recreated tag libreoffice-3.3.0.4 which had these commits:

commit 5d72cb3cf5b1e61a804e7a5db52a4a6bd041afdd (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date:   Tue Jan 18 19:01:21 2011 +0100

    Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)

commit 95323c2f1c8e7c340e8f3bb1261cd63fca66b68a
Author: Petr Mladek <pmladek@suse.cz>
Date:   Tue Jan 11 22:59:38 2011 +0100

    Branch libreoffice-3-3-0

    This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
    Only very safe changes, reviewed by three people are allowed.

    If you want to commit more complicated fix for the next 3.3.x release,
    please use the 'libreoffice-3-3' branch.

    If you want to build something cool, unstable, and risky, use master.

5721 files changed, 130229 insertions, 130229 deletions

diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx
index b5dfd5d28168..3e0c48807305 100644
--- a/bridges/inc/bridges/cpp_uno/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/bridge.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -291,17 +291,17 @@ inline cppu_Bridge::cppu_Bridge(
     , bExportCpp2Uno( bExportCpp2Uno_ )
 {
     g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
-
+    
     aCpp2Uno.pBridge = this;
     aCpp2Uno.acquire = cppu_Mapping_acquire;
     aCpp2Uno.release = cppu_Mapping_release;
     aCpp2Uno.mapInterface = cppu_Mapping_cpp2uno;
-
+    
     aUno2Cpp.pBridge = this;
     aUno2Cpp.acquire = cppu_Mapping_acquire;
     aUno2Cpp.release = cppu_Mapping_release;
     aUno2Cpp.mapInterface = cppu_Mapping_uno2cpp;
-
+    
     (*((uno_Environment *)pCppEnv)->acquire)( (uno_Environment *)pCppEnv );
     (*((uno_Environment *)pUnoEnv)->acquire)( (uno_Environment *)pUnoEnv );
 }
diff --git a/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx b/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx
index 542be6e0f3d6..f18520ec8d8f 100644
--- a/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx b/bridges/inc/bridges/cpp_uno/shared/bridge.hxx
index 4ee69e37b416..35bf11d90915 100644
--- a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/bridge.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx b/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx
index 31e19cc94d00..ffaada865ae2 100644
--- a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/inc/bridges/cpp_uno/shared/types.hxx b/bridges/inc/bridges/cpp_uno/shared/types.hxx
index 0cc87864af0e..bb3b4f7175b2 100644
--- a/bridges/inc/bridges/cpp_uno/shared/types.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/types.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx b/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx
index 87c96ec36689..a3c89f9f3eae 100644
--- a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
index 247b12aafb25..680dee6c0c98 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@
 
 /*See: http://people.redhat.com/drepper/selinux-mem.html*/
 #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
-    || defined(NETBSD)
+	|| defined(NETBSD)
 #define USE_DOUBLE_MMAP
 #endif
 
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtables.hxx b/bridges/inc/bridges/cpp_uno/shared/vtables.hxx
index 2ea5c7c83121..f282f997becc 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtables.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtables.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/inc/bridges/cpp_uno/type_misc.hxx b/bridges/inc/bridges/cpp_uno/type_misc.hxx
index 5fbd0da45cac..98fd84205588 100644
--- a/bridges/inc/bridges/cpp_uno/type_misc.hxx
+++ b/bridges/inc/bridges/cpp_uno/type_misc.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@ inline bool cppu_relatesToInterface( typelib_TypeDescription * pTypeDescr ) SAL_
 {
     switch (pTypeDescr->eTypeClass)
     {
-//      case typelib_TypeClass_TYPEDEF:
+//  	case typelib_TypeClass_TYPEDEF:
     case typelib_TypeClass_SEQUENCE:
     {
         switch (((typelib_IndirectTypeDescription *)pTypeDescr)->pType->eTypeClass)
@@ -78,7 +78,7 @@ inline bool cppu_relatesToInterface( typelib_TypeDescription * pTypeDescr ) SAL_
             case typelib_TypeClass_UNION: // might relate to interface
             case typelib_TypeClass_ANY: // might relate to interface
                 return true;
-//              case typelib_TypeClass_TYPEDEF:
+//  			case typelib_TypeClass_TYPEDEF:
             case typelib_TypeClass_SEQUENCE:
             case typelib_TypeClass_STRUCT:
             case typelib_TypeClass_EXCEPTION:
diff --git a/bridges/inc/bridges/remote/bridgeimpl.hxx b/bridges/inc/bridges/remote/bridgeimpl.hxx
index bb166d50a153..cff8effae72c 100644
--- a/bridges/inc/bridges/remote/bridgeimpl.hxx
+++ b/bridges/inc/bridges/remote/bridgeimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ namespace bridges_remote {
     {
         RTC_HOLDENVWEAK = 0x1
     };
-
+    
     class RemoteThreadCounter
     {
     public:
@@ -63,13 +63,13 @@ namespace bridges_remote {
               remote_Context *pContext = ((remote_Context *) m_pEnvRemote->pContext );
             osl_incrementInterlockedCount( &( pContext->m_pBridgeImpl->m_nRemoteThreads ) );
         }
-
+        
         RemoteThreadCounter( uno_Environment *pEnvRemote )
             : m_bReleaseEnvironment( sal_True )
             , m_pEnvRemote( pEnvRemote )
         {
             m_pEnvRemote->acquire( m_pEnvRemote );
-
+            
               remote_Context *pContext = ((remote_Context *) m_pEnvRemote->pContext );
             osl_incrementInterlockedCount( &( pContext->m_pBridgeImpl->m_nRemoteThreads ) );
         }
@@ -86,7 +86,7 @@ namespace bridges_remote {
             if( m_bReleaseEnvironment )
                 m_pEnvRemote->release( m_pEnvRemote );
         }
-
+        
         sal_Bool m_bReleaseEnvironment;
         uno_Environment *m_pEnvRemote;
     };
diff --git a/bridges/inc/bridges/remote/connection.h b/bridges/inc/bridges/remote/connection.h
index 9ed8fad10d02..6e85250d8234 100644
--- a/bridges/inc/bridges/remote/connection.h
+++ b/bridges/inc/bridges/remote/connection.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,16 +35,16 @@
 struct remote_Connection
 {
     void ( SAL_CALL * acquire ) ( remote_Connection *);
-
+    
     void ( SAL_CALL * release ) ( remote_Connection *);
-
+    
     /**
       reads nSize bytes from the connection. This method blocks, until
       all bytes are available or an error occurs.
       @return Number of bytes read.
               If the return value is less than nSize, an unrecoverable
               i/o error has occured or the connection was closed.
-
+                          
      */
     sal_Int32 (SAL_CALL * read)(remote_Connection *, sal_Int8 *pDest, sal_Int32 nSize );
 
diff --git a/bridges/inc/bridges/remote/context.h b/bridges/inc/bridges/remote/context.h
index 8ff83adfb128..d73f371c79a5 100644
--- a/bridges/inc/bridges/remote/context.h
+++ b/bridges/inc/bridges/remote/context.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@
 
     Not all uno_Contexts need to be refcounted, in case they are,
     they should be 'derived' from this struct.
-    This is used as a base class for the remote_Context.
+    This is used as a base class for the remote_Context. 
     @see uno_Environment
     @see uno_getEnvironment()
     @see remote_Context
@@ -53,7 +53,7 @@ struct uno_Context
     void (SAL_CALL * acquire)( uno_Context *pContext );
 
     /** decrements the recount of the context. In case the recount drops to zero,
-        the context gets destroye.
+        the context gets destroye. 
     */
     void (SAL_CALL * release)( uno_Context *pContext);
 
@@ -70,7 +70,7 @@ struct remote_Interface;
 
 
 /** performs a query-interface for a certain interface via the remote connection !
-
+ 
   @param pEnvRemote The environment, that shall perform the call.
   @param ppRemoteI  in/out parameter contains the interface returned by queryInterface
   @param pOid       the oid of the 'ghost' object on which the call must be done.
@@ -99,7 +99,7 @@ struct remote_InstanceProvider
 
 /** refcounted C-interface, which allows to register a listener to an
     remote bridge to be informed when the bridge gets disposed.
-
+    
    @see remote_Context
  */
 struct remote_DisposingListener
@@ -115,8 +115,8 @@ struct remote_DisposingListener
   Try to get an existing context characterized by the pIdString. Each ID-String must
   uniquely charcterize a certain connection. The context can't be retrieved via this
   function anymore, after it got disposed.
-
-  @return 0 when such a context does not exist, otherwise
+  
+  @return 0 when such a context does not exist, otherwise 
           a pointer to an acquired remote_Context.
  **/
 extern "C" remote_Context * SAL_CALL
@@ -125,19 +125,19 @@ remote_getContext( rtl_uString *pIdString );
 /**
   Create an acquired remote context. The Context is weakly held by the context administration
   and can be accessed later through remote_getContext() (using the same id-string).
-
+ 
   @param pIdString A string, that uniquely describes the connection. For e.g. a socket connection,
                    host and port of the local and remote host should be in the string.
-
+                   
   @param pDescription
                    Description of the connection, that may brought up to the user.
-
+ 
   @param pProtocol
                    The protocol, that the environment uses for
                    communicating with the remote process.
                    The format of the protocol string is : "protocolname,para1=para1value,..."
   @return 0, when a context with this name already exists.
-
+  
   @see remote_getContext()
   @see remote_Context
  */
@@ -172,10 +172,10 @@ extern "C" void SAL_CALL
 remote_removeContextListener( remote_contextListenerFunc listener , void *pObject );
 
 /** Allows to retrieve all existing context strings.
-
+    
    @param pnStringCount out parameter. Contains the number of rtl_uStrings in the array
    @param memAlloc      a memory allocation function for the array of  pointers to rtl_uStrings
-
+ 
    @return array of rtl strings. The caller must call release on all rtl_uString s and must free
            the pointer array.
  */
@@ -204,9 +204,9 @@ struct remote_Context
                                                   remote_DisposingListener * );
     /**
        will be called by the environment when it gets disposed
-     */
+     */	
     void ( SAL_CALL * dispose ) ( remote_Context * );
-
+    
     /** The method is set by the remote-environment during environment initialization.
       @see remote_getInstanceFunc
      */
@@ -218,7 +218,7 @@ struct remote_Context
       The parameters are protocol dependend
      */
     rtl_uString *m_pProtocol;
-
+    
     /**
        It may be the same as m_pName.
        Livetime is handled by the context administration.
@@ -231,7 +231,7 @@ struct remote_Context
       Livetime is handled by the context administration.
      */
     rtl_uString *m_pName;
-
+    
     /** The instance-provider, which is used to look up unknown object identifiers.
       Is usually called on server side,  when the first client request comes in.
       Maybe 0. Livetime is handled by the context administration.
diff --git a/bridges/inc/bridges/remote/counter.hxx b/bridges/inc/bridges/remote/counter.hxx
index 8bcb547008af..9dfd21dd416d 100644
--- a/bridges/inc/bridges/remote/counter.hxx
+++ b/bridges/inc/bridges/remote/counter.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/inc/bridges/remote/helper.hxx b/bridges/inc/bridges/remote/helper.hxx
index 56de06b7d8c8..3df820c36c94 100644
--- a/bridges/inc/bridges/remote/helper.hxx
+++ b/bridges/inc/bridges/remote/helper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@ namespace bridges_remote
     /** @param callback If the bridge implementation wants to handle the remote release call,
                         it can do it giving this callback. If callback == 0, the releaseRemote
                         method of the stub is called.
-    */
+    */						
     void SAL_CALL remote_createStub (
         remote_Interface **ppRemoteI,
         rtl_uString *pOid ,
@@ -58,7 +58,7 @@ namespace bridges_remote
     void SAL_CALL remote_retrieveOidFromProxy(
         remote_Interface *pRemtoeI,
         rtl_uString **ppOid );
-
+        
     void SAL_CALL remote_sendQueryInterface(
         uno_Environment *pEnvRemote,
         remote_Interface **ppRemoteI,
diff --git a/bridges/inc/bridges/remote/mapping.hxx b/bridges/inc/bridges/remote/mapping.hxx
index 28903eff8ac2..8aefb477b24f 100644
--- a/bridges/inc/bridges/remote/mapping.hxx
+++ b/bridges/inc/bridges/remote/mapping.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,12 +43,12 @@ namespace bridges_remote
         uno_Mapping *pMapping, void **ppOut, void *pInterface,
         typelib_InterfaceTypeDescription *pInterfaceTypeDescr );
     RemoteToUno remoteToUno;
-
+    
     extern "C" typedef void SAL_CALL UnoToRemote(
         uno_Mapping *pMapping, void **ppOut, void *pInterface,
         typelib_InterfaceTypeDescription *pInterfaceTypeDescr );
     UnoToRemote unoToRemote;
-
+        
     extern "C" typedef void SAL_CALL FreeRemoteMapping(uno_Mapping * mapping);
     FreeRemoteMapping freeRemoteMapping;
 
@@ -61,11 +61,11 @@ namespace bridges_remote
                        uno_MapInterfaceFunc func ,
                        const ::rtl::OUString sPurpose);
         ~RemoteMapping();
-
-        oslInterlockedCount m_nRef;
+        
+        oslInterlockedCount	m_nRef;
         ::rtl::OUString m_sPurpose;
     };
-
+    
 }
 #endif
 
diff --git a/bridges/inc/bridges/remote/proxy.hxx b/bridges/inc/bridges/remote/proxy.hxx
index 25afecca6c13..c7c25652bc6e 100644
--- a/bridges/inc/bridges/remote/proxy.hxx
+++ b/bridges/inc/bridges/remote/proxy.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@ AcquireRemote2UnoProxy acquireRemote2UnoProxy;
 extern "C" typedef void SAL_CALL ReleaseRemote2UnoProxy(uno_Interface *);
 ReleaseRemote2UnoProxy releaseRemote2UnoProxy;
 
-// private:
+// private:	
 extern "C" typedef void SAL_CALL DispatchRemote2UnoProxy(
     uno_Interface *, typelib_TypeDescription const *, void *, void **,
     uno_Any **);
@@ -66,9 +66,9 @@ public:
         uno_Environment *pEnvUno,
         uno_Environment *pEnvRemote
         );
-
+    
     ~Remote2UnoProxy();
-
+    
 private:
     ::rtl::OUString m_sOid;
     typelib_InterfaceTypeDescription *m_pType;
@@ -77,8 +77,8 @@ private:
     uno_Environment *m_pEnvRemote;
     ::com::sun::star::uno::Mapping m_mapRemote2Uno;
     ::com::sun::star::uno::Mapping m_mapUno2Remote;
-
-    oslInterlockedCount m_nRef;
+    
+    oslInterlockedCount	m_nRef;
 
     friend void SAL_CALL acquireRemote2UnoProxy(uno_Interface *);
 
diff --git a/bridges/inc/bridges/remote/remote.h b/bridges/inc/bridges/remote/remote.h
index 1e8ebabf2b93..49180a866ff4 100644
--- a/bridges/inc/bridges/remote/remote.h
+++ b/bridges/inc/bridges/remote/remote.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,7 +56,7 @@ typedef void (SAL_CALL * remote_DispatchMethod)(
     remote_Interface * pRemoteI, typelib_TypeDescription const * pMemberType,
     void * pReturn, void * pArgs[], uno_Any ** ppException );
 
-/**
+/** 
    @internal
  */
 typedef void ( SAL_CALL * requestClientSideDispatcher ) (
diff --git a/bridges/inc/bridges/remote/remote.hxx b/bridges/inc/bridges/remote/remote.hxx
index a4fcac21f1c8..c773b6a2c7fb 100644
--- a/bridges/inc/bridges/remote/remote.hxx
+++ b/bridges/inc/bridges/remote/remote.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/inc/bridges/remote/stub.hxx b/bridges/inc/bridges/remote/stub.hxx
index b89389ec50fe..4c53b029149f 100644
--- a/bridges/inc/bridges/remote/stub.hxx
+++ b/bridges/inc/bridges/remote/stub.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@ public:
     ::rtl::OUString m_sOid;
     typelib_InterfaceTypeDescription *m_pType;
     uno_Interface *m_pUnoI;
-    oslInterlockedCount m_nRef;
+    oslInterlockedCount	m_nRef;
 
     uno_Environment *m_pEnvUno;
     uno_Environment *m_pEnvRemote;
diff --git a/bridges/inc/pch/precompiled_bridges.cxx b/bridges/inc/pch/precompiled_bridges.cxx
index 05fd24f32377..6cd286dca455 100644
--- a/bridges/inc/pch/precompiled_bridges.cxx
+++ b/bridges/inc/pch/precompiled_bridges.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/inc/pch/precompiled_bridges.hxx b/bridges/inc/pch/precompiled_bridges.hxx
index 3116a130f7ed..7a9e5199e65c 100644
--- a/bridges/inc/pch/precompiled_bridges.hxx
+++ b/bridges/inc/pch/precompiled_bridges.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/cc50_solaris_intel.hxx b/bridges/source/cpp_uno/cc50_solaris_intel/cc50_solaris_intel.hxx
index 8e938e2c8105..479d39ec6841 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/cc50_solaris_intel.hxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/cc50_solaris_intel.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,10 +39,10 @@ namespace __Crun
     struct static_type_info
     {
         std::ptrdiff_t m_pClassName;
-        int         m_nSkip1; // must be 0
-        void*       m_pMagic; // points to some magic data
-        int         m_nMagic[ 4 ];
-        int         m_nSkip2[2]; // must be 0
+        int			m_nSkip1; // must be 0
+        void*		m_pMagic; // points to some magic data
+        int			m_nMagic[ 4 ];
+        int			m_nSkip2[2]; // must be 0
     };
     void* ex_alloc(unsigned);
     void ex_throw( void*, const static_type_info*, void(*)(void*));
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx
index 0737475c995a..fcd3509050fb 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -66,7 +66,7 @@ void cpp2uno_call(
 
     void * pUnoReturn = 0;
     void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -95,9 +95,9 @@ void cpp2uno_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
@@ -151,7 +151,7 @@ void cpp2uno_call(
         }
         pCppStack += sizeof(sal_Int32); // standard parameter length
     }
-
+    
     // ExceptionHolder
     uno_Any aUnoExc; // Any will be constructed by callee
     uno_Any * pUnoExc = &aUnoExc;
@@ -159,7 +159,7 @@ void cpp2uno_call(
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)(
         pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
+    
     // in case no exception occured...
     if (pUnoExc)
     {
@@ -167,14 +167,14 @@ void cpp2uno_call(
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn) // is in/inout => was constructed
                 uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
         }
         if (pReturnTypeDescr)
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
+        
         CPPU_CURRENT_NAMESPACE::cc50_solaris_intel_raiseException(
             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
             // has to destruct the any
@@ -186,7 +186,7 @@ void cpp2uno_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bOut) // inout/out
             {
                 // convert and assign
@@ -198,7 +198,7 @@ void cpp2uno_call(
             }
             // destroy temp uno param
             uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return
@@ -218,7 +218,7 @@ void cpp2uno_call(
         {
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
         }
-    }
+    }		
 }
 
 
@@ -228,7 +228,7 @@ extern "C" void cpp_vtable_call(
     sal_Int64 nRegReturn )
 {
     OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-
+    
     // pCallStack: ret adr, [ret *], this, params
     void * pThis;
     if( nFunctionIndex & 0x80000000 )
@@ -253,7 +253,7 @@ extern "C" void cpp_vtable_call(
     {
         throw RuntimeException( rtl::OUString::createFromAscii("illegal vtable index!"), (XInterface *)pThis );
     }
-
+    
     // determine called method
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
     OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
@@ -279,9 +279,9 @@ extern "C" void cpp_vtable_call(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
+            
             cpp2uno_call(
                 pCppI, aMemberDescr.get(),
                 0, // indicates void return
@@ -313,7 +313,7 @@ extern "C" void cpp_vtable_call(
                     pCppI->getBridge()->getCppEnv(),
                     (void **)&pInterface, pCppI->getOid().pData,
                     (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
index e0776c19476c..e0bb02db0257 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx
index c1c2c2dc8eb6..dfa9b7227195 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ typedef unsigned int sal_uInt32;
 #include <string.h>
 
 /*
- *  build a hash for a character buffer using the NIST algorithm
+ *	build a hash for a character buffer using the NIST algorithm
  */
 
 class NIST_Hash
@@ -50,12 +50,12 @@ class NIST_Hash
     {
         return z ^ ( x & ( y ^ z ) );
     }
-
+    
     sal_uInt32 f2( sal_uInt32 x, sal_uInt32 y, sal_uInt32 z )
     {
         return x ^ y ^ z;
     }
-
+    
     sal_uInt32 f3( sal_uInt32 x, sal_uInt32 y, sal_uInt32 z )
     {
         return ( x & y ) + ( z & ( x ^ y ) );
@@ -98,17 +98,17 @@ class NIST_Hash
     sal_uInt32 hashdata[5];
 public:
     NIST_Hash( const char* pString, sal_uInt32 nLen );
-
+    
     sal_uInt32 *getHash() { return hashdata; }
 };
 
 void NIST_Hash::transform()
 {
     // constants
-    const sal_uInt32 K2     = 0x5A827999;
-    const sal_uInt32 K3     = 0x6ED9EBA1;
-    const sal_uInt32 K5     = 0x8F1BBCDC;
-    const sal_uInt32 K10    = 0xCA62C1D6;
+    const sal_uInt32 K2		= 0x5A827999;
+    const sal_uInt32 K3		= 0x6ED9EBA1;
+    const sal_uInt32 K5		= 0x8F1BBCDC;
+    const sal_uInt32 K10	= 0xCA62C1D6;
 
     sal_uInt32 a, b, c, d, e;
     a = hashdata[0];
@@ -210,7 +210,7 @@ void NIST_Hash::transform()
 
 #define BLOCKSIZE sizeof( data )
 
-NIST_Hash::NIST_Hash( const char* pString, sal_uInt32 nLen )
+NIST_Hash::NIST_Hash( const char* pString, sal_uInt32 nLen ) 
 {
     hashdata[0] = 0x67452301;
     hashdata[1] = 0xefcdab89;
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx
index 7242ccd31ee6..705cad8a33ef 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -70,16 +70,16 @@ static inline void cpp_call(
       // max space for: [complex ret ptr], values|ptr ...
       char * pCppStack = (char *)alloca( ((nParams+3) * sizeof(sal_Int64)) );
       char * pCppStackStart = pCppStack;
-
+    
       // return
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
       void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-
+    
     void * pReturnSpace = 0;
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -102,7 +102,7 @@ static inline void cpp_call(
         + aVtableSlot.offset;
     *(void**)pCppStack = pAdjustedThisPtr;
     pCppStack += sizeof( void* );
-
+    
     const int nMaxParams = 32;
     // args
     void * args_buffer[3 * nMaxParams];
@@ -117,20 +117,20 @@ static inline void cpp_call(
     const int nTempBufferSize = 256;
     sal_Int32 nTempBufferPos = 0;
     long params_buffer[nTempBufferSize];
-
+    
       for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
       {
         const typelib_MethodParameter & rParam = pParams[nPos];
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
+        
         if (!rParam.bOut
             && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
             pCppArgs[ nPos ] = pCppStack;
             uno_copyAndConvertData( pCppArgs[nPos], pUnoArgs[nPos], pParamTypeDescr,
                                     pThis->getBridge()->getUno2Cpp() );
-
+            
             switch (pParamTypeDescr->eTypeClass)
             {
             case typelib_TypeClass_HYPER:
@@ -212,10 +212,10 @@ static inline void cpp_call(
             (sal_Int32 *)pCppStackStart,
             nStackLongs
             );
-
+    
         // NO exception occured...
         *ppUnoExc = 0;
-
+        
         // reconvert temporary params
         for ( ; nTempIndizes--; )
         {
@@ -223,7 +223,7 @@ static inline void cpp_call(
             sal_Bool bAllocated = (nIndex & 0x80000000) != 0;
             nIndex &= 0x7fffffff;
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -263,7 +263,7 @@ static inline void cpp_call(
         const char* pName = __Cimpl::ex_name();
 
         // get exception
-        CPPU_CURRENT_NAMESPACE::cc50_solaris_intel_fillUnoException(
+        CPPU_CURRENT_NAMESPACE::cc50_solaris_intel_fillUnoException( 
             pExc, pName, *ppUnoExc,
             pThis->getBridge()->getCpp2Uno());
 
@@ -285,7 +285,7 @@ static inline void cpp_call(
         if (pReturnTypeDescr)
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
       }
-
+    
     if (pCppArgs != (void **)args_buffer)
         rtl_freeMemory( pCppArgs );
     if (pReturnSpace)
@@ -304,7 +304,7 @@ void unoInterfaceProxyDispatch(
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
         = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
     typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-
+    
     switch (pMemberDescr->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -329,14 +329,14 @@ void unoInterfaceProxyDispatch(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
 
             typelib_TypeDescriptionReference * pReturnTypeRef = 0;
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
             aVtableSlot.index += 1; // get, then set method
             cpp_call(
@@ -344,10 +344,10 @@ void unoInterfaceProxyDispatch(
                 pReturnTypeRef,
                 1, &aParam,
                 pReturn, pArgs, ppException );
-
+            
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -378,7 +378,7 @@ void unoInterfaceProxyDispatch(
                 (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
                     pThis->pBridge->getUnoEnv(),
                     (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -408,7 +408,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/cc50_solaris_sparc.hxx b/bridges/source/cpp_uno/cc50_solaris_sparc/cc50_solaris_sparc.hxx
index 06667e4a366c..a00d2ac7cc8b 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/cc50_solaris_sparc.hxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/cc50_solaris_sparc.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,10 +39,10 @@ namespace __Crun
     struct static_type_info
     {
         std::ptrdiff_t m_pClassName;
-        int         m_nSkip1; // must be 0
-        void*       m_pMagic; // points to some magic data
-        int         m_nMagic[ 4 ];
-        int         m_nSkip2[2]; // must be 0
+        int			m_nSkip1; // must be 0
+        void*		m_pMagic; // points to some magic data
+        int			m_nMagic[ 4 ];
+        int			m_nSkip2[2]; // must be 0
     };
     void* ex_alloc(unsigned);
     void ex_throw( void*, const static_type_info*, void(*)(void*));
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx
index bfe55d726b3c..f13bcfbe214c 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -260,13 +260,13 @@ static typelib_TypeClass cpp_mediate(
 
       OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex,
                 "### illegal vtable index!" );
-//      if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-//      {
-//          RuntimeException aExc;
-//          aExc.Message = OUString::createFromAscii("illegal vtable index!");
-//          aExc.Context = (XInterface *)pThis;
-//          throw aExc;
-//      }
+//  	if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
+//  	{
+//  		RuntimeException aExc;
+//  		aExc.Message = OUString::createFromAscii("illegal vtable index!");
+//  		aExc.Context = (XInterface *)pThis;
+//  		throw aExc;
+//  	}
 
     // determine called method
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
@@ -294,8 +294,8 @@ static typelib_TypeClass cpp_mediate(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
 
             eRet = cpp2uno_call(
                 pCppI, aMemberDescr.get(),
@@ -356,15 +356,15 @@ static typelib_TypeClass cpp_mediate(
         }
         break;
     }
-//      default:
-//      {
-//          RuntimeException aExc;
-//          aExc.Message = OUString::createFromAscii("no member description found!");
-//          aExc.Context = (XInterface *)pThis;
-//          throw aExc;
-//          // is here for dummy
-//          eRet = typelib_TypeClass_VOID;
-//      }
+//  	default:
+//  	{
+//  		RuntimeException aExc;
+//  		aExc.Message = OUString::createFromAscii("no member description found!");
+//  		aExc.Context = (XInterface *)pThis;
+//  		throw aExc;
+//  		// is here for dummy
+//  		eRet = typelib_TypeClass_VOID;
+//  	}
     }
 
     return eRet;
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx
index aa2bbde76708..2c003cc4ba5b 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/flushcode.hxx b/bridges/source/cpp_uno/cc50_solaris_sparc/flushcode.hxx
index 5d89d81efed8..4a3bbc9319b5 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/flushcode.hxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/flushcode.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/hash.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/hash.cxx
index 29064c19a28f..d2d94bb24b96 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/hash.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/hash.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ typedef unsigned int sal_uInt32;
 #include <string.h>
 
 /*
- *  build a hash for a character buffer using the NIST algorithm
+ *	build a hash for a character buffer using the NIST algorithm
  */
 
 class NIST_Hash
@@ -51,12 +51,12 @@ class NIST_Hash
     {
         return z ^ ( x & ( y ^ z ) );
     }
-
+    
     sal_uInt32 f2( sal_uInt32 x, sal_uInt32 y, sal_uInt32 z )
     {
         return x ^ y ^ z;
     }
-
+    
     sal_uInt32 f3( sal_uInt32 x, sal_uInt32 y, sal_uInt32 z )
     {
         return ( x & y ) + ( z & ( x ^ y ) );
@@ -99,17 +99,17 @@ class NIST_Hash
     sal_uInt32 hashdata[5];
 public:
     NIST_Hash( const char* pString, sal_uInt32 nLen );
-
+    
     sal_uInt32 *getHash() { return hashdata; }
 };
 
 void NIST_Hash::transform()
 {
     // constants
-    const sal_uInt32 K2     = 0x5A827999;
-    const sal_uInt32 K3     = 0x6ED9EBA1;
-    const sal_uInt32 K5     = 0x8F1BBCDC;
-    const sal_uInt32 K10    = 0xCA62C1D6;
+    const sal_uInt32 K2		= 0x5A827999;
+    const sal_uInt32 K3		= 0x6ED9EBA1;
+    const sal_uInt32 K5		= 0x8F1BBCDC;
+    const sal_uInt32 K10	= 0xCA62C1D6;
 
     sal_uInt32 a, b, c, d, e;
     a = hashdata[0];
@@ -211,7 +211,7 @@ void NIST_Hash::transform()
 
 #define BLOCKSIZE sizeof( data )
 
-NIST_Hash::NIST_Hash( const char* pString, sal_uInt32 nLen )
+NIST_Hash::NIST_Hash( const char* pString, sal_uInt32 nLen ) 
 {
     hashdata[0] = 0x67452301;
     hashdata[1] = 0xefcdab89;
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx
index 7b85bc1fee91..2d040352ff5d 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -69,8 +69,8 @@ static void cpp_call(
       OSL_ENSURE( pThis, "### no interface given!" );
 
       // max space for: [complex ret ptr], values|ptr ...
-      char * pCppStack      = (char *)alloca( ((nParams+3) * sizeof(sal_Int64)) );
-      char * pCppStackStart = pCppStack;
+      char * pCppStack		= (char *)alloca( ((nParams+3) * sizeof(sal_Int64)) );
+      char * pCppStackStart	= pCppStack;
 
       // return
     typelib_TypeDescription * pReturnTypeDescr = 0;
@@ -173,20 +173,20 @@ static void cpp_call(
 // seems that EH registration for callVirtualMethod is not really
 // necessary
 
-//  static unsigned long* pFrameInfo = NULL;
-
-//  if( ! pFrameInfo )
-//  {
-//      pFrameInfo = new unsigned long[ 7 ];
-//      pFrameInfo[ 0 ] = 0x40000000 | (((unsigned long)__Crun::ex_rethrow_q) >> 2);
-//      pFrameInfo[ 1 ] = 0x01000000;
-//      pFrameInfo[ 2 ] = (unsigned long)callVirtualMethodExceptionHandler;
-//      pFrameInfo[ 3 ] = 0;
-//          pFrameInfo[ 4 ] = (unsigned long)pFrameInfo - (unsigned long)callVirtualMethodExceptionHandler;
-//      pFrameInfo[ 5 ] = 0;
-//      pFrameInfo[ 6 ] = 0;
-//      _ex_register( pFrameInfo+2, 1 );
-//  }
+// 	static unsigned long* pFrameInfo = NULL;
+
+// 	if( ! pFrameInfo )
+// 	{
+// 		pFrameInfo = new unsigned long[ 7 ];
+// 		pFrameInfo[ 0 ] = 0x40000000 | (((unsigned long)__Crun::ex_rethrow_q) >> 2);
+// 		pFrameInfo[ 1 ] = 0x01000000;
+// 		pFrameInfo[ 2 ] = (unsigned long)callVirtualMethodExceptionHandler;
+// 		pFrameInfo[ 3 ] = 0;
+//     		pFrameInfo[ 4 ] = (unsigned long)pFrameInfo - (unsigned long)callVirtualMethodExceptionHandler;
+// 		pFrameInfo[ 5 ] = 0;
+// 		pFrameInfo[ 6 ] = 0;
+// 		_ex_register( pFrameInfo+2, 1 );
+// 	}
 
      try
       {
@@ -250,7 +250,7 @@ static void cpp_call(
         const char* pName = __Cimpl::ex_name();
 
         // get exception
-        CPPU_CURRENT_NAMESPACE::cc50_solaris_sparc_fillUnoException(
+        CPPU_CURRENT_NAMESPACE::cc50_solaris_sparc_fillUnoException( 
             pExc, pName, *ppUnoExc, pThis->getBridge()->getCpp2Uno());
 
         // temporary params
@@ -307,8 +307,8 @@ void unoInterfaceProxyDispatch(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
 
             typelib_TypeDescriptionReference * pReturnTypeRef = 0;
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/callvirtualmethod.hxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/callvirtualmethod.hxx
index 16f6c1090ff2..f58a9bd616cb 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/callvirtualmethod.hxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/callvirtualmethod.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx
index c49330b2223f..0d0d4e05707e 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx
index bf6b1512a41d..5e694c09de46 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.hxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.hxx
index 8ba17dad842f..ee5672e05cd1 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.hxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/flushcode.hxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/flushcode.hxx
index de7028d3faa2..f78a66c93a8c 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/flushcode.hxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/flushcode.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/fp.hxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/fp.hxx
index ba32b141d338..b22804e062b2 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/fp.hxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/fp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/isdirectreturntype.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/isdirectreturntype.cxx
index 9b004078c35f..1a2f5f6bddf7 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/isdirectreturntype.cxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/isdirectreturntype.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/isdirectreturntype.hxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/isdirectreturntype.hxx
index f9741a8898a5..b1bc3d64a489 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/isdirectreturntype.hxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/isdirectreturntype.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx
index e6646dca42a1..76959161bf2f 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/vtableslotcall.hxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/vtableslotcall.hxx
index c63f674c1549..6c699bb5a91e 100644
--- a/bridges/source/cpp_uno/cc5_solaris_sparc64/vtableslotcall.hxx
+++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/vtableslotcall.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
index 3ee825511d66..6cb1deedbaa7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,7 +48,7 @@
 
 using namespace ::com::sun::star::uno;
 
-namespace
+namespace 
 {
 static typelib_TypeClass cpp2uno_call(
     bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
@@ -62,7 +62,7 @@ static typelib_TypeClass cpp2uno_call(
     fprintf(stderr, "as far as cpp2uno_call\n");
 #endif
     int nregs = 0; //number of words passed in registers
-
+       
     // gpreg:  [ret *], this, [gpr params]
     // fpreg:  [fpr params]
     // ovrflw: [gpr or fpr params (properly aligned)]
@@ -71,10 +71,10 @@ static typelib_TypeClass cpp2uno_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     if (pReturnTypeRef)
         TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
+    
     void * pUnoReturn = 0;
     void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -87,14 +87,14 @@ static typelib_TypeClass cpp2uno_call(
             gpreg++;
             fpreg++;
             nregs++;
-
+            
             pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
                           ? alloca( pReturnTypeDescr->nSize )
                           : pCppReturn); // direct way
         }
     }
     // pop this
-    gpreg++;
+    gpreg++; 
     fpreg++;
     nregs++;
 
@@ -107,7 +107,7 @@ static typelib_TypeClass cpp2uno_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
@@ -223,7 +223,7 @@ static typelib_TypeClass cpp2uno_call(
             void *pCppStack; //temporary stack pointer
 
             if (nregs < axp::MAX_WORDS_IN_REGS)
-            {
+            { 
                 pCppArgs[nPos] = pCppStack = *gpreg;
                 gpreg++;
                 fpreg++;
@@ -265,14 +265,14 @@ static typelib_TypeClass cpp2uno_call(
 #ifdef CMC_DEBUG
     fprintf(stderr, "end of params\n");
 #endif
-
+    
     // ExceptionHolder
     uno_Any aUnoExc; // Any will be constructed by callee
     uno_Any * pUnoExc = &aUnoExc;
 
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
+    
     // in case an exception occured...
     if (pUnoExc)
     {
@@ -280,14 +280,14 @@ static typelib_TypeClass cpp2uno_call(
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn) // is in/inout => was constructed
                 uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
         }
         if (pReturnTypeDescr)
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
+        
         CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc, pThis->getBridge()->getUno2Cpp() ); // has to destruct the any
         // is here for dummy
         return typelib_TypeClass_VOID;
@@ -299,7 +299,7 @@ static typelib_TypeClass cpp2uno_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bOut) // inout/out
             {
                 // convert and assign
@@ -309,7 +309,7 @@ static typelib_TypeClass cpp2uno_call(
             }
             // destroy temp uno param
             uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return
@@ -366,7 +366,7 @@ static typelib_TypeClass cpp_mediate(
         }
 #endif
 
-
+    
     // gpreg:  [ret *], this, [other gpr params]
     // fpreg:  [fpr params]
     // ovrflw: [gpr or fpr params (properly aligned)]
@@ -384,14 +384,14 @@ static typelib_TypeClass cpp_mediate(
     }
 
     pThis = static_cast< char * >(pThis) - nVtableOffset;
-
+    
     bridges::cpp_uno::shared::CppInterfaceProxy * pCppI
         = bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(
             pThis);
 
     typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
 
-
+    
     OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
@@ -399,14 +399,14 @@ static typelib_TypeClass cpp_mediate(
             rtl::OUString::createFromAscii("illegal vtable index!"),
             (XInterface *)pCppI );
     }
-
+    
     // determine called method
     OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
     OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
 
     TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-
+    
     typelib_TypeClass eRet;
     switch (aMemberDescr.get()->eTypeClass)
     {
@@ -429,7 +429,7 @@ static typelib_TypeClass cpp_mediate(
                 ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
             aParam.bIn      = sal_True;
             aParam.bOut     = sal_False;
-
+            
             eRet = cpp2uno_call(
                 pCppI, aMemberDescr.get(),
                 0, // indicates void return
@@ -460,9 +460,9 @@ static typelib_TypeClass cpp_mediate(
                 XInterface * pInterface = 0;
                 (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)(
                     pCppI->getBridge()->getCppEnv(),
-                    (void **)&pInterface, pCppI->getOid().pData,
+                    (void **)&pInterface, pCppI->getOid().pData, 
                     (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -529,8 +529,8 @@ long cpp_vtable_call(long r16, long r17, long r18, long r19, long r20, long r21,
     fprintf(stderr, "non-doubles are %x %x %x %x %x %x\n", gpreg[0], gpreg[1], gpreg[2], gpreg[3], gpreg[4], gpreg[5]);
     fprintf(stderr, "doubles are %f %f %f %f %f %f\n", fpreg[0], fpreg[1], fpreg[2], fpreg[3], fpreg[4], fpreg[5]);
 #endif
-    typelib_TypeClass aType =
-        cpp_mediate( nOffsetAndIndex, (void**)gpreg, (void**)fpreg, (void**)sp,
+    typelib_TypeClass aType = 
+        cpp_mediate( nOffsetAndIndex, (void**)gpreg, (void**)fpreg, (void**)sp, 
             (sal_Int64*)nRegReturn );
 #ifdef CMC_DEBUG
     fprintf(stderr, "after mediate ret is %lx %ld\n", nRegReturn[0], nRegReturn[0]);
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
index c0de95532515..ea6961092f1a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx b/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx
index d76cbf748db3..ba9db0598b73 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,25 +49,25 @@ struct _Unwind_Exception
 } __attribute__((__aligned__));
 
 struct __cxa_exception
-{
+{ 
     ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
+    void (*exceptionDestructor)(void *); 
+    
     ::std::unexpected_handler unexpectedHandler;
     ::std::terminate_handler terminateHandler;
-
+    
     __cxa_exception *nextException;
-
+    
     int handlerCount;
-
+    
     int handlerSwitchValue;
     const unsigned char *actionRecord;
     const unsigned char *languageSpecificData;
     void *catchTemp;
     void *adjustedPtr;
-
+    
     _Unwind_Exception unwindHeader;
-};
+};    
 
 extern "C" void *__cxa_allocate_exception(
     std::size_t thrown_size ) throw();
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx
index dddda8ab8207..02801f75606c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -203,7 +203,7 @@ void callVirtualMethod(
 }
 
 
-//============================================================================
+//============================================================================ 
 static void cpp_call(
         bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
         bridges::cpp_uno::shared::VtableSlot  aVtableSlot,
@@ -218,12 +218,12 @@ static void cpp_call(
     sal_uInt64 pGPR[axp::MAX_GPR_REGS];
     double pFPR[axp::MAX_SSE_REGS];
     sal_uInt32 nRegs = 0;
-
+    
     // return
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
 
     if (pReturnTypeDescr)
@@ -254,15 +254,15 @@ static void cpp_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
+        
         if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
             uno_copyAndConvertData( pCppArgs[nPos] = alloca( 8 ), pUnoArgs[nPos], pParamTypeDescr,
@@ -319,7 +319,7 @@ static void cpp_call(
                 uno_copyAndConvertData(
                     pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
                     pUnoArgs[nPos], pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
-
+                
                 pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
                 // will be released at reconversion
                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -333,7 +333,7 @@ static void cpp_call(
             INSERT_INT64( &(pCppArgs[nPos]), nRegs, pGPR, pStack );
         }
     }
-
+  
     try
     {
         callVirtualMethod(
@@ -344,13 +344,13 @@ static void cpp_call(
             pFPR, nRegs );
         // NO exception occured...
         *ppUnoExc = 0;
-
+        
         // reconvert temporary params
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -367,7 +367,7 @@ static void cpp_call(
             }
             // destroy temp cpp param => cpp: every param was constructed
             uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return value
@@ -381,10 +381,10 @@ static void cpp_call(
     catch (...)
     {
         // fill uno exception
-        fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions,
+        fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, 
             *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
 
-
+        
         // temporary params
         for ( ; nTempIndizes--; )
         {
@@ -409,12 +409,12 @@ void unoInterfaceProxyDispatch(
 #ifdef CMC_DEBUG
     fprintf(stderr, "unoInterfaceProxyDispatch\n");
 #endif
-
+    
 
     // is my surrogate
-    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
+    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis 
             = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy *> (pUnoI);
-
+    
     switch (pMemberDescr->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -448,7 +448,7 @@ void unoInterfaceProxyDispatch(
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
                         aVtableSlot.index += 1; //get then set method
             cpp_call(
@@ -456,10 +456,10 @@ void unoInterfaceProxyDispatch(
                 pReturnTypeRef,
                 1, &aParam,
                 pReturn, pArgs, ppException );
-
+            
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -491,7 +491,7 @@ void unoInterfaceProxyDispatch(
                 (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
                     pThis->pBridge->getUnoEnv(),
                     (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -521,7 +521,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index da4f0e34ce3c..e71398220522 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@ namespace
     static typelib_TypeClass cpp2uno_call(
         bridges::cpp_uno::shared::CppInterfaceProxy* pThis,
         const typelib_TypeDescription * pMemberTypeDescr,
-        typelib_TypeDescriptionReference * pReturnTypeRef,
+        typelib_TypeDescriptionReference * pReturnTypeRef, 
         sal_Int32 nParams, typelib_MethodParameter * pParams,
         void ** pCallStack,
         sal_Int64 * pRegisterReturn /* space for register return */ )
@@ -70,11 +70,11 @@ namespace
         typelib_TypeDescription * pReturnTypeDescr = 0;
         if (pReturnTypeRef)
             TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
+        
         void * pUnoReturn = 0;
         // complex return ptr: if != 0 && != pUnoReturn, reconversion need
         void * pCppReturn = 0;
-
+        
         if (pReturnTypeDescr)
         {
             if (!arm::return_in_hidden_param(pReturnTypeRef))
@@ -83,7 +83,7 @@ namespace
             {
                 pCppReturn = *(void **)pCppStack;
                 pCppStack += sizeof(void *);
-
+                
                 pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType(
                     pReturnTypeDescr )
                         ? alloca( pReturnTypeDescr->nSize )
@@ -103,9 +103,9 @@ namespace
         // cpp<=>uno)
         sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
         // type descriptions for reconversions
-        typelib_TypeDescription ** ppTempParamTypeDescr =
+        typelib_TypeDescription ** ppTempParamTypeDescr = 
             (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+        
         sal_Int32 nTempIndizes   = 0;
 
         for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
@@ -114,8 +114,8 @@ namespace
             typelib_TypeDescription * pParamTypeDescr = 0;
             TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
 
-            if (!rParam.bOut &&
-                bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
+            if (!rParam.bOut && 
+                bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr )) 
             {
 #ifdef __ARM_EABI__
                 switch (pParamTypeDescr->eTypeClass)
@@ -161,7 +161,7 @@ namespace
                 else if (bridges::cpp_uno::shared::relatesToInterfaceType(
                     pParamTypeDescr ))
                 {
-                    uno_copyAndConvertData( pUnoArgs[nPos] =
+                    uno_copyAndConvertData( pUnoArgs[nPos] = 
                         alloca( pParamTypeDescr->nSize ),
                         *(void **)pCppStack, pParamTypeDescr,
                         pThis->getBridge()->getCpp2Uno() );
@@ -178,7 +178,7 @@ namespace
             }
             pCppStack += sizeof(sal_Int32); // standard parameter length
         }
-
+        
         // ExceptionHolder
         uno_Any aUnoExc; // Any will be constructed by callee
         uno_Any * pUnoExc = &aUnoExc;
@@ -194,16 +194,16 @@ namespace
             for ( ; nTempIndizes--; )
             {
                 sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+                
                 if (pParams[nIndex].bIn) // is in/inout => was constructed
-                    uno_destructData( pUnoArgs[nIndex],
+                    uno_destructData( pUnoArgs[nIndex], 
                         ppTempParamTypeDescr[nTempIndizes], 0 );
                 TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
             }
             if (pReturnTypeDescr)
                 TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
-            CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc,
+            
+            CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc, 
                 pThis->getBridge()->getUno2Cpp() ); // has to destruct the any
             // is here for dummy
             return typelib_TypeClass_VOID;
@@ -216,18 +216,18 @@ namespace
                 sal_Int32 nIndex = pTempIndizes[nTempIndizes];
                 typelib_TypeDescription * pParamTypeDescr =
                     ppTempParamTypeDescr[nTempIndizes];
-
+                
                 if (pParams[nIndex].bOut) // inout/out
                 {
                     // convert and assign
                     uno_destructData( pCppArgs[nIndex], pParamTypeDescr,
                         cpp_release );
-                    uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex],
+                    uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], 
                         pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
                 }
                 // destroy temp uno param
                 uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+                
                 TYPELIB_DANGER_RELEASE( pParamTypeDescr );
             }
             // return
@@ -278,10 +278,10 @@ namespace
         }
 
         pThis = static_cast< char * >(pThis) - nVtableOffset;
-        bridges::cpp_uno::shared::CppInterfaceProxy * pCppI =
+        bridges::cpp_uno::shared::CppInterfaceProxy * pCppI = 
             bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(
                 pThis);
-
+            
         typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
 
         OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex,
@@ -292,7 +292,7 @@ namespace
                 OUString::createFromAscii("illegal vtable index!"),
                 (XInterface *)pCppI );
         }
-
+        
         // determine called method
         OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex,
             "### illegal vtable index!" );
@@ -326,7 +326,7 @@ namespace
                     ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
                 aParam.bIn      = sal_True;
                 aParam.bOut     = sal_False;
-
+                
                 eRet = cpp2uno_call(
                     pCppI, aMemberDescr.get(),
                     0, // indicates void return
@@ -360,7 +360,7 @@ namespace
                         pCppI->getBridge()->getCppEnv(),
                         (void **)&pInterface, pCppI->getOid().pData,
                         (typelib_InterfaceTypeDescription *)pTD );
-
+                
                     if (pInterface)
                     {
                         ::uno_any_construct(
@@ -405,7 +405,7 @@ namespace
  * (called by asm snippets)
  */
 
-extern "C" sal_Int64 cpp_vtable_call( long *pFunctionAndOffset,
+extern "C" sal_Int64 cpp_vtable_call( long *pFunctionAndOffset, 
     void **pCallStack )
 {
     sal_Int64 nRegReturn;
@@ -442,7 +442,7 @@ namespace
 {
     const int codeSnippetSize = 20;
 
-    unsigned char *codeSnippet(unsigned char* code, sal_Int32 functionIndex,
+    unsigned char *codeSnippet(unsigned char* code, sal_Int32 functionIndex, 
         sal_Int32 vtableOffset, bool bHasHiddenParam)
     {
         if (bHasHiddenParam)
@@ -522,7 +522,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
             {
                 (s++)->fn = code + writetoexecdiff;
 
-                typelib_InterfaceMethodTypeDescription *pMethodTD =
+                typelib_InterfaceMethodTypeDescription *pMethodTD = 
                     reinterpret_cast<
                         typelib_InterfaceMethodTypeDescription * >(member);
 
@@ -544,7 +544,7 @@ void bridges::cpp_uno::shared::VtableFactory::flushCode(
 {
    static void (*clear_cache)(unsigned char const*, unsigned char const*)
        = (void (*)(unsigned char const*, unsigned char const*))
-           dlsym(RTLD_DEFAULT, "__clear_cache");
+           dlsym(RTLD_DEFAULT, "__clear_cache");    
    (*clear_cache)(beg, end);
 }
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index 1fc67a2098d6..84f60331d48a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
index 2b00c6c008b4..e1d24dc71ab9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,15 +42,15 @@ namespace CPPU_CURRENT_NAMESPACE
     // -- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
 
     struct __cxa_exception
-    {
+    { 
         ::std::type_info *exceptionType;
-        void (*exceptionDestructor)(void *);
-
+        void (*exceptionDestructor)(void *); 
+        
         ::std::unexpected_handler unexpectedHandler;
         ::std::terminate_handler terminateHandler;
-
+        
         __cxa_exception *nextException;
-
+        
         int handlerCount;
 #ifdef __ARM_EABI__
     __cxa_exception *nextPropagatingException;
@@ -61,14 +61,14 @@ namespace CPPU_CURRENT_NAMESPACE
         const unsigned char *languageSpecificData;
         void *catchTemp;
         void *adjustedPtr;
-#endif
+#endif    
         _Unwind_Exception unwindHeader;
-    };
+    };    
 
     extern "C" void *__cxa_allocate_exception(
         std::size_t thrown_size ) throw();
     extern "C" void __cxa_throw (
-        void *thrown_exception, std::type_info *tinfo,
+        void *thrown_exception, std::type_info *tinfo, 
         void (*dest) (void *) ) __attribute__((noreturn));
 
     struct __cxa_eh_globals
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 00a06643fda5..1a2c27136d83 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,13 +43,13 @@
 #include <stdio.h>
 #include <string.h>
 
-/*
+/* 
  * Based on http://gcc.gnu.org/PR41443
  * References to __SOFTFP__ are incorrect for EABI; the __SOFTFP__ code
  * should be used for *soft-float ABI* whether or not VFP is enabled,
  * and __SOFTFP__ does specifically mean soft-float not soft-float ABI.
  *
- * Changing the conditionals to __SOFTFP__ || __ARM_EABI__ then
+ * Changing the conditionals to __SOFTFP__ || __ARM_EABI__ then 
  * -mfloat-abi=softfp should work.  -mfloat-abi=hard won't; that would
  * need both a new macro to identify the hard-VFP ABI.
  */
@@ -320,7 +320,7 @@ void callVirtualMethod(
                 *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
 
 namespace {
-//=======================================================================
+//======================================================================= 
 static void cpp_call(
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
     bridges::cpp_uno::shared::VtableSlot aVtableSlot,
@@ -335,12 +335,12 @@ static void cpp_call(
 
     sal_uInt32 pGPR[arm::MAX_GPR_REGS];
     sal_uInt32 nGPR = 0;
-
+    
     // return
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
 
     bool bOverFlow = false;
@@ -377,7 +377,7 @@ static void cpp_call(
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
 
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
@@ -389,7 +389,7 @@ static void cpp_call(
 //            uno_copyAndConvertData( pCppArgs[nPos] = pStack, pUnoArgs[nPos],
             uno_copyAndConvertData( pCppArgs[nPos] = alloca(8), pUnoArgs[nPos],
                 pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
-
+            
             switch (pParamTypeDescr->eTypeClass)
             {
             case typelib_TypeClass_HYPER:
@@ -446,7 +446,7 @@ static void cpp_call(
                 uno_copyAndConvertData(
                     pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
                     pUnoArgs[nPos], pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
-
+                
                 pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
                 // will be released at reconversion
                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -466,7 +466,7 @@ static void cpp_call(
         callVirtualMethod(
             pAdjustedThisPtr, aVtableSlot.index,
             pCppReturn, pReturnTypeRef,
-            pStackStart,
+            pStackStart, 
             (pStack - pStackStart),
             pGPR, nGPR);
 
@@ -478,7 +478,7 @@ static void cpp_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -495,7 +495,7 @@ static void cpp_call(
             }
             // destroy temp cpp param => cpp: every param was constructed
             uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return value
@@ -521,7 +521,7 @@ static void cpp_call(
             uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
         }
-
+        
         // return type
         if (pReturnTypeDescr)
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
@@ -541,7 +541,7 @@ void unoInterfaceProxyDispatch(
 #if OSL_DEBUG_LEVEL > 0
     typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
 #endif
-
+    
     switch (pMemberDescr->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -551,12 +551,12 @@ void unoInterfaceProxyDispatch(
         sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
         OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
 #endif
-
+        
         VtableSlot aVtableSlot(
             getVtableSlot(
             reinterpret_cast<typelib_InterfaceAttributeTypeDescription const *>
               (pMemberDescr)));
-
+        
         if (pReturn)
         {
             // dependent dispatch
@@ -579,7 +579,7 @@ void unoInterfaceProxyDispatch(
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
             aVtableSlot.index += 1;
             cpp_call(
@@ -587,10 +587,10 @@ void unoInterfaceProxyDispatch(
                 pReturnTypeRef,
                 1, &aParam,
                 pReturn, pArgs, ppException );
-
+            
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -627,7 +627,7 @@ void unoInterfaceProxyDispatch(
                 (*pThis->getBridge()->getUnoEnv()->getRegisteredInterface)(
                     pThis->getBridge()->getUnoEnv(),
                     (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -657,7 +657,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx
index 4974bf3f0e82..ad9898c732c5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -92,11 +92,11 @@ void MapReturn(sal_uInt32 ret0, sal_uInt32 ret1, typelib_TypeDescription *pRetur
 //strictly necessary
 register sal_uInt32 r28 __asm__("%r28");
 
-void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
+void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, 
     void * pRegisterReturn, typelib_TypeDescription *pReturnTypeDescr, bool bRegisterReturn,
     sal_uInt32 *pStack, sal_uInt32 nStack, sal_uInt32 *pGPR, double *pFPR) __attribute__((noinline));
 
-void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
+void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, 
     void * pRegisterReturn, typelib_TypeDescription *pReturnTypeDescr, bool bRegisterReturn,
     sal_uInt32 *pStack, sal_uInt32 nStack, sal_uInt32 *pGPR, double *pFPR)
 {
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
index ebe07d4119b2..cb6ed0a33db2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@ namespace
     static typelib_TypeClass cpp2uno_call(
         bridges::cpp_uno::shared::CppInterfaceProxy* pThis,
         const typelib_TypeDescription * pMemberTypeDescr,
-        typelib_TypeDescriptionReference * pReturnTypeRef,
+        typelib_TypeDescriptionReference * pReturnTypeRef, 
         sal_Int32 nParams, typelib_MethodParameter * pParams,
         long r8, void ** gpreg, double *fpreg, void ** ovrflw,
         sal_Int64 * pRegisterReturn /* space for register return */ )
@@ -72,7 +72,7 @@ namespace
         typelib_TypeDescription * pReturnTypeDescr = 0;
         if (pReturnTypeRef)
             TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
+        
         void * pUnoReturn = 0;
         // complex return ptr: if != 0 && != pUnoReturn, reconversion need
         void * pCppReturn = 0;
@@ -112,9 +112,9 @@ namespace
         // cpp<=>uno)
         sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
         // type descriptions for reconversions
-        typelib_TypeDescription ** ppTempParamTypeDescr =
+        typelib_TypeDescription ** ppTempParamTypeDescr = 
             (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+        
         sal_Int32 nTempIndizes   = 0;
         bool bOverFlowUsed = false;
         for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
@@ -275,7 +275,7 @@ namespace
                 else if (bridges::cpp_uno::shared::relatesToInterfaceType(
                     pParamTypeDescr ))
                 {
-                   uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
+                   uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ), 
                         pCppStack, pParamTypeDescr,
                         pThis->getBridge()->getCpp2Uno() );
                     pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
@@ -313,16 +313,16 @@ namespace
             for ( ; nTempIndizes--; )
             {
                 sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+                
                 if (pParams[nIndex].bIn) // is in/inout => was constructed
-                    uno_destructData( pUnoArgs[nIndex],
+                    uno_destructData( pUnoArgs[nIndex], 
                         ppTempParamTypeDescr[nTempIndizes], 0 );
                 TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
             }
             if (pReturnTypeDescr)
                 TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
-            CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc,
+            
+            CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc, 
                 pThis->getBridge()->getUno2Cpp() ); // has to destruct the any
             // is here for dummy
             return typelib_TypeClass_VOID;
@@ -335,18 +335,18 @@ namespace
                 sal_Int32 nIndex = pTempIndizes[nTempIndizes];
                 typelib_TypeDescription * pParamTypeDescr =
                     ppTempParamTypeDescr[nTempIndizes];
-
+                
                 if (pParams[nIndex].bOut) // inout/out
                 {
                     // convert and assign
                     uno_destructData( pCppArgs[nIndex], pParamTypeDescr,
                         cpp_release );
-                    uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex],
+                    uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], 
                         pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
                 }
                 // destroy temp uno param
                 uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+                
                 TYPELIB_DANGER_RELEASE( pParamTypeDescr );
             }
             // return
@@ -421,10 +421,10 @@ namespace
 
         pThis = static_cast< char * >(pThis) - nVtableOffset;
 
-        bridges::cpp_uno::shared::CppInterfaceProxy * pCppI =
+        bridges::cpp_uno::shared::CppInterfaceProxy * pCppI = 
             bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(
                 pThis);
-
+            
         typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
 
         OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex,
@@ -469,7 +469,7 @@ namespace
                     ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
                 aParam.bIn      = sal_True;
                 aParam.bOut     = sal_False;
-
+                
                 eRet = cpp2uno_call(
                     pCppI, aMemberDescr.get(),
                     0, // indicates void return
@@ -503,7 +503,7 @@ namespace
                         pCppI->getBridge()->getCppEnv(),
                         (void **)&pInterface, pCppI->getOid().pData,
                         (typelib_InterfaceTypeDescription *)pTD );
-
+                
                     if (pInterface)
                     {
                         ::uno_any_construct(
@@ -617,7 +617,7 @@ namespace
 #   define L21(v)  unldil(((unsigned long)(v) >> 11) & 0x1fffff) //Left 21 bits
 #   define R11(v)  (((unsigned long)(v) & 0x7FF) << 1) //Right 11 bits
 
-    unsigned char *codeSnippet(unsigned char* code, sal_Int32 functionIndex,
+    unsigned char *codeSnippet(unsigned char* code, sal_Int32 functionIndex, 
         sal_Int32 vtableOffset, bool bHasHiddenParam)
     {
         if (bHasHiddenParam)
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
index 36fe7968e19a..a49edffc61c1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx b/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx
index 895acf6b1883..f4ce93771bf7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,25 +49,25 @@ struct _Unwind_Exception
 } __attribute__((__aligned__));
 
 struct __cxa_exception
-{
+{ 
     ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
+    void (*exceptionDestructor)(void *); 
+    
     ::std::unexpected_handler unexpectedHandler;
     ::std::terminate_handler terminateHandler;
-
+    
     __cxa_exception *nextException;
-
+    
     int handlerCount;
-
+    
     int handlerSwitchValue;
     const unsigned char *actionRecord;
     const unsigned char *languageSpecificData;
     void *catchTemp;
     void *adjustedPtr;
-
+    
     _Unwind_Exception unwindHeader;
-};
+};    
 
 extern "C" void *__cxa_allocate_exception(
     std::size_t thrown_size ) throw();
@@ -92,7 +92,7 @@ void fillUnoException(
 }
 
 
-namespace hppa
+namespace hppa 
 {
     enum hppalimits { MAX_WORDS_IN_REGS = 4, MAX_GPR_REGS = 4, MAX_SSE_REGS = 4 };
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
index 6d7a5333f1e1..377d8fd27cfd 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@
 using namespace ::rtl;
 using namespace ::com::sun::star::uno;
 
-void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
+void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, 
     void * pRegisterReturn, typelib_TypeDescription *pReturnTypeDescr, bool bRegisterReturn,
     sal_uInt32 *pStack, sal_uInt32 nStack, sal_uInt32 *pGPR, double *pFPR);
 
@@ -139,7 +139,7 @@ namespace hppa
         {
             if (p->ppTypeRefs[i]->eTypeClass == typelib_TypeClass_STRUCT ||
                 p->ppTypeRefs[i]->eTypeClass == typelib_TypeClass_EXCEPTION)
-            {
+            { 
                 typelib_TypeDescription * t = 0;
                 TYPELIB_DANGER_GET(&t, p->ppTypeRefs[i]);
                 bool b = is_complex_struct(t);
@@ -177,7 +177,7 @@ namespace hppa
 
 
 namespace {
-//=======================================================================
+//======================================================================= 
 static void cpp_call(
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
     bridges::cpp_uno::shared::VtableSlot aVtableSlot,
@@ -198,7 +198,7 @@ static void cpp_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
     bool bOverFlow = false;
     bool bRegisterReturn = true;
@@ -243,7 +243,7 @@ static void cpp_call(
         {
             uno_copyAndConvertData( pCppArgs[nPos] = alloca(8), pUnoArgs[nPos],
                 pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
-
+            
             switch (pParamTypeDescr->eTypeClass)
             {
                 case typelib_TypeClass_HYPER:
@@ -300,7 +300,7 @@ static void cpp_call(
                 uno_copyAndConvertData(
                     pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
                     pUnoArgs[nPos], pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
-
+                
                 pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
                 // will be released at reconversion
                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -320,7 +320,7 @@ static void cpp_call(
         callVirtualMethod(
             pAdjustedThisPtr, aVtableSlot.index,
             pCppReturn, pReturnTypeDescr, bRegisterReturn,
-            pStackStart,
+            pStackStart, 
             (pStack - pStackStart), pGPR, pFPR);
 
         // NO exception occured...
@@ -331,7 +331,7 @@ static void cpp_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -348,7 +348,7 @@ static void cpp_call(
             }
             // destroy temp cpp param => cpp: every param was constructed
             uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return value
@@ -372,7 +372,7 @@ static void cpp_call(
             uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
         }
-
+        
         // return type
         if (pReturnTypeDescr)
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
@@ -402,12 +402,12 @@ void unoInterfaceProxyDispatch(
             sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
             OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
 #endif
-
+        
             VtableSlot aVtableSlot(
                 getVtableSlot(
                 reinterpret_cast<typelib_InterfaceAttributeTypeDescription const *>
                    (pMemberDescr)));
-
+        
             if (pReturn)
             {
                 // dependent dispatch
@@ -430,7 +430,7 @@ void unoInterfaceProxyDispatch(
                 OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
                 typelib_typedescriptionreference_new(
                     &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
                 // dependent dispatch
                 aVtableSlot.index += 1;
                 cpp_call(
@@ -438,10 +438,10 @@ void unoInterfaceProxyDispatch(
                     pReturnTypeRef,
                     1, &aParam,
                     pReturn, pArgs, ppException );
-
+            
                 typelib_typedescriptionreference_release( pReturnTypeRef );
             }
-
+        
             break;
         }
         case typelib_TypeClass_INTERFACE_METHOD:
@@ -478,7 +478,7 @@ void unoInterfaceProxyDispatch(
                         (*pThis->getBridge()->getUnoEnv()->getRegisteredInterface)(
                             pThis->getBridge()->getUnoEnv(),
                             (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                         if (pInterface)
                         {
                             ::uno_any_construct(
@@ -509,7 +509,7 @@ void unoInterfaceProxyDispatch(
             ::com::sun::star::uno::RuntimeException aExc(
                 OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
                 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
             Type const & rExcType = ::getCppuType( &aExc );
             // binary identical null reference
             ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
index 5a25c25c1ed8..dcd589b64bb0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,7 +52,7 @@ static typelib_TypeClass cpp2uno_call(
     bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
     const typelib_TypeDescription * pMemberTypeDescr,
     typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
-    sal_Int32 nParams, typelib_MethodParameter * pParams, long r8,
+    sal_Int32 nParams, typelib_MethodParameter * pParams, long r8, 
         void ** gpreg, void ** fpreg, void ** ovrflw,
     sal_Int64 * pRegisterReturn /* space for register return */ )
 {
@@ -60,9 +60,9 @@ static typelib_TypeClass cpp2uno_call(
     fprintf(stderr, "as far as cpp2uno_call\n");
 #endif
 
-    int ng = 0; //number of gpr registers used
+    int ng = 0; //number of gpr registers used 
     int nf = 0; //number of fpr regsiters used
-
+       
     // gpreg:  [ret *], this, [gpr params]
     // fpreg:  [fpr params]
     // ovrflw: [gpr or fpr params (properly aligned)]
@@ -71,10 +71,10 @@ static typelib_TypeClass cpp2uno_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     if (pReturnTypeRef)
         TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
+    
     void * pUnoReturn = 0;
     void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
+    
     if (pReturnTypeDescr)
     {
         if ( ia64::return_in_hidden_param( pReturnTypeRef ) ) // complex return via ptr passed as hidden parameter reg (pCppReturn)
@@ -82,15 +82,15 @@ static typelib_TypeClass cpp2uno_call(
             pCppReturn = *(void **)gpreg;
             gpreg++;
             ng++;
-
+            
             pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
                           ? alloca( pReturnTypeDescr->nSize )
                           : pCppReturn); // direct way
         }
-        else if ( ia64::return_via_r8_buffer( pReturnTypeRef ) ) // complex return via ptr passed in r8
+        else if ( ia64::return_via_r8_buffer( pReturnTypeRef ) ) // complex return via ptr passed in r8 
         {
             pCppReturn = (void *)r8;
-
+            
             pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
                           ? alloca( pReturnTypeDescr->nSize )
                           : pCppReturn); // direct way
@@ -100,7 +100,7 @@ static typelib_TypeClass cpp2uno_call(
             pUnoReturn = pRegisterReturn; // direct way for simple types
     }
     // pop this
-    gpreg++;
+    gpreg++; 
     ng++;
 
     // stack space
@@ -112,7 +112,7 @@ static typelib_TypeClass cpp2uno_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+    
     sal_Int32 nTempIndizes = 0;
     bool bOverFlowUsed = false;
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
@@ -126,7 +126,7 @@ static typelib_TypeClass cpp2uno_call(
 #endif
 
         //I think it is impossible to get UNO to pass structs as parameters by copy
-        if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
+        if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr )) 
         {
 #ifdef CMC_DEBUG
             fprintf(stderr, "simple\n");
@@ -175,7 +175,7 @@ static typelib_TypeClass cpp2uno_call(
                 case typelib_TypeClass_LONG:
                 case typelib_TypeClass_UNSIGNED_LONG:
                 default:
-                    if (ng < ia64::MAX_GPR_REGS)
+                    if (ng < ia64::MAX_GPR_REGS) 
                     {
                         pCppArgs[nPos] = pUnoArgs[nPos] = gpreg++;
                         ng++;
@@ -200,7 +200,7 @@ static typelib_TypeClass cpp2uno_call(
             void *pCppStack; //temporary stack pointer
 
             if (ng < ia64::MAX_GPR_REGS)
-            {
+            { 
                 pCppArgs[nPos] = pCppStack = *gpreg++;
                 ng++;
             }
@@ -241,14 +241,14 @@ static typelib_TypeClass cpp2uno_call(
 #ifdef CMC_DEBUG
     fprintf(stderr, "end of params\n");
 #endif
-
+    
     // ExceptionHolder
     uno_Any aUnoExc; // Any will be constructed by callee
     uno_Any * pUnoExc = &aUnoExc;
 
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
+    
     // in case an exception occured...
     if (pUnoExc)
     {
@@ -256,15 +256,15 @@ static typelib_TypeClass cpp2uno_call(
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn) // is in/inout => was constructed
                 uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
         }
         if (pReturnTypeDescr)
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
-        CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc, pThis->getBridge()->getUno2Cpp() );
+        
+        CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc, pThis->getBridge()->getUno2Cpp() ); 
                 // has to destruct the any
         // is here for dummy
         return typelib_TypeClass_VOID;
@@ -276,7 +276,7 @@ static typelib_TypeClass cpp2uno_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bOut) // inout/out
             {
                 // convert and assign
@@ -286,7 +286,7 @@ static typelib_TypeClass cpp2uno_call(
             }
             // destroy temp uno param
             uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return
@@ -317,7 +317,7 @@ static typelib_TypeClass cpp2uno_call(
 //==================================================================================================
 static typelib_TypeClass cpp_mediate(
     sal_uInt64 nOffsetAndIndex,
-        void ** gpreg, void ** fpreg, long sp, long r8,
+        void ** gpreg, void ** fpreg, long sp, long r8, 
     sal_Int64 * pRegisterReturn /* space for register return */ )
 {
     OSL_ENSURE( sizeof(sal_Int64)==sizeof(void *), "### unexpected!" );
@@ -326,7 +326,7 @@ static typelib_TypeClass cpp_mediate(
     sal_Int32 nFunctionIndex = (nOffsetAndIndex & 0xFFFFFFFF);
 
     void ** ovrflw = (void**)(sp);
-
+    
     // gpreg:  [ret *], this, [other gpr params]
     // fpreg:  [fpr params]
     // ovrflw: [gpr or fpr params (properly aligned)]
@@ -351,7 +351,7 @@ static typelib_TypeClass cpp_mediate(
 #ifdef CMC_DEBUG
     fprintf(stderr, "pThis is %p\n", pThis);
 #endif
-
+    
     pThis = static_cast< char * >(pThis) - nVtableOffset;
 
 #ifdef CMC_DEBUG
@@ -367,7 +367,7 @@ static typelib_TypeClass cpp_mediate(
 #ifdef CMC_DEBUG
     fprintf(stderr, "indexes are %d %d\n", nFunctionIndex, pTypeDescr->nMapFunctionIndexToMemberIndex);
 #endif
-
+    
     OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
@@ -375,7 +375,7 @@ static typelib_TypeClass cpp_mediate(
             rtl::OUString::createFromAscii("illegal vtable index!"),
             (XInterface *)pThis );
     }
-
+    
     // determine called method
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
     OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
@@ -406,9 +406,9 @@ static typelib_TypeClass cpp_mediate(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
+            
             eRet = cpp2uno_call(
                 pCppI, aMemberDescr.get(),
                 0, // indicates void return
@@ -439,9 +439,9 @@ static typelib_TypeClass cpp_mediate(
                 XInterface * pInterface = 0;
                 (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)(
                     pCppI->getBridge()->getCppEnv(),
-                    (void **)&pInterface, pCppI->getOid().pData,
+                    (void **)&pInterface, pCppI->getOid().pData, 
                     (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -573,7 +573,7 @@ namespace
 {
 const int codeSnippetSize = 40;
 
-bridges::cpp_uno::shared::VtableFactory::Slot codeSnippet( unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
+bridges::cpp_uno::shared::VtableFactory::Slot codeSnippet( unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, 
                               bool bHasHiddenParam )
 {
 #ifdef CMC_DEBUG
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
index c0de95532515..ea6961092f1a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx
index 359c9c720212..aabc2359bcb4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,25 +50,25 @@ struct _Unwind_Exception
 } __attribute__((__aligned__));
 
 struct __cxa_exception
-{
+{ 
     ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
+    void (*exceptionDestructor)(void *); 
+    
     ::std::unexpected_handler unexpectedHandler;
     ::std::terminate_handler terminateHandler;
-
+    
     __cxa_exception *nextException;
-
+    
     int handlerCount;
-
+    
     int handlerSwitchValue;
     const unsigned char *actionRecord;
     const unsigned char *languageSpecificData;
     void *catchTemp;
     void *adjustedPtr;
-
+    
     _Unwind_Exception unwindHeader;
-};
+};    
 
 extern "C" void *__cxa_allocate_exception(
     std::size_t thrown_size ) throw();
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
index 2be69d85ba90..8e1d706a8f42 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -88,7 +88,7 @@ void MapReturn(const ia64::RegReturn &rRet, double dret, typelib_TypeDescription
 }
 
 namespace ia64
-{
+{ 
     bool is_complex_struct(const typelib_TypeDescription * type)
     {
         const typelib_CompoundTypeDescription * p
@@ -97,7 +97,7 @@ namespace ia64
         {
             if (p->ppTypeRefs[i]->eTypeClass == typelib_TypeClass_STRUCT ||
                 p->ppTypeRefs[i]->eTypeClass == typelib_TypeClass_EXCEPTION)
-            {
+            { 
                 typelib_TypeDescription * t = 0;
                 TYPELIB_DANGER_GET(&t, p->ppTypeRefs[i]);
                 bool b = is_complex_struct(t);
@@ -161,7 +161,7 @@ namespace ia64
 namespace
 {
 //==================================================================================================
-static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
+static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, 
     void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
         sal_uInt64 *pStack, sal_uInt32 nStack,
         sal_uInt64 *pGPR, sal_uInt32 nGPR,
@@ -184,7 +184,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
                 for ( unsigned int i = 0; i < nGPR; ++i )
                         fprintf( stderr, "0x%lx, ", pGPR[i] );
                 fprintf( stderr, "\nFPR's (%d): ", nFPR );
-                for ( unsigned int i = 0; i < nFPR; ++i )
+                for ( unsigned int i = 0; i < nFPR; ++i ) 
                         fprintf( stderr, "0x%lx (%f), ", pFPR[i], pFPR[i] );
                 fprintf( stderr, "\nStack (%d): ", nStack );
                 for ( unsigned int i = 0; i < nStack; ++i )
@@ -243,7 +243,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
         register long r10 asm("r10"); ret.r10 = r10;
         register long r11 asm("r11"); ret.r11 = r11;
     }
-
+   
     MapReturn(ret, f8, pReturnTypeDescr, bSimpleReturn, (sal_uInt64*)pRegisterReturn);
 }
 
@@ -307,7 +307,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
         if (bOverFlow) \
                 *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
 
-//==================================================================================================
+//================================================================================================== 
 static void cpp_call(
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
     bridges::cpp_uno::shared::VtableSlot  aVtableSlot,
@@ -324,12 +324,12 @@ static void cpp_call(
 
     double pFPR[ia64::MAX_SSE_REGS];
     sal_uInt32 nFPR = 0;
-
+    
     // return
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
 
         bool bOverFlow = false;
@@ -370,19 +370,19 @@ static void cpp_call(
 #endif
     INSERT_INT64( &pAdjustedThisPtr, nGPR, pGPR, pStack, bOverFlow );
 
-        // Args
+        // Args 
         void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams );
     // indizes of values this have to be converted (interface conversion cpp<=>uno)
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
 
 #ifdef CMC_DEBUG
     fprintf(stderr, "n params is %d\n", nParams);
 #endif
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
@@ -393,10 +393,10 @@ static void cpp_call(
         fprintf(stderr, "param %d is %d %d %d\n", nPos, rParam.bOut, bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ),
             pParamTypeDescr->eTypeClass);
 #endif
-
+        
         if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
-//          uno_copyAndConvertData( pCppArgs[nPos] = alloca( 8 ), pUnoArgs[nPos], pParamTypeDescr,
+//			uno_copyAndConvertData( pCppArgs[nPos] = alloca( 8 ), pUnoArgs[nPos], pParamTypeDescr,
             uno_copyAndConvertData( pCppArgs[nPos] = pStack, pUnoArgs[nPos], pParamTypeDescr,
                                     pThis->getBridge()->getUno2Cpp() );
                 switch (pParamTypeDescr->eTypeClass)
@@ -450,7 +450,7 @@ static void cpp_call(
 
                         // no longer needed
                         TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-
+    
         }
         else // ptr to complex value | ref
         {
@@ -465,7 +465,7 @@ static void cpp_call(
                                 // cpp out is constructed mem, uno out is not!
                                 uno_constructData(
                                         pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-                                        pParamTypeDescr );
+                                        pParamTypeDescr ); 
                                 pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
                                 // will be released at reconversion
                                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -496,12 +496,12 @@ static void cpp_call(
                         INSERT_INT64( &(pCppArgs[nPos]), nGPR, pGPR, pStack, bOverFlow );
         }
     }
-
+  
     try
     {
                callVirtualMethod(
                         pAdjustedThisPtr, aVtableSlot.index,
-                        pCppReturn, pReturnTypeDescr, bSimpleReturn,
+                        pCppReturn, pReturnTypeDescr, bSimpleReturn, 
                         pStackStart, ( pStack - pStackStart ),
                         pGPR, nGPR,
                         pFPR, nFPR );
@@ -513,7 +513,7 @@ static void cpp_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -530,7 +530,7 @@ static void cpp_call(
             }
             // destroy temp cpp param => cpp: every param was constructed
             uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return value
@@ -544,9 +544,9 @@ static void cpp_call(
      catch (...)
      {
           // fill uno exception
-        fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions,
+        fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, 
                                   *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
-
+        
         // temporary params
         for ( ; nTempIndizes--; )
         {
@@ -570,9 +570,9 @@ void unoInterfaceProxyDispatch(
     void * pReturn, void * pArgs[], uno_Any ** ppException )
 {
     // is my surrogate
-        bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
+        bridges::cpp_uno::shared::UnoInterfaceProxy * pThis 
             = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy *> (pUnoI);
-
+    
     switch (pMemberDescr->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -599,14 +599,14 @@ void unoInterfaceProxyDispatch(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
 
             typelib_TypeDescriptionReference * pReturnTypeRef = 0;
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
                         aVtableSlot.index += 1; //get then set method
             cpp_call(
@@ -614,10 +614,10 @@ void unoInterfaceProxyDispatch(
                 pReturnTypeRef,
                 1, &aParam,
                 pReturn, pArgs, ppException );
-
+            
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -649,7 +649,7 @@ void unoInterfaceProxyDispatch(
                 (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
                     pThis->pBridge->getUnoEnv(),
                     (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -679,7 +679,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
index ccc31f10a407..355928ac8721 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,10 +62,10 @@ void cpp2uno_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     if (pReturnTypeRef)
         TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
+    
     void * pUnoReturn = 0;
     void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
+    
     if (pReturnTypeDescr)
     {
         if (x86::isSimpleReturnType( pReturnTypeDescr ))
@@ -76,7 +76,7 @@ void cpp2uno_call(
         {
             pCppReturn = *(void **)pCppStack;
             pCppStack += sizeof(void *);
-
+            
             pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType(
                               pReturnTypeDescr )
                           ? alloca( pReturnTypeDescr->nSize )
@@ -95,9 +95,9 @@ void cpp2uno_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
@@ -155,7 +155,7 @@ void cpp2uno_call(
         }
         pCppStack += sizeof(sal_Int32); // standard parameter length
     }
-
+    
     // ExceptionHolder
     uno_Any aUnoExc; // Any will be constructed by callee
     uno_Any * pUnoExc = &aUnoExc;
@@ -163,7 +163,7 @@ void cpp2uno_call(
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)(
         pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
+    
     // in case an exception occured...
     if (pUnoExc)
     {
@@ -171,14 +171,14 @@ void cpp2uno_call(
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn) // is in/inout => was constructed
                 uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
         }
         if (pReturnTypeDescr)
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
+        
         CPPU_CURRENT_NAMESPACE::raiseException(
             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
             // has to destruct the any
@@ -190,7 +190,7 @@ void cpp2uno_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bOut) // inout/out
             {
                 // convert and assign
@@ -200,7 +200,7 @@ void cpp2uno_call(
             }
             // destroy temp uno param
             uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return
@@ -230,7 +230,7 @@ extern "C" void cpp_vtable_call(
     void * pReturnValue )
 {
     OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-
+    
     // pCallStack: ret adr, [ret *], this, params
     void * pThis;
     if( nFunctionIndex & 0x80000000 )
@@ -246,9 +246,9 @@ extern "C" void cpp_vtable_call(
     bridges::cpp_uno::shared::CppInterfaceProxy * pCppI
         = bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(
             pThis);
-
+    
     typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
-
+    
     OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
@@ -256,13 +256,13 @@ extern "C" void cpp_vtable_call(
             rtl::OUString::createFromAscii("illegal vtable index!"),
             (XInterface *)pThis );
     }
-
+    
     // determine called method
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
     OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
 
     TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-
+    
     switch (aMemberDescr.get()->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -282,9 +282,9 @@ extern "C" void cpp_vtable_call(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
+            
             cpp2uno_call(
                 pCppI, aMemberDescr.get(),
                 0, // indicates void return
@@ -315,7 +315,7 @@ extern "C" void cpp_vtable_call(
                     pCppI->getBridge()->getCppEnv(),
                     (void **)&pInterface, pCppI->getOid().pData,
                     (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 69785be506f1..807448909389 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
index 8a3e136bfb7b..f7dc2f956896 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,25 +48,25 @@ struct _Unwind_Exception
 } __attribute__((__aligned__));
 
 struct __cxa_exception
-{
+{ 
     ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
+    void (*exceptionDestructor)(void *); 
+    
     ::std::unexpected_handler unexpectedHandler;
     ::std::terminate_handler terminateHandler;
-
+    
     __cxa_exception *nextException;
-
+    
     int handlerCount;
-
+    
     int handlerSwitchValue;
     const unsigned char *actionRecord;
     const unsigned char *languageSpecificData;
     void *catchTemp;
     void *adjustedPtr;
-
+    
     _Unwind_Exception unwindHeader;
-};
+};    
 
 extern "C" void *__cxa_allocate_exception(
     std::size_t thrown_size ) throw();
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
index 777d4b553db3..57e59d312560 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -77,11 +77,11 @@ void callVirtualMethod(
 {
     // parameter list is mixed list of * and values
     // reference parameters are pointers
-
+    
     OSL_ENSURE( pStackLongs && pAdjustedThisPtr, "### null ptr!" );
     OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
     OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-
+    
     // never called
     if (! pAdjustedThisPtr) CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something
 
@@ -169,7 +169,7 @@ void callVirtualMethod(
     }
 }
 
-//==================================================================================================
+//================================================================================================== 
 static void cpp_call(
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
     bridges::cpp_uno::shared::VtableSlot aVtableSlot,
@@ -178,18 +178,18 @@ static void cpp_call(
     void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
 {
       // max space for: [complex ret ptr], values|ptr ...
-      char * pCppStack      =
+      char * pCppStack		=
           (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-      char * pCppStackStart = pCppStack;
-
+      char * pCppStackStart	= pCppStack;
+    
     // return
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
     bool bSimpleReturn = true;
-
+    
     if (pReturnTypeDescr)
     {
         bSimpleReturn = x86::isSimpleReturnType(pReturnTypeDescr);
@@ -222,21 +222,21 @@ static void cpp_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
+        
         if (!rParam.bOut
             && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
             uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
                                     pThis->getBridge()->getUno2Cpp() );
-
+            
             switch (pParamTypeDescr->eTypeClass)
             {
             case typelib_TypeClass_HYPER:
@@ -270,7 +270,7 @@ static void cpp_call(
                     *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
                     pUnoArgs[nPos], pParamTypeDescr,
                     pThis->getBridge()->getUno2Cpp() );
-
+                
                 pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
                 // will be released at reconversion
                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -294,13 +294,13 @@ static void cpp_call(
             (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
         // NO exception occured...
         *ppUnoExc = 0;
-
+        
         // reconvert temporary params
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -317,7 +317,7 @@ static void cpp_call(
             }
             // destroy temp cpp param => cpp: every param was constructed
             uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return value
@@ -332,7 +332,7 @@ static void cpp_call(
      {
           // fill uno exception
         fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
-
+        
         // temporary params
         for ( ; nTempIndizes--; )
         {
@@ -390,7 +390,7 @@ void unoInterfaceProxyDispatch(
     // is my surrogate
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
         = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
-
+    
     switch (pMemberDescr->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -415,14 +415,14 @@ void unoInterfaceProxyDispatch(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
 
             typelib_TypeDescriptionReference * pReturnTypeRef = 0;
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
             aVtableSlot.index += 1; // get, then set method
             cpp_call(
@@ -430,10 +430,10 @@ void unoInterfaceProxyDispatch(
                 pReturnTypeRef,
                 1, &aParam,
                 pReturn, pArgs, ppException );
-
+            
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -464,7 +464,7 @@ void unoInterfaceProxyDispatch(
                 (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
                     pThis->pBridge->getUnoEnv(),
                     (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -494,7 +494,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
index 53542e23f97d..7673ad98f268 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@ namespace
     static typelib_TypeClass cpp2uno_call(
         bridges::cpp_uno::shared::CppInterfaceProxy* pThis,
         const typelib_TypeDescription * pMemberTypeDescr,
-        typelib_TypeDescriptionReference * pReturnTypeRef,
+        typelib_TypeDescriptionReference * pReturnTypeRef, 
         sal_Int32 nParams, typelib_MethodParameter * pParams,
         long r8, void ** pCallStack,
         sal_Int64 * pRegisterReturn /* space for register return */ )
@@ -72,11 +72,11 @@ namespace
         typelib_TypeDescription * pReturnTypeDescr = 0;
         if (pReturnTypeRef)
             TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
+        
         void * pUnoReturn = 0;
         // complex return ptr: if != 0 && != pUnoReturn, reconversion need
         void * pCppReturn = 0;
-
+        
         if (pReturnTypeDescr)
         {
             if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -111,9 +111,9 @@ namespace
         // cpp<=>uno)
         sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
         // type descriptions for reconversions
-        typelib_TypeDescription ** ppTempParamTypeDescr =
+        typelib_TypeDescription ** ppTempParamTypeDescr = 
             (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+        
         sal_Int32 nTempIndizes   = 0;
 
         for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
@@ -122,8 +122,8 @@ namespace
             typelib_TypeDescription * pParamTypeDescr = 0;
             TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
 
-            if (!rParam.bOut &&
-                bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
+            if (!rParam.bOut && 
+                bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr )) 
             {
                 switch (pParamTypeDescr->eTypeClass)
                 {
@@ -169,7 +169,7 @@ namespace
                 else if (bridges::cpp_uno::shared::relatesToInterfaceType(
                     pParamTypeDescr ))
                 {
-                   uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
+                   uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ), 
                         *(void **)pCppStack, pParamTypeDescr,
                         pThis->getBridge()->getCpp2Uno() );
                     pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
@@ -208,16 +208,16 @@ namespace
             for ( ; nTempIndizes--; )
             {
                 sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+                
                 if (pParams[nIndex].bIn) // is in/inout => was constructed
-                    uno_destructData( pUnoArgs[nIndex],
+                    uno_destructData( pUnoArgs[nIndex], 
                         ppTempParamTypeDescr[nTempIndizes], 0 );
                 TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
             }
             if (pReturnTypeDescr)
                 TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
-            CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc,
+            
+            CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc, 
                 pThis->getBridge()->getUno2Cpp() ); // has to destruct the any
             // is here for dummy
             return typelib_TypeClass_VOID;
@@ -230,18 +230,18 @@ namespace
                 sal_Int32 nIndex = pTempIndizes[nTempIndizes];
                 typelib_TypeDescription * pParamTypeDescr =
                     ppTempParamTypeDescr[nTempIndizes];
-
+                
                 if (pParams[nIndex].bOut) // inout/out
                 {
                     // convert and assign
                     uno_destructData( pCppArgs[nIndex], pParamTypeDescr,
                         cpp_release );
-                    uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex],
+                    uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], 
                         pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
                 }
                 // destroy temp uno param
                 uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+                
                 TYPELIB_DANGER_RELEASE( pParamTypeDescr );
             }
             // return
@@ -254,7 +254,7 @@ namespace
                     // destroy temp uno return
                     uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
                 }
-                // complex return ptr is set to return reg
+                // complex return ptr is set to return reg 
                 *(void **)pRegisterReturn = pCppReturn;
             }
             if (pReturnTypeDescr)
@@ -289,10 +289,10 @@ namespace
 
         pThis = static_cast< char * >(pThis) - nVtableOffset;
 
-        bridges::cpp_uno::shared::CppInterfaceProxy * pCppI =
+        bridges::cpp_uno::shared::CppInterfaceProxy * pCppI = 
             bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(
                 pThis);
-
+            
         typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
 
         OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex,
@@ -337,7 +337,7 @@ namespace
                     ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
                 aParam.bIn      = sal_True;
                 aParam.bOut     = sal_False;
-
+                
                 eRet = cpp2uno_call(
                     pCppI, aMemberDescr.get(),
                     0, // indicates void return
@@ -371,7 +371,7 @@ namespace
                         pCppI->getBridge()->getCppEnv(),
                         (void **)&pInterface, pCppI->getOid().pData,
                         (typelib_InterfaceTypeDescription *)pTD );
-
+                
                     if (pInterface)
                     {
                         ::uno_any_construct(
@@ -440,17 +440,17 @@ namespace
 
     //some m68k info : http://www2.biglobe.ne.jp/~inaba/trampolines.html
 
-    unsigned char *codeSnippet(unsigned char* code, sal_Int32 functionIndex,
+    unsigned char *codeSnippet(unsigned char* code, sal_Int32 functionIndex, 
         sal_Int32 vtableOffset)
     {
         unsigned char * p = code;
-        *(short *)&p[0] = 0x203C;       //movel functionIndex,d0
+        *(short *)&p[0] = 0x203C;		//movel functionIndex,d0
         *(long *)&p[2] = functionIndex;
-        *(short *)&p[6] = 0x223C;       //movel functionIndex,d1
+        *(short *)&p[6] = 0x223C;		//movel functionIndex,d1
         *(long *)&p[8] = vtableOffset;
-        *(short *)&p[12] = 0x4EF9;      //jmp cpp_vtable_call
+        *(short *)&p[12] = 0x4EF9;		//jmp cpp_vtable_call
         *(long *)&p[14] = (long)&cpp_vtable_call;
-        *(short *)&p[18] = 0x4E71;      //nop
+        *(short *)&p[18] = 0x4E71;		//nop
         return code + codeSnippetSize;
     }
 }
@@ -510,7 +510,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
             {
                 (s++)->fn = code + writetoexecdiff;
 
-                typelib_InterfaceMethodTypeDescription *pMethodTD =
+                typelib_InterfaceMethodTypeDescription *pMethodTD = 
                     reinterpret_cast<
                         typelib_InterfaceMethodTypeDescription * >(member);
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
index 36fe7968e19a..a49edffc61c1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx b/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx
index 4ec09c29ff0a..aa802babac96 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,25 +49,25 @@ struct _Unwind_Exception
 } __attribute__((__aligned__));
 
 struct __cxa_exception
-{
+{ 
     ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
+    void (*exceptionDestructor)(void *); 
+    
     ::std::unexpected_handler unexpectedHandler;
     ::std::terminate_handler terminateHandler;
-
+    
     __cxa_exception *nextException;
-
+    
     int handlerCount;
-
+    
     int handlerSwitchValue;
     const unsigned char *actionRecord;
     const unsigned char *languageSpecificData;
     void *catchTemp;
     void *adjustedPtr;
-
+    
     _Unwind_Exception unwindHeader;
-};
+};    
 
 extern "C" void *__cxa_allocate_exception(
     std::size_t thrown_size ) throw();
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx
index 97a9ab0187d9..9ea27cfb05fc 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -159,7 +159,7 @@ void callVirtualMethod(
         *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
 
 namespace {
-//=======================================================================
+//======================================================================= 
 static void cpp_call(
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
     bridges::cpp_uno::shared::VtableSlot aVtableSlot,
@@ -177,7 +177,7 @@ static void cpp_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
 
     if (pReturnTypeDescr)
@@ -212,7 +212,7 @@ static void cpp_call(
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
 
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
@@ -224,7 +224,7 @@ static void cpp_call(
 //            uno_copyAndConvertData( pCppArgs[nPos] = pStack, pUnoArgs[nPos],
             uno_copyAndConvertData( pCppArgs[nPos] = alloca(8), pUnoArgs[nPos],
                 pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
-
+            
             switch (pParamTypeDescr->eTypeClass)
             {
             case typelib_TypeClass_HYPER:
@@ -279,7 +279,7 @@ static void cpp_call(
                 uno_copyAndConvertData(
                     pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
                     pUnoArgs[nPos], pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
-
+                
                 pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
                 // will be released at reconversion
                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -299,7 +299,7 @@ static void cpp_call(
         callVirtualMethod(
             pAdjustedThisPtr, aVtableSlot.index,
             pCppReturn, pReturnTypeDescr->eTypeClass,
-            pStackStart,
+            pStackStart, 
             (pStack - pStackStart));
 
         // NO exception occured...
@@ -310,7 +310,7 @@ static void cpp_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -327,7 +327,7 @@ static void cpp_call(
             }
             // destroy temp cpp param => cpp: every param was constructed
             uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return value
@@ -351,7 +351,7 @@ static void cpp_call(
             uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
         }
-
+        
         // return type
         if (pReturnTypeDescr)
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
@@ -377,12 +377,12 @@ void unoInterfaceProxyDispatch(
         // determine vtable call index
         sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
         OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
-
+        
         VtableSlot aVtableSlot(
             getVtableSlot(
             reinterpret_cast<typelib_InterfaceAttributeTypeDescription const *>
               (pMemberDescr)));
-
+        
         if (pReturn)
         {
             // dependent dispatch
@@ -405,7 +405,7 @@ void unoInterfaceProxyDispatch(
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
             aVtableSlot.index += 1;
             cpp_call(
@@ -413,10 +413,10 @@ void unoInterfaceProxyDispatch(
                 pReturnTypeRef,
                 1, &aParam,
                 pReturn, pArgs, ppException );
-
+            
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -451,7 +451,7 @@ void unoInterfaceProxyDispatch(
                 (*pThis->getBridge()->getUnoEnv()->getRegisteredInterface)(
                     pThis->getBridge()->getUnoEnv(),
                     (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -481,7 +481,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
index b6fd1d461cfd..5b49ac892005 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -87,9 +87,9 @@ namespace
 #endif
 
     /* C++ has [ret *] or this as the first arguments, so no arguments will
-     * be passed in floating-point registers?
+     * be passed in floating-point registers? 
      */
-    //int int_seen = 0; // have we seen integer arguments?
+    //int int_seen = 0; // have we seen integer arguments? 
 
     void ** pCppStack; //temporary stack pointer
 
@@ -130,7 +130,7 @@ namespace
     }
 
     // pop this
-    gpreg++;
+    gpreg++; 
     nw++;
 
     // stack space
@@ -155,7 +155,7 @@ namespace
       typelib_TypeDescription * pParamTypeDescr = 0;
       TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
 
-      if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
+      if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr )) 
         // value
       {
 
@@ -171,7 +171,7 @@ namespace
               if (nw & 1) {
                 nw++;
                 gpreg++;
-              }
+              }  
 #ifdef BRDEBUG
     fprintf(stderr,"cpp2uno_call:gpreg=%p,%p\n",gpreg[0],gpreg[1]);
 #endif
@@ -253,7 +253,7 @@ namespace
 #ifdef BRDEBUG
     fprintf(stderr,"cpp2uno_call:ptr|ref\n");
 #endif
-        if (nw < 4) {
+        if (nw < 4) { 
           pCppArgs[nPos] = *(void **)gpreg;
           pCppStack = gpreg;
           nw++;
@@ -328,7 +328,7 @@ namespace
       if (pReturnTypeDescr)
         TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
 
-      CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc, pThis->getBridge()->getUno2Cpp() );
+      CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc, pThis->getBridge()->getUno2Cpp() ); 
       // has to destruct the any
       // is here for dummy
       return typelib_TypeClass_VOID;
@@ -465,8 +465,8 @@ namespace
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
               ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
 
             eRet = cpp2uno_call(
                 pCppI, aMemberDescr.get(),
@@ -507,7 +507,7 @@ namespace
                   XInterface * pInterface = 0;
                   (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)(
                                                                              pCppI->getBridge()->getCppEnv(),
-                                                                             (void **)&pInterface, pCppI->getOid().pData,
+                                                                             (void **)&pInterface, pCppI->getOid().pData, 
                                                                              (typelib_InterfaceTypeDescription *)pTD );
 
                   if (pInterface)
@@ -579,15 +579,15 @@ namespace
 
     memcpy( gpreg, pCallStack, 16);
 
-#ifdef BRDEBUG
-    fprintf(stderr,"in cpp_vtable_call nFunctionIndex is %d\n",nFunctionIndex);
+#ifdef BRDEBUG 
+    fprintf(stderr,"in cpp_vtable_call nFunctionIndex is %d\n",nFunctionIndex); 
     fprintf(stderr,"in cpp_vtable_call nVtableOffset is %d\n",vTableOffset);
     fprintf(stderr,"gp=%x,%x,%x,%x\n",gpreg[0],gpreg[1],gpreg[2],gpreg[3]);
 #endif
 
     //sal_Bool bComplex = nFunctionIndex & 0x80000000 ? sal_True : sal_False;
 
-    typelib_TypeClass aType =
+    typelib_TypeClass aType = 
       cpp_mediate( nFunctionIndex, vTableOffset, (void**)gpreg, (void**)fpreg, ovrflw, (sal_Int64*)nRegReturn );
 
     switch( aType )
@@ -639,7 +639,7 @@ namespace
 
   int const codeSnippetSize = 56;
 
-  unsigned char *  codeSnippet( unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
+  unsigned char *  codeSnippet( unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, 
       bool simpleRetType)
   {
 
@@ -683,7 +683,7 @@ namespace
        40:   00000000        nop
 
        be careful, we use the argument space reserved by the caller to
-       write down regs. This can avoid the need to make use of arbitary far away
+       write down regs. This can avoid the need to make use of arbitary far away 
        stack space or to allocate a function frame for this code snippet itself.
        Since only functions with variable arguments will overwrite the space,
        cpp_vtable_call should be safe.
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
index 78d72c0c733b..d99977e00a08 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,7 +52,7 @@ using namespace ::__cxxabiv1;
 
 namespace CPPU_CURRENT_NAMESPACE
 {
-
+    
 void dummy_can_throw_anything( char const * )
 {
 }
@@ -63,13 +63,13 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 #if defined BRIDGES_DEBUG
     char const * start = p;
 #endif
-
+    
     // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-
+    
     OUStringBuffer buf( 64 );
     OSL_ASSERT( 'N' == *p );
     ++p; // skip N
-
+    
     while ('E' != *p)
     {
         // read chars count
@@ -84,7 +84,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
         if ('E' != *p)
             buf.append( (sal_Unicode)'.' );
     }
-
+    
 #if defined BRIDGES_DEBUG
     OUString ret( buf.makeStringAndClear() );
     OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
@@ -99,17 +99,17 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 class RTTI
 {
     typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-
+    
     Mutex m_mutex;
     t_rtti_map m_rttis;
     t_rtti_map m_generatedRttis;
 
     void * m_hApp;
-
+    
 public:
     RTTI() SAL_THROW( () );
     ~RTTI() SAL_THROW( () );
-
+    
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
 };
 //__________________________________________________________________________________________________
@@ -127,9 +127,9 @@ RTTI::~RTTI() SAL_THROW( () )
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
 {
     type_info * rtti;
-
+    
     OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-
+    
     MutexGuard guard( m_mutex );
     t_rtti_map::const_iterator iRttiFind( m_rttis.find( unoName ) );
     if (iRttiFind == m_rttis.end())
@@ -147,7 +147,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
         }
         while (index >= 0);
         buf.append( 'E' );
-
+        
         OString symName( buf.makeStringAndClear() );
         rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
 
@@ -183,7 +183,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
                     // this class has no base class
                     rtti = new __class_type_info( strdup( rttiName ) );
                 }
-
+                
                 pair< t_rtti_map::iterator, bool > insertion(
                     m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
                 OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
@@ -198,7 +198,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     {
         rtti = iRttiFind->second;
     }
-
+    
     return rtti;
 }
 
@@ -242,10 +242,10 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
             Reference< XInterface >() );
     }
-
+    
     pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
     ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-
+    
     // destruct uno exception
     ::uno_any_destruct( pUnoExc, 0 );
     // avoiding locked counts
@@ -274,7 +274,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
             Reference< XInterface >() );
     }
     }
-
+    
     __cxa_throw( pCppExc, rtti, deleteException );
 }
 
@@ -294,7 +294,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 #endif
         return;
     }
-
+    
     typelib_TypeDescription * pExcTypeDescr = 0;
     OUString unoName( toUNOname( header->exceptionType->name() ) );
 #if defined BRIDGES_DEBUG
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx b/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx
index 4ec09c29ff0a..aa802babac96 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,25 +49,25 @@ struct _Unwind_Exception
 } __attribute__((__aligned__));
 
 struct __cxa_exception
-{
+{ 
     ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
+    void (*exceptionDestructor)(void *); 
+    
     ::std::unexpected_handler unexpectedHandler;
     ::std::terminate_handler terminateHandler;
-
+    
     __cxa_exception *nextException;
-
+    
     int handlerCount;
-
+    
     int handlerSwitchValue;
     const unsigned char *actionRecord;
     const unsigned char *languageSpecificData;
     void *catchTemp;
     void *adjustedPtr;
-
+    
     _Unwind_Exception unwindHeader;
-};
+};    
 
 extern "C" void *__cxa_allocate_exception(
     std::size_t thrown_size ) throw();
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
index 82d226f88ea6..ba139cd43f51 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -89,7 +89,7 @@ namespace
 
     /* p = sp - 512; new sp will be p - 16, but we don't change sp
      * at this time to avoid breaking ABI--not sure whether changing sp will break
-     * references to local variables. For the same reason, we use abosulte value.
+     * references to local variables. For the same reason, we use abosulte value. 
      */
     __asm__ __volatile__ (
         "addiu $2,$29,-512\n\t"
@@ -97,10 +97,10 @@ namespace
         :"=r"(p): : "$2","$29" );
 
 #ifdef BRDEBUG
-     if (nStackLongs * 4 > 512 )
-         fprintf(stderr,"too many arguments");
+     if (nStackLongs * 4 > 512 ) 
+         fprintf(stderr,"too many arguments"); 
 #endif
-
+    
     // now begin to load the C++ function arguments into storage
     nw = 0;
 
@@ -130,13 +130,13 @@ namespace
         case 'D':                   /* type is double */
           /* treat the same as long long */
         case 'H':                /* type is long long */
-          if (nw & 1) nw++;     /* note even elements gpr[] will map to
+          if (nw & 1) nw++; 	/* note even elements gpr[] will map to
                                odd registers*/
           if (nw < 4) {
             gpr[nw++] = *pStackLongs;
             gpr[nw++] = *(pStackLongs+1);
           } else {
-            if (((long) p) & 4)
+            if (((long) p) & 4)          
               p++;
             *p++ = *pStackLongs;
             *p++ = *(pStackLongs+1);
@@ -175,12 +175,12 @@ namespace
     }
 
     /* figure out the address of the function we need to invoke */
-    off = nVtableIndex;
+    off = nVtableIndex; 
     off = off * 4;                         // 4 bytes per slot
     mfunc = *((unsigned long **)pAdjustedThisPtr);    // get the address of the vtable
-    mfunc = (unsigned long *)((char *)mfunc + off); // get the address from the vtable entry at offset
+    mfunc = (unsigned long *)((char *)mfunc + off); // get the address from the vtable entry at offset 
     mfunc = *((unsigned long **)mfunc);                 // the function is stored at the address
-    ptr = (void (*)())mfunc;
+    ptr = (void (*)())mfunc;   
 
 #ifdef BRDEBUG
     fprintf(stderr,"calling function %p\n",mfunc);
@@ -189,10 +189,10 @@ namespace
     /* Set up the machine registers and invoke the function */
 
     __asm__ __volatile__ (
-        "lw $4, 0(%0)\n\t"
-        "lw $5, 4(%0)\n\t"
-        "lw $6, 8(%0)\n\t"
-        "lw $7, 12(%0)\n\t"
+        "lw	$4,	0(%0)\n\t"
+        "lw	$5,	4(%0)\n\t"
+        "lw	$6,	8(%0)\n\t"
+        "lw	$7,	12(%0)\n\t"
         : : "r" (gpr)
         : "$4", "$5", "$6", "$7"
         );
@@ -208,13 +208,13 @@ namespace
         "sw $3,%1 \n\t"
         : "=m" (iret), "=m" (iret2) : );
     register float fret asm("$f0");
-    register double dret asm("$f0");
+    register double	dret asm("$f0");
 
     switch( eReturnType )
     {
       case typelib_TypeClass_HYPER:
       case typelib_TypeClass_UNSIGNED_HYPER:
-          ((long*)pRegisterReturn)[1] = iret2;  // fall through
+          ((long*)pRegisterReturn)[1] = iret2;	// fall through
       case typelib_TypeClass_LONG:
       case typelib_TypeClass_UNSIGNED_LONG:
       case typelib_TypeClass_ENUM:
@@ -241,7 +241,7 @@ namespace
   }
 
 
-  //==================================================================================================
+  //================================================================================================== 
   static void cpp_call(
       bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
       bridges::cpp_uno::shared::VtableSlot  aVtableSlot,
@@ -250,9 +250,9 @@ namespace
       void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
   {
     // max space for: [complex ret ptr], values|ptr ...
-    char * pCppStack        =
+    char * pCppStack		=
       (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-    char * pCppStackStart   = pCppStack;
+    char * pCppStackStart	= pCppStack;
 
     // need to know parameter types for callVirtualMethod so generate a signature string
     char * pParamType = (char *) alloca(nParams+2);
@@ -278,7 +278,7 @@ namespace
       else
       {
         // complex return via ptr
-        pCppReturn = *(void **)pCppStack =
+        pCppReturn = *(void **)pCppStack = 
           (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
            ? alloca( pReturnTypeDescr->nSize ): pUnoReturn); // direct way
         *pPT++ = 'I'; //signify that a complex return type on stack
@@ -376,7 +376,7 @@ namespace
         {
           uno_copyAndConvertData(
               *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-              pUnoArgs[nPos], pParamTypeDescr,
+              pUnoArgs[nPos], pParamTypeDescr, 
               pThis->getBridge()->getUno2Cpp() );
 
           pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
@@ -445,7 +445,7 @@ namespace
     catch (...)
     {
       // fill uno exception
-      fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions,
+      fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, 
           *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
 
       // temporary params
@@ -507,8 +507,8 @@ void unoInterfaceProxyDispatch(
           typelib_MethodParameter aParam;
           aParam.pTypeRef =
             ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-          aParam.bIn        = sal_True;
-          aParam.bOut       = sal_False;
+          aParam.bIn		= sal_True;
+          aParam.bOut		= sal_False;
 
           typelib_TypeDescriptionReference * pReturnTypeRef = 0;
           OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
index 24354bfa45f8..282f40a66765 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,12 +56,12 @@ static typelib_TypeClass cpp2uno_call(
         void ** gpreg, void ** fpreg, void ** ovrflw,
     sal_Int64 * pRegisterReturn /* space for register return */ )
 {
-        int ng = 0; //number of gpr registers used
+        int ng = 0; //number of gpr registers used 
 #ifndef __NO_FPRS__
         int nf = 0; //number of fpr regsiters used
 #endif
         void ** pCppStack; //temporary stack pointer
-
+       
         // gpreg:  [ret *], this, [gpr params]
         // fpreg:  [fpr params]
         // ovrflw: [gpr or fpr params (properly aligned)]
@@ -70,10 +70,10 @@ static typelib_TypeClass cpp2uno_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     if (pReturnTypeRef)
         TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
+    
     void * pUnoReturn = 0;
     void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -85,14 +85,14 @@ static typelib_TypeClass cpp2uno_call(
             pCppReturn = *(void **)gpreg;
                         gpreg++;
                         ng++;
-
+            
             pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
                           ? alloca( pReturnTypeDescr->nSize )
                           : pCppReturn); // direct way
         }
     }
     // pop this
-        gpreg++;
+        gpreg++; 
         ng++;
 
     // stack space
@@ -104,16 +104,16 @@ static typelib_TypeClass cpp2uno_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
 
-        if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
+        if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr )) 
                 // value
         {
 
@@ -185,7 +185,7 @@ static typelib_TypeClass cpp2uno_call(
              if (ng & 1) {
                 ng++;
                 gpreg++;
-             }
+             }  
              if (ng < 8) {
                 pCppArgs[nPos] = gpreg;
                 pUnoArgs[nPos] = gpreg;
@@ -250,7 +250,7 @@ static typelib_TypeClass cpp2uno_call(
         else // ptr to complex value | ref
         {
 
-                if (ng < 8) {
+                if (ng < 8) { 
                   pCppArgs[nPos] = *(void **)gpreg;
                   pCppStack = gpreg;
                   ng++;
@@ -287,14 +287,14 @@ static typelib_TypeClass cpp2uno_call(
             }
         }
     }
-
+    
     // ExceptionHolder
     uno_Any aUnoExc; // Any will be constructed by callee
     uno_Any * pUnoExc = &aUnoExc;
 
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
+    
     // in case an exception occured...
     if (pUnoExc)
     {
@@ -302,15 +302,15 @@ static typelib_TypeClass cpp2uno_call(
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn) // is in/inout => was constructed
                 uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
         }
         if (pReturnTypeDescr)
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
-        CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc, pThis->getBridge()->getUno2Cpp() );
+        
+        CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc, pThis->getBridge()->getUno2Cpp() ); 
                 // has to destruct the any
         // is here for dummy
         return typelib_TypeClass_VOID;
@@ -322,7 +322,7 @@ static typelib_TypeClass cpp2uno_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bOut) // inout/out
             {
                 // convert and assign
@@ -332,7 +332,7 @@ static typelib_TypeClass cpp2uno_call(
             }
             // destroy temp uno param
             uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return
@@ -368,7 +368,7 @@ static typelib_TypeClass cpp_mediate(
     sal_Int64 * pRegisterReturn /* space for register return */ )
 {
     OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-
+    
     // gpreg:  [ret *], this, [other gpr params]
     // fpreg:  [fpr params]
     // ovrflw: [gpr or fpr params (properly aligned)]
@@ -383,14 +383,14 @@ static typelib_TypeClass cpp_mediate(
         {
         pThis = gpreg[0];
         }
-
+    
         pThis = static_cast< char * >(pThis) - nVtableOffset;
         bridges::cpp_uno::shared::CppInterfaceProxy * pCppI
           = bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(
             pThis);
 
     typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
-
+    
     OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
@@ -398,13 +398,13 @@ static typelib_TypeClass cpp_mediate(
             rtl::OUString::createFromAscii("illegal vtable index!"),
             (XInterface *)pThis );
     }
-
+    
     // determine called method
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
     OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
 
     TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-
+    
     typelib_TypeClass eRet;
     switch (aMemberDescr.get()->eTypeClass)
     {
@@ -425,9 +425,9 @@ static typelib_TypeClass cpp_mediate(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
+            
             eRet = cpp2uno_call(
                 pCppI, aMemberDescr.get(),
                 0, // indicates void return
@@ -458,9 +458,9 @@ static typelib_TypeClass cpp_mediate(
                 XInterface * pInterface = 0;
                 (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)(
                     pCppI->getBridge()->getCppEnv(),
-                    (void **)&pInterface, pCppI->getOid().pData,
+                    (void **)&pInterface, pCppI->getOid().pData, 
                     (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -519,15 +519,15 @@ static void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** gpreg
         // fprintf(stderr,"in cpp_vtable_call nVtableOffset is %x\n",nVtableOffset);
         // fflush(stderr);
 
-    typelib_TypeClass aType =
+    typelib_TypeClass aType = 
              cpp_mediate( nFunctionIndex, nVtableOffset, (void**)gpreg,
 #ifndef __NO_FPRS__
-                 (void**)fpreg,
+                 (void**)fpreg, 
 #else
                  NULL,
 #endif
                  ovrflw, (sal_Int64*)nRegReturn );
-
+    
     switch( aType )
     {
 
@@ -539,7 +539,7 @@ static void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** gpreg
                   __asm__( "lbz 3,%0\n\t" : :
                "m"(nRegReturn[0]) );
                   break;
-
+ 
                 case typelib_TypeClass_CHAR:
                 case typelib_TypeClass_SHORT:
                 case typelib_TypeClass_UNSIGNED_SHORT:
@@ -584,7 +584,7 @@ static void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** gpreg
 
 int const codeSnippetSize = 108;
 
-unsigned char *  codeSnippet( unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
+unsigned char *  codeSnippet( unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, 
                               bool simpleRetType)
 {
 
@@ -596,59 +596,59 @@ unsigned char *  codeSnippet( unsigned char * code, sal_Int32 functionIndex, sal
         functionIndex |= 0x80000000;
 
     unsigned long * p = (unsigned long *) code;
-
+    
     // OSL_ASSERT( sizeof (long) == 4 );
     OSL_ASSERT((((unsigned long)code) & 0x3) == 0 );  //aligned to 4 otherwise a mistake
 
     /* generate this code */
     // # so first save gpr 3 to gpr 10 (aligned to 4)
-    //  stw r3,-2048(r1)
-    //  stw r4,-2044(r1)
-    //  stw r5,-2040(r1)
-    //  stw r6,-2036(r1)
-    //  stw r7,-2032(r1)
-    //  stw r8,-2028(r1)
-    //  stw r9,-2024(r1)
-    //  stw r10,-2020(r1)
+    //	stw	r3,-2048(r1)
+    //	stw	r4,-2044(r1)
+    //	stw	r5,-2040(r1)
+    //	stw	r6,-2036(r1)
+    //	stw	r7,-2032(r1)
+    //	stw	r8,-2028(r1)
+    //	stw	r9,-2024(r1)
+    //	stw	r10,-2020(r1)
 
 
     // # next save fpr 1 to fpr 8 (aligned to 8)
     // if dedicated floating point registers are used
-    //  stfd    f1,-2016(r1)
-    //  stfd    f2,-2008(r1)
-    //  stfd    f3,-2000(r1)
-    //  stfd    f4,-1992(r1)
-    //  stfd    f5,-1984(r1)
-    //  stfd    f6,-1976(r1)
-    //  stfd    f7,-1968(r1)
-    //  stfd    f8,-1960(r1)
+    //	stfd	f1,-2016(r1)
+    //	stfd	f2,-2008(r1)
+    //	stfd	f3,-2000(r1)
+    //	stfd	f4,-1992(r1)
+    //	stfd	f5,-1984(r1)
+    //	stfd	f6,-1976(r1)
+    //	stfd	f7,-1968(r1)
+    //	stfd	f8,-1960(r1)
 
     // # now here is where cpp_vtable_call must go
-    //  lis r3,-8531
-    //  ori r3,r3,48879
-    //  mtctr   r3
+    //	lis	r3,-8531
+    //	ori	r3,r3,48879
+    //	mtctr	r3
 
     // # now load up the functionIndex
-    //  lis r3,-8531
-    //  ori r3,r3,48879
+    //	lis	r3,-8531
+    //	ori	r3,r3,48879
 
-    // # now load up the vtableOffset
-    //  lis r4,-8531
-    //  ori r4,r4,48879
+    // # now load up the vtableOffset 
+    //	lis	r4,-8531
+    //	ori	r4,r4,48879
 
     // #now load up the pointer to the saved gpr registers
-    //  addi    r5,r1,-2048
+    //	addi	r5,r1,-2048
 
     // #now load up the pointer to the saved fpr registers
-    //  addi    r6,r1,-2016
+    //	addi	r6,r1,-2016
     // if no dedicated floating point registers are used than we have NULL
     // pointer there
     //  li      r6, 0
     //
 
     // #now load up the pointer to the overflow call stack
-    //  addi    r7,r1,8
-    //  bctr
+    //	addi	r7,r1,8
+    //	bctr
 
       * p++ = 0x9061f800;
       * p++ = 0x9081f804;
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
index c0de95532515..ea6961092f1a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx
index 4ec09c29ff0a..aa802babac96 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,25 +49,25 @@ struct _Unwind_Exception
 } __attribute__((__aligned__));
 
 struct __cxa_exception
-{
+{ 
     ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
+    void (*exceptionDestructor)(void *); 
+    
     ::std::unexpected_handler unexpectedHandler;
     ::std::terminate_handler terminateHandler;
-
+    
     __cxa_exception *nextException;
-
+    
     int handlerCount;
-
+    
     int handlerSwitchValue;
     const unsigned char *actionRecord;
     const unsigned char *languageSpecificData;
     void *catchTemp;
     void *adjustedPtr;
-
+    
     _Unwind_Exception unwindHeader;
-};
+};    
 
 extern "C" void *__cxa_allocate_exception(
     std::size_t thrown_size ) throw();
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
index 0ebc44895a78..0c0ad60c5e64 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,7 +64,7 @@ static void callVirtualMethod(
   // reference parameters are pointers
 
   // the basic idea here is to use gpr[8] as a storage area for
-  // the future values of registers r3 to r10 needed for the call,
+  // the future values of registers r3 to r10 needed for the call, 
   // and similarly fpr[8] as a storage area for the future values
   // of floating point registers f1 to f8
 
@@ -91,14 +91,14 @@ static void callVirtualMethod(
      // Note: This keeps us from having to decode the signature twice and
      // prevents problems with later local variables.
 
-     // Note: could require up to  2*nStackLongs words of parameter stack area
-     // if the call has many float parameters (i.e. floats take up only 1
+     // Note: could require up to  2*nStackLongs words of parameter stack area 
+     // if the call has many float parameters (i.e. floats take up only 1 
      // word on the stack but double takes 2 words in parameter area in the
      // stack frame .
 
      // Update! floats on the outgoing parameter stack only take up 1 word
      // (stfs is used) which is not correct according to the ABI but we
-     // will match what the compiler does until this is figured out
+     // will match what the compiler does until this is figured out 
 
      // this grows the current stack to the appropriate size
      // and sets the outgoing stack pointer p to the right place
@@ -156,7 +156,7 @@ static void callVirtualMethod(
                gpr[n++] = *(pStackLongs+1);
 #endif
         } else {
-           if (((long) p) & 4)
+           if (((long) p) & 4)          
               p++;
                *p++ = *pStackLongs;       /* or on the parameter stack */
                *p++ = *(pStackLongs + 1);
@@ -169,7 +169,7 @@ static void callVirtualMethod(
         stack and that if passed in parameter stack to C, should be
         as double word.
 
-            Whoops: the abi is not actually followed by gcc, need to
+            Whoops: the abi is not actually followed by gcc, need to 
             store floats as a *single* word on outgoing parameter stack
             to match what gcc actually does
      */
@@ -182,7 +182,7 @@ static void callVirtualMethod(
 #endif
         } else {
 #if 0 /* if abi were followed */
-           if (((long) p) & 4)
+           if (((long) p) & 4)          
               p++;
            *((double *)p) = *((float *)pStackLongs);
                p += 2;
@@ -195,13 +195,13 @@ static void callVirtualMethod(
             break;
 
        case 'H':                /* type is long long */
-            if (n & 1) n++;     /* note even elements gpr[] will map to
+            if (n & 1) n++; 	/* note even elements gpr[] will map to
                                    odd registers*/
             if (n <= 6) {
                gpr[n++] = *pStackLongs;
                gpr[n++] = *(pStackLongs+1);
         } else {
-           if (((long) p) & 4)
+           if (((long) p) & 4)          
               p++;
                *p++ = *pStackLongs;
                *p++ = *(pStackLongs+1);
@@ -240,33 +240,33 @@ static void callVirtualMethod(
      }
 
      /* figure out the address of the function we need to invoke */
-     off = nVtableIndex;
+     off = nVtableIndex; 
      off = off * 4;                         // 4 bytes per slot
      mfunc = *((unsigned long **)pAdjustedThisPtr);    // get the address of the vtable
-     mfunc = (unsigned long *)((char *)mfunc + off); // get the address from the vtable entry at offset
+     mfunc = (unsigned long *)((char *)mfunc + off); // get the address from the vtable entry at offset 
      mfunc = *((unsigned long **)mfunc);                 // the function is stored at the address
-     ptr = (void (*)())mfunc;
+     ptr = (void (*)())mfunc;   
 
     /* Set up the machine registers and invoke the function */
 
     __asm__ __volatile__ (
-        "lwz    3,  0(%0)\n\t"
-        "lwz    4,  4(%0)\n\t"
-        "lwz    5,  8(%0)\n\t"
-        "lwz    6,  12(%0)\n\t"
-        "lwz    7,  16(%0)\n\t"
-        "lwz    8,  20(%0)\n\t"
-        "lwz    9,  24(%0)\n\t"
-        "lwz    10, 28(%0)\n\t"
+        "lwz	3,	0(%0)\n\t"
+        "lwz	4,	4(%0)\n\t"
+        "lwz	5,	8(%0)\n\t"
+        "lwz	6,	12(%0)\n\t"
+        "lwz	7,	16(%0)\n\t"
+        "lwz	8,	20(%0)\n\t"
+        "lwz	9,	24(%0)\n\t"
+        "lwz	10,	28(%0)\n\t"
 #ifndef __NO_FPRS__
-        "lfd    1,  0(%1)\n\t"
-        "lfd    2,  8(%1)\n\t"
-        "lfd    3,  16(%1)\n\t"
-        "lfd    4,  24(%1)\n\t"
-        "lfd    5,  32(%1)\n\t"
-        "lfd    6,  40(%1)\n\t"
-        "lfd    7,  48(%1)\n\t"
-        "lfd    8,  56(%1)\n\t"
+        "lfd	1,	0(%1)\n\t"
+        "lfd	2,	8(%1)\n\t"
+        "lfd	3,	16(%1)\n\t"
+        "lfd	4,	24(%1)\n\t"
+        "lfd	5,	32(%1)\n\t"
+        "lfd	6,	40(%1)\n\t"
+        "lfd	7,	48(%1)\n\t"
+        "lfd	8,	56(%1)\n\t"
             : : "r" (gpr), "r" (fpr)
 #else
             : : "r" (gpr)
@@ -328,7 +328,7 @@ static void callVirtualMethod(
 }
 
 
-//==================================================================================================
+//================================================================================================== 
 static void cpp_call(
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
     bridges::cpp_uno::shared::VtableSlot  aVtableSlot,
@@ -337,10 +337,10 @@ static void cpp_call(
     void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
 {
       // max space for: [complex ret ptr], values|ptr ...
-      char * pCppStack      =
+      char * pCppStack		=
           (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-      char * pCppStackStart = pCppStack;
-
+      char * pCppStackStart	= pCppStack;
+    
         // need to know parameter types for callVirtualMethod so generate a signature string
         char * pParamType = (char *) alloca(nParams+2);
         char * pPT = pParamType;
@@ -349,9 +349,9 @@ static void cpp_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     // OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -361,7 +361,7 @@ static void cpp_call(
         else
         {
             // complex return via ptr
-            pCppReturn = *(void **)pCppStack =
+            pCppReturn = *(void **)pCppStack = 
                               (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
                    ? alloca( pReturnTypeDescr->nSize ): pUnoReturn); // direct way
                         *pPT++ = 'I'; //signify that a complex return type on stack
@@ -382,20 +382,20 @@ static void cpp_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
+        
         if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
             uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
                                     pThis->getBridge()->getUno2Cpp() );
-
+            
             switch (pParamTypeDescr->eTypeClass)
             {
 
@@ -458,9 +458,9 @@ static void cpp_call(
             {
                 uno_copyAndConvertData(
                     *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-                    pUnoArgs[nPos], pParamTypeDescr,
+                    pUnoArgs[nPos], pParamTypeDescr, 
                                         pThis->getBridge()->getUno2Cpp() );
-
+                
                 pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
                 // will be released at reconversion
                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -476,7 +476,7 @@ static void cpp_call(
         }
         pCppStack += sizeof(sal_Int32); // standard parameter length
     }
-
+  
         // terminate the signature string
         *pPT++='X';
         *pPT=0;
@@ -490,13 +490,13 @@ static void cpp_call(
             (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
         // NO exception occured...
         *ppUnoExc = 0;
-
+        
         // reconvert temporary params
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -513,7 +513,7 @@ static void cpp_call(
             }
             // destroy temp cpp param => cpp: every param was constructed
             uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return value
@@ -527,9 +527,9 @@ static void cpp_call(
      catch (...)
      {
           // fill uno exception
-        fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions,
+        fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, 
                                   *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
-
+        
         // temporary params
         for ( ; nTempIndizes--; )
         {
@@ -553,9 +553,9 @@ void unoInterfaceProxyDispatch(
     void * pReturn, void * pArgs[], uno_Any ** ppException )
 {
     // is my surrogate
-        bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
+        bridges::cpp_uno::shared::UnoInterfaceProxy * pThis 
             = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy *> (pUnoI);
-
+    
     switch (pMemberDescr->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -582,14 +582,14 @@ void unoInterfaceProxyDispatch(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
 
             typelib_TypeDescriptionReference * pReturnTypeRef = 0;
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
                         aVtableSlot.index += 1; //get then set method
             cpp_call(
@@ -597,10 +597,10 @@ void unoInterfaceProxyDispatch(
                 pReturnTypeRef,
                 1, &aParam,
                 pReturn, pArgs, ppException );
-
+            
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -632,7 +632,7 @@ void unoInterfaceProxyDispatch(
                 (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
                     pThis->pBridge->getUnoEnv(),
                     (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -662,7 +662,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index f8e1fb9cd98a..661f54522224 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -61,9 +61,9 @@ static typelib_TypeClass cpp2uno_call(
     fprintf(stderr, "as far as cpp2uno_call\n");
 #endif
 
-    int ng = 0; //number of gpr registers used
+    int ng = 0; //number of gpr registers used 
     int nf = 0; //number of fpr regsiters used
-
+       
     // gpreg:  [ret *], this, [gpr params]
     // fpreg:  [fpr params]
     // ovrflw: [gpr or fpr params (properly aligned)]
@@ -72,10 +72,10 @@ static typelib_TypeClass cpp2uno_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     if (pReturnTypeRef)
         TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
+    
     void * pUnoReturn = 0;
     void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -87,14 +87,14 @@ static typelib_TypeClass cpp2uno_call(
             pCppReturn = *(void **)gpreg;
             gpreg++;
             ng++;
-
+            
             pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
                           ? alloca( pReturnTypeDescr->nSize )
                           : pCppReturn); // direct way
         }
     }
     // pop this
-    gpreg++;
+    gpreg++; 
     ng++;
 
     // stack space
@@ -106,7 +106,7 @@ static typelib_TypeClass cpp2uno_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+    
     sal_Int32 nTempIndizes = 0;
     bool bOverFlowUsed = false;
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
@@ -119,7 +119,7 @@ static typelib_TypeClass cpp2uno_call(
         fprintf(stderr, "arg %d of %d\n", nPos, nParams);
 #endif
 
-        if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
+        if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr )) 
         {
 #ifdef CMC_DEBUG
             fprintf(stderr, "simple\n");
@@ -194,7 +194,7 @@ static typelib_TypeClass cpp2uno_call(
                     if (bOverFlowUsed) ovrflw++;
                     break;
                 default:
-                    if (ng < ppc64::MAX_GPR_REGS)
+                    if (ng < ppc64::MAX_GPR_REGS) 
                     {
                         pCppArgs[nPos] = pUnoArgs[nPos] = gpreg++;
                         ng++;
@@ -219,7 +219,7 @@ static typelib_TypeClass cpp2uno_call(
             void *pCppStack; //temporary stack pointer
 
             if (ng < ppc64::MAX_GPR_REGS)
-            {
+            { 
                 pCppArgs[nPos] = pCppStack = *gpreg++;
                 ng++;
             }
@@ -260,14 +260,14 @@ static typelib_TypeClass cpp2uno_call(
 #ifdef CMC_DEBUG
     fprintf(stderr, "end of params\n");
 #endif
-
+    
     // ExceptionHolder
     uno_Any aUnoExc; // Any will be constructed by callee
     uno_Any * pUnoExc = &aUnoExc;
 
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
+    
     // in case an exception occured...
     if (pUnoExc)
     {
@@ -275,15 +275,15 @@ static typelib_TypeClass cpp2uno_call(
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn) // is in/inout => was constructed
                 uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
         }
         if (pReturnTypeDescr)
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
-        CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc, pThis->getBridge()->getUno2Cpp() );
+        
+        CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc, pThis->getBridge()->getUno2Cpp() ); 
                 // has to destruct the any
         // is here for dummy
         return typelib_TypeClass_VOID;
@@ -295,7 +295,7 @@ static typelib_TypeClass cpp2uno_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bOut) // inout/out
             {
                 // convert and assign
@@ -305,7 +305,7 @@ static typelib_TypeClass cpp2uno_call(
             }
             // destroy temp uno param
             uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return
@@ -346,7 +346,7 @@ static typelib_TypeClass cpp_mediate(
 
     long sf = *(long*)sp;
     void ** ovrflw = (void**)(sf + 112);
-
+    
     // gpreg:  [ret *], this, [other gpr params]
     // fpreg:  [fpr params]
     // ovrflw: [gpr or fpr params (properly aligned)]
@@ -371,7 +371,7 @@ static typelib_TypeClass cpp_mediate(
 #ifdef CMC_DEBUG
     fprintf(stderr, "pThis is %lx\n", pThis);
 #endif
-
+    
     pThis = static_cast< char * >(pThis) - nVtableOffset;
 
 #ifdef CMC_DEBUG
@@ -387,7 +387,7 @@ static typelib_TypeClass cpp_mediate(
 #ifdef CMC_DEBUG
     fprintf(stderr, "indexes are %d %d\n", nFunctionIndex, pTypeDescr->nMapFunctionIndexToMemberIndex);
 #endif
-
+    
     OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
@@ -395,7 +395,7 @@ static typelib_TypeClass cpp_mediate(
             rtl::OUString::createFromAscii("illegal vtable index!"),
             (XInterface *)pThis );
     }
-
+    
     // determine called method
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
     OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
@@ -405,7 +405,7 @@ static typelib_TypeClass cpp_mediate(
 #endif
 
     TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-
+    
     typelib_TypeClass eRet;
     switch (aMemberDescr.get()->eTypeClass)
     {
@@ -426,9 +426,9 @@ static typelib_TypeClass cpp_mediate(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
+            
             eRet = cpp2uno_call(
                 pCppI, aMemberDescr.get(),
                 0, // indicates void return
@@ -459,9 +459,9 @@ static typelib_TypeClass cpp_mediate(
                 XInterface * pInterface = 0;
                 (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)(
                     pCppI->getBridge()->getCppEnv(),
-                    (void **)&pInterface, pCppI->getOid().pData,
+                    (void **)&pInterface, pCppI->getOid().pData, 
                     (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -540,7 +540,7 @@ extern "C" void privateSnippetExecutor( ... )
         "stfd 11, 80(%1)\t\n"
         "stfd 12, 88(%1)\t\n"
         "stfd 13, 96(%1)\t\n"
-    : : "r" (gpreg), "r" (fpreg)
+    : : "r" (gpreg), "r" (fpreg) 
         : "r0", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",
           "fr1", "fr2", "fr3", "fr4", "fr5", "fr6", "fr7", "fr8", "fr9",
           "fr10", "fr11", "fr12", "fr13"
@@ -564,7 +564,7 @@ extern "C" void privateSnippetExecutor( ... )
         break;
         case typelib_TypeClass_BOOLEAN:
         case typelib_TypeClass_BYTE:
-            __asm__( "lbz 3,%0\n\t"
+            __asm__( "lbz 3,%0\n\t" 
                 : : "m" (nRegReturn[0]) );
             break;
         case typelib_TypeClass_CHAR:
@@ -586,15 +586,15 @@ extern "C" void privateSnippetExecutor( ... )
                 : : "m"(nRegReturn[0]) );
             break;
         case typelib_TypeClass_FLOAT:
-            __asm__( "lfs 1,%0\n\t"
+            __asm__( "lfs 1,%0\n\t" 
                 : : "m" (*((float*)nRegReturn)) );
             break;
         case typelib_TypeClass_DOUBLE:
-            __asm__( "lfd 1,%0\n\t"
+            __asm__( "lfd 1,%0\n\t" 
                 : : "m" (*((double*)nRegReturn)) );
             break;
         default:
-            __asm__( "ld 3,%0\n\t"
+            __asm__( "ld 3,%0\n\t" 
                 : : "m" (nRegReturn[0]) );
             break;
     }
@@ -602,7 +602,7 @@ extern "C" void privateSnippetExecutor( ... )
 
 const int codeSnippetSize = 24;
 
-unsigned char *  codeSnippet( unsigned char * code, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
+unsigned char *  codeSnippet( unsigned char * code, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, 
                               bool simpleRetType)
 {
 #ifdef CMC_DEBUG
@@ -619,7 +619,7 @@ unsigned char *  codeSnippet( unsigned char * code, sal_Int32 nFunctionIndex, sa
     memcpy(raw, (char*) privateSnippetExecutor, 16);
     raw[2] = (void*) nOffsetAndIndex;
 #ifdef CMC_DEBUG
-    fprintf(stderr, "in: offset/index is %x %x %d, %lx\n",
+    fprintf(stderr, "in: offset/index is %x %x %d, %lx\n", 
     nFunctionIndex, nVtableOffset, !simpleRetType, raw[2]);
 #endif
     return (code + codeSnippetSize);
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
index c0de95532515..ea6961092f1a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx
index 38ed48ee06c8..0ec8ec2666f4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,25 +49,25 @@ struct _Unwind_Exception
 } __attribute__((__aligned__));
 
 struct __cxa_exception
-{
+{ 
     ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
+    void (*exceptionDestructor)(void *); 
+    
     ::std::unexpected_handler unexpectedHandler;
     ::std::terminate_handler terminateHandler;
-
+    
     __cxa_exception *nextException;
-
+    
     int handlerCount;
-
+    
     int handlerSwitchValue;
     const unsigned char *actionRecord;
     const unsigned char *languageSpecificData;
     void *catchTemp;
     void *adjustedPtr;
-
+    
     _Unwind_Exception unwindHeader;
-};
+};    
 
 extern "C" void *__cxa_allocate_exception(
     std::size_t thrown_size ) throw();
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
index 04ceddab4c5f..23796ca1cbb4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -84,8 +84,8 @@ void MapReturn(long r3, double dret, typelib_TypeClass eTypeClass, void *pRegist
 namespace
 {
 //==================================================================================================
-static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
-    void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr,
+static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, 
+    void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, 
         sal_uInt64 *pStack, sal_uInt32 nStack,
         sal_uInt64 *pGPR, sal_uInt32 nGPR,
         double *pFPR, sal_uInt32 nFPR)
@@ -107,7 +107,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
                 for ( int i = 0; i < nGPR; ++i )
                         fprintf( stderr, "0x%lx, ", pGPR[i] );
                 fprintf( stderr, "\nFPR's (%d): ", nFPR );
-                for ( int i = 0; i < nFPR; ++i )
+                for ( int i = 0; i < nFPR; ++i ) 
                         fprintf( stderr, "0x%lx (%f), ", pFPR[i], pFPR[i] );
                 fprintf( stderr, "\nStack (%d): ", nStack );
                 for ( int i = 0; i < nStack; ++i )
@@ -238,7 +238,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
         if (bOverFlow) \
                 *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
 
-//==================================================================================================
+//================================================================================================== 
 static void cpp_call(
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
     bridges::cpp_uno::shared::VtableSlot  aVtableSlot,
@@ -255,12 +255,12 @@ static void cpp_call(
 
     double pFPR[ppc64::MAX_SSE_REGS];
     sal_uInt32 nFPR = 0;
-
+    
     // return
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
 
         bool bOverFlow = false;
@@ -295,19 +295,19 @@ static void cpp_call(
 #endif
     INSERT_INT64( &pAdjustedThisPtr, nGPR, pGPR, pStack, bOverFlow );
 
-        // Args
+        // Args 
         void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams );
     // indizes of values this have to be converted (interface conversion cpp<=>uno)
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
 
 #ifdef CMC_DEBUG
     fprintf(stderr, "n params is %d\n", nParams);
 #endif
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
@@ -318,10 +318,10 @@ static void cpp_call(
         fprintf(stderr, "param %d is %d %d %d\n", nPos, rParam.bOut, bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ),
             pParamTypeDescr->eTypeClass);
 #endif
-
+        
         if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
-//          uno_copyAndConvertData( pCppArgs[nPos] = alloca( 8 ), pUnoArgs[nPos], pParamTypeDescr,
+//			uno_copyAndConvertData( pCppArgs[nPos] = alloca( 8 ), pUnoArgs[nPos], pParamTypeDescr,
             uno_copyAndConvertData( pCppArgs[nPos] = pStack, pUnoArgs[nPos], pParamTypeDescr,
                                     pThis->getBridge()->getUno2Cpp() );
                 switch (pParamTypeDescr->eTypeClass)
@@ -360,7 +360,7 @@ static void cpp_call(
 
                         // no longer needed
                         TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-
+    
         }
         else // ptr to complex value | ref
         {
@@ -375,7 +375,7 @@ static void cpp_call(
                                 // cpp out is constructed mem, uno out is not!
                                 uno_constructData(
                                         pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
-                                        pParamTypeDescr );
+                                        pParamTypeDescr ); 
                                 pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
                                 // will be released at reconversion
                                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -406,24 +406,24 @@ static void cpp_call(
                         INSERT_INT64( &(pCppArgs[nPos]), nGPR, pGPR, pStack, bOverFlow );
         }
     }
-
+  
     try
     {
                callVirtualMethod(
                         pAdjustedThisPtr, aVtableSlot.index,
-                        pCppReturn, pReturnTypeDescr,
+                        pCppReturn, pReturnTypeDescr, 
                         pStackStart, ( pStack - pStackStart ),
                         pGPR, nGPR,
                         pFPR, nFPR );
         // NO exception occured...
         *ppUnoExc = 0;
-
+        
         // reconvert temporary params
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -440,7 +440,7 @@ static void cpp_call(
             }
             // destroy temp cpp param => cpp: every param was constructed
             uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return value
@@ -454,9 +454,9 @@ static void cpp_call(
      catch (...)
      {
           // fill uno exception
-        fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions,
+        fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, 
                                   *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
-
+        
         // temporary params
         for ( ; nTempIndizes--; )
         {
@@ -480,10 +480,10 @@ void unoInterfaceProxyDispatch(
     void * pReturn, void * pArgs[], uno_Any ** ppException )
 {
     // is my surrogate
-        bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
+        bridges::cpp_uno::shared::UnoInterfaceProxy * pThis 
             = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy *> (pUnoI);
     typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-
+    
     switch (pMemberDescr->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -510,14 +510,14 @@ void unoInterfaceProxyDispatch(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
 
             typelib_TypeDescriptionReference * pReturnTypeRef = 0;
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
                         aVtableSlot.index += 1; //get then set method
             cpp_call(
@@ -525,10 +525,10 @@ void unoInterfaceProxyDispatch(
                 pReturnTypeRef,
                 1, &aParam,
                 pReturn, pArgs, ppException );
-
+            
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -560,7 +560,7 @@ void unoInterfaceProxyDispatch(
                 (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
                     pThis->pBridge->getUnoEnv(),
                     (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -590,7 +590,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
index f259387a98bf..9e6e9bda3e55 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@
 
 using namespace ::com::sun::star::uno;
 
-namespace
+namespace 
 {
 
 static typelib_TypeClass cpp2uno_call(
@@ -55,10 +55,10 @@ static typelib_TypeClass cpp2uno_call(
         void ** gpreg, void ** fpreg, void ** ovrflw,
     sal_Int64 * pRegisterReturn /* space for register return */ )
 {
-        int ng = 0; //number of gpr registers used
+        int ng = 0; //number of gpr registers used 
         int nf = 0; //number of fpr regsiters used
         void ** pCppStack; //temporary stack pointer
-
+       
         // gpreg:  [ret *], this, [gpr params]
         // fpreg:  [fpr params]
         // ovrflw: [gpr or fpr params (properly aligned)]
@@ -67,10 +67,10 @@ static typelib_TypeClass cpp2uno_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     if (pReturnTypeRef)
         TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
+    
     void * pUnoReturn = 0;
     void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -82,14 +82,14 @@ static typelib_TypeClass cpp2uno_call(
             pCppReturn = *(void **)gpreg;
                         gpreg++;
                         ng++;
-
+            
             pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
                           ? alloca( pReturnTypeDescr->nSize )
                           : pCppReturn); // direct way
         }
     }
     // pop this
-        gpreg++;
+        gpreg++; 
         ng++;
 
     // stack space
@@ -101,9 +101,9 @@ static typelib_TypeClass cpp2uno_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
@@ -133,8 +133,8 @@ static typelib_TypeClass cpp2uno_call(
                 // fpreg are all double values so need to
                 // modify fpreg to be a single word float value
                 if (nf < 2) {
-//                 float tmp = (float) (*((double *)fpreg));
-//                 (*((float *) fpreg)) = tmp;
+//			       float tmp = (float) (*((double *)fpreg));
+//			       (*((float *) fpreg)) = tmp;
                    pCppArgs[nPos] = fpreg;
                    pUnoArgs[nPos] = fpreg;
                    nf++;
@@ -211,7 +211,7 @@ static typelib_TypeClass cpp2uno_call(
         else // ptr to complex value | ref
         {
 
-                if (ng < 5) {
+                if (ng < 5) { 
                   pCppArgs[nPos] = *(void **)gpreg;
                   pCppStack = gpreg;
                   ng++;
@@ -248,14 +248,14 @@ static typelib_TypeClass cpp2uno_call(
             }
         }
     }
-
+    
     // ExceptionHolder
     uno_Any aUnoExc; // Any will be constructed by callee
     uno_Any * pUnoExc = &aUnoExc;
 
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
+    
     // in case an exception occured...
     if (pUnoExc)
     {
@@ -263,14 +263,14 @@ static typelib_TypeClass cpp2uno_call(
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn) // is in/inout => was constructed
                 uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
         }
         if (pReturnTypeDescr)
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
+        
         CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc, pThis->getBridge()->getUno2Cpp() ); // has to destruct the any
         // is here for dummy
         return typelib_TypeClass_VOID;
@@ -282,7 +282,7 @@ static typelib_TypeClass cpp2uno_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bOut) // inout/out
             {
                 // convert and assign
@@ -292,7 +292,7 @@ static typelib_TypeClass cpp2uno_call(
             }
             // destroy temp uno param
             uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return
@@ -330,7 +330,7 @@ static typelib_TypeClass cpp_mediate(
 
     sal_Int16 nVtableOffset = (nOffsetAndIndex >> 16);
     sal_Int16 nFunctionIndex = (nOffsetAndIndex & 0xFFFF);
-
+    
     // gpreg:  [ret *], this, [other gpr params]
     // fpreg:  [fpr params]
     // ovrflw: [gpr or fpr params (properly aligned)]
@@ -348,14 +348,14 @@ static typelib_TypeClass cpp_mediate(
     }
 
     pThis = static_cast< char * >(pThis) - nVtableOffset;
-
+    
     bridges::cpp_uno::shared::CppInterfaceProxy * pCppI
         = bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(
             pThis);
 
     typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
 
-
+    
     OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
@@ -363,14 +363,14 @@ static typelib_TypeClass cpp_mediate(
             rtl::OUString::createFromAscii("illegal vtable index!"),
             (XInterface *)pCppI );
     }
-
+    
     // determine called method
     OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
     OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
 
     TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-
+    
     typelib_TypeClass eRet;
     switch (aMemberDescr.get()->eTypeClass)
     {
@@ -391,9 +391,9 @@ static typelib_TypeClass cpp_mediate(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
+            
             eRet = cpp2uno_call(
                 pCppI, aMemberDescr.get(),
                 0, // indicates void return
@@ -424,9 +424,9 @@ static typelib_TypeClass cpp_mediate(
                 XInterface * pInterface = 0;
                 (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)(
                     pCppI->getBridge()->getCppEnv(),
-                    (void **)&pInterface, pCppI->getOid().pData,
+                    (void **)&pInterface, pCppI->getOid().pData, 
                     (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -484,10 +484,10 @@ static void privateSnippetExecutor( sal_uInt32 nOffsetAndIndex, void** gpregptr,
 
     volatile long nRegReturn[2];
 
-    typelib_TypeClass aType =
-        cpp_mediate( nOffsetAndIndex, (void**)gpreg, (void**)fpreg, ovrflw,
+    typelib_TypeClass aType = 
+        cpp_mediate( nOffsetAndIndex, (void**)gpreg, (void**)fpreg, ovrflw, 
         (sal_Int64*)nRegReturn );
-
+    
     switch( aType )
     {
 
@@ -560,7 +560,7 @@ unsigned char* codeSnippet( unsigned char * code, sal_Int16 nFunctionIndex, sal_
      /* generate this code */
      // lr      %r0,%r13
      // bras    %r13,0x6
-     // .long   privateSnippetExecutor
+     // .long   privateSnippetExecutor 
      // .long   nOffsetAndIndex
      // stm     %r2,%r6,8(%r15)
      // std     %f0,64(%r15)
@@ -569,7 +569,7 @@ unsigned char* codeSnippet( unsigned char * code, sal_Int16 nFunctionIndex, sal_
      // l       %r2,4(%r13)
      // la      %r3,8(%r15)
      // la      %r4,64(%r15)
-     // la      %r5,96(%r15)
+     // la      %r5,96(%r15)   
      // l       %r1,0(%r13)
      // lr      %r13,%r0
      // br      %r1
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
index c0de95532515..ea6961092f1a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx b/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx
index 4ec09c29ff0a..aa802babac96 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,25 +49,25 @@ struct _Unwind_Exception
 } __attribute__((__aligned__));
 
 struct __cxa_exception
-{
+{ 
     ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
+    void (*exceptionDestructor)(void *); 
+    
     ::std::unexpected_handler unexpectedHandler;
     ::std::terminate_handler terminateHandler;
-
+    
     __cxa_exception *nextException;
-
+    
     int handlerCount;
-
+    
     int handlerSwitchValue;
     const unsigned char *actionRecord;
     const unsigned char *languageSpecificData;
     void *catchTemp;
     void *adjustedPtr;
-
+    
     _Unwind_Exception unwindHeader;
-};
+};    
 
 extern "C" void *__cxa_allocate_exception(
     std::size_t thrown_size ) throw();
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
index a87cc8e182c8..6c8dc7d9d3d5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -93,7 +93,7 @@ static void
 //invoke_copy_to_stack(sal_Int32 paramCount, sal_Int32 * pStackLongs, char * pPT, sal_Int32* d_ov, sal_Int32 overflow)
 invoke_copy_to_stack(sal_Int32 * pStackLongs, char * pPT, sal_Int32* d_ov, sal_Int32 overflow)
 {
-    sal_Int32 *d_gpr = d_ov + overflow;
+    sal_Int32 *d_gpr = d_ov + overflow; 
     sal_Int64 *d_fpr = (sal_Int64 *)(d_gpr + 5);
     sal_Int32 gpr = 0, fpr = 0;
     char c;
@@ -192,7 +192,7 @@ static void callVirtualMethod(
   // reference parameters are pointers
 
   // the basic idea here is to use gpr[5] as a storage area for
-  // the future values of registers r2 to r6 needed for the call,
+  // the future values of registers r2 to r6 needed for the call, 
   // and similarly fpr[2] as a storage area for the future values
   // of floating point registers f0 to f2
 
@@ -228,23 +228,23 @@ static void callVirtualMethod(
         "ld    0,116(7)\n\t"
         "ld    2,124(7)\n\t"
         "lm    2,6,96(7)\n\t"
-        :
+        : 
         : "r" (pStackLongs),
-          "r" (pPT),
+          "r" (pPT), 
           "r" (overflow),
           "a" (invoke_copy_to_stack),
           "a" (method),
           "X" (dummy)
         : "2", "3", "4", "5", "6", "7", "memory"
     );
-//  "basr  14,%8\n\t"
+//	"basr  14,%8\n\t"
 
     (*(void (*)())method)();
 
     __asm__ __volatile__
      (
-        "la    15,48(7)\n\t"
-
+        "la    15,48(7)\n\t" 
+ 
         "lr    %2,2\n\t"
         "lr    %3,3\n\t"
         "ler   %0,0\n\t"
@@ -257,7 +257,7 @@ static void callVirtualMethod(
     {
         case typelib_TypeClass_HYPER:
         case typelib_TypeClass_UNSIGNED_HYPER:
-//              ((long*)pRegisterReturn)[0] = iret;
+//		        ((long*)pRegisterReturn)[0] = iret;
             ((long*)pRegisterReturn)[1] = iret2;
         case typelib_TypeClass_LONG:
         case typelib_TypeClass_UNSIGNED_LONG:
@@ -283,7 +283,7 @@ static void callVirtualMethod(
 }
 
 
-//============================================================================
+//============================================================================ 
 static void cpp_call(
         bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
         bridges::cpp_uno::shared::VtableSlot  aVtableSlot,
@@ -292,10 +292,10 @@ static void cpp_call(
     void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
 {
       // max space for: [complex ret ptr], values|ptr ...
-      char * pCppStack      =
+      char * pCppStack		=
           (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-      char * pCppStackStart = pCppStack;
-
+      char * pCppStackStart	= pCppStack;
+    
         // need to know parameter types for callVirtualMethod so generate a signature string
         char * pParamType = (char *) alloca(nParams+2);
         char * pPT = pParamType;
@@ -304,9 +304,9 @@ static void cpp_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -337,15 +337,15 @@ static void cpp_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
+        
         if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
             uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
@@ -416,7 +416,7 @@ static void cpp_call(
                 uno_copyAndConvertData(
                     *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
                     pUnoArgs[nPos], pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
-
+                
                 pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
                 // will be released at reconversion
                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -432,7 +432,7 @@ static void cpp_call(
         }
         pCppStack += sizeof(sal_Int32); // standard parameter length
     }
-
+  
         // terminate the signature string
         *pPT++='X';
         *pPT=0;
@@ -446,13 +446,13 @@ static void cpp_call(
             (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
         // NO exception occured...
         *ppUnoExc = 0;
-
+        
         // reconvert temporary params
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -469,7 +469,7 @@ static void cpp_call(
             }
             // destroy temp cpp param => cpp: every param was constructed
             uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return value
@@ -483,10 +483,10 @@ static void cpp_call(
      catch (...)
      {
           // fill uno exception
-        fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions,
+        fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, 
             *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
 
-
+        
         // temporary params
         for ( ; nTempIndizes--; )
         {
@@ -511,13 +511,13 @@ void unoInterfaceProxyDispatch(
 #ifdef CMC_DEBUG
     fprintf(stderr, "unoInterfaceProxyDispatch\n");
 #endif
-
+    
 
     // is my surrogate
-        bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
+        bridges::cpp_uno::shared::UnoInterfaceProxy * pThis 
             = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy *> (pUnoI);
     typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-
+    
     switch (pMemberDescr->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -544,14 +544,14 @@ void unoInterfaceProxyDispatch(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
 
             typelib_TypeDescriptionReference * pReturnTypeRef = 0;
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
                         aVtableSlot.index += 1; //get then set method
             cpp_call(
@@ -559,10 +559,10 @@ void unoInterfaceProxyDispatch(
                 pReturnTypeRef,
                 1, &aParam,
                 pReturn, pArgs, ppException );
-
+            
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -594,7 +594,7 @@ void unoInterfaceProxyDispatch(
                 (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
                     pThis->pBridge->getUnoEnv(),
                     (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -624,7 +624,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
index b491f661bff9..39d9fe482fbe 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@
 
 using namespace ::com::sun::star::uno;
 
-namespace
+namespace 
 {
 static typelib_TypeClass cpp2uno_call(
     bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
@@ -56,9 +56,9 @@ static typelib_TypeClass cpp2uno_call(
 #ifdef CMC_DEBUG
     fprintf(stderr, "as far as cpp2uno_call\n");
 #endif
-    int ng = 0; //number of gpr registers used
+    int ng = 0; //number of gpr registers used 
     int nf = 0; //number of fpr regsiters used
-
+       
     // gpreg:  [ret *], this, [gpr params]
     // fpreg:  [fpr params]
     // ovrflw: [gpr or fpr params (properly aligned)]
@@ -67,10 +67,10 @@ static typelib_TypeClass cpp2uno_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     if (pReturnTypeRef)
         TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
+    
     void * pUnoReturn = 0;
     void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -82,14 +82,14 @@ static typelib_TypeClass cpp2uno_call(
             pCppReturn = *(void **)gpreg;
             gpreg++;
             ng++;
-
+            
             pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
                           ? alloca( pReturnTypeDescr->nSize )
                           : pCppReturn); // direct way
         }
     }
     // pop this
-    gpreg++;
+    gpreg++; 
     ng++;
 
     // stack space
@@ -101,7 +101,7 @@ static typelib_TypeClass cpp2uno_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
@@ -210,7 +210,7 @@ static typelib_TypeClass cpp2uno_call(
             void *pCppStack; //temporary stack pointer
 
             if (ng < s390x::MAX_GPR_REGS)
-            {
+            { 
                 pCppArgs[nPos] = pCppStack = *gpreg++;
                 ng++;
             }
@@ -250,14 +250,14 @@ static typelib_TypeClass cpp2uno_call(
 #ifdef CMC_DEBUG
     fprintf(stderr, "end of params\n");
 #endif
-
+    
     // ExceptionHolder
     uno_Any aUnoExc; // Any will be constructed by callee
     uno_Any * pUnoExc = &aUnoExc;
 
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
+    
     // in case an exception occured...
     if (pUnoExc)
     {
@@ -265,14 +265,14 @@ static typelib_TypeClass cpp2uno_call(
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn) // is in/inout => was constructed
                 uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
         }
         if (pReturnTypeDescr)
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
+        
         CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc, pThis->getBridge()->getUno2Cpp() ); // has to destruct the any
         // is here for dummy
         return typelib_TypeClass_VOID;
@@ -284,7 +284,7 @@ static typelib_TypeClass cpp2uno_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bOut) // inout/out
             {
                 // convert and assign
@@ -294,7 +294,7 @@ static typelib_TypeClass cpp2uno_call(
             }
             // destroy temp uno param
             uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return
@@ -351,7 +351,7 @@ static typelib_TypeClass cpp_mediate(
         }
 #endif
 
-
+    
     // gpreg:  [ret *], this, [other gpr params]
     // fpreg:  [fpr params]
     // ovrflw: [gpr or fpr params (properly aligned)]
@@ -369,14 +369,14 @@ static typelib_TypeClass cpp_mediate(
     }
 
     pThis = static_cast< char * >(pThis) - nVtableOffset;
-
+    
     bridges::cpp_uno::shared::CppInterfaceProxy * pCppI
         = bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(
             pThis);
 
     typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
 
-
+    
     OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
@@ -384,14 +384,14 @@ static typelib_TypeClass cpp_mediate(
             rtl::OUString::createFromAscii("illegal vtable index!"),
             (XInterface *)pCppI );
     }
-
+    
     // determine called method
     OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
     OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
 
     TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-
+    
     typelib_TypeClass eRet;
     switch (aMemberDescr.get()->eTypeClass)
     {
@@ -414,7 +414,7 @@ static typelib_TypeClass cpp_mediate(
                 ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
             aParam.bIn      = sal_True;
             aParam.bOut     = sal_False;
-
+            
             eRet = cpp2uno_call(
                 pCppI, aMemberDescr.get(),
                 0, // indicates void return
@@ -445,9 +445,9 @@ static typelib_TypeClass cpp_mediate(
                 XInterface * pInterface = 0;
                 (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)(
                     pCppI->getBridge()->getCppEnv(),
-                    (void **)&pInterface, pCppI->getOid().pData,
+                    (void **)&pInterface, pCppI->getOid().pData, 
                     (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -510,8 +510,8 @@ long privateSnippetExecutor(long r2, long r3, long r4, long r5, long r6, long fi
     fprintf(stderr, "before mediate with %lx\n",nOffsetAndIndex);
     fprintf(stderr, "doubles are %f %f %f %f\n", fpreg[0], fpreg[1], fpreg[2], fpreg[3]);
 #endif
-    typelib_TypeClass aType =
-        cpp_mediate( nOffsetAndIndex, (void**)gpreg, (void**)fpreg, (void**)sp,
+    typelib_TypeClass aType = 
+        cpp_mediate( nOffsetAndIndex, (void**)gpreg, (void**)fpreg, (void**)sp, 
             (sal_Int64*)nRegReturn );
 #ifdef CMC_DEBUG
     fprintf(stderr, "after mediate ret is %lx %ld\n", nRegReturn[0], nRegReturn[0]);
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
index c0de95532515..ea6961092f1a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx b/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx
index 69176377606b..1abf8cb08aa6 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,25 +49,25 @@ struct _Unwind_Exception
 } __attribute__((__aligned__));
 
 struct __cxa_exception
-{
+{ 
     ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
+    void (*exceptionDestructor)(void *); 
+    
     ::std::unexpected_handler unexpectedHandler;
     ::std::terminate_handler terminateHandler;
-
+    
     __cxa_exception *nextException;
-
+    
     int handlerCount;
-
+    
     int handlerSwitchValue;
     const unsigned char *actionRecord;
     const unsigned char *languageSpecificData;
     void *catchTemp;
     void *adjustedPtr;
-
+    
     _Unwind_Exception unwindHeader;
-};
+};    
 
 extern "C" void *__cxa_allocate_exception(
     std::size_t thrown_size ) throw();
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
index d3fec618c301..1e7421dcdc87 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -206,7 +206,7 @@ void callVirtualMethod(
 }
 
 
-//============================================================================
+//============================================================================ 
 static void cpp_call(
         bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
         bridges::cpp_uno::shared::VtableSlot  aVtableSlot,
@@ -223,12 +223,12 @@ static void cpp_call(
 
     double pFPR[s390x::MAX_SSE_REGS];
     sal_uInt32 nFPR = 0;
-
+    
     // return
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
 
     if (pReturnTypeDescr)
@@ -259,15 +259,15 @@ static void cpp_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
+        
         if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
             uno_copyAndConvertData( pCppArgs[nPos] = alloca( 8 ), pUnoArgs[nPos], pParamTypeDescr,
@@ -324,7 +324,7 @@ static void cpp_call(
                 uno_copyAndConvertData(
                     pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
                     pUnoArgs[nPos], pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
-
+                
                 pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
                 // will be released at reconversion
                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -338,7 +338,7 @@ static void cpp_call(
             INSERT_INT64( &(pCppArgs[nPos]), nGPR, pGPR, pStack );
         }
     }
-
+  
     try
     {
         callVirtualMethod(
@@ -349,13 +349,13 @@ static void cpp_call(
             pFPR, nFPR );
         // NO exception occured...
         *ppUnoExc = 0;
-
+        
         // reconvert temporary params
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -372,7 +372,7 @@ static void cpp_call(
             }
             // destroy temp cpp param => cpp: every param was constructed
             uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return value
@@ -386,10 +386,10 @@ static void cpp_call(
     catch (...)
     {
         // fill uno exception
-        fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions,
+        fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, 
             *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
 
-
+        
         // temporary params
         for ( ; nTempIndizes--; )
         {
@@ -414,12 +414,12 @@ void unoInterfaceProxyDispatch(
 #ifdef CMC_DEBUG
     fprintf(stderr, "unoInterfaceProxyDispatch\n");
 #endif
-
+    
 
     // is my surrogate
-    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
+    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis 
             = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy *> (pUnoI);
-
+    
     switch (pMemberDescr->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -453,7 +453,7 @@ void unoInterfaceProxyDispatch(
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
                         aVtableSlot.index += 1; //get then set method
             cpp_call(
@@ -461,10 +461,10 @@ void unoInterfaceProxyDispatch(
                 pReturnTypeRef,
                 1, &aParam,
                 pReturn, pArgs, ppException );
-
+            
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -496,7 +496,7 @@ void unoInterfaceProxyDispatch(
                 (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
                     pThis->pBridge->getUnoEnv(),
                     (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -526,7 +526,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
index 1546432e5980..25f62a08ef1b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,10 +57,10 @@ static typelib_TypeClass cpp2uno_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     if (pReturnTypeRef)
         TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
+    
     void * pUnoReturn = 0;
     void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -87,9 +87,9 @@ static typelib_TypeClass cpp2uno_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
@@ -156,14 +156,14 @@ static typelib_TypeClass cpp2uno_call(
         }
         pCppStack += sizeof(sal_Int32); // standard parameter length
     }
-
+    
     // ExceptionHolder
     uno_Any aUnoExc; // Any will be constructed by callee
     uno_Any * pUnoExc = &aUnoExc;
 
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)(pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
+    
     // in case an exception occured...
     if (pUnoExc)
     {
@@ -171,7 +171,7 @@ static typelib_TypeClass cpp2uno_call(
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn) // is in/inout => was constructed
                 uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
@@ -190,7 +190,7 @@ static typelib_TypeClass cpp2uno_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bOut) // inout/out
             {
                 // convert and assign
@@ -200,7 +200,7 @@ static typelib_TypeClass cpp2uno_call(
             }
             // destroy temp uno param
             uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return
@@ -230,9 +230,9 @@ static typelib_TypeClass cpp2uno_call(
 
 //==================================================================================================
 static typelib_TypeClass cpp_mediate(
-    sal_Int32   nFunctionIndex,
-    sal_Int32   nVtableOffset,
-    void ** pCallStack,
+    sal_Int32	nFunctionIndex,
+    sal_Int32	nVtableOffset,
+    void **	pCallStack,
     sal_Int64 * pRegisterReturn /* space for register return */ )
 {
     OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
@@ -259,7 +259,7 @@ static typelib_TypeClass cpp_mediate(
     {
         throw RuntimeException( rtl::OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
     }
-
+    
     // determine called method
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
     OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
@@ -291,9 +291,9 @@ static typelib_TypeClass cpp_mediate(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
+            
             eRet = cpp2uno_call(
                 pCppI, aMemberDescr.get(),
                 0, // indicates void return
@@ -325,7 +325,7 @@ static typelib_TypeClass cpp_mediate(
         (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)(
             pCppI->getBridge()->getCppEnv(),
             (void **)&pInterface, pCppI->getOid().pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -381,8 +381,8 @@ void * pRegReturn = &nRegReturn;
              "st %%i2, %2\n\t"
             : : "m"(nFunctionIndex), "m"(pCallStack), "m"(vTableOffset) );
 
-//  fprintf(stderr,"cpp_mediate nFunctionIndex=%x\n",nFunctionIndex);
-//  fflush(stderr);
+//	fprintf(stderr,"cpp_mediate nFunctionIndex=%x\n",nFunctionIndex);
+//	fflush(stderr);
 
     sal_Bool bComplex = nFunctionIndex & 0x80000000 ? sal_True : sal_False;
     typelib_TypeClass aType =
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
index 6e61196df98e..4556172651cf 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,7 +55,7 @@ using namespace ::__cxxabiv1;
 
 namespace CPPU_CURRENT_NAMESPACE
 {
-
+    
 void dummy_can_throw_anything( char const * )
 {
 }
@@ -66,13 +66,13 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 #if defined BRIDGES_DEBUG
     char const * start = p;
 #endif
-
+    
     // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-
+    
     OUStringBuffer buf( 64 );
     OSL_ASSERT( 'N' == *p );
     ++p; // skip N
-
+    
     while ('E' != *p)
     {
         // read chars count
@@ -87,7 +87,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
         if ('E' != *p)
             buf.append( (sal_Unicode)'.' );
     }
-
+    
 #if defined BRIDGES_DEBUG
     OUString ret( buf.makeStringAndClear() );
     OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
@@ -102,17 +102,17 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 class RTTI
 {
     typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-
+    
     Mutex m_mutex;
     t_rtti_map m_rttis;
     t_rtti_map m_generatedRttis;
 
     void * m_hApp;
-
+    
 public:
     RTTI() SAL_THROW( () );
     ~RTTI() SAL_THROW( () );
-
+    
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
 };
 //__________________________________________________________________________________________________
@@ -130,9 +130,9 @@ RTTI::~RTTI() SAL_THROW( () )
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
 {
     type_info * rtti;
-
+    
     OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-
+    
     MutexGuard guard( m_mutex );
     t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
     if (iFind == m_rttis.end())
@@ -150,7 +150,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
         }
         while (index >= 0);
         buf.append( 'E' );
-
+        
         OString symName( buf.makeStringAndClear() );
         rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
 
@@ -186,7 +186,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
                     // this class has no base class
                     rtti = new __class_type_info( strdup( rttiName ) );
                 }
-
+                
                 pair< t_rtti_map::iterator, bool > insertion(
                     m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
                 OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
@@ -201,7 +201,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     {
         rtti = iFind->second;
     }
-
+    
     return rtti;
 }
 
@@ -245,10 +245,10 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
             Reference< XInterface >() );
     }
-
+    
     pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
     ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-
+    
     // destruct uno exception
     ::uno_any_destruct( pUnoExc, 0 );
     // avoiding locked counts
@@ -277,7 +277,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
             Reference< XInterface >() );
     }
     }
-
+    
     __cxa_throw( pCppExc, rtti, deleteException );
 }
 
@@ -297,7 +297,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 #endif
         return;
     }
-
+    
     typelib_TypeDescription * pExcTypeDescr = 0;
     OUString unoName( toUNOname( header->exceptionType->name() ) );
 #if defined BRIDGES_DEBUG
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx b/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx
index 3526f19082cd..eb1cb12f53a9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,25 +43,25 @@ struct _Unwind_Exception
 } __attribute__((__aligned__));
 
 struct __cxa_exception
-{
+{ 
     ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
+    void (*exceptionDestructor)(void *); 
+    
     ::std::unexpected_handler unexpectedHandler;
     ::std::terminate_handler terminateHandler;
-
+    
     __cxa_exception *nextException;
-
+    
     int handlerCount;
-
+    
     int handlerSwitchValue;
     const unsigned char *actionRecord;
     const unsigned char *languageSpecificData;
     void *catchTemp;
     void *adjustedPtr;
-
+    
     _Unwind_Exception unwindHeader;
-};
+};    
 
 extern "C" void *__cxa_allocate_exception(
     std::size_t thrown_size ) throw();
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
index 0cf6d21c80e7..02f951a59381 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -107,7 +107,7 @@ void callVirtualMethod( void * pAdjustedThisPtr,
         "mov %%l1, %%l7\n\t"
 
         // increase our own stackframe if necessary
-        "mov %%sp, %%l3\n\t"        // save stack ptr for readjustment
+        "mov %%sp, %%l3\n\t"		// save stack ptr for readjustment
 
         "subcc %%i5, 7, %%l0\n\t"
         "ble .LmoveOn\n\t"
@@ -115,14 +115,14 @@ void callVirtualMethod( void * pAdjustedThisPtr,
 
         "sll %%l0, 2, %%l0\n\t"
         "add %%l0, 96, %%l0\n\t"
-        "mov %%sp, %%l1\n\t"        // old stack ptr
-        "sub %%sp, %%l0, %%l0\n\t"  // future stack ptr
-        "andcc %%l0, 7, %%g0\n\t"   // align stack to 8
+        "mov %%sp, %%l1\n\t"		// old stack ptr
+        "sub %%sp, %%l0, %%l0\n\t"	// future stack ptr
+        "andcc %%l0, 7, %%g0\n\t"	// align stack to 8
         "be .LisAligned\n\t"
         "nop\n\t"
         "sub %%l0, 4, %%l0\n"
     ".LisAligned:\n\t"
-        "mov %%l0, %%o5\n\t"            // save newly computed stack ptr
+        "mov %%l0, %%o5\n\t"			// save newly computed stack ptr
         "add %%g0, 16, %%o4\n"
 
         // now copy longs down to save register window
@@ -135,11 +135,11 @@ void callVirtualMethod( void * pAdjustedThisPtr,
         "subcc %%o4, 1, %%o4\n\t"
         "bne .LcopyDown\n\t"
 
-        "mov %%o5, %%sp\n\t"        // move new stack ptr (hopefully) atomically
+        "mov %%o5, %%sp\n\t"		// move new stack ptr (hopefully) atomically
         // while register window is valid in both spaces
         // (scheduling might hit in copyDown loop)
 
-        "sub %%i5, 7, %%l0\n\t"     // copy parameters past the sixth to stack
+        "sub %%i5, 7, %%l0\n\t"		// copy parameters past the sixth to stack
         "add %%i4, 28, %%l1\n\t"
         "add %%sp, 92, %%l2\n"
     ".LcopyLong:\n\t"
@@ -152,10 +152,10 @@ void callVirtualMethod( void * pAdjustedThisPtr,
         "nop\n"
 
     ".LmoveOn:\n\t"
-        "mov %%i5, %%l0\n\t"        // prepare out registers
+        "mov %%i5, %%l0\n\t"		// prepare out registers
         "mov %%i4, %%l1\n\t"
 
-        "ld [%%l1], %%o0\n\t"       // prepare complex return ptr
+        "ld [%%l1], %%o0\n\t"		// prepare complex return ptr
         "st %%o0, [%%sp+64]\n\t"
         "sub %%l0, 1, %%l0\n\t"
         "add %%l1, 4, %%l1\n\t"
@@ -193,20 +193,20 @@ void callVirtualMethod( void * pAdjustedThisPtr,
         "ld [%%l1], %%o5\n"
 
     ".LdoCall:\n\t"
-        "ld [%%i0], %%l0\n\t"       // get vtable ptr
+        "ld [%%i0], %%l0\n\t"		// get vtable ptr
 
 "sll %%i1, 2, %%l6\n\t"
 //        "add %%l6, 8, %%l6\n\t"
         "add %%l6, %%l0, %%l0\n\t"
-//      // vtable has 8byte wide entries,
-//      // upper half contains 2 half words, of which the first
-//      // is the this ptr patch !
-//      // first entry is (or __tf)
+// 		// vtable has 8byte wide entries,
+// 		// upper half contains 2 half words, of which the first
+// 		// is the this ptr patch !
+// 		// first entry is (or __tf)
 
-//      "ldsh [%%l0], %%l6\n\t"     // load this ptr patch
-//      "add %%l6, %%o0, %%o0\n\t"  // patch this ptr
+// 		"ldsh [%%l0], %%l6\n\t"		// load this ptr patch
+// 		"add %%l6, %%o0, %%o0\n\t"	// patch this ptr
 
-//      "add %%l0, 4, %%l0\n\t"     // get virtual function ptr
+// 		"add %%l0, 4, %%l0\n\t"		// get virtual function ptr
         "ld [%%l0], %%l0\n\t"
 
         "ld [%%i4], %%l2\n\t"
@@ -223,8 +223,8 @@ void callVirtualMethod( void * pAdjustedThisPtr,
         "unimp\n"
 
     ".LcallReturned:\n\t"
-        "mov %%l3, %%sp\n\t"        // readjust stack so that our locals are where they belong
-        "st %%o0, %0\n\t"           // save possible return registers into our locals
+        "mov %%l3, %%sp\n\t"		// readjust stack so that our locals are where they belong
+        "st %%o0, %0\n\t"			// save possible return registers into our locals
         "st %%o1, %1\n\t"
         "std %%f0, %2\n\t"
         "st %%f0, %3\n\t"
@@ -289,17 +289,17 @@ static void cpp_call(
     void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
 {
       // max space for: complex ret ptr, this, values|ptr ...
-      char * pCppStack  =
+      char * pCppStack	=
           (char *)alloca( (nParams+2) * sizeof(sal_Int64) );
-      char * pCppStackStart = pCppStack;
-
+      char * pCppStackStart	= pCppStack;
+    
     // return
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -330,9 +330,9 @@ static void cpp_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
@@ -341,7 +341,7 @@ static void cpp_call(
         if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
             pCppArgs[ nPos ] = CPPU_CURRENT_NAMESPACE::adjustPointer(pCppStack, pParamTypeDescr );
-
+            
             switch (pParamTypeDescr->eTypeClass)
             {
             case typelib_TypeClass_HYPER:
@@ -383,7 +383,7 @@ static void cpp_call(
                     *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
                                     pUnoArgs[nPos], pParamTypeDescr,
                     pThis->getBridge()->getUno2Cpp() );
-
+                
                 pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
                 // will be released at reconversion
                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -402,7 +402,7 @@ static void cpp_call(
     {
         int nStackLongs = (pCppStack - pCppStackStart)/sizeof(sal_Int32);
         OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-
+        
         if( nStackLongs & 1 )
             // stack has to be 8 byte aligned
             nStackLongs++;
@@ -421,7 +421,7 @@ static void cpp_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -438,7 +438,7 @@ static void cpp_call(
             }
             // destroy temp cpp param => cpp: every param was constructed
             uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return value
@@ -452,7 +452,7 @@ static void cpp_call(
      catch( ... )
      {
          // get exception
-           fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions,
+           fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, 
                                 *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
 
         // temporary params
@@ -481,12 +481,12 @@ void unoInterfaceProxyDispatch(
     OString cstr( OUStringToOString( pMemberDescr->pTypeName, RTL_TEXTENCODING_ASCII_US ) );
     fprintf( stderr, "received dispatch( %s )\n", cstr.getStr() );
 #endif
-
+    
     // is my surrogate
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
        = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
-//  typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-
+//	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
+    
     switch (pMemberDescr->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -511,14 +511,14 @@ void unoInterfaceProxyDispatch(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
 
             typelib_TypeDescriptionReference * pReturnTypeRef = 0;
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
             aVtableSlot.index += 1; // get, then set method
             cpp_call(
@@ -529,7 +529,7 @@ void unoInterfaceProxyDispatch(
 
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -560,7 +560,7 @@ void unoInterfaceProxyDispatch(
          (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
            pThis->pBridge->getUnoEnv(),
                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -590,7 +590,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
index e62f71d2c32a..57e135933b79 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,8 +38,8 @@
 
 /* -----------------------------------------------------------------------
    ffi.c - Copyright (c) 2002  Bo Thorsen <bo@suse.de>
-
-   x86-64 Foreign Function Interface
+   
+   x86-64 Foreign Function Interface 
 
    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this software and associated documentation files (the
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
index c9f71f18078b..b37a9daa5fa3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,7 +48,7 @@ const sal_uInt32 MAX_SSE_REGS = 8;
 
  Examine the argument and return set number of register required in each
  class.
-
+ 
  Return false iff parameter should be passed in memory.
 */
 bool examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int &nUsedGPR, int &nUsedSSE );
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index 512b7d1f3f34..a208c2f10786 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -77,22 +77,22 @@ static typelib_TypeClass cpp2uno_call(
 {
     unsigned int nr_gpr = 0; //number of gpr registers used
     unsigned int nr_fpr = 0; //number of fpr registers used
-
+       
     // return
     typelib_TypeDescription * pReturnTypeDescr = 0;
     if (pReturnTypeRef)
         TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
+    
     void * pUnoReturn = 0;
     void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
+    
     if ( pReturnTypeDescr )
     {
         if ( x86_64::return_in_hidden_param( pReturnTypeRef ) )
         {
             pCppReturn = *gpreg++;
             nr_gpr++;
-
+            
             pUnoReturn = ( bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
                            ? alloca( pReturnTypeDescr->nSize )
                            : pCppReturn ); // direct way
@@ -102,7 +102,7 @@ static typelib_TypeClass cpp2uno_call(
     }
 
     // pop this
-    gpreg++;
+    gpreg++; 
     nr_gpr++;
 
     // stack space
@@ -113,7 +113,7 @@ static typelib_TypeClass cpp2uno_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+    
     sal_Int32 nTempIndizes = 0;
 
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
@@ -159,7 +159,7 @@ static typelib_TypeClass cpp2uno_call(
 
             void *pCppStack;
             if ( nr_gpr < x86_64::MAX_GPR_REGS )
-            {
+            { 
                 pCppArgs[nPos] = pCppStack = *gpreg++;
                 nr_gpr++;
             }
@@ -191,14 +191,14 @@ static typelib_TypeClass cpp2uno_call(
             }
         }
     }
-
+    
     // ExceptionHolder
     uno_Any aUnoExc; // Any will be constructed by callee
     uno_Any * pUnoExc = &aUnoExc;
 
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
+    
     // in case an exception occured...
     if ( pUnoExc )
     {
@@ -206,14 +206,14 @@ static typelib_TypeClass cpp2uno_call(
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn) // is in/inout => was constructed
                 uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
         }
         if (pReturnTypeDescr)
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
+        
         CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc, pThis->getBridge()->getUno2Cpp() ); // has to destruct the any
         // is here for dummy
         return typelib_TypeClass_VOID;
@@ -225,7 +225,7 @@ static typelib_TypeClass cpp2uno_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if ( pParams[nIndex].bOut ) // inout/out
             {
                 // convert and assign
@@ -235,7 +235,7 @@ static typelib_TypeClass cpp2uno_call(
             }
             // destroy temp uno param
             uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return
@@ -307,7 +307,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
     {
         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
         {
-            typelib_TypeDescriptionReference *pAttrTypeRef =
+            typelib_TypeDescriptionReference *pAttrTypeRef = 
                 reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>( aMemberDescr.get() )->pAttributeTypeRef;
 
             if ( pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex )
@@ -322,8 +322,8 @@ extern "C" typelib_TypeClass cpp_vtable_call(
                 // is SET method
                 typelib_MethodParameter aParam;
                 aParam.pTypeRef = pAttrTypeRef;
-                aParam.bIn      = sal_True;
-                aParam.bOut     = sal_False;
+                aParam.bIn		= sal_True;
+                aParam.bOut		= sal_False;
 
                 eRet = cpp2uno_call( pCppI, aMemberDescr.get(),
                         0, // indicates void return
@@ -501,7 +501,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
         {
             typelib_InterfaceMethodTypeDescription *pMethodTD =
                 reinterpret_cast<typelib_InterfaceMethodTypeDescription *>( pTD );
-
+            
             (s++)->fn = code + writetoexecdiff;
             code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
                                 x86_64::return_in_hidden_param( pMethodTD->pReturnTypeRef ) );
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index 759f28764fa7..dd41ad1bdbd7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@ using namespace ::__cxxabiv1;
 
 namespace CPPU_CURRENT_NAMESPACE
 {
-
+    
 void dummy_can_throw_anything( char const * )
 {
 }
@@ -68,13 +68,13 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 #if OSL_DEBUG_LEVEL > 1
     char const * start = p;
 #endif
-
+    
     // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-
+    
     OUStringBuffer buf( 64 );
     OSL_ASSERT( 'N' == *p );
     ++p; // skip N
-
+    
     while ('E' != *p)
     {
         // read chars count
@@ -89,7 +89,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
         if ('E' != *p)
             buf.append( (sal_Unicode)'.' );
     }
-
+    
 #if OSL_DEBUG_LEVEL > 1
     OUString ret( buf.makeStringAndClear() );
     OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
@@ -104,17 +104,17 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 class RTTI
 {
     typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-
+    
     Mutex m_mutex;
     t_rtti_map m_rttis;
     t_rtti_map m_generatedRttis;
 
     void * m_hApp;
-
+    
 public:
     RTTI() SAL_THROW( () );
     ~RTTI() SAL_THROW( () );
-
+    
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
 };
 //__________________________________________________________________________________________________
@@ -136,9 +136,9 @@ RTTI::~RTTI() SAL_THROW( () )
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
 {
     type_info * rtti;
-
+    
     OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-
+    
     MutexGuard guard( m_mutex );
     t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
     if (iFind == m_rttis.end())
@@ -156,7 +156,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
         }
         while (index >= 0);
         buf.append( 'E' );
-
+        
         OString symName( buf.makeStringAndClear() );
 #if defined(FREEBSD) && __FreeBSD_version < 702104 /* #i22253# */
         rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
@@ -196,7 +196,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
                     // this class has no base class
                     rtti = new __class_type_info( strdup( rttiName ) );
                 }
-
+                
                 pair< t_rtti_map::iterator, bool > insertion(
                     m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
                 OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
@@ -211,7 +211,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     {
         rtti = iFind->second;
     }
-
+    
     return rtti;
 }
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
index da2367ad172b..e4a6b379a840 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,25 +48,25 @@ struct _Unwind_Exception
 } __attribute__((__aligned__));
 
 struct __cxa_exception
-{
+{ 
     ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
+    void (*exceptionDestructor)(void *); 
+    
     ::std::unexpected_handler unexpectedHandler;
     ::std::terminate_handler terminateHandler;
-
+    
     __cxa_exception *nextException;
-
+    
     int handlerCount;
-
+    
     int handlerSwitchValue;
     const unsigned char *actionRecord;
     const unsigned char *languageSpecificData;
     void *catchTemp;
     void *adjustedPtr;
-
+    
     _Unwind_Exception unwindHeader;
-};
+};    
 
 extern "C" void *__cxa_allocate_exception(
     std::size_t thrown_size ) throw();
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index 767961b9c691..90acb02ff5db 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -114,7 +114,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
     double xmm1;
 
     asm volatile (
-
+        
         // Fill the xmm registers
         "movq %2, %%rax\n\t"
 
@@ -196,7 +196,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
     }
 }
 
-//==================================================================================================
+//================================================================================================== 
 
 // Macros for easier insertion of values to registers or stack
 // pSV - pointer to the source
@@ -236,7 +236,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
     else \
         *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
 
-//==================================================================================================
+//================================================================================================== 
 
 static void cpp_call(
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
@@ -260,10 +260,10 @@ static void cpp_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion (see below)
 
-    bool bSimpleReturn = true;
+    bool bSimpleReturn = true;	
     if ( pReturnTypeDescr )
     {
         if ( x86_64::return_in_hidden_param( pReturnTypeRef ) )
@@ -290,20 +290,20 @@ static void cpp_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
     // Type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
+    
     sal_Int32 nTempIndizes = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
+        
         if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
             uno_copyAndConvertData( pCppArgs[nPos] = alloca( 8 ), pUnoArgs[nPos], pParamTypeDescr,
                                     pThis->getBridge()->getUno2Cpp() );
-
+            
             switch (pParamTypeDescr->eTypeClass)
             {
             case typelib_TypeClass_HYPER:
@@ -353,7 +353,7 @@ static void cpp_call(
                 uno_copyAndConvertData(
                     pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
                     pUnoArgs[nPos], pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
-
+                
                 pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
                 // will be released at reconversion
                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -367,7 +367,7 @@ static void cpp_call(
             INSERT_INT64( &(pCppArgs[nPos]), nGPR, pGPR, pStack );
         }
     }
-
+    
     try
     {
         callVirtualMethod(
@@ -378,13 +378,13 @@ static void cpp_call(
             pFPR, nFPR );
         // NO exception occured...
         *ppUnoExc = 0;
-
+        
         // reconvert temporary params
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -401,7 +401,7 @@ static void cpp_call(
             }
             // destroy temp cpp param => cpp: every param was constructed
             uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return value
@@ -416,7 +416,7 @@ static void cpp_call(
      {
           // fill uno exception
         fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
-
+        
         // temporary params
         for ( ; nTempIndizes--; )
         {
@@ -445,7 +445,7 @@ void unoInterfaceProxyDispatch(
 #if OSL_DEBUG_LEVEL > 0
     typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
 #endif
-
+    
     switch (pMemberDescr->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -460,7 +460,7 @@ void unoInterfaceProxyDispatch(
                     reinterpret_cast<
                     typelib_InterfaceAttributeTypeDescription const * >(
                         pMemberDescr)));
-
+        
         if (pReturn)
         {
             // dependent dispatch
@@ -476,14 +476,14 @@ void unoInterfaceProxyDispatch(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
 
             typelib_TypeDescriptionReference * pReturnTypeRef = 0;
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
             aVtableSlot.index += 1; // get, then set method
             cpp_call(
@@ -491,10 +491,10 @@ void unoInterfaceProxyDispatch(
                 pReturnTypeRef,
                 1, &aParam,
                 pReturn, pArgs, ppException );
-
+            
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -509,7 +509,7 @@ void unoInterfaceProxyDispatch(
                     reinterpret_cast<
                     typelib_InterfaceMethodTypeDescription const * >(
                         pMemberDescr)));
-
+        
         switch (aVtableSlot.index)
         {
             // standard calls
@@ -531,7 +531,7 @@ void unoInterfaceProxyDispatch(
                 (*pThis->getBridge()->getUnoEnv()->getRegisteredInterface)(
                     pThis->getBridge()->getUnoEnv(),
                     (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -561,7 +561,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
index 11c1d0f10db2..2d406af78518 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -66,10 +66,10 @@ void cpp2uno_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     if (pReturnTypeRef)
         TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
+    
     void * pUnoReturn = 0;
     void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
+    
     if (pReturnTypeDescr)
     {
         // xxx todo: test PolyStructy<STRUCT<long>> foo()
@@ -99,9 +99,9 @@ void cpp2uno_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
@@ -158,7 +158,7 @@ void cpp2uno_call(
         }
         pCppStack += sizeof(sal_Int32); // standard parameter length
     }
-
+    
     // ExceptionHolder
     uno_Any aUnoExc; // Any will be constructed by callee
     uno_Any * pUnoExc = &aUnoExc;
@@ -166,7 +166,7 @@ void cpp2uno_call(
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)(
         pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
+    
     // in case an exception occured...
     if (pUnoExc)
     {
@@ -174,14 +174,14 @@ void cpp2uno_call(
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn) // is in/inout => was constructed
                 uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
         }
         if (pReturnTypeDescr)
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
+        
         CPPU_CURRENT_NAMESPACE::raiseException(
             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
             // has to destruct the any
@@ -193,7 +193,7 @@ void cpp2uno_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bOut) // inout/out
             {
                 // convert and assign
@@ -203,7 +203,7 @@ void cpp2uno_call(
             }
             // destroy temp uno param
             uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return
@@ -236,7 +236,7 @@ extern "C" void cpp_vtable_call(
     void * pReturnValue )
 {
     OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-
+    
     // pCallStack: ret adr, [ret *], this, params
     void * pThis;
     if( nFunctionIndex & 0x80000000 )
@@ -254,11 +254,11 @@ extern "C" void cpp_vtable_call(
             pThis);
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "%p %p %p pThis=%p, pCppI=%p, function index=%d, vtable offset=%d\n", pCallStack[0], pCallStack[1], pCallStack[2], pThis, pCppI, nFunctionIndex, nVtableOffset );
-#endif
+#endif    
     typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "name=%s\n", rtl::OUStringToOString(pTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_UTF8).getStr() );
-#endif
+#endif	
     OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
@@ -266,7 +266,7 @@ extern "C" void cpp_vtable_call(
             rtl::OUString::createFromAscii("illegal vtable index!"),
             (XInterface *)pThis );
     }
-
+    
     // determine called method
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
     OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
@@ -274,7 +274,7 @@ extern "C" void cpp_vtable_call(
     TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
 #if OSL_DEBUG_LEVEL > 1
     fprintf(stderr, "calling %s\n", rtl::OUStringToOString(aMemberDescr.get()->pTypeName, RTL_TEXTENCODING_UTF8).getStr());
-#endif
+#endif    
     switch (aMemberDescr.get()->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -294,9 +294,9 @@ extern "C" void cpp_vtable_call(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
+            
             cpp2uno_call(
                 pCppI, aMemberDescr.get(),
                 0, // indicates void return
@@ -327,7 +327,7 @@ extern "C" void cpp_vtable_call(
                     pCppI->getBridge()->getCppEnv(),
                     (void **)&pInterface, pCppI->getOid().pData,
                     (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
index c8cc3cd17257..b6e170236d9d 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/share.hxx b/bridges/source/cpp_uno/gcc3_macosx_intel/share.hxx
index 8b105c0880b3..8fa373310d69 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,25 +50,25 @@ struct _Unwind_Exception
 } __attribute__((__aligned__));
 
 struct __cxa_exception
-{
+{ 
     ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
+    void (*exceptionDestructor)(void *); 
+    
     ::std::unexpected_handler unexpectedHandler;
     ::std::terminate_handler terminateHandler;
-
+    
     __cxa_exception *nextException;
-
+    
     int handlerCount;
-
+    
     int handlerSwitchValue;
     const unsigned char *actionRecord;
     const unsigned char *languageSpecificData;
     void *catchTemp;
     void *adjustedPtr;
-
+    
     _Unwind_Exception unwindHeader;
-};
+};    
 
 extern "C" void *__cxa_allocate_exception(
     std::size_t thrown_size ) throw();
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx
index aaf696608e41..8610c3cf50d8 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -73,11 +73,11 @@ void callVirtualMethod(
 {
     // parameter list is mixed list of * and values
     // reference parameters are pointers
-
+    
     OSL_ENSURE( pStackLongs && pAdjustedThisPtr, "### null ptr!" );
     OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
     OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-
+    
     // never called
     if (! pAdjustedThisPtr) CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something
 
@@ -159,7 +159,7 @@ void callVirtualMethod(
     }
 }
 
-//==================================================================================================
+//================================================================================================== 
 static void cpp_call(
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
     bridges::cpp_uno::shared::VtableSlot aVtableSlot,
@@ -168,18 +168,18 @@ static void cpp_call(
     void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
 {
       // max space for: [complex ret ptr], values|ptr ...
-      char * pCppStack      =
+      char * pCppStack		=
           (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-      char * pCppStackStart = pCppStack;
-
+      char * pCppStackStart	= pCppStack;
+    
     // return
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
     bool bSimpleReturn = true;
-
+    
     if (pReturnTypeDescr)
     {
         bSimpleReturn = CPPU_CURRENT_NAMESPACE::isSimpleReturnType(
@@ -213,21 +213,21 @@ static void cpp_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
+        
         if (!rParam.bOut
             && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
             uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
                                     pThis->getBridge()->getUno2Cpp() );
-
+            
             switch (pParamTypeDescr->eTypeClass)
             {
             case typelib_TypeClass_HYPER:
@@ -260,7 +260,7 @@ static void cpp_call(
                     *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
                     pUnoArgs[nPos], pParamTypeDescr,
                     pThis->getBridge()->getUno2Cpp() );
-
+                
                 pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
                 // will be released at reconversion
                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -284,13 +284,13 @@ static void cpp_call(
             (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
         // NO exception occured...
         *ppUnoExc = 0;
-
+        
         // reconvert temporary params
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -307,7 +307,7 @@ static void cpp_call(
             }
             // destroy temp cpp param => cpp: every param was constructed
             uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return value
@@ -325,7 +325,7 @@ static void cpp_call(
 #endif
           // fill uno exception
         fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
-
+        
         // temporary params
         for ( ; nTempIndizes--; )
         {
@@ -379,7 +379,7 @@ void unoInterfaceProxyDispatch(
     // is my surrogate
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
         = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
-
+    
     switch (pMemberDescr->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -404,14 +404,14 @@ void unoInterfaceProxyDispatch(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
 
             typelib_TypeDescriptionReference * pReturnTypeRef = 0;
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
             aVtableSlot.index += 1; // get, then set method
             cpp_call(
@@ -419,10 +419,10 @@ void unoInterfaceProxyDispatch(
                 pReturnTypeRef,
                 1, &aParam,
                 pReturn, pArgs, ppException );
-
+            
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -453,7 +453,7 @@ void unoInterfaceProxyDispatch(
                 (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
                     pThis->pBridge->getUnoEnv(),
                     (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -483,7 +483,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
index f3515a86ea08..e80a2a017459 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@ static typelib_TypeClass cpp2uno_call(
         void ** gpreg, void ** fpreg, void ** ovrflw,
     sal_Int64 * pRegisterReturn /* space for register return */ )
 {
-
+       
         // gpreg:  [ret *], this, [gpr params]
         // fpreg:  [fpr params]
         // ovrflw: [gpr or fpr params (space for entire parameter list in structure format properly aligned)]
@@ -63,10 +63,10 @@ static typelib_TypeClass cpp2uno_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     if (pReturnTypeRef)
         TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
+    
     void * pUnoReturn = 0;
     void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
+    
     sal_Int32 ngpreg = 0;
     sal_Int32 nfpreg = 0;
 
@@ -80,7 +80,7 @@ static typelib_TypeClass cpp2uno_call(
             pCppReturn = *gpreg;
             ngpreg++;
             ++ovrflw;
-
+            
             pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
                           ? alloca( pReturnTypeDescr->nSize )
                           : pCppReturn); // direct way
@@ -92,7 +92,7 @@ static typelib_TypeClass cpp2uno_call(
 
         // after handling optional return pointer and "this"
         // make use of the space that is allocated to store all parameters in the callers stack
-        // by comying the proper registers filled with parameters to that space
+        // by comying the proper registers filled with parameters to that space 
     char * pCppStack = (char *)ovrflw;
 
 
@@ -120,7 +120,7 @@ static typelib_TypeClass cpp2uno_call(
             }
             pCppStack += sizeof (float);
             ngpreg += 1;
-            break;
+            break;	
         case typelib_TypeClass_DOUBLE:
             if (nfpreg < 13)
             {
@@ -128,7 +128,7 @@ static typelib_TypeClass cpp2uno_call(
             }
             pCppStack += sizeof (double);
             ngpreg += 2;
-            break;
+            break;	
         case typelib_TypeClass_UNSIGNED_HYPER:
         case typelib_TypeClass_HYPER:
             if (ngpreg < 8)
@@ -163,16 +163,16 @@ static typelib_TypeClass cpp2uno_call(
 
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
 
-        if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
+        if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr )) 
                 // value
         {
             switch (pParamTypeDescr->eTypeClass)
@@ -233,16 +233,16 @@ static typelib_TypeClass cpp2uno_call(
         }
         pCppStack += sizeof(sal_Int32); // standard parameter length
     }
-
-
+    
+    
     // ExceptionHolder
     uno_Any aUnoExc; // Any will be constructed by callee
     uno_Any * pUnoExc = &aUnoExc;
 
     // invoke uno dispatch call
-    (*pThis->getUnoI()->pDispatcher)(
+    (*pThis->getUnoI()->pDispatcher)( 
          pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
+    
     // in case an exception occured...
     if (pUnoExc)
     {
@@ -250,16 +250,16 @@ static typelib_TypeClass cpp2uno_call(
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn) // is in/inout => was constructed
                 uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
         }
         if (pReturnTypeDescr)
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
-        CPPU_CURRENT_NAMESPACE::raiseException(
-                    &aUnoExc, pThis->getBridge()->getUno2Cpp() );
+        
+        CPPU_CURRENT_NAMESPACE::raiseException( 
+                    &aUnoExc, pThis->getBridge()->getUno2Cpp() ); 
                 // has to destruct the any
         // is here for dummy
         return typelib_TypeClass_VOID;
@@ -271,7 +271,7 @@ static typelib_TypeClass cpp2uno_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bOut) // inout/out
             {
                 // convert and assign
@@ -281,7 +281,7 @@ static typelib_TypeClass cpp2uno_call(
             }
             // destroy temp uno param
             uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return
@@ -317,7 +317,7 @@ static typelib_TypeClass cpp_mediate(
     sal_Int64 * pRegisterReturn /* space for register return */ )
 {
     OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-
+    
     // gpreg:  [ret *], this, [other gpr params]
     // fpreg:  [fpr params]
     // ovrflw: [gpr or fpr params (in space allocated for all params properly aligned)]
@@ -332,14 +332,14 @@ static typelib_TypeClass cpp_mediate(
         {
         pThis = gpreg[0];
         }
-
+    
         pThis = static_cast< char * >(pThis) - nVtableOffset;
-        bridges::cpp_uno::shared::CppInterfaceProxy * pCppI
+        bridges::cpp_uno::shared::CppInterfaceProxy * pCppI 
     = bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(pThis);
 
-
+    
     typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
-
+    
     OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
@@ -347,13 +347,13 @@ static typelib_TypeClass cpp_mediate(
             rtl::OUString::createFromAscii("illegal vtable index!"),
             (XInterface *)pThis );
     }
-
+    
     // determine called method
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
     OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
 
     TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-
+    
     typelib_TypeClass eRet;
     switch (aMemberDescr.get()->eTypeClass)
     {
@@ -374,9 +374,9 @@ static typelib_TypeClass cpp_mediate(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
+            
             eRet = cpp2uno_call(
                 pCppI, aMemberDescr.get(),
                 0, // indicates void return
@@ -408,7 +408,7 @@ static typelib_TypeClass cpp_mediate(
                 (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)(
                     pCppI->getBridge()->getCppEnv(),
                     (void **)&pInterface, pCppI->getOid().pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -455,7 +455,7 @@ static void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** gpreg
 {
         sal_Int32     gpreg[8];
         double        fpreg[13];
-
+       
         // FIXME: why are we restoring the volatile ctr register here
     sal_Int32   ctrsave = ((sal_Int32*)gpregptr)[-1];
 
@@ -466,9 +466,9 @@ static void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** gpreg
 
         // sal_Bool bComplex = nFunctionIndex & 0x80000000 ? sal_True : sal_False;
 
-    typelib_TypeClass aType =
+    typelib_TypeClass aType = 
              cpp_mediate( nFunctionIndex, nVtableOffset, (void**)gpreg, (void**)fpreg, ovrflw, (sal_Int64*)nRegReturn );
-
+    
         // FIXME: why are we restoring the volatile ctr register here
         // FIXME: and why are we putting back the values for r4, r5, and r6 as well
         // FIXME: this makes no sense to me, all of these registers are volatile!
@@ -490,7 +490,7 @@ static void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** gpreg
                   __asm__( "lbz r3,%0\n\t" : :
                "m"(nRegReturn[0]) );
                   break;
-
+ 
                 case typelib_TypeClass_CHAR:
                 case typelib_TypeClass_SHORT:
                 case typelib_TypeClass_UNSIGNED_SHORT:
@@ -523,7 +523,7 @@ static void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** gpreg
 
 int const codeSnippetSize = 136;
 
-unsigned char * codeSnippet( unsigned char * code, sal_Int32 functionIndex,
+unsigned char * codeSnippet( unsigned char * code, sal_Int32 functionIndex, 
                   sal_Int32 vtableOffset, bool simpleRetType )
 {
     if (! simpleRetType )
@@ -535,17 +535,17 @@ unsigned char * codeSnippet( unsigned char * code, sal_Int32 functionIndex,
     // FIXME: is this to allow room for signal handling frames?
     // FIXME: seems like overkill here but this is what was done for Mac OSX for gcc2
     // FIXME: also why no saving of the non-volatile CR pieces here, to be safe
-    // FIXME: we probably should
+    // FIXME: we probably should 
 
     /* generate this code */
 
     // # so first save gpr 3 to gpr 10 (aligned to 4)
     //  stw   r3, -8000(r1)
     //  stw   r4, -7996(r1)
-    //  stw   r5, -7992(r1)
+    //  stw   r5, -7992(r1) 
     //  stw   r6, -7988(r1)
     //  stw   r7, -7984(r1)
-    //  stw   r8, -7980(r1)
+    //  stw   r8, -7980(r1) 
     //  stw   r9, -7976(r1)
     //  stw   r10,-7972(r1)
 
@@ -580,18 +580,18 @@ unsigned char * codeSnippet( unsigned char * code, sal_Int32 functionIndex,
     // # now load up the vtableOffset
     // lis r4, 0xdead
     // ori r4,r4,0xbeef
-
+    
     // #now load up the pointer to the saved gpr registers
     // addi r5,r1,-8000
 
     // #now load up the pointer to the saved fpr registers
     // addi r6,r1,-7968
-
+    
     // #now load up the pointer to the overflow call stack
-    // addi r7,r1,24 # frame pointer plus 24
+    // addi r7,r1,24 # frame pointer plus 24	
 
     // bctr
-
+    
     unsigned long * p = (unsigned long *) code;
 
     * p++ = 0x9061e0c0;
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
index abc3ad10fc37..fc0720a0e52d 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,7 +55,7 @@ using namespace ::__cxxabiv1;
 
 namespace CPPU_CURRENT_NAMESPACE
 {
-
+    
 void dummy_can_throw_anything( char const * )
 {
 }
@@ -66,13 +66,13 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 #ifdef DEBUG
     char const * start = p;
 #endif
-
+    
     // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-
+    
     OUStringBuffer buf( 64 );
     OSL_ASSERT( 'N' == *p );
     ++p; // skip N
-
+    
     while ('E' != *p)
     {
         // read chars count
@@ -87,7 +87,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
         if ('E' != *p)
             buf.append( (sal_Unicode)'.' );
     }
-
+    
 #ifdef DEBUG
     OUString ret( buf.makeStringAndClear() );
     OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
@@ -102,17 +102,17 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 class RTTI
 {
     typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-
+    
     Mutex m_mutex;
     t_rtti_map m_rttis;
     t_rtti_map m_generatedRttis;
 
     void * m_hApp;
-
+    
 public:
     RTTI() SAL_THROW( () );
     ~RTTI() SAL_THROW( () );
-
+    
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
 };
 //__________________________________________________________________________________________________
@@ -130,9 +130,9 @@ RTTI::~RTTI() SAL_THROW( () )
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
 {
     type_info * rtti;
-
+    
     OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-
+    
     MutexGuard guard( m_mutex );
     t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
     if (iFind == m_rttis.end())
@@ -150,7 +150,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
         }
         while (index >= 0);
         buf.append( 'E' );
-
+        
         OString symName( buf.makeStringAndClear() );
         rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
 
@@ -186,7 +186,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
                     // this class has no base class
                     rtti = new __class_type_info( strdup( rttiName ) );
                 }
-
+                
                 pair< t_rtti_map::iterator, bool > insertion(
                     m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
                 OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
@@ -201,7 +201,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     {
         rtti = iFind->second;
     }
-
+    
     return rtti;
 }
 
@@ -233,10 +233,10 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     OSL_ASSERT( pTypeDescr );
     if (! pTypeDescr)
         terminate();
-
+    
     pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
     ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-
+    
     // destruct uno exception
     ::uno_any_destruct( pUnoExc, 0 );
     // avoiding locked counts
@@ -260,7 +260,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
     if (! rtti)
         terminate();
     }
-
+    
     __cxa_throw( pCppExc, rtti, deleteException );
 }
 
@@ -270,14 +270,14 @@ void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * p
     OSL_ENSURE( header, "### no exception header!!!" );
     if (! header)
         terminate();
-
+    
     typelib_TypeDescription * pExcTypeDescr = 0;
     OUString unoName( toUNOname( header->exceptionType->name() ) );
     ::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
     OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" );
     if (! pExcTypeDescr)
         terminate();
-
+    
     // construct uno exception any
     ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
     ::typelib_typedescription_release( pExcTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/share.hxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/share.hxx
index 4ec09c29ff0a..aa802babac96 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,25 +49,25 @@ struct _Unwind_Exception
 } __attribute__((__aligned__));
 
 struct __cxa_exception
-{
+{ 
     ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
+    void (*exceptionDestructor)(void *); 
+    
     ::std::unexpected_handler unexpectedHandler;
     ::std::terminate_handler terminateHandler;
-
+    
     __cxa_exception *nextException;
-
+    
     int handlerCount;
-
+    
     int handlerSwitchValue;
     const unsigned char *actionRecord;
     const unsigned char *languageSpecificData;
     void *catchTemp;
     void *adjustedPtr;
-
+    
     _Unwind_Exception unwindHeader;
-};
+};    
 
 extern "C" void *__cxa_allocate_exception(
     std::size_t thrown_size ) throw();
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx
index 39388fc602f0..09a1935c4598 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,7 +64,7 @@ static void callVirtualMethod(
   // reference parameters are pointers
 
   // the basic idea here is to use gpr[8] as a storage area for
-  // the future values of registers r3 to r10 needed for the call,
+  // the future values of registers r3 to r10 needed for the call, 
   // and similarly fpr[13] as a storage area for the future values
   // of floating point registers f1 to f13
 
@@ -91,10 +91,10 @@ static void callVirtualMethod(
 
      // FIXME: I do not believe the following is true but we will keep the
      // FIXME: extra space just to be safe until proven otherwise
-
-     // Note: could require up to  2*nStackLongs words of parameter stack area
-     // if the call has many float parameters (i.e. floats take up only 1
-     // word on the stack but take 2 words in parameter area in the
+ 
+     // Note: could require up to  2*nStackLongs words of parameter stack area 
+     // if the call has many float parameters (i.e. floats take up only 1 
+     // word on the stack but take 2 words in parameter area in the 
      // stack frame .
 
 
@@ -117,12 +117,12 @@ static void callVirtualMethod(
 
 
      // now we need to parse the entire signature string
-     // until we get the END indicator
+     // until we get the END indicator 
 
      // treat complex return pointer like any other parameter
 
      // parse the argument list up to the ending )
-
+ 
      while (*pPT != 'X') {
        c = *pPT;
        switch (c) {
@@ -205,12 +205,12 @@ static void callVirtualMethod(
 
 
      /* figure out the address of the function we need to invoke */
-     off = nVtableIndex;
+     off = nVtableIndex; 
      off = off * 4;                         // 4 bytes per slot
      mfunc = *((unsigned long **)pAdjustedThisPtr);    // get the address of the vtable
-     mfunc = (unsigned long *)((char *)mfunc + off); // get the address from the vtable entry at offset
+     mfunc = (unsigned long *)((char *)mfunc + off); // get the address from the vtable entry at offset 
      mfunc = *((unsigned long **)mfunc);                 // the function is stored at the address
-     ptr = (void (*)())mfunc;
+     ptr = (void (*)())mfunc;   
 
     /* Set up the machine registers and invoke the function */
 
@@ -289,7 +289,7 @@ static void callVirtualMethod(
 }
 
 
-//==================================================================================================
+//================================================================================================== 
 static void cpp_call(
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
     bridges::cpp_uno::shared::VtableSlot aVtableSlot,
@@ -298,10 +298,10 @@ static void cpp_call(
     void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
 {
       // max space for: [complex ret ptr], values|ptr ...
-      char * pCppStack      =
+      char * pCppStack		=
           (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-      char * pCppStackStart = pCppStack;
-
+      char * pCppStackStart	= pCppStack;
+    
         // need to know parameter types for callVirtualMethod so generate a signature string
         char * pParamType = (char *) alloca(nParams+2);
         char * pPT = pParamType;
@@ -310,9 +310,9 @@ static void cpp_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -322,7 +322,7 @@ static void cpp_call(
         else
         {
             // complex return via ptr
-            pCppReturn = *(void **)pCppStack
+            pCppReturn = *(void **)pCppStack 
                            = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
                ? alloca( pReturnTypeDescr->nSize )
                : pUnoReturn); // direct way
@@ -345,21 +345,21 @@ static void cpp_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
-        if (!rParam.bOut
+        
+        if (!rParam.bOut 
                     && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
             uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
                                     pThis->getBridge()->getUno2Cpp() );
-
+            
             switch (pParamTypeDescr->eTypeClass)
             {
 
@@ -423,7 +423,7 @@ static void cpp_call(
                 uno_copyAndConvertData(
                     *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
                     pUnoArgs[nPos], pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
-
+                
                 pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
                 // will be released at reconversion
                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -438,7 +438,7 @@ static void cpp_call(
         }
         pCppStack += sizeof(sal_Int32); // standard parameter length
     }
-
+  
         // terminate the signature string
         *pPT++='X';
         *pPT=0;
@@ -452,13 +452,13 @@ static void cpp_call(
             (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
         // NO exception occured...
         *ppUnoExc = 0;
-
+        
         // reconvert temporary params
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -475,7 +475,7 @@ static void cpp_call(
             }
             // destroy temp cpp param => cpp: every param was constructed
             uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return value
@@ -490,7 +490,7 @@ static void cpp_call(
      {
           // fill uno exception
         fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
-
+        
         // temporary params
         for ( ; nTempIndizes--; )
         {
@@ -514,10 +514,10 @@ void unoInterfaceProxyDispatch(
     void * pReturn, void * pArgs[], uno_Any ** ppException )
 {
     // is my surrogate
-    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
+    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis 
            = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * > (pUnoI);
-        //  typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-
+        //	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
+    
     switch (pMemberDescr->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -544,14 +544,14 @@ void unoInterfaceProxyDispatch(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
 
             typelib_TypeDescriptionReference * pReturnTypeRef = 0;
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
                         aVtableSlot.index += 1; //get then set method
             cpp_call(
@@ -559,10 +559,10 @@ void unoInterfaceProxyDispatch(
                 pReturnTypeRef,
                 1, &aParam,
                 pReturn, pArgs, ppException );
-
+            
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -594,7 +594,7 @@ void unoInterfaceProxyDispatch(
                 (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
                     pThis->pBridge->getUnoEnv(),
                     (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -624,7 +624,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno.cxx
index 8b19ff92760c..3a068c4712f3 100644
--- a/bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,10 +62,10 @@ static typelib_TypeClass cpp2uno_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     if (pReturnTypeRef)
         TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
+    
     void * pUnoReturn = 0;
     void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -76,7 +76,7 @@ static typelib_TypeClass cpp2uno_call(
         {
             pCppReturn = *(void **)pCppStack;
             pCppStack += sizeof(void *);
-
+            
             pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType(
                               pReturnTypeDescr )
                           ? alloca( pReturnTypeDescr->nSize )
@@ -95,9 +95,9 @@ static typelib_TypeClass cpp2uno_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
@@ -152,7 +152,7 @@ static typelib_TypeClass cpp2uno_call(
         }
         pCppStack += sizeof(sal_Int32); // standard parameter length
     }
-
+    
     // ExceptionHolder
     uno_Any aUnoExc = {0}; // Any will be constructed by callee
     uno_Any * pUnoExc = &aUnoExc;
@@ -172,14 +172,14 @@ static typelib_TypeClass cpp2uno_call(
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn) // is in/inout => was constructed
                 uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
         }
         if (pReturnTypeDescr)
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
+        
         CPPU_CURRENT_NAMESPACE::raiseException(
             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
             // has to destruct the any
@@ -193,7 +193,7 @@ static typelib_TypeClass cpp2uno_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bOut) // inout/out
             {
                 // convert and assign
@@ -203,7 +203,7 @@ static typelib_TypeClass cpp2uno_call(
             }
             // destroy temp uno param
             uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return
@@ -239,7 +239,7 @@ static typelib_TypeClass cpp_mediate(
     sal_Int64 * pRegisterReturn /* space for register return */ )
 {
     OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-
+    
     // pCallStack: ret adr, [ret *], this, params
     void * pThis;
     if( nFunctionIndex & 0x80000000 )
@@ -255,9 +255,9 @@ static typelib_TypeClass cpp_mediate(
     bridges::cpp_uno::shared::CppInterfaceProxy * pCppI
         = bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(
             pThis);
-
+    
     typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
-
+    
     OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
@@ -265,13 +265,13 @@ static typelib_TypeClass cpp_mediate(
             rtl::OUString::createFromAscii("illegal vtable index!"),
             (XInterface *)pThis );
     }
-
+    
     // determine called method
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
     OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
 
     TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-
+    
     typelib_TypeClass eRet;
     switch (aMemberDescr.get()->eTypeClass)
     {
@@ -292,9 +292,9 @@ static typelib_TypeClass cpp_mediate(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
+            
             eRet = cpp2uno_call(
                 pCppI, aMemberDescr.get(),
                 0, // indicates void return
@@ -327,7 +327,7 @@ static typelib_TypeClass cpp_mediate(
                     pCppI->getBridge()->getCppEnv(),
                     (void **)&pInterface, pCppI->getOid().pData,
                     (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -379,7 +379,7 @@ void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
     volatile long nRegReturn[2];
     typelib_TypeClass aType = cpp_mediate(
         nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn );
-
+    
     switch( aType )
     {
         case typelib_TypeClass_HYPER:
@@ -400,11 +400,11 @@ void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
                      "fldl %0\n"
                      : : "m"(*(double *)nRegReturn) );
             break;
-//      case typelib_TypeClass_UNSIGNED_SHORT:
-//      case typelib_TypeClass_SHORT:
-//          __asm__( "movswl %0, %%eax\n"
-//                   : : "m"(nRegReturn) );
-//      break;
+// 		case typelib_TypeClass_UNSIGNED_SHORT:
+// 		case typelib_TypeClass_SHORT:
+// 			__asm__( "movswl %0, %%eax\n"
+// 					 : : "m"(nRegReturn) );
+// 		break;
         default:
             __asm__( "movl %0, %%eax\n"
                      : : "m"(nRegReturn[0]) );
diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx b/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx
index 99c2f62d1476..ec8447ba417c 100644
--- a/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,7 +55,7 @@ using namespace ::__cxxabiv1;
 
 //==================================================================================================
 //YD static handle to this dll, to allow rtti symbol lookup
-static  void*   hmod;
+static	void*	hmod;
 
 //==================================================================================================
 //YD required to run test programs, because exe cannot export symbols!
diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/share.hxx b/bridges/source/cpp_uno/gcc3_os2_intel/share.hxx
index da2367ad172b..e4a6b379a840 100644
--- a/bridges/source/cpp_uno/gcc3_os2_intel/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_os2_intel/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,25 +48,25 @@ struct _Unwind_Exception
 } __attribute__((__aligned__));
 
 struct __cxa_exception
-{
+{ 
     ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
+    void (*exceptionDestructor)(void *); 
+    
     ::std::unexpected_handler unexpectedHandler;
     ::std::terminate_handler terminateHandler;
-
+    
     __cxa_exception *nextException;
-
+    
     int handlerCount;
-
+    
     int handlerSwitchValue;
     const unsigned char *actionRecord;
     const unsigned char *languageSpecificData;
     void *catchTemp;
     void *adjustedPtr;
-
+    
     _Unwind_Exception unwindHeader;
-};
+};    
 
 extern "C" void *__cxa_allocate_exception(
     std::size_t thrown_size ) throw();
diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_os2_intel/uno2cpp.cxx
index 64be1daa086e..d78ac1f62359 100644
--- a/bridges/source/cpp_uno/gcc3_os2_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_os2_intel/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -73,11 +73,11 @@ static void callVirtualMethod(
 {
     // parameter list is mixed list of * and values
     // reference parameters are pointers
-
+    
     OSL_ENSURE( pStackLongs && pAdjustedThisPtr, "### null ptr!" );
     OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
     OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-
+    
     // never called
     if (! pAdjustedThisPtr) CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something
 
@@ -85,10 +85,10 @@ static void callVirtualMethod(
      unsigned long * mfunc;        // actual function to be invoked
      int off;                      // offset used to find function
      void (*ptr)();
-     off = nVtableIndex;
+     off = nVtableIndex; 
      off = off * 4;                         // 4 bytes per slot
      mfunc = *((unsigned long **)pAdjustedThisPtr);    // get the address of the vtable
-     mfunc = (unsigned long *)((char *)mfunc + off); // get the address from the vtable entry at offset
+     mfunc = (unsigned long *)((char *)mfunc + off); // get the address from the vtable entry at offset 
      mfunc = *((unsigned long **)mfunc);                 // the function is stored at the address
      ptr = (void (*)())mfunc;
 
@@ -152,7 +152,7 @@ static void callVirtualMethod(
     }
 }
 
-//==================================================================================================
+//================================================================================================== 
 static void cpp_call(
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
     bridges::cpp_uno::shared::VtableSlot aVtableSlot,
@@ -161,17 +161,17 @@ static void cpp_call(
     void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
 {
       // max space for: [complex ret ptr], values|ptr ...
-      char * pCppStack      =
+      char * pCppStack		=
           (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-      char * pCppStackStart = pCppStack;
-
+      char * pCppStackStart	= pCppStack;
+    
     // return
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -203,21 +203,21 @@ static void cpp_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
+        
         if (!rParam.bOut
             && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
             uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
                                     pThis->getBridge()->getUno2Cpp() );
-
+            
             switch (pParamTypeDescr->eTypeClass)
             {
             case typelib_TypeClass_HYPER:
@@ -248,7 +248,7 @@ static void cpp_call(
                     *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
                     pUnoArgs[nPos], pParamTypeDescr,
                     pThis->getBridge()->getUno2Cpp() );
-
+                
                 pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
                 // will be released at reconversion
                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -272,13 +272,13 @@ static void cpp_call(
             (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
         // NO exception occured...
         *ppUnoExc = 0;
-
+        
         // reconvert temporary params
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -295,7 +295,7 @@ static void cpp_call(
             }
             // destroy temp cpp param => cpp: every param was constructed
             uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return value
@@ -310,7 +310,7 @@ static void cpp_call(
      {
           // fill uno exception
         fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
-
+        
         // temporary params
         for ( ; nTempIndizes--; )
         {
@@ -337,7 +337,7 @@ void unoInterfaceProxyDispatch(
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
         = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
     typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-
+    
     switch (pMemberDescr->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -362,14 +362,14 @@ void unoInterfaceProxyDispatch(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
 
             typelib_TypeDescriptionReference * pReturnTypeRef = 0;
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
             aVtableSlot.index += 1; // get, then set method
             cpp_call(
@@ -377,10 +377,10 @@ void unoInterfaceProxyDispatch(
                 pReturnTypeRef,
                 1, &aParam,
                 pReturn, pArgs, ppException );
-
+            
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -411,7 +411,7 @@ void unoInterfaceProxyDispatch(
                 (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
                     pThis->pBridge->getUnoEnv(),
                     (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -441,7 +441,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
index 1c16f6550120..36c1a14e7792 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,10 +64,10 @@ static typelib_TypeClass cpp2uno_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     if (pReturnTypeRef)
         TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
+    
     void * pUnoReturn = 0;
     void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -78,7 +78,7 @@ static typelib_TypeClass cpp2uno_call(
         {
             pCppReturn = *(void **)pCppStack;
             pCppStack += sizeof(void *);
-
+            
             pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType(
                               pReturnTypeDescr )
                           ? alloca( pReturnTypeDescr->nSize )
@@ -97,9 +97,9 @@ static typelib_TypeClass cpp2uno_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
@@ -154,7 +154,7 @@ static typelib_TypeClass cpp2uno_call(
         }
         pCppStack += sizeof(sal_Int32); // standard parameter length
     }
-
+    
     // ExceptionHolder
     uno_Any aUnoExc; // Any will be constructed by callee
     uno_Any * pUnoExc = &aUnoExc;
@@ -162,7 +162,7 @@ static typelib_TypeClass cpp2uno_call(
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)(
         pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
+    
     // in case an exception occured...
     if (pUnoExc)
     {
@@ -170,14 +170,14 @@ static typelib_TypeClass cpp2uno_call(
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn) // is in/inout => was constructed
                 uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
         }
         if (pReturnTypeDescr)
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
+        
         CPPU_CURRENT_NAMESPACE::raiseException(
             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
             // has to destruct the any
@@ -191,7 +191,7 @@ static typelib_TypeClass cpp2uno_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bOut) // inout/out
             {
                 // convert and assign
@@ -201,7 +201,7 @@ static typelib_TypeClass cpp2uno_call(
             }
             // destroy temp uno param
             uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return
@@ -237,7 +237,7 @@ static typelib_TypeClass cpp_mediate(
     sal_Int64 * pRegisterReturn /* space for register return */ )
 {
     OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-
+    
     // pCallStack: ret adr, [ret *], this, params
     void * pThis;
     if( nFunctionIndex & 0x80000000 )
@@ -253,9 +253,9 @@ static typelib_TypeClass cpp_mediate(
     bridges::cpp_uno::shared::CppInterfaceProxy * pCppI
         = bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(
             pThis);
-
+    
     typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
-
+    
     OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
@@ -263,13 +263,13 @@ static typelib_TypeClass cpp_mediate(
             rtl::OUString::createFromAscii("illegal vtable index!"),
             (XInterface *)pThis );
     }
-
+    
     // determine called method
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
     OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
 
     TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-
+    
     typelib_TypeClass eRet;
     switch (aMemberDescr.get()->eTypeClass)
     {
@@ -290,9 +290,9 @@ static typelib_TypeClass cpp_mediate(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
+            
             eRet = cpp2uno_call(
                 pCppI, aMemberDescr.get(),
                 0, // indicates void return
@@ -325,7 +325,7 @@ static typelib_TypeClass cpp_mediate(
                     pCppI->getBridge()->getCppEnv(),
                     (void **)&pInterface, pCppI->getOid().pData,
                     (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -377,7 +377,7 @@ void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
     volatile long nRegReturn[2];
     typelib_TypeClass aType = cpp_mediate(
         nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn );
-
+    
     switch( aType )
     {
         case typelib_TypeClass_HYPER:
@@ -398,11 +398,11 @@ void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** pCallStack )
                      "fldl %0\n"
                      : : "m"(*(double *)nRegReturn) );
             break;
-//      case typelib_TypeClass_UNSIGNED_SHORT:
-//      case typelib_TypeClass_SHORT:
-//          __asm__( "movswl %0, %%eax\n"
-//                   : : "m"(nRegReturn) );
-//      break;
+// 		case typelib_TypeClass_UNSIGNED_SHORT:
+// 		case typelib_TypeClass_SHORT:
+// 			__asm__( "movswl %0, %%eax\n"
+// 					 : : "m"(nRegReturn) );
+// 		break;
         default:
             __asm__( "movl %0, %%eax\n"
                      : : "m"(nRegReturn[0]) );
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
index 5dfc476edafd..69d3881a7606 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx b/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx
index da2367ad172b..e4a6b379a840 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,25 +48,25 @@ struct _Unwind_Exception
 } __attribute__((__aligned__));
 
 struct __cxa_exception
-{
+{ 
     ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
+    void (*exceptionDestructor)(void *); 
+    
     ::std::unexpected_handler unexpectedHandler;
     ::std::terminate_handler terminateHandler;
-
+    
     __cxa_exception *nextException;
-
+    
     int handlerCount;
-
+    
     int handlerSwitchValue;
     const unsigned char *actionRecord;
     const unsigned char *languageSpecificData;
     void *catchTemp;
     void *adjustedPtr;
-
+    
     _Unwind_Exception unwindHeader;
-};
+};    
 
 extern "C" void *__cxa_allocate_exception(
     std::size_t thrown_size ) throw();
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
index 8035256d4db8..d061e74fe83f 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -60,11 +60,11 @@ static void callVirtualMethod(
 {
     // parameter list is mixed list of * and values
     // reference parameters are pointers
-
+    
     OSL_ENSURE( pStackLongs && pAdjustedThisPtr, "### null ptr!" );
     OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
     OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-
+    
     // never called
     if (! pAdjustedThisPtr) CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something
 
@@ -128,7 +128,7 @@ static void callVirtualMethod(
     }
 }
 
-//==================================================================================================
+//================================================================================================== 
 static void cpp_call(
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
     bridges::cpp_uno::shared::VtableSlot aVtableSlot,
@@ -137,17 +137,17 @@ static void cpp_call(
     void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
 {
       // max space for: [complex ret ptr], values|ptr ...
-      char * pCppStack      =
+      char * pCppStack		=
           (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
-      char * pCppStackStart = pCppStack;
-
+      char * pCppStackStart	= pCppStack;
+    
     // return
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -179,21 +179,21 @@ static void cpp_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
+        
         if (!rParam.bOut
             && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
             uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
                                     pThis->getBridge()->getUno2Cpp() );
-
+            
             switch (pParamTypeDescr->eTypeClass)
             {
             case typelib_TypeClass_HYPER:
@@ -224,7 +224,7 @@ static void cpp_call(
                     *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
                     pUnoArgs[nPos], pParamTypeDescr,
                     pThis->getBridge()->getUno2Cpp() );
-
+                
                 pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
                 // will be released at reconversion
                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -248,13 +248,13 @@ static void cpp_call(
             (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
         // NO exception occured...
         *ppUnoExc = 0;
-
+        
         // reconvert temporary params
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -271,7 +271,7 @@ static void cpp_call(
             }
             // destroy temp cpp param => cpp: every param was constructed
             uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return value
@@ -286,7 +286,7 @@ static void cpp_call(
      {
           // fill uno exception
         fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
-
+        
         // temporary params
         for ( ; nTempIndizes--; )
         {
@@ -313,7 +313,7 @@ void unoInterfaceProxyDispatch(
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
         = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
     typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-
+    
     switch (pMemberDescr->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -338,14 +338,14 @@ void unoInterfaceProxyDispatch(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
 
             typelib_TypeDescriptionReference * pReturnTypeRef = 0;
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
             aVtableSlot.index += 1; // get, then set method
             cpp_call(
@@ -353,10 +353,10 @@ void unoInterfaceProxyDispatch(
                 pReturnTypeRef,
                 1, &aParam,
                 pReturn, pArgs, ppException );
-
+            
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -387,7 +387,7 @@ void unoInterfaceProxyDispatch(
                 (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
                     pThis->pBridge->getUnoEnv(),
                     (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -417,7 +417,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
index e6b0273b97a9..1fb537cd474c 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -58,10 +58,10 @@ static typelib_TypeClass cpp2uno_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     if (pReturnTypeRef)
         TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
+    
     void * pUnoReturn = 0;
     void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -88,9 +88,9 @@ static typelib_TypeClass cpp2uno_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
@@ -155,14 +155,14 @@ static typelib_TypeClass cpp2uno_call(
         }
         pCppStack += sizeof(sal_Int32); // standard parameter length
     }
-
+    
     // ExceptionHolder
     uno_Any aUnoExc; // Any will be constructed by callee
     uno_Any * pUnoExc = &aUnoExc;
 
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)(pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
+    
     // in case an exception occured...
     if (pUnoExc)
     {
@@ -170,7 +170,7 @@ static typelib_TypeClass cpp2uno_call(
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn) // is in/inout => was constructed
                 uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
@@ -189,7 +189,7 @@ static typelib_TypeClass cpp2uno_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bOut) // inout/out
             {
                 // convert and assign
@@ -199,7 +199,7 @@ static typelib_TypeClass cpp2uno_call(
             }
             // destroy temp uno param
             uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return
@@ -229,9 +229,9 @@ static typelib_TypeClass cpp2uno_call(
 
 //==================================================================================================
 static typelib_TypeClass cpp_mediate(
-    sal_Int32   nFunctionIndex,
-    sal_Int32   nVtableOffset,
-    void ** pCallStack,
+    sal_Int32	nFunctionIndex,
+    sal_Int32	nVtableOffset,
+    void **	pCallStack,
     sal_Int64 * pRegisterReturn /* space for register return */ )
 {
     OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
@@ -258,7 +258,7 @@ static typelib_TypeClass cpp_mediate(
     {
         throw RuntimeException( rtl::OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
     }
-
+    
     // determine called method
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
     OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
@@ -290,9 +290,9 @@ static typelib_TypeClass cpp_mediate(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
+            
             eRet = cpp2uno_call(
                 pCppI, aMemberDescr.get(),
                 0, // indicates void return
@@ -324,7 +324,7 @@ static typelib_TypeClass cpp_mediate(
         (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)(
             pCppI->getBridge()->getCppEnv(),
             (void **)&pInterface, pCppI->getOid().pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -378,8 +378,8 @@ static void cpp_vtable_call()
              "st %%i2, %2\n\t"
             : : "m"(nFunctionIndex), "m"(pCallStack), "m"(vTableOffset) );
 
-//  fprintf(stderr,"cpp_mediate nFunctionIndex=%x\n",nFunctionIndex);
-//  fflush(stderr);
+//	fprintf(stderr,"cpp_mediate nFunctionIndex=%x\n",nFunctionIndex);
+//	fflush(stderr);
 
     sal_Bool bComplex = nFunctionIndex & 0x80000000 ? sal_True : sal_False;
     typelib_TypeClass aType =
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
index 8d0be02e7d93..6833b9ed13ff 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@ using namespace ::__cxxabiv1;
 
 namespace CPPU_CURRENT_NAMESPACE
 {
-
+    
 void dummy_can_throw_anything( char const * )
 {
 }
@@ -65,13 +65,13 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 #if defined BRIDGES_DEBUG
     char const * start = p;
 #endif
-
+    
     // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-
+    
     OUStringBuffer buf( 64 );
     OSL_ASSERT( 'N' == *p );
     ++p; // skip N
-
+    
     while ('E' != *p)
     {
         // read chars count
@@ -86,7 +86,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
         if ('E' != *p)
             buf.append( (sal_Unicode)'.' );
     }
-
+    
 #if defined BRIDGES_DEBUG
     OUString ret( buf.makeStringAndClear() );
     OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
@@ -101,17 +101,17 @@ static OUString toUNOname( char const * p ) SAL_THROW( () )
 class RTTI
 {
     typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
-
+    
     Mutex m_mutex;
     t_rtti_map m_rttis;
     t_rtti_map m_generatedRttis;
 
     void * m_hApp;
-
+    
 public:
     RTTI() SAL_THROW( () );
     ~RTTI() SAL_THROW( () );
-
+    
     type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
 };
 //__________________________________________________________________________________________________
@@ -129,9 +129,9 @@ RTTI::~RTTI() SAL_THROW( () )
 type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
 {
     type_info * rtti;
-
+    
     OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-
+    
     MutexGuard guard( m_mutex );
     t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
     if (iFind == m_rttis.end())
@@ -149,7 +149,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
         }
         while (index >= 0);
         buf.append( 'E' );
-
+        
         OString symName( buf.makeStringAndClear() );
         rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
 
@@ -185,7 +185,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
                     // this class has no base class
                     rtti = new __class_type_info( strdup( rttiName ) );
                 }
-
+                
                 pair< t_rtti_map::iterator, bool > insertion(
                     m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
                 OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
@@ -200,7 +200,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     {
         rtti = iFind->second;
     }
-
+    
     return rtti;
 }
 
@@ -244,10 +244,10 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
             *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
             Reference< XInterface >() );
     }
-
+    
     pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
     ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-
+    
     // destruct uno exception
     ::uno_any_destruct( pUnoExc, 0 );
     // avoiding locked counts
@@ -276,7 +276,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
             Reference< XInterface >() );
     }
     }
-
+    
     __cxa_throw( pCppExc, rtti, deleteException );
 }
 
@@ -296,7 +296,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
 #endif
         return;
     }
-
+    
     typelib_TypeDescription * pExcTypeDescr = 0;
     OUString unoName( toUNOname( header->exceptionType->name() ) );
 #if defined BRIDGES_DEBUG
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx
index 3526f19082cd..eb1cb12f53a9 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,25 +43,25 @@ struct _Unwind_Exception
 } __attribute__((__aligned__));
 
 struct __cxa_exception
-{
+{ 
     ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
+    void (*exceptionDestructor)(void *); 
+    
     ::std::unexpected_handler unexpectedHandler;
     ::std::terminate_handler terminateHandler;
-
+    
     __cxa_exception *nextException;
-
+    
     int handlerCount;
-
+    
     int handlerSwitchValue;
     const unsigned char *actionRecord;
     const unsigned char *languageSpecificData;
     void *catchTemp;
     void *adjustedPtr;
-
+    
     _Unwind_Exception unwindHeader;
-};
+};    
 
 extern "C" void *__cxa_allocate_exception(
     std::size_t thrown_size ) throw();
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
index b1c2767609f4..5d844835803d 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -104,7 +104,7 @@ void callVirtualMethod( void * pAdjustedThisPtr,
         "mov %%l1, %%l7\n\t"
 
         // increase our own stackframe if necessary
-        "mov %%sp, %%l3\n\t"        // save stack ptr for readjustment
+        "mov %%sp, %%l3\n\t"		// save stack ptr for readjustment
 
         "subcc %%i5, 7, %%l0\n\t"
         "ble .LmoveOn\n\t"
@@ -112,14 +112,14 @@ void callVirtualMethod( void * pAdjustedThisPtr,
 
         "sll %%l0, 2, %%l0\n\t"
         "add %%l0, 96, %%l0\n\t"
-        "mov %%sp, %%l1\n\t"        // old stack ptr
-        "sub %%sp, %%l0, %%l0\n\t"  // future stack ptr
-        "andcc %%l0, 7, %%g0\n\t"   // align stack to 8
+        "mov %%sp, %%l1\n\t"		// old stack ptr
+        "sub %%sp, %%l0, %%l0\n\t"	// future stack ptr
+        "andcc %%l0, 7, %%g0\n\t"	// align stack to 8
         "be .LisAligned\n\t"
         "nop\n\t"
         "sub %%l0, 4, %%l0\n"
     ".LisAligned:\n\t"
-        "mov %%l0, %%o5\n\t"            // save newly computed stack ptr
+        "mov %%l0, %%o5\n\t"			// save newly computed stack ptr
         "add %%g0, 16, %%o4\n"
 
         // now copy longs down to save register window
@@ -132,11 +132,11 @@ void callVirtualMethod( void * pAdjustedThisPtr,
         "subcc %%o4, 1, %%o4\n\t"
         "bne .LcopyDown\n\t"
 
-        "mov %%o5, %%sp\n\t"        // move new stack ptr (hopefully) atomically
+        "mov %%o5, %%sp\n\t"		// move new stack ptr (hopefully) atomically
         // while register window is valid in both spaces
         // (scheduling might hit in copyDown loop)
 
-        "sub %%i5, 7, %%l0\n\t"     // copy parameters past the sixth to stack
+        "sub %%i5, 7, %%l0\n\t"		// copy parameters past the sixth to stack
         "add %%i4, 28, %%l1\n\t"
         "add %%sp, 92, %%l2\n"
     ".LcopyLong:\n\t"
@@ -149,10 +149,10 @@ void callVirtualMethod( void * pAdjustedThisPtr,
         "nop\n"
 
     ".LmoveOn:\n\t"
-        "mov %%i5, %%l0\n\t"        // prepare out registers
+        "mov %%i5, %%l0\n\t"		// prepare out registers
         "mov %%i4, %%l1\n\t"
 
-        "ld [%%l1], %%o0\n\t"       // prepare complex return ptr
+        "ld [%%l1], %%o0\n\t"		// prepare complex return ptr
         "st %%o0, [%%sp+64]\n\t"
         "sub %%l0, 1, %%l0\n\t"
         "add %%l1, 4, %%l1\n\t"
@@ -190,20 +190,20 @@ void callVirtualMethod( void * pAdjustedThisPtr,
         "ld [%%l1], %%o5\n"
 
     ".LdoCall:\n\t"
-        "ld [%%i0], %%l0\n\t"       // get vtable ptr
+        "ld [%%i0], %%l0\n\t"		// get vtable ptr
 
 "sll %%i1, 2, %%l6\n\t"
 //        "add %%l6, 8, %%l6\n\t"
         "add %%l6, %%l0, %%l0\n\t"
-//      // vtable has 8byte wide entries,
-//      // upper half contains 2 half words, of which the first
-//      // is the this ptr patch !
-//      // first entry is (or __tf)
+// 		// vtable has 8byte wide entries,
+// 		// upper half contains 2 half words, of which the first
+// 		// is the this ptr patch !
+// 		// first entry is (or __tf)
 
-//      "ldsh [%%l0], %%l6\n\t"     // load this ptr patch
-//      "add %%l6, %%o0, %%o0\n\t"  // patch this ptr
+// 		"ldsh [%%l0], %%l6\n\t"		// load this ptr patch
+// 		"add %%l6, %%o0, %%o0\n\t"	// patch this ptr
 
-//      "add %%l0, 4, %%l0\n\t"     // get virtual function ptr
+// 		"add %%l0, 4, %%l0\n\t"		// get virtual function ptr
         "ld [%%l0], %%l0\n\t"
 
         "ld [%%i4], %%l2\n\t"
@@ -220,8 +220,8 @@ void callVirtualMethod( void * pAdjustedThisPtr,
         "unimp\n"
 
     ".LcallReturned:\n\t"
-        "mov %%l3, %%sp\n\t"        // readjust stack so that our locals are where they belong
-        "st %%o0, %0\n\t"           // save possible return registers into our locals
+        "mov %%l3, %%sp\n\t"		// readjust stack so that our locals are where they belong
+        "st %%o0, %0\n\t"			// save possible return registers into our locals
         "st %%o1, %1\n\t"
         "std %%f0, %2\n\t"
         "st %%f0, %3\n\t"
@@ -284,17 +284,17 @@ static void cpp_call(
     void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
 {
       // max space for: complex ret ptr, this, values|ptr ...
-      char * pCppStack  =
+      char * pCppStack	=
           (char *)alloca( (nParams+2) * sizeof(sal_Int64) );
-      char * pCppStackStart = pCppStack;
-
+      char * pCppStackStart	= pCppStack;
+    
     // return
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -325,9 +325,9 @@ static void cpp_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
@@ -336,7 +336,7 @@ static void cpp_call(
         if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
             pCppArgs[ nPos ] = CPPU_CURRENT_NAMESPACE::adjustPointer(pCppStack, pParamTypeDescr );
-
+            
             switch (pParamTypeDescr->eTypeClass)
             {
             case typelib_TypeClass_HYPER:
@@ -378,7 +378,7 @@ static void cpp_call(
                     *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
                                     pUnoArgs[nPos], pParamTypeDescr,
                     pThis->getBridge()->getUno2Cpp() );
-
+                
                 pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
                 // will be released at reconversion
                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -397,7 +397,7 @@ static void cpp_call(
     {
         int nStackLongs = (pCppStack - pCppStackStart)/sizeof(sal_Int32);
         OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
-
+        
         if( nStackLongs & 1 )
             // stack has to be 8 byte aligned
             nStackLongs++;
@@ -416,7 +416,7 @@ static void cpp_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -433,7 +433,7 @@ static void cpp_call(
             }
             // destroy temp cpp param => cpp: every param was constructed
             uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return value
@@ -447,7 +447,7 @@ static void cpp_call(
      catch( ... )
      {
          // get exception
-           fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions,
+           fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, 
                                 *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
 
         // temporary params
@@ -476,12 +476,12 @@ void unoInterfaceProxyDispatch(
     OString cstr( OUStringToOString( pMemberDescr->pTypeName, RTL_TEXTENCODING_ASCII_US ) );
     fprintf( stderr, "received dispatch( %s )\n", cstr.getStr() );
 #endif
-
+    
     // is my surrogate
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
        = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
     typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-
+    
     switch (pMemberDescr->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -506,14 +506,14 @@ void unoInterfaceProxyDispatch(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
 
             typelib_TypeDescriptionReference * pReturnTypeRef = 0;
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
             aVtableSlot.index += 1; // get, then set method
             cpp_call(
@@ -524,7 +524,7 @@ void unoInterfaceProxyDispatch(
 
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -555,7 +555,7 @@ void unoInterfaceProxyDispatch(
          (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
            pThis->pBridge->getUnoEnv(),
                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -585,7 +585,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
index cd74da7462df..67864122bd2b 100644
--- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,10 +64,10 @@ void cpp2uno_call(
     typelib_TypeDescription * pReturnTypeDescr = 0;
     if (pReturnTypeRef)
         TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
+    
     void * pUnoReturn = 0;
     void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -83,7 +83,7 @@ void cpp2uno_call(
             else {
                 pCppReturn = pReturnValue;
             }
-
+            
             pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType(
                               pReturnTypeDescr )
                           ? alloca( pReturnTypeDescr->nSize )
@@ -102,9 +102,9 @@ void cpp2uno_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
@@ -162,7 +162,7 @@ void cpp2uno_call(
         }
         pCppStack += sizeof(sal_Int32); // standard parameter length
     }
-
+    
     // ExceptionHolder
     uno_Any aUnoExc; // Any will be constructed by callee
     uno_Any * pUnoExc = &aUnoExc;
@@ -170,7 +170,7 @@ void cpp2uno_call(
     // invoke uno dispatch call
     (*pThis->getUnoI()->pDispatcher)(
         pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
+    
     // in case an exception occured...
     if (pUnoExc)
     {
@@ -178,14 +178,14 @@ void cpp2uno_call(
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn) // is in/inout => was constructed
                 uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
             TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
         }
         if (pReturnTypeDescr)
             TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
+        
         CPPU_CURRENT_NAMESPACE::raiseException(
             &aUnoExc, pThis->getBridge()->getUno2Cpp() );
             // has to destruct the any
@@ -197,7 +197,7 @@ void cpp2uno_call(
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bOut) // inout/out
             {
                 // convert and assign
@@ -207,7 +207,7 @@ void cpp2uno_call(
             }
             // destroy temp uno param
             uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return
@@ -238,7 +238,7 @@ extern "C" void cpp_vtable_call(
     void * pReturnValue )
 {
     OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-
+    
     // pCallStack: ret adr, [ret *], this, params
     void * pThis;
     if( nFunctionIndex & 0x80000000 )
@@ -254,9 +254,9 @@ extern "C" void cpp_vtable_call(
     bridges::cpp_uno::shared::CppInterfaceProxy * pCppI
         = bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(
             pThis);
-
+    
     typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
-
+    
     OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
@@ -264,13 +264,13 @@ extern "C" void cpp_vtable_call(
             rtl::OUString::createFromAscii("illegal vtable index!"),
             (XInterface *)pThis );
     }
-
+    
     // determine called method
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
     OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
 
     TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-
+    
     switch (aMemberDescr.get()->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -290,9 +290,9 @@ extern "C" void cpp_vtable_call(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
+            
             cpp2uno_call(
                 pCppI, aMemberDescr.get(),
                 0, // indicates void return
@@ -323,7 +323,7 @@ extern "C" void cpp_vtable_call(
                     pCppI->getBridge()->getCppEnv(),
                     (void **)&pInterface, pCppI->getOid().pData,
                     (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -374,9 +374,9 @@ unsigned char * codeSnippet(
     typelib_TypeDescription * returnTypeDescr = 0;
     if (returnType)
     TYPELIB_DANGER_GET( &returnTypeDescr, returnType );
-
+    
     typelib_TypeClass returnTypeClass = returnType ? returnType->eTypeClass : typelib_TypeClass_VOID;
-    if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass) &&
+    if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass) && 
     !bridges::cpp_uno::shared::isSmallStruct(returnTypeDescr)) {
         functionIndex |= 0x80000000;
     }
diff --git a/bridges/source/cpp_uno/mingw_intel/dllinit.cxx b/bridges/source/cpp_uno/mingw_intel/dllinit.cxx
index d215a3124470..8cc2af733a25 100644
--- a/bridges/source/cpp_uno/mingw_intel/dllinit.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/dllinit.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 #include <windows.h>
 
-
+ 
 void dso_init(void);
 void dso_exit(void);
 
diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx
index 7a4aca8b1b4d..7ad94a9ac65f 100644
--- a/bridges/source/cpp_uno/mingw_intel/except.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/mingw_intel/share.hxx b/bridges/source/cpp_uno/mingw_intel/share.hxx
index da2367ad172b..e4a6b379a840 100644
--- a/bridges/source/cpp_uno/mingw_intel/share.hxx
+++ b/bridges/source/cpp_uno/mingw_intel/share.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,25 +48,25 @@ struct _Unwind_Exception
 } __attribute__((__aligned__));
 
 struct __cxa_exception
-{
+{ 
     ::std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
+    void (*exceptionDestructor)(void *); 
+    
     ::std::unexpected_handler unexpectedHandler;
     ::std::terminate_handler terminateHandler;
-
+    
     __cxa_exception *nextException;
-
+    
     int handlerCount;
-
+    
     int handlerSwitchValue;
     const unsigned char *actionRecord;
     const unsigned char *languageSpecificData;
     void *catchTemp;
     void *adjustedPtr;
-
+    
     _Unwind_Exception unwindHeader;
-};
+};    
 
 extern "C" void *__cxa_allocate_exception(
     std::size_t thrown_size ) throw();
diff --git a/bridges/source/cpp_uno/mingw_intel/smallstruct.cxx b/bridges/source/cpp_uno/mingw_intel/smallstruct.cxx
index bcfb0df87902..7e8fff8345c7 100644
--- a/bridges/source/cpp_uno/mingw_intel/smallstruct.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/smallstruct.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/mingw_intel/smallstruct.hxx b/bridges/source/cpp_uno/mingw_intel/smallstruct.hxx
index f1eae96e6734..d24d5b274d60 100644
--- a/bridges/source/cpp_uno/mingw_intel/smallstruct.hxx
+++ b/bridges/source/cpp_uno/mingw_intel/smallstruct.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
index cbbe1312c464..8cf382211680 100644
--- a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -73,11 +73,11 @@ void callVirtualMethod(
 {
     // parameter list is mixed list of * and values
     // reference parameters are pointers
-
+    
     OSL_ENSURE( pStackLongs && pAdjustedThisPtr, "### null ptr!" );
     OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
     OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" );
-
+    
     // never called
     if (! pAdjustedThisPtr) CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something
 
@@ -161,7 +161,7 @@ void callVirtualMethod(
     }
 }
 
-//==================================================================================================
+//================================================================================================== 
 static void cpp_call(
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
     bridges::cpp_uno::shared::VtableSlot aVtableSlot,
@@ -170,21 +170,21 @@ static void cpp_call(
     void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
 {
       // max space for: [complex ret ptr], values|ptr ...
-      char * pCppStack      =
+      char * pCppStack		=
 #ifdef BROKEN_ALLOCA
           (char *)malloc( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
 #else
           (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) );
 #endif
-      char * pCppStackStart = pCppStack;
-
+      char * pCppStackStart	= pCppStack;
+    
     // return
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -227,21 +227,21 @@ static void cpp_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
+        
         if (!rParam.bOut
             && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
             uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
                                     pThis->getBridge()->getUno2Cpp() );
-
+            
             switch (pParamTypeDescr->eTypeClass)
             {
             case typelib_TypeClass_HYPER:
@@ -283,7 +283,7 @@ static void cpp_call(
 #endif
                     pUnoArgs[nPos], pParamTypeDescr,
                     pThis->getBridge()->getUno2Cpp() );
-
+                
                 pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
                 // will be released at reconversion
                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -307,13 +307,13 @@ static void cpp_call(
             (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
         // NO exception occured...
         *ppUnoExc = 0;
-
+        
         // reconvert temporary params
         for ( ; nTempIndizes--; )
         {
             sal_Int32 nIndex = pTempIndizes[nTempIndizes];
             typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
-
+            
             if (pParams[nIndex].bIn)
             {
                 if (pParams[nIndex].bOut) // inout
@@ -333,7 +333,7 @@ static void cpp_call(
 #ifdef BROKEN_ALLOCA
             free( pCppArgs[nIndex] );
 #endif
-
+            
             TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         // return value
@@ -348,7 +348,7 @@ static void cpp_call(
      {
           // fill uno exception
         fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
-
+        
         // temporary params
         for ( ; nTempIndizes--; )
         {
@@ -386,7 +386,7 @@ void unoInterfaceProxyDispatch(
     // is my surrogate
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
         = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
-
+    
     switch (pMemberDescr->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -411,14 +411,14 @@ void unoInterfaceProxyDispatch(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
 
             typelib_TypeDescriptionReference * pReturnTypeRef = 0;
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
             aVtableSlot.index += 1; // get, then set method
             cpp_call(
@@ -426,10 +426,10 @@ void unoInterfaceProxyDispatch(
                 pReturnTypeRef,
                 1, &aParam,
                 pReturn, pArgs, ppException );
-
+            
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -460,7 +460,7 @@ void unoInterfaceProxyDispatch(
                 (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
                     pThis->pBridge->getUnoEnv(),
                     (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -490,7 +490,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
index b2687fddc543..34e0de99c86f 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -287,8 +287,8 @@ static typelib_TypeClass __cdecl cpp_mediate(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
 
             eRet = cpp2uno_call(
                 pCppI, aMemberDescr.get(),
@@ -370,40 +370,40 @@ static __declspec(naked) void __cdecl cpp_vtable_call(void)
 {
 __asm
     {
-        sub     esp, 8      // space for immediate return type
-        push    esp
+        sub		esp, 8		// space for immediate return type
+        push	esp
         push    edx         // vtable offset
-        push    eax         // function index
-        mov     eax, esp
-        add     eax, 20
-        push    eax         // original stack ptr
-
-        call    cpp_mediate
-        add     esp, 16
-
-        cmp     eax, typelib_TypeClass_FLOAT
-        je      Lfloat
-        cmp     eax, typelib_TypeClass_DOUBLE
-        je      Ldouble
-        cmp     eax, typelib_TypeClass_HYPER
-        je      Lhyper
-        cmp     eax, typelib_TypeClass_UNSIGNED_HYPER
-        je      Lhyper
+        push	eax			// function index
+        mov		eax, esp
+        add		eax, 20
+        push	eax			// original stack ptr
+
+        call	cpp_mediate
+        add		esp, 16
+
+        cmp		eax, typelib_TypeClass_FLOAT
+        je		Lfloat
+        cmp		eax, typelib_TypeClass_DOUBLE
+        je		Ldouble
+        cmp		eax, typelib_TypeClass_HYPER
+        je		Lhyper
+        cmp		eax, typelib_TypeClass_UNSIGNED_HYPER
+        je		Lhyper
         // rest is eax
-        pop     eax
-        add     esp, 4
+        pop		eax
+        add		esp, 4
         ret
 Lhyper:
-        pop     eax
-        pop     edx
+        pop		eax
+        pop		edx
         ret
 Lfloat:
-        fld     dword ptr [esp]
-        add     esp, 8
+        fld		dword ptr [esp]
+        add		esp, 8
         ret
 Ldouble:
-        fld     qword ptr [esp]
-        add     esp, 8
+        fld		qword ptr [esp]
+        add		esp, 8
         ret
     }
 }
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx b/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx
index cfbc58650f0d..4505157e2143 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
 #include <windows.h>
 #pragma warning(pop)
 
-
+ 
 void dso_init(void);
 void dso_exit(void);
 
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index 4bda7cfa9074..a7648d2922d4 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -102,8 +102,8 @@ typedef hash_map< OUString, void *, OUStringHash, equal_to< OUString > > t_strin
 //==================================================================================================
 class RTTInfos
 {
-    Mutex               _aMutex;
-    t_string2PtrMap     _allRTTI;
+    Mutex				_aMutex;
+    t_string2PtrMap		_allRTTI;
 
     static OUString toRawName( OUString const & rUNOname ) throw ();
 public:
@@ -199,12 +199,12 @@ struct ObjectFunction
 
     inline static void * operator new ( size_t nSize );
     inline static void operator delete ( void * pMem );
-
+    
     ObjectFunction( typelib_TypeDescription * pTypeDescr, void * fpFunc ) throw ();
     ~ObjectFunction() throw ();
 };
 
-inline void * ObjectFunction::operator new ( size_t nSize )
+inline void * ObjectFunction::operator new ( size_t nSize ) 
 {
     void * pMem = rtl_allocateMemory( nSize );
     if (pMem != 0)
@@ -272,7 +272,7 @@ static __declspec(naked) void copyConstruct() throw ()
     {
         // ObjectFunction this already on stack
         push [esp+8]  // source exc object this
-        push ecx      // exc object
+        push ecx	  // exc object
         call __copyConstruct
         add  esp, 12  // + ObjectFunction this
         ret  4
@@ -284,7 +284,7 @@ static __declspec(naked) void destruct() throw ()
     __asm
     {
         // ObjectFunction this already on stack
-        push ecx    // exc object
+        push ecx	// exc object
         call __destruct
         add  esp, 8 // + ObjectFunction this
         ret
@@ -294,11 +294,11 @@ static __declspec(naked) void destruct() throw ()
 //==================================================================================================
 struct ExceptionType
 {
-    sal_Int32           _n0;
-    type_info *         _pTypeInfo;
-    sal_Int32           _n1, _n2, _n3, _n4;
-    ObjectFunction *    _pCopyCtor;
-    sal_Int32           _n5;
+    sal_Int32			_n0;
+    type_info *			_pTypeInfo;
+    sal_Int32			_n1, _n2, _n3, _n4;
+    ObjectFunction *	_pCopyCtor;
+    sal_Int32			_n5;
 
     inline ExceptionType( typelib_TypeDescription * pTypeDescr ) throw ()
         : _n0( 0 )
@@ -315,11 +315,11 @@ struct ExceptionType
 //==================================================================================================
 struct RaiseInfo
 {
-    sal_Int32           _n0;
-    ObjectFunction *    _pDtor;
-    sal_Int32           _n2;
-    void *              _types;
-    sal_Int32           _n3, _n4;
+    sal_Int32			_n0;
+    ObjectFunction *	_pDtor;
+    sal_Int32			_n2;
+    void *				_types;
+    sal_Int32			_n3, _n4;
 
     RaiseInfo( typelib_TypeDescription * pTypeDescr ) throw ();
     ~RaiseInfo() throw ();
@@ -374,8 +374,8 @@ RaiseInfo::~RaiseInfo() throw ()
 //==================================================================================================
 class ExceptionInfos
 {
-    Mutex           _aMutex;
-    t_string2PtrMap _allRaiseInfos;
+    Mutex			_aMutex;
+    t_string2PtrMap	_allRaiseInfos;
 
 public:
     static void * getRaiseInfo( typelib_TypeDescription * pTypeDescr ) throw ();
@@ -393,7 +393,7 @@ ExceptionInfos::~ExceptionInfos() throw ()
 #if OSL_DEBUG_LEVEL > 1
     OSL_TRACE( "> freeing exception infos... <\n" );
 #endif
-
+    
     MutexGuard aGuard( _aMutex );
     for ( t_string2PtrMap::const_iterator iPos( _allRaiseInfos.begin() );
           iPos != _allRaiseInfos.end(); ++iPos )
@@ -513,7 +513,7 @@ int msci_filterCppException(
     // handle only C++ exceptions:
     if (pRecord == 0 || pRecord->ExceptionCode != MSVC_ExceptionCode)
         return EXCEPTION_CONTINUE_SEARCH;
-
+    
 #if _MSC_VER < 1300 // MSVC -6
     bool rethrow = (pRecord->NumberParameters < 3 ||
                     pRecord->ExceptionInformation[ 2 ] == 0);
@@ -546,9 +546,9 @@ int msci_filterCppException(
     // rethrow: handle only C++ exceptions:
     if (pRecord == 0 || pRecord->ExceptionCode != MSVC_ExceptionCode)
         return EXCEPTION_CONTINUE_SEARCH;
-
+    
     if (pRecord->NumberParameters == 3 &&
-//          pRecord->ExceptionInformation[ 0 ] == MSVC_magic_number &&
+//  		pRecord->ExceptionInformation[ 0 ] == MSVC_magic_number &&
         pRecord->ExceptionInformation[ 1 ] != 0 &&
         pRecord->ExceptionInformation[ 2 ] != 0)
     {
@@ -566,7 +566,7 @@ int msci_filterCppException(
                             pType->_pTypeInfo )->_m_d_name,
                         RTL_TEXTENCODING_ASCII_US ) );
                 OUString aUNOname( toUNOname( aRTTIname ) );
-
+                
                 typelib_TypeDescription * pExcTypeDescr = 0;
                 typelib_typedescription_getByName(
                     &pExcTypeDescr, aUNOname.pData );
@@ -610,7 +610,7 @@ int msci_filterCppException(
 #endif
                     typelib_typedescription_release( pExcTypeDescr );
                 }
-
+                
                 return EXCEPTION_EXECUTE_HANDLER;
             }
         }
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx b/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx
index ecc4e22960d7..7f8cf6ed746c 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@ const long MSVC_magic_number = 0x19930520L;
 
 //==============================================================================
 type_info * msci_getRTTI( ::rtl::OUString const & rUNOname );
-
+ 
 //==============================================================================
 int msci_filterCppException(
     EXCEPTION_POINTERS * pPointers, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno );
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
index 0a131e94a05b..1667e216e3be 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,91 +59,91 @@ inline static void callVirtualMethod(
     OSL_ENSURE( pStackLongs && pAdjustedThisPtr, "### null ptr!" );
     OSL_ENSURE( (sizeof(void *) == 4) &&
                  (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-
+    
 __asm
     {
-        mov     eax, nStackLongs
-        test    eax, eax
-        je      Lcall
+        mov		eax, nStackLongs
+        test	eax, eax
+        je		Lcall
         // copy values
-        mov     ecx, eax
-        shl     eax, 2           // sizeof(sal_Int32) == 4
-        add     eax, pStackLongs // params stack space
-Lcopy:  sub     eax, 4
-        push    dword ptr [eax]
-        dec     ecx
-        jne     Lcopy
+        mov		ecx, eax
+        shl		eax, 2			 // sizeof(sal_Int32) == 4
+        add		eax, pStackLongs // params stack space
+Lcopy:	sub		eax, 4
+        push	dword ptr [eax]
+        dec		ecx
+        jne		Lcopy
 Lcall:
         // call
-        mov     ecx, pAdjustedThisPtr
-        push    ecx             // this ptr
-        mov     edx, [ecx]      // pvft
-        mov     eax, nVtableIndex
-        shl     eax, 2          // sizeof(void *) == 4
-        add     edx, eax
-        call    [edx]           // interface method call must be __cdecl!!!
+        mov		ecx, pAdjustedThisPtr
+        push	ecx				// this ptr
+        mov		edx, [ecx]		// pvft
+        mov		eax, nVtableIndex
+        shl		eax, 2			// sizeof(void *) == 4
+        add		edx, eax
+        call	[edx]			// interface method call must be __cdecl!!!
 
         // register return
-        mov     ecx, eReturnTypeClass
-        cmp     ecx, typelib_TypeClass_VOID
-        je      Lcleanup
-        mov     ebx, pRegisterReturn
+        mov		ecx, eReturnTypeClass
+        cmp		ecx, typelib_TypeClass_VOID
+        je		Lcleanup
+        mov		ebx, pRegisterReturn
 // int32
-        cmp     ecx, typelib_TypeClass_LONG
-        je      Lint32
-        cmp     ecx, typelib_TypeClass_UNSIGNED_LONG
-        je      Lint32
-        cmp     ecx, typelib_TypeClass_ENUM
-        je      Lint32
+        cmp		ecx, typelib_TypeClass_LONG
+        je		Lint32
+        cmp		ecx, typelib_TypeClass_UNSIGNED_LONG
+        je		Lint32
+        cmp		ecx, typelib_TypeClass_ENUM
+        je		Lint32
 // int8
-        cmp     ecx, typelib_TypeClass_BOOLEAN
-        je      Lint8
-        cmp     ecx, typelib_TypeClass_BYTE
-        je      Lint8
+        cmp		ecx, typelib_TypeClass_BOOLEAN
+        je		Lint8
+        cmp		ecx, typelib_TypeClass_BYTE
+        je		Lint8
 // int16
-        cmp     ecx, typelib_TypeClass_CHAR
-        je      Lint16
-        cmp     ecx, typelib_TypeClass_SHORT
-        je      Lint16
-        cmp     ecx, typelib_TypeClass_UNSIGNED_SHORT
-        je      Lint16
+        cmp		ecx, typelib_TypeClass_CHAR
+        je		Lint16
+        cmp		ecx, typelib_TypeClass_SHORT
+        je		Lint16
+        cmp		ecx, typelib_TypeClass_UNSIGNED_SHORT
+        je		Lint16
 // float
-        cmp     ecx, typelib_TypeClass_FLOAT
-        je      Lfloat
+        cmp		ecx, typelib_TypeClass_FLOAT
+        je		Lfloat
 // double
-        cmp     ecx, typelib_TypeClass_DOUBLE
-        je      Ldouble
+        cmp		ecx, typelib_TypeClass_DOUBLE
+        je		Ldouble
 // int64
-        cmp     ecx, typelib_TypeClass_HYPER
-        je      Lint64
-        cmp     ecx, typelib_TypeClass_UNSIGNED_HYPER
-          je        Lint64
-        jmp     Lcleanup // no simple type
+        cmp		ecx, typelib_TypeClass_HYPER
+        je		Lint64
+        cmp		ecx, typelib_TypeClass_UNSIGNED_HYPER
+          je		Lint64
+        jmp		Lcleanup // no simple type
 Lint8:
-        mov     byte ptr [ebx], al
-        jmp     Lcleanup
+        mov		byte ptr [ebx], al
+        jmp		Lcleanup
 Lint16:
-        mov     word ptr [ebx], ax
-        jmp     Lcleanup
+        mov		word ptr [ebx], ax
+        jmp		Lcleanup
 Lfloat:
-        fstp    dword ptr [ebx]
-        jmp     Lcleanup
+        fstp	dword ptr [ebx]
+        jmp		Lcleanup
 Ldouble:
-        fstp    qword ptr [ebx]
-        jmp     Lcleanup
+        fstp	qword ptr [ebx]
+        jmp		Lcleanup
 Lint64:
-        mov     dword ptr [ebx], eax
-        mov     dword ptr [ebx+4], edx
-        jmp     Lcleanup
+        mov		dword ptr [ebx], eax
+        mov		dword ptr [ebx+4], edx
+        jmp		Lcleanup
 Lint32:
-        mov     dword ptr [ebx], eax
-        jmp     Lcleanup
+        mov		dword ptr [ebx], eax
+        jmp		Lcleanup
 Lcleanup:
         // cleanup stack (obsolete though because of function)
-        mov     eax, nStackLongs
-        shl     eax, 2          // sizeof(sal_Int32) == 4
-        add     eax, 4          // this ptr
-        add     esp, eax
+        mov		eax, nStackLongs
+        shl		eax, 2			// sizeof(sal_Int32) == 4
+        add		eax, 4			// this ptr
+        add		esp, eax
     }
 }
 
@@ -156,16 +156,16 @@ static void cpp_call(
     void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc ) throw ()
 {
     // max space for: [complex ret ptr], values|ptr ...
-    char * pCppStack        = (char *)alloca( sizeof(sal_Int32) + (nParams * sizeof(sal_Int64)) );
-    char * pCppStackStart   = pCppStack;
-
+    char * pCppStack		= (char *)alloca( sizeof(sal_Int32) + (nParams * sizeof(sal_Int64)) );
+    char * pCppStackStart	= pCppStack;
+    
     // return
     typelib_TypeDescription * pReturnTypeDescr = 0;
     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
-
+    
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-
+    
     if (pReturnTypeDescr)
     {
         if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
@@ -193,22 +193,22 @@ static void cpp_call(
     sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
     // type descriptions for reconversions
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
-
+    
     sal_Int32 nTempIndizes   = 0;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
         typelib_TypeDescription * pParamTypeDescr = 0;
         TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
+        
         if (!rParam.bOut
             && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
         {
             ::uno_copyAndConvertData(
                 pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
                 pThis->getBridge()->getUno2Cpp() );
-
+            
             switch (pParamTypeDescr->eTypeClass)
             {
             case typelib_TypeClass_HYPER:
@@ -242,7 +242,7 @@ static void cpp_call(
                     *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
                     pUnoArgs[nPos], pParamTypeDescr,
                     pThis->getBridge()->getUno2Cpp() );
-
+                
                 pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
                 // will be released at reconversion
                 ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
@@ -290,17 +290,17 @@ static void cpp_call(
         // end here
         return;
     }
-
+    
     // NO exception occured
     *ppUnoExc = 0;
-
+    
     // reconvert temporary params
     while (nTempIndizes--)
     {
         sal_Int32 nIndex = pTempIndizes[nTempIndizes];
         typelib_TypeDescription * pParamTypeDescr =
             ppTempParamTypeDescr[nTempIndizes];
-
+        
         if (pParams[nIndex].bIn)
         {
             if (pParams[nIndex].bOut) // inout
@@ -321,7 +321,7 @@ static void cpp_call(
         // destroy temp cpp param => cpp: every param was constructed
         ::uno_destructData(
             pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
+        
         TYPELIB_DANGER_RELEASE( pParamTypeDescr );
     }
     // return value
@@ -351,7 +351,7 @@ void unoInterfaceProxyDispatch(
     // is my surrogate
     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
         = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
-
+    
     switch (pMemberDescr->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE_ATTRIBUTE:
@@ -376,14 +376,14 @@ void unoInterfaceProxyDispatch(
             typelib_MethodParameter aParam;
             aParam.pTypeRef =
                 ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
+            aParam.bIn		= sal_True;
+            aParam.bOut		= sal_False;
+            
             typelib_TypeDescriptionReference * pReturnTypeRef = 0;
             OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
             typelib_typedescriptionreference_new(
                 &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
+            
             // dependent dispatch
             aVtableSlot.index += 1; // get, then set method
             cpp_call(
@@ -391,10 +391,10 @@ void unoInterfaceProxyDispatch(
                 pReturnTypeRef,
                 1, &aParam,
                 pReturn, pArgs, ppException );
-
+            
             typelib_typedescriptionreference_release( pReturnTypeRef );
         }
-
+        
         break;
     }
     case typelib_TypeClass_INTERFACE_METHOD:
@@ -425,7 +425,7 @@ void unoInterfaceProxyDispatch(
                 (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
                     pThis->pBridge->getUnoEnv(),
                     (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
-
+            
                 if (pInterface)
                 {
                     ::uno_any_construct(
@@ -455,7 +455,7 @@ void unoInterfaceProxyDispatch(
         ::com::sun::star::uno::RuntimeException aExc(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
-
+        
         Type const & rExcType = ::getCppuType( &aExc );
         // binary identical null reference
         ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
diff --git a/bridges/source/cpp_uno/shared/bridge.cxx b/bridges/source/cpp_uno/shared/bridge.cxx
index 0b76b0ca1a8a..922a5bd40a99 100644
--- a/bridges/source/cpp_uno/shared/bridge.cxx
+++ b/bridges/source/cpp_uno/shared/bridge.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx
index 2c89217c9721..32365c307bf6 100644
--- a/bridges/source/cpp_uno/shared/component.cxx
+++ b/bridges/source/cpp_uno/shared/component.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/shared/component.hxx b/bridges/source/cpp_uno/shared/component.hxx
index 7be6cd7a6355..f700b6f58147 100644
--- a/bridges/source/cpp_uno/shared/component.hxx
+++ b/bridges/source/cpp_uno/shared/component.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
index 5b3c8eeba37e..4ebe6c042571 100644
--- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,7 +62,7 @@ void dso_init(void) {
 }
 
 void dso_exit(void) {
-    if (pInstance)
+    if (pInstance) 
     {
         delete pInstance;
         pInstance = NULL;
diff --git a/bridges/source/cpp_uno/shared/guardedarray.hxx b/bridges/source/cpp_uno/shared/guardedarray.hxx
index 9e4e0f3b0cad..bd22752ee0f0 100644
--- a/bridges/source/cpp_uno/shared/guardedarray.hxx
+++ b/bridges/source/cpp_uno/shared/guardedarray.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/shared/types.cxx b/bridges/source/cpp_uno/shared/types.cxx
index cf442082f283..efa657725248 100644
--- a/bridges/source/cpp_uno/shared/types.cxx
+++ b/bridges/source/cpp_uno/shared/types.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
index e3159f12190d..7cced6e19ae7 100644
--- a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 02247de10bf3..667fe7f56ec3 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/cpp_uno/shared/vtables.cxx b/bridges/source/cpp_uno/shared/vtables.cxx
index 40436d0224fb..eb65e3bb46a9 100644
--- a/bridges/source/cpp_uno/shared/vtables.cxx
+++ b/bridges/source/cpp_uno/shared/vtables.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
index 223b53a7013f..8041d9a7f96c 100644
--- a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
+++ b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,12 +38,12 @@ public final class JNI_info_holder
     }
 
     private static JNI_info_holder s_holder = new JNI_info_holder();
-
+    
     private static long s_jni_info_handle;
-
+    
     //__________________________________________________________________________
     private native void finalize( long jni_info_handle );
-
+    
     //__________________________________________________________________________
     protected void finalize()
     {
diff --git a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
index 076d568e9c91..877b08287320 100644
--- a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
+++ b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,14 +46,14 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
         JNI_proxy.class.getClassLoader();
     protected static Class s_InvocationHandler [] =
         new Class [] { java.lang.reflect.InvocationHandler.class };
-
+    
     protected long m_bridge_handle;
     protected IEnvironment m_java_env;
     protected long m_receiver_handle;
     protected long m_td_handle;
     protected Type m_type;
     protected String m_oid;
-    protected Class m_class;
+    protected Class m_class;    
 
     //__________________________________________________________________________
     public static String get_stack_trace( Throwable throwable )
@@ -83,10 +83,10 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
         }
         return "\njava stack trace:\n" + trace;
     }
-
+    
     //__________________________________________________________________________
     private native void finalize( long bridge_handle );
-
+    
     //__________________________________________________________________________
     public void finalize()
     {
@@ -96,7 +96,7 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
                 }
             });
     }
-
+    
     //__________________________________________________________________________
     private JNI_proxy(
         long bridge_handle, IEnvironment java_env,
@@ -110,7 +110,7 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
         m_oid = oid;
         m_class = m_type.getZClass();
     }
-
+    
     //__________________________________________________________________________
     public static Object create(
         long bridge_handle, IEnvironment java_env,
@@ -123,7 +123,7 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
         Object proxy = proxy_ctor.newInstance( new Object [] { handler } );
         return java_env.registerInterface( proxy, new String [] { oid }, type );
     }
-
+    
     //__________________________________________________________________________
     public static java.lang.reflect.Constructor get_proxy_ctor( Class clazz )
         throws Throwable
@@ -134,12 +134,12 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
                            com.sun.star.lib.uno.Proxy.class } );
         return proxy_class.getConstructor( s_InvocationHandler );
     }
-
+    
     //__________________________________________________________________________
     private native Object dispatch_call(
         long bridge_handle, String decl_class, String method, Object args [] )
         throws Throwable;
-
+    
     // InvocationHandler impl
     //__________________________________________________________________________
     public Object invoke(
@@ -148,7 +148,7 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
     {
         Class decl_class = method.getDeclaringClass();
         String method_name = method.getName();
-
+        
         if (Object.class.equals( decl_class ))
         {
             if (method_name.equals( "hashCode" ))
@@ -205,7 +205,7 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
                 return m_oid;
             }
         }
-
+        
         throw new com.sun.star.uno.RuntimeException(
             "[jni_uno bridge error] unexpected call on proxy " +
             proxy.toString() + ": " + method.toString() );
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h
index 7601648ad93a..ce8498826dd8 100644
--- a/bridges/source/jni_uno/jni_base.h
+++ b/bridges/source/jni_uno/jni_base.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,7 +62,7 @@ class JNI_info;
 struct BridgeRuntimeError
 {
     ::rtl::OUString m_message;
-
+    
     inline BridgeRuntimeError( ::rtl::OUString const & message )
         : m_message( message )
         {}
@@ -75,10 +75,10 @@ class JNI_context
     JNI_info const * m_jni_info;
     JNIEnv *         m_env;
     jobject          m_class_loader;
-
+    
     JNI_context( JNI_context & ); // not impl
     void operator = ( JNI_context ); // not impl
-
+    
     void java_exc_occured() const;
 public:
     inline explicit JNI_context(
@@ -87,10 +87,10 @@ public:
           m_env( env ),
           m_class_loader( class_loader )
         {}
-
+    
     inline JNI_info const * get_info() const
         { return m_jni_info; }
-
+    
     inline JNIEnv * operator -> () const
         { return m_env; }
     inline JNIEnv * get_jni_env() const
@@ -105,10 +105,10 @@ public:
     jclass findClass(
         char const * name, jclass classClass, jmethodID methodForName,
         bool inException) const;
-
+    
     inline void ensure_no_exception() const; // throws BridgeRuntimeError
     inline bool assert_no_exception() const; // asserts and clears exception
-
+    
     ::rtl::OUString get_stack_trace( jobject jo_exc = 0 ) const;
 };
 
@@ -141,7 +141,7 @@ class JNI_guarded_context
 {
     JNI_guarded_context( JNI_guarded_context & ); // not impl
     void operator = ( JNI_guarded_context ); // not impl
-
+    
 public:
     inline explicit JNI_guarded_context(
         JNI_info const * jni_info, ::jvmaccess::UnoVirtualMachine * vm_access )
@@ -158,7 +158,7 @@ class JLocalAutoRef
 {
     JNI_context const & m_jni;
     jobject m_jo;
-
+    
 public:
     inline JLocalAutoRef( JNI_context const & jni )
         : m_jni( jni ),
@@ -170,7 +170,7 @@ public:
         {}
     inline JLocalAutoRef( JLocalAutoRef & auto_ref );
     inline ~JLocalAutoRef() SAL_THROW( () );
-
+    
     inline jobject get() const
         { return m_jo; }
     inline bool is() const
@@ -244,7 +244,7 @@ struct rtl_mem
         { return mem; }
     inline static void operator delete ( void *, void * )
         {}
-
+    
     static inline ::std::auto_ptr< rtl_mem > allocate( ::std::size_t bytes );
 };
 
@@ -262,15 +262,15 @@ inline ::std::auto_ptr< rtl_mem > rtl_mem::allocate( ::std::size_t bytes )
 class TypeDescr
 {
     typelib_TypeDescription * m_td;
-
+    
     TypeDescr( TypeDescr & ); // not impl
     void operator = ( TypeDescr ); // not impl
-
+    
 public:
     inline explicit TypeDescr( typelib_TypeDescriptionReference * td_ref );
     inline ~TypeDescr() SAL_THROW( () )
         { TYPELIB_DANGER_RELEASE( m_td ); }
-
+    
     inline typelib_TypeDescription * get() const
         { return m_td; }
 };
diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx
index 3f9f22a98c38..cf572395726d 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -72,7 +72,7 @@ void SAL_CALL Mapping_map_to_uno(
 {
     uno_Interface ** ppUnoI = (uno_Interface **)ppOut;
     jobject javaI = (jobject) pIn;
-
+    
     OSL_ASSERT( sizeof (void *) == sizeof (jobject) );
     OSL_ENSURE( ppUnoI && td, "### null ptr!" );
 
@@ -95,7 +95,7 @@ void SAL_CALL Mapping_map_to_uno(
                 bridge->m_jni_info,
                 reinterpret_cast< ::jvmaccess::UnoVirtualMachine * >(
                     bridge->m_java_env->pContext ) );
-
+            
             JNI_interface_type_info const * info =
                 static_cast< JNI_interface_type_info const * >(
                     bridge->m_jni_info->get_type_info(
@@ -166,7 +166,7 @@ void SAL_CALL Mapping_map_to_java(
                 bridge->m_jni_info,
                 reinterpret_cast< ::jvmaccess::UnoVirtualMachine * >(
                     bridge->m_java_env->pContext ) );
-
+            
             JNI_interface_type_info const * info =
                 static_cast< JNI_interface_type_info const * >(
                     bridge->m_jni_info->get_type_info(
@@ -337,7 +337,7 @@ void JNI_context::java_exc_occured() const
             OUSTR("error examining java exception object!") +
             get_stack_trace() );
     }
-
+    
     jsize len = m_env->GetStringLength( (jstring) jo_descr.get() );
     auto_ptr< rtl_mem > ustr_mem(
         rtl_mem::allocate(
@@ -507,7 +507,7 @@ void SAL_CALL uno_ext_getMapping(
             OUString::unacquired( &pFrom->pTypeName );
         OUString const & to_env_typename =
             OUString::unacquired( &pTo->pTypeName );
-
+        
         uno_Mapping * mapping = 0;
 
         try
diff --git a/bridges/source/jni_uno/jni_bridge.h b/bridges/source/jni_uno/jni_bridge.h
index f2298fbdbe46..3bb1f0372456 100644
--- a/bridges/source/jni_uno/jni_bridge.h
+++ b/bridges/source/jni_uno/jni_bridge.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,25 +56,25 @@ struct Mapping : public uno_Mapping
 struct Bridge
 {
     mutable oslInterlockedCount m_ref;
-
+    
     uno_ExtEnvironment *        m_uno_env;
     uno_Environment *           m_java_env;
-
+    
     Mapping                     m_java2uno;
     Mapping                     m_uno2java;
     bool                        m_registered_java2uno;
-
+    
     JNI_info const *            m_jni_info;
-
+    
     //
     ~Bridge() SAL_THROW( () );
     explicit Bridge(
         uno_Environment * java_env, uno_ExtEnvironment * uno_env,
         bool registered_java2uno );
-
+    
     void acquire() const;
     void release() const;
-
+    
     // jni_data.cxx
     void map_to_uno(
         JNI_context const & jni,
@@ -90,7 +90,7 @@ struct Bridge
         JNI_type_info const * info /* maybe 0 */,
         bool in_param, bool out_param,
         bool special_wrapped_integral_types = false ) const;
-
+    
     // jni_uno2java.cxx
     void handle_uno_exc(
         JNI_context const & jni, uno_Any * uno_exc ) const;
@@ -104,7 +104,7 @@ struct Bridge
     jobject map_to_java(
         JNI_context const & jni,
         uno_Interface * pUnoI, JNI_interface_type_info const * info ) const;
-
+    
     // jni_java2uno.cxx
     void handle_java_exc(
         JNI_context const & jni,
diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx
index aca455d154ed..b8dc895b35fd 100644
--- a/bridges/source/jni_uno/jni_data.cxx
+++ b/bridges/source/jni_uno/jni_data.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -230,7 +230,7 @@ void Bridge::map_to_uno(
     OSL_ASSERT(
         !out_param ||
         (1 == jni->GetArrayLength( (jarray) java_data.l )) );
-
+    
     switch (type->eTypeClass)
     {
     case typelib_TypeClass_CHAR:
@@ -486,7 +486,7 @@ void Bridge::map_to_uno(
 
         JLocalAutoRef jo_type( jni );
         JLocalAutoRef jo_wrapped_holder( jni );
-
+        
         if (JNI_FALSE != jni->IsInstanceOf(
                 java_data.l, m_jni_info->m_class_Any ))
         {
@@ -534,7 +534,7 @@ void Bridge::map_to_uno(
         jni.ensure_no_exception();
         OUString type_name(
             jstring_to_oustring( jni, (jstring) jo_type_name.get() ) );
-
+        
         ::com::sun::star::uno::TypeDescription value_td( type_name );
         if (! value_td.is())
         {
@@ -725,7 +725,7 @@ void Bridge::map_to_uno(
             buf.append( jni.get_stack_trace() );
             throw BridgeRuntimeError( buf.makeStringAndClear() );
         }
-
+        
         *(jint *) uno_data = jni->GetIntField(
             java_data.l, m_jni_info->m_field_Enum_m_value );
         break;
@@ -1029,7 +1029,7 @@ void Bridge::map_to_uno(
 
         auto_ptr< rtl_mem > seq;
         sal_Int32 nElements = jni->GetArrayLength( (jarray) java_data.l );
-
+        
         switch (element_type->eTypeClass)
         {
         case typelib_TypeClass_CHAR:
@@ -1869,7 +1869,7 @@ void Bridge::map_to_java(
             OUStringToOString( type_name, RTL_TEXTENCODING_JAVA_UTF8 ) );
         JLocalAutoRef jo_enum_class(
             jni, find_class( jni, class_name.getStr() ) );
-
+        
         JLocalAutoRef jo_enum( jni );
         if (in_param)
         {
@@ -2354,7 +2354,7 @@ void Bridge::map_to_java(
                     element_type_name, RTL_TEXTENCODING_JAVA_UTF8 ) );
             JLocalAutoRef jo_enum_class(
                 jni, find_class( jni, class_name.getStr() ) );
-
+            
             jo_ar.reset(
                 jni->NewObjectArray(
                     nElements, (jclass) jo_enum_class.get(), 0 ) );
@@ -2394,7 +2394,7 @@ void Bridge::map_to_java(
         {
             JNI_type_info const * element_info =
                 m_jni_info->get_type_info( jni, element_type );
-
+            
             jo_ar.reset(
                 jni->NewObjectArray( nElements, element_info->m_class, 0 ) );
             jni.ensure_no_exception();
@@ -2427,7 +2427,7 @@ void Bridge::map_to_java(
             OString class_name( buf.makeStringAndClear() );
             JLocalAutoRef jo_seq_class(
                 jni, find_class( jni, class_name.getStr() ) );
-
+            
             jo_ar.reset(
                 jni->NewObjectArray(
                     nElements, (jclass) jo_seq_class.get(), 0 ) );
@@ -2456,7 +2456,7 @@ void Bridge::map_to_java(
             JNI_interface_type_info const * iface_info =
                 static_cast< JNI_interface_type_info const * >(
                     m_jni_info->get_type_info( jni, element_type ) );
-
+            
             jo_ar.reset(
                 jni->NewObjectArray( nElements, iface_info->m_class, 0 ) );
             jni.ensure_no_exception();
diff --git a/bridges/source/jni_uno/jni_helper.h b/bridges/source/jni_uno/jni_helper.h
index 293bf82d868e..80376dc63085 100644
--- a/bridges/source/jni_uno/jni_helper.h
+++ b/bridges/source/jni_uno/jni_helper.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx
index 6df598859d0a..d4ec229b852f 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -83,10 +83,10 @@ JNI_interface_type_info::JNI_interface_type_info(
     : JNI_type_info( jni, td_ )
 {
     OSL_ASSERT( typelib_TypeClass_INTERFACE == m_td.get()->eTypeClass );
-
+    
     OUString const & uno_name = OUString::unacquired( &m_td.get()->pTypeName );
     JNI_info const * jni_info = jni.get_info();
-
+    
     JLocalAutoRef jo_class(
         jni,
         find_class(
@@ -94,7 +94,7 @@ JNI_interface_type_info::JNI_interface_type_info(
             ( OUStringToOString( uno_name, RTL_TEXTENCODING_JAVA_UTF8 ).
               getStr() ) ) );
     JLocalAutoRef jo_type( jni, create_type( jni, (jclass) jo_class.get() ) );
-
+    
     // get proxy ctor
     jvalue arg;
     arg.l = jo_class.get();
@@ -102,7 +102,7 @@ JNI_interface_type_info::JNI_interface_type_info(
         jni, jni->CallStaticObjectMethodA(
             jni_info->m_class_JNI_proxy,
             jni_info->m_method_JNI_proxy_get_proxy_ctor, &arg ) );
-
+    
     if (is_XInterface( m_td.get()->pWeakRef ))
     {
         m_methods = 0; // no methods
@@ -111,21 +111,21 @@ JNI_interface_type_info::JNI_interface_type_info(
     {
         // retrieve method ids for all direct members
         try
-        {
+        { 
             typelib_InterfaceTypeDescription * td =
                 reinterpret_cast< typelib_InterfaceTypeDescription * >(
                     m_td.get() );
             m_methods = new jmethodID[ td->nMapFunctionIndexToMemberIndex ];
             sal_Int32 nMethodIndex = 0;
             typelib_TypeDescriptionReference ** ppMembers = td->ppMembers;
-            sal_Int32 nMembers = td->nMembers;
-
+            sal_Int32 nMembers = td->nMembers;        
+            
             for ( sal_Int32 nPos = 0; nPos < nMembers; ++nPos )
             {
                 TypeDescr member_td( ppMembers[ nPos ] );
-
+                
                 OStringBuffer sig_buf( 64 );
-
+                
                 if (typelib_TypeClass_INTERFACE_METHOD ==
                       member_td.get()->eTypeClass) // method
                 {
@@ -133,7 +133,7 @@ JNI_interface_type_info::JNI_interface_type_info(
                         reinterpret_cast<
                           typelib_InterfaceMethodTypeDescription * >(
                               member_td.get() );
-
+                    
                     sig_buf.append( '(' );
                     for ( sal_Int32 i = 0; i < method_td->nParams; ++i )
                     {
@@ -145,13 +145,13 @@ JNI_interface_type_info::JNI_interface_type_info(
                     }
                     sig_buf.append( ')' );
                     JNI_info::append_sig( &sig_buf, method_td->pReturnTypeRef );
-
+                    
                     OString method_signature( sig_buf.makeStringAndClear() );
                     OString method_name(
                         OUStringToOString( OUString::unacquired(
                                                &method_td->aBase.pMemberName ),
                                            RTL_TEXTENCODING_JAVA_UTF8 ) );
-
+                    
                     m_methods[ nMethodIndex ] = jni->GetMethodID(
                         (jclass) jo_class.get(), method_name.getStr(),
                         method_signature.getStr() );
@@ -168,7 +168,7 @@ JNI_interface_type_info::JNI_interface_type_info(
                         reinterpret_cast<
                           typelib_InterfaceAttributeTypeDescription * >(
                               member_td.get() );
-
+                    
                     // type sig
                     JNI_info::append_sig(
                         &sig_buf, attribute_td->pAttributeTypeRef );
@@ -178,7 +178,7 @@ JNI_interface_type_info::JNI_interface_type_info(
                     OUString const & member_name =
                         OUString::unacquired(
                             &attribute_td->aBase.pMemberName );
-
+                    
                     // getter
                     sig_buf.append( RTL_CONSTASCII_STRINGPARAM("()") );
                     sig_buf.append( type_sig );
@@ -252,7 +252,7 @@ JNI_compound_type_info::JNI_compound_type_info(
                 typelib_TypeClass_EXCEPTION == m_td.get()->eTypeClass );
     typelib_CompoundTypeDescription * td =
         reinterpret_cast< typelib_CompoundTypeDescription * >( m_td.get() );
-
+    
     OUString const & uno_name =
         OUString::unacquired( &((typelib_TypeDescription *)td)->pTypeName );
 
@@ -270,7 +270,7 @@ JNI_compound_type_info::JNI_compound_type_info(
             jni,
             OUStringToOString(
                 nucleus, RTL_TEXTENCODING_JAVA_UTF8 ).getStr() ) );
-
+    
     JNI_info const * jni_info = jni.get_info();
 
     if (typelib_TypeClass_EXCEPTION == m_td.get()->eTypeClass)
@@ -281,15 +281,15 @@ JNI_compound_type_info::JNI_compound_type_info(
         jni.ensure_no_exception();
         OSL_ASSERT( 0 != m_exc_ctor );
     }
-
+    
     // retrieve info for base type
     typelib_TypeDescription * base_td =
         reinterpret_cast< typelib_TypeDescription * >(
             td->pBaseTypeDescription );
     m_base = (0 == base_td ? 0 : jni_info->get_type_info( jni, base_td ));
-
+    
     try
-    {
+    { 
         if (type_equals(
                 ((typelib_TypeDescription *)td)->pWeakRef,
                 jni_info->m_Exception_type.getTypeLibType() ) ||
@@ -308,9 +308,9 @@ JNI_compound_type_info::JNI_compound_type_info(
         else
         {
             // retrieve field ids for all direct members
-            sal_Int32 nMembers = td->nMembers;
+            sal_Int32 nMembers = td->nMembers;        
             m_fields = new jfieldID[ nMembers ];
-
+            
             for ( sal_Int32 nPos = 0; nPos < nMembers; ++nPos )
             {
                 OString sig;
@@ -327,12 +327,12 @@ JNI_compound_type_info::JNI_compound_type_info(
                     JNI_info::append_sig( &sig_buf, td->ppTypeRefs[ nPos ] );
                     sig = sig_buf.makeStringAndClear();
                 }
-
+                
                 OString member_name(
                     OUStringToOString(
                         OUString::unacquired( &td->ppMemberNames[ nPos ] ),
                         RTL_TEXTENCODING_JAVA_UTF8 ) );
-
+                
                 m_fields[ nPos ] = jni->GetFieldID(
                     (jclass) jo_class.get(), member_name.getStr(),
                     sig.getStr() );
@@ -346,7 +346,7 @@ JNI_compound_type_info::JNI_compound_type_info(
         delete [] m_fields;
         throw;
     }
-
+    
     m_class = (jclass) jni->NewGlobalRef( jo_class.get() );
 }
 
@@ -356,7 +356,7 @@ JNI_type_info const * JNI_info::create_type_info(
     JNI_context const & jni, typelib_TypeDescription * td ) const
 {
     OUString const & uno_name = OUString::unacquired( &td->pTypeName );
-
+    
     JNI_type_info * new_info;
     switch (td->eTypeClass)
     {
@@ -381,7 +381,7 @@ JNI_type_info const * JNI_info::create_type_info(
         throw BridgeRuntimeError( buf.makeStringAndClear() );
     }
     }
-
+    
     // look up
     JNI_type_info * info;
     ClearableMutexGuard guard( m_mutex );
@@ -397,7 +397,7 @@ JNI_type_info const * JNI_info::create_type_info(
         info = holder.m_info;
         guard.clear();
         new_info->destroy( jni.get_jni_env() );
-    }
+    }    
     return info;
 }
 
@@ -409,7 +409,7 @@ JNI_type_info const * JNI_info::get_type_info(
     {
         return m_XInterface_type_info;
     }
-
+    
     OUString const & uno_name = OUString::unacquired( &td->pTypeName );
     JNI_type_info const * info;
     ClearableMutexGuard guard( m_mutex );
@@ -424,7 +424,7 @@ JNI_type_info const * JNI_info::get_type_info(
     {
         info = iFind->second.m_info;
     }
-
+    
     return info;
 }
 
@@ -436,7 +436,7 @@ JNI_type_info const * JNI_info::get_type_info(
     {
         return m_XInterface_type_info;
     }
-
+    
     OUString const & uno_name = OUString::unacquired( &type->pTypeName );
     JNI_type_info const * info;
     ClearableMutexGuard guard( m_mutex );
@@ -451,7 +451,7 @@ JNI_type_info const * JNI_info::get_type_info(
     {
         info = iFind->second.m_info;
     }
-
+    
     return info;
 }
 
@@ -464,13 +464,13 @@ JNI_type_info const * JNI_info::get_type_info(
     {
         return m_XInterface_type_info;
     }
-
+    
     JNI_type_info const * info;
     ClearableMutexGuard guard( m_mutex );
     t_str2type::const_iterator iFind( m_type_map.find( uno_name ) );
     if (iFind == m_type_map.end())
     {
-        guard.clear();
+        guard.clear();   
         css::uno::TypeDescription td( uno_name );
         if (! td.is())
         {
@@ -487,7 +487,7 @@ JNI_type_info const * JNI_info::get_type_info(
     {
         info = iFind->second.m_info;
     }
-
+    
     return info;
 }
 
@@ -553,7 +553,7 @@ JNI_info::JNI_info(
         jni, find_class( jni, "com.sun.star.uno.IEnvironment" ) );
     JLocalAutoRef jo_JNI_proxy(
         jni, find_class( jni, "com.sun.star.bridges.jni_uno.JNI_proxy" ) );
-
+    
     // method Object.toString()
     m_method_Object_toString = jni->GetMethodID(
         (jclass) jo_Object.get(), "toString", "()Ljava/lang/String;" );
@@ -564,13 +564,13 @@ JNI_info::JNI_info(
         (jclass) jo_Class.get(), "getName", "()Ljava/lang/String;" );
     jni.ensure_no_exception();
     OSL_ASSERT( 0 != m_method_Class_getName );
-
+    
     // method Throwable.getMessage()
     m_method_Throwable_getMessage = jni->GetMethodID(
         (jclass) jo_Throwable.get(), "getMessage", "()Ljava/lang/String;" );
     jni.ensure_no_exception();
     OSL_ASSERT( 0 != m_method_Throwable_getMessage );
-
+    
     // method Character.charValue()
     m_method_Character_charValue = jni->GetMethodID(
         (jclass) jo_Character.get(), "charValue", "()C" );
@@ -611,7 +611,7 @@ JNI_info::JNI_info(
         (jclass) jo_Double.get(), "doubleValue", "()D" );
     jni.ensure_no_exception();
     OSL_ASSERT( 0 != m_method_Double_doubleValue );
-
+    
     // ctor Character( char )
     m_ctor_Character_with_char = jni->GetMethodID(
         (jclass) jo_Character.get(), "<init>", "(C)V" );
@@ -652,7 +652,7 @@ JNI_info::JNI_info(
         (jclass) jo_Double.get(), "<init>", "(D)V" );
     jni.ensure_no_exception();
     OSL_ASSERT( 0 != m_ctor_Double_with_double );
-
+    
     // static method UnoRuntime.generateOid()
     m_method_UnoRuntime_generateOid = jni->GetStaticMethodID(
         (jclass) jo_UnoRuntime.get(),
@@ -666,20 +666,20 @@ JNI_info::JNI_info(
         "(Lcom/sun/star/uno/Type;Ljava/lang/Object;)Ljava/lang/Object;" );
     jni.ensure_no_exception();
     OSL_ASSERT( 0 != m_method_UnoRuntime_queryInterface );
-
+    
     // field Enum.m_value
     m_field_Enum_m_value = jni->GetFieldID(
         (jclass) jo_Enum.get(), "m_value", "I" );
     jni.ensure_no_exception();
     OSL_ASSERT( 0 != m_field_Enum_m_value );
-
+    
     // static method TypeClass.fromInt()
     m_method_TypeClass_fromInt = jni->GetStaticMethodID(
         (jclass) jo_TypeClass.get(),
         "fromInt", "(I)Lcom/sun/star/uno/TypeClass;" );
     jni.ensure_no_exception();
     OSL_ASSERT( 0 != m_method_TypeClass_fromInt );
-
+    
     // ctor Type( Class )
     m_ctor_Type_with_Class = jni->GetMethodID(
         (jclass) jo_Type.get(), "<init>", "(Ljava/lang/Class;)V" );
@@ -703,7 +703,7 @@ JNI_info::JNI_info(
         "<init>", "(Lcom/sun/star/uno/Type;Ljava/lang/Object;)V" );
     jni.ensure_no_exception();
     OSL_ASSERT( 0 != m_ctor_Any_with_Type_Object );
-
+    
     // field Any._type
     m_field_Any__type = jni->GetFieldID(
         (jclass) jo_Any.get(), "_type", "Lcom/sun/star/uno/Type;" );
@@ -714,7 +714,7 @@ JNI_info::JNI_info(
         (jclass) jo_Any.get(), "_object", "Ljava/lang/Object;" );
     jni.ensure_no_exception();
     OSL_ASSERT( 0 != m_field_Any__object );
-
+    
     // method IEnvironment.getRegisteredInterface()
     m_method_IEnvironment_getRegisteredInterface = jni->GetMethodID(
         (jclass) jo_IEnvironment.get(),
@@ -729,7 +729,7 @@ JNI_info::JNI_info(
         "Ljava/lang/Object;" );
     jni.ensure_no_exception();
     OSL_ASSERT( 0 != m_method_IEnvironment_registerInterface );
-
+    
     // static method JNI_proxy.get_proxy_ctor()
     m_method_JNI_proxy_get_proxy_ctor = jni->GetStaticMethodID(
         (jclass) jo_JNI_proxy.get(), "get_proxy_ctor",
@@ -763,7 +763,7 @@ JNI_info::JNI_info(
         (jclass) jo_JNI_proxy.get(), "m_oid", "Ljava/lang/String;" );
     jni.ensure_no_exception();
     OSL_ASSERT( 0 != m_field_JNI_proxy_m_oid );
-
+    
     // get java env
     OUString java_env_type_name( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_JAVA) );
     JLocalAutoRef jo_java(
@@ -780,7 +780,7 @@ JNI_info::JNI_info(
     JLocalAutoRef jo_java_env(
         jni, jni->CallStaticObjectMethodA(
             (jclass) jo_UnoRuntime.get(), method_getEnvironment, args ) );
-
+    
     // get com.sun.star.uno.Any.VOID
     jfieldID field_Any_VOID = jni->GetStaticFieldID(
         (jclass) jo_Any.get(), "VOID", "Lcom/sun/star/uno/Any;" );
@@ -813,7 +813,7 @@ JNI_info::JNI_info(
     JLocalAutoRef jo_Type_UNSIGNED_HYPER(
         jni, jni->GetStaticObjectField(
             (jclass) jo_Type.get(), field_Type_UNSIGNED_HYPER ) );
-
+    
     // make global refs
     m_class_UnoRuntime =
         (jclass) jni->NewGlobalRef( jo_UnoRuntime.get() );
@@ -827,7 +827,7 @@ JNI_info::JNI_info(
         (jclass) jni->NewGlobalRef( jo_TypeClass.get() );
     m_class_JNI_proxy =
         (jclass) jni->NewGlobalRef( jo_JNI_proxy.get() );
-
+    
     m_class_Character =
         (jclass) jni->NewGlobalRef( jo_Character.get() );
     m_class_Boolean =
@@ -850,7 +850,7 @@ JNI_info::JNI_info(
         (jclass) jni->NewGlobalRef( jo_Object.get() );
     m_class_Class =
         (jclass) jni->NewGlobalRef( m_class_Class );
-
+    
     m_object_Any_VOID =
         jni->NewGlobalRef( jo_Any_VOID.get() );
     m_object_Type_UNSIGNED_SHORT =
@@ -860,7 +860,7 @@ JNI_info::JNI_info(
     m_object_Type_UNSIGNED_HYPER =
         jni->NewGlobalRef( jo_Type_UNSIGNED_HYPER.get() );
     m_object_java_env = jni->NewGlobalRef( jo_java_env.get() );
-
+    
     try
     {
         css::uno::TypeDescription XInterface_td(
@@ -890,14 +890,14 @@ void JNI_info::destruct( JNIEnv * jni_env )
         const_cast< JNI_interface_type_info * >(
             m_XInterface_type_info )->destroy( jni_env );
     }
-
+    
     // free global refs
     jni_env->DeleteGlobalRef( m_object_java_env );
     jni_env->DeleteGlobalRef( m_object_Any_VOID );
     jni_env->DeleteGlobalRef( m_object_Type_UNSIGNED_SHORT );
     jni_env->DeleteGlobalRef( m_object_Type_UNSIGNED_LONG );
     jni_env->DeleteGlobalRef( m_object_Type_UNSIGNED_HYPER );
-
+    
     jni_env->DeleteGlobalRef( m_class_Class );
     jni_env->DeleteGlobalRef( m_class_Object );
     jni_env->DeleteGlobalRef( m_class_String );
@@ -909,7 +909,7 @@ void JNI_info::destruct( JNIEnv * jni_env )
     jni_env->DeleteGlobalRef( m_class_Byte );
     jni_env->DeleteGlobalRef( m_class_Boolean );
     jni_env->DeleteGlobalRef( m_class_Character );
-
+    
     jni_env->DeleteGlobalRef( m_class_JNI_proxy );
     jni_env->DeleteGlobalRef( m_class_RuntimeException );
     jni_env->DeleteGlobalRef( m_class_UnoRuntime );
@@ -944,7 +944,7 @@ JNI_info const * JNI_info::get_jni_info(
             (jclass) jo_JNI_info_holder.get(), "s_jni_info_handle", "J" );
     jni.ensure_no_exception();
     OSL_ASSERT( 0 != field_s_jni_info_handle );
-
+    
     JNI_info const * jni_info =
         reinterpret_cast< JNI_info const * >(
             jni->GetStaticLongField(
@@ -954,7 +954,7 @@ JNI_info const * JNI_info::get_jni_info(
         JNI_info * new_info = new JNI_info(
             jni_env, static_cast< jobject >(uno_vm->getClassLoader()), jo_class,
             jo_forName );
-
+        
         ClearableMutexGuard g( Mutex::getGlobalMutex() );
         jni_info =
             reinterpret_cast< JNI_info const * >(
@@ -974,7 +974,7 @@ JNI_info const * JNI_info::get_jni_info(
             new_info->destroy( jni_env );
         }
     }
-
+    
     return jni_info;
 }
 
@@ -993,7 +993,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1info_1holder_finalize__J(
           reinterpret_cast< ::jni_uno::JNI_info * >( jni_info_handle );
     jni_info->destroy( jni_env );
 }
-
+ 
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index 1382c6f9f4d8..e8cacd8bbc05 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -75,7 +75,7 @@ struct JNI_type_info
 {
     ::com::sun::star::uno::TypeDescription      m_td;
     jclass                                      m_class;
-
+    
     virtual void destroy( JNIEnv * jni_env ) = 0;
 protected:
     inline void destruct( JNIEnv * jni_env )
@@ -91,8 +91,8 @@ struct JNI_interface_type_info : public JNI_type_info
     jobject                                     m_proxy_ctor; // proxy ctor
     jobject                                     m_type;
     // sorted via typelib function index
-    jmethodID *                                 m_methods;
-
+    jmethodID *                                 m_methods;    
+    
     virtual void destroy( JNIEnv * jni_env );
     explicit JNI_interface_type_info(
         JNI_context const & jni, typelib_TypeDescription * td );
@@ -106,7 +106,7 @@ struct JNI_compound_type_info : public JNI_type_info
     jmethodID                                   m_exc_ctor;
     // sorted via typelib member index
     jfieldID *                                  m_fields;
-
+    
     virtual void destroy( JNIEnv * jni_env );
     explicit JNI_compound_type_info(
         JNI_context const & jni, typelib_TypeDescription * td );
@@ -129,7 +129,7 @@ class JNI_info
 {
     mutable ::osl::Mutex        m_mutex;
     mutable t_str2type          m_type_map;
-
+    
 public:
     // These two are needed very early by find_class from within the ctor:
     jclass                      m_class_Class;
@@ -141,7 +141,7 @@ public:
     jobject                     m_object_Type_UNSIGNED_SHORT;
     jobject                     m_object_Type_UNSIGNED_LONG;
     jobject                     m_object_Type_UNSIGNED_HYPER;
-
+    
     //
     jclass                      m_class_Object;
     jclass                      m_class_Character;
@@ -153,14 +153,14 @@ public:
     jclass                      m_class_Float;
     jclass                      m_class_Double;
     jclass                      m_class_String;
-
+    
     jclass                      m_class_UnoRuntime;
     jclass                      m_class_RuntimeException;
     jclass                      m_class_Any;
     jclass                      m_class_Type;
     jclass                      m_class_TypeClass;
     jclass                      m_class_JNI_proxy;
-
+    
     //
     jmethodID                   m_method_Object_toString;
     jmethodID                   m_method_Class_getName;
@@ -172,7 +172,7 @@ public:
     jmethodID                   m_ctor_Integer_with_int;
     jmethodID                   m_ctor_Long_with_long;
     jmethodID                   m_ctor_Float_with_float;
-    jmethodID                   m_ctor_Double_with_double;
+    jmethodID                   m_ctor_Double_with_double;    
     jmethodID                   m_method_Boolean_booleanValue;
     jmethodID                   m_method_Byte_byteValue;
     jmethodID                   m_method_Character_charValue;
@@ -181,7 +181,7 @@ public:
     jmethodID                   m_method_Integer_intValue;
     jmethodID                   m_method_Long_longValue;
     jmethodID                   m_method_Short_shortValue;
-
+    
     //
     jmethodID                   m_method_IEnvironment_getRegisteredInterface;
     jmethodID                   m_method_IEnvironment_registerInterface;
@@ -195,7 +195,7 @@ public:
     jfieldID                    m_field_Type__typeName;
     jmethodID                   m_method_TypeClass_fromInt;
     jfieldID                    m_field_Enum_m_value;
-
+    
     //
     jmethodID                   m_method_JNI_proxy_get_proxy_ctor;
     jmethodID                   m_method_JNI_proxy_create;
@@ -210,8 +210,8 @@ public:
     ::com::sun::star::uno::Type const & m_RuntimeException_type;
     ::com::sun::star::uno::Type const & m_void_type;
     //
-    JNI_interface_type_info const * m_XInterface_type_info;
-
+    JNI_interface_type_info const * m_XInterface_type_info;    
+    
     //
     JNI_type_info const * get_type_info(
         JNI_context const & jni,
@@ -226,18 +226,18 @@ public:
     inline static void append_sig(
         ::rtl::OStringBuffer * buf, typelib_TypeDescriptionReference * type,
         bool use_Object_for_type_XInterface = true, bool use_slashes = true );
-
+    
     // get this
     static JNI_info const * get_jni_info(
         rtl::Reference< jvmaccess::UnoVirtualMachine > const & uno_vm );
     inline void destroy( JNIEnv * jni_env );
-
+    
 private:
     JNI_type_info const * create_type_info(
         JNI_context const & jni, typelib_TypeDescription * td ) const;
-
+    
     void destruct( JNIEnv * jni_env );
-
+    
     JNI_info( JNIEnv * jni_env, jobject class_loader,
               jclass classClass, jmethodID methodForName );
     inline ~JNI_info() {}
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx
index fa32e879f1bd..bd1bd2d734e0 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -198,7 +198,7 @@ jobject Bridge::call_uno(
         return_size = sizeof (largest);
         break;
     }
-
+    
 #ifdef BROKEN_ALLOCA
     char * mem = (char *) malloc(
 #else
@@ -210,7 +210,7 @@ jobject Bridge::call_uno(
     void * uno_ret = return_size == 0 ? 0 : (mem + (nParams * sizeof (void *)));
     largest * uno_args_mem = (largest *)
         (mem + (nParams * sizeof (void *)) + return_size);
-
+    
     OSL_ASSERT( (0 == nParams) || (nParams == jni->GetArrayLength( jo_args )) );
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
@@ -506,14 +506,14 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
         }
 
         typelib_InterfaceTypeDescription * td =
-            reinterpret_cast< typelib_InterfaceTypeDescription * >(
+            reinterpret_cast< typelib_InterfaceTypeDescription * >( 
                 jni->GetLongField(
                     jo_proxy, jni_info->m_field_JNI_proxy_m_td_handle ) );
         uno_Interface * pUnoI =
             reinterpret_cast< uno_Interface * >(
                 jni->GetLongField(
                     jo_proxy, jni_info->m_field_JNI_proxy_m_receiver_handle ) );
-
+        
         typelib_TypeDescriptionReference ** ppAllMembers = td->ppAllMembers;
         for ( sal_Int32 nPos = td->nAllMembers; nPos--; )
         {
@@ -522,7 +522,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
             // typelib_typedescriptionreference_getDescription()
             typelib_TypeDescriptionReference * member_type =
                 ppAllMembers[ nPos ];
-
+            
             // check method_name against fully qualified type_name
             // of member_type; type_name is of the form
             //  <name> "::" <method_name> *(":@" <idx> "," <idx> ":" <name>)
@@ -677,7 +677,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_finalize__J(
         reinterpret_cast< typelib_TypeDescription * >(
             jni->GetLongField(
                 jo_proxy, jni_info->m_field_JNI_proxy_m_td_handle ) );
-
+    
 #if OSL_DEBUG_LEVEL > 1
     {
     JLocalAutoRef jo_oid(
@@ -685,7 +685,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_finalize__J(
             jo_proxy, jni_info->m_field_JNI_proxy_m_oid ) );
     OUString oid( jstring_to_oustring( jni, (jstring) jo_oid.get() ) );
     OString cstr_msg(
-        OUStringToOString(
+        OUStringToOString( 
             OUSTR("freeing java uno proxy: ") + oid,
             RTL_TEXTENCODING_ASCII_US ) );
     OSL_TRACE( cstr_msg.getStr() );
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index 70e139d66aab..d4c59ab2ad11 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -89,7 +89,7 @@ void Bridge::handle_java_exc(
     jni.ensure_no_exception();
     OUString exc_name(
         jstring_to_oustring( jni, (jstring) jo_class_name.get() ) );
-
+    
     ::com::sun::star::uno::TypeDescription td( exc_name.pData );
     if (!td.is() || (typelib_TypeClass_EXCEPTION != td.get()->eTypeClass))
     {
@@ -148,11 +148,11 @@ void Bridge::call_java(
     void * uno_ret, void * uno_args [], uno_Any ** uno_exc ) const
 {
     OSL_ASSERT( function_pos_offset == 0 || function_pos_offset == 1 );
-
+    
     JNI_guarded_context jni(
         m_jni_info, reinterpret_cast< ::jvmaccess::UnoVirtualMachine * >(
             m_java_env->pContext ) );
-
+    
     // assure fully initialized iface_td:
     ::com::sun::star::uno::TypeDescription iface_holder;
     if (! iface_td->aBase.bComplete) {
@@ -171,14 +171,14 @@ void Bridge::call_java(
             iface_holder.get() );
         OSL_ASSERT( iface_td->aBase.eTypeClass == typelib_TypeClass_INTERFACE );
     }
-
+    
     // prepare java args, save param td
 #ifdef BROKEN_ALLOCA
     jvalue * java_args = (jvalue *) malloc( sizeof (jvalue) * nParams );
 #else
     jvalue * java_args = (jvalue *) alloca( sizeof (jvalue) * nParams );
 #endif
-
+    
     sal_Int32 nPos;
     for ( nPos = 0; nPos < nParams; ++nPos )
     {
@@ -227,7 +227,7 @@ void Bridge::call_java(
         && function_pos < iface_td->nMapFunctionIndexToMemberIndex,
         "### illegal function index!" );
     function_pos -= base_members_function_pos;
-
+    
     JNI_interface_type_info const * info =
         static_cast< JNI_interface_type_info const * >(
             m_jni_info->get_type_info( jni, &iface_td->aBase ) );
@@ -525,7 +525,7 @@ uno_Interface * Bridge::map_to_uno(
         pUnoI = new UNO_proxy(
             jni, const_cast< Bridge * >( this ),
             javaI, (jstring) jo_oid.get(), oid, info );
-
+        
         (*m_uno_env->registerProxyInterface)(
             m_uno_env, (void **)&pUnoI,
             UNO_proxy_free,
@@ -555,7 +555,7 @@ void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy )
     }
 #if OSL_DEBUG_LEVEL > 1
     OString cstr_msg(
-        OUStringToOString(
+        OUStringToOString( 
             OUSTR("freeing binary uno proxy: ") + that->m_oid,
             RTL_TEXTENCODING_ASCII_US ) );
     OSL_TRACE( cstr_msg.getStr() );
@@ -567,7 +567,7 @@ void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy )
             bridge->m_jni_info,
             reinterpret_cast< ::jvmaccess::UnoVirtualMachine * >(
                 bridge->m_java_env->pContext ) );
-
+        
         jni->DeleteGlobalRef( that->m_javaI );
         jni->DeleteGlobalRef( that->m_jo_oid );
     }
@@ -740,7 +740,7 @@ void SAL_CALL UNO_proxy_dispatch(
                             jni_info->m_class_UnoRuntime,
                             jni_info->m_method_UnoRuntime_queryInterface,
                             args ) );
-
+                    
                     if (jni->ExceptionCheck())
                     {
                         JLocalAutoRef jo_exc( jni, jni->ExceptionOccurred() );
@@ -772,7 +772,7 @@ void SAL_CALL UNO_proxy_dispatch(
                                 reinterpret_cast<
                                   typelib_InterfaceTypeDescription * >(
                                       info->m_td.get() ) );
-
+                            
                             uno_any_construct(
                                 (uno_Any *)uno_ret, &pUnoI2,
                                 demanded_td.get(), 0 );
diff --git a/bridges/source/jni_uno/nativethreadpool.cxx b/bridges/source/jni_uno/nativethreadpool.cxx
index 9c92e89c5b07..870b67844806 100644
--- a/bridges/source/jni_uno/nativethreadpool.cxx
+++ b/bridges/source/jni_uno/nativethreadpool.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/remote/context/context.cxx b/bridges/source/remote/context/context.cxx
index 3e0ffeac894f..75991d45f546 100644
--- a/bridges/source/remote/context/context.cxx
+++ b/bridges/source/remote/context/context.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -77,7 +77,7 @@ public:
     static void SAL_CALL thisRemoveDisposingListener( remote_Context *, remote_DisposingListener *);
     static void SAL_CALL thisDispose( remote_Context *);
 public:
-    oslInterlockedCount m_nRef;
+    oslInterlockedCount	m_nRef;
     sal_Bool m_bDisposed;
     list < remote_DisposingListener * > m_lstListener;
     Mutex m_mutex;
diff --git a/bridges/source/remote/idl/corba.idl b/bridges/source/remote/idl/corba.idl
index b71d16e2eff1..63f93283d41e 100644
--- a/bridges/source/remote/idl/corba.idl
+++ b/bridges/source/remote/idl/corba.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ module corba
     {
         ThreadIDs IDs;
     };
-
+    
     struct CorbaString8
     {
         string theString;
@@ -80,9 +80,9 @@ module corba
         tk_value, tk_value_box,
         tk_native,
         tk_abstract_interface
-    };
+    };	
 };
 
-};
-};
-};
+}; 
+}; 
+}; 
diff --git a/bridges/source/remote/static/helper.cxx b/bridges/source/remote/static/helper.cxx
index f0fc40106d36..d120d38b80df 100644
--- a/bridges/source/remote/static/helper.cxx
+++ b/bridges/source/remote/static/helper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::uno;
 
 namespace bridges_remote
 {
-
+    
 void SAL_CALL remote_createStub (
     remote_Interface **ppRemoteI,
     rtl_uString *pOid ,
@@ -53,7 +53,7 @@ void SAL_CALL remote_createStub (
     ReleaseRemoteCallbackFunc releaseRemoteCallback )
 {
     typelib_TypeDescription *pType = 0;
-    typelib_typedescriptionreference_getDescription( &pType, pTypeRef );
+    typelib_typedescriptionreference_getDescription( &pType, pTypeRef );	
 
     (void) pEnvRemote->pExtEnv->getRegisteredInterface(
         pEnvRemote->pExtEnv,
@@ -90,7 +90,7 @@ void SAL_CALL remote_createStub (
                 (typelib_InterfaceTypeDescription * ) pType,
                 pEnvRemote,
                 pImpl->m_sendRequest);
-
+        
         // ppRemoteI may change during registration
         pEnvRemote->pExtEnv->registerProxyInterface(
             pEnvRemote->pExtEnv,
@@ -115,17 +115,17 @@ void SAL_CALL remote_sendQueryInterface(
 
     typelib_InterfaceTypeDescription *pType = 0;
     typelib_typedescriptionreference_getDescription( (typelib_TypeDescription ** )&pType, pTypeRef );
-
+    
     if( *ppRemoteI )
     {
         (*ppRemoteI)->release( *ppRemoteI );
         (*ppRemoteI) = 0;
     }
-
+    
     remote_BridgeImpl *pImpl = ((remote_Context *)pEnvRemote->pContext)->m_pBridgeImpl;
-
+    
     Type type  = ::getCppuType( (Reference < XInterface > *)0 );
-
+    
     // get type for queryInterface
     OUString sCompleteMethodName = type.getTypeName();
     sCompleteMethodName += OUString(RTL_CONSTASCII_USTRINGPARAM("::queryInterface"));
@@ -134,13 +134,13 @@ void SAL_CALL remote_sendQueryInterface(
     typelib_typedescription_getByName(
         (typelib_TypeDescription **) &pMemberType,
         sCompleteMethodName.pData );
-
+    
     OSL_ASSERT( pMemberType );
-
+    
     uno_Any anyInterface;
     anyInterface.pType = 0;
     anyInterface.pData = 0;
-
+    
     void *pReturn = &anyInterface;
     void *ppArgs[1];
 
@@ -151,9 +151,9 @@ void SAL_CALL remote_sendQueryInterface(
                                           pType->aBase.pTypeName);
 
     ppArgs[0] = &pRef;
-
-//      uno_Any anyException;
-//      uno_Any *pAnyException = &anyException;
+    
+//  	uno_Any anyException;
+//  	uno_Any *pAnyException = &anyException;
 
     // do the queryInterface
     pImpl->m_sendRequest(
@@ -165,11 +165,11 @@ void SAL_CALL remote_sendQueryInterface(
         ppArgs,
         ppException );
 
-
+    
     // now release everything
     typelib_typedescriptionreference_release( pRef );
     typelib_typedescription_release( (typelib_TypeDescription * ) pMemberType );
-
+    
     if( *ppException )
     {
         *ppRemoteI = 0;
diff --git a/bridges/source/remote/static/mapping.cxx b/bridges/source/remote/static/mapping.cxx
index 3402cfe68268..cd0201cbb87c 100644
--- a/bridges/source/remote/static/mapping.cxx
+++ b/bridges/source/remote/static/mapping.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -60,7 +60,7 @@ static void SAL_CALL thisAcquire( uno_Mapping *pMap )
                                  p->pEnvRemote ,
                                  p->m_sPurpose.pData );
         }
-
+            
     }
 }
 
@@ -76,12 +76,12 @@ static void SAL_CALL thisRelease( uno_Mapping *pMap )
 }
 
 namespace bridges_remote {
-
+    
 void remoteToUno( uno_Mapping *pMapping, void **ppUnoI, void *pRemoteI,
                   typelib_InterfaceTypeDescription *pTypeDescr )
 {
     remote_Mapping *pRemoteMapping = ( remote_Mapping * ) pMapping;
-
+    
     OSL_ASSERT( ppUnoI && pTypeDescr );
     if (*ppUnoI)
     {
@@ -110,7 +110,7 @@ void remoteToUno( uno_Mapping *pMapping, void **ppUnoI, void *pRemoteI,
             ppUnoI,
             pOid,
             pTypeDescr);
-
+            
         if ( ! *ppUnoI) // already existing interface
         {
             // try to publish a new proxy; proxy may be exchanged during registration
@@ -120,14 +120,14 @@ void remoteToUno( uno_Mapping *pMapping, void **ppUnoI, void *pRemoteI,
                 pTypeDescr ,
                 pRemoteMapping->pEnvUno,
                 pRemoteMapping->pEnvRemote);
-
+                
             pRemoteMapping->pEnvUno->pExtEnv->registerProxyInterface(
                 pRemoteMapping->pEnvUno->pExtEnv,
                 ppUnoI,
                 freeRemote2UnoProxy,
                 pOid,
                 pTypeDescr );
-
+            
             OSL_ASSERT( *ppUnoI );
         }
         rtl_uString_release( pOid );
@@ -158,7 +158,7 @@ void unoToRemote( uno_Mapping *pMapping, void **ppRemoteI, void *pUnoI,
         {
             return;
         }
-
+                                                      
         pRemoteMapping->pEnvRemote->pExtEnv->getRegisteredInterface(
             pRemoteMapping->pEnvRemote->pExtEnv,
             (void**)ppRemoteI,
@@ -173,8 +173,8 @@ void unoToRemote( uno_Mapping *pMapping, void **ppRemoteI, void *pUnoI,
                 pOid,
                 pTypeDescr,
                 pRemoteMapping->pEnvUno,
-                pRemoteMapping->pEnvRemote );
-
+                pRemoteMapping->pEnvRemote );			
+                
             // note : ppRemoteI may change during registration
             pRemoteMapping->pEnvRemote->pExtEnv->registerProxyInterface(
                 pRemoteMapping->pEnvRemote->pExtEnv,
@@ -201,7 +201,7 @@ RemoteMapping::RemoteMapping( uno_Environment *pEnvUno_ ,
 {
     pEnvUno = pEnvUno_;
     pEnvRemote = pEnvRemote_;
-
+    
     pEnvUno->acquire( pEnvUno );
     pEnvRemote->acquire( pEnvRemote );
 
diff --git a/bridges/source/remote/static/proxy.cxx b/bridges/source/remote/static/proxy.cxx
index db7b9a67a903..bf8428264ab6 100644
--- a/bridges/source/remote/static/proxy.cxx
+++ b/bridges/source/remote/static/proxy.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -85,7 +85,7 @@ void releaseRemote2UnoProxy( uno_Interface *pThis )
     Remote2UnoProxy *p = ( Remote2UnoProxy * ) pThis;
     if ( 0 == osl_decrementInterlockedCount( &(p->m_nRef) ))
     {
-        p->m_pEnvUno->pExtEnv->revokeInterface( p->m_pEnvUno->pExtEnv, p );
+        p->m_pEnvUno->pExtEnv->revokeInterface(	p->m_pEnvUno->pExtEnv, p );
     }
 }
 
diff --git a/bridges/source/remote/static/remote.cxx b/bridges/source/remote/static/remote.cxx
index e94743469271..24e7674f8cf1 100644
--- a/bridges/source/remote/static/remote.cxx
+++ b/bridges/source/remote/static/remote.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/remote/static/remote_types.cxx b/bridges/source/remote/static/remote_types.cxx
index f47580d8da92..95f023508ee4 100644
--- a/bridges/source/remote/static/remote_types.cxx
+++ b/bridges/source/remote/static/remote_types.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 #include "remote_types.hxx"
 
 namespace bridges_remote {
-
+    
 sal_Bool SAL_CALL remote_relatesToInterface2( typelib_TypeDescription * pTypeDescr )
 {
     switch (pTypeDescr->eTypeClass)
@@ -93,7 +93,7 @@ sal_Bool SAL_CALL remote_relatesToInterface2( typelib_TypeDescription * pTypeDes
     }
     return sal_False;
 }
-
+    
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/remote/static/remote_types.hxx b/bridges/source/remote/static/remote_types.hxx
index 9325cbc18167..024f38037349 100644
--- a/bridges/source/remote/static/remote_types.hxx
+++ b/bridges/source/remote/static/remote_types.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 namespace bridges_remote
 {
-
+    
 inline sal_Bool SAL_CALL remote_relatesToInterface( typelib_TypeDescription *pTypeDescr );
 sal_Bool SAL_CALL remote_relatesToInterface2( typelib_TypeDescription * pTypeDescr );
 
diff --git a/bridges/source/remote/static/stub.cxx b/bridges/source/remote/static/stub.cxx
index 58796351d5bd..ee6d33184eca 100644
--- a/bridges/source/remote/static/stub.cxx
+++ b/bridges/source/remote/static/stub.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/remote/urp/urp_bridgeimpl.cxx b/bridges/source/remote/urp/urp_bridgeimpl.cxx
index 0e25746f0a42..53443a0ecf63 100644
--- a/bridges/source/remote/urp/urp_bridgeimpl.cxx
+++ b/bridges/source/remote/urp/urp_bridgeimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -199,7 +199,7 @@ void urp_BridgeImpl::applyProtocolChanges( const Properties &props )
     {
         m_properties.bForceSynchronous = props.bForceSynchronous;
     }
-
+    
     m_properties.bCurrentContext = props.bCurrentContext;
 }
 
diff --git a/bridges/source/remote/urp/urp_bridgeimpl.hxx b/bridges/source/remote/urp/urp_bridgeimpl.hxx
index 4e6d31d22505..59795fac17cd 100644
--- a/bridges/source/remote/urp/urp_bridgeimpl.hxx
+++ b/bridges/source/remote/urp/urp_bridgeimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,7 +48,7 @@ namespace bridges_urp
 {
 
 class PropertyObject;
-
+    
 struct equalOUString
 {
     sal_Int32 operator() ( const ::rtl::OUString &s1, const ::rtl::OUString &s2 ) const
@@ -56,8 +56,8 @@ struct equalOUString
             return s1 == s2;
         }
 };
-
-struct equalType
+    
+struct equalType 
 {
     sal_Int32 operator() ( const ::com::sun::star::uno::Type &t1,
                            const ::com::sun::star::uno::Type &t2 ) const
@@ -68,13 +68,13 @@ struct equalType
 
 class OWriterThread;
 class OReaderThread;
-
+    
 struct urp_BridgeImpl :
     public remote_BridgeImpl
 {
     urp_BridgeImpl( sal_Int32 nCacheSize , sal_uInt32 nInitialMarshalerSize );
     ~urp_BridgeImpl();
-
+    
     void applyProtocolChanges( const Properties & );
 
     void startBlockBridge();
@@ -89,7 +89,7 @@ struct urp_BridgeImpl :
     ::osl::Mutex m_errorListMutex;
     Marshal m_blockMarshaler;
     sal_Int32 m_nMarshaledMessages;
-
+    
       // Caches for vars, that go from local process to the remote process
       Cache < ::rtl::OUString , equalOUString >             m_oidCacheOut;
        Cache < ::rtl::ByteSequence , EqualThreadId >         m_tidCacheOut;
@@ -107,9 +107,9 @@ struct urp_BridgeImpl :
     ::com::sun::star::uno::Type m_lastInType;
     ::rtl::ByteSequence m_lastInTid;
     ::rtl::OUString m_lastInOid;
-
+    
     urp_ClientJobContainer m_clientJobContainer;
-
+    
     OWriterThread *m_pWriter;
     OReaderThread *m_pReader;
     ::rtl::OString m_sLogFileName;
diff --git a/bridges/source/remote/urp/urp_cache.h b/bridges/source/remote/urp/urp_cache.h
index a0150c854594..ca3dec9c8298 100644
--- a/bridges/source/remote/urp/urp_cache.h
+++ b/bridges/source/remote/urp/urp_cache.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/remote/urp/urp_cache.hxx b/bridges/source/remote/urp/urp_cache.hxx
index 5aec834199be..e8677116cb96 100644
--- a/bridges/source/remote/urp/urp_cache.hxx
+++ b/bridges/source/remote/urp/urp_cache.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,8 +41,8 @@ namespace bridges_urp
         m_pCache( new t[nMaxEntries] ),
         m_nMaxEntries( nMaxEntries ),
         m_nEntries( 0 )
-    {
-
+    {		
+        
     }
 
     template < class t , class tequals >
@@ -81,7 +81,7 @@ namespace bridges_urp
         }
         return nEntry;
     }
-
+    
     template < class t , class tequals >
     inline sal_uInt16 Cache< t , tequals >::seek( const t & value )
     {
@@ -110,7 +110,7 @@ namespace bridges_urp
         sal_Int32 operator () ( const t &value  )  const
             { return value >= m_; }
     };
-
+    
     template < class t, class tequals >
     inline void Cache < t , tequals >::resize( sal_uInt16 nNewMaxEntries )
     {
diff --git a/bridges/source/remote/urp/urp_dispatch.cxx b/bridges/source/remote/urp/urp_dispatch.cxx
index 459900b2460a..c8c405403938 100644
--- a/bridges/source/remote/urp/urp_dispatch.cxx
+++ b/bridges/source/remote/urp/urp_dispatch.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/remote/urp/urp_dispatch.hxx b/bridges/source/remote/urp/urp_dispatch.hxx
index 2b44854e3350..146732d339b2 100644
--- a/bridges/source/remote/urp/urp_dispatch.hxx
+++ b/bridges/source/remote/urp/urp_dispatch.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@ namespace bridges_urp {
     const sal_uInt8 HDRFLAG_EXCEPTION        = 0x20;
 
     void SAL_CALL urp_sendCloseConnection( uno_Environment *pEnvRemote );
-
+    
     extern "C" void SAL_CALL urp_sendRequest(
         uno_Environment *pEnvRemote,
         typelib_TypeDescription const * pMemberType,
diff --git a/bridges/source/remote/urp/urp_environment.cxx b/bridges/source/remote/urp/urp_environment.cxx
index f1a61896202b..9f13e60c35e4 100644
--- a/bridges/source/remote/urp/urp_environment.cxx
+++ b/bridges/source/remote/urp/urp_environment.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -73,18 +73,18 @@ rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
 
 //  static void dumpProperties( struct Properties *p )
 //  {
-//      fprintf( stderr , "FlushBlockSize     : %d\n" , p->nFlushBlockSize );
-//      fprintf( stderr , "OnewayTimeoutMUSEC : %d\n" , p->nOnewayTimeoutMUSEC );
-//      fprintf( stderr , "OidCacheSize       : %d\n" , p->nOidCacheSize );
-//      fprintf( stderr , "TypeCacheSize      : %d\n" , p->nTypeCacheSize );
-//      fprintf( stderr , "TidCacheSize       : %d\n" , p->nTidCacheSize );
-//      OString o = OUStringToOString( p->sSupportedVersions , RTL_TEXTENCODING_ASCII_US );
-//      fprintf( stderr , "SupportedVersions  : %s\n" , o.pData->buffer );
-//      o = OUStringToOString( p->sVersion , RTL_TEXTENCODING_ASCII_US );
-//      fprintf( stderr , "Version : %s\n" , o.pData->buffer );
-//      fprintf( stderr , "SupportsMultipleSynchronous : %d\n" , p->bSupportsMultipleSynchronous );
-//      fprintf( stderr , "SupportsMustReply   : %d\n" , p->bSupportsMustReply );
-//      fprintf( stderr , "SupportsSynchronous : %d\n" , p->bSupportsSynchronous );
+//  	fprintf( stderr , "FlushBlockSize     : %d\n" , p->nFlushBlockSize );
+//  	fprintf( stderr , "OnewayTimeoutMUSEC : %d\n" , p->nOnewayTimeoutMUSEC );
+//  	fprintf( stderr , "OidCacheSize       : %d\n" , p->nOidCacheSize );
+//  	fprintf( stderr , "TypeCacheSize      : %d\n" , p->nTypeCacheSize );
+//  	fprintf( stderr , "TidCacheSize       : %d\n" , p->nTidCacheSize );
+//  	OString o = OUStringToOString( p->sSupportedVersions , RTL_TEXTENCODING_ASCII_US );
+//  	fprintf( stderr , "SupportedVersions  : %s\n" , o.pData->buffer );
+//  	o = OUStringToOString( p->sVersion , RTL_TEXTENCODING_ASCII_US );
+//  	fprintf( stderr , "Version : %s\n" , o.pData->buffer );
+//  	fprintf( stderr , "SupportsMultipleSynchronous : %d\n" , p->bSupportsMultipleSynchronous );
+//  	fprintf( stderr , "SupportsMustReply   : %d\n" , p->bSupportsMustReply );
+//  	fprintf( stderr , "SupportsSynchronous : %d\n" , p->bSupportsSynchronous );
 //  }
 
 // PropertySetterThread
diff --git a/bridges/source/remote/urp/urp_job.cxx b/bridges/source/remote/urp/urp_job.cxx
index 8af686fa3ef3..62d43863276d 100644
--- a/bridges/source/remote/urp/urp_job.cxx
+++ b/bridges/source/remote/urp/urp_job.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -98,7 +98,7 @@ namespace bridges_urp
         }
         return bReturn;
     }
-
+    
     //--------------------------------------------------------------------------------------
     static void prepareRuntimeExceptionClientSide( uno_Any **ppException , const OUString &s)
     {
@@ -114,7 +114,7 @@ namespace bridges_urp
         uno_type_any_construct( *ppException , &exception , type.getTypeLibType() , 0 );
     }
 
-
+    
     Job::Job( uno_Environment *pEnvRemote,
               remote_Context *pContext,
               sal_Sequence *pTid,
@@ -146,19 +146,19 @@ namespace bridges_urp
 
 
 
-
+    
     //--------------------------------------------------------------------------------------
     sal_Bool ClientJob::extract(  )
     {
         sal_Bool bReturn = sal_True;
         //-------------------------------
-        // Handle the reply, unpack data
+        // Handle the reply, unpack data 
         //-------------------------------
         if( m_bExceptionOccured )
         {
             bReturn = m_pUnmarshal->unpackAny( *m_ppException );
         }
-         else
+         else 
         {
             //---------------------------------
             // alles ist gut
@@ -215,7 +215,7 @@ namespace bridges_urp
         uno_threadpool_putJob( m_pBridgeImpl->m_hThreadPool, m_pTid , this, 0, sal_False);
     }
 
-    //--------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------	
     sal_Bool ClientJob::pack()
     {
         sal_Bool bSuccess = sal_True;
@@ -295,7 +295,7 @@ namespace bridges_urp
             // the flag byte is needed + request
             nFlags = nFlags | HDRFLAG_LONGHEADER | HDRFLAG_REQUEST; //
 
-            // as long as we do not have customized calls, no MOREFLAGS must be set
+            // as long as we do not have customized calls, no MOREFLAGS must be set			
             if( m_nMethodIndex >= 0x100 )
             {
                 nFlags = nFlags | HDRFLAG_LONGMETHODID;
@@ -347,7 +347,7 @@ namespace bridges_urp
         if( bOid )
         {
             m_pBridgeImpl->m_lastOutOid = *(OUString *)&m_pOid;
-            m_pBridgeImpl->m_blockMarshaler.packOid( m_pBridgeImpl->m_lastOutOid );
+            m_pBridgeImpl->m_blockMarshaler.packOid( m_pBridgeImpl->m_lastOutOid );			
         }
         if( bTid )
         {
@@ -359,7 +359,7 @@ namespace bridges_urp
              && m_nMethodIndex != REMOTE_RELEASE_METHOD_INDEX
              && m_pContext != 0 )
         {
-            void * pCc = 0;
+            void * pCc = 0; 
             rtl::OUString aEnvName( RTL_CONSTASCII_USTRINGPARAM( "urp" ) );
             bSuccess = bSuccess && uno_getCurrentContext(
                 &pCc, aEnvName.pData, m_pContext );
@@ -375,7 +375,7 @@ namespace bridges_urp
                 p->release( p );
             }
         }
-
+        
         // marshal arguments !
 #ifdef BRIDGES_URP_PROT
         sal_Int32 nLogHeader = m_pBridgeImpl->m_blockMarshaler.getPos();
@@ -439,7 +439,7 @@ namespace bridges_urp
                      m_pMethodType ? m_pMethodType->aBase.pMemberName :
                                                m_pAttributeType->aBase.pMemberName );
 #endif
-
+        
         if( bSuccess )
         {
             if( ! m_bOneway )
@@ -453,7 +453,7 @@ namespace bridges_urp
             // Inform the writer thread, that there is some work to do
             //---------------------------
             m_pBridgeImpl->m_pWriter->touch( ! m_bOneway );
-
+            
             if( m_bOneway )
             {
                 *m_ppException = 0;
@@ -489,9 +489,9 @@ namespace bridges_urp
         // Wait for the reply
         //---------------------------
         void * pDisposeReason = 0;
-
+        
         uno_threadpool_enter(m_pBridgeImpl->m_hThreadPool, &pDisposeReason );
-
+        
         if( ! pDisposeReason )
         {
             // thread has been disposed !
@@ -501,14 +501,14 @@ namespace bridges_urp
             // it won't be in the container anymore, but it is eiterway safe to call
             // the method
             ClientJob *pJob =
-                m_pBridgeImpl->m_clientJobContainer.remove( *(ByteSequence*) &m_pTid );
+                m_pBridgeImpl->m_clientJobContainer.remove(	*(ByteSequence*) &m_pTid );
             if( pJob != this )
             {
                 // this is not our job, it is probably one of the callstack below, so
                 // push it back
                 m_pBridgeImpl->m_clientJobContainer.add( *(ByteSequence*) &m_pTid , pJob );
             }
-
+            
             OUStringBuffer sMessage( 256 );
             sMessage.appendAscii( RTL_CONSTASCII_STRINGPARAM( "URP_Bridge : disposed\n" ) );
             sMessage.append( m_pBridgeImpl->getErrorsAsString() );
@@ -543,7 +543,7 @@ namespace bridges_urp
         , m_nCurrentMemPosition( 0 )
     {
         m_pEnvRemote->acquire( m_pEnvRemote );
-        m_nCurrentMemSize = MULTIJOB_STANDARD_MEMORY_SIZE + m_nMaxMessages * (
+        m_nCurrentMemSize = MULTIJOB_STANDARD_MEMORY_SIZE +	m_nMaxMessages * (
             MULTIJOB_PER_CALL_MEMORY_SIZE + sizeof(ServerJobEntry) + sizeof(MemberTypeInfo) );
         m_pCurrentMem = ( sal_Int8 * ) rtl_allocateMemory( m_nCurrentMemSize );
         m_aEntries = ( ServerJobEntry * ) getHeap( m_nMaxMessages * sizeof( ServerJobEntry ) );
@@ -557,7 +557,7 @@ namespace bridges_urp
         {
             struct MemberTypeInfo *const pMTI = &( m_aTypeInfo[i] );
             struct ServerJobEntry *const pSJE = &( m_aEntries[i] );
-
+            
               if( pSJE->m_pRemoteI )
                   pSJE->m_pRemoteI->release( pSJE->m_pRemoteI );
 
@@ -566,10 +566,10 @@ namespace bridges_urp
 
             if( pSJE->m_pInterfaceTypeRef )
                 typelib_typedescriptionreference_release( pSJE->m_pInterfaceTypeRef );
-
+            
             if( pMTI->m_pInterfaceType )
                 TYPELIB_DANGER_RELEASE( (typelib_TypeDescription *)pMTI->m_pInterfaceType );
-
+            
             for( sal_Int32 iArgs = 0 ; iArgs < pMTI->m_nArgCount ; iArgs ++ )
             {
                 if( pMTI->m_ppArgType[iArgs] )
@@ -635,10 +635,10 @@ namespace bridges_urp
                 //             is not a release call.
                 remote_Context *pRemoteC = ((remote_Context*)m_pEnvRemote->pContext);
 
-                if( ! pMTI->m_bIsReleaseCall && pRemoteC->m_pInstanceProvider )
+                if( ! pMTI->m_bIsReleaseCall &&	pRemoteC->m_pInstanceProvider )
                 {
                     pSJE->m_pException = &(pSJE->m_exception);
-
+                    
                     pRemoteC->m_pInstanceProvider->getInstance(
                         pRemoteC->m_pInstanceProvider,
                         m_pEnvRemote,
@@ -667,7 +667,7 @@ namespace bridges_urp
             else
             {
                 pSJE->m_pException = &(pSJE->m_exception );
-
+                
                 if( pMTI->m_bIsReleaseCall )
                 {
                     pSJE->m_pRemoteI->release( pSJE->m_pRemoteI );
@@ -708,18 +708,18 @@ namespace bridges_urp
                         uno_destructData( pSJE->m_ppArgs[j] , pMTI->m_ppArgType[j] , 0 );
                     }
                 }
-
+                
                 if( pSJE->m_pException )
                 {
                     uno_any_destruct( pSJE->m_pException, ::bridges_remote::remote_release );
                 }
-
+                
             }
             else
             {
                 // synchron, get the mutex to marshal reply and send immeadiatly
                 MutexGuard guard( m_pBridgeImpl->m_marshalingMutex );
-
+            
                 sal_Bool bTid = sal_False;
                 sal_uInt8 nFlags = HDRFLAG_LONGHEADER;
                 ByteSequence tid = m_pTid;
@@ -729,7 +729,7 @@ namespace bridges_urp
                     nFlags = nFlags | HDRFLAG_NEWTID;
                     bTid = sal_True;
                 }
-
+            
                 if( pSJE->m_pException )
                 {
                     nFlags = nFlags | HDRFLAG_EXCEPTION;
@@ -738,7 +738,7 @@ namespace bridges_urp
                 sal_Int32 nLogStart = m_pBridgeImpl->m_blockMarshaler.getPos();
 #endif
                 m_pBridgeImpl->m_blockMarshaler.packInt8( &nFlags );
-
+                
                 if( bTid )
                 {
                     if( ! pSJE->m_bIgnoreCache )
@@ -759,7 +759,7 @@ namespace bridges_urp
                     //--------------------
                     m_pBridgeImpl->m_blockMarshaler.packAny( &(pSJE->m_exception) );
                     uno_any_destruct( &(pSJE->m_exception) , ::bridges_remote::remote_release );
-
+                    
                     // destroy in parameters
                     for( sal_Int32 j = 0 ; j < pMTI->m_nArgCount ; j ++ )
                     {
@@ -799,21 +799,21 @@ namespace bridges_urp
                         }
                     }
                 }
-
+                
 #ifdef BRIDGES_URP_PROT
                  {
                      typelib_InterfaceMemberTypeDescription *pMemberType =
                          pMTI->m_pMethodType ?
                          (typelib_InterfaceMemberTypeDescription*)pMTI->m_pMethodType :
                          (typelib_InterfaceMemberTypeDescription*)pMTI->m_pAttributeType;
-
+                    
                      urp_logReplying( m_pBridgeImpl ,
                                       m_pBridgeImpl->m_blockMarshaler.getPos() - nLogStart,
                                       m_pBridgeImpl->m_blockMarshaler.getPos() - nLogHeader,
                                       pMemberType->pMemberName );
-                 }
+                 }		 
 #endif
-
+            
                 m_pBridgeImpl->m_nMarshaledMessages ++;
                 // put it on the wire
                 m_pBridgeImpl->m_pWriter->touch( sal_True );
@@ -832,7 +832,7 @@ namespace bridges_urp
             }
         }
     }
-
+    
     //-------------------------------------------------------------------------------------
     void ServerMultiJob::prepareRuntimeException( const OUString & sMessage , sal_Int32 nCall )
     {
@@ -876,7 +876,7 @@ namespace bridges_urp
         pSJE->m_ppArgs = 0;
         pSJE->m_pReturn = 0;
         pMTI->m_pReturnType = 0;
-
+    
         if( pMTI->m_nArgCount )
         {
             pMTI->m_ppArgType =
@@ -888,11 +888,11 @@ namespace bridges_urp
         if( pMTI->m_pMethodType &&
             pMTI->m_pMethodType->pReturnTypeRef->eTypeClass != typelib_TypeClass_VOID )
         {
-            TYPELIB_DANGER_GET( &(pMTI->m_pReturnType), pMTI->m_pMethodType->pReturnTypeRef );
+            TYPELIB_DANGER_GET(	&(pMTI->m_pReturnType), pMTI->m_pMethodType->pReturnTypeRef );
         }
         else if( pMTI->m_pAttributeType && ! pMTI->m_nArgCount )
         {
-            TYPELIB_DANGER_GET( &(pMTI->m_pReturnType) , pMTI->m_pAttributeType->pAttributeTypeRef );
+            TYPELIB_DANGER_GET(	&(pMTI->m_pReturnType) , pMTI->m_pAttributeType->pAttributeTypeRef );
         }
 
         // normal method
@@ -901,10 +901,10 @@ namespace bridges_urp
             for( sal_Int32 i = 0 ; i < pMTI->m_nArgCount ; i ++ )
             {
                 pMTI->m_ppArgType[i] = 0;
-                TYPELIB_DANGER_GET( & ( pMTI->m_ppArgType[i] ) , pMTI->m_pMethodType->pParams[i].pTypeRef);
+                TYPELIB_DANGER_GET(	& ( pMTI->m_ppArgType[i] ) , pMTI->m_pMethodType->pParams[i].pTypeRef);
                 pMTI->m_pbIsIn[i]  = pMTI->m_pMethodType->pParams[i].bIn;
                 pMTI->m_pbIsOut[i] = pMTI->m_pMethodType->pParams[i].bOut;
-
+                
                 pSJE->m_ppArgs[i] = getHeap( pMTI->m_ppArgType[i]->nSize );
                 if( pMTI->m_pbIsIn[i] )
                 {
diff --git a/bridges/source/remote/urp/urp_job.hxx b/bridges/source/remote/urp/urp_job.hxx
index ed31e33c387b..08bc43f89184 100644
--- a/bridges/source/remote/urp/urp_job.hxx
+++ b/bridges/source/remote/urp/urp_job.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,12 +45,12 @@ const sal_Int32 MULTIJOB_PER_CALL_MEMORY_SIZE = 96;
 class Unmarshal;
 struct urp_BridgeImpl;
 
-template < class t >
+template < class t >	
 inline t mymax( const t &t1 , const t &t2 )
 {
     return t1 > t2 ? t1 : t2;
 }
-
+    
 class Job
 {
 public:
@@ -80,7 +80,7 @@ public:
 public:
     remote_Context *m_pContext;
       Unmarshal *m_pUnmarshal;
-    struct urp_BridgeImpl *m_pBridgeImpl;
+    struct urp_BridgeImpl *m_pBridgeImpl; 
     sal_Sequence          *m_pTid;
     ::bridges_remote::RemoteThreadCounter m_counter;
 };
@@ -92,17 +92,17 @@ public:
     inline ClientJob( uno_Environment *pEnvRemote, // weak !
                       remote_Context *pContext,
                       struct urp_BridgeImpl *pBridgeImpl,
-                      rtl_uString *pOid,  // weak
-                      typelib_TypeDescription const * pMemberType, // weak
+                      rtl_uString *pOid,  // weak 
+                      typelib_TypeDescription const * pMemberType, // weak 
                       typelib_InterfaceTypeDescription *pInterfaceType, // weak
                       void *pReturn,
                       void *ppArgs[],
-                      uno_Any **ppException  );
+                      uno_Any **ppException	 );
 
     // ~ClientJob
     // no release for method type and attribute type necessary, because
     // it was acquired by the caller of urp_sendRequest. The lifetime
-    // of the ClientJob object is always shorter than the urp_sendRequest call.
+    // of the ClientJob object is always shorter than the urp_sendRequest call.		
     inline ~ClientJob()
         {
             if( m_bReleaseForTypeDescriptionNecessary )
@@ -134,7 +134,7 @@ private:
     void     *m_pReturn;
     typelib_InterfaceTypeDescription          *m_pInterfaceType;
     sal_Bool m_bReleaseForTypeDescriptionNecessary;
-
+    
     uno_Any  **m_ppException;
     sal_Bool m_bOneway;
     sal_Bool m_bBridgePropertyCall;
@@ -158,7 +158,7 @@ struct MemberTypeInfo
     typelib_TypeDescription **m_ppArgType;
 };
 
-
+    
 struct ServerJobEntry
 {
     rtl_uString           *m_pOid;
@@ -201,7 +201,7 @@ public:
             m_aTypeInfo[m_nCalls].m_bIsReleaseCall = bIsReleaseCall;
             m_aTypeInfo[m_nCalls].m_bIsOneway = bIsOneway;
         }
-
+    
     inline void setAttributeType(
         typelib_InterfaceAttributeTypeDescription *pAttributeType, sal_Bool bIsSetter, sal_Bool bIsOneway )
         {
@@ -221,13 +221,13 @@ public:
                 pTypeRef );
         }
     // setOid or setInterface MUST be called before extract
-      inline void setOid(   rtl_uString *pOid )
+      inline void setOid(	rtl_uString *pOid )
         {
             m_aEntries[m_nCalls].m_pOid = pOid;
             rtl_uString_acquire( m_aEntries[m_nCalls].m_pOid );
             m_aEntries[m_nCalls].m_pRemoteI = 0;
         }
-
+        
     // setOid or setInterface MUST be called
     inline void setInterface( remote_Interface *pRemoteI )
         {
@@ -258,7 +258,7 @@ public:
                 m_lstMem.push_back( m_pCurrentMem );
                 m_nCurrentMemSize = mymax( nSizeToAlloc , MULTIJOB_STANDARD_MEMORY_SIZE ) +
                     (m_nMaxMessages -m_nCalls)*MULTIJOB_PER_CALL_MEMORY_SIZE;
-                m_pCurrentMem = (sal_Int8*) rtl_allocateMemory( m_nCurrentMemSize );
+                m_pCurrentMem = (sal_Int8*)	rtl_allocateMemory( m_nCurrentMemSize );
                 m_nCurrentMemPosition = 0;
             }
             sal_Int8 *pHeap = m_pCurrentMem + m_nCurrentMemPosition;
@@ -277,7 +277,7 @@ private:
     uno_Environment *m_pEnvRemote;
     sal_Int32 m_nCalls;
     sal_Int32 m_nMaxMessages;
-
+    
     ServerJobEntry *m_aEntries;
     MemberTypeInfo *m_aTypeInfo;
 
@@ -306,7 +306,7 @@ inline ClientJob::ClientJob(
         pEnvRemote, pContext, pBridgeImpl, ::bridges_remote::RTC_HOLDENVWEAK )
     , m_ppArgs( ppArgs )
     , m_pReturn( pReturn )
-    , m_pInterfaceType( pInterfaceType ) // weak
+    , m_pInterfaceType( pInterfaceType ) // weak 
     , m_bReleaseForTypeDescriptionNecessary( sal_False )
     , m_ppException( ppException )
     , m_bBridgePropertyCall( sal_False )
@@ -341,7 +341,7 @@ inline ClientJob::ClientJob(
     }
     m_nMethodIndex = (sal_uInt16) m_pInterfaceType->pMapMemberIndexToFunctionIndex[
         ((typelib_InterfaceMemberTypeDescription*)pMemberType)->nPosition ];
-
+    
     if( m_pAttributeType && m_ppArgs )
     {
         // setter
@@ -350,12 +350,12 @@ inline ClientJob::ClientJob(
 
     if( typelib_TypeClass_INTERFACE_METHOD == pMemberType->eTypeClass )
     {
-//          if( (( typelib_InterfaceMemberTypeDescription * ) pMemberType)->nPosition
-//              == REMOTE_RELEASE_METHOD_INDEX )
-//          {
-//              m_bOneway = sal_True;
-//          }
-//          else
+//  		if( (( typelib_InterfaceMemberTypeDescription * ) pMemberType)->nPosition
+//  			== REMOTE_RELEASE_METHOD_INDEX )
+//  		{
+//  			m_bOneway = sal_True;
+//  		}
+//  		else
         if( pBridgeImpl->m_properties.bForceSynchronous )
         {
             m_bOneway = sal_False;
diff --git a/bridges/source/remote/urp/urp_log.cxx b/bridges/source/remote/urp/urp_log.cxx
index cdaa1727e6b9..48c8543a8ebd 100644
--- a/bridges/source/remote/urp/urp_log.cxx
+++ b/bridges/source/remote/urp/urp_log.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -71,7 +71,7 @@ namespace bridges_urp
         MutexGuard guard;
         FILE *f;
     };
-
+    
     void urp_logCall( urp_BridgeImpl *pBridgeImpl, sal_Int32 nSize, sal_Int32 nUseData, sal_Bool bSynchron ,
                       const ::rtl::OUString &sMethodName )
     {
diff --git a/bridges/source/remote/urp/urp_log.hxx b/bridges/source/remote/urp/urp_log.hxx
index 8eb3751932a6..cc352e85f848 100644
--- a/bridges/source/remote/urp/urp_log.hxx
+++ b/bridges/source/remote/urp/urp_log.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@ namespace bridges_urp
 #ifdef DBG_UTIL
 #define BRIDGES_URP_PROT
 #endif
-
+    
 #ifdef BRIDGES_URP_PROT
     void urp_logCall( urp_BridgeImpl *pBridgeImpl ,
                       sal_Int32 nSize, sal_Int32 nUseData, sal_Bool bSynchron ,
diff --git a/bridges/source/remote/urp/urp_marshal.cxx b/bridges/source/remote/urp/urp_marshal.cxx
index ae23cfb87eb5..29f8b35cec0f 100644
--- a/bridges/source/remote/urp/urp_marshal.cxx
+++ b/bridges/source/remote/urp/urp_marshal.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,9 +43,9 @@ using namespace ::com::sun::star::uno;
 
 namespace bridges_urp {
 
-static int g_nDetectLittleEndian = 1;
+static int g_nDetectLittleEndian = 1;	
 char g_bMarshalSystemIsLittleEndian = ((char*)&g_nDetectLittleEndian)[0];
-
+    
 Marshal::Marshal( urp_BridgeImpl *pBridgeImpl,
                   sal_Int32 nBufferSize,
                   urp_extractOidCallback callback) :
@@ -96,7 +96,7 @@ void Marshal::packTid( const ByteSequence & threadId, sal_Bool bIgnoreCache )
     {
         nIndex = m_pBridgeImpl->m_tidCacheOut.seek( threadId );
     }
-
+    
     if( 0xffff == nIndex )
     {
         if( ! bIgnoreCache )
@@ -117,11 +117,11 @@ void Marshal::packType( void *pSource )
 {
     typelib_TypeDescriptionReference *pRef =
         *(typelib_TypeDescriptionReference ** ) pSource;
-
+    
     OSL_ASSERT( pRef );
-
+    
     sal_uInt8 nTypeClass = ( sal_uInt8 ) pRef->eTypeClass;
-
+    
     if( nTypeClass <= /* any*/ 14 )
     {
         packInt8( (sal_Int8*)&nTypeClass );
@@ -130,7 +130,7 @@ void Marshal::packType( void *pSource )
     {
         OUString sTypeName;
         sal_uInt16 nIndex = 0xffff;
-
+        
         nIndex = m_pBridgeImpl->m_typeCacheOut.seek( *(Type*)&pRef );
         if( 0xffff == nIndex )
         {
@@ -155,7 +155,7 @@ sal_Bool Marshal::packRecursive( void *pSource , typelib_TypeDescription *pType
     {
     case typelib_TypeClass_EXCEPTION:
     case typelib_TypeClass_STRUCT:
-    {
+    {		
         typelib_CompoundTypeDescription * pCompType = (typelib_CompoundTypeDescription*)pType;
 
         if (pCompType->pBaseTypeDescription)
@@ -167,7 +167,7 @@ sal_Bool Marshal::packRecursive( void *pSource , typelib_TypeDescription *pType
         typelib_TypeDescriptionReference ** ppTypeRefs = pCompType->ppTypeRefs;
         sal_Int32 * pMemberOffsets = pCompType->pMemberOffsets;
         sal_Int32 nDescr = pCompType->nMembers;
-
+        
         for ( sal_Int32 nPos = 0; nPos < nDescr; ++nPos )
         {
               typelib_TypeDescription * pMemberType = 0;
@@ -192,10 +192,10 @@ sal_Bool Marshal::packRecursive( void *pSource , typelib_TypeDescription *pType
     {
         typelib_IndirectTypeDescription *pIndirectType =
             ( typelib_IndirectTypeDescription* ) pType;
-
-        const sal_Int32 nElements        = (*(uno_Sequence **)pSource)->nElements;
-        char * pSourceElements   = (char *)(*(uno_Sequence **)pSource)->elements;
-
+        
+        const sal_Int32 nElements		 = (*(uno_Sequence **)pSource)->nElements;
+        char * pSourceElements	 = (char *)(*(uno_Sequence **)pSource)->elements;
+            
         if( typelib_TypeClass_BYTE == pIndirectType->pType->eTypeClass )
         {
             // Byte sequences are optimized
@@ -207,8 +207,8 @@ sal_Bool Marshal::packRecursive( void *pSource , typelib_TypeDescription *pType
             TYPELIB_DANGER_GET( &pElementType, pIndirectType->pType );
             if( pElementType )
             {
-                const sal_Int32 nElementSize     = pElementType->nSize;
-
+                const sal_Int32 nElementSize	 = pElementType->nSize;
+                
                 packCompressedSize( nElements );
                 for ( sal_Int32 i = 0 ; i < nElements; i++ )
                 {
diff --git a/bridges/source/remote/urp/urp_marshal.hxx b/bridges/source/remote/urp/urp_marshal.hxx
index f66528d74703..c4ed70e9bbbd 100644
--- a/bridges/source/remote/urp/urp_marshal.hxx
+++ b/bridges/source/remote/urp/urp_marshal.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ namespace bridges_urp
     // methods for accessing marshaling buffer
     inline void Marshal::finish( sal_Int32 nMessageCount )
     {
-        sal_Int32 nSize = getSize() - 2*sizeof( sal_Int32 );
+        sal_Int32 nSize = getSize() - 2*sizeof( sal_Int32 ); 
 
         // save the state
         sal_Int8 *pos = m_pos;
@@ -53,7 +53,7 @@ namespace bridges_urp
         // reset the state
         m_pos = pos;
     }
-
+    
     inline void Marshal::restart()
     {
         m_pos = m_base + 2*sizeof( sal_Int32 );
@@ -63,7 +63,7 @@ namespace bridges_urp
     {
         return m_base;
     }
-
+    
     inline sal_Bool Marshal::empty() const
     {
         return ( m_pos - m_base ) == 2*sizeof( sal_Int32 );
@@ -73,7 +73,7 @@ namespace bridges_urp
     {
         return ((sal_Int32) (m_pos - m_base));
     }
-
+    
     inline void Marshal::ensureAdditionalMem( sal_Int32 nMemToAdd )
     {
         sal_Int32 nDiff = m_pos - m_base;
@@ -82,7 +82,7 @@ namespace bridges_urp
             m_nBufferSize = m_nBufferSize * 2 > nDiff + nMemToAdd ?
                 m_nBufferSize* 2 :
                 nDiff + nMemToAdd;
-
+            
             m_base = ( sal_Int8 * ) rtl_reallocateMemory( m_base , m_nBufferSize );
             m_pos = m_base + nDiff;
         }
@@ -115,12 +115,12 @@ namespace bridges_urp
     inline void Marshal::packByteSequence( sal_Int8 *pData , sal_Int32 nLength )
     {
         packCompressedSize( nLength );
-
+        
         ensureAdditionalMem( nLength );
         memcpy( m_pos , pData , nLength );
         m_pos += nLength;
     }
-
+    
     inline void Marshal::packString( void *pSource )
     {
         rtl_uString *p = *( rtl_uString ** ) pSource;
@@ -130,9 +130,9 @@ namespace bridges_urp
         ::rtl::OString o = ::rtl::OUStringToOString( p , RTL_TEXTENCODING_UTF8 );
         sal_Int32 nLength = o.pData->length;
         packCompressedSize( nLength );
-
+        
         ensureAdditionalMem( nLength );
-
+        
         memcpy( m_pos , o.pData->buffer , nLength  );
         m_pos += nLength;
     }
@@ -262,7 +262,7 @@ namespace bridges_urp
             m_pos += 8;
             break;
         }
-
+        
         case typelib_TypeClass_STRING:
         {
             packString( pSource );
@@ -293,7 +293,7 @@ namespace bridges_urp
             if( pRemoteI )
             {
                 m_callback( pRemoteI , &(sOid.pData) );
-
+            
                 nIndex = m_pBridgeImpl->m_oidCacheOut.seek( sOid );
                 if( 0xffff == nIndex )
                 {
diff --git a/bridges/source/remote/urp/urp_marshal_decl.hxx b/bridges/source/remote/urp/urp_marshal_decl.hxx
index a07f6ea48f5a..411730bacf2f 100644
--- a/bridges/source/remote/urp/urp_marshal_decl.hxx
+++ b/bridges/source/remote/urp/urp_marshal_decl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 namespace bridges_urp
 {
     struct urp_BridgeImpl;
-
+    
       typedef void
         ( SAL_CALL * urp_extractOidCallback )( remote_Interface *pRemoteI, rtl_uString **ppOid );
 
@@ -50,11 +50,11 @@ namespace bridges_urp
                    urp_extractOidCallback callback = 0
               );
         ~Marshal( );
-
+        
         inline sal_Bool pack( void *pSource , typelib_TypeDescription *pType );
 
         sal_Bool packRecursive( void *pSource, typelib_TypeDescription *pType );
-
+        
         void packTid( const ::rtl::ByteSequence &id, sal_Bool bIgnoreCache = sal_False );
         void packOid( const ::rtl::OUString &oid );
         void packType( void *pSource );
@@ -80,25 +80,25 @@ namespace bridges_urp
         // a new marshalling session is started invalidating
         // the previous bufer
         inline void restart();
-
+        
         // is only valid, after finish has been called.
         // valid until destructed.
         inline sal_Int8 *getBuffer();
-
+        
         // is only valid, after finish has been called.
         // valid until destructed.
         inline sal_Int32 getSize();
-
+        
         inline sal_Int32 getPos()
             { return m_pos - m_base; }
-
+    
         inline sal_Bool isSystemLittleEndian()
             { return g_bMarshalSystemIsLittleEndian; }
-
+        
     private:
         inline void ensureAdditionalMem( sal_Int32 nMemToAdd );
         sal_Int32 m_nBufferSize;
-        sal_Int8 *m_base;
+        sal_Int8 *m_base;		
         sal_Int8 *m_pos;
         struct urp_BridgeImpl *m_pBridgeImpl;
         urp_extractOidCallback m_callback;
diff --git a/bridges/source/remote/urp/urp_property.hxx b/bridges/source/remote/urp/urp_property.hxx
index 0cd5525e63ad..530cea697e56 100644
--- a/bridges/source/remote/urp/urp_property.hxx
+++ b/bridges/source/remote/urp/urp_property.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/remote/urp/urp_propertyobject.cxx b/bridges/source/remote/urp/urp_propertyobject.cxx
index 323faee2e929..95c290ef08f0 100644
--- a/bridges/source/remote/urp/urp_propertyobject.cxx
+++ b/bridges/source/remote/urp/urp_propertyobject.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@ static void SAL_CALL staticAcquire( remote_Interface *pRemoteI )
     PropertyObject *pProperties = (PropertyObject *) pRemoteI;
     pProperties->thisAcquire();
 }
-
+    
 static void SAL_CALL staticRelease( remote_Interface *pRemoteI )
 {
     PropertyObject *pProperties = (PropertyObject *) pRemoteI;
@@ -76,7 +76,7 @@ static void SAL_CALL staticDispatch(
 
 namespace bridges_urp
 {
-// some nice constants ....
+// some nice constants ....	
 static const sal_Int32 METHOD_QUERY_INTERFACE = 0;
 static const sal_Int32 METHOD_GET_PROPERTIES = 3;
 static const sal_Int32 METHOD_REQUEST_CHANGE = 4;
@@ -118,9 +118,9 @@ const sal_Char *g_aPropertyName[] =
     "ForceSynchronous",
     "CurrentContext"
 };
-
+    
 // nice little helper functions for conversion
-template< class t >
+template< class t >	
 void assignToIdl( ProtocolProperty *pIdl, sal_Int32 nIndex, const t &value )
 {
     pIdl->Name = OUString::createFromAscii( g_aPropertyName[nIndex] );
@@ -173,7 +173,7 @@ static sal_Bool assignFromIdlToStruct( Properties *pProps, const ProtocolPropert
         case PROPERTY_SUPPORTSMULTIPLESYNCHRONOUS:
             assignFromIdl( &(pProps->bSupportsMultipleSynchronous) , idl );
             break;
-        case PROPERTY_SUPPERTSSYNCHRONOUS:
+        case PROPERTY_SUPPERTSSYNCHRONOUS:				
             assignFromIdl( &(pProps->bSupportsMustReply) , idl );
             break;
         case PROPERTY_SUPPORTSMUSTREPLY:
@@ -249,7 +249,7 @@ static void assignFromStringToPropSeq( const OUString &sProps, uno_Sequence **pp
 {
     ::std::list< OUString > lst;
     extractTokens( sProps , lst );
-
+    
     typelib_TypeDescription *pSequenceType = 0;
     getCppuType( (Sequence< ProtocolProperty > *)0).getDescription( &pSequenceType );
     uno_Sequence *pSeq = 0;
@@ -302,7 +302,7 @@ static void assignFromStringToPropSeq( const OUString &sProps, uno_Sequence **pp
             break;
         }
 
-            // strings
+            // strings 
         case PROPERTY_VERSION:
             assignToIdl( &(pElements[i]) , nIndex , sValue );
             break;
@@ -362,7 +362,7 @@ void SAL_CALL PropertyObject::thisDispatch(
     uno_Any ** ppException )
 {
     OSL_ASSERT( pMemberType->eTypeClass == typelib_TypeClass_INTERFACE_METHOD );
-
+    
     typelib_InterfaceMethodTypeDescription *pMethodType =
         ( typelib_InterfaceMethodTypeDescription * ) pMemberType;
 
@@ -403,12 +403,12 @@ void SAL_CALL PropertyObject::localGetPropertiesFromRemote( struct Properties *p
     {
         typelib_typedescription_complete( &pInterfaceType );
     }
-
+    
     typelib_TypeDescription *pMethodType = 0;
     typelib_typedescriptionreference_getDescription(
         &pMethodType,
         ((typelib_InterfaceTypeDescription*) pInterfaceType)->ppAllMembers[METHOD_GET_PROPERTIES] );
-
+    
 
     uno_Sequence *pResult = 0;
     uno_Any exception;
@@ -442,7 +442,7 @@ void SAL_CALL PropertyObject::localGetPropertiesFromRemote( struct Properties *p
 }
 
 
-// implementation for call from remote
+// implementation for call from remote 
 void SAL_CALL PropertyObject::implGetProperties( uno_Sequence **ppReturnValue )
 {
     typelib_TypeDescription *pElementType= 0;
@@ -467,7 +467,7 @@ void SAL_CALL PropertyObject::implGetProperties( uno_Sequence **ppReturnValue )
     assignToIdl( &(pElements[PROPERTY_SUPPERTSSYNCHRONOUS]), PROPERTY_SUPPERTSSYNCHRONOUS, pP->bSupportsSynchronous );
     assignToIdl( &(pElements[PROPERTY_SUPPORTSMULTIPLESYNCHRONOUS]), PROPERTY_SUPPORTSMULTIPLESYNCHRONOUS, pP->bSupportsMultipleSynchronous );
     assignToIdl( &(pElements[PROPERTY_CLEARCACHE]), PROPERTY_CLEARCACHE, pP->bClearCache );
-
+                 
     typelib_typedescription_release( pElementType );
 }
 
@@ -497,20 +497,20 @@ sal_Int32 SAL_CALL PropertyObject::localRequestChange( )
             rtl_random_destroyPool( pool );
         }
     }
-
+    
     if( bCall )
     {
         OUString oid = OUString::createFromAscii( g_NameOfUrpProtocolPropertiesObject );
 
-        // gather types for calling
+        // gather types for calling 
         typelib_TypeDescription *pInterfaceType = 0;
         getCppuType( (Reference< XProtocolProperties > *) 0 ).getDescription( &pInterfaceType );
-
+        
         if( !pInterfaceType->bComplete )
         {
             typelib_typedescription_complete( &pInterfaceType );
         }
-
+        
         typelib_TypeDescription *pMethodType = 0;
         typelib_typedescriptionreference_getDescription(
             &pMethodType,
@@ -518,10 +518,10 @@ sal_Int32 SAL_CALL PropertyObject::localRequestChange( )
 
         void *pArg1 = &m_nRandomNumberOfRequest;
         void **ppArgs = &pArg1;
-
+        
         uno_Any exception;
         uno_Any *pException = &exception;
-
+        
         ClientJob job( m_pEnvRemote,
                        0,
                        m_pBridgeImpl,
@@ -546,7 +546,7 @@ sal_Int32 SAL_CALL PropertyObject::localRequestChange( )
         if( bSuccess )
         {
             job.wait();
-
+        
             if( pException )
             {
                 // the object is unknown on the other side.
@@ -570,7 +570,7 @@ sal_Int32 SAL_CALL PropertyObject::localRequestChange( )
     return nResult;
 }
 
-// implementation for call from remote
+// implementation for call from remote 
 sal_Int32 SAL_CALL PropertyObject::implRequestChange( sal_Int32 nRandomNumber, uno_Any **ppException )
 {
     sal_Int32 nResult = 0;
@@ -616,13 +616,13 @@ void SAL_CALL PropertyObject::localCommitChange( const ::rtl::OUString &sProps ,
     //       The remote counterpart cannot if the call following the commit already uses
     //       the new properties or not.
     MutexGuard guard( m_pBridgeImpl->m_marshalingMutex );
-
+    
     OUString oid = OUString::createFromAscii( g_NameOfUrpProtocolPropertiesObject );
 
     osl_resetCondition( m_commitChangeCondition );
 
     Properties props = *m_pLocalSetting;
-
+    
     typelib_TypeDescription *pInterfaceType = 0;
     getCppuType( (Reference< XProtocolProperties > *) 0 ).getDescription( &pInterfaceType );
 
@@ -630,75 +630,75 @@ void SAL_CALL PropertyObject::localCommitChange( const ::rtl::OUString &sProps ,
     {
         typelib_typedescription_complete( &pInterfaceType );
     }
-
+    
     typelib_TypeDescription *pMethodType = 0;
     typelib_typedescriptionreference_getDescription(
         &pMethodType,
         ((typelib_InterfaceTypeDescription*) pInterfaceType)->ppAllMembers[METHOD_COMMIT_CHANGE] );
+    
+//	typelib_TypeDescription *pSequenceType= 0;
 
-//  typelib_TypeDescription *pSequenceType= 0;
-
-
+    
     // extract name/value pairs
     uno_Sequence *pSeq = 0;
     assignFromStringToPropSeq( sProps, &pSeq );
     assignFromPropSeqToStruct( pSeq , &props );
-//      ::std::list< OUString > lst;
-//      extractTokens( sProps , lst );
-
-//      getCppuType( (Sequence< ProtocolProperty > *)0).getDescription( &pSequenceType );
-//      uno_sequence_construct( &pSeq , pSequenceType , 0, lst.size() , 0 );
-//      ProtocolProperty *pElements = (ProtocolProperty * ) pSeq->elements;
-
-//      sal_Int32 i = 0;
-//      for( ::std::list< OUString >::iterator ii = lst.begin() ; ii != lst.end() ; ++ ii, i++ )
-//      {
-//          sal_Int32 nAssign = (*ii).indexOf( '=' );
-//          if( -1 == nAssign )
-//          {
-//              OString o = OUStringToOString( *ii, RTL_TEXTENCODING_ASCII_US );
-//              OSL_ENSURE( !"wrong protocol propertyt format, ignored", o.getStr() );
-//          }
-//          OUString sPropName = (*ii).copy( 0, nAssign );
-//          OUString sValue    = (*ii).copy( nAssign +1, (*ii).getLength() - nAssign -1 );
-
-//          sal_Int32 nIndex = getIndexFromString( sPropName );
-//          if( -1 == nIndex )
-//          {
-//              OString o = OUStringToOString( sPropName , RTL_TEXTENCODING_ASCII_US);
-//              OSL_ENSURE( !"unknown protocol property, ignored", o.getStr() );
-//          }
-//          switch( nIndex )
-//          {
-//              // bools
-//          case PROPERTY_CLEARCACHE:
-//          {
-//              sal_Bool bClearCache = (sal_Bool ) sValue.toInt32();
-//              assignToIdl( &(pElements[i]) , nIndex , bClearCache );
-//              break;
-//          }
-//              // ints
-//          case PROPERTY_TYPECACHESIZE:
-//          case PROPERTY_OIDCACHESIZE:
-//          case PROPERTY_TIDCACHESIZE:
-//          case PROPERTY_FLUSHBLOCKSIZE:
-//          case PROPERTY_ONEWAYTIMEOUT_MUSEC:
-//          {
-//              sal_Int32 nValue = sValue.toInt32();
-//              assignToIdl( &(pElements[i]) , nIndex , nValue );
-//              break;
-//          }
-
-//              // strings
-//          case PROPERTY_VERSION:
-//              assignToIdl( &(pElements[i]) , nIndex , sValue );
-//              break;
-//          default:
-//              OString o = OUStringToOString( sPropName, RTL_TEXTENCODING_ASCII_US );
-//              OSL_ENSURE( !"readonly protocol property, ignored" , o.getStr() );
-//          }
-//          assignFromIdlToStruct( &props, pElements[i] );
-//      }
+//  	::std::list< OUString > lst;
+//  	extractTokens( sProps , lst );
+
+//  	getCppuType( (Sequence< ProtocolProperty > *)0).getDescription( &pSequenceType );
+//  	uno_sequence_construct( &pSeq , pSequenceType , 0, lst.size() , 0 );
+//  	ProtocolProperty *pElements = (ProtocolProperty * ) pSeq->elements;
+
+//  	sal_Int32 i = 0;
+//  	for( ::std::list< OUString >::iterator ii = lst.begin() ; ii != lst.end() ; ++ ii, i++ )
+//  	{
+//  		sal_Int32 nAssign = (*ii).indexOf( '=' );
+//  		if( -1 == nAssign )
+//  		{
+//  			OString o = OUStringToOString( *ii, RTL_TEXTENCODING_ASCII_US );
+//  			OSL_ENSURE( !"wrong protocol propertyt format, ignored", o.getStr() );
+//  		}
+//  		OUString sPropName = (*ii).copy( 0, nAssign );
+//  		OUString sValue    = (*ii).copy( nAssign +1, (*ii).getLength() - nAssign -1 );
+
+//  		sal_Int32 nIndex = getIndexFromString( sPropName );
+//  		if( -1 == nIndex )
+//  		{
+//  			OString o = OUStringToOString( sPropName , RTL_TEXTENCODING_ASCII_US);
+//  			OSL_ENSURE( !"unknown protocol property, ignored", o.getStr() );
+//  		}
+//  		switch( nIndex )
+//  		{
+//  			// bools
+//  		case PROPERTY_CLEARCACHE:
+//  		{
+//  			sal_Bool bClearCache = (sal_Bool ) sValue.toInt32();
+//  			assignToIdl( &(pElements[i]) , nIndex , bClearCache );
+//  			break;
+//  		}
+//  			// ints
+//  		case PROPERTY_TYPECACHESIZE:
+//  		case PROPERTY_OIDCACHESIZE:
+//  		case PROPERTY_TIDCACHESIZE:
+//  		case PROPERTY_FLUSHBLOCKSIZE:
+//  		case PROPERTY_ONEWAYTIMEOUT_MUSEC:
+//  		{
+//  			sal_Int32 nValue = sValue.toInt32();
+//  			assignToIdl( &(pElements[i]) , nIndex , nValue );
+//  			break;
+//  		}
+
+//  			// strings 
+//  		case PROPERTY_VERSION:
+//  			assignToIdl( &(pElements[i]) , nIndex , sValue );
+//  			break;
+//  		default:
+//  			OString o = OUStringToOString( sPropName, RTL_TEXTENCODING_ASCII_US );
+//  			OSL_ENSURE( !"readonly protocol property, ignored" , o.getStr() );
+//  		}
+//  		assignFromIdlToStruct( &props, pElements[i] );
+//  	}
 
     void *pArg1 = &pSeq;
     uno_Any exception;
@@ -722,7 +722,7 @@ void SAL_CALL PropertyObject::localCommitChange( const ::rtl::OUString &sProps ,
     {
         OSL_ASSERT( pException != NULL );
     }
-
+    
     ::uno_type_destructData(
         &pSeq, getCppuType( (Sequence< ProtocolProperty > *)0).getTypeLibType(), 0 );
 
@@ -748,7 +748,7 @@ void SAL_CALL PropertyObject::localCommitChange( const ::rtl::OUString &sProps ,
     typelib_typedescription_release( pMethodType );
     typelib_typedescription_release( pInterfaceType );
 }
-
+    
 void SAL_CALL PropertyObject::implCommitChange( uno_Sequence *pSequence, uno_Any **ppException )
 {
     MutexGuard guard( m_mutex );
diff --git a/bridges/source/remote/urp/urp_propertyobject.hxx b/bridges/source/remote/urp/urp_propertyobject.hxx
index d6cfbc84ff95..49628f522e3d 100644
--- a/bridges/source/remote/urp/urp_propertyobject.hxx
+++ b/bridges/source/remote/urp/urp_propertyobject.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@ namespace bridges_urp {
 struct urp_BridgeImpl;
 const sal_Char g_NameOfUrpProtocolPropertiesObject[] = "UrpProtocolProperties";
 
-// helper functions
+// helper functions 
 void assignFromStringToStruct( const ::rtl::OUString & sProps , struct Properties *pProps );
 
 class PropertyObject : public remote_Interface
@@ -49,17 +49,17 @@ class PropertyObject : public remote_Interface
 private:
     ::osl::Mutex m_mutex;
     oslCondition m_commitChangeCondition;
-    oslInterlockedCount m_nRefCount;
+    oslInterlockedCount	m_nRefCount;
     urp_BridgeImpl *m_pBridgeImpl;
     struct Properties *m_pLocalSetting;
     struct Properties m_propsToBeApplied;
-
+    
     uno_Environment *m_pEnvRemote;
     sal_Int32 m_nRandomNumberOfRequest;
     sal_Bool  m_bRequestChangeHasBeenCalled;
     sal_Bool  m_bServerWaitingForCommit;
     sal_Bool  m_bApplyProperties;
-
+    
 public:
     PropertyObject(
         struct Properties *pLocalSetting , uno_Environment *pEnvRemote, urp_BridgeImpl *pImpl );
@@ -83,7 +83,7 @@ public:
                                 void * pArgs[],
                                 uno_Any ** ppException );
 
-public: // local
+public: // local 
     sal_Int32 SAL_CALL localRequestChange(  );
     void SAL_CALL localCommitChange( const ::rtl::OUString &properties, sal_Bool *pbExceptionThrown );
     void SAL_CALL localGetPropertiesFromRemote( struct Properties * );
@@ -92,9 +92,9 @@ public: // local
     inline sal_Bool SAL_CALL changesHaveBeenCommited()
         { return m_bApplyProperties; }
     Properties SAL_CALL getCommitedChanges();
-
+        
     void SAL_CALL waitUntilChangesAreCommitted();
-
+    
 protected:
     // these methods are called by thisDispatch
     void SAL_CALL     implGetProperties( uno_Sequence **ppReturnValue );
diff --git a/bridges/source/remote/urp/urp_reader.cxx b/bridges/source/remote/urp/urp_reader.cxx
index 00941c468e1b..1dfaf30d4d1f 100644
--- a/bridges/source/remote/urp/urp_reader.cxx
+++ b/bridges/source/remote/urp/urp_reader.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -66,7 +66,7 @@ namespace bridges_urp
      ***/
     void SAL_CALL urp_releaseRemoteCallback (
         remote_Interface *, rtl_uString *pOid,
-        typelib_TypeDescriptionReference *pTypeRef, uno_Environment *pEnvRemote )
+        typelib_TypeDescriptionReference *pTypeRef, uno_Environment *pEnvRemote	)
     {
         remote_Context *pContext = (remote_Context *) pEnvRemote->pContext;
         urp_BridgeImpl *pImpl = (urp_BridgeImpl*) ( pContext->m_pBridgeImpl );
@@ -758,7 +758,7 @@ void OReaderThread::run()
                     pLastRemoteI = 0;
                 }
                 ClientJob *pClientJob =
-                    m_pBridgeImpl->m_clientJobContainer.remove( *( ByteSequence * )ppLastTid );
+                    m_pBridgeImpl->m_clientJobContainer.remove(	*( ByteSequence * )ppLastTid );
 
                 // Bridge MUST be already disposed, otherwise we got a wrong threadid
                 // from remote !
diff --git a/bridges/source/remote/urp/urp_reader.hxx b/bridges/source/remote/urp/urp_reader.hxx
index aa4042ce197b..409cce526caf 100644
--- a/bridges/source/remote/urp/urp_reader.hxx
+++ b/bridges/source/remote/urp/urp_reader.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@ typedef struct _uno_Environment uno_Environment;
 
 namespace bridges_urp
 {
-
+    
 class OWriterThread;
 struct MessageFlags;
 
@@ -46,9 +46,9 @@ public:
                    uno_Environment *pEnvRemote,
                    OWriterThread *pWriterThread );
     ~OReaderThread();
-
+    
     // may only be called in the callstack of this thread !!!!!
-    // run() -> disposeEnvironment() -> dispose() -> destroyYourself()
+    // run() -> disposeEnvironment() -> dispose() -> destroyYourself() 
     void destroyYourself();
 
 private:
@@ -66,7 +66,7 @@ private:
         sal_Bool *pbIsSetter,
         sal_uInt16 nMethodId ,
         typelib_TypeDescriptionReference *pITypeRef);
-
+    
     remote_Connection *m_pConnection;
     uno_Environment *m_pEnvRemote;
     OWriterThread *m_pWriterThread;
diff --git a/bridges/source/remote/urp/urp_replycontainer.hxx b/bridges/source/remote/urp/urp_replycontainer.hxx
index c8b05ea47435..ff04a15a8f94 100644
--- a/bridges/source/remote/urp/urp_replycontainer.hxx
+++ b/bridges/source/remote/urp/urp_replycontainer.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/remote/urp/urp_threadid.cxx b/bridges/source/remote/urp/urp_threadid.cxx
index e603a73bab83..4554057d22a8 100644
--- a/bridges/source/remote/urp/urp_threadid.cxx
+++ b/bridges/source/remote/urp/urp_threadid.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/remote/urp/urp_threadid.hxx b/bridges/source/remote/urp/urp_threadid.hxx
index e920e2c1e9c3..d26b1cdc0af9 100644
--- a/bridges/source/remote/urp/urp_threadid.hxx
+++ b/bridges/source/remote/urp/urp_threadid.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@ namespace bridges_urp
 
     struct HashThreadId
     {
-        sal_Int32 operator () ( const ::rtl::ByteSequence &a  )  const
+        sal_Int32 operator () ( const ::rtl::ByteSequence &a  )  const 
             {
                 if( a.getLength() >= 4 )
                 {
diff --git a/bridges/source/remote/urp/urp_unmarshal.cxx b/bridges/source/remote/urp/urp_unmarshal.cxx
index 5fd124017d4a..43802bc78d8a 100644
--- a/bridges/source/remote/urp/urp_unmarshal.cxx
+++ b/bridges/source/remote/urp/urp_unmarshal.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/remote/urp/urp_unmarshal.hxx b/bridges/source/remote/urp/urp_unmarshal.hxx
index 04881d456cce..07b03b606641 100644
--- a/bridges/source/remote/urp/urp_unmarshal.hxx
+++ b/bridges/source/remote/urp/urp_unmarshal.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ struct urp_BridgeImpl;
 void SAL_CALL urp_releaseRemoteCallback(
     remote_Interface *pRemoteI,rtl_uString *pOid,
     typelib_TypeDescriptionReference *pTypeRef,
-    uno_Environment *pEnvRemote );
+    uno_Environment *pEnvRemote	);
 
 struct UnpackItem
 {
diff --git a/bridges/source/remote/urp/urp_writer.cxx b/bridges/source/remote/urp/urp_writer.cxx
index 58795d9f3359..38f85a7c4194 100644
--- a/bridges/source/remote/urp/urp_writer.cxx
+++ b/bridges/source/remote/urp/urp_writer.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/source/remote/urp/urp_writer.hxx b/bridges/source/remote/urp/urp_writer.hxx
index 041f0b4d753f..f491bc9aadbc 100644
--- a/bridges/source/remote/urp/urp_writer.hxx
+++ b/bridges/source/remote/urp/urp_writer.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@ namespace bridges_urp
         ::rtl::OUString sOid;
         ::com::sun::star::uno::Type typeInterface;
     };
-
+    
     struct urp_BridgeImpl;
     class OWriterThread :
         public ::osl::Thread
@@ -55,18 +55,18 @@ namespace bridges_urp
                        urp_BridgeImpl *m_pBridgeImpl,
                        uno_Environment *pEnvRemote);
         ~OWriterThread(  );
-
+        
         virtual void SAL_CALL run();
-
+        
         void touch( sal_Bool bImmediately );
         void sendEmptyMessage();
-
+        
         void abortThread();
 
         void SAL_CALL insertReleaseRemoteCall (
             rtl_uString *pOid,typelib_TypeDescriptionReference *pTypeRef);
         void SAL_CALL executeReleaseRemoteCalls();
-
+        
     private:
         void write();
         oslCondition m_oslCondition;
diff --git a/bridges/test/com/sun/star/lib/TestBed.java b/bridges/test/com/sun/star/lib/TestBed.java
index 2e96a724ebc3..971fbe5cfc6a 100644
--- a/bridges/test/com/sun/star/lib/TestBed.java
+++ b/bridges/test/com/sun/star/lib/TestBed.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug107753_Test.java b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug107753_Test.java
index badc38df256e..052f6927b744 100644
--- a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug107753_Test.java
+++ b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug107753_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug108825_Test.java b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug108825_Test.java
index 9c7b84a960b3..1b6cf60802fc 100644
--- a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug108825_Test.java
+++ b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug108825_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug110892_Test.java b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug110892_Test.java
index 322f8051ed60..3e1e21285983 100644
--- a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug110892_Test.java
+++ b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug110892_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug111153_Test.java b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug111153_Test.java
index 351481cb4680..ff94985ccbad 100644
--- a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug111153_Test.java
+++ b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug111153_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug114133_Test.java b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug114133_Test.java
index 0049b966be1c..40dac06164da 100644
--- a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug114133_Test.java
+++ b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug114133_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug51323_Test.java b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug51323_Test.java
index bb13c55ee1ad..fe0bfafa3b19 100644
--- a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug51323_Test.java
+++ b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug51323_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug92174_Test.java b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug92174_Test.java
index 9c425a61fb2b..a4eecdb28b33 100644
--- a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug92174_Test.java
+++ b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug92174_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug97697_Test.java b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug97697_Test.java
index 34d98532688b..559fecdeffce 100644
--- a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug97697_Test.java
+++ b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug97697_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug98508_Test.idl b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug98508_Test.idl
index 491f82cc0a83..fb46db0ed542 100644
--- a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug98508_Test.idl
+++ b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug98508_Test.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug98508_Test.java b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug98508_Test.java
index 82804cf22e67..810b7ce88500 100644
--- a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug98508_Test.java
+++ b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug98508_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/MethodIdTest.java b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/MethodIdTest.java
index 39c8a0639b8f..c8ff424cbad1 100755
--- a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/MethodIdTest.java
+++ b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/MethodIdTest.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/PolyStructTest.idl b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/PolyStructTest.idl
index 68330567d405..fdc080d093ee 100644
--- a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/PolyStructTest.idl
+++ b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/PolyStructTest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/PolyStructTest.java b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/PolyStructTest.java
index ebf1ed57bc2c..4f37abb8e271 100644
--- a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/PolyStructTest.java
+++ b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/PolyStructTest.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/StopMessageDispatcherTest.java b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/StopMessageDispatcherTest.java
index 2456d681563d..487d3e4877f7 100644
--- a/bridges/test/com/sun/star/lib/uno/bridges/java_remote/StopMessageDispatcherTest.java
+++ b/bridges/test/com/sun/star/lib/uno/bridges/java_remote/StopMessageDispatcherTest.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/inter_libs_exc/inter.cxx b/bridges/test/inter_libs_exc/inter.cxx
index 56966388f09e..b3f94e844305 100644
--- a/bridges/test/inter_libs_exc/inter.cxx
+++ b/bridges/test/inter_libs_exc/inter.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,12 +57,12 @@ extern "C" int main( int argc, char const * argv [] )
     typedef t_throws_exc (SAL_CALL * t_get_thrower)();
     t_get_thrower get_thrower = (t_get_thrower)mod_thrower.getSymbol( OUSTR("get_thrower") );
     t_throws_exc thrower = (*get_thrower)();
-
+    
     typedef void (SAL_CALL * t_starter)( t_throws_exc );
     t_starter start = (t_starter)mod_starter.getSymbol( OUSTR("start") );
-
+    
     (*start)( thrower );
-
+    
     return 0;
 }
 
diff --git a/bridges/test/inter_libs_exc/starter.cxx b/bridges/test/inter_libs_exc/starter.cxx
index e19e83990979..23b8d066b2be 100644
--- a/bridges/test/inter_libs_exc/starter.cxx
+++ b/bridges/test/inter_libs_exc/starter.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/inter_libs_exc/thrower.cxx b/bridges/test/inter_libs_exc/thrower.cxx
index d490e5d7b084..5289e59d7363 100644
--- a/bridges/test/inter_libs_exc/thrower.cxx
+++ b/bridges/test/inter_libs_exc/thrower.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/java_uno/acquire/TestAcquire.java b/bridges/test/java_uno/acquire/TestAcquire.java
index 0314e6bfcf9d..b1b90c825cd4 100644
--- a/bridges/test/java_uno/acquire/TestAcquire.java
+++ b/bridges/test/java_uno/acquire/TestAcquire.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx
index 95a4a0241d20..9c4ab2b07bdf 100644
--- a/bridges/test/java_uno/acquire/testacquire.cxx
+++ b/bridges/test/java_uno/acquire/testacquire.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/java_uno/acquire/types.idl b/bridges/test/java_uno/acquire/types.idl
index 6dd2964777bd..d8edcf737e78 100644
--- a/bridges/test/java_uno/acquire/types.idl
+++ b/bridges/test/java_uno/acquire/types.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/java_uno/any/TestAny.java b/bridges/test/java_uno/any/TestAny.java
index 43e8bf542479..3e21fb15a663 100644
--- a/bridges/test/java_uno/any/TestAny.java
+++ b/bridges/test/java_uno/any/TestAny.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/java_uno/any/TestJni.java b/bridges/test/java_uno/any/TestJni.java
index 1242c38e86b0..5628263ad8bf 100644
--- a/bridges/test/java_uno/any/TestJni.java
+++ b/bridges/test/java_uno/any/TestJni.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@ public class TestJni
 {
     static { System.loadLibrary( "test_javauno_any" ); }
     private static native XTransport create_jni_transport(ClassLoader loader);
-
+    
     public static void main( String args [] )
     {
         if (TestAny.test(
diff --git a/bridges/test/java_uno/any/TestRemote.java b/bridges/test/java_uno/any/TestRemote.java
index 4d038559660f..b1508b97a08e 100644
--- a/bridges/test/java_uno/any/TestRemote.java
+++ b/bridges/test/java_uno/any/TestRemote.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/java_uno/any/transport.cxx b/bridges/test/java_uno/any/transport.cxx
index 4211a96f8149..f093c9c09d9b 100644
--- a/bridges/test/java_uno/any/transport.cxx
+++ b/bridges/test/java_uno/any/transport.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -70,9 +70,9 @@ extern "C" JNIEXPORT jobject JNICALL Java_test_java_1uno_anytest_TestJni_create_
     // publish some idl types
     ::getCppuType( (Reference< XTransport > const *)0 );
     ::getCppuType( (Reference< ::test::java_uno::anytest::DerivedInterface > const *)0 );
-
+    
     Reference< XTransport > xRet( new Transport() );
-
+    
     // get java vm
     JavaVM * java_vm;
     OSL_VERIFY( 0 == jni_env->GetJavaVM( &java_vm ) );
@@ -95,13 +95,13 @@ extern "C" JNIEXPORT jobject JNICALL Java_test_java_1uno_anytest_TestJni_create_
     OSL_ASSERT( java_env.is() );
     uno_getEnvironment( (uno_Environment **)&cpp_env, cpp_name.pData, 0 );
     OSL_ASSERT( cpp_env.is() );
-
+    
     // map interface
     Mapping mapping( cpp_env.get(), java_env.get() );
     OSL_ASSERT( mapping.is() );
     jobject jo_global = (jobject)mapping.mapInterface( xRet.get(), ::getCppuType( &xRet ) );
     OSL_ASSERT( 0 != jo_global );
-
+    
     // return
     jobject jo_ret = jni_env->NewLocalRef( jo_global );
     jni_env->DeleteGlobalRef( jo_global );
diff --git a/bridges/test/java_uno/any/types.idl b/bridges/test/java_uno/any/types.idl
index a7d7df5487e6..cc71ad85fd08 100644
--- a/bridges/test/java_uno/any/types.idl
+++ b/bridges/test/java_uno/any/types.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,8 +35,8 @@ interface XTransport : com::sun::star::uno::XInterface
     any mapAny([in] any a);
 };
 
-interface BaseInterface : com::sun::star::uno::XInterface {};
-
-interface DerivedInterface : BaseInterface {};
+interface BaseInterface : com::sun::star::uno::XInterface {}; 
 
+interface DerivedInterface : BaseInterface {}; 
+ 
 }; }; };
diff --git a/bridges/test/java_uno/equals/TestEquals.java b/bridges/test/java_uno/equals/TestEquals.java
index 5f3ee34a1c1d..b2d134914abd 100644
--- a/bridges/test/java_uno/equals/TestEquals.java
+++ b/bridges/test/java_uno/equals/TestEquals.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx
index ff38371bc6ca..6f8197c3665f 100644
--- a/bridges/test/java_uno/equals/testequals.cxx
+++ b/bridges/test/java_uno/equals/testequals.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/java_uno/equals/types.idl b/bridges/test/java_uno/equals/types.idl
index c8ddc2f072fe..afe2dddb5117 100644
--- a/bridges/test/java_uno/equals/types.idl
+++ b/bridges/test/java_uno/equals/types.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/java_uno/nativethreadpool/Relay.java b/bridges/test/java_uno/nativethreadpool/Relay.java
index 50e198a2d819..5f4307b36efe 100644
--- a/bridges/test/java_uno/nativethreadpool/Relay.java
+++ b/bridges/test/java_uno/nativethreadpool/Relay.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
index 425b93a271e4..fa2277e2a8ad 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
index c055faa1aa29..1aa1caa2df00 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/java_uno/nativethreadpool/types.idl b/bridges/test/java_uno/nativethreadpool/types.idl
index 36ca44af37e0..ce9f31263f68 100644
--- a/bridges/test/java_uno/nativethreadpool/types.idl
+++ b/bridges/test/java_uno/nativethreadpool/types.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/java_uno/nativethreadpool/version.map b/bridges/test/java_uno/nativethreadpool/version.map
index b560ad15b99f..39c961bdfb95 100644
--- a/bridges/test/java_uno/nativethreadpool/version.map
+++ b/bridges/test/java_uno/nativethreadpool/version.map
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/bridges/test/performance/testperformance.cxx b/bridges/test/performance/testperformance.cxx
index d692144a3f37..66e1adf0f4ee 100644
--- a/bridges/test/performance/testperformance.cxx
+++ b/bridges/test/performance/testperformance.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -60,20 +60,20 @@ static inline sal_uInt32 getSystemTicks()
 #ifdef SAL_W32
     return (sal_uInt32)GetTickCount();
 #else // only UNX supported for now
-    static sal_uInt32   nImplTicksPerSecond = 0;
-    static double       dImplTicksPerSecond;
-    static double       dImplTicksULONGMAX;
-
-    struct tms          aTms;
+    static sal_uInt32	nImplTicksPerSecond = 0;
+    static double		dImplTicksPerSecond;
+    static double		dImplTicksULONGMAX;
+    
+    struct tms			aTms;
     sal_uInt32 nTicks = (sal_uInt32)times( &aTms );
 
     if ( !nImplTicksPerSecond )
     {
         nImplTicksPerSecond = CLK_TCK;
         dImplTicksPerSecond = nImplTicksPerSecond;
-        dImplTicksULONGMAX  = (double)(sal_uInt32)ULONG_MAX;
+        dImplTicksULONGMAX	= (double)(sal_uInt32)ULONG_MAX;
     }
-
+    
     double fTicks = nTicks;
     fTicks *= 1000;
     fTicks /= dImplTicksPerSecond;
@@ -187,7 +187,7 @@ void main()
             OUString textEnc( RTL_CONSTASCII_USTRINGPARAM( "this is a test string" ) );
         }
     }
-
+        
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/test_bridge.idl b/bridges/test/test_bridge.idl
index ce38594ecd88..ed6f6e12e2a9 100644
--- a/bridges/test/test_bridge.idl
+++ b/bridges/test/test_bridge.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,21 +32,21 @@ module test
 
 struct TestTypes
 {
-    boolean                    Bool;
-    char                       Char;
-    byte                       Byte;
-    short                      Short;
-    unsigned short             UShort;
-    long                       Long;
-    unsigned long              ULong;
-    hyper                      Hyper;
-    unsigned hyper             UHyper;
-    float                      Float;
-    double                     Double;
-//  test::TestEnum             Enum;
-    string                     String;
+    boolean					   Bool;
+    char					   Char;
+    byte					   Byte;
+    short					   Short;
+    unsigned short			   UShort;
+    long					   Long;
+    unsigned long			   ULong;
+    hyper					   Hyper;
+    unsigned hyper			   UHyper;
+    float					   Float;
+    double					   Double;
+//	test::TestEnum			   Enum;
+    string					   String;
     com::sun::star::uno::XInterface   Interface;
-    any                        Any;
+    any						   Any;
 };
 
 exception TestBridgeException : com::sun::star::uno::Exception
diff --git a/bridges/test/testclient.cxx b/bridges/test/testclient.cxx
index be5223fb5873..b56537fd6722 100644
--- a/bridges/test/testclient.cxx
+++ b/bridges/test/testclient.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -74,25 +74,25 @@ using namespace ::com::sun::star::test::performance;
 void doPerformanceTest( const Reference < XPerformanceTest > & /* xBench */)
 {
     printf( "not implemented\n" );
-//      sal_Int32 i,nLoop = 2000;
-//      sal_Int32 tStart, tEnd , tEnd2;
-//      //------------------------------------
-//      // oneway calls
-//      i = nLoop;
-//      tStart = GetTickCount();
-//      while (i--)
-//          xBench->async();
-//      tEnd = GetTickCount();
-//      xBench->sync();
-//      tEnd2 = GetTickCount();
-//      printf( "%d %d %d\n" , nLoop, tEnd - tStart , tEnd2 -tStart );
-//      // synchron calls
-//      i = nLoop;
-//      tStart = GetTickCount();
-//      while (i--)
-//          xBench->sync();
-//      tEnd = GetTickCount();
-//      printf( "%d %d \n" , nLoop, tEnd - tStart );
+//  	sal_Int32 i,nLoop = 2000;
+//  	sal_Int32 tStart, tEnd , tEnd2;
+//  	//------------------------------------
+//  	// oneway calls
+//  	i = nLoop;
+//  	tStart = GetTickCount();
+//  	while (i--)
+//  		xBench->async();
+//  	tEnd = GetTickCount();
+//    	xBench->sync();
+//  	tEnd2 = GetTickCount();
+//  	printf( "%d %d %d\n" , nLoop, tEnd - tStart , tEnd2 -tStart );
+//  	// synchron calls
+//  	i = nLoop;
+//  	tStart = GetTickCount();
+//  	while (i--)
+//  		xBench->sync();
+//  	tEnd = GetTickCount();
+//  	printf( "%d %d \n" , nLoop, tEnd - tStart );
 
 }
 
@@ -193,7 +193,7 @@ int main( int argc, char *argv[] )
                         }
 
 
-                        Reference < XInterface > rInitialObject = rBridge->getInstance(
+                        Reference < XInterface > rInitialObject	= rBridge->getInstance(
                             OUString( RTL_CONSTASCII_USTRINGPARAM("bridges-testobject")) );
 
                         if( rInitialObject.is() )
@@ -201,19 +201,19 @@ int main( int argc, char *argv[] )
                             printf( "got the remote object\n" );
                             if( ! bReverse )
                             {
-  //                                Reference < XComponent > rPerfTest( rInitialObject , UNO_QUERY );
-//                                  if( rPerfTest.is() )
-//                                  {
-//  //                                      doPerformanceTest( rPerfTest );
-//                                  }
-//                                  else
-//                                  {
+  //    							Reference < XComponent > rPerfTest( rInitialObject , UNO_QUERY );
+//        							if( rPerfTest.is() )
+//        							{
+//  //      								doPerformanceTest( rPerfTest );
+//        							}
+//        							else
+//        							{
                                     testRemote( rInitialObject );
-//                                  }
+//        							}
                             }
                         }
-//                          Reference < XComponent > rComp( rBridge , UNO_QUERY );
-//                          rComp->dispose();
+//    						Reference < XComponent > rComp( rBridge , UNO_QUERY );
+//    						rComp->dispose();
 
                         rInitialObject = Reference < XInterface > ();
                         printf( "Waiting...\n" );
@@ -223,7 +223,7 @@ int main( int argc, char *argv[] )
                     }
 
                     Reference < XBridge > rBridge = rFactory->getBridge( OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) );
-//                      OSL_ASSERT( ! rBridge.is() );
+//      				OSL_ASSERT( ! rBridge.is() );
                 }
 
             }
diff --git a/bridges/test/testclient.java b/bridges/test/testclient.java
index f2963f685b9f..94da61555b30 100644
--- a/bridges/test/testclient.java
+++ b/bridges/test/testclient.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ class MyTestFactory implements XTestFactory
         {
             return new MyCallMe();
         }
-
+    
     public test.XInterfaceTest createInterfaceTest(  ) throws com.sun.star.uno.RuntimeException
         {
             return null;
@@ -78,7 +78,7 @@ class MyCallMe implements XCallMe
     public void callOneway( /*IN*/String s, /*IN*/int nToDo ) throws com.sun.star.uno.RuntimeException
         {
             System.out.println( "entering callOneway" );
-//              this.wait( 5 );
+//  			this.wait( 5 );
             try {
                 Thread.currentThread().sleep( 4000 );
             }
@@ -96,7 +96,7 @@ class MyCallMe implements XCallMe
         {
             return new test.TestTypes();
         }
-
+    
 }
 
 public class testclient
@@ -104,11 +104,11 @@ public class testclient
     static void main( String[] args )
         {
             try {
-
+                
                 com.sun.star.comp.servicemanager.ServiceManager smgr =
                     new com.sun.star.comp.servicemanager.ServiceManager();
                 smgr.addFactories( new String[] { "com.sun.star.comp.connections.Connector" });
-
+                
                 Object  x  = smgr.createInstance("com.sun.star.connection.Connector");
                 if( x == null )
                 {
@@ -116,12 +116,12 @@ public class testclient
                     return;
                 }
 
-
+                
                 XConnector xConnector =
                     UnoRuntime.queryInterface( XConnector.class , x );
-
+                
                 XConnection xConnection = xConnector.connect(args[0]);
-
+            
                 if( null != xConnection )
                 {
                     System.out.println( "after connect" );
@@ -132,13 +132,13 @@ public class testclient
                         "remote",
                         null,
                         new Object[]{"iiop", xConnection, new MyInstanceProvider()});
-
+                    
                     System.out.println( "after building bridge" );
-//                  Object rInitialObject = m_bridge.mapInterfaceFrom(rootOid, XInterface.class);
-//                  XTestFactory rFactory =
-//                      UnoRuntime.queryInterface(XTestFactory.class,rInitialObject );
-
-//                  XCallMe callMerFactory->
+//  				Object rInitialObject = m_bridge.mapInterfaceFrom(rootOid, XInterface.class);
+//  				XTestFactory rFactory =
+//  					UnoRuntime.queryInterface(XTestFactory.class,rInitialObject );
+                    
+//  				XCallMe callMerFactory->
                     Thread.currentThread().sleep( 100000 );
                 }
             }
@@ -152,5 +152,5 @@ public class testclient
             }
 
             System.out.println( "exiting" );
-        }
+        }	
 }
diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx
index 8ec0fc251491..2e90b2c8df72 100644
--- a/bridges/test/testcomp.cxx
+++ b/bridges/test/testcomp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -466,23 +466,23 @@ Reference< ::test::XInterfaceTest > SAL_CALL OTestFactory::createInterfaceTest(
 
 
 //  class OInstanceProvider :
-//      public ::cppu::OWeakObject,
-//      public XInstanceProvider
+//  	public ::cppu::OWeakObject,
+//  	public XInstanceProvider
 //  {
 //  public:
-//      OInstanceProvider( ){}
-//      ~OInstanceProvider(){ printf( "instance provider dies\n" );}
+//  	OInstanceProvider( ){}
+//  	~OInstanceProvider(){ printf( "instance provider dies\n" );}
 //  public:
-//      // XInterface
-//      Any         SAL_CALL queryInterface( const Type & aType);
-//      void        SAL_CALL acquire()                       { OWeakObject::acquire(); }
-//      void        SAL_CALL release()                       { OWeakObject::release(); }
+//  	// XInterface
+//  	Any	        SAL_CALL queryInterface( const Type & aType);
+//  	void 		SAL_CALL acquire() 						 { OWeakObject::acquire(); }
+//  	void 		SAL_CALL release() 						 { OWeakObject::release(); }
 
 //  public:
 //      virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
-//             getInstance( const ::rtl::OUString& sObjectName )
-//                   throw( ::com::sun::star::container::NoSuchElementException,
-//                          ::com::sun::star::uno::RuntimeException);
+//  	       getInstance( const ::rtl::OUString& sObjectName )
+//  		         throw( ::com::sun::star::container::NoSuchElementException,
+//  			            ::com::sun::star::uno::RuntimeException);
 //  };
 
 
@@ -517,7 +517,7 @@ double getCallsPerSecOneway( const Reference < XCallMe > &rCall ,
     osl_getSystemTime( &aStartTime );
     for( sal_Int32 i = 0; i < nLoops; i ++ )
     {
-//          rCall->callOneway( OUString( RTL_CONSTASCII_USTRINGPARAM("Performance test string" )), 0 );
+//  		rCall->callOneway( OUString( RTL_CONSTASCII_USTRINGPARAM("Performance test string" )), 0 );
           rCall->drawLine( 0 , 0 , 500 , 123 );
     }
     osl_getSystemTime( &aEndTime );
@@ -779,7 +779,7 @@ Reference <XInterface > createComponent( const ::rtl::OUString &sService ,
 
         OSL_ASSERT( rReg.is() );
         OUString aDllName = sDllName;
-
+        
         try
         {
             rReg->registerImplementation(
diff --git a/bridges/test/testcomp.h b/bridges/test/testcomp.h
index ad96c7262433..c21cc395cd71 100644
--- a/bridges/test/testcomp.h
+++ b/bridges/test/testcomp.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,13 +50,13 @@ public:
     OInterfaceTest() {}
     ~OInterfaceTest() {}
 
-public:
+public:	
     // XInterface
-    Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException );
-    void        SAL_CALL acquire() throw()                       { OWeakObject::acquire(); }
-    void        SAL_CALL release() throw()                       { OWeakObject::release(); }
+    Any	SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException );
+    void 		SAL_CALL acquire() throw() 						 { OWeakObject::acquire(); }
+    void 		SAL_CALL release() throw()						 { OWeakObject::release(); }
 
-public:
+public:	
     virtual void SAL_CALL setIn( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setInOut( ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL getOut( ::com::sun::star::uno::Reference< ::test::XCallMe >& callback ) throw(::com::sun::star::uno::RuntimeException);
@@ -77,11 +77,11 @@ public:
     OCallMe() : m_nLastToDos(-1) {}
     ~OCallMe() {}
 
-public:
+public:	
     // XInterface
-    Any SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException );
-    void        SAL_CALL acquire()throw()                        { OWeakObject::acquire(); }
-    void        SAL_CALL release()throw()                        { OWeakObject::release(); }
+    Any	SAL_CALL queryInterface( const com::sun::star::uno::Type & aType) throw ( ::com::sun::star::uno::RuntimeException );
+    void 		SAL_CALL acquire()throw() 						 { OWeakObject::acquire(); }
+    void 		SAL_CALL release()throw() 						 { OWeakObject::release(); }
 public:
     // XCallMe
     virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo )
@@ -113,11 +113,11 @@ public:
     OTestFactory() {}
     ~OTestFactory() {}
 
-public:
+public:	
     // XInterface
-    Any         SAL_CALL queryInterface( const  com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException );
-    void        SAL_CALL acquire() throw()                       { OWeakObject::acquire(); }
-    void        SAL_CALL release() throw()                       { OWeakObject::release(); }
+    Any	        SAL_CALL queryInterface( const  com::sun::star::uno::Type & aType ) throw ( ::com::sun::star::uno::RuntimeException );
+    void 		SAL_CALL acquire() throw() 						 { OWeakObject::acquire(); }
+    void 		SAL_CALL release() throw()						 { OWeakObject::release(); }
 public:
     virtual ::com::sun::star::uno::Reference< ::test::XCallMe > SAL_CALL createCallMe(  )
         throw(::com::sun::star::uno::RuntimeException);
@@ -137,12 +137,12 @@ public:
         m_rSMgr( r )
         {}
     ~OInstanceProvider(){ printf( "instance provider dies\n" );}
-public:
+public:	
     // XInterface
-    Any         SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException );
-    void        SAL_CALL acquire()throw()                        { OWeakObject::acquire(); }
-    void        SAL_CALL release() throw()                       { OWeakObject::release(); }
-
+    Any	        SAL_CALL queryInterface( const Type & aType)throw ( ::com::sun::star::uno::RuntimeException );
+    void 		SAL_CALL acquire()throw() 						 { OWeakObject::acquire(); }
+    void 		SAL_CALL release() throw()						 { OWeakObject::release(); }
+    
 public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
            getInstance( const ::rtl::OUString& sObjectName )
diff --git a/bridges/test/testoffice.cxx b/bridges/test/testoffice.cxx
index 0d87089b6921..d073cc2dfcfe 100644
--- a/bridges/test/testoffice.cxx
+++ b/bridges/test/testoffice.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -109,7 +109,7 @@ void testPipe( const Reference < XMultiServiceFactory > & rSmgr )
         if( ! ( 42 == seq.getArray()[0] ) )
             printf( "wrong element in sequence\n" );
 
-//          OSL_ASSERT( 0 );
+//			OSL_ASSERT( 0 );
     }
 }
 #include<stdio.h>
diff --git a/bridges/test/testsameprocess.cxx b/bridges/test/testsameprocess.cxx
index 35003986e386..e2e725fe6f35 100644
--- a/bridges/test/testsameprocess.cxx
+++ b/bridges/test/testsameprocess.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -145,10 +145,10 @@ int main( int argc, char *argv[] )
             UNO_QUERY );
 
         // just ensure that it is registered
-//      createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.iiop")),
-//                       OUString( RTL_CONSTASCII_USTRINGPARAM("iiopbrdg" SAL_DLLEXTENSION)),
-//                       rSMgr );
-
+// 		createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.iiop")),
+// 						 OUString( RTL_CONSTASCII_USTRINGPARAM("iiopbrdg" SAL_DLLEXTENSION)),
+// 						 rSMgr );
+        
         Reference < XBridgeFactory > rFactory(
             createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory")),
                              OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION)),
diff --git a/bridges/test/testserver.cxx b/bridges/test/testserver.cxx
index 1e9b70cf13d3..d5fbb770de63 100644
--- a/bridges/test/testserver.cxx
+++ b/bridges/test/testserver.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -183,8 +183,8 @@ void MyThread::run()
 
 int main( int argc, char *argv[] )
 {
-//  testserver();
-
+//	testserver();
+    
     if( argc < 2 )
     {
         printf( "usage : testserver [-r] connectionstring\n"
@@ -196,9 +196,9 @@ int main( int argc, char *argv[] )
     OUString sProtocol;
     sal_Bool bReverse = sal_False;
     sal_Bool bLatency = sal_False;
-
+    
     parseCommandLine( argv , &sConnectionString , &sProtocol , &bLatency , &bReverse );
-
+    
     {
         Reference< XMultiServiceFactory > rSMgr = createRegistryServiceFactory(
             OUString( RTL_CONSTASCII_USTRINGPARAM( "server.rdb" )  ) );
@@ -208,12 +208,12 @@ int main( int argc, char *argv[] )
             OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION )),
             rSMgr ),
                                                      UNO_QUERY );
-
-
+        
+    
         createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.iiop")),
                          OUString( RTL_CONSTASCII_USTRINGPARAM("remotebridge.uno" SAL_DLLEXTENSION)),
                          rSMgr );
-
+        
 
         Reference < XAcceptor > rAcceptor(
             createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Acceptor")),
@@ -230,7 +230,7 @@ int main( int argc, char *argv[] )
                          bLatency);
         thread.create();
 
-#ifdef SAL_W32
+#ifdef SAL_W32	
         _getch();
 #elif  SOLARIS
         getchar();
@@ -239,11 +239,11 @@ int main( int argc, char *argv[] )
         osl_waitThread( &value );
 #endif
         printf( "Closing...\n" );
-
+        
         rAcceptor->stopAccepting();
         thread.join();
-
-        printf( "Closed\n" );
+        
+        printf( "Closed\n" );		
 
         Reference < XComponent > rComp2( rBridgeFactory , UNO_QUERY );
         rComp2->dispose();
diff --git a/cli_ure/inc/pch/precompiled_cli_ure.cxx b/cli_ure/inc/pch/precompiled_cli_ure.cxx
index e11d2045be2d..038c02c7c1ea 100644
--- a/cli_ure/inc/pch/precompiled_cli_ure.cxx
+++ b/cli_ure/inc/pch/precompiled_cli_ure.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cli_ure/inc/pch/precompiled_cli_ure.hxx b/cli_ure/inc/pch/precompiled_cli_ure.hxx
index 59c8eb0fd6a9..a107db0ffd08 100644
--- a/cli_ure/inc/pch/precompiled_cli_ure.hxx
+++ b/cli_ure/inc/pch/precompiled_cli_ure.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cli_ure/qa/climaker/ClimakerTestCase.java b/cli_ure/qa/climaker/ClimakerTestCase.java
index b7443ffcb65b..430c6dbce094 100644
--- a/cli_ure/qa/climaker/ClimakerTestCase.java
+++ b/cli_ure/qa/climaker/ClimakerTestCase.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ public class ClimakerTestCase extends ComplexTestCase
                 failed("Check the make file. Java must be called with -Dcli_ure_test=pathtoexe");
             Process proc = null;
             try{
-
+                
              proc = Runtime.getRuntime().exec(testProgram);
              Reader outReader = new Reader(proc.getInputStream());
              Reader errReader = new Reader(proc.getErrorStream());
@@ -68,7 +68,7 @@ public class ClimakerTestCase extends ComplexTestCase
         {
             failed("Unexpected exception.");
         }
-
+        
     }
 }
 
diff --git a/cli_ure/qa/climaker/types.idl b/cli_ure/qa/climaker/types.idl
index 29a141f74960..ef2d854a73a8 100644
--- a/cli_ure/qa/climaker/types.idl
+++ b/cli_ure/qa/climaker/types.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,12 +50,12 @@ struct PolyStruct2<a> {
     a member1;
     long member2;
 };
-
+ 
 struct PolyStruct3<a,b> {
     a member1;
     b member2;
 };
-
+    
 interface XTest {
     boolean test();
 
@@ -74,12 +74,12 @@ interface XTest {
     [oneway] void testOneway();
 
     void testExceptions()
-        raises( com::sun::star::uno::Exception,
+        raises( com::sun::star::uno::Exception, 
                 com::sun::star::lang::ClassNotFoundException);
 
-
+    
     PolyStruct<char,long> testPolyStruct([in] PolyStruct<char, long> val);
-
+ 
 
     void inParameters([in] boolean aBool, [in] byte aByte, [in] short aShort,
                       [in] unsigned short aUShort, [in] long aLong, [in] unsigned long aULong,
@@ -98,7 +98,7 @@ interface XTest {
                       [out] com::sun::star::uno::XInterface aXInterface,
                       [out] com::sun::star::lang::XComponent aXComponent,
                       [out] sequence<boolean> seqBool);
-
+    
     void inoutParameters([inout] boolean aBool, [inout] byte aByte, [inout] short aShort,
                          [inout] unsigned short aUShort, [inout] long aLong,
                          [inout] unsigned long aULong,
@@ -129,7 +129,7 @@ interface XTest {
     com::sun::star::uno::XInterface retXInterface();
     com::sun::star::lang::XComponent retXComponent();
     sequence<boolean> retSeqBool();
-
+    
     [attribute] boolean attrBoolean;
     [attribute] byte attrByte;
     [attribute] short attrShort;
@@ -169,7 +169,7 @@ typedef Enum2 Enum;
 typedef Struct1 Struct;
 typedef com::sun::star::uno::XInterface XInterface;
 typedef com::sun::star::uno::XNamingService XNamingService;
-typedef com::sun::star::lang::XComponent XComponent;
+typedef com::sun::star::lang::XComponent XComponent; 
 
 typedef sequence< Boolean > SequenceBoolean;
 typedef sequence< Byte > SequenceByte;
@@ -189,7 +189,7 @@ typedef sequence< Enum > SequenceEnum;
 typedef sequence< Struct > SequenceStruct;
 typedef sequence< XInterface > SequenceXInterface;
 typedef sequence< XNamingService > SequenceXNamingService;
-typedef sequence< XComponent > SequenceXComponent;
+typedef sequence< XComponent > SequenceXComponent; 
 
 struct Struct2 {
     boolean p1;
@@ -412,7 +412,7 @@ service S1: XTest {
         [in] sequence< SequenceHyper > at7,
         [in] sequence< SequenceUnsignedHyper > at8,
         [in] sequence< SequenceFloat > at9,
-        [in] sequence< SequenceDouble > at10,
+        [in] sequence< SequenceDouble > at10, 
         [in] sequence< SequenceChar > at11,
         [in] sequence< SequenceString > at12,
         [in] sequence< SequenceType > at13,
diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx
index 2d82e00a17ca..b79fb7c961cf 100644
--- a/cli_ure/source/climaker/climaker_app.cxx
+++ b/cli_ure/source/climaker/climaker_app.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -131,7 +131,7 @@ static OptionInfo const * get_option_info(
           ++pos )
     {
         OptionInfo const & option_info = s_option_infos[ pos ];
-
+        
         if (opt.getLength() > 0)
         {
             if (opt.equalsAsciiL(
@@ -162,14 +162,14 @@ static bool is_option(
     OSL_ASSERT( option_info != 0 );
     if (osl_getCommandArgCount() <= *pIndex)
         return false;
-
+    
     OUString arg;
     osl_getCommandArg( *pIndex, &arg.pData );
     sal_Int32 len = arg.getLength();
-
+    
     if (len < 2 || arg[ 0 ] != '-')
         return false;
-
+    
     if (len == 2 && arg[ 1 ] == option_info->m_short_option)
     {
         ++(*pIndex);
@@ -273,7 +273,7 @@ Reference< registry::XSimpleRegistry > open_registries(
             OUSTR("no registries given!"),
             Reference< XInterface >() );
     }
-
+    
     Reference< registry::XSimpleRegistry > xSimReg;
     for ( size_t nPos = registries.size(); nPos--; )
     {
@@ -288,7 +288,7 @@ Reference< registry::XSimpleRegistry > open_registries(
                 OUSTR("invalid registry: ") + registries[ nPos ],
                 Reference< XInterface >() );
         }
-
+        
         if (xSimReg.is()) // nest?
         {
             Reference< registry::XSimpleRegistry > xNested(
@@ -308,7 +308,7 @@ Reference< registry::XSimpleRegistry > open_registries(
             xSimReg = xReg;
         }
     }
-
+    
     return xSimReg;
 }
 
@@ -325,12 +325,12 @@ SAL_IMPLEMENT_MAIN()
         printf( s_usingText );
         return 0;
     }
-
+    
     int ret = 0;
     Reference< XComponentContext > xContext;
-
+    
     try
-    {
+    {    
         OptionInfo const * info_help =
             get_option_info( OUSTR("help") );
         OptionInfo const * info_verbose =
@@ -359,7 +359,7 @@ SAL_IMPLEMENT_MAIN()
             get_option_info( OUSTR("assembly-copyright") );
         OptionInfo const * info_trademark =
             get_option_info( OUSTR("assembly-trademark") );
-
+        
         OUString output;
         vector< OUString > mandatory_registries;
         vector< OUString > extra_registries;
@@ -367,7 +367,7 @@ SAL_IMPLEMENT_MAIN()
         vector< OUString > explicit_types;
         OUString version, product, description, company, copyright, trademark,
             keyfile, delaySign;
-
+        
         OUString cmd_arg;
         for ( sal_uInt32 nPos = 0; nPos < nCount; )
         {
@@ -462,7 +462,7 @@ SAL_IMPLEMENT_MAIN()
                 }
             }
         }
-
+        
         // bootstrap uno
         xContext = ::cppu::bootstrap_InitialComponentContext(
             Reference< registry::XSimpleRegistry >() );
@@ -471,7 +471,7 @@ SAL_IMPLEMENT_MAIN()
                 OUSTR("/singletons/com.sun.star.reflection."
                       "theTypeDescriptionManager") ),
             UNO_QUERY_THROW );
-
+        
         // get rdb tdprovider factory
         Reference< lang::XSingleComponentFactory > xTDprov_factory(
             ::cppu::loadSharedLibComponentFactory(
@@ -487,7 +487,7 @@ SAL_IMPLEMENT_MAIN()
                       "bootstrap.uno" SAL_DLLEXTENSION "!"),
                 Reference< XInterface >() );
         }
-
+        
         // create registry td provider for mandatory registry files
         Any arg( makeAny( open_registries( mandatory_registries, xContext ) ) );
         Reference< XInterface > xTD_provider(
@@ -507,7 +507,7 @@ SAL_IMPLEMENT_MAIN()
             xSet->insert( provider );
             OSL_ASSERT( xSet->has( provider ) );
         }
-
+        
         if (0 == output.getLength()) // no output file specified
         {
             // if only one rdb has been given, then take rdb name
@@ -575,13 +575,13 @@ SAL_IMPLEMENT_MAIN()
         assembly_name->set_Name( name );
         if (kp != NULL)
             assembly_name->set_KeyPair(kp);
-
+        
         if (version.getLength() != 0)
         {
             assembly_name->set_Version(
                 new ::System::Version( ustring_to_String( version ) ) );
         }
-
+        
         // app domain
         ::System::AppDomain * current_appdomain =
               ::System::AppDomain::get_CurrentDomain();
@@ -644,7 +644,7 @@ SAL_IMPLEMENT_MAIN()
                     __typeof (AssemblyTrademarkAttribute)->GetConstructor(
                         params ), args ) );
         }
-
+        
         // load extra assemblies
         Assembly * assemblies __gc [] =
             new Assembly * __gc [ extra_assemblies.size() ];
@@ -653,7 +653,7 @@ SAL_IMPLEMENT_MAIN()
             assemblies[ pos ] = Assembly::LoadFrom(
                 ustring_to_String( extra_assemblies[ pos ] ) );
         }
-
+        
         // type emitter
         TypeEmitter * type_emitter = new TypeEmitter(
             assembly_builder->DefineDynamicModule( output_file ), assemblies );
@@ -662,7 +662,7 @@ SAL_IMPLEMENT_MAIN()
               new ::System::ResolveEventHandler(
                   type_emitter, &TypeEmitter::type_resolve );
         current_appdomain->add_TypeResolve( type_resolver );
-
+        
         // and emit types to it
         if (explicit_types.empty())
         {
@@ -691,7 +691,7 @@ SAL_IMPLEMENT_MAIN()
             }
         }
         type_emitter->Dispose();
-
+        
         if (g_verbose)
         {
             ::System::Console::Write(
@@ -727,7 +727,7 @@ SAL_IMPLEMENT_MAIN()
             msg.getStr() );
         ret = 1;
     }
-
+    
     try
     {
         Reference< lang::XComponent > xComp( xContext, UNO_QUERY );
@@ -745,7 +745,7 @@ SAL_IMPLEMENT_MAIN()
             msg.getStr() );
         ret = 1;
     }
-
+    
     return ret;
 }
 
diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx
index c25821a7c696..49343d740e2a 100644
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -160,7 +160,7 @@ void polymorphicStructNameToStructName(::System::String ** sPolyName)
 System::String* mapUnoTypeName(System::String * typeName)
 {
     ::System::Text::StringBuilder* buf= new System::Text::StringBuilder();
-    ::System::String * sUnoName = ::System::String::Copy(typeName);
+    ::System::String * sUnoName = ::System::String::Copy(typeName); 
     //determine if the type is a sequence and its dimensions
     int dims= 0;
     if (typeName->StartsWith(S"["))//if (usUnoName[0] == '[')
@@ -198,7 +198,7 @@ System::String* mapUnoTypeName(System::String * typeName)
     else if (sUnoName->Equals(const_cast<System::String*>(Constants::sUnoDouble)))
         buf->Append(const_cast<System::String*>(Constants::sDouble));
     else if (sUnoName->Equals(const_cast<System::String*>(Constants::sUnoString)))
-        buf->Append(const_cast<System::String*>(Constants::sString));
+        buf->Append(const_cast<System::String*>(Constants::sString));    
     else if (sUnoName->Equals(const_cast<System::String*>(Constants::sUnoVoid)))
         buf->Append(const_cast<System::String*>(Constants::sVoid));
     else if (sUnoName->Equals(const_cast<System::String*>(Constants::sUnoType)))
@@ -206,7 +206,7 @@ System::String* mapUnoTypeName(System::String * typeName)
     else if (sUnoName->Equals(const_cast<System::String*>(Constants::sUnoXInterface)))
         buf->Append(const_cast<System::String*>(Constants::sObject));
     else if (sUnoName->Equals(const_cast<System::String*>(Constants::sUnoAny)))
-    {
+    {        
         buf->Append(const_cast<System::String*>(Constants::sAny));
     }
     else
@@ -237,7 +237,7 @@ System::String* mapUnoPolymorphicName(System::String* unoName)
     int index = unoName->IndexOf('<');
     if (index == -1)
         return unoName;
-
+    
     System::Text::StringBuilder * builder =
         new System::Text::StringBuilder(unoName->Substring(0, index +1 ));
 
@@ -357,14 +357,14 @@ Assembly * TypeEmitter::type_resolve(
 
     if (ret_type == 0)
     {
-        try
+        try 
         {
             // may call on type_resolve()
             return ::System::Type::GetType( cts_name, throw_exc );
-        }
+        } 
         catch (::System::Exception* exc)
         {
-            //If the type is not found one may have forgotten to specify assemblies with
+            //If the type is not found one may have forgotten to specify assemblies with 
             //additional types
             ::System::Text::StringBuilder * sb = new ::System::Text::StringBuilder();
             sb->Append(new ::System::String(S"\nThe type "));
@@ -429,7 +429,7 @@ Assembly * TypeEmitter::type_resolve(
             code->Emit( Emit::OpCodes::Ldarg_2 );
             code->Emit( Emit::OpCodes::Stfld, field_Context );
             code->Emit( Emit::OpCodes::Ret );
-
+            
             if (g_verbose)
             {
                 ::System::Console::WriteLine(
@@ -483,7 +483,7 @@ Assembly * TypeEmitter::type_resolve(
                 Emit::OpCodes::Call,
                 type_Exception->GetConstructor( param_types ) );
             code->Emit( Emit::OpCodes::Ret );
-
+            
             if (g_verbose)
             {
                 ::System::Console::WriteLine(
@@ -515,7 +515,7 @@ Assembly * TypeEmitter::type_resolve(
                                   TypeAttributes::Sealed |
                                   TypeAttributes::BeforeFieldInit |
                                   TypeAttributes::AnsiClass) );
-
+        
         Emit::FieldBuilder * field_builder = type_builder->DefineField(
             cts_name->Substring( cts_name->LastIndexOf( '.' ) +1 ),
             constant->GetType(),
@@ -523,7 +523,7 @@ Assembly * TypeEmitter::type_resolve(
                                FieldAttributes::Static |
                                FieldAttributes::Literal) );
         field_builder->SetConstant( constant );
-
+        
         if (g_verbose)
         {
             ::System::Console::WriteLine(
@@ -549,7 +549,7 @@ Assembly * TypeEmitter::type_resolve(
                                   TypeAttributes::Sealed |
                                   TypeAttributes::BeforeFieldInit |
                                   TypeAttributes::AnsiClass) );
-
+        
         Sequence< Reference<
             reflection::XConstantTypeDescription > > seq_constants(
                 xType->getConstants() );
@@ -574,7 +574,7 @@ Assembly * TypeEmitter::type_resolve(
                                    FieldAttributes::Literal) );
             field_builder->SetConstant( constant );
         }
-
+        
         if (g_verbose)
         {
             ::System::Console::WriteLine(
@@ -633,7 +633,7 @@ Assembly * TypeEmitter::type_resolve(
             field_builder->SetConstant(
                 __box ((::System::Int32) enum_values[ enum_pos ]) );
         }
-
+        
         if (g_verbose)
         {
             ::System::Console::WriteLine(
@@ -684,8 +684,8 @@ Assembly * TypeEmitter::type_resolve(
                                   TypeAttributes::BeforeFieldInit |
                                   TypeAttributes::AnsiClass),
                 base_type );
-
-
+        
+  
          // insert to be completed
         struct_entry * entry = new struct_entry();
         xType->acquire();
@@ -693,14 +693,14 @@ Assembly * TypeEmitter::type_resolve(
         entry->m_type_builder = type_builder;
         entry->m_base_type = base_type;
         m_incomplete_structs->Add( cts_name, entry );
-
+        
         // type is incomplete
         ret_type = type_builder;
     }
-
-    //In case of an instantiated polymorphic struct we want to return a
+    
+    //In case of an instantiated polymorphic struct we want to return a 
     //uno.PolymorphicType (inherits Type) rather then Type. This is neaded for constructing
-    //the service code. We can only do that if the struct is completed.
+    //the service code. We can only do that if the struct is completed.   
     if (m_generated_structs->get_Item(cts_name))
     {
         Reference< reflection::XStructTypeDescription> xStructTypeDesc(
@@ -711,7 +711,7 @@ Assembly * TypeEmitter::type_resolve(
             Sequence< Reference< reflection::XTypeDescription > > seqTypeArgs = xStructTypeDesc->getTypeArguments();
             sal_Int32 numTypes = seqTypeArgs.getLength();
             if (numTypes > 0)
-            {
+            {	
                 //it is an instantiated polymorphic struct
                 ::System::String * sCliName = mapUnoTypeName(ustring_to_String(xType->getName()));
                 ret_type = ::uno::PolymorphicType::GetType(ret_type, sCliName);
@@ -731,13 +731,13 @@ Assembly * TypeEmitter::type_resolve(
     {
         return __typeof (::System::Object);
     }
-
+    
     ::System::String * cts_name = to_cts_name( xType->getName() );
     ::System::Type * ret_type = get_type( cts_name, false /* no exc */ );
     if (0 == ret_type)
     {
         Emit::TypeBuilder * type_builder;
-
+        
         TypeAttributes attr = (TypeAttributes) (TypeAttributes::Public |
                                                 TypeAttributes::Interface |
                                                 TypeAttributes::Abstract |
@@ -776,23 +776,23 @@ Assembly * TypeEmitter::type_resolve(
                 "warning: IDL interface {0} is not derived from "
                 "com.sun.star.uno.XInterface!",
                 ustring_to_String( uno_name ) );
-
+            
             type_builder = m_module_builder->DefineType( cts_name, attr );
         }
-
+        
         // insert to be completed
         iface_entry * entry = new iface_entry();
         xType->acquire();
         entry->m_xType = xType.get();
         entry->m_type_builder = type_builder;
         m_incomplete_ifaces->Add( cts_name, entry );
-
+        
         // type is incomplete
         ret_type = type_builder;
     }
     return ret_type;
 }
-
+ 
 
 //______________________________________________________________________________
 ::System::Type * TypeEmitter::get_type(
@@ -800,7 +800,7 @@ Assembly * TypeEmitter::type_resolve(
 {
     if (xType->isSingleInterfaceBased() == sal_False)
         return NULL;
-
+    
     System::String * cts_name = to_cts_name( xType->getName() );
     System::Type * ret_type = get_type( cts_name, false /* no exc */ );
     if (ret_type != NULL)
@@ -810,7 +810,7 @@ Assembly * TypeEmitter::type_resolve(
                                             TypeAttributes::Sealed |
                                             TypeAttributes::BeforeFieldInit |
                                             TypeAttributes::AnsiClass);
-
+    
     Emit::TypeBuilder * type_builder = m_module_builder->DefineType(
         cts_name, attr);
 
@@ -820,7 +820,7 @@ Assembly * TypeEmitter::type_resolve(
     entry->m_xType = xType.get();
     entry->m_type_builder = type_builder;
     m_incomplete_services->Add(cts_name,entry );
-
+        
     return type_builder;
 }
 
@@ -829,7 +829,7 @@ Assembly * TypeEmitter::type_resolve(
 {
     if (xType->isInterfaceBased() == sal_False)
         return NULL;
-
+    
     ::System::String* cts_name = to_cts_name( xType->getName() );
     ::System::Type * ret_type = get_type( cts_name, false /* no exc */ );
     if (ret_type != NULL)
@@ -840,7 +840,7 @@ Assembly * TypeEmitter::type_resolve(
         TypeAttributes::Sealed |
         TypeAttributes::BeforeFieldInit |
         TypeAttributes::AnsiClass);
-
+    
     Emit::TypeBuilder * type_builder = m_module_builder->DefineType(
         cts_name, attr);
 
@@ -850,7 +850,7 @@ Assembly * TypeEmitter::type_resolve(
     entry->m_xType = xType.get();
     entry->m_type_builder = type_builder;
     m_incomplete_singletons->Add(cts_name,entry );
-
+        
     return type_builder;
 
 }
@@ -860,7 +860,7 @@ Assembly * TypeEmitter::type_resolve(
 {
     Emit::TypeBuilder * type_builder = entry->m_type_builder;
     reflection::XInterfaceTypeDescription2 * xType = entry->m_xType;
-
+    
     Sequence<Reference< reflection::XTypeDescription > > seqBaseTypes( xType->getBaseTypes() );
     if (seqBaseTypes.getLength() > 0)
     {
@@ -899,7 +899,7 @@ Assembly * TypeEmitter::type_resolve(
             members[ members_pos ];
         Sequence< Reference< reflection::XTypeDescription > > seq_exceptions;
         Emit::MethodBuilder * method_builder;
-
+        
         const MethodAttributes c_method_attr = (MethodAttributes)
             (MethodAttributes::Public |
              MethodAttributes::Abstract |
@@ -909,14 +909,14 @@ Assembly * TypeEmitter::type_resolve(
 //#if defined(_MSC_VER) && (_MSC_VER < 1400)
 //             MethodAttributes::Instance);
 //#else
-//       Instance);
+//	     Instance);
 //#endif
-
+        
         if (TypeClass_INTERFACE_METHOD == xMember->getTypeClass())
         {
             Reference< reflection::XInterfaceMethodTypeDescription > xMethod(
                 xMember, UNO_QUERY_THROW );
-
+            
             Sequence<
                 Reference< reflection::XMethodParameter > > seq_parameters(
                     xMethod->getParameters() );
@@ -993,7 +993,7 @@ Assembly * TypeEmitter::type_resolve(
                     for (int i = 0; i < numTypes; i++)
                         arCtsTypes[i] = get_type(arXTypeArgs[i]);
                     ::System::Object * arArgs[] = {arCtsTypes};
-
+                    
                     Emit::CustomAttributeBuilder * attrBuilder =
                         new Emit::CustomAttributeBuilder(
                             __typeof(::uno::TypeArgumentsAttribute)
@@ -1029,14 +1029,14 @@ Assembly * TypeEmitter::type_resolve(
             Reference<
                 reflection::XInterfaceAttributeTypeDescription2 > xAttribute(
                     xMember, UNO_QUERY_THROW );
-
+            
             const MethodAttributes c_property_method_attr = (MethodAttributes)
                 (c_method_attr | MethodAttributes::SpecialName);
-
+            
             ::System::Type * attribute_type = get_type( xAttribute->getType() );
             ::System::Type * parameters [] =
                   new ::System::Type * [ 0 ];
-
+            
             Emit::PropertyBuilder * property_builder =
                 type_builder->DefineProperty(
                     ustring_to_String( xAttribute->getMemberName() ),
@@ -1054,7 +1054,7 @@ Assembly * TypeEmitter::type_resolve(
                         ctorBoundAttr, new ::System::Object*[0]);
                 property_builder->SetCustomAttribute(attrBuilderBound);
             }
-
+            
             // getter
             Emit::MethodBuilder * method_builder =
                 type_builder->DefineMethod(
@@ -1069,7 +1069,7 @@ Assembly * TypeEmitter::type_resolve(
                 method_builder->SetCustomAttribute(attrBuilder);
 
             property_builder->SetGetMethod( method_builder );
-
+            
             if (! xAttribute->isReadOnly())
             {
                 // setter
@@ -1088,17 +1088,17 @@ Assembly * TypeEmitter::type_resolve(
                     get_exception_attribute(xAttribute->getSetExceptions());
                 if (attrBuilder != NULL)
                     method_builder->SetCustomAttribute(attrBuilder);
-
+                
                 property_builder->SetSetMethod( method_builder );
             }
         }
     }
-
+    
     // remove from incomplete types map
     ::System::String * cts_name = type_builder->get_FullName();
     m_incomplete_ifaces->Remove( cts_name );
     xType->release();
-
+    
     if (g_verbose)
     {
         ::System::Console::WriteLine(
@@ -1109,7 +1109,7 @@ Assembly * TypeEmitter::type_resolve(
 
 ::System::Type * TypeEmitter::complete_struct_type( struct_entry * entry )
 {
-     OSL_ASSERT(entry);
+     OSL_ASSERT(entry);   
     ::System::String * cts_name = entry->m_type_builder->get_FullName();
 
     //Polymorphic struct, define uno.TypeParametersAttribute
@@ -1136,7 +1136,7 @@ Assembly * TypeEmitter::type_resolve(
                 new Emit::CustomAttributeBuilder(
                 __typeof(::uno::TypeParametersAttribute)->GetConstructor(arTypesCtor),
                 args);
-            entry->m_type_builder->SetCustomAttribute(attrBuilder);
+            entry->m_type_builder->SetCustomAttribute(attrBuilder);                   
         }
     }
 
@@ -1150,14 +1150,14 @@ Assembly * TypeEmitter::type_resolve(
                 m_generated_structs->get_Item(
                     entry->m_base_type->get_FullName() ) );
     }
-
+        
         // members
     Sequence< Reference< reflection::XTypeDescription > > seq_members(
         entry->m_xType->getMemberTypes() );
     Sequence< OUString > seq_member_names( entry->m_xType->getMemberNames() );
     sal_Int32 members_length = seq_members.getLength();
     OSL_ASSERT( seq_member_names.getLength() == members_length );
-    //check if we have a XTypeDescription for every member. If not then the user may
+    //check if we have a XTypeDescription for every member. If not then the user may 
     //have forgotten to specify additional rdbs with the --extra option.
     Reference< reflection::XTypeDescription > const * pseq_members =
             seq_members.getConstArray();
@@ -1172,11 +1172,11 @@ Assembly * TypeEmitter::type_resolve(
             "specify additional RDBs with the --extra option. Type missing for: ") +  sType +
             OUSTR("::") + sMemberName,0);
     }
-
+        
     sal_Int32 all_members_length = 0;
     sal_Int32 member_pos;
     sal_Int32 type_param_pos = 0;
-
+    
     // collect base types; wrong order
     ::System::Collections::ArrayList * base_types_list =
             new ::System::Collections::ArrayList( 3 /* initial capacity */ );
@@ -1460,11 +1460,11 @@ Assembly * TypeEmitter::type_resolve(
     // new entry
     m_generated_structs->Add(cts_name, entry );
     ::System::Type * ret_type = entry->m_type_builder->CreateType();
-
+    
     // remove from incomplete types map
     m_incomplete_structs->Remove( cts_name );
     entry->m_xType->release();
-
+    
     if (g_verbose)
     {
         ::System::Console::WriteLine(
@@ -1474,34 +1474,34 @@ Assembly * TypeEmitter::type_resolve(
 }
 
 //Examples of generated code
-//      public static XWeak constructor1(XComponentContext ctx)
-//      {
-//          XMultiComponentFactory factory = ctx.getServiceManager();
-//          if (factory == null)
-//              throw new com.sun.star.uno.DeploymentException("bla", null);
-//          return (XWeak) factory.createInstanceWithContext("service_specifier", ctx);
-//      }
-//      public static XWeak constructor2(XComponentContext ctx, int a, int b, Any c)
-//      {
-//          XMultiComponentFactory factory = ctx.getServiceManager();
-//          if (factory == null)
-//              throw new com.sun.star.uno.DeploymentException("bla", null);
-//          Any[] arAny = new Any[3];
-//          arAny[0] = new Any(typeof(int), a);
-//          arAny[1] = new Any(typeof(int), b);
-//          arAny[2] = new Any(c.Type, c.Value);
-//          return (XWeak) factory.createInstanceWithArgumentsAndContext("service_specifier", arAny, ctx);
-//      }
+// 		public static XWeak constructor1(XComponentContext ctx)
+// 		{
+// 			XMultiComponentFactory factory = ctx.getServiceManager();
+// 			if (factory == null)
+// 				throw new com.sun.star.uno.DeploymentException("bla", null);
+// 			return (XWeak) factory.createInstanceWithContext("service_specifier", ctx);
+// 		}
+// 		public static XWeak constructor2(XComponentContext ctx, int a, int b, Any c)
+// 		{
+// 			XMultiComponentFactory factory = ctx.getServiceManager();
+// 			if (factory == null)
+// 				throw new com.sun.star.uno.DeploymentException("bla", null);
+// 			Any[] arAny = new Any[3];
+// 			arAny[0] = new Any(typeof(int), a);
+// 			arAny[1] = new Any(typeof(int), b);
+//			arAny[2] = new Any(c.Type, c.Value);
+// 			return (XWeak) factory.createInstanceWithArgumentsAndContext("service_specifier", arAny, ctx);
+// 		}
 // Notice that a any parameter is NOT wrapped by another any. Instead the new any is created with the type and value
 // of the parameter.
 
-//      public static XWeak constructor3(XComponentContext ctx, params Any[] c)
-//      {
-//          XMultiComponentFactory factory = ctx.getServiceManager();
-//          if (factory == null)
-//              throw new com.sun.star.uno.DeploymentException("bla", null);
-//          return (XWeak) factory.createInstanceWithArgumentsAndContext("service_specifier", c, ctx);
-//      }
+// 		public static XWeak constructor3(XComponentContext ctx, params Any[] c)
+// 		{
+// 			XMultiComponentFactory factory = ctx.getServiceManager();
+// 			if (factory == null)
+// 				throw new com.sun.star.uno.DeploymentException("bla", null);
+// 			return (XWeak) factory.createInstanceWithArgumentsAndContext("service_specifier", c, ctx);
+//		}
 ::System::Type * TypeEmitter::complete_service_type(service_entry * entry)
 {
     Emit::TypeBuilder * type_builder = entry->m_type_builder;
@@ -1546,7 +1546,7 @@ Assembly * TypeEmitter::type_resolve(
         xServiceType->getConstructors();
 
     ::System::Type * type_uno_exception = get_type(S"unoidl.com.sun.star.uno.Exception", true);
-
+    
     for (int i = seqCtors.getLength() - 1; i >= 0; i--)
     {
         bool bParameterArray = false;
@@ -1568,11 +1568,11 @@ Assembly * TypeEmitter::type_resolve(
                 arTypeParameters[iparam + 1] = get_type(arXParams[iparam]->getType());
         }
         //The array arTypeParameters can contain:
-        //System.Type and uno.PolymorphicType.
+        //System.Type and uno.PolymorphicType. 
         //Passing PolymorphicType to MethodBuilder.DefineMethod will cause a problem.
         //The exception will read something like no on information for parameter # d
-        //Maybe we need no override another Type method in PolymorphicType ...
-        //Until we have figured this out, we will create another array of System.Type which
+        //Maybe we need no override another Type method in PolymorphicType ... 
+        //Until we have figured this out, we will create another array of System.Type which 
         //we pass on to DefineMethod.
         ::System::Type * arParamTypes[] = new ::System::Type * [cParams + 1];
 //        arParamTypes[0] = get_type(S"unoidl.com.sun.star.uno.XComponentContext", true);
@@ -1634,7 +1634,7 @@ Assembly * TypeEmitter::type_resolve(
                 break;
             }
         }
-
+        
         Emit::ILGenerator * ilGen = method_builder->GetILGenerator();
 
         //Define locals ---------------------------------
@@ -1695,7 +1695,7 @@ Assembly * TypeEmitter::type_resolve(
 
             ::System::Reflection::MethodInfo * methodCreate =
                     local_factory->get_LocalType()->GetMethod(S"createInstanceWithContext");
-            ilGen->Emit(Emit::OpCodes::Callvirt, methodCreate);
+            ilGen->Emit(Emit::OpCodes::Callvirt, methodCreate);  
         }
         else if(bParameterArray)
         {
@@ -1714,7 +1714,7 @@ Assembly * TypeEmitter::type_resolve(
             // For each parameter,except the component context, and parameter array
             // and Any is created.
             Emit::LocalBuilder * arLocalAny[] = new Emit::LocalBuilder* [cParams];
-
+            
             for (int iParam = 0; iParam < cParams; iParam ++)
             {
                 arLocalAny[iParam] = ilGen->DeclareLocal(typeAny);
@@ -1724,7 +1724,7 @@ Assembly * TypeEmitter::type_resolve(
             //and the values contained in the parameter array
             Emit::LocalBuilder * local_anyParams =
                 ilGen->DeclareLocal(__typeof(::uno::Any[]));
-
+            
             //Create the Any for every argument, except for the parameter array
             //arLocalAny contains the LocalBuilder for all these parameters.
             //we call the ctor Any(Type, Object)
@@ -1733,9 +1733,9 @@ Assembly * TypeEmitter::type_resolve(
                                                     __typeof(::System::Object)};
             ::System::Reflection::ConstructorInfo * ctorAny =
                 typeAny->GetConstructor( arTypesCtorAny);
-            ::System::Reflection::MethodInfo * methodAnyGetType =
+            ::System::Reflection::MethodInfo * methodAnyGetType = 
                 typeAny->GetProperty(S"Type")->GetGetMethod();
-            ::System::Reflection::MethodInfo * methodAnyGetValue =
+            ::System::Reflection::MethodInfo * methodAnyGetValue = 
                 typeAny->GetProperty(S"Value")->GetGetMethod();
             for (int i = 0; i < arLocalAny->Length; i ++)
             {
@@ -1774,7 +1774,7 @@ Assembly * TypeEmitter::type_resolve(
                     ilGen->Emit(Emit::OpCodes::Call, ctorAny);
                 }
                 else if (arTypeParameters[i+1] == typeAny)
-                {
+                {	
                     //Create the call new Any(param.Type,param,Value)
                     //Stack must be Any,Type,Value
                     //First load the Any which is to be constructed
@@ -1812,7 +1812,7 @@ Assembly * TypeEmitter::type_resolve(
             ilGen->Emit(Emit::OpCodes::Newarr, typeAny);
             ilGen->Emit(Emit::OpCodes::Stloc, local_anyParams);
 
-            //Assign all anys created from the parameters
+            //Assign all anys created from the parameters 
             //array to the Any[]
             for (int i = 0; i < arLocalAny->Length; i++)
             {
@@ -1843,7 +1843,7 @@ Assembly * TypeEmitter::type_resolve(
             ilGen->BeginCatchBlock(get_type(S"unoidl.com.sun.star.uno.RuntimeException", true));
             ilGen->Emit(Emit::OpCodes::Pop);
             ilGen->Emit(Emit::OpCodes::Rethrow);
-
+            
             //catch and rethrow all other defined Exceptions
             for (int i = 0; i < arExceptionTypes->Count; i++)
             {
@@ -1892,7 +1892,7 @@ Assembly * TypeEmitter::type_resolve(
             ilGen->Emit(Emit::OpCodes::Throw);//Exception(typeDeploymentExc);
 
             ilGen->EndExceptionBlock();
-        }
+        }   
 
 
         //Check if the service instance was create and throw a exception if not.
@@ -1903,7 +1903,7 @@ Assembly * TypeEmitter::type_resolve(
         strbuilder = new ::System::Text::StringBuilder(256);
         strbuilder->Append(S"The context (com.sun.star.uno.XComponentContext) failed to supply the service ");
         strbuilder->Append(to_cts_name(xServiceType->getName()));
-        strbuilder->Append(S".");
+        strbuilder->Append(S".");        
         ilGen->Emit(Emit::OpCodes::Ldstr, strbuilder->ToString());
         ilGen->Emit(Emit::OpCodes::Ldarg_0);
         ilGen->Emit(Emit::OpCodes::Newobj, ctorDeploymentException);
@@ -1938,7 +1938,7 @@ Emit::CustomAttributeBuilder* TypeEmitter::get_iface_method_exception_attribute(
 {
 
     const Sequence<Reference<reflection::XTypeDescription> > seqTD = xMethod->getExceptions();
-    int len = seqTD.getLength();
+    int len = seqTD.getLength();    
     Sequence<Reference<reflection::XCompoundTypeDescription> > seqCTD(len);
     Reference<reflection::XCompoundTypeDescription> * arCTD = seqCTD.getArray();
     for (int i = 0; i < len; i++)
@@ -1951,7 +1951,7 @@ Emit::CustomAttributeBuilder* TypeEmitter::get_exception_attribute(
     const Sequence<Reference< reflection::XCompoundTypeDescription > >& seq_exceptionsTd )
 {
     Emit::CustomAttributeBuilder * attr_builder = NULL;
-
+    
     Reference< reflection::XCompoundTypeDescription > const * exceptions =
         seq_exceptionsTd.getConstArray();
 
@@ -1961,7 +1961,7 @@ Emit::CustomAttributeBuilder* TypeEmitter::get_exception_attribute(
 
     sal_Int32 exc_length = seq_exceptionsTd.getLength();
     if (exc_length != 0) // opt
-    {
+    {        
         ::System::Type * exception_types [] =
               new ::System::Type * [ exc_length ];
         for ( sal_Int32 exc_pos = 0; exc_pos < exc_length; ++exc_pos )
@@ -2017,7 +2017,7 @@ Emit::CustomAttributeBuilder* TypeEmitter::get_exception_attribute(
                                       MethodAttributes::Static),
         retType,
         arTypeParameters);
-
+        
 
 //         method_builder->SetCustomAttribute(get_service_ctor_method_attribute(ctorDes));
 
@@ -2030,9 +2030,9 @@ Emit::CustomAttributeBuilder* TypeEmitter::get_exception_attribute(
     ilGen = method_builder->GetILGenerator();
     //Define locals ---------------------------------
     // Any, returned by XComponentContext.getValueByName
-    Emit::LocalBuilder* local_any =
+    Emit::LocalBuilder* local_any = 
         ilGen->DeclareLocal(__typeof(::uno::Any));
-
+    
     //Call XContext::getValueByName
     ilGen->Emit(Emit::OpCodes::Ldarg_0);
     // build the singleton name : /singleton/unoidl.com.sun.star.XXX
@@ -2070,7 +2070,7 @@ Emit::CustomAttributeBuilder* TypeEmitter::get_exception_attribute(
                 ->GetConstructor(arTypesCtorDeploymentException));
     ilGen->Emit(Emit::OpCodes::Throw);
     ilGen->MarkLabel(label_singleton_exists);
-
+    
     //Cast the singleton contained in the Any to the expected interface and return it.
     ilGen->Emit(Emit::OpCodes::Ldloca_S, local_any);
     ilGen->Emit(Emit::OpCodes::Call,  __typeof(::uno::Any)->GetProperty(S"Value")->GetGetMethod());
@@ -2086,7 +2086,7 @@ Emit::CustomAttributeBuilder* TypeEmitter::get_exception_attribute(
         ::System::Console::WriteLine(
             "> emitting singleton type {0}", cts_name );
     }
-    return type_builder->CreateType();
+    return type_builder->CreateType();    
 }
 
 
@@ -2125,7 +2125,7 @@ Emit::CustomAttributeBuilder* TypeEmitter::get_exception_attribute(
     case TypeClass_TYPE:
         return __typeof (::System::Type);
     case TypeClass_ANY:
-        return __typeof(::uno::Any);
+        return __typeof(::uno::Any); 
     case TypeClass_ENUM:
         return get_type( Reference< reflection::XEnumTypeDescription >(
                              xType, UNO_QUERY_THROW ) );
@@ -2191,7 +2191,7 @@ Emit::CustomAttributeBuilder* TypeEmitter::get_exception_attribute(
 {
     struct_entry * pStruct = __try_cast< struct_entry *>(
         m_incomplete_structs->get_Item(sName));
-    if (pStruct)
+    if (pStruct) 
     {
         complete_struct_type(pStruct);
     }
@@ -2268,7 +2268,7 @@ TypeEmitter::TypeEmitter(
 {
     if (seqExceptionsTd.getLength() == 0)
         return new ::System::Collections::ArrayList();
-
+    
     ::System::Collections::ArrayList * arTypes = new ::System::Collections::ArrayList();
     for (int i = 0; i < seqExceptionsTd.getLength(); i++)
         arTypes->Add(get_type(to_cts_name(seqExceptionsTd[i]->getName()), true));
@@ -2287,7 +2287,7 @@ TypeEmitter::TypeEmitter(
                     arTypes->RemoveAt(i);
                     bRemove = true;
                     break;
-                }
+                }   
             }
             if (bRemove)
                 break;
@@ -2310,14 +2310,14 @@ resolveInterfaceTypedef(
 
     if (xIfaceTd.is())
         return xIfaceTd;
-
+    
     Reference<reflection::XIndirectTypeDescription> xIndTd(
         type, UNO_QUERY);
     if (xIndTd.is() == sal_False)
         throw css::uno::Exception(
             OUSTR("resolveInterfaceTypedef was called with an invalid argument"), 0);
 
-    return resolveInterfaceTypedef(xIndTd->getReferencedType());
+    return resolveInterfaceTypedef(xIndTd->getReferencedType());    
 }
 
 
diff --git a/cli_ure/source/climaker/climaker_share.h b/cli_ure/source/climaker/climaker_share.h
index da173d35dacf..bb69351e5e90 100644
--- a/cli_ure/source/climaker/climaker_share.h
+++ b/cli_ure/source/climaker/climaker_share.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -127,9 +127,9 @@ __gc class TypeEmitter : public ::System::IDisposable
 {
     ::System::Reflection::Emit::ModuleBuilder * m_module_builder;
     ::System::Reflection::Assembly * m_extra_assemblies __gc [];
-
+    
     ::System::Reflection::MethodInfo * m_method_info_Type_GetTypeFromHandle;
-
+    
     ::System::Type * m_type_Exception;
     ::System::Type * get_type_Exception();
     ::System::Type * m_type_RuntimeException;
@@ -160,7 +160,7 @@ __gc class TypeEmitter : public ::System::IDisposable
         const css::uno::Sequence<
         css::uno::Reference<css::reflection::XCompoundTypeDescription> > & seqExceptionsTd);
 
-
+    
     __gc class iface_entry
     {
     public:
@@ -169,7 +169,7 @@ __gc class TypeEmitter : public ::System::IDisposable
     };
     ::System::Collections::Hashtable * m_incomplete_ifaces;
     ::System::Type * complete_iface_type( iface_entry * entry );
-
+    
     __gc class struct_entry
     {
     public:
@@ -185,10 +185,10 @@ __gc class TypeEmitter : public ::System::IDisposable
     ::System::Collections::Hashtable * m_incomplete_structs;
     ::System::Type * complete_struct_type( struct_entry * entry );
 
-    /*  returns the type for the name. If it is a struct then it may
+    /*  returns the type for the name. If it is a struct then it may 
         complete the struct if not already done. This also refers to its
-        base types.
-
+        base types.            
+        
         @param sName
             the full name of the type.
         @return the type object for sName. Not necessarily a struct.
@@ -203,7 +203,7 @@ __gc class TypeEmitter : public ::System::IDisposable
     };
     ::System::Collections::Hashtable * m_incomplete_services;
     ::System::Type * complete_service_type(service_entry * entry);
-
+    
     __gc class singleton_entry
     {
     public:
@@ -214,10 +214,10 @@ __gc class TypeEmitter : public ::System::IDisposable
 
     ::System::Collections::Hashtable * m_incomplete_singletons;
     ::System::Type * complete_singleton_type(singleton_entry * entry);
-
-
+    
+    
     ::System::Collections::Hashtable * m_generated_structs;
-
+    
     ::System::Type * get_type(
         ::System::String * cli_name, bool throw_exc );
     ::System::Type * get_type(
@@ -229,7 +229,7 @@ __gc class TypeEmitter : public ::System::IDisposable
     ::System::Type * get_type(
         css::uno::Reference<
         css::reflection::XEnumTypeDescription > const & xType );
-    /* returns the type for a struct or exception. In case of a polymorphic struct it may
+    /* returns the type for a struct or exception. In case of a polymorphic struct it may 
         return a ::uno::PolymorphicType (cli_basetypes.dll) only if the struct is already
         complete.
     */
@@ -257,10 +257,10 @@ public:
         ::System::Reflection::Assembly * assemblies __gc [] );
     // must be called to finish up uncompleted types
     void Dispose();
-
+    
     ::System::Reflection::Assembly * type_resolve(
         ::System::Object * sender, ::System::ResolveEventArgs * args );
-
+    
     ::System::Type * get_type(
         css::uno::Reference<
         css::reflection::XTypeDescription > const & xType );
diff --git a/cli_ure/source/native/assembly.cxx b/cli_ure/source/native/assembly.cxx
index 5efc4af891fc..7553bca1a442 100644
--- a/cli_ure/source/native/assembly.cxx
+++ b/cli_ure/source/native/assembly.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cli_ure/source/native/native_bootstrap.cxx b/cli_ure/source/native/native_bootstrap.cxx
index d57dfba5e1c1..b8d488804293 100644
--- a/cli_ure/source/native/native_bootstrap.cxx
+++ b/cli_ure/source/native/native_bootstrap.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -143,7 +143,7 @@ WCHAR * getInstallPath()
 
     DWORD  cChars = GetEnvironmentVariable(UNO_PATH, NULL, 0);
     if (cChars > 0)
-    {
+    {	
         szInstallPath = new WCHAR[cChars];
         cChars = GetEnvironmentVariable(UNO_PATH, szInstallPath, cChars);
         //If PATH is not set then it is no error
@@ -187,10 +187,10 @@ WCHAR* getUnoPath()
         szLinkPath[0] = L'\0';
         lstrcat(szLinkPath, szInstallPath);
         lstrcat(szLinkPath, BASIS_LINK);
-
+                
         //get the path to the actual Basis folder
         if (cli_ure::resolveLink(szLinkPath))
-        {
+        {   
             //build the path to the ure-link file
             int sizeUrePath = lstrlen(szLinkPath) + lstrlen(URE_LINK) + 1;
             if (sizeUrePath < MAX_PATH)
@@ -208,7 +208,7 @@ WCHAR* getUnoPath()
                  szUreBin[0] = L'\0';
                 lstrcat(szUreBin, szUrePath);
                  lstrcat(szUreBin, URE_BIN);
-            }
+            }     
         }
     }
 #if OSL_DEBUG_LEVEL >=2
@@ -240,7 +240,7 @@ void extendPath(LPCWSTR szUreBinPath)
     WCHAR * sEnvPath = NULL;
     DWORD  cChars = GetEnvironmentVariable(L"PATH", sEnvPath, 0);
     if (cChars > 0)
-    {
+    {	
         sEnvPath = new WCHAR[cChars];
         cChars = GetEnvironmentVariable(L"PATH", sEnvPath, cChars);
         //If PATH is not set then it is no error
@@ -261,7 +261,7 @@ void extendPath(LPCWSTR szUreBinPath)
         lstrcat(sNewPath, sEnvPath);
     }
     BOOL bSet = SetEnvironmentVariable(L"PATH", sNewPath);
-
+    
     delete[] sEnvPath;
     delete[] sNewPath;
 }
@@ -285,14 +285,14 @@ HMODULE loadFromPath(LPCWSTR sLibName)
     lstrcat(szFullPath, sLibName);
     HMODULE handle = LoadLibraryEx(szFullPath, NULL,
         LOAD_WITH_ALTERED_SEARCH_PATH);
-
+    
     delete[] szFullPath;
     delete[] szUreBinPath;
     return handle;
 }
 
 /*Hook for delayed loading of libraries which this library is linked with.
-    This is a failure hook. That is, it is only called when the loading of
+    This is a failure hook. That is, it is only called when the loading of 
     a library failed. It will be called when loading of cppuhelper failed.
     Because we extend the PATH to the URE/bin folder while this function is
     executed (see extendPath), all other libraries are found.
@@ -343,24 +343,24 @@ namespace util
 public __sealed __gc class Bootstrap
 {
     inline Bootstrap() {}
-
+    
 public:
-
+    
     /** Bootstraps the initial component context from a native UNO installation.
-
+        
         @see cppuhelper/bootstrap.hxx:defaultBootstrap_InitialComponentContext()
     */
     static ::unoidl::com::sun::star::uno::XComponentContext *
         defaultBootstrap_InitialComponentContext();
-
+    
     /** Bootstraps the initial component context from a native UNO installation.
-
+        
         @param ini_file
                a file URL of an ini file, e.g. uno.ini/unorc. (The ini file must
                reside next to the cppuhelper library)
         @param bootstrap_parameters
                bootstrap parameters (maybe null)
-
+               
         @see cppuhelper/bootstrap.hxx:defaultBootstrap_InitialComponentContext()
     */
     static ::unoidl::com::sun::star::uno::XComponentContext *
@@ -394,11 +394,11 @@ Bootstrap::defaultBootstrap_InitialComponentContext(
             OUString value(
                 String_to_ustring( __try_cast< ::System::String * >(
                                        bootstrap_parameters->get_Value() ) ) );
-
+            
             ::rtl::Bootstrap::set( key, value );
         }
     }
-
+    
     // bootstrap native uno
     Reference< XComponentContext > xContext;
     if (0 == ini_file)
@@ -410,7 +410,7 @@ Bootstrap::defaultBootstrap_InitialComponentContext(
         xContext = ::cppu::defaultBootstrap_InitialComponentContext(
             String_to_ustring( __try_cast< ::System::String * >( ini_file ) ) );
     }
-
+    
     return __try_cast< ::unoidl::com::sun::star::uno::XComponentContext * >(
         to_cli( xContext ) );
 }
@@ -427,7 +427,7 @@ Bootstrap::defaultBootstrap_InitialComponentContext()
     Reference<XComponentContext> xContext = ::cppu::bootstrap();
     return __try_cast< ::unoidl::com::sun::star::uno::XComponentContext * >(
         to_cli( xContext ) );
-
+        
 }
 
 }
diff --git a/cli_ure/source/native/native_share.h b/cli_ure/source/native/native_share.h
index 7106f0daf820..99e656847368 100644
--- a/cli_ure/source/native/native_share.h
+++ b/cli_ure/source/native/native_share.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -70,7 +70,7 @@ inline ::System::Object * to_cli(
             ::com::sun::star::uno::Reference<
               ::com::sun::star::uno::XInterface >() );
     }
-
+    
     intptr_t intptr =
         reinterpret_cast< intptr_t >(
             mapping.mapInterface( x.get(), ::getCppuType( &x ) ) );
@@ -95,7 +95,7 @@ inline void to_uno(
             ::com::sun::star::uno::Reference<
               ::com::sun::star::uno::XInterface >() );
     }
-
+    
     ::System::Runtime::InteropServices::GCHandle handle(
         ::System::Runtime::InteropServices::GCHandle::Alloc( x ) );
     T * ret = 0;
diff --git a/cli_ure/source/native/path.cxx b/cli_ure/source/native/path.cxx
index 78c29cfa5d9c..ede11b78fa7a 100644
--- a/cli_ure/source/native/path.cxx
+++ b/cli_ure/source/native/path.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cli_ure/source/scripts/increment_version.pl b/cli_ure/source/scripts/increment_version.pl
index 9b677b314d03..d7b221ae96cc 100644
--- a/cli_ure/source/scripts/increment_version.pl
+++ b/cli_ure/source/scripts/increment_version.pl
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -36,8 +36,8 @@ sub checkName($);
 sub incrementNewVersion($);
 sub incrementOldVersion($);
 sub incrementPolicyVersion($);
-my $usage =
-"The tool increments the minor version of assemblies and the major version of ".
+my $usage = 
+"The tool increments the minor version of assemblies and the major version of ". 
 "the respective policy files. This is only done if new uno types have been added since".
 "the last product upate. This information is obtained from the file which is passed as ".
 "argument changedTypes. The names in the version file must have a particular form. ".
@@ -45,7 +45,7 @@ my $usage =
 "If no new published types habe been added then no output, argument  newVersions, is written".
 "Usage is: \n increment_version.pl oldVersions  incVersions newVersions changedTypes\n\n".
 "oldVersion: Contains name value pairs, which are used for forming the config files of ".
-"the policy assemblies, for building the assemblies. \n\n".
+"the policy assemblies, for building the assemblies. \n\n". 
 "incVersions: File containing the names of which the versions are to be incremented. ".
 "Every line may only contain one name. The names must exactly match those from the ".
 "oldVersion file.\n\n".
@@ -58,7 +58,7 @@ my $sNameForm =
 "The names must end on one of these names: NEW_VERSION, OLD_VERSION, POLICY_VERSION\n".
 "For example, valid names are: \n".
 "CLI_URETYPES_NEW_VERSION\nCLI_URETYPES_OLD_VERSION\nCLI_URETYPES_POLICY_VERSION\n";
-
+              
 if (scalar @ARGV < 4) {
    print $usage;
    exit -1;
@@ -115,7 +115,7 @@ my @incVersions = readIncVersions($ARGV[1]);
 #read in oldVersions line by line and apply the increment operation
 open OLDVERSION, "$ARGV[0]" or die "Cannot open to $ARGV[0] $!";
 
-#open file we want to write to
+#open file we want to write to 
 open NEWVERSION, "> $ARGV[2]" or die "Cannot write to $ARGV[2] $!";
 
 print NEWVERSION processLine($_, @incVersions) while(<OLDVERSION>);
@@ -152,9 +152,9 @@ sub processLine($$)
     my $value = substr($line, $i + 1);
     $value = trim($value);
 
-    #Check if the entry shall be incremented, this information is in the second
+    #Check if the entry shall be incremented, this information is in the second 
     #argument
-    my $found;
+    my $found;		     
     for(@incVersions) {
     if ($_ eq $name) {
         $found = 1;
@@ -164,7 +164,7 @@ sub processLine($$)
     if ( ! defined($found)) {
      return $line;
     }
-
+ 
     #Check if the name represents a version we need to change
     if ($name =~ /NEW_VERSION$/)
     {
@@ -239,7 +239,7 @@ sub readIncVersions($)
     my $arg = $_[0];
     my @names;
 
-    while(<INC>)
+    while(<INC>) 
     {
     chomp;
     #Skip empty lines
diff --git a/cli_ure/source/scripts/subst_template.pl b/cli_ure/source/scripts/subst_template.pl
index 7358103f78c1..cfa463d35f49 100644
--- a/cli_ure/source/scripts/subst_template.pl
+++ b/cli_ure/source/scripts/subst_template.pl
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -32,9 +32,9 @@ use diagnostics;
 sub trim;
 sub readRedirectionValues($);
 
-my $usage =
+my $usage = 
    "Usage is: \n subst_template.pl configTemplate redirections policyConfig
-
+   
    configTemplate: The config file which is used for the policy assembly. It
    contains place holders for the binding redirection.
 
@@ -44,7 +44,7 @@ my $usage =
    policyConfig: Name of the file in which we want to write the config file.
 ";
 
-
+              
 if (scalar @ARGV < 3) {
    print $usage;
    exit -1;
@@ -89,20 +89,20 @@ sub readRedirectionValues($)
         if (length($trimmed = trim($_)) == 0) {
             next;
         }
-
+        
     #Skip comment symbol: #
     if ($trimmed =~ /^#/) {
         next;
     }
 
         my @lineParts = split /=/,$_;
-
+        
         #Check if we have valid name value pairs.
         if (scalar @lineParts != 2) {
             print "Error: Values in $ARGV[1] are not correct (Entries must have the form name=value). Invalid line: \n$_\n";
             exit -1;
         }
-
+        
         #Trim the strings and check if they still contain characters
         my $name = trim($lineParts[0]);
         my $value = trim($lineParts[1]);
@@ -110,7 +110,7 @@ sub readRedirectionValues($)
             print "Error: Values in $ARGV[1] are not correct. Invalid line: \n$_\n";
             exit -1;
         }
-
+        
         #Check if we have duplicate key names
         for (keys %redirectionValues) {
             if ( $name eq $_) {
@@ -118,7 +118,7 @@ sub readRedirectionValues($)
                 exit -1;
             }
         }
-
+        
         $redirectionValues{$name} = $value;
     }
     return %redirectionValues;
diff --git a/cli_ure/source/uno_bridge/cli_base.h b/cli_ure/source/uno_bridge/cli_base.h
index 8d70d228dc1e..99b50bb1cf92 100644
--- a/cli_ure/source/uno_bridge/cli_base.h
+++ b/cli_ure/source/uno_bridge/cli_base.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -118,7 +118,7 @@ __gc struct Constants
 struct BridgeRuntimeError
 {
     ::rtl::OUString m_message;
-
+    
     inline BridgeRuntimeError( ::rtl::OUString const & message )
         : m_message( message )
         {}
@@ -135,7 +135,7 @@ struct rtl_mem
         { return mem; }
     inline static void operator delete ( void *, void * )
         {}
-
+    
     static inline ::std::auto_ptr< rtl_mem > allocate( ::std::size_t bytes );
 };
 //--------------------------------------------------------------------------------------------------
@@ -151,15 +151,15 @@ inline ::std::auto_ptr< rtl_mem > rtl_mem::allocate( ::std::size_t bytes )
 class TypeDescr
 {
     typelib_TypeDescription * m_td;
-
+    
     TypeDescr( TypeDescr & ); // not impl
     void operator = ( TypeDescr ); // not impl
-
+    
 public:
     inline explicit TypeDescr( typelib_TypeDescriptionReference * td_ref );
     inline ~TypeDescr() SAL_THROW( () )
         { TYPELIB_DANGER_RELEASE( m_td ); }
-
+    
     inline typelib_TypeDescription * get() const
         { return m_td; }
 };
diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx
index 1adef3d91bb6..040366d19100 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.cxx
+++ b/cli_ure/source/uno_bridge/cli_bridge.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -225,7 +225,7 @@ void Bridge::release() const  SAL_THROW( () )
     {
         uno_revokeMapping(
             m_registered_cli2uno
-            ?  const_cast<Mapping*>(&m_cli2uno)
+            ?  const_cast<Mapping*>(&m_cli2uno) 
             :  const_cast<Mapping*>(&m_uno2cli)  );
    }
 }
@@ -241,7 +241,7 @@ Bridge::Bridge(
     OSL_ASSERT( 0 != m_uno_cli_env && 0 != m_uno_env );
     (*((uno_Environment *)m_uno_env)->acquire)( (uno_Environment *)m_uno_env );
     (*m_uno_cli_env->acquire)( m_uno_cli_env );
-
+    
     // cli2uno
     m_cli2uno.acquire = Mapping_acquire;
     m_cli2uno.release = Mapping_release;
@@ -252,7 +252,7 @@ Bridge::Bridge(
     m_uno2cli.release = Mapping_release;
     m_uno2cli.mapInterface = Mapping_uno2cli;
     m_uno2cli.m_bridge = this;
-
+    
 }
 
 //__________________________________________________________________________________________________
@@ -275,7 +275,7 @@ namespace cli_uno
 //--------------------------------------------------------------------------------------------------
 void SAL_CALL cli_env_disposing( uno_Environment * uno_cli_env )
     SAL_THROW_EXTERN_C()
-{
+{    
     uno_cli_env->pContext = 0;
 }
 
@@ -295,7 +295,7 @@ void SAL_CALL uno_initEnvironment( uno_Environment * uno_cli_env )
     System::Diagnostics::Trace::get_Listeners()->
             Add( new System::Diagnostics::TextWriterTraceListener(System::Console::get_Out()));
 #endif
-    OSL_ASSERT( 0 == uno_cli_env->pContext );
+    OSL_ASSERT( 0 == uno_cli_env->pContext );  
 
     // We let the Cli_environment leak, since there is no good point where we could destruct it.
     //dispose is not used because we would have then also synchronize the calls to proxies. If the
@@ -316,15 +316,15 @@ void SAL_CALL uno_ext_getMapping(
         (*(*ppMapping)->release)( *ppMapping );
         *ppMapping = 0;
     }
-
+    
 
     OUString const & from_env_typename = *reinterpret_cast< OUString const * >(
         &pFrom->pTypeName );
     OUString const & to_env_typename = *reinterpret_cast< OUString const * >(
         &pTo->pTypeName );
-
+        
     uno_Mapping * mapping = 0;
-
+        
     try
     {
         if (from_env_typename.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_CLI) ) &&
@@ -355,7 +355,7 @@ void SAL_CALL uno_ext_getMapping(
         (void) err; // unused
 #endif
     }
-    *ppMapping = mapping;
+    *ppMapping = mapping;    
 }
 
 
diff --git a/cli_ure/source/uno_bridge/cli_bridge.h b/cli_ure/source/uno_bridge/cli_bridge.h
index 34d6ed294d4d..895945c44ef6 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.h
+++ b/cli_ure/source/uno_bridge/cli_bridge.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -69,17 +69,17 @@ struct Bridge
     mutable oslInterlockedCount m_ref;
     uno_ExtEnvironment *        m_uno_env;
     uno_Environment *           m_uno_cli_env;
-
+                                               
     Mapping                     m_cli2uno;
     Mapping                     m_uno2cli;
     bool                        m_registered_cli2uno;
 
     ~Bridge() SAL_THROW( () );
     Bridge( uno_Environment * java_env, uno_ExtEnvironment * uno_env, bool registered_java2uno );
-
+    
     void acquire() const;
     void release() const;
-
+    
     void  map_to_uno(
         void * uno_data, System::Object* cli_data,
         typelib_TypeDescriptionReference * type,
@@ -93,9 +93,9 @@ struct Bridge
         System::Object* *cli_data, void const * uno_data,
         typelib_TypeDescriptionReference * type, System::Type* info /* maybe 0 */,
         bool bDontCreateObj) const;
-
+    
     System::Object* map_uno2cli(uno_Interface * pUnoI, typelib_InterfaceTypeDescription* pTD) const;
-
+    
     System::Object* Bridge::call_uno(uno_Interface * pUnoI,
                       typelib_TypeDescription* member_td,
                       typelib_TypeDescriptionReference * return_type,
@@ -109,7 +109,7 @@ struct Bridge
         typelib_TypeDescriptionReference * return_type,
         typelib_MethodParameter * params, int nParams,
         void * uno_ret, void * uno_args [], uno_Any ** uno_exc ) const;
-
+    
     uno_Interface * map_cli2uno(
         System::Object* cliI, typelib_TypeDescription* pTD) const;
 
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx
index e3b07fd3d8df..ec82d58d483d 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -90,7 +90,7 @@ System::Object* Bridge::map_uno2cli(uno_Interface * pUnoI, typelib_InterfaceType
     //see if the interface was already mapped
     System::Type* ifaceType= mapUnoType(reinterpret_cast<typelib_TypeDescription*>(pTD));
     System::String* sOid= mapUnoString(oid.pData);
-
+    
     System::Threading::Monitor::Enter( CliEnvHolder::g_cli_env );
     try
     {
@@ -105,7 +105,7 @@ System::Object* Bridge::map_uno2cli(uno_Interface * pUnoI, typelib_InterfaceType
             {
                 UnoInterfaceProxy* p = static_cast<UnoInterfaceProxy*>(
                     srr::RemotingServices::GetRealProxy(retVal));
-                p->addUnoInterface(pUnoI, pTD);
+                p->addUnoInterface(pUnoI, pTD);            
             }
         }
         else
@@ -118,7 +118,7 @@ System::Object* Bridge::map_uno2cli(uno_Interface * pUnoI, typelib_InterfaceType
     {
         System::Threading::Monitor::Exit( CliEnvHolder::g_cli_env );
     }
-
+    
     return retVal;
 }
 
@@ -127,7 +127,7 @@ uno_Interface* Bridge::map_cli2uno(System::Object* cliObj, typelib_TypeDescripti
     uno_Interface* retIface = NULL;
     // get oid from dot net environment
     System::String* ds_oid = CliEnvHolder::g_cli_env->getObjectIdentifier( cliObj);
-    OUString ousOid = mapCliString(ds_oid);
+    OUString ousOid = mapCliString(ds_oid);  
     // look if interface is already mapped
     m_uno_env->getRegisteredInterface(m_uno_env, (void**) &retIface, ousOid.pData,
                                       (typelib_InterfaceTypeDescription*) pTD);
@@ -164,7 +164,7 @@ System::Type* loadCliType(System::String * unoName)
         //If unoName denotes a polymorphic type, e.g com.sun.star.beans.Defaulted<System.Char>
         //then we remove the type list, otherwise the type could not be loaded.
         bool bIsPolymorphic = false;
-
+        
         System::String * loadName = unoName;
         int index = unoName->IndexOf('<');
         if (index != -1)
@@ -302,7 +302,7 @@ System::Type* mapUnoType(typelib_TypeDescriptionReference const * pTD)
         case typelib_TypeClass_TYPE:
             retVal= System::Type::GetType(const_cast<System::String*>(Constants::sArType));
             break;
-        case typelib_TypeClass_ANY:
+        case typelib_TypeClass_ANY:    
         case typelib_TypeClass_ENUM:
         case typelib_TypeClass_EXCEPTION:
         case typelib_TypeClass_STRUCT:
@@ -442,7 +442,7 @@ typelib_TypeDescriptionReference* mapCliType(System::Type* cliType)
                 typelib_TypeClass_ANY );
             typelib_typedescriptionreference_acquire( retVal );
         }
-        //struct, interfaces, sequences
+        //struct, interfaces, sequences 
         else
         {
             OUString usTypeName;
@@ -473,7 +473,7 @@ typelib_TypeDescriptionReference* mapCliType(System::Type* cliType)
     return retVal;
 }
 
-/**
+/** 
     Otherwise a leading "unoidl." is removed.
  */
 System::String* mapUnoTypeName(rtl_uString const * typeName)
@@ -518,7 +518,7 @@ System::String* mapUnoTypeName(rtl_uString const * typeName)
     else if (sUnoName->Equals(const_cast<System::String*>(Constants::usDouble)))
         buf->Append(const_cast<System::String*>(Constants::sDouble));
     else if (sUnoName->Equals(const_cast<System::String*>(Constants::usString)))
-        buf->Append(const_cast<System::String*>(Constants::sString));
+        buf->Append(const_cast<System::String*>(Constants::sString));    
     else if (sUnoName->Equals(const_cast<System::String*>(Constants::usVoid)))
         buf->Append(const_cast<System::String*>(Constants::sVoid));
     else if (sUnoName->Equals(const_cast<System::String*>(Constants::usType)))
@@ -526,7 +526,7 @@ System::String* mapUnoTypeName(rtl_uString const * typeName)
     else if (sUnoName->Equals(const_cast<System::String*>(Constants::usXInterface)))
         buf->Append(const_cast<System::String*>(Constants::sObject));
     else if (sUnoName->Equals(const_cast<System::String*>(Constants::usAny)))
-    {
+    {        
         buf->Append(const_cast<System::String*>(Constants::sAny));
     }
     else
@@ -575,7 +575,7 @@ System::String* mapPolymorphicName(System::String* unoName, bool bCliToUno)
     int index = unoName->IndexOf('<');
     if (index == -1)
         return unoName;
-
+    
     System::Text::StringBuilder * builder = new System::Text::StringBuilder(256);
     builder->Append(unoName->Substring(0, index +1 ));
 
@@ -674,7 +674,7 @@ OUString mapCliTypeName(System::String* typeName)
         }
         cur--;
     }
-
+    
     if (bRightBracket || cur < 0)
         throw BridgeRuntimeError(
             OUSTR("Typename is wrong. ") +
@@ -711,7 +711,7 @@ OUString mapCliTypeName(System::String* typeName)
     else if (typeName->Equals(const_cast<System::String*>(Constants::sDouble)))
         buf->Append(const_cast<System::String*>(Constants::usDouble));
     else if (typeName->Equals(const_cast<System::String*>(Constants::sString)))
-        buf->Append(const_cast<System::String*>(Constants::usString));
+        buf->Append(const_cast<System::String*>(Constants::usString));    
     else if (typeName->Equals(const_cast<System::String*>(Constants::sVoid)))
         buf->Append(const_cast<System::String*>(Constants::usVoid));
     else if (typeName->Equals(const_cast<System::String*>(Constants::sType)))
@@ -737,7 +737,7 @@ inline System::String* mapUnoString( rtl_uString const * data)
     return new System::String((__wchar_t*) data->buffer, 0, data->length);
 }
 
-OUString mapCliString(System::String const * data)
+OUString mapCliString(System::String const * data)    
 {
 
     if (data != NULL)
@@ -756,7 +756,7 @@ OUString mapCliString(System::String const * data)
 // is a sal_Int16. This could be necessary if a scripting language (typeless) is used
 // @param assign the uno_data has to be destructed (in/out args)
 void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
-                        typelib_TypeDescriptionReference * type,
+                        typelib_TypeDescriptionReference * type, 
                         bool assign) const
 {
     try{
@@ -873,7 +873,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
             }
             uno::Any aAny= *__try_cast<uno::Any*>(cli_data);
             css::uno::Type  value_td( mapCliType(aAny.Type), SAL_NO_ACQUIRE);
-
+        
             if (assign)
                 uno_any_destruct( pAny, 0 );
 
@@ -907,7 +907,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
                 case typelib_TypeClass_LONG:
                     pAny->pData = &pAny->pReserved;
                     *(sal_Int32*) &pAny->pReserved =  *__try_cast<System::Int32*>(aAny.Value);
-                    break;
+                    break;                
                 case typelib_TypeClass_UNSIGNED_LONG:
                     pAny->pData = &pAny->pReserved;
                     *(sal_uInt32*) &pAny->pReserved =  *__try_cast<System::UInt32*>(aAny.Value);
@@ -924,7 +924,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
                         *(sal_Int64 *) mem.get()=  *__try_cast<System::Int64*>(aAny.Value);
                         pAny->pData = mem.release();
                     }
-                    break;
+                    break;                
                 case typelib_TypeClass_UNSIGNED_HYPER:
                     if (sizeof (sal_uInt64) <= sizeof (void *))
                     {
@@ -1036,10 +1036,10 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
             catch (...)
             {
                 if (assign)
-                    uno_any_construct( pAny, 0, 0, 0 ); // restore some valid any
+                    uno_any_construct( pAny, 0, 0, 0 ); // restore some valid any                
                 throw;
             }
-
+            
             pAny->pType = value_td.getTypeLibType();
             typelib_typedescriptionreference_acquire(pAny->pType);
             break;
@@ -1054,10 +1054,10 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
         case typelib_TypeClass_STRUCT:
         case typelib_TypeClass_EXCEPTION:
         {
-            css::uno::TypeDescription td(type);
+            css::uno::TypeDescription td(type);        
             typelib_CompoundTypeDescription * comp_td =
                 (typelib_CompoundTypeDescription*) td.get();
-
+            
             typelib_StructTypeDescription * struct_td = NULL;
             if (type->eTypeClass == typelib_TypeClass_STRUCT)
                 struct_td = (typelib_StructTypeDescription*) td.get();
@@ -1065,7 +1065,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
             if ( ! ((typelib_TypeDescription*) comp_td)->bComplete)
                 ::typelib_typedescription_complete(
                     (typelib_TypeDescription**) & comp_td );
-
+            
             sal_Int32 nMembers = comp_td->nMembers;
             boolean bException= false;
             System::Type* cliType = NULL;
@@ -1243,8 +1243,8 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
                 bException= true;
                 throw;
             }
-            __finally
-            {
+            __finally            
+            {    
                 if (bException && !assign) // if assign then caller cleans up
                 {
                     // cleanup the members which we have converted so far
@@ -1258,7 +1258,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
                         uno_destructData(
                             uno_data, (typelib_TypeDescription *)comp_td->pBaseTypeDescription, 0 );
                     }
-                }
+                }            
             }
             break;
         }
@@ -1267,15 +1267,15 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
             TypeDescr td( type );
             typelib_TypeDescriptionReference * element_type =
                 ((typelib_IndirectTypeDescription *)td.get())->pType;
-
+        
             auto_ptr< rtl_mem > seq;
-
+            
             System::Array* ar = NULL;
             if (cli_data != NULL)
             {
                 ar = __try_cast<System::Array*>(cli_data);
                 sal_Int32 nElements = ar->GetLength(0);
-
+            
                 try
                 {
                     switch (element_type->eTypeClass)
@@ -1344,7 +1344,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
                         System::String* arStr[]= __try_cast<System::String*[]>(cli_data);
                         for (int i= 0; i < nElements; i++)
                         {
-                            wchar_t const __pin * pdata= PtrToStringChars(arStr[i]);
+                            wchar_t const __pin * pdata= PtrToStringChars(arStr[i]);					
                             rtl_uString** pStr=  & ((rtl_uString**) &
                                                     ((uno_Sequence*) seq.get())->elements)[i];
                             *pStr= NULL;
@@ -1360,7 +1360,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
                             ((sal_Int32*) &((uno_Sequence*) seq.get())->elements)[i]=
                                 System::Convert::ToInt32(ar->GetValue(i));
                         }
-                        break;
+                        break;            
                     case typelib_TypeClass_TYPE:
                     case typelib_TypeClass_ANY:
                     case typelib_TypeClass_STRUCT:
@@ -1370,7 +1370,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
                     {
                         TypeDescr element_td( element_type );
                         seq = seq_allocate( nElements, element_td.get()->nSize );
-
+                        
                         for (sal_Int32 nPos = 0; nPos < nElements; ++nPos)
                         {
                             try
@@ -1405,7 +1405,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
                         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] unsupported sequence element type: ") );
                         buf.append( *reinterpret_cast< OUString const * >( &element_type->pTypeName ) );
                         throw BridgeRuntimeError( buf.makeStringAndClear() );
-                    }
+                    }            
                     }
                 }
                 catch (BridgeRuntimeError& e)
@@ -1434,7 +1434,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
                 }
                 __finally
                     {
-                        if (assign)
+                        if (assign) 
                             uno_destructData( uno_data, td.get(), 0 );
                     }
             }
@@ -1452,7 +1452,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
                 uno_Interface * p = *(uno_Interface **)uno_data;
                 if (0 != p)
                     (*p->release)( p );
-            }
+            }        
             if (0 == cli_data) // null-ref
             {
                 *(uno_Interface **)uno_data = 0;
@@ -1464,7 +1464,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
                 *(uno_Interface **)uno_data = pUnoI;
             }
             break;
-        }
+        }    
         default:
         {
             //ToDo check
@@ -1476,7 +1476,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
         }
         }
     }
-    // BridgeRuntimeError are allowed to be thrown
+    // BridgeRuntimeError are allowed to be thrown 
     catch (System::InvalidCastException* )
     {
         //ToDo check
@@ -1492,7 +1492,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
         buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(
                              "[map_to_uno()] Illegal null reference passed!\n"));
         buf.append(mapCliString(e->get_StackTrace()));
-        throw BridgeRuntimeError( buf.makeStringAndClear() );
+        throw BridgeRuntimeError( buf.makeStringAndClear() );                
     }
     catch (BridgeRuntimeError& )
     {
@@ -1506,7 +1506,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object* cli_data,
 
 }
 
-/**
+/** 
    @param info
        The expected target type. Currently info is provdided when this method is called
        to convert the in/out and out parameters of a call from cli to uno. Then info
@@ -1580,7 +1580,7 @@ void Bridge::map_to_cli(
             map_to_cli(
                 &objCli, pAny->pData, pAny->pType, 0,
                 false);
-
+            
             uno::Any anyVal(mapUnoType(pAny->pType), objCli);
             *cli_data= __box(anyVal);
         }
@@ -1613,13 +1613,13 @@ void Bridge::map_to_cli(
                 ::typelib_typedescription_complete(
                     (typelib_TypeDescription**) & comp_td );
 
-
+        
         //create the type
         System::Type* cliType= loadCliType(td.get()->pTypeName);
         //detect if we recursivly convert inherited structures
         //If this point is reached because of a recursive call during convering a
         //struct then we must not create a new object rather we use the one in
-        // cli_data argument.
+        // cli_data argument. 
         System::Object* cliObj;
         if (bDontCreateObj)
             cliObj = *cli_data; // recursive call
@@ -1643,7 +1643,7 @@ void Bridge::map_to_cli(
 #if OSL_DEBUG_LEVEL >= 2
                     System::String* sMember;
                     sMember = mapUnoString(pCTD->ppMemberNames[i]);
-#endif
+#endif                    
                     if (usMessageMember.equals(pCTD->ppMemberNames[i]))
                     {
                         nPos = i;
@@ -1686,7 +1686,7 @@ void Bridge::map_to_cli(
                 cliObj = System::Activator::CreateInstance(cliType);
         }
         sal_Int32 * pMemberOffsets = comp_td->pMemberOffsets;
-
+        
         if (comp_td->pBaseTypeDescription)
         {
             //convert inherited struct
@@ -1708,7 +1708,7 @@ void Bridge::map_to_cli(
             if ( ! aField && usUnoException.equals(td.get()->pTypeName))
             {
                 continue;
-            }
+            }       
             void const * p = (char const *)uno_data + pMemberOffsets[ nPos ];
             switch (member_type->eTypeClass)
             {
@@ -1765,11 +1765,11 @@ void Bridge::map_to_cli(
         uno_Sequence const * seq = 0;
         seq = *(uno_Sequence * const *)uno_data;
         nElements = seq->nElements;
-
+        
         TypeDescr td( type );
         typelib_TypeDescriptionReference * element_type =
             ((typelib_IndirectTypeDescription *)td.get())->pType;
-
+        
         switch (element_type->eTypeClass)
         {
         case typelib_TypeClass_CHAR:
@@ -1924,7 +1924,7 @@ void Bridge::map_to_cli(
                 char * p = (char *) &seq->elements;
                 sal_Int32 nSize = element_td.get()->nSize;
                 for ( sal_Int32 nPos = 0; nPos < nElements; ++nPos )
-                {
+                { 
                     System::Object* val;
                     map_to_cli(
                         &val, p + (nSize * nPos), element_type, 0, false);
@@ -1963,11 +1963,11 @@ void Bridge::map_to_cli(
             char * p = (char *)seq->elements;
             sal_Int32 nSize = element_td.get()->nSize;
             for ( sal_Int32 nPos = 0; nPos < nElements; ++nPos )
-            {
+            { 
                 System::Object* val;
                 map_to_cli(
                     &val, p + (nSize * nPos), element_type, NULL, false);
-
+                   
                 ar->SetValue(val, nPos);
             }
             *cli_data= ar;
@@ -2005,7 +2005,7 @@ void Bridge::map_to_cli(
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_cli():") );
         buf.append( *reinterpret_cast< OUString const * >( &type->pTypeName ) );
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] unsupported type!") );
-        throw BridgeRuntimeError( buf.makeStringAndClear() );
+        throw BridgeRuntimeError( buf.makeStringAndClear() );        
     }
     }
 }
diff --git a/cli_ure/source/uno_bridge/cli_environment.cxx b/cli_ure/source/uno_bridge/cli_environment.cxx
index 213cfc9ae5dd..11f53f6aab8a 100644
--- a/cli_ure/source/uno_bridge/cli_environment.cxx
+++ b/cli_ure/source/uno_bridge/cli_environment.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@ inline Cli_environment::Cli_environment()
 {
 #if OSL_DEBUG_LEVEL >= 2
     _numRegisteredObjects = 0;
-#endif
+#endif    
 }
 
 Cli_environment::~Cli_environment()
@@ -74,7 +74,7 @@ System::Object* Cli_environment::registerInterface(
     //obj must be a transparent proxy
     OSL_ASSERT(RemotingServices::IsTransparentProxy(obj));
     _numRegisteredObjects ++;
-#endif
+#endif    
     OSL_ASSERT( ! m_objects->ContainsKey(oid));
     m_objects->Add(oid, new WeakReference(obj));
     return obj;
@@ -95,11 +95,11 @@ System::Object* Cli_environment::registerInterface      (
 }
 
 void Cli_environment::revokeInterface(System::String* oid, System::Type* type)
-{
+{   
     System::String* key = type != NULL ? createKey(oid, type) : oid;
 #if OSL_DEBUG_LEVEL >= 1
     _numRegisteredObjects --;
-#endif
+#endif    
 #if OSL_DEBUG_LEVEL >= 2
     int i = 1;
     if (m_objects->ContainsKey(key) == false)
@@ -153,7 +153,7 @@ System::String* Cli_environment::getObjectIdentifier(System::Object* obj)
         if (proxyImpl)
             oId= proxyImpl->getOid();
     }
-
+    
     if (oId == 0)
     {
         StringBuilder * buf= new StringBuilder(256);
diff --git a/cli_ure/source/uno_bridge/cli_environment.h b/cli_ure/source/uno_bridge/cli_environment.h
index a10692390c7c..d8345e940535 100644
--- a/cli_ure/source/uno_bridge/cli_environment.h
+++ b/cli_ure/source/uno_bridge/cli_environment.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,10 +48,10 @@ public __gc class Cli_environment
 
 #if OSL_DEBUG_LEVEL >= 1
     int _numRegisteredObjects;
-#endif
+#endif     
 
 public:
-
+    
     static Cli_environment()
     {
         m_objects = Hashtable::Synchronized(new Hashtable());
@@ -66,7 +66,7 @@ public:
     inline Cli_environment();
 
     ~Cli_environment();
-
+    
     /**
        Registers an UNO object as being mapped by this bridge. The resulting
        cli object is represents all interfaces of the UNO object. Therefore the
@@ -85,7 +85,7 @@ public:
        destructors.
      */
     inline void revokeInterface(System::String* oid);
-
+    
     void revokeInterface(System::String* oid, System::Type* type);
     /**
      * Retrieves an interface identified by its object id and type from this
diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx
index 4feb21a29fbe..313aa39a4dfd 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.cxx
+++ b/cli_ure/source/uno_bridge/cli_proxy.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -135,7 +135,7 @@ UnoInterfaceProxy::UnoInterfaceProxy(
 #if OSL_DEBUG_LEVEL >= 2
     _numInterfaces = 0;
     _sInterfaces = NULL;
-#endif
+#endif    
     addUnoInterface(pUnoI, pTD);
 
 }
@@ -195,7 +195,7 @@ void UnoInterfaceProxy::addUnoInterface(uno_Interface* pUnoI,
                reinterpret_cast<typelib_TypeDescription*>(pTd)))
             {
                 return;
-            }
+            }           
         }
         OUString oid(mapCliString(m_oid));
         (*m_bridge->m_uno_env->registerInterface)(
@@ -236,15 +236,15 @@ bool UnoInterfaceProxy::CanCastTo(System::Type* fromType,
 {
     if (fromType == __typeof(System::Object)) // trivial case
         return true;
-
+    
     System::Threading::Monitor::Enter(this);
     try
     {
         if (0 != findInfo( fromType )) // proxy supports demanded interface
             return true;
-
+        
         //query an uno interface for the required type
-
+        
         // we use the first interface in the list (m_listIfaces) to make
         // the queryInterface call
         UnoInterfaceInfo* info =
@@ -253,11 +253,11 @@ bool UnoInterfaceProxy::CanCastTo(System::Type* fromType,
             reinterpret_cast<typelib_InterfaceTypeDescription*>(
                 info->m_typeDesc)->ppAllMembers[0]);
         System::Object *args[] = new System::Object*[1];
-
+        
         args[0] = fromType;
         __box uno::Any  * pAny;
         System::Object* pException = NULL;
-
+        
         pAny= static_cast<__box uno::Any *>(
             m_bridge->call_uno(
                 info->m_unoI,
@@ -268,14 +268,14 @@ bool UnoInterfaceProxy::CanCastTo(System::Type* fromType,
                 ((typelib_InterfaceMethodTypeDescription*)
                  membertd.get())->pParams,
                 args, NULL, &pException) );
-
+        
         // handle regular exception from target
         OSL_ENSURE(
             0 == pException,
             OUStringToOString(
                 mapCliString( pException->ToString()),
                 RTL_TEXTENCODING_UTF8 ).getStr() );
-
+        
         if (pAny->Type != __typeof (void)) // has value?
         {
             if (0 != findInfo( fromType ))
@@ -283,7 +283,7 @@ bool UnoInterfaceProxy::CanCastTo(System::Type* fromType,
                 // proxy now supports demanded interface
                 return true;
             }
-
+            
             // via aggregation: it is possible that queryInterface() returns
             //                  and interface with a different oid.
             //                  That way, this type is supported for the CLI
@@ -326,7 +326,7 @@ bool UnoInterfaceProxy::CanCastTo(System::Type* fromType,
         OSL_ENSURE(
             0, "An unexpected native C++ exception occurred in "
             "UnoInterfaceProxy::CanCastTo()" );
-    }
+    }    
     __finally
     {
         System::Threading::Monitor::Exit(this);
@@ -335,7 +335,7 @@ bool UnoInterfaceProxy::CanCastTo(System::Type* fromType,
 }
 
 srrm::IMessage* UnoInterfaceProxy::invokeObject(
-    sc::IDictionary* props,
+    sc::IDictionary* props,                    
     srrm::LogicalCallContext* context,
     srrm::IMethodCallMessage* mcm)
 {
@@ -382,12 +382,12 @@ srrm::IMessage* UnoInterfaceProxy::invokeObject(
     {
         // Object.ToString
         st::StringBuilder* sb = new st::StringBuilder(256);
-//              sb->AppendFormat(S"Uno object proxy. Implemented interface: {0}"
-//                  S". OID: {1}", m_type->ToString(), m_oid);
+// 				sb->AppendFormat(S"Uno object proxy. Implemented interface: {0}"
+// 					S". OID: {1}", m_type->ToString(), m_oid);
         sb->AppendFormat(S"Uno object proxy. OID: {0}", m_oid);
         retMethod = sb->ToString();
-    }
-    else
+    }                     
+    else 
     {
         //Either Object has new functions or a protected method was called
         //which should not be possible
@@ -429,22 +429,22 @@ srrm::IMessage* UnoInterfaceProxy::Invoke(srrm::IMessage* callmsg)
                 props->get_Item(m_CallContextString));
         srrm::IMethodCallMessage* mcm=
             static_cast<srrm::IMethodCallMessage*>(callmsg);
-
+        
         //Find out which UNO interface is being called
         System::String* sTypeName = static_cast<System::String*>(
             props->get_Item(m_typeNameString));
         sTypeName = sTypeName->Substring(0, sTypeName->IndexOf(','));
-
+        
         // Special Handling for System.Object methods
         if(sTypeName->IndexOf(m_system_Object_String) != -1)
         {
             return invokeObject(props, context, mcm);
         }
-
+        
         System::Type* typeBeingCalled = loadCliType(sTypeName);
         UnoInterfaceInfo* info = findInfo( typeBeingCalled );
         OSL_ASSERT( 0 != info );
-
+        
         // ToDo do without string conversion, a OUString is not needed here
         // get the type description of the call
         OUString usMethodName(mapCliString(static_cast<System::String*>(
@@ -455,7 +455,7 @@ srrm::IMessage* UnoInterfaceProxy::Invoke(srrm::IMessage* callmsg)
         for ( sal_Int32 nPos = numberMembers; nPos--; )
         {
             typelib_TypeDescriptionReference * member_type = ppAllMembers[nPos];
-
+            
             // check usMethodName against fully qualified usTypeName
             // of member_type; usTypeName is of the form
             //  <name> "::" <usMethodName> *(":@" <idx> "," <idx> ":" <name>)
@@ -542,7 +542,7 @@ srrm::IMessage* UnoInterfaceProxy::Invoke(srrm::IMessage* callmsg)
                             param.pTypeRef = attribute_td->pAttributeTypeRef;
                             param.bIn = sal_True;
                             param.bOut = sal_False;
-
+                            
                             System::Object* args[] =
                                 static_cast<System::Object*[]>(
                                     props->get_Item(m_ArgsString));
@@ -606,14 +606,14 @@ srrm::IMessage* UnoInterfaceProxy::Invoke(srrm::IMessage* callmsg)
         srrm::IMethodCallMessage* mcm =
             static_cast<srrm::IMethodCallMessage*>(callmsg);
         return new srrm::ReturnMessage(new ucss::uno::RuntimeException(
-                                       msg, NULL), mcm);
+                                       msg, NULL), mcm);        
     }
     return NULL;
 }
 /** If the argument args is NULL then this function is called for an attribute
     method (either setXXX or getXXX).
     For attributes the argument mtd is also NULL.
-*/
+*/    
 srrm::IMessage* UnoInterfaceProxy::constructReturnMessage(
     System::Object* cliReturn,
     System::Object* args[],
@@ -637,7 +637,7 @@ srrm::IMessage* UnoInterfaceProxy::constructReturnMessage(
         {
             // Method
             //build the array of out parameters, allocate max length
-            System::Object* arOut[]= new System::Object*[mtd->nParams];
+            System::Object* arOut[]= new System::Object*[mtd->nParams]; 
             int nOut = 0;
             for (int i= 0; i < mtd->nParams; i++)
             {
@@ -685,7 +685,7 @@ CliProxy::CliProxy(Bridge const* bridge, System::Object* cliI,
     sd::Trace::WriteLine(System::String::Format(
       new System::String(S"cli uno bridge: Creating proxy for cli object, "
                          S"id:\n\t{0}\n\t{1}"), m_oid, m_type));
-#endif
+#endif    
 
 }
 
@@ -696,7 +696,7 @@ void CliProxy::makeMethodInfos()
     System::Type* type;
     cliI = m_cliI;
     type = m_type;
-#endif
+#endif    
 
     if (m_type->get_IsInterface() == false)
         return;
@@ -732,7 +732,7 @@ void CliProxy::makeMethodInfos()
     arMethodInfosDbg = m_arMethodInfos;
     arInterfaceMethodInfosDbg = m_arInterfaceMethodInfos;
     arInterfaceMethodCountDbg = m_arInterfaceMethodCount;
-#endif
+#endif    
 
 
     //fill m_arMethodInfos with the mappings
@@ -741,7 +741,7 @@ void CliProxy::makeMethodInfos()
     // but it is Type*[] instead. Bug in the framework?
     System::Type* objType = m_cliI->GetType();
     try
-    {
+    {        
         int index = 0;
         // now get the methods from the inherited interface
         //arInheritedIfaces[0] is the direct base interface
@@ -802,7 +802,7 @@ sr::MethodInfo* CliProxy::getMethodInfo(int nUnoFunctionPos,
     arInterfaceMethodInfosDbg = m_arInterfaceMethodInfos;
     arInterfaceMethodCountDbg = m_arInterfaceMethodCount;
     arUnoPosToCliPosDbg = m_arUnoPosToCliPos;
-#endif
+#endif    
     //deduct 3 for XInterface methods
     nUnoFunctionPos -= 3;
     System::Threading::Monitor::Enter(m_arUnoPosToCliPos);
@@ -870,7 +870,7 @@ sr::MethodInfo* CliProxy::getMethodInfo(int nUnoFunctionPos,
     {
         System::Threading::Monitor::Exit(m_arUnoPosToCliPos);
     }
-
+    
     return ret;
 }
 
@@ -882,7 +882,7 @@ CliProxy::~CliProxy()
                   S"cli uno bridge: Destroying proxy for cli object, "
                   S"id:\n\t{0}\n\t{1}\n"),
                   m_oid, m_type));
-#endif
+#endif    
     CliEnvHolder::g_cli_env->revokeInterface(m_oid, mapUnoType(m_unoType.get()));
     m_bridge->release();
 }
@@ -911,7 +911,7 @@ uno_Interface* CliProxy::create(Bridge const * bridge,
 
 
 void SAL_CALL CliProxy::uno_DispatchMethod(
-        struct _uno_Interface *,
+        struct _uno_Interface *, 
         const struct _typelib_TypeDescription *,
         void *,
         void **,
@@ -991,12 +991,12 @@ void SAL_CALL cli_proxy_dispatch(
     try
     {
         Bridge const* bridge = proxy->m_bridge;
-
+        
         switch (member_td->eTypeClass)
         {
         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
         {
-
+            
             sal_Int32 member_pos = ((typelib_InterfaceMemberTypeDescription *)
                                     member_td)->nPosition;
             typelib_InterfaceTypeDescription * iface_td =
@@ -1009,7 +1009,7 @@ void SAL_CALL cli_proxy_dispatch(
             OSL_ENSURE(
                 function_pos < iface_td->nMapFunctionIndexToMemberIndex,
                 "### illegal function index!" );
-
+            
             if (uno_ret) // is getter method
             {
                OUString const& usAttrName= *(rtl_uString**)&
@@ -1017,7 +1017,7 @@ void SAL_CALL cli_proxy_dispatch(
                    ->pMemberName;
                sr::MethodInfo* info = proxy->getMethodInfo(function_pos,
                                              usAttrName, CliProxy::MK_GET);
-               bridge->call_cli(
+               bridge->call_cli( 
                     proxy->m_cliI,
                     info,
                     ((typelib_InterfaceAttributeTypeDescription *)member_td)
@@ -1038,7 +1038,7 @@ void SAL_CALL cli_proxy_dispatch(
                     ->pAttributeTypeRef;
                 param.bIn = sal_True;
                 param.bOut = sal_False;
-
+                
                 bridge->call_cli(
                     proxy->m_cliI,
                     // set follows get method
@@ -1062,7 +1062,7 @@ void SAL_CALL cli_proxy_dispatch(
             OSL_ENSURE(
                 function_pos < iface_td->nMapFunctionIndexToMemberIndex,
                 "### illegal function index!" );
-
+            
             switch (function_pos)
             {
             case 0: // queryInterface()
@@ -1076,13 +1076,13 @@ void SAL_CALL cli_proxy_dispatch(
                     throw BridgeRuntimeError(
                     OUSTR("queryInterface() call demands an INTERFACE type!"));
                 }
-
+                
                 uno_Interface * pInterface = 0;
                 (*bridge->m_uno_env->getRegisteredInterface)(
                     bridge->m_uno_env,
                     (void **)&pInterface, proxy->m_usOid.pData,
                     (typelib_InterfaceTypeDescription *)demanded_td.get() );
-
+                
                 if (0 == pInterface)
                 {
                     System::Type* mgdDemandedType =
@@ -1108,7 +1108,7 @@ void SAL_CALL cli_proxy_dispatch(
                         uno_any_construct( (uno_Any *)uno_ret, 0, 0, 0 );
                     }
                     // no excetpion occured
-                    *uno_exc = 0;
+                    *uno_exc = 0;                    
                 }
                 else
                 {
@@ -1137,7 +1137,7 @@ void SAL_CALL cli_proxy_dispatch(
                    ->pMemberName;
 
                sr::MethodInfo* info = proxy->getMethodInfo(function_pos,
-                                             usMethodName, CliProxy::MK_METHOD);
+                                             usMethodName, CliProxy::MK_METHOD); 
                bridge->call_cli(
                     proxy->m_cliI,
                     info,
diff --git a/cli_ure/source/uno_bridge/cli_proxy.h b/cli_ure/source/uno_bridge/cli_proxy.h
index c5ea831dbf70..43225a530c6b 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.h
+++ b/cli_ure/source/uno_bridge/cli_proxy.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ namespace cli_uno
 public __gc class UnoInterfaceInfo
 {
 public:
-    UnoInterfaceInfo(Bridge const * bridge, uno_Interface* unoI,
+    UnoInterfaceInfo(Bridge const * bridge, uno_Interface* unoI, 
                      typelib_InterfaceTypeDescription* td);
     ~UnoInterfaceInfo();
     uno_Interface * m_unoI; // wrapped interface
@@ -76,7 +76,7 @@ public __gc class  UnoInterfaceProxy: public srrp::RealProxy,
     sc::ArrayList* m_listIfaces;
     /** The number of UNO interfaces this proxy represents. It corresponds
         to the the number of elements in m_listIfaces.
-    */
+    */    
     int m_numUnoIfaces;
     /** The list is filled with additional UnoInterfaceProxy object due
         to aggregation via bridges.  Though the latter is strongly
@@ -84,12 +84,12 @@ public __gc class  UnoInterfaceProxy: public srrp::RealProxy,
     */
     sc::ArrayList* m_listAdditionalProxies;
     int m_nlistAdditionalProxies;
-
+    
     UnoInterfaceInfo * findInfo( ::System::Type * type );
 
     Bridge const* m_bridge;
      System::String* m_oid;
-
+    
 #if OSL_DEBUG_LEVEL >= 2
     /** The string contains all names of UNO interfaces which are
         represented by this proxy. It is used to print out the interfaces
@@ -101,7 +101,7 @@ public __gc class  UnoInterfaceProxy: public srrp::RealProxy,
 //      */
     int _numInterfaces;
 #endif
-
+    
 public:
 
     /** Creates a proxy and registers it on the dot NET side.
@@ -140,7 +140,7 @@ public:
         m_sTypeName = name;
     }
 
-
+    
 private:
     UnoInterfaceProxy(
         Bridge * bridge,
@@ -170,7 +170,7 @@ private:
     static System::String* m_ToString_String = new System::String("ToString");
 
 protected:
-     srrm::IMessage* invokeObject(sc::IDictionary* properties,
+     srrm::IMessage* invokeObject(sc::IDictionary* properties,                    
                                   srrm::LogicalCallContext* context,
                                   srrm::IMethodCallMessage* mcm);
 };
@@ -229,17 +229,17 @@ struct CliProxy: public uno_Interface
 
         That is the real Uno position has to be deducted by 3. Then
         arUnoPosToCliPos[pos] contains the index for m_arMethodInfos.
-
+        
      */
     gcroot<System::Int32[]> m_arUnoPosToCliPos;
 
     /** Count of inherited interfaces of the cli interface.
      */
     int m_nInheritedInterfaces;
-    /** Contains the number of methods of each interface.
+    /** Contains the number of methods of each interface. 
      */
     gcroot<System::Int32[]> m_arInterfaceMethodCount;
-
+    
     CliProxy( Bridge const* bridge, System::Object* cliI,
                  typelib_TypeDescription const* pTD,
                  const rtl::OUString& usOid);
@@ -278,16 +278,16 @@ struct CliProxy: public uno_Interface
        The implementation assumes that the order of interface methods as
        provided by InterfaceMapping.InterfaceMethods corresponds to the order
        of methods in the interface declaration.
-
+      
        @param nUnoFunctionPos
        Position of the method in the uno interface.
      */
     sr::MethodInfo* getMethodInfo(int nUnoFunctionPos,
                                   const rtl::OUString & usMethodName,
                                   MethodKind mk);
-
+    
     void SAL_CALL uno_DispatchMethod(
-        struct _uno_Interface * pUnoI,
+        struct _uno_Interface * pUnoI, 
         const struct _typelib_TypeDescription * pMemberType,
         void * pReturn,
         void * pArgs[],
diff --git a/cli_ure/source/uno_bridge/cli_uno.cxx b/cli_ure/source/uno_bridge/cli_uno.cxx
index 92e98b59807a..d417900af334 100644
--- a/cli_ure/source/uno_bridge/cli_uno.cxx
+++ b/cli_ure/source/uno_bridge/cli_uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -78,7 +78,7 @@ System::Object* Bridge::call_uno(uno_Interface * pUnoI,
     //
     // If an argument is larger then union largest, such as some structures, then the pointer
     // points to an extra block of memory. The same goes for a big return value.
-
+    
     char * mem = (char *)alloca(
         (nParams * sizeof (void *)) + return_size + (nParams * sizeof (largest)) );
     //array of pointers to args
@@ -94,7 +94,7 @@ System::Object* Bridge::call_uno(uno_Interface * pUnoI,
     {
         typelib_MethodParameter const & param = pParams[ nPos ];
         typelib_TypeDescriptionReference * type = param.pTypeRef;
-
+        
         uno_args[ nPos ] = &uno_args_mem[ nPos ];
         if (typelib_TypeClass_STRUCT == type->eTypeClass ||
             typelib_TypeClass_EXCEPTION == type->eTypeClass)
@@ -103,7 +103,7 @@ System::Object* Bridge::call_uno(uno_Interface * pUnoI,
             if (td.get()->nSize > sizeof (largest))
                 uno_args[ nPos ] = alloca( td.get()->nSize );
         }
-
+        
         if (param.bIn)
         {
             try
@@ -167,7 +167,7 @@ System::Object* Bridge::call_uno(uno_Interface * pUnoI,
                 uno_type_destructData(uno_args[nPos], type, 0);
             }
         }
-
+        
         if ((0 != return_type) &&
             (typelib_TypeClass_VOID != return_type->eTypeClass))
         {
@@ -207,11 +207,11 @@ System::Object* Bridge::call_uno(uno_Interface * pUnoI,
 
 void Bridge::call_cli(
     System::Object* cliI,
-    sr::MethodInfo* method,
+    sr::MethodInfo* method, 
     typelib_TypeDescriptionReference * return_type,
     typelib_MethodParameter * params, int nParams,
     void * uno_ret, void * uno_args [], uno_Any ** uno_exc ) const
-{
+{   
     System::Object *args[]=  new System::Object*[nParams];
     for (int nPos= 0; nPos < nParams; nPos++)
     {
@@ -236,7 +236,7 @@ void Bridge::call_cli(
         map_to_uno(memExc.get(), exc, td.get()->pWeakRef, false);
         (*uno_exc)->pType= td.get()->pWeakRef;
         (*uno_exc)->pData= memExc.release();
-        return;
+        return;        
     }
     catch (System::Exception* e)
     {
@@ -252,7 +252,7 @@ void Bridge::call_cli(
     for (int nPos = 0; nPos < nParams; ++nPos )
     {
         typelib_MethodParameter const & param = params[ nPos ];
-
+            
         if (param.bOut)
         {
             try
@@ -276,11 +276,11 @@ void Bridge::call_cli(
         }
     }
     // return value
-    if (0 != return_type)
+    if (0 != return_type) 
     {
         map_to_uno(
             uno_ret, retInvoke, return_type, false /* no assign */);
-    }
+    }        
     // no exception occured
     *uno_exc = 0;
 }
diff --git a/codemaker/inc/codemaker/codemaker.hxx b/codemaker/inc/codemaker/codemaker.hxx
index 91cf382d39f8..2a0d8bf1a2d7 100644
--- a/codemaker/inc/codemaker/codemaker.hxx
+++ b/codemaker/inc/codemaker/codemaker.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ namespace rtl {
 }
 class TypeManager;
 
-namespace codemaker {
+namespace codemaker { 
 
 rtl::OString convertString(rtl::OUString const & string);
 
diff --git a/codemaker/inc/codemaker/commoncpp.hxx b/codemaker/inc/codemaker/commoncpp.hxx
index 5ccb5e30efcb..993397f5fdd9 100644
--- a/codemaker/inc/codemaker/commoncpp.hxx
+++ b/codemaker/inc/codemaker/commoncpp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/inc/codemaker/commonjava.hxx b/codemaker/inc/codemaker/commonjava.hxx
index 9fa36efc60fd..d99826ab6bb4 100644
--- a/codemaker/inc/codemaker/commonjava.hxx
+++ b/codemaker/inc/codemaker/commonjava.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/inc/codemaker/dependencies.hxx b/codemaker/inc/codemaker/dependencies.hxx
index 0e6bc90197f0..681901175630 100644
--- a/codemaker/inc/codemaker/dependencies.hxx
+++ b/codemaker/inc/codemaker/dependencies.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/inc/codemaker/exceptiontree.hxx b/codemaker/inc/codemaker/exceptiontree.hxx
index e8edb35fab57..3a92ddbd41dd 100644
--- a/codemaker/inc/codemaker/exceptiontree.hxx
+++ b/codemaker/inc/codemaker/exceptiontree.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/inc/codemaker/generatedtypeset.hxx b/codemaker/inc/codemaker/generatedtypeset.hxx
index 7740847c273a..a290bb7cfc39 100644
--- a/codemaker/inc/codemaker/generatedtypeset.hxx
+++ b/codemaker/inc/codemaker/generatedtypeset.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/inc/codemaker/global.hxx b/codemaker/inc/codemaker/global.hxx
index 2406305db451..820dd58de6e4 100644
--- a/codemaker/inc/codemaker/global.hxx
+++ b/codemaker/inc/codemaker/global.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,9 +68,9 @@ typedef ::std::new_alloc NewAlloc;
 #endif
 
 
-typedef ::std::list< ::rtl::OString >               StringList;
-typedef ::std::vector< ::rtl::OString >             StringVector;
-typedef ::std::set< ::rtl::OString, LessString >    StringSet;
+typedef ::std::list< ::rtl::OString > 				StringList;
+typedef ::std::vector< ::rtl::OString > 			StringVector;
+typedef ::std::set< ::rtl::OString, LessString > 	StringSet;
 
 //*************************************************************************
 // FileStream
@@ -87,16 +87,16 @@ class FileStream
 {
 public:
     FileStream();
-    FileStream(const ::rtl::OString& name, FileAccessMode nMode = FAM_READWRITE);
+    FileStream(const ::rtl::OString& name, FileAccessMode nMode = FAM_READWRITE);	
     virtual ~FileStream();
-
+    
     sal_Bool isValid();
 
     void open(const ::rtl::OString& name, FileAccessMode nMode = FAM_READWRITE);
     void createTempFile(const ::rtl::OString& sPath);
     void close();
 
-    ::rtl::OString  getName() { return m_name; }
+    ::rtl::OString 	getName() { return m_name; }
 
     bool write(void const * buffer, sal_uInt64 size);
 
@@ -112,7 +112,7 @@ private:
     sal_uInt32 checkAccessMode(FileAccessMode mode);
 
     oslFileHandle m_file;
-    ::rtl::OString  m_name;
+    ::rtl::OString  m_name;    
 };
 
 
@@ -121,8 +121,8 @@ private:
 //*************************************************************************
 ::rtl::OString getTempDir(const ::rtl::OString& sFileName);
 
-::rtl::OString createFileNameFromType(const ::rtl::OString& destination,
-                                      const ::rtl::OString type,
+::rtl::OString createFileNameFromType(const ::rtl::OString& destination, 
+                                      const ::rtl::OString type, 
                                       const ::rtl::OString postfix,
                                       sal_Bool bLowerCase=sal_False,
                                       const ::rtl::OString prefix="");
@@ -144,7 +144,7 @@ public:
     CannotDumpException(const ::rtl::OString& msg)
         : m_message(msg) {}
 
-    ::rtl::OString  m_message;
+    ::rtl::OString	m_message;	
 };
 
 
diff --git a/codemaker/inc/codemaker/options.hxx b/codemaker/inc/codemaker/options.hxx
index d443d35d2c1a..421cc217aa74 100644
--- a/codemaker/inc/codemaker/options.hxx
+++ b/codemaker/inc/codemaker/options.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,20 +34,20 @@
 #include <codemaker/global.hxx>
 
 #if defined( _MSC_VER ) && ( _MSC_VER < 1200 )
-typedef ::std::__hash_map__
-<
-    ::rtl::OString,
-    ::rtl::OString,
-    HashString,
-    EqualString,
+typedef	::std::__hash_map__
+<	
+    ::rtl::OString, 
+    ::rtl::OString, 
+    HashString, 
+    EqualString, 
     NewAlloc
 > OptionMap;
 #else
-typedef ::std::hash_map
-<
-    ::rtl::OString,
-    ::rtl::OString,
-    HashString,
+typedef	::std::hash_map
+<	
+    ::rtl::OString, 
+    ::rtl::OString, 
+    HashString, 
     EqualString
 > OptionMap;
 #endif
@@ -58,7 +58,7 @@ public:
     IllegalArgument(const ::rtl::OString& msg)
         : m_message(msg) {}
 
-    ::rtl::OString  m_message;
+    ::rtl::OString	m_message;	
 };
 
 class Options
@@ -67,34 +67,34 @@ public:
     Options();
     virtual ~Options();
 
-    virtual sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
+    virtual sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) 
         throw( IllegalArgument ) = 0;
 
-    virtual ::rtl::OString  prepareHelp() = 0;
+    virtual ::rtl::OString	prepareHelp() = 0;
 
-    const ::rtl::OString&   getProgramName() const;
-    sal_Bool                isValid(const ::rtl::OString& option);
-    const ::rtl::OString    getOption(const ::rtl::OString& option)
+    const ::rtl::OString&	getProgramName() const;
+    sal_Bool				isValid(const ::rtl::OString& option);
+    const ::rtl::OString	getOption(const ::rtl::OString& option)
         throw( IllegalArgument );
-    const OptionMap&        getOptions();
+    const OptionMap& 		getOptions();
 
-    const ::rtl::OString    getInputFile(sal_uInt16 index)
+    const ::rtl::OString 	getInputFile(sal_uInt16 index)
         throw( IllegalArgument );
 
     const StringVector& getInputFiles();
 
     ::rtl::OString getExtraInputFile(sal_uInt16 index) const throw( IllegalArgument );
     inline sal_uInt16 getNumberOfExtraInputFiles() const
-        { return (sal_uInt16)m_extra_input_files.size(); }
+        { return (sal_uInt16)m_extra_input_files.size(); }	
     inline const StringVector& getExtraInputFiles() const
         { return m_extra_input_files; }
 protected:
-    ::rtl::OString  m_program;
-    StringVector    m_inputFiles;
+    ::rtl::OString 	m_program;
+    StringVector	m_inputFiles;
     StringVector    m_extra_input_files;
-    OptionMap       m_options;
+    OptionMap		m_options;
 };
-
+    
 #endif // INCLUDED_CODEMAKER_OPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/inc/codemaker/typemanager.hxx b/codemaker/inc/codemaker/typemanager.hxx
index 8927e9080932..49a6e0a4938f 100644
--- a/codemaker/inc/codemaker/typemanager.hxx
+++ b/codemaker/inc/codemaker/typemanager.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,28 +38,28 @@
 
 namespace typereg { class Reader; }
 
-//typedef ::std::list< Registry* >  RegistryList;
-typedef ::std::vector< Registry* >  RegistryList;
-typedef ::std::pair< RegistryKey, sal_Bool >    KeyPair;
-typedef ::std::vector< KeyPair >    RegistryKeyList;
+//typedef ::std::list< Registry* > 	RegistryList;
+typedef ::std::vector< Registry* > 	RegistryList;
+typedef ::std::pair< RegistryKey, sal_Bool > 	KeyPair;
+typedef ::std::vector< KeyPair > 	RegistryKeyList;
 
 #if defined( _MSC_VER ) && ( _MSC_VER < 1200 )
-typedef ::std::__hash_map__
-<
+typedef	::std::__hash_map__
+<	
     ::rtl::OString, // Typename
-    RTTypeClass,    // TypeClass
-    HashString,
-    EqualString,
+    RTTypeClass, 	// TypeClass
+    HashString, 
+    EqualString, 
     NewAlloc
-> T2TypeClassMap;
+> T2TypeClassMap; 
 #else
-typedef ::std::hash_map
-<
+typedef	::std::hash_map
+<	
     ::rtl::OString, // Typename
-    RTTypeClass,    // TypeClass
-    HashString,
+    RTTypeClass, 	// TypeClass
+    HashString, 
     EqualString
-> T2TypeClassMap;
+> T2TypeClassMap; 
 #endif
 
 struct TypeManagerImpl
@@ -68,8 +68,8 @@ struct TypeManagerImpl
         : m_refCount(0)
         {}
 
-    sal_Int32       m_refCount;
-};
+    sal_Int32		m_refCount;
+};	
 
 class TypeManager
 {
@@ -96,19 +96,19 @@ public:
 
     virtual ::rtl::OString getTypeName(RegistryKey&) const
         { return ::rtl::OString(); }
-
-    virtual RegistryKey getTypeKey(const ::rtl::OString&, sal_Bool * = 0 ) const
+    
+    virtual RegistryKey	getTypeKey(const ::rtl::OString&, sal_Bool * = 0 ) const
         { return RegistryKey(); }
-    virtual RegistryKeyList getTypeKeys(const ::rtl::OString&) const
+    virtual RegistryKeyList	getTypeKeys(const ::rtl::OString&) const
         { return RegistryKeyList(); }
     virtual typereg::Reader getTypeReader(
         const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const = 0;
     virtual typereg::Reader getTypeReader(RegistryKey& rTypeKey) const = 0;
-    virtual RTTypeClass getTypeClass(const ::rtl::OString&) const
-        { return RT_TYPE_INVALID; }
-    virtual RTTypeClass getTypeClass(RegistryKey&) const
+    virtual RTTypeClass	getTypeClass(const ::rtl::OString&) const
+        { return RT_TYPE_INVALID; } 
+    virtual RTTypeClass	getTypeClass(RegistryKey&) const
         { return RT_TYPE_INVALID; }
-
+    
     virtual void setBase(const ::rtl::OString&) {}
     virtual ::rtl::OString getBase() const { return ::rtl::OString(); }
 
@@ -126,14 +126,14 @@ protected:
 struct RegistryTypeManagerImpl
 {
     RegistryTypeManagerImpl()
-        : m_base("/")
+        : m_base("/") 
         {}
 
-    T2TypeClassMap  m_t2TypeClass;
-    RegistryList    m_registries;
-    RegistryList    m_extra_registries;
-    ::rtl::OString  m_base;
-};
+    T2TypeClassMap	m_t2TypeClass;
+    RegistryList	m_registries;
+    RegistryList	m_extra_registries;
+    ::rtl::OString 	m_base;
+};	
 
 class RegistryTypeManager : public TypeManager
 {
@@ -151,27 +151,27 @@ public:
     sal_Bool init(const StringVector& regFiles, const StringVector& extraFiles = StringVector() );
 
     ::rtl::OString getTypeName(RegistryKey& rTypeKey) const;
-
-    sal_Bool    isValidType(const ::rtl::OString& name) const
+    
+    sal_Bool  	isValidType(const ::rtl::OString& name) const
         { return searchTypeKey(name, 0).isValid(); }
-    RegistryKey getTypeKey(
+    RegistryKey	getTypeKey(
         const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const
         { return searchTypeKey(name, pIsExtraType); }
-    RegistryKeyList getTypeKeys(const ::rtl::OString& name) const;
+    RegistryKeyList	getTypeKeys(const ::rtl::OString& name) const;
     typereg::Reader getTypeReader(
         const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const;
     typereg::Reader getTypeReader(RegistryKey& rTypeKey) const;
-    RTTypeClass getTypeClass(const ::rtl::OString& name) const;
-    RTTypeClass getTypeClass(RegistryKey& rTypeKey) const;
+    RTTypeClass	getTypeClass(const ::rtl::OString& name) const;
+    RTTypeClass	getTypeClass(RegistryKey& rTypeKey) const;
 
     void setBase(const ::rtl::OString& base);
     ::rtl::OString getBase() const { return m_pImpl->m_base; }
 
     sal_Int32 getSize() const { return m_pImpl->m_t2TypeClass.size(); }
 protected:
-    RegistryKey searchTypeKey(
+    RegistryKey	searchTypeKey(
         const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const;
-    void        freeRegistries();
+    void		freeRegistries();
 
     void acquire();
     void release();
@@ -179,7 +179,7 @@ protected:
 protected:
     RegistryTypeManagerImpl* m_pImpl;
 };
-
+    
 #endif // INCLUDED_CODEMAKER_TYPEMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/inc/codemaker/unotype.hxx b/codemaker/inc/codemaker/unotype.hxx
index e79e760530d7..3e490beed682 100644
--- a/codemaker/inc/codemaker/unotype.hxx
+++ b/codemaker/inc/codemaker/unotype.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/inc/pch/precompiled_codemaker.cxx b/codemaker/inc/pch/precompiled_codemaker.cxx
index fbe55a4f00f4..a3a0735bd8af 100644
--- a/codemaker/inc/pch/precompiled_codemaker.cxx
+++ b/codemaker/inc/pch/precompiled_codemaker.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/inc/pch/precompiled_codemaker.hxx b/codemaker/inc/pch/precompiled_codemaker.hxx
index 443b3f60ee23..0409cb77eb18 100644
--- a/codemaker/inc/pch/precompiled_codemaker.hxx
+++ b/codemaker/inc/pch/precompiled_codemaker.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/source/codemaker/codemaker.cxx b/codemaker/source/codemaker/codemaker.cxx
index 8ce02ab0a1d5..d141a7c107e6 100644
--- a/codemaker/source/codemaker/codemaker.cxx
+++ b/codemaker/source/codemaker/codemaker.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -99,7 +99,7 @@ codemaker::UnoType::Sort decomposeAndResolve(
             throw CannotDumpException(
                 errorMsg(rtl::OString(
                     RTL_CONSTASCII_STRINGPARAM("Bad type information: ")),
-                    type));
+                    type));	
             //TODO
         }
         *rank += n;
@@ -114,7 +114,7 @@ codemaker::UnoType::Sort decomposeAndResolve(
                 throw CannotDumpException(
                     errorMsg(rtl::OString(
                         RTL_CONSTASCII_STRINGPARAM("Bad type information: ")),
-                        type));
+                        type));	
                 //TODO
             }
         default:
@@ -140,7 +140,7 @@ codemaker::UnoType::Sort decomposeAndResolve(
                     throw CannotDumpException(
                         errorMsg(rtl::OString(
                             RTL_CONSTASCII_STRINGPARAM("Bad type information: ")),
-                            type));
+                            type));	
                     //TODO
                 }
                 return sort;
@@ -154,7 +154,7 @@ codemaker::UnoType::Sort decomposeAndResolve(
                     throw CannotDumpException(
                         errorMsg(rtl::OString(
                             RTL_CONSTASCII_STRINGPARAM("Bad type information: ")),
-                            type));
+                            type));	
                     //TODO
                 }
                 checkNoTypeArguments(*arguments);
@@ -179,7 +179,7 @@ codemaker::UnoType::Sort decomposeAndResolve(
                 throw CannotDumpException(
                     errorMsg(rtl::OString(
                         RTL_CONSTASCII_STRINGPARAM("Bad type information: ")),
-                        type));
+                        type));	
                 //TODO
             }
         }
diff --git a/codemaker/source/codemaker/dependencies.cxx b/codemaker/source/codemaker/dependencies.cxx
index da8d33e1f88e..51ea792b0ad2 100644
--- a/codemaker/source/codemaker/dependencies.cxx
+++ b/codemaker/source/codemaker/dependencies.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/source/codemaker/exceptiontree.cxx b/codemaker/source/codemaker/exceptiontree.cxx
index e54483d39561..e7cbc5e68cc4 100644
--- a/codemaker/source/codemaker/exceptiontree.cxx
+++ b/codemaker/source/codemaker/exceptiontree.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -75,7 +75,7 @@ void ExceptionTree::add(rtl::OString const & name, TypeManager const & manager)
             throw CannotDumpException(
                 ::rtl::OString("Unknown type '" + n.replace('/', '.')
                                + "', incomplete type library."));
-
+        
         OSL_ASSERT(
             reader.getTypeClass() == RT_TYPE_EXCEPTION
             && reader.getSuperTypeCount() == 1);
diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx
index 52e4e3486aa6..e3f690fe87b3 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -167,7 +167,7 @@ OString createFileNameFromType( const OString& destination,
 
     OUString uSysFileName;
     OSL_VERIFY( FileBase::getSystemPathFromFileURL(
-        convertToFileUrl(fileName), uSysFileName) == FileBase::E_None );
+        convertToFileUrl(fileName), uSysFileName) == FileBase::E_None );    
     return OUStringToOString(uSysFileName, osl_getThreadTextEncoding());;
 }
 
@@ -188,14 +188,14 @@ sal_Bool checkFileContent(const OString& targetFileName, const OString& tmpFileN
 {
     FILE  *target = fopen(targetFileName.getStr(), "r");
     FILE  *tmp = fopen(tmpFileName.getStr(), "r");
-    sal_Bool    bFindChanges = sal_False;
+    sal_Bool 	bFindChanges = sal_False;
 
     if (target != NULL && tmp != NULL)
     {
-        sal_Char    buffer1[1024+1];
-        sal_Char    buffer2[1024+1];
-        sal_Int32   n1 = 0;
-        sal_Int32   n2 = 0;
+        sal_Char 	buffer1[1024+1];
+        sal_Char 	buffer2[1024+1];
+        sal_Int32 	n1 = 0;
+        sal_Int32 	n2 = 0;
 
         while ( !bFindChanges && !feof(target) && !feof(tmp))
         {
@@ -212,7 +212,7 @@ sal_Bool checkFileContent(const OString& targetFileName, const OString& tmpFileN
 
     if (target) fclose(target);
     if (tmp) fclose(tmp);
-
+    
     return bFindChanges;
 }
 
@@ -223,14 +223,14 @@ sal_Bool makeValidTypeFile(const OString& targetFileName, const OString& tmpFile
         if (checkFileContent(targetFileName, tmpFileName)) {
             if ( !unlink(targetFileName.getStr()) )
                 if ( !rename(tmpFileName.getStr(), targetFileName.getStr()) )
-                    return sal_True;
-        } else
+                    return sal_True;        
+        } else 
             return removeTypeFile(tmpFileName);
     } else {
         if (fileExists(targetFileName))
             if (!removeTypeFile(targetFileName))
                 return sal_False;
-
+        
         if ( rename(tmpFileName.getStr(), targetFileName.getStr()) ) {
             if (errno == EEXIST)
                 return sal_True;
@@ -303,7 +303,7 @@ FileStream::FileStream(const OString& name, FileAccessMode mode)
     if ( name.getLength() > 0 )
     {
         OUString sUrl(convertToFileUrl(name));
-#ifdef SAL_UNX
+#ifdef SAL_UNX        
         sal_uInt64 uAttr = osl_File_Attribute_OwnWrite |
                            osl_File_Attribute_OwnRead |
                            osl_File_Attribute_GrpWrite |
@@ -346,7 +346,7 @@ void FileStream::createTempFile(const OString& sPath)
     sTmpPath = convertToFileUrl(sTmp);
 
     if (osl_createTempFile(sTmpPath.pData, &m_file, &sTmpName.pData) == osl_File_E_None) {
-#ifdef SAL_UNX
+#ifdef SAL_UNX       
         sal_uInt64 uAttr = osl_File_Attribute_OwnWrite |
                            osl_File_Attribute_OwnRead |
                            osl_File_Attribute_GrpWrite |
@@ -356,7 +356,7 @@ void FileStream::createTempFile(const OString& sPath)
             m_file = NULL;
             return;
         }
-#endif
+#endif  
         OUString sSysTmpName;
         FileBase::getSystemPathFromFileURL(sTmpName, sSysTmpName);
         m_name = OUStringToOString(sSysTmpName, osl_getThreadTextEncoding());
@@ -435,7 +435,7 @@ FileStream &operator<<(FileStream& o, const ::rtl::OString& s) {
     sal_uInt64 writtenBytes;
     osl_writeFile(o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes);
     return o;
-
+    
 }
 FileStream &operator<<(FileStream& o, ::rtl::OStringBuffer* s) {
     sal_uInt64 writtenBytes;
diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx
index 2019e96b3518..27ebb14d5b3e 100644
--- a/codemaker/source/codemaker/options.cxx
+++ b/codemaker/source/codemaker/options.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,22 +35,22 @@ using namespace rtl;
 
 Options::Options()
 {
-}
+}	
 
 Options::~Options()
 {
-
+    
 }
 
 const OString& Options::getProgramName() const
 {
     return m_program;
-}
+}	
 
 sal_Bool Options::isValid(const OString& option)
 {
-    return (m_options.count(option) > 0);
-}
+    return (m_options.count(option) > 0);	
+}	
 
 const OString Options::getOption(const OString& option)
     throw( IllegalArgument )
@@ -66,36 +66,36 @@ const OString Options::getOption(const OString& option)
 
 const OptionMap& Options::getOptions()
 {
-    return m_options;
-}
+    return m_options;	
+}	
 
 const OString Options::getInputFile(sal_uInt16 index)
     throw( IllegalArgument )
 {
     if (index < m_inputFiles.size())
     {
-        return m_inputFiles[index];
+        return m_inputFiles[index];		
     } else
     {
         throw IllegalArgument("index is out of bound.");
     }
-}
+}	
 
 const StringVector& Options::getInputFiles()
 {
-    return m_inputFiles;
-}
-
+    return m_inputFiles;	
+}	
+    
 OString Options::getExtraInputFile(sal_uInt16 index) const
     throw( IllegalArgument )
 {
     if (index < m_extra_input_files.size())
     {
-        return m_extra_input_files[index];
+        return m_extra_input_files[index];		
     } else
     {
         throw IllegalArgument("index is out of bound.");
     }
-}
+}	
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/codemaker/typemanager.cxx b/codemaker/source/codemaker/typemanager.cxx
index b65120aa1aa0..a3a453013859 100644
--- a/codemaker/source/codemaker/typemanager.cxx
+++ b/codemaker/source/codemaker/typemanager.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,21 +39,21 @@ using namespace rtl;
 TypeManager::TypeManager()
 {
     m_pImpl = new TypeManagerImpl();
-    acquire();
-}
+    acquire();	
+}	
 
 TypeManager::~TypeManager()
 {
     release();
-}
+}	
 
 sal_Int32 TypeManager::acquire()
-{
+{ 
     return osl_incrementInterlockedCount(&m_pImpl->m_refCount);
 }
 
 sal_Int32 TypeManager::release()
-{
+{ 
     sal_Int32 refCount = 0;
     if (0 == (refCount = osl_decrementInterlockedCount(&m_pImpl->m_refCount)) )
     {
@@ -96,30 +96,30 @@ sal_Bool TypeManager::isBaseType(const ::rtl::OString& name)
         return sal_True;
 
     return sal_False;
-}
+}	
 
 RegistryTypeManager::RegistryTypeManager()
 {
     m_pImpl = new RegistryTypeManagerImpl();
-    acquire();
-}
+    acquire();	
+}	
 
 RegistryTypeManager::~RegistryTypeManager()
 {
     release();
-}
+}	
 
 void RegistryTypeManager::acquire()
-{
+{ 
     TypeManager::acquire();
 }
 
 void RegistryTypeManager::release()
-{
+{ 
     if (0 == TypeManager::release())
     {
         freeRegistries();
-
+        
         delete m_pImpl;
     }
 }
@@ -157,9 +157,9 @@ sal_Bool RegistryTypeManager::init(
         }
         ++iter;
     }
-
+    
     return sal_True;
-}
+}	
 
 ::rtl::OString RegistryTypeManager::getTypeName(RegistryKey& rTypeKey) const
 {
@@ -178,126 +178,126 @@ typereg::Reader RegistryTypeManager::getTypeReader(
 {
     typereg::Reader reader;
     RegistryKey key(searchTypeKey(name, pIsExtraType));
-
+    
     if (key.isValid())
     {
-        RegValueType    valueType;
-        sal_uInt32      valueSize;
+        RegValueType 	valueType;
+        sal_uInt32		valueSize;
 
         if (!key.getValueInfo(OUString(), &valueType, &valueSize))
         {
-            sal_uInt8*  pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);
+            sal_uInt8*	pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);	
             if (!key.getValue(OUString(), pBuffer))
             {
                 reader = typereg::Reader(
                     pBuffer, valueSize, true, TYPEREG_VERSION_1);
-            }
+            }		
             rtl_freeMemory(pBuffer);
         }
     }
     return reader;
-}
+}	
 
 typereg::Reader RegistryTypeManager::getTypeReader(RegistryKey& rTypeKey) const
 {
     typereg::Reader reader;
-
+    
     if (rTypeKey.isValid())
     {
-        RegValueType    valueType;
-        sal_uInt32      valueSize;
+        RegValueType 	valueType;
+        sal_uInt32		valueSize;
 
         if (!rTypeKey.getValueInfo(OUString(), &valueType, &valueSize))
         {
-            sal_uInt8*  pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);
+            sal_uInt8*	pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);	
             if (!rTypeKey.getValue(OUString(), pBuffer))
             {
                 reader = typereg::Reader(
                     pBuffer, valueSize, true, TYPEREG_VERSION_1);
-            }
+            }		
             rtl_freeMemory(pBuffer);
         }
     }
     return reader;
-}
+}	
 
 
 RTTypeClass RegistryTypeManager::getTypeClass(const OString& name) const
 {
     if (m_pImpl->m_t2TypeClass.count(name) > 0)
     {
-        return m_pImpl->m_t2TypeClass[name];
+        return m_pImpl->m_t2TypeClass[name];		
     } else
     {
         RegistryKey key(searchTypeKey(name));
-
+        
         if (key.isValid())
         {
-            RegValueType    valueType;
-            sal_uInt32      valueSize;
+            RegValueType 	valueType;
+            sal_uInt32		valueSize;
 
             if (!key.getValueInfo(OUString(), &valueType, &valueSize))
             {
-                sal_uInt8*  pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);
+                sal_uInt8*	pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);	
                 if (!key.getValue(OUString(), pBuffer))
                 {
                     typereg::Reader reader(
                         pBuffer, valueSize, false, TYPEREG_VERSION_1);
 
                     RTTypeClass ret = reader.getTypeClass();
-
+                    
                     rtl_freeMemory(pBuffer);
-
-                    m_pImpl->m_t2TypeClass[name] = ret;
+                    
+                    m_pImpl->m_t2TypeClass[name] = ret;				
                     return ret;
-                }
+                }		
                 rtl_freeMemory(pBuffer);
             }
         }
-    }
+    }	
 
-    return RT_TYPE_INVALID;
-}
+    return RT_TYPE_INVALID;	
+}	
 
 RTTypeClass RegistryTypeManager::getTypeClass(RegistryKey& rTypeKey) const
 {
     OString name = getTypeName(rTypeKey);
-
+    
     if (m_pImpl->m_t2TypeClass.count(name) > 0)
     {
-        return m_pImpl->m_t2TypeClass[name];
+        return m_pImpl->m_t2TypeClass[name];		
     } else
     {
         if (rTypeKey.isValid())
         {
-            RegValueType    valueType;
-            sal_uInt32      valueSize;
+            RegValueType 	valueType;
+            sal_uInt32		valueSize;
 
             if (!rTypeKey.getValueInfo(OUString(), &valueType, &valueSize))
             {
-                sal_uInt8*  pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);
+                sal_uInt8*	pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);	
                 if (!rTypeKey.getValue(OUString(), pBuffer))
                 {
                     typereg::Reader reader(
                         pBuffer, valueSize, false, TYPEREG_VERSION_1);
 
                     RTTypeClass ret = reader.getTypeClass();
-
+                    
                     rtl_freeMemory(pBuffer);
-
-                    m_pImpl->m_t2TypeClass[name] = ret;
+                    
+                    m_pImpl->m_t2TypeClass[name] = ret;				
                     return ret;
-                }
+                }		
                 rtl_freeMemory(pBuffer);
             }
         }
-    }
+    }	
 
-    return RT_TYPE_INVALID;
-}
+    return RT_TYPE_INVALID;	
+}	
 
 void RegistryTypeManager::setBase(const OString& base)
-{
+{ 
 
     if (base.lastIndexOf('/') == (base.getLength() - 1))
         m_pImpl->m_base += base.copy(0, base.lastIndexOf('/') - 1);
@@ -319,14 +319,14 @@ void RegistryTypeManager::freeRegistries()
         delete *iter;
         ++iter;
     }
-}
+}	
 
-RegistryKey RegistryTypeManager::searchTypeKey(const OString& name_, sal_Bool * pIsExtraType )
+RegistryKey	RegistryTypeManager::searchTypeKey(const OString& name_, sal_Bool * pIsExtraType )
     const
 {
     OUString name( OStringToOUString(m_pImpl->m_base + "/" + name_, RTL_TEXTENCODING_UTF8) );
     RegistryKey key, rootKey;
-
+    
     RegistryList::const_iterator iter = m_pImpl->m_registries.begin();
     while (iter != m_pImpl->m_registries.end())
     {
@@ -354,12 +354,12 @@ RegistryKey RegistryTypeManager::searchTypeKey(const OString& name_, sal_Bool *
             }
         }
         ++iter;
-    }
-
+    }	
+    
     return key;
-}
-
-RegistryKeyList RegistryTypeManager::getTypeKeys(const ::rtl::OString& name_) const
+}	
+    
+RegistryKeyList	RegistryTypeManager::getTypeKeys(const ::rtl::OString& name_) const
 {
     RegistryKeyList keyList= RegistryKeyList();
     OString tmpName;
@@ -371,10 +371,10 @@ RegistryKeyList RegistryTypeManager::getTypeKeys(const ::rtl::OString& name_) co
         else
             tmpName = m_pImpl->m_base + "/" + name_;
     }
-
+    
     OUString name( OStringToOUString(tmpName, RTL_TEXTENCODING_UTF8) );
     RegistryKey key, rootKey;
-
+    
     RegistryList::const_iterator iter = m_pImpl->m_registries.begin();
     while (iter != m_pImpl->m_registries.end())
     {
@@ -398,8 +398,8 @@ RegistryKeyList RegistryTypeManager::getTypeKeys(const ::rtl::OString& name_) co
             }
         }
         ++iter;
-    }
-
+    }	
+    
     return keyList;
 }
 
diff --git a/codemaker/source/codemaker/unotype.cxx b/codemaker/source/codemaker/unotype.cxx
index cd3ce6d83752..7ce45a100d34 100644
--- a/codemaker/source/codemaker/unotype.cxx
+++ b/codemaker/source/codemaker/unotype.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx
index c8da1873846d..ec7cadcafe93 100644
--- a/codemaker/source/commoncpp/commoncpp.cxx
+++ b/codemaker/source/commoncpp/commoncpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@ rtl::OString typeToPrefix(TypeManager const & manager, rtl::OString const & type
     if (typeclass == RT_TYPE_INVALID ||
         typeclass == RT_TYPE_PUBLISHED)
         return rtl::OString("_");
-
+    
     static char const * const typeclassPrefix[RT_TYPE_UNION + 1] = {
         "invalid",    /* RT_TYPE_INVALID, is here only as placeholder */
         "interface",  /* RT_TYPE_INTERFACE */
@@ -103,9 +103,9 @@ rtl::OString scopedCppName(rtl::OString const & type, bool bNoNameSpace,
         else
             return s;
     }
-
+    
     return tmpBuf.makeStringAndClear();
-}
+}	
 
 
 rtl::OString translateUnoToCppType(
diff --git a/codemaker/source/commonjava/commonjava.cxx b/codemaker/source/commonjava/commonjava.cxx
index fe2fad09eb43..6dcbd2619f3e 100644
--- a/codemaker/source/commonjava/commonjava.cxx
+++ b/codemaker/source/commonjava/commonjava.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/source/cppumaker/cppumaker.cxx b/codemaker/source/cppumaker/cppumaker.cxx
index 82edce406682..0d6048a99999 100644
--- a/codemaker/source/cppumaker/cppumaker.cxx
+++ b/codemaker/source/cppumaker/cppumaker.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -69,21 +69,21 @@ void produce(
 }
 
 void produceAllTypes(RegistryKey& rTypeKey, bool bIsExtraType,
-                         TypeManager const & typeMgr,
+                         TypeManager const & typeMgr, 
                          codemaker::GeneratedTypeSet & generated,
                          CppuOptions* pOptions,
                          sal_Bool bFullScope)
     throw( CannotDumpException )
 {
     OString typeName = typeMgr.getTypeName(rTypeKey);
-
+    
     produce(rTypeKey, bIsExtraType, typeMgr, generated, pOptions);
 
     RegistryKeyList typeKeys = typeMgr.getTypeKeys(typeName);
     RegistryKeyList::const_iterator iter = typeKeys.begin();
     RegistryKey key, subKey;
     RegistryKeyArray subKeys;
-
+    
     while (iter != typeKeys.end())
     {
         key = (*iter).first;
@@ -103,19 +103,19 @@ void produceAllTypes(RegistryKey& rTypeKey, bool bIsExtraType,
                             typeMgr, generated, pOptions);
                 }
             }
-        }
+        }      
 
         ++iter;
     }
 }
 
 void produceAllTypes(const OString& typeName,
-                     TypeManager const & typeMgr,
+                     TypeManager const & typeMgr, 
                      codemaker::GeneratedTypeSet & generated,
                      CppuOptions* pOptions,
                      sal_Bool bFullScope)
     throw( CannotDumpException )
-{
+{   
     produce(typeName, typeMgr, generated, pOptions);
 
     RegistryKeyList typeKeys = typeMgr.getTypeKeys(typeName);
@@ -141,8 +141,8 @@ void produceAllTypes(const OString& typeName,
                             typeMgr, generated, pOptions);
                 }
             }
-        }
-
+        }      
+        
         ++iter;
     }
 }
@@ -153,7 +153,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
     CppuOptions options;
 
-    try
+    try 
     {
         if (!options.initOptions(argc, argv))
         {
@@ -167,7 +167,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     }
 
     RegistryTypeManager typeMgr;
-
+    
     if (!typeMgr.init(options.getInputFiles(), options.getExtraInputFiles()))
     {
         fprintf(stderr, "%s : init registries failed, check your registry files.\n", options.getProgramName().getStr());
@@ -180,7 +180,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     }
 
     codemaker::GeneratedTypeSet generated;
-    try
+    try 
     {
         if (options.isValid("-T"))
         {
@@ -203,7 +203,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
                     } else
                     {
                         tmpName = typeName.copy(0, typeName.lastIndexOf('.')).replace('.', '/');
-                        if (tmpName.getLength() == 0)
+                        if (tmpName.getLength() == 0) 
                             tmpName = "/";
                         else
                             tmpName.replace('.', '/');
@@ -233,8 +233,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     }
     catch( CannotDumpException& e)
     {
-        fprintf(stderr, "%s ERROR: %s\n",
-                options.getProgramName().getStr(),
+        fprintf(stderr, "%s ERROR: %s\n", 
+                options.getProgramName().getStr(), 
                 e.m_message.getStr());
         exit(99);
     }
diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx
index f1ec221b89e5..302a7ea3f3af 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_codemaker.hxx"
-#include <stdio.h>
+#include <stdio.h> 
 #include <string.h>
 
 #include "cppuoptions.hxx"
@@ -37,16 +37,16 @@
 
 using namespace rtl;
 
-sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
+sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) 
     throw( IllegalArgument )
 {
-    sal_Bool    ret = sal_True;
-    sal_uInt16  i=0;
+    sal_Bool 	ret = sal_True;
+    sal_uInt16	i=0;
 
     if (!bCmdFile)
     {
         bCmdFile = sal_True;
-
+        
         m_program = av[0];
 
         if (ac < 2)
@@ -61,7 +61,7 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
         i = 0;
     }
 
-    char    *s=NULL;
+    char	*s=NULL;
     for( ; i < ac; i++)
     {
         if (av[i][0] == '-')
@@ -82,14 +82,14 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     m_options["-O"] = OString(s);
                     break;
                 case 'B':
@@ -106,14 +106,14 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     m_options["-B"] = OString(s);
                     break;
                 case 'T':
@@ -130,14 +130,14 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     if (m_options.count("-T") > 0)
                     {
                         OString tmp(m_options["-T"]);
@@ -159,7 +159,7 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
 
                         throw IllegalArgument(tmp);
                     }
-
+                    
                     if (isValid("-C") || isValid("-CS"))
                     {
                         OString tmp("'-L' could not be combined with '-C' or '-CS' option");
@@ -199,7 +199,7 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
 
                         throw IllegalArgument(tmp);
                     }
-
+                    
                     if (isValid("-L") || isValid("-CS"))
                     {
                         OString tmp("'-C' could not be combined with '-L' or '-CS' option");
@@ -234,9 +234,9 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
 
                         throw IllegalArgument(tmp);
                     }
-
+                    
                     m_options["-G"] = OString("");
-                    break;
+                    break;                    
                 case 'X': // support for eXtra type rdbs
                 {
                     if (av[i][2] == '\0')
@@ -252,18 +252,18 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     m_extra_input_files.push_back( s );
                     break;
                 }
-
+                
                 default:
                     throw IllegalArgument("the option is unknown" + OString(av[i]));
             }
@@ -288,14 +288,14 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                         rargc++;
                     }
                     fclose(cmdFile);
-
+                    
                     ret = initOptions(rargc, rargv, bCmdFile);
-
-                    for (long j=0; j < rargc; j++)
+                    
+                    for (long j=0; j < rargc; j++) 
                     {
                         free(rargv[j]);
                     }
-                }
+                }		
             } else
             {
                 if (bCmdFile)
@@ -311,14 +311,14 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                     }
                     m_inputFiles.push_back(OUStringToOString(system_filepath, osl_getThreadTextEncoding()));
                 }
-            }
+            }		
         }
     }
+    
+    return ret;	
+}	
 
-    return ret;
-}
-
-OString CppuOptions::prepareHelp()
+OString	CppuOptions::prepareHelp()
 {
     OString help("\nusing: ");
     help += m_program + " [-options] file_1 ... file_n\nOptions:\n";
@@ -327,7 +327,7 @@ OString CppuOptions::prepareHelp()
     help += "    -T<name>   = name specifies a type or a list of types. The output for this\n";
     help += "      [t1;...]   type is generated. If no '-T' option is specified,\n";
     help += "                 then output for all types is generated.\n";
-    help += "                 Example: 'com.sun.star.uno.XInterface' is a valid type.\n";
+    help += "                 Example: 'com.sun.star.uno.XInterface' is a valid type.\n";		
     help += "    -B<name>   = name specifies the base node. All types are searched under this\n";
     help += "                 node. Default is the root '/' of the registry files.\n";
     help += "    -L         = UNO type functions are generated lightweight, that means only\n";
@@ -341,18 +341,18 @@ OString CppuOptions::prepareHelp()
     help += "    -Gc        = generate only target files which content will be changed.\n";
     help += "    -X<file>   = extra types which will not be taken into account for generation.\n";
     help += prepareVersion();
-
+    
     return help;
-}
+}	
 
-OString CppuOptions::prepareVersion()
+OString	CppuOptions::prepareVersion()
 {
     OString version("\nSun Microsystems (R) ");
     version += m_program + " Version 2.0\n\n";
 
     return version;
-}
-
+}	
 
+    
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/cppumaker/cppuoptions.hxx b/codemaker/source/cppumaker/cppuoptions.hxx
index 567372e91c5d..94ca9ee0af2a 100644
--- a/codemaker/source/cppumaker/cppuoptions.hxx
+++ b/codemaker/source/cppumaker/cppuoptions.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,16 +39,16 @@ public:
 
     ~CppuOptions() {}
 
-    sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
+    sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) 
             throw( IllegalArgument );
 
-    ::rtl::OString  prepareHelp();
-
-    ::rtl::OString  prepareVersion();
+    ::rtl::OString	prepareHelp();
 
+    ::rtl::OString	prepareVersion();
+    
 protected:
 };
-
+    
 #endif // INCLUDED_CODEMAKER_SOURCE_CPPUMAKER_CPPUOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 22e1c6b01729..20359b0063ef 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -74,7 +74,7 @@ rtl::OString translateSimpleUnoType(rtl::OString const & unoType, bool cppuUnoTy
         else
             return "::cppu::UnoUnsignedShortType";
     }
-
+    
     return trans[sort];
 }
 
@@ -246,7 +246,7 @@ sal_Bool CppuType::dumpFile(CppuOptions* pOptions,
         sTmpExt = ".tmp";
         bHdl = sal_False;
     }
-
+    
     OString sFileName = createFileNameFromType(sOutPath, sName, sExtension);
     if (sFileName.getLength() == 0)
         return sal_False;
@@ -264,7 +264,7 @@ sal_Bool CppuType::dumpFile(CppuOptions* pOptions,
     FileStream oFile;
     oFile.createTempFile(sTmpDir);
     OString sTmpFileName;
-
+    
     if(!oFile.isValid())
     {
         OString message("cannot open ");
@@ -274,13 +274,13 @@ sal_Bool CppuType::dumpFile(CppuOptions* pOptions,
         sTmpFileName = oFile.getName();
 
     codemaker::cppumaker::Includes includes(m_typeMgr, m_dependencies, !bHdl);
-    if (bHdl)
+    if (bHdl) 
         ret = dumpHFile(oFile, includes);
     else {
         addGetCppuTypeIncludes(includes);
         ret = dumpHxxFile(oFile, includes);
     }
-
+        
     oFile.close();
 
     if (ret) {
@@ -289,7 +289,7 @@ sal_Bool CppuType::dumpFile(CppuOptions* pOptions,
         // remove existing type file if something goes wrong to ensure consistency
         if (fileExists(sFileName))
             removeTypeFile(sFileName);
-
+            
         // remove tmp file if something goes wrong
         removeTypeFile(sTmpFileName);
     }
@@ -509,27 +509,27 @@ void CppuType::dumpNormalGetCppuType(FileStream& o)
             o << " >::get();\n\n";
         }
     }
-
+    
     sal_uInt32 count = getMemberCount();
     if (count)
     {
         o << indent() << "typelib_TypeDescriptionReference * aMemberRefs[" << count << "];\n";
-
+        
         sal_uInt16      fieldCount = m_reader.getFieldCount();
         RTFieldAccess   access = RT_ACCESS_INVALID;
         OString         fieldType, fieldName;
         OString         scope = m_typeName.replace('/', '.');
         OString         modFieldType;
         StringSet       generatedTypeSet;
-        StringSet::iterator findIter;
+        StringSet::iterator	findIter;
 
         for (sal_uInt16 i=0; i < fieldCount; i++)
         {
             access = m_reader.getFieldFlags(i);
-
+            
             if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
                 continue;
-
+            
             fieldName = rtl::OUStringToOString(
                 m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
             fieldType = checkRealBaseType(
@@ -571,7 +571,7 @@ void CppuType::dumpNormalGetCppuType(FileStream& o)
     {
         o << "0, " << count << ", ";
     }
-
+    
     if (count)
     {
         o << " aMemberRefs );\n";
@@ -699,8 +699,8 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream& o)
 
 void CppuType::dumpCppuGetTypeMemberDecl(FileStream& o, CppuTypeDecl eDeclFlag)
 {
-    sal_uInt16      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
+    sal_uInt16 		fieldCount = m_reader.getFieldCount();
+    RTFieldAccess 	access = RT_ACCESS_INVALID;
 
     StringSet aFinishedTypes;
     for (sal_uInt16 i=0; i < fieldCount; i++)
@@ -798,10 +798,10 @@ sal_uInt32 CppuType::getInheritedMemberCount()
     return m_inheritedMemberCount;
 }
 
-OString CppuType::getTypeClass(const OString& type, sal_Bool bCStyle)
+OString	CppuType::getTypeClass(const OString& type, sal_Bool bCStyle)
 {
-    OString     typeName = (type.getLength() > 0 ? type : m_typeName);
-    RTTypeClass rtTypeClass = RT_TYPE_INVALID;
+    OString 	typeName = (type.getLength() > 0 ? type : m_typeName);
+    RTTypeClass	rtTypeClass = RT_TYPE_INVALID;
 
     if (type.getLength() > 0)
     {
@@ -978,15 +978,15 @@ void CppuType::dumpCppuGetType(FileStream& o, const OString& type, sal_Bool bDec
                 m_typeMgr.getTypeClass(relType) == RT_TYPE_INTERFACE)
                 return;
 
-//          if (m_typeMgr.getTypeClass(type) == RT_TYPE_TYPEDEF)
-//          {
-//              o << indent() << "get_" << type.replace('/', '_') << "_Type()";
-//          } else
-//          {
+//			if (m_typeMgr.getTypeClass(type) == RT_TYPE_TYPEDEF)
+//			{
+//				o << indent() << "get_" << type.replace('/', '_') << "_Type()";
+//			} else
+//			{
                 o << indent() << "::cppu::UnoType< ";
                 dumpType(o, type, false, false, false, true);
                 o << " >::get()";
-//          }
+//			}
         }
         if (bDecl)
             o << ";\n";
@@ -1039,13 +1039,13 @@ bool CppuType::passByReference(rtl::OString const & unoType) {
     }
 }
 
-OString CppuType::resolveTypedefs(const OString& type) const
+OString	CppuType::resolveTypedefs(const OString& type) const
 {
     OString baseType(type);
 
-    RegistryKey     key;
-    RTTypeClass     typeClass;
-    sal_Bool        isTypeDef = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF);
+    RegistryKey 	key;
+    RTTypeClass 	typeClass;
+    sal_Bool 		isTypeDef = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF);
     typereg::Reader reader;
 
     while (isTypeDef)
@@ -1070,14 +1070,14 @@ OString CppuType::resolveTypedefs(const OString& type) const
     return baseType;
 }
 
-OString CppuType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly) const
+OString	CppuType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly) const
 {
     sal_Int32 rank;
     rtl::OString baseType(codemaker::UnoType::decompose(type, &rank));
 
-    RegistryKey     key;
-    RTTypeClass     typeClass;
-    sal_Bool        mustBeChecked = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF);
+    RegistryKey 	key;
+    RTTypeClass 	typeClass;
+    sal_Bool 		mustBeChecked = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF);
     typereg::Reader reader;
 
     while (mustBeChecked)
@@ -1282,8 +1282,8 @@ sal_Bool InterfaceType::dumpDeclaration(FileStream& o)
 {
 //     rtl::OString cppName(translateUnoToCppIdentifier(
 //                              m_name, "interface", ITM_KEYWORDSONLY, &m_name));
-
-//  o << "\nclass SAL_NO_VTABLE " << cppName;
+    
+// 	o << "\nclass SAL_NO_VTABLE " << cppName;
     o << "\nclass SAL_NO_VTABLE " << m_name;
 
     for (sal_Int16 i = 0; i < m_reader.getSuperTypeCount(); ++i) {
@@ -1324,7 +1324,7 @@ sal_Bool InterfaceType::dumpHxxFile(
 
 //     rtl::OString cppName(translateUnoToCppIdentifier(
 //                              m_name, "interface", ITM_KEYWORDSONLY, &m_name));
-
+    
     o << "\n::com::sun::star::uno::Type const & "
       << scopedCppName(m_typeName)
       << "::static_type(void *) {\n";
@@ -1391,7 +1391,7 @@ void InterfaceType::dumpMethods(FileStream& o)
     OString methodName, returnType, paramType, paramName;
     sal_uInt16 paramCount = 0;
     RTMethodMode methodMode = RT_MODE_INVALID;
-    RTParamMode  paramMode = RT_PARAM_INVALID;
+    RTParamMode	 paramMode = RT_PARAM_INVALID;
 
     sal_Bool bRef = sal_False;
     sal_Bool bConst = sal_False;
@@ -1428,9 +1428,9 @@ void InterfaceType::dumpMethods(FileStream& o)
         o << " SAL_CALL " << methodName << "( ";
         for (sal_uInt16 j=0; j < paramCount; j++)
         {
-            paramName = rtl::OUStringToOString(
+            paramName =	rtl::OUStringToOString(
                 m_reader.getMethodParameterName(i, j), RTL_TEXTENCODING_UTF8);
-            paramType = rtl::OUStringToOString(
+            paramType =	rtl::OUStringToOString(
                 m_reader.getMethodParameterTypeName(i, j),
                 RTL_TEXTENCODING_UTF8);
             paramMode = m_reader.getMethodParameterFlags(i, j);
@@ -1451,7 +1451,7 @@ void InterfaceType::dumpMethods(FileStream& o)
             }
 
             dumpType(o, paramType, bConst, bRef);
-//          o << " " << translateUnoToCppIdentifier(
+// 			o << " " << translateUnoToCppIdentifier(
 //                 paramName, "param", ITM_KEYWORDSONLY, NULL);
             o << " " << paramName;
 
@@ -1469,7 +1469,7 @@ void InterfaceType::dumpNormalGetCppuType(FileStream& o)
 
     o << indent()
       << "static typelib_TypeDescriptionReference * the_type = 0;\n";
-
+    
     o << indent() << "if ( !the_type )\n" << indent() << "{\n";
     inc();
     sal_Int16 nBases = m_reader.getSuperTypeCount();
@@ -1496,7 +1496,7 @@ void InterfaceType::dumpNormalGetCppuType(FileStream& o)
 
     o << indent() << "typelib_static_mi_interface_type_init( &the_type, \""
       << m_typeName.replace('/', '.') << "\", " << nBases << ", ";
-
+    
     if ( nBases > 0 )
     {
         o << "aSuperTypes );\n";
@@ -1633,7 +1633,7 @@ void InterfaceType::dumpCppuAttributeRefs(FileStream& o, sal_uInt32& index)
 
     RTFieldAccess access = RT_ACCESS_INVALID;
     OString fieldName;
-    OString scope = m_typeName.replace('/', '.');
+    OString	scope = m_typeName.replace('/', '.');
 
     for (sal_uInt16 i=0; i < fieldCount; i++)
     {
@@ -1659,9 +1659,9 @@ void InterfaceType::dumpCppuAttributeRefs(FileStream& o, sal_uInt32& index)
 
 void InterfaceType::dumpCppuMethodRefs(FileStream& o, sal_uInt32& index)
 {
-    sal_uInt16  methodCount = m_reader.getMethodCount();
-    OString     methodName;
-    OString     scope = m_typeName.replace('/', '.');
+    sal_uInt16 	methodCount = m_reader.getMethodCount();
+    OString    	methodName;
+    OString	   	scope = m_typeName.replace('/', '.');
 
     for (sal_uInt16 i = 0; i < methodCount; i++)
     {
@@ -1793,23 +1793,23 @@ sal_uInt32 InterfaceType::getInheritedMemberCount()
 {
     if (m_inheritedMemberCount == 0)
     {
-        m_inheritedMemberCount = checkInheritedMemberCount(0);
+        m_inheritedMemberCount = checkInheritedMemberCount(0);	
     }
-
+    
     return m_inheritedMemberCount;
-}
+}	
 
 void InterfaceType::dumpCppuAttributes(FileStream& o, sal_uInt32& index)
 {
     sal_uInt16 fieldCount = m_reader.getFieldCount();
-
+        
     RTFieldAccess access = RT_ACCESS_INVALID;
     OString fieldName;
-    OString fieldType;
-    OString scope = m_typeName.replace('/', '.');
+    OString fieldType;	
+    OString	scope = m_typeName.replace('/', '.');
 
     sal_uInt32 absoluteIndex = index;
-
+    
     if (m_hasAttributes)
     {
         o << "\n" << indent() << "typelib_InterfaceAttributeTypeDescription * pAttribute = 0;\n";
@@ -1817,7 +1817,7 @@ void InterfaceType::dumpCppuAttributes(FileStream& o, sal_uInt32& index)
         for (sal_uInt16 i=0; i < fieldCount; i++)
         {
             access = m_reader.getFieldFlags(i);
-
+            
             if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
                 continue;
 
@@ -1830,7 +1830,7 @@ void InterfaceType::dumpCppuAttributes(FileStream& o, sal_uInt32& index)
 
             o << indent() << "{\n";
             inc();
-            o << indent() << "::rtl::OUString sAttributeType" << i << "( RTL_CONSTASCII_USTRINGPARAM(\""
+            o << indent() << "::rtl::OUString sAttributeType" << i << "( RTL_CONSTASCII_USTRINGPARAM(\"" 
               << fieldType.replace('/', '.') << "\") );\n";
             sal_Int32 getExceptions = dumpAttributeExceptionTypeNames(
                 o, "get", name, RT_MODE_ATTRIBUTE_GET);
@@ -1841,7 +1841,7 @@ void InterfaceType::dumpCppuAttributes(FileStream& o, sal_uInt32& index)
                   " &pAttribute,\n");
             inc();
             o << indent() << absoluteIndex++ << ", sAttributeName" << i << ".pData,\n";
-            o << indent() << "(typelib_TypeClass)" << getTypeClass(fieldType)
+            o << indent() << "(typelib_TypeClass)" << getTypeClass(fieldType) 
               << ", sAttributeType" << i << ".pData,\n";
             o << indent() << "sal_"
               << ((access & RT_ACCESS_READONLY) == 0 ? "False" : "True") << ", "
@@ -1853,21 +1853,21 @@ void InterfaceType::dumpCppuAttributes(FileStream& o, sal_uInt32& index)
             o << indent() << "typelib_typedescription_register( (typelib_TypeDescription**)&pAttribute );\n";
             dec();
             o << indent() << "}\n";
-        }
+        }		
          o << indent() << "typelib_typedescription_release( (typelib_TypeDescription*)pAttribute );\n";
 
         index = absoluteIndex;
     }
-}
+}	
 
 void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index)
 {
-    sal_uInt16      methodCount = m_reader.getMethodCount();
-    OString         methodName, returnType, paramType, paramName;
-    sal_uInt16      paramCount = 0;
-    RTMethodMode    methodMode = RT_MODE_INVALID;
-    RTParamMode     paramMode = RT_PARAM_INVALID;
-    sal_Bool        bWithRuntimeException = sal_True;
+    sal_uInt16 		methodCount = m_reader.getMethodCount();
+    OString 		methodName, returnType, paramType, paramName;	
+    sal_uInt16 		paramCount = 0;
+    RTMethodMode 	methodMode = RT_MODE_INVALID;
+    RTParamMode	 	paramMode = RT_PARAM_INVALID;
+    sal_Bool 		bWithRuntimeException = sal_True;
 
     sal_uInt32 absoluteIndex = index;
 
@@ -1894,36 +1894,36 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index)
 
             if ( methodName.equals("acquire") || methodName.equals("release") )
             {
-                bWithRuntimeException = sal_False;
+                bWithRuntimeException = sal_False;	
             }
 
             o << indent() << "{\n";
             inc();
-
+            
             if (paramCount)
             {
-                o << indent() << "typelib_Parameter_Init aParameters[" << paramCount << "];\n";
+                o << indent() << "typelib_Parameter_Init aParameters[" << paramCount << "];\n";				
             }
 
             sal_uInt16 j;
             for (j=0; j < paramCount; j++)
             {
-                paramName = rtl::OUStringToOString(
+                paramName =	rtl::OUStringToOString(
                     m_reader.getMethodParameterName(i, j),
                     RTL_TEXTENCODING_UTF8);
-                paramType = checkRealBaseType(
+                paramType =	checkRealBaseType(
                     rtl::OUStringToOString(
                         m_reader.getMethodParameterTypeName(i, j),
                         RTL_TEXTENCODING_UTF8),
                     sal_True);
                 paramMode = m_reader.getMethodParameterFlags(i, j);
-
-                o << indent() << "::rtl::OUString sParamName" << j << "( RTL_CONSTASCII_USTRINGPARAM(\""
+                
+                o << indent() << "::rtl::OUString sParamName" << j << "( RTL_CONSTASCII_USTRINGPARAM(\"" 
                   << paramName << "\") );\n";
-                o << indent() << "::rtl::OUString sParamType" << j << "( RTL_CONSTASCII_USTRINGPARAM(\""
+                o << indent() << "::rtl::OUString sParamType" << j << "( RTL_CONSTASCII_USTRINGPARAM(\"" 
                   << paramType.replace('/', '.') << "\") );\n";
                 o << indent() << "aParameters[" << j << "].pParamName = sParamName" << j << ".pData;\n";
-                o << indent() << "aParameters[" << j << "].eTypeClass = (typelib_TypeClass)"
+                o << indent() << "aParameters[" << j << "].eTypeClass = (typelib_TypeClass)" 
                   << getTypeClass(paramType) << ";\n";
                 o << indent() << "aParameters[" << j << "].pTypeName = sParamType" << j << ".pData;\n";
 
@@ -1940,49 +1940,49 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index)
 
             sal_Int32 excCount = dumpExceptionTypeNames(
                 o, "", i, bWithRuntimeException);
-
-            o << indent() << "::rtl::OUString sReturnType" << i << "( RTL_CONSTASCII_USTRINGPARAM(\""
+            
+            o << indent() << "::rtl::OUString sReturnType" << i << "( RTL_CONSTASCII_USTRINGPARAM(\"" 
               << returnType.replace('/', '.') << "\") );\n";
             o << indent() << "typelib_typedescription_newInterfaceMethod( &pMethod,\n";
             inc();
             o << indent() << absoluteIndex++ << ", ";
             if (methodMode == RT_MODE_ONEWAY || methodMode == RT_MODE_ONEWAY_CONST)
                 o << "sal_True,\n";
-            else
+            else				
                 o << "sal_False,\n";
             o << indent() << "sMethodName" << i << ".pData,\n";
-            o << indent() << "(typelib_TypeClass)" << getTypeClass(returnType)
+            o << indent() << "(typelib_TypeClass)" << getTypeClass(returnType) 
               << ", sReturnType" << i << ".pData,\n";
             if (paramCount)
-                o << indent() << paramCount << ", aParameters,\n";
-            else
-                o << indent() << "0, 0,\n";
+                o << indent() << paramCount << ", aParameters,\n"; 
+            else								
+                o << indent() << "0, 0,\n"; 
             o << indent() << excCount << ", "
-              << (excCount == 0 ? "0" : "the_Exceptions") << " );\n";
+              << (excCount == 0 ? "0" : "the_Exceptions") << " );\n"; 
 
             dec();
             o << indent() << "typelib_typedescription_register( (typelib_TypeDescription**)&pMethod );\n";
 
-            dec();
+            dec();			
             o << indent() << "}\n";
-        }
+        }		
         o << indent() << "typelib_typedescription_release( (typelib_TypeDescription*)pMethod );\n";
 
-        index = absoluteIndex;
+        index = absoluteIndex;	
     }
-}
+}	
 
 void InterfaceType::dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTypes, CppuTypeDecl eDeclFlag)
 {
     sal_uInt16 fieldCount = m_reader.getFieldCount();
-
+        
     RTFieldAccess access = RT_ACCESS_INVALID;
     OString fieldName;
-    OString fieldType;
+    OString fieldType;	
     for (sal_uInt16 i=0; i < fieldCount; i++)
     {
         access = m_reader.getFieldFlags(i);
-
+        
         if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
             continue;
 
@@ -1990,21 +1990,21 @@ void InterfaceType::dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTy
             m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
         fieldType = rtl::OUStringToOString(
             m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8);
-
-        if (pFinishedTypes->count(fieldType) == 0)
+    
+        if (pFinishedTypes->count(fieldType) == 0) 
         {
             pFinishedTypes->insert(fieldType);
-            dumpCppuGetType(o, fieldType, sal_True, eDeclFlag);
+            dumpCppuGetType(o, fieldType, sal_True, eDeclFlag);	
         }
-    }
-}
+    }		
+}	
 
 void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes, CppuTypeDecl eDeclFlag)
 {
-    sal_uInt16      methodCount = m_reader.getMethodCount();
-    OString         returnType, paramType, excType;
-    sal_uInt16      paramCount = 0;
-    sal_uInt16      excCount = 0;
+    sal_uInt16 		methodCount = m_reader.getMethodCount();
+    OString 		returnType, paramType, excType;	
+    sal_uInt16 		paramCount = 0;
+    sal_uInt16 		excCount = 0;
 
     for (sal_uInt16 i=0; i < methodCount; i++)
     {
@@ -2012,20 +2012,20 @@ void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes
             m_reader.getMethodReturnTypeName(i), RTL_TEXTENCODING_UTF8);
         paramCount = m_reader.getMethodParameterCount(i);
         excCount = m_reader.getMethodExceptionCount(i);
-
-        if (pFinishedTypes->count(returnType) == 0)
+    
+        if (pFinishedTypes->count(returnType) == 0) 
         {
             pFinishedTypes->insert(returnType);
-            dumpCppuGetType(o, returnType, sal_True, eDeclFlag);
+            dumpCppuGetType(o, returnType, sal_True, eDeclFlag);	
         }
         sal_uInt16 j;
         for (j=0; j < paramCount; j++)
         {
-            paramType = rtl::OUStringToOString(
+            paramType =	rtl::OUStringToOString(
                 m_reader.getMethodParameterTypeName(i, j),
                 RTL_TEXTENCODING_UTF8);
 
-            if (pFinishedTypes->count(paramType) == 0)
+            if (pFinishedTypes->count(paramType) == 0) 
             {
                 pFinishedTypes->insert(paramType);
                 dumpCppuGetType(o, paramType, sal_True, eDeclFlag);
@@ -2037,14 +2037,14 @@ void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes
             excType = rtl::OUStringToOString(
                 m_reader.getMethodExceptionTypeName(i, j),
                 RTL_TEXTENCODING_UTF8);
-            if (pFinishedTypes->count(excType) == 0)
+            if (pFinishedTypes->count(excType) == 0) 
             {
                 pFinishedTypes->insert(excType);
                 dumpCppuGetType(o, excType, sal_True, eDeclFlag);
             }
         }
-    }
-}
+    }		
+}	
 
 void InterfaceType::dumpExceptionSpecification(
     FileStream & out, sal_uInt32 methodIndex, bool runtimeException)
@@ -2164,8 +2164,8 @@ ConstantsType::ConstantsType(typereg::Reader& typeReader,
 
 ConstantsType::~ConstantsType()
 {
-
-}
+    
+}	
 
 sal_Bool ConstantsType::dump(CppuOptions* pOptions)
     throw( CannotDumpException )
@@ -2177,11 +2177,11 @@ sal_Bool ConstantsType::dump(CppuOptions* pOptions)
 
     if (pOptions->isValid("-U"))
         m_cppuTypeDynamic = sal_True;
-
+    
     OString outPath;
     if (pOptions->isValid("-O"))
         outPath = pOptions->getOption("-O");
-
+    
     return dumpFiles(pOptions, outPath);
 }
 
@@ -2222,22 +2222,22 @@ sal_Bool ConstantsType::dumpHFile(
 sal_Bool ConstantsType::dumpDeclaration(FileStream& o)
     throw( CannotDumpException )
 {
-    sal_uInt16      fieldCount = m_reader.getFieldCount();
-    OString         fieldName;
-    OString         fieldType;
+    sal_uInt16 		fieldCount = m_reader.getFieldCount();
+    OString 		fieldName;
+    OString 		fieldType;	
     for (sal_uInt16 i=0; i < fieldCount; i++)
     {
         fieldName = rtl::OUStringToOString(
             m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
         fieldType = rtl::OUStringToOString(
             m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8);
-
+                
         o << "static const ";
-        dumpType(o, fieldType);
+        dumpType(o, fieldType);	
         o << " " << fieldName << " = ";
         dumpConstantValue(o, i);
         o << ";\n";
-    }
+    }		
 
     return sal_True;
 }
@@ -2245,7 +2245,7 @@ sal_Bool ConstantsType::dumpDeclaration(FileStream& o)
 sal_Bool ConstantsType::hasConstants()
 {
     return m_reader.getFieldCount() > 0;
-}
+}	
 
 sal_Bool ConstantsType::dumpHxxFile(
     FileStream& o, codemaker::cppumaker::Includes &)
@@ -2260,7 +2260,7 @@ sal_Bool ConstantsType::dumpHxxFile(
 
     OString headerDefine(dumpHeaderDefine(o, "HPP", bSpecialDefine));
     o << "\n";
-
+    
     rtl::OString suffix;
     if (bSpecialDefine) {
         suffix = m_name;
@@ -2284,8 +2284,8 @@ ModuleType::ModuleType(typereg::Reader& typeReader,
 
 ModuleType::~ModuleType()
 {
-
-}
+    
+}	
 
 bool ModuleType::dumpFiles(
     CppuOptions * options, rtl::OString const & outPath)
@@ -2324,8 +2324,8 @@ StructureType::StructureType(typereg::Reader& typeReader,
 
 StructureType::~StructureType()
 {
-
-}
+    
+}	
 
 sal_Bool StructureType::dumpHFile(
     FileStream& o, codemaker::cppumaker::Includes & includes)
@@ -2353,7 +2353,7 @@ sal_Bool StructureType::dumpHFile(
 
     dumpTemplateHead(o);
     o << "inline const ::com::sun::star::uno::Type& SAL_CALL getCppuType( ";
-    dumpType(o, m_typeName, sal_True, sal_False);
+    dumpType(o, m_typeName, sal_True, sal_False); 
     dumpTemplateParameters(o);
     o << "* );\n\n";
 
@@ -2366,7 +2366,7 @@ sal_Bool StructureType::dumpDeclaration(FileStream& o)
     throw( CannotDumpException )
 {
     o << "\n#ifdef SAL_W32\n"
-      << "#   pragma pack(push, 8)\n"
+      << "#   pragma pack(push, 8)\n"					   
       << "#elif defined(SAL_OS2)\n"
       << "#   pragma pack(8)\n"
       << "#endif\n\n";
@@ -2458,7 +2458,7 @@ sal_Bool StructureType::dumpHxxFile(
 {
     OString headerDefine(dumpHeaderDefine(o, "HPP"));
     o << "\n";
-
+    
     includes.dump(o, &m_typeName);
     o << "\n";
 
@@ -2483,16 +2483,16 @@ sal_Bool StructureType::dumpHxxFile(
         o << indent() << ": " << scopedCppName(superType) << "()\n";
         first = sal_False;
     }
-
-    sal_uInt16      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    OString         fieldName;
-    OString         fieldType;
+    
+    sal_uInt16 		fieldCount = m_reader.getFieldCount();
+    RTFieldAccess 	access = RT_ACCESS_INVALID;
+    OString 		fieldName;
+    OString 		fieldType;	
 
     for (sal_uInt16 i=0; i < fieldCount; i++)
     {
         access = m_reader.getFieldFlags(i);
-
+        
         if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
             continue;
 
@@ -2527,7 +2527,7 @@ sal_Bool StructureType::dumpHxxFile(
         for (sal_uInt16 i=0; i < fieldCount; i++)
         {
             access = m_reader.getFieldFlags(i);
-
+            
             if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
                 continue;
 
@@ -2535,21 +2535,21 @@ sal_Bool StructureType::dumpHxxFile(
                 m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
             fieldType = rtl::OUStringToOString(
                 m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8);
-
+        
             if (superHasMember)
                 o << ", ";
             else
                 superHasMember = sal_True;
-
+                
             if ((access & RT_ACCESS_PARAMETERIZED_TYPE) != 0) {
                 dumpTypeParameterName(o, fieldType);
                 o << " const &";
             } else {
                 dumpType(o, fieldType, sal_True, sal_True);
             }
-//          o << " __" << fieldName;
+//			o << " __" << fieldName;
             o << " " << fieldName << "_";
-        }
+        }		
         o << ") SAL_THROW( () )\n";
 
         inc();
@@ -2565,23 +2565,23 @@ sal_Bool StructureType::dumpHxxFile(
         for (sal_uInt16 i=0; i < fieldCount; i++)
         {
             access = m_reader.getFieldFlags(i);
-
+            
             if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
                 continue;
 
             fieldName = rtl::OUStringToOString(
                 m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
-
+        
             if (first)
             {
                 first = sal_False;
                 o << indent() << ": ";
             } else
                 o << indent() << ", ";
-
-//          o << fieldName << "(__" << fieldName << ")\n";
+                
+//			o << fieldName << "(__" << fieldName << ")\n";
             o << fieldName << "(" << fieldName << "_)\n";
-        }
+        }		
 
         dec();
         o << "{\n}\n\n";
@@ -2935,7 +2935,7 @@ sal_Bool StructureType::dumpSuperMember(FileStream& o, const OString& superType,
     if (superType.getLength() > 0)
     {
         typereg::Reader aSuperReader(m_typeMgr.getTypeReader(superType));
-
+        
         if (aSuperReader.isValid())
         {
             rtl::OString superSuper;
@@ -2945,14 +2945,14 @@ sal_Bool StructureType::dumpSuperMember(FileStream& o, const OString& superType,
             }
             hasMember = dumpSuperMember(o, superSuper, bWithType);
 
-            sal_uInt16      fieldCount = aSuperReader.getFieldCount();
-            RTFieldAccess   access = RT_ACCESS_INVALID;
-            OString         fieldName;
-            OString         fieldType;
+            sal_uInt16 		fieldCount = aSuperReader.getFieldCount();
+            RTFieldAccess 	access = RT_ACCESS_INVALID;
+            OString 		fieldName;
+            OString 		fieldType;	
             for (sal_uInt16 i=0; i < fieldCount; i++)
             {
                 access = aSuperReader.getFieldFlags(i);
-
+                
                 if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
                     continue;
 
@@ -2960,8 +2960,8 @@ sal_Bool StructureType::dumpSuperMember(FileStream& o, const OString& superType,
                     aSuperReader.getFieldName(i), RTL_TEXTENCODING_UTF8);
                 fieldType = rtl::OUStringToOString(
                     aSuperReader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8);
-
-                if (hasMember)
+            
+                if (hasMember) 
                 {
                     o << ", ";
                 } else
@@ -2971,17 +2971,17 @@ sal_Bool StructureType::dumpSuperMember(FileStream& o, const OString& superType,
 
                 if (bWithType)
                 {
-                    dumpType(o, fieldType, sal_True, sal_True);
+                    dumpType(o, fieldType, sal_True, sal_True);	
                     o << " ";
-                }
-//              o << "__" << fieldName;
+                }					
+//				o << "__" << fieldName;
                 o << fieldName << "_";
             }
         }
     }
-
+    
     return hasMember;
-}
+}	
 
 void StructureType::addLightGetCppuTypeIncludes(
     codemaker::cppumaker::Includes & includes) const
@@ -3086,8 +3086,8 @@ ExceptionType::ExceptionType(typereg::Reader& typeReader,
 
 ExceptionType::~ExceptionType()
 {
-
-}
+    
+}	
 
 sal_Bool ExceptionType::dumpHFile(
     FileStream& o, codemaker::cppumaker::Includes & includes)
@@ -3105,7 +3105,7 @@ sal_Bool ExceptionType::dumpHFile(
     }
 
     dumpDeclaration(o);
-
+    
     if (codemaker::cppumaker::dumpNamespaceClose(o, m_typeName, false)) {
         o << "\n";
     }
@@ -3114,7 +3114,7 @@ sal_Bool ExceptionType::dumpHFile(
       << "class Type;\n} } } }\n\n";
 
     o << "inline const ::com::sun::star::uno::Type& SAL_CALL getCppuType( ";
-    dumpType(o, m_typeName, sal_True, sal_False);
+    dumpType(o, m_typeName, sal_True, sal_False); 
     o << "* ) SAL_THROW( () );\n\n";
 
     o << "#endif // "<< headerDefine << "\n";
@@ -3134,31 +3134,31 @@ sal_Bool ExceptionType::dumpDeclaration(FileStream& o)
     }
     if (superType.getLength() > 0)
                     o << " : public " << scopedCppName(superType);
-
+        
     o << "\n{\npublic:\n";
     inc();
     o << indent() << "inline CPPU_GCC_DLLPRIVATE " << m_name
       << "() SAL_THROW( () );\n\n";
-
-    sal_uInt16      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    OString         fieldName;
-    OString         fieldType;
-    sal_uInt16      i = 0;
-
+        
+    sal_uInt16 		fieldCount = m_reader.getFieldCount();
+    RTFieldAccess 	access = RT_ACCESS_INVALID;
+    OString 		fieldName;
+    OString 		fieldType;	
+    sal_uInt16 		i = 0;
+        
     if (fieldCount > 0 || getInheritedMemberCount() > 0)
     {
         o << indent() << "inline CPPU_GCC_DLLPRIVATE " << m_name << "(";
-
+            
         sal_Bool superHasMember = dumpSuperMember(o, superType, sal_True);
-
+            
         for (i=0; i < fieldCount; i++)
         {
             access = m_reader.getFieldFlags(i);
-
+                
             if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
                             continue;
-
+                
             fieldName = rtl::OUStringToOString(
                 m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
             fieldType = rtl::OUStringToOString(
@@ -3169,10 +3169,10 @@ sal_Bool ExceptionType::dumpDeclaration(FileStream& o)
             else
                 superHasMember = sal_True;
 
-            dumpType(o, fieldType, sal_True, sal_True);
-//          o << " __" << fieldName;
+            dumpType(o, fieldType, sal_True, sal_True);	
+//			o << " __" << fieldName;
             o << " " << fieldName << "_";
-        }
+        }		
         o << ") SAL_THROW( () );\n\n";
     }
     o << indent() << "inline CPPU_GCC_DLLPRIVATE " << m_name << "(" << m_name
@@ -3194,7 +3194,7 @@ sal_Bool ExceptionType::dumpDeclaration(FileStream& o)
             m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8);
 
         o << indent();
-        dumpType(o, fieldType);
+        dumpType(o, fieldType);	
         o << " " << fieldName;
         if (i == 0 && superType.getLength() &&
             !fieldType.equals("double") && !fieldType.equals("hyper") && !fieldType.equals("unsigned hyper"))
@@ -3204,7 +3204,7 @@ sal_Bool ExceptionType::dumpDeclaration(FileStream& o)
         o << ";\n";
     }
 
-
+    
     dec();
     o << "};\n\n";
 
@@ -3217,11 +3217,11 @@ sal_Bool ExceptionType::dumpHxxFile(
 {
     OString headerDefine(dumpHeaderDefine(o, "HPP"));
     o << "\n";
-
+    
     addDefaultHxxIncludes(includes);
     includes.dump(o, &m_typeName);
     o << "\n";
-
+    
     if (codemaker::cppumaker::dumpNamespaceOpen(o, m_typeName, false)) {
         o << "\n";
     }
@@ -3240,16 +3240,16 @@ sal_Bool ExceptionType::dumpHxxFile(
         o << indent() << ": " << scopedCppName(superType) << "()\n";
         first = sal_False;
     }
-
-    sal_uInt16      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    OString         fieldName;
-    OString         fieldType;
+    
+    sal_uInt16 		fieldCount = m_reader.getFieldCount();
+    RTFieldAccess 	access = RT_ACCESS_INVALID;
+    OString 		fieldName;
+    OString 		fieldType;	
 
     for (sal_uInt16 i=0; i < fieldCount; i++)
     {
         access = m_reader.getFieldFlags(i);
-
+        
         if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
             continue;
 
@@ -3289,7 +3289,7 @@ sal_Bool ExceptionType::dumpHxxFile(
         for (sal_uInt16 i=0; i < fieldCount; i++)
         {
             access = m_reader.getFieldFlags(i);
-
+            
             if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
                 continue;
 
@@ -3297,16 +3297,16 @@ sal_Bool ExceptionType::dumpHxxFile(
                 m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
             fieldType = rtl::OUStringToOString(
                 m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8);
-
+        
             if (superHasMember)
                 o << ", ";
             else
                 superHasMember = sal_True;
-
-            dumpType(o, fieldType, sal_True, sal_True);
-//          o << " __" << fieldName;
+                
+            dumpType(o, fieldType, sal_True, sal_True);	
+//			o << " __" << fieldName;
             o << " " << fieldName << "_";
-        }
+        }		
         o << ") SAL_THROW( () )\n";
 
         inc();
@@ -3322,23 +3322,23 @@ sal_Bool ExceptionType::dumpHxxFile(
         for (sal_uInt16 i=0; i < fieldCount; i++)
         {
             access = m_reader.getFieldFlags(i);
-
+            
             if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
                 continue;
 
             fieldName = rtl::OUStringToOString(
                 m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
-
+        
             if (first)
             {
                 first = sal_False;
                 o << indent() << ": ";
             } else
                 o << indent() << ", ";
-
-//          o << fieldName << "(__" << fieldName << ")\n";
+                
+//			o << fieldName << "(__" << fieldName << ")\n";
             o << fieldName << "(" << fieldName << "_)\n";
-        }
+        }		
 
         dec();
         if ( !m_cppuTypeDynamic )
@@ -3407,7 +3407,7 @@ sal_Bool ExceptionType::dumpSuperMember(FileStream& o, const OString& superType,
     if (superType.getLength() > 0)
     {
         typereg::Reader aSuperReader(m_typeMgr.getTypeReader(superType));
-
+        
         if (aSuperReader.isValid())
         {
             rtl::OString superSuper;
@@ -3417,14 +3417,14 @@ sal_Bool ExceptionType::dumpSuperMember(FileStream& o, const OString& superType,
             }
             hasMember = dumpSuperMember(o, superSuper, bWithType);
 
-            sal_uInt16      fieldCount = aSuperReader.getFieldCount();
-            RTFieldAccess   access = RT_ACCESS_INVALID;
-            OString         fieldName;
-            OString         fieldType;
+            sal_uInt16 		fieldCount = aSuperReader.getFieldCount();
+            RTFieldAccess 	access = RT_ACCESS_INVALID;
+            OString 		fieldName;
+            OString 		fieldType;	
             for (sal_uInt16 i=0; i < fieldCount; i++)
             {
                 access = aSuperReader.getFieldFlags(i);
-
+                
                 if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
                     continue;
 
@@ -3432,8 +3432,8 @@ sal_Bool ExceptionType::dumpSuperMember(FileStream& o, const OString& superType,
                     aSuperReader.getFieldName(i), RTL_TEXTENCODING_UTF8);
                 fieldType = rtl::OUStringToOString(
                     aSuperReader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8);
-
-                if (hasMember)
+            
+                if (hasMember) 
                 {
                     o << ", ";
                 } else
@@ -3443,17 +3443,17 @@ sal_Bool ExceptionType::dumpSuperMember(FileStream& o, const OString& superType,
 
                 if (bWithType)
                 {
-                    dumpType(o, fieldType, sal_True, sal_True);
+                    dumpType(o, fieldType, sal_True, sal_True);	
                     o << " ";
-                }
-//              o << "__" << fieldName;
+                }					
+//				o << "__" << fieldName;
                 o << fieldName << "_";
             }
         }
     }
-
+    
     return hasMember;
-}
+}	
 
 //*************************************************************************
 // EnumType
@@ -3467,8 +3467,8 @@ EnumType::EnumType(typereg::Reader& typeReader,
 
 EnumType::~EnumType()
 {
-
-}
+    
+}	
 
 sal_Bool EnumType::dumpHFile(
     FileStream& o, codemaker::cppumaker::Includes & includes)
@@ -3495,7 +3495,7 @@ sal_Bool EnumType::dumpHFile(
       << "class Type;\n} } } }\n\n";
 
     o << "inline const ::com::sun::star::uno::Type& SAL_CALL getCppuType( ";
-    dumpType(o, m_typeName, sal_True, sal_False);
+    dumpType(o, m_typeName, sal_True, sal_False); 
     o << "* ) SAL_THROW( () );\n\n";
 
     o << "#endif // "<< headerDefine << "\n";
@@ -3509,11 +3509,11 @@ sal_Bool EnumType::dumpDeclaration(FileStream& o)
     o << "\nenum " << m_name << "\n{\n";
     inc();
 
-    sal_uInt16      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    RTConstValue    constValue;
-    OString         fieldName;
-    sal_Int32       value=0;
+    sal_uInt16 		fieldCount = m_reader.getFieldCount();
+    RTFieldAccess 	access = RT_ACCESS_INVALID;
+    RTConstValue	constValue;
+    OString 		fieldName;
+    sal_Int32		value=0;
     for (sal_uInt16 i=0; i < fieldCount; i++)
     {
         access = m_reader.getFieldFlags(i);
@@ -3524,17 +3524,17 @@ sal_Bool EnumType::dumpDeclaration(FileStream& o)
         fieldName = rtl::OUStringToOString(
             m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
         constValue = m_reader.getFieldValue(i);
-
+        
         if (constValue.m_type == RT_TYPE_INT32)
             value = constValue.m_value.aLong;
         else
             value++;
-
+        
         o << indent() << m_name << "_" << fieldName << " = " << value << ",\n";
-    }
-
+    }		
+    
     o << indent() << m_name << "_MAKE_FIXED_SIZE = SAL_MAX_ENUM\n";
-
+    
     dec();
     o << "};\n\n";
 
@@ -3547,7 +3547,7 @@ sal_Bool EnumType::dumpHxxFile(
 {
     OString headerDefine(dumpHeaderDefine(o, "HPP"));
     o << "\n";
-
+    
     addDefaultHxxIncludes(includes);
     includes.dump(o, &m_typeName);
     o << "\n";
@@ -3573,7 +3573,7 @@ void EnumType::dumpNormalGetCppuType(FileStream& o)
     o << indent() << "\"" << m_typeName.replace('/', '.') << "\",\n"
       << indent() << scopedCppName(m_typeName) << "_"
       << rtl::OUStringToOString(m_reader.getFieldName(0), RTL_TEXTENCODING_UTF8)
-      << " );\n";
+      << " );\n"; 
     dec(31);
     dec();
     o << indent() << "}\n";
@@ -3595,7 +3595,7 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o)
 
     o << indent() << "if (the_pType == 0)\n" << indent() << "{\n";
     inc();
-    o << indent() << "::rtl::OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM(\""
+    o << indent() << "::rtl::OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM(\"" 
       << m_typeName.replace('/', '.') << "\") );\n\n";
 
     o << indent() << "// Start inline typedescription generation\n"
@@ -3607,7 +3607,7 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o)
     for (i = 0; i < count; i++)
     {
         o << indent() << "::rtl::OUString sEnumValue" << i
-          << "( RTL_CONSTASCII_USTRINGPARAM(\""
+          << "( RTL_CONSTASCII_USTRINGPARAM(\"" 
           << rtl::OUStringToOString(
               m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8)
           << "\") );\n";
@@ -3648,7 +3648,7 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o)
     o << indent() << "static ::com::sun::star::uno::Type the_staticType( "
       << getTypeClass(m_typeName) << ", sTypeName );\n";
     o << indent() << "the_pType = &the_staticType;\n";
-
+ 
     dec();
     o << indent() << "}\n";
     dec();
@@ -3670,8 +3670,8 @@ TypeDefType::TypeDefType(typereg::Reader& typeReader,
 
 TypeDefType::~TypeDefType()
 {
-
-}
+    
+}	
 
 sal_Bool TypeDefType::dumpHFile(
     FileStream& o, codemaker::cppumaker::Includes & includes)
@@ -3694,10 +3694,10 @@ sal_Bool TypeDefType::dumpHFile(
         o << "\n";
     }
 
-//  o << "\nnamespace com { namespace sun { namespace star { namespace uno {\n"
-//    << "class Type;\n} } } }\n\n";
-//  o << "inline const ::com::sun::star::uno::Type& SAL_CALL get_" << m_typeName.replace('/', '_')
-//    <<  "_Type( ) SAL_THROW( () );\n\n";
+//	o << "\nnamespace com { namespace sun { namespace star { namespace uno {\n"
+//	  << "class Type;\n} } } }\n\n";
+//	o << "inline const ::com::sun::star::uno::Type& SAL_CALL get_" << m_typeName.replace('/', '_')
+//	  <<  "_Type( ) SAL_THROW( () );\n\n";
 
     o << "#endif // "<< headerDefine << "\n";
 
@@ -3723,11 +3723,11 @@ sal_Bool TypeDefType::dumpHxxFile(
 {
     OString headerDefine(dumpHeaderDefine(o, "HPP"));
     o << "\n";
-
+    
     addDefaultHxxIncludes(includes);
     includes.dump(o, &m_typeName);
     o << "\n";
-
+    
     o << "\n#endif // "<< headerDefine << "\n";
     return sal_True;
 }
@@ -4207,7 +4207,7 @@ sal_Bool SingletonType::dumpHxxFile(
 // produceType
 //*************************************************************************
 bool produceType(const OString& typeName,
-                 TypeManager const & typeMgr,
+                 TypeManager const & typeMgr, 
                  codemaker::GeneratedTypeSet & generated,
                  CppuOptions* pOptions)
     throw( CannotDumpException )
@@ -4217,7 +4217,7 @@ bool produceType(const OString& typeName,
     {
         return true;
     }
-
+    
     sal_Bool bIsExtraType = sal_False;
     typereg::Reader reader(typeMgr.getTypeReader(typeName, &bIsExtraType));
     if (bIsExtraType) {
@@ -4336,12 +4336,12 @@ bool produceType(const OString& typeName,
             OSL_ASSERT(false);
             break;
     }
-
+    
     return ret;
 }
 
 bool produceType(RegistryKey& rTypeKey, bool bIsExtraType,
-                     TypeManager const & typeMgr,
+                     TypeManager const & typeMgr, 
                      codemaker::GeneratedTypeSet & generated,
                      CppuOptions* pOptions)
     throw( CannotDumpException )
@@ -4353,7 +4353,7 @@ bool produceType(RegistryKey& rTypeKey, bool bIsExtraType,
     {
         return true;
     }
-
+    
     if (bIsExtraType) {
         generated.add(typeName);
         return true;
@@ -4471,7 +4471,7 @@ bool produceType(RegistryKey& rTypeKey, bool bIsExtraType,
             OSL_ASSERT(false);
             break;
     }
-
+    
     return ret;
 }
 
@@ -4497,11 +4497,11 @@ OString scopedName(const OString& scope, const OString& type,
                               token, "module", ITM_KEYWORDSONLY));
         else
             tmpBuf.append(translateUnoToCppIndentifier(
-                              token, "interface", ITM_KEYWORDSONLY));
+                              token, "interface", ITM_KEYWORDSONLY));            
     } while( nPos != -1 );
-
+    
     return tmpBuf.makeStringAndClear();
-}
+}	
 */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/cppumaker/cpputype.hxx b/codemaker/source/cppumaker/cpputype.hxx
index 2823e9c30159..9932bf70aad4 100644
--- a/codemaker/source/cppumaker/cpputype.hxx
+++ b/codemaker/source/cppumaker/cpputype.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,7 +49,7 @@ enum CppuTypeDecl
     CPPUTYPEDECL_ALLTYPES,
     CPPUTYPEDECL_NOINTERFACES,
     CPPUTYPEDECL_ONLYINTERFACES
-};
+};	
 
 class CppuOptions;
 class FileStream;
@@ -68,7 +68,7 @@ public:
                       const ::rtl::OString& sExtension,
                       const ::rtl::OString& sName,
                       const ::rtl::OString& sOutPath )
-        throw( CannotDumpException );
+        throw( CannotDumpException );   
     void dumpDependedTypes(
         codemaker::GeneratedTypeSet & generated, CppuOptions * options);
     virtual sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ) = 0;
@@ -85,28 +85,28 @@ public:
     virtual void dumpType(FileStream& o, const ::rtl::OString& type, bool bConst=false,
                           bool bRef=false, bool bNative=false, bool cppuUnoType=false)
         const throw( CannotDumpException );
-    ::rtl::OString  getTypeClass(const ::rtl::OString& type="", sal_Bool bCStyle=sal_False);
-    void    dumpCppuGetType(FileStream& o, const ::rtl::OString& type, sal_Bool bDecl=sal_False, CppuTypeDecl eDeclFlag=CPPUTYPEDECL_ALLTYPES);
+    ::rtl::OString	getTypeClass(const ::rtl::OString& type="", sal_Bool bCStyle=sal_False);
+    void	dumpCppuGetType(FileStream& o, const ::rtl::OString& type, sal_Bool bDecl=sal_False, CppuTypeDecl eDeclFlag=CPPUTYPEDECL_ALLTYPES);
 
     ::rtl::OString typeToIdentifier(const ::rtl::OString& type);
 
-    void    dumpConstantValue(FileStream& o, sal_uInt16 index);
+    void 	dumpConstantValue(FileStream& o, sal_uInt16 index);
 
     virtual sal_uInt32  getMemberCount();
-    virtual sal_uInt32  getInheritedMemberCount();
+    virtual sal_uInt32	getInheritedMemberCount();
 
-    void            inc(sal_Int32 num=4);
-    void            dec(sal_Int32 num=4);
-    ::rtl::OString  indent() const;
+    void 			inc(sal_Int32 num=4);
+    void 			dec(sal_Int32 num=4);
+    ::rtl::OString 	indent() const;
 protected:
     virtual sal_uInt32 checkInheritedMemberCount(
         const typereg::Reader* pReader);
 
     bool passByReference(rtl::OString const & unoType);
 
-    ::rtl::OString  resolveTypedefs(const ::rtl::OString& type) const;
-    ::rtl::OString  checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False) const;
-    void    dumpCppuGetTypeMemberDecl(FileStream& o, CppuTypeDecl eDeclFlag);
+    ::rtl::OString	resolveTypedefs(const ::rtl::OString& type) const;
+    ::rtl::OString	checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False) const;
+    void	dumpCppuGetTypeMemberDecl(FileStream& o, CppuTypeDecl eDeclFlag);
 
     codemaker::cpp::IdentifierTranslationMode isGlobal() const;
 
@@ -140,13 +140,13 @@ protected:
         FileStream & out, bool parameterized, rtl::OUString const & type) const;
 
 protected:
-    sal_uInt32          m_inheritedMemberCount;
+    sal_uInt32 			m_inheritedMemberCount;
 
-    sal_Bool            m_cppuTypeLeak;
-    sal_Bool            m_cppuTypeDynamic;
-    sal_Int32           m_indentLength;
-    ::rtl::OString      m_typeName;
-    ::rtl::OString      m_name;
+    sal_Bool			m_cppuTypeLeak;
+    sal_Bool			m_cppuTypeDynamic;
+    sal_Int32			m_indentLength;
+    ::rtl::OString		m_typeName;
+    ::rtl::OString		m_name;
     typereg::Reader     m_reader;
     TypeManager const & m_typeMgr;
     codemaker::Dependencies m_dependencies;
@@ -165,23 +165,23 @@ public:
 
     virtual ~InterfaceType();
 
-    sal_Bool    dumpDeclaration(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
-    sal_Bool    dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
+    sal_Bool	dumpDeclaration(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
+    sal_Bool	dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
 
-    void        dumpAttributes(FileStream& o);
-    void        dumpMethods(FileStream& o);
-    void        dumpNormalGetCppuType(FileStream& o);
-    void        dumpComprehensiveGetCppuType(FileStream& o);
-    void        dumpCppuAttributeRefs(FileStream& o, sal_uInt32& index);
-    void        dumpCppuMethodRefs(FileStream& o, sal_uInt32& index);
-    void        dumpCppuAttributes(FileStream& o, sal_uInt32& index);
-    void        dumpCppuMethods(FileStream& o, sal_uInt32& index);
-    void        dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTypes, CppuTypeDecl eDeclFlag);
-    void        dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes, CppuTypeDecl eDeclFlag );
+    void		dumpAttributes(FileStream& o);
+    void		dumpMethods(FileStream& o);
+    void		dumpNormalGetCppuType(FileStream& o);
+    void 		dumpComprehensiveGetCppuType(FileStream& o);
+    void		dumpCppuAttributeRefs(FileStream& o, sal_uInt32& index);
+    void		dumpCppuMethodRefs(FileStream& o, sal_uInt32& index);
+    void		dumpCppuAttributes(FileStream& o, sal_uInt32& index);
+    void		dumpCppuMethods(FileStream& o, sal_uInt32& index);
+    void		dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTypes, CppuTypeDecl eDeclFlag);
+    void		dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes, CppuTypeDecl eDeclFlag );
 
-    sal_uInt32  getMemberCount();
-    sal_uInt32  getInheritedMemberCount();
+    sal_uInt32	getMemberCount();
+    sal_uInt32	getInheritedMemberCount();
 
 protected:
     virtual void addSpecialDependencies();
@@ -189,12 +189,12 @@ protected:
     virtual void addComprehensiveGetCppuTypeIncludes(
         codemaker::cppumaker::Includes & includes) const;
 
-    sal_uInt32  checkInheritedMemberCount(const typereg::Reader* pReader);
+    sal_uInt32	checkInheritedMemberCount(const typereg::Reader* pReader);
 
 protected:
-    sal_uInt32  m_inheritedMemberCount;
-    sal_Bool    m_hasAttributes;
-    sal_Bool    m_hasMethods;
+    sal_uInt32 	m_inheritedMemberCount;
+    sal_Bool 	m_hasAttributes;
+    sal_Bool 	m_hasMethods;
 
 private:
     void dumpExceptionSpecification(
@@ -225,12 +225,12 @@ public:
 
     virtual ~ConstantsType();
 
-    virtual sal_Bool    dump(CppuOptions* pOptions) throw( CannotDumpException );
+    virtual sal_Bool 	dump(CppuOptions* pOptions) throw( CannotDumpException );
 
-    sal_Bool            dumpDeclaration(FileStream& o) throw( CannotDumpException );
-    sal_Bool            dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
-    sal_Bool            dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
-    sal_Bool            hasConstants();
+    sal_Bool			dumpDeclaration(FileStream& o) throw( CannotDumpException );
+    sal_Bool			dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
+    sal_Bool			dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
+    sal_Bool			hasConstants();
 };
 
 class ModuleType : public ConstantsType
@@ -255,9 +255,9 @@ public:
 
     virtual ~StructureType();
 
-    sal_Bool    dumpDeclaration(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
-    sal_Bool    dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
+    sal_Bool	dumpDeclaration(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
+    sal_Bool	dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
 
     virtual void dumpLightGetCppuType(FileStream & out);
 
@@ -265,7 +265,7 @@ public:
 
     virtual void dumpComprehensiveGetCppuType(FileStream & out);
 
-    sal_Bool    dumpSuperMember(FileStream& o, const ::rtl::OString& super, sal_Bool bWithType);
+    sal_Bool	dumpSuperMember(FileStream& o, const ::rtl::OString& super, sal_Bool bWithType);
 
 protected:
     virtual void addLightGetCppuTypeIncludes(
@@ -293,11 +293,11 @@ public:
 
     virtual ~ExceptionType();
 
-    sal_Bool    dumpDeclaration(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
-    sal_Bool    dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
+    sal_Bool	dumpDeclaration(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
+    sal_Bool	dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
 
-    sal_Bool    dumpSuperMember(FileStream& o, const ::rtl::OString& super, sal_Bool bWithType);
+    sal_Bool	dumpSuperMember(FileStream& o, const ::rtl::OString& super, sal_Bool bWithType);
 };
 
 class EnumType : public CppuType
@@ -309,12 +309,12 @@ public:
 
     virtual ~EnumType();
 
-    sal_Bool    dumpDeclaration(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
-    sal_Bool    dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
+    sal_Bool	dumpDeclaration(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
+    sal_Bool	dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
 
-    void        dumpNormalGetCppuType(FileStream& o);
-    void        dumpComprehensiveGetCppuType(FileStream& o);
+    void		dumpNormalGetCppuType(FileStream& o);
+    void 		dumpComprehensiveGetCppuType(FileStream& o);
 };
 
 class TypeDefType : public CppuType
@@ -326,9 +326,9 @@ public:
 
     virtual ~TypeDefType();
 
-    sal_Bool    dumpDeclaration(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
-    sal_Bool    dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
+    sal_Bool	dumpDeclaration(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
+    sal_Bool	dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
 };
 
 class ConstructiveType: public CppuType {
@@ -385,23 +385,23 @@ public:
 };
 
 bool produceType(const ::rtl::OString& typeName,
-                     TypeManager const & typeMgr,
+                     TypeManager const & typeMgr, 
                      codemaker::GeneratedTypeSet & generated,
                      CppuOptions* pOptions)
                  throw( CannotDumpException );
 
 bool produceType(RegistryKey& typeName, bool bIsExtraType,
-                     TypeManager const & typeMgr,
+                     TypeManager const & typeMgr, 
                      codemaker::GeneratedTypeSet & generated,
                      CppuOptions* pOptions)
                  throw( CannotDumpException );
 
 /**
- * This function returns a C++ scoped name, represents the namespace
+ * This function returns a C++ scoped name, represents the namespace 
  * scoping of this type, e.g. com:.sun::star::uno::XInterface.
  */
-// ::rtl::OString scopedName(const ::rtl::OString& scope, const ::rtl::OString& type,
-//                 sal_Bool bNoNameSpace=sal_False);
+// ::rtl::OString scopedName(const ::rtl::OString& scope, const ::rtl::OString& type, 
+// 				   sal_Bool bNoNameSpace=sal_False);
 
 #endif // INCLUDED_CODEMAKER_SOURCE_CPPUMAKER_CPPUTYPE_HXX
 
diff --git a/codemaker/source/cppumaker/dumputils.cxx b/codemaker/source/cppumaker/dumputils.cxx
index 05f178eed2fe..c74636af78e9 100644
--- a/codemaker/source/cppumaker/dumputils.cxx
+++ b/codemaker/source/cppumaker/dumputils.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -85,7 +85,7 @@ bool dumpNamespaceClose(
     return output;
 }
 
-void dumpTypeIdentifier(FileStream & out, rtl::OString const & registryType) {
+void dumpTypeIdentifier(FileStream & out, rtl::OString const & registryType) {  
     out << registryType.copy(registryType.lastIndexOf('/') + 1);
 }
 
diff --git a/codemaker/source/cppumaker/dumputils.hxx b/codemaker/source/cppumaker/dumputils.hxx
index 265110dedbea..18126ce1d17c 100644
--- a/codemaker/source/cppumaker/dumputils.hxx
+++ b/codemaker/source/cppumaker/dumputils.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/source/cppumaker/includes.cxx b/codemaker/source/cppumaker/includes.cxx
index 02021e660522..10e58a243834 100644
--- a/codemaker/source/cppumaker/includes.cxx
+++ b/codemaker/source/cppumaker/includes.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/source/cppumaker/includes.hxx b/codemaker/source/cppumaker/includes.hxx
index 887faac10484..2a2445627fab 100644
--- a/codemaker/source/cppumaker/includes.hxx
+++ b/codemaker/source/cppumaker/includes.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/source/cunomaker/cunomaker.cxx b/codemaker/source/cunomaker/cunomaker.cxx
index d05764f94edc..28f7a3d3d9f1 100644
--- a/codemaker/source/cunomaker/cunomaker.cxx
+++ b/codemaker/source/cunomaker/cunomaker.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,26 +42,26 @@
 using namespace rtl;
 
 sal_Bool produceAllTypes(const OString& typeName,
-                         TypeManager& typeMgr,
+                         TypeManager& typeMgr, 
                          TypeDependency& typeDependencies,
                          CunoOptions* pOptions,
                          sal_Bool bFullScope)
     throw( CannotDumpException )
 {
-    if (!produceType(typeName, typeMgr, typeDependencies, pOptions))
+    if (!produceType(typeName, typeMgr,	typeDependencies, pOptions))
     {
-        fprintf(stderr, "%s ERROR: %s\n",
-                pOptions->getProgramName().getStr(),
+        fprintf(stderr, "%s ERROR: %s\n", 
+                pOptions->getProgramName().getStr(), 
                 OString("cannot dump Type '" + typeName + "'").getStr());
         exit(99);
     }
 
-    RegistryKey typeKey = typeMgr.getTypeKey(typeName);
+    RegistryKey	typeKey = typeMgr.getTypeKey(typeName);
     RegistryKeyNames subKeys;
-
+    
     if (typeKey.getKeyNames(OUString(), subKeys))
         return sal_False;
-
+    
     OString tmpName;
     for (sal_uInt32 i=0; i < subKeys.getLength(); i++)
     {
@@ -82,15 +82,15 @@ sal_Bool produceAllTypes(const OString& typeName,
                 return sal_False;
         }
     }
-
-    return sal_True;
+    
+    return sal_True;			
 }
 
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
     CunoOptions options;
 
-    try
+    try 
     {
         if (!options.initOptions(argc, argv))
         {
@@ -104,8 +104,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     }
 
     RegistryTypeManager typeMgr;
-    TypeDependency      typeDependencies;
-
+    TypeDependency		typeDependencies;
+    
     if (!typeMgr.init(!options.isValid("-T"), options.getInputFiles()))
     {
         fprintf(stderr, "%s : init registries failed, check your registry files.\n", options.getProgramName().getStr());
@@ -117,7 +117,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         typeMgr.setBase(options.getOption("-B"));
     }
 
-    try
+    try 
     {
         if (options.isValid("-T"))
         {
@@ -141,7 +141,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
                     } else
                     {
                         tmpName = typeName.copy(0, typeName.lastIndexOf('.')).replace('.', '/');
-                        if (tmpName.getLength() == 0)
+                        if (tmpName.getLength() == 0) 
                             tmpName = "/";
                         else
                             tmpName.replace('.', '/');
@@ -155,8 +155,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
                 if (!ret)
                 {
-                    fprintf(stderr, "%s ERROR: %s\n",
-                            options.getProgramName().getStr(),
+                    fprintf(stderr, "%s ERROR: %s\n", 
+                            options.getProgramName().getStr(), 
                             OString("cannot dump Type '" + typeName + "'").getStr());
                     exit(99);
                 }
@@ -166,8 +166,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
             // produce all types
             if (!produceAllTypes("/", typeMgr, typeDependencies, &options, sal_True))
             {
-                fprintf(stderr, "%s ERROR: %s\n",
-                        options.getProgramName().getStr(),
+                fprintf(stderr, "%s ERROR: %s\n", 
+                        options.getProgramName().getStr(), 
                         "an error occurs while dumping all types.");
                 exit(99);
             }
@@ -175,8 +175,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     }
     catch( CannotDumpException& e)
     {
-        fprintf(stderr, "%s ERROR: %s\n",
-                options.getProgramName().getStr(),
+        fprintf(stderr, "%s ERROR: %s\n", 
+                options.getProgramName().getStr(), 
                 e.m_message.getStr());
         exit(99);
     }
diff --git a/codemaker/source/cunomaker/cunooptions.cxx b/codemaker/source/cunomaker/cunooptions.cxx
index ababcc32b79c..a26efe18361e 100644
--- a/codemaker/source/cunomaker/cunooptions.cxx
+++ b/codemaker/source/cunomaker/cunooptions.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,22 +28,22 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_codemaker.hxx"
-#include    <stdio.h>
+#include 	<stdio.h> 
 
-#include    "cunooptions.hxx"
+#include	"cunooptions.hxx"
 
 using namespace rtl;
 
-sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
+sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) 
     throw( IllegalArgument )
 {
-    sal_Bool    ret = sal_True;
-    sal_uInt16  i=0;
+    sal_Bool 	ret = sal_True;
+    sal_uInt16	i=0;
 
     if (!bCmdFile)
     {
         bCmdFile = sal_True;
-
+        
         m_program = av[0];
 
         if (ac < 2)
@@ -58,7 +58,7 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
         i = 0;
     }
 
-    char    *s=NULL;
+    char	*s=NULL;
     for (i; i < ac; i++)
     {
         if (av[i][0] == '-')
@@ -81,7 +81,7 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                                 {
                                     tmp += " your input '" + OString(av[i+1]) + "'";
                                 }
-
+                                
                                 throw IllegalArgument(tmp);
                             }
                         } else
@@ -105,14 +105,14 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     m_options["-O"] = OString(s);
                     break;
                 case 'B':
@@ -129,14 +129,14 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     m_options["-B"] = OString(s);
                     break;
                 case 'T':
@@ -153,14 +153,14 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     if (m_options.count("-T") > 0)
                     {
                         OString tmp(m_options["-T"]);
@@ -182,7 +182,7 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
 
                         throw IllegalArgument(tmp);
                     }
-
+                    
                     m_options["-U"] = OString("");
                     break;
 /*
@@ -197,7 +197,7 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
 
                         throw IllegalArgument(tmp);
                     }
-
+                    
                     if (isValid("-C") || isValid("-CS"))
                     {
                         OString tmp("'-L' could not be combined with '-C' or '-CS' option");
@@ -217,7 +217,7 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
 
                         throw IllegalArgument(tmp);
                     }
-
+                    
                     if (isValid("-L") || isValid("-CS"))
                     {
                         OString tmp("'-C' could not be combined with '-L' or '-CS' option");
@@ -252,12 +252,12 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
 
                         throw IllegalArgument(tmp);
                     }
-
+                    
                     m_options["-G"] = OString("");
                     break;
                 default:
                     throw IllegalArgument("the option is unknown" + OString(av[i]));
-                    break;
+                    break;					
             }
         } else
         {
@@ -280,25 +280,25 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                         rargc++;
                     }
                     fclose(cmdFile);
-
+                    
                     ret = initOptions(rargc, rargv, bCmdFile);
-
-                    for (long i=0; i < rargc; i++)
+                    
+                    for (long i=0; i < rargc; i++) 
                     {
                         free(rargv[i]);
                     }
-                }
+                }		
             } else
             {
                 m_inputFiles.push_back(av[i]);
-            }
+            }		
         }
     }
+    
+    return ret;	
+}	
 
-    return ret;
-}
-
-OString CunoOptions::prepareHelp()
+OString	CunoOptions::prepareHelp()
 {
     OString help("\nusing: ");
     help += m_program + " [-options] file_1 ... file_n\nOptions:\n";
@@ -307,27 +307,27 @@ OString CunoOptions::prepareHelp()
     help += "    -T<name>   = name specifies a type or a list of types. The output for this\n";
     help += "      [t1;...]   type is generated. If no '-T' option is specified,\n";
     help += "                 then output for all types is generated.\n";
-    help += "                 Example: 'com.sun.star.uno.XInterface' is a valid type.\n";
+    help += "                 Example: 'com.sun.star.uno.XInterface' is a valid type.\n";		
     help += "    -B<name>   = name specifies the base node. All types are searched under this\n";
     help += "                 node. Default is the root '/' of the registry files.\n";
     help += "    -U         = activate the generating of a getCppuType_<name> function.\n";
-//  help += "    -L         = getCppuType function with a known leak.\n";
+//	help += "    -L         = getCppuType function with a known leak.\n";
     help += "    -C         = getCppuType_<name> function keeps comprehensive type information.\n";
     help += "    -G         = generate only target files which does not exists.\n";
     help += "    -Gc        = generate only target files which content will be changed.\n";
     help += prepareVersion();
-
+    
     return help;
-}
+}	
 
-OString CunoOptions::prepareVersion()
+OString	CunoOptions::prepareVersion()
 {
     OString version("\nSun Microsystems (R) ");
     version += m_program + " Version 1.0\n\n";
 
     return version;
-}
-
+}	
 
+    
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/cunomaker/cunooptions.hxx b/codemaker/source/cunomaker/cunooptions.hxx
index 2f8debf897b3..615ec6b78e74 100644
--- a/codemaker/source/cunomaker/cunooptions.hxx
+++ b/codemaker/source/cunomaker/cunooptions.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
 #ifndef INCLUDED_CODEMAKER_SOURCE_CUNOMAKER_CUNOOPTIONS_HXX
 #define INCLUDED_CODEMAKER_SOURCE_CUNOMAKER_CUNOOPTIONS_HXX
 
-#include    <codemaker/options.hxx>
+#include	<codemaker/options.hxx>
 
 class CunoOptions : public Options
 {
@@ -39,16 +39,16 @@ public:
 
     ~CunoOptions() {}
 
-    sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
+    sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) 
             throw( IllegalArgument );
 
-    ::rtl::OString  prepareHelp();
-
-    ::rtl::OString  prepareVersion();
+    ::rtl::OString	prepareHelp();
 
+    ::rtl::OString	prepareVersion();
+    
 protected:
 };
-
+    
 #endif // INCLUDED_CODEMAKER_SOURCE_CUNOMAKER_CUNOOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/cunomaker/cunotype.cxx b/codemaker/source/cunomaker/cunotype.cxx
index c5452de9b14e..40637c785af7 100644
--- a/codemaker/source/cunomaker/cunotype.cxx
+++ b/codemaker/source/cunomaker/cunotype.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,12 +30,12 @@
 #include "precompiled_codemaker.hxx"
 
 #include <stdio.h>
-#include    <rtl/alloc.h>
-#include    <rtl/ustring.hxx>
-#include    <rtl/strbuf.hxx>
+#include	<rtl/alloc.h>
+#include	<rtl/ustring.hxx>
+#include	<rtl/strbuf.hxx>
 
-#include    "cunotype.hxx"
-#include    "cunooptions.hxx"
+#include	"cunotype.hxx"
+#include	"cunooptions.hxx"
 
 using namespace rtl;
 
@@ -52,7 +52,7 @@ CunoType::CunoType(TypeReader& typeReader,
     , m_cunoTypeDynamic(sal_True)
     , m_indentLength(0)
     , m_typeName(typeName)
-//  , m_name(typeName.getToken(typeName.getTokenCount('/') - 1, '/'))
+//	, m_name(typeName.getToken(typeName.getTokenCount('/') - 1, '/'))
     , m_name(typeName.replace('/', '_'))
     , m_reader(typeReader)
     , m_typeMgr((TypeManager&)typeMgr)
@@ -142,7 +142,7 @@ sal_Bool CunoType::dump(CunoOptions* pOptions)
 
     if ( bFileExists && pOptions->isValid("-Gc") )
     {
-        tmpFileName  = createFileNameFromType(outPath, m_typeName, ".tmh");
+        tmpFileName	 = createFileNameFromType(outPath, m_typeName, ".tmh");
         bFileCheck = sal_True;
     }
 
@@ -191,7 +191,7 @@ sal_Bool CunoType::dump(CunoOptions* pOptions)
 
         if ( bFileExists && pOptions->isValid("-Gc") )
         {
-            tmpFileName  = createFileNameFromType(outPath, m_typeName, ".tmc");
+            tmpFileName	 = createFileNameFromType(outPath, m_typeName, ".tmc");
             bFileCheck = sal_True;
         }
 
@@ -366,11 +366,11 @@ void CunoType::dumpDepIncludes(FileStream& o, const OString& typeName, sal_Char*
 
     TypeUsingSet::const_iterator iter = usingSet.begin();
 
-    OString     sPrefix(OString(prefix).toAsciiUpperCase());
-    sal_Bool    bSequenceDumped = sal_False;
-    sal_uInt32  index = 0;
-    sal_uInt32  seqNum = 0;
-    OString     relType;
+    OString 	sPrefix(OString(prefix).toAsciiUpperCase());
+    sal_Bool 	bSequenceDumped = sal_False;
+    sal_uInt32 	index = 0;
+    sal_uInt32 	seqNum = 0;
+    OString 	relType;
     while (iter != usingSet.end())
     {
         sal_Bool bDumpThisType = sal_True;
@@ -416,15 +416,15 @@ void CunoType::dumpDepIncludes(FileStream& o, const OString& typeName, sal_Char*
                             iLastS = outerNamespace.lastIndexOf('/');
                             OString outerClass(outerNamespace.copy(iLastS+1));
 
-//                          o << "\n";
-//                          dumpNameSpace(o, sal_True, sal_False, outerNamespace);
-//                          o << "\nclass " << outerClass << "::" << innerClass << ";\n";
-//                          dumpNameSpace(o, sal_False, sal_False, outerNamespace);
-//                          o << "\n\n";
+//							o << "\n";
+//							dumpNameSpace(o, sal_True, sal_False, outerNamespace);
+//							o << "\nclass " << outerClass << "::" << innerClass << ";\n";
+//							dumpNameSpace(o, sal_False, sal_False, outerNamespace);
+//							o << "\n\n";
                         }
                         else
                         {
-//                          dumpInclude(o, relType, prefix);
+//							dumpInclude(o, relType, prefix);
                             OString type(relType.replace('/', '_'));
                             o << "\n#ifndef " << type.toAsciiUpperCase() << "\n";
                             o << "#define " << type.toAsciiUpperCase() << "\n";
@@ -612,14 +612,14 @@ void CunoType::dumpGetCunoType(FileStream& o)
 
         if (count)
         {
-            sal_uInt32      fieldCount = m_reader.getFieldCount();
-            RTFieldAccess   access = RT_ACCESS_INVALID;
-            OString         fieldType, fieldName;
-            OString         scope = m_typeName.replace('/', '.');
-            sal_Bool        bWithScope = sal_True;
-            OString         modFieldType;
-            StringSet       generatedTypeSet;
-            StringSet::iterator findIter;
+            sal_uInt32 		fieldCount = m_reader.getFieldCount();
+            RTFieldAccess 	access = RT_ACCESS_INVALID;
+            OString 		fieldType, fieldName;
+            OString			scope = m_typeName.replace('/', '.');
+            sal_Bool		bWithScope = sal_True;
+            OString			modFieldType;
+            StringSet		generatedTypeSet;
+            StringSet::iterator	findIter;
 
             for (sal_uInt16 i=0; i < fieldCount; i++)
             {
@@ -631,7 +631,7 @@ void CunoType::dumpGetCunoType(FileStream& o)
                 fieldName = m_reader.getFieldName(i);
                 fieldType = checkRealBaseType(m_reader.getFieldType(i), sal_True);
 
-//              modFieldType = typeToIdentifier(fieldType);
+//				modFieldType = typeToIdentifier(fieldType);
 
                 findIter = generatedTypeSet.find(fieldType);
                 if ( findIter == generatedTypeSet.end() )
@@ -711,9 +711,9 @@ void CunoType::dumpCGetCunoType(FileStream& o)
     if (superType.getLength() > 0)
         o << indent() << "typelib_TypeDescriptionReference * pSuperType = 0;\n";
 
-    sal_uInt32      count = getMemberCount();
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
+    sal_uInt32 		count = getMemberCount();
+    sal_uInt32 		fieldCount = m_reader.getFieldCount();
+    RTFieldAccess 	access = RT_ACCESS_INVALID;
     if (count)
     {
         o << indent() << "typelib_CompoundMember_Init aMembers["
@@ -743,8 +743,8 @@ void CunoType::dumpCGetCunoType(FileStream& o)
 
     if (count)
     {
-        OString         fieldType, fieldName;
-        OString         scope = m_typeName.replace('/', '.');
+        OString 		fieldType, fieldName;
+        OString			scope = m_typeName.replace('/', '.');
 
         for (sal_uInt16 i=0; i < fieldCount; i++)
         {
@@ -821,8 +821,8 @@ void CunoType::dumpCGetCunoType(FileStream& o)
 
 void CunoType::dumpCppuGetTypeMemberDecl(FileStream& o, CunoTypeDecl eDeclFlag)
 {
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
+    sal_uInt32 		fieldCount = m_reader.getFieldCount();
+    RTFieldAccess 	access = RT_ACCESS_INVALID;
 
     if ( fieldCount )
     {
@@ -941,10 +941,10 @@ void CunoType::dumpInheritedMembers(FileStream& o, rtl::OString& superType)
     }
 }
 
-OString CunoType::getTypeClass(const OString& type, sal_Bool bCStyle)
+OString	CunoType::getTypeClass(const OString& type, sal_Bool bCStyle)
 {
-    OString     typeName = (type.getLength() > 0 ? type : m_typeName);
-    RTTypeClass rtTypeClass = RT_TYPE_INVALID;
+    OString 	typeName = (type.getLength() > 0 ? type : m_typeName);
+    RTTypeClass	rtTypeClass = RT_TYPE_INVALID;
 
     if (type.getLength() > 0)
     {
@@ -981,7 +981,7 @@ OString CunoType::getTypeClass(const OString& type, sal_Bool bCStyle)
                 OString realType = checkRealBaseType( typeName );
                 return getTypeClass( realType, bCStyle );
             }
-//          return bCStyle ? "typelib_TypeClass_TYPEDEF" : "::com::sun::star::uno::TypeClass_TYPEDEF";
+//			return bCStyle ? "typelib_TypeClass_TYPEDEF" : "::com::sun::star::uno::TypeClass_TYPEDEF";
             break;
         case RT_TYPE_SERVICE:
             return bCStyle ? "typelib_TypeClass_SERVICE" : "::com::sun::star::uno::TypeClass_SERVICE";
@@ -1037,7 +1037,7 @@ void CunoType::dumpType(FileStream& o, const OString& type,
 
     RTTypeClass typeClass = m_typeMgr.getTypeClass(relType);
 
-//  if (bConst) o << "const ";
+//	if (bConst) o << "const ";
 
     if ( seqNum )
     {
@@ -1087,7 +1087,7 @@ void CunoType::dumpType(FileStream& o, const OString& type,
     if (bPointer) o << "*";
 }
 
-OString CunoType::getBaseType(const OString& type)
+OString	CunoType::getBaseType(const OString& type)
 {
     if (type.equals("long"))
         return "sal_Int32";
@@ -1285,17 +1285,17 @@ OString CunoType::typeToIdentifier(const OString& type)
     return sIdentifier;
 }
 
-OString CunoType::checkSpecialCunoType(const OString& type)
+OString	CunoType::checkSpecialCunoType(const OString& type)
 {
     OString baseType(type);
 
     RegistryTypeReaderLoader & rReaderLoader = getRegistryTypeReaderLoader();
 
-    RegistryKey     key;
-    sal_uInt8*      pBuffer=NULL;
-    RTTypeClass     typeClass;
-    sal_Bool        isTypeDef = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF);
-    TypeReader      reader;
+    RegistryKey 	key;
+    sal_uInt8*		pBuffer=NULL;
+    RTTypeClass 	typeClass;
+    sal_Bool 		isTypeDef = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF);
+    TypeReader		reader;
 
     while (isTypeDef)
     {
@@ -1350,7 +1350,7 @@ sal_Bool CunoType::isArrayType(const OString& type, OString& baseType, OString&
     return sal_False;
 }
 
-OString CunoType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly)
+OString	CunoType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly)
 {
     OString realType;
     OString baseType;
@@ -1363,11 +1363,11 @@ OString CunoType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOn
 
     RegistryTypeReaderLoader & rReaderLoader = getRegistryTypeReaderLoader();
 
-    RegistryKey     key;
-    sal_uInt8*      pBuffer=NULL;
-    RTTypeClass     typeClass;
-    sal_Bool        mustBeChecked = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF);
-    TypeReader      reader;
+    RegistryKey 	key;
+    sal_uInt8*		pBuffer=NULL;
+    RTTypeClass 	typeClass;
+    sal_Bool 		mustBeChecked = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF);
+    TypeReader		reader;
     while (mustBeChecked)
     {
         reader = m_typeMgr.getTypeReader(baseType);
@@ -1491,7 +1491,7 @@ OString CunoType::indent()
     return tmp.makeStringAndClear();
 }
 
-OString CunoType::indent(sal_uInt32 num)
+OString	CunoType::indent(sal_uInt32 num)
 {
     OStringBuffer tmp(m_indentLength + num);
 
@@ -1797,7 +1797,7 @@ void InterfaceType::dumpMethods(FileStream& o, const OString& interfaceType, Typ
     sal_uInt32 paramCount = 0;
     sal_uInt32 excCount = 0;
     RTMethodMode methodMode = RT_MODE_INVALID;
-    RTParamMode  paramMode = RT_PARAM_INVALID;
+    RTParamMode	 paramMode = RT_PARAM_INVALID;
 
     sal_Bool bPointer = sal_False;
     sal_Bool bParam = sal_False;
@@ -1846,8 +1846,8 @@ void InterfaceType::dumpMethods(FileStream& o, const OString& interfaceType, Typ
         sal_uInt16 j;
         for (j=0; j < paramCount; j++)
         {
-            paramName = reader.getMethodParamName(i, j);
-            paramType = reader.getMethodParamType(i, j);
+            paramName =	reader.getMethodParamName(i, j);
+            paramType =	reader.getMethodParamType(i, j);
             paramMode = reader.getMethodParamMode(i, j);
 
             if (j < (sal_uInt16)paramCount) o << ", ";
@@ -2060,9 +2060,9 @@ void InterfaceType::dumpCGetCunoType(FileStream& o)
       << "typelib_TypeClass_INTERFACE, (typelib_TypeDescription*)pTD);\n\n";
 
     o << indent() << "typelib_TypeDescriptionReference ** ppTypeRef = 0;\n";
-    StringSet   aTypes;
+    StringSet 	aTypes;
     // type for RuntimeException is always needed
-    OString     sRunTimeExceptionType("com/sun/star/uno/RuntimeException");
+    OString 	sRunTimeExceptionType("com/sun/star/uno/RuntimeException");
     aTypes.insert(sRunTimeExceptionType);
     dumpCppuGetType(o, sRunTimeExceptionType, sal_True, CUNOTYPEDECL_ALLTYPES);
 
@@ -2116,7 +2116,7 @@ void InterfaceType::dumpCUnoAttributeTypeNames(FileStream&o, sal_Bool bRelease)
 
 void InterfaceType::dumpCUnoMethodTypeNames(FileStream&o, sal_Bool bRelease)
 {
-    sal_uInt32  methodCount = m_reader.getMethodCount();
+    sal_uInt32 	methodCount = m_reader.getMethodCount();
 
     for (sal_uInt16 i = 0; i < methodCount; i++)
     {
@@ -2135,7 +2135,7 @@ void InterfaceType::dumpCUnoAttributeRefs(FileStream& o, sal_uInt32& index)
     sal_uInt32 fieldCount = m_reader.getFieldCount();
     RTFieldAccess access = RT_ACCESS_INVALID;
     OString fieldName;
-    OString scope = m_typeName.replace('/', '.');
+    OString	scope = m_typeName.replace('/', '.');
 
     for (sal_uInt16 i=0; i < fieldCount; i++)
     {
@@ -2158,9 +2158,9 @@ void InterfaceType::dumpCUnoAttributeRefs(FileStream& o, sal_uInt32& index)
 
 void InterfaceType::dumpCUnoMethodRefs(FileStream& o, sal_uInt32& index)
 {
-    sal_uInt32  methodCount = m_reader.getMethodCount();
-    OString     methodName; //, returnType, paramType, paramName;
-    OString     scope = m_typeName.replace('/', '.');
+    sal_uInt32 	methodCount = m_reader.getMethodCount();
+    OString    	methodName; //, returnType, paramType, paramName;
+    OString	   	scope = m_typeName.replace('/', '.');
 
     for (sal_uInt16 i = 0; i < methodCount; i++)
     {
@@ -2295,13 +2295,13 @@ void InterfaceType::dumpCUnoAttributes(FileStream& o, sal_uInt32& index)
 
 void InterfaceType::dumpCUnoMethods(FileStream& o, sal_uInt32& index)
 {
-    sal_uInt32      methodCount = m_reader.getMethodCount();
-    OString         methodName, returnType, paramType, paramName;
-    sal_uInt32      paramCount = 0;
-    sal_uInt32      excCount = 0;
-    RTMethodMode    methodMode = RT_MODE_INVALID;
-    RTParamMode     paramMode = RT_PARAM_INVALID;
-    sal_Bool        bWithRuntimeException = sal_True;
+    sal_uInt32 		methodCount = m_reader.getMethodCount();
+    OString 		methodName, returnType, paramType, paramName;
+    sal_uInt32 		paramCount = 0;
+    sal_uInt32 		excCount = 0;
+    RTMethodMode 	methodMode = RT_MODE_INVALID;
+    RTParamMode	 	paramMode = RT_PARAM_INVALID;
+    sal_Bool 		bWithRuntimeException = sal_True;
 
     sal_uInt32 absoluteIndex = index;
 
@@ -2351,8 +2351,8 @@ void InterfaceType::dumpCUnoMethods(FileStream& o, sal_uInt32& index)
             }
             for (j=0; j < paramCount; j++)
             {
-                paramName = m_reader.getMethodParamName(i, j);
-                paramType = checkRealBaseType(m_reader.getMethodParamType(i, j), sal_True);
+                paramName =	m_reader.getMethodParamName(i, j);
+                paramType =	checkRealBaseType(m_reader.getMethodParamType(i, j), sal_True);
                 paramMode = m_reader.getMethodParamMode(i, j);
                 o << indent() << "rtl_uString_newFromAscii( &pParamName" << j << ", \""
                   << paramName << "\" );\n";
@@ -2468,10 +2468,10 @@ void InterfaceType::dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTy
 
 void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes, CunoTypeDecl eDeclFlag)
 {
-    sal_uInt32      methodCount = m_reader.getMethodCount();
-    OString         returnType, paramType, excType;
-    sal_uInt32      paramCount = 0;
-    sal_uInt32      excCount = 0;
+    sal_uInt32 		methodCount = m_reader.getMethodCount();
+    OString 		returnType, paramType, excType;
+    sal_uInt32 		paramCount = 0;
+    sal_uInt32 		excCount = 0;
 
     for (sal_uInt16 i=0; i < methodCount; i++)
     {
@@ -2487,7 +2487,7 @@ void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes
         sal_uInt16 j;
         for (j=0; j < paramCount; j++)
         {
-            paramType = m_reader.getMethodParamType(i, j);
+            paramType =	m_reader.getMethodParamType(i, j);
 
             if (pFinishedTypes->count(paramType) == 0)
             {
@@ -2541,7 +2541,7 @@ sal_Bool ModuleType::dump(CunoOptions* pOptions)
     if (tmpName.equals("/"))
         tmpName = "global";
     else
-//      tmpName += "/" + m_typeName.getToken(m_typeName.getTokenCount('/') - 1, '/');
+//		tmpName += "/" + m_typeName.getToken(m_typeName.getTokenCount('/') - 1, '/');
         tmpName += "/" + m_name;
 
     OString tmpFileName;
@@ -2558,7 +2558,7 @@ sal_Bool ModuleType::dump(CunoOptions* pOptions)
 
     if ( bFileExists && pOptions->isValid("-Gc") )
     {
-        tmpFileName  = createFileNameFromType(outPath, m_typeName, ".tml");
+        tmpFileName	 = createFileNameFromType(outPath, m_typeName, ".tml");
         bFileCheck = sal_True;
     }
 
@@ -2599,7 +2599,7 @@ sal_Bool ModuleType::dump(CunoOptions* pOptions)
 
     if ( bFileExists && pOptions->isValid("-Gc") )
     {
-        tmpFileName  = createFileNameFromType(outPath, m_typeName, ".tmc");
+        tmpFileName	 = createFileNameFromType(outPath, m_typeName, ".tmc");
         bFileCheck = sal_True;
     }
 
@@ -2663,10 +2663,10 @@ sal_Bool ModuleType::dumpHFile(FileStream& o)
 sal_Bool ModuleType::dumpDeclaration(FileStream& o)
     throw( CannotDumpException )
 {
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    OString         fieldName;
-    OString         fieldType;
+    sal_uInt32 		fieldCount = m_reader.getFieldCount();
+    RTFieldAccess 	access = RT_ACCESS_INVALID;
+    OString 		fieldName;
+    OString 		fieldType;
     for (sal_uInt16 i=0; i < fieldCount; i++)
     {
         access = m_reader.getFieldAccess(i);
@@ -2689,8 +2689,8 @@ sal_Bool ModuleType::dumpDeclaration(FileStream& o)
 
 sal_Bool ModuleType::hasConstants()
 {
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
+    sal_uInt32 		fieldCount = m_reader.getFieldCount();
+    RTFieldAccess 	access = RT_ACCESS_INVALID;
 
     for (sal_uInt16 i=0; i < fieldCount; i++)
     {
@@ -2751,7 +2751,7 @@ sal_Bool ConstantsType::dump(CunoOptions* pOptions)
 
     if ( bFileExists && pOptions->isValid("-Gc") )
     {
-        tmpFileName  = createFileNameFromType(outPath, m_typeName, ".tmh");
+        tmpFileName	 = createFileNameFromType(outPath, m_typeName, ".tmh");
         bFileCheck = sal_True;
     }
 
@@ -2792,7 +2792,7 @@ sal_Bool ConstantsType::dump(CunoOptions* pOptions)
 
     if ( bFileExists && pOptions->isValid("-Gc") )
     {
-        tmpFileName  = createFileNameFromType(outPath, m_typeName, ".tmc");
+        tmpFileName	 = createFileNameFromType(outPath, m_typeName, ".tmc");
         bFileCheck = sal_True;
     }
 
@@ -2886,11 +2886,11 @@ sal_Bool StructureType::dumpDeclaration(FileStream& o)
         o << indent() << superType.replace('/', '_').getStr() << " _Base;\n";
         //dumpInheritedMembers(o, superType);
 
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    OString         fieldName;
-    OString         fieldType;
-    sal_uInt16      i=0;
+    sal_uInt32 		fieldCount = m_reader.getFieldCount();
+    RTFieldAccess 	access = RT_ACCESS_INVALID;
+    OString 		fieldName;
+    OString 		fieldType;
+    sal_uInt16 		i=0;
 
     for (i=0; i < fieldCount; i++)
     {
@@ -2996,11 +2996,11 @@ sal_Bool ExceptionType::dumpDeclaration(FileStream& o)
         o << indent() << superType.replace('/', '_').getStr() << " _Base;\n";
         //dumpInheritedMembers(o, superType);
 
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    OString         fieldName;
-    OString         fieldType;
-    sal_uInt16      i = 0;
+    sal_uInt32 		fieldCount = m_reader.getFieldCount();
+    RTFieldAccess 	access = RT_ACCESS_INVALID;
+    OString 		fieldName;
+    OString 		fieldType;
+    sal_uInt16 		i = 0;
 
     for (i=0; i < fieldCount; i++)
     {
@@ -3093,11 +3093,11 @@ sal_Bool EnumType::dumpDeclaration(FileStream& o)
     o << "\ntypedef enum _" << m_name << "\n{\n";
     inc();
 
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    RTConstValue    constValue;
-    OString         fieldName;
-    sal_Int32       value=0;
+    sal_uInt32 		fieldCount = m_reader.getFieldCount();
+    RTFieldAccess 	access = RT_ACCESS_INVALID;
+    RTConstValue	constValue;
+    OString 		fieldName;
+    sal_Int32		value=0;
     for (sal_uInt16 i=0; i < fieldCount; i++)
     {
         access = m_reader.getFieldAccess(i);
@@ -3227,8 +3227,8 @@ void EnumType::dumpCGetCunoType(FileStream& o)
         o << indent() << "enumValueNames[" << i << "] = pEnumValue" << i << ";\n";
     }
 
-    RTConstValue    constValue;
-    sal_Int32       value=0;
+    RTConstValue 	constValue;
+    sal_Int32 		value=0;
     for (i = 0; i < count; i++)
     {
         o << indent() << "enumValues[" << i << "] = ";
@@ -3389,7 +3389,7 @@ sal_Bool produceType(const OString& typeName,
         return sal_False;
 
     RTTypeClass typeClass = reader.getTypeClass();
-    sal_Bool    ret = sal_False;
+    sal_Bool 	ret = sal_False;
     switch (typeClass)
     {
         case RT_TYPE_INTERFACE:
@@ -3407,7 +3407,7 @@ sal_Bool produceType(const OString& typeName,
                 {
                     ret = mType.dump(pOptions);
                     if (ret) typeDependencies.setGenerated(typeName);
-//                  ret = mType.dumpDependedTypes(pOptions);
+//					ret = mType.dumpDependedTypes(pOptions);
                 } else
                 {
                     typeDependencies.setGenerated(typeName);
@@ -3454,7 +3454,7 @@ sal_Bool produceType(const OString& typeName,
                 {
                     ret = cType.dump(pOptions);
                     if (ret) typeDependencies.setGenerated(typeName);
-//                  ret = cType.dumpDependedTypes(pOptions);
+//					ret = cType.dumpDependedTypes(pOptions);
                 } else
                 {
                     typeDependencies.setGenerated(typeName);
diff --git a/codemaker/source/cunomaker/cunotype.hxx b/codemaker/source/cunomaker/cunotype.hxx
index 89e1347715f3..e735246ec6b1 100644
--- a/codemaker/source/cunomaker/cunotype.hxx
+++ b/codemaker/source/cunomaker/cunotype.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
 #ifndef INCLUDED_CODEMAKER_SOURCE_CUNOMAKER_CUNOTYPE_HXX_
 #define INCLUDED_CODEMAKER_SOURCE_CUNOMAKER_CUNOTYPE_HXX
 
-#include    <codemaker/typemanager.hxx>
-#include    <codemaker/dependency.hxx>
+#include	<codemaker/typemanager.hxx>
+#include	<codemaker/dependency.hxx>
 
 enum BASETYPE
 {
@@ -39,7 +39,7 @@ enum BASETYPE
     BT_ANY,
     BT_TYPE,
     BT_BOOLEAN,
-    BT_CHAR,
+    BT_CHAR,		
     BT_STRING,
     BT_FLOAT,
     BT_DOUBLE,
@@ -59,7 +59,7 @@ enum CunoTypeDecl
     CUNOTYPEDECL_ALLTYPES,
     CUNOTYPEDECL_NOINTERFACES,
     CUNOTYPEDECL_ONLYINTERFACES
-};
+};	
 
 class CunoOptions;
 class FileStream;
@@ -69,7 +69,7 @@ class CunoType
 public:
     CunoType(TypeReader& typeReader,
              const ::rtl::OString& typeName,
-             const TypeManager& typeMgr,
+             const TypeManager& typeMgr, 
              const TypeDependency& typeDependencies);
 
     virtual ~CunoType();
@@ -95,58 +95,58 @@ public:
     virtual void dumpType(FileStream& o, const ::rtl::OString& type, sal_Bool bConst=sal_False,
                           sal_Bool bPointer=sal_False, sal_Bool bParam=sal_False)
                     throw( CannotDumpException );
-    ::rtl::OString  getTypeClass(const ::rtl::OString& type="", sal_Bool bCStyle=sal_False);
-    ::rtl::OString  getBaseType(const ::rtl::OString& type);
-    void    dumpCppuGetType(FileStream& o, const ::rtl::OString& type, sal_Bool bDecl=sal_False, CunoTypeDecl eDeclFlag=CUNOTYPEDECL_ALLTYPES);
-    void    dumpTypeInit(FileStream& o, const ::rtl::OString& type);
+    ::rtl::OString	getTypeClass(const ::rtl::OString& type="", sal_Bool bCStyle=sal_False);
+    ::rtl::OString	getBaseType(const ::rtl::OString& type);
+    void	dumpCppuGetType(FileStream& o, const ::rtl::OString& type, sal_Bool bDecl=sal_False, CunoTypeDecl eDeclFlag=CUNOTYPEDECL_ALLTYPES);
+    void	dumpTypeInit(FileStream& o, const ::rtl::OString& type);
     BASETYPE isBaseType(const ::rtl::OString& type);
 
     ::rtl::OString typeToIdentifier(const ::rtl::OString& type);
 
-    void    dumpConstantValue(FileStream& o, sal_uInt16 index);
+    void 	dumpConstantValue(FileStream& o, sal_uInt16 index);
 
     virtual sal_uInt32  getMemberCount();
-    virtual sal_uInt32  getInheritedMemberCount();
-    void    dumpInheritedMembers(FileStream& o, rtl::OString& superType);
+    virtual sal_uInt32	getInheritedMemberCount();
+    void 	dumpInheritedMembers(FileStream& o, rtl::OString& superType);
 
     sal_Bool isSeqType(const ::rtl::OString& type, ::rtl::OString& baseType, ::rtl::OString& seqPrefix);
     sal_Bool isArrayType(const ::rtl::OString& type, ::rtl::OString& baseType, ::rtl::OString& arrayPrefix);
     sal_Bool isVoid(const ::rtl::OString& type)
         { return type.equals("void"); }
-    void            inc(sal_uInt32 num=4);
-    void            dec(sal_uInt32 num=4);
-    ::rtl::OString  indent();
-    ::rtl::OString  indent(sal_uInt32 num);
+    void 			inc(sal_uInt32 num=4);
+    void 			dec(sal_uInt32 num=4);
+    ::rtl::OString 	indent();
+    ::rtl::OString	indent(sal_uInt32 num);
 protected:
-    virtual sal_uInt32  checkInheritedMemberCount(const TypeReader* pReader);
+    virtual sal_uInt32	checkInheritedMemberCount(const TypeReader* pReader);
 
-    ::rtl::OString  checkSpecialCunoType(const ::rtl::OString& type);
-    ::rtl::OString  checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False);
-    void    dumpCppuGetTypeMemberDecl(FileStream& o, CunoTypeDecl eDeclFlag);
+    ::rtl::OString	checkSpecialCunoType(const ::rtl::OString& type);
+    ::rtl::OString	checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False);
+    void	dumpCppuGetTypeMemberDecl(FileStream& o, CunoTypeDecl eDeclFlag);
 
-     sal_Bool isNestedType()
+     sal_Bool isNestedType() 
         { return m_bIsNestedType; };
 
-     RegistryKeyNames& getNestedTypeNames()
+     RegistryKeyNames& getNestedTypeNames() 
         { return  m_nestedTypeNames; };
 
      sal_Bool isNestedTypeByName(const ::rtl::OString& type);
      sal_Bool hasNestedType(const ::rtl::OString& type);
 
 protected:
-    sal_uInt32          m_inheritedMemberCount;
-
-    sal_Bool            m_cunoTypeLib;
-    sal_Bool            m_cunoTypeLeak;
-    sal_Bool            m_cunoTypeDynamic;
-    sal_uInt32          m_indentLength;
-    ::rtl::OString      m_typeName;
-    ::rtl::OString      m_name;
-    TypeReader          m_reader;
-    TypeManager&        m_typeMgr;
-    TypeDependency      m_dependencies;
-    sal_Bool            m_bIsNestedType;
-    RegistryKeyNames    m_nestedTypeNames;
+    sal_uInt32 			m_inheritedMemberCount;
+
+    sal_Bool			m_cunoTypeLib;
+    sal_Bool			m_cunoTypeLeak;
+    sal_Bool			m_cunoTypeDynamic;
+    sal_uInt32			m_indentLength;
+    ::rtl::OString		m_typeName;
+    ::rtl::OString		m_name;
+    TypeReader			m_reader;
+    TypeManager&		m_typeMgr;	
+    TypeDependency  	m_dependencies;	
+    sal_Bool 			m_bIsNestedType;
+    RegistryKeyNames 	m_nestedTypeNames;
 };
 
 class InterfaceType : public CunoType
@@ -154,39 +154,39 @@ class InterfaceType : public CunoType
 public:
     InterfaceType(TypeReader& typeReader,
                  const ::rtl::OString& typeName,
-                 const TypeManager& typeMgr,
+                 const TypeManager& typeMgr, 
                  const TypeDependency& typeDependencies);
 
     virtual ~InterfaceType();
 
-    sal_Bool    dumpDeclaration(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpCFile(FileStream& o) throw( CannotDumpException );
-
-    void        dumpInheritedFunctions(FileStream& o, rtl::OString& superType);
-    void        dumpAttributes(FileStream& o, const ::rtl::OString& interfaceType, TypeReader& reader );
-    void        dumpMethods(FileStream& o, const ::rtl::OString& interfaceType, TypeReader& reader );
-    void        dumpGetCunoType(FileStream& o);
-    void        dumpCGetCunoType(FileStream& o);
-    void        dumpCUnoAttributeTypeNames(FileStream& o, sal_Bool bRelease=sal_False);
-    void        dumpCUnoMethodTypeNames(FileStream& o, sal_Bool bRelease=sal_False);
-    void        dumpCUnoAttributeRefs(FileStream& o, sal_uInt32& index);
-    void        dumpCUnoMethodRefs(FileStream& o, sal_uInt32& index);
-    void        dumpCUnoAttributes(FileStream& o, sal_uInt32& index);
-    void        dumpCUnoMethods(FileStream& o, sal_uInt32& index);
-    void        dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTypes, CunoTypeDecl eDeclFlag);
-    void        dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes, CunoTypeDecl eDeclFlag );
-
-    sal_uInt32  getMemberCount();
-    sal_uInt32  getInheritedMemberCount();
+    sal_Bool	dumpDeclaration(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpHFile(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpCFile(FileStream& o) throw( CannotDumpException );
+
+    void 		dumpInheritedFunctions(FileStream& o, rtl::OString& superType);
+    void		dumpAttributes(FileStream& o, const ::rtl::OString& interfaceType, TypeReader& reader );
+    void		dumpMethods(FileStream& o, const ::rtl::OString& interfaceType, TypeReader& reader );
+    void		dumpGetCunoType(FileStream& o);
+    void 		dumpCGetCunoType(FileStream& o);
+    void 		dumpCUnoAttributeTypeNames(FileStream& o, sal_Bool bRelease=sal_False);
+    void 		dumpCUnoMethodTypeNames(FileStream& o, sal_Bool bRelease=sal_False);
+    void		dumpCUnoAttributeRefs(FileStream& o, sal_uInt32& index);
+    void		dumpCUnoMethodRefs(FileStream& o, sal_uInt32& index);
+    void		dumpCUnoAttributes(FileStream& o, sal_uInt32& index);
+    void		dumpCUnoMethods(FileStream& o, sal_uInt32& index);
+    void		dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTypes, CunoTypeDecl eDeclFlag);
+    void		dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes, CunoTypeDecl eDeclFlag );
+
+    sal_uInt32	getMemberCount();
+    sal_uInt32	getInheritedMemberCount();
 
 protected:
-    sal_uInt32  checkInheritedMemberCount(const TypeReader* pReader);
+    sal_uInt32	checkInheritedMemberCount(const TypeReader* pReader);
 
 protected:
-    sal_uInt32  m_inheritedMemberCount;
-    sal_Bool    m_hasAttributes;
-    sal_Bool    m_hasMethods;
+    sal_uInt32 	m_inheritedMemberCount;
+    sal_Bool 	m_hasAttributes;
+    sal_Bool 	m_hasMethods;
 };
 
 class ModuleType : public CunoType
@@ -194,17 +194,17 @@ class ModuleType : public CunoType
 public:
     ModuleType(TypeReader& typeReader,
                   const ::rtl::OString& typeName,
-               const TypeManager& typeMgr,
+               const TypeManager& typeMgr, 
                const TypeDependency& typeDependencies);
 
     virtual ~ModuleType();
 
-    virtual sal_Bool    dump(CunoOptions* pOptions) throw( CannotDumpException );
+    virtual sal_Bool 	dump(CunoOptions* pOptions) throw( CannotDumpException );
 
-    sal_Bool            dumpDeclaration(FileStream& o) throw( CannotDumpException );
-    sal_Bool            dumpHFile(FileStream& o) throw( CannotDumpException );
-    sal_Bool            dumpCFile(FileStream& o) throw( CannotDumpException );
-    sal_Bool            hasConstants();
+    sal_Bool			dumpDeclaration(FileStream& o) throw( CannotDumpException );
+    sal_Bool			dumpHFile(FileStream& o) throw( CannotDumpException );
+    sal_Bool			dumpCFile(FileStream& o) throw( CannotDumpException );
+    sal_Bool			hasConstants();
 };
 
 class ConstantsType : public ModuleType
@@ -212,12 +212,12 @@ class ConstantsType : public ModuleType
 public:
     ConstantsType(TypeReader& typeReader,
                   const ::rtl::OString& typeName,
-               const TypeManager& typeMgr,
+               const TypeManager& typeMgr, 
                const TypeDependency& typeDependencies);
 
     virtual ~ConstantsType();
 
-    virtual sal_Bool    dump(CunoOptions* pOptions) throw( CannotDumpException );
+    virtual sal_Bool 	dump(CunoOptions* pOptions) throw( CannotDumpException );
 };
 
 class StructureType : public CunoType
@@ -225,14 +225,14 @@ class StructureType : public CunoType
 public:
     StructureType(TypeReader& typeReader,
                   const ::rtl::OString& typeName,
-                  const TypeManager& typeMgr,
+                  const TypeManager& typeMgr, 
                   const TypeDependency& typeDependencies);
 
     virtual ~StructureType();
 
-    sal_Bool    dumpDeclaration(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpCFile(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpDeclaration(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpHFile(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpCFile(FileStream& o) throw( CannotDumpException );
 };
 
 class ExceptionType : public CunoType
@@ -240,14 +240,14 @@ class ExceptionType : public CunoType
 public:
     ExceptionType(TypeReader& typeReader,
                   const ::rtl::OString& typeName,
-                  const TypeManager& typeMgr,
+                  const TypeManager& typeMgr, 
                   const TypeDependency& typeDependencies);
 
     virtual ~ExceptionType();
 
-    sal_Bool    dumpDeclaration(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpCFile(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpDeclaration(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpHFile(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpCFile(FileStream& o) throw( CannotDumpException );
 };
 
 class EnumType : public CunoType
@@ -255,17 +255,17 @@ class EnumType : public CunoType
 public:
     EnumType(TypeReader& typeReader,
               const ::rtl::OString& typeName,
-              const TypeManager& typeMgr,
+              const TypeManager& typeMgr, 
               const TypeDependency& typeDependencies);
 
     virtual ~EnumType();
 
-    sal_Bool    dumpDeclaration(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpCFile(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpDeclaration(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpHFile(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpCFile(FileStream& o) throw( CannotDumpException );
 
-    void        dumpGetCunoType(FileStream& o);
-    void        dumpCGetCunoType(FileStream& o);
+    void		dumpGetCunoType(FileStream& o);
+    void 		dumpCGetCunoType(FileStream& o);
 };
 
 class TypeDefType : public CunoType
@@ -278,31 +278,31 @@ public:
 
     virtual ~TypeDefType();
 
-    sal_Bool    dumpDeclaration(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
-    sal_Bool    dumpCFile(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpDeclaration(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpHFile(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpCFile(FileStream& o) throw( CannotDumpException );
 
-    void        dumpGetCunoType(FileStream& o);
-    void        dumpLGetCunoType(FileStream& o);
-    void        dumpCGetCunoType(FileStream& o);
+    void		dumpGetCunoType(FileStream& o);
+    void		dumpLGetCunoType(FileStream& o);
+    void 		dumpCGetCunoType(FileStream& o);
 };
 
 
 sal_Bool produceType(const ::rtl::OString& typeName,
-                     TypeManager& typeMgr,
+                     TypeManager& typeMgr, 
                      TypeDependency& typeDependencies,
                      CunoOptions* pOptions)
                  throw( CannotDumpException );
 
 /**
- * This function returns a C++ scoped name, represents the namespace
+ * This function returns a C++ scoped name, represents the namespace 
  * scoping of this type, e.g. com:.sun::star::uno::XInterface. If the scope of
  * the type is equal scope, the relativ name will be used.
  */
-::rtl::OString scopedName(const ::rtl::OString& scope, const ::rtl::OString& type,
+::rtl::OString scopedName(const ::rtl::OString& scope, const ::rtl::OString& type, 
                    sal_Bool bNoNameSpace=sal_False);
 
-::rtl::OString shortScopedName(const ::rtl::OString& scope, const ::rtl::OString& type,
+::rtl::OString shortScopedName(const ::rtl::OString& scope, const ::rtl::OString& type, 
                            sal_Bool bNoNameSpace=sal_False);
 
 
diff --git a/codemaker/source/idlmaker/idlmaker.cxx b/codemaker/source/idlmaker/idlmaker.cxx
index 9287f22ecb53..416aef10ab4f 100644
--- a/codemaker/source/idlmaker/idlmaker.cxx
+++ b/codemaker/source/idlmaker/idlmaker.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,26 +42,26 @@
 using namespace rtl;
 
 sal_Bool produceAllTypes(const OString& typeName,
-                         TypeManager& typeMgr,
+                         TypeManager& typeMgr, 
                          TypeDependency& typeDependencies,
                          IdlOptions* pOptions,
                          sal_Bool bFullScope)
     throw( CannotDumpException )
 {
-    if (!produceType(typeName, typeMgr, typeDependencies, pOptions))
+    if (!produceType(typeName, typeMgr,	typeDependencies, pOptions))
     {
-        fprintf(stderr, "%s ERROR: %s\n",
-                pOptions->getProgramName().getStr(),
+        fprintf(stderr, "%s ERROR: %s\n", 
+                pOptions->getProgramName().getStr(), 
                 OString("cannot dump Type '" + typeName + "'").getStr());
         exit(99);
     }
 
-    RegistryKey typeKey = typeMgr.getTypeKey(typeName);
+    RegistryKey	typeKey = typeMgr.getTypeKey(typeName);
     RegistryKeyNames subKeys;
-
+    
     if (typeKey.getKeyNames(OUString(), subKeys))
         return sal_False;
-
+    
     OString tmpName;
     for (sal_uInt32 i=0; i < subKeys.getLength(); i++)
     {
@@ -82,15 +82,15 @@ sal_Bool produceAllTypes(const OString& typeName,
                 return sal_False;
         }
     }
-
-    return sal_True;
+    
+    return sal_True;			
 }
 
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
     IdlOptions options;
 
-    try
+    try 
     {
         if (!options.initOptions(argc, argv))
         {
@@ -104,8 +104,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     }
 
     RegistryTypeManager typeMgr;
-    TypeDependency      typeDependencies;
-
+    TypeDependency		typeDependencies;
+    
     if (!typeMgr.init(!options.isValid("-T"), options.getInputFiles()))
     {
         fprintf(stderr, "%s : init registries failed, check your registry files.\n", options.getProgramName().getStr());
@@ -117,7 +117,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         typeMgr.setBase(options.getOption("-B"));
     }
 
-    try
+    try 
     {
         if (options.isValid("-T"))
         {
@@ -141,7 +141,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
                     } else
                     {
                         tmpName = typeName.copy(0, typeName.lastIndexOf('.')).replace('.', '/');
-                        if (tmpName.getLength() == 0)
+                        if (tmpName.getLength() == 0) 
                             tmpName = "/";
                         else
                             tmpName.replace('.', '/');
@@ -155,8 +155,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
                 if (!ret)
                 {
-                    fprintf(stderr, "%s ERROR: %s\n",
-                            options.getProgramName().getStr(),
+                    fprintf(stderr, "%s ERROR: %s\n", 
+                            options.getProgramName().getStr(), 
                             OString("cannot dump Type '" + typeName + "'").getStr());
                     exit(99);
                 }
@@ -166,8 +166,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
             // produce all types
             if (!produceAllTypes("/", typeMgr, typeDependencies, &options, sal_True))
             {
-                fprintf(stderr, "%s ERROR: %s\n",
-                        options.getProgramName().getStr(),
+                fprintf(stderr, "%s ERROR: %s\n", 
+                        options.getProgramName().getStr(), 
                         "an error occurs while dumping all types.");
                 exit(99);
             }
@@ -175,8 +175,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     }
     catch( CannotDumpException& e)
     {
-        fprintf(stderr, "%s ERROR: %s\n",
-                options.getProgramName().getStr(),
+        fprintf(stderr, "%s ERROR: %s\n", 
+                options.getProgramName().getStr(), 
                 e.m_message.getStr());
         exit(99);
     }
diff --git a/codemaker/source/idlmaker/idloptions.cxx b/codemaker/source/idlmaker/idloptions.cxx
index d2e2689e2435..b5435a1a1109 100644
--- a/codemaker/source/idlmaker/idloptions.cxx
+++ b/codemaker/source/idlmaker/idloptions.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,22 +28,22 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_codemaker.hxx"
-#include    <stdio.h>
+#include 	<stdio.h> 
 
-#include    "idloptions.hxx"
+#include	"idloptions.hxx"
 
 using namespace rtl;
 
-sal_Bool IdlOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
+sal_Bool IdlOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) 
     throw( IllegalArgument )
 {
-    sal_Bool    ret = sal_True;
-    sal_uInt16  i=0;
+    sal_Bool 	ret = sal_True;
+    sal_uInt16	i=0;
 
     if (!bCmdFile)
     {
         bCmdFile = sal_True;
-
+        
         m_program = av[0];
 
         if (ac < 2)
@@ -58,7 +58,7 @@ sal_Bool IdlOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
         i = 0;
     }
 
-    char    *s=NULL;
+    char	*s=NULL;
     for (i; i < ac; i++)
     {
         if (av[i][0] == '-')
@@ -79,14 +79,14 @@ sal_Bool IdlOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     m_options["-O"] = OString(s);
                     break;
                 case 'B':
@@ -103,14 +103,14 @@ sal_Bool IdlOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     m_options["-B"] = OString(s);
                     break;
                 case 'T':
@@ -127,14 +127,14 @@ sal_Bool IdlOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     if (m_options.count("-T") > 0)
                     {
                         OString tmp(m_options["-T"]);
@@ -172,12 +172,12 @@ sal_Bool IdlOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
 
                         throw IllegalArgument(tmp);
                     }
-
+                    
                     m_options["-G"] = OString("");
                     break;
                 default:
                     throw IllegalArgument("the option is unknown" + OString(av[i]));
-                    break;
+                    break;					
             }
         } else
         {
@@ -200,25 +200,25 @@ sal_Bool IdlOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                         rargc++;
                     }
                     fclose(cmdFile);
-
+                    
                     ret = initOptions(rargc, rargv, bCmdFile);
-
-                    for (long i=0; i < rargc; i++)
+                    
+                    for (long i=0; i < rargc; i++) 
                     {
                         free(rargv[i]);
                     }
-                }
+                }		
             } else
             {
                 m_inputFiles.push_back(av[i]);
-            }
+            }		
         }
     }
+    
+    return ret;	
+}	
 
-    return ret;
-}
-
-OString IdlOptions::prepareHelp()
+OString	IdlOptions::prepareHelp()
 {
     OString help("\nusing: ");
     help += m_program + " [-options] file_1 ... file_n\nOptions:\n";
@@ -227,28 +227,28 @@ OString IdlOptions::prepareHelp()
     help += "    -T<name>   = name specifies a type or a list of types. The output for this\n";
     help += "      [t1;...]   type is generated. If no '-T' option is specified,\n";
     help += "                 then output for all types is generated.\n";
-    help += "                 Example: 'com.sun.star.uno.XInterface' is a valid type.\n";
+    help += "                 Example: 'com.sun.star.uno.XInterface' is a valid type.\n";		
     help += "    -B<name>   = name specifies the base node. All types are searched under this\n";
     help += "                 node. Default is the root '/' of the registry files.\n";
     help += "    -G         = generate only target files which does not exists.\n";
     help += "    -Gc        = generate only target files which content will be changed.\n";
-    help += "IMPORTANT:       You lose enum values and struct, exception inheritance!\n";
-    help += "                 Parameter name Object is translated to _Object!\n";
-    help += "                 The type type is translated to CORBA::TypeCode!\n";
-    help += "                 Sequences are expanded to a typedef name Sequence_..._\"name\"!\n";
+    help += "IMPORTANT:		  You lose enum values and struct, exception inheritance!\n";
+    help += "				  Parameter name Object is translated to _Object!\n";
+    help += "				  The type type is translated to CORBA::TypeCode!\n";
+    help += "				  Sequences are expanded to a typedef name Sequence_..._\"name\"!\n";
     help += prepareVersion();
-
+    
     return help;
-}
+}	
 
-OString IdlOptions::prepareVersion()
+OString	IdlOptions::prepareVersion()
 {
     OString version("\nSun Microsystems (R) ");
     version += m_program + " Version 2.0\n\n";
 
     return version;
-}
-
+}	
 
+    
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/idlmaker/idloptions.hxx b/codemaker/source/idlmaker/idloptions.hxx
index 4b52736e907c..8d94c2b9aac6 100644
--- a/codemaker/source/idlmaker/idloptions.hxx
+++ b/codemaker/source/idlmaker/idloptions.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
 #ifndef INCLUDED_CODEMAKER_SOURCE_IDLMAKER_IDLOPTIONS_HXX
 #define INCLUDED_CODEMAKER_SOURCE_IDLMAKER_IDLOPTIONS_HXX
 
-#include    <codemaker/options.hxx>
+#include	<codemaker/options.hxx>
 
 class IdlOptions : public Options
 {
@@ -39,16 +39,16 @@ public:
 
     ~IdlOptions() {}
 
-    sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
+    sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) 
             throw( IllegalArgument );
 
-    ::rtl::OString  prepareHelp();
-
-    ::rtl::OString  prepareVersion();
+    ::rtl::OString	prepareHelp();
 
+    ::rtl::OString	prepareVersion();
+    
 protected:
 };
-
+    
 #endif // INCLUDED_CODEMAKER_SOURCE_IDLMAKER_IDLOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/idlmaker/idltype.cxx b/codemaker/source/idlmaker/idltype.cxx
index 9a2c75427560..4cd516369498 100644
--- a/codemaker/source/idlmaker/idltype.cxx
+++ b/codemaker/source/idlmaker/idltype.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,12 +30,12 @@
 #include "precompiled_codemaker.hxx"
 
 #include <stdio.h>
-#include    <rtl/alloc.h>
-#include    <rtl/ustring.hxx>
-#include    <rtl/strbuf.hxx>
+#include	<rtl/alloc.h>
+#include	<rtl/ustring.hxx>
+#include	<rtl/strbuf.hxx>
 
-#include    "idltype.hxx"
-#include    "idloptions.hxx"
+#include	"idltype.hxx"
+#include	"idloptions.hxx"
 
 using namespace rtl;
 
@@ -85,7 +85,7 @@ sal_Bool IdlType::dump(IdlOptions* pOptions)
 
     if ( bFileExists && pOptions->isValid("-Gc") )
     {
-        tmpFileName  = createFileNameFromType(outPath, m_typeName, ".tml");
+        tmpFileName	 = createFileNameFromType(outPath, m_typeName, ".tml");
         bFileCheck = sal_True;
     }
 
@@ -210,9 +210,9 @@ void IdlType::dumpInclude(FileStream& o, const OString& genTypeName, const OStri
          o << "../";
     } while( nIndex != -1 );
 
-//      sal_Int32 nSlashes = genTypeName.getTokenCount( '/');
-//      for( sal_Int32 i = 1; i < nSlashes; i++ )
-//          o << "../";
+//  	sal_Int32 nSlashes = genTypeName.getTokenCount( '/');
+//  	for( sal_Int32 i = 1; i < nSlashes; i++ )
+//  		o << "../";
     o << tmp;
     o << ">\n#endif\n";
 }
@@ -223,10 +223,10 @@ void IdlType::dumpDepIncludes(FileStream& o, const OString& typeName, sal_Char*
 
     TypeUsingSet::const_iterator iter = usingSet.begin();
 
-    OString     sPrefix(OString(prefix).toAsciiUpperCase());
-    sal_uInt32  index = 0;
-    sal_uInt32  seqNum = 0;
-    OString     relType;
+    OString 	sPrefix(OString(prefix).toAsciiUpperCase());
+    sal_uInt32 	index = 0;
+    sal_uInt32 	seqNum = 0;
+    OString 	relType;
     while (iter != usingSet.end())
     {
         index = (*iter).m_type.lastIndexOf(']');
@@ -455,7 +455,7 @@ void IdlType::dumpType(FileStream& o, const OString& type )
     }
 }
 
-OString IdlType::getBaseType(const OString& type)
+OString	IdlType::getBaseType(const OString& type)
 {
     if (type.equals("long"))
         return type;
@@ -521,15 +521,15 @@ void IdlType::dumpIdlGetType(FileStream& o, const OString& type, sal_Bool bDecl,
                 m_typeMgr.getTypeClass(relType) == RT_TYPE_INTERFACE)
                 return;
 
-//          if (m_typeMgr.getTypeClass(type) == RT_TYPE_TYPEDEF)
-//          {
-//              o << indent() << "get_" << type.replace('/', '_') << "_Type()";
-//          } else
-//          {
+//			if (m_typeMgr.getTypeClass(type) == RT_TYPE_TYPEDEF)
+//			{
+//				o << indent() << "get_" << type.replace('/', '_') << "_Type()";
+//			} else
+//			{
                 o << indent() << "getIdlType( (";
                 dumpType(o, type);
                 o << "*)0 )";
-//          }
+//			}
         }
         if (bDecl)
             o << ";\n";
@@ -570,17 +570,17 @@ BASETYPE IdlType::isBaseType(const OString& type)
     return BT_INVALID;
 }
 
-OString IdlType::checkSpecialIdlType(const OString& type)
+OString	IdlType::checkSpecialIdlType(const OString& type)
 {
     OString baseType(type);
 
     RegistryTypeReaderLoader & rReaderLoader = getRegistryTypeReaderLoader();
 
-    RegistryKey     key;
-    sal_uInt8*      pBuffer=NULL;
-    RTTypeClass     typeClass;
-    sal_Bool        isTypeDef = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF);
-    TypeReader      reader;
+    RegistryKey 	key;
+    sal_uInt8*		pBuffer=NULL;
+    RTTypeClass 	typeClass;
+    sal_Bool 		isTypeDef = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF);
+    TypeReader		reader;
 
     while (isTypeDef)
     {
@@ -603,7 +603,7 @@ OString IdlType::checkSpecialIdlType(const OString& type)
     return baseType;
 }
 
-OString IdlType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly)
+OString	IdlType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly)
 {
     sal_uInt32 index = type.lastIndexOf(']');
     OString baseType = (index > 0 ? ((OString)type).copy(index+1) : type);
@@ -611,11 +611,11 @@ OString IdlType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnl
 
     RegistryTypeReaderLoader & rReaderLoader = getRegistryTypeReaderLoader();
 
-    RegistryKey     key;
-    sal_uInt8*      pBuffer=NULL;
-    RTTypeClass     typeClass;
-    sal_Bool        mustBeChecked = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF);
-    TypeReader      reader;
+    RegistryKey 	key;
+    sal_uInt8*		pBuffer=NULL;
+    RTTypeClass 	typeClass;
+    sal_Bool 		mustBeChecked = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF);
+    TypeReader		reader;
 
     while (mustBeChecked)
     {
@@ -737,7 +737,7 @@ OString IdlType::indent()
     return tmp.makeStringAndClear();
 }
 
-OString IdlType::indent(sal_uInt32 num)
+OString	IdlType::indent(sal_uInt32 num)
 {
     OStringBuffer tmp(m_indentLength + num);
 
@@ -800,8 +800,8 @@ sal_Bool InterfaceType::dumpHFile(FileStream& o)
 
     dumpNameSpace(o, sal_False);
 
-//  o << "\nnamespace com { namespace sun { namespace star { namespace uno {\n"
-//    << "class Type;\n} } } }\n\n";
+//	o << "\nnamespace com { namespace sun { namespace star { namespace uno {\n"
+//	  << "class Type;\n} } } }\n\n";
 
     o << "#endif /* "<< headerDefine << "*/" << "\n";
     return sal_True;
@@ -853,7 +853,7 @@ void InterfaceType::dumpMethods(FileStream& o)
     sal_uInt32 paramCount = 0;
     sal_uInt32 excCount = 0;
     RTMethodMode methodMode = RT_MODE_INVALID;
-    RTParamMode  paramMode = RT_PARAM_INVALID;
+    RTParamMode	 paramMode = RT_PARAM_INVALID;
 
     sal_Bool bRef = sal_False;
     sal_Bool bConst = sal_False;
@@ -883,8 +883,8 @@ void InterfaceType::dumpMethods(FileStream& o)
         sal_uInt16 j;
         for (j=0; j < paramCount; j++)
         {
-            paramName = m_reader.getMethodParamName(i, j);
-            paramType = m_reader.getMethodParamType(i, j);
+            paramName =	m_reader.getMethodParamName(i, j);
+            paramType =	m_reader.getMethodParamType(i, j);
             paramMode = m_reader.getMethodParamMode(i, j);
 
             switch (paramMode)
@@ -1054,7 +1054,7 @@ sal_Bool ModuleType::dump(IdlOptions* pOptions)
     if (tmpName.equals("/"))
         tmpName = "global";
     else
-//      tmpName += "/" + m_typeName.getToken(m_typeName.getTokenCount('/') - 1, '/');
+//		tmpName += "/" + m_typeName.getToken(m_typeName.getTokenCount('/') - 1, '/');
         tmpName += "/" + m_name;
 
     OString tmpFileName;
@@ -1071,7 +1071,7 @@ sal_Bool ModuleType::dump(IdlOptions* pOptions)
 
     if ( bFileExists && pOptions->isValid("-Gc") )
     {
-        tmpFileName  = createFileNameFromType(outPath, m_typeName, ".tml");
+        tmpFileName	 = createFileNameFromType(outPath, m_typeName, ".tml");
         bFileCheck = sal_True;
     }
 
@@ -1117,10 +1117,10 @@ sal_Bool ModuleType::dumpHFile(FileStream& o)
     dumpNameSpace(o, sal_True, sal_True);
     o << "\n";
 
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    OString         fieldName;
-    OString         fieldType;
+    sal_uInt32 		fieldCount = m_reader.getFieldCount();
+    RTFieldAccess 	access = RT_ACCESS_INVALID;
+    OString 		fieldName;
+    OString 		fieldType;
     for (sal_uInt16 i=0; i < fieldCount; i++)
     {
         access = m_reader.getFieldAccess(i);
@@ -1147,8 +1147,8 @@ sal_Bool ModuleType::dumpHFile(FileStream& o)
 
 sal_Bool ModuleType::hasConstants()
 {
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
+    sal_uInt32 		fieldCount = m_reader.getFieldCount();
+    RTFieldAccess 	access = RT_ACCESS_INVALID;
 
     for (sal_uInt16 i=0; i < fieldCount; i++)
     {
@@ -1200,7 +1200,7 @@ sal_Bool ConstantsType::dump(IdlOptions* pOptions)
 
     if ( bFileExists && pOptions->isValid("-Gc") )
     {
-        tmpFileName  = createFileNameFromType(outPath, m_typeName, ".tml");
+        tmpFileName	 = createFileNameFromType(outPath, m_typeName, ".tml");
         bFileCheck = sal_True;
     }
 
@@ -1274,11 +1274,11 @@ sal_Bool StructureType::dumpHFile(FileStream& o)
     if (superType.getLength() > 0)
         dumpSuperMember(o, superType);
 
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    OString         fieldName;
-    OString         fieldType;
-    sal_uInt16      i=0;
+    sal_uInt32 		fieldCount = m_reader.getFieldCount();
+    RTFieldAccess 	access = RT_ACCESS_INVALID;
+    OString 		fieldName;
+    OString 		fieldType;
+    sal_uInt16 		i=0;
 
     for (i=0; i < fieldCount; i++)
     {
@@ -1320,10 +1320,10 @@ void StructureType::dumpSuperMember(FileStream& o, const OString& superType)
         {
             dumpSuperMember(o, aSuperReader.getSuperTypeName());
 
-            sal_uInt32      fieldCount = aSuperReader.getFieldCount();
-            RTFieldAccess   access = RT_ACCESS_INVALID;
-            OString         fieldName;
-            OString         fieldType;
+            sal_uInt32 		fieldCount = aSuperReader.getFieldCount();
+            RTFieldAccess 	access = RT_ACCESS_INVALID;
+            OString 		fieldName;
+            OString 		fieldType;
             for (sal_uInt16 i=0; i < fieldCount; i++)
             {
                 access = aSuperReader.getFieldAccess(i);
@@ -1393,11 +1393,11 @@ sal_Bool ExceptionType::dumpHFile(FileStream& o)
     if (superType.getLength() > 0)
         dumpSuperMember(o, superType);
 
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    OString         fieldName;
-    OString         fieldType;
-    sal_uInt16      i = 0;
+    sal_uInt32 		fieldCount = m_reader.getFieldCount();
+    RTFieldAccess 	access = RT_ACCESS_INVALID;
+    OString 		fieldName;
+    OString 		fieldType;
+    sal_uInt16 		i = 0;
 
     for (i=0; i < fieldCount; i++)
     {
@@ -1440,10 +1440,10 @@ void ExceptionType::dumpSuperMember(FileStream& o, const OString& superType)
         {
             dumpSuperMember(o, aSuperReader.getSuperTypeName());
 
-            sal_uInt32      fieldCount = aSuperReader.getFieldCount();
-            RTFieldAccess   access = RT_ACCESS_INVALID;
-            OString         fieldName;
-            OString         fieldType;
+            sal_uInt32 		fieldCount = aSuperReader.getFieldCount();
+            RTFieldAccess 	access = RT_ACCESS_INVALID;
+            OString 		fieldName;
+            OString 		fieldType;
             for (sal_uInt16 i=0; i < fieldCount; i++)
             {
                 access = aSuperReader.getFieldAccess(i);
@@ -1503,11 +1503,11 @@ sal_Bool EnumType::dumpHFile(FileStream& o)
     o << "\nenum " << m_name << "\n{\n";
     inc();
 
-    sal_uInt32      fieldCount = m_reader.getFieldCount();
-    RTFieldAccess   access = RT_ACCESS_INVALID;
-    RTConstValue    constValue;
-    OString         fieldName;
-    sal_uInt32      value=0;
+    sal_uInt32 		fieldCount = m_reader.getFieldCount();
+    RTFieldAccess 	access = RT_ACCESS_INVALID;
+    RTConstValue	constValue;
+    OString 		fieldName;
+    sal_uInt32		value=0;
     for (sal_uInt16 i=0; i < fieldCount; i++)
     {
         access = m_reader.getFieldAccess(i);
@@ -1528,7 +1528,7 @@ sal_Bool EnumType::dumpHFile(FileStream& o)
         OString aDoc = m_reader.getFieldDoku(i);
         if( aDoc.getLength() )
         */
-        //  o << "/**\n" << aDoc << "\n*/\n";
+        //	o << "/**\n" << aDoc << "\n*/\n";
         o << indent() << fieldName;
         if( i +1 < fieldCount )
             o << ",\n";
@@ -1612,7 +1612,7 @@ sal_Bool produceType(const OString& typeName,
         return sal_False;
 
     RTTypeClass typeClass = reader.getTypeClass();
-    sal_Bool    ret = sal_False;
+    sal_Bool 	ret = sal_False;
     switch (typeClass)
     {
         case RT_TYPE_INTERFACE:
@@ -1630,7 +1630,7 @@ sal_Bool produceType(const OString& typeName,
                 {
                     ret = mType.dump(pOptions);
                     if (ret) typeDependencies.setGenerated(typeName);
-//                  ret = mType.dumpDependedTypes(pOptions);
+//					ret = mType.dumpDependedTypes(pOptions);
                 } else
                 {
                     typeDependencies.setGenerated(typeName);
@@ -1677,7 +1677,7 @@ sal_Bool produceType(const OString& typeName,
                 {
                     ret = cType.dump(pOptions);
                     if (ret) typeDependencies.setGenerated(typeName);
-//                  ret = cType.dumpDependedTypes(pOptions);
+//					ret = cType.dumpDependedTypes(pOptions);
                 } else
                 {
                     typeDependencies.setGenerated(typeName);
diff --git a/codemaker/source/idlmaker/idltype.hxx b/codemaker/source/idlmaker/idltype.hxx
index 84ced9a9208f..d3fa71abff2b 100644
--- a/codemaker/source/idlmaker/idltype.hxx
+++ b/codemaker/source/idlmaker/idltype.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
 #ifndef INCLUDED_CODEMAKER_SOURCE_IDLMAKER_IDLTYPE_HXX
 #define INCLUDED_CODEMAKER_SOURCE_IDLMAKER_IDLTYPE_HXX
 
-#include    <codemaker/typemanager.hxx>
-#include    <codemaker/dependency.hxx>
+#include	<codemaker/typemanager.hxx>
+#include	<codemaker/dependency.hxx>
 
 enum BASETYPE
 {
@@ -39,7 +39,7 @@ enum BASETYPE
     BT_ANY,
     BT_TYPE,
     BT_BOOLEAN,
-    BT_CHAR,
+    BT_CHAR,		
     BT_STRING,
     BT_FLOAT,
     BT_DOUBLE,
@@ -59,7 +59,7 @@ enum IdlTypeDecl
     CPPUTYPEDECL_ALLTYPES,
     CPPUTYPEDECL_NOINTERFACES,
     CPPUTYPEDECL_ONLYINTERFACES
-};
+};	
 
 class IdlOptions;
 class FileStream;
@@ -69,7 +69,7 @@ class IdlType
 public:
     IdlType(TypeReader& typeReader,
              const ::rtl::OString& typeName,
-             const TypeManager& typeMgr,
+             const TypeManager& typeMgr, 
              const TypeDependency& typeDependencies);
 
     virtual ~IdlType();
@@ -88,34 +88,34 @@ public:
 
     virtual void dumpType(FileStream& o, const ::rtl::OString& type)
                     throw( CannotDumpException );
-    ::rtl::OString  getBaseType(const ::rtl::OString& type);
-    void    dumpIdlGetType(FileStream& o, const ::rtl::OString& type, sal_Bool bDecl=sal_False, IdlTypeDecl eDeclFlag=CPPUTYPEDECL_ALLTYPES);
+    ::rtl::OString	getBaseType(const ::rtl::OString& type);
+    void	dumpIdlGetType(FileStream& o, const ::rtl::OString& type, sal_Bool bDecl=sal_False, IdlTypeDecl eDeclFlag=CPPUTYPEDECL_ALLTYPES);
     BASETYPE isBaseType(const ::rtl::OString& type);
 
-    void    dumpConstantValue(FileStream& o, sal_uInt16 index);
+    void 	dumpConstantValue(FileStream& o, sal_uInt16 index);
 
     virtual sal_uInt32  getMemberCount();
-    virtual sal_uInt32  getInheritedMemberCount();
+    virtual sal_uInt32	getInheritedMemberCount();
 
-    void            inc(sal_uInt32 num=4);
-    void            dec(sal_uInt32 num=4);
-    ::rtl::OString  indent();
-    ::rtl::OString  indent(sal_uInt32 num);
+    void 			inc(sal_uInt32 num=4);
+    void 			dec(sal_uInt32 num=4);
+    ::rtl::OString 	indent();
+    ::rtl::OString	indent(sal_uInt32 num);
 protected:
-    virtual sal_uInt32  checkInheritedMemberCount(const TypeReader* pReader);
-
-    ::rtl::OString  checkSpecialIdlType(const ::rtl::OString& type);
-    ::rtl::OString  checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False);
+    virtual sal_uInt32	checkInheritedMemberCount(const TypeReader* pReader);
 
+    ::rtl::OString	checkSpecialIdlType(const ::rtl::OString& type);
+    ::rtl::OString	checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False);
+    
 protected:
-    sal_uInt32          m_inheritedMemberCount;
-
-    sal_uInt32          m_indentLength;
-    ::rtl::OString      m_typeName;
-    ::rtl::OString      m_name;
-    TypeReader          m_reader;
-    TypeManager&        m_typeMgr;
-    TypeDependency      m_dependencies;
+    sal_uInt32 			m_inheritedMemberCount;
+
+    sal_uInt32			m_indentLength;
+    ::rtl::OString		m_typeName;
+    ::rtl::OString		m_name;
+    TypeReader			m_reader;
+    TypeManager&		m_typeMgr;	
+    TypeDependency  	m_dependencies;	
 };
 
 class InterfaceType : public IdlType
@@ -123,26 +123,26 @@ class InterfaceType : public IdlType
 public:
     InterfaceType(TypeReader& typeReader,
                  const ::rtl::OString& typeName,
-                 const TypeManager& typeMgr,
+                 const TypeManager& typeMgr, 
                  const TypeDependency& typeDependencies);
 
     virtual ~InterfaceType();
 
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpHFile(FileStream& o) throw( CannotDumpException );
 
-    void        dumpAttributes(FileStream& o);
-    void        dumpMethods(FileStream& o);
+    void		dumpAttributes(FileStream& o);
+    void		dumpMethods(FileStream& o);
 
-    sal_uInt32  getMemberCount();
-    sal_uInt32  getInheritedMemberCount();
+    sal_uInt32	getMemberCount();
+    sal_uInt32	getInheritedMemberCount();
 
 protected:
-    sal_uInt32  checkInheritedMemberCount(const TypeReader* pReader);
+    sal_uInt32	checkInheritedMemberCount(const TypeReader* pReader);
 
 protected:
-    sal_uInt32  m_inheritedMemberCount;
-    sal_Bool    m_hasAttributes;
-    sal_Bool    m_hasMethods;
+    sal_uInt32 	m_inheritedMemberCount;
+    sal_Bool 	m_hasAttributes;
+    sal_Bool 	m_hasMethods;
 };
 
 class ModuleType : public IdlType
@@ -150,14 +150,14 @@ class ModuleType : public IdlType
 public:
     ModuleType(TypeReader& typeReader,
                   const ::rtl::OString& typeName,
-               const TypeManager& typeMgr,
+               const TypeManager& typeMgr, 
                const TypeDependency& typeDependencies);
 
     virtual ~ModuleType();
 
-    virtual sal_Bool    dump(IdlOptions* pOptions) throw( CannotDumpException );
-    sal_Bool            dumpHFile(FileStream& o) throw( CannotDumpException );
-    sal_Bool            hasConstants();
+    virtual sal_Bool 	dump(IdlOptions* pOptions) throw( CannotDumpException );
+    sal_Bool			dumpHFile(FileStream& o) throw( CannotDumpException );
+    sal_Bool			hasConstants();
 };
 
 class ConstantsType : public ModuleType
@@ -165,12 +165,12 @@ class ConstantsType : public ModuleType
 public:
     ConstantsType(TypeReader& typeReader,
                   const ::rtl::OString& typeName,
-               const TypeManager& typeMgr,
+               const TypeManager& typeMgr, 
                const TypeDependency& typeDependencies);
 
     virtual ~ConstantsType();
 
-    virtual sal_Bool    dump(IdlOptions* pOptions) throw( CannotDumpException );
+    virtual sal_Bool 	dump(IdlOptions* pOptions) throw( CannotDumpException );
 };
 
 class StructureType : public IdlType
@@ -178,14 +178,14 @@ class StructureType : public IdlType
 public:
     StructureType(TypeReader& typeReader,
                   const ::rtl::OString& typeName,
-                  const TypeManager& typeMgr,
+                  const TypeManager& typeMgr, 
                   const TypeDependency& typeDependencies);
 
     virtual ~StructureType();
 
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpHFile(FileStream& o) throw( CannotDumpException );
 
-    void        dumpSuperMember(FileStream& o, const ::rtl::OString& super);
+    void		dumpSuperMember(FileStream& o, const ::rtl::OString& super);
 };
 
 class ExceptionType : public IdlType
@@ -193,14 +193,14 @@ class ExceptionType : public IdlType
 public:
     ExceptionType(TypeReader& typeReader,
                   const ::rtl::OString& typeName,
-                  const TypeManager& typeMgr,
+                  const TypeManager& typeMgr, 
                   const TypeDependency& typeDependencies);
 
     virtual ~ExceptionType();
 
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpHFile(FileStream& o) throw( CannotDumpException );
 
-    void        dumpSuperMember(FileStream& o, const ::rtl::OString& super);
+    void		dumpSuperMember(FileStream& o, const ::rtl::OString& super);
 };
 
 class EnumType : public IdlType
@@ -208,12 +208,12 @@ class EnumType : public IdlType
 public:
     EnumType(TypeReader& typeReader,
               const ::rtl::OString& typeName,
-              const TypeManager& typeMgr,
+              const TypeManager& typeMgr, 
               const TypeDependency& typeDependencies);
 
     virtual ~EnumType();
 
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpHFile(FileStream& o) throw( CannotDumpException );
 };
 
 class TypeDefType : public IdlType
@@ -226,18 +226,18 @@ public:
 
     virtual ~TypeDefType();
 
-    sal_Bool    dumpHFile(FileStream& o) throw( CannotDumpException );
+    sal_Bool	dumpHFile(FileStream& o) throw( CannotDumpException );
 };
 
 
 sal_Bool produceType(const ::rtl::OString& typeName,
-                     TypeManager& typeMgr,
+                     TypeManager& typeMgr, 
                      TypeDependency& typeDependencies,
                      IdlOptions* pOptions)
                  throw( CannotDumpException );
 
 /**
- * This function returns a C++ scoped name, represents the namespace
+ * This function returns a C++ scoped name, represents the namespace 
  * scoping of this type, e.g. com:.sun::star::uno::XInterface. If the scope of
  * the type is equal scope, the relativ name will be used.
  */
diff --git a/codemaker/source/javamaker/classfile.cxx b/codemaker/source/javamaker/classfile.cxx
index 9ab2e4296228..4f6f6755ce00 100644
--- a/codemaker/source/javamaker/classfile.cxx
+++ b/codemaker/source/javamaker/classfile.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/source/javamaker/classfile.hxx b/codemaker/source/javamaker/classfile.hxx
index 57986a70aa18..72a5d0528800 100644
--- a/codemaker/source/javamaker/classfile.hxx
+++ b/codemaker/source/javamaker/classfile.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/source/javamaker/javamaker.cxx b/codemaker/source/javamaker/javamaker.cxx
index bb7ec071fb19..6a25bc728e25 100644
--- a/codemaker/source/javamaker/javamaker.cxx
+++ b/codemaker/source/javamaker/javamaker.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,18 +41,18 @@
 using namespace rtl;
 
 sal_Bool produceAllTypes(RegistryKey& rTypeKey, sal_Bool bIsExtraType,
-                         TypeManager const & typeMgr,
+                         TypeManager const & typeMgr, 
                          codemaker::GeneratedTypeSet & generated,
                          JavaOptions* pOptions,
                          sal_Bool bFullScope)
     throw( CannotDumpException )
 {
     OString typeName = typeMgr.getTypeName(rTypeKey);
-
+    
     if (!produceType(rTypeKey, bIsExtraType, typeMgr, generated, pOptions))
     {
-        fprintf(stderr, "%s ERROR: %s\n",
-                pOptions->getProgramName().getStr(),
+        fprintf(stderr, "%s ERROR: %s\n", 
+                pOptions->getProgramName().getStr(), 
                 OString("cannot dump Type '" + typeName + "'").getStr());
         exit(99);
     }
@@ -61,7 +61,7 @@ sal_Bool produceAllTypes(RegistryKey& rTypeKey, sal_Bool bIsExtraType,
     RegistryKeyList::const_iterator iter = typeKeys.begin();
     RegistryKey key, subKey;
     RegistryKeyArray subKeys;
-
+    
     while (iter != typeKeys.end())
     {
         key = (*iter).first;
@@ -84,25 +84,25 @@ sal_Bool produceAllTypes(RegistryKey& rTypeKey, sal_Bool bIsExtraType,
                         return sal_False;
                 }
             }
-        }
+        }      
 
         ++iter;
     }
-
-    return sal_True;
+    
+    return sal_True;			
 }
 
 sal_Bool produceAllTypes(const OString& typeName,
-                         TypeManager const & typeMgr,
+                         TypeManager const & typeMgr, 
                          codemaker::GeneratedTypeSet & generated,
                          JavaOptions* pOptions,
                          sal_Bool bFullScope)
     throw( CannotDumpException )
 {
-    if (!produceType(typeName, typeMgr, generated, pOptions))
+    if (!produceType(typeName, typeMgr,	generated, pOptions))
     {
-        fprintf(stderr, "%s ERROR: %s\n",
-                pOptions->getProgramName().getStr(),
+        fprintf(stderr, "%s ERROR: %s\n", 
+                pOptions->getProgramName().getStr(), 
                 OString("cannot dump Type '" + typeName + "'").getStr());
         exit(99);
     }
@@ -133,19 +133,19 @@ sal_Bool produceAllTypes(const OString& typeName,
                         return sal_False;
                 }
             }
-        }
-
+        }      
+        
         ++iter;
     }
-
-    return sal_True;
+    
+    return sal_True;			
 }
 
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
     JavaOptions options;
 
-    try
+    try 
     {
         if (!options.initOptions(argc, argv))
         {
@@ -159,7 +159,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     }
 
     RegistryTypeManager typeMgr;
-
+    
     if (!typeMgr.init(options.getInputFiles(), options.getExtraInputFiles()))
     {
         fprintf(stderr, "%s : init registries failed, check your registry files.\n", options.getProgramName().getStr());
@@ -171,7 +171,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         typeMgr.setBase(options.getOption("-B"));
     }
 
-    try
+    try 
     {
         if (options.isValid("-T"))
         {
@@ -184,7 +184,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
             do
             {
                 typeName = tOption.getToken(0, ';', nIndex);
-
+                
                 sal_Int32 nPos = typeName.lastIndexOf( '.' );
                 tmpName = typeName.copy( nPos != -1 ? nPos+1 : 0 );
                 if (tmpName == "*")
@@ -196,7 +196,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
                     } else
                     {
                         tmpName = typeName.copy(0, typeName.lastIndexOf('.')).replace('.', '/');
-                        if (tmpName.getLength() == 0)
+                        if (tmpName.getLength() == 0) 
                             tmpName = "/";
                         else
                             tmpName.replace('.', '/');
@@ -215,8 +215,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
                 if (!ret)
                 {
-                    fprintf(stderr, "%s ERROR: %s\n",
-                            options.getProgramName().getStr(),
+                    fprintf(stderr, "%s ERROR: %s\n", 
+                            options.getProgramName().getStr(), 
                             OString("cannot dump Type '" + typeName + "'").getStr());
                     exit(99);
                 }
@@ -227,8 +227,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
             codemaker::GeneratedTypeSet generated;
             if (!produceAllTypes("/", typeMgr, generated, &options, sal_True))
             {
-                fprintf(stderr, "%s ERROR: %s\n",
-                        options.getProgramName().getStr(),
+                fprintf(stderr, "%s ERROR: %s\n", 
+                        options.getProgramName().getStr(), 
                         "an error occurs while dumping all types.");
                 exit(99);
             }
@@ -236,8 +236,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     }
     catch( CannotDumpException& e)
     {
-        fprintf(stderr, "%s ERROR: %s\n",
-                options.getProgramName().getStr(),
+        fprintf(stderr, "%s ERROR: %s\n", 
+                options.getProgramName().getStr(), 
                 e.m_message.getStr());
         exit(99);
     }
diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx
index db4980ba6a69..105357c27ef4 100644
--- a/codemaker/source/javamaker/javaoptions.cxx
+++ b/codemaker/source/javamaker/javaoptions.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_codemaker.hxx"
-#include    <stdio.h>
+#include 	<stdio.h>
 #include <string.h>
 #include "javaoptions.hxx"
 #include "osl/process.h"
@@ -36,16 +36,16 @@
 
 using namespace rtl;
 
-sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
+sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) 
     throw( IllegalArgument )
 {
-    sal_Bool    ret = sal_True;
-    sal_uInt16  i=0;
+    sal_Bool 	ret = sal_True;
+    sal_uInt16	i=0;
 
     if (!bCmdFile)
     {
         bCmdFile = sal_True;
-
+        
         m_program = av[0];
 
         if (ac < 2)
@@ -60,7 +60,7 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
         i = 0;
     }
 
-    char    *s=NULL;
+    char	*s=NULL;
     for( ; i < ac; i++)
     {
         if (av[i][0] == '-')
@@ -81,14 +81,14 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     m_options["-O"] = OString(s);
                     break;
                 case 'B':
@@ -105,14 +105,14 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     m_options["-B"] = OString(s);
                     break;
                 case 'n':
@@ -122,7 +122,7 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             tmp += " your input '" + OString(av[i]) + "'";
                         throw IllegalArgument(tmp);
                     }
-
+                    
                     m_options["-nD"] = OString("");
                     break;
                 case 'T':
@@ -139,14 +139,14 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     if (m_options.count("-T") > 0)
                     {
                         OString tmp(m_options["-T"]);
@@ -184,7 +184,7 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
 
                         throw IllegalArgument(tmp);
                     }
-
+                    
                     m_options["-G"] = OString("");
                     break;
                 case 'X': // support for eXtra type rdbs
@@ -202,18 +202,18 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     m_extra_input_files.push_back( s );
                     break;
                 }
-
+                
                 default:
                     throw IllegalArgument("the option is unknown" + OString(av[i]));
             }
@@ -238,14 +238,14 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                         rargc++;
                     }
                     fclose(cmdFile);
-
+                    
                     ret = initOptions(rargc, rargv, bCmdFile);
-
-                    for (long j=0; j < rargc; j++)
+                    
+                    for (long j=0; j < rargc; j++) 
                     {
                         free(rargv[j]);
                     }
-                }
+                }		
             } else
             {
                 if (bCmdFile)
@@ -261,14 +261,14 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                     }
                     m_inputFiles.push_back(OUStringToOString(system_filepath, osl_getThreadTextEncoding()));
                 }
-            }
+            }		
         }
     }
+    
+    return ret;	
+}	
 
-    return ret;
-}
-
-OString JavaOptions::prepareHelp()
+OString	JavaOptions::prepareHelp()
 {
     OString help("\nusing: ");
     help += m_program + " [-options] file_1 ... file_n -Xfile_n+1 -Xfile_n+2\nOptions:\n";
@@ -277,7 +277,7 @@ OString JavaOptions::prepareHelp()
     help += "    -T<name>   = name specifies a type or a list of types. The output for this\n";
     help += "      [t1;...]   type and all dependent types are generated. If no '-T' option is \n";
     help += "                 specified, then output for all types is generated.\n";
-    help += "                 Example: 'com.sun.star.uno.XInterface' is a valid type.\n";
+    help += "                 Example: 'com.sun.star.uno.XInterface' is a valid type.\n";		
     help += "    -B<name>   = name specifies the base node. All types are searched under this\n";
     help += "                 node. Default is the root '/' of the registry files.\n";
     help += "    -nD        = no dependent types are generated.\n";
@@ -285,18 +285,18 @@ OString JavaOptions::prepareHelp()
     help += "    -Gc        = generate only target files which content will be changed.\n";
     help += "    -X<file>   = extra types which will not be taken into account for generation.\n";
     help += prepareVersion();
-
+    
     return help;
-}
+}	
 
-OString JavaOptions::prepareVersion()
+OString	JavaOptions::prepareVersion()
 {
     OString version("\nSun Microsystems (R) ");
     version += m_program + " Version 2.0\n\n";
 
     return version;
-}
-
+}	
 
+    
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/javamaker/javaoptions.hxx b/codemaker/source/javamaker/javaoptions.hxx
index e7f2f48b3960..5317529a32f6 100644
--- a/codemaker/source/javamaker/javaoptions.hxx
+++ b/codemaker/source/javamaker/javaoptions.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,16 +39,16 @@ public:
 
     ~JavaOptions() {}
 
-    sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
+    sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) 
             throw( IllegalArgument );
 
-    ::rtl::OString  prepareHelp();
-
-    ::rtl::OString  prepareVersion();
+    ::rtl::OString	prepareHelp();
 
+    ::rtl::OString	prepareVersion();
+    
 protected:
 };
-
+    
 #endif // INCLUDED_CODEMAKER_SOURCE_JAVAMAKER_JAVAOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx
index 4b99ef9f116b..0ef325ca3711 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -1873,7 +1873,7 @@ void handleAggregatingType(
     } else {
         if (
              (
-              typeClass == RT_TYPE_STRUCT &&
+              typeClass == RT_TYPE_STRUCT && 
               (
                fields == 0 ||
                (references == 0 ? superTypes > 1 : superTypes != 0)
@@ -3307,7 +3307,7 @@ bool produceType(
     codemaker::GeneratedTypeSet & generated, JavaOptions * options)
 {
     ::rtl::OString typeName = manager.getTypeName(rTypeKey);
-
+    
     OSL_ASSERT(options != 0);
     if (typeName.equals("/")
         || typeName.equals(manager.getBase())
diff --git a/codemaker/source/javamaker/javatype.hxx b/codemaker/source/javamaker/javatype.hxx
index e294aa6ab94f..dd507af7891a 100644
--- a/codemaker/source/javamaker/javatype.hxx
+++ b/codemaker/source/javamaker/javatype.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ bool produceType(
     rtl::OString const & type, TypeManager const & manager,
     codemaker::GeneratedTypeSet & generated, JavaOptions * pOptions);
 
-bool produceType(RegistryKey& typeName, bool bIsExtraType, TypeManager const & typeMgr,
+bool produceType(RegistryKey& typeName, bool bIsExtraType, TypeManager const & typeMgr, 
                  codemaker::GeneratedTypeSet & generated,
                  JavaOptions* pOptions);
 
diff --git a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
index 92d4d7024f62..a55cefacd538 100644
--- a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
+++ b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/test/cppumaker/types.idl b/codemaker/test/cppumaker/types.idl
index 9d9c70234ae3..20e2dad46ba1 100644
--- a/codemaker/test/cppumaker/types.idl
+++ b/codemaker/test/cppumaker/types.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/test/cppumaker/version.map b/codemaker/test/cppumaker/version.map
index 7321bbca16ad..f313c44bd7ad 100644
--- a/codemaker/test/cppumaker/version.map
+++ b/codemaker/test/cppumaker/version.map
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/test/javamaker/Test.java b/codemaker/test/javamaker/Test.java
index 532b9de76c9d..b1473555621c 100644
--- a/codemaker/test/javamaker/Test.java
+++ b/codemaker/test/javamaker/Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/test/javamaker/java15/Test.java b/codemaker/test/javamaker/java15/Test.java
index de5e43367198..968a369ff4b1 100644
--- a/codemaker/test/javamaker/java15/Test.java
+++ b/codemaker/test/javamaker/java15/Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/test/javamaker/java15/types.idl b/codemaker/test/javamaker/java15/types.idl
index b2f96818dd72..cc7291f50013 100644
--- a/codemaker/test/javamaker/java15/types.idl
+++ b/codemaker/test/javamaker/java15/types.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/codemaker/test/javamaker/types.idl b/codemaker/test/javamaker/types.idl
index 81710430acb7..a3fd9a646815 100644
--- a/codemaker/test/javamaker/types.idl
+++ b/codemaker/test/javamaker/types.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/inc/com/sun/star/uno/Any.h b/cppu/inc/com/sun/star/uno/Any.h
index eb29273c16aa..e4d1a559b574 100644
--- a/cppu/inc/com/sun/star/uno/Any.h
+++ b/cppu/inc/com/sun/star/uno/Any.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,13 +36,13 @@
 
 
 namespace com
-{
+{     
 namespace sun
-{
+{     
 namespace star
-{
+{     
 namespace uno
-{
+{     
 
 /** C++ class representing an IDL any.
     This class is used to transport any type defined in IDL. The class inherits from the
@@ -68,101 +68,101 @@ public:
     /** @internal */
     inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () )
         {}
-
+    
     /** Default constructor: Any holds no value; its type is void.
     */
     inline Any() SAL_THROW( () );
-
+    
     /** Templated ctor.  Sets a copy of the given value.
-
+        
         @param value value of the Any
     */
     template <typename T>
     explicit inline Any( T const & value );
     /// Ctor support for C++ bool.
     explicit inline Any( bool value );
-
+    
     /** Copy constructor: Sets value of the given any.
-
+        
         @param rAny another any
     */
     inline Any( const Any & rAny ) SAL_THROW( () );
-
+    
     /** Constructor: Sets a copy of the given data.
-
+        
         @param pData_ value
         @param rType type of value
     */
     inline Any( const void * pData_, const Type & rType ) SAL_THROW( () );
-
+    
     /** Constructor: Sets a copy of the given data.
-
+        
         @param pData_ value
         @param pTypeDescr type of value
     */
     inline Any( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW( () );
-
+    
     /** Constructor: Sets a copy of the given data.
-
+        
         @param pData_ value
         @param pType type of value
     */
     inline Any( const void * pData_, typelib_TypeDescriptionReference * pType ) SAL_THROW( () );
-
+    
     /** Destructor: Destructs any content and frees memory.
     */
     inline ~Any() SAL_THROW( () );
-
+    
     /** Assignment operator: Sets the value of the given any.
-
+        
         @param rAny another any (right side)
         @return this any
     */
     inline Any & SAL_CALL operator = ( const Any & rAny ) SAL_THROW( () );
-
+    
     /** Gets the type of the set value.
-
+        
         @return a Type object of the set value
      */
     inline const Type & SAL_CALL getValueType() const SAL_THROW( () )
         { return * reinterpret_cast< const Type * >( &pType ); }
     /** Gets the type of the set value.
-
+        
         @return the UNacquired type description reference of the set value
      */
     inline typelib_TypeDescriptionReference * SAL_CALL getValueTypeRef() const SAL_THROW( () )
         { return pType; }
-
+    
     /** Gets the type description of the set value. Provides ownership of the type description!
         Call an explicit typelib_typedescription_release() to release afterwards.
-
+        
         @param a pointer to type description pointer
     */
     inline void SAL_CALL getValueTypeDescription( typelib_TypeDescription ** ppTypeDescr ) const SAL_THROW( () )
         { ::typelib_typedescriptionreference_getDescription( ppTypeDescr, pType ); }
-
+    
     /** Gets the type class of the set value.
-
+        
         @return the type class of the set value
      */
     inline TypeClass SAL_CALL getValueTypeClass() const SAL_THROW( () )
         { return (TypeClass)pType->eTypeClass; }
-
+    
     /** Gets the type name of the set value.
-
+        
         @return the type name of the set value
     */
     inline ::rtl::OUString SAL_CALL getValueTypeName() const SAL_THROW( () );
-
+    
     /** Tests if any contains a value.
-
+        
         @return true if any has a value, false otherwise
     */
     inline sal_Bool SAL_CALL hasValue() const SAL_THROW( () )
         { return (typelib_TypeClass_VOID != pType->eTypeClass); }
-
+    
     /** Gets a pointer to the set value.
-
+        
         @return a pointer to the set value
     */
     inline const void * SAL_CALL getValue() const SAL_THROW( () )
@@ -185,66 +185,66 @@ public:
     template <typename T>
     inline T get() const;
 #endif // ! defined(EXCEPTIONS_OFF)
-
+    
     /** Sets a value. If the any already contains a value, that value will be destructed
         and its memory freed.
-
+        
         @param pData_ pointer to value
         @param rType type of value
     */
     inline void SAL_CALL setValue( const void * pData_, const Type & rType ) SAL_THROW( () );
     /** Sets a value. If the any already contains a value, that value will be destructed
         and its memory freed.
-
+        
         @param pData_ pointer to value
         @param pType type of value
     */
     inline void SAL_CALL setValue( const void * pData_, typelib_TypeDescriptionReference * pType ) SAL_THROW( () );
     /** Sets a value. If the any already contains a value, that value will be destructed
         and its memory freed.
-
+        
         @param pData_ pointer to value
         @param pTypeDescr type description of value
     */
     inline void SAL_CALL setValue( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW( () );
-
+    
     /** Clears this any. If the any already contains a value, that value will be destructed
         and its memory freed. After this has been called, the any does not contain a value.
     */
     inline void SAL_CALL clear() SAL_THROW( () );
-
+    
     /** Tests whether this any is extractable to a value of given type.
         Widening conversion without data loss is taken into account.
-
+        
         @param rType destination type
         @return true if this any is extractable to value of given type (e.g. using >>= operator)
     */
     inline sal_Bool SAL_CALL isExtractableTo( const Type & rType ) const SAL_THROW( () );
-
+    
     /** Tests whether this any can provide a value of specified type.
         Widening conversion without data loss is taken into account.
-
+        
         @return true if this any can provide a value of specified type
         (e.g. using >>= operator)
     */
     template <typename T>
     inline bool has() const;
-
+    
     /** Equality operator: compares two anys.
         The values need not be of equal type, e.g. a short integer is compared to a long integer.
-
+        
         @param rAny another any (right side)
         @return true if both any contains equal values
     */
     inline sal_Bool SAL_CALL operator == ( const Any & rAny ) const SAL_THROW( () );
     /** Unequality operator: compares two anys.
         The values need not be of equal type, e.g. a short integer is compared to a long integer.
-
+        
         @param rAny another any (right side)
         @return true if both any contains unequal values
     */
     inline sal_Bool SAL_CALL operator != ( const Any & rAny ) const SAL_THROW( () );
-
+    
 private:
     // not impl: forbid use with ambiguous type (sal_Unicode, sal_uInt16)
     explicit Any( sal_uInt16 );
@@ -293,7 +293,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, bool const & value )
 /** Template binary >>= operator to assign a value from an any.
     If the any does not contain a value that can be assigned without data loss, then this
     operation will fail returning false.
-
+    
     @tplparam C value type
     @param rAny source any (left side)
     @param value destination value (right side)
@@ -301,12 +301,12 @@ inline void SAL_CALL operator <<= ( Any & rAny, bool const & value )
 */
 template< class C >
 inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW( () );
-
+    
 /** Template equality operator: compares set value of left side any to right side value.
     The values need not be of equal type, e.g. a short integer is compared to a long integer.
     This operator can be implemented as template member function, if all supported compilers
     can cope with template member functions.
-
+    
     @tplparam C value type
     @param rAny another any (left side)
     @param value a value (right side)
@@ -318,7 +318,7 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_T
     The values need not be of equal type, e.g. a short integer is compared to a long integer.
     This operator can be implemented as template member function, if all supported compilers
     can cope with template member functions.
-
+    
     @tplparam C value type
     @param rAny another any (left side)
     @param value a value (right side)
@@ -369,10 +369,10 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & v
 }
 
 /** Gets the meta type of IDL type any.
-
+    
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-
+    
     @param dummy typed pointer for function signature
     @return type of IDL type any
 */
diff --git a/cppu/inc/com/sun/star/uno/Any.hxx b/cppu/inc/com/sun/star/uno/Any.hxx
index 8ea8c437dde2..da95bb8393b2 100644
--- a/cppu/inc/com/sun/star/uno/Any.hxx
+++ b/cppu/inc/com/sun/star/uno/Any.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,13 +36,13 @@
 #include "cppu/unotype.hxx"
 
 namespace com
-{
+{     
 namespace sun
-{
+{     
 namespace star
-{
+{     
 namespace uno
-{
+{     
 
 //__________________________________________________________________________________________________
 inline Any::Any() SAL_THROW( () )
@@ -183,7 +183,7 @@ inline sal_Bool Any::operator != ( const Any & rAny ) const SAL_THROW( () )
 //__________________________________________________________________________________________________
 template< class C >
 inline Any SAL_CALL makeAny( const C & value ) SAL_THROW( () )
-{
+{ 
     return Any( &value, ::cppu::getTypeFavourUnsigned(&value) );
 }
 
@@ -199,7 +199,7 @@ inline Any SAL_CALL makeAny( bool const & value ) SAL_THROW( () )
 //__________________________________________________________________________________________________
 template< class C >
 inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW( () )
-{
+{ 
     const Type & rType = ::cppu::getTypeFavourUnsigned(&value);
     ::uno_type_any_assign(
         &rAny, const_cast< C * >( &value ), rType.getTypeLibType(),
diff --git a/cppu/inc/com/sun/star/uno/Reference.h b/cppu/inc/com/sun/star/uno/Reference.h
index 071cadcfde7b..1ed01fcc7782 100644
--- a/cppu/inc/com/sun/star/uno/Reference.h
+++ b/cppu/inc/com/sun/star/uno/Reference.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,13 +32,13 @@
 
 
 namespace com
-{
+{     
 namespace sun
-{
+{     
 namespace star
-{
+{     
 namespace uno
-{
+{     
 
 class RuntimeException;
 class XInterface;
@@ -66,9 +66,9 @@ protected:
     /** the interface pointer
     */
     XInterface * _pInterface;
-
+    
     /** Queries given interface for type rType.
-
+        
         @param pInterface interface pointer
         @param rType interface type
         @return interface of demanded type (may be null)
@@ -78,7 +78,7 @@ protected:
 #ifndef EXCEPTIONS_OFF
     /** Queries given interface for type rType.
         Throws a RuntimeException if the demanded interface cannot be queried.
-
+        
         @param pInterface interface pointer
         @param rType interface type
         @return interface of demanded type
@@ -86,54 +86,54 @@ protected:
     inline static XInterface * SAL_CALL iquery_throw( XInterface * pInterface, const Type & rType )
         SAL_THROW( (RuntimeException) );
 #endif
-
+    
 public:
     /** Gets interface pointer. This call does not acquire the interface.
-
+        
         @return UNacquired interface pointer
     */
     inline XInterface * SAL_CALL get() const SAL_THROW( () )
         { return _pInterface; }
-
+    
     /** Checks if reference is null.
-
+        
         @return true if reference acquires an interface, i.e. true if it is not null
     */
     inline sal_Bool SAL_CALL is() const SAL_THROW( () )
         { return (0 != _pInterface); }
-
+    
     /** Equality operator: compares two interfaces
         Checks if both references are null or refer to the same object.
-
+        
         @param rRef another interface
         @return true if both references are null or refer to the same object, false otherwise
     */
     inline sal_Bool SAL_CALL operator == ( XInterface * pInterface ) const SAL_THROW( () );
     /** Unequality operator: compares two interfaces
         Checks if both references are null or refer to the same object.
-
+        
         @param rRef another interface
         @return false if both references are null or refer to the same object, true otherwise
     */
     inline sal_Bool SAL_CALL operator != ( XInterface * pInterface ) const SAL_THROW( () );
-
+    
     /** Equality operator: compares two interfaces
         Checks if both references are null or refer to the same object.
-
+        
         @param rRef another reference
         @return true if both references are null or refer to the same object, false otherwise
     */
     inline sal_Bool SAL_CALL operator == ( const BaseReference & rRef ) const SAL_THROW( () );
     /** Unequality operator: compares two interfaces
         Checks if both references are null or refer to the same object.
-
+        
         @param rRef another reference
         @return false if both references are null or refer to the same object, true otherwise
     */
     inline sal_Bool SAL_CALL operator != ( const BaseReference & rRef ) const SAL_THROW( () );
 
     /** Needed by some STL containers.
-
+        
         @param rRef another reference
         @return true, if this reference is less than rRef
     */
@@ -183,7 +183,7 @@ template< class interface_type >
 class Reference : public BaseReference
 {
     /** Queries given interface for type interface_type.
-
+        
         @param pInterface interface pointer
         @return interface of demanded type (may be null)
     */
@@ -192,14 +192,14 @@ class Reference : public BaseReference
 #ifndef EXCEPTIONS_OFF
     /** Queries given interface for type interface_type.
         Throws a RuntimeException if the demanded interface cannot be queried.
-
+        
         @param pInterface interface pointer
         @return interface of demanded type
     */
     inline static XInterface * SAL_CALL iquery_throw( XInterface * pInterface )
         SAL_THROW( (RuntimeException) );
     /** Returns the given interface if it is not <NULL/>, throws a RuntimeException otherwise.
-
+        
         @param pInterface interface pointer
         @return pInterface
     */
@@ -236,7 +236,7 @@ class Reference : public BaseReference
     static inline XInterface * castToXInterface(interface_type * p) {
         return static_cast< XInterface * >(static_cast< void * >(p));
     }
-
+    
 public:
     // these are here to force memory de/allocation to sal lib.
     /** @internal */
@@ -251,55 +251,55 @@ public:
     /** @internal */
     inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () )
         {}
-
+    
     /** Destructor: Releases interface if set.
     */
     inline ~Reference() SAL_THROW( () );
-
+    
     /** Default Constructor: Sets null reference.
     */
     inline Reference() SAL_THROW( () );
-
+    
     /** Copy constructor: Copies interface reference.
-
+        
         @param rRef another reference
     */
     inline Reference( const Reference< interface_type > & rRef ) SAL_THROW( () );
     /** Constructor: Sets given interface pointer.
-
+        
         @param pInterface an interface pointer
     */
     inline Reference( interface_type * pInterface ) SAL_THROW( () );
-
+    
     /** Constructor: Sets given interface pointer without acquiring it.
-
+        
         @param pInterface another reference
         @param dummy SAL_NO_ACQUIRE to force obvious distinction to other constructors
     */
     inline Reference( interface_type * pInterface, __sal_NoAcquire ) SAL_THROW( () );
     /** Constructor: Sets given interface pointer without acquiring it.
         Deprecated, please use SAL_NO_ACQUIRE version.
-
+        
         @deprecated
         @param pInterface another reference
         @param dummy UNO_REF_NO_ACQUIRE to force obvious distinction to other constructors
     */
     inline Reference( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW( () );
-
+    
     /** Constructor: Queries given interface for reference interface type (interface_type).
-
+        
         @param rRef another reference
         @param dummy UNO_QUERY or UNO_REF_QUERY to force obvious distinction to other constructors
     */
     inline Reference( const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) );
     /** Constructor: Queries given interface for reference interface type (interface_type).
-
+        
         @param pInterface an interface pointer
         @param dummy UNO_QUERY to force obvious distinction to other constructors
     */
     inline Reference( XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) );
     /** Constructor: Queries given any for reference interface type (interface_type).
-
+        
         @param rAny an any
         @param dummy UNO_QUERY to force obvious distinction to other constructors
     */
@@ -307,7 +307,7 @@ public:
 #ifndef EXCEPTIONS_OFF
     /** Constructor: Queries given interface for reference interface type (interface_type).
         Throws a RuntimeException if the demanded interface cannot be queried.
-
+        
         @param rRef another reference
         @param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction
                      to other constructors
@@ -315,7 +315,7 @@ public:
     inline Reference( const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) );
     /** Constructor: Queries given interface for reference interface type (interface_type).
         Throws a RuntimeException if the demanded interface cannot be queried.
-
+        
         @param pInterface an interface pointer
         @param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction
                      to other constructors
@@ -323,7 +323,7 @@ public:
     inline Reference( XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) );
     /** Constructor: Queries given any for reference interface type (interface_type).
         Throws a RuntimeException if the demanded interface cannot be queried.
-
+        
         @param rAny an any
         @param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction
                      to other constructors
@@ -348,47 +348,47 @@ public:
     */
     inline Reference( interface_type * pInterface, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) );
 #endif
-
+    
     /** Cast operator to Reference< XInterface >: Reference objects are binary compatible and
         any interface must be derived from com.sun.star.uno.XInterface.
         This a useful direct cast possibility.
     */
     inline SAL_CALL operator const Reference< XInterface > & () const SAL_THROW( () )
         { return * reinterpret_cast< const Reference< XInterface > * >( this ); }
-
+    
     /** Dereference operator: Used to call interface methods.
-
+        
         @return UNacquired interface pointer
     */
     inline interface_type * SAL_CALL operator -> () const SAL_THROW( () )
         { return castFromXInterface(_pInterface); }
-
+    
     /** Gets interface pointer. This call does not acquire the interface.
-
+        
         @return UNacquired interface pointer
     */
     inline interface_type * SAL_CALL get() const SAL_THROW( () )
         { return castFromXInterface(_pInterface); }
-
+    
     /** Clears reference, i.e. releases interface. Reference is null after clear() call.
     */
-    inline void SAL_CALL clear() SAL_THROW( () );
-
+    inline void	SAL_CALL clear() SAL_THROW( () );
+    
     /** Sets the given interface. An interface already set will be released.
-
+        
         @param rRef another reference
         @return true, if non-null interface was set
     */
     inline sal_Bool SAL_CALL set( const Reference< interface_type > & rRef ) SAL_THROW( () );
     /** Sets the given interface. An interface already set will be released.
-
+        
         @param pInterface another interface
         @return true, if non-null interface was set
     */
     inline sal_Bool SAL_CALL set( interface_type * pInterface ) SAL_THROW( () );
-
+    
     /** Sets interface pointer without acquiring it. An interface already set will be released.
-
+        
         @param pInterface an interface pointer
         @param dummy SAL_NO_ACQUIRE to force obvious distinction to set methods
         @return true, if non-null interface was set
@@ -403,10 +403,10 @@ public:
         @return true, if non-null interface was set
     */
     inline sal_Bool SAL_CALL set( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW( () );
-
+    
     /** Queries given interface for reference interface type (interface_type) and sets it.
         An interface already set will be released.
-
+        
         @param pInterface an interface pointer
         @param dummy UNO_QUERY or UNO_REF_QUERY to force obvious distinction to set methods
         @return true, if non-null interface was set
@@ -414,16 +414,16 @@ public:
     inline sal_Bool SAL_CALL set( XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) );
     /** Queries given interface for reference interface type (interface_type) and sets it.
         An interface already set will be released.
-
+        
         @param rRef another reference
         @param dummy UNO_QUERY or UNO_REF_QUERY to force obvious distinction to set methods
         @return true, if non-null interface was set
     */
     inline sal_Bool SAL_CALL set( const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) );
-
+    
     /** Queries given any for reference interface type (interface_type)
         and sets it.  An interface already set will be released.
-
+        
         @param rAny
                an Any containing an interface
         @param dummy
@@ -433,12 +433,12 @@ public:
                 true, if non-null interface was set
     */
     inline bool set( Any const & rAny, UnoReference_Query );
-
+    
 #ifndef EXCEPTIONS_OFF
     /** Queries given interface for reference interface type (interface_type) and sets it.
         An interface already set will be released.
         Throws a RuntimeException if the demanded interface cannot be set.
-
+        
         @param pInterface an interface pointer
         @param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction
                      to set methods
@@ -447,17 +447,17 @@ public:
     /** Queries given interface for reference interface type (interface_type) and sets it.
         An interface already set will be released.
         Throws a RuntimeException if the demanded interface cannot be set.
-
+        
         @param rRef another reference
         @param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction
                to set methods
     */
     inline void SAL_CALL set( const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) );
-
+    
     /** Queries given any for reference interface type (interface_type) and
         sets it.  An interface already set will be released.
         Throws a RuntimeException if the demanded interface cannot be set.
-
+        
         @param rAny
                an Any containing an interface
         @param dummy
@@ -468,7 +468,7 @@ public:
     /** sets the given interface
         An interface already set will be released.
         Throws a RuntimeException if the source interface is <NULL/>.
-
+        
         @param pInterface an interface pointer
         @param dummy UNO_SET_THROW to force obvious distinction to other set methods
 
@@ -478,39 +478,39 @@ public:
     /** sets the given interface
         An interface already set will be released.
         Throws a RuntimeException if the source interface is <NULL/>.
-
+        
         @param rRef an interface reference
         @param dummy UNO_SET_THROW to force obvious distinction to other set methods
 
         @since UDK 3.2.8
     */
     inline void SAL_CALL set( const Reference< interface_type > & rRef, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) );
-
+    
 #endif
-
+    
     /** Assignment operator: Acquires given interface pointer and sets reference.
         An interface already set will be released.
-
+        
         @param pInterface an interface pointer
         @return this reference
     */
     inline Reference< interface_type > & SAL_CALL operator = ( interface_type * pInterface ) SAL_THROW( () );
     /** Assignment operator: Acquires given interface reference and sets reference.
         An interface already set will be released.
-
+        
         @param rRef an interface reference
         @return this reference
     */
     inline Reference< interface_type > & SAL_CALL operator = ( const Reference< interface_type > & rRef ) SAL_THROW( () );
-
+    
     /** Queries given interface reference for type interface_type.
-
+        
         @param rRef interface reference
         @return interface reference of demanded type (may be null)
     */
     inline static Reference< interface_type > SAL_CALL query( const BaseReference & rRef ) SAL_THROW( (RuntimeException) );
     /** Queries given interface for type interface_type.
-
+        
         @param pInterface interface pointer
         @return interface reference of demanded type (may be null)
     */
diff --git a/cppu/inc/com/sun/star/uno/Reference.hxx b/cppu/inc/com/sun/star/uno/Reference.hxx
index 39e9614f20d8..d2a16a149a47 100644
--- a/cppu/inc/com/sun/star/uno/Reference.hxx
+++ b/cppu/inc/com/sun/star/uno/Reference.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,11 +34,11 @@
 #include <com/sun/star/uno/genfunc.hxx>
 
 namespace com
-{
+{     
 namespace sun
-{
+{     
 namespace star
-{
+{     
 namespace uno
 {
 
diff --git a/cppu/inc/com/sun/star/uno/Sequence.h b/cppu/inc/com/sun/star/uno/Sequence.h
index 942050866eae..8b6cda8f322e 100644
--- a/cppu/inc/com/sun/star/uno/Sequence.h
+++ b/cppu/inc/com/sun/star/uno/Sequence.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,19 +44,19 @@ class ByteSequence;
 }
 
 namespace com
-{
+{     
 namespace sun
-{
+{     
 namespace star
-{
+{     
 namespace uno
-{
+{     
 
 /** Template C++ class representing an IDL sequence. Template argument is the
     sequence element type.  C++ Sequences are reference counted and shared,
     so the sequence keeps a handle to its data.  To keep value semantics,
     copies are only generated if the sequence is to be modified (new handle).
-
+    
     @tplparam E element type of sequence
 */
 template< class E >
@@ -66,7 +66,7 @@ class Sequence
         @internal
     */
     uno_Sequence * _pSequence;
-
+    
 public:
     // these are here to force memory de/allocation to sal lib.
     /** @internal */
@@ -85,135 +85,135 @@ public:
     inline static void SAL_CALL operator delete ( void *, void * )
         SAL_THROW( () )
         {}
-
+    
     /** Static pointer to typelib type of sequence.
         Don't use directly, call getCppuType().
         @internal
     */
     static typelib_TypeDescriptionReference * s_pType;
-
+    
     /** typedefs the element type of the sequence
     */
     typedef E ElementType;
-
+    
     /** Default constructor: Creates an empty sequence.
     */
     inline Sequence() SAL_THROW( () );
-
+    
     /** Copy constructor: Creates a copy of given sequence.
-
+        
         @param rSeq another sequence of same type
     */
     inline Sequence( const Sequence< E > & rSeq ) SAL_THROW( () );
-
+    
     /** Constructor: Takes over ownership of given sequence.
-
+        
         @param pSequence a sequence
         @param dummy SAL_NO_ACQUIRE to force obvious distinction to other
         constructors
     */
     inline Sequence( uno_Sequence * pSequence, __sal_NoAcquire )
         SAL_THROW( () );
-
+    
     /** Constructor: Creates a copy of given elements.
-
+        
         @param pElement an array of elements
         @param len length of array
     */
     inline Sequence( const E * pElements, sal_Int32 len );
-
+    
     /** Constructor: Creates a default constructed sequence of given length.
-
+        
         @param len initial sequence length
     */
     inline Sequence( sal_Int32 len );
-
+    
     /** Destructor: Releases sequence handle. Last handle will destruct
         elements and free memory.
     */
     inline ~Sequence() SAL_THROW( () );
-
+    
     /** Assignment operator: Acquires given sequence handle and releases
         previously set handle.
-
+        
         @param rSeq another sequence of same type
         @return this sequence
     */
     inline Sequence< E > & SAL_CALL operator = ( const Sequence< E > & rSeq )
         SAL_THROW( () );
-
+    
     /** Gets length of the sequence.
-
+        
         @return length of sequence
     */
     inline sal_Int32 SAL_CALL getLength() const SAL_THROW( () )
         { return _pSequence->nElements; }
-
+    
     /** Tests whether the sequence has elements, i.e. elements count is
         greater than zero.
-
+        
         @return true, if elements count is greater than zero
     */
     inline sal_Bool SAL_CALL hasElements() const SAL_THROW( () )
         { return (_pSequence->nElements > 0); }
-
+    
     /** Gets a pointer to elements array for reading.
         If the sequence has a length of 0, then the returned pointer is
         undefined.
-
+        
         @return pointer to elements array
     */
     inline const E * SAL_CALL getConstArray() const SAL_THROW( () )
         { return reinterpret_cast< const E * >( _pSequence->elements ); }
-
+    
     /** Gets a pointer to elements array for reading and writing.
         In general if the sequence has a handle acquired by other sequences
         (reference count > 1), then a new sequence is created copy constructing
         all elements to keep value semantics!
         If the sequence has a length of 0, then the returned pointer is
         undefined.
-
+        
         @return pointer to elements array
     */
     inline E * SAL_CALL getArray();
-
+    
     /** Non-const index operator: Obtains a reference to element indexed at
         given position.
         The implementation does not check for array bounds!
         In general if the sequence has a handle acquired by other sequences
         (reference count > 1), then a new sequence is created copy constructing
         all elements to keep value semantics!
-
+        
         @param nIndex index
         @return non-const C++ reference to element
     */
     inline E & SAL_CALL operator [] ( sal_Int32 nIndex );
-
+    
     /** Const index operator: Obtains a reference to element indexed at
         given position.  The implementation does not check for array bounds!
-
+        
         @param nIndex index
         @return const C++ reference to element
     */
     inline const E & SAL_CALL operator [] ( sal_Int32 nIndex ) const
         SAL_THROW( () );
-
+    
     /** Equality operator: Compares two sequences.
-
+        
         @param rSeq another sequence of same type (right side)
         @return true if both sequences are equal, false otherwise
     */
     inline sal_Bool SAL_CALL operator == ( const Sequence< E > & rSeq ) const
         SAL_THROW( () );
-
+    
     /** Unequality operator: Compares two sequences.
-
+        
         @param rSeq another sequence of same type (right side)
         @return false if both sequences are equal, true otherwise
     */
     inline sal_Bool SAL_CALL operator != ( const Sequence< E > & rSeq ) const
         SAL_THROW( () );
-
+    
     /** Reallocates sequence to new length.
         If the new length is smaller than the former, then upper elements will
         be destructed (and their memory freed).  If the new length is greater
@@ -221,13 +221,13 @@ public:
         If the sequence has a handle acquired by other sequences
         (reference count > 1), then the remaining elements are copy constructed
         to a new sequence handle to keep value semantics!
-
+        
         @param nSize new size of sequence
     */
     inline void SAL_CALL realloc( sal_Int32 nSize );
-
+    
     /** Provides UNacquired sequence handle.
-
+        
         @return UNacquired sequence handle
     */
     inline uno_Sequence * SAL_CALL get() const SAL_THROW( () )
@@ -235,7 +235,7 @@ public:
 };
 
 /** Creates a UNO byte sequence from a SAL byte sequence.
-
+    
     @param rByteSequence a byte sequence
     @return a UNO byte sequence
 */
@@ -251,7 +251,7 @@ inline ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL toUnoSequence(
 
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-
+    
     @tplparam E element type of sequence
     @param dummy typed pointer for function signature
     @return type of IDL sequence
@@ -265,7 +265,7 @@ SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< E > * )
     This function has been introduced, because one cannot get the (templated)
     cppu type out of C++ array types.  Array types have special
     getCppuArrayTypeN() functions.
-
+    
     @attention
     the given element type must be the same as the template argument type!
     @tplparam E element type of sequence
@@ -279,7 +279,7 @@ SAL_CALL getCppuSequenceType( const ::com::sun::star::uno::Type & rElementType )
 
 /** Gets the meta type of IDL sequence< char >.
     This function has been introduced due to ambiguities with unsigned short.
-
+    
     @param dummy typed pointer for function signature
     @return type of IDL sequence< char >
 */
diff --git a/cppu/inc/com/sun/star/uno/Sequence.hxx b/cppu/inc/com/sun/star/uno/Sequence.hxx
index 8a9b43d1339e..ca94d0acbea9 100644
--- a/cppu/inc/com/sun/star/uno/Sequence.hxx
+++ b/cppu/inc/com/sun/star/uno/Sequence.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,11 +37,11 @@
 #include "cppu/unotype.hxx"
 
 namespace com
-{
+{     
 namespace sun
-{
+{     
 namespace star
-{
+{     
 namespace uno
 {
 
@@ -82,8 +82,8 @@ inline Sequence< E >::Sequence( const E * pElements, sal_Int32 len )
 {
     const Type & rType = ::cppu::getTypeFavourUnsigned( this );
 #if ! defined EXCEPTIONS_OFF
-    sal_Bool success =
-#endif
+    sal_Bool success = 
+#endif    
     ::uno_type_sequence_construct(
         &_pSequence, rType.getTypeLibType(),
         const_cast< E * >( pElements ), len, (uno_AcquireFunc)cpp_acquire );
@@ -99,8 +99,8 @@ inline Sequence< E >::Sequence( sal_Int32 len )
 {
     const Type & rType = ::cppu::getTypeFavourUnsigned( this );
 #if ! defined EXCEPTIONS_OFF
-    sal_Bool success =
-#endif
+    sal_Bool success = 
+#endif    
     ::uno_type_sequence_construct(
         &_pSequence, rType.getTypeLibType(),
         0, len, (uno_AcquireFunc)cpp_acquire );
@@ -158,7 +158,7 @@ inline E * Sequence< E >::getArray()
 {
     const Type & rType = ::cppu::getTypeFavourUnsigned( this );
 #if ! defined EXCEPTIONS_OFF
-    sal_Bool success =
+    sal_Bool success = 
 #endif
     ::uno_type_sequence_reference2One(
         &_pSequence, rType.getTypeLibType(),
@@ -197,7 +197,7 @@ inline void Sequence< E >::realloc( sal_Int32 nSize )
 {
     const Type & rType = ::cppu::getTypeFavourUnsigned( this );
 #if !defined EXCEPTIONS_OFF
-    sal_Bool success =
+    sal_Bool success = 
 #endif
     ::uno_type_sequence_realloc(
         &_pSequence, rType.getTypeLibType(), nSize,
diff --git a/cppu/inc/com/sun/star/uno/Type.h b/cppu/inc/com/sun/star/uno/Type.h
index 6490fa4ab7f1..56cf94aed642 100644
--- a/cppu/inc/com/sun/star/uno/Type.h
+++ b/cppu/inc/com/sun/star/uno/Type.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
  ************************************************************************/
 #ifndef _COM_SUN_STAR_UNO_TYPE_H_
 #define _COM_SUN_STAR_UNO_TYPE_H_
-
+                    
 #include <typelib/typedescription.h>
 #ifndef _COM_SUN_STAR_UNO_TYPECLASS_HDL_
 #include <com/sun/star/uno/TypeClass.hdl>
@@ -38,13 +38,13 @@
 
 
 namespace com
-{
+{     
 namespace sun
-{
+{     
 namespace star
-{
+{     
 namespace uno
-{
+{     
 
 /** Enum defining UNO_TYPE_NO_ACQUIRE for type description reference transfer.
 */
@@ -69,7 +69,7 @@ class Type
         @internal
     */
     typelib_TypeDescriptionReference * _pType;
-
+    
 public:
     // these are here to force memory de/allocation to sal lib.
     /** @internal */
@@ -84,118 +84,118 @@ public:
     /** @internal */
     inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () )
         {}
-
+    
     /** Default Constructor: Type is set to void.
     */
     inline Type() SAL_THROW( () );
-
+    
     /** Constructor: Type is constructed by given name and type class.
-
+        
         @param eTypeClass type class of type
         @param rTypeName name of type
     */
     inline Type( TypeClass eTypeClass, const ::rtl::OUString & rTypeName ) SAL_THROW( () );
-
+    
     /** Constructor: Type is constructed by given name and type class.
-
+        
         @param eTypeClass type class of type
         @param pTypeName name of type
     */
     inline Type( TypeClass eTypeClass, const sal_Char * pTypeName ) SAL_THROW( () );
-
+    
     /** Constructor: Type is (copy) constructed by given C type description reference.
-
+        
         @param pType C type description reference
     */
     inline Type( typelib_TypeDescriptionReference * pType ) SAL_THROW( () );
-
+    
     /** Constructor: Type is (copy) constructed by given C type description reference
         without acquiring it.
-
+        
         @param pType C type description reference
         @param dummy UNO_TYPE_NO_ACQUIRE to force obvious distinction to other constructors
     */
     inline Type( typelib_TypeDescriptionReference * pType, UnoType_NoAcquire ) SAL_THROW( () );
     /** Constructor: Type is (copy) constructed by given C type description reference
         without acquiring it.
-
+        
         @param pType C type description reference
         @param dummy SAL_NO_ACQUIRE to force obvious distinction to other constructors
     */
     inline Type( typelib_TypeDescriptionReference * pType, __sal_NoAcquire ) SAL_THROW( () );
-
+    
     /** Copy constructor: Type is copy constructed by given type.
-
+        
         @param rType another type
     */
     inline Type( const Type & rType ) SAL_THROW( () );
-
+    
     /** Destructor: Releases acquired C type description reference.
     */
     inline ~Type() SAL_THROW( () )
         { ::typelib_typedescriptionreference_release( _pType ); }
-
+    
     /** Assignment operator: Acquires right side type and releases previously set type.
-
+        
         @param rType another type (right side)
         @return this type
     */
     inline Type & SAL_CALL operator = ( const Type & rType ) SAL_THROW( () );
-
+    
     /** Gets the type class of set type.
-
+        
         @return type class of set type
     */
     inline TypeClass SAL_CALL getTypeClass() const SAL_THROW( () )
         { return (TypeClass)_pType->eTypeClass; }
-
+    
     /** Gets the name of the set type.
-
+        
         @return name of the set type
     */
     inline ::rtl::OUString SAL_CALL getTypeName() const SAL_THROW( () );
-
+    
     /** Obtains a full type description of set type.
-
+        
         @param ppDescr [inout] type description
     */
     inline void SAL_CALL getDescription( typelib_TypeDescription ** ppDescr ) const SAL_THROW( () )
         { ::typelib_typedescriptionreference_getDescription( ppDescr, _pType ); }
-
+    
     /** Gets the C typelib type description reference pointer. Does not acquire the reference!
-
+        
         @return UNacquired type description reference
     */
     inline typelib_TypeDescriptionReference * SAL_CALL getTypeLibType() const SAL_THROW( () )
         { return _pType; }
-
+    
     /** Tests if values of this reflected type can be assigned by values of given type.
         This includes widening conversion (e.g., long assignable from short), as long as there
         is no data loss.
-
+        
         @param rType another type
         @return true if values of this type can be assigned from values of given type,
                 false otherwise
     */
     inline sal_Bool SAL_CALL isAssignableFrom( const Type & rType ) const SAL_THROW( () )
         { return ::typelib_typedescriptionreference_isAssignableFrom( _pType, rType._pType ); }
-
+    
     /** Compares two types.
-
+        
         @param rType another type
         @return true if both types refer the same type, false otherwise
     */
     inline sal_Bool SAL_CALL equals( const Type & rType ) const SAL_THROW( () )
         { return ::typelib_typedescriptionreference_equals( _pType, rType._pType ); }
     /** Equality operator: Compares two types.
-
+        
         @param rType another type
         @return true if both types refer the same type, false otherwise
     */
     inline sal_Bool SAL_CALL operator == ( const Type & rType ) const SAL_THROW( () )
         { return ::typelib_typedescriptionreference_equals( _pType, rType._pType ); }
     /** Unequality operator: Compares two types.
-
+        
         @param rType another type
         @return false if both types refer the same type, true otherwise
     */
@@ -221,7 +221,7 @@ public:
 
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-
+    
     @param dummy typed pointer for function signature
     @return type of IDL type "type"
 */
@@ -232,35 +232,35 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::su
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuVoidType() SAL_THROW( () );
 /** Gets the meta type of IDL type void.
-
+    
     @return type of IDL type void
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getVoidCppuType() SAL_THROW( () );
 
 /** Gets the meta type of IDL type boolean.
-
+    
     @return type of IDL type boolean
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuBooleanType() SAL_THROW( () );
 /** Gets the meta type of IDL type boolean.
-
+    
     @return type of IDL type boolean
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getBooleanCppuType() SAL_THROW( () );
 /** Gets the meta type of IDL type boolean.
-
+    
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-
+    
     @param dummy typed pointer for function signature
     @return type of IDL type boolean
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Bool * ) SAL_THROW( () );
 /** Gets the meta type of IDL type boolean.
-
+    
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-
+    
     @param dummy typed pointer for function signature
     @return type of IDL type boolean
 */
@@ -268,153 +268,153 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType(
     bool const * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type char.
-
+    
     @return type of IDL type char
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCharCppuType() SAL_THROW( () );
 /** Gets the meta type of IDL type char.
-
+    
     @return type of IDL type char
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuCharType() SAL_THROW( () );
 
 /** Gets the meta type of IDL type byte.
-
+    
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-
+    
     @param dummy typed pointer for function signature
     @return type of IDL type byte
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int8 * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type string.
-
+    
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-
+    
     @param dummy typed pointer for function signature
     @return type of IDL type string
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::rtl::OUString * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type short.
-
+    
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-
+    
     @param dummy typed pointer for function signature
     @return type of IDL type short
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int16 * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type unsigned short.
-
+    
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-
+    
     @param dummy typed pointer for function signature
     @return type of IDL type unsigned short
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt16 * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type long.
-
+    
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-
+    
     @param dummy typed pointer for function signature
     @return type of IDL type long
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int32 * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type unsigned long.
-
+    
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-
+    
     @param dummy typed pointer for function signature
     @return type of IDL type unsigned long
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt32 * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type hyper.
-
+    
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-
+    
     @param dummy typed pointer for function signature
     @return type of IDL type hyper
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int64 * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type unsigned hyper.
-
+    
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-
+    
     @param dummy typed pointer for function signature
     @return type of IDL type unsigned hyper
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt64 * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type float.
-
+    
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-
+    
     @param dummy typed pointer for function signature
     @return type of IDL type float
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const float * ) SAL_THROW( () );
 
 /** Gets the meta type of IDL type double.
-
+    
     There are cases (involving templates) where uses of getCppuType are known to
     not compile.  Use cppu::UnoType or cppu::getTypeFavourUnsigned instead.
-
+    
     @param dummy typed pointer for function signature
     @return type of IDL type double
 */
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const double * ) SAL_THROW( () );
 
 /** Array template function to get meta type for one-dimensional arrays.
-
+    
     @param pT array pointer
     @return type of array
 */
 template< class T >
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType1( T * pT ) SAL_THROW( () );
 /** Array template function to get meta type for two-dimensional arrays.
-
+    
     @param pT array pointer
     @return type of array
 */
 template< class T >
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType2( T * pT ) SAL_THROW( () );
 /** Array template function to get meta type for three-dimensional arrays.
-
+    
     @param pT array pointer
     @return type of array
 */
 template< class T >
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType3( T * pT ) SAL_THROW( () );
 /** Array template function to get meta type for four-dimensional arrays.
-
+    
     @param pT array pointer
     @return type of array
 */
 template< class T >
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType4( T * pT ) SAL_THROW( () );
 /** Array template function to get meta type for five-dimensional arrays.
-
+    
     @param pT array pointer
     @return type of array
 */
 template< class T >
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType5( T * pT ) SAL_THROW( () );
 /** Array template function to get meta type for six-dimensional arrays.
-
+    
     @param pT array pointer
     @return type of array
 */
diff --git a/cppu/inc/com/sun/star/uno/Type.hxx b/cppu/inc/com/sun/star/uno/Type.hxx
index 46fd86329424..83f7aff9789c 100644
--- a/cppu/inc/com/sun/star/uno/Type.hxx
+++ b/cppu/inc/com/sun/star/uno/Type.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,11 +33,11 @@
 #include "cppu/unotype.hxx"
 
 namespace com
-{
+{     
 namespace sun
-{
+{     
 namespace star
-{
+{     
 namespace uno
 {
 
diff --git a/cppu/inc/com/sun/star/uno/genfunc.h b/cppu/inc/com/sun/star/uno/genfunc.h
index 1b0dbd2c4cce..168a98fdcf04 100644
--- a/cppu/inc/com/sun/star/uno/genfunc.h
+++ b/cppu/inc/com/sun/star/uno/genfunc.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,28 +33,28 @@
 typedef struct _typelib_TypeDescriptionReference typelib_TypeDescriptionReference;
 
 namespace com
-{
+{     
 namespace sun
-{
+{     
 namespace star
-{
+{     
 namespace uno
-{
+{     
 
 /** Function to acquire a C++ interface.
-
+    
     @param pCppI C++ interface pointer
 */
 inline void SAL_CALL cpp_acquire( void * pCppI )
     SAL_THROW( () );
 /** Function to release a C++ interface.
-
+    
     @param pCppI C++ interface pointer
 */
 inline void SAL_CALL cpp_release( void * pCppI )
     SAL_THROW( () );
 /** Function to query for a C++ interface.
-
+    
     @param pCppI C++ interface pointer
     @param pType demanded interface type
     @return acquired C++ interface pointer or null
diff --git a/cppu/inc/com/sun/star/uno/genfunc.hxx b/cppu/inc/com/sun/star/uno/genfunc.hxx
index 88234bd81389..097fb87aef09 100644
--- a/cppu/inc/com/sun/star/uno/genfunc.hxx
+++ b/cppu/inc/com/sun/star/uno/genfunc.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,13 +33,13 @@
 
 
 namespace com
-{
+{     
 namespace sun
-{
+{     
 namespace star
-{
+{     
 namespace uno
-{
+{     
 
 //==================================================================================================
 inline void SAL_CALL cpp_acquire( void * pCppI )
diff --git a/cppu/inc/cppu/Enterable.hxx b/cppu/inc/cppu/Enterable.hxx
index b378ca44e147..cf238edb0049 100644
--- a/cppu/inc/cppu/Enterable.hxx
+++ b/cppu/inc/cppu/Enterable.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 #include "uno/Enterable.h"
 #include "rtl/ustring.hxx"
 
-namespace cppu
+namespace cppu 
 {
 /** C++ wrapper for binary C Enterable
     (http://wiki.services.openoffice.org/wiki/Uno/Cpp/Spec/Environment_Stack)
@@ -74,15 +74,15 @@ private:
 
 extern "C" inline void Enterable_call_enter (void * context) { ((Enterable *)context)->v_enter(); };
 extern "C" inline void Enterable_call_leave (void * context) { ((Enterable *)context)->v_leave(); };
-extern "C" inline void Enterable_call_callInto_v(void * context, uno_EnvCallee * pCallee, va_list * pParam)
+extern "C" inline void Enterable_call_callInto_v(void * context, uno_EnvCallee * pCallee, va_list * pParam) 
     { ((Enterable *)context)->v_callInto_v(pCallee, pParam); };
-extern "C" inline void Enterable_call_callOut_v (void * context, uno_EnvCallee * pCallee, va_list * pParam)
+extern "C" inline void Enterable_call_callOut_v (void * context, uno_EnvCallee * pCallee, va_list * pParam) 
     { ((Enterable *)context)->v_callOut_v(pCallee, pParam); };
 extern "C" inline int  Enterable_call_isValid   (void * context, rtl_uString ** pReason)
     {return ((Enterable *)context)->v_isValid((rtl::OUString *)pReason);}
 
 
-Enterable::Enterable(void)
+Enterable::Enterable(void) 
 {
     m_enter      = Enterable_call_enter;
     m_leave      = Enterable_call_leave;
diff --git a/cppu/inc/cppu/EnvDcp.hxx b/cppu/inc/cppu/EnvDcp.hxx
index 68adf63017c3..d35e8f2865c4 100644
--- a/cppu/inc/cppu/EnvDcp.hxx
+++ b/cppu/inc/cppu/EnvDcp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,18 +33,18 @@
 #include "uno/EnvDcp.h"
 
 
-namespace cppu
+namespace cppu 
 {
 namespace EnvDcp
 {
 /** Get the OBI type part of an environment descriptor.
     (http://wiki.services.openoffice.org/wiki/Uno/Cpp/Spec/Environment_Descriptor)
-
+    
     @param  rEnvDcp        the Environment Descriptor
     @return                the OBI type
     @since UDK 3.2.7
 */
-inline rtl::OUString getTypeName(rtl::OUString const & rEnvDcp)
+inline rtl::OUString getTypeName(rtl::OUString const & rEnvDcp) 
 {
     rtl::OUString typeName;
 
@@ -55,7 +55,7 @@ inline rtl::OUString getTypeName(rtl::OUString const & rEnvDcp)
 
 /** Get the purpose part of an environment descriptor.
     (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Descriptor)
-
+    
     @param  rEnvDcp        the Environment Descriptor
     @return                the purpose
     @since UDK 3.2.7
diff --git a/cppu/inc/cppu/EnvGuards.hxx b/cppu/inc/cppu/EnvGuards.hxx
index 07f65b2aced9..b03f54ff0c6b 100644
--- a/cppu/inc/cppu/EnvGuards.hxx
+++ b/cppu/inc/cppu/EnvGuards.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,25 +59,25 @@ namespace cppu
             }
         }
 
-        ~EnvGuard()
-        {
-            m_env.enter();
+        ~EnvGuard() 
+        { 
+            m_env.enter(); 
         }
 
         /** Checks if the associated environment is non empty.
-
+    
             @return  0 == empty, 1 == non empty
         */
         sal_Bool SAL_CALL is() const SAL_THROW( () )
-        {
-            return m_env.is();
+        { 
+            return m_env.is(); 
         }
 
         /** Leaves the associated environment and clears
             the reference.
         */
-        void clear()
-        {
+        void clear() 
+        { 
             if (m_env.is())
             {
                 m_env.enter();
@@ -104,12 +104,12 @@ namespace cppu
             uno_Environment_enter(NULL);
         }
 
-        ~AntiEnvGuard()
-        {
+        ~AntiEnvGuard() 
+        { 
             m_env.enter();
         }
     };
-}
+} 
 
 #endif
 
diff --git a/cppu/inc/cppu/FreeReference.hxx b/cppu/inc/cppu/FreeReference.hxx
index 5a8d22175921..4a1ffb96889e 100644
--- a/cppu/inc/cppu/FreeReference.hxx
+++ b/cppu/inc/cppu/FreeReference.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -77,7 +77,7 @@ namespace cppu
 
         FreeReference(FreeReference<T> const & rOther)
             : m_env    (rOther.m_env),
-              m_pObject(rOther.m_pObject)
+              m_pObject(rOther.m_pObject) 
         {
             if (m_pObject)
                 m_env.get()->pExtEnv->acquireInterface(m_env.get()->pExtEnv, m_pObject);
@@ -118,7 +118,7 @@ namespace cppu
         {
             if (m_pObject)
             {
-
+                
                 m_env.get()->pExtEnv->releaseInterface(m_env.get()->pExtEnv, m_pObject);
                 m_pObject = NULL;
                 m_env.clear();
@@ -147,7 +147,7 @@ namespace cppu
             if (m_pObject)
             {
                 m_env = cssuno::Environment::getCurrent();
-
+                
                 m_env.get()->pExtEnv->acquireInterface(m_env.get()->pExtEnv, m_pObject);
             }
         }
@@ -162,7 +162,7 @@ namespace cppu
             return !operator==(rOther);
         }
     };
-}
+} 
 
 #endif
 
diff --git a/cppu/inc/cppu/Map.hxx b/cppu/inc/cppu/Map.hxx
index a5922f830b5d..c664806c3aef 100644
--- a/cppu/inc/cppu/Map.hxx
+++ b/cppu/inc/cppu/Map.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ namespace cppu
     template<class T> inline T * mapOut(T * pT, cssu::Environment const & outerEnv)
     {
         cssu::Mapping curr2outer(cssu::Environment::getCurrent(), outerEnv);
-
+        
         return reinterpret_cast<T *>(curr2outer.mapInterface(pT, getCppuType((cssu::Reference<T> *)NULL)));
     }
 
@@ -65,7 +65,7 @@ namespace cppu
     template<class T> inline T * mapIn(T * pT, cssu::Environment const & outerEnv)
     {
         cssu::Mapping outer2curr(outerEnv, cssu::Environment::getCurrent());
-
+        
         return reinterpret_cast<T *>(outer2curr.mapInterface(pT, getCppuType((cssu::Reference<T> *)NULL)));
     }
 
@@ -81,7 +81,7 @@ namespace cppu
     inline void mapOutAny(cssu::Any const & any, cssu::Any * res, cssu::Environment const & outerEnv)
     {
         cssu::Mapping curr2outer(cssu::Environment::getCurrent(), outerEnv);
-
+        
         uno_any_destruct(res, (uno_ReleaseFunc)cssu::cpp_release);
         uno_type_any_constructAndConvert(
             res,
@@ -101,7 +101,7 @@ namespace cppu
     inline void mapInAny(cssu::Any const & any, cssu::Any * res, cssu::Environment const & outerEnv)
     {
         cssu::Mapping outer2curr(outerEnv, cssu::Environment::getCurrent());
-
+        
         uno_any_destruct(res, (uno_ReleaseFunc)cssu::cpp_release);
         uno_type_any_constructAndConvert(
             res,
diff --git a/cppu/inc/cppu/Shield.hxx b/cppu/inc/cppu/Shield.hxx
index 1e7221a210d3..2eb0f93ce7b8 100644
--- a/cppu/inc/cppu/Shield.hxx
+++ b/cppu/inc/cppu/Shield.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,7 +62,7 @@ namespace cppu
     {
         return mapIn(pT, cssu::Environment(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV)))));
     }
-
+    
 
     /** Maps an any from the current to the thread-safe Environment, fills the passed any.
 
diff --git a/cppu/inc/cppu/helper/purpenv/Environment.hxx b/cppu/inc/cppu/helper/purpenv/Environment.hxx
index 25c9de8e8a6e..1b96e2f3486b 100644
--- a/cppu/inc/cppu/helper/purpenv/Environment.hxx
+++ b/cppu/inc/cppu/helper/purpenv/Environment.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/inc/cppu/helper/purpenv/Mapping.hxx b/cppu/inc/cppu/helper/purpenv/Mapping.hxx
index 6bdcd207987f..27dd1e8e11cf 100644
--- a/cppu/inc/cppu/helper/purpenv/Mapping.hxx
+++ b/cppu/inc/cppu/helper/purpenv/Mapping.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -63,7 +63,7 @@ void createMapping(uno_Mapping     ** ppMapping,
                    ProbeFun         * probeFun  = NULL,
                    void             * pContext  = NULL
     );
-
+    
 }}}
 
 #endif
diff --git a/cppu/inc/cppu/macros.hxx b/cppu/inc/cppu/macros.hxx
index 5c123e7aecd9..e62594b981ff 100644
--- a/cppu/inc/cppu/macros.hxx
+++ b/cppu/inc/cppu/macros.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 #include <uno/lbnames.h>
 
 /** Namespace name for compiler/ platform, e.g. gcc3, msci */
-#define CPPU_CURRENT_NAMESPACE CPPU_ENV
+#define	CPPU_CURRENT_NAMESPACE CPPU_ENV
 
 /** Patching the GCC 3 incomatible alignment change for Linux.
 
@@ -62,6 +62,6 @@
 #define CPPU_GCC_DLLPUBLIC_EXPORT SAL_EXCEPTION_DLLPUBLIC_EXPORT
 #define CPPU_GCC_DLLPRIVATE SAL_EXCEPTION_DLLPRIVATE
 
-#endif  // _CPPU_MACROS_HXX_
+#endif	// _CPPU_MACROS_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/cppu/unotype.hxx b/cppu/inc/cppu/unotype.hxx
index b8df4e07a1b0..6c176a05d617 100644
--- a/cppu/inc/cppu/unotype.hxx
+++ b/cppu/inc/cppu/unotype.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/inc/pch/precompiled_cppu.cxx b/cppu/inc/pch/precompiled_cppu.cxx
index 2a6a6cb94ae0..0b9c5e7e876d 100644
--- a/cppu/inc/pch/precompiled_cppu.cxx
+++ b/cppu/inc/pch/precompiled_cppu.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/inc/pch/precompiled_cppu.hxx b/cppu/inc/pch/precompiled_cppu.hxx
index c6624e57b5ca..e82823cb5416 100644
--- a/cppu/inc/pch/precompiled_cppu.hxx
+++ b/cppu/inc/pch/precompiled_cppu.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/inc/typelib/typeclass.h b/cppu/inc/typelib/typeclass.h
index 231c9d9f5fe3..493f7425c9a5 100644
--- a/cppu/inc/typelib/typeclass.h
+++ b/cppu/inc/typelib/typeclass.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/inc/typelib/typedescription.h b/cppu/inc/typelib/typedescription.h
index 2758d0914ca9..c188261d2154 100644
--- a/cppu/inc/typelib/typedescription.h
+++ b/cppu/inc/typelib/typedescription.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,76 +53,76 @@ typedef struct _typelib_TypeDescriptionReference
     /** reference count of type; don't ever modify this by yourself, use
         typelib_typedescriptionreference_acquire() and typelib_typedescriptionreference_release()
     */
-    sal_Int32                           nRefCount;
+    sal_Int32							nRefCount;
     /** number of static references of type, because of the fact that some types are needed
         until program termination and are commonly held static.
     */
-    sal_Int32                           nStaticRefCount;
+    sal_Int32							nStaticRefCount;
     /** type class of type
     */
-    typelib_TypeClass                   eTypeClass;
+    typelib_TypeClass					eTypeClass;
     /** fully qualified name of type
-    */
-    rtl_uString *                       pTypeName;
+    */ 
+    rtl_uString *						pTypeName;
     /** pointer to full typedescription; this value is only valid if the type is never swapped out
     */
-    struct _typelib_TypeDescription *   pType;
+    struct _typelib_TypeDescription *	pType;
     /** pointer to optimize the runtime; not for public use
     */
-    void *                              pUniqueIdentifier;
+    void *								pUniqueIdentifier;
     /** reserved for future use; 0 if not used
     */
-    void *                              pReserved;
+    void *								pReserved;
 } typelib_TypeDescriptionReference;
 
 /** Full type description of a type. Memory layout of this struct is identical to the
     typelib_TypeDescriptionReference for the first six members.
-    So a typedescription can be used as type reference.
+    So a typedescription can be used as type reference. 
 */
 typedef struct _typelib_TypeDescription
 {
     /** reference count; don't ever modify this by yourself, use
         typelib_typedescription_acquire() and typelib_typedescription_release()
     */
-    sal_Int32                           nRefCount;
+    sal_Int32							nRefCount;
     /** number of static references of type, because of the fact that some types are needed
         until program termination and are commonly held static.
     */
-    sal_Int32                           nStaticRefCount;
+    sal_Int32							nStaticRefCount;
     /** type class of type
     */
-    typelib_TypeClass                   eTypeClass;
+    typelib_TypeClass					eTypeClass;	
     /** fully qualified name of type
-    */
-    rtl_uString *                       pTypeName;
+    */ 
+    rtl_uString *						pTypeName;
     /** pointer to self to distinguish reference from description; for internal use only
     */
-    struct _typelib_TypeDescription *   pSelf;
+    struct _typelib_TypeDescription *	pSelf;
     /** pointer to optimize the runtime; not for public use
     */
-    void *                              pUniqueIdentifier;
+    void *								pUniqueIdentifier;
     /** reserved for future use; 0 if not used
     */
-    void *                              pReserved;
-
+    void *								pReserved;
+    
     /** flag to determine whether the description is complete:
         compound and union types lack of member names, enums lack of member types and names,
         interfaces lack of members and table init.
         Call typelib_typedescription_complete() if false.
     */
-    sal_Bool                            bComplete;
+    sal_Bool							bComplete;
     /** size of type
     */
-    sal_Int32                           nSize;
+    sal_Int32							nSize;
     /** alignment of type
     */
-    sal_Int32                           nAlignment;
+    sal_Int32							nAlignment;
     /** pointer to weak reference
     */
-    typelib_TypeDescriptionReference *  pWeakRef;
+    typelib_TypeDescriptionReference *	pWeakRef;
     /** determines, if type can be unloaded (and it is possible to reloaded it)
     */
-    sal_Bool                            bOnDemand;
+    sal_Bool							bOnDemand;
 } typelib_TypeDescription;
 
 /** Type description for exception types.
@@ -131,24 +131,24 @@ typedef struct _typelib_CompoundTypeDescription
 {
     /** inherits all members of typelib_TypeDescription
     */
-    typelib_TypeDescription             aBase;
-
+    typelib_TypeDescription				aBase;
+    
     /** pointer to base type description, else 0
     */
     struct _typelib_CompoundTypeDescription * pBaseTypeDescription;
-
+    
     /** number of members
     */
-    sal_Int32                           nMembers;
+    sal_Int32							nMembers;
     /** byte offsets of each member including the size the base type
     */
-    sal_Int32 *                         pMemberOffsets;
+    sal_Int32 *							pMemberOffsets;
     /** members of the struct or exception
     */
-    typelib_TypeDescriptionReference ** ppTypeRefs;
+    typelib_TypeDescriptionReference **	ppTypeRefs;
     /** member names of the struct or exception
     */
-    rtl_uString **                      ppMemberNames;
+    rtl_uString **						ppMemberNames;
 } typelib_CompoundTypeDescription;
 
 /**
@@ -182,33 +182,33 @@ typedef struct _typelib_UnionTypeDescription
 {
     /** inherits all members of typelib_TypeDescription
     */
-    typelib_TypeDescription             aBase;
-
+    typelib_TypeDescription				aBase;
+    
     /** type of the discriminant
     */
-    typelib_TypeDescriptionReference *  pDiscriminantTypeRef;
-
+    typelib_TypeDescriptionReference *	pDiscriminantTypeRef;
+    
     /** union default descriminant
     */
-    sal_Int64                           nDefaultDiscriminant;
+    sal_Int64							nDefaultDiscriminant;
     /** union default member type (may be 0)
      */
-    typelib_TypeDescriptionReference *  pDefaultTypeRef;
+    typelib_TypeDescriptionReference *	pDefaultTypeRef;
     /** number of union member types
     */
-    sal_Int32                           nMembers;
+    sal_Int32							nMembers;
     /** union member discriminant values (same order as idl declaration)
     */
-    sal_Int64 *                         pDiscriminants;
+    sal_Int64 *							pDiscriminants;
     /** union member value types (same order as idl declaration)
     */
-    typelib_TypeDescriptionReference ** ppTypeRefs;
+    typelib_TypeDescriptionReference **	ppTypeRefs;
     /** union member value names (same order as idl declaration)
     */
-    rtl_uString **                      ppMemberNames;
+    rtl_uString **						ppMemberNames;
     /** union value offset for data access
     */
-    sal_Int32                           nValueOffset;
+    sal_Int32							nValueOffset;
 } typelib_UnionTypeDescription;
 
 /** Type description of an array or sequence.
@@ -217,11 +217,11 @@ typedef struct _typelib_IndirectTypeDescription
 {
     /** inherits all members of typelib_TypeDescription
     */
-    typelib_TypeDescription             aBase;
-
+    typelib_TypeDescription				aBase;
+    
     /** array, sequence: pointer to element type
     */
-    typelib_TypeDescriptionReference *  pType;
+    typelib_TypeDescriptionReference *	pType;
 } typelib_IndirectTypeDescription;
 
 /** Type description of an array.
@@ -230,17 +230,17 @@ typedef struct _typelib_ArrayTypeDescription
 {
     /** inherits all members of typelib_IndirectTypeDescription
     */
-    typelib_IndirectTypeDescription     aBase;
-
+    typelib_IndirectTypeDescription		aBase;
+    
     /** number of dimensions
     */
-    sal_Int32                           nDimensions;
+    sal_Int32							nDimensions;
     /** number of total array elements
     */
-    sal_Int32                           nTotalElements;
+    sal_Int32 							nTotalElements;
     /** array of dimensions
     */
-    sal_Int32 *                         pDimensions;
+    sal_Int32 *							pDimensions;
 } typelib_ArrayTypeDescription;
 
 /** Type description of an enum. The type class of this description is typelib_TypeClass_ENUM.
@@ -249,20 +249,20 @@ typedef struct _typelib_EnumTypeDescription
 {
     /** inherits all members of typelib_TypeDescription
     */
-    typelib_TypeDescription             aBase;
-
+    typelib_TypeDescription				aBase;
+    
     /** first value of the enum
     */
-    sal_Int32                           nDefaultEnumValue;
+    sal_Int32							nDefaultEnumValue;
     /** number of enum values
     */
-    sal_Int32                           nEnumValues;
+    sal_Int32							nEnumValues;
     /** names of enum values
     */
-    rtl_uString **                      ppEnumNames;
+    rtl_uString **						ppEnumNames;
     /** values of enum (corresponding to names in similar order)
     */
-    sal_Int32 *                         pEnumValues;
+    sal_Int32 *							pEnumValues;
 } typelib_EnumTypeDescription;
 
 /** Description of an interface method parameter.
@@ -271,18 +271,18 @@ typedef struct _typelib_MethodParameter
 {
     /** name of parameter
     */
-    rtl_uString *                       pName;
+    rtl_uString *						pName;
     /** type of parameter
     */
-    typelib_TypeDescriptionReference *  pTypeRef;
+    typelib_TypeDescriptionReference *	pTypeRef;
     /** true: the call type of this parameter is [in] or [inout]
         false: the call type of this parameter is [out]
     */
-    sal_Bool                            bIn;
+    sal_Bool							bIn;
     /** true: the call type of this parameter is [out] or [inout]
         false: the call type of this parameter is [in]
     */
-    sal_Bool                            bOut;
+    sal_Bool							bOut;
 } typelib_MethodParameter;
 
 /** Common base type description of typelib_InterfaceMethodTypeDescription and
@@ -292,15 +292,15 @@ typedef struct _typelib_InterfaceMemberTypeDescription
 {
     /** inherits all members of typelib_TypeDescription
     */
-    typelib_TypeDescription             aBase;
-
+    typelib_TypeDescription				aBase;
+    
     /** position of member in the interface including the number of members of
         any base interfaces
     */
-    sal_Int32                           nPosition;
+    sal_Int32							nPosition;
     /** name of member
     */
-    rtl_uString *                       pMemberName;
+    rtl_uString *						pMemberName;
 } typelib_InterfaceMemberTypeDescription;
 
 /** Type description of an interface method. The type class of this description is
@@ -310,26 +310,26 @@ typedef struct _typelib_InterfaceMethodTypeDescription
 {
     /** inherits all members of typelib_InterfaceMemberTypeDescription
     */
-    typelib_InterfaceMemberTypeDescription      aBase;
-
+    typelib_InterfaceMemberTypeDescription		aBase;
+    
     /** type of the return value
     */
-    typelib_TypeDescriptionReference *          pReturnTypeRef;
+    typelib_TypeDescriptionReference *			pReturnTypeRef;
     /** number of parameters
     */
-    sal_Int32                                   nParams;
+    sal_Int32									nParams;
     /** array of parameters
     */
-    typelib_MethodParameter *                   pParams;
+    typelib_MethodParameter *					pParams;
     /** number of exceptions
     */
-    sal_Int32                                   nExceptions;
+    sal_Int32									nExceptions;
     /** array of exception types
     */
-    typelib_TypeDescriptionReference **         ppExceptions;
+    typelib_TypeDescriptionReference **			ppExceptions;
     /** determines whether method is declared oneway
     */
-    sal_Bool                                    bOneWay;
+    sal_Bool									bOneWay;
 
     /** the interface description this method is a member of
 
@@ -359,14 +359,14 @@ typedef struct _typelib_InterfaceAttributeTypeDescription
 {
     /** inherits all members of typelib_InterfaceMemberTypeDescription
     */
-    typelib_InterfaceMemberTypeDescription      aBase;
-
+    typelib_InterfaceMemberTypeDescription		aBase;
+    
     /** determines whether attribute is read only
     */
-    sal_Bool                                    bReadOnly;
+    sal_Bool									bReadOnly;	   
     /** type of the attribute
     */
-    typelib_TypeDescriptionReference *          pAttributeTypeRef;
+    typelib_TypeDescriptionReference *			pAttributeTypeRef;
 
     /** the interface description this attribute is a member of
 
@@ -442,39 +442,39 @@ typedef struct _typelib_InterfaceTypeDescription
 {
     /** inherits all members of typelib_TypeDescription
     */
-    typelib_TypeDescription                     aBase;
-
+    typelib_TypeDescription						aBase;
+    
     /** pointer to base type description, else 0
 
         @deprecated
         use nBaseTypes and ppBaseTypes instead
     */
-    struct _typelib_InterfaceTypeDescription *  pBaseTypeDescription;
+    struct _typelib_InterfaceTypeDescription *	pBaseTypeDescription;
     /** unique identifier of interface
     */
-    typelib_Uik                                 aUik;
+    typelib_Uik									aUik;
     /** number of members
     */
-    sal_Int32                                   nMembers;
+    sal_Int32									nMembers;
     /** array of members; references attributes or methods
     */
-    typelib_TypeDescriptionReference **         ppMembers;
+    typelib_TypeDescriptionReference **			ppMembers;
     /** number of members including members of base interface
     */
-    sal_Int32                                   nAllMembers;
+    sal_Int32									nAllMembers;
     /** array of members including members of base interface; references attributes or methods
     */
-    typelib_TypeDescriptionReference **         ppAllMembers;
+    typelib_TypeDescriptionReference **			ppAllMembers;
     /** array mapping index of the member description to an index doubling for read-write
         attributes (called function index); size of array is nAllMembers
     */
-    sal_Int32 *                                 pMapMemberIndexToFunctionIndex;
+    sal_Int32 *									pMapMemberIndexToFunctionIndex;
     /** number of members plus number of read-write attributes
     */
-    sal_Int32                                   nMapFunctionIndexToMemberIndex;
+    sal_Int32									nMapFunctionIndexToMemberIndex;
     /** array mapping function index to member index; size of arry is nMapFunctionIndexToMemberIndex
     */
-    sal_Int32 *                                 pMapFunctionIndexToMemberIndex;
+    sal_Int32 *									pMapFunctionIndexToMemberIndex;
     /** number of base types
 
         @since UDK 3.2.0
@@ -493,16 +493,16 @@ typedef struct _typelib_CompoundMember_Init
 {
     /** type class of compound member
     */
-    typelib_TypeClass   eTypeClass;
+    typelib_TypeClass	eTypeClass;
     /** name of type of compound member
 
         For a member of an instantiated polymorphic struct type that is of
         parameterized type, this will be a null pointer.
     */
-    rtl_uString *       pTypeName;
+    rtl_uString *		pTypeName;
     /** name of compound member
     */
-    rtl_uString *       pMemberName;
+    rtl_uString *		pMemberName;
 } typelib_CompoundMember_Init;
 
 /**
@@ -530,19 +530,19 @@ typedef struct _typelib_Parameter_Init
 {
     /** type class of parameter
     */
-    typelib_TypeClass   eTypeClass;
+    typelib_TypeClass	eTypeClass;
     /** name of parameter
     */
-    rtl_uString *       pTypeName;
+    rtl_uString *		pTypeName;
     /** name of parameter
     */
-    rtl_uString *       pParamName;
+    rtl_uString *		pParamName;
     /** true, if parameter is [in] or [inout]
     */
-    sal_Bool            bIn;
+    sal_Bool			bIn;
     /** true, if parameter is [out] or [inout]
     */
-    sal_Bool            bOut;
+    sal_Bool			bOut;
 } typelib_Parameter_Init;
 
 /** Init struct of union types for typelib_typedescription_newUnion().
@@ -551,10 +551,10 @@ typedef struct _typelib_Union_Init
 {
     /** union member discriminant
     */
-    sal_Int64           nDiscriminant;
+    sal_Int64			nDiscriminant;
     /** union member name
     */
-    rtl_uString *       pMemberName;
+    rtl_uString *		pMemberName;
     /** union member type
     */
     typelib_TypeDescriptionReference* pTypeRef;
@@ -567,7 +567,7 @@ typedef struct _typelib_Union_Init
 
 /** Creates a union type description. All discriminants are handled as int64 values.
     The pDiscriminantTypeRef must be of type byte, short, ..., up to hyper.
-
+    
     @param ppRet inout union type description
     @param pTypeName name of union type
     @param pDiscriminantTypeRef discriminant type
@@ -587,7 +587,7 @@ void SAL_CALL typelib_typedescription_newUnion(
     SAL_THROW_EXTERN_C();
 
 /** Creates an enum type description.
-
+    
     @param ppRet inout enum type description
     @param pTypeName name of enum
     @param nDefaultEnumValue default enum value
@@ -605,7 +605,7 @@ void SAL_CALL typelib_typedescription_newEnum(
     SAL_THROW_EXTERN_C();
 
 /** Creates an array type description.
-
+    
     @param ppRet inout enum type description
     @param pElementTypeRef element type
     @param nDimensions number of dimensions
@@ -643,7 +643,7 @@ void SAL_CALL typelib_typedescription_new(
     SAL_THROW_EXTERN_C();
 
 /** Creates a new struct type description.
-
+    
     @param ppRet inout type description
     @param pTypeName name of type
     @param pType base type;
@@ -661,7 +661,7 @@ void SAL_CALL typelib_typedescription_newStruct(
     SAL_THROW_EXTERN_C();
 
 /** Creates an interface type description.
-
+    
     @param ppRet inout interface type description
     @param pTypeName the fully qualified name of the interface.
     @param nUik1 uik part
@@ -686,7 +686,7 @@ void SAL_CALL typelib_typedescription_newInterface(
     SAL_THROW_EXTERN_C();
 
 /** Creates a multiple-inheritance interface type description.
-
+    
     @param ppRet inout interface type description
     @param pTypeName the fully qualified name of the interface.
     @param nUik1 uik part
@@ -712,7 +712,7 @@ void SAL_CALL typelib_typedescription_newMIInterface(
     SAL_THROW_EXTERN_C();
 
 /** Creates an interface method type description.
-
+    
     @param ppRet inout method type description
     @param nAbsolutePosition position of member including all members of base interfaces
     @param bOneWay determines whether method is declared oneway
@@ -738,7 +738,7 @@ void SAL_CALL typelib_typedescription_newInterfaceMethod(
     SAL_THROW_EXTERN_C();
 
 /** Creates an interface attribute type description.
-
+    
     @param ppRet inout attribute type description
     @param nAbsolutePosition position of this attribute including all members of base interfaces
     @param pAttributeName fully qualified name of attribute including interface
@@ -760,7 +760,7 @@ void SAL_CALL typelib_typedescription_newInterfaceAttribute(
     SAL_THROW_EXTERN_C();
 
 /** Creates an extended interface attribute type description.
-
+    
     @param ppRet inout attribute type description
     @param nAbsolutePosition position of this attribute including all members of
     base interfaces
@@ -788,7 +788,7 @@ void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute(
     SAL_THROW_EXTERN_C();
 
 /** Increments reference count of given type description.
-
+    
     @param pDesc type description
 */
 void SAL_CALL typelib_typedescription_acquire(
@@ -797,7 +797,7 @@ void SAL_CALL typelib_typedescription_acquire(
 
 /** Decrements reference count of given type. If reference count reaches 0, the trype description
     is deleted.
-
+    
     @param pDesc type description
 */
 void SAL_CALL typelib_typedescription_release(
@@ -806,15 +806,15 @@ void SAL_CALL typelib_typedescription_release(
 
 /** Registers a type description and creates a type description reference. Type descriptions
     will be registered automatically if they are provided via the callback chain.
-
-    @param ppNewDescription inout description to be registered;
+    
+    @param ppNewDescription	inout description to be registered;
 */
 void SAL_CALL typelib_typedescription_register(
     typelib_TypeDescription ** ppNewDescription )
     SAL_THROW_EXTERN_C();
 
 /** Tests whether two types descriptions are equal, i.e. type class and names are equal.
-
+    
     @param p1 a type description
     @param p2 another type description
     @return true, if type descriptions are equal
@@ -824,7 +824,7 @@ sal_Bool SAL_CALL typelib_typedescription_equals(
     SAL_THROW_EXTERN_C();
 
 /** Retrieves a type description via its fully qualified name.
-
+    
     @param ppRet inout type description; *ppRet is 0, if type description was not found
     @param pName name demanded type description
 */
@@ -833,7 +833,7 @@ void SAL_CALL typelib_typedescription_getByName(
     SAL_THROW_EXTERN_C();
 
 /** Sets size of type description cache.
-
+    
     @param nNewSize new size of cache
 */
 void SAL_CALL typelib_setCacheSize(
@@ -842,8 +842,8 @@ void SAL_CALL typelib_setCacheSize(
 
 /** Function pointer declaration of callback function get additional descriptions. Callbacks
     must provide complete type descriptions (see typelib_typedescription_complete())!
-
-    @param pContext callback context
+    
+    @param pContext callback context 
     @param ppRet inout type description
     @param pTypeName  name of demanded type description
 */
@@ -851,8 +851,8 @@ typedef void (SAL_CALL * typelib_typedescription_Callback)(
     void * pContext, typelib_TypeDescription ** ppRet, rtl_uString * pTypeName );
 
 /** Registers callback function providing additional type descriptions.
-
-    @param pContext callback context
+    
+    @param pContext callback context 
     @param pCallback callback function
 */
 void SAL_CALL typelib_typedescription_registerCallback(
@@ -860,8 +860,8 @@ void SAL_CALL typelib_typedescription_registerCallback(
     SAL_THROW_EXTERN_C();
 
 /** Revokes a previously registered callback function.
-
-    @param pContext callback context
+    
+    @param pContext callback context 
     @param pCallback registered callback function
 */
 void SAL_CALL typelib_typedescription_revokeCallback(
@@ -880,7 +880,7 @@ void SAL_CALL typelib_typedescription_revokeCallback(
     description is not initialized.
     @internal
 */
-#define TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( eTypeClass ) \
+#define TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( eTypeClass )	\
     ((eTypeClass) == typelib_TypeClass_INTERFACE_METHOD || \
      (eTypeClass) == typelib_TypeClass_INTERFACE_ATTRIBUTE)
 
@@ -920,12 +920,12 @@ void SAL_CALL typelib_typedescription_revokeCallback(
 
 /** Creates a type description reference. This is a weak reference not holding the description.
     If the description is already registered, the previous one is returned.
-
+    
     @param ppTDR inout type description reference
     @param eTypeClass type class of type
     @param pTypeName name of type
 */
-void SAL_CALL typelib_typedescriptionreference_new(
+void SAL_CALL typelib_typedescriptionreference_new( 
     typelib_TypeDescriptionReference ** ppTDR,
     typelib_TypeClass eTypeClass,
     rtl_uString * pTypeName )
@@ -933,7 +933,7 @@ void SAL_CALL typelib_typedescriptionreference_new(
 
 /** Creates a type description reference. This is a weak reference not holding the description.
     If the description is already registered, the previous one is returned.
-
+    
     @param ppTDR inout type description reference
     @param eTypeClass type class of type
     @param pTypeName ascii name of type
@@ -945,7 +945,7 @@ void SAL_CALL typelib_typedescriptionreference_newByAsciiName(
     SAL_THROW_EXTERN_C();
 
 /** Increments reference count of type description reference.
-
+    
     @param pRef type description reference
 */
 void SAL_CALL typelib_typedescriptionreference_acquire(
@@ -954,7 +954,7 @@ void SAL_CALL typelib_typedescriptionreference_acquire(
 
 /** Increments reference count of type description reference. If the reference count reaches 0,
     then the reference is deleted.
-
+    
     @param pRef type description reference
 */
 void SAL_CALL typelib_typedescriptionreference_release(
@@ -963,7 +963,7 @@ void SAL_CALL typelib_typedescriptionreference_release(
 
 /** Retrieves the type description for a given reference. If it is not possible to resolve the
     reference, null is returned.
-
+    
     @param ppRet inout type description
 */
 void SAL_CALL typelib_typedescriptionreference_getDescription(
@@ -971,7 +971,7 @@ void SAL_CALL typelib_typedescriptionreference_getDescription(
     SAL_THROW_EXTERN_C();
 
 /** Tests whether two types description references are equal, i.e. type class and names are equal.
-
+    
     @param p1 a type description reference
     @param p2 another type description reference
     @return true, if type description references are equal
@@ -981,7 +981,7 @@ sal_Bool SAL_CALL typelib_typedescriptionreference_equals(
     SAL_THROW_EXTERN_C();
 
 /** Assigns a type.
-
+    
     @param ppDest destination type
     @param pSource source type
 */
@@ -992,7 +992,7 @@ void SAL_CALL typelib_typedescriptionreference_assign(
 
 /** Tests if values of type pAssignable can be assigned by values of type pFrom. This includes
     widening conversion (e.g., long assignable from short), as long as there is no data loss.
-
+    
     @param pAssignable type description of value to be assigned
     @param pFrom type description of value
 */
@@ -1003,7 +1003,7 @@ sal_Bool SAL_CALL typelib_typedescription_isAssignableFrom(
 
 /** Tests if values of type pAssignable can be assigned by values of type pFrom. This includes
     widening conversion (e.g., long assignable from short), as long as there is no data loss.
-
+    
     @param pAssignable type of value to be assigned
     @param pFrom type of value
 */
@@ -1015,9 +1015,9 @@ sal_Bool SAL_CALL typelib_typedescriptionreference_isAssignableFrom(
 /** Gets static type reference of standard types by type class.
     ADDITIONAL OPT: provides Type com.sun.star.uno.Exception for typelib_TypeClass_EXCEPTION
                     and com.sun.star.uno.XInterface for typelib_TypeClass_INTERFACE.
-
+    
     Thread synchronizes on typelib mutex.
-
+    
     @param eTypeClass type class of basic type
     @return pointer to type reference pointer
 */
@@ -1026,7 +1026,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
     SAL_THROW_EXTERN_C();
 
 /** Inits static type reference. Thread synchronizes on typelib init mutex.
-
+    
     @param ppRef pointer to type reference pointer
     @param eTypeClass type class of type
     @param pTypeName ascii name of type
@@ -1037,7 +1037,7 @@ void SAL_CALL typelib_static_type_init(
     SAL_THROW_EXTERN_C();
 
 /** Inits static sequence type reference. Thread synchronizes on typelib init mutex.
-
+    
     @param ppRef pointer to type reference pointer
     @param pElementType element type of sequence
 */
@@ -1047,7 +1047,7 @@ void SAL_CALL typelib_static_sequence_type_init(
     SAL_THROW_EXTERN_C ();
 
 /** Inits static array type reference. Thread synchronizes on typelib init mutex.
-
+    
     @param ppRef pointer to type reference pointer
     @param pElementType element type of sequence
     @param nDimensions number of dimensions
@@ -1102,7 +1102,7 @@ void SAL_CALL typelib_static_struct_type_init(
     SAL_THROW_EXTERN_C();
 
 /** Inits incomplete static interface type reference. Thread synchronizes on typelib init mutex.
-
+    
     @param ppRef pointer to type reference pointer
     @param pTypeName name of interface
     @param pBaseType base type
@@ -1131,7 +1131,7 @@ void SAL_CALL typelib_static_mi_interface_type_init(
     SAL_THROW_EXTERN_C();
 
 /** Inits incomplete static enum type reference. Thread synchronizes on typelib init mutex.
-
+    
     @param ppRef pointer to type reference pointer
     @param pTypeName name of enum
     @param nDefaultEnumValue default enum value
@@ -1146,7 +1146,7 @@ void SAL_CALL typelib_static_enum_type_init(
     INTERFACE and ENUM type descriptions may be partly initialized (see typelib_static_...(),
     typelib_TypeDescription::bComplete). For interface type descriptions, this will also
     init index tables.
-
+    
     @param ppTypeDescr [inout] type description to be completed (may be exchanged!)
     @return true, if type description is complete
 */
diff --git a/cppu/inc/typelib/typedescription.hxx b/cppu/inc/typelib/typedescription.hxx
index 3997f3d9c14d..20ce773356e7 100644
--- a/cppu/inc/typelib/typedescription.hxx
+++ b/cppu/inc/typelib/typedescription.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,11 +35,11 @@
 
 
 namespace com
-{
+{     
 namespace sun
-{
+{     
 namespace star
-{
+{     
 namespace uno
 {
 
@@ -53,7 +53,7 @@ class TypeDescription
     /** C typelib type description
     */
     mutable typelib_TypeDescription * _pTypeDescr;
-
+    
 public:
     // these are here to force memory de/allocation to sal lib.
     /** @internal */
@@ -68,34 +68,34 @@ public:
     /** @internal */
     inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () )
         {}
-
+    
     /** Constructor:
-
+        
         @param pTypeDescr a type description
     */
     inline TypeDescription( typelib_TypeDescription * pTypeDescr = 0 ) SAL_THROW( () );
     /** Constructor:
-
+        
         @param pTypeDescrRef a type description reference
     */
     inline TypeDescription( typelib_TypeDescriptionReference * pTypeDescrRef ) SAL_THROW( () );
     /** Constructor:
-
+        
         @param rType a type
     */
     inline TypeDescription( const ::com::sun::star::uno::Type & rType ) SAL_THROW( () );
     /** Copy constructor:
-
+        
         @param rDescr another TypeDescription
     */
     inline TypeDescription( const TypeDescription & rDescr ) SAL_THROW( () );
     /** Constructor:
-
+        
         @param pTypeName a type name
     */
     inline TypeDescription( rtl_uString * pTypeName ) SAL_THROW( () );
     /** Constructor:
-
+        
         @param rTypeName a type name
     */
     inline TypeDescription( const ::rtl::OUString & rTypeName ) SAL_THROW( () );
@@ -104,13 +104,13 @@ public:
     inline ~TypeDescription() SAL_THROW( () );
 
     /** Assignment operator: acquires given type description and releases a set one.
-
+        
         @param pTypeDescr another type description
         @return this TypeDescription
     */
     inline TypeDescription & SAL_CALL operator = ( typelib_TypeDescription * pTypeDescr ) SAL_THROW( () );
     /** Assignment operator: acquires given type description and releases a set one.
-
+        
         @param rTypeDescr another type description
         @return this TypeDescription
     */
@@ -118,13 +118,13 @@ public:
         { return this->operator =( rTypeDescr.get() ); }
 
     /** Tests whether two type descriptions are equal.
-
+        
         @param pTypeDescr another type description
         @return true, if both type descriptions are equal, false otherwise
     */
     inline sal_Bool SAL_CALL equals( const typelib_TypeDescription * pTypeDescr ) const SAL_THROW( () );
     /** Tests whether two type descriptions are equal.
-
+        
         @param rTypeDescr another type description
         @return true, if both type descriptions are equal, false otherwise
     */
@@ -134,15 +134,15 @@ public:
     /** Makes stored type description complete.
     */
     inline void SAL_CALL makeComplete() const SAL_THROW( () );
-
+    
     /** Gets the UNacquired type description pointer.
-
+        
         @return stored pointer of type description
     */
     inline typelib_TypeDescription * SAL_CALL get() const SAL_THROW( () )
         { return _pTypeDescr; }
     /** Tests if a type description is set.
-
+        
         @return true, if a type description is set, false otherwise
     */
     inline sal_Bool SAL_CALL is() const SAL_THROW( () )
diff --git a/cppu/inc/typelib/uik.h b/cppu/inc/typelib/uik.h
index 026d376da9f2..d8ed652e4737 100644
--- a/cppu/inc/typelib/uik.h
+++ b/cppu/inc/typelib/uik.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,15 +40,15 @@
 */
 typedef struct _typelib_Uik
 {
-    sal_uInt32  m_Data1;
-    sal_uInt16  m_Data2;
-    sal_uInt16  m_Data3;
-    sal_uInt32  m_Data4;
-    sal_uInt32  m_Data5;
+    sal_uInt32	m_Data1;
+    sal_uInt16	m_Data2;
+    sal_uInt16	m_Data3;
+    sal_uInt32	m_Data4;
+    sal_uInt32	m_Data5;
 } typelib_Uik;
 
 #if defined( SAL_W32) ||  defined(SAL_OS2)
-#   pragma pack(pop)
+#	pragma pack(pop)
 #endif
 
 #endif
diff --git a/cppu/inc/uno/Enterable.h b/cppu/inc/uno/Enterable.h
index a769ede987f2..a4258c092d75 100644
--- a/cppu/inc/uno/Enterable.h
+++ b/cppu/inc/uno/Enterable.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ extern "C"
 
 /** Generic function type declaration for entering an Environment.
     (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack)
-
+    
     @param context
     @since UDK 3.2.7
 */
@@ -49,7 +49,7 @@ typedef void uno_Enterable_enter     (void * context);
 
 /** Generic function type declaration for levaing an Environment.
     (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack)
-
+    
     @param context
     @since UDK 3.2.7
 */
@@ -58,7 +58,7 @@ typedef void uno_Enterable_leave     (void * context);
 
 /** Generic function type declaration for calling into an Environment.
     (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack)
-
+    
     @param context
     @param pCallee  the function to be called
     @param pParam   the parameter pointer to be passed to the function
@@ -69,7 +69,7 @@ typedef void uno_Enterable_callInto_v(void * context, uno_EnvCallee * pCallee, v
 
 /** Generic function type declaration for calling out of an Environment.
     (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack)
-
+    
     @param context
     @param pCallee  the function to be called
     @param pParam   the parameter pointer to be passed to the function
@@ -81,7 +81,7 @@ typedef void uno_Enterable_callOut_v (void * context, uno_EnvCallee * pCallee, v
 /** Generic function type declaration for checking if calling on managed object is
     valid.
     (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack)
-
+    
     @param  context
     @param  ppReason  the reason, in case calling is not valid
     @return           0 == calling is not valid, 1 == calling is valid
@@ -95,14 +95,14 @@ typedef int  uno_Enterable_isValid_v (void * context, rtl_uString ** ppReason);
 
     @since UDK 3.2.7
 */
-typedef struct
+typedef struct 
 {
     uno_Enterable_enter      * m_enter;
     uno_Enterable_leave      * m_leave;
     uno_Enterable_callInto_v * m_callInto_v;
     uno_Enterable_callOut_v  * m_callOut_v;
     uno_Enterable_isValid_v  * m_isValid;
-}
+} 
 uno_Enterable;
 
 
diff --git a/cppu/inc/uno/EnvDcp.h b/cppu/inc/uno/EnvDcp.h
index a2471815c179..8c4f21016535 100644
--- a/cppu/inc/uno/EnvDcp.h
+++ b/cppu/inc/uno/EnvDcp.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@ extern "C"
 
 /** Get the OBI type part of an environment descriptor.
     (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Descriptor)
-
+    
     @param pEnvDcp        the Environment Descriptor
     @param ppEnvTypeName  the OBI type
     @since UDK 3.2.7
@@ -48,7 +48,7 @@ void uno_EnvDcp_getTypeName(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvTyp
 
 /** Get the purpose part of an environment descriptor.
     (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Descriptor)
-
+    
     @param pEnvDcp        the Environment Descriptor
     @param ppEnvPurpose   the purpose
     @since UDK 3.2.7
diff --git a/cppu/inc/uno/any2.h b/cppu/inc/uno/any2.h
index b359339b4686..a42121341053 100644
--- a/cppu/inc/uno/any2.h
+++ b/cppu/inc/uno/any2.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -69,13 +69,13 @@ typedef struct _uno_Any
 
 /** Assign an any with a given value. Interfaces are acquired or released by the given callback
     functions.
-
-    @param pDest            pointer memory of destination any
-    @param pSource          pointer to source value; defaults (0) to default constructed value
-    @param pTypeDescr       type description of value; defaults (0) to void
-    @param acquire          function called each time an interface needs to be acquired;
+    
+    @param pDest			pointer memory of destination any
+    @param pSource			pointer to source value; defaults (0) to default constructed value
+    @param pTypeDescr		type description of value; defaults (0) to void
+    @param acquire			function called each time an interface needs to be acquired;
                             defaults (0) to uno
-    @param release          function called each time an interface needs to be released;
+    @param release			function called each time an interface needs to be released;
                             defaults (0) to uno
 */
 void SAL_CALL uno_any_assign(
@@ -85,13 +85,13 @@ void SAL_CALL uno_any_assign(
     SAL_THROW_EXTERN_C();
 /** Assign an any with a given value. Interfaces are acquired or released by the given callback
     functions.
-
-    @param pDest            pointer memory of destination any
-    @param pSource          pointer to source value; defaults (0) to default constructed value
-    @param pTypeDescr       type description of value; defaults (0) to void
-    @param acquire          function called each time an interface needs to be acquired;
+    
+    @param pDest			pointer memory of destination any
+    @param pSource			pointer to source value; defaults (0) to default constructed value
+    @param pTypeDescr		type description of value; defaults (0) to void
+    @param acquire			function called each time an interface needs to be acquired;
                             defaults (0) to uno
-    @param release          function called each time an interface needs to be released;
+    @param release			function called each time an interface needs to be released;
                             defaults (0) to uno
 */
 void SAL_CALL uno_type_any_assign(
@@ -101,11 +101,11 @@ void SAL_CALL uno_type_any_assign(
     SAL_THROW_EXTERN_C();
 
 /** Constructs an any with a given value. Interfaces are acquired by the given callback function.
-
-    @param pDest            pointer memory of destination any
-    @param pSource          pointer to source value; defaults (0) to default constructed value
-    @param pTypeDescr       type description of value; defaults (0) to void
-    @param acquire          function called each time an interface needs to be acquired;
+    
+    @param pDest			pointer memory of destination any
+    @param pSource			pointer to source value; defaults (0) to default constructed value
+    @param pTypeDescr		type description of value; defaults (0) to void
+    @param acquire			function called each time an interface needs to be acquired;
                             defaults (0) to uno
 */
 void SAL_CALL uno_any_construct(
@@ -114,11 +114,11 @@ void SAL_CALL uno_any_construct(
     uno_AcquireFunc acquire )
     SAL_THROW_EXTERN_C();
 /** Constructs an any with a given value. Interfaces are acquired by the given callback function.
-
-    @param pDest            pointer memory of destination any
-    @param pSource          pointer to source value; defaults (0) to default constructed value
-    @param pType            type of value; defaults (0) to void
-    @param acquire          function called each time an interface needs to be acquired;
+    
+    @param pDest			pointer memory of destination any
+    @param pSource			pointer to source value; defaults (0) to default constructed value
+    @param pType			type of value; defaults (0) to void
+    @param acquire			function called each time an interface needs to be acquired;
                             defaults (0) to uno
 */
 void SAL_CALL uno_type_any_construct(
@@ -128,11 +128,11 @@ void SAL_CALL uno_type_any_construct(
     SAL_THROW_EXTERN_C();
 
 /** Constructs an any with a given value and converts/ maps interfaces.
-
-    @param pDest            pointer memory of destination any
-    @param pSource          pointer to source value; defaults (0) to default constructed value
-    @param pTypeDescr       type description of value; defaults (0) to void
-    @param mapping          mapping to convert/ map interfaces
+    
+    @param pDest			pointer memory of destination any
+    @param pSource			pointer to source value; defaults (0) to default constructed value
+    @param pTypeDescr		type description of value; defaults (0) to void
+    @param mapping			mapping to convert/ map interfaces
 */
 void SAL_CALL uno_any_constructAndConvert(
     uno_Any * pDest, void * pSource,
@@ -140,11 +140,11 @@ void SAL_CALL uno_any_constructAndConvert(
     struct _uno_Mapping * mapping )
     SAL_THROW_EXTERN_C();
 /** Constructs an any with a given value and converts/ maps interfaces.
-
-    @param pDest            pointer memory of destination any
-    @param pSource          pointer to source value; defaults (0) to default constructed value
-    @param pType            type of value; defaults (0) to void
-    @param mapping          mapping to convert/ map interfaces
+    
+    @param pDest			pointer memory of destination any
+    @param pSource			pointer to source value; defaults (0) to default constructed value
+    @param pType			type of value; defaults (0) to void
+    @param mapping			mapping to convert/ map interfaces
 */
 void SAL_CALL uno_type_any_constructAndConvert(
     uno_Any * pDest, void * pSource,
@@ -153,9 +153,9 @@ void SAL_CALL uno_type_any_constructAndConvert(
     SAL_THROW_EXTERN_C();
 
 /** Destructs an any.
-
-    @param pValue           pointer to any
-    @param release          function called each time an interface needs to be released;
+    
+    @param pValue			pointer to any
+    @param release			function called each time an interface needs to be released;
                             defaults (0) to uno
 */
 void SAL_CALL uno_any_destruct(
@@ -163,9 +163,9 @@ void SAL_CALL uno_any_destruct(
     SAL_THROW_EXTERN_C();
 
 /** Sets value to void.
-
-    @param pValue           pointer to any
-    @param release          function called each time an interface needs to be released;
+    
+    @param pValue			pointer to any
+    @param release			function called each time an interface needs to be released;
                             defaults (0) to uno
 */
 void SAL_CALL uno_any_clear(
diff --git a/cppu/inc/uno/cuno.h b/cppu/inc/uno/cuno.h
index d5c5e7c82e80..fe4a96f36408 100644
--- a/cppu/inc/uno/cuno.h
+++ b/cppu/inc/uno/cuno.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,9 +30,9 @@
 
 #include <sal/types.h>
 
-#define CUNO_ERROR_NONE                 0
-#define CUNO_ERROR_CALL_FAILED          (1 << 31)
-#define CUNO_ERROR_EXCEPTION            (1 | CUNO_ERROR_CALL_FAILED)
+#define CUNO_ERROR_NONE					0
+#define CUNO_ERROR_CALL_FAILED			(1 << 31)
+#define CUNO_ERROR_EXCEPTION			(1 | CUNO_ERROR_CALL_FAILED)
 
 /** macro to call on a C interface
 
diff --git a/cppu/inc/uno/current_context.h b/cppu/inc/uno/current_context.h
index 7abd2771df07..70d9ae2ddc03 100644
--- a/cppu/inc/uno/current_context.h
+++ b/cppu/inc/uno/current_context.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ extern "C"
     @attention
     Don't spread the returned interface around to other threads.  Every thread has its own
     current context.
-
+    
     @param ppCurrentContext  inout param current context of type com.sun.star.uno.XCurrentContext
     @param pEnvDcp           descriptor of returned interface's environment
     @param pEnvContext       context of returned interface's environment (commonly 0)
@@ -51,7 +51,7 @@ sal_Bool SAL_CALL uno_getCurrentContext(
     SAL_THROW_EXTERN_C();
 
 /** Sets the current task's context.
-
+    
     @param pCurrentContext  in param current context of type com.sun.star.uno.XCurrentContext
     @param pEnvDcp          descriptor of interface's environment
     @param pEnvContext      context of interface's environment (commonly 0)
diff --git a/cppu/inc/uno/current_context.hxx b/cppu/inc/uno/current_context.hxx
index 01d59a460eca..0fb001f7b91b 100644
--- a/cppu/inc/uno/current_context.hxx
+++ b/cppu/inc/uno/current_context.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,11 +34,11 @@
 
 
 namespace com
-{
+{     
 namespace sun
-{
+{     
 namespace star
-{
+{     
 namespace uno
 {
 
@@ -46,7 +46,7 @@ namespace uno
     @attention
     Don't spread the returned interface around to other threads.  Every thread has its own
     current context.
-
+    
     @return current context or null ref, if none is set
 */
 inline Reference< XCurrentContext > SAL_CALL getCurrentContext()
@@ -84,10 +84,10 @@ class ContextLayer
         @internal
     */
     Reference< XCurrentContext > m_xPreviousContext;
-
+    
 public:
     /** Constructor: Saves the previous context and sets the new (given) one.
-
+        
         @param xNewContext new context to be set
     */
     inline ContextLayer(
@@ -96,9 +96,9 @@ public:
     /** Destructor: restores the previous context.
     */
     inline ~ContextLayer() SAL_THROW( () );
-
+    
     /** Gets the previously set context.
-
+        
         @return the previously set context
     */
     inline Reference< XCurrentContext > SAL_CALL getPreviousContext() const
diff --git a/cppu/inc/uno/data.h b/cppu/inc/uno/data.h
index 8a86b89841d7..545affe2d4b3 100644
--- a/cppu/inc/uno/data.h
+++ b/cppu/inc/uno/data.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@ struct _typelib_InterfaceTypeDescription;
 struct _uno_Mapping;
 
 /** Generic function pointer declaration to query for an interface.
-
+    
     @param pInterface interface
     @param pTypedemanded interface type
     @return interface pointer
@@ -49,27 +49,27 @@ struct _uno_Mapping;
 typedef void * (SAL_CALL * uno_QueryInterfaceFunc)(
     void * pInterface, struct _typelib_TypeDescriptionReference * pType );
 /** Generic function pointer declaration to acquire an interface.
-
+    
     @param pInterface interface to be acquired
 */
 typedef void (SAL_CALL * uno_AcquireFunc)(
     void * pInterface );
 /** Generic function pointer declaration to release an interface.
-
+    
     @param pInterface interface to be release
 */
 typedef void (SAL_CALL * uno_ReleaseFunc)(
     void * pInterface );
 
 /** Tests if two values are equal. May compare different types (e.g., short to long).
-
-    @param pVal1            pointer to a value
-    @param pVal1TypeDescr   type description of pVal1
-    @param pVal2            pointer to another value
-    @param pVal2TypeDescr   type description of pVal2
-    @param queryInterface   function called each time two interfaces are tested whether they belong
+    
+    @param pVal1			pointer to a value
+    @param pVal1TypeDescr	type description of pVal1
+    @param pVal2			pointer to another value
+    @param pVal2TypeDescr	type description of pVal2
+    @param queryInterface	function called each time two interfaces are tested whether they belong
                             to the same object; defaults (0) to uno
-    @param release          function to release queried interfaces; defaults (0) to uno
+    @param release			function to release queried interfaces; defaults (0) to uno
     @return true if values are equal
 */
 sal_Bool SAL_CALL uno_equalData(
@@ -78,14 +78,14 @@ sal_Bool SAL_CALL uno_equalData(
     uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
     SAL_THROW_EXTERN_C();
 /** Tests if two values are equal. May compare different types (e.g., short to long).
-
-    @param pVal1            pointer to a value
-    @param pVal1Type        type of pVal1
-    @param pVal2            pointer to another value
-    @param pVal2Type        type of pVal2
-    @param queryInterface   function called each time two interfaces are tested whether they belong
+    
+    @param pVal1			pointer to a value
+    @param pVal1Type		type of pVal1
+    @param pVal2			pointer to another value
+    @param pVal2Type		type of pVal2
+    @param queryInterface	function called each time two interfaces are tested whether they belong
                             to the same object; defaults (0) to uno
-    @param release          function to release queried interfaces; defaults (0) to uno
+    @param release			function to release queried interfaces; defaults (0) to uno
     @return true if values are equal
 */
 sal_Bool SAL_CALL uno_type_equalData(
@@ -96,11 +96,11 @@ sal_Bool SAL_CALL uno_type_equalData(
 
 /** Copy construct memory with given value. The size of the destination value must be larger
     or equal to the size of the source value.
-
-    @param pDest            pointer to destination value memory
-    @param pSource          pointer to source value
-    @param pTypeDescr       type description of source
-    @param acquire          function called each time an interface needs to be acquired;
+    
+    @param pDest			pointer to destination value memory
+    @param pSource			pointer to source value
+    @param pTypeDescr		type description of source
+    @param acquire			function called each time an interface needs to be acquired;
                             defaults (0) to uno
 */
 void SAL_CALL uno_copyData(
@@ -109,11 +109,11 @@ void SAL_CALL uno_copyData(
     SAL_THROW_EXTERN_C();
 /** Copy construct memory with given value. The size of the destination value must be larger
     or equal to the size of the source value.
-
-    @param pDest            pointer to destination value memory
-    @param pSource          pointer to source value
-    @param pType            type of source
-    @param acquire          function called each time an interface needs to be acquired;
+    
+    @param pDest			pointer to destination value memory
+    @param pSource			pointer to source value
+    @param pType			type of source
+    @param acquire			function called each time an interface needs to be acquired;
                             defaults (0) to uno
 */
 void SAL_CALL uno_type_copyData(
@@ -123,11 +123,11 @@ void SAL_CALL uno_type_copyData(
 
 /** Copy construct memory with given value. The size of the destination value must be larger
     or equal to the size of the source value. Interfaces are converted/ mapped by mapping parameter.
-
-    @param pDest            pointer to destination value memory
-    @param pSource          pointer to source value
-    @param pTypeDescr       type description of source
-    @param mapping          mapping to convert/ map interfaces
+    
+    @param pDest			pointer to destination value memory
+    @param pSource			pointer to source value
+    @param pTypeDescr		type description of source
+    @param mapping			mapping to convert/ map interfaces
 */
 void SAL_CALL uno_copyAndConvertData(
     void * pDest, void * pSource,
@@ -135,11 +135,11 @@ void SAL_CALL uno_copyAndConvertData(
     SAL_THROW_EXTERN_C();
 /** Copy construct memory with given value. The size of the destination value must be larger
     or equal to the size of the source value. Interfaces are converted/ mapped by mapping parameter.
-
-    @param pDest            pointer to destination value memory
-    @param pSource          pointer to source value
-    @param pType            type of source
-    @param mapping          mapping to convert/ map interfaces
+    
+    @param pDest			pointer to destination value memory
+    @param pSource			pointer to source value
+    @param pType			type of source
+    @param mapping			mapping to convert/ map interfaces
 */
 void SAL_CALL uno_type_copyAndConvertData(
     void * pDest, void * pSource,
@@ -147,20 +147,20 @@ void SAL_CALL uno_type_copyAndConvertData(
     SAL_THROW_EXTERN_C();
 
 /** Destructs a given value; does NOT free its memory!
-
-    @param pValue           value to be destructed
-    @param pTypeDescr       type description of value
-    @param release          function called each time an interface pointer needs to be released;
+    
+    @param pValue			value to be destructed
+    @param pTypeDescr		type description of value
+    @param release			function called each time an interface pointer needs to be released;
                             defaults (0) to uno
 */
 void SAL_CALL uno_destructData(
     void * pValue, struct _typelib_TypeDescription * pTypeDescr, uno_ReleaseFunc release )
     SAL_THROW_EXTERN_C();
 /** Destructs a given value; does NOT free its memory!
-
-    @param pValue           value to be destructed
-    @param pType            type of value
-    @param release          function called each time an interface pointer needs to be released;
+    
+    @param pValue			value to be destructed
+    @param pType			type of value
+    @param release			function called each time an interface pointer needs to be released;
                             defaults (0) to uno
 */
 void SAL_CALL uno_type_destructData(
@@ -168,17 +168,17 @@ void SAL_CALL uno_type_destructData(
     SAL_THROW_EXTERN_C();
 
 /** Default constructs a value. All simple types are set to 0, enums are set to their default value.
-
-    @param pMem             pointer to memory of value to be constructed
-    @param pTypeDescr       type description of value to be constructed
+    
+    @param pMem				pointer to memory of value to be constructed
+    @param pTypeDescr		type description of value to be constructed
 */
 void SAL_CALL uno_constructData(
     void * pMem, struct _typelib_TypeDescription * pTypeDescr )
     SAL_THROW_EXTERN_C();
 /** Default constructs a value. All simple types are set to 0, enums are set to their default value.
-
-    @param pMem             pointer to memory of value to be constructed
-    @param pType            type of value to be constructed
+    
+    @param pMem				pointer to memory of value to be constructed
+    @param pType			type of value to be constructed
 */
 void SAL_CALL uno_type_constructData(
     void * pMem, struct _typelib_TypeDescriptionReference * pType )
@@ -188,17 +188,17 @@ void SAL_CALL uno_type_constructData(
     Widening conversion WITHOUT data loss is allowed (e.g., assigning a long with a short).
     Querying for demanded interface type is allowed.
     Assignment from any value to a value of type Any and vice versa is allowed.
-
-    @param pDest            pointer to destination value
-    @param pDestTypeDescr   type description of destination value
-    @param pSource          pointer to source value; if 0, then destination value will be assigned
+    
+    @param pDest			pointer to destination value
+    @param pDestTypeDescr	type description of destination value
+    @param pSource			pointer to source value; if 0, then destination value will be assigned
                             to default value
-    @param pSourceTypeDescr type destination of source value
-    @param queryInterface   function called each time an interface needs to be queried;
+    @param pSourceTypeDescr	type destination of source value
+    @param queryInterface	function called each time an interface needs to be queried;
                             defaults (0) to uno
-    @param acquire          function called each time an interface needs to be acquired;
+    @param acquire			function called each time an interface needs to be acquired;
                             defaults (0) to uno
-    @param release          function called each time an interface needs to be released;
+    @param release			function called each time an interface needs to be released;
                             defaults (0) to uno
     @return true if destination has been successfully assigned
 */
@@ -211,17 +211,17 @@ sal_Bool SAL_CALL uno_assignData(
     Widening conversion WITHOUT data loss is allowed (e.g., assigning a long with a short).
     Querying for demanded interface type is allowed.
     Assignment from any value to a value of type Any and vice versa is allowed.
-
-    @param pDest            pointer to destination value
-    @param pDestType        type of destination value
-    @param pSource          pointer to source value; if 0, then destination value will be assigned
+    
+    @param pDest			pointer to destination value
+    @param pDestType		type of destination value
+    @param pSource			pointer to source value; if 0, then destination value will be assigned
                             to default value
-    @param pSourceType      type of source value
-    @param queryInterface   function called each time an interface needs to be queried;
+    @param pSourceType		type of source value
+    @param queryInterface	function called each time an interface needs to be queried;
                             defaults (0) to uno
-    @param acquire          function called each time an interface needs to be acquired;
+    @param acquire			function called each time an interface needs to be acquired;
                             defaults (0) to uno
-    @param release          function called each time an interface needs to be released;
+    @param release			function called each time an interface needs to be released;
                             defaults (0) to uno
     @return true if destination has been successfully assigned
 */
@@ -235,13 +235,13 @@ sal_Bool SAL_CALL uno_type_assignData(
     Widening conversion WITHOUT data loss is allowed (e.g., assigning a long with a short).
     Querying for demanded interface type is allowed.
     Assignment from any value to a value of type Any and vice versa is allowed.
-
+    
     @param pAssignable      type
-    @param pFrom            pointer to value
-    @param pFromType        type of value
-    @param queryInterface   function called each time an interface needs to be queried;
+    @param pFrom			pointer to value
+    @param pFromType		type of value
+    @param queryInterface	function called each time an interface needs to be queried;
                             defaults (0) to uno
-    @param release          function called each time an interface needs to be released;
+    @param release			function called each time an interface needs to be released;
                             defaults (0) to uno
     @return true if value is destination has been successfully assigned
 */
diff --git a/cppu/inc/uno/dispatcher.h b/cppu/inc/uno/dispatcher.h
index 74b73d3f2127..42bde5e8c8bb 100644
--- a/cppu/inc/uno/dispatcher.h
+++ b/cppu/inc/uno/dispatcher.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,18 +45,18 @@ struct _uno_Interface;
     If an exception is signalled, the any *ppException is properly constructed by the callee,
     otherwise the pointer *ppException is set to 0.
     An attribute get call is indicated by a non-null return pointer.
-
-    @param pUnoI        uno interface the call is performed on
-    @param pMemberType  member type description of a method or attribute
-    @param pReturn      pointer to return value memory;
+    
+    @param pUnoI		uno interface the call is performed on
+    @param pMemberType	member type description of a method or attribute
+    @param pReturn	    pointer to return value memory;
                         pointer may be undefined if void method, null if attribute set call.
-    @param pArgs        an array of pointers to arguments values.
+    @param pArgs		an array of pointers to arguments values.
                         (remark: the value of an interface reference stores a
                          uno_interface *, so you get it by *(uno_Interface **)pArgs[n])
-    @param ppException  pointer to pointer to unconstructed any to signal an exception.
+    @param ppException	pointer to pointer to unconstructed any to signal an exception.
 */
 typedef void (SAL_CALL * uno_DispatchMethod)(
-    struct _uno_Interface * pUnoI,
+    struct _uno_Interface * pUnoI, 
     const struct _typelib_TypeDescription * pMemberType,
     void * pReturn,
     void * pArgs[],
@@ -73,12 +73,12 @@ typedef void (SAL_CALL * uno_DispatchMethod)(
 typedef struct _uno_Interface
 {
     /** Acquires uno interface.
-
+        
         @param pInterface uno interface
     */
     void (SAL_CALL * acquire)( struct _uno_Interface * pInterface );
     /** Releases uno interface.
-
+        
         @param pInterface uno interface
     */
     void (SAL_CALL * release)( struct _uno_Interface * pInterface );
diff --git a/cppu/inc/uno/dispatcher.hxx b/cppu/inc/uno/dispatcher.hxx
index 90fdb3db6df7..309c9e846d02 100644
--- a/cppu/inc/uno/dispatcher.hxx
+++ b/cppu/inc/uno/dispatcher.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,17 +33,17 @@
 
 
 namespace com
-{
+{     
 namespace sun
-{
+{     
 namespace star
-{
+{     
 namespace uno
 {
 
 /** C++ holder reference for binary C uno_Interface.  Not for public use, may be
     subject to changes.
-
+    
     @see uno_Interface
     @internal
               not for public use!
@@ -52,10 +52,10 @@ class UnoInterfaceReference
 {
 public:
     uno_Interface * m_pUnoI;
-
+    
     inline bool is() const
         { return m_pUnoI != 0; }
-
+    
     inline ~UnoInterfaceReference();
     inline UnoInterfaceReference();
     inline UnoInterfaceReference( uno_Interface * pUnoI, __sal_NoAcquire );
@@ -64,24 +64,24 @@ public:
 
     inline uno_Interface * get() const
         { return m_pUnoI; }
-
+    
     inline UnoInterfaceReference & set(
         uno_Interface * pUnoI );
     inline UnoInterfaceReference & set(
         uno_Interface * pUnoI, __sal_NoAcquire );
     inline void clear();
-
+    
     inline UnoInterfaceReference & operator = (
         UnoInterfaceReference const & ref )
         { return set( ref.m_pUnoI ); }
     inline UnoInterfaceReference & operator = (
         uno_Interface * pUnoI )
         { return set( pUnoI ); }
-
+    
     inline void dispatch(
         struct _typelib_TypeDescription const * pMemberType,
         void * pReturn, void * pArgs [], uno_Any ** ppException ) const;
-
+    
 private:
     inline bool operator == ( UnoInterfaceReference const & ); // not impl
     inline bool operator != ( UnoInterfaceReference const & ); // not impl
@@ -125,7 +125,7 @@ inline UnoInterfaceReference::UnoInterfaceReference(
     if (m_pUnoI != 0)
         (*m_pUnoI->acquire)( m_pUnoI );
 }
-
+    
 //______________________________________________________________________________
 inline UnoInterfaceReference & UnoInterfaceReference::set(
     uno_Interface * pUnoI )
diff --git a/cppu/inc/uno/environment.h b/cppu/inc/uno/environment.h
index 4a02c46abc28..e362ce7a6e88 100644
--- a/cppu/inc/uno/environment.h
+++ b/cppu/inc/uno/environment.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,69 +53,69 @@ typedef struct _uno_Environment
 {
     /** reserved for future use (0 if not used)
     */
-    void *              pReserved;
-
+    void *				pReserved;
+    
     /** type name of environment
     */
-    rtl_uString *       pTypeName;
-
+    rtl_uString *		pTypeName;
+    
     /** free context pointer to be used for specific classes of environments (e.g., a jvm pointer)
     */
-    void *              pContext;
-
+    void *				pContext;
+    
     /** pointer to extended environment (interface registration functionality), if supported
     */
     struct _uno_ExtEnvironment * pExtEnv;
-
+    
     /** Acquires this environment.
-
+        
         @param pEnv this environment
     */
     void (SAL_CALL * acquire)( struct _uno_Environment * pEnv );
-
+    
     /** Releases this environment; last release of environment will revoke the environment from
         runtime.
-
+        
         @param pEnv this environment
     */
     void (SAL_CALL * release)( struct _uno_Environment * pEnv );
-
+    
     /** Acquires this environment weakly.  You can only harden a weakly held environment if it
         is still acquired hard (acquire()).
-
+        
         @param pEnv this environment
     */
     void (SAL_CALL * acquireWeak)( struct _uno_Environment * pEnv );
-
+    
     /** Releases this environment weakly in correspondence to acquireWeak().
-
+        
         @param pEnv this environment
     */
     void (SAL_CALL * releaseWeak)( struct _uno_Environment * pEnv );
-
+    
     /** Makes hard reference out of weak referenced environment. You can only harden a weakly
         held environment if it is still acquired hard (acquire()).
-
+        
         @param ppHardEnv inout hard referenced environment (has to be released via release())
         @param pEnv environment (may be weak referenced)
     */
     void (SAL_CALL * harden)(
         struct _uno_Environment ** ppHardEnv,
         struct _uno_Environment * pEnv );
-
+    
     /** Call this function to EXPLICITLY dispose this environment (e.g., release all
         interfaces). You may want to call this function before shutting down due to a runtime error.
-
+        
         @param pEnv this environment
     */
     void (SAL_CALL * dispose)( struct _uno_Environment * pEnv );
-
+    
     /* ===== the following part will be late initialized by a matching bridge ===== *
-     * ===== and is NOT for public use.                                       ===== */
-
+     * ===== and is NOT for public use.										  ===== */
+    
     /** CALLBACK function pointer: Disposing callback function pointer that can be set to get
                                    signalled before the environment is destroyed.
-
+                                   
         @param pEnv environment that is being disposed
     */
     void (SAL_CALL * environmentDisposing)( struct _uno_Environment * pEnv );
@@ -126,14 +126,14 @@ typedef struct _uno_Environment
     Any proxy object must register itself on first acquire() call and revoke itself on last
     release() call. This can happen several times because the environment caches proxy objects
     until the environment explicitly frees the proxy object calling this function.
-
+    
     @param pEnv environment
     @param pProxy proxy pointer
 */
 typedef void (SAL_CALL * uno_freeProxyFunc)( struct _uno_ExtEnvironment * pEnv, void * pProxy );
 
 /** Generic function pointer declaration to allocate memory. Used with getRegisteredInterfaces().
-
+    
     @param nBytes amount of memory in bytes
     @return pointer to allocated memory
 */
@@ -146,28 +146,28 @@ typedef struct _uno_ExtEnvironment
     /** inherits all members of an uno_Environment
     */
     uno_Environment aBase;
-
+    
     /** Registers an interface of this environment.
-
-        @param pEnv         this environment
-        @param ppInterface  inout parameter of interface to be registered
-        @param pOId         object id of interface
-        @param pTypeDescr   type description of interface
+        
+        @param pEnv			this environment
+        @param ppInterface	inout parameter of interface to be registered
+        @param pOId			object id of interface
+        @param pTypeDescr	type description of interface
     */
     void (SAL_CALL * registerInterface)(
         struct _uno_ExtEnvironment * pEnv,
         void ** ppInterface,
         rtl_uString * pOId,
         struct _typelib_InterfaceTypeDescription * pTypeDescr );
-
+    
     /** Registers a proxy interface of this environment that can be reanimated and is freed
         explicitly by this environment.
-
-        @param pEnv         this environment
-        @param ppInterface  inout parameter of interface to be registered
-        @param freeProxy    function to free proxy object
-        @param pOId         object id of interface
-        @param pTypeDescr   type description of interface
+        
+        @param pEnv			this environment
+        @param ppInterface	inout parameter of interface to be registered
+        @param freeProxy	function to free proxy object
+        @param pOId			object id of interface
+        @param pTypeDescr	type description of interface
     */
     void (SAL_CALL * registerProxyInterface)(
         struct _uno_ExtEnvironment * pEnv,
@@ -175,48 +175,48 @@ typedef struct _uno_ExtEnvironment
         uno_freeProxyFunc freeProxy,
         rtl_uString * pOId,
         struct _typelib_InterfaceTypeDescription * pTypeDescr );
-
+    
     /** Revokes an interface from this environment. You have to revoke any interface that has
         been registered via this method.
-
-        @param pEnv         this environment
-        @param pInterface   interface to be revoked
+        
+        @param pEnv			this environment
+        @param pInterface	interface to be revoked
     */
     void (SAL_CALL * revokeInterface)(
         struct _uno_ExtEnvironment * pEnv,
         void * pInterface );
-
+    
     /** Provides the object id of a given interface.
-
-        @param ppOut        inout oid
-        @param pInterface   interface of object
+        
+        @param ppOut		inout oid
+        @param pInterface	interface of object
     */
     void (SAL_CALL * getObjectIdentifier)(
         struct _uno_ExtEnvironment * pEnv,
         rtl_uString ** ppOId,
         void * pInterface );
-
+    
     /** Retrieves an interface identified by its object id and type from this environment.
         Interfaces are retrieved in the same order as they are registered.
-
-        @param pEnv         this environment
-        @param ppInterface  inout parameter for the registered interface; (0) if none was found
-        @param pOId         object id of interface to be retrieved
-        @param pTypeDescr   type description of interface to be retrieved
+        
+        @param pEnv			this environment
+        @param ppInterface	inout parameter for the registered interface; (0) if none was found
+        @param pOId			object id of interface to be retrieved
+        @param pTypeDescr	type description of interface to be retrieved
     */
     void (SAL_CALL * getRegisteredInterface)(
         struct _uno_ExtEnvironment * pEnv,
         void ** ppInterface,
         rtl_uString * pOId,
         struct _typelib_InterfaceTypeDescription * pTypeDescr );
-
+    
     /** Returns all currently registered interfaces of this environment. The memory block
         allocated might be slightly larger than (*pnLen * sizeof(void *)).
-
-        @param pEnv         this environment
+        
+        @param pEnv			this environment
         @param pppInterfaces out param; pointer to array of interface pointers
-        @param pnLen        out param; length of array
-        @param memAlloc     function for allocating memory that is passed back
+        @param pnLen		out param; length of array
+        @param memAlloc		function for allocating memory that is passed back
     */
     void (SAL_CALL * getRegisteredInterfaces)(
         struct _uno_ExtEnvironment * pEnv,
@@ -227,33 +227,33 @@ typedef struct _uno_ExtEnvironment
     /* ===== the following part will be late initialized by a matching bridge ===== */
 
     /** Computes an object id of the given interface; is called by the environment implementation.
-
-        @param pEnv         corresponding environment
-        @param ppOId        out param: computed id
-        @param pInterface   an interface
+        
+        @param pEnv			corresponding environment
+        @param ppOId		out param: computed id
+        @param pInterface	an interface
     */
     void (SAL_CALL * computeObjectIdentifier)(
         struct _uno_ExtEnvironment * pEnv,
         rtl_uString ** ppOId, void * pInterface );
-
+    
     /** Function to acquire an interface.
-
-        @param pEnv         corresponding environment
-        @param pInterface   an interface
+        
+        @param pEnv			corresponding environment
+        @param pInterface	an interface
     */
     void (SAL_CALL * acquireInterface)(
         struct _uno_ExtEnvironment * pEnv,
         void * pInterface );
-
+    
     /** Function to release an interface.
-
-        @param pEnv         corresponding environment
-        @param pInterface   an interface
+        
+        @param pEnv			corresponding environment
+        @param pInterface	an interface
     */
     void (SAL_CALL * releaseInterface)(
         struct _uno_ExtEnvironment * pEnv,
         void * pInterface );
-
+    
 } uno_ExtEnvironment;
 
 #if defined( SAL_W32) ||  defined(SAL_OS2)
@@ -262,7 +262,7 @@ typedef struct _uno_ExtEnvironment
 
 /** Function exported by some bridge library providing acquireInterface(), releaseInterface();
     may set a disposing callback.
-
+    
     @param pEnv environment to be initialized
 */
 typedef void (SAL_CALL * uno_initEnvironmentFunc)( uno_Environment * pEnv );
@@ -270,10 +270,10 @@ typedef void (SAL_CALL * uno_initEnvironmentFunc)( uno_Environment * pEnv );
 
 /** Gets a specific environment. If the specified environment does not exist, then a default one
     is created and registered. The environment revokes itself on last release() call.
-
-    @param ppEnv        inout parameter of environment; given environment will be released
-    @param pEnvDcp      descriptor of environment
-    @param pContext     some context pointer (e.g., to distinguish java vm; set 0 if not needed)
+    
+    @param ppEnv		inout parameter of environment; given environment will be released
+    @param pEnvDcp	    descriptor of environment
+    @param pContext		some context pointer (e.g., to distinguish java vm; set 0 if not needed)
 */
 void SAL_CALL uno_getEnvironment(
     uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext )
@@ -281,10 +281,10 @@ void SAL_CALL uno_getEnvironment(
 
 /** Gets all specified environments. Caller has to release returned environments and free allocated
     memory.
-
-    @param pppEnvs      out param; pointer to array of environments
-    @param pnLen        out param; length of array
-    @param memAlloc     function for allocating memory that is passed back
+    
+    @param pppEnvs		out param; pointer to array of environments
+    @param pnLen		out param; length of array
+    @param memAlloc		function for allocating memory that is passed back
     @param pEnvDcp      descriptor of environments; 0 defaults to all
 */
 void SAL_CALL uno_getRegisteredEnvironments(
@@ -293,29 +293,29 @@ void SAL_CALL uno_getRegisteredEnvironments(
     SAL_THROW_EXTERN_C();
 
 /** Creates an environment. The new environment is anonymous (NOT publicly registered/ accessible).
-
-    @param ppEnv        out parameter of environment; given environment will be released
+    
+    @param ppEnv		out parameter of environment; given environment will be released
     @param pEnvDcp      descriptor of environment
-    @param pContext     context pointer (e.g., to distinguish java vm); set 0 if not needed
+    @param pContext		context pointer (e.g., to distinguish java vm); set 0 if not needed
 */
 void SAL_CALL uno_createEnvironment(
     uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext )
     SAL_THROW_EXTERN_C();
 
 /** Dumps out environment information, i.e. registered interfaces.
-
-    @param stream       output stream (FILE *)
-    @param pEnv         environment to be dumped
-    @param pFilter      if not null, filters output
+    
+    @param stream		output stream (FILE *)
+    @param pEnv			environment to be dumped
+    @param pFilter		if not null, filters output
 */
 void SAL_CALL uno_dumpEnvironment(
     void * stream, uno_Environment * pEnv, const sal_Char * pFilter )
     SAL_THROW_EXTERN_C();
 /** Dumps out environment information, i.e. registered interfaces.
-
-    @param stream       output stream (FILE *)
+    
+    @param stream		output stream (FILE *)
     @param pEnvDcp      descritpro of environment to be dumped
-    @param pFilter      if not null, filters output
+    @param pFilter		if not null, filters output
 */
 void SAL_CALL uno_dumpEnvironmentByName(
     void * stream, rtl_uString * pEnvDcp, const sal_Char * pFilter )
@@ -327,7 +327,7 @@ void SAL_CALL uno_dumpEnvironmentByName(
     In case no Environment has explicitly been entered, a purpose free
     default environment gets returned (e.g. the "uno" or "gcc3" Environment).
 
-    @param ppEnv      inout parameter; a given environment will be released
+    @param ppEnv	  inout parameter; a given environment will be released
     @param pTypeName  the optional type of the environment, falls back to "uno"
     @since UDK 3.2.7
 */
@@ -348,7 +348,7 @@ typedef void SAL_CALL uno_EnvCallee(va_list * pParam);
 void SAL_CALL uno_Environment_invoke_v(uno_Environment * pEnv, uno_EnvCallee * pCallee, va_list * pParam)
     SAL_THROW_EXTERN_C();
 
-/** Invoke the passed function in the given environment.
+/** Invoke the passed function in the given environment. 
 
     @param pEnv     the target environment
     @param pCallee  the function to call
@@ -358,7 +358,7 @@ void SAL_CALL uno_Environment_invoke_v(uno_Environment * pEnv, uno_EnvCallee * p
 void SAL_CALL uno_Environment_invoke (uno_Environment * pEnv, uno_EnvCallee * pCallee, ...)
     SAL_THROW_EXTERN_C();
 
-/** Enter an environment explicitly.
+/** Enter an environment explicitly. 
 
     @param pEnv    the environment to enter; NULL leaves all environments
     @since UDK 3.2.7
diff --git a/cppu/inc/uno/environment.hxx b/cppu/inc/uno/environment.hxx
index 8fa4f3ea5063..41c8435421d5 100644
--- a/cppu/inc/uno/environment.hxx
+++ b/cppu/inc/uno/environment.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,13 +36,13 @@
 
 /** */ //for docpp
 namespace com
-{
+{     
 /** */ //for docpp
 namespace sun
-{
+{     
 /** */ //for docpp
 namespace star
-{
+{     
 /** */ //for docpp
 namespace uno
 {
@@ -56,7 +56,7 @@ class Environment
     /** binary C uno_Environment
     */
     uno_Environment * _pEnv;
-
+    
 public:
     /** Returns the current Environment.
 
@@ -79,13 +79,13 @@ public:
     /** @internal */
     inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () )
         {}
-
+    
     /** Constructor: acquires given environment
-
+        
         @param pEnv environment
     */
     inline Environment( uno_Environment * pEnv = 0 ) SAL_THROW( () );
-
+    
     /** Gets a specific environment. If the specified environment does not exist, then a default one
         is created and registered.
 
@@ -96,7 +96,7 @@ public:
 
 
     /** Copy constructor: acquires given environment
-
+        
         @param rEnv another environment
     */
     inline Environment( const Environment & rEnv ) SAL_THROW( () );
@@ -104,49 +104,49 @@ public:
     /** Destructor: releases a set environment.
     */
     inline ~Environment() SAL_THROW( () );
-
+    
     /** Sets a given environment, i.e. acquires given one and releases a set one.
-
+        
         @param pEnv another environment
         @return this environment
     */
     inline Environment & SAL_CALL operator = ( uno_Environment * pEnv ) SAL_THROW( () );
     /** Sets a given environment, i.e. acquires given one and releases a set one.
-
+        
         @param rEnv another environment
         @return this environment
     */
     inline Environment & SAL_CALL operator = ( const Environment & rEnv ) SAL_THROW( () )
         { return operator = ( rEnv._pEnv ); }
-
+    
     /** Provides UNacquired pointer to the set C environment.
-
+        
         @return UNacquired pointer to the C environment struct
     */
     inline uno_Environment * SAL_CALL get() const SAL_THROW( () )
         { return _pEnv; }
-
+    
     /** Gets type name of set environment.
-
+        
         @return type name of set environment
     */
     inline ::rtl::OUString SAL_CALL getTypeName() const SAL_THROW( () )
         { return _pEnv->pTypeName; }
-
+    
     /** Gets free context pointer of set environment.
-
+        
         @return free context pointer of set environment
     */
     inline void * SAL_CALL getContext() const SAL_THROW( () )
         { return _pEnv->pContext; }
-
+    
     /** Tests if a environment is set.
-
+        
         @return true, if a environment is set, false otherwise
     */
     inline sal_Bool SAL_CALL is() const SAL_THROW( () )
         { return (_pEnv != 0); }
-
+    
     /** Releases a set environment.
     */
     inline void SAL_CALL clear() SAL_THROW( () );
@@ -159,7 +159,7 @@ public:
     */
     inline void SAL_CALL invoke_v(uno_EnvCallee * pCallee, va_list * pParam) const SAL_THROW( () );
 
-    /** Invoke the passed function in this environment.
+    /** Invoke the passed function in this environment. 
 
         @param pCallee  the function to call
         @param ...      the parameters to be passed to the function
@@ -167,13 +167,13 @@ public:
     */
     inline void SAL_CALL invoke(uno_EnvCallee * pCallee, ...) const SAL_THROW( () );
 
-    /** Enter this environment explicitly.
+    /** Enter this environment explicitly. 
 
         @since UDK 3.2.7
     */
     inline void SAL_CALL enter() const SAL_THROW( () );
 
-    /** Checks, if it is valid to currently call objects
+    /** Checks, if it is valid to currently call objects 
         belonging to this environment.
 
         @since UDK 3.2.7
@@ -237,15 +237,15 @@ inline void SAL_CALL Environment::invoke_v(uno_EnvCallee * pCallee, va_list * pP
 //__________________________________________________________________________________________________
 inline void SAL_CALL Environment::invoke(uno_EnvCallee * pCallee, ...) const SAL_THROW( () )
 {
-    if (_pEnv)
+    if (_pEnv) 
     {
         va_list param;
-
+        
         va_start(param, pCallee);
         uno_Environment_invoke_v(_pEnv, pCallee, &param);
         va_end(param);
     }
-
+    
 }
 //__________________________________________________________________________________________________
 inline void SAL_CALL Environment::enter() const SAL_THROW( () )
diff --git a/cppu/inc/uno/lbnames.h b/cppu/inc/uno/lbnames.h
index f9e32a957312..34943dc9d93f 100644
--- a/cppu/inc/uno/lbnames.h
+++ b/cppu/inc/uno/lbnames.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@
 #define CPPU_STRINGIFY( x ) CPPU_STRINGIFY_EX( x )
 
 /** Name for C++ compiler/ platform, e.g. "gcc3", "msci" */
-#define CPPU_CURRENT_LANGUAGE_BINDING_NAME CPPU_STRINGIFY( CPPU_ENV )
+#define	CPPU_CURRENT_LANGUAGE_BINDING_NAME CPPU_STRINGIFY( CPPU_ENV )
 
 #else
 
diff --git a/cppu/inc/uno/mapping.h b/cppu/inc/uno/mapping.h
index 082b59907ad4..99f8598d9df1 100644
--- a/cppu/inc/uno/mapping.h
+++ b/cppu/inc/uno/mapping.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,10 +52,10 @@ typedef void (SAL_CALL * uno_AcquireMappingFunc)(struct _uno_Mapping *);
 typedef void (SAL_CALL * uno_ReleaseMappingFunc)(struct _uno_Mapping *);
 
 /** Function pointer declaration to map an interface from one environment to another.
-
-    @param pMapping         mapping
-    @param ppOut            [inout] destination interface; existing interfaces are released
-    @param pInterface       source interface
+    
+    @param pMapping			mapping
+    @param ppOut			[inout] destination interface; existing interfaces are released
+    @param pInterface		source interface
     @param pInterfaceTypeDescr type description of the interface
 */
 typedef void (SAL_CALL * uno_MapInterfaceFunc)(
@@ -92,13 +92,13 @@ typedef struct _uno_Mapping
 #endif
 
 /** Gets an interface mapping from one environment to another.
-
-    @param ppMapping    [inout] mapping; existing mapping will be released
-    @param pFrom        source environment
-    @param pTo          destination environment
+    
+    @param ppMapping	[inout] mapping; existing mapping will be released
+    @param pFrom		source environment
+    @param pTo			destination environment
                         (interfaces resulting in mapInterface() call can be used
                         in this language environment)
-    @param pAddPurpose  additional purpose of mapping (e.g., protocolling); defaults to 0 (none)
+    @param pAddPurpose	additional purpose of mapping (e.g., protocolling); defaults to 0 (none)
 */
 void SAL_CALL uno_getMapping(
     struct _uno_Mapping ** ppMapping,
@@ -108,11 +108,11 @@ void SAL_CALL uno_getMapping(
     SAL_THROW_EXTERN_C();
 
 /** Callback function pointer declaration to get a mapping.
-
-    @param ppMapping    inout mapping
-    @param pFrom        source environment
-    @param pTo          destination environment
-    @param pAddPurpose  additional purpose
+    
+    @param ppMapping	inout mapping
+    @param pFrom		source environment
+    @param pTo			destination environment
+    @param pAddPurpose	additional purpose
 */
 typedef void (SAL_CALL * uno_getMappingFunc)(
     struct _uno_Mapping ** ppMapping,
@@ -121,35 +121,35 @@ typedef void (SAL_CALL * uno_getMappingFunc)(
     rtl_uString * pAddPurpose );
 
 /** Registers a callback being called each time a mapping is demanded.
-
-    @param pCallback    callback function
+    
+    @param pCallback	callback function
 */
 void SAL_CALL uno_registerMappingCallback(
     uno_getMappingFunc pCallback )
     SAL_THROW_EXTERN_C();
 
 /** Revokes a mapping callback registration.
-
-    @param pCallback    callback function
+    
+    @param pCallback	callback function
 */
 void SAL_CALL uno_revokeMappingCallback(
     uno_getMappingFunc pCallback )
     SAL_THROW_EXTERN_C();
 
 /** Function pointer declaration to free a mapping.
-
-    @param pMapping     mapping to be freed
+    
+    @param pMapping		mapping to be freed
 */
 typedef void (SAL_CALL * uno_freeMappingFunc)( struct _uno_Mapping * pMapping );
 
 /** Registers a mapping. A mapping registers itself on first acquire and revokes itself on last
     release. The given freeMapping function is called by the runtime to cleanup any resources.
-
-    @param ppMapping    inout mapping to be registered
-    @param freeMapping  called by runtime to delete mapping
-    @param pFrom        source environment
-    @param pTo          destination environment
-    @param pAddPurpose  additional purpose string; defaults to 0
+    
+    @param ppMapping	inout mapping to be registered
+    @param freeMapping	called by runtime to delete mapping
+    @param pFrom		source environment
+    @param pTo			destination environment
+    @param pAddPurpose	additional purpose string; defaults to 0
 */
 void SAL_CALL uno_registerMapping(
     struct _uno_Mapping ** ppMapping, uno_freeMappingFunc freeMapping,
@@ -158,8 +158,8 @@ void SAL_CALL uno_registerMapping(
 
 /** Revokes a mapping. A mapping registers itself on first acquire and revokes itself on last
     release.
-
-    @param pMapping     mapping to be revoked
+    
+    @param pMapping		mapping to be revoked
 */
 void SAL_CALL uno_revokeMapping(
     struct _uno_Mapping * pMapping )
@@ -167,13 +167,13 @@ void SAL_CALL uno_revokeMapping(
 
 /** Gets an interface mapping from one language environment to another by corresponding environment
     type names.
-
-    @param ppMapping    [inout] mapping; existing mapping will be released
-    @param pFrom        source environment type name
-    @param pTo          destination environment type name
+    
+    @param ppMapping	[inout] mapping; existing mapping will be released
+    @param pFrom		source environment type name
+    @param pTo			destination environment type name
                         (interfaces resulting in mapInterface() call can be used
                         in this language environment)
-    @param pAddPurpose  additional purpose of mapping (e.g., protocolling); defaults to 0 (none)
+    @param pAddPurpose	additional purpose of mapping (e.g., protocolling); defaults to 0 (none)
 */
 void SAL_CALL uno_getMappingByName(
     struct _uno_Mapping ** ppMapping,
@@ -187,10 +187,10 @@ void SAL_CALL uno_getMappingByName(
 
 /** Function pointer declaration to get a mapping from a loaded bridge. Bridges export a function
     called uno_ext_getMapping() of this signature.
-
-    @param ppMapping    [inout] mapping; existing mapping will be released
-    @pFrom              source environment
-    @pTo                destination environment
+    
+    @param ppMapping	[inout] mapping; existing mapping will be released
+    @pFrom				source environment
+    @pTo				destination environment
 */
 typedef void (SAL_CALL * uno_ext_getMappingFunc)(
     struct _uno_Mapping ** ppMapping,
diff --git a/cppu/inc/uno/mapping.hxx b/cppu/inc/uno/mapping.hxx
index a183cf089de3..73223fe87ef1 100644
--- a/cppu/inc/uno/mapping.hxx
+++ b/cppu/inc/uno/mapping.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,11 +42,11 @@ typedef struct _typelib_InterfaceTypeDescription typelib_InterfaceTypeDescriptio
 typedef struct _uno_Interface uno_Interface;
 
 namespace com
-{
+{     
 namespace sun
-{
+{     
 namespace star
-{
+{     
 namespace uno
 {
 
@@ -57,7 +57,7 @@ namespace uno
 class Mapping
 {
     uno_Mapping * _pMapping;
-
+    
 public:
     // these are here to force memory de/allocation to sal lib.
     /** @internal */
@@ -72,30 +72,30 @@ public:
     /** @internal */
     inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () )
         {}
-
+    
     /** Holds a mapping from the specified source to the specified destination by environment
         type names.
-
-        @param rFrom        type name of source environment
-        @param rTo          type name of destination environment
-        @param rAddPurpose  additional purpose
+        
+        @param rFrom		type name of source environment
+        @param rTo			type name of destination environment
+        @param rAddPurpose	additional purpose
     */
     inline Mapping(
         const ::rtl::OUString & rFrom, const ::rtl::OUString & rTo,
         const ::rtl::OUString & rAddPurpose = ::rtl::OUString() )
         SAL_THROW( () );
-
+    
     /** Holds a mapping from the specified source to the specified destination.
-
-        @param pFrom        source environment
-        @param pTo          destination environment
-        @param rAddPurpose  additional purpose
+        
+        @param pFrom		source environment
+        @param pTo			destination environment
+        @param rAddPurpose	additional purpose
     */
     inline Mapping(
         uno_Environment * pFrom, uno_Environment * pTo,
         const ::rtl::OUString & rAddPurpose = ::rtl::OUString() )
         SAL_THROW( () );
-
+    
     /** Holds a mapping from the specified source to the specified destination
         environment.
 
@@ -108,100 +108,100 @@ public:
         SAL_THROW( () );
 
     /** Constructor.
-
+        
         @param pMapping another mapping
     */
     inline Mapping( uno_Mapping * pMapping = 0 ) SAL_THROW( () );
-
+    
     /** Copy constructor.
-
+        
         @param rMapping another mapping
     */
     inline Mapping( const Mapping & rMapping ) SAL_THROW( () );
-
+    
     /** Destructor.
     */
     inline ~Mapping() SAL_THROW( () );
-
+    
     /** Sets a given mapping.
-
+        
         @param pMapping another mapping
         @return this mapping
     */
     inline Mapping & SAL_CALL operator = ( uno_Mapping * pMapping ) SAL_THROW( () );
     /** Sets a given mapping.
-
+        
         @param rMapping another mapping
         @return this mapping
     */
     inline Mapping & SAL_CALL operator = ( const Mapping & rMapping ) SAL_THROW( () )
         { return operator = ( rMapping._pMapping ); }
-
+    
     /** Provides a pointer to the C mapping. The returned mapping is NOT acquired!
-
+        
         @return UNacquired C mapping
     */
     inline uno_Mapping * SAL_CALL get() const SAL_THROW( () )
         { return _pMapping; }
-
+    
     /** Tests if a mapping is set.
-
+        
         @return true if a mapping is set
     */
     inline sal_Bool SAL_CALL is() const SAL_THROW( () )
         { return (_pMapping != 0); }
-
+    
     /** Releases a set mapping.
     */
     inline void SAL_CALL clear() SAL_THROW( () );
-
+    
     /** Maps an interface from one environment to another.
-
-        @param pInterface       source interface
-        @param pTypeDescr       type description of interface
-        @return                 mapped interface
+        
+        @param pInterface		source interface
+        @param pTypeDescr		type description of interface
+        @return					mapped interface
     */
     inline void * SAL_CALL mapInterface( void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const SAL_THROW( () );
     /** Maps an interface from one environment to another.
-
-        @param pInterface       source interface
-        @param pTypeDescr       type description of interface
-        @return                 mapped interface
+        
+        @param pInterface		source interface
+        @param pTypeDescr		type description of interface
+        @return					mapped interface
     */
     inline void * SAL_CALL mapInterface( void * pInterface, typelib_TypeDescription * pTypeDescr ) const SAL_THROW( () )
         { return mapInterface( pInterface, (typelib_InterfaceTypeDescription *)pTypeDescr ); }
-
+    
     /** Maps an interface from one environment to another.
-
-        @param pInterface       source interface
-        @param rType            type of interface
-        @return                 mapped interface
+        
+        @param pInterface		source interface
+        @param rType			type of interface
+        @return					mapped interface
     */
     inline void * SAL_CALL mapInterface(
         void * pInterface, const ::com::sun::star::uno::Type & rType ) const SAL_THROW( () );
-
+    
     /** Maps an interface from one environment to another.
-
-        @param ppOut            inout mapped interface
-        @param pInterface       source interface
-        @param pTypeDescr       type description of interface
+        
+        @param ppOut			inout mapped interface
+        @param pInterface		source interface
+        @param pTypeDescr		type description of interface
     */
     inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const SAL_THROW( () )
         { (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface, pTypeDescr ); }
     /** Maps an interface from one environment to another.
-
-        @param ppOut            inout mapped interface
-        @param pInterface       source interface
-        @param pTypeDescr       type description of interface
+        
+        @param ppOut			inout mapped interface
+        @param pInterface		source interface
+        @param pTypeDescr		type description of interface
     */
     inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_TypeDescription * pTypeDescr ) const SAL_THROW( () )
         { (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface, (typelib_InterfaceTypeDescription *)pTypeDescr ); }
-
+    
     /** Maps an interface from one environment to another.
-
-        @param ppOut            inout mapped interface
-        @param pInterface       source interface
-        @param rType            type of interface to be mapped
+        
+        @param ppOut			inout mapped interface
+        @param pInterface		source interface
+        @param rType			type of interface to be mapped
      */
     inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, const ::com::sun::star::uno::Type & rType ) const SAL_THROW( () );
 };
@@ -304,7 +304,7 @@ inline void * Mapping::mapInterface(
     (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Purpose Environments)
 
     Maps an binary C UNO interface to be used in the currently used compiler environment.
-
+    
     @tplparam C interface type
     @param ppRet inout returned interface pointer
     @param pUnoI binary C UNO interface
@@ -327,7 +327,7 @@ inline sal_Bool mapToCpp( Reference< C > * ppRet, uno_Interface * pUnoI ) SAL_TH
     (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Purpose Environments)
 
     Maps an UNO interface of the currently used compiler environment to binary C UNO.
-
+    
     @tplparam C interface type
     @param ppRet inout returned interface pointer
     @param x interface reference
diff --git a/cppu/inc/uno/sequence2.h b/cppu/inc/uno/sequence2.h
index d1a50a3743f5..16a949eea39d 100644
--- a/cppu/inc/uno/sequence2.h
+++ b/cppu/inc/uno/sequence2.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,11 +41,11 @@ struct _typelib_TypeDescription;
 typedef sal_Sequence uno_Sequence;
 
 /** Assigns a sequence.
-
-    @param ppDest       destinstaion sequence
-    @param pSource      source sequence
-    @param pTypeDescr   type description of the sequence and NOT of an element
-    @param release      function called each time an interface needs to
+    
+    @param ppDest		destinstaion sequence
+    @param pSource		source sequence
+    @param pTypeDescr	type description of the sequence and NOT of an element
+    @param release		function called each time an interface needs to
                         be released; defaults (0) to uno
 */
 void SAL_CALL uno_sequence_assign(
@@ -55,11 +55,11 @@ void SAL_CALL uno_sequence_assign(
     uno_ReleaseFunc release )
     SAL_THROW_EXTERN_C();
 /** Assigns a sequence.
-
-    @param ppDest       destinstaion sequence
-    @param pSource      source sequence
-    @param pType        type of the sequence and NOT of an element
-    @param release      function called each time an interface needs to
+    
+    @param ppDest		destinstaion sequence
+    @param pSource		source sequence
+    @param pType		type of the sequence and NOT of an element
+    @param release		function called each time an interface needs to
                         be released; defaults (0) to uno
 */
 void SAL_CALL uno_type_sequence_assign(
@@ -70,14 +70,14 @@ void SAL_CALL uno_type_sequence_assign(
     SAL_THROW_EXTERN_C();
 
 /** Constructs a new sequence with given elements.
-
-    @param ppSequence         out parameter sequence;
+    
+    @param ppSequence		  out parameter sequence;
                               0 if memory allocation has failed
-    @param pTypeDescr         type description of the sequence and NOT of an
+    @param pTypeDescr		  type description of the sequence and NOT of an
                               element
-    @param pElements          if 0, then all elements are default constructed
-    @param len                number of elements
-    @param acquire            function called each time an interface needs to
+    @param pElements		  if 0, then all elements are default constructed
+    @param len				  number of elements
+    @param acquire			  function called each time an interface needs to
                               be acquired; defaults (0) to uno
     @return                   false, if memoray allocation has failed
 */
@@ -88,13 +88,13 @@ sal_Bool SAL_CALL uno_sequence_construct(
     uno_AcquireFunc acquire )
     SAL_THROW_EXTERN_C();
 /** Constructs a new sequence with given elements.
-
-    @param ppSequence         out parameter sequence;
+    
+    @param ppSequence		  out parameter sequence;
                               0 if memory allocation has failed
-    @param pType              type of the sequence and NOT of an element
-    @param pElements          if 0, then all elements are default constructed
-    @param len                number of elements
-    @param acquire            function called each time an interface needs to
+    @param pType			  type of the sequence and NOT of an element
+    @param pElements		  if 0, then all elements are default constructed
+    @param len				  number of elements
+    @param acquire			  function called each time an interface needs to
                               be acquired; defaults (0) to uno
     @return                   false, if memoray allocation has failed
 */
@@ -108,12 +108,12 @@ sal_Bool SAL_CALL uno_type_sequence_construct(
 /** Assures that the reference count of the given sequence is one.
     Otherwise a new copy of the sequence is created with a reference count
     of one.
-
-    @param ppSequence       inout sequence
-    @param pTypeDescr       type description of sequence
-    @param acquire          function called each time an interface needs to
+    
+    @param ppSequence		inout sequence
+    @param pTypeDescr		type description of sequence
+    @param acquire			function called each time an interface needs to
                             be acquired; defaults (0) to uno
-    @param release          function called each time an interface needs to
+    @param release			function called each time an interface needs to
                             be released; defaults (0) to uno
     @return                 false, if memoray allocation has failed
 */
@@ -126,12 +126,12 @@ sal_Bool SAL_CALL uno_sequence_reference2One(
 /** Assures that the reference count of the given sequence is one.
     Otherwise a new copy of the sequence is created with a reference count
     of one.
-
-    @param ppSequence       inout sequence
-    @param pType            type of sequence
-    @param acquire          function called each time an interface needs to
+    
+    @param ppSequence		inout sequence
+    @param pType			type of sequence
+    @param acquire			function called each time an interface needs to
                             be acquired; defaults (0) to uno
-    @param release          function called each time an interface needs to
+    @param release			function called each time an interface needs to
                             be released; defaults (0) to uno
     @return                 false, if memoray allocation has failed
 */
@@ -144,13 +144,13 @@ sal_Bool SAL_CALL uno_type_sequence_reference2One(
 
 /** Reallocates length of a sequence. This truncates a sequence or enlarges
     it default constructing appended elements.
-
-    @param ppSequence       inout sequence
-    @param pTypeDescr       type description of sequence
-    @param nSize            new size of sequence
-    @param acquire          function called each time an interface needs to
+    
+    @param ppSequence		inout sequence
+    @param pTypeDescr		type description of sequence
+    @param nSize			new size of sequence
+    @param acquire			function called each time an interface needs to
                             be acquired; defaults (0) to uno
-    @param release          function called each time an interface needs to
+    @param release			function called each time an interface needs to
                             be released; defaults (0) to uno
     @return                 false, if memoray allocation has failed
 */
@@ -163,13 +163,13 @@ sal_Bool SAL_CALL uno_sequence_realloc(
     SAL_THROW_EXTERN_C();
 /** Reallocates length of a sequence. This truncates a sequence or enlarges
     it default constructing appended elements.
-
-    @param ppSequence       inout sequence
-    @param pType            type of sequence
-    @param nSize            new size of sequence
-    @param acquire          function called each time an interface needs to
+    
+    @param ppSequence		inout sequence
+    @param pType			type of sequence
+    @param nSize			new size of sequence
+    @param acquire			function called each time an interface needs to
                             be acquired; defaults (0) to uno
-    @param release          function called each time an interface needs to
+    @param release			function called each time an interface needs to
                             be released; defaults (0) to uno
     @return                 false, if memoray allocation has failed
 */
diff --git a/cppu/inc/uno/threadpool.h b/cppu/inc/uno/threadpool.h
index 0c647442e377..f2acf71fe092 100644
--- a/cppu/inc/uno/threadpool.h
+++ b/cppu/inc/uno/threadpool.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,13 +42,13 @@ extern "C" {
   uno_releaseIdFromCurrentThread().
   This method is in general called by a bridge, that wants to bind a remote threadId
   to a new thread.
-
+ 
   @param pThreadId a byte sequence, that contains the identifier of the current thread.
-  @return true, when the identifier was registered.
+  @return true, when the identifier was registered. 
           false, when the thread has already an identifier. The identifier was not
           altered. ( This is in general a bug ).
 
-  @see uno_releaseIdFromCurrentThread()
+  @see uno_releaseIdFromCurrentThread()        
  */
 sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId )
     SAL_THROW_EXTERN_C();
@@ -59,8 +59,8 @@ sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId )
   If no id has been bound for the thread before, a new one is generated and bound
   to the thread.
   For each call to uno_getIdOfCurrentThread(), a call to uno_releaseIdFromCurrentThread()
-  must be done.
-
+  must be done. 
+ 
   @param ppThreadId [out] Contains the (acquired) ThreadId.
   @see uno_releaseIdFromCurrentThread()
  */
@@ -68,7 +68,7 @@ void SAL_CALL uno_getIdOfCurrentThread( sal_Sequence **ppThreadId )
     SAL_THROW_EXTERN_C();
 
 
-/**
+/** 
   If the internal refcount drops to zero, the association betwen threadId and
   thread is broken.
  */
@@ -94,9 +94,9 @@ uno_threadpool_create() SAL_THROW_EXTERN_C();
   an incoming request/reply).
   For every call to uno_threadpool_attach, a corrosponding call to
   uno_threadpool_detach must be done.
-
+ 
   @param hPool The bridge threadpool handle previously created by uno_threadpool_create.
-
+ 
 */
 void SAL_CALL
 uno_threadpool_attach( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C();
@@ -104,7 +104,7 @@ uno_threadpool_attach( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C();
 /**
   This method is called to wait for a reply of a previously sent request. This is a
   blocking method. uno_threadpool_attach() must have been called before.
-
+ 
   @param hPool the handle that was previously created by uno_threadpool_create().
   @param ppJob [out] the pointer, that was given by uno_threadpool_putJob
   0, when uno_threadpool_dispose() was the reason to fall off from threadpool.
@@ -117,30 +117,30 @@ uno_threadpool_enter( uno_ThreadPool hPool , void **ppJob )
 /**
    Detaches the current thread from the threadpool. Must be called for
    every call to uno_threadpool_attach.
-*/
+*/	
 void SAL_CALL
 uno_threadpool_detach( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C();
 
 /**
   Puts a job into the pool. A job may eiter be a request or a reply
   (replies have a 0 in the doRequest parameter). This function is non-blocking.
-
+ 
   A request may either be synchronous or asynchronous.
   If the request is synchronous, it is first looked up,
   if there exists a handle with the given
   identifier. If this is the case, the thread is woken up and the doRequest
   function is called with the given pJob. If no handle exists,
   a new thread is created and the given threadId is bound to the new thread.
-
+ 
   If the request is asynchronous, it is put into the queue of asynchronous
   requests for the current threadid. The requests are always executed in a new
   thread, even if the thread with the given id is waiting in the pool. No id is bound
   to the newly created thread. The responsibilty is left to the bridge ( if it
   wishes to bind a name).
-
+ 
   If pJob is a reply, there MUST be a thread with the given threadId waiting
-  for this reply.
-
+  for this reply. 
+ 
   @param pThreadId The Id of the thread, that initialized this request. (In general a
                    remote threadid).
   @param pJob The argument, that doRequest will get or that will be returned by
@@ -161,16 +161,16 @@ uno_threadpool_putJob(
 /**
   All threads, that are waiting on the hPool handle, are forced out of the pool.
   The threads waiting with uno_threadpool_enter() will return with *ppJob == 0
-
-  Later calls to uno_threadpool_enter() using the hPool handle will also
+  
+  Later calls to uno_threadpool_enter() using the hPool handle will also 
   return immeadiatly with *ppJob == 0.
-
+ 
   @param hPool The handle to be disposed.
   In case, hPool is 0, this function joins on all threads created
   by the threadpool administration. This may e.g. used to ensure, that
   no threads are inside the cppu library anymore, in case it needs to get
   unloaded.
-
+ 
   This function is called i.e. by a bridge, that is forced to dispose itself.
  */
 void SAL_CALL
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index e3cd60b6a41d..7f440065c367 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/qa/test_recursion.cxx b/cppu/qa/test_recursion.cxx
index 977fdba1e062..b5e12ca18d8f 100644
--- a/cppu/qa/test_recursion.cxx
+++ b/cppu/qa/test_recursion.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx
index 968978af92fe..b4ef870b9e12 100644
--- a/cppu/qa/test_reference.cxx
+++ b/cppu/qa/test_reference.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index c7cca12ff955..d6fe948becae 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/qa/types.idl b/cppu/qa/types.idl
index 0ec106ec91b2..d4011985838f 100644
--- a/cppu/qa/types.idl
+++ b/cppu/qa/types.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/qa/version.map b/cppu/qa/version.map
index 7321bbca16ad..f313c44bd7ad 100644
--- a/cppu/qa/version.map
+++ b/cppu/qa/version.map
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index 89647322ad6d..ab2399fcb75a 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,7 +56,7 @@ class OuterThread;
 class SAL_DLLPRIVATE AffineBridge : public cppu::Enterable
 {
 public:
-    enum Msg
+    enum Msg 
     {
         CB_DONE,
         CB_FPOINTER
@@ -100,7 +100,7 @@ class SAL_DLLPRIVATE InnerThread : public osl::Thread
 
 public:
     InnerThread(AffineBridge * threadEnvironment)
-        : m_pAffineBridge(threadEnvironment)
+        : m_pAffineBridge(threadEnvironment) 
         {
             create();
         }
@@ -181,7 +181,7 @@ void AffineBridge::outerDispatch(int loop)
 
     Msg mm;
 
-    do
+    do 
     {
         // FIXME: created outer thread must not wait
         // in case of no message
@@ -193,20 +193,20 @@ void AffineBridge::outerDispatch(int loop)
 
         mm = m_message;
 
-        switch(mm)
+        switch(mm) 
         {
         case CB_DONE:
             break;
-
-        case CB_FPOINTER:
+            
+        case CB_FPOINTER: 
         {
             m_pCallee(m_pParam);
-
+            
             m_message = CB_DONE;
             m_innerCondition.set();
             break;
         }
-        default:
+        default: 
             abort();
         }
     }
@@ -220,27 +220,27 @@ void AffineBridge::innerDispatch(void)
 
     Msg mm;
 
-    do
+    do 
     {
         m_innerCondition.wait();
         m_innerCondition.reset();
 
         mm = m_message;
 
-        switch(mm)
+        switch(mm) 
         {
         case CB_DONE:
             break;
-
-        case CB_FPOINTER:
+            
+        case CB_FPOINTER: 
         {
             m_pCallee(m_pParam);
-
+            
             m_message = CB_DONE;
             m_outerCondition.set();
             break;
         }
-        default:
+        default: 
             abort();
         }
     }
@@ -309,14 +309,14 @@ void AffineBridge::v_enter(void)
 {
     m_innerMutex.acquire();
 
-    if (!m_enterCount)
+    if (!m_enterCount) 
         m_innerThreadId = osl_getThreadIdentifier(NULL);
 
     OSL_ASSERT(m_innerThreadId == osl_getThreadIdentifier(NULL));
 
     ++ m_enterCount;
 }
-
+    
 void AffineBridge::v_leave(void)
 {
     OSL_ASSERT(m_innerThreadId == osl_getThreadIdentifier(NULL));
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index eb7c2c85e9c2..2a0f970e8af9 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -105,7 +105,7 @@ void LogBridge::v_enter(void)
 
     ++ m_count;
 }
-
+    
 void LogBridge::v_leave(void)
 {
     OSL_ASSERT(m_count > 0);
@@ -236,7 +236,7 @@ void LogProbe(
                 if ( i > 0 )
                     rtl_logfile_trace( ",");
                 traceValue(pParams[i].pTypeRef,pArgs[i]);
-
+                
             }
             rtl_logfile_trace( ")");
         } // if ( nParams )
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index 17ecb4646918..1e6f003a2a94 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -114,7 +114,7 @@ void UnsafeBridge::v_enter(void)
 
     ++ m_count;
 }
-
+    
 void UnsafeBridge::v_leave(void)
 {
     OSL_ASSERT(m_count > 0);
diff --git a/cppu/source/cppu/cppu_opt.cxx b/cppu/source/cppu/cppu_opt.cxx
index 6512bd567d71..912fb76b8619 100644
--- a/cppu/source/cppu/cppu_opt.cxx
+++ b/cppu/source/cppu/cppu_opt.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/source/helper/purpenv/Proxy.hxx b/cppu/source/helper/purpenv/Proxy.hxx
index 9db0182c2edc..9eec6b61c954 100644
--- a/cppu/source/helper/purpenv/Proxy.hxx
+++ b/cppu/source/helper/purpenv/Proxy.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -67,7 +67,7 @@ public:
                    typelib_InterfaceTypeDescription       * pTypeDescr,
                    rtl::OUString                    const & rOId,
                    cppu::helper::purpenv::ProbeFun        * probeFun,
-                   void                                   * pProbeContext)
+                   void                                   * pProbeContext) 
         SAL_THROW( () );
     ~Proxy(void);
 
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
index 52e77785f1ea..b0b6388f125d 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,33 +51,33 @@
 #endif
 
 
-extern "C" {
-typedef void SAL_CALL EnvFun_P   (uno_Environment *);
+extern "C" { 
+typedef void SAL_CALL EnvFun_P   (uno_Environment *); 
 typedef void SAL_CALL EnvFun_PP_P(uno_Environment ** ppHardEnv, uno_Environment *);
 typedef void SAL_CALL ExtEnv_registerProxyInterface (uno_ExtEnvironment                 *,
                                                      void                              ** ppProxy,
                                                      uno_freeProxyFunc                    freeProxy,
                                                      rtl_uString * pOId,
                                                      typelib_InterfaceTypeDescription   * pTypeDescr);
-typedef void SAL_CALL ExtEnv_revokeInterface        (uno_ExtEnvironment                 *,
+typedef void SAL_CALL ExtEnv_revokeInterface        (uno_ExtEnvironment                 *, 
                                                      void                               * pInterface);
-typedef void SAL_CALL ExtEnv_getObjectIdentifier    (uno_ExtEnvironment                 *,
-                                                     rtl_uString                       **,
+typedef void SAL_CALL ExtEnv_getObjectIdentifier    (uno_ExtEnvironment                 *, 
+                                                     rtl_uString                       **, 
                                                      void                               *);
-typedef void SAL_CALL ExtEnv_getRegisteredInterface (uno_ExtEnvironment                 *,
-                                                     void                              **,
-                                                     rtl_uString                        *,
+typedef void SAL_CALL ExtEnv_getRegisteredInterface (uno_ExtEnvironment                 *, 
+                                                     void                              **, 
+                                                     rtl_uString                        *, 
                                                      typelib_InterfaceTypeDescription   *);
-typedef void SAL_CALL ExtEnv_getRegisteredInterfaces(uno_ExtEnvironment                 *,
+typedef void SAL_CALL ExtEnv_getRegisteredInterfaces(uno_ExtEnvironment                 *, 
                                                      void                             *** pppInterfaces,
                                                      sal_Int32                          * pnLen,
                                                      uno_memAlloc                         memAlloc);
-typedef void SAL_CALL ExtEnv_computeObjectIdentifier(uno_ExtEnvironment                 *,
-                                                     rtl_uString                       ** ppOId,
+typedef void SAL_CALL ExtEnv_computeObjectIdentifier(uno_ExtEnvironment                 *, 
+                                                     rtl_uString                       ** ppOId, 
                                                      void                               * pInterface);
-typedef void SAL_CALL ExtEnv_acquireInterface       (uno_ExtEnvironment                 *,
+typedef void SAL_CALL ExtEnv_acquireInterface       (uno_ExtEnvironment                 *, 
                                                      void                               * pInterface);
-typedef void SAL_CALL ExtEnv_releaseInterface       (uno_ExtEnvironment                 *,
+typedef void SAL_CALL ExtEnv_releaseInterface       (uno_ExtEnvironment                 *, 
                                                      void                               * pInterface);
 }
 
@@ -92,20 +92,20 @@ public:
     void acquire    (void);
     void release    (void);
 
-    void registerProxyInterface (void                                  ** ppProxy,
-                                 uno_freeProxyFunc                        freeProxy,
+    void registerProxyInterface (void                                  ** ppProxy, 
+                                 uno_freeProxyFunc                        freeProxy, 
                                  rtl::OUString                    const & oid,
                                  typelib_InterfaceTypeDescription       * pTypeDescr);
     void revokeInterface        (void                                   * pInterface);
-    void getObjectIdentifier    (void                                   * pInterface,
+    void getObjectIdentifier    (void                                   * pInterface, 
                                  rtl::OUString                          * pOid);
-    void getRegisteredInterface (void                                  **,
-                                 rtl::OUString                    const & oid,
+    void getRegisteredInterface (void                                  **, 
+                                 rtl::OUString                    const & oid, 
                                  typelib_InterfaceTypeDescription       *);
-    void getRegisteredInterfaces(void                                 ***,
+    void getRegisteredInterfaces(void                                 ***, 
                                  sal_Int32                              * pnLen,
                                  uno_memAlloc                             memAlloc);
-    void computeObjectIdentifier(void                                   * pInterface,
+    void computeObjectIdentifier(void                                   * pInterface, 
                                  rtl::OUString                          * pOid);
     void acquireInterface       (void                                   * pInterface);
     void releaseInterface       (void                                   * pInterface);
@@ -171,40 +171,40 @@ static void SAL_CALL s_releaseWeak(uno_Environment * pEnv) SAL_THROW_EXTERN_C()
 }
 
 
-static void SAL_CALL s_registerProxyInterface(uno_ExtEnvironment                * pExtEnv,
+static void SAL_CALL s_registerProxyInterface(uno_ExtEnvironment                * pExtEnv, 
                                                          void                             ** ppProxy,
                                                          uno_freeProxyFunc                   freeProxy,
-                                                         rtl_uString                       * pOId,
-                                                         typelib_InterfaceTypeDescription  * pTypeDescr)
+                                                         rtl_uString                       * pOId, 
+                                                         typelib_InterfaceTypeDescription  * pTypeDescr) 
 {
     Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved);
     pBase->registerProxyInterface(ppProxy, freeProxy, pOId, pTypeDescr);
 }
 
-static void SAL_CALL s_revokeInterface(uno_ExtEnvironment * pExtEnv, void * pInterface)
+static void SAL_CALL s_revokeInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) 
 {
     Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved);
     pBase->revokeInterface(pInterface);
 }
 
-static void SAL_CALL s_getObjectIdentifier(uno_ExtEnvironment *  pExtEnv,
-                                                      rtl_uString        ** ppOId,
-                                                      void               *  pInterface)
+static void SAL_CALL s_getObjectIdentifier(uno_ExtEnvironment *  pExtEnv, 
+                                                      rtl_uString        ** ppOId, 
+                                                      void               *  pInterface) 
 {
     Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved);
     pBase->getObjectIdentifier(pInterface, reinterpret_cast<rtl::OUString *>(ppOId));
 }
 
-static void SAL_CALL s_getRegisteredInterface(uno_ExtEnvironment *  pExtEnv,
+static void SAL_CALL s_getRegisteredInterface(uno_ExtEnvironment *  pExtEnv, 
                                                          void               ** ppInterface,
-                                                         rtl_uString        *  pOId,
-                                                         typelib_InterfaceTypeDescription * pTypeDescr)
+                                                         rtl_uString        *  pOId, 
+                                                         typelib_InterfaceTypeDescription * pTypeDescr) 
 {
     Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved);
     pBase->getRegisteredInterface(ppInterface, pOId, pTypeDescr);
 }
 
-static void SAL_CALL s_getRegisteredInterfaces(uno_ExtEnvironment   * pExtEnv,
+static void SAL_CALL s_getRegisteredInterfaces(uno_ExtEnvironment   * pExtEnv, 
                                                           void               *** pppInterface,
                                                           sal_Int32            * pnLen,
                                                           uno_memAlloc           memAlloc)
@@ -213,9 +213,9 @@ static void SAL_CALL s_getRegisteredInterfaces(uno_ExtEnvironment   * pExtEnv,
     pBase->getRegisteredInterfaces(pppInterface, pnLen, memAlloc);
 }
 
-static void SAL_CALL s_computeObjectIdentifier(uno_ExtEnvironment *  pExtEnv,
-                                                          rtl_uString        ** ppOId,
-                                                          void               *  pInterface)
+static void SAL_CALL s_computeObjectIdentifier(uno_ExtEnvironment *  pExtEnv, 
+                                                          rtl_uString        ** ppOId, 
+                                                          void               *  pInterface) 
 {
     Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved);
     pBase->computeObjectIdentifier(pInterface, reinterpret_cast<rtl::OUString *>(ppOId));
@@ -275,7 +275,7 @@ Base::Base(uno_Environment * pEnv, cppu::Enterable * pEnterable)
     pEnv->pReserved = this;
 }
 
-Base::~Base()
+Base::~Base() 
 {
     LOG_LIFECYCLE_cppu_helper_purpenv_Base_emit(fprintf(stderr, "LIFE: %s -> %p\n", "cppu::helper::purpenv::Base::~Base()", this));
 
@@ -324,7 +324,7 @@ void Base::releaseWeak(void)
 }
 
 
-extern "C" { static void s_registerProxyInterface_v(va_list * pParam)
+extern "C" { static void s_registerProxyInterface_v(va_list * pParam) 
 {
     uno_ExtEnvironment                   * pExtEnv    = va_arg(*pParam, uno_ExtEnvironment *);
     void                                ** ppProxy    = va_arg(*pParam, void **);
@@ -337,15 +337,15 @@ extern "C" { static void s_registerProxyInterface_v(va_list * pParam)
     pRegisterProxyInterface(pExtEnv, ppProxy, freeProxy, pOId, pTypeDescr);
 }}
 
-void Base::registerProxyInterface(void                                  ** ppProxy,
-                                  uno_freeProxyFunc                        freeProxy,
+void Base::registerProxyInterface(void                                  ** ppProxy, 
+                                  uno_freeProxyFunc                        freeProxy, 
                                   rtl::OUString                    const & oid,
                                   typelib_InterfaceTypeDescription       * pTypeDescr)
 {
-     uno_Environment_invoke(m_pEnv,
-                           s_registerProxyInterface_v,
-                           m_pEnv->pExtEnv,
-                           ppProxy,
+     uno_Environment_invoke(m_pEnv, 
+                           s_registerProxyInterface_v, 
+                           m_pEnv->pExtEnv, 
+                           ppProxy, 
                            freeProxy,
                            oid.pData,
                            pTypeDescr,
@@ -353,7 +353,7 @@ void Base::registerProxyInterface(void                                  ** ppPro
 }
 
 
-extern "C" { static void s_revokeInterface_v(va_list * pParam)
+extern "C" { static void s_revokeInterface_v(va_list * pParam) 
 {
     uno_ExtEnvironment * pExtEnv    = va_arg(*pParam, uno_ExtEnvironment *);
     void               * pInterface = va_arg(*pParam, void *);
@@ -364,15 +364,15 @@ extern "C" { static void s_revokeInterface_v(va_list * pParam)
 
 void Base::revokeInterface(void * pInterface)
 {
-     uno_Environment_invoke(m_pEnv,
-                           s_revokeInterface_v,
-                           m_pEnv->pExtEnv,
-                           pInterface,
+     uno_Environment_invoke(m_pEnv, 
+                           s_revokeInterface_v, 
+                           m_pEnv->pExtEnv, 
+                           pInterface, 
                            m_env_revokeInterface);
 }
 
 
-extern "C" { static void s_getObjectIdentifier_v(va_list * pParam)
+extern "C" { static void s_getObjectIdentifier_v(va_list * pParam) 
 {
     uno_ExtEnvironment * pExtEnv    = va_arg(*pParam, uno_ExtEnvironment *);
     void               * pInterface = va_arg(*pParam, void *);
@@ -385,16 +385,16 @@ extern "C" { static void s_getObjectIdentifier_v(va_list * pParam)
 
 void Base::getObjectIdentifier(void * pInterface, rtl::OUString * pOid)
 {
-     uno_Environment_invoke(m_pEnv,
-                           s_getObjectIdentifier_v,
-                           m_pEnv->pExtEnv,
-                           pInterface,
+     uno_Environment_invoke(m_pEnv, 
+                           s_getObjectIdentifier_v, 
+                           m_pEnv->pExtEnv, 
+                           pInterface, 
                            pOid,
                            m_env_getObjectIdentifier);
 }
 
 
-extern "C" { static void s_getRegisteredInterface_v(va_list * pParam)
+extern "C" { static void s_getRegisteredInterface_v(va_list * pParam) 
 {
     uno_ExtEnvironment                   * pExtEnv     = va_arg(*pParam, uno_ExtEnvironment *);
     void                                ** ppInterface = va_arg(*pParam, void **);
@@ -406,21 +406,21 @@ extern "C" { static void s_getRegisteredInterface_v(va_list * pParam)
     pGetRegisteredInterface(pExtEnv, ppInterface, pOId, pTypeDescr);
 }}
 
-void Base::getRegisteredInterface(void ** ppInterface,
+void Base::getRegisteredInterface(void ** ppInterface, 
                                   rtl::OUString const & oid,
                                   typelib_InterfaceTypeDescription * pTypeDescr)
 {
-     uno_Environment_invoke(m_pEnv,
-                           s_getRegisteredInterface_v,
-                           m_pEnv->pExtEnv,
-                           ppInterface,
+     uno_Environment_invoke(m_pEnv, 
+                           s_getRegisteredInterface_v, 
+                           m_pEnv->pExtEnv, 
+                           ppInterface, 
                            oid.pData,
                            pTypeDescr,
                            m_env_getRegisteredInterface);
 }
 
 
-extern "C" { static void s_getRegisteredInterfaces_v(va_list * pParam)
+extern "C" { static void s_getRegisteredInterfaces_v(va_list * pParam) 
 {
     uno_ExtEnvironment   * pExtEnv      = va_arg(*pParam, uno_ExtEnvironment *);
     void               *** pppInterface = va_arg(*pParam, void ***);
@@ -432,21 +432,21 @@ extern "C" { static void s_getRegisteredInterfaces_v(va_list * pParam)
     pGetRegisteredInterfaces(pExtEnv, pppInterface, pnLen, memAlloc);
 }}
 
-void Base::getRegisteredInterfaces(void         *** pppInterface,
+void Base::getRegisteredInterfaces(void         *** pppInterface, 
                                    sal_Int32      * pnLen,
                                    uno_memAlloc     memAlloc)
 {
-     uno_Environment_invoke(m_pEnv,
-                           s_getRegisteredInterfaces_v,
-                           m_pEnv->pExtEnv,
-                           pppInterface,
+     uno_Environment_invoke(m_pEnv, 
+                           s_getRegisteredInterfaces_v, 
+                           m_pEnv->pExtEnv, 
+                           pppInterface, 
                            pnLen,
                            memAlloc,
                            m_env_getRegisteredInterfaces);
 }
 
 
-extern "C" { static void s_computeObjectIdentifier_v(va_list * pParam)
+extern "C" { static void s_computeObjectIdentifier_v(va_list * pParam) 
 {
     uno_ExtEnvironment * pExtEnv    = va_arg(*pParam, uno_ExtEnvironment *);
     void               * pInterface = va_arg(*pParam, void *);
@@ -459,20 +459,20 @@ extern "C" { static void s_computeObjectIdentifier_v(va_list * pParam)
 
 void Base::computeObjectIdentifier(void * pInterface, rtl::OUString * pOid)
 {
-     uno_Environment_invoke(m_pEnv,
-                           s_computeObjectIdentifier_v,
-                           m_pEnv->pExtEnv,
-                           pInterface,
+     uno_Environment_invoke(m_pEnv, 
+                           s_computeObjectIdentifier_v, 
+                           m_pEnv->pExtEnv, 
+                           pInterface, 
                            pOid,
                            m_env_computeObjectIdentifier);
 }
 
 
-extern "C" { static void s_acquireInterface_v(va_list * pParam)
+extern "C" { static void s_acquireInterface_v(va_list * pParam) 
 {
     uno_ExtEnvironment * pExtEnv    = va_arg(*pParam, uno_ExtEnvironment *);
     void               * pInterface = va_arg(*pParam, void *);
-    ExtEnv_acquireInterface * pAcquireInterface
+    ExtEnv_acquireInterface * pAcquireInterface 
         = va_arg(*pParam, ExtEnv_acquireInterface *);
 
     pAcquireInterface(pExtEnv, pInterface);
@@ -484,7 +484,7 @@ void Base::acquireInterface(void * pInterface)
 }
 
 
-extern "C" { static void s_releaseInterface_v(va_list * pParam)
+extern "C" { static void s_releaseInterface_v(va_list * pParam) 
 {
     uno_ExtEnvironment * pExtEnv    = va_arg(*pParam, uno_ExtEnvironment *);
     void               * pInterface = va_arg(*pParam, void *);
@@ -496,10 +496,10 @@ extern "C" { static void s_releaseInterface_v(va_list * pParam)
 
 void Base::releaseInterface(void * pInterface)
 {
-     uno_Environment_invoke(m_pEnv,
-                           s_releaseInterface_v,
-                           m_pEnv->pExtEnv,
-                           pInterface,
+     uno_Environment_invoke(m_pEnv, 
+                           s_releaseInterface_v, 
+                           m_pEnv->pExtEnv, 
+                           pInterface, 
                            m_env_releaseInterface);
 }
 
@@ -523,7 +523,7 @@ void Base::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam)
     m_pEnterable->callOut_v(pCallee, pParam);
 }
 
-int Base::v_isValid(rtl::OUString * pReason)
+int Base::v_isValid(rtl::OUString * pReason) 
 {
     return m_pEnterable->isValid(pReason);
 }
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
index 9c87f82cf470..a299e1eb1dbc 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -67,7 +67,7 @@ class Mapping : public uno_Mapping
     void                            * m_pContext;
 
 public:
-    explicit  Mapping(uno_Environment                 * pFrom,
+    explicit  Mapping(uno_Environment                 * pFrom, 
                       uno_Environment                 * pTo,
                       cppu::helper::purpenv::ProbeFun * probeFun,
                       void                            * pProbeContext);
@@ -114,7 +114,7 @@ static void s_getIdentifier_v(va_list * pParam)
     uno_ExtEnvironment *  pEnv  = va_arg(*pParam, uno_ExtEnvironment *);
     rtl_uString        ** ppOid = va_arg(*pParam, rtl_uString **);
     uno_Interface      *  pUnoI = va_arg(*pParam, uno_Interface *);
-
+    
     pEnv->getObjectIdentifier(pEnv, ppOid, pUnoI);
 }
 
@@ -126,7 +126,7 @@ static void SAL_CALL s_free(uno_Mapping * puno_Mapping)
 }
 }
 
-Mapping::Mapping(uno_Environment                 * pFrom,
+Mapping::Mapping(uno_Environment                 * pFrom, 
                  uno_Environment                 * pTo,
                  cppu::helper::purpenv::ProbeFun * probeFun,
                  void                            * pProbeContext
@@ -185,14 +185,14 @@ void Mapping::mapInterface(
                                            pOId,
                                            m_probeFun,
                                            m_pContext);
-
+        
         // proxy may be exchanged during registration
         m_to.get()->pExtEnv->registerProxyInterface(m_to.get()->pExtEnv,
                                                     (void **)&pProxy,
                                                     Proxy_free,
                                                     pOId,
                                                     pTypeDescr);
-
+        
         *ppOut = pProxy;
     }
 
@@ -210,9 +210,9 @@ void Mapping::acquire() SAL_THROW(())
     }
 }
 
-void Mapping::release() SAL_THROW(())
+void Mapping::release() SAL_THROW(()) 
 {
-    if (osl_decrementInterlockedCount(&m_nCount) == 0)
+    if (osl_decrementInterlockedCount(&m_nCount) == 0) 
         ::uno_revokeMapping(this);
 }
 
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
index c5651b007686..ecf6bcd56726 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,12 +51,12 @@
 using namespace com::sun::star;
 
 
-static bool relatesToInterface(typelib_TypeDescription * pTypeDescr)
+static bool relatesToInterface(typelib_TypeDescription * pTypeDescr) 
     SAL_THROW( () )
 {
     switch (pTypeDescr->eTypeClass)
     {
-//      case typelib_TypeClass_TYPEDEF:
+//  	case typelib_TypeClass_TYPEDEF:
     case typelib_TypeClass_SEQUENCE:
     {
         switch (((typelib_IndirectTypeDescription *)pTypeDescr)->pType->eTypeClass)
@@ -94,7 +94,7 @@ static bool relatesToInterface(typelib_TypeDescription * pTypeDescr)
             case typelib_TypeClass_UNION: // might relate to interface
             case typelib_TypeClass_ANY: // might relate to interface
                 return true;
-//              case typelib_TypeClass_TYPEDEF:
+//  			case typelib_TypeClass_TYPEDEF:
             case typelib_TypeClass_SEQUENCE:
             case typelib_TypeClass_STRUCT:
             case typelib_TypeClass_EXCEPTION:
@@ -130,7 +130,7 @@ extern "C" { static void SAL_CALL s_Proxy_dispatch(
     typelib_TypeDescription const * pMemberType,
     void                          * pReturn,
     void                          * pArgs[],
-    uno_Any                      ** ppException)
+    uno_Any                      ** ppException) 
     SAL_THROW_EXTERN_C()
 {
     Proxy * pThis = static_cast<Proxy *>(pUnoI);
@@ -204,7 +204,7 @@ static void SAL_CALL s_Proxy_release(uno_Interface * pUnoI) SAL_THROW_EXTERN_C()
     pProxy->release();
 }
 
-static void s_acquireAndRegister_v(va_list * pParam)
+static void s_acquireAndRegister_v(va_list * pParam) 
 {
     uno_Interface                    * pUnoI      = va_arg(*pParam, uno_Interface *);
     rtl_uString                      * pOid       = va_arg(*pParam, rtl_uString *);
@@ -224,7 +224,7 @@ Proxy::Proxy(uno::Mapping                  const & to_from,
              rtl::OUString                 const & rOId,
              cppu::helper::purpenv::ProbeFun     * probeFun,
              void                                * pProbeContext
-)
+) 
     SAL_THROW(())
         : m_nRef         (1),
           m_from         (pFrom),
@@ -253,7 +253,7 @@ Proxy::Proxy(uno::Mapping                  const & to_from,
     uno_Interface::pDispatcher = s_Proxy_dispatch;
 }
 
-extern "C" { static void s_releaseAndRevoke_v(va_list * pParam)
+extern "C" { static void s_releaseAndRevoke_v(va_list * pParam) 
 {
     uno_ExtEnvironment * pEnv  = va_arg(*pParam, uno_ExtEnvironment *);
     uno_Interface      * pUnoI = va_arg(*pParam, uno_Interface *);
@@ -271,7 +271,7 @@ Proxy::~Proxy()
     typelib_typedescription_release((typelib_TypeDescription *)m_pTypeDescr);
 }
 
-static uno::TypeDescription getAcquireMethod(void)
+static uno::TypeDescription getAcquireMethod(void) 
 {
     typelib_TypeDescriptionReference * type_XInterface =
         * typelib_static_type_getByTypeClass(typelib_TypeClass_INTERFACE);
@@ -286,7 +286,7 @@ static uno::TypeDescription getAcquireMethod(void)
     return acquire;
 }
 
-static uno::TypeDescription getReleaseMethod(void)
+static uno::TypeDescription getReleaseMethod(void) 
 {
     typelib_TypeDescriptionReference * type_XInterface =
         * typelib_static_type_getByTypeClass(typelib_TypeClass_INTERFACE);
@@ -309,7 +309,7 @@ void Proxy::acquire(void)
     if (m_probeFun)
         m_probeFun(true,
                    this,
-                   m_pProbeContext,
+                   m_pProbeContext, 
                    *typelib_static_type_getByTypeClass(typelib_TypeClass_VOID),
                    NULL,
                    0,
@@ -333,7 +333,7 @@ void Proxy::acquire(void)
     if (m_probeFun)
         m_probeFun(false,
                    this,
-                   m_pProbeContext,
+                   m_pProbeContext, 
                    *typelib_static_type_getByTypeClass(typelib_TypeClass_VOID),
                    NULL,
                    0,
@@ -344,7 +344,7 @@ void Proxy::acquire(void)
 
 }
 
-void Proxy::release(void)
+void Proxy::release(void) 
 {
     cppu::helper::purpenv::ProbeFun * probeFun = m_probeFun;
     void                            * pProbeContext = m_pProbeContext;
@@ -352,7 +352,7 @@ void Proxy::release(void)
     if (m_probeFun)
         m_probeFun(true,
                    this,
-                   m_pProbeContext,
+                   m_pProbeContext, 
                    *typelib_static_type_getByTypeClass(typelib_TypeClass_VOID),
                    NULL,
                    0,
@@ -367,7 +367,7 @@ void Proxy::release(void)
     if (probeFun)
         probeFun(false,
                  this,
-                 pProbeContext,
+                 pProbeContext, 
                  *typelib_static_type_getByTypeClass(typelib_TypeClass_VOID),
                  NULL,
                  0,
@@ -411,7 +411,7 @@ void Proxy::dispatch(typelib_TypeDescriptionReference * pReturnTypeRef,
     if (m_probeFun)
         m_probeFun(true,
                    this,
-                   m_pProbeContext,
+                   m_pProbeContext, 
                    pReturnTypeRef,
                    pParams,
                    nParams,
@@ -424,7 +424,7 @@ void Proxy::dispatch(typelib_TypeDescriptionReference * pReturnTypeRef,
 
     typelib_TypeDescription * return_td = 0;
     void * ret = pReturn;
-    if (pReturnTypeRef)
+    if (pReturnTypeRef) 
     {
         TYPELIB_DANGER_GET(&return_td, pReturnTypeRef);
 
@@ -483,9 +483,9 @@ void Proxy::dispatch(typelib_TypeDescriptionReference * pReturnTypeRef,
         }
         if (ret != pReturn)
         {
-            uno_type_copyAndConvertData(pReturn,
-                                        ret,
-                                        pReturnTypeRef,
+            uno_type_copyAndConvertData(pReturn, 
+                                        ret, 
+                                        pReturnTypeRef, 
                                         m_to_from.get());
 
             uno_Environment_invoke(m_to.get(), s_type_destructData_v, ret, pReturnTypeRef, 0);
@@ -507,9 +507,9 @@ void Proxy::dispatch(typelib_TypeDescriptionReference * pReturnTypeRef,
             }
         }
 
-        uno_type_any_constructAndConvert(*ppException,
-                                         exc->pData,
-                                         exc->pType,
+        uno_type_any_constructAndConvert(*ppException, 
+                                         exc->pData, 
+                                         exc->pType, 
                                          m_to_from.get());
 
         // FIXME: need to destruct in m_to
@@ -519,7 +519,7 @@ void Proxy::dispatch(typelib_TypeDescriptionReference * pReturnTypeRef,
     if (m_probeFun)
         m_probeFun(false,
                    this,
-                   m_pProbeContext,
+                   m_pProbeContext, 
                    pReturnTypeRef,
                    pParams,
                    nParams,
diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx
index 2ffabcbff014..6fad817494cd 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -67,7 +67,7 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext()
         if (0 == s_type_XCurrentContext)
         {
             OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XCurrentContext") );
-            typelib_InterfaceTypeDescription * pTD = 0;
+            typelib_InterfaceTypeDescription * pTD = 0;            
             typelib_TypeDescriptionReference * pMembers[1] = { 0 };
             OUString sMethodName0(
                 RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XCurrentContext::getValueByName") );
@@ -81,10 +81,10 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext()
                 * typelib_static_type_getByTypeClass( typelib_TypeClass_INTERFACE ),
                 1,
                 pMembers );
-
+            
             typelib_typedescription_register( (typelib_TypeDescription**)&pTD );
             typelib_typedescriptionreference_release( pMembers[0] );
-
+            
             typelib_InterfaceMethodTypeDescription * pMethod = 0;
             typelib_Parameter_Init aParameters[1];
             OUString sParamName0( RTL_CONSTASCII_USTRINGPARAM("Name") );
@@ -121,13 +121,13 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext()
 //==================================================================================================
 class ThreadKey
 {
-    sal_Bool     _bInit;
+    sal_Bool	 _bInit;
     oslThreadKey _hThreadKey;
     oslThreadKeyCallbackFunction _pCallback;
-
+    
 public:
     inline oslThreadKey getThreadKey() SAL_THROW( () );
-
+    
     inline ThreadKey( oslThreadKeyCallbackFunction pCallback ) SAL_THROW( () );
     inline ~ThreadKey() SAL_THROW( () );
 };
@@ -186,7 +186,7 @@ IdContainer * getIdContainer() SAL_THROW( () )
 {
     static ThreadKey s_key( delete_IdContainer );
     oslThreadKey aKey = s_key.getThreadKey();
-
+    
     IdContainer * pId = reinterpret_cast< IdContainer * >( ::osl_getThreadKeyData( aKey ) );
     if (! pId)
     {
@@ -209,7 +209,7 @@ extern "C" sal_Bool SAL_CALL uno_setCurrentContext(
 {
     IdContainer * pId = getIdContainer();
     OSL_ASSERT( pId );
-
+    
     // free old one
     if (pId->pCurrentContext)
     {
@@ -221,7 +221,7 @@ extern "C" sal_Bool SAL_CALL uno_setCurrentContext(
 
         pId->pCurrentContext = 0;
     }
-
+    
     if (pCurrentContext)
     {
         uno_Environment * pEnv = 0;
@@ -256,7 +256,7 @@ extern "C" sal_Bool SAL_CALL uno_getCurrentContext(
 {
     IdContainer * pId = getIdContainer();
     OSL_ASSERT( pId );
-
+    
     Environment target_env;
 
     // release inout parameter
@@ -274,11 +274,11 @@ extern "C" sal_Bool SAL_CALL uno_getCurrentContext(
 
         *ppCurrentContext = 0;
     }
-
+    
     // case: null-ref
     if (0 == pId->pCurrentContext)
         return sal_True;
-
+    
     if (! target_env.is())
     {
         target_env = Environment(rtl::OUString(pEnvTypeName), pEnvContext);
@@ -286,7 +286,7 @@ extern "C" sal_Bool SAL_CALL uno_getCurrentContext(
         if (! target_env.is())
             return sal_False;
     }
-
+    
     Mapping mapping((uno_Environment *) pId->pCurrentContextEnv, target_env.get());
     OSL_ASSERT( mapping.is() );
     if (! mapping.is())
diff --git a/cppu/source/threadpool/current.hxx b/cppu/source/threadpool/current.hxx
index 45640220116d..cf9b04b1cf3e 100644
--- a/cppu/source/threadpool/current.hxx
+++ b/cppu/source/threadpool/current.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,10 +39,10 @@ struct IdContainer
     void *               pCurrentContext;
     uno_ExtEnvironment * pCurrentContextEnv;
     //
-    sal_Bool            bInit;
-    sal_Sequence *      pLocalThreadId;
-    sal_Int32           nRefCountOfCurrentId;
-    sal_Sequence *      pCurrentId;
+    sal_Bool			bInit;
+    sal_Sequence *		pLocalThreadId;
+    sal_Int32			nRefCountOfCurrentId;
+    sal_Sequence *		pCurrentId;
 };
 
 IdContainer * getIdContainer() SAL_THROW( () );
diff --git a/cppu/source/threadpool/jobqueue.cxx b/cppu/source/threadpool/jobqueue.cxx
index 92bd7cf97607..6db0d68d5102 100644
--- a/cppu/source/threadpool/jobqueue.cxx
+++ b/cppu/source/threadpool/jobqueue.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,22 +36,22 @@
 using namespace ::osl;
 
 namespace cppu_threadpool {
-
+    
     JobQueue::JobQueue() :
         m_nToDo( 0 ),
         m_bSuspended( sal_False ),
         m_cndWait( osl_createCondition() )
     {
-        osl_resetCondition( m_cndWait );
+        osl_resetCondition( m_cndWait );		
         m_DisposedCallerAdmin = DisposedCallerAdmin::getInstance();
     }
-
+    
     JobQueue::~JobQueue()
     {
         osl_destroyCondition( m_cndWait );
     }
-
-
+        
+        
     void JobQueue::add( void *pThreadSpecificData, RequestFun * doRequest )
     {
         MutexGuard guard( m_mutex );
@@ -63,7 +63,7 @@ namespace cppu_threadpool {
         }
         m_nToDo ++;
     }
-
+        
     void *JobQueue::enter( sal_Int64 nDisposeId , sal_Bool bReturnWhenNoJob )
     {
         void *pReturn = 0;
@@ -77,7 +77,7 @@ namespace cppu_threadpool {
             m_lstCallstack.push_front( nDisposeId );
         }
 
-
+        
         while( sal_True )
         {
             if( bReturnWhenNoJob )
@@ -90,7 +90,7 @@ namespace cppu_threadpool {
             }
 
             osl_waitCondition( m_cndWait , 0 );
-
+            
             struct Job job={0,0};
             {
                 // synchronize with add and dispose calls
@@ -132,10 +132,10 @@ namespace cppu_threadpool {
             MutexGuard guard( m_mutex );
             m_lstCallstack.pop_front();
         }
-
+        
         return pReturn;
     }
-
+    
     void JobQueue::dispose( sal_Int64 nDisposeId )
     {
         MutexGuard guard( m_mutex );
@@ -155,7 +155,7 @@ namespace cppu_threadpool {
             osl_setCondition( m_cndWait );
         }
     }
-
+        
     void JobQueue::suspend()
     {
         MutexGuard guard( m_mutex );
diff --git a/cppu/source/threadpool/jobqueue.hxx b/cppu/source/threadpool/jobqueue.hxx
index bfeef9b4a576..7016fc028d25 100644
--- a/cppu/source/threadpool/jobqueue.hxx
+++ b/cppu/source/threadpool/jobqueue.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,16 +40,16 @@
 namespace cppu_threadpool
 {
     extern "C" typedef void (SAL_CALL RequestFun)(void *);
-
+    
     struct Job
     {
         void *pThreadSpecificData;
         RequestFun * doRequest;
     };
+    
+    typedef	::std::list	< struct Job > JobList;
 
-    typedef ::std::list < struct Job > JobList;
-
-    typedef ::std::list < sal_Int64 > CallStackList;
+    typedef	::std::list	< sal_Int64 > CallStackList;
 
     class DisposedCallerAdmin;
     typedef boost::shared_ptr<DisposedCallerAdmin> DisposedCallerAdminHolder;
@@ -59,9 +59,9 @@ namespace cppu_threadpool
     public:
         JobQueue();
         ~JobQueue();
-
+        
         void add( void *pThreadSpecificData, RequestFun * doRequest );
-
+        
         void *enter( sal_Int64 nDisposeId , sal_Bool bReturnWhenNoJob = sal_False );
         void dispose( sal_Int64 nDisposeId );
 
@@ -71,7 +71,7 @@ namespace cppu_threadpool
         sal_Bool isEmpty();
         sal_Bool isCallstackEmpty();
         sal_Bool isBusy();
-
+    
     private:
         ::osl::Mutex m_mutex;
         JobList      m_lstJob;
@@ -83,6 +83,6 @@ namespace cppu_threadpool
     };
 }
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx
index c6035f0754c7..5a849a331b39 100644
--- a/cppu/source/threadpool/thread.cxx
+++ b/cppu/source/threadpool/thread.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -149,8 +149,8 @@ namespace cppu_threadpool {
 
     sal_Bool ORequestThread::create()
     {
-        OSL_ASSERT(m_thread == 0);  // only one running thread per instance
-
+        OSL_ASSERT(m_thread == 0);	// only one running thread per instance
+        
         m_thread = osl_createSuspendedThread( cppu_requestThreadWorker, (void*)this);
         if ( m_thread )
         {
diff --git a/cppu/source/threadpool/thread.hxx b/cppu/source/threadpool/thread.hxx
index bbef51eabca4..7ece3b5f0e9f 100644
--- a/cppu/source/threadpool/thread.hxx
+++ b/cppu/source/threadpool/thread.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ namespace cppu_threadpool {
     class JobQueue;
     class ThreadAdmin;
     typedef boost::shared_ptr<ThreadAdmin> ThreadAdminHolder;
-
+    
     //-----------------------------------------
     // private thread class for the threadpool
     // independent from vos
@@ -54,14 +54,14 @@ namespace cppu_threadpool {
         ~ORequestThread();
 
         void setTask( JobQueue * , const ::rtl::ByteSequence & aThreadId , sal_Bool bAsynchron );
-
+        
         sal_Bool create();
         void join();
         void onTerminated();
         void run();
         inline void setDeleteSelf( sal_Bool b )
             { m_bDeleteSelf = b; }
-
+        
     private:
         oslThread m_thread;
         ThreadAdminHolder m_aThreadAdmin;
@@ -88,6 +88,6 @@ namespace cppu_threadpool {
 } // end cppu_threadpool
 
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/threadpool/threadident.cxx b/cppu/source/threadpool/threadident.cxx
index 50fef43f57b4..d9a933ef023a 100644
--- a/cppu/source/threadpool/threadident.cxx
+++ b/cppu/source/threadpool/threadident.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx
index d56999c7a74c..42dd870896ae 100644
--- a/cppu/source/threadpool/threadpool.cxx
+++ b/cppu/source/threadpool/threadpool.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/source/threadpool/threadpool.hxx b/cppu/source/threadpool/threadpool.hxx
index 75cdd18882d1..db849099ef67 100644
--- a/cppu/source/threadpool/threadpool.hxx
+++ b/cppu/source/threadpool/threadpool.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ namespace cppu_threadpool {
 
     struct HashThreadId
     {
-        sal_Int32 operator () ( const ::rtl::ByteSequence &a  )  const
+        sal_Int32 operator () ( const ::rtl::ByteSequence &a  )  const 
             {
                 if( a.getLength() >= 4 )
                 {
@@ -60,33 +60,33 @@ namespace cppu_threadpool {
             }
     };
 
-    typedef ::std::hash_map
+    typedef	::std::hash_map
     <
-        ByteSequence, // ThreadID
+        ByteSequence, // ThreadID 
         ::std::pair < JobQueue * , JobQueue * >,
         HashThreadId,
         EqualThreadId
     > ThreadIdHashMap;
 
-    typedef ::std::list < sal_Int64 > DisposedCallerList;
-
+    typedef	::std::list	< sal_Int64 > DisposedCallerList;
 
+    
     struct WaitingThread
     {
         oslCondition condition;
         ORequestThread *thread;
     };
-
-    typedef ::std::list < struct ::cppu_threadpool::WaitingThread * > WaitingThreadList;
+    
+    typedef	::std::list	< struct ::cppu_threadpool::WaitingThread * > WaitingThreadList;
 
     class DisposedCallerAdmin;
     typedef boost::shared_ptr<DisposedCallerAdmin> DisposedCallerAdminHolder;
-
+    
     class DisposedCallerAdmin
     {
     public:
         ~DisposedCallerAdmin();
-
+        
         static DisposedCallerAdminHolder getInstance();
 
         void dispose( sal_Int64 nDisposeId );
@@ -107,10 +107,10 @@ namespace cppu_threadpool {
         ThreadPool();
         ~ThreadPool();
         static ThreadPoolHolder getInstance();
-
+        
         void dispose( sal_Int64 nDisposeId );
         void stopDisposing( sal_Int64 nDisposeId );
-
+        
         void addJob( const ByteSequence &aThreadId,
                      sal_Bool bAsynchron,
                      void *pThreadSpecificData,
@@ -123,15 +123,15 @@ namespace cppu_threadpool {
          * @return true, if queue could be succesfully revoked.
          ********/
         sal_Bool revokeQueue( const ByteSequence & aThreadId , sal_Bool bAsynchron );
-
+        
         void waitInPool( ORequestThread *pThread );
     private:
-        void createThread( JobQueue *pQueue, const ByteSequence &aThreadId, sal_Bool bAsynchron);
-
+        void createThread( JobQueue *pQueue, const ByteSequence &aThreadId,	sal_Bool bAsynchron);
 
+        
         ThreadIdHashMap m_mapQueue;
         ::osl::Mutex m_mutex;
-
+        
         ::osl::Mutex m_mutexWaitingThreadList;
         WaitingThreadList m_lstThreads;
 
diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx
index 9aa9afcf648f..5cb19e266ba0 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -74,7 +74,7 @@ void SAL_CALL typelib_typedescriptionreference_getByName(
 
 /**
  * The double member determin the alignment.
- * Under Os2 and MS-Windows the Alignment is min( 8, sizeof( type ) ).
+ * Under Os2 and MS-Windows the Alignment is min( 8, sizeof( type ) ). 
  * The aligment of a strukture is min( 8, sizeof( max basic type ) ), the greatest basic type
  * determine the aligment.
  */
@@ -97,7 +97,7 @@ struct AlignSize_Impl
 #pragma pack()
 #endif
 
-// the value of the maximal alignment
+// the value of the maximal alignment 
 static sal_Int32 nMaxAlignment = (sal_Int32)( (sal_Size)(&((AlignSize_Impl *) 16)->dDouble) - 16);
 
 static inline sal_Int32 adjustAlignment( sal_Int32 nRequestedAlignment )
@@ -153,7 +153,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0 };
-
+    
     if (! s_aTypes[eTypeClass])
     {
         MutexGuard aGuard( typelib_StaticInitMutex::get() );
@@ -164,7 +164,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
                 "short", "unsigned short", "long", "unsigned long",
                 "hyper", "unsigned hyper", "float", "double",
                 "string", "type", "any" };
-
+            
             switch (eTypeClass)
             {
             case typelib_TypeClass_EXCEPTION:
@@ -201,9 +201,9 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
                 if (! s_aTypes[typelib_TypeClass_INTERFACE])
                 {
                     OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface") );
-
+                    
                     typelib_InterfaceTypeDescription * pTD = 0;
-
+                    
                     typelib_TypeDescriptionReference * pMembers[3] = { 0,0,0 };
                     OUString sMethodName0( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface::queryInterface") );
                     ::typelib_typedescriptionreference_new(
@@ -214,18 +214,18 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
                     OUString sMethodName2( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface::release") );
                     ::typelib_typedescriptionreference_new(
                         &pMembers[2], typelib_TypeClass_INTERFACE_METHOD, sMethodName2.pData );
-
+                    
                     ::typelib_typedescription_newInterface(
                         &pTD, sTypeName.pData, 0xe227a391, 0x33d6, 0x11d1, 0xaabe00a0, 0x249d5590,
                         0, 3, pMembers );
-
+                    
                     ::typelib_typedescription_register( (typelib_TypeDescription **)&pTD );
                     ::typelib_typedescriptionreference_acquire(
                         s_aTypes[typelib_TypeClass_INTERFACE] = ((typelib_TypeDescription *)pTD)->pWeakRef );
                     // another static ref:
                     ++s_aTypes[typelib_TypeClass_INTERFACE]->nStaticRefCount;
                     ::typelib_typedescription_release( (typelib_TypeDescription*)pTD );
-
+                    
                     ::typelib_typedescriptionreference_release( pMembers[0] );
                     ::typelib_typedescriptionreference_release( pMembers[1] );
                     ::typelib_typedescriptionreference_release( pMembers[2] );
@@ -234,7 +234,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
                     {
                     typelib_TypeDescription * pTD1 = 0;
                     OUString sTypeName1( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception") );
-
+                    
                     typelib_CompoundMember_Init aMembers[2];
                     OUString sMemberType0( RTL_CONSTASCII_USTRINGPARAM("string") );
                     OUString sMemberName0( RTL_CONSTASCII_USTRINGPARAM("Message") );
@@ -246,7 +246,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
                     aMembers[1].eTypeClass = typelib_TypeClass_INTERFACE;
                     aMembers[1].pTypeName = sMemberType1.pData;
                     aMembers[1].pMemberName = sMemberName1.pData;
-
+                    
                     ::typelib_typedescription_new(
                         &pTD1, typelib_TypeClass_EXCEPTION, sTypeName1.pData, 0, 2, aMembers );
                     typelib_typedescription_register( &pTD1 );
@@ -280,13 +280,13 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
                         typelib_TypeClass_ANY, sReturnType0.pData,
                         1, aParameters, 1, pExceptions );
                     ::typelib_typedescription_register( (typelib_TypeDescription**)&pMethod );
-
+                    
                     OUString sReturnType1( RTL_CONSTASCII_USTRINGPARAM("void") );
                     ::typelib_typedescription_newInterfaceMethod(
                         &pMethod, 1, sal_True, sMethodName1.pData,
                         typelib_TypeClass_VOID, sReturnType1.pData, 0, 0, 0, 0 );
                     ::typelib_typedescription_register( (typelib_TypeDescription**)&pMethod );
-
+                    
                     ::typelib_typedescription_newInterfaceMethod(
                         &pMethod, 2, sal_True, sMethodName2.pData,
                         typelib_TypeClass_VOID, sReturnType1.pData,
@@ -322,7 +322,7 @@ void SAL_CALL typelib_static_type_init(
         {
             OUString aTypeName( OUString::createFromAscii( pTypeName ) );
             ::typelib_typedescriptionreference_new( ppRef, eTypeClass, aTypeName.pData );
-
+            
             // another static ref:
             ++((*ppRef)->nStaticRefCount);
         }
@@ -344,7 +344,7 @@ void SAL_CALL typelib_static_sequence_type_init(
             aBuf.appendAscii( "[]" );
             aBuf.append( pElementType->pTypeName );
             OUString aTypeName( aBuf.makeStringAndClear() );
-
+            
             OSL_ASSERT( ! TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK(typelib_TypeClass_SEQUENCE) );
             *ppRef = igetTypeByName( aTypeName.pData );
             if (!*ppRef)
@@ -353,7 +353,7 @@ void SAL_CALL typelib_static_sequence_type_init(
                 ::typelib_typedescription_new(
                     &pReg, typelib_TypeClass_SEQUENCE,
                     aTypeName.pData, pElementType, 0, 0 );
-
+                
                 ::typelib_typedescription_register( &pReg );
                 *ppRef = (typelib_TypeDescriptionReference *)pReg;
                 OSL_ASSERT( *ppRef == pReg->pWeakRef );
@@ -376,7 +376,7 @@ void init(
 {
     OSL_ENSURE( typelib_TypeClass_STRUCT == eTypeClass ||
                  typelib_TypeClass_EXCEPTION == eTypeClass, "### unexpected type class!" );
-
+    
     if (! *ppRef)
     {
         MutexGuard aGuard( typelib_StaticInitMutex::get() );
@@ -400,7 +400,7 @@ void init(
                     nOffset = ((typelib_TypeDescription *)pComp->pBaseTypeDescription)->nSize;
                     OSL_ENSURE( newAlignedSize( 0, ((typelib_TypeDescription *)pComp->pBaseTypeDescription)->nSize, ((typelib_TypeDescription *)pComp->pBaseTypeDescription)->nAlignment ) == ((typelib_TypeDescription *)pComp->pBaseTypeDescription)->nSize, "### unexpected offset!" );
                 }
-
+                
                 if (nMembers)
                 {
                     pComp->nMembers = nMembers;
@@ -430,14 +430,14 @@ void init(
                         }
                     }
                 }
-
+                
                 typelib_TypeDescription * pReg = (typelib_TypeDescription *)pComp;
                 pReg->pWeakRef = (typelib_TypeDescriptionReference *)pReg;
                 // sizeof( void ) not allowed
                 pReg->nSize = ::typelib_typedescription_getAlignedUnoSize( pReg, 0, pReg->nAlignment );
                 pReg->nAlignment = adjustAlignment( pReg->nAlignment );
                 pReg->bComplete = sal_False;
-
+                
                 ::typelib_typedescription_register( &pReg );
                 *ppRef = (typelib_TypeDescriptionReference *)pReg;
                 OSL_ASSERT( *ppRef == pReg->pWeakRef );
@@ -504,7 +504,7 @@ void SAL_CALL typelib_static_mi_interface_type_init(
                 typelib_InterfaceTypeDescription * pIface = 0;
                 ::typelib_typedescription_newEmpty(
                     (typelib_TypeDescription **)&pIface, typelib_TypeClass_INTERFACE, aTypeName.pData );
-
+                
                 pIface->nBaseTypes = std::max< sal_Int32 >(nBaseTypes, 1);
                 pIface->ppBaseTypes = new typelib_InterfaceTypeDescription *[
                     pIface->nBaseTypes];
@@ -528,15 +528,15 @@ void SAL_CALL typelib_static_mi_interface_type_init(
                 pIface->pBaseTypeDescription = pIface->ppBaseTypes[0];
                 typelib_typedescription_acquire(
                     &pIface->pBaseTypeDescription->aBase);
-
+                
                 typelib_TypeDescription * pReg = (typelib_TypeDescription *)pIface;
                 pReg->pWeakRef = (typelib_TypeDescriptionReference *)pReg;
                 // sizeof( void ) not allowed
                 pReg->nSize = ::typelib_typedescription_getAlignedUnoSize( pReg, 0, pReg->nAlignment );
-
+                
                 pReg->nAlignment = adjustAlignment( pReg->nAlignment );
                 pReg->bComplete = sal_False;
-
+                
                 ::typelib_typedescription_register( &pReg );
                 *ppRef = (typelib_TypeDescriptionReference *)pReg;
                 OSL_ASSERT( *ppRef == pReg->pWeakRef );
@@ -568,15 +568,15 @@ void SAL_CALL typelib_static_enum_type_init(
                 ::typelib_typedescription_newEmpty(
                     &pReg, typelib_TypeClass_ENUM, aTypeName.pData );
                 typelib_EnumTypeDescription * pEnum = (typelib_EnumTypeDescription *)pReg;
-
+                
                 pEnum->nDefaultEnumValue = nDefaultValue;
-
+                
                 pReg->pWeakRef = (typelib_TypeDescriptionReference *)pReg;
                 // sizeof( void ) not allowed
                 pReg->nSize = ::typelib_typedescription_getAlignedUnoSize( pReg, 0, pReg->nAlignment );
                 pReg->nAlignment = ::adjustAlignment( pReg->nAlignment );
                 pReg->bComplete = sal_False;
-
+                
                 ::typelib_typedescription_register( &pReg );
                 *ppRef = (typelib_TypeDescriptionReference *)pReg;
                 OSL_ASSERT( *ppRef == pReg->pWeakRef );
@@ -591,7 +591,7 @@ void SAL_CALL typelib_static_enum_type_init(
 void SAL_CALL typelib_static_array_type_init(
     typelib_TypeDescriptionReference ** ppRef,
     typelib_TypeDescriptionReference * pElementTypeRef,
-    sal_Int32 nDimensions, ... )
+    sal_Int32 nDimensions, ... ) 
     SAL_THROW_EXTERN_C()
 {
     if (! *ppRef)
@@ -601,7 +601,7 @@ void SAL_CALL typelib_static_array_type_init(
         {
             OUStringBuffer aBuf( 32 );
             aBuf.append( pElementTypeRef->pTypeName );
-
+            
             va_list dimArgs;
             va_start( dimArgs, nDimensions );
             sal_Int32 dim = 0;
@@ -618,7 +618,7 @@ void SAL_CALL typelib_static_array_type_init(
             }
             va_end( dimArgs );
             OUString aTypeName( aBuf.makeStringAndClear() );
-
+            
             OSL_ASSERT( ! TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK(typelib_TypeClass_ARRAY) );
             *ppRef = igetTypeByName( aTypeName.pData );
             if (!*ppRef)
@@ -627,20 +627,20 @@ void SAL_CALL typelib_static_array_type_init(
                 ::typelib_typedescription_newEmpty(
                     &pReg, typelib_TypeClass_ARRAY, aTypeName.pData );
                 typelib_ArrayTypeDescription * pArray = (typelib_ArrayTypeDescription *)pReg;
-
+                
                 pArray->nDimensions = nDimensions;
                 pArray->nTotalElements = nElements;
                 pArray->pDimensions = pDimensions;
 
                 typelib_typedescriptionreference_acquire(pElementTypeRef);
                 ((typelib_IndirectTypeDescription*)pArray)->pType = pElementTypeRef;
-
+                
                 pReg->pWeakRef = (typelib_TypeDescriptionReference *)pReg;
                 // sizeof( void ) not allowed
                 pReg->nSize = ::typelib_typedescription_getAlignedUnoSize( pReg, 0, pReg->nAlignment );
                 pReg->nAlignment = ::adjustAlignment( pReg->nAlignment );
                 pReg->bComplete = sal_True;
-
+                
                 ::typelib_typedescription_register( &pReg );
                 *ppRef = (typelib_TypeDescriptionReference *)pReg;
                 OSL_ASSERT( *ppRef == pReg->pWeakRef );
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index c248af3228e5..738f35d3c5f2 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_cppu.hxx"
-
+ 
 #include <hash_map>
 #include <list>
 #include <set>
@@ -208,15 +208,15 @@ static sal_Int32 nCacheSize = 256;
  */
 struct TypeDescriptor_Init_Impl
 {
-    //sal_Bool          bDesctructorCalled;
+    //sal_Bool			bDesctructorCalled;
     // all type description references
-    WeakMap_Impl *              pWeakMap;
+    WeakMap_Impl *				pWeakMap;
     // all type description callbacks
-    CallbackSet_Impl *          pCallbacks;
+    CallbackSet_Impl *			pCallbacks;
     // A cache to hold descriptions
-    TypeDescriptionList_Impl *  pCache;
+    TypeDescriptionList_Impl *	pCache;
     // The mutex to guard all type library accesses
-    Mutex *                     pMutex;
+    Mutex *						pMutex;
 
     inline Mutex & getMutex() SAL_THROW( () );
 
@@ -224,16 +224,16 @@ struct TypeDescriptor_Init_Impl
 
 #if OSL_DEBUG_LEVEL > 1
     // only for debugging
-    sal_Int32           nTypeDescriptionCount;
-    sal_Int32           nCompoundTypeDescriptionCount;
-    sal_Int32           nUnionTypeDescriptionCount;
-    sal_Int32           nIndirectTypeDescriptionCount;
-    sal_Int32           nArrayTypeDescriptionCount;
-    sal_Int32           nEnumTypeDescriptionCount;
-    sal_Int32           nInterfaceMethodTypeDescriptionCount;
-    sal_Int32           nInterfaceAttributeTypeDescriptionCount;
-    sal_Int32           nInterfaceTypeDescriptionCount;
-    sal_Int32           nTypeDescriptionReferenceCount;
+    sal_Int32			nTypeDescriptionCount;
+    sal_Int32			nCompoundTypeDescriptionCount;
+    sal_Int32			nUnionTypeDescriptionCount;
+    sal_Int32			nIndirectTypeDescriptionCount;
+    sal_Int32			nArrayTypeDescriptionCount;
+    sal_Int32			nEnumTypeDescriptionCount;
+    sal_Int32			nInterfaceMethodTypeDescriptionCount;
+    sal_Int32			nInterfaceAttributeTypeDescriptionCount;
+    sal_Int32			nInterfaceTypeDescriptionCount;
+    sal_Int32			nTypeDescriptionReferenceCount;
 #endif
     ~TypeDescriptor_Init_Impl() SAL_THROW( () );
 };
@@ -340,15 +340,15 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () )
         pWeakMap = 0;
     }
 #if OSL_DEBUG_LEVEL > 1
-    OSL_ASSERT( nTypeDescriptionCount == 0 );
-    OSL_ASSERT( nCompoundTypeDescriptionCount == 0 );
-    OSL_ASSERT( nUnionTypeDescriptionCount == 0 );
-    OSL_ASSERT( nIndirectTypeDescriptionCount == 0 );
-    OSL_ASSERT( nArrayTypeDescriptionCount == 0 );
-    OSL_ASSERT( nEnumTypeDescriptionCount == 0 );
-    OSL_ASSERT( nInterfaceMethodTypeDescriptionCount == 0 );
-    OSL_ASSERT( nInterfaceAttributeTypeDescriptionCount == 0 );
-    OSL_ASSERT( nInterfaceTypeDescriptionCount == 0 );
+    OSL_ASSERT(	nTypeDescriptionCount == 0 );
+    OSL_ASSERT(	nCompoundTypeDescriptionCount == 0 );
+    OSL_ASSERT(	nUnionTypeDescriptionCount == 0 );
+    OSL_ASSERT(	nIndirectTypeDescriptionCount == 0 );
+    OSL_ASSERT(	nArrayTypeDescriptionCount == 0 );
+    OSL_ASSERT(	nEnumTypeDescriptionCount == 0 );
+    OSL_ASSERT(	nInterfaceMethodTypeDescriptionCount == 0 );
+    OSL_ASSERT(	nInterfaceAttributeTypeDescriptionCount == 0 );
+    OSL_ASSERT(	nInterfaceTypeDescriptionCount == 0 );
     OSL_ASSERT( nTypeDescriptionReferenceCount == 0 );
 
     OSL_ASSERT( !pCallbacks || pCallbacks->empty() );
@@ -376,7 +376,7 @@ extern "C" void SAL_CALL typelib_typedescription_registerCallback(
 {
     // todo mt safe: guard is no solution, can not acquire while calling callback!
     TypeDescriptor_Init_Impl &rInit = Init::get();
-//      OslGuard aGuard( rInit.getMutex() );
+//  	OslGuard aGuard( rInit.getMutex() );
     if( !rInit.pCallbacks )
         rInit.pCallbacks = new CallbackSet_Impl;
     rInit.pCallbacks->push_back( CallbackEntry( pContext, pCallback ) );
@@ -391,7 +391,7 @@ extern "C" void SAL_CALL typelib_typedescription_revokeCallback(
     if( rInit.pCallbacks )
     {
         // todo mt safe: guard is no solution, can not acquire while calling callback!
-//          OslGuard aGuard( rInit.getMutex() );
+//  		OslGuard aGuard( rInit.getMutex() );
         CallbackEntry aEntry( pContext, pCallback );
         CallbackSet_Impl::iterator iPos( rInit.pCallbacks->begin() );
         while (!(iPos == rInit.pCallbacks->end()))
@@ -700,9 +700,9 @@ extern "C" void SAL_CALL typelib_typedescription_newEmpty(
                 &Init::get().nEnumTypeDescriptionCount );
 #endif
             pTmp->nDefaultEnumValue = 0;
-            pTmp->nEnumValues       = 0;
-            pTmp->ppEnumNames       = 0;
-            pTmp->pEnumValues       = 0;
+            pTmp->nEnumValues		= 0;
+            pTmp->ppEnumNames		= 0;
+            pTmp->pEnumValues		= 0;
         }
         break;
 
@@ -1010,13 +1010,13 @@ extern "C" void SAL_CALL typelib_typedescription_newEnum(
     typelib_EnumTypeDescription * pEnum = (typelib_EnumTypeDescription *)*ppRet;
 
     pEnum->nDefaultEnumValue = nDefaultValue;
-    pEnum->nEnumValues       = nEnumValues;
-    pEnum->ppEnumNames       = new rtl_uString * [ nEnumValues ];
+    pEnum->nEnumValues		 = nEnumValues;
+    pEnum->ppEnumNames		 = new rtl_uString * [ nEnumValues ];
     for ( sal_Int32 nPos = nEnumValues; nPos--; )
     {
         rtl_uString_acquire( pEnum->ppEnumNames[nPos] = ppEnumNames[nPos] );
     }
-    pEnum->pEnumValues      = new sal_Int32[ nEnumValues ];
+    pEnum->pEnumValues		= new sal_Int32[ nEnumValues ];
     ::memcpy( pEnum->pEnumValues, pEnumValues, nEnumValues * sizeof(sal_Int32) );
 
     (*ppRet)->pWeakRef = (typelib_TypeDescriptionReference *)*ppRet;
@@ -2572,17 +2572,17 @@ extern "C" void SAL_CALL typelib_setCacheSize( sal_Int32 nNewSize )
 static sal_Bool s_aAssignableFromTab[11][11] =
 {
                          /* from CH,BO,BY,SH,US,LO,UL,HY,UH,FL,DO */
-/* TypeClass_CHAR */            { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-/* TypeClass_BOOLEAN */         { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-/* TypeClass_BYTE */            { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
-/* TypeClass_SHORT */           { 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0 },
-/* TypeClass_UNSIGNED_SHORT */  { 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0 },
-/* TypeClass_LONG */            { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0 },
-/* TypeClass_UNSIGNED_LONG */   { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0 },
-/* TypeClass_HYPER */           { 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0 },
-/* TypeClass_UNSIGNED_HYPER */  { 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0 },
-/* TypeClass_FLOAT */           { 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0 },
-/* TypeClass_DOUBLE */          { 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1 }
+/* TypeClass_CHAR */			{ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+/* TypeClass_BOOLEAN */			{ 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+/* TypeClass_BYTE */			{ 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+/* TypeClass_SHORT */			{ 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0 },
+/* TypeClass_UNSIGNED_SHORT */	{ 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0 },
+/* TypeClass_LONG */			{ 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0 },
+/* TypeClass_UNSIGNED_LONG */	{ 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0 },
+/* TypeClass_HYPER */			{ 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0 },
+/* TypeClass_UNSIGNED_HYPER */	{ 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0 },
+/* TypeClass_FLOAT */			{ 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0 },
+/* TypeClass_DOUBLE */			{ 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1 }
 };
 
 //##################################################################################################
@@ -2594,7 +2594,7 @@ extern "C" sal_Bool SAL_CALL typelib_typedescriptionreference_isAssignableFrom(
     if (pAssignable && pFrom)
     {
         typelib_TypeClass eAssignable = pAssignable->eTypeClass;
-        typelib_TypeClass eFrom       = pFrom->eTypeClass;
+        typelib_TypeClass eFrom		  = pFrom->eTypeClass;
 
         if (eAssignable == typelib_TypeClass_ANY) // anything can be assigned to an any .)
             return sal_True;
diff --git a/cppu/source/uno/EnvDcp.c b/cppu/source/uno/EnvDcp.c
index a9d6dc3d59c7..f73dc46d630d 100644
--- a/cppu/source/uno/EnvDcp.c
+++ b/cppu/source/uno/EnvDcp.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,20 +29,20 @@
 #include "uno/EnvDcp.h"
 
 
-void uno_EnvDcp_getTypeName(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvTypeName)
+void uno_EnvDcp_getTypeName(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvTypeName) 
 {
     sal_Int32 colIdx = rtl_ustr_indexOfChar_WithLength(pEnvDcp->buffer, pEnvDcp->length, ':');
-    if (colIdx >= 0)
+    if (colIdx >= 0) 
         rtl_uString_newFromStr_WithLength(ppEnvTypeName, pEnvDcp->buffer, colIdx);
 
     else
         rtl_uString_newFromStr(ppEnvTypeName, pEnvDcp->buffer);
 }
 
-void uno_EnvDcp_getPurpose(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvPurpose)
+void uno_EnvDcp_getPurpose(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvPurpose) 
 {
     sal_Int32 colIdx = rtl_ustr_indexOfChar_WithLength(pEnvDcp->buffer, pEnvDcp->length, ':');
-    if (colIdx >= 0)
+    if (colIdx >= 0) 
         rtl_uString_newFromStr_WithLength(ppEnvPurpose, pEnvDcp->buffer + colIdx, pEnvDcp->length - colIdx);
 
     else
diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx
index 330353a1e5c7..99322eb0dcf2 100644
--- a/cppu/source/uno/EnvStack.cxx
+++ b/cppu/source/uno/EnvStack.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -84,7 +84,7 @@ static void s_setCurrent(uno_Environment * pEnv)
 
     osl::MutexGuard guard(s_threadMap_mutex::get());
     ThreadMap &rThreadMap = s_threadMap::get();
-    if (pEnv)
+    if (pEnv) 
         rThreadMap[threadId] = pEnv;
 
     else
@@ -129,7 +129,7 @@ extern "C" void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl
     {
         rtl::OUString envDcp(pTypeName);
         envDcp += currPurpose;
-
+        
         uno_getEnvironment(ppEnv, envDcp.pData, NULL);
     }
     else
@@ -150,10 +150,10 @@ static rtl::OUString s_getPrefix(rtl::OUString const & str1, rtl::OUString const
     sal_Int32 nIndex1 = 0;
     sal_Int32 nIndex2 = 0;
     sal_Int32 sim = 0;
-
+    
     rtl::OUString token1;
     rtl::OUString token2;
-
+    
     do
     {
         token1 = str1.getToken(0, ':', nIndex1);
@@ -222,7 +222,7 @@ static int s_getNextEnv(uno_Environment ** ppEnv, uno_Environment * pCurrEnv, un
     }
 
     return res;
-}
+} 
 
 extern "C" { static void s_pull(va_list * pParam)
 {
@@ -237,7 +237,7 @@ static void s_callInto_v(uno_Environment * pEnv, uno_EnvCallee * pCallee, va_lis
     cppu::Enterable * pEnterable = reinterpret_cast<cppu::Enterable *>(pEnv->pReserved);
     if (pEnterable)
         pEnterable->callInto(s_pull, pCallee, pParam);
-
+                
     else
         pCallee(pParam);
 }
@@ -335,7 +335,7 @@ extern "C" void SAL_CALL uno_Environment_enter(uno_Environment * pTargetEnv)
     uno_Environment * pCurrEnv = s_getCurrent();
 
     int res;
-    while ( (res = s_getNextEnv(&pNextEnv, pCurrEnv, pTargetEnv)) != 0)
+    while ( (res = s_getNextEnv(&pNextEnv, pCurrEnv, pTargetEnv)) != 0) 
     {
         cppu::Enterable * pEnterable;
 
@@ -347,7 +347,7 @@ extern "C" void SAL_CALL uno_Environment_enter(uno_Environment * pTargetEnv)
                 pEnterable->leave();
             pCurrEnv->release(pCurrEnv);
             break;
-
+            
         case 1:
             pNextEnv->acquire(pNextEnv);
             pEnterable = reinterpret_cast<cppu::Enterable *>(pNextEnv->pReserved);
diff --git a/cppu/source/uno/IdentityMapping.cxx b/cppu/source/uno/IdentityMapping.cxx
index 868a4d7c5e3c..3b82e2ba3a29 100644
--- a/cppu/source/uno/IdentityMapping.cxx
+++ b/cppu/source/uno/IdentityMapping.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@ using namespace ::com::sun::star;
 
 struct IdentityMapping : public uno_Mapping
 {
-    sal_Int32        m_nRef;
+    sal_Int32	     m_nRef;
     uno::Environment m_env;
 
     IdentityMapping(uno::Environment const & rEnv);
@@ -59,7 +59,7 @@ static void SAL_CALL s_acquire(uno_Mapping * pMapping) SAL_THROW(())
     if (1 == ::osl_incrementInterlockedCount(&static_cast<IdentityMapping *>(pMapping)->m_nRef))
     {
         uno_registerMapping(
-            &pMapping,
+            &pMapping, 
             s_free,
             static_cast<IdentityMapping *>(pMapping)->m_env.get(),
             static_cast<IdentityMapping *>(pMapping)->m_env.get(),
@@ -74,30 +74,30 @@ static void SAL_CALL s_release(uno_Mapping * pMapping) SAL_THROW(())
 }
 
 static void SAL_CALL s_mapInterface(uno_Mapping                       * pMapping,
-                                    void                             ** ppOut,
+                                    void                             ** ppOut, 
                                     void                              * pInterface,
                                     struct _typelib_InterfaceTypeDescription * /*pInterfaceTypeDescr*/)
     SAL_THROW(())
 {
     *ppOut = pInterface;
 
-    if (pInterface)
+    if (pInterface) 
     {
         IdentityMapping * that = static_cast<IdentityMapping *>(pMapping);
-
+        
         (that->m_env.get()->pExtEnv->acquireInterface)(that->m_env.get()->pExtEnv, pInterface);
     }
 }
 }
 
 
-IdentityMapping::IdentityMapping(uno::Environment const & rEnv)
+IdentityMapping::IdentityMapping(uno::Environment const & rEnv) 
     : m_nRef(0),
       m_env(rEnv)
 {
-    uno_Mapping::acquire        = s_acquire;
-    uno_Mapping::release        = s_release;
-    uno_Mapping::mapInterface   = s_mapInterface;
+    uno_Mapping::acquire		= s_acquire;
+    uno_Mapping::release		= s_release;
+    uno_Mapping::mapInterface	= s_mapInterface;
 }
 
 
diff --git a/cppu/source/uno/IdentityMapping.hxx b/cppu/source/uno/IdentityMapping.hxx
index cd9760640656..ccd1e4834a30 100644
--- a/cppu/source/uno/IdentityMapping.hxx
+++ b/cppu/source/uno/IdentityMapping.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/source/uno/any.cxx b/cppu/source/uno/any.cxx
index f83373ce4d5c..4dfd08e80f81 100644
--- a/cppu/source/uno/any.cxx
+++ b/cppu/source/uno/any.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/source/uno/assign.hxx b/cppu/source/uno/assign.hxx
index 42375832ab09..c7aa7cb9cd12 100644
--- a/cppu/source/uno/assign.hxx
+++ b/cppu/source/uno/assign.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -148,7 +148,7 @@ inline sal_Bool _assignArray(
         {
             ::rtl_uString_assign( (rtl_uString **)pDest + i,
                                   ((rtl_uString **)pSource)[i] );
-        }
+        }		
         bRet = sal_True;
         break;
     case typelib_TypeClass_TYPE:
@@ -165,7 +165,7 @@ inline sal_Bool _assignArray(
         for (i=0; i < nTotalElements; i++)
         {
             _destructAny( (uno_Any *)pDest + i, release );
-            _copyConstructAny( (uno_Any *)pDest + i, (uno_Any *)pSource + i,
+            _copyConstructAny( (uno_Any *)pDest + i, (uno_Any *)pSource + i, 
                                pElementTypeRef, pElementTypeDescr, acquire, 0 );
         }
         bRet = sal_True;
@@ -183,7 +183,7 @@ inline sal_Bool _assignArray(
         {
             bRet = _assignStruct( (sal_Char *)pDest + i * nElementSize,
                                   (sal_Char *)pSource + i * nElementSize,
-                                  (typelib_CompoundTypeDescription *)pElementTypeDescr,
+                                  (typelib_CompoundTypeDescription *)pElementTypeDescr, 
                                   queryInterface, acquire, release );
             if (! bRet)
                 break;
@@ -194,8 +194,8 @@ inline sal_Bool _assignArray(
         for (i=0; i < nTotalElements; i++)
         {
             _destructUnion( (sal_Char*)pDest + i * nElementSize, pElementTypeDescr, release );
-            _copyConstructUnion( (sal_Char*)pDest + i * nElementSize,
-                                 (sal_Char*)pSource + i * nElementSize,
+            _copyConstructUnion( (sal_Char*)pDest + i * nElementSize, 
+                                 (sal_Char*)pSource + i * nElementSize, 
                                  pElementTypeDescr, acquire, 0 );
         }
         bRet = sal_True;
@@ -216,8 +216,8 @@ inline sal_Bool _assignArray(
         for (i=0; i < nTotalElements; i++)
         {
             _assignInterface(
-                (void **)((sal_Char*)pDest + i * nElementSize),
-                *(void **)((sal_Char*)pSource + i * nElementSize),
+                (void **)((sal_Char*)pDest + i * nElementSize), 
+                *(void **)((sal_Char*)pSource + i * nElementSize), 
                 acquire, release );
         }
         bRet = sal_True;
@@ -241,7 +241,7 @@ inline sal_Bool _assignData(
 {
     if (pDest == pSource)
         return _type_equals( pDestType, pSourceType );
-
+    
     if (! pSource)
     {
         _destructData( pDest, pDestType, pDestTypeDescr, release );
@@ -256,7 +256,7 @@ inline sal_Bool _assignData(
         if (pDest == pSource)
             return sal_True;
     }
-
+    
     switch (pDestType->eTypeClass)
     {
     case typelib_TypeClass_VOID:
@@ -614,7 +614,7 @@ inline sal_Bool _assignData(
                     return true;
                 }
             }
-
+            
             // query for interface:
             void * pQueried = _queryInterface( *static_cast<void **>(pSource),
                                                pDestType, queryInterface );
diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx
index 9e32c6db8bc5..560d5330e7ed 100644
--- a/cppu/source/uno/cascade_mapping.cxx
+++ b/cppu/source/uno/cascade_mapping.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ using namespace com::sun::star;
 class MediatorMapping : public uno_Mapping
 {
     oslInterlockedCount m_refCount;
-
+    
     uno::Mapping        m_from2uno;
     uno::Mapping        m_uno2to;
 
@@ -58,14 +58,14 @@ class MediatorMapping : public uno_Mapping
     uno::Environment    m_interm;
     uno::Environment    m_to;
 
-public:
+public:	
     void acquire(void);
     void release(void);
 
-    void mapInterface(void                            ** ppOut,
+    void mapInterface(void                            ** ppOut, 
                       void                             * pInterface,
                       typelib_InterfaceTypeDescription * pInterfaceTypeDescr);
-    MediatorMapping(uno_Environment * pFrom,
+    MediatorMapping(uno_Environment * pFrom, 
                     uno_Environment * pInterm,
                     uno_Environment * pTo);
     ~MediatorMapping();
@@ -77,16 +77,16 @@ static void SAL_CALL s_acquire(uno_Mapping * mapping)
     MediatorMapping * pMediatorMapping = static_cast<MediatorMapping *>(mapping);
     pMediatorMapping->acquire();
 }
-
+    
 static void SAL_CALL s_release(uno_Mapping * mapping)
 {
     MediatorMapping * pMediatorMapping = static_cast<MediatorMapping *>(mapping);
     pMediatorMapping->release();
 }
-
+    
 static void SAL_CALL s_mapInterface(
     uno_Mapping                      * mapping,
-    void                            ** ppOut,
+    void                            ** ppOut, 
     void                             * pInterface,
     typelib_InterfaceTypeDescription * pInterfaceTypeDescr)
 {
@@ -95,7 +95,7 @@ static void SAL_CALL s_mapInterface(
 }
 }
 
-MediatorMapping::MediatorMapping(uno_Environment * pFrom,
+MediatorMapping::MediatorMapping(uno_Environment * pFrom, 
                                  uno_Environment * pInterm,
                                  uno_Environment * pTo)
     : m_refCount(0),
@@ -115,7 +115,7 @@ MediatorMapping::MediatorMapping(uno_Environment * pFrom,
     uno_Mapping::mapInterface = s_mapInterface;
 }
 
-MediatorMapping::~MediatorMapping()
+MediatorMapping::~MediatorMapping() 
 {
     LOG_LIFECYLE_MediatorMapping_emit(std::cerr << __FUNCTION__ << std::endl);
 }
@@ -148,7 +148,7 @@ extern "C" { static void s_mapInterface_v(va_list * pParam)
 }}
 
 void MediatorMapping::mapInterface(
-    void                            ** ppOut,
+    void                            ** ppOut, 
     void                             * pInterface,
     typelib_InterfaceTypeDescription * pInterfaceTypeDescr)
 {
@@ -164,12 +164,12 @@ void MediatorMapping::mapInterface(
     uno_Interface * pUnoI = 0;
 
     m_from.invoke(s_mapInterface_v, &pUnoI, pInterface, pInterfaceTypeDescr, m_from2uno.get());
-
+        
     m_uno2to.mapInterface(&ret, pUnoI, pInterfaceTypeDescr);
-
+        
     if (pUnoI)
         m_interm.get()->pExtEnv->releaseInterface(m_interm.get()->pExtEnv, pUnoI);
-
+    
     *ppOut = ret;
 }
 
@@ -186,10 +186,10 @@ static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const &
     sal_Int32 nIndex1 = 0;
     sal_Int32 nIndex2 = 0;
     sal_Int32 sim = 0;
-
+    
     rtl::OUString token1;
     rtl::OUString token2;
-
+    
     do
     {
         token1 = str1.getToken(0, ':', nIndex1);
@@ -208,21 +208,21 @@ static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const &
     return result;
 }
 
-//  rtl::OUString str1(RTL_CONSTASCII_USTRINGPARAM("abc:def:ghi"));
-//  rtl::OUString str2(RTL_CONSTASCII_USTRINGPARAM("abc:def"));
-//  rtl::OUString str3(RTL_CONSTASCII_USTRINGPARAM("abc"));
-//  rtl::OUString str4(RTL_CONSTASCII_USTRINGPARAM(""));
+// 	rtl::OUString str1(RTL_CONSTASCII_USTRINGPARAM("abc:def:ghi"));
+// 	rtl::OUString str2(RTL_CONSTASCII_USTRINGPARAM("abc:def"));
+// 	rtl::OUString str3(RTL_CONSTASCII_USTRINGPARAM("abc"));
+// 	rtl::OUString str4(RTL_CONSTASCII_USTRINGPARAM(""));
 
-//  rtl::OUString pref;
+// 	rtl::OUString pref;
 
-//  pref = getPrefix(str1, str1);
-//  pref = getPrefix(str1, str2);
-//  pref = getPrefix(str1, str3);
-//  pref = getPrefix(str1, str4);
+// 	pref = getPrefix(str1, str1);
+// 	pref = getPrefix(str1, str2);
+// 	pref = getPrefix(str1, str3);
+// 	pref = getPrefix(str1, str4);
 
-//  pref = getPrefix(str2, str1);
-//  pref = getPrefix(str3, str1);
-//  pref = getPrefix(str4, str1);
+// 	pref = getPrefix(str2, str1);
+// 	pref = getPrefix(str3, str1);
+// 	pref = getPrefix(str4, str1);
 
 
 void getCascadeMapping(uno_Mapping     ** ppMapping,
@@ -266,7 +266,7 @@ void getCascadeMapping(uno_Mapping     ** ppMapping,
 
         // direct mapping possible?
         // uno:bla-->uno:bla:blubb
-        if (from_envPurpose.equals(purpose))
+        if (from_envPurpose.equals(purpose)) 
         {
             rtl::OUString rest = to_envPurpose.copy(purpose.getLength());
 
@@ -292,7 +292,7 @@ void getCascadeMapping(uno_Mapping     ** ppMapping,
 
             uno_envDcp += rest.copy(0, index);
         }
-
+        
         uno_getEnvironment(&pInterm, uno_envDcp.pData, NULL);
     }
     else if (from_envType != uno_envType && to_envType == uno_envType) // <ANY> -> UNO ?
@@ -311,7 +311,7 @@ void getCascadeMapping(uno_Mapping     ** ppMapping,
          envDcp += to_envPurpose;
         uno_getEnvironment(&pInterm, envDcp.pData, NULL);
     }
-    else // everything else
+    else // everything else 
         // mediate via uno:purpose
     {
         rtl::OUString purpose = getPrefix(from_envPurpose, to_envPurpose);
@@ -329,7 +329,7 @@ void getCascadeMapping(uno_Mapping     ** ppMapping,
     pMapping->acquire(pMapping);
 
     ::uno_registerMapping(&pMapping, s_MediatorMapping_free, pFrom, pTo, pAddPurpose);
-
+        
     if (*ppMapping)
         (*ppMapping)->release(*ppMapping);
 
diff --git a/cppu/source/uno/cascade_mapping.hxx b/cppu/source/uno/cascade_mapping.hxx
index 9920fa05058d..db826705e2d7 100644
--- a/cppu/source/uno/cascade_mapping.hxx
+++ b/cppu/source/uno/cascade_mapping.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/source/uno/constr.hxx b/cppu/source/uno/constr.hxx
index b8eb9b5cc5ce..5a9f27d17a44 100644
--- a/cppu/source/uno/constr.hxx
+++ b/cppu/source/uno/constr.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,11 +64,11 @@ inline void _defaultConstructStruct(
     {
         defaultConstructStruct( pMem, pTypeDescr->pBaseTypeDescription );
     }
-
+    
     typelib_TypeDescriptionReference ** ppTypeRefs = (pTypeDescr)->ppTypeRefs;
     sal_Int32 * pMemberOffsets = pTypeDescr->pMemberOffsets;
     sal_Int32 nDescr = pTypeDescr->nMembers;
-
+    
     while (nDescr--)
     {
         ::uno_type_constructData( (char *)pMem + pMemberOffsets[nDescr], ppTypeRefs[nDescr] );
@@ -107,8 +107,8 @@ inline void _defaultConstructArray(
         {
             rtl_uString** ppElement = (rtl_uString **)pMem + i;
             *ppElement = 0;
-            rtl_uString_new( ppElement);
-        }
+            rtl_uString_new( ppElement);			
+        }		
         break;
     case typelib_TypeClass_TYPE:
         for (i=0; i < nTotalElements; i++)
@@ -145,7 +145,7 @@ inline void _defaultConstructArray(
     case typelib_TypeClass_SEQUENCE:
         for (i=0; i < nTotalElements; i++)
         {
-            uno_Sequence** ppElement = (uno_Sequence **)pMem + i;
+            uno_Sequence** ppElement = (uno_Sequence **)pMem + i; 
             *ppElement = createEmptySequence();
         }
         break;
@@ -162,7 +162,7 @@ inline void _defaultConstructData(
     typelib_TypeDescriptionReference * pType,
     typelib_TypeDescription * pTypeDescr )
     SAL_THROW( () )
-{
+{	
     switch (pType->eTypeClass)
     {
     case typelib_TypeClass_CHAR:
diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx
index 7750a686b694..5b7791115aad 100644
--- a/cppu/source/uno/copy.hxx
+++ b/cppu/source/uno/copy.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -77,12 +77,12 @@ inline void _copyConstructStruct(
         // copy base value
         copyConstructStruct( pDest, pSource, pTypeDescr->pBaseTypeDescription, acquire, mapping );
     }
-
+    
     // then copy members
     typelib_TypeDescriptionReference ** ppTypeRefs = pTypeDescr->ppTypeRefs;
     sal_Int32 * pMemberOffsets = pTypeDescr->pMemberOffsets;
     sal_Int32 nDescr = pTypeDescr->nMembers;
-
+    
     if (mapping)
     {
         while (nDescr--)
@@ -179,7 +179,7 @@ inline void _copyConstructAnyFromData(
 {
     TYPE_ACQUIRE( pType );
     pDestAny->pType = pType;
-
+    
     switch (pType->eTypeClass)
     {
     case typelib_TypeClass_CHAR:
@@ -648,7 +648,7 @@ inline uno_Sequence * icopyConstructSequence(
                             pElements + (nPos * nElementSize);
                         char * pSource2 =
                             pSourceElements + (nPos * nElementSize);
-
+                        
                         typelib_TypeDescriptionReference * pSetType =
                             _unionGetSetType( pSource2, pElementTypeDescr );
                         ::uno_type_copyAndConvertData(
@@ -671,7 +671,7 @@ inline uno_Sequence * icopyConstructSequence(
                     typelib_TypeDescriptionReference * pSeqElementType =
                         ((typelib_IndirectTypeDescription *)
                          pElementTypeDescr)->pType;
-
+                    
                     uno_Sequence ** pDestElements =
                         (uno_Sequence **) pDest->elements;
                     uno_Sequence ** pSourceElements =
@@ -687,7 +687,7 @@ inline uno_Sequence * icopyConstructSequence(
                         // because of reference counted sequence handles
                         pDestElements[ nPos ] = pNew;
                     }
-
+                    
                     TYPELIB_DANGER_RELEASE( pElementTypeDescr );
                 }
                 break;
@@ -738,7 +738,7 @@ inline uno_Sequence * icopyConstructSequence(
         {
             pDest = allocSeq( 0, 0 );
         }
-
+        
         return pDest;
     }
 }
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index 6d2982981d35..5a8de8a6cc50 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -361,7 +361,7 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
 
 #if defined(INTEL) \
     && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(OS2) || \
-    defined(OPENBSD)) || defined(MACOSX) \
+	defined(OPENBSD)) || defined(MACOSX) \
         || defined(__SUNPRO_CC) && defined(SOLARIS))
 #define MAX_ALIGNMENT_4
 #endif
@@ -375,7 +375,7 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
 
 #if OSL_DEBUG_LEVEL > 1
 #if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(OPENBSD)) && \
-    (defined(INTEL) || defined(POWERPC) || defined(X86_64) || defined(S390))
+	(defined(INTEL) || defined(POWERPC) || defined(X86_64) || defined(S390))
 #define BINTEST_VERIFYSIZE( s, n ) \
     fprintf( stderr, "> sizeof(" #s ") = %d; __alignof__ (" #s ") = %d\n", sizeof(s), __alignof__ (s) ); \
     if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); }
@@ -434,23 +434,23 @@ struct E
 
 struct M
 {
-    sal_Int32   n;
-    sal_Int16   o;
+    sal_Int32	n;
+    sal_Int16	o;
 };
 
 struct N : public M
 {
-    sal_Int16   p CPPU_GCC3_ALIGN( M );
+    sal_Int16	p CPPU_GCC3_ALIGN( M );
 };
 struct N2
 {
     M m;
-    sal_Int16   p;
+    sal_Int16	p;
 };
 
 struct O : public M
 {
-    double  p;
+    double	p;
     sal_Int16 q;
 };
 struct O2 : public O
@@ -460,7 +460,7 @@ struct O2 : public O
 
 struct P : public N
 {
-    double  p2;
+    double	p2;
 };
 
 struct empty
@@ -473,8 +473,8 @@ struct second : public empty
 
 struct AlignSize_Impl
 {
-    sal_Int16   nInt16;
-    double      dDouble;
+    sal_Int16	nInt16;
+    double		dDouble;
 };
 
 struct Char1
@@ -608,9 +608,9 @@ BinaryCompatible_Impl::BinaryCompatible_Impl()
 }
 
 #ifdef SAL_W32
-#   pragma pack(pop)
+#	pragma pack(pop)
 #elif defined(SAL_OS2)
-#   pragma pack()
+#	pragma pack()
 #endif
 
 static BinaryCompatible_Impl aTest;
diff --git a/cppu/source/uno/destr.hxx b/cppu/source/uno/destr.hxx
index 0dc28386afed..464dc932564d 100644
--- a/cppu/source/uno/destr.hxx
+++ b/cppu/source/uno/destr.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/source/uno/env_subst.cxx b/cppu/source/uno/env_subst.cxx
index 6d75a35b662b..56cbb2004544 100644
--- a/cppu/source/uno/env_subst.cxx
+++ b/cppu/source/uno/env_subst.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,8 +31,8 @@
 #include "env_subst.hxx"
 
 
-void SAL_CALL uno_getEnvironment(uno_Environment ** ppEnv,
-                                 rtl_uString      * pEnvDcp,
+void SAL_CALL uno_getEnvironment(uno_Environment ** ppEnv, 
+                                 rtl_uString      * pEnvDcp, 
                                  void             * pContext)
     SAL_THROW_EXTERN_C()
 {
@@ -47,7 +47,7 @@ void SAL_CALL uno_getEnvironment(uno_Environment ** ppEnv,
 
         OSL_TRACE("UNO_ENV_SUBST \"%s\" -> \"%s\"", a_envDcp.getStr(), c_value);
         rtl::OUString value(c_value, rtl_str_getLength(c_value), RTL_TEXTENCODING_ASCII_US);
-
+        
          envDcp = value;
     }
 
diff --git a/cppu/source/uno/env_subst.hxx b/cppu/source/uno/env_subst.hxx
index b0118a532403..50f3991889ee 100644
--- a/cppu/source/uno/env_subst.hxx
+++ b/cppu/source/uno/env_subst.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 #include "uno/environment.h"
 
 
-extern "C" void SAL_CALL uno_direct_getEnvironment(uno_Environment ** ppEnv,
+extern "C" void SAL_CALL uno_direct_getEnvironment(uno_Environment ** ppEnv, 
                                                    rtl_uString      * pEnvDcp,
                                                    void             * pContext)
     SAL_THROW_EXTERN_C();
diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx
index 4b5a22c42da7..2f08feac5715 100644
--- a/cppu/source/uno/eq.hxx
+++ b/cppu/source/uno/eq.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ inline sal_Bool _equalObject(
     if ((0 == pI1) || (0 == pI2))
         return sal_False;
     sal_Bool bRet = sal_False;
-
+    
     typelib_TypeDescriptionReference * type_XInterface =
         * typelib_static_type_getByTypeClass( typelib_TypeClass_INTERFACE );
     if (0 == queryInterface)
@@ -90,11 +90,11 @@ inline sal_Bool _equalStruct(
     {
         return sal_False;
     }
-
+    
     typelib_TypeDescriptionReference ** ppTypeRefs = pTypeDescr->ppTypeRefs;
     sal_Int32 * pMemberOffsets = pTypeDescr->pMemberOffsets;
     sal_Int32 nDescr = pTypeDescr->nMembers;
-
+    
     while (nDescr--)
     {
         sal_Int32 nOffset = pMemberOffsets[nDescr];
@@ -129,10 +129,10 @@ inline sal_Bool _equalSequence(
         return sal_False;
     if (! nElements)
         return sal_True;
-
+    
     void * pDestElements = pDest->elements;
     void * pSourceElements = pSource->elements;
-
+    
     switch (pElementType->eTypeClass)
     {
     case typelib_TypeClass_CHAR:
@@ -320,7 +320,7 @@ inline sal_Bool _equalData(
         pSourceType = ((uno_Any *)pSource)->pType;
         pSource = ((uno_Any *)pSource)->pData;
     }
-
+    
     switch (eDestTypeClass)
     {
     case typelib_TypeClass_VOID:
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 38e5ec746112..5599910817ab 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -91,7 +91,7 @@ struct ObjectEntry
     sal_Int32 nRef;
     ::std::vector< InterfaceEntry > aInterfaces;
     bool mixedObject;
-
+    
     inline ObjectEntry( const OUString & rOId_ );
 
     inline void append(
@@ -163,11 +163,11 @@ struct uno_DefaultEnvironment : public uno_ExtEnvironment
 {
     sal_Int32 nRef;
     sal_Int32 nWeakRef;
-
+    
     ::osl::Mutex mutex;
     Ptr2ObjectMap aPtr2ObjectMap;
     OId2ObjectMap aOId2ObjectMap;
-
+    
     uno_DefaultEnvironment(
         const OUString & rEnvDcp_, void * pContext_ );
     ~uno_DefaultEnvironment();
@@ -196,7 +196,7 @@ inline void ObjectEntry::append(
     aNewEntry.fpFreeProxy = fpFreeProxy;
     typelib_typedescription_acquire( (typelib_TypeDescription *) pTypeDescr );
     aNewEntry.pTypeDescr = pTypeDescr;
-
+    
     ::std::pair< Ptr2ObjectMap::iterator, bool > insertion(
         pEnv->aPtr2ObjectMap.insert( Ptr2ObjectMap::value_type(
                                          pInterface, this ) ) );
@@ -214,7 +214,7 @@ inline InterfaceEntry * ObjectEntry::find(
     OSL_ASSERT( ! aInterfaces.empty() );
     if (aInterfaces.empty())
         return 0;
-
+    
     // shortcut common case:
     OUString const & type_name =
         OUString::unacquired(
@@ -224,7 +224,7 @@ inline InterfaceEntry * ObjectEntry::find(
     {
         return &aInterfaces[ 0 ];
     }
-
+    
     ::std::size_t nSize = aInterfaces.size();
     for ( ::std::size_t nPos = 0; nPos < nSize; ++nPos )
     {
@@ -263,11 +263,11 @@ static void SAL_CALL defenv_registerInterface(
 {
     OSL_ENSURE( pEnv && ppInterface && pOId && pTypeDescr, "### null ptr!" );
     OUString const & rOId = OUString::unacquired( &pOId );
-
+    
     uno_DefaultEnvironment * that =
         static_cast< uno_DefaultEnvironment * >( pEnv );
     ::osl::ClearableMutexGuard guard( that->mutex );
-
+    
     // try to insert dummy 0:
     std::pair<OId2ObjectMap::iterator, bool> const insertion(
         that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, 0 ) ) );
@@ -311,11 +311,11 @@ static void SAL_CALL defenv_registerProxyInterface(
     OSL_ENSURE( pEnv && ppInterface && pOId && pTypeDescr && freeProxy,
                 "### null ptr!" );
     OUString const & rOId = OUString::unacquired( &pOId );
-
+    
     uno_DefaultEnvironment * that =
         static_cast< uno_DefaultEnvironment * >( pEnv );
     ::osl::ClearableMutexGuard guard( that->mutex );
-
+    
     // try to insert dummy 0:
     std::pair<OId2ObjectMap::iterator, bool> const insertion(
         that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, 0 ) ) );
@@ -329,12 +329,12 @@ static void SAL_CALL defenv_registerProxyInterface(
     else // object entry exists
     {
         ObjectEntry * pOEntry = insertion.first->second;
-
+        
         // first registration was an original, then registerProxyInterface():
         pOEntry->mixedObject |=
             (!pOEntry->aInterfaces.empty() &&
              pOEntry->aInterfaces[ 0 ].fpFreeProxy == 0);
-
+        
         ++pOEntry->nRef; // another register call on object
         InterfaceEntry * pIEntry = pOEntry->find( pTypeDescr );
 
@@ -428,7 +428,7 @@ static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam)
                     typelib_TypeDescription * pTypeDescr =
                         reinterpret_cast< typelib_TypeDescription * >(
                             entry.pTypeDescr );
-
+                    
                     pOEntry->aInterfaces.erase(
                         pOEntry->aInterfaces.begin() + index );
                     if (pOEntry->find( pInterface, index ) < 0)
@@ -441,9 +441,9 @@ static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam)
                               that->aPtr2ObjectMap.erase( pInterface );
                         OSL_ASSERT( erased == 1 );
                     }
-
+                    
                     guard.clear();
-
+                    
                     typelib_typedescription_release( pTypeDescr );
                     (*fpFreeProxy)( pEnv, pInterface );
                 }
@@ -751,7 +751,7 @@ extern "C" void SAL_CALL uno_dumpEnvironment(
     while (iPos != that->aOId2ObjectMap.end())
     {
         ObjectEntry * pOEntry = iPos->second;
-
+        
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("+ ") );
         if (pOEntry->mixedObject)
             buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("mixed ") );
@@ -766,7 +766,7 @@ extern "C" void SAL_CALL uno_dumpEnvironment(
               nPos < pOEntry->aInterfaces.size(); ++nPos )
         {
             const InterfaceEntry & rIEntry = pOEntry->aInterfaces[nPos];
-
+            
             buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("  - ") );
             buf.append(
                 ((typelib_TypeDescription *) rIEntry.pTypeDescr)->pTypeName );
@@ -784,7 +784,7 @@ extern "C" void SAL_CALL uno_dumpEnvironment(
             buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("; ptr=0x") );
             buf.append(
                 reinterpret_cast< sal_IntPtr >(rIEntry.pInterface), 16 );
-
+            
             if (pOEntry->find( rIEntry.pInterface, nPos + 1 ) < 0)
             {
                 ::std::size_t erased = ptr2obj.erase( rIEntry.pInterface );
@@ -1054,14 +1054,14 @@ inline void EnvironmentsData::getRegisteredEnvironments(
     }
 }
 
-static bool loadEnv(OUString const  & cLibStem,
+static bool loadEnv(OUString const  & cLibStem, 
                     uno_Environment * pEnv,
                     void            * /*pContext*/)
 {
     // late init with some code from matching uno language binding
     // will be unloaded by environment
     oslModule hMod = cppu::detail::loadModule( cLibStem );
-
+    
     if (!hMod)
         return false;
 
@@ -1102,11 +1102,11 @@ static uno_Environment * initDefaultEnvironment(
         that->releaseInterface = unoenv_releaseInterface;
 
         OUString envPurpose = cppu::EnvDcp::getPurpose(rEnvDcp);
-        if (envPurpose.getLength())
+        if (envPurpose.getLength()) 
         {
             rtl::OUString libStem = envPurpose.copy(envPurpose.lastIndexOf(':') + 1);
             libStem += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_uno_uno") );
-
+            
             if(!loadEnv(libStem, pEnv, pContext))
             {
                 pEnv->release(pEnv);
@@ -1140,7 +1140,7 @@ void SAL_CALL uno_createEnvironment(
     OSL_ENSURE( ppEnv, "### null ptr!" );
     if (*ppEnv)
         (*(*ppEnv)->release)( *ppEnv );
-
+    
     OUString const & rEnvDcp = OUString::unacquired( &pEnvDcp );
     *ppEnv = initDefaultEnvironment( rEnvDcp, pContext );
 }
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 243cfba6646e..12fbb25abc9f 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -114,10 +114,10 @@ inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) SAL_THROW( () )
 //==================================================================================================
 struct MappingEntry
 {
-    sal_Int32           nRef;
-    uno_Mapping *       pMapping;
-    uno_freeMappingFunc freeMapping;
-    OUString            aMappingName;
+    sal_Int32			nRef;
+    uno_Mapping *		pMapping;
+    uno_freeMappingFunc	freeMapping;
+    OUString			aMappingName;
 
     MappingEntry(
         uno_Mapping * pMapping_, uno_freeMappingFunc freeMapping_,
@@ -153,15 +153,15 @@ typedef set< OUString > t_OUStringSet;
 //==================================================================================================
 struct MappingsData
 {
-    Mutex               aMappingsMutex;
-    t_OUString2Entry    aName2Entry;
-    t_Mapping2Entry     aMapping2Entry;
+    Mutex				aMappingsMutex;
+    t_OUString2Entry	aName2Entry;
+    t_Mapping2Entry		aMapping2Entry;
 
-    Mutex               aCallbacksMutex;
-    t_CallbackSet       aCallbacks;
+    Mutex				aCallbacksMutex;
+    t_CallbackSet		aCallbacks;
 
-    Mutex               aNegativeLibsMutex;
-    t_OUStringSet       aNegativeLibs;
+    Mutex				aNegativeLibsMutex;
+    t_OUStringSet		aNegativeLibs;
 };
 //--------------------------------------------------------------------------------------------------
 static MappingsData & getMappingsData() SAL_THROW( () )
@@ -186,15 +186,15 @@ static MappingsData & getMappingsData() SAL_THROW( () )
  */
 struct uno_Mediate_Mapping : public uno_Mapping
 {
-    sal_Int32   nRef;
+    sal_Int32	nRef;
 
     Environment aFrom;
     Environment aTo;
 
-    Mapping     aFrom2Uno;
-    Mapping     aUno2To;
+    Mapping		aFrom2Uno;
+    Mapping		aUno2To;
 
-    OUString    aAddPurpose;
+    OUString	aAddPurpose;
 
     uno_Mediate_Mapping(
         const Environment & rFrom_, const Environment & rTo_,
@@ -283,9 +283,9 @@ uno_Mediate_Mapping::uno_Mediate_Mapping(
     , aUno2To( rUno2To_ )
     , aAddPurpose( rAddPurpose_ )
 {
-    uno_Mapping::acquire        = mediate_acquire;
-    uno_Mapping::release        = mediate_release;
-    uno_Mapping::mapInterface   = mediate_mapInterface;
+    uno_Mapping::acquire		= mediate_acquire;
+    uno_Mapping::release		= mediate_release;
+    uno_Mapping::mapInterface	= mediate_mapInterface;
 }
 
 //==================================================================================================
@@ -540,9 +540,9 @@ void SAL_CALL uno_getMapping(
     }
 
     // See if an identity mapping does fit.
-    if (!aRet.is() && pFrom == pTo && !aAddPurpose.getLength())
+    if (!aRet.is() && pFrom == pTo && !aAddPurpose.getLength()) 
         aRet = createIdentityMapping(pFrom);
-
+        
     if (!aRet.is())
     {
         getCascadeMapping(ppMapping, pFrom, pTo, pAddPurpose);
diff --git a/cppu/source/uno/loadmodule.cxx b/cppu/source/uno/loadmodule.cxx
index fe2b9d0b1a59..718241555be6 100644
--- a/cppu/source/uno/loadmodule.cxx
+++ b/cppu/source/uno/loadmodule.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/source/uno/loadmodule.hxx b/cppu/source/uno/loadmodule.hxx
index fc3ec6dbbbe3..be36e829bf11 100644
--- a/cppu/source/uno/loadmodule.hxx
+++ b/cppu/source/uno/loadmodule.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/source/uno/prim.hxx b/cppu/source/uno/prim.hxx
index 81f6f3148173..da51514b593b 100644
--- a/cppu/source/uno/prim.hxx
+++ b/cppu/source/uno/prim.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx
index 947e803cb76a..775ea01db1b7 100644
--- a/cppu/source/uno/sequence.cxx
+++ b/cppu/source/uno/sequence.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -166,7 +166,7 @@ static inline bool idefaultConstructElements(
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, sizeof(double), nAlloc );
         if (pSeq != 0)
-        {
+        {		
             double * pElements = (double *) pSeq->elements;
             for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos )
             {
@@ -180,7 +180,7 @@ static inline bool idefaultConstructElements(
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, sizeof(rtl_uString *), nAlloc );
         if (pSeq != 0)
-        {
+        {		
             rtl_uString ** pElements = (rtl_uString **) pSeq->elements;
             for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos )
             {
@@ -198,7 +198,7 @@ static inline bool idefaultConstructElements(
                 pSeq, sizeof(typelib_TypeDescriptionReference *), nAlloc );
         }
         if (pSeq != 0)
-        {
+        {		
             typelib_TypeDescriptionReference ** pElements =
                 (typelib_TypeDescriptionReference **) pSeq->elements;
             for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos )
@@ -213,7 +213,7 @@ static inline bool idefaultConstructElements(
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, sizeof(uno_Any), nAlloc );
         if (pSeq != 0)
-        {
+        {		
             uno_Any * pElements = (uno_Any *) pSeq->elements;
             for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos )
             {
@@ -234,7 +234,7 @@ static inline bool idefaultConstructElements(
                 ((typelib_EnumTypeDescription *)
                  pElementTypeDescr)->nDefaultEnumValue;
             TYPELIB_DANGER_RELEASE( pElementTypeDescr );
-
+            
             sal_Int32 * pElements = (sal_Int32 *) pSeq->elements;
             for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos )
             {
@@ -245,11 +245,11 @@ static inline bool idefaultConstructElements(
     }
     case typelib_TypeClass_STRUCT:
     case typelib_TypeClass_EXCEPTION:
-    {
+    {		
         typelib_TypeDescription * pElementTypeDescr = 0;
         TYPELIB_DANGER_GET( &pElementTypeDescr, pElementType );
         sal_Int32 nElementSize = pElementTypeDescr->nSize;
-
+        
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, nElementSize, nAlloc );
         if (pSeq != 0)
@@ -262,20 +262,20 @@ static inline bool idefaultConstructElements(
                     (typelib_CompoundTypeDescription *)pElementTypeDescr );
             }
         }
-
+        
         TYPELIB_DANGER_RELEASE( pElementTypeDescr );
         break;
     }
     case typelib_TypeClass_ARRAY:
-    {
+    {		
         typelib_TypeDescription * pElementTypeDescr = 0;
         TYPELIB_DANGER_GET( &pElementTypeDescr, pElementType );
         sal_Int32 nElementSize = pElementTypeDescr->nSize;
-
+        
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, nElementSize, nAlloc );
         if (pSeq != 0)
-        {
+        {		
             char * pElements = pSeq->elements;
             for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos )
             {
@@ -284,7 +284,7 @@ static inline bool idefaultConstructElements(
                     (typelib_ArrayTypeDescription *)pElementTypeDescr );
             }
         }
-
+        
         TYPELIB_DANGER_RELEASE( pElementTypeDescr );
         break;
     }
@@ -293,24 +293,24 @@ static inline bool idefaultConstructElements(
         typelib_TypeDescription * pElementTypeDescr = 0;
         TYPELIB_DANGER_GET( &pElementTypeDescr, pElementType );
         sal_Int32 nElementSize = pElementTypeDescr->nSize;
-
+        
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, nElementSize, nAlloc );
         if (pSeq != 0)
-        {
+        {		
             sal_Int32 nValueOffset =
                 ((typelib_UnionTypeDescription *)
                  pElementTypeDescr)->nValueOffset;
             sal_Int64 nDefaultDiscr =
                 ((typelib_UnionTypeDescription *)
                  pElementTypeDescr)->nDefaultDiscriminant;
-
+            
             typelib_TypeDescription * pDefaultTypeDescr = 0;
             TYPELIB_DANGER_GET(
                 &pDefaultTypeDescr,
                 ((typelib_UnionTypeDescription *)
                  pElementTypeDescr)->pDefaultTypeRef );
-
+            
             char * pElements = pSeq->elements;
             for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos )
             {
@@ -321,7 +321,7 @@ static inline bool idefaultConstructElements(
             }
             TYPELIB_DANGER_RELEASE( pDefaultTypeDescr );
         }
-
+        
         TYPELIB_DANGER_RELEASE( pElementTypeDescr );
         break;
     }
@@ -330,7 +330,7 @@ static inline bool idefaultConstructElements(
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, sizeof(uno_Sequence *), nAlloc );
         if (pSeq != 0)
-        {
+        {		
             uno_Sequence ** pElements =
                 (uno_Sequence **) pSeq->elements;
             for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos )
@@ -344,7 +344,7 @@ static inline bool idefaultConstructElements(
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, sizeof(void *), nAlloc );
         if (pSeq != 0)
-        {
+        {		
             ::rtl_zeroMemory(
                 pSeq->elements + (sizeof(void *) * nStartIndex),
                 sizeof(void *) * (nStopIndex - nStartIndex) );
@@ -355,7 +355,7 @@ static inline bool idefaultConstructElements(
         pSeq = 0;
         break;
     }
-
+    
     if (pSeq == 0)
     {
         OSL_ASSERT( nAlloc >= 0 ); // must have been an allocation failure
@@ -383,7 +383,7 @@ static inline bool icopyConstructFromElements(
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, sizeof(sal_Unicode), nAlloc );
         if (pSeq != 0)
-        {
+        {		
             ::rtl_copyMemory(
                 pSeq->elements + (sizeof(sal_Unicode) * nStartIndex),
                 (char *)pSourceElements + (sizeof(sal_Unicode) * nStartIndex),
@@ -394,7 +394,7 @@ static inline bool icopyConstructFromElements(
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, sizeof(sal_Bool), nAlloc );
         if (pSeq != 0)
-        {
+        {		
             ::rtl_copyMemory(
                 pSeq->elements + (sizeof(sal_Bool) * nStartIndex),
                 (char *)pSourceElements + (sizeof(sal_Bool) * nStartIndex),
@@ -405,7 +405,7 @@ static inline bool icopyConstructFromElements(
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, sizeof(sal_Int8), nAlloc );
         if (pSeq != 0)
-        {
+        {		
             ::rtl_copyMemory(
                 pSeq->elements + (sizeof(sal_Int8) * nStartIndex),
                 (char *)pSourceElements + (sizeof(sal_Int8) * nStartIndex),
@@ -417,7 +417,7 @@ static inline bool icopyConstructFromElements(
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, sizeof(sal_Int16), nAlloc );
         if (pSeq != 0)
-        {
+        {		
             ::rtl_copyMemory(
                 pSeq->elements + (sizeof(sal_Int16) * nStartIndex),
                 (char *)pSourceElements + (sizeof(sal_Int16) * nStartIndex),
@@ -429,7 +429,7 @@ static inline bool icopyConstructFromElements(
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, sizeof(sal_Int32), nAlloc );
         if (pSeq != 0)
-        {
+        {		
             ::rtl_copyMemory(
                 pSeq->elements + (sizeof(sal_Int32) * nStartIndex),
                 (char *)pSourceElements + (sizeof(sal_Int32) * nStartIndex),
@@ -441,7 +441,7 @@ static inline bool icopyConstructFromElements(
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, sizeof(sal_Int64), nAlloc );
         if (pSeq != 0)
-        {
+        {		
             ::rtl_copyMemory(
                 pSeq->elements + (sizeof(sal_Int64) * nStartIndex),
                 (char *)pSourceElements + (sizeof(sal_Int64) * nStartIndex),
@@ -452,7 +452,7 @@ static inline bool icopyConstructFromElements(
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, sizeof(float), nAlloc );
         if (pSeq != 0)
-        {
+        {		
             ::rtl_copyMemory(
                 pSeq->elements + (sizeof(float) * nStartIndex),
                 (char *)pSourceElements + (sizeof(float) * nStartIndex),
@@ -463,7 +463,7 @@ static inline bool icopyConstructFromElements(
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, sizeof(double), nAlloc );
         if (pSeq != 0)
-        {
+        {		
             ::rtl_copyMemory(
                 pSeq->elements + (sizeof(double) * nStartIndex),
                 (char *)pSourceElements + (sizeof(double) * nStartIndex),
@@ -474,7 +474,7 @@ static inline bool icopyConstructFromElements(
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, sizeof(sal_Int32), nAlloc );
         if (pSeq != 0)
-        {
+        {		
             ::rtl_copyMemory(
                 pSeq->elements + (sizeof(sal_Int32) * nStartIndex),
                 (char *)pSourceElements + (sizeof(sal_Int32) * nStartIndex),
@@ -486,7 +486,7 @@ static inline bool icopyConstructFromElements(
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, sizeof(rtl_uString *), nAlloc );
         if (pSeq != 0)
-        {
+        {		
             rtl_uString ** pDestElements = (rtl_uString **) pSeq->elements;
             for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos )
             {
@@ -525,7 +525,7 @@ static inline bool icopyConstructFromElements(
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, sizeof(uno_Any), nAlloc );
         if (pSeq != 0)
-        {
+        {		
             uno_Any * pDestElements = (uno_Any *) pSeq->elements;
             for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos )
             {
@@ -545,13 +545,13 @@ static inline bool icopyConstructFromElements(
         typelib_TypeDescription * pElementTypeDescr = 0;
         TYPELIB_DANGER_GET( &pElementTypeDescr, pElementType );
         sal_Int32 nElementSize = pElementTypeDescr->nSize;
-
+        
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, nElementSize, nAlloc );
         if (pSeq != 0)
-        {
+        {		
             char * pDestElements = pSeq->elements;
-
+            
             typelib_CompoundTypeDescription * pTypeDescr =
                 (typelib_CompoundTypeDescription *)pElementTypeDescr;
             for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos )
@@ -560,7 +560,7 @@ static inline bool icopyConstructFromElements(
                     pDestElements + (nElementSize * nPos);
                 char * pSource =
                     (char *)pSourceElements + (nElementSize * nPos);
-
+                
                 if (pTypeDescr->pBaseTypeDescription)
                 {
                     // copy base value
@@ -568,13 +568,13 @@ static inline bool icopyConstructFromElements(
                         pDest, pSource,
                         pTypeDescr->pBaseTypeDescription, acquire, 0 );
                 }
-
+                
                 // then copy members
                 typelib_TypeDescriptionReference ** ppTypeRefs =
                     pTypeDescr->ppTypeRefs;
                 sal_Int32 * pMemberOffsets = pTypeDescr->pMemberOffsets;
                 sal_Int32 nDescr = pTypeDescr->nMembers;
-
+                
                 while (nDescr--)
                 {
                     ::uno_type_copyData(
@@ -584,7 +584,7 @@ static inline bool icopyConstructFromElements(
                 }
             }
         }
-
+        
         TYPELIB_DANGER_RELEASE( pElementTypeDescr );
         break;
     }
@@ -599,7 +599,7 @@ static inline bool icopyConstructFromElements(
         if (pSeq != 0)
         {
             char * pDestElements = pSeq->elements;
-
+            
             sal_Int32 nValueOffset =
                 ((typelib_UnionTypeDescription *)
                  pElementTypeDescr)->nValueOffset;
@@ -609,7 +609,7 @@ static inline bool icopyConstructFromElements(
                     pDestElements + (nElementSize * nPos);
                 char * pSource =
                     (char *)pSourceElements + (nElementSize * nPos);
-
+                
                 typelib_TypeDescriptionReference * pSetType = _unionGetSetType(
                     pSource, pElementTypeDescr );
                 ::uno_type_copyData(
@@ -620,7 +620,7 @@ static inline bool icopyConstructFromElements(
                 typelib_typedescriptionreference_release( pSetType );
             }
         }
-
+        
         TYPELIB_DANGER_RELEASE( pElementTypeDescr );
         break;
     }
@@ -654,7 +654,7 @@ static inline bool icopyConstructFromElements(
         if (nAlloc >= 0)
             pSeq = reallocSeq( pSeq, sizeof(void *), nAlloc );
         if (pSeq != 0)
-        {
+        {		
             void ** pDestElements = (void **) pSeq->elements;
             for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos )
             {
@@ -669,7 +669,7 @@ static inline bool icopyConstructFromElements(
         pSeq = 0;
         break;
     }
-
+    
     if (pSeq == 0)
     {
         OSL_ASSERT( nAlloc >= 0 ); // must have been an allocation failure
@@ -690,9 +690,9 @@ static inline bool ireallocSequence(
     uno_AcquireFunc acquire, uno_ReleaseFunc release )
 {
     bool ret = true;
-    uno_Sequence * pSeq = *ppSequence;
+    uno_Sequence * pSeq = *ppSequence;	
     sal_Int32 nElements = pSeq->nElements;
-
+    
     if (pSeq->nRefCount > 1 ||
         // not mem-copyable elements?
         typelib_TypeClass_ANY == pElementType->eTypeClass ||
@@ -701,10 +701,10 @@ static inline bool ireallocSequence(
     {
         // split sequence and construct new one from scratch
         uno_Sequence * pNew = 0;
-
+        
         sal_Int32 nRest = nSize - nElements;
         sal_Int32 nCopy = (nRest > 0 ? nElements : nSize);
-
+        
         if (nCopy >= 0)
         {
             ret = icopyConstructFromElements(
@@ -719,7 +719,7 @@ static inline bool ireallocSequence(
                 nCopy, nSize,
                 nCopy >= 0 ? -1 /* no mem allocation */ : nSize );
         }
-
+        
         if (ret)
         {
             // destruct sequence
@@ -758,7 +758,7 @@ static inline bool ireallocSequence(
             ret = (*ppSequence != 0);
         }
     }
-
+    
     return ret;
 }
 
@@ -779,10 +779,10 @@ sal_Bool SAL_CALL uno_type_sequence_construct(
     {
         typelib_TypeDescription * pTypeDescr = 0;
         TYPELIB_DANGER_GET( &pTypeDescr, pType );
-
+        
         typelib_TypeDescriptionReference * pElementType =
             ((typelib_IndirectTypeDescription *)pTypeDescr)->pType;
-
+        
         *ppSequence = 0;
         if (pElements == 0)
         {
@@ -798,7 +798,7 @@ sal_Bool SAL_CALL uno_type_sequence_construct(
                 0, len, acquire,
                 len ); // alloc to len
         }
-
+        
         TYPELIB_DANGER_RELEASE( pTypeDescr );
     }
     else
@@ -806,7 +806,7 @@ sal_Bool SAL_CALL uno_type_sequence_construct(
         *ppSequence = createEmptySequence();
         ret = true;
     }
-
+    
     OSL_ASSERT( (*ppSequence != 0) == ret );
     return ret;
 }
@@ -823,7 +823,7 @@ sal_Bool SAL_CALL uno_sequence_construct(
     {
         typelib_TypeDescriptionReference * pElementType =
             ((typelib_IndirectTypeDescription *)pTypeDescr)->pType;
-
+        
         *ppSequence = 0;
         if (pElements == 0)
         {
@@ -845,7 +845,7 @@ sal_Bool SAL_CALL uno_sequence_construct(
         *ppSequence = createEmptySequence();
         ret = true;
     }
-
+    
     OSL_ASSERT( (*ppSequence != 0) == ret );
     return ret;
 }
@@ -880,7 +880,7 @@ sal_Bool SAL_CALL uno_sequence_realloc(
 {
     OSL_ENSURE( ppSequence, "### null ptr!" );
     OSL_ENSURE( nSize >= 0, "### new size must be at least 0!" );
-
+    
     bool ret = true;
     if (nSize != (*ppSequence)->nElements)
     {
@@ -908,7 +908,7 @@ sal_Bool SAL_CALL uno_type_sequence_reference2One(
         {
             typelib_TypeDescription * pTypeDescr = 0;
             TYPELIB_DANGER_GET( &pTypeDescr, pType );
-
+            
             ret = icopyConstructFromElements(
                 &pNew, pSequence->elements,
                 ((typelib_IndirectTypeDescription *)pTypeDescr)->pType,
@@ -919,7 +919,7 @@ sal_Bool SAL_CALL uno_type_sequence_reference2One(
                 idestructSequence( *ppSequence, pType, pTypeDescr, release );
                 *ppSequence = pNew;
             }
-
+            
             TYPELIB_DANGER_RELEASE( pTypeDescr );
         }
         else
@@ -977,7 +977,7 @@ sal_Bool SAL_CALL uno_sequence_reference2One(
                 *ppSequence = pNew;
             }
         }
-
+        
     }
     return ret;
 }
diff --git a/cppu/util/cppu.map b/cppu/util/cppu.map
index e89594615f53..451b4b689678 100755
--- a/cppu/util/cppu.map
+++ b/cppu/util/cppu.map
@@ -48,7 +48,7 @@ UDK_3_0_0 {
         uno_assignData;
         uno_type_assignData;
         uno_type_isAssignableFromData;
-
+        
         uno_any_assign;
         uno_type_any_assign;
         uno_any_construct;
@@ -92,7 +92,7 @@ UDK_3_0_0 {
         uno_threadpool_dispose;
         uno_threadpool_attach;
         uno_threadpool_detach;
-
+        
         cppu_unsatisfied_iquery_msg;
     local:
         *;
diff --git a/cppuhelper/inc/cppuhelper/access_control.hxx b/cppuhelper/inc/cppuhelper/access_control.hxx
index 7b177c9e8ea4..acd5008b83de 100644
--- a/cppuhelper/inc/cppuhelper/access_control.hxx
+++ b/cppuhelper/inc/cppuhelper/access_control.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,10 +40,10 @@ namespace cppu
 class AccessControl
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::security::XAccessController > m_xController;
-
+    
 public:
     /** Ctor.
-
+        
         @param xContext component context to retrieve access controller singleton
     */
     AccessControl(
@@ -51,7 +51,7 @@ public:
             ::com::sun::star::uno::XComponentContext > const & xContext )
         SAL_THROW( (::com::sun::star::uno::RuntimeException) );
     /** Ctor.
-
+        
         @param xController access controller
     */
     AccessControl(
@@ -59,33 +59,33 @@ public:
             ::com::sun::star::security::XAccessController > const & xController )
         SAL_THROW( (::com::sun::star::uno::RuntimeException) );
     /** Copy ctor.
-
+        
         @param another object
     */
     AccessControl( ::cppu::AccessControl const & ac )
         SAL_THROW( (::com::sun::star::uno::RuntimeException) );
-
+    
     /** Clears the access controller reference being used.
     */
     inline void SAL_CALL clear() SAL_THROW( () )
         { m_xController.clear(); }
-
+    
     /** Returns access to the access controller reference being used.
-
+        
         @return access controller
     */
     inline ::com::sun::star::uno::Reference<
         ::com::sun::star::security::XAccessController > const & SAL_CALL get() const SAL_THROW( () )
         { return m_xController; }
-
+    
     /** Returns access to the access controller reference being used.
-
+        
         @return access controller
     */
     inline ::com::sun::star::security::XAccessController * SAL_CALL operator -> () const SAL_THROW( () )
         { return m_xController.get(); }
-
-
+    
+    
     /** A com.sun.star.security.RuntimePermission is for runtime permissions.
         A RuntimePermission contains a name (also referred to as a "target name") but no
         actions list; you either have the named permission or you don't.
@@ -95,7 +95,7 @@ public:
     void SAL_CALL checkRuntimePermission(
         ::rtl::OUString const & name )
         SAL_THROW( (::com::sun::star::uno::RuntimeException) );
-
+    
     /** A com.sun.star.io.FilePermission represents access to a file or directory.
         A FilePermission consists of a file url and a set of actions valid for that pathname.
 
@@ -106,7 +106,7 @@ public:
         ::rtl::OUString const & url,
         ::rtl::OUString const & actions )
         SAL_THROW( (::com::sun::star::uno::RuntimeException) );
-
+    
     /** A com.sun.star.connection.SocketPermission represents access to a network via sockets.
         A SocketPermission consists of a host specification and a set of "actions"
         specifying ways to connect to that host.
diff --git a/cppuhelper/inc/cppuhelper/basemutex.hxx b/cppuhelper/inc/cppuhelper/basemutex.hxx
index f145709095fb..0b94deda0174 100644
--- a/cppuhelper/inc/cppuhelper/basemutex.hxx
+++ b/cppuhelper/inc/cppuhelper/basemutex.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@ namespace cppu
 {
     /** base class for all classes who want derive from
      ::cppu::WeakComponentImplHelperXX.
-
+     
      Implmentation classes have first to derive from BaseMutex and then from
      ::cppu::WeakComponentImplHelperXX to ensure that the BaseMutex is completely
      initialized when the mutex is used to intialize the
diff --git a/cppuhelper/inc/cppuhelper/bootstrap.hxx b/cppuhelper/inc/cppuhelper/bootstrap.hxx
index 253d3fa53b40..76a0c32a4905 100644
--- a/cppuhelper/inc/cppuhelper/bootstrap.hxx
+++ b/cppuhelper/inc/cppuhelper/bootstrap.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ namespace cppu
 {
 
 /** Creates a simple registry service instance.
-
+    
     @rBootstrapPath optional bootstrap path for initial components
     @return simple registry service instance
 */
@@ -54,7 +54,7 @@ SAL_CALL createSimpleRegistry(
     SAL_THROW( () );
 
 /** Creates a nested registry service instance.
-
+    
     @rBootstrapPath optional bootstrap path for initial components
     @return nested registry service instance
 */
@@ -64,7 +64,7 @@ SAL_CALL createNestedRegistry(
     SAL_THROW( () );
 
 /** Installs type description manager instance, i.e. registers a callback at cppu core.
-
+    
     @param xTDMgr manager instance
     @return true, if successfully registered
 */
@@ -78,7 +78,7 @@ sal_Bool SAL_CALL installTypeDescriptionManager(
       - simple registry, nested registry,
       - implementation registration
       - registry typedescription provider, typedescription manager (also installs it into cppu core)
-
+      
     @param xRegistry registry for service manager and singleton objects of context (may be null)
     @param rBootstrapPath optional bootstrap path for initial components
     @return component context
@@ -97,16 +97,16 @@ bootstrap_InitialComponentContext(
       - simple registry, nested registry,
       - implementation registration
       - registry typedescription provider, typedescription manager (also installs it into cppu core)
-
+      
     This function tries to find its parameters via these bootstrap variables:
-
+    
       - UNO_TYPES         -- a space separated list of file urls of type rdbs
       - UNO_SERVICES      -- a space separated list of file urls of service rdbs
       - UNO_WRITERDB      -- a file url of a write rdb (e.g. user.rdb)
-
+      
     Please look at http://udk.openoffice.org/common/man/concept/uno_default_bootstrapping.html
     for further info.
-
+    
     @return component context
 */
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL
@@ -120,13 +120,13 @@ defaultBootstrap_InitialComponentContext() SAL_THROW( (::com::sun::star::uno::Ex
       - simple registry, nested registry,
       - implementation registration
       - registry typedescription provider, typedescription manager (also installs it into cppu core)
-
+      
     This function tries to find its parameters via these bootstrap variables:
-
+    
       - UNO_TYPES         -- a space separated list of file urls of type rdbs
       - UNO_SERVICES      -- a space separated list of file urls of service rdbs
       - UNO_WRITERDB      -- a file url of a write rdb (e.g. user.rdb)
-
+      
     Please look at http://udk.openoffice.org/common/man/concept/uno_default_bootstrapping.html
     for further info.
 
@@ -136,7 +136,7 @@ defaultBootstrap_InitialComponentContext() SAL_THROW( (::com::sun::star::uno::Ex
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL
 defaultBootstrap_InitialComponentContext(const ::rtl::OUString & iniFile) SAL_THROW( (::com::sun::star::uno::Exception) );
 
-/**
+/** 
  * An exception indicating a bootstrap error.
  *
  * @since UDK 3.2.0
@@ -145,11 +145,11 @@ class BootstrapException
 {
 public:
     /**
-     * Constructs a BootstrapException.
+     * Constructs a BootstrapException. 
      */
     BootstrapException();
 
-    /**
+    /** 
      * Constructs a BootstrapException with the specified detail message.
      *
      * @param rMessage
@@ -179,14 +179,14 @@ public:
         this BootstrapException.
      */
     const ::rtl::OUString & getMessage() const;
-
+    
 private:
     ::rtl::OUString m_aMessage;
 };
 
 /**
  * Bootstraps the component context from a UNO installation.
- *
+ *   
  * @return a bootstrapped component context
  * @exception BootstrapException
  * Thrown in case bootstrap() signals an exception due to a
@@ -194,7 +194,7 @@ private:
  *
  * @since UDK 3.2.0
  */
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > 
 SAL_CALL bootstrap();
 
 /**
diff --git a/cppuhelper/inc/cppuhelper/compbase.hxx b/cppuhelper/inc/cppuhelper/compbase.hxx
index 5827c630da23..54db23a4e5d3 100644
--- a/cppuhelper/inc/cppuhelper/compbase.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/inc/cppuhelper/compbase1.hxx b/cppuhelper/inc/cppuhelper/compbase1.hxx
index b968c3278eb1..0f146f4eafc9 100644
--- a/cppuhelper/inc/cppuhelper/compbase1.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase1.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,14 +45,14 @@ namespace cppu
 
     /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::lang::XComponent.
-
+        
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -80,7 +80,7 @@ namespace cppu
         virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
             { WeakComponentImplHelperBase::addEventListener(xListener); }
         virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
+            { WeakComponentImplHelperBase::removeEventListener(xListener); }        
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
@@ -98,14 +98,14 @@ namespace cppu
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
-
+        
         @deprecated
     */
     template< class Ifc1 >
diff --git a/cppuhelper/inc/cppuhelper/compbase10.hxx b/cppuhelper/inc/cppuhelper/compbase10.hxx
index 0dd725b35a16..9c3fd193af1f 100644
--- a/cppuhelper/inc/cppuhelper/compbase10.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase10.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,10 +49,10 @@ namespace cppu
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -98,14 +98,14 @@ namespace cppu
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
-
+        
         @deprecated
     */
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 >
diff --git a/cppuhelper/inc/cppuhelper/compbase11.hxx b/cppuhelper/inc/cppuhelper/compbase11.hxx
index 5b88983ac6fd..efb9a9f6b321 100644
--- a/cppuhelper/inc/cppuhelper/compbase11.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase11.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,10 +49,10 @@ namespace cppu
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -98,14 +98,14 @@ namespace cppu
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
-
+        
         @deprecated
     */
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 >
diff --git a/cppuhelper/inc/cppuhelper/compbase12.hxx b/cppuhelper/inc/cppuhelper/compbase12.hxx
index f79af5223571..8a43f50098a1 100644
--- a/cppuhelper/inc/cppuhelper/compbase12.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase12.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,10 +49,10 @@ namespace cppu
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -98,10 +98,10 @@ namespace cppu
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
diff --git a/cppuhelper/inc/cppuhelper/compbase2.hxx b/cppuhelper/inc/cppuhelper/compbase2.hxx
index 9518c01f85fd..c102f9726367 100644
--- a/cppuhelper/inc/cppuhelper/compbase2.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase2.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,10 +49,10 @@ namespace cppu
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -98,14 +98,14 @@ namespace cppu
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
-
+        
         @deprecated
     */
     template< class Ifc1, class Ifc2 >
diff --git a/cppuhelper/inc/cppuhelper/compbase3.hxx b/cppuhelper/inc/cppuhelper/compbase3.hxx
index 04bac81f9e2a..9e8c18e754a2 100644
--- a/cppuhelper/inc/cppuhelper/compbase3.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase3.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,10 +49,10 @@ namespace cppu
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -98,14 +98,14 @@ namespace cppu
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
-
+        
         @deprecated
     */
     template< class Ifc1, class Ifc2, class Ifc3 >
diff --git a/cppuhelper/inc/cppuhelper/compbase4.hxx b/cppuhelper/inc/cppuhelper/compbase4.hxx
index a482e4bf0be7..8f7bb7634fdb 100644
--- a/cppuhelper/inc/cppuhelper/compbase4.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase4.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,10 +49,10 @@ namespace cppu
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -98,14 +98,14 @@ namespace cppu
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
-
+        
         @deprecated
     */
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4 >
diff --git a/cppuhelper/inc/cppuhelper/compbase5.hxx b/cppuhelper/inc/cppuhelper/compbase5.hxx
index 2fdaf471aa73..dfdbe976eff8 100644
--- a/cppuhelper/inc/cppuhelper/compbase5.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase5.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,10 +49,10 @@ namespace cppu
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -98,14 +98,14 @@ namespace cppu
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
-
+        
         @deprecated
     */
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5 >
diff --git a/cppuhelper/inc/cppuhelper/compbase6.hxx b/cppuhelper/inc/cppuhelper/compbase6.hxx
index 3c80d59169fe..c871e06e3fb7 100644
--- a/cppuhelper/inc/cppuhelper/compbase6.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase6.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,10 +49,10 @@ namespace cppu
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -98,14 +98,14 @@ namespace cppu
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
-
+        
         @deprecated
     */
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6 >
diff --git a/cppuhelper/inc/cppuhelper/compbase7.hxx b/cppuhelper/inc/cppuhelper/compbase7.hxx
index 43d4de7d787a..42c3c040ccff 100644
--- a/cppuhelper/inc/cppuhelper/compbase7.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase7.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,10 +49,10 @@ namespace cppu
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -98,14 +98,14 @@ namespace cppu
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
-
+        
         @deprecated
     */
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7 >
diff --git a/cppuhelper/inc/cppuhelper/compbase8.hxx b/cppuhelper/inc/cppuhelper/compbase8.hxx
index 8df9b4fb5eff..3742753e1986 100644
--- a/cppuhelper/inc/cppuhelper/compbase8.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase8.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,10 +49,10 @@ namespace cppu
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -98,14 +98,14 @@ namespace cppu
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
-
+        
         @deprecated
     */
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8 >
diff --git a/cppuhelper/inc/cppuhelper/compbase9.hxx b/cppuhelper/inc/cppuhelper/compbase9.hxx
index a2f90b45dae6..7ca131ae2be9 100644
--- a/cppuhelper/inc/cppuhelper/compbase9.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase9.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,10 +49,10 @@ namespace cppu
         Upon disposing objects of this class, sub-classes receive a disposing()
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -97,14 +97,14 @@ namespace cppu
         call.  Objects of this class can be held weakly, i.e. by a
         ::com::sun::star::uno::WeakReference.  Object of this class can be
         aggregated, i.e. incoming queryInterface() calls are delegated.
-
+        
         @attention
         The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
-
+        
         @deprecated
     */
     template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9 >
diff --git a/cppuhelper/inc/cppuhelper/compbase_ex.hxx b/cppuhelper/inc/cppuhelper/compbase_ex.hxx
index 121927b3320c..7d79304b2f2f 100644
--- a/cppuhelper/inc/cppuhelper/compbase_ex.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase_ex.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,7 +49,7 @@ protected:
     /** broadcast helper for disposing events
     */
     ::cppu::OBroadcastHelper rBHelper;
-
+    
     /** this function is called upon disposing the component
     */
     virtual void SAL_CALL disposing();
@@ -63,7 +63,7 @@ public:
     /** Destructor
     */
     virtual ~WeakComponentImplHelperBase() SAL_THROW( () );
-
+    
     // these are here to force memory de/allocation to sal lib.
     inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () )
         { return ::rtl_allocateMemory( nSize ); }
@@ -73,7 +73,7 @@ public:
         { return pMem; }
     inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () )
         {}
-
+    
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
         ::com::sun::star::uno::Type const & rType )
         throw (::com::sun::star::uno::RuntimeException);
@@ -101,15 +101,15 @@ class SAL_NO_VTABLE WeakAggComponentImplHelperBase
 {
 protected:
     ::cppu::OBroadcastHelper rBHelper;
-
+    
     /** Is called upon disposing the component.
     */
     virtual void SAL_CALL disposing();
-
+    
     WeakAggComponentImplHelperBase( ::osl::Mutex & rMutex ) SAL_THROW( () );
 public:
     virtual ~WeakAggComponentImplHelperBase() SAL_THROW( () );
-
+    
     // these are here to force memory de/allocation to sal lib.
     inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () )
         { return ::rtl_allocateMemory( nSize ); }
@@ -119,7 +119,7 @@ public:
         { return pMem; }
     inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () )
         {}
-
+    
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
         ::com::sun::star::uno::Type const & rType )
         throw (::com::sun::star::uno::RuntimeException);
diff --git a/cppuhelper/inc/cppuhelper/component.hxx b/cppuhelper/inc/cppuhelper/component.hxx
index 76f74d402ab5..92eb60389afb 100644
--- a/cppuhelper/inc/cppuhelper/component.hxx
+++ b/cppuhelper/inc/cppuhelper/component.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,13 +39,13 @@
 
 
 namespace cppu
-{
+{    
 
 /** Deprecated.  Helper for implementing ::com::sun::star::lang::XComponent.
     Upon disposing objects of this class, sub-classes receive a disposing() call.  Objects of
     this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference.  Object of
     this class can be aggregated, i.e. incoming queryInterface() calls are delegated.
-
+    
     @attention
     The life-cycle of the passed mutex reference has to be longer than objects of this class.
     @deprecated
@@ -57,7 +57,7 @@ class OComponentHelper
 {
 public:
     /** Constructor.
-
+        
         @param rMutex
         the mutex used to protect multi-threaded access;
         lifetime must be longer than the lifetime of this object.
@@ -66,7 +66,7 @@ public:
     /** Dewstructor. If this object was not disposed previously, object will be disposed manually.
     */
     virtual ~OComponentHelper() SAL_THROW( (::com::sun::star::uno::RuntimeException) );
-
+    
     // XAggregation
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
         ::com::sun::star::uno::Type const & rType )
@@ -78,7 +78,7 @@ public:
         throw ();
     virtual void SAL_CALL release()
         throw ();
-
+    
     /** @attention
         XTypeProvider::getImplementationId() has to be implemented separately!
     */
@@ -89,7 +89,7 @@ public:
     */
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
         throw (::com::sun::star::uno::RuntimeException);
-
+    
     // XComponent
     virtual void SAL_CALL dispose()
         throw(::com::sun::star::uno::RuntimeException);
@@ -99,14 +99,14 @@ public:
     virtual void SAL_CALL removeEventListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener )
         throw(::com::sun::star::uno::RuntimeException);
-
+    
 protected:
     /** Called in dispose method after the listeners were notified.
     */
     virtual void SAL_CALL disposing();
-
+    
     /** @internal */
-    OBroadcastHelper    rBHelper;
+    OBroadcastHelper	rBHelper;
 private:
     /** @internal */
     inline OComponentHelper( const OComponentHelper & ) SAL_THROW( () );
@@ -114,7 +114,7 @@ private:
     inline OComponentHelper & operator = ( const OComponentHelper & ) SAL_THROW( () );
 };
 
-}
+}     
 
 #endif
 
diff --git a/cppuhelper/inc/cppuhelper/component_context.hxx b/cppuhelper/inc/cppuhelper/component_context.hxx
index 10ecc2a885c4..2ab6a0cf25cf 100644
--- a/cppuhelper/inc/cppuhelper/component_context.hxx
+++ b/cppuhelper/inc/cppuhelper/component_context.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ namespace cppu
 struct ContextEntry_Init
 {
     /** late init denotes a object that will be raised when first get() is calling for it
-
+        
         The context implementation expects either a ::com::sun::star::lang::XSingleComponentFactory
         object as value (to instanciate the object) or a string as value for raising
         a service via the used service manager.
@@ -59,7 +59,7 @@ struct ContextEntry_Init
         : bLateInitService( false )
         {}
     /** Ctor.
-
+        
         @param name_
                name of entry
         @param value_
@@ -79,7 +79,7 @@ struct ContextEntry_Init
 };
 
 /** Creates a component context with the given entries.
-
+    
     @param pEntries array of entries
     @param nEntries number of entries
     @param xDelegate delegation to further context, if value was not found
diff --git a/cppuhelper/inc/cppuhelper/exc_hlp.hxx b/cppuhelper/inc/cppuhelper/exc_hlp.hxx
index 5b07c05d9edc..3d70b9eb6a4d 100644
--- a/cppuhelper/inc/cppuhelper/exc_hlp.hxx
+++ b/cppuhelper/inc/cppuhelper/exc_hlp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,12 +32,12 @@
 #include <com/sun/star/uno/Any.hxx>
 
 namespace cppu
-{
+{    
 
 /** This function throws the exception given by rExc.  The given value has to
     be of typeclass EXCEPTION and must be dervived from or of
     type com.sun.star.uno.Exception.
-
+    
     @param rExc
            exception to be thrown.
 */
@@ -46,7 +46,7 @@ void SAL_CALL throwException( const ::com::sun::star::uno::Any & rExc )
 
 /** Use this function to get the dynamic type of a caught C++-UNO exception;
     completes the above function throwing exceptions generically.
-
+    
     try
     {
         ...
@@ -61,17 +61,17 @@ void SAL_CALL throwException( const ::com::sun::star::uno::Any & rExc )
         ::com::sun::star::uno::Any caught( ::cppu::getCaughtException() );
         ...
     }
-
+    
     Restrictions:
     - use only for caught C++-UNO exceptions (UNOIDL defined)
     - only as first statement in a catch block!
     - don't do a C++ rethrow (throw;) after you have called this function
     - call getCaughtException() just once in your catch block!
       (function internally uses a C++ rethrow)
-
+      
     @return
               caught UNO exception
-
+              
     @attention Caution!
               This function is limited to the same C++ compiler runtime library.
               E.g. for MSVC, this means that the catch handler code (the one
@@ -86,7 +86,7 @@ void SAL_CALL throwException( const ::com::sun::star::uno::Any & rExc )
               in newer UDK versions without being recompiled, because those
               newer UDK (-> OOo versions) potentially use newer C++ runtime
               libraries which most often become incompatible!
-
+              
               But this function ought to be usable for most OOo internal C++-UNO
               development, because the whole OOo code base is compiled using the
               same C++ compiler (and linking against one runtime library).
diff --git a/cppuhelper/inc/cppuhelper/factory.hxx b/cppuhelper/inc/cppuhelper/factory.hxx
index 0ba8c603a8ed..538d85c51e85 100644
--- a/cppuhelper/inc/cppuhelper/factory.hxx
+++ b/cppuhelper/inc/cppuhelper/factory.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,11 +40,11 @@
 
 //##################################################################################################
 
-#define COMPONENT_GETENV            "component_getImplementationEnvironment"
+#define COMPONENT_GETENV			"component_getImplementationEnvironment"
 #define COMPONENT_GETENVEXT         "component_getImplementationEnvironmentExt"
-#define COMPONENT_GETDESCRIPTION    "component_getDescription"
-#define COMPONENT_WRITEINFO         "component_writeInfo"
-#define COMPONENT_GETFACTORY        "component_getFactory"
+#define COMPONENT_GETDESCRIPTION	"component_getDescription"
+#define COMPONENT_WRITEINFO			"component_writeInfo"
+#define COMPONENT_GETFACTORY		"component_getFactory"
 
 typedef struct _uno_Environment uno_Environment;
 
@@ -52,7 +52,7 @@ typedef struct _uno_Environment uno_Environment;
     Function determines the environment of the component implementation, i.e. which compiler
     compiled it. If the environment is NOT session specific (needs no additional context),
     then this function should return the environment type name and leave ppEnv (to 0).
-
+    
     @paramppEnvTypeName environment type name; string must be constant
     @param ppEnv function returns its environment if the environment is session specific,
                  i.e. has special context
@@ -79,7 +79,7 @@ typedef void (SAL_CALL * component_getImplementationEnvironmentExtFunc)(
 
 /** Function pointer declaration.
     Function retrieves a component description.
-
+    
     @return an XML formatted string containing a short component description
     @deprecated
 */
@@ -87,7 +87,7 @@ typedef const sal_Char * (SAL_CALL * component_getDescriptionFunc)(void);
 
 /** Function pointer declaration.
     Function writes component registry info, at least writing the supported service names.
-
+    
     @param pServiceManager
     a service manager (the type is an XMultiServiceFactory that can be used
     by the environment returned by component_getImplementationEnvironment)
@@ -120,7 +120,7 @@ typedef void * (SAL_CALL * component_getFactoryFunc)(
 //##################################################################################################
 
 namespace cppu
-{
+{     
 
 /** Function pointer declaration.
     Function creates component instance passing the component context to be used.
@@ -134,7 +134,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(
     SAL_THROW( (::com::sun::star::uno::Exception) );
 
 /** Creates a single component factory supporting the XSingleComponentFactory interface.
-
+    
     @param fptr function pointer for instanciating the object
     @param rImplementationName implementation name of service
     @param rServiceNames supported services
@@ -149,12 +149,12 @@ SAL_CALL createSingleComponentFactory(
     SAL_THROW( () );
 
 /** Creates a single service factory which holds the instance created only once.
-
+    
     @param fptr function pointer for instanciating the object
     @param rImplementationName implementation name of service
     @param rServiceNames supported services
     @param pModCount for future extension (library unloading concept).
-
+    
     @see createSingleComponentFactory
 */
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > SAL_CALL
@@ -166,7 +166,7 @@ createOneInstanceComponentFactory(
     SAL_THROW( () );
 
 /** Deprecated.  The type of the instanciate function used as argument of the create*Fcatory functions.
-
+    
     @see createSingleFactory
     @see createOneInstanceFactory
     @deprecated
@@ -175,15 +175,15 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(SA
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager );
 
 /** Deprecated.  Creates a single service factory.
-
-    @param rServiceManager      the service manager used by the implementation.
-    @param rImplementationName  the implementation name. An empty string is possible.
+    
+    @param rServiceManager		the service manager used by the implementation.
+    @param rImplementationName	the implementation name. An empty string is possible.
     @param ComponentInstantiation the function pointer to create an object.
-    @param rServiceNames            the service supported by the implementation.
+    @param rServiceNames			the service supported by the implementation.
     @param pModCount             for future extension (library unloading concept).
     @return a factory that support the interfaces XServiceProvider, XServiceInfo
     XSingleServiceFactory and XComponent.
-
+    
     @see createOneInstanceFactory
     @deprecated
 */
@@ -201,12 +201,12 @@ createSingleFactory(
     XSingleServiceFactory are forwarded.
     @attention
     The XComponent interface is not supported!
-
-    @param rServiceManager      the service manager used by the implementation.
-    @param xSingleServiceFactory    the wrapped service factory.
+    
+    @param rServiceManager		the service manager used by the implementation.
+    @param xSingleServiceFactory	the wrapped service factory.
     @return a factory that support the interfaces XServiceProvider, XServiceInfo
     XSingleServiceFactory.
-
+    
     @see createSingleFactory
     @deprecated
 */
@@ -217,61 +217,61 @@ createFactoryProxy(
     SAL_THROW( () );
 
 /** Deprecated.  Creates a single service factory which holds the instance created only once.
-
-    @param rServiceManager      the service manager used by the implementation.
-    @param rImplementationName  the implementation name. An empty string is possible.
+    
+    @param rServiceManager		the service manager used by the implementation.
+    @param rImplementationName	the implementation name. An empty string is possible.
     @param ComponentInstantiation the function pointer to create an object.
-    @param rServiceNames            the service supported by the implementation.
+    @param rServiceNames			the service supported by the implementation.
     @param pModCount             for future extension (library unloading concept).
     @return a factory that support the interfaces XServiceProvider, XServiceInfo
     XSingleServiceFactory and XComponent.
-
+    
     @see createSingleFactory
     @deprecated
 */
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL
 createOneInstanceFactory(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager,
-    const ::rtl::OUString & rComponentName,
+    const ::rtl::OUString & rComponentName, 
     ComponentInstantiation pCreateFunction,
     const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rServiceNames,
     rtl_ModuleCount * pModCount = 0  )
     SAL_THROW( () );
 
 /** Deprecated.  Creates a single service factory based on a registry.
-
-    @param rServiceManager      the service manager used by the implementation.
-    @param rImplementationName  the implementation name. An empty string is possible.
-    @param rImplementationKey   the registry key of the implementation section.
+    
+    @param rServiceManager		the service manager used by the implementation.
+    @param rImplementationName	the implementation name. An empty string is possible.
+    @param rImplementationKey	the registry key of the implementation section.
     @return a factory that support the interfaces XServiceProvider, XServiceInfo
     XSingleServiceFactory and XComponent.
     @deprecated
 */
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL createSingleRegistryFactory(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager,
-    const ::rtl::OUString & rImplementationName,
+    const ::rtl::OUString & rImplementationName, 
     const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > & rImplementationKey )
     SAL_THROW( () );
 
 /** Deprecated.  Creates a single service factory which holds the instance created only once
     based on a registry.
-
-    @param rServiceManager      the service manager used by the implementation.
-    @param rImplementationName  the implementation name. An empty string is possible.
-    @param rImplementationKey   the registry key of the implementation section.
+    
+    @param rServiceManager		the service manager used by the implementation.
+    @param rImplementationName	the implementation name. An empty string is possible.
+    @param rImplementationKey	the registry key of the implementation section.
     @return a factory that support the interfaces XServiceProvider, XServiceInfo
     XSingleServiceFactory and XComponent.
-
+    
     @see createSingleRegistryFactory
     @deprecated
 */
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL createOneInstanceRegistryFactory(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager,
-    const ::rtl::OUString & rComponentName,
+    const ::rtl::OUString & rComponentName, 
     const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > & rImplementationKey )
     SAL_THROW( () );
 
-}
+}     
 
 #endif
 
diff --git a/cppuhelper/inc/cppuhelper/findsofficepath.h b/cppuhelper/inc/cppuhelper/findsofficepath.h
index b1bbc50e3340..8a7027ebf906 100644
--- a/cppuhelper/inc/cppuhelper/findsofficepath.h
+++ b/cppuhelper/inc/cppuhelper/findsofficepath.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/inc/cppuhelper/implbase.hxx b/cppuhelper/inc/cppuhelper/implbase.hxx
index fe816ed18acf..9d56d4c5f51b 100644
--- a/cppuhelper/inc/cppuhelper/implbase.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -110,7 +110,7 @@ struct ClassData : public ClassDataBase
     /** type entries array
     */
     Type_Offset arType2Offset[1];
-
+    
     /** init call for supporting com.sun.star.lang.XTypeProvider
     */
     void SAL_CALL initTypeProvider() SAL_THROW( () );
@@ -163,14 +163,14 @@ struct ClassData : public ClassDataBase
     So there is commonly no need to use these macros. Though, you may need to implement more than
     12 interfaces. Then you have to declare something like the following in your headers
     (where N is your demanded number of interfaces):
-
+    
     #define __IFC3 Ifc1, Ifc2, Ifc3, ... up to N
     #define __CLASS_IFC3 class Ifc1, class Ifc2, class Ifc3, ... up to N
     #define __PUBLIC_IFC3 public Ifc1, public Ifc2, public Ifc3, ... up to N
     __DEF_IMPLHELPER_PRE( N )
     __IFC_WRITEOFFSET( 1 ) __IFC_WRITEOFFSET( 2 ) __IFC_WRITEOFFSET( 3 ), ... up to N
     __DEF_IMPLHELPER_POST( N )
-
+    
     @internal
 */
 #define __DEF_IMPLHELPER_PRE( N ) \
diff --git a/cppuhelper/inc/cppuhelper/implbase1.hxx b/cppuhelper/inc/cppuhelper/implbase1.hxx
index 6974c4c57507..c7de4ad26e0b 100644
--- a/cppuhelper/inc/cppuhelper/implbase1.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase1.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -61,10 +61,10 @@ namespace cppu
             return reinterpret_cast< class_data * >(&s_cd);
         }
     };
-
+    
     /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s) including acquire()/
@@ -87,7 +87,7 @@ namespace cppu
     /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
         (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -124,7 +124,7 @@ namespace cppu
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -162,7 +162,7 @@ namespace cppu
         and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
@@ -229,14 +229,14 @@ namespace cppu
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
-
+        
         @attention
         The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
         ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
diff --git a/cppuhelper/inc/cppuhelper/implbase10.hxx b/cppuhelper/inc/cppuhelper/implbase10.hxx
index 972de4544fe9..26ea7525732d 100644
--- a/cppuhelper/inc/cppuhelper/implbase10.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase10.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ namespace cppu
     };
 
     /** @internal */
-    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Impl >
+    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Impl > 
     struct ImplClassData10
     {
         class_data* operator ()()
@@ -73,7 +73,7 @@ namespace cppu
 
     /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s) including acquire()/
@@ -97,7 +97,7 @@ namespace cppu
     /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
         (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -130,7 +130,7 @@ namespace cppu
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -168,7 +168,7 @@ namespace cppu
         and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
@@ -230,14 +230,14 @@ namespace cppu
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
-
+        
         @attention
         The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
         ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
diff --git a/cppuhelper/inc/cppuhelper/implbase11.hxx b/cppuhelper/inc/cppuhelper/implbase11.hxx
index 49a1149b68fa..c262cd6ae5b0 100644
--- a/cppuhelper/inc/cppuhelper/implbase11.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase11.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ namespace cppu
     };
 
     /** @internal */
-    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Impl >
+    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Impl > 
     struct ImplClassData11
     {
         class_data* operator ()()
@@ -74,7 +74,7 @@ namespace cppu
 
     /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s) including acquire()/
@@ -98,7 +98,7 @@ namespace cppu
     /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
         (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -131,7 +131,7 @@ namespace cppu
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -169,7 +169,7 @@ namespace cppu
         and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
@@ -231,14 +231,14 @@ namespace cppu
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
-
+        
         @attention
         The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
         ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
diff --git a/cppuhelper/inc/cppuhelper/implbase12.hxx b/cppuhelper/inc/cppuhelper/implbase12.hxx
index 0005abf07f3d..a4ef396c0bd6 100644
--- a/cppuhelper/inc/cppuhelper/implbase12.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase12.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ namespace cppu
     };
 
     /** @internal */
-    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Ifc12, typename Impl >
+    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Ifc12, typename Impl > 
     struct ImplClassData12
     {
         class_data* operator ()()
@@ -75,7 +75,7 @@ namespace cppu
 
     /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s) including acquire()/
@@ -99,7 +99,7 @@ namespace cppu
     /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
         (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -132,7 +132,7 @@ namespace cppu
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -170,7 +170,7 @@ namespace cppu
         and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
@@ -232,14 +232,14 @@ namespace cppu
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
-
+        
         @attention
         The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
         ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
diff --git a/cppuhelper/inc/cppuhelper/implbase2.hxx b/cppuhelper/inc/cppuhelper/implbase2.hxx
index 99282f6a0a16..8aa6fb4ceeda 100644
--- a/cppuhelper/inc/cppuhelper/implbase2.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase2.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,7 +64,7 @@ namespace cppu
 
     /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
         and queryInterface(), but no reference counting.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your base class defines method implementations, acquire(), release() and delegates incoming
@@ -88,7 +88,7 @@ namespace cppu
     /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
         (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -121,7 +121,7 @@ namespace cppu
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -159,7 +159,7 @@ namespace cppu
         and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
@@ -221,14 +221,14 @@ namespace cppu
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
-
+        
         @attention
         The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
         ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
diff --git a/cppuhelper/inc/cppuhelper/implbase3.hxx b/cppuhelper/inc/cppuhelper/implbase3.hxx
index 1aad6ce7b940..e3cca581febd 100644
--- a/cppuhelper/inc/cppuhelper/implbase3.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase3.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,7 +65,7 @@ namespace cppu
 
     /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s) including acquire()/
@@ -89,7 +89,7 @@ namespace cppu
     /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
         (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -122,7 +122,7 @@ namespace cppu
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -161,7 +161,7 @@ namespace cppu
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
         also has to have a default ctor.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
@@ -223,14 +223,14 @@ namespace cppu
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
-
+        
         @attention
         The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
         ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
diff --git a/cppuhelper/inc/cppuhelper/implbase4.hxx b/cppuhelper/inc/cppuhelper/implbase4.hxx
index ad00b829ee88..c982fca2a9ca 100644
--- a/cppuhelper/inc/cppuhelper/implbase4.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase4.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ namespace cppu
     };
 
     /** @internal */
-    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Impl >
+    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Impl > 
         struct ImplClassData4
     {
         class_data* operator ()()
@@ -67,7 +67,7 @@ namespace cppu
 
     /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s) including acquire()/
@@ -91,7 +91,7 @@ namespace cppu
     /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
         (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -124,7 +124,7 @@ namespace cppu
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -162,7 +162,7 @@ namespace cppu
         and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
@@ -224,14 +224,14 @@ namespace cppu
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
-
+        
         @attention
         The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
         ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
diff --git a/cppuhelper/inc/cppuhelper/implbase5.hxx b/cppuhelper/inc/cppuhelper/implbase5.hxx
index 8d4e216e0b00..c2eff30c0df1 100644
--- a/cppuhelper/inc/cppuhelper/implbase5.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase5.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ namespace cppu
     };
 
     /** @internal */
-    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Impl >
+    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Impl > 
         struct ImplClassData5
     {
         class_data* operator ()()
@@ -68,7 +68,7 @@ namespace cppu
 
     /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s) including acquire()/
@@ -92,7 +92,7 @@ namespace cppu
     /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
         (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -125,7 +125,7 @@ namespace cppu
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -163,7 +163,7 @@ namespace cppu
         and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
@@ -225,14 +225,14 @@ namespace cppu
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
-
+        
         @attention
         The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
         ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
diff --git a/cppuhelper/inc/cppuhelper/implbase6.hxx b/cppuhelper/inc/cppuhelper/implbase6.hxx
index c545284145e6..ca11813140aa 100644
--- a/cppuhelper/inc/cppuhelper/implbase6.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase6.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ namespace cppu
     };
 
     /** @internal */
-    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Impl >
+    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Impl > 
         struct ImplClassData6
     {
         class_data* operator ()()
@@ -66,10 +66,10 @@ namespace cppu
             return reinterpret_cast< class_data * >(&s_cd);
         }
     };
-
+    
     /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s) including acquire()/
@@ -93,7 +93,7 @@ namespace cppu
     /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
         (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -126,7 +126,7 @@ namespace cppu
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -164,7 +164,7 @@ namespace cppu
         and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
@@ -226,14 +226,14 @@ namespace cppu
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
-
+        
         @attention
         The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
         ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
diff --git a/cppuhelper/inc/cppuhelper/implbase7.hxx b/cppuhelper/inc/cppuhelper/implbase7.hxx
index 9a254f40f731..620e0e0a583c 100644
--- a/cppuhelper/inc/cppuhelper/implbase7.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase7.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ namespace cppu
     };
 
     /** @internal */
-    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Impl >
+    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Impl > 
         struct ImplClassData7
     {
         class_data* operator ()()
@@ -68,10 +68,10 @@ namespace cppu
         }
     };
 
-
+    
     /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s) including acquire()/
@@ -95,7 +95,7 @@ namespace cppu
     /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
         (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -128,7 +128,7 @@ namespace cppu
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -166,7 +166,7 @@ namespace cppu
         and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
@@ -228,14 +228,14 @@ namespace cppu
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
-
+        
         @attention
         The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
         ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
diff --git a/cppuhelper/inc/cppuhelper/implbase8.hxx b/cppuhelper/inc/cppuhelper/implbase8.hxx
index e817dc388e8a..31bda399bc61 100644
--- a/cppuhelper/inc/cppuhelper/implbase8.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase8.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ namespace cppu
     };
 
     /** @internal */
-    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Impl >
+    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Impl > 
     struct ImplClassData8
     {
         class_data* operator ()()
@@ -71,7 +71,7 @@ namespace cppu
 
     /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s) including acquire()/
@@ -95,7 +95,7 @@ namespace cppu
     /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
         (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -128,7 +128,7 @@ namespace cppu
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -166,7 +166,7 @@ namespace cppu
         and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
@@ -228,14 +228,14 @@ namespace cppu
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
-
+        
         @attention
         The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
         ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
diff --git a/cppuhelper/inc/cppuhelper/implbase9.hxx b/cppuhelper/inc/cppuhelper/implbase9.hxx
index a070c71cab3e..911caac08ae6 100644
--- a/cppuhelper/inc/cppuhelper/implbase9.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase9.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ namespace cppu
     };
 
     /** @internal */
-    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Impl >
+    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Impl > 
     struct ImplClassData9
     {
         class_data* operator ()()
@@ -70,10 +70,10 @@ namespace cppu
         }
     };
 
-
+    
     /** Implementation helper implementing interface ::com::sun::star::lang::XTypeProvider
         and method XInterface::queryInterface(), but no reference counting.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s) including acquire()/
@@ -97,7 +97,7 @@ namespace cppu
     /** Implementation helper implementing interfaces ::com::sun::star::lang::XTypeProvider and
         ::com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
         (supporting ::com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -130,7 +130,7 @@ namespace cppu
         If a delegator is set (this object is aggregated), then incoming queryInterface()
         calls are delegated to the delegator object. If the delegator does not support the
         demanded interface, it calls queryAggregation() on its aggregated objects.
-
+        
         @derive
         Inherit from this class giving your interface(s) to be implemented as template argument(s).
         Your sub class defines method implementations for these interface(s).
@@ -168,7 +168,7 @@ namespace cppu
         and ::com::sun::star::lang::XTypeProvider are implemented properly.  The
         BaseClass must have at least one ctor that can be called with six or
         fewer arguments, of which none is of non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
@@ -230,14 +230,14 @@ namespace cppu
         All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
         Upon queryAggregation(), if a demanded interface is not supported by this class directly,
         the request is delegated to the BaseClass.
-
+        
         @attention
         The BaseClass has to be complete in a sense, that ::com::sun::star::uno::XInterface,
         ::com::sun::star::uno::XAggregation and ::com::sun::star::lang::XTypeProvider
         are implemented properly.  The BaseClass must have at least one ctor
         that can be called with six or fewer arguments, of which none is of
         non-const reference type.
-
+        
         @derive
         Inherit from this class giving your additional interface(s) to be implemented as
         template argument(s). Your sub class defines method implementations for these interface(s).
diff --git a/cppuhelper/inc/cppuhelper/implbase_ex.hxx b/cppuhelper/inc/cppuhelper/implbase_ex.hxx
index 267bdf6b04cc..056bb3760f8a 100644
--- a/cppuhelper/inc/cppuhelper/implbase_ex.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase_ex.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@
 
 /* If you need to define implementation helper classes that deal with more than
    12 interfaces, then use macros as follows, e.g. for 3 interfaces:
-
+   
 #include <cppuhelper/implbase_ex_pre.hxx>
 #define __IFC_EX_TYPE_INIT3( class_cast ) \
     __IFC_EX_TYPE_INIT( class_cast, 1 ), __IFC_EX_TYPE_INIT( class_cast, 2 ), \
@@ -84,19 +84,19 @@ struct class_data
     /** number of supported types in m_typeEntries
     */
     sal_Int16 m_nTypes;
-
+    
     /** determines whether m_typeEntries is initialized and carries unacquired type refs
     */
     sal_Bool m_storedTypeRefs;
-
+    
     /** determines whether an implementation id was created in m_id
     */
     sal_Bool m_createdId;
-
+    
     /** implementation id
      */
     sal_Int8 m_id[ 16 ];
-
+    
     /** type, object offset
     */
     type_entry m_typeEntries[ 1 ];
diff --git a/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx b/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx
index 83849e5e6cab..3a2f4ca4ad6c 100644
--- a/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx b/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx
index 337fa1ecdc9a..7eee744cd4c0 100644
--- a/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/inc/cppuhelper/implementationentry.hxx b/cppuhelper/inc/cppuhelper/implementationentry.hxx
index 1ff7e49676b7..eb49075d1350 100644
--- a/cppuhelper/inc/cppuhelper/implementationentry.hxx
+++ b/cppuhelper/inc/cppuhelper/implementationentry.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 namespace cppu
 {
 /** One struct instance represents all data necessary for registering one service implementation.
-
+   
  */
 struct ImplementationEntry
 {
@@ -97,7 +97,7 @@ sal_Bool component_writeInfoHelper(
                            This is a reference to the registry key, where the implementation
                            data has been written to.
     @param entries         Each element of the entries-array must contains a function pointer
-                           table for creating a factor of the implementation. The end of the array
+                           table for creating a factor of the implementation. The end of the array 
                            must be marked with a 0 entry in the create-function.
     @return 0 if the helper failed to instantiate a factory, otherwise an acquired pointer
             to a factory.
diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.h b/cppuhelper/inc/cppuhelper/interfacecontainer.h
index ae3c2adf1457..6242de88b6d8 100644
--- a/cppuhelper/inc/cppuhelper/interfacecontainer.h
+++ b/cppuhelper/inc/cppuhelper/interfacecontainer.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@
 
 /** */ //for docpp
 namespace cppu
-{
+{     
 
 namespace detail {
 
@@ -62,7 +62,7 @@ class OInterfaceContainerHelper;
   This is the iterator of a InterfaceContainerHelper. Typically
   one constructs an instance on the stack for one firing session.
   It is not allowed to assign or copy an instance of this class.
-
+  
   @see OInterfaceContainerHelper
  */
 class OInterfaceIteratorHelper
@@ -71,15 +71,15 @@ public:
     /**
        Create an iterator over the elements of the container. The iterator
        copies the elements of the conatainer. A change to the container
-       during the lifetime of an iterator is allowed and does not
+       during the lifetime of an iterator is allowed and does not 
        affect the iterator-instance. The iterator and the container take cares
        themself for concurrent access, no additional guarding is necessary.
-
+       
        Remark: The copy is on demand. The iterator copy the elements only if the container
        change the contents. It is not allowed to destroy the container as long
        as an iterator exist.
-
-       @param rCont the container of the elements.
+     
+       @param rCont	the container of the elements.
      */
     OInterfaceIteratorHelper( OInterfaceContainerHelper & rCont ) SAL_THROW( () );
 
@@ -93,34 +93,34 @@ public:
         { return nRemain != 0; }
     /** Return the next element of the iterator. Calling this method if
         hasMoreElements() has returned sal_False, is an error. Cast the
-        returned pointer to the
+        returned pointer to the 
      */
-    ::com::sun::star::uno::XInterface * SAL_CALL next() SAL_THROW( () );
+    ::com::sun::star::uno::XInterface *	SAL_CALL next() SAL_THROW( () );
 
     /** Removes the current element (the last one returned by next())
         from the underlying container. Calling this method before
         next() has been called or calling it twice with no next()
-        inbetween is an error.
+        inbetween is an error. 
     */
     void SAL_CALL remove() SAL_THROW( () );
-
+    
 private:
-    OInterfaceContainerHelper & rCont;
-    sal_Bool                    bIsList;
+    OInterfaceContainerHelper &	rCont;
+    sal_Bool					bIsList;
 
     detail::element_alias aData;
 
-    sal_Int32                   nRemain;
+    sal_Int32					nRemain;
 
     OInterfaceIteratorHelper( const OInterfaceIteratorHelper & ) SAL_THROW( () );
-    OInterfaceIteratorHelper &  operator = ( const OInterfaceIteratorHelper & ) SAL_THROW( () );
+    OInterfaceIteratorHelper &	operator = ( const OInterfaceIteratorHelper & ) SAL_THROW( () );
 };
 
 //===================================================================
 /**
   A container of interfaces. To access the elements use an iterator.
   This implementation is thread save.
-
+ 
   @see OInterfaceIteratorHelper
  */
 class OInterfaceContainerHelper
@@ -135,11 +135,11 @@ public:
         { return pMem; }
     inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () )
         {}
-
+    
     /**
-       Create an interface container.
-
-       @param rMutex    the mutex to protect multi thread access.
+       Create an interface container. 
+     
+       @param rMutex	the mutex to protect multi thread access.
        The lifetime must be longer than the lifetime
        of this object.
      */
@@ -169,7 +169,7 @@ public:
         removeInterface() the same number of times.
         In the latter case, you will also get events fired more than once (if the interface is a
         listener interface).
-
+        
         @param rxIFace
                interface to be added; it is allowed to insert null or
                the same interface more than once
@@ -178,7 +178,7 @@ public:
     */
     sal_Int32 SAL_CALL addInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace ) SAL_THROW( () );
     /** Removes an element from the container.  It uses interface equality to remove the interface.
-
+        
         @param rxIFace
                interface to be removed
         @return
@@ -197,10 +197,10 @@ public:
 
     /** Executes a functor for each contained listener of specified type, e.g.
         <code>forEach<awt::XPaintListener>(...</code>.
-
+        
         If a com::sun::star::lang::DisposedException occurs which relates to
         the called listener, then that listener is removed from the container.
-
+        
         @tpl ListenerT listener type
         @tpl FuncT unary functor type, let your compiler deduce this for you
         @param func unary functor object expecting an argument of type
@@ -208,7 +208,7 @@ public:
     */
     template <typename ListenerT, typename FuncT>
     inline void forEach( FuncT const& func );
-
+    
     /** Calls a UNO listener method for each contained listener.
 
         The listener method must take a single argument of type EventT,
@@ -216,7 +216,7 @@ public:
 
         If a com::sun::star::lang::DisposedException occurs which relates to
         the called listener, then that listener is removed from the container.
-
+        
         @tpl ListenerT UNO event listener type, let your compiler deduce this for you
         @tpl EventT event type, let your compiler deduce this for you
         @param NotificationMethod
@@ -232,19 +232,19 @@ public:
     */
     template< typename ListenerT, typename EventT >
     inline void notifyEach( void ( SAL_CALL ListenerT::*NotificationMethod )( const EventT& ), const EventT& Event );
-
+    
 private:
 friend class OInterfaceIteratorHelper;
-    /**
+    /** 
       bIsList == TRUE -> aData.pAsSequence of type Sequence< XInterfaceSequence >,
       otherwise aData.pAsInterface == of type (XEventListener *)
      */
     detail::element_alias   aData;
-    ::osl::Mutex &          rMutex;
+    ::osl::Mutex &			rMutex;
     /** TRUE -> used by an iterator. */
-    sal_Bool                bInUse;
+    sal_Bool				bInUse;
     /** TRUE -> aData.pAsSequence is of type Sequence< XInterfaceSequence >. */
-    sal_Bool                bIsList;
+    sal_Bool				bIsList;
 
     OInterfaceContainerHelper( const OInterfaceContainerHelper & ) SAL_THROW( () );
     OInterfaceContainerHelper & operator = ( const OInterfaceContainerHelper & ) SAL_THROW( () );
@@ -305,7 +305,7 @@ inline void OInterfaceContainerHelper::notifyEach( void ( SAL_CALL ListenerT::*N
 //===================================================================
 /**
   A helper class to store interface references of different types.
-
+ 
   @see OInterfaceIteratorHelper
   @see OInterfaceContainerHelper
  */
@@ -322,11 +322,11 @@ public:
         { return pMem; }
     inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () )
         {}
-
+    
     /**
       Create a container of interface containers.
-
-      @param rMutex the mutex to protect multi thread access.
+     
+      @param rMutex	the mutex to protect multi thread access.
                          The lifetime must be longer than the lifetime
                          of this object.
      */
@@ -348,17 +348,17 @@ public:
                  was not created, null was returned.
      */
     inline OInterfaceContainerHelper * SAL_CALL getContainer( const key & ) const SAL_THROW( () );
-
+    
     /** Inserts an element into the container with the specified key.
         The position is not specified, thus it is not specified in which order events are fired.
-
+        
         @attention
         If you add the same interface more than once, then it will be added to the elements list
         more than once and thus if you want to remove that interface from the list, you have to call
         removeInterface() the same number of times.
         In the latter case, you will also get events fired more than once (if the interface is a
         listener interface).
-
+        
         @param rKey
                the id of the container
         @param r
@@ -367,14 +367,14 @@ public:
         @return
                 the new count of elements in the container
     */
-    inline sal_Int32 SAL_CALL addInterface(
+    inline sal_Int32 SAL_CALL addInterface( 
         const key & rKey,
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & r )
         SAL_THROW( () );
-
+    
     /** Removes an element from the container with the specified key.
         It uses interface equality to remove the interface.
-
+        
         @param rKey
                the id of the container
         @param rxIFace
@@ -382,17 +382,17 @@ public:
         @return
                 the new count of elements in the container
     */
-    inline sal_Int32 SAL_CALL removeInterface(
+    inline sal_Int32 SAL_CALL removeInterface(	
         const key & rKey,
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace )
         SAL_THROW( () );
-
+    
     /**
       Call disposing on all references in the container, that
       support XEventListener. Then clears the container.
       @param rEvt the event object which is passed during disposing() call
      */
-    inline void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () );
+    inline void	SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () );
     /**
       Remove all elements of all containers. Does not delete the container.
      */
@@ -402,7 +402,7 @@ public:
 private:
     typedef ::std::vector< std::pair < key , void* > > InterfaceMap;
     InterfaceMap *m_pMap;
-    ::osl::Mutex &  rMutex;
+    ::osl::Mutex &	rMutex;
 
     inline typename InterfaceMap::iterator find(const key &rKey) const
     {
@@ -418,7 +418,7 @@ private:
         }
         return iter;
     }
-
+    
     inline OMultiTypeInterfaceContainerHelperVar( const OMultiTypeInterfaceContainerHelperVar & ) SAL_THROW( () );
     inline OMultiTypeInterfaceContainerHelperVar & operator = ( const OMultiTypeInterfaceContainerHelperVar & ) SAL_THROW( () );
 };
@@ -426,26 +426,26 @@ private:
 
 
 
-/**
+/** 
   This struct contains the standard variables of a broadcaster. Helper
   classes only know a reference to this struct instead of references
   to the four members. The access to the members must be guarded with
   rMutex.
-
+ 
   The additional template parameter keyType has been added, because gcc
   can't compile addListener( const container::keyType &key ).
  */
-template < class container , class keyType >
+template < class container , class keyType > 
 struct OBroadcastHelperVar
 {
     /** The shared mutex. */
-    ::osl::Mutex &                      rMutex;
+    ::osl::Mutex &						rMutex;
     /** ListenerContainer class is thread save. */
-    container   aLC;
+    container	aLC;
     /** Dispose call ready. */
-    sal_Bool                            bDisposed;
+    sal_Bool							bDisposed; 
     /** In dispose call. */
-    sal_Bool                            bInDispose;
+    sal_Bool							bInDispose;
 
     /**
       Initialize the structur. bDispose and bInDispose are set to false.
@@ -527,11 +527,11 @@ public:
         { return pMem; }
     inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () )
         {}
-
+    
     /**
       Create a container of interface containers.
-
-      @param rMutex the mutex to protect multi thread access.
+     
+      @param rMutex	the mutex to protect multi thread access.
                          The lifetime must be longer than the lifetime
                          of this object.
      */
@@ -552,17 +552,17 @@ public:
                  was not created, null was returned.
      */
     OInterfaceContainerHelper * SAL_CALL getContainer( const ::com::sun::star::uno::Type & rKey ) const SAL_THROW( () );
-
+    
     /** Inserts an element into the container with the specified key.
         The position is not specified, thus it is not specified in which order events are fired.
-
+        
         @attention
         If you add the same interface more than once, then it will be added to the elements list
         more than once and thus if you want to remove that interface from the list, you have to call
         removeInterface() the same number of times.
         In the latter case, you will also get events fired more than once (if the interface is a
         listener interface).
-
+        
         @param rKey
                the id of the container
         @param r
@@ -571,14 +571,14 @@ public:
         @return
                 the new count of elements in the container
     */
-    sal_Int32 SAL_CALL addInterface(
+    sal_Int32 SAL_CALL addInterface( 
         const ::com::sun::star::uno::Type & rKey,
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & r )
         SAL_THROW( () );
-
+    
     /** Removes an element from the container with the specified key.
         It uses interface equality to remove the interface.
-
+        
         @param rKey
                the id of the container
         @param rxIFace
@@ -586,25 +586,25 @@ public:
         @return
                 the new count of elements in the container
     */
-    sal_Int32 SAL_CALL removeInterface(
+    sal_Int32 SAL_CALL removeInterface(	
         const ::com::sun::star::uno::Type & rKey,
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace )
         SAL_THROW( () );
-
+    
     /**
       Call disposing on all object in the container that
       support XEventListener. Than clear the container.
      */
-    void    SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () );
+    void	SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () );
     /**
       Remove all elements of all containers. Does not delete the container.
      */
     void SAL_CALL clear() SAL_THROW( () );
-
+    
     typedef ::com::sun::star::uno::Type keyType;
 private:
     void *m_pMap;
-    ::osl::Mutex &  rMutex;
+    ::osl::Mutex &	rMutex;
 
     inline OMultiTypeInterfaceContainerHelper( const OMultiTypeInterfaceContainerHelper & ) SAL_THROW( () );
     inline OMultiTypeInterfaceContainerHelper & operator = ( const OMultiTypeInterfaceContainerHelper & ) SAL_THROW( () );
@@ -612,7 +612,7 @@ private:
 
 typedef OBroadcastHelperVar< OMultiTypeInterfaceContainerHelper , OMultiTypeInterfaceContainerHelper::keyType > OBroadcastHelper;
 
-}
+}     
 
 #endif
 
diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx b/cppuhelper/inc/cppuhelper/interfacecontainer.hxx
index d9c347ecc0cf..68781c9d5ac1 100644
--- a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx
+++ b/cppuhelper/inc/cppuhelper/interfacecontainer.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 
 
 namespace cppu
-{
+{     
 
 template< class key , class hashImpl , class equalImpl >
 inline OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::OMultiTypeInterfaceContainerHelperVar( ::osl::Mutex & rMutex_ )
@@ -94,7 +94,7 @@ inline ::com::sun::star::uno::Sequence< key > OMultiTypeInterfaceContainerHelper
 
 //===================================================================
 template< class key , class hashImpl , class equalImpl >
-OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::getContainer(
+OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::getContainer( 
     const key & rKey ) const SAL_THROW( () )
 {
     ::osl::MutexGuard aGuard( rMutex );
@@ -107,7 +107,7 @@ OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperVar< key , hashImp
 
 //===================================================================
 template< class key , class hashImpl , class equalImpl >
-sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::addInterface(
+sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::addInterface( 
     const key & rKey,
     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener )
     SAL_THROW( () )
@@ -126,8 +126,8 @@ sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::a
 
 //===================================================================
 template< class key , class hashImpl , class equalImpl >
-inline sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::removeInterface(
-    const key & rKey,
+inline sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::removeInterface( 
+    const key & rKey, 
     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener )
     SAL_THROW( () )
 {
@@ -158,10 +158,10 @@ void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::dispos
         {
             typedef OInterfaceContainerHelper* ppp;
             ppListenerContainers = new ppp[nSize];
-
+    
             typename InterfaceMap::iterator iter = m_pMap->begin();
             typename InterfaceMap::iterator end = m_pMap->end();
-
+    
             typename InterfaceMap::size_type i = 0;
             while( iter != end )
             {
@@ -197,7 +197,7 @@ void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::clear(
 }
 
 
-}
+}     
 
 #endif
 
diff --git a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
index 6ab242f111a0..41a9f1ae4785 100644
--- a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
+++ b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/inc/cppuhelper/propshlp.hxx b/cppuhelper/inc/cppuhelper/propshlp.hxx
index a288feb284ba..0beca5ab0bad 100644
--- a/cppuhelper/inc/cppuhelper/propshlp.hxx
+++ b/cppuhelper/inc/cppuhelper/propshlp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -71,7 +71,7 @@ public:
 
     /**
        Return the property members Name and Attribute from the handle nHandle.
-       @param nHandle   the handle of a property. If the values of the handles
+       @param nHandle	the handle of a property. If the values of the handles
                           are sorted in the same way as the names and the highest handle value
                           is getCount() -1, than it must be an indexed acces to the property array.
        @param pPropName is an out parameter filled with property name of the property with the
@@ -88,21 +88,21 @@ public:
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void) = 0;
     /**
        Return the property with the name rPropertyName.
-       @param rPropertyName the name of the property.
-       @exception UnknownPropertyException  thrown if the property name is unknown.
+       @param rPropertyName	the name of the property.
+       @exception UnknownPropertyException	thrown if the property name is unknown.
      */
     virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName(
         const ::rtl::OUString& rPropertyName )
         throw (::com::sun::star::beans::UnknownPropertyException) = 0;
     /**
        Return true if the property with the name rPropertyName exist, otherwise false.
-       @param rPropertyName the name of the property.
+       @param rPropertyName	the name of the property.
      */
     virtual sal_Bool SAL_CALL hasPropertyByName(const ::rtl::OUString& rPropertyName) = 0;
     /**
        Return the handle of the property with the name rPropertyName.
        If the property does not exist -1 is returned.
-       @param rPropertyName the name of the property.
+       @param rPropertyName	the name of the property.
      */
     virtual sal_Int32 SAL_CALL getHandleByName( const ::rtl::OUString & rPropertyName ) = 0;
     /**
@@ -123,11 +123,11 @@ class OPropertyArrayHelper : public IPropertyArrayHelper
 public:
      /**
        Create an object which supports the common property interfaces.
-
-       @param pProps    array of properties
+       
+       @param pProps	array of properties
                           The array pProps should be sorted.
-       @param nElements is the number of properties in the pProps structure.
-       @param bSorted   indicates that the elements are sorted.
+       @param nElements	is the number of properties in the pProps structure.
+       @param bSorted	indicates that the elements are sorted.
       *********/
     OPropertyArrayHelper(
         ::com::sun::star::beans::Property *pProps,
@@ -151,8 +151,8 @@ public:
      */
     sal_Int32 SAL_CALL getCount() const SAL_THROW( () );
     /**
-       Return the property members Name and Attribute from the handle nHandle.
-       @param nHandle   the handle of a property. If the values of the handles
+       Return the property members Name and Attribute from the handle nHandle. 
+       @param nHandle	the handle of a property. If the values of the handles
                           are sorted in the same way as the names and the highest handle value
                           is getCount() -1, than it is only an indexed acces to the property array.
                           Otherwise it is a linear search through the array.
@@ -170,21 +170,21 @@ public:
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void);
     /**
        Return the property with the name rPropertyName.
-       @param rPropertyName the name of the property.
-       @exception UnknownPropertyException  thrown if the property name is unknown.
+       @param rPropertyName	the name of the property.
+       @exception UnknownPropertyException	thrown if the property name is unknown.
      */
     virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName(
         const ::rtl::OUString& rPropertyName )
         throw (::com::sun::star::beans::UnknownPropertyException);
     /**
        Return true if the property with the name rPropertyName exist, otherwise false.
-       @param rPropertyName the name of the property.
+       @param rPropertyName	the name of the property.
      */
     virtual sal_Bool SAL_CALL hasPropertyByName(const ::rtl::OUString& rPropertyName);
     /**
        Return the handle of the property with the name rPropertyName.
        If the property does not exist -1 is returned.
-       @param rPropertyName the name of the property.
+       @param rPropertyName	the name of the property.
      */
     virtual sal_Int32 SAL_CALL getHandleByName( const ::rtl::OUString & rPropertyName );
     /**
@@ -208,9 +208,9 @@ private:
 
     /**
        True, If the values of the handles are sorted in the same way as the names
-       and the highest handle value is getCount() -1, otherwise false.
+       and the highest handle value	is getCount() -1, otherwise false.
      */
-    sal_Bool                    bRightOrdered;
+    sal_Bool					bRightOrdered;
 };
 
 
@@ -246,8 +246,8 @@ public:
 
     /**
       Create a container of interface containers.
-
-      @param rMutex the mutex to protect multi thread access.
+     
+      @param rMutex	the mutex to protect multi thread access.
                          The lifetime must be longer than the lifetime
                          of this object.
      */
@@ -271,12 +271,12 @@ public:
 
     /**
       Insert an element in the container specified with the key. The position is not specified.
-      @param rKey       the id of the container.
-      @param rxIFace    the added interface. It is allowed to insert null or
+      @param rKey		the id of the container.
+      @param rxIFace	the added interface. It is allowed to insert null or
                          the same pointer more than once.
       @return the new count of elements in the container.
      */
-    sal_Int32 SAL_CALL addInterface(
+    sal_Int32 SAL_CALL addInterface( 
         const sal_Int32 & rKey,
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & r )
         SAL_THROW( () );
@@ -284,11 +284,11 @@ public:
     /**
       Remove an element from the container specified with the key.
       It uses the equal definition of uno objects to remove the interfaces.
-      @param rKey       the id of the container.
-      @param rxIFace    the removed interface.
+      @param rKey		the id of the container.
+      @param rxIFace	the removed interface.
       @return the new count of elements in the container.
      */
-    sal_Int32 SAL_CALL removeInterface(
+    sal_Int32 SAL_CALL removeInterface(	
         const sal_Int32 & rKey,
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace )
         SAL_THROW( () );
@@ -297,7 +297,7 @@ public:
       Call disposing on all objects in the container that
       support XEventListener. Then clear the container.
      */
-    void    SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () );
+    void	SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () );
     /**
       Remove all elements of all containers. Does not delete the container.
      */
@@ -306,7 +306,7 @@ public:
     typedef sal_Int32 keyType;
 private:
     void *m_pMap;
-    ::osl::Mutex &  rMutex;
+    ::osl::Mutex &	rMutex;
 
     inline OMultiTypeInterfaceContainerHelperInt32( const OMultiTypeInterfaceContainerHelperInt32 & ) SAL_THROW( () );
     inline OMultiTypeInterfaceContainerHelperInt32 & operator = ( const OMultiTypeInterfaceContainerHelperInt32 & ) SAL_THROW( () );
@@ -346,7 +346,7 @@ public:
    The XPropertyChangeListener and XVetoableChangeListener with no names are inserted
    in the rBHelper.aLC structure. So it is possible to advise property listeners with
    the connection point interfaces. But only listeners that listen to all property changes.
-
+  
  */
 class OPropertySetHelper : public ::com::sun::star::beans::XMultiPropertySet,
                            public ::com::sun::star::beans::XFastPropertySet,
@@ -354,7 +354,7 @@ class OPropertySetHelper : public ::com::sun::star::beans::XMultiPropertySet,
 {
 public:
     /**
-       @param rBHelper  this structure contains the basic members of
+       @param rBHelper	this structure contains the basic members of
                           a broadcaster.
                           The lifetime must be longer than the lifetime
                           of this object. Stored in the variable rBHelper.
@@ -362,13 +362,13 @@ public:
     OPropertySetHelper( OBroadcastHelper & rBHelper ) SAL_THROW( () );
 
     /** Constructor.
-
+       
         @param rBHelper
                         this structure contains the basic members of
                         a broadcaster.
                           The lifetime must be longer than the lifetime
                           of this object. Stored in the variable rBHelper.
-
+                          
         @param bIgnoreRuntimeExceptionsWhileFiring
                         indicates whether occuring RuntimeExceptions will be
                         ignored when firing notifications (vetoableChange((),
@@ -382,13 +382,13 @@ public:
         OBroadcastHelper & rBHelper, bool bIgnoreRuntimeExceptionsWhileFiring );
 
     /** Constructor.
-
+       
         @param rBHelper
                         this structure contains the basic members of
                         a broadcaster.
                         The lifetime must be longer than the lifetime
                         of this object. Stored in the variable rBHelper.
-
+                          
         @param i_pFireEvents
                         additional event notifier
 
@@ -421,7 +421,7 @@ public:
     /**
        Send a disposing notification to the listeners in the conatiners aBoundLC
        and aVetoableLC.
-
+      
        @see OComponentHelper
      */
     void SAL_CALL disposing() SAL_THROW( () );
@@ -439,7 +439,7 @@ public:
      */
     virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& aPropertyName)
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    /** Ignored if the property is not bound. */
+    /** Ignored if the property is not bound. */ 
     virtual void SAL_CALL addPropertyChangeListener(
         const ::rtl::OUString& aPropertyName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener)
@@ -511,10 +511,10 @@ public:
 protected:
     /**
        This method fire events to all registered property listeners.
-       @param pnHandles     the id's of the properties that changed.
-       @param pNewValues    the new values of the properties.
-       @param pOldValues    the old values of the properties.
-       @param nCount        the number of elements in the arrays pnHandles, pNewValues and pOldValues.
+       @param pnHandles		the id's of the properties that changed.
+       @param pNewValues	the new values of the properties.
+       @param pOldValues	the old values of the properties.
+       @param nCount		the number of elements in the arrays pnHandles, pNewValues and pOldValues.
        @param bVetoable true means fire to VetoableChangeListener, false means fire to
                   XPropertyChangedListener and XMultiPropertyChangedListener.
      */
@@ -527,7 +527,7 @@ protected:
 
     /**
        Set multiple properties with the handles.
-       @param nSeqLen   the length of the arrays pHandles and Values.
+       @param nSeqLen	the length of the arrays pHandles and Values.
        @param pHandles the handles of the properties. The number of elements
               in the Values sequence is the length of the handle array. A value of -1
               of a handle means invalid property. These are ignored.
@@ -552,7 +552,7 @@ protected:
        old value in rOldValue. A IllegalArgumentException is thrown.
        The method is not implemented in this class. After this call the vetoable
        listeners are notified.
-
+      
        @param rConvertedValue the converted value. Only set if return is true.
        @param rOldValue the old value. Only set if return is true.
        @param nHandle the handle of the proberty.
@@ -577,7 +577,7 @@ protected:
         -- ::com::sun::star::lang::IllegalArgumentException
         -- ::com::sun::star::lang::WrappedTargetException
         -- ::com::sun::star::uno::RuntimeException
-
+        
         @param nHandle
                handle
         @param rValue
@@ -597,7 +597,7 @@ protected:
         sal_Int32 nHandle ) const = 0;
 
     /** The common data of a broadcaster. Use the mutex, disposing state and the listener container. */
-    OBroadcastHelper    &rBHelper;
+    OBroadcastHelper	&rBHelper;
     /**
        Container for the XProperyChangedListener. The listeners are inserted by handle.
      */
@@ -615,7 +615,7 @@ protected:
 
 private:
     OPropertySetHelper( const OPropertySetHelper & ) SAL_THROW( () );
-    OPropertySetHelper &    operator = ( const OPropertySetHelper & ) SAL_THROW( () );
+    OPropertySetHelper &	operator = ( const OPropertySetHelper & ) SAL_THROW( () );
 
 public:
 // Suppress warning about virtual functions but non-virtual destructor:
@@ -635,7 +635,7 @@ public:
 #endif
 
 } // end namespace cppuhelper
-#endif  //
+#endif	//
 
 
 
diff --git a/cppuhelper/inc/cppuhelper/proptypehlp.h b/cppuhelper/inc/cppuhelper/proptypehlp.h
index e36e9d897dee..a7c1210319d6 100644
--- a/cppuhelper/inc/cppuhelper/proptypehlp.h
+++ b/cppuhelper/inc/cppuhelper/proptypehlp.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@ namespace cppu {
     The function does the same as the operator >>= () at the
     Any class, except that it throws an IllegalArgumentException in case of
     failures (the value cannot be extracted without data loss )
-
+   
    @exception com::sun::star::lang::IllegalArgumentException when the type could not be converted.
  */
 template < class target >
@@ -50,25 +50,25 @@ inline void SAL_CALL convertPropertyValue( target &value ,  ::com::sun::star::un
 /**
   conversion of basic types
 */
-inline void SAL_CALL convertPropertyValue( sal_Int64 & target ,  const ::com::sun::star::uno::Any & source )
+inline void SAL_CALL convertPropertyValue( sal_Int64 & target ,  const ::com::sun::star::uno::Any & source ) 
     SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
-inline void SAL_CALL convertPropertyValue( sal_uInt64 & target, const ::com::sun::star::uno::Any & source )
+inline void SAL_CALL convertPropertyValue( sal_uInt64 & target, const ::com::sun::star::uno::Any & source ) 
     SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
-inline void SAL_CALL convertPropertyValue( sal_Int32 & target , const ::com::sun::star::uno::Any & source )
+inline void SAL_CALL convertPropertyValue( sal_Int32 & target , const ::com::sun::star::uno::Any & source ) 
     SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
-inline void SAL_CALL convertPropertyValue( sal_uInt32 & target, const ::com::sun::star::uno::Any & source )
+inline void SAL_CALL convertPropertyValue( sal_uInt32 & target, const ::com::sun::star::uno::Any & source ) 
     SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
 inline void SAL_CALL convertPropertyValue( sal_Int16 & target , const ::com::sun::star::uno::Any & source )
     SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
 inline void SAL_CALL convertPropertyValue( sal_uInt16 & target, const ::com::sun::star::uno::Any & source )
     SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
-inline void SAL_CALL convertPropertyValue( sal_Int8 & target     , const ::com::sun::star::uno::Any & source )
+inline void SAL_CALL convertPropertyValue( sal_Int8 & target	 , const ::com::sun::star::uno::Any & source )
     SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
 inline void SAL_CALL convertPropertyValue( float & target     , const ::com::sun::star::uno::Any & source )
     SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
 inline void SAL_CALL convertPropertyValue( double &target     , const ::com::sun::star::uno::Any &source )
     SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
-inline void SAL_CALL convertPropertyValue( ::rtl::OUString &target  , const ::com::sun::star::uno::Any &source )
+inline void SAL_CALL convertPropertyValue( ::rtl::OUString &target 	, const ::com::sun::star::uno::Any &source )
     SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
 
 } // end namespace cppu
diff --git a/cppuhelper/inc/cppuhelper/proptypehlp.hxx b/cppuhelper/inc/cppuhelper/proptypehlp.hxx
index b1c50389dc83..b7a14e8bcbae 100644
--- a/cppuhelper/inc/cppuhelper/proptypehlp.hxx
+++ b/cppuhelper/inc/cppuhelper/proptypehlp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,13 +31,13 @@
 #include <cppuhelper/proptypehlp.h>
 
 namespace cppu
-{
+{     
 
 /** Converts the value stored in an any to a concrete C++ type.
     The function does the same as the operator >>= () at the
     Any class, except that it throws an IllegalArgumentException in case of
     failures (the value cannot be extracted without data loss )
-
+   
    @exception com::sun::star::lang::IllegalArgumentException when the type could not be converted.
  */
 template < class target >
@@ -45,7 +45,7 @@ inline void SAL_CALL convertPropertyValue( target &value , const  ::com::sun::st
 {
 
     if( !( a >>= value ) ) {
-        throw ::com::sun::star::lang::IllegalArgumentException();
+        throw ::com::sun::star::lang::IllegalArgumentException();	
     }
 }
 
@@ -72,12 +72,12 @@ inline void SAL_CALL convertPropertyValue( sal_Bool & b   , const ::com::sun::st
     }
     else if ( ::com::sun::star::uno::TypeClass_CHAR  == tc ) {
         sal_Unicode c = *(sal_Unicode*) a.getValue();
-        b = ( sal_Bool ) c;
+        b = ( sal_Bool ) c;	
     }
     else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) {
         sal_Int16 i16 = 0;
         a >>= i16;
-        b = ( sal_Bool ) i16;
+        b = ( sal_Bool ) i16;	
     }
     else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) {
         b = *((sal_Bool*)a.getValue());
@@ -85,12 +85,12 @@ inline void SAL_CALL convertPropertyValue( sal_Bool & b   , const ::com::sun::st
     else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) {
         sal_Int8 i8 = 0;
         a >>= i8;
-        b = ( sal_Bool ) i8;
+        b = ( sal_Bool ) i8;	
     }
     else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) {
         sal_uInt16 i16 = 0;
         a >>= i16;
-        b = ( sal_Bool  ) i16;
+        b = ( sal_Bool	) i16;
     }
     else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) {
         sal_uInt32 i32 = 0;
@@ -98,17 +98,17 @@ inline void SAL_CALL convertPropertyValue( sal_Bool & b   , const ::com::sun::st
         b = ( sal_Bool ) i32;
     }
     else {
-        throw ::com::sun::star::lang::IllegalArgumentException();
-    }
+        throw ::com::sun::star::lang::IllegalArgumentException();	
+    }		
 }
 
-inline void SAL_CALL convertPropertyValue( sal_Int64 & i  , const ::com::sun::star::uno::Any & a )
+inline void SAL_CALL convertPropertyValue( sal_Int64 & i  , const ::com::sun::star::uno::Any & a ) 
     SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) )
 {
     const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass();
-
+    
     if( ::com::sun::star::uno::TypeClass_HYPER == tc ) {
-        a >>= i;
+        a >>= i;	
     }
     else if( ::com::sun::star::uno::TypeClass_UNSIGNED_HYPER == tc ) {
         sal_uInt64 i64 = 0;
@@ -123,27 +123,27 @@ inline void SAL_CALL convertPropertyValue( sal_Int64 & i  , const ::com::sun::st
     else if ( ::com::sun::star::uno::TypeClass_CHAR  == tc ) {
         sal_Unicode c;
         c = *(sal_Unicode *)a.getValue();
-        i = ( sal_Int64 ) c;
+        i = ( sal_Int64 ) c;	
     }
     else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) {
         sal_Int16 i16 = 0;
         a >>= i16;
-        i = ( sal_Int64 ) i16;
+        i = ( sal_Int64 ) i16;	
     }
     else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) {
         sal_Bool b;
         b =  *((sal_Bool * )a.getValue());
-        i = ( sal_Int64 ) b;
+        i = ( sal_Int64 ) b;	
     }
     else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) {
         sal_Int8 i8 = 0;
         a >>= i8;
-        i = ( sal_Int64 ) i8;
+        i = ( sal_Int64 ) i8;	
     }
     else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) {
         sal_uInt16 i16 = 0;
         a >>= i16;
-        i = ( sal_Int64 ) i16;
+        i = ( sal_Int64	) i16;
     }
     else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) {
         sal_uInt32 i32 = 0;
@@ -151,18 +151,18 @@ inline void SAL_CALL convertPropertyValue( sal_Int64 & i  , const ::com::sun::st
         i = ( sal_Int64 ) i32;
     }
     else {
-        throw ::com::sun::star::lang::IllegalArgumentException();
+        throw ::com::sun::star::lang::IllegalArgumentException();	
     }
 }
 
 
-inline void SAL_CALL convertPropertyValue( sal_uInt64 & i  , const ::com::sun::star::uno::Any & a )
+inline void SAL_CALL convertPropertyValue( sal_uInt64 & i  , const ::com::sun::star::uno::Any & a ) 
     SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) )
 {
     const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass();
-
+    
     if( ::com::sun::star::uno::TypeClass_UNSIGNED_HYPER == tc ) {
-        a >>= i;
+        a >>= i;	
     }
     if( ::com::sun::star::uno::TypeClass_HYPER == tc ) {
         sal_Int64 i64;
@@ -177,27 +177,27 @@ inline void SAL_CALL convertPropertyValue( sal_uInt64 & i  , const ::com::sun::s
     else if ( ::com::sun::star::uno::TypeClass_CHAR  == tc ) {
         sal_Unicode c;
         c = *( sal_Unicode * ) a.getValue() ;
-        i = ( sal_uInt64 ) c;
+        i = ( sal_uInt64 ) c;	
     }
     else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) {
         sal_Int16 i16;
         a >>= i16;
-        i = ( sal_uInt64 ) i16;
+        i = ( sal_uInt64 ) i16;	
     }
     else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) {
         sal_Bool b;
         b =  *((sal_Bool * )a.getValue());
-        i = ( sal_uInt64 ) b;
+        i = ( sal_uInt64 ) b;	
     }
     else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) {
         sal_Int8 i8;
         a >>= i8;
-        i = ( sal_uInt64 ) i8;
+        i = ( sal_uInt64 ) i8;	
     }
     else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) {
         sal_uInt16 i16;
         a >>= i16;
-        i = ( sal_uInt64    ) i16;
+        i = ( sal_uInt64	) i16;
     }
     else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) {
         sal_uInt32 i32;
@@ -205,44 +205,44 @@ inline void SAL_CALL convertPropertyValue( sal_uInt64 & i  , const ::com::sun::s
         i = ( sal_uInt64 ) i32;
     }
     else {
-        throw ::com::sun::star::lang::IllegalArgumentException();
+        throw ::com::sun::star::lang::IllegalArgumentException();	
     }
 }
 
 // the basic types
 // sal_Int32
-inline void SAL_CALL convertPropertyValue( sal_Int32 & i  , const ::com::sun::star::uno::Any & a )
+inline void SAL_CALL convertPropertyValue( sal_Int32 & i  , const ::com::sun::star::uno::Any & a ) 
     SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) )
 {
     const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass();
-
+    
     if( ::com::sun::star::uno::TypeClass_LONG == tc ) {
         a >>= i;
     }
     else if ( ::com::sun::star::uno::TypeClass_CHAR  == tc ) {
         sal_Unicode c;
         c = *(sal_Unicode*) a.getValue();
-        i = ( sal_Int32 ) c;
+        i = ( sal_Int32 ) c;	
     }
     else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) {
         sal_Int16 i16 = 0;
         a >>= i16;
-        i = ( sal_Int32 ) i16;
+        i = ( sal_Int32 ) i16;	
     }
     else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) {
         sal_Bool b;
         b =  *((sal_Bool * )a.getValue());
-        i = ( sal_Int32 ) b;
+        i = ( sal_Int32 ) b;	
     }
     else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) {
         sal_Int8 i8 = 0;
         a >>= i8;
-        i = ( sal_Int32 ) i8;
+        i = ( sal_Int32 ) i8;	
     }
     else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) {
         sal_uInt16 i16 = 0;
         a >>= i16;
-        i = ( sal_Int32 ) i16;
+        i = ( sal_Int32	) i16;
     }
     else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) {
         sal_uInt32 i32 = 0;
@@ -250,15 +250,15 @@ inline void SAL_CALL convertPropertyValue( sal_Int32 & i  , const ::com::sun::st
         i = ( sal_Int32 ) i32;
     }
     else {
-        throw ::com::sun::star::lang::IllegalArgumentException();
+        throw ::com::sun::star::lang::IllegalArgumentException();	
     }
 }
 
-inline void SAL_CALL convertPropertyValue( sal_uInt32 & i  , const ::com::sun::star::uno::Any & a )
+inline void SAL_CALL convertPropertyValue( sal_uInt32 & i  , const ::com::sun::star::uno::Any & a ) 
     SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) )
 {
     const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass();
-
+    
     if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) {
         a >>= i;
     }
@@ -270,30 +270,30 @@ inline void SAL_CALL convertPropertyValue( sal_uInt32 & i  , const ::com::sun::s
     else if ( ::com::sun::star::uno::TypeClass_CHAR  == tc ) {
         sal_Unicode c;
         c = *(sal_Unicode*) a.getValue();
-        i = ( sal_uInt32 ) c;
+        i = ( sal_uInt32 ) c;	
     }
     else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) {
         sal_Int16 i16;
         a >>= i16;
-        i = ( sal_uInt32 ) i16;
+        i = ( sal_uInt32 ) i16;	
     }
     else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) {
         sal_Bool b;
         b =  *((sal_Bool * )a.getValue());
-        i = ( sal_uInt32 ) b;
+        i = ( sal_uInt32 ) b;	
     }
     else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) {
         sal_Int8 i8;
         a >>= i8;
-        i = ( sal_uInt32 ) i8;
+        i = ( sal_uInt32 ) i8;	
     }
     else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) {
         sal_uInt16 i16;
         a >>= i16;
-        i = ( sal_uInt32    ) i16;
+        i = ( sal_uInt32	) i16;
     }
     else {
-        throw ::com::sun::star::lang::IllegalArgumentException();
+        throw ::com::sun::star::lang::IllegalArgumentException();	
     }
 }
 
@@ -309,25 +309,25 @@ inline void SAL_CALL convertPropertyValue( sal_Int16 & i  , const ::com::sun::st
     else if ( ::com::sun::star::uno::TypeClass_CHAR  == tc ) {
         sal_Unicode c;
         c = *(sal_Unicode*) a.getValue();
-        i = ( sal_Int16 ) c;
+        i = ( sal_Int16 ) c;	
     }
     else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) {
         sal_Bool b;
         b =  *((sal_Bool * )a.getValue());
-        i = ( sal_Int16 ) b;
+        i = ( sal_Int16 ) b;	
     }
     else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) {
         sal_Int8 i8 = 0;
         a >>= i8;
-        i = ( sal_Int16 ) i8;
+        i = ( sal_Int16 ) i8;	
     }
     else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) {
         sal_uInt16 i16 = 0;
         a >>= i16;
-        i = ( sal_Int16 ) i16;
+        i = ( sal_Int16	) i16;
     }
     else {
-        throw ::com::sun::star::lang::IllegalArgumentException();
+        throw ::com::sun::star::lang::IllegalArgumentException();	
     }
 }
 
@@ -342,17 +342,17 @@ inline void SAL_CALL convertPropertyValue( sal_uInt16 & i  , const ::com::sun::s
     else if ( ::com::sun::star::uno::TypeClass_CHAR  == tc ) {
         sal_Unicode c;
         c = *(sal_Unicode *) a.getValue();
-        i = ( sal_Int16 ) c;
+        i = ( sal_Int16 ) c;	
     }
     else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) {
         sal_Bool b;
         b =  *((sal_Bool * )a.getValue());
-        i = ( sal_Int16 ) b;
+        i = ( sal_Int16 ) b;	
     }
     else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) {
         sal_Int8 i8 = 0;
         a >>= i8;
-        i = ( sal_Int16 ) i8;
+        i = ( sal_Int16 ) i8;	
     }
     else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) {
         sal_Int16 i16 = 0;
@@ -360,7 +360,7 @@ inline void SAL_CALL convertPropertyValue( sal_uInt16 & i  , const ::com::sun::s
         i = ( sal_Int16 ) i16;
     }
     else {
-        throw ::com::sun::star::lang::IllegalArgumentException();
+        throw ::com::sun::star::lang::IllegalArgumentException();	
     }
 }
 
@@ -375,10 +375,10 @@ inline void SAL_CALL convertPropertyValue( sal_Int8 & i  , const ::com::sun::sta
     else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) {
         sal_Bool b;
         b =  *((sal_Bool * )a.getValue());
-        i = ( sal_Int8 ) b;
+        i = ( sal_Int8 ) b;	
     }
     else {
-        throw ::com::sun::star::lang::IllegalArgumentException();
+        throw ::com::sun::star::lang::IllegalArgumentException();	
     }
 }
 
@@ -386,9 +386,9 @@ inline void SAL_CALL convertPropertyValue( float &f , const ::com::sun::star::un
     SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) )
 {
     const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass();
-
+    
     if ( ::com::sun::star::uno::TypeClass_FLOAT == tc ) {
-        a >>= f;
+        a >>= f;	
     }
     else if( ::com::sun::star::uno::TypeClass_DOUBLE == tc ) {
          double d = 0;
@@ -397,16 +397,16 @@ inline void SAL_CALL convertPropertyValue( float &f , const ::com::sun::star::un
     }
     else if( ::com::sun::star::uno::TypeClass_HYPER == tc ) {
         sal_Int64 i64 = 0;
-        a >>= i64;
+        a >>= i64;	
         f = ( float ) i64;
     }
     // msci 4 does not support this conversion
-/*  else if( ::com::sun::star::uno::TypeClass_UNSIGNED_HYPER == tc ) {
+/*	else if( ::com::sun::star::uno::TypeClass_UNSIGNED_HYPER == tc ) {
         sal_uInt64 i64;
         a >>= i64;
         f = ( float ) i64;
     }
-*/  else if( ::com::sun::star::uno::TypeClass_LONG == tc ) {
+*/	else if( ::com::sun::star::uno::TypeClass_LONG == tc ) {
         sal_Int32 i32 = 0;
         a >>= i32;
         f = ( float )i32;
@@ -414,27 +414,27 @@ inline void SAL_CALL convertPropertyValue( float &f , const ::com::sun::star::un
     else if ( ::com::sun::star::uno::TypeClass_CHAR  == tc ) {
         sal_Unicode c;
         c = *(sal_Unicode*) a.getValue();
-        f = ( float ) c;
+        f = ( float ) c;	
     }
     else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) {
         sal_Int16 i16 = 0;
         a >>= i16;
-        f = ( float ) i16;
+        f = ( float ) i16;	
     }
     else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) {
         sal_Bool b;
         b =  *((sal_Bool * )a.getValue());
-        f = ( float ) b;
+        f = ( float ) b;	
     }
     else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) {
         sal_Int8 i8 = 0;
         a >>= i8;
-        f = ( float ) i8;
+        f = ( float ) i8;	
     }
     else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) {
         sal_uInt16 i16 = 0;
         a >>= i16;
-        f = ( float ) i16;
+        f = ( float	) i16;
     }
     else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) {
         sal_uInt32 i32 = 0;
@@ -442,7 +442,7 @@ inline void SAL_CALL convertPropertyValue( float &f , const ::com::sun::star::un
         f = ( float ) i32;
     }
     else {
-        throw ::com::sun::star::lang::IllegalArgumentException();
+        throw ::com::sun::star::lang::IllegalArgumentException();	
     }
 }
 
@@ -451,7 +451,7 @@ inline void SAL_CALL convertPropertyValue( double &d , const ::com::sun::star::u
     SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) )
 {
     const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass();
-
+    
     if( ::com::sun::star::uno::TypeClass_DOUBLE == tc ) {
          float f;
          a >>= f;
@@ -464,16 +464,16 @@ inline void SAL_CALL convertPropertyValue( double &d , const ::com::sun::star::u
     }
     else if( ::com::sun::star::uno::TypeClass_HYPER == tc ) {
         sal_Int64 i64;
-        a >>= i64;
+        a >>= i64;	
         d = (double) i64;
     }
-    // msci 4 does not support this
-/*  else if( ::com::sun::star::uno::TypeClass_UNSIGNED_HYPER == tc ) {
+    // msci 4 does not support this 
+/*	else if( ::com::sun::star::uno::TypeClass_UNSIGNED_HYPER == tc ) {
         sal_uInt64 i64;
         a >>= i64;
         d = (double) i64;
     }
-*/  else if( ::com::sun::star::uno::TypeClass_LONG == tc ) {
+*/	else if( ::com::sun::star::uno::TypeClass_LONG == tc ) {
         sal_Int32 i32;
         a >>= i32;
         d = (double)i32;
@@ -481,22 +481,22 @@ inline void SAL_CALL convertPropertyValue( double &d , const ::com::sun::star::u
     else if ( ::com::sun::star::uno::TypeClass_CHAR  == tc ) {
         sal_Unicode c;
         c = *(sal_Unicode*) a.getValue();
-        d = (double) c;
+        d = (double) c;	
     }
     else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) {
         sal_Int16 i16;
         a >>= i16;
-        d = (double) i16;
+        d = (double) i16;	
     }
     else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) {
         sal_Bool b;
         b =  *((sal_Bool * )a.getValue());
-        d = (double) b;
+        d = (double) b;	
     }
     else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) {
         sal_Int8 i8;
         a >>= i8;
-        d = (double) i8;
+        d = (double) i8;	
     }
     else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) {
         sal_uInt16 i16;
@@ -509,7 +509,7 @@ inline void SAL_CALL convertPropertyValue( double &d , const ::com::sun::star::u
         d = (double) i32;
     }
     else {
-        throw ::com::sun::star::lang::IllegalArgumentException();
+        throw ::com::sun::star::lang::IllegalArgumentException();	
     }
 }
 
@@ -517,7 +517,7 @@ inline void SAL_CALL convertPropertyValue( ::rtl::OUString &ow , const ::com::su
     SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) )
 {
     if( ::com::sun::star::uno::TypeClass_STRING == a.getValueType().getTypeClass() ) {
-        a >>= ow;
+        a >>= ow;	
     }
     else {
         throw ::com::sun::star::lang::IllegalArgumentException();
diff --git a/cppuhelper/inc/cppuhelper/queryinterface.hxx b/cppuhelper/inc/cppuhelper/queryinterface.hxx
index e67e9f9b9342..4efc77ae88a9 100644
--- a/cppuhelper/inc/cppuhelper/queryinterface.hxx
+++ b/cppuhelper/inc/cppuhelper/queryinterface.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
 #include "sal/types.h"
 
 namespace cppu
-{
+{     
 
 /** Compares demanded type to given template argument types.
 
@@ -56,7 +56,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
         return ::com::sun::star::uno::Any();
 }
 /** Compares demanded type to given template argument types.
-
+    
     @tplparam Interface1 interface type
     @tplparam Interface2 interface type
     @param rType demanded type
@@ -78,7 +78,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
         return ::com::sun::star::uno::Any();
 }
 /** Compares demanded type to given template argument types.
-
+    
     @tplparam Interface1 interface type
     @tplparam Interface2 interface type
     @tplparam Interface3 interface type
@@ -104,7 +104,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
         return ::com::sun::star::uno::Any();
 }
 /** Compares demanded type to given template argument types.
-
+    
     @tplparam Interface1 interface type
     @tplparam Interface2 interface type
     @tplparam Interface3 interface type
@@ -134,7 +134,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
         return ::com::sun::star::uno::Any();
 }
 /** Compares demanded type to given template argument types.
-
+    
     @tplparam Interface1 interface type
     @tplparam Interface2 interface type
     @tplparam Interface3 interface type
@@ -168,7 +168,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
         return ::com::sun::star::uno::Any();
 }
 /** Compares demanded type to given template argument types.
-
+    
     @tplparam Interface1 interface type
     @tplparam Interface2 interface type
     @tplparam Interface3 interface type
@@ -208,7 +208,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
         return ::com::sun::star::uno::Any();
 }
 /** Compares demanded type to given template argument types.
-
+    
     @tplparam Interface1 interface type
     @tplparam Interface2 interface type
     @tplparam Interface3 interface type
@@ -252,7 +252,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
         return ::com::sun::star::uno::Any();
 }
 /** Compares demanded type to given template argument types.
-
+    
     @tplparam Interface1 interface type
     @tplparam Interface2 interface type
     @tplparam Interface3 interface type
@@ -300,7 +300,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
         return ::com::sun::star::uno::Any();
 }
 /** Compares demanded type to given template argument types.
-
+    
     @tplparam Interface1 interface type
     @tplparam Interface2 interface type
     @tplparam Interface3 interface type
@@ -352,7 +352,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
         return ::com::sun::star::uno::Any();
 }
 /** Compares demanded type to given template argument types.
-
+    
     @tplparam Interface1 interface type
     @tplparam Interface2 interface type
     @tplparam Interface3 interface type
@@ -408,7 +408,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
         return ::com::sun::star::uno::Any();
 }
 /** Compares demanded type to given template argument types.
-
+    
     @tplparam Interface1 interface type
     @tplparam Interface2 interface type
     @tplparam Interface3 interface type
@@ -470,7 +470,7 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface(
         return ::com::sun::star::uno::Any();
 }
 /** Compares demanded type to given template argument types.
-
+    
     @tplparam Interface1 interface type
     @tplparam Interface2 interface type
     @tplparam Interface3 interface type
diff --git a/cppuhelper/inc/cppuhelper/servicefactory.hxx b/cppuhelper/inc/cppuhelper/servicefactory.hxx
index 366b7dd35e06..bdf9f9e6bce7 100644
--- a/cppuhelper/inc/cppuhelper/servicefactory.hxx
+++ b/cppuhelper/inc/cppuhelper/servicefactory.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,22 +38,22 @@ namespace cppu
 {
 
 /** Deprecated.  Use cppuhelper/bootstrap.hxx functions instead.
-
-    This bootstraps an initial service factory working on a registry. If the first or both
+    
+    This bootstraps an initial service factory working on a registry. If the first or both 
     parameters contain a value then the service factory is initialized with a simple registry
     or a nested registry. Otherwise the service factory must be initialized later with a valid
     registry.
-
+    
     @param rWriteRegistryFile
     file name of the simple registry or the first registry file of
     the nested registry which will be opened with read/write rights. This
     file will be created if necessary.
     @param rReadRegistryFile
-    file name of the second registry file of the nested registry
+    file name of the second registry file of the nested registry 
     which will be opened with readonly rights.
     @param bReadOnly
-    flag which specify that the first registry file will be opened with
-    readonly rights. Default is FALSE. If this flag is used the registry
+    flag which specify that the first registry file will be opened with 
+    readonly rights. Default is FALSE. If this flag is used the registry 
     will not be created if not exist.
     @param rBootstrapPath
     specifies a path where the bootstrap components could be find. If this
@@ -63,7 +63,7 @@ namespace cppu
 */
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > SAL_CALL
 createRegistryServiceFactory(
-    const ::rtl::OUString & rWriteRegistryFile,
+    const ::rtl::OUString & rWriteRegistryFile, 
     const ::rtl::OUString & rReadRegistryFile,
     sal_Bool bReadOnly = sal_False,
     const ::rtl::OUString & rBootstrapPath = ::rtl::OUString() )
@@ -71,15 +71,15 @@ createRegistryServiceFactory(
 
 
 /** Deprecated.  Use cppuhelper/bootstrap.hxx functions instead.
-
+    
     This bootstraps an initial service factory working on a registry file.
-
+    
     @param rRegistryFile
     file name of the registry to use/ create; if this is an empty
     string, the default registry is used instead
     @param bReadOnly
-    flag which specify that the registry file will be opened with
-    readonly rights. Default is FALSE. If this flag is used the registry
+    flag which specify that the registry file will be opened with 
+    readonly rights. Default is FALSE. If this flag is used the registry 
     will not be created if not exist.
     @param rBootstrapPath
     specifies a path where the bootstrap components could be find. If this
@@ -89,7 +89,7 @@ createRegistryServiceFactory(
 */
 inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > SAL_CALL
 createRegistryServiceFactory(
-    const ::rtl::OUString & rRegistryFile,
+    const ::rtl::OUString & rRegistryFile, 
     sal_Bool bReadOnly = sal_False,
     const ::rtl::OUString & rBootstrapPath = ::rtl::OUString() )
     SAL_THROW( (::com::sun::star::uno::Exception) )
@@ -99,7 +99,7 @@ createRegistryServiceFactory(
 }
 
 /** Deprecated.  Use cppuhelper/bootstrap.hxx functions instead.
-
+    
     This bootstraps a service factory without initialize a registry.
 
     @param rBootstrapPath
diff --git a/cppuhelper/inc/cppuhelper/shlib.hxx b/cppuhelper/inc/cppuhelper/shlib.hxx
index 4d19171db096..a4f52ca94eb5 100644
--- a/cppuhelper/inc/cppuhelper/shlib.hxx
+++ b/cppuhelper/inc/cppuhelper/shlib.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ namespace cppu
     (e.g. xxx.dll).  You can give parameter rPath to force lookup of the library in a specific
     directory.  The resulting path of the library will be checked against environment variable
     CPLD_ACCESSPATH if set.
-
+    
     @param rLibName name of the library
     @param rPath optional path
     @param rImplName implementation to be retrieved from the library
@@ -65,7 +65,7 @@ SAL_CALL loadSharedLibComponentFactory(
     (e.g. xxx.dll).  You can give parameter rPath to force lookup of the library in a specific
     directory.  The resulting path of the library will be checked against environment variable
     CPLD_ACCESSPATH if set.
-
+    
     @param rLibName name of the library
     @param rPath optional path
     @param xMgr service manager to be provided to the component
diff --git a/cppuhelper/inc/cppuhelper/stdidlclass.hxx b/cppuhelper/inc/cppuhelper/stdidlclass.hxx
index e7c8443ef0f3..576378b104b7 100644
--- a/cppuhelper/inc/cppuhelper/stdidlclass.hxx
+++ b/cppuhelper/inc/cppuhelper/stdidlclass.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,12 +38,12 @@ namespace cppu {
   @deprecated
 */
 ::com::sun::star::reflection::XIdlClass * SAL_CALL createStandardClassWithSequence(
-    const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr ,
-    const ::rtl::OUString & sImplementationName ,
+    const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr , 
+    const ::rtl::OUString & sImplementationName , 
     const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > & rSuperClass,
     const ::com::sun::star::uno::Sequence < ::rtl::OUString > &seq )
     SAL_THROW( () );
-
+                        
 
 
 /**
@@ -58,47 +58,47 @@ namespace cppu {
 
    @deprecated
  */
-template < class Interface1 >
+template < class Interface1 > 
 inline ::com::sun::star::reflection::XIdlClass * SAL_CALL
 //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass >
-createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
+createStandardClass(	const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
                          const ::rtl::OUString &sImplementationName  ,
                          const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass ,
                          const Interface1 *
                      )
     SAL_THROW( () )
-{
+{ 
     ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(1);
     seqInterface.getArray()[0] = Interface1::static_type().getTypeName();
-    return createStandardClassWithSequence(
+    return createStandardClassWithSequence( 	
                                             rSMgr,
                                             sImplementationName,
                                             rSuperClass,
-                                            seqInterface
+                                            seqInterface 
                                           );
 }
 
 
 
-template < class Interface1, class Interface2 >
+template < class Interface1, class Interface2 > 
 inline ::com::sun::star::reflection::XIdlClass * SAL_CALL
 //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass >
-createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
+createStandardClass(	const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
                          const ::rtl::OUString &sImplementationName  ,
                          const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass ,
                          const Interface1 *,
                          const Interface2 *
                      )
     SAL_THROW( () )
-{
+{ 
     ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(2);
     seqInterface.getArray()[0] = Interface1::static_type().getTypeName();
     seqInterface.getArray()[1] = Interface2::static_type().getTypeName();
-    return createStandardClassWithSequence(
+    return createStandardClassWithSequence( 	
                                             rSMgr,
                                             sImplementationName,
                                             rSuperClass,
-                                            seqInterface
+                                            seqInterface 
                                           );
 }
 
@@ -106,10 +106,10 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
 
 
 
-template < class Interface1, class Interface2 , class Interface3 >
+template < class Interface1, class Interface2 , class Interface3 > 
 inline ::com::sun::star::reflection::XIdlClass * SAL_CALL
 //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass >
-createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
+createStandardClass(	const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
                          const ::rtl::OUString &sImplementationName  ,
                          const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass ,
                          const Interface1 *,
@@ -117,16 +117,16 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
                          const Interface3 *
                      )
     SAL_THROW( () )
-{
+{ 
     ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(3);
     seqInterface.getArray()[0] = Interface1::static_type().getTypeName();
     seqInterface.getArray()[1] = Interface2::static_type().getTypeName();
     seqInterface.getArray()[2] = Interface3::static_type().getTypeName();
-    return createStandardClassWithSequence(
+    return createStandardClassWithSequence( 	
                                             rSMgr,
                                             sImplementationName,
                                             rSuperClass,
-                                            seqInterface
+                                            seqInterface 
                                           );
 }
 
@@ -134,10 +134,10 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
 
 
 
-template < class Interface1, class Interface2 , class Interface3 , class Interface4 >
+template < class Interface1, class Interface2 , class Interface3 , class Interface4 > 
 inline ::com::sun::star::reflection::XIdlClass * SAL_CALL
 //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass >
-createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
+createStandardClass(	const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
                          const ::rtl::OUString &sImplementationName  ,
                          const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass ,
                          const Interface1 *,
@@ -146,17 +146,17 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
                          const Interface4 *
                      )
     SAL_THROW( () )
-{
+{ 
     ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(4);
     seqInterface.getArray()[0] = Interface1::static_type().getTypeName();
     seqInterface.getArray()[1] = Interface2::static_type().getTypeName();
     seqInterface.getArray()[2] = Interface3::static_type().getTypeName();
     seqInterface.getArray()[3] = Interface4::static_type().getTypeName();
-    return createStandardClassWithSequence(
+    return createStandardClassWithSequence( 	
                                             rSMgr,
                                             sImplementationName,
                                             rSuperClass,
-                                            seqInterface
+                                            seqInterface 
                                           );
 }
 
@@ -166,10 +166,10 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
 
 
 
-template < class Interface1, class Interface2 , class Interface3 , class Interface4 , class Interface5 >
+template < class Interface1, class Interface2 , class Interface3 , class Interface4 , class Interface5 > 
 inline ::com::sun::star::reflection::XIdlClass * SAL_CALL
 //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass >
-createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
+createStandardClass(	const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
                          const ::rtl::OUString &sImplementationName  ,
                          const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass ,
                          const Interface1 *,
@@ -179,29 +179,29 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
                          const Interface5 *
                      )
     SAL_THROW( () )
-{
+{ 
     ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(5);
     seqInterface.getArray()[0] = Interface1::static_type().getTypeName();
     seqInterface.getArray()[1] = Interface2::static_type().getTypeName();
     seqInterface.getArray()[2] = Interface3::static_type().getTypeName();
     seqInterface.getArray()[3] = Interface4::static_type().getTypeName();
     seqInterface.getArray()[4] = Interface5::static_type().getTypeName();
-    return createStandardClassWithSequence(
+    return createStandardClassWithSequence( 	
                                             rSMgr,
                                             sImplementationName,
                                             rSuperClass,
-                                            seqInterface
+                                            seqInterface 
                                           );
 }
 
 
 
 
-template <  class Interface1, class Interface2 , class Interface3 , class Interface4 , class Interface5 ,
-            class Interface6 >
+template < 	class Interface1, class Interface2 , class Interface3 , class Interface4 , class Interface5 ,
+            class Interface6 > 
 inline ::com::sun::star::reflection::XIdlClass * SAL_CALL
 //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass >
-createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
+createStandardClass(	const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
                          const ::rtl::OUString &sImplementationName  ,
                          const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass ,
                          const Interface1 *,
@@ -212,7 +212,7 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
                          const Interface6 *
                      )
     SAL_THROW( () )
-{
+{ 
     ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(6);
     seqInterface.getArray()[0] = Interface1::static_type().getTypeName();
     seqInterface.getArray()[1] = Interface2::static_type().getTypeName();
@@ -220,11 +220,11 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
     seqInterface.getArray()[3] = Interface4::static_type().getTypeName();
     seqInterface.getArray()[4] = Interface5::static_type().getTypeName();
     seqInterface.getArray()[5] = Interface6::static_type().getTypeName();
-    return createStandardClassWithSequence(
+    return createStandardClassWithSequence( 	
                                             rSMgr,
                                             sImplementationName,
                                             rSuperClass,
-                                            seqInterface
+                                            seqInterface 
                                           );
 }
 
@@ -232,11 +232,11 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
 
 
 
-template <  class Interface1, class Interface2 , class Interface3 , class Interface4 , class Interface5 ,
-            class Interface6, class Interface7 >
+template < 	class Interface1, class Interface2 , class Interface3 , class Interface4 , class Interface5 ,
+            class Interface6, class Interface7 > 
 inline ::com::sun::star::reflection::XIdlClass * SAL_CALL
 //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass >
-createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
+createStandardClass(	const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
                          const ::rtl::OUString &sImplementationName  ,
                          const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass ,
                          const Interface1 *,
@@ -245,10 +245,10 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
                          const Interface4 *,
                          const Interface5 *,
                          const Interface6 *,
-                         const Interface7 *
+                         const Interface7 * 
                      )
     SAL_THROW( () )
-{
+{ 
     ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(7);
     seqInterface.getArray()[0] = Interface1::static_type().getTypeName();
     seqInterface.getArray()[1] = Interface2::static_type().getTypeName();
@@ -257,11 +257,11 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
     seqInterface.getArray()[4] = Interface5::static_type().getTypeName();
     seqInterface.getArray()[5] = Interface6::static_type().getTypeName();
     seqInterface.getArray()[6] = Interface7::static_type().getTypeName();
-    return createStandardClassWithSequence(
+    return createStandardClassWithSequence( 	
                                             rSMgr,
                                             sImplementationName,
                                             rSuperClass,
-                                            seqInterface
+                                            seqInterface 
                                           );
 }
 
@@ -270,11 +270,11 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
 
 
 
-template <  class Interface1, class Interface2, class Interface3 , class Interface4 , class Interface5 ,
-            class Interface6, class Interface7, class Interface8 >
+template < 	class Interface1, class Interface2, class Interface3 , class Interface4 , class Interface5 ,
+            class Interface6, class Interface7, class Interface8 > 
 inline ::com::sun::star::reflection::XIdlClass * SAL_CALL
 //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass >
-createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
+createStandardClass(	const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
                          const ::rtl::OUString &sImplementationName  ,
                          const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass ,
                          const Interface1 *,
@@ -287,7 +287,7 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
                          const Interface8 *
                      )
     SAL_THROW( () )
-{
+{ 
     ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(8);
     seqInterface.getArray()[0] = Interface1::static_type().getTypeName();
     seqInterface.getArray()[1] = Interface2::static_type().getTypeName();
@@ -297,22 +297,22 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
     seqInterface.getArray()[5] = Interface6::static_type().getTypeName();
     seqInterface.getArray()[6] = Interface7::static_type().getTypeName();
     seqInterface.getArray()[7] = Interface8::static_type().getTypeName();
-    return createStandardClassWithSequence(
+    return createStandardClassWithSequence( 	
                                             rSMgr,
                                             sImplementationName,
                                             rSuperClass,
-                                            seqInterface
+                                            seqInterface 
                                           );
 }
 
 
 
 
-template <  class Interface1, class Interface2, class Interface3 , class Interface4 , class Interface5 ,
-            class Interface6, class Interface7, class Interface8 , class Interface9 >
+template < 	class Interface1, class Interface2, class Interface3 , class Interface4 , class Interface5 ,
+            class Interface6, class Interface7, class Interface8 , class Interface9 > 
 inline ::com::sun::star::reflection::XIdlClass * SAL_CALL
 //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass >
-createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
+createStandardClass(	const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
                          const ::rtl::OUString &sImplementationName  ,
                          const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass ,
                          const Interface1 *,
@@ -326,7 +326,7 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
                          const Interface9 *
                      )
     SAL_THROW( () )
-{
+{ 
     ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(9);
     seqInterface.getArray()[0] = Interface1::static_type().getTypeName();
     seqInterface.getArray()[1] = Interface2::static_type().getTypeName();
@@ -337,20 +337,20 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
     seqInterface.getArray()[6] = Interface7::static_type().getTypeName();
     seqInterface.getArray()[7] = Interface8::static_type().getTypeName();
     seqInterface.getArray()[8] = Interface9::static_type().getTypeName();
-    return createStandardClassWithSequence(
+    return createStandardClassWithSequence( 	
                                             rSMgr,
                                             sImplementationName,
                                             rSuperClass,
-                                            seqInterface
+                                            seqInterface 
                                           );
 }
 
 
-template <  class Interface1, class Interface2, class Interface3 , class Interface4 , class Interface5 ,
-            class Interface6, class Interface7, class Interface8 , class Interface9 , class Interface10 >
+template < 	class Interface1, class Interface2, class Interface3 , class Interface4 , class Interface5 ,
+            class Interface6, class Interface7, class Interface8 , class Interface9 , class Interface10 > 
 inline ::com::sun::star::reflection::XIdlClass * SAL_CALL
 //inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass >
-createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
+createStandardClass(	const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr,
                          const ::rtl::OUString &sImplementationName  ,
                          const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > &rSuperClass ,
                          const Interface1 *,
@@ -365,7 +365,7 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
                          const Interface10 *
                      )
     SAL_THROW( () )
-{
+{ 
     ::com::sun::star::uno::Sequence < ::rtl::OUString > seqInterface(10);
     seqInterface.getArray()[0] = Interface1::static_type().getTypeName();
     seqInterface.getArray()[1] = Interface2::static_type().getTypeName();
@@ -377,11 +377,11 @@ createStandardClass(    const ::com::sun::star::uno::Reference < ::com::sun::sta
     seqInterface.getArray()[7] = Interface8::static_type().getTypeName();
     seqInterface.getArray()[8] = Interface9::static_type().getTypeName();
     seqInterface.getArray()[9] = Interface10::static_type().getTypeName();
-    return createStandardClassWithSequence(
+    return createStandardClassWithSequence( 	
                                             rSMgr,
                                             sImplementationName,
                                             rSuperClass,
-                                            seqInterface
+                                            seqInterface 
                                           );
 }
 
diff --git a/cppuhelper/inc/cppuhelper/typeprovider.hxx b/cppuhelper/inc/cppuhelper/typeprovider.hxx
index c434d54a7071..4e01bb5ac80a 100644
--- a/cppuhelper/inc/cppuhelper/typeprovider.hxx
+++ b/cppuhelper/inc/cppuhelper/typeprovider.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ namespace cppu
 class OTypeCollection
 {
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > _aTypes;
-
+    
 public:
     // these are here to force memory de/allocation to sal lib.
     /** @internal */
@@ -194,7 +194,7 @@ class OImplementationId
     mutable ::com::sun::star::uno::Sequence< sal_Int8 > * _pSeq;
     /** @internal */
     sal_Bool _bUseEthernetAddress;
-
+    
 public:
     // these are here to force memory de/allocation to sal lib.
     /** @internal */
@@ -209,7 +209,7 @@ public:
     /** @internal */
     inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () )
         {}
-
+    
     /** @internal */
     ~OImplementationId() SAL_THROW( () );
     /** Constructor.
@@ -230,9 +230,9 @@ public:
     inline OImplementationId( const OImplementationId & rId ) SAL_THROW( () )
         : _pSeq( new ::com::sun::star::uno::Sequence< sal_Int8 >( rId.getImplementationId() ) )
         {}
-
+    
     /** Called upon XTypeProvider::getImplementationId().
-
+        
         @return implementation id
     */
     ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() const SAL_THROW( () );
diff --git a/cppuhelper/inc/cppuhelper/unourl.hxx b/cppuhelper/inc/cppuhelper/unourl.hxx
index c0d70dee8e9b..55127ed84134 100644
--- a/cppuhelper/inc/cppuhelper/unourl.hxx
+++ b/cppuhelper/inc/cppuhelper/unourl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/inc/cppuhelper/weak.hxx b/cppuhelper/inc/cppuhelper/weak.hxx
index 14236d992310..2000557ea079 100644
--- a/cppuhelper/inc/cppuhelper/weak.hxx
+++ b/cppuhelper/inc/cppuhelper/weak.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@
 
 
 namespace cppu
-{
+{    
 
 /** @internal */
 class OWeakConnectionPoint;
@@ -45,7 +45,7 @@ class OWeakConnectionPoint;
     weakly (by a ::com::sun::star::uno::WeakReference).
     This implementation copes with reference counting.  Upon last release(), the virtual dtor
     is called.
-
+    
     @derive
     Inherit from this class and delegate acquire()/ release() calls.
 */
@@ -53,39 +53,39 @@ class OWeakObject : public ::com::sun::star::uno::XWeak
 {
     /** @internal */
     friend class OWeakConnectionPoint;
-
+    
 protected:
     /** Virtual dtor.
-
+        
         @attention
         Despite the fact that a RuntimeException is allowed to be thrown, you must not throw any
         exception upon destruction!
     */
     virtual ~OWeakObject() SAL_THROW( (::com::sun::star::uno::RuntimeException) );
-
+    
     /** disposes and resets m_pWeakConnectionPoint
         @precond
             m_refCount equals 0
     */
     void    disposeWeakConnectionPoint();
-
+    
     /** reference count.
-
+        
         @attention
         Don't modify manually!  Use acquire() and release().
     */
     oslInterlockedCount m_refCount;
-
+    
     /** Container of all weak reference listeners and the connection point from the weak reference.
         @internal
     */
     OWeakConnectionPoint * m_pWeakConnectionPoint;
-
+    
     /** reserved for future use. do not use.
         @internal
     */
     void * m_pReserved;
-
+    
 public:
     // these are here to force memory de/allocation to sal lib.
     /** @internal */
@@ -100,7 +100,7 @@ public:
     /** @internal */
     inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () )
         {}
-
+    
 #ifdef _MSC_VER
     /** Default Constructor.  Sets the reference count to zero.
         Accidentally occurs in msvc mapfile = > had to be outlined.
@@ -115,7 +115,7 @@ public:
         {}
 #endif
     /** Dummy copy constructor.  Set the reference count to zero.
-
+        
         @param rObj dummy param
     */
     inline OWeakObject( const OWeakObject & ) SAL_THROW( () )
@@ -124,16 +124,16 @@ public:
         , m_pWeakConnectionPoint( 0 )
         {}
     /** Dummy assignment operator. Does not affect reference count.
-
+        
         @return this OWeakObject
     */
     inline OWeakObject & SAL_CALL operator = ( const OWeakObject &)
         SAL_THROW( () )
         { return *this; }
-
+    
     /** Basic queryInterface() implementation supporting ::com::sun::star::uno::XWeak and
         ::com::sun::star::uno::XInterface.
-
+        
         @param rType demanded type
         @return demanded type or empty any
     */
@@ -148,16 +148,16 @@ public:
     */
     virtual void SAL_CALL release()
         throw ();
-
+    
     /** XWeak::queryAdapter() implementation
 
         @return a ::com::sun::star::uno::XAdapter reference
     */
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAdapter > SAL_CALL queryAdapter()
         throw (::com::sun::star::uno::RuntimeException);
-
+    
     /** Cast operator to XInterface reference.
-
+        
         @return XInterface reference
     */
     inline SAL_CALL operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > () SAL_THROW( () )
diff --git a/cppuhelper/inc/cppuhelper/weakagg.hxx b/cppuhelper/inc/cppuhelper/weakagg.hxx
index adc3b7987d04..aac14997e5a7 100644
--- a/cppuhelper/inc/cppuhelper/weakagg.hxx
+++ b/cppuhelper/inc/cppuhelper/weakagg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,14 +33,14 @@
 
 
 namespace cppu
-{
+{    
 
 /** Base class to implement an UNO object supporting weak references, i.e. the object can be held
     weakly (by a ::com::sun::star::uno::WeakReference) and aggregation, i.e. the object can be
     aggregated by another (delegator).
     This implementation copes with reference counting.  Upon last release(), the virtual dtor
     is called.
-
+    
     @derive
     Inherit from this class and delegate acquire()/ release() calls.  Re-implement
     XAggregation::queryInterface().
@@ -54,7 +54,7 @@ public:
     */
     inline OWeakAggObject() SAL_THROW( () )
         {}
-
+    
     /** If a delegator is set, then the delegators gets acquired.  Otherwise call is delegated to
         base class ::cppu::OWeakObject.
     */
@@ -66,7 +66,7 @@ public:
     /** If a delegator is set, then the delegator is queried for the demanded interface.  If the
         delegator cannot provide the demanded interface, it calls queryAggregation() on its
         aggregated objects.
-
+        
         @param rType demanded interface type
         @return demanded type or empty any
         @see queryAggregation.
@@ -75,14 +75,14 @@ public:
         throw(::com::sun::star::uno::RuntimeException);
 
     /** Set the delegator.  The delegator member reference is a weak reference.
-
+        
         @param Delegator the object that delegate its queryInterface to this aggregate.
     */
     virtual void SAL_CALL setDelegator( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Delegator )
         throw(::com::sun::star::uno::RuntimeException);
     /** Called by the delegator or queryInterface. Re-implement this method instead of
         queryInterface.
-
+        
         @see queryInterface
     */
     virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType )
@@ -96,7 +96,7 @@ protected:
         exception upon destruction!
     */
     virtual ~OWeakAggObject() SAL_THROW( (::com::sun::star::uno::RuntimeException) );
-
+    
     /** weak reference to delegator.
     */
     ::com::sun::star::uno::WeakReferenceHelper xDelegator;
diff --git a/cppuhelper/inc/cppuhelper/weakref.hxx b/cppuhelper/inc/cppuhelper/weakref.hxx
index f138a8aeaf10..54a313b2d5df 100644
--- a/cppuhelper/inc/cppuhelper/weakref.hxx
+++ b/cppuhelper/inc/cppuhelper/weakref.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,13 +32,13 @@
 
 
 namespace com
-{
+{    
 namespace sun
-{
+{    
 namespace star
-{
+{    
 namespace uno
-{
+{    
 
 /** @internal */
 class OWeakRefListener;
@@ -53,8 +53,8 @@ public:
     */
     inline WeakReferenceHelper() SAL_THROW( () )
         : m_pImpl( 0 )
-        {}
-
+        {}	
+    
     /** Copy ctor.  Initialize this reference with the same interface as in rWeakRef.
 
         @param rWeakRef another weak ref
@@ -62,7 +62,7 @@ public:
     WeakReferenceHelper( const WeakReferenceHelper & rWeakRef ) SAL_THROW( () );
     /** Initialize this reference with the hard interface reference xInt. If the implementation
         behind xInt does not support XWeak or XInt is null then this reference will be null.
-
+        
         @param xInt another hard interface reference
     */
     WeakReferenceHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xInt )
@@ -70,9 +70,9 @@ public:
     /** Releases this reference.
     */
     ~WeakReferenceHelper() SAL_THROW( () );
-
+    
     /** Releases this reference and takes over rWeakRef.
-
+        
         @param rWeakRef another weak ref
     */
     WeakReferenceHelper & SAL_CALL operator = ( const WeakReferenceHelper & rWeakRef ) SAL_THROW( () );
@@ -94,14 +94,14 @@ public:
     */
     inline sal_Bool SAL_CALL operator == ( const WeakReferenceHelper & rObj ) const SAL_THROW( () )
         { return (get() == rObj.get()); }
-
+    
     /**  Gets a hard reference to the object.
-
+         
          @return hard reference or null, if the weakly referenced interface has gone
     */
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL get() const SAL_THROW( () );
     /**  Gets a hard reference to the object.
-
+         
          @return hard reference or null, if the weakly referenced interface has gone
     */
     inline SAL_CALL operator Reference< XInterface > () const SAL_THROW( () )
@@ -125,16 +125,16 @@ protected:
 */
 template< class interface_type >
 class WeakReference : public WeakReferenceHelper
-{
+{	
 public:
     /** Default ctor.  Creates an empty weak reference.
     */
     inline WeakReference() SAL_THROW( () )
         : WeakReferenceHelper()
         {}
-
+    
     /** Copy ctor.  Initialize this reference with a hard reference.
-
+        
         @param rRef another hard ref
     */
     inline WeakReference( const Reference< interface_type > & rRef ) SAL_THROW( () )
@@ -155,7 +155,7 @@ public:
         { WeakReferenceHelper::operator=(xInt); return *this; }
 
     /**  Gets a hard reference to the object.
-
+         
          @return hard reference or null, if the weakly referenced interface has gone
     */
     inline SAL_CALL operator Reference< interface_type > () const SAL_THROW( () )
diff --git a/cppuhelper/inc/pch/precompiled_cppuhelper.cxx b/cppuhelper/inc/pch/precompiled_cppuhelper.cxx
index 28a0019ac80e..d8090977e1ff 100644
--- a/cppuhelper/inc/pch/precompiled_cppuhelper.cxx
+++ b/cppuhelper/inc/pch/precompiled_cppuhelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/inc/pch/precompiled_cppuhelper.hxx b/cppuhelper/inc/pch/precompiled_cppuhelper.hxx
index 9a601079de5b..b1a1df1a14f3 100644
--- a/cppuhelper/inc/pch/precompiled_cppuhelper.hxx
+++ b/cppuhelper/inc/pch/precompiled_cppuhelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
index 8c76af380d3c..4f47fd449a87 100644
--- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
+++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/qa/propertysetmixin/JavaSupplier.java b/cppuhelper/qa/propertysetmixin/JavaSupplier.java
index 2d37c8901077..513f207aba14 100644
--- a/cppuhelper/qa/propertysetmixin/JavaSupplier.java
+++ b/cppuhelper/qa/propertysetmixin/JavaSupplier.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
index 4769904687b1..adf161083398 100644
--- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -411,7 +411,7 @@ css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() {
 
 cppu::ImplementationEntry entries[] = {
     { &create, &getImplementationName, &getSupportedServiceNames,
-      &cppu::createSingleComponentFactory, 0, 0 },
+      &cppu::createSingleComponentFactory, 0, 0 }, 
     { 0, 0, 0, 0, 0, 0 } };
 
 }
diff --git a/cppuhelper/qa/propertysetmixin/test.map b/cppuhelper/qa/propertysetmixin/test.map
index 3308588ef6f8..0dbbcc5a7372 100644
--- a/cppuhelper/qa/propertysetmixin/test.map
+++ b/cppuhelper/qa/propertysetmixin/test.map
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
index eea2e0f6cc2b..3b05dc3f3eb2 100644
--- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/qa/propertysetmixin/types.idl b/cppuhelper/qa/propertysetmixin/types.idl
index 09232648a8f0..cd8659362367 100644
--- a/cppuhelper/qa/propertysetmixin/types.idl
+++ b/cppuhelper/qa/propertysetmixin/types.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx
index c7d2de6dbb99..c37d08a28a24 100644
--- a/cppuhelper/qa/unourl/cppu_unourl.cxx
+++ b/cppuhelper/qa/unourl/cppu_unourl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx
index eb93659e1e64..9e0040b55666 100644
--- a/cppuhelper/qa/weak/test_weak.cxx
+++ b/cppuhelper/qa/weak/test_weak.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/qa/weak/version.map b/cppuhelper/qa/weak/version.map
index 7321bbca16ad..f313c44bd7ad 100644
--- a/cppuhelper/qa/weak/version.map
+++ b/cppuhelper/qa/weak/version.map
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/source/access_control.cxx b/cppuhelper/source/access_control.cxx
index b3c8e0c0b16d..f71e6b217726 100644
--- a/cppuhelper/source/access_control.cxx
+++ b/cppuhelper/source/access_control.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,9 +46,9 @@ using namespace ::com::sun::star::uno;
 
 namespace
 {
-    inline OUString str_ac_singleton()
-    {
-        return OUSTR("/singletons/com.sun.star.security.theAccessController");
+    inline OUString str_ac_singleton() 
+    { 
+        return OUSTR("/singletons/com.sun.star.security.theAccessController"); 
     }
 }
 
@@ -110,11 +110,11 @@ inline void __checkPermission(
     __permission perm;
     perm.m_str1 = str1;
     perm.m_str2 = str2;
-
+    
     uno_Any a;
     a.pType = type.getTypeLibType();
     a.pData = &perm;
-
+    
     xController->checkPermission( * static_cast< Any * >( &a ) );
 }
 //__________________________________________________________________________________________________
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 245714827145..1a73a1d4d4fe 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -135,7 +135,7 @@ void addFactories(
     {
         OUString lib( OUString::createFromAscii( *ppNames++ ) );
         OUString implName( OUString::createFromAscii( *ppNames++ ) );
-
+        
         Any aFac( makeAny( loadSharedLibComponentFactory(
                                lib, bootstrapPath, implName, xSF, xKey ) ) );
         xSet->insert( aFac );
@@ -239,7 +239,7 @@ OUString findBoostrapArgument(
         result_buf.append( arg_name.toAsciiLowerCase() );
         result_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(".rdb") );
         result = result_buf.makeStringAndClear();
-
+        
 #if OSL_DEBUG_LEVEL > 1
         OString result_dbg =
             OUStringToOString(result, RTL_TEXTENCODING_ASCII_US);
@@ -323,7 +323,7 @@ Reference< registry::XSimpleRegistry > nestRegistries(
         bool optional = ('?' == rdb_name[ 0 ]);
         if (optional)
             rdb_name = rdb_name.copy( 1 );
-
+        
         try
         {
             Reference<registry::XSimpleRegistry> simpleRegistry(
@@ -411,18 +411,18 @@ SAL_CALL defaultBootstrap_InitialComponentContext(
     sal_Bool bFallenback_types;
     OUString cls_uno_types =
         findBoostrapArgument( bootstrap, OUSTR("TYPES"), &bFallenback_types );
-
+    
     Reference<registry::XSimpleRegistry> types_xRegistry =
         nestRegistries(
             iniDir, xSimRegFac, xNesRegFac, cls_uno_types,
             OUString(), sal_False, bFallenback_types );
-
+    
     // ==== bootstrap from services registry ====
-
+    
     sal_Bool bFallenback_services;
     OUString cls_uno_services = findBoostrapArgument(
         bootstrap, OUSTR("SERVICES"), &bFallenback_services );
-
+    
     sal_Bool fallenBackWriteRegistry;
     OUString write_rdb = findBoostrapArgument(
         bootstrap, OUSTR("WRITERDB"), &fallenBackWriteRegistry );
@@ -431,16 +431,16 @@ SAL_CALL defaultBootstrap_InitialComponentContext(
         // no standard write rdb anymore
         write_rdb = OUString();
     }
-
+    
     Reference<registry::XSimpleRegistry> services_xRegistry = nestRegistries(
         iniDir, xSimRegFac, xNesRegFac, cls_uno_services, write_rdb,
         !fallenBackWriteRegistry, bFallenback_services );
-
+    
     Reference< XComponentContext > xContext(
         bootstrapInitialContext(
             smgr_XMultiComponentFactory, types_xRegistry, services_xRegistry,
             bootstrapPath, bootstrap ) );
-
+    
     // initialize sf
     Reference< lang::XInitialization > xInit(
         smgr_XMultiComponentFactory, UNO_QUERY );
@@ -448,7 +448,7 @@ SAL_CALL defaultBootstrap_InitialComponentContext(
     Sequence< Any > aSFInit( 1 );
     aSFInit[ 0 ] <<= services_xRegistry;
     xInit->initialize( aSFInit );
-
+    
     return xContext;
 }
 
@@ -497,8 +497,8 @@ BootstrapException & BootstrapException::operator=( const BootstrapException & e
 }
 
 const ::rtl::OUString & BootstrapException::getMessage() const
-{
-    return m_aMessage;
+{ 
+    return m_aMessage; 
 }
 
 Reference< XComponentContext > SAL_CALL bootstrap()
@@ -541,7 +541,7 @@ Reference< XComponentContext > SAL_CALL bootstrap()
         }
 
         // create default local component context
-        Reference< XComponentContext > xLocalContext(
+        Reference< XComponentContext > xLocalContext( 
             defaultBootstrap_InitialComponentContext() );
         if ( !xLocalContext.is() )
             throw BootstrapException( OUSTR( "no local component context!" ) );
@@ -551,7 +551,7 @@ Reference< XComponentContext > SAL_CALL bootstrap()
         if ( hPool == 0 )
             throw BootstrapException( OUSTR( "cannot create random pool!" ) );
         sal_uInt8 bytes[ 16 ];
-        if ( rtl_random_getBytes( hPool, bytes, ARLEN( bytes ) )
+        if ( rtl_random_getBytes( hPool, bytes, ARLEN( bytes ) ) 
             != rtl_Random_E_None )
             throw BootstrapException( OUSTR( "random pool error!" ) );
         rtl_random_destroyPool( hPool );
@@ -621,7 +621,7 @@ Reference< XComponentContext > SAL_CALL bootstrap()
         OSL_ASSERT( buf.getLength() == 0 );
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "uno:pipe,name=" ) );
         buf.append( sPipeName );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
+        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( 
             ";urp;StarOffice.ComponentContext" ) );
         OUString sConnectString( buf.makeStringAndClear() );
 
@@ -631,7 +631,7 @@ Reference< XComponentContext > SAL_CALL bootstrap()
             try
             {
                 // try to connect to office
-                xRemoteContext.set(
+                xRemoteContext.set( 
                     xUrlResolver->resolve( sConnectString ), UNO_QUERY_THROW );
                 break;
             }
@@ -645,7 +645,7 @@ Reference< XComponentContext > SAL_CALL bootstrap()
     }
     catch ( Exception & e )
     {
-        throw BootstrapException(
+        throw BootstrapException( 
             OUSTR( "unexpected UNO exception caught: " ) + e.Message );
     }
 
diff --git a/cppuhelper/source/cc5_solaris_sparc.map b/cppuhelper/source/cc5_solaris_sparc.map
index d43ea690e11a..090f8a1cca2e 100755
--- a/cppuhelper/source/cc5_solaris_sparc.map
+++ b/cppuhelper/source/cc5_solaris_sparc.map
@@ -326,7 +326,7 @@ UDK_3.1 {
         __1cEcppubL__RTTI__1CpnEcppuSBootstrapException__;
         __1cEcppubM__RTTI__1CpknEcppuSBootstrapException__;
 } UDK_3_0_0;
-
+                    
 UDK_3.2 {
     global:
     __1cEcppubL__RTTI__1nEcppuUPropertySetMixinImpl__;
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index 13ee0d8f60f9..2add1357b5cf 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,9 +44,9 @@ using namespace com::sun::star::lang;
 namespace cppu
 {
 
-//  ----------------------------------------------------
-//  class OComponentHelper
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class OComponentHelper
+//	----------------------------------------------------
 
 OComponentHelper::OComponentHelper( Mutex & rMutex ) SAL_THROW( () )
     : rBHelper( rMutex )
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index de1d106912bd..306490aa1616 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -2,7 +2,7 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -152,7 +152,7 @@ static OUString val2str( void const * pVal, typelib_TypeDescriptionReference * p
         TYPELIB_DANGER_GET( &pElementTypeDescr, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType );
 
         sal_Int32 nElementSize = pElementTypeDescr->nSize;
-        sal_Int32 nElements    = pSequence->nElements;
+        sal_Int32 nElements	   = pSequence->nElements;
 
         if (nElements)
         {
@@ -385,7 +385,7 @@ public:
         throw (RuntimeException);
     virtual Reference<lang::XMultiComponentFactory> SAL_CALL getServiceManager()
         throw (RuntimeException);
-
+    
     // XNameContainer
     virtual void SAL_CALL insertByName(
         OUString const & name, Any const & element )
@@ -545,20 +545,20 @@ Any ComponentContext::lookupMap( OUString const & rName )
         return Any();
     }
 #endif
-
+    
     ResettableMutexGuard guard( m_mutex );
     t_map::const_iterator iFind( m_map.find( rName ) );
     if (iFind == m_map.end())
         return Any();
-
+    
     t_map::mapped_type pEntry = iFind->second;
     if (! pEntry->lateInit)
         return pEntry->value;
-
+    
     // late init singleton entry
     Reference< XInterface > xInstance;
     guard.clear();
-
+    
     try
     {
         Any usesService( getValueByName( rName + OUSTR("/service") ) );
@@ -569,7 +569,7 @@ Any ComponentContext::lookupMap( OUString const & rName )
             args.realloc( 1 );
             args[ 0 ] = args_;
         }
-
+        
         Reference< lang::XSingleComponentFactory > xFac;
         if (usesService >>= xFac) // try via factory
         {
@@ -623,14 +623,14 @@ Any ComponentContext::lookupMap( OUString const & rName )
         throw lang::WrappedTargetRuntimeException(
             buf.makeStringAndClear(), static_cast<OWeakObject *>(this),caught );
     }
-
+    
     if (! xInstance.is())
     {
         throw RuntimeException(
             OUSTR("no service object raising singleton ") + rName,
             static_cast<OWeakObject *>(this) );
     }
-
+    
     Any ret;
     guard.reset();
     iFind = m_map.find( rName );
@@ -645,7 +645,7 @@ Any ComponentContext::lookupMap( OUString const & rName )
         }
         else
             ret = pEntry->value;
-    }
+    }    
     guard.clear();
     try_dispose( xInstance );
     return ret;
@@ -663,7 +663,7 @@ Any ComponentContext::getValueByName( OUString const & rName )
         else
             return makeAny( Reference<XComponentContext>(this) );
     }
-
+    
     Any ret( lookupMap( rName ) );
     if (!ret.hasValue() && m_xDelegate.is())
     {
@@ -883,7 +883,7 @@ Reference< XComponentContext > SAL_CALL createComponentContext(
     {
         mapped_entries[nPos].bLateInitService = pEntries[nPos].bLateInitService;
         mapped_entries[nPos].name             = pEntries[nPos].name;
-
+        
         uno_type_any_constructAndConvert(&mapped_entries[nPos].value,
                                          const_cast<void *>(pEntries[nPos].value.getValue()),
                                          pEntries[nPos].value.getValueTypeRef(),
diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index 234e57569a73..dd5c5bd12c40 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@ using cppuhelper::detail::XExceptionThrower;
 struct ExceptionThrower : public uno_Interface, XExceptionThrower
 {
     inline ExceptionThrower();
-
+    
 public:
     static ExceptionThrower * get();
     static inline Type const & getCppuType()
@@ -65,13 +65,13 @@ public:
         return ::getCppuType(
             reinterpret_cast< Reference< XExceptionThrower > const * >(0) );
     }
-
+    
     // XInterface
     virtual Any SAL_CALL queryInterface( Type const & type )
         throw (RuntimeException);
     virtual void SAL_CALL acquire() throw ();
     virtual void SAL_CALL release() throw ();
-
+    
     // XExceptionThrower
     virtual void SAL_CALL throwException( Any const & exc ) throw (Exception);
     virtual void SAL_CALL rethrowException() throw (Exception);
@@ -91,7 +91,7 @@ static void SAL_CALL ExceptionThrower_dispatch(
     void * pReturn, void * pArgs [], uno_Any ** ppException )
 {
     OSL_ASSERT( pMemberType->eTypeClass == typelib_TypeClass_INTERFACE_METHOD );
-
+    
     switch (reinterpret_cast< typelib_InterfaceMemberTypeDescription * >(
                 const_cast< typelib_TypeDescription * >( pMemberType ) )->
             nPosition)
@@ -222,7 +222,7 @@ void SAL_CALL throwException( Any const & exc ) SAL_THROW( (Exception) )
                   "(must be derived from com::sun::star::uno::Exception)!"),
             Reference< XInterface >() );
     }
-
+    
     Mapping uno2cpp(Environment(OUSTR(UNO_LB_UNO)), Environment::getCurrent());
     if (! uno2cpp.is())
     {
@@ -230,7 +230,7 @@ void SAL_CALL throwException( Any const & exc ) SAL_THROW( (Exception) )
             OUSTR("cannot get binary UNO to C++ mapping!"),
             Reference< XInterface >() );
     }
-
+    
     Reference< XExceptionThrower > xThrower;
     uno2cpp.mapInterface(
         reinterpret_cast< void ** >( &xThrower ),
@@ -257,11 +257,11 @@ Any SAL_CALL getCaughtException()
             OUSTR("cannot get binary UNO to C++ mapping!"),
             Reference< XInterface >() );
     }
-
+    
     typelib_TypeDescription * pTD = 0;
     TYPELIB_DANGER_GET(
         &pTD, ExceptionThrower::getCppuType().getTypeLibType() );
-
+    
     UnoInterfaceReference unoI;
     cpp2uno.mapInterface(
         reinterpret_cast< void ** >( &unoI.m_pUnoI ),
@@ -273,21 +273,21 @@ Any SAL_CALL getCaughtException()
         &pMemberTD,
         reinterpret_cast< typelib_InterfaceTypeDescription * >( pTD )->
         ppMembers[ 1 ] /* rethrowException() */ );
-
+    
     uno_Any exc_mem;
     uno_Any * exc = &exc_mem;
     unoI.dispatch( pMemberTD, 0, 0, &exc );
-
+    
     TYPELIB_DANGER_RELEASE( pMemberTD );
     TYPELIB_DANGER_RELEASE( pTD );
-
+    
     if (exc == 0)
     {
         throw RuntimeException(
             OUSTR("rethrowing C++ exception failed!"),
             Reference< XInterface >() );
     }
-
+    
     Any ret;
     uno_any_destruct( &ret, reinterpret_cast< uno_ReleaseFunc >(cpp_release) );
     uno_type_any_constructAndConvert(
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index ab23cf7a1d9e..214258816577 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -136,15 +136,15 @@ protected:
      * in the createInstance and createInstanceWithArguments methods.
      * @return the newly created instance. Do not return a previous (one instance) instance.
      */
-    virtual Reference<XInterface >  createInstanceEveryTime(
+    virtual Reference<XInterface >	createInstanceEveryTime(
         Reference< XComponentContext > const & xContext )
         throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
     Reference<XMultiServiceFactory > xSMgr;
-    ComponentInstantiation           pCreateFunction;
+    ComponentInstantiation			 pCreateFunction;
     ComponentFactoryFunc             m_fptr;
-    Sequence< OUString >             aServiceNames;
-    OUString                         aImplementationName;
+    Sequence< OUString >			 aServiceNames;
+    OUString						 aImplementationName;
 };
 OSingleFactoryHelper::~OSingleFactoryHelper()
 {
@@ -273,7 +273,7 @@ Sequence< OUString > OSingleFactoryHelper::getSupportedServiceNames(void)
 //----------------------------------------------------------------------
 struct OFactoryComponentHelper_Mutex
 {
-    Mutex   aMutex;
+    Mutex	aMutex;
 };
 
 class OFactoryComponentHelper
@@ -374,9 +374,9 @@ public:
     void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
 
 private:
-    Reference<XInterface >  xTheInstance;
-    sal_Bool                bOneInstance;
-    rtl_ModuleCount *       pModuleCount;
+    Reference<XInterface >	xTheInstance;
+    sal_Bool				bOneInstance;
+    rtl_ModuleCount	*		pModuleCount;
 protected:
     // needed for implementing XUnloadingPreference in inheriting classes
     sal_Bool isOneInstance() {return bOneInstance;}
@@ -549,7 +549,7 @@ sal_Bool SAL_CALL OFactoryComponentHelper::releaseOnNotification() throw(::com::
 //-----------------------------------------------------------------------------
 class ORegistryFactoryHelper : public OFactoryComponentHelper,
                                public OPropertySetHelper
-
+    
 {
 public:
     ORegistryFactoryHelper(
@@ -562,7 +562,7 @@ public:
               OPropertySetHelper( OComponentHelper::rBHelper ),
               xImplementationKey( xImplementationKey_ )
         {}
-
+    
     // XInterface
     virtual Any SAL_CALL queryInterface( Type const & type )
         throw (RuntimeException);
@@ -587,7 +587,7 @@ public:
     using OPropertySetHelper::getFastPropertyValue;
     virtual void SAL_CALL getFastPropertyValue(
         Any & rValue, sal_Int32 nHandle ) const;
-
+    
     // OSingleFactoryHelper
     Reference<XInterface > createInstanceEveryTime(
         Reference< XComponentContext > const & xContext )
@@ -615,10 +615,10 @@ private:
         throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
     /** The registry key of the implementation section */
-    Reference<XRegistryKey >    xImplementationKey;
+    Reference<XRegistryKey >	xImplementationKey;
     /** The factory created with the loader. */
-    Reference<XSingleComponentFactory > xModuleFactory;
-    Reference<XSingleServiceFactory >   xModuleFactoryDepr;
+    Reference<XSingleComponentFactory >	xModuleFactory;
+    Reference<XSingleServiceFactory >	xModuleFactoryDepr;
     Reference< beans::XPropertySetInfo > m_xInfo;
     ::std::auto_ptr< IPropertyArrayHelper > m_property_array_helper;
 protected:
@@ -880,7 +880,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
         }
     }
 
-    Reference< XInterface > xFactory;
+    Reference< XInterface >	xFactory;
     if( aActivatorName.getLength() != 0 )
     {
         Reference<XInterface > x = xSMgr->createInstance( aActivatorName );
@@ -961,7 +961,7 @@ sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification() throw(::com::s
 class OFactoryProxyHelper : public WeakImplHelper3< XServiceInfo, XSingleServiceFactory,
                                                     XUnloadingPreference >
 {
-    Reference<XSingleServiceFactory >   xFactory;
+    Reference<XSingleServiceFactory >	xFactory;
 
 public:
 
diff --git a/cppuhelper/source/findsofficepath.c b/cppuhelper/source/findsofficepath.c
index 0a0cea0ff8b3..e1fe9bb6abd7 100644
--- a/cppuhelper/source/findsofficepath.c
+++ b/cppuhelper/source/findsofficepath.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -94,7 +94,7 @@ static char* platformSpecific()
     const char* SUBKEYNAME = "Software\\LibreOffice\\UNO\\InstallPath";
 
     char* path = NULL;
-
+    
     /* read the key's default value from HKEY_CURRENT_USER */
     path = getPathFromRegistryKey( HKEY_CURRENT_USER, SUBKEYNAME );
 
@@ -112,13 +112,13 @@ static char* platformSpecific()
 #include <unistd.h>
 #include <limits.h>
 
-/*
+/*     
  * Gets the installation path from the PATH environment variable.
  *
  * <p>An installation is found, if the executable 'soffice' or a symbolic link
  * is in one of the directories listed in the PATH environment variable.</p>
  *
- * @return the installation path or NULL, if no installation was found or
+ * @return the installation path or NULL, if no installation was found or 
  *         if an error occured
  */
 static char* platformSpecific()
diff --git a/cppuhelper/source/gcc3.map b/cppuhelper/source/gcc3.map
index 59ab83e34e82..88e58df6551b 100644
--- a/cppuhelper/source/gcc3.map
+++ b/cppuhelper/source/gcc3.map
@@ -327,7 +327,7 @@ UDK_3.1 {
 
 UDK_3.2 {
     global:
-       _ZN4cppu20PropertySetMixinImpl10prepareSetERKN3rtl8OUStringERKN3com3sun4star3uno3AnyESB_PNS0_14BoundListenersE;
+       _ZN4cppu20PropertySetMixinImpl10prepareSetERKN3rtl8OUStringERKN3com3sun4star3uno3AnyESB_PNS0_14BoundListenersE; 
         _ZN4cppu20PropertySetMixinImpl14BoundListenersC1Ev;
         _ZN4cppu20PropertySetMixinImpl14BoundListenersC2Ev;
         _ZN4cppu20PropertySetMixinImpl14BoundListenersD1Ev;
diff --git a/cppuhelper/source/gcc3os2.map b/cppuhelper/source/gcc3os2.map
index 681a076cee79..2c3bd2d64b5c 100644
--- a/cppuhelper/source/gcc3os2.map
+++ b/cppuhelper/source/gcc3os2.map
@@ -328,7 +328,7 @@ UDK_3.1 {
 
 UDK_3.2 {
     global:
-       _ZN4cppu20PropertySetMixinImpl10prepareSetERKN3rtl8OUStringERKN3com3sun4star3uno3AnyESB_PNS0_14BoundListenersE;
+       _ZN4cppu20PropertySetMixinImpl10prepareSetERKN3rtl8OUStringERKN3com3sun4star3uno3AnyESB_PNS0_14BoundListenersE; 
         _ZN4cppu20PropertySetMixinImpl14BoundListenersC1Ev;
         _ZN4cppu20PropertySetMixinImpl14BoundListenersC2Ev;
         _ZN4cppu20PropertySetMixinImpl14BoundListenersD1Ev;
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index 60f153194bef..3765dbaa12c7 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/cppuhelper/source/implbase.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx
index fdd5ab9665bd..01452d81bf90 100644
--- a/cppuhelper/source/implbase_ex.cxx
+++ b/cppuhelper/source/implbase_ex.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/source/implementationentry.cxx b/cppuhelper/source/implementationentry.cxx
index 9277a1f7d7b4..0c870d8ac54c 100644
--- a/cppuhelper/source/implementationentry.cxx
+++ b/cppuhelper/source/implementationentry.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
 
 namespace cppu {
-
+    
 sal_Bool component_writeInfoHelper(
     void *, void *pRegistryKey , const struct ImplementationEntry entries[] )
 {
@@ -75,10 +75,10 @@ void * component_getFactoryHelper(
     const sal_Char * pImplName, void *, void *,
     const struct ImplementationEntry entries[] )
 {
-
+    
       void * pRet = 0;
     Reference< XSingleComponentFactory > xFactory;
-
+    
     for( sal_Int32 i = 0 ; entries[i].create ; i ++ )
     {
         OUString implName = entries[i].getImplementationName();
diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx
index 53a06f3112c9..672a7f1230cc 100644
--- a/cppuhelper/source/interfacecontainer.cxx
+++ b/cppuhelper/source/interfacecontainer.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -602,7 +602,7 @@ Sequence< sal_Int32 > OMultiTypeInterfaceContainerHelperInt32::getContainedTypes
 
         t_long2ptr::iterator iter = pMap->begin();
         t_long2ptr::iterator end = pMap->end();
-
+        
         sal_Int32 i = 0;
         while( iter != end )
         {
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index 4bbebbd21105..38dc08b8af43 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -102,14 +102,14 @@ class Bootstrap_MacroExpander : public mutex_holder, public t_uno_impl
 {
 protected:
     virtual void SAL_CALL disposing();
-
+    
 public:
     inline Bootstrap_MacroExpander( Reference< XComponentContext > const & ) SAL_THROW( () )
         : t_uno_impl( m_mutex )
         {}
     virtual ~Bootstrap_MacroExpander()
         SAL_THROW( () );
-
+    
     // XMacroExpander impl
     virtual OUString SAL_CALL expandMacros( OUString const & exp )
         throw (lang::IllegalArgumentException);
diff --git a/cppuhelper/source/macro_expander.hxx b/cppuhelper/source/macro_expander.hxx
index 24e3ffcd5b80..d9914aeecf09 100644
--- a/cppuhelper/source/macro_expander.hxx
+++ b/cppuhelper/source/macro_expander.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx
index ec7125b448d8..bee27129e7b5 100644
--- a/cppuhelper/source/propertysetmixin.cxx
+++ b/cppuhelper/source/propertysetmixin.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 11aca838c288..42bb1c1c539b 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -82,7 +82,7 @@ class OPropertySetHelperInfo_Impl
 {
     Sequence < Property > aInfos;
 
-public:
+public:	
     OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) SAL_THROW( () );
 
     // XPropertySetInfo-Methoden
@@ -114,7 +114,7 @@ Sequence< Property > OPropertySetHelperInfo_Impl::getProperties(void) throw(::co
 /**
  * Return the sequence of properties, which are provided throug the constructor.
  */
-Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)
+Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) 
 {
     Property * pR;
     pR = (Property *)bsearch( &PropertyName, aInfos.getConstArray(), aInfos.getLength(),
@@ -124,7 +124,7 @@ Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & Proper
         throw UnknownPropertyException();
     }
 
-    return *pR;
+    return *pR;	
 }
 
 /**
@@ -139,9 +139,9 @@ sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const OUString & Proper
     return pR != NULL;
 }
 
-//  ----------------------------------------------------
-//  class PropertySetHelper_Impl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class PropertySetHelper_Impl
+//	----------------------------------------------------
 class OPropertySetHelper::Impl {
 
 public:
@@ -157,9 +157,9 @@ public:
 };
 
 
-//  ----------------------------------------------------
-//  class PropertySetHelper
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class PropertySetHelper
+//	----------------------------------------------------
 OPropertySetHelper::OPropertySetHelper(
     OBroadcastHelper  & rBHelper_ ) SAL_THROW( () )
     : rBHelper( rBHelper_ ),
@@ -272,10 +272,10 @@ Any OPropertySetHelper::getPropertyValue(
 
 // XPropertySet
 void OPropertySetHelper::addPropertyChangeListener(
-    const OUString& rPropertyName,
+    const OUString& rPropertyName, 
     const Reference < XPropertyChangeListener > & rxListener )
-     throw(::com::sun::star::beans::UnknownPropertyException,
-           ::com::sun::star::lang::WrappedTargetException,
+     throw(::com::sun::star::beans::UnknownPropertyException, 
+           ::com::sun::star::lang::WrappedTargetException, 
            ::com::sun::star::uno::RuntimeException)
 {
     MutexGuard aGuard( rBHelper.rMutex );
@@ -308,11 +308,11 @@ void OPropertySetHelper::addPropertyChangeListener(
 
             aBoundLC.addInterface( (sal_Int32)nHandle, rxListener );
         }
-        else
+        else 
             // add the change listener to the helper container
-            rBHelper.aLC.addInterface(
+            rBHelper.aLC.addInterface( 
                             getPropertyTypeIdentifier(  ),
-                            rxListener
+                            rxListener 
                                      );
     }
 }
@@ -320,10 +320,10 @@ void OPropertySetHelper::addPropertyChangeListener(
 
 // XPropertySet
 void OPropertySetHelper::removePropertyChangeListener(
-    const OUString& rPropertyName,
+    const OUString& rPropertyName, 
     const Reference < XPropertyChangeListener >& rxListener )
-    throw(::com::sun::star::beans::UnknownPropertyException,
-          ::com::sun::star::lang::WrappedTargetException,
+    throw(::com::sun::star::beans::UnknownPropertyException, 
+          ::com::sun::star::lang::WrappedTargetException, 
           ::com::sun::star::uno::RuntimeException)
 {
     MutexGuard aGuard( rBHelper.rMutex );
@@ -344,9 +344,9 @@ void OPropertySetHelper::removePropertyChangeListener(
         }
         else {
             // remove the change listener to the helper container
-            rBHelper.aLC.removeInterface(
+            rBHelper.aLC.removeInterface( 
                             getPropertyTypeIdentifier(  ),
-                            rxListener
+                            rxListener 
                                         );
         }
     }
@@ -356,8 +356,8 @@ void OPropertySetHelper::removePropertyChangeListener(
 void OPropertySetHelper::addVetoableChangeListener(
     const OUString& rPropertyName,
     const Reference< XVetoableChangeListener > & rxListener )
-    throw(::com::sun::star::beans::UnknownPropertyException,
-          ::com::sun::star::lang::WrappedTargetException,
+    throw(::com::sun::star::beans::UnknownPropertyException, 
+          ::com::sun::star::lang::WrappedTargetException, 
           ::com::sun::star::uno::RuntimeException)
 {
     MutexGuard aGuard( rBHelper.rMutex );
@@ -391,9 +391,9 @@ void OPropertySetHelper::addVetoableChangeListener(
         }
         else
             // add the vetoable listener to the helper container
-            rBHelper.aLC.addInterface(
+            rBHelper.aLC.addInterface( 
                                 getVetoableTypeIdentifier(  ),
-                                rxListener
+                                rxListener 
                                      );
     }
 }
@@ -402,8 +402,8 @@ void OPropertySetHelper::addVetoableChangeListener(
 void OPropertySetHelper::removeVetoableChangeListener(
     const OUString& rPropertyName,
     const Reference < XVetoableChangeListener > & rxListener )
-    throw(::com::sun::star::beans::UnknownPropertyException,
-          ::com::sun::star::lang::WrappedTargetException,
+    throw(::com::sun::star::beans::UnknownPropertyException, 
+          ::com::sun::star::lang::WrappedTargetException, 
           ::com::sun::star::uno::RuntimeException)
 {
     MutexGuard aGuard( rBHelper.rMutex );
@@ -426,19 +426,19 @@ void OPropertySetHelper::removeVetoableChangeListener(
         }
         else
             // add the vetoable listener to the helper container
-            rBHelper.aLC.removeInterface(
-                                getVetoableTypeIdentifier( ),
-                                rxListener
+            rBHelper.aLC.removeInterface( 
+                                getVetoableTypeIdentifier( ), 
+                                rxListener 
                                         );
     }
 }
 
 // XFastPropertySet
 void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue )
-     throw(::com::sun::star::beans::UnknownPropertyException,
-           ::com::sun::star::beans::PropertyVetoException,
-           ::com::sun::star::lang::IllegalArgumentException,
-           ::com::sun::star::lang::WrappedTargetException,
+     throw(::com::sun::star::beans::UnknownPropertyException, 
+           ::com::sun::star::beans::PropertyVetoException, 
+           ::com::sun::star::lang::IllegalArgumentException, 
+           ::com::sun::star::lang::WrappedTargetException, 
            ::com::sun::star::uno::RuntimeException)
 {
     OSL_ENSURE( !rBHelper.bInDispose, "do not setFastPropertyValue in the dispose call" );
@@ -453,8 +453,8 @@ void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rVa
     if( nAttributes & PropertyAttribute::READONLY )
         throw PropertyVetoException();
 
-    Any aConvertedVal;
-    Any aOldVal;
+    Any	aConvertedVal;
+    Any	aOldVal;
 
     // Will the property change?
     sal_Bool bChanged;
@@ -481,11 +481,11 @@ void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rVa
                 // set the property to the new value
                 setFastPropertyValue_NoBroadcast( nHandle, aConvertedVal );
             }
-            catch (const ::com::sun::star::beans::UnknownPropertyException& )   { throw;    /* allowed to leave */ }
-            catch (const ::com::sun::star::beans::PropertyVetoException& )      { throw;    /* allowed to leave */ }
-            catch (const ::com::sun::star::lang::IllegalArgumentException& )    { throw;    /* allowed to leave */ }
-            catch (const ::com::sun::star::lang::WrappedTargetException& )      { throw;    /* allowed to leave */ }
-            catch (const ::com::sun::star::uno::RuntimeException& )             { throw;    /* allowed to leave */ }
+            catch (const ::com::sun::star::beans::UnknownPropertyException& )	{ throw;	/* allowed to leave */ }
+            catch (const ::com::sun::star::beans::PropertyVetoException& )		{ throw;	/* allowed to leave */ }
+            catch (const ::com::sun::star::lang::IllegalArgumentException& )	{ throw;	/* allowed to leave */ }
+            catch (const ::com::sun::star::lang::WrappedTargetException& )		{ throw;	/* allowed to leave */ }
+            catch (const ::com::sun::star::uno::RuntimeException& )				{ throw;	/* allowed to leave */ }
             catch (const ::com::sun::star::uno::Exception& e )
             {
                 // not allowed to leave this meathod
@@ -505,8 +505,8 @@ void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rVa
 
 // XFastPropertySet
 Any OPropertySetHelper::getFastPropertyValue( sal_Int32 nHandle )
-     throw(::com::sun::star::beans::UnknownPropertyException,
-           ::com::sun::star::lang::WrappedTargetException,
+     throw(::com::sun::star::beans::UnknownPropertyException, 
+           ::com::sun::star::lang::WrappedTargetException, 
            ::com::sun::star::uno::RuntimeException)
 
 {
@@ -553,13 +553,13 @@ void OPropertySetHelper::fire
             // Vetoable fire and constrained attribute set or
             // Change fire and Changed and bound attribute set
             IPropertyArrayHelper & rInfo = getInfoHelper();
-            sal_Int16   nAttributes;
+            sal_Int16	nAttributes;
             OUString aPropName;
             rInfo.fillPropertyMembersByHandle( &aPropName, &nAttributes, pnHandles[i] );
 
             if(
                (bVetoable && (nAttributes & PropertyAttribute::CONSTRAINED)) ||
-               (!bVetoable && (nAttributes & PropertyAttribute::BOUND))
+               (!bVetoable && (nAttributes & PropertyAttribute::BOUND)) 
               )
             {
                 pEvts[nChangesLen].Source = xSource;
@@ -631,13 +631,13 @@ void OPropertySetHelper::fire
             // broadcast to all listeners with "" property name
             if( bVetoable ){
                 // fire change Events?
-                pLC = rBHelper.aLC.getContainer(
+                pLC = rBHelper.aLC.getContainer( 
                             getVetoableTypeIdentifier()
                                                 );
             }
             else {
-                pLC = rBHelper.aLC.getContainer(
-                            getPropertyTypeIdentifier(  )
+                pLC = rBHelper.aLC.getContainer( 
+                            getPropertyTypeIdentifier(  ) 
                                                 );
             }
             if( pLC )
@@ -693,7 +693,7 @@ void OPropertySetHelper::fire
         if( !bVetoable )
         {
             OInterfaceContainerHelper * pCont = 0;
-            pCont = rBHelper.aLC.getContainer(
+            pCont = rBHelper.aLC.getContainer( 
                                 getPropertiesTypeIdentifier(  )
                                              );
             if( pCont )
@@ -780,7 +780,7 @@ void OPropertySetHelper::setFastPropertyValues(
                                             pHandles[i], pValues[i] ) )
                 {
                     // only increment if the property really change
-                    pHandles[n]         = pHandles[i];
+                    pHandles[n]			= pHandles[i];
                     n++;
                 }
             }
@@ -806,7 +806,7 @@ void OPropertySetHelper::setFastPropertyValues(
         // fire change events
         fire( pHandles, pConvertedValues, pOldValues, n, sal_False );
     }
-    catch( ... )
+    catch( ... ) 
     {
         delete [] pOldValues;
         delete [] pConvertedValues;
@@ -829,7 +829,7 @@ void OPropertySetHelper::setPropertyValues(
     sal_Int32 * pHandles = NULL;
     try
     {
-        sal_Int32   nSeqLen = rPropertyNames.getLength();
+        sal_Int32	nSeqLen = rPropertyNames.getLength();
         pHandles = new sal_Int32[ nSeqLen ];
         // get the map table
         IPropertyArrayHelper & rPH = getInfoHelper();
@@ -841,7 +841,7 @@ void OPropertySetHelper::setPropertyValues(
     catch( ... )
     {
         delete [] pHandles;
-        throw;
+        throw; 
     }
     delete [] pHandles;
 }
@@ -850,8 +850,8 @@ void OPropertySetHelper::setPropertyValues(
 Sequence<Any> OPropertySetHelper::getPropertyValues( const Sequence<OUString>& rPropertyNames )
     throw(::com::sun::star::uno::RuntimeException)
 {
-    sal_Int32   nSeqLen = rPropertyNames.getLength();
-    sal_Int32 * pHandles = new sal_Int32[ nSeqLen ];
+    sal_Int32	nSeqLen = rPropertyNames.getLength();
+    sal_Int32 *	pHandles = new sal_Int32[ nSeqLen ];
     Sequence< Any > aValues( nSeqLen );
 
     // get the map table
@@ -871,8 +871,8 @@ Sequence<Any> OPropertySetHelper::getPropertyValues( const Sequence<OUString>& r
 }
 
 // XMultiPropertySet
-void OPropertySetHelper::addPropertiesChangeListener(
-    const Sequence<OUString> & ,
+void OPropertySetHelper::addPropertiesChangeListener( 
+    const Sequence<OUString> & , 
     const Reference < XPropertiesChangeListener > & rListener )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -980,18 +980,18 @@ void OPropertySetHelper::removePropertyStateChangeListener( const OUString& aPro
 
 //  static OUString makeOUString( sal_Char *p )
 //  {
-//      sal_Int32 nLen = strlen(p);
-//      sal_Unicode *pw = new sal_Unicode[nLen];
-
-//      for( int i = 0 ; i < nLen ; i ++ ) {
-
-//          // Only ascii strings allowed with this helper !
-//          OSL_ASSERT( p[i] < 127 );
-//          pw[i] = p[i];
-//      }
-//      OUString ow( pw , nLen );
-//      delete pw;
-//      return ow;
+//  	sal_Int32 nLen = strlen(p);
+//  	sal_Unicode *pw = new sal_Unicode[nLen];
+
+//  	for( int i = 0 ; i < nLen ; i ++ ) {
+
+//  		// Only ascii strings allowed with this helper !
+//  		OSL_ASSERT( p[i] < 127 );
+//  		pw[i] = p[i];	
+//  	}
+//  	OUString ow( pw , nLen );
+//  	delete pw;
+//  	return ow;
 //  }
 
 extern "C" {
@@ -1006,7 +1006,7 @@ static int compare_Property_Impl( const void *arg1, const void *arg2 )
 
 void OPropertyArrayHelper::init( sal_Bool bSorted ) SAL_THROW( () )
 {
-    sal_Int32 i, nElements = aInfos.getLength();
+    sal_Int32 i, nElements = aInfos.getLength();	
     const Property* pProperties = aInfos.getConstArray();
 
     for( i = 1; i < nElements; i++ )
@@ -1038,17 +1038,17 @@ OPropertyArrayHelper::OPropertyArrayHelper(
     sal_Int32 nEle,
     sal_Bool bSorted )
     SAL_THROW( () )
-    : aInfos(pProps, nEle)
+    : aInfos(pProps, nEle)	
     , bRightOrdered( sal_False )
 {
     init( bSorted );
 }
 
-OPropertyArrayHelper::OPropertyArrayHelper(
+OPropertyArrayHelper::OPropertyArrayHelper( 
     const Sequence< Property > & aProps,
     sal_Bool bSorted )
     SAL_THROW( () )
-    : aInfos(aProps)
+    : aInfos(aProps)	
     , bRightOrdered( sal_False )
 {
     init( bSorted );
@@ -1069,7 +1069,7 @@ sal_Bool OPropertyArrayHelper::fillPropertyMembersByHandle
 )
 {
     const Property* pProperties = aInfos.getConstArray();
-    sal_Int32 nElements = aInfos.getLength();
+    sal_Int32 nElements = aInfos.getLength();	
 
     if( bRightOrdered )
     {
@@ -1198,7 +1198,7 @@ sal_Int32 OPropertyArrayHelper::fillHandles( sal_Int32 * pHandles, const Sequenc
         else
         {
             // binary search is better
-            sal_Int32   nCompVal = 1;
+            sal_Int32	nCompVal = 1;
             const Property * pOldEnd = pEnd--;
             const Property * pMid = pCur;
 
diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx
index 919fe7bbb995..17b6eadb02af 100644
--- a/cppuhelper/source/servicefactory.cxx
+++ b/cppuhelper/source/servicefactory.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -309,7 +309,7 @@ static void add_access_control_entries(
             context_values.push_back( entry );
         }
     }
-
+    
     // - ac prop: mode
     // { "off", "on", "dynamic-only", "single-user", "single-default-user" }
     entry.bLateInitService = false;
@@ -338,7 +338,7 @@ Reference< lang::XMultiComponentFactory > bootstrapInitialSF(
                 Reference< lang::XMultiServiceFactory >(),
                 Reference< registry::XRegistryKey >() ) ),
         UNO_QUERY );
-
+    
     // add initial bootstrap services
     static char const * ar[] = {
         "bootstrap.uno" SAL_DLLEXTENSION,
@@ -411,7 +411,7 @@ Reference< XComponentContext > bootstrapInitialContext(
             if (xKey.is())
             {
                 entry.bLateInitService = true;
-
+                
                 Sequence< Reference< registry::XRegistryKey > > keys(
                     xKey->openKeys() );
                 Reference< registry::XRegistryKey > const * pKeys =
@@ -612,7 +612,7 @@ static Reference< lang::XMultiComponentFactory > createImplServiceFactory(
     Reference< XComponentContext > xContext(
         bootstrapInitialContext(
             xSF, xRegistry, xRegistry, rBootstrapPath, bootstrap ) );
-
+    
     // initialize sf
     Reference< lang::XInitialization > xInit( xSF, UNO_QUERY );
     OSL_ASSERT( xInit.is() );
@@ -646,7 +646,7 @@ Reference< XComponentContext > SAL_CALL bootstrap_InitialComponentContext(
     Reference< XComponentContext > xContext(
         bootstrapInitialContext(
             xSF, xRegistry, xRegistry, rBootstrapPath, bootstrap ) );
-
+    
     // initialize sf
     Reference< lang::XInitialization > xInit( xSF, UNO_QUERY );
     OSL_ASSERT( xInit.is() );
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 1be484c49336..c9e1a35a5361 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -275,8 +275,8 @@ static OUString makeComponentPath(
 
 //==============================================================================
 static OUString getLibEnv(OUString         const & aModulePath,
-                          oslModule                lib,
-                          uno::Environment       * pEnv,
+                          oslModule                lib, 
+                          uno::Environment       * pEnv, 
                           OUString               * pSourceEnv_name,
                           uno::Environment const & cTargetEnv,
                           OUString         const & cImplName = OUString())
@@ -286,7 +286,7 @@ static OUString getLibEnv(OUString         const & aModulePath,
     sal_Char const * pEnvTypeName = NULL;
 
     OUString aGetEnvNameExt = OUSTR(COMPONENT_GETENVEXT);
-    component_getImplementationEnvironmentExtFunc pGetImplEnvExt =
+    component_getImplementationEnvironmentExtFunc pGetImplEnvExt = 
         (component_getImplementationEnvironmentExtFunc)osl_getFunctionSymbol(lib, aGetEnvNameExt.pData);
 
     if (pGetImplEnvExt)
@@ -297,8 +297,8 @@ static OUString getLibEnv(OUString         const & aModulePath,
     else
     {
         OUString aGetEnvName = OUSTR(COMPONENT_GETENV);
-        component_getImplementationEnvironmentFunc pGetImplEnv =
-            (component_getImplementationEnvironmentFunc)osl_getFunctionSymbol(
+        component_getImplementationEnvironmentFunc pGetImplEnv = 
+            (component_getImplementationEnvironmentFunc)osl_getFunctionSymbol( 
                 lib, aGetEnvName.pData );
         if (pGetImplEnv)
             pGetImplEnv(&pEnvTypeName, (uno_Environment **)pEnv);
@@ -311,7 +311,7 @@ static OUString getLibEnv(OUString         const & aModulePath,
             aExcMsg += OUSTR("- nor: ");
         }
     }
-
+    
     if (!pEnv->is() && pEnvTypeName)
     {
         *pSourceEnv_name = OUString::createFromAscii(pEnvTypeName);
@@ -329,15 +329,15 @@ static OUString getLibEnv(OUString         const & aModulePath,
                     *pSourceEnv_name += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":log"));
                     break;
                 }
-            } while( nIndex != -1 );
+            } while( nIndex != -1 );            
         }
-
+        
     }
 
     return aExcMsg;
 }
 
-extern "C" {static void s_getFactory(va_list * pParam)
+extern "C" {static void s_getFactory(va_list * pParam) 
 {
     component_getFactoryFunc         pSym      = va_arg(*pParam, component_getFactoryFunc);
     OString                  const * pImplName = va_arg(*pParam, OString const *);
@@ -363,7 +363,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
             aModulePath,
             Reference< XInterface >() );
     }
-
+    
     oslModule lib = osl_loadModule(
         aModulePath.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
     if (! lib)
@@ -392,7 +392,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
 
             if (!env.is())
                 env = uno::Environment(aEnvTypeName);
-
+            
             if (env.is() && currentEnv.is())
             {
 #if OSL_DEBUG_LEVEL > 1
@@ -400,23 +400,23 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
                     rtl::OString libName(rtl::OUStringToOString(rLibName, RTL_TEXTENCODING_ASCII_US));
                     rtl::OString implName(rtl::OUStringToOString(rImplName, RTL_TEXTENCODING_ASCII_US));
                     rtl::OString envDcp(rtl::OUStringToOString(env.getTypeName(), RTL_TEXTENCODING_ASCII_US));
-
+                    
                     fprintf(stderr, "loadSharedLibComponentFactory envDcp: %-12.12s  implName: %30.30s  libName: %-15.15s\n", envDcp.getStr(), implName.getStr() + (implName.getLength() > 30 ? implName.getLength() - 30 : 0), libName.getStr());
                 }
 #endif
 
                 Mapping aCurrent2Env( currentEnv, env );
                 Mapping aEnv2Current( env, currentEnv );
-
+                
                 if (aCurrent2Env.is() && aEnv2Current.is())
                 {
                     void * pSMgr = aCurrent2Env.mapInterface(
                         xMgr.get(), ::getCppuType( &xMgr ) );
                     void * pKey = aCurrent2Env.mapInterface(
                         xKey.get(), ::getCppuType( &xKey ) );
-
+                    
                     void * pSSF = NULL;
-
+                    
                     env.invoke(s_getFactory, pSym, &aImplName, pSMgr, pKey, &pSSF);
 
                     if (pKey)
@@ -429,7 +429,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
                         (*env.get()->pExtEnv->releaseInterface)(
                             env.get()->pExtEnv, pSMgr );
                     }
-
+                    
                     if (pSSF)
                     {
                         aEnv2Current.mapInterface(
@@ -484,7 +484,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
 }
 
 //==============================================================================
-extern "C" { static void s_writeInfo(va_list * pParam)
+extern "C" { static void s_writeInfo(va_list * pParam) 
 {
     component_writeInfoFunc         pSym      = va_arg(*pParam, component_writeInfoFunc);
     void                          * pSMgr     = va_arg(*pParam, void *);
@@ -510,7 +510,7 @@ void SAL_CALL writeSharedLibComponentInfo(
             aModulePath,
             Reference< XInterface >() );
     }
-
+    
     oslModule lib = osl_loadModule(
         aModulePath.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
     if (! lib)
@@ -524,7 +524,7 @@ void SAL_CALL writeSharedLibComponentInfo(
 
     uno::Environment currentEnv(Environment::getCurrent());
     uno::Environment env;
-
+    
     OUString aEnvTypeName;
     OUString aExcMsg = getLibEnv(aModulePath, lib, &env, &aEnvTypeName, currentEnv);
     if (!aExcMsg.getLength())
@@ -535,7 +535,7 @@ void SAL_CALL writeSharedLibComponentInfo(
         {
             if (!env.is())
                 env = uno::Environment(aEnvTypeName);
-
+            
             if (env.is() && currentEnv.is())
             {
                 Mapping aCurrent2Env( currentEnv, env );
@@ -566,7 +566,7 @@ void SAL_CALL writeSharedLibComponentInfo(
                         aExcMsg += OUSTR(": registry is mandatory to invoke"
                                          " component_writeInfo()!");
                     }
-
+                    
                     if (pSMgr)
                     {
                         (*env.get()->pExtEnv->releaseInterface)(
diff --git a/cppuhelper/source/stdidlclass.cxx b/cppuhelper/source/stdidlclass.cxx
index 1852b6827b78..512913c65811 100644
--- a/cppuhelper/source/stdidlclass.cxx
+++ b/cppuhelper/source/stdidlclass.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,30 +48,30 @@ using namespace com::sun::star::reflection;
 using namespace rtl;
 
 namespace cppu {
-
+    
 /*---------------------------------------------------------
-*   This helper class implements XIdlClass. Is used by
-*   createStdIdlClass()
+*	This helper class implements XIdlClass. Is used by
+*	createStdIdlClass()
 *---------------------------------------------------------*/
-class OStdIdlClass :
+class OStdIdlClass : 	
             public OWeakObject,
             public XIdlClass,
             public XIdlClassProvider
 {
 public:
-    OStdIdlClass(
-                    const Reference < XMultiServiceFactory > &rSMgr ,
-                    const OUString & sImplementationName ,
+    OStdIdlClass( 	
+                    const Reference < XMultiServiceFactory > &rSMgr , 
+                    const OUString & sImplementationName , 
                     const Reference < XIdlClass > & rSuperClass,
-                    const Sequence < OUString > &seq
+                    const Sequence < OUString > &seq 
                 ) SAL_THROW( () );
 
     // XInterface
-    Any                 SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType )
+    Any					SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType )
         throw(::com::sun::star::uno::RuntimeException);
 
-    void                SAL_CALL acquire() throw()   { OWeakObject::acquire(); }
-    void                SAL_CALL release() throw()   { OWeakObject::release(); }
+    void 				SAL_CALL acquire() throw() 	 { OWeakObject::acquire(); }
+    void 				SAL_CALL release() throw()	 { OWeakObject::release(); }
 
     // XIdlClassProvider
     Sequence< Reference < XIdlClass > > SAL_CALL getIdlClasses(void)
@@ -79,7 +79,7 @@ public:
 
     // XIdlClass
     virtual Sequence< Reference< XIdlClass > > SAL_CALL getClasses(  ) throw(RuntimeException)
-                                        { return Sequence < Reference < XIdlClass > > (); }
+                                        { return Sequence < Reference < XIdlClass > > (); } 
     virtual Reference< XIdlClass > SAL_CALL getClass( const ::rtl::OUString& ) throw(RuntimeException)
                                         { return Reference < XIdlClass > (); }
     virtual sal_Bool SAL_CALL equals( const Reference< XIdlClass >& Type ) throw(RuntimeException)
@@ -111,10 +111,10 @@ public:
     virtual void SAL_CALL createObject( Any& ) throw(RuntimeException) {}
 
 private:
-    OUString                                m_sImplementationName;
-    Sequence < OUString >                   m_seqSupportedInterface;
-    Sequence < Reference < XIdlClass > >    m_seqSuperClasses;
-    Reference < XMultiServiceFactory >      m_rSMgr;
+    OUString 								m_sImplementationName;
+    Sequence < OUString >					m_seqSupportedInterface;
+    Sequence < Reference < XIdlClass > > 	m_seqSuperClasses;
+    Reference < XMultiServiceFactory >		m_rSMgr;
 
     Reference< XIdlReflection > m_xCorefl;
     Reference< XIdlReflection > const & get_corefl() SAL_THROW( (RuntimeException) );
@@ -141,7 +141,7 @@ Reference< XIdlReflection > const & OStdIdlClass::get_corefl()
                     xContext->getValueByName(
                         OUString( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.reflection.theCoreReflection") ) ) >>= x;
                     OSL_ENSURE( x.is(), "### CoreReflection singleton not accessible!?" );
-
+                    
                     if (x.is())
                     {
                         ::osl::MutexGuard guard( ::osl::Mutex::getGlobalMutex() );
@@ -164,10 +164,10 @@ Reference< XIdlReflection > const & OStdIdlClass::get_corefl()
 }
 
 OStdIdlClass::OStdIdlClass(
-                    const Reference < XMultiServiceFactory > &rSMgr ,
-                    const OUString & sImplementationName ,
+                    const Reference < XMultiServiceFactory > &rSMgr , 
+                    const OUString & sImplementationName , 
                     const Reference < XIdlClass > & rSuperClass,
-                    const Sequence < OUString > &seq
+                    const Sequence < OUString > &seq 
                           ) SAL_THROW( () ) :
                 m_sImplementationName( sImplementationName ) ,
                 m_seqSupportedInterface( seq ),
@@ -175,17 +175,17 @@ OStdIdlClass::OStdIdlClass(
 {
     if( rSuperClass.is() )
         m_seqSuperClasses = Sequence< Reference < XIdlClass > >( &rSuperClass, 1 );
-
+            
 }
-
+    
 Any SAL_CALL OStdIdlClass::queryInterface( const Type & rType )
      throw(::com::sun::star::uno::RuntimeException)
 {
     Any aRet( ::cppu::queryInterface(
         rType, static_cast< XIdlClass * >( this ), static_cast< XIdlClassProvider * >( this ) ) );
-
+    
     return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
-}
+}	
 
 
 Sequence< Reference< XIdlClass > > SAL_CALL OStdIdlClass::getInterfaces(  ) throw(RuntimeException)
@@ -196,12 +196,12 @@ Sequence< Reference< XIdlClass > > SAL_CALL OStdIdlClass::getInterfaces(  ) thro
     if( rCoreRefl.is() )
     {
         Sequence< Reference< XIdlClass > > seqClasses( nMax );
-
+        
         for( int n = 0 ; n < nMax ; n++ )
         {
             seqClasses.getArray()[n] = rCoreRefl->forName( m_seqSupportedInterface.getArray()[n] );
-        }
-
+        }	
+        
         return seqClasses;
     }
     return Sequence< Reference< XIdlClass > > () ;
@@ -213,14 +213,14 @@ Sequence< Reference < XIdlClass > > SAL_CALL OStdIdlClass::getIdlClasses(void)
     throw (RuntimeException)
 {
     // weak reference to cache the standard class
-    static WeakReference< XIdlClass >   weakRef;
-
-    // try to make weakref hard
+    static WeakReference< XIdlClass >	weakRef;
+    
+    // try to make weakref hard	
     Reference < XIdlClass > r = weakRef;
 
-    if( ! r.is() ) {
+    if( ! r.is() ) {		
         // xidlclass has not been initialized before or has been destroyed already.
-        r = ::cppu::createStandardClass(
+        r = ::cppu::createStandardClass( 
                                         m_rSMgr ,
                                         OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.cppuhelper.OStdIdlClass") ) ,
                                         Reference < XIdlClass > () ,
@@ -240,20 +240,20 @@ Sequence< Reference < XIdlClass > > SAL_CALL OStdIdlClass::getIdlClasses(void)
 
 // external constructor
 XIdlClass *  SAL_CALL createStandardClassWithSequence(
-                    const Reference < XMultiServiceFactory > &rSMgr ,
-                    const OUString & sImplementationName ,
+                    const Reference < XMultiServiceFactory > &rSMgr , 
+                    const OUString & sImplementationName , 
                     const Reference < XIdlClass > & rSuperClass,
                     const Sequence < OUString > &seqInterfaceNames )
     SAL_THROW( () )
 {
-    return SAL_STATIC_CAST(
-                        XIdlClass * ,
-                        new OStdIdlClass(
-                                            rSMgr ,
+    return SAL_STATIC_CAST( 
+                        XIdlClass * , 
+                        new OStdIdlClass(	
+                                            rSMgr , 
                                             sImplementationName,
-                                            rSuperClass,
-                                            seqInterfaceNames
-                                          )
+                                            rSuperClass, 	
+                                            seqInterfaceNames 
+                                          ) 
                        );
 }
 
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index 570a7b4505d6..c5b76e4fe4af 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -130,9 +130,9 @@ inline static typelib_TypeDescription * createCTD(
         sal_Int32 nMembers = aDiscriminants.getLength();
         OSL_ASSERT( nMembers == aMemberNames.getLength() && nMembers == aMemberTypes.getLength() );
 
-        const Any * pDiscriminants                          = aDiscriminants.getConstArray();
-        const Reference< XTypeDescription > * pMemberTypes  = aMemberTypes.getConstArray();
-        const OUString * pMemberNames                       = aMemberNames.getConstArray();
+        const Any * pDiscriminants							= aDiscriminants.getConstArray();
+        const Reference< XTypeDescription > * pMemberTypes	= aMemberTypes.getConstArray();
+        const OUString * pMemberNames						= aMemberNames.getConstArray();
 
         typelib_Union_Init * pMembers = (typelib_Union_Init *)alloca( nMembers * sizeof(typelib_Union_Init) );
 
@@ -182,10 +182,10 @@ inline static typelib_TypeDescription * createCTD(
 
         // construct member init array
         const Sequence<Reference< XTypeDescription > > & rMemberTypes = xType->getMemberTypes();
-        const Sequence< OUString > & rMemberNames                     = xType->getMemberNames();
+        const Sequence< OUString > & rMemberNames					  = xType->getMemberNames();
 
         const Reference< XTypeDescription > * pMemberTypes = rMemberTypes.getConstArray();
-        const OUString * pMemberNames                      = rMemberNames.getConstArray();
+        const OUString * pMemberNames					   = rMemberNames.getConstArray();
 
         sal_Int32 nMembers = rMemberTypes.getLength();
         OSL_ENSURE( nMembers == rMemberNames.getLength(), "### lens differ!" );
@@ -240,10 +240,10 @@ inline static typelib_TypeDescription * createCTD(
 
         // construct member init array
         const Sequence<Reference< XTypeDescription > > & rMemberTypes = xType->getMemberTypes();
-        const Sequence< OUString > & rMemberNames                     = xType->getMemberNames();
+        const Sequence< OUString > & rMemberNames					  = xType->getMemberNames();
 
         const Reference< XTypeDescription > * pMemberTypes = rMemberTypes.getConstArray();
-        const OUString * pMemberNames                      = rMemberNames.getConstArray();
+        const OUString * pMemberNames					   = rMemberNames.getConstArray();
 
         sal_Int32 nMembers = rMemberTypes.getLength();
         OSL_ENSURE( nMembers == rMemberNames.getLength(), "### lens differ!" );
@@ -333,7 +333,7 @@ static typelib_TypeDescription * createCTD(
 
         // init all params
         const Sequence<Reference< XMethodParameter > > & rParams = xMethod->getParameters();
-        const Reference< XMethodParameter > * pParams            = rParams.getConstArray();
+        const Reference< XMethodParameter > * pParams			 = rParams.getConstArray();
         sal_Int32 nParams = rParams.getLength();
 
         typelib_Parameter_Init * pParamInit = (typelib_Parameter_Init *)alloca(
@@ -343,7 +343,7 @@ static typelib_TypeDescription * createCTD(
         for ( nPos = nParams; nPos--; )
         {
             const Reference< XMethodParameter > & xParam = pParams[nPos];
-            const Reference< XTypeDescription > & xType  = xParam->getType();
+            const Reference< XTypeDescription > & xType	 = xParam->getType();
             typelib_Parameter_Init & rInit = pParamInit[xParam->getPosition()];
 
             rInit.eTypeClass = (typelib_TypeClass)xType->getTypeClass();
diff --git a/cppuhelper/source/typeprovider.cxx b/cppuhelper/source/typeprovider.cxx
index fd403f9d2beb..9707d7310dbe 100644
--- a/cppuhelper/source/typeprovider.cxx
+++ b/cppuhelper/source/typeprovider.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,7 +65,7 @@ static inline void copy( Sequence< Type > & rDest, const Sequence< Type > & rSou
 {
     Type * pDest = rDest.getArray();
     const Type * pSource = rSource.getConstArray();
-
+    
     for ( sal_Int32 nPos = rSource.getLength(); nPos--; )
         pDest[nOffset+ nPos] = pSource[nPos];
 }
diff --git a/cppuhelper/source/unourl.cxx b/cppuhelper/source/unourl.cxx
index eff9f8a0be2a..724ea00ad4dc 100644
--- a/cppuhelper/source/unourl.cxx
+++ b/cppuhelper/source/unourl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index 1dd76d26758e..0224390b9436 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@ using namespace com::sun::star::uno;
 
 /** */ //for docpp
 namespace cppu
-{
+{    
 
 // due to static Reflection destruction from usr, ther must be a mutex leak (#73272#)
 inline static Mutex & getWeakMutex() SAL_THROW( () )
@@ -63,12 +63,12 @@ public:
         , m_pObject(pObj)
         , m_aReferences( getWeakMutex() )
         {}
-
+    
     // XInterface
-    Any SAL_CALL        queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL       acquire() throw();
-    void SAL_CALL       release() throw();
-
+    Any SAL_CALL		queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL		acquire() throw();
+    void SAL_CALL		release() throw();
+    
     // XAdapter
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL queryAdapted() throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL addReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XReference >& xRef ) throw(::com::sun::star::uno::RuntimeException);
@@ -84,11 +84,11 @@ private:
     virtual ~OWeakConnectionPoint() {}
 
     /// The reference counter.
-    oslInterlockedCount         m_aRefCount;
+    oslInterlockedCount			m_aRefCount;
     /// The weak object
-    OWeakObject*                m_pObject;
+    OWeakObject* 				m_pObject;
     /// The container to hold the weak references
-    OInterfaceContainerHelper   m_aReferences;
+    OInterfaceContainerHelper	m_aReferences;
 };
 
 // XInterface
@@ -103,7 +103,7 @@ Any SAL_CALL OWeakConnectionPoint::queryInterface( const Type & rType )
 void SAL_CALL OWeakConnectionPoint::acquire() throw()
 {
     osl_incrementInterlockedCount( &m_aRefCount );
-}
+}	
 
 // XInterface
 void SAL_CALL OWeakConnectionPoint::release() throw()
@@ -133,18 +133,18 @@ void SAL_CALL OWeakConnectionPoint::dispose() throw(::com::sun::star::uno::Runti
         cppu::throwException(ex);
     }
 }
-
+    
 // XInterface
 Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(::com::sun::star::uno::RuntimeException)
 {
     Reference< XInterface > ret;
-
+    
     ClearableMutexGuard guard(getWeakMutex());
-
+        
     if (m_pObject)
     {
         oslInterlockedCount n = osl_incrementInterlockedCount( &m_pObject->m_refCount );
-
+        
         if (n > 1)
         {
             // The refence is incremented. The object cannot be destroyed.
@@ -158,7 +158,7 @@ Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(::co
             // Another thread wait in the dispose method at the guard
             n = osl_decrementInterlockedCount( &m_pObject->m_refCount );
     }
-
+    
     return ret;
 }
 
@@ -167,14 +167,14 @@ void SAL_CALL OWeakConnectionPoint::addReference(const Reference< XReference >&
     throw(::com::sun::star::uno::RuntimeException)
 {
     m_aReferences.addInterface( (const Reference< XInterface > &)rRef );
-}
+}	
 
 // XInterface
 void SAL_CALL OWeakConnectionPoint::removeReference(const Reference< XReference >& rRef)
     throw(::com::sun::star::uno::RuntimeException)
 {
     m_aReferences.removeInterface( (const Reference< XInterface > &)rRef );
-}
+}	
 
 
 //------------------------------------------------------------------------
@@ -196,13 +196,13 @@ Any SAL_CALL OWeakObject::queryInterface( const Type & rType ) throw(::com::sun:
     return ::cppu::queryInterface(
         rType,
         static_cast< XWeak * >( this ), static_cast< XInterface * >( this ) );
-}
+}	
 
 // XInterface
 void SAL_CALL OWeakObject::acquire() throw()
 {
     osl_incrementInterlockedCount( &m_refCount );
-}
+}	
 
 // XInterface
 void SAL_CALL OWeakObject::release() throw()
@@ -214,7 +214,7 @@ void SAL_CALL OWeakObject::release() throw()
         // destroy object:
         delete this;
     }
-}
+}	
 
 void OWeakObject::disposeWeakConnectionPoint()
 {
@@ -254,9 +254,9 @@ Reference< XAdapter > SAL_CALL OWeakObject::queryAdapter()
             m_pWeakConnectionPoint = p;
         }
     }
-
+    
     return m_pWeakConnectionPoint;
-}
+}	
 
 //------------------------------------------------------------------------
 //-- OWeakAggObject ----------------------------------------------------
@@ -273,7 +273,7 @@ void OWeakAggObject::acquire() throw()
         x->acquire();
     else
         OWeakObject::acquire();
-}
+}	
 
 // XInterface
 void OWeakAggObject::release() throw()
@@ -312,16 +312,16 @@ void OWeakAggObject::setDelegator( const Reference<XInterface > & rDelegator ) t
 
 /** */ //for docpp
 namespace com
-{
+{    
 /** */ //for docpp
 namespace sun
-{
+{    
 /** */ //for docpp
 namespace star
-{
+{    
 /** */ //for docpp
 namespace uno
-{
+{    
 
 
 //------------------------------------------------------------------------
@@ -333,19 +333,19 @@ public:
     OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW( () );
     OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW( () );
     virtual ~OWeakRefListener() SAL_THROW( () );
-
+    
     // XInterface
     Any SAL_CALL queryInterface( const Type & rType ) throw(RuntimeException);
     void SAL_CALL acquire() throw();
     void SAL_CALL release() throw();
-
+    
     // XReference
-    void SAL_CALL   dispose() throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL 	dispose() throw(::com::sun::star::uno::RuntimeException);
 
     /// The reference counter.
-    oslInterlockedCount         m_aRefCount;
+    oslInterlockedCount			m_aRefCount;
     /// The connection point of the weak object
-    Reference< XAdapter >       m_XWeakConnectionPoint;
+    Reference< XAdapter >		m_XWeakConnectionPoint;	
 
 private:
     OWeakRefListener& SAL_CALL operator=(const OWeakRefListener& rRef) SAL_THROW( () );
@@ -358,7 +358,7 @@ OWeakRefListener::OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW( () )
     try
     {
     m_XWeakConnectionPoint = rRef.m_XWeakConnectionPoint;
-
+    
     if (m_XWeakConnectionPoint.is())
     {
         m_XWeakConnectionPoint->addReference((XReference*)this);
@@ -374,11 +374,11 @@ OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt) SAL_THRO
     try
     {
     Reference< XWeak > xWeak( Reference< XWeak >::query( xInt ) );
-
+    
     if (xWeak.is())
     {
         m_XWeakConnectionPoint = xWeak->queryAdapter();
-
+        
         if (m_XWeakConnectionPoint.is())
         {
             m_XWeakConnectionPoint->addReference((XReference*)this);
@@ -400,29 +400,29 @@ OWeakRefListener::~OWeakRefListener() SAL_THROW( () )
     }
     }
     catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
-}
+}	
 
 // XInterface
 Any SAL_CALL OWeakRefListener::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     return ::cppu::queryInterface(
         rType, static_cast< XReference * >( this ), static_cast< XInterface * >( this ) );
-}
+}	
 
 // XInterface
 void SAL_CALL OWeakRefListener::acquire() throw()
 {
     osl_incrementInterlockedCount( &m_aRefCount );
-}
+}	
 
 // XInterface
 void SAL_CALL OWeakRefListener::release() throw()
 {
     if( ! osl_decrementInterlockedCount( &m_aRefCount ) )
         delete this;
-}
+}	
 
-void SAL_CALL OWeakRefListener::dispose()
+void SAL_CALL OWeakRefListener::dispose() 
     throw(::com::sun::star::uno::RuntimeException)
 {
     Reference< XAdapter > xAdp;
@@ -437,7 +437,7 @@ void SAL_CALL OWeakRefListener::dispose()
 
     if( xAdp.is() )
         xAdp->removeReference((XReference*)this);
-}
+}	
 
 //------------------------------------------------------------------------
 //-- WeakReferenceHelper ----------------------------------------------------------
@@ -450,7 +450,7 @@ WeakReferenceHelper::WeakReferenceHelper(const Reference< XInterface >& xInt) SA
         m_pImpl = new OWeakRefListener(xInt);
         m_pImpl->acquire();
     }
-}
+}	
 
 WeakReferenceHelper::WeakReferenceHelper(const WeakReferenceHelper& rWeakRef) SAL_THROW( () )
     : m_pImpl( 0 )
@@ -529,13 +529,13 @@ Reference< XInterface > WeakReferenceHelper::get() const SAL_THROW( () )
         return xAdp->queryAdapted();
     }
     catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
-
+    
     return Reference< XInterface >();
 }
 
 }
 }
 }
-}
+}     
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/test/bootstrap/TestEnv.cxx b/cppuhelper/test/bootstrap/TestEnv.cxx
index 578378ee2898..90e4bb65b9e6 100644
--- a/cppuhelper/test/bootstrap/TestEnv.cxx
+++ b/cppuhelper/test/bootstrap/TestEnv.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@
 #endif
 
 
-class SAL_DLLPRIVATE TestEnv : public cppu::Enterable
+class SAL_DLLPRIVATE TestEnv : public cppu::Enterable 
 {
     int m_inCount;
 
@@ -96,7 +96,7 @@ void TestEnv::v_enter(void)
 {
     ++ m_inCount;
 }
-
+    
 void TestEnv::v_leave(void)
 {
     -- m_inCount;
diff --git a/cppuhelper/test/bootstrap/bootstrap.test.cxx b/cppuhelper/test/bootstrap/bootstrap.test.cxx
index b0eadb6946a1..5aa09b704680 100644
--- a/cppuhelper/test/bootstrap/bootstrap.test.cxx
+++ b/cppuhelper/test/bootstrap/bootstrap.test.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,7 +55,7 @@ using namespace com::sun::star;
 static rtl::OUString s_comment;
 
 static bool s_check_object_is_in(void * pObject)
-{
+{ 
     uno::Environment currentEnv(uno::Environment::getCurrent());
 
     rtl_uString * pOId = NULL;
@@ -65,7 +65,7 @@ static bool s_check_object_is_in(void * pObject)
     uno::TypeDescription typeDescription(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface")));
 
     void * pRegisteredObject = NULL;
-    currentEnv.get()->pExtEnv->getRegisteredInterface(currentEnv.get()->pExtEnv,
+    currentEnv.get()->pExtEnv->getRegisteredInterface(currentEnv.get()->pExtEnv, 
                                                       &pRegisteredObject,
                                                       pOId,
                                                       (typelib_InterfaceTypeDescription *)typeDescription.get());
@@ -81,10 +81,10 @@ static bool s_check_object_is_in(void * pObject)
      return result;
 }
 
-static void s_test__loadSharedLibComponentFactory(rtl::OUString const & clientPurpose,
-                                                  rtl::OUString const & servicePurpose)
+static void s_test__loadSharedLibComponentFactory(rtl::OUString const & clientPurpose, 
+                                                  rtl::OUString const & servicePurpose) 
 {
-    cppu::EnvGuard envGuard(uno::Environment(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO))
+    cppu::EnvGuard envGuard(uno::Environment(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)) 
                                                + clientPurpose, NULL));
     if (clientPurpose.getLength() && !envGuard.is())
     {
@@ -110,13 +110,13 @@ static void s_test__loadSharedLibComponentFactory(rtl::OUString const & clientPu
             uno::Reference<registry::XRegistryKey>()
             )
         );
-
+    
     if (!xItf.is())
     {
         s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t\tgot no object - FAILURE\n"));
         return;
     }
-
+    
     if (!clientPurpose.equals(servicePurpose) && !s_check_object_is_in(xItf.get()))
     {
         s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t\tcouldn't find object in current purpose \""));
@@ -132,22 +132,22 @@ static void s_test__loadSharedLibComponentFactory(rtl::OUString const & clientPu
     }
 }
 
-static void s_test__loadSharedLibComponentFactory__free_free()
+static void s_test__loadSharedLibComponentFactory__free_free() 
 {
     s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__loadSharedLibComponentFactory__free_free\n"));
 
     s_test__loadSharedLibComponentFactory(rtl::OUString(), rtl::OUString());
 }
 
-static void s_test__loadSharedLibComponentFactory__free_purpose()
+static void s_test__loadSharedLibComponentFactory__free_purpose() 
 {
     s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__loadSharedLibComponentFactory__free_purpose\n"));
 
-    s_test__loadSharedLibComponentFactory(rtl::OUString(),
+    s_test__loadSharedLibComponentFactory(rtl::OUString(), 
                                           rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv")));
 }
 
-static void s_test__loadSharedLibComponentFactory__purpose_free()
+static void s_test__loadSharedLibComponentFactory__purpose_free() 
 {
     s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__loadSharedLibComponentFactory__purpose_free\n"));
 
@@ -155,11 +155,11 @@ static void s_test__loadSharedLibComponentFactory__purpose_free()
                                           rtl::OUString());
 }
 
-static void s_test__loadSharedLibComponentFactory__purpose_purpose()
+static void s_test__loadSharedLibComponentFactory__purpose_purpose() 
 {
     s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__loadSharedLibComponentFactory__purpose_purpose\n"));
 
-    s_test__loadSharedLibComponentFactory(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv")),
+    s_test__loadSharedLibComponentFactory(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv")), 
                                           rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":testenv")));
 }
 
@@ -192,7 +192,7 @@ static rtl::OUString s_getSDrive(void)
 
 static void s_test__createSimpleRegistry(rtl::OUString const & clientPurpose)
 {
-    cppu::EnvGuard envGuard(uno::Environment(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO))
+    cppu::EnvGuard envGuard(uno::Environment(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)) 
                                                + clientPurpose, NULL));
     if (clientPurpose.getLength() && !envGuard.is())
     {
@@ -211,7 +211,7 @@ static void s_test__createSimpleRegistry(rtl::OUString const & clientPurpose)
         s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t\tgot no object - FAILURE\n"));
         return;
     }
-
+    
     if (clientPurpose.getLength() != 0 && !s_check_object_is_in(registry.get()))
     {
         s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t\tcouldn't find object in current purpose \""));
@@ -237,7 +237,7 @@ static void s_test__createSimpleRegistry__purpose(void)
 
 static void s_test__bootstrap_InitialComponentContext(rtl::OUString const & clientPurpose)
 {
-    cppu::EnvGuard envGuard(uno::Environment(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO))
+    cppu::EnvGuard envGuard(uno::Environment(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)) 
                                                + clientPurpose, NULL));
     if (clientPurpose.getLength() && !envGuard.is())
     {
@@ -259,7 +259,7 @@ static void s_test__bootstrap_InitialComponentContext(rtl::OUString const & clie
         s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t\tgot no object - FAILURE\n"));
         return;
     }
-
+    
     if (clientPurpose.getLength() != 0 && !s_check_object_is_in(xContext.get()))
     {
         s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t\tcouldn't find object in current purpose \""));
@@ -305,16 +305,16 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(/*argc*/, argv)
         s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS PASSED\n"));
         ret = 0;
     }
-    else
+    else 
     {
         s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS _NOT_ PASSED\n"));
         ret = -1;
     }
 
-    std::cerr
-        << argv[0]
-        << std::endl
-        << rtl::OUStringToOString(s_comment, RTL_TEXTENCODING_ASCII_US).getStr()
+    std::cerr 
+        << argv[0] 
+        << std::endl 
+        << rtl::OUStringToOString(s_comment, RTL_TEXTENCODING_ASCII_US).getStr() 
         << std::endl;
 
     return ret;
diff --git a/cppuhelper/test/cfg_data/instance/uno/components.xml b/cppuhelper/test/cfg_data/instance/uno/components.xml
index b0ea5ce3b291..83305fca1273 100644
--- a/cppuhelper/test/cfg_data/instance/uno/components.xml
+++ b/cppuhelper/test/cfg_data/instance/uno/components.xml
@@ -5,7 +5,7 @@
             xmlns:cfg="http://openoffice.org/2000/registry/instance"
         xmlns="http://openoffice.org/2000/uno/Components">
 
-
+        
 <services cfg:type="set" cfg:element-type="service">
 
  <service cfg:name="com.sun.star.script.Converter">
@@ -13,7 +13,7 @@
    com.sun.star.comp.stoc.TypeConverter
   </available-implementations>
  </service>
-
+ 
  <service cfg:name="com.sun.star.bootstrap.TestComponent0">
   <available-implementations cfg:type="string" cfg:derivedBy="list">
    com.sun.star.comp.bootstrap.TestComponent0
@@ -23,7 +23,7 @@
    <cfg:any cfg:name="serviceprop1" cfg:type="string">value of serviceprop1</cfg:any>
   </context-properties>
  </service>
-
+ 
 </services>
 
 
@@ -34,7 +34,7 @@
   <url cfg:type="string">tcv.dll</url>
   <supported-services cfg:type="string" cfg:derivedBy="list">com.sun.star.script.Converter</supported-services>
  </implementation>
-
+ 
  <implementation cfg:name="com.sun.star.comp.bootstrap.TestComponent0">
   <activator cfg:type="string">com.sun.star.loader.SharedLibrary</activator>
   <url cfg:type="string">cfg_test.dll</url>
@@ -44,7 +44,7 @@
    <cfg:any cfg:name="implprop1" cfg:type="string">value of implprop1</cfg:any>
   </context-properties>
  </implementation>
-
+ 
 </implementations>
 
 
@@ -53,7 +53,7 @@
  <singleton cfg:name="com.sun.star.script.theConverter">
   <used-service cfg:type="string">com.sun.star.script.Converter</used-service>
  </singleton>
-
+ 
  <singleton cfg:name="com.sun.star.bootstrap.theTestComponent0">
   <used-service cfg:type="string">com.sun.star.bootstrap.TestComponent0</used-service>
   <initial-arguments cfg:type="set" cfg:element-type="cfg:any">
@@ -62,14 +62,14 @@
    <cfg:any cfg:name="2" cfg:type="string">third argument</cfg:any>
   </initial-arguments>
  </singleton>
-
+ 
 </singletons>
 
 
 <global-context-properties cfg:type="set" cfg:element-type="cfg:any">
 
  <cfg:any cfg:name="TestValue" cfg:type="int">5</cfg:any>
-
+ 
 </global-context-properties>
 
 
diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx
index 2a0671867157..53345815f186 100644
--- a/cppuhelper/test/cfg_test.cxx
+++ b/cppuhelper/test/cfg_test.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -90,13 +90,13 @@ class ServiceImpl0
     : public WeakImplHelper2< lang::XServiceInfo, lang::XInitialization >
 {
     Reference< XComponentContext > m_xContext;
-
+    
 public:
     ServiceImpl0( Reference< XComponentContext > const & xContext ) SAL_THROW( () );
 
     // XInitialization
     virtual void SAL_CALL initialize( const Sequence< Any >& rArgs ) throw (Exception, RuntimeException);
-
+    
     // XServiceInfo
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException);
     virtual OUString SAL_CALL getImplementationName() throw (RuntimeException);
@@ -108,7 +108,7 @@ ServiceImpl0::ServiceImpl0( Reference< XComponentContext > const & xContext ) SA
 {
     sal_Int32 n;
     OUString val;
-
+    
     // service properties
     OSL_VERIFY( m_xContext->getValueByName(
         OUSTR("/services/com.sun.star.bootstrap.TestComponent0/context-properties/serviceprop0") ) >>= n );
@@ -173,7 +173,7 @@ public:
     inline ServiceImpl1( Reference< XComponentContext > const & xContext ) SAL_THROW( () )
         : ServiceImpl0( xContext )
         {}
-
+    
     // XServiceInfo
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException);
     virtual OUString SAL_CALL getImplementationName() throw (RuntimeException);
@@ -259,19 +259,19 @@ SAL_IMPLEMENT_MAIN()
     {
         Reference< XComponentContext > xContext( defaultBootstrap_InitialComponentContext() );
         Reference< lang::XMultiComponentFactory > xMgr( xContext->getServiceManager() );
-
+        
         // show what is in context
         xContext->getValueByName( OUSTR("dump_maps") );
-
+        
         sal_Int32 n;
         OSL_VERIFY( xContext->getValueByName( OUSTR("/global-context-properties/TestValue") ) >>= n );
         ::fprintf( stderr, "> n=%d\n", n );
-
+        
         Reference< XInterface > x;
         OSL_VERIFY( !(xContext->getValueByName( OUSTR("/singletons/my_converter") ) >>= x) );
         OSL_VERIFY( xContext->getValueByName( OUSTR("/singletons/com.sun.star.script.theConverter") ) >>= x );
         OSL_VERIFY( xContext->getValueByName( OUSTR("/singletons/com.sun.star.bootstrap.theTestComponent0") ) >>= x );
-
+        
         ::fprintf( stderr, "> registering service...\n", n );
 #if defined(SAL_W32) || defined(SAL_OS2)
         OUString libName( OUSTR("cfg_test.dll") );
@@ -284,10 +284,10 @@ SAL_IMPLEMENT_MAIN()
         xImplReg->registerImplementation(
             OUSTR("com.sun.star.loader.SharedLibrary"), libName,
             Reference< registry::XSimpleRegistry >() );
-
+        
         OSL_VERIFY( (x = xMgr->createInstanceWithContext( OUSTR("com.sun.star.bootstrap.TestComponent0"), xContext )).is() );
         OSL_VERIFY( (x = xMgr->createInstanceWithContext( OUSTR("com.sun.star.bootstrap.TestComponent1"), xContext )).is() );
-
+        
         Reference< lang::XComponent > xComp( xContext, UNO_QUERY );
         if (xComp.is())
         {
diff --git a/cppuhelper/test/helpertest.idl b/cppuhelper/test/helpertest.idl
index e78629ab5313..daa69656f4ef 100644
--- a/cppuhelper/test/helpertest.idl
+++ b/cppuhelper/test/helpertest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 module test
 {
-
+    
 interface A : com::sun::star::uno::XInterface
 {
     string a();
diff --git a/cppuhelper/test/loader/loader.test.cxx b/cppuhelper/test/loader/loader.test.cxx
index 53d5d96ac175..34846197d030 100644
--- a/cppuhelper/test/loader/loader.test.cxx
+++ b/cppuhelper/test/loader/loader.test.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -83,12 +83,12 @@ public:
 
 
 
-static rtl::OUString s_test__cppu_loadSharedLibComponentFactory(char const * pServicePurpose)
+static rtl::OUString s_test__cppu_loadSharedLibComponentFactory(char const * pServicePurpose) 
 {
     rtl::OUString result;
 
-    rtl::OUString servicePurpose = rtl::OUString(pServicePurpose,
-                                                 rtl_str_getLength(pServicePurpose),
+    rtl::OUString servicePurpose = rtl::OUString(pServicePurpose, 
+                                                 rtl_str_getLength(pServicePurpose), 
                                                  RTL_TEXTENCODING_ASCII_US);
 
     result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__cppu_loadSharedLibComponentFactory "));
@@ -110,7 +110,7 @@ static rtl::OUString s_test__cppu_loadSharedLibComponentFactory(char const * pSe
         if (envDcp_purpose == servicePurpose)
             result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("passed\n"));
 
-        else
+        else 
         {
             result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FAILED - got: \""));
             result += envDcp_purpose;
@@ -126,12 +126,12 @@ static rtl::OUString s_test__cppu_loadSharedLibComponentFactory(char const * pSe
     return result;
 }
 
-static rtl::OUString s_test__cppu_writeSharedLibComponentInfo(char const * pServicePurpose)
+static rtl::OUString s_test__cppu_writeSharedLibComponentInfo(char const * pServicePurpose) 
 {
     rtl::OUString result;
 
-    rtl::OUString servicePurpose = rtl::OUString(pServicePurpose,
-                                                 rtl_str_getLength(pServicePurpose),
+    rtl::OUString servicePurpose = rtl::OUString(pServicePurpose, 
+                                                 rtl_str_getLength(pServicePurpose), 
                                                  RTL_TEXTENCODING_ASCII_US);
 
     result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__cppu_writeSharedLibComponentInfo "));
@@ -157,7 +157,7 @@ static rtl::OUString s_test__cppu_writeSharedLibComponentInfo(char const * pServ
         if (envDcp_purpose == servicePurpose)
             result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("passed\n"));
 
-        else
+        else 
         {
             result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FAILED - got: \""));
             result += envDcp_purpose;
@@ -190,11 +190,11 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(/*argc*/, argv)
     message += s_test__cppu_writeSharedLibComponentInfo(":unsafe");
     message += s_test__cppu_writeSharedLibComponentInfo(":affine");
     message += s_test__cppu_writeSharedLibComponentInfo("");
-
+    
     if (message.indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FAILED"))) == -1)
         message += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS PASSED\n"));
 
-    else
+    else 
     {
         message += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS _NOT_ PASSED\n"));
         result = -1;
diff --git a/cppuhelper/test/testcmp/TestComponent.cxx b/cppuhelper/test/testcmp/TestComponent.cxx
index 83bdac1a47a2..b8858f3329bd 100644
--- a/cppuhelper/test/testcmp/TestComponent.cxx
+++ b/cppuhelper/test/testcmp/TestComponent.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -84,12 +84,12 @@ public:
     uno::Any SAL_CALL queryInterface(uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException);
     void SAL_CALL release() throw ();
     void SAL_CALL acquire() throw ();
-
+    
     // lang::XServiceInfo
     virtual rtl::OUString SAL_CALL getImplementationName() throw (uno::RuntimeException);
     virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
         throw (uno::RuntimeException);
-    virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames()
+    virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() 
         throw (uno::RuntimeException);
 
 protected:
@@ -133,25 +133,25 @@ TestComponent::~TestComponent()
     LOG_LIFECYCLE_TestComponent_emit(fprintf(stderr, "LIFE: %s -> %p\n", "TestComponent::~TestComponent", this));
 }
 
-rtl::OUString SAL_CALL TestComponent::getImplementationName()
+rtl::OUString SAL_CALL TestComponent::getImplementationName() 
     throw (uno::RuntimeException)
 {
     return m_implName;
 }
 
-void SAL_CALL TestComponent::acquire() throw ()
+void SAL_CALL TestComponent::acquire() throw () 
 {
-     cppu::WeakImplHelper1<lang::XServiceInfo>::acquire();
-}
+     cppu::WeakImplHelper1<lang::XServiceInfo>::acquire(); 
+} 
 
-void SAL_CALL TestComponent::release() throw ()
+void SAL_CALL TestComponent::release() throw () 
 {
-    cppu::WeakImplHelper1<lang::XServiceInfo>::release();
-}
+    cppu::WeakImplHelper1<lang::XServiceInfo>::release(); 
+} 
 
 uno::Any SAL_CALL TestComponent::queryInterface(uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
 {
-    return cppu::WeakImplHelper1<lang::XServiceInfo>::queryInterface(rType);
+    return cppu::WeakImplHelper1<lang::XServiceInfo>::queryInterface(rType); 
 }
 
 sal_Bool SAL_CALL TestComponent::supportsService(rtl::OUString const & ServiceName)
@@ -168,14 +168,14 @@ sal_Bool SAL_CALL TestComponent::supportsService(rtl::OUString const & ServiceNa
     return false;
 }
 
-uno::Sequence<rtl::OUString> SAL_CALL TestComponent::getSupportedServiceNames()
+uno::Sequence<rtl::OUString> SAL_CALL TestComponent::getSupportedServiceNames() 
     throw (uno::RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
 
 extern "C" sal_Bool SAL_CALL component_writeInfo(
-    void * /*serviceManager*/,
+    void * /*serviceManager*/, 
     void * /*registryKey*/
 )
 {
@@ -185,8 +185,8 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
-    char const * pImplName,
-    void       * /*serviceManager*/,
+    char const * pImplName, 
+    void       * /*serviceManager*/, 
     void       * /*registryKey*/
 )
 {
@@ -213,7 +213,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT  void SAL_CALL component_getImplementationEnvironmentExt(
-    sal_Char        const ** envTypeName,
+    sal_Char        const ** envTypeName, 
     uno_Environment       ** /*ppEnv*/,
     sal_Char        const  * pImplName,
     uno_Environment        * /*pSrcEnv*/
@@ -227,7 +227,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT  void SAL_CALL component_getImplementationEnviro
         purpose = rtl::OUStringToOString(cppu::EnvDcp::getPurpose(uImplName), RTL_TEXTENCODING_ASCII_US);
     }
 
-    if (!purpose.getLength())
+    if (!purpose.getLength()) 
     {
         char * pPurpose = getenv("TestComponent.uno");
         if (pPurpose)
diff --git a/cppuhelper/test/testcmp/TestComponent.hxx b/cppuhelper/test/testcmp/TestComponent.hxx
index 7499628148f4..92824bd8acb6 100644
--- a/cppuhelper/test/testcmp/TestComponent.hxx
+++ b/cppuhelper/test/testcmp/TestComponent.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/test/testcontainer.cxx b/cppuhelper/test/testcontainer.cxx
index 1dc37b61c596..ccf9aeda31a7 100644
--- a/cppuhelper/test/testcontainer.cxx
+++ b/cppuhelper/test/testcontainer.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,8 +49,8 @@ class TestListener : public WeakImplHelper1< XVetoableChangeListener >
         {
 
         }
-
-    virtual void SAL_CALL vetoableChange( const ::com::sun::star::beans::PropertyChangeEvent& /*aEvent*/ )
+    
+    virtual void SAL_CALL vetoableChange( const ::com::sun::star::beans::PropertyChangeEvent& /*aEvent*/ ) 
        throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException)
         {
 
@@ -68,7 +68,7 @@ void test_interfacecontainer()
         Reference< XVetoableChangeListener > r1 = new TestListener();
         Reference< XVetoableChangeListener > r2 = new TestListener();
         Reference< XVetoableChangeListener > r3 = new TestListener();
-
+        
         helper.addInterface( r1 );
         helper.addInterface( r2 );
         helper.addInterface( r3 );
@@ -82,7 +82,7 @@ void test_interfacecontainer()
         Reference< XVetoableChangeListener > r1 = new TestListener();
         Reference< XVetoableChangeListener > r2 = new TestListener();
         Reference< XVetoableChangeListener > r3 = new TestListener();
-
+        
         helper.addInterface( r1 );
         helper.addInterface( r2 );
         helper.addInterface( r3 );
@@ -91,7 +91,7 @@ void test_interfacecontainer()
 
         while( iterator.hasMoreElements() )
             ((XVetoableChangeListener*)iterator.next())->vetoableChange( PropertyChangeEvent() );
-
+        
         helper.disposeAndClear( EventObject() );
     }
 
@@ -101,7 +101,7 @@ void test_interfacecontainer()
         Reference< XVetoableChangeListener > r1 = new TestListener();
         Reference< XVetoableChangeListener > r2 = new TestListener();
         Reference< XVetoableChangeListener > r3 = new TestListener();
-
+        
         helper.addInterface( r1 );
         helper.addInterface( r2 );
         helper.addInterface( r3 );
@@ -125,7 +125,7 @@ void test_interfacecontainer()
         Reference< XVetoableChangeListener > r1 = new TestListener();
         Reference< XVetoableChangeListener > r2 = new TestListener();
         Reference< XVetoableChangeListener > r3 = new TestListener();
-
+        
         helper.addInterface( r1 );
         helper.addInterface( r2 );
         helper.addInterface( r3 );
@@ -148,7 +148,7 @@ void test_interfacecontainer()
                 OSL_ASSERT( r != r1 && ( r == r2 || r == r3 ) );
             }
         }
-
+        
         helper.disposeAndClear( EventObject() );
     }
 }
diff --git a/cppuhelper/test/testdefaultbootstrapping.cxx b/cppuhelper/test/testdefaultbootstrapping.cxx
index fce0a1242a82..52f1c96af619 100644
--- a/cppuhelper/test/testdefaultbootstrapping.cxx
+++ b/cppuhelper/test/testdefaultbootstrapping.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,7 +59,7 @@ SAL_IMPLEMENT_MAIN()
             OUString arg;
 
             rtl_getAppCommandArg(i, &arg.pData);
-            if (arg.getLength())
+            if (arg.getLength()) 
             {
                 Reference<XInterface> xInterface = smgr->createInstance(arg);
                 OString tmp = OUStringToOString(arg, RTL_TEXTENCODING_ASCII_US);
diff --git a/cppuhelper/test/testdefaultbootstrapping.pl b/cppuhelper/test/testdefaultbootstrapping.pl
index c1756e908529..b96ed5c49bcb 100644
--- a/cppuhelper/test/testdefaultbootstrapping.pl
+++ b/cppuhelper/test/testdefaultbootstrapping.pl
@@ -4,7 +4,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -58,7 +58,7 @@ else {
 sub extendProgName($) {
     my $_extension = shift;
     my $_result;
-
+    
     if ($ENV{GUI} eq "WNT") {
         $_result = $progname . $_extension;
     }
@@ -91,7 +91,7 @@ sub testForServices($$$) {
     my $_testexe  = shift;
 
 
-#   my $_rc = system 'echo', $_testexe, @{$_services}, $_pars;
+#	my $_rc = system 'echo', $_testexe, @{$_services}, $_pars;
     my $_rc = system $_testexe, @{$_services}, $_pars;
 
     return $_rc >> 8;
@@ -102,7 +102,7 @@ sub registerService($$){
     my $service_lib  = shift;
     my $rdb_name = shift;
 
-#   system 'echo', "regcomp -register -r " . $rdb_name . " -c $service_lib";
+#	system 'echo', "regcomp -register -r " . $rdb_name . " -c $service_lib";
     my $rc = system "regcomp -register -r " . $rdb_name . " -c $service_lib";
 
 
@@ -131,21 +131,21 @@ sub registerServices() {
             $comment = $comment . "\tcouldn't unregister service " . $service . "\n";
             $state = 0;
         }
-
-
+        
+        
         # register the service and ensure that it is reachable
         $rc = registerService($services{$service}, $service . '.rdb');
         if(!$rc) {
             $comment = $comment . "\tcouldn't register service " . $service . "\n";
             $state = 0;
         }
-
+        
         $rc = testForServices([$service], "-env:UNO_SERVICES=" . $service . ".rdb", $testexe);
         if(!$rc) {
             $comment = $comment . "\tcouldn't reach service " . $service . "\n";
             $state = 0;
         }
-
+        
         # memorize all services
         if (length($allservices_rdbs)) {
             $allservices_rdbs = $allservices_rdbs . " ";
@@ -169,7 +169,7 @@ sub testBeneathExe() {
     my $service = 'com.sun.star.reflection.CoreReflection';
     my $_testexe;
 
-    my @_exes = (extendProgName(".exe"),
+    my @_exes = (extendProgName(".exe"), 
                  extendProgName(".Exe"),
                  extendProgName(".bin"),
                  extendProgName(".Bin"));
@@ -243,7 +243,7 @@ sub testAllAvailable() {
     # test that all services are reachable through different rdbs
     # change the directory to ensure, that all paths become expanded
     chdir "..";
-
+    
     $rc = testForServices(\@allservices, "-env:UNO_SERVICES=" . $allservices_rdbs, $testexe);
     if (!$rc) {
         $comment = $comment . "\tmulti rdb test not passed\n";
diff --git a/cppuhelper/test/testhelper.cxx b/cppuhelper/test/testhelper.cxx
index 623585299c76..faa83b92fb24 100644
--- a/cppuhelper/test/testhelper.cxx
+++ b/cppuhelper/test/testhelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -77,14 +77,14 @@ SAL_IMPLEMENT_MAIN()
             Reference< beans::XPropertySet >(
                 xContext->getServiceManager(), UNO_QUERY )->getPropertyValue(
                     OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) != xInitialContext );
-
+    
         Reference< XMultiServiceFactory > x( xMgr, UNO_QUERY );
         test_ImplHelper( x );
         testPropertyTypeHelper();
         testidlclass( x );
          test_PropertySetHelper();
         test_interfacecontainer();
-
+        
         OSL_VERIFY( xContext->getValueByName(
                         OUString( RTL_CONSTASCII_USTRINGPARAM("bla, bla") ) ) == (sal_Int32)5 );
         OSL_VERIFY( ! xInitialContext->getValueByName(
@@ -99,7 +99,7 @@ SAL_IMPLEMENT_MAIN()
         OString cstr_msg( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
         OSL_ENSURE( ! "exception occured: ", cstr_msg.getStr() );
     }
-
+    
     printf( "Test finished\n" );
     return 0;
 }
diff --git a/cppuhelper/test/testhelper.hxx b/cppuhelper/test/testhelper.hxx
index a164c1c6b9f4..c40d738d83ba 100644
--- a/cppuhelper/test/testhelper.hxx
+++ b/cppuhelper/test/testhelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/test/testidlclass.cxx b/cppuhelper/test/testidlclass.cxx
index 48ee84ed9101..fca2a64089f8 100644
--- a/cppuhelper/test/testidlclass.cxx
+++ b/cppuhelper/test/testidlclass.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -101,11 +101,11 @@ void testidlclass( const Reference < XMultiServiceFactory > &rSMgr)
     //TODO !
     // one idl class for one interface
     // this test fails, if core reflection fails !
-//  OSL_ASSERT( 1 == seqIdlClass.getLength() );
-//  Reference < XIdlClass > rIdlInterface = seqIdlClass.getArray()[0];
+//	OSL_ASSERT( 1 == seqIdlClass.getLength() );
+//	Reference < XIdlClass > rIdlInterface = seqIdlClass.getArray()[0];
 
     // check for IdlClass interface returned by Core Reflection
-//  OSL_ASSERT( rIdlInterface.is() );
+//	OSL_ASSERT( rIdlInterface.is() );
 
 
 
diff --git a/cppuhelper/test/testimplhelper.cxx b/cppuhelper/test/testimplhelper.cxx
index b3c2638739c3..703c44ebebbb 100644
--- a/cppuhelper/test/testimplhelper.cxx
+++ b/cppuhelper/test/testimplhelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -91,7 +91,7 @@ using namespace com::sun::star::uno;
 struct TestImpl : public ImplHelper4< CA, DBA, FE, G >
 {
     sal_Int32 nRef;
-
+    
     virtual ~TestImpl()
         { OSL_TRACE( "> TestImpl dtor called... <\n" ); }
 
@@ -101,7 +101,7 @@ struct TestImpl : public ImplHelper4< CA, DBA, FE, G >
         { ++nRef; }
     virtual void SAL_CALL release(  ) throw()
         { if (! --nRef) delete this; }
-
+    
     // A
     virtual OUString SAL_CALL a() throw(RuntimeException)
         { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); }
@@ -130,7 +130,7 @@ struct TestWeakAggImpl : public WeakAggImplHelper4< CA, DBA, FE, G >
 {
     virtual ~TestWeakAggImpl()
         { OSL_TRACE( "> TestWeakAggImpl dtor called... <\n" ); }
-
+    
     // A
     virtual OUString SAL_CALL a() throw(RuntimeException)
         { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); }
@@ -161,7 +161,7 @@ struct TestWeakImpl : public WeakImplHelper4< CA, DBA, FE, G >
 
     virtual ~TestWeakImpl()
         { OSL_TRACE( "> TestWeakImpl dtor called... <\n" ); }
-
+    
     // A
     virtual OUString SAL_CALL a() throw(RuntimeException)
         { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); }
@@ -210,7 +210,7 @@ struct TestWeakComponentImpl : public WeakComponentImplHelper4< CA, DBA, FE, G >
 
     void SAL_CALL disposing()
         { OSL_TRACE( "> TestWeakComponentImpl disposing called... <\n" ); }
-
+    
     // A
     virtual OUString SAL_CALL a() throw(RuntimeException)
         { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); }
@@ -246,7 +246,7 @@ struct TestWeakAggComponentImpl : public WeakAggComponentImplHelper4< CA, DBA, F
 
     void SAL_CALL disposing()
         { OSL_TRACE( "> TestWeakAggComponentImpl disposing called... <\n" ); }
-
+    
     // A
     virtual OUString SAL_CALL a() throw(RuntimeException)
         { return OUString( RTL_CONSTASCII_USTRINGPARAM("a") ); }
@@ -295,7 +295,7 @@ struct TestImplInh : public ImplInheritanceHelper2< TestWeakImpl, H, I >
 
     virtual ~TestImplInh()
         { OSL_TRACE( "> TestWeakImplInh dtor called... <\n" ); }
-
+    
     // H
     virtual OUString SAL_CALL h() throw(RuntimeException)
         { return OUString( RTL_CONSTASCII_USTRINGPARAM("h") ); }
@@ -309,7 +309,7 @@ struct TestAggImplInh : public AggImplInheritanceHelper2< TestWeakAggImpl, H, I
 {
     virtual ~TestAggImplInh()
         { OSL_TRACE( "> TestAggImplInh dtor called... <\n" ); }
-
+    
     // H
     virtual OUString SAL_CALL h() throw(RuntimeException)
         { return OUString( RTL_CONSTASCII_USTRINGPARAM("h2") ); }
@@ -348,7 +348,7 @@ static void dotest( const Reference< XInterface > & xOriginal )
     {
         ::fprintf( stderr, n < 15 ? "%x " : "%x \n", id[ n ] );
     }
-
+    
     Reference< A > xa( xOriginal, UNO_QUERY );
     OSL_ENSURE( xa->a().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("a") ), "### A failed!" );
     Reference< BA > xba( xa, UNO_QUERY );
@@ -372,14 +372,14 @@ static void dotest( const Reference< XInterface > & xOriginal )
     // type provider
     Reference< lang::XTypeProvider > xProv( xg, UNO_QUERY );
     Sequence< Type > aTypes( xProv->getTypes() );
-
+    
     // CA, DBA, FE, G, XTypeProvider
     OSL_ASSERT( isIn( aTypes, "test.CA" ) );
     OSL_ASSERT( isIn( aTypes, "test.DBA" ) );
     OSL_ASSERT( isIn( aTypes, "test.FE") );
     OSL_ASSERT( isIn( aTypes, "test.G") );
     OSL_ASSERT( isIn( aTypes, "com.sun.star.lang.XTypeProvider") );
-
+    
     Reference< XWeak > xWeak( xg, UNO_QUERY );
     if (xWeak.is())
     {
@@ -390,7 +390,7 @@ static void dotest( const Reference< XInterface > & xOriginal )
     {
         OSL_ASSERT( isIn( aTypes, "com.sun.star.lang.XComponent") );
     }
-
+    
     Reference< XAggregation > xAgg( xg, UNO_QUERY );
     if (xAgg.is())
     {
@@ -406,7 +406,7 @@ static void dotest( const Reference< XInterface > & xOriginal )
     {
         OSL_ASSERT( isIn( aTypes, "test.I") );
     }
-
+    
     OSL_ENSURE( xg == xOriginal, "### root!" );
 }
 
@@ -455,7 +455,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
         xTP3->getImplementationId() != xTP5->getImplementationId() &&
         xTP4->getImplementationId() != xTP5->getImplementationId() );
     //
-
+    
     dotest( xImpl );
     dotest( xWeakImpl );
     dotest( xWeakAggImpl );
@@ -469,7 +469,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
     Reference< I > xI( xH, UNO_QUERY );
     OSL_ASSERT( xH->h().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("h") ) );
     OSL_ASSERT( xI->i().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("i") ) );
-
+    
     xWeakAggImpl = (OWeakObject *)new TestAggImplInh();
     Reference< lang::XTypeProvider > xTP7( xWeakAggImpl, UNO_QUERY );
     dotest( xWeakAggImpl );
@@ -506,7 +506,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
     {
         Any a( getCaughtException() );
         OSL_ASSERT( a == exc );
-
+        
         try
         {
             throwException( a );
@@ -514,7 +514,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
         catch (lang::IllegalAccessException & e)
         {
             OSL_ASSERT( exc.Message == e.Message && exc.Context == e.Context );
-
+            
             try
             {
                 throw_one( exc );
@@ -538,7 +538,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ )
         }
     }
     OSL_ASSERT( exc_succ );
-
+    
     try
     {
         throwException( makeAny( RuntimeException(
diff --git a/cppuhelper/test/testlib/UNO.pm b/cppuhelper/test/testlib/UNO.pm
index 052a9ea986d3..0bc7b27fc86a 100644
--- a/cppuhelper/test/testlib/UNO.pm
+++ b/cppuhelper/test/testlib/UNO.pm
@@ -13,17 +13,17 @@ our @ISA = qw(Exporter DynaLoader);
 # names by default without a very good reason. Use EXPORT_OK instead.
 # Do not simply export all your public functions/methods/constants.
 
-# This allows declaration   use UNO ':all';
+# This allows declaration	use UNO ':all';
 # If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
 # will save memory.
 our %EXPORT_TAGS = ( 'all' => [ qw(
-
+    
 ) ] );
 
 our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
 
 our @EXPORT = qw(
-
+    
 );
 our $VERSION = '0.01';
 
diff --git a/cppuhelper/test/testlib/defbootstrap_lib.cxx b/cppuhelper/test/testlib/defbootstrap_lib.cxx
index 64c28766a5f3..22a4c5d865a4 100644
--- a/cppuhelper/test/testlib/defbootstrap_lib.cxx
+++ b/cppuhelper/test/testlib/defbootstrap_lib.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -94,7 +94,7 @@ XS(XS_UNO_tryService)
     Perl_croak(aTHX_ "Usage: UNO::tryService(input)");
     {
         const char * input = (const char *)SvPV(ST(0),PL_na);
-        int RETVAL;
+        int	RETVAL;
         dXSTARG;
 
         RETVAL = tryService(input);
diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx
index 94b1401e35e7..ebea7d09289d 100644
--- a/cppuhelper/test/testpropshlp.cxx
+++ b/cppuhelper/test/testpropshlp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,17 +68,17 @@ static Property * getPropertyTable1()
         if( ! pTable ) {
             static Property aTable[] =
             {
-                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString *)0) ,
+                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString *)0) , 
                              PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //OUString
-                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ) ,
+                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ) , 
                              PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //Char
-                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("c") ), 2, getCppuType( (sal_Int32*)0) ,
+                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("c") ), 2, getCppuType( (sal_Int32*)0) , 
                              PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //sal_Int32
-                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("d") ), 5, getCppuType( (double*)0)     ,
+                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("d") ), 5, getCppuType( (double*)0) 	, 
                              PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //double
-                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("e") ), 7, getCppuBooleanType()         ,
+                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("e") ), 7, getCppuBooleanType() 		, 
                              PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //BOOL
-                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 8, getCppuType( (Any*)0)        ,
+                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 8, getCppuType( (Any*)0)		, 
                              PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID )  //Any
             };
             pTable = aTable;
@@ -97,18 +97,18 @@ static Property * getPropertyTable2()
         if( ! pTable ) {
             static Property aTable[] =
             {
-                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 8, getCppuType( (Any *)0)   ,
-                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ),   // Any
-                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ),
-                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ),   // Char
-                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString*)0),
-                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ),   // OUString
-                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("d") ), 5, getCppuType( (double*)0) ,
-                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ),   // Double
-                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("c") ), 2, getCppuType( (sal_Int32*)0),
-                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ),   // sal_Int32
-                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("e") ), 7, getCppuBooleanType()         ,
-                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID )    // Bool
+                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 8, getCppuType( (Any *)0)	, 
+                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ),	// Any
+                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ), 
+                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ),	// Char
+                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString*)0), 
+                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ),	// OUString
+                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("d") ), 5, getCppuType( (double*)0)	, 
+                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ),	// Double
+                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("c") ), 2, getCppuType( (sal_Int32*)0), 
+                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ),	// sal_Int32
+                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("e") ), 7, getCppuBooleanType() 		, 
+                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID )	// Bool
             };
             pTable = aTable;
         }
@@ -125,12 +125,12 @@ static Property * getPropertyTable3()
         if( ! pTable ) {
             static Property aTable[] =
             {
-                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ),
-                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ),   // Char
-                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 8, getCppuType( (Any *)0)   ,
-                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ),   // any
-                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString*)0),
-                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID )    // OUString
+                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ), 
+                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ),	// Char
+                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 8, getCppuType( (Any *)0)	, 
+                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ),	// any
+                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString*)0), 
+                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID )	// OUString
             };
             pTable = aTable;
         }
@@ -148,12 +148,12 @@ static Property * getPropertyTable4()
         if( ! pTable ) {
             static Property aTable[] =
             {
-                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString*)0),
-                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ),   // OUString
-                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ),
+                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("a") ), 0, getCppuType( (OUString*)0), 
+                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ),	// OUString
+                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("b") ), 1, getCppuCharType( ), 
                                      PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Char
-                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 2, getCppuType( (Any *)0)   ,
-                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID )    // Any
+                Property( OUString( RTL_CONSTASCII_USTRINGPARAM("f") ), 2, getCppuType( (Any *)0)	, 
+                                    PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID )	// Any
             };
             pTable = aTable;
         }
@@ -181,9 +181,9 @@ void test_PropertyArrayHelper()
         OSL_ENSURE( 6 == aProps.getLength(), "getProperties() gives not all properties" );
         for( int i = 0; i < 6; i++ )
         {
-            OSL_ENSURE( pP[i].Name      == getPropertyTable1()[i].Name , "Name not correct" );
-            OSL_ENSURE( pP[i].Handle        == getPropertyTable1()[i].Handle, "Handle not correct" );
-            OSL_ENSURE( pP[i].Attributes    == getPropertyTable1()[i].Attributes, "Attributes not correct" );
+            OSL_ENSURE( pP[i].Name 		== getPropertyTable1()[i].Name , "Name not correct" );
+            OSL_ENSURE( pP[i].Handle 		== getPropertyTable1()[i].Handle, "Handle not correct" );
+            OSL_ENSURE( pP[i].Attributes 	== getPropertyTable1()[i].Attributes, "Attributes not correct" );
             OSL_ENSURE( pP[i].Type == getPropertyTable1()[i].Type, "Type not correct" );
         }
     }
@@ -258,14 +258,14 @@ void test_PropertyArrayHelper()
         sal_Int32 Handle = a1.getHandleByName( OUString( RTL_CONSTASCII_USTRINGPARAM("asdaf") ) );
         OSL_ENSURE( Handle == -1, "Handle not correct" );
     }
-
+    
     // Test fillPropertyMembersByHandle
     {
         OPropertyArrayHelper a1( getPropertyTable1(), 6 );
         int i;
         for( i = 0; i < 6; i++ )
         {
-            sal_Int16   nAttributes;
+            sal_Int16	nAttributes;
             OUString aPropName;
             sal_Bool b = a1.fillPropertyMembersByHandle( &aPropName, &nAttributes, getPropertyTable1()[i].Handle );
             OSL_ENSURE( b, "fillPropertyMembersByHandle: handle not found" );
@@ -277,7 +277,7 @@ void test_PropertyArrayHelper()
         OPropertyArrayHelper a4( getPropertyTable4(), 3 );
         for( i = 0; i < 3; i++ )
         {
-            sal_Int16   nAttributes;
+            sal_Int16	nAttributes;
             OUString aPropName;
             sal_Bool b = a1.fillPropertyMembersByHandle( &aPropName, &nAttributes, getPropertyTable4()[i].Handle );
             OSL_ENSURE( b, "fillPropertyMembersByHandle: handle not found" );
@@ -310,28 +310,28 @@ void test_PropertyArrayHelper()
 
 
 //----------------------------------------------------
-//  test_OPropertySetHelper
+//	test_OPropertySetHelper
 //----------------------------------------------------
 struct MutexContainer
 {
     Mutex aMutex;
 };
-class test_OPropertySetHelper :
+class test_OPropertySetHelper : 
             public MutexContainer,
-            public OBroadcastHelper ,
+            public OBroadcastHelper , 
             public OPropertySetHelper,
             public OWeakObject
 {
 public:
 
-                    test_OPropertySetHelper( Property * p, sal_Int32    n )
-                        : MutexContainer()
+                    test_OPropertySetHelper( Property * p, sal_Int32	n )
+                        : MutexContainer() 
                         , OBroadcastHelper( ((MutexContainer *)this)->aMutex )
-//                      , OPropertySetHelper( *SAL_STATIC_CAST(OBroadcastHelper *,this))
-                        // MSCI 4 bug ! :
-                        //      OBroadcastHelper == OBroadcastHelperVar<OMultiTypeInterfaceContainerHelper>
-                        , OPropertySetHelper(
-                                *SAL_STATIC_CAST(OBroadcastHelper *,this))
+//						, OPropertySetHelper( *SAL_STATIC_CAST(OBroadcastHelper *,this)) 
+                        // MSCI 4 bug !	: 
+                        //		OBroadcastHelper == OBroadcastHelperVar<OMultiTypeInterfaceContainerHelper>
+                        , OPropertySetHelper( 
+                                *SAL_STATIC_CAST(OBroadcastHelper *,this)) 
                         , bBOOL( sal_False )
                         , nINT16( 0 )
                         , nINT32( 0 )
@@ -339,7 +339,7 @@ public:
                         , nPropCount( n )
                     {
                     }
-
+    
 
                     ~test_OPropertySetHelper()
                     {
@@ -362,7 +362,7 @@ public:
                             disposing();
                             EventObject aEvt;
                             aEvt.Source = Reference < XInterface > ( SAL_STATIC_CAST( OWeakObject * ,this) );
-
+                            
                             rBHelper.aLC.disposeAndClear( aEvt );
                             rBHelper.bDisposed = sal_True;
                             rBHelper.bInDispose = sal_False;
@@ -370,14 +370,14 @@ public:
                     }
 
     // XInterface
-    Any             SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(RuntimeException)
-                    {
+    Any				SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(RuntimeException)
+                    { 
                         Any aRet( OPropertySetHelper::queryInterface( rType ) );
                         return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
                     }
-    void            SAL_CALL acquire() throw()
+    void			SAL_CALL acquire() throw()
                             { OWeakObject::acquire(); }
-    void            SAL_CALL release() throw()
+    void			SAL_CALL release() throw()
                             { OWeakObject::release(); }
 
     // XPropertySet
@@ -385,15 +385,15 @@ public:
 
     using OPropertySetHelper::getFastPropertyValue;
 
-    sal_Bool                    bBOOL;
-    sal_Int16                   nINT16;
-    sal_Int32                   nINT32;
+    sal_Bool					bBOOL;
+    sal_Int16					nINT16;
+    sal_Int32					nINT32;
     Property *                  pBasicProps;
-    sal_Int32                   nPropCount;
+    sal_Int32					nPropCount;
 protected:
     IPropertyArrayHelper & SAL_CALL getInfoHelper() throw(RuntimeException);
     sal_Bool SAL_CALL convertFastPropertyValue(
-        Any & rConvertedValue, Any & rOldValue,
+        Any & rConvertedValue, Any & rOldValue, 
         sal_Int32 nHandle, const Any& rValue )
         throw(IllegalArgumentException);
     void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw(RuntimeException);
@@ -404,12 +404,12 @@ protected:
 //------ The Properties of this implementation -------------------------
 //----------------------------------------------------------------------
 // Id must be the index into the array
-#define PROPERTY_BOOL       0
-#define PROPERTY_INT16      1
-#define PROPERTY_INT32      2
+#define PROPERTY_BOOL		0
+#define PROPERTY_INT16		1
+#define PROPERTY_INT32		2
 
 // Max number of properties
-#define PROPERTY_COUNT                      4
+#define PROPERTY_COUNT						4
 // Names of Properties
 /**
  * All Properties of this implementation. Must be sorted by name.
@@ -424,11 +424,11 @@ Property * getBasicProps()
 
             static Property aBasicProps[PROPERTY_COUNT] =
             {
-                 Property( OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") )  , PROPERTY_BOOL , getCppuBooleanType(), PropertyAttribute::READONLY ),
-                 Property( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ) , PROPERTY_INT16,
-                                 getCppuType( (sal_Int16*)0 ),  PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ),
-                 Property( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ) , PROPERTY_INT32, getCppuType( (sal_Int32*)0 ), PropertyAttribute::BOUND ),
-                 Property( OUString( RTL_CONSTASCII_USTRINGPARAM("TEST") )  , 55            , getCppuType( (sal_Int32*)0),  PropertyAttribute::BOUND )
+                 Property( OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") )	, PROPERTY_BOOL	, getCppuBooleanType(),	PropertyAttribute::READONLY ),
+                 Property( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") )	, PROPERTY_INT16, 
+                                 getCppuType( (sal_Int16*)0 ), 	PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ),
+                 Property( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") )	, PROPERTY_INT32, getCppuType( (sal_Int32*)0 ), PropertyAttribute::BOUND ),
+                 Property( OUString( RTL_CONSTASCII_USTRINGPARAM("TEST") )	, 55			, getCppuType( (sal_Int32*)0), 	PropertyAttribute::BOUND )
             };
             pTable = aBasicProps;
         }
@@ -438,17 +438,17 @@ Property * getBasicProps()
 
 
 //----------------------------------------------------
-//  test_OPropertySetHelper_Listener
+//	test_OPropertySetHelper_Listener
 //----------------------------------------------------
 class test_OPropertySetHelper_Listener
     : public WeakImplHelper3< XPropertyChangeListener, XPropertiesChangeListener, XVetoableChangeListener >
 {
 public:
-    sal_Int32           nDisposing;
-    Mutex               aMutex;
-    Any *               pExceptedListenerValues;
-    sal_Int32           nCount;
-    sal_Int32           nCurrent;
+    sal_Int32			nDisposing;
+    Mutex				aMutex;
+    Any *				pExceptedListenerValues;
+    sal_Int32			nCount;
+    sal_Int32			nCurrent;
 
                     test_OPropertySetHelper_Listener( Any * p = 0, sal_Int32 n = 0 )
                         : nDisposing( 0 )
@@ -460,19 +460,19 @@ public:
                     ~test_OPropertySetHelper_Listener()
                     {
                     }
-
-    sal_Int32   getRefCount()
+    
+    sal_Int32	getRefCount() 
         { return m_refCount; }
 
     // XEventListener
-    void SAL_CALL disposing(const EventObject& /*evt*/) throw ( RuntimeException)
+    void SAL_CALL disposing(const EventObject& /*evt*/) throw ( RuntimeException) 
     {
         MutexGuard aGuard( aMutex );
         nDisposing++;
     }
 
     // XPropertyChangeListener
-    void SAL_CALL propertyChange(const PropertyChangeEvent& evt) throw (RuntimeException)
+    void SAL_CALL propertyChange(const PropertyChangeEvent& evt) throw (RuntimeException) 
     {
         if( !pExceptedListenerValues )
             return;
@@ -483,7 +483,7 @@ public:
         {
             case PROPERTY_BOOL:
                 {
-                OSL_ENSURE( sal_False           , "PropertySetHelper: BOOL cannot change" );
+                OSL_ENSURE( sal_False			, "PropertySetHelper: BOOL cannot change" );
                 OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ), "PropertySetHelper: wrong name" );
                 }
             break;
@@ -491,35 +491,35 @@ public:
             case PROPERTY_INT16:
                 {
                 OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), "PropertySetHelper: wrong name" );
-
+                
                 OSL_ENSURE( pExceptedListenerValues[nCurrent].getValueType().getTypeClass() == TypeClass_SHORT ,
                             "PropertySetHelper: wrong data type" );
-
+                
                 sal_Int16 nInt16, nOldInt16;
-                pExceptedListenerValues[nCurrent]   >>= nInt16;
-                evt.OldValue                        >>= nOldInt16;
+                pExceptedListenerValues[nCurrent] 	>>= nInt16;
+                evt.OldValue 						>>= nOldInt16;
                 OSL_ENSURE( nInt16 == nOldInt16, "PropertySetHelper: wrong old value" );
 
-
+                
                 pExceptedListenerValues[nCurrent+1] >>= nInt16;
-                evt.NewValue                        >>= nOldInt16;
-                OSL_ENSURE( nInt16 == nOldInt16 ,   "PropertySetHelper: wrong new value" );
+                evt.NewValue 						>>= nOldInt16;
+                OSL_ENSURE( nInt16 == nOldInt16 ,	"PropertySetHelper: wrong new value" );
                 }
             break;
 
             case PROPERTY_INT32:
                 {
                     OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" );
-
-                    sal_Int32 nInt32,nOldInt32;
-
+    
+                    sal_Int32 nInt32,nOldInt32; 
+                    
                     pExceptedListenerValues[nCurrent] >>= nInt32;
                     evt.OldValue >>= nOldInt32;
-                    OSL_ENSURE( nInt32 == nOldInt32 ,   "PropertySetHelper: wrong old value" );
-
+                    OSL_ENSURE( nInt32 == nOldInt32 ,	"PropertySetHelper: wrong old value" );
+                                    
                     pExceptedListenerValues[nCurrent+1] >>= nInt32;
                     evt.NewValue >>= nOldInt32;
-                    OSL_ENSURE( nInt32 == nOldInt32 ,   "PropertySetHelper: wrong new value" );
+                    OSL_ENSURE( nInt32 == nOldInt32 ,	"PropertySetHelper: wrong new value" );
                 }
             break;
 
@@ -541,7 +541,7 @@ public:
         {
             case PROPERTY_BOOL:
                 {
-                    OSL_ENSURE( sal_False   , "PropertySetHelper: BOOL cannot change" );
+                    OSL_ENSURE( sal_False	, "PropertySetHelper: BOOL cannot change" );
                     OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ), "PropertySetHelper: wrong name" );
                 }
             break;
@@ -549,17 +549,17 @@ public:
             case PROPERTY_INT16:
                 {
                     OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), "PropertySetHelper: wrong name" );
-
+    
                     sal_Int16 nInt16, nOldInt16;
-                    pExceptedListenerValues[nCurrent]   >>= nInt16;
-                    evt.OldValue                        >>= nOldInt16;
-
+                    pExceptedListenerValues[nCurrent] 	>>= nInt16;
+                    evt.OldValue 						>>= nOldInt16;
+    
                     OSL_ENSURE( nInt16 == nOldInt16,"PropertySetHelper: wrong old value" );
-
-                    pExceptedListenerValues[nCurrent+1]     >>= nInt16;
-                    evt.NewValue                            >>= nOldInt16;
-                    OSL_ENSURE( nInt16 == nOldInt16 ,   "PropertySetHelper: wrong new value" );
-
+    
+                    pExceptedListenerValues[nCurrent+1] 	>>= nInt16;
+                    evt.NewValue 							>>= nOldInt16;
+                    OSL_ENSURE( nInt16 == nOldInt16 ,	"PropertySetHelper: wrong new value" );
+    
                     if( nOldInt16 == 100 )
                     {
                         nCurrent += 2;
@@ -571,12 +571,12 @@ public:
             case PROPERTY_INT32:
                 {
                     OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" );
-
-                    sal_Int32 nInt32,nOldInt32;
+                    
+                    sal_Int32 nInt32,nOldInt32; 
                     pExceptedListenerValues[nCurrent] >>= nInt32;
                     evt.OldValue >>= nOldInt32;
                     OSL_ENSURE( nInt32 == nOldInt32 , "PropertySetHelper: wrong old value" );
-
+    
                     pExceptedListenerValues[nCurrent+1] >>= nInt32;
                     evt.NewValue >>= nOldInt32;
                     OSL_ENSURE( nInt32 == nOldInt32 , "PropertySetHelper: wrong new value" );
@@ -614,13 +614,13 @@ public:
                     OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), "PropertySetHelper: wrong name" );
 
                     sal_Int16 nInt16, nOldInt16;
-                    pExceptedListenerValues[nCurrent]   >>= nInt16;
-                    evt.OldValue                        >>= nOldInt16;
+                    pExceptedListenerValues[nCurrent] 	>>= nInt16;
+                    evt.OldValue 						>>= nOldInt16;
                     OSL_ENSURE( nInt16 == nOldInt16 , "PropertySetHelper: wrong old value" );
+                                
 
-
-                    pExceptedListenerValues[nCurrent+1] >>= nInt16;
-                    evt.NewValue                        >>= nOldInt16;
+                    pExceptedListenerValues[nCurrent+1]	>>= nInt16;
+                    evt.NewValue 						>>= nOldInt16;
                     OSL_ENSURE( nInt16 == nOldInt16 , "PropertySetHelper: wrong new value" );
                     }
                 break;
@@ -629,15 +629,15 @@ public:
                     {
                     OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" );
 
-
-                    sal_Int32 nInt32,nOldInt32;
+                    
+                    sal_Int32 nInt32,nOldInt32; 
                     pExceptedListenerValues[nCurrent] >>= nInt32;
                     evt.OldValue >>= nOldInt32;
                     OSL_ENSURE( nInt32 == nOldInt32 , "PropertySetHelper: wrong old value" );
-
+                    
                     pExceptedListenerValues[nCurrent+1] >>= nInt32;
                     evt.NewValue >>= nOldInt32;
-                    OSL_ENSURE( nInt32 == nOldInt32 ,   "PropertySetHelper: wrong new value" );
+                    OSL_ENSURE( nInt32 == nOldInt32 ,	"PropertySetHelper: wrong new value" );
                     }
                 break;
 
@@ -671,9 +671,9 @@ Reference < XPropertySetInfo >  test_OPropertySetHelper::getPropertySetInfo()
 // Return sal_True, value changed
 sal_Bool test_OPropertySetHelper::convertFastPropertyValue
 (
-    Any & rConvertedValue,
-    Any & rOldValue,
-    sal_Int32 nHandle,
+    Any & rConvertedValue, 
+    Any & rOldValue, 
+    sal_Int32 nHandle, 
     const Any& rValue
 )throw(IllegalArgumentException)
 {
@@ -684,8 +684,8 @@ sal_Bool test_OPropertySetHelper::convertFastPropertyValue
             sal_Bool b;
             convertPropertyValue( b , rValue );
             if( b != bBOOL )
-            {
-
+            {				
+                
                 rConvertedValue.setValue( &b , ::getCppuBooleanType()  );
                 rOldValue.setValue( & bBOOL , ::getCppuBooleanType() );
                 return sal_True;
@@ -698,11 +698,11 @@ sal_Bool test_OPropertySetHelper::convertFastPropertyValue
             {
             sal_Int16 n16;
             convertPropertyValue( n16 , rValue );
-
+            
             if( n16 != nINT16 )
             {
-                rConvertedValue <<=  n16;
-                rOldValue       <<= nINT16;
+                rConvertedValue	<<=	 n16;
+                rOldValue		<<= nINT16;
                 return sal_True;
             }
             else
@@ -716,7 +716,7 @@ sal_Bool test_OPropertySetHelper::convertFastPropertyValue
             if( n32 != nINT32 )
             {
                 rConvertedValue <<= n32;
-                rOldValue       <<= nINT32;
+                rOldValue		<<= nINT32;
                 return sal_True;
             }
             else
@@ -729,12 +729,12 @@ sal_Bool test_OPropertySetHelper::convertFastPropertyValue
     }
 }
 
-/**
+/** 
  * only set the value.
  */
 void test_OPropertySetHelper::setFastPropertyValue_NoBroadcast
 (
-    sal_Int32 nHandle,
+    sal_Int32 nHandle, 
     const Any& rValue
 )throw(RuntimeException)
 {
@@ -802,24 +802,24 @@ void test_PropertySetHelper()
         // first test getBasicProps() Handles are { 0, 1, 2 }
         xPS = pPS = new test_OPropertySetHelper( getBasicProps(), PROPERTY_COUNT - z );
         xPS_L = static_cast< XPropertyChangeListener * >( pPS_L = new test_OPropertySetHelper_Listener() );
-
+        
         // Test queryInterface
         Reference < XPropertySet > rProp( xPS , UNO_QUERY );
         OSL_ENSURE( rProp.is() , "PropertySetHelper: XPropertySet nor supported" );
-
+        
         Reference < XMultiPropertySet > rMulti( xPS , UNO_QUERY );
         OSL_ENSURE( rMulti.is() , "PropertySetHelper: XMultiPropertySet nor supported" );
-
+        
         Reference < XFastPropertySet > rFast( xPS , UNO_QUERY );
         OSL_ENSURE( rFast.is() , "PropertySetHelper: XFastPropertySet nor supported" );
 
         x = Reference < XInterface > ();
-
+    
         // Test add-remove listener
         {
-            Reference < XPropertiesChangeListener >     x1( xPS_L, UNO_QUERY );
-            Reference < XVetoableChangeListener >       x2( xPS_L, UNO_QUERY );
-
+            Reference < XPropertiesChangeListener >  	x1( xPS_L, UNO_QUERY );
+            Reference < XVetoableChangeListener >  		x2( xPS_L, UNO_QUERY );
+        
             xPS->addPropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L );
             Sequence<OUString> szPN( 3 );
             szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") );
@@ -830,7 +830,7 @@ void test_PropertySetHelper()
             szPN = Sequence<OUString>();
             pPS->addPropertiesChangeListener( szPN, x1 );
             pPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 );
-
+        
             xPS->removePropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L );
             pPS->removePropertiesChangeListener( x1 );
             pPS->removePropertiesChangeListener( x1 );
@@ -844,9 +844,9 @@ void test_PropertySetHelper()
             }
             catch( UnknownPropertyException & /*e*/ )
             {
-
+                
             }
-
+            
             try
             {
                 xPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ), x2 );
@@ -854,17 +854,17 @@ void test_PropertySetHelper()
             }
             catch( UnknownPropertyException & /*e*/ )
             {
-
+                
             }
-
+    
         }
         OSL_ENSURE( pPS_L->getRefCount() == 1, "PropertySetHelper: wrong reference count" );
-
+    
         // Test disposing
         {
             Reference < XPropertiesChangeListener >  x1( xPS_L, UNO_QUERY );
-            Reference < XVetoableChangeListener >    x2( xPS_L, UNO_QUERY );
-
+            Reference < XVetoableChangeListener > 	 x2( xPS_L, UNO_QUERY );
+        
             xPS->addPropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L );
             Sequence<OUString> szPN( 2 );
             szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") );
@@ -875,11 +875,11 @@ void test_PropertySetHelper()
             pPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 );
             pPS->dispose();
         }
-        OSL_ENSURE( pPS_L->nDisposing == 4      , "PropertySetHelper: wrong disposing count" );
-        OSL_ENSURE( pPS_L->getRefCount() == 1   , "PropertySetHelper: wrong reference count" );
+        OSL_ENSURE( pPS_L->nDisposing == 4		, "PropertySetHelper: wrong disposing count" );
+        OSL_ENSURE( pPS_L->getRefCount() == 1	, "PropertySetHelper: wrong reference count" );
         pPS_L->nDisposing = 0;
         xPS = pPS = new test_OPropertySetHelper( getBasicProps(), PROPERTY_COUNT - z );
-
+    
         // Test set- and get- (Fast) propertyValue
         {
             // set read only property
@@ -909,7 +909,7 @@ void test_PropertySetHelper()
             catch( PropertyVetoException & /*e*/ )
             {
             }
-
+        
             // set unknown property
             try
             {
@@ -934,7 +934,7 @@ void test_PropertySetHelper()
             catch( UnknownPropertyException & /*e*/ )
             {
             }
-
+        
             // get unknown property
             try
             {
@@ -945,8 +945,8 @@ void test_PropertySetHelper()
             catch( UnknownPropertyException & /*e*/ )
             {
             }
-
-            try
+        
+            try			
             {
                 Any aBool;
                 aBool = ((XFastPropertySet *)pPS)->getFastPropertyValue( 3 );
@@ -955,7 +955,7 @@ void test_PropertySetHelper()
             catch( UnknownPropertyException & /*e*/ )
             {
             }
-
+        
             // set property with invalid type
             try
             {
@@ -976,7 +976,7 @@ void test_PropertySetHelper()
             catch( IllegalArgumentException & /*e*/ )
             {
             }
-
+        
             // narrowing conversion is not allowed!
             try
             {
@@ -1001,7 +1001,7 @@ void test_PropertySetHelper()
             {
             }
 
-
+        
             Any aValue;
             aValue = xPS->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") ) );
             sal_Bool b = *( (sal_Bool*)aValue.getValue());
@@ -1010,7 +1010,7 @@ void test_PropertySetHelper()
 
             b = *((sal_Bool*)aValue.getValue());
             OSL_ENSURE( !b, "PropertySetHelper: wrong BOOL value" );
-
+        
             sal_Int16 n16;
             aValue <<=(sal_Int16)22;
             xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), aValue );
@@ -1023,7 +1023,7 @@ void test_PropertySetHelper()
             aValue = ((XFastPropertySet *)pPS)->getFastPropertyValue( PROPERTY_INT16 );
             aValue >>= n16;
             OSL_ENSURE( 44 == n16, "PropertySetHelper: wrong INT16 value" );
-
+        
             // widening conversion
             aValue <<= (sal_Int16)55;
             xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), aValue );
@@ -1036,28 +1036,28 @@ void test_PropertySetHelper()
             aValue = ((XFastPropertySet *)pPS)->getFastPropertyValue( PROPERTY_INT32 );
             aValue >>= n32;
             OSL_ENSURE( 66 == n32, "PropertySetHelper: wrong INT32 value" );
-
+        
             Sequence< OUString >valueNames = Sequence<OUString>( 3 );
             valueNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") );
             valueNames.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") );
             valueNames.getArray()[2] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") );
             Sequence< Any > aValues = pPS->getPropertyValues( valueNames );
-
+    
             b = *((sal_Bool*)aValues.getConstArray()[0].getValue());
             aValues.getConstArray()[1] >>= n16;
             aValues.getConstArray()[2] >>= n32;
-
+            
             OSL_ENSURE( !b, "PropertySetHelper: wrong BOOL value" );
             OSL_ENSURE( 44 == n16, "PropertySetHelper: wrong INT16 value" );
             OSL_ENSURE( 66 == n32, "PropertySetHelper: wrong INT32 value" );
         }
         pPS->nINT32 = 0;
         pPS->nINT16 = 0;
-
+    
         // Test add-remove listener
         {
             Reference < XVetoableChangeListener >  x2( xPS_L, UNO_QUERY );
-
+        
             xPS->addPropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L );
             pPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 );
 
@@ -1067,17 +1067,17 @@ void test_PropertySetHelper()
 
             pPS_L->pExceptedListenerValues = aSeq.getArray();
 
-            pPS_L->pExceptedListenerValues[0] <<= (sal_Int16) 0; // old value   vetoable
-            pPS_L->pExceptedListenerValues[1] <<= (sal_Int16) 22; // new value  vetoable
-            pPS_L->pExceptedListenerValues[2] <<= (sal_Int16) 0; // old value   bound
-            pPS_L->pExceptedListenerValues[3] <<= (sal_Int16) 22; // new value  bound
-            pPS_L->pExceptedListenerValues[4] <<= (sal_Int16) 22; // old value  vetoable
-            pPS_L->pExceptedListenerValues[5] <<= (sal_Int16) 44; // new value  vetoable
-            pPS_L->pExceptedListenerValues[6] <<= (sal_Int16) 22; // old value  bound
-            pPS_L->pExceptedListenerValues[7] <<= (sal_Int16) 44; // new value  bound
-            pPS_L->pExceptedListenerValues[8] <<= (sal_Int16) 44; // old value  vetoable
-            pPS_L->pExceptedListenerValues[9] <<= (sal_Int16) 100; // new value vetoable exception
-
+            pPS_L->pExceptedListenerValues[0] <<= (sal_Int16) 0; // old value	vetoable
+            pPS_L->pExceptedListenerValues[1] <<= (sal_Int16) 22; // new value	vetoable
+            pPS_L->pExceptedListenerValues[2] <<= (sal_Int16) 0; // old value	bound
+            pPS_L->pExceptedListenerValues[3] <<= (sal_Int16) 22; // new value	bound
+            pPS_L->pExceptedListenerValues[4] <<= (sal_Int16) 22; // old value	vetoable
+            pPS_L->pExceptedListenerValues[5] <<= (sal_Int16) 44; // new value	vetoable
+            pPS_L->pExceptedListenerValues[6] <<= (sal_Int16) 22; // old value	bound
+            pPS_L->pExceptedListenerValues[7] <<= (sal_Int16) 44; // new value	bound
+            pPS_L->pExceptedListenerValues[8] <<= (sal_Int16) 44; // old value	vetoable
+            pPS_L->pExceptedListenerValues[9] <<= (sal_Int16) 100; // new value	vetoable exception
+        
             Any aValue;
             aValue <<= (sal_Int16)22;
             xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), aValue );
@@ -1103,12 +1103,12 @@ void test_PropertySetHelper()
             xPS->removePropertyChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), xPS_L );
             pPS->removeVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), x2 );
         }
-
+        
         // Test multi property set listener
         {
             Reference < XPropertiesChangeListener > x1( xPS_L, UNO_QUERY );
             Reference < XVetoableChangeListener >  x2( xPS_L, UNO_QUERY );
-
+        
             pPS->addVetoableChangeListener( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ) , x2 );
             Sequence<OUString> szPN( 4 );
             szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("BOOL") );
@@ -1116,19 +1116,19 @@ void test_PropertySetHelper()
             szPN.getArray()[2] = OUString( RTL_CONSTASCII_USTRINGPARAM("Does not exist") ); // must ne ignored by the addPropertiesChangeListener method
             szPN.getArray()[3] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") );
             pPS->addPropertiesChangeListener( szPN, x1 );
-
+        
             pPS_L->nCount = 6;
             Sequence< Any > aSeq( pPS_L->nCount );
             pPS_L->nCurrent = 0;
             pPS_L->pExceptedListenerValues = aSeq.getArray();
-            pPS_L->pExceptedListenerValues[0] <<= (sal_Int16) 0; // old value   vetoable
-            pPS_L->pExceptedListenerValues[1] <<= (sal_Int16 ) 22; // new value vetoable
+            pPS_L->pExceptedListenerValues[0] <<= (sal_Int16) 0; // old value	vetoable
+            pPS_L->pExceptedListenerValues[1] <<= (sal_Int16 ) 22; // new value	vetoable
             // INT32 is not constrained
-            pPS_L->pExceptedListenerValues[2] <<= (sal_Int16) 0; // old value   bound
-            pPS_L->pExceptedListenerValues[3] <<= (sal_Int16) 22; // new value  bound
-            pPS_L->pExceptedListenerValues[4] <<= (sal_Int32) 0; // old value   bound
-            pPS_L->pExceptedListenerValues[5] <<= (sal_Int32) 44; // new value  bound
-
+            pPS_L->pExceptedListenerValues[2] <<= (sal_Int16) 0; // old value	bound
+            pPS_L->pExceptedListenerValues[3] <<= (sal_Int16) 22; // new value	bound
+            pPS_L->pExceptedListenerValues[4] <<= (sal_Int32) 0; // old value	bound
+            pPS_L->pExceptedListenerValues[5] <<= (sal_Int32) 44; // new value	bound
+        
             szPN = Sequence<OUString>( 2 );
             szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") );
             szPN.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") );
@@ -1137,7 +1137,7 @@ void test_PropertySetHelper()
             aValues.getArray()[1] <<= (sal_Int16) 44;
             pPS->setPropertyValues( szPN, aValues );
             OSL_ENSURE( pPS_L->nCount == pPS_L->nCurrent, "not all listeners called" );
-
+        
             //firePropertiesChangeEvent
             pPS->nINT16 = 8;
             pPS->nINT32 = 5;
@@ -1149,20 +1149,20 @@ void test_PropertySetHelper()
             pPS_L->pExceptedListenerValues[3] <<= (sal_Int32) 5; // new value
             pPS->firePropertiesChangeEvent( szPN, pPS_L );
             OSL_ENSURE( pPS_L->nCount == pPS_L->nCurrent, "not all listeners called" );
-
-
-            //vetoable exception with multible
+        
+        
+            //vetoable exception with multible 
             szPN.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") );
             szPN.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") );
             pPS->nINT32 = 0;
             pPS->nINT16 = 0;
             pPS_L->nCount = 4;
             pPS_L->nCurrent = 0;
-            pPS_L->pExceptedListenerValues[0] <<= (sal_Int16) 0; // old value   vetoable
-            pPS_L->pExceptedListenerValues[1] <<= (sal_Int16) 44; // new value  vetoable
-            pPS_L->pExceptedListenerValues[2] <<= (sal_Int16) 0; // old value   vetoable
-            pPS_L->pExceptedListenerValues[3] <<= (sal_Int16) 100; // new value vetoable
-
+            pPS_L->pExceptedListenerValues[0] <<= (sal_Int16) 0; // old value	vetoable
+            pPS_L->pExceptedListenerValues[1] <<= (sal_Int16) 44; // new value	vetoable
+            pPS_L->pExceptedListenerValues[2] <<= (sal_Int16) 0; // old value	vetoable
+            pPS_L->pExceptedListenerValues[3] <<= (sal_Int16) 100; // new value	vetoable
+        
             try
             {
                 aValues.getArray()[0] <<= (sal_Int16)44;
diff --git a/cppuhelper/test/testproptyphlp.cxx b/cppuhelper/test/testproptyphlp.cxx
index d913c7879b60..852fa33ba09f 100644
--- a/cppuhelper/test/testproptyphlp.cxx
+++ b/cppuhelper/test/testproptyphlp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl b/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl
index 371a4e358c54..eb328c1d8983 100644
--- a/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl
+++ b/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cpputools/source/regcomplazy/regcomplazy.cxx b/cpputools/source/regcomplazy/regcomplazy.cxx
index 3b5b6421e9e4..fec0f6a8e14d 100644
--- a/cpputools/source/regcomplazy/regcomplazy.cxx
+++ b/cpputools/source/regcomplazy/regcomplazy.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,13 +40,13 @@
 #include <registry/registry.hxx>
 
 
-#define OSToOUS(x) ::rtl::OStringToOUString(x, osl_getThreadTextEncoding())
-#define OUSToOS(x) ::rtl::OUStringToOString(x, osl_getThreadTextEncoding())
+#define OSToOUS(x) ::rtl::OStringToOUString(x, osl_getThreadTextEncoding()) 
+#define OUSToOS(x) ::rtl::OUStringToOString(x, osl_getThreadTextEncoding()) 
 using namespace ::rtl;
 
 typedef ::std::vector< ::rtl::OString > OSVector;
 
-struct CompDescriptor {
+struct CompDescriptor {    
     OString sImplementationName;
     OString sComponentName;
     OString sLoaderName;
@@ -111,8 +111,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         size_t totalSize = 0;
         size_t readSize  = 0;
         char   pBuffer[513];
-
-        while ( !feof(fDescr) )
+        
+        while ( !feof(fDescr) )            
         {
             if ( (readSize = fread(pBuffer, 1, 512, fDescr)) > 0
                  && !ferror(fDescr) ) {
@@ -121,19 +121,19 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
                     sBuffer.ensureCapacity(totalSize * 2);
 
                 sBuffer.append(pBuffer, readSize);
-            }
+            }            
         }
     fclose(fDescr);
     fDescr = 0; // just to be sure noone tries to use the file ever after
     }
-
+    
     OString sDescr = sBuffer.makeStringAndClear();
     sal_Int32 nTokenIndex = 0;
 
     CDescrVector vDescr;
     CompDescriptor descr;
     bool bFirst = true;
-
+    
     do {
         OString sTmp = sDescr.getToken(0, '\x0A', nTokenIndex);
         OString sToken(sTmp);
@@ -160,15 +160,15 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
                   (sToken.getLength() > 0) &&
                   (sToken.pData->buffer[0] != '[') ) {
             descr.vSupportedServices.push_back(sToken);
-        }
+        }      
     } while (nTokenIndex >= 0 );
     // insert the last descriptor
     vDescr.push_back(descr);
 
     Registry *pReg = new Registry;
-
+    
     RegistryKey rootKey, key, subKey, serviceKey;
-
+    
     if (pReg->open(reg_url, REG_READWRITE))
     {
         if (pReg->create(reg_url))
@@ -185,7 +185,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     }
 
     CDescrVector::const_iterator comp_iter = vDescr.begin();
-    do {
+    do {  
         OString sImplName = (*comp_iter).sImplementationName;
         OUStringBuffer sbImpl;
         sbImpl.appendAscii("/IMPLEMENTATIONS/");
@@ -204,31 +204,31 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
                 return 1;
             }
         }
-
+        
         OString sLoaderName = (*comp_iter).sLoaderName;
         OUString usKeyName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO/ACTIVATOR")));
         key.createKey(usKeyName, subKey);
         subKey.setValue(OUString(), RG_VALUETYPE_STRING,
                         (sal_Char*)sLoaderName.getStr(), sLoaderName.getLength()+1);
-
+        
         OString sCompName = (*comp_iter).sComponentName;
         usKeyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO/LOCATION"));
         key.createKey(usKeyName, subKey);
         subKey.setValue(OUString(), RG_VALUETYPE_STRING,
                         (sal_Char*)sCompName.getStr(), sCompName.getLength()+1);
-
+        
         usKeyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO/SERVICES"));
         key.createKey(usKeyName, subKey);
-
+        
         rootKey.createKey(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/SERVICES")), serviceKey);
-
+        
         OSVector::const_iterator serv_iter = ((*comp_iter).vSupportedServices).begin();
         OUString usServiceKeyName;
-        do {
+        do {            
             usServiceKeyName = OSToOUS(*serv_iter);
             // write service key in impl section
             subKey.createKey(usServiceKeyName, key);
-
+            
             if (serviceKey.openKey(usServiceKeyName, key) == REG_NO_ERROR) {
                 RegistryValueList<sal_Char*> valueList;
                 serviceKey.getStringListValue(usServiceKeyName, valueList);
@@ -252,33 +252,33 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
                 // free memory
                 rtl_freeMemory(pImplList[0]);
                 rtl_freeMemory(pImplList);
-
+                
             } else {
                 serviceKey.createKey(usServiceKeyName, key);
-
+                
                 sal_Char* pImplList[1];
                 pImplList[0] = (sal_Char*)rtl_allocateZeroMemory(
                     sImplName.getLength()+1 * sizeof(sal_Char));
                 rtl_copyMemory(pImplList[0], (sal_Char*)sImplName.getStr(),
                                sImplName.getLength()+1);
                 key.setStringListValue(OUString(), pImplList, 1);
-
+                
                 // free memory
                 rtl_freeMemory(pImplList[0]);
-            }
+            }          
             serv_iter++;
         } while (serv_iter != (*comp_iter).vSupportedServices.end());
-
+        
         comp_iter++;
     } while (comp_iter != vDescr.end());
-
+        
     key.closeKey();
     subKey.closeKey();
     serviceKey.closeKey();
     rootKey.closeKey();
     pReg->close();
     delete pReg;
-
+    
     return 0;
 }
 
diff --git a/cpputools/source/registercomponent/registercomponent.cxx b/cpputools/source/registercomponent/registercomponent.cxx
index cc9d22e42a96..92f7e2f30753 100644
--- a/cpputools/source/registercomponent/registercomponent.cxx
+++ b/cpputools/source/registercomponent/registercomponent.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -200,8 +200,8 @@ struct Options
 sal_Bool parseOptions(int ac, char* av[], Options& rOptions, sal_Bool bCmdFile)
     throw( IllegalArgument )
 {
-    sal_Bool    ret = sal_True;
-    sal_uInt16  i=0;
+    sal_Bool 	ret = sal_True;
+    sal_uInt16	i=0;
     sal_Bool bLoaderExplicitlyGiven = sal_False;
 
     rOptions.sProgramName = OUString::createFromAscii(av[i++]);
@@ -515,10 +515,10 @@ struct DoIt
     sal_Bool                                _bSilent;
     sal_Bool                                _bPrefix;
     OUString                                _sPrefix;
-    OString                                 _sRegName;
+    OString 	                            _sRegName;
     OUString                                _sLoaderName;
     Reference<XImplementationRegistration2> _xImplRegistration;
-    Reference<XSimpleRegistry>              _xReg;
+    Reference<XSimpleRegistry> 		        _xReg;
     sal_uInt32                            * _exitCode;
 
     DoIt(sal_Bool bRegister,
@@ -573,7 +573,7 @@ void DoIt::operator() (const OUString & url) throw()
             } else {
                 _xImplRegistration->registerImplementation(_sLoaderName, url, _xReg);
             }
-
+                    
             if ( ! _bSilent )
             {
                 fprintf(stderr, "register component '%s' in registry '%s' successful!\n", sUrl.getStr(), _sRegName.getStr());
@@ -749,9 +749,9 @@ static void bootstrap(
 
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
-    sal_Bool    bRet = sal_False;
-    sal_uInt32  exitCode = 0;
-    Options     aOptions;
+    sal_Bool 	bRet = sal_False;
+    sal_uInt32 	exitCode = 0;
+    Options	 	aOptions;
 
     try
     {
@@ -777,8 +777,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         exit(1);
     }
 
-    Reference< XMultiServiceFactory >   xSMgr;
-    Reference< XSimpleRegistry >        xReg;
+    Reference< XMultiServiceFactory >	xSMgr;
+    Reference< XSimpleRegistry > 		xReg;
     try
     {
         bootstrap( aOptions, xSMgr ,xReg );
@@ -812,7 +812,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
             urls.push_back(aToken);
         } while ( index >= 0 );
 
-
+        
         OString sRegName = OUStringToOString( aOptions.sRegName, osl_getThreadTextEncoding() );
         if(aOptions.bRegister || aOptions.bRevoke)
         {
diff --git a/cpputools/source/regsingleton/regsingleton.cxx b/cpputools/source/regsingleton/regsingleton.cxx
index 05fc7dafe67a..b98e9e1799e5 100644
--- a/cpputools/source/regsingleton/regsingleton.cxx
+++ b/cpputools/source/regsingleton/regsingleton.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -77,7 +77,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         insert_entry = false;
         ++nPos;
     }
-
+    
     OUString sys_path( OUString::createFromAscii( argv[ nPos ] ) );
     OUString file_url;
     oslFileError rc = osl_getFileURLFromSystemPath( sys_path.pData, &file_url.pData );
@@ -87,7 +87,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         return 1;
     }
     ++nPos;
-
+    
     try
     {
         Reference< registry::XSimpleRegistry > xSimReg( ::cppu::createSimpleRegistry() );
@@ -114,7 +114,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
             Reference< registry::XRegistryKey > xKey( xRoot->openKey( OUSTR("SINGLETONS") ) );
             if (! xKey.is())
                 xKey = xRoot->createKey( OUSTR("SINGLETONS") );
-
+            
             for ( ; nPos < argc; ++nPos )
             {
                 OUString singleton( OUString::createFromAscii( argv[ nPos ] ) );
@@ -125,7 +125,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
                     service = singleton.copy( eq +1 );
                     singleton = singleton.copy( 0, eq );
                 }
-
+                
                 if (insert_entry)
                 {
                     if (service.getLength())
@@ -162,7 +162,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
                 }
             }
         }
-
+        
         return 0;
     }
     catch (Exception & rExc)
diff --git a/cpputools/source/sp2bv/sp2bv.cxx b/cpputools/source/sp2bv/sp2bv.cxx
index 7ae8cabc05bb..752d0b93d406 100644
--- a/cpputools/source/sp2bv/sp2bv.cxx
+++ b/cpputools/source/sp2bv/sp2bv.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ using namespace rtl;
 
 static sal_Bool hasOption(char const * szOption, int argc, char** argv);
 
-
+    
 #define HELP_TEXT    \
 "SYNOPSIS \n\n" \
 "\tsp2bv [-h] [-?] string \n\n" \
@@ -94,14 +94,14 @@ int main(int argc, char **argv)
         {
         case '$':
             rtl_uStringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length, &cEscapeChar, 1);
-            rtl_uStringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length, pCur, 1);
+            rtl_uStringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length, pCur, 1);            
             break;
         case '{':
         case '}':
         case '\\': fprintf(stderr, "sp2vb: file URL contains invalid characters!\n");
             return -1;
         default:
-            rtl_uStringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length, pCur, 1);
+            rtl_uStringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length, pCur, 1);            
         }
         pCur ++;
     }
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 940b3a67cae3..bac822b864b2 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -479,16 +479,16 @@ class OInstanceProvider
 {
     Reference< XComponentContext > _xContext;
 
-    Mutex                             _aSingleInstanceMutex;
-    Reference< XInterface >           _xSingleInstance;
-    sal_Bool                          _bSingleInstance;
+    Mutex							  _aSingleInstanceMutex;
+    Reference< XInterface >			  _xSingleInstance;
+    sal_Bool						  _bSingleInstance;
 
-    OUString                          _aImplName;
-    OUString                          _aLocation;
-    OUString                          _aServiceName;
-    Sequence< Any >                   _aInitParams;
+    OUString						  _aImplName;
+    OUString						  _aLocation;
+    OUString						  _aServiceName;
+    Sequence< Any >					  _aInitParams;
 
-    OUString                          _aInstanceName;
+    OUString						  _aInstanceName;
 
     inline Reference< XInterface > createInstance() throw (Exception);
 
@@ -536,7 +536,7 @@ Reference< XInterface > OInstanceProvider::getInstance( const OUString & rName )
         if (_aInstanceName == rName)
         {
             Reference< XInterface > xRet;
-
+            
             if (_aImplName.getLength() == 0 && _aServiceName.getLength() == 0)
             {
                 OSL_ASSERT(
@@ -657,12 +657,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,)
                 break;
             }
 
-            if (readOption( &aImplName, "c", &nPos, arg)                ||
-                readOption( &aLocation, "l", &nPos, arg)                ||
-                readOption( &aServiceName, "s", &nPos, arg)             ||
-                readOption( &aUnoUrl, "u", &nPos, arg)                  ||
+            if (readOption( &aImplName, "c", &nPos, arg)				||
+                readOption( &aLocation, "l", &nPos, arg)				||
+                readOption( &aServiceName, "s", &nPos, arg)				||
+                readOption( &aUnoUrl, "u", &nPos, arg)					||
                 readOption( &s_quiet, "quiet", &nPos, arg)              ||
-                readOption( &bSingleAccept, "singleaccept", &nPos, arg) ||
+                readOption( &bSingleAccept, "singleaccept", &nPos, arg)	||
                 readOption( &bSingleInstance, "singleinstance", &nPos, arg))
             {
                 continue;
@@ -745,11 +745,11 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,)
 
         if (aReadOnlyRegistries.size() > 0 ||
             aReadWriteRegistry.getLength() > 0)
-        {
+        {   
             //#### create registry #############################################
-
+            
             Reference< XSimpleRegistry > xRegistry;
-
+            
             // ReadOnly registries
             for ( size_t nReg = 0; nReg < aReadOnlyRegistries.size(); ++nReg )
             {
@@ -782,7 +782,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,)
                                  ? nestRegistries( xNewReg, xRegistry )
                                  : xNewReg);
             }
-
+            
             OSL_ASSERT( xRegistry.is() );
             xContext = bootstrap_InitialComponentContext( xRegistry );
         }
@@ -790,7 +790,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,)
         {
             xContext = defaultBootstrap_InitialComponentContext();
         }
-
+        
         //#### accept, instanciate, etc. ###########################################################
 
         if (aUnoUrl.getLength()) // accepting connections
diff --git a/idlc/inc/idlc/astarray.hxx b/idlc/inc/idlc/astarray.hxx
index bb711823e869..4ee463ef9b66 100644
--- a/idlc/inc/idlc/astarray.hxx
+++ b/idlc/inc/idlc/astarray.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,21 +42,21 @@ public:
     AstType* getType()
         { return m_pType; }
     void setType(AstType* pType)
-        {
+        { 
             m_pType = pType;
             setName(makeName());
         }
     ExprList* getDimExpressions()
-        {   return &m_dimExpressions; }
+        {	return &m_dimExpressions; }
     sal_uInt32 getDimension()
-        {   return m_dimension; }
-
+        {	return m_dimension; }
+    
 private:
     ::rtl::OString makeName();
 
-    AstType*    m_pType;
-    sal_uInt32  m_dimension;
-    ExprList    m_dimExpressions;
+    AstType* 	m_pType;
+    sal_uInt32 	m_dimension;
+    ExprList   	m_dimExpressions;
 };
 
 #endif // _IDLC_ASTARRAY_HXX_
diff --git a/idlc/inc/idlc/astattribute.hxx b/idlc/inc/idlc/astattribute.hxx
index 9b55069b6609..1be771652764 100644
--- a/idlc/inc/idlc/astattribute.hxx
+++ b/idlc/inc/idlc/astattribute.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -110,7 +110,7 @@ private:
         DeclList const & exceptions, RTMethodMode flags,
         sal_uInt16 * methodIndex);
 
-    const sal_uInt32    m_flags;
+    const sal_uInt32 	m_flags;
     AstType const * m_pType;
     rtl::OUString m_getDocumentation;
     DeclList m_getExceptions;
diff --git a/idlc/inc/idlc/astbasetype.hxx b/idlc/inc/idlc/astbasetype.hxx
index 4d0793ef66fb..493e557f9936 100644
--- a/idlc/inc/idlc/astbasetype.hxx
+++ b/idlc/inc/idlc/astbasetype.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/idlc/inc/idlc/astconstant.hxx b/idlc/inc/idlc/astconstant.hxx
index b9c87ad42f03..8bd2952123f8 100644
--- a/idlc/inc/idlc/astconstant.hxx
+++ b/idlc/inc/idlc/astconstant.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@ public:
     AstConstant(const ExprType type, AstExpression* pExpr,
                 const ::rtl::OString& name, AstScope* pScope);
     virtual ~AstConstant();
-
+    
     AstExpression* getConstValue()
         { return m_pConstValue; }
     ExprType getConstValueType() const
@@ -50,8 +50,8 @@ public:
     sal_Bool dumpBlob(
         typereg::Writer & rBlob, sal_uInt16 index, bool published);
 private:
-    AstExpression*                  m_pConstValue;
-    const ExprType  m_constValueType;
+    AstExpression* 					m_pConstValue;
+    const ExprType	m_constValueType;
 };
 
 #endif // _IDLC_ASTCONSTANT_HXX_
diff --git a/idlc/inc/idlc/astconstants.hxx b/idlc/inc/idlc/astconstants.hxx
index f132a978b31d..1417db98358e 100644
--- a/idlc/inc/idlc/astconstants.hxx
+++ b/idlc/inc/idlc/astconstants.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/idlc/inc/idlc/astdeclaration.hxx b/idlc/inc/idlc/astdeclaration.hxx
index f0f6d29b0953..1daf4f2f8aff 100644
--- a/idlc/inc/idlc/astdeclaration.hxx
+++ b/idlc/inc/idlc/astdeclaration.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,39 +34,39 @@
 class AstScope;
 
 // Enum defining the different kinds of Ast nodes
-enum NodeType
+enum NodeType 
 {
-    NT_object,              // Denotes an object
-    NT_service,             // Denotes an servcie
-    NT_interface_member,    // Denotes an interface which is exported from object
-    NT_service_member,      // Denotes an service which is exported from object
-    NT_observes,            // Denotes an observed interface
-    NT_needs,               // Denotes an needed service
-    NT_module,              // Denotes a module
-    NT_root,                // Denotes the root of AST
-    NT_interface,           // Denotes an interface
-    NT_constants,           // Denotes a constant group
-    NT_const,               // Denotes a constant
-    NT_exception,           // Denotes an exception
-    NT_attribute,           // Denotes an attribute
-    NT_property,            // Denotes an property
-    NT_operation,           // Denotes an operation
-    NT_parameter,           // Denotes an op. parameter
-    NT_union,               // Denotes a union
-    NT_union_branch,        // Denotes a union branch
+    NT_object,				// Denotes an object
+    NT_service,				// Denotes an servcie
+    NT_interface_member,	// Denotes an interface which is exported from object
+    NT_service_member,		// Denotes an service which is exported from object
+    NT_observes,			// Denotes an observed interface 
+    NT_needs,				// Denotes an needed service
+    NT_module,				// Denotes a module
+    NT_root,				// Denotes the root of AST
+    NT_interface,			// Denotes an interface
+    NT_constants,		 	// Denotes a constant group
+    NT_const,				// Denotes a constant
+    NT_exception,			// Denotes an exception
+    NT_attribute,			// Denotes an attribute
+    NT_property,			// Denotes an property
+    NT_operation,			// Denotes an operation
+    NT_parameter,			// Denotes an op. parameter
+    NT_union,				// Denotes a union
+    NT_union_branch,		// Denotes a union branch
     NT_struct,              // Denotes either a plain struct type, or a
                             // polymorphic struct type template
     NT_type_parameter,      // Denotes a type parameter of a polymorphic struct
                             // type template
     NT_instantiated_struct, // Denotes an instantiated polymorphic struct type
-    NT_member,              // Denotes a member in structure, exception
-    NT_enum,                // Denotes an enumeration
-    NT_enum_val,            // Denotes an enum. value
-    NT_array,               // Denotes an IDL array
-    NT_sequence,            // Denotes an IDL sequence
-    NT_typedef,             // Denotes a typedef
-    NT_predefined,          // Denotes a predefined type
-    NT_singleton            // Denotes a singleton
+    NT_member,				// Denotes a member in structure, exception
+    NT_enum,				// Denotes an enumeration
+    NT_enum_val,			// Denotes an enum. value
+    NT_array,				// Denotes an IDL array
+    NT_sequence,			// Denotes an IDL sequence
+    NT_typedef,				// Denotes a typedef
+    NT_predefined,			// Denotes a predefined type
+    NT_singleton			// Denotes a singleton
 };
 
 class AstDeclaration
@@ -80,11 +80,11 @@ public:
     void setName(const ::rtl::OString& name);
     const ::rtl::OString& getLocalName() const
         { return m_localName; }
-    const ::rtl::OString&   getScopedName() const
+    const ::rtl::OString&	getScopedName() const
         { return m_scopedName; }
-    const ::rtl::OString&   getFullName()
+    const ::rtl::OString&	getFullName()
         { return m_fullName; }
-    virtual const sal_Char* getRelativName() const
+    virtual const sal_Char*	getRelativName() const
         { return m_fullName.getStr()+1; }
     AstScope* getScope()
         { return m_pScope; }
@@ -128,21 +128,21 @@ public:
 
     bool isPredefined() { return m_bPredefined; }
     void setPredefined(bool bPredefined);
-
+    
 protected:
-    ::rtl::OString      m_localName;
-    ::rtl::OString      m_scopedName;       // full qualified name
-    ::rtl::OString      m_fullName;         // full qualified name with '/' as seperator
-    AstScope*           m_pScope;
+    ::rtl::OString		m_localName; 
+    ::rtl::OString		m_scopedName; 		// full qualified name
+    ::rtl::OString		m_fullName;			// full qualified name with '/' as seperator
+    AstScope*			m_pScope;
     NodeType            m_nodeType;
-    sal_Bool            m_bImported;        // imported ?
-    sal_Bool            m_bIsAdded;         // mark declaration as added in scope
-    sal_Bool            m_bInMainFile;      // defined in main file
+    sal_Bool			m_bImported;		// imported ?
+    sal_Bool			m_bIsAdded;			// mark declaration as added in scope
+    sal_Bool			m_bInMainFile;		// defined in main file
     bool                m_bPublished;
     bool                m_bPredefined;
-    sal_Int32           m_lineNumber;       // line number defined in
-    ::rtl::OString      m_fileName;         // fileName defined in
-    ::rtl::OUString     m_documentation;    // fileName defined in
+    sal_Int32			m_lineNumber;		// line number defined in	
+    ::rtl::OString		m_fileName;			// fileName	defined in
+    ::rtl::OUString		m_documentation; 	// fileName	defined in
 };
 
 #endif // _IDLC_ASTDECLARATION_HXX_
diff --git a/idlc/inc/idlc/astenum.hxx b/idlc/inc/idlc/astenum.hxx
index 6a3380a22250..ae4665631d72 100644
--- a/idlc/inc/idlc/astenum.hxx
+++ b/idlc/inc/idlc/astenum.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,7 +51,7 @@ public:
 
     virtual AstDeclaration* addDeclaration(AstDeclaration* pDecl);
 private:
-    sal_Int32   m_enumValueCount;
+    sal_Int32 	m_enumValueCount;
 };
 
 #endif // _IDLC_ASTENUM_HXX_
diff --git a/idlc/inc/idlc/astexception.hxx b/idlc/inc/idlc/astexception.hxx
index 2f4c73ac7d07..c6627889508d 100644
--- a/idlc/inc/idlc/astexception.hxx
+++ b/idlc/inc/idlc/astexception.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/idlc/inc/idlc/astexpression.hxx b/idlc/inc/idlc/astexpression.hxx
index 74dfb91b7c8c..b09472576367 100644
--- a/idlc/inc/idlc/astexpression.hxx
+++ b/idlc/inc/idlc/astexpression.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,67 +33,67 @@
 // Enum to define all the different operators to combine expressions
 enum ExprComb
 {
-    EC_add,     // '+'
-    EC_minus,   // '-'
-    EC_mul,     // '*'
-    EC_div,     // '/'
-    EC_mod,     // '%'
-    EC_or,      // '|'
-    EC_xor,     // '^'
-    EC_and,     // '&'
-    EC_left,    // '<<'
-    EC_right,   // '>>'
-    EC_u_plus,  // unary '+'
-    EC_u_minus, // unary '-'
-    EC_bit_neg, // '~'
-    EC_none,    // No operator (missing)
-    EC_symbol   // a symbol (function or constant name)
+    EC_add,		// '+'
+    EC_minus,	// '-'
+    EC_mul,		// '*'
+    EC_div,		// '/'
+    EC_mod,		// '%'
+    EC_or,		// '|'
+    EC_xor,		// '^'
+    EC_and,		// '&'
+    EC_left,	// '<<'
+    EC_right,	// '>>'
+    EC_u_plus,	// unary '+'
+    EC_u_minus,	// unary '-'
+    EC_bit_neg,	// '~'
+    EC_none,	// No operator (missing)
+    EC_symbol	// a symbol (function or constant name)
 };
 
 // Enum to define the different kinds of evaluation possible
-enum EvalKind
+enum EvalKind 
 {
-    EK_const,           // Must evaluate to constant
-    EK_positive_int     // Must evaluate to positive integer
+    EK_const,			// Must evaluate to constant
+    EK_positive_int		// Must evaluate to positive integer
 };
 
 // Enum to define expression type
 enum ExprType
 {
-    ET_short,       // Expression value is short
-    ET_ushort,      // Expression value is unsigned short
-    ET_long,        // Expression value is long
-    ET_ulong,       // Expression value is unsigned long
-    ET_hyper,       // Expression value is hyper (64 bit)
-    ET_uhyper,      // Expression value is unsigned hyper
-    ET_float,       // Expression value is 32-bit float
-    ET_double,      // Expression value is 64-bit float
-    ET_char,        // Expression value is char
-    ET_byte,        // Expression value is byte
-    ET_boolean,     // Expression value is boolean
-    ET_string,      // Expression value is char *
-    ET_any,         // Expression value is any of above
-    ET_void,        // Expression value is void (absent)
-    ET_type,        // Expression value is type
-    ET_none         // Expression value is missing
+    ET_short,		// Expression value is short
+    ET_ushort,		// Expression value is unsigned short
+    ET_long,		// Expression value is long
+    ET_ulong,		// Expression value is unsigned long
+    ET_hyper,		// Expression value is hyper (64 bit)
+    ET_uhyper,		// Expression value is unsigned hyper
+    ET_float,		// Expression value is 32-bit float
+    ET_double,		// Expression value is 64-bit float
+    ET_char,		// Expression value is char
+    ET_byte,		// Expression value is byte
+    ET_boolean,		// Expression value is boolean
+    ET_string,		// Expression value is char *
+    ET_any,			// Expression value is any of above
+    ET_void,		// Expression value is void (absent)
+    ET_type,		// Expression value is type
+    ET_none 		// Expression value is missing
 };
 
 // Structure to describe value of constant expression and its type
-struct AstExprValue
+struct AstExprValue 
 {
-    union
+    union 
     {
-        sal_uInt8       byval;      // Contains byte expression value
-        sal_Int16       sval;       // Contains short expression value
-        sal_uInt16      usval;      // Contains unsigned short expr value
-        sal_Int32       lval;       // Contains long expression value
-        sal_uInt32      ulval;      // Contains unsigned long expr value
-        sal_Int64       hval;       // Contains hyper expression value
-        sal_uInt64      uhval;      // Contains unsigned hyper expr value
-        sal_Bool        bval;       // Contains boolean expression value
-        float           fval;       // Contains 32-bit float expr value
-        double          dval;       // Contains 64-bit float expr value
-        sal_uInt32      eval;       // Contains enumeration value
+        sal_uInt8		byval;		// Contains byte expression value
+        sal_Int16		sval;		// Contains short expression value
+        sal_uInt16		usval;		// Contains unsigned short expr value
+        sal_Int32		lval;		// Contains long expression value
+        sal_uInt32		ulval;		// Contains unsigned long expr value
+        sal_Int64		hval;		// Contains hyper expression value
+        sal_uInt64		uhval;		// Contains unsigned hyper expr value
+        sal_Bool		bval;		// Contains boolean expression value
+        float			fval;		// Contains 32-bit float expr value
+        double			dval;		// Contains 64-bit float expr value
+        sal_uInt32		eval;		// Contains enumeration value
     } u;
     ExprType et;
 };
@@ -106,18 +106,18 @@ public:
     // Constructor(s)
     AstExpression(ExprComb c, AstExpression *pExpr1, AstExpression *pExpr2);
 
-    AstExpression(sal_Int32         l);
-    AstExpression(sal_Int32         l, ExprType et);
-    AstExpression(sal_Int64         h);
-    AstExpression(sal_uInt64        uh);
-    AstExpression(double            d);
+    AstExpression(sal_Int32			l);
+    AstExpression(sal_Int32			l, ExprType et);
+    AstExpression(sal_Int64			h);
+    AstExpression(sal_uInt64		uh);
+    AstExpression(double			d);
     AstExpression(::rtl::OString* scopedName);
 
     virtual ~AstExpression();
 
     // Data Accessors
     AstScope* getScope()
-        { return m_pScope; }
+        { return m_pScope; } 
     void setScope(AstScope* pScope)
         { m_pScope = pScope; }
     sal_Int32 getLine()
@@ -163,7 +163,7 @@ public:
     void dump() {}
 private:
     // Fill out the lineno, filename and definition scope details
-    void    fillDefinitionDetails();
+    void	fillDefinitionDetails();
     // Internal evaluation
     AstExprValue* eval_internal(EvalKind ek);
     // Evaluate different sets of operators
@@ -172,15 +172,15 @@ private:
     AstExprValue* eval_un_op(EvalKind ek);
     AstExprValue* eval_symbol(EvalKind ek);
 
-    AstScope*       m_pScope;       // scope defined in
-    sal_Int32       m_lineNo;       // line number defined in
-    ::rtl::OString  m_fileName;     // fileName defined in
+    AstScope*		m_pScope;		// scope defined in
+    sal_Int32		m_lineNo;		// line number defined in	
+    ::rtl::OString	m_fileName;		// fileName	defined in
 
-    ExprComb        m_combOperator;
-    AstExpression*  m_subExpr1;
-    AstExpression*  m_subExpr2;
-    AstExprValue*   m_exprValue;
-    ::rtl::OString* m_pSymbolicName;
+    ExprComb		m_combOperator;
+    AstExpression*	m_subExpr1;
+    AstExpression*	m_subExpr2;
+    AstExprValue*	m_exprValue;
+    ::rtl::OString*	m_pSymbolicName;
 };
 
 #endif // _IDLC_ASTEXPRESSION_HXX_
diff --git a/idlc/inc/idlc/astinterface.hxx b/idlc/inc/idlc/astinterface.hxx
index 5b4f3ae6fee7..038a810a5bbf 100644
--- a/idlc/inc/idlc/astinterface.hxx
+++ b/idlc/inc/idlc/astinterface.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@ public:
 
     AstInterface(
         const ::rtl::OString& name, AstInterface const * pInherits,
-        AstScope* pScope);
+        AstScope* pScope);	
     virtual ~AstInterface();
 
     InheritedInterfaces const & getAllInheritedInterfaces() const
@@ -133,9 +133,9 @@ private:
 
     InheritedInterfaces m_inheritedInterfaces;
     InheritedInterfaces::size_type m_mandatoryInterfaces;
-    sal_Bool    m_bIsDefined;
-    sal_Bool    m_bForwarded;
-    sal_Bool    m_bForwardedInSameFile;
+    sal_Bool	m_bIsDefined;
+    sal_Bool	m_bForwarded;
+    sal_Bool	m_bForwardedInSameFile;
     bool m_bSingleInheritance;
     VisibleInterfaces m_visibleInterfaces;
     VisibleMembers m_visibleMembers;
diff --git a/idlc/inc/idlc/astinterfacemember.hxx b/idlc/inc/idlc/astinterfacemember.hxx
index 12eb19cf678e..8ea498bd0268 100644
--- a/idlc/inc/idlc/astinterfacemember.hxx
+++ b/idlc/inc/idlc/astinterfacemember.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 class AstInterfaceMember : public AstDeclaration
 {
 public:
-    AstInterfaceMember(const sal_uInt32 flags, AstInterface* pRealInterface,
+    AstInterfaceMember(const sal_uInt32 flags, AstInterface* pRealInterface, 
                        const ::rtl::OString& name, AstScope* pScope)
         : AstDeclaration(NT_interface_member, name, pScope)
         , m_flags(flags)
@@ -43,11 +43,11 @@ public:
 
     AstInterface* getRealInterface()
         { return m_pRealInterface; }
-    sal_Bool isOptional()
+    sal_Bool isOptional() 
         { return ((m_flags & AF_OPTIONAL) == AF_OPTIONAL); }
 private:
-    const sal_uInt32    m_flags;
-    AstInterface*       m_pRealInterface;
+    const sal_uInt32	m_flags;
+    AstInterface*		m_pRealInterface;
 };
 
 #endif // _IDLC_ASTINTERFACEMEMBER_HXX_
diff --git a/idlc/inc/idlc/astmember.hxx b/idlc/inc/idlc/astmember.hxx
index 4100bffd3826..0f21f6e37f81 100644
--- a/idlc/inc/idlc/astmember.hxx
+++ b/idlc/inc/idlc/astmember.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/idlc/inc/idlc/astmodule.hxx b/idlc/inc/idlc/astmodule.hxx
index 54c95c2d1305..8e5b12d21099 100644
--- a/idlc/inc/idlc/astmodule.hxx
+++ b/idlc/inc/idlc/astmodule.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/idlc/inc/idlc/astneeds.hxx b/idlc/inc/idlc/astneeds.hxx
index c4084dfef5a5..767223e0a1b7 100644
--- a/idlc/inc/idlc/astneeds.hxx
+++ b/idlc/inc/idlc/astneeds.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ public:
     AstService* getRealService()
         { return m_pRealService; }
 private:
-    AstService* m_pRealService;
+    AstService*	m_pRealService;
 };
 
 #endif // _IDLC_ASTNEEDS_HXX_
diff --git a/idlc/inc/idlc/astobserves.hxx b/idlc/inc/idlc/astobserves.hxx
index 0faec0b8a949..085e28a96791 100644
--- a/idlc/inc/idlc/astobserves.hxx
+++ b/idlc/inc/idlc/astobserves.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ public:
     AstInterface* getRealInterface()
         { return m_pRealInterface; }
 private:
-    AstInterface*   m_pRealInterface;
+    AstInterface*	m_pRealInterface;
 };
 
 #endif // _IDLC_ASTOBSERVES_HXX_
diff --git a/idlc/inc/idlc/astoperation.hxx b/idlc/inc/idlc/astoperation.hxx
index 397e1c3396c0..a49d0e8e385d 100644
--- a/idlc/inc/idlc/astoperation.hxx
+++ b/idlc/inc/idlc/astoperation.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,8 +33,8 @@
 
 namespace typereg { class Writer; }
 
-#define OP_NONE         0x0000
-#define OP_ONEWAY       0x0001
+#define OP_NONE			0x0000
+#define OP_ONEWAY		0x0001
 
 class AstType;
 
@@ -68,9 +68,9 @@ public:
     // scope management
     virtual AstDeclaration* addDeclaration(AstDeclaration* pDecl);
 private:
-    sal_uInt32  m_flags;
-    AstType*    m_pReturnType;
-    DeclList    m_exceptions;
+    sal_uInt32 	m_flags;
+    AstType*	m_pReturnType;
+    DeclList	m_exceptions;
 };
 
 #endif // _IDLC_ASTOPERATION_HXX_
diff --git a/idlc/inc/idlc/astparameter.hxx b/idlc/inc/idlc/astparameter.hxx
index 3d97e72d14b8..fc8fa330b469 100644
--- a/idlc/inc/idlc/astparameter.hxx
+++ b/idlc/inc/idlc/astparameter.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 
 #include <idlc/astmember.hxx>
 
-enum Direction { DIR_IN, DIR_OUT, DIR_INOUT };
+enum Direction { DIR_IN, DIR_OUT, DIR_INOUT };  
 
 class AstParameter: public AstMember {
 public:
diff --git a/idlc/inc/idlc/astscope.hxx b/idlc/inc/idlc/astscope.hxx
index e7f6a3962928..fb5d037a9c55 100644
--- a/idlc/inc/idlc/astscope.hxx
+++ b/idlc/inc/idlc/astscope.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -71,8 +71,8 @@ protected:
     { return m_declarations.back(); }
 
 private:
-    DeclList    m_declarations;
-    NodeType    m_nodeType;
+    DeclList	m_declarations;
+    NodeType 	m_nodeType;
 };
 
 #endif // _IDLC_ASTSCOPE_HXX_
diff --git a/idlc/inc/idlc/astsequence.hxx b/idlc/inc/idlc/astsequence.hxx
index d7e3cec03b9d..0b4e6e45f625 100644
--- a/idlc/inc/idlc/astsequence.hxx
+++ b/idlc/inc/idlc/astsequence.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@ public:
         , m_pMemberType(pMemberType)
         , m_pRelativName(NULL)
     {}
-    virtual ~AstSequence()
+    virtual ~AstSequence() 
     {
         if ( m_pRelativName )
             delete m_pRelativName;
@@ -50,9 +50,9 @@ public:
     virtual bool isUnsigned() const
     { return m_pMemberType != 0 && m_pMemberType->isUnsigned(); }
 
-    virtual const sal_Char* getRelativName() const;
+    virtual const sal_Char*	getRelativName() const;
 private:
-    AstType*        m_pMemberType;
+    AstType* 		m_pMemberType;
     mutable ::rtl::OString* m_pRelativName;
 };
 
diff --git a/idlc/inc/idlc/astservice.hxx b/idlc/inc/idlc/astservice.hxx
index 862c33ce17c4..cd6d2162fb10 100644
--- a/idlc/inc/idlc/astservice.hxx
+++ b/idlc/inc/idlc/astservice.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/idlc/inc/idlc/astservicemember.hxx b/idlc/inc/idlc/astservicemember.hxx
index f8b7932a647f..835387e55732 100644
--- a/idlc/inc/idlc/astservicemember.hxx
+++ b/idlc/inc/idlc/astservicemember.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,11 +43,11 @@ public:
 
     AstService* getRealService()
         { return m_pRealService; }
-    sal_Bool isOptional()
+    sal_Bool isOptional() 
         { return ((m_flags & AF_OPTIONAL) == AF_OPTIONAL); }
 private:
-    const sal_uInt32    m_flags;
-    AstService*         m_pRealService;
+    const sal_uInt32	m_flags;
+    AstService*			m_pRealService;
 };
 
 #endif // _IDLC_ASTSERVICEMEMBER_HXX_
diff --git a/idlc/inc/idlc/aststack.hxx b/idlc/inc/idlc/aststack.hxx
index 6604996c9bb2..6d34f83af4cb 100644
--- a/idlc/inc/idlc/aststack.hxx
+++ b/idlc/inc/idlc/aststack.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,9 +48,9 @@ public:
     void clear();
 
 private:
-    AstScope**  m_stack;
-    sal_uInt32  m_size;
-    sal_uInt32  m_top;
+    AstScope**	m_stack;
+    sal_uInt32 	m_size;
+    sal_uInt32	m_top;
 };
 
 #endif // _IDLC_ASTSTACK_HXX_
diff --git a/idlc/inc/idlc/aststruct.hxx b/idlc/inc/idlc/aststruct.hxx
index 98cadcc4899c..92c09294a49b 100644
--- a/idlc/inc/idlc/aststruct.hxx
+++ b/idlc/inc/idlc/aststruct.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,8 +44,8 @@ public:
         std::vector< rtl::OString > const & typeParameters,
         AstStruct* pBaseType, AstScope* pScope);
 
-    AstStruct(const NodeType type,
-              const ::rtl::OString& name,
+    AstStruct(const NodeType type, 
+              const ::rtl::OString& name, 
               AstStruct* pBaseType,
               AstScope* pScope);
     virtual ~AstStruct();
diff --git a/idlc/inc/idlc/aststructinstance.hxx b/idlc/inc/idlc/aststructinstance.hxx
index 3428bc2be0b2..4b8539311b78 100644
--- a/idlc/inc/idlc/aststructinstance.hxx
+++ b/idlc/inc/idlc/aststructinstance.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/idlc/inc/idlc/asttype.hxx b/idlc/inc/idlc/asttype.hxx
index 32a18ab671f5..a3c2abba5b3e 100644
--- a/idlc/inc/idlc/asttype.hxx
+++ b/idlc/inc/idlc/asttype.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/idlc/inc/idlc/asttypedef.hxx b/idlc/inc/idlc/asttypedef.hxx
index 2b1839dcadd9..6f467e2a4a48 100644
--- a/idlc/inc/idlc/asttypedef.hxx
+++ b/idlc/inc/idlc/asttypedef.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/idlc/inc/idlc/astunion.hxx b/idlc/inc/idlc/astunion.hxx
index 4435317bee37..132bdd7064ac 100644
--- a/idlc/inc/idlc/astunion.hxx
+++ b/idlc/inc/idlc/astunion.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -61,8 +61,8 @@ protected:
     AstUnionBranch* lookupEnum(AstUnionBranch* pBranch);
 
 private:
-    AstType*    m_pDiscriminantType;
-    ExprType    m_discExprType;
+    AstType* 	m_pDiscriminantType;
+    ExprType	m_discExprType;
 };
 
 #endif // _IDLC_ASTUNION_HXX_
diff --git a/idlc/inc/idlc/astunionbranch.hxx b/idlc/inc/idlc/astunionbranch.hxx
index 20df92b90552..35a9d4b835ef 100644
--- a/idlc/inc/idlc/astunionbranch.hxx
+++ b/idlc/inc/idlc/astunionbranch.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ public:
     AstUnionLabel* getLabel()
         { return m_pLabel; }
 private:
-    AstUnionLabel*  m_pLabel;
+    AstUnionLabel* 	m_pLabel;
 };
 
 #endif // _IDLC_ASTUNIONBRANCH_HXX_
diff --git a/idlc/inc/idlc/astunionlabel.hxx b/idlc/inc/idlc/astunionlabel.hxx
index d468884d5a01..61f0fe3414eb 100644
--- a/idlc/inc/idlc/astunionlabel.hxx
+++ b/idlc/inc/idlc/astunionlabel.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,10 +28,10 @@
 #ifndef _IDLC_ASTUNIONLABEL_HXX_
 #define _IDLC_ASTUNIONLABEL_HXX_
 
-enum UnionLabel
+enum UnionLabel 
 {
-    UL_default,     // Label is "default"
-    UL_label        // Regular label
+    UL_default,		// Label is "default"
+    UL_label		// Regular label
 };
 
 class AstUnionLabel
@@ -45,8 +45,8 @@ public:
     AstExpression* getLabelValue()
         { return m_pLabelValue; }
 private:
-    UnionLabel      m_label;
-    AstExpression*  m_pLabelValue;
+    UnionLabel 		m_label;
+    AstExpression*	m_pLabelValue;
 };
 
 #endif // _IDLC_ASTUNIONLABEL_HXX_
diff --git a/idlc/inc/idlc/errorhandler.hxx b/idlc/inc/idlc/errorhandler.hxx
index 44d2a8a5a704..c60bc3441514 100644
--- a/idlc/inc/idlc/errorhandler.hxx
+++ b/idlc/inc/idlc/errorhandler.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,41 +35,41 @@
 
 enum ErrorCode
 {
-    EIDL_NONE,              // No error
-    EIDL_SYNTAX_ERROR,      // Syntax error in IDL input
+    EIDL_NONE,				// No error
+    EIDL_SYNTAX_ERROR,		// Syntax error in IDL input
                             // More details will be gleaned from examining
                             // the parse state
-    EIDL_REDEF,             // Redefinition
-    EIDL_REDEF_SCOPE,       // Redefinition inside defining scope
-    EIDL_DEF_USE,           // Definition after use
-    EIDL_MULTIPLE_BRANCH,   // More than one union branch with this label
-    EIDL_COERCION_FAILURE,  // Coercion failure
-    EIDL_SCOPE_CONFLICT,    // Between fwd declare and full declare
-    EIDL_ONEWAY_CONFLICT,   // Between op decl and argument direction
-    EIDL_DISC_TYPE,         // Illegal discriminator type in union
-    EIDL_LABEL_TYPE,        // Mismatch with discriminator type in union
-    EIDL_ILLEGAL_ADD,       // Illegal add action
-    EIDL_ILLEGAL_USE,       // Illegal type used in expression
-    EIDL_ILLEGAL_RAISES,    // Error in "raises" clause
-    EIDL_CANT_INHERIT,      // Cannot inherit from non-interface
-    EIDL_LOOKUP_ERROR,      // Identifier not found
-    EIDL_INHERIT_FWD_ERROR, // Cannot inherit from fwd decl interface
-    EIDL_CONSTANT_EXPECTED, // We got something else..
-    EIDL_NAME_CASE_ERROR,   // Spelling differences found
-    EIDL_ENUM_VAL_EXPECTED, // Expected an enumerator
-    EIDL_ENUM_VAL_NOT_FOUND,    // Didnt find an enumerator with that name
-    EIDL_EVAL_ERROR,        // Error in evaluating expression
-    EIDL_AMBIGUOUS,         // Ambiguous name definition
-    EIDL_DECL_NOT_DEFINED,  // Forward declared but never defined
-    EIDL_FWD_DECL_LOOKUP,   // Tried to lookup in fwd declared intf
-    EIDL_RECURSIVE_TYPE,    // Illegal recursive use of type
-    EIDL_NONVOID_ONEWAY,    // Non-void return type in oneway operation
-    EIDL_NOT_A_TYPE,        // Not a type
-    EIDL_TYPE_NOT_VALID,    // Type is not valid in this context
-    EIDL_INTERFACEMEMBER_LOOKUP,    // interface is not defined or a fwd declaration not exists
+    EIDL_REDEF,				// Redefinition
+    EIDL_REDEF_SCOPE,		// Redefinition inside defining scope
+    EIDL_DEF_USE,			// Definition after use
+    EIDL_MULTIPLE_BRANCH,	// More than one union branch with this label
+    EIDL_COERCION_FAILURE,	// Coercion failure
+    EIDL_SCOPE_CONFLICT,	// Between fwd declare and full declare
+    EIDL_ONEWAY_CONFLICT,	// Between op decl and argument direction
+    EIDL_DISC_TYPE,			// Illegal discriminator type in union
+    EIDL_LABEL_TYPE,		// Mismatch with discriminator type in union
+    EIDL_ILLEGAL_ADD,		// Illegal add action
+    EIDL_ILLEGAL_USE,		// Illegal type used in expression
+    EIDL_ILLEGAL_RAISES,	// Error in "raises" clause
+    EIDL_CANT_INHERIT,		// Cannot inherit from non-interface
+    EIDL_LOOKUP_ERROR,		// Identifier not found
+    EIDL_INHERIT_FWD_ERROR,	// Cannot inherit from fwd decl interface
+    EIDL_CONSTANT_EXPECTED,	// We got something else..
+    EIDL_NAME_CASE_ERROR,	// Spelling differences found
+    EIDL_ENUM_VAL_EXPECTED,	// Expected an enumerator
+    EIDL_ENUM_VAL_NOT_FOUND,	// Didnt find an enumerator with that name
+    EIDL_EVAL_ERROR,		// Error in evaluating expression
+    EIDL_AMBIGUOUS,			// Ambiguous name definition
+    EIDL_DECL_NOT_DEFINED,	// Forward declared but never defined
+    EIDL_FWD_DECL_LOOKUP,	// Tried to lookup in fwd declared intf
+    EIDL_RECURSIVE_TYPE,	// Illegal recursive use of type
+    EIDL_NONVOID_ONEWAY,	// Non-void return type in oneway operation
+    EIDL_NOT_A_TYPE,		// Not a type
+    EIDL_TYPE_NOT_VALID,	// Type is not valid in this context
+    EIDL_INTERFACEMEMBER_LOOKUP,	// interface is not defined or a fwd declaration not exists
     EIDL_SERVICEMEMBER_LOOKUP,
-    EIDL_TYPE_IDENT_CONFLICT,   // type and identifier has equal names
-    EIDL_ONEWAY_RAISE_CONFLICT, // oneway function raised excpetion conflict
+    EIDL_TYPE_IDENT_CONFLICT,	// type and identifier has equal names
+    EIDL_ONEWAY_RAISE_CONFLICT,	// oneway function raised excpetion conflict
     EIDL_WRONGATTRIBUTEFLAG,
     EIDL_DEFINED_ATTRIBUTEFLAG,
     EIDL_WRONGATTRIBUTEKEYWORD,
@@ -108,48 +108,48 @@ class ErrorHandler
 {
 public:
     // Report errors with varying numbers of arguments
-    void    error0(ErrorCode e);
-    void    error1(ErrorCode e, AstDeclaration const * d);
-    void    error2(
+    void	error0(ErrorCode e);
+    void	error1(ErrorCode e, AstDeclaration const * d);
+    void	error2(
         ErrorCode e, AstDeclaration const * d1, AstDeclaration const * d2);
-    void    error3(ErrorCode e, AstDeclaration* d1, AstDeclaration* d2, AstDeclaration* d3);
+    void	error3(ErrorCode e, AstDeclaration* d1, AstDeclaration* d2, AstDeclaration* d3);
 
     // Warning
-    void    warning0(WarningCode e, const sal_Char* warningmsg);
+    void	warning0(WarningCode e, const sal_Char* warningmsg);
 
     // Report a syntax error in IDL input
-    void    syntaxError(ParseState state, sal_Int32 lineNumber, const sal_Char* errmsg);
+    void	syntaxError(ParseState state, sal_Int32 lineNumber, const sal_Char* errmsg);
 
     // Report an unsuccesful coercion attempt
-    void    coercionError(AstExpression *pExpr, ExprType et);
+    void	coercionError(AstExpression *pExpr, ExprType et);
 
     // Report a failed name lookup attempt
-    void    lookupError(const ::rtl::OString& n);
+    void	lookupError(const ::rtl::OString& n);
     // Report a failed name lookup attempt
-    void    lookupError(ErrorCode e, const ::rtl::OString& n, AstDeclaration* pScope);
+    void	lookupError(ErrorCode e, const ::rtl::OString& n, AstDeclaration* pScope);
 
 
     // Report a type error
-    void    noTypeError(AstDeclaration const * pDecl);
+    void 	noTypeError(AstDeclaration const * pDecl);
 
-    void    inheritanceError(NodeType nodeType, const ::rtl::OString* name, AstDeclaration* pDecl);
+    void 	inheritanceError(NodeType nodeType, const ::rtl::OString* name, AstDeclaration* pDecl);
 
-    void    flagError(ErrorCode e, sal_uInt32 flag);
+    void 	flagError(ErrorCode e, sal_uInt32 flag);
 
-    void    forwardLookupError(AstDeclaration* pForward, const ::rtl::OString& name);
+    void	forwardLookupError(AstDeclaration* pForward, const ::rtl::OString& name);
 
-    void    constantExpected(AstDeclaration* pDecl, const ::rtl::OString& name);
+    void	constantExpected(AstDeclaration* pDecl, const ::rtl::OString& name);
 
-    void    evalError(AstExpression* pExpr);
+    void 	evalError(AstExpression* pExpr);
 
     // Report a situation where an enumerator was expected but we got
     // something else instead. This occurs when a union with an enum
     // discriminator is being parsed and one of the branch labels is
     // not an enumerator in that enum
-    void    enumValExpected(AstUnion* pUnion);
+    void	enumValExpected(AstUnion* pUnion);
 
     // Report a failed enumerator lookup in an enum
-    void    enumValLookupFailure(AstUnion* pUnion, AstEnum* pEnum, const ::rtl::OString& name);
+    void	enumValLookupFailure(AstUnion* pUnion, AstEnum* pEnum, const ::rtl::OString& name);
 
     bool checkPublished(AstDeclaration const * decl, bool bOptiional=false);
 };
diff --git a/idlc/inc/idlc/fehelper.hxx b/idlc/inc/idlc/fehelper.hxx
index 9c716da3edfd..35e38e7e2d29 100644
--- a/idlc/inc/idlc/fehelper.hxx
+++ b/idlc/inc/idlc/fehelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,10 +37,10 @@ class FeDeclarator
 {
 public:
     // Enum to denote types of declarators
-    enum DeclaratorType
+    enum DeclaratorType 
     {
-        FD_simple,      // Simple declarator
-        FD_complex      // Complex declarator (complex_part field used)
+        FD_simple,		// Simple declarator
+        FD_complex		// Complex declarator (complex_part field used)
     };
 
     FeDeclarator(const ::rtl::OString& name, DeclaratorType declType, AstDeclaration* pComplPart);
@@ -50,7 +50,7 @@ public:
         { return m_pComplexPart; }
     const ::rtl::OString& getName()
         { return m_name; }
-    DeclaratorType  getDeclType()
+    DeclaratorType	getDeclType()
         { return m_declType; }
 
     sal_Bool checkType(AstDeclaration const * pType);
@@ -58,7 +58,7 @@ public:
 private:
     AstDeclaration* m_pComplexPart;
     ::rtl::OString  m_name;
-    DeclaratorType  m_declType;
+    DeclaratorType	m_declType;
 };
 
 typedef ::std::list< FeDeclarator* > FeDeclList;
@@ -69,7 +69,7 @@ public:
     FeInheritanceHeader(
         NodeType nodeType, ::rtl::OString* pName, ::rtl::OString* pInherits,
         std::vector< rtl::OString > * typeParameters);
-
+    
     virtual ~FeInheritanceHeader()
     {
         if ( m_pName )
@@ -89,8 +89,8 @@ public:
 private:
     void initializeInherits(::rtl::OString* pinherits);
 
-    NodeType        m_nodeType;
-    ::rtl::OString* m_pName;
+    NodeType		m_nodeType;
+    ::rtl::OString*	m_pName;
     AstDeclaration* m_pInherits;
     std::vector< rtl::OString > m_typeParameters;
 };
diff --git a/idlc/inc/idlc/idlc.hxx b/idlc/inc/idlc/idlc.hxx
index 8262b26fc095..a423624579f9 100644
--- a/idlc/inc/idlc/idlc.hxx
+++ b/idlc/inc/idlc/idlc.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -75,12 +75,12 @@ public:
     void setRealFileName(const ::rtl::OString& realFileName)
         { m_realFileName = realFileName; }
     const ::rtl::OString& getDocumentation()
-        {
+        { 
             m_bIsDocValid = sal_False;
-            return m_documentation;
+            return m_documentation; 
         }
     void setDocumentation(const ::rtl::OString& documentation)
-        {
+        { 
             m_documentation = documentation;
             m_bIsDocValid = sal_True;
         }
@@ -128,25 +128,25 @@ public:
 
     void reset();
 private:
-    Options*            m_pOptions;
-    AstStack*           m_pScopes;
-    AstModule*          m_pRoot;
-    ErrorHandler*       m_pErrorHandler;
-    ::rtl::OString      m_fileName;
-    ::rtl::OString      m_mainFileName;
-    ::rtl::OString      m_realFileName;
-    ::rtl::OString      m_documentation;
-    sal_Bool            m_bIsDocValid;
-    sal_Bool            m_bGenerateDoc;
-    sal_Bool            m_bIsInMainfile;
+    Options*			m_pOptions;
+    AstStack*			m_pScopes;
+    AstModule*			m_pRoot;
+    ErrorHandler*		m_pErrorHandler;
+    ::rtl::OString		m_fileName;
+    ::rtl::OString		m_mainFileName;
+    ::rtl::OString		m_realFileName;
+    ::rtl::OString		m_documentation;
+    sal_Bool			m_bIsDocValid;
+    sal_Bool			m_bGenerateDoc;
+    sal_Bool			m_bIsInMainfile;
     bool                m_published;
-    sal_uInt32          m_errorCount;
-    sal_uInt32          m_warningCount;
-    sal_uInt32          m_lineNumber;
-    sal_uInt32          m_offsetStart;
-    sal_uInt32          m_offsetEnd;
-    ParseState          m_parseState;
-    StringSet           m_includes;
+    sal_uInt32			m_errorCount;
+    sal_uInt32			m_warningCount;
+    sal_uInt32			m_lineNumber;
+    sal_uInt32			m_offsetStart;
+    sal_uInt32			m_offsetEnd;
+    ParseState			m_parseState;
+    StringSet			m_includes;
 };
 
 sal_Int32 compileFile(const ::rtl::OString * pathname);
diff --git a/idlc/inc/idlc/idlctypes.hxx b/idlc/inc/idlc/idlctypes.hxx
index 0849dd85fb28..a23e760d00cd 100644
--- a/idlc/inc/idlc/idlctypes.hxx
+++ b/idlc/inc/idlc/idlctypes.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -61,15 +61,15 @@ struct LessString
     }
 };
 
-typedef ::std::list< ::rtl::OString >               StringList;
-typedef ::std::vector< ::rtl::OString >             StringVector;
-typedef ::std::set< ::rtl::OString, LessString >    StringSet;
+typedef ::std::list< ::rtl::OString > 				StringList;
+typedef ::std::vector< ::rtl::OString > 			StringVector;
+typedef ::std::set< ::rtl::OString, LessString > 	StringSet;
 
 class AstExpression;
-typedef ::std::list< AstExpression* >   ExprList;
+typedef ::std::list< AstExpression* >  	ExprList;
 
 class AstUnionLabel;
-typedef ::std::list< AstUnionLabel* >   LabelList;
+typedef ::std::list< AstUnionLabel* >  	LabelList;
 
 class AstDeclaration;
 
@@ -85,183 +85,183 @@ AstScope* SAL_CALL declAsScope(AstDeclaration* pDecl);
 #endif
 
 // flags used for attributes, properties and services
-#define AF_INVALID          0x0000
-#define AF_READONLY         0x0001
-#define AF_OPTIONAL         0x0002
-#define AF_MAYBEVOID        0x0004
-#define AF_BOUND            0x0008
-#define AF_CONSTRAINED      0x0010
-#define AF_TRANSIENT        0x0020
-#define AF_MAYBEAMBIGUOUS   0x0040
-#define AF_MAYBEDEFAULT     0x0080
-#define AF_REMOVEABLE       0x0100
-#define AF_ATTRIBUTE        0x0200
-#define AF_PROPERTY         0x0400
+#define AF_INVALID			0x0000
+#define AF_READONLY			0x0001
+#define AF_OPTIONAL			0x0002
+#define AF_MAYBEVOID		0x0004
+#define AF_BOUND			0x0008
+#define AF_CONSTRAINED		0x0010
+#define AF_TRANSIENT		0x0020
+#define AF_MAYBEAMBIGUOUS	0x0040
+#define AF_MAYBEDEFAULT		0x0080
+#define AF_REMOVEABLE		0x0100
+#define AF_ATTRIBUTE		0x0200
+#define AF_PROPERTY			0x0400
 
 enum ParseState
 {
     PS_NoState,
-    PS_TypeDeclSeen,        // Seen complete typedef declaration
-    PS_ConstantDeclSeen,    // Seen complete const declaration
-    PS_ExceptionDeclSeen,   // Seen complete exception declaration
-    PS_InterfaceDeclSeen,   // Seen complete interface declaration
-    PS_ServiceDeclSeen,     // Seen complete service declaration
-    PS_SingletonDeclSeen,   // Seen complete singleton declaration
-    PS_ModuleDeclSeen,      // Seen complete module declaration
-    PS_AttributeDeclSeen,   // Seen complete attribute declaration
-    PS_PropertyDeclSeen,    // Seen complete property declaration
-    PS_OperationDeclSeen,   // Seen complete operation declaration
+    PS_TypeDeclSeen,		// Seen complete typedef declaration
+    PS_ConstantDeclSeen,  	// Seen complete const declaration
+    PS_ExceptionDeclSeen, 	// Seen complete exception declaration
+    PS_InterfaceDeclSeen,	// Seen complete interface declaration
+    PS_ServiceDeclSeen,		// Seen complete service declaration
+    PS_SingletonDeclSeen,	// Seen complete singleton declaration
+    PS_ModuleDeclSeen,		// Seen complete module declaration
+    PS_AttributeDeclSeen, 	// Seen complete attribute declaration
+    PS_PropertyDeclSeen,	// Seen complete property declaration
+    PS_OperationDeclSeen, 	// Seen complete operation declaration	
     PS_InterfaceInheritanceDeclSeen, // Seen complete interface inheritance decl
-    PS_ConstantsDeclSeen,   // Seen complete constants declaration
-
-    PS_ServiceSeen,         // Seen a SERVICE keyword
-    PS_ServiceIDSeen,       // Seen the service ID
-    PS_ServiceSqSeen,       // '{' seen for service
-    PS_ServiceQsSeen,       // '}' seen for service
-    PS_ServiceBodySeen,     // Seen complete service body
-    PS_ServiceMemberSeen,   // Seen a service member
+    PS_ConstantsDeclSeen, 	// Seen complete constants declaration	
+
+    PS_ServiceSeen,			// Seen a SERVICE keyword
+    PS_ServiceIDSeen,		// Seen the service ID
+    PS_ServiceSqSeen,		// '{' seen for service
+    PS_ServiceQsSeen,		// '}' seen for service
+    PS_ServiceBodySeen, 	// Seen complete service body
+    PS_ServiceMemberSeen,	// Seen a service member
     PS_ServiceIFHeadSeen,   // Seen an interface member header
-    PS_ServiceSHeadSeen,    // Seen an service member header
-
-    PS_SingletonSeen,       // Seen a SINGLETON keyword
-    PS_SingletonIDSeen,     // Seen the singleton ID
-    PS_SingletonSqSeen,     // '{' seen for singleton
-    PS_SingletonQsSeen,     // '}' seen for singleton
-    PS_SingletonBodySeen,   // Seen complete singleton body
-    PS_SingletonMemberSeen, // Seen a singleton member
-
-    PS_ModuleSeen,          // Seen a MODULE keyword
-    PS_ModuleIDSeen,        // Seen the module ID
-    PS_ModuleSqSeen,        // '{' seen for module
-    PS_ModuleQsSeen,        // '}' seen for module
-    PS_ModuleBodySeen,      // Seen complete module body
-
-    PS_ConstantsSeen,       // Seen a CONSTANTS keyword
-    PS_ConstantsIDSeen,     // Seen the constants ID
-    PS_ConstantsSqSeen,     // '{' seen for constants
-    PS_ConstantsQsSeen,     // '}' seen for constants
-    PS_ConstantsBodySeen,   // Seen complete constants body
-
-    PS_InterfaceSeen,       // Seen an INTERFACE keyword
-    PS_InterfaceIDSeen,     // Seen the interface ID
-    PS_InterfaceHeadSeen,   // Seen the interface head
-    PS_InheritSpecSeen,     // Seen a complete inheritance spec
-    PS_ForwardDeclSeen,     // Forward interface decl seen
-    PS_InterfaceSqSeen,     // '{' seen for interface
-    PS_InterfaceQsSeen,     // '}' seen for interface
-    PS_InterfaceBodySeen,   // Seen an interface body
-    PS_InheritColonSeen,    // Seen ':' in inheritance list
-
-    PS_SNListCommaSeen,     // Seen ',' in list of scoped names
-    PS_ScopedNameSeen,      // Seen a complete scoped name
-    PS_SN_IDSeen,           // Seen an identifier as part of a scoped name
-    PS_ScopeDelimSeen,      // Seen a scope delim as party of a scoped name
-
-    PS_ConstSeen,           // Seen a CONST keyword
-    PS_ConstTypeSeen,       // Parsed the type of a constant
-    PS_ConstIDSeen,         // Seen the constant ID
-    PS_ConstAssignSeen,     // Seen the '='
-    PS_ConstExprSeen,       // Seen the constant value expression
-
-    PS_TypedefSeen,         // Seen a TYPEDEF keyword
-    PS_TypeSpecSeen,        // Seen a complete type specification
-    PS_DeclaratorsSeen,     // Seen a complete list of declarators
-
-    PS_StructSeen,          // Seen a STRUCT keyword
-    PS_StructHeaderSeen,    // Seen struct header
-    PS_StructIDSeen,        // Seen the struct ID
-    PS_StructSqSeen,        // '{' seen for struct
-    PS_StructQsSeen,        // '}' seen for struct
-    PS_StructBodySeen,      // Seen complete body of struct decl
-
-    PS_MemberTypeSeen,      // Seen type of struct or except member
-    PS_MemberDeclsSeen,     // Seen decls of struct or except members
+    PS_ServiceSHeadSeen,   	// Seen an service member header
+
+    PS_SingletonSeen,		// Seen a SINGLETON keyword
+    PS_SingletonIDSeen,		// Seen the singleton ID
+    PS_SingletonSqSeen,		// '{' seen for singleton
+    PS_SingletonQsSeen,		// '}' seen for singleton
+    PS_SingletonBodySeen, 	// Seen complete singleton body
+    PS_SingletonMemberSeen,	// Seen a singleton member
+
+    PS_ModuleSeen,			// Seen a MODULE keyword
+    PS_ModuleIDSeen,		// Seen the module ID
+    PS_ModuleSqSeen,		// '{' seen for module
+    PS_ModuleQsSeen,		// '}' seen for module
+    PS_ModuleBodySeen,		// Seen complete module body
+
+    PS_ConstantsSeen,		// Seen a CONSTANTS keyword
+    PS_ConstantsIDSeen,		// Seen the constants ID
+    PS_ConstantsSqSeen,		// '{' seen for constants
+    PS_ConstantsQsSeen,		// '}' seen for constants
+    PS_ConstantsBodySeen,  	// Seen complete constants body
+    
+    PS_InterfaceSeen,		// Seen an INTERFACE keyword
+    PS_InterfaceIDSeen,		// Seen the interface ID
+    PS_InterfaceHeadSeen,	// Seen the interface head
+    PS_InheritSpecSeen,		// Seen a complete inheritance spec
+    PS_ForwardDeclSeen,		// Forward interface decl seen
+    PS_InterfaceSqSeen,		// '{' seen for interface
+    PS_InterfaceQsSeen,		// '}' seen for interface
+    PS_InterfaceBodySeen,	// Seen an interface body
+    PS_InheritColonSeen,	// Seen ':' in inheritance list
+
+    PS_SNListCommaSeen,		// Seen ',' in list of scoped names
+    PS_ScopedNameSeen,		// Seen a complete scoped name
+    PS_SN_IDSeen,			// Seen an identifier as part of a scoped name
+    PS_ScopeDelimSeen,		// Seen a scope delim as party of a scoped name
+
+    PS_ConstSeen,			// Seen a CONST keyword
+    PS_ConstTypeSeen,		// Parsed the type of a constant
+    PS_ConstIDSeen,			// Seen the constant ID
+    PS_ConstAssignSeen,		// Seen the '='
+    PS_ConstExprSeen,		// Seen the constant value expression
+
+    PS_TypedefSeen,			// Seen a TYPEDEF keyword
+    PS_TypeSpecSeen,		// Seen a complete type specification
+    PS_DeclaratorsSeen,		// Seen a complete list of declarators
+
+    PS_StructSeen,			// Seen a STRUCT keyword
+    PS_StructHeaderSeen,	// Seen struct header
+    PS_StructIDSeen,		// Seen the struct ID
+    PS_StructSqSeen,		// '{' seen for struct
+    PS_StructQsSeen,		// '}' seen for struct
+    PS_StructBodySeen,		// Seen complete body of struct decl
+
+    PS_MemberTypeSeen,		// Seen type of struct or except member
+    PS_MemberDeclsSeen,		// Seen decls of struct or except members
     PS_MemberDeclsCompleted,// Completed one struct or except member to ';'
 
-    PS_UnionSeen,           // Seen a UNION keyword
-    PS_UnionIDSeen,         // Seen the union ID
-    PS_SwitchSeen,          // Seen the SWITCH keyword
-    PS_SwitchOpenParSeen,   // Seen the switch open par.
-    PS_SwitchTypeSeen,      // Seen the switch type spec
-    PS_SwitchCloseParSeen,  // Seen the switch close par.
-    PS_UnionSqSeen,         // '{' seen for union
-    PS_UnionQsSeen,         // '}' seen for union
-    PS_DefaultSeen,         // Seen DEFAULT keyword
-    PS_UnionLabelSeen,      // Seen label of union element
-    PS_LabelColonSeen,      // Seen ':' of union branch label
-    PS_LabelExprSeen,       // Seen expression of union branch label
-    PS_UnionElemSeen,       // Seen a union element
-    PS_UnionElemCompleted,  // Completed one union member up to ';'
-    PS_CaseSeen,            // Seen a CASE keyword
-    PS_UnionElemTypeSeen,   // Seen type spec for union element
-    PS_UnionElemDeclSeen,   // Seen declarator for union element
-    PS_UnionBodySeen,       // Seen completed union body
-
-    PS_EnumSeen,            // Seen an ENUM keyword
-    PS_EnumIDSeen,          // Seen the enum ID
-    PS_EnumSqSeen,          // Seen '{' for enum
-    PS_EnumQsSeen,          // Seen '}' for enum
-    PS_EnumBodySeen,        // Seen complete enum body
-    PS_EnumCommaSeen,       // Seen ',' in list of enumerators
-
-    PS_SequenceSeen,        // Seen a SEQUENCE keyword
-    PS_SequenceSqSeen,      // Seen '<' for sequence
-    PS_SequenceQsSeen,      // Seen '>' for sequence
-    PS_SequenceTypeSeen,    // Seen type decl for sequence
-
-    PS_ArrayIDSeen,         // Seen array ID
-    PS_ArrayTypeSeen,       // Seen array type
-    PS_ArrayCompleted,      // Seen completed array declaration
-    PS_DimSqSeen,           // Seen '[' for array dimension
-    PS_DimQsSeen,           // Seen ']' for array dimension
-    PS_DimExprSeen,         // Seen size expression for array dimension
-
-
-    PS_FlagHeaderSeen,      // Seen the attribute|property|interface member head
-    PS_AttrSeen,            // Seen ATTRIBUTE keyword
-    PS_AttrTypeSeen,        // Seen type decl for attribute
-    PS_AttrCompleted,       // Seen complete attribute declaration
-    PS_ReadOnlySeen,        // Seen READONLY keyword
-    PS_OptionalSeen,        // Seen OPTIONAL keyword
-    PS_MayBeVoidSeen,       // Seen MAYBEVOID yword
-    PS_BoundSeen,           // Seen BOUND  keyword
-    PS_ConstrainedSeen,     // Seen CONSTRAINED keyword
-    PS_TransientSeen,       // Seen TRANSIENT keyword
-    PS_MayBeAmbigiousSeen,  // Seen MAYBEAMBIGIOUS keyword
-    PS_MayBeDefaultSeen,    // Seen MAYBEDEFAULT keyword
-    PS_RemoveableSeen,      // Seen REMOVEABLE keyword
-
-    PS_PropertySeen,        // Seen PROPERTY keyword
-    PS_PropertyTypeSeen,    // Seen type decl for property
-    PS_PropertyCompleted,   // Seen complete property declaration
-
-    PS_ExceptSeen,          // Seen EXCEPTION keyword
-    PS_ExceptHeaderSeen,    // Seen exception header keyword
-    PS_ExceptIDSeen,        // Seen exception identifier
-    PS_ExceptSqSeen,        // Seen '{' for exception
-    PS_ExceptQsSeen,        // Seen '}' for exception
-    PS_ExceptBodySeen,      // Seen complete exception body
-
-    PS_OpHeadSeen,          // Seen the operation head
-    PS_OpTypeSeen,          // Seen operation return type
-    PS_OpIDSeen,            // Seen operation ID
-    PS_OpParsCompleted,     // Completed operation param list
-    PS_OpCompleted,         // Completed operation statement
-    PS_OpSqSeen,            // Seen '(' for operation
-    PS_OpQsSeen,            // Seen ')' for operation
-    PS_OpParCommaSeen,      // Seen ',' in list of op params
-    PS_OpParDirSeen,        // Seen parameter direction
-    PS_OpParTypeSeen,       // Seen parameter type
-    PS_OpParDeclSeen,       // Seen parameter declaration
-    PS_OpOnewaySeen,        // Seen ONEWAY keyword
+    PS_UnionSeen,			// Seen a UNION keyword
+    PS_UnionIDSeen,			// Seen the union ID
+    PS_SwitchSeen,			// Seen the SWITCH keyword
+    PS_SwitchOpenParSeen,	// Seen the switch open par.
+    PS_SwitchTypeSeen,		// Seen the switch type spec
+    PS_SwitchCloseParSeen,	// Seen the switch close par.
+    PS_UnionSqSeen,			// '{' seen for union
+    PS_UnionQsSeen,			// '}' seen for union
+    PS_DefaultSeen,			// Seen DEFAULT keyword
+    PS_UnionLabelSeen,		// Seen label of union element
+    PS_LabelColonSeen,		// Seen ':' of union branch label
+    PS_LabelExprSeen,		// Seen expression of union branch label
+    PS_UnionElemSeen,		// Seen a union element
+    PS_UnionElemCompleted,	// Completed one union member up to ';'
+    PS_CaseSeen,			// Seen a CASE keyword
+    PS_UnionElemTypeSeen,	// Seen type spec for union element
+    PS_UnionElemDeclSeen,	// Seen declarator for union element
+    PS_UnionBodySeen,		// Seen completed union body
+
+    PS_EnumSeen,			// Seen an ENUM keyword
+    PS_EnumIDSeen,			// Seen the enum ID
+    PS_EnumSqSeen,			// Seen '{' for enum
+    PS_EnumQsSeen,			// Seen '}' for enum
+    PS_EnumBodySeen,		// Seen complete enum body
+    PS_EnumCommaSeen,		// Seen ',' in list of enumerators
+
+    PS_SequenceSeen,		// Seen a SEQUENCE keyword
+    PS_SequenceSqSeen,		// Seen '<' for sequence
+    PS_SequenceQsSeen,		// Seen '>' for sequence
+    PS_SequenceTypeSeen,	// Seen type decl for sequence
+
+    PS_ArrayIDSeen,			// Seen array ID
+    PS_ArrayTypeSeen,		// Seen array type
+    PS_ArrayCompleted,		// Seen completed array declaration
+    PS_DimSqSeen,			// Seen '[' for array dimension
+    PS_DimQsSeen,			// Seen ']' for array dimension
+    PS_DimExprSeen,			// Seen size expression for array dimension
+
+
+    PS_FlagHeaderSeen,		// Seen the attribute|property|interface member head
+    PS_AttrSeen,			// Seen ATTRIBUTE keyword
+    PS_AttrTypeSeen,		// Seen type decl for attribute
+    PS_AttrCompleted,		// Seen complete attribute declaration
+    PS_ReadOnlySeen,		// Seen READONLY keyword
+    PS_OptionalSeen,		// Seen OPTIONAL keyword
+    PS_MayBeVoidSeen,		// Seen MAYBEVOID yword
+    PS_BoundSeen,			// Seen BOUND  keyword
+    PS_ConstrainedSeen,		// Seen CONSTRAINED keyword
+    PS_TransientSeen,		// Seen TRANSIENT keyword
+    PS_MayBeAmbigiousSeen,	// Seen MAYBEAMBIGIOUS keyword
+    PS_MayBeDefaultSeen,	// Seen MAYBEDEFAULT keyword
+    PS_RemoveableSeen, 		// Seen REMOVEABLE keyword
+
+    PS_PropertySeen,		// Seen PROPERTY keyword
+    PS_PropertyTypeSeen,	// Seen type decl for property
+    PS_PropertyCompleted,	// Seen complete property declaration
+
+    PS_ExceptSeen,			// Seen EXCEPTION keyword
+    PS_ExceptHeaderSeen,   	// Seen exception header keyword
+    PS_ExceptIDSeen,		// Seen exception identifier
+    PS_ExceptSqSeen,		// Seen '{' for exception
+    PS_ExceptQsSeen,		// Seen '}' for exception
+    PS_ExceptBodySeen,		// Seen complete exception body
+
+    PS_OpHeadSeen,			// Seen the operation head
+    PS_OpTypeSeen,			// Seen operation return type
+    PS_OpIDSeen,			// Seen operation ID
+    PS_OpParsCompleted,		// Completed operation param list
+    PS_OpCompleted,			// Completed operation statement
+    PS_OpSqSeen,			// Seen '(' for operation
+    PS_OpQsSeen,			// Seen ')' for operation
+    PS_OpParCommaSeen,		// Seen ',' in list of op params
+    PS_OpParDirSeen,		// Seen parameter direction
+    PS_OpParTypeSeen,		// Seen parameter type
+    PS_OpParDeclSeen,		// Seen parameter declaration
+    PS_OpOnewaySeen,		// Seen ONEWAY keyword
 
     PS_RaiseSeen,           // Seen RAISES keyword
     PS_RaiseSqSeen,         // Seen '(' for RAISES
     PS_RaiseQsSeen,         // Seen ')' for RAISES
 
-    PS_DeclsCommaSeen,      // Seen ',' in declarators list
-    PS_DeclsDeclSeen        // Seen complete decl in decls list
-};
+    PS_DeclsCommaSeen,		// Seen ',' in declarators list
+    PS_DeclsDeclSeen		// Seen complete decl in decls list
+};	
 
 #endif // _IDLC_IDLCTYPES_HXX_
 
diff --git a/idlc/inc/idlc/inheritedinterface.hxx b/idlc/inc/idlc/inheritedinterface.hxx
index e983c751acd2..94545d98eb6b 100644
--- a/idlc/inc/idlc/inheritedinterface.hxx
+++ b/idlc/inc/idlc/inheritedinterface.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/idlc/inc/idlc/options.hxx b/idlc/inc/idlc/options.hxx
index 796552aec671..1b725c0414fd 100644
--- a/idlc/inc/idlc/options.hxx
+++ b/idlc/inc/idlc/options.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 
 #include <idlc/idlctypes.hxx>
 
-typedef ::std::hash_map< ::rtl::OString,
+typedef	::std::hash_map< ::rtl::OString, 
                          ::rtl::OString,
                          HashString,
                          EqualString > OptionMap;
@@ -42,7 +42,7 @@ public:
     IllegalArgument(const ::rtl::OString& msg)
         : m_message(msg) {}
 
-    ::rtl::OString  m_message;
+    ::rtl::OString	m_message;	
 };
 
 
@@ -52,15 +52,15 @@ public:
     Options();
     ~Options();
 
-    sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
+    sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) 
         throw( IllegalArgument );
 
     ::rtl::OString prepareHelp();
     ::rtl::OString prepareVersion();
 
-    const ::rtl::OString&   getProgramName() const;
-    sal_Bool                isValid(const ::rtl::OString& option);
-    const ::rtl::OString    getOption(const ::rtl::OString& option)
+    const ::rtl::OString&	getProgramName() const;
+    sal_Bool				isValid(const ::rtl::OString& option);
+    const ::rtl::OString	getOption(const ::rtl::OString& option)
         throw( IllegalArgument );
 
     const StringVector& getInputFiles() const { return m_inputFiles; }
@@ -69,14 +69,14 @@ public:
     bool quiet() const { return m_quiet; }
 
 protected:
-    ::rtl::OString  m_program;
-    StringVector    m_inputFiles;
+    ::rtl::OString 	m_program;
+    StringVector	m_inputFiles;
     bool            m_stdin;
     bool            m_verbose;
     bool            m_quiet;
-    OptionMap       m_options;
+    OptionMap		m_options;
 };
-
+    
 #endif // _IDLC_OPTIONS_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/inc/pch/precompiled_idlc.cxx b/idlc/inc/pch/precompiled_idlc.cxx
index 50db39b8b090..7517fd4bac17 100644
--- a/idlc/inc/pch/precompiled_idlc.cxx
+++ b/idlc/inc/pch/precompiled_idlc.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/idlc/inc/pch/precompiled_idlc.hxx b/idlc/inc/pch/precompiled_idlc.hxx
index 1702e1a05c0b..b077ecce9120 100644
--- a/idlc/inc/pch/precompiled_idlc.hxx
+++ b/idlc/inc/pch/precompiled_idlc.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/idlc/source/astarray.cxx b/idlc/source/astarray.cxx
index 1d3052b577e5..3dfc16c470fa 100644
--- a/idlc/source/astarray.cxx
+++ b/idlc/source/astarray.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -72,6 +72,6 @@ OString AstArray::makeName()
         return name;
     }
     return OString();
-}
+}	
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astconstant.cxx b/idlc/source/astconstant.cxx
index 7f9a1de0425d..8cbc6b449e20 100644
--- a/idlc/source/astconstant.cxx
+++ b/idlc/source/astconstant.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,18 +35,18 @@
 
 using namespace ::rtl;
 
-AstConstant::AstConstant(const ExprType type,
+AstConstant::AstConstant(const ExprType type, 
                          const NodeType nodeType,
-                         AstExpression* pExpr,
+                         AstExpression* pExpr, 
                          const ::rtl::OString& name,
                          AstScope* pScope)
     : AstDeclaration(nodeType, name, pScope)
     , m_pConstValue(pExpr)
     , m_constValueType(type)
 {
-}
+}	
 
-AstConstant::AstConstant(const ExprType type,
+AstConstant::AstConstant(const ExprType type, 
                          AstExpression* pExpr,
                          const ::rtl::OString& name,
                          AstScope* pScope)
@@ -54,60 +54,60 @@ AstConstant::AstConstant(const ExprType type,
     , m_pConstValue(pExpr)
     , m_constValueType(type)
 {
-}
+}	
 
 AstConstant::~AstConstant()
 {
-
-}
+    
+}	
 
 sal_Bool AstConstant::dumpBlob(
     typereg::Writer & rBlob, sal_uInt16 index, bool published)
 {
-    RTConstValue    aConst;
-    sal_Unicode*    str = NULL;
+    RTConstValue 	aConst;
+    sal_Unicode* 	str = NULL;
 
     AstExprValue *exprVal = getConstValue()->getExprValue();
     switch (getConstValueType())
     {
         case ET_short:
-            aConst.m_type = RT_TYPE_INT16;
-            aConst.m_value.aShort = exprVal->u.sval;
+            aConst.m_type = RT_TYPE_INT16; 
+            aConst.m_value.aShort = exprVal->u.sval; 
             break;
         case ET_ushort:
-            aConst.m_type = RT_TYPE_UINT16;
+            aConst.m_type = RT_TYPE_UINT16; 
             aConst.m_value.aUShort = exprVal->u.usval;
             break;
         case ET_long:
-            aConst.m_type = RT_TYPE_INT32;
+            aConst.m_type = RT_TYPE_INT32; 
             aConst.m_value.aLong = exprVal->u.lval;
             break;
         case ET_ulong:
-            aConst.m_type = RT_TYPE_UINT32;
+            aConst.m_type = RT_TYPE_UINT32; 
             aConst.m_value.aULong = exprVal->u.ulval;
             break;
         case ET_hyper:
-            aConst.m_type = RT_TYPE_INT64;
+            aConst.m_type = RT_TYPE_INT64; 
             aConst.m_value.aHyper = exprVal->u.hval;
             break;
         case ET_uhyper:
-            aConst.m_type = RT_TYPE_UINT64;
+            aConst.m_type = RT_TYPE_UINT64; 
             aConst.m_value.aUHyper = exprVal->u.uhval;
             break;
         case ET_float:
-            aConst.m_type = RT_TYPE_FLOAT;
-            aConst.m_value.aFloat = exprVal->u.fval;
-            break;
+            aConst.m_type = RT_TYPE_FLOAT; 
+            aConst.m_value.aFloat = exprVal->u.fval; 
+            break;	
         case ET_double:
-            aConst.m_type = RT_TYPE_DOUBLE;
+            aConst.m_type = RT_TYPE_DOUBLE; 
             aConst.m_value.aDouble = exprVal->u.dval;
             break;
         case ET_byte:
-            aConst.m_type = RT_TYPE_BYTE;
+            aConst.m_type = RT_TYPE_BYTE; 
             aConst.m_value.aByte = exprVal->u.byval;
             break;
         case ET_boolean:
-            aConst.m_type = RT_TYPE_BOOL;
+            aConst.m_type = RT_TYPE_BOOL; 
             aConst.m_value.aBool = exprVal->u.bval;
             break;
         default:
@@ -117,7 +117,7 @@ sal_Bool AstConstant::dumpBlob(
                 return sal_False;
             }
     }
-
+    
     OString name = getLocalName();
 
     OUString type;
@@ -125,7 +125,7 @@ sal_Bool AstConstant::dumpBlob(
     {
         type = OStringToOUString(exprTypeToString(getConstValueType()), RTL_TEXTENCODING_UTF8);
     }
-
+    
     rBlob.setFieldData(
         index, getDocumentation(), OUString(),
         RT_ACCESS_CONST | (published ? RT_ACCESS_PUBLISHED : 0),
@@ -134,6 +134,6 @@ sal_Bool AstConstant::dumpBlob(
         delete[] str;
 
     return sal_True;
-}
+}	
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astdeclaration.cxx b/idlc/source/astdeclaration.cxx
index f767bb7991bb..1b154a4c3e58 100644
--- a/idlc/source/astdeclaration.cxx
+++ b/idlc/source/astdeclaration.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ static OString convertName(const OString& name)
         }
     } while( nIndex != -1 );
     return nameBuffer.makeStringAndClear();
-}
+}	
 
 AstDeclaration::AstDeclaration(NodeType type, const OString& name, AstScope* pScope)
     : m_localName(name)
@@ -69,7 +69,7 @@ AstDeclaration::AstDeclaration(NodeType type, const OString& name, AstScope* pSc
             m_scopedName = pDecl->getScopedName();
             if (m_scopedName.getLength() > 0)
                 m_scopedName += sGlobal;
-            m_scopedName += m_localName;
+            m_scopedName +=	m_localName;
         }
     } else
     {
@@ -92,11 +92,11 @@ AstDeclaration::AstDeclaration(NodeType type, const OString& name, AstScope* pSc
 
     m_bPublished = idlc()->isPublished();
 }
-
+    
 
 AstDeclaration::~AstDeclaration()
 {
-
+    
 }
 
 void AstDeclaration::setPredefined(bool bPredefined)
@@ -105,7 +105,7 @@ void AstDeclaration::setPredefined(bool bPredefined)
     if ( m_bPredefined )
     {
         m_fileName = OString();
-        m_bInMainFile = sal_False;
+        m_bInMainFile = sal_False;    
     }
 }
 
@@ -117,30 +117,30 @@ void AstDeclaration::setName(const ::rtl::OString& name)
 
 // Huh ? There is always at least one token
 
-//  sal_Int32 count = name.getTokenCount(':');
-
-//  if ( count > 0 )
-//  {
-//      m_localName = name.getToken(count-1, ':');
-//      m_scopedName = name;
-//  } else if ( m_pScope )
-//  {
-//      m_localName = name;
-//      AstDeclaration* pDecl = scopeAsDecl(m_pScope);
-//      if (pDecl)
-//      {
-//          m_scopedName = pDecl->getScopedName();
-//          if (m_scopedName.getLength() > 0)
-//              m_scopedName += sGlobal;
-//          m_scopedName += m_localName;
-//      }
-//  } else
-//  {
-//      m_localName = name;
-//      m_scopedName = name;
-//  }
+// 	sal_Int32 count = name.getTokenCount(':');
+
+// 	if ( count > 0 )
+// 	{
+// 		m_localName = name.getToken(count-1, ':');
+// 		m_scopedName = name;
+// 	} else if ( m_pScope )
+// 	{
+// 		m_localName = name;
+// 		AstDeclaration* pDecl = scopeAsDecl(m_pScope);
+// 		if (pDecl)
+// 		{
+// 			m_scopedName = pDecl->getScopedName();
+// 			if (m_scopedName.getLength() > 0)
+// 				m_scopedName += sGlobal;
+// 			m_scopedName +=	m_localName;
+// 		}
+// 	} else
+// 	{
+// 		m_localName = name;
+// 		m_scopedName = name;
+// 	}
     m_fullName = convertName(m_scopedName);
-}
+}	
 
 bool AstDeclaration::isType() const {
     switch (m_nodeType) {
@@ -168,12 +168,12 @@ sal_Bool AstDeclaration::hasAncestor(AstDeclaration* pDecl)
     if ( !m_pScope )
         return sal_False;
     return scopeAsDecl(m_pScope)->hasAncestor(pDecl);
-}
+}	
 
 sal_Bool AstDeclaration::dump(RegistryKey& rKey)
 {
     AstScope* pScope = declAsScope(this);
-    sal_Bool bRet = sal_True;
+    sal_Bool bRet = sal_True;	
 
     if ( pScope )
     {
@@ -201,13 +201,13 @@ sal_Bool AstDeclaration::dump(RegistryKey& rKey)
                         break;
                     default:
                         break;
-                }
+                }	
             }
-
+            
             ++iter;
-        }
+        }		
     }
     return bRet;
-}
+}	
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx
index cf8f33edbc9a..314122c462d0 100644
--- a/idlc/source/astdump.cxx
+++ b/idlc/source/astdump.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,21 +56,21 @@ sal_Bool AstModule::dump(RegistryKey& rKey)
     {
         if (rKey.createKey( OStringToOUString(getFullName(), RTL_TEXTENCODING_UTF8 ), localKey))
         {
-            fprintf(stderr, "%s: warning, could not create key '%s' in '%s'\n",
+            fprintf(stderr, "%s: warning, could	not create key '%s' in '%s'\n",
                     idlc()->getOptions()->getProgramName().getStr(),
                     getFullName().getStr(), OUStringToOString(rKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
             return sal_False;
         }
     }
 
-    sal_uInt16          nConst = getNodeCount(NT_const);
+    sal_uInt16 		 	nConst = getNodeCount(NT_const);
 
     if ( nConst > 0 )
     {
         RTTypeClass typeClass = RT_TYPE_MODULE;
         if ( getNodeType() == NT_constants )
             typeClass = RT_TYPE_CONSTANTS;
-
+        
         typereg::Writer aBlob(
             m_bPublished ? TYPEREG_VERSION_1 : TYPEREG_VERSION_0,
             getDocumentation(), emptyStr, typeClass,
@@ -98,14 +98,14 @@ sal_Bool AstModule::dump(RegistryKey& rKey)
         sal_uInt32 aBlobSize;
         void const * pBlob = aBlob.getBlob(&aBlobSize);
 
-        if (localKey.setValue(emptyStr, RG_VALUETYPE_BINARY,
+        if (localKey.setValue(emptyStr, RG_VALUETYPE_BINARY, 
                                 (RegValue)pBlob, aBlobSize))
         {
-            fprintf(stderr, "%s: warning, could not set value of key \"%s\" in %s\n",
+            fprintf(stderr, "%s: warning, could	not set value of key \"%s\" in %s\n",
                     idlc()->getOptions()->getProgramName().getStr(),
                     getFullName().getStr(), OUStringToOString(localKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
             return sal_False;
-        }
+        }				
     } else
     {
         RTTypeClass typeClass = RT_TYPE_MODULE;
@@ -123,14 +123,14 @@ sal_Bool AstModule::dump(RegistryKey& rKey)
 
         if ( getNodeType() != NT_root )
         {
-            if (localKey.setValue(emptyStr, RG_VALUETYPE_BINARY,
+            if (localKey.setValue(emptyStr, RG_VALUETYPE_BINARY, 
                                     (RegValue)pBlob, aBlobSize))
             {
-                fprintf(stderr, "%s: warning, could not set value of key \"%s\" in %s\n",
+                fprintf(stderr, "%s: warning, could	not set value of key \"%s\" in %s\n",
                         idlc()->getOptions()->getProgramName().getStr(),
                         getFullName().getStr(), OUStringToOString(localKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
                 return sal_False;
-            }
+            }				
         }
     }
     if ( getNodeType() == NT_root )
@@ -138,7 +138,7 @@ sal_Bool AstModule::dump(RegistryKey& rKey)
         localKey.releaseKey();
     }
     return AstDeclaration::dump(rKey);
-}
+}	
 
 sal_Bool AstTypeDef::dump(RegistryKey& rKey)
 {
@@ -146,7 +146,7 @@ sal_Bool AstTypeDef::dump(RegistryKey& rKey)
     RegistryKey localKey;
     if (rKey.createKey( OStringToOUString(getFullName(), RTL_TEXTENCODING_UTF8 ), localKey))
     {
-        fprintf(stderr, "%s: warning, could not create key '%s' in '%s'\n",
+        fprintf(stderr, "%s: warning, could	not create key '%s' in '%s'\n",
                 idlc()->getOptions()->getProgramName().getStr(),
                 getFullName().getStr(), OUStringToOString(rKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
         return sal_False;
@@ -166,14 +166,14 @@ sal_Bool AstTypeDef::dump(RegistryKey& rKey)
 
     if (localKey.setValue(emptyStr, RG_VALUETYPE_BINARY, (RegValue)pBlob, aBlobSize))
     {
-        fprintf(stderr, "%s: warning, could not set value of key \"%s\" in %s\n",
+        fprintf(stderr, "%s: warning, could	not set value of key \"%s\" in %s\n",
                 idlc()->getOptions()->getProgramName().getStr(),
                 getFullName().getStr(), OUStringToOString(localKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
         return sal_False;
     }
 
     return sal_True;
-}
+}	
 
 sal_Bool AstService::dump(RegistryKey& rKey)
 {
@@ -361,7 +361,7 @@ sal_Bool AstAttribute::dumpBlob(
 
     if (isReadonly())
     {
-        accessMode |= RT_ACCESS_READONLY;
+        accessMode |= RT_ACCESS_READONLY;		
     } else
     {
         accessMode |= RT_ACCESS_READWRITE;
@@ -412,7 +412,7 @@ sal_Bool AstAttribute::dumpBlob(
         methodIndex);
 
     return sal_True;
-}
+}	
 
 void AstAttribute::dumpExceptions(
     typereg::Writer & writer, rtl::OUString const & documentation,
@@ -440,7 +440,7 @@ void AstAttribute::dumpExceptions(
     }
 }
 
-const sal_Char* AstSequence::getRelativName() const
+const sal_Char*	AstSequence::getRelativName() const
 {
     if ( !m_pRelativName )
     {
@@ -448,8 +448,8 @@ const sal_Char* AstSequence::getRelativName() const
         AstDeclaration const * pType = resolveTypedefs( m_pMemberType );
         *m_pRelativName += pType->getRelativName();
     }
-
+    
     return m_pRelativName->getStr();
-}
+}	
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astenum.cxx b/idlc/source/astenum.cxx
index 5d5a8597b850..9c07915a497d 100644
--- a/idlc/source/astenum.cxx
+++ b/idlc/source/astenum.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,10 +39,10 @@ AstEnum::AstEnum(const ::rtl::OString& name, AstScope* pScope)
     : AstType(NT_enum, name, pScope)
     , AstScope(NT_enum)
     , m_enumValueCount(0)
-{
-}
+{	
+}	
 
-AstEnum::~AstEnum()
+AstEnum::~AstEnum() 
 {
 }
 
@@ -50,15 +50,15 @@ AstConstant* AstEnum::checkValue(AstExpression* pExpr)
 {
     DeclList::const_iterator iter = getIteratorBegin();
     DeclList::const_iterator end = getIteratorEnd();
-    AstConstant*        pConst = NULL;
-    AstDeclaration*     pDecl = NULL;
+    AstConstant*		pConst = NULL;
+    AstDeclaration* 	pDecl = NULL;
 
-    while ( iter != end)
+    while ( iter != end) 
     {
         pDecl = *iter;
         pConst = (AstConstant*)pDecl;
 
-        if (pConst->getConstValue()->compare(pExpr))
+        if (pConst->getConstValue()->compare(pExpr)) 
             return pConst;
 
         ++iter;
@@ -68,14 +68,14 @@ AstConstant* AstEnum::checkValue(AstExpression* pExpr)
         m_enumValueCount = pExpr->getExprValue()->u.lval + 1;
 
     return NULL;
-}
+}	
 
 sal_Bool AstEnum::dump(RegistryKey& rKey)
 {
     RegistryKey localKey;
     if (rKey.createKey( OStringToOUString(getFullName(), RTL_TEXTENCODING_UTF8 ), localKey))
     {
-        fprintf(stderr, "%s: warning, could not create key '%s' in '%s'\n",
+        fprintf(stderr, "%s: warning, could	not create key '%s' in '%s'\n",
                 idlc()->getOptions()->getProgramName().getStr(),
                 getFullName().getStr(), OUStringToOString(rKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
         return sal_False;
@@ -106,23 +106,23 @@ sal_Bool AstEnum::dump(RegistryKey& rKey)
 
         sal_uInt32 aBlobSize;
         void const * pBlob = aBlob.getBlob(&aBlobSize);
-
-        if (localKey.setValue(emptyStr, RG_VALUETYPE_BINARY,
+        
+        if (localKey.setValue(emptyStr, RG_VALUETYPE_BINARY, 
                                 (RegValue)pBlob, aBlobSize))
         {
-            fprintf(stderr, "%s: warning, could not set value of key \"%s\" in %s\n",
+            fprintf(stderr, "%s: warning, could	not set value of key \"%s\" in %s\n",
                     idlc()->getOptions()->getProgramName().getStr(),
                     getFullName().getStr(), OUStringToOString(localKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
             return sal_False;
-        }
+        }				
     }
 
     return sal_True;
-}
+}	
 
 AstDeclaration* AstEnum::addDeclaration(AstDeclaration* pDecl)
 {
     return AstScope::addDeclaration(pDecl);
-}
+}	
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx
index 394bb848bdd1..fd9628663e2d 100644
--- a/idlc/source/astexpression.cxx
+++ b/idlc/source/astexpression.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,9 +36,9 @@
 #include <limits.h>
 #include <float.h>
 
-#undef  MAXCHAR
+#undef	MAXCHAR
 #define MAXCHAR         127
-#undef  MINCHAR
+#undef	MINCHAR
 #define MINCHAR         -128
 
 using namespace ::rtl;
@@ -51,8 +51,8 @@ AstExpression::AstExpression(ExprComb c, AstExpression *pExpr1, AstExpression *p
     , m_pSymbolicName(NULL)
 {
     fillDefinitionDetails();
-
-}
+    
+}	
 
 AstExpression::AstExpression(sal_Int32 l)
     : m_combOperator(EC_none)
@@ -66,9 +66,9 @@ AstExpression::AstExpression(sal_Int32 l)
     m_exprValue = new AstExprValue();
     m_exprValue->et = ET_long;
     m_exprValue->u.lval = l;
-}
+}	
 
-AstExpression::AstExpression(sal_Int32  l, ExprType et)
+AstExpression::AstExpression(sal_Int32	l, ExprType et)
     : m_combOperator(EC_none)
     , m_subExpr1(NULL)
     , m_subExpr2(NULL)
@@ -80,9 +80,9 @@ AstExpression::AstExpression(sal_Int32  l, ExprType et)
     m_exprValue = new AstExprValue();
     m_exprValue->et = et;
     m_exprValue->u.lval = l;
-}
+}	
 
-AstExpression::AstExpression(sal_Int64  h)
+AstExpression::AstExpression(sal_Int64	h)
     : m_combOperator(EC_none)
     , m_subExpr1(NULL)
     , m_subExpr2(NULL)
@@ -94,9 +94,9 @@ AstExpression::AstExpression(sal_Int64  h)
     m_exprValue = new AstExprValue();
     m_exprValue->et = ET_hyper;
     m_exprValue->u.hval = h;
-}
+}	
 
-AstExpression::AstExpression(sal_uInt64 uh)
+AstExpression::AstExpression(sal_uInt64	uh)
     : m_combOperator(EC_none)
     , m_subExpr1(NULL)
     , m_subExpr2(NULL)
@@ -108,9 +108,9 @@ AstExpression::AstExpression(sal_uInt64 uh)
     m_exprValue = new AstExprValue();
     m_exprValue->et = ET_uhyper;
     m_exprValue->u.uhval = uh;
-}
+}	
 
-AstExpression::AstExpression(double d)
+AstExpression::AstExpression(double	d)
     : m_combOperator(EC_none)
     , m_subExpr1(NULL)
     , m_subExpr2(NULL)
@@ -122,7 +122,7 @@ AstExpression::AstExpression(double d)
     m_exprValue = new AstExprValue();
     m_exprValue->et = ET_double;
     m_exprValue->u.dval = d;
-}
+}	
 
 AstExpression::AstExpression(::rtl::OString* scopedName)
     : m_combOperator(EC_symbol)
@@ -132,8 +132,8 @@ AstExpression::AstExpression(::rtl::OString* scopedName)
     , m_pSymbolicName(scopedName)
 {
     fillDefinitionDetails();
-}
-
+}	
+    
 AstExpression::~AstExpression()
 {
     if ( m_exprValue )
@@ -144,7 +144,7 @@ AstExpression::~AstExpression()
         delete m_subExpr2;
     if ( m_pSymbolicName )
         delete m_pSymbolicName;
-}
+}	
 
 /*
  * Perform the coercion from the given AstExprValue to the requested
@@ -157,10 +157,10 @@ coerce_value(AstExprValue *ev, ExprType t)
     if (ev == NULL)
         return NULL;
 
-    switch (t)
+    switch (t) 
     {
         case ET_short:
-            switch (ev->et)
+            switch (ev->et) 
             {
                 case ET_short:
                     return ev;
@@ -219,7 +219,7 @@ coerce_value(AstExprValue *ev, ExprType t)
                     return NULL;
             }
         case ET_ushort:
-            switch (ev->et)
+            switch (ev->et) 
             {
                 case ET_short:
                     if (ev->u.sval < 0)
@@ -278,7 +278,7 @@ coerce_value(AstExprValue *ev, ExprType t)
                     return NULL;
             }
         case ET_long:
-            switch (ev->et)
+            switch (ev->et) 
             {
                 case ET_short:
                     ev->u.lval = (sal_Int32)ev->u.sval;
@@ -333,7 +333,7 @@ coerce_value(AstExprValue *ev, ExprType t)
                     return NULL;
             }
         case ET_ulong:
-            switch (ev->et)
+            switch (ev->et) 
             {
                 case ET_short:
                     if (ev->u.sval < 0)
@@ -390,7 +390,7 @@ coerce_value(AstExprValue *ev, ExprType t)
                     return NULL;
             }
         case ET_hyper:
-            switch (ev->et)
+            switch (ev->et) 
             {
                 case ET_short:
                     ev->u.hval = (sal_Int64)ev->u.sval;
@@ -441,7 +441,7 @@ coerce_value(AstExprValue *ev, ExprType t)
                     return NULL;
             }
         case ET_uhyper:
-            switch (ev->et)
+            switch (ev->et) 
             {
                 case ET_short:
                     if (ev->u.sval < 0)
@@ -496,7 +496,7 @@ coerce_value(AstExprValue *ev, ExprType t)
                     return NULL;
             }
         case ET_boolean:
-            switch (ev->et)
+            switch (ev->et) 
             {
                 case ET_short:
                     ev->u.bval = (ev->u.sval == 0) ? sal_False : sal_True;
@@ -541,7 +541,7 @@ coerce_value(AstExprValue *ev, ExprType t)
                     return NULL;
             }
         case ET_float:
-            switch (ev->et)
+            switch (ev->et) 
             {
                 case ET_short:
                     ev->u.fval = (float)ev->u.sval;
@@ -590,7 +590,7 @@ coerce_value(AstExprValue *ev, ExprType t)
                     return NULL;
             }
         case ET_double:
-            switch (ev->et)
+            switch (ev->et) 
             {
                 case ET_short:
                     ev->u.dval = (double)ev->u.sval;
@@ -637,7 +637,7 @@ coerce_value(AstExprValue *ev, ExprType t)
                     return NULL;
             }
         case ET_byte:
-            switch (ev->et)
+            switch (ev->et) 
             {
                 case ET_short:
                     if (ev->u.sval < SAL_MIN_INT8 || ev->u.sval > SAL_MAX_UINT8)
@@ -706,9 +706,9 @@ coerce_value(AstExprValue *ev, ExprType t)
 /*
  * Evaluate the expression with the evaluation kind requested. Supported
  * evaluation kinds are
- * - EK_const:      The expression must evaluate to a constant
- * - EK_positive_int:   The expression must further evaluate to a
- *          positive integer
+ * - EK_const:		The expression must evaluate to a constant
+ * - EK_positive_int:	The expression must further evaluate to a
+ *			positive integer
  */
 static AstExprValue *
 eval_kind(AstExprValue *ev, EvalKind ek)
@@ -746,7 +746,7 @@ AstExprValue* AstExpression::coerce(ExprType t, sal_Bool bAssign)
     copy = new AstExprValue;
 
     copy->et = m_exprValue->et;
-    switch (m_exprValue->et)
+    switch (m_exprValue->et) 
     {
         case ET_short:
             copy->u.sval = m_exprValue->u.sval;
@@ -788,7 +788,7 @@ AstExprValue* AstExpression::coerce(ExprType t, sal_Bool bAssign)
         m_exprValue = coerce_value(copy, t);
         return m_exprValue;
     }
-
+    
     return coerce_value(copy, t);
 }
 
@@ -796,7 +796,7 @@ void AstExpression::evaluate(EvalKind ek)
 {
     m_exprValue = eval_internal(ek);
     m_exprValue = eval_kind(m_exprValue, ek);
-}
+}	
 
 sal_Bool AstExpression::operator==(AstExpression *pExpr)
 {
@@ -808,7 +808,7 @@ sal_Bool AstExpression::operator==(AstExpression *pExpr)
         return sal_False;
     if (m_exprValue->et != pExpr->getExprValue()->et)
         return sal_False;
-    switch (m_exprValue->et)
+    switch (m_exprValue->et) 
     {
         case ET_short:
             return (m_exprValue->u.sval == pExpr->getExprValue()->u.sval) ? sal_True : sal_False;
@@ -836,10 +836,10 @@ sal_Bool AstExpression::operator==(AstExpression *pExpr)
     }
 
     return sal_False;
-}
+}	
 
 sal_Bool AstExpression::compare(AstExpression *pExpr)
-{
+{	
     if (m_combOperator != pExpr->getCombOperator())
         return sal_False;
     evaluate(EK_const);
@@ -848,7 +848,7 @@ sal_Bool AstExpression::compare(AstExpression *pExpr)
         return sal_False;
     if (m_exprValue->et != pExpr->getExprValue()->et)
         return sal_False;
-    switch (m_exprValue->et)
+    switch (m_exprValue->et) 
     {
         case ET_short:
             return (m_exprValue->u.sval == pExpr->getExprValue()->u.sval) ? sal_True : sal_False;
@@ -876,11 +876,11 @@ sal_Bool AstExpression::compare(AstExpression *pExpr)
     }
 
     return sal_False;
-}
-
+}	
+    
 void AstExpression::fillDefinitionDetails()
 {
-    m_pScope = idlc()->scopes()->depth() > 0 ? idlc()->scopes()->top() : NULL;
+    m_pScope = idlc()->scopes()->depth() > 0 ? idlc()->scopes()->top() : NULL;		
     m_lineNo = idlc()->getLineNumber();
     m_fileName = idlc()->getFileName();
 }
@@ -895,7 +895,7 @@ AstExprValue* AstExpression::eval_internal(EvalKind ek)
     /*
      * OK, must evaluate operator
      */
-    switch (m_combOperator)
+    switch (m_combOperator) 
     {
         case EC_add:
         case EC_minus:
@@ -924,7 +924,7 @@ AstExprValue* AstExpression::eval_internal(EvalKind ek)
     }
 
     return NULL;
-}
+}	
 
 AstExprValue* AstExpression::eval_bin_op(EvalKind ek)
 {
@@ -954,7 +954,7 @@ AstExprValue* AstExpression::eval_bin_op(EvalKind ek)
     retval = new AstExprValue();
     retval->et = eType;
 
-    switch (m_combOperator)
+    switch (m_combOperator) 
     {
         case EC_mod:
             if (m_subExpr2->getExprValue()->u.hval == 0)
@@ -978,13 +978,13 @@ AstExprValue* AstExpression::eval_bin_op(EvalKind ek)
         default:
             return NULL;
     }
-
+    
     return retval;
-}
-
+}	
+    
 AstExprValue* AstExpression::eval_bit_op(EvalKind ek)
 {
-    AstExprValue    *retval = NULL;
+    AstExprValue	*retval = NULL;
 
     if (ek != EK_const && ek != EK_positive_int)
         return NULL;
@@ -1006,7 +1006,7 @@ AstExprValue* AstExpression::eval_bit_op(EvalKind ek)
     retval = new AstExprValue;
     retval->et = ET_long;
 
-    switch (m_combOperator)
+    switch (m_combOperator) 
     {
         case EC_or:
             retval->u.lval = m_subExpr1->getExprValue()->u.lval | m_subExpr2->getExprValue()->u.lval;
@@ -1026,13 +1026,13 @@ AstExprValue* AstExpression::eval_bit_op(EvalKind ek)
         default:
             return NULL;
     }
-
+  
     return retval;
-}
-
+}	
+    
 AstExprValue* AstExpression::eval_un_op(EvalKind ek)
 {
-    AstExprValue    *retval = NULL;
+    AstExprValue	*retval = NULL;
 
     if (m_exprValue != NULL)
         return m_exprValue;
@@ -1051,7 +1051,7 @@ AstExprValue* AstExpression::eval_un_op(EvalKind ek)
     retval = new AstExprValue();
     retval->et = ET_double;
 
-    switch (m_combOperator)
+    switch (m_combOperator) 
     {
         case EC_u_plus:
             retval->u.lval = m_subExpr1->getExprValue()->u.lval;
@@ -1068,20 +1068,20 @@ AstExprValue* AstExpression::eval_un_op(EvalKind ek)
         default:
             return NULL;
     }
-
+    
     return retval;
-}
+}	
 
 AstExprValue* AstExpression::eval_symbol(EvalKind ek)
 {
-    AstScope        *pScope = 0;
-    AstDeclaration  *pDecl;
-    AstConstant     *pConst;
+    AstScope		*pScope = 0;
+    AstDeclaration	*pDecl;
+    AstConstant		*pConst;
 
     /*
      * Is there a symbol stored?
      */
-    if (m_pSymbolicName == NULL)
+    if (m_pSymbolicName == NULL) 
     {
         idlc()->error()->evalError(this);
         return NULL;
@@ -1091,7 +1091,7 @@ AstExprValue* AstExpression::eval_symbol(EvalKind ek)
      */
     if (idlc()->scopes()->depth() > 0)
         pScope = idlc()->scopes()->topNonNull();
-    if ( !pScope )
+    if ( !pScope ) 
     {
         idlc()->error()->lookupError(*m_pSymbolicName);
         return NULL;
@@ -1100,7 +1100,7 @@ AstExprValue* AstExpression::eval_symbol(EvalKind ek)
      * Do lookup
      */
     pDecl = pScope->lookupByName(*m_pSymbolicName);
-    if (pDecl == NULL)
+    if (pDecl == NULL) 
     {
         idlc()->error()->lookupError(*m_pSymbolicName);
         return NULL;
@@ -1109,7 +1109,7 @@ AstExprValue* AstExpression::eval_symbol(EvalKind ek)
      * Is it a constant?
      */
     if (pDecl->getNodeType() != NT_const &&
-        pDecl->getNodeType() != NT_enum_val)
+        pDecl->getNodeType() != NT_enum_val) 
     {
         idlc()->error()->constantExpected(pDecl, *m_pSymbolicName);
         return NULL;
@@ -1126,7 +1126,7 @@ AstExprValue* AstExpression::eval_symbol(EvalKind ek)
         return NULL;
     return pConst->getConstValue()->eval_internal(ek);
 }
-
+    
 OString AstExpression::toString()
 {
     OString exprStr;
@@ -1135,7 +1135,7 @@ OString AstExpression::toString()
 
     if ( m_exprValue )
     {
-        switch (m_exprValue->et)
+        switch (m_exprValue->et) 
         {
             case ET_short:
                 return OString::valueOf((sal_Int32)m_exprValue->u.sval);
@@ -1156,17 +1156,17 @@ OString AstExpression::toString()
             case ET_byte:
                 return OString::valueOf((sal_Int32)m_exprValue->u.byval);
             case ET_boolean:
-                if ( m_exprValue->u.lval == 0)
+                if ( m_exprValue->u.lval == 0) 
                     return OString("FALSE");
                 else
-                    return OString("TRUE");
+                    return OString("TRUE");					
             default:
                 OSL_ASSERT(false);
                 return OString();
         }
-    }
+    }	
 
-    switch (m_combOperator)
+    switch (m_combOperator) 
     {
         case EC_u_plus:
             exprStr += OString("+");
@@ -1182,7 +1182,7 @@ OString AstExpression::toString()
     }
     if ( m_subExpr1 )
         exprStr += m_subExpr1->toString();
-    switch (m_combOperator)
+    switch (m_combOperator) 
     {
         case EC_add:
             exprStr += OString(" + ");
@@ -1217,17 +1217,17 @@ OString AstExpression::toString()
         default:
             break;
     }
-
+    
     if ( m_subExpr2 )
         exprStr += m_subExpr2->toString();
 
     return exprStr;
-}
+}	
 
 // Convert the type of an AST_Expression to a char *
 const sal_Char* SAL_CALL exprTypeToString(ExprType t)
 {
-    switch (t)
+    switch (t) 
     {
         case ET_short:
             return "short";
diff --git a/idlc/source/astinterface.cxx b/idlc/source/astinterface.cxx
index 5400036185c4..03c463441106 100644
--- a/idlc/source/astinterface.cxx
+++ b/idlc/source/astinterface.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@
 
 using namespace ::rtl;
 
-AstInterface::AstInterface(const ::rtl::OString& name,
+AstInterface::AstInterface(const ::rtl::OString& name, 
                            AstInterface const * pInherits,
                            AstScope* pScope)
     : AstType(NT_interface, name, pScope)
@@ -118,7 +118,7 @@ sal_Bool AstInterface::dump(RegistryKey& rKey)
     RegistryKey localKey;
     if (rKey.createKey( OStringToOUString(getFullName(), RTL_TEXTENCODING_UTF8 ), localKey))
     {
-        fprintf(stderr, "%s: warning, could not create key '%s' in '%s'\n",
+        fprintf(stderr, "%s: warning, could	not create key '%s' in '%s'\n",
                 idlc()->getOptions()->getProgramName().getStr(),
                 getFullName().getStr(), OUStringToOString(rKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
         return sal_False;
@@ -261,14 +261,14 @@ sal_Bool AstInterface::dump(RegistryKey& rKey)
 
     if (localKey.setValue(emptyStr, RG_VALUETYPE_BINARY, (RegValue)pBlob, aBlobSize))
     {
-        fprintf(stderr, "%s: warning, could not set value of key \"%s\" in %s\n",
+        fprintf(stderr, "%s: warning, could	not set value of key \"%s\" in %s\n",
                 idlc()->getOptions()->getProgramName().getStr(),
                 getFullName().getStr(), OUStringToOString(localKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
         return sal_False;
     }
 
     return true;
-}
+}	
 
 void AstInterface::checkInheritedInterfaceClashes(
     DoubleDeclarations & doubleDeclarations,
diff --git a/idlc/source/astoperation.cxx b/idlc/source/astoperation.cxx
index 2cc90da3ad9c..8cd32ecaf21f 100644
--- a/idlc/source/astoperation.cxx
+++ b/idlc/source/astoperation.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,9 +56,9 @@ bool AstOperation::isVariadic() const {
 
 sal_Bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index)
 {
-    sal_uInt16      nParam = getNodeCount(NT_parameter);
-    sal_uInt16      nExcep = nExceptions();
-    RTMethodMode    methodMode = RT_MODE_TWOWAY;
+    sal_uInt16		nParam = getNodeCount(NT_parameter);
+    sal_uInt16		nExcep = nExceptions();
+    RTMethodMode 	methodMode = RT_MODE_TWOWAY;
 
     if ( isOneway() )
         methodMode = RT_MODE_ONEWAY;
@@ -76,7 +76,7 @@ sal_Bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index)
         returnTypeName, nParam, nExcep);
 
     if ( nParam )
-    {
+    {	
         DeclList::const_iterator iter = getIteratorBegin();
         DeclList::const_iterator end = getIteratorEnd();
         AstDeclaration* pDecl = NULL;
@@ -84,7 +84,7 @@ sal_Bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index)
         sal_uInt16 paramIndex = 0;
         while ( iter != end )
         {
-            pDecl = *iter;
+            pDecl = *iter;		
             if ( pDecl->getNodeType() == NT_parameter )
             {
                 AstParameter* pParam = (AstParameter*)pDecl;
@@ -102,12 +102,12 @@ sal_Bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index)
                     default:
                         paramMode = RT_PARAM_INVALID;
                         break;
-                }
+                }			
                 if (pParam->isRest()) {
                     paramMode = static_cast< RTParamMode >(
                         paramMode | RT_PARAM_REST);
                 }
-
+                
                 rBlob.setMethodParameterData(
                     index, paramIndex++, paramMode,
                     OStringToOUString(
@@ -117,7 +117,7 @@ sal_Bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index)
                         RTL_TEXTENCODING_UTF8));
             }
             ++iter;
-        }
+        }		
     }
 
     if ( nExcep )
@@ -132,25 +132,25 @@ sal_Bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index)
                 OStringToOUString(
                     (*iter)->getRelativName(), RTL_TEXTENCODING_UTF8));
             ++iter;
-        }
+        }		
     }
 
     return sal_True;
-}
+}	
 
 AstDeclaration* AstOperation::addDeclaration(AstDeclaration* pDecl)
 {
     if ( pDecl->getNodeType() == NT_parameter )
     {
         AstParameter* pParam = (AstParameter*)pDecl;
-        if ( isOneway() &&
+        if ( isOneway() && 
              (pParam->getDirection() == DIR_OUT || pParam->getDirection() == DIR_INOUT) )
         {
             idlc()->error()->error2(EIDL_ONEWAY_CONFLICT, pDecl, this);
-            return NULL;
+            return NULL;			
         }
     }
     return AstScope::addDeclaration(pDecl);
-}
+}	
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astscope.cxx b/idlc/source/astscope.cxx
index 0b1a750f5a8b..1333a43f65b3 100644
--- a/idlc/source/astscope.cxx
+++ b/idlc/source/astscope.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,37 +40,37 @@ sal_Bool isGlobal(const OString& scopedName)
 {
     if ((scopedName.getLength() == 0) || (scopedName.indexOf(':') == 0))
     {
-        return sal_True;
+        return sal_True;	
     }
     return sal_False;
-}
+}	
 
 AstScope::AstScope(NodeType nodeType)
     : m_nodeType(nodeType)
 {
-
-}
+    
+}	
 
 AstScope::~AstScope()
 {
-
-}
+    
+}	
 
 AstDeclaration* AstScope::addDeclaration(AstDeclaration* pDecl)
 {
     AstDeclaration* pDeclaration = NULL;
 
-    if ((pDeclaration = lookupForAdd(pDecl)) != NULL)
+    if ((pDeclaration = lookupForAdd(pDecl)) != NULL) 
     {
         if (pDecl->getNodeType() == NT_union_branch )
         {
             m_declarations.push_back(pDecl);
-            return pDecl;
+            return pDecl;			
         }
         if ( pDecl->hasAncestor(pDeclaration) )
         {
             idlc()->error()->error2(EIDL_REDEF_SCOPE, pDecl, pDeclaration);
-            return NULL;
+            return NULL;			
         }
         if ( (pDecl->getNodeType() == pDeclaration->getNodeType()) &&
              (pDecl->getNodeType() == NT_sequence
@@ -87,23 +87,23 @@ AstDeclaration* AstScope::addDeclaration(AstDeclaration* pDecl)
             return pDecl;
         }
         if ( (NT_service == m_nodeType) &&
-             ( ((pDecl->getNodeType() == NT_interface_member)
+             ( ((pDecl->getNodeType() == NT_interface_member) 
                 && (pDeclaration->getNodeType() == NT_interface)) ||
-               ((pDecl->getNodeType() == NT_service_member)
+               ((pDecl->getNodeType() == NT_service_member)  
                 && (pDeclaration->getNodeType() == NT_service)) )
             )
         {
             m_declarations.push_back(pDecl);
             return pDecl;
         }
-
+        
         idlc()->error()->error2(EIDL_REDEF_SCOPE, scopeAsDecl(this), pDecl);
-        return NULL;
+        return NULL;						
     }
-
+    
     m_declarations.push_back(pDecl);
     return pDecl;
-}
+}	
 
 sal_uInt16 AstScope::getNodeCount(NodeType nodeType)
 {
@@ -111,7 +111,7 @@ sal_uInt16 AstScope::getNodeCount(NodeType nodeType)
     DeclList::const_iterator end = getIteratorEnd();
     AstDeclaration* pDecl = NULL;
     sal_uInt16 count = 0;
-
+    
     while ( iter != end )
     {
         pDecl = *iter;
@@ -119,23 +119,23 @@ sal_uInt16 AstScope::getNodeCount(NodeType nodeType)
             count++;
         ++iter;
     }
-    return count;
-}
+    return count;			
+}	
 
 AstDeclaration* AstScope::lookupByName(const OString& scopedName)
 {
     AstDeclaration* pDecl = NULL;
-    AstScope*       pScope = NULL;
+    AstScope*		pScope = NULL;
     if (scopedName.getLength() == 0)
         return NULL;
-
+        
     // If name starts with "::" start look up in global scope
     if ( isGlobal(scopedName) )
     {
         pDecl = scopeAsDecl(this);
         if ( !pDecl )
             return NULL;
-
+            
         pScope = pDecl->getScope();
         // If this is the global scope ...
         if ( !pScope )
@@ -146,7 +146,7 @@ AstDeclaration* AstScope::lookupByName(const OString& scopedName)
             return pDecl;
             //return pScope->lookupByName();
         }
-        // OK, not global scope yet, so simply iterate with parent scope
+        // OK, not global scope yet, so simply iterate with parent scope 
         pDecl = pScope->lookupByName(scopedName);
         return pDecl;
     }
@@ -155,7 +155,7 @@ AstDeclaration* AstScope::lookupByName(const OString& scopedName)
     // Look up in the local scope and start with the first scope
     sal_Int32 nIndex = scopedName.indexOf(':');
     OString firstScope =  nIndex > 0 ? scopedName.copy(0, nIndex) : scopedName;
-    sal_Bool    bFindFirstScope = sal_True;
+    sal_Bool	bFindFirstScope = sal_True;
     pDecl = lookupByNameLocal(firstScope);
     if ( !pDecl )
     {
@@ -170,10 +170,10 @@ AstDeclaration* AstScope::lookupByName(const OString& scopedName)
                    pDecl = pScope->lookupByName(scopedName);
             else
                 pDecl = NULL;
-
+            
              // Special case for scope which is an interface. We
              // have to look in the inherited interfaces as well.
-            if ( !pDecl )
+            if ( !pDecl ) 
             {
                 if (m_nodeType == NT_interface)
                     pDecl = lookupInInherited(scopedName);
@@ -209,20 +209,20 @@ AstDeclaration* AstScope::lookupByName(const OString& scopedName)
             } else
             {
                 pDecl = NULL;
-            }
+            }            
         }
 
     }
 
     return pDecl;
-}
+}	
 
 AstDeclaration* AstScope::lookupByNameLocal(const OString& name) const
 {
     DeclList::const_iterator iter(m_declarations.begin());
     DeclList::const_iterator end(m_declarations.end());
     AstDeclaration* pDecl = NULL;
-
+    
     while ( iter != end )
     {
         pDecl = *iter;
@@ -230,13 +230,13 @@ AstDeclaration* AstScope::lookupByNameLocal(const OString& name) const
             return pDecl;
         ++iter;
     }
-    return NULL;
-}
+    return NULL;			
+}	
 
 AstDeclaration* AstScope::lookupInInherited(const OString& scopedName) const
 {
-    AstInterface* pInterface = (AstInterface*)this;
-
+    AstInterface* pInterface = (AstInterface*)this;	
+    
     if ( !pInterface )
         return NULL;
 
@@ -269,9 +269,9 @@ AstDeclaration* AstScope::lookupInInherited(const OString& scopedName) const
 AstDeclaration* AstScope::lookupPrimitiveType(ExprType type)
 {
     AstDeclaration* pDecl = NULL;
-    AstScope*       pScope = NULL;
-    AstBaseType*    pBaseType = NULL;
-    OString         typeName;
+    AstScope*		pScope = NULL;
+    AstBaseType*	pBaseType = NULL;
+    OString			typeName;
     pDecl = scopeAsDecl(this);
     if ( !pDecl )
         return NULL;
@@ -279,7 +279,7 @@ AstDeclaration* AstScope::lookupPrimitiveType(ExprType type)
     if ( pScope)
         return pScope->lookupPrimitiveType(type);
 
-    switch (type)
+    switch (type) 
     {
         case ET_none:
             OSL_ASSERT(false);
@@ -331,19 +331,19 @@ AstDeclaration* AstScope::lookupPrimitiveType(ExprType type)
             break;
     }
 
-    pDecl = lookupByNameLocal(typeName);
+    pDecl = lookupByNameLocal(typeName);	
 
     if ( pDecl && (pDecl->getNodeType() == NT_predefined) )
     {
         pBaseType = (AstBaseType*)pDecl;
-
+        
         if ( pBaseType->getExprType() == type )
             return pDecl;
     }
 
     return NULL;
 }
-
+    
 AstDeclaration* AstScope::lookupForAdd(AstDeclaration* pDecl)
 {
     if ( !pDecl )
@@ -351,7 +351,7 @@ AstDeclaration* AstScope::lookupForAdd(AstDeclaration* pDecl)
 
     AstDeclaration* pRetDecl = lookupByNameLocal(pDecl->getLocalName());
 
-   return pRetDecl;
-}
+   return pRetDecl;	
+}	
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/astservice.cxx b/idlc/source/astservice.cxx
index b26997cc3ab9..ae1ff66227f8 100644
--- a/idlc/source/astservice.cxx
+++ b/idlc/source/astservice.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/idlc/source/aststack.cxx b/idlc/source/aststack.cxx
index 711c86d45fad..49063d1f1106 100644
--- a/idlc/source/aststack.cxx
+++ b/idlc/source/aststack.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,22 +43,22 @@ AstStack::AstStack()
 
 AstStack::~AstStack()
 {
-    for(sal_uInt32 i=0; i < m_top; i++)
+    for(sal_uInt32 i=0; i < m_top; i++) 
     {
-        if (m_stack[i])
+        if (m_stack[i]) 
             delete(m_stack[i]);
     }
-
+    
     rtl_freeMemory(m_stack);
 }
 
 sal_uInt32 AstStack::depth()
-{
+{ 
     return m_top;
 }
 
 AstScope* AstStack::top()
-{
+{ 
     if (m_top < 1)
         return NULL;
     return m_stack[m_top - 1];
@@ -68,8 +68,8 @@ AstScope* AstStack::bottom()
 {
     if (m_top == 0)
         return NULL;
-    return m_stack[0];
-}
+    return m_stack[0];	
+}	
 
 AstScope* AstStack::nextToTop()
 {
@@ -78,37 +78,37 @@ AstScope* AstStack::nextToTop()
     if (depth() < 2)
         return NULL;
 
-    tmp = top();        // Save top
-    (void) pop();       // Pop it
-    retval = top();     // Get next one down
-    (void) push(tmp);   // Push top back
-    return retval;      // Return next one down
-}
+    tmp = top();		// Save top
+    (void) pop();		// Pop it
+    retval = top();		// Get next one down
+    (void) push(tmp);	// Push top back
+    return retval;		// Return next one down
+}	
 
 AstScope* AstStack::topNonNull()
 {
     for (sal_uInt32 i = m_top; i > 0; i--)
     {
-        if ( m_stack[i - 1] )
+        if ( m_stack[i - 1] ) 
             return m_stack[i - 1];
       }
     return NULL;
-}
+}	
 
 AstStack* AstStack::push(AstScope* pScope)
-{
-    AstScope        **tmp;
-//  AstDeclaration  *pDecl = ScopeAsDecl(pScope);
-    sal_uInt32  newSize;
-    sal_uInt32  i;
+{ 
+    AstScope		**tmp;
+//	AstDeclaration	*pDecl = ScopeAsDecl(pScope);
+    sal_uInt32	newSize;
+    sal_uInt32	i;
 
     // Make sure there's space for one more
-    if (m_size == m_top)
+    if (m_size == m_top) 
     {
         newSize = m_size;
         newSize += STACKSIZE_INCREMENT;
-        tmp = (AstScope**)rtl_allocateZeroMemory(sizeof(AstScope*) * newSize);
-
+        tmp	= (AstScope**)rtl_allocateZeroMemory(sizeof(AstScope*) * newSize);
+    
         for(i=0; i < m_size; i++)
             tmp[i] = m_stack[i];
 
@@ -123,7 +123,7 @@ AstStack* AstStack::push(AstScope* pScope)
 }
 
 void AstStack::pop()
-{
+{ 
     AstScope *pScope;
 
     if (m_top < 1)
@@ -132,7 +132,7 @@ void AstStack::pop()
 }
 
 void AstStack::clear()
-{
+{ 
     m_top = 0;
 }
 
diff --git a/idlc/source/aststruct.cxx b/idlc/source/aststruct.cxx
index 3a8a959062ed..5ac1777948df 100644
--- a/idlc/source/aststruct.cxx
+++ b/idlc/source/aststruct.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,8 +51,8 @@ AstStruct::AstStruct(
     }
 }
 
-AstStruct::AstStruct(const NodeType type,
-                        const OString& name,
+AstStruct::AstStruct(const NodeType type, 
+                        const OString& name, 
                        AstStruct* pBaseType,
                      AstScope* pScope)
     : AstType(type, name, pScope)
@@ -93,7 +93,7 @@ sal_Bool AstStruct::dump(RegistryKey& rKey)
     RegistryKey localKey;
     if (rKey.createKey( OStringToOUString(getFullName(), RTL_TEXTENCODING_UTF8 ), localKey))
     {
-        fprintf(stderr, "%s: warning, could not create key '%s' in '%s'\n",
+        fprintf(stderr, "%s: warning, could	not create key '%s' in '%s'\n",
                 idlc()->getOptions()->getProgramName().getStr(),
                 getFullName().getStr(), OUStringToOString(rKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
         return sal_False;
@@ -135,9 +135,9 @@ sal_Bool AstStruct::dump(RegistryKey& rKey)
         DeclList::const_iterator iter = getIteratorBegin();
         DeclList::const_iterator end = getIteratorEnd();
         AstDeclaration* pDecl = NULL;
-        AstMember*  pMember = NULL;
-        OUString    docu;
-        sal_uInt16  index = 0;
+        AstMember* 	pMember = NULL;
+        OUString 	docu;
+        sal_uInt16 	index = 0;
         while ( iter != end )
         {
             pDecl = *iter;
@@ -175,17 +175,17 @@ sal_Bool AstStruct::dump(RegistryKey& rKey)
 
     sal_uInt32 aBlobSize;
     void const * pBlob = aBlob.getBlob(&aBlobSize);
-
-    if (localKey.setValue(emptyStr, RG_VALUETYPE_BINARY,
+    
+    if (localKey.setValue(emptyStr, RG_VALUETYPE_BINARY, 
                             (RegValue)pBlob, aBlobSize))
     {
-        fprintf(stderr, "%s: warning, could not set value of key \"%s\" in %s\n",
+        fprintf(stderr, "%s: warning, could	not set value of key \"%s\" in %s\n",
                 idlc()->getOptions()->getProgramName().getStr(),
                 getFullName().getStr(), OUStringToOString(localKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
         return sal_False;
-    }
+    }				
 
     return sal_True;
-}
+}	
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/aststructinstance.cxx b/idlc/source/aststructinstance.cxx
index e2292d016912..16b96c93bceb 100644
--- a/idlc/source/aststructinstance.cxx
+++ b/idlc/source/aststructinstance.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/idlc/source/astunion.cxx b/idlc/source/astunion.cxx
index aaa6ca36aa83..4c0f5c688667 100644
--- a/idlc/source/astunion.cxx
+++ b/idlc/source/astunion.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ AstUnion::AstUnion(const ::rtl::OString& name, AstType* pDiscType, AstScope* pSc
 {
     AstBaseType* pBaseType;
 
-    if ( !pDiscType )
+    if ( !pDiscType ) 
     {
         m_pDiscriminantType = NULL;
         m_discExprType = ET_none;
@@ -55,17 +55,17 @@ AstUnion::AstUnion(const ::rtl::OString& name, AstType* pDiscType, AstScope* pSc
      * then install the equivalent coercion target type in
      * the pd_udisc_type field.
      */
-    if ( pDiscType->getNodeType() == NT_predefined )
+    if ( pDiscType->getNodeType() == NT_predefined ) 
     {
         pBaseType = (AstBaseType*)pDiscType;
-        if ( !pBaseType )
+        if ( !pBaseType ) 
         {
             m_pDiscriminantType = NULL;
             m_discExprType = ET_none;
             return;
         }
         m_pDiscriminantType = pDiscType;
-        switch (pBaseType->getExprType())
+        switch (pBaseType->getExprType()) 
         {
             case ET_long:
             case ET_ulong:
@@ -80,12 +80,12 @@ AstUnion::AstUnion(const ::rtl::OString& name, AstType* pDiscType, AstScope* pSc
                 m_pDiscriminantType = NULL;
                 break;
         }
-    } else
-        if (pDiscType->getNodeType() == NT_enum)
+    } else 
+        if (pDiscType->getNodeType() == NT_enum) 
         {
             m_discExprType = ET_any;
             m_pDiscriminantType = pDiscType;
-        } else
+        } else 
         {
             m_discExprType = ET_none;
             m_pDiscriminantType = NULL;
@@ -97,22 +97,22 @@ AstUnion::AstUnion(const ::rtl::OString& name, AstType* pDiscType, AstScope* pSc
 
 AstUnion::~AstUnion()
 {
-}
+}	
 
 AstDeclaration* AstUnion::addDeclaration(AstDeclaration* pDecl)
 {
     if ( pDecl->getNodeType() == NT_union_branch )
     {
         AstUnionBranch* pBranch = (AstUnionBranch*)pDecl;
-        if ( lookupBranch(pBranch) )
+        if ( lookupBranch(pBranch) ) 
         {
             idlc()->error()->error2(EIDL_MULTIPLE_BRANCH, this, pDecl);
             return NULL;
         }
     }
-
+    
     return AstScope::addDeclaration(pDecl);
-}
+}	
 
 AstUnionBranch* AstUnion::lookupBranch(AstUnionBranch* pBranch)
 {
@@ -121,38 +121,38 @@ AstUnionBranch* AstUnion::lookupBranch(AstUnionBranch* pBranch)
     if ( pBranch )
         pLabel = pBranch->getLabel();
 
-    if ( pLabel )
+    if ( pLabel ) 
     {
         if (pLabel->getLabelKind() == UL_default)
             return lookupDefault();
-        if (m_discExprType == ET_any)
+        if (m_discExprType == ET_any)	
             /* CONVENTION: indicates enum discr */
             return lookupEnum(pBranch);
         return lookupLabel(pBranch);
     }
     return NULL;
-}
+}	
 
 AstUnionBranch* AstUnion::lookupDefault(sal_Bool bReportError)
 {
     DeclList::const_iterator iter = getIteratorBegin();
     DeclList::const_iterator end = getIteratorEnd();
-    AstUnionBranch      *pBranch = NULL;
-    AstDeclaration      *pDecl = NULL;
+    AstUnionBranch	    *pBranch = NULL;
+    AstDeclaration	    *pDecl = NULL;
 
-    while ( iter != end )
+    while ( iter != end ) 
     {
         pDecl = *iter;
-        if ( pDecl->getNodeType() == NT_union_branch )
+        if ( pDecl->getNodeType() == NT_union_branch ) 
         {
             pBranch = (AstUnionBranch*)pDecl;
-            if (pBranch == NULL)
+            if (pBranch == NULL) 
             {
                 ++iter;
                 continue;
             }
             if ( pBranch->getLabel() != NULL &&
-                 pBranch->getLabel()->getLabelKind() == UL_default)
+                 pBranch->getLabel()->getLabelKind() == UL_default) 
             {
                 if ( bReportError )
                     idlc()->error()->error2(EIDL_MULTIPLE_BRANCH, this, pBranch);
@@ -162,7 +162,7 @@ AstUnionBranch* AstUnion::lookupDefault(sal_Bool bReportError)
         ++iter;
     }
     return NULL;
-}
+}	
 
 AstUnionBranch* AstUnion::lookupLabel(AstUnionBranch* pBranch)
 {
@@ -170,10 +170,10 @@ AstUnionBranch* AstUnion::lookupLabel(AstUnionBranch* pBranch)
 
     if ( !pLabel->getLabelValue() )
         return pBranch;
-//  pLabel->getLabelValue()->setExprValue(pLabel->getLabelValue()->coerce(m_discExprType, sal_False));
+//	pLabel->getLabelValue()->setExprValue(pLabel->getLabelValue()->coerce(m_discExprType, sal_False));
     AstExprValue* pLabelValue = pLabel->getLabelValue()->coerce(
         m_discExprType, sal_False);
-    if ( !pLabelValue )
+    if ( !pLabelValue ) 
     {
         idlc()->error()->evalError(pLabel->getLabelValue());
         return pBranch;
@@ -184,23 +184,23 @@ AstUnionBranch* AstUnion::lookupLabel(AstUnionBranch* pBranch)
 
     DeclList::const_iterator iter = getIteratorBegin();
     DeclList::const_iterator end = getIteratorEnd();
-    AstUnionBranch* pB = NULL;
-    AstDeclaration* pDecl = NULL;
+    AstUnionBranch*	pB = NULL;
+    AstDeclaration*	pDecl = NULL;
 
-    while ( iter != end )
+    while ( iter != end ) 
     {
         pDecl = *iter;
-        if ( pDecl->getNodeType() == NT_union_branch )
+        if ( pDecl->getNodeType() == NT_union_branch ) 
         {
             pB = (AstUnionBranch*)pDecl;
-            if ( !pB )
+            if ( !pB ) 
             {
                 ++iter;
                 continue;
             }
             if ( pB->getLabel() != NULL &&
                  pB->getLabel()->getLabelKind() == UL_label &&
-                 pB->getLabel()->getLabelValue()->compare(pLabel->getLabelValue()) )
+                 pB->getLabel()->getLabelValue()->compare(pLabel->getLabelValue()) ) 
             {
                 idlc()->error()->error2(EIDL_MULTIPLE_BRANCH, this, pBranch);
                 return pBranch;
@@ -209,14 +209,14 @@ AstUnionBranch* AstUnion::lookupLabel(AstUnionBranch* pBranch)
         ++iter;
     }
     return NULL;
-}
+}	
 
 AstUnionBranch* AstUnion::lookupEnum(AstUnionBranch* pBranch)
 {
-    AstDeclaration const * pType = resolveTypedefs(m_pDiscriminantType);
+    AstDeclaration const * pType = resolveTypedefs(m_pDiscriminantType);	
     if ( pType->getNodeType() != NT_enum )
         return NULL;
-
+            
     AstUnionLabel* pLabel = pBranch->getLabel();
     AstExpression* pExpr = pLabel->getLabelValue();
     if ( !pExpr )
@@ -225,7 +225,7 @@ AstUnionBranch* AstUnion::lookupEnum(AstUnionBranch* pBranch)
     /*
      * Expecting a symbol label
      */
-    if ( pExpr->getCombOperator() != EC_symbol)
+    if ( pExpr->getCombOperator() != EC_symbol) 
     {
         idlc()->error()->enumValExpected(this);
         return pBranch;
@@ -236,7 +236,7 @@ AstUnionBranch* AstUnion::lookupEnum(AstUnionBranch* pBranch)
      */
     AstEnum* pEnum = (AstEnum*)pType;
     AstDeclaration* pDecl = pEnum->lookupByName(*pExpr->getSymbolicName());
-    if ( pDecl == NULL || pDecl->getScope() != pEnum)
+    if ( pDecl == NULL || pDecl->getScope() != pEnum) 
     {
         idlc()->error()->enumValLookupFailure(this, pEnum, *pExpr->getSymbolicName());
         return pBranch;
@@ -245,23 +245,23 @@ AstUnionBranch* AstUnion::lookupEnum(AstUnionBranch* pBranch)
 
     DeclList::const_iterator iter = getIteratorBegin();
     DeclList::const_iterator end = getIteratorEnd();
-    AstUnionBranch* pB = NULL;
+    AstUnionBranch*	pB = NULL;
     pDecl = NULL;
 
-    while ( iter != end )
+    while ( iter != end ) 
     {
         pDecl = *iter;
-        if ( pDecl->getNodeType() == NT_union_branch )
+        if ( pDecl->getNodeType() == NT_union_branch ) 
         {
             pB = (AstUnionBranch*)pDecl;
-            if ( !pB )
+            if ( !pB ) 
             {
                 ++iter;
                 continue;
             }
             if ( pB->getLabel() != NULL &&
                  pB->getLabel()->getLabelKind() == UL_label &&
-                 pB->getLabel()->getLabelValue()->compare(pLabel->getLabelValue()) )
+                 pB->getLabel()->getLabelValue()->compare(pLabel->getLabelValue()) ) 
             {
                 idlc()->error()->error2(EIDL_MULTIPLE_BRANCH, this, pBranch);
                 return pBranch;
@@ -270,14 +270,14 @@ AstUnionBranch* AstUnion::lookupEnum(AstUnionBranch* pBranch)
         ++iter;
     }
     return NULL;
-}
+}	
 
 sal_Bool AstUnion::dump(RegistryKey& rKey)
 {
     RegistryKey localKey;
     if (rKey.createKey( OStringToOUString(getFullName(), RTL_TEXTENCODING_UTF8 ), localKey))
     {
-        fprintf(stderr, "%s: warning, could not create key '%s' in '%s'\n",
+        fprintf(stderr, "%s: warning, could	not create key '%s' in '%s'\n",
                 idlc()->getOptions()->getProgramName().getStr(),
                 getFullName().getStr(), OUStringToOString(rKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
         return sal_False;
@@ -302,16 +302,16 @@ sal_Bool AstUnion::dump(RegistryKey& rKey)
         AstDeclaration* pDecl = NULL;
         AstUnionBranch* pBranch = NULL;
         AstUnionBranch* pDefault = lookupDefault(sal_False);
-        AstUnionLabel*  pLabel = NULL;
-        AstExprValue*   pExprValue = NULL;
-        RTConstValue    aConst;
-        RTFieldAccess   access = RT_ACCESS_READWRITE;
-        OUString    docu;
-        sal_uInt16  index = 0;
+        AstUnionLabel* 	pLabel = NULL;
+        AstExprValue*	pExprValue = NULL;
+        RTConstValue 	aConst;
+        RTFieldAccess	access = RT_ACCESS_READWRITE;
+        OUString 	docu;
+        sal_uInt16 	index = 0;
         if ( pDefault )
             index = 1;
 
-        sal_Int64   disc = 0;
+        sal_Int64	disc = 0;
         while ( iter != end )
         {
             pDecl = *iter;
@@ -322,7 +322,7 @@ sal_Bool AstUnion::dump(RegistryKey& rKey)
                 {
                     ++iter;
                     continue;
-                }
+                } 
 
                 pLabel = pBranch->getLabel();
                 pExprValue = pLabel->getLabelValue()->coerce(ET_hyper, sal_False);
@@ -361,30 +361,30 @@ sal_Bool AstUnion::dump(RegistryKey& rKey)
 
     sal_uInt32 aBlobSize;
     void const * pBlob = aBlob.getBlob(&aBlobSize);
-
-    if (localKey.setValue(OUString(), RG_VALUETYPE_BINARY,
+    
+    if (localKey.setValue(OUString(), RG_VALUETYPE_BINARY, 
                             (RegValue)pBlob, aBlobSize))
     {
-        fprintf(stderr, "%s: warning, could not set value of key \"%s\" in %s\n",
+        fprintf(stderr, "%s: warning, could	not set value of key \"%s\" in %s\n",
                 idlc()->getOptions()->getProgramName().getStr(),
                 getFullName().getStr(), OUStringToOString(localKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
         return sal_False;
-    }
-
+    }				
+    
     return sal_True;
-}
+}	
 
 AstUnionBranch::AstUnionBranch(AstUnionLabel* pLabel, AstType const * pType, const ::rtl::OString& name, AstScope* pScope)
     : AstMember(NT_union_branch, pType, name, pScope)
-    , m_pLabel(pLabel)
+    , m_pLabel(pLabel) 
 {
-}
+}	
 
 AstUnionBranch::~AstUnionBranch()
 {
     if ( m_pLabel )
         delete m_pLabel;
-}
+}	
 
 AstUnionLabel::AstUnionLabel(UnionLabel labelKind, AstExpression* pExpr)
     : m_label(labelKind)
@@ -399,6 +399,6 @@ AstUnionLabel::~AstUnionLabel()
     if ( m_pLabelValue )
         delete m_pLabelValue;
 }
-
+    
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/attributeexceptions.hxx b/idlc/source/attributeexceptions.hxx
index 080a009bbbcc..7f7741042558 100644
--- a/idlc/source/attributeexceptions.hxx
+++ b/idlc/source/attributeexceptions.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/idlc/source/errorhandler.cxx b/idlc/source/errorhandler.cxx
index 30ecd1ef7ca4..6875d6b78c2d 100644
--- a/idlc/source/errorhandler.cxx
+++ b/idlc/source/errorhandler.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -168,7 +168,7 @@ static const sal_Char* errorCodeToMessage(ErrorCode eCode)
         return "two constructors have identical lists of parameter types";
     }
     return "unknown errror";
-}
+}	
 
 static const sal_Char* warningCodeToMessage(WarningCode wCode)
 {
@@ -186,7 +186,7 @@ static const sal_Char* warningCodeToMessage(WarningCode wCode)
         return "type or identifier doesn't fulfill the UNO naming convention: ";
     }
     return "unkown warning";
-}
+}	
 
 static const sal_Char* parseStateToMessage(ParseState state)
 {
@@ -456,7 +456,7 @@ static const sal_Char* parseStateToMessage(ParseState state)
     default:
         return "no wider described syntax error";
     }
-}
+}	
 
 static OString flagToString(sal_uInt32 flag)
 {
@@ -487,7 +487,7 @@ static OString flagToString(sal_uInt32 flag)
         flagStr += "'unknown'";
 
     return flagStr;
-}
+}	
 
 static void errorHeader(ErrorCode eCode, sal_Int32 lineNumber, sal_uInt32 start, sal_uInt32 end)
 {
@@ -496,12 +496,12 @@ static void errorHeader(ErrorCode eCode, sal_Int32 lineNumber, sal_uInt32 start,
         file = idlc()->getMainFileName();
     else
         file = idlc()->getFileName();
-
+    
     fprintf(stderr, "%s:%lu [%lu:%lu] : %s", file.getStr(),
             sal::static_int_cast< unsigned long >(lineNumber),
             sal::static_int_cast< unsigned long >(start),
             sal::static_int_cast< unsigned long >(end),
-            errorCodeToMessage(eCode));
+            errorCodeToMessage(eCode));		
 }
 
 static void errorHeader(ErrorCode eCode, sal_uInt32 lineNumber)
@@ -509,12 +509,12 @@ static void errorHeader(ErrorCode eCode, sal_uInt32 lineNumber)
     errorHeader(eCode, lineNumber,
             idlc()->getOffsetStart(), idlc()->getOffsetEnd());
 }
-
+    
 static void errorHeader(ErrorCode eCode)
 {
     errorHeader(eCode, idlc()->getLineNumber(),
             idlc()->getOffsetStart(), idlc()->getOffsetEnd());
-}
+}	
 
 static void warningHeader(WarningCode wCode)
 {
@@ -523,42 +523,42 @@ static void warningHeader(WarningCode wCode)
         file = idlc()->getMainFileName();
     else
         file = idlc()->getFileName();
-
+    
     fprintf(stderr, "%s(%lu) : WARNING, %s", file.getStr(),
             sal::static_int_cast< unsigned long >(idlc()->getLineNumber()),
-            warningCodeToMessage(wCode));
-}
+            warningCodeToMessage(wCode));	
+}	
 
 void ErrorHandler::error0(ErrorCode e)
 {
-    errorHeader(e);
+    errorHeader(e);	
     fprintf(stderr, "\n");
-    idlc()->incErrorCount();
-}
+    idlc()->incErrorCount();	
+}	
 
 void ErrorHandler::error1(ErrorCode e, AstDeclaration const * d)
 {
     errorHeader(e);
-    fprintf(stderr, "'%s'\n", d->getScopedName().getStr());
-    idlc()->incErrorCount();
-}
+    fprintf(stderr, "'%s'\n", d->getScopedName().getStr());	
+    idlc()->incErrorCount();	
+}	
 
 void ErrorHandler::error2(
     ErrorCode e, AstDeclaration const * d1, AstDeclaration const * d2)
 {
-    errorHeader(e);
-    fprintf(stderr, "'%s', '%s'\n", d1->getScopedName().getStr(),
-            d2->getScopedName().getStr());
-    idlc()->incErrorCount();
-}
+    errorHeader(e);	
+    fprintf(stderr, "'%s', '%s'\n", d1->getScopedName().getStr(), 
+            d2->getScopedName().getStr());	
+    idlc()->incErrorCount();	
+}	
 
 void ErrorHandler::error3(ErrorCode e, AstDeclaration* d1, AstDeclaration* d2, AstDeclaration* d3)
 {
-    errorHeader(e);
-    fprintf(stderr, "'%s', '%s', '%s'\n", d1->getScopedName().getStr(),
-            d2->getScopedName().getStr(), d3->getScopedName().getStr());
-    idlc()->incErrorCount();
-}
+    errorHeader(e);	
+    fprintf(stderr, "'%s', '%s', '%s'\n", d1->getScopedName().getStr(), 
+            d2->getScopedName().getStr(), d3->getScopedName().getStr());	
+    idlc()->incErrorCount();	
+}	
 
 void ErrorHandler::warning0(WarningCode w, const sal_Char* warningmsg)
 {
@@ -568,53 +568,53 @@ void ErrorHandler::warning0(WarningCode w, const sal_Char* warningmsg)
     }
 
     if ( idlc()->getOptions()->isValid("-we") )
-        idlc()->incErrorCount();
+        idlc()->incErrorCount();	
     else
-        idlc()->incWarningCount();
-}
+        idlc()->incWarningCount();	
+}	
 
 void ErrorHandler::syntaxError(ParseState ps, sal_Int32 lineNumber, const sal_Char* errmsg)
 {
-    errorHeader(EIDL_SYNTAX_ERROR, lineNumber);
-    fprintf(stderr, "%s: %s\n", parseStateToMessage(ps), errmsg);
-    idlc()->incErrorCount();
-}
+    errorHeader(EIDL_SYNTAX_ERROR, lineNumber);	
+    fprintf(stderr, "%s: %s\n", parseStateToMessage(ps), errmsg); 
+    idlc()->incErrorCount();	
+}	
 
 void ErrorHandler::coercionError(AstExpression *pExpr, ExprType et)
 {
-    errorHeader(EIDL_COERCION_FAILURE);
-    fprintf(stderr, "'%s' to '%s'\n", pExpr->toString().getStr(),
+    errorHeader(EIDL_COERCION_FAILURE);	
+    fprintf(stderr, "'%s' to '%s'\n", pExpr->toString().getStr(), 
             exprTypeToString(et));
-    idlc()->incErrorCount();
-}
+    idlc()->incErrorCount();	
+}	
 
 void ErrorHandler::lookupError(const ::rtl::OString& n)
 {
     errorHeader(EIDL_LOOKUP_ERROR);
     fprintf(stderr, "'%s'\n", n.getStr());
-    idlc()->incErrorCount();
-}
+    idlc()->incErrorCount();	
+}	
 
 void ErrorHandler::lookupError(ErrorCode e, const ::rtl::OString& n, AstDeclaration* pScope)
 {
     errorHeader(e);
     fprintf(stderr, "'%s' in '%s'\n", n.getStr(), pScope->getFullName().getStr());
-    idlc()->incErrorCount();
-}
+    idlc()->incErrorCount();	
+}	
 
 void ErrorHandler::flagError(ErrorCode e, sal_uInt32 flag)
 {
     errorHeader(e);
     fprintf(stderr, "'%s'\n", flagToString(flag).getStr());
-    idlc()->incErrorCount();
-}
+    idlc()->incErrorCount();	
+}	
 
 void ErrorHandler::noTypeError(AstDeclaration const * pDecl)
 {
     errorHeader(EIDL_NOT_A_TYPE);
     fprintf(stderr, "'%s'\n", pDecl->getScopedName().getStr());
-    idlc()->incErrorCount();
-}
+    idlc()->incErrorCount();	
+}	
 
 namespace {
 
@@ -639,7 +639,7 @@ char const * nodeTypeName(NodeType nodeType) {
 void ErrorHandler::inheritanceError(NodeType nodeType, const OString* name, AstDeclaration* pDecl)
 {
     if ( nodeType == NT_interface &&
-         (pDecl->getNodeType() == NT_interface) &&
+         (pDecl->getNodeType() == NT_interface) && 
          !((AstInterface*)pDecl)->isDefined() )
     {
         errorHeader(EIDL_INHERIT_FWD_ERROR);
@@ -652,48 +652,48 @@ void ErrorHandler::inheritanceError(NodeType nodeType, const OString* name, AstD
                 nodeTypeName(nodeType), name->getStr(),
                 pDecl->getScopedName().getStr());
     }
-    idlc()->incErrorCount();
-}
+    idlc()->incErrorCount();	
+}	
 
-void ErrorHandler::forwardLookupError(AstDeclaration* pForward,
+void ErrorHandler::forwardLookupError(AstDeclaration* pForward, 
                                       const ::rtl::OString& name)
 {
     errorHeader(EIDL_FWD_DECL_LOOKUP);
     fprintf(stderr, "trying to look up '%s' in undefined forward declared interface '%s'\n",
             pForward->getScopedName().getStr(), name.getStr());
-    idlc()->incErrorCount();
-}
+    idlc()->incErrorCount();	
+}	
 
-void ErrorHandler::constantExpected(AstDeclaration* pDecl,
+void ErrorHandler::constantExpected(AstDeclaration* pDecl, 
                                     const ::rtl::OString& name)
 {
     errorHeader(EIDL_CONSTANT_EXPECTED);
     fprintf(stderr, "'%s' is bound to '%s'\n", name.getStr(), pDecl->getScopedName().getStr());
-    idlc()->incErrorCount();
-}
+    idlc()->incErrorCount();	
+}	
 
 void ErrorHandler::evalError(AstExpression* pExpr)
 {
     errorHeader(EIDL_EVAL_ERROR);
     fprintf(stderr, "'%s'\n", pExpr->toString().getStr());
-    idlc()->incErrorCount();
-}
+    idlc()->incErrorCount();	
+}	
 
 void ErrorHandler::enumValExpected(AstUnion* pUnion)
 {
     errorHeader(EIDL_ENUM_VAL_EXPECTED);
     fprintf(stderr, " union %s\n", pUnion->getLocalName().getStr());
-    idlc()->incErrorCount();
-}
+    idlc()->incErrorCount();	
+}	
 
 void ErrorHandler::enumValLookupFailure(AstUnion* pUnion, AstEnum* pEnum, const ::rtl::OString& name)
 {
     errorHeader(EIDL_ENUM_VAL_NOT_FOUND);
-    fprintf(stderr, " union %s, enum %s, enumerator %s\n",
-            pUnion->getLocalName().getStr(),
+    fprintf(stderr, " union %s, enum %s, enumerator %s\n", 
+            pUnion->getLocalName().getStr(), 
             pEnum->getLocalName().getStr(), name.getStr());
-    idlc()->incErrorCount();
-}
+    idlc()->incErrorCount();	
+}	
 
 bool ErrorHandler::checkPublished(AstDeclaration const * decl, bool bOptional) {
     if (idlc()->isPublished() && !decl->isPublished() && !bOptional) {
diff --git a/idlc/source/fehelper.cxx b/idlc/source/fehelper.cxx
index 306d4f16306a..5598c993cc8c 100644
--- a/idlc/source/fehelper.cxx
+++ b/idlc/source/fehelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,11 +40,11 @@ FeDeclarator::FeDeclarator(const OString& name, DeclaratorType declType, AstDecl
     , m_name(name)
     , m_declType(declType)
 {
-}
+}	
 
 FeDeclarator::~FeDeclarator()
 {
-}
+}	
 
 sal_Bool FeDeclarator::checkType(AstDeclaration const * type)
 {
@@ -57,27 +57,27 @@ sal_Bool FeDeclarator::checkType(AstDeclaration const * type)
         return sal_False;
     else
         return sal_True;
-}
+}	
 
 AstType const * FeDeclarator::compose(AstDeclaration const * pDecl)
 {
-    AstArray*   pArray;
-    AstType*    pType;
+    AstArray*	pArray;
+    AstType*	pType;
 
     if ( pDecl == 0 )
     {
         return NULL;
     }
-    if ( !pDecl->isType() )
+    if ( !pDecl->isType() ) 
     {
         idlc()->error()->noTypeError(pDecl);
         return NULL;
     }
     pType = (AstType*)pDecl;
-    if (m_declType == FD_simple || m_pComplexPart == NULL)
+    if (m_declType == FD_simple || m_pComplexPart == NULL) 
         return pType;
 
-    if (m_pComplexPart->getNodeType() == NT_array)
+    if (m_pComplexPart->getNodeType() == NT_array) 
     {
         pArray = (AstArray*)m_pComplexPart;
         pArray->setType(pType);
@@ -90,14 +90,14 @@ AstType const * FeDeclarator::compose(AstDeclaration const * pDecl)
             if ( (AstDeclaration*)pArray != pDecl2 )
             {
                 delete m_pComplexPart;
-                m_pComplexPart = pDecl2;
+                m_pComplexPart = pDecl2;	
             }
         }
         return pArray;
     }
 
     return NULL; // return through this statement should not happen
-}
+}	
 
 FeInheritanceHeader::FeInheritanceHeader(
     NodeType nodeType, ::rtl::OString* pName, ::rtl::OString* pInherits,
diff --git a/idlc/source/idlc.cxx b/idlc/source/idlc.cxx
index d1b3b9587d5b..7fcc8e8abcf2 100644
--- a/idlc/source/idlc.cxx
+++ b/idlc/source/idlc.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@ AstDeclaration* SAL_CALL scopeAsDecl(AstScope* pScope)
 {
     if (pScope == NULL) return NULL;
 
-    switch( pScope->getScopeNodeType() )
+    switch( pScope->getScopeNodeType() ) 
     {
         case NT_service:
         case NT_singleton:
@@ -79,13 +79,13 @@ AstDeclaration* SAL_CALL scopeAsDecl(AstScope* pScope)
         default:
             return NULL;
     }
-}
+}	
 
 AstScope* SAL_CALL declAsScope(AstDeclaration* pDecl)
 {
     if (pDecl == NULL) return NULL;
 
-    switch(pDecl->getNodeType())
+    switch(pDecl->getNodeType()) 
     {
         case NT_interface:
             return (AstInterface*)(pDecl);
@@ -110,7 +110,7 @@ AstScope* SAL_CALL declAsScope(AstDeclaration* pDecl)
         default:
             return NULL;
    }
-}
+}	
 
 static void SAL_CALL predefineXInterface(AstModule* pRoot)
 {
@@ -122,7 +122,7 @@ static void SAL_CALL predefineXInterface(AstModule* pRoot)
     pParentScope = pModule;
     pModule = new AstModule(OString("sun"), pParentScope);
     pModule->setPredefined(true);
-    pParentScope->addDeclaration(pModule);
+    pParentScope->addDeclaration(pModule);                            
     pParentScope = pModule;
     pModule = new AstModule(OString("star"), pParentScope);
     pModule->setPredefined(true);
@@ -153,7 +153,7 @@ static void SAL_CALL predefineXInterface(AstModule* pRoot)
     pOp = new AstOperation(1, (AstType*)(pRoot->lookupPrimitiveType(ET_void)),
                                          OString("acquire"), pInterface);
     pInterface->addMember(pOp);
-
+    
     // define XInterface::release
     pOp = new AstOperation(1, (AstType*)(pRoot->lookupPrimitiveType(ET_void)),
                                          OString("release"), pInterface);
@@ -167,7 +167,7 @@ static void SAL_CALL initializePredefinedTypes(AstModule* pRoot)
     {
          pPredefined = new AstBaseType(ET_long, OString("long"), pRoot);
          pRoot->addDeclaration(pPredefined);
-
+         
          pPredefined = new AstBaseType(ET_ulong, OString("unsigned long"), pRoot);
          pRoot->addDeclaration(pPredefined);
 
@@ -176,37 +176,37 @@ static void SAL_CALL initializePredefinedTypes(AstModule* pRoot)
 
          pPredefined = new AstBaseType(ET_uhyper, OString("unsigned hyper"), pRoot);
          pRoot->addDeclaration(pPredefined);
-
+         
          pPredefined = new AstBaseType(ET_short, OString("short"), pRoot);
          pRoot->addDeclaration(pPredefined);
-
+         
          pPredefined = new AstBaseType(ET_ushort, OString("unsigned short"), pRoot);
          pRoot->addDeclaration(pPredefined);
-
+         
          pPredefined = new AstBaseType(ET_float, OString("float"), pRoot);
          pRoot->addDeclaration(pPredefined);
-
+         
          pPredefined = new AstBaseType(ET_double, OString("double"), pRoot);
          pRoot->addDeclaration(pPredefined);
-
+         
          pPredefined = new AstBaseType(ET_char, OString("char"), pRoot);
          pRoot->addDeclaration(pPredefined);
-
+         
          pPredefined = new AstBaseType(ET_byte, OString("byte"), pRoot);
          pRoot->addDeclaration(pPredefined);
-
+         
          pPredefined = new AstBaseType(ET_any, OString("any"), pRoot);
          pRoot->addDeclaration(pPredefined);
 
          pPredefined = new AstBaseType(ET_string, OString("string"), pRoot);
          pRoot->addDeclaration(pPredefined);
-
+         
          pPredefined = new AstBaseType(ET_type, OString("type"), pRoot);
          pRoot->addDeclaration(pPredefined);
-
+         
          pPredefined = new AstBaseType(ET_boolean, OString("boolean"), pRoot);
          pRoot->addDeclaration(pPredefined);
-
+         
          pPredefined = new AstBaseType(ET_void, OString("void"), pRoot);
          pRoot->addDeclaration(pPredefined);
     }
@@ -227,9 +227,9 @@ Idlc::Idlc(Options* pOptions)
     m_pScopes = new AstStack();
     // init root object after construction
     m_pRoot = NULL;
-    m_pErrorHandler = new ErrorHandler();
+    m_pErrorHandler = new ErrorHandler();		
     m_bGenerateDoc = m_pOptions->isValid("-C");
-}
+}	
 
 Idlc::~Idlc()
 {
@@ -239,13 +239,13 @@ Idlc::~Idlc()
         delete m_pScopes;
     if (m_pErrorHandler)
         delete m_pErrorHandler;
-}
+}	
 
 void Idlc::init()
 {
     if ( m_pRoot )
         delete m_pRoot;
-
+        
     m_pRoot = new AstModule(NT_root, OString(), NULL);
 
     // push the root node on the stack
@@ -253,7 +253,7 @@ void Idlc::init()
     initializePredefinedTypes(m_pRoot);
     predefineXInterface(m_pRoot);
 }
-
+    
 void Idlc::reset()
 {
     m_bIsDocValid = sal_False;
@@ -269,31 +269,31 @@ void Idlc::reset()
     m_mainFileName = OString();
     m_realFileName = OString();
     m_documentation = OString();
-
+    
     m_pScopes->clear();
     if ( m_pRoot)
         delete m_pRoot;
 
     m_pRoot = new AstModule(NT_root, OString(), NULL);
-
+    
     // push the root node on the stack
     m_pScopes->push(m_pRoot);
-    initializePredefinedTypes(m_pRoot);
+    initializePredefinedTypes(m_pRoot);	
 }
 
 sal_Bool Idlc::isDocValid()
-{
+{ 
     if ( m_bGenerateDoc )
-        return m_bIsDocValid;
+        return m_bIsDocValid; 
     return sal_False;;
 }
-
+     
 static Idlc* pStaticIdlc = NULL;
 
 Idlc* SAL_CALL idlc()
 {
     return pStaticIdlc;
-}
+}	
 
 Idlc* SAL_CALL setIdlc(Options* pOptions)
 {
@@ -304,7 +304,7 @@ Idlc* SAL_CALL setIdlc(Options* pOptions)
     pStaticIdlc = new Idlc(pOptions);
     pStaticIdlc->init();
     return pStaticIdlc;
-}
+}	
 
 AstDeclaration const * resolveTypedefs(AstDeclaration const * type) {
     if (type != 0) {
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index 48c975b280a9..8453a3e8be49 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,10 +40,10 @@
 #include <io.h>
 #endif
 
-#ifdef  SAL_UNX
+#ifdef	SAL_UNX
 #include <unistd.h>
 #if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || \
-    defined(AIX) || defined(OPENBSD)
+	defined(AIX) || defined(OPENBSD)
 #include <sys/wait.h>
 #else
 #include <wait.h>
@@ -302,9 +302,9 @@ sal_Int32 compileFile(const OString * pathname)
 #ifdef SAL_OS2_00
       char* tok = strtok( (char*)cppArgs.getStr(), " \t\n\r");
       while( tok) {
-         if (tok[strlen(tok)-1] == '\"')
+         if (tok[strlen(tok)-1] == '\"') 
             tok[strlen(tok)-1] = '\0';
-         if (*tok == '\"')
+         if (*tok == '\"') 
             memcpy( tok, tok+1, strlen(tok));
          if (strlen(tok)>0) {
             fputs(tok, pCmdFile);
@@ -328,15 +328,15 @@ sal_Int32 compileFile(const OString * pathname)
 
     sal_Int32 idx= cpp.lastIndexOf(OUString( RTL_CONSTASCII_USTRINGPARAM("idlc")) );
      cpp = cpp.copy(0, idx);
-
+    
 #if defined(SAL_W32) || defined(SAL_OS2)
      cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("idlcpp.exe"));
 #else
     cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("idlcpp"));
 #endif
 
-    oslProcess      hProcess = NULL;
-    oslProcessError procError = osl_Process_E_None;
+    oslProcess		hProcess = NULL;
+    oslProcessError	procError = osl_Process_E_None;
 
     procError = osl_executeProcess(cpp.pData, &cmdArg.pData, 1, osl_Process_WAIT,
                                    0, startDir.pData, 0, 0, &hProcess);
diff --git a/idlc/source/idlcmain.cxx b/idlc/source/idlcmain.cxx
index 4a7cdbbb7f2b..21f8b89c36fd 100644
--- a/idlc/source/idlcmain.cxx
+++ b/idlc/source/idlcmain.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,14 +37,14 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
     Options options;
 
-    try
+    try 
     {
         if (!options.initOptions(argc, argv))
            exit(1);
     }
     catch( IllegalArgument& e)
     {
-        fprintf(stderr, "Illegal argument: %s\n%s",
+        fprintf(stderr, "Illegal argument: %s\n%s", 
             e.m_message.getStr(),
             options.prepareVersion().getStr());
         exit(99);
@@ -114,21 +114,21 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
             OString strippedFileName(sysFileName.copy(sysFileName.lastIndexOf(SEPARATOR) + 1));
             outputFileUrl = convertToFileUrl(options.getOption("-O"));
             sal_Char c = outputFileUrl.getStr()[outputFileUrl.getLength()-1];
-
+            
             if ( c != '/' )
                 outputFileUrl += OString::valueOf('/');
-
+            
             outputFileUrl += strippedFileName.replaceAt(strippedFileName.getLength() -3 , 3, "urd");
         } else
         {
             outputFileUrl = convertToFileUrl(sysFileName.replaceAt(sysFileName.getLength() -3 , 3, "urd"));
         }
-
+        
         if ( nErrors )
             removeIfExists(outputFileUrl);
         else
             nErrors = produceFile(outputFileUrl);
-
+        
         idlc()->reset();
     }
 
@@ -136,7 +136,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     {
         fprintf(stderr, "%s: detected %ld errors%s",
             options.getProgramName().getStr(),
-            sal::static_int_cast< long >(nErrors),
+            sal::static_int_cast< long >(nErrors), 
             options.prepareVersion().getStr());
     } else
     {
diff --git a/idlc/source/idlcproduce.cxx b/idlc/source/idlcproduce.cxx
index f97357a4e500..5633ddb3608b 100644
--- a/idlc/source/idlcproduce.cxx
+++ b/idlc/source/idlcproduce.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -73,7 +73,7 @@ static sal_Bool checkOutputPath(const OString& completeName)
     }
     else
         nIndex = 0;
-
+        
     do
     {
         buffer.append(sysPathName.getToken(0, SEPARATOR, nIndex));
@@ -87,8 +87,8 @@ static sal_Bool checkOutputPath(const OString& completeName)
 #endif
             {
                 if (errno == ENOENT)
-                {
-                    fprintf(stderr, "%s: cannot create directory '%s'\n",
+                {	
+                    fprintf(stderr, "%s: cannot create directory '%s'\n", 
                             idlc()->getOptions()->getProgramName().getStr(), buffer.getStr());
                     return sal_False;
                 }
@@ -96,13 +96,13 @@ static sal_Bool checkOutputPath(const OString& completeName)
             {
                 if ( !pCreatedDirectories )
                     pCreatedDirectories = new StringList();
-                pCreatedDirectories->push_front(buffer.getStr());
+                pCreatedDirectories->push_front(buffer.getStr());				
             }
         }
         buffer.append(SEPARATOR);
     } while( nIndex != -1 );
     return sal_True;
-}
+}	
 
 static sal_Bool cleanPath()
 {
@@ -113,12 +113,12 @@ static sal_Bool cleanPath()
         while ( iter != end )
         {
 //#ifdef SAL_UNX
-//          if (rmdir((char*)(*iter).getStr(), 0777) == -1)
+//			if (rmdir((char*)(*iter).getStr(), 0777) == -1)
 //#else
             if (rmdir((char*)(*iter).getStr()) == -1)
 //#endif
             {
-                fprintf(stderr, "%s: cannot remove directory '%s'\n",
+                fprintf(stderr, "%s: cannot remove directory '%s'\n", 
                         idlc()->getOptions()->getProgramName().getStr(), (*iter).getStr());
                 return sal_False;
             }
@@ -133,19 +133,19 @@ void removeIfExists(const OString& pathname)
 {
     unlink(pathname.getStr());
 }
-
+    
 sal_Int32 SAL_CALL produceFile(const OString& regFileName)
 {
     Options* pOptions = idlc()->getOptions();
 
     OString regTmpName = regFileName.replaceAt(regFileName.getLength() -3, 3, "_idlc_");
 
-    if ( !checkOutputPath(regFileName) )
+    if ( !checkOutputPath(regFileName) )	
     {
-        fprintf(stderr, "%s: could not create path of registry file '%s'.\n",
+        fprintf(stderr, "%s: could not create path of registry file '%s'.\n", 
                 pOptions->getProgramName().getStr(), regFileName.getStr());
         return 1;
-    }
+    }	
 
     removeIfExists(regTmpName);
     OString urlRegTmpName = convertToFileUrl(regTmpName);
@@ -153,26 +153,26 @@ sal_Int32 SAL_CALL produceFile(const OString& regFileName)
     Registry regFile;
     if ( regFile.create(OStringToOUString(urlRegTmpName, RTL_TEXTENCODING_UTF8)) != REG_NO_ERROR )
     {
-        fprintf(stderr, "%s: could not create registry file '%s'\n",
+        fprintf(stderr, "%s: could not create registry file '%s'\n", 
                 pOptions->getProgramName().getStr(), regTmpName.getStr());
         removeIfExists(regTmpName);
         removeIfExists(regFileName);
         cleanPath();
-        return 1;
+        return 1;	
     }
 
     RegistryKey rootKey;
     if ( regFile.openRootKey(rootKey) != REG_NO_ERROR )
     {
-        fprintf(stderr, "%s: could not open root of registry file '%s'\n",
+        fprintf(stderr, "%s: could not open root of registry file '%s'\n", 
                 pOptions->getProgramName().getStr(), regFileName.getStr());
         removeIfExists(regTmpName);
         removeIfExists(regFileName);
         cleanPath();
-        return 1;
+        return 1;			
     }
 
-    // produce registry file
+    // produce registry file 
     if ( !idlc()->getRoot()->dump(rootKey) )
     {
         rootKey.releaseKey();
@@ -181,12 +181,12 @@ sal_Int32 SAL_CALL produceFile(const OString& regFileName)
         removeIfExists(regFileName);
         cleanPath();
         return 1;
-    }
+    } 
 
     rootKey.releaseKey();
     if ( regFile.close() != REG_NO_ERROR )
     {
-        fprintf(stderr, "%s: could not close registry file '%s'\n",
+        fprintf(stderr, "%s: could not close registry file '%s'\n", 
                 pOptions->getProgramName().getStr(), regFileName.getStr());
         removeIfExists(regTmpName);
         removeIfExists(regFileName);
@@ -198,15 +198,15 @@ sal_Int32 SAL_CALL produceFile(const OString& regFileName)
 
     if ( File::move(OStringToOUString(regTmpName, osl_getThreadTextEncoding()),
                     OStringToOUString(regFileName, osl_getThreadTextEncoding())) != FileBase::E_None ) {
-        fprintf(stderr, "%s: cannot rename temporary registry '%s' to '%s'\n",
-                idlc()->getOptions()->getProgramName().getStr(),
+        fprintf(stderr, "%s: cannot rename temporary registry '%s' to '%s'\n", 
+                idlc()->getOptions()->getProgramName().getStr(), 
                 regTmpName.getStr(), regFileName.getStr());
         removeIfExists(regTmpName);
         cleanPath();
         return 1;
     }
     removeIfExists(regTmpName);
-
+    
     return 0;
 }
 
diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx
index fe02e3a6e169..ec9315ce2337 100644
--- a/idlc/source/options.cxx
+++ b/idlc/source/options.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,37 +37,37 @@ using namespace rtl;
 
 Options::Options(): m_stdin(false), m_verbose(false), m_quiet(false)
 {
-}
+}	
 
 Options::~Options()
 {
 }
 
-sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
+sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile) 
     throw( IllegalArgument )
 {
-    sal_Bool    ret = sal_True;
-    sal_uInt16  j=0;
-
+    sal_Bool 	ret = sal_True;
+    sal_uInt16	j=0;
+    
     if (!bCmdFile)
     {
         bCmdFile = sal_True;
-
+        
         m_program = av[0];
-
+        
         if (ac < 2)
         {
             fprintf(stderr, "%s", prepareHelp().getStr());
             ret = sal_False;
         }
-
+        
         j = 1;
     } else
     {
         j = 0;
     }
-
-    char    *s=NULL;
+    
+    char	*s=NULL;
     for (; j < ac; j++)
     {
         if (av[j][0] == '-')
@@ -88,14 +88,14 @@ sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                         {
                             tmp += " your input '" + OString(av[j+1]) + "'";
                         }
-
+                        
                         throw IllegalArgument(tmp);
                     }
                 } else
                 {
                     s = av[j] + 2;
                 }
-
+                
                 m_options["-O"] = OString(s);
                 break;
             case 'I':
@@ -113,14 +113,14 @@ sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                         {
                             tmp += " your input '" + OString(av[j+1]) + "'";
                         }
-
+                        
                         throw IllegalArgument(tmp);
                     }
                 } else
                 {
                     s = av[j] + 2;
                 }
-
+                
                 OString inc(s);
                 if ( inc.indexOf(';') > 0 )
                 {
@@ -130,7 +130,7 @@ sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                     do inc = inc + " -I\"" + tmp.getToken( 0, ';', nIndex ) +"\""; while( nIndex != -1 );
                 } else
                     inc = OString("-I\"") + s + "\"";
-
+                
                 if (m_options.count("-I") > 0)
                 {
                     OString tmp(m_options["-I"]);
@@ -156,14 +156,14 @@ sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                         {
                             tmp += " your input '" + OString(av[j+1]) + "'";
                         }
-
+                        
                         throw IllegalArgument(tmp);
                     }
                 } else
                 {
                     s = av[j];
                 }
-
+                
                 if (m_options.count("-D") > 0)
                 {
                     OString tmp(m_options["-D"]);
@@ -176,7 +176,7 @@ sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                 if (av[j][2] != '\0')
                 {
                     throw IllegalArgument(OString(av[j]) + ", please check your input");
-                }
+                } 				
                 if (m_options.count("-C") == 0)
                     m_options["-C"] = OString(av[j]);
                 break;
@@ -209,12 +209,12 @@ sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                     if (m_options.count("-we") == 0)
                         m_options["-we"] = OString(av[j]);
                 } else {
-                    if (av[j][2] == '\0') {
+                    if (av[j][2] == '\0') { 
                         if (m_options.count("-w") == 0)
                             m_options["-w"] = OString(av[j]);
                     } else
                         throw IllegalArgument(OString(av[j]) + ", please check your input");
-                }
+                }                    
                 break;
             case 'h':
             case '?':
@@ -225,7 +225,7 @@ sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                 {
                     fprintf(stdout, "%s", prepareHelp().getStr());
                     exit(0);
-                }
+                }					
             case 's':
                 if (/*MSVC trouble: std::*/strcmp(&av[j][2], "tdin") == 0)
                 {
@@ -267,7 +267,7 @@ sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             if (c!=13 && c!=10) {
                                 if (found || c!=' ') {
                                     buffer[i++]=c;
-                                    continue;
+                                    continue;                
                                 }
                             }
                             if (i==0)
@@ -286,33 +286,33 @@ sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                         rargc++;
                     }
                     fclose(cmdFile);
-
+                    
                     ret = initOptions(rargc, rargv, bCmdFile);
-
+                    
                     long ii = 0;
-                    for (ii=0; ii < rargc; ii++)
+                    for (ii=0; ii < rargc; ii++) 
                     {
                         free(rargv[ii]);
                     }
-                }
+                }		
             } else
             {
                 OString name(av[j]);
                 name = name.toAsciiLowerCase();
                 if ( name.lastIndexOf(".idl") != (name.getLength() - 4) )
                 {
-                    throw IllegalArgument("'" + OString(av[j]) +
+                    throw IllegalArgument("'" + OString(av[j]) + 
                         "' is not a valid input file, only '*.idl' files will be accepted");
                 }
                 m_inputFiles.push_back(av[j]);
-            }
+            }		
         }
     }
+    
+    return ret;	
+}	
 
-    return ret;
-}
-
-OString Options::prepareHelp()
+OString	Options::prepareHelp()
 {
     OString help("\nusing: ");
     help += m_program
@@ -338,26 +338,26 @@ OString Options::prepareHelp()
     help += "    -we         = treat warnings as errors.\n";
     help += "    -h|-?       = print this help message and exit.\n";
     help += prepareVersion();
-
+    
     return help;
-}
+}	
 
-OString Options::prepareVersion()
+OString	Options::prepareVersion()
 {
     OString version("\nSun Microsystems (R) ");
     version += m_program + " Version 1.1\n\n";
     return version;
-}
+}	
 
 const OString& Options::getProgramName() const
 {
     return m_program;
-}
+}	
 
 sal_Bool Options::isValid(const OString& option)
 {
-    return (m_options.count(option) > 0);
-}
+    return (m_options.count(option) > 0);	
+}	
 
 const OString Options::getOption(const OString& option)
     throw( IllegalArgument )
diff --git a/idlc/source/preproc/cpp.c b/idlc/source/preproc/cpp.c
index e56ae306ac11..496c1749f562 100644
--- a/idlc/source/preproc/cpp.c
+++ b/idlc/source/preproc/cpp.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 #include <stdarg.h>
 #include "cpp.h"
 
-#define OUTS    16384
+#define	OUTS	16384
 char outbuf[OUTS];
 char *outptr = outbuf;
 Source *cursource;
@@ -51,9 +51,9 @@ char* realargv[512];
 
 void checkCommandFile(char* cmdfile)
 {
-    FILE    *commandfile;
-    char    option[256];
-
+    FILE	*commandfile;
+    char 	option[256];
+    
     commandfile = fopen(cmdfile+1, "r");
     if( commandfile == NULL )
     {
@@ -76,8 +76,8 @@ void checkCommandFile(char* cmdfile)
                 if (c!=13 && c!=10) {
                     if (found || c!=' ') {
                         option[i++]=c;
-                        continue;
-                    }
+                        continue;                
+                    } 
                 }
                 if (i==0)
                     continue;
@@ -101,8 +101,8 @@ void checkCommandFile(char* cmdfile)
             realargc++;
         }
         fclose(commandfile);
-    }
-}
+    }	
+}	
 
 void checkCommandArgs(int argc, char **argv)
 {
@@ -119,7 +119,7 @@ void checkCommandArgs(int argc, char **argv)
             realargc++;
         }
     }
-}
+}	
 
 void cleanCommandArgs()
 {
@@ -129,7 +129,7 @@ void cleanCommandArgs()
     {
         free(realargv[i]);
     }
-}
+}	
 
 #ifdef WNT
 int __cdecl main(int argc, char **argv)
diff --git a/idlc/source/preproc/cpp.h b/idlc/source/preproc/cpp.h
index b40647cd38b7..89de35a0dde6 100644
--- a/idlc/source/preproc/cpp.h
+++ b/idlc/source/preproc/cpp.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,19 +26,19 @@
  *
  ************************************************************************/
 
-#define INS         32768   /* input buffer                             */
-#define OBS         8092    /* outbut buffer                            */
-#define NARG        32      /* Max number arguments to a macro          */
-#define NINCLUDE    32      /* Max number of include directories (-I)   */
-#define NIF         64      /* depth of nesting of #if                  */
-#define NINC        32      /* depth of nesting of #include             */
+#define	INS			32768	/* input buffer								*/
+#define	OBS			8092    /* outbut buffer							*/
+#define	NARG		32      /* Max number arguments to a macro			*/
+#define	NINCLUDE	32      /* Max number of include directories (-I)	*/
+#define	NIF			64		/* depth of nesting of #if					*/
+#define	NINC		32		/* depth of nesting of #include				*/
 
 #ifndef EOF
-#define EOF (-1)
+#define	EOF	(-1)
 #endif
 
 #ifndef NULL
-#define NULL    0
+#define NULL	0
 #endif
 
 typedef unsigned char uchar;
@@ -59,21 +59,21 @@ enum toktype
 enum kwtype
 {
     KIF, KIFDEF, KIFNDEF, KELIF, KELSE, KENDIF, KINCLUDE, KINCLUDENEXT,
-    KIMPORT, KDEFINE, KUNDEF, KLINE, KERROR, KPRAGMA, KIDENT, KDEFINED,
+    KIMPORT, KDEFINE, KUNDEF, KLINE, KERROR, KPRAGMA, KIDENT, KDEFINED, 
     KMACHINE, KLINENO, KFILE, KDATE, KTIME, KSTDC, KEVAL
 };
 
-#define ISDEFINED       0x01            /* has #defined value */
-#define ISKW            0x02            /* is PP keyword */
-#define ISUNCHANGE      0x04            /* can't be #defined in PP */
-#define ISMAC           0x08            /* builtin macro, e.g. __LINE__ */
-#define ISARCHITECTURE  0x10            /* architecture */
-#define ISACTIVE        0x80            /* is macro currently expanded */
+#define	ISDEFINED		0x01            /* has #defined value */
+#define	ISKW			0x02            /* is PP keyword */
+#define	ISUNCHANGE		0x04            /* can't be #defined in PP */
+#define	ISMAC			0x08            /* builtin macro, e.g. __LINE__ */
+#define	ISARCHITECTURE	0x10            /* architecture */
+#define	ISACTIVE   	    0x80            /* is macro currently expanded */
 
-#define EOB     0xFE                    /* sentinel for end of input buffer */
-#define EOFC    0xFD                    /* sentinel for end of input file */
-#define XPWS    1                       /* token flag: white space to assure token sep. */
-#define XTWS    2
+#define	EOB		0xFE                    /* sentinel for end of input buffer */
+#define	EOFC	0xFD                    /* sentinel for end of input file */
+#define	XPWS	1                       /* token flag: white space to assure token sep. */
+#define XTWS	2
 
 typedef struct token
 {
@@ -116,7 +116,7 @@ typedef struct nlist
     Tokenrow *ap;                       /* list of argument names, if any */
     char val;                           /* value as preprocessor name */
     char flag;                          /* is defined, is pp name */
-    uchar *loc;                         /* location of definition */
+    uchar *loc;							/* location of definition */
 }   Nlist;
 
 typedef struct includelist
@@ -131,9 +131,9 @@ typedef struct wraplist
     char *file;
 }   Wraplist;
 
-#define new(t)  (t *)domalloc(sizeof(t))
-#define quicklook(a,b)  (namebit[(a)&077] & (1<<((b)&037)))
-#define quickset(a,b)   namebit[(a)&077] |= (1<<((b)&037))
+#define	new(t)	(t *)domalloc(sizeof(t))
+#define	quicklook(a,b)	(namebit[(a)&077] & (1<<((b)&037)))
+#define	quickset(a,b)	namebit[(a)&077] |= (1<<((b)&037))
 extern unsigned long namebit[077 + 1];
 
 enum errtype
@@ -188,7 +188,7 @@ char *outnum(char *, int);
 int digit(int);
 uchar *newstring(uchar *, int, int);
 
-#define rowlen(tokrow)  ((tokrow)->lp - (tokrow)->bp)
+#define	rowlen(tokrow)	((tokrow)->lp - (tokrow)->bp)
 
 extern char *outptr;
 extern Token nltoken;
diff --git a/idlc/source/preproc/eval.c b/idlc/source/preproc/eval.c
index 292cc95336bc..e908d19cb503 100644
--- a/idlc/source/preproc/eval.c
+++ b/idlc/source/preproc/eval.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,12 +29,12 @@
 #include <string.h>
 #include "cpp.h"
 
-#define NSTAK   32
-#define SGN 0
-#define UNS 1
-#define UND 2
+#define	NSTAK	32
+#define	SGN	0
+#define	UNS	1
+#define	UND	2
 
-#define UNSMARK 0x1000
+#define	UNSMARK	0x1000
 
 struct value
 {
@@ -43,12 +43,12 @@ struct value
 };
 
 /* conversion types */
-#define RELAT   1
-#define ARITH   2
-#define LOGIC   3
-#define SPCL    4
-#define SHIFT   5
-#define UNARY   6
+#define	RELAT	1
+#define	ARITH	2
+#define	LOGIC	3
+#define	SPCL	4
+#define	SHIFT	5
+#define	UNARY	6
 
 /* operator priority, arity, and conversion type, indexed by tokentype */
 struct pri
diff --git a/idlc/source/preproc/include.c b/idlc/source/preproc/include.c
index b56622b571ee..da750b29dacb 100644
--- a/idlc/source/preproc/include.c
+++ b/idlc/source/preproc/include.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,12 +26,12 @@
  *
  ************************************************************************/
 #if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__))
-#   include <io.h>
+#	include <io.h>
 #else
-#   include <unistd.h>
+#	include <unistd.h>
 #endif
 #ifdef _MSC_VER
-#   define _POSIX_
+#	define _POSIX_
 #endif
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,7 +39,7 @@
 #include <fcntl.h>
 
 #ifdef __hpux
-#   define _HPUX_SOURCE
+#	define _HPUX_SOURCE
 #endif
 #ifdef SCO
 #define _IBCS2
diff --git a/idlc/source/preproc/lex.c b/idlc/source/preproc/lex.c
index 4b565b9c133f..522f85a91ff0 100644
--- a/idlc/source/preproc/lex.c
+++ b/idlc/source/preproc/lex.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,17 +54,17 @@
  *      nextstate: 6 bits; ?\ marker: 1 bit; tokentype: 9 bits.
  */
 
-#define MAXSTATE        32
-#define ACT(tok,act)    ((tok<<7)+act)
-#define QBSBIT          0100
-#define GETACT(st)      ((st>>7)&0x1ff)
+#define	MAXSTATE		32
+#define	ACT(tok,act)	((tok<<7)+act)
+#define	QBSBIT			0100
+#define	GETACT(st)		((st>>7)&0x1ff)
 
 /* character classes */
-#define C_WS    1
-#define C_ALPH  2
-#define C_NUM   3
-#define C_EOF   4
-#define C_XX    5
+#define	C_WS	1
+#define	C_ALPH	2
+#define	C_NUM	3
+#define	C_EOF	4
+#define	C_XX	5
 
 enum state
 {
@@ -382,7 +382,7 @@ continue2:
             oldstate = state;
 
             c = *ip;
-
+                        
             if ((state = bigfsm[c][state]) >= 0)
             {
                 ip += runelen;
@@ -428,7 +428,7 @@ continue2:
                     if (c == '\n')
                     {
                         while (s->inp + 1 >= s->inl && fillbuf(s) != EOF);
-
+                    
                         if (s->inp[1] == '\r')
                         {
                             memmove(s->inp + 1, s->inp + 2, s->inl - s->inp + 2);
@@ -441,7 +441,7 @@ continue2:
                     if (c == '\r')
                     {
                         while (s->inp + 1 >= s->inl && fillbuf(s) != EOF);
-
+                    
                         if (s->inp[1] == '\n')
                         {
                             memmove(s->inp, s->inp + 1, s->inl - s->inp + 1);
diff --git a/idlc/source/preproc/macro.c b/idlc/source/preproc/macro.c
index be9f30abf085..1d253d6a8729 100644
--- a/idlc/source/preproc/macro.c
+++ b/idlc/source/preproc/macro.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,17 +26,17 @@
  *
  ************************************************************************/
 #ifdef _MSC_VER
-#   define _POSIX_
+#	define _POSIX_
 #endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #ifdef __hpux
-#   define _HPUX_SOURCE
+#	define _HPUX_SOURCE
 #endif
 #ifdef SCO
-#   define _IBCS2
+#	define _IBCS2
 #endif
 #include <limits.h>
 
@@ -329,7 +329,7 @@ void
             trp->tp += ntokc;
             return;
         }
-        substargs(np, &ntr, atr);       /* put args into replacement */
+        substargs(np, &ntr, atr);		/* put args into replacement */
         for (i = 0; i < narg; i++)
         {
             dofree(atr[i]->bp);
@@ -597,7 +597,7 @@ int
 /*
  * Return a quoted version of the tokenrow (from # arg)
  */
-#define STRLEN  512
+#define	STRLEN	512
 Tokenrow *
     stringify(Tokenrow * vp)
 {
diff --git a/idlc/source/preproc/nlist.c b/idlc/source/preproc/nlist.c
index d3256fa0fce8..af8ff103dad4 100644
--- a/idlc/source/preproc/nlist.c
+++ b/idlc/source/preproc/nlist.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,14 +34,14 @@ extern int Cplusplus;
 Nlist *kwdefined;
 char wd[128];
 
-/*
+/* 
     ER: Tabelle extra gross gemacht, da es anscheinend ein Problem mit der
     der Verkettung gibt, irgendwann irgendwo wird mal ein nlist->next
     ueberschrieben, was in eineme SIGSEGV resultiert.
     Den GDB mit watchpoint hab ich aber nach 2 Tagen abgebrochen..
     so loeppt's jedenfalls erstmal..
  */
-#define NLSIZE 15000
+#define	NLSIZE 15000
 
 static Nlist *nlist[NLSIZE];
 
diff --git a/idlc/source/preproc/tokens.c b/idlc/source/preproc/tokens.c
index e119fc5cc2b8..cb1b17f6b404 100644
--- a/idlc/source/preproc/tokens.c
+++ b/idlc/source/preproc/tokens.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/idlc/source/preproc/unix.c b/idlc/source/preproc/unix.c
index 57b49a74128a..23b0ae69bbe1 100644
--- a/idlc/source/preproc/unix.c
+++ b/idlc/source/preproc/unix.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@
 extern char rcsid[];
 
 int Pflag = 0;                          /* print no line information */
-int Iflag = 0;                          /* print includes */
+int Iflag = 0;							/* print includes */
 int Mflag = 0;                          /* print macor expansion */
 int Aflag = 0;                          /* translate character sets */
 int Xflag = 0;                          /* print pragma for include/import */
diff --git a/idlc/source/wrap_parser.cxx b/idlc/source/wrap_parser.cxx
index f03b3cc7f173..f568b8753dbf 100644
--- a/idlc/source/wrap_parser.cxx
+++ b/idlc/source/wrap_parser.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/idlc/source/wrap_scanner.cxx b/idlc/source/wrap_scanner.cxx
index 6ea04c00e96e..2b669e9293fd 100644
--- a/idlc/source/wrap_scanner.cxx
+++ b/idlc/source/wrap_scanner.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/idlc/test/const.idl b/idlc/test/const.idl
index 76b3d2a02e6b..8fbf80cde8bf 100644
--- a/idlc/test/const.idl
+++ b/idlc/test/const.idl
@@ -39,11 +39,11 @@ constants USER
     /// = 4
     const long FLAG9 = FLAG1 << 2;
     /// = 32
-    const long FLAG10 = (FLAG5 >> 1) << 2;
+    const long FLAG10 = (FLAG5 >> 1) << 2;	
     /// = 1
-    const long FLAG11 = 33 % 4;
+    const long FLAG11 = 33 % 4;	
     /// = 4
-    const long FLAG12 = FLAG10 / 8;
+    const long FLAG12 = FLAG10 / 8;	
 };
 
 };
diff --git a/idlc/test/enum.idl b/idlc/test/enum.idl
index 2920d7fe6a0f..d287c57fccd9 100644
--- a/idlc/test/enum.idl
+++ b/idlc/test/enum.idl
@@ -16,7 +16,7 @@ enum Warning
     NO,
     USER = 2,
     WRONGPASSWORD = 4,
-    IDFAILURE
+    IDFAILURE	
 };
 
 
diff --git a/idlc/test/exception.idl b/idlc/test/exception.idl
index b53d1dbe74fd..d527301687f3 100644
--- a/idlc/test/exception.idl
+++ b/idlc/test/exception.idl
@@ -5,13 +5,13 @@ module test
 
 exception BaseException
 {
-    string  Description;
+    string	Description;
 };
 
 exception RuntimeException : BaseException
 {
-    long    Id;
-    type    Context;
+    long	Id;
+    type	Context;
 };
 
 
diff --git a/idlc/test/interface.idl b/idlc/test/interface.idl
index 18116bf963db..336d8858a32b 100644
--- a/idlc/test/interface.idl
+++ b/idlc/test/interface.idl
@@ -19,31 +19,31 @@ interface XTestBaseTypes : XBase
     void voidFunc();
     [oneway] void onewayFunc();
 
-    short shortFunc( [in] short inparam, [out] short outparam, [inout] short inoutparam);
-    unsigned short uShortFunc( [in] unsigned short inparam, [out] unsigned short outparam, [inout] unsigned short inoutparam);
+    short shortFunc( [in] short inparam, [out] short outparam, [inout] short inoutparam); 
+    unsigned short uShortFunc( [in] unsigned short inparam, [out] unsigned short outparam, [inout] unsigned short inoutparam); 
 
-    long longFunc( [in] long inparam, [out] long outparam, [inout] long inoutparam);
-    unsigned long ulongFunc( [in] unsigned long inparam, [out] unsigned long outparam, [inout] unsigned long inoutparam);
+    long longFunc( [in] long inparam, [out] long outparam, [inout] long inoutparam); 
+    unsigned long ulongFunc( [in] unsigned long inparam, [out] unsigned long outparam, [inout] unsigned long inoutparam); 
 
-    hyper hyperFunc( [in] hyper inparam, [out] hyper outparam, [inout] hyper inoutparam);
-    unsigned hyper uHyperFunc( [in] unsigned hyper inparam, [out] unsigned hyper outparam, [inout] unsigned hyper inoutparam);
+    hyper hyperFunc( [in] hyper inparam, [out] hyper outparam, [inout] hyper inoutparam); 
+    unsigned hyper uHyperFunc( [in] unsigned hyper inparam, [out] unsigned hyper outparam, [inout] unsigned hyper inoutparam); 
 
-    float floatFunc( [in] float inparam, [out] float outparam, [inout] float inoutparam);
-    double doubleFunc( [in] double inparam, [out] double outparam, [inout] double inoutparam);
-    char charFunc( [in] char inparam, [out] char outparam, [inout] char inoutparam);
-    string stringFunc( [in] string inparam, [out] string outparam, [inout] string inoutparam);
-    byte byteFunc( [in] byte inparam, [out] byte outparam, [inout] byte inoutparam);
+    float floatFunc( [in] float inparam, [out] float outparam, [inout] float inoutparam); 
+    double doubleFunc( [in] double inparam, [out] double outparam, [inout] double inoutparam); 
+    char charFunc( [in] char inparam, [out] char outparam, [inout] char inoutparam); 
+    string stringFunc( [in] string inparam, [out] string outparam, [inout] string inoutparam); 
+    byte byteFunc( [in] byte inparam, [out] byte outparam, [inout] byte inoutparam); 
 
-    type typeFunc( [in] type inparam, [out] type outparam, [inout] type inoutparam);
-    any anyFunc( [in] any inparam, [out] any outparam, [inout] any inoutparam);
+    type typeFunc( [in] type inparam, [out] type outparam, [inout] type inoutparam); 
+    any anyFunc( [in] any inparam, [out] any outparam, [inout] any inoutparam); 
 };
 
 
 interface XTestComplexTypes : XBase
 {
-    Error enumFunc( [in] Error inparam, [out] Error outparam, [inout] Error inoutparam);
+    Error enumFunc( [in] Error inparam, [out] Error outparam, [inout] Error inoutparam); 
 
-    BaseStruct structFunc( [in] ::idlc::test::BaseStruct inparam, [out] idlc::test::BaseStruct outparam, [inout] BaseStruct inoutparam);
+    BaseStruct structFunc( [in] ::idlc::test::BaseStruct inparam, [out] idlc::test::BaseStruct outparam, [inout] BaseStruct inoutparam); 
 };
 
 };
diff --git a/idlc/test/service.idl b/idlc/test/service.idl
index 5a962d8fe948..121d5f5402fe 100644
--- a/idlc/test/service.idl
+++ b/idlc/test/service.idl
@@ -11,10 +11,10 @@ exception bla
 
 service IdlTest
 {
-//  [property] bla p0;
+//	[property] bla p0;
     [property] short p1;
     [optional, property] unsigned short p2;
-
+    
     [maybevoid, property] long p3;
     [bound, property] unsigned long p4;
 
@@ -34,7 +34,7 @@ service IdlTest
 service BetterIdlTest
 {
     service IdlTest;
-
+    
     interface XTestBaseTypes;
     [optional] interface ::idlc::test::XTestComplexTypes;
 };
diff --git a/idlc/test/singleton.idl b/idlc/test/singleton.idl
index a4b2590c726a..2754402ada5c 100644
--- a/idlc/test/singleton.idl
+++ b/idlc/test/singleton.idl
@@ -11,10 +11,10 @@ exception bla
 
 service IdlTest
 {
-//  [property] bla p0;
+//	[property] bla p0;
     [property] short p1;
     [optional, property] unsigned short p2;
-
+    
     [maybevoid, property] long p3;
     [bound, property] unsigned long p4;
 
diff --git a/idlc/test/struct.idl b/idlc/test/struct.idl
index 887b45c7859b..f87cd504af72 100644
--- a/idlc/test/struct.idl
+++ b/idlc/test/struct.idl
@@ -13,7 +13,7 @@ module test
 typedef sequence< long > Id;
 //struct Bla
 //{
-//  long bla;
+//	long bla;
 //};
 
 /** bla
@@ -24,46 +24,46 @@ struct BaseStruct
     Id Id;
 
     /// a short  member
-    short   m1;
+    short  	m1;
 
     /// a unsigned short  member
-    unsigned short  m2;
+    unsigned short 	m2;
 
     /// a long member
-    long    m3;
+    long 	m3;
 
     /// a unsigned long  member
-    unsigned long   m4;
+    unsigned long 	m4;
 
     /// a hyper member
-    hyper   m5;
+    hyper 	m5;
 
     /// a unsigned hyper  member
-    unsigned hyper  m6;
+    unsigned hyper 	m6;
 
     /// a string member
-    string  m7;
+    string 	m7;
 
     /// a byte member
-    byte    m8;
+    byte	m8;
 
     /// a type member
-    type    m9;
+    type 	m9;
 
     /// a float member
-    float   m10;
+    float 	m10;
 
     /// a double member
-    double  m11;
+    double 	m11;
 
     /// a char member
-    char    m12;
+    char 	m12;
 
     /// a boolean member
-    boolean m13;
+    boolean	m13;
 
     /// a any member
-    any     m14;
+    any 	m14;
 };
 
 interface XTestBaseTypes;
@@ -72,22 +72,22 @@ typedef sequence< long > LongSeq;
 
 typedef sequence< LongSeq > LongSeqSeq;
 
-/** TestStruct deinfes a struct which inherits
-    from the base strcut type BaseStruct.
+/** TestStruct deinfes a struct which inherits 
+    from the base strcut type BaseStruct. 
 */
 struct TestStruct : BaseStruct
 {
     /// a sequence< long > member
-    sequence< long >    ms1;
+    sequence< long > 	ms1;
 
     /// a sequence< sequence< long > > member
-    sequence< sequence< long > >    ms2;
+    sequence< sequence< long > > 	ms2;
 
     /// a long array member with dimesion 5,10
-//  long            ms3[5][10];
+//	long			ms3[5][10];
 
     /// a string array member with dimension 4,8
-//  long[5][10]     ms4;
+//	long[5][10]		ms4;
 
     /// an interface member
     XTestBaseTypes ms5;
diff --git a/idlc/test/typelookup.idl b/idlc/test/typelookup.idl
index ba1b6f29e8f3..315787744a31 100644
--- a/idlc/test/typelookup.idl
+++ b/idlc/test/typelookup.idl
@@ -22,40 +22,40 @@ module test
 struct BaseStruct
 {
     /// a long member
-    long    m1;
+    long 	m1;
     /// a string member
-    string  m2;
+    string 	m2;
     /// a byte member
-    byte    m3;
+    byte	m3;
     /// a type member
-    type    m4;
+    type 	m4;
     /// a enum member, Error in moudle idlc::test
-    Error   m5;
+    Error	m5;
     /// a typedef member, global Error (typedef short)
-    ::Error m6;
+    ::Error	m6;
     /// a typedef member, Error in moudle idlc (typedef long)
-    ::idlc::Error   m7;
+    ::idlc::Error	m7;
     /// a typedef member, Error in moudle idlc (typedef long)
-    idlc::Error m8;
+    idlc::Error	m8;	
     /// a enum member, Error in moudle idlc::test
-    test::Error m9;
+    test::Error	m9;	
 };
 
-/** TestStruct deinfes a struct which inherits
-    from the base strcut type BaseStruct.
+/** TestStruct deinfes a struct which inherits 
+    from the base strcut type BaseStruct. 
 */
 struct TestStruct : BaseStruct
 {
     /// a short member
-    short           ms1;
+    short 			ms1;
     /// a hyper member
-    hyper           ms2;
+    hyper			ms2;
     /// a sequence<long> member
-    sequence< long >    ms3;
+    sequence< long > 	ms3;
     /// a long array member with dimesion 5,10
-    long            ms4[5][10];
+    long			ms4[5][10];
     /// a string array member with dimension 4,8
-    long[5][10]     ms5;
+    long[5][10]		ms5;
 };
 
 }; // test
diff --git a/io/inc/pch/precompiled_io.cxx b/io/inc/pch/precompiled_io.cxx
index aebb139d4ebd..0dfe5cee565b 100644
--- a/io/inc/pch/precompiled_io.cxx
+++ b/io/inc/pch/precompiled_io.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/io/inc/pch/precompiled_io.hxx b/io/inc/pch/precompiled_io.hxx
index 0c959b5c8712..109bd0862e19 100644
--- a/io/inc/pch/precompiled_io.hxx
+++ b/io/inc/pch/precompiled_io.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx
index e8beb3f4a63a..2191c33c703b 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -71,8 +71,8 @@ namespace io_TextInputStream
 typedef WeakImplHelper3< XTextInputStream, XActiveDataSink, XServiceInfo > TextInputStreamHelper;
 class OCommandEnvironment;
 
-#define INITIAL_UNICODE_BUFFER_CAPACITY     0x100
-#define READ_BYTE_COUNT                     0x100
+#define INITIAL_UNICODE_BUFFER_CAPACITY		0x100
+#define READ_BYTE_COUNT						0x100
 
 class OTextInputStream : public TextInputStreamHelper
 {
@@ -81,9 +81,9 @@ class OTextInputStream : public TextInputStreamHelper
     // Encoding
     OUString mEncoding;
     sal_Bool mbEncodingInitialized;
-    rtl_TextToUnicodeConverter  mConvText2Unicode;
-    rtl_TextToUnicodeContext    mContextText2Unicode;
-    Sequence<sal_Int8>          mSeqSource;
+    rtl_TextToUnicodeConverter 	mConvText2Unicode;
+    rtl_TextToUnicodeContext   	mContextText2Unicode;
+    Sequence<sal_Int8>			mSeqSource;
 
     // Internal buffer for characters that are already converted successfully
     sal_Unicode* mpBuffer;
@@ -92,40 +92,40 @@ class OTextInputStream : public TextInputStreamHelper
     sal_Bool mbReachedEOF;
 
     void implResizeBuffer( void );
-    OUString implReadString( const Sequence< sal_Unicode >& Delimiters,
-        sal_Bool bRemoveDelimiter, sal_Bool bFindLineEnd )
+    OUString implReadString( const Sequence< sal_Unicode >& Delimiters, 
+        sal_Bool bRemoveDelimiter, sal_Bool bFindLineEnd ) 
             throw(IOException, RuntimeException);
     sal_Int32 implReadNext() throw(IOException, RuntimeException);
-
+    
 public:
     OTextInputStream();
     virtual ~OTextInputStream();
 
     // Methods XTextInputStream
-    virtual OUString SAL_CALL readLine(  )
+    virtual OUString SAL_CALL readLine(  ) 
         throw(IOException, RuntimeException);
-    virtual OUString SAL_CALL readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool bRemoveDelimiter )
+    virtual OUString SAL_CALL readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool bRemoveDelimiter ) 
         throw(IOException, RuntimeException);
-    virtual sal_Bool SAL_CALL isEOF(  )
+    virtual sal_Bool SAL_CALL isEOF(  ) 
         throw(IOException, RuntimeException);
     virtual void SAL_CALL setEncoding( const OUString& Encoding ) throw(RuntimeException);
 
     // Methods XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
         throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException);
-    virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
+    virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) 
         throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException);
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) 
         throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException);
-    virtual sal_Int32 SAL_CALL available(  )
+    virtual sal_Int32 SAL_CALL available(  ) 
         throw(NotConnectedException, IOException, RuntimeException);
-    virtual void SAL_CALL closeInput(  )
+    virtual void SAL_CALL closeInput(  ) 
         throw(NotConnectedException, IOException, RuntimeException);
 
     // Methods XActiveDataSink
-    virtual void SAL_CALL setInputStream( const Reference< XInputStream >& aStream )
+    virtual void SAL_CALL setInputStream( const Reference< XInputStream >& aStream ) 
         throw(RuntimeException);
-    virtual Reference< XInputStream > SAL_CALL getInputStream()
+    virtual Reference< XInputStream > SAL_CALL getInputStream() 
         throw(RuntimeException);
 
     // Methods XServiceInfo
@@ -165,20 +165,20 @@ void OTextInputStream::implResizeBuffer( void )
 //===========================================================================
 // XTextInputStream
 
-OUString OTextInputStream::readLine(  )
+OUString OTextInputStream::readLine(  ) 
     throw(IOException, RuntimeException)
 {
     static Sequence< sal_Unicode > aDummySeq;
     return implReadString( aDummySeq, sal_True, sal_True );
 }
 
-OUString OTextInputStream::readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool )
+OUString OTextInputStream::readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool ) 
         throw(IOException, RuntimeException)
 {
     return implReadString( Delimiters, sal_True, sal_False );
 }
 
-sal_Bool OTextInputStream::isEOF()
+sal_Bool OTextInputStream::isEOF() 
     throw(IOException, RuntimeException)
 {
     sal_Bool bRet = sal_False;
@@ -188,8 +188,8 @@ sal_Bool OTextInputStream::isEOF()
 }
 
 
-OUString OTextInputStream::implReadString( const Sequence< sal_Unicode >& Delimiters,
-                                           sal_Bool bRemoveDelimiter, sal_Bool bFindLineEnd )
+OUString OTextInputStream::implReadString( const Sequence< sal_Unicode >& Delimiters, 
+                                           sal_Bool bRemoveDelimiter, sal_Bool bFindLineEnd ) 
         throw(IOException, RuntimeException)
 {
     OUString aRetStr;
@@ -232,9 +232,9 @@ OUString OTextInputStream::implReadString( const Sequence< sal_Unicode >& Delimi
                 break;
         }
 
-        // Now there should be characters available
+        // Now there should be characters available 
         // (otherwise the loop should have been breaked before)
-        sal_Unicode c = mpBuffer[ nBufferReadPos++ ];
+        sal_Unicode	c = mpBuffer[ nBufferReadPos++ ];
 
         if( bFindLineEnd )
         {
@@ -286,7 +286,7 @@ OUString OTextInputStream::implReadString( const Sequence< sal_Unicode >& Delimi
         aRetStr = OUString( mpBuffer, nCopyLen );
 
     // Copy rest of buffer
-    memmove( mpBuffer, mpBuffer + nBufferReadPos,
+    memmove( mpBuffer, mpBuffer + nBufferReadPos, 
         (mnCharsInBuffer - nBufferReadPos) * sizeof( sal_Unicode ) );
     mnCharsInBuffer -= nBufferReadPos;
 
@@ -294,7 +294,7 @@ OUString OTextInputStream::implReadString( const Sequence< sal_Unicode >& Delimi
 }
 
 
-sal_Int32 OTextInputStream::implReadNext()
+sal_Int32 OTextInputStream::implReadNext() 
         throw(IOException, RuntimeException)
 {
     sal_Int32 nFreeBufferSize = mnBufferSize - mnCharsInBuffer;
@@ -320,7 +320,7 @@ sal_Int32 OTextInputStream::implReadNext()
             const sal_Int8 *pbSource = mSeqSource.getConstArray();
 
             // All invalid characters are transformed to the unicode undefined char
-            nTargetCount += rtl_convertTextToUnicode(
+            nTargetCount += rtl_convertTextToUnicode(   
                                 mConvText2Unicode,
                                 mContextText2Unicode,
                                 (const sal_Char*) &( pbSource[nSourceCount] ),
@@ -333,15 +333,15 @@ sal_Int32 OTextInputStream::implReadNext()
                                 &uiInfo,
                                 &nSrcCvtBytes );
             nSourceCount += nSrcCvtBytes;
-
+                            
             sal_Bool bCont = sal_False;
-            if( uiInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL )
+            if( uiInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL ) 
             {
                 implResizeBuffer();
                 bCont = sal_True;
             }
 
-            if( uiInfo & RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL )
+            if( uiInfo & RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL ) 
             {
                 // read next byte
                 static Sequence< sal_Int8 > aOneByteSeq( 1 );
@@ -382,12 +382,12 @@ sal_Int32 OTextInputStream::implReadNext()
     }
 }
 
-void OTextInputStream::setEncoding( const OUString& Encoding )
+void OTextInputStream::setEncoding( const OUString& Encoding ) 
     throw(RuntimeException)
 {
     OString aOEncodingStr = OUStringToOString( Encoding, RTL_TEXTENCODING_ASCII_US );
     rtl_TextEncoding encoding = rtl_getTextEncodingFromMimeCharset( aOEncodingStr.getStr() );
-    if( RTL_TEXTENCODING_DONTKNOW == encoding )
+    if( RTL_TEXTENCODING_DONTKNOW == encoding ) 
         return;
 
     mbEncodingInitialized = true;
@@ -399,7 +399,7 @@ void OTextInputStream::setEncoding( const OUString& Encoding )
 //===========================================================================
 // XInputStream
 
-sal_Int32 OTextInputStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+sal_Int32 OTextInputStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
     throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
 {
     return mxStream->readBytes( aData, nBytesToRead );
@@ -417,13 +417,13 @@ void OTextInputStream::skipBytes( sal_Int32 nBytesToSkip )
     mxStream->skipBytes( nBytesToSkip );
 }
 
-sal_Int32 OTextInputStream::available(  )
+sal_Int32 OTextInputStream::available(  ) 
     throw(NotConnectedException, IOException, RuntimeException)
 {
     return mxStream->available();
 }
 
-void OTextInputStream::closeInput(  )
+void OTextInputStream::closeInput(  ) 
     throw(NotConnectedException, IOException, RuntimeException)
 {
     mxStream->closeInput();
@@ -433,7 +433,7 @@ void OTextInputStream::closeInput(  )
 //===========================================================================
 // XActiveDataSink
 
-void OTextInputStream::setInputStream( const Reference< XInputStream >& aStream )
+void OTextInputStream::setInputStream( const Reference< XInputStream >& aStream ) 
     throw(RuntimeException)
 {
     mxStream = aStream;
@@ -481,11 +481,11 @@ sal_Bool OTextInputStream::supportsService(const OUString& ServiceName) throw()
 {
     Sequence< OUString > aSNL = getSupportedServiceNames();
     const OUString * pArray = aSNL.getConstArray();
-
+    
     for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
             return sal_True;
-
+        
     return sal_False;
 }
 
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx
index f71e7f216034..fa6aecde2d00 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -75,8 +75,8 @@ class OTextOutputStream : public TextOutputStreamHelper
     // Encoding
     OUString mEncoding;
     sal_Bool mbEncodingInitialized;
-    rtl_UnicodeToTextConverter  mConvUnicode2Text;
-    rtl_UnicodeToTextContext    mContextUnicode2Text;
+    rtl_UnicodeToTextConverter 	mConvUnicode2Text;
+    rtl_UnicodeToTextContext   	mContextUnicode2Text;
 
     Sequence<sal_Int8> implConvert( const OUString& rSource );
 
@@ -85,23 +85,23 @@ public:
     ~OTextOutputStream();
 
     // Methods XTextOutputStream
-    virtual void SAL_CALL writeString( const OUString& aString )
+    virtual void SAL_CALL writeString( const OUString& aString ) 
         throw(IOException, RuntimeException);
-    virtual void SAL_CALL setEncoding( const OUString& Encoding )
+    virtual void SAL_CALL setEncoding( const OUString& Encoding ) 
         throw(RuntimeException);
 
     // Methods XOutputStream
-    virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& aData )
+    virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& aData ) 
         throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException);
-    virtual void SAL_CALL flush(  )
+    virtual void SAL_CALL flush(  ) 
         throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException);
-    virtual void SAL_CALL closeOutput(  )
+    virtual void SAL_CALL closeOutput(  ) 
         throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException);
 
     // Methods XActiveDataSource
-    virtual void SAL_CALL setOutputStream( const Reference< XOutputStream >& aStream )
+    virtual void SAL_CALL setOutputStream( const Reference< XOutputStream >& aStream ) 
         throw(RuntimeException);
-    virtual Reference< XOutputStream > SAL_CALL getOutputStream(  )
+    virtual Reference< XOutputStream > SAL_CALL getOutputStream(  ) 
         throw(RuntimeException);
 
     // Methods XServiceInfo
@@ -131,7 +131,7 @@ Sequence<sal_Int8> OTextOutputStream::implConvert( const OUString& rSource )
 
     sal_Size nTargetCount = 0;
     sal_Size nSourceCount = 0;
-
+    
     sal_uInt32 uiInfo;
     sal_Size nSrcCvtChars;
 
@@ -142,7 +142,7 @@ Sequence<sal_Int8> OTextOutputStream::implConvert( const OUString& rSource )
 
     Sequence<sal_Int8> seqText( nSeqSize );
     sal_Char *pTarget = (sal_Char *) seqText.getArray();
-    while( sal_True )
+    while( sal_True ) 
     {
         nTargetCount += rtl_convertUnicodeToText(
                                     mConvUnicode2Text,
@@ -156,8 +156,8 @@ Sequence<sal_Int8> OTextOutputStream::implConvert( const OUString& rSource )
                                     &uiInfo,
                                     &nSrcCvtChars);
         nSourceCount += nSrcCvtChars;
-
-        if( uiInfo & RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL )
+        
+        if( uiInfo & RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL ) 
         {
             nSeqSize *= 2;
             seqText.realloc( nSeqSize );  // double array size
@@ -176,7 +176,7 @@ Sequence<sal_Int8> OTextOutputStream::implConvert( const OUString& rSource )
 //===========================================================================
 // XTextOutputStream
 
-void OTextOutputStream::writeString( const OUString& aString )
+void OTextOutputStream::writeString( const OUString& aString ) 
     throw(IOException, RuntimeException)
 {
     if( !mbEncodingInitialized )
@@ -191,35 +191,35 @@ void OTextOutputStream::writeString( const OUString& aString )
     mxStream->writeBytes( aByteSeq );
 }
 
-void OTextOutputStream::setEncoding( const OUString& Encoding )
+void OTextOutputStream::setEncoding( const OUString& Encoding ) 
     throw(RuntimeException)
 {
     OString aOEncodingStr = OUStringToOString( Encoding, RTL_TEXTENCODING_ASCII_US );
     rtl_TextEncoding encoding = rtl_getTextEncodingFromMimeCharset( aOEncodingStr.getStr() );
-    if( RTL_TEXTENCODING_DONTKNOW == encoding )
+    if( RTL_TEXTENCODING_DONTKNOW == encoding ) 
         return;
 
     mbEncodingInitialized = true;
-    mConvUnicode2Text   = rtl_createUnicodeToTextConverter( encoding );
+    mConvUnicode2Text 	= rtl_createUnicodeToTextConverter( encoding );
     mContextUnicode2Text = rtl_createUnicodeToTextContext( mConvUnicode2Text );
     mEncoding = Encoding;
 }
 
 //===========================================================================
 // XOutputStream
-void OTextOutputStream::writeBytes( const Sequence< sal_Int8 >& aData )
+void OTextOutputStream::writeBytes( const Sequence< sal_Int8 >& aData ) 
     throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
 {
     mxStream->writeBytes( aData );
 }
 
-void OTextOutputStream::flush(  )
+void OTextOutputStream::flush(  ) 
     throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
 {
     mxStream->flush();
 }
 
-void OTextOutputStream::closeOutput(  )
+void OTextOutputStream::closeOutput(  ) 
     throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
 {
     mxStream->closeOutput();
@@ -229,7 +229,7 @@ void OTextOutputStream::closeOutput(  )
 //===========================================================================
 // XActiveDataSource
 
-void OTextOutputStream::setOutputStream( const Reference< XOutputStream >& aStream )
+void OTextOutputStream::setOutputStream( const Reference< XOutputStream >& aStream ) 
     throw(RuntimeException)
 {
     mxStream = aStream;
@@ -278,11 +278,11 @@ sal_Bool OTextOutputStream::supportsService(const OUString& ServiceName) throw()
 {
     Sequence< OUString > aSNL = getSupportedServiceNames();
     const OUString * pArray = aSNL.getConstArray();
-
+    
     for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
             return sal_True;
-
+        
     return sal_False;
 }
 
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx
index 27a298bf5c7f..61efcb724e12 100644
--- a/io/source/acceptor/acc_pipe.cxx
+++ b/io/source/acceptor/acc_pipe.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,14 +47,14 @@ namespace io_acceptor
 {
 
     typedef WeakImplHelper1< XConnection > MyPipeConnection;
-
+    
     class PipeConnection :
         public MyPipeConnection
     {
     public:
         PipeConnection( const OUString &sConnectionDescription);
         ~PipeConnection();
-
+        
         virtual sal_Int32 SAL_CALL read( Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead )
             throw(::com::sun::star::io::IOException,
                   ::com::sun::star::uno::RuntimeException);
@@ -75,7 +75,7 @@ namespace io_acceptor
         OUString m_sDescription;
     };
 
-
+    
 
     PipeConnection::PipeConnection( const OUString &sConnectionDescription) :
         m_nStatus( 0 ),
@@ -95,7 +95,7 @@ namespace io_acceptor
     {
         g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
     }
-
+    
     sal_Int32 PipeConnection::read( Sequence < sal_Int8 > & aReadBytes , sal_Int32 nBytesToRead )
         throw(::com::sun::star::io::IOException,
               ::com::sun::star::uno::RuntimeException)
@@ -130,7 +130,7 @@ namespace io_acceptor
     }
 
     void PipeConnection::flush( )
-        throw(  ::com::sun::star::io::IOException,
+        throw(	::com::sun::star::io::IOException,
                 ::com::sun::star::uno::RuntimeException)
     {
     }
@@ -150,9 +150,9 @@ namespace io_acceptor
     {
         return m_sDescription;
     }
-
+    
     /***************
-     * PipeAcceptor
+     * PipeAcceptor 
      **************/
     PipeAcceptor::PipeAcceptor( const OUString &sPipeName , const OUString & sConnectionDescription) :
         m_sPipeName( sPipeName ),
diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx
index de362b1f51d2..3c4f7eacd4ec 100644
--- a/io/source/acceptor/acc_socket.cxx
+++ b/io/source/acceptor/acc_socket.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -60,7 +60,7 @@ namespace io_acceptor {
     template<class T>
     struct ReferenceEqual
     {
-        sal_Bool operator () (const ::com::sun::star::uno::Reference<T> & op1,
+        sal_Bool operator () (const ::com::sun::star::uno::Reference<T> & op1, 
                               const ::com::sun::star::uno::Reference<T> & op2) const
         {
             return op1.get() == op2.get();
@@ -68,21 +68,21 @@ namespace io_acceptor {
     };
 
 
-    typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>,
-                             ReferenceHash< ::com::sun::star::io::XStreamListener>,
+    typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, 
+                             ReferenceHash< ::com::sun::star::io::XStreamListener>, 
                              ReferenceEqual< ::com::sun::star::io::XStreamListener> >
             XStreamListener_hash_set;
 
 
-    class SocketConnection : public ::cppu::WeakImplHelper2<
+    class SocketConnection : public ::cppu::WeakImplHelper2< 
         ::com::sun::star::connection::XConnection,
         ::com::sun::star::connection::XConnectionBroadcaster>
-
+    
     {
     public:
         SocketConnection( const OUString & sConnectionDescription );
         ~SocketConnection();
-
+        
         virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes,
                                          sal_Int32 nBytesToRead )
             throw(::com::sun::star::io::IOException,
@@ -100,14 +100,14 @@ namespace io_acceptor {
             throw(::com::sun::star::uno::RuntimeException);
 
         // XConnectionBroadcaster
-        virtual void SAL_CALL addStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener)
+        virtual void SAL_CALL addStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) 
             throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removeStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener)
+        virtual void SAL_CALL removeStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) 
             throw(::com::sun::star::uno::RuntimeException);
 
     public:
         void completeConnectionString();
-
+        
         ::osl::StreamSocket m_socket;
         ::osl::SocketAddr m_addr;
         oslInterlockedCount m_nStatus;
@@ -127,7 +127,7 @@ namespace io_acceptor {
 
         {
             ::osl::MutexGuard guard(pCon->_mutex);
-            if(!*notified)
+            if(!*notified) 
             {
                 *notified = sal_True;
                 listeners = pCon->_listeners;
@@ -165,7 +165,7 @@ namespace io_acceptor {
         xStreamListener->closed();
     }
 
-
+    
     SocketConnection::SocketConnection( const OUString &sConnectionDescription) :
         m_nStatus( 0 ),
         m_sDescription( sConnectionDescription ),
@@ -194,7 +194,7 @@ namespace io_acceptor {
         buf.append( (sal_Int32) m_socket.getPeerPort() );
         buf.appendAscii( ",peerHost=" );
         buf.append( m_socket.getPeerHost( ) );
-
+        
         buf.appendAscii( ",localPort=" );
         buf.append( (sal_Int32) m_socket.getLocalPort() );
         buf.appendAscii( ",localHost=" );
@@ -222,15 +222,15 @@ namespace io_acceptor {
             if(i != nBytesToRead)
             {
                 OUString message(RTL_CONSTASCII_USTRINGPARAM("acc_socket.cxx:SocketConnection::read: error - "));
-                message +=  m_socket.getErrorAsString();
-
+                message +=	m_socket.getErrorAsString();
+                
                 IOException ioException(message, Reference<XInterface>(static_cast<XConnection *>(this)));
-
+                
                 Any any;
                 any <<= ioException;
-
+                
                 notifyListeners(this, &_error, callError(any));
-
+                
                 throw ioException;
             }
 
@@ -261,12 +261,12 @@ namespace io_acceptor {
             {
                 OUString message(RTL_CONSTASCII_USTRINGPARAM("acc_socket.cxx:SocketConnection::write: error - "));
                 message += m_socket.getErrorAsString();
-
+                
                 IOException ioException(message, Reference<XInterface>(static_cast<XConnection *>(this)));
-
+                
                 Any any;
                 any <<= ioException;
-
+                
                 notifyListeners(this, &_error, callError(any));
 
                 throw ioException;
@@ -360,7 +360,7 @@ namespace io_acceptor {
                 message.makeStringAndClear(), Reference< XInterface > () );
         }
         m_socket.setOption( osl_Socket_OptionReuseAddr, 1);
-
+        
         if(! m_socket.bind(m_addr) )
         {
             OUStringBuffer message( 128 );
@@ -370,13 +370,13 @@ namespace io_acceptor {
                 message.makeStringAndClear(),
                 Reference<XInterface>());
         }
-
+        
         if(! m_socket.listen() )
         {
             OUStringBuffer message( 128 );
             message.appendAscii( "acc_socket.cxx:SocketAcceptor::init - error - can't listen on " );
             message.append( m_sSocketName ).appendAscii( ":" ).append( (sal_Int32) m_nPort);
-            throw ConnectionSetupException( message.makeStringAndClear(),Reference<XInterface>() );
+            throw ConnectionSetupException(	message.makeStringAndClear(),Reference<XInterface>() );
         }
     }
 
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index 3edca9d0841e..487f173ba24d 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/io/source/acceptor/acceptor.hxx b/io/source/acceptor/acceptor.hxx
index 963adc1f1460..ff031028e1d8 100644
--- a/io/source/acceptor/acceptor.hxx
+++ b/io/source/acceptor/acceptor.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,19 +40,19 @@ namespace io_acceptor {
     {
     public:
         PipeAcceptor( const ::rtl::OUString &sPipeName , const ::rtl::OUString &sConnectionDescription );
-
+        
         void init();
         ::com::sun::star::uno::Reference < ::com::sun::star::connection::XConnection >  accept(  );
-
+        
         void stopAccepting();
-
+        
         ::osl::Mutex m_mutex;
         ::osl::Pipe m_pipe;
         ::rtl::OUString m_sPipeName;
         ::rtl::OUString m_sConnectionDescription;
         sal_Bool m_bClosed;
     };
-
+    
     class SocketAcceptor
     {
     public:
@@ -65,7 +65,7 @@ namespace io_acceptor {
         ::com::sun::star::uno::Reference < ::com::sun::star::connection::XConnection > accept();
 
         void stopAccepting();
-
+        
         ::osl::SocketAddr m_addr;
         ::osl::AcceptorSocket m_socket;
         ::rtl::OUString m_sSocketName;
@@ -74,7 +74,7 @@ namespace io_acceptor {
         sal_Bool m_bTcpNoDelay;
         sal_Bool m_bClosed;
     };
-
+    
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/acceptor/acceptor.xml b/io/source/acceptor/acceptor.xml
index 2a2d3a76afb2..920b37ecedf2 100644
--- a/io/source/acceptor/acceptor.xml
+++ b/io/source/acceptor/acceptor.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   acceptor.uno    </module-name>
+    <module-name>	acceptor.uno	</module-name>
     <component-description>
         <author> Joerg Budischewski </author>
-        <name>  com.sun.star.comp.io.Acceptor </name>
+        <name>	com.sun.star.comp.io.Acceptor </name>
         <description>
             This component allows
             to accept an connect-attempt from a different process.
         </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.connection.Acceptor    </supported-service>
-        <service-dependency>    ... </service-dependency>
-        <type>   com.sun.star.connection.XAcceptor                  </type>
+        <supported-service>	com.sun.star.connection.Acceptor	</supported-service>
+        <service-dependency>	...	</service-dependency>
+        <type>	 com.sun.star.connection.XAcceptor                	</type>
         <type>   com.sun.star.connection.XConnectionBroadcaster     </type>
-        <type>   com.sun.star.io.UnexpectedEOFException             </type>
-        <type>   com.sun.star.io.WrongFormatException               </type>
-        <type>   com.sun.star.lang.XComponent                       </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory            </type>
-        <type>   com.sun.star.lang.XServiceInfo                     </type>
-        <type>   com.sun.star.lang.XTypeProvider                    </type>
-        <type>   com.sun.star.lang.IllegalArgumentException         </type>
-        <type>   com.sun.star.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.registry.XImplementationRegistration  </type>
-        <type>   com.sun.star.test.XSimpleTest                      </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
+        <type>	 com.sun.star.io.UnexpectedEOFException            	</type>
+        <type>	 com.sun.star.io.WrongFormatException              	</type>
+        <type>	 com.sun.star.lang.XComponent                      	</type>
+        <type>	 com.sun.star.lang.XMultiServiceFactory            	</type>
+        <type>	 com.sun.star.lang.XSingleServiceFactory           	</type>
+        <type>	 com.sun.star.lang.XServiceInfo                    	</type>
+        <type>	 com.sun.star.lang.XTypeProvider                   	</type>
+        <type>	 com.sun.star.lang.IllegalArgumentException        	</type>
+        <type>	 com.sun.star.registry.XRegistryKey                	</type>
+        <type>	 com.sun.star.registry.XImplementationRegistration	</type>
+        <type>	 com.sun.star.test.XSimpleTest                     	</type>
+        <type>	 com.sun.star.lang.XSingleComponentFactory         	</type>
+        <type>	 com.sun.star.uno.XComponentContext                	</type>
+        <type>	 com.sun.star.uno.TypeClass                        	</type>
+        <type>	 com.sun.star.uno.XWeak                            	</type>
+        <type>	 com.sun.star.uno.XAggregation                      </type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu2		</runtime-module-dependency>
+    <runtime-module-dependency>	sal2		</runtime-module-dependency>
 </module-description>
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index 4ba32fc54a26..da55d8417337 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/io/source/connector/connector.hxx b/io/source/connector/connector.hxx
index ed4015ded0a5..fd53b5120df5 100644
--- a/io/source/connector/connector.hxx
+++ b/io/source/connector/connector.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@
 namespace stoc_connector
 {
     extern rtl_StandardModuleCount g_moduleCount;
-
+    
     template<class T>
     struct ReferenceHash
     {
@@ -53,26 +53,26 @@ namespace stoc_connector
     template<class T>
     struct ReferenceEqual
     {
-        sal_Bool operator () (const ::com::sun::star::uno::Reference<T> & op1,
+        sal_Bool operator () (const ::com::sun::star::uno::Reference<T> & op1, 
                               const ::com::sun::star::uno::Reference<T> & op2) const
         {
             return op1.get() == op2.get();
         }
     };
 
-    typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>,
-                             ReferenceHash< ::com::sun::star::io::XStreamListener>,
+    typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, 
+                             ReferenceHash< ::com::sun::star::io::XStreamListener>, 
                              ReferenceEqual< ::com::sun::star::io::XStreamListener> >
             XStreamListener_hash_set;
 
     class PipeConnection :
         public ::cppu::WeakImplHelper1< ::com::sun::star::connection::XConnection >
-
+    
     {
     public:
         PipeConnection( const ::rtl::OUString &sConnectionDescription );
         virtual ~PipeConnection();
-
+        
         virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes,
                                          sal_Int32 nBytesToRead )
             throw(::com::sun::star::io::IOException,
@@ -96,12 +96,12 @@ namespace stoc_connector
 
     class SocketConnection :
         public ::cppu::WeakImplHelper2< ::com::sun::star::connection::XConnection, ::com::sun::star::connection::XConnectionBroadcaster >
-
+    
     {
     public:
         SocketConnection( const ::rtl::OUString & sConnectionDescription  );
         virtual ~SocketConnection();
-
+        
         virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes,
                                          sal_Int32 nBytesToRead )
             throw(::com::sun::star::io::IOException,
@@ -120,14 +120,14 @@ namespace stoc_connector
 
 
         // XConnectionBroadcaster
-        virtual void SAL_CALL addStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener)
+        virtual void SAL_CALL addStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) 
             throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removeStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener)
+        virtual void SAL_CALL removeStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) 
             throw(::com::sun::star::uno::RuntimeException);
 
     public:
         void completeConnectionString();
-
+        
         ::osl::ConnectorSocket m_socket;
         ::osl::SocketAddr m_addr;
         oslInterlockedCount m_nStatus;
diff --git a/io/source/connector/connectr.xml b/io/source/connector/connectr.xml
index cdeb0df7edec..5f324f7b9677 100644
--- a/io/source/connector/connectr.xml
+++ b/io/source/connector/connectr.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   connector.uno   </module-name>
+    <module-name>	connector.uno	</module-name>
     <component-description>
         <author> Joerg Budischewski </author>
-        <name>  com.sun.star.comp.io.Connector </name>
+        <name>	com.sun.star.comp.io.Connector </name>
         <description>
             This component allows
             to establish a connection to another process.
         </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.connection.Connector   </supported-service>
-        <service-dependency>    ... </service-dependency>
-        <type>   com.sun.star.connection.XConnector                         </type>
+        <supported-service>	com.sun.star.connection.Connector	</supported-service>
+        <service-dependency>	...	</service-dependency>
+        <type>	 com.sun.star.connection.XConnector                			</type>
         <type>   com.sun.star.connection.XConnectionBroadcaster                         </type>
-        <type>   com.sun.star.io.UnexpectedEOFException                     </type>
-        <type>   com.sun.star.io.WrongFormatException                           </type>
-        <type>   com.sun.star.lang.XComponent                               </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory                    </type>
-        <type>   com.sun.star.lang.XServiceInfo                                 </type>
-        <type>   com.sun.star.lang.XTypeProvider                                </type>
-        <type>   com.sun.star.lang.IllegalArgumentException                 </type>
-        <type>   com.sun.star.registry.XRegistryKey                         </type>
-        <type>   com.sun.star.registry.XImplementationRegistration          </type>
-        <type>   com.sun.star.test.XSimpleTest                              </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>   com.sun.star.uno.TypeClass                                 </type>
-        <type>   com.sun.star.uno.XWeak                                 </type>
-        <type>   com.sun.star.uno.XAggregation                              </type>
+        <type>	 com.sun.star.io.UnexpectedEOFException            			</type>
+        <type>	 com.sun.star.io.WrongFormatException              				</type>
+        <type>	 com.sun.star.lang.XComponent                      			</type>
+        <type>	 com.sun.star.lang.XMultiServiceFactory            	</type>
+        <type>	 com.sun.star.lang.XSingleServiceFactory           			</type>
+        <type>	 com.sun.star.lang.XServiceInfo                    				</type>
+        <type>	 com.sun.star.lang.XTypeProvider                   				</type>
+        <type>	 com.sun.star.lang.IllegalArgumentException        			</type>
+        <type>	 com.sun.star.registry.XRegistryKey                			</type>
+        <type>	 com.sun.star.registry.XImplementationRegistration 			</type>
+        <type>	 com.sun.star.test.XSimpleTest                     			</type>
+        <type>	 com.sun.star.lang.XSingleComponentFactory         	</type>
+        <type>	 com.sun.star.uno.XComponentContext                	</type>
+        <type>	 com.sun.star.uno.TypeClass                        			</type>
+        <type>	 com.sun.star.uno.XWeak                            		</type>
+        <type>	 com.sun.star.uno.XAggregation                      		</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper2 </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper2	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu2		</runtime-module-dependency>
+    <runtime-module-dependency>	sal2		</runtime-module-dependency>
 </module-description>
diff --git a/io/source/connector/ctr_pipe.cxx b/io/source/connector/ctr_pipe.cxx
index 3069d0523794..8a347a7a7c01 100644
--- a/io/source/connector/ctr_pipe.cxx
+++ b/io/source/connector/ctr_pipe.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ using namespace ::com::sun::star::connection;
 
 
 namespace stoc_connector {
-
+    
     PipeConnection::PipeConnection( const OUString & sConnectionDescription ) :
         m_nStatus( 0 ),
         m_sDescription( sConnectionDescription )
diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx
index 1fdd69429190..8d802eb92448 100644
--- a/io/source/connector/ctr_socket.cxx
+++ b/io/source/connector/ctr_socket.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,7 +48,7 @@ namespace stoc_connector {
 
         {
             ::osl::MutexGuard guard(pCon->_mutex);
-            if(!*notified)
+            if(!*notified) 
             {
                 *notified = sal_True;
                 listeners = pCon->_listeners;
@@ -87,7 +87,7 @@ namespace stoc_connector {
         xStreamListener->closed();
     }
 
-
+    
     SocketConnection::SocketConnection( const OUString &sConnectionDescription ) :
         m_nStatus( 0 ),
         m_sDescription( sConnectionDescription ),
@@ -108,7 +108,7 @@ namespace stoc_connector {
     {
         g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
     }
-
+    
     void SocketConnection::completeConnectionString()
     {
         sal_Int32 nPort;
@@ -128,7 +128,7 @@ namespace stoc_connector {
 
         m_sDescription += buf.makeStringAndClear();
     }
-
+    
     sal_Int32 SocketConnection::read( Sequence < sal_Int8 > & aReadBytes , sal_Int32 nBytesToRead )
             throw(::com::sun::star::io::IOException,
                   ::com::sun::star::uno::RuntimeException)
@@ -147,20 +147,20 @@ namespace stoc_connector {
             {
                 OUString message(RTL_CONSTASCII_USTRINGPARAM("ctr_socket.cxx:SocketConnection::read: error - "));
                 message += m_socket.getErrorAsString();
-
+                
                 IOException ioException(message, Reference<XInterface>(static_cast<XConnection *>(this)));
-
+                
                 Any any;
                 any <<= ioException;
-
+                
                 notifyListeners(this, &_error, callError(any));
-
+                
                 throw ioException;
             }
 
             return i;
         }
-        else
+        else 
         {
             OUString message(RTL_CONSTASCII_USTRINGPARAM("ctr_socket.cxx:SocketConnection::read: error - connection already closed"));
 
@@ -185,18 +185,18 @@ namespace stoc_connector {
             {
                 OUString message(RTL_CONSTASCII_USTRINGPARAM("ctr_socket.cxx:SocketConnection::write: error - "));
                 message += m_socket.getErrorAsString();
-
+                
                 IOException ioException(message, Reference<XInterface>(static_cast<XConnection *>(this)));
-
+                
                 Any any;
                 any <<= ioException;
-
+                
                 notifyListeners(this, &_error, callError(any));
 
                 throw ioException;
             }
         }
-        else
+        else 
         {
             OUString message(RTL_CONSTASCII_USTRINGPARAM("ctr_socket.cxx:SocketConnection::write: error - connection already closed"));
 
diff --git a/io/source/stm/factreg.cxx b/io/source/stm/factreg.cxx
index 9b9a8a68384b..215b943e31f6 100644
--- a/io/source/stm/factreg.cxx
+++ b/io/source/stm/factreg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,7 +65,7 @@ static struct ImplementationEntry g_entries[] =
     {
         ODataInputStream_CreateInstance, ODataInputStream_getImplementationName,
         ODataInputStream_getSupportedServiceNames, createSingleComponentFactory,
-        &g_moduleCount.modCnt, 0
+        &g_moduleCount.modCnt, 0 
     },
     {
         ODataOutputStream_CreateInstance, ODataOutputStream_getImplementationName,
@@ -75,7 +75,7 @@ static struct ImplementationEntry g_entries[] =
     {
         OObjectInputStream_CreateInstance, OObjectInputStream_getImplementationName,
         OObjectInputStream_getSupportedServiceNames, createSingleComponentFactory,
-        &g_moduleCount.modCnt, 0
+        &g_moduleCount.modCnt, 0 
     },
     {
         OObjectOutputStream_CreateInstance, OObjectOutputStream_getImplementationName,
@@ -85,15 +85,15 @@ static struct ImplementationEntry g_entries[] =
     {
         OMarkableInputStream_CreateInstance, OMarkableInputStream_getImplementationName,
         OMarkableInputStream_getSupportedServiceNames, createSingleComponentFactory,
-        &g_moduleCount.modCnt, 0
+        &g_moduleCount.modCnt, 0 
     },
     {
         OMarkableOutputStream_CreateInstance, OMarkableOutputStream_getImplementationName,
         OMarkableOutputStream_getSupportedServiceNames, createSingleComponentFactory,
-        &g_moduleCount.modCnt, 0
+        &g_moduleCount.modCnt, 0 
     },
     { 0, 0, 0, 0, 0, 0 }
-
+    
 };
 
 extern "C"
@@ -103,7 +103,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 {
     return g_moduleCount.canUnload( &g_moduleCount , pTime );
 }
-
+    
 //==================================================================================================
 void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
diff --git a/io/source/stm/factreg.hxx b/io/source/stm/factreg.hxx
index 56c097671c89..80cf2a9b4deb 100644
--- a/io/source/stm/factreg.hxx
+++ b/io/source/stm/factreg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,14 +30,14 @@
 namespace io_stm {
 
 extern rtl_StandardModuleCount g_moduleCount;
-
-// OPipeImpl
+    
+// OPipeImpl 
 Reference< XInterface > SAL_CALL OPipeImpl_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception);
-OUString    OPipeImpl_getImplementationName();
+OUString 	OPipeImpl_getImplementationName();
 Sequence<OUString> OPipeImpl_getSupportedServiceNames(void);
 
 Reference< XInterface > SAL_CALL ODataInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception);
-OUString    ODataInputStream_getImplementationName();
+OUString 	ODataInputStream_getImplementationName();
 Sequence<OUString> ODataInputStream_getSupportedServiceNames(void);
 
 Reference< XInterface > SAL_CALL ODataOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception);
@@ -49,7 +49,7 @@ OUString OMarkableOutputStream_getImplementationName();
 Sequence<OUString> OMarkableOutputStream_getSupportedServiceNames(void);
 
 Reference< XInterface > SAL_CALL OMarkableInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception);
-OUString    OMarkableInputStream_getImplementationName() ;
+OUString 	OMarkableInputStream_getImplementationName() ;
 Sequence<OUString> OMarkableInputStream_getSupportedServiceNames(void);
 
 Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw(Exception);
@@ -57,7 +57,7 @@ OUString OObjectOutputStream_getImplementationName();
 Sequence<OUString> OObjectOutputStream_getSupportedServiceNames(void);
 
 Reference< XInterface > SAL_CALL OObjectInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw(Exception);
-OUString    OObjectInputStream_getImplementationName() ;
+OUString 	OObjectInputStream_getImplementationName() ;
 Sequence<OUString> OObjectInputStream_getSupportedServiceNames(void);
 
 Reference< XInterface > SAL_CALL OPumpImpl_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception);
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx
index b5be8e855ba9..9e76659b5d9a 100644
--- a/io/source/stm/odata.cxx
+++ b/io/source/stm/odata.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -85,19 +85,19 @@ public:
     ~ODataInputStream();
 public: // XInputStream
     virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-                                                            throw ( NotConnectedException,
+                                                            throw (	NotConnectedException,
                                                                         BufferSizeExceededException,
                                                                         RuntimeException);
     virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
-                                                            throw ( NotConnectedException,
+                                                            throw (	NotConnectedException,
                                                                         BufferSizeExceededException,
                                                                         RuntimeException);
-    virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip)                 throw ( NotConnectedException,
+    virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) 				throw (	NotConnectedException,
                                                                         BufferSizeExceededException,
                                                                         RuntimeException);
-    virtual sal_Int32 SAL_CALL available(void)                          throw ( NotConnectedException,
+    virtual sal_Int32 SAL_CALL available(void) 							throw (	NotConnectedException,
                                                                         RuntimeException);
-    virtual void SAL_CALL closeInput(void)                          throw ( NotConnectedException,
+    virtual void SAL_CALL closeInput(void) 							throw (	NotConnectedException,
                                                                         RuntimeException);
 
 public: // XDataInputStream
@@ -132,9 +132,9 @@ public: // XServiceInfo
 
 protected:
 
-    Reference < XConnectable >  m_pred;
-    Reference < XConnectable >  m_succ;
-    Reference < XInputStream >  m_input;
+    Reference < XConnectable > 	m_pred;
+    Reference < XConnectable > 	m_succ;
+    Reference < XInputStream > 	m_input;
     sal_Bool m_bValidStream;
 };
 
@@ -145,7 +145,7 @@ ODataInputStream::~ODataInputStream()
 
 // XInputStream
 sal_Int32 ODataInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-    throw ( NotConnectedException,
+    throw (	NotConnectedException,
             BufferSizeExceededException,
             RuntimeException)
 {
@@ -164,7 +164,7 @@ sal_Int32 ODataInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBy
 }
 
 sal_Int32 ODataInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
-    throw ( NotConnectedException,
+    throw (	NotConnectedException,
             BufferSizeExceededException,
             RuntimeException)
 {
@@ -179,7 +179,7 @@ sal_Int32 ODataInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32
      return nRead;
 }
 void ODataInputStream::skipBytes(sal_Int32 nBytesToSkip)
-    throw ( NotConnectedException,
+    throw (	NotConnectedException,
             BufferSizeExceededException,
             RuntimeException)
 {
@@ -194,7 +194,7 @@ void ODataInputStream::skipBytes(sal_Int32 nBytesToSkip)
 
 
 sal_Int32 ODataInputStream::available(void)
-    throw ( NotConnectedException,
+    throw (	NotConnectedException,
             RuntimeException)
 {
      sal_Int32 nAvail;
@@ -211,7 +211,7 @@ sal_Int32 ODataInputStream::available(void)
 }
 
 void ODataInputStream::closeInput(void )
-    throw ( NotConnectedException,
+    throw (	NotConnectedException,
             RuntimeException)
 {
      if( m_bValidStream ) {
@@ -238,7 +238,7 @@ sal_Int8 ODataInputStream::readBoolean(void) throw (IOException, RuntimeExceptio
     return readByte();
 }
 
-sal_Int8 ODataInputStream::readByte(void)    throw (IOException, RuntimeException)
+sal_Int8 ODataInputStream::readByte(void)	 throw (IOException, RuntimeException)
 {
     Sequence<sal_Int8> aTmp(1);
     if( 1 != readBytes( aTmp, 1 ) )
@@ -334,8 +334,8 @@ double ODataInputStream::readDouble(void) throw (IOException, RuntimeException)
 
 OUString ODataInputStream::readUTF(void) throw (IOException, RuntimeException)
 {
-    sal_uInt16              nShortLen = (sal_uInt16)readShort();
-    sal_Int32               nUTFLen;
+    sal_uInt16				nShortLen = (sal_uInt16)readShort();
+    sal_Int32				nUTFLen;
 
     if( ((sal_uInt16)0xffff) == nShortLen )
     {
@@ -348,8 +348,8 @@ OUString ODataInputStream::readUTF(void) throw (IOException, RuntimeException)
         nUTFLen = ( sal_Int32 ) nShortLen;
     }
 
-    Sequence<sal_Unicode>   aBuffer( nUTFLen );
-    sal_Unicode *           pStr = aBuffer.getArray();
+    Sequence<sal_Unicode>	aBuffer( nUTFLen );
+    sal_Unicode *			pStr = aBuffer.getArray();
 
     sal_Int32 nCount = 0;
     sal_Int32 nStrLen = 0;
@@ -543,15 +543,15 @@ public:
 
 public: // XOutputStream
     virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData)
-        throw ( NotConnectedException,
+        throw (	NotConnectedException,
                 BufferSizeExceededException,
                 RuntimeException);
     virtual void SAL_CALL flush(void)
-        throw ( NotConnectedException,
+        throw (	NotConnectedException,
                 BufferSizeExceededException,
                 RuntimeException);
     virtual void SAL_CALL closeOutput(void)
-        throw ( NotConnectedException,
+        throw (	NotConnectedException,
                 BufferSizeExceededException,
                 RuntimeException);
 
@@ -587,8 +587,8 @@ public: // XServiceInfo
     sal_Bool                     SAL_CALL supportsService(const OUString& ServiceName) throw ();
 
 protected:
-    Reference < XConnectable >  m_succ;
-    Reference < XConnectable >  m_pred;
+    Reference < XConnectable > 	m_succ;
+    Reference < XConnectable >	m_pred;
     Reference<  XOutputStream > m_output;
     sal_Bool m_bValidStream;
 };
@@ -601,7 +601,7 @@ ODataOutputStream::~ODataOutputStream()
 
 // XOutputStream
 void ODataOutputStream::writeBytes(const Sequence< sal_Int8 >& aData)
-    throw ( NotConnectedException,
+    throw (	NotConnectedException,
             BufferSizeExceededException,
             RuntimeException)
 {
@@ -615,7 +615,7 @@ void ODataOutputStream::writeBytes(const Sequence< sal_Int8 >& aData)
 }
 
 void ODataOutputStream::flush(void)
-    throw ( NotConnectedException,
+    throw (	NotConnectedException,
             BufferSizeExceededException,
             RuntimeException)
 {
@@ -632,7 +632,7 @@ void ODataOutputStream::flush(void)
 
 
 void ODataOutputStream::closeOutput(void)
-    throw ( NotConnectedException,
+    throw (	NotConnectedException,
             BufferSizeExceededException,
             RuntimeException)
 {
@@ -651,7 +651,7 @@ void ODataOutputStream::closeOutput(void)
 
 // XDataOutputStream
 void ODataOutputStream::writeBoolean(sal_Bool Value)
-    throw ( IOException,
+    throw (	IOException,
             RuntimeException)
 {
     if( Value )
@@ -666,7 +666,7 @@ void ODataOutputStream::writeBoolean(sal_Bool Value)
 
 
 void ODataOutputStream::writeByte(sal_Int8 Value)
-    throw ( IOException,
+    throw (	IOException,
             RuntimeException)
 {
     Sequence<sal_Int8> aTmp( 1 );
@@ -675,7 +675,7 @@ void ODataOutputStream::writeByte(sal_Int8 Value)
 }
 
 void ODataOutputStream::writeChar(sal_Unicode Value)
-    throw ( IOException,
+    throw (	IOException,
             RuntimeException)
 {
     Sequence<sal_Int8> aTmp( 2 );
@@ -687,7 +687,7 @@ void ODataOutputStream::writeChar(sal_Unicode Value)
 
 
 void ODataOutputStream::writeShort(sal_Int16 Value)
-    throw ( IOException,
+    throw (	IOException,
             RuntimeException)
 {
     Sequence<sal_Int8> aTmp( 2 );
@@ -698,7 +698,7 @@ void ODataOutputStream::writeShort(sal_Int16 Value)
 }
 
 void ODataOutputStream::writeLong(sal_Int32 Value)
-    throw ( IOException,
+    throw (	IOException,
             RuntimeException)
 {
     Sequence<sal_Int8> aTmp( 4 );
@@ -711,7 +711,7 @@ void ODataOutputStream::writeLong(sal_Int32 Value)
 }
 
 void ODataOutputStream::writeHyper(sal_Int64 Value)
-    throw ( IOException,
+    throw (	IOException,
             RuntimeException)
 {
     Sequence<sal_Int8> aTmp( 8 );
@@ -729,7 +729,7 @@ void ODataOutputStream::writeHyper(sal_Int64 Value)
 
 
 void ODataOutputStream::writeFloat(float Value)
-    throw ( IOException,
+    throw (	IOException,
             RuntimeException)
 {
     union { float f; sal_uInt32 n; } a;
@@ -738,7 +738,7 @@ void ODataOutputStream::writeFloat(float Value)
 }
 
 void ODataOutputStream::writeDouble(double Value)
-    throw ( IOException,
+    throw (	IOException,
             RuntimeException)
 {
     sal_uInt32 n = 1;
@@ -759,7 +759,7 @@ void ODataOutputStream::writeDouble(double Value)
 }
 
 void ODataOutputStream::writeUTF(const OUString& Value)
-    throw ( IOException,
+    throw (	IOException,
             RuntimeException)
 {
     sal_Int32 nStrLen = Value.getLength();
@@ -860,14 +860,14 @@ void ODataOutputStream::setSuccessor( const Reference < XConnectable > &r )
          }
      }
 }
-Reference < XConnectable > ODataOutputStream::getSuccessor()    throw (RuntimeException)
+Reference < XConnectable > ODataOutputStream::getSuccessor()	throw (RuntimeException)
 {
     return m_succ;
 }
 
 
 // XDataSource
-void ODataOutputStream::setPredecessor( const Reference < XConnectable > &r )   throw (RuntimeException)
+void ODataOutputStream::setPredecessor( const Reference < XConnectable > &r )	throw (RuntimeException)
 {
     if( r != m_pred ) {
         m_pred = r;
@@ -877,7 +877,7 @@ void ODataOutputStream::setPredecessor( const Reference < XConnectable > &r )
         }
     }
 }
-Reference < XConnectable > ODataOutputStream::getPredecessor()  throw (RuntimeException)
+Reference < XConnectable > ODataOutputStream::getPredecessor()	throw (RuntimeException)
 {
     return m_pred;
 }
@@ -988,19 +988,19 @@ public:
 public:
     // XOutputStream
     virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData)
-        throw ( NotConnectedException,
+        throw (	NotConnectedException,
                 BufferSizeExceededException,
                 RuntimeException)
         { ODataOutputStream::writeBytes( aData ); }
 
     virtual void SAL_CALL flush(void)
-        throw ( NotConnectedException,
+        throw (	NotConnectedException,
                 BufferSizeExceededException,
                 RuntimeException)
         { ODataOutputStream::flush(); }
 
     virtual void SAL_CALL closeOutput(void)
-        throw ( NotConnectedException,
+        throw (	NotConnectedException,
                 BufferSizeExceededException,
                 RuntimeException)
         { ODataOutputStream::closeOutput(); }
@@ -1030,10 +1030,10 @@ public:
         virtual void SAL_CALL writeObject( const Reference< XPersistObject > & r ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
 public: // XMarkableStream
-    virtual sal_Int32 SAL_CALL createMark(void)                 throw (IOException, RuntimeException);
-    virtual void SAL_CALL deleteMark(sal_Int32 Mark)            throw (IOException, IllegalArgumentException, RuntimeException);
-    virtual void SAL_CALL jumpToMark(sal_Int32 nMark)       throw (IOException, IllegalArgumentException, RuntimeException);
-    virtual void SAL_CALL jumpToFurthest(void)          throw (IOException, RuntimeException);
+    virtual sal_Int32 SAL_CALL createMark(void) 				throw (IOException, RuntimeException);
+    virtual void SAL_CALL deleteMark(sal_Int32 Mark)			throw (IOException, IllegalArgumentException, RuntimeException);
+    virtual void SAL_CALL jumpToMark(sal_Int32 nMark) 		throw (IOException, IllegalArgumentException, RuntimeException);
+    virtual void SAL_CALL jumpToFurthest(void) 			throw (IOException, RuntimeException);
     virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark)
         throw (IOException, IllegalArgumentException, RuntimeException);
 
@@ -1051,10 +1051,10 @@ public: // XServiceInfo
 private:
     void connectToMarkable();
 private:
-    ObjectContainer_Impl                m_mapObject;
-    sal_Int32                           m_nMaxId;
-    Reference< XMarkableStream >        m_rMarkable;
-    sal_Bool                            m_bValidMarkable;
+    ObjectContainer_Impl	            m_mapObject;
+    sal_Int32							m_nMaxId;
+    Reference< XMarkableStream > 		m_rMarkable;
+    sal_Bool 							m_bValidMarkable;
 };
 
 OObjectOutputStream::~OObjectOutputStream()
@@ -1175,7 +1175,7 @@ void OObjectOutputStream::connectToMarkable(void)
 sal_Int32 OObjectOutputStream::createMark(void)
     throw (IOException, RuntimeException)
 {
-    connectToMarkable();    // throws an exception, if a markable is not connected !
+    connectToMarkable();	// throws an exception, if a markable is not connected !
 
     return m_rMarkable->createMark();
 }
@@ -1325,30 +1325,30 @@ public:
 
 public: // XInputStream
     virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-        throw ( NotConnectedException,
+        throw (	NotConnectedException,
                 BufferSizeExceededException,
                 RuntimeException)
         { return ODataInputStream::readBytes( aData , nBytesToRead ); }
 
     virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
-        throw ( NotConnectedException,
+        throw (	NotConnectedException,
                 BufferSizeExceededException,
                 RuntimeException)
         { return ODataInputStream::readSomeBytes( aData, nMaxBytesToRead ); }
 
     virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip)
-        throw ( NotConnectedException,
+        throw (	NotConnectedException,
                 BufferSizeExceededException,
                 RuntimeException)
         { ODataInputStream::skipBytes( nBytesToSkip ); }
 
     virtual sal_Int32 SAL_CALL available(void)
-        throw ( NotConnectedException,
+        throw (	NotConnectedException,
                 RuntimeException)
         { return ODataInputStream::available(); }
 
     virtual void SAL_CALL closeInput(void)
-        throw ( NotConnectedException,
+        throw (	NotConnectedException,
                 RuntimeException)
         { ODataInputStream::closeInput(); }
 
@@ -1378,9 +1378,9 @@ public: // XObjectInputStream
 public: // XMarkableStream
     virtual sal_Int32 SAL_CALL createMark(void)
         throw (IOException, RuntimeException);
-    virtual void SAL_CALL deleteMark(sal_Int32 Mark)            throw (IOException, IllegalArgumentException, RuntimeException);
-    virtual void SAL_CALL jumpToMark(sal_Int32 nMark)       throw (IOException, IllegalArgumentException, RuntimeException);
-    virtual void SAL_CALL jumpToFurthest(void)          throw (IOException, RuntimeException);
+    virtual void SAL_CALL deleteMark(sal_Int32 Mark)			throw (IOException, IllegalArgumentException, RuntimeException);
+    virtual void SAL_CALL jumpToMark(sal_Int32 nMark) 		throw (IOException, IllegalArgumentException, RuntimeException);
+    virtual void SAL_CALL jumpToFurthest(void) 			throw (IOException, RuntimeException);
     virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark)
         throw (IOException, IllegalArgumentException, RuntimeException);
 
@@ -1400,7 +1400,7 @@ private:
 private:
     Reference < XMultiComponentFactory > m_rSMgr;
     Reference < XComponentContext >     m_rCxt;
-    sal_Bool                m_bValidMarkable;
+    sal_Bool 				m_bValidMarkable;
     Reference < XMarkableStream > m_rMarkable;
     vector < Reference<  XPersistObject > > m_aPersistVector;
 
@@ -1541,14 +1541,14 @@ void OObjectInputStream::connectToMarkable()
     }
 }
 
-sal_Int32 OObjectInputStream::createMark(void)              throw (IOException, RuntimeException)
+sal_Int32 OObjectInputStream::createMark(void) 				throw (IOException, RuntimeException)
 {
-    connectToMarkable();    // throws an exception, if a markable is not connected !
+    connectToMarkable();	// throws an exception, if a markable is not connected !
 
     return m_rMarkable->createMark();
 }
 
-void OObjectInputStream::deleteMark(sal_Int32 Mark)         throw (IOException, IllegalArgumentException, RuntimeException)
+void OObjectInputStream::deleteMark(sal_Int32 Mark)			throw (IOException, IllegalArgumentException, RuntimeException)
 {
     if( ! m_bValidMarkable )
     {
@@ -1557,7 +1557,7 @@ void OObjectInputStream::deleteMark(sal_Int32 Mark)         throw (IOException,
     m_rMarkable->deleteMark( Mark );
 }
 
-void OObjectInputStream::jumpToMark(sal_Int32 nMark)        throw (IOException, IllegalArgumentException, RuntimeException)
+void OObjectInputStream::jumpToMark(sal_Int32 nMark) 		throw (IOException, IllegalArgumentException, RuntimeException)
 {
     if( ! m_bValidMarkable )
     {
@@ -1565,7 +1565,7 @@ void OObjectInputStream::jumpToMark(sal_Int32 nMark)        throw (IOException,
     }
     m_rMarkable->jumpToMark( nMark );
 }
-void OObjectInputStream::jumpToFurthest(void)           throw (IOException, RuntimeException)
+void OObjectInputStream::jumpToFurthest(void) 			throw (IOException, RuntimeException)
 {
     connectToMarkable();
     m_rMarkable->jumpToFurthest();
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index 792920c2667a..13ce6db616ef 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -89,15 +89,15 @@ public:
 
 public: // XOutputStream
     virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData)
-        throw ( NotConnectedException,
+        throw (	NotConnectedException,
                 BufferSizeExceededException,
                 RuntimeException);
     virtual void SAL_CALL flush(void)
-        throw ( NotConnectedException,
+        throw (	NotConnectedException,
                 BufferSizeExceededException,
                 RuntimeException);
     virtual void SAL_CALL closeOutput(void)
-        throw ( NotConnectedException,
+        throw (	NotConnectedException,
                 BufferSizeExceededException,
                 RuntimeException);
 
@@ -173,7 +173,7 @@ OMarkableOutputStream::~OMarkableOutputStream()
 
 // XOutputStream
 void OMarkableOutputStream::writeBytes(const Sequence< sal_Int8 >& aData)
-    throw ( NotConnectedException,
+    throw (	NotConnectedException,
             BufferSizeExceededException,
             RuntimeException)
 {
@@ -207,7 +207,7 @@ void OMarkableOutputStream::writeBytes(const Sequence< sal_Int8 >& aData)
 }
 
 void OMarkableOutputStream::flush(void)
-    throw ( NotConnectedException,
+    throw (	NotConnectedException,
             BufferSizeExceededException,
             RuntimeException)
 {
@@ -227,7 +227,7 @@ void OMarkableOutputStream::flush(void)
 }
 
 void OMarkableOutputStream::closeOutput(void)
-    throw ( NotConnectedException,
+    throw (	NotConnectedException,
             BufferSizeExceededException,
             RuntimeException)
 {
@@ -352,7 +352,7 @@ void OMarkableOutputStream::setOutputStream(const Reference < XOutputStream >& a
     m_bValidStream = m_output.is();
 }
 
-Reference< XOutputStream > OMarkableOutputStream::getOutputStream(void) throw (RuntimeException)
+Reference< XOutputStream > OMarkableOutputStream::getOutputStream(void)	throw (RuntimeException)
 {
     return m_output;
 }
@@ -373,7 +373,7 @@ void OMarkableOutputStream::setSuccessor( const Reference< XConnectable > &r )
          }
      }
 }
-Reference <XConnectable > OMarkableOutputStream::getSuccessor()     throw (RuntimeException)
+Reference <XConnectable > OMarkableOutputStream::getSuccessor()		throw (RuntimeException)
 {
     return m_succ;
 }
@@ -399,7 +399,7 @@ Reference < XConnectable > OMarkableOutputStream::getPredecessor() throw (Runtim
 
 // private methods
 
-void OMarkableOutputStream::checkMarksAndFlush() throw(     NotConnectedException,
+void OMarkableOutputStream::checkMarksAndFlush() throw( 	NotConnectedException,
                                                             BufferSizeExceededException)
 {
     map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii;
@@ -473,7 +473,7 @@ Reference< XInterface > SAL_CALL OMarkableOutputStream_CreateInstance( const Ref
     return Reference < XInterface > ( ( OWeakObject * ) p );
 }
 
-OUString    OMarkableOutputStream_getImplementationName()
+OUString 	OMarkableOutputStream_getImplementationName()
 {
     return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.io.stm.MarkableOutputStream" ));
 }
@@ -514,15 +514,15 @@ public:
 
 public: // XInputStream
     virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-        throw ( NotConnectedException,
+        throw (	NotConnectedException,
                 BufferSizeExceededException,
                 RuntimeException) ;
     virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
-        throw ( NotConnectedException,
+        throw (	NotConnectedException,
                 BufferSizeExceededException,
                 RuntimeException);
     virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip)
-        throw ( NotConnectedException,
+        throw (	NotConnectedException,
                 BufferSizeExceededException,
                 RuntimeException);
 
@@ -566,8 +566,8 @@ public: // XServiceInfo
 private:
     void checkMarksAndFlush();
 
-    Reference < XConnectable >  m_succ;
-    Reference < XConnectable >  m_pred;
+    Reference < XConnectable > 	m_succ;
+    Reference < XConnectable > 	m_pred;
 
     Reference< XInputStream > m_input;
     sal_Bool m_bValidStream;
@@ -603,7 +603,7 @@ OMarkableInputStream::~OMarkableInputStream()
 // XInputStream
 
 sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-    throw ( NotConnectedException,
+    throw (	NotConnectedException,
             BufferSizeExceededException,
             RuntimeException)
 {
@@ -660,7 +660,7 @@ sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32
 
 
 sal_Int32 OMarkableInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
-    throw ( NotConnectedException,
+    throw (	NotConnectedException,
             BufferSizeExceededException,
             RuntimeException)
 {
@@ -678,20 +678,20 @@ sal_Int32 OMarkableInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_I
             sal_Int32 nInBuffer = m_pBuffer->getSize() - m_nCurrentPos;
             sal_Int32 nAdditionalBytesToRead = Min(nMaxBytesToRead-nInBuffer,m_input->available());
             nAdditionalBytesToRead = Max(0 , nAdditionalBytesToRead );
-
-            // read enough bytes into buffer
+            
+            // read enough bytes into buffer 
             if( 0 == nInBuffer ) {
-                nRead = m_input->readSomeBytes( aData , nMaxBytesToRead );
+                nRead = m_input->readSomeBytes( aData , nMaxBytesToRead );	
             }
             else if( nAdditionalBytesToRead ) {
-                nRead = m_input->readBytes( aData , nAdditionalBytesToRead );
+                nRead = m_input->readBytes( aData , nAdditionalBytesToRead );				
             }
-
+            
             if( nRead ) {
                 aData.realloc( nRead );
                 try
                 {
-                    m_pBuffer->writeAt( m_pBuffer->getSize() , aData );
+                    m_pBuffer->writeAt( m_pBuffer->getSize() , aData );	
                 }
                 catch( IRingBuffer_OutOfMemoryException & )
                 {
@@ -702,9 +702,9 @@ sal_Int32 OMarkableInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_I
                     throw BufferSizeExceededException();
                 }
             }
-
+            
             nBytesRead = Min( nMaxBytesToRead , nInBuffer + nRead );
-
+            
             // now take everything from buffer !
             m_pBuffer->readAt( m_nCurrentPos , aData , nBytesRead );
 
@@ -715,7 +715,7 @@ sal_Int32 OMarkableInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_I
     {
         throw NotConnectedException(
             OUString( RTL_CONSTASCII_USTRINGPARAM("MarkableInputStream::readSomeBytes NotConnectedException")) ,
-            *this );
+            *this );	
     }
     return nBytesRead;
 
@@ -724,8 +724,8 @@ sal_Int32 OMarkableInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_I
 
 
 void OMarkableInputStream::skipBytes(sal_Int32 nBytesToSkip)
-    throw ( NotConnectedException,
-            BufferSizeExceededException,
+    throw (	NotConnectedException, 
+            BufferSizeExceededException, 
             RuntimeException)
 {
     if ( nBytesToSkip < 0 )
@@ -734,10 +734,10 @@ void OMarkableInputStream::skipBytes(sal_Int32 nBytesToSkip)
             *this
         );
 
-    // this method is blocking
+    // this method is blocking 
     sal_Int32 nRead;
     Sequence<sal_Int8> seqDummy( nBytesToSkip );
-
+    
     nRead = readBytes( seqDummy , nBytesToSkip );
 }
 
@@ -759,17 +759,17 @@ sal_Int32 OMarkableInputStream::available(void) throw (NotConnectedException, Ru
 }
 
 
-void OMarkableInputStream::closeInput(void) throw (NotConnectedException, RuntimeException)
+void OMarkableInputStream::closeInput(void) throw (NotConnectedException, RuntimeException) 
 {
     if( m_bValidStream ) {
         MutexGuard guard( m_mutex );
 
         m_input->closeInput();
-
+ 
         setInputStream( Reference< XInputStream > () );
         setPredecessor( Reference< XConnectable > () );
         setSuccessor( Reference< XConnectable >() );
-
+        
         delete m_pBuffer;
         m_pBuffer = 0;
         m_nCurrentPos = 0;
@@ -784,22 +784,22 @@ void OMarkableInputStream::closeInput(void) throw (NotConnectedException, Runtim
 
 // XMarkable
 
-sal_Int32 OMarkableInputStream::createMark(void)            throw (IOException, RuntimeException)
+sal_Int32 OMarkableInputStream::createMark(void) 			throw (IOException, RuntimeException)
 {
     MutexGuard guard( m_mutex );
     sal_Int32 nMark = m_nCurrentMark;
-
+        
     m_mapMarks[nMark] = m_nCurrentPos;
-
+    
     m_nCurrentMark ++;
     return nMark;
 }
 
-void OMarkableInputStream::deleteMark(sal_Int32 Mark)       throw (IOException, IllegalArgumentException, RuntimeException)
+void OMarkableInputStream::deleteMark(sal_Int32 Mark) 		throw (IOException, IllegalArgumentException, RuntimeException)
 {
     MutexGuard guard( m_mutex );
     map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii = m_mapMarks.find( Mark );
-
+    
     if( ii == m_mapMarks.end() ) {
         OUStringBuffer buf( 128 );
         buf.appendAscii( "MarkableInputStream::deleteMark unknown mark (" );
@@ -809,18 +809,18 @@ void OMarkableInputStream::deleteMark(sal_Int32 Mark)       throw (IOException,
     }
     else {
         m_mapMarks.erase( ii );
-        checkMarksAndFlush();
-    }
+        checkMarksAndFlush();		
+    }		
 }
 
 void OMarkableInputStream::jumpToMark(sal_Int32 nMark)
     throw (IOException,
-           IllegalArgumentException,
+           IllegalArgumentException, 
            RuntimeException)
 {
     MutexGuard guard( m_mutex );
     map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii = m_mapMarks.find( nMark );
-
+    
     if( ii == m_mapMarks.end() )
     {
         OUStringBuffer buf( 128 );
@@ -832,24 +832,24 @@ void OMarkableInputStream::jumpToMark(sal_Int32 nMark)
     else
     {
         m_nCurrentPos = (*ii).second;
-    }
+    }	
 }
 
-void OMarkableInputStream::jumpToFurthest(void)         throw (IOException, RuntimeException)
+void OMarkableInputStream::jumpToFurthest(void) 		throw (IOException, RuntimeException)
 {
     MutexGuard guard( m_mutex );
-    m_nCurrentPos = m_pBuffer->getSize();
-    checkMarksAndFlush();
+    m_nCurrentPos = m_pBuffer->getSize();	
+    checkMarksAndFlush();	
 }
 
 sal_Int32 OMarkableInputStream::offsetToMark(sal_Int32 nMark)
-     throw (IOException,
+     throw (IOException, 
            IllegalArgumentException,
            RuntimeException)
 {
     MutexGuard guard( m_mutex );
     map<sal_Int32,sal_Int32,less<sal_Int32> >::const_iterator ii = m_mapMarks.find( nMark );
-
+    
     if( ii == m_mapMarks.end() )
     {
         OUStringBuffer buf( 128 );
@@ -871,19 +871,19 @@ sal_Int32 OMarkableInputStream::offsetToMark(sal_Int32 nMark)
 void OMarkableInputStream::setInputStream(const Reference< XInputStream > & aStream)
     throw (RuntimeException)
 {
-
+    
     if( m_input != aStream ) {
         m_input = aStream;
-
+        
         Reference < XConnectable >  pred( m_input , UNO_QUERY );
         setPredecessor( pred );
     }
-
-    m_bValidStream = m_input.is();
-
+    
+    m_bValidStream = m_input.is();	
+    
 }
 
-Reference< XInputStream > OMarkableInputStream::getInputStream(void) throw (RuntimeException)
+Reference< XInputStream > OMarkableInputStream::getInputStream(void) throw (RuntimeException) 
 {
     return m_input;
 }
@@ -899,7 +899,7 @@ void OMarkableInputStream::setSuccessor( const Reference< XConnectable > &r )
          /// store the reference for later use
          m_succ = r;
 
-         if( m_succ.is() ) {
+         if( m_succ.is() ) { 
               /// set this instance as the sink !
               m_succ->setPredecessor( Reference< XConnectable > (
                   SAL_STATIC_CAST( XConnectable * , this ) ) );
@@ -909,7 +909,7 @@ void OMarkableInputStream::setSuccessor( const Reference< XConnectable > &r )
 
 Reference < XConnectable >  OMarkableInputStream::getSuccessor() throw (RuntimeException)
 {
-    return m_succ;
+    return m_succ;	
 }
 
 
@@ -923,7 +923,7 @@ void OMarkableInputStream::setPredecessor( const Reference < XConnectable >  &r
             m_pred->setSuccessor( Reference< XConnectable > (
                 SAL_STATIC_CAST( XConnectable * , this ) ) );
         }
-    }
+    }	
 }
 Reference< XConnectable >  OMarkableInputStream::getPredecessor() throw (RuntimeException)
 {
@@ -936,12 +936,12 @@ Reference< XConnectable >  OMarkableInputStream::getPredecessor() throw (Runtime
 void OMarkableInputStream::checkMarksAndFlush()
 {
     map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii;
-
+    
     // find the smallest mark
     sal_Int32 nNextFound = m_nCurrentPos;
     for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ii ++ ) {
         if( (*ii).second <= nNextFound )  {
-            nNextFound = (*ii).second;
+            nNextFound = (*ii).second;	
         }
     }
 
@@ -951,26 +951,26 @@ void OMarkableInputStream::checkMarksAndFlush()
         for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ii ++ ) {
             (*ii).second -= nNextFound;
         }
-
+                
         m_pBuffer->forgetFromStart( nNextFound );
 
     }
     else {
         // nothing to do. There is a mark or the current cursor position, that prevents
         // releasing data !
-    }
+    }		
 }
 
 
 
 // XServiceInfo
-OUString OMarkableInputStream::getImplementationName() throw ()
+OUString OMarkableInputStream::getImplementationName() throw () 
 {
     return OMarkableInputStream_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool OMarkableInputStream::supportsService(const OUString& ServiceName) throw ()
+sal_Bool OMarkableInputStream::supportsService(const OUString& ServiceName) throw () 
 {
     Sequence< OUString > aSNL = getSupportedServiceNames();
     const OUString * pArray = aSNL.getConstArray();
@@ -983,7 +983,7 @@ sal_Bool OMarkableInputStream::supportsService(const OUString& ServiceName) thro
 }
 
 // XServiceInfo
-Sequence< OUString > OMarkableInputStream::getSupportedServiceNames(void) throw ()
+Sequence< OUString > OMarkableInputStream::getSupportedServiceNames(void) throw () 
 {
     return OMarkableInputStream_getSupportedServiceNames();
 }
@@ -996,12 +996,12 @@ Sequence< OUString > OMarkableInputStream::getSupportedServiceNames(void) throw
 *------------------------*/
 Reference < XInterface > SAL_CALL OMarkableInputStream_CreateInstance(
     const Reference < XComponentContext > & ) throw(Exception)
-{
-    OMarkableInputStream *p = new OMarkableInputStream( );
+{	
+    OMarkableInputStream *p = new OMarkableInputStream( ); 
     return Reference< XInterface > ( (OWeakObject * ) p );
 }
 
-OUString    OMarkableInputStream_getImplementationName()
+OUString 	OMarkableInputStream_getImplementationName()
 {
     return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.io.stm.MarkableInputStream" ));
 }
diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx
index b17ce4081e0a..9072dfd5d0d0 100644
--- a/io/source/stm/opipe.cxx
+++ b/io/source/stm/opipe.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@ using namespace ::com::sun::star::lang;
 #include "streamhelper.hxx"
 
 // Implementation and service names
-#define IMPLEMENTATION_NAME "com.sun.star.comp.io.stm.Pipe"
+#define IMPLEMENTATION_NAME	"com.sun.star.comp.io.stm.Pipe"
 #define SERVICE_NAME "com.sun.star.io.Pipe"
 
 namespace io_stm{
@@ -71,7 +71,7 @@ public:
 
 public: // XInputStream
     virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-        throw(  NotConnectedException,
+        throw(	NotConnectedException,
                 BufferSizeExceededException,
                 RuntimeException );
     virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
@@ -123,8 +123,8 @@ private:
     // DEBUG
     inline void checkInvariant();
 
-    Reference < XConnectable >  m_succ;
-    Reference < XConnectable >  m_pred;
+    Reference < XConnectable > 	m_succ;
+    Reference < XConnectable > 	m_pred;
 
     sal_Int32 m_nBytesToSkip;
 
@@ -135,7 +135,7 @@ private:
 
     oslCondition m_conditionBytesAvail;
     Mutex     m_mutexAccess;
-    I_FIFO      *m_pFIFO;
+    I_FIFO		*m_pFIFO;
 };
 
 
@@ -145,8 +145,8 @@ OPipeImpl::OPipeImpl()
     g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
     m_nBytesToSkip  = 0;
 
-    m_bOutputStreamClosed   = sal_False;
-    m_bInputStreamClosed    = sal_False;
+    m_bOutputStreamClosed 	= sal_False;
+    m_bInputStreamClosed 	= sal_False;
 
     m_pFIFO = new MemFIFO;
     m_conditionBytesAvail = osl_createCondition();
@@ -406,7 +406,7 @@ void OPipeImpl::setSuccessor( const Reference < XConnectable >  &r )
      }
 }
 
-Reference < XConnectable > OPipeImpl::getSuccessor()    throw( RuntimeException )
+Reference < XConnectable > OPipeImpl::getSuccessor() 	throw( RuntimeException )
 {
     return m_succ;
 }
@@ -477,7 +477,7 @@ Reference < XInterface > SAL_CALL OPipeImpl_CreateInstance(
 }
 
 
-OUString    OPipeImpl_getImplementationName()
+OUString 	OPipeImpl_getImplementationName()
 {
     return OUString( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index 0d20908daae1..d0b78f988551 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -63,17 +63,17 @@ using namespace com::sun::star::io;
 #include "factreg.hxx"
 
 namespace io_stm {
-
+    
     class Pump : public WeakImplHelper5<
           XActiveDataSource, XActiveDataSink, XActiveDataControl, XConnectable, XServiceInfo >
     {
-        Mutex                                   m_aMutex;
-        oslThread                               m_aThread;
+        Mutex									m_aMutex;
+        oslThread								m_aThread;
 
-        Reference< XConnectable >               m_xPred;
-        Reference< XConnectable >               m_xSucc;
-        Reference< XInputStream >               m_xInput;
-        Reference< XOutputStream >              m_xOutput;
+        Reference< XConnectable >				m_xPred;
+        Reference< XConnectable >				m_xSucc;
+        Reference< XInputStream >				m_xInput;
+        Reference< XOutputStream >				m_xOutput;
         OInterfaceContainerHelper               m_cnt;
         sal_Bool                                m_closeFired;
 
@@ -85,31 +85,31 @@ namespace io_stm {
         void fireStarted();
         void fireTerminated();
         void fireError( const Any &a );
-
+            
     public:
         Pump();
         virtual ~Pump();
-
+        
         // XActiveDataSource
         virtual void SAL_CALL setOutputStream( const Reference< ::com::sun::star::io::XOutputStream >& xOutput ) throw();
         virtual Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream() throw();
-
+        
         // XActiveDataSink
         virtual void SAL_CALL setInputStream( const Reference< ::com::sun::star::io::XInputStream >& xStream ) throw();
         virtual Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream() throw();
-
+        
         // XActiveDataControl
         virtual void SAL_CALL addListener( const Reference< ::com::sun::star::io::XStreamListener >& xListener ) throw();
         virtual void SAL_CALL removeListener( const Reference< ::com::sun::star::io::XStreamListener >& xListener ) throw();
         virtual void SAL_CALL start() throw( RuntimeException );
         virtual void SAL_CALL terminate() throw();
-
+        
         // XConnectable
         virtual void SAL_CALL setPredecessor( const Reference< ::com::sun::star::io::XConnectable >& xPred ) throw();
         virtual Reference< ::com::sun::star::io::XConnectable > SAL_CALL getPredecessor() throw();
         virtual void SAL_CALL setSuccessor( const Reference< ::com::sun::star::io::XConnectable >& xSucc ) throw();
         virtual Reference< ::com::sun::star::io::XConnectable > SAL_CALL getSuccessor() throw();
-
+        
     public: // XServiceInfo
         virtual OUString    SAL_CALL getImplementationName() throw(  );
         virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(  );
@@ -122,7 +122,7 @@ Pump::Pump() : m_aThread( 0 ),
 {
     g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
 }
-
+    
 Pump::~Pump()
 {
     // exit gracefully
@@ -226,7 +226,7 @@ void Pump::close()
         MutexGuard guard( m_aMutex );
         rInput = m_xInput;
         m_xInput.clear();
-
+        
         rOutput = m_xOutput;
         m_xOutput.clear();
         m_xSucc.clear();
@@ -240,7 +240,7 @@ void Pump::close()
         }
         catch( Exception & )
         {
-            // go down calm
+            // go down calm 
         }
     }
     if( rOutput.is() )
@@ -276,7 +276,7 @@ void Pump::run()
                 rInput = m_xInput;
                 rOutput = m_xOutput;
             }
-
+            
             if( ! rInput.is() )
             {
                 NotConnectedException exception(
diff --git a/io/source/stm/stm.xml b/io/source/stm/stm.xml
index 64e76dc8d2c7..cf31de6229cb 100644
--- a/io/source/stm/stm.xml
+++ b/io/source/stm/stm.xml
@@ -6,35 +6,35 @@
     <component-description>
         <author> Joerg Budischewski </author>
         <name> com.sun.star.comp.io.stm.Pipe </name>
-        <description>
+        <description> 
             This component provides ...
         </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language>  c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.io.Pipe </supported-service>
+        <loader-name> com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
+        <status	value="final"/>
+        <supported-service>	com.sun.star.io.Pipe </supported-service>
         <service-dependency> ... </service-dependency>
-        <type>   com.sun.star.io.XObjectInputStream                 </type>
-        <type>   com.sun.star.io.XObjectOutputStream                </type>
-        <type>   com.sun.star.io.XActiveDataSource                  </type>
-        <type>   com.sun.star.io.XActiveDataSink                    </type>
-        <type>   com.sun.star.io.XMarkableStream                    </type>
-        <type>   com.sun.star.io.UnexpectedEOFException             </type>
-        <type>   com.sun.star.io.WrongFormatException               </type>
-        <type>   com.sun.star.lang.XComponent                       </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory            </type>
-        <type>   com.sun.star.lang.XServiceInfo                     </type>
-        <type>   com.sun.star.lang.XTypeProvider                    </type>
-        <type>   com.sun.star.lang.IllegalArgumentException         </type>
-        <type>   com.sun.star.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.registry.XImplementationRegistration  </type>
-        <type>   com.sun.star.test.XSimpleTest                      </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
+        <type>	 com.sun.star.io.XObjectInputStream					</type>
+        <type>	 com.sun.star.io.XObjectOutputStream	   			</type>
+        <type>	 com.sun.star.io.XActiveDataSource					</type>
+        <type>	 com.sun.star.io.XActiveDataSink					</type>
+        <type>	 com.sun.star.io.XMarkableStream					</type>
+        <type>	 com.sun.star.io.UnexpectedEOFException    			</type>
+        <type>	 com.sun.star.io.WrongFormatException      			</type>
+        <type>	 com.sun.star.lang.XComponent              			</type>
+        <type>	 com.sun.star.lang.XMultiServiceFactory            	</type>
+        <type>	 com.sun.star.lang.XSingleServiceFactory   			</type>
+        <type>	 com.sun.star.lang.XServiceInfo            			</type>
+        <type>	 com.sun.star.lang.XTypeProvider           			</type>
+        <type>	 com.sun.star.lang.IllegalArgumentException			</type>
+        <type>	 com.sun.star.registry.XRegistryKey           		</type>
+        <type>	 com.sun.star.registry.XImplementationRegistration	</type>
+        <type>	 com.sun.star.test.XSimpleTest                    	</type>
+        <type>	 com.sun.star.lang.XSingleComponentFactory         	</type>
+        <type>	 com.sun.star.uno.XComponentContext                	</type>
+        <type>	 com.sun.star.uno.TypeClass                       	</type>
+        <type>	 com.sun.star.uno.XWeak                           	</type>
+        <type>	 com.sun.star.uno.XAggregation                    	</type>
     </component-description>
 
     <component-description>
@@ -43,30 +43,30 @@
         <description>
             This component provides ...
         </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language>  c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.io.DataInputStream </supported-service>
+        <loader-name> com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
+        <status	value="final"/>
+        <supported-service>	com.sun.star.io.DataInputStream	</supported-service>
         <service-dependency> ... </service-dependency>
-        <type>   com.sun.star.io.XObjectInputStream                 </type>
-        <type>   com.sun.star.io.XObjectOutputStream                </type>
-        <type>   com.sun.star.io.XActiveDataSource                  </type>
-        <type>   com.sun.star.io.XActiveDataSink                    </type>
-        <type>   com.sun.star.io.XMarkableStream                    </type>
-        <type>   com.sun.star.io.UnexpectedEOFException             </type>
-        <type>   com.sun.star.io.WrongFormatException               </type>
-        <type>   com.sun.star.lang.XComponent                       </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory            </type>
-        <type>   com.sun.star.lang.XServiceInfo                     </type>
-        <type>   com.sun.star.lang.XTypeProvider                    </type>
-        <type>   com.sun.star.lang.IllegalArgumentException         </type>
-        <type>   com.sun.star.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.registry.XImplementationRegistration  </type>
-        <type>   com.sun.star.test.XSimpleTest                      </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
+        <type>	 com.sun.star.io.XObjectInputStream					</type>
+        <type>	 com.sun.star.io.XObjectOutputStream				</type>
+        <type>	 com.sun.star.io.XActiveDataSource					</type>
+        <type>	 com.sun.star.io.XActiveDataSink					</type>
+        <type>	 com.sun.star.io.XMarkableStream					</type>
+        <type>	 com.sun.star.io.UnexpectedEOFException            	</type>
+        <type>	 com.sun.star.io.WrongFormatException              	</type>
+        <type>	 com.sun.star.lang.XComponent                      	</type>
+        <type>	 com.sun.star.lang.XMultiServiceFactory            	</type>
+        <type>	 com.sun.star.lang.XSingleServiceFactory           	</type>
+        <type>	 com.sun.star.lang.XServiceInfo                    	</type>
+        <type>	 com.sun.star.lang.XTypeProvider                   	</type>
+        <type>	 com.sun.star.lang.IllegalArgumentException        	</type>
+        <type>	 com.sun.star.registry.XRegistryKey                	</type>
+        <type>	 com.sun.star.registry.XImplementationRegistration	</type>
+        <type>	 com.sun.star.test.XSimpleTest                     	</type>
+        <type>	 com.sun.star.uno.TypeClass                        	</type>
+        <type>	 com.sun.star.uno.XWeak                            	</type>
+        <type>	 com.sun.star.uno.XAggregation                      </type>
     </component-description>
 
     <component-description>
@@ -75,32 +75,32 @@
         <description>
             This component provides ...
         </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <loader-name> com.sun.star.loader.SharedLibrary	</loader-name>
         <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.io.DataOutputStream </supported-service>
+        <status	value="final"/>
+        <supported-service>	com.sun.star.io.DataOutputStream </supported-service>
         <service-dependency> ... </service-dependency>
-        <type>  com.sun.star.io.XObjectInputStream                  </type>
-        <type>  com.sun.star.io.XObjectOutputStream                 </type>
-        <type>  com.sun.star.io.XActiveDataSource                   </type>
-        <type>  com.sun.star.io.XActiveDataSink                     </type>
-        <type>  com.sun.star.io.XMarkableStream                     </type>
-        <type>  com.sun.star.io.UnexpectedEOFException              </type>
-        <type>  com.sun.star.io.WrongFormatException                </type>
-        <type>  com.sun.star.lang.XComponent                        </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory              </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory             </type>
-        <type>  com.sun.star.lang.XServiceInfo                      </type>
-        <type>  com.sun.star.lang.XTypeProvider                     </type>
-        <type>  com.sun.star.lang.IllegalArgumentException          </type>
-        <type>  com.sun.star.registry.XRegistryKey                  </type>
-        <type>  com.sun.star.registry.XImplementationRegistration   </type>
-        <type>  com.sun.star.test.XSimpleTest                       </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>  com.sun.star.uno.TypeClass                          </type>
-        <type>  com.sun.star.uno.XWeak                              </type>
-        <type>  com.sun.star.uno.XAggregation                       </type>
+        <type> 	com.sun.star.io.XObjectInputStream					</type>
+        <type> 	com.sun.star.io.XObjectOutputStream					</type>
+        <type> 	com.sun.star.io.XActiveDataSource					</type>
+        <type> 	com.sun.star.io.XActiveDataSink						</type>
+        <type> 	com.sun.star.io.XMarkableStream						</type>
+        <type> 	com.sun.star.io.UnexpectedEOFException            	</type>
+        <type> 	com.sun.star.io.WrongFormatException              	</type>
+        <type> 	com.sun.star.lang.XComponent                      	</type>
+        <type> 	com.sun.star.lang.XMultiServiceFactory            	</type>
+        <type> 	com.sun.star.lang.XSingleServiceFactory           	</type>
+        <type> 	com.sun.star.lang.XServiceInfo                    	</type>
+        <type> 	com.sun.star.lang.XTypeProvider                   	</type>
+        <type> 	com.sun.star.lang.IllegalArgumentException        	</type>
+        <type> 	com.sun.star.registry.XRegistryKey                	</type>
+        <type> 	com.sun.star.registry.XImplementationRegistration	</type>
+        <type> 	com.sun.star.test.XSimpleTest                     	</type>
+        <type>	 com.sun.star.lang.XSingleComponentFactory         	</type>
+        <type>	 com.sun.star.uno.XComponentContext                	</type>
+        <type> 	com.sun.star.uno.TypeClass                        	</type>
+        <type> 	com.sun.star.uno.XWeak                            	</type>
+        <type> 	com.sun.star.uno.XAggregation                      	</type>
     </component-description>
 
     <component-description>
@@ -109,32 +109,32 @@
         <description>
             This component provides ...
         </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <loader-name> com.sun.star.loader.SharedLibrary	</loader-name>
         <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.io.ObjectInputStream </supported-service>
+        <status	value="final"/>
+        <supported-service>	com.sun.star.io.ObjectInputStream </supported-service>
         <service-dependency> ... </service-dependency>
-        <type>  com.sun.star.io.XObjectInputStream                  </type>
-        <type>  com.sun.star.io.XObjectOutputStream                 </type>
-        <type>  com.sun.star.io.XActiveDataSource                   </type>
-        <type>  com.sun.star.io.XActiveDataSink                     </type>
-        <type>  com.sun.star.io.XMarkableStream                     </type>
-        <type>  com.sun.star.io.UnexpectedEOFException              </type>
-        <type>  com.sun.star.io.WrongFormatException                </type>
-        <type>  com.sun.star.lang.XComponent                        </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory              </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory             </type>
-        <type>  com.sun.star.lang.XServiceInfo                      </type>
-        <type>  com.sun.star.lang.XTypeProvider                     </type>
-        <type>  com.sun.star.lang.IllegalArgumentException          </type>
-        <type>  com.sun.star.registry.XRegistryKey                  </type>
-        <type>  com.sun.star.registry.XImplementationRegistration   </type>
-        <type>  com.sun.star.test.XSimpleTest                       </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>  com.sun.star.uno.TypeClass                          </type>
-        <type>  com.sun.star.uno.XWeak                              </type>
-        <type>  com.sun.star.uno.XAggregation                       </type>
+        <type> 	com.sun.star.io.XObjectInputStream					</type>
+        <type> 	com.sun.star.io.XObjectOutputStream					</type>
+        <type> 	com.sun.star.io.XActiveDataSource					</type>
+        <type> 	com.sun.star.io.XActiveDataSink						</type>
+        <type> 	com.sun.star.io.XMarkableStream						</type>
+        <type> 	com.sun.star.io.UnexpectedEOFException            	</type>
+        <type> 	com.sun.star.io.WrongFormatException              	</type>
+        <type> 	com.sun.star.lang.XComponent                      	</type>
+        <type> 	com.sun.star.lang.XMultiServiceFactory            	</type>
+        <type> 	com.sun.star.lang.XSingleServiceFactory           	</type>
+        <type> 	com.sun.star.lang.XServiceInfo                    	</type>
+        <type> 	com.sun.star.lang.XTypeProvider                   	</type>
+        <type> 	com.sun.star.lang.IllegalArgumentException        	</type>
+        <type> 	com.sun.star.registry.XRegistryKey                	</type>
+        <type> 	com.sun.star.registry.XImplementationRegistration	</type>
+        <type> 	com.sun.star.test.XSimpleTest                     	</type>
+        <type>	 com.sun.star.lang.XSingleComponentFactory         	</type>
+        <type>	 com.sun.star.uno.XComponentContext                	</type>
+        <type> 	com.sun.star.uno.TypeClass                        	</type>
+        <type> 	com.sun.star.uno.XWeak                            	</type>
+        <type> 	com.sun.star.uno.XAggregation                      	</type>
     </component-description>
 
     <component-description>
@@ -143,32 +143,32 @@
         <description>
             This component provides ...
         </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <loader-name> com.sun.star.loader.SharedLibrary	</loader-name>
         <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.io.ObjectOutputStream </supported-service>
+        <status	value="final"/>
+        <supported-service>	com.sun.star.io.ObjectOutputStream </supported-service>
         <service-dependency> ... </service-dependency>
-        <type>   com.sun.star.io.XObjectInputStream                 </type>
-        <type>   com.sun.star.io.XObjectOutputStream                </type>
-        <type>   com.sun.star.io.XActiveDataSource                  </type>
-        <type>   com.sun.star.io.XActiveDataSink                    </type>
-        <type>   com.sun.star.io.XMarkableStream                    </type>
-        <type>   com.sun.star.io.UnexpectedEOFException             </type>
-        <type>   com.sun.star.io.WrongFormatException               </type>
-        <type>   com.sun.star.lang.XComponent                       </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory            </type>
-        <type>   com.sun.star.lang.XServiceInfo                     </type>
-        <type>   com.sun.star.lang.XTypeProvider                    </type>
-        <type>   com.sun.star.lang.IllegalArgumentException         </type>
-        <type>   com.sun.star.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.registry.XImplementationRegistration  </type>
-        <type>   com.sun.star.test.XSimpleTest                      </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
+        <type>	 com.sun.star.io.XObjectInputStream					</type>
+        <type>	 com.sun.star.io.XObjectOutputStream				</type>
+        <type>	 com.sun.star.io.XActiveDataSource					</type>
+        <type>	 com.sun.star.io.XActiveDataSink					</type>
+        <type>	 com.sun.star.io.XMarkableStream					</type>
+        <type>	 com.sun.star.io.UnexpectedEOFException            	</type>
+        <type>	 com.sun.star.io.WrongFormatException              	</type>
+        <type>	 com.sun.star.lang.XComponent                      	</type>
+        <type>	 com.sun.star.lang.XMultiServiceFactory            	</type>
+        <type>	 com.sun.star.lang.XSingleServiceFactory           	</type>
+        <type>	 com.sun.star.lang.XServiceInfo                    	</type>
+        <type>	 com.sun.star.lang.XTypeProvider                   	</type>
+        <type>	 com.sun.star.lang.IllegalArgumentException        	</type>
+        <type>	 com.sun.star.registry.XRegistryKey                	</type>
+        <type>	 com.sun.star.registry.XImplementationRegistration	</type>
+        <type>	 com.sun.star.test.XSimpleTest                     	</type>
+        <type>	 com.sun.star.lang.XSingleComponentFactory         	</type>
+        <type>	 com.sun.star.uno.XComponentContext                	</type>
+        <type>	 com.sun.star.uno.TypeClass                        	</type>
+        <type>	 com.sun.star.uno.XWeak                            	</type>
+        <type>	 com.sun.star.uno.XAggregation                      </type>
     </component-description>
 
     <component-description>
@@ -177,32 +177,32 @@
         <description>
             This component provides ...
         </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <loader-name> com.sun.star.loader.SharedLibrary	</loader-name>
         <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.io.MarkableInputStream </supported-service>
+        <status	value="final"/>
+        <supported-service>	com.sun.star.io.MarkableInputStream	</supported-service>
         <service-dependency> ... </service-dependency>
-        <type>   com.sun.star.io.XObjectInputStream                 </type>
-        <type>   com.sun.star.io.XObjectOutputStream                </type>
-        <type>   com.sun.star.io.XActiveDataSource                  </type>
-        <type>   com.sun.star.io.XActiveDataSink                    </type>
-        <type>   com.sun.star.io.XMarkableStream                    </type>
-        <type>   com.sun.star.io.UnexpectedEOFException             </type>
-        <type>   com.sun.star.io.WrongFormatException               </type>
-        <type>   com.sun.star.lang.XComponent                       </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory            </type>
-        <type>   com.sun.star.lang.XServiceInfo                     </type>
-        <type>   com.sun.star.lang.XTypeProvider                    </type>
-        <type>   com.sun.star.lang.IllegalArgumentException         </type>
-        <type>   com.sun.star.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.registry.XImplementationRegistration  </type>
-        <type>   com.sun.star.test.XSimpleTest                      </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
+        <type>	 com.sun.star.io.XObjectInputStream					</type>
+        <type>	 com.sun.star.io.XObjectOutputStream				</type>
+        <type>	 com.sun.star.io.XActiveDataSource					</type>
+        <type>	 com.sun.star.io.XActiveDataSink					</type>
+        <type>	 com.sun.star.io.XMarkableStream					</type>
+        <type>	 com.sun.star.io.UnexpectedEOFException            	</type>
+        <type>	 com.sun.star.io.WrongFormatException              	</type>
+        <type>	 com.sun.star.lang.XComponent                      	</type>
+        <type>	 com.sun.star.lang.XMultiServiceFactory            	</type>
+        <type>	 com.sun.star.lang.XSingleServiceFactory           	</type>
+        <type>	 com.sun.star.lang.XServiceInfo                    	</type>
+        <type>	 com.sun.star.lang.XTypeProvider                   	</type>
+        <type>	 com.sun.star.lang.IllegalArgumentException        	</type>
+        <type>	 com.sun.star.registry.XRegistryKey                	</type>
+        <type>	 com.sun.star.registry.XImplementationRegistration	</type>
+        <type>	 com.sun.star.test.XSimpleTest                     	</type>
+        <type>	 com.sun.star.lang.XSingleComponentFactory         	</type>
+        <type>	 com.sun.star.uno.XComponentContext                	</type>
+        <type>	 com.sun.star.uno.TypeClass                        	</type>
+        <type>	 com.sun.star.uno.XWeak                            	</type>
+        <type>	 com.sun.star.uno.XAggregation                      </type>
     </component-description>
 
     <component-description>
@@ -211,32 +211,32 @@
         <description>
             This component provides ...
         </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <loader-name> com.sun.star.loader.SharedLibrary	</loader-name>
         <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.io.MarkableOutputStream </supported-service>
+        <status	value="final"/>
+        <supported-service>	com.sun.star.io.MarkableOutputStream </supported-service>
         <service-dependency> ... </service-dependency>
-        <type>   com.sun.star.io.XObjectInputStream                 </type>
-        <type>   com.sun.star.io.XObjectOutputStream                </type>
-        <type>   com.sun.star.io.XActiveDataSource                  </type>
-        <type>   com.sun.star.io.XActiveDataSink                    </type>
-        <type>   com.sun.star.io.XMarkableStream                    </type>
-        <type>   com.sun.star.io.UnexpectedEOFException             </type>
-        <type>   com.sun.star.io.WrongFormatException               </type>
-        <type>   com.sun.star.lang.XComponent                       </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory            </type>
-        <type>   com.sun.star.lang.XServiceInfo                     </type>
-        <type>   com.sun.star.lang.XTypeProvider                    </type>
-        <type>   com.sun.star.lang.IllegalArgumentException         </type>
-        <type>   com.sun.star.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.registry.XImplementationRegistration  </type>
-        <type>   com.sun.star.test.XSimpleTest                      </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
+        <type>	 com.sun.star.io.XObjectInputStream					</type>
+        <type>	 com.sun.star.io.XObjectOutputStream				</type>
+        <type>	 com.sun.star.io.XActiveDataSource					</type>
+        <type>	 com.sun.star.io.XActiveDataSink					</type>
+        <type>	 com.sun.star.io.XMarkableStream					</type>
+        <type>	 com.sun.star.io.UnexpectedEOFException            	</type>
+        <type>	 com.sun.star.io.WrongFormatException              	</type>
+        <type>	 com.sun.star.lang.XComponent                      	</type>
+        <type>	 com.sun.star.lang.XMultiServiceFactory            	</type>
+        <type>	 com.sun.star.lang.XSingleServiceFactory           	</type>
+        <type>	 com.sun.star.lang.XServiceInfo                    	</type>
+        <type>	 com.sun.star.lang.XTypeProvider                   	</type>
+        <type>	 com.sun.star.lang.IllegalArgumentException        	</type>
+        <type>	 com.sun.star.registry.XRegistryKey                	</type>
+        <type>	 com.sun.star.registry.XImplementationRegistration	</type>
+        <type>	 com.sun.star.test.XSimpleTest                     	</type>
+        <type>	 com.sun.star.lang.XSingleComponentFactory         	</type>
+        <type>	 com.sun.star.uno.XComponentContext                	</type>
+        <type>	 com.sun.star.uno.TypeClass                        	</type>
+        <type>	 com.sun.star.uno.XWeak                            	</type>
+        <type>	 com.sun.star.uno.XAggregation                      </type>
     </component-description>
 
     <component-description>
@@ -245,34 +245,34 @@
         <description>
             This component provides ...
         </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <loader-name> com.sun.star.loader.SharedLibrary	</loader-name>
         <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.io.Pump </supported-service>
+        <status	value="final"/>
+        <supported-service>	com.sun.star.io.Pump </supported-service>
         <service-dependency> ... </service-dependency>
-        <type>  com.sun.star.io.XConnectable                </type>
-        <type>  com.sun.star.io.XActiveDataSource           </type>
-        <type>  com.sun.star.io.XActiveDataSink             </type>
-        <type>  com.sun.star.io.XActiveDataControl          </type>
-        <type>  com.sun.star.lang.DisposedException         </type>
-        <type>  com.sun.star.lang.XTypeProvider             </type>
-        <type>  com.sun.star.lang.XServiceInfo              </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory     </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory      </type>
-        <type>  com.sun.star.registry.XRegistryKey          </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>  com.sun.star.uno.XAggregation               </type>
-        <type>  com.sun.star.uno.XWeak                      </type>
-        <type>  com.sun.star.uno.TypeClass                  </type>
+        <type>	com.sun.star.io.XConnectable				</type>
+        <type>	com.sun.star.io.XActiveDataSource			</type>
+        <type>	com.sun.star.io.XActiveDataSink				</type>
+        <type>	com.sun.star.io.XActiveDataControl			</type>
+        <type>	com.sun.star.lang.DisposedException 		</type>
+        <type>	com.sun.star.lang.XTypeProvider				</type>
+        <type>	com.sun.star.lang.XServiceInfo				</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory		</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory		</type>
+        <type>	com.sun.star.registry.XRegistryKey			</type>
+        <type>	 com.sun.star.lang.XSingleComponentFactory         	</type>
+        <type>	 com.sun.star.uno.XComponentContext                	</type>
+        <type>	com.sun.star.uno.XAggregation				</type>
+        <type>	com.sun.star.uno.XWeak						</type>
+        <type>	com.sun.star.uno.TypeClass					</type>
     </component-description>
 
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
 
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
+    <runtime-module-dependency>	cppuhelper	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu2		</runtime-module-dependency>
+    <runtime-module-dependency>	sal2		</runtime-module-dependency>
 </module-description>
 
diff --git a/io/source/stm/streamhelper.cxx b/io/source/stm/streamhelper.cxx
index 8791c016db7d..c09aa22822f9 100644
--- a/io/source/stm/streamhelper.cxx
+++ b/io/source/stm/streamhelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -90,10 +90,10 @@ void MemFIFO::skip( sal_Int32 nBytesToSkip ) throw ( I_FIFO_OutOfBoundsException
 
 MemRingBuffer::MemRingBuffer()
 {
-    m_nBufferLen            = 0;
-    m_p                     = 0;
-    m_nStart                = 0;
-    m_nOccupiedBuffer       = 0;
+    m_nBufferLen 			= 0;
+    m_p 					= 0;
+    m_nStart 				= 0;
+    m_nOccupiedBuffer		= 0;
 }
 
 MemRingBuffer::~MemRingBuffer()
diff --git a/io/source/stm/streamhelper.hxx b/io/source/stm/streamhelper.hxx
index 6a792732d4ef..8481d67f6079 100644
--- a/io/source/stm/streamhelper.hxx
+++ b/io/source/stm/streamhelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@
 #include <assert.h>
 
 #define Max( a, b )     (((a)>(b)) ? (a) : (b) )
-#define Min( a, b )     (((a)<(b)) ? (a) : (b) )
+#define Min( a, b )		(((a)<(b)) ? (a) : (b) )
 
 namespace io_stm {
 
@@ -55,15 +55,15 @@ class I_FIFO
 public:
 
 
-    virtual void    write( const Sequence<sal_Int8> &) throw( I_FIFO_OutOfMemoryException,
+    virtual void 	write( const Sequence<sal_Int8> &) throw( I_FIFO_OutOfMemoryException,
                                                               I_FIFO_OutOfBoundsException )=0;
 
-    virtual void    read( Sequence<sal_Int8> & , sal_Int32 nBytesToRead )
+    virtual void 	read( Sequence<sal_Int8> & , sal_Int32 nBytesToRead )
                                                        throw( I_FIFO_OutOfBoundsException )=0;
-    virtual void    skip( sal_Int32 nBytesToSkip )
+    virtual void 	skip( sal_Int32 nBytesToSkip )
                                                        throw( I_FIFO_OutOfBoundsException )=0;
-    virtual sal_Int32   getSize() const throw(  )  =0;
-    virtual void    shrink() throw() = 0;
+    virtual sal_Int32 	getSize() const throw(  )  =0;
+    virtual void 	shrink() throw() = 0;
 
     virtual ~I_FIFO() {};
 };
@@ -86,15 +86,15 @@ public:
     *
     ***/
 
-    virtual void    writeAt( sal_Int32 nPos, const Sequence<sal_Int8> &)
+    virtual void 	writeAt( sal_Int32 nPos, const Sequence<sal_Int8> &)
         throw( IRingBuffer_OutOfMemoryException,
                IRingBuffer_OutOfBoundsException )=0;
-    virtual void    readAt( sal_Int32 nPos, Sequence<sal_Int8> & , sal_Int32 nBytesToRead ) const
+    virtual void 	readAt( sal_Int32 nPos, Sequence<sal_Int8> & , sal_Int32 nBytesToRead ) const
         throw( IRingBuffer_OutOfBoundsException )=0;
-    virtual sal_Int32   getSize() const throw(  )  =0;
-    virtual void    forgetFromStart( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException)=0;
-    virtual void    forgetFromEnd( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException)=0;
-    virtual void    shrink() throw() = 0;
+    virtual sal_Int32 	getSize() const throw(  )  =0;
+    virtual void 	forgetFromStart( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException)=0;
+    virtual void	forgetFromEnd( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException)=0;
+    virtual void 	shrink() throw() = 0;
     virtual ~IRingBuffer() {};
 };
 
@@ -106,14 +106,14 @@ public:
     MemRingBuffer();
     virtual ~MemRingBuffer();
 
-    virtual void    writeAt( sal_Int32 nPos, const Sequence<sal_Int8> &)
-                                                    throw(  IRingBuffer_OutOfMemoryException,
+    virtual void 	writeAt( sal_Int32 nPos, const Sequence<sal_Int8> &)
+                                                    throw(	IRingBuffer_OutOfMemoryException,
                                                                 IRingBuffer_OutOfBoundsException );
-    virtual void    readAt( sal_Int32 nPos, Sequence<sal_Int8> & , sal_Int32 nBytesToRead ) const
+    virtual void 	readAt( sal_Int32 nPos, Sequence<sal_Int8> & , sal_Int32 nBytesToRead ) const
                                                     throw( IRingBuffer_OutOfBoundsException );
-    virtual sal_Int32   getSize() const throw(  );
-    virtual void    forgetFromStart( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException);
-    virtual void    forgetFromEnd( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException);
+    virtual sal_Int32 	getSize() const throw(  );
+    virtual void 	forgetFromStart( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException);
+    virtual void	forgetFromEnd( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException);
 
     virtual void shrink() throw();
 
@@ -129,10 +129,10 @@ private:
         assert( 0 == m_nStart || m_nStart < m_nBufferLen );
     }
 
-    sal_Int8    *m_p;
-    sal_Int32   m_nBufferLen;
-    sal_Int32   m_nStart;
-    sal_Int32   m_nOccupiedBuffer;
+    sal_Int8 	*m_p;
+    sal_Int32 	m_nBufferLen;
+    sal_Int32 	m_nStart;
+    sal_Int32 	m_nOccupiedBuffer;
 };
 
 
@@ -141,14 +141,14 @@ class MemFIFO :
     private MemRingBuffer
 {
 public:
-    virtual void    write( const Sequence<sal_Int8> &) throw( I_FIFO_OutOfMemoryException,
+    virtual void 	write( const Sequence<sal_Int8> &) throw( I_FIFO_OutOfMemoryException,
                                                               I_FIFO_OutOfBoundsException );
-    virtual void    read( Sequence<sal_Int8> & , sal_Int32 nBytesToRead )
+    virtual void 	read( Sequence<sal_Int8> & , sal_Int32 nBytesToRead )
                                                        throw( I_FIFO_OutOfBoundsException );
-    virtual void    skip( sal_Int32 nBytesToSkip ) throw( I_FIFO_OutOfBoundsException );
-    virtual sal_Int32   getSize()  const throw(  )
+    virtual void 	skip( sal_Int32 nBytesToSkip ) throw( I_FIFO_OutOfBoundsException );
+    virtual sal_Int32 	getSize()  const throw(  )
                         { return MemRingBuffer::getSize(); }
-    virtual void    shrink() throw()
+    virtual void 	shrink() throw()
                         { MemRingBuffer::shrink(); }
 
 };
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx
index 94e4cbdf48bc..3f86a21f6091 100644
--- a/io/test/stm/datatest.cxx
+++ b/io/test/stm/datatest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -88,19 +88,19 @@ public:
 
 public:
     virtual void SAL_CALL testInvariant(const OUString& TestName, const Reference < XInterface >& TestObject)
-        throw ( IllegalArgumentException,
+        throw (	IllegalArgumentException,
                     RuntimeException);
 
-    virtual sal_Int32 SAL_CALL test(    const OUString& TestName,
+    virtual sal_Int32 SAL_CALL test(	const OUString& TestName,
                                         const Reference < XInterface >& TestObject,
                                         sal_Int32 hTestHandle)
-        throw ( IllegalArgumentException,
+        throw (	IllegalArgumentException,
                 RuntimeException);
 
-    virtual sal_Bool SAL_CALL testPassed(void)                              throw ( RuntimeException);
-    virtual Sequence< OUString > SAL_CALL getErrors(void)               throw (RuntimeException);
-    virtual Sequence< Any > SAL_CALL getErrorExceptions(void)       throw (RuntimeException);
-    virtual Sequence< OUString > SAL_CALL getWarnings(void)                 throw (RuntimeException);
+    virtual sal_Bool SAL_CALL testPassed(void) 								throw (	RuntimeException);
+    virtual Sequence< OUString > SAL_CALL getErrors(void) 				throw (RuntimeException);
+    virtual Sequence< Any > SAL_CALL getErrorExceptions(void) 		throw (RuntimeException);
+    virtual Sequence< OUString > SAL_CALL getWarnings(void) 				throw (RuntimeException);
 
 private:
     void testSimple( const Reference < XDataInputStream > & , const Reference < XDataOutputStream > &);
@@ -119,7 +119,7 @@ protected:
 void ODataStreamTest::testInvariant(
     const OUString& TestName,
     const Reference < XInterface >& TestObject )
-    throw ( IllegalArgumentException,
+    throw (	IllegalArgumentException,
             RuntimeException)
 {
     if( OUString::createFromAscii("com.sun.star.io.DataInputStream") == TestName ) {
@@ -141,10 +141,10 @@ void ODataStreamTest::testInvariant(
         Reference < XOutputStream > output( TestObject , UNO_QUERY );
         Reference < XDataOutputStream > dataOutput( TestObject , UNO_QUERY );
 
-        WARNING_ASSERT( connect.is(),       "XConnectable cannot be queried" );
-        WARNING_ASSERT( active.is() ,   "XActiveDataSink cannot be queried" );
-        ERROR_ASSERT(   output.is() ,   "XInputStream cannot be queried" );
-        ERROR_ASSERT(   dataOutput.is(),    "XDataInputStream cannot be queried" );
+        WARNING_ASSERT( connect.is(), 		"XConnectable cannot be queried" );
+        WARNING_ASSERT( active.is() , 	"XActiveDataSink cannot be queried" );
+        ERROR_ASSERT( 	output.is() ,	"XInputStream cannot be queried" );
+        ERROR_ASSERT( 	dataOutput.is(),	"XDataInputStream cannot be queried" );
 
     }
 
@@ -163,7 +163,7 @@ sal_Int32 ODataStreamTest::test(
     const OUString& TestName,
     const Reference < XInterface >& TestObject,
     sal_Int32 hTestHandle)
-    throw ( IllegalArgumentException,
+    throw (	IllegalArgumentException,
             RuntimeException)
 {
     if( OUString::createFromAscii("com.sun.star.io.DataInputStream") == TestName ||
@@ -240,30 +240,30 @@ sal_Int32 ODataStreamTest::test(
 
 
 
-sal_Bool ODataStreamTest::testPassed(void)                                      throw (RuntimeException)
+sal_Bool ODataStreamTest::testPassed(void) 										throw (RuntimeException)
 {
     return m_seqErrors.getLength() == 0;
 }
 
 
-Sequence< OUString > ODataStreamTest::getErrors(void)                           throw (RuntimeException)
+Sequence< OUString > ODataStreamTest::getErrors(void) 							throw (RuntimeException)
 {
     return m_seqErrors;
 }
 
 
-Sequence< Any > ODataStreamTest::getErrorExceptions(void)                   throw (RuntimeException)
+Sequence< Any > ODataStreamTest::getErrorExceptions(void) 					throw (RuntimeException)
 {
     return m_seqExceptions;
 }
 
 
-Sequence< OUString > ODataStreamTest::getWarnings(void)                         throw (RuntimeException)
+Sequence< OUString > ODataStreamTest::getWarnings(void) 						throw (RuntimeException)
 {
     return m_seqWarnings;
 }
 
-void ODataStreamTest::testSimple(   const Reference < XDataInputStream > &rInput,
+void ODataStreamTest::testSimple( 	const Reference < XDataInputStream > &rInput,
                                     const Reference < XDataOutputStream > &rOutput )
 {
     rOutput->writeLong( 0x34ff3c );
@@ -336,7 +336,7 @@ void ODataStreamTest::testSimple(   const Reference < XDataInputStream > &rInput
         // ok
     }
     catch( ... ) {
-        ERROR_ASSERT( 0 , "IOException  expected, but another exception was thrown" );
+        ERROR_ASSERT( 0 , "IOException	expected, but another exception was thrown" );
     }
 
 }
@@ -374,7 +374,7 @@ OUString     ODataStreamTest_getServiceName( int i) throw ()
     }
 }
 
-OUString    ODataStreamTest_getImplementationName( int i) throw ()
+OUString 	ODataStreamTest_getImplementationName( int i) throw ()
 {
     if( 1 == i ) {
         return OUString(
@@ -423,50 +423,50 @@ public:
         throw (RuntimeException);
 
     virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const Any& aValue)
-        throw ( UnknownPropertyException,
+        throw (	UnknownPropertyException,
                 PropertyVetoException,
                 IllegalArgumentException,
                 WrappedTargetException,
                 RuntimeException);
     virtual Any SAL_CALL getPropertyValue(const OUString& PropertyName)
-        throw ( UnknownPropertyException,
+        throw (	UnknownPropertyException,
                 WrappedTargetException,
                 RuntimeException);
     virtual void SAL_CALL addPropertyChangeListener(
         const OUString& aPropertyName,
         const Reference < XPropertyChangeListener > & xListener)
-        throw ( UnknownPropertyException,
+        throw (	UnknownPropertyException,
                 WrappedTargetException,
                 RuntimeException);
 
     virtual void SAL_CALL removePropertyChangeListener(
         const OUString& aPropertyName,
         const Reference< XPropertyChangeListener > & aListener)
-        throw ( UnknownPropertyException,
+        throw (	UnknownPropertyException,
                 WrappedTargetException,
                 RuntimeException);
     virtual void SAL_CALL addVetoableChangeListener(
         const OUString& PropertyName,
         const Reference< XVetoableChangeListener > & aListener)
-        throw ( UnknownPropertyException,
+        throw (	UnknownPropertyException,
                 WrappedTargetException,
                 RuntimeException);
 
     virtual void SAL_CALL removeVetoableChangeListener(
         const OUString& PropertyName,
         const Reference<  XVetoableChangeListener >& aListener)
-        throw ( UnknownPropertyException,
+        throw (	UnknownPropertyException,
                 WrappedTargetException,
                 RuntimeException);
 
 public:
-    sal_Int32   m_l;
-    float   m_f;
-    double  m_d;
-    sal_Bool    m_b;
-    sal_Int8    m_byte;
-    sal_Unicode m_c;
-    OUString    m_s;
+    sal_Int32	m_l;
+    float	m_f;
+    double	m_d;
+    sal_Bool	m_b;
+    sal_Int8	m_byte;
+    sal_Unicode	m_c;
+    OUString	m_s;
     Reference< XPersistObject > m_ref;
     OUString m_sServiceName;
 };
@@ -482,7 +482,7 @@ Reference <XPropertySetInfo > MyPersistObject::getPropertySetInfo(void)
 void MyPersistObject::setPropertyValue(
     const OUString& aPropertyName,
     const Any& aValue)
-    throw ( UnknownPropertyException,
+    throw (	UnknownPropertyException,
             PropertyVetoException,
             IllegalArgumentException,
             WrappedTargetException,
@@ -523,7 +523,7 @@ void MyPersistObject::setPropertyValue(
 
 
 Any MyPersistObject::getPropertyValue(const OUString& aPropertyName)
-    throw ( UnknownPropertyException,
+    throw (	UnknownPropertyException,
             WrappedTargetException,
             RuntimeException)
 {
@@ -560,7 +560,7 @@ Any MyPersistObject::getPropertyValue(const OUString& aPropertyName)
 void MyPersistObject::addPropertyChangeListener(
     const OUString& aPropertyName,
     const Reference< XPropertyChangeListener > & xListener)
-    throw ( UnknownPropertyException,
+    throw (	UnknownPropertyException,
             WrappedTargetException,
             RuntimeException)
 {
@@ -570,7 +570,7 @@ void MyPersistObject::addPropertyChangeListener(
 void MyPersistObject::removePropertyChangeListener(
     const OUString& aPropertyName,
     const Reference < XPropertyChangeListener > & aListener)
-    throw ( UnknownPropertyException,
+    throw (	UnknownPropertyException,
             WrappedTargetException,
             RuntimeException)
 {
@@ -580,7 +580,7 @@ void MyPersistObject::removePropertyChangeListener(
 void MyPersistObject::addVetoableChangeListener(
     const OUString& PropertyName,
     const Reference <XVetoableChangeListener >& aListener)
-    throw ( UnknownPropertyException,
+    throw (	UnknownPropertyException,
             WrappedTargetException,
             RuntimeException)
 {
@@ -590,7 +590,7 @@ void MyPersistObject::addVetoableChangeListener(
 void MyPersistObject::removeVetoableChangeListener(
     const OUString& PropertyName,
     const Reference < XVetoableChangeListener > & aListener)
-    throw ( UnknownPropertyException,
+    throw (	UnknownPropertyException,
             WrappedTargetException,
             RuntimeException)
 {
@@ -652,7 +652,7 @@ OUString     OMyPersistObject_getServiceName( ) throw ()
     return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.PersistTest" ));
 }
 
-OUString    OMyPersistObject_getImplementationName( ) throw ()
+OUString 	OMyPersistObject_getImplementationName( ) throw ()
 {
     return OUString( RTL_CONSTASCII_USTRINGPARAM( "test.com.sun.star.io.PersistTest" ) );
 }
@@ -669,19 +669,19 @@ public:
 public:
     virtual void SAL_CALL testInvariant(const OUString& TestName,
                                const Reference < XInterface >& TestObject)
-        throw ( IllegalArgumentException,
+        throw (	IllegalArgumentException,
                 RuntimeException);
 
     virtual sal_Int32 SAL_CALL test(
-        const OUString& TestName,
-        const Reference < XInterface >& TestObject,
+        const OUString& TestName, 
+        const Reference < XInterface >& TestObject, 
         sal_Int32 hTestHandle)
-        throw ( IllegalArgumentException,
+        throw (	IllegalArgumentException, 
                 RuntimeException);
 
 
 private:
-    void OObjectStreamTest::testObject(     const Reference <XObjectOutputStream > &rOut,
+    void OObjectStreamTest::testObject( 	const Reference <XObjectOutputStream > &rOut, 
                                             const Reference <XObjectInputStream> &rIn );
 
 private:
@@ -690,14 +690,14 @@ private:
 
 void OObjectStreamTest::testInvariant( const OUString& TestName,
                                        const Reference < XInterface >& TestObject )
-    throw ( IllegalArgumentException, RuntimeException)
+    throw (	IllegalArgumentException, RuntimeException)
 {
 
     if( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.ObjectInputStream" ) )
                   == TestName )
     {
         ODataStreamTest::testInvariant( TestName , TestObject );
-        Reference< XObjectInputStream > dataInput( TestObject , UNO_QUERY );
+        Reference< XObjectInputStream > dataInput( TestObject , UNO_QUERY );		
         Reference< XMarkableStream >  markable( TestObject , UNO_QUERY );
         ERROR_ASSERT( dataInput.is() , "XObjectInputStream cannot be queried" );
         ERROR_ASSERT(   markable.is() , "XMarkableStream cannot be queried" );
@@ -708,7 +708,7 @@ void OObjectStreamTest::testInvariant( const OUString& TestName,
         ODataStreamTest::testInvariant( TestName , TestObject );
         Reference < XMarkableStream > markable( TestObject , UNO_QUERY );
         Reference < XObjectOutputStream > dataOutput( TestObject , UNO_QUERY );
-        ERROR_ASSERT(   dataOutput.is(),    "XObjectOutputStream cannot be queried" );
+        ERROR_ASSERT( 	dataOutput.is(),	"XObjectOutputStream cannot be queried" );
         ERROR_ASSERT(   markable.is() , "XMarkableStream cannot be queried" );
     }
 
@@ -722,15 +722,15 @@ void OObjectStreamTest::testInvariant( const OUString& TestName,
 
 }
 
-sal_Int32 OObjectStreamTest::test(  const OUString& TestName,
-                        const Reference < XInterface >& TestObject,
+sal_Int32 OObjectStreamTest::test(	const OUString& TestName, 
+                        const Reference < XInterface >& TestObject, 
                         sal_Int32 hTestHandle)
-    throw ( IllegalArgumentException,
+    throw (	IllegalArgumentException, 
             RuntimeException)
 {
-    if( 0 == TestName.compareToAscii("com.sun.star.io.ObjectInputStream") ||
+    if( 0 == TestName.compareToAscii("com.sun.star.io.ObjectInputStream") || 
         0 == TestName.compareToAscii("com.sun.star.io.ObjectOutputStream" ) )  {
-
+        
         try
         {
             if( 0 == hTestHandle ) {
@@ -739,47 +739,47 @@ sal_Int32 OObjectStreamTest::test(  const OUString& TestName,
             else if( DATASTREAM_TEST_MAX_HANDLE >= hTestHandle ) {
                 sal_Int32 hOldHandle = hTestHandle;
                 hTestHandle = ODataStreamTest::test(
-                    OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream" )),
+                    OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream" )), 
                     TestObject , hTestHandle );
                 if( hTestHandle == -1 ){
                     hTestHandle = hOldHandle;
                 }
             }
             else {
-
+                
                 Reference<XActiveDataSink >  rSink( TestObject, UNO_QUERY );
                 Reference<XActiveDataSource >  rSource( TestObject , UNO_QUERY );
 
                 Reference< XObjectInputStream >  rInput( TestObject , UNO_QUERY );
                 Reference< XObjectOutputStream > rOutput( TestObject , UNO_QUERY );
 
-
+                
                 Reference < XInterface > x = m_rFactory->createInstance(
                     OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe" )) );
 
                 Reference <XInputStream > rPipeInput( x , UNO_QUERY );
                 Reference <XOutputStream >  rPipeOutput( x , UNO_QUERY );
-
+                
                 x = m_rFactory->createInstance(
                     OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableInputStream") ) );
 
                 Reference <XInputStream > markableInput( x , UNO_QUERY );
                 Reference <XActiveDataSink> markableSink( x , UNO_QUERY );
-
-                x = m_rFactory->createInstance( OUString(
+                
+                x = m_rFactory->createInstance( OUString( 
                     RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableOutputStream" ) ) );
-                Reference <XOutputStream >  markableOutput( x , UNO_QUERY );
-                Reference <XActiveDataSource >  markableSource( x , UNO_QUERY );
-
-                OSL_ASSERT( markableInput.is()  );
+                Reference <XOutputStream > 	markableOutput( x , UNO_QUERY );
+                Reference <XActiveDataSource >	markableSource( x , UNO_QUERY );
+                
+                OSL_ASSERT( markableInput.is() 	);
                 OSL_ASSERT( markableOutput.is() );
-                OSL_ASSERT( markableSink.is()   );
+                OSL_ASSERT( markableSink.is() 	);
                 OSL_ASSERT( markableSource.is() );
 
                 markableSink->setInputStream( rPipeInput );
                 markableSource->setOutputStream( rPipeOutput );
 
-                if( ! rSink.is() ) {
+                if( ! rSink.is() ) {					
                     x = m_rFactory->createInstance(
                         OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.ObjectInputStream") ));
                     rInput = Reference < XObjectInputStream > ( x , UNO_QUERY );
@@ -794,7 +794,7 @@ sal_Int32 OObjectStreamTest::test(  const OUString& TestName,
 
                 OSL_ASSERT( rPipeInput.is() );
                 OSL_ASSERT( rPipeOutput.is() );
-
+                
                 rSink->setInputStream( markableInput );
                 rSource->setOutputStream( markableOutput );
 
@@ -806,7 +806,7 @@ sal_Int32 OObjectStreamTest::test(  const OUString& TestName,
                 }
                 rInput->closeInput();
                 rOutput->closeOutput();
-
+                
             }
         }
         catch( Exception &e )  {
@@ -816,9 +816,9 @@ sal_Int32 OObjectStreamTest::test(  const OUString& TestName,
         catch( ... ) {
             BUILD_ERROR( 0 , "unknown exception (Exception is  not base class)" );
         }
-
+    
         hTestHandle ++;
-
+        
         if( hTestHandle > 1 +DATASTREAM_TEST_MAX_HANDLE ) {
             // all tests finished.
             hTestHandle = -1;
@@ -828,7 +828,7 @@ sal_Int32 OObjectStreamTest::test(  const OUString& TestName,
         BUILD_ERROR( 0 , "service not supported by test." );
     }
     return hTestHandle;
-}
+}													
 
 
 sal_Bool compareMyPropertySet( Reference< XPropertySet > &r1 , Reference < XPropertySet > &r2 )
@@ -837,17 +837,17 @@ sal_Bool compareMyPropertySet( Reference< XPropertySet > &r1 , Reference < XProp
 
     if( r1->getPropertyValue( OUString::createFromAscii("long") ).getValueType() == getCppuVoidType() ||
         r2->getPropertyValue( OUString::createFromAscii("long") ).getValueType() == getCppuVoidType() ) {
-
+        
         // one of the objects is not the correct propertyset !
         fprintf( stderr, "compareMyPropertySet: 1\n" );
         return sal_False;
     }
-
-    b = b && (  r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("long")) ) ==
+    
+    b = b && ( 	r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("long")) ) ==
                 r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("long")) ) );
     if( ! b ) fprintf( stderr, "compareMyPropertySet: 2\n" );
 
-    b = b && (  r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("float")) ) ==
+    b = b && ( 	r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("float")) ) ==
                 r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("float")) ) );
     if( ! b ){
         float f1(0.0);
@@ -856,8 +856,8 @@ sal_Bool compareMyPropertySet( Reference< XPropertySet > &r1 , Reference < XProp
         r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("float")) ) >>= f2;
         fprintf( stderr, "compareMyPropertySet: %f %f 3\n",f1,f2 );
     }
-
-    b = b && (  r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("double")) ) ==
+    
+    b = b && ( 	r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("double")) ) ==
                 r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("double" ))) );
     if( ! b ) fprintf( stderr, "compareMyPropertySet: 4\n" );
 
@@ -869,24 +869,24 @@ sal_Bool compareMyPropertySet( Reference< XPropertySet > &r1 , Reference < XProp
     b = b && ( (b1 && b2) || b1 == b2 );
     if( ! b ) fprintf( stderr, "compareMyPropertySet: 5\n" );
 
-//      b = b &&    r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("bool")) ) ==
-//                  r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("bool")) ) );
-
-    b = b && (  r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("byte")) ) ==
+//  	b = b &&	r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("bool")) ) ==
+//  				r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("bool")) ) );
+                
+    b = b && ( 	r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("byte")) ) ==
                 r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("byte")) ) );
     if( ! b ) fprintf( stderr, "compareMyPropertySet: 6\n" );
-
-    b = b && (  r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("char")) ) ==
+                
+    b = b && ( 	r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("char")) ) ==
                 r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("char")) ) );
     if( ! b ) fprintf( stderr, "compareMyPropertySet: 7\n" );
 
-    b = b && (  r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("string")) ) ==
+    b = b && ( 	r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("string")) ) == 
                 r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("string")) ));
-    if( ! b ) fprintf( stderr, "compareMyPropertySet: 8\n" );
+    if( ! b ) fprintf( stderr, "compareMyPropertySet: 8\n" );    
 
     Any o1 = r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("object")) );
     Any o2 = r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("object")) );
-
+    
     if( o1.getValueType() == getCppuType( (Reference<XPersistObject>*)0 ) ) {
 
         if( o2.getValueType() == getCppuType( (Reference<XPersistObject>*)0 ) ) {
@@ -896,34 +896,34 @@ sal_Bool compareMyPropertySet( Reference< XPropertySet > &r1 , Reference < XProp
             o2 >>= rPersist2;
             Reference <XPropertySet > rProp1( rPersist1 , UNO_QUERY );
             Reference < XPropertySet > rProp2( rPersist2 , UNO_QUERY );
-
-            if( rProp1.is() && rProp2.is() && ! ( rProp1 == rProp2 )
+                        
+            if( rProp1.is() && rProp2.is() && ! ( rProp1 == rProp2 ) 
                 &&( rProp1 != r1 )) {
                     b = b && compareMyPropertySet( rProp1 , rProp2 );
-            }
+            }		
         }
         else {
-            b = sal_False;
+            b = sal_False;	
         }
-        if( ! b ) fprintf( stderr, "compareMyPropertySet: 9\n" );
+        if( ! b ) fprintf( stderr, "compareMyPropertySet: 9\n" );    
     }
     else {
         if( o2.getValueType()  == getCppuType( (Reference<XPersistObject>*)0 ) ) {
-            b = sal_False;
+            b = sal_False;	
         }
-        if( ! b ) fprintf( stderr, "compareMyPropertySet: 10\n" );
+        if( ! b ) fprintf( stderr, "compareMyPropertySet: 10\n" );    
     }
 
     return b;
 }
 
-void OObjectStreamTest::testObject(     const Reference<  XObjectOutputStream >  &rOut,
+void OObjectStreamTest::testObject( 	const Reference<  XObjectOutputStream >  &rOut, 
                                         const Reference < XObjectInputStream > &rIn )
 {
     ERROR_ASSERT( rOut.is() , "no objectOutputStream" );
     ERROR_ASSERT( rIn.is() , "no objectInputStream" );
-
-
+    
+    
 
     // tests, if saving an object with an unknown service name allows
     // reading the data behind the object !
@@ -959,10 +959,10 @@ void OObjectStreamTest::testObject(     const Reference<  XObjectOutputStream >
         Reference< XPersistObject > persistRef( x , UNO_QUERY );
 
         ERROR_ASSERT( persistRef.is() , "couldn't instantiate PersistTest object" );
-
+        
         Reference < XPropertySet > rProp( persistRef , UNO_QUERY );
         ERROR_ASSERT( rProp.is() , "test object is no property set " );
-
+    
         Any any;
         sal_Int32 i = 0x83482;
         any <<= i;
@@ -994,12 +994,12 @@ void OObjectStreamTest::testObject(     const Reference<  XObjectOutputStream >
 
         any <<= persistRef;
         rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("object")) , any );
-
-        // do read and write
-        rOut->writeObject( persistRef );
+    
+        // do read and write 
+        rOut->writeObject( persistRef );	
         ERROR_ASSERT( 0 != rIn->available() , "no data arrived at input" );
-        Reference< XPersistObject > xReadPersist    =   rIn->readObject( );
-
+        Reference< XPersistObject > xReadPersist	= 	rIn->readObject( );
+        
         Reference< XPropertySet >  rPropRead( xReadPersist , UNO_QUERY );
         ERROR_ASSERT( compareMyPropertySet( rProp , rPropRead ) , "objects has not been read properly !" );
 
@@ -1011,73 +1011,73 @@ void OObjectStreamTest::testObject(     const Reference<  XObjectOutputStream >
     {
         Reference< XMarkableStream > markableOut( rOut , UNO_QUERY );
         ERROR_ASSERT( markableOut.is() , "markable stream cannot be queried" );
-
+        
         // do the same thing multiple times to check if
         // buffering and marks work correctly
         for( int i = 0 ; i < 2000 ; i ++ ) {
 
             Reference < XInterface > x = m_rFactory->createInstance(OUString::createFromAscii("test.com.sun.star.io.PersistTest"));
             Reference< XPersistObject >  persistRef( x , UNO_QUERY );
-
+        
             Reference < XPropertySet >  rProp( persistRef , UNO_QUERY );
             ERROR_ASSERT( rProp.is() , "test object is no property set " );
-
+        
             Any any;
             sal_Int32 i = 0x83482;
             any <<= i;
             rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("long")) , any );
-
+            
             float f = 42.23;
             any <<= f;
             rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("float")) , any );
-
+            
             double d = 233.321412;
             any <<= d;
             rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("double")) , any );
-
+            
             sal_Bool b = sal_True;
             any.setValue( &b , getCppuBooleanType() );
             rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("bool")) , any );
-
+            
             sal_Int8 by = 120;
             any <<= by;
             rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("byte")) , any );
-
+            
             sal_Unicode c = 'h';
             any.setValue( &c , getCppuCharType() );
             rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("char")) , any );
-
+            
             OUString str( RTL_CONSTASCII_USTRINGPARAM( "hi du !" ) );
             any <<= str;
             rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("string")) , any );
-
+            
             x = m_rFactory->createInstance(OUString::createFromAscii("test.com.sun.star.io.PersistTest"));
             Reference <XPersistObject > persist2ndRef( x , UNO_QUERY );
-
+    
             // Note : persist2ndRef contains coincident values, but also coincident values must be
             // saved properly !
             any <<= persist2ndRef;
             rProp->setPropertyValue( OUString::createFromAscii("object") , any );
-
+            
             // simply test, if markable operations and object operations do not interfere
             sal_Int32 nMark = markableOut->createMark();
 
-            // do read and write
-            rOut->writeObject( persistRef );
-
+            // do read and write 
+            rOut->writeObject( persistRef );	
+            
             // further markable tests !
             sal_Int32 nOffset = markableOut->offsetToMark( nMark );
             markableOut->jumpToMark( nMark );
             markableOut->deleteMark( nMark );
             markableOut->jumpToFurthest();
-
+            
 
 
 
 
             ERROR_ASSERT( 0 != rIn->available() , "no data arrived at input" );
-            Reference < XPersistObject > xReadPersistRef    =   rIn->readObject( );
-
+            Reference < XPersistObject > xReadPersistRef	= 	rIn->readObject( );
+            
             Reference< XPropertySet > rProp1( persistRef , UNO_QUERY );
             Reference< XPropertySet >  rProp2( xReadPersistRef , UNO_QUERY );
             ERROR_ASSERT( compareMyPropertySet( rProp1, rProp2) ,
@@ -1088,7 +1088,7 @@ void OObjectStreamTest::testObject(     const Reference<  XObjectOutputStream >
 
 
 Reference < XInterface > SAL_CALL OObjectStreamTest_CreateInstance( const Reference < XMultiServiceFactory > & rSMgr ) throw(Exception)
-{
+{	
     OObjectStreamTest *p = new OObjectStreamTest( rSMgr );
     return Reference < XInterface > ( SAL_STATIC_CAST( OWeakObject * , p ) );
 }
@@ -1100,23 +1100,23 @@ Sequence<OUString> OObjectStreamTest_getSupportedServiceNames( int i) throw ()
     return aRet;
 }
 
-OUString     OObjectStreamTest_getServiceName( int i) throw ()
+OUString     OObjectStreamTest_getServiceName( int i) throw () 
 {
     if( 1 == i ) {
         return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.ObjectInputStream" ));
-    }
+    } 
     else {
-        return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.ObjectOutputStream"));
+        return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.ObjectOutputStream"));	
     }
 }
 
-OUString    OObjectStreamTest_getImplementationName( int i) throw ()
+OUString 	OObjectStreamTest_getImplementationName( int i) throw ()
 {
     if( 1 == i ) {
         return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.comp.extensions.stm.ObjectInputStream" ));
     }
     else {
-        return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.comp.extensions.stm.ObjectOutputStream"));
+        return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.comp.extensions.stm.ObjectOutputStream"));	
     }
 }
 
diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx
index ecd3ad30366b..488f80249a8a 100644
--- a/io/test/stm/marktest.cxx
+++ b/io/test/stm/marktest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -63,22 +63,22 @@ public:
     ~OMarkableOutputStreamTest();
 
 public: // implementation names
-    static Sequence< OUString >     getSupportedServiceNames_Static(void) throw ();
-    static OUString                 getImplementationName_Static() throw ();
+    static Sequence< OUString > 	getSupportedServiceNames_Static(void) throw ();
+    static OUString 				getImplementationName_Static() throw ();
 
 public:
     virtual void SAL_CALL testInvariant(
         const OUString& TestName,
         const Reference < XInterface >& TestObject)
-        throw ( IllegalArgumentException,
+        throw (	IllegalArgumentException,
                 RuntimeException) ;
 
-    virtual sal_Int32 SAL_CALL  test(   const OUString& TestName,
+    virtual sal_Int32 SAL_CALL  test(	const OUString& TestName,
                         const Reference < XInterface >& TestObject,
                         sal_Int32 hTestHandle)
-        throw ( IllegalArgumentException, RuntimeException);
+        throw (	IllegalArgumentException, RuntimeException);
     virtual sal_Bool SAL_CALL testPassed(void)
-        throw ( RuntimeException);
+        throw (	RuntimeException);
     virtual Sequence< OUString > SAL_CALL getErrors(void)
         throw (RuntimeException);
     virtual Sequence< Any > SAL_CALL getErrorExceptions(void)
@@ -113,7 +113,7 @@ OMarkableOutputStreamTest::~OMarkableOutputStreamTest()
 
 void OMarkableOutputStreamTest::testInvariant( const OUString& TestName,
                                                const Reference < XInterface >& TestObject )
-    throw ( IllegalArgumentException, RuntimeException)
+    throw (	IllegalArgumentException, RuntimeException)
 {
     Reference< XServiceInfo > info( TestObject, UNO_QUERY );
     ERROR_ASSERT( info.is() , "XServiceInfo not supported !" );
@@ -130,7 +130,7 @@ sal_Int32 OMarkableOutputStreamTest::test(
     const OUString& TestName,
     const Reference < XInterface >& TestObject,
     sal_Int32 hTestHandle)
-    throw ( IllegalArgumentException, RuntimeException)
+    throw (	IllegalArgumentException, RuntimeException)
 {
     if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableOutputStream") )
                   == TestName  )  {
@@ -186,13 +186,13 @@ sal_Int32 OMarkableOutputStreamTest::test(
 
 
 
-sal_Bool OMarkableOutputStreamTest::testPassed(void)                        throw (RuntimeException)
+sal_Bool OMarkableOutputStreamTest::testPassed(void) 						throw (RuntimeException)
 {
     return m_seqErrors.getLength() == 0;
 }
 
 
-Sequence< OUString > OMarkableOutputStreamTest::getErrors(void)         throw (RuntimeException)
+Sequence< OUString > OMarkableOutputStreamTest::getErrors(void) 		throw (RuntimeException)
 {
     return m_seqErrors;
 }
@@ -204,13 +204,13 @@ Sequence< Any > OMarkableOutputStreamTest::getErrorExceptions(void) throw (Runti
 }
 
 
-Sequence< OUString > OMarkableOutputStreamTest::getWarnings(void)       throw (RuntimeException)
+Sequence< OUString > OMarkableOutputStreamTest::getWarnings(void) 		throw (RuntimeException)
 {
     return m_seqWarnings;
 }
 
 
-void OMarkableOutputStreamTest::testSimple(     const Reference< XOutputStream > &rOutput ,
+void OMarkableOutputStreamTest::testSimple(  	const Reference< XOutputStream > &rOutput ,
                                                 const Reference< XInputStream > &rInput )
 {
     Reference < XMarkableStream > rMarkable( rOutput , UNO_QUERY );
@@ -400,7 +400,7 @@ OUString     OMarkableOutputStreamTest_getServiceName() throw ()
     return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.MarkableOutputStream"));
 }
 
-OUString    OMarkableOutputStreamTest_getImplementationName() throw ()
+OUString 	OMarkableOutputStreamTest_getImplementationName() throw ()
 {
     return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.starextensions.stm.MarkableOutputStream"));
 }
@@ -422,24 +422,24 @@ public:
     ~OMarkableInputStreamTest();
 
 public: // implementation names
-    static Sequence< OUString >     getSupportedServiceNames_Static(void) throw () ;
-    static OUString                 getImplementationName_Static() throw () ;
+    static Sequence< OUString > 	getSupportedServiceNames_Static(void) throw () ;
+    static OUString 				getImplementationName_Static() throw () ;
 
 public:
     virtual void SAL_CALL testInvariant(
         const OUString& TestName,
         const Reference < XInterface >& TestObject)
-        throw ( IllegalArgumentException, RuntimeException) ;
+        throw (	IllegalArgumentException, RuntimeException) ;
 
     virtual sal_Int32 SAL_CALL test(
         const OUString& TestName,
         const Reference < XInterface >& TestObject,
         sal_Int32 hTestHandle)
-        throw ( IllegalArgumentException,
+        throw (	IllegalArgumentException,
                 RuntimeException) ;
 
     virtual sal_Bool SAL_CALL testPassed(void)
-        throw ( RuntimeException);
+        throw (	RuntimeException);
     virtual Sequence< OUString > SAL_CALL getErrors(void)
         throw (RuntimeException);
     virtual Sequence< Any > SAL_CALL getErrorExceptions(void)
@@ -474,7 +474,7 @@ OMarkableInputStreamTest::~OMarkableInputStreamTest()
 
 void OMarkableInputStreamTest::testInvariant(
     const OUString& TestName, const Reference < XInterface >& TestObject )
-    throw ( IllegalArgumentException, RuntimeException)
+    throw (	IllegalArgumentException, RuntimeException)
 {
     if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableInputStream"))
         == TestName )  {
@@ -499,7 +499,7 @@ void OMarkableInputStreamTest::testInvariant(
 sal_Int32 OMarkableInputStreamTest::test(
     const OUString& TestName,
     const Reference < XInterface >& TestObject,
-    sal_Int32 hTestHandle)  throw ( IllegalArgumentException, RuntimeException)
+    sal_Int32 hTestHandle) 	throw (	IllegalArgumentException, RuntimeException)
 {
     if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableInputStream")) == TestName )
     {
@@ -553,31 +553,31 @@ sal_Int32 OMarkableInputStreamTest::test(
 
 
 
-sal_Bool OMarkableInputStreamTest::testPassed(void)                                         throw (RuntimeException)
+sal_Bool OMarkableInputStreamTest::testPassed(void) 										throw (RuntimeException)
 {
     return m_seqErrors.getLength() == 0;
 }
 
 
-Sequence< OUString > OMarkableInputStreamTest::getErrors(void)                          throw (RuntimeException)
+Sequence< OUString > OMarkableInputStreamTest::getErrors(void) 							throw (RuntimeException)
 {
     return m_seqErrors;
 }
 
 
-Sequence< Any > OMarkableInputStreamTest::getErrorExceptions(void)                  throw (RuntimeException)
+Sequence< Any > OMarkableInputStreamTest::getErrorExceptions(void) 					throw (RuntimeException)
 {
     return m_seqExceptions;
 }
 
 
-Sequence< OUString > OMarkableInputStreamTest::getWarnings(void)                        throw (RuntimeException)
+Sequence< OUString > OMarkableInputStreamTest::getWarnings(void) 						throw (RuntimeException)
 {
     return m_seqWarnings;
 }
 
 
-void OMarkableInputStreamTest::testSimple(      const Reference< XOutputStream > &rOutput ,
+void OMarkableInputStreamTest::testSimple(  	const Reference< XOutputStream > &rOutput ,
                                                 const Reference < XInputStream > &rInput )
 {
     Reference < XMarkableStream > rMarkable( rInput , UNO_QUERY );
@@ -631,7 +631,7 @@ void OMarkableInputStreamTest::testSimple(      const Reference< XOutputStream >
     ERROR_ASSERT( 256-10-50 == rInput->available() , "marking error" );
 
 
-    ERROR_ASSERT( 100 == rInput->readSomeBytes( seqRead , 100   ) , "wrong results using readSomeBytes" );
+    ERROR_ASSERT( 100 == rInput->readSomeBytes( seqRead , 100	) , "wrong results using readSomeBytes" );
     ERROR_ASSERT( 96 == rInput->readSomeBytes( seqRead , 1000) , "wrong results using readSomeBytes" );
     rOutput->closeOutput();
     rInput->closeInput();
@@ -667,12 +667,12 @@ Sequence<OUString> OMarkableInputStreamTest_getSupportedServiceNames(void) throw
     return aRet;
 }
 
-OUString     OMarkableInputStreamTest_getServiceName() throw ()
+OUString     OMarkableInputStreamTest_getServiceName() throw () 
 {
     return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.MarkableInputStream"));
 }
 
-OUString    OMarkableInputStreamTest_getImplementationName() throw ()
+OUString 	OMarkableInputStreamTest_getImplementationName() throw () 
 {
     return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.extensions.stm.MarkableInputStream" ));
 }
diff --git a/io/test/stm/pipetest.cxx b/io/test/stm/pipetest.cxx
index b4f6208f7e53..2e7acaa78108 100644
--- a/io/test/stm/pipetest.cxx
+++ b/io/test/stm/pipetest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,8 +57,8 @@ using namespace ::com::sun::star::test;
 // streams
 
 #include "testfactreg.hxx"
-#define IMPLEMENTATION_NAME "test.com.sun.star.comp.extensions.stm.Pipe"
-#define SERVICE_NAME        "test.com.sun.star.io.Pipe"
+#define IMPLEMENTATION_NAME	"test.com.sun.star.comp.extensions.stm.Pipe"
+#define SERVICE_NAME		"test.com.sun.star.io.Pipe"
 
 
 class WriteToStreamThread :
@@ -110,23 +110,23 @@ public:
     ~OPipeTest();
 
 public: // implementation names
-    static Sequence< OUString >     getSupportedServiceNames_Static(void) throw();
-    static OUString                 getImplementationName_Static() throw();
+    static Sequence< OUString > 	getSupportedServiceNames_Static(void) throw();
+    static OUString 				getImplementationName_Static() throw();
 
 public:
     virtual void SAL_CALL testInvariant(const OUString& TestName, const Reference < XInterface >& TestObject)
         throw  ( IllegalArgumentException, RuntimeException) ;
 
-    virtual sal_Int32 SAL_CALL test(    const OUString& TestName,
+    virtual sal_Int32 SAL_CALL test(	const OUString& TestName,
                                         const Reference < XInterface >& TestObject,
                                         sal_Int32 hTestHandle)
-        throw  (    IllegalArgumentException,
+        throw  (	IllegalArgumentException,
                     RuntimeException);
 
-    virtual sal_Bool SAL_CALL testPassed(void)                              throw  (    RuntimeException) ;
-    virtual Sequence< OUString > SAL_CALL getErrors(void)               throw  (RuntimeException) ;
-    virtual Sequence< Any > SAL_CALL getErrorExceptions(void)       throw  (RuntimeException);
-    virtual Sequence< OUString > SAL_CALL getWarnings(void)                 throw  (RuntimeException);
+    virtual sal_Bool SAL_CALL testPassed(void) 								throw  (	RuntimeException) ;
+    virtual Sequence< OUString > SAL_CALL getErrors(void) 				throw  (RuntimeException) ;
+    virtual Sequence< Any > SAL_CALL getErrorExceptions(void) 		throw  (RuntimeException);
+    virtual Sequence< OUString > SAL_CALL getWarnings(void) 				throw  (RuntimeException);
 
 private:
     void testSimple( const Reference < XInterface > & );
@@ -155,7 +155,7 @@ OPipeTest::~OPipeTest()
 
 
 void OPipeTest::testInvariant( const OUString& TestName, const Reference < XInterface >& TestObject )
-    throw  (    IllegalArgumentException,
+    throw  (	IllegalArgumentException,
                 RuntimeException)
 {
     Reference< XServiceInfo > info( TestObject, UNO_QUERY );
@@ -174,7 +174,7 @@ sal_Int32 OPipeTest::test(
     const OUString& TestName,
     const Reference < XInterface >& TestObject,
     sal_Int32 hTestHandle)
-    throw  (    IllegalArgumentException, RuntimeException)
+    throw  (	IllegalArgumentException, RuntimeException)
 {
     if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe") ) == TestName )  {
         try
@@ -218,25 +218,25 @@ sal_Int32 OPipeTest::test(
 
 
 
-sal_Bool OPipeTest::testPassed(void)        throw  (RuntimeException)
+sal_Bool OPipeTest::testPassed(void) 		throw  (RuntimeException)
 {
     return m_seqErrors.getLength() == 0;
 }
 
 
-Sequence< OUString > OPipeTest::getErrors(void)     throw  (RuntimeException)
+Sequence< OUString > OPipeTest::getErrors(void)		throw  (RuntimeException)
 {
     return m_seqErrors;
 }
 
 
-Sequence< Any > OPipeTest::getErrorExceptions(void)                     throw  (RuntimeException)
+Sequence< Any > OPipeTest::getErrorExceptions(void) 					throw  (RuntimeException)
 {
     return m_seqExceptions;
 }
 
 
-Sequence< OUString > OPipeTest::getWarnings(void)                       throw  (RuntimeException)
+Sequence< OUString > OPipeTest::getWarnings(void) 						throw  (RuntimeException)
 {
     return m_seqWarnings;
 }
@@ -279,7 +279,7 @@ void OPipeTest::testSimple( const Reference < XInterface > &r )
         ERROR_ASSERT( 5 == input->available() , "wrong available after skip/write " );
 
         input->readBytes( seqRead , 5 );
-        ERROR_ASSERT(   ! strcmp(   (char*) seqRead.getArray() ,
+        ERROR_ASSERT( 	! strcmp( 	(char*) seqRead.getArray() ,
                             (char*) &( seqWrite.getArray()[seqWrite.getLength()-5] ) ),
                         "write/read mismatich" );
 
@@ -357,7 +357,7 @@ void OPipeTest::testBufferResizing( const Reference < XInterface > &r )
 
     for( i = 0 ; i < iMax ; i ++ ) {
         input->readBytes( seqRead, createIntSeq(i).getLength() );
-        ERROR_ASSERT( ! strcmp(     (char*) seqRead.getArray() ,
+        ERROR_ASSERT( ! strcmp( 	(char*) seqRead.getArray() ,
                                     (char*) createIntSeq(i).getArray() ) ,
                         "written/read mismatch\n" );
     }
@@ -396,7 +396,7 @@ void OPipeTest::testMultithreading( const Reference < XInterface > &r )
             break;
         }
 
-        ERROR_ASSERT( ! strcmp(     (char*) seqRead.getArray() ,
+        ERROR_ASSERT( ! strcmp( 	(char*) seqRead.getArray() ,
                                     (char*) createIntSeq(i).getArray() ) ,
                         "written/read mismatch\n" );
     }
@@ -434,7 +434,7 @@ OUString     OPipeTest_getServiceName() throw()
     return OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
 }
 
-OUString    OPipeTest_getImplementationName() throw()
+OUString 	OPipeTest_getImplementationName() throw()
 {
     return OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
 }
diff --git a/io/test/stm/pumptest.cxx b/io/test/stm/pumptest.cxx
index e8723375cc26..64975d42a8e7 100644
--- a/io/test/stm/pumptest.cxx
+++ b/io/test/stm/pumptest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -77,26 +77,26 @@ class OPumpTest : public WeakImplHelper1 < XSimpleTest >
 public:
     OPumpTest( const Reference< XMultiServiceFactory >  & rFactory );
     ~OPumpTest();
-
+    
 public: // implementation names
-    static Sequence< OUString >     getSupportedServiceNames_Static(void) throw();
-    static OUString                 getImplementationName_Static() throw();
+    static Sequence< OUString > 	getSupportedServiceNames_Static(void) throw();
+    static OUString 				getImplementationName_Static() throw();	
 
-public:
-    virtual void SAL_CALL testInvariant(const OUString& TestName, const Reference < XInterface >& TestObject)
+public:	
+    virtual void SAL_CALL testInvariant(const OUString& TestName, const Reference < XInterface >& TestObject) 
         throw  ( IllegalArgumentException, RuntimeException) ;
 
-    virtual sal_Int32 SAL_CALL test(    const OUString& TestName,
-                                        const Reference < XInterface >& TestObject,
+    virtual sal_Int32 SAL_CALL test(	const OUString& TestName, 
+                                        const Reference < XInterface >& TestObject, 
                                         sal_Int32 hTestHandle)
-        throw  (    IllegalArgumentException,
+        throw  (	IllegalArgumentException, 
                     RuntimeException);
 
-    virtual sal_Bool SAL_CALL testPassed(void)                              throw  (    RuntimeException) ;
-    virtual Sequence< OUString > SAL_CALL getErrors(void)               throw  (RuntimeException) ;
-    virtual Sequence< Any > SAL_CALL getErrorExceptions(void)       throw  (RuntimeException);
-    virtual Sequence< OUString > SAL_CALL getWarnings(void)                 throw  (RuntimeException);
-
+    virtual sal_Bool SAL_CALL testPassed(void) 								throw  (	RuntimeException) ;
+    virtual Sequence< OUString > SAL_CALL getErrors(void) 				throw  (RuntimeException) ;
+    virtual Sequence< Any > SAL_CALL getErrorExceptions(void) 		throw  (RuntimeException);
+    virtual Sequence< OUString > SAL_CALL getWarnings(void) 				throw  (RuntimeException);	
+    
 private:
     void testSimple( const Reference < XInterface > & );
     void testWrongUsage( const Reference < XInterface > & );
@@ -108,25 +108,25 @@ private:
     Sequence<OUString> m_seqErrors;
     Sequence<OUString> m_seqWarnings;
     Reference< XMultiServiceFactory > m_rSmgr;
-
+        
 };
 
 OPumpTest::OPumpTest( const Reference< XMultiServiceFactory > &rFactory ) :
     m_rSmgr( rFactory )
 {
-
+    
 }
 
 OPumpTest::~OPumpTest()
 {
-
+    
 }
 
 
 
-void OPumpTest::testInvariant( const OUString& TestName, const Reference < XInterface >& TestObject )
-    throw  (    IllegalArgumentException,
-                RuntimeException)
+void OPumpTest::testInvariant( const OUString& TestName, const Reference < XInterface >& TestObject ) 
+    throw  (	IllegalArgumentException, 
+                RuntimeException) 
 {
     Reference< XServiceInfo > info( TestObject, UNO_QUERY );
       ERROR_ASSERT( info.is() , "XServiceInfo not supported !" );
@@ -144,14 +144,14 @@ void OPumpTest::testInvariant( const OUString& TestName, const Reference < XInte
 
     ERROR_ASSERT( xActiveDataSource.is() && xActiveDataSink.is() && xActiveDataControl.is () &&
                   xConnectable.is(), "specified interface not supported" );
-}
+}    																		
 
 
 sal_Int32 OPumpTest::test(
-    const OUString& TestName,
-    const Reference < XInterface >& TestObject,
+    const OUString& TestName, 
+    const Reference < XInterface >& TestObject, 
     sal_Int32 hTestHandle)
-    throw  (    IllegalArgumentException, RuntimeException)
+    throw  (	IllegalArgumentException, RuntimeException)
 {
     if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pump") ) == TestName )  {
         try
@@ -185,9 +185,9 @@ sal_Int32 OPumpTest::test(
         {
             BUILD_ERROR( 0 , "unknown exception (Exception is  not base class)" );
         }
-
+        
         hTestHandle ++;
-
+        
         if( 5 == hTestHandle )
         {
             // all tests finished.
@@ -198,29 +198,29 @@ sal_Int32 OPumpTest::test(
         throw IllegalArgumentException();
     }
     return hTestHandle;
-}
+}													
 
 
 
-sal_Bool OPumpTest::testPassed(void)        throw  (RuntimeException)
+sal_Bool OPumpTest::testPassed(void) 		throw  (RuntimeException) 
 {
-    return m_seqErrors.getLength() == 0;
+    return m_seqErrors.getLength() == 0;	
 }
 
 
-Sequence< OUString > OPumpTest::getErrors(void)     throw  (RuntimeException)
+Sequence< OUString > OPumpTest::getErrors(void)		throw  (RuntimeException) 
 {
     return m_seqErrors;
 }
 
 
-Sequence< Any > OPumpTest::getErrorExceptions(void)                     throw  (RuntimeException)
+Sequence< Any > OPumpTest::getErrorExceptions(void) 					throw  (RuntimeException) 
 {
     return m_seqExceptions;
 }
 
 
-Sequence< OUString > OPumpTest::getWarnings(void)                       throw  (RuntimeException)
+Sequence< OUString > OPumpTest::getWarnings(void) 						throw  (RuntimeException)
 {
     return m_seqWarnings;
 }
@@ -235,7 +235,7 @@ Sequence< OUString > OPumpTest::getWarnings(void)                       throw  (
 void OPumpTest::testSimple( const Reference < XInterface > &r )
 {
     // jbu todo: add sensible test
-
+    
 }
 
 class TestListener: public WeakImplHelper1< XStreamListener >
@@ -291,7 +291,7 @@ public:
               const Reference< XInterface > &r ) : m_rSmgr( rSMgr ), m_pTestListener( 0 )
     {
         m_rControl = Reference<XActiveDataControl>( r, UNO_QUERY );
-
+        
         Reference< XActiveDataSource > rSource ( r, UNO_QUERY );
         Reference< XActiveDataSink > rSink( r , UNO_QUERY );
 
@@ -312,7 +312,7 @@ public:
         if( m_pTestListener )
             m_pTestListener->release();
     }
-
+    
     TestListener *m_pTestListener;
     Reference< XActiveDataControl > m_rControl;
     Reference< XOutputStream > m_rOutSource;
@@ -328,12 +328,12 @@ private:
     }
 };
 
-
+ 
 
 void OPumpTest::testClose( const Reference< XInterface > &r )
 {
     TestCase t( m_rSmgr, r );
-
+    
     ERROR_ASSERT( ! t.m_pTestListener->m_bStarted , "started too early" );
     ERROR_ASSERT( ! t.m_pTestListener->m_bTerminated , "terminiation unexpected" );
     ERROR_ASSERT( ! t.m_pTestListener->m_bError, "unexpected error" );
@@ -341,7 +341,7 @@ void OPumpTest::testClose( const Reference< XInterface > &r )
 
     t.m_rControl->start();
     mywait();
-
+    
     ERROR_ASSERT( t.m_pTestListener->m_bStarted , "should have been started already" );
     ERROR_ASSERT( ! t.m_pTestListener->m_bTerminated , "terminiation unexpected" );
     ERROR_ASSERT( ! t.m_pTestListener->m_bError, "unexpected error" );
@@ -370,7 +370,7 @@ void OPumpTest::testTerminate( const Reference< XInterface > &r )
 
     t.m_rControl->start();
     mywait();
-
+ 
     ERROR_ASSERT( t.m_pTestListener->m_bStarted , "should have been started already" );
     ERROR_ASSERT( ! t.m_pTestListener->m_bTerminated , "terminiation unexpected" );
     ERROR_ASSERT( ! t.m_pTestListener->m_bError, "unexpected error" );
@@ -391,7 +391,7 @@ void OPumpTest::testTerminate( const Reference< XInterface > &r )
 void OPumpTest::testFunction( const Reference< XInterface > &r )
 {
     TestCase t( m_rSmgr, r );
-
+    
     t.m_rControl->start();
 
     t.m_rOutSource->writeBytes( Sequence< sal_Int8 > ( 5 ) );
@@ -401,7 +401,7 @@ void OPumpTest::testFunction( const Reference< XInterface > &r )
 
     t.m_rOutSource->closeOutput();
     mywait();
-
+    
     ERROR_ASSERT( t.m_pTestListener->m_bStarted , "should have been started already" );
     ERROR_ASSERT( ! t.m_pTestListener->m_bTerminated , "should be terminiated already" );
     ERROR_ASSERT( ! t.m_pTestListener->m_bError, "unexpected error" );
@@ -431,7 +431,7 @@ Reference< XInterface > SAL_CALL OPumpTest_CreateInstance( const Reference< XMul
 {
     return *new OPumpTest( rSMgr );
 }
-
+    
 Sequence<OUString> OPumpTest_getSupportedServiceNames(void) throw()
 {
     OUString s = OPumpTest_getServiceName();
@@ -444,7 +444,7 @@ OUString     OPumpTest_getServiceName() throw()
     return OUString( RTL_CONSTASCII_USTRINGPARAM( "test.com.sun.star.io.Pump" ) );
 }
 
-OUString    OPumpTest_getImplementationName() throw()
+OUString 	OPumpTest_getImplementationName() throw()
 {
     return OUString( RTL_CONSTASCII_USTRINGPARAM( "test.com.sun.star.comp.io.Pump") );
 }
diff --git a/io/test/stm/testfactreg.cxx b/io/test/stm/testfactreg.cxx
index 05aaa92b1c34..4cd7c1d2b970 100644
--- a/io/test/stm/testfactreg.cxx
+++ b/io/test/stm/testfactreg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 #include <osl/diagnose.h>
 
-#include <cppuhelper/factory.hxx>  // for EXTERN_SERVICE_CALLTYPE
+#include <cppuhelper/factory.hxx>  // for EXTERN_SERVICE_CALLTYPE 
 
 using namespace ::rtl;
 using namespace ::cppu;
@@ -75,49 +75,49 @@ sal_Bool SAL_CALL component_writeInfo(
                 OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
             xNewKey = xKey->createKey( str );
             xNewKey->createKey( OPumpTest_getServiceName() );
-
+            
             str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
                 ODataStreamTest_getImplementationName(1) +
                 OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
             xNewKey = xKey->createKey( str );
             xNewKey->createKey( ODataStreamTest_getServiceName(1) );
-
+            
             str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
                 ODataStreamTest_getImplementationName(2) +
                 OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
             xNewKey = xKey->createKey( str );
             xNewKey->createKey( ODataStreamTest_getServiceName(2) );
-
+            
             str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
                 OObjectStreamTest_getImplementationName(1) +
                 OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
             xNewKey = xKey->createKey( str );
             xNewKey->createKey( OObjectStreamTest_getServiceName(1) );
-
+            
             str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
                 OObjectStreamTest_getImplementationName(2) +
                 OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
             xNewKey = xKey->createKey( str );
             xNewKey->createKey( OObjectStreamTest_getServiceName(2) );
-
+            
             str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
                 OMarkableOutputStreamTest_getImplementationName() +
                 OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
             xNewKey = xKey->createKey( str );
             xNewKey->createKey( OMarkableOutputStreamTest_getServiceName() );
-
+            
             str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
                 OMarkableInputStreamTest_getImplementationName() +
                 OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
             xNewKey = xKey->createKey( str );
             xNewKey->createKey( OMarkableInputStreamTest_getServiceName() );
-
+            
             str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
                 OMyPersistObject_getImplementationName() +
                 OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
             xNewKey = xKey->createKey( str );
             xNewKey->createKey( OMyPersistObject_getServiceName() );
-
+            
             return sal_True;
         }
         catch (InvalidRegistryException &)
@@ -132,13 +132,13 @@ void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     void * pRet = 0;
-
+    
     if (pServiceManager )
     {
         Reference< XSingleServiceFactory > xRet;
         Reference< XMultiServiceFactory > xSMgr =
             reinterpret_cast< XMultiServiceFactory * > ( pServiceManager );
-
+        
         OUString aImplementationName = OUString::createFromAscii( pImplName );
 
         if (aImplementationName == OPipeTest_getImplementationName() )
@@ -153,41 +153,41 @@ void * SAL_CALL component_getFactory(
                                         OPumpTest_CreateInstance,
                                         OPumpTest_getSupportedServiceNames() );
         }
-
+        
         else if( aImplementationName == ODataStreamTest_getImplementationName(1) ) {
             xRet = createSingleFactory( xSMgr , aImplementationName,
                                         ODataStreamTest_CreateInstance,
-                                        ODataStreamTest_getSupportedServiceNames(1) );
+                                        ODataStreamTest_getSupportedServiceNames(1) );	
         }
         else if( aImplementationName == ODataStreamTest_getImplementationName(2) ) {
             xRet = createSingleFactory( xSMgr , aImplementationName,
                                         ODataStreamTest_CreateInstance,
-                                        ODataStreamTest_getSupportedServiceNames(2) );
+                                        ODataStreamTest_getSupportedServiceNames(2) );	
         }
         else if( aImplementationName == OObjectStreamTest_getImplementationName(1) ) {
             xRet = createSingleFactory( xSMgr , aImplementationName,
                                         OObjectStreamTest_CreateInstance,
-                                        OObjectStreamTest_getSupportedServiceNames(1) );
+                                        OObjectStreamTest_getSupportedServiceNames(1) );	
         }
         else if( aImplementationName == OObjectStreamTest_getImplementationName(2) ) {
             xRet = createSingleFactory( xSMgr , aImplementationName,
                                         OObjectStreamTest_CreateInstance,
-                                        OObjectStreamTest_getSupportedServiceNames(2) );
+                                        OObjectStreamTest_getSupportedServiceNames(2) );	
         }
         else if( aImplementationName == OMarkableOutputStreamTest_getImplementationName() ) {
             xRet = createSingleFactory( xSMgr , aImplementationName,
                                         OMarkableOutputStreamTest_CreateInstance,
-                                        OMarkableOutputStreamTest_getSupportedServiceNames() );
+                                        OMarkableOutputStreamTest_getSupportedServiceNames() );	
         }
         else if( aImplementationName == OMarkableInputStreamTest_getImplementationName() ) {
             xRet = createSingleFactory( xSMgr , aImplementationName,
                                         OMarkableInputStreamTest_CreateInstance,
-                                        OMarkableInputStreamTest_getSupportedServiceNames() );
+                                        OMarkableInputStreamTest_getSupportedServiceNames() );	
         }
         else if( aImplementationName == OMyPersistObject_getImplementationName() ) {
             xRet = createSingleFactory( xSMgr , aImplementationName,
                                     OMyPersistObject_CreateInstance,
-                                        OMyPersistObject_getSupportedServiceNames() );
+                                        OMyPersistObject_getSupportedServiceNames() );	
         }
         if (xRet.is())
         {
@@ -195,7 +195,7 @@ void * SAL_CALL component_getFactory(
             pRet = xRet.get();
         }
     }
-
+    
     return pRet;
 }
 
@@ -208,7 +208,7 @@ Sequence<sal_Int8 > createSeq( char * p )
     return seq;
 }
 
-Sequence<sal_Int8> createIntSeq( sal_Int32 i )
+Sequence<sal_Int8> createIntSeq( sal_Int32 i ) 
 {
     char pcCount[20];
     sprintf( pcCount , "%d" , i );
diff --git a/io/test/stm/testfactreg.hxx b/io/test/stm/testfactreg.hxx
index 374a63bcff7d..5aefcad6a2e1 100644
--- a/io/test/stm/testfactreg.hxx
+++ b/io/test/stm/testfactreg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,37 +30,37 @@
 Reference< XInterface > SAL_CALL OPipeTest_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception );
 Sequence<OUString> OPipeTest_getSupportedServiceNames(void) throw();
 OUString     OPipeTest_getServiceName() throw();
-OUString    OPipeTest_getImplementationName() throw();
+OUString 	OPipeTest_getImplementationName() throw();
 
 Reference< XInterface > SAL_CALL OPumpTest_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception );
 Sequence<OUString> OPumpTest_getSupportedServiceNames(void) throw();
 OUString     OPumpTest_getServiceName() throw();
-OUString    OPumpTest_getImplementationName() throw();
+OUString 	OPumpTest_getImplementationName() throw();
 
 Reference< XInterface > SAL_CALL ODataStreamTest_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw(Exception);
 Sequence<OUString> ODataStreamTest_getSupportedServiceNames( int i) throw();
 OUString     ODataStreamTest_getServiceName( int i) throw();
-OUString    ODataStreamTest_getImplementationName( int i) throw();
+OUString 	ODataStreamTest_getImplementationName( int i) throw();
 
 Reference< XInterface > SAL_CALL OMarkableOutputStreamTest_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw(Exception);
 Sequence<OUString> OMarkableOutputStreamTest_getSupportedServiceNames(void) throw();
 OUString     OMarkableOutputStreamTest_getServiceName() throw();
-OUString    OMarkableOutputStreamTest_getImplementationName() throw();
+OUString 	OMarkableOutputStreamTest_getImplementationName() throw();
 
 Reference< XInterface > SAL_CALL OMarkableInputStreamTest_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw(Exception);
 Sequence<OUString> OMarkableInputStreamTest_getSupportedServiceNames(void) throw();
 OUString     OMarkableInputStreamTest_getServiceName() throw();
-OUString    OMarkableInputStreamTest_getImplementationName() throw();
+OUString 	OMarkableInputStreamTest_getImplementationName() throw();
 
 Reference< XInterface > SAL_CALL OObjectStreamTest_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw(Exception);
 Sequence<OUString> OObjectStreamTest_getSupportedServiceNames( int i) throw();
 OUString     OObjectStreamTest_getServiceName( int i) throw();
-OUString    OObjectStreamTest_getImplementationName( int i) throw();
+OUString 	OObjectStreamTest_getImplementationName( int i) throw();
 
 Reference< XInterface > SAL_CALL OMyPersistObject_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw(Exception);
-Sequence<OUString>  OMyPersistObject_getSupportedServiceNames( ) throw();
-OUString            OMyPersistObject_getServiceName( ) throw();
-OUString            OMyPersistObject_getImplementationName( ) throw();
+Sequence<OUString> 	OMyPersistObject_getSupportedServiceNames( ) throw();
+OUString     		OMyPersistObject_getServiceName( ) throw();
+OUString 			OMyPersistObject_getImplementationName( ) throw();
 
 Sequence<sal_Int8> createSeq( char * p );
 Sequence<sal_Int8> createIntSeq( sal_Int32 i );
@@ -83,7 +83,7 @@ Sequence<sal_Int8> createIntSeq( sal_Int32 i );
                        OStringToOUString( str.makeStringAndClear() , RTL_TEXTENCODING_ASCII_US ); \
         }\
         ((void)0)
-
+        
 
 #define WARNING_ASSERT(expr, Message) \
         if( ! (expr) ) { \
diff --git a/io/test/testcomponent.cxx b/io/test/testcomponent.cxx
index 419fdf7021ab..a4ed668a49ba 100644
--- a/io/test/testcomponent.cxx
+++ b/io/test/testcomponent.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/io/test/testconnection.cxx b/io/test/testconnection.cxx
index 2afdd2915525..49ab3fb09e2d 100644
--- a/io/test/testconnection.cxx
+++ b/io/test/testconnection.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -76,14 +76,14 @@ void doWrite( const Reference < XConnection > &r )
     {
         seq.getArray()[i] = i;
     }
-
+    
     r->write( seq );
 }
 
 void doRead( const Reference < XConnection > &r )
 {
     Sequence < sal_Int8 > seq(10);
-
+    
     OSL_ASSERT( 10 == r->read( seq , 10 ) );
 
     for( sal_Int32 i = 0 ; i < 10 ; i ++ )
@@ -153,12 +153,12 @@ void testConnection( const OUString &sConnectionDescription  ,
             catch( ... )
             {
                 printf( "Couldn't connect, retrying ...\n" );
-
+                
             }
         }
 
         r->close();
-
+        
         try
         {
             Sequence < sal_Int8 > seq(10);
@@ -171,10 +171,10 @@ void testConnection( const OUString &sConnectionDescription  ,
         }
         catch ( ... )
         {
-            OSL_ENSURE( 0 , "wrong exception was thrown" );
+            OSL_ENSURE( 0 , "wrong exception was thrown" );			
         }
 
-        thread.join();
+        thread.join();	
     }
 }
 
@@ -184,7 +184,7 @@ int main( int argc, char * argv[] )
 #else
 int __cdecl main( int argc, char * argv[] )
 #endif
-{
+{	
     Reference< XMultiServiceFactory > xMgr(
         createRegistryServiceFactory( OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")) ) );
 
@@ -217,7 +217,7 @@ int __cdecl main( int argc, char * argv[] )
     fflush( stdout );
     testConnection( OUString::createFromAscii("socket,host=localhost,port=2001"), rAcceptor , rConnector );
     printf( " Done\n" );
-
+    
     printf( "Testing pipe" );
     fflush( stdout );
     testConnection( OUString::createFromAscii("pipe,name=bla") , rAcceptorPipe , rConnector );
@@ -256,7 +256,7 @@ int __cdecl main( int argc, char * argv[] )
         OSL_ENSURE( 0, "unexpected exception with empty connection string" );
     }
 
-
+    
     MyThread thread( rAcceptor , OUString::createFromAscii("socket,host=localhost,port=2001") );
     thread.create();
 
@@ -278,7 +278,7 @@ int __cdecl main( int argc, char * argv[] )
 
     rAcceptor->stopAccepting();
     thread.join();
-
+    
     Reference < XComponent > rComp( xMgr , UNO_QUERY );
     if( rComp.is() )
     {
diff --git a/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java b/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java
index ba928eb81c1f..411779faff92 100644
--- a/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java
+++ b/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,10 +38,10 @@ import com.sun.star.comp.juhtest.SmoketestCommandEnvironment;
  * by this class.
  */
 public class JavaUNOHelperServices {
-
+ 
         static private final String __service_smoketestCommandEnv =
         "com.sun.star.deployment.test.SmoketestCommandEnvironment";
-
+    
      /**
      * Gives a factory for creating the service.
      * This method is called by the <code>JavaLoader</code>
@@ -55,11 +55,11 @@ public class JavaUNOHelperServices {
     public static XSingleComponentFactory __getComponentFactory(String sImplName)
     {
         XSingleComponentFactory xFactory = null;
-
+    
         if ( sImplName.equals( SmoketestCommandEnvironment.class.getName() ) )
             xFactory = Factory.createComponentFactory(SmoketestCommandEnvironment.class,
                                             SmoketestCommandEnvironment.getServiceNames());
-
+        
         return xFactory;
     }
 
@@ -75,7 +75,7 @@ public class JavaUNOHelperServices {
         return Factory.writeRegistryServiceInfo(SmoketestCommandEnvironment.class.getName(),
                                                 SmoketestCommandEnvironment.getServiceNames(),
                                                 regKey);
-    }
+    }     
 }
 
 
diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index 04bba081e37f..d954f036820d 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,34 +68,34 @@ import java.util.Random;
         // insert the service manager
         xSet.insert( aSingleComponentFactory );
     </pre>
-*/
+*/	
 public class Bootstrap {
-
+    
     private static void insertBasicFactories(
         XSet xSet, XImplementationLoader xImpLoader )
         throws Exception
     {
-        // insert the factory of the loader
+        // insert the factory of the loader        
         xSet.insert( xImpLoader.activate(
             "com.sun.star.comp.loader.JavaLoader", null, null, null ) );
-
-        // insert the factory of the URLResolver
+        
+        // insert the factory of the URLResolver        
         xSet.insert( xImpLoader.activate(
             "com.sun.star.comp.urlresolver.UrlResolver", null, null, null ) );
-
+        
         // insert the bridgefactory
         xSet.insert( xImpLoader.activate(
             "com.sun.star.comp.bridgefactory.BridgeFactory", null, null, null ) );
-
+        
         // insert the connector
         xSet.insert( xImpLoader.activate(
             "com.sun.star.comp.connections.Connector", null, null, null ) );
-
+        
         // insert the acceptor
         xSet.insert( xImpLoader.activate(
             "com.sun.star.comp.connections.Acceptor", null, null, null ) );
     }
-
+    
     /** Bootstraps an initial component context with service manager and basic
         jurt components inserted.
         @param context_entries the hash table contains mappings of entry names (type string) to
@@ -107,22 +107,22 @@ public class Bootstrap {
     {
         XImplementationLoader xImpLoader = UnoRuntime.queryInterface(
             XImplementationLoader.class, new JavaLoader() );
-
+        
         // Get the factory of the ServiceManager
         XSingleComponentFactory smgr_fac = UnoRuntime.queryInterface(
             XSingleComponentFactory.class, xImpLoader.activate(
                 "com.sun.star.comp.servicemanager.ServiceManager", null, null, null ) );
-
+        
         // Create an instance of the ServiceManager
         XMultiComponentFactory xSMgr = UnoRuntime.queryInterface(
             XMultiComponentFactory.class, smgr_fac.createInstanceWithContext( null ) );
-
+        
         // post init loader
         XInitialization xInit = UnoRuntime.queryInterface(
             XInitialization.class, xImpLoader );
         Object[] args = new Object [] { xSMgr };
         xInit.initialize( args );
-
+        
         // initial component context
         if (context_entries == null)
             context_entries = new Hashtable( 1 );
@@ -132,22 +132,22 @@ public class Bootstrap {
             new ComponentContextEntry( null, xSMgr ) );
         // ... xxx todo: add standard entries
         XComponentContext xContext = new ComponentContext( context_entries, null );
-
+        
         // post init smgr
         xInit = UnoRuntime.queryInterface(
             XInitialization.class, xSMgr );
         args = new Object [] { null, xContext }; // no registry, default context
         xInit.initialize( args );
-
+        
         XSet xSet = UnoRuntime.queryInterface( XSet.class, xSMgr );
         // insert the service manager
         xSet.insert( smgr_fac );
         // and basic jurt factories
         insertBasicFactories( xSet, xImpLoader );
-
+        
         return xContext;
     }
-
+    
     /**
      * Bootstraps a servicemanager with the jurt base components registered.
      * <p>
@@ -159,10 +159,10 @@ public class Bootstrap {
         return UnoRuntime.queryInterface(
             XMultiServiceFactory.class, createInitialComponentContext( null ).getServiceManager() );
     }
-
-
+    
+    
     /** Bootstraps the initial component context from a native UNO installation.
-
+        
         @see cppuhelper/defaultBootstrap_InitialComponentContext()
     */
     static public final XComponentContext defaultBootstrap_InitialComponentContext()
@@ -171,12 +171,12 @@ public class Bootstrap {
         return defaultBootstrap_InitialComponentContext( null, null );
     }
     /** Bootstraps the initial component context from a native UNO installation.
-
+        
         @param ini_file
                ini_file (may be null: uno.rc besides cppuhelper lib)
         @param bootstrap_parameters
                bootstrap parameters (maybe null)
-
+               
         @see cppuhelper/defaultBootstrap_InitialComponentContext()
     */
     static public final XComponentContext defaultBootstrap_InitialComponentContext(
@@ -197,7 +197,7 @@ public class Bootstrap {
                 pairs[ n++ ] = (String)bootstrap_parameters.get( name );
             }
         }
-
+        
         if (! m_loaded_juh)
         {
             NativeLibraryLoader.loadLibrary( Bootstrap.class.getClassLoader(), "juh" );
@@ -208,7 +208,7 @@ public class Bootstrap {
             cppuhelper_bootstrap(
                 ini_file, pairs, Bootstrap.class.getClassLoader() ) );
     }
-
+    
     static private boolean m_loaded_juh = false;
     static private native Object cppuhelper_bootstrap(
         String ini_file, String bootstrap_parameters [], ClassLoader loader )
@@ -216,27 +216,27 @@ public class Bootstrap {
 
     /**
      * Bootstraps the component context from a UNO installation.
-     *
+     *   
      * @return a bootstrapped component context.
-     *
+     * 
      * @since UDK 3.1.0
-     */
+     */    
     public static final XComponentContext bootstrap()
         throws BootstrapException {
-
+        
         XComponentContext xContext = null;
-
+        
         try {
-            // create default local component context
+            // create default local component context                
             XComponentContext xLocalContext =
                 createInitialComponentContext( null );
             if ( xLocalContext == null )
                 throw new BootstrapException( "no local component context!" );
-
+            
             // find office executable relative to this class's class loader
             String sOffice =
                 System.getProperty( "os.name" ).startsWith( "Windows" ) ?
-                "soffice.exe" : "soffice";
+                "soffice.exe" : "soffice";            
             File fOffice = NativeLibraryLoader.getResource(
                 Bootstrap.class.getClassLoader(), sOffice );
             if ( fOffice == null )
@@ -245,7 +245,7 @@ public class Bootstrap {
             // create random pipe name
             String sPipeName = "uno" +
                 Long.toString( (new Random()).nextLong() & 0x7fffffffffffffffL );
-
+            
             // create call with arguments
             String[] cmdArray = new String[7];
             cmdArray[0] = fOffice.getPath();
@@ -255,26 +255,26 @@ public class Bootstrap {
             cmdArray[4] = "-nocrashreport";
             cmdArray[5] = "-nolockcheck";
             cmdArray[6] = "-accept=pipe,name=" + sPipeName + ";urp;";
-
+            
             // start office process
             Process p = Runtime.getRuntime().exec( cmdArray );
             pipe( p.getInputStream(), System.out, "CO> " );
             pipe( p.getErrorStream(), System.err, "CE> " );
-
+            
             // initial service manager
             XMultiComponentFactory xLocalServiceManager =
                 xLocalContext.getServiceManager();
             if ( xLocalServiceManager == null )
                 throw new BootstrapException( "no initial service manager!" );
-
+            
             // create a URL resolver
             XUnoUrlResolver xUrlResolver =
                 UnoUrlResolver.create( xLocalContext );
-
+            
             // connection string
             String sConnect = "uno:pipe,name=" + sPipeName +
                 ";urp;StarOffice.ComponentContext";
-
+            
             // wait until office is started
             for (int i = 0;; ++i) {
                 try {
@@ -301,13 +301,13 @@ public class Bootstrap {
         } catch ( java.lang.Exception e ) {
             throw new BootstrapException( e );
         }
-
+        
         return xContext;
     }
 
     private static void pipe(
         final InputStream in, final PrintStream out, final String prefix ) {
-
+        
         new Thread( "Pipe: " + prefix) {
             public void run() {
                 BufferedReader r = new BufferedReader(
diff --git a/javaunohelper/com/sun/star/comp/helper/BootstrapException.java b/javaunohelper/com/sun/star/comp/helper/BootstrapException.java
index 4d84a4f7dd3f..3136358c257f 100644
--- a/javaunohelper/com/sun/star/comp/helper/BootstrapException.java
+++ b/javaunohelper/com/sun/star/comp/helper/BootstrapException.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,16 +30,16 @@ package com.sun.star.comp.helper;
 /**
  * BootstrapException is a checked exception that wraps an exception
  * thrown by the original target.
- *
+ * 
  * @since UDK 3.1.0
  */
 public class BootstrapException extends java.lang.Exception {
-
+    
     /**
      * This field holds the target exception.
      */
     private Exception m_target = null;
-
+    
     /**
      * Constructs a <code>BootstrapException</code> with <code>null</code> as
      * the target exception.
@@ -56,7 +56,7 @@ public class BootstrapException extends java.lang.Exception {
      */
     public BootstrapException( String message ) {
         super( message );
-    }
+    }    
 
     /**
      * Constructs a <code>BootstrapException</code> with the specified
@@ -69,17 +69,17 @@ public class BootstrapException extends java.lang.Exception {
         super( message );
         m_target = target;
     }
-
+    
     /**
      * Constructs a <code>BootstrapException</code> with a target exception.
      *
-     * @param  target    the target exception
+     * @param  target    the target exception     
      */
     public BootstrapException( Exception target ) {
         super();
         m_target = target;
     }
-
+    
     /**
      * Get the thrown target exception.
      *
@@ -87,5 +87,5 @@ public class BootstrapException extends java.lang.Exception {
      */
     public Exception getTargetException() {
         return m_target;
-    }
+    }    
 }
diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
index fe3336c1dbfb..fd4800d693b8 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@ import java.util.Vector;
 class Disposer implements XEventListener
 {
     private XComponent m_xComp;
-
+    
     //----------------------------------------------------------------------------------------------
     Disposer( XComponent xComp )
     {
@@ -65,19 +65,19 @@ public class ComponentContext implements XComponentContext, XComponent
     private static final boolean DEBUG = false;
     private static final String SMGR_NAME = "/singletons/com.sun.star.lang.theServiceManager";
     private static final String TDMGR_NAME = "/singletons/com.sun.star.reflection.theTypeDescriptionManager";
-
+    
     private Hashtable m_table;
     private XComponentContext m_xDelegate;
-
+    
     private XMultiComponentFactory m_xSMgr;
     private boolean m_bDisposeSMgr;
-
+    
     private Vector m_eventListener;
 
     /** Ctor to create a component context passing a hashtable for values and a delegator
         reference. Entries of the passed hashtable are either direct values or
         ComponentContextEntry objects.
-
+        
         @param table
                entries
         @param xDelegate
@@ -109,7 +109,7 @@ public class ComponentContext implements XComponentContext, XComponent
         {
             m_xSMgr = m_xDelegate.getServiceManager();
         }
-
+        
         // listen for delegate
         XComponent xComp = UnoRuntime.queryInterface(
             XComponent.class, m_xDelegate );
@@ -118,7 +118,7 @@ public class ComponentContext implements XComponentContext, XComponent
             xComp.addEventListener( new Disposer( this ) );
         }
     }
-
+    
     // XComponentContext impl
     //______________________________________________________________________________________________
     public Object getValueByName( String rName )
@@ -169,7 +169,7 @@ public class ComponentContext implements XComponentContext, XComponent
                         if (DEBUG)
                             System.err.println( "### exception occured on late init of singleton instance \"" + rName + "\": " + exc.getMessage() );
                     }
-
+                
                     if (xInstance != null)
                     {
                         synchronized (entry)
@@ -218,14 +218,14 @@ public class ComponentContext implements XComponentContext, XComponent
     {
         return m_xSMgr;
     }
-
+    
     // XComponent impl
     //______________________________________________________________________________________________
     public void dispose()
     {
         if (DEBUG)
             System.err.print( "> disposing context " + this );
-
+        
         // fire events
         EventObject evt = new EventObject( this );
         Enumeration eventListener = m_eventListener.elements();
@@ -235,7 +235,7 @@ public class ComponentContext implements XComponentContext, XComponent
             listener.disposing( evt );
         }
         m_eventListener.removeAllElements();
-
+        
         XComponent tdmgr = null;
         // dispose values, then service manager, then typdescription manager
         Enumeration keys = m_table.keys();
@@ -249,7 +249,7 @@ public class ComponentContext implements XComponentContext, XComponent
                 {
                     o = ((ComponentContextEntry)o).m_value;
                 }
-
+                
                 XComponent xComp = UnoRuntime.queryInterface( XComponent.class, o );
                 if (xComp != null)
                 {
@@ -265,7 +265,7 @@ public class ComponentContext implements XComponentContext, XComponent
             }
         }
         m_table.clear();
-
+        
         // smgr
         if (m_bDisposeSMgr)
         {
@@ -277,13 +277,13 @@ public class ComponentContext implements XComponentContext, XComponent
             }
         }
         m_xSMgr = null;
-
+        
         // tdmgr
         if (tdmgr != null)
         {
             tdmgr.dispose();
         }
-
+        
         if (DEBUG)
             System.err.println( "... finished" );
     }
@@ -293,8 +293,8 @@ public class ComponentContext implements XComponentContext, XComponent
         if (xListener == null)
             throw new com.sun.star.uno.RuntimeException( "Listener must not be null" );
           if (m_eventListener.contains( xListener ))
-              throw new com.sun.star.uno.RuntimeException( "Listener already registred." );
-
+              throw new com.sun.star.uno.RuntimeException( "Listener already registred." );      	
+        
            m_eventListener.addElement( xListener );
     }
     //______________________________________________________________________________________________
@@ -303,8 +303,8 @@ public class ComponentContext implements XComponentContext, XComponent
         if (xListener == null)
             throw new com.sun.star.uno.RuntimeException( "Listener must not be null" );
           if (! m_eventListener.contains( xListener ))
-              throw new com.sun.star.uno.RuntimeException( "Listener is not registered." );
-
-        m_eventListener.removeElement( xListener );
+              throw new com.sun.star.uno.RuntimeException( "Listener is not registered." );      	
+        
+        m_eventListener.removeElement( xListener );	
     }
 }
diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java b/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
index 52b116469f7a..48e999d5700f 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,11 +45,11 @@ public class ComponentContextEntry
     /** set entry value
     */
     public Object m_value;
-
+    
     /** Creating a late-init singleton entry component context entry.
         The second parameter will be ignored and overwritten during
         instanciation of the singleton instance.
-
+        
         @param lateInit
                object factory or service string
         @param value
@@ -61,7 +61,7 @@ public class ComponentContextEntry
         this.m_value = value;
     }
     /** Creating a direct value component context entry.
-
+        
         @param value
                pass null
     */
diff --git a/javaunohelper/com/sun/star/comp/helper/RegistryServiceFactory.java b/javaunohelper/com/sun/star/comp/helper/RegistryServiceFactory.java
index 826c812fa049..c748187babd3 100644
--- a/javaunohelper/com/sun/star/comp/helper/RegistryServiceFactory.java
+++ b/javaunohelper/com/sun/star/comp/helper/RegistryServiceFactory.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,32 +34,32 @@ import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.RuntimeException;
 
 /** The class provides a set of methods which create instances of the
-    com.sun.star.lang.RegistryServiceManager service.
-
+    com.sun.star.lang.RegistryServiceManager service. 
+    
     @deprecated use class Bootstrap instead
 */
 public class RegistryServiceFactory {
     static {
         System.loadLibrary("juh");
     }
-
+    
     private static native Object createRegistryServiceFactory(
-            String writeRegistryFile,
-            String readRegistryFile,
+            String writeRegistryFile, 
+            String readRegistryFile, 
             boolean readOnly,
             ClassLoader loader);
-
+            
     /**
-      * This bootstraps an initial service factory working on a registry. If the first or both
+      * This bootstraps an initial service factory working on a registry. If the first or both 
       * parameters contain a value then the service factory is initialized with a simple registry
       * or a nested registry. Otherwise the service factory must be initialized later with a valid
       * registry.
       *<BR>
-      * @param writeRegistryFile    file name of the simple registry or the first registry file of
-      *                             the nested registry which will be opened with read/write rights. This
-      *                             file will be created if necessary.
-      * @param readRegistryFile     file name of the second registry file of the nested registry
-      *                             which will be opened with readonly rights.
+      * @param writeRegistryFile	file name of the simple registry or the first registry file of
+      *								the nested registry which will be opened with read/write rights. This
+      *								file will be created if necessary.
+      * @param readRegistryFile		file name of the second registry file of the nested registry 
+      *								which will be opened with readonly rights.
      * @return a new RegistryServiceFactory.
       */
     public static XMultiServiceFactory create(String writeRegistryFile, String readRegistryFile)
@@ -69,28 +69,28 @@ public class RegistryServiceFactory {
     }
 
     /**
-      * This bootstraps an initial service factory working on a registry. If the first or both
+      * This bootstraps an initial service factory working on a registry. If the first or both 
       * parameters contain a value then the service factory is initialized with a simple registry
       * or a nested registry. Otherwise the service factory must be initialized later with a valid
       * registry.
       *<BR>
-     * @param writeRegistryFile     file name of the simple registry or the first registry file of
-     *                              the nested registry which will be opened with read/write rights. This
-     *                              file will be created if necessary.
-     * @param readRegistryFile      file name of the second registry file of the nested registry
-     *                              which will be opened with readonly rights.
-     * @param readOnly              flag which specify that the first registry file will be opened with
-     *                              readonly rights. Default is FALSE. If this flag is used the registry
-     *                              will not be created if not exist.
+     * @param writeRegistryFile	    file name of the simple registry or the first registry file of
+     *								the nested registry which will be opened with read/write rights. This
+     *								file will be created if necessary.
+     * @param readRegistryFile		file name of the second registry file of the nested registry 
+     *								which will be opened with readonly rights.
+     * @param readOnly				flag which specify that the first registry file will be opened with 
+     *								readonly rights. Default is FALSE. If this flag is used the registry 
+     *								will not be created if not exist.
      *
       * @return a new RegistryServiceFactory
       */
     public static XMultiServiceFactory create(String writeRegistryFile, String readRegistryFile, boolean readOnly)
         throws com.sun.star.uno.Exception
     {
-        // Ensure that we are on a native threads vm
+        // Ensure that we are on a native threads vm 
         // (binary UNO does use native threads).
-        String vm_info = System.getProperty("java.vm.info");
+        String vm_info = System.getProperty("java.vm.info"); 
         if(vm_info != null && vm_info.indexOf("green") != -1)
             throw new RuntimeException(RegistryServiceFactory.class.toString() + ".create - can't use binary UNO with green threads");
 
@@ -107,7 +107,7 @@ public class RegistryServiceFactory {
 //              } else
 //                  throw new com.sun.star.uno.Exception(writeRegistryFile + " doese not exist!");
 //          }
-
+        
 //          if (readRegistryFile != null) {
 //              java.io.File file = new java.io.File(readRegistryFile);
 
@@ -122,18 +122,18 @@ public class RegistryServiceFactory {
             writeRegistryFile, readRegistryFile, readOnly,
             RegistryServiceFactory.class.getClassLoader() );
         return UnoRuntime.queryInterface(
-            XMultiServiceFactory.class, obj );
+            XMultiServiceFactory.class, obj );	
     }
 
     /**
      * This bootstraps an initial service factory working on a registry file.
      *<BR>
-     * @param registryFile          file name of the registry to use/ create; if this is an empty
-     *                              string, the default registry is used instead
+     * @param registryFile			file name of the registry to use/ create; if this is an empty
+     *								string, the default registry is used instead
      *
      * @return a new RegistryServiceFactory.
      */
-    public static XMultiServiceFactory create(String registryFile)
+    public static XMultiServiceFactory create(String registryFile) 
         throws com.sun.star.uno.Exception
     {
         return create(registryFile, null, false);
@@ -142,15 +142,15 @@ public class RegistryServiceFactory {
     /**
      * This bootstraps an initial service factory working on a registry file.
      *<BR>
-     * @param registryFile          file name of the registry to use/ create; if this is an empty
-     *                              string, the default registry is used instead
-     * @param readOnly              flag which specify that the registry file will be opened with
-     *                              readonly rights. Default is FALSE. If this flag is used the registry
-     *                              will not be created if not exist.
-     *
+     * @param registryFile			file name of the registry to use/ create; if this is an empty
+     *								string, the default registry is used instead
+     * @param readOnly				flag which specify that the registry file will be opened with 
+     *								readonly rights. Default is FALSE. If this flag is used the registry 
+     *								will not be created if not exist.
+     *								
      * @return a new RegistryServiceFactory.
      */
-    public static XMultiServiceFactory create(String registryFile, boolean readOnly)
+    public static XMultiServiceFactory create(String registryFile, boolean readOnly) 
         throws com.sun.star.uno.Exception
     {
         return create(registryFile, null, readOnly);
diff --git a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
index e077fe6bb9bd..34d523a60516 100644
--- a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
+++ b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,34 +34,34 @@ import com.sun.star.registry.XRegistryKey;
 /**
  * @deprecated use class Bootstrap bootstrapping a native UNO installation
  *             and use the shared library loader service.
- *
+ * 
  * The <code>SharedLibraryLoader</code> class provides the functionality of the <code>com.sun.star.loader.SharedLibrary</code>
  * service.
  * <p>
  * @see         com.sun.star.loader.SharedLibrary
  * @see         com.sun.star.comp.servicemanager.ServiceManager
- * @see         com.sun.star.lang.ServiceManager
+ * @see			com.sun.star.lang.ServiceManager
  */
 public class SharedLibraryLoader {
-    /**
-     * The default library which contains the SharedLibraryLoader component
+    /** 
+     * The default library which contains the SharedLibraryLoader component 
      */
     public static final String DEFAULT_LIBRARY = "shlibloader.uno";
 
-    /**
+    /** 
      * The default implementation name
      */
     public static final String DEFAULT_IMPLEMENTATION = "com.sun.star.comp.stoc.DLLComponentLoader";
-
+    
     static {
         System.loadLibrary("juh");
     }
-
-    private static native boolean component_writeInfo(
+        
+    private static native boolean component_writeInfo( 
             String libName, XMultiServiceFactory smgr, XRegistryKey regKey,
             ClassLoader loader );
-
-    private static native Object component_getFactory(
+    
+    private static native Object component_getFactory( 
             String libName, String implName, XMultiServiceFactory smgr,
             XRegistryKey regKey, ClassLoader loader );
 
@@ -71,19 +71,19 @@ public class SharedLibraryLoader {
      * for the library and "com.sun.star.comp.stoc.DLLComponentLoader"
      * for the component name.
      * <p>
-     * @return  the factory for the "com.sun.star.comp.stoc.DLLComponentLoader" component.
-     * @param   smgr    the ServiceManager
-     * @param   regKey  the root registry key
-     * @see     com.sun.star.loader.SharedLibrary
-     * @see     com.sun.star.lang.ServiceManager
-     * @see     com.sun.star.registry.RegistryKey
+     * @return	the factory for the "com.sun.star.comp.stoc.DLLComponentLoader" component.
+     * @param	smgr	the ServiceManager
+     * @param	regKey	the root registry key
+     * @see		com.sun.star.loader.SharedLibrary
+     * @see		com.sun.star.lang.ServiceManager
+     * @see		com.sun.star.registry.RegistryKey
      */
     public static XSingleServiceFactory getServiceFactory(
-                XMultiServiceFactory smgr,
+                XMultiServiceFactory smgr, 
                 XRegistryKey regKey )
     {
         return UnoRuntime.queryInterface(
-                    XSingleServiceFactory.class,
+                    XSingleServiceFactory.class, 
                     component_getFactory(
                         DEFAULT_LIBRARY, DEFAULT_IMPLEMENTATION, smgr, regKey,
                         SharedLibraryLoader.class.getClassLoader() ) );
@@ -92,40 +92,40 @@ public class SharedLibraryLoader {
     /**
      * Loads and returns a specific factory for a given library and implementation name.
      * <p>
-     * @return  the factory of the component
-     * @param   libName the name of the shared library
-     * @param   impName the implementation name of the component
-     * @param   smgr    the ServiceManager
-     * @param   regKey  the root registry key
-     * @see     com.sun.star.loader.SharedLibrary
-     * @see     com.sun.star.lang.ServiceManager
-     * @see     com.sun.star.registry.RegistryKey
+     * @return	the factory of the component
+     * @param	libName	the name of the shared library
+     * @param	impName	the implementation name of the component
+     * @param	smgr	the ServiceManager
+     * @param	regKey	the root registry key
+     * @see		com.sun.star.loader.SharedLibrary
+     * @see		com.sun.star.lang.ServiceManager
+     * @see		com.sun.star.registry.RegistryKey
      */
     public static XSingleServiceFactory getServiceFactory(
                 String libName,
                 String impName,
-                XMultiServiceFactory smgr,
+                XMultiServiceFactory smgr, 
                 XRegistryKey regKey )
     {
         return UnoRuntime.queryInterface(
-                    XSingleServiceFactory.class,
+                    XSingleServiceFactory.class, 
                     component_getFactory(
                         libName, impName, smgr, regKey,
                         SharedLibraryLoader.class.getClassLoader() ) );
     }
-
+    
     /**
      * Registers the SharedLibraryLoader under a RegistryKey.
      * <p>
-     * @return  true if the registration was successfull - otherwise false
-     * @param   smgr    the ServiceManager
-     * @param   regKey  the root key under that the component should be registered
-     * @see     com.sun.star.loader.SharedLibrary
-     * @see     com.sun.star.lang.ServiceManager
-     * @see     com.sun.star.registry.RegistryKey
+     * @return	true if the registration was successfull - otherwise false
+     * @param	smgr	the ServiceManager
+     * @param	regKey	the root key under that the component should be registered
+     * @see		com.sun.star.loader.SharedLibrary
+     * @see		com.sun.star.lang.ServiceManager
+     * @see		com.sun.star.registry.RegistryKey
      */
     public static boolean writeRegistryServiceInfo(
-                com.sun.star.lang.XMultiServiceFactory smgr,
+                com.sun.star.lang.XMultiServiceFactory smgr, 
                 com.sun.star.registry.XRegistryKey regKey )
     {
         return component_writeInfo(
@@ -136,20 +136,20 @@ public class SharedLibraryLoader {
     /**
      * Registers the SharedLibraryLoader under a RegistryKey.
      * <p>
-     * @return  true if the registration was successfull - otherwise false
-     * @param   libName name of the shared library
-     * @param   smgr    the ServiceManager
-     * @param   regKey  the root key under that the component should be registered
-     * @see     com.sun.star.loader.SharedLibrary
-     * @see     com.sun.star.lang.ServiceManager
-     * @see     com.sun.star.registry.RegistryKey
+     * @return	true if the registration was successfull - otherwise false
+     * @param	libName	name of the shared library
+     * @param	smgr	the ServiceManager
+     * @param	regKey	the root key under that the component should be registered
+     * @see		com.sun.star.loader.SharedLibrary
+     * @see		com.sun.star.lang.ServiceManager
+     * @see		com.sun.star.registry.RegistryKey
      */
     public static boolean writeRegistryServiceInfo(
                 String libName,
-                com.sun.star.lang.XMultiServiceFactory smgr,
+                com.sun.star.lang.XMultiServiceFactory smgr, 
                 com.sun.star.registry.XRegistryKey regKey )
-
-            throws  com.sun.star.registry.InvalidRegistryException,
+                
+            throws 	com.sun.star.registry.InvalidRegistryException, 
                     com.sun.star.uno.RuntimeException
     {
         return component_writeInfo(
diff --git a/javaunohelper/com/sun/star/comp/helper/UnoInfo.java b/javaunohelper/com/sun/star/comp/helper/UnoInfo.java
index d528f433ba59..896974b9e301 100644
--- a/javaunohelper/com/sun/star/comp/helper/UnoInfo.java
+++ b/javaunohelper/com/sun/star/comp/helper/UnoInfo.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@ import java.net.URLClassLoader;
 
 /**
  * UnoInfo offers functionality to obtain the UNO jar files.
- */
+ */	
 public final class UnoInfo {
 
     /**
@@ -45,7 +45,7 @@ public final class UnoInfo {
      * Gets the URL base.
      *
      * @return the URL base
-     */
+     */    
     private static String getBase() {
 
         final String JUHJAR = "/juh.jar";
@@ -103,7 +103,7 @@ public final class UnoInfo {
 
         return getURLs( jarFileNames );
     }
-
+    
     /**
      * Gets the extra UNO types.
      *
diff --git a/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java b/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java
index 9e9d3cef59bf..a28d3a145544 100644
--- a/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java
+++ b/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,15 +42,15 @@ public class SmoketestCommandEnvironment extends WeakBase
 
     static private final String __serviceName =
     "com.sun.star.deployment.test.SmoketestCommandEnvironment";
-
+    
     private XComponentContext m_cmpCtx;
     private XMultiComponentFactory m_xMCF;
-
+    
 
     public SmoketestCommandEnvironment(XComponentContext xCompContext) {
         try {
             m_cmpCtx = xCompContext;
-            m_xMCF = m_cmpCtx.getServiceManager();
+            m_xMCF = m_cmpCtx.getServiceManager();                
         }
         catch( Exception e ) {
             e.printStackTrace();
@@ -67,24 +67,24 @@ public class SmoketestCommandEnvironment extends WeakBase
         return getServiceNames();
     }
 
-
+    
     public boolean supportsService( String sServiceName ) {
         boolean bSupported = false;
         if (sServiceName.equals(__serviceName))
             bSupported = true;
         return bSupported;
     }
-
+    
     public String getImplementationName() {
         return  SmoketestCommandEnvironment.class.getName();
     }
-
+    
     //XCommandEnvironment ================================================
     public com.sun.star.task.XInteractionHandler getInteractionHandler()
     {
         return new InteractionImpl();
     }
-
+    
     public com.sun.star.ucb.XProgressHandler getProgressHandler()
     {
         return new ProgressImpl();
@@ -131,7 +131,7 @@ class InteractionImpl implements com.sun.star.task.XInteractionHandler
                 //don't query again for ongoing extensions
                 abort = false;
             }
-        }
+        }   
     }
 }
 
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java
index bcc2aa128fa5..60b4fe009397 100755
--- a/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,66 +42,66 @@ import com.sun.star.io.XInputStream;
 import com.sun.star.io.XSeekable;
 import  com.sun.star.lib.uno.helper.ComponentBase;
 
-public class ByteArrayToXInputStreamAdapter
+public class ByteArrayToXInputStreamAdapter 
     extends ComponentBase
     implements XInputStream, XSeekable
 {
-
+    
     byte[] m_bytes;
     int m_length;
     int m_pos;
-
+    
     boolean m_open;
-
+    
     /** Creates a new instance of ByteArrayXInputStram */
     public ByteArrayToXInputStreamAdapter(byte[] bytes) {
         init(bytes);
     }
-
+    
     public void init(byte[] bytes) {
         // System.err.println("ByteArrayXInputStream");
         m_bytes = bytes;
         m_length = bytes.length;
         m_pos = 0;
         m_open = true;
-    }
-
+    }    
+    
     private void _check() throws com.sun.star.io.NotConnectedException, com.sun.star.io.IOException {
         if (m_bytes == null) {
             // System.err.println("check failed no bytes!");
             throw new com.sun.star.io.NotConnectedException("no bytes");
         }
         if(!m_open) {
-            // System.err.println("check failed: closed");
-            throw new com.sun.star.io.IOException("input closed");
+            // System.err.println("check failed: closed");            
+            throw new com.sun.star.io.IOException("input closed");        
         }
     }
-
+    
     public int available() throws com.sun.star.io.NotConnectedException, com.sun.star.io.IOException {
         _check();
-        long a = m_length - m_pos;
-        if (a != (int)a)
-            throw new com.sun.star.io.IOException("integer overflow");
+        long a = m_length - m_pos;        
+        if (a != (int)a) 
+            throw new com.sun.star.io.IOException("integer overflow");        
         else {
-            // System.err.println("available() -> "+a);
+            // System.err.println("available() -> "+a);            
             return (int)a;
         }
     }
-
+    
     public void closeInput() throws com.sun.star.io.NotConnectedException, com.sun.star.io.IOException {
         // System.err.println("closeInput()");
-        _check();
+        _check();        
         m_open = false;
     }
-
+    
     public int readBytes(byte[][] values, int param) throws com.sun.star.io.NotConnectedException, com.sun.star.io.BufferSizeExceededException, com.sun.star.io.IOException {
         // System.err.println("readbytes(..., "+param+")");
         _check();
-    try {
+    try {                           
             int remain = (int)(m_length - m_pos);
             if (param > remain) param = remain;
             /* ARGH!!! */
-            if (values[0] == null){
+            if (values[0] == null){                
                 values[0] = new byte[param];
                 // System.err.println("allocated new buffer of "+param+" bytes");
             }
@@ -111,20 +111,20 @@ public class ByteArrayToXInputStreamAdapter
             return param;
         } catch (ArrayIndexOutOfBoundsException ae) {
             // System.err.println("readbytes() -> ArrayIndexOutOfBounds");
-            ae.printStackTrace();
+            ae.printStackTrace();            
             throw new com.sun.star.io.BufferSizeExceededException("buffer overflow");
         } catch (Exception e) {
             // System.err.println("readbytes() -> Exception: "+e.getMessage());
-            e.printStackTrace();
+            e.printStackTrace();                        
             throw new com.sun.star.io.IOException("error accessing buffer");
         }
     }
-
+    
     public int readSomeBytes(byte[][] values, int param) throws com.sun.star.io.NotConnectedException, com.sun.star.io.BufferSizeExceededException, com.sun.star.io.IOException {
         // System.err.println("readSomebytes()");
         return readBytes(values, param);
     }
-
+    
     public void skipBytes(int param) throws com.sun.star.io.NotConnectedException, com.sun.star.io.BufferSizeExceededException, com.sun.star.io.IOException {
         // System.err.println("skipBytes("+param+")");
         _check();
@@ -132,30 +132,30 @@ public class ByteArrayToXInputStreamAdapter
             throw new com.sun.star.io.BufferSizeExceededException("buffer overflow");
         m_pos += param;
     }
-
+    
     public long getLength() throws com.sun.star.io.IOException {
         // System.err.println("getLength() -> "+m_length);
         if (m_bytes != null) return m_length;
         else throw new com.sun.star.io.IOException("no bytes");
     }
-
+    
     public long getPosition() throws com.sun.star.io.IOException {
         // System.err.println("getPosition() -> "+m_pos);
         if (m_bytes != null) return m_pos;
-        else throw new com.sun.star.io.IOException("no bytes");
+        else throw new com.sun.star.io.IOException("no bytes");        
     }
-
+    
     public void seek(long param) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.io.IOException {
         // System.err.println("seek("+param+")");
         if (m_bytes != null){
             if (param < 0 || param > m_length) throw new com.sun.star.lang.IllegalArgumentException("invalid seek position");
             else m_pos = (int)param;
-        }else throw new com.sun.star.io.IOException("no bytes");
+        }else throw new com.sun.star.io.IOException("no bytes");        
     }
-
+    
     public void finalize() throws Throwable{
         // System.err.println("finalizer called for ByteArrayXInputStream!");
         super.finalize();
     }
-
+    
 }
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
index 59ed553b3272..f143bf82f12a 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,31 +30,31 @@ import java.io.IOException;
 import com.sun.star.io.XInputStream;
 import java.io.InputStream;
 
-/** The <code>InputStreamToInputXStreamAdapter</code> wraps the
-    Java <code>InputStream</code> object into a
-    UNO <code>XInputStream</code> object.
-    This allows users to access an <code>InputStream</code>
+/**	The <code>InputStreamToInputXStreamAdapter</code> wraps the 
+    Java <code>InputStream</code> object into a 
+    UNO <code>XInputStream</code> object.  
+    This allows users to access an <code>InputStream</code> 
     as if it were an <code>XInputStream</code>.
  */
 public class InputStreamToXInputStreamAdapter implements XInputStream {
 
-    /**
+    /** 
      *  Internal store to the InputStream
      */
     private InputStream iIn;
-
+ 
     /**
      *  Constructor.
      *
-     *  @param  in  The <code>XInputStream</code> to be
+     *  @param  in  The <code>XInputStream</code> to be 
      *              accessed as an <code>InputStream</code>.
      */
-    public InputStreamToXInputStreamAdapter (InputStream in)
+    public InputStreamToXInputStreamAdapter (InputStream in) 
     {
         iIn = in;
     }
 
-    public int available() throws
+    public int available() throws 
             com.sun.star.io.IOException
     {
 
@@ -69,8 +69,8 @@ public class InputStreamToXInputStreamAdapter implements XInputStream {
         return(bytesAvail);
     }
 
-    public void closeInput() throws
-            com.sun.star.io.IOException
+    public void closeInput() throws 
+            com.sun.star.io.IOException 
     {
         try {
             iIn.close();
@@ -79,8 +79,8 @@ public class InputStreamToXInputStreamAdapter implements XInputStream {
         }
     }
 
-    public int readBytes(byte[][] b, int len) throws
-            com.sun.star.io.IOException
+    public int readBytes(byte[][] b, int len) throws 
+            com.sun.star.io.IOException 
     {
         int count = 0;
         try {
@@ -92,22 +92,22 @@ public class InputStreamToXInputStreamAdapter implements XInputStream {
             bytesRead = iIn.read(b[0], 0, len);
         }
             // Casting bytesRead to an int is okay, since the user can
-            // only pass in an integer length to read, so the bytesRead
+            // only pass in an integer length to read, so the bytesRead 
             // must <= len.
             //
             if (bytesRead <= 0) {
                 return(0);
-        }
+        } 	    
         return ((int)bytesRead);
-
-
+        
+        
         } catch (IOException e) {
             throw new com.sun.star.io.IOException("reader error: "+e.toString());
         }
     }
 
-    public int readSomeBytes(byte[][] b, int len) throws
-            com.sun.star.io.IOException
+    public int readSomeBytes(byte[][] b, int len) throws 
+            com.sun.star.io.IOException 
     {
         int count = 0;
         try {
@@ -119,22 +119,22 @@ public class InputStreamToXInputStreamAdapter implements XInputStream {
             bytesRead = iIn.read(b[0], 0, len);
         }
             // Casting bytesRead to an int is okay, since the user can
-            // only pass in an integer length to read, so the bytesRead
+            // only pass in an integer length to read, so the bytesRead 
             // must <= len.
             //
             if (bytesRead <= 0) {
                 return(0);
-        }
+        } 	    
         return ((int)bytesRead);
-
-
+        
+        
         } catch (IOException e) {
             throw new com.sun.star.io.IOException("reader error: "+e.toString());
         }
     }
 
-    public void skipBytes(int n) throws
-            com.sun.star.io.IOException
+    public void skipBytes(int n) throws 
+            com.sun.star.io.IOException 
     {
         int avail;
         int tmpLongVal = n;
@@ -154,7 +154,7 @@ public class InputStreamToXInputStreamAdapter implements XInputStream {
                tmpIntVal = (int)tmpLongVal;
             }
             tmpLongVal -= tmpIntVal;
-
+ 
             try {
                 iIn.skip(tmpIntVal);
             } catch (IOException e) {
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
index 93ca681a8ce4..0f69faffa4ae 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@ import com.sun.star.io.XOutputStream;
 import java.io.OutputStream;
 
 /** The <code>OutputStreamToXOutputStreamAdapter</code> wraps
-   a a UNO <code>XOutputStream</code> into a Java <code>OutputStream</code>
-   object in a Java.  This allows users to access an <code>OutputStream</code>
+   a a UNO <code>XOutputStream</code> into a Java <code>OutputStream</code> 
+   object in a Java.  This allows users to access an <code>OutputStream</code> 
    as if it were an <code>XOutputStream</code>.
  */
 public class OutputStreamToXOutputStreamAdapter implements XOutputStream {
@@ -53,8 +53,8 @@ public class OutputStreamToXOutputStreamAdapter implements XOutputStream {
         iOut = out;
     }
 
-    public void closeOutput() throws
-            com.sun.star.io.IOException
+    public void closeOutput() throws 
+            com.sun.star.io.IOException 
     {
         try {
             iOut.close();
@@ -63,8 +63,8 @@ public class OutputStreamToXOutputStreamAdapter implements XOutputStream {
         }
     }
 
-    public void flush() throws
-            com.sun.star.io.IOException
+    public void flush() throws 
+            com.sun.star.io.IOException 
     {
         try {
             iOut.flush();
@@ -73,11 +73,11 @@ public class OutputStreamToXOutputStreamAdapter implements XOutputStream {
         }
     }
 
-    public void writeBytes(byte[] b) throws
-            com.sun.star.io.IOException
+    public void writeBytes(byte[] b) throws 
+            com.sun.star.io.IOException 
     {
-
-        try {
+ 
+        try {	   
                 iOut.write(b);
             } catch (IOException e) {
                 throw new com.sun.star.io.IOException(e.toString());
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
index 0720884f00a5..696956964de7 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,15 +41,15 @@ import java.io.InputStream;
  */
 public class XInputStreamToInputStreamAdapter extends InputStream {
 
-    /**
+    /** 
      *  Internal handle to the XInputStream
      */
     private XInputStream xin;
-
+ 
     /**
      *  Constructor.
      *
-     *  @param  in  The <code>XInputStream</code> to be
+     *  @param  in  The <code>XInputStream</code> to be 
      *              accessed as an <code>InputStream</code>.
      */
     public XInputStreamToInputStreamAdapter (XInputStream in) {
@@ -77,11 +77,11 @@ public class XInputStreamToInputStreamAdapter extends InputStream {
         }
     }
 
-    public int read () throws IOException {
-        byte [][] tmp = new byte [1][1];
+    public int read () throws IOException {	
+        byte [][] tmp = new byte [1][1]; 
         try {
             long bytesRead = xin.readBytes(tmp, 1);
-
+      
             if (bytesRead <= 0) {
                return (-1);
             } else {
@@ -98,8 +98,8 @@ public class XInputStreamToInputStreamAdapter extends InputStream {
     }
 
     public int read (byte[] b) throws IOException {
-
-        byte [][] tmp = new byte [1][b.length];
+    
+        byte [][] tmp = new byte [1][b.length]; 
         int bytesRead;
 
         try {
@@ -131,7 +131,7 @@ public class XInputStreamToInputStreamAdapter extends InputStream {
         bytesRead = xin.readBytes(tmp,len);
         }
             // Casting bytesRead to an int is okay, since the user can
-            // only pass in an integer length to read, so the bytesRead
+            // only pass in an integer length to read, so the bytesRead 
             // must <= len.
             //
             if (bytesRead <= 0) {
@@ -141,10 +141,10 @@ public class XInputStreamToInputStreamAdapter extends InputStream {
         } else {
                 System.arraycopy(tmp[0], 0, b, off, len);
         }
-
+        
         return ((int)bytesRead);
-
-
+        
+        
         } catch (Exception e) {
             throw new IOException("reader error: "+e.toString());
         }
@@ -170,7 +170,7 @@ public class XInputStreamToInputStreamAdapter extends InputStream {
                tmpIntVal = (int)tmpLongVal;
             }
             tmpLongVal -= tmpIntVal;
-
+ 
             try {
                 xin.skipBytes(tmpIntVal);
             } catch (Exception e) {
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
index 82c1aceecaeb..8812f02b0e35 100755
--- a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,8 +42,8 @@ import com.sun.star.io.*;
 import  com.sun.star.lib.uno.helper.ComponentBase;
 
 public class XOutputStreamToByteArrayAdapter
-    extends ComponentBase
-    implements XOutputStream
+    extends ComponentBase 
+    implements XOutputStream 
 {
     private int initialSize = 100240; // 10 kb
     private int size = 0;
@@ -56,7 +56,7 @@ public class XOutputStreamToByteArrayAdapter
     public XOutputStreamToByteArrayAdapter() {
         this(null);
     }
-
+    
     public XOutputStreamToByteArrayAdapter(byte[] aBuffer) {
         if (aBuffer != null) {
             externalBuffer = true;
@@ -67,20 +67,20 @@ public class XOutputStreamToByteArrayAdapter
             size = initialSize;
             buffer = new byte[size];
             // System.err.println("new outputbuffer with internal storage");
-        }
+        }        
     }
-
+    
     public byte[] getBuffer() {
         return buffer;
     }
-
-    public void closeOutput()
-        throws com.sun.star.io.NotConnectedException,
-            com.sun.star.io.BufferSizeExceededException,
-            com.sun.star.io.IOException
+    
+    public void closeOutput() 
+        throws com.sun.star.io.NotConnectedException, 
+            com.sun.star.io.BufferSizeExceededException, 
+            com.sun.star.io.IOException 
     {
         // trim buffer
-        if ( buffer.length > position && !externalBuffer )
+        if ( buffer.length > position && !externalBuffer ) 
         {
             byte[] newBuffer = new byte[position];
             System.arraycopy(buffer, 0, newBuffer, 0, position);
@@ -88,23 +88,23 @@ public class XOutputStreamToByteArrayAdapter
         }
         closed = true;
     }
-
-    public void flush()
-        throws com.sun.star.io.NotConnectedException,
-            com.sun.star.io.BufferSizeExceededException,
-            com.sun.star.io.IOException
+    
+    public void flush() 
+        throws com.sun.star.io.NotConnectedException, 
+            com.sun.star.io.BufferSizeExceededException, 
+            com.sun.star.io.IOException 
     {
     }
-
-    public void writeBytes(byte[] values)
-        throws com.sun.star.io.NotConnectedException,
-            com.sun.star.io.BufferSizeExceededException,
-            com.sun.star.io.IOException
+    
+    public void writeBytes(byte[] values) 
+        throws com.sun.star.io.NotConnectedException, 
+            com.sun.star.io.BufferSizeExceededException, 
+            com.sun.star.io.IOException 
     {
         // System.err.println("writeBytes("+values.length+")");
-        if ( values.length > size-position )
+        if ( values.length > size-position ) 
         {
-            if ( externalBuffer )
+            if ( externalBuffer ) 
                 throw new BufferSizeExceededException("out of buffer space, cannot grow external buffer");
             byte[] newBuffer = null;
             while ( values.length > size-position )
@@ -115,7 +115,7 @@ public class XOutputStreamToByteArrayAdapter
             buffer = newBuffer;
         }
         System.arraycopy(values, 0, buffer, position, values.length);
-        position += values.length;
+        position += values.length;    
     }
-
+    
 }
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
index 7765c07f513b..e8f521b5e64e 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -74,8 +74,8 @@ public class XOutputStreamToOutputStreamAdapter extends OutputStream {
     }
 
     public void write(byte[] b) throws IOException {
-
-    try {
+ 
+    try {	   
             xout.writeBytes(b);
         } catch (Exception e) {
             throw new IOException(e.toString());
@@ -83,13 +83,13 @@ public class XOutputStreamToOutputStreamAdapter extends OutputStream {
     }
 
     public void write(byte[] b, int off, int len) throws IOException {
-
+    
         byte[] tmp = new byte[len];
 
         // Copy the input array into a temp array, and write it out.
         //
         System.arraycopy(b, off, tmp, 0, len);
-
+        
         try {
             xout.writeBytes(tmp);
         } catch (Exception e) {
@@ -98,7 +98,7 @@ public class XOutputStreamToOutputStreamAdapter extends OutputStream {
     }
 
     public void write(int b) throws IOException {
-
+    
         byte [] oneByte = new byte [1];
         oneByte[0] = (byte) b;
 
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java b/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
index 41cf01d81661..2833918322f4 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,15 +42,15 @@ public class ComponentBase extends WeakBase implements XComponent
     protected boolean bDisposed= false;
     static final Type  EVT_LISTENER_TYPE= new Type(XEventListener.class);
 
-
+    
     /** Creates a new instance of CompBase */
     public ComponentBase()
     {
         super();
         listenerContainer= new MultiTypeInterfaceContainer();
     }
-
-    /** Override to perform extra clean-up work. Provided for subclasses. It is
+    
+    /** Override to perform extra clean-up work. Provided for subclasses. It is 
         called during dispose()
      */
     protected void preDisposing()
@@ -61,9 +61,9 @@ public class ComponentBase extends WeakBase implements XComponent
     protected void postDisposing()
     {
     }
-
-
-    /** Method of XComponent. It is called by the owning client when the component is not needed
+    
+    
+    /** Method of XComponent. It is called by the owning client when the component is not needed 
      *  anymore. The registered listeners are notified that this method has been called.
      */
     public void dispose()
@@ -108,14 +108,14 @@ public class ComponentBase extends WeakBase implements XComponent
                 System.out.println("OComponentHelper::dispose() - dispose called twice" );
         }
     }
-
+    
     /** Method of XComponent.
      */
     public void removeEventListener(XEventListener xEventListener)
-    {
+    {   
         listenerContainer.removeInterface( EVT_LISTENER_TYPE, xEventListener);
     }
-
+    
     public void addEventListener(XEventListener listener)
     {
         boolean bDoDispose= false;
@@ -130,8 +130,8 @@ public class ComponentBase extends WeakBase implements XComponent
         {
             listener.disposing( new EventObject(this));
         }
-    }
-
+    }  
+    
     protected void finalize() throws Throwable
     {
         if ( ! bInDispose && ! bDisposed)
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java b/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
index 33d107279633..0d3759f74d6d 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@ import com.sun.star.uno.UnoRuntime;
 
 /** Factory helper class supporting com.sun.star.lang.XServiceInfo and
     com.sun.star.lang.XSingleComponentFactory.
-
+    
     @attention
     This factory implementation does not support lang.XSingleServiceFactory.
 */
@@ -46,11 +46,11 @@ public class Factory
     implements XSingleComponentFactory, XServiceInfo
 {
     private static final boolean DEBUG = false;
-
+    
     /** Creates an object factory supporting interfaces
         com.sun.star.lang.XSingleComponentFactory and
         com.sun.star.lang.XServiceInfo
-
+        
         @param impl_class
                implementation class
         @param supported_services
@@ -65,7 +65,7 @@ public class Factory
         return new Factory( impl_class, supported_services );
     }
     /** Writes component's implementation info to given registry key.
-
+        
         @param impl_name
                name of implementation
         @param supported_services
@@ -98,14 +98,14 @@ public class Factory
           }
         return false;
     }
-
+    
     //==============================================================================================
     private String m_impl_name;
     private String [] m_supported_services;
     private Class m_impl_class;
     private java.lang.reflect.Method m_method;
     private java.lang.reflect.Constructor m_ctor;
-
+    
     // ctor
     private Factory( Class impl_class, String supported_services [] )
         throws com.sun.star.uno.RuntimeException
@@ -115,9 +115,9 @@ public class Factory
         m_impl_class = impl_class;
         m_method = null;
         m_ctor = null;
-
+        
         Class params [] = new Class [] { XComponentContext.class };
-
+        
         try
         {
             // seeking for "public static Object __create( XComponentContext )"
@@ -133,7 +133,7 @@ public class Factory
         catch (Exception exc)
         {
         }
-
+        
         if (null == m_method)
         {
             try
@@ -147,7 +147,7 @@ public class Factory
             }
         }
     }
-
+    
     //______________________________________________________________________________________________
     private final Object instantiate( XComponentContext xContext )
         throws com.sun.star.uno.Exception
@@ -218,7 +218,7 @@ public class Factory
         xInit.initialize( arguments );
         return inst;
     }
-
+    
     // XServiceInfo impl
     //______________________________________________________________________________________________
     public final String getImplementationName()
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
index 404c5a5e3f3a..710141a17c70 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -102,15 +102,15 @@ public class InterfaceContainer implements Cloneable
      * The capacity of the ArrayList is the length of this array buffer.
      */
     Object elementData[];
-
+    
     /**
      * The size of the ArrayList (the number of elements it contains).
      *
      * @serial
      */
     private int size;
-
-
+    
+    
     //private ArrayList data= new ArrayList();
     /** Creates a new instance of InterfaceContainer */
     public InterfaceContainer()
@@ -131,7 +131,7 @@ public class InterfaceContainer implements Cloneable
             initialCapacity);
         this.elementData = new Object[initialCapacity];
     }
-
+    
     /**
      * Trims the capacity of this <tt>ArrayList</tt> instance to be the
      * list's current size.  An application can use this operation to minimize
@@ -147,7 +147,7 @@ public class InterfaceContainer implements Cloneable
             System.arraycopy(oldData, 0, elementData, 0, size);
         }
     }
-
+    
     /**
      * Increases the capacity of this <tt>ArrayList</tt> instance, if
      * necessary, to ensure  that it can hold at least the number of elements
@@ -168,7 +168,7 @@ public class InterfaceContainer implements Cloneable
             System.arraycopy(oldData, 0, elementData, 0, size);
         }
     }
-
+    
     /**
      * Appends the specified element to the end of this list.
      *
@@ -186,7 +186,7 @@ public class InterfaceContainer implements Cloneable
         }
         return ret;
     }
-
+    
     /**
      * Inserts the specified element at the specified position in this
      * list. Shifts the element currently at that position (if any) and
@@ -195,7 +195,7 @@ public class InterfaceContainer implements Cloneable
      * @param index index at which the specified element is to be inserted.
      * @param element element to be inserted.
      * @throws    IndexOutOfBoundsException if index is out of range
-     *        <tt>(index &lt; 0 || index &gt; size())</tt>.
+     *		  <tt>(index &lt; 0 || index &gt; size())</tt>.
      */
     synchronized public void add(int index, Object element)
     {
@@ -204,7 +204,7 @@ public class InterfaceContainer implements Cloneable
             if (index > size || index < 0)
                 throw new IndexOutOfBoundsException(
                 "Index: "+index+", Size: "+size);
-
+            
             ensureCapacity(size+1);
             System.arraycopy(elementData, index, elementData, index + 1,
             size - index);
@@ -212,8 +212,8 @@ public class InterfaceContainer implements Cloneable
             size++;
         }
     }
-
-
+    
+    
     /**
      * Appends all of the elements in the specified Collection to the end of
      * this list, in the order that they are returned by the
@@ -225,13 +225,13 @@ public class InterfaceContainer implements Cloneable
      *
      * @param c the elements to be inserted into this list.
      * @throws    IndexOutOfBoundsException if index out of range <tt>(index
-     *        &lt; 0 || index &gt; size())</tt>.
+     *		  &lt; 0 || index &gt; size())</tt>.
      */
     synchronized public boolean addAll(Collection c)
     {
         int numNew = c.size();
         ensureCapacity(size + numNew);
-
+        
         Iterator e = c.iterator();
         for (int i=0; i<numNew; i++)
         {
@@ -250,10 +250,10 @@ public class InterfaceContainer implements Cloneable
      * specified Collection's iterator.
      *
      * @param index index at which to insert first element
-     *          from the specified collection.
+     *		    from the specified collection.
      * @param c elements to be inserted into this list.
      * @throws    IndexOutOfBoundsException if index out of range <tt>(index
-     *        &lt; 0 || index &gt; size())</tt>.
+     *		  &lt; 0 || index &gt; size())</tt>.
      */
     synchronized public boolean addAll(int index, Collection c)
     {
@@ -276,12 +276,12 @@ public class InterfaceContainer implements Cloneable
             }
             int numNew = curIndex;
             ensureCapacity(size + numNew);  // Increments modCount!!
-
+            
             int numMoved = size - index;
             if (numMoved > 0)
                 System.arraycopy(elementData, index, elementData, index + numNew,
                 numMoved);
-
+            
             for (int i=0; i<numNew; i++)
             {
                 elementData[index++]= arColl[i];
@@ -291,7 +291,7 @@ public class InterfaceContainer implements Cloneable
         }
         return ret;
     }
-
+    
     /**
      * Removes all of the elements from this list.  The list will
      * be empty after this call returns.
@@ -303,7 +303,7 @@ public class InterfaceContainer implements Cloneable
             // Let gc do its work
             for (int i = 0; i < size; i++)
                 elementData[i] = null;
-
+            
             size = 0;
         }
     }
@@ -316,7 +316,7 @@ public class InterfaceContainer implements Cloneable
     {
         return indexOf(elem) >= 0;
     }
-
+    
     synchronized public boolean containsAll(Collection collection)
     {
         boolean retVal= true;
@@ -341,7 +341,7 @@ public class InterfaceContainer implements Cloneable
      * @param  index index of element to return.
      * @return the element at the specified position in this list.
      * @throws    IndexOutOfBoundsException if index is out of range <tt>(index
-     *        &lt; 0 || index &gt;= size())</tt>.
+     * 		  &lt; 0 || index &gt;= size())</tt>.
      */
     synchronized public Object get(int index)
     {
@@ -352,7 +352,7 @@ public class InterfaceContainer implements Cloneable
         }
         return null;
     }
-
+    
     /**
      * Searches for the first occurence of the given argument, testing
      * for equality using the <tt>equals</tt> method.
@@ -375,7 +375,7 @@ public class InterfaceContainer implements Cloneable
                     break;
                 }
             }
-
+            
             if (index == -1)
             {
                 for (int i = 0; i < size; i++)
@@ -400,7 +400,7 @@ public class InterfaceContainer implements Cloneable
     {
         return size == 0;
     }
-
+    
     synchronized public Iterator iterator()
     {
         if (elementData != null)
@@ -445,9 +445,9 @@ public class InterfaceContainer implements Cloneable
         }
         return index;
     }
-
+    
     /**
-     * Returns a shallow copy of this <tt>ArrayList</tt> instance. The contained
+     * Returns a shallow copy of this <tt>ArrayList</tt> instance. The contained 
      * references are copied but the objects not.
      *
      * @return  a clone of this <tt>List</tt> instance.
@@ -469,7 +469,7 @@ public class InterfaceContainer implements Cloneable
     {
         return listIterator(0);
     }
-
+    
     /** The iterator keeps a copy of the list. Changes to InterfaceContainer do not
      *  affect the data of the iterator. Conversly, changes to the iterator are effect
      *  InterfaceContainer.
@@ -491,7 +491,7 @@ public class InterfaceContainer implements Cloneable
      * @param index the index of the element to removed.
      * @return the element that was removed from the list.
      * @throws    IndexOutOfBoundsException if index out of range <tt>(index
-     *        &lt; 0 || index &gt;= size())</tt>.
+     * 		  &lt; 0 || index &gt;= size())</tt>.
      */
     synchronized public Object remove(int index)
     {
@@ -500,7 +500,7 @@ public class InterfaceContainer implements Cloneable
         {
             RangeCheck(index);
             ret= elementData[index];
-
+            
             int numMoved = size - index - 1;
             if (numMoved > 0)
                 System.arraycopy(elementData, index+1, elementData, index,
@@ -509,8 +509,8 @@ public class InterfaceContainer implements Cloneable
         }
         return ret;
     }
-
-
+    
+    
     /** Parameter obj may  */
     synchronized public boolean remove(Object obj)
     {
@@ -526,7 +526,7 @@ public class InterfaceContainer implements Cloneable
         }
         return ret;
     }
-
+    
     synchronized public boolean removeAll(Collection collection)
     {
         boolean retVal= false;
@@ -543,7 +543,7 @@ public class InterfaceContainer implements Cloneable
         }
         return retVal;
     }
-
+    
     synchronized public boolean retainAll(Collection collection)
     {
         boolean retVal= false;
@@ -595,14 +595,14 @@ public class InterfaceContainer implements Cloneable
         }
         return retVal;
     }
-
-
-    /** Not supported.
+    
+    
+    /** Not supported. 
      * @param index index of element to replace.
      * @param element element to be stored at the specified position.
      * @return the element previously at the specified position.
      * @throws    IndexOutOfBoundsException if index out of range
-     *        <tt>(index &lt; 0 || index &gt;= size())</tt>.
+     *		  <tt>(index &lt; 0 || index &gt;= size())</tt>.
      */
     synchronized public Object set(int index, Object element)
     {
@@ -615,7 +615,7 @@ public class InterfaceContainer implements Cloneable
           }
           return ret;
     }
-
+    
     /**
      * Returns the number of elements in this list.
      *
@@ -627,14 +627,14 @@ public class InterfaceContainer implements Cloneable
             return size;
         return 0;
     }
-
+    
 
     /**
      * Returns an array containing all of the elements in this list
      * in the correct order.
      *
      * @return an array containing all of the elements in this list
-     *         in the correct order.
+     * 	       in the correct order.
      */
     synchronized public Object[] toArray()
     {
@@ -662,8 +662,8 @@ public class InterfaceContainer implements Cloneable
      * <tt>null</tt> elements.
      *
      * @param a the array into which the elements of the list are to
-     *      be stored, if it is big enough; otherwise, a new array of the
-     *      same runtime type is allocated for this purpose.
+     *		be stored, if it is big enough; otherwise, a new array of the
+     * 		same runtime type is allocated for this purpose.
      * @return an array containing the elements of the list.
      * @throws ArrayStoreException if the runtime type of a is not a supertype
      *         of the runtime type of every element in this list.
@@ -675,13 +675,13 @@ public class InterfaceContainer implements Cloneable
             a.getClass().getComponentType(), size);
         if (elementData != null)
             System.arraycopy(elementData, 0, a, 0, size);
-
+        
         if (a.length > size)
             a[size] = null;
-
+        
         return a;
     }
-
+    
     /**
      * Check if the given index is in range.  If not, throw an appropriate
      * runtime exception.
@@ -692,7 +692,7 @@ public class InterfaceContainer implements Cloneable
             throw new IndexOutOfBoundsException(
             "Index: "+index+", Size: "+size);
     }
-
+    
     public void disposeAndClear(EventObject evt)
     {
         Iterator aIt;
@@ -725,8 +725,8 @@ public class InterfaceContainer implements Cloneable
             }
         }
     }
-
-
+    
+    
     private class Itr implements Iterator
     {
         InterfaceContainer dataIt;
@@ -740,23 +740,23 @@ public class InterfaceContainer implements Cloneable
          * to remove.
          */
         int lastRet = -1;
-
+        
         /** The object that has been returned by most recent call to next
          *  or previous. Reset to null if this element is deleted by a call
          *  to remove.
          */
         Object lastRetObj= null;
-
+        
         Itr(InterfaceContainer _data)
         {
             dataIt= _data;
         }
-
+        
         synchronized public boolean hasNext()
         {
             return cursor !=dataIt.size();
         }
-
+        
         public synchronized Object next()
         {
             try
@@ -771,7 +771,7 @@ public class InterfaceContainer implements Cloneable
                 throw new java.util.NoSuchElementException();
             }
         }
-
+        
         /** Removes the interface from the list, that has been last returned by a
          *  call to next(). This is done according to the specification of the interface
          *  method. The element is also removed from InterfaceContainer but independent
@@ -785,23 +785,23 @@ public class InterfaceContainer implements Cloneable
             // Remove the entry from InterfaceContainer.
             InterfaceContainer.this.remove(lastRetObj);
             dataIt.remove(lastRet);
-
+            
             if (lastRet < cursor)
                 cursor--;
             lastRet = -1;
             lastRetObj= null;
         }
     }
-
+    
     private class LstItr extends Itr implements ListIterator
     {
-
+        
         LstItr(InterfaceContainer _data, int _index)
         {
             super(_data);
             cursor= _index;
         }
-
+        
         /** Inserts an element to the iterators list according to the specification
          *  of this interface method. The element is also added to InterfaceContainer
          *  but its location within the list cannot be guaranteed.
@@ -813,17 +813,17 @@ public class InterfaceContainer implements Cloneable
             lastRet = -1;
             lastRetObj= null;
         }
-
+        
         synchronized public boolean hasPrevious()
         {
             return cursor != 0;
         }
-
+        
         synchronized public int nextIndex()
         {
             return cursor;
         }
-
+        
         public synchronized Object previous()
         {
             try
@@ -837,20 +837,20 @@ public class InterfaceContainer implements Cloneable
                 throw new NoSuchElementException();
             }
         }
-
+        
         synchronized public int previousIndex()
         {
             return cursor-1;
         }
-
+        
         /** This is not possible since several iterators can modify InterfaceContainer
          */
         public synchronized void set(Object o)
         {
             throw new UnsupportedOperationException();
         }
-
-
+        
+        
     } // class LstItr
 }
 
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
index c324345a27d8..e61362b2bc3c 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,14 +34,14 @@ import java.util.Iterator;
 
 public class MultiTypeInterfaceContainer
 {
-
+    
     private Map map= new HashMap();
-
+    
     /** Creates a new instance of MultiTypeInterfaceContainer */
     public MultiTypeInterfaceContainer()
     {
     }
-
+    
     /** only returns types which have at least one value in InterfaceContainer
      *  return value can contain an element null, if someone called
      *  addInterface (null, interf)
@@ -50,12 +50,12 @@ public class MultiTypeInterfaceContainer
     {
         int size;
         Type[] retVal= null;
-
+        
         if ( (size=map.size()) > 0)
         {
             Type [] arTypes= new Type[size];
             Iterator it= map.keySet().iterator();
-
+            
             int countTypes= 0;
             while (it.hasNext())
             {
@@ -73,7 +73,7 @@ public class MultiTypeInterfaceContainer
                         arTypes[countTypes++]= new Type(key.getClass());
                 }
             }
-
+            
             if (countTypes != size)
             {
                 retVal= new Type[countTypes];
@@ -86,7 +86,7 @@ public class MultiTypeInterfaceContainer
             retVal= new Type[0];
         return retVal;
     }
-
+    
     /** param key can be null */
     synchronized public InterfaceContainer getContainer(Object key)
     {
@@ -108,12 +108,12 @@ public class MultiTypeInterfaceContainer
         }
         return retVal;
     }
-
-
+    
+    
     synchronized public int addInterface(Object ckey, Object iface)
     {
         //If the key is a Type then it does not matter if the objects are different
-        // if they represent the same type. This is because Types overrides hashCode and
+        // if they represent the same type. This is because Types overrides hashCode and 
         // equals. For example:
         // Type a= new Type(XInterface.class);
         // Type b= new Type(XInterface.class);
@@ -131,8 +131,8 @@ public class MultiTypeInterfaceContainer
         }
         return cont.size();
     }
-
-
+  
+    
     synchronized public int removeInterface(Object key, Object iface)
     {
         int retVal= 0;
@@ -144,7 +144,7 @@ public class MultiTypeInterfaceContainer
         }
         return retVal;
     }
-
+    
     public void disposeAndClear(EventObject evt)
     {
         Iterator it= null;
@@ -155,7 +155,7 @@ public class MultiTypeInterfaceContainer
         while (it.hasNext() )
             ((InterfaceContainer) it.next()).disposeAndClear(evt);
     }
-
+    
     synchronized public void clear()
     {
         Iterator it= map.values().iterator();
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
index ad2c8c7bcf88..0f18ac78154b 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,18 +54,18 @@ import com.sun.star.lang.DisposedException;
 
 
 /** This class is an implementation of the interfaces com.sun.star.beans.XPropertySet,
- *  com.sun.star.beans.XFastPropertySet and com.sun.star.beans.XMultiPropertySet. This
- *  class has to be inherited to be used. The values of properties are stored in member
- *  variables of the inheriting class. By overriding the methods
+ *  com.sun.star.beans.XFastPropertySet and com.sun.star.beans.XMultiPropertySet. This 
+ *  class has to be inherited to be used. The values of properties are stored in member 
+ *  variables of the inheriting class. By overriding the methods 
  *  {@link #convertPropertyValue convertPropertyValue},
- *  {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast} and
- *  {@link #getPropertyValue(Property)} one can determine how
+ *  {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast} and 
+ *  {@link #getPropertyValue(Property)} one can determine how 
  *  property values are stored.
- *  When using the supplied implementations of this class then the member variables which
+ *  When using the supplied implementations of this class then the member variables which 
  *  hold property values have to be declared in the class which inherits last in the inheriting
  *  chain and they have to be public<p>
- *  Properties have to be registered by one of the registerProperty methods. They take among other
- *  arguments an Object named <em>id</em> which has to be a String that represents the name of
+ *  Properties have to be registered by one of the registerProperty methods. They take among other 
+ *  arguments an Object named <em>id</em> which has to be a String that represents the name of 
  *  the member variable. The registering has to occur in the constructor of the inheriting class.
  *  It is no allowed to add or change properties later on.<p>
  *  Example:
@@ -89,9 +89,9 @@ XMultiPropertySet
     private HashMap _handleToPropertyMap;
     private HashMap _propertyToIdMap;
     private Property[] arProperties;
-
+    
     private int lastHandle= 1;
-
+    
     protected XPropertySetInfo propertySetInfo;
     protected MultiTypeInterfaceContainer aBoundLC= new MultiTypeInterfaceContainer();
     protected MultiTypeInterfaceContainer aVetoableLC= new MultiTypeInterfaceContainer();
@@ -101,14 +101,14 @@ XMultiPropertySet
         initMappings();
     }
 
-    /** Registers a property with this helper class and associates the argument <em>id</em> with it.
+    /** Registers a property with this helper class and associates the argument <em>id</em> with it. 
      *  <em>id</em> is used to identify the storage of the property value. How property values are stored
-     *  and retrieved is determined by the methods {@link #convertPropertyValue convertPropertyValue},
-     *  {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast} and {@link #getPropertyValue(Property) getPropertyValue}
+     *  and retrieved is determined by the methods {@link #convertPropertyValue convertPropertyValue}, 
+     *  {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast} and {@link #getPropertyValue(Property) getPropertyValue} 
      *  These methods expect <em>id</em> to be a java.lang.String which represents the name of a member variable
      *  which holds the property value.
      *  Only properties which are registered can be accessed. Registration has to occur during
-     *  initialization of the inheriting class (i.e. within the contructor).
+     *  initialization of the inheriting class (i.e. within the contructor). 
      *  @param prop The property to be registered.
      *  @param id Identifies the properties storage.
      *  @see #getPropertyId
@@ -118,9 +118,9 @@ XMultiPropertySet
         putProperty(prop);
         assignPropertyId(prop, id);
     }
-
+    
     /** Registers a property with this helper class and associates the argument id with it.
-     *  It does the same as {@link #registerProperty(Property, Object)}. The first four
+     *  It does the same as {@link #registerProperty(Property, Object)}. The first four 
      *  arguments are used to construct a Property object.
      *  Registration has to occur during
      *  initialization of the inheriting class (i.e. within the contructor)
@@ -137,7 +137,7 @@ XMultiPropertySet
     }
 
     /** Registers a property with this  class and associates the argument id with it.
-     *  It does the same as {@link #registerProperty(Property, Object)}. The first three
+     *  It does the same as {@link #registerProperty(Property, Object)}. The first three 
      *  arguments are used to construct a Property object. The value for the Property.Handle
      *  is generated and does not have to be specified here. Use this method for registering
      *  a property if you do not care about the Property's handles.
@@ -154,12 +154,12 @@ XMultiPropertySet
         Property p= new Property(name, lastHandle++, type, attributes);
         registerProperty(p, id);
     }
-
-    /** Registers a property with this class. This method expects that property values
+    
+    /** Registers a property with this class. This method expects that property values 
      *  are stored in member variables as is the case if the methods convertPropertyValue,
      *  setPropertyValueNoBroadcast and getPropertyValue(Property) are not overridden.
      *  It is presumed that the type of the member variable
-     *  corresponds Property.Type. For example, if the TypeClass of Property.Type is to be
+     *  corresponds Property.Type. For example, if the TypeClass of Property.Type is to be 
      *  a TypeClass.SHORT then the member must be a short or java.lang.Short.
      *  The handle for the property is generated.<br>
      *  If there is no member with the specified name or if the member has an incompatible type
@@ -171,7 +171,7 @@ XMultiPropertySet
     protected void registerProperty(String propertyName, String memberName, short attributes)
     {
         Field propField= null;
-        try
+        try 
         {
             propField= getClass().getDeclaredField(memberName);
         }
@@ -190,9 +190,9 @@ XMultiPropertySet
             throw new com.sun.star.uno.RuntimeException("the member has an unknown type: " + memberName);
     }
 
-    /** Registers a property with this class.
+    /** Registers a property with this class. 
      *  It is presumed that the name of property is equal to the name of the member variable
-     *  that holds the property value.
+     *  that holds the property value. 
      *  @param propertyName The name of the property and the member variable that holds the property's value.
      *  @param attributes The property attributes.
      *  @see #registerProperty(String, String, short)
@@ -201,13 +201,13 @@ XMultiPropertySet
     {
         registerProperty(propertyName, propertyName, attributes);
     }
+        
+            
 
-
-
-    /** Returns the Property object for a given property name or null if that property does
-     *  not exists (i.e. it has not been registered). Override this method
+    /** Returns the Property object for a given property name or null if that property does 
+     *  not exists (i.e. it has not been registered). Override this method 
      *  if you want to implement your own mapping from property names to Property objects.
-     *  Then you also have to override {@link #initMappings}, {@link #getProperties()} and
+     *  Then you also have to override {@link #initMappings}, {@link #getProperties()} and 
      *  {@link #putProperty(Property)}.
      *  @param propertyName The name of the property (Property.Name)
      *  @return The Property object with the name <em>propertyName</em>.
@@ -216,10 +216,10 @@ XMultiPropertySet
     {
         return (Property) _nameToPropertyMap.get(propertyName);
     }
-
+    
     /** Returns the Property object with a handle (Property.Handle) as specified by the argument
-     *  <em>nHandle</em>. The method returns null if there is no such property (i.e. it has not
-     *  been registered). Override this method if you want to implement your own mapping from handles
+     *  <em>nHandle</em>. The method returns null if there is no such property (i.e. it has not 
+     *  been registered). Override this method if you want to implement your own mapping from handles 
      *  to Property objects. Then you also have to override {@link #initMappings}, {@link #putProperty(Property)}.
      *  @param nHandle The handle of the property (Property.Handle).
      *  @return The Property object with the handle <em>nHandle</em>
@@ -228,10 +228,10 @@ XMultiPropertySet
     {
         return (Property) _handleToPropertyMap.get(new Integer(nHandle));
     }
-
+    
     /** Returns an array of all Property objects or an array of length null if there
-     *  are no properties. Override this method if you want to implement your own mapping from names
-     *  to Property objects. Then you also have to override {@link #initMappings}, {@link #getProperty(String)} and
+     *  are no properties. Override this method if you want to implement your own mapping from names 
+     *  to Property objects. Then you also have to override {@link #initMappings}, {@link #getProperty(String)} and 
      *  {@link #putProperty}.
      *  @return Array of all Property objects.
      */
@@ -244,12 +244,12 @@ XMultiPropertySet
         }
         return arProperties;
     }
-
-    /** Stores a Property object so that it can be retrieved subsequently by
+    
+    /** Stores a Property object so that it can be retrieved subsequently by 
      *  {@link #getProperty(String)},{@link #getProperties()},{@link #getPropertyByHandle(int)}.
-     *  Override this method if you want to implement your own mapping from handles
+     *  Override this method if you want to implement your own mapping from handles 
      *  to Property objects and names to Property objects. Then you also need to override {@link #initMappings},
-     *  {@link #getProperty(String)},{@link #getProperties()},{@link #getPropertyByHandle(int)}.
+     *  {@link #getProperty(String)},{@link #getProperties()},{@link #getPropertyByHandle(int)}. 
      *  @param prop The Property object that is to be stored.
      */
     protected void putProperty(Property prop)
@@ -258,16 +258,16 @@ XMultiPropertySet
         if (prop.Handle != -1)
             _handleToPropertyMap.put(new Integer(prop.Handle), prop);
     }
-
-    /** Assigns an identifyer object to a Property object so that the identifyer
+    
+    /** Assigns an identifyer object to a Property object so that the identifyer 
      *  can be obtained by {@link #getPropertyId getPropertyId} later on. The identifyer
      *  is used to specify a certain storage for the property's value. If you do not
      *  override {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast} or {@link #getPropertyValue(Property)}
-     *  then the argument <em>id</em> has to be a java.lang.String that equals the name of
+     *  then the argument <em>id</em> has to be a java.lang.String that equals the name of 
      *  the member variable that holds the Property's value.
-     *  Override this method if you want to implement your own mapping from Property objects  to ids or
+     *  Override this method if you want to implement your own mapping from Property objects  to ids or 
      *  if you need ids of a type other then java.lang.String.
-     *  Then you also need to override {@link #initMappings initMappings} and {@link #getPropertyId getPropertyId}.
+     *  Then you also need to override {@link #initMappings initMappings} and {@link #getPropertyId getPropertyId}. 
      *  @param prop The Property object that is being assigned an id.
      *  @param id The object which identifies the storage used for the property's value.
      *  @see #registerProperty(Property, Object)
@@ -277,11 +277,11 @@ XMultiPropertySet
        if (id instanceof String && ((String) id).equals("") == false)
             _propertyToIdMap.put(prop, id);
     }
-
-    /** Returns the identifyer object for a certain Property. The object must have been
+    
+    /** Returns the identifyer object for a certain Property. The object must have been 
      *  previously assigned to the Property object by {@link #assignPropertyId assignPropertyId}.
      *  Override this method if you want to implement your own mapping from Property objects to ids.
-     *  Then you also need to override {@link #initMappings initMappings} and {@link #assignPropertyId assignPropertyId}.
+     *  Then you also need to override {@link #initMappings initMappings} and {@link #assignPropertyId assignPropertyId}. 
      *  @param prop The property for which the id is to be retrieved.
      *  @return The id object that identifies the storage used for the property's value.
      *  @see #registerProperty(Property, Object)
@@ -293,7 +293,7 @@ XMultiPropertySet
 
     /** Initializes data structures used for mappings of property names to property object,
      *  property handles to property objects and property objects to id objects.
-     *  Override this method if you want to implement your own mappings. Then you also need to
+     *  Override this method if you want to implement your own mappings. Then you also need to 
      *  override {@link #putProperty putProperty},{@link #getProperty getProperty}, {@link #getPropertyByHandle},
      *  {@link #assignPropertyId assignPropertyId} and {@link #getPropertyId getPropertyId}.
      */
@@ -311,14 +311,14 @@ XMultiPropertySet
     {
         // Create an event with this as sender
         EventObject aEvt= new EventObject(this);
-
+        
         // inform all listeners to reelease this object
         aBoundLC.disposeAndClear(aEvt);
         aVetoableLC.disposeAndClear(aEvt);
-    }
+    }   
 
     //XPropertySet ----------------------------------------------------
-    synchronized public void addPropertyChangeListener(String str, XPropertyChangeListener xPropertyChangeListener)
+    synchronized public void addPropertyChangeListener(String str, XPropertyChangeListener xPropertyChangeListener) 
     throws UnknownPropertyException, WrappedTargetException
     {
           // only add listeners if you are not disposed
@@ -381,16 +381,16 @@ XMultiPropertySet
     }
     //XPropertySet ----------------------------------------------------
     public Object getPropertyValue(String name) throws UnknownPropertyException, WrappedTargetException
-    {
+    {   
         Object ret= null;
         if (bInDispose || bDisposed)
             throw new com.sun.star.lang.DisposedException("The component has been disposed already");
-
+ 
         Property prop= getProperty(name);
         if (prop == null)
             throw new UnknownPropertyException("The property " + name + " is unknown");
-
-        synchronized (this)
+        
+        synchronized (this) 
         {
             ret= getPropertyValue(prop);
         }
@@ -405,10 +405,10 @@ XMultiPropertySet
         }
         return ret;
     }
-
+    
     //XPropertySet ----------------------------------------------------
     synchronized public void removePropertyChangeListener(String propName, XPropertyChangeListener listener) throws UnknownPropertyException, WrappedTargetException
-    {   // all listeners are automaticly released in a dispose call
+    {	// all listeners are automaticly released in a dispose call
         if (!bInDispose && !bDisposed)
         {
             if (propName.length() > 0)
@@ -439,12 +439,12 @@ XMultiPropertySet
                 listenerContainer.removeInterface(XVetoableChangeListener.class, listener);
         }
     }
-
+    
     //XPropertySet ----------------------------------------------------
-    /** Sets the value of a property.
+    /** Sets the value of a property. 
      *  The idl description for this interfaces, stipulates that the argument value is an Any. Since a java.lang.Object
      *  reference has the same meaning as an Any this function accepts
-     *  java anys (com.sun.star.uno.Any) and all other appropriate objects as arguments. The value argument can be one
+     *  java anys (com.sun.star.uno.Any) and all other appropriate objects as arguments. The value argument can be one 
      *  of these:
      *  <ul>
      *  <li>java.lang.Boolean</li>
@@ -461,23 +461,23 @@ XMultiPropertySet
      *  <li><em>arrays which contain elements of the types above</em></li>
      *  <li>com.sun.star.uno.Any containing an instance of one of the above types</li>
      *  </ul>
-     *
-     *  Properties can have the attribute com.sun.star.beans.PropertyAttribute.MAYBEVOID, which means that the value
+     *  
+     *  Properties can have the attribute com.sun.star.beans.PropertyAttribute.MAYBEVOID, which means that the value 
      *  (not the type) can be void. In order to assign a void value to a property one can either pass an Any which
-     *  contains a null reference or pass null directly. In bothe cases the null reference is only accepted if
+     *  contains a null reference or pass null directly. In bothe cases the null reference is only accepted if 
      *  the PropertyAttribute.MAYBEVOID attribute is set for the property.
-     *
-     *  Properties which have the attribute MAYBEVOID set (Property.Attributes) can have a void value. The following
+     *  
+     *  Properties which have the attribute MAYBEVOID set (Property.Attributes) can have a void value. The following 
      *  considerations presume that the Property has that attribute set. Further, when mentioning an Any's value we
-     *  actually refer to the object returned by Any.getObject.
+     *  actually refer to the object returned by Any.getObject. 
      *  If the argument <em>value</em> is null, or it is an Any whose value is null (but with a valid Type)
-     *  then the member variable used for storing the property's value is set to null.
+     *  then the member variable used for storing the property's value is set to null. 
      *  Therefore those properties can only be stored in objects
      *  and primitive types are not allowed (one can use the wrapper classes instead,e.g. java.lang.Byte) .
      *  If a property's value is kept in a member variable of type Any and that reference is still null
      *  then when setPropertyValue is called with
      *  <em>value</em> = null then the member variable is assigned an Any with type void and a null value.
-     *  Or if the argument is an Any with a null value then it is assigned to the member variable.
+     *  Or if the argument is an Any with a null value then it is assigned to the member variable. 
      *  Further, if the variable already
      *  references an Any and setPropertyValue is called with <em>value</em> = null, then the variable is assigned
      *  a new Any with the same type as the previously referenced Any and with a null value.
@@ -493,8 +493,8 @@ XMultiPropertySet
         setPropertyValue(prop, value);
     }
 
-    /** Sets the value of a property. It checks if the property's attributes (READONLY,MAYBEVOID), allow that the
-     *  new value can be set. It also causes the notification of listeners.
+    /** Sets the value of a property. It checks if the property's attributes (READONLY,MAYBEVOID), allow that the 
+     *  new value can be set. It also causes the notification of listeners. 
      *  @param prop The property whose value is to be set.
      *  @param value The new value for the property.
      */
@@ -503,17 +503,17 @@ XMultiPropertySet
     {
         if ((prop.Attributes & PropertyAttribute.READONLY) == PropertyAttribute.READONLY)
             throw new com.sun.star.beans.PropertyVetoException();
-        // The value may be null only if MAYBEVOID attribute is set
+        // The value may be null only if MAYBEVOID attribute is set         
         boolean bVoidValue= false;
         if (value instanceof Any)
             bVoidValue= ((Any) value).getObject() == null;
         else
             bVoidValue= value == null;
-        if (bVoidValue && (prop.Attributes & PropertyAttribute.MAYBEVOID) == 0)
+        if (bVoidValue && (prop.Attributes & PropertyAttribute.MAYBEVOID) == 0) 
             throw new com.sun.star.lang.IllegalArgumentException("The property must have a value; the MAYBEVOID attribute is not set!");
         if (bInDispose || bDisposed)
             throw new DisposedException("Component is already disposed");
-
+        
         //Check if the argument is allowed
         boolean bValueOk= false;
         if (value instanceof Any)
@@ -522,16 +522,16 @@ XMultiPropertySet
             bValueOk= checkType(value);
         if (! bValueOk)
             throw new com.sun.star.lang.IllegalArgumentException("No valid UNO type");
-
-
+            
+        
         boolean bConversionOk= false;
         Object[] outConvertedVal= new Object[1];
         Object[] outOldValue= new Object[1];
-        synchronized (this)
+        synchronized (this) 
         {
             bConversionOk= convertPropertyValue(prop, outConvertedVal, outOldValue, value);
         }
-
+        
         //The next step following the conversion is to set the new value of the property. Prior to this
         // the XVetoableChangeListener s have to be notified.
         if (bConversionOk)
@@ -548,76 +548,76 @@ XMultiPropertySet
             fire( new Property[]{prop}, outConvertedVal, outOldValue, false);
         }
     }
-
-    /** Converts a value in a way so that it is appropriate for storing as a property value, that is
-     *  {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast} can process the value without any further
+    
+    /** Converts a value in a way so that it is appropriate for storing as a property value, that is 
+     *  {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast} can process the value without any further 
      *  conversion. This implementation presumes that
-     *  the values are stored in member variables of the furthest inheriting class. For example,
+     *  the values are stored in member variables of the furthest inheriting class. For example, 
      *  class A inherits this class then members of class A
      *  can hold property values. If there is a class B which inherits A then only members of B can hold
-     *  property values. The variables must be public. A property must have been registered (e.g. by
+     *  property values. The variables must be public. A property must have been registered (e.g. by 
      *  {@link #registerProperty(Property, Object)} in order for this method to work. The identifyer argument (type Object)
-     *  used in the registerProperty methods must
+     *  used in the registerProperty methods must 
      *  be a java.lang.String, which is, the name of the member variable that holds the property value.
      *  If one opts to store values differently then one may override
-     *  this method, as well as {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast} and
+     *  this method, as well as {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast} and 
      *  {@link #getPropertyValue(Property) getPropertyValue(Property)}.
-     *  This method is always called as a result of a call to one of the setter methods, such as
-     *  {@link #setPropertyValue(String,Object) XPropertySet.setPropertyValue},
+     *  This method is always called as a result of a call to one of the setter methods, such as 
+     *  {@link #setPropertyValue(String,Object) XPropertySet.setPropertyValue}, 
      *  {@link #setFastPropertyValue XFastPropertySet.setFastPropertyValue}
-     *  and {@link #setPropertyValues XMultiPropertySet.setPropertyValues}.
-     *  If this method fails, that is, it returns false or throws an exception, then no listeners are notified and the
+     *  and {@link #setPropertyValues XMultiPropertySet.setPropertyValues}. 
+     *  If this method fails, that is, it returns false or throws an exception, then no listeners are notified and the 
      *  property value, that was intended to be changed, remains untouched.<br /> This method does not have to deal with property attributes, such as
      *  PropertyAttribute.READONLY or PropertyAttribute.MAYBEVOID. The processing of these attributes occurs
      *  in the calling methods.<br />
-     *  Only if this method returns successfully further processing, such
+     *  Only if this method returns successfully further processing, such 
      *  as listener notification and finally the modifiction of the property's value, will occur.<br />
      *
-     *  The actual modification of a property's value is done by {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast}
-     *  which is called subsequent to convertPropertyValue.
+     *  The actual modification of a property's value is done by {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast} 
+     *  which is called subsequent to convertPropertyValue. 
      *<p>
      *  This method converts values by help of the com.sun.star.uno.AnyConverter which only does a few widening
-     *  conversions on integer types and floating point types. For example, there is the property PropA with a Type equivalent
-     *  to int.class and the
-     *  value of the property is to be stored in a member variable of type int with name intProp. Then setPropertyValue is
+     *  conversions on integer types and floating point types. For example, there is the property PropA with a Type equivalent 
+     *  to int.class and the 
+     *  value of the property is to be stored in a member variable of type int with name intProp. Then setPropertyValue is 
      *  called:
      *  <pre>
      *  set.setPropertyValue( "PropA", new Byte( (byte)111));
      *  </pre>
      *  At some point setPropertyValue will call convertPropertyValue and pass in the Byte object. Since we allow
-     *  that Byte values can be used with the property and know that the value is to be stored in intProp (type int)
-     *  we convert the Byte object into an Integer object which is then returned in the out-parameter <em>newVal</em>. This
+     *  that Byte values can be used with the property and know that the value is to be stored in intProp (type int) 
+     *  we convert the Byte object into an Integer object which is then returned in the out-parameter <em>newVal</em>. This 
      *  conversion is actually performed by the AnyConverter. Later
      *  the setPropertyValueNoBroadcast is called with that Integer object and the int value can be easily extracted
-     *  from the object and be assigned to the member intProp.
+     *  from the object and be assigned to the member intProp. 
      *  <p>
-     *  The method handles Any arguments the same as Object arguments. That is, the <em>setVal</em> argument can
-     *  be a java.lang.Boolean or a com.sun.star.uno.Any containing a java.lang.Boolean. Likewise, a member
-     *  containing a property value can be a com.sun.star.uno.Any or an java.lang.Object.
-     *  Then, no conversion is necessary, since they can hold all possible values. However, if
+     *  The method handles Any arguments the same as Object arguments. That is, the <em>setVal</em> argument can 
+     *  be a java.lang.Boolean or a com.sun.star.uno.Any containing a java.lang.Boolean. Likewise, a member 
+     *  containing a property value can be a com.sun.star.uno.Any or an java.lang.Object. 
+     *  Then, no conversion is necessary, since they can hold all possible values. However, if 
      *  the member is an Object and <em>setVal</em> is an Any then the object contained in the any is assigned to
-     *  the member. The extra type information which exists as Type object in the Any will get lost. If this is not
+     *  the member. The extra type information which exists as Type object in the Any will get lost. If this is not 
      *  intended then use an Any variable rather then an Object.<br />
-     *  If a member is an Object or Any and the argument <em>setVal</em> is an Object, other than String or array,
+     *  If a member is an Object or Any and the argument <em>setVal</em> is an Object, other than String or array, 
      *  then it is presumed to be an UNO object and queried for XInterface. If successful, the out-param <em>newVal</em>
      *  returns the XInterface.<br />
      *  If a member is an UNO interface, then <em>setVal</em> is queried for this interface and the result is returned.
      *  If <em>setVal</em> is null then <em>newVal</em> will be null too after return.
      *  <p>
-     *  If a property value is stored using a primitive type the the out-parameters
+     *  If a property value is stored using a primitive type the the out-parameters 
      *  <em>curVal</em> and <em>newVal</em> contain the respective wrapper class (e.g.java.lang.Byte, etc.).
      *  curVal is used in calls to the XVetoableChangeListener and XPropertyChangeListener.
      *
      * @param property - in-param property for which the data is to be converted.
      * @param newVal - out-param which contains the converted value on return.
-     * @param curVal - out-param the current value of the property. It is used in calls to the
+     * @param curVal - out-param the current value of the property. It is used in calls to the 
      *                   XVetoableChangeListener and XPropertyChangeListener.
-     *  @param setVal - in-param. The value that is to be converted so that it matches Property and the internally used
-     *  dataformat for that property.
-     *  @return true - Conversion was successful. <em>newVal</em> contains a valid value for the property. false -
+     *  @param setVal - in-param. The value that is to be converted so that it matches Property and the internally used 
+     *  dataformat for that property.  
+     *  @return true - Conversion was successful. <em>newVal</em> contains a valid value for the property. false - 
      *  conversion failed for some reason.
      *  @throws com.sun.star.lang.IllegalArgumentException The value provided is unfit for the property.
-     *  @throws com.sun.star.lang.WrappedTargetException - An exception occured during the conversion, that is to be made known
+     *  @throws com.sun.star.lang.WrappedTargetException - An exception occured during the conversion, that is to be made known 
      *  to the caller.
      */
     protected boolean convertPropertyValue(Property property, Object[] newVal, Object[]curVal,  Object setVal)
@@ -635,10 +635,10 @@ XMultiPropertySet
                 // also get inherited fields, but only those which are public.
                 Field propField= getClass().getDeclaredField(sMember);
                 if (propField != null)
-                {
+                {   
                     curVal[0]= propField.get(this);
                     Class memberClass= propField.getType();
-
+                    
                     // MAYBEVOID: if setVal == null or it is an Any and getObject returns null, then a void value is to be set
                     // This works only if there are no primitive types. For those we use the respective wrapper classes.
                     // In this implementation, a null reference means void value.
@@ -650,7 +650,7 @@ XMultiPropertySet
                         bVoidValue= setVal == null;
                     if (bVoidValue && memberClass.isPrimitive())
                         throw new com.sun.star.lang.IllegalArgumentException("The implementation does not support the MAYBEVOID attribute for this property");
-
+                    
                     Object convObj= null;
                     //The member that keeps the value of the Property is an Any. It can contain all possible
                     //types, therefore a conversion is not necessary.
@@ -661,12 +661,12 @@ XMultiPropertySet
                             convObj= setVal;
                         else
                         {
-                            // Parameter setVal is not an Any. We need to construct an Any that contains
+                            // Parameter setVal is not an Any. We need to construct an Any that contains 
                             // the argument setVal.
-                            // If setVal is an interface implementation then, we cannot constuct the
+                            // If setVal is an interface implementation then, we cannot constuct the 
                             // Any with setVal.getClass(), because the Any.Type._typeClass would be TypeClass.UNKNOWN.
                             // We try to get an XInterface of setVal and set an XInterface type.
-                            if (setVal instanceof XInterface)
+                            if (setVal instanceof XInterface)   
                             {
                                 XInterface xint= UnoRuntime.queryInterface(XInterface.class, setVal);
                                 if (xint != null)
@@ -698,7 +698,7 @@ XMultiPropertySet
         }
         catch (java.lang.NoSuchFieldException e)
         {
-            throw new WrappedTargetException("Field does not exist", this, e);
+            throw new WrappedTargetException("Field does not exist", this, e); 
         }
         catch (java.lang.IllegalAccessException e)
         {
@@ -706,11 +706,11 @@ XMultiPropertySet
         }
         return ret;
     }
-
+    
     private boolean checkType(Object obj)
     {
-        if (obj == null
-        || obj instanceof Boolean
+        if (obj == null 
+        || obj instanceof Boolean 
         || obj instanceof Character
         || obj instanceof Number
         || obj instanceof String
@@ -721,7 +721,7 @@ XMultiPropertySet
             return true;
         return false;
     }
-
+    
     // Param object can be an Any or other object. If obj is null then the return value is null
     private Object convert( Class cl, Object obj) throws com.sun.star.lang.IllegalArgumentException
     {
@@ -782,17 +782,17 @@ XMultiPropertySet
             throw new com.sun.star.lang.IllegalArgumentException("Could not convert the argument");
         return retVal;
     }
-
-    /**  Sets the value of a property. In this implementation property values are stored in member variables
+    
+    /**  Sets the value of a property. In this implementation property values are stored in member variables 
      *  (see {@link #convertPropertyValue convertPropertyValue} Notification of property listeners
      *  does not occur in this method. By overriding this method one can take full control about how property values
-     *  are stored. But then, the {@link #convertPropertyValue convertPropertyValue} and
-     *  {@link #getPropertyValue(Property)} must be overridden too.
-     *
-     *  A Property with the MAYBEVOID attribute set, is stored as null value. Therefore the member variable must be
-     *  an Object in order to make use of the property attribute. An exception is Any. The Any variable can be initially null, but
-     *  once it is set the reference will not become null again. If the value is to be set to
-     *  void then a new Any will be stored
+     *  are stored. But then, the {@link #convertPropertyValue convertPropertyValue} and 
+     *  {@link #getPropertyValue(Property)} must be overridden too. 
+     *  
+     *  A Property with the MAYBEVOID attribute set, is stored as null value. Therefore the member variable must be 
+     *  an Object in order to make use of the property attribute. An exception is Any. The Any variable can be initially null, but 
+     *  once it is set the reference will not become null again. If the value is to be set to 
+     *  void then a new Any will be stored 
      *  with a valid type but without a value (i.e. Any.getObject returns null).
      *  If a property has the READONLY attribute set, and one of the setter methods, such as setPropertyValue, has been
      *  called, then this method is not going to be called.
@@ -823,14 +823,14 @@ XMultiPropertySet
             throw new WrappedTargetException("PropertySet.setPropertyValueNoBroadcast", this, e);
         }
     }
-    /** Retrieves the value of a property. This implementation presumes that the values are stored in member variables
-     *  of the furthest inheriting class (see {@link #convertPropertyValue convertPropertyValue}) and that the
-     *  variables are public. The property must have
-     *  been registered, for example by {@link #registerProperty(Property, Object)}. The identifyer Object argument
+    /** Retrieves the value of a property. This implementation presumes that the values are stored in member variables 
+     *  of the furthest inheriting class (see {@link #convertPropertyValue convertPropertyValue}) and that the 
+     *  variables are public. The property must have 
+     *  been registered, for example by {@link #registerProperty(Property, Object)}. The identifyer Object argument 
      *  must have been a java.lang.String which was the name of the member variable holding the property value.
-     *  When properties are to be stored differently one has to override this method as well as
+     *  When properties are to be stored differently one has to override this method as well as 
      *  {@link #convertPropertyValue} and {@link #setPropertyValueNoBroadcast}. <br>
-     *  If a value is stored in a variable of a primitive type then this method returns an instance of the respective
+     *  If a value is stored in a variable of a primitive type then this method returns an instance of the respective 
      *  wrapper class (e.g. java.lang.Boolean).
      *  @param property The property for which the value is to be retrieved.
      *  @return The value of the property.
@@ -862,17 +862,17 @@ XMultiPropertySet
         }
         return ret;
     }
-
+    
     /**
      *  This method fires events to XPropertyChangeListener,XVetoableChangeListener and
      *  XPropertiesChangeListener event sinks.
-     *  To distinguish what listeners are to be called the argument <em>bVetoable</em> is to be set to true if
+     *  To distinguish what listeners are to be called the argument <em>bVetoable</em> is to be set to true if 
      *  a XVetoableChangeListener is meant. For XPropertyChangeListener and XPropertiesChangeListener
-     *  it is to be set to false.
-     *
-     * @param properties    Properties wich will be or have been affected.
-     * @param newValues the new values of the properties.
-     * @param oldValues the old values of the properties.
+     *  it is to be set to false. 
+     * 
+     * @param properties	Properties wich will be or have been affected.
+     * @param newValues	the new values of the properties.
+     * @param oldValues	the old values of the properties.
      * @param bVetoable true means fire to VetoableChangeListener, false means fire to
      * XPropertyChangedListener and XMultiPropertyChangedListener.
      */
@@ -894,7 +894,7 @@ XMultiPropertySet
                 if ((bVetoable && (properties[i].Attributes & PropertyAttribute.CONSTRAINED) > 0)
                     || (!bVetoable && (properties[i].Attributes & PropertyAttribute.BOUND) > 0))
                 {
-                    arEvts[i]= new PropertyChangeEvent(this, properties[i].Name, false,
+                    arEvts[i]= new PropertyChangeEvent(this, properties[i].Name, false, 
                                         properties[i].Handle, oldValues[i], newValues[i]);
                     nAffectedProps++;
                 }
@@ -923,8 +923,8 @@ XMultiPropertySet
                    // broadcast to all listeners with "" property name
                 if(bVetoable)
                     lc= listenerContainer.getContainer(XVetoableChangeListener.class);
-                else
-                    lc= listenerContainer.getContainer(XPropertyChangeListener.class);
+                else 
+                    lc= listenerContainer.getContainer(XPropertyChangeListener.class); 
                 if(lc != null)
                 {
                     Iterator it= lc.iterator();
@@ -942,7 +942,7 @@ XMultiPropertySet
             // if nAffectedProps == 0 then there are no BOUND properties
             if (!bVetoable && nAffectedProps > 0)
             {
-
+                
                 PropertyChangeEvent[] arReduced= new PropertyChangeEvent[nAffectedProps];
                 System.arraycopy(arEvts, 0, arReduced, 0, nAffectedProps);
                 InterfaceContainer lc= listenerContainer.getContainer(XPropertiesChangeListener.class);
@@ -957,10 +957,10 @@ XMultiPropertySet
                     }
                 }
             }
-        }
+        } 
     }
     // XFastPropertySet--------------------------------------------------------------------------------
-    public void setFastPropertyValue(int nHandle, Object aValue ) throws UnknownPropertyException,
+    public void setFastPropertyValue(int nHandle, Object aValue ) throws UnknownPropertyException, 
     PropertyVetoException, com.sun.star.lang.IllegalArgumentException, WrappedTargetException
     {
         Property prop= getPropertyByHandle(nHandle);
@@ -968,9 +968,9 @@ XMultiPropertySet
             throw new UnknownPropertyException(" The property with handle : " + nHandle +" is unknown");
         setPropertyValue(prop, aValue);
     }
-
+    
     // XFastPropertySet --------------------------------------------------------------------------------
-    public Object getFastPropertyValue(int nHandle ) throws UnknownPropertyException,
+    public Object getFastPropertyValue(int nHandle ) throws UnknownPropertyException, 
     WrappedTargetException
     {
         Property prop= getPropertyByHandle(nHandle);
@@ -983,8 +983,8 @@ XMultiPropertySet
     public void addPropertiesChangeListener(String[] propNames, XPropertiesChangeListener listener)
     {
         listenerContainer.addInterface(XPropertiesChangeListener.class, listener);
-    }
-
+    }    
+    
     // XMultiPropertySet -----------------------------------------------------------------------------------
     public void firePropertiesChangeEvent(String[] propNames, XPropertiesChangeListener listener)
     {
@@ -1000,21 +1000,21 @@ XMultiPropertySet
                 if (prop != null)
                 {
                     Object value= null;
-                    try
+                    try 
                     {
                        value= getPropertyValue(prop);
-                    }
-                    catch(Exception e)
+                    } 
+                    catch(Exception e) 
                     {
                         continue;
                     }
-                    arEvents[eventCount]= new PropertyChangeEvent(this, prop.Name,
+                    arEvents[eventCount]= new PropertyChangeEvent(this, prop.Name, 
                                         false, prop.Handle, value, value);
                     eventCount++;
                 }
             }
         }
-
+        
         // fire events from unsynchronized section so as to prevent deadlocks
         if (eventCount > 0)
         {
@@ -1028,19 +1028,19 @@ XMultiPropertySet
             listener.propertiesChange(arEvents);
         }
     }
-    // XMultiPropertySet -----------------------------------------------------------------------------------
-    /** If a value for a property could not be retrieved then the respective element in the returned
+    // XMultiPropertySet -----------------------------------------------------------------------------------    
+    /** If a value for a property could not be retrieved then the respective element in the returned 
      *  array has the value null.
      */
     public Object[] getPropertyValues(String[] propNames)
     {
         Object[] arValues= new Object[propNames.length];
-        synchronized (this)
+        synchronized (this) 
         {
             for (int i= 0; i < propNames.length; i++)
             {
                 Object value= null;
-                try
+                try 
                 {
                     value= getPropertyValue(propNames[i]);
                 }
@@ -1052,19 +1052,19 @@ XMultiPropertySet
         }
         return arValues;
     }
-    // XMultiPropertySet -----------------------------------------------------------------------------------
+    // XMultiPropertySet -----------------------------------------------------------------------------------    
     public void removePropertiesChangeListener(XPropertiesChangeListener xPropertiesChangeListener)
     {
         listenerContainer.removeInterface(XPropertiesChangeListener.class, xPropertiesChangeListener);
     }
-    // XMultiPropertySet -----------------------------------------------------------------------------------
+    // XMultiPropertySet -----------------------------------------------------------------------------------  
     /** If the array of property names containes an unknown property then it will be ignored.
      */
     public void setPropertyValues(String[] propNames, Object[] values) throws PropertyVetoException, com.sun.star.lang.IllegalArgumentException, com.sun.star.lang.WrappedTargetException
     {
         for (int i= 0; i < propNames.length; i++)
         {
-            try
+            try 
             {
                 setPropertyValue(propNames[i], values[i]);
             }
@@ -1072,31 +1072,31 @@ XMultiPropertySet
             {
                 continue;
             }
-
+            
         }
     }
-
+    
     private class PropertySetInfo implements XPropertySetInfo
     {
         public com.sun.star.beans.Property[] getProperties()
         {
             return PropertySet.this.getProperties();
         }
-
+        
         public com.sun.star.beans.Property getPropertyByName(String name) throws UnknownPropertyException
         {
             return getProperty(name);
         }
-
+        
         public boolean hasPropertyByName(String name)
         {
             return getProperty(name) != null;
         }
-
+        
     }
 }
-
-
-
-
+    
+    
+    
+    
 
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
index 5bf32f6cad0d..643cd43f1463 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java b/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
index 1747956949ec..a413ab43fc3b 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,28 +32,28 @@ import java.util.Vector;
 
 /**
  * Object representation and parsing of Uno Urls,
- * which allow to locate a named Uno object in a
- * different process. An Uno Url consists of the
- * specification of a connection, protocol and
+ * which allow to locate a named Uno object in a 
+ * different process. An Uno Url consists of the 
+ * specification of a connection, protocol and 
  * rootOid delimited with a ';'.
  * The syntax of an Uno Url is
- *
+ * 
  * <code>
  * [uno:]connection-type,parameters;protocol-name,parameters;objectname";
  * </code>
- *
+ * 
  * An example Uno Url will look like this:
- *
+ * 
  * <code>
  * socket,host=localhost,port=2002;urp;StarOffice.ServiceManager
  * </code>
- *
+ * 
  * For more information about Uno Url please consult
  * <a href="http://udk.openoffice.org/common/man/spec/uno-url.html">
  * http://udk.openoffice.org/common/man/spec/uno-url.html</a>
- *
+ * 
  * Usage:
- *
+ * 
  * <code>
  *   UnoUrl url = UnoUrl.parseUnoUrl("socket,host=localhost,port=2002;urp;StarOffice.ServiceManager");
  * </code>
@@ -121,7 +121,7 @@ public class UnoUrl {
     /**
      * Returns the name of the connection of this
      * Uno Url. Encoded characters are not allowed.
-     *
+     * 
      * @return The connection name as string.
      */
     public String getConnection() {
@@ -131,7 +131,7 @@ public class UnoUrl {
     /**
      * Returns the name of the protocol of this
      * Uno Url. Encoded characters are not allowed.
-     *
+     * 
      * @return The protocol name as string.
      */
     public String getProtocol() {
@@ -141,7 +141,7 @@ public class UnoUrl {
     /**
      * Return the object name. Encoded character are
      * not allowed.
-     *
+     * 
      * @return The object name as String.
      */
     public String getRootOid() {
@@ -152,7 +152,7 @@ public class UnoUrl {
      * Returns the protocol parameters as
      * a Hashmap with key/value pairs. Encoded
      * characters like '%41' are decoded.
-     *
+     * 
      * @return a HashMap with key/value pairs for protocol parameters.
      */
     public HashMap getProtocolParameters() {
@@ -163,7 +163,7 @@ public class UnoUrl {
      * Returns the connection parameters as
      * a Hashmap with key/value pairs. Encoded
      * characters like '%41' are decoded.
-     *
+     * 
      * @return a HashMap with key/value pairs for connection parameters.
      */
     public HashMap getConnectionParameters() {
@@ -174,7 +174,7 @@ public class UnoUrl {
      * Returns the raw specification of the protocol
      * parameters. Encoded characters like '%41' are
      * not decoded.
-     *
+     * 
      * @return The uninterpreted protocol parameters as string.
      */
     public String getProtocolParametersAsString() {
@@ -185,7 +185,7 @@ public class UnoUrl {
      * Returns the raw specification of the connection
      * parameters. Encoded characters like '%41' are
      * not decoded.
-     *
+     * 
      * @return The uninterpreted connection parameters as string.
      */
     public String getConnectionParametersAsString() {
@@ -358,7 +358,7 @@ public class UnoUrl {
     /**
      * Parses the given Uno Url and returns
      * an in memory object representation.
-     *
+     * 
      * @param unoUrl The given uno URl as string.
      * @return Object representation of class UnoUrl.
      * @throws IllegalArgumentException if Url cannot be parsed.
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java b/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java
index 2c3cc142f1a5..bda5a081b64a 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,10 +33,10 @@ import java.util.List;
 import java.util.Collections;
 import java.util.LinkedList;
 
-/** An XAdapter implementation that holds a weak reference (java.lang.ref.WeakReference)
- *  to an object. Clients can register listener (com.sun.star.lang.XReference) which
- *  are notified when the the object (the one which is kept weak) is being finalized. That
- *  is, that object is being destroyed because there are not any hard references
+/** An XAdapter implementation that holds a weak reference (java.lang.ref.WeakReference) 
+ *  to an object. Clients can register listener (com.sun.star.lang.XReference) which 
+ *  are notified when the the object (the one which is kept weak) is being finalized. That 
+ *  is, that object is being destroyed because there are not any hard references 
  *  to it.
  */
 public class WeakAdapter implements XAdapter
@@ -46,7 +46,7 @@ public class WeakAdapter implements XAdapter
     private WeakReference m_weakRef;
     // contains XReference objects registered by addReference
     private List m_xreferenceList;
-
+    
     /**
      *@param component the object that is to be held weak
      */
@@ -55,14 +55,14 @@ public class WeakAdapter implements XAdapter
         m_weakRef= new WeakReference(component);
         m_xreferenceList= Collections.synchronizedList( new LinkedList());
     }
-
+    
     /** Called by the XWeak implementation (WeakBase) when it is being finalized.
      *  It is only being called once.
-     *  The registererd XReference listeners are notified. On notification they are
-     *  to unregister themselves. The notification is thread-safe. However, it is possible
-     *  to add a listener during the notification process, which will never receive a
-     *  notification. To prevent this, one would have to synchronize this method with
-     *  the addReference method. But this can result in deadlocks in a multithreaded
+     *  The registererd XReference listeners are notified. On notification they are 
+     *  to unregister themselves. The notification is thread-safe. However, it is possible 
+     *  to add a listener during the notification process, which will never receive a 
+     *  notification. To prevent this, one would have to synchronize this method with 
+     *  the addReference method. But this can result in deadlocks in a multithreaded 
      *  environment.
      */
     void referentDying()
@@ -74,7 +74,7 @@ public class WeakAdapter implements XAdapter
             ((XReference) references[i-1]).dispose();
         }
     }
-
+    
     /** Method  of com.sun.star.uno.XAdapter. It is called to obtain a hard reference
      *  to the object which is kept weak by this instance.
      *  @return hard reference to the object
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java b/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java
index cce414fcc2a9..ace0713ccdd7 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,14 +42,14 @@ import java.util.Hashtable;
 public class WeakBase implements XWeak, XTypeProvider
 {
     private final boolean DEBUG= false;
-
+    
     // Contains all WeakAdapter which have been created in this class
     // They have to be notified when this object dies
     private WeakAdapter m_adapter;
-
+    
     protected static Map _mapImplementationIds= new Hashtable();
     protected static Map _mapTypes= new Hashtable();
-
+    
     /** Method of XWeak. The returned XAdapter implementation can be used to keap
      * a weak reference to this object.
      * @return a com.sun.star.uno.XAdapter implementation.
@@ -60,7 +60,7 @@ public class WeakBase implements XWeak, XTypeProvider
             m_adapter= new WeakAdapter(this);
         return m_adapter;
     }
-
+    
     /** Override of Object.finalize. When there are no references to this object anymore
      * then the garbage collector calls this method. Thereby causing the adapter object
      * to be notified. The adapter, in turn, notifies all listeners (com.sun.star.uno.XReference)
@@ -71,7 +71,7 @@ public class WeakBase implements XWeak, XTypeProvider
             m_adapter.referentDying();
         super.finalize();
     }
-
+    
     /** Method of XTypeProvider. It returns an array of Type objects which represent
      * all implemented UNO interfaces of this object.
      * @return Type objects of all implemented interfaces.
@@ -95,7 +95,7 @@ public class WeakBase implements XWeak, XTypeProvider
                 // get the superclass the currentClass inherits from
                 currentClass= currentClass.getSuperclass();
             } while (currentClass != null);
-
+            
             Type types[]= new Type[vec.size()];
             for( int i= 0; i < types.length; i++)
                 types[i]= (Type) vec.elementAt(i);
@@ -104,11 +104,11 @@ public class WeakBase implements XWeak, XTypeProvider
         }
         return arTypes;
     }
-
+    
     /** Method of XTypeProvider. It provides an identifier that represents the set of UNO
      * interfaces implemented by this class. All instances of this class
      * which run in the same Java Virtual Machine return the same array. (This only works as long
-     * the ClassLoader preserves the class even if no instance exist.)
+     * the ClassLoader preserves the class even if no instance exist.) 
      *@return identifier as array of bytes
      */
     public byte[] getImplementationId()
diff --git a/javaunohelper/inc/pch/precompiled_javaunohelper.cxx b/javaunohelper/inc/pch/precompiled_javaunohelper.cxx
index 78f04ceafd7a..60393c81394f 100644
--- a/javaunohelper/inc/pch/precompiled_javaunohelper.cxx
+++ b/javaunohelper/inc/pch/precompiled_javaunohelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/javaunohelper/inc/pch/precompiled_javaunohelper.hxx b/javaunohelper/inc/pch/precompiled_javaunohelper.hxx
index 0f1ce4290d16..a1e61803cf8e 100644
--- a/javaunohelper/inc/pch/precompiled_javaunohelper.hxx
+++ b/javaunohelper/inc/pch/precompiled_javaunohelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx
index d29f7bef71eb..e98e690fb0f8 100644
--- a/javaunohelper/source/bootstrap.cxx
+++ b/javaunohelper/source/bootstrap.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -110,7 +110,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstrap_cpp
                     if (0 != jstr)
                     {
                         OUString value( ::javaunohelper::jstring_to_oustring( jstr, jni_env ) );
-
+                        
                         // set bootstrap parameter
                         ::rtl::Bootstrap::set( name, value );
                     }
@@ -118,7 +118,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstrap_cpp
                 nPos += 2;
             }
         }
-
+        
         // bootstrap uno
         Reference< XComponentContext > xContext;
         if (0 == juno_rc)
@@ -130,20 +130,20 @@ extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstrap_cpp
             OUString uno_rc( ::javaunohelper::jstring_to_oustring( juno_rc, jni_env ) );
             xContext = ::cppu::defaultBootstrap_InitialComponentContext( uno_rc );
         }
-
+        
         // create vm access
         ::rtl::Reference< ::jvmaccess::UnoVirtualMachine > vm_access(
             ::javaunohelper::create_vm_access( jni_env, loader ) );
         // wrap vm singleton entry
         xContext = ::javaunohelper::install_vm_singleton( xContext, vm_access );
-
+        
         // get uno envs
         OUString cpp_env_name = OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
         OUString java_env_name = OUSTR(UNO_LB_JAVA);
         Environment java_env, cpp_env;
         uno_getEnvironment((uno_Environment **)&cpp_env, cpp_env_name.pData, NULL);
         uno_getEnvironment( (uno_Environment **)&java_env, java_env_name.pData, vm_access.get() );
-
+        
         // map to java
         Mapping mapping( cpp_env.get(), java_env.get() );
         if (! mapping.is())
@@ -155,11 +155,11 @@ extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstrap_cpp
                 OUSTR("cannot get mapping C++ <-> Java!"),
                 Reference< XInterface >() );
         }
-
+        
         jobject jret = (jobject)mapping.mapInterface( xContext.get(), ::getCppuType( &xContext ) );
         jobject jlocal = jni_env->NewLocalRef( jret );
         jni_env->DeleteGlobalRef( jret );
-
+        
         return jlocal;
     }
     catch (RuntimeException & exc)
@@ -184,7 +184,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstrap_cpp
             jni_env->ThrowNew( c, cstr.getStr() );
         }
     }
-
+    
     return 0;
 }
 
diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx
index e64fd7e97db9..fd170353b541 100644
--- a/javaunohelper/source/javaunohelper.cxx
+++ b/javaunohelper/source/javaunohelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -73,7 +73,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
     const jchar* pJLibName = pJEnv->GetStringChars( jLibName, NULL );
     OUString aLibName( pJLibName );
     pJEnv->ReleaseStringChars( jLibName, pJLibName);
-
+    
     oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
     if (lib)
     {
@@ -84,7 +84,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
         if (pSym)
         {
             Environment java_env, loader_env;
-
+            
             const sal_Char * pEnvTypeName = 0;
             (*((component_getImplementationEnvironmentFunc)pSym))(
                 &pEnvTypeName, (uno_Environment **)&loader_env );
@@ -93,14 +93,14 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
                 OUString aEnvTypeName( OUString::createFromAscii( pEnvTypeName ) );
                 uno_getEnvironment( (uno_Environment **)&loader_env, aEnvTypeName.pData, 0 );
             }
-
+            
             // create vm access
             ::rtl::Reference< ::jvmaccess::UnoVirtualMachine > vm_access(
                 ::javaunohelper::create_vm_access( pJEnv, loader ) );
             OUString java_env_name = OUSTR(UNO_LB_JAVA);
             uno_getEnvironment(
                 (uno_Environment **)&java_env, java_env_name.pData, vm_access.get() );
-
+            
             OUString aWriteInfoName( RTL_CONSTASCII_USTRINGPARAM(COMPONENT_WRITEINFO) );
             pSym = osl_getFunctionSymbol( lib, aWriteInfoName.pData );
             if (pSym)
@@ -108,16 +108,16 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
                 if (loader_env.is() && java_env.is())
                 {
                     Mapping java2dest(java_env.get(), loader_env.get());
-
+                    
                     if ( java2dest.is() )
-                    {
+                    {						
                         void * pSMgr =
                             java2dest.mapInterface(
                                 jSMgr, getCppuType((Reference< lang::XMultiServiceFactory > *) 0) );
                         void * pKey =
                             java2dest.mapInterface(
                                 jRegKey, getCppuType((Reference< registry::XRegistryKey > *) 0) );
-
+                        
                         uno_ExtEnvironment * env = loader_env.get()->pExtEnv;
                         if (pKey)
                         {
@@ -126,7 +126,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
                             if (env)
                                 (*env->releaseInterface)( env, pKey );
                         }
-
+                        
                         if (pSMgr && env)
                             (*env->releaseInterface)( env, pSMgr );
                     }
@@ -134,7 +134,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
             }
         }
     }
-
+    
     return bRet == sal_False? JNI_FALSE : JNI_TRUE;
 }
 
@@ -153,9 +153,9 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
     pJEnv->ReleaseStringChars( jLibName, pJLibName);
 
     aLibName += OUString( RTL_CONSTASCII_USTRINGPARAM(SAL_DLLEXTENSION) );
-
+    
     jobject joSLL_cpp = 0;
-
+    
     oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
     if (lib)
     {
@@ -166,7 +166,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
         if (pSym)
         {
             Environment java_env, loader_env;
-
+            
             const sal_Char * pEnvTypeName = 0;
             (*((component_getImplementationEnvironmentFunc)pSym))(
                 &pEnvTypeName, (uno_Environment **)&loader_env );
@@ -176,23 +176,23 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
                 OUString aEnvTypeName( OUString::createFromAscii( pEnvTypeName ) );
                 uno_getEnvironment( (uno_Environment **)&loader_env, aEnvTypeName.pData, 0 );
             }
-
+            
             // create vm access
             ::rtl::Reference< ::jvmaccess::UnoVirtualMachine > vm_access(
                 ::javaunohelper::create_vm_access( pJEnv, loader ) );
             OUString java_env_name = OUSTR(UNO_LB_JAVA);
             uno_getEnvironment(
                 (uno_Environment **)&java_env, java_env_name.pData, vm_access.get() );
-
+            
             OUString aGetFactoryName( RTL_CONSTASCII_USTRINGPARAM(COMPONENT_GETFACTORY) );
             pSym = osl_getFunctionSymbol( lib, aGetFactoryName.pData );
             if (pSym)
-            {
+            {				
                 if (loader_env.is() && java_env.is())
                 {
                     Mapping java2dest( java_env.get(), loader_env.get() );
                     Mapping dest2java( loader_env.get(), java_env.get() );
-
+                    
                     if (dest2java.is() && java2dest.is())
                     {
                         void * pSMgr =
@@ -201,21 +201,21 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
                         void * pKey =
                             java2dest.mapInterface(
                                 jRegKey, ::getCppuType((Reference< registry::XRegistryKey > *) 0) );
-
+                        
                         const char* pImplName = pJEnv->GetStringUTFChars( jImplName, NULL );
-
+                        
                         void * pSSF = (*((component_getFactoryFunc)pSym))(
                             pImplName, pSMgr, pKey );
-
+                        
                         pJEnv->ReleaseStringUTFChars( jImplName, pImplName );
-
+                        
                         uno_ExtEnvironment * env = loader_env.get()->pExtEnv;
-
+                        
                         if (pKey && env)
                             (*env->releaseInterface)( env, pKey );
                         if (pSMgr && env)
                             (*env->releaseInterface)( env, pSMgr );
-
+                        
                         if (pSSF)
                         {
                             jobject jglobal = (jobject) dest2java.mapInterface(
@@ -230,7 +230,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
             }
         }
     }
-
+    
     return joSLL_cpp;
 }
 
@@ -250,15 +250,15 @@ Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactor
     {
         OUString aWriteRegFile;
         OUString aReadRegFile;
-
+    
         sal_Bool bReadOnly = jbReadOnly == JNI_FALSE ? sal_False : sal_True;
-
+    
         if (jReadRegFile) {
             const jchar* pjReadRegFile = pJEnv->GetStringChars(jReadRegFile, NULL);
             aReadRegFile = OUString(pjReadRegFile);
             pJEnv->ReleaseStringChars(jReadRegFile, pjReadRegFile);
         }
-
+        
         if (jWriteRegFile) {
             const jchar * pjWriteRegFile = pJEnv->GetStringChars(jWriteRegFile, NULL);
             aWriteRegFile = OUString(pjWriteRegFile);
@@ -271,7 +271,7 @@ Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactor
             rMSFac = ::cppu::createRegistryServiceFactory( aWriteRegFile, bReadOnly);
         else
             rMSFac = ::cppu::createRegistryServiceFactory(aWriteRegFile, aReadRegFile, bReadOnly);
-
+        
         Reference< beans::XPropertySet > xProps(
             rMSFac, UNO_QUERY_THROW );
         Reference< XComponentContext > xContext(
@@ -283,21 +283,21 @@ Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactor
         // wrap vm singleton entry
         xContext = ::javaunohelper::install_vm_singleton( xContext, vm_access );
         rMSFac.set( xContext->getServiceManager(), UNO_QUERY_THROW );
-
+        
         // get uno envs
         OUString aCurrentEnv(RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME));
         OUString java_env_name = OUSTR(UNO_LB_JAVA);
-        Environment java_env, curr_env;
+        Environment java_env, curr_env;    
         uno_getEnvironment((uno_Environment **)&curr_env, aCurrentEnv.pData, NULL);
         uno_getEnvironment( (uno_Environment **)&java_env, java_env_name.pData, vm_access.get() );
-
+        
         Mapping curr_java(curr_env.get(), java_env.get());
         if (! curr_java.is())
         {
             throw RuntimeException(
                 OUSTR("no C++ <-> Java mapping available!"), Reference< XInterface >() );
         }
-
+        
         jobject joGlobalRegServiceFac =
             (jobject)curr_java.mapInterface(
                 rMSFac.get(),
@@ -317,7 +317,7 @@ Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactor
         }
         return 0;
     }
-
+    
     OSL_TRACE("javaunohelper.cxx: object %i", joRegServiceFac);
 
     return joRegServiceFac;
diff --git a/javaunohelper/source/preload.cxx b/javaunohelper/source/preload.cxx
index 18ed40c16598..047f7c3336b3 100644
--- a/javaunohelper/source/preload.cxx
+++ b/javaunohelper/source/preload.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx
index f9c82383b9da..8555c10fb235 100644
--- a/javaunohelper/source/vm.cxx
+++ b/javaunohelper/source/vm.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,16 +55,16 @@ typedef ::cppu::WeakComponentImplHelper1<
 class SingletonFactory : public MutexHolder, public t_impl
 {
     ::rtl::Reference< ::jvmaccess::UnoVirtualMachine > m_vm_access;
-
+    
 protected:
     virtual void SAL_CALL disposing();
-
+    
 public:
     inline SingletonFactory( ::rtl::Reference< ::jvmaccess::UnoVirtualMachine > const & vm_access )
         : t_impl( m_mutex ),
           m_vm_access( vm_access )
         {}
-
+    
     // XSingleComponentFactory impl
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext(
         css::uno::Reference< css::uno::XComponentContext > const & xContext )
diff --git a/javaunohelper/source/vm.hxx b/javaunohelper/source/vm.hxx
index 913d447aa26a..21620fa1d8c7 100644
--- a/javaunohelper/source/vm.hxx
+++ b/javaunohelper/source/vm.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
index c5908f3452cb..3fe9bd53beb6 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,12 +36,12 @@ import com.sun.star.lang.XMultiServiceFactory;
 
 
 public class Bootstrap_Test {
-
+    
     static public boolean test( String ini_file, java.util.Hashtable bootstrap_parameters )
         throws java.lang.Exception
     {
         boolean passed = false;
-        System.err.println();
+        System.err.println();			
         System.out.println("*******************************************************************");
         System.err.println("Bootstrap - doing tests...");
         System.err.println();
@@ -50,7 +50,7 @@ public class Bootstrap_Test {
             XComponentContext xContext =
                 com.sun.star.comp.helper.Bootstrap.defaultBootstrap_InitialComponentContext(
                     ini_file, bootstrap_parameters );
-
+            
             if (AnyConverter.isVoid(
                     xContext.getValueByName(
                         "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ))
@@ -58,7 +58,7 @@ public class Bootstrap_Test {
                 throw new Exception(
                     "no /singletons/com.sun.star.reflection.theTypeDescriptionManager!" );
             }
-
+            
             XMultiServiceFactory msf = UnoRuntime.queryInterface(
                 XMultiServiceFactory.class, xContext.getServiceManager() );
             String services[] = msf.getAvailableServiceNames();
@@ -67,16 +67,16 @@ public class Bootstrap_Test {
             if (services.length == 0)
                 System.out.println("No services avialable!");
 
-            else
+            else 			
                 for ( int i=0; i<services.length; i++ )
                     System.out.println(services[i]);
 
             XComponent xComp = UnoRuntime.queryInterface(
                 XComponent.class, xContext );
             xComp.dispose();
-
+            
             passed = true;
-        }
+        }		
         catch (Exception e) {
             e.printStackTrace();
         }
@@ -99,7 +99,7 @@ public class Bootstrap_Test {
     static public void main(String args[]) throws java.lang.Exception {
         if ( args.length == 0 )
             usage();
-
+        
         java.util.Hashtable bootstrap_parameters = new java.util.Hashtable();
         for ( int nPos = 1; nPos < args.length; ++nPos )
         {
@@ -110,8 +110,8 @@ public class Bootstrap_Test {
                 bootstrap_parameters.put( arg.substring( 0, n ), arg.substring( n +1 ) );
             }
         }
-
-        System.exit( test(args[0], bootstrap_parameters) == true ? 0: -1 );
+        
+        System.exit( test(args[0], bootstrap_parameters) == true ? 0: -1 );		
     }
 }
 
diff --git a/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java b/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java
index 94f8a1591a4b..f38ecf543249 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,12 +43,12 @@ public class ComponentContext_Test {
             Hashtable table = new Hashtable();
             table.put( "bla1", new ComponentContextEntry( null, new Integer( 1 ) ) );
             XComponentContext xInitialContext = Bootstrap.createInitialComponentContext( table );
-
+            
             table = new Hashtable();
             table.put( "bla2", new ComponentContextEntry( new Integer( 2 ) ) );
             table.put( "bla3", new Integer( 3 ) );
             XComponentContext xContext = new ComponentContext( table, xInitialContext );
-
+            
             XMultiComponentFactory xSMgr = xContext.getServiceManager();
             Object o = xSMgr.createInstanceWithContext( "com.sun.star.loader.Java", xContext );
             if (o == null)
@@ -68,7 +68,7 @@ public class ComponentContext_Test {
             o = xSMgr.createInstanceWithContext( "com.sun.star.lang.ServiceManager", xContext );
             if (o == null)
                 System.err.println( "### failed raising service: 6!" );
-
+            
             if (xContext.getValueByName( "bla1" ) == null ||
                 xContext.getValueByName( "bla2" ) == null ||
                 xContext.getValueByName( "bla3" ) == null ||
@@ -84,7 +84,7 @@ public class ComponentContext_Test {
             {
                 System.err.println( "### bootstrap context test failed: 2!" );
             }
-
+            
             XComponent xComp = UnoRuntime.queryInterface(
                 XComponent.class, xInitialContext );
             xComp.dispose();
diff --git a/javaunohelper/test/com/sun/star/comp/helper/RegistryServiceFactory_Test.java b/javaunohelper/test/com/sun/star/comp/helper/RegistryServiceFactory_Test.java
index c7fe7e69d02c..18a0cac49fa4 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/RegistryServiceFactory_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/RegistryServiceFactory_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,10 +50,10 @@ import com.sun.star.loader.XImplementationLoader;
 import com.sun.star.registry.XSimpleRegistry;
 
 public class RegistryServiceFactory_Test {
-
+    
     static public boolean test(String applicat) throws java.lang.Exception {
         boolean passed = false;
-        System.err.println();
+        System.err.println();			
         System.out.println("*******************************************************************");
         System.err.println("RegistryServiceFactory - doing tests...");
         System.err.println();
@@ -66,12 +66,12 @@ public class RegistryServiceFactory_Test {
             if (services.length == 0)
                 System.out.println("No services avialable!");
 
-            else
+            else 			
                 for ( int i=0; i<services.length; i++ )
                     System.out.println(services[i]);
-
+                    
             passed = true;
-        }
+        }		
         catch (Exception e) {
             e.printStackTrace();
         }
@@ -94,7 +94,7 @@ public class RegistryServiceFactory_Test {
     static public void main(String args[]) throws java.lang.Exception {
         if ( args.length != 1 )
             usage();
-        System.exit( test(args[0]) == true ? 0: -1 );
+        System.exit( test(args[0]) == true ? 0: -1 );		
     }
 }
 
diff --git a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
index 885c3c607ffd..b417c2544060 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,35 +51,35 @@ import com.sun.star.registry.XSimpleRegistry;
 
 
 public class SharedLibraryLoader_Test {
-
+    
     private static final String NATIVE_SERVICE_MANAGER_IMP_NAME = "com.sun.star.comp.stoc.OServiceManager";
     private static final String NATIVE_SERVICE_MANAGER_LIB_NAME = "servicemgr.uno";
     private static final String NATIVE_REGISTRY_IMP_NAME = "com.sun.star.comp.stoc.SimpleRegistry";
     private static final String NATIVE_REGISTRY_LIB_NAME = "simplereg.uno";
-
-    private static XMultiServiceFactory     nativeServiceManager        = null;
-    private static XSingleServiceFactory    sharedLibraryLoaderFactory  = null;
-    private static XImplementationLoader    sharedLibraryLoader         = null;
-    private static XSimpleRegistry          simpleRegistry              = null;
-
-    static public boolean test_getSharedLibraryLoaderFactory()
-            throws java.lang.Exception
+    
+    private static XMultiServiceFactory		nativeServiceManager		= null;
+    private static XSingleServiceFactory 	sharedLibraryLoaderFactory 	= null;
+    private static XImplementationLoader 	sharedLibraryLoader			= null;
+    private static XSimpleRegistry			simpleRegistry				= null;
+        
+    static public boolean test_getSharedLibraryLoaderFactory() 
+            throws java.lang.Exception 
     {
         sharedLibraryLoaderFactory = null;
         System.out.println("*******************************************************************");
         System.out.println("Test: <<< get SharedLibraryLoader factory >>>");
         sharedLibraryLoaderFactory = SharedLibraryLoader.getServiceFactory(null, null);
-
+        
         System.out.print("Test - ");
-        System.out.println(sharedLibraryLoaderFactory == null? "failed" : "successfull");
+        System.out.println(sharedLibraryLoaderFactory == null? "failed" : "successfull");		
         System.out.println("*******************************************************************");
         System.out.println();
-
+        
         return sharedLibraryLoaderFactory != null;
     }
 
-    static public boolean test_instantiateSharedLibraryLoader()
-            throws java.lang.Exception
+    static public boolean test_instantiateSharedLibraryLoader() 	
+            throws java.lang.Exception 
     {
         sharedLibraryLoader = null;
         System.out.println("*******************************************************************");
@@ -87,47 +87,47 @@ public class SharedLibraryLoader_Test {
         if ( sharedLibraryLoaderFactory == null )
             if ( ! test_getSharedLibraryLoaderFactory() )
                 return false;
-
-        sharedLibraryLoader = UnoRuntime.queryInterface(
+        
+        sharedLibraryLoader = UnoRuntime.queryInterface( 
                 XImplementationLoader.class, sharedLibraryLoaderFactory.createInstance() );
-
+        
         System.out.print("Test - ");
-        System.out.println(sharedLibraryLoader == null? "failed" : "successfull");
+        System.out.println(sharedLibraryLoader == null? "failed" : "successfull");		
         System.out.println("*******************************************************************");
         System.out.println();
-
+        
         return sharedLibraryLoader != null;
     }
-
-    static public boolean test_loadNativeServiceManager()
-            throws java.lang.Exception
+    
+    static public boolean test_loadNativeServiceManager() 	
+            throws java.lang.Exception 
     {
         nativeServiceManager = null;
-
+        
         System.out.println("*******************************************************************");
         System.out.println("Test: <<< load native ServiceManager >>>");
         if ( sharedLibraryLoader == null )
             if ( ! test_instantiateSharedLibraryLoader() )
                 return false;
-
+        
         System.err.println("- get the native ServiceManger factory");
-        XSingleServiceFactory aSMgrFac =
-            UnoRuntime.queryInterface( XSingleServiceFactory.class,
+        XSingleServiceFactory aSMgrFac = 
+            UnoRuntime.queryInterface( XSingleServiceFactory.class, 
                         sharedLibraryLoader.activate(NATIVE_SERVICE_MANAGER_IMP_NAME, null, NATIVE_SERVICE_MANAGER_LIB_NAME, null));
-
+        
         System.err.println("- instantiate the native ServiceManger");
         nativeServiceManager = UnoRuntime.queryInterface( XMultiServiceFactory.class, aSMgrFac.createInstance() );
-
+        
         System.out.print("Test - ");
         System.out.println(nativeServiceManager == null? "failed" : "successfull");
-
+        
         System.out.println("*******************************************************************");
         System.out.println();
         return nativeServiceManager != null;
     }
-
-    static public boolean test_loadNativeSimpleRegistry()
-            throws java.lang.Exception
+    
+    static public boolean test_loadNativeSimpleRegistry() 	
+            throws java.lang.Exception 
     {
         boolean result = false;
         System.out.println("*******************************************************************");
@@ -137,34 +137,34 @@ public class SharedLibraryLoader_Test {
                 return false;
 
         System.err.println("- get factory of the Registry");
-        XSingleServiceFactory aRegFac =
-            UnoRuntime.queryInterface( XSingleServiceFactory.class,
+        XSingleServiceFactory aRegFac = 
+            UnoRuntime.queryInterface( XSingleServiceFactory.class, 
                         sharedLibraryLoader.activate(NATIVE_REGISTRY_IMP_NAME, null, NATIVE_REGISTRY_LIB_NAME, null)
             );
         System.err.println("- instantiate the Registry");
-        simpleRegistry =
+        simpleRegistry = 
             UnoRuntime.queryInterface( XSimpleRegistry.class, aRegFac.createInstance() );
         System.out.print("Test - ");
         System.out.println(simpleRegistry == null? "failed" : "successfull");
         System.out.println("*******************************************************************");
-        System.err.println();
+        System.err.println();			
         return true;
     }
 
-    static public boolean test_registerSharedLibraryLoader()
-            throws java.lang.Exception
+    static public boolean test_registerSharedLibraryLoader() 	
+            throws java.lang.Exception 
     {
         boolean result = true;
         System.out.println("*******************************************************************");
         System.out.println("Test: <<< register SharedLibraryLoader at the Registry >>>");
-
+        
         if ( simpleRegistry == null )
             if ( ! test_loadNativeSimpleRegistry() )
                 return false;
 
         com.sun.star.registry.XRegistryKey regKey = simpleRegistry.getRootKey();
         result = SharedLibraryLoader.writeRegistryServiceInfo( null,  regKey );
-
+        
         System.out.print("Test - ");
         System.out.println( result==false ? "failed" : "successfull");
         System.out.println("*******************************************************************");
@@ -188,7 +188,7 @@ public class SharedLibraryLoader_Test {
     }
 
     static public void main(String args[]) throws java.lang.Exception {
-        System.exit( test() == true ? 0: -1 );
+        System.exit( test() == true ? 0: -1 );		
     }
 }
 
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/AWeakBase.java b/javaunohelper/test/com/sun/star/lib/uno/helper/AWeakBase.java
index d44b91006f4b..262c13dcf7cc 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/AWeakBase.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/AWeakBase.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,19 +32,19 @@ import com.sun.star.lang.XEventListener;
 public class AWeakBase extends WeakBase implements XEventListener
 {
     public int nDisposingCalled= 0;
-
+    
     public AWeakBase(int i)
     {
     }
     public AWeakBase()
     {
     }
-
+    
     public void disposing(com.sun.star.lang.EventObject eventObject)
     {
 //        System.out.println(getClass().getName() + " .disposing called");
         nDisposingCalled++;
     }
-
+    
 }
 
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
index 86358d53cb85..236b8bf312ab 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,7 +52,7 @@ public class ComponentBase_Test
         proxyObj2TypeProv= ProxyProvider.createProxy(obj2, XTypeProvider.class);
         proxyObj3TypeProv= ProxyProvider.createProxy(obj3, XTypeProvider.class);
     }
-
+    
     public boolean dispose()
     {
         System.out.println("Testing ComponentBase");
@@ -60,7 +60,7 @@ public class ComponentBase_Test
         boolean r[]= new boolean[50];
         int i= 0;
         // addEventListener
-
+        
         comp.addEventListener(obj1);
         comp.addEventListener(obj2);
         comp.addEventListener(obj3);
@@ -85,7 +85,7 @@ public class ComponentBase_Test
         obj3.nDisposingCalled= 0;
         comp.dispose(); // allready disposed;
         r[i++]= obj1.nDisposingCalled == 0;
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -95,7 +95,7 @@ public class ComponentBase_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     public boolean test_finalize()
     {
         System.out.println("Testing ComponentBase");
@@ -119,7 +119,7 @@ public class ComponentBase_Test
             }
         }
         r[i++]= obj1.nDisposingCalled == 1;
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -129,16 +129,16 @@ public class ComponentBase_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     public static void main(String[] args)
     {
         ComponentBase_Test test= new ComponentBase_Test();
-
+        
         boolean r[]= new boolean[50];
         int i= 0;
         r[i++]= test.dispose();
         r[i++]= test.test_finalize();
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -148,6 +148,6 @@ public class ComponentBase_Test
             System.out.println("No errors.");
 
     }
-
+    
 }
 
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
index c40b4c410286..55ad6d687555 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ public class Factory_Test
     static final String m_impl_name = Factory_Test.class.getName();
     static final String m_supported_services [] = {
         "Factory_Test.Service0", "Factory_Test.Service1" };
-
+    
     //______________________________________________________________________________________________
     public Factory_Test()
     {
@@ -74,7 +74,7 @@ public class Factory_Test
     {
         return new Factory_Test( xContext );
     }
-
+    
     // XServiceInfo impl
     //______________________________________________________________________________________________
     public final String getImplementationName()
@@ -96,7 +96,7 @@ public class Factory_Test
     {
         return m_supported_services;
     }
-
+    
     //==============================================================================================
     public static XSingleComponentFactory __getComponentFactory( String implName )
     {
@@ -113,12 +113,12 @@ public class Factory_Test
         return Factory.writeRegistryServiceInfo(
             m_impl_name, Factory_Test.m_supported_services, xKey );
     }
-
+    
     //==============================================================================================
     static void service_info_test( Object inst )
     {
         XServiceInfo xInfo = UnoRuntime.queryInterface( XServiceInfo.class, inst );
-
+        
         if (! xInfo.getImplementationName().equals( m_impl_name ))
         {
             System.err.println( "Factory_Test: err -- 1" );
@@ -153,7 +153,7 @@ public class Factory_Test
             String rdb = "file://" + new java.io.File( args[ 1 ] ).toURL().getPath();
             System.out.println( "jar file = " + jar );
             System.out.println( "rdb file = " + rdb );
-
+        
             // bootstrap service manager
             XMultiServiceFactory xMgr = RegistryServiceFactory.create( rdb );
             XPropertySet xProps = UnoRuntime.queryInterface(
@@ -174,7 +174,7 @@ public class Factory_Test
                     xContext.getServiceManager().createInstanceWithContext(
                         "com.sun.star.registry.ImplementationRegistration", xContext ) );
             xImpReg.registerImplementation( "com.sun.star.loader.Java2", jar, xRDB );
-
+            
             // tests
             System.out.println( "testing instance" );
             service_info_test( new Factory_Test() );
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
index ba6df3038e0d..60f87d71ee1e 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,7 +68,7 @@ public class InterfaceContainer_Test
     List list2;
     //contains original object + proxies + null value
     List list3;
-
+    
     public InterfaceContainer_Test()
     {
         obj1= new AWeakBase();
@@ -80,7 +80,7 @@ public class InterfaceContainer_Test
         proxyObj3Weak2= ProxyProvider.createProxy(obj3, XWeak.class);
         proxyObj2TypeProv= ProxyProvider.createProxy(obj2, XTypeProvider.class);
         proxyObj3TypeProv= ProxyProvider.createProxy(obj3, XTypeProvider.class);
-
+        
         list1= new ArrayList();
         list1.add(obj1);
         list1.add(obj2);
@@ -95,7 +95,7 @@ public class InterfaceContainer_Test
         list3.add(proxyObj2TypeProv);
         list3.add(proxyObj3Weak1);
     }
-
+    
     /** Tests add(object), size(), clear();
      */
     public boolean add()
@@ -104,7 +104,7 @@ public class InterfaceContainer_Test
         InterfaceContainer cont= new InterfaceContainer();
         boolean r[]= new boolean[50];
         int i= 0;
-
+        
         r[i++]= cont.size() == 0;
         r[i++]= cont.add(obj1);
         r[i++]= cont.size() == 1;
@@ -116,7 +116,7 @@ public class InterfaceContainer_Test
         cont.clear();
         r[i++]= cont.size() == 0;
         r[i++]= cont.isEmpty();
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -126,7 +126,7 @@ public class InterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     /**Tests list.addAll(Collection c), list.addAll(int index, Collection c)
      */
     public boolean listConstructors()
@@ -135,7 +135,7 @@ public class InterfaceContainer_Test
         boolean r[]= new boolean[50];
         int i= 0;
         InterfaceContainer cont= new InterfaceContainer(100);
-
+        
         r[i++]= cont.elementData.length == 100;
         boolean bOk= true;
         for (int c= 0; c < i; c++)
@@ -173,7 +173,7 @@ public class InterfaceContainer_Test
         InterfaceContainer cont= new InterfaceContainer(10);
         boolean r[]= new boolean[50];
         int i= 0;
-
+        
         cont.ensureCapacity(9);
         r[i++]= cont.elementData.length >= 9;
         cont.ensureCapacity(11);
@@ -187,14 +187,14 @@ public class InterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     public boolean addAll()
     {
         System.out.println("Testing List.addAll(Collection c), List.addAll(int index, Collection c)");
         InterfaceContainer cont= new InterfaceContainer();
         boolean r[]= new boolean[50];
         int i= 0;
-
+        
         r[i++]= cont.addAll(list1);
         r[i++]= cont.size() == list1.size();
         for (int c= 0; c < cont.size(); c++)
@@ -216,7 +216,7 @@ public class InterfaceContainer_Test
         r[i++]= cont.get(0) == list3.get(0);
         r[i++]= cont.get(1) == list3.get(2);
         r[i++]= cont.get(2) == list3.get(3);
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -226,7 +226,7 @@ public class InterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     /** Tests List.add(int index, Object element), List.get(int index)
      */
     public boolean get()
@@ -235,7 +235,7 @@ public class InterfaceContainer_Test
         InterfaceContainer cont= new InterfaceContainer();
         boolean r[]= new boolean[50];
         int i= 0;
-
+        
         cont.add(0, obj1);
         cont.add(1, obj2);
         cont.add(1, proxyObj3Weak1);
@@ -251,7 +251,7 @@ public class InterfaceContainer_Test
         {
             r[i++]= true;
         }
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -269,7 +269,7 @@ public class InterfaceContainer_Test
         InterfaceContainer cont= new InterfaceContainer();
         boolean r[]= new boolean[50];
         int i= 0;
-
+        
         r[i++]= cont.contains(obj1) ? false : true; // nothing in the list
         cont.add(obj1);
         cont.add(proxyObj2TypeProv);
@@ -281,7 +281,7 @@ public class InterfaceContainer_Test
         r[i++]= cont.contains(proxyObj1Weak1);
         r[i++]= cont.contains(obj3);
         r[i++]= cont.contains(null) ? false : true;
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -315,7 +315,7 @@ public class InterfaceContainer_Test
         cont.add(3, list1.get(1));
         cont.add(5, list1.get(2));
         r[i++]= cont.contains(list1) ? false : true;
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -342,7 +342,7 @@ public class InterfaceContainer_Test
         cont.addAll(list2);
         r[i++]= cont.indexOf(proxyObj3Weak1) == 2;
         r[i++]= cont.lastIndexOf(proxyObj3Weak2) == 5;
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -352,7 +352,7 @@ public class InterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     /** Tests List.remove(int index), List.remove(Object element), List.removeAll(Collection c)
      */
     public boolean remove()
@@ -361,7 +361,7 @@ public class InterfaceContainer_Test
         InterfaceContainer cont= new InterfaceContainer();
         boolean r[]= new boolean[50];
         int i= 0;
-
+        
         cont.addAll(list2);
         r[i++]=  proxyObj2TypeProv.equals(cont.remove(1));
         r[i++]= cont.size() == 2;
@@ -376,14 +376,14 @@ public class InterfaceContainer_Test
         r[i++]= cont.removeAll(list3);
         r[i++]= cont.isEmpty();
         cont.addAll(list2);
-
+        
         List list= new ArrayList();
         list.add(list2.get(0));
         list.add(list2.get(1));
         list.add(proxyObj3Weak2);
         r[i++]= cont.removeAll(list);
         r[i++]= cont.isEmpty();
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -393,7 +393,7 @@ public class InterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     /** Tests List.retainAll
      */
     public boolean retainAll()
@@ -402,20 +402,20 @@ public class InterfaceContainer_Test
         InterfaceContainer cont= new InterfaceContainer();
         boolean r[]= new boolean[50];
         int i= 0;
-
+        
         cont.addAll(list1); //obj1, obj2, obj3
         cont.addAll(list2); //obj1, proxyObj2TypeProv, proxyObj3TypeProv
         List list = new ArrayList();
         list.add(obj1);
         list.add(proxyObj3Weak1);
-
+        
         r[i++]= cont.retainAll(list);
         r[i++]= cont.get(0) == obj1;
         r[i++]= cont.get(1) == obj3;
         r[i++]= cont.get(2) == obj1;
         r[i++]= cont.get(3) == proxyObj3TypeProv;
         r[i++]= 4 == cont.size();
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -425,7 +425,7 @@ public class InterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     /** Tests List.set(int index, Object element)
      **/
     public boolean set()
@@ -441,7 +441,7 @@ public class InterfaceContainer_Test
         r[i++]= o2 == list2.get(2);
         r[i++]= cont.get(0) == obj3;
         r[i++]= cont.get(2) == proxyObj3Weak1;
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -451,7 +451,7 @@ public class InterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     /** Tests List.toArray(), List.toArray(Object[] a)
      */
     public boolean toArray()
@@ -460,16 +460,16 @@ public class InterfaceContainer_Test
         InterfaceContainer cont= new InterfaceContainer();
         boolean r[]= new boolean[50];
         int i= 0;
-
+        
         cont.addAll(list1);
         Object[] ar= cont.toArray();
         Object[] arOrig= list1.toArray();
         r[i++]= ar.length == arOrig.length;
-
+        
         r[i]= true;
         for (int c= 0; c < ar.length; c++)
             r[i]= r[i] && ar[c] == arOrig[c];
-
+        
         i++;
         XWeak[] arWeak= new XWeak[3];
         XWeak[] arWeak2= (XWeak[])cont.toArray(arWeak);
@@ -477,9 +477,9 @@ public class InterfaceContainer_Test
         r[i]= true;
         for (int c= 0; c < ar.length; c++)
             r[i]= r[i] && ar[c] == arWeak2[c];
-
+        
         i++;
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -489,14 +489,14 @@ public class InterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     public boolean Iterator_next()
     {
         System.out.println("Testing InterfaceContainer.iterator, Iterator.next()");
         InterfaceContainer cont= new InterfaceContainer();
         boolean r[]= new boolean[50];
         int i= 0;
-
+        
         cont.addAll(list1);
         Iterator it= cont.iterator();
         r[i++]= it.next() == list1.get(0);
@@ -512,7 +512,7 @@ public class InterfaceContainer_Test
         {
             r[i++]= false;
         }
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -522,14 +522,14 @@ public class InterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     public boolean Iterator_hasNext()
     {
         System.out.println("Testing, Iterator.next()");
         InterfaceContainer cont= new InterfaceContainer();
         boolean r[]= new boolean[50];
         int i= 0;
-
+        
         Iterator it= cont.iterator();
         r[i++]= ! it.hasNext();
         cont.addAll(list1);
@@ -541,7 +541,7 @@ public class InterfaceContainer_Test
         r[i++]= it.hasNext();
         it.next();
         r[i++]= ! it.hasNext();
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -551,14 +551,14 @@ public class InterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     public boolean Iterator_remove()
     {
         System.out.println("Testing, Iterator.remove()");
         InterfaceContainer cont= new InterfaceContainer();
         boolean r[]= new boolean[50];
         int i= 0;
-
+        
         Iterator it= cont.iterator();
         try
         {
@@ -598,7 +598,7 @@ public class InterfaceContainer_Test
             it.remove();
         }
         r[i++]= cont.isEmpty();
-
+        
         // 2 iterators, remove must not impair the other iterator
         cont.clear();
         cont.addAll(list1);
@@ -621,7 +621,7 @@ public class InterfaceContainer_Test
             r[i++]= false;
         }
         r[i++]= cont.size() == 0;
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -637,7 +637,7 @@ public class InterfaceContainer_Test
         InterfaceContainer cont= new InterfaceContainer();
         boolean r[]= new boolean[50];
         int i= 0;
-
+        
         cont.addAll(list1);
         Iterator it= cont.listIterator();
         r[i++]= it.next() == list1.get(0);
@@ -653,7 +653,7 @@ public class InterfaceContainer_Test
         {
             r[i++]= false;
         }
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -663,14 +663,14 @@ public class InterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     public boolean ListIterator_hasNext()
     {
         System.out.println("Testing ListIterator.hasNext()");
         InterfaceContainer cont= new InterfaceContainer();
         boolean r[]= new boolean[50];
         int i= 0;
-
+        
         Iterator it= cont.listIterator();
         r[i++]= ! it.hasNext();
         cont.addAll(list1);
@@ -682,7 +682,7 @@ public class InterfaceContainer_Test
         r[i++]= it.hasNext();
         it.next();
         r[i++]= ! it.hasNext();
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -692,14 +692,14 @@ public class InterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     public boolean ListIterator_remove()
     {
         System.out.println("Testing ListIterator.remove()");
         InterfaceContainer cont= new InterfaceContainer();
         boolean r[]= new boolean[50];
         int i= 0;
-
+        
         ListIterator it= cont.listIterator();
         try
         {
@@ -739,7 +739,7 @@ public class InterfaceContainer_Test
             it.remove();
         }
         r[i++]= cont.isEmpty();
-
+        
         // 2 iterators, remove must not impair the other iterator
         cont.clear();
         cont.addAll(list1);
@@ -762,7 +762,7 @@ public class InterfaceContainer_Test
             r[i++]= false;
         }
         r[i++]= cont.size() == 0;
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -772,14 +772,14 @@ public class InterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     public boolean ListIterator_hasPrevious()
     {
         System.out.println("Testing ListIterator.hasPrevious()");
         InterfaceContainer cont= new InterfaceContainer();
         boolean r[]= new boolean[50];
         int i= 0;
-
+        
         ListIterator it= cont.listIterator();
         r[i++]= ! it.hasPrevious();
         cont.addAll(list1);
@@ -789,7 +789,7 @@ public class InterfaceContainer_Test
             it.next();
             r[i++]= it.hasPrevious();
         }
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -799,7 +799,7 @@ public class InterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     public boolean ListIterator_previous()
     {
         System.out.println("Testing ListIterator.previous()");
@@ -807,7 +807,7 @@ public class InterfaceContainer_Test
         boolean r[]= new boolean[50];
         int i= 0;
         boolean bOk= true;
-
+        
         cont.addAll(list1);
         // go to the end of our list and list1
         ListIterator it= cont.listIterator();
@@ -816,7 +816,7 @@ public class InterfaceContainer_Test
         ListIterator it_list1= list1.listIterator();
         while (it_list1.hasNext())
             it_list1.next();
-
+        
         while (it.hasPrevious())
         {
             r[i++]= it.previous() == it_list1.previous();
@@ -830,7 +830,7 @@ public class InterfaceContainer_Test
         {
             r[i++]=true;
         }
-
+        
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
         if ( ! bOk )
@@ -839,7 +839,7 @@ public class InterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     public boolean ListIterator_nextIndex()
     {
         System.out.println("Testing ListIterator.nextIndex()");
@@ -847,7 +847,7 @@ public class InterfaceContainer_Test
         boolean r[]= new boolean[50];
         int i= 0;
         boolean bOk= true;
-
+        
         ListIterator it= cont.listIterator();
         cont.addAll(list1);
         it= cont.listIterator();
@@ -856,7 +856,7 @@ public class InterfaceContainer_Test
         r[i++]= it.nextIndex() == 1;
         it.next();
         r[i++]= it.nextIndex() == 2;
-
+        
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
         if ( ! bOk )
@@ -872,20 +872,20 @@ public class InterfaceContainer_Test
         boolean r[]= new boolean[50];
         int i= 0;
         boolean bOk= true;
-
+        
         ListIterator it= cont.listIterator();
         cont.addAll(list1);
         it= cont.listIterator();
         while (it.hasNext())
             it.next();
-
+        
         r[i++]= it.previousIndex() == 2;
         it.previous();
         r[i++]= it.previousIndex() == 1;
         it.previous();
         r[i++]= it.previousIndex() == 0;
         it.previous();
-
+        
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
         if ( ! bOk )
@@ -901,7 +901,7 @@ public class InterfaceContainer_Test
         boolean r[]= new boolean[50];
         int i= 0;
         boolean bOk= true;
-
+        
         ListIterator it= cont.listIterator();
         it.add(obj1);
         r[i++]= cont.size() == 1;
@@ -911,7 +911,7 @@ public class InterfaceContainer_Test
         r[i++]= it.previous() == obj3;
         r[i++]= it.previous() == obj2;
         r[i++]= it.previous() == obj1;
-
+        
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
         if ( ! bOk )
@@ -920,14 +920,14 @@ public class InterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     public boolean disposeAndClear()
     {
         System.out.println("Testing InterfaceContainer.disposeAndClear");
         InterfaceContainer cont= new InterfaceContainer(10);
         boolean r[]= new boolean[50];
         int i= 0;
-
+        
         cont.add(obj1);
         cont.add(obj2);
         cont.add(obj3);
@@ -947,7 +947,7 @@ public class InterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
 
     public static void main(String[] args)
     {
@@ -986,7 +986,7 @@ public class InterfaceContainer_Test
             System.out.println("Test finished.\nErrors occured!!!");
         else
             System.out.println("Test finished. \nNo errors.");
-
+        
     }
-
+    
 }
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
index 9a855db6ddb5..c953e7bb98d9 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,13 +62,13 @@ public class MultiTypeInterfaceContainer_Test
         obj2= new AWeakBase();
         obj3= new AWeakBase();
         obj4= new AWeakBase();
-
+        
         proxyObj1Weak1= ProxyProvider.createProxy(obj1, XWeak.class);
         proxyObj3Weak1= ProxyProvider.createProxy(obj3, XWeak.class);
         proxyObj3Weak2= ProxyProvider.createProxy(obj3, XWeak.class);
         proxyObj2TypeProv= ProxyProvider.createProxy(obj2, XTypeProvider.class);
         proxyObj3TypeProv= ProxyProvider.createProxy(obj3, XTypeProvider.class);
-
+        
         list1= new ArrayList();
         list1.add(obj1);
         list1.add(obj2);
@@ -94,7 +94,7 @@ public class MultiTypeInterfaceContainer_Test
 //        Object retVal= null;
 //        if (obj == null || iface == null || iface.isInstance(obj) == false )
 //            return retVal;
-//
+//        
 //        Type type= new Type(TypeDescription.getTypeDescription(iface));
 //        Type evtType= new Type(TypeDescription.getTypeDescription(com.sun.star.lang.XEventListener.class));
 //        // find the object identifier
@@ -108,7 +108,7 @@ public class MultiTypeInterfaceContainer_Test
 //            Object aProxyEvt = Proxy.create(eventRequester, sOid, evtType, false, false);
 //            String[] arOid= new String[]{sOid};
 //            retVal= env.registerInterface(aProxyEvt, arOid, evtType);
-//
+//            
 //            Requester requester = new Requester(false, false, aProxyEvt);
 //            Object aProxy = Proxy.create(requester, sOid, type, false, false);
 //            arOid= new String[] {sOid};
@@ -123,7 +123,7 @@ public class MultiTypeInterfaceContainer_Test
         MultiTypeInterfaceContainer cont= new MultiTypeInterfaceContainer();
         boolean r[]= new boolean[200];
         int i= 0;
-
+        
         int ci= 0;
         ci= cont.addInterface(new Type(XInterface.class), obj1);
         ci= cont.addInterface(new Type(XInterface.class), obj2);
@@ -136,7 +136,7 @@ public class MultiTypeInterfaceContainer_Test
         r[i++]= ci == 1;
         ci= cont.addInterface(new Type(XTypeProvider.class), null);
         r[i++]= ci == 0;
-
+        
         cont= new MultiTypeInterfaceContainer();
         AWeakBase[] arObj= new AWeakBase[100];
         for (int c= 0; c < 100; c++)
@@ -149,7 +149,7 @@ public class MultiTypeInterfaceContainer_Test
         {
             ci= cont.removeInterface(new Type(XInterface.class), arObj[c]);
             r[i++]= ci == 100 -c -1;
-
+            
         }
         boolean bOk= true;
         for (int c= 0; c < i; c++)
@@ -160,14 +160,14 @@ public class MultiTypeInterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     public boolean getContainedTypes()
     {
         System.out.println("Testing MultiTypeInterfaceContainer.getContainedTypes");
         MultiTypeInterfaceContainer cont= new MultiTypeInterfaceContainer();
         boolean r[]= new boolean[50];
         int i= 0;
-
+        
         cont.addInterface(new Type(XInterface.class), obj1);
         cont.addInterface(new Type(XWeak.class), obj1);
         cont.addInterface(null, obj1);
@@ -230,7 +230,7 @@ public class MultiTypeInterfaceContainer_Test
         r[i++]= icont.size() == 2;
         icont= cont.getContainer(null);
         r[i++]= icont.size() == 1;
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -255,7 +255,7 @@ public class MultiTypeInterfaceContainer_Test
         r[i++]= count == 0;
         count= cont.removeInterface(null, obj2);
         r[i++]= count == 0;
-
+        
         cont.addInterface(new Type(XInterface.class), obj1);
         cont.addInterface(null, obj1);
         count= cont.removeInterface(null, obj2);
@@ -265,7 +265,7 @@ public class MultiTypeInterfaceContainer_Test
         r[i++]= count == 0;
         count= cont.removeInterface(new Type(XInterface.class), obj1);
         r[i++]= count == 0;
-
+        
           boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -300,7 +300,7 @@ public class MultiTypeInterfaceContainer_Test
         cont.clear();
         types= cont.getContainedTypes();
         r[i++]= types.length == 0;
-
+            
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -328,13 +328,13 @@ public class MultiTypeInterfaceContainer_Test
         cont.addInterface(new Type(XWeak.class), obj2);
         cont.addInterface(new Type(XTypeProvider.class), obj1);
         cont.disposeAndClear(new com.sun.star.lang.EventObject("blabla"));
-
+        
         r[i++]= obj1.nDisposingCalled == 3;
         r[i++]= obj2.nDisposingCalled == 2;
         r[i++]= obj3.nDisposingCalled == 1;
         Type[] types= cont.getContainedTypes();
         r[i++]= types.length == 0;
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -344,8 +344,8 @@ public class MultiTypeInterfaceContainer_Test
             System.out.println("Ok");
         return bOk;
     }
-
-
+    
+    
     public static void main(String[] args)
     {
         MultiTypeInterfaceContainer_Test test= new MultiTypeInterfaceContainer_Test();
@@ -364,8 +364,8 @@ public class MultiTypeInterfaceContainer_Test
             System.out.println("Test finished.\nErrors occured!!!");
         else
             System.out.println("Test finished. \nNo errors.");
-
-    }
+   
+    }    
 }
 
 
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
index 1a00899cbcf1..da63cc1f105b 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,18 +49,18 @@ import java.util.Arrays;
 
 public class PropertySet_Test
 {
-
+    
     /** Creates a new instance of PropertySet_Test */
     public PropertySet_Test()
     {
     }
-
+    
     public boolean convertPropertyValue()
     {
         System.out.println("PropertySet.convertPropertyValue");
         boolean[] r= new boolean[50];
         int i= 0;
-
+        
         TestClass cl= new TestClass();
         try {
         r[i++]= cl.test_convertPropertyValue();
@@ -82,7 +82,7 @@ public class PropertySet_Test
         System.out.println("PropertySet.setValueNoBroadcast");
         boolean[] r= new boolean[50];
         int i= 0;
-
+        
         TestClass cl= new TestClass();
         try {
             r[i++]= cl.test_setPropertyValueNoBroadcast();
@@ -104,7 +104,7 @@ public class PropertySet_Test
         System.out.println("PropertySet.setPropertyValue");
         boolean[] r= new boolean[150];
         int i= 0;
-
+        
         TestClass cl= new TestClass();
         try {
             cl.resetPropertyMembers();
@@ -166,7 +166,7 @@ public class PropertySet_Test
             cl.setPropertyValue("PropTypeA", value);
             ret= cl.getPropertyValue("PropTypeA");
             r[i++]= ((Type) ret).equals(value);
-
+            
             // test protected,package,private members
             value= new Boolean(true);
             cl.setPropertyValue("PropBoolB", value);
@@ -175,7 +175,7 @@ public class PropertySet_Test
             cl.setPropertyValue("PropBoolC", value);
             ret= cl.getPropertyValue("PropBoolC");
             r[i++]= ((Boolean) ret).equals((Boolean) value);
-
+            
             try{
                 cl.setPropertyValue("PropBoolD", value);
                 i++;
@@ -184,7 +184,7 @@ public class PropertySet_Test
                 r[i++]= true;
             }
             cl.resetPropertyMembers();
-
+            
             value= new Boolean(true);
             cl.setPropertyValue("PropObjectA", value);
             ret= cl.getPropertyValue("PropObjectA");
@@ -240,8 +240,8 @@ public class PropertySet_Test
             cl.setPropertyValue("PropObjectA", new Any( new Type(byte.class), new Byte((byte)1)));
             ret= cl.getPropertyValue("PropObjectA");
             r[i++]= ((Byte) ret).byteValue() == 1;
-
-           cl.resetPropertyMembers();
+            
+           cl.resetPropertyMembers();           
             value= new Boolean(true);
             cl.setPropertyValue("PropAnyA", value);
             ret= cl.getPropertyValue("PropAnyA");
@@ -295,7 +295,7 @@ public class PropertySet_Test
             ret= cl.getPropertyValue("PropAnyA");
             r[i++]= ret instanceof Any && util.anyEquals(value, ret);
 
-            cl.resetPropertyMembers();
+            cl.resetPropertyMembers();           
             value= new Any(new Type(boolean.class), new Boolean(true));
             cl.setPropertyValue("PropBoolA", value);
             ret= cl.getPropertyValue("PropBoolA");
@@ -348,9 +348,9 @@ public class PropertySet_Test
             cl.setPropertyValue("PropTypeA", value);
             ret= cl.getPropertyValue("PropTypeA");
             r[i++]= ret instanceof Type && util.anyEquals(value, ret);
+            
 
-
-            cl.resetPropertyMembers();
+            cl.resetPropertyMembers();           
             value= new Any(new Type(boolean.class), new Boolean(true));
             cl.setPropertyValue("PropAnyA", value);
             ret= cl.getPropertyValue("PropAnyA");
@@ -403,8 +403,8 @@ public class PropertySet_Test
             cl.setPropertyValue("PropAnyA", value);
             ret= cl.getPropertyValue("PropAnyA");
             r[i++]= ret instanceof Any && util.anyEquals(value, ret);
-
-
+            
+            
             // ------------------------------------------------------------------------------
             cl.resetPropertyMembers();
             value= new Boolean(true);
@@ -439,10 +439,10 @@ public class PropertySet_Test
             cl.setPropertyValue("PropDoubleClass",value);
             ret= cl.getPropertyValue("PropDoubleClass");
             r[i++]= ((Double) ret).equals((Double) value);
-
-            cl.resetPropertyMembers();
-
+            
             cl.resetPropertyMembers();
+                        
+            cl.resetPropertyMembers();           
             value= new Any(new Type(boolean.class), new Boolean(true));
             cl.setPropertyValue("PropBoolClass", value);
             ret= cl.getPropertyValue("PropBoolClass");
@@ -477,7 +477,7 @@ public class PropertySet_Test
             r[i++]= ret instanceof Double && util.anyEquals(value, ret);
             value= new Any(new Type(String.class), new String("string"));
 
-
+            
 
             // PropertyAttribute.READONLY
             cl.propBoolA.Attributes= PropertyAttribute.READONLY;
@@ -489,13 +489,13 @@ public class PropertySet_Test
                 r[i++]= true;
             }
             cl.propBoolA.Attributes= 0;
-
+            
             // MAYBEVOID
             cl.resetPropertyMembers();
             // first MAYBEVOID not set
-
+            
             //primitive members: must not work
-
+            
             cl.boolPropA= false;
             try {
                 cl.setPropertyValue("PropBoolA", null); i++;
@@ -514,7 +514,7 @@ public class PropertySet_Test
                 r[i++]= true;
             }
             cl.propBoolA.Attributes= 0;
-
+            
             cl.propBoolClass.Attributes= PropertyAttribute.MAYBEVOID;
             cl.boolClassProp= null;
             cl.setPropertyValue("PropBoolClass", null);
@@ -522,7 +522,7 @@ public class PropertySet_Test
             // the returned value must be a void any
             Object objAny= cl.getPropertyValue("PropBoolClass");
             r[i++]= util.isVoidAny( objAny);
-
+            
             cl.boolClassProp= new Boolean(true);
             cl.setPropertyValue("PropBoolClass", null);
             r[i++]= cl.boolClassProp == null;
@@ -534,7 +534,7 @@ public class PropertySet_Test
             cl.setPropertyValue("PropXWeakA", null);
             r[i++]= util.isVoidAny(cl.getPropertyValue("PropXWeakA"));
             cl.propXWeakA.Attributes= 0;
-
+            
             cl.anyPropA= null;
             try{
                 cl.setPropertyValue("PropAnyA", null); i++;
@@ -543,17 +543,17 @@ public class PropertySet_Test
             }
             cl.anyPropA= null;
             cl.propAnyA.Attributes= PropertyAttribute.MAYBEVOID;
-
+            
             Type _t= new Type(Object.class);
             cl.setPropertyValue("PropAnyA", null);
             r[i++]= cl.anyPropA.getType().equals(new Type(void.class)) &&
                     cl.anyPropA.getObject() == null;
-
+            
             cl.anyPropA= new Any(new Type(byte.class),new Byte((byte) 111));
             cl.setPropertyValue("PropAnyA", null);
             r[i++]= cl.anyPropA.getType().equals(new Type(byte.class)) &&
                     cl.anyPropA.getObject() == null;
-
+            
             cl.anyPropA= null;
             try{
                 cl.setPropertyValue("PropAnyA", new Object()); i++;
@@ -561,7 +561,7 @@ public class PropertySet_Test
             {
                 r[i++]= true;
             }
-
+            
             cl.propObjectA.Attributes= 0;
             try{
                 cl.setPropertyValue("PropObjectA", null); i++;
@@ -575,19 +575,19 @@ public class PropertySet_Test
             {
                 r[i++]= true;
             }
-
+            
             cl.propObjectA.Attributes= PropertyAttribute.MAYBEVOID;
             cl.propObjectA= null;
             cl.setPropertyValue("PropObjectA", null);
             r[i++]= cl.propObjectA == null;
-
+            
             cl.propObjectA= null;
             cl.setPropertyValue("PropObjectA", new Any( new Type(byte.class), null));
             r[i++]= cl.propObjectA == null;
-
-
-            //
-
+            
+            
+            // 
+            
         }catch(java.lang.Exception e){
             i++;
         }
@@ -604,7 +604,7 @@ public class PropertySet_Test
     public boolean addPropertyChangeListener()
     {
         System.out.println("PropertySet.addPropertyChangeListener,\n" +
-                            "PropertySet.removePropertChangeListener," +
+                            "PropertySet.removePropertChangeListener," + 
                             "PropertySet.addVetoableChangeListener, \n" +
                             "PropertySet.removeVetoableChangeListener" +
                             "Notification of listeners");
@@ -623,7 +623,7 @@ public class PropertySet_Test
             cl.setPropertyValue("PropByteA", val2);
             r[i++]= li.nChangeCalled == 1 && li.nVetoCalled == 0;
             r[i++]= li.evt.OldValue.equals(val1) && li.evt.NewValue.equals(val2) && li.evt.Source == cl;
-
+            
             li.reset();
             Listener li2= new Listener();
             cl.addPropertyChangeListener("PropByteA", li2);
@@ -631,9 +631,9 @@ public class PropertySet_Test
             cl.setPropertyValue("PropByteA", val3);
             r[i++]= li.nChangeCalled == 1 && li.nVetoCalled == 0
                     && li2.nChangeCalled == 1 && li2.nVetoCalled == 0;
-            r[i++]= li.evt.OldValue.equals(val2) && li.evt.NewValue.equals(val3) && li.evt.Source == cl
+            r[i++]= li.evt.OldValue.equals(val2) && li.evt.NewValue.equals(val3) && li.evt.Source == cl 
                     && li2.evt.OldValue.equals(val2) && li2.evt.NewValue.equals(val3) && li2.evt.Source == cl ;
-
+            
             li.reset();
             li2.reset();
             Listener li3= new Listener();
@@ -643,8 +643,8 @@ public class PropertySet_Test
             r[i++]= li.nChangeCalled == 1 && li.nVetoCalled == 0
                     && li2.nChangeCalled == 1 && li2.nVetoCalled == 0
                     &&  li3.nChangeCalled == 1 && li3.nVetoCalled == 0;
-            r[i++]= li.evt.OldValue.equals(val3) && li.evt.NewValue.equals(val1) && li.evt.Source == cl;
-            r[i++]= li2.evt.OldValue.equals(val3) && li2.evt.NewValue.equals(val1) && li2.evt.Source == cl;
+            r[i++]= li.evt.OldValue.equals(val3) && li.evt.NewValue.equals(val1) && li.evt.Source == cl; 
+            r[i++]= li2.evt.OldValue.equals(val3) && li2.evt.NewValue.equals(val1) && li2.evt.Source == cl; 
             r[i++]= li3.evt.OldValue.equals(val3) && li3.evt.NewValue.equals(val1) && li3.evt.Source == cl ;
 
             li.reset();
@@ -663,7 +663,7 @@ public class PropertySet_Test
             r[i++]= li.nChangeCalled == 0 && li.nVetoCalled == 0
                     && li2.nChangeCalled == 0 && li2.nVetoCalled == 0
                     &&  li3.nChangeCalled == 1 && li3.nVetoCalled == 0;
-
+            
             cl.removePropertyChangeListener("", li3);
             li.reset();
             li2.reset();
@@ -686,7 +686,7 @@ public class PropertySet_Test
             {
                 r[i++]= true;
             }
-
+            
             //Vetoable tests
             cl= new TestClass();
             li.reset();
@@ -703,7 +703,7 @@ public class PropertySet_Test
             cl.setPropertyValue("PropByteA", val2);
             r[i++]= li.nChangeCalled == 0 && li.nVetoCalled == 1;
             r[i++]= li.evt.OldValue.equals(val1) && li.evt.NewValue.equals(val2) && li.evt.Source == cl;
-
+            
             li.reset();
             li2.reset();
             li3.reset();
@@ -712,9 +712,9 @@ public class PropertySet_Test
             cl.setPropertyValue("PropByteA", val3);
             r[i++]= li.nChangeCalled == 0 && li.nVetoCalled == 1
                     && li2.nChangeCalled == 0 && li2.nVetoCalled == 1;
-            r[i++]= li.evt.OldValue.equals(val2) && li.evt.NewValue.equals(val3) && li.evt.Source == cl
+            r[i++]= li.evt.OldValue.equals(val2) && li.evt.NewValue.equals(val3) && li.evt.Source == cl 
                     && li2.evt.OldValue.equals(val2) && li2.evt.NewValue.equals(val3) && li2.evt.Source == cl ;
-
+            
             li.reset();
             li2.reset();
             li3.reset();
@@ -724,8 +724,8 @@ public class PropertySet_Test
             r[i++]= li.nChangeCalled == 0 && li.nVetoCalled == 1
                     && li2.nChangeCalled == 0 && li2.nVetoCalled == 1
                     &&  li3.nChangeCalled == 0 && li3.nVetoCalled == 1;
-            r[i++]= li.evt.OldValue.equals(val3) && li.evt.NewValue.equals(val1) && li.evt.Source == cl;
-            r[i++]= li2.evt.OldValue.equals(val3) && li2.evt.NewValue.equals(val1) && li2.evt.Source == cl;
+            r[i++]= li.evt.OldValue.equals(val3) && li.evt.NewValue.equals(val1) && li.evt.Source == cl; 
+            r[i++]= li2.evt.OldValue.equals(val3) && li2.evt.NewValue.equals(val1) && li2.evt.Source == cl; 
             r[i++]= li3.evt.OldValue.equals(val3) && li3.evt.NewValue.equals(val1) && li3.evt.Source == cl ;
 
             li.reset();
@@ -759,7 +759,7 @@ public class PropertySet_Test
             r[i++]= li.nChangeCalled == 0 && li.nVetoCalled == 0
                     && li2.nChangeCalled == 0 && li2.nVetoCalled == 0
                     &&  li3.nChangeCalled == 0 && li3.nVetoCalled == 1;
-
+            
             cl.removeVetoableChangeListener("", li3);
             li.reset();
             li2.reset();
@@ -801,7 +801,7 @@ public class PropertySet_Test
         System.out.println("PropertySet.getPropertySetInfo");
         boolean[] r= new boolean[50];
         int i= 0;
-
+        
         TestClass cl= new TestClass();
         try {
             XPropertySetInfo info= cl.getPropertySetInfo();
@@ -822,7 +822,7 @@ public class PropertySet_Test
                 if ( !bFound)
                     r[i++]= false;
             }
-
+            
             for (int j= 0; j < arRegProps.length; j++)
             {
                 Property prop= info.getPropertyByName(arRegProps[j].Name);
@@ -831,13 +831,13 @@ public class PropertySet_Test
                 if (! info.hasPropertyByName(arRegProps[j].Name))
                     r[i++]= false;
             }
-
-
+                
+            
         }catch(java.lang.Exception e){
             System.out.println(e.getMessage());
             i++;
         }
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -853,7 +853,7 @@ public class PropertySet_Test
         System.out.println("PropertySet.setFastPropertyValue");
         boolean[] r= new boolean[50];
         int i= 0;
-
+        
         TestClass cl= new TestClass();
         try {
             cl.setFastPropertyValue(5, new Integer(111));
@@ -868,7 +868,7 @@ public class PropertySet_Test
             System.out.println(e.getMessage());
             i++;
         }
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -884,7 +884,7 @@ public class PropertySet_Test
         System.out.println("PropertySet.setFastPropertyValue");
         boolean[] r= new boolean[50];
         int i= 0;
-
+        
         TestClass cl= new TestClass();
         try {
             cl.setFastPropertyValue(5, new Integer(111));
@@ -894,7 +894,7 @@ public class PropertySet_Test
             System.out.println(e.getMessage());
             i++;
         }
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -910,7 +910,7 @@ public class PropertySet_Test
         System.out.println("PropertySet.setPropertyValues");
         boolean[] r= new boolean[50];
         int i= 0;
-
+        
         TestClass cl= new TestClass();
         try {
             cl.setPropertyValues(new String[0], new Object[0]);
@@ -921,7 +921,7 @@ public class PropertySet_Test
             Object[] values= new Object[]{aChar, aInt, aByte};
             cl.setPropertyValues(arNames, values);
             r[i++]= cl.charPropA == 'A' && cl.intClassProp.intValue() == 111 && ((Byte)cl.objectPropA).byteValue() == 11;
-
+            
             arNames= new String[] {"blabla","PropIntClass","PropObjectA"};
             cl.resetPropertyMembers();
             cl.setPropertyValues(arNames, values);
@@ -945,15 +945,15 @@ public class PropertySet_Test
         System.out.println("PropertySet.getPropertyValues");
         boolean[] r= new boolean[50];
         int i= 0;
-
+        
         TestClass cl= new TestClass();
         try {
             cl.charPropA= 'A';
             cl.intClassProp= new Integer(111);
             cl.objectPropA= new Byte((byte)11);
             Object[] values= cl.getPropertyValues(new String[] {"PropCharA","PropIntClass","PropObjectA"});
-
-            r[i++]= ((Character) values[0]).charValue() == 'A' && ((Integer) values[1]).intValue() == 111
+            
+            r[i++]= ((Character) values[0]).charValue() == 'A' && ((Integer) values[1]).intValue() == 111 
                         && ((Byte) values[2]).byteValue() == 11;
         }catch(java.lang.Exception e){
             System.out.println(e.getMessage());
@@ -973,12 +973,12 @@ public class PropertySet_Test
     // The property names in the first argument are ignored.
     public boolean addPropertiesChangeListener()
     {
-        System.out.println("PropertySet.addPropertiesChangeListener\n" +
+        System.out.println("PropertySet.addPropertiesChangeListener\n" +    
                             "PropertySet.removePropertiesChangeListener\n" +
                             "notification of such listeners");
         boolean[] r= new boolean[50];
         int i= 0;
-
+        
         TestClass cl= new TestClass();
         try {
             Listener li1= new Listener();
@@ -989,7 +989,7 @@ public class PropertySet_Test
             cl.propCharA.Attributes= PropertyAttribute.BOUND;
             cl.setPropertyValue("PropCharA", new Character('C'));
             r[i++]= li1.nPropertiesChange == 1;
-
+            
             PropertyChangeEvent evt= li1.arEvt[0];
             r[i++]= evt.PropertyName.equals("PropCharA") && ((Character)evt.OldValue).charValue() == 'B'
                     && ((Character) evt.NewValue).charValue() == 'C';
@@ -1013,10 +1013,10 @@ public class PropertySet_Test
 
     public boolean firePropertiesChangeEvent()
     {
-        System.out.println("PropertySet.firePropertiesChangeEvent");
+        System.out.println("PropertySet.firePropertiesChangeEvent");    
         boolean[] r= new boolean[50];
         int i= 0;
-
+        
         TestClass cl= new TestClass();
         try {
             Listener li1= new Listener();
@@ -1025,10 +1025,10 @@ public class PropertySet_Test
             cl.firePropertiesChangeEvent(new String[]{"PropCharA","PropIntClass"},  li1);
             r[i++]= li1.nPropertiesChange == 1;
             PropertyChangeEvent[] arEvt= li1.arEvt;
-            r[i++]= arEvt[0].PropertyName.equals("PropCharA")
+            r[i++]= arEvt[0].PropertyName.equals("PropCharA") 
                     && ((Character) arEvt[0].OldValue).charValue() == 'A'
                     && ((Character) arEvt[0].NewValue).charValue() == 'A';
-            r[i++]= arEvt[1].PropertyName.equals("PropIntClass")
+            r[i++]= arEvt[1].PropertyName.equals("PropIntClass") 
                     && ((Integer) arEvt[1].OldValue).intValue() == 111
                     && ((Integer) arEvt[1].NewValue).intValue() == 111;
         }catch(java.lang.Exception e){
@@ -1044,7 +1044,7 @@ public class PropertySet_Test
             System.out.println("Ok");
         return bOk;
     }
-
+    
     public boolean registerProperty1()
     {
         TestClass2 cl= new TestClass2();
@@ -1087,7 +1087,7 @@ public class PropertySet_Test
     public static void main(String[] args)
     {
         test();
-    }
+    }   
 }
 
 class TestClass extends PropertySet
@@ -1122,20 +1122,20 @@ class TestClass extends PropertySet
     public XInterface xInterfacePropA;
     public Property propXWeakA= new Property("PropXWeakA", 13, new Type(Any.class), (short) 0);
     public XWeak xWeakPropA;
-    public Property propEnum =
+    public Property propEnum = 
         new Property("PropEnum", 14, new Type("com.sun.star.beans.PropertyState", TypeClass.ENUM), (short)0);
     public com.sun.star.beans.PropertyState enumPropertyState = com.sun.star.beans.PropertyState.DEFAULT_VALUE;
     // Test private, protected, package access, Anys as arguments and members, members whith a value
 
     public Property propBoolB= new Property("PropBoolB", 101, new Type(Boolean.TYPE), (short) 0);
     protected boolean boolPropB;
-
+    
     public Property propBoolC= new Property("PropBoolC", 201, new Type(Boolean.TYPE), (short) 0);
     boolean boolPropC;
 
-    public Property propBoolD= new Property("PropBoolD", 301, new Type(Boolean.TYPE), (short) 0);
+    public Property propBoolD= new Property("PropBoolD", 301, new Type(Boolean.TYPE), (short) 0); 
     private boolean boolPropD;
-
+    
     public Property propBoolClass= new Property("PropBoolClass", 1001, new Type(Boolean.class), (short) 0);
     public Boolean boolClassProp;
     public Property propCharClass= new Property("PropCharClass", 1002, new Type(Character.class), (short) 0);
@@ -1153,10 +1153,10 @@ class TestClass extends PropertySet
     public Property propDoubleClass= new Property("PropDoubleClass", 1008, new Type(Double.class), (short) 0);
     public Double doubleClassProp;
 
-
+    
     public TestClass()
     {
-
+        
         super();
 //        When adding properties then modify the getRegisteredProperties method
         //registerProperty(String name, int handle, Type type, short attributes, String memberName)
@@ -1188,17 +1188,17 @@ class TestClass extends PropertySet
         registerProperty(propFloatClass, "floatClassProp");
         registerProperty(propDoubleClass, "doubleClassProp");
     }
-
+    
     /** When adding properties then modify the getRegisteredProperties method
      */
     public Property[] getRegisteredProperties()
     {
         return new Property[] {
                     propBoolA, propCharA, propByteA, propShortA,
-                    propIntA, propLongA, propFloatA, propDoubleA,
-                    propStringA, propArrayByteA, propTypeA, propObjectA,
-                    propAnyA, propXInterfaceA, propXWeakA, propEnum, propBoolB,
-                    propBoolC, propBoolD, propBoolClass, propCharClass,
+                    propIntA, propLongA, propFloatA, propDoubleA, 
+                    propStringA, propArrayByteA, propTypeA, propObjectA, 
+                    propAnyA, propXInterfaceA, propXWeakA, propEnum, propBoolB, 
+                    propBoolC, propBoolD, propBoolClass, propCharClass, 
                     propByteClass, propShortClass, propIntClass, propLongClass,
                     propFloatClass, propDoubleClass
         };
@@ -1208,11 +1208,11 @@ class TestClass extends PropertySet
     {
         boolean[] r= new boolean[150];
         int i= 0;
-
+    
         resetPropertyMembers();
         Object[] outOldVal= new Object[1];
         Object[] outNewVal= new Object[1];
-
+        
         Object value= new Boolean(true);
         try
         {
@@ -1279,11 +1279,11 @@ class TestClass extends PropertySet
             r[i++]= outNewVal[0] instanceof XInterface && outNewVal[0].equals(value);
             r[i++]= convertPropertyValue(propXWeakA, outNewVal, outOldVal, value);
             r[i++]= outNewVal[0] instanceof XWeak && outNewVal[0].equals(value);
-
+            
             value = com.sun.star.beans.PropertyState.DIRECT_VALUE;
             r[i++]= convertPropertyValue(propEnum, outNewVal, outOldVal, value);
             r[i++]= outNewVal[0] instanceof com.sun.star.uno.Enum && outNewVal[0].equals(value);
-
+            
             // Any arguments ------------------------------------------------------------------
             value= new Any( new Type(Integer.class),new Integer(111));
             r[i++]= convertPropertyValue(propIntA, outNewVal, outOldVal, value);
@@ -1480,13 +1480,13 @@ class TestClass2 extends PropertySet
     public char charA;
     protected char charB;
     char charC;
-
+    
     int intMemberA;
-
+    
     public Character charClassA;
     protected Character charClassB;
     Character charClassC;
-
+    
     boolean test_registerProperty1()
     {
         System.out.println("registerProperty Test 1");
@@ -1496,7 +1496,7 @@ class TestClass2 extends PropertySet
         registerProperty("PropChar", new Type(char.class), (short) 0, "PropChar");
         registerProperty("PropInt", new Type(int.class), (short) 0, "PropInt");
         registerProperty("PropString", new Type(String.class), (short) 0, "PropString");
-
+        
         XPropertySetInfo info= getPropertySetInfo();
         Property[] props= info.getProperties();
         for (int j= 0; j < props.length; j++)
@@ -1524,7 +1524,7 @@ class TestClass2 extends PropertySet
             System.out.println("Ok");
         return bOk;
     }
-
+    
     boolean test_registerProperty2()
     {
         System.out.println("registerProperty Test 2");
@@ -1536,7 +1536,7 @@ class TestClass2 extends PropertySet
         registerProperty("charC", "charC", (short) 0);
         registerProperty("charClassB", "charClassB", PropertyAttribute.MAYBEVOID);
         registerProperty("IntProp", "intMemberA", (short) 0);
-
+        
         XPropertySetInfo info= getPropertySetInfo();
         Property[] props= info.getProperties();
         for (int j= 0; j < props.length; j++)
@@ -1590,7 +1590,7 @@ class TestClass2 extends PropertySet
 
 }
 
-class util
+class util 
 {
     // An Object is considered an Any with TypeClass.VOID and no value.
     static boolean anyEquals(Object val1, Object val2)
@@ -1642,7 +1642,7 @@ class util
     }
 }
 
-class Listener implements XPropertyChangeListener, XVetoableChangeListener,
+class Listener implements XPropertyChangeListener, XVetoableChangeListener, 
 XPropertiesChangeListener
 {
     int nChangeCalled;
@@ -1667,12 +1667,12 @@ XPropertiesChangeListener
          if (bVeto)
              throw new PropertyVetoException();
     }
-
+    
     public void disposing( /*IN*/EventObject Source )
     {
         nDisposingCalled++;
     }
-
+    
     public void reset()
     {
         nChangeCalled= 0;
@@ -1689,5 +1689,5 @@ XPropertiesChangeListener
         nPropertiesChange++;
         arEvt= propertyChangeEvent;
     }
-
+    
 }
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
index 483ea7382f7d..ba25567fdc45 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ import com.sun.star.lib.uno.environments.java.java_environment;
 public class ProxyProvider
 {
     static java_environment env= new java_environment(null);
-
+    
     /** Creates a new instance of ProxyProvider */
     public ProxyProvider()
     {
@@ -56,7 +56,7 @@ public class ProxyProvider
         Object retVal= null;
         if (obj == null || iface == null || iface.isInstance(obj) == false )
             return retVal;
-
+        
         Type type= new Type(TypeDescription.getTypeDescription(iface));
         Type evtType= new Type(TypeDescription.getTypeDescription(com.sun.star.lang.XEventListener.class));
         // find the object identifier
@@ -86,7 +86,7 @@ class Proxy implements IQueryInterface, XEventListener
     public String getOid() {
         return oid;
     }
-
+    
     public boolean isSame(Object object) {
         if (object instanceof IQueryInterface)
         {
@@ -99,21 +99,21 @@ class Proxy implements IQueryInterface, XEventListener
                     return false;
             }
         }
-
+        
         String oidObj = UnoRuntime.generateOid(object);
         if (oidObj.equals(oid))
             return true;
         else
             return false;
     }
-
+    
     public Object queryInterface(Type type) {
         return null;
     }
-
+    
     public void disposing(com.sun.star.lang.EventObject eventObject) {
     }
-
+    
 }
 
 
@@ -123,7 +123,7 @@ class Proxy implements IQueryInterface, XEventListener
 //    boolean _virtual;
 //    boolean _forceSynchronous;
 //    boolean _passed = true;
-//
+//    
 //    Object _xEventListenerProxy;
 //    int nDisposingCalled= 0;
 //
@@ -132,9 +132,9 @@ class Proxy implements IQueryInterface, XEventListener
 //        _virtual = virtual;
 //        _forceSynchronous = forceSynchronous;
 //        _xEventListenerProxy= evtListener;
-//
+//        
 //    }
-//
+//    
 //    public Object sendRequest(Object object,
 //    Type type,
 //    String operation,
@@ -142,7 +142,7 @@ class Proxy implements IQueryInterface, XEventListener
 //    Boolean synchron[],
 //    Boolean mustReply[]) throws Throwable
 //    {
-//
+//        
 //        Object result = null;
 //        if (operation.equals("disposing"))
 //        {
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/UnoUrlTest.java b/javaunohelper/test/com/sun/star/lib/uno/helper/UnoUrlTest.java
index 21b7734f4068..371e3d838300 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/UnoUrlTest.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/UnoUrlTest.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ public class UnoUrlTest  {
     }
 
     private void assertTrue(boolean b) {
-        if (!b)
+        if (!b) 
             fail("boolean assertion failed");
     }
 
@@ -217,7 +217,7 @@ public class UnoUrlTest  {
 
     public static void main(String args[]) {
         UnoUrlTest t = new UnoUrlTest();
-
+        
         log("Running test case 1");
         t.testStart1();
         log("Running test case 2");
@@ -230,32 +230,32 @@ public class UnoUrlTest  {
         log("Running test case 5");
         t.testParam1();
         log("Running test case 6");
-        t.testParam2();
-
+        t.testParam2();		
+        
         log("Running test case 7");
         t.testPartName1();
-
+        
         log("Running test case 8");
         t.testOID1();
-
+        
         log("Running test case 9");
         t.testOIDandParams1();
         log("Running test case 10");
         t.testOIDandParams2();
-
+        
         log("Running test case 11");
         t.testParams1();
         log("Running test case 12");
         t.testParams2();
         log("Running test case 13");
         t.testParams3();
-
+        
         log("Running test case 14");
         t.testCommon();
-
+        
         log("Running test case 15");
         t.testUTF();
         log("Running test case 16");
-        t.testUTF1();
+        t.testUTF1();				
     }
 }
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
index ad2869c239b1..d80644a4d8d2 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,18 +35,18 @@ import com.sun.star.uno.XAdapter;
 
 public class WeakBase_Test
 {
-
+    
     /** Creates a new instance of WeakBase_Test */
     public WeakBase_Test()
     {
     }
-
+    
     public boolean getTypes()
     {
         System.out.println("Testing WeakBase.getTypes");
         boolean[] r= new boolean[50];
         int i= 0;
-
+        
         SomeClass comp= new SomeClass();
         Type[] types= comp.getTypes(); //XWeak,XTypeProvider,XReference,XBridgeSupplier2
         r[i++]= types.length == 4;
@@ -62,9 +62,9 @@ public class WeakBase_Test
                 r[i++]= true;
             else
                 r[i++]= false;
-
+            
         }
-
+        
         Foo1 f1= new Foo1();
         Foo1 f2= new Foo1();
         Type[] t1= f1.getTypes();
@@ -86,11 +86,11 @@ public class WeakBase_Test
         System.out.println("Testing WeakBase.getImplementationId");
         boolean[] r= new boolean[50];
         int i= 0;
-
+        
         SomeClass comp= new SomeClass();
         // byte 0 - 3 contain hashcode and the remaining bytes represent the classname
         byte [] ar= comp.getImplementationId();
-
+        
         StringBuffer buff= new StringBuffer();
         for (int c= 0; c < ar.length - 4; c++){
             buff.append((char) ar[4 + c]);
@@ -99,7 +99,7 @@ public class WeakBase_Test
         String retStr= buff.toString();
         r[i++]= retStr.equals("com.sun.star.lib.uno.helper.SomeClass");
 //        System.out.println(buff.toString());
-
+        
         Foo1 f1= new Foo1();
         Foo1 f2= new Foo1();
         r[i++]= f1.getImplementationId().equals(f2.getImplementationId());
@@ -122,14 +122,14 @@ public class WeakBase_Test
         System.out.println("Testing WeakBase.queryAdapter, XAdapter tests");
         boolean[] r= new boolean[50];
         int i= 0;
-
+        
         SomeClass comp= new SomeClass();
         XAdapter adapter= comp.queryAdapter();
         MyRef aRef1= new MyRef();
         MyRef aRef2= new MyRef();
         adapter.addReference(aRef1);
         adapter.addReference(aRef2);
-
+        
         r[i++]= adapter.queryAdapted() == comp;
         comp= null;
         System.out.println("Wait 5 sec");
@@ -144,21 +144,21 @@ public class WeakBase_Test
             {
             }
         }
-
+        
         r[i++]= aRef1.nDisposeCalled == 1;
         r[i++]= aRef2.nDisposeCalled == 1;
         r[i++]= adapter.queryAdapted() == null;
         adapter.removeReference(aRef1); // should not do any harm
-        adapter.removeReference(aRef2);
-
+        adapter.removeReference(aRef2); 
+        
         comp= new SomeClass();
         adapter= comp.queryAdapter();
         aRef1.nDisposeCalled= 0;
         aRef2.nDisposeCalled= 0;
-
+        
         adapter.addReference(aRef1);
         adapter.addReference(aRef2);
-
+        
         adapter.removeReference(aRef1);
         System.out.println("Wait 5 sec");
         comp= null;
@@ -175,7 +175,7 @@ public class WeakBase_Test
         }
         r[i++]= aRef1.nDisposeCalled == 0;
         r[i++]= aRef2.nDisposeCalled == 1;
-
+       
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -194,7 +194,7 @@ public class WeakBase_Test
         r[i++]= test.getTypes();
         r[i++]= test.getImplementationId();
         r[i++]= test.queryAdapter();
-
+        
         boolean bOk= true;
         for (int c= 0; c < i; c++)
             bOk= bOk && r[c];
@@ -204,7 +204,7 @@ public class WeakBase_Test
             System.out.println("No errors.");
 
     }
-
+    
 }
 
 interface Aint
@@ -212,7 +212,7 @@ interface Aint
 }
 class OtherClass extends WeakBase implements XBridgeSupplier2
 {
-
+    
     public Object createBridge(Object obj, byte[] values, short param, short param3) throws com.sun.star.lang.IllegalArgumentException
     {
         return null;
@@ -221,17 +221,17 @@ class OtherClass extends WeakBase implements XBridgeSupplier2
 
 class SomeClass extends OtherClass implements Aint,XReference
 {
-
+    
     public void dispose()
     {
     }
-
+    
 }
 
 class MyRef implements XReference
 {
     int nDisposeCalled;
-
+    
     public void dispose()
     {
         nDisposeCalled++;
diff --git a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
index a444f1813c3d..89174467af02 100644
--- a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
+++ b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,13 +51,13 @@ import com.sun.star.uno.UnoRuntime;
 
 /**
  * The BridgeFactory class implements the <code>XBridgeFactory</code> Interface.
- * It wrapps the <code>UnoRuntime#getBridgeByName</code>method and delivers a
+ * It wrapps the <code>UnoRuntime#getBridgeByName</code>method and delivers a 
  * XBridge component.
  * <p>
  * This component is only usable for remote bridges.
  * <p>
- * @version     $Revision: 1.11 $ $ $Date: 2008-04-11 11:07:51 $
- * @author      Kay Ramme
+ * @version 	$Revision: 1.11 $ $ $Date: 2008-04-11 11:07:51 $
+ * @author 	    Kay Ramme
  * @see         com.sun.star.uno.UnoRuntime
  * @since       UDK1.0
  */
@@ -79,20 +79,20 @@ public class BridgeFactory implements XBridgeFactory/*, XEventListener*/ {
      * @param   regKey       the registryKey
      * @see                  com.sun.star.comp.loader.JavaLoader
      */
-    public static XSingleServiceFactory __getServiceFactory(String implName,
-                                                          XMultiServiceFactory multiFactory,
+    public static XSingleServiceFactory __getServiceFactory(String implName, 
+                                                          XMultiServiceFactory multiFactory, 
                                                           XRegistryKey regKey)
     {
         XSingleServiceFactory xSingleServiceFactory = null;
 
         if (implName.equals(BridgeFactory.class.getName()) )
             xSingleServiceFactory = FactoryHelper.getServiceFactory(BridgeFactory.class,
-                                                                    multiFactory,
+                                                                    multiFactory, 
                                                                     regKey);
-
+        
         return xSingleServiceFactory;
     }
-
+    
     /**
      * Writes the service information into the given registry key.
      * This method is called by the <code>JavaLoader</code>
@@ -114,9 +114,9 @@ public class BridgeFactory implements XBridgeFactory/*, XEventListener*/ {
      * @param    anInstanceProvider   the instance provider
      * @see                           com.sun.star.bridge.XBridgeFactory
      */
-    public XBridge createBridge(String sName, String sProtocol, XConnection aConnection, XInstanceProvider anInstanceProvider) throws
-        BridgeExistsException,
-        com.sun.star.lang.IllegalArgumentException,
+    public XBridge createBridge(String sName, String sProtocol, XConnection aConnection, XInstanceProvider anInstanceProvider) throws 
+        BridgeExistsException, 
+        com.sun.star.lang.IllegalArgumentException, 
         com.sun.star.uno.RuntimeException
     {
         boolean hasName = sName.length() != 0;
@@ -173,13 +173,13 @@ public class BridgeFactory implements XBridgeFactory/*, XEventListener*/ {
             if(xBridge != null) {
                 if(xBridge.getName().equals(sName))
                     break;
-
+                    
                 else
                     xBridge = null;
             }
         }
 
-
+        
         if(DEBUG) System.err.println("##### " + getClass().getName() + ".getBridge:" + sName + " " + xBridge);
 
         return xBridge;
diff --git a/jurt/com/sun/star/comp/connections/Acceptor.java b/jurt/com/sun/star/comp/connections/Acceptor.java
index 3df51e735a1c..2539bb528d25 100644
--- a/jurt/com/sun/star/comp/connections/Acceptor.java
+++ b/jurt/com/sun/star/comp/connections/Acceptor.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/comp/connections/Connector.java b/jurt/com/sun/star/comp/connections/Connector.java
index c02db5c52b8b..6f0f351e2893 100644
--- a/jurt/com/sun/star/comp/connections/Connector.java
+++ b/jurt/com/sun/star/comp/connections/Connector.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java b/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
index f63eeadf10d8..d3e188f3f73d 100644
--- a/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
+++ b/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,11 +38,11 @@ import com.sun.star.comp.loader.FactoryHelper;
 
 
 /**
- * The <code>ConstantInstanceProvider</code> is a component
+ * The <code>ConstantInstanceProvider</code> is a component 
  * that implements the <code>XInstanceProvider</code> Interface.
  * <p>
- * @version     $Revision: 1.3 $ $ $Date: 2008-04-11 11:08:55 $
- * @author      Kay Ramme
+ * @version 	$Revision: 1.3 $ $ $Date: 2008-04-11 11:08:55 $
+ * @author 	    Kay Ramme
  * @see         com.sun.star.bridge.XBridge
  * @see         com.sun.star.bridge.XBridgeFactory
  * @see         com.sun.star.bridge.XInstanceProvider
@@ -70,8 +70,8 @@ public class ConstantInstanceProvider implements XInstanceProvider {
      * @param   regKey       the registryKey
      * @see                  com.sun.star.comp.loader.JavaLoader
      */
-    public static XSingleServiceFactory __getServiceFactory(String implName,
-                                                            XMultiServiceFactory multiFactory,
+    public static XSingleServiceFactory __getServiceFactory(String implName, 
+                                                            XMultiServiceFactory multiFactory, 
                                                             XRegistryKey regKey)
     {
         XSingleServiceFactory xSingleServiceFactory = null;
@@ -79,12 +79,12 @@ public class ConstantInstanceProvider implements XInstanceProvider {
         if (implName.equals(ConstantInstanceProvider.class.getName()) )
             xSingleServiceFactory = FactoryHelper.getServiceFactory(ConstantInstanceProvider.class,
                                                                     __serviceName,
-                                                                    multiFactory,
+                                                                    multiFactory, 
                                                                     regKey);
-
+        
         return xSingleServiceFactory;
     }
-
+    
     /**
      * Writes the service information into the given registry key.
      * This method is called by the <code>JavaLoader</code>
diff --git a/jurt/com/sun/star/comp/connections/Implementation.java b/jurt/com/sun/star/comp/connections/Implementation.java
index 466ea9741766..05fe4c750928 100644
--- a/jurt/com/sun/star/comp/connections/Implementation.java
+++ b/jurt/com/sun/star/comp/connections/Implementation.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/comp/connections/PipedConnection.java b/jurt/com/sun/star/comp/connections/PipedConnection.java
index 630adf4e223b..ee772124e39e 100644
--- a/jurt/com/sun/star/comp/connections/PipedConnection.java
+++ b/jurt/com/sun/star/comp/connections/PipedConnection.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,8 +43,8 @@ import com.sun.star.registry.XRegistryKey;
  * It is useful for <code>Thread</code> communication
  * in one Process.
  * <p>
- * @version     $Revision: 1.3 $ $ $Date: 2008-04-11 11:09:30 $
- * @author      Kay Ramme
+ * @version 	$Revision: 1.3 $ $ $Date: 2008-04-11 11:09:30 $
+ * @author 	    Kay Ramme
  * @see         com.sun.star.connections.XConnection
  * @see         com.sun.star.loader.JavaLoader
  * @since       UDK1.0
@@ -70,8 +70,8 @@ public class PipedConnection implements XConnection {
      * @param   regKey       the registryKey
      * @see                  com.sun.star.comp.loader.JavaLoader
      */
-    public static XSingleServiceFactory __getServiceFactory(String implName,
-                                                          XMultiServiceFactory multiFactory,
+    public static XSingleServiceFactory __getServiceFactory(String implName, 
+                                                          XMultiServiceFactory multiFactory, 
                                                           XRegistryKey regKey)
     {
         XSingleServiceFactory xSingleServiceFactory = null;
@@ -79,12 +79,12 @@ public class PipedConnection implements XConnection {
         if (implName.equals(PipedConnection.class.getName()) )
             xSingleServiceFactory = FactoryHelper.getServiceFactory(PipedConnection.class,
                                                                     __serviceName,
-                                                                    multiFactory,
+                                                                    multiFactory, 
                                                                     regKey);
-
+        
         return xSingleServiceFactory;
     }
-
+    
     /**
      * Writes the service information into the given registry key.
      * This method is called by the <code>JavaLoader</code>
@@ -104,14 +104,14 @@ public class PipedConnection implements XConnection {
      */
     protected static final int __waitTime = 10000;
 
-    protected byte             _buffer[] = new byte[4096];
-    protected int              _in,
+    protected byte			   _buffer[] = new byte[4096];
+    protected int			   _in, 
                                _out;
-    protected boolean          _closed;
+    protected boolean		   _closed;
     protected PipedConnection  _otherSide;
 
     /**
-     * Constructs a new <code>PipedConnection</code>, sees if there
+     * Constructs a new <code>PipedConnection</code>, sees if there 
      * is an other side, which it should be connected to.
      * <p>
      * @param    args   Another side could be in index 0.
@@ -121,7 +121,7 @@ public class PipedConnection implements XConnection {
 
         _otherSide = (args.length == 1) ? (PipedConnection)args[0] : null;
         if(_otherSide != null) {
-            if(_otherSide == this)
+            if(_otherSide == this) 
                 throw new RuntimeException("can not connect to myself");
 
             _otherSide._otherSide = this;
@@ -129,7 +129,7 @@ public class PipedConnection implements XConnection {
     }
 
     /**
-     * This is a private method, used to cummunicate
+     * This is a private method, used to cummunicate 
      * internal in the pipe.
      */
     private synchronized void receive(byte aData[]) throws com.sun.star.io.IOException {
@@ -166,7 +166,7 @@ public class PipedConnection implements XConnection {
                 else {
                     bytes = Math.min(aData.length - bytesWritten, _buffer.length - _out - 1);
                 }
-
+                
                 System.arraycopy(aData, bytesWritten, _buffer, _out, bytes);
             }
 
@@ -262,7 +262,7 @@ public class PipedConnection implements XConnection {
     public synchronized void close() throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException {
         if(!_closed) {
             _closed = true;
-
+            
             _otherSide.close();
 
             notify();
diff --git a/jurt/com/sun/star/comp/loader/FactoryHelper.java b/jurt/com/sun/star/comp/loader/FactoryHelper.java
index 29b484631670..4bd6ef595f21 100644
--- a/jurt/com/sun/star/comp/loader/FactoryHelper.java
+++ b/jurt/com/sun/star/comp/loader/FactoryHelper.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,8 +51,8 @@ import com.sun.star.uno.Type;
  * This class has default implementations for <code>getServiceFactory</code>
  * and <code>writeRegistryServiceInfo</code>.
  * <p>
- * @version     $Revision: 1.9 $ $ $Date: 2008-04-11 11:10:09 $
- * @author      Kay Ramme
+ * @version 	$Revision: 1.9 $ $ $Date: 2008-04-11 11:10:09 $
+ * @author 	    Kay Ramme
  * @see         com.sun.star.lang.XMultiServiceFactory
  * @see         com.sun.star.lang.XServiceInfo
  * @see         com.sun.star.lang.XSingleServiceFactory
@@ -80,19 +80,19 @@ public class FactoryHelper {
 //        private static final boolean DEBUG = false;
 
         protected XMultiServiceFactory _xMultiServiceFactory;
-        protected XRegistryKey         _xRegistryKey;
+        protected XRegistryKey		   _xRegistryKey;
         protected int                  _nCode;
-        protected Constructor          _constructor;
+        protected Constructor		   _constructor;
         protected String               _implName;
         protected String               _serviceName;
         // keeps the Id for XTypeProvider
         protected static Object _mutex= new Object();
         private static byte[] _implementationId;
 
-        protected Factory(Class implClass,
-                          String serviceName,
-                          XMultiServiceFactory xMultiServiceFactory,
-                          XRegistryKey xRegistryKey)
+        protected Factory(Class implClass, 
+                          String serviceName, 
+                          XMultiServiceFactory xMultiServiceFactory, 
+                          XRegistryKey xRegistryKey) 
         {
             _xMultiServiceFactory = xMultiServiceFactory;
             _xRegistryKey         = xRegistryKey;
@@ -109,7 +109,7 @@ public class FactoryHelper {
                      && parameters[2].equals(__objectArray)) {
                     _nCode = 0;
                     _constructor = constructors[i];
-                }
+                } 
                 else if(parameters.length == 2
                      && parameters[0].equals(XComponentContext.class)
                      && parameters[1].equals(XRegistryKey.class)) {
@@ -122,7 +122,7 @@ public class FactoryHelper {
                     _nCode = 2;
                     _constructor = constructors[i];
                 }
-                else if(parameters.length == 1
+                else if(parameters.length == 1 
                      && parameters[0].equals(XComponentContext.class)) {
                     _nCode = 3;
                     _constructor = constructors[i];
@@ -134,7 +134,7 @@ public class FactoryHelper {
                      && parameters[2].equals(__objectArray)) {
                     _nCode = 4;
                     _constructor = constructors[i];
-                }
+                } 
                 else if(parameters.length == 2
                      && parameters[0].equals(XMultiServiceFactory.class)
                      && parameters[1].equals(XRegistryKey.class)) {
@@ -147,7 +147,7 @@ public class FactoryHelper {
                     _nCode = 6;
                     _constructor = constructors[i];
                 }
-                else if(parameters.length == 1
+                else if(parameters.length == 1 
                      && parameters[0].equals(XMultiServiceFactory.class)) {
                     _nCode = 7;
                     _constructor = constructors[i];
@@ -179,7 +179,7 @@ public class FactoryHelper {
                 return _xMultiServiceFactory;
             }
         }
-
+        
         // XComponentContext impl
         //______________________________________________________________________________________________
         public Object createInstanceWithContext(
@@ -220,7 +220,7 @@ public class FactoryHelper {
                 args = new Object [ 0 ];
                 break;
             }
-
+            
             try
             {
                 return _constructor.newInstance( args );
@@ -228,7 +228,7 @@ public class FactoryHelper {
             catch (InvocationTargetException invocationTargetException)
             {
                 Throwable targetException = invocationTargetException.getTargetException();
-
+                
                 if (targetException instanceof java.lang.RuntimeException)
                     throw (java.lang.RuntimeException)targetException;
                 else if (targetException instanceof com.sun.star.uno.Exception)
@@ -293,7 +293,7 @@ public class FactoryHelper {
                 args = new Object [ 0 ];
                 break;
             }
-
+            
             try
             {
                 Object instance = _constructor.newInstance( args );
@@ -311,7 +311,7 @@ public class FactoryHelper {
             catch (InvocationTargetException invocationTargetException)
             {
                 Throwable targetException = invocationTargetException.getTargetException();
-
+                
                 if (targetException instanceof java.lang.RuntimeException)
                     throw (java.lang.RuntimeException)targetException;
                 else if (targetException instanceof com.sun.star.uno.Exception)
@@ -330,15 +330,15 @@ public class FactoryHelper {
                 throw new com.sun.star.uno.Exception( instantiationException.toString() );
             }
         }
-
+        
         /**
          * Creates an instance of the desired service.
          * <p>
          * @return  returns an instance of the desired service
          * @see                  com.sun.star.lang.XSingleServiceFactory
          */
-        public Object createInstance()
-            throws com.sun.star.uno.Exception,
+        public Object createInstance() 
+            throws com.sun.star.uno.Exception, 
                    com.sun.star.uno.RuntimeException
         {
             return createInstanceWithContext( null );
@@ -348,16 +348,16 @@ public class FactoryHelper {
          * Creates an instance of the desired service.
          * <p>
          * @return  returns an instance of the desired service
-         * @param   args     the args given to the constructor of the service
+         * @param   args     the args given to the constructor of the service   
          * @see              com.sun.star.lang.XSingleServiceFactory
          */
-        public Object createInstanceWithArguments(Object[] args)
-            throws com.sun.star.uno.Exception,
-                   com.sun.star.uno.RuntimeException
+        public Object createInstanceWithArguments(Object[] args) 
+            throws com.sun.star.uno.Exception, 
+                   com.sun.star.uno.RuntimeException 
         {
             return createInstanceWithArgumentsAndContext( args, null );
         }
-
+        
          /**
          * Gives the supported services
          * <p>
@@ -394,7 +394,7 @@ public class FactoryHelper {
 
             return found;
         }
-
+        
         //XTypeProvider
         public byte[] getImplementationId()
         {
@@ -416,7 +416,7 @@ public class FactoryHelper {
                     for (int i= 0; i < nNameLength; i++)
                     {
                         _implementationId[4 + i]= arName[i];
-                    }
+                    }                   
                 }
             }
             return _implementationId;
@@ -432,7 +432,7 @@ public class FactoryHelper {
             };
             return t;
         }
-
+        
     }
 
     /**
@@ -441,13 +441,13 @@ public class FactoryHelper {
      * @deprecated as of UDK 1.0
      * <p>
      * @return  returns a factory
-     * @param   implClass     the implementing class
+     * @param   implClass     the implementing class 
      * @param   multiFactory  the given multi service factory (service manager)
      * @param   regKey        the given registry key
      * @see              com.sun.star.lang.XServiceInfo
      */
-    static public XSingleServiceFactory getServiceFactory(Class implClass,
-                                                          XMultiServiceFactory multiFactory,
+    static public XSingleServiceFactory getServiceFactory(Class implClass, 
+                                                          XMultiServiceFactory multiFactory, 
                                                           XRegistryKey regKey)
     {
         XSingleServiceFactory xSingleServiceFactory = null;
@@ -461,7 +461,7 @@ public class FactoryHelper {
             catch(NoSuchFieldException noSuchFieldExceptio) {
                 serviceName = implClass.getField("serviceName");  // old style
             }
-
+            
             xSingleServiceFactory =  new Factory(implClass, (String)serviceName.get(null), multiFactory, regKey);
         }
         catch(NoSuchFieldException noSuchFieldException) {
@@ -470,67 +470,67 @@ public class FactoryHelper {
         catch(IllegalAccessException illegalAccessException) {
             System.err.println("##### FactoryHelper.getServiceFactory - exception:" + illegalAccessException);
         }
-
+        
         return xSingleServiceFactory;
     }
-
+    
     /**
      * Creates a factory for the given class.
      * <p>
      * @return  returns a factory
-     * @param   implClass     the implementing class
+     * @param   implClass     the implementing class 
      * @param   serviceName   the service name of the implementing class
      * @param   multiFactory  the given multi service factory (service manager)
      * @param   regKey        the given registry key
      * @see              com.sun.star.lang.XServiceInfo
      */
-    static public XSingleServiceFactory getServiceFactory(Class implClass,
+    static public XSingleServiceFactory getServiceFactory(Class implClass, 
                                                           String serviceName,
-                                                          XMultiServiceFactory multiFactory,
+                                                          XMultiServiceFactory multiFactory, 
                                                           XRegistryKey regKey)
     {
         return new Factory(implClass, serviceName, multiFactory, regKey);
     }
-
+    
     /** Creates a factory for the given class.
-
+        
         @return returns a factory object
-        @param   implClass     the implementing class
+        @param   implClass     the implementing class 
     */
     static public Object createComponentFactory( Class implClass, String serviceName )
     {
         return new Factory( implClass, serviceName, null, null );
     }
-
+    
     /**
      * Writes the registration data into the registry key
      * <p>
      * @return  success
-     * @param   implName      the name of the implementing class
+     * @param   implName      the name of the implementing class 
      * @param   serviceName   the service name
      * @param   regKey        the given registry key
      * @see                    com.sun.star.lang.XServiceInfo
      */
     static public boolean writeRegistryServiceInfo(String implName, String serviceName, XRegistryKey regKey) {
         boolean result = false;
-
+        
           try {
             XRegistryKey newKey = regKey.createKey("/" + implName + "/UNO/SERVICES");
-
+           
             newKey.createKey(serviceName);
-
+            
             result = true;
           }
           catch (Exception ex) {
               System.err.println(">>>Connection_Impl.writeRegistryServiceInfo " + ex);
           }
-
+        
         return result;
     }
 
     /** Writes the registration data into the registry key.
      * Several services are supported.
-     *
+     *   
      * @param impl_name name of implementation
      * @param supported_services supported services of implementation
      * @param xKey registry key to write to
diff --git a/jurt/com/sun/star/comp/loader/JavaLoader.java b/jurt/com/sun/star/comp/loader/JavaLoader.java
index 47723b208497..2fec17bfe6d4 100644
--- a/jurt/com/sun/star/comp/loader/JavaLoader.java
+++ b/jurt/com/sun/star/comp/loader/JavaLoader.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,30 +62,30 @@ import com.sun.star.uno.AnyConverter;
  * service. Therefor the <code>JavaLoader</code> activates external UNO components which are implemented in Java.
  * The loader is used by the <code>ServiceManger</code>.
  * <p>
- * @version     $Revision: 1.16 $ $ $Date: 2008-04-11 11:10:31 $
- * @author      Markus Herzog
+ * @version 	$Revision: 1.16 $ $ $Date: 2008-04-11 11:10:31 $
+ * @author 	    Markus Herzog
  * @see         com.sun.star.loader.XImplementationLoader
  * @see         com.sun.star.loader.Java
  * @see         com.sun.star.comp.servicemanager.ServiceManager
- * @see         com.sun.star.lang.ServiceManager
+ * @see			com.sun.star.lang.ServiceManager
  * @since       UDK1.0
- */
-public class JavaLoader implements XImplementationLoader,
+ */									   
+public class JavaLoader implements XImplementationLoader, 
                                    XServiceInfo,
                                    XInitialization
 {
     private static final boolean DEBUG = false;
-
+    
     private static final void DEBUG(String dbg) {
         if (DEBUG) System.err.println( dbg );
     }
-
+    
     private static String[] supportedServices = {
         "com.sun.star.loader.Java"
     };
-
+        
     protected XMultiServiceFactory multiServiceFactory = null;
-
+    
     private XMacroExpander m_xMacroExpander = null;
     private static final String EXPAND_PROTOCOL_PREFIX = "vnd.sun.star.expand:";
 
@@ -146,51 +146,51 @@ public class JavaLoader implements XImplementationLoader,
         }
         return url;
     }
-
+    
     /** default constructor
      */
-
+     
     /**
      * Creates a new instance of the <code>JavaLoader</code> class.
      * <p>
-     * @return  new instance
+     * @return	new instance    
      */
     public JavaLoader() {}
-
+    
     /**
      * Creates a new <code>JavaLoader</code> object. The specified <code>com.sun.star.lang.XMultiServiceFactory</code>
      * is the <code>ServiceManager</code> service which can be deliviert to all components the <code>JavaLoader</code> is
-     * loading.
+     * loading. 
      * To set the <code>MultiServiceFactory</code> you can use the <code>com.sun.star.lang.XInitialization</code> interface, either.
      * <p>
-     * @return  new instance
-     * @param   factory     the <code>ServiceManager</code>
-     * @see     com.sun.star.lang.ServiceManager
-     * @see     com.sun.star.lang.ServiceManager
-     * @see     com.sun.star.lang.XInitialization
+     * @return	new instance    
+     * @param	factory		the <code>ServiceManager</code>      
+     * @see		com.sun.star.lang.ServiceManager
+     * @see		com.sun.star.lang.ServiceManager	 
+     * @see		com.sun.star.lang.XInitialization
      */
     public JavaLoader(XMultiServiceFactory factory) {
         multiServiceFactory = factory;
     }
 
     /**
-     * Unlike the original intention, the method could be called every time a new
+     * Unlike the original intention, the method could be called every time a new  
      * <code>com.sun.star.lang.XMultiServiceFactory</code> should be set at the loader.
      * <p>
-     * @param       args - the first parameter (args[0]) specifices the <code>ServiceManager</code>
-     * @see         com.sun.star.lang.XInitialization
-     * @see         com.sun.star.lang.ServiceManager
+     * @param		args - the first parameter (args[0]) specifices the <code>ServiceManager</code>		
+     * @see		    com.sun.star.lang.XInitialization
+     * @see		    com.sun.star.lang.ServiceManager
      */
-    public void initialize( java.lang.Object[] args )
-            throws com.sun.star.uno.Exception,
+    public void initialize( java.lang.Object[] args ) 
+            throws com.sun.star.uno.Exception, 
                    com.sun.star.uno.RuntimeException
-    {
+    {      
         if (args.length == 0) throw new com.sun.star.lang.IllegalArgumentException("No arguments specified");
-
+        
         try {
             multiServiceFactory = (XMultiServiceFactory) AnyConverter.toObject(
                 new Type(XMultiServiceFactory.class), args[0]);
-        }
+        } 
         catch (ClassCastException castEx) {
             throw new com.sun.star.lang.IllegalArgumentException(
                 "The argument must be an instance of XMultiServiceFactory");
@@ -201,23 +201,23 @@ public class JavaLoader implements XImplementationLoader,
      * Supplies the implementation name of the component.
      * <p>
      * @return      the implementation name - here the class name
-     * @see         com.sun.star.lang.XServiceInfo
+     * @see			com.sun.star.lang.XServiceInfo
      */
-    public String getImplementationName()
-            throws com.sun.star.uno.RuntimeException
+    public String getImplementationName() 
+            throws com.sun.star.uno.RuntimeException 
     {
         return getClass().getName();
     }
-
+    
     /**
      * Verifies if a given service is supported by the component.
      * <p>
-     * @return      true,if service is suported - otherwise false
-     * @param       serviceName     the name of the service that should be checked
-     * @see         com.sun.star.lang.XServiceInfo
+     * @return		true,if service is suported - otherwise false     
+     * @param		serviceName		the name of the service that should be checked
+     * @see			com.sun.star.lang.XServiceInfo
      */
-    public boolean supportsService(String serviceName)
-            throws com.sun.star.uno.RuntimeException
+    public boolean supportsService(String serviceName) 
+            throws com.sun.star.uno.RuntimeException 
     {
         for ( int i = 0; i < supportedServices.length; i++ ) {
             if ( supportedServices[i].equals(serviceName) )
@@ -225,50 +225,50 @@ public class JavaLoader implements XImplementationLoader,
         }
         return false;
     }
-
+    
     /**
      * Supplies a list of all service names supported by the component
      * <p>
-     * @return      a String array with all supported services
-     * @see         com.sun.star.lang.XServiceInfo
+     * @return		a String array with all supported services     
+     * @see			com.sun.star.lang.XServiceInfo
      */
-    public String[] getSupportedServiceNames()
-            throws com.sun.star.uno.RuntimeException
+    public String[] getSupportedServiceNames() 
+            throws com.sun.star.uno.RuntimeException 
     {
         return supportedServices;
     }
-
+        
     /**
      * Provides a components factory.
-     * The <code>JavaLoader</code> tries to load the class first. If a loacation URL is given the
+     * The <code>JavaLoader</code> tries to load the class first. If a loacation URL is given the 
      * RegistrationClassFinder is used to load the class. Otherwise the class is loaded thru the Class.forName
      * method.
-     * To get the factory the inspects the class for the optional static member functions __getServiceFactory resp.
+     * To get the factory the inspects the class for the optional static member functions __getServiceFactory resp. 
      * getServiceFactory (DEPRECATED).
      * If the function can not be found a default factory @see ComponentFactoryWrapper will be created.
      * <p>
-     * @return      the factory for the component (@see com.sun.star.lang.XSingleServiceFactory)
-     * @param       implementationName          the implementation (class) name of the component
-     * @param       implementationLoaderUrl     the URL of the implementation loader. Not used.
-     * @param       locationUrl                 points to an archive (JAR file) which contains a component
-     * @param       xKey
-     * @see         com.sun.star.lang.XImplementationLoader
-     * @see         com.sun.star.com.loader.RegistrationClassFinder
+     * @return		the factory for the component (@see com.sun.star.lang.XSingleServiceFactory)
+     * @param      	implementationName			the implementation (class) name of the component
+     * @param      	implementationLoaderUrl		the URL of the implementation loader. Not used.
+     * @param      	locationUrl					points to an archive (JAR file) which contains a component
+     * @param      	xKey	 					
+     * @see		   	com.sun.star.lang.XImplementationLoader
+     * @see			com.sun.star.com.loader.RegistrationClassFinder
      */
-    public java.lang.Object activate( String implementationName,
-                                      String implementationLoaderUrl,
-                                      String locationUrl,
-                                      XRegistryKey xKey )
-        throws CannotActivateFactoryException,
-               com.sun.star.uno.RuntimeException
+    public java.lang.Object activate( String implementationName, 
+                                      String implementationLoaderUrl, 
+                                      String locationUrl, 
+                                      XRegistryKey xKey ) 
+        throws CannotActivateFactoryException, 
+               com.sun.star.uno.RuntimeException              
     {
         locationUrl = expand_url( locationUrl );
-
+        
         Object returnObject  = null;
         Class clazz = null;
-
+        
         DEBUG("try to get factory for " + implementationName);
-
+        
         // first we must get the class of the implementation
         // 1. If a location URL is given it is assumed that this points to a JAR file.
         //    The components class name is stored in the manifest file.
@@ -283,7 +283,7 @@ public class JavaLoader implements XImplementationLoader,
             else {
                 // 2.
                 clazz = Class.forName( implementationName );
-            }
+            }	
         }
         catch (java.net.MalformedURLException e) {
             CannotActivateFactoryException cae = new CannotActivateFactoryException(
@@ -312,10 +312,10 @@ public class JavaLoader implements XImplementationLoader,
             cae.fillInStackTrace();
             throw cae;
         }
-
-        Class[] paramTypes = {String.class, XMultiServiceFactory.class, XRegistryKey.class};
+        
+        Class[] paramTypes = {String.class, XMultiServiceFactory.class, XRegistryKey.class};				                    		
         Object[] params = { implementationName, multiServiceFactory, xKey };
-
+        
         // try to get factory from implemetation class
         // latest style: use the public static method __getComponentFactory
         // - new style: use the public static method __getServiceFactory
@@ -327,23 +327,23 @@ public class JavaLoader implements XImplementationLoader,
              compfac_method = clazz.getMethod(
                 "__getComponentFactory", new Class [] { String.class } );
         }
-        catch ( NoSuchMethodException noSuchMethodEx) {}
+        catch ( NoSuchMethodException noSuchMethodEx) {} 
         catch ( SecurityException secEx) {}
-
+        
         Method method = null;
         if (null == compfac_method)
         {
             try {
                 method = clazz.getMethod("__getServiceFactory", paramTypes);
-            }
+            } 
             catch ( NoSuchMethodException noSuchMethodEx) {
                 method = null;
-            }
+            } 
             catch ( SecurityException secEx) {
                 method = null;
             }
         }
-
+        
         try {
             if (null != compfac_method)
             {
@@ -360,35 +360,35 @@ public class JavaLoader implements XImplementationLoader,
                 if ( method == null ) {
                     method = clazz.getMethod("getServiceFactory", paramTypes);
                 }
-
+                
                 Object oRet = method.invoke(clazz, params);
-
+                
                 if ( (oRet != null) && (oRet instanceof XSingleServiceFactory) ) {
-                    returnObject = (XSingleServiceFactory) oRet;
+                    returnObject = (XSingleServiceFactory) oRet;						
                 }
             }
         }
         catch ( NoSuchMethodException e) {
-            throw new CannotActivateFactoryException("Can not activate the factory for "
+            throw new CannotActivateFactoryException("Can not activate the factory for " 
                         + implementationName + " because " + e.toString() );
-        }
+        } 
         catch ( SecurityException e) {
-            throw new CannotActivateFactoryException("Can not activate the factory for "
+            throw new CannotActivateFactoryException("Can not activate the factory for " 
                         + implementationName + " because " + e.toString() );
         }
         catch ( IllegalAccessException e ) {
-            throw new CannotActivateFactoryException("Can not activate the factory for "
+            throw new CannotActivateFactoryException("Can not activate the factory for " 
                         + implementationName + " because " + e.toString() );
         }
         catch ( IllegalArgumentException e ) {
-            throw new CannotActivateFactoryException("Can not activate the factory for "
+            throw new CannotActivateFactoryException("Can not activate the factory for " 
                         + implementationName + " because " + e.toString() );
         }
         catch ( InvocationTargetException e ) {
-            throw new CannotActivateFactoryException("Can not activate the factory for "
+            throw new CannotActivateFactoryException("Can not activate the factory for " 
                         + implementationName + " because " + e.getTargetException().toString() );
         }
-
+        
         return returnObject;
     }
 
@@ -397,24 +397,24 @@ public class JavaLoader implements XImplementationLoader,
      * methods __writeRegistryServiceInfo, writeRegistryServiceInfo (DEPRECATED), the call is delegated to that
      * method. Otherwise a default registration will be accomplished.
      * <p>
-     * @return      true if registration is successfully - otherwise false
-     * @param       regKey                  the root key under that the component should be registred.
-     * @param       implementationLoaderUrl specifies the loader, the component is loaded by.
-     * @param       locationUrl             points to an archive (JAR file) which contains a component
-     * @see         ComponentFactoryWrapper
+     * @return		true if registration is successfully - otherwise false
+     * @param		regKey					the root key under that the component should be registred.
+     * @param		implementationLoaderUrl	specifies the loader, the component is loaded by.
+     * @param		locationUrl				points to an archive (JAR file) which contains a component
+     * @see 		ComponentFactoryWrapper
      */
-    public boolean writeRegistryInfo( XRegistryKey regKey,
-                                      String implementationLoaderUrl,
+    public boolean writeRegistryInfo( XRegistryKey regKey, 
+                                      String implementationLoaderUrl, 
                                       String locationUrl )
-            throws CannotRegisterImplementationException,
+            throws CannotRegisterImplementationException, 
                    com.sun.star.uno.RuntimeException
     {
         locationUrl = expand_url( locationUrl );
-
-        boolean success = false;
-
+        
+        boolean success = false;		
+        
         try {
-
+            
             Class clazz = RegistrationClassFinder.find(locationUrl);
             if (null == clazz)
             {
@@ -426,57 +426,57 @@ public class JavaLoader implements XImplementationLoader,
             Object[] params = { regKey };
 
             Method method  = clazz.getMethod("__writeRegistryServiceInfo", paramTypes);
-            Object oRet = method.invoke(clazz, params);
+            Object oRet = method.invoke(clazz, params);		    
 
             if ( (oRet != null) && (oRet instanceof Boolean) )
                 success = ((Boolean) oRet).booleanValue();
-        }
+        }	
         catch (Exception e) {
             throw new CannotRegisterImplementationException( e.getMessage());
          }
-
+        
         return success;
     }
-
+    
     /**
      * Supplies the factory for the <code>JavaLoader</code>
      * <p>
-     * @return  the factory for the <code>JavaLoader</code>
-     * @param   implName        the name of the desired component
-     * @param   multiFactory    the <code>ServiceManager</code> is delivered to the factory
-     * @param   regKey          not used - can be null
+     * @return	the factory for the <code>JavaLoader</code>     
+     * @param	implName		the name of the desired component
+     * @param   multiFactory	the <code>ServiceManager</code> is delivered to the factory
+     * @param   regKey			not used - can be null
      */
-    public static XSingleServiceFactory getServiceFactory( String implName,
-                                                           XMultiServiceFactory multiFactory,
+    public static XSingleServiceFactory getServiceFactory( String implName, 
+                                                           XMultiServiceFactory multiFactory, 
                                                            XRegistryKey regKey)
-    {
+    {	     
         if ( implName.equals(JavaLoader.class.getName()) )
             return new JavaLoaderFactory( multiFactory );
-
+        
         return null;
     }
-
+    
     /**
      * Registers the <code>JavaLoader</code> at the registry.
      * <p>
      * @return     true if registration succseeded - otherwise false
-     * @param      regKey   root key under which the <code>JavaLoader</code> should be regidstered
+     * @param      regKey	root key under which the <code>JavaLoader</code> should be regidstered
      */
     public static boolean writeRegistryServiceInfo(XRegistryKey regKey) {
         boolean result = false;
-
+        
         try {
             XRegistryKey newKey = regKey.createKey("/" + JavaLoader.class.getName() + "/UNO/SERVICE");
-
+           
             for (int i=0; i<supportedServices.length; i++)
                 newKey.createKey(supportedServices[i]);
-
+            
             result = true;
         }
         catch (Exception ex) {
             if (DEBUG) System.err.println(">>>JavaLoader.writeRegistryServiceInfo " + ex);
         }
-
+        
         return result;
     }
 }
diff --git a/jurt/com/sun/star/comp/loader/JavaLoaderFactory.java b/jurt/com/sun/star/comp/loader/JavaLoaderFactory.java
index 22981f2081e3..f3f6de9e6637 100644
--- a/jurt/com/sun/star/comp/loader/JavaLoaderFactory.java
+++ b/jurt/com/sun/star/comp/loader/JavaLoaderFactory.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,51 +40,51 @@ public class JavaLoaderFactory implements XSingleServiceFactory, XServiceInfo {
     };
 
     private static final boolean DEBUG = false;
-
+    
     private static final void DEBUG(String dbg) {
         if (DEBUG)
             System.err.println(" >>> JavaLoaderFactory - " + dbg);
     }
-
+        
     protected XMultiServiceFactory multiServiceFactory = null;
-
+    
     /** default constructor
      */
-//      public JavaLoaderFactory() {}
-
+//  	public JavaLoaderFactory() {}
+    
     public JavaLoaderFactory(XMultiServiceFactory factory) {
         multiServiceFactory = factory;
     }
-
-    public java.lang.Object createInstance()
-            throws com.sun.star.uno.Exception,
+    
+    public java.lang.Object createInstance() 
+            throws com.sun.star.uno.Exception, 
                    com.sun.star.uno.RuntimeException
     {
         return new JavaLoader(multiServiceFactory);
     }
 
-    public java.lang.Object createInstanceWithArguments( java.lang.Object[] args )
-            throws com.sun.star.uno.Exception,
+    public java.lang.Object createInstanceWithArguments( java.lang.Object[] args ) 
+            throws com.sun.star.uno.Exception, 
                    com.sun.star.uno.RuntimeException
     {
         JavaLoader loader = new JavaLoader();
         loader.initialize(args);
-
+        
         return loader;
     }
-
+    
     /** implements the XServiceInfo interface
      */
-    public String getImplementationName()
-            throws com.sun.star.uno.RuntimeException
+    public String getImplementationName() 
+            throws com.sun.star.uno.RuntimeException 
     {
         return JavaLoader.class.getName();
     }
-
+    
     /** implements the XServiceInfo interface
      */
-    public boolean supportsService(String serviceName)
-            throws com.sun.star.uno.RuntimeException
+    public boolean supportsService(String serviceName) 
+            throws com.sun.star.uno.RuntimeException 
     {
         for ( int i = 0; i < supportedServices.length; i++ ) {
             if ( supportedServices[i].equals(serviceName) )
@@ -92,11 +92,11 @@ public class JavaLoaderFactory implements XSingleServiceFactory, XServiceInfo {
         }
         return false;
     }
-
+    
     /** implements the XServiceInfo interface
      */
-    public String[] getSupportedServiceNames()
-            throws com.sun.star.uno.RuntimeException
+    public String[] getSupportedServiceNames() 
+            throws com.sun.star.uno.RuntimeException 
     {
         return supportedServices;
     }
diff --git a/jurt/com/sun/star/comp/loader/RegistrationClassFinder.java b/jurt/com/sun/star/comp/loader/RegistrationClassFinder.java
index 3a40daab866b..e3c3190e9139 100644
--- a/jurt/com/sun/star/comp/loader/RegistrationClassFinder.java
+++ b/jurt/com/sun/star/comp/loader/RegistrationClassFinder.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
index 3d672c6dfddf..cb60885443e0 100644
--- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
+++ b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -58,8 +58,8 @@ import java.lang.reflect.InvocationTargetException;
  * calls to the implementing objects and are used instead of casts
  * and identity comparisons.
  * <p>
- * @version     $Revision: 1.10 $ $ $Date: 2008-04-11 11:11:46 $
- * @author      Markus Herzog
+ * @version 	$Revision: 1.10 $ $ $Date: 2008-04-11 11:11:46 $
+ * @author 	    Markus Herzog
  * @see         com.sun.star.lang.XMultiServiceFactory
  * @see         com.sun.star.container.XSet
  * @see         com.sun.star.container.XContentEnumerationAccess
@@ -67,21 +67,21 @@ import java.lang.reflect.InvocationTargetException;
  * @see         com.sun.star.lang.XServiceInfo
  * @see         com.sun.star.lang.XInitialization
  * @since       UDK1.0
- */
+ */									   
 public class ServiceManager implements XMultiServiceFactory,
-                                       XMultiComponentFactory,
-                                       XSet,
-                                       XContentEnumerationAccess,
-                                       XComponent,
+                                       XMultiComponentFactory, 
+                                       XSet, 
+                                       XContentEnumerationAccess, 
+                                       XComponent, 
                                        XServiceInfo,
                                        XInitialization
 {
     private static final boolean DEBUG = false;
-
+    
     private static final void DEBUG (String dbg) {
         if (DEBUG) System.err.println( dbg );
     }
-
+    
     private static com.sun.star.uno.Type UNO_TYPE = null;
 
     XImplementationLoader loader = null;
@@ -93,10 +93,10 @@ public class ServiceManager implements XMultiServiceFactory,
 
     java.util.Vector    eventListener;
     java.util.Hashtable factoriesByImplNames;
-    java.util.Hashtable factoriesByServiceNames;  // keys:
-
+    java.util.Hashtable factoriesByServiceNames;  // keys: 
+    
     private com.sun.star.uno.XComponentContext m_xDefaultContext;
-
+    
     /**
      * Creates a new instance of the <code>ServiceManager</code>.
      */
@@ -115,77 +115,77 @@ public class ServiceManager implements XMultiServiceFactory,
         factoriesByServiceNames = new java.util.Hashtable();
         m_xDefaultContext = xContext;
     }
-
+    
     /**
-     * Returns the service factory for the <code>ServiceManager</code>. If the given implementation name
+     * Returns the service factory for the <code>ServiceManager</code>. If the given implementation name 
      * does not equal to the <code>ServiceManagers</code> class name null will be returned.
      * <p>
      * @return     the factory for the <code>ServiceManager</code>.
-     * @param      implName     the implementation name of the of the service.
+     * @param      implName		the implementation name of the of the service. 
      *                          Must be equal to <code>com.sun.star.comp.servicemanager.ServicManager</code>
-     * @param      multiFactory refernce of the <code>MultiServiceFactory</code>. This parameter will be ignored.
-     * @param      regKey       the root key of the registry. This parameter will be ignored.
+     * @param	   multiFactory	refernce of the <code>MultiServiceFactory</code>. This parameter will be ignored.
+     * @param	   regKey		the root key of the registry. This parameter will be ignored. 	
      */
-      public static XSingleServiceFactory getServiceFactory( String implName,
-                                                           XMultiServiceFactory multiFactory,
+      public static XSingleServiceFactory getServiceFactory( String implName, 
+                                                           XMultiServiceFactory multiFactory, 
                                                            XRegistryKey regKey)
-    {
+    {	     
         if ( implName.equals(ServiceManager.class.getName()) )
             return new ServiceManagerFactory();
-
+        
         return null;
     }
 
-
+    
     /**
      * Supplies a Java component loader. The loader component must be enlisted at the <code>ServiceManager</code> before.
      * <p>
-     * @return      a new instance of the Java component loader
-     * @see         com.sun.star.loader.Java
-     */
-    private XImplementationLoader getLoader()
-                throws  com.sun.star.uno.Exception,
+     * @return		a new instance of the Java component loader
+     * @see			com.sun.star.loader.Java 
+     */  	
+    private XImplementationLoader getLoader() 
+                throws 	com.sun.star.uno.Exception,
                           com.sun.star.uno.RuntimeException
     {
-        Object[] param = { this };
-        DEBUG("make loader");
+        Object[] param = { this };                        
+        DEBUG("make loader");            
         Object loaderObj = createInstanceWithArgumentsAndContext(
             "com.sun.star.loader.Java", param, m_xDefaultContext );
-
+        
         if (loaderObj == null)
             throw new com.sun.star.uno.Exception("Can get an instance of com.sun.star.loader.Java");
-
+            
         return UnoRuntime.queryInterface( XImplementationLoader.class, loaderObj );
     }
 
     /**
      * Registers a list of components given by their class names.
-     * <p>
-     * @param   newImpls    list of the components that should be registered, given by their class names.
-     *                      If any exception occured during the registration, the process will be canceled.
-     * @see     com.sun.star.container.XSet
+     * <p> 
+     * @param 	newImpls	list of the components that should be registered, given by their class names.
+     *						If any exception occured during the registration, the process will be canceled.
+     * @see 	com.sun.star.container.XSet
      */
-    private void xaddFactories( String[] newImpls )
+    private void xaddFactories( String[] newImpls ) 
                     throws com.sun.star.uno.Exception
     {
-        for (int i=0; i<newImpls.length; i++) {
+        for (int i=0; i<newImpls.length; i++) {               
             DEBUG ("try to add " + newImpls[i] );
             Object newFactory = null;
-
+            
             try {
                 if (loader == null)
                     loader = getLoader();
-
+                
                 newFactory = loader.activate( newImpls[i], null, null, null );
-            }
+            } 
             catch (com.sun.star.uno.Exception e) {
-
+                
 //****************************** BEGIN DEPRECATED ******************************************
-
+                
                 try {
                     // try to get the class of the implementation
                     Class clazz = Class.forName( newImpls[i] );
-
+                    
                     Class[] methodClassParam = { String.class, XMultiServiceFactory.class, XRegistryKey.class };
                     java.lang.reflect.Method getFactoryMeth = null;
                     try {
@@ -197,12 +197,12 @@ public class ServiceManager implements XMultiServiceFactory,
                     catch (SecurityException securityExc) {
                         getFactoryMeth = null;
                     }
-
+                    
                     if (getFactoryMeth == null)
                         getFactoryMeth = clazz.getMethod("getServiceFactory", methodClassParam);
-
-                    Object[] methodParams = { newImpls[i], this, null };
-                    newFactory = getFactoryMeth.invoke( clazz, methodParams );
+    
+                    Object[] methodParams = { newImpls[i], this, null };                                 
+                    newFactory = getFactoryMeth.invoke( clazz, methodParams );                          
                 }
                 catch (NoSuchMethodException ex) {}
                 catch (SecurityException ex) {}
@@ -210,13 +210,13 @@ public class ServiceManager implements XMultiServiceFactory,
                 catch (IllegalAccessException ex) {}
                 catch (IllegalArgumentException ex) {}
                 catch (InvocationTargetException ex) {}
-
+                
 //****************************** END DEPRECATED ******************************************
             }
-
+            
             if ( newFactory == null )
                 throw new com.sun.star.loader.CannotActivateFactoryException("Can not get factory for " +  newImpls[i]);
-
+            
             insert( newFactory );
         } // end of for ...
     }
@@ -225,13 +225,13 @@ public class ServiceManager implements XMultiServiceFactory,
      * The method is used to add components to the <code>ServiceManager</code>. The first argument indicates a <code>SimpleRegistry</code>.
      * The components which should be added will be searched under the <i>Implementations</i> key in the registry.
      * <p>
-     * @param   args    the first argument ( args[0] ) specifices the SimpleRegistry object
-     * @see     com.sun.star.lang.XInitialization
-     * @see     com.sun.star.lang.RegistryServiceManager
-     * @see     com.sun.star.lang.XSimpleRegistry
+     * @param 	args	the first argument ( args[0] ) specifices the SimpleRegistry object
+     * @see		com.sun.star.lang.XInitialization
+     * @see		com.sun.star.lang.RegistryServiceManager
+     * @see		com.sun.star.lang.XSimpleRegistry
      */
-    public void initialize( Object args[] )
-                throws  com.sun.star.uno.Exception,
+    public void initialize( Object args[] ) 
+                throws 	com.sun.star.uno.Exception, 
                         com.sun.star.uno.RuntimeException {
         XSimpleRegistry xSimpleRegistry = null;
         try {
@@ -239,17 +239,17 @@ public class ServiceManager implements XMultiServiceFactory,
             if (xSimpleRegistry != null)
             {
                 XRegistryKey rootkey = xSimpleRegistry.getRootKey();
-
+                
                 XRegistryKey implkey_xRegistryKey = rootkey.openKey("Implementations");
                 if(implkey_xRegistryKey != null) {
                     XRegistryKey xRegistryKeys[] = implkey_xRegistryKey.openKeys();
-
+                    
                     for(int i = 0; i < xRegistryKeys.length; ++ i) {
                         xaddFactories(new String[]{xRegistryKeys[i].getStringValue()});
                     }
                 }
             }
-
+            
             if (args.length > 1)
             {
                 m_xDefaultContext = (XComponentContext)args[ 1 ];
@@ -260,29 +260,29 @@ public class ServiceManager implements XMultiServiceFactory,
             throw new com.sun.star.lang.IllegalArgumentException("Argument must not be null.");
         }
     }
-
+    
     /**
-     * Creates a new instance of a specified service. Therefor the associated factory of the service is
+     * Creates a new instance of a specified service. Therefor the associated factory of the service is 
      * looked up and used to instanciate a new component.
      * <p>
-     * @return  newly created component
-     * @param   serviceSpecifier    indicates the service or component name
-     * @see     com.sun.star.lang.XMultiServiceFactory
+     * @return	newly created component
+     * @param	serviceSpecifier 	indicates the service or component name
+     * @see		com.sun.star.lang.XMultiServiceFactory
      */
-    public java.lang.Object createInstance( String serviceSpecifier )
-            throws com.sun.star.uno.Exception,
+    public java.lang.Object createInstance( String serviceSpecifier ) 
+            throws com.sun.star.uno.Exception, 
                    com.sun.star.uno.RuntimeException
     {
         return createInstanceWithContext( serviceSpecifier, m_xDefaultContext );
     }
-
+    
     /**
-     * Creates a new instance of a specified service with the given parameters.
+     * Creates a new instance of a specified service with the given parameters. 
      * Therefor the associated factory of the service is  looked up and used to instanciate a new component.
      * <p>
-     * @return  newly created component
-     * @param   serviceSpecifier    indicates the service or component name
-     * @see     com.sun.star.lang.XMultiServiceFactory
+     * @return	newly created component
+     * @param	serviceSpecifier 	indicates the service or component name
+     * @see		com.sun.star.lang.XMultiServiceFactory
      */
     public java.lang.Object createInstanceWithArguments(
         String serviceSpecifier, Object[] args )
@@ -290,52 +290,52 @@ public class ServiceManager implements XMultiServiceFactory,
     {
         if (DEBUG) {
             System.err.println("createInstanceWithArguments:" );
-
+            
             for (int i=0; i<args.length; i++)
                 System.err.print(" "+ args[i]);
-
+            
             System.err.println();
         }
-
+        
         return createInstanceWithArgumentsAndContext( serviceSpecifier, args, m_xDefaultContext );
     }
-
+    
     /**
      * Look up the factory for a given service or implementation name.
      * First the requested service name is search in the list of avaible services. If it can not be found
-     * the name is looked up in the the implementation list.
+     * the name is looked up in the the implementation list. 
      * <p>
-     * @return  the factory of the service / implementation
-     * @param   serviceSpecifier    indicates the service or implementation name
-     * @see     com.sun.star.lang.XMultiServiceFactory
+     * @return	the factory of the service / implementation
+     * @param	serviceSpecifier 	indicates the service or implementation name
+     * @see		com.sun.star.lang.XMultiServiceFactory
      */
     private Object queryServiceFactory(String serviceName)
-            throws com.sun.star.uno.Exception,
+            throws com.sun.star.uno.Exception, 
                    com.sun.star.uno.RuntimeException
     {
         DEBUG("queryServiceFactory for name " + serviceName );
         Object factory = null;
-
+                
         if ( factoriesByServiceNames.containsKey( serviceName ) ) {
             java.util.Vector aviableFact = (java.util.Vector) factoriesByServiceNames.get( serviceName );
-
+            
             DEBUG("");
             DEBUG("aviable factories for " + serviceName +" "+ aviableFact);
             DEBUG("");
-
+            
             if ( !aviableFact.isEmpty() )
                 factory = aviableFact.lastElement();
-
+            
         } else // not found in list of services - now try the implementations
             factory = factoriesByImplNames.get( serviceName ); // return null if none is aviable
-
+       
         if (DEBUG) {
             if (factory == null) System.err.println("service not registered");
             else
                 System.err.println("service found:" + factory + " " + UnoRuntime.queryInterface(XSingleServiceFactory.class, factory));
         }
-
-        if (factory == null)
+        
+        if (factory == null) 
             throw new com.sun.star.uno.Exception("Query for service factory for " + serviceName + " failed.");
 
         return factory;
@@ -344,20 +344,20 @@ public class ServiceManager implements XMultiServiceFactory,
     /**
      * Supplies a list of all avialable services names.
      * <p>
-     * @return  list of Strings of all service names
-     * @see     com.sun.star.container.XContentEnumerationAccess
-     */
-    public String[] getAvailableServiceNames()
-            throws com.sun.star.uno.RuntimeException
+     * @return 	list of Strings of all service names
+     * @see 	com.sun.star.container.XContentEnumerationAccess
+     */ 
+    public String[] getAvailableServiceNames() 
+            throws com.sun.star.uno.RuntimeException 
     {
         int i = 0;
         String[] availableServiceNames = new String[factoriesByServiceNames.size()];
-
+        
         java.util.Enumeration keys = factoriesByServiceNames.keys();
-
+        
         while (keys.hasMoreElements())
             availableServiceNames[i++] = (String) keys.nextElement();
-
+        
         return availableServiceNames;
     }
 
@@ -446,47 +446,47 @@ public class ServiceManager implements XMultiServiceFactory,
         return null;
     }
 //      public String[] getAvailableServiceNames();
-
+    
     /**
      * Removes all listeners from the <code>ServiceManager</code> and clears the list of the services.
      * <p>
-     * @see com.sun.star.lang.XComponent
+     * @see	com.sun.star.lang.XComponent
      */
-    public void dispose()
+    public void dispose() 
         throws com.sun.star.uno.RuntimeException
     {
         if (eventListener != null) {
             java.util.Enumeration enumer = eventListener.elements();
-
+            
             while (enumer.hasMoreElements()) {
                 XEventListener listener = (XEventListener) enumer.nextElement();
                 listener.disposing(new com.sun.star.lang.EventObject(this));
             }
         }
-
+        
         eventListener.removeAllElements();
-        factoriesByServiceNames.clear();
+        factoriesByServiceNames.clear();        
         factoriesByImplNames.clear();
     }
 
     /**
-     * Adds a new <code>EventListener</code>. The listener is notified when a
-     * service is added (removed) to (from) the <code>ServiceManager</code>.
-     * If the listener is already registred a
+     * Adds a new <code>EventListener</code>. The listener is notified when a 
+     * service is added (removed) to (from) the <code>ServiceManager</code>. 
+     * If the listener is already registred a 
      * <code>com.sun.star.uno.RuntimeException</code> will be thrown.
      * <p>
-     * @param   xListener   the new listener which should been added.
-     * @see     com.sun.star.lang.XComponent
+     * @param 	xListener	the new listener which should been added.
+     * @see		com.sun.star.lang.XComponent
      */
-    public void addEventListener( XEventListener xListener )
+    public void addEventListener( XEventListener xListener ) 
             throws com.sun.star.uno.RuntimeException
     {
         if (xListener == null)
             throw new com.sun.star.uno.RuntimeException("Listener must not be null");
-
+  
           if ( eventListener.contains(xListener) )
-              throw new com.sun.star.uno.RuntimeException("Listener already registred.");
-
+              throw new com.sun.star.uno.RuntimeException("Listener already registred.");      	
+            
            eventListener.addElement(xListener);
     }
 
@@ -495,158 +495,158 @@ public class ServiceManager implements XMultiServiceFactory,
      * If the listener is not registered a <code>com.sun.star.uno.RuntimeException</code>
      * will be thrown.
      * <p>
-     * @param   xListener   the new listener which should been removed.
-     * @see com.sun.star.lang.XComponent
+     * @param 	xListener	the new listener which should been removed.
+     * @see	com.sun.star.lang.XComponent
      */
-    public void removeEventListener( XEventListener xListener )
+    public void removeEventListener( XEventListener xListener ) 
             throws com.sun.star.uno.RuntimeException
     {
         if (xListener == null)
             throw new com.sun.star.uno.RuntimeException("Listener must not be null");
-
+  
           if ( !eventListener.contains(xListener) )
-              throw new com.sun.star.uno.RuntimeException("Listener is not registered.");
-
-        eventListener.removeElement(xListener);
+              throw new com.sun.star.uno.RuntimeException("Listener is not registered.");      	
+            
+        eventListener.removeElement(xListener);	
     }
 
     /**
      * Checks if a component is registered at the <code>ServiceManager</code>. The given object argument must
      * provide a <code>XServiceInfo</code> interface.
      * <p>
-     * @return  true if the component is registred otherwise false.
-     * @param   object object which provides a <code>XServiceInfo</code> interface.
-     * @see     com.sun.star.container.XSet
-     * @see     com.sun.star.lang.XServiceInfo
+     * @return 	true if the component is registred otherwise false. 
+     * @param	object object which provides a <code>XServiceInfo</code> interface.
+     * @see		com.sun.star.container.XSet
+     * @see		com.sun.star.lang.XServiceInfo
      */
-    public boolean has( Object object )
+    public boolean has( Object object ) 
         throws com.sun.star.uno.RuntimeException
     {
-            if (object == null)
+            if (object == null) 
                 throw new com.sun.star.uno.RuntimeException("The parameter must not been null");
-
+            
             XServiceInfo xServiceInfo = UnoRuntime.queryInterface(XServiceInfo.class, object);
-
+            
             if (xServiceInfo != null) {
                 return UnoRuntime.areSame(factoriesByImplNames.get(xServiceInfo.getImplementationName()), object);
-            }
-
+            }   
+        
         return false;
     }
 
     /**
      * Adds a <code>SingleServiceFactory</code> to the <code>ServiceManager</code>.
      * <p>
-     * @param   object  factory which should be added.
+     * @param	object	factory which should be added.
      * @see com.sun.star.container.XSet
-     * @see com.sun.star.lang.XSingleServiceFactory
+     * @see	com.sun.star.lang.XSingleServiceFactory
      */
-    public void insert( Object object )
-        throws com.sun.star.lang.IllegalArgumentException,
-               com.sun.star.container.ElementExistException,
+    public void insert( Object object ) 
+        throws com.sun.star.lang.IllegalArgumentException, 
+               com.sun.star.container.ElementExistException, 
                com.sun.star.uno.RuntimeException
     {
         if (object == null) throw new com.sun.star.lang.IllegalArgumentException();
-
-        XServiceInfo xServiceInfo =
+        
+        XServiceInfo xServiceInfo = 
                 UnoRuntime.queryInterface(XServiceInfo.class, object);
-
-        if (xServiceInfo == null)
+        
+        if (xServiceInfo == null) 
             throw new com.sun.star.lang.IllegalArgumentException(
                 "The given object does not implement the XServiceInfo interface."
             );
-
+            
         if ( factoriesByImplNames.containsKey( xServiceInfo.getImplementationName() ) ) {
             throw new com.sun.star.container.ElementExistException(
                 xServiceInfo.getImplementationName() + " already registred"
             );
         }
-
+        
         DEBUG("add factory " + object.toString() + " for " + xServiceInfo.getImplementationName());
         factoriesByImplNames.put( xServiceInfo.getImplementationName(), object );
-
-
+        
+            
         String[] serviceNames = xServiceInfo.getSupportedServiceNames();
         java.util.Vector vec = null;
-
-        for (int i=0; i<serviceNames.length; i++) {
+            
+        for (int i=0; i<serviceNames.length; i++) {                
             if ( !factoriesByServiceNames.containsKey( serviceNames[i] ) ) {
                 DEBUG("> no registered services found under " + serviceNames[i] + ": adding..." );
                 factoriesByServiceNames.put(serviceNames[i], new java.util.Vector());
             }
-
-            vec = (java.util.Vector) factoriesByServiceNames.get( serviceNames[i] );
-
+                
+            vec = (java.util.Vector) factoriesByServiceNames.get( serviceNames[i] );                                                  
+            
             if ( vec.contains( object ) )
                 System.err.println("The implementation " + xServiceInfo.getImplementationName() +
                     " already registered for the service " + serviceNames[i] + " - ignoring!");
-            else
-                vec.addElement(object);
-        }
+            else                
+                vec.addElement(object); 
+        }        
     }
 
     /**
      * Removes a <code>SingleServiceFactory</code> from the <code>ServiceManager</code>.
      * <p>
-     * @param   object  factory which should be removed.
+     * @param	object	factory which should be removed.
      * @see com.sun.star.container.XSet
-     * @see com.sun.star.lang.XSingleServiceFactory
+     * @see	com.sun.star.lang.XSingleServiceFactory
      */
-    public void remove( Object object )
-        throws com.sun.star.lang.IllegalArgumentException,
-               com.sun.star.container.NoSuchElementException,
+    public void remove( Object object ) 
+        throws com.sun.star.lang.IllegalArgumentException, 
+               com.sun.star.container.NoSuchElementException, 
                com.sun.star.uno.RuntimeException
     {
-        if (object == null)
+        if (object == null) 
             throw new com.sun.star.lang.IllegalArgumentException(
                     "The given object must not be null."
             );
-
-        XServiceInfo xServiceInfo =
+        
+        XServiceInfo xServiceInfo = 
             UnoRuntime.queryInterface(XServiceInfo.class, object);
-
+        
         if (xServiceInfo == null)
             throw new com.sun.star.lang.IllegalArgumentException(
                     "The given object does not implement the XServiceInfo interface."
             );
-
-        XSingleServiceFactory xSingleServiceFactory =
+        
+        XSingleServiceFactory xSingleServiceFactory = 
             UnoRuntime.queryInterface(XSingleServiceFactory.class, object);
-
-        if (xSingleServiceFactory == null)
+        
+        if (xSingleServiceFactory == null) 
             throw new com.sun.star.lang.IllegalArgumentException(
                     "The given object does not implement the XSingleServiceFactory interface."
             );
-
+        
         if ( factoriesByImplNames.remove( xServiceInfo.getImplementationName() ) == null )
             throw new com.sun.star.container.NoSuchElementException(
-                    xServiceInfo.getImplementationName() +
+                    xServiceInfo.getImplementationName() + 
                     " is not registered as an implementation."
             );
-
+        
         String[] serviceNames = xServiceInfo.getSupportedServiceNames();
-
+        
         for ( int i=0; i<serviceNames.length; i++ ) {
             if ( factoriesByServiceNames.containsKey( serviceNames[i] ) ) {
                 java.util.Vector vec = (java.util.Vector) factoriesByServiceNames.get(serviceNames[i]);
-
-                if ( !vec.removeElement(object) )
+                
+                if ( !vec.removeElement(object) ) 
                     System.err.println("The implementation " + xServiceInfo.getImplementationName() +
                         " is not registered for the service " + serviceNames[i] + " - ignoring!");
-
+                
                 if ( vec.isEmpty() ) // remove the vector if no implementations aviable for the service
-                    factoriesByServiceNames.remove( serviceNames[i] );
-            }
+                    factoriesByServiceNames.remove( serviceNames[i] );   
+            }                    
         }
     }
 
     /**
      * Provides an enumeration of all registred services.
      * <p>
-     * @return  an enumeration of all avialable services.
-     * @see     com.sun.star.conatiner.XEnumerationAccess
+     * @return 	an enumeration of all avialable services.
+     * @see 	com.sun.star.conatiner.XEnumerationAccess
      */
-    public XEnumeration createEnumeration()
+    public XEnumeration createEnumeration()	
             throws com.sun.star.uno.RuntimeException
     {
         return new ServiceEnumerationImpl( factoriesByImplNames.elements() );
@@ -655,9 +655,9 @@ public class ServiceManager implements XMultiServiceFactory,
     /**
      * Provides the UNO type of the <code>ServiceManager</code>
      * <p>
-     * @return  the UNO type of the <code>ServiceManager</code>.
-     * @see     com.sun.star.container.XElementAccess
-     * @see     com.sun.star.uno.TypeClass
+     * @return 	the UNO type of the <code>ServiceManager</code>.
+     * @see 	com.sun.star.container.XElementAccess
+     * @see		com.sun.star.uno.TypeClass
      */
     public com.sun.star.uno.Type getElementType()
             throws com.sun.star.uno.RuntimeException
@@ -671,8 +671,8 @@ public class ServiceManager implements XMultiServiceFactory,
     /**
      * Checks if the any componets are registered.
      * <p>
-     * @return  true - if the list of the registred components is not empty - otherwise false.
-     * @see     com.sun.star.container.XElementAccess
+     * @return	true - if the list of the registred components is not empty - otherwise false.
+     * @see		com.sun.star.container.XElementAccess
      */
     public boolean hasElements() {
         return ! factoriesByImplNames.isEmpty();
@@ -681,33 +681,33 @@ public class ServiceManager implements XMultiServiceFactory,
     /**
      * Provides an enumeration of of all factorys for a specified service.
      * <p>
-     * @return  an enumeration for service name.
-     * @param   serviceName     name of the requested service
-     * @see     com.sun.star.container.XContentEnumerationAccess
+     * @return	an enumeration for service name.
+     * @param	serviceName		name of the requested service
+     * @see 	com.sun.star.container.XContentEnumerationAccess
      */
     public XEnumeration createContentEnumeration( String serviceName )
                 throws com.sun.star.uno.RuntimeException
     {
         XEnumeration enumer = null;
-
+        
         java.util.Vector serviceList = (java.util.Vector) factoriesByServiceNames.get(serviceName);
-
+        
         if (serviceList != null)
             enumer = new ServiceEnumerationImpl( serviceList.elements() );
-        else
+        else 
             enumer = new ServiceEnumerationImpl();
-
+            
         return enumer;
     }
-
+      
     /**
      * Returns the implementation name of the <code>ServiceManager</code> component.
      * <p>
-     * @return  the class name of the <code>ServiceManager</code>.
-     * @see     com.sun.star.lang.XServiceInfo
+     * @return	the class name of the <code>ServiceManager</code>.
+     * @see		com.sun.star.lang.XServiceInfo
      */
-    public String getImplementationName()
-            throws com.sun.star.uno.RuntimeException
+    public String getImplementationName() 
+            throws com.sun.star.uno.RuntimeException 
     {
         return getClass().getName();
     }
@@ -715,132 +715,132 @@ public class ServiceManager implements XMultiServiceFactory,
     /**
      * Checks if the <code>ServiceManager</code> supports a service.
      * <p>
-     * @return  true if the service is supported - otherwise false.
-     * @param   serviceName service name which should be checked.
-     * @see     com.sun.star.lang.XServiceInfo
+     * @return	true if the service is supported - otherwise false.
+     * @param	serviceName	service name which should be checked. 
+     * @see		com.sun.star.lang.XServiceInfo
      */
     public boolean supportsService( String serviceName )
-            throws com.sun.star.uno.RuntimeException
+            throws com.sun.star.uno.RuntimeException 
     {
         for (int i=0; i<supportedServiceNames.length; i++)
             if (supportedServiceNames[i].equals( serviceName )) return true;
-
+            
         if (getImplementationName().equals( serviceName )) return true;
-
+        
         return false;
     }
-
+    
     /**
-     * Supplies list of all supported services.
+     * Supplies list of all supported services. 
      * <p>
-     * @return  a list of all supported service names.
-     * @see     com.sun.star.lang.XServiceInfo
+     * @return	a list of all supported service names.
+     * @see		com.sun.star.lang.XServiceInfo
      */
     public String[] getSupportedServiceNames()
-            throws com.sun.star.uno.RuntimeException
-    {
+            throws com.sun.star.uno.RuntimeException 
+    {	    
         return supportedServiceNames;
     }
-
+    
     /**
-     * The <code>ServiceEnumerationImpl</code> class provides an
-     * implementation of the @see com.sun.star.container.XEnumeration interface.
+     * The <code>ServiceEnumerationImpl</code> class provides an 
+     * implementation of the @see com.sun.star.container.XEnumeration interface. 
      * It is a inner wrapper for a java.util.Enumeration object.
      * <p>
-     * @version     $Revision: 1.10 $ $ $Date: 2008-04-11 11:11:46 $
-     * @author      Markus Herzog
+     * @version 	$Revision: 1.10 $ $ $Date: 2008-04-11 11:11:46 $
+     * @author 	    Markus Herzog
      * @see         com.sun.star.lang.XSingleServiceFactory
      * @see         com.sun.star.lang.XServiceInfo
      * @since       UDK1.0
      */
     class ServiceEnumerationImpl implements XEnumeration {
         java.util.Enumeration enumeration = null;
-
+    
         /**
          * Constructs a new empty instance.
          */
         public ServiceEnumerationImpl() {
         }
-
+    
         /**
          * Constructs a new instance with a given enumeration.
          * <p>
-         * @param   enumer  is the enumeration which should been wrapped.
-         * @see     com.sun.star.container.XEnumeration
+         * @param	enumer	is the enumeration which should been wrapped.
+         * @see		com.sun.star.container.XEnumeration
          */
         public ServiceEnumerationImpl(java.util.Enumeration enumer) {
             enumeration = enumer;
         }
-
+            
         /**
          * Checks if the enumeration contains more elements.
          * <p>
-         * @return  true if more elements are available - otherwise false.
-         * @see     com.sun.star.container.XEnumeration
+         * @return	true if more elements are available - otherwise false.
+         * @see		com.sun.star.container.XEnumeration
          */
-        public boolean hasMoreElements()
-                throws com.sun.star.uno.RuntimeException
+        public boolean hasMoreElements() 
+                throws com.sun.star.uno.RuntimeException 
         {
             if (enumeration != null)
                 return enumeration.hasMoreElements();
-
+                
             return false;
         }
-
+    
         /**
          * Returns the next element of the enumeration. If no further elements
          * available a com.sun.star.container.NoSuchElementException exception will be thrown.
          * <p>
-         * @return  the next element.
-         * @see     com.sun.star.container.XEnumeration
+         * @return	the next element.
+         * @see		com.sun.star.container.XEnumeration
          */
-        public Object nextElement()
-                throws com.sun.star.container.NoSuchElementException,
-                       com.sun.star.lang.WrappedTargetException,
+        public Object nextElement() 
+                throws com.sun.star.container.NoSuchElementException, 
+                       com.sun.star.lang.WrappedTargetException, 
                        com.sun.star.uno.RuntimeException
         {
             if (enumeration == null)
                 throw new com.sun.star.container.NoSuchElementException();
-
+                
             try {
                 return enumeration.nextElement();
             } catch (java.util.NoSuchElementException e) {
-                com.sun.star.container.NoSuchElementException ex =
+                com.sun.star.container.NoSuchElementException ex = 
                         new com.sun.star.container.NoSuchElementException();
                 ex.fillInStackTrace();
-
+                
                 throw ex;
             }
         }
     }
 }
 /**
- * The <code>ServiceManagerFactory</code> is the factory class for the
- * <code>ServiceManager</code>. As all factories it implments the
+ * The <code>ServiceManagerFactory</code> is the factory class for the 
+ * <code>ServiceManager</code>. As all factories it implments the 
  * com.sun.star.lang.XSingleServiceFactory and the com.sun.star.lang.XServiceInfo
  * interfaces.
  * <p>
- * @version     $Revision: 1.10 $ $ $Date: 2008-04-11 11:11:46 $
- * @author      Markus Herzog
+ * @version 	$Revision: 1.10 $ $ $Date: 2008-04-11 11:11:46 $
+ * @author 	    Markus Herzog
  * @see         com.sun.star.lang.XSingleServiceFactory
  * @see         com.sun.star.lang.XServiceInfo
  * @since       UDK1.0
 */
-class ServiceManagerFactory implements  XServiceInfo, XSingleComponentFactory, XSingleServiceFactory
+class ServiceManagerFactory implements 	XServiceInfo, XSingleComponentFactory, XSingleServiceFactory
 {
     /**
      * Creates a new instance of the <code>ServiceManagerFactory</code>.
      */
     public ServiceManagerFactory() {
     }
-
+    
     /**
      * Supplies the implementation name of the <code>ServiceManager</code>.
      * <p>
-     * @return      <code>ServiceManager</code> class name.
+     * @return		<code>ServiceManager</code> class name.
       * @see         com.sun.star.lang.XServiceInfo
      */
-    public String getImplementationName()
+    public String getImplementationName() 
             throws com.sun.star.uno.RuntimeException
     {
         return ServiceManager.class.getName();
@@ -849,28 +849,28 @@ class ServiceManagerFactory implements  XServiceInfo, XSingleComponentFactory, X
     /**
      * Checks wether or not a service is supported.
      * <p>
-     * @return      true - if the service is supported, otherwise false.
-     * @param       serviceName     the name of the service that should be checked.
+     * @return 		true - if the service is supported, otherwise false.
+     * @param		serviceName		the name of the service that should be checked.
       * @see         com.sun.star.lang.XServiceInfo
      */
-    public boolean supportsService( String serviceName )
+    public boolean supportsService( String serviceName ) 
             throws com.sun.star.uno.RuntimeException
     {
         for ( int i=0; i<ServiceManager.supportedServiceNames.length; i++ )
             if ( ServiceManager.supportedServiceNames[i].equals(serviceName) ) return true;
-
+        
         if ( getImplementationName().equals(serviceName) ) return true;
-
+        
         return false;
     }
 
     /**
      * Returns all service names which are supported by <code>ServiceManager</code>.
      * <p>
-     * @return      a list aof all supported service names.
+     * @return		a list aof all supported service names.
       * @see         com.sun.star.lang.XServiceInfo
      */
-    public String[] getSupportedServiceNames()
+    public String[] getSupportedServiceNames() 
             throws com.sun.star.uno.RuntimeException
     {
         return ServiceManager.supportedServiceNames;
@@ -879,11 +879,11 @@ class ServiceManagerFactory implements  XServiceInfo, XSingleComponentFactory, X
     /**
      * Creates a new instance of the <code>ServiceManager</code>.
      * <p>
-     * @return      newly created <code>ServiceManager</code> object.
+     * @return		newly created <code>ServiceManager</code> object.
       * @see         com.sun.star.lang.XSingleServiceFactory
      */
-    public java.lang.Object createInstance()
-            throws com.sun.star.uno.Exception,
+    public java.lang.Object createInstance() 
+            throws com.sun.star.uno.Exception, 
                    com.sun.star.uno.RuntimeException
     {
         return new ServiceManager();
@@ -895,17 +895,17 @@ class ServiceManagerFactory implements  XServiceInfo, XSingleComponentFactory, X
      * because there is no the <code>ServiceManager</code> has no constructor with
      * arguments.
      * <p>
-     * @return      null - allways throws an exception
-     * @param       aArguments arguments for new instance.
+     * @return		null - allways throws an exception
+     * @param		aArguments arguments for new instance.
       * @see         com.sun.star.lang.XSingleServiceFactory
      */
-    public java.lang.Object createInstanceWithArguments( java.lang.Object[] aArguments )
-            throws com.sun.star.uno.Exception,
+    public java.lang.Object createInstanceWithArguments( java.lang.Object[] aArguments ) 
+            throws com.sun.star.uno.Exception, 
                    com.sun.star.uno.RuntimeException
     {
         throw new com.sun.star.lang.NoSuchMethodException("Constructor with arguments is not supported.");
     }
-
+    
     // XSingleComponentFactory impl
     //______________________________________________________________________________________________
     public Object createInstanceWithContext( XComponentContext xContext )
diff --git a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
index 3509dfb303f2..a73b24098642 100644
--- a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
+++ b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,8 +51,8 @@ import com.sun.star.uno.UnoRuntime;
 /**
  * This component gives a factory for an <code>UnoUrlResolver</code> service.
  * <p>
- * @version     $Revision: 1.6 $ $ $Date: 2008-04-11 11:12:25 $
- * @author      Kay Ramme
+ * @version 	$Revision: 1.6 $ $ $Date: 2008-04-11 11:12:25 $
+ * @author 	    Kay Ramme
  * @see         com.sun.star.brige.XBrideFactory
  * @see         com.sun.star.connection.Connector
  * @since       UDK1.0
@@ -74,7 +74,7 @@ public class UrlResolver {
             String conDcp = null;
             String protDcp = null;
             String rootOid = null;
-
+            
             if(dcp.indexOf(';') == -1) {// use old style
                 conDcp = dcp;
                 protDcp = "iiop";
@@ -84,28 +84,28 @@ public class UrlResolver {
                 int index = dcp.indexOf(':');
                 String url = dcp.substring(0, index).trim();
                 dcp = dcp.substring(index + 1).trim();
-
+                
                 index = dcp.indexOf(';');
                 conDcp = dcp.substring(0, index).trim();
                 dcp = dcp.substring(index + 1).trim();
-
+                
                 index = dcp.indexOf(';');
                 protDcp = dcp.substring(0, index).trim();
                 dcp = dcp.substring(index + 1).trim();
-
+                
                 rootOid = dcp.trim().trim();
             }
 
             Object rootObject = null;
             XBridgeFactory xBridgeFactory= null;
             try {
-                xBridgeFactory = UnoRuntime.queryInterface(XBridgeFactory.class,
+                xBridgeFactory = UnoRuntime.queryInterface(XBridgeFactory.class, 
                                                                           _xMultiServiceFactory.createInstance("com.sun.star.bridge.BridgeFactory"));
             } catch (com.sun.star.uno.Exception e) {
                 throw new com.sun.star.uno.RuntimeException(e.getMessage());
             }
             XBridge xBridge = xBridgeFactory.getBridge(conDcp + ";" + protDcp);
-
+            
             if(xBridge == null) {
                 Object connector= null;
                 try {
@@ -113,9 +113,9 @@ public class UrlResolver {
                 } catch (com.sun.star.uno.Exception e) {
                         throw new com.sun.star.uno.RuntimeException(e.getMessage());
                 }
-
+                
                 XConnector connector_xConnector = UnoRuntime.queryInterface(XConnector.class, connector);
-
+                
                 // connect to the server
                 XConnection xConnection = connector_xConnector.connect(conDcp);
                 try {
@@ -140,8 +140,8 @@ public class UrlResolver {
      * @param   regKey       the registryKey
      * @see                  com.sun.star.comp.loader.JavaLoader
      */
-    public static XSingleServiceFactory __getServiceFactory(String implName,
-                                                            XMultiServiceFactory multiFactory,
+    public static XSingleServiceFactory __getServiceFactory(String implName, 
+                                                            XMultiServiceFactory multiFactory, 
                                                             XRegistryKey regKey)
     {
         XSingleServiceFactory xSingleServiceFactory = null;
@@ -149,12 +149,12 @@ public class UrlResolver {
           if (implName.equals(UrlResolver.class.getName()) )
             xSingleServiceFactory = FactoryHelper.getServiceFactory(_UrlResolver.class,
                                                                     _UrlResolver.__serviceName,
-                                                                    multiFactory,
+                                                                    multiFactory, 
                                                                     regKey);
-
+        
         return xSingleServiceFactory;
     }
-
+    
     /**
      * Writes the service information into the given registry key.
      * This method is called by the <code>JavaLoader</code>
diff --git a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java b/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
index 455e3aab6502..ea5057365377 100644
--- a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
+++ b/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,8 +44,8 @@ import com.sun.star.connection.XConnectionBroadcaster;
  * and is uses by the <code>PipeConnector</code> and the <code>PipeAcceptor</code>.
  * This class is not part of the provided <code>api</code>.
  * <p>
- * @version     $Revision: 1.7 $ $ $Date: 2008-04-11 11:13:00 $
- * @author      Kay Ramme
+ * @version 	$Revision: 1.7 $ $ $Date: 2008-04-11 11:13:00 $
+ * @author 	    Kay Ramme
  * @see         com.sun.star.comp.connections.PipeAcceptor
  * @see         com.sun.star.comp.connections.PipeConnector
  * @see         com.sun.star.connections.XConnection
@@ -62,10 +62,10 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
         NativeLibraryLoader.loadLibrary(PipeConnection.class.getClassLoader(), "jpipe");
     }
 
-    protected String    _aDescription;
-    protected long      _nPipeHandle;
-    protected Vector    _aListeners;
-    protected boolean   _bFirstRead;
+    protected String	_aDescription;
+    protected long		_nPipeHandle;
+    protected Vector	_aListeners;
+    protected boolean	_bFirstRead;
 
     /**
      * Constructs a new <code>PipeConnection</code>.
@@ -73,7 +73,7 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
      * @param  description   the description of the connection
      * @param  pipe        the pipe of the connection
      */
-    public PipeConnection(String description)
+    public PipeConnection(String description) 
         throws IOException
     {
         if (DEBUG) System.err.println("##### " + getClass().getName() + " - instantiated " + description );
@@ -84,7 +84,7 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
         // get pipe name from pipe descriptor
         String aPipeName = null;
         StringTokenizer aTokenizer = new StringTokenizer( description, "," );
-        if ( aTokenizer.hasMoreTokens() )
+        if ( aTokenizer.hasMoreTokens() ) 
         {
             String aConnType = aTokenizer.nextToken();
             if ( !aConnType.equals( "pipe" ) )
@@ -99,7 +99,7 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
             throw new RuntimeException( "invalid or empty pipe descriptor" );
 
         // create the pipe
-        try
+        try 
         { createJNI( aPipeName ); }
         catch ( java.lang.NullPointerException aNPE )
         { throw new IOException( aNPE.getMessage() ); }
@@ -132,7 +132,7 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
             xStreamListener.closed();
         }
     }
-
+    
     private void notifyListeners_error(com.sun.star.uno.Exception exception) {
         Enumeration elements = _aListeners.elements();
         while(elements.hasMoreElements()) {
@@ -144,21 +144,21 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
     // JNI implementation to create the pipe
     private native int createJNI( String name )
         throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException;
-
+    
     // JNI implementation to read from the pipe
-    private native int readJNI(/*OUT*/byte[][] bytes, int nBytesToRead)
+    private native int readJNI(/*OUT*/byte[][] bytes, int nBytesToRead) 
         throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException;
-
+    
     // JNI implementation to write to the pipe
-    private native void writeJNI(byte aData[])
+    private native void writeJNI(byte aData[]) 
         throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException;
-
+    
     // JNI implementation to flush the pipe
-    private native void flushJNI()
+    private native void flushJNI() 
         throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException;
 
     // JNI implementation to close the pipe
-    private native void closeJNI()
+    private native void closeJNI() 
         throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException;
 
     /**
@@ -169,8 +169,8 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
      * @param    nBytesToRead the number of bytes to read
      * @see       com.sun.star.connections.XConnection#read
      */
-    public int read(/*OUT*/byte[][] bytes, int nBytesToRead)
-        throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException
+    public int read(/*OUT*/byte[][] bytes, int nBytesToRead) 
+        throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException 
     {
         if(_bFirstRead) {
             _bFirstRead = false;
@@ -187,8 +187,8 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
      * @param    aData the bytes to write
      * @see       com.sun.star.connections.XConnection#write
      */
-    public void write(byte aData[])
-        throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException
+    public void write(byte aData[]) 
+        throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException 
     {
         writeJNI( aData );
     }
@@ -198,8 +198,8 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
      * <p>
      * @see       com.sun.star.connections.XConnection#flush
      */
-    public void flush()
-        throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException
+    public void flush() 
+        throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException 
     {
         flushJNI();
     }
@@ -209,8 +209,8 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
      * <p>
      * @see       com.sun.star.connections.XConnection#close
      */
-    public void close()
-        throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException
+    public void close() 
+        throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException 
     {
         if (DEBUG) System.out.print( "PipeConnection::close() " );
         closeJNI();
diff --git a/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java b/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java
index 4c5bf7f1c979..f9e2a43bcf72 100644
--- a/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java
+++ b/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/connections/pipe/pipeConnector.java b/jurt/com/sun/star/lib/connections/pipe/pipeConnector.java
index 9c0c412ec2bc..7128a5b3fce9 100644
--- a/jurt/com/sun/star/lib/connections/pipe/pipeConnector.java
+++ b/jurt/com/sun/star/lib/connections/pipe/pipeConnector.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -128,10 +128,10 @@ public final class pipeConnector implements XConnector {
         if (bConnected) {
             throw new ConnectionSetupException("alread connected");
         }
-
-    try
-    {
-        XConnection xConn = new PipeConnection( connectionDescription );
+    
+    try 
+    { 
+        XConnection xConn = new PipeConnection( connectionDescription ); 
         bConnected = true;
         return xConn;
     }
diff --git a/jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor.java b/jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor.java
index c38faed73e41..57e101449b0c 100644
--- a/jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor.java
+++ b/jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
index 8512bdb49fe1..3d766389b15f 100644
--- a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
+++ b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,8 +49,8 @@ import com.sun.star.connection.XConnectionBroadcaster;
  * and is uses by the <code>SocketConnector</code> and the <code>SocketAcceptor</code>.
  * This class is not part of the provided <code>api</code>.
  * <p>
- * @version     $Revision: 1.6 $ $ $Date: 2008-04-11 11:14:31 $
- * @author      Kay Ramme
+ * @version 	$Revision: 1.6 $ $ $Date: 2008-04-11 11:14:31 $
+ * @author 	    Kay Ramme
  * @see         com.sun.star.comp.connections.SocketAcceptor
  * @see         com.sun.star.comp.connections.SocketConnector
  * @see         com.sun.star.connections.XConnection
@@ -118,7 +118,7 @@ public class SocketConnection implements XConnection, XConnectionBroadcaster {
             xStreamListener.closed();
         }
     }
-
+    
     private void notifyListeners_error(com.sun.star.uno.Exception exception) {
         Enumeration elements = _listeners.elements();
         while(elements.hasMoreElements()) {
diff --git a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java b/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
index f2119225f029..930eeecf4c60 100644
--- a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
+++ b/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/connections/socket/socketConnector.java b/jurt/com/sun/star/lib/connections/socket/socketConnector.java
index f85a5ac41bd0..2872743565ae 100644
--- a/jurt/com/sun/star/lib/connections/socket/socketConnector.java
+++ b/jurt/com/sun/star/lib/connections/socket/socketConnector.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/Proxy.java b/jurt/com/sun/star/lib/uno/Proxy.java
index f2a7326c81c0..4f0f5db14b8d 100644
--- a/jurt/com/sun/star/lib/uno/Proxy.java
+++ b/jurt/com/sun/star/lib/uno/Proxy.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java
index 90f037d5ae42..3fd65cde4842 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java
index b81db391966f..631bda3a19b2 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/RequestHandler.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/RequestHandler.java
index 5bfe57a95299..ca0e80d4c78d 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/RequestHandler.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/RequestHandler.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
index e663a96d1ea7..9ba019199f69 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@ class XConnectionInputStream_Adapter extends InputStream {
     protected byte        _bytes[][] = new byte[1][];
 
     XConnectionInputStream_Adapter(XConnection xConnection) {
-        if(xConnection == null) throw new NullPointerException("the XConnection must not be null");
+        if(xConnection == null)	throw new NullPointerException("the XConnection must not be null");
 
         if(DEBUG) System.err.println("#### " + getClass().getName()  + " - instantiated ");
 
@@ -65,7 +65,7 @@ class XConnectionInputStream_Adapter extends InputStream {
     }
 
     public int read(byte[] b, int off, int len) throws IOException {
-//      byte bytes[][] = new byte[1][];
+// 		byte bytes[][] = new byte[1][];
 
         try {
             len = _xConnection.read(_bytes, len - off);
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
index 51f3594330ee..388f5bc08630 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
index 267a84d7515f..12ea6bd2e735 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -80,8 +80,8 @@ import com.sun.star.uno.Any;
  * The protocol to used is passed by name, the bridge
  * then looks for it under <code>com.sun.star.lib.uno.protocols</code>.
  * <p>
- * @version     $Revision: 1.45 $ $ $Date: 2008-04-11 11:18:08 $
- * @author      Kay Ramme
+ * @version 	$Revision: 1.45 $ $ $Date: 2008-04-11 11:18:08 $
+ * @author 	    Kay Ramme
  * @since       UDK1.0
  */
 public class java_remote_bridge
@@ -549,7 +549,7 @@ public class java_remote_bridge
                 }
                 _java_environment.list();
             }
-
+                
             // clear members
             _xConnection        = null;
             _java_environment   = null;
@@ -640,7 +640,7 @@ public class java_remote_bridge
             }
         } finally {
             _iThreadPool.detach(handle, threadId);
-            if(operation.equals("release"))
+            if(operation.equals("release")) 
                 release(); // kill this bridge, if this was the last proxy
         }
 
diff --git a/jurt/com/sun/star/lib/uno/environments/java/java_environment.java b/jurt/com/sun/star/lib/uno/environments/java/java_environment.java
index 7be0f9e5366d..e9f6344ce14a 100644
--- a/jurt/com/sun/star/lib/uno/environments/java/java_environment.java
+++ b/jurt/com/sun/star/lib/uno/environments/java/java_environment.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/IProtocol.java b/jurt/com/sun/star/lib/uno/environments/remote/IProtocol.java
index 1fae45e9ca23..afb5fc586104 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/IProtocol.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/IProtocol.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/IReceiver.java b/jurt/com/sun/star/lib/uno/environments/remote/IReceiver.java
index be4548e5ebc0..402726188b18 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/IReceiver.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/IReceiver.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java b/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java
index c70ccfa7e934..20017ed247e8 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,9 +31,9 @@ package com.sun.star.lib.uno.environments.remote;
  * This interface is an abstraction of the various
  * threadpool implementations.
  * <p>
- * @version     $Revision: 1.7 $ $ $Date: 2008-04-11 11:20:01 $
- * @author      Joerg Budischewski
- * @author      Kay Ramme
+ * @version 	$Revision: 1.7 $ $ $Date: 2008-04-11 11:20:01 $
+ * @author 	    Joerg Budischewski
+ * @author 	    Kay Ramme
  * @see         com.sun.star.lib.uno.environments.remote.ThreadPoolFactory
  * @see         com.sun.star.lib.uno.environments.remote.IThreadPoolFactory
  * @since       UDK1.0
@@ -101,7 +101,7 @@ public interface IThreadPool {
     public Object enter( Object handle, ThreadId id ) throws Throwable;
 
     /**
-     * Queues a job into the jobQueue of the thread belonging
+     * Queues a job into the jobQueue of the thread belonging 
      * to the jobs threadId.
      * <p>
      * @param job       the job
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java b/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java
index 3b1fee02b87d..4869d216c0c6 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,8 +30,8 @@ package com.sun.star.lib.uno.environments.remote;
 /**
  * This class implements a java thread pool.
  * <p>
- * @version     $Revision: 1.13 $ $ $Date: 2008-04-11 11:20:22 $
- * @author      Kay Ramme
+ * @version 	$Revision: 1.13 $ $ $Date: 2008-04-11 11:20:22 $
+ * @author 	    Kay Ramme
  * @see         com.sun.star.uno.UnoRuntime
  * @see         com.sun.star.lib.uno.environments.remote.ThreadPool
  * @see         com.sun.star.lib.uno.environments.remote.IThreadPool
@@ -66,7 +66,7 @@ public class JavaThreadPool implements IThreadPool {
         jobQueue.acquire();
         return jobQueue;
     }
-
+    
     public void attach() {
         attach( getThreadId() );
     }
@@ -75,13 +75,13 @@ public class JavaThreadPool implements IThreadPool {
     {
         ((JobQueue)handle).release();
     }
-
+    
     public void detach() {
         ThreadId threadId =  getThreadId();
         detach(_javaThreadPoolFactory.getJobQueue(threadId), threadId );
     }
 
-
+    
     public Object enter( ) throws Throwable {
         ThreadId threadId = getThreadId();
         return enter( _javaThreadPoolFactory.getJobQueue( threadId ), threadId  );
@@ -96,7 +96,7 @@ public class JavaThreadPool implements IThreadPool {
             JobQueue jobQueue = _javaThreadPoolFactory.getJobQueue(job.getThreadId());
 
             // this has not be synchronized, cause
-            // sync jobs can only come over one bridge
+            // sync jobs can only come over one bridge 
             // (cause the thread blocks on other side)
             if(jobQueue == null)
                 jobQueue = new JobQueue(_javaThreadPoolFactory, job.getThreadId(), true);
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory.java b/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory.java
index 868a4559a577..1ba1fc64179b 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/Job.java b/jurt/com/sun/star/lib/uno/environments/remote/Job.java
index 41cf9706f2b6..ef99a187da7f 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/Job.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/Job.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,8 +45,8 @@ import com.sun.star.uno.XCurrentContext;
  * The Job is an abstraction for tasks which have to be done
  * remotely because of a method invocation.
  * <p>
- * @version     $Revision: 1.17 $ $ $Date: 2008-04-11 11:21:00 $
- * @author      Kay Ramme
+ * @version 	$Revision: 1.17 $ $ $Date: 2008-04-11 11:21:00 $
+ * @author 	    Kay Ramme
  * @see         com.sun.star.lib.uno.environments.remote.ThreadID
  * @see         com.sun.star.lib.uno.environments.remote.IReceiver
  * @since       UDK1.0
@@ -159,15 +159,15 @@ public class Job {
     }
 
     public void dispose() {
-//          _oId        = null;
-//          _iReceiver  = null;
-//          _threadId   = null;
-//          _object     = null;
-//          _operation  = null;
-//          _param      = null;
-//          _exception  = null;
-//          _zInterface = null;
-//          _disposeId  = null;
+//  		_oId        = null;
+//  		_iReceiver  = null;
+//  		_threadId   = null;
+//  		_object     = null;
+//  		_operation  = null;
+//  		_param      = null;
+//  		_exception  = null;
+//  		_zInterface = null;
+//  		_disposeId  = null;
     }
 
     // The name of this method is chosen to generate a somewhat self-explanatory
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
index f7568a30cef7..b8700b61f5c3 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,11 +34,11 @@ package com.sun.star.lib.uno.environments.remote;
  * at the <code>ThreadPool</code>.
  * A JobQueue is splitted in a sync job queue and an async job queue.
  * The sync job queue is the registerd queue, it delegates async jobs
- * (put by <code>putjob</code>) into the async queue, which is only
+ * (put by <code>putjob</code>) into the async queue, which is only 
  * known by the sync queue.
  * <p>
- * @version     $Revision: 1.19 $ $ $Date: 2008-04-11 11:21:18 $
- * @author      Kay Ramme
+ * @version 	$Revision: 1.19 $ $ $Date: 2008-04-11 11:21:18 $
+ * @author 	    Kay Ramme
  * @see         com.sun.star.lib.uno.environments.remote.ThreadPool
  * @see         com.sun.star.lib.uno.environments.remote.Job
  * @see         com.sun.star.lib.uno.environments.remote.ThreadID
@@ -88,7 +88,7 @@ public class JobQueue {
 
         public void run() {
             if(DEBUG) System.err.println("ThreadPool$JobDispatcher.run: " + Thread.currentThread());
-
+        
             try {
                   enter(2000, _disposeId);
             }
@@ -104,14 +104,14 @@ public class JobQueue {
 
             if(DEBUG) System.err.println("##### " + getClass().getName() + ".run - exit:" + _threadId);
 
-//              try {
-//                  Object object = new Object();
-//                  synchronized(object) {
-//                      object.wait();
-//                  }
-//              }
-//              catch(InterruptedException interruptedException) {
-//              }
+//  			try {
+//  				Object object = new Object();
+//  				synchronized(object) {
+//  					object.wait();
+//  				}
+//  			}
+//  			catch(InterruptedException interruptedException) {
+//  			}
         }
     }
 
@@ -151,7 +151,7 @@ public class JobQueue {
      * @param createThread    if true, the queue creates a worker thread if needed
      * @see             com.sun.star.lib.uno.environments.remote.ThreadID
      */
-    JobQueue(JavaThreadPoolFactory javaThreadPoolFactory, ThreadId threadId, boolean createThread){
+    JobQueue(JavaThreadPoolFactory javaThreadPoolFactory, ThreadId threadId, boolean createThread){ 
         _javaThreadPoolFactory   = javaThreadPoolFactory;
         _threadId         = threadId;
         _createThread     = createThread;
@@ -172,7 +172,7 @@ public class JobQueue {
 
     synchronized void acquire() {
         // add only synchronous queues .
-        if(_ref_count <= 0 && _sync_jobQueue == null )
+        if(_ref_count <= 0 && _sync_jobQueue == null ) 
             _javaThreadPoolFactory.addJobQueue(this);
 
         ++ _ref_count;
@@ -183,7 +183,7 @@ public class JobQueue {
 
         if(_ref_count <= 0) {
             // only synchronous queues needs to be removed .
-            if( _sync_jobQueue == null )
+            if( _sync_jobQueue == null ) 
                 _javaThreadPoolFactory.removeJobQueue(this);
 
 
@@ -198,7 +198,7 @@ public class JobQueue {
      * Removes a job from the queue.
      * <p>
      * @return a job or null if timed out
-     * @param  waitTime        the maximum amount of time to wait for a job
+     * @param  waitTime        the maximum amount of time to wait for a job 
      */
     private Job removeJob(int waitTime) throws Throwable {
         if(DEBUG) System.err.println("##### " + getClass().getName() + ".removeJob:" + _head + " " + _threadId);
@@ -223,7 +223,7 @@ public class JobQueue {
                 catch(InterruptedException interruptedException) {
                       throw new com.sun.star.uno.RuntimeException(getClass().getName() + ".removeJob - unexpected:" + interruptedException);
                 }
-
+                
                 // signal that we have already waited once
                 waited = true;
             }
@@ -232,10 +232,10 @@ public class JobQueue {
             if(_head != null) {
                 Job current = _head;
                 _head    = _head._next;
-
+                
                 if(_head == null)
                     _tail = null;
-
+                
                 job = current;
                 _active = true;
             }
@@ -243,7 +243,7 @@ public class JobQueue {
 
         // always wait for asynchron jobqueue to be finished !
         if(job != null && _async_jobQueue != null) {
-            synchronized(_async_jobQueue) {
+            synchronized(_async_jobQueue) { 
                 // wait for async queue to be empty and last job to be done
                 while(_async_jobQueue._active || _async_jobQueue._head != null) {
                     if(DEBUG) System.err.println("waiting for async:" + _async_jobQueue._head + " " +  _async_jobQueue._worker_thread);
@@ -274,12 +274,12 @@ public class JobQueue {
      */
     synchronized void putJob(Job job, Object disposeId) {
         if(DEBUG) System.err.println("##### " + getClass().getName() + ".putJob todoes: " + " job:" + job);
-
-        if(_tail != null)
+        
+        if(_tail != null) 
             _tail._next = job;
         else
             _head = job;
-
+        
         _tail = job;
 
         if(_worker_thread == null && _createThread && _createThread_now) { // if there is no thread, which dispatches and if shall create one, create one
@@ -326,10 +326,10 @@ public class JobQueue {
 
         while(!quit) {
             Job job = null;
-
+            
             try {
                 job = removeJob(waitTime);
-
+                
                 if(job != null) {
                     try {
                         result = job.execute();
@@ -349,7 +349,7 @@ public class JobQueue {
                 else
                     quit = true;
 
-
+                
             }
             finally { // ensure that this queue becomes disposed, if necessary
                 if(DEBUG) System.err.println("##### " + getClass().getName() + ".enter leaving: " + _threadId + " " + _worker_thread + " " + hold_worker_thread + " " + result);
@@ -359,7 +359,7 @@ public class JobQueue {
                         _worker_thread = hold_worker_thread;
 
                         _createThread_now = true;
-
+                    
                         _disposeId = hold_disposeId;
 
                         if(_sync_jobQueue != null)
@@ -385,10 +385,10 @@ public class JobQueue {
         if(_sync_jobQueue == null) { // dispose only sync queues
             _doDispose = disposeId;
             _throwable = throwable;
-
+            
             // get thread out of wait and let it throw the throwable
             if(DEBUG) System.err.println(getClass().getName() + ".dispose - notifying thread");
-
+            
             notifyAll();
         }
     }
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/Message.java b/jurt/com/sun/star/lib/uno/environments/remote/Message.java
index 918b9b1282ad..310bfc6ce488 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/Message.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/Message.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/NativeThreadPool.java b/jurt/com/sun/star/lib/uno/environments/remote/NativeThreadPool.java
index 06afce7f1e5d..91f0bd411ee8 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/NativeThreadPool.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/NativeThreadPool.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/ThreadId.java b/jurt/com/sun/star/lib/uno/environments/remote/ThreadId.java
index 0b570991c11f..e194198d8397 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/ThreadId.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/ThreadId.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/ThreadPoolManager.java b/jurt/com/sun/star/lib/uno/environments/remote/ThreadPoolManager.java
index 6187eb4b1c4e..c43ec4bad66d 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/ThreadPoolManager.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/ThreadPoolManager.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/remote_environment.java b/jurt/com/sun/star/lib/uno/environments/remote/remote_environment.java
index 0a782783c00f..81cbf1bc4622 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/remote_environment.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/remote_environment.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/Cache.java b/jurt/com/sun/star/lib/uno/protocols/urp/Cache.java
index 48268a53a260..437b2006207e 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/Cache.java
+++ b/jurt/com/sun/star/lib/uno/protocols/urp/Cache.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java b/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java
index 2a43041916ce..a400614bf39c 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java
+++ b/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/PendingRequests.java b/jurt/com/sun/star/lib/uno/protocols/urp/PendingRequests.java
index ac3e039224aa..e42a045204fa 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/PendingRequests.java
+++ b/jurt/com/sun/star/lib/uno/protocols/urp/PendingRequests.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java b/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java
index 5a500ad3a0c1..36a0720ea83f 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java
+++ b/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/UrpMessage.java b/jurt/com/sun/star/lib/uno/protocols/urp/UrpMessage.java
index 57770dcb0401..2e2c6b96ada9 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/UrpMessage.java
+++ b/jurt/com/sun/star/lib/uno/protocols/urp/UrpMessage.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/urp.java b/jurt/com/sun/star/lib/uno/protocols/urp/urp.java
index da54bc7612a1..3e33a6657b3b 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/urp.java
+++ b/jurt/com/sun/star/lib/uno/protocols/urp/urp.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java b/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java
index 32303775b191..9b002a16afb2 100644
--- a/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java
+++ b/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java b/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
index 05455a87814d..da2298066995 100644
--- a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
+++ b/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/util/StringHelper.java b/jurt/com/sun/star/lib/util/StringHelper.java
index 5962d19e7b14..3ff2abfb78fd 100644
--- a/jurt/com/sun/star/lib/util/StringHelper.java
+++ b/jurt/com/sun/star/lib/util/StringHelper.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/com/sun/star/lib/util/UrlToFileMapper.java b/jurt/com/sun/star/lib/util/UrlToFileMapper.java
index 22b6ccf0a745..c356e8410b2c 100644
--- a/jurt/com/sun/star/lib/util/UrlToFileMapper.java
+++ b/jurt/com/sun/star/lib/util/UrlToFileMapper.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ import java.net.URLEncoder;
  * @since UDK 3.2.8
  */
 public final class UrlToFileMapper {
-
+    
     // java.net.URLEncoder.encode(String, String) and java.net.URI are only
     // available since Java 1.4:
     private static Method urlEncoderEncode;
@@ -155,7 +155,7 @@ public final class UrlToFileMapper {
             }
         }
         return buf.toString();
-    }
+    }    
 
     private UrlToFileMapper() {}
 }
diff --git a/jurt/com/sun/star/uno/AnyConverter.java b/jurt/com/sun/star/uno/AnyConverter.java
index cbd13fe8589a..d2d01cc64806 100644
--- a/jurt/com/sun/star/uno/AnyConverter.java
+++ b/jurt/com/sun/star/uno/AnyConverter.java
@@ -33,7 +33,7 @@ public class AnyConverter
         }
         return t;
     }
-
+    
     /** checks if the any contains the idl type <code>void</code>.
         @param object the object to check
         @return true when the any is void, false otherwise
@@ -80,7 +80,7 @@ public class AnyConverter
      */
     static public boolean isInt(Object object){
         return containsType(TypeClass.LONG, object);
-    }
+    }		
 
     /** checks if the any contains a value of the idl type <code>hyper</code> (which maps to a java-long).
         @param object the object to check
@@ -104,7 +104,7 @@ public class AnyConverter
      */
     static public boolean isDouble(Object object){
         return containsType(TypeClass.DOUBLE, object);
-    }
+    }		
 
     /** checks if the any contains a value of the idl type <code>string</code>.
         @param object the object to check
@@ -113,7 +113,7 @@ public class AnyConverter
     static public boolean isString(Object object){
         return containsType(TypeClass.STRING, object);
     }
-
+    
     /** checks if the any contains a value of the idl type <code>enum</code>.
         @param object the object to check
         @return true if the any contains an enum, false otherwise
@@ -129,7 +129,7 @@ public class AnyConverter
      */
     static public boolean isType(Object object){
         return containsType(TypeClass.TYPE, object);
-    }
+    }		
 
     /** checks if the any contains an interface, struct, exception, sequence or enum.
         If <em>object</em> is an any with an interface type, then true is also returned if
@@ -147,7 +147,7 @@ public class AnyConverter
                 TypeClass.SEQUENCE_value == tc ||
                 TypeClass.ENUM_value == tc);
     }
-
+    
     /** checks if the any contains UNO idl sequence value (meaning a java array
         containing elements which are values of UNO idl types).
         @param object the object to check
@@ -189,16 +189,16 @@ public class AnyConverter
         Byte ret= (Byte)convertSimple(TypeClass.BYTE, null, object);
         return ret.byteValue();
     }
-
+    
     /** converts a number object into a simple short and allows widening conversions.
         Allowed argument types are Byte, Short or Any containing these types.
         @param object the object to convert
         @throws com.sun.star.lang.IllegalArgumentException in case no short or byte is contained within object
         @return the short contained within the object
-     */
+     */        
     static public short toShort(Object object) throws   com.sun.star.lang.IllegalArgumentException{
         Short ret= (Short)convertSimple(TypeClass.SHORT, null, object);
-        return ret.shortValue();
+        return ret.shortValue();	
     }
     /** converts a number object into an idl unsigned short and allows widening conversions.
         Allowed argument types are Anies containing idl unsigned short values.
@@ -206,7 +206,7 @@ public class AnyConverter
         @throws com.sun.star.lang.IllegalArgumentException
                 in case no idl unsigned short is contained within Any
         @return an (unsigned) short
-     */
+     */        
     static public short toUnsignedShort(Object object)
         throws com.sun.star.lang.IllegalArgumentException
     {
@@ -219,7 +219,7 @@ public class AnyConverter
         @param object the object to convert
         @throws com.sun.star.lang.IllegalArgumentException in case no short, byte or int is contained within object.
         @return the int contained within the object
-     */
+     */        
     static public int toInt(Object object) throws  com.sun.star.lang.IllegalArgumentException{
         Integer ret= (Integer) convertSimple( TypeClass.LONG, null, object);
         return ret.intValue();
@@ -230,7 +230,7 @@ public class AnyConverter
         @throws com.sun.star.lang.IllegalArgumentException
                 in case no idl unsigned short nor unsigned long is contained within Any
         @return an (unsigned) int
-     */
+     */        
     static public int toUnsignedInt(Object object)
         throws  com.sun.star.lang.IllegalArgumentException
     {
@@ -244,7 +244,7 @@ public class AnyConverter
         @throws com.sun.star.lang.IllegalArgumentException in case no short, byte, int or long
                 is contained within object.
         @return the long contained within the object
-     */
+     */        
     static public long toLong(Object object) throws   com.sun.star.lang.IllegalArgumentException{
         Long ret= (Long) convertSimple( TypeClass.HYPER, null, object);
         return ret.longValue();
@@ -257,7 +257,7 @@ public class AnyConverter
                 in case no idl unsigned short, nor unsigned long nor unsigned hyper
                 is contained within object.
         @return an (unsigned) long
-     */
+     */        
     static public long toUnsignedLong(Object object)
         throws com.sun.star.lang.IllegalArgumentException
     {
@@ -271,7 +271,7 @@ public class AnyConverter
         @throws com.sun.star.lang.IllegalArgumentException in case no byte, short or float
                 is contained within object.
         @return the float contained within the object
-     */
+     */        
     static public float toFloat(Object object) throws com.sun.star.lang.IllegalArgumentException{
         Float ret= (Float) convertSimple( TypeClass.FLOAT,null, object);
         return ret.floatValue();
@@ -283,36 +283,36 @@ public class AnyConverter
         @throws com.sun.star.lang.IllegalArgumentException in case no byte, short, int, float
                 or double is contained within object.
         @return the double contained within the object
-     */
+     */        
     static public double toDouble(Object object) throws com.sun.star.lang.IllegalArgumentException {
         Double ret= (Double) convertSimple( TypeClass.DOUBLE, null, object);
         return ret.doubleValue();
     }
-
+        
     /** converts a string or an any containing a string into a string.
         @param object the object to convert
         @throws com.sun.star.lang.IllegalArgumentException in case no string is contained within object.
         @return the string contained within the object
-     */
+     */        
     static public String toString(Object object) throws com.sun.star.lang.IllegalArgumentException {
         return (String) convertSimple( TypeClass.STRING, null, object);
     }
-
+    
     /** converts a Type or an any containing a Type into a Type.
         @param object the object to convert
         @throws com.sun.star.lang.IllegalArgumentException in case no type is contained within object.
         @return the type contained within the object
-     */
+     */        
     static public Type toType(Object object) throws com.sun.star.lang.IllegalArgumentException {
         return (Type) convertSimple( TypeClass.TYPE, null, object);
     }
-
+    
     /** converts a UNO object (struct, exception, sequence, enum or interface) or an Any containing
      *  these types into an UNO object of a specified destination type.
      *  For interfaces, the argument <em>object</em> is queried for the interface specified
      *  by the <em>type</em> argument. That query (UnoRuntime.queryInterface) might return null,
      *  if the interface is not implemented or a null-ref or a VOID any is given.
-     *
+     *  
      *  @param type type of the returned value
      *  @param object the object that is to be converted
      *  @return destination object
@@ -329,7 +329,7 @@ public class AnyConverter
      *  For interfaces, the argument <em>object</em> is queried for the interface specified
      *  by the <em>type</em> argument. That query (UnoRuntime.queryInterface) might return null,
      *  if the interface is not implemented or a null-ref or a VOID any is given.
-     *
+     *  
      *  @param clazz class of the returned value
      *  @param object the object that is to be converted
      *  @return destination object
@@ -341,16 +341,16 @@ public class AnyConverter
     {
         return toObject( new Type( clazz ), object );
     }
-
+    
     /** converts an array or an any containing an array into an array.
         @param object the object to convert
         @throws com.sun.star.lang.IllegalArgumentException in case no array is contained within object.
         @return the array contained within the object
-     */
+     */        
     static public Object toArray( Object object) throws com.sun.star.lang.IllegalArgumentException {
         return convertSimple( TypeClass.SEQUENCE, null, object);
     }
-
+    
     /**
        Examines the argument <em>object</em> if is correspond to the type in argument <em>what</em>.
        <em>object</em> is either matched directly against the type or if it is an any then the
@@ -359,9 +359,9 @@ public class AnyConverter
     static private boolean containsType( TypeClass what, Object object){
         return (getType(object).getTypeClass().getValue() == what.getValue());
     }
-
+    
     static private final Type m_XInterface_type = new Type( XInterface.class );
-
+    
     static private Object convertSimple( TypeClass destTClass, Type destType, Object object_ )
         throws com.sun.star.lang.IllegalArgumentException
     {
@@ -382,10 +382,10 @@ public class AnyConverter
             object = object_;
             type = (null == object ? m_XInterface_type : new Type( object.getClass() ));
         }
-
+        
         int tc = type.getTypeClass().getValue();
         int dest_tc = destTClass.getValue();
-
+        
         if (null == object)
         {
             // special for interfaces
@@ -423,7 +423,7 @@ public class AnyConverter
                 case TypeClass.UNSIGNED_SHORT_value:
                     return object;
                 }
-                break;
+                break;                
             case TypeClass.LONG_value:
                 switch (tc)
                 {
diff --git a/jurt/com/sun/star/uno/Ascii.java b/jurt/com/sun/star/uno/Ascii.java
index 866bcf3960b3..c9eac0a22569 100644
--- a/jurt/com/sun/star/uno/Ascii.java
+++ b/jurt/com/sun/star/uno/Ascii.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,16 +27,16 @@
 
 package com.sun.star.uno;
 
-/**
+/** 
  * The Ascii class represents the IDL build in type <code>ascii</code>.
  * <p>
- * @version     $Revision: 1.5 $ $ $Date: 2008-04-11 11:27:21 $
- * @author      Markus Meyer
- * @deprecated do not use
+ * @version 	$Revision: 1.5 $ $ $Date: 2008-04-11 11:27:21 $
+ * @author 	    Markus Meyer
+ * @deprecated do not use 
  */
 public final class Ascii {
     public final char ascii;
-
+                        
     /**
      * Constructs a new <code>Ascii</code>.
      * <p>
diff --git a/jurt/com/sun/star/uno/AsciiString.java b/jurt/com/sun/star/uno/AsciiString.java
index 245375cf1fab..741f0f8917e5 100644
--- a/jurt/com/sun/star/uno/AsciiString.java
+++ b/jurt/com/sun/star/uno/AsciiString.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,20 +27,20 @@
 
 package com.sun.star.uno;
 
-/**
+/** 
  * The Ascii class represents the IDL build in type <code>asciistring</code>.
  * <p>
- * @version     $Revision: 1.5 $ $ $Date: 2008-04-11 11:27:42 $
- * @author      Markus Meyer
- * @deprecated do not use
+ * @version 	$Revision: 1.5 $ $ $Date: 2008-04-11 11:27:42 $
+ * @author 	    Markus Meyer
+ * @deprecated do not use 
  */
 public final class AsciiString {
-    public final String asciistring;
+    public final String	asciistring;
 
     /**
      * Constructs a new <code>AsciiString</code>.
      * <p>
-     * @deprecated do not use
+     * @deprecated do not use 
      * @param   s  the String value
      */
     public AsciiString(String s) {
diff --git a/jurt/com/sun/star/uno/MappingException.java b/jurt/com/sun/star/uno/MappingException.java
index dc65676e1181..6f9591cfb491 100644
--- a/jurt/com/sun/star/uno/MappingException.java
+++ b/jurt/com/sun/star/uno/MappingException.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@ package com.sun.star.uno;
  * The exception is replaced by the com.sun.star.lang.DisposedException.
  * @deprecated since UDK 3.0.2
  * <p>
- * @version     $Revision: 1.6 $ $ $Date: 2008-04-11 11:28:00 $
+ * @version 	$Revision: 1.6 $ $ $Date: 2008-04-11 11:28:00 $
  * @see         com.sun.star.uno.UnoRuntime
  * @see         com.sun.star.uno.IQueryInterface
  * @see         com.sun.star.uno.IBridge
diff --git a/jurt/com/sun/star/uno/WeakReference.java b/jurt/com/sun/star/uno/WeakReference.java
index 904524d8c049..c9065078ab86 100644
--- a/jurt/com/sun/star/uno/WeakReference.java
+++ b/jurt/com/sun/star/uno/WeakReference.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@ public class WeakReference
     // ref would not be notified (XReference.dispose()) because it did not register
     // itself. Therefore the XAdapter would be kept aliver although this is not
     // necessary.
-
+    
     /** Creates an instance of this class.
      *@param obj - another instance that is to be copied
      */
@@ -68,7 +68,7 @@ public class WeakReference
             }
         }
     }
-
+    
     /** Creates an instance of this class.
      *@param obj XWeak implementation
      */
@@ -94,14 +94,14 @@ public class WeakReference
 }
 
 /** Implementation of com.sun.star.uno.XReference for use with WeakReference.
- *  It keeps the XAdapter implementation and registers always with it. Deregistering
+ *  It keeps the XAdapter implementation and registers always with it. Deregistering 
  *  occurs on notification by the adapter and the adapter is released.
  */
 class OWeakRefListener implements XReference
 {
     private final boolean DEBUG= false;
     private XAdapter m_adapter;
-
+    
     /** The constructor registered this object with adapter.
      *@param adapter the XAdapter implementation.
      */
@@ -110,7 +110,7 @@ class OWeakRefListener implements XReference
         m_adapter= adapter;
         m_adapter.addReference(this);
     }
-    /** Method of com.sun.star.uno.XReference. When called, it deregisteres this
+    /** Method of com.sun.star.uno.XReference. When called, it deregisteres this 
      *  object with the adapter and releases the reference to it.
      */
     synchronized public void dispose()
@@ -121,8 +121,8 @@ class OWeakRefListener implements XReference
             m_adapter= null;
         }
     }
-
-    /** Obtains a hard reference to the object which is kept weak by the adapter
+    
+    /** Obtains a hard reference to the object which is kept weak by the adapter 
      *  and returns it.
      *  @return hard reference to the otherwise weakly kept object.
      */
@@ -136,7 +136,7 @@ class OWeakRefListener implements XReference
             {
                 // If this object registered as listener with XAdapter while it was notifying
                 // the listeners then this object might not have been notified. If queryAdapted
-                // returned null then the weak kept object is dead and the listeners have already
+                // returned null then the weak kept object is dead and the listeners have already 
                 // been notified. And we missed it.
                 m_adapter.removeReference(this);
                 m_adapter= null;
diff --git a/jurt/demo/com/sun/star/demo/DemoServer.java b/jurt/demo/com/sun/star/demo/DemoServer.java
index 53f258b5bd46..d36919ba4082 100644
--- a/jurt/demo/com/sun/star/demo/DemoServer.java
+++ b/jurt/demo/com/sun/star/demo/DemoServer.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@ public class DemoServer {
     }
 
     static public void main(String args[]) throws Exception {
-        if(args.length != 1)    {
+        if(args.length != 1)	{
             System.err.println("usage : SCalc uno:connection;protocol;objectName");
             System.exit(-1);
         }
@@ -64,7 +64,7 @@ public class DemoServer {
         String rootOid = null;
 
         String dcp = args[0];
-
+        
         if(dcp.indexOf(';') == -1) {// use old style
             conDcp = dcp;
             protDcp = "iiop";
diff --git a/jurt/demo/com/sun/star/demo/TestOffice.java b/jurt/demo/com/sun/star/demo/TestOffice.java
index 5ff3fa77d9e8..7fd08768ce87 100644
--- a/jurt/demo/com/sun/star/demo/TestOffice.java
+++ b/jurt/demo/com/sun/star/demo/TestOffice.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,8 +68,8 @@ public class TestOffice {
             bytes[0] = 42;
             rOut.writeBytes(bytes);
         }
-
-
+    
+        
         {
             byte bytes[][] = new byte[1][];
 
@@ -96,7 +96,7 @@ public class TestOffice {
         byte pcText[] = new byte[1024];
         pcText[0] = 0;
         System.err.println("pleast type any text\n");
-        while(true) {
+        while(true)	{
             System.in.read(pcText);
 
             String string = new String(pcText);
@@ -125,16 +125,16 @@ public class TestOffice {
             "www.heise.de\n",
         };
 
-        for(int i = 0; i < urls.length; ++ i)   {
+        for(int i = 0; i < urls.length; ++ i)	{
             System.err.println("press any key to open "  + docu[i]);
 
             System.in.read();
             while(System.in.available() > 0)
                 System.in.read();
 
-            XComponent rComponent = rLoader.loadComponentFromURL(urls[i], "_blank", 0, new PropertyValue[0]);
+            XComponent rComponent = rLoader.loadComponentFromURL(urls[i], "_blank",	0, new PropertyValue[0]);
 
-//              testWriter(rComponent);
+//    			testWriter(rComponent);
             System.err.println("press any key to close the document");
             System.in.read();
             while(System.in.available() > 0)
@@ -150,11 +150,11 @@ public class TestOffice {
         if(rName != null) {
             System.err.println("got the remote naming service !");
             Object rXsmgr = rName.getRegisteredObject("StarOffice.ServiceManager");
-
+            
             XMultiServiceFactory rSmgr = UnoRuntime.queryInterface(XMultiServiceFactory.class, rXsmgr);
             if(rSmgr != null) {
                 System.err.println("got the remote service manager !");
-//                  testPipe(rSmgr);
+//  				testPipe(rSmgr);
                 testDocument(rSmgr);
             }
         }
@@ -171,7 +171,7 @@ public class TestOffice {
     };
 
     public static void main(String argv[]) throws Exception {
-        if(argv.length != 1)    {
+        if(argv.length != 1)	{
             System.err.println("usage : testoffice uno:connection;protocol;objectName");
             System.exit(-1);
         }
diff --git a/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c b/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
index 0866e452424e..bf88fd32e645 100644
--- a/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
+++ b/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -69,9 +69,9 @@ static rtl_uString * jstring2ustring(JNIEnv * env, jstring jstr);
 
 static oslPipe getPipe(JNIEnv * env, jobject obj_this)
 {
-    jclass      tclass;
-    jfieldID    fid;
-    tclass  = (*env)->GetObjectClass(env, obj_this);
+    jclass		tclass;
+    jfieldID	fid;
+    tclass	= (*env)->GetObjectClass(env, obj_this);
     if (tclass == NULL)
     {
         ThrowException(env,
@@ -80,7 +80,7 @@ static oslPipe getPipe(JNIEnv * env, jobject obj_this)
         return NULL;
     }
 
-    fid     = (*env)->GetFieldID(env, tclass, "_nPipeHandle", "J");
+    fid		= (*env)->GetFieldID(env, tclass, "_nPipeHandle", "J");
     if (fid == NULL)
     {
         ThrowException(env,
@@ -97,9 +97,9 @@ static oslPipe getPipe(JNIEnv * env, jobject obj_this)
 
 static rtl_uString * jstring2ustring(JNIEnv * env, jstring jstr)
 {
-    const char *    cstr;
-    rtl_uString *   ustr    = NULL;
-    cstr    = (*env)->GetStringUTFChars(env, jstr, NULL);
+    const char *	cstr;
+    rtl_uString *	ustr	= NULL;
+    cstr	= (*env)->GetStringUTFChars(env, jstr, NULL);
     rtl_uString_newFromAscii(&ustr, cstr);
     (*env)->ReleaseStringUTFChars(env, jstr, cstr);
     return ustr;
@@ -120,20 +120,20 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_createJNI
   (JNIEnv * env, jobject obj_this, jstring name)
 {
     enum {
-        START   = 0,
+        START	= 0,
         INMONITOR,
         GOTNAME,
         CREATED
     };
 
-    short       state   = START;
+    short		state	= START;
 
-    jclass      tclass;
-    jfieldID    fid;
+    jclass		tclass;
+    jfieldID	fid;
 
     oslSecurity     psec    = osl_getCurrentSecurity();
-    oslPipe         npipe   = NULL;
-    rtl_uString *   pname   = NULL;
+    oslPipe			npipe	= NULL;
+    rtl_uString *	pname	= NULL;
     if ((*env)->MonitorEnter(env, obj_this) != 0)
     {
         ThrowException(env,
@@ -141,10 +141,10 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_createJNI
                        "native pipe cannot synchronize on the object");
         goto error;
     }
-    state   = INMONITOR;
+    state	= INMONITOR;
 
     /* check connection state */
-    npipe   = getPipe(env, obj_this);
+    npipe	= getPipe(env, obj_this);
     if ((*env)->ExceptionOccurred(env) != NULL)
         goto error;
     if (npipe != NULL)
@@ -156,7 +156,7 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_createJNI
     }
 
     /* save the pipe name */
-    tclass  = (*env)->GetObjectClass(env, obj_this);
+    tclass	= (*env)->GetObjectClass(env, obj_this);
     if (tclass == NULL)
     {
         ThrowException(env,
@@ -165,7 +165,7 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_createJNI
         goto error;
     }
 
-    fid     = (*env)->GetFieldID(env, tclass,
+    fid		= (*env)->GetFieldID(env, tclass,
                                  "_aDescription", "Ljava/lang/String;");
     if (fid == NULL)
     {
@@ -178,7 +178,7 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_createJNI
     (*env)->SetObjectField(env, obj_this, fid, (jobject)name);
 
     /* convert pipe name to rtl_uString */
-    pname   = jstring2ustring(env, name);
+    pname	= jstring2ustring(env, name);
     if (pname == NULL)
     {
         ThrowException(env,
@@ -186,10 +186,10 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_createJNI
                        "native pipe cannot convert name");
         goto error;
     }
-    state   = GOTNAME;
+    state	= GOTNAME;
 
     /* try to connect */
-    npipe   = osl_createPipe(pname, osl_Pipe_OPEN, psec);
+    npipe	= osl_createPipe(pname, osl_Pipe_OPEN, psec);
     if (npipe == NULL)
     {
         ThrowException(env,
@@ -197,10 +197,10 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_createJNI
                        "cannot create native pipe");
         goto error;
     }
-    state   = CREATED;
+    state	= CREATED;
 
     /* save the pipe */
-    tclass  = (*env)->GetObjectClass(env, obj_this);
+    tclass	= (*env)->GetObjectClass(env, obj_this);
     if (tclass == NULL)
     {
         ThrowException(env,
@@ -209,7 +209,7 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_createJNI
         goto error;
     }
 
-    fid     = (*env)->GetFieldID(env, tclass, "_nPipeHandle", "J");
+    fid		= (*env)->GetFieldID(env, tclass, "_nPipeHandle", "J");
     if (fid == NULL)
     {
         ThrowException(env,
@@ -259,14 +259,14 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_closeJNI
   (JNIEnv * env, jobject obj_this)
 {
     enum {
-        START   = 0,
+        START	= 0,
         INMONITOR
     };
 
-    short       state   = START;
-    oslPipe     npipe;      /* native pipe */
-    jclass      tclass;     /* this class */
-    jfieldID    fid;        /* a field identifier */
+    short		state	= START;
+    oslPipe		npipe;		/* native pipe */
+    jclass		tclass;		/* this class */
+    jfieldID	fid;		/* a field identifier */
 
     if ((*env)->MonitorEnter(env, obj_this) != 0)
     {
@@ -275,10 +275,10 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_closeJNI
                        "native pipe cannot synchronize on the object");
         goto error;
     }
-    state   = INMONITOR;
+    state	= INMONITOR;
 
     /* check connection state */
-    npipe   = getPipe(env, obj_this);
+    npipe	= getPipe(env, obj_this);
     if ((*env)->ExceptionOccurred(env) != NULL)
         goto error;
     if (npipe == NULL)
@@ -290,7 +290,7 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_closeJNI
     }
 
     /* remove the reference to the pipe */
-    tclass  = (*env)->GetObjectClass(env, obj_this);
+    tclass	= (*env)->GetObjectClass(env, obj_this);
     if (tclass == NULL)
     {
         ThrowException(env,
@@ -299,7 +299,7 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_closeJNI
         goto error;
     }
 
-    fid     = (*env)->GetFieldID(env, tclass, "_nPipeHandle", "J");
+    fid		= (*env)->GetFieldID(env, tclass, "_nPipeHandle", "J");
     if (fid == NULL)
     {
         ThrowException(env,
@@ -345,13 +345,13 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_readJNI
   (JNIEnv * env, jobject obj_this, jobjectArray buffer, jint len)
 {
     enum {
-        START   = 0,
+        START	= 0,
         INMONITOR,
         AQUIRED,
         GOTBUFFER
     };
 
-    short       state   = START;
+    short		state	= START;
     oslPipe     npipe;          /* native pipe */
     void *      nbuff = NULL;   /* native read buffer */
     jbyteArray  bytes;          /* java read buffer */
@@ -368,7 +368,7 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_readJNI
     state = INMONITOR;
 
     /* check connection state */
-    npipe   = getPipe(env, obj_this);
+    npipe	= getPipe(env, obj_this);
     if ((*env)->ExceptionOccurred(env) != NULL)
         goto error;
     if (npipe == NULL)
@@ -412,7 +412,7 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_readJNI
     /* copy buffer */
     if (nread >= 0)
     {
-        bytes   = (*env)->NewByteArray(env, len);
+        bytes	= (*env)->NewByteArray(env, len);
         if (bytes == NULL)
         {
             ThrowException(env,
@@ -465,12 +465,12 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_writeJNI
   (JNIEnv * env, jobject obj_this, jbyteArray buffer)
 {
     enum {
-        START   = 0,
+        START	= 0,
         INMONITOR,
         GOTBUFFER
     };
 
-    short   state   = START;
+    short	state	= START;
     oslPipe npipe;          /* native pipe */
     long    count;          /* number of bytes has been written */
     jsize   nwrite;         /* number of bytes to write */
@@ -483,10 +483,10 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_writeJNI
                        "native pipe cannot synchronize on the object");
         goto error;
     }
-    state   = INMONITOR;
+    state	= INMONITOR;
 
     /* check connection state */
-    npipe   = getPipe(env, obj_this);
+    npipe	= getPipe(env, obj_this);
     if ((*env)->ExceptionOccurred(env) != NULL)
         goto error;
     if (npipe == NULL)
@@ -497,10 +497,10 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_writeJNI
         goto error;
     }
 
-    nwrite  = (*env)->GetArrayLength(env, buffer);
+    nwrite	= (*env)->GetArrayLength(env, buffer);
     if (nwrite > 0)
     {
-        nbuff   = (*env)->GetByteArrayElements(env, buffer, NULL);
+        nbuff	= (*env)->GetByteArrayElements(env, buffer, NULL);
         if (nbuff == NULL)
         {
             ThrowException(env,
@@ -508,11 +508,11 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_writeJNI
                            "native pipe out of memory");
             goto error;
         }
-        state   = GOTBUFFER;
+        state	= GOTBUFFER;
 
         (*env)->MonitorExit(env, obj_this);
         /* writing */
-        count   = osl_writePipe(npipe, nbuff, nwrite);
+        count	= osl_writePipe(npipe, nbuff, nwrite);
         if ((*env)->MonitorEnter(env, obj_this) != 0)
         {
             ThrowException(env,
diff --git a/jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java b/jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java
index d027a412ca5c..781f97e697c2 100644
--- a/jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java
+++ b/jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/test/com/sun/star/comp/connections/PipedConnection_Test.java b/jurt/test/com/sun/star/comp/connections/PipedConnection_Test.java
index 68f9461745e1..41a2e56f3fee 100644
--- a/jurt/test/com/sun/star/comp/connections/PipedConnection_Test.java
+++ b/jurt/test/com/sun/star/comp/connections/PipedConnection_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ public final class PipedConnection_Test extends ComplexTestCase {
 
         Reader reader = new Reader(rightSide, theByte);
         Writer writer = new Writer(leftSide, theByte, reader);
-
+        
         reader.start();
         writer.start();
 
@@ -74,16 +74,16 @@ public final class PipedConnection_Test extends ComplexTestCase {
         public void run() {
             try {
                 byte bytes[][] = new byte[1][];
-
+                
                 while(!_quit) {
                     int read = _pipedConnection.read(bytes, 1);
-
+                    
                     if(read == 1) {
 //                          System.err.println("read :" + bytes[0][0]);
-
+                        
                         if(_theByte[0] != bytes[0][0])
                             throw new NullPointerException();
-
+                        
                         synchronized(this) {
                             notifyAll();
                         }
@@ -91,7 +91,7 @@ public final class PipedConnection_Test extends ComplexTestCase {
                     else
                         _quit = true; // EOF
                 }
-
+                
                 _pipedConnection.close();
                 _state = true;
             }
@@ -122,7 +122,7 @@ public final class PipedConnection_Test extends ComplexTestCase {
                         _pipedConnection.write(_theByte);
                         _pipedConnection.flush();
 //                          System.err.println("written :" + _theByte[0]);
-
+                
                         _reader.wait();
                     }
                     ++ _theByte[0];
diff --git a/jurt/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test.java b/jurt/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test.java
index 5327993fa65b..f56ab6679635 100644
--- a/jurt/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test.java
+++ b/jurt/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/test/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory_Test.java b/jurt/test/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory_Test.java
index 8d0fa09a657a..a83131c0baa3 100644
--- a/jurt/test/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory_Test.java
+++ b/jurt/test/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test.java b/jurt/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test.java
index 42187fa2277c..040cf7063c15 100644
--- a/jurt/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test.java
+++ b/jurt/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/test/com/sun/star/lib/uno/environments/java/java_environment_Test.java b/jurt/test/com/sun/star/lib/uno/environments/java/java_environment_Test.java
index 162c1636c720..80896445e3e4 100644
--- a/jurt/test/com/sun/star/lib/uno/environments/java/java_environment_Test.java
+++ b/jurt/test/com/sun/star/lib/uno/environments/java/java_environment_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ public final class java_environment_Test extends ComplexTestCase {
 
     public void test() {
         java_environment env = new java_environment(null);
-
+        
         Object obj = new Integer(3);
         String[] oid = new String[1];
 
diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test.java b/jurt/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test.java
index 8dc1a767b5fa..1434caed3c58 100644
--- a/jurt/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test.java
+++ b/jurt/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java b/jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java
index 5e83098b8ecd..83829cd955e1 100644
--- a/jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java
+++ b/jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/TestIWorkAt.java b/jurt/test/com/sun/star/lib/uno/environments/remote/TestIWorkAt.java
index 1c616a84541b..c4946208ffec 100644
--- a/jurt/test/com/sun/star/lib/uno/environments/remote/TestIWorkAt.java
+++ b/jurt/test/com/sun/star/lib/uno/environments/remote/TestIWorkAt.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,12 +35,12 @@ import com.sun.star.uno.XInterface;
 public interface TestIWorkAt extends XInterface {
     void syncCall() throws Throwable ;
     void asyncCall() throws Throwable ;
-
+    
     void increment() throws Throwable;
-
+    
     void notifyme();
 
-    public static final TypeInfo UNOTYPEINFO[] = {
+    public static final TypeInfo UNOTYPEINFO[] = { 
         new MethodTypeInfo("increment", 0, 0),
         new MethodTypeInfo("notifyme", 1, 0),
         new MethodTypeInfo("syncCall", 2, 0),
diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/TestMessage.java b/jurt/test/com/sun/star/lib/uno/environments/remote/TestMessage.java
index f47048e423ed..c4bc556960d7 100644
--- a/jurt/test/com/sun/star/lib/uno/environments/remote/TestMessage.java
+++ b/jurt/test/com/sun/star/lib/uno/environments/remote/TestMessage.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ class TestMessage implements IMessage {
     Object   _result;
     String   _operation;
     Object   _params[];
-
+    
     TestMessage(boolean synchron, ITypeDescription iTypeDescription, String oid, ThreadId threadId, Object result, String operation, Object params[]) {
         _synchron  = synchron;
         _iTypeDescription      = iTypeDescription;
@@ -50,39 +50,39 @@ class TestMessage implements IMessage {
         _operation = operation;
         _params    = params;
     }
-
+    
     public String getOperation() {
         return _operation;
     }
-
+    
     public ThreadId getThreadId() {
         return _threadId;
     }
-
+    
     public ITypeDescription getInterface() {
         return _iTypeDescription;
     }
-
+    
     public boolean isSynchron() {
         return _synchron;
     }
-
+    
     public boolean mustReply() {
         return _synchron;
     }
-
+    
     public boolean isException() {
         return false;
     }
-
+    
     public String getOid() {
         return _oid;
     }
-
+    
     public Object getData(Object params[][]) {
         params[0] = _params;
         return _result;
-//              return new Integer(_requestId);
+//  			return new Integer(_requestId);
     }
 }
 
diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/TestReceiver.java b/jurt/test/com/sun/star/lib/uno/environments/remote/TestReceiver.java
index 32ba5ba7473b..0a42d4f2db41 100644
--- a/jurt/test/com/sun/star/lib/uno/environments/remote/TestReceiver.java
+++ b/jurt/test/com/sun/star/lib/uno/environments/remote/TestReceiver.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java b/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java
index 322d7573c697..c45b020dafce 100644
--- a/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java
+++ b/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,10 +37,10 @@ class TestWorkAt implements TestIWorkAt {
 
 
     int _counter;
-
+    
     int _sync_counter;
     int _async_counter;
-
+    
     Thread _sync_thread;
     Thread _async_thread;
 
@@ -49,48 +49,48 @@ class TestWorkAt implements TestIWorkAt {
 
     public void syncCall() throws Throwable {
         ++ _sync_counter;
-
-        if(_async_counter != MESSAGES)
+        
+        if(_async_counter != MESSAGES) 
             _passedAync = false;
-
+        
         if(_sync_thread == null)
             _sync_thread = Thread.currentThread();
 
-//          if(_sync_thread != Thread.currentThread())
-//              _passedAync = false;
+//  		if(_sync_thread != Thread.currentThread())
+//  			_passedAync = false;
 
         if(DEBUG) System.err.println("syncCall:" + _sync_counter + " " + _passedAync + " " + Thread.currentThread());
     }
-
+    
     public void asyncCall() throws Throwable {
-//          Thread.sleep(50);
-
+//  		Thread.sleep(50);
+        
         ++ _async_counter;
 
         if(_async_thread == null)
             _async_thread = Thread.currentThread();
 
-//          if(_async_thread != Thread.currentThread())
-//              _passedAync = false;
+//  		if(_async_thread != Thread.currentThread())
+//  			_passedAync = false;
 
         if(DEBUG) System.err.println("asyncCall:" + _async_counter + " " + Thread.currentThread());
     }
-
+    
     public synchronized void increment() throws Throwable {
         if(DEBUG) System.err.println("increment - " + Thread.currentThread());
-
+        
         ++ _counter;
         notifyAll();
     }
-
+    
     public synchronized void notifyme() {
         if(DEBUG) System.err.println("\t\t\tnotifying me" + Thread.currentThread());
-
+        
         notifyAll();
 
         _notified = true;
     }
-
+    
     public boolean passedAsyncTest() {
         return  _passedAync && (_sync_counter == MESSAGES);
     }
diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadId_Test.java b/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadId_Test.java
index d9154ce6b0ef..b3ff1c75789a 100644
--- a/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadId_Test.java
+++ b/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadId_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java b/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java
index bed90acfbbcb..45c05e72d0f8 100644
--- a/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java
+++ b/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test.java b/jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test.java
index 31d3454bde48..650b65f0e544 100644
--- a/jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test.java
+++ b/jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java b/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java
index 4c01e9acc9c6..20bc5bca3df0 100644
--- a/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java
+++ b/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java b/jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java
index 393720c9756d..d9da63b5a7fd 100644
--- a/jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java
+++ b/jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java b/jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java
index 34f864ae3085..ab84a983fe45 100644
--- a/jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java
+++ b/jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,9 +40,9 @@ class TestBridge implements IBridge {
     static public final boolean DEBUG = false;
 
     Hashtable _hashtable = new Hashtable();
-
+    
     IEnvironment _source ;//= new com.sun.star.lib.uno.environments.java.java_environment(null);
-
+    
 
     class MyEnv implements IEnvironment {
         public Object getContext() {
@@ -75,7 +75,7 @@ class TestBridge implements IBridge {
         public void list() {
         }
     }
-
+    
     TestBridge() {
         _source = new MyEnv();
     }
@@ -92,24 +92,24 @@ class TestBridge implements IBridge {
 
     public Object mapInterfaceFrom(Object object, Type type) {
         String oid = (String)object;
-
+        
         return _hashtable.get(oid);
     }
-
+    
     public IEnvironment getSourceEnvironment() {
         return _source;
     }
-
+    
     public IEnvironment getTargetEnvironment() {
         return null;
     }
-
+    
     public void acquire() {}
 
     public void release() {}
-
+    
     public void reset() throws IOException {}
-
+    
     public void dispose() throws InterruptedException, IOException {}
 }
 
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/TestObject.java b/jurt/test/com/sun/star/lib/uno/protocols/urp/TestObject.java
index f6be37207765..c2ff8a58d4c7 100644
--- a/jurt/test/com/sun/star/lib/uno/protocols/urp/TestObject.java
+++ b/jurt/test/com/sun/star/lib/uno/protocols/urp/TestObject.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl b/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl
index 1b267c434a0f..b1aba4cf7224 100644
--- a/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl
+++ b/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -103,7 +103,7 @@ module protocols { module urp {
         string MethodWithIn_Out_InOut_Paramters_and_result([in] string text, [out] string outtext, [inout] string inouttext) raises( com::sun::star::uno::Exception );
     };
 
-    struct TestInterfaceStruct
+    struct TestInterfaceStruct 
     {
         com::sun::star::uno::XInterface hallo;
 
diff --git a/jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java b/jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java
index fbb92f9b88ee..723d2e0d055a 100644
--- a/jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java
+++ b/jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/test/com/sun/star/uno/AnyConverter_Test.java b/jurt/test/com/sun/star/uno/AnyConverter_Test.java
index 126b009c4e9a..73c972867694 100644
--- a/jurt/test/com/sun/star/uno/AnyConverter_Test.java
+++ b/jurt/test/com/sun/star/uno/AnyConverter_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/test/com/sun/star/uno/UnoRuntime_EnvironmentTest.java b/jurt/test/com/sun/star/uno/UnoRuntime_EnvironmentTest.java
index 0ee0e1d32ccd..eef51f5bb5bd 100644
--- a/jurt/test/com/sun/star/uno/UnoRuntime_EnvironmentTest.java
+++ b/jurt/test/com/sun/star/uno/UnoRuntime_EnvironmentTest.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/test/com/sun/star/uno/WeakReference_Test.java b/jurt/test/com/sun/star/uno/WeakReference_Test.java
index 6520803cb22c..bc81141ddbcc 100644
--- a/jurt/test/com/sun/star/uno/WeakReference_Test.java
+++ b/jurt/test/com/sun/star/uno/WeakReference_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jurt/workbench/com/sun/star/comp/urlresolver/UrlResolver_Test.java b/jurt/workbench/com/sun/star/comp/urlresolver/UrlResolver_Test.java
index a78a2dffd1ad..52c3659c6478 100644
--- a/jurt/workbench/com/sun/star/comp/urlresolver/UrlResolver_Test.java
+++ b/jurt/workbench/com/sun/star/comp/urlresolver/UrlResolver_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmaccess/inc/jvmaccess/classpath.hxx b/jvmaccess/inc/jvmaccess/classpath.hxx
index 917bfbd9f00e..8218289abe9d 100644
--- a/jvmaccess/inc/jvmaccess/classpath.hxx
+++ b/jvmaccess/inc/jvmaccess/classpath.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx b/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
index b14aeda2978c..a951d8c19e1a 100644
--- a/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
+++ b/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmaccess/inc/jvmaccess/virtualmachine.hxx b/jvmaccess/inc/jvmaccess/virtualmachine.hxx
index 275568d2612e..e352badfde20 100644
--- a/jvmaccess/inc/jvmaccess/virtualmachine.hxx
+++ b/jvmaccess/inc/jvmaccess/virtualmachine.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmaccess/source/classpath.cxx b/jvmaccess/source/classpath.cxx
index 102ed1d0325c..8420e98cda67 100644
--- a/jvmaccess/source/classpath.cxx
+++ b/jvmaccess/source/classpath.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmaccess/source/unovirtualmachine.cxx b/jvmaccess/source/unovirtualmachine.cxx
index 436575c95a83..fa76d132fdfe 100644
--- a/jvmaccess/source/unovirtualmachine.cxx
+++ b/jvmaccess/source/unovirtualmachine.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmaccess/source/virtualmachine.cxx b/jvmaccess/source/virtualmachine.cxx
index 9597eed2e8aa..3cebecb998c1 100644
--- a/jvmaccess/source/virtualmachine.cxx
+++ b/jvmaccess/source/virtualmachine.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmaccess/util/cc5_solaris_sparc.map b/jvmaccess/util/cc5_solaris_sparc.map
index e2cb767dc65e..09d7ba756ba1 100644
--- a/jvmaccess/util/cc5_solaris_sparc.map
+++ b/jvmaccess/util/cc5_solaris_sparc.map
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmaccess/util/gcc3.map b/jvmaccess/util/gcc3.map
index 330651a1cf6e..6702986aafd2 100644
--- a/jvmaccess/util/gcc3.map
+++ b/jvmaccess/util/gcc3.map
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmaccess/util/mingw.map b/jvmaccess/util/mingw.map
index ddc4da9a91ea..5457f88f2c10 100644
--- a/jvmaccess/util/mingw.map
+++ b/jvmaccess/util/mingw.map
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmaccess/workbench/exceptiontest1.cxx b/jvmaccess/workbench/exceptiontest1.cxx
index 4a721a91f507..e14292866a06 100644
--- a/jvmaccess/workbench/exceptiontest1.cxx
+++ b/jvmaccess/workbench/exceptiontest1.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmaccess/workbench/exceptiontest2.cxx b/jvmaccess/workbench/exceptiontest2.cxx
index d4008fe58c23..f37fd10fe03b 100644
--- a/jvmaccess/workbench/exceptiontest2.cxx
+++ b/jvmaccess/workbench/exceptiontest2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmaccess/workbench/java/TestComponent.java b/jvmaccess/workbench/java/TestComponent.java
index 4b056b641101..aff3e636ae93 100644
--- a/jvmaccess/workbench/java/TestComponent.java
+++ b/jvmaccess/workbench/java/TestComponent.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmaccess/workbench/javainfo/javainfotest.cxx b/jvmaccess/workbench/javainfo/javainfotest.cxx
index a87cffadfdaf..2d23871f291e 100644
--- a/jvmaccess/workbench/javainfo/javainfotest.cxx
+++ b/jvmaccess/workbench/javainfo/javainfotest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -213,7 +213,7 @@ bool test_compareVersions()
     printf("\ntest JavaInfo::compareVersions \n" \
            "! Check output for correctness\n\n");
 
-
+    
     JavaInfo a(OUSTR("file:///C:/Program%20Files/JavaSoft/JRE/1.3.1"));
     JavaInfo b(OUSTR("file:///C:/Program%20Files/JavaSoft/JRE/1.3.1_04"));
     JavaInfo c(OUSTR("file:///C:/Program%20Files/Java/j2re1.4.0_03"));
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
index 2dd5fe35f555..c4653b94f6ca 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
@@ -2,10 +2,10 @@
 
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+ 
  <updated>2008-08-27</updated>
-
- <vendorInfos>
+ 
+ <vendorInfos> 
   <vendor name="Sun Microsystems Inc.">
     <minVersion>1.5.0</minVersion>
   </vendor>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index ed329e5788d3..2422195465d9 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -2,10 +2,10 @@
 
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+ 
  <updated>2004-01-30</updated>
-
- <vendorInfos>
+ 
+ <vendorInfos> 
   <vendor name="Sun Microsystems Inc.">
     <minVersion>1.5.0</minVersion>
   </vendor>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml
index 2de585472b86..2882c27a04f7 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml
@@ -2,10 +2,10 @@
 
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+ 
  <updated>2004-01-30</updated>
-
- <vendorInfos>
+ 
+ <vendorInfos> 
   <vendor name="Sun Microsystems Inc.">
     <minVersion>1.4.2</minVersion>
   </vendor>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml
index d18dc66585a5..f5040f83c8ee 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-This is a template for the javavendors.xml. It shows how the file could
+This is a template for the javavendors.xml. It shows how the file could 
 look like.
 -->
 
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://openoffice.org/2004/java/framework/1.0 file:/D:/cws-jl6/jvmfwk/source/javavendors.xsd" >
-
+ 
  <updated>2004-01-30</updated>
-
- <vendorInfos>
+ 
+ <vendorInfos> 
   <vendor name="Sun Microsystems Inc.">
     <minVersion>1.3.1</minVersion>
     <maxVersion>1.5.0</maxVersion>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index 3b1f53fc4fce..ffcf9682c620 100755
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -2,10 +2,10 @@
 
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+ 
  <updated>2004-01-30</updated>
-
- <vendorInfos>
+ 
+ <vendorInfos> 
   <vendor name="Sun Microsystems Inc.">
     <minVersion>1.5.0</minVersion>
   </vendor>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index a72216d66646..267f02fb7570 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -2,10 +2,10 @@
 
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+ 
  <updated>2004-01-30</updated>
-
- <vendorInfos>
+ 
+ <vendorInfos> 
   <vendor name="Sun Microsystems Inc.">
     <minVersion>1.5.0</minVersion>
   </vendor>
diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h
index 11cca539cb05..8736bf46f226 100644
--- a/jvmfwk/inc/jvmfwk/framework.h
+++ b/jvmfwk/inc/jvmfwk/framework.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@ extern "C" {
 
 /** @file
     <p>This library can operate in two modes, application mode and direct mode.</p>
-
+    
 
     <h2>Application Mode</h2>
     In application mode the Java related settings are stored in files.
@@ -68,7 +68,7 @@ extern "C" {
     <dd>The file contains settings valid for all users. If a user changes a setting
     then it takes precedence over the setting from UNO_JAVA_JFW_SHARED_DATA.
     The content of this file is an implementation detail and may change in the future.</dd>
-
+    
     <dt>UNO_JAVA_JFW_INSTALL_DATA</dt>
     <dd><b>DEPRECATED. Support for this variable will soon be removed.</b><br>
     The file contains settings for all users. A user cannot override these settings.
@@ -79,7 +79,7 @@ extern "C" {
     default one hour. This value can be overridden by the bootstrap parameter
     UNO_JAVA_JFW_INSTALL_EXPIRE (<b>DEPRECATED</b>). Setting this variable to 1000 means
     the settings file is only valid for 1000 seconds.
-
+    
     <p>If one would not use UNO_JAVA_JFW_INSTALL_DATA during setup then most probably
     a user installation directory would be created in the home directory of root. This is
     because, java settings are determined and stored on behalf of the current user. In other
@@ -89,11 +89,11 @@ extern "C" {
     only people with root rights can install OOo. Then one has to take care that the
     installer removes this file when uninstalling.
     </p>
-
+    
 
     The content of this file is an implementation detail and may change in the future.</dd>
     </dl>
-
+    
     <p>The values for these parameters must be file URLs and include the file name, for
     example:<br>
     file:///d:/MyApp/javavendors.xml<br>
@@ -118,7 +118,7 @@ extern "C" {
     the bootrap parameter UNO_JAVA_JFW_CLASSPATH_URLS. The value contains of file URLs
     which must be separated by spaces.</p>
 
-
+    
     <h2>Direct Mode</h2>
 
     <p>The direct mode is intended for a scenario where no configuration files
@@ -128,7 +128,7 @@ extern "C" {
     For example, tools, such as regcomp, may use this  framework in a build
     environment. Then one would want to use settings which have been specified
     by the build environment. The framework would automatically use the
-    current settings when they change in the environment.
+    current settings when they change in the environment. 
     </p>
 
     <p> Here are examples how regcomp could be invoked using bootstrap parameters:
@@ -174,7 +174,7 @@ extern "C" {
     causes the framework to use the
     environment variable CLASSPATH. If this variable and UNO_JAVA_JFW_CLASSPATH are
     set then the class path is composed from UNO_JAVA_JFW_CLASSPATH and the environment
-    variable CLASSPATH.</dd>
+    variable CLASSPATH.</dd>    
     <dt>UNO_JAVA_JFW_PLUGIN</dt>
     <dd>Specified a file URL to a plugin library. If this variable is provided
     then a javavendors.xml is ignored. It must be provided if no
@@ -189,22 +189,22 @@ extern "C" {
     escape characters. Thats why the Windows path contain double back-slashes.
     One should also take into account that a console may have also special
     escape characters.</p>
-
+    
     <h2>What mode is used</h2>
     <p>
     The default mode is application mode. If at least one bootstrap parameter
     for the direct mode is provided then direct mode is used. </p>
 
-    <p>
+    <p>    
     All settings made by this API are done for the current user if not
-    mentioned differently.</p>
+    mentioned differently.</p>   
 
     <h2>Other bootstrap variables</h2>
     <dl>
     <dt>JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY</dt>
-    <dd>This is a unofficial variable which was introduced to workaround external issues.
-    It may be removed in the future. By setting it to 1, the framework will not try to
-    find out if the system is configured to use accessibility tools or if a JRE has an
+    <dd>This is a unofficial variable which was introduced to workaround external issues. 
+    It may be removed in the future. By setting it to 1, the framework will not try to 
+    find out if the system is configured to use accessibility tools or if a JRE has an 
     accessibiliy bridge installed</dd>
     </dl>
 */
@@ -333,7 +333,7 @@ sal_Bool SAL_CALL jfw_areEqualJavaInfo(
     JavaInfo const * pInfoA,JavaInfo const * pInfoB);
 
 /** determines if a Java Virtual Machine is already running.
-
+    
     <p>As long as the the office and the JREs only support one
     Virtual Machine per process the Java settings, particulary the
     selected Java, are not effective immediatly after changing when
@@ -400,7 +400,7 @@ javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool *bRunning);
     the first <code>JavaInfo</code> object from the list obtained by the
     first plug-in is used. If this plug-in does not find any JREs then the
     next plug-in is used, and so on.</p>
-
+    
     @param ppInfo
     [out] a <code>JavaInfo</code> pointer, representing the selected JRE.
     The caller has to free it by calling <code>jfw_freeJavaInfo<code>. The
@@ -462,13 +462,13 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(
    The functions only checks if a JRE exists but does not modify any settings.
    To make the found JRE the &quot;selected JRE&quot; one has
    to call <code>jfw_setSelectedJRE</code>.</p>
-
+   
    @param pPath
    [in] a file URL to a directory.
    @param pInfo
    [out] the <code>JavaInfo</code> object which represents a JRE found at the
    location specified by <code>pPath</code>
-
+   
    @return
    JFW_E_NONE function ran successfully.<br/>
    JFW_E_INVALID_ARG at least on of the parameters was NULL<br/>
@@ -522,7 +522,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
     [out] the <code>JavaVM</code> pointer.
     @param ppEnv
     [out] the <code>JNIenv</code> pointer.
-
+    
     @return
     JFW_E_NONE function ran successfully.<br/>
     JFW_E_INVALID_ARG <code>ppVM</code>, <code>ppEnv</code> are NULL or
@@ -645,14 +645,14 @@ javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled);
 javaFrameworkError SAL_CALL jfw_getEnabled(sal_Bool *pbEnabled);
 
 /** determines parameters which are passed to VM during its creation.
-
+    
     <p>The strings must be exactly as they are passed on the command line.
     For example, one could pass<br/>
     -Xdebug <br/>
     -Xrunjdw:transport=dt_socket,server=y,address=8000<br/>
     in order to enable debugging support.
     </p>
-
+    
     @param arParameters
     [in] contains the arguments. It can be NULL if nSize is 0.
     @param nSize
@@ -670,7 +670,7 @@ javaFrameworkError SAL_CALL jfw_setVMParameters(
     rtl_uString **  arArgs, sal_Int32 nSize);
 
 /** obtains the currently used start parameters.
-
+   
     <p>The caller needs to free the returned array with
     <code>rtl_freeMemory</code>. The contained strings must be released with
     <code>rtl_uString_release</code>.
@@ -682,7 +682,7 @@ javaFrameworkError SAL_CALL jfw_setVMParameters(
     @param pSize
     [out] on return contains the size of array returned in
     <code>parParameters</code>
-
+    
     @return
     JFW_E_NONE function ran successfully.<br/>
     JFW_E_INVALIDARG parParameters or pSize are  NULL<br/>
@@ -704,7 +704,7 @@ javaFrameworkError SAL_CALL jfw_getVMParameters(
 
    @param pCP
    [in] the user class path.
-
+   
    @return
    JFW_E_NONE function ran successfully.<br/>
    JFW_E_INVALIDARG pCP is NULL.<br/>
@@ -718,7 +718,7 @@ javaFrameworkError SAL_CALL jfw_setUserClassPath(rtl_uString * pCP);
 
    <p>The function returns an empty string if no user class path is set.
    </p>
-
+   
    @param ppCP
    [out] contains the user class path on return. If <code>*ppCP</code> was
    not NULL then the value is overwritten. No attempt at freeing that string
@@ -748,7 +748,7 @@ javaFrameworkError SAL_CALL jfw_getUserClassPath(rtl_uString ** ppCP);
     </p>
     <p>
     Adding a path that is already stored causes no error.</p>
-
+    
     @param sLocation
     [in] file URL to a directory which contains a JRE.
 
@@ -802,7 +802,7 @@ javaFrameworkError SAL_CALL jfw_setJRELocations(
     [out] on return it contains the array of paths.
     @param pSize
     [out] on return it contains the size of the array <code>parLocations</code>.
-
+    
     @return
     JFW_E_NONE function ran successfully.<br/>
     JFW_E_INVALIDARG parLocation is NULL or pSize is NULL.<br/>
@@ -826,7 +826,7 @@ javaFrameworkError SAL_CALL jfw_getJRELocations(
     @param pp_exist
         [out] the parameter is set to either sal_True or sal_False. The value is
         only valid if the function returns JFW_E_NONE.
-
+    
    @return
     JFW_E_NONE the function ran successfully.</br>
     JFW_E_ERROR an error occurred during execution.</br>
@@ -858,7 +858,7 @@ void SAL_CALL jfw_lock();
     <p>This function is called after <code>jfw_lock</code>. It allows other
     threads to use this API concurrently.</p>
 */
-void SAL_CALL jfw_unlock();
+void SAL_CALL jfw_unlock(); 
 
 
 #ifdef __cplusplus
diff --git a/jvmfwk/inc/jvmfwk/vendorplugin.h b/jvmfwk/inc/jvmfwk/vendorplugin.h
index 3ccbb0e487f4..2fbfa44ba0a8 100644
--- a/jvmfwk/inc/jvmfwk/vendorplugin.h
+++ b/jvmfwk/inc/jvmfwk/vendorplugin.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -100,7 +100,7 @@ typedef enum
         a vendor string. That is, the string it is not empty.
     @param sMinVersion
         [in] represents the minimum version of a JRE. The string can be empty but
-        a null pointer is not allowed.
+        a null pointer is not allowed. 
     @param sMaxVersion
         [in] represents the maximum version of a JRE. The string can be empty but
         a null pointer is not allowed.
@@ -115,7 +115,7 @@ typedef enum
     @param nSizeJavaInfo
        [out] the number of <code>JavaInfo</code> pointers contained in
        <code>parJavaInfo</code>.
-
+    
     @return
     JFW_PLUGIN_E_NONE the function ran successfully.</br>
     JFW_PLUGIN_E_ERROR an error occurred during execution.</br>
@@ -149,9 +149,9 @@ javaPluginError jfw_plugin_getAllJavaInfos(
       [in] a name of a vendor. This parameter always contains
         a vendor string. That is, the string it is not empty.
    @param sMinVersion
-       [in] represents the minimum version of a JRE.
+       [in] represents the minimum version of a JRE. 
    @param sMaxVersion
-       [in] represents the maximum version of a JRE.
+       [in] represents the maximum version of a JRE. 
    @param arExcludeList
        [in] contains a list of &quot;bad&quot; versions. JREs which have one of these
         versions must not be returned by this function. It can be NULL.
@@ -206,7 +206,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
     Therefore the functions which create the <code>JavaInfo</code> can store all
     necessary information which are needed for starting the VM into that
     structure. </p>
-
+    
     @param pInfo
         [in] the JavaInfo object with information about the JRE.
     @param arOptions
@@ -231,7 +231,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
     by the JRE.
  */
 javaPluginError jfw_plugin_startJavaVirtualMachine(
-    const JavaInfo *pInfo,
+    const JavaInfo *pInfo, 
     const JavaVMOption *arOptions,
     sal_Int32 nSizeOptions,
     JavaVM ** ppVM,
@@ -250,7 +250,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
     @param pp_exist
         [out] the parameter is set to either sal_True or sal_False. The value is
         only valid if the function returns JFW_E_NONE.
-
+    
    @return
     JFW_PLUGIN_E_NONE the function ran successfully.</br>
     JFW_PLUGIN_E_ERROR an error occurred during execution.</br>
diff --git a/jvmfwk/inc/pch/precompiled_jvmfwk.cxx b/jvmfwk/inc/pch/precompiled_jvmfwk.cxx
index 80c3bb3ee344..f0364dd413e2 100644
--- a/jvmfwk/inc/pch/precompiled_jvmfwk.cxx
+++ b/jvmfwk/inc/pch/precompiled_jvmfwk.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmfwk/inc/pch/precompiled_jvmfwk.hxx b/jvmfwk/inc/pch/precompiled_jvmfwk.hxx
index 8b4018782e42..9b7cd9ddfa8f 100644
--- a/jvmfwk/inc/pch/precompiled_jvmfwk.hxx
+++ b/jvmfwk/inc/pch/precompiled_jvmfwk.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 2c13780ad421..3f9fb9fca345 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -78,7 +78,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         return -1;
     }
 
-
+    
     JavaInfo * pInfo = NULL;
     errcode = jfw_getSelectedJRE( & pInfo);
 
@@ -92,7 +92,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         fprintf(stderr,"javaldx failed! \n");
         return -1;
     }
-
+    
     if (pInfo == NULL)
     {
         if (false == findAndSelect(&pInfo))
@@ -114,7 +114,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
             return -1;
         }
     }
-
+    
     //Only do something if the sunjavaplugin created this JavaInfo
     rtl::OUString sVendor1(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems Inc."));
     rtl::OUString sVendor2(RTL_CONSTASCII_USTRINGPARAM("IBM Corporation"));
@@ -133,11 +133,11 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
             || sVendor7.equals(pInfo->sVendor) == sal_True
             || sVendor8.equals(pInfo->sVendor) == sal_True))
         return 0;
-
+    
     rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
     fprintf(stdout, "%s\n", sPaths.getStr());
     jfw_freeJavaInfo(pInfo);
-
+    
     return 0;
 }
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java b/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
index b0930e1c93f3..28b67945ac78 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
+++ b/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
@@ -30,8 +30,8 @@ public class JREProperties
             //#i44608.
             boolean bW98 = false;
             String os = System.getProperty("os.name");
-
-            if (os != null)
+            
+            if (os != null) 
             {
                 os = os.trim();
                 if (os.equalsIgnoreCase("Windows 98") ||
@@ -48,7 +48,7 @@ public class JREProperties
             if (bNoAccess == false && ! bW98)
             {
                 try{
-                    //This line is needed to get the accessibility properties
+                    //This line is needed to get the accessibility properties 
                     Toolkit tk = java.awt.Toolkit.getDefaultToolkit();
                 }
                 catch(Throwable e)
@@ -81,5 +81,5 @@ public class JREProperties
     }
 
 
-
+    
 }
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h b/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
index 6a8ef3232bc4..ae7796d94065 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
+++ b/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index f97fba340cc4..4fb35d49c4af 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -79,7 +79,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
 {
     //get java.vendor, java.version, java.home,
     //javax.accessibility.assistive_technologies from system properties
-
+    
     OUString sVendor;
     OUString sJavaLibraryPath;
     typedef vector<pair<OUString, OUString> >::const_iterator it_prop;
@@ -164,11 +164,11 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
     // init m_sRuntimeLibrary
     OSL_ASSERT(m_sHome.getLength());
     //call virtual function to get the possible paths to the runtime library.
-
+    
     int size = 0;
     char const* const* arRtPaths = getRuntimePaths( & size);
     vector<OUString> libpaths = getVectorFromCharArray(arRtPaths, size);
-
+    
     bool bRt = false;
     typedef vector<OUString>::const_iterator i_path;
     for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++)
@@ -276,7 +276,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
     }
     if (bLdPath == false)
         return false;
-
+    
     return true;
 }
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
index 413ff4bd1c38..80bca6c29628 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index 9da3df2a2fdc..152d4431e8bc 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -93,7 +93,7 @@ char const* const* OtherInfo::getRuntimePaths(int * size)
 char const* const* OtherInfo::getLibraryPaths(int* size)
 {
 
-#ifdef UNX
+#ifdef UNX        
     static char const * ar[] = {
 #ifdef MACOSX
         //mac version does not have a ld library path anymore
@@ -121,7 +121,7 @@ char const* const* OtherInfo::getLibraryPaths(int* size)
 
 int OtherInfo::compareVersions(const rtl::OUString& /*sSecond*/) const
 {
-    //Need to provide an own algorithm for comparing version.
+    //Need to provide an own algorithm for comparing version. 
     //Because this function returns always 0, which means the version of
     //this JRE and the provided version "sSecond" are equal, one cannot put
     //any excludeVersion entries in the javavendors.xml file.
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
index 9f54cf0ea5eb..7211ad11f679 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index cff9cdfa05af..1ff9766af6c3 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,13 +65,13 @@ using namespace jfw_plugin;
 
 namespace {
 
-struct PluginMutex: public ::rtl::Static<osl::Mutex, PluginMutex> {};
+struct PluginMutex: public ::rtl::Static<osl::Mutex, PluginMutex> {}; 
 
 #if defined UNX
 OString getPluginJarPath(
     const OUString & sVendor,
     const OUString& sLocation,
-    const OUString& sVersion)
+    const OUString& sVersion) 
 {
     OString ret;
     OUString sName1(RTL_CONSTASCII_USTRINGPARAM("javaplugin.jar"));
@@ -83,7 +83,7 @@ OString getPluginJarPath(
         SunVersion ver150("1.5.0-ea");
         SunVersion ver(sVersion);
         OSL_ASSERT(ver142 && ver150 && ver);
-
+        
         OUString sName;
         if (ver < ver142)
         {
@@ -116,12 +116,12 @@ OString getPluginJarPath(
                 == osl_File_E_None)
             {
                 sPath = sPath1 + OUString::createFromAscii(sep) + sPath2;
-            }
+            }   
         }
         OSL_ASSERT(sPath.getLength());
     }
     ret = rtl::OUStringToOString(sPath, osl_getThreadTextEncoding());
-
+    
     return ret;
 }
 #endif // UNX
@@ -151,7 +151,7 @@ JavaInfo* createJavaInfo(const rtl::Reference<VendorBase> & info)
         buf.append(info->getLibraryPaths());
         buf.appendAscii("\n");
     }
-
+    
     rtl::OUString sVendorData = buf.makeStringAndClear();
     rtl::ByteSequence byteSeq( (sal_Int8*) sVendorData.pData->buffer,
                                sVendorData.getLength() * sizeof(sal_Unicode));
@@ -159,7 +159,7 @@ JavaInfo* createJavaInfo(const rtl::Reference<VendorBase> & info)
     rtl_byte_sequence_acquire(pInfo->arVendorData);
 
     return pInfo;
-}
+}   
 
 rtl::OUString getRuntimeLib(const rtl::ByteSequence & data)
 {
@@ -169,7 +169,7 @@ rtl::OUString getRuntimeLib(const rtl::ByteSequence & data)
     //the runtime lib is on the first line
     sal_Int32 index = 0;
     rtl::OUString aToken = sData.getToken( 0, '\n', index);
-
+    
     return aToken;
 }
 
@@ -228,14 +228,14 @@ javaPluginError jfw_plugin_getAllJavaInfos(
         getAllJREInfos();
     vector<rtl::Reference<VendorBase> > vecVerifiedInfos;
 
-    typedef vector<rtl::Reference<VendorBase> >::iterator it;
+    typedef vector<rtl::Reference<VendorBase> >::iterator it;    
     for (it i= vecInfos.begin(); i != vecInfos.end(); i++)
     {
         const rtl::Reference<VendorBase>& cur = *i;
-
+        
         if (ouVendor.equals(cur->getVendor()) == sal_False)
             continue;
-
+        
         if (ouMinVer.getLength() > 0)
         {
             try
@@ -249,11 +249,11 @@ javaPluginError jfw_plugin_getAllJavaInfos(
                 JFW_ENSURE(
                     0,OUSTR("[Java framework]sunjavaplugin does not know version: ")
                     + ouMinVer + OUSTR(" for vendor: ") + cur->getVendor()
-                    + OUSTR(" .Check minimum Version.") );
+                    + OUSTR(" .Check minimum Version.") );                    
                 return JFW_PLUGIN_E_WRONG_VERSION_FORMAT;
             }
         }
-
+        
         if (ouMaxVer.getLength() > 0)
         {
             try
@@ -271,7 +271,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
                 return JFW_PLUGIN_E_WRONG_VERSION_FORMAT;
             }
         }
-
+        
         if (arExcludeList > 0)
         {
             bool bExclude = false;
@@ -328,7 +328,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
     JavaInfo ** ppInfo)
 {
     javaPluginError errcode = JFW_PLUGIN_E_NONE;
-
+    
     OSL_ASSERT(path);
     OSL_ASSERT(sVendor);
     OSL_ASSERT(sMinVersion);
@@ -345,7 +345,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
     OSL_ASSERT( ! (arExcludeList == NULL && nLenList > 0));
     if (arExcludeList == NULL && nLenList > 0)
         return JFW_PLUGIN_E_INVALID_ARG;
-
+    
     OUString ouVendor(sVendor);
     OUString ouMinVer(sMinVersion);
     OUString ouMaxVer(sMaxVersion);
@@ -353,15 +353,15 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
     OSL_ASSERT(ouVendor.getLength() > 0);
     if (ouVendor.getLength() == 0)
         return JFW_PLUGIN_E_INVALID_ARG;
-
+        
     rtl::Reference<VendorBase> aVendorInfo = getJREInfoByPath(ouPath);
     if (aVendorInfo.is() == sal_False)
         return JFW_PLUGIN_E_NO_JRE;
-
+    
     //Check if the detected JRE matches the version requirements
     if (ouVendor.equals(aVendorInfo->getVendor()) == sal_False)
         return JFW_PLUGIN_E_NO_JRE;
-
+    
     if (ouMinVer.getLength() > 0)
     {
         int nRes = 0;
@@ -381,7 +381,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
         if (nRes < 0)
             return JFW_PLUGIN_E_FAILED_VERSION;
     }
-
+    
     if (ouMaxVer.getLength() > 0)
     {
         int nRes = 0;
@@ -401,7 +401,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
         if (nRes > 0)
             return JFW_PLUGIN_E_FAILED_VERSION;
     }
-
+    
     if (arExcludeList > 0)
     {
         for (int i = 0; i < nLenList; i++)
@@ -438,7 +438,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
  */
 extern "C"
 javaPluginError jfw_plugin_startJavaVirtualMachine(
-    const JavaInfo *pInfo,
+    const JavaInfo *pInfo, 
     const JavaVMOption* arOptions,
     sal_Int32 cOptions,
     JavaVM ** ppVm,
@@ -493,7 +493,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
     typedef jint JNICALL JNI_CreateVM_Type(JavaVM **, JNIEnv **, void *);
     rtl::OUString sSymbolCreateJava(
             RTL_CONSTASCII_USTRINGPARAM("JNI_CreateJavaVM"));
-
+        
     JNI_CreateVM_Type * pCreateJavaVM = (JNI_CreateVM_Type *) osl_getFunctionSymbol(
         moduleRt, sSymbolCreateJava.pData);
     if (!pCreateJavaVM)
@@ -516,7 +516,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
     boost::scoped_array<JavaVMOption> sarOptions(
         new JavaVMOption[cOptions + 1]);
     JavaVMOption * options = sarOptions.get();
-
+    
     // We set an abort handler which is called when the VM calls _exit during
     // JNI_CreateJavaVM. This happens when the LD_LIBRARY_PATH does not contain
     // all some directories of the Java installation. This is necessary for
@@ -544,7 +544,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
         }
         else
         {
-#endif
+#endif        
             options[i+1].optionString = arOptions[i].optionString;
             options[i+1].extraInfo = arOptions[i].extraInfo;
 #ifdef UNX
@@ -588,7 +588,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
         // set err to a positive number, so as or recognize that an abort (longjmp)
         //occurred
         err= 1;
-
+    
     if(err != 0)
     {
         rtl::OUString message;
@@ -610,8 +610,8 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
         *ppVm = pJavaVM;
         JFW_TRACE2("[Java framework] sunjavaplugin"SAL_DLLEXTENSION " has created a VM.\n");
     }
-
-
+        
+        
    return errcode;
 }
 
@@ -647,7 +647,7 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
     {
         rtl::OUString sRuntimeLib = getRuntimeLib(pInfo->arVendorData);
         JFW_TRACE2(OUSTR("[Java framework] Checking existence of Java runtime library.\n"));
-
+     
         ::osl::DirectoryItem itemRt;
         ::osl::File::RC rc_itemRt = ::osl::DirectoryItem::get(sRuntimeLib, itemRt);
         if (::osl::File::E_None == rc_itemRt)
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.map b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.map
index 901867f0a43d..c08817d69cff 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.map
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.map
@@ -9,5 +9,5 @@ UDK_3_0_0 {
 
 UDK_3.1 { # OOo 3.3
     global:
-    jfw_plugin_existJRE;
+    jfw_plugin_existJRE;	
 } UDK_3_0_0;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 81355dda210c..852c7cbfa638 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -85,14 +85,14 @@ char const* const* SunInfo::getRuntimePaths(int * size)
 
 char const* const* SunInfo::getLibraryPaths(int* size)
 {
-#ifdef UNX
+#ifdef UNX        
     static char const * ar[] = {
 
         "/lib/" JFW_PLUGIN_ARCH "/client",
 #if defined(OPENBSD)
         "/lib/" JFW_PLUGIN_ARCH "/server",
 #endif
-        "/lib/" JFW_PLUGIN_ARCH "/native_threads",
+        "/lib/" JFW_PLUGIN_ARCH "/native_threads", 
         "/lib/" JFW_PLUGIN_ARCH
 
     };
@@ -107,7 +107,7 @@ char const* const* SunInfo::getLibraryPaths(int* size)
 int SunInfo::compareVersions(const rtl::OUString& sSecond) const
 {
     OUString sFirst = getVersion();
-
+    
     SunVersion version1(sFirst);
     JFW_ENSURE(version1, OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION
                                " does not know the version: ")
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
index 5851b16c8143..f862a616b535 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index 53051c905d41..5f71afbd42b0 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,9 +50,9 @@ class SelfTest
 public:
     SelfTest();
 } test;
-#endif
+#endif    
 
-SunVersion::SunVersion(const rtl::OUString &usVer):
+SunVersion::SunVersion(const rtl::OUString &usVer): 
     m_nUpdateSpecial(0), m_preRelease(Rel_NONE),
     usVersion(usVer)
 {
@@ -60,7 +60,7 @@ SunVersion::SunVersion(const rtl::OUString &usVer):
     rtl::OString sVersion= rtl::OUStringToOString(usVer, osl_getThreadTextEncoding());
     m_bValid = init(sVersion.getStr());
 }
-SunVersion::SunVersion(const char * szVer):
+SunVersion::SunVersion(const char * szVer): 
     m_nUpdateSpecial(0), m_preRelease(Rel_NONE)
 {
     memset(m_arVersionParts, 0, sizeof(m_arVersionParts));
@@ -75,7 +75,7 @@ bool SunVersion::init(const char *szVersion)
 {
     if ( ! szVersion || strlen(szVersion) == 0)
         return false;
-
+    
     //first get the major,minor,maintainance
     const char * pLast = szVersion;
     const char * pCur = szVersion;
@@ -110,26 +110,26 @@ bool SunVersion::init(const char *szVersion)
                 pCur + 1 == pEnd ? isdigit(*(pCur)) : 1) )
         {
             int len = pCur - pLast;
-            if (len >= 127)
+            if (len >= 127) 
                 return false;
 
             strncpy(buf, pLast, len);
             buf[len] = 0;
-            pCur ++;
+            pCur ++; 
             pLast = pCur;
-
+            
             m_arVersionParts[nPart] = atoi(buf);
             nPart ++;
             nPartPos = 0;
             if (nPart == 3)
                 break;
-
+            
             //check next character
-            if (! ( (pCur < pEnd)
+            if (! ( (pCur < pEnd) 
                     && ( (nPart < 3) && isdigit(*pCur)))) //(*pCur >= 48 && *pCur <=57))))
-                return false;
+                return false;                    
         }
-        else
+        else 
         {
             return false;
         }
@@ -183,9 +183,9 @@ bool SunVersion::init(const char *szVersion)
                 if (pCur < pEnd)
                     pCur ++;
                 else
-                    break;
+                    break;   
             }
-        }
+        }           
     }
     // 1.4.1-ea
     else if (*(pCur - 1) == '-')
@@ -193,7 +193,7 @@ bool SunVersion::init(const char *szVersion)
         m_preRelease = getPreRelease(pCur);
         if (m_preRelease == Rel_NONE)
             return false;
-#if defined(FREEBSD)
+#if defined(FREEBSD)        
       if (m_preRelease == Rel_FreeBSD)
       {
           pCur++; //elemnate `p'
@@ -207,7 +207,7 @@ bool SunVersion::init(const char *szVersion)
           m_nUpdateSpecial = atoi(buf)+100; //hack for FBSD #i56953#
           return true;
       }
-#endif
+#endif        
     }
     else
     {
@@ -247,7 +247,7 @@ SunVersion::PreRelease SunVersion::getPreRelease(const char *szRelease)
 #if defined (FREEBSD)
     else if (! strncmp(szRelease, "p", 1))
         return Rel_FreeBSD;
-#endif
+#endif    
     else
         return Rel_NONE;
 }
@@ -261,14 +261,14 @@ SunVersion::~SunVersion()
    a) 1.0 < 1.1
    b) 1.0 < 1.0.0
    c)  1.0 < 1.0_00
-
+   
    returns false if both values are equal
 */
 bool SunVersion::operator > (const SunVersion& ver) const
 {
     if( &ver == this)
         return false;
-
+    
     //compare major.minor.maintainance
     for( int i= 0; i < 4; i ++)
     {
@@ -284,13 +284,13 @@ bool SunVersion::operator > (const SunVersion& ver) const
     }
     //major.minor.maintainance_update are equal. test for a trailing char
     if (m_nUpdateSpecial > ver.m_nUpdateSpecial)
-    {
+    {   
         return true;
     }
 
     //Until here the versions are equal
     //compare pre -release values
-    if ((m_preRelease == Rel_NONE && ver.m_preRelease == Rel_NONE)
+    if ((m_preRelease == Rel_NONE && ver.m_preRelease == Rel_NONE) 
         ||
         (m_preRelease != Rel_NONE && ver.m_preRelease == Rel_NONE))
         return false;
@@ -298,12 +298,12 @@ bool SunVersion::operator > (const SunVersion& ver) const
         return true;
     else if (m_preRelease > ver.m_preRelease)
         return true;
-
+    
     return false;
 }
 
 bool SunVersion::operator < (const SunVersion& ver) const
-{
+{        
     return (! operator > (ver)) && (! operator == (ver));
 }
 
@@ -336,7 +336,7 @@ SelfTest::SelfTest()
     char const * versions[] = {"1.4.0", "1.4.1", "1.0.0", "10.0.0", "10.10.0",
                          "10.2.2", "10.10.0", "10.10.10", "111.0.999",
                          "1.4.1_01", "9.90.99_09", "1.4.1_99",
-                         "1.4.1_00a",
+                         "1.4.1_00a", 
                          "1.4.1-ea", "1.4.1-beta", "1.4.1-rc1",
                          "1.5.0_01-ea", "1.5.0_01-rc2"};
     char const * badVersions[] = {".4.0", "..1", "", "10.0", "10.10.0.", "10.10.0-", "10.10.0.",
@@ -359,10 +359,10 @@ SelfTest::SelfTest()
         {
             bRet = false;
             break;
-        }
+        }            
     }
     OSL_ENSURE(bRet, "SunVersion selftest failed");
-    //Parsing test (negative)
+    //Parsing test (negative)    
     for ( int i = 0; i < numBad; i++)
     {
         SunVersion ver(badVersions[i]);
@@ -394,7 +394,7 @@ SelfTest::SelfTest()
                 {
                     bRet = false;
                     break;
-                }
+                }      
             }
             else if ( i == j)
             {
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
index 4e51f7a0a7a6..448100bbc327 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 
 #include "rtl/ustring.hxx"
 
-namespace jfw_plugin {
+namespace jfw_plugin { 
 // Define OSL_DEBUG_LEVEL >= 2 to run a test when this lib is loaded
 
 /* SunVersion is used to compare java versions based on a string, as taken
@@ -46,7 +46,7 @@ namespace jfw_plugin {
 
    This class supports also a FreeBSD Java. This is currently necessary because
    it also has the vendor string "Sun Microsystems Inc.".
-
+   
    An object acts as holder for the version string. That string may be present
    even if the version could not be parsed. Then the version may not be compatible
    to a SUN Java version.
@@ -54,7 +54,7 @@ namespace jfw_plugin {
    An invalid object, that is, operator bool returns false, will always be
    the lower version in a comparison. If two invalid objects are compared
    then they are considered equal.
-
+   
    To test if the version is ok, that is this object can be compared to others,
    use the bool conversion operator.
  */
@@ -104,7 +104,7 @@ public:
 
     /** Test if the version is compatible tu SUN's versioning scheme
      */
-    operator bool ();
+    operator bool (); 
 
     /** Will always contain a value if the object has been constructed with
         a version string.
@@ -123,7 +123,7 @@ protected:
     PreRelease getPreRelease(const char *szRel);
 };
 
-}
+} 
 
 #endif // INCLUDED_JVMACCESS_SUNVERSION_HXX
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 75c1a96de7bf..3612169e6ed3 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -74,11 +74,11 @@ using namespace std;
 namespace {
 char const *g_arJavaNames[] = {
     "",
-    "j2re",
-    "j2se",
+    "j2re", 
+    "j2se", 
     "j2sdk",
     "jdk",
-    "jre",
+    "jre", 
     "java",
     "Home",
     "IBMJava2-ppc-142"
@@ -87,11 +87,11 @@ char const *g_arJavaNames[] = {
  */
 char const *g_arCollectDirs[] = {
     "",
-    "j2re/",
-    "j2se/",
+    "j2re/", 
+    "j2se/", 
     "j2sdk/",
     "jdk/",
-    "jre/",
+    "jre/", 
     "java/",
     "jvm/"
 };
@@ -133,7 +133,7 @@ namespace
 {
     rtl::OUString getLibraryLocation()
     {
-        rtl::OUString libraryFileUrl;
+        rtl::OUString libraryFileUrl;    
         OSL_VERIFY(osl::Module::getUrlFromAddress((void *)(sal_IntPtr)getLibraryLocation, libraryFileUrl));
         return getDirFromFile(libraryFileUrl);
     }
@@ -144,7 +144,7 @@ namespace
         {
             static rtl::Bootstrap aInstance(sIni);
             return & aInstance;
-
+            
         }
    };
 
@@ -289,7 +289,7 @@ class AsynchReader: public Thread
 {
     size_t  m_nDataSize;
     boost::scoped_array<sal_Char> m_arData;
-
+    
     bool m_bError;
     bool m_bDone;
     FileHandleGuard m_aGuard;
@@ -302,7 +302,7 @@ public:
     /** only call this function after this thread has finished.
 
         That is, call join on this instance and then call getData.
-
+        
      */
     OString getData();
 #endif
@@ -335,12 +335,12 @@ void AsynchReader::run()
         case osl_File_E_PIPE: //HACK! for windows
             nRead = 0;
         case osl_File_E_None:
-            break;
+            break;            
         default:
             m_bError = true;
             return;
         }
-
+        
         if (nRead == 0)
         {
             m_bDone = true;
@@ -390,7 +390,7 @@ bool getJavaProps(const OUString & exePath,
     //that it calls   java.awt.Toolkit.getDefaultToolkit();
     OUString sValue;
     getBootstrap()->getFrom(OUSTR("JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY"), sValue);
-
+    
     //prepare the arguments
     sal_Int32 cArgs = 3;
     OUString arg1 = OUString(RTL_CONSTASCII_USTRINGPARAM("-classpath"));// + sClassPath;
@@ -405,7 +405,7 @@ bool getJavaProps(const OUString & exePath,
         args[3] = arg4.pData;
         cArgs = 4;
     }
-
+    
     oslProcess javaProcess= 0;
     oslFileHandle fileOut= 0;
     oslFileHandle fileErr= 0;
@@ -477,7 +477,7 @@ bool getJavaProps(const OUString & exePath,
     stderrReader.join();
     JFW_TRACE2(OString("[Java framework]  Java wrote to stderr:\" ")
                + stderrReader.getData() + OString(" \".\n"));
-
+    
     TimeValue waitMax= {5 ,0};
     procErr = osl_joinProcessWithTimeout(javaProcess, &waitMax);
     OSL_ASSERT(procErr == osl_Process_E_None);
@@ -544,7 +544,7 @@ void createJavaInfoFromWinReg(std::vector<rtl::Reference<VendorBase> > & vecInfo
 }
 
 
-bool getJavaInfoFromRegistry(const wchar_t* szRegKey,
+bool getJavaInfoFromRegistry(const wchar_t* szRegKey, 
                              vector<OUString>& vecJavaHome)
 {
     HKEY    hRoot;
@@ -554,8 +554,8 @@ bool getJavaInfoFromRegistry(const wchar_t* szRegKey,
         DWORD dwIndex = 0;
         const DWORD BUFFSIZE = 1024;
         wchar_t bufVersion[BUFFSIZE];
-//      char bufVersion[BUFFSIZE];
-        DWORD nNameLen = BUFFSIZE;
+//		char bufVersion[BUFFSIZE];
+        DWORD nNameLen = BUFFSIZE;	
         FILETIME fileTime;
         nNameLen = sizeof(bufVersion);
 
@@ -648,7 +648,7 @@ void bubbleSortVersion(vector<rtl::Reference<VendorBase> >& vec)
             // valid version
 
             //check if version of current is recognized, by comparing it with itself
-            try
+            try 
             {
                 cur->compareVersions(cur->getVersion());
             }
@@ -660,13 +660,13 @@ void bubbleSortVersion(vector<rtl::Reference<VendorBase> >& vec)
             if (nCmp == 0)
             {
                 try
-                {
+                {			
                     nCmp = cur->compareVersions(next->getVersion());
                 }
                 catch (MalformedVersionException & )
                 {
                     //The second version is invalid, therefor it is regardes less.
-                    nCmp = 1;
+                    nCmp = 1; 
                 }
             }
             if(nCmp == 1) // cur > next
@@ -722,7 +722,7 @@ bool getJREInfoFromBinPath(
                 // jre/bin/jre -> jre/bin
                 OUString sMapPath(i->getStr(), index);
                 index = sBinPath.lastIndexOf(sMapPath);
-                if (index != -1
+                if (index != -1 
                     && (index + sMapPath.getLength() == sBinPath.getLength())
                     && sBinPath[index - 1] == '/')
                 {
@@ -764,7 +764,7 @@ vector<Reference<VendorBase> > getAllJREInfos()
     return vecInfos;
 }
 
-
+    
 vector<OUString> getVectorFromCharArray(char const * const * ar, int size)
 {
     vector<OUString> vec;
@@ -779,7 +779,7 @@ bool getJREInfoByPath(const rtl::OUString& path,
                       std::vector<rtl::Reference<VendorBase> > & vecInfos)
 {
     bool ret = false;
-
+    
     rtl::Reference<VendorBase> aInfo = getJREInfoByPath(path);
     if (aInfo.is())
     {
@@ -814,7 +814,7 @@ OUString resolveDirPath(const OUString & path)
         FileStatus status(FileStatusMask_Type |
                           FileStatusMask_LinkTargetURL |
                           FileStatusMask_FileURL);
-
+        
         if (item.getFileStatus(status) == File::E_None
             && status.getFileType() == FileStatus::Directory)
         {
@@ -826,7 +826,7 @@ OUString resolveDirPath(const OUString & path)
     return ret;
 }
 /** Checks if the path is a file. If it is a link to a file than
-    it is resolved.
+    it is resolved. 
  */
 OUString resolveFilePath(const OUString & path)
 {
@@ -848,11 +848,11 @@ OUString resolveFilePath(const OUString & path)
             && status.getFileType() == FileStatus::Regular)
         {
             ret = sResolved;
-        }
+        }                    
     }
     else
         return OUString();
-
+    
     return ret;
 }
 
@@ -873,7 +873,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
     // If this path is invalid then there is no chance to find a JRE here
     if (sResolvedDir.getLength() == 0)
         return 0;
-
+    
     //check if the directory path is good, that is a JRE was already recognized.
     //Then we need not detect it again
     //For example, a sun JKD contains <jdk>/bin/java and <jdk>/jre/bin/java.
@@ -884,7 +884,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
     if (entry2 != mapJREs.end())
     {
         JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION ": ")
-                   + OUSTR("JRE found again (detected before): ") + sResolvedDir
+                   + OUSTR("JRE found again (detected before): ") + sResolvedDir 
                    + OUSTR(".\n"));
         return entry2->second;
     }
@@ -905,7 +905,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
         {
             //if the path is a link, then resolve it
             //check if the executable exists at all
-
+            
             //path can be only "file:///". Then do not append a '/'
             //sizeof counts the terminating 0
             OUString sFullPath;
@@ -917,7 +917,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
 
 
             sFilePath = resolveFilePath(sFullPath);
-
+            
             if (sFilePath.getLength() == 0)
             {
                 //The file path (to java exe) is not valid
@@ -935,7 +935,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
             if (entry != mapJREs.end())
             {
                 JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION ": ")
-                   + OUSTR("JRE found again (detected before): ") + sFilePath
+                   + OUSTR("JRE found again (detected before): ") + sFilePath 
                    + OUSTR(".\n"));
 
                 return entry->second;
@@ -962,7 +962,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
                     //then it tries to start a jdk/.../native_threads/.java_wrapper. Therefore the link, which
                     //is named java, must be used to start the script.
                     getJavaProps(sFullPath, props, & bProcessRun);
-                    // Either we found a working 1.3.1
+                    // Either we found a working 1.3.1                    
                     //Or the java is broken. In both cases we stop searchin under this "root" directory
                     bBreak = true;
                     break;
@@ -988,12 +988,12 @@ rtl::Reference<VendorBase> getJREInfoByPath(
 
     if (props.size() == 0)
         return rtl::Reference<VendorBase>();
-
+    
     //find java.vendor property
     typedef vector<pair<OUString, OUString> >::const_iterator c_ip;
     OUString sVendor(RTL_CONSTASCII_USTRINGPARAM("java.vendor"));
     OUString sVendorName;
-
+                         
     for (c_ip i = props.begin(); i != props.end(); i++)
     {
         if (sVendor.equals(i->first))
@@ -1002,9 +1002,9 @@ rtl::Reference<VendorBase> getJREInfoByPath(
             break;
         }
     }
-
+    
     if (sVendorName.getLength() > 0)
-    {
+    {   
         //find the creator func for the respective vendor name
         for ( sal_Int32 c = 0;
               gVendorMap[c].sVendorName != NULL; ++c )
@@ -1017,17 +1017,17 @@ rtl::Reference<VendorBase> getJREInfoByPath(
                 break;
             }
         }
-    }
+    }    
     if (ret.is() == false)
         vecBadPaths.push_back(sFilePath);
     else
     {
         JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION ": ")
-                   + OUSTR("Found JRE: ") + sResolvedDir
+                   + OUSTR("Found JRE: ") + sResolvedDir 
                    + OUSTR(" \n at: ") + path + OUSTR(".\n"));
-
+ 
         mapJREs.insert(MAPJRE::value_type(sResolvedDir, ret));
-        mapJREs.insert(MAPJRE::value_type(sFilePath, ret));
+        mapJREs.insert(MAPJRE::value_type(sFilePath, ret));        
     }
 
     return ret;
@@ -1036,7 +1036,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
 Reference<VendorBase> createInstance(createInstance_func pFunc,
                                      vector<pair<OUString, OUString> > properties)
 {
-
+    
     Reference<VendorBase> aBase = (*pFunc)();
     if (aBase.is())
     {
@@ -1137,7 +1137,7 @@ bool makeDriveLetterSame(OUString * fileURL)
 void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
 {
     JFW_TRACE2(OUSTR("\n[Java framework] Checking \"/usr/jdk/latest\"\n"));
-    getJREInfoByPath(OUSTR("file:////usr/jdk/latest"), vecInfos);
+    getJREInfoByPath(OUSTR("file:////usr/jdk/latest"), vecInfos);   
 }
 
 #else
@@ -1166,7 +1166,7 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
         arCollectDirs[d] = OUString(g_arCollectDirs[d], strlen(g_arCollectDirs[d]),
                                RTL_TEXTENCODING_UTF8);
 
-
+    
 
     OUString usFile(RTL_CONSTASCII_USTRINGPARAM("file:///"));
     for( int ii = 0; ii < cSearchPaths; ii ++)
@@ -1224,7 +1224,7 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
 
                         getJREInfoByPath(aStatus.getFileURL(),vecInfos);
                     }
-
+                    
                     JFW_ENSURE(errNext == File::E_None || errNext == File::E_NOENT,
                                 OUSTR("[Java framework] sunjavaplugin: "
                                       "Error while iterating over contens of ")
@@ -1244,7 +1244,7 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
                         {
                             // /usr/java/j2re1.4.0
                             OUString usDir3(usDir2 + arNames[k]);
-
+                            
                             DirectoryItem item3;
                             if(DirectoryItem::get(usDir3, item) == File::E_None)
                             {
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
index eedd51c16e33..ff54c00ce7c8 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,7 +65,7 @@ struct InfoFindSame
 {
     rtl::OUString sJava;
     InfoFindSame(const rtl::OUString& sJavaHome):sJava(sJavaHome){}
-
+    
     bool operator () (const rtl::Reference<VendorBase> & aVendorInfo)
     {
         return aVendorInfo->getHome().equals(sJava) == sal_True ? true : false;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index fc11a040dce0..f3ca071b6baf 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -98,7 +98,7 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
 {
     //get java.vendor, java.version, java.home,
     //javax.accessibility.assistive_technologies from system properties
-
+    
     OUString sVendor;
     typedef vector<pair<OUString, OUString> >::const_iterator it_prop;
     OUString sVendorProperty(
@@ -114,7 +114,7 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
     bool bVendor = false;
     bool bHome = false;
     bool bAccess = false;
-
+    
     typedef vector<pair<OUString, OUString> >::const_iterator it_prop;
     for (it_prop i = props.begin(); i != props.end(); i++)
     {
@@ -158,15 +158,15 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
     }
     if (!bVersion || !bVendor || !bHome)
         return false;
-
+    
     // init m_sRuntimeLibrary
     OSL_ASSERT(m_sHome.getLength());
     //call virtual function to get the possible paths to the runtime library.
-
+    
     int size = 0;
     char const* const* arRtPaths = getRuntimePaths( & size);
     vector<OUString> libpaths = getVectorFromCharArray(arRtPaths, size);
-
+    
     bool bRt = false;
     typedef vector<OUString>::const_iterator i_path;
     for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++)
@@ -215,7 +215,7 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
     }
     if (bLdPath == false)
         return false;
-
+    
     return true;
 }
 
@@ -272,7 +272,7 @@ int VendorBase::compareVersions(const rtl::OUString& /*sSecond*/) const
 }
 
 
-
+        
 
 }
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
index ae204e227ac0..997793f8c8e6 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -81,11 +81,11 @@ class MalformedVersionException
 {
 public:
     MalformedVersionException();
-
+    
     MalformedVersionException(const MalformedVersionException &);
-
+    
     virtual ~MalformedVersionException();
-
+    
     MalformedVersionException & operator =(const MalformedVersionException &);
 };
 
@@ -103,7 +103,7 @@ public:
        The paths are relative file URLs. That is, they always
        contain '/' even on windows. The paths are relative
        to the installation directory of a JRE.
-
+      
 
        The signature of this function must correspond to
        getJavaExePaths_func.
@@ -149,7 +149,7 @@ public:
        if so, needsRestart returns true.
      */
     virtual bool needsRestart() const;
-
+    
     /* compares versions of this vendor. MUST be overridden
        in a derived class.
        ####################################################
@@ -159,7 +159,7 @@ public:
       0 this.version == sSecond
       1 this.version > sSecond
       -1 this.version < sSEcond
-
+      
       @throw
       MalformedVersionException if the version string was not recognized.
      */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index 44bfeed7c9bc..2d976b3e8da5 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,7 +55,7 @@ BEGIN_VENDOR_MAP()
     VENDOR_MAP_ENTRY("BEA Systems, Inc.", OtherInfo)
     VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo)
     VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo)
-END_VENDOR_MAP()
+END_VENDOR_MAP()    
 
 
 Sequence<OUString> getVendorNames()
@@ -75,7 +75,7 @@ bool isVendorSupported(const rtl::OUString& sVendor)
     Sequence<OUString> seqNames = getVendorNames();
     const OUString * arNames = seqNames.getConstArray();
     sal_Int32 count = seqNames.getLength();
-
+    
     for (int i = 0; i < count; i++)
     {
         if (sVendor.equals(arNames[i]))
@@ -85,7 +85,7 @@ bool isVendorSupported(const rtl::OUString& sVendor)
     OString sVendorName = OUStringToOString(sVendor, osl_getThreadTextEncoding());
     fprintf(stderr, "[Java frameworksunjavaplugin.so]sunjavaplugin does not support vendor: %s.\n",
             sVendorName.getStr());
-#endif
+#endif    
     return false;
 }
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
index f1987ef42961..dd021ad87779 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,7 +56,7 @@ struct VendorSupportMapEntry
 
 #define BEGIN_VENDOR_MAP() \
 VendorSupportMapEntry gVendorMap[] ={
-
+    
 #define VENDOR_MAP_ENTRY(x,y) \
     {x, & y::getJavaExePaths, & y::createInstance},
 
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index bd8c9678cf5f..a9829643e7c7 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -113,7 +113,7 @@ void createSettingsStructure(xmlDoc * document, bool * bNeedsSave)
     //Get xsi:nil namespace
     xmlNs* nsXsi = xmlSearchNsByHref(
         document, root,(xmlChar*)  NS_SCHEMA_INSTANCE);
-
+    
     //<enabled xsi:nil="true"
     xmlNode  * nodeEn = xmlNewTextChild(
         root,NULL, (xmlChar*) "enabled", (xmlChar*) "");
@@ -139,7 +139,7 @@ void createSettingsStructure(xmlDoc * document, bool * bNeedsSave)
         root,NULL, (xmlChar*) "vmParameters", (xmlChar*) "");
     if (nodeVm == NULL)
         throw FrameworkException(JFW_E_ERROR, sExcMsg);
-    xmlSetNsProp(nodeVm,nsXsi,(xmlChar*) "nil",(xmlChar*) "true");
+    xmlSetNsProp(nodeVm,nsXsi,(xmlChar*) "nil",(xmlChar*) "true");    
     //add a new line
     nodeCrLf = xmlNewText((xmlChar*) "\n");
     xmlAddChild(root, nodeCrLf);
@@ -160,13 +160,13 @@ void createSettingsStructure(xmlDoc * document, bool * bNeedsSave)
     if (nodeJava == NULL)
         throw FrameworkException(JFW_E_ERROR, sExcMsg);
     xmlSetNsProp(nodeJava,nsXsi,(xmlChar*) "nil",(xmlChar*) "true");
-//    xmlSetProp(nodeJava,(xmlChar*) "autoSelect",(xmlChar*) "true");
+//    xmlSetProp(nodeJava,(xmlChar*) "autoSelect",(xmlChar*) "true");    
     //add a new line
     nodeCrLf = xmlNewText((xmlChar*) "\n");
     xmlAddChild(root, nodeCrLf);
 }
 
-
+    
 //====================================================================
 VersionInfo::VersionInfo(): arVersions(NULL)
 {
@@ -207,7 +207,7 @@ sal_Int32 VersionInfo::getExcludeVersionSize()
 
 NodeJava::NodeJava(Layer layer):
     m_layer(layer)
-{
+{    
     //This class reads and write to files which should only be done in
     //application mode
     if (getMode() == JFW_MODE_DIRECT)
@@ -255,7 +255,7 @@ void NodeJava::load()
     {
         OSL_ASSERT("[Java framework] Unknown enum used.");
     }
-
+        
 
     //Read the user elements
     rtl::OString sSettingsPath = getSettingsPath();
@@ -308,11 +308,11 @@ void NodeJava::load()
                 cur, (xmlChar*) "nil", (xmlChar*) NS_SCHEMA_INSTANCE);
             if (sNil == NULL)
                 throw FrameworkException(JFW_E_ERROR, sExcMsg);
-
+            
             if (xmlStrcmp(sNil, (xmlChar*) "false") == 0)
             {
-                if (! m_javaInfo)
-                    m_javaInfo = boost::optional<CNodeJavaInfo>(CNodeJavaInfo());
+                if (! m_javaInfo)             
+                    m_javaInfo = boost::optional<CNodeJavaInfo>(CNodeJavaInfo()); 
                 m_javaInfo->loadFromNode(docUser, cur);
             }
         }
@@ -430,7 +430,7 @@ void NodeJava::write() const
     CXPathObjectPtr pathObj;
 
     prepareSettingsDocument();
-
+    
     //Read the user elements
     rtl::OString sSettingsPath = getSettingsPath();
     docUser = xmlParseFile(sSettingsPath.getStr());
@@ -443,7 +443,7 @@ void NodeJava::write() const
 
     xmlNode * root = xmlDocGetRootElement(docUser);
     //Get xsi:nil namespace
-    xmlNs* nsXsi = xmlSearchNsByHref(docUser,
+    xmlNs* nsXsi = xmlSearchNsByHref(docUser, 
                              root,
                              (xmlChar*)  NS_SCHEMA_INSTANCE);
 
@@ -457,7 +457,7 @@ void NodeJava::write() const
                                          contextUser);
         if ( ! pathObj || xmlXPathNodeSetIsEmpty(pathObj->nodesetval))
             throw FrameworkException(JFW_E_ERROR, sExcMsg);
-
+        
         xmlNode * nodeEnabled = pathObj->nodesetval->nodeTab[0];
         xmlSetNsProp(nodeEnabled,
                      nsXsi,
@@ -480,7 +480,7 @@ void NodeJava::write() const
                                          contextUser);
         if ( ! pathObj || xmlXPathNodeSetIsEmpty(pathObj->nodesetval))
             throw FrameworkException(JFW_E_ERROR, sExcMsg);
-
+        
         xmlNode * nodeEnabled = pathObj->nodesetval->nodeTab[0];
         xmlSetNsProp(nodeEnabled, nsXsi, (xmlChar*) "nil",(xmlChar*) "false");
         xmlNodeSetContent(nodeEnabled,(xmlChar*) CXmlCharPtr(*m_userClassPath));
@@ -490,7 +490,7 @@ void NodeJava::write() const
     if (m_javaInfo)
     {
         rtl::OString sExpression= rtl::OString(
-            "/jf:java/jf:javaInfo");
+            "/jf:java/jf:javaInfo");                    
         pathObj = xmlXPathEvalExpression((xmlChar*) sExpression.getStr(),
                                                 contextUser);
         if ( ! pathObj || xmlXPathNodeSetIsEmpty(pathObj->nodesetval))
@@ -503,7 +503,7 @@ void NodeJava::write() const
     if (m_vmParameters)
     {
         rtl::OString sExpression= rtl::OString(
-            "/jf:java/jf:vmParameters");
+            "/jf:java/jf:vmParameters");                    
         pathObj = xmlXPathEvalExpression((xmlChar*) sExpression.getStr(),
                                          contextUser);
         if ( ! pathObj || xmlXPathNodeSetIsEmpty(pathObj->nodesetval))
@@ -544,7 +544,7 @@ void NodeJava::write() const
     if (m_JRELocations)
     {
         rtl::OString sExpression= rtl::OString(
-            "/jf:java/jf:jreLocations");
+            "/jf:java/jf:jreLocations");                    
         pathObj = xmlXPathEvalExpression((xmlChar*) sExpression.getStr(),
                                          contextUser);
         if ( ! pathObj || xmlXPathNodeSetIsEmpty(pathObj->nodesetval))
@@ -595,7 +595,7 @@ void NodeJava::setUserClassPath(const rtl::OUString & sClassPath)
     m_userClassPath = boost::optional<rtl::OUString>(sClassPath);
 }
 
-void NodeJava::setJavaInfo(const JavaInfo * pInfo, bool bAutoSelect)
+void NodeJava::setJavaInfo(const JavaInfo * pInfo, bool bAutoSelect)          
 {
     if (!m_javaInfo)
         m_javaInfo = boost::optional<CNodeJavaInfo>(CNodeJavaInfo());
@@ -656,7 +656,7 @@ void NodeJava::setJRELocations(rtl_uString  * * arLocations, sal_Int32 size)
             const rtl::OUString & sLocation = static_cast<rtl_uString*>(arLocations[i]);
 
             //only add the path if not already present
-            std::vector<rtl::OUString>::const_iterator it =
+            std::vector<rtl::OUString>::const_iterator it = 
                 std::find(m_JRELocations->begin(), m_JRELocations->end(),
                           sLocation);
             if (it == m_JRELocations->end())
@@ -672,7 +672,7 @@ void NodeJava::addJRELocation(rtl_uString * sLocation)
         m_JRELocations = boost::optional<std::vector<rtl::OUString> >(
             std::vector<rtl::OUString> ());
      //only add the path if not already present
-    std::vector<rtl::OUString>::const_iterator it =
+    std::vector<rtl::OUString>::const_iterator it = 
         std::find(m_JRELocations->begin(), m_JRELocations->end(),
                   rtl::OUString(sLocation));
     if (it == m_JRELocations->end())
@@ -708,7 +708,7 @@ const boost::optional<CNodeJavaInfo> & NodeJava::getJavaInfo() const
 jfw::FileStatus NodeJava::checkSettingsFileStatus() const
 {
     jfw::FileStatus ret = FILE_DOES_NOT_EXIST;
-
+    
     const rtl::OUString sURL = getSettingsURL();
     //check the file time
     ::osl::DirectoryItem item;
@@ -760,7 +760,7 @@ jfw::FileStatus NodeJava::checkSettingsFileStatus() const
                         ret = FILE_OK;
                     }
                 }
-                else // osl_getSystemTime
+                else // osl_getSystemTime 
                 {
                     ret = FILE_INVALID;
                 }
@@ -799,27 +799,27 @@ void NodeJava::createSettingsDocument() const
     // check if javasettings.xml already exist
     if (FILE_OK == checkSettingsFileStatus())
         return;
-
+    
     //make sure that the directories are created in case they do not exist
     FileBase::RC rcFile = Directory::createPath(getDirFromFile(sURL));
     if (rcFile != FileBase::E_EXIST && rcFile != FileBase::E_None)
         throw FrameworkException(JFW_E_ERROR, sExcMsg);
-
+    
     //javasettings.xml does not exist yet
     CXmlDocPtr doc(xmlNewDoc((xmlChar *)"1.0"));
     if (! doc)
         throw FrameworkException(JFW_E_ERROR, sExcMsg);
     //Create a comment
     xmlNewDocComment(
-        doc, (xmlChar *) "This is a generated file. Do not alter this file!");
-
+        doc, (xmlChar *) "This is a generated file. Do not alter this file!"); 
+                     
     //Create the root element and name spaces
-    xmlNodePtr root =   xmlNewDocNode(
+    xmlNodePtr root =	xmlNewDocNode(
         doc, NULL, (xmlChar *) "java", (xmlChar *) "\n");
 
     if (root == NULL)
         throw FrameworkException(JFW_E_ERROR, sExcMsg);
-
+    
     if (xmlNewNs(root, (xmlChar *) NS_JAVA_FRAMEWORK,NULL) == NULL)
         throw FrameworkException(JFW_E_ERROR, sExcMsg);
     if (xmlNewNs(root,(xmlChar*) NS_SCHEMA_INSTANCE,(xmlChar*)"xsi") == NULL)
@@ -831,7 +831,7 @@ void NodeJava::createSettingsDocument() const
         (xmlChar *) "This is a generated file. Do not alter this file!");
     if (com == NULL)
         throw FrameworkException(JFW_E_ERROR, sExcMsg);
-
+    
     if (xmlAddPrevSibling(root, com) == NULL)
         throw FrameworkException(JFW_E_ERROR, sExcMsg);
 
@@ -865,7 +865,7 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
         pJavaInfo, (xmlChar*) "nil", (xmlChar*) NS_SCHEMA_INSTANCE);
     if ( ! sNil)
         throw FrameworkException(JFW_E_ERROR, sExcMsg);
-
+    
     if (xmlStrcmp(sNil, (xmlChar*) "true") == 0)
         bNil = true;
     else if (xmlStrcmp(sNil, (xmlChar*) "false") == 0)
@@ -881,14 +881,14 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
         pJavaInfo, (xmlChar*) "autoSelect");
     if ( ! sAutoSelect)
         throw FrameworkException(JFW_E_ERROR, sExcMsg);
-
+    
     if (xmlStrcmp(sAutoSelect, (xmlChar*) "true") == 0)
         bAutoSelect = true;
     else if (xmlStrcmp(sAutoSelect, (xmlChar*) "false") == 0)
         bAutoSelect = false;
     else
         throw FrameworkException(JFW_E_ERROR, sExcMsg);
-
+    
     xmlNode * cur = pJavaInfo->children;
 
     while (cur != NULL)
@@ -940,7 +940,7 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
             //jvm of the new selected JRE will be started. Old settings (before
             //OOo 3.3) still contain the flag which can be safely ignored.
             nRequirements &= ~JFW_REQUIRE_NEEDRESTART;
-#endif
+#endif            
         }
         else if (xmlStrcmp(cur->name, (xmlChar*) "vendorData") == 0)
         {
@@ -971,7 +971,7 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
 
 void CNodeJavaInfo::writeToNode(xmlDoc* pDoc,
                                 xmlNode* pJavaInfoNode) const
-
+                                       
 {
     OSL_ASSERT(pJavaInfoNode && pDoc);
     rtl::OString sExcMsg("[Java framework] Error in function NodeJavaInfo::writeToNode "
@@ -992,7 +992,7 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc,
 
     //Set xsi:nil in javaInfo element to false
     //the xmlNs pointer must not be destroyed
-    xmlNs* nsXsi = xmlSearchNsByHref((xmlDoc*) pDoc,
+    xmlNs* nsXsi = xmlSearchNsByHref((xmlDoc*) pDoc, 
                              pJavaInfoNode,
                              (xmlChar*)  NS_SCHEMA_INSTANCE);
 
@@ -1010,7 +1010,7 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc,
         xmlUnlinkNode(lastNode);
         xmlFreeNode(lastNode);
     }
-
+    
     //If the JavaInfo was set with an empty value,
     //then we are done.
     if (m_bEmptyNode)
@@ -1019,7 +1019,7 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc,
     //add a new line after <javaInfo>
     xmlNode * nodeCrLf = xmlNewText((xmlChar*) "\n");
     xmlAddChild(pJavaInfoNode, nodeCrLf);
-
+    
     //Create the vendor element
     xmlNewTextChild(pJavaInfoNode, NULL, (xmlChar*) "vendor",
                     CXmlCharPtr(sVendor));
@@ -1033,14 +1033,14 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc,
     //add a new line for better readability
     nodeCrLf = xmlNewText((xmlChar*) "\n");
     xmlAddChild(pJavaInfoNode, nodeCrLf);
-
+    
     //Create the version element
     xmlNewTextChild(pJavaInfoNode, NULL, (xmlChar*) "version",
                     CXmlCharPtr(sVersion));
     //add a new line for better readability
     nodeCrLf = xmlNewText((xmlChar*) "\n");
     xmlAddChild(pJavaInfoNode, nodeCrLf);
-
+    
     //Create the features element
     rtl::OUString sFeatures = rtl::OUString::valueOf(
         (sal_Int64)nFeatures, 16);
@@ -1049,7 +1049,7 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc,
     //add a new line for better readability
     nodeCrLf = xmlNewText((xmlChar*) "\n");
     xmlAddChild(pJavaInfoNode, nodeCrLf);
-
+    
 
     //Create the requirements element
     rtl::OUString sRequirements = rtl::OUString::valueOf(
@@ -1059,7 +1059,7 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc,
     //add a new line for better readability
     nodeCrLf = xmlNewText((xmlChar*) "\n");
     xmlAddChild(pJavaInfoNode, nodeCrLf);
-
+    
 
     //Create the features element
     rtl::ByteSequence data = encodeBase16(arVendorData);
@@ -1105,11 +1105,11 @@ MergedSettings::MergedSettings():
 {
     NodeJava settings(NodeJava::USER_OR_INSTALL);
     settings.load();
-
+    
     //Check if UNO_JAVA_JFW_INSTALL_DATA is set. If so, then we need not use user and
     //shared data.
     const ::rtl::OUString sInstall = BootParams::getInstallData();
-
+    
     if (sInstall.getLength() == 0)
     {
         NodeJava sharedSettings(NodeJava::SHARED);
@@ -1171,7 +1171,7 @@ const rtl::OUString&  MergedSettings::getUserClassPath() const
     typedef ::std::vector< ::rtl::OUString>::const_iterator cit;
     for (cit i = m_vmParams.begin(); i < m_vmParams.end(); i++)
     {
-        ret.push_back( ::rtl::OUStringToOString(*i, RTL_TEXTENCODING_UTF8));
+        ret.push_back( ::rtl::OUStringToOString(*i, RTL_TEXTENCODING_UTF8)); 
     }
     return ret;
 }
@@ -1197,12 +1197,12 @@ void MergedSettings::getVmParametersArray(
 {
     osl::MutexGuard guard(FwkMutex::get());
     OSL_ASSERT(parParams != NULL && size != NULL);
-
+    
     *parParams = (rtl_uString **)
         rtl_allocateMemory(sizeof(rtl_uString*) * m_vmParams.size());
     if (*parParams == NULL)
         return;
-
+        
     int j=0;
     typedef std::vector<rtl::OUString>::const_iterator it;
     for (it i = m_vmParams.begin(); i != m_vmParams.end();
@@ -1219,12 +1219,12 @@ void MergedSettings::getJRELocations(
 {
     osl::MutexGuard guard(FwkMutex::get());
     OSL_ASSERT(parLocations != NULL && size != NULL);
-
+    
     *parLocations = (rtl_uString **)
         rtl_allocateMemory(sizeof(rtl_uString*) * m_JRELocations.size());
     if (*parLocations == NULL)
         return;
-
+        
     int j=0;
     typedef std::vector<rtl::OUString>::const_iterator it;
     for (it i = m_JRELocations.begin(); i != m_JRELocations.end();
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index 93aec47718e1..4641d3bbee14 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -137,7 +137,7 @@ private:
         (UNO_JAVA_JFW_USER_DATA, UNO_JAVA_JFW_SHARED_DATA,
         UNO_JAVA_JFW_INSTALL_DATA) and m_layer, unless the file already exists
         (see createSettingsDocument).
-
+        
         @return
         JFW_E_CONFIG_READWRITE
     */
@@ -146,7 +146,7 @@ private:
     /** helper function for prepareSettingsDocument.
     */
     void createSettingsDocument() const;
-
+    
     /** returns the system path to the data file which is to be used. The value
         depends on
         the the member m_layer and the bootstrap paramters UNO_JAVA_JFW_USER_DATA,
@@ -155,7 +155,7 @@ private:
     ::rtl::OString getSettingsPath() const;
 
     /** returns the file URL to the data file which is to be used. See getSettingsPath.
-    */
+    */  
     ::rtl::OUString getSettingsURL() const;
 
     /** Verifies if the respective settings file exist. In case UNO_JAVA_JFW_INSTALL_DATA
@@ -163,7 +163,7 @@ private:
         exist and wipe its contents. Then still FILE_DOES_NOT_EXIST is returned.
      */
     jfw::FileStatus checkSettingsFileStatus() const;
-
+    
     /** Determines the layer for which the instance the loads and writes the
         data.
     */
@@ -265,8 +265,8 @@ public:
 };
 
 /** merges the settings for shared, user and installation during construction.
-    The class uses a simple merge mechanism for the javasettings.xml files in share and
-    user. The following elements completly overwrite the corresponding elements
+    The class uses a simple merge mechanism for the javasettings.xml files in share and 
+    user. The following elements completly overwrite the corresponding elements 
     from share:
     /java/enabled
     /java/userClassPath
@@ -300,7 +300,7 @@ private:
     ::std::vector< ::rtl::OUString> m_vmParams;
 
     ::std::vector< ::rtl::OUString> m_JRELocations;
-
+    
     CNodeJavaInfo m_javaInfo;
 
 public:
@@ -358,7 +358,7 @@ public:
     ~VersionInfo();
 
     void addExcludeVersion(const ::rtl::OUString& sVersion);
-
+    
     ::rtl::OUString sMinVersion;
     ::rtl::OUString sMaxVersion;
 
@@ -366,7 +366,7 @@ public:
         does not need to release the strings.
         The array exists as long as this object exists.
     */
-
+    
     rtl_uString** getExcludeVersions();
     sal_Int32 getExcludeVersionSize();
 };
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 3c353e44491e..5c1364c4d7eb 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -98,7 +98,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
         const jfw::MergedSettings settings;
         const std::vector<rtl::OUString>& vecJRELocations =
             settings.getJRELocations();
-        //Use every plug-in library to get Java installations.
+        //Use every plug-in library to get Java installations.        
         typedef std::vector<jfw::PluginLibrary>::const_iterator ci_pl;
         int cModule = 0;
          for (ci_pl i = vecPlugins.begin(); i != vecPlugins.end(); i++, cModule++)
@@ -114,7 +114,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
                 rtl::OString msg = rtl::OUStringToOString(
                     library.sPath, osl_getThreadTextEncoding());
                 fprintf(stderr,"[jvmfwk] Could not load plugin %s\n" \
-                        "Modify the javavendors.xml accordingly!\n", msg.getStr());
+                        "Modify the javavendors.xml accordingly!\n", msg.getStr()); 
                 return JFW_E_NO_PLUGIN;
             }
             jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc =
@@ -136,7 +136,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
                 versionInfo.getExcludeVersions(),
                 versionInfo.getExcludeVersionSize(),
                 & arInfos,
-                & cInfos);
+                & cInfos);                                    
 
             if (plerr != JFW_PLUGIN_E_NONE)
                 return JFW_E_ERROR;
@@ -162,8 +162,8 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
             for (citLoc ii = vecJRELocations.begin();
                 ii != vecJRELocations.end(); ii++)
             {
-//              rtl::OUString sLocation =
-//                  rtl::OStringToOUString(*ii, RTL_TEXTENCODING_UTF8);
+// 				rtl::OUString sLocation =
+// 					rtl::OStringToOUString(*ii, RTL_TEXTENCODING_UTF8);
                 jfw::CJavaInfo aInfo;
                 plerr = (*jfw_plugin_getJavaInfoByPathFunc)(
                     ii->pData,
@@ -213,7 +213,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
         //vecInfoManual2
         for (it_info j = vecInfo.begin(); j != vecInfo.end(); j++)
         {
-            it_info it_duplicate =
+            it_info it_duplicate = 
                 std::find_if(vecInfoManual2.begin(), vecInfoManual2.end(),
                             std::bind2nd(std::ptr_fun(areEqualJavaInfo), *j));
             if (it_duplicate != vecInfoManual2.end())
@@ -234,7 +234,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
         //Add the manually detected JREs
         for (it l = vecInfoManual2.begin(); l != vecInfoManual2.end(); l++)
             (*pparInfo)[index++] = l->detach();
-
+            
         *pSize = nSize;
         return errcode;
     }
@@ -265,7 +265,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti
         //been created.
         if (g_pJavaVM != NULL)
             return JFW_E_RUNNING_JVM;
-
+        
         if (ppVM == NULL)
             return JFW_E_INVALID_ARG;
 
@@ -304,7 +304,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti
                         //without accessibility support. We return JFW_E_NO_SELECT
                         //to cause that we search for another JRE. The search code will
                         //then prefer a JRE with accessibility support.
-                        return JFW_E_NO_SELECT;
+                        return JFW_E_NO_SELECT;                        
                     }
                 }
             }
@@ -314,7 +314,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti
 
             if (sVendorUpdate != settings.getJavaInfoAttrVendorUpdate())
                 return JFW_E_INVALID_SETTINGS;
-
+            
             //check if JAVA is disabled
             //If Java is enabled, but it was disabled when this process was started
             // then no preparational work, such as setting the LD_LIBRARY_PATH, was
@@ -322,7 +322,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti
             if (g_bEnabledSwitchedOn &&
                     (aInfo->nRequirements & JFW_REQUIRE_NEEDRESTART))
                 return JFW_E_NEED_RESTART;
-
+            
             //Check if the selected Java was set in this process. If so it
             //must not have the requirments flag JFW_REQUIRE_NEEDRESTART
             if ((aInfo->nRequirements & JFW_REQUIRE_NEEDRESTART)
@@ -341,12 +341,12 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti
             //In direct mode the options are specified by bootstrap variables
             //of the form UNO_JAVA_JFW_PARAMETER_1 .. UNO_JAVA_JFW_PARAMETER_n
             vmParams = jfw::BootParams::getVMParameters();
-            sUserClassPath =
+            sUserClassPath = 
                 "-Djava.class.path=" + jfw::BootParams::getClasspath();
         }
         else
             OSL_ASSERT(0);
-
+            
         //get the function jfw_plugin_startJavaVirtualMachine
         jfw::VendorSettings aVendorSettings;
         rtl::OUString sLibPath = aVendorSettings.getPluginLibrary(aInfo.getVendor());
@@ -371,7 +371,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti
         JavaVMOption * arOpt = sarJOptions.get();
         if (! arOpt)
             return JFW_E_ERROR;
-
+        
         //The first argument is the classpath
         arOpt[0].optionString= (char*) sUserClassPath.getStr();
         arOpt[0].extraInfo = NULL;
@@ -397,7 +397,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti
             arOpt[index].extraInfo = arOptions[ii].extraInfo;
             index++;
         }
-
+    
         //start Java
         JavaVM *pVm = NULL;
         javaPluginError plerr = (*pFunc)(aInfo, arOpt, index, & pVm, ppEnv);
@@ -422,7 +422,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti
         fprintf(stderr, "%s\n", e.message.getStr());
         OSL_ENSURE(0, e.message.getStr());
     }
-
+ 
     return errcode;
 #endif
 }
@@ -447,7 +447,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
         bool bSupportAccessibility = jfw::isAccessibilitySupportDesired();
         nFeatureFlags = bSupportAccessibility ?
             JFW_FEATURE_ACCESSBRIDGE : 0L;
-
+        
         //Get a list of services which provide Java information
         jfw::VendorSettings aVendorSettings;
         std::vector<jfw::PluginLibrary> vecPlugins =
@@ -457,7 +457,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
         boost::scoped_array<osl::Module> sarModules;
         sarModules.reset(new osl::Module[vecPlugins.size()]);
         osl::Module * arModules = sarModules.get();
-
+        
         //Use every plug-in library to get Java installations. At the first usable
         //Java the loop will break
         typedef std::vector<jfw::PluginLibrary>::const_iterator ci_pl;
@@ -492,7 +492,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
                 versionInfo.getExcludeVersions(),
                 versionInfo.getExcludeVersionSize(),
                 & arInfos,
-                & cInfos);
+                & cInfos);                                    
 
             if (plerr != JFW_PLUGIN_E_NONE)
                 continue;
@@ -514,14 +514,14 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
                 // compare features
                 // If the user does not require any features (nFeatureFlags = 0)
                 // then the first installation is used
-                if ((pJInfo->nFeatures & nFeatureFlags) == nFeatureFlags)
+                if ((pJInfo->nFeatures & nFeatureFlags) == nFeatureFlags) 
                 {
                     //the just found Java implements all required features
                     //currently there is only accessibility!!!
                     aCurrentInfo = pJInfo;
                     bInfoFound = true;
                     break;
-                }
+                }    
             }
             //The array returned by jfw_plugin_getAllJavaInfos must be freed as well as
             //its contents
@@ -563,7 +563,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
                 OSL_ASSERT(jfw_plugin_getJavaInfoByPathFunc);
                 if (jfw_plugin_getJavaInfoByPathFunc == NULL)
                     return JFW_E_ERROR;
-
+            
                 typedef std::vector<rtl::OUString>::const_iterator citLoc;
                 for (citLoc it = vecJRELocations.begin();
                     it != vecJRELocations.end(); it++)
@@ -592,7 +592,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
                         // compare features
                         // If the user does not require any features (nFeatureFlags = 0)
                         // then the first installation is used
-                        if ((aInfo.getFeatures() & nFeatureFlags) == nFeatureFlags)
+                        if ((aInfo.getFeatures() & nFeatureFlags) == nFeatureFlags) 
                         {
                             //the just found Java implements all required features
                             //currently there is only accessibility!!!
@@ -618,7 +618,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
                 *pInfo = aCurrentInfo.cloneJavaInfo();
                 //remember that this JRE was selected in this process
                 jfw::setJavaSelected();
-            }
+            }   
         }
         else
         {
@@ -631,7 +631,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
         fprintf(stderr, "%s\n", e.message.getStr());
         OSL_ENSURE(0, e.message.getStr());
     }
-
+ 
     return errcode;
 }
 sal_Bool SAL_CALL jfw_areEqualJavaInfo(
@@ -697,7 +697,7 @@ javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo)
             return JFW_E_NONE;
         }
 
-        const jfw::MergedSettings settings;
+        const jfw::MergedSettings settings;		
         jfw::CJavaInfo aInfo;
         aInfo.attach(settings.createJavaInfo());
         if (! aInfo)
@@ -709,7 +709,7 @@ javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo)
         //Java is not valid anymore
         // /java/javaInfo/@vendorUpdate != javaSelection/updated (javavendors.xml)
         rtl::OString sUpdated = jfw::getElementUpdated();
-
+        
         if (sUpdated.equals(settings.getJavaInfoAttrVendorUpdate()) == sal_False)
             return JFW_E_INVALID_SETTINGS;
         *ppInfo = aInfo.detach();
@@ -758,7 +758,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
         typedef std::vector<rtl::OUString>::const_iterator CIT_VENDOR;
         std::vector<rtl::OUString> vecVendors =
             aVendorSettings.getSupportedVendors();
-
+            
         //Use every plug-in library to determine if the path represents a
         //JRE. If a plugin recognized it then the loop will break
         typedef std::vector<jfw::PluginLibrary>::const_iterator ci_pl;
@@ -776,7 +776,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
                 rtl::OString msg = rtl::OUStringToOString(
                     library.sPath, osl_getThreadTextEncoding());
                 fprintf(stderr,"[jvmfwk] Could not load plugin %s\n" \
-                        "Modify the javavendors.xml accordingly!\n", msg.getStr());
+                        "Modify the javavendors.xml accordingly!\n", msg.getStr()); 
                 return JFW_E_NO_PLUGIN;
             }
 
@@ -800,7 +800,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
                 versionInfo.getExcludeVersions(),
                 versionInfo.getExcludeVersionSize(),
                 & pInfo);
-
+            
             if (plerr == JFW_PLUGIN_E_NONE)
             {
                 //check if the vendor of the found JRE is supported
@@ -848,7 +848,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
         fprintf(stderr, "%s\n", e.message.getStr());
         OSL_ENSURE(0, e.message.getStr());
     }
-
+ 
     return errcode;
 }
 
@@ -866,7 +866,7 @@ javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo)
         errcode = jfw_getSelectedJRE( & currentInfo);
         if (errcode != JFW_E_NONE && errcode != JFW_E_INVALID_SETTINGS)
             return errcode;
-
+        
         if (jfw_areEqualJavaInfo(currentInfo, pInfo) == sal_False)
         {
             jfw::NodeJava node;
@@ -892,7 +892,7 @@ javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled)
         osl::MutexGuard guard(jfw::FwkMutex::get());
         if (jfw::getMode() == jfw::JFW_MODE_DIRECT)
             return JFW_E_DIRECT_MODE;
-
+                
         if (g_bEnabledSwitchedOn == false && bEnabled == sal_True)
         {
             //When the process started then Enabled was false.
@@ -1057,9 +1057,9 @@ javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation)
         fprintf(stderr, "%s\n", e.message.getStr());
         OSL_ENSURE(0, e.message.getStr());
     }
-
+ 
     return errcode;
-
+    
 }
 
 javaFrameworkError SAL_CALL jfw_setJRELocations(
@@ -1096,7 +1096,7 @@ javaFrameworkError SAL_CALL jfw_getJRELocations(
         osl::MutexGuard guard(jfw::FwkMutex::get());
         if (jfw::getMode() == jfw::JFW_MODE_DIRECT)
             return JFW_E_DIRECT_MODE;
-
+                
         if (parLocations == NULL || pLen == NULL)
             return JFW_E_INVALID_ARG;
         const jfw::MergedSettings settings;
@@ -1108,8 +1108,8 @@ javaFrameworkError SAL_CALL jfw_getJRELocations(
         fprintf(stderr, "%s\n", e.message.getStr());
         OSL_ENSURE(0, e.message.getStr());
     }
-
-    return errcode;
+    
+    return errcode;    
 }
 
 
@@ -1211,7 +1211,7 @@ JavaInfo * CJavaInfo::copyJavaInfo(const JavaInfo * pInfo)
           (JavaInfo*) rtl_allocateMemory(sizeof(JavaInfo));
     if (newInfo)
     {
-        rtl_copyMemory(newInfo, pInfo, sizeof(JavaInfo));
+        rtl_copyMemory(newInfo, pInfo, sizeof(JavaInfo));   
         rtl_uString_acquire(pInfo->sVendor);
         rtl_uString_acquire(pInfo->sLocation);
         rtl_uString_acquire(pInfo->sVersion);
diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index 89859d4806ed..086906251a68 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,14 +59,14 @@ typedef javaPluginError (*jfw_plugin_getJavaInfoByPath_ptr)(
     </p>
  */
 typedef javaPluginError (*jfw_plugin_startJavaVirtualMachine_ptr)(
-    const JavaInfo *info,
-    const JavaVMOption* options,
+    const JavaInfo *info, 
+    const JavaVMOption* options, 
     sal_Int32 cOptions,
     JavaVM ** ppVM,
     JNIEnv ** ppEnv);
 
 typedef javaPluginError (*jfw_plugin_existJRE_ptr)(
-    const JavaInfo *info,
+    const JavaInfo *info, 
     sal_Bool *exist);
 
 
@@ -86,8 +86,8 @@ class CJavaInfo
 public:
     ::JavaInfo * pInfo;
 
-
-
+    
+    
     CJavaInfo();
     CJavaInfo(const CJavaInfo &);
     ~CJavaInfo();
@@ -106,7 +106,7 @@ public:
     const ::JavaInfo* operator ->() const;
 //    ::JavaInfo** operator & ();
     operator ::JavaInfo* ();
-    operator ::JavaInfo const * () const;
+    operator ::JavaInfo const * () const; 
     ::JavaInfo* cloneJavaInfo() const;
 
     rtl::OUString getVendor() const;
diff --git a/jvmfwk/source/framework.map b/jvmfwk/source/framework.map
index c95cc83aa826..4f5b3381d993 100644
--- a/jvmfwk/source/framework.map
+++ b/jvmfwk/source/framework.map
@@ -8,7 +8,7 @@ UDK_3_0_0 {
     jfw_startVM;
     jfw_isVMRunning;
     jfw_getJavaInfoByPath;
-    jfw_setSelectedJRE;
+    jfw_setSelectedJRE;	
     jfw_getSelectedJRE;
     jfw_setEnabled;
     jfw_getEnabled;
@@ -20,7 +20,7 @@ UDK_3_0_0 {
     jfw_getJRELocations;
     jfw_addJRELocation;
     jfw_lock;
-    jfw_unlock;
+    jfw_unlock;	
     local:
         *;
 };
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index aab2201ee07d..ecc60eb2190e 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -131,7 +131,7 @@ VendorSettings::VendorSettings():
                 JFW_E_ERROR,
                 OString("[Java framework] Error while parsing file: ")
                 + sSettingsPath + OString("."));
-
+        
         m_xmlPathContextVendorSettings = xmlXPathNewContext(m_xmlDocVendorSettings);
         int res = xmlXPathRegisterNs(
             m_xmlPathContextVendorSettings, (xmlChar*) "jf",
@@ -145,7 +145,7 @@ std::vector<PluginLibrary> VendorSettings::getPluginData()
 {
     OString sExcMsg("[Java framework] Error in function VendorSettings::getVendorPluginURLs "
                          "(fwkbase.cxx).");
-    std::vector<PluginLibrary> vecPlugins;
+    std::vector<PluginLibrary> vecPlugins;    
     CXPathObjectPtr result(xmlXPathEvalExpression(
         (xmlChar*)"/jf:javaSelection/jf:plugins/jf:library",
         m_xmlPathContextVendorSettings));
@@ -180,7 +180,7 @@ std::vector<PluginLibrary> VendorSettings::getPluginData()
                     "[Java framework] The file: " + sPlugin + " does not exist.");
             }
             plugin.sPath  = sUrl;
-
+            
             vecPlugins.push_back(plugin);
         }
         cur = cur->next;
@@ -195,11 +195,11 @@ VersionInfo VendorSettings::getVersionInformation(const rtl::OUString & sVendor)
     OString osVendor = OUStringToOString(sVendor, RTL_TEXTENCODING_UTF8);
     //Get minVersion
     OString sExpresion = OString(
-        "/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") +
+        "/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") + 
         osVendor + OString("\"]/jf:minVersion");
-
+                            
     CXPathObjectPtr xPathObjectMin;
-    xPathObjectMin =
+    xPathObjectMin = 
         xmlXPathEvalExpression((xmlChar*) sExpresion.getStr(),
                                m_xmlPathContextVendorSettings);
     if (xmlXPathNodeSetIsEmpty(xPathObjectMin->nodesetval))
@@ -218,7 +218,7 @@ VersionInfo VendorSettings::getVersionInformation(const rtl::OUString & sVendor)
     }
 
     //Get maxVersion
-    sExpresion = OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") +
+    sExpresion = OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") + 
         osVendor + OString("\"]/jf:maxVersion");
     CXPathObjectPtr xPathObjectMax;
     xPathObjectMax = xmlXPathEvalExpression(
@@ -240,7 +240,7 @@ VersionInfo VendorSettings::getVersionInformation(const rtl::OUString & sVendor)
     }
 
     //Get excludeVersions
-    sExpresion = OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") +
+    sExpresion = OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") + 
         osVendor + OString("\"]/jf:excludeVersions/jf:version");
     CXPathObjectPtr xPathObjectVersions;
     xPathObjectVersions =
@@ -282,7 +282,7 @@ std::vector<OUString> VendorSettings::getSupportedVendors()
         throw FrameworkException(
             JFW_E_ERROR,
             rtl::OString("[Java framework] Error in function getSupportedVendors (fwkutil.cxx)."));
-
+    
     //get the values of the library elements + vendor attribute
     xmlNode* cur = result->nodesetval->nodeTab[0];
     while (cur != NULL)
@@ -394,7 +394,7 @@ rtl::OString BootParams::getClasspath()
             UNO_JAVA_JFW_CLASSPATH " = %s.\n", sClassPath.getStr());
 #endif
     }
-
+    
     rtl::OUString sEnvCP;
     if (Bootstrap::get()->getFrom(
         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_ENV_CLASSPATH)),
@@ -513,7 +513,7 @@ rtl::OUString BootParams::getJREHome()
         fprintf(stderr,"[Java framework] Using bootstrap parameter "
             UNO_JAVA_JFW_JREHOME" = %s.\n", sValue.getStr());
     }
-#endif
+#endif    
     return sJRE;
 }
 
@@ -604,7 +604,7 @@ JFW_MODE getMode()
             g_mode = JFW_MODE_APPLICATION;
         g_bMode = true;
     }
-
+        
     return g_mode;
 }
 
@@ -647,11 +647,11 @@ rtl::OString makeClassPathOption(OUString const & sUserClassPath)
     rtl::OString sPaths;
     rtl::OUStringBuffer sBufCP(4096);
     char szSep[] = {SAL_PATHSEPARATOR,0};
-
+    
     // append all user selected jars to the class path
     if (sUserClassPath.getLength() > 0)
         sBufCP.append(sUserClassPath);
-
+    
     //append all jar libraries and components to the class path
     OUString sAppCP = getApplicationClassPath();
     if (sAppCP.getLength())
@@ -660,10 +660,10 @@ rtl::OString makeClassPathOption(OUString const & sUserClassPath)
             sBufCP.appendAscii(szSep);
         sBufCP.append(sAppCP);
     }
-
+    
     sPaths = rtl::OUStringToOString(
         sBufCP.makeStringAndClear(), osl_getThreadTextEncoding());
-
+    
     rtl::OString sOptionClassPath("-Djava.class.path=");
     sOptionClassPath += sPaths;
     return sOptionClassPath;
diff --git a/jvmfwk/source/fwkbase.hxx b/jvmfwk/source/fwkbase.hxx
index 0a15f7628e8e..49dd2257889a 100644
--- a/jvmfwk/source/fwkbase.hxx
+++ b/jvmfwk/source/fwkbase.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ public:
     VendorSettings();
 
     /** Gets all plugin library URLs with the corresponding vendor name.
-
+    
     It uses the /javaSelection/plugins/library element from the javavendors.xml
     to locate the library.
     Is is verified that the plug-in exist. If a plug-in does not exist then an
@@ -56,7 +56,7 @@ public:
 
     VersionInfo getVersionInformation(const ::rtl::OUString & sVendor);
 
-    ::std::vector< ::rtl::OUString> getSupportedVendors();
+    ::std::vector< ::rtl::OUString> getSupportedVendors();    
 };
 
 /* The class offers functions to retrieve verified bootstrap parameters.
@@ -70,7 +70,7 @@ namespace  BootParams
    In direct mode either of them must be set. If not an exception is thrown.
 */
 ::rtl::OUString getJREHome();
-
+    
 ::std::vector< ::rtl::OString> getVMParameters();
 
 ::rtl::OUString getUserData();
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index 63402bef98d4..eee75cd8d21a 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@
 #include "osl/module.hxx"
 #include "osl/thread.hxx"
 #include "rtl/ustring.hxx"
-#include "rtl/ustrbuf.hxx"
+#include "rtl/ustrbuf.hxx" 
 #include "rtl/bootstrap.hxx"
 #include "osl/file.hxx"
 #include "osl/process.h"
@@ -83,7 +83,7 @@ bool isAccessibilitySupportDesired()
         DWORD   dwType = 0;
         DWORD   dwLen = 16;
         unsigned char arData[16];
-        if( RegQueryValueEx(hKey, "SupportAssistiveTechnology", NULL, &dwType, arData,
+        if( RegQueryValueEx(hKey, "SupportAssistiveTechnology", NULL, &dwType, arData, 
                             & dwLen)== ERROR_SUCCESS)
         {
             if (dwType == REG_SZ)
@@ -97,7 +97,7 @@ bool isAccessibilitySupportDesired()
 #if OSL_DEBUG_LEVEL > 1
                 else
                     OSL_ASSERT(0);
-#endif
+#endif                 
             }
             else if (dwType == REG_DWORD)
             {
@@ -108,7 +108,7 @@ bool isAccessibilitySupportDesired()
 #if OSL_DEBUG_LEVEL > 1
                 else
                     OSL_ASSERT(0);
-#endif
+#endif                
             }
         }
     }
@@ -156,7 +156,7 @@ rtl::ByteSequence encodeBase16(const rtl::ByteSequence& rawData)
         *pCurBuf = EncodingTable[curChar];
         pCurBuf++;
     }
-
+    
     rtl::ByteSequence ret((sal_Int8*) pBuf, lenRaw * 2);
     delete [] pBuf;
     return ret;
@@ -199,7 +199,7 @@ rtl::ByteSequence decodeBase16(const rtl::ByteSequence& data)
     }
     rtl::ByteSequence ret((sal_Int8*) pBuf, lenBuf );
     delete [] pBuf;
-    return ret;
+    return ret;   
 }
 
 rtl::OUString getDirFromFile(const rtl::OUString& usFilePath)
@@ -215,10 +215,10 @@ rtl::OUString getExecutableDirectory()
         throw FrameworkException(
             JFW_E_ERROR,
             "[Java framework] Error in function getExecutableDirectory (fwkutil.cxx)");
-
+    
     rtl::OUString ouExe(sExe, SAL_NO_ACQUIRE);
     return getDirFromFile(ouExe);
-}
+} 
 
 rtl::OUString findPlugin(
     const rtl::OUString & baseUrl, const rtl::OUString & plugin)
@@ -311,7 +311,7 @@ rtl::OUString getLibraryLocation()
     rtl::OString sExcMsg("[Java framework] Error in function getLibraryLocation "
                          "(fwkutil.cxx).");
     rtl::OUString libraryFileUrl;
-
+    
     if (!osl::Module::getUrlFromAddress(
             reinterpret_cast< oslGenericFunction >(getLibraryLocation),
             libraryFileUrl))
@@ -328,7 +328,7 @@ jfw::FileStatus checkFileURL(const rtl::OUString & sURL)
     if (File::E_None == rc_item)
     {
         osl::FileStatus status(FileStatusMask_Validate);
-
+        
         File::RC rc_stat = item.getFileStatus(status);
         if (File::E_None == rc_stat)
         {
diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx
index 483cdf648220..bdd4d9b46f02 100644
--- a/jvmfwk/source/fwkutil.hxx
+++ b/jvmfwk/source/fwkutil.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -108,18 +108,18 @@ enum FileStatus
     FILE_DOES_NOT_EXIST,
     FILE_INVALID
 };
-
+    
 /** checks if the URL is a file.
 
     If it is a link to a file than
     it is resolved. Assuming that the argument
     represents a relative URL then FILE_INVALID
     is returned.
-
+    
 
     @return
     one of the values of FileStatus.
-
+    
     @exception
     Errors occured during determining if the file exists
  */
@@ -134,7 +134,7 @@ bool isAccessibilitySupportDesired();
 
 rtl::OUString buildClassPathFromDirectory(const rtl::OUString & relPath);
 
-rtl::OUString retrieveClassPath( ::rtl::OUString const & macro );
+rtl::OUString retrieveClassPath( ::rtl::OUString const & macro );    
 }
 #endif
 
diff --git a/jvmfwk/source/javasettings_template.xml b/jvmfwk/source/javasettings_template.xml
index 3512501d3ee4..5cb41c98bd99 100644
--- a/jvmfwk/source/javasettings_template.xml
+++ b/jvmfwk/source/javasettings_template.xml
@@ -2,8 +2,8 @@
 
 <!--
 This file shows what elements the javasettings_platform.xml can contain.
-The children of javaInfo are only created when a JRE is selected. The children of
-vmParameters are only created when parameters are added and the children of
+The children of javaInfo are only created when a JRE is selected. The children of 
+vmParameters are only created when parameters are added and the children of 
 jreLocations are only created when the paths are added.
 See CNodeJava::loadFromSettings and CNodeJava::writeSettings for details.
 When extending the javavendors.xml then use the schema to verify it.
diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx
index e121712d8672..d44ff28d87c8 100644
--- a/jvmfwk/source/libxmlutil.cxx
+++ b/jvmfwk/source/libxmlutil.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ CXPathObjectPtr & CXPathObjectPtr::operator = (xmlXPathObject* pObj)
 {
     if (_object == pObj)
         return *this;
-
+        
     xmlXPathFreeObject(_object);
     _object = pObj;
     return *this;
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx
index 5ac245afc3c7..0a6a50afabc3 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/source/libxmlutil.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,7 +56,7 @@ public:
 class CXPathContextPtr
 {
     xmlXPathContext* _object;
-
+    
     CXPathContextPtr(const jfw::CXPathContextPtr&);
     CXPathContextPtr & operator = (const CXPathContextPtr&);
 public:
@@ -72,7 +72,7 @@ public:
 class CXmlDocPtr
 {
     xmlDoc* _object;
-
+    
     CXmlDocPtr(const CXmlDocPtr&);
 
 public:
@@ -91,7 +91,7 @@ public:
 // class CXmlNsPtr
 // {
 //     xmlNs* _object;
-
+    
 //     CXmlNsPtr(const CXmlNsPtr&);
 //     CXmlNsPtr & operator = (const CXmlNsPtr&);
 // public:
@@ -109,7 +109,7 @@ public:
 class CXmlCharPtr
 {
     xmlChar* _object;
-
+    
     CXmlCharPtr(const CXmlCharPtr&);
     CXmlCharPtr & operator = (const CXmlCharPtr&);
 public:
diff --git a/offapi/com/sun/star/accessibility/AccessBridge.idl b/offapi/com/sun/star/accessibility/AccessBridge.idl
index 39dc60791337..953ac0b681a1 100644
--- a/offapi/com/sun/star/accessibility/AccessBridge.idl
+++ b/offapi/com/sun/star/accessibility/AccessBridge.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,15 +27,15 @@
 #ifndef __com_sun_star_accessibility_AccessBridge_idl__
 #define __com_sun_star_accessibility_AccessBridge_idl__
 
-module com { module sun { module star { module lang {
-     published interface XInitialization;
+module com { module sun { module star { module lang { 
+     published interface XInitialization; 
 }; }; }; };
 
-module com { module sun { module star { module accessibility {
+module com { module sun { module star { module accessibility { 
 
 /** The UNO <-> Java Access Bridge allows any native frame window
     to become accessible by implementing the XAccessible interface.
-
+    
     <p>Therefor the UNO <-> Java Access Bridge utilizes the Java <-> Windows
     and Java <-> GNOME access bridge by registering the native frames as
     Java windows.</p>
@@ -48,7 +48,7 @@ published service AccessBridge
     /** Expects and instance of XExtendedToolkit as first parameter */
     interface ::com::sun::star::lang::XInitialization;
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/Accessible.idl b/offapi/com/sun/star/accessibility/Accessible.idl
index 2b8395dea192..976d4aafde0b 100644
--- a/offapi/com/sun/star/accessibility/Accessible.idl
+++ b/offapi/com/sun/star/accessibility/Accessible.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
 
 module com { module sun { module star { module accessibility {
 
- published interface    XAccessible;
+ published interface	XAccessible;
 
 /** Every class has to support this service in order to be accessible.
 
@@ -37,11 +37,11 @@ module com { module sun { module star { module accessibility {
     object--which may but usually is not the same object as the object that
     supports the <type>XAccessible</type> interface--that provides the
     actual information that is needed to make it accessible.</p>
-
+        
     <p>Service <code>Accessible</code> is just a wrapper for the interface
     <code>XAccessible</code>.  See the interface's documentation for more
     information.</p>
-
+    
     @see XAccessible
 
     @since OOo 1.1.2
@@ -50,7 +50,7 @@ published service Accessible
 {
     interface XAccessible;
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/AccessibleContext.idl b/offapi/com/sun/star/accessibility/AccessibleContext.idl
index f9ccf67ec324..5ac46e9e3774 100644
--- a/offapi/com/sun/star/accessibility/AccessibleContext.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,11 +44,11 @@ module com { module sun { module star { module accessibility {
     <type>XAccessibleContext</type> interface of this service exposes
     methods that provide access to the actual object's content.  This can be
     the object's role, name, description, and so on.</p>
-
+    
     @see XAccessibleContext
 
     @since OOo 1.1.2
-*/
+*/    
 published service AccessibleContext
 {
     interface XAccessibleContext;
@@ -59,9 +59,9 @@ published service AccessibleContext
         @see AccessibleEventObject
         @see AccessibleEventId
     */
-    [optional] interface XAccessibleEventBroadcaster;
+    [optional] interface XAccessibleEventBroadcaster; 
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/AccessibleEventId.idl b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
index 960a4c5d425c..782f0eb1d648 100644
--- a/offapi/com/sun/star/accessibility/AccessibleEventId.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/accessibility/AccessibleEventObject.idl b/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
index c1a4e5c39d07..c53658dc8ecd 100644
--- a/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/accessibility/AccessibleRelation.idl b/offapi/com/sun/star/accessibility/AccessibleRelation.idl
index 8df475e9fa0e..61126087d4a7 100644
--- a/offapi/com/sun/star/accessibility/AccessibleRelation.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleRelation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,15 +27,15 @@
 #ifndef __com_sun_star_accessibility_AccessibleRelation_idl__
 #define __com_sun_star_accessibility_AccessibleRelation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
 module com { module sun { module star { module accessibility {
 
 /** An <type>AccessibleRelation</type> object defines a one-to-many
     relation.
-
+    
     <p>The represented relation points from the implementing object to a set
     of target objects.</p>
 
@@ -44,25 +44,25 @@ module com { module sun { module star { module accessibility {
 published struct AccessibleRelation
 {
     /** Type of the relation.
-
+        
         <p>Its value has to be one of the constants defined by
         <type>AccessibleRelationType</type>.  If that value is INVALID then
         the whole relation is regarded as invalid.  The content of the
         targetSet is then undefined.</p>
-
+            
         @see AccessibleRelationType
     */
     short RelationType;
-
+    
     /** Set of objects that are the relation's targets.
-
+        
         <p>The content of this set is undefined if the relation's type is
         INVALID.  The set must not contain references to one object more
         than once.</p>
     */
     sequence< ::com::sun::star::uno::XInterface> TargetSet;
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/AccessibleRelationType.idl b/offapi/com/sun/star/accessibility/AccessibleRelationType.idl
index ead836dcec36..9542e2bede0b 100644
--- a/offapi/com/sun/star/accessibility/AccessibleRelationType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleRelationType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@ module com { module sun { module star { module accessibility {
 
     <p>This list of constants defines the available types of relations that
     are usable by <type>AccessibleRelation</type>.</p>
-
+        
     <p>We are using constants instead of a more typesafe enum.  The reason
     for this is that IDL enums may not be extended.  Therefore, in order to
     include future extensions to the set of roles we have to use constants
@@ -44,53 +44,53 @@ module com { module sun { module star { module accessibility {
 published constants AccessibleRelationType
 {
     /** Invalid relation type.
-
+    
         <p>Indicates an invalid relation type.  This is used to indicate
         that a retrieval method could not find a requested relation.</p>
     */
     const short INVALID = 0;
 
     /** Content-flows-from relation.
-
+    
         <p>Indicates a content flow between the related objects.</p>
     */
     const short CONTENT_FLOWS_FROM = 1;
 
     /** Content-flows-to relation.
-
+    
         <p>Indicates a content flow between the related objects.</p>
     */
     const short CONTENT_FLOWS_TO = 2;
 
     /** Controlled-by relation type.
-
+        
         <p>Indicates an object is controlled by one or more target
         objects.</p>
     */
     const short CONTROLLED_BY = 3;
 
     /** Controller-for relation type.
-
+    
         <p>Indicates an object is a controller for one or more target
         objects.</p>
     */
     const short CONTROLLER_FOR = 4;
 
     /** Label-for relation type.
-
+        
         <p>Indicates an object is a label for one or more target
         objects.</p>
     */
     const short LABEL_FOR = 5;
 
     /** Labeled-by relation type.
-
+    
         <p>Indicates an object is labeled by one or more target objects.</p>
     */
     const short LABELED_BY = 6;
 
     /** Member-of relation type.
-
+    
         <p>Indicates an object is a member of a group of one or more target
         objects.</p>
     */
@@ -107,8 +107,8 @@ published constants AccessibleRelationType
 
     /** Node-Child-of relation type.
 
-        <p>Indicates an object is a cell in a tree or tree table which is
-        displayed because a cell in the same column is expanded and
+        <p>Indicates an object is a cell in a tree or tree table which is 
+        displayed because a cell in the same column is expanded and 
         identifies that cell.</p>
 
         @since OOo 3.0
diff --git a/offapi/com/sun/star/accessibility/AccessibleStateType.idl b/offapi/com/sun/star/accessibility/AccessibleStateType.idl
index 1d83932d0344..ccb3e59e8d7b 100644
--- a/offapi/com/sun/star/accessibility/AccessibleStateType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleStateType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -114,7 +114,7 @@ published constants AccessibleStateType
     /** Sometimes UI elements can have a state indeterminate.
         This can happen e.g. if a check box reflects the bold state of text in a text processor.
         When the current selection contains text which is bold and also text which is not bold, the state is indeterminate.
-
+        
     */
     const short INDETERMINATE = 14;
 
diff --git a/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl b/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl
index f38bbf9e17ac..d948a3e2f627 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,14 +55,14 @@ published struct AccessibleTableModelChange
         of the model change.</p>
     */
     short Type;
-
+    
     /** The lowest index of a row that has changed.
 
         <p>The first row that has been changed or that contains
         modified cells.</p>
     */
     long FirstRow;
-
+    
     /** The highest index of a row that has changed.
 
         <p>The last row that has been changed or that contains modified
@@ -84,7 +84,7 @@ published struct AccessibleTableModelChange
     */
     long LastColumn;
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl b/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
index bdc57865db98..9ba1a51da02f 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ module com { module sun { module star { module accessibility {
         <p>The value of this constants group are used by the
         <type>AccessibleTableModelChange</type> structure to specify the
         type of change that has been made to a table model.</p>
-
+        
         <p>Two of the constants,
         <const>AccessibleTableModelChangeType::INSERT</const> and
         <const>AccessibleTableModelChangeType::DELETE</const> describe
@@ -53,22 +53,22 @@ module com { module sun { module star { module accessibility {
 published constants AccessibleTableModelChangeType
 {
     /** One or more rows and/or columns have been inserted.
-
+        
         <p>Use the fields of the <type>AccessibleTableModelChange</type>
         structure to determine the indices of the rows and/or columns that
         have been inserted.</p>
     */
     const short INSERT = 1;
-
+    
     /** One or more rows and/or columns have been deleted.
-
-        <p>The affected area of the table is stored in the fields of the
+        
+        <p>The affected area of the table is stored in the fields of the 
         <type>AccessibleTableModelChange</type> structure.</p>
      */
     const short DELETE = 2;
-
+    
     /** Some of the table data has changed.
-
+        
         <p>The number of rows and columns remains unchanged.  Only (some of)
         the content of the cells in the range that is specified by the
         fields of the <type>AccessibleTableModelChange</type> structure have
@@ -76,7 +76,7 @@ published constants AccessibleTableModelChangeType
     */
     const short UPDATE = 3;
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/AccessibleTextType.idl b/offapi/com/sun/star/accessibility/AccessibleTextType.idl
index 33dfd5d7beb3..dad427fccc13 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTextType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTextType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_accessibility_AccessibleTextType_idl__
-#define __com_sun_star_accessibility_AccessibleTextType_idl__
+#ifndef	__com_sun_star_accessibility_AccessibleTextType_idl__
+#define	__com_sun_star_accessibility_AccessibleTextType_idl__
 
 module com { module sun { module star { module accessibility {
 
@@ -42,13 +42,13 @@ module com { module sun { module star { module accessibility {
 published constants AccessibleTextType
 {
     /** Single character.
-
+    
         <p>Indicates that single (multibyte) characters are used.</p>
     */
     const short CHARACTER = 1;
-
+    
     /** Single word.
-
+    
         <p>Indicates that single words are used.  The definition of what a
         word is is implementation and language/locale dependent.  While in
         English a word is ended by a space or a special character like a
@@ -56,26 +56,26 @@ published constants AccessibleTextType
         languages.</p>
     */
     const short WORD = 2;
-
+    
     /** Single sentence.
-
+    
         <p>Indicates that single sentences are used.  The definition of what
         a sentence is is implementation and language/locale dependent.
         While in English a sentence is ended by a period, this is not
         necessarily true in other languages.</p>
     */
     const short SENTENCE = 3;
-
+    
     /** Single paragraph.
-
+    
         <p>Indicates that single paragraphs are used.  The definition of
         what a paragraph is is implementation and language/locale
         dependent.</p>
     */
     const short PARAGRAPH = 4;
-
+    
     /** Single line.
-
+    
         <p>Indicates that single lines, as displayed on the screen, are
         used.  In contrast to the constants <const>CHARACTER</const>,
         <const>WORD</const>, <const>SENTENCE</const>, and
@@ -99,7 +99,7 @@ published constants AccessibleTextType
     */
     const short ATTRIBUTE_RUN = 7;
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl b/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl
index a90733f0a13b..9cb78aac9d06 100644
--- a/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl
+++ b/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,30 +25,30 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_accessibility_IllegalAccessibleComponentStateException_idl__
-#define __com_sun_star_accessibility_IllegalAccessibleComponentStateException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-module com {  module sun {  module star {  module accessibility {
-
+#ifndef __com_sun_star_accessibility_IllegalAccessibleComponentStateException_idl__ 
+#define __com_sun_star_accessibility_IllegalAccessibleComponentStateException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+module com {  module sun {  module star {  module accessibility {  
+ 
 /** Indicates invalid or unavailable state information.
 
     <p>This exception is thrown to indicate the an accessibility component
     has been queried for state information that it can not provide.  Used by
     <member>XAccessibleContext::getLocale</member>.</p>
-
+    
     @see XAccessibleContext::getLocale()
 
     @since OOo 1.1.2
 */
-published exception IllegalAccessibleComponentStateException
+published exception IllegalAccessibleComponentStateException 
     : ::com::sun::star::uno::Exception
 {
-};
-
-}; }; }; };
+}; 
 
-#endif
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/accessibility/TextSegment.idl b/offapi/com/sun/star/accessibility/TextSegment.idl
index 650433598539..824d2bf3ac3a 100644
--- a/offapi/com/sun/star/accessibility/TextSegment.idl
+++ b/offapi/com/sun/star/accessibility/TextSegment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -79,7 +79,7 @@ published struct TextSegment
     */
     long SegmentEnd;
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/XAccessible.idl b/offapi/com/sun/star/accessibility/XAccessible.idl
index d195da413c8a..afd9928bf172 100644
--- a/offapi/com/sun/star/accessibility/XAccessible.idl
+++ b/offapi/com/sun/star/accessibility/XAccessible.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,9 @@
 #ifndef __com_sun_star_accessibility_XAccessible_idl__
 #define __com_sun_star_accessibility_XAccessible_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
 module com { module sun { module star { module accessibility {
 
@@ -38,11 +38,11 @@ module com { module sun { module star { module accessibility {
 
 /** This interface has to be implemented by any class that wants to be
     accessible.
-
+    
     <p>It is used to provide access to the <type>XAccessibleContext</type>
     interface but allows at the same time that that interface is implemented
     by another class.</p>
-
+    
     <p>The distinction between the interfaces <type>XAccessible</type> and
     <type>XAccessibleContext</type> makes it possible to split up the
     implementation of the
@@ -63,24 +63,24 @@ module com { module sun { module star { module accessibility {
 */
 published interface XAccessible : ::com::sun::star::uno::XInterface
 {
-    /** Returns the AccessibleContext associated with this object.
-
+    /** Returns the AccessibleContext associated with this object.  
+    
         <p>The idea to let this interface only return an
         <type>XAccessibleContext</type> instead of directly supporting its
         functions is to allow the separation of the implementation of the
         functions that make a class accessible from the implementation of
         that class.  You may, of course, implement <type>XAccessible</type>
         and <type>XAccessibleContext</type> in one class.</p>
-
+        
         @return
             A reference to the object that contains the actual accessibility
             information.
-
+            
         @see AccessibleContext
     */
     XAccessibleContext getAccessibleContext ();
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/XAccessibleAction.idl b/offapi/com/sun/star/accessibility/XAccessibleAction.idl
index 4d25f9a71ea2..1270283f0ec9 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleAction.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,12 +25,12 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
-#define __com_sun_star_accessibility_XAccessibleAction_idl__
+#ifndef	__com_sun_star_accessibility_XAccessibleAction_idl__
+#define	__com_sun_star_accessibility_XAccessibleAction_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
 #endif
@@ -41,7 +41,7 @@ module com { module sun { module star { module accessibility {
 
 /** Implement this interface to give access to actions that can be executed
     for accessible objects.
-
+        
     <p>Every accessible object that can be manipulated beyond its methods
     exported over the accessibility API should support this interface to
     expose all actions that it can perform.  Each action can be performed or
@@ -52,18 +52,18 @@ module com { module sun { module star { module accessibility {
 published interface XAccessibleAction : ::com::sun::star::uno::XInterface
 {
     /** Returns the number of accessible actions available in this object.
-
+        
         <p>If there are more than one, the first one is considered the
         "default" action of the object.</p>
-
+        
         @return
             The returned value of the number of actions is zero if there are
             no actions.
     */
     long getAccessibleActionCount ();
-
+    
     /** Perform the specified Action on the object.
-
+    
         @param nIndex
             This index specifies the action to perform.  If it lies outside
             the valid range <FALSE/> is returned and no action is performed.
@@ -77,36 +77,36 @@ published interface XAccessibleAction : ::com::sun::star::uno::XInterface
             <type scope="::com::sun::star::lang">IndexOutOfBoundsException</type>
             exception is thrown.
     */
-    boolean doAccessibleAction ([in] long nIndex)
+    boolean	doAccessibleAction ([in] long nIndex)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
 
     /** Returns a description of the specified action of the object.
-
+    
         @param nIndex
             This index specifies the action of which to return a
             description.  If it lies outside the valid range an empty string
             is returned.
-
+            
         @return
             The returned value is a localized string of the specified action.
 
         @throws IndexOutOfBoundsException
             If the given index lies not in the valid range then an
-            <type scope="::com::sun::star::lang">IndexOutOfBoundsException</type>
+            <type scope="::com::sun::star::lang">IndexOutOfBoundsException</type> 
             exception is thrown.
     */
     string getAccessibleActionDescription ([in] long nIndex)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
-
+    
     /** Returns a key binding object, if there is one, associated with the
         specified action.  Note that there can be several alternative key
         bindings for an action.  See <type>XAccessibleKeyBinding</type> for
         more information about how key bindings are represented.
-
+            
         @param nIndex
             This index specifies the action of which to return the key
             binding.
-
+            
         @return
             The returned object describes a set of key bindings associated
             with the specified action.
@@ -117,7 +117,7 @@ published interface XAccessibleAction : ::com::sun::star::uno::XInterface
     XAccessibleKeyBinding getAccessibleActionKeyBinding ([in] long nIndex)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
 };
-
+ 
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/XAccessibleComponent.idl b/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
index 2e1b980fc8d9..3c2d14afb4bc 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,9 @@
 #ifndef __com_sun_star_accessibility_XAccessibleComponent_idl__
 #define __com_sun_star_accessibility_XAccessibleComponent_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_awt_XFocusListener_idl__
 #include <com/sun/star/awt/XFocusListener.idl>
 #endif
@@ -103,19 +103,19 @@ module com { module sun { module star { module accessibility {
 published interface XAccessibleComponent : ::com::sun::star::uno::XInterface
 {
     /** Tests whether the specified point lies within this object's bounds.
-
+    
         <p>The test point's coordinates are defined relative to the
         coordinate system of the object.  That means that when the object is
         an opaque rectangle then both the points (0,0) and (with-1,height-1)
         would yield a <TRUE/> value.</p>
-
+        
         @param point
             Coordinates of the point to test.  The origin of the coordinate
             system is the upper left corner of the object's bounding box as
             returned by the <method>getBounds</method>.  The scale of the
             coordinate system is identical to that of the screen coordinate
             system.
-
+            
         @return
             Returns <TRUE/> if the point lies within or on the object's bounding
             box and <FALSE/> otherwise.
@@ -123,7 +123,7 @@ published interface XAccessibleComponent : ::com::sun::star::uno::XInterface
     boolean containsPoint ([in] ::com::sun::star::awt::Point aPoint);
 
     /** Returns the Accessible child that is rendered under the given point.
-
+    
         <p>The test point's coordinates are defined relative to the
         coordinate system of the object.  That means that when the object is
         an opaque rectangle then both the points (0,0) and (with-1,height-1)
@@ -135,7 +135,7 @@ published interface XAccessibleComponent : ::com::sun::star::uno::XInterface
             corner of the object's bounding box as returned by the
             <method>getBounds</method>.  The scale of the coordinate
             system is identical to that of the screen coordinate system.
-
+            
         @return
             If there is one child which is rendered so that its bounding box
             contains the test point then a reference to that object is
@@ -147,14 +147,14 @@ published interface XAccessibleComponent : ::com::sun::star::uno::XInterface
     XAccessible  getAccessibleAtPoint ([in] ::com::sun::star::awt::Point aPoint);
 
     /** Returns the bounding box of this object.
-
+    
         <p>The returned bounding box has the form of a rectangle.  Its
         coordinates are relative to the object's parent coordinate system.
         Note that the two methods <method>getLocation</methodmber> and
         <method>getSize</method> return the same information.  With method
         <method>getLocationOnScreen</method> you can get the bound box
         position in screen coordinates.</p>
-
+        
         @return
             The coordinates of the returned rectangle are relative to this
             object's parent or relative to the screen on which this object
@@ -166,10 +166,10 @@ published interface XAccessibleComponent : ::com::sun::star::uno::XInterface
 
     /** Returns the location of the upper left corner of the object's
         bounding box relative to the parent.</p>
-
+    
         <p>The coordinates of the bounding box are given relative to the
         parent's coordinate system.</p>
-
+        
         @return
             The coordinates of the returned position are relative to this
             object's parent or relative to the screen on which this object
@@ -180,30 +180,30 @@ published interface XAccessibleComponent : ::com::sun::star::uno::XInterface
 
     /** Returns the location of the upper left corner of the object's
         bounding box in screen coordinates.
-
+        
         <p>This method returns the same point as does the method
         <method>getLocation</method>.  The difference is that the
         coordinates are absolute screen coordinates of the screen to which
         the object is rendered instead of being relative to the object's
         parent.</p>
-
+        
         @return
             The coordinates of the returned position are relative to the
             screen on which this object is rendered.  If the object is not
             on any screen the returned position is (0,0).
     */
     ::com::sun::star::awt::Point getLocationOnScreen ();
-
+    
     /** Returns the size of this object's bounding box.
-
+    
         @return
             The returned size is the size of this object or empty if it is
             not rendered on any screen.
     */
     ::com::sun::star::awt::Size getSize();
-
+    
     /** Grabs the focus to this object.
-
+    
         <p>If this object can not accept the focus,
         i.e. <method>isFocusTraversable</method> returns <FALSE/> for this
         object then nothing happens.  Otherwise the object will attempt to
@@ -214,23 +214,23 @@ published interface XAccessibleComponent : ::com::sun::star::uno::XInterface
     [oneway] void grabFocus ();
 
     /** Returns the foreground color of this object.
-
+    
         @return
             The returned color is the foreground color of this object or, if
             that is not supported, the default foreground color.
-    */
+    */ 
     ::com::sun::star::util::Color getForeground ();
 
     /** Returns the background color of this object.
-
+    
         @return
             The returned color is the background color of this object or, if
             that is not supported, the default background color.
-    */
+    */ 
     ::com::sun::star::util::Color getBackground ();
 
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/XAccessibleContext.idl b/offapi/com/sun/star/accessibility/XAccessibleContext.idl
index 67ec7cf8d9a4..b639df887ede 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleContext.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,41 +68,41 @@ module com { module sun { module star { module accessibility {
 published interface XAccessibleContext : ::com::sun::star::uno::XInterface
 {
     /** Return the number of children.
-
+    
         <p>Returns the number of accessible children of the object.</p>
-
-        @return
+        
+        @return 
             The returned value is non-negative.
     */
-    long getAccessibleChildCount();
+    long getAccessibleChildCount(); 
 
     /** Returns the i-th child of this object.
-
+        
         <p>The order in which the children are enumerated is implementation
         dependent.</p>
-
-        @param i
+        
+        @param i 
             The index may have any value.  If it is outside the range from 0
             to n-1, with n being the number of children as returned by
             <member>XAccessibleContext::getAccessibleChild</member> an empty
             reference is returned.
-        @return
+        @return 
             If the object has an i-th child the returned value is a
             reference to that child.  Otherwise an empty reference is
             returned.
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
             If no child with the given index exists then an
-            <type scope="::com::sun::star::lang">IndexOutOfBoundsException</type>
+            <type scope="::com::sun::star::lang">IndexOutOfBoundsException</type> 
             exception is thrown.
     */
     XAccessible getAccessibleChild ([in] long i)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
 
     /** Returns the parent of this object.
-
+        
         <p>This function may be called for every node, including the root
         node, of the accessible tree.</p>
-
+        
         @return
             The returned reference points to a valid object for all but the
             root node.  If called for the root node an empty reference is
@@ -111,57 +111,57 @@ published interface XAccessibleContext : ::com::sun::star::uno::XInterface
     XAccessible getAccessibleParent ();
 
     /** Returns the index of this object in its accessible parent.
-
+        
         <p>If you call getAccessibeChild on the object's parent with the
         index returned by this function you get a reference to this
         object.</p>
-
+        
         @return
            The returned index is zero based.
     */
     long getAccessibleIndexInParent ();
 
     /** Returns the role of this object.
-
+        
         <p>The role is a generic description of an objects function.  The
         relation between role and name is similar to the relation between
         class and object.</p>
-
+        
         @return
             The returned value is a role defined in the enumeration
             AccessibleRole.
-
-        @see AccessibleRole
+            
+        @see AccessibleRole 
             for a list of the available roles.
     */
     short getAccessibleRole ();
 
     /** Returns the object's description.
-
+    
         <p>Returns the object's localized description.  The description should
         complement the more generic descriptions given by an object's role
         and name.</p>
-
-        @return
+        
+        @return 
             The returned string is the object's localized description.
     */
     string getAccessibleDescription ();
 
     /** Return the object's localized name.
-
+        
         <p>See <member>XAccessibleContext::getAccessibleRole</member>'s
         documentation for the relation between an object's name and role.
         Names should be unique, at least between children of the same
         parent, although the uniqueness is neither enforced nor used inside
         the API.</p>
-
+        
         @return
             The returned string is the object's localized name.
     */
     string  getAccessibleName ();
 
     /** Returns the set of relations defined for this object.
-
+        
         <p>The returned set of relations is a copy of this object's relation
         set: changing the returned object does not change this object's
         relations.</p>
@@ -169,7 +169,7 @@ published interface XAccessibleContext : ::com::sun::star::uno::XInterface
         <p>aThere are two ways to represent an empty list of relations:
         Return an empty reference or return a valid object that contains an
         empty list.
-
+         
         @return
            The returned value is either an empty reference or a reference to
            a valid object that represents a copy of the objects list of
@@ -179,37 +179,37 @@ published interface XAccessibleContext : ::com::sun::star::uno::XInterface
 
     /** Returns the set of states that are currently active for this
         object.
-
+        
         <p>The returned state set is a copy: Changing the returned state set
         will not be reflected by changing the object's set of states.  See
         the documentation of <type>XAccessibleStateSet</type> for a
         description of the individual states.</p>
-
+        
         @return
             A reference to this object's state set or an empty reference if
             states are not supported.
-
+            
         @see XAccessibleStateSet
     */
     XAccessibleStateSet getAccessibleStateSet ();
 
     /** Returns the locale of the component.
-
+        
         <p>This locale is used for example to determine the language to use
         for the name and description texts.</p>
-
+    
         @return
             If this object does not have a locale, the locale of its parent
             is returned.  If it does not have (yet) a parent it throws the
             exception <type>IllegalAccessibleComponentStateException</type>.
-
+            
         @throws IllegalAccessibleComponentStateException
             when this object does not (yet) have a parent.
     */
     ::com::sun::star::lang::Locale getLocale ()
         raises (IllegalAccessibleComponentStateException);
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl b/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl
index 1dc673f4a024..ff0d33356aed 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,18 +28,18 @@
 #ifndef __com_sun_star_accessibility_XAccessibleEditableText_idl__
 #define __com_sun_star_accessibility_XAccessibleEditableText_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
-#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
-#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
+#ifndef __com_sun_star_accessibility_XAccessibleText_idl__ 
+#include <com/sun/star/accessibility/XAccessibleText.idl> 
+#endif 
+#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ 
+#include <com/sun/star/lang/IndexOutOfBoundsException.idl> 
+#endif 
 #ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
 #endif
 
 module com { module sun { module star { module accessibility {
-
+        
 /** Implement this interface to give read and write access to a text
     representation.
 
@@ -53,21 +53,21 @@ published interface XAccessibleEditableText
     : ::com::sun::star::accessibility::XAccessibleText
 {
     /** Copies the text range into the clipboard.
-
+    
         <p>The specified text between and including the two given indices is
         copied into the system clipboard and is deleted afterwards from the
         text represented by this object.  This is equivalent to calling
         first <member>XAccessibleText::copyText</member> and then
         <member>XAccessibleEditableText::deleteText</member> with the given
         start and end indices.</p>
-
-        <p>The text indices are interpreted like those in the
+        
+        <p>The text indices are interpreted like those in the 
         <member>XAccessibleText::getTextRange</member> method. </p>
-
+        
         @param nStartIndex
             Start index of the text to moved into the clipboard.
             The valid range is 0..length.
-
+            
         @param nEndIndex
             End index of the text to moved into the clipboard.
             The valid range is 0..length.
@@ -83,13 +83,13 @@ published interface XAccessibleEditableText
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
 
     /** Pastes text from the clipboard.
-
+    
         <p>The text in the system clipboard is pasted into the text
         represented by this object at the given index.  This method is
         similar to the <member>XAccessibleEditableText::insertText</member>
         method.  If the index is not valid then the system clipboard text is
         not inserted.</p>
-
+        
         @param nIndex
             Index at which to insert the text from the system clipboard into
             the text represented by this object.
@@ -104,19 +104,19 @@ published interface XAccessibleEditableText
     */
     boolean pasteText ([in] long nIndex)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
-
+    
     /** Deletes a range of text.
-
+    
         <p>The text between and including the two given indices is deleted
         from the text represented by this object.</p>
 
-        <p>The text indices are interpreted like those in the
+        <p>The text indices are interpreted like those in the 
         <member>XAccessibleText::getTextRange</member> method. </p>
-
+        
         @param nStartIndex
             Start index of the text to be deleted.
             The valid range is 0..length.
-
+            
         @param nEndIndex
             End index of the text to be deleted.
             The valid range is 0..length.
@@ -132,13 +132,13 @@ published interface XAccessibleEditableText
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
 
     /** Inserts text at the specified position.
-
+    
         <p>The specified string is inserted at the given index into the text
         represented by this object.</p>
-
+            
         @param sText
             Text that is inserted.
-
+            
         @param nIndex
             Index at which to insert the text.
             The valid range is 0..length.
@@ -154,7 +154,7 @@ published interface XAccessibleEditableText
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
 
     /** Replaces text.
-
+    
         <p>The text between the two given indices is replaced
         by the specified replacement string. This method is
         equivalent to calling first
@@ -162,14 +162,14 @@ published interface XAccessibleEditableText
         indices and afterwards calling
         <member>XAccessibleEditableText::insertText</member> with the
         replacement text and the start index.</p>
-
-        <p>The text indices are interpreted like those in the
+        
+        <p>The text indices are interpreted like those in the 
         <member>XAccessibleText::getTextRange</member> method. </p>
 
         @param nStartIndex
             Start index of the text to be replaced.
             The valid range is 0..length.
-
+            
         @param nEndIndex
             Start index of the text to be replaced.
             The valid range is 0..length.
@@ -190,22 +190,22 @@ published interface XAccessibleEditableText
 
     /** Replaces the attributes of a text range by the given set of
         attributes.
-
+    
         <p>Sets the attributes for the text between and including the two
         given indices to those given.  The old attributes of this text
         portion are replaced by the new list of attributes.</p>
-
-        <p>The text indices are interpreted like those in the
+        
+        <p>The text indices are interpreted like those in the 
         <member>XAccessibleText::getTextRange</member> method. </p>
 
         @param nStartIndex
             Start index of the text whose attributes are modified.
             The valid range is 0..length.
-
+            
         @param nEndIndex
             Start index of the text whose attributes are modified.
             The valid range is 0..length.
-
+            
         @param aAttributeSet
             Set of attributes that replaces the old list of attributes of
             the specified text portion.
@@ -220,11 +220,11 @@ published interface XAccessibleEditableText
     boolean setAttributes ([in] long nStartIndex, [in] long nEndIndex,
         [in] sequence<::com::sun::star::beans::PropertyValue> aAttributeSet)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
-
+    
     /** Replaces the whole text with the given text.
-
+    
         <p>The text content of this object is set to the given string.</p>
-
+        
         @param sText
             The new text that replaces the old text.
 
@@ -234,7 +234,7 @@ published interface XAccessibleEditableText
     */
     boolean setText ([in] string sText);
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl b/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl
index 0635ad906da4..f05c7b659b4f 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,12 +25,12 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
-#define __com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
+#ifndef	__com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
+#define	__com_sun_star_accessibility_XAccessibleEventBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
 module com { module sun { module star { module accessibility {
 
@@ -45,20 +45,20 @@ module com { module sun { module star { module accessibility {
     @since OOo 1.1.2
  */
 published interface XAccessibleEventBroadcaster: ::com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{  
+    //------------------------------------------------------------------------- 
+        
     /** registers the given <type>XAccessibleEventListener</type>.
      */
-    [oneway] void addEventListener( [in] XAccessibleEventListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addEventListener( [in] XAccessibleEventListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** unregisters the given <type>XAccessibleEventListener</type>.
      */
-    [oneway] void removeEventListener( [in] XAccessibleEventListener xListener );
-};
-
+    [oneway] void removeEventListener( [in] XAccessibleEventListener xListener ); 
+};  
+ 
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl b/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl
index d673d71557b4..bd76259dde13 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,12 +25,12 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_accessibility_XAccessibleEventListener_idl__
-#define __com_sun_star_accessibility_XAccessibleEventListener_idl__
+#ifndef	__com_sun_star_accessibility_XAccessibleEventListener_idl__
+#define	__com_sun_star_accessibility_XAccessibleEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
 
 #ifndef __com_sun_star_accessibility_AccessibleEventObject_idl__
 #include <com/sun/star/accessibility/AccessibleEventObject.idl>
@@ -46,14 +46,14 @@ module com { module sun { module star { module accessibility {
     @since OOo 1.1.2
  */
 published interface XAccessibleEventListener: ::com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{  
+    //------------------------------------------------------------------------- 
+        
     /** is called whenever a accessible event (see <type>AccessibleEventObject</type>) occurs.
      */
-    void notifyEvent( [in] AccessibleEventObject aEvent );
-};
-
+    void notifyEvent( [in] AccessibleEventObject aEvent ); 
+};  
+ 
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl b/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
index f7e9168ae881..ef31c6500d76 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,9 @@
 #ifndef __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 #define __com_sun_star_accessibility_XAccessibleExtendedComponent_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_awt_XFocusListener_idl__
 #include <com/sun/star/awt/XFocusListener.idl>
 #endif
@@ -74,36 +74,36 @@ module com { module sun { module star { module accessibility {
 published interface XAccessibleExtendedComponent : XAccessibleComponent
 {
     /** Returns the font of this object.
-
+    
         @return
             The returned reference to a font object is empty if a font is not
             supported by this object.
     */
     ::com::sun::star::awt::XFont getFont ();
 
-    /** Returns the titled border text.
-
+    /** Returns the titled border text.  
+        
         <p>This method stems from the Java interface
         <code>AccessibleExtendedComponent</code>.</p>
-
+        
         @return
             The returned value is the titled border text of the object or
             empty if that is not supported.
     */
     string getTitledBorderText ();
 
-    /** Returns the tool tip text of this object.
-
+    /** Returns the tool tip text of this object.  
+        
         <p>This method stems from the Java interface
         <code>AccessibleExtendedComponent</code>.</p>
-
+        
         @return
             Returns the localized tool tip text of the object.  If tool tips
             are not supported and empty string is returned.
     */
     string getToolTipText ();
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl b/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl
index 464ebff4b838..3505919bcb16 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,12 +28,12 @@
 #ifndef __com_sun_star_accessibility_XAccessibleHyperlink_idl__
 #define __com_sun_star_accessibility_XAccessibleHyperlink_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__
-#include <com/sun/star/accessibility/XAccessibleAction.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
-#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
+#ifndef __com_sun_star_accessibility_XAccessibleAction_idl__ 
+#include <com/sun/star/accessibility/XAccessibleAction.idl> 
+#endif 
+#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ 
+#include <com/sun/star/lang/IndexOutOfBoundsException.idl> 
+#endif 
 
 module com { module sun { module star { module accessibility {
 
@@ -49,7 +49,7 @@ module com { module sun { module star { module accessibility {
     <member>XAccessibleHyperlink::getAccessibleActionAnchor</member> and
     <member>XAccessibleHyperlink::getAccessibleActionObject</member>
     methods.</p>
-
+        
     <p>Furthermore, the object that implements this interface has to be
     connected implicitly or explicitly with an object that implements the
     the <type>XAccessibleText</type> interface.  The
@@ -59,21 +59,21 @@ module com { module sun { module star { module accessibility {
 
     @since OOo 1.1.2
 */
-published interface XAccessibleHyperlink :
+published interface XAccessibleHyperlink : 
     ::com::sun::star::accessibility::XAccessibleAction
 {
     /** Returns an object that represents the link anchor, as appropriate
         for that link.
-
+        
         <p>For an HTML link for example, this method would return the string
         enclosed by the &lt&a href&gt; tag.</p>
-
+        
         @param nIndex
             This index identifies the anchor when, as in the case of an
             image map, there is more than one link represented by this
             object.  The valid maximal index can be determined by calling
             the <member>XAccessibleAction::getActionCount</member> method.
-
+            
         @return
             If the index is not valid then an exception is thrown.
             Otherwise it returns an implementation dependent value.
@@ -83,16 +83,16 @@ published interface XAccessibleHyperlink :
 
     /** Returns an object that represents the link anchor, as appropriate
         for that link.
-
+        
         <p>For an HTML link for example, this method would return the URL of
         the &lt&a href&gt; tag.</p>
-
+        
         @param nIndex
             This index identifies the action object when, as in the case of
             an image map, there is more than one link represented by this
             object.  The valid maximal index can be determined by calling
             the <member>XAccessibleAction::getActionCount</member> method.
-
+            
         @return
             If the index is not valid then an exception is thrown.
             Otherwise it returns an implementation dependent value.
@@ -102,10 +102,10 @@ published interface XAccessibleHyperlink :
 
     /** Returns the index at which the textual representation of the
         hyperlink (group) starts.
-
+        
         <p>The returned value relates to the <type>XAccessibleText</type>
         interface that owns this hyperlink.</p>
-
+        
         @return
             The index relates to the text exposed by the
             <type>XAccessibleHypertext</type> interface.
@@ -114,10 +114,10 @@ published interface XAccessibleHyperlink :
 
     /** Returns the index at which the textual representation of the
         hyperlink (group) ends.
-
+        
         <p>The returned value relates to the <type>XAccessibleText</type>
         interface that owns this hyperlink.</p>
-
+        
         @return
             The index relates to the text exposed by the
             <type>XAccessibleText</type> interface.
@@ -126,17 +126,17 @@ published interface XAccessibleHyperlink :
 
     /** Returns whether the document referenced by this links is
         still valid.
-
+        
         <p>This is a volatile state that may change without further warning
         like e.g. sending an appropriate event.</p>
-
+        
         @return
             Returns <TRUE/> if the referenced document is still valid and
             <FALSE/> otherwise.
     */
     boolean isValid ();
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl b/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl
index 1330ebd4a2eb..b80a5b195413 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,9 @@
 #ifndef __com_sun_star_accessibility_XAccessibleHypertext_idl__
 #define __com_sun_star_accessibility_XAccessibleHypertext_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
 #endif
@@ -52,32 +52,32 @@ module com { module sun { module star { module accessibility {
     interface and other character related methods of the
     <type>XAccessibleHyperlink</type> interface, it is necessary to also
     support the <type>XAccessibleText</type> interface.</p>
-
+    
     @see XAccessibleHyperlink, XAccessibleText
 
     @since OOo 1.1.2
 */
-published interface XAccessibleHypertext
+published interface XAccessibleHypertext 
     : ::com::sun::star::accessibility::XAccessibleText
 {
     /** Returns the number of links and link groups contained within this
         hypertext document.
-
+    
         @return
             The number of links and link groups within this hypertext
             document.  Returns 0 if there is no link.
     */
     long getHyperLinkCount ();
-
+    
     /** Return the specified link.
-
+    
         <p>The returned <type>XAccessibleHyperlink</type> object
         encapsulates the hyperlink and provides several kinds of information
         describing it.</p>
-
+        
         @param nLinkIndex
             This index specifies the hyperlink to return.
-
+            
         @return
             If the given index is valid, i.e. lies in the interval from 0
             to the number of links minus one, a reference to the specified
@@ -90,10 +90,10 @@ published interface XAccessibleHypertext
 
     /** Returns the index of the hyperlink that is associated with this
         character index.
-
+        
         <p>In a HTML document this is the case when a &lt;a href&gt; tag
         spans (includes) the given character index.</p>
-
+        
         @param nCharIndex
             Index of the character for which to return the link index.  If
             the <type>XAccessibleText</type> interface is used to represent
@@ -101,18 +101,18 @@ published interface XAccessibleHypertext
             valid if it is greater than or equal to zero and lower then the
             number of characters in the text.  See that interface's
             documentation for more details.
-
+            
         @return
             Returns the index of the hyperlink that is associated with this
             character index, or throws an exception if there is no hyperlink
             associated with this index.
-
+            
         @see XAccessibleText.
     */
     long getHyperLinkIndex ([in] long nCharIndex)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/XAccessibleImage.idl b/offapi/com/sun/star/accessibility/XAccessibleImage.idl
index 7b2dd7a8bbd0..94315f7218fb 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleImage.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleImage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,9 @@
 #ifndef __com_sun_star_accessibility_XAccessibleImage_idl__
 #define __com_sun_star_accessibility_XAccessibleImage_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
 module com { module sun { module star { module accessibility {
 
@@ -46,23 +46,23 @@ module com { module sun { module star { module accessibility {
 published interface XAccessibleImage : ::com::sun::star::uno::XInterface
 {
     /** Returns the localized description of the image.
-
+        
         <p>It depends on the usage of an image whether the description
         should express the image's function (e.g. for icons) or the actual
         content of the image (e.g. for image maps or non-iconic images
         embedded into a document.)</p>
-
+            
         @return
             Returns a localized string that describes the image's function
             or content.
     */
     string getAccessibleImageDescription ();
-
+    
     /** Returns the height of the image.
-
+        
         <p>The height is returned in units specified by the parents
         coordinate system.</p>
-
+        
         @return
             Returns the image's height with respect to the parent's
             coordinate system.
@@ -70,17 +70,17 @@ published interface XAccessibleImage : ::com::sun::star::uno::XInterface
     long getAccessibleImageHeight ();
 
     /** Returns the width of the image.
-
+        
         <p>The width is returned in units specified by the parents
         coordinate system.</p>
-
+        
         @return
             Returns the image's width with respect to the parent's
             coordinate system.
     */
     long getAccessibleImageWidth ();
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl b/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl
index c131d9c19815..960a663953a1 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -87,7 +87,7 @@ published interface XAccessibleKeyBinding : ::com::sun::star::uno::XInterface
     sequence<::com::sun::star::awt::KeyStroke> getAccessibleKeyBinding ([in] long nIndex)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl b/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl
index 7becd18a339d..42d2414ed813 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleMultiLineText.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,18 +28,18 @@
 #ifndef __com_sun_star_accessibility_XAccessibleMultiLineText_idl__
 #define __com_sun_star_accessibility_XAccessibleMultiLineText_idl__
 
-#ifndef __com_sun_star_accessibility_XAccessibleText_idl__
-#include <com/sun/star/accessibility/XAccessibleText.idl>
-#endif
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
-#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
+#ifndef __com_sun_star_accessibility_XAccessibleText_idl__ 
+#include <com/sun/star/accessibility/XAccessibleText.idl> 
+#endif 
+#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ 
+#include <com/sun/star/lang/IndexOutOfBoundsException.idl> 
+#endif 
 #ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
 #endif
 
 module com { module sun { module star { module accessibility {
-
+        
 /** Implement this interface to give provide a mapping between text index
     and line numbers.
 
@@ -55,15 +55,15 @@ interface XAccessibleMultiLineText
     : ::com::sun::star::accessibility::XAccessibleText
 {
     /** Returns the line number at the specified index.
-
+    
         <p>For a text object that is spread over multiple lines, this method
         provides a mapping from a text index to the corresponding line number.
         </p>
-
+        
         @param nIndex
             Index for which the line number should be returned.
             The valid range is 0..length.
-
+            
         @return
             Returns the line number of the specified text index.
 
@@ -74,17 +74,17 @@ interface XAccessibleMultiLineText
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
 
     /** Returns the text of the specified line.
-
+    
         <p>Returns the substring of text that makes up the specified line
         number.</p>
 
-        <p>The number of lines can be obtained by calling
+        <p>The number of lines can be obtained by calling 
         <member>XAccessibleMultiLineText::getLineNumberAtIndex</member>
         with the index of the last character. In a loop, the last line
         has been reached when <member>TextSegment::SegmentEnd</member>
-        of the returned value is equal to the index of the last
+        of the returned value is equal to the index of the last 
         character of the text.</p>
-
+        
         @param nLineNo
             The number of the line to return the substring from.
             The valid range is 0..getLineNumberAtIndex(getCharacterCount()).
@@ -99,21 +99,21 @@ interface XAccessibleMultiLineText
 
     TextSegment getTextAtLineNumber([in] long nLineNo)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
-
+    
     /** Returns the text of the line in which the caret is located.
-
+    
         <p>The substring returned will most of the time be identical to
-        calling <member>XAccessibleText::getTextAtIndex</member> with
+        calling <member>XAccessibleText::getTextAtIndex</member> with 
         the index returned by <member>XAccessibleText::getCaretPosition</member>
         and type  <const scope="AccessibleTextType">LINE</type> beside the
         following special case:</p>
 
-        <p>Some text implementations place the caret at the end of the current
+        <p>Some text implementations place the caret at the end of the current 
         line when the <b>End</b> key gets pressed. Since the index of this position
         is identical to the one of the first character of the following line,
-        <member>XAccessibleMultiLineText::getLineNumberAtIndex</member> will
+        <member>XAccessibleMultiLineText::getLineNumberAtIndex</member> will 
         return the line following the current one in this case.</p>
-
+        
         @return
             Returns the requested text portion. This portion may be empty
             or invalid if the paragraph object does not have a valid caret
@@ -121,20 +121,20 @@ interface XAccessibleMultiLineText
     */
 
     TextSegment getTextAtLineWithCaret();
-
+  
     /** Returns the number of the line in which the caret is located.
-
+    
         <p>The line number returned will most of the time be identical to
         calling <member>XAccessibleMultiLineText::getLineNumberAtIndex</member>
         with the index returned by <member>XAccessibleText::getCaretPosition</member>
         beside the following special case:</p>
 
-        <p>Some text implementations place the caret at the end of the current
+        <p>Some text implementations place the caret at the end of the current 
         line when the <b>End</b> key gets pressed. Since the index of this position
         is identical to the one of the first character of the following line,
-        <member>XAccessibleMultiLineText::getLineNumberAtIndex</member> will
+        <member>XAccessibleMultiLineText::getLineNumberAtIndex</member> will 
         return the line following the current one in this case.</p>
-
+        
         @return
             Returns the index of the line in which the caret is located or -1
             if the paragraph does not have a valid caret position.
@@ -142,7 +142,7 @@ interface XAccessibleMultiLineText
 
     long getNumberOfLineWithCaret();
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl b/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
index 5f1733b52588..e35afc5c6b64 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,9 +32,9 @@
 #include <com/sun/star/accessibility/AccessibleRelation.idl>
 #endif
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
 #endif
@@ -58,36 +58,36 @@ module com { module sun { module star { module accessibility {
 published interface XAccessibleRelationSet : ::com::sun::star::uno::XInterface
 {
     /** Returns the number of relations in this relation set.
-
+        
         @return
-            Returns the number of relations or zero if there are none.
+            Returns the number of relations or zero if there are none.            
     */
     long getRelationCount ();
-
+    
     /** Returns the relation of this relation set that is specified by
         the given index.
-
+        
         @param nIndex
             This index specifies the relation to return.
-
+            
         @return
             For a valid index, i.e. inside the range 0 to the number of
             relations minus one, the returned value is the requested
             relation.  If the index is invalid then the returned relation
             has the type INVALID.
-
+            
     */
     AccessibleRelation getRelation ([in] long nIndex)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
 
     /** Tests whether the relation set contains a relation matching the
         specified key.
-
+        
         @param aRelationType
             The type of relation to look for in this set of relations.  This
             has to be one of the constants of
             <type>AccessibleRelationType</type>.
-
+            
         @return
             Returns <TRUE/> if there is a (at least one) relation of the
             given type and <FALSE/> if there is no such relation in the set.
@@ -95,11 +95,11 @@ published interface XAccessibleRelationSet : ::com::sun::star::uno::XInterface
     boolean containsRelation ([in] short aRelationType);
 
     /** Retrieve and return the relation with the given relation type.
-
+        
         @param aRelationType
             The type of the relation to return.  This has to be one of the
             constants of <type>AccessibleRelationType</type>.
-
+            
         @return
             If a relation with the given type could be found than (a copy
             of) this relation is returned.  Otherwise a relation with the
@@ -107,7 +107,7 @@ published interface XAccessibleRelationSet : ::com::sun::star::uno::XInterface
     */
     AccessibleRelation getRelationByType ([in] short aRelationType);
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/XAccessibleSelection.idl b/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
index f0f9cc637184..f0e8cc25eb0c 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,9 @@
 #ifndef __com_sun_star_accessibility_XAccessibleSelection_idl__
 #define __com_sun_star_accessibility_XAccessibleSelection_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
 #endif
@@ -44,11 +44,11 @@ module com { module sun { module star { module accessibility {
     <p>This interface is the standard mechanism to obtain and modify the
     currently selected children.  Every object that has children that can be
     selected should support this interface.</p>
-
+        
     <p>The <type>XAccessibleSelection</type> interface has to be implemented
     in conjunction with the <type>XAccessibleContext</type> interface that
     provides the children on which the first operates.</p>
-
+        
     <p>It depends on the class implementing this interface, whether it
     supports single or multi selection.</p>
 
@@ -58,11 +58,11 @@ published interface XAccessibleSelection : ::com::sun::star::uno::XInterface
 {
     /** Selects the specified <type>Accessible</type> child of the
         object.
-
+        
         <p>Depending on the implementing class the child is added to the
         current set a selected children (multi selection) or a previously
         selected child is deselected first (single selection).</p>
-
+        
         @param nChildIndex
             Index of the child which is to add to the selection.  This index
             refers to all the children of this object.
@@ -75,11 +75,11 @@ published interface XAccessibleSelection : ::com::sun::star::uno::XInterface
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
 
     /** Determines if the specified child of this object is selected.
-
+        
         @param nChildIndex
             Index of the child for which to detect whether it is selected.
             This index refers to all the children of this object.
-
+            
         @return
             Returns <TRUE/> if the specified child is selected and <FALSE/>
             if it is not selected.
@@ -90,29 +90,29 @@ published interface XAccessibleSelection : ::com::sun::star::uno::XInterface
     */
     boolean isAccessibleChildSelected ([in] long nChildIndex)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
-
+    
     /** Clears the selection, so that no children of the
         object are selected.
     */
     [oneway] void clearAccessibleSelection ();
 
     /** Select all children.
-
+    
         <p>Causes every child of the object to be selected if the object
         supports multiple selections.  If multiple selection is not
         supported then the first child, if it exists, is selected and all
         other children are deselected.</p>
     */
     [oneway] void selectAllAccessibleChildren ();
-
+    
     /** Returns the number of Accessible children that are currently
         selected.
-
+        
         <p>This number specifies the valid interval of indices that can be
         used as arguments for the methods
         <member>XAccessibleSelection::getSelectedChild</member> and
         <member>XAccessibleSelection::deselectSelectedChild</member>.</p>
-
+        
         @return
             Returns the number of selected children of this object or 0 if
             no child is selected.
@@ -120,14 +120,14 @@ published interface XAccessibleSelection : ::com::sun::star::uno::XInterface
     long getSelectedAccessibleChildCount ();
 
     /** Returns the specified selected Accessible child.
-
+        
         @param nSelectedChildIndex
             This index refers only to the selected children, not to all the
             children of this object.  Even if all children are selected, the
             indices enumerating the selected children need not be the same
             as those enumerating all children.  If only single selection is
             supported the only valid value is 0.
-
+            
         @return
             If the index is valid, i.e. not negative and lower than the
             number of selected children, then a valid reference to the
@@ -144,7 +144,7 @@ published interface XAccessibleSelection : ::com::sun::star::uno::XInterface
     /** Removes the specified child from the set of this object's
         selected children.  Note that not all applications support
         deselection: calls to this method may be silently ignored.
-
+        
         @param nChildIndex
             This index refers to all children not just the selected ones.
             If the specified child is not selected or it can not be
@@ -158,7 +158,7 @@ published interface XAccessibleSelection : ::com::sun::star::uno::XInterface
     void deselectAccessibleChild ([in] long nChildIndex)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl b/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
index 01b381349621..d7a8d006fc04 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,9 +32,9 @@
 #include <com/sun/star/accessibility/AccessibleStateType.idl>
 #endif
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
 module com { module sun { module star { module accessibility {
 
@@ -52,7 +52,7 @@ module com { module sun { module star { module accessibility {
 published interface XAccessibleStateSet : ::com::sun::star::uno::XInterface
 {
     /** Checks whether the current state set is empty.
-
+        
         @return
             Returns <TRUE/> if there is no state in this state set and
             <FALSE/> if there is at least one set state in it.
@@ -61,26 +61,26 @@ published interface XAccessibleStateSet : ::com::sun::star::uno::XInterface
 
     /** Checks if the given state is a member of the state set of the called
         object.
-
+        
         @param aState
             The state for which to check membership.  This has to be one of
             the constants of <type>AccessibleStateType</type>.
-
+            
         @return
             Returns <TRUE/> if the given state is a member of this object's
             state set and <FALSE/> otherwise.
     */
     boolean contains ([in] short aState);
-
+    
     /** Checks if all of the given states are in the state set of the called
         object.
-
+        
         @param aStateSet
             This sequence of states is interpreted as set and every of its
             members, duplicates are ignored, is checked for membership in
             this object's state set.  Each state has to be one of the
             constants of <type>AccessibleStateType</type>.
-
+            
         @return
             Returns <TRUE/> if all states of the given state set are members
             of this object's state set.  <FALSE/> is returned if at least
@@ -103,7 +103,7 @@ published interface XAccessibleStateSet : ::com::sun::star::uno::XInterface
     */
     sequence<short> getStates ();
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/XAccessibleTable.idl b/offapi/com/sun/star/accessibility/XAccessibleTable.idl
index 708233a00cd7..3afed14d1f65 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleTable.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleTable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,9 @@
 #ifndef __com_sun_star_accessibility_XAccessibleTable_idl__
 #define __com_sun_star_accessibility_XAccessibleTable_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
 #endif
@@ -46,7 +46,7 @@ module com { module sun { module star { module accessibility {
    <code>javax.accessibility.AccessibleTable</code> and
    <code>javax.accessibility.AccessibleExtendedTable</code> of the Java Accessibility API
    (version 1.4).</p>
-
+       
    <p>All <type>XAccessible</type> objects that represent cells or
    cell-clusters of a table have to be at the same time children of the
    table.  This is necessary to be able to convert row and column indices
@@ -54,7 +54,7 @@ module com { module sun { module star { module accessibility {
    <member>XAccessibleTable::getAccessibleIndex</member>,
    <member>XAccessibleTable::getAccessibleRow</member>, and
    <member>XAccessibleTable::getAccessibleColumn</member>.</p>
-
+              
    <p>The range of valid coordinates for this interface are implementation
    dependent.  However, that range includes at least the intervals from the
    from the first row or column with the index 0 up to the last (but not
@@ -69,10 +69,10 @@ module com { module sun { module star { module accessibility {
 published interface XAccessibleTable : ::com::sun::star::uno::XInterface
 {
     /** Returns the number of used rows in the table.
-
+        
         <p>The implementation, however, may allow the access of columns
         beyond this number.</p>
-
+        
         @return
             Returns the number of used rows in the table or 0 for an empty
             table.
@@ -80,22 +80,22 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
     long getAccessibleRowCount ();
 
     /** Returns the number of used columns in the table.
-
+        
         <p>The implementation, however, may allow the access of columns
         beyond this number.</p>
-
+    
         @return
             Returns the number of used columns in the table or 0 for an empty
             table.
     */
     long getAccessibleColumnCount ();
-
+    
     /** Returns the description text of the specified row in the
         table.
-
+        
         @param nRow
             The index of the row for which to retrieve the description.
-
+            
         @return
             Returns the description text of the specified row in the table
             if such a description exists.  Otherwise an empty string is
@@ -111,10 +111,10 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
 
     /** Returns the description text of the specified column in the
         table.
-
+        
         @param nColumn
             The index of the column for which to retrieve the description.
-
+            
         @return
             Returns the description text of the specified row in the table
             if such a description exists.  Otherwise an empty string is
@@ -129,18 +129,18 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
 
     /** Returns the number of rows occupied by the Accessible at the
         specified row and column in the table.
-
+        
         <p>The result differs from 1 if the specified cell spans multiple
         rows.</p>
-
+        
         @param nRow
             Row index of the accessible for which to return the column
             extent.
-
+            
         @param nColumn
             Column index of the accessible for which to return the column
             extent.
-
+            
         @return
             Returns the row extent of the specified cell.
 
@@ -154,18 +154,18 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
 
     /** Returns the number of columns occupied by the Accessible at the
         specified row and column in the table.
-
+        
         <p>The result differs from 1 if the specified cell spans multiple
         columns.</p>
-
+        
         @param nRow
             Row index of the accessible for which to return the column
             extent.
-
+            
         @param nColumn
             Column index of the accessible for which to return the column
             extent.
-
+            
         @return
             Returns the column extent of the specified.
 
@@ -179,10 +179,10 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
 
     /** Returns the row headers as an <type>XAccessibleTable</type>
         object.
-
+        
         <p>Content and size of the returned table are implementation
         dependent.</p>
-
+            
         @return
             Returns allways a valid reference to an
             <type>XAccessibleTable</type> object.
@@ -191,10 +191,10 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
 
     /** Returns the column headers as an <type>XAccessibleTable</type>
         object.
-
+        
         <p>Content and size of the returned table are implementation
         dependent.</p>
-
+        
         @return
             Returns allways a valid reference to an
             <type>XAccessibleTable</type> object.
@@ -203,7 +203,7 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
 
     /** Returns a list of the indices of completely selected rows in a
         table.
-
+        
         @return
             The returned sequence contains indices of all completely
             selected rows in the table.  This sequence is in ascending
@@ -213,7 +213,7 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
 
     /** Returns a list of the indices of completely selected columns in a
         table.
-
+        
         @return
             The returned sequence contains indices of all completely
             selected columns in the table.  This sequence is in ascending
@@ -223,10 +223,10 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
 
     /** Returns a boolean value indicating whether the specified row is
         completely selected.
-
+        
         @param nRow
             Index of the row for which to determine whether it is selected.
-
+            
         @return
             Returns <TRUE/> if the specified row is selected completely and
             <FALSE/> otherwise.
@@ -241,11 +241,11 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
 
     /** Returns a boolean value indicating whether the specified column
         is completely selected.
-
+        
         @param nColumn
             Index of the column for which to determine whether it is
             selected.
-
+            
         @return
             Returns <TRUE/> if the specified column is selected completely
             and <FALSE/> otherwise.
@@ -260,20 +260,20 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
 
     /** Returns the <type>XAccessible</type> object at the specified row
         and column in the table.
-
+        
         <p>This method has been renamed from the Java name
         <code>getAccessibleAt</code> to
         <member>XAccessibleTable::getAccessibleCellAt</member> to avoid
         ambiguities with the
         <member>XAccessibleComponent::getAccessibleAt</member> method when
         accessed, for instance, from StarBasic.</p>
-
+            
         @param nRow
             The row index for which to retrieve the cell.
-
+            
         @param nColumn
             The column index for which to retrieve the cell.
-
+            
         @return
             If both row and column index are valid then the corresponding
             <type>XAccessible</type> object is returned that represents the
@@ -287,9 +287,9 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
     */
     XAccessible getAccessibleCellAt ([in] long nRow, [in] long nColumn)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
-
+    
     /** Returns the caption for the table.
-
+    
         @return
             If the table has a caption then a reference to it is returned,
             else an empty reference is returned.
@@ -297,7 +297,7 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
     XAccessible getAccessibleCaption ();
 
     /** Returns the summary description of the table.
-
+        
         @return
             Returns a reference to an implementation dependent
             <type>XAccessible</type> object representing the table's summary
@@ -307,15 +307,15 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
 
     /** Returns a boolean value indicating whether the accessible at the
         specified row and column is selected.
-
+        
         @param nRow
             Row index of the cell for which to determine if the accessible
             object that spans that cell is selected.
-
+            
         @param nColumn
             Column index of the cell for which to determine if the
             accessible object that spans that cell is selected.
-
+            
         @return
             Returns <TRUE/> if the given row and column indices are valid
             and the specified accessible object is selected.  Otherwise
@@ -323,36 +323,36 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
     */
     boolean isAccessibleSelected ([in] long nRow, [in] long nColumn)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
-
+    
     /** Returns the child index of the accessible object that spans the
         specified cell.
-
+        
         <p>This is the same index that would be returned by calling
         <member>XAccessibleContext::getAccessibleIndexInParent</member> for
         that accessible object.</p>
-
+            
         @param nRow
             Row index of the accessible object for which to return the child
             index.
-
+            
         @param nColumn
             Row index of the accessible object for which to return the child
             index.
-
+            
         @return
             Child index of the specified accessible object or -1 if one or
             both of the given indices is/are invalid.
     */
     long getAccessibleIndex ([in] long nRow, [in] long nColumn)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
-
+    
     /** Translate the given child index into the corresponding row
         index.
-
+        
         @param nChildIndex
             Index of the child of the table for which to return the row
             index.
-
+            
         @return
             Returns the row index of the cell of the specified child or the
             index of the first row if the child spans multiple rows.
@@ -362,14 +362,14 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
     */
     long getAccessibleRow ([in] long nChildIndex)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
-
+    
     /** Translate the given child index into the corresponding column
         index.
-
+        
         @param nChildIndex
             Index of the child of the table for which to return the column
             index.
-
+            
         @return
             Returns the column index of the cell of the specified child or
             the index of the first column if the child spans multiple
@@ -381,7 +381,7 @@ published interface XAccessibleTable : ::com::sun::star::uno::XInterface
     long getAccessibleColumn ([in] long nChildIndex)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/accessibility/XAccessibleText.idl b/offapi/com/sun/star/accessibility/XAccessibleText.idl
index c66cd3d6d5e7..b650110dcda8 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleText.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleText.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,9 +32,9 @@
 #include <com/sun/star/accessibility/AccessibleTextType.idl>
 #endif
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
 #endif
@@ -65,30 +65,30 @@ module com { module sun { module star { module accessibility {
     spatial location.  However, text can not be modified with this
     interface.  That is the task of the <type>XAccessibleEditableText</type>
     interface.</p>
-
+        
     <p>The text length, i.e. the number of characters in the text, is
-    returned by <member>XAccessibleText::getCharacterCount</member>.
-    All methods that operate on particular characters (e.g.
-    <member>XAccessibleText::getCharacterAt</member>) use character
+    returned by <member>XAccessibleText::getCharacterCount</member>. 
+    All methods that operate on particular characters (e.g. 
+    <member>XAccessibleText::getCharacterAt</member>) use character 
     indices from 0 to length-1. All methods that operate on character
-    positions (e.g. <member>XAccessibleText::getTextRange</member>)
+    positions (e.g. <member>XAccessibleText::getTextRange</member>) 
     use indices from 0 to length.</p>
 
     <p>Please note that accessible text does not necessarily support
     selection.  In this case it should behave as if there where no
     selection.  An empty selection is used for example to express the
-    current cursor position.</p>
+    current cursor position.</p> 
 
     @since OOo 1.1.2
 */
 published interface XAccessibleText : ::com::sun::star::uno::XInterface
 {
     /** Return the position of the caret.
-
+    
         <p>Returns the offset of the caret.  The caret is often called text
         cursor.  The caret is actually the position between two characters.
         Its position/offset is that of the character to the right of it.</p>
-
+            
         @return
             The returned offset is relative to the text represented by this
             object.
@@ -133,13 +133,13 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
 
     /** Return the character at the specified position.
-
+    
         <p>Returns the character at the given index.</p>
-
+        
         @param nIndex
             The index of the character to return.
             The valid range is 0..length-1.
-
+            
         @return
             the character at the index nIndex.
 
@@ -150,17 +150,17 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
 
     /** Get the attribute set for the specified position.
-
+    
         <p>Returns a set of attributes that are associated for the character
         at the given index.  To prevent the method from returning possibly
         large sets of attributes that the caller is not interested in the
         caller has to provide a list of attributes that he wants to be
         returned.</p>
-
+        
         @param nIndex
             The index of the character for which to return its attributes.
             The valid range is 0..length-1.
-
+            
         @param aRequestedAttributes
             This string sequence defines the set of attributes that the
             caller is interested in.  When there are attributes defined that
@@ -175,7 +175,7 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
             objects supports but is interested in all of them
             nevertheless.</p>
 
-        @return
+        @return 
             Returns the explicitly or implicitly (empty
             <arg>aRequestedAttributes</arg> argument) requested attributes
             of the specified character.  Each attribute is represented by a
@@ -188,7 +188,7 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
             if the index is invalid
     */
-    sequence<::com::sun::star::beans::PropertyValue>
+    sequence<::com::sun::star::beans::PropertyValue> 
         getCharacterAttributes (
             [in] long nIndex,
             [in] sequence<string> aRequestedAttributes)
@@ -196,9 +196,9 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
 
 
     /** Return the bounding box of the specified position.
-
+    
         <p>Returns the bounding box of the indexed character.</p>
-
+        
         <p>The virtual character after the last character of the represented
         text, i.e. the one at position length is a special case. It
         represents the current input position and will therefore typically
@@ -219,7 +219,7 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
         @param nIndex
             Index of the character for which to return its bounding box.
             The valid range is 0..length.
-
+            
         @return
             The bounding box of the referenced character.  The bounding box
             of the virtual character at position length has to have
@@ -233,10 +233,10 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
 
 
     /** Return the number of characters in the represented text.
-
+    
         <p>Returns the number of characters in the text represented by this
         object or, in other words, the text length.</p>
-
+        
         @return
             Returns the number of characters of this object's text.  A zero
             value indicates an empty text.
@@ -245,29 +245,29 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
 
 
     /** Return the text position for the specified screen position.
-
-        <p>Given a point in local coordinates, i.e. relative to the
+    
+        <p>Given a point in local coordinates, i.e. relative to the 
         coordinate system of the object, return the zero-based index of
-        the character under that point.  The same functionality could be
-        achieved by using the bounding boxes for each character as returned
+        the character under that point.  The same functionality could be 
+        achieved by using the bounding boxes for each character as returned 
         by <member>XAccessibleText::getCharacterBounds</member>. The method
         <member>XAccessibleText::getIndexAtPoint</member>, however, can be
         implemented in a more efficient way.</p>
-
+            
         @param aPoint
             The position for which to look up the index of the character
             that is rendered on to the display at that point.
-
+            
         @return
             Index of the character under the given point or -1 if the point
             is invalid or there is no character under the point.
     */
     long getIndexAtPoint ([in] ::com::sun::star::awt::Point aPoint);
-
+    
     /** Return the selected text.
-
+    
         <p>Returns the portion of the text that is selected.</p>
-
+        
         @return
             The returned text is the selected portion of the object's text.
             If no text is selected when this method is called or when
@@ -276,20 +276,20 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
     string getSelectedText ();
 
     /** Return the position of the start of the selection.
-
+    
         <p>Returns the index of the start of the selected text.</p>
-
+        
         @return
             If there is no selection or selection is not supported the
             position of selection start and end will be the same undefined
             value.
     */
     long getSelectionStart ();
-
+    
     /** Return the position of the end of the selection.
-
+    
         <p>Returns the index of the end of the selected text.</p>
-
+        
         @return
             If there is no selection or selection is not supported the
             position of selection start and end will be the same undefined
@@ -298,7 +298,7 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
     long getSelectionEnd ();
 
     /** Set a new selection.
-
+    
         <p>Sets the selected text portion according to the given indices.
         The old selection is replaced by the new selection.</p>
 
@@ -311,15 +311,15 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
         argument.  When the caret is moved this is notified to the
         accessibility event listeners with an
         <const>AccessibleEventId::ACCESSIBLE_CARET_EVENT</const>.</p>
-
+        
         @param nStartIndex
-            The first character of the new selection.
+            The first character of the new selection. 
             The valid range is 0..length.
-
+            
         @parm nEndIndex
             The position after the last character of the new selection.
             The valid range is 0..length.
-
+            
         @return
             Returns <TRUE/> if the selection has been set successfully and
             <FALSE/> otherwise or when selection is not supported.
@@ -329,20 +329,20 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
     */
     boolean setSelection ([in] long nStartIndex, [in] long nEndIndex)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
-
+    
     /** Return the whole text.
-
+    
         <p>Returns the complete text.  This is equivalent to a call to
         <member>XAccessibleText::getTextRange</member> with the arguments
         zero and <code>getCharacterCount()-1</code>.</p>
-
+        
         @return
             Returns a string that contains the complete text.
     */
     string getText ();
-
+    
     /** Return the specified text range.
-
+    
         <p>Returns the substring between the two given indices.</p>
 
         <p>The substring starts with the character at nStartIndex
@@ -352,20 +352,20 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
         the two arguments being exchanged.</p>
 
         <p>The whole text can be requested by passing the indices zero and
-        <code>getCharacterCount()</code>.  If both indices have the same
+        <code>getCharacterCount()</code>.  If both indices have the same 
         value, an empty string is returned.</p>
-
+            
         @param nStartIndex
             Index of the first character to include in the returned string.
             The valid range is 0..length.
-
+            
         @param nEndIndex
             Index of the last character to exclude in the returned string.
             The valid range is 0..length.
-
+            
         @return
-            Returns the substring starting with the character at nStartIndex
-            (inclusive) and up to the character at nEndIndex (exclusive), if
+            Returns the substring starting with the character at nStartIndex 
+            (inclusive) and up to the character at nEndIndex (exclusive), if 
             nStartIndex is less than or equal to nEndIndex.
 
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
@@ -375,22 +375,22 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
 
     /** Get a text portion around the given position.
-
+    
         <p>Returns the substring of the specified text type that contains
         the character at the given index, if any.  For example, given the
         text type <const scope="AccessibleTextType">WORD</type>, the word
         which contains the character at position nIndex is returned, or an
         empty string if no word is found at the that position.</p>
-
+        
         @param nIndex
-            Index of the character whose containing text portion is to be
+            Index of the character whose containing text portion is to be 
             returned.
             The valid range is 0..length.
-
+            
         @param nTextType
             The type of the text portion to return.  See
             <type>AccessibleTextType</type> for the complete list.
-
+            
         @return
             Returns the requested text portion.  This portion may be empty
             or invalid when no appropriate text portion is found or text
@@ -406,7 +406,7 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
             ::com::sun::star::lang::IllegalArgumentException);
 
     /** Get a text portion before the given position.
-
+    
         <p>Returns the substring of the specified text type that is
         located before the given character and does not include
         it. The result of this method should be same as a result for
@@ -414,22 +414,22 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
         suitably decreased index value.</p>
 
         <p>For example, if text type is <const
-        scope="AccessibleTextType">WORD</type>, then the complete word
+        scope="AccessibleTextType">WORD</type>, then the complete word 
         that is closest to and located before nIndex is returned.</p>
 
         <p>If the index is valid, but no suitable word (or other text
         type) is found, an empty text segment is returned.</p>
-
+            
         @param nIndex
             Index of the character for which to return the text part before
             it.  The index character will not be part of the returned
             string.
             The valid range is 0..length.
-
+            
         @param nTextType
             The type of the text portion to return.  See
             <type>AccessibleTextType</type> for the complete list.
-
+            
         @return
             Returns the requested text portion.  This portion may be empty
             or invalid when no appropriate text portion is found or text
@@ -445,7 +445,7 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
             ::com::sun::star::lang::IllegalArgumentException);
 
     /** Get a text portion behind the given position.
-
+    
         <p>Returns the substring of the specified text type that is
         located after the given character and does not include
         it. The result of this method should be same as a result for
@@ -458,16 +458,16 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
 
         <p>If the index is valid, but no suitable word (or other text
         type) is found, an empty string is returned.</p>
-
+        
         @param nIndex
             Index of the character for which to return the text part after
             it.  The index character will be part of the returned string.
             The valid range is 0..length.
-
+            
         @param nTextType
             The type of the text portion to return.  See
             <type>AccessibleTextType</type> for the complete list.
-
+            
         @return
             Returns the requested text portion.  This portion may be empty
             or invalid when no appropriate text portion is found or text
@@ -481,11 +481,11 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
     TextSegment getTextBehindIndex([in] long nIndex, [in] short nTextType)
         raises (::com::sun::star::lang::IndexOutOfBoundsException,
             ::com::sun::star::lang::IllegalArgumentException);
-
+    
     /** Copy the specified text into the clipboard.
-
-        <p>Copy the specified text into the clipboard.  The text that is
-        copied is the same text that would have been selected by the
+    
+        <p>Copy the specified text into the clipboard.  The text that is 
+        copied is the same text that would have been selected by the 
         <member>XAccessibleText::getTextRange</member> method. </p>
 
         <p>The other clipboard related methods
@@ -493,11 +493,11 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
         <member>XAccessibleEditableText::deleteText</member> can be found in
         the <type>XAccessibleEditableText</type> because of their
         destructive nature.</p>
-
+        
         @param nStartIndex
             Start index of the text to copied into the clipboard.
             The valid range is 0..length.
-
+            
         @param nEndIndex
             End index of the text to copied into the clipboard.
             The valid range is 0..length.
@@ -511,7 +511,7 @@ published interface XAccessibleText : ::com::sun::star::uno::XInterface
     */
     boolean copyText ([in] long nStartIndex, [in] long nEndIndex)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
-
+    
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl b/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
index 5bb632b0cbc2..a68c8cd74cfb 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/accessibility/XAccessibleTextMarkup.idl b/offapi/com/sun/star/accessibility/XAccessibleTextMarkup.idl
index 5be710265d5e..241d2779f56c 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleTextMarkup.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleTextMarkup.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/accessibility/XAccessibleValue.idl b/offapi/com/sun/star/accessibility/XAccessibleValue.idl
index b5d8cb8482ff..b7bedfa3309f 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleValue.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleValue.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,40 +46,40 @@ module com { module sun { module star { module accessibility {
 published interface XAccessibleValue : ::com::sun::star::uno::XInterface
 {
     /** Returns the value of this object as a number.
-
+        
         <p>The exact return type is implementation dependent.  Typical types
         are long and double.</p>
-
+        
         @return
             Returns the current value represented by this object.
     */
     any getCurrentValue ();
 
     /** Sets the value of this object to the given number.
-
+        
         <p>The argument is clipped to the valid interval whose upper and
         lower bounds are returned by the methods
         <member>getMaximumAccessibleValue</member> and
         <member>getMinimumAccessibleValue</member>, i.e. if it is lower than
         the minimum value the new value will be the minimum and if it is
         greater than the maximum then the new value will be the maximum.</p>
-
+        
         @param aNumber
             The new value represented by this object.  The set of admissible
             types for this argument is implementation dependent.
-
+            
         @return
             Returns <TRUE/> if the new value could successfully be set and
             <FALSE/> otherwise.
     */
     boolean setCurrentValue ([in] any aNumber);
-
+    
     /** Returns the maximal value that can be represented by this object.
-
+        
         <p>The type of the returned value is implementation dependent.  It
         does not have to be the same type as that returned by
         <member>getCurrentAccessibleValue</member>.</p>
-
+        
         @return
             Returns the maximal value in an implementation dependent type.
             If this object has no upper bound then an empty object is
@@ -88,11 +88,11 @@ published interface XAccessibleValue : ::com::sun::star::uno::XInterface
     any getMaximumValue ();
 
     /** Returns the minimal value that can be represented by this object.
-
+        
         <p>The type of the returned value is implementation dependent.  It
         does not have to be the same type as that returned by
         <member>getCurrentAccessibleValue</member>.</p>
-
+        
         @return
             Returns the minimal value in an implementation dependent type.
             If this object has no upper bound then an empty object is
@@ -100,7 +100,7 @@ published interface XAccessibleValue : ::com::sun::star::uno::XInterface
     */
     any getMinimumValue ();
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/animations/AnimationAdditiveMode.idl b/offapi/com/sun/star/animations/AnimationAdditiveMode.idl
index de84bc485d5b..85a39e9c126b 100644
--- a/offapi/com/sun/star/animations/AnimationAdditiveMode.idl
+++ b/offapi/com/sun/star/animations/AnimationAdditiveMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_AnimationAdditiveMode_idl__
-#define __com_sun_star_animations_AnimationAdditiveMode_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
+#ifndef __com_sun_star_animations_AnimationAdditiveMode_idl__ 
+#define __com_sun_star_animations_AnimationAdditiveMode_idl__ 
 
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** Specifies the additive mode for the animation.
 
@@ -41,29 +41,29 @@
 */
 constants AnimationAdditiveMode
 {
-    /**
+    /** 
     */
     const short BASE = 0;
-
-    /**
+    
+    /** 
     */
     const short SUM = 1;
 
-    /**
+    /** 
     */
     const short REPLACE = 2;
 
-    /**
+    /** 
     */
     const short MULTIPLY = 3;
 
-    /**
+    /** 
     */
     const short NONE = 4;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/AnimationCalcMode.idl b/offapi/com/sun/star/animations/AnimationCalcMode.idl
index cd1aaed78eef..48e705081f1f 100644
--- a/offapi/com/sun/star/animations/AnimationCalcMode.idl
+++ b/offapi/com/sun/star/animations/AnimationCalcMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_AnimationCalcMode_idl__
-#define __com_sun_star_animations_AnimationCalcMode_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
+#ifndef __com_sun_star_animations_AnimationCalcMode_idl__ 
+#define __com_sun_star_animations_AnimationCalcMode_idl__ 
 
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** Specifies the interpolation mode for the animation.
 
@@ -41,25 +41,25 @@
 */
 constants AnimationCalcMode
 {
-    /** This specifies that the animation function will jump from one value to the next without any interpolation.
+    /** This specifies that the animation function will jump from one value to the next without any interpolation. 
     */
     const short DISCRETE = 0;
-
-    /** Simple linear interpolation between values is used to calculate the animation function.
+    
+    /** Simple linear interpolation between values is used to calculate the animation function. 
         <br>
-        This is the default.
+        This is the default. 
     */
     const short LINEAR = 1;
 
-    /** Defines interpolation to produce an even pace of change across the animation.
+    /** Defines interpolation to produce an even pace of change across the animation. 
         <br>
         This is only supported for values that define a linear numeric range, and
         for which some notion of "distance" between points can be calculated
-        (e.g. position, width, height, etc.).
+        (e.g. position, width, height, etc.). 
     */
     const short PACED = 2;
 
-    /** Interpolates from one value in the values list to the next according to a
+    /** Interpolates from one value in the values list to the next according to a 
         time function defined by a cubic Bezier spline. The points of the spline are
         defined in the <member>KeyTimes</member> attribute, and the control points
         for each interval are defined in the <member>KeySplines</member> attribute.
@@ -67,8 +67,8 @@ constants AnimationCalcMode
     const short SPLINE = 3;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/AnimationColorSpace.idl b/offapi/com/sun/star/animations/AnimationColorSpace.idl
index a29c40139f5a..01f4e7939bf7 100644
--- a/offapi/com/sun/star/animations/AnimationColorSpace.idl
+++ b/offapi/com/sun/star/animations/AnimationColorSpace.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_AnimationColorSpace_idl__
-#define __com_sun_star_animations_AnimationColorSpace_idl__
-
-//=============================================================================
+#ifndef __com_sun_star_animations_AnimationColorSpace_idl__ 
+#define __com_sun_star_animations_AnimationColorSpace_idl__ 
 
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** defines the colorspace that is used for interpolation.
     <br>
@@ -42,17 +42,17 @@
 */
 constants AnimationColorSpace
 {
-    /** defines that the RGB colorspace is used for interpolation .
+    /** defines that the RGB colorspace is used for interpolation . 
     */
     const short RGB = 0;
 
-    /** defines that the HSL colorspace is used for interpolation .
+    /** defines that the HSL colorspace is used for interpolation . 
     */
     const short HSL = 1;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/AnimationEndSync.idl b/offapi/com/sun/star/animations/AnimationEndSync.idl
index e11024b9f723..66cecc2bc89c 100644
--- a/offapi/com/sun/star/animations/AnimationEndSync.idl
+++ b/offapi/com/sun/star/animations/AnimationEndSync.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_AnimationEndSync_idl__
-#define __com_sun_star_animations_AnimationEndSync_idl__
-
-//=============================================================================
+#ifndef __com_sun_star_animations_AnimationEndSync_idl__ 
+#define __com_sun_star_animations_AnimationEndSync_idl__ 
 
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** @see http://www.w3.org/TR/smil20/smil-timing.html#adef-endsync
 */
@@ -74,8 +74,8 @@ constants AnimationEndSync
     const short MEDIA = 3;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/AnimationFill.idl b/offapi/com/sun/star/animations/AnimationFill.idl
index 32b3b77fb992..c0175b632c08 100644
--- a/offapi/com/sun/star/animations/AnimationFill.idl
+++ b/offapi/com/sun/star/animations/AnimationFill.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_AnimationFill_idl__
-#define __com_sun_star_animations_AnimationFill_idl__
-
-//=============================================================================
+#ifndef __com_sun_star_animations_AnimationFill_idl__ 
+#define __com_sun_star_animations_AnimationFill_idl__ 
 
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** This constants are used for the members <member>fill</member> and <member>fillDefault</member>
     of the an <type>XTimeContainer</type>.
@@ -45,7 +45,7 @@ constants AnimationFill
          This is the default value for the <member>XTiming::Fill</member>..
          If the application of fillDefault to an element would result in the element having a value
          of fill that is not allowed on that element, the element will instead have a fill value of
-         <const>AnimationFill::AUTO</const>.
+         <const>AnimationFill::AUTO</const>. 
      */
     const short DEFAULT = 0;
 
@@ -93,8 +93,8 @@ constants AnimationFill
     const short AUTO = 5;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/AnimationNodeType.idl b/offapi/com/sun/star/animations/AnimationNodeType.idl
index 01834c8de1fb..59421b5faa21 100644
--- a/offapi/com/sun/star/animations/AnimationNodeType.idl
+++ b/offapi/com/sun/star/animations/AnimationNodeType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_AnimationNodeType_idl__
-#define __com_sun_star_animations_AnimationNodeType_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
+#ifndef __com_sun_star_animations_AnimationNodeType_idl__ 
+#define __com_sun_star_animations_AnimationNodeType_idl__ 
 
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** This constants defines a type for an animation node.
     <br>
@@ -46,7 +46,7 @@ constants AnimationNodeType
 
     /** Defines a parallel time container. */
     const short PAR = 1;
-
+        
     /** Defines a sequence time container. */
     const short SEQ = 2;
 
@@ -80,8 +80,8 @@ constants AnimationNodeType
 
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/AnimationRestart.idl b/offapi/com/sun/star/animations/AnimationRestart.idl
index 4185bb594764..44df0d24e9f2 100644
--- a/offapi/com/sun/star/animations/AnimationRestart.idl
+++ b/offapi/com/sun/star/animations/AnimationRestart.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_AnimationRestart_idl__
-#define __com_sun_star_animations_AnimationRestart_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
+#ifndef __com_sun_star_animations_AnimationRestart_idl__ 
+#define __com_sun_star_animations_AnimationRestart_idl__ 
 
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** defines the restart behaviour
 
@@ -56,20 +56,20 @@ constants AnimationRestart
     /** The element can be restarted at any time.
     */
     const short ALWAYS = 1;
-
+    
     /** The element can only be restarted when it is not active (i.e. it can be restarted after the active end).
         Attempts to restart the element during its active duration are ignored.
     */
     const short WHEN_NOT_ACTIVE = 2;
-
+    
     /** The element cannot be restarted for the remainder of the current simple
         duration of the parent time container.
     */
     const short NEVER = 3;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/AnimationTransformType.idl b/offapi/com/sun/star/animations/AnimationTransformType.idl
index 14b3d4b3aeaa..1909883f0f0f 100644
--- a/offapi/com/sun/star/animations/AnimationTransformType.idl
+++ b/offapi/com/sun/star/animations/AnimationTransformType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_AnimationTransformType_idl__
-#define __com_sun_star_animations_AnimationTransformType_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
+#ifndef __com_sun_star_animations_AnimationTransformType_idl__ 
+#define __com_sun_star_animations_AnimationTransformType_idl__ 
 
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** Specifies the transformation type for an <type>XAnimateTransform</type>.
 
@@ -39,10 +39,10 @@
 */
 constants AnimationTransformType
 {
-    /** defines a translation
+    /** defines a translation 
     */
     const short TRANSLATE = 0;
-
+    
     /** defines a scale
     */
     const short SCALE = 1;
@@ -60,8 +60,8 @@ constants AnimationTransformType
     const short SKEWY = 4;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/AnimationValueType.idl b/offapi/com/sun/star/animations/AnimationValueType.idl
index 939c32fe47ad..65750a518c88 100644
--- a/offapi/com/sun/star/animations/AnimationValueType.idl
+++ b/offapi/com/sun/star/animations/AnimationValueType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_AnimationValueType_idl__
-#define __com_sun_star_animations_AnimationValueType_idl__
-
-//=============================================================================
+#ifndef __com_sun_star_animations_AnimationValueType_idl__ 
+#define __com_sun_star_animations_AnimationValueType_idl__ 
 
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** @see <member>XAnimateAttribute::ValueType</member>
 */
@@ -50,8 +50,8 @@ constants AnimationValueType
     const short COLOR = 2;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/Event.idl b/offapi/com/sun/star/animations/Event.idl
index 297d336978d4..96921e3f7309 100644
--- a/offapi/com/sun/star/animations/Event.idl
+++ b/offapi/com/sun/star/animations/Event.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_Event_idl__
-#define __com_sun_star_animations_Event_idl__
+#ifndef __com_sun_star_animations_Event_idl__ 
+#define __com_sun_star_animations_Event_idl__ 
 
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** an event has a source that causes an event to be fired and a trigger
     that defines under which condition an event should be raised and
@@ -62,8 +62,8 @@ struct Event
     unsigned short Repeat;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/EventTrigger.idl b/offapi/com/sun/star/animations/EventTrigger.idl
index 4ded278b44db..4050acb46649 100644
--- a/offapi/com/sun/star/animations/EventTrigger.idl
+++ b/offapi/com/sun/star/animations/EventTrigger.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_EventTrigger_idl__
-#define __com_sun_star_animations_EventTrigger_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
+#ifndef __com_sun_star_animations_EventTrigger_idl__ 
+#define __com_sun_star_animations_EventTrigger_idl__ 
 
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /**
 */
@@ -64,7 +64,7 @@ constants EventTrigger
     const short ON_DBL_CLICK = 6;
     const short ON_MOUSE_ENTER = 7;
     const short ON_MOUSE_LEAVE = 8;
-
+    
     /** This event is raised when the user wants the presentation to go one step forward.
     */
     const short ON_NEXT = 9;
@@ -84,8 +84,8 @@ constants EventTrigger
 };
 
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/TargetProperties.idl b/offapi/com/sun/star/animations/TargetProperties.idl
index 3e2133f1c2ae..44eb5f1f7cdc 100644
--- a/offapi/com/sun/star/animations/TargetProperties.idl
+++ b/offapi/com/sun/star/animations/TargetProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_TargetProperties_idl__
-#define __com_sun_star_animations_TargetProperties_idl__
+#ifndef __com_sun_star_animations_TargetProperties_idl__ 
+#define __com_sun_star_animations_TargetProperties_idl__ 
 
 #ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** Properties of an animated target.<p>
 
@@ -46,14 +46,14 @@
 struct TargetProperties
 {
     /// Target for which this struct specifies properties
-    any                                             Target;
+    any												Target;
 
     /// Global target properties
     sequence< ::com::sun::star::beans::NamedValue > Properties;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/TimeFilterPair.idl b/offapi/com/sun/star/animations/TimeFilterPair.idl
index 45130e8941b3..fbc874d225ae 100644
--- a/offapi/com/sun/star/animations/TimeFilterPair.idl
+++ b/offapi/com/sun/star/animations/TimeFilterPair.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_TimeFilterPair_idl__
-#define __com_sun_star_animations_TimeFilterPair_idl__
-
-//=============================================================================
+#ifndef __com_sun_star_animations_TimeFilterPair_idl__ 
+#define __com_sun_star_animations_TimeFilterPair_idl__ 
 
- module com {  module sun {  module star {  module animations {
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
-//=============================================================================
-
-/**
+/** 
 */
 struct TimeFilterPair
 {
@@ -44,8 +44,8 @@ struct TimeFilterPair
     double Progress;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/Timing.idl b/offapi/com/sun/star/animations/Timing.idl
index 01f2c1727910..cb978b889c52 100644
--- a/offapi/com/sun/star/animations/Timing.idl
+++ b/offapi/com/sun/star/animations/Timing.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_Timing_idl__
-#define __com_sun_star_animations_Timing_idl__
-
-//=============================================================================
+#ifndef __com_sun_star_animations_Timing_idl__ 
+#define __com_sun_star_animations_Timing_idl__ 
 
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /**
 */
@@ -46,8 +46,8 @@ enum Timing
     MEDIA
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/TransitionSubType.idl b/offapi/com/sun/star/animations/TransitionSubType.idl
index 54c8fdb875db..31e38e4a54bf 100644
--- a/offapi/com/sun/star/animations/TransitionSubType.idl
+++ b/offapi/com/sun/star/animations/TransitionSubType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_TransitionSubType_idl__
-#define __com_sun_star_animations_TransitionSubType_idl__
-
-//=============================================================================
+#ifndef __com_sun_star_animations_TransitionSubType_idl__ 
+#define __com_sun_star_animations_TransitionSubType_idl__ 
 
- module com {  module sun {  module star {  module animations {
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
-//=============================================================================
-
-/** @see http://www.w3.org/TR/smil20/smil-transitions.html#Table%201:%20Taxonomy%20Table
+/**	@see http://www.w3.org/TR/smil20/smil-transitions.html#Table%201:%20Taxonomy%20Table
 */
 constants TransitionSubType
 {
@@ -156,8 +156,8 @@ constants TransitionSubType
     const short FROMBOTTOMRIGHT = 119;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/TransitionType.idl b/offapi/com/sun/star/animations/TransitionType.idl
index cb5d01fade55..0a4e952e5da1 100644
--- a/offapi/com/sun/star/animations/TransitionType.idl
+++ b/offapi/com/sun/star/animations/TransitionType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_TransitionType_idl__
-#define __com_sun_star_animations_TransitionType_idl__
-
-//=============================================================================
+#ifndef __com_sun_star_animations_TransitionType_idl__ 
+#define __com_sun_star_animations_TransitionType_idl__ 
 
- module com {  module sun {  module star {  module animations {
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
-//=============================================================================
-
-/** @see http://www.w3.org/TR/smil20/smil-transitions.html#Table%201:%20Taxonomy%20Table
+/**	@see http://www.w3.org/TR/smil20/smil-transitions.html#Table%201:%20Taxonomy%20Table
 */
 constants TransitionType
 {
@@ -84,8 +84,8 @@ constants TransitionType
     const short ZOOM = 43;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/ValuePair.idl b/offapi/com/sun/star/animations/ValuePair.idl
index 12362e63488b..c25f331a765b 100644
--- a/offapi/com/sun/star/animations/ValuePair.idl
+++ b/offapi/com/sun/star/animations/ValuePair.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_ValuePair_idl__
-#define __com_sun_star_animations_ValuePair_idl__
-
-//=============================================================================
+#ifndef __com_sun_star_animations_ValuePair_idl__ 
+#define __com_sun_star_animations_ValuePair_idl__ 
 
- module com {  module sun {  module star {  module animations {
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
-//=============================================================================
-
-/**
+/** 
 */
 struct ValuePair
 {
@@ -41,8 +41,8 @@ struct ValuePair
     any Second;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/XAnimate.idl b/offapi/com/sun/star/animations/XAnimate.idl
index 1a1c02b59bcc..ef7daeacd761 100644
--- a/offapi/com/sun/star/animations/XAnimate.idl
+++ b/offapi/com/sun/star/animations/XAnimate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -136,7 +136,7 @@ interface XAnimate : XAnimationNode
     */
     [attribute] any By;
 
-    /** todo: timeFilter="0,0; 0.14,0.36; 0.43,0.73; 0.71,0.91; 1.0,1.0" ?
+    /**	todo: timeFilter="0,0; 0.14,0.36; 0.43,0.73; 0.71,0.91; 1.0,1.0" ?
     */
     [attribute] sequence< TimeFilterPair > TimeFilter;
 
diff --git a/offapi/com/sun/star/animations/XAnimateColor.idl b/offapi/com/sun/star/animations/XAnimateColor.idl
index fc5e37a4df49..caa189521f59 100644
--- a/offapi/com/sun/star/animations/XAnimateColor.idl
+++ b/offapi/com/sun/star/animations/XAnimateColor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_XAnimateColor_idl__
-#define __com_sun_star_animations_XAnimateColor_idl__
+#ifndef __com_sun_star_animations_XAnimateColor_idl__ 
+#define __com_sun_star_animations_XAnimateColor_idl__ 
 
 #ifndef __com_sun_star_animations_XAnimate_idl__
 #include <com/sun/star/animations/XAnimate.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** Interface for animation by defining color changes over time.
     <br>
@@ -67,8 +67,8 @@ interface XAnimateColor : XAnimate
     [attribute] boolean Direction;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/XAnimateMotion.idl b/offapi/com/sun/star/animations/XAnimateMotion.idl
index ea9a71a7a469..42b154f1dd6d 100644
--- a/offapi/com/sun/star/animations/XAnimateMotion.idl
+++ b/offapi/com/sun/star/animations/XAnimateMotion.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_XAnimateMotion_idl__
-#define __com_sun_star_animations_XAnimateMotion_idl__
+#ifndef __com_sun_star_animations_XAnimateMotion_idl__ 
+#define __com_sun_star_animations_XAnimateMotion_idl__ 
 
 #ifndef __com_sun_star_animations_XAnimate_idl__
 #include <com/sun/star/animations/XAnimate.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** Interface for animation by defining motion on a path.
 
@@ -58,8 +58,8 @@ interface XAnimateMotion : XAnimate
     [attribute] any Origin;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/XAnimateSet.idl b/offapi/com/sun/star/animations/XAnimateSet.idl
index 1f363f42c62b..6db771acf35c 100644
--- a/offapi/com/sun/star/animations/XAnimateSet.idl
+++ b/offapi/com/sun/star/animations/XAnimateSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_XAnimateSet_idl__
-#define __com_sun_star_animations_XAnimateSet_idl__
+#ifndef __com_sun_star_animations_XAnimateSet_idl__ 
+#define __com_sun_star_animations_XAnimateSet_idl__ 
 
 #ifndef __com_sun_star_animations_XAnimate_idl__
 #include <com/sun/star/animations/XAnimate.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** Interface for animation by simply setting the value of the target attribute to a constant value.
     This interface provides a simple means of just setting the value of an attribute for
@@ -59,8 +59,8 @@ interface XAnimateSet : XAnimate
 {
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/XAnimateTransform.idl b/offapi/com/sun/star/animations/XAnimateTransform.idl
index 2bdd61cc8cdb..03789dcca3d5 100644
--- a/offapi/com/sun/star/animations/XAnimateTransform.idl
+++ b/offapi/com/sun/star/animations/XAnimateTransform.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_XAnimateTransform_idl__
-#define __com_sun_star_animations_XAnimateTransform_idl__
+#ifndef __com_sun_star_animations_XAnimateTransform_idl__ 
+#define __com_sun_star_animations_XAnimateTransform_idl__ 
 
 #ifndef __com_sun_star_animations_XAnimate_idl__
 #include <com/sun/star/animations/XAnimate.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** animates a transformation attribute on a target element, thereby allowing
     animations to control translation, scaling, rotation and/or skewing.
@@ -71,9 +71,9 @@ interface XAnimateTransform : XAnimate
     [attribute] short TransformType;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
 
diff --git a/offapi/com/sun/star/animations/XAnimationListener.idl b/offapi/com/sun/star/animations/XAnimationListener.idl
index 1a71cae3457b..9779c51cd602 100644
--- a/offapi/com/sun/star/animations/XAnimationListener.idl
+++ b/offapi/com/sun/star/animations/XAnimationListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,8 +24,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_XAnimationListener_idl__
-#define __com_sun_star_animations_XAnimationListener_idl__
+#ifndef __com_sun_star_animations_XAnimationListener_idl__ 
+#define __com_sun_star_animations_XAnimationListener_idl__ 
 
 #ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
@@ -34,11 +34,11 @@
 #include <com/sun/star/animations/XAnimationNode.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** makes it possible to register listeners, which are called whenever
     an animation event occurs.
@@ -53,7 +53,7 @@ interface XAnimationListener : ::com::sun::star::lang::XEventListener
         case that the element was begun with an interface method.</p>
 
         @param Node
-            The node that begins to play.
+            The node that begins to play.			
     */
     void beginEvent( [in] XAnimationNode Node );
 
@@ -71,7 +71,7 @@ interface XAnimationListener : ::com::sun::star::lang::XEventListener
         <p>It will be raised each time the element repeats, after the first iteration.</p>
         <p>Associated with the repeat event is an integer that indicates which repeat iteration is
         beginning.
-
+        
         @param Node
             The node that repeats.
 
@@ -81,8 +81,8 @@ interface XAnimationListener : ::com::sun::star::lang::XEventListener
     void repeat( [in] XAnimationNode Node, [in] long Repeat );
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/XAnimationNode.idl b/offapi/com/sun/star/animations/XAnimationNode.idl
index f2d5d859ce5f..c216a6d72fcc 100644
--- a/offapi/com/sun/star/animations/XAnimationNode.idl
+++ b/offapi/com/sun/star/animations/XAnimationNode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,8 +24,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
-#define __com_sun_star_animations_XAnimationNode_idl__
+#ifndef __com_sun_star_animations_XAnimationNode_idl__ 
+#define __com_sun_star_animations_XAnimationNode_idl__ 
 
 #ifndef __com_sun_star_container_XChild_idl__
 #include <com/sun/star/container/XChild.idl>
@@ -35,11 +35,11 @@
 #include <com/sun/star/beans/NamedValue.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /**
 */
@@ -118,7 +118,7 @@ interface XAnimationNode : ::com::sun::star::container::XChild
             either a <atom>short</atom> constant from <const>EndSync</const>,
             an interface reference to a child <type>XTimeContainer</type>
             or <void/>.
-
+            
         @see http://www.w3.org/TR/smil20/smil-timing.html#adef-endsync
     */
     [attribute] any EndSync;
@@ -162,7 +162,7 @@ interface XAnimationNode : ::com::sun::star::container::XChild
 
     /** the attribute that specify the behavior how an element
         should be extended beyond the active duration by freezing the final
-        state of the element.
+        state of the element. 
         <br>
         <member>Fill</member> is
             a value from <const>AnimationFill</const>.
@@ -173,7 +173,7 @@ interface XAnimationNode : ::com::sun::star::container::XChild
     [attribute] short Fill;
 
     /** the default value for the fill behavior for this element and all
-        descendants.
+        descendants. 
         <br>
         <member>FillDefault</member> is
             <ul>
@@ -190,21 +190,21 @@ interface XAnimationNode : ::com::sun::star::container::XChild
     */
     [attribute] short FillDefault;
 
-    /** defines the restart behavior of this element.
+    /**	defines the restart behavior of this element.
         <br>
         <member>Restart</member> is
             a <atom>short</atom> value from <const>AnimationRestart</const>.
-
+        
         @see <const>AnimationRestart</const>
         @see http://www.w3.org/TR/smil20/smil-timing.html#adef-restart
     */
     [attribute] short Restart;
 
-    /** defines the default restart behavior for this element and all descendants.
+    /**	defines the default restart behavior for this element and all descendants.
 
         @returns
             a value from <const>Restart</const>.
-
+        
         @see <const>AnimationRestart</const>
         @see http://www.w3.org/TR/smil20/smil-timing.html#adef-restartDefault
     */
@@ -244,7 +244,7 @@ interface XAnimationNode : ::com::sun::star::container::XChild
             <li><false/> if the animation is played normal.</li>
             <li><true/> if the animation is played forwards and then backwards. This doubles the duration</li>
             </ul>
-
+        
         @see http://www.w3.org/TR/smil20/smil-timemanip.html#adef-autoReverse
     */
     [attribute] boolean AutoReverse;
@@ -254,8 +254,8 @@ interface XAnimationNode : ::com::sun::star::container::XChild
     [attribute] sequence< ::com::sun::star::beans::NamedValue > UserData;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/XAnimationNodeSupplier.idl b/offapi/com/sun/star/animations/XAnimationNodeSupplier.idl
index d7be5b71b05d..597f9cba00e6 100644
--- a/offapi/com/sun/star/animations/XAnimationNodeSupplier.idl
+++ b/offapi/com/sun/star/animations/XAnimationNodeSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_XAnimationNodeSupplier_idl__
-#define __com_sun_star_animations_XAnimationNodeSupplier_idl__
+#ifndef __com_sun_star_animations_XAnimationNodeSupplier_idl__ 
+#define __com_sun_star_animations_XAnimationNodeSupplier_idl__ 
 
 #ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /**
 */
@@ -44,8 +44,8 @@ interface XAnimationNodeSupplier
     XAnimationNode getAnimationNode();
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/XAudio.idl b/offapi/com/sun/star/animations/XAudio.idl
index 9a5c253132da..6f8014e8be92 100644
--- a/offapi/com/sun/star/animations/XAudio.idl
+++ b/offapi/com/sun/star/animations/XAudio.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_XAudio_idl__
-#define __com_sun_star_animations_XAudio_idl__
+#ifndef __com_sun_star_animations_XAudio_idl__ 
+#define __com_sun_star_animations_XAudio_idl__ 
 
 #ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /**
 */
@@ -50,9 +50,9 @@ interface XAudio : XAnimationNode
     [attribute] double Volume;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
 
diff --git a/offapi/com/sun/star/animations/XCommand.idl b/offapi/com/sun/star/animations/XCommand.idl
index 5a24477ac5b6..3b6839658823 100644
--- a/offapi/com/sun/star/animations/XCommand.idl
+++ b/offapi/com/sun/star/animations/XCommand.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_XCommand_idl__
-#define __com_sun_star_animations_XCommand_idl__
+#ifndef __com_sun_star_animations_XCommand_idl__ 
+#define __com_sun_star_animations_XCommand_idl__ 
 
 #ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** Execution of the XCommand animation node causes the slideshow component
     to call back the application to perform the command.
@@ -59,8 +59,8 @@ interface XCommand : XAnimationNode
     [attribute] any Parameter;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/XIterateContainer.idl b/offapi/com/sun/star/animations/XIterateContainer.idl
index 310ce04ded76..e92b272a0370 100644
--- a/offapi/com/sun/star/animations/XIterateContainer.idl
+++ b/offapi/com/sun/star/animations/XIterateContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_XIterateContainer_idl__
-#define __com_sun_star_animations_XIterateContainer_idl__
+#ifndef __com_sun_star_animations_XIterateContainer_idl__ 
+#define __com_sun_star_animations_XIterateContainer_idl__ 
 
 #ifndef __com_sun_star_animations_XTimeContainer_idl__
 #include <com/sun/star/animations/XTimeContainer.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** An iterate container iterates over subitems of a given target object
     and animates them by subsequently executes the contained effects on them.
@@ -46,7 +46,7 @@
 interface XIterateContainer : XTimeContainer
 {
     /** a target that contains iterable contents, f.e. a paragraph.
-        <br>
+        <br>	
         See documentation of used animation engine for supported targets.
     */
     [attribute] any Target;
@@ -61,7 +61,7 @@ interface XIterateContainer : XTimeContainer
     [attribute] short SubItem;
 
     /** the type of iteration, this depends on the target.
-        <br>
+        <br>	
         See documentation of used animation engine for supported iteration types.
     */
     [attribute] short IterateType;
@@ -72,8 +72,8 @@ interface XIterateContainer : XTimeContainer
     [attribute] double IterateInterval;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl b/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
index 13d726833b63..ff03c57a95b8 100644
--- a/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
+++ b/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,8 +24,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_XTargetPropertiesCreator_idl__
-#define __com_sun_star_animations_XTargetPropertiesCreator_idl__
+#ifndef __com_sun_star_animations_XTargetPropertiesCreator_idl__ 
+#define __com_sun_star_animations_XTargetPropertiesCreator_idl__ 
 
 #ifndef __com_sun_star_animations_TargetProperties_idl__
 #include <com/sun/star/animations/TargetProperties.idl>
@@ -34,11 +34,11 @@
 #include <com/sun/star/animations/XAnimationNode.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /** Factory interface to generate properties for all animated targets.<p>
 
@@ -69,10 +69,10 @@ interface XTargetPropertiesCreator : ::com::sun::star::uno::XInterface
 
 };
 
-//=============================================================================
+//============================================================================= 
 
 service TargetPropertiesCreator: XTargetPropertiesCreator;
-
-}; }; }; };
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/XTimeContainer.idl b/offapi/com/sun/star/animations/XTimeContainer.idl
index 2fa1681706f7..40ed239dc9aa 100644
--- a/offapi/com/sun/star/animations/XTimeContainer.idl
+++ b/offapi/com/sun/star/animations/XTimeContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,8 +24,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_animations_XTimeContainer_idl__
-#define __com_sun_star_animations_XTimeContainer_idl__
+#ifndef __com_sun_star_animations_XTimeContainer_idl__ 
+#define __com_sun_star_animations_XTimeContainer_idl__ 
 
 #ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
@@ -47,11 +47,11 @@
 #include <com/sun/star/container/ElementExistException.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module animations {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module animations {  
+ 
+//============================================================================= 
 
 /**
 
@@ -89,23 +89,23 @@ interface XTimeContainer : XAnimationNode
     /**
     */
     XAnimationNode insertBefore( [in] XAnimationNode newChild, [in] XAnimationNode refChild )
-        raises( com::sun::star::lang::IllegalArgumentException,
-                com::sun::star::container::NoSuchElementException,
+        raises( com::sun::star::lang::IllegalArgumentException, 
+                com::sun::star::container::NoSuchElementException, 
                 com::sun::star::container::ElementExistException,
                 com::sun::star::lang::WrappedTargetException );
 
     /**
     */
     XAnimationNode insertAfter( [in] XAnimationNode newChild, [in] XAnimationNode refChild )
-        raises( com::sun::star::lang::IllegalArgumentException,
-                com::sun::star::container::NoSuchElementException,
+        raises( com::sun::star::lang::IllegalArgumentException, 
+                com::sun::star::container::NoSuchElementException, 
                 com::sun::star::container::ElementExistException,
                 com::sun::star::lang::WrappedTargetException );
 
     /**
     */
     XAnimationNode replaceChild( [in] XAnimationNode newChild, [in] XAnimationNode oldChild )
-        raises( com::sun::star::lang::IllegalArgumentException,
+        raises( com::sun::star::lang::IllegalArgumentException, 
                 com::sun::star::container::NoSuchElementException,
                 com::sun::star::container::ElementExistException,
                 com::sun::star::lang::WrappedTargetException );
@@ -113,20 +113,20 @@ interface XTimeContainer : XAnimationNode
     /**
     */
     XAnimationNode removeChild( [in] XAnimationNode oldChild )
-        raises( com::sun::star::lang::IllegalArgumentException,
-                com::sun::star::container::NoSuchElementException,
+        raises( com::sun::star::lang::IllegalArgumentException, 
+                com::sun::star::container::NoSuchElementException, 
                 com::sun::star::lang::WrappedTargetException );
 
     /**
     */
     XAnimationNode appendChild( [in] XAnimationNode newChild )
-        raises( com::sun::star::lang::IllegalArgumentException,
-                com::sun::star::container::ElementExistException,
+        raises( com::sun::star::lang::IllegalArgumentException, 
+                com::sun::star::container::ElementExistException, 
                 com::sun::star::lang::WrappedTargetException );
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/animations/XTransitionFilter.idl b/offapi/com/sun/star/animations/XTransitionFilter.idl
index 1a6eec80f382..a45c24a6f3f0 100644
--- a/offapi/com/sun/star/animations/XTransitionFilter.idl
+++ b/offapi/com/sun/star/animations/XTransitionFilter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -83,7 +83,7 @@ interface XTransitionFilter : XAnimate
     [attribute] boolean Direction;
 
     /** If the value of the <member>Type</member> attribute is <const>TransitionType::FADE</const> and
-        the value of the <member>Subtype</member> attribute is  <const>TransitionSubType::FADETOCOLOR</const> or
+        the value of the <member>Subtype</member> attribute is 	<const>TransitionSubType::FADETOCOLOR</const> or
         <const>TransitionSubType::FADEFROMCOLOR</const>, then this attribute specifies the starting or ending
         color of the fade.
         The default value is 0 (black).
diff --git a/offapi/com/sun/star/auth/AuthenticationFailedException.idl b/offapi/com/sun/star/auth/AuthenticationFailedException.idl
index 6d0abbaa97d1..b4df2e526629 100644
--- a/offapi/com/sun/star/auth/AuthenticationFailedException.idl
+++ b/offapi/com/sun/star/auth/AuthenticationFailedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/auth/InvalidArgumentException.idl b/offapi/com/sun/star/auth/InvalidArgumentException.idl
index 115eab5b6337..1f6a0ecdb8c5 100644
--- a/offapi/com/sun/star/auth/InvalidArgumentException.idl
+++ b/offapi/com/sun/star/auth/InvalidArgumentException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/auth/InvalidContextException.idl b/offapi/com/sun/star/auth/InvalidContextException.idl
index 28e9bba9b0dd..164fcd7f7113 100644
--- a/offapi/com/sun/star/auth/InvalidContextException.idl
+++ b/offapi/com/sun/star/auth/InvalidContextException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/auth/InvalidCredentialException.idl b/offapi/com/sun/star/auth/InvalidCredentialException.idl
index 3caed7fd1dec..ff0704a05ce7 100644
--- a/offapi/com/sun/star/auth/InvalidCredentialException.idl
+++ b/offapi/com/sun/star/auth/InvalidCredentialException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/auth/InvalidPrincipalException.idl b/offapi/com/sun/star/auth/InvalidPrincipalException.idl
index 6b98b9b86e47..106f6c4b3ecb 100644
--- a/offapi/com/sun/star/auth/InvalidPrincipalException.idl
+++ b/offapi/com/sun/star/auth/InvalidPrincipalException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/auth/PersistenceFailureException.idl b/offapi/com/sun/star/auth/PersistenceFailureException.idl
index 7ef1864327d1..bc3a847796e1 100644
--- a/offapi/com/sun/star/auth/PersistenceFailureException.idl
+++ b/offapi/com/sun/star/auth/PersistenceFailureException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/auth/SSOExceptions.idl b/offapi/com/sun/star/auth/SSOExceptions.idl
index 4e4bbe293ecb..87633e0754d7 100644
--- a/offapi/com/sun/star/auth/SSOExceptions.idl
+++ b/offapi/com/sun/star/auth/SSOExceptions.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/auth/SSOManagerFactory.idl b/offapi/com/sun/star/auth/SSOManagerFactory.idl
index 1c6501c0f8f6..9b2c97abce83 100644
--- a/offapi/com/sun/star/auth/SSOManagerFactory.idl
+++ b/offapi/com/sun/star/auth/SSOManagerFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@ module com { module sun { module star { module auth {
         <LI>On the initiator side, use the previously created context to process
             security tokens received from the acceptor side and to create
             security tokens to send to the acceptor side. On the acceptor side,
-            use the previously created context to process security tokens
+            use the previously created context to process security tokens 
             received from the initiator side and to create security tokens to
             send to the initiator side.</LI>
     </UL>
diff --git a/offapi/com/sun/star/auth/SSOPasswordCache.idl b/offapi/com/sun/star/auth/SSOPasswordCache.idl
index 30f959c452ad..8b78d7bcfc31 100644
--- a/offapi/com/sun/star/auth/SSOPasswordCache.idl
+++ b/offapi/com/sun/star/auth/SSOPasswordCache.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/auth/UnsupportedException.idl b/offapi/com/sun/star/auth/UnsupportedException.idl
index a2c14079714d..3c30a2805a57 100644
--- a/offapi/com/sun/star/auth/UnsupportedException.idl
+++ b/offapi/com/sun/star/auth/UnsupportedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/auth/XSSOAcceptorContext.idl b/offapi/com/sun/star/auth/XSSOAcceptorContext.idl
index e343719a488f..d43e21bfc702 100644
--- a/offapi/com/sun/star/auth/XSSOAcceptorContext.idl
+++ b/offapi/com/sun/star/auth/XSSOAcceptorContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,8 +51,8 @@ published interface XSSOAcceptorContext : ::com::sun::star::auth::XSSOContext
     /** accepts/authenticates an SSO token sent from the context initiator side.
         <P>
         accept() should be called only once. Subsequent calls produce
-        undefined results.
-
+        undefined results.	
+        
         @param Token
         the SSO token sent by the initiator.
 
@@ -63,7 +63,7 @@ published interface XSSOAcceptorContext : ::com::sun::star::auth::XSSOContext
         supported a zero length sequence is returned.
      */
 
-    sequence< byte >    accept( [in] sequence< byte > Token )
+    sequence< byte >	accept(	[in] sequence< byte > Token )
         raises( InvalidArgumentException,
                 InvalidCredentialException,
                 InvalidContextException,
diff --git a/offapi/com/sun/star/auth/XSSOContext.idl b/offapi/com/sun/star/auth/XSSOContext.idl
index ce47d6cd1a6f..3bb6706a99ec 100644
--- a/offapi/com/sun/star/auth/XSSOContext.idl
+++ b/offapi/com/sun/star/auth/XSSOContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 module com { module sun { module star { module auth {
 
-/** Base SSO security context representation
+/** Base SSO security context representation 
 
     @since OOo 1.1.2
  */
@@ -69,7 +69,7 @@ published interface XSSOContext : ::com::sun::star::uno::XInterface
         @returns
         <TRUE/> if mutual authentication is supported, <FALSE/> otherwise.
      */
-    boolean getMutual();
+    boolean	getMutual();
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/auth/XSSOInitiatorContext.idl b/offapi/com/sun/star/auth/XSSOInitiatorContext.idl
index 27b7cf672a92..ef8a7317baf5 100644
--- a/offapi/com/sun/star/auth/XSSOInitiatorContext.idl
+++ b/offapi/com/sun/star/auth/XSSOInitiatorContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,7 +68,7 @@ published interface XSSOInitiatorContext : ::com::sun::star::auth::XSSOContext
         on a context supporting mutual authentication and undefined in all
         other cases.
      */
-    sequence< byte > init(  [in] sequence< byte > Token )
+    sequence< byte > init(	[in] sequence< byte > Token )
         raises( InvalidArgumentException,
                 InvalidCredentialException,
                 InvalidContextException,
diff --git a/offapi/com/sun/star/auth/XSSOManager.idl b/offapi/com/sun/star/auth/XSSOManager.idl
index e28b40c50093..06af910fe58d 100644
--- a/offapi/com/sun/star/auth/XSSOManager.idl
+++ b/offapi/com/sun/star/auth/XSSOManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_auth_XSSOManager_idl__
 #define __com_sun_star_auth_XSSOManager_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
+#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
@@ -63,7 +63,7 @@ published interface XSSOManager : ::com::sun::star::uno::XInterface
         @returns
         the mechanism name ( e.g. "KERBEROS" )
      */
-    string                  getMechanism();
+    string					getMechanism();
 
 
     /** creates an initiator side security context.
@@ -82,10 +82,10 @@ published interface XSSOManager : ::com::sun::star::uno::XInterface
         @returns
         the newly created initiator context.
      */
-    XSSOInitiatorContext    createInitiatorContext(
-                                [in] string SourcePrincipal,
-                                [in] string TargetPrincipal,
-                                [in] string TargetHost )
+    XSSOInitiatorContext	createInitiatorContext(
+                                [in] string	SourcePrincipal,
+                                [in] string	TargetPrincipal,
+                                [in] string	TargetHost )
                                     raises( InvalidArgumentException,
                                             InvalidCredentialException,
                                             InvalidPrincipalException,
@@ -100,8 +100,8 @@ published interface XSSOManager : ::com::sun::star::uno::XInterface
         @returns
         the newly created acceptor side context.
      */
-    XSSOAcceptorContext     createAcceptorContext(
-                                [in] string TargetPrincipal )
+    XSSOAcceptorContext		createAcceptorContext(
+                                [in] string	TargetPrincipal )
                                     raises( InvalidArgumentException,
                                             InvalidCredentialException,
                                             InvalidPrincipalException,
diff --git a/offapi/com/sun/star/auth/XSSOManagerFactory.idl b/offapi/com/sun/star/auth/XSSOManagerFactory.idl
index 400bc1c075a6..fa683d41c0fb 100644
--- a/offapi/com/sun/star/auth/XSSOManagerFactory.idl
+++ b/offapi/com/sun/star/auth/XSSOManagerFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_auth_XSSOManagerFactory_idl__
 #define __com_sun_star_auth_XSSOManagerFactory_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
+#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
@@ -52,7 +52,7 @@ published interface XSSOManagerFactory : ::com::sun::star::uno::XInterface
         @returns
         the relevant <type>XSSOManager</type> instance
      */
-    XSSOManager getSSOManager();
+    XSSOManager	getSSOManager();
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/auth/XSSOPasswordCache.idl b/offapi/com/sun/star/auth/XSSOPasswordCache.idl
index f06718923dbd..ca1c00d8e3a5 100644
--- a/offapi/com/sun/star/auth/XSSOPasswordCache.idl
+++ b/offapi/com/sun/star/auth/XSSOPasswordCache.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,12 +62,12 @@ published interface XSSOPasswordCache : ::com::sun::star::uno::XInterface
         indicates whether or not the username/password combination should be
         persisted
      */
-    void    addPassword( [in] string UserName,
+    void	addPassword( [in] string UserName,
                          [in] string Password,
                          [in] boolean Persist )
                 raises( InvalidArgumentException,
                         PersistenceFailureException );
-
+        
     /** retrieves a password for a given user from the cache.
         <P>
         Non persistent cache is searched first, followed by the
@@ -78,11 +78,11 @@ published interface XSSOPasswordCache : ::com::sun::star::uno::XInterface
 
         @param Persist
         indicates whether or not the password is persistent
-
+        
         @returns
         the required password
      */
-    string  getPassword( [in] string UserName, [out] boolean Persist )
+    string	getPassword( [in] string UserName, [out] boolean Persist )
                 raises( InvalidArgumentException,
                         PersistenceFailureException );
 
@@ -95,7 +95,7 @@ published interface XSSOPasswordCache : ::com::sun::star::uno::XInterface
         indicates whether or not the password should also be removed, if
         present, from persistent cache.
      */
-    void    removePassword( [in] string UserName, [in] boolean RemovePersist )
+    void	removePassword( [in] string UserName, [in] boolean RemovePersist )
                 raises( InvalidArgumentException,
                         PersistenceFailureException );
 };
diff --git a/offapi/com/sun/star/awt/AccessibleButton.idl b/offapi/com/sun/star/awt/AccessibleButton.idl
index 16e35e2018ec..2ee05f74678b 100644
--- a/offapi/com/sun/star/awt/AccessibleButton.idl
+++ b/offapi/com/sun/star/awt/AccessibleButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,23 +51,23 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for a button.
 
     @since OOo 1.1.2
- */
+ */    
 published service AccessibleButton
 {
     /** This interface gives access to the structural information of a button:
 
         <ul>
-        <li>Role: The role of a button is <const
+        <li>Role: The role of a button is <const 
             scope="com::sun::star::accessibility"
             >AccessibleRole::PUSH_BUTTON</const>.</li>
         <li>Name: The name of a button is its localized label.</li>
         <li>Description: The description of a button is its localized
             help text.</li>
-        <li>Children: There are no children.</li>
+        <li>Children: There are no children.</li>            
         <li>Parent: The parent is the window that contains the button.</li>
         <li>Relations: There are no relations.</li>
         <li>States: The states supported by this service are
@@ -78,7 +78,7 @@ published service AccessibleButton
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::DEFUNC</const>
                 is set if the object has already been disposed
-                and subsequent calls to this object result in
+                and subsequent calls to this object result in				
                 <type scope="com::sun::star::lang">DisposedException</type>
                 exceptions.</li>
             <li><const scope="com::sun::star::accessibility"
@@ -102,16 +102,16 @@ published service AccessibleButton
         </ul>
      */
     interface ::com::sun::star::accessibility::XAccessibleContext;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleEventBroadcaster;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleComponent;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleExtendedComponent;
 
     /** This interface gives read-only access to the text representation
         of a button.
-     */
+     */    
     interface ::com::sun::star::accessibility::XAccessibleText;
 
     /** This interface gives access to the actions that can be executed for
@@ -123,14 +123,14 @@ published service AccessibleButton
     interface ::com::sun::star::accessibility::XAccessibleAction;
 
     /** This interface gives access to the numerical value of a button,
-        which is related to the button's
+        which is related to the button's 
         <const scope="com::sun::star::accessibility"
         >AccessibleStateType::PRESSED</const> state.
      */
     interface ::com::sun::star::accessibility::XAccessibleValue;
-
+    
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/AccessibleCheckBox.idl b/offapi/com/sun/star/awt/AccessibleCheckBox.idl
index 1781f6543a77..bb6aa60c2f95 100644
--- a/offapi/com/sun/star/awt/AccessibleCheckBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleCheckBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,18 +51,18 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for a check box.
-
-    @since OOo 1.1.2
- */
+    
+    @since OOo 1.1.2    
+ */    
 published service AccessibleCheckBox
 {
     /** This interface gives access to the structural information of a
         check box:
 
         <ul>
-        <li>Role: The role of a check box is <const
+        <li>Role: The role of a check box is <const 
             scope="com::sun::star::accessibility"
             >AccessibleRole::CHECK_BOX</const>.</li>
         <li>Name: The name of a check box is its localized label.</li>
@@ -75,11 +75,11 @@ published service AccessibleCheckBox
             <ul>
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::CHECKED</const> is set
-                if the object is currently checked.</li>
+                if the object is currently checked.</li>        
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::DEFUNC</const>
                 is set if the object has already been disposed
-                and subsequent calls to this object result in
+                and subsequent calls to this object result in				
                 <type scope="com::sun::star::lang">DisposedException</type>
                 exceptions.</li>
             <li><const scope="com::sun::star::accessibility"
@@ -100,18 +100,18 @@ published service AccessibleCheckBox
         </ul>
      */
     interface ::com::sun::star::accessibility::XAccessibleContext;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleEventBroadcaster;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleComponent;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleExtendedComponent;
-
+    
     /** This interface gives read-only access to the text representation
         of a check box.
      */
     interface ::com::sun::star::accessibility::XAccessibleText;
-
+    
     /** This interface gives access to the actions that can be executed for
         a check box. The supported actions for a check box are:
         <ul>
diff --git a/offapi/com/sun/star/awt/AccessibleComboBox.idl b/offapi/com/sun/star/awt/AccessibleComboBox.idl
index 5e492724c10b..1e598601b827 100644
--- a/offapi/com/sun/star/awt/AccessibleComboBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleComboBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,21 +48,21 @@ module com { module sun { module star { module awt {
     @see com::sun::star::accessibility::XAccessibleComponent
     @see com::sun::star::accessibility::XAccessibleExtendedComponent
     @since OOo 1.1.2
-*/
+*/    
 published service AccessibleComboBox
 {
     /** This interface gives access to the structural information of a combo box:
 
        <ul>
-       <li>Role: The role of a combo box is <const
+       <li>Role: The role of a combo box is <const 
            scope="com::sun::star::accessibility"
            >AccessibleRole::COMBO_BOX</const>.</li>
        <li>Name: The name of a combo box is its localized label.</li>
        <li>Description: The description of a combo box is its localized
            help text.</li>
-       <li>Children: There exists two children.
-            The first is a <type scope="com::sun::star::awt">AccessibleTextField</type>
-            and the 2nd is a <type scope="com::sun::star::awt">AccessibleList</type>. </li>
+       <li>Children: There exists two children. 
+            The first is a <type scope="com::sun::star::awt">AccessibleTextField</type> 
+            and the 2nd is a <type scope="com::sun::star::awt">AccessibleList</type>. </li>            
        <li>Parent: The parent is the window that contains the combo box.</li>
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
@@ -70,7 +70,7 @@ published service AccessibleComboBox
            <li><const scope="com::sun::star::accessibility"
                >AccessibleStateType::DEFUNC</const>
                is set if the object has already been disposed
-               and subsequent calls to this object result in
+               and subsequent calls to this object result in				
                <type scope="com::sun::star::lang">DisposedException</type>
                exceptions.</li>
            <li><const scope="com::sun::star::accessibility"
@@ -102,7 +102,7 @@ published service AccessibleComboBox
     interface com::sun::star::accessibility::XAccessibleComponent;
     interface com::sun::star::accessibility::XAccessibleExtendedComponent;
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl b/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
index 01d8b7cb1c80..292c26116648 100644
--- a/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,19 +52,19 @@ module com { module sun { module star { module awt {
     @see com::sun::star::accessibility::XAccessibleAction
 
     @since OOo 1.1.2
-*/
+*/    
 published service AccessibleDropDownComboBox
 {
     /** This interface gives access to the structural information of a dropdown combo box:
 
        <ul>
-       <li>Role: The role of a dropdown combo box is <const
+       <li>Role: The role of a dropdown combo box is <const 
            scope="com::sun::star::accessibility"
            >AccessibleRole::COMBO_BOX</const>.</li>
        <li>Name: The name of a dropdown combo box is its localized label.</li>
        <li>Description: The description of a dropdown combo box is its localized
            help text.</li>
-       <li>Children: There exists two children.
+       <li>Children: There exists two children. 
             The first is a <type scope="com::sun::star::awt">AccessibleTextField</type>
             and the 2nd is a <type scope="com::sun::star::awt">AccessibleList</type>. </li>
        <li>Parent: The parent is the window that contains the dropdown combo box.</li>
@@ -74,7 +74,7 @@ published service AccessibleDropDownComboBox
            <li><const scope="com::sun::star::accessibility"
                >AccessibleStateType::DEFUNC</const>
                is set if the object has already been disposed
-               and subsequent calls to this object result in
+               and subsequent calls to this object result in				
                <type scope="com::sun::star::lang">DisposedException</type>
                exceptions.</li>
            <li><const scope="com::sun::star::accessibility"
@@ -113,7 +113,7 @@ published service AccessibleDropDownComboBox
      */
     interface com::sun::star::accessibility::XAccessibleAction;
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl b/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
index 2f3ca4989083..476f214703d3 100644
--- a/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,19 +53,19 @@ module com { module sun { module star { module awt {
     @see com::sun::star::accessibility::XAccessibleAction
 
     @since OOo 1.1.2
-*/
+*/    
 published service AccessibleDropDownListBox
 {
     /** This interface gives access to the structural information of a dropdown list box:
 
        <ul>
-       <li>Role: The role of a dropdown list box is <const
+       <li>Role: The role of a dropdown list box is <const 
            scope="com::sun::star::accessibility"
            >AccessibleRole::COMBO_BOX</const>.</li>
        <li>Name: The name of a dropdown list box is its localized label.</li>
        <li>Description: The description of a dropdown list box is its localized
            help text.</li>
-       <li>Children: There exists one child.
+       <li>Children: There exists one child. 
            It is of type <type scope="com::sun::star::awt">AccessibleList</type>.</li>
        <li>Parent: The parent is the window that contains the dropdown list box.</li>
        <li>Relations: There are no relations.</li>
@@ -74,7 +74,7 @@ published service AccessibleDropDownListBox
            <li><const scope="com::sun::star::accessibility"
                >AccessibleStateType::DEFUNC</const>
                is set if the object has already been disposed
-               and subsequent calls to this object result in
+               and subsequent calls to this object result in				
                <type scope="com::sun::star::lang">DisposedException</type>
                exceptions.</li>
            <li><const scope="com::sun::star::accessibility"
@@ -113,7 +113,7 @@ published service AccessibleDropDownListBox
      */
     interface com::sun::star::accessibility::XAccessibleAction;
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/AccessibleEdit.idl b/offapi/com/sun/star/awt/AccessibleEdit.idl
index 720b9204e14e..c3fa8d126eaa 100644
--- a/offapi/com/sun/star/awt/AccessibleEdit.idl
+++ b/offapi/com/sun/star/awt/AccessibleEdit.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,11 +48,11 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for an edit.
-
+    
     @since OOo 1.1.2
- */
+ */    
 published service AccessibleEdit
 {
     /** This interface gives access to the structural information of an edit:
@@ -86,7 +86,7 @@ published service AccessibleEdit
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::DEFUNC</const>
                 is set if the object has already been disposed
-                and subsequent calls to this object result in
+                and subsequent calls to this object result in				
                 <type scope="com::sun::star::lang">DisposedException</type>
                 exceptions.</li>
             <li><const scope="com::sun::star::accessibility"
@@ -110,18 +110,18 @@ published service AccessibleEdit
         </ul>
      */
     interface ::com::sun::star::accessibility::XAccessibleContext;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleEventBroadcaster;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleComponent;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleExtendedComponent;
 
     /** This interface gives read-only access to the text representation
         of an edit.
      */
     interface ::com::sun::star::accessibility::XAccessibleText;
-
+    
     /** This interface extends the
         <type scope="com::sun::star::accessibility">XAccessibleText</type>
         interface and gives read and write access to the text representation
diff --git a/offapi/com/sun/star/awt/AccessibleFixedText.idl b/offapi/com/sun/star/awt/AccessibleFixedText.idl
index bef95c95bfea..9bd8c63de4f8 100644
--- a/offapi/com/sun/star/awt/AccessibleFixedText.idl
+++ b/offapi/com/sun/star/awt/AccessibleFixedText.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for a fixed text.
 
     @since OOo 1.1.2
@@ -77,7 +77,7 @@ published service AccessibleFixedText
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::DEFUNC</const>
                 is set if the object has already been disposed
-                and subsequent calls to this object result in
+                and subsequent calls to this object result in				
                 <type scope="com::sun::star::lang">DisposedException</type>
                 exceptions.</li>
             <li><const scope="com::sun::star::accessibility"
@@ -96,13 +96,13 @@ published service AccessibleFixedText
         </ul>
      */
     interface ::com::sun::star::accessibility::XAccessibleContext;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleEventBroadcaster;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleComponent;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleExtendedComponent;
-
+    
     /** This interface gives read-only access to the text representation
         of a fixed text.
      */
diff --git a/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl b/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
index 20f447fdf592..c6270e27d95c 100644
--- a/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
+++ b/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,14 +54,14 @@ published service AccessibleIconChoiceControl
     /** This interface gives access to the structural information of an icon choice control:
 
        <ul>
-       <li>Role: The role of an icon choice control is <const
+       <li>Role: The role of an icon choice control is <const 
            scope="com::sun::star::accessibility"
            >AccessibleRole::TREE</const>.</li>
        <li>Name: The name of an icon choice control is IconChoiceControl.</li>
        <li>Description: The description of an icon choice control is its localized
            help text.</li>
-       <li>Children: There exists children of type <type scope="com::sun::star::awt">AccessibleIconChoiceControlEntry</type>.
-        </li>
+       <li>Children: There exists children of type <type scope="com::sun::star::awt">AccessibleIconChoiceControlEntry</type>. 
+        </li>            
        <li>Parent: The parent is the window that contains the icon choice control.</li>
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
@@ -69,7 +69,7 @@ published service AccessibleIconChoiceControl
            <li><const scope="com::sun::star::accessibility"
                >AccessibleStateType::DEFUNC</const>
                is set if the object has already been disposed
-               and subsequent calls to this object result in
+               and subsequent calls to this object result in				
                <type scope="com::sun::star::lang">DisposedException</type>
                exceptions.</li>
            <li><const scope="com::sun::star::accessibility"
diff --git a/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl b/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
index 0b8cf1ef973d..af6b1b5a552f 100644
--- a/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
+++ b/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,13 +56,13 @@ published service AccessibleIconChoiceControlEntry
     /** This interface gives access to the structural information of an icon choice control entry:
 
        <ul>
-       <li>Role: The role of an icon choice control entry is <const
+       <li>Role: The role of an icon choice control entry is <const 
            scope="com::sun::star::accessibility"
            >AccessibleRole::LABEL</const>.</li>
        <li>Name: The name of an icon choice control entry is it's text.</li>
        <li>Description: The description of an icon choice control entry is empty.</li>
        <li>Children: There exist no children.
-        </li>
+        </li>            
        <li>Parent: The parent is either the <type scope="com::sun::star::awt">AccessibleIconChoiceControl</type>.</li>
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
@@ -70,7 +70,7 @@ published service AccessibleIconChoiceControlEntry
            <li><const scope="com::sun::star::accessibility"
                >AccessibleStateType::DEFUNC</const>
                is set if the object has already been disposed
-               and subsequent calls to this object result in
+               and subsequent calls to this object result in				
                <type scope="com::sun::star::lang">DisposedException</type>
                exceptions.</li>
            <li><const scope="com::sun::star::accessibility"
diff --git a/offapi/com/sun/star/awt/AccessibleList.idl b/offapi/com/sun/star/awt/AccessibleList.idl
index 5e86d6102de1..271ea2d6fce7 100644
--- a/offapi/com/sun/star/awt/AccessibleList.idl
+++ b/offapi/com/sun/star/awt/AccessibleList.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,21 +55,21 @@ module com { module sun { module star { module awt {
     @see ::com::sun::star::accessibility::XAccessibleSelection
 
     @since OOo 1.1.2
-*/
+*/    
 published service AccessibleList
 {
     /** This interface gives access to the structural information of a list:
 
        <ul>
-       <li>Role: The role of a list is <const
+       <li>Role: The role of a list is <const 
            scope="::com::sun::star::accessibility"
            >AccessibleRole::LIST</const>.</li>
        <li>Name: The name of a list is its localized label.</li>
        <li>Description: The description of a list is its localized
            help text.</li>
-       <li>Children: There exists children.
+       <li>Children: There exists children. 
             Each child is of type <type scope="com::sun::star::awt">AccessibleListItem</type>. </li>
-       <li>Parent: The parent can be of type
+       <li>Parent: The parent can be of type 
             <ul>
             <li>
                 <type scope="com::sun::star::awt">AccessibleComboBox</type>
@@ -85,7 +85,7 @@ published service AccessibleList
            <li><const scope="com::sun::star::accessibility"
                >AccessibleStateType::DEFUNC</const>
                is set if the object has already been disposed
-               and subsequent calls to this object result in
+               and subsequent calls to this object result in				
                <type scope="com::sun::star::lang">DisposedException</type>
                exceptions.</li>
            <li><const scope="com::sun::star::accessibility"
@@ -108,10 +108,10 @@ published service AccessibleList
            <li><const scope="com::sun::star::accessibility"
                >AccessibleStateType::VISIBLE</const> is always set.</li>
            <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::MULTI_SELECTABLE</const> is set
+               >AccessibleStateType::MULTI_SELECTABLE</const> is set 
                if the list supports multi selection.</li>
            <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::MANAGES_DESCENDANTS</const> is always set.
+               >AccessibleStateType::MANAGES_DESCENDANTS</const> is always set. 
                The children are transient.</li>
            </ul>
            </li>
@@ -132,7 +132,7 @@ published service AccessibleList
      */
     interface com::sun::star::accessibility::XAccessibleSelection;
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/AccessibleListBox.idl b/offapi/com/sun/star/awt/AccessibleListBox.idl
index 282306d7c70f..e3d400f81453 100644
--- a/offapi/com/sun/star/awt/AccessibleListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleListBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,19 +49,19 @@ module com { module sun { module star { module awt {
     @see com::sun::star::accessibility::XAccessibleExtendedComponent
 
     @since OOo 1.1.2
-*/
+*/    
 published service AccessibleListBox
 {
     /** This interface gives access to the structural information of a list box:
 
        <ul>
-       <li>Role: The role of a list box is <const
+       <li>Role: The role of a list box is <const 
            scope="com::sun::star::accessibility"
            >AccessibleRole::PANEL</const>.</li>
        <li>Name: The name of a list box is its localized label.</li>
        <li>Description: The description of a list box is its localized
            help text.</li>
-       <li>Children: There exists one child.
+       <li>Children: There exists one child. 
            It is of type <type scope="com::sun::star::awt">AccessibleList</type>.</li>
        <li>Parent: The parent is the window that contains the list box.</li>
        <li>Relations: There are no relations.</li>
@@ -70,7 +70,7 @@ published service AccessibleListBox
            <li><const scope="com::sun::star::accessibility"
                >AccessibleStateType::DEFUNC</const>
                is set if the object has already been disposed
-               and subsequent calls to this object result in
+               and subsequent calls to this object result in				
                <type scope="com::sun::star::lang">DisposedException</type>
                exceptions.</li>
            <li><const scope="com::sun::star::accessibility"
@@ -101,7 +101,7 @@ published service AccessibleListBox
     interface com::sun::star::accessibility::XAccessibleComponent;
     interface com::sun::star::accessibility::XAccessibleExtendedComponent;
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/AccessibleListBoxList.idl b/offapi/com/sun/star/awt/AccessibleListBoxList.idl
index 4caba7202796..2dfe53075edd 100644
--- a/offapi/com/sun/star/awt/AccessibleListBoxList.idl
+++ b/offapi/com/sun/star/awt/AccessibleListBoxList.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,12 +41,12 @@ module com { module sun { module star { module awt {
     <type scope="com::sun::star::accessibility">XAccessibleSelection</type> interface is supported.
 
     @since OOo 1.1.2
-*/
+*/    
 published service AccessibleListBoxList
 {
     service AccessibleList;
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/AccessibleListItem.idl b/offapi/com/sun/star/awt/AccessibleListItem.idl
index 70020f0c2056..69333995e930 100644
--- a/offapi/com/sun/star/awt/AccessibleListItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleListItem.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,13 +49,13 @@ module com { module sun { module star { module awt {
     @see com::sun::star::accessibility::XAccessibleText
 
     @since OOo 1.1.2
-*/
+*/    
 published service AccessibleListItem
 {
     /** This interface gives access to the structural information of a list item:
 
        <ul>
-       <li>Role: The role of a list item is <const
+       <li>Role: The role of a list item is <const 
            scope="com::sun::star::accessibility"
            >AccessibleRole::LIST_ITEM</const>.</li>
        <li>Name: The name of a list item is the text of the item.</li>
@@ -68,7 +68,7 @@ published service AccessibleListItem
            <li><const scope="com::sun::star::accessibility"
                >AccessibleStateType::DEFUNC</const>
                is set if the object has already been disposed
-               and subsequent calls to this object result in
+               and subsequent calls to this object result in				
                <type scope="com::sun::star::lang">DisposedException</type>
                exceptions.</li>
            <li><const scope="com::sun::star::accessibility"
@@ -83,7 +83,7 @@ published service AccessibleListItem
            <li><const scope="com::sun::star::accessibility"
                >AccessibleStateType::SELECTABLE</const> is always set.</li>
            <li><const scope="com::sun::star::accessibility"
-               >AccessibleStateType::SELECTED</const> is set
+               >AccessibleStateType::SELECTED</const> is set 
                when the item is selected.</li>
            </ul>
            </li>
@@ -98,7 +98,7 @@ published service AccessibleListItem
      */
     interface com::sun::star::accessibility::XAccessibleText;
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/AccessibleMenu.idl b/offapi/com/sun/star/awt/AccessibleMenu.idl
index 440d49543787..23b30aede8ae 100644
--- a/offapi/com/sun/star/awt/AccessibleMenu.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenu.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,11 +54,11 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for a menu.
-
+    
     @since OOo 1.1.2
- */
+ */    
 published service AccessibleMenu
 {
     /** This interface gives access to the structural information of a menu:
@@ -90,7 +90,7 @@ published service AccessibleMenu
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::DEFUNC</const>
                 is set if the object has already been disposed
-                and subsequent calls to this object result in
+                and subsequent calls to this object result in				
                 <type scope="com::sun::star::lang">DisposedException</type>
                 exceptions.</li>
             <li><const scope="com::sun::star::accessibility"
@@ -102,7 +102,7 @@ published service AccessibleMenu
                 >AccessibleStateType::SELECTABLE</const> is always set.</li>
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::SELECTED</const> is set
-                if the object is selected.</li>
+                if the object is selected.</li>   
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::SHOWING</const> is set
                 if the object is displayed on the screen.</li>
@@ -113,11 +113,11 @@ published service AccessibleMenu
         </ul>
      */
     interface ::com::sun::star::accessibility::XAccessibleContext;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleEventBroadcaster;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleComponent;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleExtendedComponent;
 
     /** This interface gives read-only access to the text representation
@@ -144,7 +144,7 @@ published service AccessibleMenu
         menu.
      */
     interface ::com::sun::star::accessibility::XAccessibleSelection;
-
+    
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/awt/AccessibleMenuBar.idl b/offapi/com/sun/star/awt/AccessibleMenuBar.idl
index e001471b9149..7579cbb9dce2 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuBar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,11 +45,11 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for a menu bar.
-
+    
     @since OOo 1.1.2
- */
+ */    
 published service AccessibleMenuBar
 {
     /** This interface gives access to the structural information of a
@@ -96,11 +96,11 @@ published service AccessibleMenuBar
         </ul>
      */
     interface ::com::sun::star::accessibility::XAccessibleContext;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleEventBroadcaster;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleComponent;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleExtendedComponent;
 
     /** This interface gives access to the selectable children of a
@@ -109,7 +109,7 @@ published service AccessibleMenuBar
     interface ::com::sun::star::accessibility::XAccessibleSelection;
 
 };
-
+ 
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/AccessibleMenuItem.idl b/offapi/com/sun/star/awt/AccessibleMenuItem.idl
index 05ad03a88ca3..2237e8b695a0 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuItem.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,18 +51,18 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for a menu item.
-
+    
     @since OOo 1.1.2
- */
+ */    
 published service AccessibleMenuItem
 {
     /** This interface gives access to the structural information of a
         menu item:
 
         <ul>
-        <li>Role: The role of a menu item is <const
+        <li>Role: The role of a menu item is <const 
             scope="com::sun::star::accessibility"
             >AccessibleRole::MENU_ITEM</const>.</li>
         <li>Name: The name of a menu item is the localized item text.</li>
@@ -85,7 +85,7 @@ published service AccessibleMenuItem
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::DEFUNC</const>
                 is set if the object has already been disposed
-                and subsequent calls to this object result in
+                and subsequent calls to this object result in				
                 <type scope="com::sun::star::lang">DisposedException</type>
                 exceptions.</li>
             <li><const scope="com::sun::star::accessibility"
@@ -108,11 +108,11 @@ published service AccessibleMenuItem
         </ul>
      */
     interface ::com::sun::star::accessibility::XAccessibleContext;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleEventBroadcaster;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleComponent;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleExtendedComponent;
 
     /** This interface gives read-only access to the text representation
diff --git a/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl b/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
index 47f3a62124ac..77539af7dfd8 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for a menu separator.
 
     @since OOo 1.1.2
@@ -53,7 +53,7 @@ published service AccessibleMenuSeparator
         menu separator:
 
         <ul>
-        <li>Role: The role of a menu separator is <const
+        <li>Role: The role of a menu separator is <const 
             scope="com::sun::star::accessibility"
             >AccessibleRole::SEPARATOR</const>.</li>
         <li>Name: There is no name.</li>
@@ -82,7 +82,7 @@ published service AccessibleMenuSeparator
                 >AccessibleStateType::SELECTABLE</const> is always set.</li>
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::SELECTED</const> is set
-                if the object is selected.</li>
+                if the object is selected.</li>   
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::SHOWING</const> is set
                 if the object is displayed on the screen.</li>
@@ -93,15 +93,15 @@ published service AccessibleMenuSeparator
         </ul>
      */
     interface ::com::sun::star::accessibility::XAccessibleContext;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleEventBroadcaster;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleComponent;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleExtendedComponent;
 
 };
-
+    
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/AccessiblePopupMenu.idl b/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
index f7d3d2162087..aa1921e32517 100644
--- a/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
+++ b/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,11 +45,11 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for a popup menu.
-
+    
     @since OOo 1.1.2
- */
+ */    
 published service AccessiblePopupMenu
 {
     /** This interface gives access to the structural information of a
@@ -73,7 +73,7 @@ published service AccessiblePopupMenu
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::DEFUNC</const>
                 is set if the object has already been disposed
-                and subsequent calls to this object result in
+                and subsequent calls to this object result in				
                 <type scope="com::sun::star::lang">DisposedException</type>
                 exceptions.</li>
             <li><const scope="com::sun::star::accessibility"
diff --git a/offapi/com/sun/star/awt/AccessibleRadioButton.idl b/offapi/com/sun/star/awt/AccessibleRadioButton.idl
index 94744ecc5301..62600eb8786a 100644
--- a/offapi/com/sun/star/awt/AccessibleRadioButton.idl
+++ b/offapi/com/sun/star/awt/AccessibleRadioButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,11 +51,11 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for a radio button.
 
     @since OOo 1.1.2
- */
+ */    
 published service AccessibleRadioButton
 {
     /** This interface gives access to the structural information of a
@@ -86,7 +86,7 @@ published service AccessibleRadioButton
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::DEFUNC</const>
                 is set if the object has already been disposed
-                and subsequent calls to this object result in
+                and subsequent calls to this object result in				
                 <type scope="com::sun::star::lang">DisposedException</type>
                 exceptions.</li>
             <li><const scope="com::sun::star::accessibility"
@@ -107,13 +107,13 @@ published service AccessibleRadioButton
         </ul>
      */
     interface ::com::sun::star::accessibility::XAccessibleContext;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleEventBroadcaster;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleComponent;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleExtendedComponent;
-
+    
     /** This interface gives read-only access to the text representation
         of a radio button.
      */
@@ -135,7 +135,7 @@ published service AccessibleRadioButton
     interface ::com::sun::star::accessibility::XAccessibleValue;
 
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/AccessibleScrollBar.idl b/offapi/com/sun/star/awt/AccessibleScrollBar.idl
index d3337c737563..08323f60b00b 100644
--- a/offapi/com/sun/star/awt/AccessibleScrollBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleScrollBar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,11 +48,11 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for a scroll bar.
 
     @since OOo 1.1.2
- */
+ */    
 published service AccessibleScrollBar
 {
     /** This interface gives access to the structural information of a
@@ -100,11 +100,11 @@ published service AccessibleScrollBar
         </ul>
      */
     interface ::com::sun::star::accessibility::XAccessibleContext;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleEventBroadcaster;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleComponent;
-
+    
     interface ::com::sun::star::accessibility::XAccessibleExtendedComponent;
 
     /** This interface gives access to the actions that can be executed for
diff --git a/offapi/com/sun/star/awt/AccessibleStatusBar.idl b/offapi/com/sun/star/awt/AccessibleStatusBar.idl
index b3618150235e..b4bd6809e761 100644
--- a/offapi/com/sun/star/awt/AccessibleStatusBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleStatusBar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,18 +42,18 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for a status bar.
-
+    
     @since OOo 1.1.2
- */
+ */    
 published service AccessibleStatusBar
 {
     /** This interface gives access to the structural information of a
         status bar:
 
         <ul>
-        <li>Role: The role of a status bar is <const
+        <li>Role: The role of a status bar is <const 
             scope="com::sun::star::accessibility"
             >AccessibleRole::STATUS_BAR</const>.</li>
         <li>Name: There is no name.</li>
@@ -68,7 +68,7 @@ published service AccessibleStatusBar
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::DEFUNC</const>
                 is set if the object has already been disposed
-                and subsequent calls to this object result in
+                and subsequent calls to this object result in				
                 <type scope="com::sun::star::lang">DisposedException</type>
                 exceptions.</li>
             <li><const scope="com::sun::star::accessibility"
diff --git a/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl b/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
index ceea05097428..cc801baf96a5 100644
--- a/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,18 +45,18 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for a status bar item.
-
+    
     @since OOo 1.1.2
- */
+ */    
 published service AccessibleStatusBarItem
 {
     /** This interface gives access to the structural information of a
         status bar item:
 
         <ul>
-        <li>Role: The role of a status bar item is <const
+        <li>Role: The role of a status bar item is <const 
             scope="com::sun::star::accessibility"
             >AccessibleRole::LABEL</const>.</li>
         <li>Name: The name of a status bar item is its localized
@@ -73,7 +73,7 @@ published service AccessibleStatusBarItem
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::DEFUNC</const>
                 is set if the object has already been disposed
-                and subsequent calls to this object result in
+                and subsequent calls to this object result in				
                 <type scope="com::sun::star::lang">DisposedException</type>
                 exceptions.</li>
             <li><const scope="com::sun::star::accessibility"
diff --git a/offapi/com/sun/star/awt/AccessibleTabBar.idl b/offapi/com/sun/star/awt/AccessibleTabBar.idl
index 4e2bdceadb1c..8342b76f8b6e 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,18 +42,18 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for a tabbar.
-
+    
     @since OOo 1.1.2
- */
+ */    
 published service AccessibleTabBar
 {
     /** This interface gives access to the structural information of a
         tabbar:
 
         <ul>
-        <li>Role: The role of a tabbar is <const
+        <li>Role: The role of a tabbar is <const 
             scope="com::sun::star::accessibility"
             >AccessibleRole::PANEL</const>.</li>
         <li>Name: There is no name.</li>
@@ -71,7 +71,7 @@ published service AccessibleTabBar
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::DEFUNC</const>
                 is set if the object has already been disposed
-                and subsequent calls to this object result in
+                and subsequent calls to this object result in				
                 <type scope="com::sun::star::lang">DisposedException</type>
                 exceptions.</li>
             <li><const scope="com::sun::star::accessibility"
@@ -103,7 +103,7 @@ published service AccessibleTabBar
     interface ::com::sun::star::accessibility::XAccessibleExtendedComponent;
 
 };
-
+        
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/AccessibleTabBarPage.idl b/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
index 3937066b6897..df8e43d2491f 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,18 +42,18 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for a tabbar page.
-
+    
     @since OOo 1.1.2
- */
+ */    
 published service AccessibleTabBarPage
 {
     /** This interface gives access to the structural information of a
         tabbar page:
 
         <ul>
-        <li>Role: The role of a tabbar page is <const
+        <li>Role: The role of a tabbar page is <const 
             scope="com::sun::star::accessibility"
             >AccessibleRole::PAGE_TAB</const>.</li>
         <li>Name: The name of a tabbar page is the localized
@@ -70,7 +70,7 @@ published service AccessibleTabBarPage
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::DEFUNC</const>
                 is set if the object has already been disposed
-                and subsequent calls to this object result in
+                and subsequent calls to this object result in				
                 <type scope="com::sun::star::lang">DisposedException</type>
                 exceptions.</li>
             <li><const scope="com::sun::star::accessibility"
@@ -99,7 +99,7 @@ published service AccessibleTabBarPage
     interface ::com::sun::star::accessibility::XAccessibleExtendedComponent;
 
 };
-
+        
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl b/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
index 80bceb661f9c..91bb00a24800 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,18 +45,18 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for a tabbar page list.
-
+    
     @since OOo 1.1.2
- */
+ */    
 published service AccessibleTabBarPageList
 {
     /** This interface gives access to the structural information of a
         tabbar page list:
 
         <ul>
-        <li>Role: The role of a tabbar page list is <const
+        <li>Role: The role of a tabbar page list is <const 
             scope="com::sun::star::accessibility"
             >AccessibleRole::PAGE_TAB_LIST</const>.</li>
         <li>Name: There is no name.</li>
@@ -73,7 +73,7 @@ published service AccessibleTabBarPageList
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::DEFUNC</const>
                 is set if the object has already been disposed
-                and subsequent calls to this object result in
+                and subsequent calls to this object result in				
                 <type scope="com::sun::star::lang">DisposedException</type>
                 exceptions.</li>
             <li><const scope="com::sun::star::accessibility"
diff --git a/offapi/com/sun/star/awt/AccessibleTabControl.idl b/offapi/com/sun/star/awt/AccessibleTabControl.idl
index 09b1f6b91efa..e5e3871bb8c7 100644
--- a/offapi/com/sun/star/awt/AccessibleTabControl.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,18 +45,18 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for a tab control.
-
+    
     @since OOo 1.1.2
- */
+ */    
 published service AccessibleTabControl
 {
     /** This interface gives access to the structural information of a
         tab control:
 
         <ul>
-        <li>Role: The role of a tab control is <const
+        <li>Role: The role of a tab control is <const 
             scope="com::sun::star::accessibility"
             >AccessibleRole::PAGE_TAB_LIST</const>.</li>
         <li>Name: There is no name.</li>
@@ -72,8 +72,8 @@ published service AccessibleTabControl
             <ul>
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::DEFUNC</const>
-                is set if the object has already been disposed
-                and subsequent calls to this object result in
+                is set if the object has already been disposed 
+                and subsequent calls to this object result in				
                 <type scope="com::sun::star::lang">DisposedException</type>
                 exceptions.</li>
             <li><const scope="com::sun::star::accessibility"
diff --git a/offapi/com/sun/star/awt/AccessibleTabPage.idl b/offapi/com/sun/star/awt/AccessibleTabPage.idl
index 061024b62fc8..c3557585796a 100644
--- a/offapi/com/sun/star/awt/AccessibleTabPage.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabPage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,18 +45,18 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for a tab page.
-
+    
     @since OOo 1.1.2
- */
+ */    
 published service AccessibleTabPage
 {
     /** This interface gives access to the structural information of a
         tab page:
 
         <ul>
-        <li>Role: The role of a tab page is <const
+        <li>Role: The role of a tab page is <const 
             scope="com::sun::star::accessibility"
             >AccessibleRole::PAGE_TAB</const>.</li>
         <li>Name: The name of a tab page is the localized tab page text.</li>
@@ -72,7 +72,7 @@ published service AccessibleTabPage
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::DEFUNC</const>
                 is set if the object has already been disposed
-                and subsequent calls to this object result in
+                and subsequent calls to this object result in				
                 <type scope="com::sun::star::lang">DisposedException</type>
                 exceptions.</li>
             <li><const scope="com::sun::star::accessibility"
@@ -107,11 +107,11 @@ published service AccessibleTabPage
 
     /** This interface gives read-only access to the text representation
         of a tab page.
-     */
+     */    
     interface ::com::sun::star::accessibility::XAccessibleText;
 
 };
-
+        
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/AccessibleTextField.idl b/offapi/com/sun/star/awt/AccessibleTextField.idl
index 65c422e7e604..232acaae451d 100644
--- a/offapi/com/sun/star/awt/AccessibleTextField.idl
+++ b/offapi/com/sun/star/awt/AccessibleTextField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,19 +53,19 @@ module com { module sun { module star { module awt {
     @see com::sun::star::accessibility::XAccessibleText
 
     @since OOo 1.1.2
-*/
+*/    
 published service AccessibleTextField
 {
     /** This interface gives access to the structural information of a text filed:
 
        <ul>
-       <li>Role: The role of a text filed is <const
+       <li>Role: The role of a text filed is <const 
            scope="com::sun::star::accessibility"
            >AccessibleRole::TEXT</const>.</li>
        <li>Name: The name of a text filed is its localized label.</li>
        <li>Description: The description of a text filed is its localized
            help text.</li>
-       <li>Children: There exists no children.</li>
+       <li>Children: There exists no children.</li>            
        <li>Parent: The parent is the window that contains the text filed.</li>
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
@@ -73,7 +73,7 @@ published service AccessibleTextField
            <li><const scope="com::sun::star::accessibility"
                >AccessibleStateType::DEFUNC</const>
                is set if the object has already been disposed
-               and subsequent calls to this object result in
+               and subsequent calls to this object result in				
                <type scope="com::sun::star::lang">DisposedException</type>
                exceptions.</li>
            <li><const scope="com::sun::star::accessibility"
@@ -110,7 +110,7 @@ published service AccessibleTextField
     interface com::sun::star::accessibility::XAccessibleExtendedComponent;
 
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/AccessibleToolBox.idl b/offapi/com/sun/star/awt/AccessibleToolBox.idl
index b86003badf17..2a62c81ac01e 100644
--- a/offapi/com/sun/star/awt/AccessibleToolBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleToolBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,20 +51,20 @@ module com { module sun { module star { module awt {
     @see com::sun::star::accessibility::XAccessibleExtendedComponent
 
     @since OOo 1.1.2
-*/
+*/    
 published service AccessibleToolBox
 {
     /** This interface gives access to the structural information of a tool box:
 
        <ul>
-       <li>Role: The role of a tool box is <const
+       <li>Role: The role of a tool box is <const 
            scope="com::sun::star::accessibility"
            >AccessibleRole::TOOL_BAR</const>.</li>
        <li>Name: The name of a tool box is its localized label.</li>
        <li>Description: The description of a tool box is its localized
            help text.</li>
-       <li>Children: There exists children of type <type scope="com::sun::star::awt">AccessibleToolBoxItem</type>.
-       </li>
+       <li>Children: There exists children of type <type scope="com::sun::star::awt">AccessibleToolBoxItem</type>. 
+       </li>            
        <li>Parent: The parent is the window that contains the tool box.</li>
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
@@ -72,7 +72,7 @@ published service AccessibleToolBox
            <li><const scope="com::sun::star::accessibility"
                >AccessibleStateType::DEFUNC</const>
                is set if the object has already been disposed
-               and subsequent calls to this object result in
+               and subsequent calls to this object result in				
                <type scope="com::sun::star::lang">DisposedException</type>
                exceptions.</li>
            <li><const scope="com::sun::star::accessibility"
@@ -110,7 +110,7 @@ published service AccessibleToolBox
     interface com::sun::star::accessibility::XAccessibleExtendedComponent;
 
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl b/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
index b2aafcd4be47..e1b812e0c855 100644
--- a/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,13 +57,13 @@ module com { module sun { module star { module awt {
     @see com::sun::star::accessibility::XAccessibleValue
 
     @since OOo 1.1.2
-*/
+*/    
 published service AccessibleToolBoxItem
 {
     /** This interface gives access to the structural information of a tool box item:
 
        <ul>
-       <li>Role: The role of a tool box item is
+       <li>Role: The role of a tool box item is 
            <const scope="com::sun::star::accessibility">AccessibleRole::PUSH_BUTTON</const> when the item is a push button, or
            <const scope="com::sun::star::accessibility">AccessibleRole::TOGGLE_BUTTON</const> when the item is a button and checkable, or
            <const scope="com::sun::star::accessibility">AccessibleRole::PANEL</const> when the item is a window, or
@@ -72,8 +72,8 @@ published service AccessibleToolBoxItem
        <li>Name: The name of a tool box item is the name set.</li>
        <li>Description: The description of a tool box item is its localized
            help text.</li>
-       <li>Children: There can exist one child.
-            This can be any kind of accessible object.</li>
+       <li>Children: There can exist one child. 
+            This can be any kind of accessible object.</li>            
        <li>Parent: The parent is the tool box that contains the tool box item.</li>
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
@@ -81,7 +81,7 @@ published service AccessibleToolBoxItem
            <li><const scope="com::sun::star::accessibility"
                >AccessibleStateType::DEFUNC</const>
                is set if the object has already been disposed
-               and subsequent calls to this object result in
+               and subsequent calls to this object result in				
                <type scope="com::sun::star::lang">DisposedException</type>
                exceptions.</li>
            <li><const scope="com::sun::star::accessibility"
@@ -128,7 +128,7 @@ published service AccessibleToolBoxItem
      */
     interface com::sun::star::accessibility::XAccessibleValue;
 };
-
+          
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/AccessibleTreeListBox.idl b/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
index f6e521f689e7..813e60b674f7 100644
--- a/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,14 +56,14 @@ published service AccessibleTreeListBox
     /** This interface gives access to the structural information of a tree list box:
 
        <ul>
-       <li>Role: The role of a tree list box is <const
+       <li>Role: The role of a tree list box is <const 
            scope="com::sun::star::accessibility"
            >AccessibleRole::TREE</const>.</li>
        <li>Name: The name of a tree list box is its localized label.</li>
        <li>Description: The description of a tree list box is its localized
            help text.</li>
        <li>Children: There exists children of type <type scope="com::sun::star::awt">AccessibleTreeListBoxEntry</type>.
-        </li>
+        </li>            
        <li>Parent: The parent is the window that contains the tree list box.</li>
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
@@ -71,7 +71,7 @@ published service AccessibleTreeListBox
            <li><const scope="com::sun::star::accessibility"
                >AccessibleStateType::DEFUNC</const>
                is set if the object has already been disposed
-               and subsequent calls to this object result in
+               and subsequent calls to this object result in				
                <type scope="com::sun::star::lang">DisposedException</type>
                exceptions.</li>
            <li><const scope="com::sun::star::accessibility"
diff --git a/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl b/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
index cec5b4d3819d..660c47559e93 100644
--- a/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
+++ b/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -60,14 +60,14 @@ published service AccessibleTreeListBoxEntry
     /** This interface gives access to the structural information of a tree list box entry:
 
        <ul>
-       <li>Role: The role of a tree list box entry is <const
+       <li>Role: The role of a tree list box entry is <const 
            scope="com::sun::star::accessibility"
            >AccessibleRole::LABEL</const>.</li>
        <li>Name: The name of a tree list box entry is it's text.</li>
        <li>Description: The description of a tree list box entry is empty.</li>
-       <li>Children: There can exist children of type <type scope="com::sun::star::awt">AccessibleTreeListBoxEntry</type>.
-        </li>
-       <li>Parent: The parent is either the <type scope="com::sun::star::awt">AccessibleTreeListBox</type>
+       <li>Children: There can exist children of type <type scope="com::sun::star::awt">AccessibleTreeListBoxEntry</type>. 
+        </li>            
+       <li>Parent: The parent is either the <type scope="com::sun::star::awt">AccessibleTreeListBox</type> 
             or an <type scope="com::sun::star::awt">AccessibleTreeListBoxEntry</type> that contains the tree list box entry.</li>
        <li>Relations: There are no relations.</li>
        <li>States: The states supported by this service are
@@ -75,7 +75,7 @@ published service AccessibleTreeListBoxEntry
            <li><const scope="com::sun::star::accessibility"
                >AccessibleStateType::DEFUNC</const>
                is set if the object has already been disposed
-               and subsequent calls to this object result in
+               and subsequent calls to this object result in				
                <type scope="com::sun::star::lang">DisposedException</type>
                exceptions.</li>
            <li><const scope="com::sun::star::accessibility"
diff --git a/offapi/com/sun/star/awt/AccessibleWindow.idl b/offapi/com/sun/star/awt/AccessibleWindow.idl
index 59ae5bf25c28..3c1fe7429db3 100644
--- a/offapi/com/sun/star/awt/AccessibleWindow.idl
+++ b/offapi/com/sun/star/awt/AccessibleWindow.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,9 +42,9 @@
 #endif
 
 module com { module sun { module star { module awt {
-
+    
 /** specifies accessibility support for a window.
-
+    
     @since OOo 1.1.2
  */
 published service AccessibleWindow
@@ -71,9 +71,9 @@ published service AccessibleWindow
                 >AccessibleRole::SPLIT_PANE</const></li>
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleRole::WINDOW</const></li>
-            <li>...</li>
+            <li>...</li>               
             </ul>
-            </li>
+            </li>     
         <li>Name: The name of a window is its localized title.</li>
         <li>Description: The description of a window is its localized
             help text.</li>
@@ -84,11 +84,11 @@ published service AccessibleWindow
             <ul>
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::ACTIVE</const> is set
-                if the object is currently the active object.</li>
+                if the object is currently the active object.</li>    
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::DEFUNC</const>
                 is set if the object has already been disposed
-                and subsequent calls to this object result in
+                and subsequent calls to this object result in				
                 <type scope="com::sun::star::lang">DisposedException</type>
                 exceptions.</li>
             <li><const scope="com::sun::star::accessibility"
@@ -104,7 +104,7 @@ published service AccessibleWindow
                 if the object is modal.</li>
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::RESIZABLE</const> is set
-                if the size of the object is not fixed.</li>
+                if the size of the object is not fixed.</li> 
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::SHOWING</const> is set
                 if the object is displayed on the screen.</li>
diff --git a/offapi/com/sun/star/awt/ActionEvent.idl b/offapi/com/sun/star/awt/ActionEvent.idl
index 29cf1ab2e65b..d7f1a14389a4 100644
--- a/offapi/com/sun/star/awt/ActionEvent.idl
+++ b/offapi/com/sun/star/awt/ActionEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_ActionEvent_idl__
-#define __com_sun_star_awt_ActionEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_ActionEvent_idl__ 
+#define __com_sun_star_awt_ActionEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** a semantic event which indicates that a component-defined action occurred.
-
+    
     <p>This high-level event is generated by a component (such as a Button)
-    when the component-specific action occurs (such as being pressed).
-    The event is passed to every <type>XActionListener</type> object
-    that registered to receive such events using the component's
+    when the component-specific action occurs (such as being pressed). 
+    The event is passed to every <type>XActionListener</type> object 
+    that registered to receive such events using the component's 
     <code>addActionListener</code> method.</p>
-
-    <p>The object that implements the <type>XActionListener</type> interface
-    gets this ActionEvent when the event occurs. The listener is therefore
-    spared the details of processing individual mouse movements and mouse
-    clicks, and can instead process a "meaningful" (semantic) event like
+    
+    <p>The object that implements the <type>XActionListener</type> interface 
+    gets this ActionEvent when the event occurs. The listener is therefore 
+    spared the details of processing individual mouse movements and mouse 
+    clicks, and can instead process a "meaningful" (semantic) event like 
     "button pressed".</p>
  */
 published struct ActionEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** contains the command string associated with this action.
      */
-    string ActionCommand;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string ActionCommand; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/AdjustmentEvent.idl b/offapi/com/sun/star/awt/AdjustmentEvent.idl
index e2835a239529..e803d70a2e5c 100644
--- a/offapi/com/sun/star/awt/AdjustmentEvent.idl
+++ b/offapi/com/sun/star/awt/AdjustmentEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_AdjustmentEvent_idl__
-#define __com_sun_star_awt_AdjustmentEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_awt_AdjustmentType_idl__
-#include <com/sun/star/awt/AdjustmentType.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_AdjustmentEvent_idl__ 
+#define __com_sun_star_awt_AdjustmentEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_AdjustmentType_idl__ 
+#include <com/sun/star/awt/AdjustmentType.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** adjustment event emitted by adjustable objects.
  */
 published struct AdjustmentEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** contains the current value in the adjustment event.
      */
-    long Value;
-
-    //-------------------------------------------------------------------------
-
+    long Value; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** contains the type of the adjustment event.
      */
-    com::sun::star::awt::AdjustmentType Type;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::awt::AdjustmentType Type; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/AdjustmentType.idl b/offapi/com/sun/star/awt/AdjustmentType.idl
index 247b3c8eacf4..cdd75616da78 100644
--- a/offapi/com/sun/star/awt/AdjustmentType.idl
+++ b/offapi/com/sun/star/awt/AdjustmentType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_AdjustmentType_idl__
-#define __com_sun_star_awt_AdjustmentType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_AdjustmentType_idl__ 
+#define __com_sun_star_awt_AdjustmentType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the adjustment type.
  */
 published enum AdjustmentType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+    
     /** adjustment is originated by a line jump.
 
-        <p>A line jump can, for example, be caused by a click on
+        <p>A line jump can, for example, be caused by a click on 
         one of the pointer buttons.</p>
      */
-    ADJUST_LINE,
-
-    //-------------------------------------------------------------------------
-
+    ADJUST_LINE, 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** adjustment is originated by a page jump.
-
-        <p>A page jump can, for example, be caused by a click in the
+        
+        <p>A page jump can, for example, be caused by a click in the 
         background area of the scrollbar (neither one of the pointer
         buttons, nor the thumb).</p>
      */
-    ADJUST_PAGE,
-
-    //-------------------------------------------------------------------------
-
+    ADJUST_PAGE, 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** adjustment is originated by dragging the thumb.
      */
-    ADJUST_ABS
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    ADJUST_ABS 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/AsyncCallback.idl b/offapi/com/sun/star/awt/AsyncCallback.idl
index 6c1d9feef993..f108eb9c89e2 100644
--- a/offapi/com/sun/star/awt/AsyncCallback.idl
+++ b/offapi/com/sun/star/awt/AsyncCallback.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/CharSet.idl b/offapi/com/sun/star/awt/CharSet.idl
index c483ee56a196..8a2fd4ebd159 100644
--- a/offapi/com/sun/star/awt/CharSet.idl
+++ b/offapi/com/sun/star/awt/CharSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,100 +24,100 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_CharSet_idl__
-#define __com_sun_star_awt_CharSet_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** These values are used to specify the characters which are available in
-    a font and their codes.
-
+#ifndef __com_sun_star_awt_CharSet_idl__ 
+#define __com_sun_star_awt_CharSet_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** These values are used to specify the characters which are available in  
+    a font and their codes. 
+         
     <P>The currently defined constants of <CODE>CharSet</CODE> have the same
     numerical values as the corresponding enum values of the C/C++
     <CODE>rtl_TextEncoding</CODE> (from <CODE>rtl/textenc.h</CODE>).  This
     correspondence is by design.  Since <CODE>CharSet</CODE> is deprecated,
     however, it is not planned to add further constants to keep it in sync with
     <CODE>rtl_TextEncoding</CODE>.</P>
-
+     
     @deprecated
  */
 published constants CharSet
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies an unknown character set.
      */
-    const short DONTKNOW = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short DONTKNOW = 0; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the ANSI character set.
      */
-    const short ANSI = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short ANSI = 1; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the <regtm>Apple Macintosh</regtm> character set.
      */
-    const short MAC = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short MAC = 2; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the IBM PC character set number 437.
      */
-    const short IBMPC_437 = 3;
-
-    //-------------------------------------------------------------------------
-
+    const short IBMPC_437 = 3; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the IBM PC character set number 850.
      */
-    const short IBMPC_850 = 4;
-
-    //-------------------------------------------------------------------------
-
+    const short IBMPC_850 = 4; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the IBM PC character set number 860.
      */
-    const short IBMPC_860 = 5;
-
-    //-------------------------------------------------------------------------
-
+    const short IBMPC_860 = 5; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the IBM PC character set number 861.
      */
-    const short IBMPC_861 = 6;
-
-    //-------------------------------------------------------------------------
-
+    const short IBMPC_861 = 6; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the IBM PC character set number 863.
      */
-    const short IBMPC_863 = 7;
-
-    //-------------------------------------------------------------------------
-
+    const short IBMPC_863 = 7; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the IBM PC character set number 865.
      */
-    const short IBMPC_865 = 8;
-
-    //-------------------------------------------------------------------------
-
+    const short IBMPC_865 = 8; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the system character set.
      */
-    const short SYSTEM = 9;
-
-    //-------------------------------------------------------------------------
-
+    const short SYSTEM = 9; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a set of symbols.
      */
-    const short SYMBOL = 10;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short SYMBOL = 10; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/Command.idl b/offapi/com/sun/star/awt/Command.idl
index 5a38e8972ea6..e9920e2ce99c 100644
--- a/offapi/com/sun/star/awt/Command.idl
+++ b/offapi/com/sun/star/awt/Command.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,96 +38,96 @@ module com {  module sun {  module star {  module awt {
 published constants Command
 {
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** specifies a requests for a context menu.
     */
     const short CONTEXTMENU = 1;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the beginning of a drag operation.
     */
     const short STARTDRAG = 2;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+    
     /** specifies a mouse wheel operation.
     */
     const short WHEEL = 3;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+    
     /** specifies the beginning of an auto scroll operation.
     */
     const short STARTAUTOSCROLL = 4;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+    
     /** specifies an auto scroll operation.
     */
     const short AUTOSCROLL = 5;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+    
     /** specifies a request for a voice operation.
     */
     const short VOICE = 6;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+    
     /** specifies the beginning of an extended text input operation.
     */
     const short STARTEXTTEXTINPUT = 7;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+    
     /** specifies an extended text input operation.
     */
     const short EXTTEXTINPUT = 8;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+    
     /** specifies the end of an extended text input operation.
     */
     const short ENDEXTTEXTINPUT = 9;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+    
     /** specifies that the input context has been changed.
     */
     const short INPUTCONTEXTCHANGE = 10;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+    
     /** specifies the cursor position.
     */
     const short CURSORPOS = 11;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+    
     /** specifies a paste selection command.
     */
     const short PASTESELECTION = 12;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+    
     /** specifies that the state of a key modifier has changed.
     */
     const short MODKEYCHANGE = 13;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+    
     /** specifies a Hangul hanja conversion command.
     */
     const short HANGUL_HANJA_CONVERSION = 14;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+    
     /** specifies a user-defined command.
     */
     const short USER = 4096;
-};
+};          
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/ContainerWindowProvider.idl b/offapi/com/sun/star/awt/ContainerWindowProvider.idl
index 74bc62d11b56..c3b6ab5997c8 100644
--- a/offapi/com/sun/star/awt/ContainerWindowProvider.idl
+++ b/offapi/com/sun/star/awt/ContainerWindowProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,11 +37,11 @@
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module awt {
 
-//=============================================================================
+//============================================================================= 
 
 /** specifies a provider for container windows implementing the
     <type scope="com::sun::star::awt">XWindow</type> interface.
@@ -49,7 +49,7 @@ module com { module sun { module star { module awt {
 service ContainerWindowProvider : com::sun::star::awt::XContainerWindowProvider;
 
 
-//=============================================================================
+//============================================================================= 
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/DeviceCapability.idl b/offapi/com/sun/star/awt/DeviceCapability.idl
index 1f90be3bb4ac..06e7a309a9cd 100644
--- a/offapi/com/sun/star/awt/DeviceCapability.idl
+++ b/offapi/com/sun/star/awt/DeviceCapability.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_DeviceCapability_idl__
-#define __com_sun_star_awt_DeviceCapability_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_DeviceCapability_idl__ 
+#define __com_sun_star_awt_DeviceCapability_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** defines which capabilities a device supports.
  */
 published constants DeviceCapability
-{
-    //-------------------------------------------------------------------------
-
-    /** supports the device raster operations.
-
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** supports the device raster operations.  
+                 
         @see XGraphics::setRasterOp
      */
-    const long RASTEROPERATIONS = 1;
-
-    //-------------------------------------------------------------------------
-
-    /** supports the <member>XDevice::createBitmap</member>,
+    const long RASTEROPERATIONS = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** supports the <member>XDevice::createBitmap</member>, 
         the <member>XDevice::createDevice</member> and the
-        <member>XGraphics::copy</member> methods.
-
+        <member>XGraphics::copy</member> methods. 
+                 
         @see XGraphics::setRasterOp
      */
-    const long GETBITS = 2;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const long GETBITS = 2; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/DeviceInfo.idl b/offapi/com/sun/star/awt/DeviceInfo.idl
index f9de79870395..a89dacacbb8f 100644
--- a/offapi/com/sun/star/awt/DeviceInfo.idl
+++ b/offapi/com/sun/star/awt/DeviceInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,87 +24,87 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_DeviceInfo_idl__
-#define __com_sun_star_awt_DeviceInfo_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_DeviceInfo_idl__ 
+#define __com_sun_star_awt_DeviceInfo_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** contains information about a device.
  */
 published struct DeviceInfo
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** contains the width of the device in pixels.
      */
-    long Width;
-
-    //-------------------------------------------------------------------------
-
+    long Width; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the height of the device in pixels.
      */
-    long Height;
-
-    //-------------------------------------------------------------------------
-
+    long Height; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the inset from the left.
      */
-    long LeftInset;
-
-    //-------------------------------------------------------------------------
-
+    long LeftInset; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the inset from the top.
      */
-    long TopInset;
-
-    //-------------------------------------------------------------------------
-
+    long TopInset; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the inset from the right.
      */
-    long RightInset;
-
-    //-------------------------------------------------------------------------
-
+    long RightInset; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the inset from the bottom.
      */
-    long BottomInset;
-
-    //-------------------------------------------------------------------------
-
+    long BottomInset; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the X-axis resolution of the device in pixel/meter.
      */
-    double PixelPerMeterX;
-
-    //-------------------------------------------------------------------------
-
+    double PixelPerMeterX; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the Y-axis resolution of the device in pixel/meter.
      */
-    double PixelPerMeterY;
-
-    //-------------------------------------------------------------------------
-
+    double PixelPerMeterY; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the color-depth of the device.
      */
-    short BitsPerPixel;
-
-    //-------------------------------------------------------------------------
-
+    short BitsPerPixel; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies special operations which are possible on the device.
 
         @see DeviceCapability
      */
-    long Capabilities;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    long Capabilities; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+
+#endif 
diff --git a/offapi/com/sun/star/awt/DialogProvider.idl b/offapi/com/sun/star/awt/DialogProvider.idl
index 863a107755d6..a3565c7972fe 100644
--- a/offapi/com/sun/star/awt/DialogProvider.idl
+++ b/offapi/com/sun/star/awt/DialogProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,11 +37,11 @@
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module awt {
 
-//=============================================================================
+//============================================================================= 
 
 /** specifies a provider for dialogs implementing the
     <type scope="com::sun::star::awt">XDialog</type> interface.
@@ -52,7 +52,7 @@ service DialogProvider : com::sun::star::awt::XDialogProvider;
     // interface com::sun::star::awt::XDialogProvider;
 // };
 
-//=============================================================================
+//============================================================================= 
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/DialogProvider2.idl b/offapi/com/sun/star/awt/DialogProvider2.idl
index be0db00bf859..3312cdf55677 100644
--- a/offapi/com/sun/star/awt/DialogProvider2.idl
+++ b/offapi/com/sun/star/awt/DialogProvider2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,18 +37,18 @@
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module awt {
 
-//=============================================================================
+//============================================================================= 
 
 /** specifies a provider for dialogs implementing the
     <type scope="com::sun::star::awt">XDialog</type> interface.
  */
 service DialogProvider2 : com::sun::star::awt::XDialogProvider2;
 
-//=============================================================================
+//============================================================================= 
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/DockingData.idl b/offapi/com/sun/star/awt/DockingData.idl
index ec470b193063..a2919f690133 100644
--- a/offapi/com/sun/star/awt/DockingData.idl
+++ b/offapi/com/sun/star/awt/DockingData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_DockingData_idl__
-#define __com_sun_star_awt_DockingData_idl__
-
+#ifndef __com_sun_star_awt_DockingData_idl__ 
+#define __com_sun_star_awt_DockingData_idl__ 
+ 
 #ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
 #endif
 
-//=============================================================================
-
-module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** data returned by docking handler
 
  */
 struct DockingData
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the position and size where the window would be placed
         if the user releases the mouse
      */
-    com::sun::star::awt::Rectangle TrackingRectangle;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Rectangle TrackingRectangle; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the window should be floating (TRUE) or docked (FALSE)
      */
-    boolean bFloating;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean bFloating; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/DockingEvent.idl b/offapi/com/sun/star/awt/DockingEvent.idl
index b6182c48ee2e..3bba6a186b10 100644
--- a/offapi/com/sun/star/awt/DockingEvent.idl
+++ b/offapi/com/sun/star/awt/DockingEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,61 +24,61 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_DockingEvent_idl__
-#define __com_sun_star_awt_DockingEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
+#ifndef __com_sun_star_awt_DockingEvent_idl__ 
+#define __com_sun_star_awt_DockingEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
 #endif
 #ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a docking event.
  */
 struct DockingEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the current tracking rectangle
      */
-    com::sun::star::awt::Rectangle TrackingRectangle;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Rectangle TrackingRectangle; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the current mouse position in frame coordinates
      */
-    com::sun::star::awt::Point MousePos;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Point MousePos; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies if the layout should be adjusted immediately
      */
-    boolean bLiveMode;
-
-    //-------------------------------------------------------------------------
-
+    boolean bLiveMode; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies if the docking procedure is interactive which means that
         the user is currently dragging the window to a new position
         if this member is <FALSE/> the window will be docked or undocked immediately
         using the returned tracking rectangle
      */
     boolean bInteractive;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/EndDockingEvent.idl b/offapi/com/sun/star/awt/EndDockingEvent.idl
index f1563bd240dd..b6dcfc00e40b 100644
--- a/offapi/com/sun/star/awt/EndDockingEvent.idl
+++ b/offapi/com/sun/star/awt/EndDockingEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_EndDockingEvent_idl__
-#define __com_sun_star_awt_EndDockingEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
+#ifndef __com_sun_star_awt_EndDockingEvent_idl__ 
+#define __com_sun_star_awt_EndDockingEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
 
 #ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies an end docking event.
  */
 struct EndDockingEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the new bounding rectangle of the window
      */
-    com::sun::star::awt::Rectangle WindowRectangle;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Rectangle WindowRectangle; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies if the window is now floating <TRUE/> or docked <FALSE/>
      */
     boolean bFloating;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the docking procedure was cancelled
      */
     boolean bCancelled;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/EndPopupModeEvent.idl b/offapi/com/sun/star/awt/EndPopupModeEvent.idl
index 637f70c56d05..6e6b78e3bcd1 100644
--- a/offapi/com/sun/star/awt/EndPopupModeEvent.idl
+++ b/offapi/com/sun/star/awt/EndPopupModeEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_EndPopupModeEvent_idl__
-#define __com_sun_star_awt_EndPopupModeEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
+#ifndef __com_sun_star_awt_EndPopupModeEvent_idl__ 
+#define __com_sun_star_awt_EndPopupModeEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
 
-#ifndef __com_sun_star_awt_Point_idl__
+#ifndef __com_sun_star_awt_Point_idl__ 
 #include <com/sun/star/awt/Point.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies an end popup mode event.
  */
 struct EndPopupModeEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies how the popup mode was ended
         <TRUE/> means the window should be teared-off and positioned at FloatingPosition
         <FALSE/> means the window was closed
      */
     boolean bTearoff;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the new position of the floating window in frame coordinates
          if bTearoff is <TRUE/>
      */
-    com::sun::star::awt::Point FloatingPosition;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::awt::Point FloatingPosition; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/EnhancedMouseEvent.idl b/offapi/com/sun/star/awt/EnhancedMouseEvent.idl
index f866397e0613..9a2af3fbeb6e 100644
--- a/offapi/com/sun/star/awt/EnhancedMouseEvent.idl
+++ b/offapi/com/sun/star/awt/EnhancedMouseEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/FieldUnit.idl b/offapi/com/sun/star/awt/FieldUnit.idl
index 14c593b5a107..a2d59579ff46 100644
--- a/offapi/com/sun/star/awt/FieldUnit.idl
+++ b/offapi/com/sun/star/awt/FieldUnit.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_FieldUnit_idl__
-#define __com_sun_star_awt_FieldUnit_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
+#ifndef __com_sun_star_awt_FieldUnit_idl__ 
+#define __com_sun_star_awt_FieldUnit_idl__ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
 
 /** specifies attributes for the MetricField map units.
 
@@ -55,9 +55,9 @@ constants FieldUnit
     const short FUNIT_PERCENT = 12;
     const short FUNIT_100TH_MM = 13;
 };
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/FocusChangeReason.idl b/offapi/com/sun/star/awt/FocusChangeReason.idl
index 32d4380b79cc..177fca7541a2 100644
--- a/offapi/com/sun/star/awt/FocusChangeReason.idl
+++ b/offapi/com/sun/star/awt/FocusChangeReason.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,70 +24,70 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_FocusChangeReason_idl__
-#define __com_sun_star_awt_FocusChangeReason_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** A combination of these values can be used to specify the reason
+#ifndef __com_sun_star_awt_FocusChangeReason_idl__ 
+#define __com_sun_star_awt_FocusChangeReason_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** A combination of these values can be used to specify the reason 
     for a focus change.
  */
 published constants FocusChangeReason
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** Focus changed because TAB was pressed.
      */
-    const long TAB = 1;
-
-    //-------------------------------------------------------------------------
-
+    const long TAB = 1; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** Focus changed because KeyLeft/Right/Up/Down was pressed.
      */
-    const long CURSOR = 2;
-
-    //-------------------------------------------------------------------------
-
+    const long CURSOR = 2; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** Focus changed because mnemonic key was pressed.
      */
-    const long MNEMONIC = 4;
-
-    //-------------------------------------------------------------------------
-
+    const long MNEMONIC = 4; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** Changed Focus to the next control.
      */
-    const long FORWARD = 16;
-
-    //-------------------------------------------------------------------------
-
+    const long FORWARD = 16; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** Changed Focus to the previous control.
      */
-    const long BACKWARD = 32;
-
-    //-------------------------------------------------------------------------
-
+    const long BACKWARD = 32; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** Changed Focus forward from last to first or backward from first to
         last.
      */
-    const long AROUND = 64;
-
-    //-------------------------------------------------------------------------
-
+    const long AROUND = 64; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** Focus changed because mnemonic key was pressed and this mnemonic is
         unique.
      */
-    const long UNIQUEMNEMONIC = 256;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    const long UNIQUEMNEMONIC = 256; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/FocusEvent.idl b/offapi/com/sun/star/awt/FocusEvent.idl
index 8671d156423e..45d1401e0ba2 100644
--- a/offapi/com/sun/star/awt/FocusEvent.idl
+++ b/offapi/com/sun/star/awt/FocusEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_FocusEvent_idl__
-#define __com_sun_star_awt_FocusEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_FocusEvent_idl__ 
+#define __com_sun_star_awt_FocusEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a keyboard focus event.
-
+            
     <p>There are two levels of focus change events: permanent and temporary.
     Permanent focus change events occur when focus is directly moved
     from one component to another, such as through calls to requestFocus()
     or as the user uses the Tab key to traverse components.
-    Temporary focus change events occur when focus is
+    Temporary focus change events occur when focus is 
     gained or lost for a component as the indirect result of another
     operation, such as window deactivation or a scrollbar drag.  In this
     case, the original focus state will automatically be restored once
@@ -59,32 +59,32 @@
     method.</p>
  */
 published struct FocusEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the reason for the focus change as an arithmetic-or
         combination of <type>FocusChangeReason</type>.
 
         @see FocusChangeReason
      */
-    short FocusFlags;
-
-    //-------------------------------------------------------------------------
-
+    short FocusFlags; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the window which gets the focus on a lose focus event.
      */
-    com::sun::star::uno::XInterface NextFocus;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::uno::XInterface NextFocus; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies if this focus change event is a temporary change.
      */
-    boolean Temporary;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean Temporary; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/FontDescriptor.idl b/offapi/com/sun/star/awt/FontDescriptor.idl
index 54107d6466d4..8911d03a99b5 100644
--- a/offapi/com/sun/star/awt/FontDescriptor.idl
+++ b/offapi/com/sun/star/awt/FontDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,167 +24,167 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#define __com_sun_star_awt_FontDescriptor_idl__
-
-#ifndef __com_sun_star_awt_FontSlant_idl__
-#include <com/sun/star/awt/FontSlant.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#define __com_sun_star_awt_FontDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_awt_FontSlant_idl__ 
+#include <com/sun/star/awt/FontSlant.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** describes the characteristics of a font.
-
+            
     <p>For example, this can be used to select a font.</p>
  */
 published struct FontDescriptor
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** specifies the exact name of the font.
      */
-    string Name;
-
-    //-------------------------------------------------------------------------
-
+    string Name; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the height of the font in the measure of the
         destination.
      */
-    short Height;
-
-    //-------------------------------------------------------------------------
-
+    short Height; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the width of the font in the measure of the
         destination.
      */
-    short Width;
-
-    //-------------------------------------------------------------------------
-
+    short Width; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the style name of the font.
      */
-    string StyleName;
-
-    //-------------------------------------------------------------------------
-
+    string StyleName; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the general style of the font.
-
+                        
         <p>Use one value out of the constant group
         <type scope="com::sun::star::awt">FontFamily</type>.</p>
      */
-    short Family;
-
-    //-------------------------------------------------------------------------
-
+    short Family; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the character set which is supported by the font.
-
-        <p>Use one value out of the constant group
+        
+        <p>Use one value out of the constant group 
         <type scope="com::sun::star::awt">CharSet</type>.</p>
      */
-    short CharSet;
-
-    //-------------------------------------------------------------------------
-
+    short CharSet; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the pitch of the font.
-
-        <p>Use one value out of the constant group
+        
+        <p>Use one value out of the constant group 
         <type scope="com::sun::star::awt">FontPitch</type>.</p>
      */
-    short Pitch;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the character width.
-
+    short Pitch; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the character width. 
+                        
         <p>Depending on the specified width, a font that supports this
         width may be selected.</p>
-
+        
         <p>The value is expressed as a percentage.</p>
      */
-    float CharacterWidth;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the thickness of the line.
-
+    float CharacterWidth; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the thickness of the line. 
+                        
         <p>Depending on the specified weight, a font that supports this
         thickness may be selected.</p>
-
+        
         <p>The value is expressed as a percentage.</p>
      */
-    float Weight;
-
-    //-------------------------------------------------------------------------
-
+    float Weight; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the slant of the font.
      */
-    com::sun::star::awt::FontSlant Slant;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::FontSlant Slant; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the kind of underlining.
-
+        
         <p>Use one value out of the constant group
         <type scope="com::sun::star::awt">FontUnderline</type>.</p>
      */
-    short Underline;
-
-    //-------------------------------------------------------------------------
-
+    short Underline; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the kind of strikeout.
 
         <p>Use one value out of the constant group
         <type scope="com::sun::star::awt">FontStrikeout</type>.</p>
      */
-    short Strikeout;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the rotation of the font.
-
+    short Strikeout; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the rotation of the font. 
+                        
         <p>The unit of measure is degrees; 0 is the baseline.</p>
      */
-    float Orientation;
-
-    //-------------------------------------------------------------------------
-
+    float Orientation; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** For requesting, it specifies if there is a kerning table available.
         For selecting, it specifies if the kerning table is to be used.
      */
-    boolean Kerning;
-
-    //-------------------------------------------------------------------------
-
+    boolean Kerning; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies if only words get underlined.
-
+                        
         <p><TRUE/> means that only non-space characters get underlined,
         <FALSE/> means that the spacing also gets underlined.</p>
-
+        
         <p>This property is only valid if the property
         <member scope="com::sun::star::awt">FontDescriptor::Underline</member>
         is not <const>FontUnderline::NONE</const>.</p>
      */
-    boolean WordLineMode;
-
-    //-------------------------------------------------------------------------
-
+    boolean WordLineMode; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the technology of the font representation.
-
+                        
         <p>One or more values out of the constant group
         <type scope="com::sun::star::awt">FontType</type> can be combined by
         an arithmetical or-operation.</p>
      */
-    short Type;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    short Type; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/FontEmphasisMark.idl b/offapi/com/sun/star/awt/FontEmphasisMark.idl
index 8e13cb8ca4a6..aaaf051e4a91 100644
--- a/offapi/com/sun/star/awt/FontEmphasisMark.idl
+++ b/offapi/com/sun/star/awt/FontEmphasisMark.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,70 +25,70 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_awt_FontEmphasisMark_idl__
-#define __com_sun_star_awt_FontEmphasisMark_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** These values are used to specify the kind of emphasis mark.
-
+#ifndef __com_sun_star_awt_FontEmphasisMark_idl__ 
+#define __com_sun_star_awt_FontEmphasisMark_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** These values are used to specify the kind of emphasis mark. 
+         
     <p>They may be expanded in future versions.</p>
  */
 published constants FontEmphasisMark
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies no emphasis mark.
      */
-    const short NONE = 0x0000;
-
-    //-------------------------------------------------------------------------
+    const short NONE = 0x0000; 
 
+    //------------------------------------------------------------------------- 
+        
     /** specifies emphasis mark dot.
      */
-    const short DOT = 0x0001;
-
-    //-------------------------------------------------------------------------
-
+    const short DOT = 0x0001; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies emphasis mark circle.
      */
-    const short CIRCLE = 0x0002;
-
-    //-------------------------------------------------------------------------
-
+    const short CIRCLE = 0x0002; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies emphasis mark disc.
      */
-    const short DISC = 0x0003;
-
-    //-------------------------------------------------------------------------
-
+    const short DISC = 0x0003; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies emphasis mark accent.
      */
-    const short ACCENT = 0x0004;
-
-    //-------------------------------------------------------------------------
+    const short ACCENT = 0x0004; 
 
+    //------------------------------------------------------------------------- 
+        
     /** specifies that the emphasis mark should be positioned above the
         characters.
      */
-    const short ABOVE = 0x1000;
-
-    //-------------------------------------------------------------------------
+    const short ABOVE = 0x1000; 
 
+    //------------------------------------------------------------------------- 
+        
     /** specifies that the emphasis mark should be positioned below the
         characters.
      */
     const short BELOW = 0x2000;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/FontFamily.idl b/offapi/com/sun/star/awt/FontFamily.idl
index 2f16e8fe08a7..de64ee238321 100644
--- a/offapi/com/sun/star/awt/FontFamily.idl
+++ b/offapi/com/sun/star/awt/FontFamily.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,68 +24,68 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_FontFamily_idl__
-#define __com_sun_star_awt_FontFamily_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** These values are used to specify the general kind of font.
-
+#ifndef __com_sun_star_awt_FontFamily_idl__ 
+#define __com_sun_star_awt_FontFamily_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** These values are used to specify the general kind of font. 
+         
     <p>They may be expanded in future versions.</p>
  */
 published constants FontFamily
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies an unknown font family.
      */
-    const short DONTKNOW = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short DONTKNOW = 0; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the family of decorative fonts.
      */
-    const short DECORATIVE = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short DECORATIVE = 1; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the family of modern fonts.
      */
-    const short MODERN = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short MODERN = 2; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the family roman fonts (with serifs).
      */
-    const short ROMAN = 3;
-
-    //-------------------------------------------------------------------------
-
+    const short ROMAN = 3; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the family of script fonts.
      */
-    const short SCRIPT = 4;
-
-    //-------------------------------------------------------------------------
-
+    const short SCRIPT = 4; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the family roman fonts (without serifs).
      */
-    const short SWISS = 5;
-
-    //-------------------------------------------------------------------------
-
+    const short SWISS = 5; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the family system fonts.
      */
-    const short SYSTEM = 6;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short SYSTEM = 6; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/FontPitch.idl b/offapi/com/sun/star/awt/FontPitch.idl
index 07554160f0c7..5178f82ce288 100644
--- a/offapi/com/sun/star/awt/FontPitch.idl
+++ b/offapi/com/sun/star/awt/FontPitch.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_FontPitch_idl__
-#define __com_sun_star_awt_FontPitch_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** These values are used to specify whether the width of a character is
-    fixed or variable.
-
+#ifndef __com_sun_star_awt_FontPitch_idl__ 
+#define __com_sun_star_awt_FontPitch_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** These values are used to specify whether the width of a character is 
+    fixed or variable. 
+         
     <p>They may be expanded in future versions.</p>
  */
 published constants FontPitch
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies that the pitch for this font is unknown.
      */
-    const short DONTKNOW = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short DONTKNOW = 0; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a font with a fixed character width.
      */
-    const short FIXED = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short FIXED = 1; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a font with a variable character width.
      */
-    const short VARIABLE = 2;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short VARIABLE = 2; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/FontRelief.idl b/offapi/com/sun/star/awt/FontRelief.idl
index d737ef76ec32..b37046cb55e5 100644
--- a/offapi/com/sun/star/awt/FontRelief.idl
+++ b/offapi/com/sun/star/awt/FontRelief.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_FontRelief_idl__
-#define __com_sun_star_awt_FontRelief_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** These values are used to specify the kind of relief.
-
+#ifndef __com_sun_star_awt_FontRelief_idl__ 
+#define __com_sun_star_awt_FontRelief_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** These values are used to specify the kind of relief. 
+         
     <p>They may be expanded in future versions.</p>
  */
 
 published constants FontRelief
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies no relief.
      */
-    const short NONE = 0;
-
-    //-------------------------------------------------------------------------
+    const short NONE = 0; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies no embossed.
-     */
-    const short EMBOSSED = 1;
-
-    //-------------------------------------------------------------------------
+     */	
+    const short EMBOSSED = 1; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies no engraved.
      */
     const short ENGRAVED = 2;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/FontSlant.idl b/offapi/com/sun/star/awt/FontSlant.idl
index 35496caaf754..c148bfb847ab 100644
--- a/offapi/com/sun/star/awt/FontSlant.idl
+++ b/offapi/com/sun/star/awt/FontSlant.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_FontSlant_idl__
-#define __com_sun_star_awt_FontSlant_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_FontSlant_idl__ 
+#define __com_sun_star_awt_FontSlant_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** used to specify the slant of a font.
  */
 published enum FontSlant
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a font without slant.
      */
-    NONE,
-
-    //-------------------------------------------------------------------------
-
+    NONE, 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies an oblique font (slant not designed into the font).
      */
-    OBLIQUE,
-
-    //-------------------------------------------------------------------------
-
+    OBLIQUE, 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies an italic font (slant designed into the font).
      */
-    ITALIC,
-
-    //-------------------------------------------------------------------------
-
+    ITALIC, 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** specifies a font with an unknown slant.
      */
-    DONTKNOW,
-
-    //-------------------------------------------------------------------------
-
+    DONTKNOW, 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a reverse oblique font (slant not designed into the font).
      */
-    REVERSE_OBLIQUE,
-
-    //-------------------------------------------------------------------------
-
+    REVERSE_OBLIQUE, 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a reverse italic font (slant designed into the font).
      */
-    REVERSE_ITALIC
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    REVERSE_ITALIC 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/FontStrikeout.idl b/offapi/com/sun/star/awt/FontStrikeout.idl
index d9b7a5df1b53..5f59e910820d 100644
--- a/offapi/com/sun/star/awt/FontStrikeout.idl
+++ b/offapi/com/sun/star/awt/FontStrikeout.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,68 +24,68 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_FontStrikeout_idl__
-#define __com_sun_star_awt_FontStrikeout_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** These values are used to specify the kind of strikeout.
-
+#ifndef __com_sun_star_awt_FontStrikeout_idl__ 
+#define __com_sun_star_awt_FontStrikeout_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** These values are used to specify the kind of strikeout. 
+         
     <p>They may be expanded in future versions.</p>
  */
 published constants FontStrikeout
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies not to strike out the characters.
      */
-    const short NONE = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short NONE = 0; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies to strike out the characters with a single line.
      */
-    const short SINGLE = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short SINGLE = 1; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies to strike out the characters with a double line.
      */
-    const short DOUBLE = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short DOUBLE = 2; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** The strikeout mode is not specified.
      */
-    const short DONTKNOW = 3;
-
-    //-------------------------------------------------------------------------
-
+    const short DONTKNOW = 3; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies to strike out the characters with a bold line.
      */
-    const short BOLD = 4;
-
-    //-------------------------------------------------------------------------
-
+    const short BOLD = 4; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies to strike out the characters with slashes.
      */
-    const short SLASH = 5;
-
-    //-------------------------------------------------------------------------
-
+    const short SLASH = 5; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies to strike out the characters with X's.
      */
-    const short X = 6;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short X = 6; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/FontType.idl b/offapi/com/sun/star/awt/FontType.idl
index 2474976d33e1..31522a0c46b3 100644
--- a/offapi/com/sun/star/awt/FontType.idl
+++ b/offapi/com/sun/star/awt/FontType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_FontType_idl__
-#define __com_sun_star_awt_FontType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** These values are used to specify the technology of the font representation.
-
+#ifndef __com_sun_star_awt_FontType_idl__ 
+#define __com_sun_star_awt_FontType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** These values are used to specify the technology of the font representation. 
+         
     <p>They may be expanded in future versions.</p>
  */
 published constants FontType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** The type of the font is not known.
      */
-    const short DONTKNOW = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short DONTKNOW = 0; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a raster font.
      */
-    const short RASTER = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short RASTER = 1; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a device font.
      */
-    const short DEVICE = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short DEVICE = 2; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a scalable font.
      */
-    const short SCALABLE = 4;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short SCALABLE = 4; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/FontUnderline.idl b/offapi/com/sun/star/awt/FontUnderline.idl
index 4065e347029d..edfca7b25434 100644
--- a/offapi/com/sun/star/awt/FontUnderline.idl
+++ b/offapi/com/sun/star/awt/FontUnderline.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,140 +24,140 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_FontUnderline_idl__
-#define __com_sun_star_awt_FontUnderline_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** These values are used to specify the kind of underlining.
-
+#ifndef __com_sun_star_awt_FontUnderline_idl__ 
+#define __com_sun_star_awt_FontUnderline_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** These values are used to specify the kind of underlining. 
+         
     <p>They may be expanded in future versions.</p>
  */
 published constants FontUnderline
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies no underlining.
      */
-    const short NONE = 0;
-
-    //-------------------------------------------------------------------------
+    const short NONE = 0; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies underlining with a single line.
-     */
-    const short SINGLE = 1;
-
-    //-------------------------------------------------------------------------
+     */	
+    const short SINGLE = 1; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies underlining with a double line.
-     */
-    const short DOUBLE = 2;
-
-    //-------------------------------------------------------------------------
+     */	
+    const short DOUBLE = 2; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies underlining with a dotted line.
-     */
-    const short DOTTED = 3;
-
-    //-------------------------------------------------------------------------
-
+     */	
+    const short DOTTED = 3; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** The kind of underlining is not known.
      */
-    const short DONTKNOW = 4;
-
-    //-------------------------------------------------------------------------
+    const short DONTKNOW = 4; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies underlining with a dashed line.
-     */
-    const short DASH = 5;
-
-    //-------------------------------------------------------------------------
+     */	
+    const short DASH = 5; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies underlining with long dashes.
-     */
-    const short LONGDASH = 6;
-
-    //-------------------------------------------------------------------------
+     */	
+    const short LONGDASH = 6; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies underlining with a dash and dot sequence.
-     */
-    const short DASHDOT = 7;
-
-    //-------------------------------------------------------------------------
+     */	
+    const short DASHDOT = 7; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies underlining with a dash, dot, dot sequence.
-     */
-    const short DASHDOTDOT = 8;
-
-    //-------------------------------------------------------------------------
+     */	
+    const short DASHDOTDOT = 8; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies underlining with a small wave.
-     */
-    const short SMALLWAVE = 9;
-
-    //-------------------------------------------------------------------------
+     */	
+    const short SMALLWAVE = 9; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies underlining with a wave.
-     */
-    const short WAVE = 10;
-
-    //-------------------------------------------------------------------------
+     */	
+    const short WAVE = 10; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies underlining with a double wave.
-     */
-    const short DOUBLEWAVE = 11;
-
-    //-------------------------------------------------------------------------
+     */	
+    const short DOUBLEWAVE = 11; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies underlining with a bold line.
-     */
-    const short BOLD = 12;
-
-    //-------------------------------------------------------------------------
+     */	
+    const short BOLD = 12; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies underlining with bold dots.
-     */
-    const short BOLDDOTTED = 13;
-
-    //-------------------------------------------------------------------------
+     */	
+    const short BOLDDOTTED = 13; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies underlining with bold dashes.
-     */
-    const short BOLDDASH = 14;
-
-    //-------------------------------------------------------------------------
+     */	
+    const short BOLDDASH = 14; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies underlining with long bold dashes.
-     */
-    const short BOLDLONGDASH = 15;
-
-    //-------------------------------------------------------------------------
+     */	
+    const short BOLDLONGDASH = 15; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies underlining with a dash and dot sequence in bold.
-     */
-    const short BOLDDASHDOT = 16;
-
-    //-------------------------------------------------------------------------
+     */	
+    const short BOLDDASHDOT = 16; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies underlining with a dash, dot, dot sequence in bold.
-     */
-    const short BOLDDASHDOTDOT = 17;
-
-    //-------------------------------------------------------------------------
+     */	
+    const short BOLDDASHDOTDOT = 17; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies underlining with a bold wave.
-     */
-    const short BOLDWAVE = 18;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+     */	
+    const short BOLDWAVE = 18; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/FontWeight.idl b/offapi/com/sun/star/awt/FontWeight.idl
index f70891022cbf..43dfac66f52a 100644
--- a/offapi/com/sun/star/awt/FontWeight.idl
+++ b/offapi/com/sun/star/awt/FontWeight.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,86 +24,86 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_FontWeight_idl__
-#define __com_sun_star_awt_FontWeight_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** These values are used to specify whether a font is thin or bold.
-
+#ifndef __com_sun_star_awt_FontWeight_idl__ 
+#define __com_sun_star_awt_FontWeight_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** These values are used to specify whether a font is thin or bold. 
+         
     <p>They may be expanded in future versions.</p>
  */
 published constants FontWeight
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** The font weight is not specified/known.
-     */
-    const float DONTKNOW = 0.000000;
-
-    //-------------------------------------------------------------------------
+     */	
+    const float DONTKNOW = 0.000000; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies a 50% font weight.
-     */
-    const float THIN = 50.000000;
-
-    //-------------------------------------------------------------------------
+     */	
+    const float THIN = 50.000000; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies a 60% font weight.
-     */
-    const float ULTRALIGHT = 60.000000;
-
-    //-------------------------------------------------------------------------
+     */	
+    const float ULTRALIGHT = 60.000000; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies a 75% font weight.
-     */
-    const float LIGHT = 75.000000;
-
-    //-------------------------------------------------------------------------
+     */	
+    const float LIGHT = 75.000000; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies a 90% font weight.
-     */
-    const float SEMILIGHT = 90.000000;
-
-    //-------------------------------------------------------------------------
+     */	
+    const float SEMILIGHT = 90.000000; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies a normal font weight.
-     */
-    const float NORMAL = 100.000000;
-
-    //-------------------------------------------------------------------------
+     */	
+    const float NORMAL = 100.000000; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies a 110% font weight.
-     */
-    const float SEMIBOLD = 110.000000;
-
-    //-------------------------------------------------------------------------
+     */	
+    const float SEMIBOLD = 110.000000; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies a 150% font weight.
-     */
-    const float BOLD = 150.000000;
-
-    //-------------------------------------------------------------------------
+     */	
+    const float BOLD = 150.000000; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies a 175% font weight.
-     */
-    const float ULTRABOLD = 175.000000;
-
-    //-------------------------------------------------------------------------
+     */	
+    const float ULTRABOLD = 175.000000; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies a 200% font weight.
-     */
-    const float BLACK = 200.000000;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+     */	
+    const float BLACK = 200.000000; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/FontWidth.idl b/offapi/com/sun/star/awt/FontWidth.idl
index c36d70519c03..5882f81552c5 100644
--- a/offapi/com/sun/star/awt/FontWidth.idl
+++ b/offapi/com/sun/star/awt/FontWidth.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,86 +24,86 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_FontWidth_idl__
-#define __com_sun_star_awt_FontWidth_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** These values are used to specify the width of the characters of a font.
-
+#ifndef __com_sun_star_awt_FontWidth_idl__ 
+#define __com_sun_star_awt_FontWidth_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** These values are used to specify the width of the characters of a font. 
+         
     <p>They may be expanded in future versions.</p>
  */
 published constants FontWidth
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** The width of the font is not specified/known.
      */
-    const float DONTKNOW = 0.000000;
-
-    //-------------------------------------------------------------------------
-
+    const float DONTKNOW = 0.000000; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** The width of the font is condensed to 50%.
      */
-    const float ULTRACONDENSED = 50.000000;
-
-    //-------------------------------------------------------------------------
-
+    const float ULTRACONDENSED = 50.000000; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** The width of the font is condensed to 60%.
      */
-    const float EXTRACONDENSED = 60.000000;
-
-    //-------------------------------------------------------------------------
-
+    const float EXTRACONDENSED = 60.000000; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** The width of the font is condensed to 75%.
      */
-    const float CONDENSED = 75.000000;
-
-    //-------------------------------------------------------------------------
-
+    const float CONDENSED = 75.000000; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** The width of the font is condensed to 90%.
      */
-    const float SEMICONDENSED = 90.000000;
-
-    //-------------------------------------------------------------------------
-
+    const float SEMICONDENSED = 90.000000; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** The width of the font is normal.
      */
-    const float NORMAL = 100.000000;
-
-    //-------------------------------------------------------------------------
-
+    const float NORMAL = 100.000000; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** The width of the font is expanded to 110%.
      */
-    const float SEMIEXPANDED = 110.000000;
-
-    //-------------------------------------------------------------------------
-
+    const float SEMIEXPANDED = 110.000000; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** The width of the font is expanded to 150%.
      */
-    const float EXPANDED = 150.000000;
-
-    //-------------------------------------------------------------------------
-
+    const float EXPANDED = 150.000000; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** The width of the font is expanded to 175%.
      */
-    const float EXTRAEXPANDED = 175.000000;
-
-    //-------------------------------------------------------------------------
-
+    const float EXTRAEXPANDED = 175.000000; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** The width of the font is expanded to 200%.
      */
-    const float ULTRAEXPANDED = 200.000000;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const float ULTRAEXPANDED = 200.000000; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/Gradient.idl b/offapi/com/sun/star/awt/Gradient.idl
index 9774bc655d2a..af50dc9b656e 100644
--- a/offapi/com/sun/star/awt/Gradient.idl
+++ b/offapi/com/sun/star/awt/Gradient.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,92 +24,92 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_Gradient_idl__
-#define __com_sun_star_awt_Gradient_idl__
-
-#ifndef __com_sun_star_awt_GradientStyle_idl__
-#include <com/sun/star/awt/GradientStyle.idl>
-#endif
-
+#ifndef __com_sun_star_awt_Gradient_idl__ 
+#define __com_sun_star_awt_Gradient_idl__ 
+ 
+#ifndef __com_sun_star_awt_GradientStyle_idl__ 
+#include <com/sun/star/awt/GradientStyle.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** describes a color dispersion within an area.
  */
 published struct Gradient
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** specifies the style of the gradient.
      */
-    com::sun::star::awt::GradientStyle Style;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::GradientStyle Style; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the color at the start point of the gradient.
      */
-    com::sun::star::util::Color StartColor;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::util::Color StartColor; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the color at the end point of the gradient.
      */
-    com::sun::star::util::Color EndColor;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::util::Color EndColor; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** angle of the gradient in 1/10 degree.
      */
-    short Angle;
-
-    //-------------------------------------------------------------------------
-
+    short Angle; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** per cent of the total width where just the start color is used.
      */
-    short Border;
-
-    //-------------------------------------------------------------------------
-
+    short Border; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** specifies the X-coordinate, where the gradient begins.
      */
-    short XOffset;
-
-    //-------------------------------------------------------------------------
-
+    short XOffset; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** specifies the Y-coordinate, where the gradient begins.
      */
-    short YOffset;
-
-    //-------------------------------------------------------------------------
-
+    short YOffset; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the intensity at the start point of the gradient.
      */
-    short StartIntensity;
-
-    //-------------------------------------------------------------------------
-
+    short StartIntensity; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the intensity at the end point of the gradient.
      */
-    short EndIntensity;
-
-    //-------------------------------------------------------------------------
-
+    short EndIntensity; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the number of steps of change color.
      */
-    short StepCount;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    short StepCount; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/GradientStyle.idl b/offapi/com/sun/star/awt/GradientStyle.idl
index 273dcbca28f9..f57b859f90d5 100644
--- a/offapi/com/sun/star/awt/GradientStyle.idl
+++ b/offapi/com/sun/star/awt/GradientStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_GradientStyle_idl__
-#define __com_sun_star_awt_GradientStyle_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_GradientStyle_idl__ 
+#define __com_sun_star_awt_GradientStyle_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specify the style of color dispersion.
  */
 published enum GradientStyle
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a linear gradient.
      */
-    LINEAR,
-
-    //-------------------------------------------------------------------------
-
+    LINEAR, 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies an axial gradient.
      */
-    AXIAL,
-
-    //-------------------------------------------------------------------------
-
+    AXIAL, 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a radial gradient.
      */
-    RADIAL,
-
-    //-------------------------------------------------------------------------
-
+    RADIAL, 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies an elliptical gradient.
      */
-    ELLIPTICAL,
-
-    //-------------------------------------------------------------------------
-
+    ELLIPTICAL, 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a gradient in the shape of a square.
      */
-    SQUARE,
-
-    //-------------------------------------------------------------------------
-
+    SQUARE, 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a gradient in the shape of a rectangle.
      */
-    RECT
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    RECT 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/ImageAlign.idl b/offapi/com/sun/star/awt/ImageAlign.idl
index aa61e7d22228..5a0a24326c47 100644
--- a/offapi/com/sun/star/awt/ImageAlign.idl
+++ b/offapi/com/sun/star/awt/ImageAlign.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_ImageAlign_idl__
-#define __com_sun_star_awt_ImageAlign_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_ImageAlign_idl__ 
+#define __com_sun_star_awt_ImageAlign_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the alignment of an image.
  */
 published constants ImageAlign
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies to align left.
      */
-    const short LEFT = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short LEFT = 0; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies to align top.
      */
-    const short TOP = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short TOP = 1; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies to align right.
      */
-    const short RIGHT = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short RIGHT = 2; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies to align bottom.
      */
     const short BOTTOM = 3;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/ImagePosition.idl b/offapi/com/sun/star/awt/ImagePosition.idl
index b19c796c22b0..e358cb063a2a 100644
--- a/offapi/com/sun/star/awt/ImagePosition.idl
+++ b/offapi/com/sun/star/awt/ImagePosition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/ImageScaleMode.idl b/offapi/com/sun/star/awt/ImageScaleMode.idl
index aeefc4f61c91..ec6fe27b0a0e 100644
--- a/offapi/com/sun/star/awt/ImageScaleMode.idl
+++ b/offapi/com/sun/star/awt/ImageScaleMode.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module awt {
+module com { module sun { module star { module awt { 
 
 //=============================================================================
 
@@ -55,7 +55,7 @@ constants ImageScaleMode
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/ImageStatus.idl b/offapi/com/sun/star/awt/ImageStatus.idl
index efeeff806e39..5067a0aa7485 100644
--- a/offapi/com/sun/star/awt/ImageStatus.idl
+++ b/offapi/com/sun/star/awt/ImageStatus.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_ImageStatus_idl__
-#define __com_sun_star_awt_ImageStatus_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_ImageStatus_idl__ 
+#define __com_sun_star_awt_ImageStatus_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** These values are used to specify to which degree an image is available.
  */
 published constants ImageStatus
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** This conveys that an error was encountered while producing the image.
      */
-    const long IMAGESTATUS_ERROR = 1;
-
-    //-------------------------------------------------------------------------
-
-    /** This conveys that one frame of the image is complete but there are more
+    const long IMAGESTATUS_ERROR = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** This conveys that one frame of the image is complete but there are more 
         frames to be delivered.
      */
-    const long IMAGESTATUS_SINGLEFRAMEDONE = 2;
-
-    //-------------------------------------------------------------------------
-
-    /** This conveys that the image is complete and there are no more pixels or
+    const long IMAGESTATUS_SINGLEFRAMEDONE = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** This conveys that the image is complete and there are no more pixels or 
         frames to be delivered.
      */
-    const long IMAGESTATUS_STATICIMAGEDONE = 3;
-
-    //-------------------------------------------------------------------------
-
+    const long IMAGESTATUS_STATICIMAGEDONE = 3; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This conveys that the image creation process was deliberately aborted.
      */
-    const long IMAGESTATUS_ABORTED = 4;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const long IMAGESTATUS_ABORTED = 4; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/InputEvent.idl b/offapi/com/sun/star/awt/InputEvent.idl
index 478dc622fcb2..1383cb5d3268 100644
--- a/offapi/com/sun/star/awt/InputEvent.idl
+++ b/offapi/com/sun/star/awt/InputEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_InputEvent_idl__
-#define __com_sun_star_awt_InputEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_InputEvent_idl__ 
+#define __com_sun_star_awt_InputEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** the root event class for all component-level input events.
-
+            
     <p>Input events are delivered to listeners before they are
     processed normally by the source where they originated.</p>
 
     @see WindowEvent
  */
 published struct InputEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
-    /** contains the modifier keys which were pressed while the event occurred.
-
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** contains the modifier keys which were pressed while the event occurred. 
+                        
         <p>Zero or more constants from the
         <type scope="com::sun::star::awt">KeyModifier</type> group.</p>
      */
-    short Modifiers;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    short Modifiers; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/InvalidateStyle.idl b/offapi/com/sun/star/awt/InvalidateStyle.idl
index 74ef3a1e4df0..054be43bb95d 100644
--- a/offapi/com/sun/star/awt/InvalidateStyle.idl
+++ b/offapi/com/sun/star/awt/InvalidateStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,66 +24,66 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_InvalidateStyle_idl__
-#define __com_sun_star_awt_InvalidateStyle_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_InvalidateStyle_idl__ 
+#define __com_sun_star_awt_InvalidateStyle_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies how to invalidate windows.
  */
 published constants InvalidateStyle
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** The child windows are invalidated, too.
      */
-    const short CHILDREN = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short CHILDREN = 1; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** The child windows are not invalidated.
      */
-    const short NOCHILDREN = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short NOCHILDREN = 2; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** The invalidated area is painted with the background color/pattern.
      */
-    const short NOERASE = 4;
-
-    //-------------------------------------------------------------------------
-
+    const short NOERASE = 4; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** The invalidated area is updated immediately.
      */
-    const short UPDATE = 8;
-
-    //-------------------------------------------------------------------------
-
+    const short UPDATE = 8; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** The parent window is invalidated, too.
      */
-    const short TRANSPARENT = 16;
-
-    //-------------------------------------------------------------------------
+    const short TRANSPARENT = 16; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** The parent window is not invalidated.
      */
-    const short NOTRANSPARENT = 32;
-
-    //-------------------------------------------------------------------------
-
+    const short NOTRANSPARENT = 32; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** The area is invalidated regardless of overlapping child windows.
      */
-    const short NOCLIPCHILDREN = 16384;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short NOCLIPCHILDREN = 16384; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/ItemEvent.idl b/offapi/com/sun/star/awt/ItemEvent.idl
index 3b5a07765d81..603dc26994d2 100644
--- a/offapi/com/sun/star/awt/ItemEvent.idl
+++ b/offapi/com/sun/star/awt/ItemEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_ItemEvent_idl__
-#define __com_sun_star_awt_ItemEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_ItemEvent_idl__ 
+#define __com_sun_star_awt_ItemEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies an event occurred to an item of a menu, a list box etc.
  */
 published struct ItemEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies which item is newly selected.
      */
-    long Selected;
-
-    //-------------------------------------------------------------------------
-
+    long Selected; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies which item is newly highlighted.
      */
-    long Highlighted;
-
-    //-------------------------------------------------------------------------
-
+    long Highlighted; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the id of the item.
      */
-    long ItemId;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    long ItemId; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/Key.idl b/offapi/com/sun/star/awt/Key.idl
index e8b8962444d5..7b0e31913706 100644
--- a/offapi/com/sun/star/awt/Key.idl
+++ b/offapi/com/sun/star/awt/Key.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,425 +24,425 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_Key_idl__
-#define __com_sun_star_awt_Key_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_Key_idl__ 
+#define __com_sun_star_awt_Key_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** These values are used to specifies distinct physical keys.
  */
 published constants Key
-{
-    //-------------------------------------------------------------------------
-
-    const short NUM0 = 256;
-
-    //-------------------------------------------------------------------------
-
-    const short NUM1 = 257;
-
-    //-------------------------------------------------------------------------
-
-    const short NUM2 = 258;
-
-    //-------------------------------------------------------------------------
-
-    const short NUM3 = 259;
-
-    //-------------------------------------------------------------------------
-
-    const short NUM4 = 260;
-
-    //-------------------------------------------------------------------------
-
-    const short NUM5 = 261;
-
-    //-------------------------------------------------------------------------
-
-    const short NUM6 = 262;
-
-    //-------------------------------------------------------------------------
-
-    const short NUM7 = 263;
-
-    //-------------------------------------------------------------------------
-
-    const short NUM8 = 264;
-
-    //-------------------------------------------------------------------------
-
-    const short NUM9 = 265;
-
-    //-------------------------------------------------------------------------
-
-    const short A = 512;
-
-    //-------------------------------------------------------------------------
-
-    const short B = 513;
-
-    //-------------------------------------------------------------------------
-
-    const short C = 514;
-
-    //-------------------------------------------------------------------------
-
-    const short D = 515;
-
-    //-------------------------------------------------------------------------
-
-    const short E = 516;
-
-    //-------------------------------------------------------------------------
-
-    const short F = 517;
-
-    //-------------------------------------------------------------------------
-
-    const short G = 518;
-
-    //-------------------------------------------------------------------------
-
-    const short H = 519;
-
-    //-------------------------------------------------------------------------
-
-    const short I = 520;
-
-    //-------------------------------------------------------------------------
-
-    const short J = 521;
-
-    //-------------------------------------------------------------------------
-
-    const short K = 522;
-
-    //-------------------------------------------------------------------------
-
-    const short L = 523;
-
-    //-------------------------------------------------------------------------
-
-    const short M = 524;
-
-    //-------------------------------------------------------------------------
-
-    const short N = 525;
-
-    //-------------------------------------------------------------------------
-
-    const short O = 526;
-
-    //-------------------------------------------------------------------------
-
-    const short P = 527;
-
-    //-------------------------------------------------------------------------
-
-    const short Q = 528;
-
-    //-------------------------------------------------------------------------
-
-    const short R = 529;
-
-    //-------------------------------------------------------------------------
-
-    const short S = 530;
-
-    //-------------------------------------------------------------------------
-
-    const short T = 531;
-
-    //-------------------------------------------------------------------------
-
-    const short U = 532;
-
-    //-------------------------------------------------------------------------
-
-    const short V = 533;
-
-    //-------------------------------------------------------------------------
-
-    const short W = 534;
-
-    //-------------------------------------------------------------------------
-
-    const short X = 535;
-
-    //-------------------------------------------------------------------------
-
-    const short Y = 536;
-
-    //-------------------------------------------------------------------------
-
-    const short Z = 537;
-
-    //-------------------------------------------------------------------------
-
-    const short F1 = 768;
-
-    //-------------------------------------------------------------------------
-
-    const short F2 = 769;
-
-    //-------------------------------------------------------------------------
-
-    const short F3 = 770;
-
-    //-------------------------------------------------------------------------
-
-    const short F4 = 771;
-
-    //-------------------------------------------------------------------------
-
-    const short F5 = 772;
-
-    //-------------------------------------------------------------------------
-
-    const short F6 = 773;
-
-    //-------------------------------------------------------------------------
-
-    const short F7 = 774;
-
-    //-------------------------------------------------------------------------
-
-    const short F8 = 775;
-
-    //-------------------------------------------------------------------------
-
-    const short F9 = 776;
-
-    //-------------------------------------------------------------------------
-
-    const short F10 = 777;
-
-    //-------------------------------------------------------------------------
-
-    const short F11 = 778;
-
-    //-------------------------------------------------------------------------
-
-    const short F12 = 779;
-
-    //-------------------------------------------------------------------------
-
-    const short F13 = 780;
-
-    //-------------------------------------------------------------------------
-
-    const short F14 = 781;
-
-    //-------------------------------------------------------------------------
-
-    const short F15 = 782;
-
-    //-------------------------------------------------------------------------
-
-    const short F16 = 783;
-
-    //-------------------------------------------------------------------------
-
-    const short F17 = 784;
-
-    //-------------------------------------------------------------------------
-
-    const short F18 = 785;
-
-    //-------------------------------------------------------------------------
-
-    const short F19 = 786;
-
-    //-------------------------------------------------------------------------
-
-    const short F20 = 787;
-
-    //-------------------------------------------------------------------------
-
-    const short F21 = 788;
-
-    //-------------------------------------------------------------------------
-
-    const short F22 = 789;
-
-    //-------------------------------------------------------------------------
-
-    const short F23 = 790;
-
-    //-------------------------------------------------------------------------
-
-    const short F24 = 791;
-
-    //-------------------------------------------------------------------------
-
-    const short F25 = 792;
-
-    //-------------------------------------------------------------------------
-
-    const short F26 = 793;
-
-    //-------------------------------------------------------------------------
-
-    const short DOWN = 1024;
-
-    //-------------------------------------------------------------------------
-
-    const short UP = 1025;
-
-    //-------------------------------------------------------------------------
-
-    const short LEFT = 1026;
-
-    //-------------------------------------------------------------------------
-
-    const short RIGHT = 1027;
-
-    //-------------------------------------------------------------------------
-
-    const short HOME = 1028;
-
-    //-------------------------------------------------------------------------
-
-    const short END = 1029;
-
-    //-------------------------------------------------------------------------
-
-    const short PAGEUP = 1030;
-
-    //-------------------------------------------------------------------------
-
-    const short PAGEDOWN = 1031;
-
-    //-------------------------------------------------------------------------
-
-    const short RETURN = 1280;
-
-    //-------------------------------------------------------------------------
-
-    const short ESCAPE = 1281;
-
-    //-------------------------------------------------------------------------
-
-    const short TAB = 1282;
-
-    //-------------------------------------------------------------------------
-
-    const short BACKSPACE = 1283;
-
-    //-------------------------------------------------------------------------
-
-    const short SPACE = 1284;
-
-    //-------------------------------------------------------------------------
-
-    const short INSERT = 1285;
-
-    //-------------------------------------------------------------------------
-
-    const short DELETE = 1286;
-
-    //-------------------------------------------------------------------------
-
-    const short ADD = 1287;
-
-    //-------------------------------------------------------------------------
-
-    const short SUBTRACT = 1288;
-
-    //-------------------------------------------------------------------------
-
-    const short MULTIPLY = 1289;
-
-    //-------------------------------------------------------------------------
-
-    const short DIVIDE = 1290;
-
-    //-------------------------------------------------------------------------
-
-    const short POINT = 1291;
-
-    //-------------------------------------------------------------------------
-
-    const short COMMA = 1292;
-
-    //-------------------------------------------------------------------------
-
-    const short LESS = 1293;
-
-    //-------------------------------------------------------------------------
-
-    const short GREATER = 1294;
-
-    //-------------------------------------------------------------------------
-
-    const short EQUAL = 1295;
-
-    //-------------------------------------------------------------------------
-
-    const short OPEN = 1296;
-
-    //-------------------------------------------------------------------------
-
-    const short CUT = 1297;
-
-    //-------------------------------------------------------------------------
-
-    const short COPY = 1298;
-
-    //-------------------------------------------------------------------------
-
-    const short PASTE = 1299;
-
-    //-------------------------------------------------------------------------
-
-    const short UNDO = 1300;
-
-    //-------------------------------------------------------------------------
-
-    const short REPEAT = 1301;
-
-    //-------------------------------------------------------------------------
-
-    const short FIND = 1302;
-
-    //-------------------------------------------------------------------------
-
-    const short PROPERTIES = 1303;
-
-    //-------------------------------------------------------------------------
-
-    const short FRONT = 1304;
-
-    //-------------------------------------------------------------------------
-
-    const short CONTEXTMENU = 1305;
-
-    //-------------------------------------------------------------------------
-
-    const short HELP = 1306;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+    
+    const short NUM0 = 256; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short NUM1 = 257; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short NUM2 = 258; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short NUM3 = 259; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short NUM4 = 260; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short NUM5 = 261; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short NUM6 = 262; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short NUM7 = 263; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short NUM8 = 264; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short NUM9 = 265; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short A = 512; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short B = 513; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short C = 514; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short D = 515; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short E = 516; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F = 517; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short G = 518; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short H = 519; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short I = 520; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short J = 521; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short K = 522; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short L = 523; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short M = 524; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short N = 525; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short O = 526; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short P = 527; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short Q = 528; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short R = 529; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short S = 530; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short T = 531; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short U = 532; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short V = 533; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short W = 534; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short X = 535; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short Y = 536; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short Z = 537; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F1 = 768; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F2 = 769; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F3 = 770; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F4 = 771; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F5 = 772; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F6 = 773; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F7 = 774; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F8 = 775; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F9 = 776; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F10 = 777; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F11 = 778; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F12 = 779; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F13 = 780; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F14 = 781; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F15 = 782; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F16 = 783; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F17 = 784; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F18 = 785; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F19 = 786; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F20 = 787; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F21 = 788; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F22 = 789; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F23 = 790; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F24 = 791; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F25 = 792; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short F26 = 793; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short DOWN = 1024; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short UP = 1025; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short LEFT = 1026; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short RIGHT = 1027; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short HOME = 1028; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short END = 1029; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short PAGEUP = 1030; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short PAGEDOWN = 1031; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short RETURN = 1280; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short ESCAPE = 1281; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short TAB = 1282; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short BACKSPACE = 1283; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short SPACE = 1284; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short INSERT = 1285; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short DELETE = 1286; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short ADD = 1287; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short SUBTRACT = 1288; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short MULTIPLY = 1289; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short DIVIDE = 1290; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short POINT = 1291; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short COMMA = 1292; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short LESS = 1293; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short GREATER = 1294; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short EQUAL = 1295; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short OPEN = 1296; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short CUT = 1297; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short COPY = 1298; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short PASTE = 1299; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short UNDO = 1300; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short REPEAT = 1301; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short FIND = 1302; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short PROPERTIES = 1303; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short FRONT = 1304; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short CONTEXTMENU = 1305; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short HELP = 1306; 
+ 
+    //-------------------------------------------------------------------------
+    
     const short MENU = 1307;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     const short HANGUL_HANJA = 1308;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     const short DECIMAL = 1309;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     const short TILDE = 1310;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     const short QUOTELEFT = 1311;
 
@@ -459,17 +459,17 @@ published constants Key
     const short SCROLLLOCK = 1314;
 
     //-------------------------------------------------------------------------
-
+    
     const short DELETE_TO_BEGIN_OF_LINE = 1536;
-
+    
     //-------------------------------------------------------------------------
-
+    
     const short DELETE_TO_END_OF_LINE = 1537;
-
+    
     //-------------------------------------------------------------------------
-
+    
     const short DELETE_TO_BEGIN_OF_PARAGRAPH = 1538;
-
+    
     //-------------------------------------------------------------------------
 
     const short BRACKETLEFT = 1315;
@@ -483,27 +483,27 @@ published constants Key
     const short SEMICOLON = 1317;
 
     //-------------------------------------------------------------------------
-
+    
     const short DELETE_TO_END_OF_PARAGRAPH = 1539;
-
+    
     //-------------------------------------------------------------------------
-
+    
     const short DELETE_WORD_BACKWARD = 1540;
-
+    
     //-------------------------------------------------------------------------
-
+    
     const short DELETE_WORD_FORWARD = 1541;
-
+    
     //-------------------------------------------------------------------------
-
+    
     const short INSERT_LINEBREAK = 1542;
-
+    
     //-------------------------------------------------------------------------
-
+    
     const short INSERT_PARAGRAPH = 1543;
-
+    
     //-------------------------------------------------------------------------
-
+    
     const short MOVE_WORD_BACKWARD = 1544;
 
     //-------------------------------------------------------------------------
@@ -527,72 +527,72 @@ published constants Key
     const short MOVE_TO_END_OF_PARAGRAPH = 1549;
 
     //-------------------------------------------------------------------------
-
+    
     const short SELECT_BACKWARD = 1550;
 
     //-------------------------------------------------------------------------
-
+    
     const short SELECT_FORWARD = 1551;
 
     //-------------------------------------------------------------------------
-
+    
     const short SELECT_WORD_BACKWARD = 1552;
 
     //-------------------------------------------------------------------------
-
+    
     const short SELECT_WORD_FORWARD = 1553;
 
     //-------------------------------------------------------------------------
-
+    
     const short SELECT_WORD = 1554;
 
     //-------------------------------------------------------------------------
-
+    
     const short SELECT_LINE = 1555;
 
     //-------------------------------------------------------------------------
-
+    
     const short SELECT_PARAGRAPH = 1556;
 
     //-------------------------------------------------------------------------
-
+    
     const short SELECT_ALL = 1557;
 
     //-------------------------------------------------------------------------
-
+    
     const short SELECT_TO_BEGIN_OF_LINE = 1558;
 
     //-------------------------------------------------------------------------
-
+    
     const short SELECT_TO_END_OF_LINE = 1559;
 
     //-------------------------------------------------------------------------
-
+    
     const short MOVE_TO_BEGIN_OF_DOCUMENT = 1560;
 
     //-------------------------------------------------------------------------
-
+    
     const short MOVE_TO_END_OF_DOCUMENT = 1561;
 
     //-------------------------------------------------------------------------
-
+    
     const short SELECT_TO_BEGIN_OF_DOCUMENT = 1562;
 
     //-------------------------------------------------------------------------
-
+    
     const short SELECT_TO_END_OF_DOCUMENT = 1563;
 
     //-------------------------------------------------------------------------
-
+    
     const short SELECT_TO_BEGIN_OF_PARAGRAPH = 1564;
 
     //-------------------------------------------------------------------------
-
+    
     const short SELECT_TO_END_OF_PARAGRAPH = 1565;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/KeyEvent.idl b/offapi/com/sun/star/awt/KeyEvent.idl
index 6d185b9ba26e..a012b8ffe913 100644
--- a/offapi/com/sun/star/awt/KeyEvent.idl
+++ b/offapi/com/sun/star/awt/KeyEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_KeyEvent_idl__
-#define __com_sun_star_awt_KeyEvent_idl__
-
-#ifndef __com_sun_star_awt_InputEvent_idl__
-#include <com/sun/star/awt/InputEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_KeyEvent_idl__ 
+#define __com_sun_star_awt_KeyEvent_idl__ 
+ 
+#ifndef __com_sun_star_awt_InputEvent_idl__ 
+#include <com/sun/star/awt/InputEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a key event.
 
     @see InputEvent
  */
 published struct KeyEvent: com::sun::star::awt::InputEvent
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the integer code representing the key of the event.
-
+                        
         <p>This is a constant from the constant group <type>Key</type>.</p>
      */
-    short KeyCode;
-
-    //-------------------------------------------------------------------------
-
+    short KeyCode; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the Unicode character generated by this event or 0.
      */
-    char KeyChar;
-
-    //-------------------------------------------------------------------------
-
+    char KeyChar; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the function type of the key event.
-
+                        
         <p>This is a constant from the constant group
         <type>KeyFunction</type>.</p>
      */
-    short KeyFunc;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    short KeyFunc; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/KeyFunction.idl b/offapi/com/sun/star/awt/KeyFunction.idl
index db806c1d0a11..8f82e805ea94 100644
--- a/offapi/com/sun/star/awt/KeyFunction.idl
+++ b/offapi/com/sun/star/awt/KeyFunction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,100 +24,100 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_KeyFunction_idl__
-#define __com_sun_star_awt_KeyFunction_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_KeyFunction_idl__ 
+#define __com_sun_star_awt_KeyFunction_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** These values are used to specify logical key functions.
  */
 published constants KeyFunction
-{
-    //-------------------------------------------------------------------------
-
-    const short DONTKNOW = 0;
-
-    //-------------------------------------------------------------------------
-
-    const short NEW = 1;
-
-    //-------------------------------------------------------------------------
-
-    const short OPEN = 2;
-
-    //-------------------------------------------------------------------------
-
-    const short SAVE = 3;
-
-    //-------------------------------------------------------------------------
-
-    const short SAVEAS = 4;
-
-    //-------------------------------------------------------------------------
-
-    const short PRINT = 5;
-
-    //-------------------------------------------------------------------------
-
-    const short CLOSE = 6;
-
-    //-------------------------------------------------------------------------
-
-    const short QUIT = 7;
-
-    //-------------------------------------------------------------------------
-
-    const short CUT = 8;
-
-    //-------------------------------------------------------------------------
-
-    const short COPY = 9;
-
-    //-------------------------------------------------------------------------
-
-    const short PASTE = 10;
-
-    //-------------------------------------------------------------------------
-
-    const short UNDO = 11;
-
-    //-------------------------------------------------------------------------
-
-    const short REDO = 12;
-
-    //-------------------------------------------------------------------------
-
-    const short DELETE = 13;
-
-    //-------------------------------------------------------------------------
-
-    const short REPEAT = 14;
-
-    //-------------------------------------------------------------------------
-
-    const short FIND = 15;
-
-    //-------------------------------------------------------------------------
-
-    const short FINDBACKWARD = 16;
-
-    //-------------------------------------------------------------------------
-
-    const short PROPERTIES = 17;
-
-    //-------------------------------------------------------------------------
-
-    const short FRONT = 18;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    //------------------------------------------------------------------------- 
+    
+    const short DONTKNOW = 0; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short NEW = 1; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short OPEN = 2; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short SAVE = 3; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short SAVEAS = 4; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short PRINT = 5; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short CLOSE = 6; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short QUIT = 7; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short CUT = 8; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short COPY = 9; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short PASTE = 10; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short UNDO = 11; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short REDO = 12; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short DELETE = 13; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short REPEAT = 14; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short FIND = 15; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short FINDBACKWARD = 16; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short PROPERTIES = 17; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short FRONT = 18; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/KeyGroup.idl b/offapi/com/sun/star/awt/KeyGroup.idl
index 4939965b02f5..580fee6e447f 100644
--- a/offapi/com/sun/star/awt/KeyGroup.idl
+++ b/offapi/com/sun/star/awt/KeyGroup.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,62 +24,62 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_KeyGroup_idl__
-#define __com_sun_star_awt_KeyGroup_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** These values are used to specify functional groups of keys.
-
+#ifndef __com_sun_star_awt_KeyGroup_idl__ 
+#define __com_sun_star_awt_KeyGroup_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** These values are used to specify functional groups of keys. 
+     
     @deprecated
  */
 published constants KeyGroup
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a numeric key.
      */
-    const short NUM = 256;
-
-    //-------------------------------------------------------------------------
-
+    const short NUM = 256; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies an alphabetic key.
      */
-    const short ALPHA = 512;
-
-    //-------------------------------------------------------------------------
-
+    const short ALPHA = 512; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a function key.
      */
-    const short FKEYS = 768;
-
-    //-------------------------------------------------------------------------
-
+    const short FKEYS = 768; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a cursor key.
      */
-    const short CURSOR = 1024;
-
-    //-------------------------------------------------------------------------
-
+    const short CURSOR = 1024; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies other keys.
      */
-    const short MISC = 1280;
-
-    //-------------------------------------------------------------------------
-
+    const short MISC = 1280; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** specifies the group mask.
      */
-    const short TYPE = 3840;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short TYPE = 3840; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/KeyModifier.idl b/offapi/com/sun/star/awt/KeyModifier.idl
index 89b79a928db3..68e19462228f 100644
--- a/offapi/com/sun/star/awt/KeyModifier.idl
+++ b/offapi/com/sun/star/awt/KeyModifier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_KeyModifier_idl__
-#define __com_sun_star_awt_KeyModifier_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_KeyModifier_idl__ 
+#define __com_sun_star_awt_KeyModifier_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** These values are used to specify which modifier keys are pressed.
  */
 published constants KeyModifier
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** refers to both shift keys.
      */
-    const short SHIFT = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short SHIFT = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** refers in the most cases to the 'Ctrl' key (Cmd on Mac OS X).
      */
-    const short MOD1 = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short MOD1 = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** refers in the most cases to the 'Alt' key.
      */
-    const short MOD2 = 4;
+    const short MOD2 = 4; 
 
     /** refers in the most cases to the 'Ctrl' key (Mac OS X)
          */
-    const short MOD3 = 8;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short MOD3 = 8; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/KeyStroke.idl b/offapi/com/sun/star/awt/KeyStroke.idl
index 2b65ee78e6ff..de5060de097a 100644
--- a/offapi/com/sun/star/awt/KeyStroke.idl
+++ b/offapi/com/sun/star/awt/KeyStroke.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,58 +24,58 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_KeyStroke_idl__
-#define __com_sun_star_awt_KeyStroke_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_KeyStroke_idl__ 
+#define __com_sun_star_awt_KeyStroke_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** Describes a key stroke for hotkeys etc.
 
     @since OOo 1.1.2
  */
 published struct KeyStroke
-{
-    //-------------------------------------------------------------------------
-
-    /** contains the modifier keys which were pressed while the event occurred.
-
+{ 
+    //------------------------------------------------------------------------- 
+         
+    /** contains the modifier keys which were pressed while the event occurred. 
+               
         <p>Zero or more constants from the group
         <type scope="com::sun::star::awt">KeyModifier</type>.</p>
      */
-    short Modifiers;
-
-    //-------------------------------------------------------------------------
-
+    short Modifiers; 
+    
+    //------------------------------------------------------------------------- 
+     
     /** contains the integer code representing the key of the event.
-
-        <p>This is a constant from the constant group
+        
+        <p>This is a constant from the constant group 
         <type scope="com::sun::star::awt">Key</type>.</p>
      */
-    short KeyCode;
-
-    //-------------------------------------------------------------------------
-
+    short KeyCode; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the Unicode character generated by this event or 0.
      */
-    char KeyChar;
-
-    //-------------------------------------------------------------------------
-
+    char KeyChar; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the function type of the key event.
-
+        
         <p>This is a constant from the constant group
         <type scope="com::sun::star::awt">KeyFunction</type>.</p>
      */
-    short KeyFunc;
-};
-
-//=============================================================================
-
+    short KeyFunc; 
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/LineEndFormat.idl b/offapi/com/sun/star/awt/LineEndFormat.idl
index 995cf3c43228..f3c5cd133694 100644
--- a/offapi/com/sun/star/awt/LineEndFormat.idl
+++ b/offapi/com/sun/star/awt/LineEndFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/MaxChildrenException.idl b/offapi/com/sun/star/awt/MaxChildrenException.idl
index a73ddb2f5233..3fb7d9073aae 100644
--- a/offapi/com/sun/star/awt/MaxChildrenException.idl
+++ b/offapi/com/sun/star/awt/MaxChildrenException.idl
@@ -1,16 +1,16 @@
-#ifndef __com_sun_star_awt_MaxChildrenException_idl__
-#define __com_sun_star_awt_MaxChildrenException_idl__
+#ifndef __com_sun_star_awt_MaxChildrenException_idl__ 
+#define __com_sun_star_awt_MaxChildrenException_idl__ 
 
 #ifndef __com_sun_star_uno_Exception_idl__
 #include <com/sun/star/uno/Exception.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com {  module sun {  module star {  module awt {
 
-//=============================================================================
-
+//============================================================================= 
+ 
 /** This exception is thrown when adding a child to a container that is full.
 
     @see     XLayoutContainer
@@ -19,11 +19,11 @@ module com {  module sun {  module star {  module awt {
     @since OOo 3.0
  */
 exception MaxChildrenException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
+{ 
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/MenuBar.idl b/offapi/com/sun/star/awt/MenuBar.idl
index 4f95cd74f9bc..faaab666fec9 100644
--- a/offapi/com/sun/star/awt/MenuBar.idl
+++ b/offapi/com/sun/star/awt/MenuBar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_MenuBar_idl__
-#define __com_sun_star_awt_MenuBar_idl__
-
-#ifndef __com_sun_star_awt_XMenuBar_idl__
-#include <com/sun/star/awt/XMenuBar.idl>
-#endif
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_MenuBar_idl__ 
+#define __com_sun_star_awt_MenuBar_idl__ 
+ 
+#ifndef __com_sun_star_awt_XMenuBar_idl__ 
+#include <com/sun/star/awt/XMenuBar.idl> 
+#endif 
+
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+    
+//============================================================================= 
+ 
 /** describes a menu for top-level windows.
-
+        
     <p>A menu bar can only be used by top-level windows. They support
        the interface <type scope="com::sun::star::awt">XTopWindow</type>
        to set an menu bar object.
     </p>
  */
 published service MenuBar
-{
-    interface XMenuBar;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    interface XMenuBar; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/MenuEvent.idl b/offapi/com/sun/star/awt/MenuEvent.idl
index 48f326f5f7cc..b7077f9b6054 100644
--- a/offapi/com/sun/star/awt/MenuEvent.idl
+++ b/offapi/com/sun/star/awt/MenuEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_MenuEvent_idl__
-#define __com_sun_star_awt_MenuEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_MenuEvent_idl__ 
+#define __com_sun_star_awt_MenuEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a menu event.
  */
 published struct MenuEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the item id.
      */
-    short MenuId;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    short MenuId; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/MenuItemStyle.idl b/offapi/com/sun/star/awt/MenuItemStyle.idl
index 6e0ce79a7cfa..006bf193e53d 100644
--- a/offapi/com/sun/star/awt/MenuItemStyle.idl
+++ b/offapi/com/sun/star/awt/MenuItemStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_MenuItemStyle_idl__
-#define __com_sun_star_awt_MenuItemStyle_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** These values are used to specify the properties of a menu item.
-
+#ifndef __com_sun_star_awt_MenuItemStyle_idl__ 
+#define __com_sun_star_awt_MenuItemStyle_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** These values are used to specify the properties of a menu item. 
+         
     <p>They may be expanded in future versions.</p>
  */
 published constants MenuItemStyle
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies an item which can be checked independently.
      */
-    const short CHECKABLE = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short CHECKABLE = 1; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies an item which can be checked dependent on the neighboring
         items.
      */
-    const short RADIOCHECK = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short RADIOCHECK = 2; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies to check this item automatically on select.
      */
-    const short AUTOCHECK = 4;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short AUTOCHECK = 4; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/MenuItemType.idl b/offapi/com/sun/star/awt/MenuItemType.idl
index af05e84f67f0..78fe90d0b222 100644
--- a/offapi/com/sun/star/awt/MenuItemType.idl
+++ b/offapi/com/sun/star/awt/MenuItemType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/MenuLogo.idl b/offapi/com/sun/star/awt/MenuLogo.idl
index a84f6be2f04a..799bf359242d 100755
--- a/offapi/com/sun/star/awt/MenuLogo.idl
+++ b/offapi/com/sun/star/awt/MenuLogo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/MessageBoxButtons.idl b/offapi/com/sun/star/awt/MessageBoxButtons.idl
index 5fcb700940cb..4bd035f3400c 100644
--- a/offapi/com/sun/star/awt/MessageBoxButtons.idl
+++ b/offapi/com/sun/star/awt/MessageBoxButtons.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,22 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_MessageBoxButtons_idl__
-#define __com_sun_star_awt_MessageBoxButtons_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** defines constants for the possible message box button
+#ifndef __com_sun_star_awt_MessageBoxButtons_idl__ 
+#define __com_sun_star_awt_MessageBoxButtons_idl__ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** defines constants for the possible message box button 
     combinations.
 
  */
 constants MessageBoxButtons
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** specifies a message with "OK" button.
      */
@@ -68,7 +68,7 @@ constants MessageBoxButtons
     /** specifies that OK is the default button.
      */
     const long DEFAULT_BUTTON_OK            = 0x10000;
-
+    
     /** specifies that CANCEL is the default button.
      */
     const long DEFAULT_BUTTON_CANCEL        = 0x20000;
@@ -76,7 +76,7 @@ constants MessageBoxButtons
     /** specifies that RETRY is the default button.
      */
     const long DEFAULT_BUTTON_RETRY         = 0x30000;
-
+    
     /** specifies that YES is the default button.
      */
     const long DEFAULT_BUTTON_YES           = 0x40000;
@@ -88,10 +88,10 @@ constants MessageBoxButtons
     /** specifies that IGNORE is the default button.
      */
     const long DEFAULT_BUTTON_IGNORE        = 0x60000;
-};
-
-//=============================================================================
-
-}; }; }; };
+}; 
 
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/MessageBoxCommand.idl b/offapi/com/sun/star/awt/MessageBoxCommand.idl
index c07f98d5b8d2..d7872021a014 100644
--- a/offapi/com/sun/star/awt/MessageBoxCommand.idl
+++ b/offapi/com/sun/star/awt/MessageBoxCommand.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_MessageBoxCommand_idl__
-#define __com_sun_star_awt_MessageBoxCommand_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_MessageBoxCommand_idl__ 
+#define __com_sun_star_awt_MessageBoxCommand_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a message box command.
 
     @deprecated
  */
 published constants MessageBoxCommand
-{
-    //-------------------------------------------------------------------------
-
-    const short CANCEL = 0;
-
-    //-------------------------------------------------------------------------
-
-    const short OK = 1;
-
-    //-------------------------------------------------------------------------
-
-    const short YES = 2;
-
-    //-------------------------------------------------------------------------
-
-    const short NO = 3;
-
-    //-------------------------------------------------------------------------
-
-    const short RETRY = 4;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    //------------------------------------------------------------------------- 
+    
+    const short CANCEL = 0; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short OK = 1; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short YES = 2; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short NO = 3; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const short RETRY = 4; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/MouseButton.idl b/offapi/com/sun/star/awt/MouseButton.idl
index 5f7f222373c7..d442a8b4e2cf 100644
--- a/offapi/com/sun/star/awt/MouseButton.idl
+++ b/offapi/com/sun/star/awt/MouseButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_MouseButton_idl__
-#define __com_sun_star_awt_MouseButton_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_MouseButton_idl__ 
+#define __com_sun_star_awt_MouseButton_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** These values are used to specify which keys on the mouse are pressed.
  */
 published constants MouseButton
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the left mouse button as being pressed.
      */
-    const short LEFT = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short LEFT = 1; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the right mouse button as being pressed.
      */
-    const short RIGHT = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short RIGHT = 2; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the middle mouse button as being pressed.
      */
-    const short MIDDLE = 4;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short MIDDLE = 4; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/MouseEvent.idl b/offapi/com/sun/star/awt/MouseEvent.idl
index 02f7ec08bceb..3d374c33f93b 100644
--- a/offapi/com/sun/star/awt/MouseEvent.idl
+++ b/offapi/com/sun/star/awt/MouseEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_MouseEvent_idl__
-#define __com_sun_star_awt_MouseEvent_idl__
-
-#ifndef __com_sun_star_awt_InputEvent_idl__
-#include <com/sun/star/awt/InputEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_MouseEvent_idl__ 
+#define __com_sun_star_awt_MouseEvent_idl__ 
+ 
+#ifndef __com_sun_star_awt_InputEvent_idl__ 
+#include <com/sun/star/awt/InputEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies an event from the mouse.
 
     <p>This event is also used for popup menu requests on objects.
@@ -48,36 +48,36 @@
     @see InputEvent
  */
 published struct MouseEvent: com::sun::star::awt::InputEvent
-{
-    //-------------------------------------------------------------------------
-
-    /** contains the pressed mouse buttons.
-
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** contains the pressed mouse buttons. 
+                        
         <p>Zero ore more constants from the
         <type scope="com::sun::star::awt">MouseButton</type> group.</p>
      */
-    short Buttons;
-
-    //-------------------------------------------------------------------------
-
+    short Buttons; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the x coordinate location of the mouse.
      */
-    long X;
-
-    //-------------------------------------------------------------------------
-
+    long X; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the y coordinate location of the mouse.
      */
-    long Y;
-
-    //-------------------------------------------------------------------------
-
+    long Y; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the number of mouse clicks associated with event.
      */
-    long ClickCount;
-
-    //-------------------------------------------------------------------------
-
+    long ClickCount; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies if this event is a popup-menu trigger event.
 
         <p>If this member is <TRUE/>, the event describes a request for a popup menu,
@@ -90,12 +90,12 @@ published struct MouseEvent: com::sun::star::awt::InputEvent
 
         @see XMouseListener::mousePressed
     */
-    boolean PopupTrigger;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean PopupTrigger; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/MouseWheelBehavior.idl b/offapi/com/sun/star/awt/MouseWheelBehavior.idl
index 94efb8abc160..1d5d6da8e437 100755
--- a/offapi/com/sun/star/awt/MouseWheelBehavior.idl
+++ b/offapi/com/sun/star/awt/MouseWheelBehavior.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module awt {
+module com { module sun { module star { module awt { 
 
 //=============================================================================
 
@@ -55,7 +55,7 @@ constants MouseWheelBehavior
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/PaintEvent.idl b/offapi/com/sun/star/awt/PaintEvent.idl
index f3ba266b3a0a..67d10b23567f 100644
--- a/offapi/com/sun/star/awt/PaintEvent.idl
+++ b/offapi/com/sun/star/awt/PaintEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_PaintEvent_idl__
-#define __com_sun_star_awt_PaintEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
-#include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_PaintEvent_idl__ 
+#define __com_sun_star_awt_PaintEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Rectangle_idl__ 
+#include <com/sun/star/awt/Rectangle.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the paint event for a component.
-
+            
     <p>This event is a special type which is used to ensure that
     paint/update method calls are serialized along with the other
     events delivered from the event queue.</p>
@@ -51,25 +51,25 @@
     @see WindowEvent
  */
 published struct PaintEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the rectangle area which needs to be repainted.
      */
-    com::sun::star::awt::Rectangle UpdateRect;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Rectangle UpdateRect; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the number of paint events that follows this event if
         it is a multiple PaintEvent. You can collect the PaintEvent
         until Count is zero.
      */
-    short Count;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    short Count; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/Point.idl b/offapi/com/sun/star/awt/Point.idl
index 6afcc76d611e..aaabf47339a6 100644
--- a/offapi/com/sun/star/awt/Point.idl
+++ b/offapi/com/sun/star/awt/Point.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_Point_idl__
-#define __com_sun_star_awt_Point_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_Point_idl__ 
+#define __com_sun_star_awt_Point_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a 2-dimensional point using the Cartesian coordinate system.
  */
 published struct Point
 {
     /** specifies the x-coordinate.
      */
-    long X;
-
-    //-------------------------------------------------------------------------
-
+    long X; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the y-coordinate.
      */
-    long Y;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    long Y; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/PopupMenu.idl b/offapi/com/sun/star/awt/PopupMenu.idl
index e8a5f913c2cb..e2cf37efd7a4 100644
--- a/offapi/com/sun/star/awt/PopupMenu.idl
+++ b/offapi/com/sun/star/awt/PopupMenu.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_PopupMenu_idl__
-#define __com_sun_star_awt_PopupMenu_idl__
-
-#ifndef __com_sun_star_awt_XPopupMenu_idl__
-#include <com/sun/star/awt/XPopupMenu.idl>
-#endif
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_PopupMenu_idl__ 
+#define __com_sun_star_awt_PopupMenu_idl__ 
+ 
+#ifndef __com_sun_star_awt_XPopupMenu_idl__ 
+#include <com/sun/star/awt/XPopupMenu.idl> 
+#endif 
+
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+    
+//============================================================================= 
+ 
 /** describes a popup menu which is a recursive container for commands
-
-    <p>A popup menu can be used as a standalone object to display a context
-       menu. It's also possible to use a popup menu to integrate it into
+        
+    <p>A popup menu can be used as a standalone object to display a context 
+       menu. It's also possible to use a popup menu to integrate it into 
        another menu.</p>
  */
 published service PopupMenu
-{
-    interface XPopupMenu;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    interface XPopupMenu; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/PopupMenuDirection.idl b/offapi/com/sun/star/awt/PopupMenuDirection.idl
index 0e676d3e91fe..a8e36669f99f 100644
--- a/offapi/com/sun/star/awt/PopupMenuDirection.idl
+++ b/offapi/com/sun/star/awt/PopupMenuDirection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,69 +24,69 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_PopupMenuDirection_idl__
-#define __com_sun_star_awt_PopupMenuDirection_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** These values are used to specify the direction in which
-    a popup menu will grow.
-
+#ifndef __com_sun_star_awt_PopupMenuDirection_idl__ 
+#define __com_sun_star_awt_PopupMenuDirection_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** These values are used to specify the direction in which  
+    a popup menu will grow. 
+         
     <p>They may be expanded in future versions.</p>
  */
 published constants PopupMenuDirection
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** @deprecated
      */
-    const short DEFAULT = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short DEFAULT = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** @deprecated
      */
-    const short DOWN = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short DOWN = 1; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** opens on execute in a default direction.
      */
-    const short EXECUTE_DEFAULT = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short EXECUTE_DEFAULT = 0; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** opens on execute downwards.
      */
-    const short EXECUTE_DOWN = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short EXECUTE_DOWN = 1; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** opens on execute upwards.
      */
-    const short EXECUTE_UP = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short EXECUTE_UP = 2; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** opens on execute to the left.
      */
-    const short EXECUTE_LEFT = 4;
-
-    //-------------------------------------------------------------------------
-
+    const short EXECUTE_LEFT = 4; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** opens on execute to the right.
      */
-    const short EXECUTE_RIGHT = 8;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short EXECUTE_RIGHT = 8; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/PosSize.idl b/offapi/com/sun/star/awt/PosSize.idl
index 93e0d3d3df3f..c154c960ea53 100644
--- a/offapi/com/sun/star/awt/PosSize.idl
+++ b/offapi/com/sun/star/awt/PosSize.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,66 +24,66 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_PosSize_idl__
-#define __com_sun_star_awt_PosSize_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_PosSize_idl__ 
+#define __com_sun_star_awt_PosSize_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** These constants are used to flag the parameters of a rectangle.
  */
 published constants PosSize
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+    
     /** flags the x-coordinate.
      */
-    const short X = 1;
-
+    const short X = 1; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** flags the y-coordinate.
      */
-    const short Y = 2;
-
-    //-------------------------------------------------------------------------
+    const short Y = 2; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** flags the width.
      */
-    const short WIDTH = 4;
-
-    //-------------------------------------------------------------------------
+    const short WIDTH = 4; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** flags the height.
      */
-    const short HEIGHT = 8;
-
-    //-------------------------------------------------------------------------
+    const short HEIGHT = 8; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** flags the x- and y-coordinate.
      */
-    const short POS = 3;
-
+    const short POS = 3; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** flags the width and height.
      */
-    const short SIZE = 12;
-
-    //-------------------------------------------------------------------------
+    const short SIZE = 12; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** flags the x- and y-coordinate, width and height.
      */
-    const short POSSIZE = 15;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short POSSIZE = 15; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/PrinterException.idl b/offapi/com/sun/star/awt/PrinterException.idl
index 805b52e86b98..d2f28c70d263 100644
--- a/offapi/com/sun/star/awt/PrinterException.idl
+++ b/offapi/com/sun/star/awt/PrinterException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_PrinterException_idl__
-#define __com_sun_star_awt_PrinterException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_PrinterException_idl__ 
+#define __com_sun_star_awt_PrinterException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** fired if a resource cannot be locked.
-
-    <p>It is an error if the exception occurs in a non-transacted task.
+            
+    <p>It is an error if the exception occurs in a non-transacted task. 
     A transacted task repeats later.</p>
  */
 published exception PrinterException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/PushButtonType.idl b/offapi/com/sun/star/awt/PushButtonType.idl
index fc0c47129efb..bd6b6f88149e 100644
--- a/offapi/com/sun/star/awt/PushButtonType.idl
+++ b/offapi/com/sun/star/awt/PushButtonType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_PushButtonType_idl__
-#define __com_sun_star_awt_PushButtonType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_PushButtonType_idl__ 
+#define __com_sun_star_awt_PushButtonType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the default actions of a button.
  */
 published enum PushButtonType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** acts like a standard push button.
      */
-    STANDARD,
-
-    //-------------------------------------------------------------------------
-
+    STANDARD, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** acts like a OK button.
      */
-    OK,
-
-    //-------------------------------------------------------------------------
-
+    OK, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** acts like a cancel button.
      */
-    CANCEL,
-
-    //-------------------------------------------------------------------------
-
+    CANCEL, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** acts like a help button.
      */
-    HELP
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    HELP 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/RasterOperation.idl b/offapi/com/sun/star/awt/RasterOperation.idl
index 8c1839bf2e0c..a38cf88a9630 100644
--- a/offapi/com/sun/star/awt/RasterOperation.idl
+++ b/offapi/com/sun/star/awt/RasterOperation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module awt {
+module com { module sun { module star { module awt { 
 
 //=============================================================================
 
@@ -48,7 +48,7 @@ published enum RasterOperation
     //-------------------------------------------------------------------------
 
     /** uses the pixel written as one and the current pixel as
-        the other operator of an exclusive or-operation.
+        the other operator of an exclusive or-operation. 
     */
     XOR,
 
@@ -74,6 +74,6 @@ published enum RasterOperation
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/awt/Rectangle.idl b/offapi/com/sun/star/awt/Rectangle.idl
index 3e1058339356..08378f5c0567 100644
--- a/offapi/com/sun/star/awt/Rectangle.idl
+++ b/offapi/com/sun/star/awt/Rectangle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_Rectangle_idl__
-#define __com_sun_star_awt_Rectangle_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_Rectangle_idl__ 
+#define __com_sun_star_awt_Rectangle_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a rectangular area by position and size.
  */
 published struct Rectangle
 {
     /** specifies the x-coordinate.
      */
-    long X;
-
-    //-------------------------------------------------------------------------
-
+    long X; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the y-coordinate.
      */
-    long Y;
-
-    //-------------------------------------------------------------------------
-
+    long Y; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the width.
      */
-    long Width;
-
-    //-------------------------------------------------------------------------
-
+    long Width; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the height.
      */
-    long Height;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    long Height; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/RoadmapItem.idl b/offapi/com/sun/star/awt/RoadmapItem.idl
index 69f386641ab3..8471268ef192 100644
--- a/offapi/com/sun/star/awt/RoadmapItem.idl
+++ b/offapi/com/sun/star/awt/RoadmapItem.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/ScrollBarOrientation.idl b/offapi/com/sun/star/awt/ScrollBarOrientation.idl
index 706ee93ddc52..fdd944489915 100644
--- a/offapi/com/sun/star/awt/ScrollBarOrientation.idl
+++ b/offapi/com/sun/star/awt/ScrollBarOrientation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_ScrollBarOrientation_idl__
-#define __com_sun_star_awt_ScrollBarOrientation_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_ScrollBarOrientation_idl__ 
+#define __com_sun_star_awt_ScrollBarOrientation_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** These constants are used to specify the orientation of a scroll bar.
  */
 published constants ScrollBarOrientation
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a horizontal scroll bar.
      */
-    const long HORIZONTAL = 0;
-
-    //-------------------------------------------------------------------------
-
+    const long HORIZONTAL = 0; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a vertical scroll bar.
      */
-    const long VERTICAL = 1;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const long VERTICAL = 1; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/Selection.idl b/offapi/com/sun/star/awt/Selection.idl
index aa904e687949..1bb3f195cb50 100644
--- a/offapi/com/sun/star/awt/Selection.idl
+++ b/offapi/com/sun/star/awt/Selection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_Selection_idl__
-#define __com_sun_star_awt_Selection_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_Selection_idl__ 
+#define __com_sun_star_awt_Selection_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a numerical range.
  */
 published struct Selection
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** specifies the lower limit of the range.
      */
-    long Min;
-
-    //-------------------------------------------------------------------------
-
+    long Min; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the upper limit of the range.
      */
-    long Max;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    long Max; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/SimpleFontMetric.idl b/offapi/com/sun/star/awt/SimpleFontMetric.idl
index 51c44ad67b4d..7b15be0778ec 100644
--- a/offapi/com/sun/star/awt/SimpleFontMetric.idl
+++ b/offapi/com/sun/star/awt/SimpleFontMetric.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,78 +24,78 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_SimpleFontMetric_idl__
-#define __com_sun_star_awt_SimpleFontMetric_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_SimpleFontMetric_idl__ 
+#define __com_sun_star_awt_SimpleFontMetric_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** describes the general metrics of a certain font.
  */
 published struct SimpleFontMetric
 {
     /** specifies the portion of a lower case character that
-        rises above the height of the character "x" of the font.
-
-        <p>For example, the letters 'b', 'd', 'h', 'k' and 'l'
+        rises above the height of the character "x" of the font. 
+                        
+        <p>For example, the letters 'b', 'd', 'h', 'k' and 'l' 
         have an ascent unequal to 0.</p>
-
+        
         <p>The ascent is measured in pixels, thus the font metric is
         device dependent.</p>
      */
-    short Ascent;
-
-    //-------------------------------------------------------------------------
-
+    short Ascent; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the portion of a letter falling below the baseline.
-
+                        
         <p>For example, the letters 'g', 'p', and 'y'
         have a descent unequal to 0.</p>
-
-        <p>The descent is measured in pixels, thus the font metric is
+        
+        <p>The descent is measured in pixels, thus the font metric is 
         device dependent.</p>
      */
-    short Descent;
-
-    //-------------------------------------------------------------------------
-
+    short Descent; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the vertical space between lines of this font;
-        it is also called internal linespacing.
-
-        <p>The leading is measured in pixels, thus the font metric is
+        it is also called internal linespacing. 
+                        
+        <p>The leading is measured in pixels, thus the font metric is 
         device dependent.</p>
      */
-    short Leading;
-
-    //-------------------------------------------------------------------------
-
+    short Leading; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the slant of the characters (italic).
-
+                        
         <p>The slant is measured in degrees from 0 to 359.</p>
      */
-    short Slant;
-
-    //-------------------------------------------------------------------------
-
+    short Slant; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the code of the first printable character in the font.
      */
-    char FirstChar;
-
-    //-------------------------------------------------------------------------
-
+    char FirstChar; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the code of the last printable character in the font.
      */
-    char LastChar;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    char LastChar; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+
+#endif 
diff --git a/offapi/com/sun/star/awt/Size.idl b/offapi/com/sun/star/awt/Size.idl
index 9a9b4912dc8c..65a6f2747e17 100644
--- a/offapi/com/sun/star/awt/Size.idl
+++ b/offapi/com/sun/star/awt/Size.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_Size_idl__
-#define __com_sun_star_awt_Size_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_Size_idl__ 
+#define __com_sun_star_awt_Size_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the 2-dimensional size of an area using width and height.
  */
 published struct Size
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** specifies the width.
      */
-    long Width;
-
-    //-------------------------------------------------------------------------
-
+    long Width; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the height.
      */
-    long Height;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    long Height; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/SpinEvent.idl b/offapi/com/sun/star/awt/SpinEvent.idl
index bcba2b554aad..4a11586cd638 100644
--- a/offapi/com/sun/star/awt/SpinEvent.idl
+++ b/offapi/com/sun/star/awt/SpinEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_SpinEvent_idl__
-#define __com_sun_star_awt_SpinEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_SpinEvent_idl__ 
+#define __com_sun_star_awt_SpinEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a spin button event.
  */
 published struct SpinEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** This is a dummy field only. Please ignore.
      */
-    short dummy1;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    short dummy1; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/Style.idl b/offapi/com/sun/star/awt/Style.idl
index 6643b316dd48..68d41e2ba829 100644
--- a/offapi/com/sun/star/awt/Style.idl
+++ b/offapi/com/sun/star/awt/Style.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_Style_idl__
-#define __com_sun_star_awt_Style_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_Style_idl__ 
+#define __com_sun_star_awt_Style_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the style of a window.
  */
 published constants Style
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+    
     /** specifies a frame.
      */
-    const short FRAME = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short FRAME = 0; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** specifies a dialog.
      */
-    const short DIALOG = 1;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    const short DIALOG = 1; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/SystemDependentXWindow.idl b/offapi/com/sun/star/awt/SystemDependentXWindow.idl
index b9e99c513a0c..4ce57fe6a338 100644
--- a/offapi/com/sun/star/awt/SystemDependentXWindow.idl
+++ b/offapi/com/sun/star/awt/SystemDependentXWindow.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_SystemDependentXWindow_idl__
+#ifndef __com_sun_star_awt_SystemDependentXWindow_idl__ 
 #define __com_sun_star_awt_SystemDependentXWindow_idl__
 
 
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a system dependent XWindow.
 
     <p>This is the structure returned in the
     <member>XSystemDependentWindowPeer::getWindowHandle</member> call,
     if the system type is
     <const scope="com::sun::star::lang">SystemDependent::XWINDOW</const>.</p>
-
+    
     @deprecated
  */
 published struct SystemDependentXWindow
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** The XWindow handle if possible, otherwise 0.
      */
-    long    WindowHandle;
-
+    long	WindowHandle; 
+     
     //-------------------------------------------------------------------------
-
+    
     /** The display pointer.
      */
-    hyper   DisplayPointer;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    hyper	DisplayPointer;
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/SystemPointer.idl b/offapi/com/sun/star/awt/SystemPointer.idl
index 6740d72a949f..9a769fc4155c 100644
--- a/offapi/com/sun/star/awt/SystemPointer.idl
+++ b/offapi/com/sun/star/awt/SystemPointer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,469 +24,469 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_SystemPointer_idl__
-#define __com_sun_star_awt_SystemPointer_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_SystemPointer_idl__ 
+#define __com_sun_star_awt_SystemPointer_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the shape of a mouse pointer.
  */
 published constants SystemPointer
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the normal arrow-like mouse pointer.
      */
-    const long ARROW = 0;
-
-    //-------------------------------------------------------------------------
-
+    const long ARROW = 0; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies an invisible mouse pointer.
      */
-    const long INVISIBLE = 1;
-
-    //-------------------------------------------------------------------------
-
+    const long INVISIBLE = 1; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a waiting symbol as a mouse pointer (for example hourglass).
      */
-    const long WAIT = 2;
-
-    //-------------------------------------------------------------------------
-
+    const long WAIT = 2; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer for text (cursor-like).
      */
-    const long TEXT = 3;
-
-    //-------------------------------------------------------------------------
-
+    const long TEXT = 3; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer for online help.
      */
-    const long HELP = 4;
-
-    //-------------------------------------------------------------------------
-
+    const long HELP = 4; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a cross as a mouse pointer.
      */
-    const long CROSS = 5;
-
-    //-------------------------------------------------------------------------
-
+    const long CROSS = 5; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes movement.
      */
-    const long MOVE = 6;
-
-    //-------------------------------------------------------------------------
-
+    const long MOVE = 6; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes resizing for a top border.
      */
-    const long NSIZE = 7;
-
-    //-------------------------------------------------------------------------
-
+    const long NSIZE = 7; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes resizing for a bottom
         border.
      */
-    const long SSIZE = 8;
-
-    //-------------------------------------------------------------------------
-
+    const long SSIZE = 8; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes resizing for a left border.
      */
-    const long WSIZE = 9;
-
-    //-------------------------------------------------------------------------
-
+    const long WSIZE = 9; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes resizing for a right border.
      */
-    const long ESIZE = 10;
-
-    //-------------------------------------------------------------------------
-
+    const long ESIZE = 10; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes resizing for the top-left
         corner.
      */
-    const long NWSIZE = 11;
-
-    //-------------------------------------------------------------------------
-
+    const long NWSIZE = 11; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes resizing for the top-right
         corner.
      */
-    const long NESIZE = 12;
-
-    //-------------------------------------------------------------------------
-
+    const long NESIZE = 12; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes resizing for the bottom-left
         corner.
      */
-    const long SWSIZE = 13;
-
-    //-------------------------------------------------------------------------
-
+    const long SWSIZE = 13; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes resizing for the
         bottom-right corner.
      */
-    const long SESIZE = 14;
-
-    //-------------------------------------------------------------------------
-
+    const long SESIZE = 14; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes window resizing for a top
         border.
      */
-    const long WINDOW_NSIZE = 15;
-
-    //-------------------------------------------------------------------------
-
+    const long WINDOW_NSIZE = 15; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes window resizing for a bottom
         border.
      */
-    const long WINDOW_SSIZE = 16;
-
-    //-------------------------------------------------------------------------
-
+    const long WINDOW_SSIZE = 16; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes window resizing for a left
         border.
      */
-    const long WINDOW_WSIZE = 17;
-
-    //-------------------------------------------------------------------------
-
+    const long WINDOW_WSIZE = 17; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes window resizing for a right
         border.
      */
-    const long WINDOW_ESIZE = 18;
-
-    //-------------------------------------------------------------------------
-
+    const long WINDOW_ESIZE = 18; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes window resizing for the
         top-left corner.
      */
-    const long WINDOW_NWSIZE = 19;
-
-    //-------------------------------------------------------------------------
-
+    const long WINDOW_NWSIZE = 19; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes window resizing for the
         top-right corner.
      */
-    const long WINDOW_NESIZE = 20;
-
-    //-------------------------------------------------------------------------
-
+    const long WINDOW_NESIZE = 20; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes window resizing for the
         bottom-left corner.
      */
-    const long WINDOW_SWSIZE = 21;
-
-    //-------------------------------------------------------------------------
-
+    const long WINDOW_SWSIZE = 21; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes window resizing for the
         bottom-right corner.
      */
-    const long WINDOW_SESIZE = 22;
-
-    //-------------------------------------------------------------------------
-
+    const long WINDOW_SESIZE = 22; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes horizontal splitting.
      */
-    const long HSPLIT = 23;
-
-    //-------------------------------------------------------------------------
-
+    const long HSPLIT = 23; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes vertical splitting.
      */
-    const long VSPLIT = 24;
-
-    //-------------------------------------------------------------------------
-
+    const long VSPLIT = 24; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes horizontal resizing.
      */
-    const long HSIZEBAR = 25;
-
-    //-------------------------------------------------------------------------
-
+    const long HSIZEBAR = 25; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes vertical resizing.
      */
-    const long VSIZEBAR = 26;
-
-    //-------------------------------------------------------------------------
-
+    const long VSIZEBAR = 26; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a hand symbol as mouse pointer.
      */
-    const long HAND = 27;
-
-    //-------------------------------------------------------------------------
-
+    const long HAND = 27; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a pointing hand symbol as mouse pointer.
      */
-    const long REFHAND = 28;
-
-    //-------------------------------------------------------------------------
-
+    const long REFHAND = 28; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a pen symbol as mouse pointer.
      */
-    const long PEN = 29;
-
-    //-------------------------------------------------------------------------
-
+    const long PEN = 29; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a magnify symbol as mouse pointer.
      */
-    const long MAGNIFY = 30;
-
-    //-------------------------------------------------------------------------
-
+    const long MAGNIFY = 30; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a fill symbol as mouse pointer.
      */
-    const long FILL = 31;
-
-    //-------------------------------------------------------------------------
-
+    const long FILL = 31; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a rotate symbol as mouse pointer.
      */
-    const long ROTATE = 32;
-
-    //-------------------------------------------------------------------------
-
+    const long ROTATE = 32; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a horizontal shear symbol as mouse pointer.
      */
-    const long HSHEAR = 33;
-
-    //-------------------------------------------------------------------------
-
+    const long HSHEAR = 33; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a vertical shear symbol as mouse pointer.
      */
-    const long VSHEAR = 34;
-
-    //-------------------------------------------------------------------------
-
+    const long VSHEAR = 34; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mirror symbol as mouse pointer.
      */
-    const long MIRROR = 35;
-
-    //-------------------------------------------------------------------------
-
+    const long MIRROR = 35; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a crook symbol as mouse pointer.
      */
-    const long CROOK = 36;
-
-    //-------------------------------------------------------------------------
-
+    const long CROOK = 36; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a crop symbol as mouse pointer.
      */
-    const long CROP = 37;
-
-    //-------------------------------------------------------------------------
-
+    const long CROP = 37; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes moving a point.
      */
-    const long MOVEPOINT = 38;
-
-    //-------------------------------------------------------------------------
-
+    const long MOVEPOINT = 38; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes moving a Bezier weight.
      */
-    const long MOVEBEZIERWEIGHT = 39;
-
-    //-------------------------------------------------------------------------
-
+    const long MOVEBEZIERWEIGHT = 39; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes moving data.
      */
-    const long MOVEDATA = 40;
-
-    //-------------------------------------------------------------------------
-
+    const long MOVEDATA = 40; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes copying data.
      */
-    const long COPYDATA = 41;
-
-    //-------------------------------------------------------------------------
-
+    const long COPYDATA = 41; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes linking data.
      */
-    const long LINKDATA = 42;
-
-    //-------------------------------------------------------------------------
-
+    const long LINKDATA = 42; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes moving a data link.
      */
-    const long MOVEDATALINK = 43;
-
-    //-------------------------------------------------------------------------
-
+    const long MOVEDATALINK = 43; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes copying a data link.
      */
-    const long COPYDATALINK = 44;
-
-    //-------------------------------------------------------------------------
-
+    const long COPYDATALINK = 44; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes moving a file.
      */
-    const long MOVEFILE = 45;
-
-    //-------------------------------------------------------------------------
-
+    const long MOVEFILE = 45; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes copying a file.
      */
-    const long COPYFILE = 46;
-
-    //-------------------------------------------------------------------------
-
+    const long COPYFILE = 46; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes linking a file.
      */
-    const long LINKFILE = 47;
-
-    //-------------------------------------------------------------------------
-
+    const long LINKFILE = 47; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes moving a file link.
      */
-    const long MOVEFILELINK = 48;
-
-    //-------------------------------------------------------------------------
-
+    const long MOVEFILELINK = 48; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes copying a file link.
      */
-    const long COPYFILELINK = 49;
-
-    //-------------------------------------------------------------------------
-
+    const long COPYFILELINK = 49; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes moving multiple files.
      */
-    const long MOVEFILES = 50;
-
-    //-------------------------------------------------------------------------
-
+    const long MOVEFILES = 50; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes copying multiple files.
      */
-    const long COPYFILES = 51;
-
-    //-------------------------------------------------------------------------
-
+    const long COPYFILES = 51; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes "not allowed".
      */
-    const long NOTALLOWED = 52;
-
-    //-------------------------------------------------------------------------
-
+    const long NOTALLOWED = 52; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes drawing a line.
      */
-    const long DRAW_LINE = 53;
-
-    //-------------------------------------------------------------------------
-
+    const long DRAW_LINE = 53; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes drawing a rectangle.
      */
-    const long DRAW_RECT = 54;
-
-    //-------------------------------------------------------------------------
-
+    const long DRAW_RECT = 54; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes drawing a polygon.
      */
-    const long DRAW_POLYGON = 55;
-
-    //-------------------------------------------------------------------------
-
+    const long DRAW_POLYGON = 55; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes drawing a Bezier.
      */
-    const long DRAW_BEZIER = 56;
-
-    //-------------------------------------------------------------------------
-
+    const long DRAW_BEZIER = 56; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes drawing an arc.
      */
-    const long DRAW_ARC = 57;
-
-    //-------------------------------------------------------------------------
-
+    const long DRAW_ARC = 57; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes drawing a pie.
      */
-    const long DRAW_PIE = 58;
-
-    //-------------------------------------------------------------------------
-
+    const long DRAW_PIE = 58; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes drawing a circle cut.
      */
-    const long DRAW_CIRCLECUT = 59;
-
-    //-------------------------------------------------------------------------
-
+    const long DRAW_CIRCLECUT = 59; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes drawing an ellipse.
      */
-    const long DRAW_ELLIPSE = 60;
-
-    //-------------------------------------------------------------------------
-
+    const long DRAW_ELLIPSE = 60; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes drawing free handed.
      */
-    const long DRAW_FREEHAND = 61;
-
-    //-------------------------------------------------------------------------
-
+    const long DRAW_FREEHAND = 61; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes drawing a connector.
      */
-    const long DRAW_CONNECT = 62;
-
-    //-------------------------------------------------------------------------
-
+    const long DRAW_CONNECT = 62; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes drawing text.
      */
-    const long DRAW_TEXT = 63;
-
-    //-------------------------------------------------------------------------
-
+    const long DRAW_TEXT = 63; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes drawing a text caption.
      */
-    const long DRAW_CAPTION = 64;
-
-    //-------------------------------------------------------------------------
-
+    const long DRAW_CAPTION = 64; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes a chart.
      */
-    const long CHART = 65;
-
-    //-------------------------------------------------------------------------
-
+    const long CHART = 65; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes a detective.
      */
-    const long DETECTIVE = 66;
-
-    //-------------------------------------------------------------------------
-
+    const long DETECTIVE = 66; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes a pivot column.
      */
-    const long PIVOT_COL = 67;
-
-    //-------------------------------------------------------------------------
-
+    const long PIVOT_COL = 67; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes a pivot row.
      */
-    const long PIVOT_ROW = 68;
-
-    //-------------------------------------------------------------------------
-
+    const long PIVOT_ROW = 68; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes a pivot field.
      */
-    const long PIVOT_FIELD = 69;
-
-    //-------------------------------------------------------------------------
-
+    const long PIVOT_FIELD = 69; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes a chain.
      */
-    const long CHAIN = 70;
-
-    //-------------------------------------------------------------------------
-
+    const long CHAIN = 70; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a mouse pointer which symbolizes "chaining not allowed".
      */
-    const long CHAIN_NOTALLOWED = 71;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const long CHAIN_NOTALLOWED = 71; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/TabController.idl b/offapi/com/sun/star/awt/TabController.idl
index 7b9ded82d233..a9319242a98b 100644
--- a/offapi/com/sun/star/awt/TabController.idl
+++ b/offapi/com/sun/star/awt/TabController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_TabController_idl__
-#define __com_sun_star_awt_TabController_idl__
-
-#ifndef __com_sun_star_awt_XTabController_idl__
-#include <com/sun/star/awt/XTabController.idl>
-#endif
-
-
-//=============================================================================
+#ifndef __com_sun_star_awt_TabController_idl__ 
+#define __com_sun_star_awt_TabController_idl__ 
 
- module com {  module sun {  module star {  module awt {
+#ifndef __com_sun_star_awt_XTabController_idl__ 
+#include <com/sun/star/awt/XTabController.idl> 
+#endif 
 
-//=============================================================================
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a standard tab controller.
- */
+ */	
 published service TabController
-{
+{ 
     interface com::sun::star::awt::XTabController;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
diff --git a/offapi/com/sun/star/awt/TabControllerModel.idl b/offapi/com/sun/star/awt/TabControllerModel.idl
index c85e6336c6f9..def18cd363ea 100644
--- a/offapi/com/sun/star/awt/TabControllerModel.idl
+++ b/offapi/com/sun/star/awt/TabControllerModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_TabControllerModel_idl__
-#define __com_sun_star_awt_TabControllerModel_idl__
-
-#ifndef __com_sun_star_awt_XTabControllerModel_idl__
-#include <com/sun/star/awt/XTabControllerModel.idl>
-#endif
+#ifndef __com_sun_star_awt_TabControllerModel_idl__ 
+#define __com_sun_star_awt_TabControllerModel_idl__ 
 
-#ifndef __com_sun_star_io_XPersistObject_idl__
-#include <com/sun/star/io/XPersistObject.idl>
-#endif
+#ifndef __com_sun_star_awt_XTabControllerModel_idl__ 
+#include <com/sun/star/awt/XTabControllerModel.idl> 
+#endif 
 
+#ifndef __com_sun_star_io_XPersistObject_idl__ 
+#include <com/sun/star/io/XPersistObject.idl> 
+#endif 
 
-//=============================================================================
 
+//============================================================================= 
+ 
  module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+     
+//============================================================================= 
+ 
 /** specifies a standard tab controller model.
  */
 published service TabControllerModel
-{
-    interface com::sun::star::awt::XTabControllerModel;
-
+{ 
+    interface com::sun::star::awt::XTabControllerModel; 
+    
     interface com::sun::star::io::XPersistObject;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/TextAlign.idl b/offapi/com/sun/star/awt/TextAlign.idl
index 773419c89254..8ac8897f6e62 100644
--- a/offapi/com/sun/star/awt/TextAlign.idl
+++ b/offapi/com/sun/star/awt/TextAlign.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_TextAlign_idl__
-#define __com_sun_star_awt_TextAlign_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_TextAlign_idl__ 
+#define __com_sun_star_awt_TextAlign_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the alignment of text.
  */
 published constants TextAlign
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies to left align text.
      */
-    const long LEFT = 0;
-
-    //-------------------------------------------------------------------------
-
+    const long LEFT = 0; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies to center text.
      */
-    const long CENTER = 1;
-
-    //-------------------------------------------------------------------------
-
+    const long CENTER = 1; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies to right align text.
      */
-    const long RIGHT = 2;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const long RIGHT = 2; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/TextEvent.idl b/offapi/com/sun/star/awt/TextEvent.idl
index 537fa2d1016b..106aedb02740 100644
--- a/offapi/com/sun/star/awt/TextEvent.idl
+++ b/offapi/com/sun/star/awt/TextEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_TextEvent_idl__
-#define __com_sun_star_awt_TextEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_TextEvent_idl__ 
+#define __com_sun_star_awt_TextEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a text event.
  */
 published struct TextEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** This is a dummy field only. Please ignore.
      */
-    short dummy1;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    short dummy1; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/Toolkit.idl b/offapi/com/sun/star/awt/Toolkit.idl
index a065776a535b..589e80428c57 100644
--- a/offapi/com/sun/star/awt/Toolkit.idl
+++ b/offapi/com/sun/star/awt/Toolkit.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,12 +24,12 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_Toolkit_idl__
-#define __com_sun_star_awt_Toolkit_idl__
-
-#ifndef __com_sun_star_awt_XToolkit_idl__
-#include <com/sun/star/awt/XToolkit.idl>
-#endif
+#ifndef __com_sun_star_awt_Toolkit_idl__ 
+#define __com_sun_star_awt_Toolkit_idl__ 
+ 
+#ifndef __com_sun_star_awt_XToolkit_idl__ 
+#include <com/sun/star/awt/XToolkit.idl> 
+#endif 
 
 #ifndef __com_sun_star_awt_XDataTransferProviderAccess_idl__
 #include <com/sun/star/awt/XDataTransferProviderAccess.idl>
@@ -43,34 +43,34 @@
 #include <com/sun/star/awt/XMessageBoxFactory.idl>
 #endif
 
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** describes a toolkit that creates windows on a screen.
-
-    <p>The design of the interfaces for the toolkit implementation
+    
+//============================================================================= 
+ 
+/** describes a toolkit that creates windows on a screen. 
+        
+    <p>The design of the interfaces for the toolkit implementation 
     should be remote. This means that the calls to the interfaces
     of the toolkit should be one-way. Too many synchronous calls kill the
     remote performance.</p>
  */
 published service Toolkit
-{
-    interface XToolkit;
+{ 
+    interface XToolkit; 
 
     [optional] interface com::sun::star::awt::XDataTransferProviderAccess;
 
     [optional] interface com::sun::star::awt::XSystemChildFactory;
 
     [optional] interface com::sun::star::awt::XMessageBoxFactory;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControl.idl b/offapi/com/sun/star/awt/UnoControl.idl
index 38acae5635e3..646d6284907a 100644
--- a/offapi/com/sun/star/awt/UnoControl.idl
+++ b/offapi/com/sun/star/awt/UnoControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,59 +24,59 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControl_idl__
-#define __com_sun_star_awt_UnoControl_idl__
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
+#ifndef __com_sun_star_awt_UnoControl_idl__ 
+#define __com_sun_star_awt_UnoControl_idl__ 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
 #endif
 
-#ifndef __com_sun_star_awt_XControl_idl__
-#include <com/sun/star/awt/XControl.idl>
-#endif
+#ifndef __com_sun_star_awt_XControl_idl__ 
+#include <com/sun/star/awt/XControl.idl> 
+#endif 
 
-#ifndef __com_sun_star_awt_XWindow_idl__
-#include <com/sun/star/awt/XWindow.idl>
-#endif
+#ifndef __com_sun_star_awt_XWindow_idl__ 
+#include <com/sun/star/awt/XWindow.idl> 
+#endif 
 
-#ifndef __com_sun_star_awt_XView_idl__
-#include <com/sun/star/awt/XView.idl>
-#endif
+#ifndef __com_sun_star_awt_XView_idl__ 
+#include <com/sun/star/awt/XView.idl> 
+#endif 
 
 #ifndef __com_sun_star_accessibility_XAccessible_idl__
 #include <com/sun/star/accessibility/XAccessible.idl>
 #endif
 
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
  module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** specifies an abstract control.
-
-    <p>All components which implement this service can
-    be integrated in a windowing environment. This service describes
+     
+//============================================================================= 
+ 
+/** specifies an abstract control. 
+        
+    <p>All components which implement this service can 
+    be integrated in a windowing environment. This service describes 
     the controller of the Smalltalk model view controller design.</p>
-
-    <p>You must set a model and a stub to the UnoControl before using
-    other methods.  The implementation only allows the change of the
-    graphics (<type>XView</type>) if the window is not visible. The
-    change of the graphics in visible state should redirect the output
+    
+    <p>You must set a model and a stub to the UnoControl before using 
+    other methods.  The implementation only allows the change of the 
+    graphics (<type>XView</type>) if the window is not visible. The 
+    change of the graphics in visible state should redirect the output 
     to these graphics, but this behavior is implementation-specific.</p>
-
-    <p>The change of data directly at the control may not affect the
+    
+    <p>The change of data directly at the control may not affect the 
     model data. To ensure this behavior, modify the data of the model.</p>
  */
 published service UnoControl
-{
-    interface com::sun::star::lang::XComponent;
-
-    interface com::sun::star::awt::XControl;
-
-    interface com::sun::star::awt::XWindow;
-
+{	 
+    interface com::sun::star::lang::XComponent; 
+    
+    interface com::sun::star::awt::XControl; 
+    
+    interface com::sun::star::awt::XWindow; 
+    
     interface com::sun::star::awt::XView;
 
     /** provides access to the accessible context associated with this object.
@@ -84,11 +84,11 @@ published service UnoControl
         @since OOo 1.1.2
      */
     [optional] interface com::sun::star::accessibility::XAccessible;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlButton.idl b/offapi/com/sun/star/awt/UnoControlButton.idl
index 96e2ac272e57..e421222852ec 100644
--- a/offapi/com/sun/star/awt/UnoControlButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoButtonControl_idl__
-#define __com_sun_star_awt_UnoButtonControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControl_idl__
-#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XButton_idl__
-#include <com/sun/star/awt/XButton.idl>
+#ifndef __com_sun_star_awt_UnoButtonControl_idl__ 
+#define __com_sun_star_awt_UnoButtonControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControl_idl__ 
+#include <com/sun/star/awt/UnoControl.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XButton_idl__ 
+#include <com/sun/star/awt/XButton.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XLayoutConstrains_idl__ 
+#include <com/sun/star/awt/XLayoutConstrains.idl> 
 #endif
 
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
-#include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a button control.
  */
 published service UnoControlButton
-{
-    service com::sun::star::awt::UnoControl;
-
-    interface com::sun::star::awt::XButton;
-
+{ 
+    service com::sun::star::awt::UnoControl; 
+    
+    interface com::sun::star::awt::XButton; 
+    
     interface com::sun::star::awt::XLayoutConstrains;
-
-};
-
-//=============================================================================
-
+    
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; };
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlButtonModel.idl b/offapi/com/sun/star/awt/UnoControlButtonModel.idl
index 1a8b4b2cced8..f7fdfed94d38 100644
--- a/offapi/com/sun/star/awt/UnoControlButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlButtonModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/UnoControlCheckBox.idl b/offapi/com/sun/star/awt/UnoControlCheckBox.idl
index f9f286e5b8fb..f395350a2647 100644
--- a/offapi/com/sun/star/awt/UnoControlCheckBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlCheckBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoCheckBoxControl_idl__
-#define __com_sun_star_awt_UnoCheckBoxControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControl_idl__
-#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XCheckBox_idl__
-#include <com/sun/star/awt/XCheckBox.idl>
+#ifndef __com_sun_star_awt_UnoCheckBoxControl_idl__ 
+#define __com_sun_star_awt_UnoCheckBoxControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControl_idl__ 
+#include <com/sun/star/awt/UnoControl.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XCheckBox_idl__ 
+#include <com/sun/star/awt/XCheckBox.idl> 
 #endif
 
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
-#include <com/sun/star/awt/XLayoutConstrains.idl>
+#ifndef __com_sun_star_awt_XLayoutConstrains_idl__ 
+#include <com/sun/star/awt/XLayoutConstrains.idl> 
 #endif
 
 
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a check box control.
  */
 published service UnoControlCheckBox
-{
-    service com::sun::star::awt::UnoControl;
-
+{ 
+    service com::sun::star::awt::UnoControl; 
+    
     interface com::sun::star::awt::XCheckBox;
-
+    
     interface com::sun::star::awt::XLayoutConstrains;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl b/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl
index 7870f03f4aec..b7fe6f487adb 100644
--- a/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/UnoControlComboBox.idl b/offapi/com/sun/star/awt/UnoControlComboBox.idl
index 0392f571cd33..3709a2e5b795 100644
--- a/offapi/com/sun/star/awt/UnoControlComboBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlComboBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoComboBoxControl_idl__
-#define __com_sun_star_awt_UnoComboBoxControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
-#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XComboBox_idl__
-#include <com/sun/star/awt/XComboBox.idl>
+#ifndef __com_sun_star_awt_UnoComboBoxControl_idl__ 
+#define __com_sun_star_awt_UnoComboBoxControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
+#include <com/sun/star/awt/UnoControlEdit.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XComboBox_idl__ 
+#include <com/sun/star/awt/XComboBox.idl> 
 #endif
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a combo box control.
  */
 published service UnoControlComboBox
-{
-    service com::sun::star::awt::UnoControlEdit;
-
+{ 
+    service com::sun::star::awt::UnoControlEdit; 
+    
     interface com::sun::star::awt::XComboBox;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
index 5e6b650f8848..2fe01dab365f 100644
--- a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,72 +24,72 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlComboBoxModel_idl__
-#define __com_sun_star_awt_UnoControlComboBoxModel_idl__
+#ifndef __com_sun_star_awt_UnoControlComboBoxModel_idl__ 
+#define __com_sun_star_awt_UnoControlComboBoxModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
 
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlModel.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
-
+ 
 #include <com/sun/star/awt/XItemList.idl>
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the standard model of an <type>UnoControlComboBox</type>.
  */
 published service UnoControlComboBoxModel
-{
-    service com::sun::star::awt::UnoControlModel;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the horizontal alignment of the text in the control.
-
+{ 
+    service com::sun::star::awt::UnoControlModel; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the horizontal alignment of the text in the control. 
+                
         <pre>
         0: left
         1: center
         2: right
         </pre>
      */
-    [optional, property] short Align;
-
-    //-------------------------------------------------------------------------
-
+    [optional, property] short Align; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies whether automatic completion of text is enabled.
      */
-    [property] boolean Autocomplete;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Autocomplete; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the background color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color BackgroundColor;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the border style of the control.
-
+    [property] com::sun::star::util::Color BackgroundColor; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the border style of the control. 
+                
         <pre>
         0: No border
         1: 3D border
         2: simple border
         </pre>
      */
-    [property] short Border;
-
-    //-------------------------------------------------------------------------
+    [property] short Border; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the color of the border, if present
 
@@ -99,53 +99,53 @@ published service UnoControlComboBoxModel
         @since OOo 2.0.0
      */
     [optional, property] long BorderColor;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies if the control has a drop down button.
      */
-    [property] boolean Dropdown;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Dropdown; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines whether the control is enabled or disabled.
      */
-    [property] boolean Enabled;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Enabled; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the font attributes of the text in the control.
      */
-    [property] com::sun::star::awt::FontDescriptor FontDescriptor;
-
+    [property] com::sun::star::awt::FontDescriptor FontDescriptor; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the <type scope="com::sun::star::text">FontEmphasis</type>
         value of the text in the control.
      */
     [property] short FontEmphasisMark;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the <type scope="com::sun::star::text">FontRelief</type>
         value of the text in the control.
      */
     [property] short FontRelief;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the help text of the control.
      */
     [property] string HelpText;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the help URL of the control.
      */
     [property] string HelpURL;
 
     //-------------------------------------------------------------------------
-
+    
     /** specifies whether the selection in the control should be hidden when
         the control is not active (focused).
 
@@ -153,57 +153,57 @@ published service UnoControlComboBoxModel
      */
     [optional, property] boolean HideInactiveSelection;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** specifies the maximum line count displayed in the drop down box.
      */
-    [property] short LineCount;
-
+    [property] short LineCount; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the maximum character count.
 
-        <p>There's no limitation, if set to 0.</p>
+        <p>There's no limitation, if set to 0.</p>    
      */
-    [property] short MaxTextLen;
-
-    //-------------------------------------------------------------------------
-
+    [property] short MaxTextLen; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the control will be printed with the document.
      */
-    [property] boolean Printable;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Printable; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the content of the control cannot be modified by the user.
      */
-    [property] boolean ReadOnly;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean ReadOnly; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the list of items.
      */
-    [property] sequence<string> StringItemList;
-
-    //-------------------------------------------------------------------------
-
+    [property] sequence<string> StringItemList; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the control can be reached with the TAB key.
      */
-    [property] boolean Tabstop;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Tabstop; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the text displayed in the control.
      */
-    [property] string Text;
-
-    //-------------------------------------------------------------------------
-
+    [property] string Text; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the text color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color TextColor;
-
-    //-------------------------------------------------------------------------
+    [property] com::sun::star::util::Color TextColor; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the text line color (RGB) of the control.
      */
@@ -231,10 +231,10 @@ published service UnoControlComboBoxModel
         <member>StringItemList</member> property.
     */
     [optional] interface XItemList;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlContainer.idl b/offapi/com/sun/star/awt/UnoControlContainer.idl
index 1b63521680a2..6f09cdf82f2f 100644
--- a/offapi/com/sun/star/awt/UnoControlContainer.idl
+++ b/offapi/com/sun/star/awt/UnoControlContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlContainer_idl__
+#ifndef __com_sun_star_awt_UnoControlContainer_idl__ 
 #define __com_sun_star_awt_UnoControlContainer_idl__
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
-#include <com/sun/star/awt/UnoControl.idl>
-#endif
+#ifndef __com_sun_star_awt_UnoControl_idl__ 
+#include <com/sun/star/awt/UnoControl.idl> 
+#endif 
 
-#ifndef __com_sun_star_awt_XUnoControlContainer_idl__
+#ifndef __com_sun_star_awt_XUnoControlContainer_idl__ 
 #include <com/sun/star/awt/XUnoControlContainer.idl>
 #endif
 
-#ifndef __com_sun_star_awt_XControlContainer_idl__
-#include <com/sun/star/awt/XControlContainer.idl>
+#ifndef __com_sun_star_awt_XControlContainer_idl__ 
+#include <com/sun/star/awt/XControlContainer.idl> 
 #endif
 
-#ifndef __com_sun_star_container_XContainer_idl__
-#include <com/sun/star/container/XContainer.idl>
+#ifndef __com_sun_star_container_XContainer_idl__ 
+#include <com/sun/star/container/XContainer.idl> 
 #endif
 
 
-//=============================================================================
-
+//============================================================================= 
+ 
  module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** specifies an abstract control which contains other controls.
+     
+//============================================================================= 
+ 
+/** specifies an abstract control which contains other controls.				
  */
 published service UnoControlContainer
 {
     service com::sun::star::awt::UnoControl;
 
     interface com::sun::star::awt::XUnoControlContainer;
-
+    
     interface com::sun::star::awt::XControlContainer;
 
     interface com::sun::star::container::XContainer;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlContainerModel.idl b/offapi/com/sun/star/awt/UnoControlContainerModel.idl
index 9fda3791781f..1235f23aef32 100644
--- a/offapi/com/sun/star/awt/UnoControlContainerModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlContainerModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,55 +24,55 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlContainerModel_idl__
-#define __com_sun_star_awt_UnoControlContainerModel_idl__
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
+#ifndef __com_sun_star_awt_UnoControlContainerModel_idl__ 
+#define __com_sun_star_awt_UnoControlContainerModel_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlModel.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the standard model of an <type>UnoControlContainer</type>.
  */
 published service UnoControlContainerModel
-{
-    service com::sun::star::awt::UnoControlModel;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    service com::sun::star::awt::UnoControlModel; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the background color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color BackgroundColor;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::util::Color BackgroundColor; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines whether a control is enabled or disabled.
      */
-    [property] boolean Enabled;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the border style of the control.
-
+    [property] boolean Enabled; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the border style of the control. 
+                
         <pre>
         0: No border
         1: 3D border
         2: simple border
         </pre>
      */
-    [property] short Border;
-
-    //-------------------------------------------------------------------------
+    [property] short Border; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the color of the border, if present
 
@@ -82,35 +82,35 @@ published service UnoControlContainerModel
         @since OOo 2.0.0
      */
     [optional, property] long BorderColor;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies whether the control will be printed with the document.
      */
-    [property] boolean Printable;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Printable; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the text displayed in the control.
      */
-    [property] string Text;
-
-    //-------------------------------------------------------------------------
-
+    [property] string Text; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the help text of the control.
      */
     [property] string HelpText;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the help URL of the control.
      */
     [property] string HelpURL;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlCurrencyField.idl b/offapi/com/sun/star/awt/UnoControlCurrencyField.idl
index 06159fb54ed2..eb7caf1475bd 100644
--- a/offapi/com/sun/star/awt/UnoControlCurrencyField.idl
+++ b/offapi/com/sun/star/awt/UnoControlCurrencyField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoCurrencyFieldControl_idl__
-#define __com_sun_star_awt_UnoCurrencyFieldControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
-#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__
-#include <com/sun/star/awt/XSpinField.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XCurrencyField_idl__
-#include <com/sun/star/awt/XCurrencyField.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_UnoCurrencyFieldControl_idl__ 
+#define __com_sun_star_awt_UnoCurrencyFieldControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
+#include <com/sun/star/awt/UnoControlEdit.idl> 
+#endif 
+
+#ifndef __com_sun_star_awt_XSpinField_idl__ 
+#include <com/sun/star/awt/XSpinField.idl> 
+#endif 
+
+#ifndef __com_sun_star_awt_XCurrencyField_idl__ 
+#include <com/sun/star/awt/XCurrencyField.idl> 
+#endif 
+
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a currency field control.
 
     <p>A currency field makes it possible to enter, display and edit
     currency values.</p>
  */
 published service UnoControlCurrencyField
-{
-    service com::sun::star::awt::UnoControlEdit;
+{ 
+    service com::sun::star::awt::UnoControlEdit; 
 
     /** gives access to the value of a spin field and makes it possible to
         register for spin events.
 
         @since OOo 1.1.2
      */
-    [optional] interface com::sun::star::awt::XSpinField;
-
+    [optional] interface com::sun::star::awt::XSpinField; 
+    
     interface com::sun::star::awt::XCurrencyField;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl b/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl
index 781d672d2001..9d062d1f76c7 100644
--- a/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlCurrencyFieldModel_idl__
-#define __com_sun_star_awt_UnoControlCurrencyFieldModel_idl__
+#ifndef __com_sun_star_awt_UnoControlCurrencyFieldModel_idl__ 
+#define __com_sun_star_awt_UnoControlCurrencyFieldModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
 
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlModel.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
-
+ 
 #ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the standard model of an <type>UnoControlCurrencyField</type>.
  */
 published service UnoControlCurrencyFieldModel
-{
-    service com::sun::star::awt::UnoControlModel;
-
-    //-------------------------------------------------------------------------
+{ 
+    service com::sun::star::awt::UnoControlModel; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the background color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color BackgroundColor;
-
+    [property] com::sun::star::util::Color BackgroundColor; 
+ 
     //-------------------------------------------------------------------------
 
-    /** specifies the border style of the control.
-
+    /** specifies the border style of the control. 
+                
         <pre>
         0: No border
         1: 3D border
@@ -72,8 +72,8 @@ published service UnoControlCurrencyFieldModel
         </pre>
      */
     [property] short Border;
-
-    //-------------------------------------------------------------------------
+    
+    //------------------------------------------------------------------------- 
 
     /** specifies the color of the border, if present
 
@@ -83,59 +83,59 @@ published service UnoControlCurrencyFieldModel
         @since OOo 2.0.0
      */
     [optional, property] long BorderColor;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the currency symbol.
      */
-    [property] string CurrencySymbol;
-
-    //-------------------------------------------------------------------------
-
+    [property] string CurrencySymbol; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the decimal accuracy.
      */
-    [property] short DecimalAccuracy;
-
+    [property] short DecimalAccuracy; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** determines whether the control is enabled or disabled.
      */
-    [property] boolean Enabled;
-
-    //-------------------------------------------------------------------------
+    [property] boolean Enabled; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the font attributes of the text in the control.
      */
-    [property] com::sun::star::awt::FontDescriptor FontDescriptor;
-
+    [property] com::sun::star::awt::FontDescriptor FontDescriptor; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the <type scope="com::sun::star::text">FontEmphasis</type>
         value of the text in the control.
      */
     [property] short FontEmphasisMark;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the <type scope="com::sun::star::text">FontRelief</type>
         value of the text in the control.
      */
     [property] short FontRelief;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the help text of the control.
      */
     [property] string HelpText;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the help URL of the control.
      */
     [property] string HelpURL;
 
     //-------------------------------------------------------------------------
-
+    
     /** specifies whether the selection in the control should be hidden when
         the control is not active (focused).
 
@@ -144,24 +144,24 @@ published service UnoControlCurrencyFieldModel
     [optional, property] boolean HideInactiveSelection;
 
     //-------------------------------------------------------------------------
-
+    
     /** specifies whether the currency symbol is to be prepended.
      */
 
     [property] boolean PrependCurrencySymbol;
 
     //-------------------------------------------------------------------------
-
+    
     /** specifies that the control will be printed with the document.
      */
-    [property] boolean Printable;
-
-    //-------------------------------------------------------------------------
+    [property] boolean Printable; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies that the content of the control cannot be modified by the user.
      */
-    [property] boolean ReadOnly;
-
+    [property] boolean ReadOnly; 
+ 
     //-------------------------------------------------------------------------
 
     /** specifies whether the mouse should show repeating behavior, i.e.
@@ -171,7 +171,7 @@ published service UnoControlCurrencyFieldModel
      */
     [optional, property] boolean Repeat;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the mouse repeat delay, in milliseconds.
 
@@ -185,65 +185,65 @@ published service UnoControlCurrencyFieldModel
      */
     [optional, property] long RepeatDelay;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies whether the thousands separator is to be displayed.
      */
-    [property] boolean ShowThousandsSeparator;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean ShowThousandsSeparator; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the control has a spin button.
      */
-    [property] boolean Spin;
-
+    [property] boolean Spin; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies that the value is checked during the user input.
      */
-    [property] boolean StrictFormat;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean StrictFormat; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** specifies that the control can be reached with the TAB key.
      */
-    [property] boolean Tabstop;
-
+    [property] boolean Tabstop; 
+ 
     //-------------------------------------------------------------------------
 
     /** specifies the text color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color TextColor;
-
+    [property] com::sun::star::util::Color TextColor; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the text line color (RGB) of the control.
      */
     [property] com::sun::star::util::Color TextLineColor;
 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the value displayed in the control.
      */
-    [property] double Value;
-
-    //-------------------------------------------------------------------------
-
+    [property] double Value; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the maximum value that can be entered.
      */
-    [property] double ValueMax;
-
-    //-------------------------------------------------------------------------
-
+    [property] double ValueMax; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the minimum value that can be entered.
      */
-    [property] double ValueMin;
-
-    //-------------------------------------------------------------------------
-
+    [property] double ValueMin; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the value step when using the spin button.
      */
-    [property] double ValueStep;
+    [property] double ValueStep; 
 
     /** denotes the writing mode used in the control, as specified in the
         <type scope="com::sun::star::text">WritingMode2</type> constants group.
@@ -270,10 +270,10 @@ published service UnoControlCurrencyFieldModel
         @since OpenOffice.org 3.3
      */
     [optional, property] com::sun::star::style::VerticalAlignment VerticalAlign;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlDateField.idl b/offapi/com/sun/star/awt/UnoControlDateField.idl
index 77f7f677a28e..fea807ad83f2 100644
--- a/offapi/com/sun/star/awt/UnoControlDateField.idl
+++ b/offapi/com/sun/star/awt/UnoControlDateField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoDateFieldControl_idl__
-#define __com_sun_star_awt_UnoDateFieldControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
-#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__
-#include <com/sun/star/awt/XSpinField.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDateField_idl__
-#include <com/sun/star/awt/XDateField.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_UnoDateFieldControl_idl__ 
+#define __com_sun_star_awt_UnoDateFieldControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
+#include <com/sun/star/awt/UnoControlEdit.idl> 
+#endif 
+
+#ifndef __com_sun_star_awt_XSpinField_idl__ 
+#include <com/sun/star/awt/XSpinField.idl> 
+#endif 
+
+#ifndef __com_sun_star_awt_XDateField_idl__ 
+#include <com/sun/star/awt/XDateField.idl> 
+#endif 
+ 
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a date field control.
-
+    
     <p>A date field makes it possible to enter, display and edit date values.</p>
  */
 published service UnoControlDateField
-{
-    service com::sun::star::awt::UnoControlEdit;
+{ 
+    service com::sun::star::awt::UnoControlEdit; 
 
     /** gives access to the value of a spin field and makes it possible to
         register for spin events.
 
         @since OOo 1.1.2
-     */
-    [optional] interface com::sun::star::awt::XSpinField;
-
+     */	
+    [optional] interface com::sun::star::awt::XSpinField; 
+    
     interface com::sun::star::awt::XDateField;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl b/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl
index 2ce08a35f774..84a9aa57a316 100644
--- a/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,56 +24,56 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlDateFieldModel_idl__
-#define __com_sun_star_awt_UnoControlDateFieldModel_idl__
+#ifndef __com_sun_star_awt_UnoControlDateFieldModel_idl__ 
+#define __com_sun_star_awt_UnoControlDateFieldModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
 
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlModel.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
-
+ 
 #ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the standard model of an <type>UnoControlDateField</type>.
  */
 published service UnoControlDateFieldModel
-{
-    service com::sun::star::awt::UnoControlModel;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    service com::sun::star::awt::UnoControlModel; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the background color(RGB) of the control.
      */
-    [property] com::sun::star::util::Color BackgroundColor;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the border style of the control.
-
+    [property] com::sun::star::util::Color BackgroundColor; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the border style of the control. 
+                
         <pre>
         0: No border
         1: 3D border
         2: simple border
         </pre>
      */
-    [property] short Border;
-
-    //-------------------------------------------------------------------------
+    [property] short Border; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the color of the border, if present
 
@@ -83,19 +83,19 @@ published service UnoControlDateFieldModel
         @since OOo 2.0.0
      */
     [optional, property] long BorderColor;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the date displayed in the control.
 
         <p>The date must be specified in the format YYYYMMDD.</p>
      */
     [property] long Date;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+     
     /** specifies the format of the displayed date.
-
+                
         <pre>
         0:   system short
         1:   system short YY
@@ -112,71 +112,71 @@ published service UnoControlDateFieldModel
         </pre>
      */
     [property] short DateFormat;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+     
     /** specifies the maximum date that can be entered.
      */
-    [property] long DateMax;
-
-    //-------------------------------------------------------------------------
-
+    [property] long DateMax; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the minimum date that can be entered.
      */
-    [property] long DateMin;
-
+    [property] long DateMin; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies, if the date century is displayed.
      */
-    [property] boolean DateShowCentury;
-
+    [property] boolean DateShowCentury; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies, if the control has a dropdown button.
      */
-    [property] boolean Dropdown;
-
+    [property] boolean Dropdown; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** determines whether the control is enabled or disabled.
      */
     [property] boolean Enabled;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+     
     /** specifies the font attributes of the text in the control.
      */
-    [property] com::sun::star::awt::FontDescriptor FontDescriptor;
-
-    //-------------------------------------------------------------------------
+    [property] com::sun::star::awt::FontDescriptor FontDescriptor; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the <type scope="com::sun::star::text">FontEmphasis</type>
         value of the text in the control.
      */
     [property] short FontEmphasisMark;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the <type scope="com::sun::star::text">FontRelief</type>
         value of the text in the control.
      */
     [property] short FontRelief;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the help text of the control.
      */
     [property] string HelpText;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the help URL of the control.
      */
     [property] string HelpURL;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies whether the selection in the control should be hidden when
         the control is not active (focused).
 
@@ -185,18 +185,18 @@ published service UnoControlDateFieldModel
     [optional, property] boolean HideInactiveSelection;
 
     //-------------------------------------------------------------------------
-
+    
     /** specifies that the control will be printed with the document.
      */
-    [property] boolean Printable;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Printable; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the content of the control cannot be modified by the user.
      */
-    [property] boolean ReadOnly;
-
-    //-------------------------------------------------------------------------
+    [property] boolean ReadOnly; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies whether the mouse should show repeating behavior, i.e.
         repeatedly trigger an action when keeping pressed.
@@ -205,7 +205,7 @@ published service UnoControlDateFieldModel
      */
     [optional, property] boolean Repeat;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the mouse repeat delay, in milliseconds.
 
@@ -219,40 +219,40 @@ published service UnoControlDateFieldModel
      */
     [optional, property] long RepeatDelay;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies that the control has a spin button.
      */
-    [property] boolean Spin;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Spin; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the date is checked during the user input.
      */
-    [property] boolean StrictFormat;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean StrictFormat; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the control can be reached with the TAB key.
      */
-    [property] boolean Tabstop;
-
-    //-------------------------------------------------------------------------
+    [property] boolean Tabstop; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the text displayed in the control.
 
-        @since OOo 2.0.0
+        @since OOo 2.0.0    
      */
-    [optional, property] string Text;
-
-    //-------------------------------------------------------------------------
+    [optional, property] string Text; 
 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the text color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color TextColor;
-
+    [property] com::sun::star::util::Color TextColor; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the text line color (RGB) of the control.
      */
     [property] com::sun::star::util::Color TextLineColor;
@@ -282,10 +282,10 @@ published service UnoControlDateFieldModel
         @since OpenOffice.org 3.3
      */
     [optional, property] com::sun::star::style::VerticalAlignment VerticalAlign;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlDialog.idl b/offapi/com/sun/star/awt/UnoControlDialog.idl
index 443b0da18563..e7f08714ef8c 100644
--- a/offapi/com/sun/star/awt/UnoControlDialog.idl
+++ b/offapi/com/sun/star/awt/UnoControlDialog.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlDialog_idl__
+#ifndef __com_sun_star_awt_UnoControlDialog_idl__ 
 #define __com_sun_star_awt_UnoControlDialog_idl__
 
-#ifndef __com_sun_star_awt_UnoControlContainer_idl__
-#include <com/sun/star/awt/UnoControlContainer.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTopWindow_idl__
-#include <com/sun/star/awt/XTopWindow.idl>
+#ifndef __com_sun_star_awt_UnoControlContainer_idl__ 
+#include <com/sun/star/awt/UnoControlContainer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XTopWindow_idl__ 
+#include <com/sun/star/awt/XTopWindow.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XDialog_idl__ 
+#include <com/sun/star/awt/XDialog.idl> 
 #endif
 
-#ifndef __com_sun_star_awt_XDialog_idl__
-#include <com/sun/star/awt/XDialog.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a dialog control.
  */
 published service UnoControlDialog
 {
-    service com::sun::star::awt::UnoControlContainer;
-
+    service com::sun::star::awt::UnoControlContainer; 
+    
     interface com::sun::star::awt::XTopWindow;
-
+    
     interface com::sun::star::awt::XDialog;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlDialogElement.idl b/offapi/com/sun/star/awt/UnoControlDialogElement.idl
index b02fe7bd116f..6bb37caf3d1f 100644
--- a/offapi/com/sun/star/awt/UnoControlDialogElement.idl
+++ b/offapi/com/sun/star/awt/UnoControlDialogElement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,74 +24,74 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlDialogElement_idl__
+#ifndef __com_sun_star_awt_UnoControlDialogElement_idl__ 
 #define __com_sun_star_awt_UnoControlDialogElement_idl__
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
 //=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** specifies a set of properties to describe the model of an
+     
+/**	specifies a set of properties to describe the model of an
     <type>UnoControl</type> which is embedded in a
-    <type>UnoControlDialogModel</type>.
+    <type>UnoControlDialogModel</type>.    
  */
 published service UnoControlDialogElement
-{
+{ 
     //-------------------------------------------------------------------------
 
     /** specifies the height of the control.
      */
-    [property] long Height;
-
-    //-------------------------------------------------------------------------
+    [property] long Height; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the name of the control.
      */
     [property] string Name;
-
-    //-------------------------------------------------------------------------
+    
+    //------------------------------------------------------------------------- 
 
     /** specifies the horizontal position of the control.
      */
     [property] string PositionX;
-
-    //-------------------------------------------------------------------------
+    
+    //------------------------------------------------------------------------- 
 
     /** specifies the vertical position of the control.
      */
     [property] string PositionY;
-
+    
     //-------------------------------------------------------------------------
 
     /** specifies the step of the control.
      */
     [property] long Step;
-
+    
     //-------------------------------------------------------------------------
 
     /** specifies the tabindex of the control.
      */
     [property] short TabIndex;
-
+    
     //-------------------------------------------------------------------------
-
+    
     /** specifies the tag of the control.
      */
     [property] string Tag;
-
+    
     //-------------------------------------------------------------------------
-
+    
     /** specifies the width of the control.
      */
     [property] long Width;
 
-    //-------------------------------------------------------------------------
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    //-------------------------------------------------------------------------    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlDialogModel.idl b/offapi/com/sun/star/awt/UnoControlDialogModel.idl
index ff6188e5276e..215568c35cc0 100644
--- a/offapi/com/sun/star/awt/UnoControlDialogModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlDialogModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,25 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlDialogModel_idl__
-#define __com_sun_star_awt_UnoControlDialogModel_idl__
+#ifndef __com_sun_star_awt_UnoControlDialogModel_idl__ 
+#define __com_sun_star_awt_UnoControlDialogModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#include <com/sun/star/awt/UnoControlModel.idl>
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlModel.idl> 
 #endif
 
-#ifndef __com_sun_star_container_XContainer_idl__
-#include <com/sun/star/container/XContainer.idl>
+#ifndef __com_sun_star_container_XContainer_idl__ 
+#include <com/sun/star/container/XContainer.idl> 
 #endif
 
 #ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
 #endif
-
+ 
 #ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
 #endif
@@ -55,108 +55,108 @@
 #include <com/sun/star/graphic/XGraphic.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the standard model of an <type>UnoControlDialog</type>.
  */
 published service UnoControlDialogModel
-{
+{ 
     service com::sun::star::awt::UnoControlModel;
-
+    
     /** allows to create control models, which support the
         <type>UnoControlDialogElement</type> service and can be inserted into
         this container.
      */
     interface com::sun::star::lang::XMultiServiceFactory;
-
-    interface com::sun::star::container::XContainer;
+    
+    interface com::sun::star::container::XContainer; 
 
     interface com::sun::star::container::XNameContainer;
 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the background color (RGB) of the dialog.
      */
-    [property] com::sun::star::util::Color BackgroundColor;
-
+    [property] com::sun::star::util::Color BackgroundColor; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies if the dialog is closeable.
      */
-    [property] boolean Closeable;
-
+    [property] boolean Closeable; 
+ 
     //-------------------------------------------------------------------------
 
     /** determines whether a dialog is enabled or disabled.
      */
-    [property] boolean Enabled;
-
-    //-------------------------------------------------------------------------
+    [property] boolean Enabled; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the font attributes of the text in the caption bar of the dialog.
      */
-    [property] com::sun::star::awt::FontDescriptor FontDescriptor;
-
+    [property] com::sun::star::awt::FontDescriptor FontDescriptor; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the <type scope="com::sun::star::text">FontEmphasis</type>
         value of the text in the caption bar of the dialog.
      */
     [property] short FontEmphasisMark;
-
+ 
     //-------------------------------------------------------------------------
 
     /** specifies the <type scope="com::sun::star::text">FontRelief</type>
         value of the text in the caption bar of the dialog.
      */
     [property] short FontRelief;
-
+ 
     //-------------------------------------------------------------------------
 
     /** specifies the help text of the dialog.
      */
     [property] string HelpText;
-
-    //-------------------------------------------------------------------------
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the help URL of the dialog.
      */
     [property] string HelpURL;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+    
     /** specifies if the dialog is moveable.
      */
     [property] boolean Moveable;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies if the dialog is sizeable.
      */
     [property] boolean Sizeable;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the text color (RGB) of the dialog.
      */
-    [property] com::sun::star::util::Color TextColor;
-
-    //-------------------------------------------------------------------------
+    [property] com::sun::star::util::Color TextColor; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the text line color (RGB) of the dialog.
      */
     [property] com::sun::star::util::Color TextLineColor;
-
+    
     //-------------------------------------------------------------------------
 
     /** specifies the text that is displayed in the caption bar of the dialog.
      */
     [property] string Title;
-
+    
     //-------------------------------------------------------------------------
 
     /** If set to true the dialog will have the desktop as parent.
@@ -187,11 +187,11 @@ published service UnoControlDialogModel
         @since OOo 2.4.0
      */
     [optional, property, transient] com::sun::star::graphic::XGraphic Graphic;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+}; 
+
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlEdit.idl b/offapi/com/sun/star/awt/UnoControlEdit.idl
index e603aa3ee29b..efb5ecbe5199 100644
--- a/offapi/com/sun/star/awt/UnoControlEdit.idl
+++ b/offapi/com/sun/star/awt/UnoControlEdit.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
-#define __com_sun_star_awt_UnoControlEdit_idl__
-
-#ifndef __com_sun_star_awt_UnoControl_idl__
-#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTextComponent_idl__
-#include <com/sun/star/awt/XTextComponent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
-#include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTextLayoutConstrains_idl__
-#include <com/sun/star/awt/XTextLayoutConstrains.idl>
+#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
+#define __com_sun_star_awt_UnoControlEdit_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControl_idl__ 
+#include <com/sun/star/awt/UnoControl.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XTextComponent_idl__ 
+#include <com/sun/star/awt/XTextComponent.idl> 
 #endif
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XLayoutConstrains_idl__ 
+#include <com/sun/star/awt/XLayoutConstrains.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XTextLayoutConstrains_idl__ 
+#include <com/sun/star/awt/XTextLayoutConstrains.idl> 
+#endif 
+
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies an edit control.
  */
 published service UnoControlEdit
-{
-    service com::sun::star::awt::UnoControl;
-
+{ 
+    service com::sun::star::awt::UnoControl; 
+    
     interface com::sun::star::awt::XTextComponent;
-
-    interface com::sun::star::awt::XLayoutConstrains;
-
-    interface com::sun::star::awt::XTextLayoutConstrains;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+    interface com::sun::star::awt::XLayoutConstrains; 
+    
+    interface com::sun::star::awt::XTextLayoutConstrains; 
+
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlEditModel.idl b/offapi/com/sun/star/awt/UnoControlEditModel.idl
index 5ac71c442f3b..d819bf97bb98 100644
--- a/offapi/com/sun/star/awt/UnoControlEditModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlEditModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,58 +24,58 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlEditModel_idl__
-#define __com_sun_star_awt_UnoControlEditModel_idl__
+#ifndef __com_sun_star_awt_UnoControlEditModel_idl__ 
+#define __com_sun_star_awt_UnoControlEditModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
 
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlModel.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
-
+ 
 #ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the standard model of an <type>UnoControlEdit</type>.
  */
 published service UnoControlEditModel
-{
-    service com::sun::star::awt::UnoControlModel;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the horizontal alignment of the text in the control.
-
+{ 
+    service com::sun::star::awt::UnoControlModel; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the horizontal alignment of the text in the control. 
+                
         <pre>
         0: left
         1: center
         2: right
         </pre>
      */
-    [property] short Align;
-
-    //-------------------------------------------------------------------------
-
+    [property] short Align; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If set to true an horizontal scrollbar will be added automatically
         when needed.
 
         @since OOo 2.3.0
      */
     [optional, property] boolean AutoHScroll;
-
+    
     //-------------------------------------------------------------------------
 
     /** If set to true an vertical scrollbar will be added automatically
@@ -84,26 +84,26 @@ published service UnoControlEditModel
         @since OOo 2.3.0
      */
     [optional, property] boolean AutoVScroll;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+     
     /** specifies the background color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color BackgroundColor;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the border style of the control.
-
+    [property] com::sun::star::util::Color BackgroundColor; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the border style of the control. 
+                
         <pre>
         0: No border
         1: 3D border
         2: simple border
         </pre>
      */
-    [property] short Border;
-
-    //-------------------------------------------------------------------------
+    [property] short Border; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the color of the border, if present
 
@@ -113,61 +113,61 @@ published service UnoControlEditModel
         @since OOo 2.0.0
      */
     [optional, property] long BorderColor;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the echo character for a password edit field.
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the echo character for a password edit field.		
      */
-    [optional, property] short EchoChar;
-
-    //-------------------------------------------------------------------------
-
+    [optional, property] short EchoChar; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines whether the control is enabled or disabled.
      */
-    [property] boolean Enabled;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Enabled; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the font attributes of the text in the control.
      */
-    [property] com::sun::star::awt::FontDescriptor FontDescriptor;
+    [property] com::sun::star::awt::FontDescriptor FontDescriptor; 
 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the <type scope="com::sun::star::text">FontEmphasis</type>
         value of the text in the control.
      */
     [property] short FontEmphasisMark;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the <type scope="com::sun::star::text">FontRelief</type>
         value of the text in the control.
      */
     [property] short FontRelief;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+          
     /** specifies if hard line breaks will be returned in the
         <member>XTextComponent::getText</member> method.
      */
     [property] boolean HardLineBreaks;
-
+    
     //-------------------------------------------------------------------------
-
+    
     /** specifies the help text of the control.
      */
     [property] string HelpText;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the help URL of the control.
      */
     [property] string HelpURL;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies whether the selection in the control should be hidden when
+    
+    //------------------------------------------------------------------------- 
+    
+    /** specifies whether the selection in the control should be hidden when 
         the control is not active (focused).
 
         @since OOo 2.0.0
@@ -180,8 +180,8 @@ published service UnoControlEditModel
         the horizontal direction.
      */
     [property] boolean HScroll;
-
-    //-------------------------------------------------------------------------
+    
+    //------------------------------------------------------------------------- 
 
     /** specifies which line end type should be used for multi line text
 
@@ -199,22 +199,22 @@ published service UnoControlEditModel
         @since OOo 2.0.0
      */
     [optional, property] short LineEndFormat;
-
+    
     //-------------------------------------------------------------------------
 
     /** specifies the maximum character count.
 
-        <p>There's no limitation, if set to 0.</p>
+        <p>There's no limitation, if set to 0.</p>    
      */
-    [property] short MaxTextLen;
-
+    [property] short MaxTextLen; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies that the control may have more than one line.
      */
-    [property] boolean MultiLine;
-
-    //-------------------------------------------------------------------------
+    [property] boolean MultiLine; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies whether the control paints it background or not.
 
@@ -222,47 +222,47 @@ published service UnoControlEditModel
      */
     [optional, property] boolean PaintTransparent;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the control will be printed with the document.
      */
-    [property] boolean Printable;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Printable; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the content of the control cannot be modified by the user.
      */
-    [property] boolean ReadOnly;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean ReadOnly; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the control can be reached with the TAB key.
      */
-    [property] boolean Tabstop;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Tabstop; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the text displayed in the control.
      */
-    [property] string Text;
-
-    //-------------------------------------------------------------------------
-
+    [property] string Text; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the text color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color TextColor;
-
+    [property] com::sun::star::util::Color TextColor; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the text line color (RGB) of the control.
      */
     [property] com::sun::star::util::Color TextLineColor;
-
-    //-------------------------------------------------------------------------
+    
+    //------------------------------------------------------------------------- 
 
     /** specifies if the content of the control can be scrolled in
         the vertical direction.
-     */
+     */    
     [property] boolean VScroll;
 
     /** denotes the writing mode used in the control, as specified in the
@@ -282,10 +282,10 @@ published service UnoControlEditModel
         @since OpenOffice.org 3.3
      */
     [optional, property] com::sun::star::style::VerticalAlignment VerticalAlign;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlFileControl.idl b/offapi/com/sun/star/awt/UnoControlFileControl.idl
index da2eceb5fef5..39b2eac8858b 100644
--- a/offapi/com/sun/star/awt/UnoControlFileControl.idl
+++ b/offapi/com/sun/star/awt/UnoControlFileControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoFileControl_idl__
-#define __com_sun_star_awt_UnoFileControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
-#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_UnoFileControl_idl__ 
+#define __com_sun_star_awt_UnoFileControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
+#include <com/sun/star/awt/UnoControlEdit.idl> 
+#endif 
+
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a file control.
 
     <p>A file control extends the <type>UnoControlEdit</type> with a file
     dialog.</p>
  */
 published service UnoControlFileControl
-{
+{ 
     service com::sun::star::awt::UnoControlEdit;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlFileControlModel.idl b/offapi/com/sun/star/awt/UnoControlFileControlModel.idl
index e609a51512ae..6ef9cec330fd 100644
--- a/offapi/com/sun/star/awt/UnoControlFileControlModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFileControlModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlFileControlModel_idl__
-#define __com_sun_star_awt_UnoControlFileControlModel_idl__
-
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
+#ifndef __com_sun_star_awt_UnoControlFileControlModel_idl__ 
+#define __com_sun_star_awt_UnoControlFileControlModel_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
 
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlModel.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
-
+ 
 #ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the standard model of an <type>UnoControlFileControl</type>.
  */
 published service UnoControlFileControlModel
-{
-    service com::sun::star::awt::UnoControlModel;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    service com::sun::star::awt::UnoControlModel; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the background color (RGB) of the control.
      */
     [property] com::sun::star::util::Color BackgroundColor;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the border style of the control.
-
+    
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the border style of the control. 
+                
         <pre>
         0: No border
         1: 3D border
@@ -72,8 +72,8 @@ published service UnoControlFileControlModel
         </pre>
      */
     [property] short Border;
-
-    //-------------------------------------------------------------------------
+    
+    //------------------------------------------------------------------------- 
 
     /** specifies the color of the border, if present
 
@@ -83,48 +83,48 @@ published service UnoControlFileControlModel
         @since OOo 2.0.0
      */
     [optional, property] long BorderColor;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines whether a control is enabled or disabled.
      */
-    [property] boolean Enabled;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Enabled; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the font attributes of the text in the control.
      */
-    [property] com::sun::star::awt::FontDescriptor FontDescriptor;
-
+    [property] com::sun::star::awt::FontDescriptor FontDescriptor; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the <type scope="com::sun::star::text">FontEmphasis</type>
         value of the text in the control.
      */
     [property] short FontEmphasisMark;
-
+ 
     //-------------------------------------------------------------------------
 
     /** specifies the <type scope="com::sun::star::text">FontRelief</type>
         value of the text in the control.
      */
     [property] short FontRelief;
-
+ 
     //-------------------------------------------------------------------------
 
     /** specifies the help text of the control.
      */
     [property] string HelpText;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the help URL of the control.
      */
     [property] string HelpURL;
 
     //-------------------------------------------------------------------------
-
-    /** specifies whether the selection in the control should be hidden when
+    
+    /** specifies whether the selection in the control should be hidden when 
         the control is not active (focused).
 
         @since OOo 2.0.0
@@ -132,43 +132,43 @@ published service UnoControlFileControlModel
     [optional, property] boolean HideInactiveSelection;
 
     //-------------------------------------------------------------------------
-
+    
     /** specifies that the control will be printed with the document.
      */
-    [property] boolean Printable;
-
-    //-------------------------------------------------------------------------
+    [property] boolean Printable; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies that the content of the control cannot be modified by the user.
 
         @since OOo 1.1.2
      */
-    [optional, property] boolean ReadOnly;
-
+    [optional, property] boolean ReadOnly; 
+ 
     //-------------------------------------------------------------------------
 
     /** specifies that the control can be reached with the TAB key.
      */
-    [property] boolean Tabstop;
-
+    [property] boolean Tabstop; 
+ 
     //-------------------------------------------------------------------------
 
     /** specifies the text displayed in the control.
      */
-    [property] string Text;
-
-    //-------------------------------------------------------------------------
-
+    [property] string Text; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the text color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color TextColor;
-
+    [property] com::sun::star::util::Color TextColor; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the text line color (RGB) of the control.
      */
     [property] com::sun::star::util::Color TextLineColor;
-
+    
     //-------------------------------------------------------------------------
 
     /** specifies the vertical alignment of the text in the control.
@@ -176,10 +176,10 @@ published service UnoControlFileControlModel
         @since OpenOffice.org 3.3
      */
     [optional, property] com::sun::star::style::VerticalAlignment VerticalAlign;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl b/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl
index fa0e96885304..0a9c8d5e0c65 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedHyperlink.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl b/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl
index 8d5938d21f6f..441fa75063b7 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/UnoControlFixedLine.idl b/offapi/com/sun/star/awt/UnoControlFixedLine.idl
index 6dd1b1e36e0e..59b024bddc48 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedLine.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedLine.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoFixedLineControl_idl__
-#define __com_sun_star_awt_UnoFixedLineControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControl_idl__
-#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_UnoFixedLineControl_idl__ 
+#define __com_sun_star_awt_UnoFixedLineControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControl_idl__ 
+#include <com/sun/star/awt/UnoControl.idl> 
+#endif 
+ 
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a fixed line control.
  */
 published service UnoControlFixedLine
-{
+{ 
     service com::sun::star::awt::UnoControl;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl b/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl
index b49b6e94d19a..a25145e40d68 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,79 +24,79 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlFixedLineModel_idl__
-#define __com_sun_star_awt_UnoControlFixedLineModel_idl__
+#ifndef __com_sun_star_awt_UnoControlFixedLineModel_idl__ 
+#define __com_sun_star_awt_UnoControlFixedLineModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlModel.idl> 
+#endif 
 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+  
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the standard model of an <type>UnoControlFixedLine</type>.
  */
 published service UnoControlFixedLineModel
-{
-    service com::sun::star::awt::UnoControlModel;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    service com::sun::star::awt::UnoControlModel; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines whether the control is enabled or disabled.
      */
-    [property] boolean Enabled;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Enabled; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the font attributes of the text in the control.
      */
-    [property] com::sun::star::awt::FontDescriptor FontDescriptor;
-
-    //-------------------------------------------------------------------------
+    [property] com::sun::star::awt::FontDescriptor FontDescriptor; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the <type scope="com::sun::star::text">FontEmphasis</type>
         value of the text in the control.
      */
     [property] short FontEmphasisMark;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the <type scope="com::sun::star::text">FontRelief</type>
         value of the text in the control.
      */
     [property] short FontRelief;
-
-    //-------------------------------------------------------------------------
+    
+    //------------------------------------------------------------------------- 
 
     /** specifies the help text of the control.
      */
     [property] string HelpText;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the help URL of the control.
      */
     [property] string HelpURL;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+     
     /** specifies the label of the control.
      */
-    [property] string Label;
-
-    //-------------------------------------------------------------------------
+    [property] string Label; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the orientation of the control.
 
@@ -105,30 +105,30 @@ published service UnoControlFixedLineModel
         1: vertical
         </pre>
      */
-    [property] long Orientation;
+    [property] long Orientation; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies that the control will be printed with the document.
      */
-    [property] boolean Printable;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Printable; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the text color (RGB) of the control.
      */
     [property] com::sun::star::util::Color TextColor;
 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the text line color (RGB) of the control.
      */
     [property] com::sun::star::util::Color TextLineColor;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlFixedText.idl b/offapi/com/sun/star/awt/UnoControlFixedText.idl
index e4dd759f19d2..12befafe2f5d 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedText.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedText.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoFixedTextControl_idl__
-#define __com_sun_star_awt_UnoFixedTextControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControl_idl__
-#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XFixedText_idl__
-#include <com/sun/star/awt/XFixedText.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
-#include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
+#ifndef __com_sun_star_awt_UnoFixedTextControl_idl__ 
+#define __com_sun_star_awt_UnoFixedTextControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControl_idl__ 
+#include <com/sun/star/awt/UnoControl.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XFixedText_idl__ 
+#include <com/sun/star/awt/XFixedText.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XLayoutConstrains_idl__ 
+#include <com/sun/star/awt/XLayoutConstrains.idl> 
+#endif 
 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a control for displaying fixed text.
  */
 published service UnoControlFixedText
-{
-    service com::sun::star::awt::UnoControl;
-
-    interface com::sun::star::awt::XFixedText;
-
+{ 
+    service com::sun::star::awt::UnoControl; 
+    
+    interface com::sun::star::awt::XFixedText; 
+    
     interface com::sun::star::awt::XLayoutConstrains;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl b/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
index b6981556a8f4..93b22a37f8e8 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlFixedTextModel_idl__
-#define __com_sun_star_awt_UnoControlFixedTextModel_idl__
+#ifndef __com_sun_star_awt_UnoControlFixedTextModel_idl__ 
+#define __com_sun_star_awt_UnoControlFixedTextModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlModel.idl> 
+#endif 
 
 #ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
@@ -42,24 +42,24 @@
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the standard model of an <type>UnoControlFixedText</type>.
  */
 published service UnoControlFixedTextModel
-{
-    service com::sun::star::awt::UnoControlModel;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the horiztonal alignment of the text in the control.
-
+{ 
+    service com::sun::star::awt::UnoControlModel; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the horiztonal alignment of the text in the control. 
+                
         <pre>
         0: left
         1: center
@@ -173,10 +173,10 @@ published service UnoControlFixedTextModel
      */
     [optional, property] com::sun::star::style::VerticalAlignment VerticalAlign;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlFormattedField.idl b/offapi/com/sun/star/awt/UnoControlFormattedField.idl
index 9d66a3e319a1..a55c9e9262dc 100644
--- a/offapi/com/sun/star/awt/UnoControlFormattedField.idl
+++ b/offapi/com/sun/star/awt/UnoControlFormattedField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlFormattedField_idl__
-#define __com_sun_star_awt_UnoControlFormattedField_idl__
-
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
-#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__
-#include <com/sun/star/awt/XSpinField.idl>
-#endif
-
-
-//=============================================================================
+#ifndef __com_sun_star_awt_UnoControlFormattedField_idl__ 
+#define __com_sun_star_awt_UnoControlFormattedField_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
+#include <com/sun/star/awt/UnoControlEdit.idl> 
+#endif 
 
- module com {  module sun {  module star {  module awt {
+#ifndef __com_sun_star_awt_XSpinField_idl__ 
+#include <com/sun/star/awt/XSpinField.idl> 
+#endif 
 
-//=============================================================================
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a formatted field control.
  */
 published service UnoControlFormattedField
-{
+{ 
     service com::sun::star::awt::UnoControlEdit;
 
     /** gives access to the value of a spin field and makes it possible to
         register for spin events.
 
         @since OOo 1.1.2
-     */
+     */	
     [optional] interface com::sun::star::awt::XSpinField;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl b/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl
index 0cdf42e38f29..05ee9d44ac2b 100644
--- a/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -61,35 +61,35 @@ published service UnoControlFormattedFieldModel
 
     //-------------------------------------------------------------------------
 
-    /** specifies the horiztonal alignment of the text in the control.
-
+    /** specifies the horiztonal alignment of the text in the control. 
+                
         <pre>
         0: left
         1: center
         2: right
         </pre>
      */
-    [property] short Align;
-
-    //-------------------------------------------------------------------------
+    [property] short Align; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the background color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color BackgroundColor;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the border style of the control.
+    [property] com::sun::star::util::Color BackgroundColor; 
+ 
+    //------------------------------------------------------------------------- 
 
+    /** specifies the border style of the control. 
+                
         <pre>
         0: No border
         1: 3D border
         2: simple border
         </pre>
      */
-    [property] short Border;
-
-    //-------------------------------------------------------------------------
+    [property] short Border; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the color of the border, if present
 
@@ -99,74 +99,74 @@ published service UnoControlFormattedFieldModel
         @since OOo 2.0.0
      */
     [optional, property] long BorderColor;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the default value of the formatted field.
-
+        
         <p>This may be a numeric value (double) or a string, depending on
         the formatting of the field.</p>
      */
     [property] any EffectiveDefault;
-
+    
     //-------------------------------------------------------------------------
 
     /** specifies the maximum value that can be entered.
-
+        
         <p>This property is ignored if the format of the field is no numeric
         format.</p>
      */
     [property] double EffectiveMax;
-
+    
     //-------------------------------------------------------------------------
 
     /** specifies the minimum value that can be entered.
-
+        
         <p>This property is ignored if the format of the field is no numeric
         format.</p>
      */
     [property] double EffectiveMin;
-
+    
     //-------------------------------------------------------------------------
 
     /** specifies the current value of the formatted field.
-
+        
         <p>This may be a numeric value (double) or a string, depending on
         the formatting of the field.</p>
      */
     [property] double EffectiveValue;
-
+    
     //-------------------------------------------------------------------------
 
     /** determines whether the control is enabled or disabled.
      */
-    [property] boolean Enabled;
-
-    //-------------------------------------------------------------------------
+    [property] boolean Enabled; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the font attributes of the text in the control.
      */
-    [property] com::sun::star::awt::FontDescriptor FontDescriptor;
-
+    [property] com::sun::star::awt::FontDescriptor FontDescriptor; 
+ 
     //-------------------------------------------------------------------------
 
     /** specifies the <type scope="com::sun::star::text">FontEmphasis</type>
         value of the text in the control.
      */
     [property] short FontEmphasisMark;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the <type scope="com::sun::star::text">FontRelief</type>
         value of the text in the control.
      */
     [property] short FontRelief;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the format to be used when formatting the field input
         and output.
-
+        
         <p>This value is meaningful relative to the FormatsSupplier property
         only.</p>
      */
@@ -183,16 +183,16 @@ published service UnoControlFormattedFieldModel
     /** specifies the help text of the control.
      */
     [property] string HelpText;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the help URL of the control.
      */
     [property] string HelpURL;
 
 
     //-------------------------------------------------------------------------
-
+    
     /** specifies whether the selection in the control should be hidden when
         the control is not active (focused).
 
@@ -201,28 +201,28 @@ published service UnoControlFormattedFieldModel
     [optional, property] boolean HideInactiveSelection;
 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the maximum character count.
 
-        <p>There's no limitation, if set to 0.</p>
+        <p>There's no limitation, if set to 0.</p>    
      */
-    [property] short MaxTextLen;
-
+    [property] short MaxTextLen; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies that the control will be printed with the document.
      */
-    [property] boolean Printable;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Printable; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the content of the control cannot be modified by the
         user.
      */
-    [property] boolean ReadOnly;
-
+    [property] boolean ReadOnly; 
+ 
     //-------------------------------------------------------------------------
-
+ 
     /** specifies whether the mouse should show repeating behavior, i.e.
         repeatedly trigger an action when keeping pressed.
 
@@ -230,7 +230,7 @@ published service UnoControlFormattedFieldModel
      */
     [optional, property] boolean Repeat;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the mouse repeat delay, in milliseconds.
 
@@ -244,48 +244,48 @@ published service UnoControlFormattedFieldModel
      */
     [optional, property] long RepeatDelay;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies that the control has a spin button.
      */
-    [property] boolean Spin;
-
+    [property] boolean Spin; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies that the text is checked during the user input.
-
+        
         <p>This property is optional - not every component implementing this
         service is required to provide it, as real-time input checking on a
-        formatted field may be pretty expensive.</p>
+        formatted field may be pretty expensive.</p>    
      */
-    [optional, property] boolean StrictFormat;
-
-    //-------------------------------------------------------------------------
+    [optional, property] boolean StrictFormat; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies that the control can be reached with the TAB key.
      */
-    [property] boolean Tabstop;
-
-    //-------------------------------------------------------------------------
+    [property] boolean Tabstop; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the text displayed in the control.
      */
-    [property] string Text;
-
-    //-------------------------------------------------------------------------
-
+    [property] string Text; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** specifies the text color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color TextColor;
-
+    [property] com::sun::star::util::Color TextColor; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the text line color (RGB) of the control.
      */
     [property] com::sun::star::util::Color TextLineColor;
-
+    
     //-------------------------------------------------------------------------
-
+    
     /** specifies that the text is treated as a number.
      */
     [property] boolean TreatAsNumber;
diff --git a/offapi/com/sun/star/awt/UnoControlGroupBox.idl b/offapi/com/sun/star/awt/UnoControlGroupBox.idl
index cc1aaff14985..77b3576e63c1 100644
--- a/offapi/com/sun/star/awt/UnoControlGroupBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlGroupBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoGroupBoxControl_idl__
-#define __com_sun_star_awt_UnoGroupBoxControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControl_idl__
-#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_UnoGroupBoxControl_idl__ 
+#define __com_sun_star_awt_UnoGroupBoxControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControl_idl__ 
+#include <com/sun/star/awt/UnoControl.idl> 
+#endif 
+
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a group box control.
  */
 published service UnoControlGroupBox
-{
+{ 
     service com::sun::star::awt::UnoControl;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl b/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl
index c0a5d97afc06..640e5bbcd80b 100644
--- a/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,92 +24,92 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlGroupBoxModel_idl__
-#define __com_sun_star_awt_UnoControlGroupBoxModel_idl__
+#ifndef __com_sun_star_awt_UnoControlGroupBoxModel_idl__ 
+#define __com_sun_star_awt_UnoControlGroupBoxModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
 
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlModel.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the standard model of an <type>UnoControlGroupBox</type>.
  */
 published service UnoControlGroupBoxModel
-{
-    service com::sun::star::awt::UnoControlModel;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    service com::sun::star::awt::UnoControlModel; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines whether the control is enabled or disabled.
      */
-    [property] boolean Enabled;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Enabled; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the font attributes of the text in the control.
      */
-    [property] com::sun::star::awt::FontDescriptor FontDescriptor;
-
-    //-------------------------------------------------------------------------
+    [property] com::sun::star::awt::FontDescriptor FontDescriptor; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the <type scope="com::sun::star::text">FontEmphasis</type>
         value of the text in the control.
      */
     [property] short FontEmphasisMark;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the <type scope="com::sun::star::text">FontRelief</type>
         value of the text in the control.
      */
     [property] short FontRelief;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the help text of the control.
      */
     [property] string HelpText;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the help URL of the control.
      */
     [property] string HelpURL;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the label of the control.
      */
-    [property] string Label;
-
-    //-------------------------------------------------------------------------
-
+    [property] string Label; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the control will be printed with the document.
      */
-    [property] boolean Printable;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Printable; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the text color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color TextColor;
-
+    [property] com::sun::star::util::Color TextColor; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the text line color (RGB) of the control.
      */
     [property] com::sun::star::util::Color TextLineColor;
@@ -123,10 +123,10 @@ published service UnoControlGroupBoxModel
         @since OOo 3.1
     */
     [optional, property] short WritingMode;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlImageControl.idl b/offapi/com/sun/star/awt/UnoControlImageControl.idl
index 8b7d3bc9d12b..cca77e38fde8 100644
--- a/offapi/com/sun/star/awt/UnoControlImageControl.idl
+++ b/offapi/com/sun/star/awt/UnoControlImageControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoImageControl_idl__
-#define __com_sun_star_awt_UnoImageControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControl_idl__
-#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
-#include <com/sun/star/awt/XLayoutConstrains.idl>
+#ifndef __com_sun_star_awt_UnoImageControl_idl__ 
+#define __com_sun_star_awt_UnoImageControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControl_idl__ 
+#include <com/sun/star/awt/UnoControl.idl> 
 #endif
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XLayoutConstrains_idl__ 
+#include <com/sun/star/awt/XLayoutConstrains.idl> 
+#endif 
+
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a control for displaying an image.
  */
 published service UnoControlImageControl
-{
-    service com::sun::star::awt::UnoControl;
-
+{ 
+    service com::sun::star::awt::UnoControl; 
+    
     interface com::sun::star::awt::XLayoutConstrains;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlImageControlModel.idl b/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
index aadf3074fcbe..e3b49065e320 100644
--- a/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/UnoControlListBox.idl b/offapi/com/sun/star/awt/UnoControlListBox.idl
index edc34550242e..05087a7bfb63 100644
--- a/offapi/com/sun/star/awt/UnoControlListBox.idl
+++ b/offapi/com/sun/star/awt/UnoControlListBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoListBoxControl_idl__
-#define __com_sun_star_awt_UnoListBoxControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControl_idl__
-#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XListBox_idl__
-#include <com/sun/star/awt/XListBox.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
-#include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTextLayoutConstrains_idl__
-#include <com/sun/star/awt/XTextLayoutConstrains.idl>
+#ifndef __com_sun_star_awt_UnoListBoxControl_idl__ 
+#define __com_sun_star_awt_UnoListBoxControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControl_idl__ 
+#include <com/sun/star/awt/UnoControl.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XListBox_idl__ 
+#include <com/sun/star/awt/XListBox.idl> 
 #endif
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XLayoutConstrains_idl__ 
+#include <com/sun/star/awt/XLayoutConstrains.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XTextLayoutConstrains_idl__ 
+#include <com/sun/star/awt/XTextLayoutConstrains.idl> 
+#endif 
+
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a list box control.
-
+        
     <p>A list box displays a list of strings and allows a selection within
     these.</p>
  */
 published service UnoControlListBox
-{
-    service com::sun::star::awt::UnoControl;
-
+{ 
+    service com::sun::star::awt::UnoControl; 
+    
     interface com::sun::star::awt::XListBox;
-
-    interface com::sun::star::awt::XLayoutConstrains;
-
+    
+    interface com::sun::star::awt::XLayoutConstrains; 
+    
     interface com::sun::star::awt::XTextLayoutConstrains;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
index 1579823bf68e..c73197aefa08 100644
--- a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,67 +24,67 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlListBoxModel_idl__
-#define __com_sun_star_awt_UnoControlListBoxModel_idl__
+#ifndef __com_sun_star_awt_UnoControlListBoxModel_idl__ 
+#define __com_sun_star_awt_UnoControlListBoxModel_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
 
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlModel.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
 
 #include <com/sun/star/awt/XItemList.idl>
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the standard model of an <type>UnoControlListBox</type>.
  */
 published service UnoControlListBoxModel
-{
-    service com::sun::star::awt::UnoControlModel;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    service com::sun::star::awt::UnoControlModel; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the horizontal alignment of the text in the control.
-
+                
         <pre>
         0: left
         1: center
         2: right
         </pre>
      */
-    [optional, property] short Align;
-
-    //-------------------------------------------------------------------------
-
+    [optional, property] short Align; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the background color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color BackgroundColor;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the border style of the control.
-
+    [property] com::sun::star::util::Color BackgroundColor; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the border style of the control. 
+                
         <pre>
         0: No border
         1: 3D border
         2: simple border
         </pre>
      */
-    [property] short Border;
-
-    //-------------------------------------------------------------------------
+    [property] short Border; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the color of the border, if present
 
@@ -94,100 +94,100 @@ published service UnoControlListBoxModel
         @since OOo 2.0.0
      */
     [optional, property] long BorderColor;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies if the control has a drop down button.
      */
-    [property] boolean Dropdown;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Dropdown; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines whether the control is enabled or disabled.
      */
-    [property] boolean Enabled;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Enabled; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the font attributes of the text in the control.
      */
     [property] com::sun::star::awt::FontDescriptor FontDescriptor;
-
+    
     //-------------------------------------------------------------------------
-
+    
     /** specifies the <type scope="com::sun::star::text">FontEmphasis</type>
         value of the text in the control.
      */
     [property] short FontEmphasisMark;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the <type scope="com::sun::star::text">FontRelief</type>
         value of the text in the control.
      */
     [property] short FontRelief;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the help text of the control.
      */
     [property] string HelpText;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the help URL of the control.
      */
     [property] string HelpURL;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+     
     /** specifies the maximum line count displayed in the drop down box.
      */
-    [property] short LineCount;
-
-    //-------------------------------------------------------------------------
-
+    [property] short LineCount; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies if more than one entry can be selected.
      */
-    [property] boolean MultiSelection;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean MultiSelection; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the control will be printed with the document.
      */
     [property] boolean Printable;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the content of the control cannot be modified by the user.
      */
     [property] boolean ReadOnly;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+        
     /** specifies the sequence of selected items, identified by the position.
      */
-    [property] sequence<short> SelectedItems;
-
-    //-------------------------------------------------------------------------
-
+    [property] sequence<short> SelectedItems; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the list of items.
      */
-    [property] sequence<string> StringItemList;
-
-    //-------------------------------------------------------------------------
-
+    [property] sequence<string> StringItemList; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the control can be reached with the TAB key.
      */
-    [property] boolean Tabstop;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Tabstop; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the text color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color TextColor;
-
-    //-------------------------------------------------------------------------
+    [property] com::sun::star::util::Color TextColor; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the text line color (RGB) of the control.
      */
@@ -226,10 +226,10 @@ published service UnoControlListBoxModel
         @since OOo 3.3
     */
     [optional, property, maybevoid] short ItemSeparatorPos;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlModel.idl b/offapi/com/sun/star/awt/UnoControlModel.idl
index 22fba6dce0b2..5c489ab2b5da 100644
--- a/offapi/com/sun/star/awt/UnoControlModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,82 +24,82 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#define __com_sun_star_awt_UnoControlModel_idl__
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#define __com_sun_star_awt_UnoControlModel_idl__ 
 
 #ifndef __com_sun_star_awt_UnoControlDialogElement_idl__
 #include <com/sun/star/awt/UnoControlDialogElement.idl>
 #endif
 
-#ifndef __com_sun_star_awt_XControlModel_idl__
-#include <com/sun/star/awt/XControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
-#include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_io_XPersistObject_idl__
-#include <com/sun/star/io/XPersistObject.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCloneable_idl__
+#ifndef __com_sun_star_awt_XControlModel_idl__ 
+#include <com/sun/star/awt/XControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XMultiPropertySet_idl__ 
+#include <com/sun/star/beans/XMultiPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XPersistObject_idl__ 
+#include <com/sun/star/io/XPersistObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XCloneable_idl__ 
 #include <com/sun/star/util/XCloneable.idl>
 #endif
 
 
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** specifies the standard model of an <type>UnoControl</type>
-    in the <em>Smalltalk model view controller design</em>.
-
-    <p>The interfaces <type scope="com::sun::star::beans">XPropertySet</type>
-    and <type scope="com::sun::star::beans">XMultiPropertySet</type> need
-    access to the model data from the embedding environment. The control
-    and the model can specify additional interfaces to exchange data or
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** specifies the standard model of an <type>UnoControl</type> 
+    in the <em>Smalltalk model view controller design</em>. 
+        
+    <p>The interfaces <type scope="com::sun::star::beans">XPropertySet</type> 
+    and <type scope="com::sun::star::beans">XMultiPropertySet</type> need 
+    access to the model data from the embedding environment. The control 
+    and the model can specify additional interfaces to exchange data or 
     export more functionality from the model.</p>
  */
 published service UnoControlModel
-{
+{ 
     /** This service is present when the control model is embedded in an
-        <type>UnoControlDialogModel</type>.
+        <type>UnoControlDialogModel</type>.    
      */
     [optional] service com::sun::star::awt::UnoControlDialogElement;
 
-    interface com::sun::star::awt::XControlModel;
+    interface com::sun::star::awt::XControlModel; 
 
-    interface com::sun::star::lang::XComponent;
+    interface com::sun::star::lang::XComponent; 
 
-    interface com::sun::star::beans::XPropertySet;
+    interface com::sun::star::beans::XPropertySet; 
 
-    interface com::sun::star::beans::XMultiPropertySet;
+    interface com::sun::star::beans::XMultiPropertySet; 
 
     interface com::sun::star::io::XPersistObject;
 
     interface com::sun::star::util::XCloneable;
-
-    //-------------------------------------------------------------------------
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the service name of the default control for this model.
      */
     [property] string DefaultControl;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlNumericField.idl b/offapi/com/sun/star/awt/UnoControlNumericField.idl
index f09d7739bb98..2fe63db7c786 100644
--- a/offapi/com/sun/star/awt/UnoControlNumericField.idl
+++ b/offapi/com/sun/star/awt/UnoControlNumericField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlNumericField_idl__
-#define __com_sun_star_awt_UnoControlNumericField_idl__
-
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
-#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__
-#include <com/sun/star/awt/XSpinField.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XNumericField_idl__
-#include <com/sun/star/awt/XNumericField.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_UnoControlNumericField_idl__ 
+#define __com_sun_star_awt_UnoControlNumericField_idl__ 
+
+#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
+#include <com/sun/star/awt/UnoControlEdit.idl> 
+#endif 
+
+#ifndef __com_sun_star_awt_XSpinField_idl__ 
+#include <com/sun/star/awt/XSpinField.idl> 
+#endif 
+
+#ifndef __com_sun_star_awt_XNumericField_idl__ 
+#include <com/sun/star/awt/XNumericField.idl> 
+#endif 
+
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a numeric field control.
-
-    <p>A numeric field makes it possible to enter, display and edit
+    
+    <p>A numeric field makes it possible to enter, display and edit 
     formatted numeric values.</p>
  */
 published service UnoControlNumericField
-{
-    service com::sun::star::awt::UnoControlEdit;
+{ 
+    service com::sun::star::awt::UnoControlEdit; 
 
     /** gives access to the value of a spin field and makes it possible to
         register for spin events.
 
         @since OOo 1.1.2
-     */
-    [optional] interface com::sun::star::awt::XSpinField;
-
+     */	
+    [optional] interface com::sun::star::awt::XSpinField; 
+    
     interface com::sun::star::awt::XNumericField;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl b/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
index a3988d7e2ae9..33684cf81df3 100644
--- a/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,56 +24,56 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlNumericFieldModel_idl__
-#define __com_sun_star_awt_UnoControlNumericFieldModel_idl__
-
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
+#ifndef __com_sun_star_awt_UnoControlNumericFieldModel_idl__ 
+#define __com_sun_star_awt_UnoControlNumericFieldModel_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
 
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlModel.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
-
+ 
 #ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the standard model of an <type>UnoControlNumericField</type>.
  */
 published service UnoControlNumericFieldModel
-{
-    service com::sun::star::awt::UnoControlModel;
-
-    //-------------------------------------------------------------------------
+{ 
+    service com::sun::star::awt::UnoControlModel; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the background color(RGB) of the control.
      */
-    [property] com::sun::star::util::Color BackgroundColor;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the border style of the control.
+    [property] com::sun::star::util::Color BackgroundColor; 
+ 
+    //------------------------------------------------------------------------- 
 
+    /** specifies the border style of the control. 
+                
         <pre>
         0: No border
         1: 3D border
         2: simple border
         </pre>
      */
-    [property] short Border;
-
-    //-------------------------------------------------------------------------
+    [property] short Border; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the color of the border, if present
 
@@ -83,47 +83,47 @@ published service UnoControlNumericFieldModel
         @since OOo 2.0.0
      */
     [optional, property] long BorderColor;
-
-    //-------------------------------------------------------------------------
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the decimal accuracy.
      */
-    [property] short DecimalAccuracy;
-
+    [property] short DecimalAccuracy; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** determines whether the control is enabled or disabled.
      */
     [property] boolean Enabled;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+     
     /** specifies the font attributes of the text in the control.
      */
-    [property] com::sun::star::awt::FontDescriptor FontDescriptor;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::awt::FontDescriptor FontDescriptor; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the <type scope="com::sun::star::text">FontEmphasis</type>
         value of the text in the control.
      */
     [property] short FontEmphasisMark;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the <type scope="com::sun::star::text">FontRelief</type>
         value of the text in the control.
      */
     [property] short FontRelief;
-
+ 
     //-------------------------------------------------------------------------
-
+     
     /** specifies the help text of the control.
      */
     [property] string HelpText;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the help URL of the control.
      */
     [property] string HelpURL;
@@ -141,16 +141,16 @@ published service UnoControlNumericFieldModel
 
     /** specifies that the control will be printed with the document.
      */
-    [property] boolean Printable;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Printable; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the content of the control cannot be modified by the
         user.
      */
-    [property] boolean ReadOnly;
-
-    //-------------------------------------------------------------------------
+    [property] boolean ReadOnly; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies whether the mouse should show repeating behavior, i.e.
         repeatedly trigger an action when keeping pressed.
@@ -159,7 +159,7 @@ published service UnoControlNumericFieldModel
      */
     [optional, property] boolean Repeat;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the mouse repeat delay, in milliseconds.
 
@@ -177,58 +177,58 @@ published service UnoControlNumericFieldModel
 
     /** specifies whether the thousands separator is to be displayed.
      */
-    [property] boolean ShowThousandsSeparator;
-
-    //-------------------------------------------------------------------------
+    [property] boolean ShowThousandsSeparator; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies that the control has a spin button.
      */
-    [property] boolean Spin;
-
+    [property] boolean Spin; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies that the value is checked during the user input.
      */
-    [property] boolean StrictFormat;
-
-    //-------------------------------------------------------------------------
+    [property] boolean StrictFormat; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies that the control can be reached with the TAB key.
      */
-    [property] boolean Tabstop;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Tabstop; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** specifies the text color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color TextColor;
-
+    [property] com::sun::star::util::Color TextColor; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the text line color (RGB) of the control.
      */
     [property] com::sun::star::util::Color TextLineColor;
 
     //-------------------------------------------------------------------------
-
+     
     /** specifies the value displayed in the control.
      */
-    [property] double Value;
-
-    //-------------------------------------------------------------------------
-
+    [property] double Value; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the maximum value that can be entered.
      */
-    [property] double ValueMax;
-
-    //-------------------------------------------------------------------------
-
+    [property] double ValueMax; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the minimum value that can be entered.
      */
-    [property] double ValueMin;
-
-    //-------------------------------------------------------------------------
-
+    [property] double ValueMin; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the value step when using the spin button.
      */
     [property] double ValueStep;
@@ -258,10 +258,10 @@ published service UnoControlNumericFieldModel
         @since OpenOffice.org 3.3
      */
     [optional, property] com::sun::star::style::VerticalAlignment VerticalAlign;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlPatternField.idl b/offapi/com/sun/star/awt/UnoControlPatternField.idl
index 415265eeb690..991380a96cdf 100644
--- a/offapi/com/sun/star/awt/UnoControlPatternField.idl
+++ b/offapi/com/sun/star/awt/UnoControlPatternField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoPatternFieldControl_idl__
-#define __com_sun_star_awt_UnoPatternFieldControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
-#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__
-#include <com/sun/star/awt/XSpinField.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XPatternField_idl__
-#include <com/sun/star/awt/XPatternField.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_UnoPatternFieldControl_idl__ 
+#define __com_sun_star_awt_UnoPatternFieldControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
+#include <com/sun/star/awt/UnoControlEdit.idl> 
+#endif 
+
+#ifndef __com_sun_star_awt_XSpinField_idl__ 
+#include <com/sun/star/awt/XSpinField.idl> 
+#endif 
+
+#ifndef __com_sun_star_awt_XPatternField_idl__ 
+#include <com/sun/star/awt/XPatternField.idl> 
+#endif 
+
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a pattern field control.
-
+    
     <p>A pattern field makes it possible to enter, display and edit text
     which conforms to a specified pattern.</p>
  */
 published service UnoControlPatternField
-{
-    service com::sun::star::awt::UnoControlEdit;
+{ 
+    service com::sun::star::awt::UnoControlEdit; 
 
     /** gives access to the value of a spin field and makes it possible to
         register for spin events.
 
         @since OOo 1.1.2
-     */
-    [optional] interface com::sun::star::awt::XSpinField;
-
+     */	
+    [optional] interface com::sun::star::awt::XSpinField; 
+    
     interface com::sun::star::awt::XPatternField;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl b/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
index 8b4b6ccf601c..e26b3dae6806 100644
--- a/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlPatternFieldModel_idl__
-#define __com_sun_star_awt_UnoControlPatternFieldModel_idl__
-
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
+#ifndef __com_sun_star_awt_UnoControlPatternFieldModel_idl__ 
+#define __com_sun_star_awt_UnoControlPatternFieldModel_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
 
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlModel.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
-
+ 
 #ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the standard model of an <type>UnoControlPatternField</type>.
  */
 published service UnoControlPatternFieldModel
-{
-    service com::sun::star::awt::UnoControlModel;
-
-    //-------------------------------------------------------------------------
+{ 
+    service com::sun::star::awt::UnoControlModel; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the background color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color BackgroundColor;
-
+    [property] com::sun::star::util::Color BackgroundColor; 
+ 
     //-------------------------------------------------------------------------
 
-    /** specifies the border style of the control.
-
+    /** specifies the border style of the control. 
+                
         <pre>
         0: No border
         1: 3D border
@@ -72,8 +72,8 @@ published service UnoControlPatternFieldModel
         </pre>
      */
     [property] short Border;
-
-    //-------------------------------------------------------------------------
+    
+    //------------------------------------------------------------------------- 
 
     /** specifies the color of the border, if present
 
@@ -83,53 +83,53 @@ published service UnoControlPatternFieldModel
         @since OOo 2.0.0
      */
     [optional, property] long BorderColor;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the edit mask.
      */
-    [property] string EditMask;
-
-    //-------------------------------------------------------------------------
+    [property] string EditMask; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** determines whether the control is enabled or disabled.
      */
-    [property] boolean Enabled;
-
-    //-------------------------------------------------------------------------
+    [property] boolean Enabled; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the font attributes of the text in the control.
      */
-    [property] com::sun::star::awt::FontDescriptor FontDescriptor;
-
+    [property] com::sun::star::awt::FontDescriptor FontDescriptor; 
+ 
     //-------------------------------------------------------------------------
 
     /** specifies the <type scope="com::sun::star::text">FontEmphasis</type>
         value of the text in the control.
      */
     [property] short FontEmphasisMark;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the <type scope="com::sun::star::text">FontRelief</type>
         value of the text in the control.
      */
     [property] short FontRelief;
-
+ 
     //-------------------------------------------------------------------------
 
     /** specifies the help text of the control.
      */
     [property] string HelpText;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the help URL of the control.
      */
     [property] string HelpURL;
 
     //-------------------------------------------------------------------------
-
+    
     /** specifies whether the selection in the control should be hidden when
         the control is not active (focused).
 
@@ -138,56 +138,56 @@ published service UnoControlPatternFieldModel
     [optional, property] boolean HideInactiveSelection;
 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the literal mask.
      */
-    [property] string LiteralMask;
-
-    //-------------------------------------------------------------------------
+    [property] string LiteralMask; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the maximum character count.
      */
-    [property] short MaxTextLen;
-
+    [property] short MaxTextLen; 
+ 
     //-------------------------------------------------------------------------
 
     /** specifies that the control will be printed with the document.
      */
-    [property] boolean Printable;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Printable; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the content of the control cannot be modified by the
         user.
      */
-    [property] boolean ReadOnly;
-
+    [property] boolean ReadOnly; 
+ 
     //-------------------------------------------------------------------------
-
-    /** specifies that the text is checked during the user input.
+    
+    /** specifies that the text is checked during the user input.        
      */
-    [property] boolean StrictFormat;
-
-    //-------------------------------------------------------------------------
+    [property] boolean StrictFormat; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies that the control can be reached with the TAB key.
      */
-    [property] boolean Tabstop;
-
-    //-------------------------------------------------------------------------
+    [property] boolean Tabstop; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the text displayed in the control.
      */
-    [property] string Text;
-
-    //-------------------------------------------------------------------------
-
+    [property] string Text; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** specifies the text color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color TextColor;
-
+    [property] com::sun::star::util::Color TextColor; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the text line color (RGB) of the control.
      */
     [property] com::sun::star::util::Color TextLineColor;
@@ -217,10 +217,10 @@ published service UnoControlPatternFieldModel
         @since OpenOffice.org 3.3
      */
     [optional, property] com::sun::star::style::VerticalAlignment VerticalAlign;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlProgressBar.idl b/offapi/com/sun/star/awt/UnoControlProgressBar.idl
index 72240452a324..f06fee56bed7 100644
--- a/offapi/com/sun/star/awt/UnoControlProgressBar.idl
+++ b/offapi/com/sun/star/awt/UnoControlProgressBar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoProgressBarControl_idl__
-#define __com_sun_star_awt_UnoProgressBarControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControl_idl__
-#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XProgressBar_idl__
-#include <com/sun/star/awt/XProgressBar.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_UnoProgressBarControl_idl__ 
+#define __com_sun_star_awt_UnoProgressBarControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControl_idl__ 
+#include <com/sun/star/awt/UnoControl.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XProgressBar_idl__ 
+#include <com/sun/star/awt/XProgressBar.idl> 
+#endif 
+ 
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a progress bar control.
  */
 published service UnoControlProgressBar
-{
-    service com::sun::star::awt::UnoControl;
-
+{ 
+    service com::sun::star::awt::UnoControl; 
+    
     interface com::sun::star::awt::XProgressBar;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl b/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl
index 1ffb7ace534a..b94105fd88f1 100644
--- a/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlProgressBarModel_idl__
-#define __com_sun_star_awt_UnoControlProgressBarModel_idl__
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
+#ifndef __com_sun_star_awt_UnoControlProgressBarModel_idl__ 
+#define __com_sun_star_awt_UnoControlProgressBarModel_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlModel.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+  
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the standard model of an <type>UnoControlProgressBar</type>.
  */
 published service UnoControlProgressBarModel
-{
-    service com::sun::star::awt::UnoControlModel;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    service com::sun::star::awt::UnoControlModel; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the background color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color BackgroundColor;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the border style of the control.
+    [property] com::sun::star::util::Color BackgroundColor; 
+ 
+    //------------------------------------------------------------------------- 
 
+    /** specifies the border style of the control. 
+                
         <pre>
         0: No border
         1: 3D border
         2: simple border
         </pre>
      */
-    [property] short Border;
+    [property] short Border; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the color of the border, if present
 
@@ -76,59 +76,59 @@ published service UnoControlProgressBarModel
         @since OOo 2.0.0
      */
     [optional, property] long BorderColor;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines whether the control is enabled or disabled.
      */
-    [property] boolean Enabled;
-
-    //-------------------------------------------------------------------------
+    [property] boolean Enabled; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the fill color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color FillColor;
-
-    //-------------------------------------------------------------------------
+    [property] com::sun::star::util::Color FillColor; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the help text of the control.
      */
     [property] string HelpText;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the help URL of the control.
      */
     [property] string HelpURL;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies that the control will be printed with the document.
      */
-    [property] boolean Printable;
-
-    //-------------------------------------------------------------------------
+    [property] boolean Printable; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the progress value of the control.
      */
-    [property] long ProgressValue;
+    [property] long ProgressValue; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the maximum progress value of the control.
      */
-    [property] long ProgressValueMax;
-
-    //-------------------------------------------------------------------------
-
+    [property] long ProgressValueMax; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the minimum progress value of the control.
      */
     [property] long ProgressValueMin;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlRadioButton.idl b/offapi/com/sun/star/awt/UnoControlRadioButton.idl
index 72c88df107bd..5318ebd03fb0 100644
--- a/offapi/com/sun/star/awt/UnoControlRadioButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlRadioButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoButtonControl_idl__
-#define __com_sun_star_awt_UnoButtonControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControl_idl__
-#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XRadioButton_idl__
-#include <com/sun/star/awt/XRadioButton.idl>
+#ifndef __com_sun_star_awt_UnoButtonControl_idl__ 
+#define __com_sun_star_awt_UnoButtonControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControl_idl__ 
+#include <com/sun/star/awt/UnoControl.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XRadioButton_idl__ 
+#include <com/sun/star/awt/XRadioButton.idl> 
 #endif
 
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
-#include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module awt {
-
-//=============================================================================
+#ifndef __com_sun_star_awt_XLayoutConstrains_idl__ 
+#include <com/sun/star/awt/XLayoutConstrains.idl> 
+#endif 
 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a radio button control.
  */
 published service UnoControlRadioButton
-{
-    service com::sun::star::awt::UnoControl;
-
+{ 
+    service com::sun::star::awt::UnoControl; 
+    
     interface com::sun::star::awt::XRadioButton;
-
+    
     interface com::sun::star::awt::XLayoutConstrains;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl b/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl
index 6676e98e7e6e..103c9c9e8655 100644
--- a/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/UnoControlRoadmap.idl b/offapi/com/sun/star/awt/UnoControlRoadmap.idl
index f68e1b2cba7e..0d2282c32d78 100644
--- a/offapi/com/sun/star/awt/UnoControlRoadmap.idl
+++ b/offapi/com/sun/star/awt/UnoControlRoadmap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl b/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl
index 65f5380c6e1f..81ba76a5c72a 100644
--- a/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/UnoControlScrollBar.idl b/offapi/com/sun/star/awt/UnoControlScrollBar.idl
index 403df8459d46..ad2c50e2019e 100644
--- a/offapi/com/sun/star/awt/UnoControlScrollBar.idl
+++ b/offapi/com/sun/star/awt/UnoControlScrollBar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoScrollBarControl_idl__
-#define __com_sun_star_awt_UnoScrollBarControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControl_idl__
-#include <com/sun/star/awt/UnoControl.idl>
+#ifndef __com_sun_star_awt_UnoScrollBarControl_idl__ 
+#define __com_sun_star_awt_UnoScrollBarControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControl_idl__ 
+#include <com/sun/star/awt/UnoControl.idl> 
 #endif
 
-#ifndef __com_sun_star_awt_XScrollBar_idl__
-#include <com/sun/star/awt/XScrollBar.idl>
+#ifndef __com_sun_star_awt_XScrollBar_idl__ 
+#include <com/sun/star/awt/XScrollBar.idl> 
 #endif
 
 
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a scroll bar control.
  */
 published service UnoControlScrollBar
-{
+{ 
     service com::sun::star::awt::UnoControl;
-
+    
     interface com::sun::star::awt::XScrollBar;
 
-};
-
-//=============================================================================
-
-}; }; }; };
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 
-
-#endif
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl b/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl
index e9f2b2340c0e..9c2d6a5b5ebb 100644
--- a/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlScrollBarModel_idl__
-#define __com_sun_star_awt_UnoControlScrollBarModel_idl__
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
-#include <com/sun/star/util/Color.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_UnoControlScrollBarModel_idl__ 
+#define __com_sun_star_awt_UnoControlScrollBarModel_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlModel.idl> 
+#endif 
+
+#ifndef __com_sun_star_util_Color_idl__ 
+#include <com/sun/star/util/Color.idl> 
+#endif 
+
+  
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the standard model of an <type>UnoControlScrollBar</type>.
  */
 published service UnoControlScrollBarModel
-{
-    service com::sun::star::awt::UnoControlModel;
-
-    //-------------------------------------------------------------------------
+{ 
+    service com::sun::star::awt::UnoControlModel; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the RGB color to be used for the control.
 
@@ -56,25 +56,25 @@ published service UnoControlScrollBarModel
      */
     [optional, property] com::sun::star::util::Color BackgroundColor;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** specifies the increment for a block move.
      */
-    [property] long BlockIncrement;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the border style of the control.
+    [property] long BlockIncrement; 
+ 
+    //------------------------------------------------------------------------- 
 
+    /** specifies the border style of the control. 
+                
         <pre>
         0: No border
         1: 3D border
         2: simple border
         </pre>
      */
-    [property] short Border;
+    [property] short Border; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the color of the border, if present
 
@@ -84,32 +84,32 @@ published service UnoControlScrollBarModel
         @since OOo 2.0.0
      */
     [optional, property] long BorderColor;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines whether the control is enabled or disabled.
      */
-    [property] boolean Enabled;
-
-    //-------------------------------------------------------------------------
+    [property] boolean Enabled; 
+  
+    //------------------------------------------------------------------------- 
 
     /** specifies the help text of the control.
      */
     [property] string HelpText;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the help URL of the control.
      */
     [property] string HelpURL;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the increment for a single line move.
      */
-    [property] long LineIncrement;
+    [property] long LineIncrement; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the scrolling behavior of the control.
 
@@ -120,21 +120,21 @@ published service UnoControlScrollBarModel
 
         @since OOo 2.0.0
      */
-    [optional, property] boolean LiveScroll;
+    [optional, property] boolean LiveScroll; 
 
     //-------------------------------------------------------------------------
 
     /** specifies the <type>ScrollBarOrientation</type> of the control.
      */
-    [property] long Orientation;
+    [property] long Orientation; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies that the control will be printed with the document.
      */
-    [property] boolean Printable;
-
-    //-------------------------------------------------------------------------
+    [property] boolean Printable; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the mouse repeat delay, in milliseconds.
 
@@ -148,13 +148,13 @@ published service UnoControlScrollBarModel
      */
     [optional, property] long RepeatDelay;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the scroll value of the control.
      */
-    [property] long ScrollValue;
+    [property] long ScrollValue; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the minimum scroll value of the control.
 
@@ -163,13 +163,13 @@ published service UnoControlScrollBarModel
     */
     [optional, property] long ScrollValueMin;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the maximum scroll value of the control.
      */
-    [property] long ScrollValueMax;
+    [property] long ScrollValueMax; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the RGB color to be used when painting symbols which are
         part of the control's appearance, such as the arrow buttons.
@@ -178,13 +178,13 @@ published service UnoControlScrollBarModel
      */
     [optional, property] com::sun::star::util::Color SymbolColor;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** specifies that the control can be reached with the TAB key.
 
         @since OOo 2.0.0
      */
-    [optional, property] boolean Tabstop;
+    [optional, property] boolean Tabstop; 
 
     //-------------------------------------------------------------------------
 
@@ -192,10 +192,10 @@ published service UnoControlScrollBarModel
      */
     [property] long VisibleSize;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl b/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
index cf45f0aea0f0..6c65cd8a4c7e 100644
--- a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
+++ b/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl b/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
index ca301483263f..902dffb98412 100644
--- a/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -61,7 +61,7 @@ published service UnoControlSimpleAnimationModel
      */
     [property] long StepTime;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies whether the animation will restart again after displaying the last
         image.
diff --git a/offapi/com/sun/star/awt/UnoControlSpinButton.idl b/offapi/com/sun/star/awt/UnoControlSpinButton.idl
index db8386c4304f..c3ac460919d2 100644
--- a/offapi/com/sun/star/awt/UnoControlSpinButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlSpinButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl b/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl
index 73e82363f5b3..ca005989fae7 100644
--- a/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -69,7 +69,7 @@ service UnoControlSpinButtonModel
      */
     [property] short Border;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the color of the border, if present
 
@@ -79,7 +79,7 @@ service UnoControlSpinButtonModel
         @since OOo 2.0.0
      */
     [optional, property] long BorderColor;
-
+ 
     //-------------------------------------------------------------------------
 
     /** determines whether the control is enabled or disabled.
diff --git a/offapi/com/sun/star/awt/UnoControlThrobber.idl b/offapi/com/sun/star/awt/UnoControlThrobber.idl
index f5194075019a..9d0384ef74d5 100644
--- a/offapi/com/sun/star/awt/UnoControlThrobber.idl
+++ b/offapi/com/sun/star/awt/UnoControlThrobber.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl b/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
index f2eacad5b76b..d82c65666f7a 100644
--- a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/UnoControlTimeField.idl b/offapi/com/sun/star/awt/UnoControlTimeField.idl
index 310f0b9b9539..bc73e10e1494 100644
--- a/offapi/com/sun/star/awt/UnoControlTimeField.idl
+++ b/offapi/com/sun/star/awt/UnoControlTimeField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoTimeFieldControl_idl__
+#ifndef __com_sun_star_awt_UnoTimeFieldControl_idl__ 
 #define __com_sun_star_awt_UnoTimeFieldControl_idl__
 
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
-#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinField_idl__
-#include <com/sun/star/awt/XSpinField.idl>
+#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
+#include <com/sun/star/awt/UnoControlEdit.idl> 
 #endif
 
-#ifndef __com_sun_star_awt_XTimeField_idl__
-#include <com/sun/star/awt/XTimeField.idl>
+#ifndef __com_sun_star_awt_XSpinField_idl__ 
+#include <com/sun/star/awt/XSpinField.idl> 
 #endif
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XTimeField_idl__ 
+#include <com/sun/star/awt/XTimeField.idl> 
+#endif 
+
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a time field control.
-
+    
     <p>A time field makes it possible to enter, display, and edit time
     values.</p>
  */
 published service UnoControlTimeField
-{
+{ 
     service com::sun::star::awt::UnoControlEdit;
 
     /** gives access to the value of a spin field and makes it possible to
         register for spin events.
 
         @since OOo 1.1.2
-     */
+     */    
     [optional] interface com::sun::star::awt::XSpinField;
-
+    
     interface com::sun::star::awt::XTimeField;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl b/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl
index 671846c06703..fa67e98da0be 100644
--- a/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_UnoControlTimeFieldModel_idl__
-#define __com_sun_star_awt_UnoControlTimeFieldModel_idl__
-
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
+#ifndef __com_sun_star_awt_UnoControlTimeFieldModel_idl__ 
+#define __com_sun_star_awt_UnoControlTimeFieldModel_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
 
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlModel.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
-
+ 
 #ifndef __com_sun_star_style_VerticalAlignment_idl__
 #include <com/sun/star/style/VerticalAlignment.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the standard model of an <type>UnoControlTimeField</type>.
  */
 published service UnoControlTimeFieldModel
-{
-    service com::sun::star::awt::UnoControlModel;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    service com::sun::star::awt::UnoControlModel; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the background color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color BackgroundColor;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the border style of the control.
+    [property] com::sun::star::util::Color BackgroundColor; 
+ 
+    //------------------------------------------------------------------------- 
 
+    /** specifies the border style of the control. 
+                
         <pre>
         0: No border
         1: 3D border
@@ -73,7 +73,7 @@ published service UnoControlTimeFieldModel
      */
     [property] short Border;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the color of the border, if present
 
@@ -83,47 +83,47 @@ published service UnoControlTimeFieldModel
         @since OOo 2.0.0
      */
     [optional, property] long BorderColor;
-
-    //-------------------------------------------------------------------------
+ 
+    //------------------------------------------------------------------------- 
 
     /** determines whether the control is enabled or disabled.
      */
     [property] boolean Enabled;
-
+    
     //-------------------------------------------------------------------------
 
     /** specifies the font attributes of the text in the control.
      */
-    [property] com::sun::star::awt::FontDescriptor FontDescriptor;
-
-    //-------------------------------------------------------------------------
+    [property] com::sun::star::awt::FontDescriptor FontDescriptor; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the <type scope="com::sun::star::text">FontEmphasis</type>
         value of the text in the control.
      */
     [property] short FontEmphasisMark;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the <type scope="com::sun::star::text">FontRelief</type>
         value of the text in the control.
      */
     [property] short FontRelief;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the help text of the control.
      */
     [property] string HelpText;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the help URL of the control.
      */
     [property] string HelpURL;
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies whether the selection in the control should be hidden when
         the control is not active (focused).
 
@@ -132,18 +132,18 @@ published service UnoControlTimeFieldModel
     [optional, property] boolean HideInactiveSelection;
 
     //-------------------------------------------------------------------------
-
+    
     /** specifies that the control will be printed with the document.
      */
-    [property] boolean Printable;
-
-    //-------------------------------------------------------------------------
+    [property] boolean Printable; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies that the content of the control cannot be modified by the user.
      */
-    [property] boolean ReadOnly;
-
-    //-------------------------------------------------------------------------
+    [property] boolean ReadOnly; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies whether the mouse should show repeating behavior, i.e.
         repeatedly trigger an action when keeping pressed.
@@ -152,7 +152,7 @@ published service UnoControlTimeFieldModel
      */
     [optional, property] boolean Repeat;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the mouse repeat delay, in milliseconds.
 
@@ -166,40 +166,40 @@ published service UnoControlTimeFieldModel
      */
     [optional, property] long RepeatDelay;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies that the control has a spin button.
      */
-    [property] boolean Spin;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Spin; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the date is checked during the user input.
      */
-    [property] boolean StrictFormat;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean StrictFormat; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the control can be reached with the TAB key.
      */
-    [property] boolean Tabstop;
-
-    //-------------------------------------------------------------------------
+    [property] boolean Tabstop; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the text displayed in the control.
 
-        @since OOo 2.0.0
+        @since OOo 2.0.0    
      */
-    [optional, property] string Text;
+    [optional, property] string Text; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the text color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color TextColor;
-
+    [property] com::sun::star::util::Color TextColor; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the text line color (RGB) of the control.
      */
     [property] com::sun::star::util::Color TextLineColor;
@@ -208,12 +208,12 @@ published service UnoControlTimeFieldModel
 
     /** specifies the time displayed in the control.
      */
-    [property] long Time;
-
+    [property] long Time; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the format of the displayed time.
-
+                
         <pre>
         0:  24h short
         1:  24h long
@@ -223,16 +223,16 @@ published service UnoControlTimeFieldModel
         5:  Duration long
         </pre>
      */
-    [property] short TimeFormat;
-
+    [property] short TimeFormat; 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the maximum time that can be entered.
      */
-    [property] long TimeMax;
-
-    //-------------------------------------------------------------------------
-
+    [property] long TimeMax; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the minimum time that can be entered.
      */
     [property] long TimeMin;
@@ -262,10 +262,10 @@ published service UnoControlTimeFieldModel
         @since OpenOffice.org 3.3
      */
     [optional, property] com::sun::star::style::VerticalAlignment VerticalAlign;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/VclContainerEvent.idl b/offapi/com/sun/star/awt/VclContainerEvent.idl
index 2f4595e984e9..65de4c5ee15d 100644
--- a/offapi/com/sun/star/awt/VclContainerEvent.idl
+++ b/offapi/com/sun/star/awt/VclContainerEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_VclContainerEvent_idl__
-#define __com_sun_star_awt_VclContainerEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_VclContainerEvent_idl__ 
+#define __com_sun_star_awt_VclContainerEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a container event.
-
+            
     <p>These events are provided <strong>only</strong> for notification
     purposes.</p>
 
     @see XVclContainerListener
  */
 published struct VclContainerEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the child component that was added or removed.
      */
-    com::sun::star::uno::XInterface Child;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::uno::XInterface Child; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/VclWindowPeerAttribute.idl b/offapi/com/sun/star/awt/VclWindowPeerAttribute.idl
index 10585f52f035..22cad57c6c0d 100644
--- a/offapi/com/sun/star/awt/VclWindowPeerAttribute.idl
+++ b/offapi/com/sun/star/awt/VclWindowPeerAttribute.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,133 +24,133 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_VclWindowPeerAttribute_idl__
-#define __com_sun_star_awt_VclWindowPeerAttribute_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_VclWindowPeerAttribute_idl__ 
+#define __com_sun_star_awt_VclWindowPeerAttribute_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies attributes for the VCL window implementation.
 
     <p><b>IMPORTANT:</b> These constants have to be disjunct with
     constants in <type>WindowAttribute</type>.</p>
-
+    
     @deprecated
  */
 published constants VclWindowPeerAttribute
-{
-    //-------------------------------------------------------------------------
-
-    const long HSCROLL = 256;
-
-    //-------------------------------------------------------------------------
-
-    const long VSCROLL = 512;
-
-    //-------------------------------------------------------------------------
-
-    const long LEFT = 1024;
-
-    //-------------------------------------------------------------------------
-
-    const long CENTER = 2048;
-
-    //-------------------------------------------------------------------------
-
-    const long RIGHT = 4096;
-
-    //-------------------------------------------------------------------------
-
-    const long SPIN = 8192;
-
-    //-------------------------------------------------------------------------
-
-    const long SORT = 16384;
-
-    //-------------------------------------------------------------------------
-
-    const long DROPDOWN = 32768;
-
-    //-------------------------------------------------------------------------
-
-    const long DEFBUTTON = 65536;
-
-    //-------------------------------------------------------------------------
-
-    const long READONLY = 262144;
-
-    //-------------------------------------------------------------------------
-
-    const long CLIPCHILDREN = 524288;
-
-    //-------------------------------------------------------------------------
-
-    const long NOBORDER = 1048576;
-
-    //-------------------------------------------------------------------------
-
-    const long GROUP = 2097152;
-
-    //-------------------------------------------------------------------------
-
-    const long OK = 4194304;
-
-    //-------------------------------------------------------------------------
-
-    const long OK_CANCEL = 8388608;
-
-    //-------------------------------------------------------------------------
-
-    const long YES_NO = 16777216;
-
-    //-------------------------------------------------------------------------
-
-    const long YES_NO_CANCEL = 33554432;
-
-    //-------------------------------------------------------------------------
-
-    const long RETRY_CANCEL = 67108864;
-
-    //-------------------------------------------------------------------------
-
-    const long DEF_OK = 134217728;
-
-    //-------------------------------------------------------------------------
-
-    const long DEF_CANCEL = 268435456;
-
-    //-------------------------------------------------------------------------
-
-    const long DEF_RETRY = 536870912;
-
-    //-------------------------------------------------------------------------
-
-    const long DEF_YES = 1073741824;
-
-    //-------------------------------------------------------------------------
-
-    const long DEF_NO = -2147483648;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+    
+    const long HSCROLL = 256; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long VSCROLL = 512; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long LEFT = 1024; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long CENTER = 2048; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long RIGHT = 4096; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long SPIN = 8192; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long SORT = 16384; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long DROPDOWN = 32768; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long DEFBUTTON = 65536; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long READONLY = 262144; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long CLIPCHILDREN = 524288; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long NOBORDER = 1048576; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long GROUP = 2097152; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long OK = 4194304; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long OK_CANCEL = 8388608; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long YES_NO = 16777216; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long YES_NO_CANCEL = 33554432; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long RETRY_CANCEL = 67108864; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long DEF_OK = 134217728; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long DEF_CANCEL = 268435456; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long DEF_RETRY = 536870912; 
+    
+    //------------------------------------------------------------------------- 
+        
+    const long DEF_YES = 1073741824; 
+ 
+    //------------------------------------------------------------------------- 
+    
+    const long DEF_NO = -2147483648; 
+ 
+    //------------------------------------------------------------------------- 
+    
     const long NOLABEL = 536870912; //added for issue79712
-
-    //-------------------------------------------------------------------------
-
-    const long AUTOHSCROLL = 1073741824;
-
-    //-------------------------------------------------------------------------
-
-    const long AUTOVSCROLL = -2147483648;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+    //-------------------------------------------------------------------------	
+
+    const long AUTOHSCROLL = 1073741824; 
+
+    //------------------------------------------------------------------------- 
+    
+    const long AUTOVSCROLL = -2147483648; 
+
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/VisualEffect.idl b/offapi/com/sun/star/awt/VisualEffect.idl
index a9c818bf1225..4f0f1674ef4c 100644
--- a/offapi/com/sun/star/awt/VisualEffect.idl
+++ b/offapi/com/sun/star/awt/VisualEffect.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/WindowAttribute.idl b/offapi/com/sun/star/awt/WindowAttribute.idl
index 68f9feb3fd42..dfa33fcfb1e4 100644
--- a/offapi/com/sun/star/awt/WindowAttribute.idl
+++ b/offapi/com/sun/star/awt/WindowAttribute.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,112 +24,112 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_WindowAttribute_idl__
-#define __com_sun_star_awt_WindowAttribute_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_WindowAttribute_idl__ 
+#define __com_sun_star_awt_WindowAttribute_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** These values are used to specify the decorations of a window.
 
     <p><b>IMPORTANT:</b> These constants have to be disjunct with
     constants in <type>VclWindowPeerAttribute</type>.</p>
  */
 published constants WindowAttribute
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the window is initially visible.
      */
-    const long SHOW = 1;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies that the window fills the complete desktop area.
-
+    const long SHOW = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies that the window fills the complete desktop area. 
+                 
         <p>This applies only to top windows.</p>
      */
-    const long FULLSIZE = 2;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies that the window is optimum size.
-
+    const long FULLSIZE = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies that the window is optimum size. 
+                 
         <p>This applies only to top windows.</p>
      */
-    const long OPTIMUMSIZE = 4;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies that the window is minimum size.
-
+    const long OPTIMUMSIZE = 4; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies that the window is minimum size. 
+                 
         <p>This applies only to top windows.</p>
      */
-    const long MINSIZE = 8;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies that the window has visible borders.
-
+    const long MINSIZE = 8; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies that the window has visible borders. 
+                 
         <p>This applies only to top windows.</p>
      */
-    const long BORDER = 16;
+    const long BORDER = 16; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies that the size of the window can be changed by the user. 
 
-    //-------------------------------------------------------------------------
-
-    /** specifies that the size of the window can be changed by the user.
-
-        <p>This applies only to top windows.</p>
+        <p>This applies only to top windows.</p>    
      */
-    const long SIZEABLE = 32;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies that the window can be moved by the user.
+    const long SIZEABLE = 32; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies that the window can be moved by the user. 
 
-        <p>This applies only to top windows.</p>
+        <p>This applies only to top windows.</p>    
      */
-    const long MOVEABLE = 64;
-
-    //-------------------------------------------------------------------------
+    const long MOVEABLE = 64; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies that the window can be closed by the user. 
 
-    /** specifies that the window can be closed by the user.
-
-        <p>This applies only to top windows.</p>
+        <p>This applies only to top windows.</p>    
      */
-    const long CLOSEABLE = 128;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies that the window should support the
+    const long CLOSEABLE = 128; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies that the window should support the 
         <type scope="com::sun::star::awt::">XSystemDependentWindowPeer</type>
-        interface.
-
-        <p>This flag may be ignored, but in this case no system-dependent
+        interface.  
+                 
+        <p>This flag may be ignored, but in this case no system-dependent  
         extension works.</p>
-
-        @see XSystemDependentWindowPeer
+                 
+        @see XSystemDependentWindowPeer 
         @see com::sun::star::lang::SystemDependent
 
         @deprecated
             conflicts with <member>VclWindowPeerAttribute::HSCROLL</member>
      */
-    const long SYSTEMDEPENDENT = 256;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies that the window should have no decoration.
+    const long SYSTEMDEPENDENT = 256; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies that the window should have no decoration. 
      */
     const long NODECORATION = 512;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/WindowClass.idl b/offapi/com/sun/star/awt/WindowClass.idl
index d798cb3599cc..a30b8a6aacb4 100644
--- a/offapi/com/sun/star/awt/WindowClass.idl
+++ b/offapi/com/sun/star/awt/WindowClass.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_WindowClass_idl__
-#define __com_sun_star_awt_WindowClass_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_WindowClass_idl__ 
+#define __com_sun_star_awt_WindowClass_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the class of a window.
  */
 published enum WindowClass
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies a top level window on the desktop. It is also a container.
      */
-    TOP,
-
-    //-------------------------------------------------------------------------
-
+    TOP, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is a modal top level window on the desktop. It is also a container.
      */
-    MODALTOP,
-
-    //-------------------------------------------------------------------------
-
+    MODALTOP, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is a container that may contain other components.
         It is not a top window.
      */
-    CONTAINER,
-
-    //-------------------------------------------------------------------------
-
+    CONTAINER, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is the simplest window. It can be a container.
      */
-    SIMPLE
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    SIMPLE 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/WindowDescriptor.idl b/offapi/com/sun/star/awt/WindowDescriptor.idl
index 3ab2b89299c7..b2aa2fbacb02 100644
--- a/offapi/com/sun/star/awt/WindowDescriptor.idl
+++ b/offapi/com/sun/star/awt/WindowDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_WindowDescriptor_idl__
-#define __com_sun_star_awt_WindowDescriptor_idl__
-
-#ifndef __com_sun_star_awt_WindowClass_idl__
-#include <com/sun/star/awt/WindowClass.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
-#include <com/sun/star/awt/XWindowPeer.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
-#include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_WindowDescriptor_idl__ 
+#define __com_sun_star_awt_WindowDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_awt_WindowClass_idl__ 
+#include <com/sun/star/awt/WindowClass.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XWindowPeer_idl__ 
+#include <com/sun/star/awt/XWindowPeer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Rectangle_idl__ 
+#include <com/sun/star/awt/Rectangle.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** describes a window.
  */
 published struct WindowDescriptor
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** specifies the type of window.
      */
-    com::sun::star::awt::WindowClass Type;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::WindowClass Type; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the name of the component service.
-
-        <p>A zero length name means that the vcl creates a blank top,
+                        
+        <p>A zero length name means that the vcl creates a blank top, 
         a container, or a simple window.
         The following service names are defined:<br/>
         <ul>
@@ -131,49 +131,49 @@ published struct WindowDescriptor
         </ul>
         </p>
      */
-    string WindowServiceName;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the parent of the component.
-
-        <p>If <code>Parent == 0 && ParentIndex == -1</code>,
+    string WindowServiceName; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the parent of the component. 
+                        
+        <p>If <code>Parent == 0 && ParentIndex == -1</code>, 
         then the window is on the desktop.</p>
      */
-    com::sun::star::awt::XWindowPeer Parent;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::XWindowPeer Parent; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the index of the parent window, if available.
-
+                        
         <p>If <code>Parent == 0</code> and this struct is a member of an array,
         then this is the offset from the beginning of the array to the parent.
         A value of -1 means desktop.</p>
      */
-    short ParentIndex;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the position and size of the window.
-
+    short ParentIndex; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the position and size of the window. 
+                        
         <p>This member is ignored if the window attribute is
         <const scope="com::sun::star::awt">WindowAttribute::FULLSIZE</const>.</p>
      */
-    com::sun::star::awt::Rectangle Bounds;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Rectangle Bounds; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the window attributes.
 
         <p>Use one value out of the constant group
-        <type scope="com::sun::star::awt">WindowAttribute</type>.</p>
+        <type scope="com::sun::star::awt">WindowAttribute</type>.</p>    
      */
-    long WindowAttributes;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    long WindowAttributes; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/WindowEvent.idl b/offapi/com/sun/star/awt/WindowEvent.idl
index fb46c18b19f6..a353dc067b0d 100644
--- a/offapi/com/sun/star/awt/WindowEvent.idl
+++ b/offapi/com/sun/star/awt/WindowEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,88 +24,88 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_WindowEvent_idl__
-#define __com_sun_star_awt_WindowEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_WindowEvent_idl__ 
+#define __com_sun_star_awt_WindowEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a window event.
  */
 published struct WindowEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the outer x position of the window.
      */
-    long X;
-
-    //-------------------------------------------------------------------------
-
+    long X; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the outer y position of the window.
      */
-    long Y;
-
-    //-------------------------------------------------------------------------
-
+    long Y; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the outer (total) width of the window.
      */
-    long Width;
-
-    //-------------------------------------------------------------------------
-
+    long Width; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the outer (total) height of the window.
      */
-    long Height;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the inset from the left.
-
+    long Height; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the inset from the left. 
+                        
         <p>The inset is the distance between the outer and the inner window,
         that means the left inset is the width of the left border.</p>
      */
-    long LeftInset;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the inset from the top.
-
+    long LeftInset; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the inset from the top. 
+                        
         <p>The inset is the distance between the outer and the inner window,
         that means the top inset is the height of the top border.</p>
      */
-    long TopInset;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the inset from the right.
-
+    long TopInset; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the inset from the right. 
+                        
         <p>The inset is the distance between the outer and the inner window,
         that means the right inset is the width of the right border.</p>
      */
-    long RightInset;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the inset from the bottom.
-
+    long RightInset; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the inset from the bottom. 
+                        
         <p>The inset is the distance between the outer and the inner window,
         that means the bottom inset is the height of the bottom border.</p>
      */
-    long BottomInset;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    long BottomInset; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XActionListener.idl b/offapi/com/sun/star/awt/XActionListener.idl
index 15dbc6110320..662aa4d243d7 100644
--- a/offapi/com/sun/star/awt/XActionListener.idl
+++ b/offapi/com/sun/star/awt/XActionListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XActionListener_idl__
-#define __com_sun_star_awt_XActionListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_ActionEvent_idl__
-#include <com/sun/star/awt/ActionEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XActionListener_idl__ 
+#define __com_sun_star_awt_XActionListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_ActionEvent_idl__ 
+#include <com/sun/star/awt/ActionEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive action events.
  */
 published interface XActionListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when an action is performed.
      */
-    [oneway] void actionPerformed( [in] com::sun::star::awt::ActionEvent rEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void actionPerformed( [in] com::sun::star::awt::ActionEvent rEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XActivateListener.idl b/offapi/com/sun/star/awt/XActivateListener.idl
index 954b5e11294c..51880a010a82 100644
--- a/offapi/com/sun/star/awt/XActivateListener.idl
+++ b/offapi/com/sun/star/awt/XActivateListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,55 +24,55 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XActivateListener_idl__
-#define __com_sun_star_awt_XActivateListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XActivateListener_idl__ 
+#define __com_sun_star_awt_XActivateListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive activate events.
 
-    @see XFocusListener
+    @see XFocusListener 
     @see XTopWindowListener
  */
 published interface XActivateListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
-    /** is invoked when a window is activated.
-
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** is invoked when a window is activated. 
+                        
         <p>A window is activated if a child or itself got the focus.</p>
 
         @see XFocusListener::focusGained
      */
-    [oneway] void windowActivated( [in] com::sun::star::lang::EventObject e );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void windowActivated( [in] com::sun::star::lang::EventObject e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a window is deactivated.
-
+                        
         <p>A window is deactivated if a child or itself lost the focus.</p>
 
         @see XFocusListener::focusLost
      */
-    [oneway] void windowDeactivated( [in] com::sun::star::lang::EventObject e );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void windowDeactivated( [in] com::sun::star::lang::EventObject e ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XAdjustmentListener.idl b/offapi/com/sun/star/awt/XAdjustmentListener.idl
index 4e56f96170cf..d6baa54cac1a 100644
--- a/offapi/com/sun/star/awt/XAdjustmentListener.idl
+++ b/offapi/com/sun/star/awt/XAdjustmentListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XAdjustmentListener_idl__
-#define __com_sun_star_awt_XAdjustmentListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_AdjustmentEvent_idl__
-#include <com/sun/star/awt/AdjustmentEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XAdjustmentListener_idl__ 
+#define __com_sun_star_awt_XAdjustmentListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_AdjustmentEvent_idl__ 
+#include <com/sun/star/awt/AdjustmentEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive adjustment events.
  */
 published interface XAdjustmentListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the adjustment has changed.
      */
-    [oneway] void adjustmentValueChanged( [in] com::sun::star::awt::AdjustmentEvent rEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void adjustmentValueChanged( [in] com::sun::star::awt::AdjustmentEvent rEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XBitmap.idl b/offapi/com/sun/star/awt/XBitmap.idl
index 4c1a650d796a..467be2fd0489 100644
--- a/offapi/com/sun/star/awt/XBitmap.idl
+++ b/offapi/com/sun/star/awt/XBitmap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XBitmap_idl__
-#define __com_sun_star_awt_XBitmap_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
-#include <com/sun/star/awt/Size.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XBitmap_idl__ 
+#define __com_sun_star_awt_XBitmap_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Size_idl__ 
+#include <com/sun/star/awt/Size.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** provides a bitmap in the Microsoft DIB format.
  */
 published interface XBitmap: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the size of the bitmap in pixel.
      */
-    com::sun::star::awt::Size getSize();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Size getSize(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the device independent bitmap.
      */
-    sequence<byte> getDIB();
-
-    //-------------------------------------------------------------------------
-
+    sequence<byte> getDIB(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the transparency mask of the device independent bitmap.
      */
-    sequence<byte> getMaskDIB();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    sequence<byte> getMaskDIB(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XButton.idl b/offapi/com/sun/star/awt/XButton.idl
index 47b24d757811..99ed50f7f68e 100644
--- a/offapi/com/sun/star/awt/XButton.idl
+++ b/offapi/com/sun/star/awt/XButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,56 +24,56 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XButton_idl__
-#define __com_sun_star_awt_XButton_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XActionListener_idl__
-#include <com/sun/star/awt/XActionListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XButton_idl__ 
+#define __com_sun_star_awt_XButton_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XActionListener_idl__ 
+#include <com/sun/star/awt/XActionListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to set the label of a button and to register for action events.
  */
 published interface XButton: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** registers an event handler for button action events.
      */
-    [oneway] void addActionListener( [in] com::sun::star::awt::XActionListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addActionListener( [in] com::sun::star::awt::XActionListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** unregisters an event handler for button action events.
      */
-    [oneway] void removeActionListener( [in] com::sun::star::awt::XActionListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeActionListener( [in] com::sun::star::awt::XActionListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the label of the button.
      */
-    [oneway] void setLabel( [in] string Label );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setLabel( [in] string Label ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets a command string for pushing the button.
      */
-    [oneway] void setActionCommand( [in] string Command );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void setActionCommand( [in] string Command ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XCallback.idl b/offapi/com/sun/star/awt/XCallback.idl
index 25cc9bd522bb..ce3bd7cb676e 100644
--- a/offapi/com/sun/star/awt/XCallback.idl
+++ b/offapi/com/sun/star/awt/XCallback.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,15 +28,15 @@
 #ifndef __com_sun_star_awt_XCallback_idl__
 #define __com_sun_star_awt_XCallback_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
 #endif
 
 //=============================================================================
 
 module com { module sun { module star { module awt {
-
-//=============================================================================
+    
+//============================================================================= 
 
 /** specifies an interface which can be used to call back
     an implementation
@@ -44,7 +44,7 @@ module com { module sun { module star { module awt {
 interface XCallback
 {
     //-------------------------------------------------------------------------
-
+    
     /** notifies the callback implementation
 
         @param aData
diff --git a/offapi/com/sun/star/awt/XCheckBox.idl b/offapi/com/sun/star/awt/XCheckBox.idl
index 0e1011d75294..ea29a083bf96 100644
--- a/offapi/com/sun/star/awt/XCheckBox.idl
+++ b/offapi/com/sun/star/awt/XCheckBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,69 +24,69 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XCheckBox_idl__
-#define __com_sun_star_awt_XCheckBox_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XItemListener_idl__
-#include <com/sun/star/awt/XItemListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XCheckBox_idl__ 
+#define __com_sun_star_awt_XCheckBox_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XItemListener_idl__ 
+#include <com/sun/star/awt/XItemListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to the state of a check box and makes it possible
     to register for events.
  */
 published interface XCheckBox: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** registers a listener for item events.
      */
-    [oneway] void addItemListener( [in] com::sun::star::awt::XItemListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addItemListener( [in] com::sun::star::awt::XItemListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** unregisters a listener for item events.
      */
-    [oneway] void removeItemListener( [in] com::sun::star::awt::XItemListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeItemListener( [in] com::sun::star::awt::XItemListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the state of the check box.
      */
-    short getState();
-
-    //-------------------------------------------------------------------------
-
+    short getState(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the state of the check box.
      */
-    [oneway] void setState( [in] short n );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setState( [in] short n ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the label of the check box.
      */
-    [oneway] void setLabel( [in] string Label );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setLabel( [in] string Label ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** enables or disables the tri state mode.
      */
-    [oneway] void enableTriState( [in] boolean b );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void enableTriState( [in] boolean b ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XComboBox.idl b/offapi/com/sun/star/awt/XComboBox.idl
index b85b36a037d3..fc3fcab67585 100644
--- a/offapi/com/sun/star/awt/XComboBox.idl
+++ b/offapi/com/sun/star/awt/XComboBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,109 +24,109 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XComboBox_idl__
-#define __com_sun_star_awt_XComboBox_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XItemListener_idl__
-#include <com/sun/star/awt/XItemListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XActionListener_idl__
-#include <com/sun/star/awt/XActionListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XComboBox_idl__ 
+#define __com_sun_star_awt_XComboBox_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XItemListener_idl__ 
+#include <com/sun/star/awt/XItemListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XActionListener_idl__ 
+#include <com/sun/star/awt/XActionListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to the items of a combo box and makes it possible to
     register item and action event listeners.
  */
 published interface XComboBox: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** registers a listener for item events.
      */
-    [oneway] void addItemListener( [in] com::sun::star::awt::XItemListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addItemListener( [in] com::sun::star::awt::XItemListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** unregisters a listener for item events.
      */
-    [oneway] void removeItemListener( [in] com::sun::star::awt::XItemListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeItemListener( [in] com::sun::star::awt::XItemListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** registers a listener for action events.
      */
-    [oneway] void addActionListener( [in] com::sun::star::awt::XActionListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addActionListener( [in] com::sun::star::awt::XActionListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** unregisters a listener for action events.
      */
-    [oneway] void removeActionListener( [in] com::sun::star::awt::XActionListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeActionListener( [in] com::sun::star::awt::XActionListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** adds an item at the specified position.
      */
-    [oneway] void addItem( [in] string aItem, [in] short nPos );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addItem( [in] string aItem, [in] short nPos ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** adds multiple items at the specified position.
      */
-    [oneway] void addItems( [in] sequence<string> aItems, [in] short nPos );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addItems( [in] sequence<string> aItems, [in] short nPos ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** removes a number of items at the specified position.
      */
-    [oneway] void removeItems( [in] short nPos, [in] short nCount );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeItems( [in] short nPos, [in] short nCount ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the number of items in the combo box.
      */
-    short getItemCount();
-
-    //-------------------------------------------------------------------------
-
+    short getItemCount(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the item at the specified position.
      */
-    string getItem( [in] short nPos );
-
-    //-------------------------------------------------------------------------
-
+    string getItem( [in] short nPos ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns all items of the combo box.
      */
-    sequence<string> getItems();
-
-    //-------------------------------------------------------------------------
-
+    sequence<string> getItems(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the number of visible lines in the drop down mode.
      */
-    short getDropDownLineCount();
-
-    //-------------------------------------------------------------------------
-
+    short getDropDownLineCount(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the number of visible lines for drop down mode.
      */
-    [oneway] void setDropDownLineCount( [in] short nLines );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void setDropDownLineCount( [in] short nLines ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl b/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl
index d1e2d725c02e..bc1f0697dca1 100644
--- a/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl
+++ b/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,26 +31,26 @@
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
 #endif
-#ifndef __com_sun_star_awt_XWindow_idl__
-#include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
+#ifndef __com_sun_star_awt_XWindow_idl__ 
+#include <com/sun/star/awt/XWindow.idl> 
 #endif
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module awt {
 
-//=============================================================================
+//============================================================================= 
 
 /** Handles events fired by windows represented by a
     <type scope="com::sun::star::awt">XWindow</type> interface.
  */
 interface XContainerWindowEventHandler : ::com::sun::star::uno::XInterface {
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** Handles an event generated by a window.
 
@@ -62,7 +62,7 @@ interface XContainerWindowEventHandler : ::com::sun::star::uno::XInterface {
             the window instance that generated the event. If used in the scope of
             <type scope="com::sun::star::awt">XContainerWindowProvider</type> this
             is the same window instance that was returned by the createContainerWindow
-            method when passing the XContainerWindowEventHandler instance receiving the
+            method when passing the XContainerWindowEventHandler instance receiving the 
             event as handler parameter.
 
         @param EventObject
@@ -75,11 +75,11 @@ interface XContainerWindowEventHandler : ::com::sun::star::uno::XInterface {
 
         @param MethodName
             the name of the function which is to be called.
-
+            
         @returns
             true if the event was handled, otherwise false.
 
-        @throws com::sun::star::lang::WrappedTargetException
+        @throws com::sun::star::lang::WrappedTargetException  
             if the implementation of the method, which is determined by the argument MethodName,
             throws an exception. This exception is then wrapped into a
             <type scope="com::sun::star::lang">WrappedTargetException</type>.
@@ -89,7 +89,7 @@ interface XContainerWindowEventHandler : ::com::sun::star::uno::XInterface {
         [in] com::sun::star::awt::XWindow xWindow,
         [in] any EventObject,
         [in] string MethodName)
-        raises(com::sun::star::lang::WrappedTargetException);
+        raises(com::sun::star::lang::WrappedTargetException); 
 
 
     /** returns a sequence of supported method names
@@ -100,7 +100,7 @@ interface XContainerWindowEventHandler : ::com::sun::star::uno::XInterface {
     sequence<string> getSupportedMethodNames();
 };
 
-//=============================================================================
+//============================================================================= 
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/XContainerWindowProvider.idl b/offapi/com/sun/star/awt/XContainerWindowProvider.idl
index 1cea42d99a80..fea57d85aa00 100644
--- a/offapi/com/sun/star/awt/XContainerWindowProvider.idl
+++ b/offapi/com/sun/star/awt/XContainerWindowProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,28 +28,28 @@
 #ifndef __com_sun_star_awt_XContainerWindowProvider_idl__
 #define __com_sun_star_awt_XContainerWindowProvider_idl__
 
-#ifndef __com_sun_star_awt_XWindow_idl__
-#include <com/sun/star/awt/XWindow.idl>
+#ifndef __com_sun_star_awt_XWindow_idl__ 
+#include <com/sun/star/awt/XWindow.idl> 
 #endif
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
-#include <com/sun/star/awt/XWindowPeer.idl>
+#ifndef __com_sun_star_awt_XWindowPeer_idl__ 
+#include <com/sun/star/awt/XWindowPeer.idl> 
 #endif
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module awt {
 
-//=============================================================================
+//============================================================================= 
 
-/** provides container windows implementing the
+/** provides container windows implementing the 
     <type scope="com::sun::star::awt">XWindow</type> interface.
  */
 interface XContainerWindowProvider : ::com::sun::star::uno::XInterface {
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** creates a window for the given URL
 
@@ -65,28 +65,28 @@ interface XContainerWindowProvider : ::com::sun::star::uno::XInterface {
             This parameter must not be null.
 
         @param xHandler
-            is the interface that will be called to handle the Events that
-            are generated by the window (and all controls placed on it) and
-            bound to the handler using a vnd.sun.star.UNO URL specifying a
-            handler method to be called. Usually this will be done directly
+            is the interface that will be called to handle the Events that 
+            are generated by the window (and all controls placed on it) and 
+            bound to the handler using a vnd.sun.star.UNO URL specifying a 
+            handler method to be called. Usually this will be done directly 
             by the user.
-
+            
             xHandler can handle events in two different ways:
 
-            1. By supporting the <type scope="com::sun::star::awt">XContainerWindowEventHandler</type>
+            1. By supporting the <type scope="com::sun::star::awt">XContainerWindowEventHandler</type> 
             interface. This is a generic interface to accept event notifications.
-
+            
             2. By providing interfaces that directly implement the handler
             methods to be called. The XContainerWindowProvider implementation then
-            will try to access these events using the
+            will try to access these events using the 
             <type scope="com::sun::star::beans">Introspection</type>Introspection
             service. To make this possible the handler implementation also has to
             support <type scope="com::sun::star::lang">XTypeProvider</type>.
 
             If XContainerWindowEventHandler is supported XContainerWindowEventHandler.callHandlerMethod()
-            is always called first to handle the event. Only if the event cannot be
+            is always called first to handle the event. Only if the event cannot be 
             handled by XContainerWindowEventHandler (callHandlerMethod() then has to return
-            false) or if XContainerWindowEventHandler is not supported at all the Introspection
+            false) or if XContainerWindowEventHandler is not supported at all the Introspection 
             based access will be used.
 
             The Introspection based access tries to call a method named according to the
@@ -96,10 +96,10 @@ interface XContainerWindowProvider : ::com::sun::star::uno::XInterface {
             void HandlerMethodName( [in] com::sun::star::awt::XWindow xWindow, [in] any aEvent )
 
             will be searched. The signature is similar to XContainerWindowEventHandler.
-            callHandlerMethod except for MethodName itself that isn't needed
+            callHandlerMethod except for MethodName itself that isn't needed 
             here. For more information about these parameters, see
             <type scope="com::sun::star::awt">XContainerWindowEventHandler</type>.
-
+            
             If this method is found, it will be called, otherwise a method
 
             void HandlerMethodName( void )
@@ -119,11 +119,11 @@ interface XContainerWindowProvider : ::com::sun::star::uno::XInterface {
     com::sun::star::awt::XWindow createContainerWindow
         ( [in] string URL, [in] string WindowType,
           [in] com::sun::star::awt::XWindowPeer xParent,
-          [in] com::sun::star::uno::XInterface xHandler )
+          [in] com::sun::star::uno::XInterface xHandler )  
             raises ( com::sun::star::lang::IllegalArgumentException );
 };
 
-//=============================================================================
+//============================================================================= 
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/XControl.idl b/offapi/com/sun/star/awt/XControl.idl
index ebc58f9967f3..3a51bceefeeb 100644
--- a/offapi/com/sun/star/awt/XControl.idl
+++ b/offapi/com/sun/star/awt/XControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,123 +24,123 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XControl_idl__
-#define __com_sun_star_awt_XControl_idl__
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XToolkit_idl__
-#include <com/sun/star/awt/XToolkit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
-#include <com/sun/star/awt/XWindowPeer.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControlModel_idl__
-#include <com/sun/star/awt/XControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XView_idl__
-#include <com/sun/star/awt/XView.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XControl_idl__ 
+#define __com_sun_star_awt_XControl_idl__ 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XToolkit_idl__ 
+#include <com/sun/star/awt/XToolkit.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XWindowPeer_idl__ 
+#include <com/sun/star/awt/XWindowPeer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XControlModel_idl__ 
+#include <com/sun/star/awt/XControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XView_idl__ 
+#include <com/sun/star/awt/XView.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** identifies a control.
 
     <p>Implementations of this interface are abstract windows.
     The main reason to instantiate this implementation is to show the window
     on the screen. Before the window appears on the screen, the
     <member>XControl::createPeer</member> method must be called.</p>
-
+    
     <p>If the implementation of the control does not distinguish
     between model, view and controller, it must allow to set
     a new XGraphics in the view, so that the control can be printed.</p>
  */
 published interface XControl: com::sun::star::lang::XComponent
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the context of the control.
      */
-    [oneway] void setContext( [in] com::sun::star::uno::XInterface Context );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setContext( [in] com::sun::star::uno::XInterface Context ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** gets the context of the control.
      */
-    com::sun::star::uno::XInterface getContext();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::uno::XInterface getContext(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** creates a "child" window on the screen.
 
         <p>If the parent is NULL, then the desktop window of the toolkit
         is the parent.</p>
      */
-    [oneway] void createPeer( [in] com::sun::star::awt::XToolkit Toolkit,
-             [in] com::sun::star::awt::XWindowPeer Parent );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void createPeer( [in] com::sun::star::awt::XToolkit Toolkit, 
+             [in] com::sun::star::awt::XWindowPeer Parent ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the peer which was previously created or set.
      */
-    com::sun::star::awt::XWindowPeer getPeer();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::XWindowPeer getPeer(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets a model for the control.
      */
-    boolean setModel( [in] com::sun::star::awt::XControlModel Model );
-
-    //-------------------------------------------------------------------------
+    boolean setModel( [in] com::sun::star::awt::XControlModel Model ); 
 
+    //------------------------------------------------------------------------- 
+     
     /** returns the model for this control.
      */
-    com::sun::star::awt::XControlModel getModel();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::XControlModel getModel(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the view of this control.
      */
-    com::sun::star::awt::XView getView();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::XView getView(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the design mode for use in a design editor.
-
+        
         <p>Normally the control will be painted directly without a peer.</p>
      */
-    [oneway] void setDesignMode( [in] boolean bOn );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setDesignMode( [in] boolean bOn ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns <true/> if the control is in design mode, <false/> otherwise.
      */
-    boolean isDesignMode();
-
-    //-------------------------------------------------------------------------
-
+    boolean isDesignMode(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns <true/> if the control is transparent, <false/> otherwise.
      */
-    boolean isTransparent();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean isTransparent(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XControlContainer.idl b/offapi/com/sun/star/awt/XControlContainer.idl
index 938d4ca364a0..9f51fe987611 100644
--- a/offapi/com/sun/star/awt/XControlContainer.idl
+++ b/offapi/com/sun/star/awt/XControlContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,64 +24,64 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XControlContainer_idl__
-#define __com_sun_star_awt_XControlContainer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControl_idl__
-#include <com/sun/star/awt/XControl.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XControlContainer_idl__ 
+#define __com_sun_star_awt_XControlContainer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XControl_idl__ 
+#include <com/sun/star/awt/XControl.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** Provides access to the controls within an
     <type>UnoControlContainer</type>.
  */
 published interface XControlContainer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the status text in the status bar of the container.
      */
-    [oneway] void setStatusText( [in] string StatusText );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setStatusText( [in] string StatusText ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns all controls.
      */
-    sequence<com::sun::star::awt::XControl> getControls();
-
-    //-------------------------------------------------------------------------
-
+    sequence<com::sun::star::awt::XControl> getControls(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the control with the specified name.
      */
-    com::sun::star::awt::XControl getControl( [in] string aName );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::XControl getControl( [in] string aName ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** adds the given control with the specified name to the container.
      */
-    [oneway] void addControl( [in] string Name,
-             [in] com::sun::star::awt::XControl Control );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addControl( [in] string Name, 
+             [in] com::sun::star::awt::XControl Control ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the given control from the container.
      */
-    [oneway] void removeControl( [in] com::sun::star::awt::XControl Control );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void removeControl( [in] com::sun::star::awt::XControl Control ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XControlModel.idl b/offapi/com/sun/star/awt/XControlModel.idl
index a8e7c84b93d1..bd77db0d87c4 100644
--- a/offapi/com/sun/star/awt/XControlModel.idl
+++ b/offapi/com/sun/star/awt/XControlModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XControlModel_idl__
-#define __com_sun_star_awt_XControlModel_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XControlModel_idl__ 
+#define __com_sun_star_awt_XControlModel_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** identifies a control model.
  */
 published interface XControlModel: com::sun::star::uno::XInterface
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XCurrencyField.idl b/offapi/com/sun/star/awt/XCurrencyField.idl
index d1345bfc679b..661d64c22582 100644
--- a/offapi/com/sun/star/awt/XCurrencyField.idl
+++ b/offapi/com/sun/star/awt/XCurrencyField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,126 +24,126 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XCurrencyField_idl__
-#define __com_sun_star_awt_XCurrencyField_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XCurrencyField_idl__ 
+#define __com_sun_star_awt_XCurrencyField_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to the value and formatting of a currency field.
  */
 published interface XCurrencyField: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the value which is displayed in the currency field.
      */
-    [oneway] void setValue( [in] double Value );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setValue( [in] double Value ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the value which is currently displayed in the currency field.
      */
-    double getValue();
-
-    //-------------------------------------------------------------------------
-
+    double getValue(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the minimum value that can be entered by the user.
      */
-    [oneway] void setMin( [in] double Value );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setMin( [in] double Value ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set minimum value that can be entered by the
         user.
      */
-    double getMin();
-
-    //-------------------------------------------------------------------------
-
+    double getMin(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the maximum value that can be entered by the user.
      */
-    [oneway] void setMax( [in] double Value );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setMax( [in] double Value ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set maximum value that can be entered by the
         user.
      */
-    double getMax();
-
-    //-------------------------------------------------------------------------
-
+    double getMax(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the first value to be set on POS1 key.
-     */
-    [oneway] void setFirst( [in] double Value );
-
-    //-------------------------------------------------------------------------
-
+     */    
+    [oneway] void setFirst( [in] double Value ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set first value which is set on POS1 key.
-     */
-    double getFirst();
-
-    //-------------------------------------------------------------------------
-
+     */    
+    double getFirst(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the last value to be set on END key.
-     */
-    [oneway] void setLast( [in] double Value );
-
-    //-------------------------------------------------------------------------
-
+     */    
+    [oneway] void setLast( [in] double Value ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set last value which is set on END key.
-     */
-    double getLast();
-
-    //-------------------------------------------------------------------------
-
+     */    
+    double getLast(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the increment value for the spin button.
      */
-    [oneway] void setSpinSize( [in] double Value );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setSpinSize( [in] double Value ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set increment value for the spin button.
      */
-    double getSpinSize();
-
-    //-------------------------------------------------------------------------
-
+    double getSpinSize(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the number of decimals.
      */
-    [oneway] void setDecimalDigits( [in] short nDigits );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setDecimalDigits( [in] short nDigits ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set number of decimals.
      */
-    short getDecimalDigits();
-
-    //-------------------------------------------------------------------------
+    short getDecimalDigits(); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** determines if the format is checked during user input.
-     */
-    [oneway] void setStrictFormat( [in] boolean bStrict );
-
-    //-------------------------------------------------------------------------
-
+     */    
+    [oneway] void setStrictFormat( [in] boolean bStrict ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns whether the format is currently checked during user input.
-     */
-    boolean isStrictFormat();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+     */    
+    boolean isStrictFormat(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XDataTransferProviderAccess.idl b/offapi/com/sun/star/awt/XDataTransferProviderAccess.idl
index 8ce12873836a..c0cc57a3ffe1 100644
--- a/offapi/com/sun/star/awt/XDataTransferProviderAccess.idl
+++ b/offapi/com/sun/star/awt/XDataTransferProviderAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module datatransfer {
+module com { module sun { module star { module datatransfer { 
 module dnd {
      published interface XDragGestureRecognizer;
      published interface XDragSource;
@@ -42,7 +42,7 @@ module dnd {
 };
 module clipboard {
      published interface XClipboard;
-};
+}; 
 }; }; }; };
 
 //=============================================================================
@@ -53,7 +53,7 @@ module com { module sun { module star { module awt {
 
 //=============================================================================
 
-/** This interface extends the XToolkit interface with clipboard and
+/** This interface extends the XToolkit interface with clipboard and 
     drag-and-drop support.
 */
 published interface XDataTransferProviderAccess: com::sun::star::uno::XInterface
@@ -61,7 +61,7 @@ published interface XDataTransferProviderAccess: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     /** returns the drag gesture recognizer of the specified window.
-
+    
         @returns the drag gesture recognizer.
 
         @param window
@@ -74,18 +74,18 @@ published interface XDataTransferProviderAccess: com::sun::star::uno::XInterface
     /** returns the drag source of the specified window.
 
         @returns the drag source.
-
+    
         @param window
         a window created by the same toolkit instance.
     */
     com::sun::star::datatransfer::dnd::XDragSource getDragSource( [in] XWindow window );
-
+    
     //-------------------------------------------------------------------------
 
     /** returns the drop target of the specified window.
 
         @returns the drop target.
-
+        
         @param window
         a window created by the same toolkit instance.
     */
@@ -96,7 +96,7 @@ published interface XDataTransferProviderAccess: com::sun::star::uno::XInterface
     /** returns the specified clipboard.
 
         @returns the specified clipboard (if available).
-
+        
         @param clipboardName
         the name of the clipboard to return.
         If an empty string is passed in, the default clipboard is returned.
diff --git a/offapi/com/sun/star/awt/XDateField.idl b/offapi/com/sun/star/awt/XDateField.idl
index f7c0e3cc8f19..a0d6990a5436 100644
--- a/offapi/com/sun/star/awt/XDateField.idl
+++ b/offapi/com/sun/star/awt/XDateField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,129 +24,129 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XDateField_idl__
-#define __com_sun_star_awt_XDateField_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XDateField_idl__ 
+#define __com_sun_star_awt_XDateField_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to the value and settings of a date field.
  */
 published interface XDateField: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the date value which is displayed in the date field.
 
         <p>The date value must be specified in the format
         YYYYMMDD.</p>
      */
-    [oneway] void setDate( [in] long Date );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setDate( [in] long Date ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the date value which is currently displayed in the date field.
      */
-    long getDate();
-
-    //-------------------------------------------------------------------------
-
+    long getDate(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the minimum date value that can be entered by the user.
      */
-    [oneway] void setMin( [in] long Date );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setMin( [in] long Date ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set minimum date value that can be entered by
         the user.
      */
-    long getMin();
-
-    //-------------------------------------------------------------------------
-
+    long getMin(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the maximum date value that can be entered by the user.
      */
-    [oneway] void setMax( [in] long Date );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setMax( [in] long Date ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set maximum date value that can be entered by
         the user.
      */
-    long getMax();
-
-    //-------------------------------------------------------------------------
-
+    long getMax(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the first value to be set on POS1 key.
      */
-    [oneway] void setFirst( [in] long Date );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setFirst( [in] long Date ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set first value which is set on POS1 key.
      */
-    long getFirst();
-
-    //-------------------------------------------------------------------------
-
+    long getFirst(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the last value to be set on END key.
      */
-    [oneway] void setLast( [in] long Date );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setLast( [in] long Date ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set last value which is set on END key.
      */
-    long getLast();
-
-    //-------------------------------------------------------------------------
-
+    long getLast(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** determines if the long date format is to be used.
      */
-    [oneway] void setLongFormat( [in] boolean bLong );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setLongFormat( [in] boolean bLong ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** determines if the long date format is currently used.
      */
-    boolean isLongFormat();
-
-    //-------------------------------------------------------------------------
-
+    boolean isLongFormat(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets an empty value for the date.
      */
-    void setEmpty();
-
-    //-------------------------------------------------------------------------
-
+    void setEmpty(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns whether currently an empty value is set for the date.
      */
-    boolean isEmpty();
-
-    //-------------------------------------------------------------------------
-
+    boolean isEmpty(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** determines if the format is checked during user input.
      */
-    [oneway] void setStrictFormat( [in] boolean bStrict );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setStrictFormat( [in] boolean bStrict ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns whether the format is currently checked during user input.
      */
-    boolean isStrictFormat();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean isStrictFormat(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XDevice.idl b/offapi/com/sun/star/awt/XDevice.idl
index 9d05c05e5e2e..5a44f9086753 100644
--- a/offapi/com/sun/star/awt/XDevice.idl
+++ b/offapi/com/sun/star/awt/XDevice.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,104 +24,104 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XDevice_idl__
-#define __com_sun_star_awt_XDevice_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_DeviceInfo_idl__
-#include <com/sun/star/awt/DeviceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
- published interface XGraphics;
- published interface XFont;
- published interface XBitmap;
- published interface XDisplayBitmap;
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XDevice_idl__ 
+#define __com_sun_star_awt_XDevice_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_DeviceInfo_idl__ 
+#include <com/sun/star/awt/DeviceInfo.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+ published interface XGraphics; 
+ published interface XFont; 
+ published interface XBitmap; 
+ published interface XDisplayBitmap; 
+ 
+//============================================================================= 
+ 
 /** provides information about a graphical output device and
     offers a factory for the <em>graphics</em> which provides write
     operations on the device.
  */
 published interface XDevice: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** creates a new graphics whose output operation is directed to this
         device.
      */
-    XGraphics createGraphics();
-
-    //-------------------------------------------------------------------------
-
+    XGraphics createGraphics(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** creates a new device which is compatible with this one.
-
-        <p>If the device does not support the GETBITS device capability,
+                        
+        <p>If the device does not support the GETBITS device capability, 
         this method returns <NULL/>.</p>
      */
-    XDevice createDevice( [in] long nWidth,
-             [in] long nHeight );
-
-    //-------------------------------------------------------------------------
-
+    XDevice createDevice( [in] long nWidth, 
+             [in] long nHeight ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns information about the device.
      */
-    com::sun::star::awt::DeviceInfo getInfo();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::DeviceInfo getInfo(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the list of available font descriptors.
      */
-    sequence<FontDescriptor> getFontDescriptors();
-
-    //-------------------------------------------------------------------------
-
-    /** returns information about a font offered by this device.
+    sequence<FontDescriptor> getFontDescriptors(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** returns information about a font offered by this device. 
 
         @returns the font of this device.
-
-        @param aDescriptor
-        specifies the description of a font.
+        
+        @param aDescriptor  
+        specifies the description of a font.				 
         The unit of measure is pixel for this device.
      */
-    com::sun::star::awt::XFont getFont( [in] FontDescriptor aDescriptor );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::XFont getFont( [in] FontDescriptor aDescriptor ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** creates a bitmap with the current device depth.
-
+        
         <p>If the specified area does not lie entirely in the device, the bits
         outside are not specified.</p>
      */
-    XBitmap createBitmap( [in] long nX,
-             [in] long nY,
-             [in] long nWidth,
-             [in] long nHeight );
-
-    //-------------------------------------------------------------------------
-
-    /** creates a device compatible bitmap.
-
-        <p>The data of the bitmap is in process memory instead of in the device,
+    XBitmap createBitmap( [in] long nX, 
+             [in] long nY, 
+             [in] long nWidth, 
+             [in] long nHeight ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** creates a device compatible bitmap. 
+                        
+        <p>The data of the bitmap is in process memory instead of in the device, 
         so that the output operation is fast.</p>
      */
-    XDisplayBitmap createDisplayBitmap( [in] XBitmap Bitmap );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    XDisplayBitmap createDisplayBitmap( [in] XBitmap Bitmap ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XDialog.idl b/offapi/com/sun/star/awt/XDialog.idl
index 831c80597070..8d897bbe0e5f 100644
--- a/offapi/com/sun/star/awt/XDialog.idl
+++ b/offapi/com/sun/star/awt/XDialog.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XDialog_idl__
-#define __com_sun_star_awt_XDialog_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XDialog_idl__ 
+#define __com_sun_star_awt_XDialog_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to show and hide a dialog and gives access to
     the title of the dialog.
  */
 published interface XDialog: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+    
     /** sets the title of the dialog.
      */
-    [oneway] void setTitle( [in] string Title );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setTitle( [in] string Title ); 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** gets the title of the dialog.
      */
-    string getTitle();
-
-    //-------------------------------------------------------------------------
+    string getTitle(); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** shows the dialog.
      */
-    short execute();
-
-    //-------------------------------------------------------------------------
-
+    short execute(); 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** hides the dialog and then causes <member>XDialog::execute</member>
         to return.
      */
-    void endExecute();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void endExecute(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XDialog2.idl b/offapi/com/sun/star/awt/XDialog2.idl
index cd42d792cd0a..83d4ca85b4b4 100644
--- a/offapi/com/sun/star/awt/XDialog2.idl
+++ b/offapi/com/sun/star/awt/XDialog2.idl
@@ -1,23 +1,23 @@
-#ifndef __com_sun_star_awt_XDialog2_idl__
-#define __com_sun_star_awt_XDialog2_idl__
-
+#ifndef __com_sun_star_awt_XDialog2_idl__ 
+#define __com_sun_star_awt_XDialog2_idl__ 
+ 
 #ifndef __com_sun_star_awt_XDialog_idl__
-#include <com/sun/star/awt/XDialog.idl>
-#endif
-
-
-//=============================================================================
-
+#include <com/sun/star/awt/XDialog.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** Makes it possible to end a dialog and set a help id.
 
     @since OOo 3.0
  */
 interface XDialog2: com::sun::star::awt::XDialog
-{
+{ 
     /** hides the dialog and then causes <member>XDialog::execute</member>
         to return with the given result value.
      */
@@ -26,10 +26,10 @@ interface XDialog2: com::sun::star::awt::XDialog
         show the appropriate help page.
     */
     void setHelpId ( [in] long Id );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XDialogEventHandler.idl b/offapi/com/sun/star/awt/XDialogEventHandler.idl
index 206d71bb5dee..3f7595a151ea 100644
--- a/offapi/com/sun/star/awt/XDialogEventHandler.idl
+++ b/offapi/com/sun/star/awt/XDialogEventHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,26 +31,26 @@
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
 #endif
-#ifndef __com_sun_star_awt_XDialog_idl__
-#include <com/sun/star/awt/XDialog.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
+#ifndef __com_sun_star_awt_XDialog_idl__ 
+#include <com/sun/star/awt/XDialog.idl> 
 #endif
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module awt {
 
-//=============================================================================
+//============================================================================= 
 
 /** Handles events fired by dialogs represented by a
     <type scope="com::sun::star::awt">XDialog</type> interface.
  */
 interface XDialogEventHandler : ::com::sun::star::uno::XInterface {
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** Handles an event generated by a dialog.
 
@@ -74,11 +74,11 @@ interface XDialogEventHandler : ::com::sun::star::uno::XInterface {
 
         @param MethodName
             the name of the function which is to be called.
-
+            
         @returns
             true if the event was handled, otherwise false.
 
-        @throws com::sun::star::lang::WrappedTargetException
+        @throws com::sun::star::lang::WrappedTargetException  
             if the implementation of the method, which is determined by the argument MethodName,
             throws an exception. This exception is then wrapped into a
             <type scope="com::sun::star::lang">WrappedTargetException</type>.
@@ -88,7 +88,7 @@ interface XDialogEventHandler : ::com::sun::star::uno::XInterface {
         [in] com::sun::star::awt::XDialog xDialog,
         [in] any EventObject,
         [in] string MethodName)
-        raises(com::sun::star::lang::WrappedTargetException);
+        raises(com::sun::star::lang::WrappedTargetException); 
 
 
     /** returns a sequence of supported method names
@@ -99,7 +99,7 @@ interface XDialogEventHandler : ::com::sun::star::uno::XInterface {
     sequence<string> getSupportedMethodNames();
 };
 
-//=============================================================================
+//============================================================================= 
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/XDialogProvider.idl b/offapi/com/sun/star/awt/XDialogProvider.idl
index 2ab873df16b6..955f698604a5 100644
--- a/offapi/com/sun/star/awt/XDialogProvider.idl
+++ b/offapi/com/sun/star/awt/XDialogProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,30 +31,30 @@
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
 #endif
-#ifndef __com_sun_star_awt_XDialog_idl__
-#include <com/sun/star/awt/XDialog.idl>
+#ifndef __com_sun_star_awt_XDialog_idl__ 
+#include <com/sun/star/awt/XDialog.idl> 
 #endif
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module awt {
 
-//=============================================================================
+//============================================================================= 
 
-/** provides dialogs implementing the
+/** provides dialogs implementing the 
     <type scope="com::sun::star::awt">XDialog</type> interface.
  */
 interface XDialogProvider : ::com::sun::star::uno::XInterface {
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** creates a dialog for the given URL.
 
-        @param URL
+        @param URL 
             is the URL.
 
         @returns
@@ -63,12 +63,12 @@ interface XDialogProvider : ::com::sun::star::uno::XInterface {
         @throws com::sun::star::lang::IllegalArgumentException
             if no dialog for the given URL is found or if the URL is invalid.
      */
-    com::sun::star::awt::XDialog createDialog( [in] string URL )
+    com::sun::star::awt::XDialog createDialog( [in] string URL )  
         raises ( com::sun::star::lang::IllegalArgumentException );
 
 };
 
-//=============================================================================
+//============================================================================= 
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/XDialogProvider2.idl b/offapi/com/sun/star/awt/XDialogProvider2.idl
index f24a783cb7fc..a8ce13c3e00f 100644
--- a/offapi/com/sun/star/awt/XDialogProvider2.idl
+++ b/offapi/com/sun/star/awt/XDialogProvider2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,48 +36,48 @@
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module awt {
 
-//=============================================================================
+//============================================================================= 
 
-/** provides dialogs implementing the
+/** provides dialogs implementing the 
     <type scope="com::sun::star::awt">XDialog</type> interface.
  */
 interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** creates a dialog for the given URL accepting an Interface used
         to handle dialog events.
 
-        @param URL
+        @param URL 
             is the URL.
 
         @param xHandler
-            is the interface that will be called to handle the Events that
-            are generated by the dialog (and all controls placed on it) and
-            bound to the handler using a vnd.sun.star.UNO URL specifying a
-            handler method to be called. Usually this will be done directly
+            is the interface that will be called to handle the Events that 
+            are generated by the dialog (and all controls placed on it) and 
+            bound to the handler using a vnd.sun.star.UNO URL specifying a 
+            handler method to be called. Usually this will be done directly 
             by the user.
-
+            
             xHandler can handle events in two different ways:
 
             1. By supporting the <type scope="com::sun::star::awt">XDialogEventHandler</type> interface.
             This is a generic interface to accept event notifications.
-
+            
             2. By providing interfaces that directly implement the handler
             methods to be called. The XDialogProvider2 implementation then
-            will try to access these events using the
+            will try to access these events using the 
             <type scope="com::sun::star::beans">Introspection</type>Introspection
             service. To make this possible the handler implementation also has to
             support <type scope="com::sun::star::lang">XTypeProvider</type>.
 
             If XDialogEventHandler is supported XDialogEventHandler.callHandlerMethod()
-            is always called first to handle the event. Only if the event cannot be
+            is always called first to handle the event. Only if the event cannot be 
             handled by XDialogEventHandler (callHandlerMethod() then has to return
-            false) or if XDialogEventHandler is not supported at all the Introspection
+            false) or if XDialogEventHandler is not supported at all the Introspection 
             based access will be used.
 
             The Introspection based access tries to call a method named according to the
@@ -87,10 +87,10 @@ interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
             void HandlerMethodName( [in] com::sun::star::awt::XDialog xDialog, [in] any aEvent )
 
             will be searched. The signature is similar to XDialogEventHandler.
-            callHandlerMethod except for MethodName itself that isn't needed
+            callHandlerMethod except for MethodName itself that isn't needed 
             here. For more information about these parameters, see
             <type scope="com::sun::star::awt">XDialogEventHandler</type>.
-
+            
             If this method is found, it will be called, otherwise a method
 
             void HandlerMethodName( void )
@@ -108,7 +108,7 @@ interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
 
      */
     com::sun::star::awt::XDialog createDialogWithHandler
-        ( [in] string URL, [in] com::sun::star::uno::XInterface xHandler )
+        ( [in] string URL, [in] com::sun::star::uno::XInterface xHandler )  
             raises ( com::sun::star::lang::IllegalArgumentException );
 
     /** creates a dialog for the given URL, accepting additional creation parameters
@@ -131,7 +131,7 @@ interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
             );
 };
 
-//=============================================================================
+//============================================================================= 
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/XDisplayBitmap.idl b/offapi/com/sun/star/awt/XDisplayBitmap.idl
index b7b8d0fc3757..e04f2590df69 100644
--- a/offapi/com/sun/star/awt/XDisplayBitmap.idl
+++ b/offapi/com/sun/star/awt/XDisplayBitmap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XDisplayBitmap_idl__
-#define __com_sun_star_awt_XDisplayBitmap_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** specifies an object as a bitmap for which data is formatted for
+#ifndef __com_sun_star_awt_XDisplayBitmap_idl__ 
+#define __com_sun_star_awt_XDisplayBitmap_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** specifies an object as a bitmap for which data is formatted for 
     a specific output device.
-
+            
     <p>Drawing of this bitmap is only valid on a compatible device.</p>
  */
 published interface XDisplayBitmap: com::sun::star::uno::XInterface
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XDisplayConnection.idl b/offapi/com/sun/star/awt/XDisplayConnection.idl
index d8eb109933fc..1e9f9113afdf 100644
--- a/offapi/com/sun/star/awt/XDisplayConnection.idl
+++ b/offapi/com/sun/star/awt/XDisplayConnection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ published interface XDisplayConnection: com::sun::star::uno::XInterface
     /** registers an event handler.
 
         @param window
-        the platform specific window id. If empty, the handler should be
+        the platform specific window id. If empty, the handler should be 
         registered for all windows.
 
         @param eventHandler
@@ -73,7 +73,7 @@ published interface XDisplayConnection: com::sun::star::uno::XInterface
         the handler to remove.
     */
     [oneway] void removeEventHandler( [in] any window, [in] XEventHandler eventHandler );
-
+    
     //-------------------------------------------------------------------------
 
     /** register an error handler for toolkit specific errors.
@@ -99,7 +99,7 @@ published interface XDisplayConnection: com::sun::star::uno::XInterface
         @returns a unique platform dependent identifier for a display connection.
     */
     any getIdentifier();
-
+    
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XDockableWindow.idl b/offapi/com/sun/star/awt/XDockableWindow.idl
index f50e8b558eb9..31998ce81af7 100644
--- a/offapi/com/sun/star/awt/XDockableWindow.idl
+++ b/offapi/com/sun/star/awt/XDockableWindow.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,101 +24,101 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XDockableWindow_idl__
-#define __com_sun_star_awt_XDockableWindow_idl__
-
+#ifndef __com_sun_star_awt_XDockableWindow_idl__ 
+#define __com_sun_star_awt_XDockableWindow_idl__ 
+ 
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
-#ifndef __com_sun_star_awt_XDockableWindowListener_idl__
-#include <com/sun/star/awt/XDockableWindowListener.idl>
-#endif
+#ifndef __com_sun_star_awt_XDockableWindowListener_idl__ 
+#include <com/sun/star/awt/XDockableWindowListener.idl> 
+#endif 
 
 #ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
 #endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the docking interface for a window component.
-
+        
     <p>A window can either be docked where it resides as a child window in
         an application frame window or it can be floating where it will
         reside in its own decorated top level window.
     </p>
  */
 interface XDockableWindow : com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** adds a docking listener to the object.
         only a single listener may be registered at any time.
      */
-    void addDockableWindowListener( [in] com::sun::star::awt::XDockableWindowListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    void addDockableWindowListener( [in] com::sun::star::awt::XDockableWindowListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified docking listener from the object.
      */
-    void removeDockableWindowListener( [in] com::sun::star::awt::XDockableWindowListener xListener );
+    void removeDockableWindowListener( [in] com::sun::star::awt::XDockableWindowListener xListener ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** enable or disable docking, docking is disabled by default
 
         @param bEnable
-            <TRUE/> specifies that docking is enabled
+            <TRUE/> specifies that docking is enabled 
             <FALSE/> specifies that docking is disabled and no
                 <type scope="com::sun::star::awt">XDockableWindowListener</type> will be called
      */
-    void enableDocking( [in] boolean bEnable );
+    void enableDocking( [in] boolean bEnable ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** queries the current window state
         @returns
             <TRUE/> if the window is floating
             <FALSE/> if the window is docked
      */
-    boolean isFloating();
+    boolean isFloating(); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** toggle between floating and docked state
         @param bFloating
             specifies the new floating mode:
             <TRUE/> means floating, <FALSE/> means docked
      */
-    void setFloatingMode( [in] boolean bFloating );
+    void setFloatingMode( [in] boolean bFloating ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /** prevents the window from being undocked
+    /** prevents the window from being undocked 
         this has no effect if the window is floating
      */
-    void lock();
+    void lock(); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** enables undocking
         this has no effect if the window is floating
      */
     void unlock();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** queries the current locking state
         @returns
             <TRUE/> if the window is locked
             <FALSE/> if the window is not locked
      */
-    boolean isLocked();
+    boolean isLocked(); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** shows the window in a menu like style, i.e. without decoration
         a special indicator will allow for tearing off the window
@@ -127,20 +127,20 @@ interface XDockableWindow : com::sun::star::uno::XInterface
         @param WindowRect
             specifies the position and size of the popup window in frame coordinates
      */
-    void startPopupMode( [in] com::sun::star::awt::Rectangle WindowRect );
+    void startPopupMode( [in] com::sun::star::awt::Rectangle WindowRect ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** queries the current popup mode
         @returns
             <TRUE/> if the window is in popup mode
             <FALSE/> if the window is not in popup mode
      */
-    boolean isInPopupMode();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean isInPopupMode(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XDockableWindowListener.idl b/offapi/com/sun/star/awt/XDockableWindowListener.idl
index 695abc448564..371c4de96ced 100644
--- a/offapi/com/sun/star/awt/XDockableWindowListener.idl
+++ b/offapi/com/sun/star/awt/XDockableWindowListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,98 +24,98 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XDockableWindowListener_idl__
-#define __com_sun_star_awt_XDockableWindowListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_DockingData_idl__
+#ifndef __com_sun_star_awt_XDockableWindowListener_idl__ 
+#define __com_sun_star_awt_XDockableWindowListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+#ifndef __com_sun_star_awt_DockingData_idl__ 
 #include <com/sun/star/awt/DockingData.idl>
-#endif
-#ifndef __com_sun_star_awt_EndDockingEvent_idl__
+#endif 
+#ifndef __com_sun_star_awt_EndDockingEvent_idl__ 
 #include <com/sun/star/awt/EndDockingEvent.idl>
 #endif
-#ifndef __com_sun_star_awt_DockingEvent_idl__
+#ifndef __com_sun_star_awt_DockingEvent_idl__ 
 #include <com/sun/star/awt/DockingEvent.idl>
 #endif
-#ifndef __com_sun_star_awt_EndPopupModeEvent_idl__
+#ifndef __com_sun_star_awt_EndPopupModeEvent_idl__ 
 #include <com/sun/star/awt/EndPopupModeEvent.idl>
 #endif
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive docking events.
  */
 interface XDockableWindowListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the docking procedure starts.
      */
-    void startDocking( [in] com::sun::star::awt::DockingEvent e );
-
-    //-------------------------------------------------------------------------
-
+    void startDocking( [in] com::sun::star::awt::DockingEvent e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked during the docking procedure when the window has been moved.
 
         on return the DockingData must contain either the old tracking rectangle
         or a changed rectangle if required, additionally it must indicate if
         the window should be docked or floating
 
-        Note: the tracking rectangle indicates to the user where the window would
+        Note: the tracking rectangle indicates to the user where the window would 
             be placed if he releases the mouse.
 
      */
     DockingData docking( [in] com::sun::star::awt::DockingEvent e );
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the docking procedure ends.
         aWindowRect contains the new position and size of the window
      */
     void endDocking( [in] com::sun::star::awt::EndDockingEvent e );
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the floating mode is about to be changed between
             floating and docked or vice versa
-
+        
         if returned FALSE the floating mode will not be changed
      */
-    boolean prepareToggleFloatingMode( [in] com::sun::star::lang::EventObject e );
-
-    //-------------------------------------------------------------------------
-
+    boolean prepareToggleFloatingMode( [in] com::sun::star::lang::EventObject e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the floating mode is changed between
             floating and docked or vice versa
      */
-    void toggleFloatingMode( [in] com::sun::star::lang::EventObject e );
-
-    //-------------------------------------------------------------------------
-
+    void toggleFloatingMode( [in] com::sun::star::lang::EventObject e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the window was actively closed
      */
-    void closed( [in] com::sun::star::lang::EventObject e );
-
-    //-------------------------------------------------------------------------
-
+    void closed( [in] com::sun::star::lang::EventObject e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the window currently is in pop-up mode and wants to be undocked
         or closed
      */
-    void endPopupMode( [in] com::sun::star::awt::EndPopupModeEvent e );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void endPopupMode( [in] com::sun::star::awt::EndPopupModeEvent e ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XEnhancedMouseClickHandler.idl b/offapi/com/sun/star/awt/XEnhancedMouseClickHandler.idl
index 547bab7c6efc..998cda103f98 100644
--- a/offapi/com/sun/star/awt/XEnhancedMouseClickHandler.idl
+++ b/offapi/com/sun/star/awt/XEnhancedMouseClickHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/XEventHandler.idl b/offapi/com/sun/star/awt/XEventHandler.idl
index e3ea40a626c2..116c52afa674 100644
--- a/offapi/com/sun/star/awt/XEventHandler.idl
+++ b/offapi/com/sun/star/awt/XEventHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,20 +43,20 @@ module com { module sun { module star { module awt {
 */
 published interface XEventHandler: com::sun::star::uno::XInterface
 {
-
+  
     //-------------------------------------------------------------------------
 
     /** requests the implementor of this interface to handle a platform
         dependent event.
 
-        @returns <TRUE/> if the event was handled properly and no further
+        @returns <TRUE/> if the event was handled properly and no further 
         handling should take place, <FALSE/> otherwise.
 
         @param event
         the platform dependent event.
     */
     boolean handleEvent( [in] any event );
-
+    
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XExtendedToolkit.idl b/offapi/com/sun/star/awt/XExtendedToolkit.idl
index 95541217281d..bea7e879a964 100755
--- a/offapi/com/sun/star/awt/XExtendedToolkit.idl
+++ b/offapi/com/sun/star/awt/XExtendedToolkit.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,16 +25,16 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_awt_XExtendedToolkit_idl__
-#define __com_sun_star_awt_XExtendedToolkit_idl__
+#ifndef __com_sun_star_awt_XExtendedToolkit_idl__ 
+#define __com_sun_star_awt_XExtendedToolkit_idl__ 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
-#ifndef __com_sun_star_awt_XTopWindow_idl__
-#include <com/sun/star/awt/XTopWindow.idl>
-#endif
+#ifndef __com_sun_star_awt_XTopWindow_idl__ 
+#include <com/sun/star/awt/XTopWindow.idl> 
+#endif 
 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
@@ -53,12 +53,12 @@
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com {  module sun {  module star {  module awt {
 
 //=============================================================================
-
+    
 /** The <type>XExtendedToolkit</type> is an extension of the <type
     scope="::com::sun::star::awt">XToolkit</type> interface.  It basically
     provides access to three event broadcasters which are used for instance
@@ -67,7 +67,7 @@ module com {  module sun {  module star {  module awt {
 
     <p>The first event broadcaster lets you keep track of the open top-level
     windows (frames).  To get the set of currently open top-level window use
-    the <member>XExtendedToolkit::getTopWindowCount</member> and
+    the <member>XExtendedToolkit::getTopWindowCount</member> and 
     <member>XExtendedToolkit::getTopWindow</member> methods.</p>
 
     <p>The second event broadcaster informs its listeners of key events.
@@ -81,13 +81,13 @@ module com {  module sun {  module star {  module awt {
     @deprecated
         This interface was only implemented in an intermediate developer
         release anyway.
-
+        
     @since OOo 1.1.2
 */
 published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** This function returns the number of currently existing top-level
         windows.
         @return
@@ -98,7 +98,7 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
     long getTopWindowCount ();
 
     //-------------------------------------------------------------------------
-
+    
     /** Return a reference to the specified top-level window.  Note that the
         number of top-level windows may change between a call to
         <member>getTopWindowCount()</member> and successive calls to this
@@ -115,8 +115,8 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
     ::com::sun::star::awt::XTopWindow getTopWindow ([in] long nIndex)
         raises (::com::sun::star::lang::IndexOutOfBoundsException);
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** Return the currently active top-level window, i.e. which has
         currently the input focus.
         @return
@@ -138,10 +138,10 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
             twice.)
     */
     [oneway] void addTopWindowListener (
-        [in] ::com::sun::star::awt::XTopWindowListener xListener);
-
-    //-------------------------------------------------------------------------
+        [in] ::com::sun::star::awt::XTopWindowListener xListener); 
 
+    //------------------------------------------------------------------------- 
+    
     /** Remove the specified listener from the list of listeners.
         @param xListener
             If the reference is empty then nothing will be changed.  If the
@@ -151,8 +151,8 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
     [oneway] void removeTopWindowListener (
         [in] ::com::sun::star::awt::XTopWindowListener xListener);
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** Add a new listener that is called on <type
         scope="::com::sun::star::awt">KeyEvent</type>s.  Every listener is
         given the opportunity to consume the event, i.e. prevent the not yet
@@ -166,7 +166,7 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
     [oneway] void addKeyHandler (
         [in] ::com::sun::star::awt::XKeyHandler xHandler);
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** Remove the specified listener from the list of listeners.
         @param xHandler
@@ -175,10 +175,10 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
             will be removed.
     */
     [oneway] void removeKeyHandler (
-        [in] ::com::sun::star::awt::XKeyHandler xHandler);
-
-    //-------------------------------------------------------------------------
+        [in] ::com::sun::star::awt::XKeyHandler xHandler); 
 
+    //------------------------------------------------------------------------- 
+    
     /** Add a new listener that is called on <type
         scope="::com::sun::star::awt">FocusEvent</type>s.  Use this focus
         broadcaster to keep track of the object that currently has the input
@@ -192,8 +192,8 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
     [oneway] void addFocusListener (
         [in] ::com::sun::star::awt::XFocusListener xListener);
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** Remove the specified listener from the list of listeners.
         @param xListener
             If the reference is empty then nothing will be changed.  If the
@@ -201,20 +201,20 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
             will be removed.
     */
     [oneway] void removeFocusListener (
-        [in] ::com::sun::star::awt::XFocusListener xListener);
-
-    //-------------------------------------------------------------------------
+        [in] ::com::sun::star::awt::XFocusListener xListener); 
 
+    //------------------------------------------------------------------------- 
+    
     /** Broadcasts the a focusGained on all registered focus listeners
         @param source
             The object that has gained the input focus. It should implement
             <type scope="com::sun::star::accessibility">XAccessible</type>.
     */
     [oneway] void fireFocusGained (
-        [in] ::com::sun::star::uno::XInterface source);
-
-    //-------------------------------------------------------------------------
+        [in] ::com::sun::star::uno::XInterface source); 
 
+    //------------------------------------------------------------------------- 
+    
     /** Broadcasts the a focusGained on all registered focus listeners
         @param source
             The object that has lost the input focus. It should implement
@@ -222,9 +222,9 @@ published interface XExtendedToolkit : ::com::sun::star::uno::XInterface
     */
     [oneway] void fireFocusLost (
         [in] ::com::sun::star::uno::XInterface source);
-
-};
-
+    
+}; 
+ 
 }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XFileDialog.idl b/offapi/com/sun/star/awt/XFileDialog.idl
index b9fe07c9e472..241a0f340b09 100644
--- a/offapi/com/sun/star/awt/XFileDialog.idl
+++ b/offapi/com/sun/star/awt/XFileDialog.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,61 +24,61 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XFileDialog_idl__
-#define __com_sun_star_awt_XFileDialog_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XFileDialog_idl__ 
+#define __com_sun_star_awt_XFileDialog_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to a file dialog.
-
+    
     @deprecated
  */
 published interface XFileDialog: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** sets the path.
      */
-    [oneway] void setPath( [in] string Path );
-
-    //-------------------------------------------------------------------------
+    [oneway] void setPath( [in] string Path ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns the path.
      */
-    string getPath();
-
-    //-------------------------------------------------------------------------
+    string getPath(); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** sets the filters.
      */
-    [oneway] void setFilters( [in] sequence<string> rFilterNames,
-             [in] sequence<string> rMasks );
-
-    //-------------------------------------------------------------------------
+    [oneway] void setFilters( [in] sequence<string> rFilterNames, 
+             [in] sequence<string> rMasks ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** sets the current filter.
      */
-    [oneway] void setCurrentFilter( [in] string Filter );
-
-    //-------------------------------------------------------------------------
+    [oneway] void setCurrentFilter( [in] string Filter ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns the currently selected filter.
      */
-    string getCurrentFilter();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string getCurrentFilter(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XFixedHyperlink.idl b/offapi/com/sun/star/awt/XFixedHyperlink.idl
index 9fb6965b6e4a..7cf8e18b4106 100644
--- a/offapi/com/sun/star/awt/XFixedHyperlink.idl
+++ b/offapi/com/sun/star/awt/XFixedHyperlink.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/XFixedText.idl b/offapi/com/sun/star/awt/XFixedText.idl
index 55b3202e7173..b4e2696001c2 100644
--- a/offapi/com/sun/star/awt/XFixedText.idl
+++ b/offapi/com/sun/star/awt/XFixedText.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,58 +24,58 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XFixedText_idl__
-#define __com_sun_star_awt_XFixedText_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XFixedText_idl__ 
+#define __com_sun_star_awt_XFixedText_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to the text and formatting of a fixed text field.
  */
 published interface XFixedText: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the text of the control.
      */
-    [oneway] void setText( [in] string Text );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setText( [in] string Text ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the text of the control.
      */
-    string getText();
-
-    //-------------------------------------------------------------------------
-
-    /** sets the alignment of the text in the control.
+    string getText(); 
+ 
+    //------------------------------------------------------------------------- 
 
+    /** sets the alignment of the text in the control. 
+                
         <pre>
         0: left
         1: center
         2: right
         </pre>
-     */
-    [oneway] void setAlignment( [in] short nAlign );
-
-    //-------------------------------------------------------------------------
-
+     */    
+    [oneway] void setAlignment( [in] short nAlign ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the alignment of the text in the control.
      */
-    short getAlignment();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    short getAlignment(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XFocusListener.idl b/offapi/com/sun/star/awt/XFocusListener.idl
index fc45be62aa07..dd3ab027041b 100644
--- a/offapi/com/sun/star/awt/XFocusListener.idl
+++ b/offapi/com/sun/star/awt/XFocusListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XFocusListener_idl__
-#define __com_sun_star_awt_XFocusListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FocusEvent_idl__
-#include <com/sun/star/awt/FocusEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XFocusListener_idl__ 
+#define __com_sun_star_awt_XFocusListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_FocusEvent_idl__ 
+#include <com/sun/star/awt/FocusEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive keyboard focus events.
-
+            
     <p>The window which has the keyboard focus is the window which gets
     the keyboard events.</p>
  */
 published interface XFocusListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a window gains the keyboard focus.
 
         @see XActivateListener::windowActivated
      */
-    [oneway] void focusGained( [in] com::sun::star::awt::FocusEvent e );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void focusGained( [in] com::sun::star::awt::FocusEvent e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a window loses the keyboard focus.
 
         @see XActivateListener::windowDeactivated
      */
-    [oneway] void focusLost( [in] com::sun::star::awt::FocusEvent e );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void focusLost( [in] com::sun::star::awt::FocusEvent e ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XFont.idl b/offapi/com/sun/star/awt/XFont.idl
index 816db2f8f24f..71a139ae76f7 100644
--- a/offapi/com/sun/star/awt/XFont.idl
+++ b/offapi/com/sun/star/awt/XFont.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,103 +24,103 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XFont_idl__
-#define __com_sun_star_awt_XFont_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_SimpleFontMetric_idl__
-#include <com/sun/star/awt/SimpleFontMetric.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XFont_idl__ 
+#define __com_sun_star_awt_XFont_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_SimpleFontMetric_idl__ 
+#include <com/sun/star/awt/SimpleFontMetric.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** describes a font on a specific device.
-
+            
     <p>All values are in pixels within this device.</p>
  */
 published interface XFont: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** returns the description of the font.
-
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** returns the description of the font.  
+                 
         <p>The unit of measurement is pixels for the device.
      */
-    com::sun::star::awt::FontDescriptor getFontDescriptor();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::FontDescriptor getFontDescriptor(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns additional information about the font.
      */
-    com::sun::star::awt::SimpleFontMetric getFontMetric();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::SimpleFontMetric getFontMetric(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the width of the specified character.
-
-        @returns
+    
+        @returns  
                 the character width measured in pixels for the device.
      */
-    short getCharWidth( [in] char c );
-
-    //-------------------------------------------------------------------------
-
+    short getCharWidth( [in] char c ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the widths of the specified characters.
-
-        @returns
+       
+        @returns 
                 a sequence of the widths of subsequent characters for this font.
      */
-    sequence<short> getCharWidths( [in] char nFirst, [in] char nLast );
-
-    //-------------------------------------------------------------------------
-
+    sequence<short> getCharWidths( [in] char nFirst, [in] char nLast ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the string width.
-
-        @returns
-                the width of the specified string of characters
+        
+        @returns 
+                the width of the specified string of characters  
                 measured in pixels for the device.
      */
-    long getStringWidth( [in] string str );
-
-    //-------------------------------------------------------------------------
-
+    long getStringWidth( [in] string str ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the string and the character widths.
-
-        @returns
-                the width of the specified string of characters
-                measured in pixels for the device.
-
-        @param aDXArray
-                receives the width of every single character
+        
+        @returns 
+                the width of the specified string of characters  
+                measured in pixels for the device. 
+                 
+        @param aDXArray 
+                receives the width of every single character  
                 measured in pixels for the device.
      */
-    long getStringWidthArray( [in] string str,
-             [out] sequence<long> aDXArray );
-
-    //-------------------------------------------------------------------------
-
+    long getStringWidthArray( [in] string str, 
+             [out] sequence<long> aDXArray ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** queries the kerning pair table.
      */
-    void getKernPairs( [out] sequence<char> Chars1,
-             [out] sequence<char> Chars2,
-             [out] sequence<short> Kerns );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void getKernPairs( [out] sequence<char> Chars1, 
+             [out] sequence<char> Chars2, 
+             [out] sequence<short> Kerns ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XFont2.idl b/offapi/com/sun/star/awt/XFont2.idl
index b67e8f2c1dee..fe0ecd5e6fca 100644
--- a/offapi/com/sun/star/awt/XFont2.idl
+++ b/offapi/com/sun/star/awt/XFont2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 #ifndef __com_sun_star_awt_XFont_idl__
 #include <com/sun/star/awt/XFont.idl>
-#endif
+#endif 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XGraphics.idl b/offapi/com/sun/star/awt/XGraphics.idl
index 2b6b63a26b2e..f63ed2311794 100644
--- a/offapi/com/sun/star/awt/XGraphics.idl
+++ b/offapi/com/sun/star/awt/XGraphics.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,298 +24,298 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XGraphics_idl__
-#define __com_sun_star_awt_XGraphics_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
+#ifndef __com_sun_star_awt_XGraphics_idl__ 
+#define __com_sun_star_awt_XGraphics_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
 
-#ifndef __com_sun_star_awt_SimpleFontMetric_idl__
-#include <com/sun/star/awt/SimpleFontMetric.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_RasterOperation_idl__
-#include <com/sun/star/awt/RasterOperation.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Gradient_idl__
-#include <com/sun/star/awt/Gradient.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
- published interface XRegion;
- published interface XDisplayBitmap;
- published interface XFont;
- published interface XDevice;
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_SimpleFontMetric_idl__ 
+#include <com/sun/star/awt/SimpleFontMetric.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_RasterOperation_idl__ 
+#include <com/sun/star/awt/RasterOperation.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Gradient_idl__ 
+#include <com/sun/star/awt/Gradient.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+ published interface XRegion; 
+ published interface XDisplayBitmap; 
+ published interface XFont; 
+ published interface XDevice; 
+ 
+//============================================================================= 
+ 
 /** provides the basic output operation of a device.
  */
 published interface XGraphics: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the device of this graphics.
      */
-    XDevice getDevice();
-
-    //-------------------------------------------------------------------------
-
+    XDevice getDevice(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the font metric of the current font.
      */
-    SimpleFontMetric getFontMetric();
-
-    //-------------------------------------------------------------------------
-
+    SimpleFontMetric getFontMetric(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the font used by text operations.
      */
-    [oneway] void setFont( [in] XFont xNewFont );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setFont( [in] XFont xNewFont ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** creates a new font and sets the font.
      */
-    [oneway] void selectFont( [in] FontDescriptor aDescription );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void selectFont( [in] FontDescriptor aDescription ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the text color used by text operations.
      */
-    [oneway] void setTextColor( [in] com::sun::star::util::Color nColor );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setTextColor( [in] com::sun::star::util::Color nColor ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the fill color used by text operations.
      */
-    [oneway] void setTextFillColor( [in] com::sun::star::util::Color nColor );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setTextFillColor( [in] com::sun::star::util::Color nColor ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the line color.
      */
-    [oneway] void setLineColor( [in] com::sun::star::util::Color nColor );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setLineColor( [in] com::sun::star::util::Color nColor ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the fill color.
      */
-    [oneway] void setFillColor( [in] com::sun::star::util::Color nColor );
-
-    //-------------------------------------------------------------------------
-
-    /** sets the raster operation.
-
-        <p>If the device does not support raster operations
+    [oneway] void setFillColor( [in] com::sun::star::util::Color nColor ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** sets the raster operation. 
+                        
+        <p>If the device does not support raster operations 
         then this call is ignored.</p>
      */
-    [oneway] void setRasterOp( [in] RasterOperation ROP );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setRasterOp( [in] RasterOperation ROP ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the clip region to specified clipping.
      */
-    [oneway] void setClipRegion( [in] XRegion Clipping );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setClipRegion( [in] XRegion Clipping ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** builds the intersection with the current region.
      */
-    [oneway] void intersectClipRegion( [in] XRegion xClipping );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void intersectClipRegion( [in] XRegion xClipping ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** saves all current settings (Font, TextColor, TextFillColor,
         LineColor, FillColor, RasterOp, ClipRegion).
      */
-    [oneway] void push();
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void push(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** restores all previous saved settings.
      */
-    [oneway] void pop();
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void pop(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** copies a rectangle of pixels from another device into this one.
      */
-    [oneway] void copy( [in] XDevice xSource,
-             [in] long nSourceX,
-             [in] long nSourceY,
-             [in] long nSourceWidth,
-             [in] long nSourceHeight,
-             [in] long nDestX,
-             [in] long nDestY,
-             [in] long nDestWidth,
-             [in] long nDestHeight );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void copy( [in] XDevice xSource, 
+             [in] long nSourceX, 
+             [in] long nSourceY, 
+             [in] long nSourceWidth, 
+             [in] long nSourceHeight, 
+             [in] long nDestX, 
+             [in] long nDestY, 
+             [in] long nDestWidth, 
+             [in] long nDestHeight ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** draws a part of the specified bitmap to the output device.
      */
-    [oneway] void draw( [in] XDisplayBitmap xBitmapHandle,
-             [in] long SourceX,
-             [in] long SourceY,
-             [in] long SourceWidth,
-             [in] long SourceHeight,
-             [in] long DestX,
-             [in] long DestY,
-             [in] long DestWidth,
-             [in] long DestHeight );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void draw( [in] XDisplayBitmap xBitmapHandle, 
+             [in] long SourceX, 
+             [in] long SourceY, 
+             [in] long SourceWidth, 
+             [in] long SourceHeight, 
+             [in] long DestX, 
+             [in] long DestY, 
+             [in] long DestWidth, 
+             [in] long DestHeight ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets a single pixel in the output device.
      */
-    [oneway] void drawPixel( [in] long X,
-             [in] long Y );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void drawPixel( [in] long X, 
+             [in] long Y ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** draws a line in the output device.
      */
-    [oneway] void drawLine( [in] long X1,
-             [in] long Y1,
-             [in] long X2,
-             [in] long Y2 );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void drawLine( [in] long X1, 
+             [in] long Y1, 
+             [in] long X2, 
+             [in] long Y2 ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** draws a rectangle in the output device.
      */
-    [oneway] void drawRect( [in] long X,
-             [in] long Y,
-             [in] long Width,
-             [in] long Height );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void drawRect( [in] long X, 
+             [in] long Y, 
+             [in] long Width, 
+             [in] long Height ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** draws a rectangle with rounded corners in the output device.
      */
-    [oneway] void drawRoundedRect( [in] long X,
-             [in] long Y,
-             [in] long Width,
-             [in] long Height,
-             [in] long nHorzRound,
-             [in] long nVertRound );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void drawRoundedRect( [in] long X, 
+             [in] long Y, 
+             [in] long Width, 
+             [in] long Height, 
+             [in] long nHorzRound, 
+             [in] long nVertRound ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** draws multiple lines in the output device at once.
      */
-    [oneway] void drawPolyLine( [in] sequence<long> DataX,
-             [in] sequence<long> DataY );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void drawPolyLine( [in] sequence<long> DataX, 
+             [in] sequence<long> DataY ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** draws a polygon line in the output device.
      */
-    [oneway] void drawPolygon( [in] sequence<long> DataX,
-             [in] sequence<long> DataY );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void drawPolygon( [in] sequence<long> DataX, 
+             [in] sequence<long> DataY ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** draws multiple polygons in the output device at once.
      */
-    [oneway] void drawPolyPolygon( [in] sequence< sequence<long> > DataX,
-             [in] sequence< sequence<long> > DataY );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void drawPolyPolygon( [in] sequence< sequence<long> > DataX, 
+             [in] sequence< sequence<long> > DataY ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** draws an ellipse in the output device.
      */
-    [oneway] void drawEllipse( [in] long X,
-             [in] long Y,
-             [in] long Width,
-             [in] long Height );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void drawEllipse( [in] long X, 
+             [in] long Y, 
+             [in] long Width, 
+             [in] long Height ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** draws an arc (part of a circle) in the output device.
      */
-    [oneway] void drawArc( [in] long X,
-             [in] long Y,
-             [in] long Width,
-             [in] long Height,
-             [in] long X1,
-             [in] long Y1,
-             [in] long X2,
-             [in] long Y2 );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void drawArc( [in] long X, 
+             [in] long Y, 
+             [in] long Width, 
+             [in] long Height, 
+             [in] long X1, 
+             [in] long Y1, 
+             [in] long X2, 
+             [in] long Y2 ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** draws a circular area in the output device.
      */
-    [oneway] void drawPie( [in] long X,
-             [in] long Y,
-             [in] long Width,
-             [in] long Height,
-             [in] long X1,
-             [in] long Y1,
-             [in] long X2,
-             [in] long Y2 );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void drawPie( [in] long X, 
+             [in] long Y, 
+             [in] long Width, 
+             [in] long Height, 
+             [in] long X1, 
+             [in] long Y1, 
+             [in] long X2, 
+             [in] long Y2 ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** draws a chord of a circular area in the output device.
-
-        <p>A chord is a segment of a circle. You get two chords from a
-        circle if you intersect the circle with a straight line
+                        
+        <p>A chord is a segment of a circle. You get two chords from a 
+        circle if you intersect the circle with a straight line 
         joining two points on the circle.</p>
      */
-    [oneway] void drawChord( [in] long nX,
-             [in] long nY,
-             [in] long nWidth,
-             [in] long nHeight,
-             [in] long nX1,
-             [in] long nY1,
-             [in] long nX2,
-             [in] long nY2 );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void drawChord( [in] long nX, 
+             [in] long nY, 
+             [in] long nWidth, 
+             [in] long nHeight, 
+             [in] long nX1, 
+             [in] long nY1, 
+             [in] long nX2, 
+             [in] long nY2 ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** draws a color dispersion in the output device.
      */
-    [oneway] void drawGradient( [in] long nX,
-             [in] long nY,
-             [in] long nWidth,
-             [in] long Height,
-             [in] Gradient aGradient );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void drawGradient( [in] long nX, 
+             [in] long nY, 
+             [in] long nWidth, 
+             [in] long Height, 
+             [in] Gradient aGradient ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** draws text in the output device.
      */
-    [oneway] void drawText( [in] long X,
-             [in] long Y,
-             [in] string Text );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void drawText( [in] long X, 
+             [in] long Y, 
+             [in] string Text ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** draws texts in the output device using an explicit kerning table.
      */
-    [oneway] void drawTextArray( [in] long X,
-             [in] long Y,
-             [in] string Text,
-             [in] sequence<long> Longs );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void drawTextArray( [in] long X, 
+             [in] long Y, 
+             [in] string Text, 
+             [in] sequence<long> Longs ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XImageButton.idl b/offapi/com/sun/star/awt/XImageButton.idl
index e3676b50711d..92463ebbb8c2 100644
--- a/offapi/com/sun/star/awt/XImageButton.idl
+++ b/offapi/com/sun/star/awt/XImageButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XImageButton_idl__
-#define __com_sun_star_awt_XImageButton_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XActionListener_idl__
-#include <com/sun/star/awt/XActionListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XImageButton_idl__ 
+#define __com_sun_star_awt_XImageButton_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XActionListener_idl__ 
+#include <com/sun/star/awt/XActionListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to register for action events of an image button
     and sets the action command.
  */
 published interface XImageButton: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** registers a listener for action events.
      */
-    [oneway] void addActionListener( [in] com::sun::star::awt::XActionListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addActionListener( [in] com::sun::star::awt::XActionListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** unregisters a listener for action events.
      */
-    [oneway] void removeActionListener( [in] com::sun::star::awt::XActionListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeActionListener( [in] com::sun::star::awt::XActionListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the action command string.
      */
-    [oneway] void setActionCommand( [in] string Command );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void setActionCommand( [in] string Command ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XImageConsumer.idl b/offapi/com/sun/star/awt/XImageConsumer.idl
index 60c1223be42a..30c9146e2892 100644
--- a/offapi/com/sun/star/awt/XImageConsumer.idl
+++ b/offapi/com/sun/star/awt/XImageConsumer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,21 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XImageConsumer_idl__
-#define __com_sun_star_awt_XImageConsumer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
- published interface XImageProducer;
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XImageConsumer_idl__ 
+#define __com_sun_star_awt_XImageConsumer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+ published interface XImageProducer; 
+ 
+//============================================================================= 
+ 
 /** specifies a data sink for an image.
 
     <p>An image consumer is a component which wants to display or just
@@ -47,30 +47,30 @@
     @see XImageProducer
  */
 published interface XImageConsumer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** initializes the consumer with image dimensions.
      */
-    [oneway] void init( [in] long Width,
-             [in] long Height );
-
-    //-------------------------------------------------------------------------
-
-    /** changes color model for next pixels
+    [oneway] void init( [in] long Width, 
+             [in] long Height ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** changes color model for next pixels 
         typically called once after initialization.
      */
-    [oneway] void setColorModel( [in] short BitCount,
-             [in] sequence<long> RGBAPal,
-             [in] long RedMask,
-             [in] long GreenMask,
-             [in] long BlueMask,
-             [in] long AlphaMask );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setColorModel( [in] short BitCount, 
+             [in] sequence<long> RGBAPal, 
+             [in] long RedMask, 
+             [in] long GreenMask, 
+             [in] long BlueMask, 
+             [in] long AlphaMask ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** delivers a chunk of pixels as <atom>long</atom> values.
-
+                        
         <p>The pixels of the image are delivered using one or more calls
         to this method.  Each call specifies the location and size of the
         rectangle of source pixels that are contained in the array of pixels.
@@ -79,18 +79,18 @@ published interface XImageConsumer: com::sun::star::uno::XInterface
         (m,n) is stored in the pixels array at index (n * <var>nScanSize</var>
         + m + nOffset).</p>
      */
-    [oneway] void setPixelsByBytes( [in] long nX,
-             [in] long nY,
-             [in] long nWidth,
-             [in] long nHeight,
-             [in] sequence<byte> aProducerData,
-             [in] long nOffset,
-             [in] long nScanSize );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setPixelsByBytes( [in] long nX, 
+             [in] long nY, 
+             [in] long nWidth, 
+             [in] long nHeight, 
+             [in] sequence<byte> aProducerData, 
+             [in] long nOffset, 
+             [in] long nScanSize ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** delivers a chunk of pixels as <atom>byte</atom> values.
-
+                        
         <p>The pixels of the image are delivered using one or more calls
         to this method.  Each call specifies the location and size of the
         rectangle of source pixels that are contained in the array of pixels.
@@ -99,34 +99,34 @@ published interface XImageConsumer: com::sun::star::uno::XInterface
         (m,n) is stored in the pixels array at index (n * <var>nScanSize</var>
         + m + nOffset).</p>
      */
-    [oneway] void setPixelsByLongs( [in] long nX,
-             [in] long nY,
-             [in] long nWidth,
-             [in] long nHeight,
-             [in] sequence<long> aProducerData,
-             [in] long nOffset,
-             [in] long nScanSize );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setPixelsByLongs( [in] long nX, 
+             [in] long nY, 
+             [in] long nWidth, 
+             [in] long nHeight, 
+             [in] sequence<long> aProducerData, 
+             [in] long nOffset, 
+             [in] long nScanSize ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is called for the notification of the degree to which the
         image is delivered.
-
+                        
         <p>The complete method is called when the image producer
         has finished delivering all of the pixels that the source image
         contains, or when a single frame of a multi-frame animation has
         been completed, or when an error in loading or producing the
         image has occurred.  The image consumer should remove itself from the
-        list of consumers registered with the image producer
+        list of consumers registered with the image producer 
         at this time, unless it is interested in successive frames.</p>
      */
-    [oneway] void complete( [in] long Status,
-             [in] XImageProducer xProducer );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void complete( [in] long Status, 
+             [in] XImageProducer xProducer ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XImageProducer.idl b/offapi/com/sun/star/awt/XImageProducer.idl
index 0dc15218012c..3d2fc0c7a540 100644
--- a/offapi/com/sun/star/awt/XImageProducer.idl
+++ b/offapi/com/sun/star/awt/XImageProducer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,68 +24,68 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XImageProducer_idl__
-#define __com_sun_star_awt_XImageProducer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XImageConsumer_idl__
-#include <com/sun/star/awt/XImageConsumer.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XImageProducer_idl__ 
+#define __com_sun_star_awt_XImageProducer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XImageConsumer_idl__ 
+#include <com/sun/star/awt/XImageConsumer.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies a source for an image.
  */
 published interface XImageProducer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** registers an image consumer with the image producer for accessing
-        the image data during a later reconstruction of the image.
-
+        the image data during a later reconstruction of the image.  
+                        
         <p>The image producer may, at its discretion, start delivering the
         image data to the consumer using the <type>XImageConsumer</type>
         interface immediately, or when the next available image reconstruction
         is triggered by a call to the startProduction method.</p>
      */
     [oneway] void addConsumer( [in] com::sun::star::awt::XImageConsumer xConsumer );
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+     
     /** removes the given <type scope="com::sun::star::awt">XImageConsumer</type>
         callback from the list of consumers currently registered to receive
         image data.
 
         <p>It is not considered an error to remove a consumer that is not
-        currently registered. The image producer should stop sending data
+        currently registered. The image producer should stop sending data 
         to this consumer as soon as it is feasible.</p>
      */
-    [oneway] void removeConsumer( [in] com::sun::star::awt::XImageConsumer xConsumer );
-
-    //-------------------------------------------------------------------------
-
-    /** registers the given image consumer as a consumer
+    [oneway] void removeConsumer( [in] com::sun::star::awt::XImageConsumer xConsumer ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** registers the given image consumer as a consumer 
         and starts an immediate reconstruction of the image data.
-
+                        
         <p>The image data will then be delivered to this consumer and any other
         consumer which may have already been registered with the producer.
         This method differs from the addConsumer method in that a reproduction of
         the image data should be triggered as soon as possible.</p>
      */
-    [oneway] void startProduction();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void startProduction(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XInfoPrinter.idl b/offapi/com/sun/star/awt/XInfoPrinter.idl
index 71afa45e0bc1..817e44965378 100644
--- a/offapi/com/sun/star/awt/XInfoPrinter.idl
+++ b/offapi/com/sun/star/awt/XInfoPrinter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XInfoPrinter_idl__
-#define __com_sun_star_awt_XInfoPrinter_idl__
-
-#ifndef __com_sun_star_awt_XPrinterPropertySet_idl__
-#include <com/sun/star/awt/XPrinterPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDevice_idl__
-#include <com/sun/star/awt/XDevice.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XInfoPrinter_idl__ 
+#define __com_sun_star_awt_XInfoPrinter_idl__ 
+ 
+#ifndef __com_sun_star_awt_XPrinterPropertySet_idl__ 
+#include <com/sun/star/awt/XPrinterPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XDevice_idl__ 
+#include <com/sun/star/awt/XDevice.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** represents an information printer.
  */
 published interface XInfoPrinter: com::sun::star::awt::XPrinterPropertySet
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** creates a new object which implements an <type>XDevice</type>.
-
+        
         <p>The current settings are used as a template.</p>
      */
-    com::sun::star::awt::XDevice createDevice();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::awt::XDevice createDevice(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XItemEventBroadcaster.idl b/offapi/com/sun/star/awt/XItemEventBroadcaster.idl
index ca4bb0727f91..986597486b14 100644
--- a/offapi/com/sun/star/awt/XItemEventBroadcaster.idl
+++ b/offapi/com/sun/star/awt/XItemEventBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/XItemListener.idl b/offapi/com/sun/star/awt/XItemListener.idl
index ccb7b90ab773..714eea13eadd 100644
--- a/offapi/com/sun/star/awt/XItemListener.idl
+++ b/offapi/com/sun/star/awt/XItemListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XItemListener_idl__
-#define __com_sun_star_awt_XItemListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_ItemEvent_idl__
-#include <com/sun/star/awt/ItemEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XItemListener_idl__ 
+#define __com_sun_star_awt_XItemListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_ItemEvent_idl__ 
+#include <com/sun/star/awt/ItemEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive events from a component
     when the state of an item changes.
  */
 published interface XItemListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when an item changes its state.
      */
-    [oneway] void itemStateChanged( [in] com::sun::star::awt::ItemEvent rEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void itemStateChanged( [in] com::sun::star::awt::ItemEvent rEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XKeyHandler.idl b/offapi/com/sun/star/awt/XKeyHandler.idl
index 7a79ac3b0a08..aff32301e901 100644
--- a/offapi/com/sun/star/awt/XKeyHandler.idl
+++ b/offapi/com/sun/star/awt/XKeyHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,19 +25,19 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_awt_XKeyHandler_idl__
-#define __com_sun_star_awt_XKeyHandler_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_KeyEvent_idl__
-#include <com/sun/star/awt/KeyEvent.idl>
-#endif
-
-
-module com {  module sun {  module star {  module awt {
+#ifndef __com_sun_star_awt_XKeyHandler_idl__ 
+#define __com_sun_star_awt_XKeyHandler_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_KeyEvent_idl__ 
+#include <com/sun/star/awt/KeyEvent.idl> 
+#endif 
+ 
+ 
+module com {  module sun {  module star {  module awt {  
 
 /** This key handler is similar to <type
     scope="::com::sun::star::awt">XKeyListener</type> but allows the
@@ -73,7 +73,7 @@ published interface XKeyHandler : ::com::sun::star::lang::XEventListener
             regarding the event.
     */
     boolean keyPressed ([in] com::sun::star::awt::KeyEvent aEvent);
-
+ 
     /** This function is called by the broadcaster, an <type
         scope="::com::sun::star::awt">XExtendedToolkit</type> for
         instance, after a key has been pressed and released.  The return
@@ -93,9 +93,9 @@ published interface XKeyHandler : ::com::sun::star::lang::XEventListener
             called and the broadcaster will take no further actions
             regarding the event.
     */
-    boolean keyReleased ([in] com::sun::star::awt::KeyEvent aEvent);
-};
-
+    boolean keyReleased ([in] com::sun::star::awt::KeyEvent aEvent); 
+}; 
+ 
 }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XKeyListener.idl b/offapi/com/sun/star/awt/XKeyListener.idl
index 299cfddb9ad3..d07a31180121 100644
--- a/offapi/com/sun/star/awt/XKeyListener.idl
+++ b/offapi/com/sun/star/awt/XKeyListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XKeyListener_idl__
-#define __com_sun_star_awt_XKeyListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_KeyEvent_idl__
-#include <com/sun/star/awt/KeyEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XKeyListener_idl__ 
+#define __com_sun_star_awt_XKeyListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_KeyEvent_idl__ 
+#include <com/sun/star/awt/KeyEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive keyboard events.
  */
 published interface XKeyListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a key has been pressed.
      */
-    [oneway] void keyPressed( [in] com::sun::star::awt::KeyEvent e );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void keyPressed( [in] com::sun::star::awt::KeyEvent e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a key has been released.
      */
-    [oneway] void keyReleased( [in] com::sun::star::awt::KeyEvent e );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void keyReleased( [in] com::sun::star::awt::KeyEvent e ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XLayoutConstrains.idl b/offapi/com/sun/star/awt/XLayoutConstrains.idl
index c715d1b7d5d8..bbb3c6b1ab3a 100644
--- a/offapi/com/sun/star/awt/XLayoutConstrains.idl
+++ b/offapi/com/sun/star/awt/XLayoutConstrains.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
-#define __com_sun_star_awt_XLayoutConstrains_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
-#include <com/sun/star/awt/Size.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XLayoutConstrains_idl__ 
+#define __com_sun_star_awt_XLayoutConstrains_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Size_idl__ 
+#include <com/sun/star/awt/Size.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the layout constraints for a surrounding container.
  */
 published interface XLayoutConstrains: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the minimum size for this component.
      */
-    com::sun::star::awt::Size getMinimumSize();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Size getMinimumSize(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the preferred size for this component.
      */
-    com::sun::star::awt::Size getPreferredSize();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Size getPreferredSize(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** calculates the adjusted size for a given maximum size.
      */
-    com::sun::star::awt::Size calcAdjustedSize( [in] com::sun::star::awt::Size aNewSize );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::awt::Size calcAdjustedSize( [in] com::sun::star::awt::Size aNewSize ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XLayoutContainer.idl b/offapi/com/sun/star/awt/XLayoutContainer.idl
index ccbaf0d01cfa..fbe8901439c7 100644
--- a/offapi/com/sun/star/awt/XLayoutContainer.idl
+++ b/offapi/com/sun/star/awt/XLayoutContainer.idl
@@ -1,30 +1,30 @@
-#ifndef __com_sun_star_awt_XLayoutContainer_idl__
-#define __com_sun_star_awt_XLayoutContainer_idl__
-
-#ifndef __com_sun_star_awt_XLayoutConstrains_idl__
-#include <com/sun/star/awt/XLayoutConstrains.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
-#include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
+#ifndef __com_sun_star_awt_XLayoutContainer_idl__ 
+#define __com_sun_star_awt_XLayoutContainer_idl__ 
+
+#ifndef __com_sun_star_awt_XLayoutConstrains_idl__ 
+#include <com/sun/star/awt/XLayoutConstrains.idl> 
+#endif 
+#ifndef __com_sun_star_awt_Rectangle_idl__ 
+#include <com/sun/star/awt/Rectangle.idl> 
+#endif 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+#ifndef __com_sun_star_container_XChild_idl__ 
+#include <com/sun/star/container/XChild.idl> 
 #endif
-#ifndef __com_sun_star_container_XChild_idl__
-#include <com/sun/star/container/XChild.idl>
+#ifndef __com_sun_star_awt_MaxChildrenException_idl__ 
+#include <com/sun/star/awt/MaxChildrenException.idl> 
 #endif
-#ifndef __com_sun_star_awt_MaxChildrenException_idl__
-#include <com/sun/star/awt/MaxChildrenException.idl>
-#endif
-#ifndef __com_sun_star_awt_XLayoutUnit_idl__
-#include <com/sun/star/awt/XLayoutUnit.idl>
+#ifndef __com_sun_star_awt_XLayoutUnit_idl__ 
+#include <com/sun/star/awt/XLayoutUnit.idl> 
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com {  module sun {  module star {  module awt {
 
-//=============================================================================
+//============================================================================= 
 
 interface XLayoutUnit;
 
@@ -37,13 +37,13 @@ interface XLayoutContainer: com::sun::star::container::XChild
     /** Adds a child. Some containers provide an interface for
        adding children which you should use. */
     void addChild( [in] com::sun::star::awt::XLayoutConstrains Child )
-        raises( com::sun::star::awt::MaxChildrenException );
+        raises( com::sun::star::awt::MaxChildrenException ); 
 
     /** Remove a child. Some containers provide an interface for
        adding children which you should use.
     */
     void removeChild( [in] com::sun::star::awt::XLayoutConstrains Child );
-
+    
     /** Returns a sequence of the children of this container. */
     sequence< com::sun::star::awt::XLayoutConstrains > getChildren();
 
@@ -61,7 +61,7 @@ interface XLayoutContainer: com::sun::star::container::XChild
     // TEMP: no need for this...
     com::sun::star::awt::XLayoutUnit getLayoutUnit();
 
-    /** To be used by the parent for the purpose of layout management.
+    /** To be used by the parent for the purpose of layout management. 
        For widgets, use XWindow::setPosSize() */
     void allocateArea( [in] com::sun::star::awt::Rectangle NewArea );
 
@@ -81,8 +81,8 @@ interface XLayoutContainer: com::sun::star::container::XChild
        re-design this approach -- check XLayoutConstrains::calcAdjustedSize(). */
     boolean hasHeightForWidth();
 };
-
-//=============================================================================
+ 
+//============================================================================= 
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/XLayoutFlow.idl b/offapi/com/sun/star/awt/XLayoutFlow.idl
index ac23974d76d7..da7fb00d40fc 100644
--- a/offapi/com/sun/star/awt/XLayoutFlow.idl
+++ b/offapi/com/sun/star/awt/XLayoutFlow.idl
@@ -1,14 +1,14 @@
-#ifndef __com_sun_star_awt_XLayoutFlow_idl__
-#define __com_sun_star_awt_XLayoutFlow_idl__
+#ifndef __com_sun_star_awt_XLayoutFlow_idl__ 
+#define __com_sun_star_awt_XLayoutFlow_idl__ 
 
-//=============================================================================
-
-#include <com/sun/star/uno/XInterface.idl>
+//============================================================================= 
 
+#include <com/sun/star/uno/XInterface.idl> 
+ 
 module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** Enables height-for-width layout negotiations, which allows for label wrapping
     and flow containers. Can be implemented by either a container or an ordinary widget;
     whether its parent will honor it is another story, so keep implementing
@@ -24,9 +24,9 @@ interface XLayoutFlow
     /** Allow the container/widget to toggle the functionality. */
     boolean hasHeightForWidth();
 };
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XLayoutFlowContainer.idl b/offapi/com/sun/star/awt/XLayoutFlowContainer.idl
index 45685964d488..d8ae47751201 100644
--- a/offapi/com/sun/star/awt/XLayoutFlowContainer.idl
+++ b/offapi/com/sun/star/awt/XLayoutFlowContainer.idl
@@ -1,14 +1,14 @@
-#ifndef __com_sun_star_awt_XLayoutUnit_idl__
-#define __com_sun_star_awt_XLayoutUnit_idl__
-
-#include <com/sun/star/awt/XLayoutContainer.idl>
-
-//=============================================================================
+#ifndef __com_sun_star_awt_XLayoutUnit_idl__ 
+#define __com_sun_star_awt_XLayoutUnit_idl__ 
 
+#include <com/sun/star/awt/XLayoutContainer.idl> 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** Responsible to evaluate size damages and force a re-calculation. Containers
     should let it know of state changes that may affects their size.
     All children of a top-level window should share the same object.
@@ -19,9 +19,9 @@ interface XLayoutContainer
 {
     void queueResize( [in] com::sun::star::awt::XLayoutContainer Container );
 };
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XLayoutRoot.idl b/offapi/com/sun/star/awt/XLayoutRoot.idl
index 3234f15e13cf..107d7e919a4a 100644
--- a/offapi/com/sun/star/awt/XLayoutRoot.idl
+++ b/offapi/com/sun/star/awt/XLayoutRoot.idl
@@ -1,22 +1,22 @@
-#ifndef __com_sun_star_awt_XLayoutRoot_idl__
-#define __com_sun_star_awt_XLayoutRoot_idl__
-
-#ifndef __com_sun_star_awt_XLayoutContainer_idl__
-#include <com/sun/star/awt/XLayoutContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XLayoutRoot_idl__ 
+#define __com_sun_star_awt_XLayoutRoot_idl__ 
+ 
+#ifndef __com_sun_star_awt_XLayoutContainer_idl__ 
+#include <com/sun/star/awt/XLayoutContainer.idl> 
+#endif 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#include <com/sun/star/container/XNameContainer.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** specifies an interface for a top-level layoutable widget
 
    @since OOo 3.0
@@ -24,10 +24,10 @@ module com {  module sun {  module star {  module awt {
 interface XLayoutRoot: com::sun::star::container::XNameAccess
 {
     com::sun::star::awt::XLayoutContainer getLayoutContainer();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XLayoutUnit.idl b/offapi/com/sun/star/awt/XLayoutUnit.idl
index cc3581ae4aa3..fdd01dd9c305 100644
--- a/offapi/com/sun/star/awt/XLayoutUnit.idl
+++ b/offapi/com/sun/star/awt/XLayoutUnit.idl
@@ -1,31 +1,31 @@
-#ifndef __com_sun_star_awt_XLayoutUnit_idl__
-#define __com_sun_star_awt_XLayoutUnit_idl__
+#ifndef __com_sun_star_awt_XLayoutUnit_idl__ 
+#define __com_sun_star_awt_XLayoutUnit_idl__ 
 
-#ifndef __com_sun_star_awt_XLayoutContainer_idl__
-#include <com/sun/star/awt/XLayoutContainer.idl>
+#ifndef __com_sun_star_awt_XLayoutContainer_idl__ 
+#include <com/sun/star/awt/XLayoutContainer.idl> 
 #endif
 
-//=============================================================================
-
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt {
-
-//=============================================================================
+ 
+//============================================================================= 
 
 interface XLayoutContainer;
 
 /** Responsible to evaluate size damages and force a re-calculation. Containers
     should let it know of state changes that may affects their size.
     All children of a top-level window should share the same object.
-
+    
     @since OOo 3.0
  */
 interface XLayoutUnit
 {
     void queueResize( [in] com::sun::star::awt::XLayoutContainer Container );
 };
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 }; }; }; };
-
+ 
 #endif
diff --git a/offapi/com/sun/star/awt/XListBox.idl b/offapi/com/sun/star/awt/XListBox.idl
index 32b458d62a2f..8763965ee3ba 100644
--- a/offapi/com/sun/star/awt/XListBox.idl
+++ b/offapi/com/sun/star/awt/XListBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,176 +24,176 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XListBox_idl__
-#define __com_sun_star_awt_XListBox_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XItemListener_idl__
-#include <com/sun/star/awt/XItemListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XActionListener_idl__
-#include <com/sun/star/awt/XActionListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
+#ifndef __com_sun_star_awt_XListBox_idl__ 
+#define __com_sun_star_awt_XListBox_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XItemListener_idl__ 
+#include <com/sun/star/awt/XItemListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XActionListener_idl__ 
+#include <com/sun/star/awt/XActionListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
 
 /** gives access to the items of a list box and makes it possible to
     register item and action event listeners.
- */
+ */     
 published interface XListBox: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** registers a listener for item events.
-     */
-    [oneway] void addItemListener( [in] com::sun::star::awt::XItemListener l );
-
-    //-------------------------------------------------------------------------
+     */    
+    [oneway] void addItemListener( [in] com::sun::star::awt::XItemListener l ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** unregisters a listener for item events.
-     */
-    [oneway] void removeItemListener( [in] com::sun::star::awt::XItemListener l );
+     */    
+    [oneway] void removeItemListener( [in] com::sun::star::awt::XItemListener l ); 
+ 
+    //------------------------------------------------------------------------- 
 
-    //-------------------------------------------------------------------------
-
-    /** registers a listener for action events.
+    /** registers a listener for action events.    
      */
-    [oneway] void addActionListener( [in] com::sun::star::awt::XActionListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addActionListener( [in] com::sun::star::awt::XActionListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** unregisters a listener for action events.
      */
-    [oneway] void removeActionListener( [in] com::sun::star::awt::XActionListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeActionListener( [in] com::sun::star::awt::XActionListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** adds an item at the specified position.
      */
-    [oneway] void addItem( [in] string aItem,
-             [in] short nPos );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addItem( [in] string aItem, 
+             [in] short nPos ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** adds multiple items at the specified position.
      */
-    [oneway] void addItems( [in] sequence<string> aItems,
-             [in] short nPos );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addItems( [in] sequence<string> aItems, 
+             [in] short nPos ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** removes a number of items at the specified position.
      */
-    [oneway] void removeItems( [in] short nPos,
-             [in] short nCount );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeItems( [in] short nPos, 
+             [in] short nCount ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the number of items in the listbox.
      */
-    short getItemCount();
-
-    //-------------------------------------------------------------------------
-
+    short getItemCount(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the item at the specified position.
      */
-    string getItem( [in] short nPos );
-
-    //-------------------------------------------------------------------------
-
+    string getItem( [in] short nPos ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns all items of the list box.
      */
-    sequence<string> getItems();
-
-    //-------------------------------------------------------------------------
-
+    sequence<string> getItems(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the position of the currently selected item.
      */
-    short getSelectedItemPos();
-
-    //-------------------------------------------------------------------------
-
+    short getSelectedItemPos(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the positions of all currently selected items.
      */
-    sequence<short> getSelectedItemsPos();
-
-    //-------------------------------------------------------------------------
-
+    sequence<short> getSelectedItemsPos(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently selected item.
      */
-    string getSelectedItem();
-
-    //-------------------------------------------------------------------------
-
+    string getSelectedItem(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns all currently selected items.
      */
-    sequence<string> getSelectedItems();
-
-    //-------------------------------------------------------------------------
-
+    sequence<string> getSelectedItems(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** selects/deselects the item at the specified position.
      */
-    [oneway] void selectItemPos( [in] short nPos,
-             [in] boolean bSelect );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void selectItemPos( [in] short nPos, 
+             [in] boolean bSelect ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** selects/deselects multiple items at the specified positions.
      */
-    [oneway] void selectItemsPos( [in] sequence<short> aPositions,
-             [in] boolean bSelect );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void selectItemsPos( [in] sequence<short> aPositions, 
+             [in] boolean bSelect ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** selects/deselects the specified item.
      */
-    [oneway] void selectItem( [in] string aItem,
-             [in] boolean bSelect );
-
-    //-------------------------------------------------------------------------
-
-    /** returns <true/> if multiple items can be selected,
+    [oneway] void selectItem( [in] string aItem, 
+             [in] boolean bSelect ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** returns <true/> if multiple items can be selected, 
         <false/> if only one item can be selected.
      */
-    boolean isMutipleMode();
-
-    //-------------------------------------------------------------------------
-
+    boolean isMutipleMode(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** determines if only a single item or multiple items can be selected.
      */
-    [oneway] void setMultipleMode( [in] boolean bMulti );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setMultipleMode( [in] boolean bMulti ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the number of visible lines in drop down mode.
      */
-    short getDropDownLineCount();
-
-    //-------------------------------------------------------------------------
-
+    short getDropDownLineCount(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the number of visible lines for drop down mode.
      */
-    [oneway] void setDropDownLineCount( [in] short nLines );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setDropDownLineCount( [in] short nLines ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** makes the item at the specified position visible by scrolling.
      */
-    [oneway] void makeVisible( [in] short nEntry );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void makeVisible( [in] short nEntry ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XMenu.idl b/offapi/com/sun/star/awt/XMenu.idl
index f9ebc738f18f..70f12136cc14 100644
--- a/offapi/com/sun/star/awt/XMenu.idl
+++ b/offapi/com/sun/star/awt/XMenu.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,119 +24,119 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XMenu_idl__
-#define __com_sun_star_awt_XMenu_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
- published interface XPopupMenu;
- published interface XMenuListener;
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XMenu_idl__ 
+#define __com_sun_star_awt_XMenu_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+ published interface XPopupMenu; 
+ published interface XMenuListener; 
+ 
+//============================================================================= 
+ 
 /** specifies a simple menu.
  */
 published interface XMenu: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** adds the specified menu listener to receive events from this menu.
      */
-    [oneway] void addMenuListener( [in] XMenuListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addMenuListener( [in] XMenuListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified menu listener so that it no longer
         receives events from this menu.
      */
-    [oneway] void removeMenuListener( [in] XMenuListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeMenuListener( [in] XMenuListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** inserts an item into the menu.
-
+        
         <p>The item is appended if the position is greater than or equal to
         <code>getItemCount()</code> or if it is negative.</p>
      */
-    [oneway] void insertItem( [in] short nItemId,
-             [in] string aText,
-             [in] short nItemStyle,
-             [in] short nPos );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void insertItem( [in] short nItemId, 
+             [in] string aText, 
+             [in] short nItemStyle, 
+             [in] short nPos ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes one or more items from the menu.
      */
-    [oneway] void removeItem( [in] short nPos,
-             [in] short nCount );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeItem( [in] short nPos, 
+             [in] short nCount ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the number of items in the menu.
      */
-    short getItemCount();
-
-    //-------------------------------------------------------------------------
-
+    short getItemCount(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the id of the item at the specified position.
      */
-    short getItemId( [in] short nPos );
-
-    //-------------------------------------------------------------------------
-
+    short getItemId( [in] short nPos ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the position of the item with the specified id.
      */
-    short getItemPos( [in] short nId );
-
-    //-------------------------------------------------------------------------
-
+    short getItemPos( [in] short nId ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** enables or disables the menu item.
      */
-    [oneway] void enableItem( [in] short nItemId,
-             [in] boolean bEnable );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void enableItem( [in] short nItemId, 
+             [in] boolean bEnable ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the state of the menu item.
      */
-    boolean isItemEnabled( [in] short nItemId );
-
-    //-------------------------------------------------------------------------
-
+    boolean isItemEnabled( [in] short nItemId ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the text for the menu item.
      */
-    [oneway] void setItemText( [in] short nItemId,
-             [in] string aText );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setItemText( [in] short nItemId, 
+             [in] string aText ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the string for the given item id.
      */
-    string getItemText( [in] short nItemId );
-
-    //-------------------------------------------------------------------------
-
+    string getItemText( [in] short nItemId ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the popup menu for a specified menu item.
      */
-    [oneway] void setPopupMenu( [in] short nItemId,
-             [in] XPopupMenu aPopupMenu );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setPopupMenu( [in] short nItemId, 
+             [in] XPopupMenu aPopupMenu ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the popup menu from the menu item.
      */
-    XPopupMenu getPopupMenu( [in] short nItemId );
-
-};
-
-
-}; }; }; };
-
-#endif
+    XPopupMenu getPopupMenu( [in] short nItemId ); 
+ 
+}; 
+ 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XMenuBar.idl b/offapi/com/sun/star/awt/XMenuBar.idl
index 40d92b9f0b80..8847b73508e7 100644
--- a/offapi/com/sun/star/awt/XMenuBar.idl
+++ b/offapi/com/sun/star/awt/XMenuBar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XMenuBar_idl__
-#define __com_sun_star_awt_XMenuBar_idl__
-
-#ifndef __com_sun_star_awt_XMenu_idl__
-#include <com/sun/star/awt/XMenu.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XMenuBar_idl__ 
+#define __com_sun_star_awt_XMenuBar_idl__ 
+ 
+#ifndef __com_sun_star_awt_XMenu_idl__ 
+#include <com/sun/star/awt/XMenu.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** identifies a menu bar.
  */
 published interface XMenuBar: com::sun::star::awt::XMenu
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XMenuBarExtended.idl b/offapi/com/sun/star/awt/XMenuBarExtended.idl
index 97fbbb39f7a9..c3601da09d58 100755
--- a/offapi/com/sun/star/awt/XMenuBarExtended.idl
+++ b/offapi/com/sun/star/awt/XMenuBarExtended.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/XMenuExtended.idl b/offapi/com/sun/star/awt/XMenuExtended.idl
index ba850ca5d416..3caa554c571e 100644
--- a/offapi/com/sun/star/awt/XMenuExtended.idl
+++ b/offapi/com/sun/star/awt/XMenuExtended.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/XMenuExtended2.idl b/offapi/com/sun/star/awt/XMenuExtended2.idl
index adba6816a9e8..210a523c6b4d 100755
--- a/offapi/com/sun/star/awt/XMenuExtended2.idl
+++ b/offapi/com/sun/star/awt/XMenuExtended2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/XMenuListener.idl b/offapi/com/sun/star/awt/XMenuListener.idl
index 12f713f83fb4..033de9add489 100644
--- a/offapi/com/sun/star/awt/XMenuListener.idl
+++ b/offapi/com/sun/star/awt/XMenuListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,56 +24,56 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XMenuListener_idl__
-#define __com_sun_star_awt_XMenuListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MenuEvent_idl__
-#include <com/sun/star/awt/MenuEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XMenuListener_idl__ 
+#define __com_sun_star_awt_XMenuListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_MenuEvent_idl__ 
+#include <com/sun/star/awt/MenuEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive menu events on a window.
  */
 published interface XMenuListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a menu item is highlighted.
      */
-    [oneway] void highlight( [in] com::sun::star::awt::MenuEvent rEvent );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void highlight( [in] com::sun::star::awt::MenuEvent rEvent ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a menu item is selected.
      */
-    [oneway] void select( [in] com::sun::star::awt::MenuEvent rEvent );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void select( [in] com::sun::star::awt::MenuEvent rEvent ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a menu is activated.
      */
-    [oneway] void activate( [in] com::sun::star::awt::MenuEvent rEvent );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void activate( [in] com::sun::star::awt::MenuEvent rEvent ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a menu is deactivated.
      */
-    [oneway] void deactivate( [in] com::sun::star::awt::MenuEvent rEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void deactivate( [in] com::sun::star::awt::MenuEvent rEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XMessageBox.idl b/offapi/com/sun/star/awt/XMessageBox.idl
index e10984a42f01..87162cf32ad4 100644
--- a/offapi/com/sun/star/awt/XMessageBox.idl
+++ b/offapi/com/sun/star/awt/XMessageBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XMessageBox_idl__
-#define __com_sun_star_awt_XMessageBox_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XMessageBox_idl__ 
+#define __com_sun_star_awt_XMessageBox_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to a message box.
 
     @deprecated
  */
 published interface XMessageBox: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** sets the caption text.
      */
-    [oneway] void setCaptionText( [in] string aText );
-
-    //-------------------------------------------------------------------------
+    [oneway] void setCaptionText( [in] string aText ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns the caption text.
      */
-    string getCaptionText();
-
-    //-------------------------------------------------------------------------
+    string getCaptionText(); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** sets the message text.
      */
-    [oneway] void setMessageText( [in] string aText );
-
-    //-------------------------------------------------------------------------
+    [oneway] void setMessageText( [in] string aText ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns the message text.
      */
-    string getMessageText();
-
-    //-------------------------------------------------------------------------
+    string getMessageText(); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** shows the message box.
      */
-    short execute();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    short execute(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XMessageBoxFactory.idl b/offapi/com/sun/star/awt/XMessageBoxFactory.idl
index 8058dd6e653d..f06ba27b8116 100644
--- a/offapi/com/sun/star/awt/XMessageBoxFactory.idl
+++ b/offapi/com/sun/star/awt/XMessageBoxFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,8 +28,8 @@
 #ifndef __com_sun_star_awt_XMessageBoxFactory_idl__
 #define __com_sun_star_awt_XMessageBoxFactory_idl__
 
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
-#include <com/sun/star/awt/XWindowPeer.idl>
+#ifndef __com_sun_star_awt_XWindowPeer_idl__ 
+#include <com/sun/star/awt/XWindowPeer.idl> 
 #endif
 
 #ifndef __com_sun_star_awt_XMessageBox_idl__
@@ -48,29 +48,29 @@
 //=============================================================================
 
 module com { module sun { module star { module awt {
-
-//=============================================================================
+    
+//============================================================================= 
 
 /** specifies a factory interface for creating message boxes.
  */
 published interface XMessageBoxFactory : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-
+    
     /** creates a message box.
 
-        @returns
+        @returns 
         the created message box or a null reference if it cannot be
         created.
 
         @param aParent
-        a valid XWindowPeer reference which is used as a parent. This parameter
+        a valid XWindowPeer reference which is used as a parent. This parameter 
         must not be null.
-
+        
         @param aPosSize
         a rectangle which defines the position and size of the message
         box in pixel.
-
+        
         @param aType
         a string which determines the message box type.
         The following strings are defined.
@@ -83,19 +83,19 @@ published interface XMessageBoxFactory : com::sun::star::uno::XInterface
             <li><b>errorbox</b>A message box to provide an error message to the user.</li>
             <li><b>querybox</b>A message box to query information from the user.</li>
             <li><b>messbox</b>A normal message box.</li>
-        </ul>
+        </ul>         
 
         @param aButtons
         specifies which buttons should be available on the
         message box. A combination of
         <type scope="com::sun::star::awt">MessageBoxButtons</type>. An <b>infobox</b>
         ignores this parameter and always use button "OK".
-
+        
         @param aTitle
         specifies the title of the message box.
 
         @param aMessage
-        specifies text which will be shown by the message box.
+        specifies text which will be shown by the message box. 
         Line-breaks must be added using 'CR' or 'CR+LF'.
     */
     XMessageBox createMessageBox( [in] com::sun::star::awt::XWindowPeer aParent, [in] com::sun::star::awt::Rectangle aPosSize, [in] string aType, [in] long aButtons, [in] string aTitle, [in] string aMessage );
diff --git a/offapi/com/sun/star/awt/XMetricField.idl b/offapi/com/sun/star/awt/XMetricField.idl
index 5bc6a7da40e2..ba2f954d682c 100644
--- a/offapi/com/sun/star/awt/XMetricField.idl
+++ b/offapi/com/sun/star/awt/XMetricField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,140 +24,140 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XMetricField_idl__
-#define __com_sun_star_awt_XMetricField_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
+#ifndef __com_sun_star_awt_XMetricField_idl__ 
+#define __com_sun_star_awt_XMetricField_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+#ifndef __com_sun_star_util_MeasureUnit_idl__ 
+#include <com/sun/star/util/MeasureUnit.idl> 
 #endif
-#ifndef __com_sun_star_util_MeasureUnit_idl__
-#include <com/sun/star/util/MeasureUnit.idl>
-#endif
-
-//=============================================================================
 
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
 
 /** gives access to the value and formatting of a metric field.
  */
 interface XMetricField: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the value which is displayed in the metric field.
      */
-    void setValue( [in] hyper Value, [in] short FieldUnit );
-
-    //-------------------------------------------------------------------------
-
+    void setValue( [in] hyper Value, [in] short FieldUnit ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the user value which is displayed in the metric field.
      */
-    void setUserValue( [in] hyper Value, [in] short FieldUnit );
-
-    //-------------------------------------------------------------------------
-
+    void setUserValue( [in] hyper Value, [in] short FieldUnit ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the value which is currently displayed in the metric field.
      */
     hyper getValue( [in] short FieldUnit );
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+        
     /** returns the corrected value which is displayed in the metric field.
      */
-    hyper getCorrectedValue( [in] short FieldUnit );
-
-    //-------------------------------------------------------------------------
-
+    hyper getCorrectedValue( [in] short FieldUnit ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the minimum value that can be entered by the user.
      */
-    void setMin( [in] hyper Value, [in] short FieldUnit );
-
-    //-------------------------------------------------------------------------
-
+    void setMin( [in] hyper Value, [in] short FieldUnit ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set minimum value that can be entered by the
         user.
      */
     hyper getMin( [in] short FieldUnit );
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the maximum value that can be entered by the user.
      */
-    void setMax( [in] hyper Value, [in] short FieldUnit );
-
-    //-------------------------------------------------------------------------
-
+    void setMax( [in] hyper Value, [in] short FieldUnit ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set maximum value that can be entered by the
         user.
      */
     hyper getMax( [in] short FieldUnit );
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the first value to be set on POS1 key.
-     */
+     */    
     void setFirst( [in] hyper Value, [in] short FieldUnit );
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set first value which is set on POS1 key.
-     */
+     */    
     hyper getFirst( [in] short FieldUnit );
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the last value to be set on END key.
-     */
+     */    
     void setLast( [in] hyper Value, [in] short FieldUnit );
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set last value which is set on END key.
-     */
+     */    
     hyper getLast( [in] short FieldUnit );
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the increment value for the spin button.
-     */
-    void setSpinSize( [in] hyper Value );
-
-    //-------------------------------------------------------------------------
-
+     */    
+    void setSpinSize( [in] hyper Value ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set increment value for the spin button.
-     */
-    hyper getSpinSize();
-
-    //-------------------------------------------------------------------------
-
+     */    
+    hyper getSpinSize(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the number of decimals.
-     */
-    void setDecimalDigits( [in] short nDigits );
-
-    //-------------------------------------------------------------------------
-
+     */    
+    void setDecimalDigits( [in] short nDigits ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set number of decimals.
-     */
-    short getDecimalDigits();
-
-    //-------------------------------------------------------------------------
-
+     */    
+    short getDecimalDigits(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** determines if the format is checked during user input.
-     */
-    void setStrictFormat( [in] boolean bStrict );
-
-    //-------------------------------------------------------------------------
-
+     */    
+    void setStrictFormat( [in] boolean bStrict ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns whether the format is currently checked during user input.
-     */
+     */    
     boolean isStrictFormat();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XMouseClickHandler.idl b/offapi/com/sun/star/awt/XMouseClickHandler.idl
index ad98f9012cba..6af2742d667c 100644
--- a/offapi/com/sun/star/awt/XMouseClickHandler.idl
+++ b/offapi/com/sun/star/awt/XMouseClickHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -73,7 +73,7 @@ published interface XMouseClickHandler: ::com::sun::star::lang::XEventListener
             regarding the event.
     */
     boolean mouseReleased( [in] com::sun::star::awt::MouseEvent e );
-
+    
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XMouseListener.idl b/offapi/com/sun/star/awt/XMouseListener.idl
index d89f1e910fde..33cdaabed36d 100644
--- a/offapi/com/sun/star/awt/XMouseListener.idl
+++ b/offapi/com/sun/star/awt/XMouseListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XMouseListener_idl__
-#define __com_sun_star_awt_XMouseListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MouseEvent_idl__
-#include <com/sun/star/awt/MouseEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XMouseListener_idl__ 
+#define __com_sun_star_awt_XMouseListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_MouseEvent_idl__ 
+#include <com/sun/star/awt/MouseEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive events from the mouse in a certain window.
  */
 published interface XMouseListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a mouse button has been pressed on a window.
 
         <p>Since mouse presses are usually also used to indicate requests for popup menus
@@ -59,30 +59,30 @@ published interface XMouseListener: com::sun::star::lang::XEventListener
         the latter, the <member>MouseEvent::PopupTrigger</member> member of the
         event will be set to <TRUE/>.</p>
     */
-    [oneway] void mousePressed( [in] com::sun::star::awt::MouseEvent e );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void mousePressed( [in] com::sun::star::awt::MouseEvent e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a mouse button has been released on a window.
      */
-    [oneway] void mouseReleased( [in] com::sun::star::awt::MouseEvent e );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void mouseReleased( [in] com::sun::star::awt::MouseEvent e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the mouse enters a window.
      */
-    [oneway] void mouseEntered( [in] com::sun::star::awt::MouseEvent e );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void mouseEntered( [in] com::sun::star::awt::MouseEvent e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the mouse exits a window.
      */
-    [oneway] void mouseExited( [in] com::sun::star::awt::MouseEvent e );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void mouseExited( [in] com::sun::star::awt::MouseEvent e ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XMouseMotionHandler.idl b/offapi/com/sun/star/awt/XMouseMotionHandler.idl
index 541419711036..c9ca8e4809fa 100644
--- a/offapi/com/sun/star/awt/XMouseMotionHandler.idl
+++ b/offapi/com/sun/star/awt/XMouseMotionHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XMouseMotionHandler_idl__
-#define __com_sun_star_awt_XMouseMotionHandler_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MouseEvent_idl__
-#include <com/sun/star/awt/MouseEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XMouseMotionHandler_idl__ 
+#define __com_sun_star_awt_XMouseMotionHandler_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_MouseEvent_idl__ 
+#include <com/sun/star/awt/MouseEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive mouse motion events on a window.
  */
 published interface XMouseMotionHandler: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
-    /** is invoked when a mouse button is pressed on a window and then
-        dragged.
-
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** is invoked when a mouse button is pressed on a window and then 
+        dragged.  
+                        
         <p>Mouse drag events will continue to be delivered to
         the window where the first event originated until the mouse button is
         released (regardless of whether the mouse position is within the
@@ -64,10 +64,10 @@ published interface XMouseMotionHandler: com::sun::star::lang::XEventListener
             regarding the event.
 
      */
-    boolean mouseDragged( [in] com::sun::star::awt::MouseEvent e );
-
-    //-------------------------------------------------------------------------
-
+    boolean mouseDragged( [in] com::sun::star::awt::MouseEvent e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the mouse button has been moved on a window
         (with no buttons down).
 
@@ -79,12 +79,12 @@ published interface XMouseMotionHandler: com::sun::star::lang::XEventListener
             regarding the event.
 
      */
-    boolean mouseMoved( [in] com::sun::star::awt::MouseEvent e );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean mouseMoved( [in] com::sun::star::awt::MouseEvent e ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XMouseMotionListener.idl b/offapi/com/sun/star/awt/XMouseMotionListener.idl
index 66f2bf8bd9db..8751ecf80af4 100644
--- a/offapi/com/sun/star/awt/XMouseMotionListener.idl
+++ b/offapi/com/sun/star/awt/XMouseMotionListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XMouseMotionListener_idl__
-#define __com_sun_star_awt_XMouseMotionListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MouseEvent_idl__
-#include <com/sun/star/awt/MouseEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XMouseMotionListener_idl__ 
+#define __com_sun_star_awt_XMouseMotionListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_MouseEvent_idl__ 
+#include <com/sun/star/awt/MouseEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive mouse motion events on a window.
  */
 published interface XMouseMotionListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
-    /** is invoked when a mouse button is pressed on a window and then
-        dragged.
-
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** is invoked when a mouse button is pressed on a window and then 
+        dragged.  
+                        
         <p>Mouse drag events will continue to be delivered to
         the window where the first event originated until the mouse button is
         released (regardless of whether the mouse position is within the
         bounds of the window).</p>
      */
-    void mouseDragged( [in] com::sun::star::awt::MouseEvent e );
-
-    //-------------------------------------------------------------------------
-
+    void mouseDragged( [in] com::sun::star::awt::MouseEvent e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the mouse button has been moved on a window
         (with no buttons down).
      */
-    void mouseMoved( [in] com::sun::star::awt::MouseEvent e );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void mouseMoved( [in] com::sun::star::awt::MouseEvent e ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XNumericField.idl b/offapi/com/sun/star/awt/XNumericField.idl
index f07131c453b1..3482bdb7273e 100644
--- a/offapi/com/sun/star/awt/XNumericField.idl
+++ b/offapi/com/sun/star/awt/XNumericField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,126 +24,126 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XNumericField_idl__
-#define __com_sun_star_awt_XNumericField_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XNumericField_idl__ 
+#define __com_sun_star_awt_XNumericField_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to the value and formatting of a numeric field.
  */
 published interface XNumericField: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the value which is displayed in the numeric field.
      */
-    [oneway] void setValue( [in] double Value );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setValue( [in] double Value ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the value which is currently displayed in the numeric field.
      */
-    double getValue();
-
-    //-------------------------------------------------------------------------
-
+    double getValue(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the minimum value that can be entered by the user.
      */
-    [oneway] void setMin( [in] double Value );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setMin( [in] double Value ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set minimum value that can be entered by the
         user.
      */
-    double getMin();
-
-    //-------------------------------------------------------------------------
-
+    double getMin(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the maximum value that can be entered by the user.
      */
-    [oneway] void setMax( [in] double Value );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setMax( [in] double Value ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set maximum value that can be entered by the
         user.
      */
-    double getMax();
-
-    //-------------------------------------------------------------------------
-
+    double getMax(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the first value to be set on POS1 key.
-     */
-    [oneway] void setFirst( [in] double Value );
-
-    //-------------------------------------------------------------------------
-
+     */    
+    [oneway] void setFirst( [in] double Value ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set first value which is set on POS1 key.
-     */
-    double getFirst();
-
-    //-------------------------------------------------------------------------
-
+     */    
+    double getFirst(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the last value to be set on END key.
-     */
-    [oneway] void setLast( [in] double Value );
-
-    //-------------------------------------------------------------------------
-
+     */    
+    [oneway] void setLast( [in] double Value ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set last value which is set on END key.
-     */
-    double getLast();
-
-    //-------------------------------------------------------------------------
-
+     */    
+    double getLast(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the increment value for the spin button.
-     */
-    [oneway] void setSpinSize( [in] double Value );
-
-    //-------------------------------------------------------------------------
-
+     */    
+    [oneway] void setSpinSize( [in] double Value ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set increment value for the spin button.
-     */
-    double getSpinSize();
-
-    //-------------------------------------------------------------------------
-
+     */    
+    double getSpinSize(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the number of decimals.
-     */
-    [oneway] void setDecimalDigits( [in] short nDigits );
-
-    //-------------------------------------------------------------------------
-
+     */    
+    [oneway] void setDecimalDigits( [in] short nDigits ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set number of decimals.
-     */
-    short getDecimalDigits();
-
-    //-------------------------------------------------------------------------
-
+     */    
+    short getDecimalDigits(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** determines if the format is checked during user input.
-     */
-    [oneway] void setStrictFormat( [in] boolean bStrict );
-
-    //-------------------------------------------------------------------------
-
+     */    
+    [oneway] void setStrictFormat( [in] boolean bStrict ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns whether the format is currently checked during user input.
-     */
+     */    
     boolean isStrictFormat();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XPaintListener.idl b/offapi/com/sun/star/awt/XPaintListener.idl
index 95874a5d6e10..135234e4a8a4 100644
--- a/offapi/com/sun/star/awt/XPaintListener.idl
+++ b/offapi/com/sun/star/awt/XPaintListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XPaintListener_idl__
-#define __com_sun_star_awt_XPaintListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_PaintEvent_idl__
-#include <com/sun/star/awt/PaintEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XPaintListener_idl__ 
+#define __com_sun_star_awt_XPaintListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_PaintEvent_idl__ 
+#include <com/sun/star/awt/PaintEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive paint events.
  */
 published interface XPaintListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a region of the window became invalid, e.g. when
         another window has been moved away.
      */
-    [oneway] void windowPaint( [in] com::sun::star::awt::PaintEvent e );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void windowPaint( [in] com::sun::star::awt::PaintEvent e ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XPatternField.idl b/offapi/com/sun/star/awt/XPatternField.idl
index 2db8433f8e57..b34e0c25a268 100644
--- a/offapi/com/sun/star/awt/XPatternField.idl
+++ b/offapi/com/sun/star/awt/XPatternField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,66 +24,66 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XPatternField_idl__
-#define __com_sun_star_awt_XPatternField_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XPatternField_idl__ 
+#define __com_sun_star_awt_XPatternField_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to the value and formatting of a pattern field.
  */
 published interface XPatternField: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the pattern mask.
      */
-    [oneway] void setMasks( [in] string EditMask,
-             [in] string LiteralMask );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setMasks( [in] string EditMask, 
+             [in] string LiteralMask ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set pattern mask.
      */
-    void getMasks( [out] string EditMask,
-             [out] string LiteralMask );
-
-    //-------------------------------------------------------------------------
-
+    void getMasks( [out] string EditMask, 
+             [out] string LiteralMask ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the string value of the pattern field.
      */
-    [oneway] void setString( [in] string Str );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setString( [in] string Str ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set string value of the pattern field.
      */
-    string getString();
-
-    //-------------------------------------------------------------------------
-
+    string getString(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** determines if the format is checked during user input.
-     */
-    [oneway] void setStrictFormat( [in] boolean bStrict );
-
-    //-------------------------------------------------------------------------
-
+     */    
+    [oneway] void setStrictFormat( [in] boolean bStrict ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns whether the format is currently checked during user input.
-     */
+     */    
     boolean isStrictFormat();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XPointer.idl b/offapi/com/sun/star/awt/XPointer.idl
index 63e5f99944d9..983c461842a4 100644
--- a/offapi/com/sun/star/awt/XPointer.idl
+++ b/offapi/com/sun/star/awt/XPointer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XPointer_idl__
-#define __com_sun_star_awt_XPointer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XPointer_idl__ 
+#define __com_sun_star_awt_XPointer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to the type of mouse pointer.
  */
 published interface XPointer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** selects a <type>SystemPointer</type> for this mouse pointer.
      */
-    [oneway] void setType( [in] long nType );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setType( [in] long nType ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set <type>SystemPointer</type> of this mouse
         pointer.
      */
-    long getType();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    long getType(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XPopupMenu.idl b/offapi/com/sun/star/awt/XPopupMenu.idl
index 8ac7dc729b78..b92b17596836 100644
--- a/offapi/com/sun/star/awt/XPopupMenu.idl
+++ b/offapi/com/sun/star/awt/XPopupMenu.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,73 +24,73 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XPopupMenu_idl__
-#define __com_sun_star_awt_XPopupMenu_idl__
-
-#ifndef __com_sun_star_awt_XMenu_idl__
-#include <com/sun/star/awt/XMenu.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
-#include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
- published interface XWindowPeer;
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XPopupMenu_idl__ 
+#define __com_sun_star_awt_XPopupMenu_idl__ 
+ 
+#ifndef __com_sun_star_awt_XMenu_idl__ 
+#include <com/sun/star/awt/XMenu.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Rectangle_idl__ 
+#include <com/sun/star/awt/Rectangle.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+ published interface XWindowPeer; 
+ 
+//============================================================================= 
+ 
 /** controls a pop-up menu.
  */
 published interface XPopupMenu: XMenu
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** inserts a separator at the specified position.
      */
-    [oneway] void insertSeparator( [in] short nPos );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void insertSeparator( [in] short nPos ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the menu default item.
      */
-    [oneway] void setDefaultItem( [in] short nItemId );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setDefaultItem( [in] short nItemId ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the menu default item.
      */
-    short getDefaultItem();
-
-    //-------------------------------------------------------------------------
-
+    short getDefaultItem(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the state of the item to be checked or unchecked.
      */
-    [oneway] void checkItem( [in] short nItemId,
-             [in] boolean bCheck );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void checkItem( [in] short nItemId, 
+             [in] boolean bCheck ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns whether the item is checked or unchecked.
      */
-    boolean isItemChecked( [in] short nItemId );
-
-    //-------------------------------------------------------------------------
-
+    boolean isItemChecked( [in] short nItemId ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** executes the pop-up menu and returns the selected item
         or <code>0</code>, if canceled.
      */
-    short execute( [in] XWindowPeer Parent,
-             [in] Rectangle Area,
-             [in] short Direction );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    short execute( [in] XWindowPeer Parent, 
+             [in] Rectangle Area, 
+             [in] short Direction ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XPopupMenuExtended.idl b/offapi/com/sun/star/awt/XPopupMenuExtended.idl
index 0bd48ffd5858..ead6591ef990 100755
--- a/offapi/com/sun/star/awt/XPopupMenuExtended.idl
+++ b/offapi/com/sun/star/awt/XPopupMenuExtended.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/XPrinter.idl b/offapi/com/sun/star/awt/XPrinter.idl
index 4b600ad4ab01..b90bfcac938f 100644
--- a/offapi/com/sun/star/awt/XPrinter.idl
+++ b/offapi/com/sun/star/awt/XPrinter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XPrinter_idl__
-#define __com_sun_star_awt_XPrinter_idl__
-
-#ifndef __com_sun_star_awt_XPrinterPropertySet_idl__
-#include <com/sun/star/awt/XPrinterPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_awt_PrinterException_idl__
-#include <com/sun/star/awt/PrinterException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDevice_idl__
-#include <com/sun/star/awt/XDevice.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** represents a virtual printer.
-
+#ifndef __com_sun_star_awt_XPrinter_idl__ 
+#define __com_sun_star_awt_XPrinter_idl__ 
+ 
+#ifndef __com_sun_star_awt_XPrinterPropertySet_idl__ 
+#include <com/sun/star/awt/XPrinterPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_PrinterException_idl__ 
+#include <com/sun/star/awt/PrinterException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XDevice_idl__ 
+#include <com/sun/star/awt/XDevice.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** represents a virtual printer. 
+            
     <p>All properties are vetoable properties.
     If you change the properties between a call to
     <member scope="com::sun::star::awt">XPrinter::startPage</member> and a call
@@ -60,34 +60,34 @@
     thrown.</p>
  */
 published interface XPrinter: com::sun::star::awt::XPrinterPropertySet
-{
-    //-------------------------------------------------------------------------
-
-    /** puts the job into the printer spooler.
-
-        <p>This call may block the thread. So release all resources
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** puts the job into the printer spooler. 
+                        
+        <p>This call may block the thread. So release all resources 
         (mutex, semaphore, etc.) before this call.</p>
      */
-    boolean start( [in] string nJobName,
-             [in] short nCopies,
-             [in] boolean nCollate )
-            raises( com::sun::star::awt::PrinterException,
-                    com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-
+    boolean start( [in] string nJobName, 
+             [in] short nCopies, 
+             [in] boolean nCollate ) 
+            raises( com::sun::star::awt::PrinterException, 
+                    com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** notifies the printer spooler that the job is done and printing
         starts.
 
         @see terminate
      */
-    void end()
-            raises( com::sun::star::awt::PrinterException );
-
-    //-------------------------------------------------------------------------
-
-    /** stops the current print job.
-
+    void end() 
+            raises( com::sun::star::awt::PrinterException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** stops the current print job. 
+                        
         <p>If the method
         <member scope="com::sun::star::awt">XPrinter::end</member>
         is called beforehand, then this call does nothing. If you call
@@ -99,26 +99,26 @@ published interface XPrinter: com::sun::star::awt::XPrinterPropertySet
 
         @see end
      */
-    void terminate();
-
-    //-------------------------------------------------------------------------
-
+    void terminate(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** begins with a new page.
      */
-    com::sun::star::awt::XDevice startPage()
-            raises( com::sun::star::awt::PrinterException );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::XDevice startPage() 
+            raises( com::sun::star::awt::PrinterException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** ends the current page.
      */
-    void endPage()
-            raises( com::sun::star::awt::PrinterException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void endPage() 
+            raises( com::sun::star::awt::PrinterException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XPrinterPropertySet.idl b/offapi/com/sun/star/awt/XPrinterPropertySet.idl
index 9dde4b077fe6..5b1ed3d299d9 100644
--- a/offapi/com/sun/star/awt/XPrinterPropertySet.idl
+++ b/offapi/com/sun/star/awt/XPrinterPropertySet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,86 +24,86 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XPrinterPropertySet_idl__
-#define __com_sun_star_awt_XPrinterPropertySet_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
-#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XPrinterPropertySet_idl__ 
+#define __com_sun_star_awt_XPrinterPropertySet_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
+#include <com/sun/star/beans/PropertyVetoException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** represents an extended property set for printer properties.
-
+            
     <p>All properties are vetoable properties. If you change the properties
     between <member scope="com::sun::star::awt">XPrinter::startPage</member>
-    and <member scope="com::sun::star::awt">XPrinter::endPage</member>, a
-    <type scope="com::sun::star::beans">PropertyVetoException</type>
+    and <member scope="com::sun::star::awt">XPrinter::endPage</member>, a 
+    <type scope="com::sun::star::beans">PropertyVetoException</type> 
     is thrown.</p>
 
-    @see XPrinter
+    @see XPrinter 
     @see XInfoPrinter
  */
 published interface XPrinterPropertySet: com::sun::star::beans::XPropertySet
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the orientation.
      */
-    void setHorizontal( [in] boolean bHorizontal )
-            raises( com::sun::star::beans::PropertyVetoException,
-                    com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-
+    void setHorizontal( [in] boolean bHorizontal ) 
+            raises( com::sun::star::beans::PropertyVetoException, 
+                    com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns descriptions of all available printer forms.
      */
-    sequence<string> getFormDescriptions();
-
-    //-------------------------------------------------------------------------
-
-    /** sets the form that should be used.
-
+    sequence<string> getFormDescriptions(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** sets the form that should be used. 
+                        
         <p>Indirectly a printer is selected.</p>
      */
-    void selectForm( [in] string aFormDescription )
-            raises( com::sun::star::beans::PropertyVetoException,
-                    com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-
+    void selectForm( [in] string aFormDescription ) 
+            raises( com::sun::star::beans::PropertyVetoException, 
+                    com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns a binary encoded version of the printer setup.
      */
-    sequence<byte> getBinarySetup();
-
-    //-------------------------------------------------------------------------
-
-    /** sets the data specific to the printer driver.
-
+    sequence<byte> getBinarySetup(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** sets the data specific to the printer driver. 
+                        
         <p>Get this data from the info printer and set the data to the
         printer.</p>
      */
-    void setBinarySetup( [in] sequence<byte> data )
-            raises( com::sun::star::beans::PropertyVetoException,
-                    com::sun::star::lang::IllegalArgumentException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void setBinarySetup( [in] sequence<byte> data ) 
+            raises( com::sun::star::beans::PropertyVetoException, 
+                    com::sun::star::lang::IllegalArgumentException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XPrinterServer.idl b/offapi/com/sun/star/awt/XPrinterServer.idl
index 275590e3e665..78e550e7b1c7 100644
--- a/offapi/com/sun/star/awt/XPrinterServer.idl
+++ b/offapi/com/sun/star/awt/XPrinterServer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,61 +24,61 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XPrinterServer_idl__
-#define __com_sun_star_awt_XPrinterServer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XPrinter_idl__
-#include <com/sun/star/awt/XPrinter.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XInfoPrinter_idl__
-#include <com/sun/star/awt/XInfoPrinter.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XPrinterServer_idl__ 
+#define __com_sun_star_awt_XPrinterServer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XPrinter_idl__ 
+#include <com/sun/star/awt/XPrinter.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XInfoPrinter_idl__ 
+#include <com/sun/star/awt/XInfoPrinter.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** manages several printers on one machine.
  */
 published interface XPrinterServer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns a list of all available printer names.
      */
-    sequence<string> getPrinterNames();
-
-    //-------------------------------------------------------------------------
-
-    /** creates a new virtual printer.
-
+    sequence<string> getPrinterNames(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** creates a new virtual printer. 
+                        
         <p>You must call
         <member scope="com::sun::star::awt">XPrinter::start</member>
         to put the job into the printer spooler.</p>
      */
-    com::sun::star::awt::XPrinter createPrinter( [in] string printerName );
-
-    //-------------------------------------------------------------------------
-
-    /** creates a new information printer.
-
+    com::sun::star::awt::XPrinter createPrinter( [in] string printerName ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** creates a new information printer. 
+                        
         <p>You can get all information from this printer,
         but the printer cannot really print.</p>
      */
-    com::sun::star::awt::XInfoPrinter createInfoPrinter( [in] string printerName );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::awt::XInfoPrinter createInfoPrinter( [in] string printerName ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XProgressBar.idl b/offapi/com/sun/star/awt/XProgressBar.idl
index 6107c1211105..340e26903625 100644
--- a/offapi/com/sun/star/awt/XProgressBar.idl
+++ b/offapi/com/sun/star/awt/XProgressBar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,66 +24,66 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XProgressBar_idl__
-#define __com_sun_star_awt_XProgressBar_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
+#ifndef __com_sun_star_awt_XProgressBar_idl__ 
+#define __com_sun_star_awt_XProgressBar_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to the value and settings of a progress bar.
- */
+ */     
 published interface XProgressBar: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** sets the foreground color (RGB) of the control.
      */
-    [oneway] void setForegroundColor( [in] com::sun::star::util::Color Color );
-
+    [oneway] void setForegroundColor( [in] com::sun::star::util::Color Color ); 
+ 
     //-------------------------------------------------------------------------
 
     /** sets the background color (RGB) of the control.
      */
-    [oneway] void setBackgroundColor( [in] com::sun::star::util::Color Color );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setBackgroundColor( [in] com::sun::star::util::Color Color ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the minimum and the maximum progress value of the progress bar.
-
+                
         <p>If the minimum value is greater than the maximum value, the method
         exchanges the values automatically.</p>
      */
-    [oneway] void setRange( [in] long Min,
-             [in] long Max );
-
-    //-------------------------------------------------------------------------
+    [oneway] void setRange( [in] long Min, 
+             [in] long Max ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** sets the progress value of the progress bar.
      */
-    [oneway] void setValue( [in] long Value );
-
-    //-------------------------------------------------------------------------
+    [oneway] void setValue( [in] long Value ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns the current progress value of the progress bar.
      */
-    long getValue();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    long getValue(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XProgressMonitor.idl b/offapi/com/sun/star/awt/XProgressMonitor.idl
index 74cda157a017..fb51b1880882 100644
--- a/offapi/com/sun/star/awt/XProgressMonitor.idl
+++ b/offapi/com/sun/star/awt/XProgressMonitor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XProgressMonitor_idl__
-#define __com_sun_star_awt_XProgressMonitor_idl__
-
-#ifndef __com_sun_star_awt_XProgressBar_idl__
-#include <com/sun/star/awt/XProgressBar.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XProgressMonitor_idl__ 
+#define __com_sun_star_awt_XProgressMonitor_idl__ 
+ 
+#ifndef __com_sun_star_awt_XProgressBar_idl__ 
+#include <com/sun/star/awt/XProgressBar.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt { 
+ 
+//============================================================================= 
+ 
 /** gives access to the text of a progress monitor.
 
     @deprecated
  */
 published interface XProgressMonitor: com::sun::star::awt::XProgressBar
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** adds a new text line to the control.
      */
-    [oneway] void addText ( [in] string Topic, [in] string Text, [in] boolean beforeProgress ) ;
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addText ( [in] string Topic, [in] string Text, [in] boolean beforeProgress ) ; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes a text line from the control.
      */
-    [oneway] void removeText ( [in] string Topic, [in] boolean beforeProgress ) ;
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeText ( [in] string Topic, [in] boolean beforeProgress ) ; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** updates an existing text line at the control.
      */
-    [oneway] void updateText ( [in] string Topic, [in] string Text, [in] boolean beforeProgress ) ;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void updateText ( [in] string Topic, [in] string Text, [in] boolean beforeProgress ) ; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XRadioButton.idl b/offapi/com/sun/star/awt/XRadioButton.idl
index 18a05a9cb5fe..73261eb762d5 100644
--- a/offapi/com/sun/star/awt/XRadioButton.idl
+++ b/offapi/com/sun/star/awt/XRadioButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,63 +24,63 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XRadioButton_idl__
-#define __com_sun_star_awt_XRadioButton_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XItemListener_idl__
-#include <com/sun/star/awt/XItemListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XRadioButton_idl__ 
+#define __com_sun_star_awt_XRadioButton_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XItemListener_idl__ 
+#include <com/sun/star/awt/XItemListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to the state of a radio button and makes it possible
     to register item event listeners.
  */
 published interface XRadioButton: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** registers a listener for item events.
      */
-    [oneway] void addItemListener( [in] com::sun::star::awt::XItemListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addItemListener( [in] com::sun::star::awt::XItemListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** unregisters a listener for item events.
      */
-    [oneway] void removeItemListener( [in] com::sun::star::awt::XItemListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeItemListener( [in] com::sun::star::awt::XItemListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns <true/> if the button is checked, <false/> otherwise.
      */
-    boolean getState();
-
-    //-------------------------------------------------------------------------
-
+    boolean getState(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the state of the radio button.
      */
-    [oneway] void setState( [in] boolean b );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setState( [in] boolean b ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the label of the radio button.
      */
-    [oneway] void setLabel( [in] string Label );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void setLabel( [in] string Label ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XRegion.idl b/offapi/com/sun/star/awt/XRegion.idl
index eabc39ac6697..515071f443f2 100644
--- a/offapi/com/sun/star/awt/XRegion.idl
+++ b/offapi/com/sun/star/awt/XRegion.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,107 +24,107 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XRegion_idl__
-#define __com_sun_star_awt_XRegion_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
-#include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XRegion_idl__ 
+#define __com_sun_star_awt_XRegion_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Rectangle_idl__ 
+#include <com/sun/star/awt/Rectangle.idl> 
+#endif 
+
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** manages multiple rectangles which make up a region.
  */
 published interface XRegion: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the bounding box of the shape.
      */
-    Rectangle getBounds();
-
-    //-------------------------------------------------------------------------
-
+    Rectangle getBounds(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** makes this region an empty region.
      */
-    [oneway] void clear();
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void clear(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** moves this region by the specified horizontal and vertical delta.
      */
-    [oneway] void move( [in] long nHorzMove,
-             [in] long nVertMove );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void move( [in] long nHorzMove, 
+             [in] long nVertMove ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** adds the specified rectangle to this region.
      */
-    [oneway] void unionRectangle( [in] Rectangle Rect );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void unionRectangle( [in] Rectangle Rect ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** intersects the specified rectangle with the current region.
      */
-    [oneway] void intersectRectangle( [in] Rectangle Region );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void intersectRectangle( [in] Rectangle Region ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** removes the area of the specified rectangle from this region.
      */
-    [oneway] void excludeRectangle( [in] Rectangle Rect );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void excludeRectangle( [in] Rectangle Rect ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** applies an exclusive-or operation with the specified rectangle
         to this region.
      */
-    [oneway] void xOrRectangle( [in] Rectangle Rect );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void xOrRectangle( [in] Rectangle Rect ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** adds the specified region to this region.
      */
-    [oneway] void unionRegion( [in] XRegion Region );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void unionRegion( [in] XRegion Region ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** intersects the specified region with the current region.
      */
-    [oneway] void intersectRegion( [in] XRegion Region );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void intersectRegion( [in] XRegion Region ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** removes the area of the specified region from this region.
      */
-    [oneway] void excludeRegion( [in] XRegion Region );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void excludeRegion( [in] XRegion Region ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** applies an exclusive-or operation with the specified region
         to this region.
      */
-    [oneway] void xOrRegion( [in] XRegion Region );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void xOrRegion( [in] XRegion Region ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns all rectangles which are making up this region.
      */
-    sequence<Rectangle> getRectangles();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    sequence<Rectangle> getRectangles(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XRequestCallback.idl b/offapi/com/sun/star/awt/XRequestCallback.idl
index 8c047312ccb7..65d688d45a9f 100644
--- a/offapi/com/sun/star/awt/XRequestCallback.idl
+++ b/offapi/com/sun/star/awt/XRequestCallback.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,15 +28,15 @@
 #ifndef __com_sun_star_awt_XRequestCallback_idl__
 #define __com_sun_star_awt_XRequestCallback_idl__
 
-#ifndef __com_sun_star_awt_XCallback_idl__
-#include <com/sun/star/awt/XCallback.idl>
+#ifndef __com_sun_star_awt_XCallback_idl__ 
+#include <com/sun/star/awt/XCallback.idl> 
 #endif
 
 //=============================================================================
 
 module com { module sun { module star { module awt {
-
-//=============================================================================
+    
+//============================================================================= 
 
 /** specifies an interface which can be used to call back
     an implementation
@@ -44,7 +44,7 @@ module com { module sun { module star { module awt {
 interface XRequestCallback
 {
     //-------------------------------------------------------------------------
-
+    
     /** adds a callback request to the implementation
 
         @param aData
diff --git a/offapi/com/sun/star/awt/XReschedule.idl b/offapi/com/sun/star/awt/XReschedule.idl
index 7aaff1830b41..aa892845ace1 100644
--- a/offapi/com/sun/star/awt/XReschedule.idl
+++ b/offapi/com/sun/star/awt/XReschedule.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,27 +25,27 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_awt_XReschedule_idl__
-#define __com_sun_star_awt_XReschedulet_idl__
+#ifndef __com_sun_star_awt_XReschedule_idl__ 
+#define __com_sun_star_awt_XReschedulet_idl__ 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
 
-//=============================================================================
+//============================================================================= 
 
 module com {  module sun {  module star {  module awt {
 
 //=============================================================================
-
+    
 /** The <type>XReschedule</type> interface can be used to give control to the main
     thread to allow events processing.
 
     @deprecated
         This interface was only implemented in an intermediate developer
         release anyway.
-
+        
     @since OOo 2.0
 */
 published interface XReschedule : ::com::sun::star::uno::XInterface
@@ -53,8 +53,8 @@ published interface XReschedule : ::com::sun::star::uno::XInterface
     /** Allow the main thread to process some events.
     */
     void reschedule();
-};
-
+}; 
+ 
 }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XScrollBar.idl b/offapi/com/sun/star/awt/XScrollBar.idl
index 4a6c3e57e99c..83c1a67b3c99 100644
--- a/offapi/com/sun/star/awt/XScrollBar.idl
+++ b/offapi/com/sun/star/awt/XScrollBar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,127 +24,127 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XScrollBar_idl__
-#define __com_sun_star_awt_XScrollBar_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XAdjustmentListener_idl__
-#include <com/sun/star/awt/XAdjustmentListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XScrollBar_idl__ 
+#define __com_sun_star_awt_XScrollBar_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XAdjustmentListener_idl__ 
+#include <com/sun/star/awt/XAdjustmentListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to the value and settings of a scroll bar and makes it possible
     to register adjustment event listeners.
  */
 published interface XScrollBar: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** registers an adjustment event listener.
      */
-    [oneway] void addAdjustmentListener( [in] com::sun::star::awt::XAdjustmentListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addAdjustmentListener( [in] com::sun::star::awt::XAdjustmentListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** unregisters an adjustment event listener.
      */
-    [oneway] void removeAdjustmentListener( [in] com::sun::star::awt::XAdjustmentListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeAdjustmentListener( [in] com::sun::star::awt::XAdjustmentListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the scroll value of the scroll bar.
      */
-    [oneway] void setValue( [in] long n );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setValue( [in] long n ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the scroll value, visible area and maximum scroll value
         of the scroll bar.
      */
-    [oneway] void setValues( [in] long nValue,
-             [in] long nVisible,
-             [in] long nMax );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setValues( [in] long nValue, 
+             [in] long nVisible, 
+             [in] long nMax ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the current scroll value of the scroll bar.
      */
-    long getValue();
-
-    //-------------------------------------------------------------------------
-
+    long getValue(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the maximum scroll value of the scroll bar.
      */
-    [oneway] void setMaximum( [in] long n );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setMaximum( [in] long n ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set maximum scroll value of the scroll bar.
      */
-    long getMaximum();
-
-    //-------------------------------------------------------------------------
-
+    long getMaximum(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the increment for a single line move.
      */
-    [oneway] void setLineIncrement( [in] long n );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setLineIncrement( [in] long n ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set increment for a single line move.
      */
-    long getLineIncrement();
-
-    //-------------------------------------------------------------------------
-
+    long getLineIncrement(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the increment for a block move.
      */
-    [oneway] void setBlockIncrement( [in] long n );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setBlockIncrement( [in] long n ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set increment for a block move.
      */
-    long getBlockIncrement();
-
-    //-------------------------------------------------------------------------
-
+    long getBlockIncrement(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the visible size of the scroll bar.
      */
-    [oneway] void setVisibleSize( [in] long n );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setVisibleSize( [in] long n ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently visible size of the scroll bar.
      */
-    long getVisibleSize();
-
-    //-------------------------------------------------------------------------
-
+    long getVisibleSize(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the <type>ScrollBarOrientation</type> of the scroll bar.
      */
-    [oneway] void setOrientation( [in] long n );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setOrientation( [in] long n ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set <type>ScrollBarOrientation</type> of the
         scroll bar.
      */
-    long getOrientation();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    long getOrientation(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XSimpleAnimation.idl b/offapi/com/sun/star/awt/XSimpleAnimation.idl
index 1cfd758590b9..306d7d353b96 100644
--- a/offapi/com/sun/star/awt/XSimpleAnimation.idl
+++ b/offapi/com/sun/star/awt/XSimpleAnimation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/XSimpleTabController.idl b/offapi/com/sun/star/awt/XSimpleTabController.idl
index a49379d2ed61..04a0bd364fe4 100644
--- a/offapi/com/sun/star/awt/XSimpleTabController.idl
+++ b/offapi/com/sun/star/awt/XSimpleTabController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/XSpinField.idl b/offapi/com/sun/star/awt/XSpinField.idl
index 580472c8372f..ed41231b62e9 100644
--- a/offapi/com/sun/star/awt/XSpinField.idl
+++ b/offapi/com/sun/star/awt/XSpinField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,75 +24,75 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XSpinField_idl__
-#define __com_sun_star_awt_XSpinField_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XSpinListener_idl__
-#include <com/sun/star/awt/XSpinListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XSpinField_idl__ 
+#define __com_sun_star_awt_XSpinField_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XSpinListener_idl__ 
+#include <com/sun/star/awt/XSpinListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to the value of a spin field and makes it possible to
     register for spin events.
  */
 published interface XSpinField: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** registers a listener for spin events.
      */
-    [oneway] void addSpinListener( [in] com::sun::star::awt::XSpinListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addSpinListener( [in] com::sun::star::awt::XSpinListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** unregisters a listener for spin events.
      */
-    [oneway] void removeSpinListener( [in] com::sun::star::awt::XSpinListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeSpinListener( [in] com::sun::star::awt::XSpinListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** increases the value by one step.
      */
-    [oneway] void up();
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void up(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** decreases the value by one step.
      */
-    [oneway] void down();
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void down(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the value to the previously set lower value.
      */
-    [oneway] void first();
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void first(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the value to the previously set upper value.
      */
-    [oneway] void last();
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void last(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** enables/disables automatic repeat mode.
      */
-    [oneway] void enableRepeat( [in] boolean bRepeat );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void enableRepeat( [in] boolean bRepeat ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XSpinListener.idl b/offapi/com/sun/star/awt/XSpinListener.idl
index 05446c42d29e..28587336aac3 100644
--- a/offapi/com/sun/star/awt/XSpinListener.idl
+++ b/offapi/com/sun/star/awt/XSpinListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,56 +24,56 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XSpinListener_idl__
-#define __com_sun_star_awt_XSpinListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_SpinEvent_idl__
-#include <com/sun/star/awt/SpinEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XSpinListener_idl__ 
+#define __com_sun_star_awt_XSpinListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_SpinEvent_idl__ 
+#include <com/sun/star/awt/SpinEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive spin events.
  */
 published interface XSpinListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** is invoked when the spin field is spun up.
      */
-    [oneway] void up( [in] com::sun::star::awt::SpinEvent rEvent );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void up( [in] com::sun::star::awt::SpinEvent rEvent ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** is invoked when the spin field is spun down.
      */
-    [oneway] void down( [in] com::sun::star::awt::SpinEvent rEvent );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void down( [in] com::sun::star::awt::SpinEvent rEvent ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** is invoked when the spin field is set to the lower value.
      */
-    [oneway] void first( [in] com::sun::star::awt::SpinEvent rEvent );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void first( [in] com::sun::star::awt::SpinEvent rEvent ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** is invoked when the spin field is set to the upper value.
      */
-    [oneway] void last( [in] com::sun::star::awt::SpinEvent rEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void last( [in] com::sun::star::awt::SpinEvent rEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XSpinValue.idl b/offapi/com/sun/star/awt/XSpinValue.idl
index be02f115a2c2..f4ebdc0ec66a 100644
--- a/offapi/com/sun/star/awt/XSpinValue.idl
+++ b/offapi/com/sun/star/awt/XSpinValue.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/XStyleChangeListener.idl b/offapi/com/sun/star/awt/XStyleChangeListener.idl
index 819f211a737f..34679612c0bf 100644
--- a/offapi/com/sun/star/awt/XStyleChangeListener.idl
+++ b/offapi/com/sun/star/awt/XStyleChangeListener.idl
@@ -31,7 +31,7 @@
 
 //==================================================================================================================
 
-module com { module sun { module star { module awt {
+module com { module sun { module star { module awt { 
 
 //==================================================================================================================
 
diff --git a/offapi/com/sun/star/awt/XStyleSettings.idl b/offapi/com/sun/star/awt/XStyleSettings.idl
index 67c3bba7d8f1..fd188c432526 100644
--- a/offapi/com/sun/star/awt/XStyleSettings.idl
+++ b/offapi/com/sun/star/awt/XStyleSettings.idl
@@ -58,7 +58,7 @@ interface XStyleSettings
     /// specifies the color of the border of active windows
     [attribute] ::com::sun::star::util::Color ActiveBorderColor;
 
-    ///
+    /// 
     [attribute] ::com::sun::star::util::Color ActiveColor;
 
     /// specifies the color of the active tab of a tab control
@@ -97,10 +97,10 @@ interface XStyleSettings
     /// specifies the text color for disabled UI elements
     [attribute] ::com::sun::star::util::Color DisableColor;
 
-    ///
+    /// 
     [attribute] ::com::sun::star::util::Color FaceColor;
 
-    ///
+    /// 
     [attribute, readonly] ::com::sun::star::util::Color FaceGradientColor;
 
     /// specifies the background color for dialog input controls
diff --git a/offapi/com/sun/star/awt/XStyleSettingsSupplier.idl b/offapi/com/sun/star/awt/XStyleSettingsSupplier.idl
index cb60994ff894..4c1a3ed7d007 100644
--- a/offapi/com/sun/star/awt/XStyleSettingsSupplier.idl
+++ b/offapi/com/sun/star/awt/XStyleSettingsSupplier.idl
@@ -30,7 +30,7 @@
 
 //==================================================================================================================
 
-module com { module sun { module star { module awt {
+module com { module sun { module star { module awt { 
 
     interface XStyleSettings;
 
diff --git a/offapi/com/sun/star/awt/XSystemChildFactory.idl b/offapi/com/sun/star/awt/XSystemChildFactory.idl
index 1c61ccd05e74..f9ac89025b87 100644
--- a/offapi/com/sun/star/awt/XSystemChildFactory.idl
+++ b/offapi/com/sun/star/awt/XSystemChildFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,8 +36,8 @@
 //=============================================================================
 
 module com { module sun { module star { module awt {
-
-//=============================================================================
+    
+//============================================================================= 
 
  published interface XWindowPeer;
 
@@ -46,35 +46,35 @@ module com { module sun { module star { module awt {
 published interface XSystemChildFactory : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-
+    
     /** creates a system child window.
 
-        @returns
+        @returns 
         the created window.
 
         @param Parent
         a system-specific handle to a window.
-
+        
         <p>You must check the machine ID and the process ID.<BR>
         WIN32: HWND.<BR>
         WIN16: HWND.<BR>
-
+        
         JAVA: global reference to a java.awt.Component
         object provided from the JNI-API.<BR>
-
+        
         OS2: HWND.<BR>
         MAC: Not supported.<BR></p>
-
+        
         @param ProcessId
         the process identifier. Use the sal_getGlobalProcessId
         function of the RTL library.
-
+        
         @param SystemType
         one constant out of the constant group
         <type scope="com::sun::star::lang">SystemDependent</type>.
     */
      XWindowPeer createSystemChild( [in] any Parent, [in] sequence< byte > ProcessId, [in] short SystemType );
-
+     
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XSystemDependentMenuPeer.idl b/offapi/com/sun/star/awt/XSystemDependentMenuPeer.idl
index 4f77905a0cfd..77decad4b1ec 100644
--- a/offapi/com/sun/star/awt/XSystemDependentMenuPeer.idl
+++ b/offapi/com/sun/star/awt/XSystemDependentMenuPeer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XSystemDependentMenuPeer_idl__
-#define __com_sun_star_awt_XSystemDependentMenuPeer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
+#ifndef __com_sun_star_awt_XSystemDependentMenuPeer_idl__ 
+#define __com_sun_star_awt_XSystemDependentMenuPeer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
 #endif
 
 
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** provides access to the system dependent implementation of the window.
 
-    @see com::sun::star::lang::SystemDependent
-    @see WindowAttribute
+    @see com::sun::star::lang::SystemDependent 
+    @see WindowAttribute 
     @see WindowAttribute::SYSTEMDEPENDENT
  */
 interface XSystemDependentMenuPeer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns a system-specific window handle.
 
-        @returns
+        @returns  
         a system-specific handle to a menu
-        or 0 if the menu is not in the same process.
-
-        <p>You must check the machine ID and the process ID.<BR>
-        WIN32: Returns an HMENU if possible, otherwise 0.<BR>
-        WIN16: Returns an HMENU if possible, otherwise 0.<BR>
-
-        @param ProcessId
-        the process identifier. Use the sal_getGlobalProcessId
-        function of the RTL library.
-
-        @param SystemType
-        one constant out of the constant group
+        or 0 if the menu is not in the same process. 
+                 
+        <p>You must check the machine ID and the process ID.<BR> 
+        WIN32: Returns an HMENU if possible, otherwise 0.<BR> 
+        WIN16: Returns an HMENU if possible, otherwise 0.<BR> 
+                 
+        @param ProcessId 
+        the process identifier. Use the sal_getGlobalProcessId 
+        function of the RTL library. 
+                 
+        @param SystemType 
+        one constant out of the constant group 
         <type scope="com::sun::star::lang">SystemDependent</type>.
      */
-    any getMenuHandle( [in] sequence< byte > ProcessId, [in] short SystemType );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    any getMenuHandle( [in] sequence< byte > ProcessId, [in] short SystemType ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XSystemDependentWindowPeer.idl b/offapi/com/sun/star/awt/XSystemDependentWindowPeer.idl
index 9d1357fac9b6..71d3f086f7f9 100644
--- a/offapi/com/sun/star/awt/XSystemDependentWindowPeer.idl
+++ b/offapi/com/sun/star/awt/XSystemDependentWindowPeer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,64 +24,64 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XSystemDependentWindowPeer_idl__
-#define __com_sun_star_awt_XSystemDependentWindowPeer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
+#ifndef __com_sun_star_awt_XSystemDependentWindowPeer_idl__ 
+#define __com_sun_star_awt_XSystemDependentWindowPeer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
 #endif
 
 
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** provides access to the system dependent implementation of the window.
 
-    @see com::sun::star::lang::SystemDependent
-    @see WindowAttribute
+    @see com::sun::star::lang::SystemDependent 
+    @see WindowAttribute 
     @see WindowAttribute::SYSTEMDEPENDENT
  */
 published interface XSystemDependentWindowPeer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns a system-specific window handle.
 
         @returns
         a system-specific handle to a window
         or 0 if the window is not in the same process.
-
-        <p>You must check the machine ID and the process ID.<BR>
-        WIN32: Returns an HWND if possible, otherwise 0.<BR>
-        WIN16: Returns an HWND if possible, otherwise 0.<BR>
-
-        JAVA: Returns a global reference to a java.awt.Component
-        object provided from the JNI-API.<BR>
-
-        OS2: Returns an HWND if possible, otherwise 0.<BR>
-
-        MAC: Returns a ptr to the NSView implementing the window.<BR>
-
+                 
+        <p>You must check the machine ID and the process ID.<BR> 
+        WIN32: Returns an HWND if possible, otherwise 0.<BR> 
+        WIN16: Returns an HWND if possible, otherwise 0.<BR> 
+                 
+        JAVA: Returns a global reference to a java.awt.Component 
+        object provided from the JNI-API.<BR> 
+                 
+        OS2: Returns an HWND if possible, otherwise 0.<BR> 
+
+        MAC: Returns a ptr to the NSView implementing the window.<BR> 
+                 
         XWINDOW: Returns a structure SystemDependentXWindow
         or void if it is not reachable.<BR></p>
-
-        @param ProcessId
-        the process identifier. Use the sal_getGlobalProcessId
-        function of the RTL library.
-
-        @param SystemType
-        one constant out of the constant group
+                 
+        @param ProcessId 
+        the process identifier. Use the sal_getGlobalProcessId 
+        function of the RTL library. 
+                 
+        @param SystemType 
+        one constant out of the constant group 
         <type scope="com::sun::star::lang">SystemDependent</type>.
      */
-    any getWindowHandle( [in] sequence< byte > ProcessId, [in] short SystemType );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    any getWindowHandle( [in] sequence< byte > ProcessId, [in] short SystemType ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XTabController.idl b/offapi/com/sun/star/awt/XTabController.idl
index c5d36ed8238f..5f9d1a1367c1 100644
--- a/offapi/com/sun/star/awt/XTabController.idl
+++ b/offapi/com/sun/star/awt/XTabController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,96 +24,96 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XTabController_idl__
-#define __com_sun_star_awt_XTabController_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTabControllerModel_idl__
-#include <com/sun/star/awt/XTabControllerModel.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControlContainer_idl__
-#include <com/sun/star/awt/XControlContainer.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControl_idl__
-#include <com/sun/star/awt/XControl.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XTabController_idl__ 
+#define __com_sun_star_awt_XTabController_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XTabControllerModel_idl__ 
+#include <com/sun/star/awt/XTabControllerModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XControlContainer_idl__ 
+#include <com/sun/star/awt/XControlContainer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XControl_idl__ 
+#include <com/sun/star/awt/XControl.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the basic operations for a tab controller.
  */
 published interface XTabController: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+    
     /** sets the tab controller model.
      */
-    [oneway] void setModel( [in] com::sun::star::awt::XTabControllerModel Model );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setModel( [in] com::sun::star::awt::XTabControllerModel Model ); 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** returns the tab controller model.
      */
-    com::sun::star::awt::XTabControllerModel getModel();
-
+    com::sun::star::awt::XTabControllerModel getModel(); 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** set the control container.
      */
-    [oneway] void setContainer( [in] com::sun::star::awt::XControlContainer Container );
-
+    [oneway] void setContainer( [in] com::sun::star::awt::XControlContainer Container ); 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** returns the control container.
      */
-    com::sun::star::awt::XControlContainer getContainer();
-
+    com::sun::star::awt::XControlContainer getContainer(); 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** returns all controls of the control container.
      */
-    sequence<com::sun::star::awt::XControl> getControls();
-
+    sequence<com::sun::star::awt::XControl> getControls(); 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** enables automatic tab order.
      */
-    [oneway] void autoTabOrder();
-
+    [oneway] void autoTabOrder(); 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** activates tab order.
      */
-    [oneway] void activateTabOrder();
-
-    //-------------------------------------------------------------------------
+    [oneway] void activateTabOrder(); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** sets the focus to the first control that can be reached with the
-        TAB key.
+        TAB key.    
      */
-    [oneway] void activateFirst();
-
+    [oneway] void activateFirst(); 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** sets the focus to the last control that can be reached with the
-        TAB key.
+        TAB key.    
      */
-    [oneway] void activateLast();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void activateLast(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XTabControllerModel.idl b/offapi/com/sun/star/awt/XTabControllerModel.idl
index 275a72d379ed..f4a9af7f0d85 100644
--- a/offapi/com/sun/star/awt/XTabControllerModel.idl
+++ b/offapi/com/sun/star/awt/XTabControllerModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,84 +24,84 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XTabControllerModel_idl__
-#define __com_sun_star_awt_XTabControllerModel_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControlModel_idl__
-#include <com/sun/star/awt/XControlModel.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XTabControllerModel_idl__ 
+#define __com_sun_star_awt_XTabControllerModel_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XControlModel_idl__ 
+#include <com/sun/star/awt/XControlModel.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the basic operations for a tab controller model.
  */
 published interface XTabControllerModel: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** returns whether the control models are grouped together.
      */
-    boolean getGroupControl();
-
-    //-------------------------------------------------------------------------
+    boolean getGroupControl(); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** determines if the control models are grouped together.
      */
-    [oneway] void setGroupControl( [in] boolean GroupControl );
-
-    //-------------------------------------------------------------------------
+    [oneway] void setGroupControl( [in] boolean GroupControl ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** sets the control models.
      */
-    [oneway] void setControlModels( [in] sequence<com::sun::star::awt::XControlModel> Controls );
-
-    //-------------------------------------------------------------------------
+    [oneway] void setControlModels( [in] sequence<com::sun::star::awt::XControlModel> Controls ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns the control models.
      */
-    sequence<com::sun::star::awt::XControlModel> getControlModels();
-
-    //-------------------------------------------------------------------------
+    sequence<com::sun::star::awt::XControlModel> getControlModels(); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** sets a control model group.
      */
-    [oneway] void setGroup( [in] sequence<com::sun::star::awt::XControlModel> Group,
-             [in] string GroupName );
-
-    //-------------------------------------------------------------------------
+    [oneway] void setGroup( [in] sequence<com::sun::star::awt::XControlModel> Group, 
+             [in] string GroupName ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns the number of control model groups.
      */
-    long getGroupCount();
-
-    //-------------------------------------------------------------------------
+    long getGroupCount(); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns a control model group.
      */
-    void getGroup( [in] long nGroup,
-             [out] sequence<com::sun::star::awt::XControlModel> Group,
-             [out] string Name );
-
-    //-------------------------------------------------------------------------
+    void getGroup( [in] long nGroup, 
+             [out] sequence<com::sun::star::awt::XControlModel> Group, 
+             [out] string Name ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns a control model group by name.
      */
-    void getGroupByName( [in] string Name,
-             [out] sequence<com::sun::star::awt::XControlModel> Group );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void getGroupByName( [in] string Name, 
+             [out] sequence<com::sun::star::awt::XControlModel> Group ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XTabListener.idl b/offapi/com/sun/star/awt/XTabListener.idl
index e7018bb284af..4939b84cf92b 100644
--- a/offapi/com/sun/star/awt/XTabListener.idl
+++ b/offapi/com/sun/star/awt/XTabListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/XTextArea.idl b/offapi/com/sun/star/awt/XTextArea.idl
index 051a74901303..bbec7a7a80bc 100644
--- a/offapi/com/sun/star/awt/XTextArea.idl
+++ b/offapi/com/sun/star/awt/XTextArea.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XTextArea_idl__
-#define __com_sun_star_awt_XTextArea_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XTextArea_idl__ 
+#define __com_sun_star_awt_XTextArea_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to the text in a control.
  */
 published interface XTextArea: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the text lines as a single string with line separators.
      */
-    string getTextLines();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string getTextLines(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XTextComponent.idl b/offapi/com/sun/star/awt/XTextComponent.idl
index 92bbc8e8d219..b2d4b27b727b 100644
--- a/offapi/com/sun/star/awt/XTextComponent.idl
+++ b/offapi/com/sun/star/awt/XTextComponent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,110 +24,110 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XTextComponent_idl__
-#define __com_sun_star_awt_XTextComponent_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTextListener_idl__
-#include <com/sun/star/awt/XTextListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Selection_idl__
-#include <com/sun/star/awt/Selection.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XTextComponent_idl__ 
+#define __com_sun_star_awt_XTextComponent_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XTextListener_idl__ 
+#include <com/sun/star/awt/XTextListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Selection_idl__ 
+#include <com/sun/star/awt/Selection.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to the text of a component and makes it possible
     to register event listeners.
  */
 published interface XTextComponent: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** registers a text event listener.
      */
-    [oneway] void addTextListener( [in] com::sun::star::awt::XTextListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addTextListener( [in] com::sun::star::awt::XTextListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** unregisters a text event listener.
      */
-    [oneway] void removeTextListener( [in] com::sun::star::awt::XTextListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeTextListener( [in] com::sun::star::awt::XTextListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the text of the component.
      */
-    [oneway] void setText( [in] string aText );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setText( [in] string aText ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** inserts text at the specified position.
      */
-    [oneway] void insertText( [in] com::sun::star::awt::Selection Sel,
-             [in] string Text );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void insertText( [in] com::sun::star::awt::Selection Sel, 
+             [in] string Text ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the text of the component.
      */
-    string getText();
-
-    //-------------------------------------------------------------------------
-
-    /** returns the currently selected text.
+    string getText(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** returns	the currently selected text.
      */
-    string getSelectedText();
-
-    //-------------------------------------------------------------------------
-
+    string getSelectedText(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the user selection.
      */
-    [oneway] void setSelection( [in] com::sun::star::awt::Selection aSelection );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setSelection( [in] com::sun::star::awt::Selection aSelection ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the current user selection.
      */
-    com::sun::star::awt::Selection getSelection();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Selection getSelection(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns if the text is editable by the user.
      */
-    boolean isEditable();
-
-    //-------------------------------------------------------------------------
-
+    boolean isEditable(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** makes the text editable for the user or read-only.
      */
-    [oneway] void setEditable( [in] boolean bEditable );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setEditable( [in] boolean bEditable ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the maximum text length.
      */
-    [oneway] void setMaxTextLen( [in] short nLen );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setMaxTextLen( [in] short nLen ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently set maximum text length.
      */
-    short getMaxTextLen();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    short getMaxTextLen(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XTextEditField.idl b/offapi/com/sun/star/awt/XTextEditField.idl
index b2898a72c6c7..3357acf8879d 100644
--- a/offapi/com/sun/star/awt/XTextEditField.idl
+++ b/offapi/com/sun/star/awt/XTextEditField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XTextEditField_idl__
-#define __com_sun_star_awt_XTextEditField_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XTextEditField_idl__ 
+#define __com_sun_star_awt_XTextEditField_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** is used for password fields.
  */
 published interface XTextEditField: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the character to display as a substitute on user input.
      */
-    [oneway] void setEchoChar( [in] char cEcho );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void setEchoChar( [in] char cEcho ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XTextLayoutConstrains.idl b/offapi/com/sun/star/awt/XTextLayoutConstrains.idl
index 144c8646b472..6eccbacab4f9 100644
--- a/offapi/com/sun/star/awt/XTextLayoutConstrains.idl
+++ b/offapi/com/sun/star/awt/XTextLayoutConstrains.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XTextLayoutConstrains_idl__
-#define __com_sun_star_awt_XTextLayoutConstrains_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
-#include <com/sun/star/awt/Size.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XTextLayoutConstrains_idl__ 
+#define __com_sun_star_awt_XTextLayoutConstrains_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Size_idl__ 
+#include <com/sun/star/awt/Size.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the layout constraints for a text field.
  */
 published interface XTextLayoutConstrains: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the minimum size for a given number of columns and lines.
      */
-    com::sun::star::awt::Size getMinimumSize( [in] short nCols,
-             [in] short nLines );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Size getMinimumSize( [in] short nCols, 
+             [in] short nLines ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the ideal number of columns and lines for displaying this text.
      */
-    void getColumnsAndLines( [out] short nCols, [out] short nLines );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void getColumnsAndLines( [out] short nCols, [out] short nLines ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XTextListener.idl b/offapi/com/sun/star/awt/XTextListener.idl
index cd476068b1ef..e04453c51ca2 100644
--- a/offapi/com/sun/star/awt/XTextListener.idl
+++ b/offapi/com/sun/star/awt/XTextListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XTextListener_idl__
-#define __com_sun_star_awt_XTextListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_TextEvent_idl__
-#include <com/sun/star/awt/TextEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XTextListener_idl__ 
+#define __com_sun_star_awt_XTextListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_TextEvent_idl__ 
+#include <com/sun/star/awt/TextEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive text change events.
  */
 published interface XTextListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** is invoked when the text has changed.
      */
-    [oneway] void textChanged( [in] com::sun::star::awt::TextEvent rEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void textChanged( [in] com::sun::star::awt::TextEvent rEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XThrobber.idl b/offapi/com/sun/star/awt/XThrobber.idl
index 0a4ac133524a..5d421a36d9c4 100644
--- a/offapi/com/sun/star/awt/XThrobber.idl
+++ b/offapi/com/sun/star/awt/XThrobber.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/XTimeField.idl b/offapi/com/sun/star/awt/XTimeField.idl
index d2efddd4fa2b..c102a55914f4 100644
--- a/offapi/com/sun/star/awt/XTimeField.idl
+++ b/offapi/com/sun/star/awt/XTimeField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,118 +24,118 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XTimeField_idl__
-#define __com_sun_star_awt_XTimeField_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XTimeField_idl__ 
+#define __com_sun_star_awt_XTimeField_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to the value and settings of a time field.
  */
 published interface XTimeField: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the time value which is displayed in the time field.
 
         <p>The time value must be specified in the format HHMMSShh,
         where HH are hours, MM are minutes, SS are seconds and hh are
-        hundredth seconds.</p>
+        hundredth seconds.</p>    
      */
-    [oneway] void setTime( [in] long Time );
-
+    [oneway] void setTime( [in] long Time ); 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** returns the time value which is currently displayed in the time field.
      */
-    long getTime();
-
-    //-------------------------------------------------------------------------
+    long getTime(); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** sets the minimum time value that can be entered by the user.
-     */
-    [oneway] void setMin( [in] long Time );
-
-    //-------------------------------------------------------------------------
+     */    
+    [oneway] void setMin( [in] long Time ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns the currently set minimum time value that can be entered by
         the user.
-     */
-    long getMin();
-
-    //-------------------------------------------------------------------------
+     */    
+    long getMin(); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** sets the maximum time value that can be entered by the user.
-     */
-    [oneway] void setMax( [in] long Time );
-
-    //-------------------------------------------------------------------------
+     */    
+    [oneway] void setMax( [in] long Time ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns the currently set maximum time value that can be entered by
         the user.
-     */
-    long getMax();
-
-    //-------------------------------------------------------------------------
+     */    
+    long getMax(); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** sets the first value to be set on POS1 key.
-     */
-    [oneway] void setFirst( [in] long Time );
-
-    //-------------------------------------------------------------------------
+     */	
+    [oneway] void setFirst( [in] long Time ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns the currently set first value which is set on POS1 key.
-     */
-    long getFirst();
-
+     */    
+    long getFirst(); 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** sets the last value to be set on END key.
-     */
-    [oneway] void setLast( [in] long Time );
-
-    //-------------------------------------------------------------------------
+     */    
+    [oneway] void setLast( [in] long Time ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns the currently set last value which is set on END key.
-     */
-    long getLast();
-
-    //-------------------------------------------------------------------------
+     */    
+    long getLast(); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** sets an empty value for the time.
-     */
-    void setEmpty();
-
-    //-------------------------------------------------------------------------
+     */    
+    void setEmpty(); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns whether currently an empty value is set for the time.
-     */
-    boolean isEmpty();
-
+     */    
+    boolean isEmpty(); 
+ 
     //-------------------------------------------------------------------------
-
+    
     /** determines if the format is checked during user input.
-     */
-    [oneway] void setStrictFormat( [in] boolean bStrict );
-
-    //-------------------------------------------------------------------------
+     */    
+    [oneway] void setStrictFormat( [in] boolean bStrict ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns whether the format is currently checked during user input.
-     */
-    boolean isStrictFormat();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+     */    
+    boolean isStrictFormat(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XToggleButton.idl b/offapi/com/sun/star/awt/XToggleButton.idl
index 447eebd5806c..5b551687aa25 100644
--- a/offapi/com/sun/star/awt/XToggleButton.idl
+++ b/offapi/com/sun/star/awt/XToggleButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XToggleButton_idl__
-#define __com_sun_star_awt_XToggleButton_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XItemEventBroadcaster_idl__
-#include <com/sun/star/awt/XItemEventBroadcaster.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XToggleButton_idl__ 
+#define __com_sun_star_awt_XToggleButton_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XItemEventBroadcaster_idl__ 
+#include <com/sun/star/awt/XItemEventBroadcaster.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** is supported by buttons which can be toggled between a "pressed" and an "unpressed" state
 
     <p>Changes in the toggle state are broadcasted to <type>XItemListener</type> instances.</p>
  */
 interface XToggleButton: XItemEventBroadcaster
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XToolkit.idl b/offapi/com/sun/star/awt/XToolkit.idl
index c92d928403ce..cb3a6d2dc0a8 100644
--- a/offapi/com/sun/star/awt/XToolkit.idl
+++ b/offapi/com/sun/star/awt/XToolkit.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,95 +24,95 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XToolkit_idl__
-#define __com_sun_star_awt_XToolkit_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
-#include <com/sun/star/awt/XWindowPeer.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
-#include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_awt_WindowDescriptor_idl__
-#include <com/sun/star/awt/WindowDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XDevice_idl__
-#include <com/sun/star/awt/XDevice.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XRegion_idl__
-#include <com/sun/star/awt/XRegion.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** specifies a factory interface for the window toolkit.
-
+#ifndef __com_sun_star_awt_XToolkit_idl__ 
+#define __com_sun_star_awt_XToolkit_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XWindowPeer_idl__ 
+#include <com/sun/star/awt/XWindowPeer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Rectangle_idl__ 
+#include <com/sun/star/awt/Rectangle.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_WindowDescriptor_idl__ 
+#include <com/sun/star/awt/WindowDescriptor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XDevice_idl__ 
+#include <com/sun/star/awt/XDevice.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XRegion_idl__ 
+#include <com/sun/star/awt/XRegion.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** specifies a factory interface for the window toolkit. 
+         
     <p>This is similar to the abstract window toolkit (AWT) in Java.</p>
  */
 published interface XToolkit: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the desktop window.
      */
-    com::sun::star::awt::XWindowPeer getDesktopWindow();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::XWindowPeer getDesktopWindow(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the complete work area for this toolkit.
      */
-    com::sun::star::awt::Rectangle getWorkArea();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Rectangle getWorkArea(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** creates a new window using the given descriptor.
      */
-    com::sun::star::awt::XWindowPeer createWindow( [in] com::sun::star::awt::WindowDescriptor Descriptor )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-
-    /** returns a sequence of windows which are newly created using the
+    com::sun::star::awt::XWindowPeer createWindow( [in] com::sun::star::awt::WindowDescriptor Descriptor ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** returns a sequence of windows which are newly created using the 
         given descriptors.
      */
-    sequence<com::sun::star::awt::XWindowPeer> createWindows(
-            [in] sequence<com::sun::star::awt::WindowDescriptor> Descriptors )
-        raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-
+    sequence<com::sun::star::awt::XWindowPeer> createWindows(  
+            [in] sequence<com::sun::star::awt::WindowDescriptor> Descriptors ) 
+        raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** creates a virtual device that is compatible with the screen.
      */
-    com::sun::star::awt::XDevice createScreenCompatibleDevice( [in] long Width,
-             [in] long Height );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::XDevice createScreenCompatibleDevice( [in] long Width, 
+             [in] long Height ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** creates a region.
      */
-    com::sun::star::awt::XRegion createRegion();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::awt::XRegion createRegion(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XTopWindow.idl b/offapi/com/sun/star/awt/XTopWindow.idl
index e74fc7e7ae7a..31bfe04d17e2 100644
--- a/offapi/com/sun/star/awt/XTopWindow.idl
+++ b/offapi/com/sun/star/awt/XTopWindow.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,70 +24,70 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XTopWindow_idl__
-#define __com_sun_star_awt_XTopWindow_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTopWindowListener_idl__
-#include <com/sun/star/awt/XTopWindowListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMenuBar_idl__
-#include <com/sun/star/awt/XMenuBar.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
-/** manages the functionality specific for a top window.
+#ifndef __com_sun_star_awt_XTopWindow_idl__ 
+#define __com_sun_star_awt_XTopWindow_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XTopWindowListener_idl__ 
+#include <com/sun/star/awt/XTopWindowListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XMenuBar_idl__ 
+#include <com/sun/star/awt/XMenuBar.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
+/** manages the functionality specific for a top window. 	
  */
 published interface XTopWindow: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** adds the specified top window listener to receive window events from
         this window.
      */
-    [oneway] void addTopWindowListener( [in] com::sun::star::awt::XTopWindowListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addTopWindowListener( [in] com::sun::star::awt::XTopWindowListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified top window listener so that it no longer
         receives window events from this window.
      */
-    [oneway] void removeTopWindowListener( [in] com::sun::star::awt::XTopWindowListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeTopWindowListener( [in] com::sun::star::awt::XTopWindowListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** places this window at the top of the stacking order and
         shows it in front of any other windows.
      */
-    [oneway] void toFront();
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void toFront(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** places this window at the bottom of the stacking order and
         makes the corresponding adjustment to other visible windows.
      */
-    [oneway] void toBack();
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void toBack(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets a menu bar.
      */
-    [oneway] void setMenuBar( [in] com::sun::star::awt::XMenuBar xMenu );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void setMenuBar( [in] com::sun::star::awt::XMenuBar xMenu ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XTopWindow2.idl b/offapi/com/sun/star/awt/XTopWindow2.idl
index d06d1273bad8..078a7d5aa726 100644
--- a/offapi/com/sun/star/awt/XTopWindow2.idl
+++ b/offapi/com/sun/star/awt/XTopWindow2.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module awt {
+module com { module sun { module star { module awt { 
 
 //=============================================================================
 
@@ -70,7 +70,7 @@ interface XTopWindow2 : XTopWindow
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/XTopWindowListener.idl b/offapi/com/sun/star/awt/XTopWindowListener.idl
index cf78ff343839..c25d71299fde 100644
--- a/offapi/com/sun/star/awt/XTopWindowListener.idl
+++ b/offapi/com/sun/star/awt/XTopWindowListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,78 +24,78 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XTopWindowListener_idl__
-#define __com_sun_star_awt_XTopWindowListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XTopWindowListener_idl__ 
+#define __com_sun_star_awt_XTopWindowListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive window events.
 
     @see XActivateListener
  */
 published interface XTopWindowListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a window has been opened.
      */
-    [oneway] void windowOpened( [in] com::sun::star::lang::EventObject e );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void windowOpened( [in] com::sun::star::lang::EventObject e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a window is in the process of being closed.
-
+                        
         <p>The close operation can be overridden at this point.</p>
      */
-    [oneway] void windowClosing( [in] com::sun::star::lang::EventObject e );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void windowClosing( [in] com::sun::star::lang::EventObject e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a window has been closed.
      */
-    [oneway] void windowClosed( [in] com::sun::star::lang::EventObject e );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void windowClosed( [in] com::sun::star::lang::EventObject e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a window is iconified.
      */
-    [oneway] void windowMinimized( [in] com::sun::star::lang::EventObject e );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void windowMinimized( [in] com::sun::star::lang::EventObject e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a window is de-iconified.
      */
-    [oneway] void windowNormalized( [in] com::sun::star::lang::EventObject e );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void windowNormalized( [in] com::sun::star::lang::EventObject e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a window is activated.
      */
-    [oneway] void windowActivated( [in] com::sun::star::lang::EventObject e );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void windowActivated( [in] com::sun::star::lang::EventObject e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a window is de-activated.
      */
-    [oneway] void windowDeactivated( [in] com::sun::star::lang::EventObject e );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void windowDeactivated( [in] com::sun::star::lang::EventObject e ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XUnitConversion.idl b/offapi/com/sun/star/awt/XUnitConversion.idl
index b04802ee0728..c6b0a8350d01 100644
--- a/offapi/com/sun/star/awt/XUnitConversion.idl
+++ b/offapi/com/sun/star/awt/XUnitConversion.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,12 +24,12 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XUnitConversion_idl__
-#define __com_sun_star_awt_XUnitConversion_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_awt_XUnitConversion_idl__ 
+#define __com_sun_star_awt_XUnitConversion_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
 #ifndef __com_sun_star_awt_Point_idl__
 #include <com/sun/star/awt/Point.idl>
@@ -43,18 +43,18 @@
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
 
 /** allows converting between different measurement units
 
     @since OOo 3.0
  */
 interface XUnitConversion: com::sun::star::uno::XInterface
-{
+{ 
     /** converts the given <type>Point</type>, which is specified in pixels, into the given logical unit
 
         @param Point
@@ -81,7 +81,7 @@ interface XUnitConversion: com::sun::star::uno::XInterface
     com::sun::star::awt::Point convertPointToPixel( [in] com::sun::star::awt::Point aPoint, [in] short SourceUnit )
             raises ( com::sun::star::lang::IllegalArgumentException );
 
-
+ 
     /** converts the given <type>Size</type>, which is specified in pixels, into the given logical unit
 
         @param aSize
@@ -108,11 +108,11 @@ interface XUnitConversion: com::sun::star::uno::XInterface
     com::sun::star::awt::Size convertSizeToPixel( [in] com::sun::star::awt::Size aSize, [in] short SourceUnit )
             raises ( com::sun::star::lang::IllegalArgumentException );
 
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XUnoControlContainer.idl b/offapi/com/sun/star/awt/XUnoControlContainer.idl
index 2d28b7152246..7b572e25adb0 100644
--- a/offapi/com/sun/star/awt/XUnoControlContainer.idl
+++ b/offapi/com/sun/star/awt/XUnoControlContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,56 +24,56 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XUnoControlContainer_idl__
-#define __com_sun_star_awt_XUnoControlContainer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTabController_idl__
-#include <com/sun/star/awt/XTabController.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XUnoControlContainer_idl__ 
+#define __com_sun_star_awt_XUnoControlContainer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XTabController_idl__ 
+#include <com/sun/star/awt/XTabController.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to the tab controllers of a <type>UnoControlContainer</type>.
  */
 published interface XUnoControlContainer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** sets a set of tab controllers.
      */
-    [oneway] void setTabControllers( [in] sequence<com::sun::star::awt::XTabController> TabControllers );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setTabControllers( [in] sequence<com::sun::star::awt::XTabController> TabControllers ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns all currently specified tab controllers.
      */
-    sequence<com::sun::star::awt::XTabController> getTabControllers();
-
-    //-------------------------------------------------------------------------
-
+    sequence<com::sun::star::awt::XTabController> getTabControllers(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** adds a single tab controller.
      */
-    [oneway] void addTabController( [in] com::sun::star::awt::XTabController TabController );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addTabController( [in] com::sun::star::awt::XTabController TabController ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** removes a single tab controller.
      */
-    [oneway] void removeTabController( [in] com::sun::star::awt::XTabController TabController );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void removeTabController( [in] com::sun::star::awt::XTabController TabController ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XUserInputInterception.idl b/offapi/com/sun/star/awt/XUserInputInterception.idl
index 18e2ff643db4..cfecff9d92d4 100644
--- a/offapi/com/sun/star/awt/XUserInputInterception.idl
+++ b/offapi/com/sun/star/awt/XUserInputInterception.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ module com {  module sun {  module star {  module awt {
 
 /** Interface to add handlers for key and mouse events. A handler is not a passive
    listener, it can even consume the event.
-
+   
     @since OOo 1.1.2
  */
 published interface XUserInputInterception : ::com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/awt/XVclContainer.idl b/offapi/com/sun/star/awt/XVclContainer.idl
index 9126ad18f912..5f544bf7cf14 100644
--- a/offapi/com/sun/star/awt/XVclContainer.idl
+++ b/offapi/com/sun/star/awt/XVclContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,58 +24,58 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XVclContainer_idl__
-#define __com_sun_star_awt_XVclContainer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XVclContainerListener_idl__
-#include <com/sun/star/awt/XVclContainerListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
-#include <com/sun/star/awt/XWindow.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XVclContainer_idl__ 
+#define __com_sun_star_awt_XVclContainer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XVclContainerListener_idl__ 
+#include <com/sun/star/awt/XVclContainerListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XWindow_idl__ 
+#include <com/sun/star/awt/XWindow.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** represents a VCL container window.
-
+                                                    
     @deprecated
  */
 published interface XVclContainer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** adds the specified container listener to receive
         container events from this container.
      */
-    [oneway] void addVclContainerListener( [in] com::sun::star::awt::XVclContainerListener l );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addVclContainerListener( [in] com::sun::star::awt::XVclContainerListener l ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified container listener so that it
         no longer receives container events from this container.
      */
-    [oneway] void removeVclContainerListener( [in] com::sun::star::awt::XVclContainerListener l );
-
-    //-------------------------------------------------------------------------
+    [oneway] void removeVclContainerListener( [in] com::sun::star::awt::XVclContainerListener l ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns all windows.
      */
-    sequence<com::sun::star::awt::XWindow> getWindows();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    sequence<com::sun::star::awt::XWindow> getWindows(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XVclContainerListener.idl b/offapi/com/sun/star/awt/XVclContainerListener.idl
index 160972dd3036..9b41dd60234b 100644
--- a/offapi/com/sun/star/awt/XVclContainerListener.idl
+++ b/offapi/com/sun/star/awt/XVclContainerListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XVclContainerListener_idl__
-#define __com_sun_star_awt_XVclContainerListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_VclContainerEvent_idl__
-#include <com/sun/star/awt/VclContainerEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XVclContainerListener_idl__ 
+#define __com_sun_star_awt_XVclContainerListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_VclContainerEvent_idl__ 
+#include <com/sun/star/awt/VclContainerEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive container events.
-
-    <p>Container events are provided <strong>only</strong> for
+            
+    <p>Container events are provided <strong>only</strong> for 
     notification purposes. The VCL will automatically handle
     add and remove operations internally.</p>
-
+            
     @deprecated
  */
 published interface XVclContainerListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a window has been added to the VCL container window.
      */
-    [oneway] void windowAdded( [in] com::sun::star::awt::VclContainerEvent e );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void windowAdded( [in] com::sun::star::awt::VclContainerEvent e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a window has been removed from the VCL container
         window.
      */
-    [oneway] void windowRemoved( [in] com::sun::star::awt::VclContainerEvent e );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void windowRemoved( [in] com::sun::star::awt::VclContainerEvent e ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XVclContainerPeer.idl b/offapi/com/sun/star/awt/XVclContainerPeer.idl
index 363e580ac7dc..b3ec1e68ec94 100644
--- a/offapi/com/sun/star/awt/XVclContainerPeer.idl
+++ b/offapi/com/sun/star/awt/XVclContainerPeer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XVclContainerPeer_idl__
-#define __com_sun_star_awt_XVclContainerPeer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindow_idl__
-#include <com/sun/star/awt/XWindow.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XVclContainerPeer_idl__ 
+#define __com_sun_star_awt_XVclContainerPeer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XWindow_idl__ 
+#include <com/sun/star/awt/XWindow.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to the VCL container window implementation.
-
+    
     @deprecated
  */
 published interface XVclContainerPeer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** enable as dialog control.
      */
-    [oneway] void enableDialogControl( [in] boolean bEnable );
-
-    //-------------------------------------------------------------------------
+    [oneway] void enableDialogControl( [in] boolean bEnable ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** sets the tab order.
      */
-    [oneway] void setTabOrder( [in] sequence<com::sun::star::awt::XWindow> WindowOrder,
-             [in] sequence<any> Tabs,
-             [in] boolean GroupControl );
-
-    //-------------------------------------------------------------------------
+    [oneway] void setTabOrder( [in] sequence<com::sun::star::awt::XWindow> WindowOrder, 
+             [in] sequence<any> Tabs, 
+             [in] boolean GroupControl ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** sets a group.
      */
-    [oneway] void setGroup( [in] sequence<com::sun::star::awt::XWindow> Windows );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void setGroup( [in] sequence<com::sun::star::awt::XWindow> Windows ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XVclWindowPeer.idl b/offapi/com/sun/star/awt/XVclWindowPeer.idl
index 1e5e03b58b1f..d0d14c5e8f53 100644
--- a/offapi/com/sun/star/awt/XVclWindowPeer.idl
+++ b/offapi/com/sun/star/awt/XVclWindowPeer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,98 +24,98 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XVclWindowPeer_idl__
-#define __com_sun_star_awt_XVclWindowPeer_idl__
-
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
-#include <com/sun/star/awt/XWindowPeer.idl>
-#endif
-
+#ifndef __com_sun_star_awt_XVclWindowPeer_idl__ 
+#define __com_sun_star_awt_XVclWindowPeer_idl__ 
+ 
+#ifndef __com_sun_star_awt_XWindowPeer_idl__ 
+#include <com/sun/star/awt/XWindowPeer.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** gives access to the VCL window implementation.
 
     @deprecated
  */
 published interface XVclWindowPeer: com::sun::star::awt::XWindowPeer
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** returns <true/> if the window peer is a child, <false/> otherwise.
-     */
-    boolean isChild( [in] com::sun::star::awt::XWindowPeer Peer );
-
-    //-------------------------------------------------------------------------
-
+     */    
+    boolean isChild( [in] com::sun::star::awt::XWindowPeer Peer ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the design mode for use in a design editor.
      */
-    [oneway] void setDesignMode( [in] boolean bOn );
-
-    //-------------------------------------------------------------------------
+    [oneway] void setDesignMode( [in] boolean bOn ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns <true/> if the window peer is in design mode,
         <false/> otherwise.
-     */
-    boolean isDesignMode();
-
-    //-------------------------------------------------------------------------
+     */    
+    boolean isDesignMode(); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** enables clipping of sibling windows.
      */
-    [oneway] void enableClipSiblings( [in] boolean bClip );
-
-    //-------------------------------------------------------------------------
+    [oneway] void enableClipSiblings( [in] boolean bClip ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** sets the foreground color.
      */
-    [oneway] void setForeground( [in] com::sun::star::util::Color Color );
-
-    //-------------------------------------------------------------------------
+    [oneway] void setForeground( [in] com::sun::star::util::Color Color ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** sets the control font.
      */
-    [oneway] void setControlFont( [in] com::sun::star::awt::FontDescriptor aFont );
-
-    //-------------------------------------------------------------------------
+    [oneway] void setControlFont( [in] com::sun::star::awt::FontDescriptor aFont ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns the font, foreground and background color for the specified
         type.
      */
-    void getStyles( [in] short nType,
-             [out] com::sun::star::awt::FontDescriptor Font,
-             [out] com::sun::star::util::Color ForegroundColor,
-             [out] com::sun::star::util::Color BackgroundColor );
-
-    //-------------------------------------------------------------------------
-
+    void getStyles( [in] short nType, 
+             [out] com::sun::star::awt::FontDescriptor Font, 
+             [out] com::sun::star::util::Color ForegroundColor, 
+             [out] com::sun::star::util::Color BackgroundColor ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the value of the property with the specified name.
      */
-    void setProperty( [in] string PropertyName,
-             [in] any Value );
-
-    //-------------------------------------------------------------------------
+    void setProperty( [in] string PropertyName, 
+             [in] any Value ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** returns the value of the property with the specified name.
      */
-    any getProperty( [in] string PropertyName );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    any getProperty( [in] string PropertyName ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XView.idl b/offapi/com/sun/star/awt/XView.idl
index f1092d71446a..3cbb9c5b6a80 100644
--- a/offapi/com/sun/star/awt/XView.idl
+++ b/offapi/com/sun/star/awt/XView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,78 +24,78 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XView_idl__
-#define __com_sun_star_awt_XView_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XGraphics_idl__
-#include <com/sun/star/awt/XGraphics.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
-#include <com/sun/star/awt/Size.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XView_idl__ 
+#define __com_sun_star_awt_XView_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XGraphics_idl__ 
+#include <com/sun/star/awt/XGraphics.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Size_idl__ 
+#include <com/sun/star/awt/Size.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to attach an output device to the object.
-
+            
     <p>This kind of object is called view-object.</p>
  */
 published interface XView: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the output device.
      */
-    boolean setGraphics( [in] com::sun::star::awt::XGraphics aDevice );
-
-    //-------------------------------------------------------------------------
-
-    /** returns the output device which was set using the method
+    boolean setGraphics( [in] com::sun::star::awt::XGraphics aDevice ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** returns the output device which was set using the method 
         <member>XView::setGraphics</member>.
      */
-    com::sun::star::awt::XGraphics getGraphics();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::XGraphics getGraphics(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the size of the object in device units.
 
-        <p>A device must be set before.</p>
+        <p>A device must be set before.</p>				 
      */
-    com::sun::star::awt::Size getSize();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Size getSize(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** draws the object at the specified position.
-
+                        
         <p>If the output should be clipped, the caller has to set the
         clipping region.</p>
      */
-    [oneway] void draw( [in] long nX,
-             [in] long nY );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void draw( [in] long nX, 
+             [in] long nY ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the zoom factor.
-
+                        
         <p>The zoom factor only affects the content of the view, not the size.</p>
      */
-    [oneway] void setZoom( [in] float fZoomX,
-             [in] float fZoomY );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void setZoom( [in] float fZoomX, 
+             [in] float fZoomY ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XWindow.idl b/offapi/com/sun/star/awt/XWindow.idl
index 7742fd7b284d..801cb6a86788 100644
--- a/offapi/com/sun/star/awt/XWindow.idl
+++ b/offapi/com/sun/star/awt/XWindow.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,59 +24,59 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XWindow_idl__
-#define __com_sun_star_awt_XWindow_idl__
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
-#include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindowListener_idl__
-#include <com/sun/star/awt/XWindowListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XFocusListener_idl__
-#include <com/sun/star/awt/XFocusListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XKeyListener_idl__
-#include <com/sun/star/awt/XKeyListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMouseListener_idl__
-#include <com/sun/star/awt/XMouseListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMouseMotionListener_idl__
-#include <com/sun/star/awt/XMouseMotionListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XPaintListener_idl__
-#include <com/sun/star/awt/XPaintListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XWindow_idl__ 
+#define __com_sun_star_awt_XWindow_idl__ 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Rectangle_idl__ 
+#include <com/sun/star/awt/Rectangle.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XWindowListener_idl__ 
+#include <com/sun/star/awt/XWindowListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XFocusListener_idl__ 
+#include <com/sun/star/awt/XFocusListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XKeyListener_idl__ 
+#include <com/sun/star/awt/XKeyListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XMouseListener_idl__ 
+#include <com/sun/star/awt/XMouseListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XMouseMotionListener_idl__ 
+#include <com/sun/star/awt/XMouseMotionListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XPaintListener_idl__ 
+#include <com/sun/star/awt/XPaintListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies the basic operations for a window component.
-
-    <p>A window is a rectangular region on an output device with
+        
+    <p>A window is a rectangular region on an output device with 
     its own position, size, and internal coordinate system.
     A window is used for displaying data. In addition, the window
     receives events from the user.</p>
  */
 published interface XWindow: com::sun::star::lang::XComponent
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the outer bounds of the window.
 
         @param X
@@ -93,118 +93,118 @@ published interface XWindow: com::sun::star::lang::XComponent
 
         @param Flags
         Flags are of type <type>PosSize</type> and specify, which parameters
-        are taken into account when setting the outer bounds of the window.
+        are taken into account when setting the outer bounds of the window.    
     */
-    [oneway] void setPosSize( [in] long X,
-             [in] long Y,
-             [in] long Width,
-             [in] long Height,
-             [in] short Flags );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setPosSize( [in] long X, 
+             [in] long Y, 
+             [in] long Width, 
+             [in] long Height, 
+             [in] short Flags ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the outer bounds of the window.
      */
-    com::sun::star::awt::Rectangle getPosSize();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Rectangle getPosSize(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** shows or hides the window depending on the parameter.
      */
-    [oneway] void setVisible( [in] boolean Visible );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setVisible( [in] boolean Visible ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** enables or disables the window depending on the parameter.
      */
-    [oneway] void setEnable( [in] boolean Enable );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setEnable( [in] boolean Enable ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the focus to the window.
      */
-    [oneway] void setFocus();
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setFocus(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** adds a window listener to the object.
 
         @param xListener
             the listener to add. If this listener also supports the <type>XWindowListener2</type> interface,
             it will receive the additional events declared in XWindowListener2.
      */
-    [oneway] void addWindowListener( [in] com::sun::star::awt::XWindowListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addWindowListener( [in] com::sun::star::awt::XWindowListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified window listener from the listener list.
      */
-    [oneway] void removeWindowListener( [in] com::sun::star::awt::XWindowListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeWindowListener( [in] com::sun::star::awt::XWindowListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** adds a focus listener to the object.
      */
-    [oneway] void addFocusListener( [in] com::sun::star::awt::XFocusListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addFocusListener( [in] com::sun::star::awt::XFocusListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified focus listener from the listener list.
      */
-    [oneway] void removeFocusListener( [in] com::sun::star::awt::XFocusListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeFocusListener( [in] com::sun::star::awt::XFocusListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** adds a key listener to the object.
      */
-    [oneway] void addKeyListener( [in] com::sun::star::awt::XKeyListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addKeyListener( [in] com::sun::star::awt::XKeyListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified key listener from the listener list.
      */
-    [oneway] void removeKeyListener( [in] com::sun::star::awt::XKeyListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeKeyListener( [in] com::sun::star::awt::XKeyListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** adds a mouse listener to the object.
      */
-    [oneway] void addMouseListener( [in] com::sun::star::awt::XMouseListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addMouseListener( [in] com::sun::star::awt::XMouseListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified mouse listener from the listener list.
      */
-    [oneway] void removeMouseListener( [in] com::sun::star::awt::XMouseListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeMouseListener( [in] com::sun::star::awt::XMouseListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** adds a mouse motion listener to the object.
      */
-    [oneway] void addMouseMotionListener( [in] com::sun::star::awt::XMouseMotionListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addMouseMotionListener( [in] com::sun::star::awt::XMouseMotionListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified mouse motion listener from the listener list.
      */
-    [oneway] void removeMouseMotionListener( [in] com::sun::star::awt::XMouseMotionListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void removeMouseMotionListener( [in] com::sun::star::awt::XMouseMotionListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** adds a paint listener to the object.
      */
-    [oneway] void addPaintListener( [in] com::sun::star::awt::XPaintListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addPaintListener( [in] com::sun::star::awt::XPaintListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified paint listener from the listener list.
      */
-    [oneway] void removePaintListener( [in] com::sun::star::awt::XPaintListener xListener );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void removePaintListener( [in] com::sun::star::awt::XPaintListener xListener ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XWindow2.idl b/offapi/com/sun/star/awt/XWindow2.idl
index 0116ff88943b..e755c02dd8a7 100644
--- a/offapi/com/sun/star/awt/XWindow2.idl
+++ b/offapi/com/sun/star/awt/XWindow2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,79 +24,79 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XWindow2_idl__
-#define __com_sun_star_awt_XWindow2_idl__
-
-#ifndef __com_sun_star_awt_XWindow_idl__
-#include <com/sun/star/awt/XWindow.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
-#include <com/sun/star/awt/Size.idl>
-#endif
-
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XWindow2_idl__ 
+#define __com_sun_star_awt_XWindow2_idl__ 
+ 
+#ifndef __com_sun_star_awt_XWindow_idl__ 
+#include <com/sun/star/awt/XWindow.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Size_idl__ 
+#include <com/sun/star/awt/Size.idl> 
+#endif 
+ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** specifies some extended operations for a window component.
-
-    <p>A window is a rectangular region on an output device with
+        
+    <p>A window is a rectangular region on an output device with 
     its own position, size, and internal coordinate system.
     A window is used for displaying data. In addition, the window
     receives events from the user.</p>
  */
 published interface XWindow2: com::sun::star::awt::XWindow
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the inner bounds of the window, also known as the client size
 
         @param Size
         the inner width and height of the window.
 
     */
-    void setOutputSize( [in] com::sun::star::awt::Size aSize );
-
-    //-------------------------------------------------------------------------
-
+    void setOutputSize( [in] com::sun::star::awt::Size aSize ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the inner bounds of the window, also known as the client size.
      */
-    com::sun::star::awt::Size getOutputSize();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Size getOutputSize(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the visibility state of the window
      */
-    boolean isVisible();
-
-    //-------------------------------------------------------------------------
-
+    boolean isVisible(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the activation state of the window
      */
-    boolean isActive();
-
-    //-------------------------------------------------------------------------
-
+    boolean isActive(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the enabled state of the window
      */
-    boolean isEnabled();
-
-    //-------------------------------------------------------------------------
-
+    boolean isEnabled(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the focus state of the window
      */
-    boolean hasFocus();
-
-    //-------------------------------------------------------------------------
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean hasFocus(); 
+ 
+    //------------------------------------------------------------------------- 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XWindowListener.idl b/offapi/com/sun/star/awt/XWindowListener.idl
index 2b7fb824d6fc..3119cb9c23ee 100644
--- a/offapi/com/sun/star/awt/XWindowListener.idl
+++ b/offapi/com/sun/star/awt/XWindowListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,65 +24,65 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XWindowListener_idl__
-#define __com_sun_star_awt_XWindowListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_WindowEvent_idl__
-#include <com/sun/star/awt/WindowEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_XWindowListener_idl__ 
+#define __com_sun_star_awt_XWindowListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_WindowEvent_idl__ 
+#include <com/sun/star/awt/WindowEvent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive window events.
-
-    <p>Component events are provided <strong>only</strong> for
-    notification purposes.  Moves and resizes will be handled
-    internally by the window component, so that GUI layout works properly
+            
+    <p>Component events are provided <strong>only</strong> for 
+    notification purposes.  Moves and resizes will be handled 
+    internally by the window component, so that GUI layout works properly 
     regardless of whether a program registers such a listener or not.</p>
  */
 published interface XWindowListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the window has been resized.
      */
-    [oneway] void windowResized( [in] com::sun::star::awt::WindowEvent e );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void windowResized( [in] com::sun::star::awt::WindowEvent e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the window has been moved.
      */
-    [oneway] void windowMoved( [in] com::sun::star::awt::WindowEvent e );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void windowMoved( [in] com::sun::star::awt::WindowEvent e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the window has been shown.
      */
-    [oneway] void windowShown( [in] com::sun::star::lang::EventObject e );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void windowShown( [in] com::sun::star::lang::EventObject e ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the window has been hidden.
      */
-    [oneway] void windowHidden( [in] com::sun::star::lang::EventObject e );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void windowHidden( [in] com::sun::star::lang::EventObject e ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/XWindowListener2.idl b/offapi/com/sun/star/awt/XWindowListener2.idl
index 1313246664ef..65336239ada6 100644
--- a/offapi/com/sun/star/awt/XWindowListener2.idl
+++ b/offapi/com/sun/star/awt/XWindowListener2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/awt/XWindowPeer.idl b/offapi/com/sun/star/awt/XWindowPeer.idl
index cc734d0c8784..58a4ac8cdb42 100644
--- a/offapi/com/sun/star/awt/XWindowPeer.idl
+++ b/offapi/com/sun/star/awt/XWindowPeer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,70 +24,70 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
-#define __com_sun_star_awt_XWindowPeer_idl__
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
+#ifndef __com_sun_star_awt_XWindowPeer_idl__ 
+#define __com_sun_star_awt_XWindowPeer_idl__ 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
 
-#ifndef __com_sun_star_awt_Rectangle_idl__
-#include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
- published interface XToolkit;
- published interface XPointer;
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_Rectangle_idl__ 
+#include <com/sun/star/awt/Rectangle.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module awt {  
+ 
+ published interface XToolkit; 
+ published interface XPointer; 
+ 
+//============================================================================= 
+ 
 /** gives access to the actual window implementation on the device.
  */
 published interface XWindowPeer: com::sun::star::lang::XComponent
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the toolkit which created this object.
      */
-    XToolkit getToolkit();
-
-    //-------------------------------------------------------------------------
-
+    XToolkit getToolkit(); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the mouse pointer.
      */
-    [oneway] void setPointer( [in] XPointer Pointer );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setPointer( [in] XPointer Pointer ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** sets the background color.
      */
-    [oneway] void setBackground( [in] com::sun::star::util::Color Color );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setBackground( [in] com::sun::star::util::Color Color ); 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** invalidates the whole window with the specified
         <type>InvalidateStyle</type>.
      */
-    [oneway] void invalidate( [in] short Flags );
-
-    //-------------------------------------------------------------------------
-
-    /** invalidates a rectangular area of the window with the specified
+    [oneway] void invalidate( [in] short Flags ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** invalidates a rectangular area of the window with the specified 
         <type>InvalidateStyle</type>.
      */
-    [oneway] void invalidateRect( [in] Rectangle Rect, [in] short Flags );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void invalidateRect( [in] Rectangle Rect, [in] short Flags ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
index db69a6b5d842..cad071b3e96d 100644
--- a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,27 +26,27 @@
  ************************************************************************/
 #ifndef __com_sun_star_awt_DefaultGridColumnModel_idl__
 #define __com_sun_star_awt_DefaultGridColumnModel_idl__
-
-#ifndef __com_sun_star_awt_grid_XGridColumnModel_idl__
-#include <com/sun/star/awt/grid/XGridColumnModel.idl>
+ 
+#ifndef __com_sun_star_awt_grid_XGridColumnModel_idl__ 
+#include <com/sun/star/awt/grid/XGridColumnModel.idl> 
 #endif
 
-//=============================================================================
-
+//============================================================================= 
+ 
  module com {  module sun {  module star {  module awt {  module grid {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** If you do not want to implement the <type>XGridColumnModel</type> yourself, use this service.
     @since OOo 3.3.0
- */
+ */ 
 service DefaultGridColumnModel
-{
+{ 
     interface com::sun::star::awt::grid::XGridColumnModel;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; };};
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
index c487afc79b49..c4f866e58c43 100644
--- a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
+++ b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,28 +26,28 @@
  ************************************************************************/
 #ifndef __com_sun_star_awt_DefaultGridDataModel_idl__
 #define __com_sun_star_awt_DefaultGridDataModel_idl__
-
-#ifndef __com_sun_star_awt_grid_XGridDataModel_idl__
-#include <com/sun/star/awt/grid/XGridDataModel.idl>
+ 
+#ifndef __com_sun_star_awt_grid_XGridDataModel_idl__ 
+#include <com/sun/star/awt/grid/XGridDataModel.idl> 
 #endif
 
-//=============================================================================
-
+//============================================================================= 
+ 
  module com {  module sun {  module star {  module awt {  module grid {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** If you do not want to implement the <type>XGridDataModel</type> yourself, use this service.
 
     @since OOo 3.3.0
- */
+ */ 
 service DefaultGridDataModel
-{
+{ 
     interface com::sun::star::awt::grid::XGridDataModel;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; };};
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/GridColumn.idl b/offapi/com/sun/star/awt/grid/GridColumn.idl
index a87aef84f7d3..d5dd5f2cc907 100644
--- a/offapi/com/sun/star/awt/grid/GridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumn.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,28 +26,28 @@
  ************************************************************************/
 #ifndef __com_sun_star_awt_GridColumn_idl__
 #define __com_sun_star_awt_GridColumn_idl__
-
-#ifndef __com_sun_star_awt_grid_XGridColumn_idl__
-#include <com/sun/star/awt/grid/XGridColumn.idl>
+ 
+#ifndef __com_sun_star_awt_grid_XGridColumn_idl__ 
+#include <com/sun/star/awt/grid/XGridColumn.idl> 
 #endif
 
-//=============================================================================
-
+//============================================================================= 
+ 
  module com {  module sun {  module star {  module awt {  module grid {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** Represents a column as used by the <type>DefaultGridColumnModel</type>
 
     @since OOo 3.3.0
- */
+ */ 
 service GridColumn
-{
+{ 
     interface com::sun::star::awt::grid::XGridColumn;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; };};
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
index caab721185a5..3ee38f50e5fc 100644
--- a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_GridColumnEvent_idl__
-#define __com_sun_star_awt_grid_GridColumnEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module awt { module grid {
-
-//=============================================================================
+#ifndef __com_sun_star_awt_grid_GridColumnEvent_idl__ 
+#define __com_sun_star_awt_grid_GridColumnEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid { 
+ 
+//============================================================================= 
 /** An event used by a <type>XGridColumn</type> to notify changes in the column.
 
     @since OOo 3.3.0
- */
+ */ 
 struct GridColumnEvent: com::sun::star::lang::EventObject
-{
+{ 
     /** Contains the property name of the changed value **/
     string valueName;
 
     /** Contains the old value **/
-    any oldValue;
+    any oldValue; 
 
     /** Contains the new value **/
     any newValue;
 
     /** Contains the index of the changed column**/
     long index;
-    //-------------------------------------------------------------------------
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    //------------------------------------------------------------------------- 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/GridControlEvent.idl b/offapi/com/sun/star/awt/grid/GridControlEvent.idl
index ce8736fb1b93..18e9958e0e33 100644
--- a/offapi/com/sun/star/awt/grid/GridControlEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridControlEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_GridControlEvent_idl__
-#define __com_sun_star_awt_GridControlEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module awt { module grid {
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_GridControlEvent_idl__ 
+#define __com_sun_star_awt_GridControlEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid {  
+ 
+//============================================================================= 
+ 
 
 struct GridControlEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
-    string ActionCommand;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+{ 
+    //------------------------------------------------------------------------- 
+        
+    string ActionCommand; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/GridDataEvent.idl b/offapi/com/sun/star/awt/grid/GridDataEvent.idl
index 1e0afb610f16..b406c33f4fd9 100644
--- a/offapi/com/sun/star/awt/grid/GridDataEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridDataEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,17 +24,17 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_GridDataEvent_idl__
-#define __com_sun_star_awt_grid_GridDataEvent_idl__
-
-#include <com/sun/star/lang/EventObject.idl>
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_grid_GridDataEvent_idl__ 
+#define __com_sun_star_awt_grid_GridDataEvent_idl__ 
+ 
+#include <com/sun/star/lang/EventObject.idl> 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt {  module grid {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** An event used by a <type>XGridDataModel</type> to notify changes in the data
     model to the <type>XGridControl</type>.
     You usually need to fill this event only if you implement the <type>XGridDataModel</type>
@@ -45,16 +45,16 @@ module com {  module sun {  module star {  module awt {  module grid {
     @see XGridDataListener
 
     @sonce OOo 3.3.0
- */
+ */ 
 struct GridDataEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** Contains the property name of the changed value **/
     string valueName;
 
     /** Contains the old value **/
-    any oldValue;
+    any oldValue; 
 
     /** Contains the new value **/
     any newValue;
@@ -63,16 +63,16 @@ struct GridDataEvent: com::sun::star::lang::EventObject
     long index;
 
     /** Contains the header name of the changed row**/
-    string headerName;
+    string headerName; 
 
     /** Contains the changed row**/
     sequence<any> rowData;
 
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl b/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl
index af1f90dfdc8b..e2d44d346131 100644
--- a/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl
+++ b/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,32 +27,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_GridInvalidDataException_idl__
-#define __com_sun_star_awt_grid_GridInvalidDataException_idl__
-
-#ifndef __com_sun_star_uno_RuntimeException_idl__
-#include <com/sun/star/uno/RuntimeException.idl>
+#ifndef __com_sun_star_awt_grid_GridInvalidDataException_idl__ 
+#define __com_sun_star_awt_grid_GridInvalidDataException_idl__ 
+ 
+#ifndef __com_sun_star_uno_RuntimeException_idl__ 
+#include <com/sun/star/uno/RuntimeException.idl> 
 #endif
 
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt { module grid {
-
-//=============================================================================
-
-/** Exception is thrown to indicate that set data is invalid, e.g. type of data is unknown
-    or data count doesn't match with column count.
-
+ 
+//============================================================================= 
+ 
+/** Exception is thrown to indicate that set data is invalid, e.g. type of data is unknown 
+    or data count doesn't match with column count. 
+    
     @since OOo 3.3.0
  */
 exception GridInvalidDataException : com::sun::star::uno::RuntimeException
 {
-
-};
-
-//=============================================================================
-
+    
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl b/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl
index 9d96daf624bb..71e79d5fa825 100644
--- a/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl
+++ b/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,31 +27,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_GridInvalidModelException_idl__
-#define __com_sun_star_awt_grid_GridInvalidModelException_idl__
-
-#ifndef __com_sun_star_uno_RuntimeException_idl__
-#include <com/sun/star/uno/RuntimeException.idl>
+#ifndef __com_sun_star_awt_grid_GridInvalidModelException_idl__ 
+#define __com_sun_star_awt_grid_GridInvalidModelException_idl__ 
+ 
+#ifndef __com_sun_star_uno_RuntimeException_idl__ 
+#include <com/sun/star/uno/RuntimeException.idl> 
 #endif
 
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt { module grid {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** Exception is thrown when data or column model isn't set.
 
     @since OOo 3.3.0
  */
 exception GridInvalidModelException : com::sun::star::uno::RuntimeException
 {
-
-};
-
-//=============================================================================
-
+    
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
index e9b87c2fe7ed..6802e3c869a3 100644
--- a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_GridSelectionEvent_idl__
-#define __com_sun_star_awt_GridSelectionEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_awt_grid_SelectionEventType_idl__
-#include <com/sun/star/awt/grid/SelectionEventType.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module awt { module grid {
-
-//=============================================================================
+#ifndef __com_sun_star_awt_GridSelectionEvent_idl__ 
+#define __com_sun_star_awt_GridSelectionEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_grid_SelectionEventType_idl__ 
+#include <com/sun/star/awt/grid/SelectionEventType.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid {  
+ 
+//============================================================================= 
 
 /** An event used by a <type>XGridControl</type> to notify changes in the selection.
 
     @see XGridControl
     @see XGridSelectionListener
- */
+ */  
 struct GridSelectionEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** the selected row*/
-    long Row;
+    long Row; 
 
     /** the selected column*/
     long Column;
@@ -61,11 +61,11 @@ struct GridSelectionEvent: com::sun::star::lang::EventObject
 
     /** Contains the action <type>SelectionEventType</types> that was performed **/
     SelectionEventType Action;
-
-};
-
-//=============================================================================
-
+ 
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/ScrollBarMode.idl b/offapi/com/sun/star/awt/grid/ScrollBarMode.idl
index d22cd8f30c78..d0bf44ff8d90 100644
--- a/offapi/com/sun/star/awt/grid/ScrollBarMode.idl
+++ b/offapi/com/sun/star/awt/grid/ScrollBarMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_ScrollBarMode_idl__
-#define __com_sun_star_awt_grid_ScrollBarMode_idl__
-
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_grid_ScrollBarMode_idl__ 
+#define __com_sun_star_awt_grid_ScrollBarMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt {  module grid {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** specifies the adjustment type.
  */
 enum ScrollBarMode
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+    
     /** adjustment is originated by a line jump.
 
-        <p>A line jump can, for example, be caused by a click on
+        <p>A line jump can, for example, be caused by a click on 
         one of the pointer buttons.</p>
      */
-    AUTO,
-
-    //-------------------------------------------------------------------------
-
+    AUTO, 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** adjustment is originated by a page jump.
-
-        <p>A page jump can, for example, be caused by a click in the
+        
+        <p>A page jump can, for example, be caused by a click in the 
         background area of the scrollbar (neither one of the pointer
         buttons, nor the thumb).</p>
      */
@@ -60,11 +60,11 @@ enum ScrollBarMode
     OFF
 
 
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/SelectionEventType.idl b/offapi/com/sun/star/awt/grid/SelectionEventType.idl
index c7ee61498cc3..0f922e82f155 100644
--- a/offapi/com/sun/star/awt/grid/SelectionEventType.idl
+++ b/offapi/com/sun/star/awt/grid/SelectionEventType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_SelectionEventType_idl__
-#define __com_sun_star_awt_grid_SelectionEventType_idl__
-
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_grid_SelectionEventType_idl__ 
+#define __com_sun_star_awt_grid_SelectionEventType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt {  module grid {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** specifies the type of a selection event, as used by
     <type>GridSelectionEvent</type>.
- */
+ */ 
 enum SelectionEventType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+    
     /** This value indicates that a selection was added to the grid control
      */
-    ADD,
-
-    //-------------------------------------------------------------------------
-
+    ADD, 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** This value indicates that a selection was removed from the grid control
      */
     REMOVE,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** This value indicates that a selection was changed
      */
-    CHANGE
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    CHANGE 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
index 542c27085dcb..87a26ba96f76 100644
--- a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
+++ b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,29 +26,29 @@
  ************************************************************************/
 #ifndef __com_sun_star_awt_UnoControlGrid_idl__
 #define __com_sun_star_awt_UnoControlGrid_idl__
-
-#ifndef __com_sun_star_awt_UnoControl_idl__
-#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_grid_XGridControl_idl__
-#include <com/sun/star/awt/grid/XGridControl.idl>
+ 
+#ifndef __com_sun_star_awt_UnoControl_idl__ 
+#include <com/sun/star/awt/UnoControl.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_grid_XGridControl_idl__ 
+#include <com/sun/star/awt/grid/XGridControl.idl> 
 #endif
 
-//=============================================================================
-
+//============================================================================= 
+ 
  module com {  module sun {  module star {  module awt {  module grid {
-
-//=============================================================================
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+//============================================================================= 
+ 
 /** A control that displays a set of tabular data.
 
     <p>
     <h4>The Column Model</h4>
     <p>The horizontal structure of the grid is defined by the <type>XGridColumnModel</type> implemented in <type>DefaultGridColumnModel</type>
-    The <type>XGridColumn</type> implemented in <typeGridColumn</type> describes the properties and behavior of a single column. Use the <member>XGridColumnModel::addColumn()</member> to add a column to the column model.
+    The <type>XGridColumn</type> implemented in <typeGridColumn</type> describes the properties and behavior of a single column. Use the <member>XGridColumnModel::addColumn()</member> to add a column to the column model.  
     </p>
     <p>
     <h4>The Data Model</h4>
@@ -69,14 +69,14 @@
     @since OOo 3.3.0
  */
 service UnoControlGrid
-{
-    service com::sun::star::awt::UnoControl;
-
+{ 
+    service com::sun::star::awt::UnoControl; 
+    
     interface com::sun::star::awt::grid::XGridControl;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; };};
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
index 7eea49624045..ce2c8d5eb8b3 100644
--- a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
+++ b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_UnoControlGridModel_idl__
-#define __com_sun_star_awt_grid_UnoControlGridModel_idl__
+#ifndef __com_sun_star_awt_grid_UnoControlGridModel_idl__ 
+#define __com_sun_star_awt_grid_UnoControlGridModel_idl__ 
 
-#include <com/sun/star/awt/grid/XGridColumnModel.idl>
+#include <com/sun/star/awt/grid/XGridColumnModel.idl> 
 
-#include <com/sun/star/awt/grid/XGridDataModel.idl>
+#include <com/sun/star/awt/grid/XGridDataModel.idl> 
 
-#include <com/sun/star/awt/grid/ScrollBarMode.idl>
+#include <com/sun/star/awt/grid/ScrollBarMode.idl> 
 
-#include <com/sun/star/awt/UnoControlModel.idl>
+#include <com/sun/star/awt/UnoControlModel.idl> 
 
 #include <com/sun/star/view/SelectionType.idl>
 
@@ -43,50 +43,50 @@
 
 #include <com/sun/star/util/Color.idl>
 
-//=============================================================================
-
-module com {  module sun {  module star {  module awt { module grid {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid { 
+ 
+//============================================================================= 
+ 
 /** specifies the standard model of a <type>UnoControlGridModel</type>.
 
     @since OOo 3.3.0
  */
 service UnoControlGridModel
-{
+{ 
     /** specifies the standard model of an <type scope="com::sun::star::awt">UnoControl</type>. */
-    service com::sun::star::awt::UnoControlModel;
-
+    service com::sun::star::awt::UnoControlModel; 
+ 
     /** Specifies whether the grid control should display a special header column.
         <p>The default value is <FALSE/></p>
     */
     [property] boolean ShowRowHeader;
-
+    
     /** Specifies whether the grid control should display a title row.
         <p>The default value is <TRUE/></p>
     */
     [property] boolean ShowColumnHeader;
-
-    /** Specifies the <type>XGridColumnModel</type> that is providing the column structure.
+    
+    /**	Specifies the <type>XGridColumnModel</type> that is providing the column structure.
 
         <p>You can implement your own instance of <type>XGridColumnModel</type> or use
         the <type>DefaultGridColumnModel</type>.
     */
     [property] XGridColumnModel ColumnModel;
-
-    /** Specifies the <type>XGridDataModel</type> that is providing the hierarchical data.
+    
+    /**	Specifies the <type>XGridDataModel</type> that is providing the hierarchical data.
 
         <p>You can implement your own instance of <type>XGridDataModel</type> or use
         the <type>DefaultGridDataModel</type>.
     */
     [property] XGridDataModel DataModel;
-
+    
     /** Specifies the vertical scrollbar mode.
         <p>The default value is <FALSE/></p>
     */
     [property] boolean HScroll;
-
+    
     /** Specifies the horizontal scrollbar mode.
         <p>The default value is <FALSE/></p>
     */
@@ -94,14 +94,14 @@ service UnoControlGridModel
 
     /** Specifies that the control can be reached with the TAB key.
      */
-    [property] boolean Tabstop;
+    [property] boolean Tabstop; 
 
     /** Specifies the selection mode that is enabled for this grid control.
         <p>The default value is <member scope="com::sun::star::view">SelectionType::SINGLE</member></p>
     */
     [property] ::com::sun::star::view::SelectionType SelectionModel;
 
-    /** Specifies the background color of rows. If color for even rows is set, then specifies
+    /** Specifies the background color of rows. If color for even rows is set, then specifies 
         the color of odd rows. Default value is white.
     */
     [property] ::com::sun::star::util::Color RowBackgroundColor;
@@ -121,7 +121,7 @@ service UnoControlGridModel
     /** Specifies the line color. Default value is white.
     */
     [property] ::com::sun::star::util::Color LineColor;
-
+    
     /** specifies the vertical alignment of the content in the control.
 
         <pre>
@@ -129,9 +129,9 @@ service UnoControlGridModel
             MIDDLE
             BOTTOM
         </pre>
-     */
+     */	
     [property] com::sun::star::style::VerticalAlignment VerticalAlign;
-
+    
     /** specifies the font attributes of the text in the control.
      */
     [property] com::sun::star::awt::FontDescriptor FontDescriptor;
@@ -154,10 +154,10 @@ service UnoControlGridModel
      */
     [property] string HelpURL;
 
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridCell.idl b/offapi/com/sun/star/awt/grid/XGridCell.idl
index 08f3cfd1b2d5..7b6ea52b607f 100644
--- a/offapi/com/sun/star/awt/grid/XGridCell.idl
+++ b/offapi/com/sun/star/awt/grid/XGridCell.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_XGridCell_idl__
-#define __com_sun_star_awt_grid_XGridCell_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_grid_XGridCell_idl__ 
+#define __com_sun_star_awt_grid_XGridCell_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+
+ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt {  module grid {
-
-//=============================================================================
+ 
+//============================================================================= 
 
 interface XGridCell
-{
+{ 
 
     [attribute] string Value;
-
+    
     [attribute] boolean Editable;
-
+    
     [attribute] any Data;
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl b/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl
index 7f9fa28c3307..996874e55574 100644
--- a/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl
+++ b/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_XGridCellRenderer_idl__
-#define __com_sun_star_awt_grid_XGridCellRenderer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module awt { module grid {
-
-//=============================================================================
+#ifndef __com_sun_star_awt_grid_XGridCellRenderer_idl__ 
+#define __com_sun_star_awt_grid_XGridCellRenderer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid { 
+ 
+//============================================================================= 
 
 /** renderer for cells
- */
+ */     
 interface XGridCellRenderer
-{
-    //-------------------------------------------------------------------------
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+{ 
+    //------------------------------------------------------------------------- 
+
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl
index d217ff5d4ac6..0ca7fad70458 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_XGridColumn_idl__
-#define __com_sun_star_awt_grid_XGridColumn_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_awt_grid_XGridColumn_idl__ 
+#define __com_sun_star_awt_grid_XGridColumn_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #include <com/sun/star/style/HorizontalAlignment.idl>
-#include <com/sun/star/awt/grid/XGridColumnListener.idl>
-
-
-//=============================================================================
+#include <com/sun/star/awt/grid/XGridColumnListener.idl> 
 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt {  module grid {
-
-//=============================================================================
+ 
+//============================================================================= 
 
 /** The <type>XGridColumn</types> defines the properties and behavior of a column in a grid control
     @since OOo 3.3.0
- */
+ */     
 interface XGridColumn
-{
+{ 
     /** Specifies the an idendifier of the colomn.**/
     [attribute] any Identifier;
 
     /** Specifies the default column witdth. **/
     [attribute] long ColumnWidth;
-
+    
     /** Specifies the preferred column witdth. **/
     [attribute] long PreferredWidth;
 
@@ -59,10 +59,10 @@ interface XGridColumn
 
     /** Specifies the max column witdth. **/
     [attribute] long MaxWidth;
-
+    
     /** Specifies whether column has fixed size or not. **/
     [attribute] boolean Resizeable;
-
+    
     /** Specifies the horizontal alignment of the content in the control.
 
         <pre>
@@ -72,23 +72,23 @@ interface XGridColumn
         </pre>
      */
     [attribute] ::com::sun::star::style::HorizontalAlignment HorizontalAlign;
-
+    
     /** A title is displayed in the colum header row if <method>UnoControlGridModel::ShowRowHeader</method> is set to <true/>**/
     [attribute] string Title;
 
     /** Adds a listener for the <type>GridColumnEvent</type> posted after the grid changes.
         @param Listener
             the listener to add.
-    */
-    [oneway] void addColumnListener( [in] XGridColumnListener  listener);
-
-    //-------------------------------------------------------------------------
+    */     
+    [oneway] void addColumnListener( [in] XGridColumnListener  listener); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** Removes a listener previously added with <method>addColumnListener()</method>.
         @param Listener
             the listener to remove.
-    */
-    [oneway] void removeColumnListener( [in] XGridColumnListener listener);
+    */   
+    [oneway] void removeColumnListener( [in] XGridColumnListener listener); 
 
     /**Updates changed column widths, when column widths are being resized.
         @param name
@@ -102,10 +102,10 @@ interface XGridColumn
             index, which is the index of the column in the column array of the column model
     */
     void setIndex( [in] long index );
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
index 8a2d044f33d5..c77943a3fdb1 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_XGridColumnListener_idl__
-#define __com_sun_star_awt_grid_XGridColumnListener_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_grid_GridColumnEvent_idl__
-#include <com/sun/star/awt/grid/GridColumnEvent.idl>
-#endif
+#ifndef __com_sun_star_awt_grid_XGridColumnListener_idl__ 
+#define __com_sun_star_awt_grid_XGridColumnListener_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_awt_grid_GridColumnEvent_idl__ 
+#include <com/sun/star/awt/grid/GridColumnEvent.idl> 
+#endif 
 
-module com {  module sun {  module star {  module awt { module grid {
-
-//=============================================================================
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid {  
+ 
+//============================================================================= 
 
 /** An instance of this interface is used by the <type>XGridColumnModel</type> to
     get notifications about column model changes.
-
+    
     <p>Usually you must not implement this interface yourself, but you must notify it correctly if
     you implement the <type>XGridColumnModel</type> yourself</p>.
-
+    
     @since OOo 3.3.0
- */
+ */     
 interface XGridColumnListener
-{
- //   /**
-    //  Invoked after a column was added to the column model.
+{ 
+ //   /** 
+    //	Invoked after a column was added to the column model.
     //*/
-    //void columnAdded( [in] GridColumnEvent event );
+    //void columnAdded( [in] GridColumnEvent event ); 
     //
- //   /**
-    //  Invoked after a column was removed from the column model.
+ //   /** 
+    //	Invoked after a column was removed from the column model.
     //*/
-    //void columnRemoved( [in] GridColumnEvent event );
-
-    /**
+    //void columnRemoved( [in] GridColumnEvent event ); 
+    
+    /** 
         Invoked after a column was modified.
     */
-    void columnChanged( [in] GridColumnEvent event );
-};
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    void columnChanged( [in] GridColumnEvent event ); 
+}; 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
index 86e77680cd95..b26dc2ef218e 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_XGridColumnModel_idl__
-#define __com_sun_star_awt_grid_XGridColumnModel_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
+#ifndef __com_sun_star_awt_grid_XGridColumnModel_idl__ 
+#define __com_sun_star_awt_grid_XGridColumnModel_idl__ 
+ 
+#include <com/sun/star/uno/XInterface.idl> 
 
-#include <com/sun/star/awt/grid/XGridColumn.idl>
+#include <com/sun/star/awt/grid/XGridColumn.idl> 
 
 #include <com/sun/star/awt/grid/XGridColumnListener.idl>
-
-//=============================================================================
-
-module com {  module sun {  module star {  module awt { module grid {
-
-//=============================================================================
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid { 
+ 
+//============================================================================= 
 
 /** An instance of this interface is used by the <type>UnoControlGrid</type> to
     retrieve the column structure that is displayed in the actual control.
 
     If you do not need your own model implementation, you can also use the <type>DefaultGridColumnModel</type>.
-
+    
     @since OOo 3.3.0
-*/
+*/     
 interface XGridColumnModel
-{
+{ 
     ///** Specifies whether column selection is allowed
     //*/
     //[attribute] boolean ColumnSelectionAllowed;
@@ -61,7 +61,7 @@ interface XGridColumnModel
                 the number of columns.
     */
     long getColumnCount();
-
+    
     /** Adds a column to the model.
         @param column
             the column to add to the model.
@@ -73,11 +73,11 @@ interface XGridColumnModel
 
     /*
     long getSelectedCount();
-
+    
     sequence<XGridColumn> getSelectedColumns();
-
+    
     sequence<long> getSelectedIndex();
-
+    
     */
 
     /** Returns all columns of the model.
@@ -85,7 +85,7 @@ interface XGridColumnModel
                  all columns associated with the model in a sequence of <type>XGridColumn</type>.
     */
     sequence<XGridColumn> getColumns();
-
+    
     /** Returns a specific column.
         @param index
                 the position of the requested column.
@@ -100,20 +100,20 @@ interface XGridColumnModel
     */
     void setDefaultColumns([in] long elements);
 
-    /**Creates new XGridColumn with the settings of other column. To be used if the columns which are added to
+    /**Creates new XGridColumn with the settings of other column. To be used if the columns which are added to 
         the column model have the same settings.
         @param column
-            the column, which is already created
+            the column, which is already created	
     */
     XGridColumn copyColumn( [in] XGridColumn column );
-
+    
     /*
     long getTotalColumnWidth();
     */
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridControl.idl b/offapi/com/sun/star/awt/grid/XGridControl.idl
index 5019a571663b..0ea37504af08 100644
--- a/offapi/com/sun/star/awt/grid/XGridControl.idl
+++ b/offapi/com/sun/star/awt/grid/XGridControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_XGridControl_idl__
-#define __com_sun_star_awt_grid_XGridControl_idl__
-
-#include <com/sun/star/awt/grid/XGridSelection.idl>
-#include <com/sun/star/awt/grid/XGridColumnModel.idl>
-#include <com/sun/star/awt/grid/XGridDataModel.idl>
-#include <com/sun/star/awt/XMouseListener.idl>
-
-//=============================================================================
-
-module com {  module sun {  module star {  module awt { module grid {
-
-//=============================================================================
+#ifndef __com_sun_star_awt_grid_XGridControl_idl__ 
+#define __com_sun_star_awt_grid_XGridControl_idl__ 
+ 
+#include <com/sun/star/awt/grid/XGridSelection.idl> 
+#include <com/sun/star/awt/grid/XGridColumnModel.idl> 
+#include <com/sun/star/awt/grid/XGridDataModel.idl> 
+#include <com/sun/star/awt/XMouseListener.idl> 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid { 
+ 
+//============================================================================= 
 
 /** An interface to a control that displays a tabular data.
 
     @see UnoControlGrid
-
+    
     @since OOo 3.3.0
- */
-interface XGridControl: XGridSelection
-{
-    /** Converting
+ */      
+interface XGridControl: XGridSelection 
+{ 
+    /** Converting 
     */
 
     long getItemIndexAtPoint( [in] long x, [in] long y);
 
     /** Sets tooltip for row
         @param textForTooltip
-            text, which will be shown as tooltip.
+            text, which will be shown as tooltip. 
             If only cell content should be displayed, leave sequence empty.
         @param columnsForTooltip
             column numbers, which define the cell content that should be shown in the tooltip.
             If only text should be shown, leave this sequence empty.
     */
     void setToolTip( [in] sequence< string > textForTooltip, [in] sequence< long > columnsForTooltip);
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridControlListener.idl b/offapi/com/sun/star/awt/grid/XGridControlListener.idl
index 6f4fdf68ccd4..4e7876cbe85b 100644
--- a/offapi/com/sun/star/awt/grid/XGridControlListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridControlListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_XGridControlListener_idl__
-#define __com_sun_star_awt_grid_XGridControlListener_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module awt { module grid {
-
-//=============================================================================
+#ifndef __com_sun_star_awt_grid_XGridControlListener_idl__ 
+#define __com_sun_star_awt_grid_XGridControlListener_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid { 
+ 
+//============================================================================= 
 
 interface XGridControlListener
-{
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+{ 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridDataListener.idl b/offapi/com/sun/star/awt/grid/XGridDataListener.idl
index d6d0d930b331..534c3d7880f4 100644
--- a/offapi/com/sun/star/awt/grid/XGridDataListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridDataListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,52 +24,52 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_XGridDataListener_idl__
-#define __com_sun_star_awt_grid_XGridDataListener_idl__
-
-#ifndef __com_sun_star_awt_grid_GridDataEvent_idl__
-#include <com/sun/star/awt/grid/GridDataEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
+#ifndef __com_sun_star_awt_grid_XGridDataListener_idl__ 
+#define __com_sun_star_awt_grid_XGridDataListener_idl__ 
+ 
+#ifndef __com_sun_star_awt_grid_GridDataEvent_idl__ 
+#include <com/sun/star/awt/grid/GridDataEvent.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
 
-module com {  module sun {  module star {  module awt { module grid {
-
-//=============================================================================
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid {  
+ 
+//============================================================================= 
 
 /** An instance of this interface is used by the <type>XGridDataModel</type> to
     get notifications about data model changes.
-
+    
     <p>Usually you must not implement this interface yourself, but you must notify it correctly if
     you implement the <type>XGridDataModel</type> yourself</p>.
-
+    
     @since OOo 3.3.0
- */
+ */       
 interface XGridDataListener: com::sun::star::lang::XEventListener
-{
+{ 
 
-    /**
+    /** 
         Invoked after a row was added to the data model.
     */
-    void rowAdded( [in] GridDataEvent Event );
-
-    /**
+    void rowAdded( [in] GridDataEvent Event ); 
+    
+    /** 
         Invoked after a row was added to the data model.
     */
-    void rowRemoved( [in] GridDataEvent Event );
-
-    /**
+    void rowRemoved( [in] GridDataEvent Event ); 
+    
+    /** 
         Invoked after a row was added to the data model.
     */
-    void dataChanged( [in] GridDataEvent Event );
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    void dataChanged( [in] GridDataEvent Event ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridDataModel.idl b/offapi/com/sun/star/awt/grid/XGridDataModel.idl
index 5cc4085807e1..7489e496086c 100644
--- a/offapi/com/sun/star/awt/grid/XGridDataModel.idl
+++ b/offapi/com/sun/star/awt/grid/XGridDataModel.idl
@@ -2,7 +2,7 @@
  *
  * $Revision: 1.8 $
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,28 +25,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_XGridDataModel_idl__
-#define __com_sun_star_awt_grid_XGridDataModel_idl__
-
-
-#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/awt/grid/XGridDataListener.idl>
-
+#ifndef __com_sun_star_awt_grid_XGridDataModel_idl__ 
+#define __com_sun_star_awt_grid_XGridDataModel_idl__ 
+ 
 
-//=============================================================================
+#include <com/sun/star/lang/XComponent.idl> 
+#include <com/sun/star/awt/grid/XGridDataListener.idl> 
 
-module com {  module sun {  module star {  module awt { module grid {
 
-//=============================================================================
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid { 
+ 
+//============================================================================= 
 /** An instance of this interface is used by the <type>UnoControlGrid</type> to
     retrieve the content data that is displayed in the actual control.
 
     If you do not need your own model implementation, you can also use the <type>DefaultGridDataModel</type>.
-
+    
     @since OOo 3.3.0
-*/
-interface XGridDataModel: ::com::sun::star::lang::XComponent
-{
+*/   
+interface XGridDataModel: ::com::sun::star::lang::XComponent 
+{ 
     /** Specifies the height of each row.
     */
     [attribute] long RowHeight;
@@ -72,7 +72,7 @@ interface XGridDataModel: ::com::sun::star::lang::XComponent
     /** Adds a row to the model.
 
         @param headername
-                specifies the name of the row.
+                specifies the name of the row. 
         @param data
                 the content of the row.
     */
@@ -98,7 +98,7 @@ interface XGridDataModel: ::com::sun::star::lang::XComponent
             the new value of the cell.
     */
     void updateCell([in] long row, [in] long column, [in] any value );
-
+        
     /**Updates the content of a given row.
         @param row
             the row index
@@ -109,26 +109,26 @@ interface XGridDataModel: ::com::sun::star::lang::XComponent
     */
     void updateRow([in] long row, [in] sequence< long > columns, [in] sequence< any > values);
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** Adds a listener for the <type>GridDataEvent</type> posted after the grid changes.
         @param Listener
             the listener to add.
-    */
-    [oneway] void addDataListener( [in] XGridDataListener  listener);
-
-    //-------------------------------------------------------------------------
+    */    
+    [oneway] void addDataListener( [in] XGridDataListener  listener); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** Removes a listener previously added with <method>addDataListener()</method>.
         @param Listener
             the listener to remove.
-    */
-    [oneway] void removeDataListener( [in] XGridDataListener listener);
-
-};
-
-//=============================================================================
-
-}; }; }; };};
-
-#endif
+    */       
+    [oneway] void removeDataListener( [in] XGridDataListener listener); 
+  
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };};  
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridSelection.idl b/offapi/com/sun/star/awt/grid/XGridSelection.idl
index 5049426018b0..a94c06ba77f6 100644
--- a/offapi/com/sun/star/awt/grid/XGridSelection.idl
+++ b/offapi/com/sun/star/awt/grid/XGridSelection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_XGridSelection_idl__
-#define __com_sun_star_awt_grid_XGridSelection_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/awt/grid/XGridSelectionListener.idl>
-#include <com/sun/star/view/SelectionType.idl>
-
-//=============================================================================
-
-module com {  module sun {  module star {  module awt { module grid {
-
-//=============================================================================
-
-/** This interfaces provides access to the selection of row for <type>UnoControlGrid</type>.
- */
+#ifndef __com_sun_star_awt_grid_XGridSelection_idl__ 
+#define __com_sun_star_awt_grid_XGridSelection_idl__ 
+ 
+#include <com/sun/star/uno/XInterface.idl> 
+#include <com/sun/star/awt/grid/XGridSelectionListener.idl> 
+#include <com/sun/star/view/SelectionType.idl> 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid {  
+ 
+//============================================================================= 
+
+/** This interfaces provides access to the selection of row for <type>UnoControlGrid</type>. 
+ */     
 interface XGridSelection
-{
-    /** Returns the lowest index of the selection.
+{ 
+    /** Returns the lowest index of the selection. 
         @returns
             the lowest index.
     */
     long getMinSelectionIndex();
 
-    /** Returns the highest index of the selection.
+    /** Returns the highest index of the selection. 
         @returns
             the highest index.
     */
@@ -106,22 +106,22 @@ interface XGridSelection
     /** Adds a listener for the <type>GridSelectionEvent</type> posted after the grid changes.
         @param listener
             the listener to add.
-    */
-    [oneway] void addSelectionListener( [in] XGridSelectionListener  listener);
-
-    //-------------------------------------------------------------------------
+    */    
+    [oneway] void addSelectionListener( [in] XGridSelectionListener  listener); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** Removes a listener previously added with <method>addSelectionListener()</method>.
         @param listener
             the listener to remove.
-    */
-    [oneway] void removeSelectionListener( [in] XGridSelectionListener listener);
-
-
-};
-
-//=============================================================================
-
+    */   
+    [oneway] void removeSelectionListener( [in] XGridSelectionListener listener); 
+ 
+
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl b/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl
index 61e8d3050b0d..43c6197ece8b 100644
--- a/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_grid_XGridSelectionListener_idl__
-#define __com_sun_star_awt_grid_XGridSelectionListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_grid_GridSelectionEvent_idl__
-#include <com/sun/star/awt/grid/GridSelectionEvent.idl>
+#ifndef __com_sun_star_awt_grid_XGridSelectionListener_idl__ 
+#define __com_sun_star_awt_grid_XGridSelectionListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
 #endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module awt { module grid {
-
-//=============================================================================
+ 
+#ifndef __com_sun_star_awt_grid_GridSelectionEvent_idl__ 
+#include <com/sun/star/awt/grid/GridSelectionEvent.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid {  
+ 
+//============================================================================= 
 
 /** An instance of this interface is used by the <type>XGridSelection</type> to
     get notifications about selection changes.
-
+    
     <p>Usually you must not implement this interface yourself, but you must notify it correctly if
     you implement the <type>XGridSelection</type> yourself</p>.
- */
+ */      
 interface XGridSelectionListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** Invoked after a selection was changed.
-     */
-    [oneway] void selectionChanged( [in] GridSelectionEvent gridSelectionEvent);
-
-};
-
-//=============================================================================
-
+     */    
+    [oneway] void selectionChanged( [in] GridSelectionEvent gridSelectionEvent); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/tree/ExpandVetoException.idl b/offapi/com/sun/star/awt/tree/ExpandVetoException.idl
index cbee77879859..69e0a1004d1c 100644
--- a/offapi/com/sun/star/awt/tree/ExpandVetoException.idl
+++ b/offapi/com/sun/star/awt/tree/ExpandVetoException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_ExpandVetoException_idl__
-#define __com_sun_star_awt_tree_ExpandVetoException_idl__
-
-#ifndef __com_sun_star_util_VetoException_idl__
-#include <com/sun/star/util/VetoException.idl>
+#ifndef __com_sun_star_awt_tree_ExpandVetoException_idl__ 
+#define __com_sun_star_awt_tree_ExpandVetoException_idl__ 
+ 
+#ifndef __com_sun_star_util_VetoException_idl__ 
+#include <com/sun/star/util/VetoException.idl> 
 #endif
 
 #ifndef __com_sun_star_awt_tree_TreeExpansionEvent_idl__
 #include <com/sun/star/awt/tree/TreeExpansionEvent.idl>
 #endif
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt { module tree {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** Exception used to stop an expand/collapse from happening.
     @see XTreeExpansionListener
     @see XTreeControl
@@ -49,10 +49,10 @@ exception ExpandVetoException : com::sun::star::util::VetoException
 {
     /** The event that the exception was created for. */
     TreeExpansionEvent Event;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl b/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl
index 92875a7806d8..8edabf9817ba 100644
--- a/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl
+++ b/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,8 +24,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_MutableTreeDataModel_idl__
-#define __com_sun_star_awt_tree_MutableTreeDataModel_idl__
+#ifndef __com_sun_star_awt_tree_MutableTreeDataModel_idl__ 
+#define __com_sun_star_awt_tree_MutableTreeDataModel_idl__ 
 
 #ifndef __com_sun_star_awt_tree_XMutableTreeDataModelidl__
 #include <com/sun/star/awt/tree/XMutableTreeDataModel.idl>
@@ -35,12 +35,12 @@
 #include <com/sun/star/awt/tree/XMutableTreeNode.idl>
 #endif
 
-//=============================================================================
-
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt {  module tree {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** If you do not want to implement the <type>XTreeDataModel</type> yourself, use this service.
     This implementation uses <type>MutableTreeNode</type> for its nodes.
  */
@@ -48,8 +48,8 @@ service MutableTreeDataModel : XMutableTreeDataModel
 {
 };
 
-//=============================================================================
-
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/tree/MutableTreeNode.idl b/offapi/com/sun/star/awt/tree/MutableTreeNode.idl
index c2db72d93bb6..1f506cad1aed 100644
--- a/offapi/com/sun/star/awt/tree/MutableTreeNode.idl
+++ b/offapi/com/sun/star/awt/tree/MutableTreeNode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_MutableTreeNode_idl__
-#define __com_sun_star_awt_tree_MutableTreeNode_idl__
-
+#ifndef __com_sun_star_awt_tree_MutableTreeNode_idl__ 
+#define __com_sun_star_awt_tree_MutableTreeNode_idl__ 
+ 
 #ifndef __com_sun_star_awt_tree_XMutableTreeNode_idl__
 #include <com/sun/star/awt/tree/XMutableTreeNode.idl>
 #endif
 
-//=============================================================================
-
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt { module tree {
 
-//=============================================================================
+//============================================================================= 
 
 /** Represents an editable tree node as used by the <type>MutableTreeDataModel</type>
  */
 service MutableTreeNode : XMutableTreeNode
 {
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/tree/TreeControl.idl b/offapi/com/sun/star/awt/tree/TreeControl.idl
index 79ed4b86ab90..a534b52f14c3 100644
--- a/offapi/com/sun/star/awt/tree/TreeControl.idl
+++ b/offapi/com/sun/star/awt/tree/TreeControl.idl
@@ -1,7 +1,7 @@
 /************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,19 +24,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_TreeControl_idl__
-#define __com_sun_star_awt_tree_TreeControl_idl__
-
+#ifndef __com_sun_star_awt_tree_TreeControl_idl__ 
+#define __com_sun_star_awt_tree_TreeControl_idl__ 
+ 
 #ifndef __com_sun_star_awt_tree_XTreeControl_idl__
 #include <com/sun/star/awt/tree/XTreeControl.idl>
 #endif
 
-//=============================================================================
-
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt { module tree {
 
-//=============================================================================
-
+//============================================================================= 
+ 
 /** A control that displays a set of hierarchical data as an outline.
 
     <p>
@@ -52,7 +52,7 @@ module com {  module sun {  module star {  module awt { module tree {
     You can implement it yourself or use the <type>MutableTreeDataModel</type>
     which uses <type>XMutableTreeNode</type> and <type>XMutableTreeDataModel</type>
     for a simple and mutable data model.
-
+    
     <p>The data model must be set at the <member>TreeControlModel::TreeDataModel</member> property.</p>
 
     <h4>Selection</h4>
@@ -87,11 +87,11 @@ module com {  module sun {  module star {  module awt { module tree {
     </p>
  */
 service TreeControl: XTreeControl
-{
-};
-
-//=============================================================================
+{ 
+}; 
+ 
+//============================================================================= 
 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/tree/TreeControlModel.idl b/offapi/com/sun/star/awt/tree/TreeControlModel.idl
index 6a84d52e165e..5ff615d7bf57 100644
--- a/offapi/com/sun/star/awt/tree/TreeControlModel.idl
+++ b/offapi/com/sun/star/awt/tree/TreeControlModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_TreeControlModel_idl__
-#define __com_sun_star_awt_tree_TreeControlModel_idl__
-
-#ifndef __com_sun_star_awt_tree_XTreeDataModel_idl__
+#ifndef __com_sun_star_awt_tree_TreeControlModel_idl__ 
+#define __com_sun_star_awt_tree_TreeControlModel_idl__ 
+ 
+#ifndef __com_sun_star_awt_tree_XTreeDataModel_idl__ 
 #include <com/sun/star/awt/tree/XTreeDataModel.idl>
 #endif
 
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl>
 #endif
 
-#ifndef __com_sun_star_view_SelectionType_idl__
+#ifndef __com_sun_star_view_SelectionType_idl__ 
 #include <com/sun/star/view/SelectionType.idl>
 #endif
 
-//=============================================================================
-
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt { module tree {
 
-//=============================================================================
-
+//============================================================================= 
+ 
 /** specifies the standard model of a <type>TreeControl</type>.
  */
 service TreeControlModel
@@ -57,7 +57,7 @@ service TreeControlModel
     */
     [property] ::com::sun::star::view::SelectionType SelectionType;
 
-    /** Specifies the <type>XTreeDataModel</type> that is providing the hierarchical data.
+    /**	Specifies the <type>XTreeDataModel</type> that is providing the hierarchical data.
 
         <p>You can implement your own instance of <type>XTreeDataModel</type> or use
         the <type>MutableTreeDataModel</type>.
@@ -98,17 +98,17 @@ service TreeControlModel
     */
     [property] boolean Editable;
 
-    /** Specifies what happens when editing is interrupted by selecting another node in the tree,
+    /**	Specifies what happens when editing is interrupted by selecting another node in the tree,
         a change in the tree's data, or by some other means.
         <p>Setting this property to <TRUE/> causes the changes to be automatically saved when editing
         is interrupted. <FALSE/> means that editing is canceled and changes are lost
         <p>The default value is <FALSE/></p>
     */
     [property] boolean InvokesStopNodeEditing;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl b/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl
index 380848950e6e..2e372ef14445 100644
--- a/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl
+++ b/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_TreeDataModelEvent_idl__
-#define __com_sun_star_awt_tree_TreeDataModelEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
+#ifndef __com_sun_star_awt_tree_TreeDataModelEvent_idl__ 
+#define __com_sun_star_awt_tree_TreeDataModelEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
 
 #ifndef __com_sun_star_awt_tree_XTreeNode_idl__
 #include <com/sun/star/awt/tree/XTreeNode.idl>
 #endif
 
-//=============================================================================
-
-module com {  module sun {  module star {  module awt { module tree {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module tree {  
+ 
+//============================================================================= 
+ 
 /** An event used by a <type>XTreeDataModel</type> to notify changes in the data
     model to the <type>XTreeControl</type>.
     You usually need to fill this event only if you implement the <type>XTreeDataModel</type>
@@ -59,10 +59,10 @@ struct TreeDataModelEvent : ::com::sun::star::lang::EventObject
     /** holds the parent node for changed, added or removed nodes.
         <p> If this is null, <member>Nodes</member> must contain only the root node */
     XTreeNode ParentNode;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl b/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl
index 20ee645d56e8..333c10353975 100644
--- a/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl
+++ b/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_TreeExpansionEvent_idl__
-#define __com_sun_star_awt_tree_TreeExpansionEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
+#ifndef __com_sun_star_awt_tree_TreeExpansionEvent_idl__ 
+#define __com_sun_star_awt_tree_TreeExpansionEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
 
 #ifndef __com_sun_star_awt_tree_XTreeNode_idl__
 #include <com/sun/star/awt/tree/XTreeNode.idl>
 #endif
 
-//=============================================================================
-
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt { module tree {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** This event tells you what node is currently expanding or collapsing.
 
     @see XTreeExpansionListener
@@ -50,10 +50,10 @@ struct TreeExpansionEvent : ::com::sun::star::lang::EventObject
 {
     /* The node that has been expanded/collapsed.*/
     com::sun::star::awt::tree::XTreeNode Node;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl b/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl
index b2ef8c65a706..f153b6910423 100644
--- a/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl
+++ b/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_XMutableTreeDataModel_idl__
-#define __com_sun_star_awt_tree_XMutableTreeDataModel_idl__
+#ifndef __com_sun_star_awt_tree_XMutableTreeDataModel_idl__ 
+#define __com_sun_star_awt_tree_XMutableTreeDataModel_idl__ 
 
-#ifndef __com_sun_star_awt_tree_XTreeDataModel_idl__
+#ifndef __com_sun_star_awt_tree_XTreeDataModel_idl__ 
 #include <com/sun/star/awt/tree/XTreeDataModel.idl>
 #endif
 
-#ifndef __com_sun_star_awt_tree_XMutableTreeNode_idl__
+#ifndef __com_sun_star_awt_tree_XMutableTreeNode_idl__ 
 #include <com/sun/star/awt/tree/XMutableTreeNode.idl>
 #endif
 
-//=============================================================================
-
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt {  module tree {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** This is the editable version of the <type>XTreeDataModel</type>.
 
     <p>Note that only <type>XTreeNode</type> created from the same instance with <member>createNode</member>
@@ -49,7 +49,7 @@ module com {  module sun {  module star {  module awt {  module tree {
 interface XMutableTreeDataModel : XTreeDataModel
 {
     /** creates a new tree node with the given value and given settings.
-
+        
         @param DisplayValue
             should be convertable to a string and is used by the <type>XTreeControl</type>
             as a textual represenation of the created node.
@@ -77,9 +77,9 @@ interface XMutableTreeDataModel : XTreeDataModel
     void setRoot( [in] XMutableTreeNode RootNode )
         raises( ::com::sun::star::lang::IllegalArgumentException );
 };
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl b/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl
index 1ecf30290400..2fce673b1aec 100644
--- a/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl
+++ b/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_XMutableTreeNode_idl__
-#define __com_sun_star_awt_tree_XMutableTreeNode_idl__
-
+#ifndef __com_sun_star_awt_tree_XMutableTreeNode_idl__ 
+#define __com_sun_star_awt_tree_XMutableTreeNode_idl__ 
+ 
 #ifndef __com_sun_star_awt_tree_XTreeNode_idl__
 #include <com/sun/star/awt/tree/XTreeNode.idl>
 #endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
-#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-//=============================================================================
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ 
+#include <com/sun/star/lang/IndexOutOfBoundsException.idl> 
+#endif 
 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt { module tree {
 
-//=============================================================================
+//============================================================================= 
 
 /** Represents a mutable tree node as used by the <type>MutableTreeDataModel</type>
  */
@@ -69,8 +69,8 @@ interface XMutableTreeNode : XTreeNode
             if <var>Index</var> is less than 0 or greater then <member>XTreeNode::getChildCount()</member>.
     */
     void insertChildByIndex( [in] long Index, [in] XMutableTreeNode ChildNode )
-        raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::lang::IndexOutOfBoundsException );
+        raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::lang::IndexOutOfBoundsException ); 
 
     /** removes the node from this instance at the specified index.
 
@@ -80,9 +80,9 @@ interface XMutableTreeNode : XTreeNode
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
             if <var>Index</var> is less than 0 or greater then <member>XTreeNode::getChildCount()</member>.
      */
-    void removeChildByIndex( [in] long Index )
-            raises( com::sun::star::lang::IndexOutOfBoundsException );
-
+    void removeChildByIndex( [in] long Index ) 
+            raises( com::sun::star::lang::IndexOutOfBoundsException ); 
+ 
     /** Changes if the children of this node are created on demand.
 
         @see XTreeNode::hasChildrenOnDemand()
@@ -113,10 +113,10 @@ interface XMutableTreeNode : XTreeNode
         <p>If <var>URL</var> is empty, <member>XTreeControl::DefaultCollapsedGraphicURL</member> is used.
     */
     void setCollapsedGraphicURL( [in] string URL );
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/tree/XTreeControl.idl b/offapi/com/sun/star/awt/tree/XTreeControl.idl
index a5341257ba45..dafdedc1a6da 100644
--- a/offapi/com/sun/star/awt/tree/XTreeControl.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeControl.idl
@@ -1,7 +1,7 @@
 /************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,12 +24,12 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_XTreeControl_idl__
-#define __com_sun_star_awt_tree_XTreeControl_idl__
-
-#ifndef __com_sun_star_awt_XControl_idl__
-#include <com/sun/star/awt/XControl.idl>
-#endif
+#ifndef __com_sun_star_awt_tree_XTreeControl_idl__ 
+#define __com_sun_star_awt_tree_XTreeControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_XControl_idl__ 
+#include <com/sun/star/awt/XControl.idl> 
+#endif 
 
 #ifndef __com_sun_star_awt_tree_XTreeExpansionListener_idl__
 #include <com/sun/star/awt/tree/XTreeExpansionListener.idl>
@@ -39,24 +39,24 @@
 #include <com/sun/star/view/XMultiSelectionSupplier.idl>
 #endif
 
-#ifndef __com_sun_star_awt_tree_XTreeEditListener_idl__
+#ifndef __com_sun_star_awt_tree_XTreeEditListener_idl__ 
 #include <com/sun/star/awt/tree/XTreeEditListener.idl>
 #endif
 
-//=============================================================================
-
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt { module tree {
 
-//=============================================================================
-
+//============================================================================= 
+ 
 /** An interface to a control that displays a set of hierarchical data as an outline.
 
     @see TreeControl
  */
 interface XTreeControl
-{
-    /** This interfaces provides access to the selection of tree nodes for this control.
-
+{ 
+    /**	This interfaces provides access to the selection of tree nodes for this control.
+    
         <p>valid selection values for this interface are
         <type>XTreeNode</type> or sequence&lt;<type>XTreeNode</type>&gt;.</p>
 
@@ -88,7 +88,7 @@ interface XTreeControl
     /** Returns <TRUE/> if <var>Node</var> is currently collapsed.
 
         @param Node
-            the <type>XTreeNode</type> specifying the node to check
+            the <type>XTreeNode</type> specifying the node to check 
 
         @returns
             <TRUE/> if <var>Node</var> or at least one of its parent nodes are collapsed,
@@ -275,7 +275,7 @@ interface XTreeControl
     /** Adds a <type>XTreeEditListener</type>.
 
         @param xListener
-            a <type>XTreeEditListener</type> that will be notified
+            a <type>XTreeEditListener</type> that will be notified 
             before and after a tree node is edited.
     */
     void addTreeEditListener( [in] XTreeEditListener Listener );
@@ -286,10 +286,10 @@ interface XTreeControl
             the <type>XTreeEditListener</type> to remove
     */
     void removeTreeEditListener( [in] XTreeEditListener Listener );
-};
-
-//=============================================================================
+}; 
+ 
+//============================================================================= 
 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/tree/XTreeDataModel.idl b/offapi/com/sun/star/awt/tree/XTreeDataModel.idl
index 50f6dcae2151..53338d5aca15 100644
--- a/offapi/com/sun/star/awt/tree/XTreeDataModel.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeDataModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_XTreeDataModel_idl__
-#define __com_sun_star_awt_tree_XTreeDataModel_idl__
+#ifndef __com_sun_star_awt_tree_XTreeDataModel_idl__ 
+#define __com_sun_star_awt_tree_XTreeDataModel_idl__ 
 
 #ifndef __com_sun_star_awt_tree_XTreeDataModelListener_idl__
 #include <com/sun/star/awt/tree/XTreeDataModelListener.idl>
 #endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
 
-#ifndef __com_sun_star_lang_XComponent_idl__
+#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl>
 #endif
 
@@ -43,12 +43,12 @@
 #include <com/sun/star/awt/tree/XTreeNode.idl>
 #endif
 
-//=============================================================================
-
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt {  module tree {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** An instance of this interface is used by the <type>TreeControl</type> to
     retrieve the hierarchical outline data that is displayed in the actual control.
 
@@ -83,10 +83,10 @@ interface XTreeDataModel : ::com::sun::star::lang::XComponent
     */
     void removeTreeDataModelListener( [in] XTreeDataModelListener Listener );
 
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl b/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
index 5110dac3623e..e1c1dd58c6b3 100644
--- a/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_XTreeDataModelListener_idl__
-#define __com_sun_star_awt_tree_XTreeDataModelListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_TreeDataModelEvent_idl__
-#include <com/sun/star/awt/tree/TreeDataModelEvent.idl>
-#endif
-
-
-//=============================================================================
-
+#ifndef __com_sun_star_awt_tree_XTreeDataModelListener_idl__ 
+#define __com_sun_star_awt_tree_XTreeDataModelListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_tree_TreeDataModelEvent_idl__ 
+#include <com/sun/star/awt/tree/TreeDataModelEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt {  module tree {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** An instance of this interface is used by the <type>TreeControl</type> to
     get notifications about data model changes.
-
+    
     <p>Usually you must not implement this interface yourself as it is already handled
     by the <type>TreeControl</type>, but you must notify it correctly if
     you implement the <type>XTreeDataModel</type> yourself</p>.
@@ -55,7 +55,7 @@ interface XTreeDataModelListener: com::sun::star::lang::XEventListener
         The node(s) have not changed locations in the tree or altered their
         children arrays, but other attributes have changed and may affect
         presentation.
-
+        
         Example: the name of a file has changed, but it is in the same location in the file system.
 
         To indicate the root has changed, <member>TreeDataModelEvent::Nodes</member> will contain
@@ -86,10 +86,10 @@ interface XTreeDataModelListener: com::sun::star::lang::XEventListener
         structure has changed. <member>TreeDataModelEvent::Nodes</member> is empty.
     */
     void treeStructureChanged( [in] TreeDataModelEvent Event );
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/tree/XTreeEditListener.idl b/offapi/com/sun/star/awt/tree/XTreeEditListener.idl
index dcaec810dae8..6256a9ac831e 100644
--- a/offapi/com/sun/star/awt/tree/XTreeEditListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeEditListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_XTreeEditListener_idl__
-#define __com_sun_star_awt_tree_XTreeEditListener_idl__
+#ifndef __com_sun_star_awt_tree_XTreeEditListener_idl__ 
+#define __com_sun_star_awt_tree_XTreeEditListener_idl__ 
 
 #ifndef __com_sun_star_awt_tree_XTreeNode_idl__
 #include <com/sun/star/awt/tree/XTreeNode.idl>
 #endif
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
 
 #ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
 #endif
 
-//=============================================================================
-
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt {  module tree {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** You can implement this interface and register with <method scope="XTreeControl">addTreeEditListener</method>
     to get notifcaitons when editing of a node starts and ends.
 
-    <p>You have to set the <member>TreeControlModel::Editable</member> property to
+    <p>You have to set the <member>TreeControlModel::Editable</member> property to 
     <TRUE/> before a tree supports editing.</p>
  */
 interface XTreeEditListener : ::com::sun::star::lang::XEventListener
@@ -59,7 +59,7 @@ interface XTreeEditListener : ::com::sun::star::lang::XEventListener
         @param Node
             the <type>XTreeNode</type> for that an edit request was fired by calling
             <method scope="XTreeControl">startEditingAtNode</method>
-
+        
         @throws VetoException
             if thrown the editing will not start.
     */
@@ -80,10 +80,10 @@ interface XTreeEditListener : ::com::sun::star::lang::XEventListener
             the text that was entered by the user.
     */
     void nodeEdited( [in] XTreeNode Node, [in] string NewText );
-};
-
-//=============================================================================
+}; 
 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl b/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
index 8b235ff6db28..01cc91664357 100644
--- a/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_XTreeExpansionListener_idl__
-#define __com_sun_star_awt_tree_XTreeExpansionListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_awt_tree_TreeExpansionEvent_idl__
-#include <com/sun/star/awt/tree/TreeExpansionEvent.idl>
-#endif
+#ifndef __com_sun_star_awt_tree_XTreeExpansionListener_idl__ 
+#define __com_sun_star_awt_tree_XTreeExpansionListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_tree_TreeExpansionEvent_idl__ 
+#include <com/sun/star/awt/tree/TreeExpansionEvent.idl> 
+#endif 
 
 #ifndef __com_sun_star_awt_tree_ExpandVetoException_idl__
 #include <com/sun/star/awt/tree/ExpandVetoException.idl>
 #endif
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt {  module tree {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** An instance of this interface can get notifications from a <type>TreeControl</type>
     when nodes are expanded or collapsed.
 
@@ -83,10 +83,10 @@ interface XTreeExpansionListener: com::sun::star::lang::XEventListener
 
     /** Called whenever a node in the tree has been succesfully collapsed. */
     void treeCollapsed( [in] TreeExpansionEvent Event );
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/tree/XTreeNode.idl b/offapi/com/sun/star/awt/tree/XTreeNode.idl
index b19af432f5d2..d47ccc607b2f 100644
--- a/offapi/com/sun/star/awt/tree/XTreeNode.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeNode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,9 +24,9 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_awt_tree_XTreeNode_idl__
-#define __com_sun_star_awt_tree_XTreeNode_idl__
-
+#ifndef __com_sun_star_awt_tree_XTreeNode_idl__ 
+#define __com_sun_star_awt_tree_XTreeNode_idl__ 
+ 
 #ifndef __com_sun_star_container_XEnumerationAccess_idl__
 #include <com/sun/star/container/XEnumerationAccess.idl>
 #endif
@@ -35,12 +35,12 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
 #endif
 
-//=============================================================================
-
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module awt { module tree {
 
-//=============================================================================
-
+//============================================================================= 
+ 
 /** An instance implementing this interface represents the model data for an entry in a
     <type>XTreeDataModel</type>.
     <p>The <type>TreeControl</type> uses this interface to retrieve the model
@@ -50,7 +50,7 @@ module com {  module sun {  module star {  module awt { module tree {
 interface XTreeNode
 {
     /** Returns the child tree node at <var>Index</var>.
-
+    
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
             if <var>Index</var> is less than 0 or equal or greater then <member>getChildCount</member>.
     */
@@ -96,10 +96,10 @@ interface XTreeNode
         <p>If <var>URL</var> is empty, <member>XTreeControl::DefaultCollapsedGraphicURL</member> is used.
     */
     string getCollapsedGraphicURL();
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl b/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl
index 82f4d48daadb..85638a22f0a5 100644
--- a/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl
+++ b/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart/AccessibleChartElement.idl b/offapi/com/sun/star/chart/AccessibleChartElement.idl
index 45692c2ff520..a5e3e5badd08 100644
--- a/offapi/com/sun/star/chart/AccessibleChartElement.idl
+++ b/offapi/com/sun/star/chart/AccessibleChartElement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ module com {  module sun {  module star {  module chart {
     Shapes added by a user via the clipboard are not treated as chart
     elements.
 
-    <p>The list of objects that implement this service is
+    <p>The list of objects that implement this service is 
     <type scope="::com::sun::star::chart">ChartTitle</type>,
     <type scope="::com::sun::star::chart">ChartLegend</type>,
     <type scope="::com::sun::star::chart">Diagram</type>,
@@ -63,7 +63,7 @@ module com {  module sun {  module star {  module chart {
 */
 published service AccessibleChartElement
 {
-    /** Base interface for being accessible.  It gives access to the
+    /** Base interface for being accessible.  It gives access to the 
         <type scope="::com::sun::star::accessibility">XAccessibleContext</type>
         interface.
     */
@@ -102,9 +102,9 @@ published service AccessibleChartElement
              implementation specific way.</dd>
          <dt>Relations</dt>
              <dd>They are not used at the moment.</dd>
-
+ 
          <dt>States</dt>
-             <dd>The states supported by this service are:
+             <dd>The states supported by this service are: 
              <ul>
 
               <li><const scope="::com::sun::star::accessibility">AccessibleStateType::DEFUNC</const>
@@ -157,8 +157,8 @@ published service AccessibleChartElement
         position in one or the other coordinate system).</p>
 
         <p>Focus handling depends on support of the
-        <type scope="::com::sun::star::accessibility">XAccessibleText</type> and
-        <type scope="::com::sun::star::accessibility">XAccessibleEditableText</type>
+        <type scope="::com::sun::star::accessibility">XAccessibleText</type> and 
+        <type scope="::com::sun::star::accessibility">XAccessibleEditableText</type> 
         interfaces.</p>
 
         <p>Key bindings are not supported at the moment</p>
@@ -166,11 +166,11 @@ published service AccessibleChartElement
     interface ::com::sun::star::accessibility::XAccessibleComponent;
 
     /** Give extended access to the graphical representation of a chart element.
-
+        
         <p>This interface is used primarily to provide the predominant
         foreground and background colors and&mdash;if applicable, i.e. the
-        <type scope="::com::sun::star::accessibility">XAccessibleText</type>
-        interface is supported&mdash;information about the font used to display
+        <type scope="::com::sun::star::accessibility">XAccessibleText</type> 
+        interface is supported&mdash;information about the font used to display 
         text.</p>
 
         <p>The foreground and background colors may in some cases be directly
diff --git a/offapi/com/sun/star/chart/AreaDiagram.idl b/offapi/com/sun/star/chart/AreaDiagram.idl
index 19f3cee7ce1d..b8c285048f19 100644
--- a/offapi/com/sun/star/chart/AreaDiagram.idl
+++ b/offapi/com/sun/star/chart/AreaDiagram.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_AreaDiagram_idl__
-#define __com_sun_star_chart_AreaDiagram_idl__
-
-#ifndef __com_sun_star_chart_Diagram_idl__
-#include <com/sun/star/chart/Diagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
-#include <com/sun/star/chart/ChartStatistics.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
-#include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
-#include <com/sun/star/chart/ChartTwoAxisYSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisZSupplier_idl__
-#include <com/sun/star/chart/ChartAxisZSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_Dim3DDiagram_idl__
-#include <com/sun/star/chart/Dim3DDiagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_StackableDiagram_idl__
-#include <com/sun/star/chart/StackableDiagram.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_AreaDiagram_idl__ 
+#define __com_sun_star_chart_AreaDiagram_idl__ 
+ 
+#ifndef __com_sun_star_chart_Diagram_idl__ 
+#include <com/sun/star/chart/Diagram.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartStatistics_idl__ 
+#include <com/sun/star/chart/ChartStatistics.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__ 
+#include <com/sun/star/chart/ChartAxisXSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__ 
+#include <com/sun/star/chart/ChartTwoAxisYSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartAxisZSupplier_idl__ 
+#include <com/sun/star/chart/ChartAxisZSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_Dim3DDiagram_idl__ 
+#include <com/sun/star/chart/Dim3DDiagram.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_StackableDiagram_idl__ 
+#include <com/sun/star/chart/StackableDiagram.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** This is a service for area diagrams.
  */
 published service AreaDiagram
-{
+{ 
     service com::sun::star::chart::Diagram;
     service com::sun::star::chart::ChartStatistics;
     service com::sun::star::chart::ChartAxisXSupplier;
@@ -73,10 +73,10 @@ published service AreaDiagram
     service com::sun::star::chart::ChartAxisZSupplier;
     service com::sun::star::chart::Dim3DDiagram;
     service com::sun::star::chart::StackableDiagram;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/BarDiagram.idl b/offapi/com/sun/star/chart/BarDiagram.idl
index 7040781e9c50..e3eeee598a55 100644
--- a/offapi/com/sun/star/chart/BarDiagram.idl
+++ b/offapi/com/sun/star/chart/BarDiagram.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart/BubbleDiagram.idl b/offapi/com/sun/star/chart/BubbleDiagram.idl
index 99298ed947d7..9d91c13df2b0 100644
--- a/offapi/com/sun/star/chart/BubbleDiagram.idl
+++ b/offapi/com/sun/star/chart/BubbleDiagram.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_BubbleDiagram_idl__
-#define __com_sun_star_chart_BubbleDiagram_idl__
-
-#ifndef __com_sun_star_chart_Diagram_idl__
-#include <com/sun/star/chart/Diagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
-#include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
-#include <com/sun/star/chart/ChartTwoAxisYSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
-#include <com/sun/star/chart/ChartStatistics.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
+#ifndef __com_sun_star_chart_BubbleDiagram_idl__ 
+#define __com_sun_star_chart_BubbleDiagram_idl__ 
+ 
+#ifndef __com_sun_star_chart_Diagram_idl__ 
+#include <com/sun/star/chart/Diagram.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__ 
+#include <com/sun/star/chart/ChartAxisXSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__ 
+#include <com/sun/star/chart/ChartTwoAxisYSupplier.idl> 
+#endif 
 
+#ifndef __com_sun_star_chart_ChartStatistics_idl__ 
+#include <com/sun/star/chart/ChartStatistics.idl> 
+#endif 
+  
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** a service for bubble diagrams. @since OOo 3.2
  */
 published service BubbleDiagram
-{
+{ 
     service com::sun::star::chart::Diagram;
     service com::sun::star::chart::ChartAxisXSupplier;
     service com::sun::star::chart::ChartTwoAxisYSupplier;
     [optional] service com::sun::star::chart::ChartStatistics;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/Chart3DBarProperties.idl b/offapi/com/sun/star/chart/Chart3DBarProperties.idl
index 31b77e446bf9..3d90ed27f2ba 100644
--- a/offapi/com/sun/star/chart/Chart3DBarProperties.idl
+++ b/offapi/com/sun/star/chart/Chart3DBarProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_Chart3DBarProperties_idl__
-#define __com_sun_star_chart_Chart3DBarProperties_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_Chart3DBarProperties_idl__ 
+#define __com_sun_star_chart_Chart3DBarProperties_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** Specifies all the properties for the graphic object of a data point in a
     three-dimensional bar diagram.@see BarDiagram
  */
 published service Chart3DBarProperties
-{
-    interface com::sun::star::beans::XPropertySet;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    interface com::sun::star::beans::XPropertySet; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Specifies the solid shape of a data point.@see ChartSolidType
      */
-    [property] long SolidType;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] long SolidType; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartArea.idl b/offapi/com/sun/star/chart/ChartArea.idl
index 66109be78471..cab6287332dc 100644
--- a/offapi/com/sun/star/chart/ChartArea.idl
+++ b/offapi/com/sun/star/chart/ChartArea.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartArea_idl__
-#define __com_sun_star_chart_ChartArea_idl__
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
-#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
+#ifndef __com_sun_star_chart_ChartArea_idl__ 
+#define __com_sun_star_chart_ChartArea_idl__ 
+ 
+#ifndef __com_sun_star_drawing_FillProperties_idl__ 
+#include <com/sun/star/drawing/FillProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_LineProperties_idl__ 
+#include <com/sun/star/drawing/LineProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
 
 #ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** Specifies the area elements of a chart, e.g. the
-    background area, the diagram wall, and the diagram floor of
+    background area, the diagram wall, and the diagram floor of 
    three-dimensional charts.
  */
 published service ChartArea
-{
+{ 
     service com::sun::star::drawing::FillProperties;
     service com::sun::star::drawing::LineProperties;
 
@@ -67,10 +67,10 @@ published service ChartArea
     [optional] service com::sun::star::xml::UserDefinedAttributeSupplier;
 
     interface com::sun::star::beans::XPropertySet;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartAxis.idl b/offapi/com/sun/star/chart/ChartAxis.idl
index 05d90b02df53..d49ff078b297 100644
--- a/offapi/com/sun/star/chart/ChartAxis.idl
+++ b/offapi/com/sun/star/chart/ChartAxis.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,65 +24,65 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartAxis_idl__
-#define __com_sun_star_chart_ChartAxis_idl__
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
-#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisArrangeOrderType_idl__
-#include <com/sun/star/chart/ChartAxisArrangeOrderType.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisPosition_idl__
-#include <com/sun/star/chart/ChartAxisPosition.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisLabelPosition_idl__
-#include <com/sun/star/chart/ChartAxisLabelPosition.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisMarkPosition_idl__
-#include <com/sun/star/chart/ChartAxisMarkPosition.idl>
-#endif
-
+#ifndef __com_sun_star_chart_ChartAxis_idl__ 
+#define __com_sun_star_chart_ChartAxis_idl__ 
+ 
+#ifndef __com_sun_star_drawing_LineProperties_idl__ 
+#include <com/sun/star/drawing/LineProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_style_CharacterProperties_idl__ 
+#include <com/sun/star/style/CharacterProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartAxisArrangeOrderType_idl__ 
+#include <com/sun/star/chart/ChartAxisArrangeOrderType.idl> 
+#endif 
+
+#ifndef __com_sun_star_chart_ChartAxisPosition_idl__ 
+#include <com/sun/star/chart/ChartAxisPosition.idl> 
+#endif 
+
+#ifndef __com_sun_star_chart_ChartAxisLabelPosition_idl__ 
+#include <com/sun/star/chart/ChartAxisLabelPosition.idl> 
+#endif 
+
+#ifndef __com_sun_star_chart_ChartAxisMarkPosition_idl__ 
+#include <com/sun/star/chart/ChartAxisMarkPosition.idl> 
+#endif 
+ 
 #ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** Specifies the axes in a diagram.
-
+        
     <p>Note: The text properties correlate to all axis description
     elements, not to just a single text element.</p>
  */
 published service ChartAxis
-{
-
-
+{ 
+ 
+     
     /** set the properties for the entire axis line as well as for the
         tick marks.
      */
-    service com::sun::star::drawing::LineProperties;
-
+    service com::sun::star::drawing::LineProperties; 
+    
     /** set the properties for all text labels of the axis
      */
-    service com::sun::star::style::CharacterProperties;
-
+    service com::sun::star::style::CharacterProperties; 
+    
         /** If a <type>ChartAxis</type> may be stored as XML element, this
             service should be supported in order to preserve unparsed XML
             attributes.
@@ -91,147 +91,147 @@ published service ChartAxis
      */
     [optional] service com::sun::star::xml::UserDefinedAttributeSupplier;
 
-    interface com::sun::star::beans::XPropertySet;
+    interface com::sun::star::beans::XPropertySet; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** Properties for scaling:
     */
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Contains the maximum value for the axis scale.
      */
-    [optional, property] double Max;
-
-    //-------------------------------------------------------------------------
-
+    [optional, property] double Max; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Contains the minimum value for the axis scale.
      */
-    [optional, property] double Min;
-
-    //-------------------------------------------------------------------------
-
+    [optional, property] double Min; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Contains the distance between the main tick marks.
      */
-    [optional, property] double StepMain;
+    [optional, property] double StepMain; 
 
-    //-------------------------------------------------------------------------
-
-    /**
+    //------------------------------------------------------------------------- 
+     
+    /** 
     Contains the number of help intervals within a main interval. E.g. a StepHelpCount of 5 divides
     the main interval into 5 pieces and thus produces 4 help tick marks.
     */
-    [optional, property] long StepHelpCount;
-
-    //-------------------------------------------------------------------------
-
+    [optional, property] long StepHelpCount; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** @deprecated
     User property StepHelpCount instead
     Contains the distance between the help tick marks.
     */
-    [optional, property] double StepHelp;
-
-    //-------------------------------------------------------------------------
-
+    [optional, property] double StepHelp; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The maximum value of the axis scale is calculated by the chart if
         this property is <TRUE/>.
      */
-    [optional, property] boolean AutoMax;
-
-    //-------------------------------------------------------------------------
-
+    [optional, property] boolean AutoMax; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The minimum value of the axis scale is calculated by the chart if
         this property is <TRUE/>.
      */
-    [optional, property] boolean AutoMin;
-
+    [optional, property] boolean AutoMin; 
+ 
     //-------------------------------------------------------------------------
 
     /** The distance between the main tick marks is calculated by the chart
         if this property is <TRUE/>.
      */
-    [optional, property] boolean AutoStepMain;
+    [optional, property] boolean AutoStepMain; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** The number of help intervals within a main interval is calculated by the
         chart if this property is <TRUE/>.
     */
-    [optional, property] boolean AutoStepHelp;
-
-
-    //-------------------------------------------------------------------------
-
+    [optional, property] boolean AutoStepHelp; 
+ 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Determines if the axis is scaled logarithmically or
         not (linear).
      */
-    [optional, property] boolean Logarithmic;
-
-    //-------------------------------------------------------------------------
+    [optional, property] boolean Logarithmic; 
 
+    //------------------------------------------------------------------------- 
+     
     /** Determines if the axis orientation is mathematical or reversed.
      */
     [optional, property] boolean ReverseDirection;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** Determines where the axis crosses the other axis.
      */
-    [optional, property] com::sun::star::chart::ChartAxisPosition CrossoverPosition;
-
-    //-------------------------------------------------------------------------
+    [optional, property] com::sun::star::chart::ChartAxisPosition CrossoverPosition; 
 
+    //------------------------------------------------------------------------- 
+     
     /** Determines the scale value on the other axis when CrossoverPosition is set to VALUE.
      */
-    [optional, property] double CrossoverValue;
-
-    //-------------------------------------------------------------------------
+    [optional, property] double CrossoverValue; 
 
+    //------------------------------------------------------------------------- 
+     
     /** Indicates the reference value where bars or areas have their grounding.
         This property has only an effect when the used ODF file format does not allow for
         further axis positioning or the axis is a secondary y-axis.
      */
-    [optional, property] double Origin;
-
-    //-------------------------------------------------------------------------
+    [optional, property] double Origin; 
 
+    //------------------------------------------------------------------------- 
+     
     /** The origin is calculated by the chart if this property is <TRUE/>.
      */
-    [optional, property] boolean AutoOrigin;
-
-    //-------------------------------------------------------------------------
+    [optional, property] boolean AutoOrigin; 
+     
+    //------------------------------------------------------------------------- 
     /** Properties for interval marks:
     */
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** Determines the type of the marks.@see ChartAxisMarks
      */
-    [property] long Marks;
-
-    //-------------------------------------------------------------------------
-
+    [property] long Marks; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Determines the type of the help marks.@see ChartAxisMarks
      */
-    [property] long HelpMarks;
-    //-------------------------------------------------------------------------
-
+    [property] long HelpMarks; 
+    //------------------------------------------------------------------------- 
+     
     /** Determines where the interval marks are placed.
      */
-    [optional, property] com::sun::star::chart::ChartAxisMarkPosition MarkPosition;
+    [optional, property] com::sun::star::chart::ChartAxisMarkPosition MarkPosition; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** Properties for axes labels:
     */
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** Determines whether to display text at the axis or not.
      */
-    [property] boolean DisplayLabels;
-
-    //-------------------------------------------------------------------------
+    [property] boolean DisplayLabels; 
 
+    //------------------------------------------------------------------------- 
+     
     /** Contains the type id for the number formatter of the axis.
 
         @see com::sun::star::util::XNumberFormatter
@@ -246,66 +246,66 @@ published service ChartAxis
      */
     [optional, property] boolean LinkNumberFormatToSource;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** Determines where the axis labels are placed.
      */
-    [optional, property] com::sun::star::chart::ChartAxisLabelPosition LabelPosition;
-
-    //-------------------------------------------------------------------------
-
+    [optional, property] com::sun::star::chart::ChartAxisLabelPosition LabelPosition; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Determines the rotation of the text elements
         (axis description) in 100th degrees.
      */
-    [property] long TextRotation;
-
-    //-------------------------------------------------------------------------
+    [property] long TextRotation; 
 
+    //------------------------------------------------------------------------- 
+     
     /** The axis description may be arranged in a special order for a
         better placement.
      */
-    [property] com::sun::star::chart::ChartAxisArrangeOrderType ArrangeOrder;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::chart::ChartAxisArrangeOrderType ArrangeOrder; 
+  
+    //------------------------------------------------------------------------- 
+     
     /** Determines if long text is broken into multiple lines.
      */
-    [property] boolean TextBreak;
+    [property] boolean TextBreak; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** Determines if certain labels are hidden, if they would otherwise overlap.
         In this case, the value of this property must be set to <FALSE/>.
      */
     [property] boolean TextCanOverlap;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** Properties related to bar charts:
     */
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** Determines the overlap of the bars in a bar-type chart.
-
+        
         <p>The value is given in percent of the width of the bars. The
         valid range is -100% to +100%. +100% means full overlap, -100%
         indicates a distance of one bar between 2 neighboring bars.</p>
      */
-    [property] long Overlap;
-
-    //-------------------------------------------------------------------------
-
+    [property] long Overlap; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Specifies the width of the gaps between each set of data points
         in a bar chart.
-
+        
         <p>The value is given in percent of the width of a bar; the
         valid range is 0 to 600%.</p>
      */
-    [property] long GapWidth;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] long GapWidth; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartAxisArrangeOrderType.idl b/offapi/com/sun/star/chart/ChartAxisArrangeOrderType.idl
index 1fbd6f311883..e9e1d7c8df3b 100644
--- a/offapi/com/sun/star/chart/ChartAxisArrangeOrderType.idl
+++ b/offapi/com/sun/star/chart/ChartAxisArrangeOrderType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartAxisArrangeOrderType_idl__
-#define __com_sun_star_chart_ChartAxisArrangeOrderType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartAxisArrangeOrderType_idl__ 
+#define __com_sun_star_chart_ChartAxisArrangeOrderType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** Values specify the arrangement of the axes descriptions.
  */
 published enum ChartAxisArrangeOrderType
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** The descriptions are arranged automatically.
-
+        
         <p>If there is enough space to put them side by side, this
         arrangement is preferred. If the descriptions would overlap
         when arranged side by side, they are staggered.</p>
      */
     AUTO,
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The descriptions are arranged side by side.
      */
     SIDE_BY_SIDE,
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The descriptions are alternately put on two lines with the even
         values out of the normal line.
      */
     STAGGER_EVEN,
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The descriptions are alternately put on two lines with the odd
         values out of the normal line.
      */
     STAGGER_ODD
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartAxisAssign.idl b/offapi/com/sun/star/chart/ChartAxisAssign.idl
index 5f9916b2b5a0..118996ffbd00 100644
--- a/offapi/com/sun/star/chart/ChartAxisAssign.idl
+++ b/offapi/com/sun/star/chart/ChartAxisAssign.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartAxisAssign_idl__
-#define __com_sun_star_chart_ChartAxisAssign_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartAxisAssign_idl__ 
+#define __com_sun_star_chart_ChartAxisAssign_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** These values specify to which y-axis a data row is assigned.
  */
 published constants ChartAxisAssign
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** Assign row to primary <i>y</i>-axis
      */
     const long PRIMARY_Y = 2;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Assign row to secondary <i>y</i>-axis
      */
     const long SECONDARY_Y = 4;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartAxisLabelPosition.idl b/offapi/com/sun/star/chart/ChartAxisLabelPosition.idl
index c22ca85f2885..31ee80813784 100644
--- a/offapi/com/sun/star/chart/ChartAxisLabelPosition.idl
+++ b/offapi/com/sun/star/chart/ChartAxisLabelPosition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,52 +24,52 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartAxisLabelPosition_idl__
-#define __com_sun_star_chart_ChartAxisLabelPosition_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
-/** Specifies the position of the axis labels with respect to the axis on the scale of the crossing axis.
+#ifndef __com_sun_star_chart_ChartAxisLabelPosition_idl__ 
+#define __com_sun_star_chart_ChartAxisLabelPosition_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
+/** Specifies the position of the axis labels with respect to the axis on the scale of the crossing axis. 
 */
 
 published enum ChartAxisLabelPosition
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** The labels are placed adjacent to the axis. When the axis itself is placed at the minimum or maximum of the scale ( that is when the property CrossoverPosition equals ChartAxisPosition_MINIMUM or ChartAxisPosition_MAXIMUM)
         the labels are placed outside the coordinate system. Otherwise the labels are placed adjacent to the axis on that side that belongs to the lower values on the crossing axis.
         E.g. when the ChartAxisLabelPosition is set to NEAR_AXIS for an y axis the labels are placed adjacent to the y axis on that side that belongs to the lower x values.
      */
     NEAR_AXIS,
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** The labels are placed adjacent to the axis on the opposite side as for NEAR_AXIS.
      */
     NEAR_AXIS_OTHER_SIDE,
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The labels are placed outside the coordinate region on that side where the crossing axis has its minimum value.
         E.g. when this is set for an y axis the labels are placed outside the diagram on that side where to the x axis has its minimum value.
      */
     OUTSIDE_START,
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** The labels are placed outside the coordinate region on that side where the crossing axis has its maximum value.
         E.g. when this is set for an y axis the labels are placed outside the diagram on that side where to the x axis has its maximum value.
      */
     OUTSIDE_END
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartAxisMarkPosition.idl b/offapi/com/sun/star/chart/ChartAxisMarkPosition.idl
index c47d7b05f22d..f2c4d8979cda 100644
--- a/offapi/com/sun/star/chart/ChartAxisMarkPosition.idl
+++ b/offapi/com/sun/star/chart/ChartAxisMarkPosition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartAxisMarkPosition_idl__
-#define __com_sun_star_chart_ChartAxisMarkPosition_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartAxisMarkPosition_idl__ 
+#define __com_sun_star_chart_ChartAxisMarkPosition_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** Specifies the position of the axis interval marks.
 */
 
 published enum ChartAxisMarkPosition
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** The interval marks are drawn besides the axis labels.
      */
     AT_LABELS,
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** The interval marks are drawn at the axis line.
     This makes a difference to 'AT_LABELS' only when the labels are not placed near the axis (@see ChartAxisLabelPosition).
      */
     AT_AXIS,
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Interval marks are drawn at the axis line and also besides the axis labels.
     This makes a difference to 'AT_LABELS' only when the labels are not placed near the axis (@see ChartAxisLabelPosition).
      */
     AT_LABELS_AND_AXIS
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartAxisMarks.idl b/offapi/com/sun/star/chart/ChartAxisMarks.idl
index 06e84453f3a3..427fdede4f39 100644
--- a/offapi/com/sun/star/chart/ChartAxisMarks.idl
+++ b/offapi/com/sun/star/chart/ChartAxisMarks.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartAxisMarks_idl__
-#define __com_sun_star_chart_ChartAxisMarks_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartAxisMarks_idl__ 
+#define __com_sun_star_chart_ChartAxisMarks_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** With these constants you can specify how the tick-marks of an axis
     are displayed.
 
@@ -42,29 +42,29 @@
     extend in both directions.</p>
  */
 published constants ChartAxisMarks
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** Do not display any marks.
      */
-    const long NONE = 0;
-
-    //-------------------------------------------------------------------------
-
+    const long NONE = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Display marks that point into the diagram area.
      */
-    const long INNER = 1;
-
-    //-------------------------------------------------------------------------
-
+    const long INNER = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Display marks that point out of the diagram area.
      */
-    const long OUTER = 2;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const long OUTER = 2; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartAxisPosition.idl b/offapi/com/sun/star/chart/ChartAxisPosition.idl
index 190f3089b557..aeb45cd444ba 100644
--- a/offapi/com/sun/star/chart/ChartAxisPosition.idl
+++ b/offapi/com/sun/star/chart/ChartAxisPosition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartAxisPosition_idl__
-#define __com_sun_star_chart_ChartAxisPosition_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartAxisPosition_idl__ 
+#define __com_sun_star_chart_ChartAxisPosition_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** Specifies the position of the axis on the scale of the crossing axis.
 When the property is set at a x-axis it indicates a position on the scale of the primary y-axis.
 When the property is set at a y-axis it indicates a position on the scale of the primary x-axis.
@@ -41,33 +41,33 @@ When the property is set at a y-axis it indicates a position on the scale of the
 
 published enum ChartAxisPosition
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** Cross the other axes at zero. If zero is not contained in the current scale the value is used which is nearest to zero.
      */
     ZERO,
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Cross the other axes at their minimum scale value.
      */
     START,
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Cross the other axes at their maximum scale value.
      */
     END,
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Cross the other axes at the value specified in the property CrossoverValue.
      */
     VALUE
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartAxisXSupplier.idl b/offapi/com/sun/star/chart/ChartAxisXSupplier.idl
index c59a3988a866..28d7f784ba63 100644
--- a/offapi/com/sun/star/chart/ChartAxisXSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartAxisXSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,67 +24,67 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
-#define __com_sun_star_chart_ChartAxisXSupplier_idl__
-
-#ifndef __com_sun_star_chart_XAxisXSupplier_idl__
-#include <com/sun/star/chart/XAxisXSupplier.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__ 
+#define __com_sun_star_chart_ChartAxisXSupplier_idl__ 
+ 
+#ifndef __com_sun_star_chart_XAxisXSupplier_idl__ 
+#include <com/sun/star/chart/XAxisXSupplier.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** has to be supported by charts providing the capabilities of a
    horizontal axis, i.e., an <em>x</em>-axis.
  */
 published service ChartAxisXSupplier
-{
+{ 
     /** offers access to the axis object, the title, and the grids
      */
-    interface com::sun::star::chart::XAxisXSupplier;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::chart::XAxisXSupplier; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This property determines if the x-axis is shown or hidden.@see ChartAxis
      */
-    [property] boolean HasXAxis;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean HasXAxis; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Determines if the description of the x-axis is
         shown or hidden.
      */
-    [property] boolean HasXAxisDescription;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean HasXAxisDescription; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Determines if the major grid of the x-axis is
         shown or hidden.@see ChartGrid
      */
-    [property] boolean HasXAxisGrid;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean HasXAxisGrid; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Determines if the minor grid of the x-axis is shown
         or hidden.@see ChartGrid
      */
-    [property] boolean HasXAxisHelpGrid;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean HasXAxisHelpGrid; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Determines if the title of the x-axis is shown
         or hidden.@see ChartTitle
      */
-    [property] boolean HasXAxisTitle;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] boolean HasXAxisTitle; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartAxisYSupplier.idl b/offapi/com/sun/star/chart/ChartAxisYSupplier.idl
index aa33daad6031..009b8259d942 100644
--- a/offapi/com/sun/star/chart/ChartAxisYSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartAxisYSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,66 +24,66 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__
-#define __com_sun_star_chart_ChartAxisYSupplier_idl__
-
-#ifndef __com_sun_star_chart_XAxisYSupplier_idl__
-#include <com/sun/star/chart/XAxisYSupplier.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__ 
+#define __com_sun_star_chart_ChartAxisYSupplier_idl__ 
+ 
+#ifndef __com_sun_star_chart_XAxisYSupplier_idl__ 
+#include <com/sun/star/chart/XAxisYSupplier.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** A helper service for the y-axis.
  */
 published service ChartAxisYSupplier
-{
+{ 
     /** offers access to the axis object, the title, and the grids
      */
-    interface com::sun::star::chart::XAxisYSupplier;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::chart::XAxisYSupplier; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Determines if the y-axis is shown or hidden.@see ChartAxis
      */
-    [property] boolean HasYAxis;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean HasYAxis; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Determines if the description of the y-axis
         is shown or hidden.
      */
-    [property] boolean HasYAxisDescription;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean HasYAxisDescription; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Determines if the major grid of the y-axis is
         shown or hidden.@see ChartGrid
      */
-    [property] boolean HasYAxisGrid;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean HasYAxisGrid; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Determines if the minor grid of the y-axis is
         shown or hidden.@see ChartGrid
      */
-    [property] boolean HasYAxisHelpGrid;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean HasYAxisHelpGrid; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Determines if the title of the y-axis is shown
         or hidden.@see ChartTitle
      */
-    [property] boolean HasYAxisTitle;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] boolean HasYAxisTitle; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartAxisZSupplier.idl b/offapi/com/sun/star/chart/ChartAxisZSupplier.idl
index 3e18709c0319..a9c5bcc141d5 100644
--- a/offapi/com/sun/star/chart/ChartAxisZSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartAxisZSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,65 +24,65 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartAxisZSupplier_idl__
-#define __com_sun_star_chart_ChartAxisZSupplier_idl__
-
-#ifndef __com_sun_star_chart_XAxisZSupplier_idl__
-#include <com/sun/star/chart/XAxisZSupplier.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartAxisZSupplier_idl__ 
+#define __com_sun_star_chart_ChartAxisZSupplier_idl__ 
+ 
+#ifndef __com_sun_star_chart_XAxisZSupplier_idl__ 
+#include <com/sun/star/chart/XAxisZSupplier.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** A helper service for chart documents which supply a z-axis.
  */
 published service ChartAxisZSupplier
-{
+{ 
     /** offers access to the axis object, the title, and the grids
      */
-    interface com::sun::star::chart::XAxisZSupplier;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::chart::XAxisZSupplier; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Determines if the z-axis is shown or hidden.@see ChartAxis
      */
-    [property] boolean HasZAxis;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean HasZAxis; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Determines if the description of the z-axis
         is shown or hidden.
      */
-    [property] boolean HasZAxisDescription;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean HasZAxisDescription; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Determines if the major grid of the z-axis
         is shown or hidden.@see ChartGrid
      */
-    [property] boolean HasZAxisGrid;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean HasZAxisGrid; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Determines if the minor grid of the z-axis is shown
         or hidden.@see ChartGrid
      */
-    [property] boolean HasZAxisHelpGrid;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean HasZAxisHelpGrid; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Determines if the title of the z-axis is shown
         or hidden.@see ChartTitle
      */
-    [property] boolean HasZAxisTitle;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] boolean HasZAxisTitle; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartData.idl b/offapi/com/sun/star/chart/ChartData.idl
index ec5efcbe8db6..a0361d27b024 100644
--- a/offapi/com/sun/star/chart/ChartData.idl
+++ b/offapi/com/sun/star/chart/ChartData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartData_idl__
-#define __com_sun_star_chart_ChartData_idl__
-
-#ifndef __com_sun_star_chart_XChartData_idl__
-#include <com/sun/star/chart/XChartData.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartData_idl__ 
+#define __com_sun_star_chart_ChartData_idl__ 
+ 
+#ifndef __com_sun_star_chart_XChartData_idl__ 
+#include <com/sun/star/chart/XChartData.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** must be supported by every component that wants to provide data
    for a chart
  */
 published service ChartData
-{
+{ 
     interface com::sun::star::chart::XChartData;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartDataArray.idl b/offapi/com/sun/star/chart/ChartDataArray.idl
index da4e2564f5c9..8540a7929bc8 100644
--- a/offapi/com/sun/star/chart/ChartDataArray.idl
+++ b/offapi/com/sun/star/chart/ChartDataArray.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartDataArray_idl__
-#define __com_sun_star_chart_ChartDataArray_idl__
-
-#ifndef __com_sun_star_chart_ChartData_idl__
-#include <com/sun/star/chart/ChartData.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
-#include <com/sun/star/chart/XChartDataArray.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XChartData_idl__
-#include <com/sun/star/chart/XChartData.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartDataArray_idl__ 
+#define __com_sun_star_chart_ChartDataArray_idl__ 
+ 
+#ifndef __com_sun_star_chart_ChartData_idl__ 
+#include <com/sun/star/chart/ChartData.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_XChartDataArray_idl__ 
+#include <com/sun/star/chart/XChartDataArray.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_XChartData_idl__ 
+#include <com/sun/star/chart/XChartData.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** must be supported by each data source for charts, where you want
     to access the values directly.
 
@@ -53,13 +53,13 @@
     each row and column.</p>
  */
 published service ChartDataArray
-{
+{ 
     service com::sun::star::chart::ChartData;
     interface com::sun::star::chart::XChartDataArray;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartDataCaption.idl b/offapi/com/sun/star/chart/ChartDataCaption.idl
index a6b3d4f56607..5e366111e2c9 100644
--- a/offapi/com/sun/star/chart/ChartDataCaption.idl
+++ b/offapi/com/sun/star/chart/ChartDataCaption.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartDataCaption_idl__
-#define __com_sun_star_chart_ChartDataCaption_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartDataCaption_idl__ 
+#define __com_sun_star_chart_ChartDataCaption_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** These values specify how the captions of data points are displayed.
  */
 published constants ChartDataCaption
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** No captions are displayed.
      */
     const long NONE = 0;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The caption contains the value of the data point in the number
         format of the axis that is attached to the respective data
         series.
      */
     const long VALUE = 1;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The caption contains the value of the data point in percent of
         all data points of one category.
 
@@ -62,32 +62,32 @@ published constants ChartDataCaption
         all available series.</p>
      */
     const long PERCENT = 2;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The caption contains the category name of the category to
         which a data point belongs.
      */
     const long TEXT = 4;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The number formatter is always used for displaying the value
         as value.  So this setting is deprecated.
 
         @deprecated
      */
     const long FORMAT = 8;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The symbol of data column/row is additionally displayed in the caption.
      */
     const long SYMBOL = 16;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartDataChangeEvent.idl b/offapi/com/sun/star/chart/ChartDataChangeEvent.idl
index bca4a7b565fd..03ced44b8d50 100644
--- a/offapi/com/sun/star/chart/ChartDataChangeEvent.idl
+++ b/offapi/com/sun/star/chart/ChartDataChangeEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,62 +24,62 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartDataChangeEvent_idl__
-#define __com_sun_star_chart_ChartDataChangeEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartDataChangeType_idl__
-#include <com/sun/star/chart/ChartDataChangeType.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartDataChangeEvent_idl__ 
+#define __com_sun_star_chart_ChartDataChangeEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartDataChangeType_idl__ 
+#include <com/sun/star/chart/ChartDataChangeType.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** describes a change that was applied to the data.
  */
 published struct ChartDataChangeEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the type of change to the data.
      */
-    com::sun::star::chart::ChartDataChangeType Type;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::chart::ChartDataChangeType Type; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the column number in which the changes begin.
      */
-    short StartColumn;
-
-    //-------------------------------------------------------------------------
-
+    short StartColumn; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the column number in which the changes end.
      */
-    short EndColumn;
-
-    //-------------------------------------------------------------------------
-
+    short EndColumn; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the row number in which the changes begin.
      */
-    short StartRow;
-
-    //-------------------------------------------------------------------------
-
+    short StartRow; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the row number in which the changes end.
      */
-    short EndRow;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    short EndRow; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartDataChangeType.idl b/offapi/com/sun/star/chart/ChartDataChangeType.idl
index cd75583a55be..4d43d2c777cc 100644
--- a/offapi/com/sun/star/chart/ChartDataChangeType.idl
+++ b/offapi/com/sun/star/chart/ChartDataChangeType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,65 +24,65 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartDataChangeType_idl__
-#define __com_sun_star_chart_ChartDataChangeType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartDataChangeType_idl__ 
+#define __com_sun_star_chart_ChartDataChangeType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** specifies the type of change that was applied to the data.
  */
 published enum ChartDataChangeType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** Major changes were applied to the data.
      */
-    ALL,
-
-    //-------------------------------------------------------------------------
-
+    ALL, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The range of columns and rows, given in the
          <type>ChartDataChangeEvent</type>, has changed.
      */
-    DATA_RANGE,
-
-    //-------------------------------------------------------------------------
-
+    DATA_RANGE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The column given in the <type>ChartDataChangeEvent</type>, was
         inserted.
      */
-    COLUMN_INSERTED,
-
-    //-------------------------------------------------------------------------
-
+    COLUMN_INSERTED, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The row given in the <type>ChartDataChangeEvent</type>, was
         inserted.
      */
-    ROW_INSERTED,
-
-    //-------------------------------------------------------------------------
-
+    ROW_INSERTED, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The column given in the <type>ChartDataChangeEvent</type>, was
         deleted.
     */
-    COLUMN_DELETED,
-
-    //-------------------------------------------------------------------------
-
+    COLUMN_DELETED, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The row given in the <type>ChartDataChangeEvent</type>, was
         deleted.
      */
-    ROW_DELETED
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    ROW_DELETED 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartDataPoint.idl b/offapi/com/sun/star/chart/ChartDataPoint.idl
index 3494ae1f3853..538f0f0c150d 100644
--- a/offapi/com/sun/star/chart/ChartDataPoint.idl
+++ b/offapi/com/sun/star/chart/ChartDataPoint.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module chart {
+module com { module sun { module star { module chart { 
 
 //=============================================================================
 /** @deprecated
@@ -42,6 +42,6 @@ published typedef sequence<ChartDataValue> ChartDataPoint;
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/chart/ChartDataPointProperties.idl b/offapi/com/sun/star/chart/ChartDataPointProperties.idl
index d7a9db2da496..13086679a26c 100644
--- a/offapi/com/sun/star/chart/ChartDataPointProperties.idl
+++ b/offapi/com/sun/star/chart/ChartDataPointProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartDataPointProperties_idl__
-#define __com_sun_star_chart_ChartDataPointProperties_idl__
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
-#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
-#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_chart_Chart3DBarPropertiesidl__
-#include <com/sun/star/chart/Chart3DBarProperties.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
+#ifndef __com_sun_star_chart_ChartDataPointProperties_idl__ 
+#define __com_sun_star_chart_ChartDataPointProperties_idl__ 
+ 
+#ifndef __com_sun_star_drawing_FillProperties_idl__ 
+#include <com/sun/star/drawing/FillProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_LineProperties_idl__ 
+#include <com/sun/star/drawing/LineProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_style_CharacterProperties_idl__ 
+#include <com/sun/star/style/CharacterProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_Chart3DBarPropertiesidl__ 
+#include <com/sun/star/chart/Chart3DBarProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
 #endif
 
 #ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** specifies all the properties for the graphic object of
     a data point (e.g., a single bar in a bar chart).
 
@@ -68,18 +68,18 @@
     @see ChartDataRowProperties
  */
 published service ChartDataPointProperties
-{
+{ 
     /** This service has to be supported for data points that can be
         filled.
      */
-    [optional] service com::sun::star::drawing::FillProperties;
-
-    service com::sun::star::drawing::LineProperties;
-
+    [optional] service com::sun::star::drawing::FillProperties; 
+    
+    service com::sun::star::drawing::LineProperties; 
+    
     /** These properties affect the characters of data captions if
         those are displayed.
      */
-    service com::sun::star::style::CharacterProperties;
+    service com::sun::star::style::CharacterProperties; 
 
     /** If <type>ChartDataPointProperties</type> may be stored as XML
         element, this service should be supported in order to preserve
@@ -89,65 +89,65 @@ published service ChartDataPointProperties
      */
     [optional] service com::sun::star::xml::UserDefinedAttributeSupplier;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** is only available if the chart is of type
         <type>BarDiagram</type> and <type>Dim3DDiagram</type> and the
         property <member>ChartDataPointProperties::Dim3D</member> is
         set to <TRUE/>.
 
-        @see BarDiagram
-        @see Dim3DDiagram@see BarDiagram
+        @see BarDiagram 
+        @see Dim3DDiagram@see BarDiagram 
         @see Dim3DDiagram
      */
-    [optional] service com::sun::star::chart::Chart3DBarProperties;
-
-    interface com::sun::star::beans::XPropertySet;
-
-    //-------------------------------------------------------------------------
-
+    [optional] service com::sun::star::chart::Chart3DBarProperties; 
+ 
+    interface com::sun::star::beans::XPropertySet; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies how the captions of data points are displayed.@see ChartDataCaption
      */
-    [property] long DataCaption;
+    [property] long DataCaption; 
 
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** specifies a string that is used to separate the parts of a data label (caption)
      */
     [optional, property] string LabelSeparator;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** specifies a number format for the display of the value in the data label
      */
     [optional, property] long NumberFormat;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** specifies a number format for the display of the percentage value in the data label
      */
     [optional, property] long PercentageNumberFormat;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies a relative position for the data label
 
         @see DataLabelPlacement
      */
     [optional, property] long LabelPlacement;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** specifies the type of symbols if the current chart type
         supports the usage of symbols.
 
         @see ChartSymbolType
      */
-    [optional, property] long SymbolType;
-
-    //-------------------------------------------------------------------------
+    [optional, property] long SymbolType; 
 
+    //------------------------------------------------------------------------- 
+     
     /** In charts that support symbols, you can set this property to
         any valid URL that points to a graphic file.  This graphic is
         then used as symbol for each data point.
@@ -164,10 +164,10 @@ published service ChartDataPointProperties
         percent of the radius.
      */
     [optional, property] long SegmentOffset;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartDataRow.idl b/offapi/com/sun/star/chart/ChartDataRow.idl
index 05f2002d60c8..0e6b105a3a66 100644
--- a/offapi/com/sun/star/chart/ChartDataRow.idl
+++ b/offapi/com/sun/star/chart/ChartDataRow.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartDataRow_idl__
-#define __com_sun_star_chart_ChartDataRow_idl__
-
-#ifndef __com_sun_star_chart_ChartDataValue_idl__
-#include <com/sun/star/chart/ChartDataValue.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartDataRow_idl__ 
+#define __com_sun_star_chart_ChartDataRow_idl__ 
+ 
+#ifndef __com_sun_star_chart_ChartDataValue_idl__ 
+#include <com/sun/star/chart/ChartDataValue.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** describes a single data row, specified by its name and
     a sequence of data points.
 
     <p>This struct is currently used nowhere.</p>
-
+        
     @deprecated
  */
 published struct ChartDataRow
 {
     /** The name of the data row.
      */
-    string Name;
-
-    //-------------------------------------------------------------------------
+    string Name; 
+ 
+    //------------------------------------------------------------------------- 
     /** The points contained in this data row.
      */
     sequence< sequence<ChartDataValue> > Points;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartDataRowProperties.idl b/offapi/com/sun/star/chart/ChartDataRowProperties.idl
index 27a02f598c3e..77c310ce0ddb 100644
--- a/offapi/com/sun/star/chart/ChartDataRowProperties.idl
+++ b/offapi/com/sun/star/chart/ChartDataRowProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartDataRowProperties_idl__
-#define __com_sun_star_chart_ChartDataRowProperties_idl__
-
-#ifndef __com_sun_star_chart_ChartDataPointProperties_idl__
-#include <com/sun/star/chart/ChartDataPointProperties.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
-#include <com/sun/star/chart/ChartStatistics.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
+#ifndef __com_sun_star_chart_ChartDataRowProperties_idl__ 
+#define __com_sun_star_chart_ChartDataRowProperties_idl__ 
+ 
+#ifndef __com_sun_star_chart_ChartDataPointProperties_idl__ 
+#include <com/sun/star/chart/ChartDataPointProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartStatistics_idl__ 
+#include <com/sun/star/chart/ChartStatistics.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
 #ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** specifies the properties for a group of graphic elements which
     belong to a data row (also known as data series).
 
@@ -60,12 +60,12 @@
     @see ChartDataPointProperties
  */
 published service ChartDataRowProperties
-{
-    service com::sun::star::chart::ChartDataPointProperties;
+{ 
+    service com::sun::star::chart::ChartDataPointProperties; 
     /** Statistical properties are not available for all types of
         diagrams.
     */
-    [optional] service com::sun::star::chart::ChartStatistics;
+    [optional] service com::sun::star::chart::ChartStatistics; 
 
     /** If <type>ChartDataRowProperties</type> may be stored as XML
         file, this service should be supported in order to preserve
@@ -75,10 +75,10 @@ published service ChartDataRowProperties
      */
     [optional] service com::sun::star::xml::UserDefinedAttributeSupplier;
 
-    interface com::sun::star::beans::XPropertySet;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::beans::XPropertySet; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines to which axis the data row is assigned.
 
         <p>The axis must be a primary or secondary y-axis</p>
@@ -87,41 +87,41 @@ published service ChartDataRowProperties
         @see ChartAxisYSupplier
         @see ChartTwoAxisYSupplier
      */
-    [property] long Axis;
-
-    //-------------------------------------------------------------------------
-
+    [property] long Axis; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** holds the properties of the regression line, if such one is
         enabled.
 
         @see ChartLine
         @see ChartStatistics
      */
-    [optional, readonly, property] com::sun::star::beans::XPropertySet DataRegressionProperties;
-
-    //-------------------------------------------------------------------------
-
+    [optional, readonly, property] com::sun::star::beans::XPropertySet DataRegressionProperties; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** holds the properties of the error markers, if those are
         enabled.
 
         @see ChartLine
         @see ChartStatistics
      */
-    [optional, readonly, property] com::sun::star::beans::XPropertySet DataErrorProperties;
-
-    //-------------------------------------------------------------------------
-
+    [optional, readonly, property] com::sun::star::beans::XPropertySet DataErrorProperties; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** holds the properties of the average line, if such one is
         enabled.
 
         @see ChartLine
         @see ChartStatistics
      */
-    [optional, readonly, property] com::sun::star::beans::XPropertySet DataMeanValueProperties;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [optional, readonly, property] com::sun::star::beans::XPropertySet DataMeanValueProperties; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartDataRowSource.idl b/offapi/com/sun/star/chart/ChartDataRowSource.idl
index 8e9dc226d90f..57ddac76a801 100644
--- a/offapi/com/sun/star/chart/ChartDataRowSource.idl
+++ b/offapi/com/sun/star/chart/ChartDataRowSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartDataRowSource_idl__
-#define __com_sun_star_chart_ChartDataRowSource_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartDataRowSource_idl__ 
+#define __com_sun_star_chart_ChartDataRowSource_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** specifies if the data rows (aka data series) displayed in the
     chart, take their values from the row or the column in the underlying
     data source (<type>ChartDataArray</type>).
  */
 published enum ChartDataRowSource
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** values displayed as data rows are taken from the rows of the data source.
      */
-    ROWS,
-
-    //-------------------------------------------------------------------------
-
+    ROWS, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** values displayed as data rows are taken from the columns of the data source.
      */
-    COLUMNS
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    COLUMNS 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartDataValue.idl b/offapi/com/sun/star/chart/ChartDataValue.idl
index 532ed8c9958b..3761c1accce4 100644
--- a/offapi/com/sun/star/chart/ChartDataValue.idl
+++ b/offapi/com/sun/star/chart/ChartDataValue.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartDataValue_idl__
-#define __com_sun_star_chart_ChartDataValue_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartDataValue_idl__ 
+#define __com_sun_star_chart_ChartDataValue_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** describes a single data value, including the error
 
     <p>This struct is currently used nowhere.</p>
@@ -44,24 +44,24 @@ published struct ChartDataValue
 {
     /** value by itself.
      */
-    double Value;
-
-    //-------------------------------------------------------------------------
-
+    double Value; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** highest possible error value.
      */
-    double HighError;
-
-    //-------------------------------------------------------------------------
-
+    double HighError; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** lowest possible error value.
      */
-    double LowError;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    double LowError; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartDocument.idl b/offapi/com/sun/star/chart/ChartDocument.idl
index 2c5227329778..a45ebeb301fb 100644
--- a/offapi/com/sun/star/chart/ChartDocument.idl
+++ b/offapi/com/sun/star/chart/ChartDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,9 +54,9 @@
     the diagram and some additional elements like a main title, a
     sub-title or a legend.
 
-    </p>@see Diagram
-        @see ChartLegend
-        @see ChartTitle
+    </p>@see Diagram 
+        @see ChartLegend 
+        @see ChartTitle 
         @see ChartDataArray
  */
 published service ChartDocument
@@ -74,19 +74,19 @@ published service ChartDocument
 
     [optional] interface ::com::sun::star::drawing::XDrawPageSupplier;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** determines if the main title is shown or hidden.
      */
     [property] boolean HasMainTitle;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** determines if the subtitle is shown or hidden.
      */
     [property] boolean HasSubTitle;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** determines if the legend is shown or hidden.
      */
diff --git a/offapi/com/sun/star/chart/ChartErrorCategory.idl b/offapi/com/sun/star/chart/ChartErrorCategory.idl
index 6f51ca054a07..5634b1b6af35 100644
--- a/offapi/com/sun/star/chart/ChartErrorCategory.idl
+++ b/offapi/com/sun/star/chart/ChartErrorCategory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartErrorCategory_idl__
-#define __com_sun_star_chart_ChartErrorCategory_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartErrorCategory_idl__ 
+#define __com_sun_star_chart_ChartErrorCategory_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** specifies the category of error indicators.
  */
 published enum ChartErrorCategory
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** error indicators are not displayed.
      */
-    NONE,
-
-    //-------------------------------------------------------------------------
-
+    NONE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** displays error indicators for the variance of the data row.
      */
-    VARIANCE,
-
-    //-------------------------------------------------------------------------
-
+    VARIANCE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** displays error indicators for the standard deviation (square
         root of variance) of the data row.
      */
-    STANDARD_DEVIATION,
-
-    //-------------------------------------------------------------------------
-
+    STANDARD_DEVIATION, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The length of the error indicators is calculated for each data
         point by taking the percentage given as
         <member>ChartStatistics::PercentageError</member> of its
@@ -67,9 +67,9 @@ published enum ChartErrorCategory
         @see ChartStatistics
      */
     PERCENT,
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The length of the error indicators for all data points is
         calculated by taking the percentage given as
         <member>ChartStatistics::ErrorMargin</member> of the largest
@@ -77,10 +77,10 @@ published enum ChartErrorCategory
 
         @see ChartStatistics
      */
-    ERROR_MARGIN,
-
-    //-------------------------------------------------------------------------
-
+    ERROR_MARGIN, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** displays the same lower and upper error indicators for all
         data points.
 
@@ -90,12 +90,12 @@ published enum ChartErrorCategory
 
         @see ChartStatistics
      */
-    CONSTANT_VALUE
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    CONSTANT_VALUE 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartErrorIndicatorType.idl b/offapi/com/sun/star/chart/ChartErrorIndicatorType.idl
index fd3dd80f299d..2f8db6fa74f3 100644
--- a/offapi/com/sun/star/chart/ChartErrorIndicatorType.idl
+++ b/offapi/com/sun/star/chart/ChartErrorIndicatorType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartErrorIndicatorType_idl__
-#define __com_sun_star_chart_ChartErrorIndicatorType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartErrorIndicatorType_idl__ 
+#define __com_sun_star_chart_ChartErrorIndicatorType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** specifies how the error is indicated.
  */
 published enum ChartErrorIndicatorType
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** displays no error indicators.
      */
     NONE,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** displays both the upper and lower values.
      */
     TOP_AND_BOTTOM,
-
-    //-------------------------------------------------------------------------
+ 
+    //------------------------------------------------------------------------- 
 
     /** displays only the upper value.
      */
     UPPER,
-
-    //-------------------------------------------------------------------------
+ 
+    //------------------------------------------------------------------------- 
 
     /** displays only the lower value.
      */
     LOWER
 };
 
-//=============================================================================
+//============================================================================= 
 
 }; }; }; };
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartGrid.idl b/offapi/com/sun/star/chart/ChartGrid.idl
index b4c6f6001e13..a999e613def0 100644
--- a/offapi/com/sun/star/chart/ChartGrid.idl
+++ b/offapi/com/sun/star/chart/ChartGrid.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartGrid_idl__
-#define __com_sun_star_chart_ChartGrid_idl__
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
+#ifndef __com_sun_star_chart_ChartGrid_idl__ 
+#define __com_sun_star_chart_ChartGrid_idl__ 
+ 
+#ifndef __com_sun_star_drawing_LineProperties_idl__ 
+#include <com/sun/star/drawing/LineProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
 #ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** specifies the grid of the diagram in a chart.
-
-
-
+    
+    
+    
     <p>The distance between the grid lines depends on the distance of the help
     or main tick marks, which may be set in <type>ChartAxis</type>.</p>@see ChartAxis
  */
@@ -65,10 +65,10 @@ published service ChartGrid
     [optional] service com::sun::star::xml::UserDefinedAttributeSupplier;
 
     interface com::sun::star::beans::XPropertySet;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartLegend.idl b/offapi/com/sun/star/chart/ChartLegend.idl
index a0fcf587c7ef..b9635f84b1d5 100644
--- a/offapi/com/sun/star/chart/ChartLegend.idl
+++ b/offapi/com/sun/star/chart/ChartLegend.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartLegend_idl__
-#define __com_sun_star_chart_ChartLegend_idl__
-
-#ifndef __com_sun_star_drawing_Shape_idl__
-#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
-#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartLegendPosition_idl__
-#include <com/sun/star/chart/ChartLegendPosition.idl>
-#endif
+#ifndef __com_sun_star_chart_ChartLegend_idl__ 
+#define __com_sun_star_chart_ChartLegend_idl__ 
+ 
+#ifndef __com_sun_star_drawing_Shape_idl__ 
+#include <com/sun/star/drawing/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_style_CharacterProperties_idl__ 
+#include <com/sun/star/style/CharacterProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartLegendPosition_idl__ 
+#include <com/sun/star/chart/ChartLegendPosition.idl> 
+#endif 
 
 #ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
 #endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** specifies the legend of a chart.
-
-
-
-    <p>The text/font properties which are specified in the service
+    
+    
+    
+    <p>The text/font properties which are specified in the service 
     <type scope="com::sun::star::drawing">Shape</type> correlate to all text
     objects inside the legend.</p>
  */
 published service ChartLegend
-{
-    service com::sun::star::drawing::Shape;
+{ 
+    service com::sun::star::drawing::Shape; 
 
     //-------------------------------------------------------------------------
 
@@ -72,7 +72,7 @@ published service ChartLegend
 
     //-------------------------------------------------------------------------
 
-    service com::sun::star::style::CharacterProperties;
+    service com::sun::star::style::CharacterProperties; 
 
     //-------------------------------------------------------------------------
 
@@ -83,18 +83,18 @@ published service ChartLegend
     @since OOo 1.1.2
      */
     [optional] service com::sun::star::xml::UserDefinedAttributeSupplier;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines the alignment of the legend relative
         to the diagram.
      */
-    [property] com::sun::star::chart::ChartLegendPosition Alignment;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] com::sun::star::chart::ChartLegendPosition Alignment; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartLegendPosition.idl b/offapi/com/sun/star/chart/ChartLegendPosition.idl
index 580a0002b76f..a06be28bf22a 100644
--- a/offapi/com/sun/star/chart/ChartLegendPosition.idl
+++ b/offapi/com/sun/star/chart/ChartLegendPosition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,70 +24,70 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartLegendPosition_idl__
-#define __com_sun_star_chart_ChartLegendPosition_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartLegendPosition_idl__ 
+#define __com_sun_star_chart_ChartLegendPosition_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** specifies one of the default positions of the legend in relation
     to the diagram.
  */
 published enum ChartLegendPosition
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** no chart legend is displayed.
 
         <p>To disable the legend you should set the property
         <member>ChartDocument::HasLegend</member> to <FALSE/> instead
         of setting this value.</p>
      */
-    NONE,
-
-    //-------------------------------------------------------------------------
-
+    NONE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** displays the chart legend on the left side of the diagram.
 
         <p>The second entry in the legend is placed below the first
         one.</p>
      */
-    LEFT,
-
-    //-------------------------------------------------------------------------
-
+    LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** displays the chart legend above the diagram.
 
         <p>The second entry in the legend is placed on the right hand
         side of the first one.</p>
      */
-    TOP,
-
-    //-------------------------------------------------------------------------
-
+    TOP, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** displays the chart legend on the right side of the diagram.
 
         <p>The second entry in the legend is placed below the first
         one.</p>
      */
-    RIGHT,
-
-    //-------------------------------------------------------------------------
-
+    RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** displays the chart legend beneath the diagram.
 
         <p>The second entry in the legend is placed on the right hand
         side of the first one.</p>
      */
     BOTTOM
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartLine.idl b/offapi/com/sun/star/chart/ChartLine.idl
index e9ae401edc11..04081a02ed1f 100644
--- a/offapi/com/sun/star/chart/ChartLine.idl
+++ b/offapi/com/sun/star/chart/ChartLine.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartLine_idl__
-#define __com_sun_star_chart_ChartLine_idl__
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartLine_idl__ 
+#define __com_sun_star_chart_ChartLine_idl__ 
+ 
+#ifndef __com_sun_star_drawing_LineProperties_idl__ 
+#include <com/sun/star/drawing/LineProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** specifies line elements in a chart (regression lines, etc.).
  */
 published service ChartLine
 {
     service com::sun::star::drawing::LineProperties;
     interface com::sun::star::beans::XPropertySet;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartPieSegmentProperties.idl b/offapi/com/sun/star/chart/ChartPieSegmentProperties.idl
index b771d59e4c8d..c9d4111b21fe 100644
--- a/offapi/com/sun/star/chart/ChartPieSegmentProperties.idl
+++ b/offapi/com/sun/star/chart/ChartPieSegmentProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,52 +24,52 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartPieSegmentProperties_idl__
-#define __com_sun_star_chart_ChartPieSegmentProperties_idl__
-
-#ifndef __com_sun_star_chart_ChartDataPointProperties_idl__
-#include <com/sun/star/chart/ChartDataPointProperties.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartPieSegmentProperties_idl__ 
+#define __com_sun_star_chart_ChartPieSegmentProperties_idl__ 
+ 
+#ifndef __com_sun_star_chart_ChartDataPointProperties_idl__ 
+#include <com/sun/star/chart/ChartDataPointProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** specifies all the properties for the graphic object of a
     pie segment.@see PieDiagram
  */
 published service ChartPieSegmentProperties
-{
-    service com::sun::star::chart::ChartDataPointProperties;
-    interface com::sun::star::beans::XPropertySet;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    service com::sun::star::chart::ChartDataPointProperties; 
+    interface com::sun::star::beans::XPropertySet; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** reflects the offset of a pie segment in percent of the radius.
-
-
-
+        
+        
+        
         <p>The default value for all the segments of a <type>PieDiagram</type>
         is 0. If you change this value from 0 to 100 the segment is pulled out
         from the center by its radius.
-
+        
         </p>
         <p>Currently this property is supported by two dimensional pie
         diagrams only.</p>
      */
-    [property] long SegmentOffset;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] long SegmentOffset; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartRegressionCurveType.idl b/offapi/com/sun/star/chart/ChartRegressionCurveType.idl
index cfeb748104ea..d32c1a540efa 100644
--- a/offapi/com/sun/star/chart/ChartRegressionCurveType.idl
+++ b/offapi/com/sun/star/chart/ChartRegressionCurveType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,75 +24,75 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartRegressionCurveType_idl__
-#define __com_sun_star_chart_ChartRegressionCurveType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartRegressionCurveType_idl__ 
+#define __com_sun_star_chart_ChartRegressionCurveType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** specifies the type of the regression curve to be displayed.
  */
 published enum ChartRegressionCurveType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** displays no regression curve.
      */
-    NONE,
-
-    //-------------------------------------------------------------------------
-
+    NONE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** displays a linear regression curve.
 
         <p>The values of the series are approximated using the model
         <i>y</i> = <i>A</i>&middot;<i>x</i> + <i>B</i>.</p>
      */
-    LINEAR,
-
-    //-------------------------------------------------------------------------
-
+    LINEAR, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** displays a linear logarithmic regression curve.
 
         <p>The values of the series are approximated using the model
         <i>y</i> = <i>A</i>&middot;log(<i>x</i>) + <i>B</i>.</p>
      */
-    LOGARITHM,
-
-    //-------------------------------------------------------------------------
-
+    LOGARITHM, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** displays an exponential regression curve.
 
         <p>The values of the series are approximated using the model
         <i>y</i> = <i>A</i>&middot;e<sup><i>B</i>&middot;<i>x</i></sup>.</p>
 
     */
-    EXPONENTIAL,
-
-    //-------------------------------------------------------------------------
-
+    EXPONENTIAL, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** displays a polynomial regression curve.
 
         @deprecated
     */
-    POLYNOMIAL,
-
-    //-------------------------------------------------------------------------
-
+    POLYNOMIAL, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** displays a regression curve using a power function.
-
+        
         <p>The values of the series are approximated using the model
         <i>y</i> = <i>A&middot;<i>x</i><sup>B</sup></i>.</p>
      */
-    POWER
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    POWER 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartSeriesAddress.idl b/offapi/com/sun/star/chart/ChartSeriesAddress.idl
index 70c328b5ecca..2c9802399741 100644
--- a/offapi/com/sun/star/chart/ChartSeriesAddress.idl
+++ b/offapi/com/sun/star/chart/ChartSeriesAddress.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartSeriesAddress_idl__
-#define __com_sun_star_chart_ChartSeriesAddress_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartSeriesAddress_idl__ 
+#define __com_sun_star_chart_ChartSeriesAddress_idl__ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** This structure describes a single data row, specified by its name
     and a sequence of data points.
-
+    
     <p>The cell addresses are in the format of the application that
     contains this chart.</p>
  */
@@ -44,26 +44,26 @@ published struct ChartSeriesAddress
     /** contains the cell range address of the data for this series.
      */
     string DataRangeAddress;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the cell address of label (i.e. name) of this series.
      */
     string LabelAddress;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains cell addresses for each domain of this series.
-
+         
         <p>For XY (scatter) diagrams at least one series has a
         domain. Most of the other chart types use an empty sequence
         here.</p>
      */
     sequence< string > DomainRangeAddresses;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartSolidType.idl b/offapi/com/sun/star/chart/ChartSolidType.idl
index 6aeaabbdb824..82b00631d3c4 100644
--- a/offapi/com/sun/star/chart/ChartSolidType.idl
+++ b/offapi/com/sun/star/chart/ChartSolidType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartSolidType_idl__
-#define __com_sun_star_chart_ChartSolidType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartSolidType_idl__ 
+#define __com_sun_star_chart_ChartSolidType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** These values specify the type of solid shapes for data points of
     3D bar charts.
  */
 published constants ChartSolidType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** extruded rectangle, i.e., a cuboid
      */
-    const long RECTANGULAR_SOLID = 0;
-
-    //-------------------------------------------------------------------------
-
+    const long RECTANGULAR_SOLID = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** cylinder with a circle as base
      */
-    const long CYLINDER = 1;
-
-    //-------------------------------------------------------------------------
-
+    const long CYLINDER = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** cone with a circle as base
      */
-    const long CONE = 2;
-
-    //-------------------------------------------------------------------------
-
+    const long CONE = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** pyramidal with a square as base
      */
-    const long PYRAMID = 3;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const long PYRAMID = 3; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartStatistics.idl b/offapi/com/sun/star/chart/ChartStatistics.idl
index 57c373eaf968..149648854671 100644
--- a/offapi/com/sun/star/chart/ChartStatistics.idl
+++ b/offapi/com/sun/star/chart/ChartStatistics.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
-#define __com_sun_star_chart_ChartStatistics_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartErrorCategory_idl__
-#include <com/sun/star/chart/ChartErrorCategory.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartErrorIndicatorType_idl__
-#include <com/sun/star/chart/ChartErrorIndicatorType.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartRegressionCurveType_idl__
-#include <com/sun/star/chart/ChartRegressionCurveType.idl>
-#endif
+#ifndef __com_sun_star_chart_ChartStatistics_idl__ 
+#define __com_sun_star_chart_ChartStatistics_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartErrorCategory_idl__ 
+#include <com/sun/star/chart/ChartErrorCategory.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartErrorIndicatorType_idl__ 
+#include <com/sun/star/chart/ChartErrorIndicatorType.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartRegressionCurveType_idl__ 
+#include <com/sun/star/chart/ChartRegressionCurveType.idl> 
+#endif 
 
 #include <com/sun/star/chart/ErrorBarStyle.idl>
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** offers statistical properties for the data in the chart. It is
     available for a single data row and for the whole diagram.
  */
 published service ChartStatistics
-{
-    interface com::sun::star::beans::XPropertySet;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    interface com::sun::star::beans::XPropertySet; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the lower limit of the error range of a
         data row.
 
@@ -67,13 +67,13 @@ published service ChartStatistics
         <member>ChartStatistics::ErrorCategory</member> is set to
         <member>ChartErrorCategory::CONSTANT_VALUE</member>.</p>
 
-        @see ConstantErrorHigh
+        @see ConstantErrorHigh 
         @see ErrorCategory
      */
-    [property] double ConstantErrorLow;
-
-    //-------------------------------------------------------------------------
-
+    [property] double ConstantErrorLow; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the upper limit of the error range of a
         data row.
 
@@ -81,32 +81,32 @@ published service ChartStatistics
         <member>ChartStatistics::ErrorCategory</member> is set to
         <member>ChartErrorCategory::CONSTANT_VALUE</member>.</p>
 
-        @see ConstantErrorLow
+        @see ConstantErrorLow 
         @see ErrorCategory
      */
-    [property] double ConstantErrorHigh;
-
-    //-------------------------------------------------------------------------
-
+    [property] double ConstantErrorHigh; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the mean value for a data row is
         displayed as a line.
      */
-    [property] boolean MeanValue;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean MeanValue; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines the type of error to indicate.
 
         @deprecated
 
-        @see ChartErrorCategory
-        @see PercentageError
-        @see ErrorMargin
-        @see ConstantErrorLow
-        @see ConstantErrorHigh
+        @see ChartErrorCategory 
+        @see PercentageError 
+        @see ErrorMargin 
+        @see ConstantErrorLow 
+        @see ConstantErrorHigh 
         @see ErrorIndicator
      */
-    [property] com::sun::star::chart::ChartErrorCategory ErrorCategory;
+    [property] com::sun::star::chart::ChartErrorCategory ErrorCategory; 
 
     /** determines the style of the error bars. Use this instead of
         ErrorCategory
@@ -114,54 +114,54 @@ published service ChartStatistics
          @see ErrorBarStyle
      */
     [optional, property] long ErrorBarStyle;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the percentage that is used to display error bars.
 
         <p>The length of the error indicators is calculated for each
         data point by taking the given percentage of its value.</p>
-
+    
         <p>this setting is effective if the
         <member>ChartStatistics::ErrorCategory</member> is set to
         <member>ChartErrorCategory::PERCENT</member>.</p>
 
         @see ErrorCategory
      */
-    [property] double PercentageError;
-
-    //-------------------------------------------------------------------------
-
+    [property] double PercentageError; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the percentage for the margin of errors.
 
         <p>The length of the error indicators is calculated by taking
         the percentage given of the largest data point value.</p>
-
+        
         <p>this setting is effective if the
         <member>ChartStatistics::ErrorCategory</member> is set to
         <member>ChartErrorCategory::ERROR_MARGIN</member>.</p>
 
         @see ErrorCategory
      */
-    [property] double ErrorMargin;
-
-    //-------------------------------------------------------------------------
-
+    [property] double ErrorMargin; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines how the error is indicated.
 
         <p>You can enable indicators pointing up, down or both.</p>
 
         @see ErrorCategory
      */
-    [property] com::sun::star::chart::ChartErrorIndicatorType ErrorIndicator;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::chart::ChartErrorIndicatorType ErrorIndicator; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines a type of regression for the data row values.
 
         @see ChartRegressionCurveType
      */
-    [property] com::sun::star::chart::ChartRegressionCurveType RegressionCurves;
+    [property] com::sun::star::chart::ChartRegressionCurveType RegressionCurves; 
 
     /** contains a cell range string for positive error bars. This
         property is used when the <type>ErrorBarCategory</type> is set
@@ -174,10 +174,10 @@ published service ChartStatistics
         to <member>ErrorBarCategory::FROM_DATA</member>.
      */
     [optional, property] string ErrorBarRangeNegative;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartSymbolType.idl b/offapi/com/sun/star/chart/ChartSymbolType.idl
index 2b669055c33b..881be2e6d5da 100644
--- a/offapi/com/sun/star/chart/ChartSymbolType.idl
+++ b/offapi/com/sun/star/chart/ChartSymbolType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartSymbolType_idl__
-#define __com_sun_star_chart_ChartSymbolType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartSymbolType_idl__ 
+#define __com_sun_star_chart_ChartSymbolType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** These values specify the type of the symbol used for data points.
 
     <p>This only applies to diagrams that use symbols like line
@@ -56,22 +56,22 @@
     @see ChartDataPointProperties
 */
 published constants ChartSymbolType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** No symbol is used.
      */
-    const long NONE = -3;
-
-    //-------------------------------------------------------------------------
-
+    const long NONE = -3; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The symbol is selected automatically.  The size of symbol will
         be dynamic and the type depends on the data row number.
      */
-    const long AUTO = -2;
-
-    //-------------------------------------------------------------------------
-
+    const long AUTO = -2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Take a Bitmap from a URL and use this as symbol.
 
         <p>The bitmap given by the URL set in the property
@@ -82,58 +82,58 @@ published constants ChartSymbolType
      */
     const long BITMAPURL = -1;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** The default symbol for row 0 is used.
      */
-    const long SYMBOL0 = 0;
-
-    //-------------------------------------------------------------------------
-
+    const long SYMBOL0 = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The default symbol for row 1 is used.
      */
-    const long SYMBOL1 = 1;
-
-    //-------------------------------------------------------------------------
-
+    const long SYMBOL1 = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The default symbol for row 2 is used.
      */
-    const long SYMBOL2 = 2;
-
-    //-------------------------------------------------------------------------
-
+    const long SYMBOL2 = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The default symbol for row 3 is used.
      */
-    const long SYMBOL3 = 3;
-
-    //-------------------------------------------------------------------------
-
+    const long SYMBOL3 = 3; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The default symbol for row 4 is used.
      */
-    const long SYMBOL4 = 4;
-
-    //-------------------------------------------------------------------------
-
+    const long SYMBOL4 = 4; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The default symbol for row 5 is used.
      */
-    const long SYMBOL5 = 5;
-
-    //-------------------------------------------------------------------------
-
+    const long SYMBOL5 = 5; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The default symbol for row 6 is used.
      */
-    const long SYMBOL6 = 6;
-
-    //-------------------------------------------------------------------------
-
+    const long SYMBOL6 = 6; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The default symbol for row 7 is used.
      */
-    const long SYMBOL7 = 7;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const long SYMBOL7 = 7; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartTableAddressSupplier.idl b/offapi/com/sun/star/chart/ChartTableAddressSupplier.idl
index a9f72f0824cc..37cb0bd674d2 100644
--- a/offapi/com/sun/star/chart/ChartTableAddressSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartTableAddressSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module chart {
+module com { module sun { module star { module chart { 
 
 //=============================================================================
 /** This is a helper service for access to table Address to
@@ -75,6 +75,6 @@ published service ChartTableAddressSupplier
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/chart/ChartTitle.idl b/offapi/com/sun/star/chart/ChartTitle.idl
index cf94f8933eda..aaba6bc700e1 100644
--- a/offapi/com/sun/star/chart/ChartTitle.idl
+++ b/offapi/com/sun/star/chart/ChartTitle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartTitle_idl__
-#define __com_sun_star_chart_ChartTitle_idl__
-
-#ifndef __com_sun_star_drawing_Shape_idl__
-#include <com/sun/star/drawing/Shape.idl>
-#endif
+#ifndef __com_sun_star_chart_ChartTitle_idl__ 
+#define __com_sun_star_chart_ChartTitle_idl__ 
+ 
+#ifndef __com_sun_star_drawing_Shape_idl__ 
+#include <com/sun/star/drawing/Shape.idl> 
+#endif 
 
 #ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** specifies titles in a chart.
 
     <p>In a chart there may be the following titles: the main title,
     the sub title, and axis titles of the x- and y-axis.</p>
  */
 published service ChartTitle
-{
-    service com::sun::star::drawing::Shape;
+{ 
+    service com::sun::star::drawing::Shape; 
 
     //-------------------------------------------------------------------------
 
@@ -67,32 +67,32 @@ published service ChartTitle
     @since OOo 1.1.2
      */
     [optional] service com::sun::star::xml::UserDefinedAttributeSupplier;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the rotation of the shape in 100th of degrees.
-
+        
         <p>Especially in three-dimensional charts, this property comes
         in handy if you want to align the axis titles with the axis,
         which are usually not vertical or horizontal in the
         two-dimensional projection.</p>
      */
-    [property] long TextRotation;
-
-    //-------------------------------------------------------------------------
-
+    [property] long TextRotation; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the text of the title.
 
         <p>Note that you cannot change attributes of parts of a
         title, e.g., put one word in bold characters.  All formatting
         affects the entire string.</p>
      */
-    [property] string String;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] string String; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl b/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl
index 66e1970da564..7a0abf7dd784 100644
--- a/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartTwoAxisXSupplier_idl__
-#define __com_sun_star_chart_ChartTwoAxisXSupplier_idl__
-
-#ifndef __com_sun_star_chart_XTwoAxisXSupplier_idl__
-#include <com/sun/star/chart/XTwoAxisXSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
-#include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartTwoAxisXSupplier_idl__ 
+#define __com_sun_star_chart_ChartTwoAxisXSupplier_idl__ 
+ 
+#ifndef __com_sun_star_chart_XTwoAxisXSupplier_idl__ 
+#include <com/sun/star/chart/XTwoAxisXSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__ 
+#include <com/sun/star/chart/ChartAxisXSupplier.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** a helper service for chart documents which supply
     primary and secondary x-axes.
  */
 published service ChartTwoAxisXSupplier
-{
+{ 
     /** offers access to the axis object
      */
-    interface com::sun::star::chart::XTwoAxisXSupplier;
-
-    service com::sun::star::chart::ChartAxisXSupplier;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::chart::XTwoAxisXSupplier; 
+    
+    service com::sun::star::chart::ChartAxisXSupplier; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the secondary x-axis is shown or hidden.
 
         @see ChartAxis
      */
-    [property] boolean HasSecondaryXAxis;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean HasSecondaryXAxis; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines for the secondary x-axis
         if the labels at the tick marks are shown or hidden.
     */
-    [property] boolean HasSecondaryXAxisDescription;
+    [property] boolean HasSecondaryXAxisDescription; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** determines if the title of the secondary X-axis is shown or hidden.
 
@@ -76,12 +76,12 @@ published service ChartTwoAxisXSupplier
 
         @since OOo 3.0
     */
-    [optional, property] boolean HasSecondaryXAxisTitle;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [optional, property] boolean HasSecondaryXAxisTitle; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl b/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl
index cba1dfd64b32..60b4aa41489b 100644
--- a/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,52 +24,52 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
-#define __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
-
-#ifndef __com_sun_star_chart_XTwoAxisYSupplier_idl__
-#include <com/sun/star/chart/XTwoAxisYSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__
-#include <com/sun/star/chart/ChartAxisYSupplier.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__ 
+#define __com_sun_star_chart_ChartTwoAxisYSupplier_idl__ 
+ 
+#ifndef __com_sun_star_chart_XTwoAxisYSupplier_idl__ 
+#include <com/sun/star/chart/XTwoAxisYSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__ 
+#include <com/sun/star/chart/ChartAxisYSupplier.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** a helper service for chart documents which supply
     primary and secondary y-axes.
  */
 published service ChartTwoAxisYSupplier
-{
+{ 
     /** offers access to the axis object
      */
-    interface com::sun::star::chart::XTwoAxisYSupplier;
-
-    service com::sun::star::chart::ChartAxisYSupplier;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::chart::XTwoAxisYSupplier; 
+    
+    service com::sun::star::chart::ChartAxisYSupplier; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the secondary y-axis is shown or
         hidden.
 
         @see ChartAxis
      */
-    [property] boolean HasSecondaryYAxis;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean HasSecondaryYAxis; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines for the secondary y-axis
         if the labels at the tick marks are shown or hidden.
     */
-    [property] boolean HasSecondaryYAxisDescription;
+    [property] boolean HasSecondaryYAxisDescription; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** determines if the title of the secondary y-axis is shown or hidden.
 
@@ -77,12 +77,12 @@ published service ChartTwoAxisYSupplier
 
         @since OOo 3.0
     */
-    [optional, property] boolean HasSecondaryYAxisTitle;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [optional, property] boolean HasSecondaryYAxisTitle; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/DataLabelPlacement.idl b/offapi/com/sun/star/chart/DataLabelPlacement.idl
index 20639b5c7108..c5ce3eab6111 100644
--- a/offapi/com/sun/star/chart/DataLabelPlacement.idl
+++ b/offapi/com/sun/star/chart/DataLabelPlacement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_DataLabelPlacement_idl__
-#define __com_sun_star_chart_DataLabelPlacement_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_DataLabelPlacement_idl__ 
+#define __com_sun_star_chart_DataLabelPlacement_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** These values specify where the captions/labels of data points are displayed.
  */
 published constants DataLabelPlacement
-{
+{ 
     const long AVOID_OVERLAP = 0;
     const long CENTER = 1;
     const long TOP = 2;
@@ -51,10 +51,10 @@ published constants DataLabelPlacement
     const long INSIDE = 10;
     const long OUTSIDE = 11;
     const long NEAR_ORIGIN = 12;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/Diagram.idl b/offapi/com/sun/star/chart/Diagram.idl
index b57fc88f3804..2074285eda80 100644
--- a/offapi/com/sun/star/chart/Diagram.idl
+++ b/offapi/com/sun/star/chart/Diagram.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_Diagram_idl__
-#define __com_sun_star_chart_Diagram_idl__
-
-#ifndef __com_sun_star_chart_XDiagram_idl__
-#include <com/sun/star/chart/XDiagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XDiagramPositioning_idl__
-#include <com/sun/star/chart/XDiagramPositioning.idl>
+#ifndef __com_sun_star_chart_Diagram_idl__ 
+#define __com_sun_star_chart_Diagram_idl__ 
+ 
+#ifndef __com_sun_star_chart_XDiagram_idl__ 
+#include <com/sun/star/chart/XDiagram.idl> 
+#endif 
+
+#ifndef __com_sun_star_chart_XDiagramPositioning_idl__ 
+#include <com/sun/star/chart/XDiagramPositioning.idl> 
 #endif
-
+ 
 #ifndef __com_sun_star_chart_XSecondAxisTitleSupplier_idl__
 #include <com/sun/star/chart/XSecondAxisTitleSupplier.idl>
 #endif
 
 #ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartDataRowSource_idl__
-#include <com/sun/star/chart/ChartDataRowSource.idl>
-#endif
-
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartDataRowSource_idl__ 
+#include <com/sun/star/chart/ChartDataRowSource.idl> 
+#endif 
+ 
 #ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** the base service for the diagram of the chart document.
 
     <p>The diagram is the object that contains the actual plot.</p>
@@ -68,7 +68,7 @@
 
  */
 published service Diagram
-{
+{ 
 
     interface com::sun::star::chart::XDiagram;
 
@@ -100,10 +100,10 @@ published service Diagram
     [optional, property] boolean AutomaticSize;
 
     //-------------------------------------------------------------------------
-
-    interface com::sun::star::beans::XPropertySet;
-
-    //-------------------------------------------------------------------------
+    
+    interface com::sun::star::beans::XPropertySet; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** If a <type>Diagram</type> may be stored as XML file, this
         service should be supported in order to preserve unparsed XML
@@ -114,35 +114,35 @@ published service Diagram
     [optional] service com::sun::star::xml::UserDefinedAttributeSupplier;
 
     //-------------------------------------------------------------------------
-
+     
     /** determines if the data for a data row is contained in the
         columns or in the rows of the data array.
 
-        @see ChartDataRowSource
+        @see ChartDataRowSource 
         @see ChartDataArray
      */
-    [property] com::sun::star::chart::ChartDataRowSource DataRowSource;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::chart::ChartDataRowSource DataRowSource; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies how the caption of data points is displayed.
 
         @see ChartDataCaption
      */
-    [property] long DataCaption;
+    [property] long DataCaption; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies how empty or invalid cells in the provided data should be handled when displayed
 
         @see MissingValueTreatment
      */
     [optional, property] long MissingValueTreatment;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/Dim3DDiagram.idl b/offapi/com/sun/star/chart/Dim3DDiagram.idl
index 26006c801f8d..d012e832e176 100644
--- a/offapi/com/sun/star/chart/Dim3DDiagram.idl
+++ b/offapi/com/sun/star/chart/Dim3DDiagram.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_Dim3DDiagram_idl__
-#define __com_sun_star_chart_Dim3DDiagram_idl__
-
-#ifndef __com_sun_star_chart_X3DDisplay_idl__
-#include <com/sun/star/chart/X3DDisplay.idl>
-#endif
-#ifndef __com_sun_star_chart_X3DDefaultSetter_idl__
-#include <com/sun/star/chart/X3DDefaultSetter.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_Dim3DDiagram_idl__ 
+#define __com_sun_star_chart_Dim3DDiagram_idl__ 
+ 
+#ifndef __com_sun_star_chart_X3DDisplay_idl__ 
+#include <com/sun/star/chart/X3DDisplay.idl> 
+#endif 
+#ifndef __com_sun_star_chart_X3DDefaultSetter_idl__ 
+#include <com/sun/star/chart/X3DDefaultSetter.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** is a service for diagrams that support the capability to render
     themselves as three-dimensional diagrams as well as
     two-dimensional ones.
@@ -51,18 +51,18 @@ published service Dim3DDiagram
         of the three-dimensional cuboid that contains the actual
         diagram.
      */
-    interface com::sun::star::chart::X3DDisplay;
+    interface com::sun::star::chart::X3DDisplay; 
 
     /** makes it easy to set suitable defaults for illumination and rotation for 3D charts
      */
     [optional] interface ::com::sun::star::chart::X3DDefaultSetter;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If set to <TRUE/>, the chart becomes a three-dimensional
         chart.  Otherwise it is two-dimensional.
     */
-    [property] boolean Dim3D;
+    [property] boolean Dim3D; 
 
     /** Perspective of 3D charts ( [0,100] ).
      */
@@ -75,10 +75,10 @@ published service Dim3DDiagram
     /** Vertical rotation of 3D charts in degrees ( ]-180,180] ).
      */
     [optional, property] long   RotationVertical;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/DonutDiagram.idl b/offapi/com/sun/star/chart/DonutDiagram.idl
index ff041f4561e0..50dc0bc19897 100644
--- a/offapi/com/sun/star/chart/DonutDiagram.idl
+++ b/offapi/com/sun/star/chart/DonutDiagram.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_DonutDiagram_idl__
-#define __com_sun_star_chart_DonutDiagram_idl__
-
-#ifndef __com_sun_star_chart_Diagram_idl__
-#include <com/sun/star/chart/Diagram.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_DonutDiagram_idl__ 
+#define __com_sun_star_chart_DonutDiagram_idl__ 
+ 
+#ifndef __com_sun_star_chart_Diagram_idl__ 
+#include <com/sun/star/chart/Diagram.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** a service for donut diagrams.
 
     <p>Donut diagrams are also known as ring diagrams.</p>
 */
 published service DonutDiagram
-{
-    service com::sun::star::chart::Diagram;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::chart::Diagram; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/ErrorBarStyle.idl b/offapi/com/sun/star/chart/ErrorBarStyle.idl
index 12738b4e60a2..56e4166dcaa6 100755
--- a/offapi/com/sun/star/chart/ErrorBarStyle.idl
+++ b/offapi/com/sun/star/chart/ErrorBarStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart/FilledNetDiagram.idl b/offapi/com/sun/star/chart/FilledNetDiagram.idl
index bb6682ad4688..1a136ae9c2bd 100644
--- a/offapi/com/sun/star/chart/FilledNetDiagram.idl
+++ b/offapi/com/sun/star/chart/FilledNetDiagram.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_FilledNetDiagram_idl__
-#define __com_sun_star_chart_FilledNetDiagram_idl__
-
-#ifndef __com_sun_star_chart_Diagram_idl__
-#include <com/sun/star/chart/Diagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_StackableDiagram_idl__
-#include <com/sun/star/chart/StackableDiagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
-#include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__
-#include <com/sun/star/chart/ChartAxisYSupplier.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
+#ifndef __com_sun_star_chart_FilledNetDiagram_idl__ 
+#define __com_sun_star_chart_FilledNetDiagram_idl__ 
+ 
+#ifndef __com_sun_star_chart_Diagram_idl__ 
+#include <com/sun/star/chart/Diagram.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_StackableDiagram_idl__ 
+#include <com/sun/star/chart/StackableDiagram.idl> 
+#endif 
 
+#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__ 
+#include <com/sun/star/chart/ChartAxisXSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__ 
+#include <com/sun/star/chart/ChartAxisYSupplier.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** specifies filled net diagrams. @since OOo 3.2
 
     <p>Net diagrams are also known as radar diagrams.</p>
  */
 published service FilledNetDiagram
-{
-    service com::sun::star::chart::Diagram;
+{ 
+    service com::sun::star::chart::Diagram; 
     service com::sun::star::chart::ChartAxisXSupplier;
-    service com::sun::star::chart::ChartAxisYSupplier;
-    service com::sun::star::chart::StackableDiagram;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    service com::sun::star::chart::ChartAxisYSupplier; 
+    service com::sun::star::chart::StackableDiagram; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/LineDiagram.idl b/offapi/com/sun/star/chart/LineDiagram.idl
index b9a118238486..b21648357261 100644
--- a/offapi/com/sun/star/chart/LineDiagram.idl
+++ b/offapi/com/sun/star/chart/LineDiagram.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,63 +24,63 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_LineDiagram_idl__
-#define __com_sun_star_chart_LineDiagram_idl__
-
-#ifndef __com_sun_star_chart_Diagram_idl__
-#include <com/sun/star/chart/Diagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
-#include <com/sun/star/chart/ChartStatistics.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
-#include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
-#include <com/sun/star/chart/ChartTwoAxisYSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisZSupplier_idl__
-#include <com/sun/star/chart/ChartAxisZSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_Dim3DDiagram_idl__
-#include <com/sun/star/chart/Dim3DDiagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_StackableDiagram_idl__
-#include <com/sun/star/chart/StackableDiagram.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
+#ifndef __com_sun_star_chart_LineDiagram_idl__ 
+#define __com_sun_star_chart_LineDiagram_idl__ 
+ 
+#ifndef __com_sun_star_chart_Diagram_idl__ 
+#include <com/sun/star/chart/Diagram.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartStatistics_idl__ 
+#include <com/sun/star/chart/ChartStatistics.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__ 
+#include <com/sun/star/chart/ChartAxisXSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__ 
+#include <com/sun/star/chart/ChartTwoAxisYSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartAxisZSupplier_idl__ 
+#include <com/sun/star/chart/ChartAxisZSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_Dim3DDiagram_idl__ 
+#include <com/sun/star/chart/Dim3DDiagram.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_StackableDiagram_idl__ 
+#include <com/sun/star/chart/StackableDiagram.idl> 
+#endif 
+
+#ifndef __com_sun_star_awt_Size_idl__ 
 #include <com/sun/star/awt/Size.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** specifies line, spline and symbol diagrams.
  */
 published service LineDiagram
-{
-    service com::sun::star::chart::Diagram;
-    service com::sun::star::chart::ChartStatistics;
-    service com::sun::star::chart::ChartAxisXSupplier;
-    service com::sun::star::chart::ChartTwoAxisYSupplier;
-    service com::sun::star::chart::ChartAxisZSupplier;
-    service com::sun::star::chart::Dim3DDiagram;
-    service com::sun::star::chart::StackableDiagram;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    service com::sun::star::chart::Diagram; 
+    service com::sun::star::chart::ChartStatistics; 
+    service com::sun::star::chart::ChartAxisXSupplier; 
+    service com::sun::star::chart::ChartTwoAxisYSupplier; 
+    service com::sun::star::chart::ChartAxisZSupplier; 
+    service com::sun::star::chart::Dim3DDiagram; 
+    service com::sun::star::chart::StackableDiagram; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines which type of symbols are displayed.
-
+            
         <p>In this interface, only the two values
         <member>ChartSymbolType::NONE</member> and
         <member>ChartSymbolType::AUTO</member> are supported. Later
@@ -95,16 +95,16 @@ published service LineDiagram
         @see ChartDataPointProperties
         @see ChartDataRowProperties
      */
-    [property] long SymbolType;
-
-    //-------------------------------------------------------------------------
-
+    [property] long SymbolType; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the size of symbols in 1/100th of a millimeter.
      */
     [optional, property] com::sun::star::awt::Size SymbolSize;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** Set this property to any valid URL that points to a graphic
         file.  This graphic is then used as symbol for all series.
 
@@ -116,15 +116,15 @@ published service LineDiagram
      */
     [optional, property] string SymbolBitmapURL;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** determines if the chart type has lines connecting the data
         points or contains just symbols.
      */
-    [property] boolean Lines;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Lines; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the chart is a spline-chart type and specifies
         the type of splines.
 
@@ -137,8 +137,8 @@ published service LineDiagram
         </p>
      */
     [property] long SplineType;
-
-    //-------------------------------------------------------------------------
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the power of the polynomials used for spline
         calculation
@@ -146,16 +146,16 @@ published service LineDiagram
         This property is only valid for B-splines
      */
     [optional, property] long SplineOrder;
-
-    //-------------------------------------------------------------------------
+    
+    //------------------------------------------------------------------------- 
 
     /** determines the number of sampling points of a spline
      */
     [optional, property] long SplineResolution;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/MissingValueTreatment.idl b/offapi/com/sun/star/chart/MissingValueTreatment.idl
index d695ea5e0020..d17d289b05a0 100644
--- a/offapi/com/sun/star/chart/MissingValueTreatment.idl
+++ b/offapi/com/sun/star/chart/MissingValueTreatment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_MissingValueTreatment_idl__
-#define __com_sun_star_chart_MissingValueTreatment_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_MissingValueTreatment_idl__ 
+#define __com_sun_star_chart_MissingValueTreatment_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** This specifies how empty or invalid cells in the provided data should be handled when plotted.
  */
 published constants MissingValueTreatment
-{
+{ 
     const long LEAVE_GAP = 0;
     const long USE_ZERO = 1;
     const long CONTINUE = 2;
-};
-
-//=============================================================================
-
-}; }; }; };
-
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
diff --git a/offapi/com/sun/star/chart/NetDiagram.idl b/offapi/com/sun/star/chart/NetDiagram.idl
index 328e33b50c69..4670ed7f1c51 100644
--- a/offapi/com/sun/star/chart/NetDiagram.idl
+++ b/offapi/com/sun/star/chart/NetDiagram.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_NetDiagram_idl__
-#define __com_sun_star_chart_NetDiagram_idl__
-
-#ifndef __com_sun_star_chart_Diagram_idl__
-#include <com/sun/star/chart/Diagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_StackableDiagram_idl__
-#include <com/sun/star/chart/StackableDiagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__
-#include <com/sun/star/chart/ChartAxisYSupplier.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_NetDiagram_idl__ 
+#define __com_sun_star_chart_NetDiagram_idl__ 
+ 
+#ifndef __com_sun_star_chart_Diagram_idl__ 
+#include <com/sun/star/chart/Diagram.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_StackableDiagram_idl__ 
+#include <com/sun/star/chart/StackableDiagram.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartAxisYSupplier_idl__ 
+#include <com/sun/star/chart/ChartAxisYSupplier.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** specifies net diagrams.
 
     <p>Net diagrams are also known as radar diagrams.</p>
  */
 published service NetDiagram
-{
-    service com::sun::star::chart::Diagram;
-    service com::sun::star::chart::StackableDiagram;
-    service com::sun::star::chart::ChartAxisYSupplier;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::chart::Diagram; 
+    service com::sun::star::chart::StackableDiagram; 
+    service com::sun::star::chart::ChartAxisYSupplier; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/PieDiagram.idl b/offapi/com/sun/star/chart/PieDiagram.idl
index 54010971d450..f79b9a5bb50a 100644
--- a/offapi/com/sun/star/chart/PieDiagram.idl
+++ b/offapi/com/sun/star/chart/PieDiagram.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_PieDiagram_idl__
-#define __com_sun_star_chart_PieDiagram_idl__
-
-#ifndef __com_sun_star_chart_Diagram_idl__
-#include <com/sun/star/chart/Diagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_Dim3DDiagram_idl__
-#include <com/sun/star/chart/Dim3DDiagram.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_PieDiagram_idl__ 
+#define __com_sun_star_chart_PieDiagram_idl__ 
+ 
+#ifndef __com_sun_star_chart_Diagram_idl__ 
+#include <com/sun/star/chart/Diagram.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_Dim3DDiagram_idl__ 
+#include <com/sun/star/chart/Dim3DDiagram.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** a service for pie diagrams.
  */
 published service PieDiagram
-{
-    service com::sun::star::chart::Diagram;
-    service com::sun::star::chart::Dim3DDiagram;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::chart::Diagram; 
+    service com::sun::star::chart::Dim3DDiagram; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/StackableDiagram.idl b/offapi/com/sun/star/chart/StackableDiagram.idl
index b30cb7f410c8..0fdbfbd06dd9 100644
--- a/offapi/com/sun/star/chart/StackableDiagram.idl
+++ b/offapi/com/sun/star/chart/StackableDiagram.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_StackableDiagram_idl__
-#define __com_sun_star_chart_StackableDiagram_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
-/**
+#ifndef __com_sun_star_chart_StackableDiagram_idl__ 
+#define __com_sun_star_chart_StackableDiagram_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
+/** 
 
 a helper service for stackable chart types (e.g., charts in
     which the data rows may be displayed stacked on each other or in
     percent relation).
  */
 published service StackableDiagram
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** If <TRUE/>, the series of the diagram are stacked and each
         category sums up to 100%.
      */
-    [property] boolean Percent;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Percent; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If <TRUE/>, the series of the diagram are stacked.
 
         <p>If you have a stacked bar chart, you can easily determine
         the sum of data in each category, by taking the top of the
         topmost bar.</p>
      */
-    [property] boolean Stacked;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] boolean Stacked; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/StockDiagram.idl b/offapi/com/sun/star/chart/StockDiagram.idl
index 9d960468b17b..3e7da9fda333 100644
--- a/offapi/com/sun/star/chart/StockDiagram.idl
+++ b/offapi/com/sun/star/chart/StockDiagram.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_StockDiagram_idl__
-#define __com_sun_star_chart_StockDiagram_idl__
-
-#ifndef __com_sun_star_chart_XStatisticDisplay_idl__
-#include <com/sun/star/chart/XStatisticDisplay.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
-#include <com/sun/star/chart/ChartStatistics.idl>
-#endif
-
-#ifndef __com_sun_star_chart_Diagram_idl__
-#include <com/sun/star/chart/Diagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
-#include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
-#include <com/sun/star/chart/ChartTwoAxisYSupplier.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_StockDiagram_idl__ 
+#define __com_sun_star_chart_StockDiagram_idl__ 
+ 
+#ifndef __com_sun_star_chart_XStatisticDisplay_idl__ 
+#include <com/sun/star/chart/XStatisticDisplay.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartStatistics_idl__ 
+#include <com/sun/star/chart/ChartStatistics.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_Diagram_idl__ 
+#include <com/sun/star/chart/Diagram.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__ 
+#include <com/sun/star/chart/ChartAxisXSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__ 
+#include <com/sun/star/chart/ChartTwoAxisYSupplier.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** specifies a diagram which can be used for presenting stock quotes.
 
     <p>Note that the data must have a specific structure for stock
@@ -99,15 +99,15 @@
     </table></p>
 */
 published service StockDiagram
-{
-    interface com::sun::star::chart::XStatisticDisplay;
-    service com::sun::star::chart::ChartStatistics;
-    service com::sun::star::chart::Diagram;
-    service com::sun::star::chart::ChartAxisXSupplier;
-    service com::sun::star::chart::ChartTwoAxisYSupplier;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    interface com::sun::star::chart::XStatisticDisplay; 
+    service com::sun::star::chart::ChartStatistics; 
+    service com::sun::star::chart::Diagram; 
+    service com::sun::star::chart::ChartAxisXSupplier; 
+    service com::sun::star::chart::ChartTwoAxisYSupplier; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** indicates if a stock chart contains data representing the
         volume of stocks.
 
@@ -117,10 +117,10 @@ published service StockDiagram
         <p>If this property is set to <TRUE/>, the values of the first
         series of the chart data are interpreted as volume.</p>
      */
-    [property] boolean Volume;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Volume; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** indicates if a stock chart contains data representing the
         value of stocks on the opening and closing date.
 
@@ -140,12 +140,12 @@ published service StockDiagram
         as the series before the series with the day's lowest
         value.</p>
      */
-    [property] boolean UpDown;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] boolean UpDown; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/X3DDefaultSetter.idl b/offapi/com/sun/star/chart/X3DDefaultSetter.idl
index 35a62e3ccdaa..915f0a912017 100644
--- a/offapi/com/sun/star/chart/X3DDefaultSetter.idl
+++ b/offapi/com/sun/star/chart/X3DDefaultSetter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_X3DDefaultSetter_idl__
-#define __com_sun_star_chart_X3DDefaultSetter_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_X3DDefaultSetter_idl__ 
+#define __com_sun_star_chart_X3DDefaultSetter_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** makes it easy to set suitable defaults for illumination and rotation for 3D charts
 
     @see Dim3DDiagram
  */
 published interface X3DDefaultSetter : com::sun::star::uno::XInterface
-{
+{ 
     /** The result may depend on the current chart type and the current shade mode.
     */
     void set3DSettingsToDefault();
@@ -57,11 +57,11 @@ published interface X3DDefaultSetter : com::sun::star::uno::XInterface
     The result may dependent on other 3D settings as rotation or shade mode. It may depend on the current chart type also.
     */
     void setDefaultIllumination();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/X3DDisplay.idl b/offapi/com/sun/star/chart/X3DDisplay.idl
index f117ccc7b4af..3c6718a0b223 100644
--- a/offapi/com/sun/star/chart/X3DDisplay.idl
+++ b/offapi/com/sun/star/chart/X3DDisplay.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_X3DDisplay_idl__
-#define __com_sun_star_chart_X3DDisplay_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_X3DDisplay_idl__ 
+#define __com_sun_star_chart_X3DDisplay_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** gives access to 3D elements of a three-dimensional chart.
 
     @see Dim3DDiagram
  */
 published interface X3DDisplay: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the properties of the diagram wall(s).
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            the properties of the diagram wall(s). 
 
         <p>This specifies the properties of the two side walls of the
         chart scene.</p>
@@ -62,23 +62,23 @@ published interface X3DDisplay: com::sun::star::uno::XInterface
 
         @see ChartArea
      */
-    com::sun::star::beans::XPropertySet getWall();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    com::sun::star::beans::XPropertySet getWall(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             the properties of the floor.
 
         <p>This is only valid for three-dimensional diagrams.</p>
 
         @see ChartArea
      */
-    com::sun::star::beans::XPropertySet getFloor();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::beans::XPropertySet getFloor(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/XAxisXSupplier.idl b/offapi/com/sun/star/chart/XAxisXSupplier.idl
index 5a66136d25f0..974af5088ecd 100644
--- a/offapi/com/sun/star/chart/XAxisXSupplier.idl
+++ b/offapi/com/sun/star/chart/XAxisXSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_XAxisXSupplier_idl__
-#define __com_sun_star_chart_XAxisXSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_XAxisXSupplier_idl__ 
+#define __com_sun_star_chart_XAxisXSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/drawing/XShape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** gives access to the <i>x</i>-axis of a chart.
 
     <p>Note that not all diagrams are capable of displaying an
@@ -54,52 +54,52 @@
     @see XDiagram
  */
 published interface XAxisXSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** @returns
             the <i>x</i>-axis title shape.
 
         @see ChartTitle
      */
-    com::sun::star::drawing::XShape getXAxisTitle();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    com::sun::star::drawing::XShape getXAxisTitle(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             the properties of the <i>x</i>-axis of the diagram.
 
         <p>The returned property set contains scaling properties as
         well as formatting properties.</p>
-
+                 
         @see ChartAxis
      */
-    com::sun::star::beans::XPropertySet getXAxis();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    com::sun::star::beans::XPropertySet getXAxis(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             the properties of the main grid (major grid) of the
             <i>x</i>-axis of the diagram.
-
+                 
         @see ChartGrid
      */
-    com::sun::star::beans::XPropertySet getXMainGrid();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    com::sun::star::beans::XPropertySet getXMainGrid(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             the properties of the help grid (minor grid) of the
             <i>x</i>-axis of the diagram.
-
+                 
         @see ChartGrid
      */
-    com::sun::star::beans::XPropertySet getXHelpGrid();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::beans::XPropertySet getXHelpGrid(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/XAxisYSupplier.idl b/offapi/com/sun/star/chart/XAxisYSupplier.idl
index a84562415948..e994516a4664 100644
--- a/offapi/com/sun/star/chart/XAxisYSupplier.idl
+++ b/offapi/com/sun/star/chart/XAxisYSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_XAxisYSupplier_idl__
-#define __com_sun_star_chart_XAxisYSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_XAxisYSupplier_idl__ 
+#define __com_sun_star_chart_XAxisYSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/drawing/XShape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** gives access to the <i>y</i>-axis of a chart.
 
     <p>Note that not all diagrams are capable of displaying a
@@ -54,31 +54,31 @@
     @see XDiagram
  */
 published interface XAxisYSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             the <i>y</i>-axis title shape.
 
         @see ChartTitle
      */
-    com::sun::star::drawing::XShape getYAxisTitle();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the properties of the <i>y</i>-axis of the diagram.
+    com::sun::star::drawing::XShape getYAxisTitle(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            the properties of the <i>y</i>-axis of the diagram. 
 
         <p>The returned property set contains scaling properties as
         well as formatting properties.</p>
 
         @see ChartAxis
      */
-    com::sun::star::beans::XPropertySet getYAxis();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    com::sun::star::beans::XPropertySet getYAxis(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             the properties of the help grid (minor grid) of the
             <i>y</i>-axis of the diagram.
 
@@ -86,20 +86,20 @@ published interface XAxisYSupplier: com::sun::star::uno::XInterface
      */
     com::sun::star::beans::XPropertySet getYHelpGrid();
 
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             the properties of the main grid (major grid) of the
-            <i>y</i>-axis of the diagram.
+            <i>y</i>-axis of the diagram. 
 
         @see ChartGrid
      */
-    com::sun::star::beans::XPropertySet getYMainGrid();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::beans::XPropertySet getYMainGrid(); 
+
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/XAxisZSupplier.idl b/offapi/com/sun/star/chart/XAxisZSupplier.idl
index 220aef76afb2..ba611ecaa7f0 100644
--- a/offapi/com/sun/star/chart/XAxisZSupplier.idl
+++ b/offapi/com/sun/star/chart/XAxisZSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,79 +24,79 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_XAxisZSupplier_idl__
-#define __com_sun_star_chart_XAxisZSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_XAxisZSupplier_idl__ 
+#define __com_sun_star_chart_XAxisZSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/drawing/XShape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** gives access to the <i>z</i>-axis of a chart.
 
     @see XDiagram
  */
 published interface XAxisZSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             the <i>z</i>-axis title shape.
-
+                 
         @see ChartTitle
      */
-    com::sun::star::drawing::XShape getZAxisTitle();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    com::sun::star::drawing::XShape getZAxisTitle(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             the properties of the main grid (major grid) of the
-            <i>z</i>-axis of the diagram.
-
+            <i>z</i>-axis of the diagram. 
+                 
         @see ChartGrid
      */
-    com::sun::star::beans::XPropertySet getZMainGrid();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    com::sun::star::beans::XPropertySet getZMainGrid(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             the properties of the help grid (minor grid) of the
-            <i>z</i>-axis of the diagram.
-
+            <i>z</i>-axis of the diagram. 
+                 
         @see ChartGrid
      */
-    com::sun::star::beans::XPropertySet getZHelpGrid();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the properties of the <i>z</i>-axis of the diagram.
+    com::sun::star::beans::XPropertySet getZHelpGrid(); 
 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            the properties of the <i>z</i>-axis of the diagram. 
+                 
         <p>The returned property set contains scaling properties as
         well as formatting properties.</p>
-
+                 
         @see ChartAxis
      */
-    com::sun::star::beans::XPropertySet getZAxis();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::beans::XPropertySet getZAxis(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/XChartData.idl b/offapi/com/sun/star/chart/XChartData.idl
index 4bcb4b199704..64426705e9cf 100644
--- a/offapi/com/sun/star/chart/XChartData.idl
+++ b/offapi/com/sun/star/chart/XChartData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_XChartData_idl__
-#define __com_sun_star_chart_XChartData_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XChartDataChangeEventListener_idl__
-#include <com/sun/star/chart/XChartDataChangeEventListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_XChartData_idl__ 
+#define __com_sun_star_chart_XChartData_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_XChartDataChangeEventListener_idl__ 
+#include <com/sun/star/chart/XChartDataChangeEventListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** manages the data of the chart.
 
     @see XChartDocument
  */
 published interface XChartData: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** allows a component supporting the
         <type>XChartDataChangeEventListener</type> interface to
         register as listener.  The component will be notified with a
@@ -62,30 +62,30 @@ published interface XChartData: com::sun::star::uno::XInterface
         @see XChartDataChangeEventListener
         @see ChartDataChangeEvent
      */
-    void addChartDataChangeEventListener( [in] com::sun::star::chart::XChartDataChangeEventListener aListener );
-
-    //-------------------------------------------------------------------------
-
+    void addChartDataChangeEventListener( [in] com::sun::star::chart::XChartDataChangeEventListener aListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes a previously registered listener.
 
         @param aListener
             the component that is to be removed
      */
-    void removeChartDataChangeEventListener( [in] com::sun::star::chart::XChartDataChangeEventListener aListener );
-
-    //-------------------------------------------------------------------------
-
+    void removeChartDataChangeEventListener( [in] com::sun::star::chart::XChartDataChangeEventListener aListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** @returns
             the value which is to be used as an indicator for a
             missing value in the data.
-
+                 
         <p>In IEEE arithmetic format it is one of the NaN values, so
         there are no conflicts with existing numeric values.</p>
      */
-    double getNotANumber();
-
-    //-------------------------------------------------------------------------
-
+    double getNotANumber(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** checks whether the value given is equal to the indicator value
         for a missing value.
 
@@ -105,12 +105,12 @@ published interface XChartData: com::sun::star::uno::XInterface
         @param nNumber
             the number that you want to check for validity.
      */
-    boolean isNotANumber( [in] double nNumber );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean isNotANumber( [in] double nNumber ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/XChartDataArray.idl b/offapi/com/sun/star/chart/XChartDataArray.idl
index 4e7519864382..8c7e8f932b72 100644
--- a/offapi/com/sun/star/chart/XChartDataArray.idl
+++ b/offapi/com/sun/star/chart/XChartDataArray.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
-#define __com_sun_star_chart_XChartDataArray_idl__
-
-#ifndef __com_sun_star_chart_XChartData_idl__
-#include <com/sun/star/chart/XChartData.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_XChartDataArray_idl__ 
+#define __com_sun_star_chart_XChartDataArray_idl__ 
+ 
+#ifndef __com_sun_star_chart_XChartData_idl__ 
+#include <com/sun/star/chart/XChartData.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** gives access to data represented as an array of rows.
-
+    
     <p>Can be obtained from interface <type>XChartDocument</type> via method getData().</p>
 
     <p>If used for an <type>XYDiagram</type>, the row number 0
     represents the <i>x</i>-values.</p>
  */
 published interface XChartDataArray: XChartData
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** retrieves the numerical data as a nested sequence of values.
 
@@ -54,9 +54,9 @@ published interface XChartDataArray: XChartData
             the values as a sequence of sequences.  The inner sequence
             represents rows.
     */
-    sequence< sequence< double > > getData();
+    sequence< sequence< double > > getData(); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** sets the chart data as an array of numbers.
 
@@ -64,9 +64,9 @@ published interface XChartDataArray: XChartData
             the values as a sequence of sequences.  The inner sequence
             represents rows.
      */
-    void setData( [in] sequence< sequence< double > > aData );
+    void setData( [in] sequence< sequence< double > > aData ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** retrieves the description texts for all rows.
 
@@ -75,18 +75,18 @@ published interface XChartDataArray: XChartData
             of a row.
      */
     sequence< string > getRowDescriptions();
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the description texts for all rows.
 
         @param aRowDescriptions
             a sequence of strings which represent a description for
             each row.
     */
-    void setRowDescriptions( [in] sequence< string > aRowDescriptions );
-
-    //-------------------------------------------------------------------------
+    void setRowDescriptions( [in] sequence< string > aRowDescriptions ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** retrieves the description texts for all columns.
 
@@ -95,8 +95,8 @@ published interface XChartDataArray: XChartData
             of a column.
      */
     sequence< string > getColumnDescriptions();
-
-    //-------------------------------------------------------------------------
+ 
+    //------------------------------------------------------------------------- 
 
     /** sets the description texts for all columns.
 
@@ -105,10 +105,10 @@ published interface XChartDataArray: XChartData
             each column.
      */
     void setColumnDescriptions( [in] sequence< string > aColumnDescriptions );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/XChartDataChangeEventListener.idl b/offapi/com/sun/star/chart/XChartDataChangeEventListener.idl
index 13b6145a452f..f021afbdd591 100644
--- a/offapi/com/sun/star/chart/XChartDataChangeEventListener.idl
+++ b/offapi/com/sun/star/chart/XChartDataChangeEventListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_XChartDataChangeEventListener_idl__
-#define __com_sun_star_chart_XChartDataChangeEventListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartDataChangeEvent_idl__
-#include <com/sun/star/chart/ChartDataChangeEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_XChartDataChangeEventListener_idl__ 
+#define __com_sun_star_chart_XChartDataChangeEventListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartDataChangeEvent_idl__ 
+#include <com/sun/star/chart/ChartDataChangeEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive events when chart data changes.
  */
 published interface XChartDataChangeEventListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is called whenever chart data changes in value or structure.
 
         <p>This interface must be implemented by components that wish
@@ -60,12 +60,12 @@ published interface XChartDataChangeEventListener: com::sun::star::lang::XEventL
         @see ChartDataChangeEvent
         @see XChartData
      */
-    void chartDataChanged( [in] com::sun::star::chart::ChartDataChangeEvent aEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void chartDataChanged( [in] com::sun::star::chart::ChartDataChangeEvent aEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/XChartDocument.idl b/offapi/com/sun/star/chart/XChartDocument.idl
index 14322c6edf4a..5522020d7a2b 100644
--- a/offapi/com/sun/star/chart/XChartDocument.idl
+++ b/offapi/com/sun/star/chart/XChartDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,77 +24,77 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_XChartDocument_idl__
-#define __com_sun_star_chart_XChartDocument_idl__
-
-#ifndef __com_sun_star_frame_XModel_idl__
-#include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XDiagram_idl__
-#include <com/sun/star/chart/XDiagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_XChartData_idl__
-#include <com/sun/star/chart/XChartData.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_XChartDocument_idl__ 
+#define __com_sun_star_chart_XChartDocument_idl__ 
+ 
+#ifndef __com_sun_star_frame_XModel_idl__ 
+#include <com/sun/star/frame/XModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/drawing/XShape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_XDiagram_idl__ 
+#include <com/sun/star/chart/XDiagram.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_XChartData_idl__ 
+#include <com/sun/star/chart/XChartData.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** manages the chart document.
 
-    @see XDiagram
+    @see XDiagram 
     @see XChartData
  */
 published interface XChartDocument: com::sun::star::frame::XModel
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the shape of the main title of the chart document.
-
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            the shape of the main title of the chart document. 
+                 
         @see ChartTitle
      */
-    com::sun::star::drawing::XShape getTitle();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    com::sun::star::drawing::XShape getTitle(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             the shape of the subtitle of the chart document.
 
        <p>Usually the subtitle is smaller than the main title by
        default.  And it is most commonly placed below the main title
        by default.</p>
-
+                 
         @see ChartTitle
      */
-    com::sun::star::drawing::XShape getSubTitle();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the shape of the legend of the chart document.
+    com::sun::star::drawing::XShape getSubTitle(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            the shape of the legend of the chart document. 
 
         @see ChartLegend
      */
-    com::sun::star::drawing::XShape getLegend();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    com::sun::star::drawing::XShape getLegend(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             the properties of the background area of the chart document.
 
         <p>The area's extent is equal to the document size.  If you
@@ -106,19 +106,19 @@ published interface XChartDocument: com::sun::star::frame::XModel
         @see ChartArea
         @see X3DDisplay
      */
-    com::sun::star::beans::XPropertySet getArea();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    com::sun::star::beans::XPropertySet getArea(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             the diagram of the chart document.
 
         @see Diagram
      */
-    com::sun::star::chart::XDiagram getDiagram();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::chart::XDiagram getDiagram(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the diagram for the chart document.
 
         <p>Setting a new diagram implicitly disposes the previous
@@ -131,11 +131,11 @@ published interface XChartDocument: com::sun::star::frame::XModel
             which should be implemented by an
             <type>XChartDocument</type>.
      */
-    void setDiagram( [in] com::sun::star::chart::XDiagram xDiagram );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    void setDiagram( [in] com::sun::star::chart::XDiagram xDiagram ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             the data of the chart.
 
         <p>The returned object supports interface <type>XChartDataArray</type>
@@ -143,15 +143,15 @@ published interface XChartDocument: com::sun::star::frame::XModel
 
         <p>Since OOo 3.3 the returned object also supports interface <type>XComplexDescriptionAccess</type>
         which can be used to access complex hierarchical axis descriptions.</p>
-
+                 
         @see XChartData
         @see XChartDataArray
         @see XComplexDescriptionAccess
      */
-    com::sun::star::chart::XChartData getData();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::chart::XChartData getData(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** attaches data to the chart.
 
         <p>The given object needs to support interface <type>XChartDataArray</type>.</p>
@@ -169,12 +169,12 @@ published interface XChartDocument: com::sun::star::frame::XModel
         @param xData
             the object that provides the new data.
      */
-    void attachData( [in] com::sun::star::chart::XChartData xData );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void attachData( [in] com::sun::star::chart::XChartData xData ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl b/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl
index 4e5af5f3ba83..930feae28e73 100755
--- a/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl
+++ b/offapi/com/sun/star/chart/XComplexDescriptionAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,19 +24,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_XComplexDescriptionAccess_idl__
-#define __com_sun_star_chart_XComplexDescriptionAccess_idl__
-
-#ifndef __com_sun_star_chart_XChartDataArray_idl__
-#include <com/sun/star/chart/XChartDataArray.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_XComplexDescriptionAccess_idl__ 
+#define __com_sun_star_chart_XComplexDescriptionAccess_idl__ 
+ 
+#ifndef __com_sun_star_chart_XChartDataArray_idl__ 
+#include <com/sun/star/chart/XChartDataArray.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** Offers access to complex column and row descriptions.
 
 <p>Can be obtained from interface <type>XChartDocument</type> via method getData().</p>
@@ -45,8 +45,8 @@
 */
 
 published interface XComplexDescriptionAccess : XChartDataArray
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** retrieves the description texts for all rows.
 
@@ -56,30 +56,30 @@ published interface XComplexDescriptionAccess : XChartDataArray
             The inner index represents the different levels (usually there is only one).
      */
     sequence< sequence< string > > getComplexRowDescriptions();
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the description texts for all rows.
-
+    
         @param rRowDescriptions
             a sequence of sequences of strings representing the descriptions of all
             rows. The outer index represents different rows.
             The inner index represents the different levels (usually there is only one).
     */
-    void setComplexRowDescriptions( [in] sequence< sequence< string > > rRowDescriptions );
-
-    //-------------------------------------------------------------------------
+    void setComplexRowDescriptions( [in] sequence< sequence< string > > rRowDescriptions ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** retrieves the description texts for all columns.
-
+    
         @returns
             a sequence of sequences of strings representing the descriptions
             of all columns. The outer index represents different columns.
             The inner index represents the different levels (usually there is only one).
      */
     sequence< sequence< string > > getComplexColumnDescriptions();
-
-    //-------------------------------------------------------------------------
+ 
+    //------------------------------------------------------------------------- 
 
     /** sets the description texts for all columns.
 
@@ -89,10 +89,10 @@ published interface XComplexDescriptionAccess : XChartDataArray
             The inner index represents the different levels (usually there is only one).
      */
     void setComplexColumnDescriptions( [in] sequence< sequence< string > > rColumnDescriptions );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/XDiagram.idl b/offapi/com/sun/star/chart/XDiagram.idl
index 959ec6ce9dcd..6a1cb0432d20 100644
--- a/offapi/com/sun/star/chart/XDiagram.idl
+++ b/offapi/com/sun/star/chart/XDiagram.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_XDiagram_idl__
-#define __com_sun_star_chart_XDiagram_idl__
-
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
-#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_XDiagram_idl__ 
+#define __com_sun_star_chart_XDiagram_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/drawing/XShape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ 
+#include <com/sun/star/lang/IndexOutOfBoundsException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** manages the diagram of the chart document.
 
     @see XChartDocument
  */
 published interface XDiagram: com::sun::star::drawing::XShape
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             a string representing the diagram type. This string
             contains the fully qualified name of the corresponding
             service.
      */
-    string getDiagramType();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    string getDiagramType(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             the properties of the specified data row (series).
 
         @param nRow
@@ -70,29 +70,29 @@ published interface XDiagram: com::sun::star::drawing::XShape
 
         @see ChartDataRowProperties
      */
-    com::sun::star::beans::XPropertySet getDataRowProperties( [in] long nRow )
-        raises( com::sun::star::lang::IndexOutOfBoundsException );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the properties of the specified data point.
+    com::sun::star::beans::XPropertySet getDataRowProperties( [in] long nRow ) 
+        raises( com::sun::star::lang::IndexOutOfBoundsException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            the properties of the specified data point. 
 
         @param nCol
             the index of the data point of a series (0-based).
         @param nRow
             the index of a series (0-based).
-
+            
         @see ChartDataPointProperties
      */
-    com::sun::star::beans::XPropertySet getDataPointProperties( [in] long nCol,
-                                                                [in] long nRow )
-        raises( com::sun::star::lang::IndexOutOfBoundsException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::beans::XPropertySet getDataPointProperties( [in] long nCol, 
+                                                                [in] long nRow ) 
+        raises( com::sun::star::lang::IndexOutOfBoundsException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/XDiagramPositioning.idl b/offapi/com/sun/star/chart/XDiagramPositioning.idl
index 830cc52401dc..c69601ba7e29 100644
--- a/offapi/com/sun/star/chart/XDiagramPositioning.idl
+++ b/offapi/com/sun/star/chart/XDiagramPositioning.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,28 +27,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_XDiagramPositioning_idl__
-#define __com_sun_star_chart_XDiagramPositioning_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_chart_XDiagramPositioning_idl__ 
+#define __com_sun_star_chart_XDiagramPositioning_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** allow for different positioning options for a diagram
 
     @see Diagram
  */
 interface XDiagramPositioning : com::sun::star::uno::XInterface
-{
+{ 
     /** the diagram will be placed automatically
     */
     void setAutomaticDiagramPositioning();
@@ -98,10 +98,10 @@ interface XDiagramPositioning : com::sun::star::uno::XInterface
         It might be necessary to calculate the positioning so this method can be expensive and the result may depend on different other settings.
     */
     com::sun::star::awt::Rectangle calculateDiagramPositionIncludingAxesAndAxisTitles();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl b/offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl
index fcd347eeed47..96e6639e90f0 100644
--- a/offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl
+++ b/offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl
@@ -1,24 +1,24 @@
-#ifndef __com_sun_star_chart_XSecondAxisTitleSupplier_idl__
-#define __com_sun_star_chart_XSecondAxisTitleSupplier_idl__
+#ifndef __com_sun_star_chart_XSecondAxisTitleSupplier_idl__ 
+#define __com_sun_star_chart_XSecondAxisTitleSupplier_idl__ 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
 #endif
 
-
-module com {  module sun {  module star {  module chart {
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/drawing/XShape.idl> 
+#endif 
+ 
+ 
+module com {  module sun {  module star {  module chart {  
 
 interface XSecondAxisTitleSupplier: com::sun::star::uno::XInterface
-{
-    com::sun::star::drawing::XShape getSecondXAxisTitle();
+{ 
+    com::sun::star::drawing::XShape getSecondXAxisTitle(); 
 
     com::sun::star::drawing::XShape getSecondYAxisTitle();
-};
-
-}; }; }; };
+}; 
 
+}; }; }; };  
+ 
 #endif 
\ No newline at end of file
diff --git a/offapi/com/sun/star/chart/XStatisticDisplay.idl b/offapi/com/sun/star/chart/XStatisticDisplay.idl
index a81038ab0c6d..0b71d6923c77 100644
--- a/offapi/com/sun/star/chart/XStatisticDisplay.idl
+++ b/offapi/com/sun/star/chart/XStatisticDisplay.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_XStatisticDisplay_idl__
-#define __com_sun_star_chart_XStatisticDisplay_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_XStatisticDisplay_idl__ 
+#define __com_sun_star_chart_XStatisticDisplay_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** gives access to statistical elements for the chart.
 
     <p>Statistical elements are used by a
     <type>StockDiagram</type>.</p>
-
+    
     @see XChartDocument
     @see StockDiagram
  */
 published interface XStatisticDisplay: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** @returns
             the properties of the up bars of a stock chart which has
             <member>StockDiagram::UpDown</member> set to <TRUE/>.
-
+                 
         <p>The <em>UpBar</em> is the box that is drawn between the
         open and close value of a stock, when the closing value is
         above the opening value, i.e., the stock price rose.</p>
 
         @see ChartArea
      */
-    com::sun::star::beans::XPropertySet getUpBar();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::beans::XPropertySet getUpBar(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** @returns
             the properties of the down bars of a stock chart which has
             <member>StockDiagram::UpDown</member> set to <TRUE/>.
@@ -78,22 +78,22 @@ published interface XStatisticDisplay: com::sun::star::uno::XInterface
 
         @see ChartArea
      */
-    com::sun::star::beans::XPropertySet getDownBar();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::beans::XPropertySet getDownBar(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** @returns
             the properties of the lines that are drawn between the
             lowest and highest stock value during a day.
-
+                 
         @see ChartLine
      */
-    com::sun::star::beans::XPropertySet getMinMaxLine();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::beans::XPropertySet getMinMaxLine(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/XTwoAxisXSupplier.idl b/offapi/com/sun/star/chart/XTwoAxisXSupplier.idl
index 2fbbf8f6cbf5..d6a05afa42e8 100644
--- a/offapi/com/sun/star/chart/XTwoAxisXSupplier.idl
+++ b/offapi/com/sun/star/chart/XTwoAxisXSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_XTwoAxisXSupplier_idl__
-#define __com_sun_star_chart_XTwoAxisXSupplier_idl__
-
-#ifndef __com_sun_star_chart_XAxisXSupplier_idl__
-#include <com/sun/star/chart/XAxisXSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_XTwoAxisXSupplier_idl__ 
+#define __com_sun_star_chart_XTwoAxisXSupplier_idl__ 
+ 
+#ifndef __com_sun_star_chart_XAxisXSupplier_idl__ 
+#include <com/sun/star/chart/XAxisXSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** gives access to both the primary and the secondary <i>x</i>-axis
     of a chart.
 
     @see XDiagram
  */
 published interface XTwoAxisXSupplier: com::sun::star::chart::XAxisXSupplier
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** @returns
             the properties of the secondary <i>x</i>-axis of the
             diagram.
 
         <p>The returned property set contains scaling properties as
         well as formatting properties.</p>
-
+                 
         @see ChartAxis
      */
-    com::sun::star::beans::XPropertySet getSecondaryXAxis();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::beans::XPropertySet getSecondaryXAxis(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/XTwoAxisYSupplier.idl b/offapi/com/sun/star/chart/XTwoAxisYSupplier.idl
index 01c8839df463..44753229f904 100644
--- a/offapi/com/sun/star/chart/XTwoAxisYSupplier.idl
+++ b/offapi/com/sun/star/chart/XTwoAxisYSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_XTwoAxisYSupplier_idl__
-#define __com_sun_star_chart_XTwoAxisYSupplier_idl__
-
-#ifndef __com_sun_star_chart_XAxisYSupplier_idl__
-#include <com/sun/star/chart/XAxisYSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_XTwoAxisYSupplier_idl__ 
+#define __com_sun_star_chart_XTwoAxisYSupplier_idl__ 
+ 
+#ifndef __com_sun_star_chart_XAxisYSupplier_idl__ 
+#include <com/sun/star/chart/XAxisYSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** gives access to both the primary and the secondary y-axis of a diagram.@see        XChartDocument
  */
 published interface XTwoAxisYSupplier: com::sun::star::chart::XAxisYSupplier
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             the properties of the secondary <i>y</i>-axis of the
             diagram.
 
         <p>The returned property set contains scaling properties as
         well as formatting properties.</p>
-
+                 
         @see ChartAxis
      */
-    com::sun::star::beans::XPropertySet getSecondaryYAxis();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::beans::XPropertySet getSecondaryYAxis(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/XYDiagram.idl b/offapi/com/sun/star/chart/XYDiagram.idl
index 501608669f0c..8b0ff9342d49 100644
--- a/offapi/com/sun/star/chart/XYDiagram.idl
+++ b/offapi/com/sun/star/chart/XYDiagram.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_chart_XYDiagram_idl__
-#define __com_sun_star_chart_XYDiagram_idl__
-
-#ifndef __com_sun_star_chart_Diagram_idl__
-#include <com/sun/star/chart/Diagram.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartStatistics_idl__
-#include <com/sun/star/chart/ChartStatistics.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__
-#include <com/sun/star/chart/ChartAxisXSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__
-#include <com/sun/star/chart/ChartTwoAxisYSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_chart_LineDiagram_idl__
-#include <com/sun/star/chart/LineDiagram.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart_XYDiagram_idl__ 
+#define __com_sun_star_chart_XYDiagram_idl__ 
+ 
+#ifndef __com_sun_star_chart_Diagram_idl__ 
+#include <com/sun/star/chart/Diagram.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartStatistics_idl__ 
+#include <com/sun/star/chart/ChartStatistics.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartAxisXSupplier_idl__ 
+#include <com/sun/star/chart/ChartAxisXSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_ChartTwoAxisYSupplier_idl__ 
+#include <com/sun/star/chart/ChartTwoAxisYSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_chart_LineDiagram_idl__ 
+#include <com/sun/star/chart/LineDiagram.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
 /** a service for X/Y diagrams (Also known as scatter charts).
 
     <p>The special thing about X/Y diagrams is that the first series
@@ -62,16 +62,16 @@
     at which data points are placed.</p>
  */
 published service XYDiagram
-{
+{ 
     service com::sun::star::chart::Diagram;
     service com::sun::star::chart::ChartStatistics;
     service com::sun::star::chart::ChartAxisXSupplier;
     service com::sun::star::chart::ChartTwoAxisYSupplier;
     service com::sun::star::chart::LineDiagram;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart2/Axis.idl b/offapi/com/sun/star/chart2/Axis.idl
index e952d446e80d..c552a4d7b18d 100644
--- a/offapi/com/sun/star/chart2/Axis.idl
+++ b/offapi/com/sun/star/chart2/Axis.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -69,11 +69,11 @@ service Axis
 
     /** Determines where the axis crosses the other axis.
      */
-    [optional, property] com::sun::star::chart::ChartAxisPosition CrossoverPosition;
+    [optional, property] com::sun::star::chart::ChartAxisPosition CrossoverPosition; 
 
     /** Determines the scale value on the other axis when CrossoverPosition is set to VALUE.
      */
-    [optional, property] double CrossoverValue;
+    [optional, property] double CrossoverValue; 
 
     /** Determines whether to display text at the axis or not.
      */
@@ -81,7 +81,7 @@ service Axis
 
     /** Determines where the axis labels are placed.
      */
-    [optional, property] com::sun::star::chart::ChartAxisLabelPosition LabelPosition;
+    [optional, property] com::sun::star::chart::ChartAxisLabelPosition LabelPosition; 
 
     /** Determines how to stagger the labels at the axis (side by side, even, odd, auto )
     */
@@ -131,7 +131,7 @@ service Axis
 
     /** Determines where the interval marks are placed.
      */
-    [optional, property] com::sun::star::chart::ChartAxisMarkPosition MarkPosition;
+    [optional, property] com::sun::star::chart::ChartAxisMarkPosition MarkPosition; 
 };
 
 } ; // chart2
diff --git a/offapi/com/sun/star/chart2/AxisOrientation.idl b/offapi/com/sun/star/chart2/AxisOrientation.idl
index 688535e26eba..541316c320ac 100644
--- a/offapi/com/sun/star/chart2/AxisOrientation.idl
+++ b/offapi/com/sun/star/chart2/AxisOrientation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/AxisType.idl b/offapi/com/sun/star/chart2/AxisType.idl
index 16d977c34801..f981eda173dc 100644
--- a/offapi/com/sun/star/chart2/AxisType.idl
+++ b/offapi/com/sun/star/chart2/AxisType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ constants AxisType
 {
     /** the axis represent real numbers
      */
-    const long REALNUMBER = 0;
+    const long REALNUMBER = 0; 
     /** the axis represent real numbers in percent
      */
     const long PERCENT = 1;
diff --git a/offapi/com/sun/star/chart2/Break.idl b/offapi/com/sun/star/chart2/Break.idl
index b5dbe80d2933..c45698edc733 100644
--- a/offapi/com/sun/star/chart2/Break.idl
+++ b/offapi/com/sun/star/chart2/Break.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/CandleStickChartType.idl b/offapi/com/sun/star/chart2/CandleStickChartType.idl
index 155ab6838935..79787f08cb37 100644
--- a/offapi/com/sun/star/chart2/CandleStickChartType.idl
+++ b/offapi/com/sun/star/chart2/CandleStickChartType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/ChartDocument.idl b/offapi/com/sun/star/chart2/ChartDocument.idl
index c4927d8297be..c2f3f1c25fa4 100644
--- a/offapi/com/sun/star/chart2/ChartDocument.idl
+++ b/offapi/com/sun/star/chart2/ChartDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/ChartDocumentWrapper.idl b/offapi/com/sun/star/chart2/ChartDocumentWrapper.idl
index a0075b449aa4..9a82d81a2c16 100644
--- a/offapi/com/sun/star/chart2/ChartDocumentWrapper.idl
+++ b/offapi/com/sun/star/chart2/ChartDocumentWrapper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/ChartType.idl b/offapi/com/sun/star/chart2/ChartType.idl
index 266ab33fc8d2..73c47039fca1 100644
--- a/offapi/com/sun/star/chart2/ChartType.idl
+++ b/offapi/com/sun/star/chart2/ChartType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/ChartTypeManager.idl b/offapi/com/sun/star/chart2/ChartTypeManager.idl
index 2d47cc007ef5..9eae8e2decd2 100644
--- a/offapi/com/sun/star/chart2/ChartTypeManager.idl
+++ b/offapi/com/sun/star/chart2/ChartTypeManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/CoordinateSystemType.idl b/offapi/com/sun/star/chart2/CoordinateSystemType.idl
index 310da4e62c47..410d910ac4d6 100644
--- a/offapi/com/sun/star/chart2/CoordinateSystemType.idl
+++ b/offapi/com/sun/star/chart2/CoordinateSystemType.idl
@@ -19,7 +19,7 @@ service CoordinateSystemType
 {
     /** required interface
     */
-//  interface ::com::sun::star::chart2::XCoordinateSystemType;
+// 	interface ::com::sun::star::chart2::XCoordinateSystemType;
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/chart2/CurveStyle.idl b/offapi/com/sun/star/chart2/CurveStyle.idl
index e8f97fde9b77..84d2fa0154da 100644
--- a/offapi/com/sun/star/chart2/CurveStyle.idl
+++ b/offapi/com/sun/star/chart2/CurveStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/DataPoint.idl b/offapi/com/sun/star/chart2/DataPoint.idl
index 9278ffb3566c..bdfa2d8bcec1 100644
--- a/offapi/com/sun/star/chart2/DataPoint.idl
+++ b/offapi/com/sun/star/chart2/DataPoint.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,7 +56,7 @@ service DataPoint
         <p>It should provide templates for all properties in this
         service, thus it must also support <type>DataPoint</type>.</p>
      */
-//  [property]  ::com::sun::star::style::XStyle     Style;
+// 	[property]  ::com::sun::star::style::XStyle     Style;
 
     /** Gives the offset of the data point.  For PieDiagrams this
         would be the percentage by which pies are dragged out of the
diff --git a/offapi/com/sun/star/chart2/DataPointGeometry3D.idl b/offapi/com/sun/star/chart2/DataPointGeometry3D.idl
index a751491a99a5..76170ec46249 100644
--- a/offapi/com/sun/star/chart2/DataPointGeometry3D.idl
+++ b/offapi/com/sun/star/chart2/DataPointGeometry3D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,49 +25,49 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_chart2_datapointgeometry3d_idl__
-#define __com_sun_star_chart2_datapointgeometry3d_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart2 {
-
-//=============================================================================
-
+#ifndef __com_sun_star_chart2_datapointgeometry3d_idl__ 
+#define __com_sun_star_chart2_datapointgeometry3d_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart2 {  
+ 
+//============================================================================= 
+ 
 /** These values specify the geometry of data points in
     3D bar charts.
  */
 constants DataPointGeometry3D
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** a cuboid
      */
-    const long CUBOID = 0;
-
-    //-------------------------------------------------------------------------
-
+    const long CUBOID = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** a cylinder with a circle as base
      */
-    const long CYLINDER = 1;
-
-    //-------------------------------------------------------------------------
-
+    const long CYLINDER = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** a cone with a circle as base
      */
-    const long CONE = 2;
-
-    //-------------------------------------------------------------------------
-
+    const long CONE = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** a pyramid with a square as base
      */
-    const long PYRAMID = 3;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const long PYRAMID = 3; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart2/DataPointLabel.idl b/offapi/com/sun/star/chart2/DataPointLabel.idl
index f0a73b5a2a51..57fb19adb2e7 100644
--- a/offapi/com/sun/star/chart2/DataPointLabel.idl
+++ b/offapi/com/sun/star/chart2/DataPointLabel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/DataPointProperties.idl b/offapi/com/sun/star/chart2/DataPointProperties.idl
index c5437e87d777..6e309dc7242d 100644
--- a/offapi/com/sun/star/chart2/DataPointProperties.idl
+++ b/offapi/com/sun/star/chart2/DataPointProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/DataSeries.idl b/offapi/com/sun/star/chart2/DataSeries.idl
index 580c036c49eb..16b0b1f2fc71 100644
--- a/offapi/com/sun/star/chart2/DataSeries.idl
+++ b/offapi/com/sun/star/chart2/DataSeries.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/Diagram.idl b/offapi/com/sun/star/chart2/Diagram.idl
index 8abd1fa3110c..3b75f89cbac0 100644
--- a/offapi/com/sun/star/chart2/Diagram.idl
+++ b/offapi/com/sun/star/chart2/Diagram.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/ErrorBar.idl b/offapi/com/sun/star/chart2/ErrorBar.idl
index c9f87c92e4f7..ceb8ff753d40 100644
--- a/offapi/com/sun/star/chart2/ErrorBar.idl
+++ b/offapi/com/sun/star/chart2/ErrorBar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/ExplicitIncrementData.idl b/offapi/com/sun/star/chart2/ExplicitIncrementData.idl
index 72c1957bc9c5..3ec727e5ebd0 100644
--- a/offapi/com/sun/star/chart2/ExplicitIncrementData.idl
+++ b/offapi/com/sun/star/chart2/ExplicitIncrementData.idl
@@ -38,7 +38,7 @@ struct ExplicitIncrementData
     <p><member>PostEquidistant</member> rules whether the <member>Distance</member>
     is meant to be a value before or after scaling.</p>
     */
-    double      Distance;
+    double		Distance;
 
     /**
     <member>PostEquidistant</member> rules whether the member <member>Distance</member>
@@ -50,7 +50,7 @@ struct ExplicitIncrementData
     If <member>PostEquidistant</member> equals <FALSE/> <member>Distance</member>
     is given in values before <type>XScaling</type> is applied.</p>
     */
-    boolean     PostEquidistant;
+    boolean		PostEquidistant;
 
     /** The <member>BaseValue</member> gives a starting point on the scale
     to which all further main tickmarks are relatively positioned.
@@ -68,7 +68,7 @@ struct ExplicitIncrementData
     And setting BaseValue to 2, -2, 4, -4 etc. in this example
     leads to the same result as BaseValue=0.</p>
     */
-    double      BaseValue;
+    double		BaseValue;
 
     /** <member>SubIncrements</member> describes the positioning of further
     sub tickmarks on the scale of an axis.
diff --git a/offapi/com/sun/star/chart2/ExponentialScaling.idl b/offapi/com/sun/star/chart2/ExponentialScaling.idl
index 95fd88853c71..6ac775831158 100644
--- a/offapi/com/sun/star/chart2/ExponentialScaling.idl
+++ b/offapi/com/sun/star/chart2/ExponentialScaling.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/FillBitmap.idl b/offapi/com/sun/star/chart2/FillBitmap.idl
index b80139f46629..69d0ef62e655 100644
--- a/offapi/com/sun/star/chart2/FillBitmap.idl
+++ b/offapi/com/sun/star/chart2/FillBitmap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/GridProperties.idl b/offapi/com/sun/star/chart2/GridProperties.idl
index e1b82c07d5a6..3a6b51a823f4 100644
--- a/offapi/com/sun/star/chart2/GridProperties.idl
+++ b/offapi/com/sun/star/chart2/GridProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/InterpretedData.idl b/offapi/com/sun/star/chart2/InterpretedData.idl
index 0eedd9c44df3..515c315205dc 100644
--- a/offapi/com/sun/star/chart2/InterpretedData.idl
+++ b/offapi/com/sun/star/chart2/InterpretedData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/Legend.idl b/offapi/com/sun/star/chart2/Legend.idl
index 0d51492ae4c2..e48b6d3c02e5 100644
--- a/offapi/com/sun/star/chart2/Legend.idl
+++ b/offapi/com/sun/star/chart2/Legend.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/LegendExpansion.idl b/offapi/com/sun/star/chart2/LegendExpansion.idl
index 8a51a47bb3a1..10191f24077b 100644
--- a/offapi/com/sun/star/chart2/LegendExpansion.idl
+++ b/offapi/com/sun/star/chart2/LegendExpansion.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/LegendPosition.idl b/offapi/com/sun/star/chart2/LegendPosition.idl
index 0cdd32270eb5..4820a6d31872 100644
--- a/offapi/com/sun/star/chart2/LegendPosition.idl
+++ b/offapi/com/sun/star/chart2/LegendPosition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/LegendSymbolStyle.idl b/offapi/com/sun/star/chart2/LegendSymbolStyle.idl
index 13d47ee3a7c9..4ffdf9200729 100644
--- a/offapi/com/sun/star/chart2/LegendSymbolStyle.idl
+++ b/offapi/com/sun/star/chart2/LegendSymbolStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/LightSource.idl b/offapi/com/sun/star/chart2/LightSource.idl
index d437338ede7c..499f99b79329 100644
--- a/offapi/com/sun/star/chart2/LightSource.idl
+++ b/offapi/com/sun/star/chart2/LightSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/LinearScaling.idl b/offapi/com/sun/star/chart2/LinearScaling.idl
index 6d1b4c90aa38..37a488afe9f1 100644
--- a/offapi/com/sun/star/chart2/LinearScaling.idl
+++ b/offapi/com/sun/star/chart2/LinearScaling.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/LogarithmicScaling.idl b/offapi/com/sun/star/chart2/LogarithmicScaling.idl
index 0c6c2eedba26..ee0e9154a9a3 100644
--- a/offapi/com/sun/star/chart2/LogarithmicScaling.idl
+++ b/offapi/com/sun/star/chart2/LogarithmicScaling.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/MutableDataSequence.idl b/offapi/com/sun/star/chart2/MutableDataSequence.idl
index 8c37c8d74de5..3c37d9d79ffc 100644
--- a/offapi/com/sun/star/chart2/MutableDataSequence.idl
+++ b/offapi/com/sun/star/chart2/MutableDataSequence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/PieChartOffsetMode.idl b/offapi/com/sun/star/chart2/PieChartOffsetMode.idl
index 0210ed104a52..f4fc77360ef0 100644
--- a/offapi/com/sun/star/chart2/PieChartOffsetMode.idl
+++ b/offapi/com/sun/star/chart2/PieChartOffsetMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/PowerScaling.idl b/offapi/com/sun/star/chart2/PowerScaling.idl
index 1d82f2a8f951..72269798b54c 100644
--- a/offapi/com/sun/star/chart2/PowerScaling.idl
+++ b/offapi/com/sun/star/chart2/PowerScaling.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/PropertyPool.idl b/offapi/com/sun/star/chart2/PropertyPool.idl
index dfceeaf102ae..8530f5bf758f 100644
--- a/offapi/com/sun/star/chart2/PropertyPool.idl
+++ b/offapi/com/sun/star/chart2/PropertyPool.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/RegressionCurve.idl b/offapi/com/sun/star/chart2/RegressionCurve.idl
index 4a7c416bf40b..fb06920827e3 100644
--- a/offapi/com/sun/star/chart2/RegressionCurve.idl
+++ b/offapi/com/sun/star/chart2/RegressionCurve.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/RegressionCurveEquation.idl b/offapi/com/sun/star/chart2/RegressionCurveEquation.idl
index 99204903f192..9a13c416abe6 100644
--- a/offapi/com/sun/star/chart2/RegressionCurveEquation.idl
+++ b/offapi/com/sun/star/chart2/RegressionCurveEquation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/RelativePosition.idl b/offapi/com/sun/star/chart2/RelativePosition.idl
index 5eb92916585c..ae2e95c6ffe2 100644
--- a/offapi/com/sun/star/chart2/RelativePosition.idl
+++ b/offapi/com/sun/star/chart2/RelativePosition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/RelativeSize.idl b/offapi/com/sun/star/chart2/RelativeSize.idl
index 669bf0f0df24..72524d616a19 100644
--- a/offapi/com/sun/star/chart2/RelativeSize.idl
+++ b/offapi/com/sun/star/chart2/RelativeSize.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/Scaling.idl b/offapi/com/sun/star/chart2/Scaling.idl
index 47b554dbc72e..32382467e60f 100644
--- a/offapi/com/sun/star/chart2/Scaling.idl
+++ b/offapi/com/sun/star/chart2/Scaling.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/StackingDirection.idl b/offapi/com/sun/star/chart2/StackingDirection.idl
index fcdb098d8a96..527567667509 100644
--- a/offapi/com/sun/star/chart2/StackingDirection.idl
+++ b/offapi/com/sun/star/chart2/StackingDirection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl b/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl
index e5bc31759ace..3b5ff4d27b93 100644
--- a/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl
+++ b/offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/Symbol.idl b/offapi/com/sun/star/chart2/Symbol.idl
index c528ea86ddfe..24fafa99dbb7 100644
--- a/offapi/com/sun/star/chart2/Symbol.idl
+++ b/offapi/com/sun/star/chart2/Symbol.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,11 +49,11 @@ struct Symbol
     /** determines which of the following members determines the
         appearance of the symbol.
      */
-    SymbolStyle                                         Style;
+    SymbolStyle                                 		Style;
 
     /** The given polygon is used as symbol.
      */
-    com::sun::star::drawing::PolyPolygonBezierCoords    PolygonCoords;
+    com::sun::star::drawing::PolyPolygonBezierCoords	PolygonCoords;
 
     /** Use the nth standard symbol, if <member>Style</member> is set
         to <member>SymbolStlye::STANDARD</member>.
@@ -83,17 +83,17 @@ struct Symbol
 
         </p>
      */
-    long                                                StandardSymbol;
+    long 												StandardSymbol;
 
     /** use this graphic as symbol
      */
-    com::sun::star::graphic::XGraphic                   Graphic;
+    com::sun::star::graphic::XGraphic 					Graphic;
 
     /** The size of the symbol in 100th of a mm.
 
         @todo use a structure using doubles instead of longs
      */
-    com::sun::star::awt::Size                           Size;
+    com::sun::star::awt::Size 							Size;
 
     /** The color used for drawing the border of symbols.
 
@@ -102,7 +102,7 @@ struct Symbol
         <member>SymbolStyle::STANDARD</member> or
         <member>SymbolStyle::POLYGON</member>.</p>
      */
-    long                                                BorderColor;
+    long 												BorderColor;
 
     /** The color used for filling symbols that contain closed polygons.
 
@@ -111,7 +111,7 @@ struct Symbol
         <member>SymbolStyle::STANDARD</member> or
         <member>SymbolStyle::POLYGON</member>.</p>
      */
-    long                                                FillColor;
+    long 												FillColor;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/chart2/SymbolStyle.idl b/offapi/com/sun/star/chart2/SymbolStyle.idl
index 654ed38923c2..8c83b61b309d 100644
--- a/offapi/com/sun/star/chart2/SymbolStyle.idl
+++ b/offapi/com/sun/star/chart2/SymbolStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/TextAnchor.idl b/offapi/com/sun/star/chart2/TextAnchor.idl
index b5de66e70eb8..a324578d1046 100644
--- a/offapi/com/sun/star/chart2/TextAnchor.idl
+++ b/offapi/com/sun/star/chart2/TextAnchor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/TickmarkStyle.idl b/offapi/com/sun/star/chart2/TickmarkStyle.idl
index 88e27470d83e..f778ce385de4 100644
--- a/offapi/com/sun/star/chart2/TickmarkStyle.idl
+++ b/offapi/com/sun/star/chart2/TickmarkStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/Title.idl b/offapi/com/sun/star/chart2/Title.idl
index d28cdcb6c4f9..90a64c550c2a 100644
--- a/offapi/com/sun/star/chart2/Title.idl
+++ b/offapi/com/sun/star/chart2/Title.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/TransparencyStyle.idl b/offapi/com/sun/star/chart2/TransparencyStyle.idl
index 13a1c93b1154..e002e1a67ba0 100644
--- a/offapi/com/sun/star/chart2/TransparencyStyle.idl
+++ b/offapi/com/sun/star/chart2/TransparencyStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/ViewLegendEntry.idl b/offapi/com/sun/star/chart2/ViewLegendEntry.idl
index 0e5ea231628c..ce50a03b70f5 100644
--- a/offapi/com/sun/star/chart2/ViewLegendEntry.idl
+++ b/offapi/com/sun/star/chart2/ViewLegendEntry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XChartDocument.idl b/offapi/com/sun/star/chart2/XChartDocument.idl
index 890b54a5112d..34ca8e4b4d27 100644
--- a/offapi/com/sun/star/chart2/XChartDocument.idl
+++ b/offapi/com/sun/star/chart2/XChartDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XChartTypeContainer.idl b/offapi/com/sun/star/chart2/XChartTypeContainer.idl
index c9e61ff9d9e8..fc583bfdc7f2 100644
--- a/offapi/com/sun/star/chart2/XChartTypeContainer.idl
+++ b/offapi/com/sun/star/chart2/XChartTypeContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
index 4b688f54a64c..afb241f57302 100644
--- a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
+++ b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XColorScheme.idl b/offapi/com/sun/star/chart2/XColorScheme.idl
index 6b29a0b9eb75..62a45e4fa492 100644
--- a/offapi/com/sun/star/chart2/XColorScheme.idl
+++ b/offapi/com/sun/star/chart2/XColorScheme.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XCoordinateSystemContainer.idl b/offapi/com/sun/star/chart2/XCoordinateSystemContainer.idl
index afbd6066e063..0f455202fbef 100644
--- a/offapi/com/sun/star/chart2/XCoordinateSystemContainer.idl
+++ b/offapi/com/sun/star/chart2/XCoordinateSystemContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XDataInterpreter.idl b/offapi/com/sun/star/chart2/XDataInterpreter.idl
index 14238dc531a5..ace1d9459810 100644
--- a/offapi/com/sun/star/chart2/XDataInterpreter.idl
+++ b/offapi/com/sun/star/chart2/XDataInterpreter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XDataSeries.idl b/offapi/com/sun/star/chart2/XDataSeries.idl
index d22f87b2680f..694837a3e687 100644
--- a/offapi/com/sun/star/chart2/XDataSeries.idl
+++ b/offapi/com/sun/star/chart2/XDataSeries.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -66,7 +66,7 @@ interface XDataSeries : ::com::sun::star::uno::XInterface
         raises( ::com::sun::star::lang::IndexOutOfBoundsException );
 
     /** the formatting of the specified data point is cleared
-
+        
         @param nIndex
             specifies the index of the data point within the series. The first index is 0.
      */
diff --git a/offapi/com/sun/star/chart2/XDataSeriesContainer.idl b/offapi/com/sun/star/chart2/XDataSeriesContainer.idl
index 659120d67ec6..efb2962f14e4 100644
--- a/offapi/com/sun/star/chart2/XDataSeriesContainer.idl
+++ b/offapi/com/sun/star/chart2/XDataSeriesContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl b/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl
index 30694a87e7f0..f7a59ddac86c 100644
--- a/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl
+++ b/offapi/com/sun/star/chart2/XDefaultSizeTransmitter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XDiagram.idl b/offapi/com/sun/star/chart2/XDiagram.idl
index 3836489b7aed..6c935c5e71fa 100644
--- a/offapi/com/sun/star/chart2/XDiagram.idl
+++ b/offapi/com/sun/star/chart2/XDiagram.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XDiagramProvider.idl b/offapi/com/sun/star/chart2/XDiagramProvider.idl
index 9aaf2771b5f6..128dd08cb93b 100644
--- a/offapi/com/sun/star/chart2/XDiagramProvider.idl
+++ b/offapi/com/sun/star/chart2/XDiagramProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,7 +52,7 @@ interface XDiagramProvider : ::com::sun::star::uno::XInterface
      */
     XDiagram getDiagram();
 
-    /**
+    /** 
      */
     void setDiagram( [in] XDiagram xDiagram );
 };
diff --git a/offapi/com/sun/star/chart2/XFastPropertyState.idl b/offapi/com/sun/star/chart2/XFastPropertyState.idl
index 29d1e4c1b27f..ec7ac4691972 100644
--- a/offapi/com/sun/star/chart2/XFastPropertyState.idl
+++ b/offapi/com/sun/star/chart2/XFastPropertyState.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,7 +68,7 @@ interface XFastPropertyState: ::com::sun::star::uno::XInterface
     /** @returns
                 the state of the property.
 
-        @param  aPropertyName
+        @param	aPropertyName
             specifies the name of the property.
 
         @throws UnknownPropertyException
diff --git a/offapi/com/sun/star/chart2/XInternalDataProvider.idl b/offapi/com/sun/star/chart2/XInternalDataProvider.idl
index a1f9caa64092..3d6407b181b1 100644
--- a/offapi/com/sun/star/chart2/XInternalDataProvider.idl
+++ b/offapi/com/sun/star/chart2/XInternalDataProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XLabeled.idl b/offapi/com/sun/star/chart2/XLabeled.idl
index 4abaf59fd3ba..e9e19e3a5151 100644
--- a/offapi/com/sun/star/chart2/XLabeled.idl
+++ b/offapi/com/sun/star/chart2/XLabeled.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XPlotter.idl b/offapi/com/sun/star/chart2/XPlotter.idl
index e6f6ef3fafd4..af3b19a63b29 100644
--- a/offapi/com/sun/star/chart2/XPlotter.idl
+++ b/offapi/com/sun/star/chart2/XPlotter.idl
@@ -75,7 +75,7 @@ module com {  module sun {  module star {  module chart2 {
 interface XPlotter : ::com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** Each Plotter implicit uses a certain type of logic coordinate
+    /**	Each Plotter implicit uses a certain type of logic coordinate
         system for interpreting data as coordinates.
         For example a bar-chart uses a Cartesian coordinate system for
         interpreting x- and y-values from a spreadsheet as Cartesian
@@ -90,11 +90,11 @@ interface XPlotter : ::com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /** For each type of shapes ('logic' or 'illogic') there exists one
     container. The Plotter will create shapes and then add (or remove)
-    them from these containers.
+    them from these	containers.
 
     <p>
     The lifetime of the container has to be handled by the calling object. The
-    calling object must assure that the container will exist longer than the
+    calling object must assure that the	container will exist longer than the
     XPlotter Object.
     </p>
     ...
@@ -108,7 +108,7 @@ interface XPlotter : ::com::sun::star::uno::XInterface
     XPlotter object needs a Scale to decide which shapes
     need to be created and maybe logically clipped. The XPlotter object
     becomes the new owner of the given scales and directions and needs to keep
-    them alive. Nobody else will change them.
+    them alive.	Nobody else will change them.
     Pay attention that a 'Scale' can have several breaks.
     */
     void setScales( [in] sequence< ScaleData > rScales);
diff --git a/offapi/com/sun/star/chart2/XRegressionCurve.idl b/offapi/com/sun/star/chart2/XRegressionCurve.idl
index 1e23edd1d0f1..406b57dc3142 100644
--- a/offapi/com/sun/star/chart2/XRegressionCurve.idl
+++ b/offapi/com/sun/star/chart2/XRegressionCurve.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl b/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl
index a7e5530601b6..10960d9a4bf0 100644
--- a/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl
+++ b/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl b/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl
index f54b351ef005..3a1c52a4c568 100644
--- a/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl
+++ b/offapi/com/sun/star/chart2/XRegressionCurveContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XStyleSupplier.idl b/offapi/com/sun/star/chart2/XStyleSupplier.idl
index cfc4d34ca5fa..8036595efde5 100644
--- a/offapi/com/sun/star/chart2/XStyleSupplier.idl
+++ b/offapi/com/sun/star/chart2/XStyleSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XTitle.idl b/offapi/com/sun/star/chart2/XTitle.idl
index 9be6629c12df..7ba39af8a2fe 100644
--- a/offapi/com/sun/star/chart2/XTitle.idl
+++ b/offapi/com/sun/star/chart2/XTitle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XTitled.idl b/offapi/com/sun/star/chart2/XTitled.idl
index 4f6d2c1faf2a..ba9d81234a57 100644
--- a/offapi/com/sun/star/chart2/XTitled.idl
+++ b/offapi/com/sun/star/chart2/XTitled.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XTransformation.idl b/offapi/com/sun/star/chart2/XTransformation.idl
index adbfd0751cf2..4459d54c89c9 100644
--- a/offapi/com/sun/star/chart2/XTransformation.idl
+++ b/offapi/com/sun/star/chart2/XTransformation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XUndoHelper.idl b/offapi/com/sun/star/chart2/XUndoHelper.idl
index a269c43cd251..b5d82c25fc47 100644
--- a/offapi/com/sun/star/chart2/XUndoHelper.idl
+++ b/offapi/com/sun/star/chart2/XUndoHelper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XUndoManager.idl b/offapi/com/sun/star/chart2/XUndoManager.idl
index 2d0ca4bd4977..25577d11a0ae 100644
--- a/offapi/com/sun/star/chart2/XUndoManager.idl
+++ b/offapi/com/sun/star/chart2/XUndoManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/XUndoSupplier.idl b/offapi/com/sun/star/chart2/XUndoSupplier.idl
index 901ca49ad74f..f1d6a48663d2 100644
--- a/offapi/com/sun/star/chart2/XUndoSupplier.idl
+++ b/offapi/com/sun/star/chart2/XUndoSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/DataFilter.idl b/offapi/com/sun/star/chart2/data/DataFilter.idl
index 8cfadbd6d038..51eb4f09ded2 100644
--- a/offapi/com/sun/star/chart2/data/DataFilter.idl
+++ b/offapi/com/sun/star/chart2/data/DataFilter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/DataProvider.idl b/offapi/com/sun/star/chart2/data/DataProvider.idl
index f9092c61f4b9..fcdf257a67a5 100644
--- a/offapi/com/sun/star/chart2/data/DataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/DataProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/DataSequence.idl b/offapi/com/sun/star/chart2/data/DataSequence.idl
index aa35f5ae8453..36f9167f6148 100644
--- a/offapi/com/sun/star/chart2/data/DataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/DataSequence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/DataSequenceRole.idl b/offapi/com/sun/star/chart2/data/DataSequenceRole.idl
index e9acb6a2c6b5..6e56da43084a 100644
--- a/offapi/com/sun/star/chart2/data/DataSequenceRole.idl
+++ b/offapi/com/sun/star/chart2/data/DataSequenceRole.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/DataSink.idl b/offapi/com/sun/star/chart2/data/DataSink.idl
index 035b01bd88b8..a0b031c6ecee 100644
--- a/offapi/com/sun/star/chart2/data/DataSink.idl
+++ b/offapi/com/sun/star/chart2/data/DataSink.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/DataSource.idl b/offapi/com/sun/star/chart2/data/DataSource.idl
index 549f2a03b5a7..64f7f3cfb976 100644
--- a/offapi/com/sun/star/chart2/data/DataSource.idl
+++ b/offapi/com/sun/star/chart2/data/DataSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/HighlightedRange.idl b/offapi/com/sun/star/chart2/data/HighlightedRange.idl
index 6d872da980d8..3aca46b3aa28 100644
--- a/offapi/com/sun/star/chart2/data/HighlightedRange.idl
+++ b/offapi/com/sun/star/chart2/data/HighlightedRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/LabelOrigin.idl b/offapi/com/sun/star/chart2/data/LabelOrigin.idl
index 0239db4ea482..bb852b254c9d 100644
--- a/offapi/com/sun/star/chart2/data/LabelOrigin.idl
+++ b/offapi/com/sun/star/chart2/data/LabelOrigin.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl b/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl
index d6dcf7f5efa4..d2d40f00cdd0 100644
--- a/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/LabeledDataSequence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/RangeHighlightListener.idl b/offapi/com/sun/star/chart2/data/RangeHighlightListener.idl
index 19093a837d08..21e668758aa4 100644
--- a/offapi/com/sun/star/chart2/data/RangeHighlightListener.idl
+++ b/offapi/com/sun/star/chart2/data/RangeHighlightListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/RangeHighlighter.idl b/offapi/com/sun/star/chart2/data/RangeHighlighter.idl
index cdf3dc637bbb..fd1dd3302c00 100644
--- a/offapi/com/sun/star/chart2/data/RangeHighlighter.idl
+++ b/offapi/com/sun/star/chart2/data/RangeHighlighter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/TabularDataProviderArguments.idl b/offapi/com/sun/star/chart2/data/TabularDataProviderArguments.idl
index db55ac4a10bf..52b4cdf103fe 100644
--- a/offapi/com/sun/star/chart2/data/TabularDataProviderArguments.idl
+++ b/offapi/com/sun/star/chart2/data/TabularDataProviderArguments.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/XDataProvider.idl b/offapi/com/sun/star/chart2/data/XDataProvider.idl
index 11dac7aae3cd..e9d0a6ca39ee 100644
--- a/offapi/com/sun/star/chart2/data/XDataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/XDataProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/XDataReceiver.idl b/offapi/com/sun/star/chart2/data/XDataReceiver.idl
index 13cb972d25a0..bc84d95b10d3 100644
--- a/offapi/com/sun/star/chart2/data/XDataReceiver.idl
+++ b/offapi/com/sun/star/chart2/data/XDataReceiver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/XDataSequence.idl b/offapi/com/sun/star/chart2/data/XDataSequence.idl
index 87a206a718d0..b0f92a61c167 100644
--- a/offapi/com/sun/star/chart2/data/XDataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/XDataSequence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -96,14 +96,14 @@ interface XDataSequence : ::com::sun::star::uno::XInterface
             for the short side used as DataSeries name and maybe a
             sequence "Row 1" "Row 2" "Row 3" for the long side to be used
             as categories for example.
-
+    
         Example: Assuming this sequence has a Range representation spanning
         row 5 and 6 in column 8. Following sequences of strings or similar strings
         are expected as return values:
 
-        generateLabel( SHORT_SIDE ) -> "Column 8"
+        generateLabel( SHORT_SIDE ) -> "Column 8" 
         generateLabel( LONG_SIDE )  -> "Row 5" "Row 6"
-        generateLabel( COLUMN )     -> "Column 8"
+        generateLabel( COLUMN )     -> "Column 8" 
         generateLabel( ROW )        -> "Row 5" "Row 6"
 
         Which strings exactly you return depends on the naming scheme of the application
diff --git a/offapi/com/sun/star/chart2/data/XDataSink.idl b/offapi/com/sun/star/chart2/data/XDataSink.idl
index ec7f922bbc53..a3ea105ad88c 100644
--- a/offapi/com/sun/star/chart2/data/XDataSink.idl
+++ b/offapi/com/sun/star/chart2/data/XDataSink.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/XDataSource.idl b/offapi/com/sun/star/chart2/data/XDataSource.idl
index 9fc4436a25b9..a6b95297d6c8 100644
--- a/offapi/com/sun/star/chart2/data/XDataSource.idl
+++ b/offapi/com/sun/star/chart2/data/XDataSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
index c67b7687ec6c..afa956be076c 100644
--- a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XDatabaseDataProvider_idl__
+#ifndef __com_sun_star_report_XDatabaseDataProvider_idl__ 
 #define __com_sun_star_report_XDatabaseDataProvider_idl__
-
+ 
 #ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
 #endif
 #include <com/sun/star/beans/XPropertySet.idl>
-#include <com/sun/star/beans/UnknownPropertyException.idl>
+#include <com/sun/star/beans/UnknownPropertyException.idl> 
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/lang/XComponent.idl>
 #include <com/sun/star/sdbc/XConnection.idl>
@@ -40,19 +40,19 @@
 #include <com/sun/star/chart2/data/XDataProvider.idl>
 #include <com/sun/star/chart2/data/XRangeXMLConversion.idl>
 
-//=============================================================================
-
- module com {  module sun {  module star {  module chart2 { module data {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart2 { module data { 
+ 
+//============================================================================= 
+ 
 /** identifies a <type>XDataProvider</type> for result sets.
-
+    
     @see XDataProvider
     @see DataProvider
  */
 interface XDatabaseDataProvider
-{
+{ 
     /** For accessing data a component provides for being used by
         charts.
      */
@@ -85,7 +85,7 @@ interface XDatabaseDataProvider
     it's data based on the values of the master fields.</p>
     <p>If the report is no sub report (e.g. it's parent is not a report itself), this
     property is not evaluated.</p>
-
+    
     */
     [attribute,bound] sequence<string> MasterFields;
 
@@ -110,7 +110,7 @@ interface XDatabaseDataProvider
     fields or their aliases of the detail report.</p>
     <p>If the report is no sub report (e.g. it's parent is not a report itself), this
     property is not evaluated.</p>
-    *
+    * 
     */
     [attribute,bound] sequence<string> DetailFields;
 
@@ -125,8 +125,8 @@ interface XDatabaseDataProvider
     The default value for <member scope="com::sun::star::sdbc">RowSet::EscapeProcessing</member>
     is <TRUE/>. By switching it to <FALSE/>, you can pass backend-specific SQL statements,
     which are not standard SQL, to your database.</p>
-
-
+    
+    
     @see com::sun::star::sdb::CommandType
     */
     [attribute,bound] string Command;
@@ -208,17 +208,17 @@ interface XDatabaseDataProvider
         or the URL of a data access component.
      */
     [attribute,bound] string DataSourceName;
-};
-
+}; 
+ 
 service DatabaseDataProvider : XDatabaseDataProvider
 {
     createWithConnection([in] com::sun::star::sdbc::XConnection connection);
 };
-//=============================================================================
-
+//============================================================================= 
+ 
  }; }; }; };  };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/chart2/data/XLabeledDataSequence.idl b/offapi/com/sun/star/chart2/data/XLabeledDataSequence.idl
index 3ac92632d757..ee855c604170 100644
--- a/offapi/com/sun/star/chart2/data/XLabeledDataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/XLabeledDataSequence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/XNumericalDataSequence.idl b/offapi/com/sun/star/chart2/data/XNumericalDataSequence.idl
index 8868b91dbd81..d281c59bc9bc 100644
--- a/offapi/com/sun/star/chart2/data/XNumericalDataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/XNumericalDataSequence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/XRangeHighlighter.idl b/offapi/com/sun/star/chart2/data/XRangeHighlighter.idl
index 95cb9ce06de6..fe23fa0ff5cd 100644
--- a/offapi/com/sun/star/chart2/data/XRangeHighlighter.idl
+++ b/offapi/com/sun/star/chart2/data/XRangeHighlighter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/XRangeXMLConversion.idl b/offapi/com/sun/star/chart2/data/XRangeXMLConversion.idl
index 9398284c309e..da8140e6109f 100644
--- a/offapi/com/sun/star/chart2/data/XRangeXMLConversion.idl
+++ b/offapi/com/sun/star/chart2/data/XRangeXMLConversion.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/chart2/data/XTextualDataSequence.idl b/offapi/com/sun/star/chart2/data/XTextualDataSequence.idl
index 09c754d740e7..3691f6ef6130 100644
--- a/offapi/com/sun/star/chart2/data/XTextualDataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/XTextualDataSequence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/configuration/AccessRootElement.idl b/offapi/com/sun/star/configuration/AccessRootElement.idl
index e6cab960ecb6..7a2b1b49baba 100644
--- a/offapi/com/sun/star/configuration/AccessRootElement.idl
+++ b/offapi/com/sun/star/configuration/AccessRootElement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,19 +45,19 @@
 
 //=============================================================================
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
 //=============================================================================
-/** provides information about the root element of a hierarchy and
+/** provides information about the root element of a hierarchy and 
     about the hierarchy as a whole.
-
+ 
  <p>Provides information about the element and the whole hierarchy.
  Allows controlling the lifetime of the hierarchy.
  Allows observing changes in the hierarchy as a whole.
  </p>
 
  <p>When access to a hierarchy is first obtained from a factory or provider,
- this is the initial object that is created by the factory.
+ this is the initial object that is created by the factory. 
  It represents the <em>root</em> of the accessible part of the hierarchy.
  </p>
 
@@ -67,8 +67,8 @@ module com { module sun { module star { module configuration {
  and that is accessible starting from this element.</em>
  </p>
 
- <p>Generally it is not possible to navigate the parent or siblings, if any,
- of this element, so <type scope="com::sun::star::container">XChild</type> is
+ <p>Generally it is not possible to navigate the parent or siblings, if any, 
+ of this element, so <type scope="com::sun::star::container">XChild</type> is 
  not supported.
  </p>
 
@@ -108,7 +108,7 @@ published service AccessRootElement
  </p>
 
  <p>The provider of this object may still dispose of this object, when the
- lifetime of the provider ends or if these objects represent
+ lifetime of the provider ends or if these objects represent 
  the root of only a fragment of an enclosing hierarchy and
  this fragment is removed from the complete hierarchy by an outside source.
  </p>
@@ -170,7 +170,7 @@ published service AccessRootElement
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/configuration/AdministrationProvider.idl b/offapi/com/sun/star/configuration/AdministrationProvider.idl
index 0c4a419fcf1f..5cbc2bcb47ac 100644
--- a/offapi/com/sun/star/configuration/AdministrationProvider.idl
+++ b/offapi/com/sun/star/configuration/AdministrationProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,51 +37,51 @@
 
 //=============================================================================
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
 //=============================================================================
-/** manages one, or more, complete sets of configuration data for
+/** manages one, or more, complete sets of configuration data for 
  administrative puposes and serves as a factory for objects that
  provide access to subsets of these shared configurations.
-
- <p>Shared sets of configuration data usually serve to provide defaults,
- which are used if no individual settings are present. Depending on the data
- store multiple layers of defaults may be combined with a user-specific layer
- to make up the final configuration.
+ 
+ <p>Shared sets of configuration data usually serve to provide defaults, 
+ which are used if no individual settings are present. Depending on the data 
+ store multiple layers of defaults may be combined with a user-specific layer 
+ to make up the final configuration. 
  </p>
- <p>Many aspects of the supported behavior depend strongly on the underlying
- data store and on the administrative structures it defines. With some data
- stores this service also enables access to individual users' configuration
- data by an administrator.
+ <p>Many aspects of the supported behavior depend strongly on the underlying 
+ data store and on the administrative structures it defines. With some data 
+ stores this service also enables access to individual users' configuration 
+ data by an administrator. 
  </p>
- <p>On the other hand, in the simplest model there is only a single layer of
- default data which is accessible through this service.
+ <p>On the other hand, in the simplest model there is only a single layer of 
+ default data which is accessible through this service. 
  </p>
  <p>An implementation is usually obtained from a
- <type scope="com::sun::star::lang">ServiceManager</type>. The arguments passed to
- <member scope="com::sun::star::lang">XMultiComponentFactory::createInstanceWithContextAndArguments()</member>
- select the configuration data source. They may also define the scope of
- administrable data or contain credentials to be used to authorize the
- administrative access. Missing parameters may be filled in
- from the context or the environment.
+ <type scope="com::sun::star::lang">ServiceManager</type>. The arguments passed to 
+ <member scope="com::sun::star::lang">XMultiComponentFactory::createInstanceWithContextAndArguments()</member> 
+ select the configuration data source. They may also define the scope of 
+ administrable data or contain credentials to be used to authorize the 
+ administrative access. Missing parameters may be filled in  
+ from the context or the environment.  
  </p>
 
  @see com::sun::star::configuration::ConfigurationProvider
-    Offers the same services and creates the same accessor objects as this
+    Offers the same services and creates the same accessor objects as this 
     service, but accesses the personal configuration.
-
-    <p>A <type> ConfigurationProvider</type> provides access to the personal
-    layer of configuration data of the current user context. It should in
+    
+    <p>A <type> ConfigurationProvider</type> provides access to the personal 
+    layer of configuration data of the current user context. It should in 
     most cases be used when <em>using</em> the configuration data, although
-    for most contexts a <type>AdministrationProvider</type> can be used as
-    a drop-in replacement.
-    </p>
+    for most contexts a <type>AdministrationProvider</type> can be used as 
+    a drop-in replacement. 
+    </p> 
  */
 published service AdministrationProvider
 {
 /** allows creating access objects for specific views such as subsets and fragments
  of the configuration.
-
+ 
  <p>The parameter <var>aServiceSpecifier</var> passed to
  <member scope="com::sun::star::lang">XMultiServiceFactory::createInstanceWithArguments()</member>
  supports at least the service specifiers
@@ -89,7 +89,7 @@ published service AdministrationProvider
  <code>"com.sun.star.configuration.ConfigurationUpdateAccess"</code>.
  </p>
 
- <p>Using the first of these service specifiers requests a read-only view of
+ <p>Using the first of these service specifiers requests a read-only view of 
  the configuration.
  The object that is created implements service <type>ConfigurationAccess</type>.
  To reflect its <em>element role</em> as root of the view, it implements
@@ -107,19 +107,19 @@ published service AdministrationProvider
  <type>ConfigurationAccess</type>/<type>AccessRootElement</type> instead.
  </p>
 
- <p>The arguments passed to
+ <p>The arguments passed to 
  <member scope="com::sun::star::lang">XMultiServiceFactory::createInstanceWithArguments()</member>
- in parameter <var>aArguments</var> specify the administrative entity for which
- data should be administered. In other words they determine the layer to which
+ in parameter <var>aArguments</var> specify the administrative entity for which 
+ data should be administered. In other words they determine the layer to which 
  changes will apply. They also specify the view of that configuration that
  should be created. That is, they determine the subset of elements that can be
  accessed starting from the returned object. Each element of the argument
- sequence should be a <type scope="com::sun::star::beans">PropertyValue</type>
- or a <type scope="com::sun::star::beans">NamedValue</type>,
+ sequence should be a <type scope="com::sun::star::beans">PropertyValue</type> 
+ or a <type scope="com::sun::star::beans">NamedValue</type>, 
  so that the parameters can be identified by name rather than by position.
  </p>
 
- <p>What combinations of arguments are supported depends on the service name
+ <p>What combinations of arguments are supported depends on the service name 
  and on the data store being administered.
  </p>
 
@@ -127,30 +127,30 @@ published service AdministrationProvider
  accept a single argument named <code>nodepath</code> of type <atom>string</atom>.
  This argument must contain the absolute path to an element of the
  configuration. The view that is selected consists of the named element and
- all its decendants. The administrative entity is the default for the
- <type>AdministrationProvider</type>. Usually this is the largest entity
- encompassing all entities accessible from this instance. In other words this
- can be used to influence as global a scope as possible.
- </p>
-
- <p>Other arguments can be used to select a more specific entity and to control
- the behavior of the view. These are different for different implementations
- and data stores. Whether and how they are used may also depend on properties
+ all its decendants. The administrative entity is the default for the 
+ <type>AdministrationProvider</type>. Usually this is the largest entity 
+ encompassing all entities accessible from this instance. In other words this 
+ can be used to influence as global a scope as possible. 
+ </p>
+ 
+ <p>Other arguments can be used to select a more specific entity and to control 
+ the behavior of the view. These are different for different implementations 
+ and data stores. Whether and how they are used may also depend on properties 
  that were selected when the provider was created.
  </p>
 
  <p>An implementation may ignore unknown arguments.</p>
 
- <p>Some parameters that are commonly supported are described for service
+ <p>Some parameters that are commonly supported are described for service 
  <type>ConfigurationProvider</type>.
  </p>
- <p>One notable difference exists for parameter <code>"Locale"</code>. For a
- <type>ConfigurationProvider</type> the default behavior usually is to select
- the locale set up for the user. But this service by default gets data for all
- locales for which data is present. Locale-dependent values in this case are
- replaced by a <type>SetAccess</type> using the language names as accessors.
- This also allows targetted setting of values for selected locales.
- This behavior can be requested explicitly by specifing a special argument
+ <p>One notable difference exists for parameter <code>"Locale"</code>. For a 
+ <type>ConfigurationProvider</type> the default behavior usually is to select 
+ the locale set up for the user. But this service by default gets data for all 
+ locales for which data is present. Locale-dependent values in this case are 
+ replaced by a <type>SetAccess</type> using the language names as accessors. 
+ This also allows targetted setting of values for selected locales. 
+ This behavior can be requested explicitly by specifing a special argument 
  value <code>locale = "*"</code>.
  </p>
 
@@ -184,7 +184,7 @@ published service AdministrationProvider
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/configuration/CannotLoadConfigurationException.idl b/offapi/com/sun/star/configuration/CannotLoadConfigurationException.idl
index 7e6bb2daaaff..21f318569df5 100644
--- a/offapi/com/sun/star/configuration/CannotLoadConfigurationException.idl
+++ b/offapi/com/sun/star/configuration/CannotLoadConfigurationException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__
-#define __com_sun_star_configuration_CannotLoadConfigurationException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module configuration {
-
-//=============================================================================
-
+#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__ 
+#define __com_sun_star_configuration_CannotLoadConfigurationException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module configuration {  
+ 
+//============================================================================= 
+ 
 /** is thrown when an application tries to create a configuration provider
     but the configuration can't be loaded
  */
 published exception CannotLoadConfigurationException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/ConfigurationAccess.idl b/offapi/com/sun/star/configuration/ConfigurationAccess.idl
index 41662f03f5e2..ae060b92f25c 100644
--- a/offapi/com/sun/star/configuration/ConfigurationAccess.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
 //=============================================================================
 /** provides read access to a fragment of the configuration hierarchy.
@@ -104,7 +104,7 @@ module com { module sun { module star { module configuration {
  can thus be classified in the following ways:
  </p>
  <ul>
-    <li><em>Container</em> role:
+    <li><em>Container</em> role: 
         An object that can hold child elements as a <em>set</em> or a <em>group</em>.
     </li>
     <li><em>Element</em> role:
@@ -113,7 +113,7 @@ module com { module sun { module star { module configuration {
     </li>
  </ul>
 
- <p>Several types of simple <em>values</em> can be used in the configuration.
+ <p>Several types of simple <em>values</em> can be used in the configuration. 
  In addition to the basic (scalar) types, sequences of the basic types are
  supported. The basic types are:
  </p>
@@ -159,11 +159,11 @@ module com { module sun { module star { module configuration {
  </p>
 
  <p>If the schema marks a value as <em>nullable</em> (which is indicated by
- attribute <const scope="com::sun::star::beans">PropertyAttribute::MAYBEVOID</const> ),
+ attribute <const scope="com::sun::star::beans">PropertyAttribute::MAYBEVOID</const> ), 
  its contents may be <NULL/>.
  </p>
 
- <p>The configuration should support explicit access to default values
+ <p>The configuration should support explicit access to default values 
  (implementing <type scope="com::sun::star::beans">XPropertyState</type>
  and  <type scope="com::sun::star::beans">XPropertyWithState</type>).
  </p>
@@ -201,13 +201,13 @@ published service ConfigurationAccess
 
      <p>Implementations shall implement exactly one of:</p>
      <ul>
-        <li><type>AccessRootElement</type> if this element is the
+        <li><type>AccessRootElement</type> if this element is the 
             <em>Root</em> of the whole hierarchy. Objects that can be
             created directly by a <type>ConfigurationProvider</type>
             implement this service.</li>
-        <li><type>SetElement</type> if this element may be contained in a
+        <li><type>SetElement</type> if this element may be contained in a 
             <em>Set</em>.</li>
-        <li><type>GroupElement</type> if this element is a child of a
+        <li><type>GroupElement</type> if this element is a child of a 
             <em>Group</em>.</li>
      </ul>
 
@@ -242,7 +242,7 @@ published service ConfigurationAccess
 
     /** specializes <type>HierarchyElement</type>,
      if this element may be contained in a <em>Set</em>.
-     <p>This is an alternative to <type>AccessRootElement</type>
+     <p>This is an alternative to <type>AccessRootElement</type> 
      or <type>GroupElement</type>.
      </p>
     */
@@ -250,7 +250,7 @@ published service ConfigurationAccess
 
     /** specializes <type>HierarchyElement</type>,
      if this element is a child of a <em>Group</em>.
-     <p>This is an alternative to <type>AccessRootElement</type>
+     <p>This is an alternative to <type>AccessRootElement</type> 
      or <type>SetElement</type>.
      </p>
 */
@@ -259,7 +259,7 @@ published service ConfigurationAccess
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/configuration/ConfigurationProvider.idl b/offapi/com/sun/star/configuration/ConfigurationProvider.idl
index c6924acf6c6e..b1b5e797d93b 100644
--- a/offapi/com/sun/star/configuration/ConfigurationProvider.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,28 +37,28 @@
 
 //=============================================================================
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
 //=============================================================================
 /** manages one, or more, complete sets of configuration data and serves as a
  factory for objects that provide access to a subset of the configuration.
-
+ 
  <p>An implementation is usually obtained from a
- <type scope="com::sun::star::lang">ServiceManager</type>. The arguments passed to
- <member scope="com::sun::star::lang">XMultiComponentFactory::createInstanceWithContextAndArguments()</member>
+ <type scope="com::sun::star::lang">ServiceManager</type>. The arguments passed to 
+ <member scope="com::sun::star::lang">XMultiComponentFactory::createInstanceWithContextAndArguments()</member> 
  select the configuration data source. Arguments must be provided as
- <type scope="com::sun::star::beans">NamedValue</type>
- or <type scope="com::sun::star::beans">PropertyValue</type>.
- If the parameters given are incomplete missing values are taken
- from the context or the environment. If an instance already exists for the
- given set of arguments, the existing instance may be reused.
- In particular, instantiating a provider without explicit arguments to access
- the default configuration data will always yield the same
+ <type scope="com::sun::star::beans">NamedValue</type> 
+ or <type scope="com::sun::star::beans">PropertyValue</type>. 
+ If the parameters given are incomplete missing values are taken 
+ from the context or the environment. If an instance already exists for the 
+ given set of arguments, the existing instance may be reused. 
+ In particular, instantiating a provider without explicit arguments to access 
+ the default configuration data will always yield the same  
  <type scope="com::sun::star::configuration">DefaultProvider</type> object.
  </p>
- <p>Some arguments for
- <member scope="com::sun::star::lang">XMultiServiceFactory::createInstanceWithArguments()</member>
- may be given default values during creation of this service. In particular
+ <p>Some arguments for 
+ <member scope="com::sun::star::lang">XMultiServiceFactory::createInstanceWithArguments()</member> 
+ may be given default values during creation of this service. In particular 
  this applies to the parameters <code>"Locale"</code> and <code>"EnableAsync"</code>.
  </p>
  */
@@ -66,7 +66,7 @@ published service ConfigurationProvider
 {
 /** allows creating access objects for specific views such as subsets and fragments
  of the configuration.
-
+ 
  <p>The parameter <var>aServiceSpecifier</var> passed to
  <member scope="com::sun::star::lang">XMultiServiceFactory::createInstanceWithArguments()</member>
  supports at least the service specifiers
@@ -74,7 +74,7 @@ published service ConfigurationProvider
  <code>"com.sun.star.configuration.ConfigurationUpdateAccess"</code>.
  </p>
 
- <p>Using the first of these service specifiers requests a read-only view of
+ <p>Using the first of these service specifiers requests a read-only view of 
  the configuration.
  The object that is created implements service <type>ConfigurationAccess</type>.
  To reflect its <em>element role</em> as root of the view, it implements
@@ -92,13 +92,13 @@ published service ConfigurationProvider
  <type>ConfigurationAccess</type>/<type>AccessRootElement</type> instead.
  </p>
 
- <p>The arguments passed to
+ <p>The arguments passed to 
  <member scope="com::sun::star::lang">XMultiServiceFactory::createInstanceWithArguments()</member>
  in parameter <var>aArguments</var> specify the view of the configuration that
  should be created. That is, they determine the subset of elements that can be
  accessed starting from the returned object. Each element of the argument
- sequence should be a <type scope="com::sun::star::beans">PropertyValue</type>
- or a <type scope="com::sun::star::beans">NamedValue</type>,
+ sequence should be a <type scope="com::sun::star::beans">PropertyValue</type> 
+ or a <type scope="com::sun::star::beans">NamedValue</type>, 
  so that the parameters can be identified by name rather than by position.
  </p>
 
@@ -111,7 +111,7 @@ published service ConfigurationProvider
  configuration. The view that is selected consists of the named element and
  all its decendants.
  </p>
-
+ 
  <p>Other arguments can be used to control the behavior of the view. These
  are different for different implementations. Whether and how they are used
  may also depend on the configuration store and configuration that were
@@ -134,7 +134,7 @@ published service ConfigurationProvider
           view.
          </dd>
          <dt><code>"locale"</code> : <type scope="com::sun::star::lang">Locale</type></dt>
-         <dd>specifies the locale for which localized values should be
+         <dd>specifies the locale for which localized values should be 
           retrieved.
          </dd>
        </dl>
@@ -145,10 +145,10 @@ published service ConfigurationProvider
    |
    - B2 - C2 (localized: de, en, fr, ..)
    |    |
-   |    - C3 - D1
+   |    - C3 - D1 
    |    |    |
    |    |    - D2 - E1
-   |    |
+   |    |    
    |    - C4 - D3 - E2 - F1
    |    |              |
    |    |              - F2
@@ -157,7 +157,7 @@ published service ConfigurationProvider
    |
    - B3
    |
-   - B4 - C6 - D4 - E3
+   - B4 - C6 - D4 - E3  
 
 </pre>
          <BR />selecting a view with <code>nodepath = "/A/B2"</code>,
@@ -169,8 +169,8 @@ published service ConfigurationProvider
         - C3 - D1
         |    |
         |    - D2 (..)
-        |
-        - C4 - D3 (..)
+        |    
+        - C4 - D3 (..) 
         |
         - C5
 
@@ -191,19 +191,19 @@ published service ConfigurationProvider
           storage at once - that is before
           <member scope="com::sun::star::util">XChangesBatch::commitChanges()</member>
           returns.
-          <p><em>This parameter was formerly called <code>"lazywrite"</code>.
+          <p><em>This parameter was formerly called <code>"lazywrite"</code>. 
             The old name should still be supported for compatibility.
           </em></p>
          </dd>
 
          <dt><code>"nocache"</code> : <atom>boolean</atom></dt>
-         <dd>This deprecated parameter
+         <dd>This deprecated parameter 
           specifies that data for the view is not taken from the cache, but
           read directly from storage. This may entail that future changes that
           become visible in the cache are not reflected in this view and that
           changes done through this view are not reflected in the cache.
           <BR /><strong>Use with caution !</strong>
-          <p><em>This parameter is not supported by all implementations and may be
+          <p><em>This parameter is not supported by all implementations and may be 
           silently ignored !
           </em></p>
          </dd>
@@ -226,7 +226,7 @@ published service ConfigurationProvider
 
  <p>The owner of the provider may dispose of this object
  using <member scope="com::sun::star::lang">XComponent::dispose()</member>.
- Note that the default provider is owned by the
+ Note that the default provider is owned by the 
  <type scope="com::sun::star::lang">ServiceManager</type> and should not be
  disposed of by user code.
  </p>
@@ -244,7 +244,7 @@ published service ConfigurationProvider
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/configuration/ConfigurationRegistry.idl b/offapi/com/sun/star/configuration/ConfigurationRegistry.idl
index 870af90e7986..63deac49c749 100644
--- a/offapi/com/sun/star/configuration/ConfigurationRegistry.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationRegistry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,25 +36,25 @@
 #include <com/sun/star/util/XFlushable.idl>
 #endif
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
 //=============================================================================
 
 
-/*  provides access to a configuration tree as a registry.
+/*	provides access to a configuration tree as a registry. 
 
     <p>This service is deprecated,
     <type scope="com.sun.star.configuration">ConfigurationProvider</type> should
     be used instead.</p>
 
-    <p> Using the <type scope="com::sun::star::registry">XSimpleRegistry</type>
-    interface, the service can be bound to a subtree within the
-    configuration tree, as provided by an
+    <p> Using the <type scope="com::sun::star::registry">XSimpleRegistry</type> 
+    interface, the service can be bound to a subtree within the 
+    configuration tree, as provided by an 
     <type scope="com.sun.star.configuration">ConfigurationProvider</type>
     service, which must be accessible from the service factory you use for the
     creation of this service.
     </p>
-    <p> There are some restrictions when accessing a configuration tree using a registry.
+    <p>	There are some restrictions when accessing a configuration tree using a registry.
     Most of them are implications of the fact that a configuration tree is very static in
     it's structure. Removal and addition of sub nodes is allowed only for special
     nodes, and even then the new elements have to comply to a given scheme (which is some
@@ -67,14 +67,14 @@ module com { module sun { module star { module configuration {
     and all of it's aspects.
     </p>
 
-    @author Frank Schoenheit
+    @author	Frank Schoenheit
     @version 1.0 2000/07/06
 */
 
 published service ConfigurationRegistry
 {
     /** controls the binding of the object to a configuration sub tree.
-        <p><member scope="com::sun::star::registry">XSimpleRegistry::open()</member>
+        <p><member scope="com::sun::star::registry">XSimpleRegistry::open()</member> 
         is used to open a special subtree within the configuration tree.
         </p>
         <p>The parameters of this method control the location of the root of the to-be-opened
@@ -84,14 +84,14 @@ published service ConfigurationRegistry
     interface com::sun::star::registry::XSimpleRegistry;
 
     /** is used to commit changes to the configuration.
-        <p>As specified for the
+        <p>As specified for the 
         <type scope="com::sun::star::configuration">ConfigurationUpdateAccess</type>
-        service, all changes made to an configuration subtree have to be commited
-        before they become persistent.
+        service, all changes made to an configuration subtree have to be commited 
+        before they become persistent. 
         To do this for a configuration accessed as a registry, call
         <method scope="com::sun::star::util">XFlushable::flush</method>.
         </p>
-        <p><strong>Warning:</strong><em>Changes that are not flushed will be
+        <p><strong>Warning:</strong><em>Changes that are not flushed will be 
         lost.</em>
         </p>
     */
@@ -101,7 +101,7 @@ published service ConfigurationRegistry
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 
 #endif
diff --git a/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl b/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl
index bd13b167c2c5..cbba3ed10749 100644
--- a/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
 //=============================================================================
 /** provides modifying access to a fragment of the configuration hierarchy.
@@ -55,7 +55,7 @@ module com { module sun { module star { module configuration {
  </p>
 
  <p>Descendants of this service also implement this service
- unless they are marked <em>read-only</em> (which is indicated by attribute
+ unless they are marked <em>read-only</em> (which is indicated by attribute 
  <const scope="com::sun::star::beans">PropertyAttribute::READONLY</const>),
  in which case they only need implement <type>ConfigurationAccess</type>.
  </p>
@@ -68,7 +68,7 @@ module com { module sun { module star { module configuration {
  extensions of the respective services documented for <type>ConfigurationAccess</type>.
  </p>
  <ul>
-    <li><em>Container</em> role:
+    <li><em>Container</em> role: 
         A <em>group</em> permits changing child values.
         A <em>set</em> permits inserting and removing contained elements.
     </li>
@@ -114,7 +114,7 @@ published service ConfigurationUpdateAccess
     [optional] service SetUpdate;
 
     /** specializes <type>GroupAccess</type> to support modifying contained
-     data.
+     data. 
 
      <p>Implemented, if this element is a <em>Group</em>.
      Otherwise service <type>SetUpdate</type> is provided.
@@ -138,7 +138,7 @@ published service ConfigurationUpdateAccess
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/configuration/CorruptedConfigurationException.idl b/offapi/com/sun/star/configuration/CorruptedConfigurationException.idl
index a2e827003eb3..fd8ec35e373f 100644
--- a/offapi/com/sun/star/configuration/CorruptedConfigurationException.idl
+++ b/offapi/com/sun/star/configuration/CorruptedConfigurationException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_configuration_CorruptedConfigurationException_idl__
-#define __com_sun_star_configuration_CorruptedConfigurationException_idl__
-
-#ifndef __com_sun_star_uno_RuntimeException_idl__
-#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module configuration {
-
-//=============================================================================
-
+#ifndef __com_sun_star_configuration_CorruptedConfigurationException_idl__ 
+#define __com_sun_star_configuration_CorruptedConfigurationException_idl__ 
+ 
+#ifndef __com_sun_star_uno_RuntimeException_idl__ 
+#include <com/sun/star/uno/RuntimeException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module configuration {  
+ 
+//============================================================================= 
+ 
 /** This exception is thrown in case a configuration
     does not exists or contains corrupt data.
 
@@ -52,10 +52,10 @@ published exception CorruptedConfigurationException : ::com::sun::star::uno::Run
     /** Instead of the message part of an exception, this value
         describe the type of corruption more in detail. */
     string Details;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/CorruptedUIConfigurationException.idl b/offapi/com/sun/star/configuration/CorruptedUIConfigurationException.idl
index 5373cb570a91..14bd759ae314 100644
--- a/offapi/com/sun/star/configuration/CorruptedUIConfigurationException.idl
+++ b/offapi/com/sun/star/configuration/CorruptedUIConfigurationException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_configuration_CorruptedUIConfigurationException_idl__
-#define __com_sun_star_configuration_CorruptedUIConfigurationException_idl__
-
-#ifndef __com_sun_star_configuration_CorruptedConfigurationException_idl__
-#include <com/sun/star/configuration/CorruptedConfigurationException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module configuration {
-
-//=============================================================================
-
+#ifndef __com_sun_star_configuration_CorruptedUIConfigurationException_idl__ 
+#define __com_sun_star_configuration_CorruptedUIConfigurationException_idl__ 
+ 
+#ifndef __com_sun_star_configuration_CorruptedConfigurationException_idl__ 
+#include <com/sun/star/configuration/CorruptedConfigurationException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module configuration {  
+ 
+//============================================================================= 
+ 
 /** This exception is thrown in case the global UI configuration
     (including menubars/toolbars and accelerators)
     does not exists or contains corrupted data.
@@ -46,10 +46,10 @@ module com {  module sun {  module star {  module configuration {
  */
 published exception CorruptedUIConfigurationException : ::com::sun::star::configuration::CorruptedConfigurationException
 {
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/DefaultProvider.idl b/offapi/com/sun/star/configuration/DefaultProvider.idl
index b41bdeec33a5..337516f737ac 100644
--- a/offapi/com/sun/star/configuration/DefaultProvider.idl
+++ b/offapi/com/sun/star/configuration/DefaultProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,13 +29,13 @@
 
 #ifndef __com_sun_star_configuration_ConfigurationProvider_idl__
 #include <com/sun/star/configuration/ConfigurationProvider.idl>
-#endif
+#endif 
 
-#ifndef __com_sun_star_util_XRefreshable_idl__
+#ifndef __com_sun_star_util_XRefreshable_idl__ 
 #include <com/sun/star/util/XRefreshable.idl>
 #endif
 
-#ifndef __com_sun_star_util_XFlushable_idl__
+#ifndef __com_sun_star_util_XFlushable_idl__ 
 #include <com/sun/star/util/XFlushable.idl>
 #endif
 
@@ -44,26 +44,26 @@
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
-//=============================================================================
+//============================================================================= 
 
 /**
-    is a <type>ConfigurationProvider</type>, that is
+    is a <type>ConfigurationProvider</type>, that is 
     the default <type>ConfigurationProvider</type> for its
     <type scope="com::sun::star::uno">XComponentContext</type>.
-
+  
     <p>This object is accessible as singleton within the context</p>.
 
     @since OOo 1.1.2
 */
-published service DefaultProvider
+published service DefaultProvider 
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /** characterizes the functionality.
+    /** characterizes the functionality. 
       */
     service ConfigurationProvider ;
 
@@ -77,24 +77,24 @@ published service DefaultProvider
     [optional] interface com::sun::star::util::XFlushable;
 
     /** Enable setting/getting locale for Provider
-
+        
         @since OOo 2.0.0
      */
 
     [optional] interface com::sun::star::lang::XLocalizable;
 
     /** Property to enable/disable asynchronous write-back from in-memory cache to backend(s)
-
+        
         @since OOo 2.0.0
      */
 
     [optional,property] boolean EnableAsync;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ;
+} ; } ; } ; } ;  
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/GroupAccess.idl b/offapi/com/sun/star/configuration/GroupAccess.idl
index 46c0312eb617..7b2672d86c52 100644
--- a/offapi/com/sun/star/configuration/GroupAccess.idl
+++ b/offapi/com/sun/star/configuration/GroupAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,12 +45,12 @@
 
 //=============================================================================
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
 //=============================================================================
 /** provides access to a predefined heterogeneous group of values and nested
  trees as part of a hierarchy.
-
+ 
  <p>Provides access to, and information about, its children and descendants
  viewed either as properties or as contained elements.
  </p>
@@ -90,7 +90,7 @@ published service GroupAccess
  </p>
 
  <p>If such elements occur as properties or subproperties of an implementation,
- it is not specified whether direct subproperty access using
+ it is not specified whether direct subproperty access using 
  <type scope="com::sun::star::beans">XHierarchicalPropertySet</type> or
  <type scope="com::sun::star::beans">XMultiHierarchicalPropertySet</type> can
  be used to access descendants of such elements.
@@ -110,25 +110,25 @@ published service GroupAccess
     service PropertyHierarchy;
 
 /** provides access to the state of child elements of an implementation. [optional]
-
- <p>This interface should be present, if the hierarchy supports default values
+ 
+ <p>This interface should be present, if the hierarchy supports default values 
  for simple (non-object) properties and the group contains such properties.
  </p>
 
- <p>For properties that are objects themselves, the semantic documented for
+ <p>For properties that are objects themselves, the semantic documented for 
  service <type>HierarchyAccess</type> applies.
  </p>
  */
     [optional] interface com::sun::star::beans::XPropertyState;
 
-/** provides access to the states of multiple child elements of
+/** provides access to the states of multiple child elements of 
  an implementation. [optional]
 
- <p>This interface should be present, if the hierarchy supports default values
+ <p>This interface should be present, if the hierarchy supports default values 
  for simple (non-object) properties and the group contains such properties.
  </p>
 
- <p>For properties that are objects themselves, the semantic documented for
+ <p>For properties that are objects themselves, the semantic documented for 
  service <type>HierarchyAccess</type> applies.
  </p>
 */
@@ -137,7 +137,7 @@ published service GroupAccess
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/configuration/GroupElement.idl b/offapi/com/sun/star/configuration/GroupElement.idl
index 0f66580b0c92..15068860f51f 100644
--- a/offapi/com/sun/star/configuration/GroupElement.idl
+++ b/offapi/com/sun/star/configuration/GroupElement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
 //=============================================================================
 /** provides information about a predefined element contained in a
@@ -83,7 +83,7 @@ published service GroupElement
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/configuration/GroupUpdate.idl b/offapi/com/sun/star/configuration/GroupUpdate.idl
index 0c7184c003c7..c834f09aee7b 100644
--- a/offapi/com/sun/star/configuration/GroupUpdate.idl
+++ b/offapi/com/sun/star/configuration/GroupUpdate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
 //=============================================================================
 /** provides write access to a predefined heterogeneous group of values
@@ -49,7 +49,7 @@ module com { module sun { module star { module configuration {
 */
 published service GroupUpdate
 {
-/** is the basic service providing read access to a group element of the
+/** is the basic service providing read access to a group element of the 
  hierarchy.
 
  <p>Any child and descendant objects support modifying access as well,
@@ -61,7 +61,7 @@ published service GroupUpdate
 
 /** allows replacing values.
 
- <p>This service extends the interface
+ <p>This service extends the interface 
  <type scope="com::sun::star::container">XNameAccess</type> supported
  by service <type>GroupAccess</type> to allow changing values.
  This strongly overlaps with functionality available through
@@ -87,7 +87,7 @@ published service GroupUpdate
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/configuration/HierarchyAccess.idl b/offapi/com/sun/star/configuration/HierarchyAccess.idl
index a5779042cd42..675c2ad547a2 100644
--- a/offapi/com/sun/star/configuration/HierarchyAccess.idl
+++ b/offapi/com/sun/star/configuration/HierarchyAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,13 +57,13 @@
 
 //=============================================================================
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
 //=============================================================================
 /** provides access to a hierarchy of descendant elements.
 
- <p>Subnodes are accessed by their name. Values that are direct or indirect
- descendants of this tree node can be retrieved. Non-value subnodes can be
+ <p>Subnodes are accessed by their name. Values that are direct or indirect 
+ descendants of this tree node can be retrieved. Non-value subnodes can be 
  navigated using container interfaces.
  Other interfaces provide access to information about this node.
  Changes to values in the subtree can be monitored by event listeners.
@@ -90,7 +90,7 @@ published service HierarchyAccess
 */
     interface com::sun::star::container::XNameAccess;
 
-/** allows access to all descendants of this node
+/** allows access to all descendants of this node 
 
  <p><member scope="com::sun::star::container">XHierarchicalNameAccess::getByHierarchicalName()</member>
  returns an <atom>any</atom> holding either a simple value or an interface
@@ -108,10 +108,10 @@ published service HierarchyAccess
  <type scope="com::sun::star::container">XNameAccess</type>,
  <type scope="com::sun::star::container">XHierarchicalNameAccess</type>,
  <type scope="com::sun::star::beans">XPropertySet</type> or
- any other interfaces that allow access to or manipulation of subnodes
- selected by name or hierarchical name.
+ any other interfaces that allow access to or manipulation of subnodes 
+ selected by name or hierarchical name. 
  </p>
- <p>If an inexact name could be matched to either a simple or a hierachical
+ <p>If an inexact name could be matched to either a simple or a hierachical 
  name, the simple (immediate child) name is preferred.
  </p>
 */
@@ -121,13 +121,13 @@ published service HierarchyAccess
 
  <p>This interface may be missing, if the hierarchy supports no traits that are
  described by <type scope="com::sun::star::beans">PropertyAttribute</type>
- values or if the same information is available by other means,
- e.g. if the implementation supports
+ values or if the same information is available by other means, 
+ e.g. if the implementation supports 
  <member scope="com::sun::star::beans">XPropertySet::getPropertySetInfo()</member>.
  </p>
 
- <p>If a child of this node is an object that implements
- <type scope="com::sun::star::beans">XProperty</type>, then this implementation
+ <p>If a child of this node is an object that implements 
+ <type scope="com::sun::star::beans">XProperty</type>, then this implementation  
  returns the same <type scope="com::sun::star::beans">Property</type> for that
  child as the child itself.
  </p>
@@ -135,19 +135,19 @@ published service HierarchyAccess
     [optional] interface com::sun::star::beans::XPropertySetInfo;
 
 /** provides access to the state of child elements of an implementation. [optional]
-
+ 
  <p>This interface may be missing if the hierarchy (or a hierarchy fragment
  that contains this implementation as element) does not support default values or
  if the node does not support accessing the default state of individual children.
  </p>
-
+ 
  <p>If elements that are not simple values, but objects themselves, support
- a default state (as indicated by
+ a default state (as indicated by 
  <const scope="com::sun::star::beans">PropertyAttribute::MAYBEDEFAULT</const>),
- they should implement
+ they should implement 
  <type scope="com::sun::star::beans">XPropertyWithState</type>, in which case
  the <type scope="com::sun::star::beans">PropertyState</type> applies to all
- their children and recursively to all descendants.
+ their children and recursively to all descendants. 
  </p>
 
  <p>If an implementation is part of a <em>read-only</em> view of the hierarchy,
@@ -156,21 +156,21 @@ published service HierarchyAccess
 */
     [optional] interface com::sun::star::beans::XPropertyState;
 
-/** provides access to the states of multiple child elements of
+/** provides access to the states of multiple child elements of 
  an implementation. [optional]
-
+ 
  <p>This interface may be missing if the hierarchy (or a hierarchy fragment
- that contains this implementation as element) does not support default values
+ that contains this implementation as element) does not support default values 
  if the node does not support accessing the default state of individual children.
  </p>
-
+ 
  <p>If elements that are not simple values, but objects themselves, support
- a default state (as indicated by
+ a default state (as indicated by 
  <const scope="com::sun::star::beans">PropertyAttribute::MAYBEDEFAULT</const>),
- they should implement
+ they should implement 
  <type scope="com::sun::star::beans">XPropertyWithState</type>, in which case
  the <type scope="com::sun::star::beans">PropertyState</type> applies to all
- their children and recursively to all descendants.
+ their children and recursively to all descendants. 
  </p>
 
  <p>If an implementation is part of a <em>read-only</em> view of the hierarchy,
@@ -182,6 +182,6 @@ published service HierarchyAccess
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/configuration/HierarchyElement.idl b/offapi/com/sun/star/configuration/HierarchyElement.idl
index 7a784821e202..580a48663732 100644
--- a/offapi/com/sun/star/configuration/HierarchyElement.idl
+++ b/offapi/com/sun/star/configuration/HierarchyElement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,7 +49,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
 //=============================================================================
 /** provides information about an element within a hierarchy.
@@ -58,7 +58,7 @@ module com { module sun { module star { module configuration {
  Attributes detailing the role of the element can be queried.
  The state of the element (regarding defaults) can be accessed.
  </p>
-
+    
  <p>Implementations of this service usually also implement
  service <type>HierarchyAccess</type>, which concerns the complementary role
  of providing access to subelements of the hierarchy.
@@ -71,7 +71,7 @@ published service HierarchyElement
 */
     interface com::sun::star::container::XHierarchicalName;
 
-/** provides the local name of this element within its parent.
+/** provides the local name of this element within its parent. 
 
  <p><em>Renaming an element is generally not supported.</em></p>
 */
@@ -84,7 +84,7 @@ published service HierarchyElement
  values.
  </p>
 
- <p>If the parent of this object implements
+ <p>If the parent of this object implements 
  <type scope="com::sun::star::beans">XPropertySetInfo</type>, then this returns
  the same <type scope="com::sun::star::beans">Property</type> as the
  <type scope="com::sun::star::beans">XPropertySetInfo</type> of the parent.
@@ -98,7 +98,7 @@ published service HierarchyElement
  a default state and values only for simple values or not at all.
  </p>
 
- <p>If the parent of this object implements
+ <p>If the parent of this object implements 
  <type scope="com::sun::star::beans">XPropertyState</type>, then members
  of this interface have the same effect as corresponding members of the parent.
  </p>
@@ -109,9 +109,9 @@ published service HierarchyElement
 */
     [optional] interface com::sun::star::beans::XPropertyWithState;
 
-/** provides access to the parent of this element [optional].
+/** provides access to the parent of this element [optional]. 
 
- <p>This interface may be missing if this object is not obtained
+ <p>This interface may be missing if this object is not obtained 
  as a child or descendant of another tree node, for example, directly from a factory or provider.
  </p>
 
@@ -127,6 +127,6 @@ published service HierarchyElement
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/configuration/InstallationIncompleteException.idl b/offapi/com/sun/star/configuration/InstallationIncompleteException.idl
index 568c36674286..3d4e712fa1f6 100644
--- a/offapi/com/sun/star/configuration/InstallationIncompleteException.idl
+++ b/offapi/com/sun/star/configuration/InstallationIncompleteException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_configuration_InstallationIncompleteException_idl__
-#define __com_sun_star_configuration_InstallationIncompleteException_idl__
-
-#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__
-#include <com/sun/star/configuration/CannotLoadConfigurationException.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module configuration {
-
-//=============================================================================
-
+#ifndef __com_sun_star_configuration_InstallationIncompleteException_idl__ 
+#define __com_sun_star_configuration_InstallationIncompleteException_idl__ 
+ 
+#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__ 
+#include <com/sun/star/configuration/CannotLoadConfigurationException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module configuration {  
+ 
+//============================================================================= 
+ 
 /** is thrown when creating a configuration provider fails because
     the user's installation for the is missing or incomplete
  */
 published exception InstallationIncompleteException: com::sun::star::configuration::CannotLoadConfigurationException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/InvalidBootstrapFileException.idl b/offapi/com/sun/star/configuration/InvalidBootstrapFileException.idl
index d7cba09edf41..5fd59439058d 100644
--- a/offapi/com/sun/star/configuration/InvalidBootstrapFileException.idl
+++ b/offapi/com/sun/star/configuration/InvalidBootstrapFileException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_configuration_InvalidBootstrapFileException_idl__
-#define __com_sun_star_configuration_InvalidBootstrapFileException_idl__
-
-#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__
-#include <com/sun/star/configuration/CannotLoadConfigurationException.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module configuration {
-
-//=============================================================================
-
+#ifndef __com_sun_star_configuration_InvalidBootstrapFileException_idl__ 
+#define __com_sun_star_configuration_InvalidBootstrapFileException_idl__ 
+ 
+#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__ 
+#include <com/sun/star/configuration/CannotLoadConfigurationException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module configuration {  
+ 
+//============================================================================= 
+ 
 /** is thrown when creating a configuration provider fails because
     a bootstrap file needed to locate the configuration contains invalid data
  */
 published exception InvalidBootstrapFileException: com::sun::star::configuration::CannotLoadConfigurationException
-{
+{ 
     /// the URL of the bootstrap file that is invalid
     string BootstrapFileURL;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/MissingBootstrapFileException.idl b/offapi/com/sun/star/configuration/MissingBootstrapFileException.idl
index b9588dc09a83..5c70af4cfd87 100644
--- a/offapi/com/sun/star/configuration/MissingBootstrapFileException.idl
+++ b/offapi/com/sun/star/configuration/MissingBootstrapFileException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_configuration_MissingBootstrapFileException_idl__
-#define __com_sun_star_configuration_MissingBootstrapFileException_idl__
-
-#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__
-#include <com/sun/star/configuration/CannotLoadConfigurationException.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module configuration {
-
-//=============================================================================
-
+#ifndef __com_sun_star_configuration_MissingBootstrapFileException_idl__ 
+#define __com_sun_star_configuration_MissingBootstrapFileException_idl__ 
+ 
+#ifndef __com_sun_star_configuration_CannotLoadConfigurationException_idl__ 
+#include <com/sun/star/configuration/CannotLoadConfigurationException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module configuration {  
+ 
+//============================================================================= 
+ 
 /** is thrown when creating a configuration provider fails because
     a bootstrap file needed to locate the configuration is missing
  */
 published exception MissingBootstrapFileException: com::sun::star::configuration::CannotLoadConfigurationException
-{
+{ 
     /// the URL of the bootstrap file that could not be found
     string BootstrapFileURL;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/PropertyHierarchy.idl b/offapi/com/sun/star/configuration/PropertyHierarchy.idl
index 3d37344a2c33..dde8be258c96 100644
--- a/offapi/com/sun/star/configuration/PropertyHierarchy.idl
+++ b/offapi/com/sun/star/configuration/PropertyHierarchy.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
 //=============================================================================
 /** provides access to and information about properties and subproperties
@@ -66,7 +66,7 @@ module com { module sun { module star { module configuration {
 */
 published service PropertyHierarchy
 {
-/** provides access to and information about the immediate properties of an implementation.
+/** provides access to and information about the immediate properties of an implementation. 
 */
     interface com::sun::star::beans::XPropertySet;
 
@@ -81,12 +81,12 @@ published service PropertyHierarchy
     interface com::sun::star::beans::XMultiPropertySet;
 
 /** provides access to and information about the whole hierarchy
- of properties and subproperties of an implementation.
+ of properties and subproperties of an implementation. 
 */
     interface com::sun::star::beans::XHierarchicalPropertySet;
 
 /** provides access to and information about the whole hierarchy
- of properties and subproperties of an implementation.
+ of properties and subproperties of an implementation. 
 
  <p>This interface allows retrieving or setting multiple properties at once.
  Accesses are guaranteed to occur as single atomic operations even if
@@ -99,6 +99,6 @@ published service PropertyHierarchy
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/configuration/SetAccess.idl b/offapi/com/sun/star/configuration/SetAccess.idl
index 9b564d90eabd..c2548c2eee1e 100644
--- a/offapi/com/sun/star/configuration/SetAccess.idl
+++ b/offapi/com/sun/star/configuration/SetAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
 //=============================================================================
 /** provides access to a dynamic, homogeneous set of values or nested
@@ -50,7 +50,7 @@ module com { module sun { module star { module configuration {
  <p>Also provides information about the template for elements.
  Allows normalizing externally generated names.
  </p>
-
+ 
  <p><em>Sets</em> are dynamic containers within the hierarchy.</p>
 
  <p>The number and names of contained elements are not fixed in advance,
@@ -100,6 +100,6 @@ published service SetAccess
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/configuration/SetElement.idl b/offapi/com/sun/star/configuration/SetElement.idl
index f82b642934be..9a5448601ee7 100644
--- a/offapi/com/sun/star/configuration/SetElement.idl
+++ b/offapi/com/sun/star/configuration/SetElement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
 //=============================================================================
 /** provides information about a dynamic element that can be inserted into a
@@ -56,7 +56,7 @@ module com { module sun { module star { module configuration {
  Allows controlling the lifetime of the element.
  </p>
 
- <p>Set elements may be added to and removed from the hierarchy at runtime.
+ <p>Set elements may be added to and removed from the hierarchy at runtime. 
  They bear user-defined names. They may exist independently, outside any
  container.
  </p>
@@ -67,8 +67,8 @@ module com { module sun { module star { module configuration {
  on an implementation of <type>SetUpdate</type>. Initially, they are not
  contained in a set object and have no meaningful name.
  </p>
-
- <p>While an instance is not contained in a set object, it is owned by
+ 
+ <p>While an instance is not contained in a set object, it is owned by 
  the client and can be disposed by calling
  <member scope="com::sun::star::lang">XComponent::dispose()</member>. The name
  of the object can freely be changed in that situation though without
@@ -140,7 +140,7 @@ published service SetElement
 
 /** allows controlling or observing the lifetime of the object.
 
- <p>Clients may dispose of the object using
+ <p>Clients may dispose of the object using 
  <member scope="com::sun::star::lang">XComponent::dispose()</member>, only if
  the object is currently not contained in a container (
  <member scope="com::sun::star::container">XChild::getParent()</member>
@@ -181,6 +181,6 @@ published service SetElement
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/configuration/SetUpdate.idl b/offapi/com/sun/star/configuration/SetUpdate.idl
index 57c56e7d0231..8dd32e0ed03a 100644
--- a/offapi/com/sun/star/configuration/SetUpdate.idl
+++ b/offapi/com/sun/star/configuration/SetUpdate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
 //=============================================================================
 /** provides write access to a dynamic homogeneous set of values or nested
@@ -58,7 +58,7 @@ module com { module sun { module star { module configuration {
 */
 published service SetUpdate
 {
-/** is the basic service providing read access to a <em>set</em> within the
+/** is the basic service providing read access to a <em>set</em> within the 
  hierarchy.
 */
     service SetAccess;
@@ -100,6 +100,6 @@ published service SetUpdate
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/configuration/SimpleSetAccess.idl b/offapi/com/sun/star/configuration/SimpleSetAccess.idl
index 35f8745fe977..c0063753f705 100644
--- a/offapi/com/sun/star/configuration/SimpleSetAccess.idl
+++ b/offapi/com/sun/star/configuration/SimpleSetAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,16 +45,16 @@
 
 //=============================================================================
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
 //=============================================================================
 /** provides access to a dynamic, homogeneous, nonhierarchical set of values
  or objects.
-
+ 
  <p>Also provides information about the template for elements.
  Allows normalizing externally generated names.
  </p>
-
+ 
  <p><em>Sets</em> are dynamic containers.</p>
 
  <p>The number and names of contained elements is not fixed in advance,
@@ -91,7 +91,7 @@ published service SimpleSetAccess
     [optional] interface com::sun::star::configuration::XTemplateContainer;
 
 /** allows normalizing and denormalizing external names. [optional]
-
+ 
  <p>Elements of a <em>set</em> often correspond to external entities,
  for example, files, web pages, and people whose names obey different rules and
  restrictions than names that are valid in the hierarchical naming scheme.
@@ -117,6 +117,6 @@ published service SimpleSetAccess
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/configuration/SimpleSetUpdate.idl b/offapi/com/sun/star/configuration/SimpleSetUpdate.idl
index c9fb908281d1..2e51ae768c78 100644
--- a/offapi/com/sun/star/configuration/SimpleSetUpdate.idl
+++ b/offapi/com/sun/star/configuration/SimpleSetUpdate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
 //=============================================================================
 /** provides write access to a dynamic, homogeneous, non-hierarchical set of
@@ -69,7 +69,7 @@ published service SimpleSetUpdate
 
 /** allows inserting, removing, and replacing elements.
 
- <p>This interface extends the interface
+ <p>This interface extends the interface 
  <type scope="com::sun::star::container">XNameAccess</type> supported
  by service <type>SimpleSetAccess</type> to allow modifying the container.
  </p>
@@ -107,11 +107,11 @@ published service SimpleSetUpdate
  <member scope="com::sun::star::container">XNameContainer::removeByName()</member>
  or replaced using
  <member scope="com::sun::star::container">XNameContainer::replaceByName()</member>
- remain valid and can be reinserted into a set supporting the same template and
+ remain valid and can be reinserted into a set supporting the same template and 
  even under a different name.
  </p>
 
- <p>An implementation need not support insertion of objects that were not
+ <p>An implementation need not support insertion of objects that were not 
  obtained in one of the ways described above. If it does, the implementation
  must reject elements that do not have the correct structure as described
  by the template.
@@ -121,17 +121,17 @@ published service SimpleSetUpdate
 
 /** allows creating an object that can be inserted into this set. [conditional]
 
- <p>This interface shall be implemented by an implementation,
+ <p>This interface shall be implemented by an implementation, 
  if and only if the element type of the set, as returned by
  <member scope="com::sun::star::container">XElementAccess::getElementType()</member>,
  is an object type, such as an interface.
- </p>
+ </p> 
 
  <p>Using <member scope="com::sun::star::lang">XSingleServiceFactory::createInstance()</member>
  an instance of the element template of this set is created. If the set
  supports multiple templates or variations of the basic template, a default
  variant of the basic template is instantiated. If an implementation supports
- variations, they may be specified by passing arguments to
+ variations, they may be specified by passing arguments to 
  <member scope="com::sun::star::lang">XSingleServiceFactory::createInstanceWithArguments()</member>.
  There are no predefined arguments for all versions of this service.
  </p>
@@ -147,19 +147,19 @@ published service SimpleSetUpdate
 
 /** allows creating various objects that can be inserted into this set. [optional]
 
- <p>This interface may be implemented by an implementation of
+ <p>This interface may be implemented by an implementation of 
  service SetUpdate to support creating elements from other than
  the basic element template. An example of this would be an
  implementation that supports inheritance, allowing the use of
  templates derived from the basic template by extension.
- </p>
+ </p> 
 
- <p>This interface may only be implemented if the element type of the set
+ <p>This interface may only be implemented if the element type of the set 
  (as returned by
  <member scope="com::sun::star::container">XElementAccess::getElementType()</member>)
  is an object type, such as an interface. An implementation should also implement
  interface <type>XTemplateContainer</type> which is optional in this service.
- </p>
+ </p> 
 
  <p>The service identifier argument passed
  to <member scope="com::sun::star::lang">XMultiServiceFactory::createInstance()</member>
@@ -170,7 +170,7 @@ published service SimpleSetUpdate
  as a service identifier, in which case the result shall be the same as if
  the corresponding member of <type scope="com::sun::star::lang">XSingleServiceFactory</type>
  had been called.
- </p>
+ </p> 
 
 */
     [optional] interface com::sun::star::lang::XMultiServiceFactory;
@@ -179,6 +179,6 @@ published service SimpleSetUpdate
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/configuration/UpdateRootElement.idl b/offapi/com/sun/star/configuration/UpdateRootElement.idl
index 16ffa9450a08..d185183dad1c 100644
--- a/offapi/com/sun/star/configuration/UpdateRootElement.idl
+++ b/offapi/com/sun/star/configuration/UpdateRootElement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,12 +37,12 @@
 
 //=============================================================================
 
-module com { module sun { module star { module configuration {
+module com { module sun { module star { module configuration { 
 
 //=============================================================================
 /** provides update control for a hierarchy of configuration items
  and information about the hierarchy as a whole as well as its root.
-
+ 
  <p>Extends <type>AccessRootElement</type> by adding support for
  collecting changes and applying them to a backend store as a single batch.
  </p>
@@ -85,7 +85,7 @@ published service UpdateRootElement
  reports all changes within the hierarchy that are done through (direct or
  indirect) descendants of this element. The same set of changes is committed
  to persistent storage and/or made visible to other objects accessing the same
- data set, when
+ data set, when 
  <member scope="com::sun::star::util">XChangesBatch::commitChanges()</member>
  is invoked.
  </p>
@@ -105,6 +105,6 @@ published service UpdateRootElement
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/configuration/XTemplateContainer.idl b/offapi/com/sun/star/configuration/XTemplateContainer.idl
index 84331c660c19..1ad7308dbe2b 100644
--- a/offapi/com/sun/star/configuration/XTemplateContainer.idl
+++ b/offapi/com/sun/star/configuration/XTemplateContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,57 +24,57 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_configuration_XTemplateContainer_idl__
-#define __com_sun_star_configuration_XTemplateContainer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module configuration {
-
-//=============================================================================
-
+#ifndef __com_sun_star_configuration_XTemplateContainer_idl__ 
+#define __com_sun_star_configuration_XTemplateContainer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module configuration {  
+ 
+//============================================================================= 
+ 
 /** is implemented by objects that contain instances of a named template to
     provide information about the template.
 
-    <p> An implementation will also implement
+    <p> An implementation will also implement 
         <type scope="com::sun::star::lang">XSingleServiceFactory</type>, in which case
         that interface creates instances of the specified template.
     </p>
-    <p> If multiple templates are supported, the supported factory interface may be
+    <p> If multiple templates are supported, the supported factory interface may be  
         <type scope="com::sun::star::lang">XMultiServiceFactory</type>, in which case
-        the <atom>string</atom> returned from
-        <member>XTemplateContainer::getElementTemplateName()</member> can be used as
+        the <atom>string</atom> returned from 
+        <member>XTemplateContainer::getElementTemplateName()</member> can be used as 
         the service name argument.
     </p>
 
     @see XTemplateInstance
  */
 published interface XTemplateContainer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** retrieves the name of the template
-
-        <p> If instances of multiple templates are accepted by the container,
+    
+        <p>	If instances of multiple templates are accepted by the container, 
             this is the name of the basic or primary template.
         </p>
-        <p> Instances of the template must be created
+        <p>	Instances of the template must be created 
             using an appropriate factory.
         </p>
 
-        @returns
-                the name of the (default) template for elements.
+        @returns  
+                the name of the (default) template for elements. 
      */
-    string getElementTemplateName();
-
-};
-
-//=============================================================================
-
-}; }; }; };
+    string getElementTemplateName(); 
 
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/XTemplateInstance.idl b/offapi/com/sun/star/configuration/XTemplateInstance.idl
index f624ce8705f7..e2b32fdbfedf 100644
--- a/offapi/com/sun/star/configuration/XTemplateInstance.idl
+++ b/offapi/com/sun/star/configuration/XTemplateInstance.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_configuration_XTemplateInstance_idl__
-#define __com_sun_star_configuration_XTemplateInstance_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module configuration {
-
-//=============================================================================
-
-/** is implemented by objects that are instances of a named template to provide
+#ifndef __com_sun_star_configuration_XTemplateInstance_idl__ 
+#define __com_sun_star_configuration_XTemplateInstance_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module configuration {  
+ 
+//============================================================================= 
+ 
+/** is implemented by objects that are instances of a named template to provide 
     information about the template.
 
-    <p> Template names are similar to service names, but apply to structure and
+    <p>	Template names are similar to service names, but apply to structure and
         content, rather than to type.
     </p>
-    <p> Often a template description can be retrieved from a repository and then be
-        interpreted by a factory object. Templates provide a means to build
+    <p>	Often a template description can be retrieved from a repository and then be 
+        interpreted by a factory object. Templates provide a means to build 
         new kinds of objects dynamically.
     </p>
 
     @see XTemplateContainer
  */
 published interface XTemplateInstance: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** retrieves the name of the template
-
-        @returns
-            the name of the template this object was built from or conforms to.
+    
+        @returns  
+            the name of the template this object was built from or conforms to. 
      */
-    string getTemplateName();
-
-};
-
-//=============================================================================
-
-}; }; }; };
+    string getTemplateName(); 
 
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/AuthenticationFailedException.idl b/offapi/com/sun/star/configuration/backend/AuthenticationFailedException.idl
index 32ee9cf05f2f..82bec312a37c 100644
--- a/offapi/com/sun/star/configuration/backend/AuthenticationFailedException.idl
+++ b/offapi/com/sun/star/configuration/backend/AuthenticationFailedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,14 +36,14 @@ module com { module sun { module star { module configuration {
 module backend {
 
 /**
-    Exception thrown when authentication to the underlying backend fails
+    Exception thrown when authentication to the underlying backend fails 
     due to an unknown user-id or invalid credentials.
 
     @since OOo 1.1.2
   */
 published exception AuthenticationFailedException : BackendSetupException {
 } ;
-
+    
 } ;
 } ; } ; } ; } ;
 
diff --git a/offapi/com/sun/star/configuration/backend/Backend.idl b/offapi/com/sun/star/configuration/backend/Backend.idl
index 0932291c74bd..6a5a4212e84a 100644
--- a/offapi/com/sun/star/configuration/backend/Backend.idl
+++ b/offapi/com/sun/star/configuration/backend/Backend.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,72 +29,72 @@
 
 #ifndef __com_sun_star_configuration_backend_XBackend_idl__
 #include <com/sun/star/configuration/backend/XBackend.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
 #include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
 #include <com/sun/star/configuration/backend/XSchemaSupplier.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
-    provides access to a configuration database composed of one or more
+    provides access to a configuration database composed of one or more 
     storage backends containing settings used by software modules.
 
-    <p> Configuration data is organized into layers which are selected
-        by components and entities.
+    <p> Configuration data is organized into layers which are selected 
+        by components and entities. 
     </p>
 
-    <p> Components are characterized by configuration schemas.
-        A component contains configuration data for a particular
+    <p> Components are characterized by configuration schemas. 
+        A component contains configuration data for a particular 
         application domain or software module.
     </p>
     <p> Entities are organised hierarchically in organisations,
-        groups, roles and individual users. Each element of the associated
+        groups, roles and individual users. Each element of the associated 
         hierarchy corresponds to a layer that applies to an entity.
     </p>
-    <p> A layer contains data for multiple components
+    <p> A layer contains data for multiple components 
         associated to a single entity.
     <p>
-
+  
     @since OOo 1.1.2
 */
-published service Backend
+published service Backend 
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /**
       provides access to configuration schemas.
       */
     interface XSchemaSupplier ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /**
       provides access to the layer data.
       */
     interface XBackend ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /**
       provides information about supported and special entities.
       */
     [optional] interface XBackendEntities ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/BackendAccessException.idl b/offapi/com/sun/star/configuration/backend/BackendAccessException.idl
index d5c80d01ee0b..cfe15292b54c 100644
--- a/offapi/com/sun/star/configuration/backend/BackendAccessException.idl
+++ b/offapi/com/sun/star/configuration/backend/BackendAccessException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ module backend {
   */
 published exception BackendAccessException : ::com::sun::star::lang::WrappedTargetException {
 } ;
-
+    
 } ;
 } ; } ; } ; } ;
 
diff --git a/offapi/com/sun/star/configuration/backend/BackendAdapter.idl b/offapi/com/sun/star/configuration/backend/BackendAdapter.idl
index 176abb2d1ce0..dfb881b76bf0 100644
--- a/offapi/com/sun/star/configuration/backend/BackendAdapter.idl
+++ b/offapi/com/sun/star/configuration/backend/BackendAdapter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,37 +29,37 @@
 
 #ifndef __com_sun_star_configuration_backend_Backend_idl__
 #include <com/sun/star/configuration/backend/Backend.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
 #include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
-    implements <type>Backend</type> retrieving data
+    implements <type>Backend</type> retrieving data 
     from a <type>SingleBackend</type>.
-
+  
     @since OOo 1.1.2
 */
 published service BackendAdapter
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** provides access to configuration data.
       */
     service Backend ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /**
       This interface, that is optional in <type>Backend</type>, is
@@ -67,28 +67,28 @@ published service BackendAdapter
       */
     interface XBackendEntities ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /**
       allows initializing the backend to use.
 
       <p>If this interface is present, a <type>SingleBackend</type>
-        may be passed, that is used to access the data.
-        Also a <type scope="com::sun::star::configuration::bootstrap">BootstrapContext</type>
+        may be passed, that is used to access the data. 
+        Also a <type scope="com::sun::star::configuration::bootstrap">BootstrapContext</type> 
         can be passed, that provides further settings for the backend.
       </p>
 
-      <p>If this interface is missing, the real backend to use is determined
+      <p>If this interface is missing, the real backend to use is determined 
         from the <type scope="com::sun::star::uno">XComponentContext</type>.
       </p>
       */
     [optional] interface com::sun::star::lang::XInitialization ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/BackendSetupException.idl b/offapi/com/sun/star/configuration/backend/BackendSetupException.idl
index c5ce0d0c47cd..3e94c6959c5b 100644
--- a/offapi/com/sun/star/configuration/backend/BackendSetupException.idl
+++ b/offapi/com/sun/star/configuration/backend/BackendSetupException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,16 +43,16 @@ module backend {
     @since OOo 1.1.2
   */
 published exception BackendSetupException : ::com::sun::star::configuration::CannotLoadConfigurationException {
-
+    
     /** The exception that is raised by the underlying backend implementation.
-        <p>May be a numeric error code, a message <atom>string</atom> or <void/>,
-        if the original exception is not represented as a
+        <p>May be a numeric error code, a message <atom>string</atom> or <void/>, 
+        if the original exception is not represented as a 
         <type scope="com::sun::star::uno">Exception</type>.
         </p>
      */
-    any BackendException;
+    any BackendException; 
 } ;
-
+    
 } ;
 } ; } ; } ; } ;
 
diff --git a/offapi/com/sun/star/configuration/backend/CannotConnectException.idl b/offapi/com/sun/star/configuration/backend/CannotConnectException.idl
index 04a1d44b9c03..965f196736f2 100644
--- a/offapi/com/sun/star/configuration/backend/CannotConnectException.idl
+++ b/offapi/com/sun/star/configuration/backend/CannotConnectException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ module com { module sun { module star { module configuration {
 module backend {
 
 /**
-    Exception thrown when a connection to the underlying backend
+    Exception thrown when a connection to the underlying backend 
     cannot be established.
 
     <p> Examples of this include
@@ -46,13 +46,13 @@ module backend {
             <li>Backend is unavailable temporarily or permanently.</li>
             <li>Internal failure of the backend access layer.</li>
         <ul/>
-    </p>
+    </p>    
 
     @since OOo 1.1.2
   */
 published exception CannotConnectException : BackendSetupException {
 } ;
-
+    
 } ;
 } ; } ; } ; } ;
 
diff --git a/offapi/com/sun/star/configuration/backend/ComponentChangeEvent.idl b/offapi/com/sun/star/configuration/backend/ComponentChangeEvent.idl
index afe42f257a83..c4e79272853e 100644
--- a/offapi/com/sun/star/configuration/backend/ComponentChangeEvent.idl
+++ b/offapi/com/sun/star/configuration/backend/ComponentChangeEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,34 +25,34 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_configuration_backend_ComponentChangeEvent_idl__
-#define __com_sun_star_configuration_backend_ComponentChangeEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-//=============================================================================
-
-module com {  module sun {  module star {  module configuration {  module backend {
-
-//=============================================================================
-
+#ifndef __com_sun_star_configuration_backend_ComponentChangeEvent_idl__ 
+#define __com_sun_star_configuration_backend_ComponentChangeEvent_idl__ 
+
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module configuration {  module backend {  
+ 
+//============================================================================= 
+ 
 /** This event is fired when a change becomes effective on the source of the event
 
-    @see XBackendChangesNotifier
-
+    @see XBackendChangesNotifier 
+    
  */
 struct ComponentChangeEvent: ::com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** The name of the Component that changed
     */
     string Component;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/ConnectionLostException.idl b/offapi/com/sun/star/configuration/backend/ConnectionLostException.idl
index f6213e9327c5..e39e894252a4 100644
--- a/offapi/com/sun/star/configuration/backend/ConnectionLostException.idl
+++ b/offapi/com/sun/star/configuration/backend/ConnectionLostException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,18 +36,18 @@ module com { module sun { module star { module configuration {
 module backend {
 
 /**
-    Exception thrown when the connection to the underlying backend was lost
+    Exception thrown when the connection to the underlying backend was lost 
     irrecoverably.
 
-    <p> Any future attempts to access data from the backend through this object
+    <p> Any future attempts to access data from the backend through this object 
         will also fail.
-    </p>
+    </p>    
 
     @since OOo 1.1.2
   */
 published exception ConnectionLostException : BackendAccessException {
 } ;
-
+    
 } ;
 } ; } ; } ; } ;
 
diff --git a/offapi/com/sun/star/configuration/backend/CopyImporter.idl b/offapi/com/sun/star/configuration/backend/CopyImporter.idl
index ab790ba521e1..4f3507b94d98 100644
--- a/offapi/com/sun/star/configuration/backend/CopyImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/CopyImporter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,45 +29,45 @@
 
 #ifndef __com_sun_star_configuration_backend_Importer_idl__
 #include <com/sun/star/configuration/backend/Importer.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
-/**
+/** 
     imports data into a configuration layer by copying over existing data.
 
-
+  
     @since OOo 1.1.2
 */
 published service CopyImporter
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** allows importing configuration data into a backend.
-
-        <p> In this implementation, the changes are copied over any
-            <type>XLayer</type> data that already exists in the <type>Backend</type>,
+        
+        <p> In this implementation, the changes are copied over any 
+            <type>XLayer</type> data that already exists in the <type>Backend</type>, 
             replacing it completely.
         </p>
       */
     service Importer ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /** allows initializing the implementation with settings that control
+    /** allows initializing the implementation with settings that control 
         its behavior .
 
-        <p> This interface, which is optional in <type>Importer</type>
-            is mandatory in this service and supports the following arguments
-            which must be provided as
+        <p> This interface, which is optional in <type>Importer</type> 
+            is mandatory in this service and supports the following arguments 
+            which must be provided as 
             <type scope="com::sun::star::beans">NamedValue</type>:
         <dl>
             <dt><code>Overwrite</code> : <atom>boolean</atom></dt>
@@ -75,15 +75,15 @@ published service CopyImporter
                 only if the existing layer is empty.
             </dd>
         </dl>
-        </p>
+        </p> 
       */
     interface com::sun::star::lang::XInitialization ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/DataImporter.idl b/offapi/com/sun/star/configuration/backend/DataImporter.idl
index a3b039e24ca0..45c445f6d9e9 100644
--- a/offapi/com/sun/star/configuration/backend/DataImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/DataImporter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,86 +29,86 @@
 
 #ifndef __com_sun_star_task_XJob_idl__
 #include <com/sun/star/task/XJob.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
     allows importing data from one configuration repository into another. .
-
+  
     @since OOo 1.1.2
 */
 published service DataImporter
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** allows running an import job
 
-        <p> The source and destination repositories are selected by arguments
+        <p> The source and destination repositories are selected by arguments 
             passed to
-            <member scope="com::sun::star::task">XJob::execute()</member>.
-            The names and meanings of such arguments depend on
+            <member scope="com::sun::star::task">XJob::execute()</member>. 
+            The names and meanings of such arguments depend on 
             the implementation. Each implementation must document such arguments.
         </p>
-
-        <p> Implementations may return a value from
+            
+        <p> Implementations may return a value from 
             <member scope="com::sun::star::task">XJob::execute()</member>
-            that indicates the status of job execution. The type and meaning of
-            such status indicators depend on the implementation.
+            that indicates the status of job execution. The type and meaning of 
+            such status indicators depend on the implementation. 
         </p>
-         <p>If <void/> or <TRUE/> is returned, this indicates successful
-            execution. If an
-            <type scope="com::sun::star::uno">Exception</type> is returned,
-            it represents an error condition encountered during execution.
+         <p>If <void/> or <TRUE/> is returned, this indicates successful 
+            execution. If an 
+            <type scope="com::sun::star::uno">Exception</type> is returned, 
+            it represents an error condition encountered during execution. 
         </p>
 
         <p> The following arguments to
             <member scope="com::sun::star::task">XJob::execute()</member>
-            should be supported by implementations. Implementations must document
+            should be supported by implementations. Implementations must document 
             a failure to support any of these arguments:
         <dl>
             <dt><code>ImporterService</code> : <atom >string</atom></dt>
-            <dd>A service or implementation name used to instantiate the
-                <type>Importer</type> to use for importing. If this parameter
-                is missing, the implementation selects an appropriate importer.
+            <dd>A service or implementation name used to instantiate the 
+                <type>Importer</type> to use for importing. If this parameter 
+                is missing, the implementation selects an appropriate importer. 
                 By default, a <type>MergeImporter</type> should be used.
             </dd>
             <dt><code>OverwriteExisting</code> : <atom >boolean</atom></dt>
-            <dd>If <TRUE/>, specifies that no existing data should be
-                overwritten by the import. If the <type>Importer</type> used
-                does not support such protection, an error may be raised.
-                If some data is not imported, because there is existing
-                data, this is indicated by returning an appropriate exception.
+            <dd>If <TRUE/>, specifies that no existing data should be 
+                overwritten by the import. If the <type>Importer</type> used 
+                does not support such protection, an error may be raised. 
+                If some data is not imported, because there is existing 
+                data, this is indicated by returning an appropriate exception. 
             </dd>
             <dt><code>TruncateExisting</code> : <atom >boolean</atom></dt>
-            <dd>If <TRUE/>, specifies that existing data should be
-                discarded and replaced by the imported data.
-                If the <type>Importer</type> used does not support this
-                operation, an error may be raised.
-                By default, a <type>CopyImporter</type> is used to perform
+            <dd>If <TRUE/>, specifies that existing data should be 
+                discarded and replaced by the imported data. 
+                If the <type>Importer</type> used does not support this 
+                operation, an error may be raised. 
+                By default, a <type>CopyImporter</type> is used to perform 
                 truncating import.
             </dd>
             <dt><code>Entity</code> : <atom >string</atom></dt>
-            <dd>An identifier for the entity in the destination backend for
-                which the imported data should apply. The value will be passed
+            <dd>An identifier for the entity in the destination backend for 
+                which the imported data should apply. The value will be passed 
                 to <member>XLayerImporter::importLayerForEntity()</member>.
-                If this parameter is missing, the implementation uses
+                If this parameter is missing, the implementation uses 
                 <member>XLayerImporter::importLayer()</member> instead.
             </dd>
             <dt><code>Component</code> : <atom >string</atom></dt>
-            <dd>Names the component for which to import data. If this
-                parameter is missing, the selection of data to import depends
-                on implementation-specific parameters.
+            <dd>Names the component for which to import data. If this 
+                parameter is missing, the selection of data to import depends 
+                on implementation-specific parameters. 
             </dd>
             <dt><code>LayerFilter</code> : <type >LayerFilter</type></dt>
-            <dd>A filter to transform data during import. This parameter is
-                optional. If this parameter is missing, data will be imported
-                unaltered. <em>Support for this parameter is optional.</em>
-                If the implementation does not support a filter it will raise an
+            <dd>A filter to transform data during import. This parameter is 
+                optional. If this parameter is missing, data will be imported 
+                unaltered. <em>Support for this parameter is optional.</em> 
+                If the implementation does not support a filter it will raise an 
                 <type scope="com::sun::star::lang">IllegalArgumentException</type>.
             </dd>
         </dl>
@@ -117,11 +117,11 @@ published service DataImporter
       */
     interface com::sun::star::task::XJob ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/DefaultBackend.idl b/offapi/com/sun/star/configuration/backend/DefaultBackend.idl
index 38ddc1e034e7..f56bde41274e 100644
--- a/offapi/com/sun/star/configuration/backend/DefaultBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/DefaultBackend.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,36 +29,36 @@
 
 #ifndef __com_sun_star_configuration_backend_Backend_idl__
 #include <com/sun/star/configuration/backend/Backend.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
-    is a <type>DefaultBackend</type>, that is
+    is a <type>DefaultBackend</type>, that is 
     the default <type>DefaultBackend</type> for its
     <type scope="com::sun::star::uno">XComponentContext</type>.
-
+  
     <p>This object is accessible as singleton within the context</p>.
 
     @since OOo 1.1.2
 */
-service DefaultBackend
+service DefaultBackend 
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /** characterizes the functionality.
+    /** characterizes the functionality. 
       */
     service Backend ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl b/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl
index 22f07f63b37b..4cd33be6b39a 100644
--- a/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl
+++ b/offapi/com/sun/star/configuration/backend/HierarchyBrowser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,57 +29,57 @@
 
 #ifndef __com_sun_star_task_XJob_idl__
 #include <com/sun/star/task/XJob.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
     allows scanning a configuration data repository for available components .
-
+  
     @since OOo 1.1.2
 */
-published service HierarchyBrowser
+published service HierarchyBrowser 
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** allows executing a scan of the repository
 
         <p> The repository to browse is selected by arguments passed to
-            <member scope="com::sun::star::task">XJob::execute()</member>.
-            The names and meanings of such arguments depend on
+            <member scope="com::sun::star::task">XJob::execute()</member>. 
+            The names and meanings of such arguments depend on 
             the implementation. Each implementation must document such arguments.
         </p>
-
+            
         <p> The following argument to
             <member scope="com::sun::star::task">XJob::execute()</member>
             must be supported by all implementations:
         <dl>
             <dt><code>ExcludeComponents</code> : <atom dim="[]">string</atom> or <atom >string</atom></dt>
-            <dd>A component or list of components that should be skipped
-                and excluded from the result. If this argument appears multiple
+            <dd>A component or list of components that should be skipped 
+                and excluded from the result. If this argument appears multiple 
                 times it is handled cumulatively.
             </dd>
         </dl>
         </p>
-        <p> The return value of
-            <member scope="com::sun::star::task">XJob::execute()</member>
-            is a list of components found. The format in which components are
-            returned may depend on the implementation. Each implementation
-            should support returning component identifiers that are compatible
+        <p> The return value of 
+            <member scope="com::sun::star::task">XJob::execute()</member> 
+            is a list of components found. The format in which components are 
+            returned may depend on the implementation. Each implementation 
+            should support returning component identifiers that are compatible 
             with some implementation of <type>Backend</type>.
         </p>
       */
     interface com::sun::star::task::XJob ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/Importer.idl b/offapi/com/sun/star/configuration/backend/Importer.idl
index 8cb74626c6be..8d5f6cbc68a1 100644
--- a/offapi/com/sun/star/configuration/backend/Importer.idl
+++ b/offapi/com/sun/star/configuration/backend/Importer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,59 +29,59 @@
 
 #ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XLayerImporter_idl__
 #include <com/sun/star/configuration/backend/XLayerImporter.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
-/**
+/** 
     imports data into a configuration layer.
 
-    <p> The configuration changes are read from a <type>XLayer</type>
+    <p> The configuration changes are read from a <type>XLayer</type> 
         and stored into a <type>Backend</type>.
     </p>
-
+  
     @since OOo 1.1.2
 */
 published service Importer
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** allows importing configuration data into a backend.
       */
     interface XLayerImporter ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /** allows initializing the implementation with settings that control
+    /** allows initializing the implementation with settings that control 
         its behavior .
 
-        <p> Arguments are provided as
-            <type scope="com::sun::star::beans">NamedValue</type>.
+        <p> Arguments are provided as 
+            <type scope="com::sun::star::beans">NamedValue</type>. 
             Implementations specify which arguments they support.
-
+       
         <dl>
             <dt><code>Notify</code> : <atom>boolean</atom></dt>
             <dd>If <TRUE/>, specifies that the backend should trigger
              notification to its listeners.
             </dd>
         </dl>
-        </p>
+        </p> 
     */
     [optional] interface com::sun::star::lang::XInitialization ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException.idl b/offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException.idl
index 81da4911437b..2a21eec34560 100644
--- a/offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException.idl
+++ b/offapi/com/sun/star/configuration/backend/InsufficientAccessRightsException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ module com { module sun { module star { module configuration {
 module backend {
 
 /**
-    Exception thrown when access to the underlying backend fails because of
+    Exception thrown when access to the underlying backend fails because of 
     insufficient access rights to some needed resource.
 
     <p> Examples of this include
@@ -47,13 +47,13 @@ module backend {
             <li>Missing access to personal data.</li>
             <li>Missing write access when updating data.</li>
         </ul>
-    </p>
-
+    </p>  
+    
     @since OOo 1.1.2
   */
 published exception InsufficientAccessRightsException : BackendAccessException {
 } ;
-
+    
 } ;
 } ; } ; } ; } ;
 
diff --git a/offapi/com/sun/star/configuration/backend/InteractionHandler.idl b/offapi/com/sun/star/configuration/backend/InteractionHandler.idl
index 82a3595a6b08..ac73fda6292b 100644
--- a/offapi/com/sun/star/configuration/backend/InteractionHandler.idl
+++ b/offapi/com/sun/star/configuration/backend/InteractionHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.idl b/offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.idl
index 50d9650636ff..ffa243b70167 100644
--- a/offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.idl
+++ b/offapi/com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ module com { module sun { module star { module configuration {
 module backend {
 
 /**
-    Exception thrown when authentication to the underlying backend fails
+    Exception thrown when authentication to the underlying backend fails 
     because the configured authentication mechanism is not supported by the
     backend or no valid mechanism can be negotiated.
 
@@ -44,7 +44,7 @@ module backend {
   */
 published exception InvalidAuthenticationMechanismException : BackendSetupException {
 } ;
-
+    
 } ;
 } ; } ; } ; } ;
 
diff --git a/offapi/com/sun/star/configuration/backend/Layer.idl b/offapi/com/sun/star/configuration/backend/Layer.idl
index 8b9429810b15..204166f198c6 100644
--- a/offapi/com/sun/star/configuration/backend/Layer.idl
+++ b/offapi/com/sun/star/configuration/backend/Layer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -74,31 +74,31 @@ published service Layer
     //--------------------------------------------------------------------------
 
     /**
-      provides read access to sublayers accessible through an
+      provides read access to sublayers accessible through an 
       additional criterion (for instance the locale they contain data for).
       */
     [optional] interface XCompositeLayer ;
 
     //--------------------------------------------------------------------------
 
-    /**
+    /** 
       provides a way to detect changes to the layer.
 
-      <p> Timestamps should be considered as opaque markers and
-      can only safely be compared for equality and
-      only to timestamps generated by the same implementation.
-      When the content of the Layer changes,
+      <p> Timestamps should be considered as opaque markers and 
+      can only safely be compared for equality and 
+      only to timestamps generated by the same implementation. 
+      When the content of the Layer changes, 
       the timestamp is guaranteed to change to a different value.
       </p>
-      <p> The timestamp format depends on the implementation.
-      If the timestamp is a representation of the time of the last change,
+      <p> The timestamp format depends on the implementation. 
+      If the timestamp is a representation of the time of the last change, 
       the recommended format is "YYYYMMDDhhmmssZ".
       </p>
       */
     [optional] interface com::sun::star::util::XTimeStamped ;
-
+    
     //--------------------------------------------------------------------------
-
+    
     /**
       The URL of the layer data.
 
diff --git a/offapi/com/sun/star/configuration/backend/LayerDescriber.idl b/offapi/com/sun/star/configuration/backend/LayerDescriber.idl
index 1f6ae54f2c5f..af3cc0487f06 100644
--- a/offapi/com/sun/star/configuration/backend/LayerDescriber.idl
+++ b/offapi/com/sun/star/configuration/backend/LayerDescriber.idl
@@ -7,35 +7,35 @@
 
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
+#endif 
 
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
-/**
+/** 
    describe the contents of a layer to an XLayerHander object. The contents of
    the layer is contained in the sequence of PropertyInfo structures
    @see PropertyInfo
-
+     
 */
-service LayerDescriber
+service LayerDescriber 
 {
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /**
+    /** 
       describes a set of configuration data to an XLayerHandler Object.
     */
     interface com::sun::star::configuration::backend::XLayerContentDescriber ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-//=============================================================================
+//============================================================================= 
 } ;
-} ; } ; } ; } ; } ;
-#endif
+} ; } ; } ; } ; } ; 
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/LayerFilter.idl b/offapi/com/sun/star/configuration/backend/LayerFilter.idl
index ec5a209aa8ac..4f6515facb38 100644
--- a/offapi/com/sun/star/configuration/backend/LayerFilter.idl
+++ b/offapi/com/sun/star/configuration/backend/LayerFilter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,9 +45,9 @@ module com { module sun { module star { module configuration { module backend {
 /**
   provides a filtered version of a configuration data <type>Layer</type>.
 
-  <p> A layer filter wraps a source <type>XLayer</type> object and
+  <p> A layer filter wraps a source <type>XLayer</type> object and 
      provides access to a filtered version of its data.
-     The data read from the filter usually is produced from the source data
+     The data read from the filter usually is produced from the source data 
      by adding and removing elements or modifying values.
   </p>
 
@@ -63,7 +63,7 @@ published service LayerFilter
     /**
       provides read access to the filtered contents.
 
-      <p> Method <member>XLayer::readData</member> will render a filtered version
+      <p> Method <member>XLayer::readData</member> will render a filtered version 
          of the data produced by the same method of the source object.
      </p>
       */
@@ -73,11 +73,11 @@ published service LayerFilter
 
     /**
       provides a means to set the source data for the filter.
-
+      
       <p> Call <method scope="com::sun::star::lang">XInitialization::initialize</method>()
          with a single argument of type <type scope="com::sun::star::beans">NamedValue</type>,
          where <member scope="com::sun::star::beans">NamedValue::Name</member> is <code>"Source"</code>
-         and <member scope="com::sun::star::beans">NamedValue::Value</member>
+         and <member scope="com::sun::star::beans">NamedValue::Value</member> 
          is an object implementing <type>XLayer</type>.
      </p>
       */
diff --git a/offapi/com/sun/star/configuration/backend/LayerUpdateMerger.idl b/offapi/com/sun/star/configuration/backend/LayerUpdateMerger.idl
index bff3c26c92a8..0ecccdb2e05d 100644
--- a/offapi/com/sun/star/configuration/backend/LayerUpdateMerger.idl
+++ b/offapi/com/sun/star/configuration/backend/LayerUpdateMerger.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,26 +29,26 @@
 
 #ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XUpdateHandler_idl__
 #include <com/sun/star/configuration/backend/XUpdateHandler.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
-/**
+/** 
     applies updates to a configuration layer.
 
-    <p> The configuration layer data is read from a <type>XLayer</type>
-    and the changed layer is provided as <type>XLayer</type> again or
+    <p> The configuration layer data is read from a <type>XLayer</type> 
+    and the changed layer is provided as <type>XLayer</type> again or 
     described to a <type>XLayerHandler</type>.
     </p>
-
+  
     @see com::sun::star::configuration::backend::UpdatableLayer
         Service describes a layer and accepts a changed layer..
 
@@ -56,25 +56,25 @@ module com { module sun { module star { module configuration { module backend {
 */
 published service LayerUpdateMerger
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** accepts events describing the changes.
       */
     interface com::sun::star::configuration::backend::XUpdateHandler ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** allows initializing layer data source and target.
 
         <p> Both source and target of the update can be provided by passing a
-            <type>XUpdatableLayer</type> object. Alternatively they can be
+            <type>XUpdatableLayer</type> object. Alternatively they can be 
             provided individually by providing a <type>XLayer</type> object as
-            data source and an <type>XLayerHandler</type> object to receive the
+            data source and an <type>XLayerHandler</type> object to receive the 
             updated data.
-        </p>
-        <p> Implementations can provide more arguments to finetune the behavior.
-            Such arguments are provided as
-            <type scope="com::sun::star::beans">NamedValue</type>.
+        </p> 
+        <p> Implementations can provide more arguments to finetune the behavior. 
+            Such arguments are provided as 
+            <type scope="com::sun::star::beans">NamedValue</type>. 
             Implementations should support the following named arguments:
         <dl>
             <dt><code>Overwrite</code> : <atom>boolean</atom></dt>
@@ -82,8 +82,8 @@ published service LayerUpdateMerger
                 only if the existing layer is empty.
             </dd>
             <dt><code>Truncate</code> : <atom>boolean</atom></dt>
-            <dd>If <TRUE/> requests that changes should not be merged onto
-                existing data, but that the changes should be applied
+            <dd>If <TRUE/> requests that changes should not be merged onto 
+                existing data, but that the changes should be applied  
                 to a layer that is completely empty.
             </dd>
         </dl>
@@ -91,11 +91,11 @@ published service LayerUpdateMerger
       */
     interface com::sun::star::lang::XInitialization ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl b/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl
index f02bd733498e..321c9f8ae8ba 100644
--- a/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,11 +31,11 @@
 #include <com/sun/star/configuration/backend/MultiLayerStratum.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
    implements <type>MultiLayerStratum</type> that
@@ -43,18 +43,18 @@ module com { module sun { module star { module configuration { module backend {
 */
 service LdapMultiLayerStratum
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /**
       provides access to multiple layers of configuration data.
      */
     service  MultiLayerStratum;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
 #endif
diff --git a/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl b/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl
index 31897515ce7c..c0a1e1931398 100644
--- a/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,33 +29,33 @@
 
 #ifndef __com_sun_star_configuration_backend_SingleBackend_idl__
 #include <com/sun/star/configuration/backend/SingleBackend.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
-    implements <type>SingleBackend</type> that stores data in an
+    implements <type>SingleBackend</type> that stores data in an 
     LDAP directoy.
-
+  
     @since OOo 1.1.2
 */
 published service LdapSingleBackend
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** provides access to configuration data.
       */
     service SingleBackend ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl b/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl
index ae50be4c836a..e070fde5393b 100644
--- a/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,11 +31,11 @@
 #include <com/sun/star/configuration/backend/SingleLayerStratum.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
    implements <type>SingleLayerStratum</type> that
@@ -43,18 +43,18 @@ module com { module sun { module star { module configuration { module backend {
 */
 service LdapSingleStratum
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /**
       provides access to configuration data.
      */
     service  SingleLayerStratum;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl b/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl
index 9c1dd5ee77f0..5b34c1988157 100644
--- a/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalDataImporter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,19 +29,19 @@
 
 #ifndef __com_sun_star_configuration_backend_DataImporter_idl__
 #include <com/sun/star/configuration/backend/DataImporter.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
-    allows importing data from a local configuration data repository
+    allows importing data from a local configuration data repository 
     or file into any <type>Backend</type>.
-
-    <p> Data to be imported can be a single layer either from a full local
+  
+    <p> Data to be imported can be a single layer either from a full local 
         configuration database or from a particular OOR Update XML file.
     </p>
     <p> Data is imported into the <type>DefaultBackend</type>.
@@ -57,55 +57,55 @@ module com { module sun { module star { module configuration { module backend {
 */
 published service LocalDataImporter
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** provides for running an import job
 
-        <p> The implementation returns <void/> from
+        <p> The implementation returns <void/> from  
             <member scope="com::sun::star::task">XJob::execute()</member>
-            to indicates successful execution. If import is not executed,
-            because <code>OverwriteExisting = </code><TRUE/> was specified,
-            a <type scope="com::sun::star::lang">IllegalAccessException</type>
-            is returned.
+            to indicates successful execution. If import is not executed, 
+            because <code>OverwriteExisting = </code><TRUE/> was specified, 
+            a <type scope="com::sun::star::lang">IllegalAccessException</type> 
+            is returned. 
         </p>
-         <p>If <void/> or <TRUE/> is returned, this indicates successful
-            execution. If an
-            <type scope="com::sun::star::uno">Exception</type> is returned,
-            it represents an error condition encountered during execution.
+         <p>If <void/> or <TRUE/> is returned, this indicates successful 
+            execution. If an 
+            <type scope="com::sun::star::uno">Exception</type> is returned, 
+            it represents an error condition encountered during execution. 
         </p>
 
         <p> The standard arguments to
             <member scope="com::sun::star::task">XJob::execute()</member>
-            are all supported by implementations. Additionally the following
+            are all supported by implementations. Additionally the following 
             argument is required to select the data source:
         <dl>
             <dt><code>LayerDataUrl</code> : <atom >string</atom></dt>
-            <dd>A file URL that specifies the location of the source data.
-                <p> If no <code>Component</code> is provided, this must be the
-                    location of an OOR Update XML file, which will be imported
-                    directly.
+            <dd>A file URL that specifies the location of the source data. 
+                <p> If no <code>Component</code> is provided, this must be the 
+                    location of an OOR Update XML file, which will be imported 
+                    directly. 
                 </p>
-                <p> If a <code>Component</code> is provided, the
-                    <code>LayerDataUrl</code> is treated as Entity
-                    (i.e. Layer directory base URL) for a local
-                    configuration database and the appropriate component
+                <p> If a <code>Component</code> is provided, the 
+                    <code>LayerDataUrl</code> is treated as Entity 
+                    (i.e. Layer directory base URL) for a local 
+                    configuration database and the appropriate component 
                     from that repository is imported.
                 </p>
             </dd>
         </dl>
         </p>
-        <p> Implementations may support additional parameters to select
-            a destination <type>Backend</type>, that is not the
+        <p> Implementations may support additional parameters to select 
+            a destination <type>Backend</type>, that is not the 
             <type>DefaultBackend</type>.
         </p>
       */
     service DataImporter ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser.idl b/offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser.idl
index ae7244365af2..b2e5eb5e0784 100644
--- a/offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalHierarchyBrowser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,52 +29,52 @@
 
 #ifndef __com_sun_star_configuration_backend_HierarchyBrowser_idl__
 #include <com/sun/star/configuration/backend/HierarchyBrowser.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
-    is a <type>HierarchyBrowser</type>, that browses a configuration database
+    is a <type>HierarchyBrowser</type>, that browses a configuration database 
     stored in the local file system.
-
+  
     @see com::sun::star::configuration::backend::LocalSingleBackend
 
     @since OOo 1.1.2
 */
-published service LocalHierarchyBrowser
+published service LocalHierarchyBrowser 
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /** allows browsing a configuration hierarchy for components.
+    /** allows browsing a configuration hierarchy for components. 
 
-        <p> Either a schema repository or a layer directory can be browsed.
+        <p> Either a schema repository or a layer directory can be browsed. 
             Components can be retrieved either as component names or as
             file URLs.
         </p>
 
         <p> The following additional arguments are supported for
-            <member scope="com::sun::star::task">XJob::execute()</member>:<BR/>
+            <member scope="com::sun::star::task">XJob::execute()</member>:<BR/> 
 
         <dl>
             <dt><code>SchemaDataUrl</code> : <atom>string</atom></dt>
-            <dd>Base directory to search for schema files.
-                If this is specified, schema files will be browsed,
+            <dd>Base directory to search for schema files. 
+                If this is specified, schema files will be browsed, 
                 so argument <code>LayerDataUrl</code> should not be specified.
             </dd>
             <dt><code>LayerDataUrl</code> : <atom>string</atom></dt>
-            <dd>Base directory to search for layer files.
-                If this is specified, layer files will be browsed,
+            <dd>Base directory to search for layer files. 
+                If this is specified, layer files will be browsed, 
                 so argument <code>SchemaDataUrl</code> should not be specified.
             </dd>
             <dt><code>FetchComponentNames</code> : <atom>boolean</atom></dt>
             <dd><ul><li>if <TRUE/> components will be returned as component names,</li>
                     <li>if <FALSE/> components will be returned as fileURLs,</li>
-                    <li>if this argument is not provided, the default is to
-                        retrieve names when browsing schemas and URLs when
+                    <li>if this argument is not provided, the default is to 
+                        retrieve names when browsing schemas and URLs when 
                         browsing layers.</li>
             </dd>
         </dl>
@@ -82,11 +82,11 @@ published service LocalHierarchyBrowser
       */
     service HierarchyBrowser ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/LocalSchemaSupplier.idl b/offapi/com/sun/star/configuration/backend/LocalSchemaSupplier.idl
index 3c72d908579c..035616fa4269 100644
--- a/offapi/com/sun/star/configuration/backend/LocalSchemaSupplier.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalSchemaSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,33 +29,33 @@
 
 #ifndef __com_sun_star_configuration_backend_SchemaSupplier_idl__
 #include <com/sun/star/configuration/backend/SchemaSupplier.idl>
-#endif
+#endif 
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
-    implements <type>SchemaSupplier</type> providing access to
+    implements <type>SchemaSupplier</type> providing access to  
     local configuration schemas
 */
 service LocalSchemaSupplier
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
      /**
       provides access to configuration schemas.
       */
     service SchemaSupplier ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
 #endif
diff --git a/offapi/com/sun/star/configuration/backend/LocalSingleBackend.idl b/offapi/com/sun/star/configuration/backend/LocalSingleBackend.idl
index 098d8123e079..a98cc2f01762 100644
--- a/offapi/com/sun/star/configuration/backend/LocalSingleBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalSingleBackend.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,33 +29,33 @@
 
 #ifndef __com_sun_star_configuration_backend_SingleBackend_idl__
 #include <com/sun/star/configuration/backend/SingleBackend.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
-    implements <type>SingleBackend</type> that stores data in the
+    implements <type>SingleBackend</type> that stores data in the 
     local filesystem using the OOR XML formats.
-
+  
     @since OOo 1.1.2
 */
 published service LocalSingleBackend
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** provides access to configuration data.
       */
     service SingleBackend ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/LocalSingleStratum.idl b/offapi/com/sun/star/configuration/backend/LocalSingleStratum.idl
index aea200df1925..8f5d06d86a57 100644
--- a/offapi/com/sun/star/configuration/backend/LocalSingleStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/LocalSingleStratum.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,11 +31,11 @@
 #include <com/sun/star/configuration/backend/SingleLayerStratum.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
    implements <type>SingleLayerStratum</type> that
@@ -43,18 +43,18 @@ module com { module sun { module star { module configuration { module backend {
 */
 service LocalSingleStratum
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /**
       provides access to configuration data.
      */
     service  SingleLayerStratum;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/MalformedDataException.idl b/offapi/com/sun/star/configuration/backend/MalformedDataException.idl
index 211571a41566..7eb5d4fbbf77 100644
--- a/offapi/com/sun/star/configuration/backend/MalformedDataException.idl
+++ b/offapi/com/sun/star/configuration/backend/MalformedDataException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
-#define __com_sun_star_configuration_backend_MalformedDataException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-//=============================================================================
+#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__ 
+#define __com_sun_star_configuration_backend_MalformedDataException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** is raised when the data of a component schema, layer or update
     is not well-formed, violates the schema or is otherwise invalid.
 
     @since OOo 1.1.2
  */
 published exception MalformedDataException: ::com::sun::star::uno::Exception
-{
-    /**
-        data that provides more detailed information about the
+{ 
+    /** 
+        data that provides more detailed information about the 
         reason and location of the error.
 
         <p> Typically this member should contain an exception characterizing
@@ -78,14 +78,14 @@ published exception MalformedDataException: ::com::sun::star::uno::Exception
             <dd>for features that are not supported by the current implementation.</dd>
         </dl>
         </p>
-        <p> If no more detail information is available, this may be left <void/>.
+        <p> If no more detail information is available, this may be left <void/>. 
         </p>
     */
-    any ErrorDetails;
-};
-
-//=============================================================================
-
+    any ErrorDetails; 
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/MergeImporter.idl b/offapi/com/sun/star/configuration/backend/MergeImporter.idl
index d02d68985f32..e3b75ff3a389 100644
--- a/offapi/com/sun/star/configuration/backend/MergeImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/MergeImporter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,23 +29,23 @@
 
 #ifndef __com_sun_star_configuration_backend_Importer_idl__
 #include <com/sun/star/configuration/backend/Importer.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
-/**
+/** 
     imports data into a configuration layer by merging with existing data.
 
-    <p> No named arguments to
-        <member scope="com::sun::star::lang">XInitialization::initialize()</member>
+    <p> No named arguments to 
+        <member scope="com::sun::star::lang">XInitialization::initialize()</member> 
         are supported.
     </p>
 
@@ -53,12 +53,12 @@ module com { module sun { module star { module configuration { module backend {
 */
 published service MergeImporter
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** allows importing configuration data into a backend.
-
-        <p> In this implementation, the changes are merged with any
-            <type>XLayer</type> data that already exists in the <type>Backend</type>,
+        
+        <p> In this implementation, the changes are merged with any 
+            <type>XLayer</type> data that already exists in the <type>Backend</type>, 
             replacing it completely.
         </p>
 
@@ -67,11 +67,11 @@ published service MergeImporter
       */
     service Importer ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl b/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
index c5d44ac4b7bf..ef0f48f6c49f 100644
--- a/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
+++ b/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_configuration_backend_MergeRecoveryRequest_idl__
-#define __com_sun_star_configuration_backend_MergeRecoveryRequest_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-//=============================================================================
+#ifndef __com_sun_star_configuration_backend_MergeRecoveryRequest_idl__ 
+#define __com_sun_star_configuration_backend_MergeRecoveryRequest_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
-
-//=============================================================================
-
-/** is passed to an <type>InteractionHandler<type> when merging fails due to
+ 
+//============================================================================= 
+ 
+/** is passed to an <type>InteractionHandler<type> when merging fails due to 
     invalid layer data or access problems.
 
     @since OOo 2.0.0
  */
 exception MergeRecoveryRequest: ::com::sun::star::uno::Exception
-{
-    /**
-        data that provides more detailed information about the
+{ 
+    /** 
+        data that provides more detailed information about the 
         reason and location of the error.
 
         <p> Typically this member should contain an exception characterizing
@@ -60,31 +60,31 @@ exception MergeRecoveryRequest: ::com::sun::star::uno::Exception
             <dd>for layers that can't be accessed.</dd>
         </dl>
         </p>
-        <p> If no more detail information is available, this may be left <void/>.
+        <p> If no more detail information is available, this may be left <void/>. 
         </p>
     */
-    any ErrorDetails;
+    any ErrorDetails; 
 
-    /**
+    /** 
         Identifier of the layer object containing the invalid data.
     */
     string ErrorLayerId;
 
-    /**
+    /** 
         specifies whether the requestor wants to remove or skip the invalid layer.
 
-        <p> If <TRUE/> the requestor wants to remove the underlying data of
+        <p> If <TRUE/> the requestor wants to remove the underlying data of 
             the layer.<BR/>
-            If <FALSE/> the request is to skip the underlying data this time,
+            If <FALSE/> the request is to skip the underlying data this time, 
             but without removing it.
         </p>
     */
     boolean IsRemovalRequest;
 
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl b/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
index 375f8851829c..ae92e65807fc 100644
--- a/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/MultiLayerStratum.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,45 +29,45 @@
 
 #ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
 #include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XMultiLayerStratum_idl__
 #include <com/sun/star/configuration/backend/XMultiLayerStratum.idl>
-#endif
+#endif 
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
    Provides access to a singe layer of configuration data
 */
 service MultiLayerStratum
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
      /**
       provides access to multiple layers of configuration data .
       */
     interface XMultiLayerStratum ;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
 
+   
     /**
       provides information about supported and special entities.
       */
     [optional] interface XBackendEntities ;
+  
 
-
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
 #endif
-
+ 
diff --git a/offapi/com/sun/star/configuration/backend/MultiStratumBackend.idl b/offapi/com/sun/star/configuration/backend/MultiStratumBackend.idl
index 7e755d187d94..a8b2d9797a01 100644
--- a/offapi/com/sun/star/configuration/backend/MultiStratumBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/MultiStratumBackend.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/configuration/backend/NodeAttribute.idl b/offapi/com/sun/star/configuration/backend/NodeAttribute.idl
index 5c5007e5e1a2..b12950c7b0d8 100644
--- a/offapi/com/sun/star/configuration/backend/NodeAttribute.idl
+++ b/offapi/com/sun/star/configuration/backend/NodeAttribute.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,15 +24,15 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_configuration_backend_NodeAttribute_idl__
+#ifndef __com_sun_star_configuration_backend_NodeAttribute_idl__ 
 #define __com_sun_star_configuration_backend_NodeAttribute_idl__
-
+ 
 //=============================================================================
-
+ 
 module com { module sun { module star { module configuration { module backend {
-
+ 
 //=============================================================================
-
+ 
 /** These values are used to specify the behavior of a node or property
     in a layer.
 
@@ -41,34 +41,34 @@ module com { module sun { module star { module configuration { module backend {
     </p>
 
     @see com::sun::star::configuration::backend::SchemaAttribute
-        During merging the values may be combined with static attributes
+        During merging the values may be combined with static attributes 
         from the schema.
 
-    @since OOo 1.1.2
+    @since OOo 1.1.2  
  */
 published constants NodeAttribute
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** indicates that a node or property may not be changed or overridden
         in subsequent layers
      */
-    const short FINALIZED = 256;
-
-    //-------------------------------------------------------------------------
-
+    const short FINALIZED = 256; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** indicates that a set item may not be removed or replaced
-        in subsequent layers.
+        in subsequent layers. 
      */
-    const short MANDATORY = 512;
-
-    //-------------------------------------------------------------------------
-
-    /** indicates that a node or property may not be changed
+    const short MANDATORY = 512; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** indicates that a node or property may not be changed 
         in this or subsequent layer.
      */
-    const short READONLY = 1024;
-
+    const short READONLY = 1024; 
+ 
     //-------------------------------------------------------------------------
 
     /** indicates that contents shall be fused.
@@ -81,21 +81,21 @@ published constants NodeAttribute
         @since OOo 2.0.3
      */
     const short FUSE = 2048;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+          
     /** can be used to mask the node attributes from merged attributes
      */
     const short MASK = 32512; // 0xFF00, changed to 0x7F00 because only 3 bits
                               // are masked and fixing a bug in idlc
-
-    //-------------------------------------------------------------------------
-};
-
+ 
+    //------------------------------------------------------------------------- 
+}; 
+ 
 //=============================================================================
-
-}; }; }; }; };
+ 
+}; }; }; }; }; 
 
 //=============================================================================
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/OfflineBackend.idl b/offapi/com/sun/star/configuration/backend/OfflineBackend.idl
index 57775a6a4afd..219ee23a548f 100644
--- a/offapi/com/sun/star/configuration/backend/OfflineBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/OfflineBackend.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,50 +29,50 @@
 
 #ifndef __com_sun_star_configuration_backend_BackendAdapter_idl__
 #include <com/sun/star/configuration/backend/BackendAdapter.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
-    implements <type>BackendAdapter</type> that maintains a cache so it
-    can operate even if the <type>SingleBackend</type> holding the data
+    implements <type>BackendAdapter</type> that maintains a cache so it  
+    can operate even if the <type>SingleBackend</type> holding the data 
     is inaccessible.
-
+ 
     @see com::sun::star::configuration::backend::OnlineBackend
-
+     
     @since OOo 1.1.2
 */
 published service OfflineBackend
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** provides access to configuration data from a <type>SingleBackend</type>.
 
-      <p>If no backend is provided during initalization or if the context
-        contains an <code>Offline</code> flag that is <TRUE/>, then offline mode
-        is activated. This may fail, if the offline cache has not been filled
-        during a previous execution.
+      <p>If no backend is provided during initalization or if the context 
+        contains an <code>Offline</code> flag that is <TRUE/>, then offline mode 
+        is activated. This may fail, if the offline cache has not been filled 
+        during a previous execution. 
       </p>
       <p>Less entities may be available from <type>XBackendEntities</type>,
-      when operating in offline mode than when operating with an online
+      when operating in offline mode than when operating with an online 
       <type>SingleBackend</type>.
       </p>
-      <p>If offline mode is not invoked, the implementation behaves
+      <p>If offline mode is not invoked, the implementation behaves 
         like any other <type>BackendAdapter</type>.
       </p>
 
       */
     service BackendAdapter ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/OnlineBackend.idl b/offapi/com/sun/star/configuration/backend/OnlineBackend.idl
index a0d8e39abaf8..ddebe6bc5f06 100644
--- a/offapi/com/sun/star/configuration/backend/OnlineBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/OnlineBackend.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,37 +29,37 @@
 
 #ifndef __com_sun_star_configuration_backend_BackendAdapter_idl__
 #include <com/sun/star/configuration/backend/BackendAdapter.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
-    implements a <type>BackendAdapter</type> that requires that
-    the <type>SingleBackend</type> holding the data
+    implements a <type>BackendAdapter</type> that requires that   
+    the <type>SingleBackend</type> holding the data 
     is continuously accessible.
-
+ 
     @see com::sun::star::configuration::backend::OfflineBackend
-
+  
     @since OOo 1.1.2
 */
 published service OnlineBackend
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** provides access to configuration data from a <type>SingleBackend</type>.
 
       */
     service BackendAdapter ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/PlatformBackend.idl b/offapi/com/sun/star/configuration/backend/PlatformBackend.idl
index 70577522da86..2fc097a78a4a 100644
--- a/offapi/com/sun/star/configuration/backend/PlatformBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/PlatformBackend.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,11 +31,11 @@
 #include <com/sun/star/configuration/backend/SingleLayerStratum.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
    implements <type>SingleLayerStratum</type> that
@@ -43,18 +43,18 @@ module com { module sun { module star { module configuration { module backend {
 */
 service PlatformBackend
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /**
       provides access to configuration data.
      */
     service  SingleLayerStratum;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
 #endif
diff --git a/offapi/com/sun/star/configuration/backend/PropertyInfo.idl b/offapi/com/sun/star/configuration/backend/PropertyInfo.idl
index 11f5fe6ba142..327934be3949 100644
--- a/offapi/com/sun/star/configuration/backend/PropertyInfo.idl
+++ b/offapi/com/sun/star/configuration/backend/PropertyInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,45 +25,45 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_configuration_backend_PropertyInfo_idl__
-#define __com_sun_star_configuration_backend_PropertyInfo_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module configuration {  module backend {
-
-//=============================================================================
+#ifndef __com_sun_star_configuration_backend_PropertyInfo_idl__ 
+#define __com_sun_star_configuration_backend_PropertyInfo_idl__ 
 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module configuration {  module backend {  
+ 
+//============================================================================= 
+ 
 /** This structure contains all the information related to a property
     @see XLayerContentDescriber
 */
 struct PropertyInfo
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** The full name of the Property
      *  for eg. org.openoffice.Inet/Settings/ooInetHTTPProxyName
     */
     string Name;
-
-    /** The type of the Property
+    
+    /** The type of the Property 
     */
     string Type;
 
-    /** The value of the property
+    /** The value of the property 
     */
     any Value;
 
     /** Is the property protected, if true  the property can not
-     *  be over written in later layer.
+     *  be over written in later layer. 
     */
     boolean Protected;
-
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
+    
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
 #endif
diff --git a/offapi/com/sun/star/configuration/backend/Schema.idl b/offapi/com/sun/star/configuration/backend/Schema.idl
index 873f7c464b15..55347bf17db9 100644
--- a/offapi/com/sun/star/configuration/backend/Schema.idl
+++ b/offapi/com/sun/star/configuration/backend/Schema.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,8 +39,8 @@ module com { module sun { module star { module configuration { module backend {
 //==============================================================================
 
 /**
-  provides read only access to a configuration component schema.
-
+  provides read only access to a configuration component schema. 
+  
   <p>A component is a set of hierarchically organised and semantically
   related configuration settings, e.g StarWriter settings.
   </p>
@@ -50,7 +50,7 @@ module com { module sun { module star { module configuration { module backend {
   </p>
 
   @see com::sun::star::configuration::backend::Layer
-        Service providing access to individual
+        Service providing access to individual 
         configuration data for an entity.
 
   @since OOo 1.1.2
@@ -68,7 +68,7 @@ published service Schema
     interface XSchema ;
 
     //--------------------------------------------------------------------------
-
+    
     /**
       The URL of the layer data.
 
diff --git a/offapi/com/sun/star/configuration/backend/SchemaAttribute.idl b/offapi/com/sun/star/configuration/backend/SchemaAttribute.idl
index dbc58c870913..bfde6dcad6e0 100644
--- a/offapi/com/sun/star/configuration/backend/SchemaAttribute.idl
+++ b/offapi/com/sun/star/configuration/backend/SchemaAttribute.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,57 +24,57 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_configuration_backend_SchemaAttribute_idl__
+#ifndef __com_sun_star_configuration_backend_SchemaAttribute_idl__ 
 #define __com_sun_star_configuration_backend_SchemaAttribute_idl__
 
 //=============================================================================
-
+ 
 module com { module sun { module star { module configuration { module backend {
-
+ 
 //=============================================================================
-
+ 
 /** These values are used to specify the behavior of a node or property
     in the schema.
 
     @see com::sun::star::configuration::backend::NodeAttribute
         During merging the values may be combined with node attributes.
 
-    @since OOo 1.1.2
+    @since OOo 1.1.2  
  */
 published constants SchemaAttribute
-{
-    //-------------------------------------------------------------------------
-
-    /** indicates that a property value can't be null.
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** indicates that a property value can't be null. 
      */
-    const short REQUIRED = 1;
-
-    //-------------------------------------------------------------------------
-
-    /** indicates that the content of the node or the value of the property
+    const short REQUIRED = 1; 
+ 
+    //------------------------------------------------------------------------- 
+          
+    /** indicates that the content of the node or the value of the property 
         may depend on the locale.
      */
-    const short LOCALIZED = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short LOCALIZED = 2; 
+ 
+    //------------------------------------------------------------------------- 
+          
     /** indicates that properties can be added to the node at runtime
      */
-    const short EXTENSIBLE = 4;
-
-    //-------------------------------------------------------------------------
-
+    const short EXTENSIBLE = 4; 
+ 
+    //------------------------------------------------------------------------- 
+          
     /** can be used to mask the schema attributes from merged attributes
      */
-    const short MASK = 255; // 0x00FF
-
-    //-------------------------------------------------------------------------
-};
-
+    const short MASK = 255; // 0x00FF 
+ 
+    //------------------------------------------------------------------------- 
+}; 
+ 
 //=============================================================================
-
-}; }; }; }; };
+ 
+}; }; }; }; }; 
 
 //=============================================================================
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/SchemaSupplier.idl b/offapi/com/sun/star/configuration/backend/SchemaSupplier.idl
index 10b59ddc5c6d..667821899fcb 100644
--- a/offapi/com/sun/star/configuration/backend/SchemaSupplier.idl
+++ b/offapi/com/sun/star/configuration/backend/SchemaSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,32 +29,32 @@
 
 #ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
 #include <com/sun/star/configuration/backend/XSchemaSupplier.idl>
-#endif
+#endif 
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
      provides access to configuration schemas
 */
 service SchemaSupplier
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
      /**
       provides access to configuration schemas.
       */
      interface XSchemaSupplier ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/SingleBackend.idl b/offapi/com/sun/star/configuration/backend/SingleBackend.idl
index 2cf1dc898661..0b6b19b216dd 100644
--- a/offapi/com/sun/star/configuration/backend/SingleBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/SingleBackend.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,73 +29,73 @@
 
 #ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
 #include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
 #include <com/sun/star/configuration/backend/XSchemaSupplier.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XMultiLayerStratum_idl__
 #include <com/sun/star/configuration/backend/XMultiLayerStratum.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
-    is a configuration storage backends containing a complete
-    configuration database, including user data, default or
+    is a configuration storage backends containing a complete 
+    configuration database, including user data, default or 
     policy layers and schemata.
 
-    <p> Configuration data is organized into layers which are selected
-        by components and entities.
+    <p> Configuration data is organized into layers which are selected 
+        by components and entities. 
     </p>
 
-    <p> Components are characterized by configuration schemas.
-        A component contains configuration data for a particular
+    <p> Components are characterized by configuration schemas. 
+        A component contains configuration data for a particular 
         application domain or software module.
     </p>
     <p> Entities are organised hierarchically in organisations,
-        groups, roles and individual users. Each element of the associated
+        groups, roles and individual users. Each element of the associated 
         hierarchy corresponds to a layer that applies to an entity.
     </p>
-    <p> Layers contains data for multiple components
+    <p> Layers contains data for multiple components 
         associated to a single entity.
     <p>
-
+  
     @since OOo 1.1.2
 */
-published service SingleBackend
+published service SingleBackend 
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /**
       provides access to configuration schemas.
       */
     interface XSchemaSupplier ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /**
       provides access to the layer data.
       */
     interface XMultiLayerStratum ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /**
       provides information about supported and special entities.
       */
     interface XBackendEntities ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/SingleBackendAdapter.idl b/offapi/com/sun/star/configuration/backend/SingleBackendAdapter.idl
index 6135f75d9f68..d2cd5b1fd2b0 100644
--- a/offapi/com/sun/star/configuration/backend/SingleBackendAdapter.idl
+++ b/offapi/com/sun/star/configuration/backend/SingleBackendAdapter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,37 +29,37 @@
 
 #ifndef __com_sun_star_configuration_backend_BackendAdapter_idl__
 #include <com/sun/star/configuration/backend/BackendAdapter.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
     implements a simple <type>BackendAdapter</type> that can be used for
     normal configuration operation.
-
+ 
     <p>All real functionality is provided by the wrapped <type>SingleBackend</type>.
 
     @see com::sun::star::configuration::backend::OnlineBackend
-
+     
     @since OOo 1.1.2
 */
 published service SingleBackendAdapter
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** provides access to configuration data from a <type>SingleBackend</type>.
       */
     service BackendAdapter ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/SingleLayerStratum.idl b/offapi/com/sun/star/configuration/backend/SingleLayerStratum.idl
index 8f6a28085c7a..8cf43f94e5b3 100644
--- a/offapi/com/sun/star/configuration/backend/SingleLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/SingleLayerStratum.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,45 +29,45 @@
 
 #ifndef __com_sun_star_configuration_backend_XBackendEntities_idl__
 #include <com/sun/star/configuration/backend/XBackendEntities.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XSingleLayerStratum_idl__
 #include <com/sun/star/configuration/backend/XSingleLayerStratum.idl>
-#endif
+#endif 
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
    Provides access to a single layer of configuration data
 */
 service SingleLayerStratum
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
      /**
       provides access to single layer of configuration data.
       */
     interface XSingleLayerStratum ;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
 
+   
     /**
       provides information about supported and special entities.
       */
     [optional] interface XBackendEntities ;
+  
 
-
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
 #endif
-
+ 
diff --git a/offapi/com/sun/star/configuration/backend/StratumCreationException.idl b/offapi/com/sun/star/configuration/backend/StratumCreationException.idl
index f425118de937..507fc314cff7 100644
--- a/offapi/com/sun/star/configuration/backend/StratumCreationException.idl
+++ b/offapi/com/sun/star/configuration/backend/StratumCreationException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_configuration_backend_StratumCreationException_idl__
-#define __com_sun_star_configuration_backend_StratumCreationException_idl__
-
+#ifndef __com_sun_star_configuration_backend_StratumCreationException_idl__ 
+#define __com_sun_star_configuration_backend_StratumCreationException_idl__ 
+ 
 #ifndef __com_sun_star_configuration_backend_BackendSetupException_idl__
-#include <com/sun/star/configuration/backend/BackendSetupException.idl>
-#endif
-
-//=============================================================================
+#include <com/sun/star/configuration/backend/BackendSetupException.idl> 
+#endif 
+ 
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** is passed to an <type>InteractionHandler<type> when creating a stratum backend fails.
 
     @since OOo 2.0.0
  */
 exception StratumCreationException : BackendSetupException
-{
-    /**
+{ 
+    /** 
         Identifier of the stratum service that could not be created.
     */
     string StratumService;
 
-    /**
+    /** 
         Initialization data passed to the stratum instance.
     */
     string StratumData;
 
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/SystemIntegration.idl b/offapi/com/sun/star/configuration/backend/SystemIntegration.idl
index 5aa281a67ec0..1154bd44025e 100644
--- a/offapi/com/sun/star/configuration/backend/SystemIntegration.idl
+++ b/offapi/com/sun/star/configuration/backend/SystemIntegration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,44 +29,44 @@
 
 #ifndef __com_sun_star_configuration_backend_Backend_idl__
 #include <com/sun/star/configuration/backend/Backend.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
-//=============================================================================
+#endif 
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
-/**
-    provides access to a configuration data composed of one or more
+/** 
+    provides access to a configuration data composed of one or more 
     platform backends containing settings used by software modules.
-
+    
  */
 service SystemIntegration
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
      /**
            provides access to the layer data.
       */
-    interface XBackend ;
-
+    interface XBackend ; 
+   
     /**
        allows initialization of backend data sources
-
-       <p>no parameters need to be passed as backends are initialised
+       
+       <p>no parameters need to be passed as backends are initialised 
           using the service registration database 'services.rdb'.
-       </p>
-
+       </p> 
+        
     */
 
     interface com::sun::star::lang::XInitialization ;
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
-#endif
+} ; } ; } ; } ; } ; 
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/TemplateIdentifier.idl b/offapi/com/sun/star/configuration/backend/TemplateIdentifier.idl
index b0338b771e41..cf549f4f6bf3 100644
--- a/offapi/com/sun/star/configuration/backend/TemplateIdentifier.idl
+++ b/offapi/com/sun/star/configuration/backend/TemplateIdentifier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_configuration_backend_TemplateIdentifier_idl__
+#ifndef __com_sun_star_configuration_backend_TemplateIdentifier_idl__ 
 #define __com_sun_star_configuration_backend_TemplateIdentifier_idl__
-
-
+  
+ 
 //=============================================================================
-
+ 
 module com { module sun { module star { module configuration { module backend {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** holds the data needed to identify a template.
 
-    @since OOo 1.1.2
-
+    @since OOo 1.1.2  
+    
  */
 published struct TemplateIdentifier
 {
     /** specifies the name of the template.
-
+        
         <p>The name is unique within a component.</p>
      */
-    string Name;
-
-    //-------------------------------------------------------------------------
-
+    string Name; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the component where the template originates.
-
+        
      */
-    string Component;
-
-    //-------------------------------------------------------------------------
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-//=============================================================================
-
-#endif
+    string Component; 
+ 
+    //------------------------------------------------------------------------- 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+
+//============================================================================= 
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/UpdatableLayer.idl b/offapi/com/sun/star/configuration/backend/UpdatableLayer.idl
index f74b1f2d5ce8..312280e3665c 100644
--- a/offapi/com/sun/star/configuration/backend/UpdatableLayer.idl
+++ b/offapi/com/sun/star/configuration/backend/UpdatableLayer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,19 +52,19 @@ module com { module sun { module star { module configuration { module backend {
   <p>An updatable layer can be read or replaced with another layer.
   </p>
 
-  @since OOo 1.1.2
+  @since OOo 1.1.2  
   */
 published service UpdatableLayer
 {
     //--------------------------------------------------------------------------
 
     /**
-        handles read access to the contents of the layer.
+        handles read access to the contents of the layer. 
 
-        <p> If the implementation supports
+        <p> If the implementation supports 
          <type scope="com::sun::star::util">XTimeStamped</type>,
          then after executing <member>XUpdatableLayer::replaceWith()</member>
-         the timestamp will be the one for the replaced contents and
+         the timestamp will be the one for the replaced contents and 
          if reading after updates is supported the next read will reproduce the
          replaced data.
         </p>
@@ -74,19 +74,19 @@ published service UpdatableLayer
     //--------------------------------------------------------------------------
 
     /**
-      provides write access to the contents of the layer.
-
-       <p> Depending of the actual type (simple, i.e pure <type>XLayer</type> or
-       composite, i.e <type>XCompositeLayer</type>) of the current layer and
-       the provided replacement layer, the operation performed
+      provides write access to the contents of the layer. 
+      
+       <p> Depending of the actual type (simple, i.e pure <type>XLayer</type> or 
+       composite, i.e <type>XCompositeLayer</type>) of the current layer and 
+       the provided replacement layer, the operation performed 
        by <member>XUpdatableLayer::replaceWith()</member>, will vary.
        </p>
        <p> For the different current/replacement layer combinations, we have:
        <dl>
-           <dt>Simple/Simple<dt>
+           <dt>Simple/Simple<dt> 
            <dd>the provided layer's contents replace the current one's.</dd>
 
-           <dt>Composite/Composite<dt>
+           <dt>Composite/Composite<dt> 
            <dd>all layers (main and sub) present in the
                provided layer are used to replace the corresponding current
                layer contents. Sublayers present in the current layer but
@@ -95,12 +95,12 @@ published service UpdatableLayer
                the current layer.
             </dd>
 
-           <dt>Simple/Composite<dt>
-           <dd>the main layer and sublayers of the provided layer
-               are merged into one whose contents replace the current layer.
+           <dt>Simple/Composite<dt> 
+           <dd>the main layer and sublayers of the provided layer 
+               are merged into one whose contents replace the current layer. 
            </dd>
 
-           <dt>Composite/Simple<dt>
+           <dt>Composite/Simple<dt> 
            <dd>the provided layer is split into a composite one whose contents
                are then used to replace the current layer as described above.
            </dd>
@@ -110,7 +110,7 @@ published service UpdatableLayer
             support conversions of the replacement layer.
             In such a case the sublayers of the provided layer may be ignored
             or all simple data be merged into the main layer.
-       </em>
+       </em> 
        </p>
       */
     interface XUpdatableLayer ;
diff --git a/offapi/com/sun/star/configuration/backend/XBackend.idl b/offapi/com/sun/star/configuration/backend/XBackend.idl
index 5696bff294b3..02a4b4ee750c 100644
--- a/offapi/com/sun/star/configuration/backend/XBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/XBackend.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,23 +29,23 @@
 
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XUpdateHandler_idl__
 #include <com/sun/star/configuration/backend/XUpdateHandler.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XSchema_idl__
 #include <com/sun/star/configuration/backend/XSchema.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
@@ -53,13 +53,13 @@
 
 #ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /**
   Handles access to layered data stored in a repository.
@@ -67,28 +67,28 @@ module com { module sun { module star { module configuration { module backend {
   <p> Data can be retrieved on behalf of one or more entities.</p>
 
   <p> There is an implied owner entity associated to the object
-     when it is created. This entity should be used for normal data access.
-     For administrative operations data of other entities can be accessed.
+     when it is created. This entity should be used for normal data access. 
+     For administrative operations data of other entities can be accessed. 
   </p>
 
   @see com::sun::star::configuration::backend::XBackendEntities
   @see com::sun::star::configuration::backend::XSchemaSupplier
-
+    
   @since OOo 1.1.2
 */
-published interface XBackend : ::com::sun::star::uno::XInterface
+published interface XBackend : ::com::sun::star::uno::XInterface 
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /**
-      retrieves the layers associated to the owner
+    /** 
+      retrieves the layers associated to the owner 
       entity for a component.
 
-      @param aComponent
+      @param aComponent 
                 component whose data will be accessed
 
-      @returns
-                a list of objects allowing access to the
+      @returns   
+                a list of objects allowing access to the 
                 component data for each layer associated to
                 the current entity
 
@@ -97,24 +97,24 @@ published interface XBackend : ::com::sun::star::uno::XInterface
 
       @throws   com::sun::star::configuration::backend::BackendAccessException
                 if an error occurs while accessing the data.
-
+  
       @see com::sun::star::configuration::backend::XBackendEntities::getOwnerEntity()
     */
     sequence<XLayer> listOwnLayers([in] string aComponent)
         raises (BackendAccessException,
                 com::sun::star::lang::IllegalArgumentException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /**
-      creates an update handler for the owner entity
+    /** 
+      creates an update handler for the owner entity 
       layer for a component.
 
-      @param aComponent
+      @param aComponent 
                 component whose data will be updated
 
-      @returns
-                an object allowing manipulation of the
+      @returns   
+                an object allowing manipulation of the 
                 component data for the current entity
 
       @throws   com::sun::star::lang::IllegalArgumentException
@@ -133,20 +133,20 @@ published interface XBackend : ::com::sun::star::uno::XInterface
                 com::sun::star::lang::NoSupportException,
                 com::sun::star::lang::IllegalArgumentException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /**
+    /** 
       retrieves the layers associated to an entity for a component.
 
-      @param aComponent
+      @param aComponent 
                 component whose data will be accessed
 
-      @param aEntity
+      @param aEntity    
                 entity whose data will be accessed
 
-      @returns
-                a list of objects allowing access to the
-                component data for each layer associated
+      @returns   
+                a list of objects allowing access to the 
+                component data for each layer associated 
                 with the entity.
 
       @throws   com::sun::star::lang::IllegalArgumentException
@@ -163,19 +163,19 @@ published interface XBackend : ::com::sun::star::uno::XInterface
         raises (BackendAccessException,
                 com::sun::star::lang::IllegalArgumentException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /**
       creates an update handler on an entity's layer for a component.
 
-      @param aComponent
+      @param aComponent 
                 component whose data will be updated
 
-      @param aEntity
+      @param aEntity    
                 entity whose data will be updated
 
-      @returns
-                an object allowing manipulation of the
+      @returns   
+                an object allowing manipulation of the 
                 component data for the entity
 
       @throws   com::sun::star::lang::IllegalArgumentException
@@ -190,17 +190,17 @@ published interface XBackend : ::com::sun::star::uno::XInterface
 
       @see com::sun::star::configuration::backend::XBackendEntities::supportsEntity()
     */
-    XUpdateHandler getUpdateHandler([in] string aComponent,
+    XUpdateHandler getUpdateHandler([in] string aComponent, 
                                     [in] string aEntity)
         raises (BackendAccessException,
                 com::sun::star::lang::NoSupportException,
                 com::sun::star::lang::IllegalArgumentException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/XBackendChangesListener.idl b/offapi/com/sun/star/configuration/backend/XBackendChangesListener.idl
index 6530e7182fea..aa41d2905450 100644
--- a/offapi/com/sun/star/configuration/backend/XBackendChangesListener.idl
+++ b/offapi/com/sun/star/configuration/backend/XBackendChangesListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,41 +25,41 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_configuration_backend_XBackendChangesListener_idl__
-#define __com_sun_star_configuration_backend_XBackendChangesListener_idl__
+#ifndef __com_sun_star_configuration_backend_XBackendChangesListener_idl__ 
+#define __com_sun_star_configuration_backend_XBackendChangesListener_idl__ 
 
-#ifndef __com_sun_star_configuration_backend_ComponentChangeEvent_idl__
+#ifndef __com_sun_star_configuration_backend_ComponentChangeEvent_idl__ 
 #include <com/sun/star/configuration/backend/ComponentChangeEvent.idl>
 #endif
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-//=============================================================================
-
-module com {  module sun {  module star {  module configuration {  module backend {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module configuration {  module backend {  
+ 
+//============================================================================= 
+ 
 /** receives notification from backend broadcaster objects.
 
-    @see XBackendChangesNotifier
-
+    @see XBackendChangesNotifier 
+    
  */
     interface XBackendChangesListener: ::com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** is invoked when component data in backend source changes
-
+        
         @param Event
              Event indicating the component data change
      */
-    void componentDataChanged( [in] com::sun::star::configuration::backend::ComponentChangeEvent Event );
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    void componentDataChanged( [in] com::sun::star::configuration::backend::ComponentChangeEvent Event ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl b/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl
index ca2861bcf443..82d36983654c 100644
--- a/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl
+++ b/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,57 +24,57 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_configuration_backend_XBackendChangesNotifier_idl__
-#define __com_sun_star_configuration_backend_XBackendChangesNotifier_idl__
-
-#ifndef __com_sun_star_configuration_backend_XBackendChangesListener_idl__
-#include <com/sun/star/configuration/backend/XBackendChangesListener.idl>
+#ifndef __com_sun_star_configuration_backend_XBackendChangesNotifier_idl__ 
+#define __com_sun_star_configuration_backend_XBackendChangesNotifier_idl__ 
+ 
+#ifndef __com_sun_star_configuration_backend_XBackendChangesListener_idl__ 
+#include <com/sun/star/configuration/backend/XBackendChangesListener.idl> 
 #endif
 
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module configuration {  module backend {
-
-//=============================================================================
-
+#endif  
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module configuration {  module backend {  
+ 
+//============================================================================= 
+ 
 /** broadcasts changes when data from backend sources has changed.
 
-    @see XBackendChangesListener
+    @see XBackendChangesListener 
 */
 interface XBackendChangesNotifier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** adds the specified listener to receive events when changes occured.
         @param aListener
             specifies the listener object.
 
         @param component
              The name of the component the listener is monitoring changes for.
-
+     
      */
     [oneway] void addChangesListener( [in] com::sun::star::configuration::backend::XBackendChangesListener aListener,
-                                      [in] string component);
-
-    //-------------------------------------------------------------------------
+                                      [in] string component); 
+ 
+    //------------------------------------------------------------------------- 
     /** removes the specified listener.
         @param aListener
             specifies the listener object.
 
         @param component
              The name of the component the listener is monitoring changes for.
-
+     
      */
     [oneway] void removeChangesListener( [in] com::sun::star::configuration::backend::XBackendChangesListener aListener,
-                                         [in] string component);
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+                                         [in] string component); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/XBackendEntities.idl b/offapi/com/sun/star/configuration/backend/XBackendEntities.idl
index 9829ad993ec3..3855281fb8a9 100644
--- a/offapi/com/sun/star/configuration/backend/XBackendEntities.idl
+++ b/offapi/com/sun/star/configuration/backend/XBackendEntities.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,42 +29,42 @@
 
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
-
-/**
-  Provides functionality relating to common and supported entities
-  for a configuration data backend.
+//============================================================================= 
 
+/** 
+  Provides functionality relating to common and supported entities 
+  for a configuration data backend. 
+ 
   @see com::sun::star::configuration::backend::XBackend
   @see com::sun::star::configuration::backend::XMultiLayerStratum
 
   @since OOo 1.1.2
 */
-published interface XBackendEntities : ::com::sun::star::uno::XInterface
+published interface XBackendEntities : ::com::sun::star::uno::XInterface 
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /**
+    /** 
         provides the entity id of the owner entity of the backend.
 
-        @returns
+        @returns   
             an entity identifier for the owner entity.
-            <p> The owner entity is the default entity for the backend.
-               For normal configuration data access the owner entity
-               should always be used.
+            <p> The owner entity is the default entity for the backend. 
+               For normal configuration data access the owner entity 
+               should always be used. 
             </p>
 
         @see com::sun::star::configuration::backend::XBackend::listOwnLayers()
@@ -72,71 +72,71 @@ published interface XBackendEntities : ::com::sun::star::uno::XInterface
     */
     string getOwnerEntity() ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /**
+    /** 
         provides the entity id of an entity for general administrative access.
 
-        <p> The admin entity is an entity that should be used to
-           read and manage configuration data that applies to all entities
-           within the backend.
+        <p> The admin entity is an entity that should be used to 
+           read and manage configuration data that applies to all entities 
+           within the backend.  
         </p>
 
-        @returns
-            an entity identifier for the admin entity or
-            an empty string, if there is no entity that can be used for
+        @returns   
+            an entity identifier for the admin entity or 
+            an empty string, if there is no entity that can be used for 
             general administrative access.
 
     */
     string getAdminEntity() ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /**
+    /** 
         determines, if a given entity id exists in this backend.
-
-        @param aEntity
-            The name of an entity.
+      
+        @param aEntity    
+            The name of an entity. 
 
         @throws   com::sun::star::configuration::backend::BackendAccessException
                 if an error occurs while accessing the backend.
-
-        @returns
-            <TRUE/>, if aEntity is a valid, existing entity for this backend,
+  
+        @returns 
+            <TRUE/>, if aEntity is a valid, existing entity for this backend, 
             <FALSE/> otherwise.
     */
-    boolean supportsEntity([in] string aEntity)
+    boolean supportsEntity([in] string aEntity) 
         raises( BackendAccessException );
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /**
+    /** 
         determines, if two given entity ids denote the same entity.
 
-        @param aEntity
-            The name of an entity.
+        @param aEntity    
+            The name of an entity. 
 
-        @param aOtherEntity
-            The name of another entity.
+        @param aOtherEntity    
+            The name of another entity. 
 
-        @returns
-            <TRUE/>, if aEntity and aOtherEntity denote the same entity
+        @returns 
+            <TRUE/>, if aEntity and aOtherEntity denote the same entity 
             within this backend, <FALSE/> otherwise.
 
         @throws   com::sun::star::configuration::backend::BackendAccessException
                 if an error occurs while accessing the backend.
-
+  
         @throws   com::sun::star::lang::IllegalArgumentException
             if either entity does not exist.
     */
-    boolean isEqualEntity([in] string aEntity, [in] string aOtherEntity)
+    boolean isEqualEntity([in] string aEntity, [in] string aOtherEntity) 
         raises( BackendAccessException, com::sun::star::lang::IllegalArgumentException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
 } ; } ; } ; } ; } ;
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/XCompositeLayer.idl b/offapi/com/sun/star/configuration/backend/XCompositeLayer.idl
index 74dc11e27820..255f91701da9 100644
--- a/offapi/com/sun/star/configuration/backend/XCompositeLayer.idl
+++ b/offapi/com/sun/star/configuration/backend/XCompositeLayer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 #ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
@@ -55,39 +55,39 @@ module com { module sun { module star { module configuration { module backend {
 //==============================================================================
 
 /**
-  provides read access to layers that contain sublayers accessible through an
+  provides read access to layers that contain sublayers accessible through an 
   additional criterion (for instance the locale they contain data for).
 
     @since OOo 1.1.2
   */
-published interface XCompositeLayer : XLayer
+published interface XCompositeLayer : XLayer 
 {
     //--------------------------------------------------------------------------
-
+    
     /**
       Returns a list of the criteria that can be used to access the
       sublayers.
 
-      @return
+      @return   
             a list supported sublayer identifiers
 
       @throws com::sun::star::lang::WrappedTargetException
             if an error occurs in the retrieval of the data.
       */
-    sequence<string> listSubLayerIds()
+    sequence<string> listSubLayerIds() 
         raises (com::sun::star::lang::WrappedTargetException) ;
-
+    
     //--------------------------------------------------------------------------
-
+    
     /**
       Describes the content of a particular sublayer to
       an <type>XLayerHandler</type>.
 
-      @param aHandler
-            Handler object that will receive calls
+      @param aHandler   
+            Handler object that will receive calls 
             describing the contents of the sublayer.
 
-      @param aSubLayerId
+      @param aSubLayerId    
             Identifier of the sublayer to be read.
             <p> Must be one the identifiers returned by
                 <member>XCompositeLayer::listSubLayerIds()</member>
@@ -103,7 +103,7 @@ published interface XCompositeLayer : XLayer
               if the data read from the layer is rejected as invalid by the
               <type>XLayerHandler</type>.
       */
-    void readSubLayerData([in] XLayerHandler aHandler, [in] string aSubLayerId)
+    void readSubLayerData([in] XLayerHandler aHandler, [in] string aSubLayerId) 
         raises (com::sun::star::lang::NullPointerException,
                 com::sun::star::lang::IllegalArgumentException,
                 com::sun::star::lang::WrappedTargetException,
@@ -115,4 +115,4 @@ published interface XCompositeLayer : XLayer
 //==============================================================================
 
 } ; } ; } ; } ; } ;
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/XLayer.idl b/offapi/com/sun/star/configuration/backend/XLayer.idl
index 89911d869dc8..55ee830f7eda 100644
--- a/offapi/com/sun/star/configuration/backend/XLayer.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,44 +29,44 @@
 
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XLayerHandler_idl__
 #include <com/sun/star/configuration/backend/XLayerHandler.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
-/**
+/** 
   provides read access to the data contained in a layer.
 
     @since OOo 1.1.2
 */
-published interface XLayer : ::com::sun::star::uno::XInterface
+published interface XLayer : ::com::sun::star::uno::XInterface 
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /**
+    /** 
       describes the contents of the layer to an <type>XLayerHandler</type>.
 
-      @param aHandler
-            Handler object that will receive calls
+      @param aHandler   
+            Handler object that will receive calls 
             describing the contents of the layer
 
       @throws com::sun::star::lang::NullPointerException
@@ -77,15 +77,15 @@ published interface XLayer : ::com::sun::star::uno::XInterface
               if the data read from the layer is rejected as invalid by the
               <type>XLayerHandler</type>.
     */
-    void readData([in] XLayerHandler aHandler)
+    void readData([in] XLayerHandler aHandler) 
         raises (com::sun::star::lang::NullPointerException,
                 com::sun::star::lang::WrappedTargetException,
                 MalformedDataException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
-#endif
+} ; } ; } ; } ; } ; 
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/XLayerContentDescriber.idl b/offapi/com/sun/star/configuration/backend/XLayerContentDescriber.idl
index d8718f361c1a..f477d41a533b 100644
--- a/offapi/com/sun/star/configuration/backend/XLayerContentDescriber.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayerContentDescriber.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,51 +27,51 @@
 #ifndef __com_sun_star_configuration_backend_XLayerContentDescriber_idl__
 #define __com_sun_star_configuration_backend_XLayerContentDescriber_idl__
 
-#ifndef __com_sun_star_configuration_backend_PropertyInfo_idl__
+#ifndef __com_sun_star_configuration_backend_PropertyInfo_idl__ 
 #include <com/sun/star/configuration/backend/PropertyInfo.idl>
 #endif
 
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XLayerHandler_idl__
 #include <com/sun/star/configuration/backend/XLayerHandler.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
-/**
+/** 
    describe the contents of a layer to an XLayerHander object. The contents of
    the layer is contained in the sequence of PropertyInfo structures
    @see PropertyInfo
-
+     
 */
-interface XLayerContentDescriber : ::com::sun::star::uno::XInterface
+interface XLayerContentDescriber : ::com::sun::star::uno::XInterface 
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /**
+    /** 
       describes the contents of the layer to an <type>XLayerHandler</type>.
 
-      @param aHandler
-            Handler object that will receive calls
+      @param aHandler   
+            Handler object that will receive calls 
             describing the contents of the layer
 
       @param aPropertyInfos
-             sequence of PropertyInfo structs contained
+             sequence of PropertyInfo structs contained 
              all required property information
 
       @throws com::sun::star::lang::NullPointerException
@@ -81,15 +81,15 @@ interface XLayerContentDescriber : ::com::sun::star::uno::XInterface
               <type>XLayerHandler</type>.
     */
     void describeLayer([in] XLayerHandler aHandler,
-                       [in] sequence<PropertyInfo> aPropertyInfos)
+                       [in] sequence<PropertyInfo> aPropertyInfos) 
         raises (com::sun::star::lang::NullPointerException,
                 com::sun::star::lang::WrappedTargetException,
                 MalformedDataException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 #endif
diff --git a/offapi/com/sun/star/configuration/backend/XLayerHandler.idl b/offapi/com/sun/star/configuration/backend/XLayerHandler.idl
index 22b75c9466dc..c2579b272efa 100644
--- a/offapi/com/sun/star/configuration/backend/XLayerHandler.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayerHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_configuration_backend_XLayerHandler_idl__
+#ifndef __com_sun_star_configuration_backend_XLayerHandler_idl__ 
 #define __com_sun_star_configuration_backend_XLayerHandler_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_TemplateIdentifier_idl__
-#include <com/sun/star/configuration/backend/TemplateIdentifier.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
-#include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+
+#ifndef __com_sun_star_configuration_backend_TemplateIdentifier_idl__ 
+#include <com/sun/star/configuration/backend/TemplateIdentifier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__ 
+#include <com/sun/star/configuration/backend/MalformedDataException.idl> 
+#endif 
+
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
 
 //=============================================================================
-
+ 
 module com { module sun { module star { module configuration { module backend {
-
-//=============================================================================
-
-/** receives a description of a configuration layer
+ 
+//============================================================================= 
+ 
+/** receives a description of a configuration layer 
     as a sequence of events.
 
     @since OOo 1.1.2
  */
 published interface XLayerHandler: ::com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a layer description is started
         for a component.
 
@@ -72,11 +72,11 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
         @throws com::sun::star::lang::WrappedTargetException
             if an error occurs processing the event.
      */
-    void startLayer(  )
+    void startLayer(  ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a layer description is complete.
 
         <p> Must match a previous call to <member>XLayerHandler::startLayer()</member>.
@@ -86,7 +86,7 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
             <ul>
             <li>if invalid data is detected in the layer</li>
             <li>if there is a unfinished subnode in progress</li>
-            <li>if no layer is started at all</li>
+            <li>if no layer is started at all</li>	
             <li>if the layer tries to override read-only or final data</li>
             </ul>
             <p><em>Not every implementation can detect each condition</em></p>
@@ -94,15 +94,15 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
         @throws com::sun::star::lang::WrappedTargetException
             if an error occurs processing the event.
      */
-    void endLayer(  )
+    void endLayer(  ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a description of a node override is started.
 
-        <p> Subsequent calls describe overrides to properties and members
-            or items of the node until a matching call to
+        <p> Subsequent calls describe overrides to properties and members 
+            or items of the node until a matching call to 
             <member>XLayerHandler::endNode()</member>is encountered.
         </p>
 
@@ -112,15 +112,15 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
         @param aAttributes
             specifies attribute values to be applied to the node.
 
-            <p> The value is a combination of
+            <p> The value is a combination of 
                 <type>NodeAttribute</type> flags.
             </p>
-            <p> The attributes are combined cumulatively with those
+            <p>	The attributes are combined cumulatively with those 
                 set on lower layers.
             </p>
 
         @param bClear
-            if <TRUE/>, specifies that the node should be cleared to an empty
+            if <TRUE/>, specifies that the node should be cleared to an empty 
             state by removing all non-mandatory children from lower layers prior
             to applying the overrides.
 
@@ -141,23 +141,23 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
         @see com::sun::star::configuration::backend::NodeAttribute
      */
     void overrideNode( [in] string aName,
-                       [in] short  aAttributes,
-                       [in] boolean bClear )
+                       [in] short  aAttributes, 
+                       [in] boolean bClear ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a new item is started.
 
-        <p> The current node must be a set and
+        <p> The current node must be a set and 
             a preexisting item (if any) must be removeable.
         </p>
         <p> The new item will be created from the default template
             of the set.
         </p>
         <p> Subsequent calls describe the difference from the template
-            of properties and members or items of the node until
-            a matching call to <member>XLayerHandler::endNode()</member>
+            of properties and members or items of the node until 
+            a matching call to <member>XLayerHandler::endNode()</member> 
             is encountered.
         </p>
 
@@ -167,7 +167,7 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
         @param aAttributes
             specifies attribute values to be applied to the new node.
 
-            <p> The value is a combination of
+            <p> The value is a combination of 
                 <type>NodeAttribute</type> flags.  Note that
                 <member>NodeAttribute::FUSE</member> has an impact on the
                 semantics of this method.
@@ -179,7 +179,7 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
             <li>if there already was a change to a node of that name</li>
             <li>if the template for the new node is not found</li>
             <li>if an item of that name on a lower layer is not removeable</li>
-            <li>if the name is not a valid item name</li>
+            <li>if the name is not a valid item name</li> 
             <li>if the attributes are not valid for the node</li>
             </ul>
             <p><em>Not every implementation can detect each condition</em></p>
@@ -189,21 +189,21 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::NodeAttribute
      */
-    void addOrReplaceNode(  [in] string aName,
-                            [in] short  aAttributes )
+    void addOrReplaceNode(	[in] string aName,
+                            [in] short  aAttributes ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
-    /** receives notification that a new item based on a particular template
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
+    /** receives notification that a new item based on a particular template 
         is started.
 
-        <p> The current node must be a set and
+        <p> The current node must be a set and 
             a preexisting item (if any) must be removeable.
         </p>
         <p> Subsequent calls describe the difference from the template
-            of properties and members or items of the node until
-            a matching call to <member>XLayerHandler::endNode()</member>
+            of properties and members or items of the node until 
+            a matching call to <member>XLayerHandler::endNode()</member> 
             is encountered.
         </p>
 
@@ -216,7 +216,7 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
         @param aAttributes
             specifies attribute values to be applied to the new node.
 
-            <p> The value is a combination of
+            <p> The value is a combination of 
                 <type>NodeAttribute</type> flags.  Note that
                 <member>NodeAttribute::FUSE</member> has an impact on the
                 semantics of this method.
@@ -239,17 +239,17 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::NodeAttribute
      */
-    void addOrReplaceNodeFromTemplate(  [in] string aName,
+    void addOrReplaceNodeFromTemplate(	[in] string aName,
                                         [in] TemplateIdentifier aTemplate,
-                                        [in] short  aAttributes )
+                                        [in] short  aAttributes ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a node description is complete.
 
-        <p> Must match the last open call to
-            <member>XLayerHandler::overrideNode()</member>,
+        <p> Must match the last open call to 
+            <member>XLayerHandler::overrideNode()</member>, 
             <member>XLayerHandler::addOrReplaceNode()</member> or
             <member>XLayerHandler::addOrReplaceNodeFromTemplate()</member>.
         </p>
@@ -257,21 +257,21 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
         @throws com::sun::star::configuration::backend::MalformedDataException
             <ul>
             <li>if invalid data is detected in the node</li>
-            <li>if no node is started at all</li>
+            <li>if no node is started at all</li>	
             </ul>
             <p><em>Not every implementation can detect each condition</em></p>
 
         @throws com::sun::star::lang::WrappedTargetException
             if an error occurs processing the event.
      */
-    void endNode(  )
+    void endNode(  ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
+    /** receives notification that a node is dropped from a set. 
 
-    /** receives notification that a node is dropped from a set.
-
-        <p> The current node must be a set and
+        <p> The current node must be a set and 
             the item must be removeable.
         </p>
 
@@ -291,15 +291,15 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
         @throws com::sun::star::lang::WrappedTargetException
             if an error occurs processing the event.
      */
-    void dropNode( [in] string aName )
+    void dropNode( [in] string aName ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that an existing property is modified.
 
-        <p> Subsequent calls describe new value(s) for the property until a
-            matching call to <member>XLayerHandler::endProperty()</member>
+        <p> Subsequent calls describe new value(s) for the property until a 
+            matching call to <member>XLayerHandler::endProperty()</member> 
             is encountered.
         </p>
 
@@ -309,38 +309,38 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
         @param aAttributes
             specifies the new attributes of the property.
 
-            <p> The value is a combination of
+            <p> The value is a combination of 
                 <type>NodeAttribute</type> flags.
             </p>
-            <p> The attributes are combined cumulatively with those
+            <p>	The attributes are combined cumulatively with those 
                 set on lower layers.
             </p>
 
         @param aType
             specifies the type of the property.
 
-            <p> This must be the same type as is already defined in the schema
+            <p> This must be the same type as is already defined in the schema 
                 or lower layers, unless the previous type was unspecified
-                (as indicated by
+                (as indicated by 
                 <const scope="com::sun::star::uno">TypeClass::ANY</const>.)
             </p>
-            <p> A <void/> type indicates that the type is unspecified
-                in this layer.
-                In this case any subsequent value may be of a generic type
-                (e.g. <atom>string</atom> or - for list values -
-                <atom dim="[]">string</atom>.) Such values may be
-                converted to the type defined in the schema by
+            <p> A <void/> type indicates that the type is unspecified 
+                in this layer. 
+                In this case any subsequent value may be of a generic type 
+                (e.g. <atom>string</atom> or - for list values - 
+                <atom dim="[]">string</atom>.) Such values may be 
+                converted to the type defined in the schema by 
                 the implementation.
             </p>
 
         @param bClear
-            if <TRUE/>, specifies that the property should be cleared to an empty
+            if <TRUE/>, specifies that the property should be cleared to an empty 
             state by discarding all values from lower layers prior
-            to applying the overrides.
+            to applying the overrides. 
 
         @throws com::sun::star::configuration::backend::MalformedDataException
             <ul>
-            <li>if there isn't a group or extensible node in progress currently</li>
+            <li>if there isn't a group or extensible node in progress currently</li> 
             <li>if there already was a change to a property of that name</li>
             <li>if there is no property with that name</li>
             <li>if the property is read-only</li>
@@ -356,27 +356,27 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::NodeAttribute
      */
-    void overrideProperty(  [in] string aName,
-                             [in] short aAttributes,
-                            [in] type aType,
-                            [in] boolean bClear )
+    void overrideProperty(  [in] string aName, 
+                             [in] short aAttributes, 
+                            [in] type aType, 
+                            [in] boolean bClear ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-    /** receives notification that the value of the current property
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** receives notification that the value of the current property 
         is overridden. .
 
         @param aValue
             specifies the new value of the property.
 
-            <p> The value must match the type of the current property.
-                If the property does not have the
+            <p> The value must match the type of the current property. 
+                If the property does not have the 
                 <const>SchemaAttribute::REQUIRED</const> flag set,
                 the value can be <void/>.
             </p>
-            <p> If the current property is localized, this value applies
+            <p> If the current property is localized, this value applies 
                 to the default locale.
             </p>
 
@@ -384,7 +384,7 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
             <ul>
             <li>if there isn't a property in progress currently</li>
             <li>if there already was a change to the value of that property</li>
-            <li>if the value does not have the proper type</li>
+            <li>if the value does not have the proper type</li> 
             <li>if the value is not valid for the property</li>
             </ul>
             <p><em>Not every implementation can detect each condition</em></p>
@@ -394,20 +394,20 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::NodeAttribute
      */
-    void setPropertyValue(  [in] any aValue )
+    void setPropertyValue(	[in] any aValue ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-    /** receives notification that the value of the current localized property
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** receives notification that the value of the current localized property 
         is overridden for a specific locale .
 
         @param aValue
             specifies the new value of the property.
 
-            <p> The value must match the type of the current property.
-                If the property does not have the
+            <p> The value must match the type of the current property. 
+                If the property does not have the 
                 <const>SchemaAttribute::REQUIRED</const> flag set,
                 the value can be <void/>.
             </p>
@@ -431,36 +431,36 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::NodeAttribute
      */
-    void setPropertyValueForLocale([in] any aValue,
-                                         [in] string aLocale )
+    void setPropertyValueForLocale([in] any aValue, 
+                                         [in] string aLocale ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a property description is complete.
 
-        <p> Must match an open call to
-            <member>XLayerHandler::overrideProperty()</member>,
+        <p> Must match an open call to 
+            <member>XLayerHandler::overrideProperty()</member>, 
         </p>
 
         @throws com::sun::star::configuration::backend::MalformedDataException
             <ul>
             <li>if invalid data is detected in the property</li>
-            <li>if no property is started at all</li>
+            <li>if no property is started at all</li>	
             </ul>
             <p><em>Not every implementation can detect each condition</em></p>
 
         @throws com::sun::star::lang::WrappedTargetException
             if an error occurs processing the event.
      */
-    void endProperty(  )
+    void endProperty(  ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
-    /** receives notification that a property having a <void/> value is added
-        to the current node.
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
+    /** receives notification that a property having a <void/> value is added 
+        to the current node. 
 
         <p> The current node must be extensible.
         </p>
@@ -471,12 +471,12 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
         @param aAttributes
             specifies the attributes of the new property.
 
-            <p> The value is a combination of
-                <type>NodeAttribute</type> flags and may also contain the
+            <p> The value is a combination of 
+                <type>NodeAttribute</type> flags and may also contain the 
                 <const>SchemaAttribute::REQUIRED</const> flag.
             </p>
-            <p> <const>NodeAttribute::MANDATORY</const> need not be set,
-                as dynamically added properties always are mandatory
+            <p>	<const>NodeAttribute::MANDATORY</const> need not be set, 
+                as dynamically added properties always are mandatory 
                 in subsequent layers.
             </p>
 
@@ -498,16 +498,16 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::SchemaAttribute
      */
-    void addProperty(   [in] string aName,
-                         [in] short aAttributes,
-                        [in] type aType )
+    void addProperty(   [in] string aName, 
+                         [in] short aAttributes, 
+                        [in] type aType ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-    /** receives notification that a property having a non-<void/> value
-        is added to the current node.
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** receives notification that a property having a non-<void/> value 
+        is added to the current node. 
 
         <p> The current node must be extensible.
         </p>
@@ -518,20 +518,20 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
         @param aAttributes
             specifies the attributes of the new property.
 
-            <p> The value is a combination of
-                <type>NodeAttribute</type> flags and may also contain the
+            <p> The value is a combination of 
+                <type>NodeAttribute</type> flags and may also contain the 
                 <const>SchemaAttribute::REQUIRED</const> flag.
             </p>
             </p>
-            <p> <const>NodeAttribute::MANDATORY</const> need not be set,
-                as dynamic properties always are mandatory
+            <p>	<const>NodeAttribute::MANDATORY</const> need not be set, 
+                as dynamic properties always are mandatory 
                 in subsequent layers.
             </p>
 
         @param aValue
             specifies the value of the new property.
 
-            <p> The value also determines the type.
+            <p> The value also determines the type. 
                 Therefore the value must not be <void/>.
             </p>
 
@@ -552,19 +552,19 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::SchemaAttribute
      */
-    void addPropertyWithValue(  [in] string aName,
-                                 [in] short aAttributes,
-                                [in] any aValue )
+    void addPropertyWithValue(  [in] string aName, 
+                                 [in] short aAttributes, 
+                                [in] any aValue ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-//=============================================================================
-
-#endif
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+
+//============================================================================= 
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/XLayerImporter.idl b/offapi/com/sun/star/configuration/backend/XLayerImporter.idl
index ee0d686dd640..9a47b0e8dab1 100644
--- a/offapi/com/sun/star/configuration/backend/XLayerImporter.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayerImporter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,19 +29,19 @@
 
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XBackend_idl__
 #include <com/sun/star/configuration/backend/XBackend.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
 #endif
@@ -52,19 +52,19 @@
 #include <com/sun/star/lang/WrappedTargetException.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
 /** allows importing a layer into a <type>Backend</type>
-
+  
   @since OOo 1.1.2
 */
-published interface XLayerImporter : ::com::sun::star::uno::XInterface
+published interface XLayerImporter : ::com::sun::star::uno::XInterface 
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** gets the target backend for importing.
 
@@ -75,7 +75,7 @@ published interface XLayerImporter : ::com::sun::star::uno::XInterface
     */
     XBackend getTargetBackend();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** sets the target backend for importing.
 
@@ -89,7 +89,7 @@ published interface XLayerImporter : ::com::sun::star::uno::XInterface
     void setTargetBackend([in] XBackend aBackend)
         raises (com::sun::star::lang::NullPointerException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** Imports the layer given into the backend.
 
@@ -103,9 +103,9 @@ published interface XLayerImporter : ::com::sun::star::uno::XInterface
 
         @throws com::sun::star::configuration::backend::MalformedDataException
             if the layer passed is invalid
-
+        
         @throws com::sun::star::lang::IllegalArgumentException
-            if the layer passed is for a component
+            if the layer passed is for a component 
             that doesn't exist in the backend
 
         @throws com::sun::star::lang::WrappedTargetException
@@ -119,7 +119,7 @@ published interface XLayerImporter : ::com::sun::star::uno::XInterface
                 com::sun::star::lang::NullPointerException,
                 com::sun::star::lang::WrappedTargetException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** Imports the layer given into the backend for a given entity.
 
@@ -136,9 +136,9 @@ published interface XLayerImporter : ::com::sun::star::uno::XInterface
 
         @throws com::sun::star::configuration::backend::MalformedDataException
             if the layer passed is invalid
-
+        
         @throws com::sun::star::lang::IllegalArgumentException
-            if the layer passed is for a component
+            if the layer passed is for a component 
             that doesn't exist in the backend
             or if the entity doesn't exist in the backend.
 
@@ -153,11 +153,11 @@ published interface XLayerImporter : ::com::sun::star::uno::XInterface
                 com::sun::star::lang::NullPointerException,
                 com::sun::star::lang::WrappedTargetException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/XMultiLayerStratum.idl b/offapi/com/sun/star/configuration/backend/XMultiLayerStratum.idl
index 0f28433a24f6..a83ddfcf07c7 100644
--- a/offapi/com/sun/star/configuration/backend/XMultiLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/XMultiLayerStratum.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,11 +29,11 @@
 
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XUpdatableLayer_idl__
 #include <com/sun/star/configuration/backend/XUpdatableLayer.idl>
@@ -45,23 +45,23 @@
 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
-/**
-  Handles access to a stratum consisting of multiple layers
+/** 
+  Handles access to a stratum consisting of multiple layers 
   in a single configuration data repository
-
-  <p> The interface provides access to data for multiple entities and
+ 
+  <p> The interface provides access to data for multiple entities and 
      timestamp-checking capabilities for efficient caching.
   </p>
 
@@ -72,33 +72,33 @@ module com { module sun { module star { module configuration { module backend {
 
   @since OOo 1.1.2
 */
-published interface XMultiLayerStratum : ::com::sun::star::uno::XInterface
+published interface XMultiLayerStratum : ::com::sun::star::uno::XInterface 
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /**
+    /** 
       identifies the layers within this stratum which should be read and
       merged to determine data of a component for an entity
+     
 
-
-      @param aComponent
+      @param aComponent 
                 The name of the component to access.
 
-      @param aEntity
-                The name of an entity on behalf of which data will be accessed.
+      @param aEntity    
+                The name of an entity on behalf of which data will be accessed. 
 
-      @return
+      @return   
                 a list of layer identifiers that can be used to
                 retrieve <type>Layer</type> objects.
-                <p> The list ist ordered by priority. Typically
-                   the most general layers (global defaults,
-                   entire organization) are first, more specific layers
-                   (associated to specific groups or roles) are next
+                <p> The list ist ordered by priority. Typically 
+                   the most general layers (global defaults, 
+                   entire organization) are first, more specific layers 
+                   (associated to specific groups or roles) are next 
                    and the entity's own data is last.
                 </p>
 
       @throws   com::sun::star::lang::IllegalArgumentException
-                if the component identifier is invalid or
+                if the component identifier is invalid or 
                 if the entity doesn't exist.
 
       @throws   com::sun::star::configuration::backend::BackendAccessException
@@ -109,29 +109,29 @@ published interface XMultiLayerStratum : ::com::sun::star::uno::XInterface
       @see com::sun::star::configuration::backend::XMultiLayerStratum::getMultipleLayers()
       @see com::sun::star::configuration::backend::XBackendEntities
     */
-    sequence<string> listLayerIds([in] string aComponent,
-                                  [in] string aEntity)
+    sequence<string> listLayerIds([in] string aComponent, 
+                                  [in] string aEntity) 
         raises (BackendAccessException,
                 com::sun::star::lang::IllegalArgumentException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /**
-      identifies the layer which should be modified
+    /** 
+      identifies the layer which should be modified 
       to update data of a component on behalf of an entity.
 
-      <p> The layer id returned is one of the layer ids obtained from
-         <member>XMultiLayerStratum::listLayerIds()</member> for the same
-         component and entity.
+      <p> The layer id returned is one of the layer ids obtained from 
+         <member>XMultiLayerStratum::listLayerIds()</member> for the same 
+         component and entity. 
       </p>
 
-      @param aComponent
+      @param aComponent 
                 The name of the component to access.
 
-      @param aEntity
-                The name of an entity on behalf of which data will be accessed.
+      @param aEntity    
+                The name of an entity on behalf of which data will be accessed.  
 
-      @returns
+      @returns   
                 a layer identifier that can be used to obtain
                 an <type>UpdatableLayer</type> object.
 
@@ -154,92 +154,92 @@ published interface XMultiLayerStratum : ::com::sun::star::uno::XInterface
                 com::sun::star::lang::NoSupportException,
                 com::sun::star::lang::IllegalArgumentException) ;
 
-    //-------------------------------------------------------------------------
-
-    /**
-      retrieves a layer associated to a layer id, if newer than indicated.
+    //------------------------------------------------------------------------- 
 
-      <p> A timestamp can be provided, which is used to indicate
-         a point in time. The layer should be returned only if is modified
-         since that time.
+    /** 
+      retrieves a layer associated to a layer id, if newer than indicated. 
+      
+      <p> A timestamp can be provided, which is used to indicate 
+         a point in time. The layer should be returned only if is modified 
+         since that time. 
       </p>
 
-      @param aLayerId
+      @param aLayerId      
                 identifier of the layers to be accessed.
-                <p>Layer ids can be obtained from
-                <member>XMultiLayerStratum::listLayerIds()</member> or
-                <member>XMultiLayerStratum::getUpdateLayerId()</member>.
+                <p>Layer ids can be obtained from 
+                <member>XMultiLayerStratum::listLayerIds()</member> or  
+                <member>XMultiLayerStratum::getUpdateLayerId()</member>. 
                 </p>
 
-      @param aTimestamp
+      @param aTimestamp    
                 a timestamp for the layer.
-
-                <p> An empty timestamp indicates, that the layer should be
-                   retrieved irrespective of its modification time.
+                
+                <p> An empty timestamp indicates, that the layer should be 
+                   retrieved irrespective of its modification time. 
                 </p>
-                <p> The format and meaning of a timestamp depends on
-                    the implementation. Timestamps can be obtained using
+                <p> The format and meaning of a timestamp depends on 
+                    the implementation. Timestamps can be obtained using 
                     <member scope="com::sun::star::util">XTimeStamped::getTimestamp()</member>.
                 </p>
 
-      @returns
-                a <type>Layer</type> object providing access to the layer data,
-                <NULL/> if the layer is newer than indicated by the timestamp.
+      @returns   
+                a <type>Layer</type> object providing access to the layer data, 
+                <NULL/> if the layer is newer than indicated by the timestamp. 
 
       @throws   com::sun::star::lang::IllegalArgumentException
-                if the layer id is invalid or
-                if the timestamp is invalid
+                if the layer id is invalid or 
+                if the timestamp is invalid 
 
       @throws   com::sun::star::configuration::backend::BackendAccessException
                 if an error occurs while accessing the data.
 
       @see com::sun::star::util::XTimeStamped
     */
-    XLayer getLayer([in] string aLayerId,
+    XLayer getLayer([in] string aLayerId, 
                     [in] string aTimestamp)
         raises (BackendAccessException,
                 com::sun::star::lang::IllegalArgumentException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /**
-      retrieves the layers associated to a series of layer ids,
-      if newer than indicated.
-      <p> A timestamp can be provided, which is used to indicate
-         a point in time. Only layers that are modified since that time
-         should be returned. The same timestamp is used for all layers.
+    /** 
+      retrieves the layers associated to a series of layer ids, 
+      if newer than indicated.   
+      <p> A timestamp can be provided, which is used to indicate 
+         a point in time. Only layers that are modified since that time 
+         should be returned. The same timestamp is used for all layers. 
       </p>
 
-      @param aLayerIds
+      @param aLayerIds      
                 identifiers of the layers to be accessed.
-                <p>Layer ids can be obtained from
-                <member>XMultiLayerStratum::listLayerIds()</member>.
+                <p>Layer ids can be obtained from 
+                <member>XMultiLayerStratum::listLayerIds()</member>. 
                 </p>
 
-      @param aTimestamp
-                a timestamp for all of the layers.
-                <p> An empty timestamp indicates, that the layers should be
-                   retrieved irrespective of their modification time.
+      @param aTimestamp    
+                a timestamp for all of the layers.               
+                <p> An empty timestamp indicates, that the layers should be 
+                   retrieved irrespective of their modification time. 
                 </p>
-                <p> The format and meaning of a timestamp depends on
-                    the implementation. Timestamps can be obtained using
+                <p> The format and meaning of a timestamp depends on 
+                    the implementation. Timestamps can be obtained using 
                     <member scope="com::sun::star::util">XTimeStamped::getTimestamp()</member>.
                 </p>
 
-      @returns
-                a list of <type>Layer</type> objects
-                providing access to the layer data.
-                <p> The list has the same length as aLayerIds. Each layer
-                   object is associated to the layer id in the corresponding
+      @returns   
+                a list of <type>Layer</type> objects 
+                providing access to the layer data.                
+                <p> The list has the same length as aLayerIds. Each layer 
+                   object is associated to the layer id in the corresponding 
                    position.
                 </p>
-                <p> For layers that are newer than indicated by the
+                <p> For layers that are newer than indicated by the 
                    timestamp, the list contains a <NULL/> element.
                 </p>
 
       @throws   com::sun::star::lang::IllegalArgumentException
-                if one of the layer ids is invalid or
-                if the timestamp is invalid
+                if one of the layer ids is invalid or 
+                if the timestamp is invalid 
 
       @throws   com::sun::star::configuration::backend::BackendAccessException
                 if an error occurs while accessing the data.
@@ -251,41 +251,41 @@ published interface XMultiLayerStratum : ::com::sun::star::uno::XInterface
         raises (BackendAccessException,
                 com::sun::star::lang::IllegalArgumentException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /**
-      retrieves the layers associated to a series of layer ids,
-      if newer than indicated for each layer.
-      <p> For each layer an individual timestamp can be provided,
-         which is used to indicate the last known version of the layer.
+      retrieves the layers associated to a series of layer ids, 
+      if newer than indicated for each layer.      
+      <p> For each layer an individual timestamp can be provided, 
+         which is used to indicate the last known version of the layer. 
          Only layers that are modified since that time should be returned.
       </p>
 
-      @param aLayerIds
-                identifiers of the layers to be accessed.
-                <p>Layer ids can be obtained from
-                <member>XMultiLayerStratum::listLayerIds()</member>.
+      @param aLayerIds      
+                identifiers of the layers to be accessed.               
+                <p>Layer ids can be obtained from 
+                <member>XMultiLayerStratum::listLayerIds()</member>. 
                 </p>
 
-      @param aTimestamps
+      @param aTimestamps    
                 timestamps for each of the layers.
-
-                <p> This list must have the same length as aLayerIds.
-                    Timestamps are matched to layer ids by their position.
+                
+                <p> This list must have the same length as aLayerIds. 
+                    Timestamps are matched to layer ids by their position. 
                 </p>
-                <p> An empty timestamp indicates, that the associated layer
+                <p> An empty timestamp indicates, that the associated layer 
                    should be retrieved irrespective of its modification time.
                 </p>
-                <p> The format and meaning of a timestamp depends on
-                    the implementation. Timestamps can be obtained using
+                <p> The format and meaning of a timestamp depends on 
+                    the implementation. Timestamps can be obtained using 
                     <member scope="com::sun::star::util">XTimeStamped::getTimestamp()</member>.
                 </p>
 
-      @returns
-                a list of <type>Layer</type> objects
-                providing access to the layer data.
-                <p> The list has the same length as aLayerIds. Each layer
-                   object is associated to the layer id in the corresponding
+      @returns   
+                a list of <type>Layer</type> objects 
+                providing access to the layer data.                
+                <p> The list has the same length as aLayerIds. Each layer 
+                   object is associated to the layer id in the corresponding 
                    position.
                 </p>
                 <p> For layers that are newer than indicated by the corresponding
@@ -293,8 +293,8 @@ published interface XMultiLayerStratum : ::com::sun::star::uno::XInterface
                 </p>
 
       @throws   com::sun::star::lang::IllegalArgumentException
-                if one of the layer ids is invalid or
-                if one of the timestamps is invalid or
+                if one of the layer ids is invalid or 
+                if one of the timestamps is invalid or 
                 if the lengths of the arguments don't match.
 
       @throws   com::sun::star::configuration::backend::BackendAccessException
@@ -307,20 +307,20 @@ published interface XMultiLayerStratum : ::com::sun::star::uno::XInterface
         raises (BackendAccessException,
                 com::sun::star::lang::IllegalArgumentException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /**
-      retrieves a writable representation of the layer
-      associated to a layer id.
+      retrieves a writable representation of the layer 
+      associated to a layer id. 
 
-      @param aLayerId
-                identifier of the layer to be accessed for writing.
-                <p>A layer id for writing can be obtained from
-                <member>XMultiLayerStratum::getUpdateLayerId()</member>.
+      @param aLayerId   
+                identifier of the layer to be accessed for writing.             
+                <p>A layer id for writing can be obtained from 
+                <member>XMultiLayerStratum::getUpdateLayerId()</member>. 
                 </p>
 
-      @return
-                an <type>UpdatableLayer</type> object providing
+      @return   
+                an <type>UpdatableLayer</type> object providing 
                 write access to the layer
 
       @throws   com::sun::star::lang::IllegalArgumentException
@@ -336,12 +336,12 @@ published interface XMultiLayerStratum : ::com::sun::star::uno::XInterface
         raises (BackendAccessException,
                 com::sun::star::lang::NoSupportException,
                 com::sun::star::lang::IllegalArgumentException) ;
-
-    //-------------------------------------------------------------------------
+    
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
 } ; } ; } ; } ; } ;
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/XSchema.idl b/offapi/com/sun/star/configuration/backend/XSchema.idl
index 6f761216fd39..440d4b027876 100644
--- a/offapi/com/sun/star/configuration/backend/XSchema.idl
+++ b/offapi/com/sun/star/configuration/backend/XSchema.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,46 +29,46 @@
 
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XSchemaHandler_idl__
 #include <com/sun/star/configuration/backend/XSchemaHandler.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
-/**
+/** 
   Handles access to the elements of a component schema,
   i.e its templates and its component definition.
 
     @since OOo 1.1.2
 */
-published interface XSchema : ::com::sun::star::uno::XInterface
+published interface XSchema : ::com::sun::star::uno::XInterface 
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /**
-      Describes the full schema (templates + component) to a
+    /** 
+      Describes the full schema (templates + component) to a 
       <type>XSchemaHandler</type>.
 
-      @param aHandler
-            schema handler that will receive calls
+      @param aHandler   
+            schema handler that will receive calls 
             describing the contents of the templates
             and the component definition
 
@@ -77,7 +77,7 @@ published interface XSchema : ::com::sun::star::uno::XInterface
       @throws com::sun::star::lang::WrappedTargetException
               if an error occurs in the access to or processing of the data or
               if a subsequent call to any of the <type>XSchema</type>methods is made.
-              The elements of a component schema are only parsed once,a repeat call
+              The elements of a component schema are only parsed once,a repeat call 
               leads to exception.
       @throws com::sun::star::configuration::backend::MalformedDataException
               if the data read from the layer is rejected as invalid by the
@@ -88,13 +88,13 @@ published interface XSchema : ::com::sun::star::uno::XInterface
                 com::sun::star::lang::WrappedTargetException,
                 MalformedDataException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /**
       Describes only the component definition to a <type>XSchemaHandler</type>.
 
-      @param aHandler
-            schema handler that will receive calls
+      @param aHandler   
+            schema handler that will receive calls 
             describing the contents of the component
             definition
 
@@ -103,7 +103,7 @@ published interface XSchema : ::com::sun::star::uno::XInterface
       @throws com::sun::star::lang::WrappedTargetException
               if an error occurs in the access to or processing of the data or
               if a subsequent call to any of the <type>XSchema</type>methods is made.
-              The elements of a component schema are only parsed once,a repeat call
+              The elements of a component schema are only parsed once,a repeat call 
               leads to exception.
       @throws com::sun::star::configuration::backend::MalformedDataException
               if the data read from the layer is rejected as invalid by the
@@ -114,13 +114,13 @@ published interface XSchema : ::com::sun::star::uno::XInterface
                 com::sun::star::lang::WrappedTargetException,
                 MalformedDataException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /**
+    /** 
       Describes the component templates to a <type>XSchemaHandler</type>.
 
-      @param aHandler
-            schema handler that will receive calls
+      @param aHandler   
+            schema handler that will receive calls 
             describing the contents of the templates
 
       @throws com::sun::star::lang::NullPointerException
@@ -128,7 +128,7 @@ published interface XSchema : ::com::sun::star::uno::XInterface
       @throws com::sun::star::lang::WrappedTargetException
               if an error occurs in the access to or processing of the data or
               if a subsequent call to any of the <type>XSchema</type>methods is made.
-              The elements of a component schema are only parsed once,a repeat call
+              The elements of a component schema are only parsed once,a repeat call 
               leads to exception.
       @throws com::sun::star::configuration::backend::MalformedDataException
               if the data read from the layer is rejected as invalid by the
@@ -139,10 +139,10 @@ published interface XSchema : ::com::sun::star::uno::XInterface
                 com::sun::star::lang::WrappedTargetException,
                 MalformedDataException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
 } ; } ; } ; } ; } ;
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl b/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl
index 635eb6164bbd..8112541a8a1b 100644
--- a/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl
+++ b/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_configuration_backend_XSchemaHandler_idl__
+#ifndef __com_sun_star_configuration_backend_XSchemaHandler_idl__ 
 #define __com_sun_star_configuration_backend_XSchemaHandler_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_TemplateIdentifier_idl__
-#include <com/sun/star/configuration/backend/TemplateIdentifier.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
-#include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+
+#ifndef __com_sun_star_configuration_backend_TemplateIdentifier_idl__ 
+#include <com/sun/star/configuration/backend/TemplateIdentifier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__ 
+#include <com/sun/star/configuration/backend/MalformedDataException.idl> 
+#endif 
+
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
 
 //=============================================================================
-
+ 
 module com { module sun { module star { module configuration { module backend {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** receives a description of a configuration schema as a sequence of events.
 
     @since OOo 1.1.2
  */
 published interface XSchemaHandler: ::com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a schema description is started.
 
         <p> The schema descrption may comprise components templates or both.
@@ -70,9 +70,9 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
      */
     void startSchema( )
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that the current schema description is complete.
 
         <p> Must match a previous call to <member>startSchema</member>.
@@ -91,9 +91,9 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
      */
     void endSchema(  )
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that the schema depends on templates
         from a different component.
 
@@ -112,11 +112,11 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
         @throws com::sun::star::lang::WrappedTargetException
             if an error occurs processing the event.
      */
-    void importComponent( [in] string aName )
+    void importComponent( [in] string aName ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a component description is started.
 
         <p> Subsequent calls describe the schema of the component
@@ -140,11 +140,11 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
         @throws com::sun::star::lang::WrappedTargetException
             if an error occurs processing the event.
      */
-    void startComponent( [in] string aName )
+    void startComponent( [in] string aName ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a component description is complete.
 
         <p> Must match a previous call to <member>startComponent</member>.
@@ -162,11 +162,11 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
         @throws com::sun::star::lang::WrappedTargetException
             if an error occurs processing the event.
      */
-    void endComponent(  )
+    void endComponent(  ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a template description is started for a group.
 
         <p> Subsequent calls describe the members and properties of the template
@@ -180,11 +180,11 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
         @param aAttributes
             specifies the attributes of the template.
 
-            <p> The value is a combination of
+            <p> The value is a combination of 
                 <type>SchemaAttribute</type> flags.
             </p>
-            <p> <const>SchemaAttribute::EXTENSIBLE</const> can be used
-                to describe a template for a node with an extensible
+            <p>	<const>SchemaAttribute::EXTENSIBLE</const> can be used
+                to describe a template for a node with an extensible 
                 set of properties.
             </p>
 
@@ -205,11 +205,11 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
         @see com::sun::star::configuration::backend::SchemaAttribute
      */
     void startGroupTemplate( [in] TemplateIdentifier aTemplate,
-                             [in] short  aAttributes  )
+                             [in] short  aAttributes  ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a template description is started for a set.
 
         <p> Subsequent calls describe the members and properties of the template
@@ -223,11 +223,11 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
         @param aAttributes
             specifies the attributes of the template.
 
-            <p> The value is a combination of
+            <p> The value is a combination of 
                 <type>SchemaAttribute</type> flags.
             </p>
-            <p> <const>SchemaAttribute::EXTENSIBLE</const> can be used
-                to describe a template for a node with an extensible
+            <p>	<const>SchemaAttribute::EXTENSIBLE</const> can be used
+                to describe a template for a node with an extensible 
                 set of properties.
             </p>
 
@@ -251,13 +251,13 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::SchemaAttribute
      */
-    void startSetTemplate(  [in] TemplateIdentifier aTemplate,
-                            [in] short  aAttributes,
-                            [in] TemplateIdentifier aItemType  )
+    void startSetTemplate(	[in] TemplateIdentifier aTemplate,
+                            [in] short  aAttributes, 
+                            [in] TemplateIdentifier aItemType  ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a template description is complete.
 
         <p> Must match a previous call to <member>startGroupTemplate</member>
@@ -276,11 +276,11 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
         @throws com::sun::star::lang::WrappedTargetException
             if an error occurs processing the event.
      */
-    void endTemplate(  )
+    void endTemplate(  ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a group description is started.
 
         <p> Subsequent calls describe the members and properties of the group
@@ -294,10 +294,10 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
         @param aAttributes
             specifies the attributes of the node.
 
-            <p> The value is a combination of
+            <p> The value is a combination of 
                 <type>SchemaAttribute</type> flags.
             </p>
-            <p> <const>SchemaAttribute::EXTENSIBLE</const> can be used
+            <p>	<const>SchemaAttribute::EXTENSIBLE</const> can be used
                 to describe a group with an extensible set of properties.
             </p>
 
@@ -305,7 +305,7 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
             <ul>
             <li>if there isn't a group node in progress currently</li>
             <li>if there already is a node with that name</li>
-            <li>if the name is not a valid node name</li>
+            <li>if the name is not a valid node name</li> 
             <li>if the attributes are not valid for a group</li>
             </ul>
             <p><em>Not every implementation can detect each condition</em></p>
@@ -316,11 +316,11 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
         @see com::sun::star::configuration::backend::SchemaAttribute
      */
     void startGroup( [in] string aName,
-                     [in] short  aAttributes )
+                     [in] short  aAttributes ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a set description is started.
 
         <p> Subsequent calls describe the item-types and properties of the set
@@ -334,10 +334,10 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
         @param aAttributes
             specifies the attributes of the node.
 
-            <p> The value is a combination of
+            <p> The value is a combination of 
                 <type>SchemaAttribute</type> flags.
             </p>
-            <p> <const>SchemaAttribute::EXTENSIBLE</const> can be used
+            <p>	<const>SchemaAttribute::EXTENSIBLE</const> can be used
                 to describe a set with an extensible set of properties.
             </p>
 
@@ -350,7 +350,7 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
             <li>if there already is a node with that name</li>
             <li>if the item-type template is not found</li>
             <li>if the name is not a valid node name</li>
-            <li>if the item-type is not a valid template identifier</li>
+            <li>if the item-type is not a valid template identifier</li> 
             <li>if the attributes are not valid for a set</li>
             </ul>
             <p><em>Not every implementation can detect each condition</em></p>
@@ -361,12 +361,12 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
         @see com::sun::star::configuration::backend::SchemaAttribute
      */
     void startSet( [in] string aName,
-                   [in] short  aAttributes,
-                   [in] TemplateIdentifier aItemType )
+                   [in] short  aAttributes, 
+                   [in] TemplateIdentifier aItemType ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a node description is complete.
 
         <p> Must match the last open call to <member>startGroup</member>
@@ -384,14 +384,14 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
         @throws com::sun::star::lang::WrappedTargetException
             if an error occurs processing the event.
      */
-    void endNode(  )
+    void endNode(  ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
-    /** receives notification that a property is added to the current node.
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
+    /** receives notification that a property is added to the current node. 
 
-        <p> The property will have a default value of <NULL/>
+        <p>	The property will have a default value of <NULL/>
             (unless it is <const>SchemaAttribute::REQUIRED</const>).
         </p>
 
@@ -401,7 +401,7 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
         @param aAttributes
             specifies the attributes of the new property.
 
-            <p> The value is a combination of
+            <p> The value is a combination of 
                 <type>SchemaAttribute</type> flags.
             </p>
 
@@ -413,7 +413,7 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
             <li>if there isn't a group or extensible node in progress currently</li>
             <li>if a property with the same name already exists</li>
             <li>if the specified type is not allowed</li>
-            <li>if the name is not a valid property name</li>
+            <li>if the name is not a valid property name</li> 
             <li>if the attributes are not valid for a property</li>
             </ul>
             <p><em>Not every implementation can detect each condition</em></p>
@@ -423,16 +423,16 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::SchemaAttribute
      */
-    void addProperty( [in] string aName,
-                       [in] short aAttributes,
-                      [in] type aType )
+    void addProperty( [in] string aName, 
+                       [in] short aAttributes, 
+                      [in] type aType ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-    /** receives notification that a property having a default value
-        is added to the current node.
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** receives notification that a property having a default value 
+        is added to the current node. 
 
         @param aName
             specifies the name of the new property.
@@ -440,14 +440,14 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
         @param aAttributes
             specifies the attributes of the new property.
 
-            <p> The value is a combination of
+            <p> The value is a combination of 
                 <type>SchemaAttribute</type> flags.
             </p>
 
         @param aDefaultValue
             specifies the value of the new property.
 
-            <p> The value also determines the type.
+            <p> The value also determines the type. 
                 Therefore the value must not be <void/>.
             </p>
 
@@ -456,7 +456,7 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
             <li>if there isn't a group or extensible node in progress currently</li>
             <li>if a property with the same name already exists</li>
             <li>if the type of the default value is not an allowed type,
-                or if the default value is <void/></li>
+                or if the default value is <void/></li> 
             <li>if the name is not a valid property name</li>
             <li>if the attributes are not valid for a property</li>
             </ul>
@@ -467,15 +467,15 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::SchemaAttribute
      */
-    void addPropertyWithDefault( [in] string aName,
-                                  [in] short aAttributes,
-                                 [in] any aDefaultValue )
+    void addPropertyWithDefault( [in] string aName, 
+                                  [in] short aAttributes, 
+                                 [in] any aDefaultValue ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-    /** receives notification that the current group has a child node
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** receives notification that the current group has a child node 
         that is an instance of a specified template.
 
         @param aName
@@ -496,18 +496,18 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
         @throws com::sun::star::lang::WrappedTargetException
             if an error occurs processing the event.
      */
-    void addInstance( [in] string aName,
-                       [in] TemplateIdentifier aTemplate )
+    void addInstance( [in] string aName, 
+                       [in] TemplateIdentifier aTemplate ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-    /** receives notification that the current set can contain items
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** receives notification that the current set can contain items 
         that are instances of a specified template.
 
         @param aItemType
-            specifies a template that is accepted as valid item type
+            specifies a template that is accepted as valid item type 
             for the current set node.
 
         @throws com::sun::star::configuration::backend::MalformedDataException
@@ -521,18 +521,18 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
         @throws com::sun::star::lang::WrappedTargetException
             if an error occurs processing the event.
      */
-    void addItemType( [in] TemplateIdentifier aItemType )
+    void addItemType( [in] TemplateIdentifier aItemType ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-//=============================================================================
-
-#endif
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+
+//============================================================================= 
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/XSchemaSupplier.idl b/offapi/com/sun/star/configuration/backend/XSchemaSupplier.idl
index d8005be6a38b..d7ae32edd5dd 100644
--- a/offapi/com/sun/star/configuration/backend/XSchemaSupplier.idl
+++ b/offapi/com/sun/star/configuration/backend/XSchemaSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,11 +29,11 @@
 
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XSchema_idl__
 #include <com/sun/star/configuration/backend/XSchema.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
@@ -41,31 +41,31 @@
 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
-/**
+/** 
   provides access to configuration component schemas.
 
   @since OOo 1.1.2
 */
-published interface XSchemaSupplier : ::com::sun::star::uno::XInterface
+published interface XSchemaSupplier : ::com::sun::star::uno::XInterface 
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /**
       Returns the schema information (component + templates)
       for a particular component.
 
-      @param aComponent
+      @param aComponent 
                 component whose schema will be accessed
 
-      @returns
+      @returns   
                 an object allowing access to the various parts of the schema,
                 <NULL/> if the component doesn't exist.
 
@@ -79,11 +79,11 @@ published interface XSchemaSupplier : ::com::sun::star::uno::XInterface
         raises (BackendAccessException,
                 com::sun::star::lang::IllegalArgumentException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
 } ; } ; } ; } ; } ;
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/XSingleLayerStratum.idl b/offapi/com/sun/star/configuration/backend/XSingleLayerStratum.idl
index 96ac572e82db..62f7bd18d034 100644
--- a/offapi/com/sun/star/configuration/backend/XSingleLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/XSingleLayerStratum.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,11 +29,11 @@
 
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XUpdatableLayer_idl__
 #include <com/sun/star/configuration/backend/XUpdatableLayer.idl>
@@ -45,23 +45,23 @@
 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
-/**
-  Handles access to a stratum consisting of a single layer
+/** 
+  Handles access to a stratum consisting of a single layer 
   in a configuration data repository
-
-  <p> The interface provides timestamp-checking capabilities
+ 
+  <p> The interface provides timestamp-checking capabilities 
      for efficient caching.
   </p>
 
@@ -71,38 +71,38 @@ module com { module sun { module star { module configuration { module backend {
 
   @since OOo 1.1.2
 */
-published interface XSingleLayerStratum : ::com::sun::star::uno::XInterface
+published interface XSingleLayerStratum : ::com::sun::star::uno::XInterface 
 {
-    //-------------------------------------------------------------------------
-
-    /**
-        retrieves the layer data for a component, if newer than indicated.
-
-        <p> A timestamp can be provided, which is used to indicate
-            a point in time. The layer should be returned only if is modified
-            since that time.
+    //------------------------------------------------------------------------- 
+
+    /** 
+        retrieves the layer data for a component, if newer than indicated. 
+      
+        <p> A timestamp can be provided, which is used to indicate 
+            a point in time. The layer should be returned only if is modified 
+            since that time. 
         </p>
 
-        @param aComponent
+        @param aComponent 
                 The name of the component to access.
 
-        @param aTimestamp
+        @param aTimestamp    
                 a timestamp for the layer.
-
-                <p> An empty timestamp indicates, that the layer should be
-                    retrieved irrespective of its modification time.
+                
+                <p> An empty timestamp indicates, that the layer should be 
+                    retrieved irrespective of its modification time. 
                 </p>
-                <p> The format and meaning of a timestamp depends on
-                    the implementation. Timestamps can be obtained using
+                <p> The format and meaning of a timestamp depends on 
+                    the implementation. Timestamps can be obtained using 
                     <member scope="com::sun::star::util">XTimeStamped::getTimestamp()</member>.
                 </p>
 
-      @returns
-                a <type>Layer</type> object providing access to the layer data,
-                <NULL/> if the layer is newer than indicated by the timestamp.
+      @returns   
+                a <type>Layer</type> object providing access to the layer data, 
+                <NULL/> if the layer is newer than indicated by the timestamp. 
 
       @throws   com::sun::star::lang::IllegalArgumentException
-                if the component identifier is invalid or
+                if the component identifier is invalid or 
                 if the timestamp is invalid.
 
       @throws   com::sun::star::configuration::backend::BackendAccessException
@@ -110,21 +110,21 @@ published interface XSingleLayerStratum : ::com::sun::star::uno::XInterface
 
       @see com::sun::star::util::XTimeStamped
     */
-    XLayer getLayer([in] string aComponent,
+    XLayer getLayer([in] string aComponent, 
                     [in] string aTimestamp)
         raises (BackendAccessException,
                 com::sun::star::lang::IllegalArgumentException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /**
         retrieves a writable representation of the layer for a component.
 
-        @param aComponent
+        @param aComponent 
                 The name of the component to access.
-
-        @return
-                an <type>UpdatableLayer</type> object providing
+      
+        @return   
+                an <type>UpdatableLayer</type> object providing 
                 write access to the layer
 
         @throws   com::sun::star::lang::IllegalArgumentException
@@ -140,12 +140,12 @@ published interface XSingleLayerStratum : ::com::sun::star::uno::XInterface
         raises (BackendAccessException,
                 com::sun::star::lang::NoSupportException,
                 com::sun::star::lang::IllegalArgumentException) ;
-
-    //-------------------------------------------------------------------------
+    
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
 } ; } ; } ; } ; } ;
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/XUpdatableLayer.idl b/offapi/com/sun/star/configuration/backend/XUpdatableLayer.idl
index c2fdf99e2eb0..66bf699be203 100644
--- a/offapi/com/sun/star/configuration/backend/XUpdatableLayer.idl
+++ b/offapi/com/sun/star/configuration/backend/XUpdatableLayer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,11 +34,11 @@
 
 #ifndef __com_sun_star_lang_NullPointerException_idl__
 #include <com/sun/star/lang/NullPointerException.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_lang_WrappedTargetException_idl__
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
 #include <com/sun/star/configuration/backend/MalformedDataException.idl>
@@ -56,7 +56,7 @@ module com { module sun { module star { module configuration { module backend {
 
     @since OOo 1.1.2
   */
-published interface XUpdatableLayer : XLayer
+published interface XUpdatableLayer : XLayer 
 {
     //--------------------------------------------------------------------------
 
@@ -65,12 +65,12 @@ published interface XUpdatableLayer : XLayer
        parameter.
 
        <p> After the replacement has been performed, reading the
-           layer will return the new content. Some implementations
+           layer will return the new content. Some implementations 
            may not support this, so after an update
            <member>XLayer::readData()</member> may fail.
         </p>
 
-       @param aNewLayer
+       @param aNewLayer 
                replacement layer
 
        @throws com::sun::star::lang::NullPointerException
@@ -80,7 +80,7 @@ published interface XUpdatableLayer : XLayer
        @throws com::sun::star::configuration::backend::MalformedDataException
                if the layer contains invalid data.
      */
-    void replaceWith([in] XLayer aNewLayer)
+    void replaceWith([in] XLayer aNewLayer) 
         raises (com::sun::star::lang::NullPointerException,
                 com::sun::star::lang::WrappedTargetException,
                 MalformedDataException) ;
diff --git a/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl b/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl
index 918eee7ea365..f7b7a01cbc0c 100644
--- a/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl
+++ b/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_configuration_backend_XUpdateHandler_idl__
+#ifndef __com_sun_star_configuration_backend_XUpdateHandler_idl__ 
 #define __com_sun_star_configuration_backend_XUpdateHandler_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_TemplateIdentifier_idl__
-#include <com/sun/star/configuration/backend/TemplateIdentifier.idl>
-#endif
-
-#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__
-#include <com/sun/star/configuration/backend/MalformedDataException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
-#include <com/sun/star/lang/IllegalAccessException.idl>
-#endif
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+
+#ifndef __com_sun_star_configuration_backend_TemplateIdentifier_idl__ 
+#include <com/sun/star/configuration/backend/TemplateIdentifier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_configuration_backend_MalformedDataException_idl__ 
+#include <com/sun/star/configuration/backend/MalformedDataException.idl> 
+#endif 
+
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+
+#ifndef __com_sun_star_lang_IllegalAccessException_idl__ 
+#include <com/sun/star/lang/IllegalAccessException.idl> 
+#endif 
 
 //=============================================================================
-
+ 
 module com { module sun { module star { module configuration { module backend {
-
-//=============================================================================
-
-/** receives a description of a configuration update or layer
+ 
+//============================================================================= 
+ 
+/** receives a description of a configuration update or layer 
     as a sequence of events.
 
     @since OOo 1.1.2
  */
 published interface XUpdateHandler: ::com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a update or description is started.
 
         @throws com::sun::star::configuration::backend::MalformedDataException
@@ -69,19 +69,19 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
         @throws com::sun::star::lang::IllegalAccessException
             if the target layer is read-only
-            <p><em>Some implementations can only detect this when executing
+            <p><em>Some implementations can only detect this when executing 
                 <member>XUpdateHandler::endUpdate()</member></em>
             </p>
 
         @throws com::sun::star::lang::WrappedTargetException
             if an error occurs processing the event.
      */
-    void startUpdate(  )
+    void startUpdate(  ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::IllegalAccessException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::IllegalAccessException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that the current update description is complete.
 
         <p> Must match a previous call to <member>XUpdateHandler::startUpdate()</member>.
@@ -102,16 +102,16 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
         @throws com::sun::star::lang::WrappedTargetException
             if an error occurs processing the event.
      */
-    void endUpdate(  )
+    void endUpdate(  ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::IllegalAccessException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::IllegalAccessException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+          
     /** receives notification that a modification of a node is started.
 
-        <p> Subsequent calls describe changes to properties and items or
-            members of the node until a matching call to
+        <p> Subsequent calls describe changes to properties and items or 
+            members of the node until a matching call to 
             <member>XUpdateHandler::endNode()</member> is encountered.
         </p>
 
@@ -122,17 +122,17 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
             specifies attribute values to be applied to the node in the
             current layer.
 
-            <p> The value is a combination of
+            <p> The value is a combination of 
                 <type>NodeAttribute</type> flags.
             </p>
-            <p> Only attributes which are selected in aAttributeMask
+            <p>	Only attributes which are selected in aAttributeMask 
                 are changed.
             </p>
 
         @param aAttributeMask
             specifies which attributes should be changed for the node.
 
-            <p> The value is a combination of
+            <p> The value is a combination of 
                 <type>NodeAttribute</type> flags.
             </p>
 
@@ -143,7 +143,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
         @throws com::sun::star::configuration::backend::MalformedDataException
             <ul>
-            <li>if there isn't an update in progress at all</li>
+            <li>if there isn't an update in progress at all</li> 
             <li>if a node is not valid in this place</li>
             <li>if there already was a change to that node</li>
             <li>if there is no node with that name</li>
@@ -161,21 +161,21 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
     void modifyNode ( [in] string aName,
                       [in] short  aAttributes,
                       [in] short  aAttributeMask,
-                      [in] boolean bReset )
+                      [in] boolean bReset ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a node is started as a new item.
 
-        <p> The current node must be a set and
+        <p> The current node must be a set and 
             a preexisting item (if any) must be removeable.
         </p>
         <p> The new item will be created from the default template
             of the set.
         </p>
         <p> Subsequent calls describe the difference from the template
-            of properties, items or members of the node until a matching call
+            of properties, items or members of the node until a matching call 
             to <member>XUpdateHandler::endNode()</member> is encountered.
         </p>
 
@@ -185,7 +185,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
         @param aAttributes
             specifies attribute values to be applied to the new node.
 
-            <p> The value is a combination of
+            <p> The value is a combination of 
                 <type>NodeAttribute</type> flags.  Note that
                 <member>NodeAttribute::FUSE</member> has an impact on the
                 semantics of this method.
@@ -207,20 +207,20 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::NodeAttribute
      */
-    void addOrReplaceNode ( [in] string aName,
-                            [in] short  aAttributes )
+    void addOrReplaceNode (	[in] string aName,
+                            [in] short  aAttributes ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
-    /** receives notification that a node is started as a new item
+                    com::sun::star::lang::WrappedTargetException ); 	 	 
+    //------------------------------------------------------------------------- 
+     
+    /** receives notification that a node is started as a new item 
         based on a particular template.
 
-        <p> The current node must be a set and
+        <p> The current node must be a set and 
             a preexisting item (if any) must be removeable.
         </p>
         <p> Subsequent calls describe the difference from the template
-            of properties or members of the node until a matching call
+            of properties or members of the node until a matching call 
             to <member>XUpdateHandler::endNode()</member> is encountered.
         </p>
 
@@ -233,7 +233,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
         @param aAttributes
             specifies attribute values to be applied to the new node.
 
-            <p> The value is a combination of
+            <p> The value is a combination of 
                 <type>NodeAttribute</type> flags.  Note that
                 <member>NodeAttribute::FUSE</member> has an impact on the
                 semantics of this method.
@@ -256,39 +256,39 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::NodeAttribute
      */
-    void addOrReplaceNodeFromTemplate(  [in] string aName,
+    void addOrReplaceNodeFromTemplate(	[in] string aName,
                                         [in] short  aAttributes,
                                         [in] TemplateIdentifier aTemplate )
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a node modification is complete.
 
-        <p> Must match the last open call to
-            <member>XUpdateHandler::modifyNode()</member>,
-            <member>XUpdateHandler::addOrReplaceNode()</member> or
+        <p> Must match the last open call to 
+            <member>XUpdateHandler::modifyNode()</member>, 
+            <member>XUpdateHandler::addOrReplaceNode()</member> or 
             <member>XUpdateHandler::addOrReplaceNodeFromTemplate()</member>.
         </p>
 
         @throws com::sun::star::configuration::backend::MalformedDataException
             <ul>
             <li>if invalid data is detected in the node</li>
-            <li>if no node is started at all</li>
+            <li>if no node is started at all</li>	
             </ul>
             <p><em>Not every implementation can detect each condition</em></p>
 
         @throws com::sun::star::lang::WrappedTargetException
             if an error occurs processing the event.
      */
-    void endNode( )
+    void endNode( ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
-    /** receives notification that an item is to be dropped from a set.
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
+    /** receives notification that an item is to be dropped from a set. 
 
-        <p> The current node must be a set and
+        <p> The current node must be a set and 
             the item must be removeable.
         </p>
 
@@ -308,15 +308,15 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
         @throws com::sun::star::lang::WrappedTargetException
             if an error occurs processing the event.
      */
-    void removeNode( [in] string aName )
+    void removeNode( [in] string aName ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that modification of an existing property is started. .
 
-        <p> Subsequent calls describe changes to the value(s)
-            of the property until a matching call to
+        <p> Subsequent calls describe changes to the value(s) 
+            of the property until a matching call to 
             <member>XUpdateHandler::endProperty()</member> is encountered.
         </p>
 
@@ -326,20 +326,20 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
         @param aAttributes
             specifies new attributes of the property.
 
-            <p> The value is a combination of
+            <p> The value is a combination of 
                 <type>NodeAttribute</type> flags.
             </p>
-            <p> Only attributes which are selected in aAttributeMask are changed.
+            <p> Only attributes which are selected in aAttributeMask are changed. 
             </p>
-            <p> <const>NodeAttribute::MANDATORY</const> need not be set
-                and can't be removed, as dynamic properties always are mandatory
+            <p>	<const>NodeAttribute::MANDATORY</const> need not be set 
+                and can't be removed, as dynamic properties always are mandatory 
                 in subsequent layers.
             </p>
 
         @param aAttributeMask
             specifies which attributes should be changed for the property.
 
-            <p> The value is a combination of
+            <p> The value is a combination of 
                 <type>NodeAttribute</type> flags.
             </p>
 
@@ -366,22 +366,22 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::NodeAttribute
      */
-    void modifyProperty( [in] string aName,
-                          [in] short aAttributes,
-                          [in] short aAttributeMask,
-                         [in] type aType )
+    void modifyProperty( [in] string aName, 
+                          [in] short aAttributes, 
+                          [in] short aAttributeMask, 
+                         [in] type aType ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
-    /** receives notification about a change to the value of
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+       
+    /** receives notification about a change to the value of 
         the current property.
 
         @param aValue
             specifies the new value of the property.
 
-            <p> The value must match the type of the existing property.
-                If the property does not have the
+            <p> The value must match the type of the existing property. 
+                If the property does not have the 
                 <const>SchemaAttribute::REQUIRED</const> flag set,
                 the value can be <void/>.
             </p>
@@ -390,7 +390,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
             <ul>
             <li>if there isn't a property modification in progress currently</li>
             <li>if there already was a change to this value</li>
-            <li>if the type of the value is not an allowed type</li>
+            <li>if the type of the value is not an allowed type</li> 
             <li>if the value is not valid for the property</li>
             </ul>
             <p><em>Not every implementation can detect each condition</em></p>
@@ -400,19 +400,19 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::NodeAttribute
      */
-    void setPropertyValue( [in] any aValue )
+    void setPropertyValue( [in] any aValue ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
-    /** receives notification about a change to the value of
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+       
+    /** receives notification about a change to the value of 
         the current property for a specific locale.
 
         @param aValue
             specifies the new value of the property for the given locale.
 
-            <p> The value must match the type of the existing property.
-                If the property does not have the
+            <p> The value must match the type of the existing property. 
+                If the property does not have the 
                 <const>SchemaAttribute::REQUIRED</const> flag set,
                 the value can be <void/>.
             </p>
@@ -422,7 +422,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
         @throws com::sun::star::configuration::backend::MalformedDataException
             <ul>
-            <li>if there isn't a property modification in progress currently</li>
+            <li>if there isn't a property modification in progress currently</li> 
             <li>if the property is not localizable</li>
             <li>if there already was a change to this value</li>
             <li>if the type of the value is not an allowed type</li>
@@ -436,12 +436,12 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::NodeAttribute
      */
-    void setPropertyValueForLocale( [in] any aValue, [in] string aLocale )
+    void setPropertyValueForLocale( [in] any aValue, [in] string aLocale ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
-    /** receives notification that the value of the current property
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+       
+    /** receives notification that the value of the current property 
         should be reset to its default.
 
         @throws com::sun::star::configuration::backend::MalformedDataException
@@ -456,12 +456,12 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::NodeAttribute
      */
-    void resetPropertyValue( )
+    void resetPropertyValue( ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
-    /** receives notification that the value of the current property
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+       
+    /** receives notification that the value of the current property 
         for a specific locale should be reset to its default.
 
         @param aLocale
@@ -481,33 +481,33 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::NodeAttribute
      */
-    void resetPropertyValueForLocale( [in] string aLocale )
+    void resetPropertyValueForLocale( [in] string aLocale ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a property modification is complete.
 
-        <p> Must match the last open call to
+        <p> Must match the last open call to 
             <member>XUpdateHandler::modifyProperty()</member>.
         </p>
 
         @throws com::sun::star::configuration::backend::MalformedDataException
             <ul>
             <li>if invalid data is detected in the property</li>
-            <li>if no property is started at all</li>
+            <li>if no property is started at all</li>	
             </ul>
             <p><em>Not every implementation can detect each condition</em></p>
 
         @throws com::sun::star::lang::WrappedTargetException
             if an error occurs processing the event.
      */
-    void endProperty( )
+    void endProperty( ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
-    /** receives notification that a property is reset to its default state.
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
+    /** receives notification that a property is reset to its default state. 
 
         @param aName
             specifies the name of the property.
@@ -516,7 +516,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
             <ul>
             <li>if there isn't a group or extensible node in progress currently</li>
             <li>if there already was a change to a property of that name</li>
-            <li>if there is no property with that name, or if the property
+            <li>if there is no property with that name, or if the property 
                 has no default</li>
             <li>if the property is read-only</li>
             <li>if the name is not a valid property name</li>
@@ -528,16 +528,16 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::NodeAttribute
      */
-    void resetProperty( [in] string aName )
+    void resetProperty(	[in] string aName ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification that a property having a value of <void/>
-        is added to the current node.
+        is added to the current node. 
 
-        <p> The current node must be extensible and
-            a preexisting property (if any) must be
+        <p> The current node must be extensible and 
+            a preexisting property (if any) must be 
             removeable in this layer.
         </p>
 
@@ -547,13 +547,13 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
         @param aAttributes
             specifies the attributes of the new property.
 
-            <p> The value is a combination of
-                <type>NodeAttribute</type> flags and may also contain the
+            <p> The value is a combination of 
+                <type>NodeAttribute</type> flags and may also contain the 
                 <const>SchemaAttribute::REQUIRED</const> flag.
             </p>
             </p>
-            <p> <const>NodeAttribute::MANDATORY</const> need not be set,
-                as dynamic properties always are mandatory
+            <p>	<const>NodeAttribute::MANDATORY</const> need not be set, 
+                as dynamic properties always are mandatory 
                 in subsequent layers.
             </p>
 
@@ -566,7 +566,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
             <li>if there already was a change to a property of that name</li>
             <li>if a property of that name exists and is not removeable</li>
             <li>if the specified type is not allowed</li>
-            <li>if the name is not a valid property name</li>
+            <li>if the name is not a valid property name</li> 
             <li>if the attributes are not valid for the property</li>
             </ul>
             <p><em>Not every implementation can detect each condition</em></p>
@@ -576,18 +576,18 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::SchemaAttribute
      */
-    void addOrReplaceProperty( [in] string aName,
-                                [in] short aAttributes,
-                               [in] type aType )
+    void addOrReplaceProperty( [in] string aName, 
+                                [in] short aAttributes, 
+                               [in] type aType ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
-    /** receives notification that a property having a non-<NULL/> value
-        is added to the current node.
-
-        <p> The current node must be extensible and
-            a preexisting property (if any) must be
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
+    /** receives notification that a property having a non-<NULL/> value 
+        is added to the current node. 
+
+        <p> The current node must be extensible and 
+            a preexisting property (if any) must be 
             removeable in this layer.
         </p>
 
@@ -597,20 +597,20 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
         @param aAttributes
             specifies the attributes of the new property.
 
-            <p> The value is a combination of
-                <type>NodeAttribute</type> flags and may also contain the
+            <p> The value is a combination of 
+                <type>NodeAttribute</type> flags and may also contain the 
                 <const>SchemaAttribute::REQUIRED</const> flag.
             </p>
             </p>
-            <p> <const>NodeAttribute::MANDATORY</const> need not be set,
-                as dynamic properties always are mandatory
+            <p>	<const>NodeAttribute::MANDATORY</const> need not be set, 
+                as dynamic properties always are mandatory 
                 in subsequent layers.
             </p>
 
         @param aValue
             specifies the value of the new property.
 
-            <p> The value also determines the type.
+            <p> The value also determines the type. 
                 Therefore the value must not be <void/>.
             </p>
 
@@ -631,14 +631,14 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
         @see com::sun::star::configuration::backend::SchemaAttribute
      */
-    void addOrReplacePropertyWithValue( [in] string aName,
-                                         [in] short aAttributes,
-                                        [in] any aValue )
+    void addOrReplacePropertyWithValue(	[in] string aName, 
+                                         [in] short aAttributes, 
+                                        [in] any aValue ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
-    /** receives notification that a property is dropped from the current node.
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
+    /** receives notification that a property is dropped from the current node. 
 
         <p>The current node must be extensible and the property removeable.</p>
 
@@ -657,17 +657,17 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
         @throws com::sun::star::lang::WrappedTargetException
             if an error occurs processing the event.
      */
-    void removeProperty( [in] string aName )
+    void removeProperty( [in] string aName ) 
             raises( MalformedDataException,
-                    com::sun::star::lang::WrappedTargetException );
-    //-------------------------------------------------------------------------
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-//=============================================================================
-
-#endif
+                    com::sun::star::lang::WrappedTargetException ); 
+    //------------------------------------------------------------------------- 
+     
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+
+//============================================================================= 
+ 
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier.idl b/offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier.idl
index 2bcefd070ac3..845d8ba4414d 100644
--- a/offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier.idl
+++ b/offapi/com/sun/star/configuration/backend/XVersionedSchemaSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
 
 #ifndef __com_sun_star_configuration_backend_XSchemaSupplier_idl__
 #include <com/sun/star/configuration/backend/XSchemaSupplier.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_BackendAccessException_idl__
 #include <com/sun/star/configuration/backend/BackendAccessException.idl>
@@ -37,43 +37,43 @@
 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 
-//=============================================================================
+//============================================================================= 
 
-/**
+/** 
   provides access to versioned configuration component schemas.
 
   @since OOo 2.0
 */
-interface XVersionedSchemaSupplier : XSchemaSupplier
+interface XVersionedSchemaSupplier : XSchemaSupplier 
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /**
       Returns the schema version for a particular component.
 
-      @param aComponent
+      @param aComponent 
                 component whose schema version will be determined
 
-      @returns
-                a <atom>string</atom> that identifies the schema version for
+      @returns   
+                a <atom>string</atom> that identifies the schema version for 
                 the given component.
 
-                <p> The format of the version string is arbitrary. No meaning
-                should be attached to it, unless an implementing service
-                defines one. If no version can be determined, an empty
+                <p> The format of the version string is arbitrary. No meaning 
+                should be attached to it, unless an implementing service 
+                defines one. If no version can be determined, an empty 
                 <atom>string</atom> may be returned.
                 </p>
 
-                <p> Clients may assume that all instances of a schema with the
+                <p> Clients may assume that all instances of a schema with the 
                 same version are identical. The converse is not true.
-                In particular an implementation may return the same version
-                string for all schemas it supplies (i.e. return a version for
+                In particular an implementation may return the same version 
+                string for all schemas it supplies (i.e. return a version for 
                 the complete schema, including all components)
                 </p>
 
@@ -87,11 +87,11 @@ interface XVersionedSchemaSupplier : XSchemaSupplier
         raises (BackendAccessException,
                 com::sun::star::lang::IllegalArgumentException) ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
 } ; } ; } ; } ; } ;
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl b/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl
index 864051bae236..9f60e22074a5 100644
--- a/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl
+++ b/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,70 +29,70 @@
 
 #ifndef __com_sun_star_configuration_backend_XLayer_idl__
 #include <com/sun/star/configuration/backend/XLayer.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_io_XActiveDataSink_idl__
 #include <com/sun/star/io/XActiveDataSink.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 module xml {
 
-//=============================================================================
+//============================================================================= 
 
 /**
     represents a configuration data layer that is stored in a stream in
     OOR Update XML format.
 
-    <p> The configuration layer xml from a given stream is parsed and fed to a
-    <type scope="com::sun::star::configuration::backend">XLayerHandler</type>.
+    <p> The configuration layer xml from a given stream is parsed and fed to a 
+    <type scope="com::sun::star::configuration::backend">XLayerHandler</type>. 
     </p>
-
+  
     @see com::sun::star::configuration::backend::xml::SchemaParser
         Service that represents a configuration schema stored in xml.
 
     @see com::sun::star::configuration::backend::xml::LayerWriter
-        Service that writes OOR Update XML for data described via
-        <type scope="com::sun::star::configuration::backend">XLayerHandler</type>.
+        Service that writes OOR Update XML for data described via 
+        <type scope="com::sun::star::configuration::backend">XLayerHandler</type>. 
 
     @since OOo 1.1.2
 */
 published service LayerParser
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** provides access to the parsed layer data.
       */
     interface com::sun::star::configuration::backend::XLayer ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** provides access to the source xml stream.
       */
     interface com::sun::star::io::XActiveDataSink ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** allows initializing the source stream.
 
-        <p> The source can be passed
-            as a <type scope="com::sun::star::io">XInputStream</type> or
+        <p> The source can be passed 
+            as a <type scope="com::sun::star::io">XInputStream</type> or 
             as a <type scope="com::sun::star::xml::sax">InputSource</type>.
-        </p>
+        </p> 
       */
     interface com::sun::star::lang::XInitialization ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 } ;
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl b/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl
index 1a32587ad13a..1a05e2f6f9a5 100644
--- a/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl
+++ b/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,31 +29,31 @@
 
 #ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_io_XActiveDataSource_idl__
 #include <com/sun/star/io/XActiveDataSource.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_configuration_backend_XLayerHandler_idl__
 #include <com/sun/star/configuration/backend/XLayerHandler.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 module xml {
 
-//=============================================================================
+//============================================================================= 
 
 /**
     can be used to parse a stream of configuration layer xml.
 
-    <p> The configuration layer data described to a
+    <p> The configuration layer data described to a 
     <type scope="com::sun::star::configuration::backend">XLayerHandler</type>
     is written to a stream as OOR Update XML.
     </p>
-
+  
     @see com::sun::star::configuration::backend::xml::LayerParser
         Service that parses configuration layer xml.
 
@@ -61,33 +61,33 @@ module xml {
 */
 published service LayerWriter
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** accepts events describing the layer data.
       */
     interface com::sun::star::configuration::backend::XLayerHandler ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** provides access to the target stream.
       */
     interface com::sun::star::io::XActiveDataSource ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** allows initializing target stream.
 
-        <p> The target can be passed
+        <p> The target can be passed 
             as a <type scope="com::sun::star::io">XOutputStream</type>.
-        </p>
+        </p> 
       */
     interface com::sun::star::lang::XInitialization ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 } ;
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl b/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl
index 6c60fa2a338a..73c5710ac788 100644
--- a/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl
+++ b/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,30 +29,30 @@
 
 #ifndef __com_sun_star_configuration_backend_XSchema_idl__
 #include <com/sun/star/configuration/backend/XSchema.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_io_XActiveDataSink_idl__
 #include <com/sun/star/io/XActiveDataSink.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module backend {
 module xml {
 
-//=============================================================================
+//============================================================================= 
 
 /** represents a configuration schema that is stored in a stream in
     OOR Schema XML format.
 
-    <p> The configuration schema xml from a given stream is parsed and fed to a
-        <type scope="com::sun::star::configuration::backend">XSchemaHandler</type>.
+    <p> The configuration schema xml from a given stream is parsed and fed to a 
+        <type scope="com::sun::star::configuration::backend">XSchemaHandler</type>. 
     </p>
-
+  
     @see com::sun::star::configuration::backend::xml::LayerParser
         Service that parses configuration layer xml.
 
@@ -60,34 +60,34 @@ module xml {
 */
 published service SchemaParser
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** provides access to the parsed schema data.
       */
     interface com::sun::star::configuration::backend::XSchema ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** provides access to the source xml stream.
       */
     interface com::sun::star::io::XActiveDataSink ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** allows initializing the source stream.
 
-        <p> The source can be passed
-            as a <type scope="com::sun::star::io">XInputStream</type> or
+        <p> The source can be passed 
+            as a <type scope="com::sun::star::io">XInputStream</type> or 
             as a <type scope="com::sun::star::xml::sax">InputSource</type>.
-        </p>
+        </p> 
       */
     interface com::sun::star::lang::XInitialization ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 } ;
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl b/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl
index 3441b45e73a1..9b987448c758 100644
--- a/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl
+++ b/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,48 +29,48 @@
 
 #ifndef __com_sun_star_uno_XComponentContext_idl__
 #include <com/sun/star/uno/XComponentContext.idl>
-#endif
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module configuration { module bootstrap {
 
-//=============================================================================
+//============================================================================= 
 
 /**
-    provides access to a component context that is enhanced with
-    bootstrap parameters for configuration services from the
+    provides access to a component context that is enhanced with 
+    bootstrap parameters for configuration services from the 
     associated metaconfiguration mechanism.
 
-    <p> The contained settings are used to initialize the
+    <p> The contained settings are used to initialize the 
         <type scope="com::sun::star::configuration">DefaultProvider</type> and
-        <type scope="com::sun::star::configuration::backend">DefaultBackend</type> of the
-        component context.
+        <type scope="com::sun::star::configuration::backend">DefaultBackend</type> of the 
+        component context. 
     </p>
-    <p> The implementation is usally available as singleton in the context
-        that it wraps..
+    <p> The implementation is usally available as singleton in the context 
+        that it wraps.. 
     </p>
-
+  
     @since OOo 1.1.2
 */
-published service BootstrapContext
+published service BootstrapContext 
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /**
       provides access to metaconfiguration data.
 
-      <p>Some values are retrieved from external metaconfiguration,
+      <p>Some values are retrieved from external metaconfiguration, 
         if they are not overridden in the wrapped context.
-      </p>
+      </p> 
       */
     interface com::sun::star::uno::XComponentContext ;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 } ;
 
-//=============================================================================
+//============================================================================= 
 
-} ; } ; } ; } ; } ;
+} ; } ; } ; } ; } ; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/datatransfer/DataFlavor.idl b/offapi/com/sun/star/datatransfer/DataFlavor.idl
index b8c258bc40db..2c0e4a7715f5 100644
--- a/offapi/com/sun/star/datatransfer/DataFlavor.idl
+++ b/offapi/com/sun/star/datatransfer/DataFlavor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,15 +40,15 @@ module com { module sun { module star { module datatransfer {
 published struct DataFlavor
 {
     //-------------------------------------------------------------------------
-    /** The MIME content-type (type/subtype) string describing the data format
+    /** The MIME content-type (type/subtype) string describing the data format 
         of the object to transfer. MimeType must be conform to <a href="ftp://ftp.isi.edu/in-notes/rfc2045.txt">Rfc2045</a> and
-        <a href="ftp://ftp.isi.edu/in-notes/rfc2046.txt">Rfc2046</a>)
-    */
+        <a href="ftp://ftp.isi.edu/in-notes/rfc2046.txt">Rfc2046</a>) 
+    */	
     string MimeType;
 
     //-------------------------------------------------------------------------
     /** A human presentable name for the data format.
-    */
+    */	
     string HumanPresentableName;
 
     //-------------------------------------------------------------------------
@@ -59,6 +59,6 @@ published struct DataFlavor
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl b/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl
index 29e9479f4a01..498cf3161329 100644
--- a/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl
+++ b/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,15 +38,15 @@
 
 //=============================================================================
 
-module com { module sun { module star { module datatransfer {
+module com { module sun { module star { module datatransfer { 
 
 //=============================================================================
 
  published interface XDataFormatTranslator;
 
 //=============================================================================
-/** Different platforms use different types to describe data formats available
-    during data exchange operations like clipboard or drag&drop.
+/** Different platforms use different types to describe data formats available 
+    during data exchange operations like clipboard or drag&drop. 
     Implementations of this service do convert system dependent data types to a
     <type>DataFlavor</type> and vice versa.
 
diff --git a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
index 82deb7314b0c..818184a93b8a 100644
--- a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
+++ b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,17 +42,17 @@
 
 //=============================================================================
 
-module com { module sun { module star { module datatransfer {
+module com { module sun { module star { module datatransfer { 
 
 //=============================================================================
 
  published interface XMimeContentTypeFactory;
 
 //=============================================================================
-/** Used to create an instance that implement the interface
-    <type>XMimeContentType</type> from a string
-    representation of such a MIME content-type that is conform to
-    <a href="ftp://ftp.isi.edu/in-notes/rfc2045.txt">Rfc2045</a> and
+/** Used to create an instance that implement the interface 
+    <type>XMimeContentType</type> from a string 
+    representation of such a MIME content-type that is conform to 
+    <a href="ftp://ftp.isi.edu/in-notes/rfc2045.txt">Rfc2045</a> and 
     <a href="ftp://ftp.isi.edu/in-notes/rfc2046.txt">Rfc2046</a>.
 
     @see com::sun::star::datatransfer::XMimeContentTypeFactory
@@ -60,11 +60,11 @@ module com { module sun { module star { module datatransfer {
 published service MimeContentTypeFactory
 {
     //-------------------------------------------------------------------------
-    /** Creates an instance that implement the interface
-        <type>XMimeContentType</type> from the string
+    /** Creates an instance that implement the interface 
+        <type>XMimeContentType</type> from the string 
         representation of such a MIME content-types that is conform to
         <a href="ftp://ftp.isi.edu/in-notes/rfc2045.txt">Rfc2045</a>,
-        <a href="ftp://ftp.isi.edu/in-notes/rfc2046.txt">Rfc2046</a>.
+        <a href="ftp://ftp.isi.edu/in-notes/rfc2046.txt">Rfc2046</a>. 
     */
     interface XMimeContentTypeFactory;
 
diff --git a/offapi/com/sun/star/datatransfer/UnsupportedFlavorException.idl b/offapi/com/sun/star/datatransfer/UnsupportedFlavorException.idl
index 0d0ffda23547..0cc5eef93454 100644
--- a/offapi/com/sun/star/datatransfer/UnsupportedFlavorException.idl
+++ b/offapi/com/sun/star/datatransfer/UnsupportedFlavorException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 module com { module sun { module star { module datatransfer {
 
 //=============================================================================
-/** Exception will be thrown if there is a request for data in a
+/** Exception will be thrown if there is a request for data in a 
     <type>DataFlavor</type> that is not supported by a data source.
 
     @see com::sun::star::datatransfer::DataFlavor
@@ -49,6 +49,6 @@ published exception UnsupportedFlavorException: com::sun::star::uno::Exception
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl b/offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl
index aad2882af77b..4844886d437f 100644
--- a/offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl
+++ b/offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,13 +40,13 @@
 module com { module sun { module star { module datatransfer {
 
 //=============================================================================
-/** Interface to be implemented by objects used to translate a <type>DataFlavor</type> to
-    a system dependent data transfer type and vice versa.
+/** Interface to be implemented by objects used to translate a <type>DataFlavor</type> to 
+    a system dependent data transfer type and vice versa. 
 
-    <p>Different platforms use different types to describe data formats available
+    <p>Different platforms use different types to describe data formats available 
     during data exchange operations like clipboard or drag&drop. Windows for instance
-    uses integer values to describe an available clipboard or drag&drop format, Unix
-    X11 uses so called Atoms etc.</p>
+    uses integer values to describe an available clipboard or drag&drop format, Unix 
+    X11 uses so called Atoms etc.</p>	 
 */
 
 published interface XDataFormatTranslator : com::sun::star::uno::XInterface
@@ -59,7 +59,7 @@ published interface XDataFormatTranslator : com::sun::star::uno::XInterface
 
         @returns
         A system dependent data transfer type for the given <type>DataFlavor</type>
-        if there is one available.
+        if there is one available. 
         <p>If the is no system dependent data type for a given <type>DataFlavor</type>
         the returned any is empty.</p>
     */
@@ -71,7 +71,7 @@ published interface XDataFormatTranslator : com::sun::star::uno::XInterface
         @param aSysDataType
         A system dependent data type. If aSysDataType is empty so is the returned <type>DataFlavor</type>.
 
-        @returns
+        @returns		
         A <type>DataFlavor</type> for the given system dependent data transfer type.
         <p>If there is no appropriate mapping for a sytem dependent data type, the returned <type>DataFlavor</type> will be empty.</p>
     */
diff --git a/offapi/com/sun/star/datatransfer/XMimeContentType.idl b/offapi/com/sun/star/datatransfer/XMimeContentType.idl
index ccfee62c6a2b..a91a4bef6a65 100644
--- a/offapi/com/sun/star/datatransfer/XMimeContentType.idl
+++ b/offapi/com/sun/star/datatransfer/XMimeContentType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,8 +40,8 @@
 module com { module sun { module star { module datatransfer {
 
 //-------------------------------------------------------------------------
-/** An implementation of this interface represents a MIME content-type that
-    is conform to <a href="ftp://ftp.isi.edu/in-notes/rfc2045.txt">Rfc2045</a> and
+/** An implementation of this interface represents a MIME content-type that 
+    is conform to <a href="ftp://ftp.isi.edu/in-notes/rfc2045.txt">Rfc2045</a> and 
     <a href="ftp://ftp.isi.edu/in-notes/rfc2046.txt">Rfc2046</a>.
     Instances that implement this interface could be created using the
     interface <type>XMimeContentTypeFactory</type>.
@@ -80,10 +80,10 @@ published interface XMimeContentType : com::sun::star::uno::XInterface
         A list of the names of all parameters of the MIME content-type.
     */
     sequence< string > getParameters( );
-
+    
     //-------------------------------------------------------------------------
     /** To query if a specific parameter is supported.
-
+    
         @param aName
         The name of the parameter to query for.
 
@@ -94,7 +94,7 @@ published interface XMimeContentType : com::sun::star::uno::XInterface
     boolean hasParameter( [in] string aName );
 
     //-------------------------------------------------------------------------
-    /** To get the value of a specified parameter.
+    /**	To get the value of a specified parameter.
 
         @param aName
         The name of the parameter for which the value is requested.
diff --git a/offapi/com/sun/star/datatransfer/XMimeContentTypeFactory.idl b/offapi/com/sun/star/datatransfer/XMimeContentTypeFactory.idl
index 5b7df3168c3b..93b515a1c6b2 100644
--- a/offapi/com/sun/star/datatransfer/XMimeContentTypeFactory.idl
+++ b/offapi/com/sun/star/datatransfer/XMimeContentTypeFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,12 +44,12 @@
 module com { module sun { module star { module datatransfer {
 
 //-------------------------------------------------------------------------
-/** Implementations of this interface do create a
+/** Implementations of this interface do create a 
     <type scope="com::sun::star::datatransfer">XMimeContentType</type> from
-    a given string that represents a MIME content-type
-    (see <a href="ftp://ftp.isi.edu/in-notes/rfc2045.txt">Rfc2045</a> and
+    a given string that represents a MIME content-type 
+    (see <a href="ftp://ftp.isi.edu/in-notes/rfc2045.txt">Rfc2045</a> and 
     <a href="ftp://ftp.isi.edu/in-notes/rfc2046.txt">Rfc2046</a>).
-
+    
 */
 published interface XMimeContentTypeFactory : com::sun::star::uno::XInterface
 {
@@ -57,16 +57,16 @@ published interface XMimeContentTypeFactory : com::sun::star::uno::XInterface
     /** Creates an object that implements <type>XMimeContentType</type>.
 
         @param aContentType
-        A string that represents a MIME content-type as specified in
-        <a href="ftp://ftp.isi.edu/in-notes/rfc2045.txt">Rfc2045</a> and
+        A string that represents a MIME content-type as specified in 
+        <a href="ftp://ftp.isi.edu/in-notes/rfc2045.txt">Rfc2045</a> and 
         <a href="ftp://ftp.isi.edu/in-notes/rfc2046.txt">Rfc2046</a>.
 
         @returns
         An object that implements <type>XMimeContentType</type>.
-
+        
         @throws com::sun::star::lang::IllegalArgumentException
-        if the string does not conform to
-        <a href="ftp://ftp.isi.edu/in-notes/rfc2045.txt">Rfc2045</a> and
+        if the string does not conform to 
+        <a href="ftp://ftp.isi.edu/in-notes/rfc2045.txt">Rfc2045</a> and 
         <a href="ftp://ftp.isi.edu/in-notes/rfc2046.txt">Rfc2046</a>;
         <p><strong>Exception:</strong> Quoted parameter values may contain spaces.</p>
 
diff --git a/offapi/com/sun/star/datatransfer/XSystemTransferable.idl b/offapi/com/sun/star/datatransfer/XSystemTransferable.idl
index ad634d8a6190..a3c0ff9e5448 100644
--- a/offapi/com/sun/star/datatransfer/XSystemTransferable.idl
+++ b/offapi/com/sun/star/datatransfer/XSystemTransferable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ published interface XSystemTransferable: com::sun::star::uno::XInterface
         different platforms.
 
         @param aProcessId
-        The argument aProcessId is a process identifier of the caller's process.
+        The argument aProcessId is a process identifier of the caller's process.		
         The interface implementation must ensure that the system data object can be
         used in that process. If the data object is not valid in the caller process
         then the returned any must be empty.
@@ -66,7 +66,7 @@ published interface XSystemTransferable: com::sun::star::uno::XInterface
     */
     any getData( [in] sequence < byte > aProcessId);
 };
-
-}; }; }; };
+ 
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl b/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl
index 1c766cd1ddd8..d1887eff050f 100644
--- a/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferDataAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@ published interface XTransferDataAccess: com::sun::star::uno::XInterface
     /** To query for the summarized data size in bytes of a sequence of <type>DataFlavor</type>.
 
         @param aFlavorList
-        A squence of requested <type>DataFlavor</type>.
+        A squence of requested <type>DataFlavor</type>. 
         <p>An unsupported <type>DataFlavor</type> will be ignored.</p>
 
         @returns
@@ -66,11 +66,11 @@ published interface XTransferDataAccess: com::sun::star::uno::XInterface
     /** To get all the data of a sequence of <type>DataFlavor</type>.
 
         @param aFlavorList
-        The sequence of requested <type>DataFlavor</type>.
+        The sequence of requested <type>DataFlavor</type>. 
         <p>An unsupported <type>DataFlavor</type> will be ignored.</p>
 
         @returns
-        The data in the requested <type>DataFlavor</type>.
+        The data in the requested <type>DataFlavor</type>. 
         <p>For unsupported <type>DataFlavor</type> an
         empty any will be returned.</p>
      */
@@ -79,6 +79,6 @@ published interface XTransferDataAccess: com::sun::star::uno::XInterface
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/datatransfer/XTransferable.idl b/offapi/com/sun/star/datatransfer/XTransferable.idl
index 3336b2d5db0b..7f1b71fc5740 100644
--- a/offapi/com/sun/star/datatransfer/XTransferable.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,7 +49,7 @@
 module com { module sun { module star { module datatransfer {
 
 //=============================================================================
-/** Interface to be implemented by objects used to provide data for a data
+/** Interface to be implemented by objects used to provide data for a data 
     transfer operation.
 
     @see com::sun::star::datatransfer::DataFlavor
@@ -58,20 +58,20 @@ module com { module sun { module star { module datatransfer {
 published interface XTransferable: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** Called by a data consumer to obtain data from the source in a specified
+    /** Called by a data consumer to obtain data from the source in a specified 
         format.
-
+        
         @param aFlavor
-        Describes the requested data format
+        Describes the requested data format 
 
         @returns
         The data in the specified <type>DataFlavor</type>.
 
-        @throws com::sun::star::io::IOException
+        @throws com::sun::star::io::IOException 
         if the data is no longer available in the requested flavor.
-
+            
         @throws com::sun::star::datatransfer::UnsupportedFlavorException
-        if the requested <type>DataFlavor</type> is not supported.
+        if the requested <type>DataFlavor</type> is not supported.		
     */
     any getTransferData( [in] DataFlavor aFlavor )
         raises ( UnsupportedFlavorException, com::sun::star::io::IOException );
@@ -89,22 +89,22 @@ published interface XTransferable: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /** Checks if the data object supports the specified data flavor.
 
-        @param aFlavor
+        @param aFlavor 
         Describes the format that should be checked
 
         @returns
         A value of <TRUE/> if the <type>DataFlavor</type> is supported by the transfer source.
         <p>A value of <FALSE/> if the <type>DataFlavor</type> is unsupported by the transfer source.</p>
-
+        
         <br/><br/><p><strong>Note: </strong>This method is only for analogy with the JAVA Clipboard interface. To
-        avoid many calls, the caller should instead use
-        <member scope="com::sun::star::datatransfer">XTransferable::getTransferDataFlavors()</member>.
+        avoid many calls, the caller should instead use 
+        <member scope="com::sun::star::datatransfer">XTransferable::getTransferDataFlavors()</member>.		
     */
     boolean isDataFlavorSupported( [in] DataFlavor aFlavor );
 };
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/datatransfer/XTransferableEx.idl b/offapi/com/sun/star/datatransfer/XTransferableEx.idl
index ab388725170f..61945aef9484 100644
--- a/offapi/com/sun/star/datatransfer/XTransferableEx.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferableEx.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,11 +52,11 @@ module com { module sun { module star { module datatransfer {
 published interface XTransferableEx: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** @param requestedFlavors
+    /**	@param requestedFlavors
         Sequence of <type>DataFlavor</type> of interest. Specify an empty sequence for interest
-        in all data flavors with top-level MIME content-types. To get all MIME
+        in all data flavors with top-level MIME content-types. To get all MIME 
         content-types, call <member scope="com::sun::star::datatransfer">XTransferable::getTransferDataFlavors()</member>.
-
+    
         @returns
         The list of the matching supported <type>DataFlavor</type> that were requested. For
         each requested top-level MIME content-type, all supported subtypes are returned.
@@ -66,6 +66,6 @@ published interface XTransferableEx: com::sun::star::uno::XInterface
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/datatransfer/XTransferableSource.idl b/offapi/com/sun/star/datatransfer/XTransferableSource.idl
index 0ff9bca08302..09fafd9df037 100644
--- a/offapi/com/sun/star/datatransfer/XTransferableSource.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferableSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,6 +54,6 @@ published interface XTransferableSource: com::sun::star::uno::XInterface
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl b/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl
index 2cf5c4967597..e616351d2634 100644
--- a/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl b/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl
index c7085041b3d0..8506affcadf7 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/ClipboardEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,6 +56,6 @@ published struct ClipboardEvent: com::sun::star::lang::EventObject
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl b/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl
index 369bfd9c53d0..9159ba0d8c62 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,9 +49,9 @@ module com { module sun { module star { module datatransfer { module clipboard {
  published interface XClipboardManager;
 
 //=============================================================================
-/** The clipboard manager is a one-instance service that holds a list of all
+/** The clipboard manager is a one-instance service that holds a list of all 
     known clipboard instances.
-
+    
     @see XClipboardManager
 */
 published service ClipboardManager
diff --git a/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl
index 7a128ee2d108..c8dc1ba56e54 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl b/offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl
index 5190f52a3ad9..dd71107d231c 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
index 43a8e0e5ba76..bb068d7310dc 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -80,9 +80,9 @@ published service SystemClipboard
 
     //-------------------------------------------------------------------------
     /** Provides the ability to render the complete clipboard content. This
-        interface is only available if the method
+        interface is only available if the method 
         <member scope="com::sun::star::datatransfer::clipboard">XClipboardEx::getRenderingCapabilities()</member>
-        returns Persistant
+        returns Persistant		
     */
     [optional] interface XFlushableClipboard;
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl
index 11fe45a2a239..af3e25e1422c 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboard.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -61,8 +61,8 @@ published interface XClipboard: com::sun::star::uno::XInterface
     XTransferable getContents();
 
     //-------------------------------------------------------------------------
-    /** Sets the current contents of the clipboard to the specified
-        transferable object and registers the specified clipboard owner
+    /** Sets the current contents of the clipboard to the specified 
+        transferable object and registers the specified clipboard owner 
         as the owner of the new contents.
 
         @param xTrans
@@ -73,10 +73,10 @@ published interface XClipboard: com::sun::star::uno::XInterface
         <p>A NULL value is not allowed.</p>
 
         @param xClipboardOwner
-        The new owner of the clipboard.
+        The new owner of the clipboard. 
         <p>NULL is an acceptable value and means that the
         caller is not interested in lost ownership notifications.</p>
-
+        
         @see com::sun::star::datatransfer::XTransferable
         @see com::sun::star::datatransfer::clipboard::XClipboardOwner
     */
@@ -84,10 +84,10 @@ published interface XClipboard: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /** To get the name of the clipboard instance.
-
+        
         @returns
-        The name of this clipboard object.
-        <p>If the returned string is empty the
+        The name of this clipboard object. 
+        <p>If the returned string is empty the 
         clipboard instance ist the system clipboard.</p>
     */
     string getName();
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardEx.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardEx.idl
index 11f0757fe740..1ced3e55ee34 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardEx.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardEx.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory.idl
index 24ded33f7239..0b6efa9fec81 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,11 +41,11 @@
 module com { module sun { module star { module datatransfer { module clipboard {
 
  published interface XClipboard;
-
+                
 //=============================================================================
 /** Should be implemented by a clipboard factory that simplifies the creation of
     multiple clipboard instances.
-
+ 
     @see com::sun::star::datatransfer::clipboard::XClipboard
 */
 
@@ -55,10 +55,10 @@ published interface XClipboardFactory: com::sun::star::uno::XInterface
     /** Creates a new named clipboard instance.
 
         @returns
-        A newly created instance of a <type>GenericClipboard</type>
-        implementation.
+        A newly created instance of a <type>GenericClipboard</type> 
+        implementation. 
 
-        @param aName
+        @param aName 
         The name the clipboard should have.
 
         @throws com::sun::star::lang::IllegalArgumentException
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardListener.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardListener.idl
index 36305a4ae412..dd409584190a 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardListener.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ module com { module sun { module star { module datatransfer { module clipboard {
 
 //=============================================================================
 /** Interface to be implemented to receive notifications on clipboard content
-    changes.
+    changes.	
 */
 
 published interface XClipboardListener: com::sun::star::lang::XEventListener
@@ -51,7 +51,7 @@ published interface XClipboardListener: com::sun::star::lang::XEventListener
     /** The content of the clipboard has changed.
 
         @param event
-        The event object containing the new clipboard content.
+        The event object containing the new clipboard content. 
 
         @see com::sun::star::datatransfer::clipboard::ClipboardEvent
     */
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardManager.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardManager.idl
index e9626c9fcd84..3fa46e053594 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardManager.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,10 +49,10 @@
 module com { module sun { module star { module datatransfer { module clipboard {
 
  published interface XClipboard;
-
+                
 //=============================================================================
 /** This interface is used to retrieve, add, or remove clipboard instances.
-
+ 
     @see com::sun::star::datatransfer::clipboard::XClipboard
 */
 
@@ -60,12 +60,12 @@ published interface XClipboardManager: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** Get a clipboard instance by name.
-
-        @returns
+        
+        @returns 
         The clipboard object with the specified name.
 
-        @param aName
-        The name of clipboard to return. To retrieve the default (system)
+        @param aName 
+        The name of clipboard to return. To retrieve the default (system) 
         clipboard, pass an empty string.
 
         @throws com::sun::star::container::NoSuchElementException
@@ -78,7 +78,7 @@ published interface XClipboardManager: com::sun::star::uno::XInterface
     /** Add a clipboard instance to the manager's list.
 
         @param xClipboard
-        The clipboard to add.
+        The clipboard to add. 
 
         @throws com::sun::star::IllegalArgumentException
         if xClipboard is not a valid clipboard.
@@ -93,7 +93,7 @@ published interface XClipboardManager: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /** Removes the clipboard with the specified name from the list.
 
-        @param aName
+        @param aName 
         The name of the clipboard to remove.
     */
     void removeClipboard( [in] string aName );
@@ -101,7 +101,7 @@ published interface XClipboardManager: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /** Get a list of a managed clipboards.
 
-        @returns
+        @returns 
         A sequence of the names of all available clipboards.
      */
     sequence < string > listClipboardNames();
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier.idl
index 6cfbe19c31f5..5a930b5ada82 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardNotifier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,7 +52,7 @@ published interface XClipboardNotifier: com::sun::star::uno::XInterface
         @param listener
         The object receiving the notifications.
     */
-    [oneway] void addClipboardListener( [in] XClipboardListener listener );
+    [oneway] void addClipboardListener( [in] XClipboardListener listener ); 
 
     //-------------------------------------------------------------------------
     /** Removes listener from notification list.
@@ -60,7 +60,7 @@ published interface XClipboardNotifier: com::sun::star::uno::XInterface
         @param listener
         The object to remove from notification list.
     */
-    [oneway] void removeClipboardListener( [in] XClipboardListener listener );
+    [oneway] void removeClipboardListener( [in] XClipboardListener listener ); 
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl b/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl
index 69127087617d..d152b77bfc4b 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XClipboardOwner.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ module com { module sun { module star { module datatransfer { module clipboard {
  published interface XClipboard;
 
 //=============================================================================
-/** The owner of a transferable object may pass this interface to the
+/** The owner of a transferable object may pass this interface to the 
     clipboard instance.
 
     @see com::sun::star::datatransfer::clipboard::XClipboard
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard.idl
index d3e1682090f7..514e42a5975b 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XFlushableClipboard.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,13 +37,13 @@
 module com { module sun { module star { module datatransfer { module clipboard {
 
 //=============================================================================
-/** An interface for flushable clipboards may optionally be implemented by a
-    system clipboard service.
+/** An interface for flushable clipboards may optionally be implemented by a 
+    system clipboard service.	
 
     @see com::sun::star::datatransfer::clipboard::SystemClipboard
 */
 
-
+      
 published interface XFlushableClipboard: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/datatransfer/dnd/DNDConstants.idl b/offapi/com/sun/star/datatransfer/dnd/DNDConstants.idl
index 2f3ec5a7912c..7809b762f4a6 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DNDConstants.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DNDConstants.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,8 +33,8 @@
 module com { module sun { module star { module datatransfer { module dnd {
 
 //=============================================================================
-/** These values represent the type of action or actions to be performed by a
-    Drag and Drop operation.
+/** These values represent the type of action or actions to be performed by a 
+    Drag and Drop operation.  
 */
 
 published constants DNDConstants
@@ -42,7 +42,7 @@ published constants DNDConstants
     //=============================================================================
     /** No action.
     */
-
+    
     const byte ACTION_NONE = 0x00;
 
     //=============================================================================
@@ -50,31 +50,31 @@ published constants DNDConstants
     */
 
     const byte ACTION_COPY = 0x01;
-
+    
     //=============================================================================
     /** Action move.
     */
 
     const byte ACTION_MOVE = 0x02;
-
+     
     //=============================================================================
     /** Action copy or move.
     */
 
     const byte ACTION_COPY_OR_MOVE = 0x03;
-
+    
     //=============================================================================
     /** Action link.
     */
 
     const byte ACTION_LINK = 0x04;
-
+    
     //=============================================================================
     /** Action reference.
     */
 
     const byte ACTION_REFERENCE = 0x04;
-
+    
     //=============================================================================
     /** Action default.
     */
diff --git a/offapi/com/sun/star/datatransfer/dnd/DragGestureEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DragGestureEvent.idl
index bc23cd376ced..dccf954967d5 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DragGestureEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DragGestureEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,17 +40,17 @@ module com { module sun { module star { module datatransfer { module dnd {
 
 //=============================================================================
 /** A DragGestureEvent is passed to the method <member>XDragGestureListener::dragGestureRecognized()</member>
-     when a particular <type>XDragGestureRecognizer</type> detects that a platform
+     when a particular <type>XDragGestureRecognizer</type> detects that a platform 
      dependent drag initiating gesture has occurred on the component that it is
-     tracking.
+     tracking. 	
 */
 
 published struct DragGestureEvent: com::sun::star::lang::EventObject
 {
     //-------------------------------------------------------------------------
-    /** The action selected by the user.
+    /** The action selected by the user. 
         <p>Different constants may be combined using a logical OR.</p>
-        It's further possible to combine the ACTION_DEFAULT with one of the other
+        It's further possible to combine the ACTION_DEFAULT with one of the other 
         actions defined in <type scope="com::sun::star::datatransfer::dnd">DNDConstants</type>.
         This means the user did not press any key during the Drag and Drop operation
         and the action that was combined with ACTION_DEFAULT is the system default action.</p>
@@ -83,7 +83,7 @@ published struct DragGestureEvent: com::sun::star::lang::EventObject
 
     <p>The initial trigger event will presumably be a <type scope="com::sun::star::awt">MouseEvent</type> event.
     If it is not, the implementation should either react accordingly or
-    presume that the left mouse button was clicked. </p>
+    presume that the left mouse button was clicked.	</p>
     */
 
     any Event;
diff --git a/offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl
index 4a51d894e1a6..f0e91f634c9a 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DragSourceDragEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,12 +37,12 @@
 module com { module sun { module star { module datatransfer { module dnd {
 
 //=============================================================================
-/** The <type>DragSourceDragEvent</type> is delivered from an object that
-    implements the <type>XDragSourceContext</type> to the
-    currently registered drag source listener.
+/** The <type>DragSourceDragEvent</type> is delivered from an object that 
+    implements the <type>XDragSourceContext</type> to the 
+    currently registered drag source listener. 
 
     <p>It contains state regarding the current state of the operation to enable
-    the operations initiator to provide the end user with the appropriate drag
+    the operations initiator to provide the end user with the appropriate drag 
     over feedback.</p>
 
     @see com::sun::star::datatransfer::dnd::XDragSourceListener
@@ -56,7 +56,7 @@ published struct DragSourceDragEvent: com::sun::star::datatransfer::dnd::DragSou
         @see com::sun::star::datatransfer::dnd::DNDConstants
      */
     byte DropAction;
-
+    
     //-------------------------------------------------------------------------
     /** The user's currently selected drop action.
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl
index 3ff38b281d17..d3164f0a0132 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DragSourceDropEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,10 +38,10 @@ module com { module sun { module star { module datatransfer { module dnd {
 
 //=============================================================================
 /** The <type>DragSourceDropEvent</type> is delivered from an object that implements
-    <type>XDragSourceContext</type> to its currently registered drag source listener's.
+    <type>XDragSourceContext</type> to its currently registered drag source listener's. 
 
-    <p>It contains sufficient information for the originator of the operation to
-    provide appropriate feedback to the end user when the operation completes.</p>
+    <p>It contains sufficient information for the originator of the operation to 
+    provide appropriate feedback to the end user when the operation completes.</p> 
 
     @see com::sun::star::datatransfer::dnd::XDragSourceListener
 */
@@ -50,10 +50,10 @@ published struct DragSourceDropEvent: com::sun::star::datatransfer::dnd::DragSou
 {
     //-------------------------------------------------------------------------
     /** The action performed by the target on the subject of the drop.
-
+        
         @see com::sun::star::datatransfer::dnd::DNDConstants
      */
-
+     
     byte DropAction;
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/datatransfer/dnd/DragSourceEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DragSourceEvent.idl
index 3cf97f7c4418..f8d580b44c3a 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DragSourceEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DragSourceEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ module com { module sun { module star { module datatransfer { module dnd {
 /** This class is the base class for <type>DragSourceDragEvent</type> and <type>DragSourceDropEvent</type>.
 
     <p>To access the <type>XDragSource</type> that originated this event, use the
-    <member scope="com::sun::star::lang">EventObject::Source</member> member of
+    <member scope="com::sun::star::lang">EventObject::Source</member> member of 
     this object.</p>
 */
 
@@ -54,7 +54,7 @@ published struct DragSourceEvent: com::sun::star::lang::EventObject
 
         @see com::sun::star::datatransfer::dnd::XDragSourceContext
      */
-
+     
     XDragSourceContext DragSourceContext;
 
     //-------------------------------------------------------------------------
@@ -62,7 +62,7 @@ published struct DragSourceEvent: com::sun::star::lang::EventObject
 
         @see com::sun::star::datatransfer::dnd::XDragSource
      */
-
+     
     XDragSource DragSource;
 };
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl
index 688cfe843d52..5e40014ff59c 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,12 +41,12 @@
 module com { module sun { module star { module datatransfer { module dnd {
 
 //=============================================================================
-/** The <type>DropTargetDragEnterEvent</type> is delivered from the drop target to the
-    currently registered drop target listeners whenever the logical cursor
-    associated with a Drag and Drop operation enters the visible geometry
+/** The <type>DropTargetDragEnterEvent</type> is delivered from the drop target to the 
+    currently registered drop target listeners whenever the logical cursor 
+    associated with a Drag and Drop operation enters the visible geometry 
     of a window associated with a drop target.
 
-    <p>It contains the <type scope="com::sun::star::datatransfer">DataFlavor</type>
+    <p>It contains the <type scope="com::sun::star::datatransfer">DataFlavor</type> 
     types supported by the transferable object of the current Drag and Drop operation. </p>
 
     @see com::sun::star::datatransfer::XTransferable
diff --git a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl
index d8280d0e5454..1c5314cd4055 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DropTargetDragEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,11 +39,11 @@ module com { module sun { module star { module datatransfer { module dnd {
  published interface XDropTargetDragContext;
 
 //=============================================================================
-/** The <type>DropTargetDragEvent</type> is delivered from the drop target
-    to the currently registered drop target listener.
+/** The <type>DropTargetDragEvent</type> is delivered from the drop target 
+    to the currently registered drop target listener. 
 
     <p>It contains information regarding the current state of the operation to enable
-    the operations initiator to provide the end user with the appropriate drag
+    the operations initiator to provide the end user with the appropriate drag 
     over feedback.</p>
 
     @see com::sun::star::datatransfer::dnd::XDropTargetListener
@@ -58,15 +58,15 @@ published struct DropTargetDragEvent: com::sun::star::datatransfer::dnd::DropTar
      */
 
     XDropTargetDragContext Context;
-
+    
     //-------------------------------------------------------------------------
     /** This value represents the currently selected drop action.
-
+        
         @see com::sun::star::datatransfer::dnd::DNDConstants
      */
 
     byte DropAction;
-
+    
     //-------------------------------------------------------------------------
     /** The cursor's current x location within the window's coordinates.
      */
@@ -83,7 +83,7 @@ published struct DropTargetDragEvent: com::sun::star::datatransfer::dnd::DropTar
     /** This value represents the action or actions supported by the source.
         This may be a combination of arbitrary source actions except ACTION_DEFAULT.
         <p>To combine different actions use a logical OR.</p>
-
+        
         @see com::sun::star::datatransfer::dnd::DNDConstants
      */
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl
index 661bfbdeae0c..ac68824e5920 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DropTargetDropEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,11 +43,11 @@ module com { module sun { module star { module datatransfer { module dnd {
  published interface XDropTargetDropContext;
 
 //=============================================================================
-/** The <type>DropTargetDropEvent</type> is delivered from the drop target to
-    its currently registered drop target listener.
+/** The <type>DropTargetDropEvent</type> is delivered from the drop target to 
+    its currently registered drop target listener. 
 
-    <p>It contains sufficient information for the originator of the operation to
-    provide appropriate feedback to the end user when the operation completes.</p>
+    <p>It contains sufficient information for the originator of the operation to 
+    provide appropriate feedback to the end user when the operation completes.</p> 
 */
 
 published struct DropTargetDropEvent: com::sun::star::datatransfer::dnd::DropTargetEvent
@@ -59,9 +59,9 @@ published struct DropTargetDropEvent: com::sun::star::datatransfer::dnd::DropTar
      */
 
     XDropTargetDropContext Context;
-
+    
     //-------------------------------------------------------------------------
-    /** This value represents the action or actions selected by the user at
+    /** This value represents the action or actions selected by the user at 
         the time of the drop.
 
         <p>If more than one action is specified, the <type>XDropTargetListener</type>
diff --git a/offapi/com/sun/star/datatransfer/dnd/DropTargetEvent.idl b/offapi/com/sun/star/datatransfer/dnd/DropTargetEvent.idl
index c73958afce3a..65e644a29832 100644
--- a/offapi/com/sun/star/datatransfer/dnd/DropTargetEvent.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/DropTargetEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,10 +38,10 @@ module com { module sun { module star { module datatransfer { module dnd {
 
 //=============================================================================
 /** This class is the base class for <type>DropTargetDragEvent</type> and
-     <type>DropTargetDropEvent</type>.
+     <type>DropTargetDropEvent</type>. 
 
     <p>To access the <type>XDropTarget</type> that originated this event, use the
-    <member scope="com::sun::star::lang">EventObject::Source</member> member of
+    <member scope="com::sun::star::lang">EventObject::Source</member> member of 
     this object.</p>
 */
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl b/offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl
index 80397604cdc8..93dc8189a7b9 100644
--- a/offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/InvalidDNDOperationException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,11 +37,11 @@
 module com { module sun { module star { module datatransfer { module dnd {
 
 //=============================================================================
-/** This exception is thrown by various methods in the datatransfer.dnd
-    package.
+/** This exception is thrown by various methods in the datatransfer.dnd 
+    package. 
 
     <p>It is usually thrown to indicate that the target in question is unable
-    to undertake the requested operation at the present time, since the
+    to undertake the requested operation at the present time, since the 
     underlying Drag and Drop system is not in the appropriate state.</p>
 */
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl b/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl
index 7227f805f642..14bd59b8918f 100644
--- a/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -67,13 +67,13 @@ published service OleDragSource
     interface XDragSource;
 
     //-------------------------------------------------------------------------
-    /** The service expects a byte sequence uniquely identifying the machine as
+    /** The service expects a byte sequence uniquely identifying the machine as 
         the first, and only, parameter. This idenifier should be checked to
-        ensure that the window ids used for creating DropTargets are valid for
+        ensure that	the window ids used for creating DropTargets are valid for
         the service, that is, come from the same machine.
 
         <p>TODO: specify how such a machine id should look like.</p>
-
+    
         The second parameter is a window handle of the native windows window.
         Is is passed as an unsigned long.
     */
diff --git a/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl b/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl
index de1431e59e65..b0e4cccc7d3d 100644
--- a/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl b/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl
index c301d81e24f8..33ab110706b3 100644
--- a/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,8 +53,8 @@ module com { module sun { module star { module datatransfer { module dnd {
  published interface XDragSource;
 
 //=============================================================================
-/** This service connects the Java-like UNO Drag and Drop protocol to the
-    X Drag and Drop protocol used on X-Servers to transfer data between
+/** This service connects the Java-like UNO Drag and Drop protocol to the 
+    X Drag and Drop protocol used on X-Servers to transfer data between 
     applications via Drag and Drop operations.
 
     @see XDragSource
@@ -68,7 +68,7 @@ published service X11DragSource
     interface XDragSource;
 
     //-------------------------------------------------------------------------
-    /** The service expects an instance of
+    /** The service expects an instance of 
         <type scope="com::sun::star::awt">XDisplayConnection</type>
         as the first parameter.
     */
diff --git a/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl b/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl
index 0ed961ede186..94ac8536b233 100644
--- a/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,8 +53,8 @@ module com { module sun { module star { module datatransfer { module dnd {
  published interface XDropTarget;
 
 //=============================================================================
-/** This service connects the Java-like UNO Drag and Drop protocol to the
-    X Drag and Drop protocol used on X-Servers to transfer data between
+/** This service connects the Java-like UNO Drag and Drop protocol to the 
+    X Drag and Drop protocol used on X-Servers to transfer data between 
     application via Drag and Drop operations.
 
     @see XDragSource
@@ -69,7 +69,7 @@ published service X11DropTarget
     interface XDropTarget;
 
     //-------------------------------------------------------------------------
-    /** The service expects an instance of
+    /** The service expects an instance of 
         <type scope="com::sun::star::awt">XDisplayConnection</type>
          as the first parameter. The second parameter must be a long
         that contains an XWindow window which shall be registered
diff --git a/offapi/com/sun/star/datatransfer/dnd/XAutoscroll.idl b/offapi/com/sun/star/datatransfer/dnd/XAutoscroll.idl
index 37efc1d7f6cd..e54d341ab669 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XAutoscroll.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XAutoscroll.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,19 +39,19 @@ module com { module sun { module star { module datatransfer { module dnd {
 //=============================================================================
 /** Interface for autoscroll support.
 
-    <p>During Drag and Drop operations it is possible that a user may wish to drop the
+    <p>During Drag and Drop operations it is possible that a user may wish to drop the 
     subject of the operation on a region of a scrollable GUI control that is
-    not currently visible to the user.</p>
+    not currently visible to the user.</p>	
 
     <p>In such situations it is desirable that the GUI control detect this and
     institute a scroll operation in order to make obscured region(s) visible to
     the user. This feature is known as autoscrolling.</p>
 
-    <p>If a GUI control is both an active DropTarget and is also scrollable,
+    <p>If a GUI control is both an active DropTarget and is also scrollable, 
     it can receive notifications of autoscrolling gestures by the user from
     the Drag and Drop system by implementing this interface.</p>
 
-    <p>An autoscrolling gesture is initiated by the user by keeping the drag
+    <p>An autoscrolling gesture is initiated by the user by keeping the drag 
     cursor motionless with a border region of the Component, referred to as
     the "autoscrolling region", for a predefined period of time, this will
     result in repeated scroll requests to the Component until the drag Cursor
@@ -69,18 +69,18 @@ published interface XAutoscroll: com::sun::star::uno::XInterface
         @param cursorLocationY
         Y location of the cursor in pixel.
     */
-
+    
     [oneway] void autoscroll( [in] long cursorLocationX, [in] long cursorLocationY );
-
+    
     //-------------------------------------------------------------------------
     /** Returns the regions describing the autoscrolling region.
 
-        @returns
-        The regions describing the autoscrolling region or border
+        @returns 
+        The regions describing the autoscrolling region or border 
         relative to the geometry of the implementing component.
     */
-
-    any getAutoscrollRegion();
+    
+    any getAutoscrollRegion(); 
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragGestureListener.idl b/offapi/com/sun/star/datatransfer/dnd/XDragGestureListener.idl
index 3aa14195448a..ca8a8fed5a5b 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragGestureListener.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragGestureListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,10 +41,10 @@
 module com { module sun { module star { module datatransfer { module dnd {
 
 //=============================================================================
-/** This interface will be used by a <type>XDragGestureRecognizer</type>
-    when it detects a drag initiating gesture.
+/** This interface will be used by a <type>XDragGestureRecognizer</type> 
+    when it detects a drag initiating gesture. 
 
-    <p>The implementor of this interface is responsible for starting the drag
+    <p>The implementor of this interface is responsible for starting the drag 
     as a result of receiving such notification.</p>
 
 */
@@ -52,8 +52,8 @@ module com { module sun { module star { module datatransfer { module dnd {
 published interface XDragGestureListener: com::sun::star::lang::XEventListener
 {
     //-------------------------------------------------------------------------
-    /** A <type>XDragGestureRecognizer</type> has detected a platform-dependent
-        drag initiating gesture and is notifying this listener in order
+    /** A <type>XDragGestureRecognizer</type> has detected a platform-dependent 
+        drag initiating gesture and is notifying this listener in order 
         for it to initiate the action for the user.
 
         @param dge
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer.idl b/offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer.idl
index 1d0fc5b63d13..29b7b8fd97f2 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragGestureRecognizer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,11 +39,11 @@ module com { module sun { module star { module datatransfer { module dnd {
  published interface XDragGestureListener;
 
 //=============================================================================
-/** This interface is implemented by a view or window that supports drag
+/** This interface is implemented by a view or window that supports drag 
     operations.
 
     <p>Different to Java, the association between view and interface is fixed
-    and cannot be changed. Otherwise, the AWT messaging would have to be
+    and cannot be changed. Otherwise, the AWT messaging would have to be 
     implemented for any window supporting Drag and Drop operations, which would
     be a performance issue.</p>
 */
@@ -51,29 +51,29 @@ module com { module sun { module star { module datatransfer { module dnd {
 published interface XDragGestureRecognizer: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** Registers a new <type>XDragGestureListener</type>.
+    /** Registers a new <type>XDragGestureListener</type>. 
 
         @param dgl
-        The <type>XDragGestureListener</type> to register with this
+        The <type>XDragGestureListener</type> to register with this 
         <type>XDragGestureRecognizer</type>.
     */
-
+    
     [oneway] void addDragGestureListener( [in] XDragGestureListener dgl );
-
+    
     //-------------------------------------------------------------------------
     /** Unregisters the specified <type>XDragGestureListener</type>.
 
         @param dgl
-        The <type>XDragGestureListener</type> to register with this
+        The <type>XDragGestureListener</type> to register with this 
         <type>XDragGestureRecognizer</type>.
     */
-
+    
     [oneway] void removeDragGestureListener( [in] XDragGestureListener dgl );
 
     //-------------------------------------------------------------------------
     /** Reset the recognizer. If it is currently recognizing a gesture, ignore it.
     */
-
+    
     void resetRecognizer();
 };
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragSource.idl b/offapi/com/sun/star/datatransfer/dnd/XDragSource.idl
index a67de276c1a5..5d2771dd9bfc 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragSource.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,27 +53,27 @@ module com { module sun { module star { module datatransfer { module dnd {
 //=============================================================================
 /** This interface is implemented by a view or window that supports drag
     operations and will be received as part of a <type>DragGestureEvent</type>
-    through a <member scope="com::sun::star::datatransfer::dnd">XDragGestureListener::dragGestureRecognized()</member>
+    through a <member scope="com::sun::star::datatransfer::dnd">XDragGestureListener::dragGestureRecognized()</member> 
     callback.
 
     <p>Differently to Java, the association between view and interface is fixed
-    and can not be changed. Otherwise, the AWT messaging would have to be
+    and can not be changed. Otherwise, the AWT messaging would have to be 
     implemented for any window supporting Drag and Drop operations, which would
     be a real performance issue.</p>
 */
 
 published interface XDragSource: com::sun::star::uno::XInterface
 {
-
+  
     //-------------------------------------------------------------------------
     /** In order to query if drag image support is available.
 
-        @returns
-        A boolean indicating whether or not drag image support is
-        available on the underlying platform.
+        @returns 
+        A boolean indicating whether or not drag image support is 
+        available on the underlying platform. 
     */
-
-    boolean isDragImageSupported();
+    
+    boolean isDragImageSupported(); 
 
     //-------------------------------------------------------------------------
     /** To get the default cursor for a specified drag action.
@@ -81,24 +81,24 @@ published interface XDragSource: com::sun::star::uno::XInterface
         @param dragAction
         A drag action as specified in <type>DNDConstants</type>.
 
-        @returns
+        @returns 
         The default drag cursor for the specified drag action.
         <p>The returned value may be used as parameter for the method
         <member scope="com::sun::star::datatransfer::dnd">XDragSourceContext::setCursor()</member>.</p>
     */
-
-    long getDefaultCursor( [in] byte dragAction )
+    
+    long getDefaultCursor( [in] byte dragAction ) 
         raises( com::sun::star::lang::IllegalArgumentException );
 
     //-------------------------------------------------------------------------
     /** Starts the drag operation.
 
-        <p>Note: this call does <em>not</em> block until the drag and drop
+        <p>Note: this call does <em>not</em> block until the drag and drop 
         operation ends. If the Drag and Drop system is unable to initiate
         a drag operation or if the user attempts to start a drag while an
         existing drag operation is still executing, the action fails immediately.
-        This is indicated by calling
-        <member scope="com::sun::star::datatransfer::dnd">XDragSourceListener::dragDropEnd()</member>
+        This is indicated by calling 
+        <member scope="com::sun::star::datatransfer::dnd">XDragSourceListener::dragDropEnd()</member> 
         on the parameter listener with a DragSourceDragEvent showing a failure.</p>
 
         @param trigger
@@ -113,22 +113,22 @@ published interface XDragSource: com::sun::star::uno::XInterface
 
         @param image
         The initial drag image id or 0 as default.
-
+        
         @param trans
         The transferable object dragged.
 
         @param listener
         The <type>XDragSourceListener</type>.
-
-        @see com::sun::star::datatransfer::XTransferable
+            
+        @see com::sun::star::datatransfer::XTransferable	
     */
-
+    
     [oneway] void startDrag(
         [in] DragGestureEvent trigger,
         [in] byte sourceActions,
-        [in] long cursor,
+        [in] long cursor, 
         [in] long image,
-        [in] com::sun::star::datatransfer::XTransferable trans,
+        [in] com::sun::star::datatransfer::XTransferable trans,	
         [in] XDragSourceListener listener );
 };
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragSourceContext.idl b/offapi/com/sun/star/datatransfer/dnd/XDragSourceContext.idl
index 3c212d8999b0..c56c6bede19c 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragSourceContext.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragSourceContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,16 +39,16 @@ module com { module sun { module star { module datatransfer { module dnd {
  published interface XDragSourceListener;
 
 //=============================================================================
-/** The drag source context class is responsible for managing the initiator side
-    of the Drag and Drop protocol.
+/** The drag source context class is responsible for managing the initiator side 
+    of the Drag and Drop protocol. 
 
-    <p>In particular, it is responsible for managing event notifications to the
-    DragSourceListener and providing the Transferable state to enable the data
+    <p>In particular, it is responsible for managing event notifications to the 
+    DragSourceListener and providing the Transferable state to enable the data 
     transfer. </p>
 
     <p>An instance of this class is created as a result of the method <member>XDragSource::startDrag()</member>
-    being successfully invoked. This instance is responsible
-    for tracking the state of the operation on behalf of the drag source and
+    being successfully invoked. This instance is responsible 
+    for tracking the state of the operation on behalf of the drag source and 
     dispatching state changes to the drag source listener. </p>
 
     @see com::sun::star::datatransfer::dnd::XDragSourceContext
@@ -60,10 +60,10 @@ published interface XDragSourceContext: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /** Get the identifier of the currently used cursor.
 
-        @returns
+        @returns 
         The currently selected drag cursor.
     */
-
+    
     long getCurrentCursor();
 
     //-------------------------------------------------------------------------
@@ -74,29 +74,29 @@ published interface XDragSourceContext: com::sun::star::uno::XInterface
         <p>Invalid cursor identifiers will be ignored.</p>
 
         @param cursorId
-        The identifier the drag source returned when registering the cursor.
+        The identifier the drag source returned when registering the cursor. 
     */
-
+    
     [oneway] void setCursor( [in] long cursorId );
 
     //-------------------------------------------------------------------------
-    /** This method sets the current drag image.
+    /** This method sets the current drag image. 
 
         @param dragImage
         The identifier the drag source returned when registering the image (0 = none).
         Invalid identifier will be ignored.
     */
-
+    
     [oneway] void setImage( [in] long imageId );
 
     //-------------------------------------------------------------------------
-    /** This method notifies the context that the
-        <type scope="com::sun::star::datatransfer">DataFlavor</type> types
+    /** This method notifies the context that the 
+        <type scope="com::sun::star::datatransfer">DataFlavor</type> types 
         of the transferable object have changed.
-
-        @see com::sun::star::datatransfer::XTransferable
+        
+        @see com::sun::star::datatransfer::XTransferable	
     */
-
+    
     [oneway] void transferablesFlavorsChanged();
 };
 
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDragSourceListener.idl b/offapi/com/sun/star/datatransfer/dnd/XDragSourceListener.idl
index b15896be1e6a..5e745982d2b8 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDragSourceListener.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDragSourceListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,7 +55,7 @@ module com { module sun { module star { module datatransfer { module dnd {
 published interface XDragSourceListener: com::sun::star::lang::XEventListener
 {
     //-------------------------------------------------------------------------
-    /** This method is invoked to signify that the Drag and Drop operation is
+    /** This method is invoked to signify that the Drag and Drop operation is 
         complete.
 
         @param dsde
@@ -67,19 +67,19 @@ published interface XDragSourceListener: com::sun::star::lang::XEventListener
       //-------------------------------------------------------------------------
     /** Called as the hotspot enters a platform dependent drop site.
 
-        <p><strong>NOTE:</strong> currently this notification can not be ensured by all
+        <p><strong>NOTE:</strong> currently this notification can not be ensured by all 
         implementations. Do not rely on it ! </p>
 
         @param dsde
         The <type>DragSourceDragEvent</type>.
     */
-
+        
     [oneway] void dragEnter( [in] DragSourceDragEvent dsde );
 
       //-------------------------------------------------------------------------
     /** Called as the hotspot exits a platform dependent drop site.
 
-        <p><strong>NOTE:</strong> Currently this notification can not be ensured by all
+        <p><strong>NOTE:</strong> Currently this notification can not be ensured by all 
         implementations. Do not rely on it ! </p>
 
         @param dse
@@ -98,7 +98,7 @@ published interface XDragSourceListener: com::sun::star::lang::XEventListener
     [oneway] void dragOver( [in] DragSourceDragEvent dsde );
 
       //-------------------------------------------------------------------------
-    /** Called when the user has modified the drop gesture.
+    /** Called when the user has modified the drop gesture.	
 
         @param dsde
         The <type>DragSourceEvent</type>.
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDropTarget.idl b/offapi/com/sun/star/datatransfer/dnd/XDropTarget.idl
index f4b52182583a..83770e8bdddf 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDropTarget.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDropTarget.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,11 +43,11 @@ module com { module sun { module star { module datatransfer { module dnd {
  published interface XDropTargetListener;
 
 //=============================================================================
-/** This interface is implemented by a view or window that supports drop
+/** This interface is implemented by a view or window that supports drop 
     operations.
 
     <p>Differently to Java, the association between view and interface is fixed
-    and cannot be changed. Otherwise, the AWT messaging would have to be
+    and cannot be changed. Otherwise, the AWT messaging would have to be 
     implemented for any window supporting Drag and Drop operations, which would
     be a performance issue.</p>
 */
@@ -74,42 +74,42 @@ published interface XDropTarget: com::sun::star::uno::XInterface
     */
 
     [oneway] void removeDropTargetListener( [in] XDropTargetListener dtl );
-
+    
     //-------------------------------------------------------------------------
     /** Indicates either a drop target object is active or not.
-
+        
         @returns
-        A boolean indicating whether or not this drop target object is
+        A boolean indicating whether or not this drop target object is 
         currently active, that is ready to accept drops.
     */
-
+    
     boolean isActive();
 
     //-------------------------------------------------------------------------
-    /** Sets the drop target object active or inactive.
+    /** Sets the drop target object active or inactive. 
 
         @param active
         A value of <TRUE/> sets the drop target object active.
         <p>A value of <FALSE/> sets the drop target object inactive.
     */
-
+    
     void setActive( [in] boolean active );
 
     //-------------------------------------------------------------------------
     /** Determine the actions supported by a drop target.
-
-        @returns
+        
+        @returns 
         The current action or actions supported by this drop target.
 
         <p>By default this will include all drag and drop actions.</p>
-
+        
         @see com::sun::star::datatransfer::dnd::DNDConstants
     */
-
+    
     byte getDefaultActions();
-
+    
     //-------------------------------------------------------------------------
-    /** Sets the default acceptable actions for this drop target.
+    /**	Sets the default acceptable actions for this drop target.
 
         <p>This method is a way to reduce the number of Drag and Drop events
         by blocking events for actions not supported by this target.</p>
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext.idl b/offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext.idl
index 261ad3a857f0..c05decfaad8e 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDropTargetDragContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,21 +43,21 @@ module com { module sun { module star { module datatransfer { module dnd {
 //=============================================================================
 /** This interface is implemented by any drop target context object.
 
-    <p>A drop target context is created whenever the logical cursor associated
-    with a Drag and Drop operation moves within the visible geometry of a
+    <p>A drop target context is created whenever the logical cursor associated 
+    with a Drag and Drop operation moves within the visible geometry of a 
     window associated with a drop target. </p>
-
-    <p>The drop target context provides the mechanism for a potential receiver
-    of a drop operation to both provide the end user with the appropriate drag
+    
+    <p>The drop target context provides the mechanism for a potential receiver 
+    of a drop operation to both provide the end user with the appropriate drag 
     under feedback and effect the subsequent data transfer, if appropriate. </p>
 */
 
 published interface XDropTargetDragContext: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** Accept the Drag.
+    /** Accept the Drag. 
 
-        <p>This method should be called from the methods of <type>XDropTargetListener</type>
+        <p>This method should be called from the methods of <type>XDropTargetListener</type> 
         <ul>
             <li><member>XDropTargetListener::dragEnter()</member></li>
             <li><member>XDropTargetListener::dragOver()</member></li>
@@ -72,11 +72,11 @@ published interface XDropTargetDragContext: com::sun::star::uno::XInterface
         @see DNDConstants
         @see DropTargetDragEvent
     */
-
+           
     [oneway] void acceptDrag( [in] byte dragOperation );
 
     //-------------------------------------------------------------------------
-    /** Reject the drag as a result of examining the available
+    /** Reject the drag as a result of examining the available 
         <type scope="com::sun::star::datatransfer">DataFlavor</type> types
         received in the <member scope="com::sun::star::datatransfer::dnd">XDropTargetListener::dragEnter()</member> method.
     */
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext.idl b/offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext.idl
index 6cd354a92b2e..59760d52f8c9 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDropTargetDropContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,22 +43,22 @@ module com { module sun { module star { module datatransfer { module dnd {
 //=============================================================================
 /** This interface is implemented by any drop target context object.
 
-    <p>A DropTargetContext is created whenever the logical cursor associated
-    with a Drag and Drop operation moves within the visible geometry of a
+    <p>A DropTargetContext is created whenever the logical cursor associated 
+    with a Drag and Drop operation moves within the visible geometry of a 
     window associated with a DropTarget. </p>
 
-    <p>The drop target context provides the mechanism for a potential receiver
-    of a drop operation to provide the end user with the appropriate drag
+    <p>The drop target context provides the mechanism for a potential receiver 
+    of a drop operation to provide the end user with the appropriate drag 
     under feedback and to effect the subsequent data transfer, if appropriate. </p>
 */
 
 published interface XDropTargetDropContext : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** Accept the Drop.
+    /** Accept the Drop. 
 
-        <p>This method should be called from the
-        <member scope="com::sun::star::datatransfer::dnd">XDropTargetListener::drop()</member>
+        <p>This method should be called from the 
+        <member scope="com::sun::star::datatransfer::dnd">XDropTargetListener::drop()</member> 
         method if the implementation wishes to accept the drop operation with the specified action.</p>
 
         @param dragOperation
@@ -67,11 +67,11 @@ published interface XDropTargetDropContext : com::sun::star::uno::XInterface
         @see DNDConstants
         @see DropTargetDragEvent
     */
-
+           
     [oneway] void acceptDrop( [in] byte dragOperation );
 
     //-------------------------------------------------------------------------
-    /** Reject the drop as a result of examining the available
+    /** Reject the drop as a result of examining the available 
         <type scope="com::sun::star::datatransfer">DataFlavor</type> types
         received in the <member>XDropTargetListener::dragEnter()</member> method.
     */
@@ -79,7 +79,7 @@ published interface XDropTargetDropContext : com::sun::star::uno::XInterface
     [oneway] void rejectDrop();
 
     //-------------------------------------------------------------------------
-    /** Signals that the drop is completed and if it was successful or not.
+    /** Signals that the drop is completed and if it was successful or not. 
 
         @param success
         A value of <TRUE/> means the drop completed successfully
diff --git a/offapi/com/sun/star/datatransfer/dnd/XDropTargetListener.idl b/offapi/com/sun/star/datatransfer/dnd/XDropTargetListener.idl
index 78516990da84..a7b2306693c6 100644
--- a/offapi/com/sun/star/datatransfer/dnd/XDropTargetListener.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/XDropTargetListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,11 +45,11 @@
 module com { module sun { module star { module datatransfer { module dnd {
 
 //=============================================================================
-/** This interface is the callback interface used by the drop target object to
-    provide notification of Drag and Drop operations that involve the subject
+/** This interface is the callback interface used by the drop target object to 
+    provide notification of Drag and Drop operations that involve the subject 
     drop target.
 
-    <p>Methods of this interface may be implemented to provide "drag under"
+    <p>Methods of this interface may be implemented to provide "drag under" 
     visual feedback to the user throughout the Drag and Drop operation.</p>
 */
 
@@ -65,7 +65,7 @@ published interface XDropTargetListener: com::sun::star::lang::XEventListener
         Also, the implementor of <type>XDropTargetListener</type> should not assume
         the <type>DropTargetDropEvent</type> to be meaningful after returning
         from the <member>XDropTargetListener::drop()</member> method.</p>
-
+        
         @param dtde
         The <type>DropTargetDropEvent</type>.
     */
@@ -78,7 +78,7 @@ published interface XDropTargetListener: com::sun::star::lang::XEventListener
         @param dtde
         The <type>DropTargetDragEvent</type>.
     */
-
+        
     [oneway] void dragEnter( [in] DropTargetDragEnterEvent dtdee );
 
       //-------------------------------------------------------------------------
@@ -100,7 +100,7 @@ published interface XDropTargetListener: com::sun::star::lang::XEventListener
     [oneway] void dragOver( [in] DropTargetDragEvent dtde );
 
       //-------------------------------------------------------------------------
-    /** Called when the user has modified the drop gesture.
+    /** Called when the user has modified the drop gesture.	
 
         @param dtde
         The <type>DropTargetEvent</type>.
diff --git a/offapi/com/sun/star/deployment/DependencyException.idl b/offapi/com/sun/star/deployment/DependencyException.idl
index e9018eb0ed40..26a630503ff0 100644
--- a/offapi/com/sun/star/deployment/DependencyException.idl
+++ b/offapi/com/sun/star/deployment/DependencyException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/deployment/DeploymentException.idl b/offapi/com/sun/star/deployment/DeploymentException.idl
index 3c07d803a48a..2ad2401db404 100644
--- a/offapi/com/sun/star/deployment/DeploymentException.idl
+++ b/offapi/com/sun/star/deployment/DeploymentException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 module com { module sun { module star { module deployment {
 
 /** A DeploymentException reflects a deployment error.
-
+    
     @since OOo 2.0.0
  */
 exception DeploymentException : com::sun::star::uno::Exception
@@ -44,6 +44,6 @@ exception DeploymentException : com::sun::star::uno::Exception
     any Cause;
 };
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/deployment/ExtensionManager.idl b/offapi/com/sun/star/deployment/ExtensionManager.idl
index 1911ce04dd81..a1747393c806 100644
--- a/offapi/com/sun/star/deployment/ExtensionManager.idl
+++ b/offapi/com/sun/star/deployment/ExtensionManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,12 +34,12 @@
 module com { module sun { module star { module deployment {
 
 /** the ExtensionManager service.
-
+    
     The component context entry is
     <code>
     /singletons/com.sun.star.deployment.ExtensionManager
     </code>.
-
+    
     @since OOo 3.3.0
 */
 singleton ExtensionManager : XExtensionManager;
diff --git a/offapi/com/sun/star/deployment/ExtensionRemovedException.idl b/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
index 1cd400e248d6..a33a681a7077 100644
--- a/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
+++ b/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/deployment/InstallException.idl b/offapi/com/sun/star/deployment/InstallException.idl
index 3186ecedbdfc..bad5e4347344 100644
--- a/offapi/com/sun/star/deployment/InstallException.idl
+++ b/offapi/com/sun/star/deployment/InstallException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl b/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
index 0f0407b0e989..1d047e91f60b 100644
--- a/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
+++ b/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/deployment/LicenseException.idl b/offapi/com/sun/star/deployment/LicenseException.idl
index a80a5e463dd6..03e866cc82f5 100644
--- a/offapi/com/sun/star/deployment/LicenseException.idl
+++ b/offapi/com/sun/star/deployment/LicenseException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 module com { module sun { module star { module deployment {
 
 /** A LicenseException reflects the necessity of someone aggreeing to a license.
-
+    
     @since OOo 2.0.4
  */
 exception LicenseException : com::sun::star::uno::Exception
@@ -45,7 +45,7 @@ exception LicenseException : com::sun::star::uno::Exception
         See <member>XPackage::getDisplayName</member>
      */
     string ExtensionName;
-    /** contains the text of the license.
+    /** contains the text of the license. 
     */
     string Text;
 
@@ -56,6 +56,6 @@ exception LicenseException : com::sun::star::uno::Exception
     string AcceptBy;
 };
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/deployment/PackageInformationProvider.idl b/offapi/com/sun/star/deployment/PackageInformationProvider.idl
index 9d3c81d10d08..224c4a6a603c 100644
--- a/offapi/com/sun/star/deployment/PackageInformationProvider.idl
+++ b/offapi/com/sun/star/deployment/PackageInformationProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/deployment/PackageRegistryBackend.idl b/offapi/com/sun/star/deployment/PackageRegistryBackend.idl
index 0ac85465284b..17dc5749c02f 100644
--- a/offapi/com/sun/star/deployment/PackageRegistryBackend.idl
+++ b/offapi/com/sun/star/deployment/PackageRegistryBackend.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ module com { module sun { module star { module deployment {
     All <type>PackageRegistryBackend</type> objects
     are related to a <type>XPackageManager</type> instance.
     </p>
-
+    
     @since OOo 2.0.0
 */
 service PackageRegistryBackend : XPackageRegistry
@@ -50,7 +50,7 @@ service PackageRegistryBackend : XPackageRegistry
                context of registry, e.g. user, shared
     */
     createTransient( [in] string context );
-
+    
     /** Creates a persistent registry.
 
         @param context
diff --git a/offapi/com/sun/star/deployment/PlatformException.idl b/offapi/com/sun/star/deployment/PlatformException.idl
index fca14c2f2c6a..7776e9954a48 100644
--- a/offapi/com/sun/star/deployment/PlatformException.idl
+++ b/offapi/com/sun/star/deployment/PlatformException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@ module com { module sun { module star { module deployment {
     interface XPackage;
 /** A DeploymentException indicates that the current platform
     is not supported.
-
+    
     @since OOo 3.0.0
  */
 exception PlatformException : com::sun::star::uno::Exception
@@ -45,6 +45,6 @@ exception PlatformException : com::sun::star::uno::Exception
     XPackage package;
 };
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/deployment/Prerequisites.idl b/offapi/com/sun/star/deployment/Prerequisites.idl
index 82999ef4a41c..aa9199b0a7ac 100644
--- a/offapi/com/sun/star/deployment/Prerequisites.idl
+++ b/offapi/com/sun/star/deployment/Prerequisites.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef __com_sun_star_deployment_prerequisites_idl_
 #define __com_sun_star_deployment_prerequisites_idl_
 
diff --git a/offapi/com/sun/star/deployment/UpdateInformationEntry.idl b/offapi/com/sun/star/deployment/UpdateInformationEntry.idl
index 26d2a1b876e4..f7da29005a64 100644
--- a/offapi/com/sun/star/deployment/UpdateInformationEntry.idl
+++ b/offapi/com/sun/star/deployment/UpdateInformationEntry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@ module com { module sun { module star { module deployment {
 
 /** Objects of this type are used as elements of the enumeration
     returned by <type>XUpdateInformationProvider</type>.
-
+    
     @since OOo 2.3
 */
 struct UpdateInformationEntry
diff --git a/offapi/com/sun/star/deployment/UpdateInformationProvider.idl b/offapi/com/sun/star/deployment/UpdateInformationProvider.idl
index d5bee547c9da..d33c1fc80df7 100644
--- a/offapi/com/sun/star/deployment/UpdateInformationProvider.idl
+++ b/offapi/com/sun/star/deployment/UpdateInformationProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@ module com { module sun { module star { module deployment {
 
 /** Implementations of this service provide access to the root element
     of one or more update information files for a given sets of URLs.
-
+    
     @since OOo 2.2
 */
 service UpdateInformationProvider : XUpdateInformationProvider;
diff --git a/offapi/com/sun/star/deployment/VersionException.idl b/offapi/com/sun/star/deployment/VersionException.idl
index 2d69c918c3a2..0a4d020444de 100644
--- a/offapi/com/sun/star/deployment/VersionException.idl
+++ b/offapi/com/sun/star/deployment/VersionException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,7 +51,7 @@ exception VersionException: com::sun::star::uno::Exception {
        the display name of the extension which is being installed.
     */
     string NewDisplayName;
-
+        
     /**
        represents the already installed version of the deployment unit.
 
diff --git a/offapi/com/sun/star/deployment/XExtensionManager.idl b/offapi/com/sun/star/deployment/XExtensionManager.idl
index b807df54af65..d0527c3ec73f 100644
--- a/offapi/com/sun/star/deployment/XExtensionManager.idl
+++ b/offapi/com/sun/star/deployment/XExtensionManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ module com { module sun { module star { module deployment {
 
 /** The <type>XExtensionManager</type> interface is used to manage extensions
     in the user, shared and bundled repository.
-
+    
     @see ExtensionManager
     @since OOo 3.3.0
 */
@@ -52,32 +52,32 @@ interface XExtensionManager
     /** interface to notify disposing
      */
     interface com::sun::star::lang::XComponent;
-
+    
     /** interface to notify changes of the set of deployed packages of
         this manager
     */
     interface com::sun::star::util::XModifyBroadcaster;
-
-
+    
+    
     /** gets the supported <type>XPackageTypeInfo</type>s.
-
+        
         @return
                 supported <type>XPackageTypeInfo</type>s.
     */
     sequence<XPackageTypeInfo> getSupportedPackageTypes();
-
+    
     /** creates a command channel to be used to asynchronously abort a command.
-
+        
         @return
                 abort channel
     */
     com::sun::star::task::XAbortChannel createAbortChannel();
-
+    
     /** adds an extension.
 
         The properties argument is currently only used to suppress the license information
         for shared extensions.
-
+        
         @param url
                package URL, must be UCB conform
         @param properties
@@ -91,7 +91,7 @@ interface XExtensionManager
         @param xCmdEnv
                command environment for error and progress handling
         @return
-               object representing the extension.
+               object representing the extension.                
     */
     XPackage addExtension( [in] string url,
                            [in] sequence<com::sun::star::beans::NamedValue> properties,
@@ -102,9 +102,9 @@ interface XExtensionManager
                 com::sun::star::ucb::CommandFailedException,
                 com::sun::star::ucb::CommandAbortedException,
                 com::sun::star::lang::IllegalArgumentException);
-
+    
     /** removes an extension.
-
+        
         @param identifier
                package identifier
         @param fileName
@@ -127,15 +127,15 @@ interface XExtensionManager
                 com::sun::star::ucb::CommandFailedException,
                 com::sun::star::ucb::CommandAbortedException,
                 com::sun::star::lang::IllegalArgumentException);
-
+    
 
     /** enable an extension.
 
         If the extension is not from the user repository then an
         IllegalArgumentException is thrown.
-
+        
         @param extension
-               the extension which is to be enabled.
+               the extension which is to be enabled. 
         @param xAbortChannel
                abort channel to asynchronously abort the removing process,
                or null
@@ -155,7 +155,7 @@ interface XExtensionManager
 
         If the extension is not from the user repository then an
         IllegalArgumentException is thrown.
-
+        
         @param extension
                the extension which is to be disabled
         @param xAbortChannel
@@ -175,7 +175,7 @@ interface XExtensionManager
 
     /** gets all currently installed extensions, including disabled
         user extensions.
-
+        
         @param repository
                the repository from which the extensions are returned
         @param xAbortChannel
@@ -233,7 +233,7 @@ interface XExtensionManager
         raises (DeploymentException,
                 com::sun::star::ucb::CommandFailedException,
                 com::sun::star::lang::IllegalArgumentException);
-
+    
 
     /** returns a sequence containing all installed extensions.
 
@@ -281,7 +281,7 @@ interface XExtensionManager
 
        Added extensions will be added to the database and removed extensions
        will be removed from the database.
-
+       
        @return
               If true - then at least one extension was removed or added. Otherwise
               nothing was chaned.
diff --git a/offapi/com/sun/star/deployment/XPackage.idl b/offapi/com/sun/star/deployment/XPackage.idl
index 9709b579bc2e..920b27426bc9 100644
--- a/offapi/com/sun/star/deployment/XPackage.idl
+++ b/offapi/com/sun/star/deployment/XPackage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,7 +48,7 @@ module com { module sun { module star { module deployment {
 
 /** Objects of this interface reflect a bound package and are issued by a
     <type>PackageRegistryBackend</type>.
-
+    
     @since OOo 2.0.0
 */
 interface XPackage
@@ -56,19 +56,19 @@ interface XPackage
     /** implemented to notify that the package has been removed
      */
     interface com::sun::star::lang::XComponent;
-
+    
     /** notifies changes of the registration state of the package
      */
     interface com::sun::star::util::XModifyBroadcaster;
-
+    
 
     /** creates a command channel to be used to asynchronously abort a command.
-
+        
         @return
                 abort channel
     */
     com::sun::star::task::XAbortChannel createAbortChannel();
-
+    
     /** checks if the package can be installed.
 
         Only if the return value is true the package is allowed to be installed.
@@ -76,7 +76,7 @@ interface XPackage
         completely.
         After return of this function no code from the extension may be used
         anymore, so that the extension can be safely removed from the harddisk.
-
+        
         @param xCmdEnv
                command environment for error handling and other interaction.
         @alreadyInstalled
@@ -94,12 +94,12 @@ interface XPackage
                 ExtensionRemovedException,
                 com::sun::star::ucb::CommandFailedException,
                 com::sun::star::ucb::CommandAbortedException);
-
+  
     /** checks if the dependencies for this package are still satisfied
 
         After updateing the OpenOffice.org, some dependencies for packages might
         no longer be satisfied.
-
+        
         @since OOo 3.2.0
 
         @param xCmdEnv
@@ -114,11 +114,11 @@ interface XPackage
         raises (DeploymentException,
                 ExtensionRemovedException,
                 com::sun::star::ucb::CommandFailedException);
-
+  
 
     /** determines whether the package is currently is registered, i.e.
         whether it is active.
-
+        
         @param xAbortChannel
                abort channel to asynchronously abort the registration process,
                or null
@@ -136,7 +136,7 @@ interface XPackage
         raises (DeploymentException,
                 com::sun::star::ucb::CommandFailedException,
                 com::sun::star::ucb::CommandAbortedException);
-
+    
     /** registers this <type>XPackage</type>.
 
         NEVER call this directly. This is done by the extension manager if necessary.
@@ -160,11 +160,11 @@ interface XPackage
                 com::sun::star::ucb::CommandFailedException,
                 com::sun::star::ucb::CommandAbortedException,
                 com::sun::star::lang::IllegalArgumentException);
-
+    
     /** revokes this <type>XPackage</type>.
 
         NEVER call this directly. This is done by the extension manager if necessary.
-
+        
         @param xAbortChannel
                abort channel to asynchronously abort the registration process,
                or null
@@ -178,15 +178,15 @@ interface XPackage
                 com::sun::star::ucb::CommandFailedException,
                 com::sun::star::ucb::CommandAbortedException,
                 com::sun::star::lang::IllegalArgumentException);
-
+    
     /** reflects whether this package is a bundle of one or more packages,
         e.g. a zip (legacy) package file or a document hosting script packages.
-
+        
         @return
                 in case this package relfects a package bundle
     */
     boolean isBundle();
-
+    
     /** Gets packages of the bundle.
 
         If <member>isRemoved</member> returns true then getBundle may return an
@@ -207,7 +207,7 @@ interface XPackage
                 com::sun::star::ucb::CommandFailedException,
                 com::sun::star::ucb::CommandAbortedException,
                 com::sun::star::lang::IllegalArgumentException);
-
+    
     /** returns the file name of the package.
 
         @return
@@ -237,25 +237,25 @@ interface XPackage
     */
     string getVersion()
         raises (ExtensionRemovedException);
-
+    
     /** returns the location of the package.
-
+        
         @return
                 location of package
     */
     string getURL();
-
+    
     /** returns the display name of the package, e.g. for graphical user
         interfaces (GUI).
-
+        
         @return
                 display name of the package
     */
     string getDisplayName()
         raises (ExtensionRemovedException);
-
+    
     /** returns a description string to describe the  package.
-
+        
         @return
                 description
     */
@@ -285,14 +285,14 @@ interface XPackage
     ::com::sun::star::beans::StringPair getPublisherInfo()
         raises (ExtensionRemovedException);
     /** returns the <type>XPackageTypeInfo</type>, e.g. media-type etc.
-
+        
         @return
                 media type of package
     */
     XPackageTypeInfo getPackageType();
-
+    
     /** exports package to given destination URL.
-
+        
         @param destFolderURL
                package destination folder URL, must be UCB conform
         @param newTitle
@@ -312,7 +312,7 @@ interface XPackage
             com::sun::star::ucb::CommandAbortedException);
 
     /** returns an icon for a package.
-
+        
         @param highContrast
             return high contrast icon
         @return
@@ -343,7 +343,7 @@ interface XPackage
     */
     com::sun::star::beans::Optional<string> getRegistrationDataURL()
         raises (ExtensionRemovedException);
-
+    
     /** indicates if this object represents a removed extension or extension
         item. This is the case when it was created by providing
         <code>true</code> for the <code>removed</code> parameter in the function
diff --git a/offapi/com/sun/star/deployment/XPackageInformationProvider.idl b/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
index a983e34ecdd3..45472ffdbe9e 100644
--- a/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
+++ b/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,9 +31,9 @@
 
 module com { module sun { module star { module deployment {
 
-/** Objects implementing this interface provide an URL to the root of
+/** Objects implementing this interface provide an URL to the root of 
     an installed package.
-
+    
     @since OOo 2.3
 */
 interface XPackageInformationProvider
diff --git a/offapi/com/sun/star/deployment/XPackageManager.idl b/offapi/com/sun/star/deployment/XPackageManager.idl
index da329bb9367f..cde8ecbe0335 100644
--- a/offapi/com/sun/star/deployment/XPackageManager.idl
+++ b/offapi/com/sun/star/deployment/XPackageManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -76,12 +76,12 @@ interface XPackageManager
     /** interface to notify disposing
      */
     interface com::sun::star::lang::XComponent;
-
+    
     /** interface to notify changes of the set of deployed packages of
         this manager
     */
     interface com::sun::star::util::XModifyBroadcaster;
-
+    
     /** returns the underlying deployment context, that is,
         the name of the repository..
 
@@ -89,27 +89,27 @@ interface XPackageManager
                 underlying deployment context
     */
     string getContext();
-
+    
     /** gets the supported <type>XPackageTypeInfo</type>s.
-
+        
         @return
                 supported <type>XPackageTypeInfo</type>s.
     */
     sequence<XPackageTypeInfo> getSupportedPackageTypes();
-
+    
     /** creates a command channel to be used to asynchronously abort a command.
-
+        
         @return
                 abort channel
     */
     com::sun::star::task::XAbortChannel createAbortChannel();
-
+    
     /** adds an UNO package.
 
         The properties argument is currently only used to suppress the license information
         for shared extensions.
-
-
+       
+        
         @param url
                package URL, must be UCB conform
         @param properties
@@ -140,9 +140,9 @@ interface XPackageManager
         This copies the extension. If it was from the same repository,
         which is represented by this XPackageManager insterface, then
         nothing happens.
-
+        
         @param extension
-
+               
         @param xAbortChannel
                abort channel to asynchronously abort the adding process,
                or null
@@ -158,9 +158,9 @@ interface XPackageManager
                 com::sun::star::ucb::CommandFailedException,
                 com::sun::star::ucb::CommandAbortedException,
                 com::sun::star::lang::IllegalArgumentException);
-
+    
     /** removes an UNO package.
-
+        
         @param identifier
                package identifier
         @param fileName
@@ -179,9 +179,9 @@ interface XPackageManager
                 com::sun::star::ucb::CommandFailedException,
                 com::sun::star::ucb::CommandAbortedException,
                 com::sun::star::lang::IllegalArgumentException);
-
+    
     /** gets a deployed package.
-
+        
         @param identifier
                package identifier
         @param fileName
@@ -198,9 +198,9 @@ interface XPackageManager
         raises (DeploymentException,
                 com::sun::star::ucb::CommandFailedException,
                 com::sun::star::lang::IllegalArgumentException);
-
+    
     /** gets all currently deployed packages.
-
+        
         @param xAbortChannel
                abort channel to asynchronously abort the removing process,
                or null
@@ -216,14 +216,14 @@ interface XPackageManager
                 com::sun::star::ucb::CommandFailedException,
                 com::sun::star::ucb::CommandAbortedException,
                 com::sun::star::lang::IllegalArgumentException);
-
+    
     /** Expert feature: erases the underlying registry cache and reinstalls
         all previously added packages.  Please keep in mind that all
         registration status get lost.
         <p>
         Please use this in case of suspected cache inconsistencies only.
         </p>
-
+        
         @param xAbortChannel
                abort channel to asynchronously abort the adding process
         @param xCmdEnv
@@ -272,7 +272,7 @@ interface XPackageManager
         raises (DeploymentException,
                 com::sun::star::ucb::CommandFailedException,
                 com::sun::star::ucb::CommandAbortedException);
-
+    
 
     /** returns all extensions which are currently not in use
         because the user did not accept the license.
diff --git a/offapi/com/sun/star/deployment/XPackageManagerFactory.idl b/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
index 4b5b7183ba47..7dc720541be3 100644
--- a/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
+++ b/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ module com { module sun { module star { module deployment {
     </code>
     exclusively.
     </p>
-
+    
     @since OOo 2.0.0
     @deprecated
     Use <type>XExtensionManager</type>.
@@ -68,7 +68,7 @@ interface XPackageManagerFactory
         <!-- or <code>vnd.sun.star.tdoc</code --> will last in an
         <type scope="com::sun::star::lang">IllegalArgumentException</type>.
         </p>
-
+        
         @param context
                context string, e.g.
                <ul>
@@ -95,6 +95,6 @@ interface XPackageManagerFactory
         raises (com::sun::star::lang::IllegalArgumentException);
 };
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/deployment/XPackageRegistry.idl b/offapi/com/sun/star/deployment/XPackageRegistry.idl
index c84f37625ec5..7c542bfad870 100644
--- a/offapi/com/sun/star/deployment/XPackageRegistry.idl
+++ b/offapi/com/sun/star/deployment/XPackageRegistry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 module com { module sun { module star { module deployment {
 
 /** Interface to bind an UNO package.
-
+    
     @since OOo 2.0.0
 */
 interface XPackageRegistry
@@ -79,7 +79,7 @@ interface XPackageRegistry
         <code>removed</code> = true. If not, then an <type
         scope="com::sun::star::lang">IllegalArgumentException</type> will be
         thrown.
-
+        
         @param url
                package URL, must be UCB conform
         @param mediaType
@@ -89,10 +89,10 @@ interface XPackageRegistry
         @para unfulfilledPrerequisites
               has a value other null if the extension could not be installed previously
               because <member>XPackage::checkPrerequisites</member> failed.
-
+              
         @param identifier
                the identifier of the extension
-
+               
         @param xCmdEnv
                command environment for error and progress handling
         @return
@@ -108,9 +108,9 @@ interface XPackageRegistry
                 InvalidRemovedParameterException,
                 com::sun::star::ucb::CommandFailedException,
                 com::sun::star::lang::IllegalArgumentException);
-
+    
     /** gets the supported <type>XPackageTypeInfo</type>s.
-
+        
         @return
                 supported <type>XPackageTypeInfo</type>s.
     */
diff --git a/offapi/com/sun/star/deployment/XPackageTypeInfo.idl b/offapi/com/sun/star/deployment/XPackageTypeInfo.idl
index 7252f73d200b..f7860da4fe13 100644
--- a/offapi/com/sun/star/deployment/XPackageTypeInfo.idl
+++ b/offapi/com/sun/star/deployment/XPackageTypeInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 module com { module sun { module star { module deployment {
 
 /** Objects of this interface provide information about a package's type.
-
+    
     @since OOo 2.0.0
 */
 interface XPackageTypeInfo
@@ -46,36 +46,36 @@ interface XPackageTypeInfo
                 media type of package
     */
     string getMediaType();
-
+    
     /** returns a description string to describe a package type.
-
+        
         @return
                 description
     */
     string getDescription()
         raises (ExtensionRemovedException);
-
+    
     /** returns a short description string to describe a package type
         (one line only).
-
+        
         @return
                 description
     */
     string getShortDescription()
-        raises (ExtensionRemovedException);
-
+        raises (ExtensionRemovedException);        
+    
     /** returns a file filter string for the file picker user interface.
         Both, the short description string and file filter string
         will be passed to
         <member scope="com::sun::star::ui::dialogs">XFilterManager::appendFilter</member>.
-
+        
         @return
                 file filter string
     */
     string getFileFilter();
-
+    
     /** returns an icon for a package.
-
+        
         @param highContrast
                return high contrast icon
         @param smallIcon
diff --git a/offapi/com/sun/star/deployment/XUpdateInformationProvider.idl b/offapi/com/sun/star/deployment/XUpdateInformationProvider.idl
index 6291b3f4e76f..5b8b118357f6 100644
--- a/offapi/com/sun/star/deployment/XUpdateInformationProvider.idl
+++ b/offapi/com/sun/star/deployment/XUpdateInformationProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,14 +43,14 @@ interface XElement;
 
 module com { module sun { module star { module deployment {
 
-/** Objects implementing this interface provide access to the xml root of
+/** Objects implementing this interface provide access to the xml root of 
     one or more update information files for a given set of URLs.
-
+    
     @since OOo 2.2
 */
 interface XUpdateInformationProvider
 {
-    /** get update information for a specific extension or all available
+    /** get update information for a specific extension or all available 
         information from a repository.
 
         @param repositories
@@ -59,11 +59,11 @@ interface XUpdateInformationProvider
                the unique identifier of an extension. If it is not empty and
                the update document is an atom feed, only items whose 'term'
                attribute of the atom:category tag matches extensionId are returned.
-
+               
     */
     sequence < com::sun::star::xml::dom::XElement > getUpdateInformation(
-        [in] sequence< string > repositories,
-        [in] string extensionId
+        [in] sequence< string > repositories, 
+        [in] string extensionId 
     ) raises ( com::sun::star::uno::Exception );
 
     /** interrupts a getUpdateInformation call and let's it return immediatly.
diff --git a/offapi/com/sun/star/deployment/test/SmoketestCommandEnvironment.idl b/offapi/com/sun/star/deployment/test/SmoketestCommandEnvironment.idl
index 0669705f351a..40455ae2f694 100644
--- a/offapi/com/sun/star/deployment/test/SmoketestCommandEnvironment.idl
+++ b/offapi/com/sun/star/deployment/test/SmoketestCommandEnvironment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,19 +25,19 @@
  *
  ************************************************************************/
 
-#ifndef _com_sun_star_deployment_test_SmoketestCommandEnvironment_idl_
-#define _com_sun_star_deployment_test_SmoketestCommandEnvironment_idl_
-
+#ifndef _com_sun_star_deployment_test_SmoketestCommandEnvironment_idl_ 
+#define _com_sun_star_deployment_test_SmoketestCommandEnvironment_idl_ 
+ 
 
 #include <com/sun/star/ucb/XCommandEnvironment.idl>
-
+ 
 
 module com { module sun { module star { module deployment { module test {
- /* The service is intended to be used in the smoketest to test the installation of
-    an extension (com::sun::star::deployment::XPackageManager::addPackage). It may therefore
+ /* The service is intended to be used in the smoketest to test the installation of 
+    an extension (com::sun::star::deployment::XPackageManager::addPackage). It may therefore 
     be constantly adapted to meet the need of the smoketest
  */
         service SmoketestCommandEnvironment: ::com::sun::star::ucb::XCommandEnvironment;
 };};};};};
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/deployment/thePackageManagerFactory.idl b/offapi/com/sun/star/deployment/thePackageManagerFactory.idl
index 85e95acea598..18c583f14f7e 100644
--- a/offapi/com/sun/star/deployment/thePackageManagerFactory.idl
+++ b/offapi/com/sun/star/deployment/thePackageManagerFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@ module com { module sun { module star { module deployment {
     /singletons/com.sun.star.deployment.thePackageManagerFactory
     </code>.
     </p>
-
+    
     @since OOo 2.0.0
     @deprecated
         Use <type>XExtensionManager</type>.
diff --git a/offapi/com/sun/star/deployment/ui/LicenseDialog.idl b/offapi/com/sun/star/deployment/ui/LicenseDialog.idl
index 308b5b5b9814..50ab79935cda 100644
--- a/offapi/com/sun/star/deployment/ui/LicenseDialog.idl
+++ b/offapi/com/sun/star/deployment/ui/LicenseDialog.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,14 +35,14 @@
 module com { module sun { module star { module deployment { module ui {
 
 /** The <type>LicenseDialog</type> is used to display a license text.
-
+    
     @since OOo 2.0.4
 */
 service LicenseDialog : com::sun::star::ui::dialogs::XExecutableDialog
 {
     /** Create a GUI using the specific parent window and focus on the
         given context.
-
+        
         @param xParent
                parent window
 
diff --git a/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl b/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
index 0f2b58d941f9..f3c06f910856 100644
--- a/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
+++ b/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@ module com { module sun { module star { module deployment { module ui {
 /** The <type>PackageManagerDialog</type> is used to visually manage installed
     packages of the user and shared installation as well as currently open
     documents.
-
+    
     @since OOo 2.0.0
 */
 service PackageManagerDialog : com::sun::star::ui::dialogs::XAsynchronousExecutableDialog
@@ -45,10 +45,10 @@ service PackageManagerDialog : com::sun::star::ui::dialogs::XAsynchronousExecuta
     /** Create a default GUI.
      */
     createDefault();
-
+    
     /** Create a GUI using the specific parent window and focus on the
         given context.
-
+        
         @param xParent
                parent window
         @param focussedContext
diff --git a/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl b/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
index 35b314b74f92..b3bb4807f33b 100644
--- a/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
+++ b/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,14 +35,14 @@
 module com { module sun { module star { module deployment { module ui {
 
 /** The <type>UpdateRequiredDialog</type> is used to show a list of extensions not compatible with this office version.
-
+    
     @since OOo 3.2.0
 */
 service UpdateRequiredDialog : com::sun::star::ui::dialogs::XExecutableDialog
 {
     /** Create a GUI using the specific parent window and focus on the
         given context.
-
+        
         @param xParent
                parent window
     */
diff --git a/offapi/com/sun/star/document/AmbigousFilterRequest.idl b/offapi/com/sun/star/document/AmbigousFilterRequest.idl
index 430614767471..d0b56736289b 100644
--- a/offapi/com/sun/star/document/AmbigousFilterRequest.idl
+++ b/offapi/com/sun/star/document/AmbigousFilterRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/BrokenPackageRequest.idl b/offapi/com/sun/star/document/BrokenPackageRequest.idl
index 04b9b795027d..2355cb7b474a 100644
--- a/offapi/com/sun/star/document/BrokenPackageRequest.idl
+++ b/offapi/com/sun/star/document/BrokenPackageRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/ChangedByOthersRequest.idl b/offapi/com/sun/star/document/ChangedByOthersRequest.idl
index 04e22ce539f9..ee638a82831f 100644
--- a/offapi/com/sun/star/document/ChangedByOthersRequest.idl
+++ b/offapi/com/sun/star/document/ChangedByOthersRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@
 module com { module sun { module star { module document {
 
 //=============================================================================
-/** Is used for interaction handle to query user decision in case the document
+/** Is used for interaction handle to query user decision in case the document 
     being saved was already stored by another user during the editing.
 
     @since OOo 3.1
diff --git a/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl b/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl
index af7116b085ea..13de1ef496b4 100644
--- a/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl
+++ b/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_document_CorruptedFilterConfigurationException_idl__
-#define __com_sun_star_document_CorruptedFilterConfigurationException_idl__
-
-#ifndef __com_sun_star_uno_RuntimeException_idl__
-#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module document {
-
-//=============================================================================
-
+#ifndef __com_sun_star_document_CorruptedFilterConfigurationException_idl__ 
+#define __com_sun_star_document_CorruptedFilterConfigurationException_idl__ 
+ 
+#ifndef __com_sun_star_uno_RuntimeException_idl__ 
+#include <com/sun/star/uno/RuntimeException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module document {  
+ 
+//============================================================================= 
+ 
 /** This exception is thrown in case the global filter configuration
     does not exists or contains corrupted data.
 
@@ -48,10 +48,10 @@ published exception CorruptedFilterConfigurationException : ::com::sun::star::un
     /** Instead of the message part of an exception, this value
         describe the type of corruption more in detail. */
     string Details;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/document/DocumentEvent.idl b/offapi/com/sun/star/document/DocumentEvent.idl
index 1ec7f599ad6a..b4d1d8cb1d06 100644
--- a/offapi/com/sun/star/document/DocumentEvent.idl
+++ b/offapi/com/sun/star/document/DocumentEvent.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
 #ifndef __com_sun_star_document_DocumentEvent_idl__
 #define __com_sun_star_document_DocumentEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
+#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl>
 #endif
 #ifndef __com_sun_star_frame_XController2_idl__
@@ -36,7 +36,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module document {
+module com { module sun { module star { module document { 
 
 //=============================================================================
 
@@ -78,7 +78,7 @@ struct DocumentEvent : ::com::sun::star::lang::EventObject
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/DocumentInfo.idl b/offapi/com/sun/star/document/DocumentInfo.idl
index 5212db0eef23..f2206997f979 100644
--- a/offapi/com/sun/star/document/DocumentInfo.idl
+++ b/offapi/com/sun/star/document/DocumentInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/DocumentProperties.idl b/offapi/com/sun/star/document/DocumentProperties.idl
index 5b00f6c9a8e2..111cedb0141a 100755
--- a/offapi/com/sun/star/document/DocumentProperties.idl
+++ b/offapi/com/sun/star/document/DocumentProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/DocumentRevisionListPersistence.idl b/offapi/com/sun/star/document/DocumentRevisionListPersistence.idl
index 6a2567abfab5..3fd6056b6cc2 100644
--- a/offapi/com/sun/star/document/DocumentRevisionListPersistence.idl
+++ b/offapi/com/sun/star/document/DocumentRevisionListPersistence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/EventDescriptor.idl b/offapi/com/sun/star/document/EventDescriptor.idl
index 50f2ae16f875..a038ce0cb71e 100644
--- a/offapi/com/sun/star/document/EventDescriptor.idl
+++ b/offapi/com/sun/star/document/EventDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/EventObject.idl b/offapi/com/sun/star/document/EventObject.idl
index 5a84f5c65a21..51962fe21e0e 100644
--- a/offapi/com/sun/star/document/EventObject.idl
+++ b/offapi/com/sun/star/document/EventObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/Events.idl b/offapi/com/sun/star/document/Events.idl
index 267f9c5329d0..5e037f3ab6f5 100644
--- a/offapi/com/sun/star/document/Events.idl
+++ b/offapi/com/sun/star/document/Events.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/ExportFilter.idl b/offapi/com/sun/star/document/ExportFilter.idl
index 6341f4c0ad2e..1032f369a0ea 100644
--- a/offapi/com/sun/star/document/ExportFilter.idl
+++ b/offapi/com/sun/star/document/ExportFilter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/ExtendedTypeDetection.idl b/offapi/com/sun/star/document/ExtendedTypeDetection.idl
index f0081f94895d..997b51ee0c7d 100644
--- a/offapi/com/sun/star/document/ExtendedTypeDetection.idl
+++ b/offapi/com/sun/star/document/ExtendedTypeDetection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl b/offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl
index 0547f50ba162..0c059dcaf57f 100644
--- a/offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl
+++ b/offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/FilterAdapter.idl b/offapi/com/sun/star/document/FilterAdapter.idl
index 800ba1372115..0564b9f7173d 100644
--- a/offapi/com/sun/star/document/FilterAdapter.idl
+++ b/offapi/com/sun/star/document/FilterAdapter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,11 +31,11 @@
 #include <com/sun/star/document/XFilterAdapter.idl>
 #endif
 
-//=============================================================================
-
-module com {   module sun {   module star {   module document {
-
-//=============================================================================
+//=============================================================================  
+  
+module com {   module sun {   module star {   module document {   
+  
+//=============================================================================  
     /* Provides access to user to filters written to use the FilterAdapter
         @author Aidan Butler
 
diff --git a/offapi/com/sun/star/document/FilterFactory.idl b/offapi/com/sun/star/document/FilterFactory.idl
index 6ff64c7f0857..c7bf28e7d91d 100644
--- a/offapi/com/sun/star/document/FilterFactory.idl
+++ b/offapi/com/sun/star/document/FilterFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/FilterOptionsRequest.idl b/offapi/com/sun/star/document/FilterOptionsRequest.idl
index 4b6bcb70e729..a750c4d91c37 100644
--- a/offapi/com/sun/star/document/FilterOptionsRequest.idl
+++ b/offapi/com/sun/star/document/FilterOptionsRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ published exception FilterOptionsRequest : ::com::sun::star::uno::Exception
     /** The model of the document that should be provided to filters
         that supports XExporter interface.
      */
-    ::com::sun::star::frame::XModel rModel;
+    ::com::sun::star::frame::XModel	rModel;
 
     /** The Media-descriptor of the document
      */
diff --git a/offapi/com/sun/star/document/HeaderFooterSettings.idl b/offapi/com/sun/star/document/HeaderFooterSettings.idl
index 729a6f99e0b2..4a596480566a 100644
--- a/offapi/com/sun/star/document/HeaderFooterSettings.idl
+++ b/offapi/com/sun/star/document/HeaderFooterSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
 #ifndef __com_sun_star_document_HeaderFooterSettings_idl__
 #define __com_sun_star_document_HeaderFooterSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
 
diff --git a/offapi/com/sun/star/document/ImportFilter.idl b/offapi/com/sun/star/document/ImportFilter.idl
index a24b33e25cab..1e0ed4db1e23 100644
--- a/offapi/com/sun/star/document/ImportFilter.idl
+++ b/offapi/com/sun/star/document/ImportFilter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/LinkTarget.idl b/offapi/com/sun/star/document/LinkTarget.idl
index b189a342c2f2..6d938537ee93 100644
--- a/offapi/com/sun/star/document/LinkTarget.idl
+++ b/offapi/com/sun/star/document/LinkTarget.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_document_LinkTarget_idl__
-#define __com_sun_star_document_LinkTarget_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_document_XLinkTargetSupplier_idl__
-#include <com/sun/star/document/XLinkTargetSupplier.idl>
-#endif
-
-
-//=============================================================================
-
-module com {   module sun {   module star {   module document {
-
-//=============================================================================
-
+#ifndef __com_sun_star_document_LinkTarget_idl__  
+#define __com_sun_star_document_LinkTarget_idl__  
+  
+#ifndef __com_sun_star_beans_XPropertySet_idl__  
+#include <com/sun/star/beans/XPropertySet.idl>  
+#endif  
+  
+#ifndef __com_sun_star_document_XLinkTargetSupplier_idl__  
+#include <com/sun/star/document/XLinkTargetSupplier.idl>  
+#endif  
+  
+  
+//=============================================================================  
+  
+module com {   module sun {   module star {   module document {   
+  
+//=============================================================================  
+  
 /** This service is implemented by objects inside a document object model that
     can be the target of a link inside a document
  */
 published service LinkTarget
-{
-    interface com::sun::star::beans::XPropertySet;
-
+{  
+    interface com::sun::star::beans::XPropertySet;  
+  
     /** a link target may have child objects which can be link targets too.
         These are accessible by this optional interface.
      */
-    [optional] interface com::sun::star::document::XLinkTargetSupplier;
-
-    //-------------------------------------------------------------------------
+    [optional] interface com::sun::star::document::XLinkTargetSupplier;  
+  
+    //-------------------------------------------------------------------------  
     /** contains a human readable name for this object that could be displayed in a user
         interface.
      */
-    [readonly, property] string LinkDisplayName;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [readonly, property] string LinkDisplayName;  
+  
+};  
+  
+//=============================================================================  
+  
+}; }; }; };   
+  
+#endif  
diff --git a/offapi/com/sun/star/document/LinkTargets.idl b/offapi/com/sun/star/document/LinkTargets.idl
index cd5fb928a6eb..6b7c34c6d1fa 100644
--- a/offapi/com/sun/star/document/LinkTargets.idl
+++ b/offapi/com/sun/star/document/LinkTargets.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_document_LinkTargets_idl__
-#define __com_sun_star_document_LinkTargets_idl__
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-
-//=============================================================================
-
-module com {   module sun {   module star {   module document {
-
-//=============================================================================
-
+#ifndef __com_sun_star_document_LinkTargets_idl__  
+#define __com_sun_star_document_LinkTargets_idl__  
+  
+#ifndef __com_sun_star_container_XNameAccess_idl__  
+#include <com/sun/star/container/XNameAccess.idl>  
+#endif  
+  
+  
+//=============================================================================  
+  
+module com {   module sun {   module star {   module document {   
+  
+//=============================================================================  
+  
 /** This service gives access to a collection of names that are child links
     of the parent object that supplied this service.
-
+    
     <p>The <type scope="com::sun::star::container">XNameAccess</type> returns elements
     of <type scope="com::sun::star::beans">XPropertySet</type> that implement
     the service <type>LinkTarget</type>.  </p>
  */
 published service LinkTargets
-{
-    interface com::sun::star::container::XNameAccess;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{  
+    interface com::sun::star::container::XNameAccess;  
+  
+};  
+  
+//=============================================================================  
+  
+}; }; }; };   
+  
+#endif  
diff --git a/offapi/com/sun/star/document/LinkUpdateModes.idl b/offapi/com/sun/star/document/LinkUpdateModes.idl
index 4c2ac905b191..7bbee43087df 100644
--- a/offapi/com/sun/star/document/LinkUpdateModes.idl
+++ b/offapi/com/sun/star/document/LinkUpdateModes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ published constants LinkUpdateModes
      */
     const long GLOBAL_SETTING = 3;
 };
-
+    
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/document/LockFileIgnoreRequest.idl b/offapi/com/sun/star/document/LockFileIgnoreRequest.idl
index d13a904ab80b..a0c80ba9d516 100644
--- a/offapi/com/sun/star/document/LockFileIgnoreRequest.idl
+++ b/offapi/com/sun/star/document/LockFileIgnoreRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/LockedDocumentRequest.idl b/offapi/com/sun/star/document/LockedDocumentRequest.idl
index 23059c9c176c..78b596e1f02c 100644
--- a/offapi/com/sun/star/document/LockedDocumentRequest.idl
+++ b/offapi/com/sun/star/document/LockedDocumentRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/LockedOnSavingRequest.idl b/offapi/com/sun/star/document/LockedOnSavingRequest.idl
index 2dc63260bfad..cab8c1e8b995 100644
--- a/offapi/com/sun/star/document/LockedOnSavingRequest.idl
+++ b/offapi/com/sun/star/document/LockedOnSavingRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/MacroExecMode.idl b/offapi/com/sun/star/document/MacroExecMode.idl
index d5590000562f..f60aee8191cf 100644
--- a/offapi/com/sun/star/document/MacroExecMode.idl
+++ b/offapi/com/sun/star/document/MacroExecMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,10 +44,10 @@ published constants MacroExecMode
     */
 
     const short NEVER_EXECUTE = 0;
-
+    
     //-------------------------------------------------------------------------
     /** Execute macros from secure list quietly.
-
+        
         <p>
         If a macro is not in the list a conformation for it executing will
         appear.
@@ -75,7 +75,7 @@ published constants MacroExecMode
 
     const short USE_CONFIG = 3;
 
-
+    
     //-------------------------------------------------------------------------
     /** A macro should be executed always no conformation should be provided.
     */
diff --git a/offapi/com/sun/star/document/MediaDescriptor.idl b/offapi/com/sun/star/document/MediaDescriptor.idl
index 0bed6a88c324..1370d366358f 100644
--- a/offapi/com/sun/star/document/MediaDescriptor.idl
+++ b/offapi/com/sun/star/document/MediaDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -141,7 +141,7 @@ published service MediaDescriptor
         for a special component type. Format of that depends from real
         type of addressed component.
         </p>
-
+        
         <p>
         For extensibility, it is recommended to use values of type
         sequence<com.sun.star.beans.PropertyValue> with this property.
diff --git a/offapi/com/sun/star/document/NoSuchFilterRequest.idl b/offapi/com/sun/star/document/NoSuchFilterRequest.idl
index fc92c27c06e9..7ba822444295 100644
--- a/offapi/com/sun/star/document/NoSuchFilterRequest.idl
+++ b/offapi/com/sun/star/document/NoSuchFilterRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/OOXMLDocumentPropertiesImporter.idl b/offapi/com/sun/star/document/OOXMLDocumentPropertiesImporter.idl
index afb96812e6f3..e0ec61512ec0 100644
--- a/offapi/com/sun/star/document/OOXMLDocumentPropertiesImporter.idl
+++ b/offapi/com/sun/star/document/OOXMLDocumentPropertiesImporter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@
 module com { module sun { module star { module document {
 
 //=============================================================================
-
+    
 /** allows to import document properties from OOXML format
  */
 service OOXMLDocumentPropertiesImporter : XOOXMLDocumentPropertiesImporter;
diff --git a/offapi/com/sun/star/document/OfficeDocument.idl b/offapi/com/sun/star/document/OfficeDocument.idl
index fe0e3476e5b8..1ab2816c90ba 100644
--- a/offapi/com/sun/star/document/OfficeDocument.idl
+++ b/offapi/com/sun/star/document/OfficeDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl b/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl
index b47abb27aeda..54e6e7afc279 100644
--- a/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl
+++ b/offapi/com/sun/star/document/OleEmbeddedServerRegistration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_document_OleEmbeddedServerRegistration_idl__
-#define __com_sun_star_document_OleEmbeddedServerRegistration_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module document {
-
-//=============================================================================
-
+#ifndef __com_sun_star_document_OleEmbeddedServerRegistration_idl__ 
+#define __com_sun_star_document_OleEmbeddedServerRegistration_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module document {  
+ 
+//============================================================================= 
+ 
 /** registers embedded server for StarOffice documents
     <p>
-    This service is only used to register embedded server support
+    This service is only used to register embedded server support 
     for StarOffice documents.
     </p>
 
      @since OOo 1.1.2
  */
 published service OleEmbeddedServerRegistration
-{
-
-    interface com::sun::star::uno::XInterface;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
+{ 
 
-=============================================================================*/
-#endif
+    interface com::sun::star::uno::XInterface; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
 
diff --git a/offapi/com/sun/star/document/OwnLockOnDocumentRequest.idl b/offapi/com/sun/star/document/OwnLockOnDocumentRequest.idl
index c2448f65ab42..eb5b54cc9e68 100644
--- a/offapi/com/sun/star/document/OwnLockOnDocumentRequest.idl
+++ b/offapi/com/sun/star/document/OwnLockOnDocumentRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/PDFDialog.idl b/offapi/com/sun/star/document/PDFDialog.idl
index 6de6e05497c1..b271afb2ea89 100644
--- a/offapi/com/sun/star/document/PDFDialog.idl
+++ b/offapi/com/sun/star/document/PDFDialog.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_document_PDFDialog_idl__
-#define __com_sun_star_document_PDFDialog_idl__
-
+#ifndef __com_sun_star_document_PDFDialog_idl__ 
+#define __com_sun_star_document_PDFDialog_idl__ 
+ 
 #ifndef __com_sun_star_ui_dialogs_FilterOptionsDialog_idl__
-#include <com/sun/star/ui/dialogs/FilterOptionsDialog.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module document {
-
-//=============================================================================
-
+#include <com/sun/star/ui/dialogs/FilterOptionsDialog.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module document {  
+ 
+//============================================================================= 
+ 
 /** This service is for a PDFDialog
  */
 service PDFDialog
-{
-    service com::sun::star::ui::dialogs::FilterOptionsDialog;
+{ 
+    service com::sun::star::ui::dialogs::FilterOptionsDialog; 
 
     //-------------------------------------------------------------------------
     /** PDFDialog options can be set as sequence of
@@ -54,11 +54,11 @@ service PDFDialog
     */
 
     //-------------------------------------------------------------------------
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/document/PrinterIndependentLayout.idl b/offapi/com/sun/star/document/PrinterIndependentLayout.idl
index edefba369eb8..d5f21d522205 100644
--- a/offapi/com/sun/star/document/PrinterIndependentLayout.idl
+++ b/offapi/com/sun/star/document/PrinterIndependentLayout.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,15 +42,15 @@ published constants PrinterIndependentLayout
     /** use printer-dependent metrics for layout */
     const short DISABLED = 1;
 
-    /** use printer-independent metrics for layout,
+    /** use printer-independent metrics for layout, 
         assuming a generic 600dpi printer */
     const short LOW_RESOLUTION = 2;
-
-    /** @deprecated ENABLED changed to LOW_RESOLUTION,
+    
+    /** @deprecated ENABLED changed to LOW_RESOLUTION, 
                     to distinguish from HIGH_RESOLUTION */
     const short ENABLED = LOW_RESOLUTION;
 
-    /** use printer-independent metrics for layout,
+    /** use printer-independent metrics for layout, 
         assuming a generic high-resolution printer (4800dpi) */
     const short HIGH_RESOLUTION = 3;
 
@@ -58,7 +58,7 @@ published constants PrinterIndependentLayout
     const short LIKE_PARENT = 4;
      */
 };
-
+    
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/document/RedlineDisplayType.idl b/offapi/com/sun/star/document/RedlineDisplayType.idl
index 991ecc190b9c..24f5a074b38e 100644
--- a/offapi/com/sun/star/document/RedlineDisplayType.idl
+++ b/offapi/com/sun/star/document/RedlineDisplayType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,19 +39,19 @@ published constants RedlineDisplayType
 {
     /** no changes are displayed.
      */
-    const short NONE = 0;
+    const short	NONE = 0;
 
     /** only inserted parts are displayed and attributed.
      */
-    const short INSERTED = 1;
+    const short	INSERTED = 1;
 
     /** only inserted parts are displayed and attributed.
      */
-    const short INSERTED_AND_REMOVED = 2;
+    const short	INSERTED_AND_REMOVED = 2;
 
     /** only removed parts are displayed and attributed.
      */
-    const short REMOVED = 3;
+    const short	REMOVED = 3;
 };
 
 };};};};
diff --git a/offapi/com/sun/star/document/Settings.idl b/offapi/com/sun/star/document/Settings.idl
index ace40c4ab814..65f694ff2aa0 100644
--- a/offapi/com/sun/star/document/Settings.idl
+++ b/offapi/com/sun/star/document/Settings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
 #ifndef __com_sun_star_document_Settings_idl__
 #define __com_sun_star_document_Settings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
 #ifndef __com_sun_star_i18n_XForbiddenCharacters_idl__
diff --git a/offapi/com/sun/star/document/StandaloneDocumentInfo.idl b/offapi/com/sun/star/document/StandaloneDocumentInfo.idl
index 9b9ed2f7cb9a..16c11612f5ac 100644
--- a/offapi/com/sun/star/document/StandaloneDocumentInfo.idl
+++ b/offapi/com/sun/star/document/StandaloneDocumentInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/TypeDetection.idl b/offapi/com/sun/star/document/TypeDetection.idl
index f0d39e77ad51..83edc22c073c 100644
--- a/offapi/com/sun/star/document/TypeDetection.idl
+++ b/offapi/com/sun/star/document/TypeDetection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/UpdateDocMode.idl b/offapi/com/sun/star/document/UpdateDocMode.idl
index 52e8a37cb011..70d87a91046c 100644
--- a/offapi/com/sun/star/document/UpdateDocMode.idl
+++ b/offapi/com/sun/star/document/UpdateDocMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ published constants UpdateDocMode
     */
 
     const short NO_UPDATE = 0;
-
+    
     //-------------------------------------------------------------------------
     /** Update document if it does not require a dialog.
         Otherwise do not update. For example a link to a database
@@ -54,7 +54,7 @@ published constants UpdateDocMode
     const short QUIET_UPDATE = 1;
 
     //-------------------------------------------------------------------------
-    /** Produce update according to configuration settings.
+    /** Produce update according to configuration settings. 
         If there are no settings use dialog.
     */
 
diff --git a/offapi/com/sun/star/document/XActionLockable.idl b/offapi/com/sun/star/document/XActionLockable.idl
index 62add1717cd8..5e5c4b2f9ac3 100644
--- a/offapi/com/sun/star/document/XActionLockable.idl
+++ b/offapi/com/sun/star/document/XActionLockable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,65 +24,65 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_document_XActionLockable_idl__
-#define __com_sun_star_document_XActionLockable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-module com {   module sun {   module star {   module document {
-
-//=============================================================================
-
+#ifndef __com_sun_star_document_XActionLockable_idl__  
+#define __com_sun_star_document_XActionLockable_idl__  
+  
+#ifndef __com_sun_star_uno_XInterface_idl__  
+#include <com/sun/star/uno/XInterface.idl>  
+#endif  
+  
+  
+//=============================================================================  
+  
+module com {   module sun {   module star {   module document {   
+  
+//=============================================================================  
+  
 /** makes it possible to prevent object internal updates for a certain period
     to be able to quickly change multiple parts of the objects, where the
     updates would invalidate each other, anyway.
  */
 published interface XActionLockable: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{  
+    //-------------------------------------------------------------------------  
     /** @returns
             <TRUE/> if at least one lock exists.
      */
-    boolean isActionLocked();
-
-    //-------------------------------------------------------------------------
+    boolean isActionLocked();  
+  
+    //-------------------------------------------------------------------------  
     /** increments the lock count of the object by one.
      */
-    void addActionLock();
-
-    //-------------------------------------------------------------------------
+    void addActionLock();  
+  
+    //-------------------------------------------------------------------------  
     /** decrements the lock count of the object by one.
      */
-    void removeActionLock();
-
-    //-------------------------------------------------------------------------
+    void removeActionLock();  
+  
+    //-------------------------------------------------------------------------  
     /** sets the locking level.
-
+        
         <p>This method is used for debugging purposes. The programming
         environment can restore the locking after a break of a debug
         session.</p>
      */
-    void setActionLocks( [in] short nLock );
-
-    //-------------------------------------------------------------------------
+    void setActionLocks( [in] short nLock );  
+  
+    //-------------------------------------------------------------------------  
     /** resets the locking level.
-
+        
         <p>This method is used for debugging purposes. The debugging
         environment of a programming language can reset the locks
         to allow refreshing of the view if a breakpoint is reached or
         step execution is used. </p>
      */
-    short resetActionLocks();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    short resetActionLocks();  
+  
+};  
+  
+//=============================================================================  
+  
+}; }; }; };   
+  
+#endif  
diff --git a/offapi/com/sun/star/document/XBinaryStreamResolver.idl b/offapi/com/sun/star/document/XBinaryStreamResolver.idl
index 5b754eba3670..4c9a9e1cfeb3 100644
--- a/offapi/com/sun/star/document/XBinaryStreamResolver.idl
+++ b/offapi/com/sun/star/document/XBinaryStreamResolver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,48 +37,48 @@
 #include <com/sun/star/io/XOutputStream.idl>
 #endif
 
-//=============================================================================
-
-module com {  module sun {  module star {  module document {
-
-//=============================================================================
-
-/**
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module document {  
+ 
+//============================================================================= 
+ 
+/** 
     <p>This interface encapsulates functionality to get/resolve binary data streams.
     It is used to transform binary data to an URL or to transform an URL to binary
-    data. The binary data is represented through input and output streams.</p>
-
+    data. The binary data is represented through input and output streams.</p> 
+    
     <p>In the case of transforming an URL to binary data, the <code>getInputStream</code>
-    method is used. This returns a <type scope="com::sun::star::io">XInputStream</type>
+    method is used. This returns a <type scope="com::sun::star::io">XInputStream</type> 
     from which the binary data, transformed from the given URL, can be read.</p>
-
+     
     <p>In the case of transforming binary data to an URL, a
-    <type scope="com::sun::star::io">XOutputStream</type> is created first to write
-    the binary data to. After this, the <code>resolveOutputStream</code> method can
-    be used to transform the binary data, represented through the
+    <type scope="com::sun::star::io">XOutputStream</type> is created first to write 
+    the binary data to. After this, the <code>resolveOutputStream</code> method can 
+    be used to transform the binary data, represented through the 
     <type scope="com::sun::star::io">XOutputStream</type> interface, to an URL.</p>
  */
 published interface XBinaryStreamResolver: com::sun::star::uno::XInterface
-{
+{ 
     /** converts the given URL from the source URL namespace to an input stream,
         from which binary data can be read
     */
     com::sun::star::io::XInputStream getInputStream( [in] string aURL );
 
     /** creates an output stream, to which binary data can be written.
-        After writing, an URL can be retrieved by a call to
+        After writing, an URL can be retrieved by a call to 
         <method>XBinaryStreamResolver::resolveOutputStream</method>.
     */
     com::sun::star::io::XOutputStream createOutputStream();
 
-    /** converts the output stream, data has been written to, to an URL in
+    /** converts the output stream, data has been written to, to an URL in 
         source URL namespace.
     */
     string resolveOutputStream( [in] com::sun::star::io::XOutputStream aBinaryStream );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/document/XCompatWriterDocProperties.idl b/offapi/com/sun/star/document/XCompatWriterDocProperties.idl
index 904ea75f3df1..435ffb33be69 100644
--- a/offapi/com/sun/star/document/XCompatWriterDocProperties.idl
+++ b/offapi/com/sun/star/document/XCompatWriterDocProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl b/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
index c0e10ac1e99c..57ea29a7a6ce 100644
--- a/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
+++ b/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,11 +35,11 @@
 #include <com/sun/star/document/DocumentEvent.idl>
 #endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 
-#ifndef __com_sun_star_lang_NoSupportException_idl__
+#ifndef __com_sun_star_lang_NoSupportException_idl__ 
 #include <com/sun/star/lang/NoSupportException.idl>
 #endif
 
@@ -118,7 +118,7 @@ interface XDocumentEventBroadcaster
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XDocumentEventListener.idl b/offapi/com/sun/star/document/XDocumentEventListener.idl
index 4d151b844659..1074fa70bfd1 100644
--- a/offapi/com/sun/star/document/XDocumentEventListener.idl
+++ b/offapi/com/sun/star/document/XDocumentEventListener.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
 #ifndef __com_sun_star_document_XDocumentEventListener_idl__
 #define __com_sun_star_document_XDocumentEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl>
 #endif
 
diff --git a/offapi/com/sun/star/document/XDocumentInfo.idl b/offapi/com/sun/star/document/XDocumentInfo.idl
index ea67495f44b9..28d7b53d2788 100644
--- a/offapi/com/sun/star/document/XDocumentInfo.idl
+++ b/offapi/com/sun/star/document/XDocumentInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XDocumentInfoSupplier.idl b/offapi/com/sun/star/document/XDocumentInfoSupplier.idl
index ceb17d1bcc5b..4b3d2127830e 100644
--- a/offapi/com/sun/star/document/XDocumentInfoSupplier.idl
+++ b/offapi/com/sun/star/document/XDocumentInfoSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XDocumentInsertable.idl b/offapi/com/sun/star/document/XDocumentInsertable.idl
index 60208ee05014..ef6b576fefc7 100644
--- a/offapi/com/sun/star/document/XDocumentInsertable.idl
+++ b/offapi/com/sun/star/document/XDocumentInsertable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_document_XDocumentInsertable_idl__
-#define __com_sun_star_document_XDocumentInsertable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {   module sun {   module star {   module document {
-
-//=============================================================================
-
+#ifndef __com_sun_star_document_XDocumentInsertable_idl__  
+#define __com_sun_star_document_XDocumentInsertable_idl__  
+  
+#ifndef __com_sun_star_uno_XInterface_idl__  
+#include <com/sun/star/uno/XInterface.idl>  
+#endif  
+  
+#ifndef __com_sun_star_beans_PropertyValue_idl__  
+#include <com/sun/star/beans/PropertyValue.idl>  
+#endif  
+  
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__  
+#include <com/sun/star/lang/IllegalArgumentException.idl>  
+#endif  
+  
+#ifndef __com_sun_star_io_IOException_idl__  
+#include <com/sun/star/io/IOException.idl>  
+#endif  
+  
+  
+//=============================================================================  
+  
+module com {   module sun {   module star {   module document {   
+  
+//=============================================================================  
+  
 /** makes it possible to import a document from a given URL
     into this document.
  */
 published interface XDocumentInsertable: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{  
+    //-------------------------------------------------------------------------  
     /** inserts the document that is specified by the URL.
      */
-    void insertDocumentFromURL( [in] string aURL,
-             [in] sequence<com::sun::star::beans::PropertyValue> aOptions )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::io::IOException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void insertDocumentFromURL( [in] string aURL,  
+             [in] sequence<com::sun::star::beans::PropertyValue> aOptions )  
+            raises( com::sun::star::lang::IllegalArgumentException,  
+                    com::sun::star::io::IOException );  
+  
+};  
+  
+//=============================================================================  
+  
+}; }; }; };   
+  
+#endif  
diff --git a/offapi/com/sun/star/document/XDocumentLanguages.idl b/offapi/com/sun/star/document/XDocumentLanguages.idl
index c6f17125d050..aaecfaa46f0f 100644
--- a/offapi/com/sun/star/document/XDocumentLanguages.idl
+++ b/offapi/com/sun/star/document/XDocumentLanguages.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@ interface XDocumentLanguages: com::sun::star::uno::XInterface
      */
     sequence< com::sun::star::lang::Locale > getDocumentLanguages( [in] short nScriptTypes, [in] short nCount )
         raises( com::sun::star::lang::IllegalArgumentException );
-
+    
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl b/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl
index 811513d7a026..8fa61d44a005 100644
--- a/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl
+++ b/offapi/com/sun/star/document/XDocumentPropertiesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XDocumentRecovery.idl b/offapi/com/sun/star/document/XDocumentRecovery.idl
index 108c16abd54d..34dc77cd7a2b 100644
--- a/offapi/com/sun/star/document/XDocumentRecovery.idl
+++ b/offapi/com/sun/star/document/XDocumentRecovery.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2009 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module document {
+module com { module sun { module star { module document { 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XDocumentRevisionListPersistence.idl b/offapi/com/sun/star/document/XDocumentRevisionListPersistence.idl
index 991b54fa84a9..0b70c8ce23ad 100644
--- a/offapi/com/sun/star/document/XDocumentRevisionListPersistence.idl
+++ b/offapi/com/sun/star/document/XDocumentRevisionListPersistence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl b/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl
index be5121bf2e2a..93c3d8b71212 100644
--- a/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl
+++ b/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XEmbeddedObjectResolver.idl b/offapi/com/sun/star/document/XEmbeddedObjectResolver.idl
index f1b31dd21d90..0abca8785a71 100644
--- a/offapi/com/sun/star/document/XEmbeddedObjectResolver.idl
+++ b/offapi/com/sun/star/document/XEmbeddedObjectResolver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_document_XEmbeddedObjectResolver_idl__
-#define __com_sun_star_document_XEmbeddedObjectResolver_idl__
-
+#ifndef __com_sun_star_document_XEmbeddedObjectResolver_idl__ 
+#define __com_sun_star_document_XEmbeddedObjectResolver_idl__ 
+ 
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
-//=============================================================================
-
-module com {  module sun {  module star {  module document {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module document {  
+ 
+//============================================================================= 
+ 
 /** this interface converts embedded object URLs from one URL space to another.
  */
 published interface XEmbeddedObjectResolver: com::sun::star::uno::XInterface
-{
+{ 
     /** converts the given URL from the source URL namespace to the destination
         URL space of this instance.
     */
     string resolveEmbeddedObjectURL( [in] string aURL );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/document/XEmbeddedObjectSupplier.idl b/offapi/com/sun/star/document/XEmbeddedObjectSupplier.idl
index 1885121705dd..4ce50ebbf543 100644
--- a/offapi/com/sun/star/document/XEmbeddedObjectSupplier.idl
+++ b/offapi/com/sun/star/document/XEmbeddedObjectSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_document_XEmbeddedObjectSupplier_idl__
-#define __com_sun_star_document_XEmbeddedObjectSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-
-//=============================================================================
-
-module com {   module sun {   module star {   module document {
-
-//=============================================================================
-
+#ifndef __com_sun_star_document_XEmbeddedObjectSupplier_idl__  
+#define __com_sun_star_document_XEmbeddedObjectSupplier_idl__  
+  
+#ifndef __com_sun_star_uno_XInterface_idl__  
+#include <com/sun/star/uno/XInterface.idl>  
+#endif  
+  
+#ifndef __com_sun_star_lang_XComponent_idl__  
+#include <com/sun/star/lang/XComponent.idl>  
+#endif  
+  
+  
+//=============================================================================  
+  
+module com {   module sun {   module star {   module document {   
+  
+//=============================================================================  
+  
 /** represents something that provides an embedded object.
  */
 published interface XEmbeddedObjectSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{  
+    //-------------------------------------------------------------------------  
     /** returns the object which is embedded into this object.
      */
-    com::sun::star::lang::XComponent getEmbeddedObject();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::lang::XComponent getEmbeddedObject();  
+  
+};  
+  
+//=============================================================================  
+  
+}; }; }; };   
+  
+#endif  
diff --git a/offapi/com/sun/star/document/XEmbeddedObjectSupplier2.idl b/offapi/com/sun/star/document/XEmbeddedObjectSupplier2.idl
index 32d959cb3944..600ede940c99 100644
--- a/offapi/com/sun/star/document/XEmbeddedObjectSupplier2.idl
+++ b/offapi/com/sun/star/document/XEmbeddedObjectSupplier2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_document_XEmbeddedObjectSupplier2_idl__
-#define __com_sun_star_document_XEmbeddedObjectSupplier2_idl__
-
-#ifndef __com_sun_star_embed_XEmbeddedObject_idl__
-#include <com/sun/star/embed/XEmbeddedObject.idl>
-#endif
-
-#ifndef __com_sun_star_graphic_XGraphic_idl__
-#include <com/sun/star/graphic/XGraphic.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEmbeddedObjectSupplier_idl__
-#include <com/sun/star/document/XEmbeddedObjectSupplier.idl>
-#endif
-
-
-//=============================================================================
-
-module com {   module sun {   module star {   module document {
-
-//=============================================================================
-
+#ifndef __com_sun_star_document_XEmbeddedObjectSupplier2_idl__  
+#define __com_sun_star_document_XEmbeddedObjectSupplier2_idl__  
+  
+#ifndef __com_sun_star_embed_XEmbeddedObject_idl__  
+#include <com/sun/star/embed/XEmbeddedObject.idl>  
+#endif  
+ 
+#ifndef __com_sun_star_graphic_XGraphic_idl__  
+#include <com/sun/star/graphic/XGraphic.idl>  
+#endif  
+
+#ifndef __com_sun_star_document_XEmbeddedObjectSupplier_idl__  
+#include <com/sun/star/document/XEmbeddedObjectSupplier.idl>  
+#endif  
+  
+  
+//=============================================================================  
+  
+module com {   module sun {   module star {   module document {   
+  
+//=============================================================================  
+  
 /** represents something that provides an embedded object.
  */
 interface XEmbeddedObjectSupplier2: com::sun::star::document::XEmbeddedObjectSupplier
-{
-    //-------------------------------------------------------------------------
+{  
+    //-------------------------------------------------------------------------  
     /** returns the object which is embedded into this object.
 
         <p>
@@ -58,23 +58,23 @@ interface XEmbeddedObjectSupplier2: com::sun::star::document::XEmbeddedObjectSup
         embedded object, but the embedded object itself.
         </p>
      */
-    com::sun::star::embed::XEmbeddedObject getExtendedControlOverEmbeddedObject();
-
-    //-------------------------------------------------------------------------
+    com::sun::star::embed::XEmbeddedObject getExtendedControlOverEmbeddedObject();  
+  
+    //-------------------------------------------------------------------------  
     /** allows to control the aspect of the object.
      */
     [attribute] hyper Aspect;
 
-    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------  
     /** allows to get the replacement image of the object.
      */
     [attribute,readonly] com::sun::star::graphic::XGraphic ReplacementGraphic;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
+};  
+  
+//=============================================================================  
+  
+}; }; }; };   
+  
 #endif
 
diff --git a/offapi/com/sun/star/document/XEmbeddedScripts.idl b/offapi/com/sun/star/document/XEmbeddedScripts.idl
index f8f14c4b3319..1fbde210f6d2 100644
--- a/offapi/com/sun/star/document/XEmbeddedScripts.idl
+++ b/offapi/com/sun/star/document/XEmbeddedScripts.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module document {
+module com { module sun { module star { module document { 
 
 //=============================================================================
 
@@ -65,7 +65,7 @@ interface XEmbeddedScripts
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XEventBroadcaster.idl b/offapi/com/sun/star/document/XEventBroadcaster.idl
index ff4240b028ee..c1c03ea20d02 100644
--- a/offapi/com/sun/star/document/XEventBroadcaster.idl
+++ b/offapi/com/sun/star/document/XEventBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XEventListener.idl b/offapi/com/sun/star/document/XEventListener.idl
index d32b04ced66f..832bfb86ca5f 100644
--- a/offapi/com/sun/star/document/XEventListener.idl
+++ b/offapi/com/sun/star/document/XEventListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XEventsSupplier.idl b/offapi/com/sun/star/document/XEventsSupplier.idl
index d5bd2b0d9aa9..4269ef3b1fc9 100644
--- a/offapi/com/sun/star/document/XEventsSupplier.idl
+++ b/offapi/com/sun/star/document/XEventsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XExporter.idl b/offapi/com/sun/star/document/XExporter.idl
index a89017c248a1..616c4200b33d 100644
--- a/offapi/com/sun/star/document/XExporter.idl
+++ b/offapi/com/sun/star/document/XExporter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XExtendedFilterDetection.idl b/offapi/com/sun/star/document/XExtendedFilterDetection.idl
index 70b9da4424ea..65160d7c6241 100644
--- a/offapi/com/sun/star/document/XExtendedFilterDetection.idl
+++ b/offapi/com/sun/star/document/XExtendedFilterDetection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XFilter.idl b/offapi/com/sun/star/document/XFilter.idl
index 82bdca53dba5..c44ef18cfdd6 100644
--- a/offapi/com/sun/star/document/XFilter.idl
+++ b/offapi/com/sun/star/document/XFilter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XFilterAdapter.idl b/offapi/com/sun/star/document/XFilterAdapter.idl
index 877587aa0e26..e35f9cfc1904 100644
--- a/offapi/com/sun/star/document/XFilterAdapter.idl
+++ b/offapi/com/sun/star/document/XFilterAdapter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,17 +35,17 @@
 #include <com/sun/star/io/XInputStream.idl>
 #include <com/sun/star/io/XOutputStream.idl>
 
-//=============================================================================
-
-module com {   module sun {   module star {   module document {
-
-//=============================================================================
+//=============================================================================  
+  
+module com {   module sun {   module star {   module document {   
+  
+//=============================================================================  
 
-      /** This is an interface that can be used to link a filter to the
+      /** This is an interface that can be used to link a filter to the 
         FilterAdapter
-
+              
         @throws com::sun::star::uno::RuntimeException
-
+        
         @since OOo 1.1.2
       */
 published interface XFilterAdapter : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/document/XGraphicObjectResolver.idl b/offapi/com/sun/star/document/XGraphicObjectResolver.idl
index 50863b04f38c..59955e6aa3a4 100644
--- a/offapi/com/sun/star/document/XGraphicObjectResolver.idl
+++ b/offapi/com/sun/star/document/XGraphicObjectResolver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_document_XGraphicObjectResolver_idl__
-#define __com_sun_star_document_XGraphicObjectResolver_idl__
-
+#ifndef __com_sun_star_document_XGraphicObjectResolver_idl__ 
+#define __com_sun_star_document_XGraphicObjectResolver_idl__ 
+ 
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
-//=============================================================================
-
-module com {  module sun {  module star {  module document {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module document {  
+ 
+//============================================================================= 
+ 
 /** this interface converts graphic object URLs from one URL space to another.
  */
 published interface XGraphicObjectResolver: com::sun::star::uno::XInterface
-{
+{ 
     /** converts the given URL from the source URL namespace to the destination
         URL space of this instance.
     */
     string resolveGraphicObjectURL( [in] string aURL );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/document/XImporter.idl b/offapi/com/sun/star/document/XImporter.idl
index 9a784aeae173..063717b957ec 100644
--- a/offapi/com/sun/star/document/XImporter.idl
+++ b/offapi/com/sun/star/document/XImporter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XInteractionFilterOptions.idl b/offapi/com/sun/star/document/XInteractionFilterOptions.idl
index b11749297e14..89c843d8275a 100644
--- a/offapi/com/sun/star/document/XInteractionFilterOptions.idl
+++ b/offapi/com/sun/star/document/XInteractionFilterOptions.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,7 +49,7 @@ published interface XInteractionFilterOptions : ::com::sun::star::task::XInterac
     //-------------------------------------------------------------------------
     /** Store results to the continuation.
 
-        @param rProperties  the list of properties containing filter options.
+        @param rProperties	the list of properties containing filter options.
 
     */
     void   setFilterOptions( [in] sequence< com::sun::star::beans::PropertyValue > rProperties );
diff --git a/offapi/com/sun/star/document/XInteractionFilterSelect.idl b/offapi/com/sun/star/document/XInteractionFilterSelect.idl
index 2e396f4aa165..99b046923b4f 100644
--- a/offapi/com/sun/star/document/XInteractionFilterSelect.idl
+++ b/offapi/com/sun/star/document/XInteractionFilterSelect.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XLinkTargetSupplier.idl b/offapi/com/sun/star/document/XLinkTargetSupplier.idl
index f48a68f9d429..db37319ec22e 100644
--- a/offapi/com/sun/star/document/XLinkTargetSupplier.idl
+++ b/offapi/com/sun/star/document/XLinkTargetSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_document_XLinkTargetSupplier_idl__
-#define __com_sun_star_document_XLinkTargetSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-
-//=============================================================================
-
-module com {   module sun {   module star {   module document {
-
-//=============================================================================
-
+#ifndef __com_sun_star_document_XLinkTargetSupplier_idl__  
+#define __com_sun_star_document_XLinkTargetSupplier_idl__  
+  
+#ifndef __com_sun_star_uno_XInterface_idl__  
+#include <com/sun/star/uno/XInterface.idl>  
+#endif  
+  
+#ifndef __com_sun_star_container_XNameAccess_idl__  
+#include <com/sun/star/container/XNameAccess.idl>  
+#endif  
+  
+  
+//=============================================================================  
+  
+module com {   module sun {   module star {   module document {   
+  
+//=============================================================================  
+  
 /** interface is supplied by objects inside a document object model that have
     children that can be the target of a link inside a document.
-
+    
     <p>These targets implement the service <type>LinkTarget</type>.  </p>
  */
 published interface XLinkTargetSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-    /** @returns
-            the names of possible links to children of this object inside  a
+{  
+    //-------------------------------------------------------------------------  
+    /** @returns 
+            the names of possible links to children of this object inside  a 
             document object model. It implements the service  <type>LinkTargets</type>.
      */
-    com::sun::star::container::XNameAccess getLinks();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::container::XNameAccess getLinks();  
+  
+};  
+  
+//=============================================================================  
+  
+}; }; }; };   
+  
+#endif  
diff --git a/offapi/com/sun/star/document/XMLBasicExporter.idl b/offapi/com/sun/star/document/XMLBasicExporter.idl
index 4e11911e3181..75515e4357cb 100644
--- a/offapi/com/sun/star/document/XMLBasicExporter.idl
+++ b/offapi/com/sun/star/document/XMLBasicExporter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,14 +45,14 @@
 module com { module sun { module star { module document {
 
 //=============================================================================
-
+    
 /** Filter for exporting Basic macros to the OpenOffice.org file format.
 
-    <p>First the <method>XExporter::setSourceDocument</method> method must be
+    <p>First the <method>XExporter::setSourceDocument</method> method must be 
     called in order to provide the export component with the source document
     from which the data should be exported. After that, the export is started
     by calling the <method>XFilter::filter</method> method.</p>
-
+    
     @since OOo 2.0.0
  */
 published service XMLBasicExporter
@@ -60,19 +60,19 @@ published service XMLBasicExporter
     //-------------------------------------------------------------------------
 
     /** sets the source document for this filter.
-     */
+     */    
     interface com::sun::star::document::XExporter;
 
     //-------------------------------------------------------------------------
 
     /** filters the document.
-     */
+     */    
     interface com::sun::star::document::XFilter;
 
     //-------------------------------------------------------------------------
 
     /** initializes the component.
-     */
+     */    
     [optional] interface com::sun::star::lang::XInitialization;
 
 };
diff --git a/offapi/com/sun/star/document/XMLBasicImporter.idl b/offapi/com/sun/star/document/XMLBasicImporter.idl
index 38f3bf3ff086..d7290662ed1c 100644
--- a/offapi/com/sun/star/document/XMLBasicImporter.idl
+++ b/offapi/com/sun/star/document/XMLBasicImporter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,8 +31,8 @@
 #include <com/sun/star/document/XImporter.idl>
 #endif
 
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
-#include <com/sun/star/xml/sax/XDocumentHandler.idl>
+#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__ 
+#include <com/sun/star/xml/sax/XDocumentHandler.idl> 
 #endif
 
 
@@ -41,15 +41,15 @@
 module com { module sun { module star { module document {
 
 //=============================================================================
-
+    
 /** Filter for importing Basic macros from the OpenOffice.org file format.
 
-    <p>The <method>XImporter::setTargetDocument</method> method must be
+    <p>The <method>XImporter::setTargetDocument</method> method must be 
     called in order to provide the import component with the target document
     to which the data should be imported.
     The <type scope="com::sun::star::xml::sax">XDocumentHandler</type>
     interface is used to stream the XML data into the filter.</p>
-
+        
     @since OOo 2.0.0
  */
 published service XMLBasicImporter
@@ -57,15 +57,15 @@ published service XMLBasicImporter
     //-------------------------------------------------------------------------
 
     /** sets the target document for this filter.
-     */
+     */    
     interface com::sun::star::document::XImporter;
 
     //-------------------------------------------------------------------------
 
     /** receives notification of general document events.
-     */
+     */    
     interface com::sun::star::xml::sax::XDocumentHandler;
-
+    
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XMLOasisBasicExporter.idl b/offapi/com/sun/star/document/XMLOasisBasicExporter.idl
index 8c59e34f4301..5235ee4640a5 100644
--- a/offapi/com/sun/star/document/XMLOasisBasicExporter.idl
+++ b/offapi/com/sun/star/document/XMLOasisBasicExporter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,14 +45,14 @@
 module com { module sun { module star { module document {
 
 //=============================================================================
-
+    
 /** Filter for exporting Basic macros to the OASIS Open Office file format.
 
-    <p>First the <method>XExporter::setSourceDocument</method> method must be
+    <p>First the <method>XExporter::setSourceDocument</method> method must be 
     called in order to provide the export component with the source document
     from which the data should be exported. After that, the export is started
     by calling the <method>XFilter::filter</method> method.</p>
-
+    
     @since OOo 2.0.0
  */
 published service XMLOasisBasicExporter
@@ -60,19 +60,19 @@ published service XMLOasisBasicExporter
     //-------------------------------------------------------------------------
 
     /** sets the source document for this filter.
-     */
+     */    
     interface com::sun::star::document::XExporter;
 
     //-------------------------------------------------------------------------
 
     /** filters the document.
-     */
+     */    
     interface com::sun::star::document::XFilter;
 
     //-------------------------------------------------------------------------
 
     /** initializes the component.
-     */
+     */    
     [optional] interface com::sun::star::lang::XInitialization;
 
 };
diff --git a/offapi/com/sun/star/document/XMLOasisBasicImporter.idl b/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
index c0aadd8c4941..4e9b128f0805 100644
--- a/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
+++ b/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,8 +31,8 @@
 #include <com/sun/star/document/XImporter.idl>
 #endif
 
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
-#include <com/sun/star/xml/sax/XDocumentHandler.idl>
+#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__ 
+#include <com/sun/star/xml/sax/XDocumentHandler.idl> 
 #endif
 
 
@@ -41,15 +41,15 @@
 module com { module sun { module star { module document {
 
 //=============================================================================
-
+    
 /** Filter for importing Basic macros from the OASIS Open Office file format.
 
-    <p>The <method>XImporter::setTargetDocument</method> method must be
+    <p>The <method>XImporter::setTargetDocument</method> method must be 
     called in order to provide the import component with the target document
     to which the data should be imported.
     The <type scope="com::sun::star::xml::sax">XDocumentHandler</type>
     interface is used to stream the XML data into the filter.</p>
-
+        
     @since OOo 2.0.0
  */
 published service XMLOasisBasicImporter
@@ -57,15 +57,15 @@ published service XMLOasisBasicImporter
     //-------------------------------------------------------------------------
 
     /** sets the target document for this filter.
-     */
+     */    
     interface com::sun::star::document::XImporter;
 
     //-------------------------------------------------------------------------
 
     /** receives notification of general document events.
-     */
+     */    
     interface com::sun::star::xml::sax::XDocumentHandler;
-
+    
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/document/XMimeTypeInfo.idl b/offapi/com/sun/star/document/XMimeTypeInfo.idl
index fd3345f75c48..ea470a1c95d3 100644
--- a/offapi/com/sun/star/document/XMimeTypeInfo.idl
+++ b/offapi/com/sun/star/document/XMimeTypeInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_document_XMimeTypeInfo_idl__
-#define __com_sun_star_document_XMimeTypeInfo_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module document {
-
-//=============================================================================
-
+#ifndef __com_sun_star_document_XMimeTypeInfo_idl__ 
+#define __com_sun_star_document_XMimeTypeInfo_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module document {  
+ 
+//============================================================================= 
+ 
 /** provides information regarding which MIME types are supported by a filter.
  */
 published interface XMimeTypeInfo: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+      
     /** asks whether a MIME type is supported or not.
      */
-    boolean supportsMimeType( [in] string MimeTypeName );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            a sequence of the names of all supported MIME types.
+    boolean supportsMimeType( [in] string MimeTypeName ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            a sequence of the names of all supported MIME types. 
      */
-    sequence<string> getSupportedMimeTypeNames();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    sequence<string> getSupportedMimeTypeNames(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl b/offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl
index 23b29bcaca61..dfb23a37b14c 100644
--- a/offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl
+++ b/offapi/com/sun/star/document/XOOXMLDocumentPropertiesImporter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XRedlinesSupplier.idl b/offapi/com/sun/star/document/XRedlinesSupplier.idl
index 6ce6b825e04e..3dd924a32e3f 100644
--- a/offapi/com/sun/star/document/XRedlinesSupplier.idl
+++ b/offapi/com/sun/star/document/XRedlinesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,9 +42,9 @@ module com {   module sun {   module star {   module document {
 published interface XRedlinesSupplier: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** @returns
+    /** @returns 
             an enumeration access that provides access to the redline objects of the document.
-
+            
             <p>The returned objects implement at least the interface
             <type scope="com::sun::star::beans">XPropertySet</type>.
             Specific objects may support other interfaces as well.</p>
diff --git a/offapi/com/sun/star/document/XScriptInvocationContext.idl b/offapi/com/sun/star/document/XScriptInvocationContext.idl
index 237ca45e9664..bd6b8e70fc64 100644
--- a/offapi/com/sun/star/document/XScriptInvocationContext.idl
+++ b/offapi/com/sun/star/document/XScriptInvocationContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module document {
+module com { module sun { module star { module document { 
 
 //=============================================================================
 
@@ -66,7 +66,7 @@ interface XScriptInvocationContext
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl b/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl
index cf09472df795..79a02e554b80 100644
--- a/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl
+++ b/offapi/com/sun/star/document/XStandaloneDocumentInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XStorageBasedDocument.idl b/offapi/com/sun/star/document/XStorageBasedDocument.idl
index 047320b43df4..b34c4daab91f 100644
--- a/offapi/com/sun/star/document/XStorageBasedDocument.idl
+++ b/offapi/com/sun/star/document/XStorageBasedDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XStorageChangeListener.idl b/offapi/com/sun/star/document/XStorageChangeListener.idl
index 2272132f8db2..3381d711ff0f 100644
--- a/offapi/com/sun/star/document/XStorageChangeListener.idl
+++ b/offapi/com/sun/star/document/XStorageChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XTypeDetection.idl b/offapi/com/sun/star/document/XTypeDetection.idl
index ce89b437edb8..054c2d7ba9fc 100644
--- a/offapi/com/sun/star/document/XTypeDetection.idl
+++ b/offapi/com/sun/star/document/XTypeDetection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/document/XVbaMethodParameter.idl b/offapi/com/sun/star/document/XVbaMethodParameter.idl
index 546f215c5023..7ef52964b7b4 100644
--- a/offapi/com/sun/star/document/XVbaMethodParameter.idl
+++ b/offapi/com/sun/star/document/XVbaMethodParameter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright IBM Corporation 2009
  * Copyright 2009 by Sun Microsystems, Inc.
  *
@@ -36,11 +36,11 @@
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com {  module sun {  module star {  module document {
 
-//=============================================================================
+//============================================================================= 
 //gives access to vba method input/output parameters
 //
 //some OO objects need to implement this interface to support the passing of input/output parameters
@@ -48,21 +48,21 @@ module com {  module sun {  module star {  module document {
 
 interface XVbaMethodParameter : com::sun::star::uno::XInterface
 {
-    //-------------------------------------------------------------------------
-
-    /** sets the value of the parameter with the specified name.
-     */
-    void setVbaMethodParameter( [in] string PropertyName,
-             [in] any Value );
-
-    //-------------------------------------------------------------------------
+	//------------------------------------------------------------------------- 
+	 
+	/** sets the value of the parameter with the specified name.
+	 */
+	void setVbaMethodParameter( [in] string PropertyName, 
+			 [in] any Value ); 
+ 
+	//------------------------------------------------------------------------- 
 
-    /** returns the value of the parameter with the specified name.
+	/** returns the value of the parameter with the specified name.
      */
-    any getVbaMethodParameter( [in] string PropertyName );
+	any getVbaMethodParameter( [in] string PropertyName ); 
 };
 
-//=============================================================================
+//============================================================================= 
 
 }; }; }; };
 #endif
diff --git a/offapi/com/sun/star/document/XViewDataSupplier.idl b/offapi/com/sun/star/document/XViewDataSupplier.idl
index 0a27b906f358..902720863ef3 100644
--- a/offapi/com/sun/star/document/XViewDataSupplier.idl
+++ b/offapi/com/sun/star/document/XViewDataSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
index d00884a08faf..b010fdff3d60 100644
--- a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -58,10 +58,10 @@ module com {  module sun {  module star {  module drawing {
     outside the currently visible area, the user has to issue these requests
     manually or programmatically through the usual chanels, e.g. pressing
     keys or selecting menu entries.</li>
-    <li>The hierarchy exposed through the
+    <li>The hierarchy exposed through the 
     <type scope="::com::sun::star::accessibility">XAccessibleContext</type>
     interface does not necessarily correspond directly to the underlying
-    draw page structure.  Internal nodes in this hierarchy are introduced
+    draw page structure.  Internal nodes in this hierarchy are introduced 
     by group shapes, 3D scenes, and OLE objects.</li>
     <li>The view modes editing view, outline view, slides view, notes view,
     handout view, and presentation view are not exposed explicitly.
@@ -73,8 +73,8 @@ module com {  module sun {  module star {  module drawing {
 */
 published service AccessibleDrawDocumentView
 {
-    /** Base interface for being accessible.  It gives access to the
-        <type scope="::com::sun::star::accessibility">XAccessibleContext</type>
+    /** Base interface for being accessible.  It gives access to the 
+        <type scope="::com::sun::star::accessibility">XAccessibleContext</type> 
         interface.
     */
     interface ::com::sun::star::accessibility::XAccessible;
@@ -87,22 +87,22 @@ published service AccessibleDrawDocumentView
             scope="com::sun::star::accessibility"
                 >AccessibleRole::DOCUMENT</const>.</li>
         <li>Name: Its name is "AccessibleDrawDocumentView",
-        "AccessibleOutlineView", or "slide window".</li>
-        <li>Description: The description is "Draw Document", "Accessible
+        "AccessibleOutlineView", or "slide window".</li> 
+        <li>Description: The description is "Draw Document", "Accessible 
         Draw Document Outline", or "slide window".</li>
         <li>Children: The shapes of the current draw page that are currently
             visible are direct and indirect children of (an object
-            implementing)
+            implementing) 
             this service.  Group shapes, 3D scenes, and OLE objects
             introduce further levels into the hierarchy.  If the visibility
-            of shapes changes--due to
+            of shapes changes--due to 
             scrolling, switching the current draw page, or changing the view
             mode--the appropriate listeners are called and the user gets
             informed of this.</li>
         <li>Parent: The parent will usually be the window that contains the
             draw document view.  It has to be set via implementation dependend
             ways.</li>
-        <li>Relations: Relations are set and modified from the outside.</li>
+        <li>Relations: Relations are set and modified from the outside.</li> 
         <li>States: <const scope="com::sun::star::accessibility"
                 >AccessibleStateType::DEFUNC</const> is set if a document view
                 becomes obsolete like when the window, which displays the view,
diff --git a/offapi/com/sun/star/drawing/AccessibleGraphControl.idl b/offapi/com/sun/star/drawing/AccessibleGraphControl.idl
index eb7fcd829fed..1a81f84891f2 100644
--- a/offapi/com/sun/star/drawing/AccessibleGraphControl.idl
+++ b/offapi/com/sun/star/drawing/AccessibleGraphControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,15 +45,15 @@ module com {  module sun {  module star {  module drawing {
 /** The service describes the accessible graph controls that are used in the
     image map of the Draw and Impress applications and the contour dialog of
     the Writer application.
-
+    
     <p>The children of graph controls are shapes that define contrours.</p>
 
      @since OOo 1.1.2
  */
 published service AccessibleGraphControl
 {
-    /** Base interface for being accessible.  It gives access to the
-        <type scope="::com::sun::star::accessibility">XAccessibleContext</type>
+    /** Base interface for being accessible.  It gives access to the 
+        <type scope="::com::sun::star::accessibility">XAccessibleContext</type> 
         interface.
     */
     interface ::com::sun::star::accessibility::XAccessible;
@@ -62,7 +62,7 @@ published service AccessibleGraphControl
     */
     interface ::com::sun::star::accessibility::XAccessibleContext;
 
-    /** This interface describes the graphical representation of an image
+    /** This interface describes the graphical representation of an image 
           bullet.
      */
     interface ::com::sun::star::accessibility::XAccessibleComponent;
diff --git a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
index 884fbe181984..7c6ec058aec9 100644
--- a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,9 +53,9 @@ module com {  module sun {  module star {  module drawing {
 published service AccessibleGraphicShape
 {
     /** Give access to information of generic shapes.
-
+      
         <p>See <type>AccessibleShape</type> for documentation and support of
-        the interfaces
+        the interfaces 
         <type scope="::com::sun::star::accessibility">XAccessible</type>,
         <type scope="::com::sun::star::accessibility">XAccessibleContext</type>,
         and
@@ -68,25 +68,25 @@ published service AccessibleGraphicShape
     /**  Give access to image specific information.
 
         <p>The support of the <type
-        scope="::com::sun::star::accessibility"
+        scope="::com::sun::star::accessibility" 
         >XAccessibleImage</type> interface
         requires the shape to provide a description of the displayed image
         and the image's size in the screen coordinate system (pixel).  At
         the time being this interface does not provide information that is
         not available through the <type>AccessibleShape</type> service:
-        the size returned by the
-        <member scope="::com::sun::star::accessibility"
+        the size returned by the 
+        <member scope="::com::sun::star::accessibility" 
         >XAccessibleImage::getWidth</member> and <member
-        scope="::com::sun::star::accessibility"
+        scope="::com::sun::star::accessibility"  
         >XAccessibleImage::getHeight</member> functions is the same as that
         returned by the <member
-        scope="::com::sun::star::accessibility"
+        scope="::com::sun::star::accessibility"  
         >XAccessibleComponent::getSize</member> function; the description
         returned by <member
-        scope="::com::sun::star::accessibility"
+        scope="::com::sun::star::accessibility"  
         >XAccessibleImage::getAccessibleImageDescription</member> function
         is the same as the one returned by the <member
-        scope="::com::sun::star::accessibility"
+        scope="::com::sun::star::accessibility"  
         >XAccessibleContext::getAccessibleDescription</member> function.
         This makes the additional interface for
         the time being basically an indicator of graphic shapes.  This may
diff --git a/offapi/com/sun/star/drawing/AccessibleImageBullet.idl b/offapi/com/sun/star/drawing/AccessibleImageBullet.idl
index 1a6464f3ef18..b678b0eb55f0 100644
--- a/offapi/com/sun/star/drawing/AccessibleImageBullet.idl
+++ b/offapi/com/sun/star/drawing/AccessibleImageBullet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,13 +55,13 @@ service AccessibleImageBullet
     /** This interface gives access to an image bullet within a text
           paragraph fragment that is at least partially visible on the
           screen.
-
+        
         <ul>
-            <li>The parent returned by
+            <li>The parent returned by 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleParent</method>
                 is the accessible object of a text paragraph.
-            <li>There are no children returned by
+            <li>There are no children returned by 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleChild</method>.
             <li>The role is <const scope="::com::sun::star::accessibility"
@@ -69,12 +69,12 @@ service AccessibleImageBullet
             <li>The name is "image bullet" (or the equivalent term
                 in application's language).
             <li>The description contains the term "image bullet" (or the equivalent
-                term in application's language) and the number of the paragraph
-                within this bullet appears.
+                term in application's language) and the number of the paragraph 
+                within this bullet appears.  
             <li>There are no relations.
-            <li>The following states are supported by the
+            <li>The following states are supported by the 
                 <type scope="::com::sun::star::accessibility"
-                >XAccessibleStateSet</type> returned by
+                >XAccessibleStateSet</type> returned by 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleStateSet</method>.
                 <ul>
@@ -83,7 +83,7 @@ service AccessibleImageBullet
                         the document window has been closed or the image bullet
                         is not existing any longer).
                     <li><const scope="::com::sun::star::accessibility"
-                        >AccessibleStateType::ENABLED</const> (always
+                        >AccessibleStateType::ENABLED</const> (always 
                         contained)
                     <li><const scope="::com::sun::star::accessibility"
                         >AccessibleStateType::SHOWING</const>
@@ -97,7 +97,7 @@ service AccessibleImageBullet
      */
     interface ::com::sun::star::accessibility::XAccessibleContext;
 
-    /** This interface describes the graphical representation of an image
+    /** This interface describes the graphical representation of an image 
           bullet.
      */
     interface ::com::sun::star::accessibility::XAccessibleComponent;
diff --git a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
index 00c46f4e34eb..4dbff16a5642 100644
--- a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,10 +62,10 @@ module com {  module sun {  module star {  module drawing {
 published service AccessibleOLEShape
 {
     /** Give access to information of generic shapes.
-
+      
         <p>See <type>AccessibleShape</type> for basic documentation and
         support of the <type
-        scope="::com::sun::star::accessibility"
+        scope="::com::sun::star::accessibility" 
         >XAccessibleContext</type>, and
         <type scope="::com::sun::star::accessibility"
         >XAccessibleComponent</type> interfaces.
diff --git a/offapi/com/sun/star/drawing/AccessibleShape.idl b/offapi/com/sun/star/drawing/AccessibleShape.idl
index 5fa370bdb511..119b08317833 100644
--- a/offapi/com/sun/star/drawing/AccessibleShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -72,7 +72,7 @@ module com {  module sun {  module star {  module drawing {
 */
 published service AccessibleShape
 {
-    /** Base interface for being accessible.  It gives access to the
+    /** Base interface for being accessible.  It gives access to the 
         <type scope="::com::sun::star::accessibility">XAccessibleContext</type>
         interface.
     */
@@ -83,7 +83,7 @@ published service AccessibleShape
         <p>You can access the following information for the shape being made
         accessible:
         <ul>
-        <li>Role: The role of all shapes is <const
+        <li>Role: The role of all shapes is <const 
             scope="com::sun::star::accessibility"
             >AccessibleRole::SHAPE</const>.</li>
         <li>Name: The name of a shape is its localized type name.</li>
@@ -103,7 +103,7 @@ published service AccessibleShape
         <li>Relations: Are set and maintained from the outside.  See the
         service description of the object that has accessible shapes as
         children for details.</li>
-        <li>States: The states supported by this service are:
+        <li>States: The states supported by this service are: 
             <ul>
             <li><p><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::DEFUNC</const> is set if an accessible
@@ -115,15 +115,15 @@ published service AccessibleShape
                 the AT-Tool does not care for the events indicating
                 this.</p>
                 <p>Usually an object that has the <const
-                scope="com::sun::star::accessibility"
+                scope="com::sun::star::accessibility" 
                 >AccessibleStateType::DEFUNC</const> state set has already
                 been disposed and subsequent calls to this object result in
-                <type scope="::com::sun::star::lang">DisposedException</type>
+                <type scope="::com::sun::star::lang">DisposedException</type> 
                 exceptions.</p>
                 <p>If this state is set then no other of the states below is
                 set.  This  is also true for the states that are otherwise
                 allways set (which  makes 'allways' more of a sort of
-                'normally').</p></li>
+                'normally').</p></li> 
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::EDITABLE</const></li> is always set.
                 This state is interpreted to mean that not only text but
@@ -136,11 +136,11 @@ published service AccessibleShape
                 >AccessibleStateType::FOCUSED</const> is set according to
                 whether the shape currently has the focus.</li>
             <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::MULTI_LINE</const> is set if a shape
+                >AccessibleStateType::MULTI_LINE</const> is set if a shape 
                 supports the <type scope="::com::sun::star::accessibility"
                 >XAccessibleText</type> interface.</li>
             <li><const scope="com::sun::star::accessibility"
-                >AccessibleStateType::OPAQUE</const> is set for certain shapes
+                >AccessibleStateType::OPAQUE</const> is set for certain shapes 
                 with certain attributes like for a filled rectangle.</li>
             <li><const scope="com::sun::star::accessibility"
                 >AccessibleStateType::RESIZABLE</const> is always set.</li>
@@ -155,7 +155,7 @@ published service AccessibleShape
                 >AccessibleStateType::VISIBLE</const> is always set.</li>
             </ul>
         <li>Locale: The shape returns the locale of its parent.</li>
-        <li>Property change listeners: Property change listeners that are
+        <li>Property change listeners: Property change listeners that are 
             registered with a shape are informed of the usual events.</li>
         </ul>
     */
@@ -164,14 +164,14 @@ published service AccessibleShape
     /** Give access to the graphical representation of a shape.
 
         <p>The bounding box returned by the <method
-        scope="::com::sun::star::accessibility"
+        scope="::com::sun::star::accessibility" 
         >XAccessibleComponent::getBounds</method> function returns the
         shape's bounding box clipped at its parent's bounding box</p>
 
         <p>An accessible shape tries as best as it can to return proper
         values for calls to the
         <method scope="::com::sun::star::accessibility"
-        >XAccessibleExtendedComponent::getForeground</method> and
+        >XAccessibleExtendedComponent::getForeground</method> and 
         <method scope="::com::sun::star::accessibility"
         >XAccessibleExtendedComponent::getBackground</method> functions.
         If the shape is painted with a uniform and non-transparent color
@@ -183,9 +183,9 @@ published service AccessibleShape
     interface ::com::sun::star::accessibility::XAccessibleComponent;
 
     /** Give extended access to the graphical representation of a shape.
-
+        
         <p>The functions <method
-        scope="::com::sun::star::accessibility"
+        scope="::com::sun::star::accessibility" 
         >XAccessibleExtendedComponent::getFont</method>,
         <method scope="::com::sun::star::accessibility"
         >XAccessibleExtendedComponent::getTitledBorderText</method>, and
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideView.idl b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
index 661ace660bc4..ac5738aab197 100644
--- a/offapi/com/sun/star/drawing/AccessibleSlideView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl b/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
index b03d1583f0f2..b4cc9c544583 100644
--- a/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
+++ b/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/Alignment.idl b/offapi/com/sun/star/drawing/Alignment.idl
index 131f62d5c887..83404bf5d251 100644
--- a/offapi/com/sun/star/drawing/Alignment.idl
+++ b/offapi/com/sun/star/drawing/Alignment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,81 +24,81 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_Alignment_idl__
-#define __com_sun_star_drawing_Alignment_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_Alignment_idl__ 
+#define __com_sun_star_drawing_Alignment_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::Alignment
 /** The <type>Alignment</type> enumeration is a general way to specify the
     alignment of an object or sub-object relative to another object.
  */
 published enum Alignment
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR Alignment::    TOP_LEFT,
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR Alignment::	TOP_LEFT, 
+    
     // DocMerge: empty anyway
-    TOP_LEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR Alignment::    TOP,
-
+    TOP_LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR Alignment::	TOP, 
+    
     // DocMerge: empty anyway
-    TOP,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR Alignment::    TOP_RIGHT,
-
+    TOP, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR Alignment::	TOP_RIGHT, 
+    
     // DocMerge: empty anyway
-    TOP_RIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR Alignment::    LEFT,
-
+    TOP_RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR Alignment::	LEFT, 
+    
     // DocMerge: empty anyway
-    LEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR Alignment::    CENTER,
-
+    LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR Alignment::	CENTER, 
+    
     // DocMerge: empty anyway
-    CENTER,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR Alignment::    RIGHT,
-
+    CENTER, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR Alignment::	RIGHT, 
+    
     // DocMerge: empty anyway
-    RIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR Alignment::    BOTTOM_LEFT,
-
+    RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR Alignment::	BOTTOM_LEFT, 
+    
     // DocMerge: empty anyway
-    BOTTOM_LEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR Alignment::    BOTTOM,
-
+    BOTTOM_LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR Alignment::	BOTTOM, 
+    
     // DocMerge: empty anyway
-    BOTTOM,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR Alignment::    BOTTOM_RIGHT
-
+    BOTTOM, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR Alignment::	BOTTOM_RIGHT 
+    
     // DocMerge: empty anyway
-    BOTTOM_RIGHT
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    BOTTOM_RIGHT 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/AppletShape.idl b/offapi/com/sun/star/drawing/AppletShape.idl
index 95e06b668b8e..4164150ce423 100644
--- a/offapi/com/sun/star/drawing/AppletShape.idl
+++ b/offapi/com/sun/star/drawing/AppletShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module drawing {
+module com { module sun { module star { module drawing { 
 
 //=============================================================================
 /** This <type>Shape</type> encapsulates an applet.
@@ -47,28 +47,28 @@ module com { module sun { module star { module drawing {
 */
 published service AppletShape
 {
-    /** basic service for position, size and z-order.
-
+    /** basic service for position, size and z-order. 
+        
         <p>A <type>AppletShape</type> cannot be rotated.
      */
     service com::sun::star::drawing::Shape;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** This property specifies the base URI for the applet.
-
+        
         <p>If this property is empty, then it defaults the same base URI as for
         the current document.
     */
     [property] string AppletCodeBase;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** this is an optional name for the applet.
     */
     [property] string AppletName;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** This property specifies one of the following:
         <br>The name of the class file that contains the compiled applet subclass.
@@ -76,14 +76,14 @@ published service AppletShape
     */
     [property] string AppletCode;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** This sequence contains paramaters that are passed to the applet
         when it is initialized.
     */
     [property] sequence< com::sun::star::beans::PropertyValue > AppletCommands;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** This property specifies whether or not the applet can be scripted.
     */
@@ -92,7 +92,7 @@ published service AppletShape
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/drawing/Arrangement.idl b/offapi/com/sun/star/drawing/Arrangement.idl
index 917f1403047f..0d4c930177fe 100644
--- a/offapi/com/sun/star/drawing/Arrangement.idl
+++ b/offapi/com/sun/star/drawing/Arrangement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_Arrangement_idl__
-#define __com_sun_star_drawing_Arrangement_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_Arrangement_idl__ 
+#define __com_sun_star_drawing_Arrangement_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::Arrangement
 /** With this enumeration you can arrange the relative position of an object
     within the other objects.
@@ -41,40 +41,40 @@
     @deprecated
  */
 published enum Arrangement
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::Arrangement::FRONT
     /** Move this object in front of all other objects.
      */
-    FRONT,
-
-    //-------------------------------------------------------------------------
-
+    FRONT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::Arrangement::MORE_FRONT
     /** Move this object one object more to the front.
      */
-    MORE_FRONT,
-
-    //-------------------------------------------------------------------------
-
+    MORE_FRONT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::Arrangement::MORE_BACK
     /** Move this object one object more to the back.
      */
-    MORE_BACK,
-
-    //-------------------------------------------------------------------------
-
+    MORE_BACK, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::Arrangement::BACK
     /** Move this object behind all other objects.
      */
-    BACK
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    BACK 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/Background.idl b/offapi/com/sun/star/drawing/Background.idl
index 7625ef293370..22ad933e2ec7 100644
--- a/offapi/com/sun/star/drawing/Background.idl
+++ b/offapi/com/sun/star/drawing/Background.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module drawing {
+module com { module sun { module star { module drawing { 
 
 //=============================================================================
 
@@ -48,7 +48,7 @@ published service Background
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/drawing/BezierPoint.idl b/offapi/com/sun/star/drawing/BezierPoint.idl
index 6adf8c5f0b42..c2283c441cff 100644
--- a/offapi/com/sun/star/drawing/BezierPoint.idl
+++ b/offapi/com/sun/star/drawing/BezierPoint.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_BezierPoint_idl__
-#define __com_sun_star_drawing_BezierPoint_idl__
-
-#ifndef __com_sun_star_awt_Point_idl__
-#include <com/sun/star/awt/Point.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_BezierPoint_idl__ 
+#define __com_sun_star_drawing_BezierPoint_idl__ 
+ 
+#ifndef __com_sun_star_awt_Point_idl__ 
+#include <com/sun/star/awt/Point.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::drawing::BezierPoint
 /** This is a point on a bezier curve.
-
+    
     <p>The two control points specify how the bezier curve
     goes through the given position.</p>
 
@@ -51,27 +51,27 @@ published struct BezierPoint
     // DocMerge from xml: field com::sun::star::drawing::BezierPoint::Position
     /** This is the position of this point.
      */
-    com::sun::star::awt::Point Position;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Point Position; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::drawing::BezierPoint::ControlPoint1
     /** This is the position of the first control point.
      */
-    com::sun::star::awt::Point ControlPoint1;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Point ControlPoint1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::drawing::BezierPoint::ControlPoint2
     /** This is the position of the second control point.
      */
-    com::sun::star::awt::Point ControlPoint2;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::awt::Point ControlPoint2; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/BitmapMode.idl b/offapi/com/sun/star/drawing/BitmapMode.idl
index d2414418927c..aec79229348e 100644
--- a/offapi/com/sun/star/drawing/BitmapMode.idl
+++ b/offapi/com/sun/star/drawing/BitmapMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_BitmapMode_idl__
-#define __com_sun_star_drawing_BitmapMode_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_BitmapMode_idl__ 
+#define __com_sun_star_drawing_BitmapMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** The <type>BitmapMode</type> selects an algorithm for filling an area with
     a bitmap.
  */
 published enum BitmapMode
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** the bitmap is repeated over the fill area.
      */
-    REPEAT,
-
-    //-------------------------------------------------------------------------
-
+    REPEAT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** the bitmap is stretched to fill the area.
      */
-    STRETCH,
-
-    //-------------------------------------------------------------------------
-
+    STRETCH, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** the bitmap is painted in its original or selected size.
      */
-    NO_REPEAT
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    NO_REPEAT 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/BitmapTable.idl b/offapi/com/sun/star/drawing/BitmapTable.idl
index 1ef488e87438..155e62157795 100644
--- a/offapi/com/sun/star/drawing/BitmapTable.idl
+++ b/offapi/com/sun/star/drawing/BitmapTable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_BitmapTable_idl__
-#define __com_sun_star_drawing_BitmapTable_idl__
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
+#ifndef __com_sun_star_drawing_BitmapTable_idl__ 
+#define __com_sun_star_drawing_BitmapTable_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#include <com/sun/star/container/XNameContainer.idl> 
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
 
 /** this is a container for URLs to bitmaps.
 
     <p>It is used for example to access the bitmaps that
-    are used inside a document for filling.
+    are used inside a document for filling. 
 
     @see DrawingDocumentFactory
     @see FillStyle::FillBitmapURL
@@ -56,9 +56,9 @@ published service BitmapTable
     interface com::sun::star::container::XNameContainer;
 };
 
-//=============================================================================
-
-}; }; }; };
-
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/BoundVolume.idl b/offapi/com/sun/star/drawing/BoundVolume.idl
index 706eaccecd96..20e787b9044d 100644
--- a/offapi/com/sun/star/drawing/BoundVolume.idl
+++ b/offapi/com/sun/star/drawing/BoundVolume.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_BoundVolume_idl__
-#define __com_sun_star_drawing_BoundVolume_idl__
-
-#ifndef __com_sun_star_drawing_Position3D_idl__
+#ifndef __com_sun_star_drawing_BoundVolume_idl__ 
+#define __com_sun_star_drawing_BoundVolume_idl__ 
+ 
+#ifndef __com_sun_star_drawing_Position3D_idl__ 
 #include <com/sun/star/drawing/Position3D.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** specifies a three-dimensional boundary volume with two positions.
  */
 published struct BoundVolume
 {
     /** this is the minimum position inside the boundary volume.
      */
-    Position3D min;
-
-    //-------------------------------------------------------------------------
+    Position3D min; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** this is the maximum position inside the boundary volume.
      */
-    Position3D max;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    Position3D max; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/CameraGeometry.idl b/offapi/com/sun/star/drawing/CameraGeometry.idl
index 3d235e8a336f..3bdd6e8a857e 100644
--- a/offapi/com/sun/star/drawing/CameraGeometry.idl
+++ b/offapi/com/sun/star/drawing/CameraGeometry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,40 +25,40 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_drawing_CameraGeometry_idl__
-#define __com_sun_star_drawing_CameraGeometry_idl__
+#ifndef __com_sun_star_drawing_CameraGeometry_idl__ 
+#define __com_sun_star_drawing_CameraGeometry_idl__ 
 
-#ifndef __com_sun_star_drawing_Direction3D_idl__
+#ifndef __com_sun_star_drawing_Direction3D_idl__ 
 #include <com/sun/star/drawing/Direction3D.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_drawing_Position3D_idl__
 #include <com/sun/star/drawing/Position3D.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** specifies a three-dimensional camera.
  */
 published struct CameraGeometry
 {
     /** is the camera position */
-    Position3D  vrp;
+    Position3D	vrp;
 
     /** is the camera view direction */
-    Direction3D vpn;
+    Direction3D	vpn;
 
     /** is the camera up direction */
-    Direction3D vup;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    Direction3D	vup;
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/CaptionEscapeDirection.idl b/offapi/com/sun/star/drawing/CaptionEscapeDirection.idl
index 4fccffff24e6..1528b6be08f3 100644
--- a/offapi/com/sun/star/drawing/CaptionEscapeDirection.idl
+++ b/offapi/com/sun/star/drawing/CaptionEscapeDirection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/CaptionShape.idl b/offapi/com/sun/star/drawing/CaptionShape.idl
index d06d8e5ee260..c944383511b3 100644
--- a/offapi/com/sun/star/drawing/CaptionShape.idl
+++ b/offapi/com/sun/star/drawing/CaptionShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,67 +24,67 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_CaptionShape_idl__
-#define __com_sun_star_drawing_CaptionShape_idl__
-
-#ifndef __com_sun_star_drawing_Shape_idl__
-#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Text_idl__
-#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
-#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
-#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
-#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
-#include <com/sun/star/awt/Point.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_CaptionShape_idl__ 
+#define __com_sun_star_drawing_CaptionShape_idl__ 
+ 
+#ifndef __com_sun_star_drawing_Shape_idl__ 
+#include <com/sun/star/drawing/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_Text_idl__ 
+#include <com/sun/star/drawing/Text.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_FillProperties_idl__ 
+#include <com/sun/star/drawing/FillProperties.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_LineProperties_idl__ 
+#include <com/sun/star/drawing/LineProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
+#include <com/sun/star/drawing/ShadowProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
+#include <com/sun/star/drawing/RotationDescriptor.idl> 
+#endif 
+
+#ifndef __com_sun_star_awt_Point_idl__ 
+#include <com/sun/star/awt/Point.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** The <type>CaptionShape</type> represents a rectangular drawing shape
     with an additional set of lines. It can be used as a description for
     a fixed point inside a drawing.
  */
 published service CaptionShape
-{
+{ 
     /** the position and size is only used for the
         caption area
     */
-    service com::sun::star::drawing::Shape;
+    service com::sun::star::drawing::Shape; 
 
     service com::sun::star::drawing::FillProperties;
 
     service com::sun::star::drawing::LineProperties;
 
-    service com::sun::star::drawing::ShadowProperties;
-
-    service com::sun::star::drawing::Text;
-
-    service com::sun::star::drawing::RotationDescriptor;
+    service com::sun::star::drawing::ShadowProperties; 
+    
+    service com::sun::star::drawing::Text; 
+    
+    service com::sun::star::drawing::RotationDescriptor;  
 
     /** This is the radius of the caption area corners.
      */
-    [property] long CornerRadius;
+    [property] long CornerRadius; 
 
     /** The caption point property specify the position of
         the point that is captioned. A set of lines are
@@ -148,11 +148,11 @@ published service CaptionShape
         the best possible length for the caption line.
     */
     [property] boolean CaptionIsFitLineLength;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/CaptionType.idl b/offapi/com/sun/star/drawing/CaptionType.idl
index df6506130f34..a9b2cfbe9267 100644
--- a/offapi/com/sun/star/drawing/CaptionType.idl
+++ b/offapi/com/sun/star/drawing/CaptionType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ published constants CaptionType
     const short straight = 0;
 
     //-------------------------------------------------------------------------
-    /** the caption line is the shortest line from the caption area edge to
+    /** the caption line is the shortest line from the caption area edge to 
         the caption point.
     */
     const short angled = 1;
diff --git a/offapi/com/sun/star/drawing/CircleKind.idl b/offapi/com/sun/star/drawing/CircleKind.idl
index 5c037c5fe155..4936e45f3bd1 100644
--- a/offapi/com/sun/star/drawing/CircleKind.idl
+++ b/offapi/com/sun/star/drawing/CircleKind.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_CircleKind_idl__
-#define __com_sun_star_drawing_CircleKind_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_CircleKind_idl__ 
+#define __com_sun_star_drawing_CircleKind_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::CircleKind
 /** This enumeration defines a circle.
  */
 published enum CircleKind
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::CircleKind::FULL
     /** a full circle
      */
-    FULL,
-
-    //-------------------------------------------------------------------------
-
+    FULL, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::CircleKind::SECTION
     /** a circle with a cut connected by a line
      */
-    SECTION,
-
-    //-------------------------------------------------------------------------
-
+    SECTION, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::CircleKind::CUT
     /** a circle with a cut connected by two lines
      */
-    CUT,
-
-    //-------------------------------------------------------------------------
-
+    CUT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::CircleKind::ARC
     /** a circle with an open cut
      */
-    ARC
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    ARC 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/ClosedBezierShape.idl b/offapi/com/sun/star/drawing/ClosedBezierShape.idl
index 7442c553439f..f747e4ddae21 100644
--- a/offapi/com/sun/star/drawing/ClosedBezierShape.idl
+++ b/offapi/com/sun/star/drawing/ClosedBezierShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,66 +24,66 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_ClosedBezierShape_idl__
-#define __com_sun_star_drawing_ClosedBezierShape_idl__
-
-#ifndef __com_sun_star_drawing_LineShape_idl__
-#include <com/sun/star/drawing/LineShape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
-#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
-#include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Text_idl__
-#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
-#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
-#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_ClosedBezierShape_idl__ 
+#define __com_sun_star_drawing_ClosedBezierShape_idl__ 
+
+#ifndef __com_sun_star_drawing_LineShape_idl__ 
+#include <com/sun/star/drawing/LineShape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_LineProperties_idl__ 
+#include <com/sun/star/drawing/LineProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_FillProperties_idl__ 
+#include <com/sun/star/drawing/FillProperties.idl> 
+#endif 
+  
+#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__ 
+#include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_Text_idl__ 
+#include <com/sun/star/drawing/Text.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
+#include <com/sun/star/drawing/ShadowProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
+#include <com/sun/star/drawing/RotationDescriptor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This service is for a closed bezier shape.
  */
 published service ClosedBezierShape
-{
+{ 
     service com::sun::star::drawing::Shape;
 
     service com::sun::star::drawing::LineProperties;
-
+    
     service com::sun::star::drawing::FillProperties;
 
     service com::sun::star::drawing::PolyPolygonBezierDescriptor;
-
+    
     service com::sun::star::drawing::Text;
-
+    
     service com::sun::star::drawing::ShadowProperties;
-
+    
     service com::sun::star::drawing::RotationDescriptor;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/ColorMode.idl b/offapi/com/sun/star/drawing/ColorMode.idl
index 9eeb0ba08d6c..81b5ea20b8db 100644
--- a/offapi/com/sun/star/drawing/ColorMode.idl
+++ b/offapi/com/sun/star/drawing/ColorMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,56 +24,56 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_ColorMode_idl__
-#define __com_sun_star_drawing_ColorMode_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_ColorMode_idl__ 
+#define __com_sun_star_drawing_ColorMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::ColorMode
 /** The <type>ColorMode</type> defines the output style of colors
     for a graphic.
  */
 published enum ColorMode
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::ColorMode::STANDARD
     /** the graphic is rendered in the default color style of the output
         device,
      */
-    STANDARD,
-
-    //-------------------------------------------------------------------------
-
+    STANDARD, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::ColorMode::GREYS
     /** the graphic is rendered in greyscales on the output device,
      */
-    GREYS,
-
-    //-------------------------------------------------------------------------
-
+    GREYS, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::ColorMode::MONO
     /** the graphic is rendered in black and white only,
      */
-    MONO,
-
-    //-------------------------------------------------------------------------
-
+    MONO, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::ColorMode::WATERMARK
     /** the graphic is rendered in a watermark like style,
      */
-    WATERMARK
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    WATERMARK 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/ConnectionType.idl b/offapi/com/sun/star/drawing/ConnectionType.idl
index eaca9eacae7a..78dc9d138769 100644
--- a/offapi/com/sun/star/drawing/ConnectionType.idl
+++ b/offapi/com/sun/star/drawing/ConnectionType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,69 +24,69 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_ConnectionType_idl__
-#define __com_sun_star_drawing_ConnectionType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_ConnectionType_idl__ 
+#define __com_sun_star_drawing_ConnectionType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::ConnectionType
 /** the direction where the
     connection line leaves the connection point.
  */
 published enum ConnectionType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::ConnectionType::AUTO
     /** the connection point is chosen automatically,
      */
-    AUTO,
-
-    //-------------------------------------------------------------------------
-
+    AUTO, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::ConnectionType::LEFT
     /** the connection line leaves the connected object to the left,
      */
-    LEFT,
-
-    //-------------------------------------------------------------------------
-
+    LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::ConnectionType::TOP
     /** the connection line leaves the connected object from the top,
      */
-    TOP,
-
-    //-------------------------------------------------------------------------
-
+    TOP, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::ConnectionType::RIGHT
     /** the connection line leaves the connected object to the right,
      */
-    RIGHT,
-
-    //-------------------------------------------------------------------------
-
+    RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::ConnectionType::BOTTOM
     /** the connection line leaves the connected object from the bottom,
      */
-    BOTTOM,
-
-    //-------------------------------------------------------------------------
-
+    BOTTOM, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::ConnectionType::SPECIAL
     /** not implemented, yet.
      */
-    SPECIAL
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    SPECIAL 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/ConnectorProperties.idl b/offapi/com/sun/star/drawing/ConnectorProperties.idl
index db86fca96f7a..51300ea85ef9 100644
--- a/offapi/com/sun/star/drawing/ConnectorProperties.idl
+++ b/offapi/com/sun/star/drawing/ConnectorProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,59 +24,59 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_ConnectorProperties_idl__
-#define __com_sun_star_drawing_ConnectorProperties_idl__
-
-#ifndef __com_sun_star_drawing_ConnectorType_idl__
-#include <com/sun/star/drawing/ConnectorType.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_ConnectorProperties_idl__ 
+#define __com_sun_star_drawing_ConnectorProperties_idl__ 
+ 
+#ifndef __com_sun_star_drawing_ConnectorType_idl__ 
+#include <com/sun/star/drawing/ConnectorType.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This is a set of properties to describe the style for rendering connector.
  */
 published service ConnectorProperties
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** This property contains the kind of the connector.
      */
-    [property] com::sun::star::drawing::ConnectorType EdgeKind;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::drawing::ConnectorType EdgeKind; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This property contains the horizontal distance of node 1.
      */
-    [property] long EdgeNode1HorzDist;
-
-    //-------------------------------------------------------------------------
-
+    [property] long EdgeNode1HorzDist; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This property contains the vertical distance of node 1.
      */
-    [property] long EdgeNode1VertDist;
-
-    //-------------------------------------------------------------------------
-
+    [property] long EdgeNode1VertDist; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This property contains the horizontal distance of node 2.
      */
-    [property] long EdgeNode2HorzDist;
-
-    //-------------------------------------------------------------------------
-
+    [property] long EdgeNode2HorzDist; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This property contains the vertical distance of node 2.
      */
-    [property] long EdgeNode2VertDist;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] long EdgeNode2VertDist; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/ConnectorShape.idl b/offapi/com/sun/star/drawing/ConnectorShape.idl
index d76bea93345f..0ae94af1139d 100644
--- a/offapi/com/sun/star/drawing/ConnectorShape.idl
+++ b/offapi/com/sun/star/drawing/ConnectorShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,62 +24,62 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_ConnectorShape_idl__
-#define __com_sun_star_drawing_ConnectorShape_idl__
-
-#ifndef __com_sun_star_drawing_XConnectorShape_idl__
-#include <com/sun/star/drawing/XConnectorShape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ConnectorProperties_idl__
-#include <com/sun/star/drawing/ConnectorProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Shape_idl__
-#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Text_idl__
-#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
-#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
-#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_ConnectorShape_idl__ 
+#define __com_sun_star_drawing_ConnectorShape_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XConnectorShape_idl__ 
+#include <com/sun/star/drawing/XConnectorShape.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_ConnectorProperties_idl__ 
+#include <com/sun/star/drawing/ConnectorProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_Shape_idl__ 
+#include <com/sun/star/drawing/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_LineProperties_idl__ 
+#include <com/sun/star/drawing/LineProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_Text_idl__ 
+#include <com/sun/star/drawing/Text.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
+#include <com/sun/star/drawing/ShadowProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
+#include <com/sun/star/drawing/RotationDescriptor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This service is for a <type>ConnectorShape</type>, a specialized <type>Shape</type>,
     which can be connected to other <type>Shape</type>s or <type>GluePoint</type>s.
  */
 published service ConnectorShape
-{
-    service com::sun::star::drawing::Shape;
-
-    service com::sun::star::drawing::LineProperties;
+{ 
+    service com::sun::star::drawing::Shape; 
 
-    service com::sun::star::drawing::ConnectorProperties;
+    service com::sun::star::drawing::LineProperties; 
 
-    service com::sun::star::drawing::ShadowProperties;
+    service com::sun::star::drawing::ConnectorProperties; 
+    
+    service com::sun::star::drawing::ShadowProperties; 
 
-    service com::sun::star::drawing::Text;
+    service com::sun::star::drawing::Text; 
+    
+    service com::sun::star::drawing::RotationDescriptor; 
 
-    service com::sun::star::drawing::RotationDescriptor;
-
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** this property either holds the shape that the start point of this
         connector is connected to, or is empty when the start point of the
@@ -87,66 +87,66 @@ published service ConnectorShape
     */
     [property] com::sun::star::drawing::XShape StartShape;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** this property holds the index of the glue point the start point of
         this connector is glued on.
     */
     [property] long StartGluePointIndex;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** this is the position of the connectors start point in 100th/mm. For
         unconnected start points you can get and set the position. For
         connected start points you can only get the position.
     */
     [property] com::sun::star::awt::Point StartPosition;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** this property either holds the shape that the end point of this
         connector is connected to, or is empty when the end point of the
         connector is not connected to a shape.
     */
     [property] com::sun::star::drawing::XShape EndShape;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** this property holds the index of the glue point the end point of
         this connector is glued on.
     */
     [property] com::sun::star::awt::Point EndPosition;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** this is the position of the connectors end point in 100th/mm. For
         unconnected end points you can get and set the position. For
         connected end points you can only get the position.
     */
     [property] long EndGluePointIndex;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** This property contains the distance of line 1.
      */
-    [property] long EdgeLine1Delta;
-
-    //-------------------------------------------------------------------------
-
+    [property] long EdgeLine1Delta; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This property contains the distance of line 2.
      */
-    [property] long EdgeLine2Delta;
-
-    //-------------------------------------------------------------------------
-
+    [property] long EdgeLine2Delta; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This property contains the distance of line 3.
      */
-    [property] long EdgeLine3Delta;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] long EdgeLine3Delta; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/ConnectorType.idl b/offapi/com/sun/star/drawing/ConnectorType.idl
index d289e2ba492c..d64ba1ab126a 100644
--- a/offapi/com/sun/star/drawing/ConnectorType.idl
+++ b/offapi/com/sun/star/drawing/ConnectorType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,55 +24,55 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_ConnectorType_idl__
-#define __com_sun_star_drawing_ConnectorType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_ConnectorType_idl__ 
+#define __com_sun_star_drawing_ConnectorType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::ConnectorType
 /** The <type>ConnectorType</type> specifies the appearance of a connector.
  */
 published enum ConnectorType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::ConnectorType::STANDARD
     /** the connector is drawn with three lines, with the middle line
         perpendicular to the other two
      */
-    STANDARD,
-
-    //-------------------------------------------------------------------------
-
+    STANDARD, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::ConnectorType::CURVE
     /** the ConnectorShape is drawn as a curve
      */
-    CURVE,
-
-    //-------------------------------------------------------------------------
-
+    CURVE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::ConnectorType::LINE
     /** the ConnectorShape is drawn as a straight line
      */
-    LINE,
-
-    //-------------------------------------------------------------------------
-
+    LINE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::ConnectorType::LINES
     /** the connector is drawn with three lines
      */
-    LINES
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    LINES 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/ControlShape.idl b/offapi/com/sun/star/drawing/ControlShape.idl
index 43055b54d26d..ca0767750567 100644
--- a/offapi/com/sun/star/drawing/ControlShape.idl
+++ b/offapi/com/sun/star/drawing/ControlShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_ControlShape_idl__
-#define __com_sun_star_drawing_ControlShape_idl__
-
-#ifndef __com_sun_star_drawing_Shape_idl__
-#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XControlShape_idl__
-#include <com/sun/star/drawing/XControlShape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_ControlShape_idl__ 
+#define __com_sun_star_drawing_ControlShape_idl__ 
+ 
+#ifndef __com_sun_star_drawing_Shape_idl__ 
+#include <com/sun/star/drawing/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XControlShape_idl__ 
+#include <com/sun/star/drawing/XControlShape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This service is for a <type>Shape</type> which contains a control.
     <p>
-    @see Shape
+    @see Shape 
     @see XControlShape
  */
 published service ControlShape
-{
-    service com::sun::star::drawing::Shape;
-    interface com::sun::star::drawing::XControlShape;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::drawing::Shape; 
+    interface com::sun::star::drawing::XControlShape; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/CoordinateSequence.idl b/offapi/com/sun/star/drawing/CoordinateSequence.idl
index f01c422745c8..6bde17a7fadb 100644
--- a/offapi/com/sun/star/drawing/CoordinateSequence.idl
+++ b/offapi/com/sun/star/drawing/CoordinateSequence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module drawing {
+module com { module sun { module star { module drawing { 
 
 //=============================================================================
 /**
@@ -39,7 +39,7 @@ published typedef sequence<long> CoordinateSequence;
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl b/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl
index e0bed624f8fe..a4bf78c80315 100644
--- a/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module drawing {
+module com { module sun { module star { module drawing { 
 
 //=============================================================================
 /**
@@ -42,7 +42,7 @@ published typedef sequence<CoordinateSequence> CoordinateSequenceSequence;
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/drawing/CustomShape.idl b/offapi/com/sun/star/drawing/CustomShape.idl
index 4ec4dbf7bf92..4ed2579ce0d0 100644
--- a/offapi/com/sun/star/drawing/CustomShape.idl
+++ b/offapi/com/sun/star/drawing/CustomShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,58 +24,58 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_CustomShape_idl__
-#define __com_sun_star_drawing_CustomShape_idl__
-
-#ifndef __com_sun_star_drawing_Shape_idl__
-#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
-#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
-#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Text_idl__
-#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
-#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
+#ifndef __com_sun_star_drawing_CustomShape_idl__ 
+#define __com_sun_star_drawing_CustomShape_idl__ 
+ 
+#ifndef __com_sun_star_drawing_Shape_idl__ 
+#include <com/sun/star/drawing/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_FillProperties_idl__ 
+#include <com/sun/star/drawing/FillProperties.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_LineProperties_idl__ 
+#include <com/sun/star/drawing/LineProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
+#include <com/sun/star/drawing/ShadowProperties.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_Text_idl__ 
+#include <com/sun/star/drawing/Text.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
+#include <com/sun/star/drawing/RotationDescriptor.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
 #endif
 
-//=============================================================================
-
-module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This service is for a CustomShape
  */
 service CustomShape
-{
-    service com::sun::star::drawing::Shape;
-
-    service com::sun::star::drawing::FillProperties;
+{ 
+    service com::sun::star::drawing::Shape; 
 
-    service com::sun::star::drawing::LineProperties;
+    service com::sun::star::drawing::FillProperties; 
 
-    service com::sun::star::drawing::ShadowProperties;
+    service com::sun::star::drawing::LineProperties; 
 
-    service com::sun::star::drawing::Text;
+    service com::sun::star::drawing::ShadowProperties; 
 
-    service com::sun::star::drawing::RotationDescriptor;
+    service com::sun::star::drawing::Text; 
+    
+    service com::sun::star::drawing::RotationDescriptor; 
 
     //-------------------------------------------------------------------------
     /** This property contains the CustomShapeEngine service name that has to
@@ -92,7 +92,7 @@ service CustomShape
     //-------------------------------------------------------------------------
     /** This property describes the geometry of the CustomShape. The CustomShapeEngine
         that is used should be able to get on with the content of this property.
-
+        
         If the CustomShapeEngine property is "com.sun.star.drawing.EnhancedCustomShapeEngine",
         then this property is containing properties as they are specified in the service
         com.sun.star.drawing.EnhancedCustomShapeGeometry
@@ -100,17 +100,17 @@ service CustomShape
     [optional, property] sequence<::com::sun::star::beans::PropertyValue> CustomShapeGeometry;
 
     //-------------------------------------------------------------------------
-    /** This property describes the URL to a replacement graphic that could
+    /**	This property describes the URL to a replacement graphic that could
         be displayed if the CustomShape engine is not available.
     */
     [optional, property] string CustomShapeReplacementURL;
 
     //-------------------------------------------------------------------------
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/CustomShapeEngine.idl b/offapi/com/sun/star/drawing/CustomShapeEngine.idl
index 6df041ce1948..a72d2a4c9a0b 100644
--- a/offapi/com/sun/star/drawing/CustomShapeEngine.idl
+++ b/offapi/com/sun/star/drawing/CustomShapeEngine.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_CustomShapeEngine_idl__
-#define __com_sun_star_drawing_CustomShapeEngine_idl__
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
-#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
+#ifndef __com_sun_star_drawing_CustomShapeEngine_idl__ 
+#define __com_sun_star_drawing_CustomShapeEngine_idl__ 
+ 
+#ifndef __com_sun_star_lang_XInitialization_idl__ 
+#include <com/sun/star/lang/XInitialization.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_drawing_XCustomShapeEngine_idl__
 #include <com/sun/star/drawing/XCustomShapeEngine.idl>
 #endif
 
-//=============================================================================
-
-module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This service is for a CustomShape
  */
 service CustomShapeEngine
-{
+{ 
     /** initializing the CustomShapeEngine
 
      */
     interface ::com::sun::star::lang::XInitialization;
 
-    /**
+    /** 
 
      */
     interface com::sun::star::drawing::XCustomShapeEngine;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/DashStyle.idl b/offapi/com/sun/star/drawing/DashStyle.idl
index 2a4aded0e20e..8ba683cf6801 100644
--- a/offapi/com/sun/star/drawing/DashStyle.idl
+++ b/offapi/com/sun/star/drawing/DashStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,56 +24,56 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_DashStyle_idl__
-#define __com_sun_star_drawing_DashStyle_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_DashStyle_idl__ 
+#define __com_sun_star_drawing_DashStyle_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::DashStyle
 /** This enumeration defines the style of a dash on a line.
  */
 published enum DashStyle
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::DashStyle::RECT
     /** the dash is a rectangle
      */
-    RECT,
-
-    //-------------------------------------------------------------------------
-
+    RECT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::DashStyle::ROUND
     /** the dash is a point
      */
-    ROUND,
-
-    //-------------------------------------------------------------------------
-
+    ROUND, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::DashStyle::RECTRELATIVE
     /** the dash is a rectangle, with the size of the dash given in
         relation to the length of the line
      */
-    RECTRELATIVE,
-
-    //-------------------------------------------------------------------------
-
+    RECTRELATIVE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::DashStyle::ROUNDRELATIVE
     /** the dash is a point, with the size of the dash given in relation
         to the length of the line
      */
-    ROUNDRELATIVE
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    ROUNDRELATIVE 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/DashTable.idl b/offapi/com/sun/star/drawing/DashTable.idl
index 84c42b794f93..e41ea0c9c436 100644
--- a/offapi/com/sun/star/drawing/DashTable.idl
+++ b/offapi/com/sun/star/drawing/DashTable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_DashTable_idl__
-#define __com_sun_star_drawing_DashTable_idl__
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
+#ifndef __com_sun_star_drawing_DashTable_idl__ 
+#define __com_sun_star_drawing_DashTable_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#include <com/sun/star/container/XNameContainer.idl> 
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
 
 /** this is a container for <type>LineDash</type>s
 
     <p>It is used for example to access the <type>LineDash</type>s that
-    are used inside a document.
+    are used inside a document. 
 
     @see DrawingDocumentFactory
     @see LineDash
@@ -56,9 +56,9 @@ published service DashTable
     interface com::sun::star::container::XNameContainer;
 };
 
-//=============================================================================
-
-}; }; }; };
-
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/Defaults.idl b/offapi/com/sun/star/drawing/Defaults.idl
index 948b8c769649..35e5cbc10642 100644
--- a/offapi/com/sun/star/drawing/Defaults.idl
+++ b/offapi/com/sun/star/drawing/Defaults.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module drawing {
+module com { module sun { module star { module drawing { 
 
 //=============================================================================
 
@@ -74,7 +74,7 @@ published service Defaults
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/drawing/Direction3D.idl b/offapi/com/sun/star/drawing/Direction3D.idl
index c346274599f6..57772d71ce14 100644
--- a/offapi/com/sun/star/drawing/Direction3D.idl
+++ b/offapi/com/sun/star/drawing/Direction3D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_Direction3D_idl__
-#define __com_sun_star_drawing_Direction3D_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_Direction3D_idl__ 
+#define __com_sun_star_drawing_Direction3D_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::drawing::Direction3D
 /** specifies a 3-dimensional vector.
  */
 published struct Direction3D
 {
     // DocMerge: empty anyway
-    double DirectionX;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR Direction3D::DirectionY
-
+    double DirectionX; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR Direction3D::DirectionY 
+    
     // DocMerge: empty anyway
-    double DirectionY;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR Direction3D::DirectionZ
-
+    double DirectionY; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR Direction3D::DirectionZ 
+    
     // DocMerge: empty anyway
-    double DirectionZ;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    double DirectionZ; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/DocumentSettings.idl b/offapi/com/sun/star/drawing/DocumentSettings.idl
index 29aee7f3b951..45d0a8891921 100644
--- a/offapi/com/sun/star/drawing/DocumentSettings.idl
+++ b/offapi/com/sun/star/drawing/DocumentSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,7 +68,7 @@ published service DocumentSettings
     /** is the numerator for the logical scale of the document
      */
     [optional, property] long ScaleNumerator;
-
+    
     /** is the denominator for the logical scale of the document
      */
     [optional, property] long ScaleDenominator;
@@ -96,7 +96,7 @@ published service DocumentSettings
     /** If this is true, the distance between two paragraphs is
         the sum of ParaTopMargin of the previous and ParaBottomMargin of
         the next paragraph. If false, only the greater of the two is
-        choosen.
+        choosen. 
      */
     [optional, property] boolean ParagraphSummation;
 
diff --git a/offapi/com/sun/star/drawing/DoubleSequence.idl b/offapi/com/sun/star/drawing/DoubleSequence.idl
index b58c6bcad3d4..a96144690776 100644
--- a/offapi/com/sun/star/drawing/DoubleSequence.idl
+++ b/offapi/com/sun/star/drawing/DoubleSequence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module drawing {
+module com { module sun { module star { module drawing { 
 
 //=============================================================================
 /**
@@ -39,6 +39,6 @@ published typedef sequence<double> DoubleSequence;
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl b/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl
index f825d4805031..427fb051d102 100644
--- a/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module drawing {
+module com { module sun { module star { module drawing { 
 
 //=============================================================================
 /**
@@ -42,7 +42,7 @@ published typedef sequence<DoubleSequence> DoubleSequenceSequence;
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/drawing/DrawPage.idl b/offapi/com/sun/star/drawing/DrawPage.idl
index 44d534362e84..bc0b033c621c 100644
--- a/offapi/com/sun/star/drawing/DrawPage.idl
+++ b/offapi/com/sun/star/drawing/DrawPage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_DrawPage_idl__
-#define __com_sun_star_drawing_DrawPage_idl__
-
-#ifndef __com_sun_star_drawing_GenericDrawPage_idl__
-#include <com/sun/star/drawing/GenericDrawPage.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XMasterPageTarget_idl__
-#include <com/sun/star/drawing/XMasterPageTarget.idl>
-#endif
-
-#ifndef __com_sun_star_form_XFormsSupplier_idl__
-#include <com/sun/star/form/XFormsSupplier.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_DrawPage_idl__ 
+#define __com_sun_star_drawing_DrawPage_idl__ 
+ 
+#ifndef __com_sun_star_drawing_GenericDrawPage_idl__ 
+#include <com/sun/star/drawing/GenericDrawPage.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XMasterPageTarget_idl__ 
+#include <com/sun/star/drawing/XMasterPageTarget.idl> 
+#endif 
+
+#ifndef __com_sun_star_form_XFormsSupplier_idl__ 
+#include <com/sun/star/form/XFormsSupplier.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::drawing::DrawPage
 /** This service specifies a page for the actual draw pages to contain
     the drawings.
-    @see    GenericDrawPage
-    @see    DrawPages
+    @see	GenericDrawPage 
+    @see	DrawPages
  */
 published service DrawPage
-{
-
-
+{ 
+ 
+     
     // DocMerge from xml: service com::sun::star::drawing::DrawPage: service com::sun::star::drawing::GenericDrawPage
-    /** This service describes the base functionality that every
+    /** This service describes the base functionality that every 
                 draw/master page has.
      */
-    service com::sun::star::drawing::GenericDrawPage;
-
-
+    service com::sun::star::drawing::GenericDrawPage; 
+ 
+     
     // DocMerge from xml: service com::sun::star::drawing::DrawPage: interface com::sun::star::drawing::XMasterPageTarget
     /** provides the link to a <type>MasterPage</type>.
      */
-    interface com::sun::star::drawing::XMasterPageTarget;
+    interface com::sun::star::drawing::XMasterPageTarget; 
 
     /** provides access to the hierarchy of form components belonging to the draw page.
 
@@ -77,12 +77,12 @@ published service DrawPage
         @see com.sun.star.form.FormComponents
         @see com.sun.star.form.Forms
     */
-    [optional] interface com::sun::star::form::XFormsSupplier;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [optional] interface com::sun::star::form::XFormsSupplier; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/DrawPages.idl b/offapi/com/sun/star/drawing/DrawPages.idl
index f65fac91c79e..73ae48965a04 100644
--- a/offapi/com/sun/star/drawing/DrawPages.idl
+++ b/offapi/com/sun/star/drawing/DrawPages.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,57 +24,57 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_DrawPages_idl__
-#define __com_sun_star_drawing_DrawPages_idl__
-
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
-#include <com/sun/star/drawing/XDrawPages.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPageSummarizer_idl__
-#include <com/sun/star/drawing/XDrawPageSummarizer.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPageExpander_idl__
-#include <com/sun/star/drawing/XDrawPageExpander.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_DrawPages_idl__ 
+#define __com_sun_star_drawing_DrawPages_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XDrawPages_idl__ 
+#include <com/sun/star/drawing/XDrawPages.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XDrawPageSummarizer_idl__ 
+#include <com/sun/star/drawing/XDrawPageSummarizer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XDrawPageExpander_idl__ 
+#include <com/sun/star/drawing/XDrawPageExpander.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::drawing::DrawPages
 /** provides access to a container of <type>DrawPage</type>s
     and makes it possible for you to manipulate them.
-
+    
     @see XDrawPagesSupplier
     @see DrawingDocument
  */
 published service DrawPages
-{
+{ 
     /** lets you access and create <type>DrawPage</type>s
      */
-    interface com::sun::star::drawing::XDrawPages;
-
-
-    /** This optional interface makes it possible to summarize the
+    interface com::sun::star::drawing::XDrawPages; 
+ 
+     
+    /** This optional interface makes it possible to summarize the 
                 pages in this collection.
      */
-    [optional] interface com::sun::star::drawing::XDrawPageSummarizer;
-
-
+    [optional] interface com::sun::star::drawing::XDrawPageSummarizer; 
+ 
+     
     /** This optional interface can be used for expanding a summarized page.
      */
-    [optional] interface com::sun::star::drawing::XDrawPageExpander;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [optional] interface com::sun::star::drawing::XDrawPageExpander; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/DrawViewMode.idl b/offapi/com/sun/star/drawing/DrawViewMode.idl
index 497670828fd3..72c2a1af82af 100644
--- a/offapi/com/sun/star/drawing/DrawViewMode.idl
+++ b/offapi/com/sun/star/drawing/DrawViewMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_DrawViewMode_idl__
-#define __com_sun_star_drawing_DrawViewMode_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_DrawViewMode_idl__ 
+#define __com_sun_star_drawing_DrawViewMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::DrawViewMode
-/** This enumeration specifies the viewmode of a view in a presentation
+/** This enumeration specifies the viewmode of a view in a presentation 
     document.
 
     @deprecated
  */
 published enum DrawViewMode
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::DrawViewMode::DRAW
     /** The view shows the drawing pages.
      */
-    DRAW,
-
-    //-------------------------------------------------------------------------
-
+    DRAW, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::DrawViewMode::NOTES
     /** The view shows the notes pages.
      */
-    NOTES,
-
-    //-------------------------------------------------------------------------
-
+    NOTES, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::DrawViewMode::HANDOUT
     /** The view shows the handout pages,
      */
-    HANDOUT
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    HANDOUT 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/drawing/DrawingDocument.idl b/offapi/com/sun/star/drawing/DrawingDocument.idl
index f0335dbd4c10..a269618fb60a 100644
--- a/offapi/com/sun/star/drawing/DrawingDocument.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl b/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
index 38abff541b14..f9b9196126fb 100644
--- a/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_DrawingDocumentDrawView_idl__
-#define __com_sun_star_drawing_DrawingDocumentDrawView_idl__
-
-#ifndef __com_sun_star_drawing_XDrawView_idl__
-#include <com/sun/star/drawing/XDrawView.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_Controller_idl__
-#include <com/sun/star/frame/Controller.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
-#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
-#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
+#ifndef __com_sun_star_drawing_DrawingDocumentDrawView_idl__ 
+#define __com_sun_star_drawing_DrawingDocumentDrawView_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XDrawView_idl__ 
+#include <com/sun/star/drawing/XDrawView.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_frame_Controller_idl__ 
+#include <com/sun/star/frame/Controller.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_view_XSelectionSupplier_idl__ 
+#include <com/sun/star/view/XSelectionSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XServiceInfo_idl__ 
+#include <com/sun/star/lang/XServiceInfo.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
+#include <com/sun/star/drawing/XDrawPage.idl> 
+#endif 
 
 #ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
@@ -59,30 +59,30 @@
 #include <com/sun/star/awt/Point.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 module com {  module sun {  module star {  module view {
     published interface XFormLayerAccess;
 }; }; }; };
 
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This componend integrates a view to a <type>DrawPage</type>s or
     <type>MasterPage</type> from a <type>DrawingDocument</type>.
  */
 published service DrawingDocumentDrawView
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** this services offers the  integration of this component into the
         desktop.
     */
     service com::sun::star::frame::Controller;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** lets you access the window for this view
 
@@ -94,59 +94,59 @@ published service DrawingDocumentDrawView
     */
     [optional] interface com::sun::star::view::XFormLayerAccess;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** lets you set/get the current page displayed by this
         view.
      */
-    interface com::sun::star::drawing::XDrawView;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::drawing::XDrawView; 
 
+    //------------------------------------------------------------------------- 
+ 
+     
     /** lets you access the properties of this service.
      */
-    interface com::sun::star::beans::XPropertySet;
+    interface com::sun::star::beans::XPropertySet; 
 
-    //-------------------------------------------------------------------------
-
-
-    /** gives you access to the selected entities of this
+    //------------------------------------------------------------------------- 
+ 
+     
+    /** gives you access to the selected entities of this 
                 view.
      */
-    interface com::sun::star::view::XSelectionSupplier;
-
-
-    //-------------------------------------------------------------------------
+    interface com::sun::star::view::XSelectionSupplier; 
+ 
 
-    /** provides the names of the services implemented by
+    //------------------------------------------------------------------------- 
+     
+    /** provides the names of the services implemented by  
                 this instance.
      */
-    interface com::sun::star::lang::XServiceInfo;
-
-    //-------------------------------------------------------------------------
-
-    /** If the view is in masterpage mode, the view shows the masterpages
+    interface com::sun::star::lang::XServiceInfo; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** If the view is in masterpage mode, the view shows the masterpages 
         of this model.
      */
-    [property] boolean IsMasterPageMode;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean IsMasterPageMode; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If the view is in layer mode, the user can modify the layer of the
         model of this view in the user interface.
      */
-    [property] boolean IsLayerMode;
-
-
-    //-------------------------------------------------------------------------
+    [property] boolean IsLayerMode; 
+ 
 
+    //------------------------------------------------------------------------- 
+     
     /** This is the drawing page that is currently visible.
      */
     [property] XDrawPage CurrentPage;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** This is the area that is currently visible.
      */
     [readonly, property] com::sun::star::awt::Rectangle VisibleArea;
@@ -193,11 +193,11 @@ published service DrawingDocumentDrawView
 
         [optional, property] ::com::sun::star::drawing::XDrawSubController SubController;
     */
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
index a07fba53ab8e..be3ef6cd3f08 100644
--- a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/EllipseShape.idl b/offapi/com/sun/star/drawing/EllipseShape.idl
index cdcbb7cf8676..cdc52ab8f0c4 100644
--- a/offapi/com/sun/star/drawing/EllipseShape.idl
+++ b/offapi/com/sun/star/drawing/EllipseShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,82 +24,82 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_EllipseShape_idl__
-#define __com_sun_star_drawing_EllipseShape_idl__
-
-#ifndef __com_sun_star_drawing_Shape_idl__
-#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
-#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Text_idl__
-#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
-#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
-#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
+#ifndef __com_sun_star_drawing_EllipseShape_idl__ 
+#define __com_sun_star_drawing_EllipseShape_idl__ 
+
+#ifndef __com_sun_star_drawing_Shape_idl__ 
+#include <com/sun/star/drawing/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_LineProperties_idl__ 
+#include <com/sun/star/drawing/LineProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_FillProperties_idl__ 
+#include <com/sun/star/drawing/FillProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_Text_idl__ 
+#include <com/sun/star/drawing/Text.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
+#include <com/sun/star/drawing/ShadowProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
+#include <com/sun/star/drawing/RotationDescriptor.idl> 
+#endif 
 
 #ifndef __com_sun_star_drawing_CircleKind_idl__
 #include <com/sun/star/drawing/CircleKind.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This service is for an ellipse or circle shape.
  */
 published service EllipseShape
-{
-    service com::sun::star::drawing::Shape;
-
-    service com::sun::star::drawing::LineProperties;
-
-    service com::sun::star::drawing::FillProperties;
-
-    service com::sun::star::drawing::Text;
-
-    service com::sun::star::drawing::ShadowProperties;
-
-    service com::sun::star::drawing::RotationDescriptor;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    service com::sun::star::drawing::Shape; 
+
+    service com::sun::star::drawing::LineProperties; 
+    
+    service com::sun::star::drawing::FillProperties; 
+    
+    service com::sun::star::drawing::Text; 
+    
+    service com::sun::star::drawing::ShadowProperties; 
+    
+    service com::sun::star::drawing::RotationDescriptor; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the kind of circle.
      */
-    [property] com::sun::star::drawing::CircleKind CircleKind;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::drawing::CircleKind CircleKind; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If the kind specifies an open circle, this is the start angle.
      */
-    [property] long CircleStartAngle;
-
-    //-------------------------------------------------------------------------
-
+    [property] long CircleStartAngle; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If the kind specifies an open circle, this is the end angle.
      */
-    [property] long CircleEndAngle;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] long CircleEndAngle; 
+
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl
index f6a755e15827..8eb1da01cab9 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,28 +31,28 @@
 #include <com/sun/star/beans/PropertyState.idl>
 #endif
 
-//=============================================================================
-
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** specifies a single AdjustmentValue
  */
 struct EnhancedCustomShapeAdjustmentValue
 {
     /** the any can be of type long or double
     */
-    any     Value;
+    any		Value;
 
     /**
     */
     ::com::sun::star::beans::PropertyState State;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; };
-
-#endif
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl
index c34304f03d18..4ebd27990ede 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeExtrusion.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,25 +27,25 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeExtrusion_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeExtrusion_idl__
 
-#ifndef __com_sun_star_awt_Size_idl__
+#ifndef __com_sun_star_awt_Size_idl__ 
 #include <com/sun/star/awt/Size.idl>
 #endif
-#ifndef __com_sun_star_awt_Point_idl__
+#ifndef __com_sun_star_awt_Point_idl__ 
 #include <com/sun/star/awt/Point.idl>
 #endif
 #ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
 #endif
-#ifndef __com_sun_star_drawing_Position3D_idl__
+#ifndef __com_sun_star_drawing_Position3D_idl__ 
 #include <com/sun/star/drawing/Position3D.idl>
 #endif
-#ifndef __com_sun_star_drawing_Direction3D_idl__
+#ifndef __com_sun_star_drawing_Direction3D_idl__ 
 #include <com/sun/star/drawing/Direction3D.idl>
 #endif
-#ifndef __com_sun_star_drawing_ProjectionMode_idl__
+#ifndef __com_sun_star_drawing_ProjectionMode_idl__ 
 #include <com/sun/star/drawing/ProjectionMode.idl>
 #endif
-#ifndef __com_sun_star_drawing_ShadeMode_idl__
+#ifndef __com_sun_star_drawing_ShadeMode_idl__ 
 #include <com/sun/star/drawing/ShadeMode.idl>
 #endif
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
@@ -54,7 +54,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module drawing {
+module com { module sun { module star { module drawing { 
 
 //=============================================================================
 /**
@@ -123,14 +123,14 @@ service EnhancedCustomShapeExtrusion
     /** This property defines the shade mode.
     */
     [optional, property] ::com::sun::star::drawing::ShadeMode ShadeMode;
-
-    /** This attributes specifies the rotation angle about the x-axis in grad.
-        The order of rotation is: z-axis, y-axis and then x-axis. The z-axis is
+    
+    /**	This attributes specifies the rotation angle about the x-axis in grad. 
+        The order of rotation is: z-axis, y-axis and then x-axis. The z-axis is 
         specified by the draw:rotate-angle.
     */
     [optional, property] ::com::sun::star::drawing::EnhancedCustomShapeParameterPair RotateAngle;
 
-    /** This attribute specifies the position of the rotate center
+    /** This attribute specifies the position of the rotate center 
         in terms of shape size fractions, if the property is omitted, then
         the geometrical center of the shape is used (this is the default).
     */
@@ -141,7 +141,7 @@ service EnhancedCustomShapeExtrusion
     [optional, property] double Shininess;
 
     /** The first value of the draw:extrusion-skew attribute specifies the skew amount of
-        an extrusion in percent. The second parameter specifies the skew-angle. Skew settings
+        an extrusion in	percent. The second parameter specifies the skew-angle. Skew settings
         are only applied if the attribute ProjectionMode is ProjectionMode_PARALLEL.
     */
     [optional, property] ::com::sun::star::drawing::EnhancedCustomShapeParameterPair Skew;
@@ -170,7 +170,7 @@ service EnhancedCustomShapeExtrusion
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl
index 16f3a3815c92..b3ecedef8385 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeGeometry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeGeometry_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeGeometry_idl__
 
-#ifndef __com_sun_star_awt_Rectangle_idl__
+#ifndef __com_sun_star_awt_Rectangle_idl__ 
 #include <com/sun/star/awt/Rectangle.idl>
 #endif
 #ifndef __com_sun_star_beans_PropertyValue_idl__
@@ -36,20 +36,20 @@
 #ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
 #endif
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeHandle_idl__
+#ifndef __com_sun_star_drawing_EnhancedCustomShapeHandle_idl__ 
 #include <com/sun/star/drawing/EnhancedCustomShapeHandle.idl>
 #endif
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeAdjustmentValue_idl__
+#ifndef __com_sun_star_drawing_EnhancedCustomShapeAdjustmentValue_idl__ 
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl>
 #endif
 
 //=============================================================================
 
-module com { module sun { module star { module drawing {
+module com { module sun { module star { module drawing { 
 
 //=============================================================================
 /**
-  This service may be represented by a ::com::sun::star::beans::PropertyValue [].
+  This service may be represented by a ::com::sun::star::beans::PropertyValue []. 
 */
 
 service EnhancedCustomShapeGeometry
@@ -113,7 +113,7 @@ service EnhancedCustomShapeGeometry
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeGluePointType.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeGluePointType.idl
index bda5c034d903..98e806019360 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeGluePointType.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeGluePointType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeGluePointType_idl__
-#define __com_sun_star_drawing_EnhancedCustomShapeGluePointType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_EnhancedCustomShapeGluePointType_idl__ 
+#define __com_sun_star_drawing_EnhancedCustomShapeGluePointType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** defines which gluepoints are being offered by the EnhancedCustomShape
  */
 constants EnhancedCustomShapeGluePointType
-{
-    /** no gluepoints are offered
+{ 
+    /** no gluepoints are offered 
      */
     const short NONE = 0;
-
-    /** gluepoints are offered for each segment
+ 
+    /** gluepoints are offered for each segment 
      */
     const short SEGMENTS = 1;
-
-    /** only glue points of the GluePoints property from the
+ 
+    /** only glue points of the GluePoints property from the 
         com::sun:star::drawing::EnhancedCustomShapePath are offered
      */
     const short CUSTOM = 2;
@@ -54,11 +54,11 @@ constants EnhancedCustomShapeGluePointType
     /** standard top, left, right, bottom glue points are offered
      */
     const short RECT = 3;
- };
-
-//=============================================================================
-
+ }; 
+ 
+//============================================================================= 
+ 
 }; }; }; };
-
-#endif
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl
index d5e8420fc32f..2d5f57d57400 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeHandle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,12 +31,12 @@
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl>
 #endif
 
-//=============================================================================
-
-module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /**
   This service may be represented by a ::com::sun::star::beans::PropertyValue [].
 */
@@ -68,22 +68,22 @@ service EnhancedCustomShapeHandle
     */
     [optional, property] ::com::sun::star::drawing::EnhancedCustomShapeParameterPair Polar;
 
-    /** RefX, if this attribute is set, it specifies the index of the adjustment
+    /** RefX, if this attribute is set, it specifies the index of the adjustment 
         value which is connected to the horizontal position of the handle
     */
     [optional, property] long RefX;
 
-    /** RefY, if this attribute is set, it specifies the index of the adjustment
+    /** RefY, if this attribute is set, it specifies the index of the adjustment 
         value which is connected to the vertical position of the handle
     */
     [optional, property] long RefY;
 
-    /** RefAngle, if this attribute is set, it specifies the index of the adjustment
+    /** RefAngle, if this attribute is set, it specifies the index of the adjustment 
         value which is connected to the angle of the handle
     */
     [optional, property] long RefAngle;
 
-    /** RefR, if this attribute is set, it specifies the index of the adjustment
+    /** RefR, if this attribute is set, it specifies the index of the adjustment 
         value which is connected to the radius of the handle
     */
     [optional, property] long RefR;
@@ -103,19 +103,19 @@ service EnhancedCustomShapeHandle
     /** If the attribute RangeYMaximum is set, it specifies the vertical maximum range of the handle.
     */
     [optional, property] ::com::sun::star::drawing::EnhancedCustomShapeParameter RangeYMaximum;
-
-    /** If this attribute is set, it specifies the minimum radius range that can be used for a polar handle.
+    
+    /** If this attribute is set, it specifies the minimum radius range that can be used for a polar handle. 
     */
     [optional, property] ::com::sun::star::drawing::EnhancedCustomShapeParameter RadiusRangeMinimum;
 
-    /** If this attribute is set, it specifies the maximum radius range that can be used for a polar handle.
+    /** If this attribute is set, it specifies the maximum radius range that can be used for a polar handle. 
     */
     [optional, property] ::com::sun::star::drawing::EnhancedCustomShapeParameter RadiusRangeMaximum;
 };
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 }; }; }; };
-
-#endif
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeParameter.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeParameter.idl
index b1e78d4333cf..7e11d1890580 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeParameter.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeParameter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,29 +26,29 @@
  ************************************************************************/
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeParameter_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeParameter_idl__
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
  module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** specifies a single value which is used with EnhancedCustomShapes
  */
 struct EnhancedCustomShapeParameter
 {
     /** the any can be of type long or double
     */
-    any     Value;
+    any		Value;
 
     /**
     */
-    short   Type;
-};
-
-//=============================================================================
-
+    short	Type;
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; };
-
-#endif
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl
index b454950bf1fe..5b6a92bd1755 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,31 +26,31 @@
  ************************************************************************/
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
-
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameter_idl__
+  
+#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameter_idl__ 
 #include <com/sun/star/drawing/EnhancedCustomShapeParameter.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** specifies the coordinates used with EnhancedCustomShapes
  */
 struct EnhancedCustomShapeParameterPair
 {
-    ::com::sun::star::drawing::EnhancedCustomShapeParameter First;
-
+    ::com::sun::star::drawing::EnhancedCustomShapeParameter	First;
+ 
     //-------------------------------------------------------------------------
 
-    ::com::sun::star::drawing::EnhancedCustomShapeParameter Second;
+    ::com::sun::star::drawing::EnhancedCustomShapeParameter	Second;
 };
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 }; }; }; };
-
-#endif
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterType.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterType.idl
index c8c035e13d24..495e3947ba6d 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterType.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeParameterType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,30 +26,30 @@
  ************************************************************************/
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterType_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeParameterType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** defines how a EnhancedCustomShapeParameter has to be interpreted
  */
 constants EnhancedCustomShapeParameterType
-{
+{ 
     /** the value of the point component is normal, the Coordinate is taken as it is
      */
     const short NORMAL = 0;
-
+ 
     /** the value of the point component has to be interpreted as index to a Equation
      */
     const short EQUATION = 1;
-
+ 
     /** the value of the point component has to be interpreted as index into the list of AdjustmentValues
      */
     const short ADJUSTMENT = 2;
-
+ 
     /** the logical left border of the CustomShape is used
      */
     const short LEFT = 3;
@@ -97,11 +97,11 @@ constants EnhancedCustomShapeParameterType
     /** The logical height of the shape is used.
      */
     const short LOGHEIGHT = 14;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
  }; }; }; };
-
-#endif
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl
index d0bd22cafb5a..b15de6f5edeb 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapePath.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,10 +27,10 @@
 #ifndef __com_sun_star_drawing_EnhancedCustomShapePath_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapePath_idl__
 
-#ifndef __com_sun_star_awt_Size_idl__
+#ifndef __com_sun_star_awt_Size_idl__ 
 #include <com/sun/star/awt/Size.idl>
 #endif
-#ifndef __com_sun_star_awt_Point_idl__
+#ifndef __com_sun_star_awt_Point_idl__ 
 #include <com/sun/star/awt/Point.idl>
 #endif
 #ifndef __com_sun_star_beans_PropertyValue_idl__
@@ -49,7 +49,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module drawing {
+module com { module sun { module star { module drawing { 
 
 //=============================================================================
 /**
@@ -77,7 +77,7 @@ service EnhancedCustomShapePath
     [optional, property] long StretchY;
 
     /** This property specifies the text frames that can be used with the shape. In general
-       the first text frame is used, except the shape is containing vertical text, then the object
+       the first text frame is used, except the shape is containing vertical text, then the object 
        tries to use the second text frame. The default text frame will be as big as the shape.
     */
     [optional, property] sequence<::com::sun::star::drawing::EnhancedCustomShapeTextFrame> TextFrames;
@@ -113,7 +113,7 @@ service EnhancedCustomShapePath
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl
index a1a8ca12b51f..6b0ad9f848cc 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,13 +31,13 @@
 #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
-/**
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
+/** 
  */
 struct EnhancedCustomShapeSegment
 {
@@ -45,10 +45,10 @@ struct EnhancedCustomShapeSegment
 
     short Count;
 };
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 }; }; }; };
-
-#endif
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl
index 4c65a23ada90..125e0db74ef6 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,18 +26,18 @@
  ************************************************************************/
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeSegmentInformationCommand_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeSegmentInformationCommand_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
-/**
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
+/** 
  */
 constants EnhancedCustomShapeSegmentCommand
-{
+{ 
     /**
      */
     const short UNKNOWN = 0;
@@ -45,15 +45,15 @@ constants EnhancedCustomShapeSegmentCommand
     /**
      */
     const short MOVETO = 1;
-
+ 
     /**
      */
     const short LINETO = 2;
-
+ 
     /**
      */
     const short CURVETO = 3;
-
+ 
     /**
      */
     const short CLOSESUBPATH = 4;
@@ -105,11 +105,11 @@ constants EnhancedCustomShapeSegmentCommand
     /**
      */
     const short QUADRATICCURVETO = 16;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; };
-
-#endif
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl
index e9bbd2c71962..88a1cb8d59f4 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,32 +26,32 @@
  ************************************************************************/
 #ifndef __com_sun_star_drawing_EnhancedCustomShapeTextFrame_idl__
 #define __com_sun_star_drawing_EnhancedCustomShapeTextFrame_idl__
-
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__
+  
+#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_idl__ 
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** specifies the coordinates used with EnhancedCustomShapes
  */
 struct EnhancedCustomShapeTextFrame
 {
-    ::com::sun::star::drawing::EnhancedCustomShapeParameterPair TopLeft;
-
+    ::com::sun::star::drawing::EnhancedCustomShapeParameterPair	TopLeft;
+ 
     //-------------------------------------------------------------------------
 
-    ::com::sun::star::drawing::EnhancedCustomShapeParameterPair BottomRight;
+    ::com::sun::star::drawing::EnhancedCustomShapeParameterPair	BottomRight;
 
 };
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 }; }; }; };
-
-#endif
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl
index 72674e8a3974..820c94a099f9 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPath.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module drawing {
+module com { module sun { module star { module drawing { 
 
 //=============================================================================
 /**
@@ -57,7 +57,7 @@ service EnhancedCustomShapeTextPath
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPathMode.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPathMode.idl
index f7500576a60d..1d588983ab9d 100644
--- a/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPathMode.idl
+++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeTextPathMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeTextPathMode_idl__
-#define __com_sun_star_drawing_EnhancedCustomShapeTextPathMode_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_EnhancedCustomShapeTextPathMode_idl__ 
+#define __com_sun_star_drawing_EnhancedCustomShapeTextPathMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 enum EnhancedCustomShapeTextPathMode
-{
+{ 
     /** the text is drawn along the path without scaling.
      */
     NORMAL,
-
+ 
     /** the text is fit to the path.
      */
     PATH,
-
+ 
     /** the text is fit to the bounding box of the shape.
      */
     SHAPE
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/EscapeDirection.idl b/offapi/com/sun/star/drawing/EscapeDirection.idl
index 7198f4033f95..a554662867f3 100644
--- a/offapi/com/sun/star/drawing/EscapeDirection.idl
+++ b/offapi/com/sun/star/drawing/EscapeDirection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_EscapeDirection_idl__
-#define __com_sun_star_drawing_EscapeDirection_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_EscapeDirection_idl__ 
+#define __com_sun_star_drawing_EscapeDirection_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This enumeration defines the escape direction a connector takes on
     a glue point.
  */
 published enum EscapeDirection
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR EscapeDirection::  SMART,
-    SMART,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR EscapeDirection::  LEFT,
-    LEFT,
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR EscapeDirection::	SMART, 
+    SMART, 
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR EscapeDirection::  RIGHT,
-    RIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR EscapeDirection::  UP,
-    UP,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR EscapeDirection::  DOWN
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR EscapeDirection::	LEFT, 
+    LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR EscapeDirection::	RIGHT, 
+    RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR EscapeDirection::	UP, 
+    UP, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR EscapeDirection::	DOWN 
     DOWN,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR EscapeDirection::  HORIZONTAL
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR EscapeDirection::	HORIZONTAL 
     HORIZONTAL,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR EscapeDirection::  VERTICAL
+     
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR EscapeDirection::	VERTICAL 
     VERTICAL
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/FillProperties.idl b/offapi/com/sun/star/drawing/FillProperties.idl
index ea6de0a07a87..2dc91cd582ea 100644
--- a/offapi/com/sun/star/drawing/FillProperties.idl
+++ b/offapi/com/sun/star/drawing/FillProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/FillStyle.idl b/offapi/com/sun/star/drawing/FillStyle.idl
index b305791e654c..9e8722c926da 100644
--- a/offapi/com/sun/star/drawing/FillStyle.idl
+++ b/offapi/com/sun/star/drawing/FillStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,66 +24,66 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_FillStyle_idl__
-#define __com_sun_star_drawing_FillStyle_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_FillStyle_idl__ 
+#define __com_sun_star_drawing_FillStyle_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::FillStyle
 /** specifies how an area will be filled.
  */
 published enum FillStyle
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR FillStyle::    NONE,
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR FillStyle::	NONE, 
+    
     // DocMerge from xml: value com::sun::star::drawing::FillStyle::NONE
     /** the area is not filled.
      */
-    NONE,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR FillStyle::    SOLID,
-
+    NONE, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR FillStyle::	SOLID, 
+    
     // DocMerge from xml: value com::sun::star::drawing::FillStyle::SOLID
     /** use a solid color to fill the area.
      */
-    SOLID,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR FillStyle::    GRADIENT,
-
+    SOLID, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR FillStyle::	GRADIENT, 
+    
     // DocMerge from xml: value com::sun::star::drawing::FillStyle::GRADIENT
     /** use a gradient color to fill the area.
      */
-    GRADIENT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR FillStyle::    HATCH,
-
+    GRADIENT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR FillStyle::	HATCH, 
+    
     // DocMerge from xml: value com::sun::star::drawing::FillStyle::HATCH
     /** use a hatch to fill the area.
      */
-    HATCH,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR FillStyle::    BITMAP
-
+    HATCH, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR FillStyle::	BITMAP 
+    
     // DocMerge from xml: value com::sun::star::drawing::FillStyle::BITMAP
     /** use a bitmap to fill the  area.
      */
-    BITMAP
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    BITMAP 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/FlagSequence.idl b/offapi/com/sun/star/drawing/FlagSequence.idl
index a2fcfe27dfc7..01e11549254c 100644
--- a/offapi/com/sun/star/drawing/FlagSequence.idl
+++ b/offapi/com/sun/star/drawing/FlagSequence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module drawing {
+module com { module sun { module star { module drawing { 
 
 //=============================================================================
 /**
@@ -42,7 +42,7 @@ published typedef sequence<PolygonFlags> FlagSequence;
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/drawing/FlagSequenceSequence.idl b/offapi/com/sun/star/drawing/FlagSequenceSequence.idl
index 5be60e2a1fb1..01bc7bdc414a 100644
--- a/offapi/com/sun/star/drawing/FlagSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/FlagSequenceSequence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module drawing {
+module com { module sun { module star { module drawing { 
 
 //=============================================================================
 /**
@@ -43,7 +43,7 @@ published typedef sequence<FlagSequence> FlagSequenceSequence;
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/drawing/GenericDrawPage.idl b/offapi/com/sun/star/drawing/GenericDrawPage.idl
index ee9920111805..ef2076c216f9 100644
--- a/offapi/com/sun/star/drawing/GenericDrawPage.idl
+++ b/offapi/com/sun/star/drawing/GenericDrawPage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,59 +24,59 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_GenericDrawPage_idl__
-#define __com_sun_star_drawing_GenericDrawPage_idl__
-
-#ifndef __com_sun_star_drawing_XShapes_idl__
-#include <com/sun/star/drawing/XShapes.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShapeGrouper_idl__
-#include <com/sun/star/drawing/XShapeGrouper.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShapeCombiner_idl__
-#include <com/sun/star/drawing/XShapeCombiner.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShapeBinder_idl__
-#include <com/sun/star/drawing/XShapeBinder.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
-#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_view_PaperOrientation_idl__
-#include <com/sun/star/view/PaperOrientation.idl>
-#endif
-
+#ifndef __com_sun_star_drawing_GenericDrawPage_idl__ 
+#define __com_sun_star_drawing_GenericDrawPage_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XShapes_idl__ 
+#include <com/sun/star/drawing/XShapes.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShapeGrouper_idl__ 
+#include <com/sun/star/drawing/XShapeGrouper.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShapeCombiner_idl__ 
+#include <com/sun/star/drawing/XShapeCombiner.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShapeBinder_idl__ 
+#include <com/sun/star/drawing/XShapeBinder.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNamed_idl__ 
+#include <com/sun/star/container/XNamed.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XServiceInfo_idl__ 
+#include <com/sun/star/lang/XServiceInfo.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_view_PaperOrientation_idl__ 
+#include <com/sun/star/view/PaperOrientation.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage
 /** This abstract service is implemented by every page of a
-    <type>DrawingDocument</type>.
-
-
-
+    <type>DrawingDocument</type>. 
+    
+    
+    
     @example create and insert a couple of <type>LineShape</type>s:
-
+    
     <listing>
     xPage = xDoc.DrawPages(0)
     for x% = 0 to 200
@@ -90,121 +90,121 @@
     </listing>
  */
 published service GenericDrawPage
-{
-
-
+{ 
+ 
+     
     // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::drawing::XShapes
-    /** manages the <type>Shape</type>s of this page.
-
-                <p>It also lets you add new <type>Shape</type>s. The program currently
-                requires that these <type>Shape</type>s be created by the factory of
-                the document.
-
-                @see    <type>DrawingDocument</type>
+    /** manages the <type>Shape</type>s of this page. 
+                 
+                <p>It also lets you add new <type>Shape</type>s. The program currently 
+                requires that these <type>Shape</type>s be created by the factory of 
+                the	document. 
+                 
+                @see	<type>DrawingDocument</type>
      */
-    interface com::sun::star::drawing::XShapes;
-
-
+    interface com::sun::star::drawing::XShapes; 
+ 
+     
     // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::drawing::XShapeGrouper
-    /** With this interface you can group/ungroup a collection of
+    /** With this interface you can group/ungroup a collection of 
                 <type>Shape</type>s.
      */
-    interface com::sun::star::drawing::XShapeGrouper;
-
-
+    interface com::sun::star::drawing::XShapeGrouper; 
+ 
+     
     // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::drawing::XShapeCombiner
-    /** With this interface you can combine/split a collection of
+    /** With this interface you can combine/split a collection of 
                 <type>Shape</type>s.
      */
-    [optional] interface com::sun::star::drawing::XShapeCombiner;
-
-
+    [optional] interface com::sun::star::drawing::XShapeCombiner; 
+ 
+     
     // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::drawing::XShapeBinder
-    /** With this interface you can bind/unbind a collection of
+    /** With this interface you can bind/unbind a collection of 
                 <type>Shape</type>s.
      */
-    [optional] interface com::sun::star::drawing::XShapeBinder;
-
-
+    [optional] interface com::sun::star::drawing::XShapeBinder; 
+ 
+     
     // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::container::XNamed
-    /** Gets or sets the name of this page.
-
+    /** Gets or sets the name of this page. 
+                 
                 <p>Duplicated pagenames inside a document are not allowed.
      */
-    [optional] interface com::sun::star::container::XNamed;
-
-
+    [optional] interface com::sun::star::container::XNamed; 
+ 
+     
     // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::lang::XServiceInfo
-    /** returns the services implemented by this
+    /** returns the services implemented by this 
                 instance.
      */
-    interface com::sun::star::lang::XServiceInfo;
-
-
+    interface com::sun::star::lang::XServiceInfo; 
+ 
+     
     // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::beans::XPropertySet
-    /** gives you access to the properties of this
+    /** gives you access to the properties of this 
                 <type>DrawPage</type>.
      */
-    [optional] interface com::sun::star::beans::XPropertySet;
-
-    //-------------------------------------------------------------------------
-
+    [optional] interface com::sun::star::beans::XPropertySet; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::drawing::GenericDrawPage::BorderBottom
     /** This is the border at the bottom.
      */
-        [optional, property] long BorderBottom;
-
-    //-------------------------------------------------------------------------
-
+        [optional, property] long BorderBottom; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::drawing::GenericDrawPage::BorderLeft
     /** This is the border at the left.
      */
-        [optional, property] long BorderLeft;
-
-    //-------------------------------------------------------------------------
-
+        [optional, property] long BorderLeft; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::drawing::GenericDrawPage::BorderRight
     /** This is the border at the right.
      */
-        [optional, property] long BorderRight;
-
-    //-------------------------------------------------------------------------
-
+        [optional, property] long BorderRight; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::drawing::GenericDrawPage::BorderTop
     /** This is the border at the top.
      */
-        [optional, property] long BorderTop;
-
-    //-------------------------------------------------------------------------
-
+        [optional, property] long BorderTop; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::drawing::GenericDrawPage::Height
     /** This is the height.
      */
-        [optional, property] long Height;
-
-    //-------------------------------------------------------------------------
-
+        [optional, property] long Height; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::drawing::GenericDrawPage::Width
     /** This is the width.
      */
-        [optional, property] long Width;
-
-    //-------------------------------------------------------------------------
-
+        [optional, property] long Width; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::drawing::GenericDrawPage::Number
     /** This is the number of this page, starting with 1.
      */
-        [optional, readonly, property] short Number;
-
-    //-------------------------------------------------------------------------
-
+        [optional, readonly, property] short Number; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::drawing::GenericDrawPage::Orientation
     /** This is the orientation of this page.
      */
-        [optional, property] com::sun::star::view::PaperOrientation Orientation;
-
-    //-------------------------------------------------------------------------
+        [optional, property] com::sun::star::view::PaperOrientation Orientation; 
 
+    //------------------------------------------------------------------------- 
+ 
     /** this property stores xml attributes.
         They will be saved to and restored from automatic styles inside xml files.
 
@@ -212,7 +212,7 @@ published service GenericDrawPage
     */
     [optional, property] com::sun::star::container::XNameContainer UserDefinedAttributes;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** this property is true if the avveraged background filling colors luminance
         is belove an application specified threshold value. This can be used to
@@ -220,7 +220,7 @@ published service GenericDrawPage
     */
     [readonly, optional, property] boolean IsBackgroundDark;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** this index access defines a navigation order for the top level shapes
         inside this page.
@@ -229,10 +229,10 @@ published service GenericDrawPage
     */
     [optional, property] com::sun::star::container::XIndexAccess NavigationOrder;
 };
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/GenericDrawingDocument.idl b/offapi/com/sun/star/drawing/GenericDrawingDocument.idl
index febd57d93b97..96582dd4c6dc 100644
--- a/offapi/com/sun/star/drawing/GenericDrawingDocument.idl
+++ b/offapi/com/sun/star/drawing/GenericDrawingDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/GluePoint.idl b/offapi/com/sun/star/drawing/GluePoint.idl
index 83cfb638d35f..d2fa2a5cb4d8 100644
--- a/offapi/com/sun/star/drawing/GluePoint.idl
+++ b/offapi/com/sun/star/drawing/GluePoint.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,25 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_GluePoint_idl__
-#define __com_sun_star_drawing_GluePoint_idl__
-
-#ifndef __com_sun_star_awt_Point_idl__
-#include <com/sun/star/awt/Point.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_GluePoint_idl__ 
+#define __com_sun_star_drawing_GluePoint_idl__ 
+ 
+#ifndef __com_sun_star_awt_Point_idl__ 
+#include <com/sun/star/awt/Point.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::drawing::GluePoint
 /** A <type>GluePoint</type> could be attached to a shape or to a page.
-
-
-
+    
+    
+    
     <p>If a <type>GluePoint</type> is attached to a shape, it is moved when
     the shape moves.
     The ends of connectors can be attached to <type>GluePoint</type>.</p>
@@ -55,37 +55,37 @@ published struct GluePoint
     // DocMerge from xml: field com::sun::star::drawing::GluePoint::Position
     /** This is the position of this <type>GluePoint</type>.
      */
-    com::sun::star::awt::Point Position;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Point Position; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::drawing::GluePoint::EscapeDirection
     /** This is the direction in which the connector line leaves the
         <type>GluePoint</type>.
      */
-    short EscapeDirection;
-
-    //-------------------------------------------------------------------------
-
+    short EscapeDirection; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::drawing::GluePoint::PositionAbsolute
     /** If this is <TRUE/>, then the position of this <type>GluePoint</type> is
-        absolute on a page and is not relative to a shape.
+        absolute on	a page and is not relative to a shape.
      */
-    boolean PositionAbsolute;
-
-    //-------------------------------------------------------------------------
-
+    boolean PositionAbsolute; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::drawing::GluePoint::Alignment
     /** The alignment of a <code>GluePoint</code> defines how the position of
         the point is affected by resizing the parent <code>Shape</code>.
      */
-    short Alignment;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    short Alignment; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/GluePoint2.idl b/offapi/com/sun/star/drawing/GluePoint2.idl
index 5169add58450..dc5269665f6c 100644
--- a/offapi/com/sun/star/drawing/GluePoint2.idl
+++ b/offapi/com/sun/star/drawing/GluePoint2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,9 +24,9 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_GluePoint2_idl__
-#define __com_sun_star_drawing_GluePoint2_idl__
-
+#ifndef __com_sun_star_drawing_GluePoint2_idl__ 
+#define __com_sun_star_drawing_GluePoint2_idl__ 
+ 
 #ifndef __com_sun_star_drawing_Alignment_idl__
 #include <com/sun/star/drawing/Alignment.idl>
 #endif
@@ -35,16 +35,16 @@
 #include <com/sun/star/awt/Point.idl>
 #endif
 
-#ifndef __com_sun_star_drawing_EscapeDirection_idl__
+#ifndef __com_sun_star_drawing_EscapeDirection_idl__ 
 #include <com/sun/star/drawing/EscapeDirection.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This struct defines the attributes of a glue point.
     <p>A glue point is a position inside a drawing shape where an edge
     of a connector shape can be connected.</p>
@@ -57,8 +57,8 @@ published struct GluePoint2
 
     <!-- Dennis: Is the % correct? -->
      */
-    com::sun::star::awt::Point Position;
-
+    com::sun::star::awt::Point Position; 
+    
     /** if this flag is set to true, the position of this glue point
         is given in 1/100% values instead of 1/100cm. */
     boolean IsRelative;
@@ -79,11 +79,11 @@ published struct GluePoint2
         point. Some shapes may have default glue points attached
         to them which cannot be altered or removed. */
     boolean IsUserDefined;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/GradientTable.idl b/offapi/com/sun/star/drawing/GradientTable.idl
index a8c3b67f4d12..7630303f15e1 100644
--- a/offapi/com/sun/star/drawing/GradientTable.idl
+++ b/offapi/com/sun/star/drawing/GradientTable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_GradientTable_idl__
-#define __com_sun_star_drawing_GradientTable_idl__
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
+#ifndef __com_sun_star_drawing_GradientTable_idl__ 
+#define __com_sun_star_drawing_GradientTable_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#include <com/sun/star/container/XNameContainer.idl> 
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
 
 /** this is a container for <type scope="com::sun::star::awt">Gradient</type>s
 
     <p>It is used for example to access the <type scope="com::sun::star::awt">Gradient</type>s that
-    are used inside a document.
+    are used inside a document. 
 
     @see DrawingDocumentFactory
     @see com::sun::star::awt::Gradient
@@ -56,9 +56,9 @@ published service GradientTable
     interface com::sun::star::container::XNameContainer;
 };
 
-//=============================================================================
-
-}; }; }; };
-
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/GraphicExportFilter.idl b/offapi/com/sun/star/drawing/GraphicExportFilter.idl
index 97351fceaa55..317114d936f3 100644
--- a/offapi/com/sun/star/drawing/GraphicExportFilter.idl
+++ b/offapi/com/sun/star/drawing/GraphicExportFilter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,11 +39,11 @@
 #include <com/sun/star/document/XMimeTypeInfo.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
 
 /** a component that supports this service lets you export pages, shapes, or
     groups of shapes from a DrawingDocument to a file in one of the file formats
@@ -53,12 +53,12 @@ published service GraphicExportFilter
 {
     /** calling <method scope=scope="com::sun::star::document">XFilter::filter
         </method> starts the export of the graphic file. The following properties
-        from the        <type scope="com::sun::star::document">MediaDescriptor
+        from the 		<type scope="com::sun::star::document">MediaDescriptor
         </type> are supported:<p>
 
         <member scope="com::sun::star::document">MediaDescriptor::MediaType
         </member><b>
-
+        
         Depending on the export filters supported by this component this is
         the mime type of the target graphic file. Possible values are<b>
         image/x-MS-bmp<b>
@@ -86,7 +86,7 @@ published service GraphicExportFilter
     */
     interface ::com::sun::star::document::XFilter;
 
-    /** sets the source component for this export filter.
+    /**	sets the source component for this export filter.
         This could either be a <type>DrawPage</type>, a <type>Shape</type>
         or a <type>Shapes</type>.
      */
@@ -96,9 +96,9 @@ published service GraphicExportFilter
     interface ::com::sun::star::document::XMimeTypeInfo;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
 
diff --git a/offapi/com/sun/star/drawing/GraphicFilterRequest.idl b/offapi/com/sun/star/drawing/GraphicFilterRequest.idl
index 9bf571609159..536e0bac2ae1 100644
--- a/offapi/com/sun/star/drawing/GraphicFilterRequest.idl
+++ b/offapi/com/sun/star/drawing/GraphicFilterRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/GraphicObjectShape.idl b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
index 06a45bbe813e..05f40ce8410b 100644
--- a/offapi/com/sun/star/drawing/GraphicObjectShape.idl
+++ b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,25 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_GraphicObjectShape_idl__
-#define __com_sun_star_drawing_GraphicObjectShape_idl__
-
-#ifndef __com_sun_star_drawing_Shape_idl__
-#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Text_idl__
-#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
-#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
-#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
+#ifndef __com_sun_star_drawing_GraphicObjectShape_idl__ 
+#define __com_sun_star_drawing_GraphicObjectShape_idl__ 
+ 
+#ifndef __com_sun_star_drawing_Shape_idl__ 
+#include <com/sun/star/drawing/Shape.idl> 
+#endif 
+  
+#ifndef __com_sun_star_drawing_Text_idl__ 
+#include <com/sun/star/drawing/Text.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
+#include <com/sun/star/drawing/ShadowProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
+#include <com/sun/star/drawing/RotationDescriptor.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_awt_XBitmap_idl__
 #include <com/sun/star/awt/XBitmap.idl>
 #endif
@@ -50,7 +50,7 @@
 #ifndef com_sun_star_graphic_XGraphic_idl
 #include <com/sun/star/graphic/XGraphic.idl>
 #endif
-
+ 
 #ifndef __com_sun_star_drawing_ColorMode_idl__
 #include <com/sun/star/drawing/ColorMode.idl>
 #endif
@@ -59,24 +59,24 @@
 #include <com/sun/star/container/XIndexContainer.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This service is for a graphic shape.
  */
 published service GraphicObjectShape
-{
-    service com::sun::star::drawing::Shape;
-
-    service com::sun::star::drawing::Text;
-
-    service com::sun::star::drawing::ShadowProperties;
-
-    service com::sun::star::drawing::RotationDescriptor;
-
+{ 
+    service com::sun::star::drawing::Shape; 
+    
+    service com::sun::star::drawing::Text; 
+    
+    service com::sun::star::drawing::ShadowProperties; 
+    
+    service com::sun::star::drawing::RotationDescriptor; 
+ 
     //-------------------------------------------------------------------------
     /** This is an url to the source bitmap for this graphic shape.
     */
@@ -151,10 +151,10 @@ published service GraphicObjectShape
     /** This is the graphic that represents this graphic shape
     */
     [optional, property] com::sun::star::graphic::XGraphic Graphic;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/drawing/GroupShape.idl b/offapi/com/sun/star/drawing/GroupShape.idl
index 4aa717692517..49538a307e97 100644
--- a/offapi/com/sun/star/drawing/GroupShape.idl
+++ b/offapi/com/sun/star/drawing/GroupShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_GroupShape_idl__
-#define __com_sun_star_drawing_GroupShape_idl__
-
-#ifndef __com_sun_star_drawing_XShapeGroup_idl__
-#include <com/sun/star/drawing/XShapeGroup.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShapes_idl__
-#include <com/sun/star/drawing/XShapes.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Shape_idl__
-#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_GroupShape_idl__ 
+#define __com_sun_star_drawing_GroupShape_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XShapeGroup_idl__ 
+#include <com/sun/star/drawing/XShapeGroup.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShapes_idl__ 
+#include <com/sun/star/drawing/XShapes.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_Shape_idl__ 
+#include <com/sun/star/drawing/Shape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This service is for a group of <type>Shape</type>s.
-        @see XShapeGroup
-        @see XShapes
+        @see XShapeGroup 
+        @see XShapes 
  */
 published service GroupShape
-{
+{ 
     /** Since a GroupShape is also a shape, it has to support this service
     */
     service com::sun::star::drawing::Shape;
@@ -59,18 +59,18 @@ published service GroupShape
     /** this is a ui feature for entering and leaving the group for
         editing.
     */
-    interface com::sun::star::drawing::XShapeGroup;
-
-
+    interface com::sun::star::drawing::XShapeGroup; 
+ 
+     
     /** lets you access the <type>Shape</type>s in this Group.
      */
-    interface com::sun::star::drawing::XShapes;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::drawing::XShapes; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/Hatch.idl b/offapi/com/sun/star/drawing/Hatch.idl
index bfbbc94d8473..ad93b2b52dd1 100644
--- a/offapi/com/sun/star/drawing/Hatch.idl
+++ b/offapi/com/sun/star/drawing/Hatch.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_Hatch_idl__
-#define __com_sun_star_drawing_Hatch_idl__
-
-#ifndef __com_sun_star_drawing_HatchStyle_idl__
-#include <com/sun/star/drawing/HatchStyle.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
-#include <com/sun/star/util/Color.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_Hatch_idl__ 
+#define __com_sun_star_drawing_Hatch_idl__ 
+ 
+#ifndef __com_sun_star_drawing_HatchStyle_idl__ 
+#include <com/sun/star/drawing/HatchStyle.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_Color_idl__ 
+#include <com/sun/star/util/Color.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::drawing::Hatch
 /** This struct defines the appearence of a hatch.
-
+    
     <p>A hatch is a texture made of straight lines.</p>
  */
 published struct Hatch
@@ -53,34 +53,34 @@ published struct Hatch
     /** The <type>HatchStyle</type> defines the kind of lines used to draw
         this hatch.
      */
-    com::sun::star::drawing::HatchStyle Style;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::drawing::HatchStyle Style; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::drawing::Hatch::Color
     /** This is the color of the hatch lines.
      */
-    com::sun::star::util::Color Color;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::util::Color Color; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::drawing::Hatch::Distance
     /** This is the distance between the lines in the hatch.
      */
-    long Distance;
-
-    //-------------------------------------------------------------------------
-
+    long Distance; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::drawing::Hatch::Angle
     /** You can rotate the lines of the hatch with this angle.
      */
-    long Angle;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    long Angle; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/HatchStyle.idl b/offapi/com/sun/star/drawing/HatchStyle.idl
index baa4d8fab6fa..83ff38cac279 100644
--- a/offapi/com/sun/star/drawing/HatchStyle.idl
+++ b/offapi/com/sun/star/drawing/HatchStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_HatchStyle_idl__
-#define __com_sun_star_drawing_HatchStyle_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_HatchStyle_idl__ 
+#define __com_sun_star_drawing_HatchStyle_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::HatchStyle
 /** The <type>HatchStyle</type> defines the style of the lines in a hatch.
  */
 published enum HatchStyle
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::HatchStyle::SINGLE
     /** the hatch consists of a single horizontal line
      */
-    SINGLE,
-
-    //-------------------------------------------------------------------------
-
+    SINGLE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::HatchStyle::DOUBLE
     /** the hatch has a horizontal and a vertical line
      */
-    DOUBLE,
-
-    //-------------------------------------------------------------------------
-
+    DOUBLE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::HatchStyle::TRIPLE
     /** the hatch has a horizontal, a vertical and a diagonal line
      */
-    TRIPLE
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    TRIPLE 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/HatchTable.idl b/offapi/com/sun/star/drawing/HatchTable.idl
index c96a474fb596..aa61bea9ba0a 100644
--- a/offapi/com/sun/star/drawing/HatchTable.idl
+++ b/offapi/com/sun/star/drawing/HatchTable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_HatchTable_idl__
-#define __com_sun_star_drawing_HatchTable_idl__
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
+#ifndef __com_sun_star_drawing_HatchTable_idl__ 
+#define __com_sun_star_drawing_HatchTable_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#include <com/sun/star/container/XNameContainer.idl> 
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
 
 /** this is a container for <type>Hatch</type>s
 
     <p>It is used for example to access the <type>Hatch</type>s that
-    are used inside a document.
+    are used inside a document. 
 
     @see DrawingDocumentFactory
     @see Hatch
@@ -56,9 +56,9 @@ published service HatchTable
     interface com::sun::star::container::XNameContainer;
 };
 
-//=============================================================================
-
-}; }; }; };
-
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix.idl b/offapi/com/sun/star/drawing/HomogenMatrix.idl
index fabfddc7875d..3cc96af4073f 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_HomogenMatrix_idl__
-#define __com_sun_star_drawing_HomogenMatrix_idl__
-
-#ifndef __com_sun_star_drawing_HomogenMatrixLine_idl__
-#include <com/sun/star/drawing/HomogenMatrixLine.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_HomogenMatrix_idl__ 
+#define __com_sun_star_drawing_HomogenMatrix_idl__ 
+ 
+#ifndef __com_sun_star_drawing_HomogenMatrixLine_idl__ 
+#include <com/sun/star/drawing/HomogenMatrixLine.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::drawing::HomogenMatrix
 /** specifies a homogenous matrix by three homogenous lines
  */
 published struct HomogenMatrix
 {
     // DocMerge: empty anyway
-    com::sun::star::drawing::HomogenMatrixLine Line1;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HomogenMatrix::Line2
-
+    com::sun::star::drawing::HomogenMatrixLine Line1; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HomogenMatrix::Line2 
+    
     // DocMerge: empty anyway
-    com::sun::star::drawing::HomogenMatrixLine Line2;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HomogenMatrix::Line3
-
+    com::sun::star::drawing::HomogenMatrixLine Line2; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HomogenMatrix::Line3 
+    
     // DocMerge: empty anyway
-    com::sun::star::drawing::HomogenMatrixLine Line3;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HomogenMatrix::Line4
-
+    com::sun::star::drawing::HomogenMatrixLine Line3; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HomogenMatrix::Line4 
+    
     // DocMerge: empty anyway
-    com::sun::star::drawing::HomogenMatrixLine Line4;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::drawing::HomogenMatrixLine Line4; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix3.idl b/offapi/com/sun/star/drawing/HomogenMatrix3.idl
index a2dfb7f6f00b..1de545a34a8d 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix3.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix3.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_HomogenMatrix3_idl__
-#define __com_sun_star_drawing_HomogenMatrix3_idl__
-
-#ifndef __com_sun_star_drawing_HomogenMatrixLine3_idl__
-#include <com/sun/star/drawing/HomogenMatrixLine3.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_HomogenMatrix3_idl__ 
+#define __com_sun_star_drawing_HomogenMatrix3_idl__ 
+ 
+#ifndef __com_sun_star_drawing_HomogenMatrixLine3_idl__ 
+#include <com/sun/star/drawing/HomogenMatrixLine3.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::drawing::HomogenMatrix
 /** specifies a homogenous matrix by three homogenous lines
  */
 published struct HomogenMatrix3
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR HomogenMatrix3::Line1
-    com::sun::star::drawing::HomogenMatrixLine3 Line1;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HomogenMatrix3::Line2
-    com::sun::star::drawing::HomogenMatrixLine3 Line2;
-
-    //-------------------------------------------------------------------------
+    com::sun::star::drawing::HomogenMatrixLine3 Line1; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HomogenMatrix3::Line2 
+    com::sun::star::drawing::HomogenMatrixLine3 Line2; 
+ 
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR HomogenMatrix3::Line3
     com::sun::star::drawing::HomogenMatrixLine3 Line3;
- };
-
-//=============================================================================
-
-}; }; }; };
+ }; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
 
-#endif
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix4.idl b/offapi/com/sun/star/drawing/HomogenMatrix4.idl
index 345a6bf3ee1a..df1a2a4c4ce6 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix4.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix4.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_HomogenMatrix4_idl__
-#define __com_sun_star_drawing_HomogenMatrix4_idl__
-
-#ifndef __com_sun_star_drawing_HomogenMatrixLine4_idl__
-#include <com/sun/star/drawing/HomogenMatrixLine4.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_HomogenMatrix4_idl__ 
+#define __com_sun_star_drawing_HomogenMatrix4_idl__ 
+ 
+#ifndef __com_sun_star_drawing_HomogenMatrixLine4_idl__ 
+#include <com/sun/star/drawing/HomogenMatrixLine4.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::drawing::HomogenMatrix
 /** specifies a homogenous matrix by four homogenous lines.
  */
 published struct HomogenMatrix4
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR HomogenMatrix4::Line1
-    com::sun::star::drawing::HomogenMatrixLine4 Line1;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HomogenMatrix4::Line2
-    com::sun::star::drawing::HomogenMatrixLine4 Line2;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HomogenMatrix4::Line3
-    com::sun::star::drawing::HomogenMatrixLine4 Line3;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HomogenMatrix4::Line4
-    com::sun::star::drawing::HomogenMatrixLine4 Line4;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::drawing::HomogenMatrixLine4 Line1; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HomogenMatrix4::Line2 
+    com::sun::star::drawing::HomogenMatrixLine4 Line2; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HomogenMatrix4::Line3 
+    com::sun::star::drawing::HomogenMatrixLine4 Line3; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HomogenMatrix4::Line4 
+    com::sun::star::drawing::HomogenMatrixLine4 Line4; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/HomogenMatrixLine.idl b/offapi/com/sun/star/drawing/HomogenMatrixLine.idl
index 68a2399d951e..f7f2c04bdcf4 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrixLine.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrixLine.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_HomogenMatrixLine_idl__
-#define __com_sun_star_drawing_HomogenMatrixLine_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_HomogenMatrixLine_idl__ 
+#define __com_sun_star_drawing_HomogenMatrixLine_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::drawing::HomogenMatrixLine
 /** specifies a single line for a <type>HomogenMatrix</type>.
  */
 published struct HomogenMatrixLine
 {
     // DocMerge: empty anyway
-    double Column1;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HomogenMatrixLine::Column2
-
+    double Column1; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HomogenMatrixLine::Column2 
+    
     // DocMerge: empty anyway
-    double Column2;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HomogenMatrixLine::Column3
-
+    double Column2; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HomogenMatrixLine::Column3 
+    
     // DocMerge: empty anyway
-    double Column3;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HomogenMatrixLine::Column4
-
+    double Column3; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HomogenMatrixLine::Column4 
+    
     // DocMerge: empty anyway
-    double Column4;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    double Column4; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/HomogenMatrixLine3.idl b/offapi/com/sun/star/drawing/HomogenMatrixLine3.idl
index 9c0e817cbaa9..0be719f43ac3 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrixLine3.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrixLine3.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_HomogenMatrixLine3_idl__
-#define __com_sun_star_drawing_HomogenMatrixLine3_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_HomogenMatrixLine3_idl__ 
+#define __com_sun_star_drawing_HomogenMatrixLine3_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** specifies a single line for a <type>HomogenMatrix3</type>.
  */
 published struct HomogenMatrixLine3
 {
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HomogenMatrixLine3::Column1
-    double Column1;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HomogenMatrixLine3::Column2
-    double Column2;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HomogenMatrixLine3::Column3
-    double Column3;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HomogenMatrixLine3::Column1 
+    double Column1; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HomogenMatrixLine3::Column2 
+    double Column2; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HomogenMatrixLine3::Column3 
+    double Column3; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/HomogenMatrixLine4.idl b/offapi/com/sun/star/drawing/HomogenMatrixLine4.idl
index c84123691d48..5e643956a773 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrixLine4.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrixLine4.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_HomogenMatrixLine4_idl__
-#define __com_sun_star_drawing_HomogenMatrixLine4_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_HomogenMatrixLine4_idl__ 
+#define __com_sun_star_drawing_HomogenMatrixLine4_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** specifies a single line for a <type>HomogenMatrix4</type>.
  */
 published struct HomogenMatrixLine4
 {
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HomogenMatrixLine4::Column1
-    double Column1;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HomogenMatrixLine4::Column2
-    double Column2;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HomogenMatrixLine4::Column3
-    double Column3;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HomogenMatrixLine4::Column4
-    double Column4;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HomogenMatrixLine4::Column1 
+    double Column1; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HomogenMatrixLine4::Column2 
+    double Column2; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HomogenMatrixLine4::Column3 
+    double Column3; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HomogenMatrixLine4::Column4 
+    double Column4;  
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/HorizontalDimensioning.idl b/offapi/com/sun/star/drawing/HorizontalDimensioning.idl
index 32afc18fe99b..4b57e293ace4 100644
--- a/offapi/com/sun/star/drawing/HorizontalDimensioning.idl
+++ b/offapi/com/sun/star/drawing/HorizontalDimensioning.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,56 +24,56 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_HorizontalDimensioning_idl__
-#define __com_sun_star_drawing_HorizontalDimensioning_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_HorizontalDimensioning_idl__ 
+#define __com_sun_star_drawing_HorizontalDimensioning_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::HorizontalDimensioning
 /** The <type>HorizontalDimensioning</type> specifies the horizontal position
-    of the text of a dimensioning shape.
+    of the text	of a dimensioning shape.
  */
 published enum HorizontalDimensioning
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::HorizontalDimensioning::AUTO
     /** Set this to have the application select the best horizontal
         position for the text.
      */
-    AUTO,
-
-    //-------------------------------------------------------------------------
-
+    AUTO, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::HorizontalDimensioning::LEFT
     /** The text is positioned to the left.
      */
-    LEFT,
-
-    //-------------------------------------------------------------------------
-
+    LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::HorizontalDimensioning::CENTERED
     /** The text is positioned at the center.
      */
-    CENTERED,
-
-    //-------------------------------------------------------------------------
-
+    CENTERED, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::HorizontalDimensioning::RIGHT
     /** The text is positioned to the right.
      */
-    RIGHT
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    RIGHT 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/Layer.idl b/offapi/com/sun/star/drawing/Layer.idl
index a8a4476966eb..9aff24a4c34d 100644
--- a/offapi/com/sun/star/drawing/Layer.idl
+++ b/offapi/com/sun/star/drawing/Layer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,83 +24,83 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_Layer_idl__
-#define __com_sun_star_drawing_Layer_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_Layer_idl__ 
+#define __com_sun_star_drawing_Layer_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::drawing::Layer
-/** A layer is an entity inside a document which contains shapes.
-
-
+/** A layer is an entity inside a document which contains shapes. 
+    
+    
     <p>There could be zero or more <type>Shape</type>s attached to
     such a layer.
-
+    
     </p>
     <p>The properties of a <type>Layer</type> instance affect all <type>Shape</type>s
     attached to the Layer.
-
+    
     </p>
 
-    @see    DrawingDocument
+    @see	DrawingDocument 
     @see LayerManager
  */
 published service Layer
-{
-
-
+{ 
+ 
+     
     // DocMerge from xml: service com::sun::star::drawing::Layer: interface com::sun::star::beans::XPropertySet
-    /** The properties in this set affect all <type>Shape</type>s attached to
+    /** The properties in this set affect all <type>Shape</type>s attached to 
                 this Layer.
      */
-    interface com::sun::star::beans::XPropertySet;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::beans::XPropertySet; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::drawing::Layer::Name
-    /** The name of a <type>Layer</type> is used to identify the
+    /** The name of a <type>Layer</type> is used to identify the 
         <type>Layer</type> in the user interface.
      */
-    [property] string Name;
-
-    //-------------------------------------------------------------------------
-
+    [property] string Name; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::drawing::Layer::IsVisible
     /** If a <type>Layer</type> is not visible, the objects in this
         <type>Layer</type> are not shown in the user interface.
      */
-    [property] boolean IsVisible;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean IsVisible; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::drawing::Layer::IsPrintable
     /** If a <type>Layer</type> is not printable, the objects in
         this <type>Layer</type> are not printed.
      */
-    [property] boolean IsPrintable;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean IsPrintable; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::drawing::Layer::IsLocked
     /** If a <type>Layer</type> is locked, the objects in this
         <type>Layer</type> cannot be edited in the user interface.
      */
-    [property] boolean IsLocked;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] boolean IsLocked; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/LayerManager.idl b/offapi/com/sun/star/drawing/LayerManager.idl
index ebcad6a021a8..abf61cd43c6c 100644
--- a/offapi/com/sun/star/drawing/LayerManager.idl
+++ b/offapi/com/sun/star/drawing/LayerManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,57 +24,57 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_LayerManager_idl__
-#define __com_sun_star_drawing_LayerManager_idl__
-
-#ifndef __com_sun_star_drawing_XLayerManager_idl__
-#include <com/sun/star/drawing/XLayerManager.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_LayerManager_idl__ 
+#define __com_sun_star_drawing_LayerManager_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XLayerManager_idl__ 
+#include <com/sun/star/drawing/XLayerManager.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::drawing::LayerManager
 /** This service is provided by documents to support <type>Layer</type>s.
 
     @see DrawingDocument
  */
 published service LayerManager
-{
-
-
+{ 
+ 
+     
     // DocMerge from xml: service com::sun::star::drawing::LayerManager: interface com::sun::star::drawing::XLayerManager
-    /** gives you access to the existing <type>Layer</type>s by
-                index and makes it possible to add and remove <type>Layer</type>s and
-                to attach <type>Shape</type>s to <type>Layer</type>s.
-
-                <p>The contents of the collection all support <type>Layer</type>
+    /** gives you access to the existing <type>Layer</type>s by 
+                index and makes it possible to add and remove <type>Layer</type>s and 
+                to attach <type>Shape</type>s to <type>Layer</type>s. 
+                 
+                <p>The contents of the collection all support <type>Layer</type> 
                 returned by <type>XLayer</type>.
      */
-    interface com::sun::star::drawing::XLayerManager;
-
-
+    interface com::sun::star::drawing::XLayerManager; 
+ 
+     
     // DocMerge from xml: service com::sun::star::drawing::LayerManager: interface com::sun::star::container::XNameAccess
-    /** gives access to the existing <type>Layer</type>s by name.
-
-                <p>The contents of the collection all support <type>Layer</type>
+    /** gives access to the existing <type>Layer</type>s by name. 
+                 
+                <p>The contents of the collection all support <type>Layer</type> 
                 returned by <type>XLayer</type>.
      */
-    interface com::sun::star::container::XNameAccess;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::container::XNameAccess; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/LayerType.idl b/offapi/com/sun/star/drawing/LayerType.idl
index ee42aa7fc5da..7668ae54e6be 100644
--- a/offapi/com/sun/star/drawing/LayerType.idl
+++ b/offapi/com/sun/star/drawing/LayerType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_LayerType_idl__
-#define __com_sun_star_drawing_LayerType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_LayerType_idl__ 
+#define __com_sun_star_drawing_LayerType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::LayerType
 /** This enumeration specifies the type of a drawing layer.
  */
 published enum LayerType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::LayerType::LAYOUT
     /** This is the layer for all standard shapes.
      */
-    LAYOUT,
-
-    //-------------------------------------------------------------------------
-
+    LAYOUT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::LayerType::CONTROLSA
     /** This is the layer for the controls.
      */
-    CONTROLSA,
-
-    //-------------------------------------------------------------------------
-
+    CONTROLSA, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::LayerType::DIMENSIONIANG_LINES
     /** This is the layer for all measure shapes.
      */
-    DIMENSIONIANG_LINES,
-
-    //-------------------------------------------------------------------------
-
+    DIMENSIONIANG_LINES, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::LayerType::USER_DEFINED
     /** There can be zero or more layers of this type.
      */
-    USER_DEFINED
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    USER_DEFINED 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/LineDash.idl b/offapi/com/sun/star/drawing/LineDash.idl
index 3ffe6a0576cb..cc7c95f9be82 100644
--- a/offapi/com/sun/star/drawing/LineDash.idl
+++ b/offapi/com/sun/star/drawing/LineDash.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_LineDash_idl__
-#define __com_sun_star_drawing_LineDash_idl__
-
-#ifndef __com_sun_star_drawing_DashStyle_idl__
-#include <com/sun/star/drawing/DashStyle.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_LineDash_idl__ 
+#define __com_sun_star_drawing_LineDash_idl__ 
+ 
+#ifndef __com_sun_star_drawing_DashStyle_idl__ 
+#include <com/sun/star/drawing/DashStyle.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::drawing::LineDash
 /** A <type>LineDash</type> defines a non-continuous line.
  */
@@ -46,49 +46,49 @@ published struct LineDash
     // DocMerge from xml: field com::sun::star::drawing::LineDash::Style
     /** This sets the style of this <type>LineDash</type>.
      */
-    com::sun::star::drawing::DashStyle Style;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::drawing::DashStyle Style; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::drawing::LineDash::Dots
     /** This is the number of dots in this <type>LineDash</type>.
      */
-    short Dots;
-
-    //-------------------------------------------------------------------------
-
+    short Dots; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::drawing::LineDash::DotLen
     /** This is the length of a dot.
      */
-    long DotLen;
-
-    //-------------------------------------------------------------------------
-
+    long DotLen; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::drawing::LineDash::Dashes
     /** This is the number of dashes.
      */
-    short Dashes;
-
-    //-------------------------------------------------------------------------
-
+    short Dashes; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::drawing::LineDash::DashLen
     /** This is the length of a single dash.
      */
-    long DashLen;
-
-    //-------------------------------------------------------------------------
-
+    long DashLen; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::drawing::LineDash::Distance
     /** This is the distance between the dots.
      */
-    long Distance;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    long Distance; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/LineEndType.idl b/offapi/com/sun/star/drawing/LineEndType.idl
index 76041cbe1d7a..d7f010e59547 100644
--- a/offapi/com/sun/star/drawing/LineEndType.idl
+++ b/offapi/com/sun/star/drawing/LineEndType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_LineEndType_idl__
-#define __com_sun_star_drawing_LineEndType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_LineEndType_idl__ 
+#define __com_sun_star_drawing_LineEndType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::LineEndType
 /** The <type>LineEndType</type> specifies the appearance of the bullet at the
     end of a line.
@@ -41,52 +41,52 @@
     @deprecated
  */
 published enum LineEndType
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR LineEndType::  NONE,
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR LineEndType::	NONE, 
+    
     // DocMerge from xml: value com::sun::star::drawing::LineEndType::NONE
     /** the line has no special end.
      */
-    NONE,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR LineEndType::  ARROW,
-
+    NONE, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR LineEndType::	ARROW, 
+    
     // DocMerge from xml: value com::sun::star::drawing::LineEndType::ARROW
     /** the line uses an arrow for the line end.
      */
-    ARROW,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR LineEndType::  CIRCLE,
-
+    ARROW, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR LineEndType::	CIRCLE, 
+    
     // DocMerge from xml: value com::sun::star::drawing::LineEndType::CIRCLE
     /** the line uses a circle for the line end.
      */
-    CIRCLE,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR LineEndType::  SQUARE,
-
+    CIRCLE, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR LineEndType::	SQUARE, 
+    
     // DocMerge from xml: value com::sun::star::drawing::LineEndType::SQUARE
     /** the line uses a square for the line end.
      */
-    SQUARE,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR LineEndType::  SPECIAL
-
+    SQUARE, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR LineEndType::	SPECIAL 
+    
     // DocMerge from xml: value com::sun::star::drawing::LineEndType::SPECIAL
     /** deprecated
      */
-    SPECIAL
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    SPECIAL 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/LineJoint.idl b/offapi/com/sun/star/drawing/LineJoint.idl
index bc1620414736..e2344acba1c3 100644
--- a/offapi/com/sun/star/drawing/LineJoint.idl
+++ b/offapi/com/sun/star/drawing/LineJoint.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_LineJoint_idl__
-#define __com_sun_star_drawing_LineJoint_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_LineJoint_idl__ 
+#define __com_sun_star_drawing_LineJoint_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::LineJoint
 /** The <type>LineJoint</type> defines rendering of joints between thick lines
  */
 published enum LineJoint
-{
-
+{ 
+     
     // DocMerge from xml: value com::sun::star::drawing::LineJoint::NONE
     /** the joint between lines will not be connected
      */
-    NONE,
-
+    NONE, 
+     
     // DocMerge from xml: value com::sun::star::drawing::LineJoint::MIDDLE
     /** the middle value between the joints is used
      */
-    MIDDLE,
-
+    MIDDLE, 
+     
     // DocMerge from xml: value com::sun::star::drawing::LineJoint::BEVEL
     /** the edges of the thick lines will be joined by lines
      */
-    BEVEL,
-
+    BEVEL, 
+     
     // DocMerge from xml: value com::sun::star::drawing::LineJoint::MITER
     /** the lines join at intersections
      */
-    MITER,
-
+    MITER, 
+     
     // DocMerge from xml: value com::sun::star::drawing::LineJoint::ROUND
     /** the lines join with an arc
      */
-    ROUND
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    ROUND 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/LineProperties.idl b/offapi/com/sun/star/drawing/LineProperties.idl
index 87455cf45c3e..97e086cd232e 100644
--- a/offapi/com/sun/star/drawing/LineProperties.idl
+++ b/offapi/com/sun/star/drawing/LineProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/LineShape.idl b/offapi/com/sun/star/drawing/LineShape.idl
index 8a98f94a6056..a2b3b8bf9c24 100644
--- a/offapi/com/sun/star/drawing/LineShape.idl
+++ b/offapi/com/sun/star/drawing/LineShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,59 +24,59 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_LineShape_idl__
-#define __com_sun_star_drawing_LineShape_idl__
-
-#ifndef __com_sun_star_drawing_Shape_idl__
-#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
-#include <com/sun/star/drawing/PolyPolygonDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Text_idl__
-#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
-#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
-#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_LineShape_idl__ 
+#define __com_sun_star_drawing_LineShape_idl__ 
+ 
+#ifndef __com_sun_star_drawing_Shape_idl__ 
+#include <com/sun/star/drawing/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_LineProperties_idl__ 
+#include <com/sun/star/drawing/LineProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__ 
+#include <com/sun/star/drawing/PolyPolygonDescriptor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_Text_idl__ 
+#include <com/sun/star/drawing/Text.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
+#include <com/sun/star/drawing/ShadowProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
+#include <com/sun/star/drawing/RotationDescriptor.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This service is for a simple <type>Shape</type> with lines.
  */
 published service LineShape
-{
+{ 
     service com::sun::star::drawing::Shape;
-
-    service com::sun::star::drawing::LineProperties;
-
-    service com::sun::star::drawing::PolyPolygonDescriptor;
-
+    
+    service com::sun::star::drawing::LineProperties; 
+    
+    service com::sun::star::drawing::PolyPolygonDescriptor; 
+    
     service com::sun::star::drawing::Text;
-
-    service com::sun::star::drawing::ShadowProperties;
-
-    service com::sun::star::drawing::RotationDescriptor;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+    service com::sun::star::drawing::ShadowProperties; 
+    
+    service com::sun::star::drawing::RotationDescriptor; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/LineStyle.idl b/offapi/com/sun/star/drawing/LineStyle.idl
index ed2a28b4ced5..77634fbfb8be 100644
--- a/offapi/com/sun/star/drawing/LineStyle.idl
+++ b/offapi/com/sun/star/drawing/LineStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_LineStyle_idl__
-#define __com_sun_star_drawing_LineStyle_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_LineStyle_idl__ 
+#define __com_sun_star_drawing_LineStyle_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::LineStyle
 /** specifies the appearance of the lines of a
     shape.
  */
 published enum LineStyle
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR LineStyle::    NONE,
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR LineStyle::	NONE, 
+    
     // DocMerge from xml: value com::sun::star::drawing::LineStyle::NONE
     /** the line is hidden.
      */
-    NONE,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR LineStyle::    SOLID,
-
+    NONE, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR LineStyle::	SOLID, 
+    
     // DocMerge from xml: value com::sun::star::drawing::LineStyle::SOLID
     /** the line is solid.
      */
-    SOLID,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR LineStyle::    DASH
-
+    SOLID, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR LineStyle::	DASH 
+    
     // DocMerge from xml: value com::sun::star::drawing::LineStyle::DASH
     /** the line use dashes.
      */
-    DASH
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    DASH 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/MarkerTable.idl b/offapi/com/sun/star/drawing/MarkerTable.idl
index 0303c5573616..fc677d13609c 100644
--- a/offapi/com/sun/star/drawing/MarkerTable.idl
+++ b/offapi/com/sun/star/drawing/MarkerTable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_MarkerTable_idl__
-#define __com_sun_star_drawing_MarkerTable_idl__
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
+#ifndef __com_sun_star_drawing_MarkerTable_idl__ 
+#define __com_sun_star_drawing_MarkerTable_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#include <com/sun/star/container/XNameContainer.idl> 
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
 
 /** this is a container for <type>PointSequence</type>s
 
     <p>It is used for example to access the line ends that
-    are used inside a document.
+    are used inside a document. 
 
     @see DrawingDocumentFactory
     @see PointSequence
@@ -56,9 +56,9 @@ published service MarkerTable
     interface com::sun::star::container::XNameContainer;
 };
 
-//=============================================================================
-
-}; }; }; };
-
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/MasterPage.idl b/offapi/com/sun/star/drawing/MasterPage.idl
index a56fc6d219c4..a0330bf3c5a7 100644
--- a/offapi/com/sun/star/drawing/MasterPage.idl
+++ b/offapi/com/sun/star/drawing/MasterPage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,25 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_MasterPage_idl__
-#define __com_sun_star_drawing_MasterPage_idl__
-
-#ifndef __com_sun_star_drawing_GenericDrawPage_idl__
-#include <com/sun/star/drawing/GenericDrawPage.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_MasterPage_idl__ 
+#define __com_sun_star_drawing_MasterPage_idl__ 
+ 
+#ifndef __com_sun_star_drawing_GenericDrawPage_idl__ 
+#include <com/sun/star/drawing/GenericDrawPage.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::drawing::MasterPage
-/** This service is a single master page inside a drawing document.
-
-
-    <p>It serves as a background page for zero or more <type>DrawPage</type>s.
+/** This service is a single master page inside a drawing document. 
+    
+    
+    <p>It serves as a background page for zero or more <type>DrawPage</type>s. 
     Since this service is derived from the service <type>GenericDrawPage</type>,
     it can be used as a draw page with three differences:
     </p>
@@ -58,20 +58,20 @@
     </ol>
  */
 published service MasterPage
-{
-
-
+{ 
+ 
+     
     // DocMerge from xml: service com::sun::star::drawing::MasterPage: service com::sun::star::drawing::GenericDrawPage
-    /** This service describes the base functionality that every
+    /** This service describes the base functionality that every 
                 draw/master page has.
      */
-    service com::sun::star::drawing::GenericDrawPage;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    service com::sun::star::drawing::GenericDrawPage; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/MasterPages.idl b/offapi/com/sun/star/drawing/MasterPages.idl
index 6c7ab4c8b9ce..b316989e5417 100644
--- a/offapi/com/sun/star/drawing/MasterPages.idl
+++ b/offapi/com/sun/star/drawing/MasterPages.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_MasterPages_idl__
-#define __com_sun_star_drawing_MasterPages_idl__
-
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
-#include <com/sun/star/drawing/XDrawPages.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_MasterPages_idl__ 
+#define __com_sun_star_drawing_MasterPages_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XDrawPages_idl__ 
+#include <com/sun/star/drawing/XDrawPages.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** provides access to a container of <type>MasterPage</type>s
     and makes it possible for them to be manipulated.
-
+    
     @see XMasterPagesSupplier
     @see DrawingDocument
  */
 published service MasterPages
-{
+{ 
     /** lets you access and create <type>MasterPage</type>s
      */
-    interface com::sun::star::drawing::XDrawPages;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::drawing::XDrawPages; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/MeasureKind.idl b/offapi/com/sun/star/drawing/MeasureKind.idl
index baed2d178898..7a4541493bf8 100644
--- a/offapi/com/sun/star/drawing/MeasureKind.idl
+++ b/offapi/com/sun/star/drawing/MeasureKind.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_MeasureKind_idl__
-#define __com_sun_star_drawing_MeasureKind_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_MeasureKind_idl__ 
+#define __com_sun_star_drawing_MeasureKind_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::MeasureKind
 /** determines whether a measured shape is a standard
     measure or a radius measure.
-
+    
     @deprecated
  */
 published enum MeasureKind
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR MeasureKind::  STANDARD,
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR MeasureKind::	STANDARD, 
+    
     // DocMerge from xml: value com::sun::star::drawing::MeasureKind::STANDARD
     /** use the length measurement.
      */
-    STANDARD,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR MeasureKind::  RADIUS
-
+    STANDARD, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR MeasureKind::	RADIUS 
+    
     // DocMerge from xml: value com::sun::star::drawing::MeasureKind::RADIUS
     /** use the radius measurement.
         This option cannot be used from the GUI Interface.
      */
-    RADIUS
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    RADIUS 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/MeasureProperties.idl b/offapi/com/sun/star/drawing/MeasureProperties.idl
index ab02f5605e91..e73b01caeaca 100644
--- a/offapi/com/sun/star/drawing/MeasureProperties.idl
+++ b/offapi/com/sun/star/drawing/MeasureProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,131 +24,131 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_MeasureProperties_idl__
-#define __com_sun_star_drawing_MeasureProperties_idl__
-
-#ifndef __com_sun_star_drawing_MeasureKind_idl__
-#include <com/sun/star/drawing/MeasureKind.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_MeasureTextHorzPos_idl__
-#include <com/sun/star/drawing/MeasureTextHorzPos.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_MeasureTextVertPos_idl__
-#include <com/sun/star/drawing/MeasureTextVertPos.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_MeasureProperties_idl__ 
+#define __com_sun_star_drawing_MeasureProperties_idl__ 
+ 
+#ifndef __com_sun_star_drawing_MeasureKind_idl__ 
+#include <com/sun/star/drawing/MeasureKind.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_MeasureTextHorzPos_idl__ 
+#include <com/sun/star/drawing/MeasureTextHorzPos.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_MeasureTextVertPos_idl__ 
+#include <com/sun/star/drawing/MeasureTextVertPos.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This service describes a <type>MeasureShape</type>.
  */
 published service MeasureProperties
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** If this property is <TRUE/>, the measure is drawn below the
         reference edge instead of above it.
      */
-    [property] boolean MeasureBelowReferenceEdge;
-
-    //-------------------------------------------------------------------------
+    [property] boolean MeasureBelowReferenceEdge; 
+ 
+    //------------------------------------------------------------------------- 
     /** This is the length of the first help line.
      */
-    [property] long MeasureHelpLine1Length;
-
-    //-------------------------------------------------------------------------
+    [property] long MeasureHelpLine1Length; 
+ 
+    //------------------------------------------------------------------------- 
     /** This is the length of the second help line.
      */
-    [property] long MeasureHelpLine2Length;
-
-    //-------------------------------------------------------------------------
+    [property] long MeasureHelpLine2Length; 
+ 
+    //------------------------------------------------------------------------- 
     /** This is the distance from the measure line to the start of the
         help lines.
      */
-    [property] long MeasureHelpLineDistance;
-
-    //-------------------------------------------------------------------------
+    [property] long MeasureHelpLineDistance; 
+ 
+    //------------------------------------------------------------------------- 
     /** This is the overhang of the two help lines.
      */
-    [property] long MeasureHelpLineOverhang;
-
-    //-------------------------------------------------------------------------
+    [property] long MeasureHelpLineOverhang; 
+ 
+    //------------------------------------------------------------------------- 
     /** This enumeration specifies the <type>MeasureKind</type>.
      */
-    [property] com::sun::star::drawing::MeasureKind MeasureKind;
-
-    //-------------------------------------------------------------------------
+    [property] com::sun::star::drawing::MeasureKind MeasureKind; 
+ 
+    //------------------------------------------------------------------------- 
     /** This is the distance from the reference edge to the measure line.
      */
-    [property] long MeasureLineDistance;
-
-    //-------------------------------------------------------------------------
+    [property] long MeasureLineDistance; 
+ 
+    //------------------------------------------------------------------------- 
     /** This is the overhang of the reference line over the help lines.
      */
-    [property] long MeasureOverhang;
-
-    //-------------------------------------------------------------------------
+    [property] long MeasureOverhang; 
+ 
+    //------------------------------------------------------------------------- 
     /** If this is <TRUE/>, the unit of measure is shown in the measure text.
      */
-    [property] boolean MeasureShowUnit;
-
-    //-------------------------------------------------------------------------
+    [property] boolean MeasureShowUnit; 
+ 
+    //------------------------------------------------------------------------- 
     /** If this is <TRUE/>, the angle of the measure is set automatically.
      */
-    [property] boolean MeasureTextAutoAngle;
-
-    //-------------------------------------------------------------------------
+    [property] boolean MeasureTextAutoAngle; 
+ 
+    //------------------------------------------------------------------------- 
     /** This is the automatic angle.
      */
-    [property] long MeasureTextAutoAngleView;
-
-    //-------------------------------------------------------------------------
+    [property] long MeasureTextAutoAngleView; 
+ 
+    //------------------------------------------------------------------------- 
     /** This is the fixed angle.
      */
-    [property] long MeasureTextFixedAngle;
-
-    //-------------------------------------------------------------------------
+    [property] long MeasureTextFixedAngle; 
+ 
+    //------------------------------------------------------------------------- 
     /** This is the horizontal position of the measure text.
      */
-    [property] com::sun::star::drawing::MeasureTextHorzPos MeasureTextHorizontalPosition;
-
-    //-------------------------------------------------------------------------
+    [property] com::sun::star::drawing::MeasureTextHorzPos MeasureTextHorizontalPosition; 
+ 
+    //------------------------------------------------------------------------- 
     /** This is the vertical position of the text.
      */
-    [property] com::sun::star::drawing::MeasureTextVertPos MeasureTextVerticalPosition;
+    [property] com::sun::star::drawing::MeasureTextVertPos MeasureTextVerticalPosition;  
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** If this value is <TRUE/>, the measure has a fixed angle.
      */
-    [property] boolean MeasureTextIsFixedAngle;
-
-    //-------------------------------------------------------------------------
+    [property] boolean MeasureTextIsFixedAngle; 
+ 
+    //------------------------------------------------------------------------- 
     /** If this value is <TRUE/>, the text is rotated 90 degrees.
      */
-    [property] boolean MeasureTextRotate90;
-
-    //-------------------------------------------------------------------------
+    [property] boolean MeasureTextRotate90; 
+ 
+    //------------------------------------------------------------------------- 
     /** If this value is <TRUE/>, the text is printed upside down.
      */
-    [property] boolean MeasureTextUpsideDown;
+    [property] boolean MeasureTextUpsideDown; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** This value is the number of decimal places that is used to format the
         measure value.
 
         @since OOo 1.1.2
      */
-    [optional, property] short MeasureDecimalPlaces;
- };
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [optional, property] short MeasureDecimalPlaces; 
+ }; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/MeasureShape.idl b/offapi/com/sun/star/drawing/MeasureShape.idl
index 7422b2d51d79..ddb309274971 100644
--- a/offapi/com/sun/star/drawing/MeasureShape.idl
+++ b/offapi/com/sun/star/drawing/MeasureShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,71 +24,71 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_MeasureShape_idl__
-#define __com_sun_star_drawing_MeasureShape_idl__
-
-#ifndef __com_sun_star_drawing_Shape_idl__
-#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_MeasureProperties_idl__
-#include <com/sun/star/drawing/MeasureProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Text_idl__
-#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
-#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
-#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
-#include <com/sun/star/awt/Point.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_MeasureShape_idl__ 
+#define __com_sun_star_drawing_MeasureShape_idl__ 
+ 
+#ifndef __com_sun_star_drawing_Shape_idl__ 
+#include <com/sun/star/drawing/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_MeasureProperties_idl__ 
+#include <com/sun/star/drawing/MeasureProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_Text_idl__ 
+#include <com/sun/star/drawing/Text.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
+#include <com/sun/star/drawing/ShadowProperties.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_LineProperties_idl__ 
+#include <com/sun/star/drawing/LineProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
+#include <com/sun/star/drawing/RotationDescriptor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Point_idl__ 
+#include <com/sun/star/awt/Point.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This service is for a dimensioning shape.
  */
 published service MeasureShape
-{
-    service com::sun::star::drawing::Shape;
+{ 
+    service com::sun::star::drawing::Shape; 
 
     service com::sun::star::drawing::MeasureProperties;
 
-    service com::sun::star::drawing::LineProperties;
-
-    service com::sun::star::drawing::Text;
-
-    service com::sun::star::drawing::ShadowProperties;
-
-    service com::sun::star::drawing::RotationDescriptor;
+    service com::sun::star::drawing::LineProperties; 
+    
+    service com::sun::star::drawing::Text; 
+    
+    service com::sun::star::drawing::ShadowProperties; 
+    
+    service com::sun::star::drawing::RotationDescriptor; 
 
     /** this point is the start of the measured distance */
     [property] com::sun::star::awt::Point StartPosition;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** this point is the end of the measured distance */
     [property] com::sun::star::awt::Point EndPosition;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/MeasureTextHorzPos.idl b/offapi/com/sun/star/drawing/MeasureTextHorzPos.idl
index 9a24a2583ea5..29399f6e3c04 100644
--- a/offapi/com/sun/star/drawing/MeasureTextHorzPos.idl
+++ b/offapi/com/sun/star/drawing/MeasureTextHorzPos.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,52 +24,52 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_MeasureTextHorzPos_idl__
-#define __com_sun_star_drawing_MeasureTextHorzPos_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_MeasureTextHorzPos_idl__ 
+#define __com_sun_star_drawing_MeasureTextHorzPos_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::MeasureTextHorzPos
 /** This enumeration defines the relative horizontal placement of the text
     inside a measure shape.
  */
 published enum MeasureTextHorzPos
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR MeasureTextHorzPos::   AUTO,
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR MeasureTextHorzPos::	AUTO, 
+    
     // DocMerge: empty anyway
-    AUTO,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR MeasureTextHorzPos::   LEFTOUTSIDE,
-
+    AUTO, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR MeasureTextHorzPos::	LEFTOUTSIDE, 
+    
     // DocMerge: empty anyway
-    LEFTOUTSIDE,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR MeasureTextHorzPos::   INSIDE,
-
+    LEFTOUTSIDE, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR MeasureTextHorzPos::	INSIDE, 
+    
     // DocMerge: empty anyway
-    INSIDE,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR MeasureTextHorzPos::   RIGHTOUTSIDE
-
+    INSIDE, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR MeasureTextHorzPos::	RIGHTOUTSIDE 
+    
     // DocMerge: empty anyway
-    RIGHTOUTSIDE
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    RIGHTOUTSIDE 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/MeasureTextVertPos.idl b/offapi/com/sun/star/drawing/MeasureTextVertPos.idl
index d1b61991292f..867a432cc6d0 100644
--- a/offapi/com/sun/star/drawing/MeasureTextVertPos.idl
+++ b/offapi/com/sun/star/drawing/MeasureTextVertPos.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,57 +24,57 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_MeasureTextVertPos_idl__
-#define __com_sun_star_drawing_MeasureTextVertPos_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_MeasureTextVertPos_idl__ 
+#define __com_sun_star_drawing_MeasureTextVertPos_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::MeasureTextVertPos
 /** This enumeration defines the relative vertical placement of the text
     inside a measure shape.
  */
 published enum MeasureTextVertPos
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR MeasureTextVertPos::   AUTO,
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR MeasureTextVertPos::	AUTO, 
+    
     // DocMerge: empty anyway
-    AUTO,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR MeasureTextVertPos::   EAST,
-
+    AUTO, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR MeasureTextVertPos::	EAST, 
+    
     // DocMerge: empty anyway
-    EAST,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR MeasureTextVertPos::   BREAKEDLINE,
-
+    EAST, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR MeasureTextVertPos::	BREAKEDLINE, 
+    
     // DocMerge: empty anyway
-    BREAKEDLINE,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR MeasureTextVertPos::   WEST,
-
+    BREAKEDLINE, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR MeasureTextVertPos::	WEST, 
+    
     // DocMerge: empty anyway
-    WEST,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR MeasureTextVertPos::   CENTERED
-
+    WEST, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR MeasureTextVertPos::	CENTERED 
+    
     // DocMerge: empty anyway
-    CENTERED
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    CENTERED 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/MirrorAxis.idl b/offapi/com/sun/star/drawing/MirrorAxis.idl
index 4324a37c3f2b..3eb82d927f9b 100644
--- a/offapi/com/sun/star/drawing/MirrorAxis.idl
+++ b/offapi/com/sun/star/drawing/MirrorAxis.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_MirrorAxis_idl__
-#define __com_sun_star_drawing_MirrorAxis_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_MirrorAxis_idl__ 
+#define __com_sun_star_drawing_MirrorAxis_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::MirrorAxis
 /** defines an axis for simple mirroring.
  */
 published enum MirrorAxis
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::MirrorAxis::VERTICAL
     /** mirror to the vertical axis
      */
-    VERTICAL,
-
-    //-------------------------------------------------------------------------
-
+    VERTICAL, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::MirrorAxis::HORIZONTAL
     /** mirror to the horizontal axis
      */
-    HORIZONTAL
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    HORIZONTAL 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/NormalsKind.idl b/offapi/com/sun/star/drawing/NormalsKind.idl
index b9bb5f9cb056..0819a3c812a1 100644
--- a/offapi/com/sun/star/drawing/NormalsKind.idl
+++ b/offapi/com/sun/star/drawing/NormalsKind.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_NormalsKind_idl__
-#define __com_sun_star_drawing_NormalsKind_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_NormalsKind_idl__ 
+#define __com_sun_star_drawing_NormalsKind_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::NormalsKind
 /** specifies in which way the standard normals
     for an object are produced.
  */
 published enum NormalsKind
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::NormalsKind::SPECIFIC
     /** does not produce standard normals, but leaves
         the object-specific ones untouched.
      */
-    SPECIFIC,
-
-    //-------------------------------------------------------------------------
-
+    SPECIFIC, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::NormalsKind::FLAT
     /** forces one normal per flat part.
      */
-    FLAT,
-
-    //-------------------------------------------------------------------------
-
+    FLAT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::NormalsKind::SPHERE
     /** forces normals to think that the object is a
         sphere.
      */
-    SPHERE
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    SPHERE 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/OLE2Shape.idl b/offapi/com/sun/star/drawing/OLE2Shape.idl
index 52eb671bdceb..38ad28a796da 100644
--- a/offapi/com/sun/star/drawing/OLE2Shape.idl
+++ b/offapi/com/sun/star/drawing/OLE2Shape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module drawing {
+module com { module sun { module star { module drawing { 
 
 //=============================================================================
 /** This service is for an ole shape.
@@ -50,7 +50,7 @@ published service OLE2Shape
 {
     service com::sun::star::drawing::Shape;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** If you get this property you get the CLSID of the OLE2 document stream
         contained in this OLE2 shape. If you set it, an empty OLE2 document stream
@@ -58,24 +58,24 @@ published service OLE2Shape
     */
     [property] string CLSID;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** this is the internal storage name that keeps this OLE2 persist.
     */
     [property] string PersistName;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** This is the model for the OLE2 inside this shape.
         <p>This property returns an empty reference if the ole2 is not an
         Office component.
-
+    
     */
     [readonly, property] com::sun::star::frame::XModel Model;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /** This property returns <TRUE/> for all OLE2 that are internal
+    /** This property returns <TRUE/> for all OLE2 that are internal 
         Office components.
     */
     [readonly, property] boolean IsInternal;
@@ -83,7 +83,7 @@ published service OLE2Shape
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/drawing/OpenBezierShape.idl b/offapi/com/sun/star/drawing/OpenBezierShape.idl
index d515efe70a43..6af64c0ae750 100644
--- a/offapi/com/sun/star/drawing/OpenBezierShape.idl
+++ b/offapi/com/sun/star/drawing/OpenBezierShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,61 +24,61 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_OpenBezierShape_idl__
-#define __com_sun_star_drawing_OpenBezierShape_idl__
-
-#ifndef __com_sun_star_drawing_Shape_idl__
-#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
-#include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Text_idl__
-#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
-#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
-#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_OpenBezierShape_idl__ 
+#define __com_sun_star_drawing_OpenBezierShape_idl__ 
+ 
+#ifndef __com_sun_star_drawing_Shape_idl__ 
+#include <com/sun/star/drawing/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_LineProperties_idl__ 
+#include <com/sun/star/drawing/LineProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__ 
+#include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_Text_idl__ 
+#include <com/sun/star/drawing/Text.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
+#include <com/sun/star/drawing/ShadowProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
+#include <com/sun/star/drawing/RotationDescriptor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This service is for an open bezier shape.
  */
 published service OpenBezierShape
-{
-    service com::sun::star::drawing::Shape;
-
-    service com::sun::star::drawing::LineProperties;
-
-    service com::sun::star::drawing::PolyPolygonBezierDescriptor;
-
-    service com::sun::star::drawing::Text;
-
-    service com::sun::star::drawing::ShadowProperties;
-
-    service com::sun::star::drawing::RotationDescriptor;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::drawing::Shape; 
+    
+    service com::sun::star::drawing::LineProperties; 
+    
+    service com::sun::star::drawing::PolyPolygonBezierDescriptor; 
+    
+    service com::sun::star::drawing::Text; 
+    
+    service com::sun::star::drawing::ShadowProperties; 
+    
+    service com::sun::star::drawing::RotationDescriptor; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/PageShape.idl b/offapi/com/sun/star/drawing/PageShape.idl
index d3bf315b8ed8..a7867dc43102 100644
--- a/offapi/com/sun/star/drawing/PageShape.idl
+++ b/offapi/com/sun/star/drawing/PageShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_PageShape_idl__
-#define __com_sun_star_drawing_PageShape_idl__
-
-#ifndef __com_sun_star_drawing_Shape_idl__
-#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_PageShape_idl__ 
+#define __com_sun_star_drawing_PageShape_idl__ 
+ 
+#ifndef __com_sun_star_drawing_Shape_idl__ 
+#include <com/sun/star/drawing/Shape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::drawing::PageShape
 /** This service is for a page shape.
     A page shape displays a preview of another page. These shapes
@@ -46,10 +46,10 @@
     the printing position and order of pages
  */
 published service PageShape
-{
+{ 
     // DocMerge: empty anyway
-    service com::sun::star::drawing::Shape;
-
+    service com::sun::star::drawing::Shape; 
+ 
     /** this is the page number that is used for the preview.
         For page shapes on notes pages, this can't be changed.
         For page shapes on handout pages, this value only
@@ -57,11 +57,11 @@ published service PageShape
         shapes on the page.
     */
     [optional, property] long PageNumber;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/PluginShape.idl b/offapi/com/sun/star/drawing/PluginShape.idl
index aaa8b3493c7d..c14cd1a1c786 100644
--- a/offapi/com/sun/star/drawing/PluginShape.idl
+++ b/offapi/com/sun/star/drawing/PluginShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module drawing {
+module com { module sun { module star { module drawing { 
 
 //=============================================================================
 /** This <type>Shape</type> encapsulates a plugin.
@@ -47,26 +47,26 @@ module com { module sun { module star { module drawing {
 */
 published service PluginShape
 {
-    /** basic service for position, size and z-order.
-
+    /** basic service for position, size and z-order. 
+        
         <p>A <type>PluginShape</type> cannot be rotated.
      */
     service com::sun::star::drawing::Shape;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** This property specifies the media-type to which this plugin should
         be registered.
     */
     [property] string PluginMimeType;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** This property specifies the url to the binary object.
     */
     [property] string PluginURL;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** This sequence contains paramaters that are passed to the application
         that renders the plugin when it is initialized.
@@ -76,7 +76,7 @@ published service PluginShape
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/drawing/PointSequence.idl b/offapi/com/sun/star/drawing/PointSequence.idl
index 6d74d8ee3306..37406e9b1fd5 100644
--- a/offapi/com/sun/star/drawing/PointSequence.idl
+++ b/offapi/com/sun/star/drawing/PointSequence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module drawing {
+module com { module sun { module star { module drawing { 
 
 //=============================================================================
 /**
@@ -42,7 +42,7 @@ published typedef sequence<com::sun::star::awt::Point> PointSequence;
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/drawing/PointSequenceSequence.idl b/offapi/com/sun/star/drawing/PointSequenceSequence.idl
index 518751635173..d46345a39ca3 100644
--- a/offapi/com/sun/star/drawing/PointSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/PointSequenceSequence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module drawing {
+module com { module sun { module star { module drawing { 
 
 //=============================================================================
 /**
@@ -42,7 +42,7 @@ published typedef sequence<PointSequence> PointSequenceSequence;
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/drawing/PolyLineShape.idl b/offapi/com/sun/star/drawing/PolyLineShape.idl
index c8ddb5a1e051..d0a1368d3335 100644
--- a/offapi/com/sun/star/drawing/PolyLineShape.idl
+++ b/offapi/com/sun/star/drawing/PolyLineShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,61 +24,61 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_PolyLineShape_idl__
-#define __com_sun_star_drawing_PolyLineShape_idl__
-
-#ifndef __com_sun_star_drawing_Shape_idl__
-#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
-#include <com/sun/star/drawing/PolyPolygonDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Text_idl__
-#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
-#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
-#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_PolyLineShape_idl__ 
+#define __com_sun_star_drawing_PolyLineShape_idl__ 
+ 
+#ifndef __com_sun_star_drawing_Shape_idl__ 
+#include <com/sun/star/drawing/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_LineProperties_idl__ 
+#include <com/sun/star/drawing/LineProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__ 
+#include <com/sun/star/drawing/PolyPolygonDescriptor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_Text_idl__ 
+#include <com/sun/star/drawing/Text.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
+#include <com/sun/star/drawing/ShadowProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
+#include <com/sun/star/drawing/RotationDescriptor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This service is for a polyline shape.
     <p>A polyline has one or more straight lines.</p>
  */
 published service PolyLineShape
-{
-    service com::sun::star::drawing::Shape;
-
-    service com::sun::star::drawing::LineProperties;
-
-    service com::sun::star::drawing::PolyPolygonDescriptor;
-
-    service com::sun::star::drawing::Text;
-
-    service com::sun::star::drawing::ShadowProperties;
-
-    service com::sun::star::drawing::RotationDescriptor;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::drawing::Shape; 
+    
+    service com::sun::star::drawing::LineProperties; 
+    
+    service com::sun::star::drawing::PolyPolygonDescriptor; 
+    
+    service com::sun::star::drawing::Text; 
+    
+    service com::sun::star::drawing::ShadowProperties; 
+    
+    service com::sun::star::drawing::RotationDescriptor;  
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
index bd671c1bbe5a..00225d1a5fe9 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
-#define __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
-
-#ifndef __com_sun_star_drawing_PointSequenceSequence_idl__
-#include <com/sun/star/drawing/PointSequenceSequence.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FlagSequenceSequence_idl__
-#include <com/sun/star/drawing/FlagSequenceSequence.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__ 
+#define __com_sun_star_drawing_PolyPolygonBezierCoords_idl__ 
+ 
+#ifndef __com_sun_star_drawing_PointSequenceSequence_idl__ 
+#include <com/sun/star/drawing/PointSequenceSequence.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_FlagSequenceSequence_idl__ 
+#include <com/sun/star/drawing/FlagSequenceSequence.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::drawing::PolyPolygonBezierCoords
 /** specifies the coordinates for a poly polygon bezier.
  */
 published struct PolyPolygonBezierCoords
 {
     // DocMerge: empty anyway
-    com::sun::star::drawing::PointSequenceSequence Coordinates;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR PolyPolygonBezierCoords::Flags
-
+    com::sun::star::drawing::PointSequenceSequence Coordinates; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR PolyPolygonBezierCoords::Flags 
+    
     // DocMerge: empty anyway
-    com::sun::star::drawing::FlagSequenceSequence Flags;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::drawing::FlagSequenceSequence Flags; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl
index d498c4d2d4f8..5dfafb02f052 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,52 +24,52 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
-#define __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
-
-#ifndef __com_sun_star_drawing_PolygonKind_idl__
-#include <com/sun/star/drawing/PolygonKind.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
-#include <com/sun/star/drawing/PolyPolygonBezierCoords.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__ 
+#define __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_drawing_PolygonKind_idl__ 
+#include <com/sun/star/drawing/PolygonKind.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__ 
+#include <com/sun/star/drawing/PolyPolygonBezierCoords.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This service describes a polypolygonbezier.
-    <p>A polypolygonbezier consists of multiple bezier polygons combined
+    <p>A polypolygonbezier consists of multiple bezier polygons combined 
     in one.</p>
  */
 published service PolyPolygonBezierDescriptor
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the type of this polygon.
      */
-    [readonly, property] com::sun::star::drawing::PolygonKind PolygonKind;
-
-    //-------------------------------------------------------------------------
-
+    [readonly, property] com::sun::star::drawing::PolygonKind PolygonKind; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** These are the bezier points of this polygon.
      */
-    [property] com::sun::star::drawing::PolyPolygonBezierCoords PolyPolygonBezier;
+    [property] com::sun::star::drawing::PolyPolygonBezierCoords PolyPolygonBezier; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** These are the untransformed bezier coordinates of this polygon.
      */
     [property] com::sun::star::drawing::PolyPolygonBezierCoords Geometry;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
index 3ceabb8f129d..73372eb55bbe 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,67 +24,67 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_PolyPolygonBezierShape_idl__
-#define __com_sun_star_drawing_PolyPolygonBezierShape_idl__
-
-#ifndef __com_sun_star_drawing_Shape_idl__
-#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
-#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__
-#include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Text_idl__
-#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
-#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
-#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_PolyPolygonBezierShape_idl__ 
+#define __com_sun_star_drawing_PolyPolygonBezierShape_idl__ 
+ 
+#ifndef __com_sun_star_drawing_Shape_idl__ 
+#include <com/sun/star/drawing/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_LineProperties_idl__ 
+#include <com/sun/star/drawing/LineProperties.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_FillProperties_idl__ 
+#include <com/sun/star/drawing/FillProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_PolyPolygonBezierDescriptor_idl__ 
+#include <com/sun/star/drawing/PolyPolygonBezierDescriptor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_Text_idl__ 
+#include <com/sun/star/drawing/Text.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
+#include <com/sun/star/drawing/ShadowProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
+#include <com/sun/star/drawing/RotationDescriptor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::drawing::PolyPolygonBezierShape
 /** This service specifies a polypolygon bezier shape.
  */
 published service PolyPolygonBezierShape
-{
-    service com::sun::star::drawing::Shape;
-
-    service com::sun::star::drawing::LineProperties;
-
-    service com::sun::star::drawing::FillProperties;
-
-    service com::sun::star::drawing::PolyPolygonBezierDescriptor;
-
-    service com::sun::star::drawing::Text;
-
-    service com::sun::star::drawing::ShadowProperties;
-
-    service com::sun::star::drawing::RotationDescriptor;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::drawing::Shape; 
+    
+    service com::sun::star::drawing::LineProperties; 
+
+    service com::sun::star::drawing::FillProperties; 
+    
+    service com::sun::star::drawing::PolyPolygonBezierDescriptor; 
+    
+    service com::sun::star::drawing::Text; 
+    
+    service com::sun::star::drawing::ShadowProperties; 
+    
+    service com::sun::star::drawing::RotationDescriptor;  
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl b/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl
index 3626fb0ae7fd..de3c7eac8ad3 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
-#define __com_sun_star_drawing_PolyPolygonDescriptor_idl__
-
-#ifndef __com_sun_star_drawing_PolygonKind_idl__
-#include <com/sun/star/drawing/PolygonKind.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_PointSequenceSequence_idl__
-#include <com/sun/star/drawing/PointSequenceSequence.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__ 
+#define __com_sun_star_drawing_PolyPolygonDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_drawing_PolygonKind_idl__ 
+#include <com/sun/star/drawing/PolygonKind.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_PointSequenceSequence_idl__ 
+#include <com/sun/star/drawing/PointSequenceSequence.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This service describes a polypolygon.
     <p>A polypolygon consists of multiple polygons combined in one.</p>
  */
 published service PolyPolygonDescriptor
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the type of polygon.
      */
-    [readonly, property] com::sun::star::drawing::PolygonKind PolygonKind;
-
-    //-------------------------------------------------------------------------
-
+    [readonly, property] com::sun::star::drawing::PolygonKind PolygonKind; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** These are the reference points for this polygon.
      */
-    [property] com::sun::star::drawing::PointSequenceSequence PolyPolygon;
-
-    //-------------------------------------------------------------------------
+    [property] com::sun::star::drawing::PointSequenceSequence PolyPolygon; 
 
+    //------------------------------------------------------------------------- 
+ 
     /** These are the untransformed points of this polygon.
      */
     [property] com::sun::star::drawing::PointSequenceSequence Geometry;
 };
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/PolyPolygonShape.idl b/offapi/com/sun/star/drawing/PolyPolygonShape.idl
index a72b00d8f1a8..3a1f1aa3f8d1 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonShape.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,69 +24,69 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_PolyPolygonShape_idl__
-#define __com_sun_star_drawing_PolyPolygonShape_idl__
-
-#ifndef __com_sun_star_drawing_Shape_idl__
-#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
-#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__
-#include <com/sun/star/drawing/PolyPolygonDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Text_idl__
-#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
-#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
-#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_PolyPolygonShape_idl__ 
+#define __com_sun_star_drawing_PolyPolygonShape_idl__ 
+ 
+#ifndef __com_sun_star_drawing_Shape_idl__ 
+#include <com/sun/star/drawing/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_LineProperties_idl__ 
+#include <com/sun/star/drawing/LineProperties.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_FillProperties_idl__ 
+#include <com/sun/star/drawing/FillProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_PolyPolygonDescriptor_idl__ 
+#include <com/sun/star/drawing/PolyPolygonDescriptor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_Text_idl__ 
+#include <com/sun/star/drawing/Text.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
+#include <com/sun/star/drawing/ShadowProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
+#include <com/sun/star/drawing/RotationDescriptor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This service is for a polygon shape.
-    <p>A polypolygon has 2 or more straight lines, with the first and
+    <p>A polypolygon has 2 or more straight lines, with the first and 
     last point connected by a straight line.</p>
  */
 published service PolyPolygonShape
-{
-    service com::sun::star::drawing::Shape;
-
-    service com::sun::star::drawing::LineProperties;
-
-    service com::sun::star::drawing::FillProperties;
-
-    service com::sun::star::drawing::PolyPolygonDescriptor;
-
-    service com::sun::star::drawing::Text;
-
-    service com::sun::star::drawing::ShadowProperties;
-
-    service com::sun::star::drawing::RotationDescriptor;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::drawing::Shape; 
+    
+    service com::sun::star::drawing::LineProperties; 
+
+    service com::sun::star::drawing::FillProperties; 
+    
+    service com::sun::star::drawing::PolyPolygonDescriptor; 
+    
+    service com::sun::star::drawing::Text; 
+    
+    service com::sun::star::drawing::ShadowProperties; 
+    
+    service com::sun::star::drawing::RotationDescriptor; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl b/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
index 721839255774..0a5e2fab46c8 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_PolyPolygonShape3D_idl__
-#define __com_sun_star_drawing_PolyPolygonShape3D_idl__
-
-#ifndef __com_sun_star_drawing_DoubleSequenceSequence_idl__
-#include <com/sun/star/drawing/DoubleSequenceSequence.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_PolyPolygonShape3D_idl__ 
+#define __com_sun_star_drawing_PolyPolygonShape3D_idl__ 
+ 
+#ifndef __com_sun_star_drawing_DoubleSequenceSequence_idl__ 
+#include <com/sun/star/drawing/DoubleSequenceSequence.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::drawing::PolyPolygonShape3D
 /** specifies the coordinates of a 3-dimensional poly polygon.
  */
 published struct PolyPolygonShape3D
 {
     // DocMerge: empty anyway
-    com::sun::star::drawing::DoubleSequenceSequence SequenceX;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR PolyPolygonShape3D::SequenceY
-
+    com::sun::star::drawing::DoubleSequenceSequence SequenceX; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR PolyPolygonShape3D::SequenceY 
+    
     // DocMerge: empty anyway
-    com::sun::star::drawing::DoubleSequenceSequence SequenceY;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR PolyPolygonShape3D::SequenceZ
-
+    com::sun::star::drawing::DoubleSequenceSequence SequenceY; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR PolyPolygonShape3D::SequenceZ 
+    
     // DocMerge: empty anyway
-    com::sun::star::drawing::DoubleSequenceSequence SequenceZ;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::drawing::DoubleSequenceSequence SequenceZ; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/PolygonFlags.idl b/offapi/com/sun/star/drawing/PolygonFlags.idl
index 2bb6d565398f..4e7dc9059d8e 100644
--- a/offapi/com/sun/star/drawing/PolygonFlags.idl
+++ b/offapi/com/sun/star/drawing/PolygonFlags.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,58 +24,58 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_PolygonFlags_idl__
-#define __com_sun_star_drawing_PolygonFlags_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_PolygonFlags_idl__ 
+#define __com_sun_star_drawing_PolygonFlags_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::PolygonFlags
 /** defines how a bezier curve goes through a point.
  */
 published enum PolygonFlags
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR PolygonFlags:: NORMAL,
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR PolygonFlags::	NORMAL, 
+    
     // DocMerge from xml: value com::sun::star::drawing::PolygonFlags::NORMAL
     /** the point is normal, from the curve discussion view.
      */
-    NORMAL,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR PolygonFlags:: SMOOTH,
-
+    NORMAL, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR PolygonFlags::	SMOOTH, 
+    
     // DocMerge from xml: value com::sun::star::drawing::PolygonFlags::SMOOTH
     /** the point is smooth, the first derivation from the curve discussion view.
      */
-    SMOOTH,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR PolygonFlags:: CONTROL,
-
+    SMOOTH, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR PolygonFlags::	CONTROL, 
+    
     // DocMerge from xml: value com::sun::star::drawing::PolygonFlags::CONTROL
     /** the point is a control point, to control the curve from the user interface.
      */
-    CONTROL,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR PolygonFlags:: SYMMETRIC
-
+    CONTROL, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR PolygonFlags::	SYMMETRIC 
+    
     // DocMerge from xml: value com::sun::star::drawing::PolygonFlags::SYMMETRIC
     /** the point is symmetric, the second derivation from the curve discussion view.
      */
-    SYMMETRIC
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    SYMMETRIC 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/PolygonKind.idl b/offapi/com/sun/star/drawing/PolygonKind.idl
index a260401f697d..c4e482120991 100644
--- a/offapi/com/sun/star/drawing/PolygonKind.idl
+++ b/offapi/com/sun/star/drawing/PolygonKind.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,89 +24,89 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_PolygonKind_idl__
-#define __com_sun_star_drawing_PolygonKind_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_PolygonKind_idl__ 
+#define __com_sun_star_drawing_PolygonKind_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::PolygonKind
 /** This enumeration defines the type of polygon.
  */
 published enum PolygonKind
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::PolygonKind::LINE
     /** This is the PolygonKind for a LineShape.
      */
-    LINE,
-
-    //-------------------------------------------------------------------------
-
+    LINE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::PolygonKind::POLY
     /** This is the PolygonKind for a PolyPolygonShape.
      */
-    POLY,
-
-    //-------------------------------------------------------------------------
-
+    POLY, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::PolygonKind::PLIN
     /** This is the PolygonKind for a PolyLineShape.
      */
-    PLIN,
-
-    //-------------------------------------------------------------------------
-
+    PLIN, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::PolygonKind::PATHLINE
     /** This is the PolygonKind for an OpenBezierShape.
      */
-    PATHLINE,
-
-    //-------------------------------------------------------------------------
-
+    PATHLINE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::PolygonKind::PATHFILL
     /** This is the PolygonKind for a ClosedBezierShape.
      */
-    PATHFILL,
-
-    //-------------------------------------------------------------------------
-
+    PATHFILL, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::PolygonKind::FREELINE
     /** This is the PolygonKind for an OpenFreeHandShape.
      */
-    FREELINE,
-
-    //-------------------------------------------------------------------------
-
+    FREELINE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::PolygonKind::FREEFILL
     /** This is the PolygonKind for a ClosedFreeHandShape.
      */
-    FREEFILL,
-
-    //-------------------------------------------------------------------------
-
+    FREEFILL, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::PolygonKind::PATHPOLY
     /** This is the PolygonKind for a PolyPolygonPathShape.
      */
-    PATHPOLY,
-
-    //-------------------------------------------------------------------------
-
+    PATHPOLY, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::PolygonKind::PATHPLIN
     /** This is the PolygonKind for a PolyLinePathShape.
      */
-    PATHPLIN
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    PATHPLIN 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/Position3D.idl b/offapi/com/sun/star/drawing/Position3D.idl
index 658cca3f4b76..0e763ce49a0e 100644
--- a/offapi/com/sun/star/drawing/Position3D.idl
+++ b/offapi/com/sun/star/drawing/Position3D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_Position3D_idl__
-#define __com_sun_star_drawing_Position3D_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_Position3D_idl__ 
+#define __com_sun_star_drawing_Position3D_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::drawing::Position3D
 /** specifies a 3-dimensional point.
  */
@@ -42,29 +42,29 @@ published struct Position3D
     // DocMerge from xml: field com::sun::star::drawing::Position3D::PositionX
     /** the position on the X-Axis in the 3D room in 100th of millimeters
      */
-    double PositionX;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR Position3D::PositionY
-
+    double PositionX; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR Position3D::PositionY 
+    
     // DocMerge from xml: field com::sun::star::drawing::Position3D::PositionY
     /** the position on the Y-Axis in the 3D room in 100th of millimeters
      */
-    double PositionY;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR Position3D::PositionZ
-
+    double PositionY; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR Position3D::PositionZ 
+    
     // DocMerge from xml: field com::sun::star::drawing::Position3D::PositionZ
     /** the position on the Z-Axis in the 3D room in 100th of millimeters
      */
-    double PositionZ;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    double PositionZ; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/ProjectionMode.idl b/offapi/com/sun/star/drawing/ProjectionMode.idl
index 7af863757daa..e5dd2a19d922 100644
--- a/offapi/com/sun/star/drawing/ProjectionMode.idl
+++ b/offapi/com/sun/star/drawing/ProjectionMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_ProjectionMode_idl__
-#define __com_sun_star_drawing_ProjectionMode_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_ProjectionMode_idl__ 
+#define __com_sun_star_drawing_ProjectionMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::ProjectionMode
 /** defines whether the 3D objects are to be
     drawn in perspective or parallel projection.
  */
 published enum ProjectionMode
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR ProjectionMode::   PARALLEL,
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR ProjectionMode::	PARALLEL, 
+    
     // DocMerge from xml: value com::sun::star::drawing::ProjectionMode::PARALLEL
     /** the 3D objects are drawn in the parallel projection.
      */
-    PARALLEL,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR ProjectionMode::   PERSPECTIVE
-
+    PARALLEL, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR ProjectionMode::	PERSPECTIVE 
+    
     // DocMerge from xml: value com::sun::star::drawing::ProjectionMode::PERSPECTIVE
     /** the 3D objects are drawn in the perspective projection.
      */
-    PERSPECTIVE
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    PERSPECTIVE 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/RectanglePoint.idl b/offapi/com/sun/star/drawing/RectanglePoint.idl
index db1d5ed16f6a..a788d064f030 100644
--- a/offapi/com/sun/star/drawing/RectanglePoint.idl
+++ b/offapi/com/sun/star/drawing/RectanglePoint.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,98 +24,98 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_RectanglePoint_idl__
-#define __com_sun_star_drawing_RectanglePoint_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_RectanglePoint_idl__ 
+#define __com_sun_star_drawing_RectanglePoint_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::RectanglePoint
 /** specifies one of nine points in a rectangle.
  */
 published enum RectanglePoint
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RectanglePoint::   LEFT_TOP,
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RectanglePoint::	LEFT_TOP, 
+    
     // DocMerge from xml: value com::sun::star::drawing::RectanglePoint::LEFT_TOP
     /** specify to the point on the left side from the top of the rectangle.
      */
-    LEFT_TOP,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RectanglePoint::   MIDDLE_TOP,
-
+    LEFT_TOP, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RectanglePoint::	MIDDLE_TOP, 
+    
     // DocMerge from xml: value com::sun::star::drawing::RectanglePoint::MIDDLE_TOP
     /** specify to the point on the middle of the top from the rectangle.
      */
-    MIDDLE_TOP,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RectanglePoint::   RIGHT_TOP,
-
+    MIDDLE_TOP, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RectanglePoint::	RIGHT_TOP, 
+    
     // DocMerge from xml: value com::sun::star::drawing::RectanglePoint::RIGHT_TOP
     /** specify to the point on the right side from the top of the rectangle.
      */
-    RIGHT_TOP,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RectanglePoint::   LEFT_MIDDLE,
-
+    RIGHT_TOP, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RectanglePoint::	LEFT_MIDDLE, 
+    
     // DocMerge from xml: value com::sun::star::drawing::RectanglePoint::LEFT_MIDDLE
     /** specify to the point on the middle of the left side from the rectangle.
      */
-    LEFT_MIDDLE,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RectanglePoint::   MIDDLE_MIDDLE,
-
+    LEFT_MIDDLE, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RectanglePoint::	MIDDLE_MIDDLE, 
+    
     // DocMerge from xml: value com::sun::star::drawing::RectanglePoint::MIDDLE_MIDDLE
     /** specify to the point on the center from the rectangle.
      */
-    MIDDLE_MIDDLE,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RectanglePoint::   RIGHT_MIDDLE,
-
+    MIDDLE_MIDDLE, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RectanglePoint::	RIGHT_MIDDLE, 
+    
     // DocMerge from xml: value com::sun::star::drawing::RectanglePoint::RIGHT_MIDDLE
     /** specify to the point on the middle of the right side from the rectangle.
      */
-    RIGHT_MIDDLE,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RectanglePoint::   LEFT_BOTTOM,
-
+    RIGHT_MIDDLE, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RectanglePoint::	LEFT_BOTTOM, 
+    
     // DocMerge from xml: value com::sun::star::drawing::RectanglePoint::LEFT_BOTTOM
     /** specify to the point on the bottom of the left side from the rectangle.
      */
-    LEFT_BOTTOM,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RectanglePoint::   MIDDLE_BOTTOM,
-
+    LEFT_BOTTOM, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RectanglePoint::	MIDDLE_BOTTOM, 
+    
     // DocMerge from xml: value com::sun::star::drawing::RectanglePoint::MIDDLE_BOTTOM
     /** specify to the point on the middle of the bottom from the rectangle.
      */
-    MIDDLE_BOTTOM,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RectanglePoint::   RIGHT_BOTTOM
-
+    MIDDLE_BOTTOM, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RectanglePoint::	RIGHT_BOTTOM 
+    
     // DocMerge from xml: value com::sun::star::drawing::RectanglePoint::RIGHT_BOTTOM
     /** specify to the point on the bottom of the right side from the rectangle.
      */
-    RIGHT_BOTTOM
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    RIGHT_BOTTOM 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/RectangleShape.idl b/offapi/com/sun/star/drawing/RectangleShape.idl
index 173df05c8c47..3ee1626d0b37 100644
--- a/offapi/com/sun/star/drawing/RectangleShape.idl
+++ b/offapi/com/sun/star/drawing/RectangleShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_RectangleShape_idl__
-#define __com_sun_star_drawing_RectangleShape_idl__
-
-#ifndef __com_sun_star_drawing_Shape_idl__
-#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
-#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Text_idl__
-#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
-#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
-#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_RectangleShape_idl__ 
+#define __com_sun_star_drawing_RectangleShape_idl__ 
+ 
+#ifndef __com_sun_star_drawing_Shape_idl__ 
+#include <com/sun/star/drawing/Shape.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_FillProperties_idl__ 
+#include <com/sun/star/drawing/FillProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_LineProperties_idl__ 
+#include <com/sun/star/drawing/LineProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_Text_idl__ 
+#include <com/sun/star/drawing/Text.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
+#include <com/sun/star/drawing/ShadowProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
+#include <com/sun/star/drawing/RotationDescriptor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This service is for a rectangle <type>Shape</type>.
  */
 published service RectangleShape
-{
+{ 
     service com::sun::star::drawing::Shape;
 
     service com::sun::star::drawing::FillProperties;
@@ -74,17 +74,17 @@ published service RectangleShape
 
     service com::sun::star::drawing::RotationDescriptor;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** For <type>Shape</type>s with rounded corners, this is the radius
         of the corners.
      */
-    [property] long CornerRadius;
- };
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] long CornerRadius; 
+ }; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/RotationDescriptor.idl b/offapi/com/sun/star/drawing/RotationDescriptor.idl
index dd7c1d9c38b7..e84573f44a30 100644
--- a/offapi/com/sun/star/drawing/RotationDescriptor.idl
+++ b/offapi/com/sun/star/drawing/RotationDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
-#define __com_sun_star_drawing_RotationDescriptor_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
+#define __com_sun_star_drawing_RotationDescriptor_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This abstract service specifies the general characteristics of an optional
     rotation and shearing for a <type>Shape</type>.
 
@@ -43,9 +43,9 @@
     @deprecated
  */
 published service RotationDescriptor
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the angle for rotation of this <type>Shape</type>.
         The shape is rotated counter-clockwise around the center
         of the bounding box.
@@ -56,22 +56,22 @@ published service RotationDescriptor
         property of the service <type>Shape</type> instead.
         @deprecated
     */
-    [property] long RotateAngle;
-
-    //-------------------------------------------------------------------------
-
+    [property] long RotateAngle; 
+  
+    //------------------------------------------------------------------------- 
+     
     /** This is the amount of shearing for this <type>Shape</type>.
         The shape is sheared counter-clockwise around the center
         of the bounding box
 
         @deprecated
     */
-    [optional, property] long ShearAngle;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [optional, property] long ShearAngle;  
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/ShadeMode.idl b/offapi/com/sun/star/drawing/ShadeMode.idl
index e91154b6108c..ebd5d49546e7 100644
--- a/offapi/com/sun/star/drawing/ShadeMode.idl
+++ b/offapi/com/sun/star/drawing/ShadeMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,57 +24,57 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_ShadeMode_idl__
-#define __com_sun_star_drawing_ShadeMode_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_ShadeMode_idl__ 
+#define __com_sun_star_drawing_ShadeMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::ShadeMode
 /** The <type>ShadeMode</type> determines the quality of displaying the object.
  */
 published enum ShadeMode
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::ShadeMode::FLAT
     /** With <const>FLAT</const> shading, the faces of the object are
         rendered in a solid color.
      */
-    FLAT,
-
-    //-------------------------------------------------------------------------
-
+    FLAT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::ShadeMode::PHONG
     /** With <const>PHONG</const> shading, the normal itself is interpolated
         to get more realistic colors and light reflections.
      */
-    PHONG,
-
-    //-------------------------------------------------------------------------
-
+    PHONG, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** With <const>SMOOTH</const> shading, the colors of the lit vertiecs is
         interpolated.
      */
-    SMOOTH,
-
-    //-------------------------------------------------------------------------
-
+    SMOOTH, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge: empty anyway
-    /** <const>DRAFT</const> is a special mode which uses a BSP tree and
+    /** <const>DRAFT</const> is a special mode which uses a BSP tree and 
                 triangle subdivision for displaying.
      */
-    DRAFT
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    DRAFT 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/ShadowProperties.idl b/offapi/com/sun/star/drawing/ShadowProperties.idl
index 9ecb450b0a2e..0dd82a07b5a4 100644
--- a/offapi/com/sun/star/drawing/ShadowProperties.idl
+++ b/offapi/com/sun/star/drawing/ShadowProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,63 +24,63 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
-#define __com_sun_star_drawing_ShadowProperties_idl__
-
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
+#define __com_sun_star_drawing_ShadowProperties_idl__ 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This is a set of properties to describe the style for rendering a shadow.
  */
 published service ShadowProperties
-{
-    //-------------------------------------------------------------------------
-
-    /** enables/disables the shadow of a <type>Shape</type>.
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** enables/disables the shadow of a <type>Shape</type>.	
         <p>The other shadow properties are only applied if this is
         set to <TRUE/>.</p>
      */
-    [property] boolean Shadow;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Shadow; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the color of the shadow of this <type>Shape</type>.
      */
-    [property] com::sun::star::util::Color ShadowColor;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::util::Color ShadowColor; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This defines the degree of transparence of the shadow in percent.
      */
-    [property] short ShadowTransparence;
-
-    //-------------------------------------------------------------------------
-
+    [property] short ShadowTransparence; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the horizontal distance of the left edge of the
         <type>Shape</type> to the shadow.
      */
-    [property] long ShadowXDistance;
-
-    //-------------------------------------------------------------------------
-
+    [property] long ShadowXDistance; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the vertical distance of the top edge of the
         <type>Shape</type> to the shadow.
      */
-    [property] long ShadowYDistance;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] long ShadowYDistance; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/Shape.idl b/offapi/com/sun/star/drawing/Shape.idl
index a85576aafb86..92fbdff71818 100644
--- a/offapi/com/sun/star/drawing/Shape.idl
+++ b/offapi/com/sun/star/drawing/Shape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -139,7 +139,7 @@ published service Shape
         on screen outputs. Please note that the <type>Shape</type> may still
         be visible when printed, see <member>Printable</member>.
      */
-    [optional, property] boolean Visible;
+    [optional, property] boolean Visible; 
 
     //-------------------------------------------------------------------------
 
@@ -201,9 +201,9 @@ published service Shape
     */
     [optional, property] long NavigationOrder;
 
-    /** this property lets you get and set a hyperlink for this shape.
-     */
-    [optional, property] string Hyperlink;
+	/** this property lets you get and set a hyperlink for this shape.
+	 */
+	[optional, property] string Hyperlink;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/drawing/ShapeCollection.idl b/offapi/com/sun/star/drawing/ShapeCollection.idl
index df633e334cb2..8789c6196368 100644
--- a/offapi/com/sun/star/drawing/ShapeCollection.idl
+++ b/offapi/com/sun/star/drawing/ShapeCollection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module drawing {
+module com { module sun { module star { module drawing { 
 
 //=============================================================================
 /** This service describes a generic container to manage collections of
@@ -61,7 +61,7 @@ published service ShapeCollection
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/drawing/Shapes.idl b/offapi/com/sun/star/drawing/Shapes.idl
index e6c1663df2e0..4f769d63b9f3 100644
--- a/offapi/com/sun/star/drawing/Shapes.idl
+++ b/offapi/com/sun/star/drawing/Shapes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_Shapes_idl__
-#define __com_sun_star_drawing_Shapes_idl__
-
-#ifndef __com_sun_star_drawing_XShapes_idl__
-#include <com/sun/star/drawing/XShapes.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_Shapes_idl__ 
+#define __com_sun_star_drawing_Shapes_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XShapes_idl__ 
+#include <com/sun/star/drawing/XShapes.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::drawing::Shapes
 /** This service is for a generic collection of shapes.
  */
 published service Shapes
-{
+{ 
     // DocMerge: empty anyway
-    interface com::sun::star::drawing::XShapes;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::drawing::XShapes; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/SlideRenderer.idl b/offapi/com/sun/star/drawing/SlideRenderer.idl
index 7607829ed338..07f97eaed78d 100644
--- a/offapi/com/sun/star/drawing/SlideRenderer.idl
+++ b/offapi/com/sun/star/drawing/SlideRenderer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/SlideSorter.idl b/offapi/com/sun/star/drawing/SlideSorter.idl
index b5af6a596a04..2f240493828c 100644
--- a/offapi/com/sun/star/drawing/SlideSorter.idl
+++ b/offapi/com/sun/star/drawing/SlideSorter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/SnapObjectType.idl b/offapi/com/sun/star/drawing/SnapObjectType.idl
index cb9b984d92d9..1948f9b25065 100644
--- a/offapi/com/sun/star/drawing/SnapObjectType.idl
+++ b/offapi/com/sun/star/drawing/SnapObjectType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_SnapObjectType_idl__
-#define __com_sun_star_drawing_SnapObjectType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_SnapObjectType_idl__ 
+#define __com_sun_star_drawing_SnapObjectType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::SnapObjectType
 /** @deprecated
  */
 published enum SnapObjectType
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR SnapObjectType::   POINT,
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR SnapObjectType::	POINT, 
+    
     // DocMerge: empty anyway
-    POINT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR SnapObjectType::   VERTICAL,
-
+    POINT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR SnapObjectType::	VERTICAL, 
+    
     // DocMerge: empty anyway
-    VERTICAL,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR SnapObjectType::   HORIZONTAL
-
+    VERTICAL, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR SnapObjectType::	HORIZONTAL 
+    
     // DocMerge: empty anyway
-    HORIZONTAL
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    HORIZONTAL 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/Text.idl b/offapi/com/sun/star/drawing/Text.idl
index cb9b0c182afd..5d1fc5e5c5dc 100644
--- a/offapi/com/sun/star/drawing/Text.idl
+++ b/offapi/com/sun/star/drawing/Text.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_Text_idl__
-#define __com_sun_star_drawing_Text_idl__
-
-#ifndef __com_sun_star_text_XText_idl__
-#include <com/sun/star/text/XText.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextProperties_idl__
+#ifndef __com_sun_star_drawing_Text_idl__ 
+#define __com_sun_star_drawing_Text_idl__ 
+ 
+#ifndef __com_sun_star_text_XText_idl__ 
+#include <com/sun/star/text/XText.idl> 
+#endif 
+  
+#ifndef __com_sun_star_drawing_TextProperties_idl__ 
 #include <com/sun/star/drawing/TextProperties.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This abstract service specifies the general characteristics of an optional
     text inside a <type>Shape</type>.
  */
 published service Text
-{
-    /** With this interface you can modify the text of this
+{ 
+    /** With this interface you can modify the text of this 
                 <type>Shape<type>.
      */
-    interface com::sun::star::text::XText;
-
+    interface com::sun::star::text::XText; 
+ 
     /** The properties in this service describe the style for rendering
         a shapes text area.
      */
-    service com::sun::star::drawing::TextProperties;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    service com::sun::star::drawing::TextProperties;	 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/TextAdjust.idl b/offapi/com/sun/star/drawing/TextAdjust.idl
index 9b0e63572503..e13541d41205 100644
--- a/offapi/com/sun/star/drawing/TextAdjust.idl
+++ b/offapi/com/sun/star/drawing/TextAdjust.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,67 +24,67 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_TextAdjust_idl__
-#define __com_sun_star_drawing_TextAdjust_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_TextAdjust_idl__ 
+#define __com_sun_star_drawing_TextAdjust_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::TextAdjust
-/** This enumeration specifies the position of a text inside a shape in
-    relation to the shape.
-
-    @deprecated
-
+/** This enumeration specifies the position of a text inside a shape in 
+    relation to the shape. 
+    
+    @deprecated	
+    
     <p>This counts for the complete text, not individual lines. </p>
  */
 published enum TextAdjust
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextAdjust::LEFT
     /** The left edge of the text is adjusted to the left edge of the shape.
      */
-    LEFT,
-
-    //-------------------------------------------------------------------------
-
+    LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextAdjust::CENTER
     /** The text is centered inside the shape.
      */
-    CENTER,
-
-    //-------------------------------------------------------------------------
-
+    CENTER, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextAdjust::RIGHT
     /** The right edge of the text is adjusted to the right edge of the shape.
      */
-    RIGHT,
-
-    //-------------------------------------------------------------------------
-
+    RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextAdjust::BLOCK
     /** The text extends from the left to the right edge of the shape.
      */
-    BLOCK,
-
-    //-------------------------------------------------------------------------
-
+    BLOCK, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextAdjust::STRETCH
     /** The text is stretched so that the longest line goes from the left
         to the right edge of the shape.
      */
-    STRETCH
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    STRETCH 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/TextAnimationDirection.idl b/offapi/com/sun/star/drawing/TextAnimationDirection.idl
index a0d172f2fd99..5b2ff8e0ffb5 100644
--- a/offapi/com/sun/star/drawing/TextAnimationDirection.idl
+++ b/offapi/com/sun/star/drawing/TextAnimationDirection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_TextAnimationDirection_idl__
-#define __com_sun_star_drawing_TextAnimationDirection_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_TextAnimationDirection_idl__ 
+#define __com_sun_star_drawing_TextAnimationDirection_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::TextAnimationDirection
 /** This enumeration defines the movement direction of a scrolltext.
  */
 published enum TextAnimationDirection
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR TextAnimationDirection::   LEFT,
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR TextAnimationDirection::	LEFT, 
+    
     // DocMerge: empty anyway
-    LEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR TextAnimationDirection::   RIGHT,
-
+    LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR TextAnimationDirection::	RIGHT, 
+    
     // DocMerge: empty anyway
-    RIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR TextAnimationDirection::   UP,
-
+    RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR TextAnimationDirection::	UP, 
+    
     // DocMerge: empty anyway
-    UP,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR TextAnimationDirection::   DOWN
-
+    UP, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR TextAnimationDirection::	DOWN 
+    
     // DocMerge: empty anyway
-    DOWN
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    DOWN 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/TextAnimationKind.idl b/offapi/com/sun/star/drawing/TextAnimationKind.idl
index fa2a12f2e596..0b0ba878bacc 100644
--- a/offapi/com/sun/star/drawing/TextAnimationKind.idl
+++ b/offapi/com/sun/star/drawing/TextAnimationKind.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,61 +24,61 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_TextAnimationKind_idl__
-#define __com_sun_star_drawing_TextAnimationKind_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_TextAnimationKind_idl__ 
+#define __com_sun_star_drawing_TextAnimationKind_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::TextAnimationKind
 /** This enumeration specifies the type of animation for a text.
  */
 published enum TextAnimationKind
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextAnimationKind::NONE
     /** Don't animate this text.
      */
-    NONE,
-
-    //-------------------------------------------------------------------------
-
+    NONE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextAnimationKind::BLINK
     /** Let this text switch its state from visibile to nonvisible continuously.
      */
-    BLINK,
-
-    //-------------------------------------------------------------------------
-
+    BLINK, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextAnimationKind::SCROLL
     /** Let this text scroll.
      */
-    SCROLL,
-
-    //-------------------------------------------------------------------------
-
+    SCROLL, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextAnimationKind::ALTERNATE
     /** Scroll the text from one side to the other and back.
      */
-    ALTERNATE,
-
-    //-------------------------------------------------------------------------
-
+    ALTERNATE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextAnimationKind::SLIDE
     /** Scroll the text from one side to the final position and stop there.
      */
-    SLIDE
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    SLIDE 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/TextFitToSizeType.idl b/offapi/com/sun/star/drawing/TextFitToSizeType.idl
index fb37d107b084..91d28b787706 100644
--- a/offapi/com/sun/star/drawing/TextFitToSizeType.idl
+++ b/offapi/com/sun/star/drawing/TextFitToSizeType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,52 +24,52 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_TextFitToSizeType_idl__
-#define __com_sun_star_drawing_TextFitToSizeType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_TextFitToSizeType_idl__ 
+#define __com_sun_star_drawing_TextFitToSizeType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::TextFitToSizeType
-/** This enumeration specifies how the text within a shape relates to the
+/** This enumeration specifies how the text within a shape relates to the 
     size of the shape.
  */
 published enum TextFitToSizeType
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** the text size is only defined by the font properties
     */
-    NONE,
-
-    //-------------------------------------------------------------------------
+    NONE, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** if the shape is scaled, the text character size is scaled proportional
     */
-    PROPORTIONAL,
+    PROPORTIONAL, 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** like <code>PROPORTIONAL</code>, but the width of each text row is
         also scaled proportional.
     */
-    ALLLINES,
-
-    //-------------------------------------------------------------------------
+    ALLLINES, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** if the shape is scaled, the font is scaled isotrophically to
         fit the avaiable space. Auto line-breaks will keep working
    */
     AUTOFIT
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/TextHorizontalAdjust.idl b/offapi/com/sun/star/drawing/TextHorizontalAdjust.idl
index bab5f3313ef8..cc8ac4850829 100644
--- a/offapi/com/sun/star/drawing/TextHorizontalAdjust.idl
+++ b/offapi/com/sun/star/drawing/TextHorizontalAdjust.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_TextHorizontalAdjust_idl__
-#define __com_sun_star_drawing_TextHorizontalAdjust_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
-/** This enumeration specifies the horizontal position of text inside a shape in
-    relation to the shape.
+#ifndef __com_sun_star_drawing_TextHorizontalAdjust_idl__ 
+#define __com_sun_star_drawing_TextHorizontalAdjust_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
+/** This enumeration specifies the horizontal position of text inside a shape in 
+    relation to the shape. 
     <p>This counts for the complete text, not individual lines. </p>
  */
 published enum TextHorizontalAdjust
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** The left edge of the text is adjusted to the left edge of the shape.
      */
-    LEFT,
-
-    //-------------------------------------------------------------------------
-
+    LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The text is centered inside the shape.
      */
-    CENTER,
-
-    //-------------------------------------------------------------------------
-
+    CENTER, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The right edge of the text is adjusted to the right edge of the shape.
      */
-    RIGHT,
-
-    //-------------------------------------------------------------------------
-
+    RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The text extends from the left to the right edge of the shape.
      */
     BLOCK
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/TextProperties.idl b/offapi/com/sun/star/drawing/TextProperties.idl
index aaf7dc5e4be7..ccbec23922e4 100644
--- a/offapi/com/sun/star/drawing/TextProperties.idl
+++ b/offapi/com/sun/star/drawing/TextProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,311 +24,311 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_TextProperties_idl__
-#define __com_sun_star_drawing_TextProperties_idl__
-
-#ifndef __com_sun_star_container_XIndexReplace_idl__
-#include <com/sun/star/container/XIndexReplace.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterProperties_idl__
-#include <com/sun/star/style/CharacterProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__
-#include <com/sun/star/style/CharacterPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__
-#include <com/sun/star/style/CharacterPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphProperties_idl__
-#include <com/sun/star/style/ParagraphProperties.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__
-#include <com/sun/star/style/ParagraphPropertiesAsian.idl>
-#endif
-
-#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__
-#include <com/sun/star/style/ParagraphPropertiesComplex.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextFitToSizeType_idl__
-#include <com/sun/star/drawing/TextFitToSizeType.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextAdjust_idl__
-#include <com/sun/star/drawing/TextAdjust.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextAnimationDirection_idl__
-#include <com/sun/star/drawing/TextAnimationDirection.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextAnimationKind_idl__
-#include <com/sun/star/drawing/TextAnimationKind.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextVerticalAdjust_idl__
-#include <com/sun/star/drawing/TextVerticalAdjust.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextHorizontalAdjust_idl__
-#include <com/sun/star/drawing/TextHorizontalAdjust.idl>
-#endif
-
-#ifndef __com_sun_star_text_WritingMode_idl__
-#include <com/sun/star/text/WritingMode.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_TextProperties_idl__ 
+#define __com_sun_star_drawing_TextProperties_idl__ 
+
+#ifndef __com_sun_star_container_XIndexReplace_idl__ 
+#include <com/sun/star/container/XIndexReplace.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_style_CharacterProperties_idl__ 
+#include <com/sun/star/style/CharacterProperties.idl> 
+#endif 
+
+#ifndef __com_sun_star_style_CharacterPropertiesAsian_idl__ 
+#include <com/sun/star/style/CharacterPropertiesAsian.idl> 
+#endif 
+
+#ifndef __com_sun_star_style_CharacterPropertiesComplex_idl__ 
+#include <com/sun/star/style/CharacterPropertiesComplex.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_style_ParagraphProperties_idl__ 
+#include <com/sun/star/style/ParagraphProperties.idl> 
+#endif 
+
+#ifndef __com_sun_star_style_ParagraphPropertiesAsian_idl__ 
+#include <com/sun/star/style/ParagraphPropertiesAsian.idl> 
+#endif 
+
+#ifndef __com_sun_star_style_ParagraphPropertiesComplex_idl__ 
+#include <com/sun/star/style/ParagraphPropertiesComplex.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_TextFitToSizeType_idl__ 
+#include <com/sun/star/drawing/TextFitToSizeType.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_TextAdjust_idl__ 
+#include <com/sun/star/drawing/TextAdjust.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_TextAnimationDirection_idl__ 
+#include <com/sun/star/drawing/TextAnimationDirection.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_TextAnimationKind_idl__ 
+#include <com/sun/star/drawing/TextAnimationKind.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_TextVerticalAdjust_idl__ 
+#include <com/sun/star/drawing/TextVerticalAdjust.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_TextHorizontalAdjust_idl__ 
+#include <com/sun/star/drawing/TextHorizontalAdjust.idl> 
+#endif 
+
+#ifndef __com_sun_star_text_WritingMode_idl__ 
+#include <com/sun/star/text/WritingMode.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 
 /** This is a set of properties to describe the style for rendering the
     text area inside a shape.
  */
 published service TextProperties
-{
-    /** The properties in this service set default formats for text
+{ 
+    /** The properties in this service set default formats for text 
         inside the <type>Shape</type>.
      */
-    service com::sun::star::style::CharacterProperties;
+    service com::sun::star::style::CharacterProperties; 
+ 
+    //------------------------------------------------------------------------- 
 
-    //-------------------------------------------------------------------------
-
-    /** The properties in this service set default formats for asian text
+    /** The properties in this service set default formats for asian text 
         inside the <type>Shape</type>.
      */
-    [optional] service com::sun::star::style::CharacterPropertiesAsian;
-
-    //-------------------------------------------------------------------------
+    [optional] service com::sun::star::style::CharacterPropertiesAsian; 
+ 
+    //------------------------------------------------------------------------- 
 
-    /** The properties in this service set default formats for complex text
+    /** The properties in this service set default formats for complex text 
         inside the <type>Shape</type>.
      */
-    [optional] service com::sun::star::style::CharacterPropertiesComplex;
-
-    //-------------------------------------------------------------------------
+    [optional] service com::sun::star::style::CharacterPropertiesComplex; 
+ 
+    //------------------------------------------------------------------------- 
 
-    /** The properties in this service set default formats for text
+    /** The properties in this service set default formats for text  
         inside the <type>Shape</type>.
      */
-    service com::sun::star::style::ParagraphProperties;
+    service com::sun::star::style::ParagraphProperties; 
+ 
+    //------------------------------------------------------------------------- 
 
-    //-------------------------------------------------------------------------
-
-    /** The properties in this service set default formats for asian text
+    /** The properties in this service set default formats for asian text  
         inside the <type>Shape</type>.
      */
-    [optional] service com::sun::star::style::ParagraphPropertiesAsian;
-
-    //-------------------------------------------------------------------------
+    [optional] service com::sun::star::style::ParagraphPropertiesAsian; 
+ 
+    //------------------------------------------------------------------------- 
 
-    /** The properties in this service set default formats for complex text
+    /** The properties in this service set default formats for complex text  
         inside the <type>Shape</type>.
      */
-    [optional] service com::sun::star::style::ParagraphPropertiesComplex;
-    //-------------------------------------------------------------------------
-
+    [optional] service com::sun::star::style::ParagraphPropertiesComplex; 
+    //------------------------------------------------------------------------- 
+     
     /** If this is <TRUE/>, numbering is ON for the text of
         this <type>Shape</type>.
      */
-    [optional, property] boolean IsNumbering;
-
-    //-------------------------------------------------------------------------
-
+    [optional, property] boolean IsNumbering; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** describes the numbering levels.
         <p>The different rules accessible with this
         <type scope="com::sun::star::container">XIndexReplace</type> interface
         are sequences of property values as described in the service
         <type scope="com::sun::star::style">NumberingRule</type>.</p>
      */
-    [optional, property] com::sun::star::container::XIndexReplace NumberingRules;
-
-    //-------------------------------------------------------------------------
-
+    [optional, property] com::sun::star::container::XIndexReplace NumberingRules; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If this value is <TRUE/>, the height of the <type>Shape</type> is
         automatically expanded/shrunk when text is added to or removed from
         the <type>Shape</type>.
      */
-    [property] boolean TextAutoGrowHeight;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean TextAutoGrowHeight; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If this value is <TRUE/>, the width of the <type>Shape</type> is
         automatically expanded/shrunk when text is added to or removed from
         the <type>Shape</type>.
      */
-    [property] boolean TextAutoGrowWidth;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean TextAutoGrowWidth; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::drawing::Text::TextContourFrame
     /** If this value is <TRUE/>, the left edge of every line of text is
         aligned with the left edge of this <type>Shape</type>.
      */
-    [property] boolean TextContourFrame;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean TextContourFrame; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** With this set to <TRUE/>, the text inside of the <type>Shape</type>
         is stretched to fit into the <type>Shape</type>.
      */
-    [property] com::sun::star::drawing::TextFitToSizeType TextFitToSize;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::drawing::TextFitToSizeType TextFitToSize; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** adjusts the horizontal position of the text inside of
         the <type>Shape</type>.
      */
-    [property] com::sun::star::drawing::TextHorizontalAdjust TextHorizontalAdjust;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::drawing::TextHorizontalAdjust TextHorizontalAdjust; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** adjusts the vertical position of the text inside of
         the <type>Shape</type>.
      */
-    [property] com::sun::star::drawing::TextVerticalAdjust TextVerticalAdjust;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::drawing::TextVerticalAdjust TextVerticalAdjust; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the distance from the left edge of the <type>Shape</type>
         to the left edge of the text.
         <p>This is only useful if <member>Text::TextHorizontalAdjust</member> is
         <const>BLOCK</const> or <const>STRETCH</const> or if
         <member>Text::TextFitSize</member> is <TRUE/>.</p>
      */
-    [property] long TextLeftDistance;
-
-    //-------------------------------------------------------------------------
-
+    [property] long TextLeftDistance; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the distance from the right edge of the <type>Shape</type>
         to the right edge of the text.
-
+        
         <p>This is only useful if <member>Text::TextHorizontalAdjust</member> is
         <const>BLOCK</const> or <const>STRETCH</const>
         or if <member>Text::TextFitSize</member> is <TRUE/>.</p>
      */
-    [property] long TextRightDistance;
-
-    //-------------------------------------------------------------------------
-
+    [property] long TextRightDistance; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the distance from the upper edge of the <type>Shape</type> to
-        the upper edge of the text.
-
+        the upper edge of the text.  
+                
         <p>This is only useful if <member>Text::TextVerticalAdjust</member> is
         <const>BLOCK</const> or if <member>Text::TextFitSize</member> is
         <TRUE/>.</p>
      */
-    [property] long TextUpperDistance;
-
-    //-------------------------------------------------------------------------
-
+    [property] long TextUpperDistance; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the distance from the lower edge of the <type>Shape</type> to the
-        lower edge of the text.
-
-
-
+        lower edge of the text.  
+        
+        
+        
         <p>This is only useful if <member>Text::TextVerticalAdjust</member> is
         <const>BLOCK</const> or if <member>Text::TextFitSize</member> is
         <TRUE/>.</p>
      */
-    [property] long TextLowerDistance;
-
-    //-------------------------------------------------------------------------
+    [property] long TextLowerDistance; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** with this property you can set the maximum height for a shape with text.
         On edit, the auto grow feature will not grow the object heigher than
         the value of this property.
     */
-    [property] long TextMaximumFrameHeight;
-
-    //-------------------------------------------------------------------------
+    [property] long TextMaximumFrameHeight; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** with this property you can set the maximum width for a shape with text.
         On edit, the auto grow feature will not grow the objects wider than
         the value of this property.
     */
-    [property] long TextMaximumFrameWidth;
-
-    //-------------------------------------------------------------------------
+    [property] long TextMaximumFrameWidth; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** with this property you can set the minimum height for a shape with text.
         On edit, the auto grow feature will not shrink the objects height smaller
         than the value of this property.
     */
-    [property] long TextMinimumFrameHeight;
-
-    //-------------------------------------------------------------------------
+    [property] long TextMinimumFrameHeight; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** with this property you can set the minimum width for a shape with text.
         On edit, the auto grow feature will not shrink the object width smaller
         than the value of this property.
     */
-    [property] long TextMinimumFrameWidth;
-
-    //-------------------------------------------------------------------------
-
+    [property] long TextMinimumFrameWidth; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the number of pixels the text is moved in each animation step.
      */
-    [property] short TextAnimationAmount;
-
-    //-------------------------------------------------------------------------
-
+    [property] short TextAnimationAmount; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This number defines how many times the text animation is repeated.
         <p>If this is set to zero, the repeat is endless.</p>
      */
-    [property] short TextAnimationCount;
-
-    //-------------------------------------------------------------------------
-
-    /** This is the delay in thousandths of a second between each
+    [property] short TextAnimationCount; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** This is the delay in thousandths of a second between each  
         of the animation steps.
      */
-    [property] short TextAnimationDelay;
-
-    //-------------------------------------------------------------------------
-
+    [property] short TextAnimationDelay; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This enumeration defines the direction in which the text moves.
      */
-    [property] com::sun::star::drawing::TextAnimationDirection TextAnimationDirection;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::drawing::TextAnimationDirection TextAnimationDirection; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This value defines the type of animation.
      */
-    [property] com::sun::star::drawing::TextAnimationKind TextAnimationKind;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::drawing::TextAnimationKind TextAnimationKind; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If this value is <TRUE/>, the text is visible at the start of the
         animation.
      */
-    [property] boolean TextAnimationStartInside;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean TextAnimationStartInside; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If this value is <TRUE/>, the text is visible at the end of the
         animation.
      */
-    [property] boolean TextAnimationStopInside;
+    [property] boolean TextAnimationStopInside; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** This value selects the writing mode for the text.
      */
-    [property] ::com::sun::star::text::WritingMode TextWritingMode;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] ::com::sun::star::text::WritingMode TextWritingMode; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/TextShape.idl b/offapi/com/sun/star/drawing/TextShape.idl
index e1b8d23fbd1d..0db839c2ce50 100644
--- a/offapi/com/sun/star/drawing/TextShape.idl
+++ b/offapi/com/sun/star/drawing/TextShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,64 +24,64 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_TextShape_idl__
-#define __com_sun_star_drawing_TextShape_idl__
-
-#ifndef __com_sun_star_drawing_Shape_idl__
-#include <com/sun/star/drawing/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Text_idl__
-#include <com/sun/star/drawing/Text.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_FillProperties_idl__
-#include <com/sun/star/drawing/FillProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ShadowProperties_idl__
-#include <com/sun/star/drawing/ShadowProperties.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_RotationDescriptor_idl__
-#include <com/sun/star/drawing/RotationDescriptor.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_TextShape_idl__ 
+#define __com_sun_star_drawing_TextShape_idl__ 
+ 
+#ifndef __com_sun_star_drawing_Shape_idl__ 
+#include <com/sun/star/drawing/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_Text_idl__ 
+#include <com/sun/star/drawing/Text.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_FillProperties_idl__ 
+#include <com/sun/star/drawing/FillProperties.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_LineProperties_idl__ 
+#include <com/sun/star/drawing/LineProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_ShadowProperties_idl__ 
+#include <com/sun/star/drawing/ShadowProperties.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_RotationDescriptor_idl__ 
+#include <com/sun/star/drawing/RotationDescriptor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This service is for a text shape.
  */
 published service TextShape
-{
-    service com::sun::star::drawing::Shape;
+{ 
+    service com::sun::star::drawing::Shape; 
 
     service com::sun::star::drawing::FillProperties;
 
     service com::sun::star::drawing::LineProperties;
 
-    service com::sun::star::drawing::ShadowProperties;
-
-    service com::sun::star::drawing::Text;
-
-    service com::sun::star::drawing::RotationDescriptor;
+    service com::sun::star::drawing::ShadowProperties; 
+    
+    service com::sun::star::drawing::Text; 
+    
+    service com::sun::star::drawing::RotationDescriptor;  
 
     /** This is the radius of the corners.
      */
-    [property] long CornerRadius;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] long CornerRadius; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/TextVerticalAdjust.idl b/offapi/com/sun/star/drawing/TextVerticalAdjust.idl
index ea22b4430324..dc7dbf045873 100644
--- a/offapi/com/sun/star/drawing/TextVerticalAdjust.idl
+++ b/offapi/com/sun/star/drawing/TextVerticalAdjust.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_TextVerticalAdjust_idl__
-#define __com_sun_star_drawing_TextVerticalAdjust_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
-/** This enumeration specifies the vertical position of text inside a shape in
-    relation to the shape.
+#ifndef __com_sun_star_drawing_TextVerticalAdjust_idl__ 
+#define __com_sun_star_drawing_TextVerticalAdjust_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
+/** This enumeration specifies the vertical position of text inside a shape in 
+    relation to the shape. 	
     <p>This counts for the complete text, not individual lines. </p>
  */
 published enum TextVerticalAdjust
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextAdjust::LEFT
     /** The top edge of the text is adjusted to the top edge of the shape.
      */
-    TOP,
-
-    //-------------------------------------------------------------------------
-
+    TOP, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextAdjust::CENTER
     /** The text is centered inside the shape.
      */
-    CENTER,
-
-    //-------------------------------------------------------------------------
-
+    CENTER, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextAdjust::RIGHT
     /** The bottom edge of the text is adjusted to the bottom edge of the shape.
      */
     BOTTOM,
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** The text extends from the top to the bottom edge of the shape.
      */
     BLOCK
- };
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ }; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/TextureKind.idl b/offapi/com/sun/star/drawing/TextureKind.idl
index 963ba7e580ae..0996e2f85b26 100644
--- a/offapi/com/sun/star/drawing/TextureKind.idl
+++ b/offapi/com/sun/star/drawing/TextureKind.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_TextureKind_idl__
-#define __com_sun_star_drawing_TextureKind_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_TextureKind_idl__ 
+#define __com_sun_star_drawing_TextureKind_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::TextureKind
 /** These enumeration values specify how the texture is applied.
     @deprecated
  */
 published enum TextureKind
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextureKind::LUMINANCE
     /** With <type>TextureKind</type> <const>LUMINANCE</const>, the texture
-        and the lighting information are    mixed to produce the image, so a
+        and the lighting information are	mixed to produce the image, so a
         lit, textured object is achieved.
      */
-    LUMINANCE,
-
-    //-------------------------------------------------------------------------
-
+    LUMINANCE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextureKind::COLOR
     /** With this mode the lighting is ignored and only the
         texture color information is used.
      */
-    COLOR
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    COLOR 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/TextureKind2.idl b/offapi/com/sun/star/drawing/TextureKind2.idl
index f419f95e2b13..ee0038735d65 100644
--- a/offapi/com/sun/star/drawing/TextureKind2.idl
+++ b/offapi/com/sun/star/drawing/TextureKind2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_TextureKind2_idl__
-#define __com_sun_star_drawing_TextureKind2_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_TextureKind2_idl__ 
+#define __com_sun_star_drawing_TextureKind2_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** These enumeration values specify how the texture is applied.
  */
 published enum TextureKind2
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** With <type>TextureKind</type> <const>LUMINANCE</const>, the texture
-        and the lighting information are    mixed to produce the image, so a
+        and the lighting information are	mixed to produce the image, so a
         lit, textured object is achieved.
      */
-    LUMINANCE,
-
+    LUMINANCE, 
+ 
     /** With <type>TextureKind</type> <const>INTENSITY</const>, each texture
         pixel is used as an intensity value.
      */
     INTENSITY,
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** With this mode, the lighting is ignored and only the
         texture color information is used.
      */
-    COLOR
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    COLOR  
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/TextureMode.idl b/offapi/com/sun/star/drawing/TextureMode.idl
index def9d015af28..99a29f5631c8 100644
--- a/offapi/com/sun/star/drawing/TextureMode.idl
+++ b/offapi/com/sun/star/drawing/TextureMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_TextureMode_idl__
-#define __com_sun_star_drawing_TextureMode_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_TextureMode_idl__ 
+#define __com_sun_star_drawing_TextureMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::TextureMode
 /** The <type>TextureMode</type> defines in which way the texture color data
     replaces the object color data.
  */
 published enum TextureMode
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextureMode::REPLACE
     /** This is the standard mode.
      */
-    REPLACE,
-
-    //-------------------------------------------------------------------------
-
+    REPLACE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextureMode::MODULATE
     /** This mixes up colors in a way defined by the texture bitmap.
      */
-    MODULATE,
-
-    //-------------------------------------------------------------------------
-
+    MODULATE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextureMode::BLEND
     /** This mixes both data sources in a fixed ratio.
      */
-    BLEND
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    BLEND 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/TextureProjectionMode.idl b/offapi/com/sun/star/drawing/TextureProjectionMode.idl
index aaede2a89872..751e589e5da3 100644
--- a/offapi/com/sun/star/drawing/TextureProjectionMode.idl
+++ b/offapi/com/sun/star/drawing/TextureProjectionMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_TextureProjectionMode_idl__
-#define __com_sun_star_drawing_TextureProjectionMode_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_TextureProjectionMode_idl__ 
+#define __com_sun_star_drawing_TextureProjectionMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::TextureProjectionMode
-/** defines how the texture is mapped to the object.
-
-
-
+/** defines how the texture is mapped to the object. 
+    
+    
+    
     <p>It can be set independently for X and Y texture directions.</p>
  */
 published enum TextureProjectionMode
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextureProjectionMode::OBJECTSPECIFIC
-    /** This value specifies that the standard object projection method is
+    /** This value specifies that the standard object projection method is 
         used.
      */
-    OBJECTSPECIFIC,
-
-    //-------------------------------------------------------------------------
-
+    OBJECTSPECIFIC, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextureProjectionMode::PARALLEL
-    /** This value specifies a flat parallel projection in the specified
+    /** This value specifies a flat parallel projection in the specified 
         degree of freedom (X or Y).
      */
-    PARALLEL,
-
-    //-------------------------------------------------------------------------
-
+    PARALLEL, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::TextureProjectionMode::SPHERE
     /** This value forces projection to wrapping in X and/or Y.
      */
-    SPHERE
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    SPHERE 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/TransparencyGradientTable.idl b/offapi/com/sun/star/drawing/TransparencyGradientTable.idl
index 1e91a5b40cd7..01b938805c2d 100644
--- a/offapi/com/sun/star/drawing/TransparencyGradientTable.idl
+++ b/offapi/com/sun/star/drawing/TransparencyGradientTable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_TransparencyGradientTable_idl__
-#define __com_sun_star_drawing_TransparencyGradientTable_idl__
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
+#ifndef __com_sun_star_drawing_TransparencyGradientTable_idl__ 
+#define __com_sun_star_drawing_TransparencyGradientTable_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#include <com/sun/star/container/XNameContainer.idl> 
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
 
 /** this is a container for <type scope="com::sun::star::awt">Gradient</type>s
 
     <p>It is used for example to access the <type scope="com::sun::star::awt">Gradient</type>s that
-    are used inside a document for fill transparency.
+    are used inside a document for fill transparency. 
 
     @see DrawingDocumentFactory
     @see com::sun::star::awt::Gradient
@@ -56,9 +56,9 @@ published service TransparencyGradientTable
     interface com::sun::star::container::XNameContainer;
 };
 
-//=============================================================================
-
-}; }; }; };
-
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/VerticalDimensioning.idl b/offapi/com/sun/star/drawing/VerticalDimensioning.idl
index d6e43834a5ee..d883b27712e8 100644
--- a/offapi/com/sun/star/drawing/VerticalDimensioning.idl
+++ b/offapi/com/sun/star/drawing/VerticalDimensioning.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,56 +24,56 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_VerticalDimensioning_idl__
-#define __com_sun_star_drawing_VerticalDimensioning_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_VerticalDimensioning_idl__ 
+#define __com_sun_star_drawing_VerticalDimensioning_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::drawing::VerticalDimensioning
 /** specifies the vertical position of
     the text of a dimensioning shape.
  */
 published enum VerticalDimensioning
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::VerticalDimensioning::AUTO
     /** Set this to have the application select the best horizontal
         position for the text.
      */
-    AUTO,
-
-    //-------------------------------------------------------------------------
-
+    AUTO, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::VerticalDimensioning::TOP
     /** The text is positioned above the main line.
      */
-    TOP,
-
-    //-------------------------------------------------------------------------
-
+    TOP, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::VerticalDimensioning::CENTERED
     /** The text is positioned over the main line.
      */
-    CENTERED,
-
-    //-------------------------------------------------------------------------
-
+    CENTERED, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::drawing::VerticalDimensioning::BOTTOM
     /** The text is positioned below the main line.
      */
-    BOTTOM
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    BOTTOM 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XConnectableShape.idl b/offapi/com/sun/star/drawing/XConnectableShape.idl
index 12132d75c7fa..174924e5ff28 100644
--- a/offapi/com/sun/star/drawing/XConnectableShape.idl
+++ b/offapi/com/sun/star/drawing/XConnectableShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XConnectableShape_idl__
-#define __com_sun_star_drawing_XConnectableShape_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
-#include <com/sun/star/awt/Point.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XConnectableShape_idl__ 
+#define __com_sun_star_drawing_XConnectableShape_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Point_idl__ 
+#include <com/sun/star/awt/Point.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** @deprecated
 */
 published interface XConnectableShape: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR XConnectableShape::canConnect
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR XConnectableShape::canConnect 
+    
     // DocMerge: empty anyway
-    boolean canConnect( [in] com::sun::star::awt::Point nPos,
-             [in] boolean bCreateGluePoint,
-             [in] long nMaxDist );
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR XConnectableShape::doConnect
-
+    boolean canConnect( [in] com::sun::star::awt::Point nPos, 
+             [in] boolean bCreateGluePoint, 
+             [in] long nMaxDist ); 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR XConnectableShape::doConnect 
+    
     // DocMerge: empty anyway
-    boolean doConnect( [in] com::sun::star::awt::Point nPos,
-             [in] boolean bCreateGluePoint,
-             [in] long nMaxDist );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean doConnect( [in] com::sun::star::awt::Point nPos, 
+             [in] boolean bCreateGluePoint, 
+             [in] long nMaxDist ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XConnectorShape.idl b/offapi/com/sun/star/drawing/XConnectorShape.idl
index 2cc777ebc2f4..2163f45ad597 100644
--- a/offapi/com/sun/star/drawing/XConnectorShape.idl
+++ b/offapi/com/sun/star/drawing/XConnectorShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,69 +24,69 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XConnectorShape_idl__
-#define __com_sun_star_drawing_XConnectorShape_idl__
-
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XConnectableShape_idl__
-#include <com/sun/star/drawing/XConnectableShape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_ConnectionType_idl__
-#include <com/sun/star/drawing/ConnectionType.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XConnectorShape_idl__ 
+#define __com_sun_star_drawing_XConnectorShape_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/drawing/XShape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XConnectableShape_idl__ 
+#include <com/sun/star/drawing/XConnectableShape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_ConnectionType_idl__ 
+#include <com/sun/star/drawing/ConnectionType.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** @deprecated
  */
 published interface XConnectorShape: com::sun::star::drawing::XShape
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::drawing::XConnectorShape::connectStart
     /** connects the start of this instance
      */
-    void connectStart( [in] com::sun::star::drawing::XConnectableShape xShape,
-             [in] com::sun::star::drawing::ConnectionType nPos );
-
-    //-------------------------------------------------------------------------
-
+    void connectStart( [in] com::sun::star::drawing::XConnectableShape xShape, 
+             [in] com::sun::star::drawing::ConnectionType nPos ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::drawing::XConnectorShape::connectEnd
     /** connects the end of this instance.
      */
-    void connectEnd( [in] com::sun::star::drawing::XConnectableShape xShape,
-             [in] com::sun::star::drawing::ConnectionType nPos );
-
-    //-------------------------------------------------------------------------
-
+    void connectEnd( [in] com::sun::star::drawing::XConnectableShape xShape, 
+             [in] com::sun::star::drawing::ConnectionType nPos ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::drawing::XConnectorShape::disconnectBegin
     /** disconnects the given <type>Shape</type> from the start of
         this instance.
      */
-    void disconnectBegin( [in] com::sun::star::drawing::XConnectableShape xShape );
-
-    //-------------------------------------------------------------------------
-
+    void disconnectBegin( [in] com::sun::star::drawing::XConnectableShape xShape ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::drawing::XConnectorShape::disconnectEnd
-    /** disconnects the given <type>Shape</type> from the end of
+    /** disconnects the given <type>Shape</type> from the end of 
         this instance.
      */
-    void disconnectEnd( [in] com::sun::star::drawing::XConnectableShape xShape );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void disconnectEnd( [in] com::sun::star::drawing::XConnectableShape xShape ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XControlShape.idl b/offapi/com/sun/star/drawing/XControlShape.idl
index 2607f082b3d7..2bcbbe88cd86 100644
--- a/offapi/com/sun/star/drawing/XControlShape.idl
+++ b/offapi/com/sun/star/drawing/XControlShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XControlShape_idl__
-#define __com_sun_star_drawing_XControlShape_idl__
-
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControlModel_idl__
-#include <com/sun/star/awt/XControlModel.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XControlShape_idl__ 
+#define __com_sun_star_drawing_XControlShape_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/drawing/XShape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XControlModel_idl__ 
+#include <com/sun/star/awt/XControlModel.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** is implemented by a <type>ControlShape</type> to access the controls model.
 
     @see com::sun::star::drawing::ControlShape
     @see com::sun::star::awt::UnoControlModel
 */
 published interface XControlShape: com::sun::star::drawing::XShape
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the control model of this <type>Shape</type>.
 
         @return
@@ -58,26 +58,26 @@ published interface XControlShape: com::sun::star::drawing::XShape
             to this <type>ControlShape</type>, than its returned.
             Otherwise you get an empty reference.
      */
-    com::sun::star::awt::XControlModel getControl();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::XControlModel getControl(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the control model for this <type>Shape</type>.
 
         @param xControl
             this will be the new control model that is
             displayed with this shape. You may change
             the model more than once during the lifetime
-            of a <type>ControlShape</type>
-
+            of a <type>ControlShape</type> 
+    
      */
-    [oneway] void setControl( [in] com::sun::star::awt::XControlModel xControl );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void setControl( [in] com::sun::star::awt::XControlModel xControl ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XCustomShapeEngine.idl b/offapi/com/sun/star/drawing/XCustomShapeEngine.idl
index 4bc2aa287066..9a934de4fff2 100644
--- a/offapi/com/sun/star/drawing/XCustomShapeEngine.idl
+++ b/offapi/com/sun/star/drawing/XCustomShapeEngine.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XCustomShapeEngine_idl__
-#define __com_sun_star_drawing_XCustomShapeEngine_idl__
+#ifndef __com_sun_star_drawing_XCustomShapeEngine_idl__ 
+#define __com_sun_star_drawing_XCustomShapeEngine_idl__ 
 
-#ifndef __com_sun_star_awt_Rectangle_idl__
-#include <com/sun/star/awt/Rectangle.idl>
-#endif
-#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__
+#ifndef __com_sun_star_awt_Rectangle_idl__ 
+#include <com/sun/star/awt/Rectangle.idl> 
+#endif 
+#ifndef __com_sun_star_drawing_PolyPolygonBezierCoords_idl__ 
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.idl>
 #endif
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_drawing_XCustomShapeHandle_idl__
-#include <com/sun/star/drawing/XCustomShapeHandle.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/drawing/XShape.idl> 
+#endif 
+#ifndef __com_sun_star_drawing_XCustomShapeHandle_idl__ 
+#include <com/sun/star/drawing/XCustomShapeHandle.idl> 
+#endif 
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** The XCustomShapeEngine
  */
 interface XCustomShapeEngine: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /**
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** 
         @returns
             a the shape that is representing the CustomShape
      */
-    com::sun::star::drawing::XShape render();
+    com::sun::star::drawing::XShape render(); 
 
-    /**
+    /** 
         @returns the text bound of the shape
     */
     com::sun::star::awt::Rectangle getTextBounds();
 
-    /**
+    /** 
         @returns the line geometry of the object
     */
     com::sun::star::drawing::PolyPolygonBezierCoords getLineGeometry();
@@ -75,13 +75,13 @@ interface XCustomShapeEngine: com::sun::star::uno::XInterface
         @returns
             a collection of interaction handles
      */
-    sequence<com::sun::star::drawing::XCustomShapeHandle> getInteraction();
-
- };
-
-//=============================================================================
+    sequence<com::sun::star::drawing::XCustomShapeHandle> getInteraction(); 
 
+ }; 
+ 
+//============================================================================= 
+ 
 }; }; }; };
-
-#endif
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XCustomShapeHandle.idl b/offapi/com/sun/star/drawing/XCustomShapeHandle.idl
index 45861c445cbd..aafe9e347b82 100644
--- a/offapi/com/sun/star/drawing/XCustomShapeHandle.idl
+++ b/offapi/com/sun/star/drawing/XCustomShapeHandle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XCustomShapeHandle_idl__
-#define __com_sun_star_drawing_XCustomShapeHandle_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
-#include <com/sun/star/awt/Point.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
+#ifndef __com_sun_star_drawing_XCustomShapeHandle_idl__ 
+#define __com_sun_star_drawing_XCustomShapeHandle_idl__ 
 
-//=============================================================================
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
+#ifndef __com_sun_star_awt_Point_idl__ 
+#include <com/sun/star/awt/Point.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** The XCustomShapeHandle
  */
 interface XCustomShapeHandle: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is getting the actual handle position
 
         @returns
             a the actual handle position
      */
-    com::sun::star::awt::Point getPosition();
+    com::sun::star::awt::Point getPosition(); 
 
     /** is setting a new positon for the handle
      */
-    void setControllerPosition( [in] com::sun::star::awt::Point aPoint );
-
- };
-
-//=============================================================================
-
-}; }; }; };
+    void setControllerPosition( [in] com::sun::star::awt::Point aPoint ); 
 
-#endif
+ }; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XDrawPage.idl b/offapi/com/sun/star/drawing/XDrawPage.idl
index 93ec75f7ea5f..0ee0e5e87de8 100644
--- a/offapi/com/sun/star/drawing/XDrawPage.idl
+++ b/offapi/com/sun/star/drawing/XDrawPage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
-#define __com_sun_star_drawing_XDrawPage_idl__
-
-#ifndef __com_sun_star_drawing_XShapes_idl__
-#include <com/sun/star/drawing/XShapes.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
+#define __com_sun_star_drawing_XDrawPage_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XShapes_idl__ 
+#include <com/sun/star/drawing/XShapes.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** identifies an <type>XShapes</type> as a <type>DrawPage</type>.
  */
 published interface XDrawPage: com::sun::star::drawing::XShapes
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl b/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl
index 515d83ac9bc2..f08c87fb7c36 100644
--- a/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XDrawPageDuplicator_idl__
-#define __com_sun_star_drawing_XDrawPageDuplicator_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
-#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XDrawPageDuplicator_idl__ 
+#define __com_sun_star_drawing_XDrawPageDuplicator_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
+#include <com/sun/star/drawing/XDrawPage.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to duplicate pages within the same document.
  */
 published interface XDrawPageDuplicator: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** creates a duplicate of a <type>DrawPage</type> or <type>MasterPage</type>,
         including the <type>Shape</type>s on that page and inserts it into the
         same model.
@@ -59,15 +59,15 @@ published interface XDrawPageDuplicator: com::sun::star::uno::XInterface
         @return
             a newly created <type>DrawPage</type> or <type>MasterPage</type>
             that as all properties and copies of all <type>Shape</type>s from
-            the source page.
+            the source page. 
      */
-    com::sun::star::drawing::XDrawPage duplicate( [in] com::sun::star::drawing::XDrawPage xPage );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::drawing::XDrawPage duplicate( [in] com::sun::star::drawing::XDrawPage xPage ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XDrawPageExpander.idl b/offapi/com/sun/star/drawing/XDrawPageExpander.idl
index 306379ea9a3b..92e436fe0b54 100644
--- a/offapi/com/sun/star/drawing/XDrawPageExpander.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageExpander.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XDrawPageExpander_idl__
-#define __com_sun_star_drawing_XDrawPageExpander_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
-#include <com/sun/star/drawing/XDrawPages.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
-#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XDrawPageExpander_idl__ 
+#define __com_sun_star_drawing_XDrawPageExpander_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XDrawPages_idl__ 
+#include <com/sun/star/drawing/XDrawPages.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
+#include <com/sun/star/drawing/XDrawPage.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** is implemented by documents that can expand the contents
     of a summary on a <type>DrawPage</type> into a collection of
     <type>DrawPage</type>s.
-
+    
     @see XDrawPageSummarizer
 
     @deprecated
  */
 published interface XDrawPageExpander: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** creates a collection of <type>DrawPage</type>s from the
         summary inside the given <type>DrawPage</type> and adds
         them to the same model as the source <type>DrawPage</type>.
     */
-    com::sun::star::drawing::XDrawPages expand( [in] com::sun::star::drawing::XDrawPage xPage );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::drawing::XDrawPages expand( [in] com::sun::star::drawing::XDrawPage xPage ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl b/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
index 780a484d0783..557f3ccfb83d 100644
--- a/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XDrawPageSummarizer_idl__
-#define __com_sun_star_drawing_XDrawPageSummarizer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
-#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
-#include <com/sun/star/drawing/XDrawPages.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XDrawPageSummarizer_idl__ 
+#define __com_sun_star_drawing_XDrawPageSummarizer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
+#include <com/sun/star/drawing/XDrawPage.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XDrawPages_idl__ 
+#include <com/sun/star/drawing/XDrawPages.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::drawing::XDrawPageSummarizer
-/** is implemented by documents that can create summaries
+/** is implemented by documents that can create summaries 
     of their <type>DrawPage</type>s.
 
     @deprecated
  */
 published interface XDrawPageSummarizer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::drawing::XDrawPageSummarizer::summarize
     /** creates a new <type>DrawPage</type> with a summary of all
         <type>DrawPage</type>s in the given collection.
      */
-    com::sun::star::drawing::XDrawPage summarize( [in] com::sun::star::drawing::XDrawPages xPages );
-
-};
-
-//=============================================================================
-
-}; }; }; };
+    com::sun::star::drawing::XDrawPage summarize( [in] com::sun::star::drawing::XDrawPages xPages ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
 
-#endif
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XDrawPageSupplier.idl b/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
index 6804c0411271..19e77b911062 100644
--- a/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XDrawPageSupplier_idl__
-#define __com_sun_star_drawing_XDrawPageSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
-#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XDrawPageSupplier_idl__ 
+#define __com_sun_star_drawing_XDrawPageSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
+#include <com/sun/star/drawing/XDrawPage.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::drawing::XDrawPageSupplier
 /** represents something that provides a <type>DrawPage</type>.
-
+    
     <p>This interface is provided if the container only supports exactly
     one <type>DrawPage</type>. For containers which support multiple
     <type>DrawPage</type>s interface <type>XDrawPagesSupplier</type> is
@@ -53,19 +53,19 @@
     @deprecated
  */
 published interface XDrawPageSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::drawing::XDrawPageSupplier::getDrawPage
     /** returns the <type>DrawPage</type>.
      */
-    com::sun::star::drawing::XDrawPage getDrawPage();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::drawing::XDrawPage getDrawPage(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XDrawPages.idl b/offapi/com/sun/star/drawing/XDrawPages.idl
index f913259ed29b..cf27bec3902f 100644
--- a/offapi/com/sun/star/drawing/XDrawPages.idl
+++ b/offapi/com/sun/star/drawing/XDrawPages.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
-#define __com_sun_star_drawing_XDrawPages_idl__
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
-#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XDrawPages_idl__ 
+#define __com_sun_star_drawing_XDrawPages_idl__ 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
+#include <com/sun/star/drawing/XDrawPage.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** gives access to a container of <type>DrawPage</type>s or <type>MasterPage</type>s.
 
     <p>The pages are stored in an index container. The order is determined by
@@ -52,9 +52,9 @@
     at a model that contains <type>DrawPage</type>s or <type>MasterPage</type>s
 */
 published interface XDrawPages: com::sun::star::container::XIndexAccess
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** creates and inserts a new <type>DrawPage</type> or <type>MasterPage</type>
         into this container
 
@@ -66,10 +66,10 @@ published interface XDrawPages: com::sun::star::container::XIndexAccess
             the newly created and already inserted <type>DrawPage</type> or
             <type>MasterPage</type>.
     */
-    com::sun::star::drawing::XDrawPage insertNewByIndex( [in] long nIndex );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::drawing::XDrawPage insertNewByIndex( [in] long nIndex ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes a <type>DrawPage</type> or <type>MasterPage</type> from this
         container.
 
@@ -78,13 +78,13 @@ published interface XDrawPages: com::sun::star::container::XIndexAccess
             contained and will be removed from this container. It will
             also be disposed and shouldn't be used any further.
     */
-    void remove( [in] com::sun::star::drawing::XDrawPage xPage );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void remove( [in] com::sun::star::drawing::XDrawPage xPage ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl b/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl
index fcc749269ef7..436241b5ab61 100644
--- a/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl
+++ b/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
-#define __com_sun_star_drawing_XDrawPagesSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
-#include <com/sun/star/drawing/XDrawPages.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__ 
+#define __com_sun_star_drawing_XDrawPagesSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XDrawPages_idl__ 
+#include <com/sun/star/drawing/XDrawPages.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** must be supported to provide access to a multi-page drawing-layer.
 */
 published interface XDrawPagesSupplier: com::sun::star::uno::XInterface
-{
+{ 
 
-    /** @returns
+    /** @returns 
                 an indexed container with the service <type>DrawPages</type>.
      */
-    com::sun::star::drawing::XDrawPages getDrawPages();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::drawing::XDrawPages getDrawPages(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XDrawSubController.idl b/offapi/com/sun/star/drawing/XDrawSubController.idl
index 6c1f86dce440..c4f1681de4de 100644
--- a/offapi/com/sun/star/drawing/XDrawSubController.idl
+++ b/offapi/com/sun/star/drawing/XDrawSubController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,27 +25,27 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_drawing_XDrawSubController_idl__
-#define __com_sun_star_drawing_XDrawSubController_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
-#include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawView_idl__
-#include <com/sun/star/drawing/XDrawView.idl>
-#endif
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
-#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-
-
-
-module com {  module sun {  module star {  module drawing {
-
+#ifndef __com_sun_star_drawing_XDrawSubController_idl__ 
+#define __com_sun_star_drawing_XDrawSubController_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XFastPropertySet_idl__ 
+#include <com/sun/star/beans/XFastPropertySet.idl> 
+#endif 
+#ifndef __com_sun_star_drawing_XDrawView_idl__ 
+#include <com/sun/star/drawing/XDrawView.idl> 
+#endif 
+#ifndef __com_sun_star_view_XSelectionSupplier_idl__ 
+#include <com/sun/star/view/XSelectionSupplier.idl> 
+#endif 
+ 
+ 
+ 
+module com {  module sun {  module star {  module drawing {  
+ 
 
 /** View dependent part of the Draw and Impress controller.
     <p>During the lifetime of an Impress application the
@@ -64,11 +64,11 @@ interface XDrawSubController
         the sub controller.  Property change listeners are handled by the
         controller.
     */
-    interface com::sun::star::beans::XFastPropertySet;
-};
-
+    interface com::sun::star::beans::XFastPropertySet; 
+}; 
+ 
 
-}; }; }; };
+}; }; }; };  
 
-#endif
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XDrawView.idl b/offapi/com/sun/star/drawing/XDrawView.idl
index de6fd0bbc7c3..3ce9fc3fe0d7 100644
--- a/offapi/com/sun/star/drawing/XDrawView.idl
+++ b/offapi/com/sun/star/drawing/XDrawView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XDrawView_idl__
-#define __com_sun_star_drawing_XDrawView_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
-#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XDrawView_idl__ 
+#define __com_sun_star_drawing_XDrawView_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
+#include <com/sun/star/drawing/XDrawPage.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** is implemented by views that display <type>DrawPage</type>s or <type>MasterPage</type>s.
  */
 published interface XDrawView: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** changes the current page.
 
         @param xPage
             this <type>DrawPage</type> or <type>MasterPage</type> will be
             displayed inside this view.
      */
-    void setCurrentPage( [in] com::sun::star::drawing::XDrawPage xPage );
-
-    //-------------------------------------------------------------------------
-
+    void setCurrentPage( [in] com::sun::star::drawing::XDrawPage xPage ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the current page.
 
         @return
             the <type>DrawPage</type> or <type>MasterPage</type> that is
             currently displayed.
      */
-    com::sun::star::drawing::XDrawPage getCurrentPage();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::drawing::XDrawPage getCurrentPage(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl b/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl
index f69951d20f21..e747eeaf84c2 100644
--- a/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl
+++ b/offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XEnhancedCustomShapeDefaulter_idl__
-#define __com_sun_star_drawing_XEnhancedCustomShapeDefaulter_idl__
+#ifndef __com_sun_star_drawing_XEnhancedCustomShapeDefaulter_idl__ 
+#define __com_sun_star_drawing_XEnhancedCustomShapeDefaulter_idl__ 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 
 /**
  */
 interface XEnhancedCustomShapeDefaulter: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
-    /**
+    /** 
 
     This interface allows to create shape properties for the given "ShapeType".
     The "ShapeType" string can be empty then the current "ShapeType" of the
@@ -52,7 +52,7 @@ interface XEnhancedCustomShapeDefaulter: com::sun::star::uno::XInterface
 
         "non-primitive",
         "rectangle",
-        "round-rectangle",
+        "round-rectangle", 
         "ellipse",
         "diamond",
         "isosceles-triangle"
@@ -61,7 +61,7 @@ interface XEnhancedCustomShapeDefaulter: com::sun::star::uno::XInterface
         "trapezoid",
         "hexagon",
         "octagon",
-        "cross",
+        "cross", 
         "star5",
         "right-arrow",
         "mso-spt14",
@@ -70,7 +70,7 @@ interface XEnhancedCustomShapeDefaulter: com::sun::star::uno::XInterface
         "mso-spt17",
         "mso-spt18",
         "mso-spt19",
-        "mso-spt20",
+        "mso-spt20", 
         "mso-spt21",
         "can",
         "ring",
@@ -256,7 +256,7 @@ interface XEnhancedCustomShapeDefaulter: com::sun::star::uno::XInterface
 
     SJ: following shape types can't be created with this method, they
     are part of the gallery (soon they also will be added)
-    // gallery: quadrat
+    // gallery: quadrat		
     // gallery: round-quadrat
     // gallery: circle
     // gallery: circle-pie
@@ -282,14 +282,14 @@ interface XEnhancedCustomShapeDefaulter: com::sun::star::uno::XInterface
     // gallery: fontwork-arch-right-curve
     // gallery: fontwork-arch-left-pour
     // gallery: fontwork-arch-right-pour
-
+    
      */
     void createCustomShapeDefaults( [ in ] string aShapeType );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/drawing/XGluePointsSupplier.idl b/offapi/com/sun/star/drawing/XGluePointsSupplier.idl
index 6fd8b7a8db24..0a258076d3c1 100644
--- a/offapi/com/sun/star/drawing/XGluePointsSupplier.idl
+++ b/offapi/com/sun/star/drawing/XGluePointsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XGluePointsSupplier_idl__
-#define __com_sun_star_drawing_XGluePointsSupplier_idl__
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
-#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XGluePointsSupplier_idl__ 
+#define __com_sun_star_drawing_XGluePointsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_container_XIndexContainer_idl__ 
+#include <com/sun/star/container/XIndexContainer.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** must be supported to provide access to a container of <type>GluePoint2</type>.
  */
 published interface XGluePointsSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /**
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** 
         @return
                 a container of <type>GluePoint2</type> structs.
      */
-    com::sun::star::container::XIndexContainer getGluePoints();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::container::XIndexContainer getGluePoints(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/drawing/XLayer.idl b/offapi/com/sun/star/drawing/XLayer.idl
index 2a4f1941f0cd..738f7b406cb4 100644
--- a/offapi/com/sun/star/drawing/XLayer.idl
+++ b/offapi/com/sun/star/drawing/XLayer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XLayer_idl__
-#define __com_sun_star_drawing_XLayer_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XLayer_idl__ 
+#define __com_sun_star_drawing_XLayer_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** identifies the object as a <type>Layer</type>.
  */
 published interface XLayer: com::sun::star::beans::XPropertySet
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XLayerManager.idl b/offapi/com/sun/star/drawing/XLayerManager.idl
index 3c20758b9b0b..865fccfe649b 100644
--- a/offapi/com/sun/star/drawing/XLayerManager.idl
+++ b/offapi/com/sun/star/drawing/XLayerManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XLayerManager_idl__
-#define __com_sun_star_drawing_XLayerManager_idl__
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XLayer_idl__
-#include <com/sun/star/drawing/XLayer.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XLayerManager_idl__ 
+#define __com_sun_star_drawing_XLayerManager_idl__ 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XLayer_idl__ 
+#include <com/sun/star/drawing/XLayer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/drawing/XShape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** This interface makes it possible to access and manage the
-    <type>Layer</type>s of a document.
+    <type>Layer</type>s	of a document.
 
     @see LayerManager
  */
 published interface XLayerManager: com::sun::star::container::XIndexAccess
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** creates a new <type>Layer</type>
 
         @param nIndex
@@ -67,21 +67,21 @@ published interface XLayerManager: com::sun::star::container::XIndexAccess
         @returns
             the new created <type>Layer</type>
      */
-    com::sun::star::drawing::XLayer insertNewByIndex( [in] long nIndex );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::drawing::XLayer insertNewByIndex( [in] long nIndex ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes a <type>Layer</type> and all <type>Shape</type>s on
         this <type>Layer</type>.
 
         @param xLayer
             this <type>Layer</type> will be removed and disposed
      */
-    void remove( [in] com::sun::star::drawing::XLayer xLayer )
-            raises( com::sun::star::container::NoSuchElementException );
-
-    //-------------------------------------------------------------------------
-
+    void remove( [in] com::sun::star::drawing::XLayer xLayer ) 
+            raises( com::sun::star::container::NoSuchElementException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** attaches a <type>Shape</type> to the given <type>Layer</type>.
 
         @param xShape
@@ -90,28 +90,28 @@ published interface XLayerManager: com::sun::star::container::XIndexAccess
         @param xLayer
             this is the <type>Layer</type> that will be attached to a <type>Shape</type>
      */
-    void attachShapeToLayer( [in] com::sun::star::drawing::XShape xShape,
-             [in] com::sun::star::drawing::XLayer xLayer );
-
-    //-------------------------------------------------------------------------
-
+    void attachShapeToLayer( [in] com::sun::star::drawing::XShape xShape, 
+             [in] com::sun::star::drawing::XLayer xLayer ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** queries the <type>Layer</type> that a <type>Shape</type> is attached to
 
-        @param xShape
+        @param xShape 
             specifies the <type>Shape</type> for which the layer is requested.
 
-        @returns
-            the <type>Layer</type> to which the <type>Shape</type> is
-            attached.
-
+        @returns 
+            the <type>Layer</type> to which the <type>Shape</type> is 
+            attached. 
+                 
      */
-    com::sun::star::drawing::XLayer getLayerForShape( [in] com::sun::star::drawing::XShape xShape );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::drawing::XLayer getLayerForShape( [in] com::sun::star::drawing::XShape xShape ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XLayerSupplier.idl b/offapi/com/sun/star/drawing/XLayerSupplier.idl
index 3c5bcfdbd3b8..b5aecc8be11c 100644
--- a/offapi/com/sun/star/drawing/XLayerSupplier.idl
+++ b/offapi/com/sun/star/drawing/XLayerSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XLayerSupplier_idl__
-#define __com_sun_star_drawing_XLayerSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XLayerSupplier_idl__ 
+#define __com_sun_star_drawing_XLayerSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** gives access to a <type>LayerManager</type>.
 
-    @see        LayerManager
+    @see 		LayerManager
  */
 published interface XLayerSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
                 the <type>LayerManager</type>.
      */
-    com::sun::star::container::XNameAccess getLayerManager();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    com::sun::star::container::XNameAccess getLayerManager(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 
-#endif
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XMasterPageTarget.idl b/offapi/com/sun/star/drawing/XMasterPageTarget.idl
index 04dcab906881..763587bf194a 100644
--- a/offapi/com/sun/star/drawing/XMasterPageTarget.idl
+++ b/offapi/com/sun/star/drawing/XMasterPageTarget.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XMasterPageTarget_idl__
-#define __com_sun_star_drawing_XMasterPageTarget_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
-#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XMasterPageTarget_idl__ 
+#define __com_sun_star_drawing_XMasterPageTarget_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
+#include <com/sun/star/drawing/XDrawPage.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** is implemented by objects that can be linked to a
     <type>MasterPage</type>.
 
     @see DrawPage
  */
 published interface XMasterPageTarget: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** @returns the <type>MasterPage</type> linked to this object.
      */
-    com::sun::star::drawing::XDrawPage getMasterPage();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::drawing::XDrawPage getMasterPage(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** links a <type>MasterPage</type> to this object.
 
         @param xMasterPage
             the <type>MasterPage</type> that is linked to this object
      */
-    void setMasterPage( [in] com::sun::star::drawing::XDrawPage xMasterPage );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void setMasterPage( [in] com::sun::star::drawing::XDrawPage xMasterPage ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl b/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl
index 77d7fd1238dc..4ffc451c9ac5 100644
--- a/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl
+++ b/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XMasterPagesSupplier_idl__
-#define __com_sun_star_drawing_XMasterPagesSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPages_idl__
-#include <com/sun/star/drawing/XDrawPages.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XMasterPagesSupplier_idl__ 
+#define __com_sun_star_drawing_XMasterPagesSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XDrawPages_idl__ 
+#include <com/sun/star/drawing/XDrawPages.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** must be supported to provide access to the
     <type>MasterPage</type>s of a multi-page drawing-layer.
  */
 published interface XMasterPagesSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
                 an indexed container with the service <type>MasterPages</type>.
      */
-    com::sun::star::drawing::XDrawPages getMasterPages();
-
-};
-
-//=============================================================================
-
-}; }; }; };
+    com::sun::star::drawing::XDrawPages getMasterPages(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
 
-#endif
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XPresenterHelper.idl b/offapi/com/sun/star/drawing/XPresenterHelper.idl
index d1a2d5d3e176..8e3cf7ac3cc7 100644
--- a/offapi/com/sun/star/drawing/XPresenterHelper.idl
+++ b/offapi/com/sun/star/drawing/XPresenterHelper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -119,7 +119,7 @@ interface XPresenterHelper
             When an explicit service name is given then a new object of this
             service is created.  This service name lets the caller select a
             specific canvas implementation, e.g. with or without hardware
-            acceleration.
+            acceleration. 
     */
     ::com::sun::star::rendering::XCanvas createCanvas (
         [in] ::com::sun::star::awt::XWindow xWindow,
diff --git a/offapi/com/sun/star/drawing/XSelectionFunction.idl b/offapi/com/sun/star/drawing/XSelectionFunction.idl
index 5e7abe8b1d42..d7de4033bbcb 100644
--- a/offapi/com/sun/star/drawing/XSelectionFunction.idl
+++ b/offapi/com/sun/star/drawing/XSelectionFunction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XSelectionFunction_idl__
-#define __com_sun_star_drawing_XSelectionFunction_idl__
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_frame_XDispatch_idl__
-#include <com/sun/star/frame/XDispatch.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XKeyHandler_idl__
-#include <com/sun/star/awt/XKeyHandler.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMouseClickHandler_idl__
-#include <com/sun/star/awt/XMouseClickHandler.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XMouseMotionHandler_idl__
-#include <com/sun/star/awt/XMouseMotionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionChangeListener_idl__
+#ifndef __com_sun_star_drawing_XSelectionFunction_idl__ 
+#define __com_sun_star_drawing_XSelectionFunction_idl__ 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif  
+
+#ifndef __com_sun_star_lang_XServiceInfo_idl__ 
+#include <com/sun/star/lang/XServiceInfo.idl> 
+#endif  
+
+#ifndef __com_sun_star_frame_XDispatch_idl__ 
+#include <com/sun/star/frame/XDispatch.idl> 
+#endif  
+
+#ifndef __com_sun_star_awt_XKeyHandler_idl__ 
+#include <com/sun/star/awt/XKeyHandler.idl> 
+#endif  
+
+#ifndef __com_sun_star_awt_XMouseClickHandler_idl__ 
+#include <com/sun/star/awt/XMouseClickHandler.idl> 
+#endif  
+
+#ifndef __com_sun_star_awt_XMouseMotionHandler_idl__ 
+#include <com/sun/star/awt/XMouseMotionHandler.idl> 
+#endif  
+
+#ifndef __com_sun_star_view_XSelectionChangeListener_idl__ 
 #include <com/sun/star/view/XSelectionChangeListener.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /**
  */
 published interface XSelectionFunction
-{
+{ 
     interface ::com::sun::star::lang::XComponent;
     interface ::com::sun::star::lang::XServiceInfo;
     interface ::com::sun::star::frame::XDispatch;
@@ -77,10 +77,10 @@ published interface XSelectionFunction
     interface ::com::sun::star::awt::XMouseMotionHandler;
     interface ::com::sun::star::view::XSelectionChangeListener;
 };
+ 
+//============================================================================= 
+ 
+}; }; }; };  
 
-//=============================================================================
-
-}; }; }; };
-
-#endif
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XShape.idl b/offapi/com/sun/star/drawing/XShape.idl
index f5ba5579ee30..6869e0c44f89 100644
--- a/offapi/com/sun/star/drawing/XShape.idl
+++ b/offapi/com/sun/star/drawing/XShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,79 +24,79 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XShape_idl__
-#define __com_sun_star_drawing_XShape_idl__
-
-#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__
-#include <com/sun/star/drawing/XShapeDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
-#include <com/sun/star/awt/Point.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
-#include <com/sun/star/awt/Size.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
-#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#define __com_sun_star_drawing_XShape_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__ 
+#include <com/sun/star/drawing/XShapeDescriptor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Point_idl__ 
+#include <com/sun/star/awt/Point.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Size_idl__ 
+#include <com/sun/star/awt/Size.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
+#include <com/sun/star/beans/PropertyVetoException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** lets you do a basic transformation on a <type>Shape</type> and
     get its type.
  */
 published interface XShape: com::sun::star::drawing::XShapeDescriptor
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** gets the current position of this object.
 
         @returns
             the position of the top left edge in 100/th mm
      */
-    com::sun::star::awt::Point getPosition();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Point getPosition(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the current position of this object
 
         @param aPosition
             the position of the top left edge in 100/th mm
      */
-    void setPosition( [in] com::sun::star::awt::Point aPosition );
-
-    //-------------------------------------------------------------------------
-
+    void setPosition( [in] com::sun::star::awt::Point aPosition ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** gets the size of this object.
 
         @returns
             the size in 100/th mm
      */
-    com::sun::star::awt::Size getSize();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::awt::Size getSize(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the size of this object.
 
         @param aSize
             the size in 100/th mm
      */
-    void setSize( [in] com::sun::star::awt::Size aSize )
-            raises( com::sun::star::beans::PropertyVetoException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void setSize( [in] com::sun::star::awt::Size aSize ) 
+            raises( com::sun::star::beans::PropertyVetoException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XShapeAligner.idl b/offapi/com/sun/star/drawing/XShapeAligner.idl
index a3eda14c62b8..ed7ba262e5ad 100644
--- a/offapi/com/sun/star/drawing/XShapeAligner.idl
+++ b/offapi/com/sun/star/drawing/XShapeAligner.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XShapeAligner_idl__
-#define __com_sun_star_drawing_XShapeAligner_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShapes_idl__
-#include <com/sun/star/drawing/XShapes.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Alignment_idl__
-#include <com/sun/star/drawing/Alignment.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XShapeAligner_idl__ 
+#define __com_sun_star_drawing_XShapeAligner_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShapes_idl__ 
+#include <com/sun/star/drawing/XShapes.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_Alignment_idl__ 
+#include <com/sun/star/drawing/Alignment.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::drawing::XShapeAligner
 /** Objects implementing this interface can be used to align
     <type>Shape</type>s.
@@ -53,20 +53,20 @@
     @deprecated
  */
 published interface XShapeAligner: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::drawing::XShapeAligner::alignShapes
     /** aligns the specified <type>Shape</type>s.
      */
-    void alignShapes( [inout] com::sun::star::drawing::XShapes aShapes,
-             [in] com::sun::star::drawing::Alignment eType );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void alignShapes( [inout] com::sun::star::drawing::XShapes aShapes, 
+             [in] com::sun::star::drawing::Alignment eType ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XShapeArranger.idl b/offapi/com/sun/star/drawing/XShapeArranger.idl
index 18ca895d33f9..39a7a6b66da0 100644
--- a/offapi/com/sun/star/drawing/XShapeArranger.idl
+++ b/offapi/com/sun/star/drawing/XShapeArranger.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XShapeArranger_idl__
-#define __com_sun_star_drawing_XShapeArranger_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShapes_idl__
-#include <com/sun/star/drawing/XShapes.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_Arrangement_idl__
-#include <com/sun/star/drawing/Arrangement.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XShapeArranger_idl__ 
+#define __com_sun_star_drawing_XShapeArranger_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShapes_idl__ 
+#include <com/sun/star/drawing/XShapes.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_Arrangement_idl__ 
+#include <com/sun/star/drawing/Arrangement.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/drawing/XShape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::drawing::XShapeArranger
 /** Objects implementing this interface can be used to arrange
     <type>Shape</type>s.
@@ -57,65 +57,65 @@
     @deprecated
  */
 published interface XShapeArranger: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::drawing::XShapeArranger::arrange
     /** applies the specified <type>Arrangement</type> to
         the specified collection of <type>Shape</type>s.
      */
-    void arrange( [in] com::sun::star::drawing::XShapes xShapes,
-             [in] com::sun::star::drawing::Arrangement eType );
-
-    //-------------------------------------------------------------------------
-
+    void arrange( [in] com::sun::star::drawing::XShapes xShapes, 
+             [in] com::sun::star::drawing::Arrangement eType ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::drawing::XShapeArranger::bringToFront
-    /** moves the specified <type>Shape</type>s by a specified number
+    /** moves the specified <type>Shape</type>s by a specified number 
         of objects more to the front.
      */
-    void bringToFront( [in] com::sun::star::drawing::XShapes xShapes,
-             [in] short nSteps );
-
-    //-------------------------------------------------------------------------
-
+    void bringToFront( [in] com::sun::star::drawing::XShapes xShapes, 
+             [in] short nSteps ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::drawing::XShapeArranger::sendToBack
     /** moves the specified <type>Shape</type>s
         <var>nSteps</var> objects more to the back.
      */
-    void sendToBack( [in] com::sun::star::drawing::XShapes xShapes,
-             [in] short nSteps );
-
-    //-------------------------------------------------------------------------
-
+    void sendToBack( [in] com::sun::star::drawing::XShapes xShapes, 
+             [in] short nSteps ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::drawing::XShapeArranger::setBehindShape
     /** moves the specified collection of <type>Shape</type>s
         behind the specified single <type>Shape</type>.
      */
-    void setBehindShape( [in] com::sun::star::drawing::XShapes xShapes,
-             [in] com::sun::star::drawing::XShape xShape );
-
-    //-------------------------------------------------------------------------
-
+    void setBehindShape( [in] com::sun::star::drawing::XShapes xShapes, 
+             [in] com::sun::star::drawing::XShape xShape ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::drawing::XShapeArranger::setInFrontOf
     /** moves the specified collection of <type>Shape</type>s in
         front of the specified single <type>Shape</type>.
      */
-    void setInFrontOf( [in] com::sun::star::drawing::XShapes xShapes,
-             [in] com::sun::star::drawing::XShape xShape );
-
-    //-------------------------------------------------------------------------
-
+    void setInFrontOf( [in] com::sun::star::drawing::XShapes xShapes, 
+             [in] com::sun::star::drawing::XShape xShape ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::drawing::XShapeArranger::reverseOrder
     /** reverses the order of the specified collection of
         <type>Shape</type>s.
      */
-    void reverseOrder( [in] com::sun::star::drawing::XShapes xShapes );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void reverseOrder( [in] com::sun::star::drawing::XShapes xShapes ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XShapeBinder.idl b/offapi/com/sun/star/drawing/XShapeBinder.idl
index 42b36a85f7f7..fe6b7183c3c2 100644
--- a/offapi/com/sun/star/drawing/XShapeBinder.idl
+++ b/offapi/com/sun/star/drawing/XShapeBinder.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XShapeBinder_idl__
-#define __com_sun_star_drawing_XShapeBinder_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShapes_idl__
-#include <com/sun/star/drawing/XShapes.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XShapeBinder_idl__ 
+#define __com_sun_star_drawing_XShapeBinder_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/drawing/XShape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShapes_idl__ 
+#include <com/sun/star/drawing/XShapes.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** connects or breaks the lines of <type>Shape</type>s
  */
 published interface XShapeBinder: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** binds <type>Shape</type>s together.
 
         @param xShapes
@@ -65,10 +65,10 @@ published interface XShapeBinder: com::sun::star::uno::XInterface
             line segment from the supplied <type>Shape</type>s. It is also added
             to the <type>GenericDrawPage</type> of the source <type>Shape</type>s.
      */
-    com::sun::star::drawing::XShape bind( [in] com::sun::star::drawing::XShapes xShapes );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::drawing::XShape bind( [in] com::sun::star::drawing::XShapes xShapes ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** breaks a <type>Shape</type> into its line segments
 
         @param xShape
@@ -77,13 +77,13 @@ published interface XShapeBinder: com::sun::star::uno::XInterface
             new <type>PolyPolygonBezierShape</type> shapes. The original <type>Shape</type>
             will be removed from its <type>GenericDrawPage</type> and disposed.
      */
-    void unbind( [in] com::sun::star::drawing::XShape xShape );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void unbind( [in] com::sun::star::drawing::XShape xShape ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XShapeCombiner.idl b/offapi/com/sun/star/drawing/XShapeCombiner.idl
index f97d15122440..93535c6a9cfe 100644
--- a/offapi/com/sun/star/drawing/XShapeCombiner.idl
+++ b/offapi/com/sun/star/drawing/XShapeCombiner.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XShapeCombiner_idl__
-#define __com_sun_star_drawing_XShapeCombiner_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShapes_idl__
-#include <com/sun/star/drawing/XShapes.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XShapeCombiner_idl__ 
+#define __com_sun_star_drawing_XShapeCombiner_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/drawing/XShape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShapes_idl__ 
+#include <com/sun/star/drawing/XShapes.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** specifies the combine/split functionality.
  */
 published interface XShapeCombiner: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** combines <type>Shape</type>s
-
+        
         @param xShapes
             the <type>Shape</type>s inside this container are converted
             to <type>PolyPolygonBezierShape</type>s and are than combined
@@ -65,28 +65,28 @@ published interface XShapeCombiner: com::sun::star::uno::XInterface
             a newly created <type>PolyPolygonBezierShape</type> which contains all
             converted <type>PolyPolygonBezierShape</type> combined. It is also added
             to the <type>GenericDrawPage</type> of the source <type>Shape</type>s.
-
+            
      */
-    com::sun::star::drawing::XShape combine( [in] com::sun::star::drawing::XShapes xShapes );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::drawing::XShape combine( [in] com::sun::star::drawing::XShapes xShapes ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** splits <type>Shape</type>s.
 
         @param xShapes
-            the <type>Shape</type> is converted to a
+            the <type>Shape</type> is converted to a 
             <type>PolyPolygonBezierShape</type>s and then splited into
             several <type>PolyPolygonBezierShape</type>s
             The <type>Shape</types>s in xShape will be removed from the
             <type>GenericDrawPage</type> and disposed.
      */
-    void split( [in] com::sun::star::drawing::XShape xGroup );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void split( [in] com::sun::star::drawing::XShape xGroup ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XShapeDescriptor.idl b/offapi/com/sun/star/drawing/XShapeDescriptor.idl
index dbadb01be765..c0d1830fe0b1 100644
--- a/offapi/com/sun/star/drawing/XShapeDescriptor.idl
+++ b/offapi/com/sun/star/drawing/XShapeDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__
-#define __com_sun_star_drawing_XShapeDescriptor_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__ 
+#define __com_sun_star_drawing_XShapeDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** offers some settings which are allowed even for objects which are not yet inserted into a draw page.
 
     @deprecated
         replaced by <type scope="com::sun::star::lang">XServiceName</type>
  */
 published interface XShapeDescriptor: com::sun::star::uno::XInterface
-{
+{ 
     /**
         @returns
             the programmatic name of the shape type.
     */
-    string getShapeType();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string getShapeType(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XShapeGroup.idl b/offapi/com/sun/star/drawing/XShapeGroup.idl
index 66013be4bacb..536d1f2645e9 100644
--- a/offapi/com/sun/star/drawing/XShapeGroup.idl
+++ b/offapi/com/sun/star/drawing/XShapeGroup.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,62 +24,62 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XShapeGroup_idl__
-#define __com_sun_star_drawing_XShapeGroup_idl__
-
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XShapeGroup_idl__ 
+#define __com_sun_star_drawing_XShapeGroup_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/drawing/XShape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** is implemented by <type>Shape</type>s that contain other
     <type>Shape</type>s.
 
     @deprecated
  */
 published interface XShapeGroup: com::sun::star::drawing::XShape
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::drawing::XShapeGroup::enterGroup
-    /** enters the group which enables the editing function
+    /** enters the group which enables the editing function 
         for the parts of a grouped <type>Shape</type>. Then the parts can
         be edited instead of the group as a whole.
-
-
-
+        
+        
+        
         <p>This affects only the user interface. The behavior is not
         specified if this instance is not visible on any view. In this case
         it may or may not work.</p>
      */
-    void enterGroup();
-
-    //-------------------------------------------------------------------------
-
+    void enterGroup(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::drawing::XShapeGroup::leaveGroup
-    /** leaves the group, which disables the editing function
+    /** leaves the group, which disables the editing function 
         for the parts of a grouped <type>Shape</type>. Then only the
         group as a whole can be edited.
-
-
-
+        
+        
+        
         <p>This affects only the user interface. The behavior is not
         specified if this instance is not visible on any view. In this case
         it may or may not work.</p>
      */
-    void leaveGroup();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void leaveGroup(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XShapeGrouper.idl b/offapi/com/sun/star/drawing/XShapeGrouper.idl
index a5474b35a5d7..4611f5cad369 100644
--- a/offapi/com/sun/star/drawing/XShapeGrouper.idl
+++ b/offapi/com/sun/star/drawing/XShapeGrouper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XShapeGrouper_idl__
-#define __com_sun_star_drawing_XShapeGrouper_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShapeGroup_idl__
-#include <com/sun/star/drawing/XShapeGroup.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShapes_idl__
-#include <com/sun/star/drawing/XShapes.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XShapeGrouper_idl__ 
+#define __com_sun_star_drawing_XShapeGrouper_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShapeGroup_idl__ 
+#include <com/sun/star/drawing/XShapeGroup.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShapes_idl__ 
+#include <com/sun/star/drawing/XShapes.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** specifies the group/ungroup functionality.
  */
 published interface XShapeGrouper: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** groups the <type>Shape</type>s inside a collection.
 
         <p>Grouping of objects in text documents works only if none
-        of the objects has an anchor of type
+        of the objects has an anchor of type 
         <member scope="com::sun::star::text::TextContentAnchorType">AS_CHARACTER</member>
         </p>.
 
@@ -69,25 +69,25 @@ published interface XShapeGrouper: com::sun::star::uno::XInterface
             <type>GenericDrawPage</type> of the <type>Shape</type>s
             in xShapes.
      */
-    com::sun::star::drawing::XShapeGroup group( [in] com::sun::star::drawing::XShapes xShapes );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::drawing::XShapeGroup group( [in] com::sun::star::drawing::XShapes xShapes ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** ungroups a given <type>GroupShape</type>.
 
         @param aGroup
             moves all <type>Shape</type>s from this <type>GroupShape</type>
             to the parent <type>XShapes</type> of the <type>GroupShape</type>.
-            The <type>GroupShape</type> is than removed from the
+            The <type>GroupShape</type> is than removed from the 
             <type>GenericDrawPage</type> and disposed.
      */
-    void ungroup( [in] com::sun::star::drawing::XShapeGroup aGroup );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void ungroup( [in] com::sun::star::drawing::XShapeGroup aGroup ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XShapeMirror.idl b/offapi/com/sun/star/drawing/XShapeMirror.idl
index 1a64265bd10f..5bbe7e97bec9 100644
--- a/offapi/com/sun/star/drawing/XShapeMirror.idl
+++ b/offapi/com/sun/star/drawing/XShapeMirror.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XShapeMirror_idl__
-#define __com_sun_star_drawing_XShapeMirror_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShapes_idl__
-#include <com/sun/star/drawing/XShapes.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_MirrorAxis_idl__
-#include <com/sun/star/drawing/MirrorAxis.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XShapeMirror_idl__ 
+#define __com_sun_star_drawing_XShapeMirror_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShapes_idl__ 
+#include <com/sun/star/drawing/XShapes.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_MirrorAxis_idl__ 
+#include <com/sun/star/drawing/MirrorAxis.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/drawing/XShape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** Objects implementing this interface can be used to mirror
     <type>Shape</type>s.
 
     @deprecated
  */
 published interface XShapeMirror: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** mirrors the given <type>Shape</type>s
         at the given axis.
      */
-    void mirror( [inout] com::sun::star::drawing::XShapes aShapes,
-             [in] com::sun::star::drawing::MirrorAxis eAxis );
-
-    //-------------------------------------------------------------------------
-
+    void mirror( [inout] com::sun::star::drawing::XShapes aShapes, 
+             [in] com::sun::star::drawing::MirrorAxis eAxis ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** mirrors the given <type>Shape</type>s at
         the given axis.
      */
-    void mirrorAtAxis( [inout] com::sun::star::drawing::XShapes aShapes,
-             [in] com::sun::star::drawing::XShape aLine );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void mirrorAtAxis( [inout] com::sun::star::drawing::XShapes aShapes, 
+             [in] com::sun::star::drawing::XShape aLine ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XShapes.idl b/offapi/com/sun/star/drawing/XShapes.idl
index b0b9c78646b5..499800d03b17 100644
--- a/offapi/com/sun/star/drawing/XShapes.idl
+++ b/offapi/com/sun/star/drawing/XShapes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,57 +24,57 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XShapes_idl__
-#define __com_sun_star_drawing_XShapes_idl__
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XShapes_idl__ 
+#define __com_sun_star_drawing_XShapes_idl__ 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/drawing/XShape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to access, add, and remove the
     <type>Shape</type>s in a collection.
-
-    @see DrawPage
+    
+    @see DrawPage 
     @see MasterPage
     @see DrawingDocumentDrawView
  */
 published interface XShapes: com::sun::star::container::XIndexAccess
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** inserts a <type>Shape</type> into this collection.
 
         @param xShape
             a <type>Shape</type> that will be inserted.
      */
-    void add( [in] com::sun::star::drawing::XShape xShape );
-
-    //-------------------------------------------------------------------------
-
+    void add( [in] com::sun::star::drawing::XShape xShape ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes a <type>Shape</type> from this collection.
 
         @param xShape
             the <type>Shape</type> will be removed from the
             collection and disposed.
      */
-    void remove( [in] com::sun::star::drawing::XShape xShape );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void remove( [in] com::sun::star::drawing::XShape xShape ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/XSlidePreviewCache.idl b/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
index ee40c5f34fa6..db615f0a21d9 100644
--- a/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
+++ b/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,7 +49,7 @@ module com { module sun { module star { module drawing {
 
 /** Listener for asynchronous preview creations.  Called when a slide
     preview has been created that was previously requested via a call to
-    <method>XSlidePreviewCache::getSlidePreview()</method>.  The
+    <method>XSlidePreviewCache::getSlidePreview()</method>.  The 
     implementor may then call <method>getSlidePreview()</method> a second
     time to get the up-to-date version of the preview.
 */
diff --git a/offapi/com/sun/star/drawing/XSlideRenderer.idl b/offapi/com/sun/star/drawing/XSlideRenderer.idl
index c2ad6030de9d..af4e01a833bd 100644
--- a/offapi/com/sun/star/drawing/XSlideRenderer.idl
+++ b/offapi/com/sun/star/drawing/XSlideRenderer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -94,7 +94,7 @@ interface XSlideRenderer
         [in] com::sun::star::awt::Size aMaximumPreviewPixelSize,
         [in] short nSuperSampleFactor,
         [in] com::sun::star::rendering::XCanvas xCanvas);
-
+    
     /** Return a size that has the given aspect ratio and shares either the
         width or the height with the given maximum size.
         @param nSlideAspectRatio
diff --git a/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl b/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
index 60286c3271d6..2dac30e00983 100644
--- a/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
+++ b/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_drawing_XUniversalShapeDescriptor_idl__
-#define __com_sun_star_drawing_XUniversalShapeDescriptor_idl__
-
-#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__
-#include <com/sun/star/drawing/XShapeDescriptor.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module drawing {
-
-//=============================================================================
-
+#ifndef __com_sun_star_drawing_XUniversalShapeDescriptor_idl__ 
+#define __com_sun_star_drawing_XUniversalShapeDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XShapeDescriptor_idl__ 
+#include <com/sun/star/drawing/XShapeDescriptor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module drawing {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::drawing::XUniversalShapeDescriptor
 /** @deprecated
  */
 published interface XUniversalShapeDescriptor: com::sun::star::drawing::XShapeDescriptor
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR XUniversalShapeDescriptor::setShapeType
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR XUniversalShapeDescriptor::setShapeType 
+    
     // DocMerge: empty anyway
-    void setShapeType( [in] string aShapeTypeName );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void setShapeType( [in] string aShapeTypeName ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl b/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
index afcea77be685..6d99dbc41850 100644
--- a/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
+++ b/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl b/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl
index 2797362aade5..6f478627ecb1 100644
--- a/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/BasicPaneFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl b/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl
index e0a1529177d1..273293e43e8f 100644
--- a/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/BasicToolBarFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl b/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl
index ffde0f8b4cb7..85528e990b7f 100644
--- a/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/BasicViewFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/framework/Configuration.idl b/offapi/com/sun/star/drawing/framework/Configuration.idl
index 3c070f8784a9..6b5e9e85c79e 100644
--- a/offapi/com/sun/star/drawing/framework/Configuration.idl
+++ b/offapi/com/sun/star/drawing/framework/Configuration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ module com { module sun { module star { module drawing { module framework {
     <p>Most likely use is the <member
     scope="XConfigurationController">restoreConfiguration()</member>
     method.</p>
-
+    
     @see XConfiguration
         for a description of the configuration.
 */
diff --git a/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl b/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl
index f5d37a917383..44c359b6be92 100644
--- a/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl
+++ b/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/framework/ConfigurationController.idl b/offapi/com/sun/star/drawing/framework/ConfigurationController.idl
index 23e43ab70a0c..1504f40765e7 100644
--- a/offapi/com/sun/star/drawing/framework/ConfigurationController.idl
+++ b/offapi/com/sun/star/drawing/framework/ConfigurationController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ module com { module sun { module star { module drawing { module framework {
     configuration controller.
 
     <p>This service is used at the moment by the
-    <type>XControllerManager</type> to create a configuration controller.
+    <type>XControllerManager</type> to create a configuration controller. 
     This allows developers to replace the default implementation of the
     configuration controller with their own.  This may not be a usefull
     feature.  Furthermore the sub controllers may need a tighter coupling
diff --git a/offapi/com/sun/star/drawing/framework/ModuleController.idl b/offapi/com/sun/star/drawing/framework/ModuleController.idl
index 3966a6fafb60..15dbe1da36e4 100644
--- a/offapi/com/sun/star/drawing/framework/ModuleController.idl
+++ b/offapi/com/sun/star/drawing/framework/ModuleController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ module com { module sun { module star { module drawing { module framework {
     <p>The <type>ModuleController</type> object for an application can be
     obtained via the <type>XControllerManager</type> interface.</type>
 */
-service ModuleController : XModuleController
+service ModuleController : XModuleController 
 {
     /** Create a new instance of a <type>ModuleController</type> as sub
         controller of the given <type>XController</type> object.
diff --git a/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl b/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl
index a62e47d01302..07d896e45eaa 100644
--- a/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl
+++ b/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@ module com { module sun { module star { module drawing { module framework {
 
 /** The ResourceActivationMode specifies, for example for the <member
     scope="com::sun::star::drawing::framework"
-    >XConfigurationController::requestResourceActivation()</member>,
+    >XConfigurationController::requestResourceActivation()</member>, 
     whether a requested resource is to replace an existing resource of the
     same class or is to be activated additionally.
 */
diff --git a/offapi/com/sun/star/drawing/framework/ResourceId.idl b/offapi/com/sun/star/drawing/framework/ResourceId.idl
index 635744f69246..8aec771b3299 100644
--- a/offapi/com/sun/star/drawing/framework/ResourceId.idl
+++ b/offapi/com/sun/star/drawing/framework/ResourceId.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/framework/TabBarButton.idl b/offapi/com/sun/star/drawing/framework/TabBarButton.idl
index 3ba80cefd3f8..398c4b81bfcc 100644
--- a/offapi/com/sun/star/drawing/framework/TabBarButton.idl
+++ b/offapi/com/sun/star/drawing/framework/TabBarButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 module com { module sun { module star { module drawing { module framework {
 
 interface XResourceId;
-
+                                                
 /** Descriptor of a tab bar button.  Tab bar buttons are typically used to
     offer the user the choice between different views to be disiplayed in
     one pane.
diff --git a/offapi/com/sun/star/drawing/framework/XConfiguration.idl b/offapi/com/sun/star/drawing/framework/XConfiguration.idl
index e0af30491710..94fac0dd24d5 100644
--- a/offapi/com/sun/star/drawing/framework/XConfiguration.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfiguration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -117,7 +117,7 @@ interface XConfiguration
             IllegalArgumentException is thrown.
     */
     void addResource ([in] XResourceId xResourceId);
-
+    
     /** Remove a resource from the configuration.
         <p>This method should be used only by objects that implement the
         <type>XConfigurationRequest</type> interface or by the configuration
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl b/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl
index d487786387b5..8412320b17cc 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl b/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl
index 8fff19cd27ad..0f4b6032d526 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
index f7d01faf44db..d50b2bf3f03c 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ interface XConfigurationChangeListener;
 interface XConfigurationChangeRequest;
 interface XResourceId;
 interface XResource;
-
+    
 /** The configuration controller is responsible for the management of the
     set of active resources.
 
@@ -62,18 +62,18 @@ interface XResource;
     <member>requestResourceActivation()</member> and
     <member>requestResourceDeactivation()</member>.</li>
     </ul></p>
-
+    
     <p>When the two configurations differ then the current configuration is
     updated eventually to reflect the requested configuration.  An update
     takes place when the following three conditions are fullfilled.
     <ol>
     <li>when the last pending request for configuration changes has been
-    processed,</li>
+    processed,</li> 
     <li>when the <member>update()</member> method is called.</li>
     <li>when the configuration manager it is unlocked after formerly being
     locked.</li>
     </ol></p>
-
+    
     <p>Requests for configuration changes are handled in a two step process:
     <ol>
     <li>First the requested configuration is updated iteratively: Every
@@ -94,7 +94,7 @@ interface XResource;
     <p>This process goes on until the queue of request objects becomes
     empty.  Until this point only the requested configuration has been
     modified.  No resources have been activated or deactivated.</p></li>
-
+    
     <li><p>The second update step activates or deactivates resources so that
     the current configuration (the one that comprises the actually active
     resources) reflects the requested configuration.</p>
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl b/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl
index 6da775a13fea..d36f4467ae2d 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl b/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
index ebd171cb4f23..885448f2b5f3 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@ interface XConfigurationChangeRequest;
 
 /** The request queue of the configuration controller handles requests for
     changes to the current configuration.
-
+    
     <p>This interface allows callers to add requests to the back of the
     queue and to determine wheter the queue is empty.  Using this interace
     should normally not be necessary for anyone else than the
diff --git a/offapi/com/sun/star/drawing/framework/XControllerManager.idl b/offapi/com/sun/star/drawing/framework/XControllerManager.idl
index fba9b5f920ca..40990d04bdf5 100644
--- a/offapi/com/sun/star/drawing/framework/XControllerManager.idl
+++ b/offapi/com/sun/star/drawing/framework/XControllerManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@ interface XModuleController;
     framework.
     <p>The <type>XControllerManager</type> interface is typically
     implemented by the same object that implements <type
-    scope="com::sun::star::frame">XController</type>.</p>
+    scope="com::sun::star::frame">XController</type>.</p> 
 */
 interface XControllerManager
 {
diff --git a/offapi/com/sun/star/drawing/framework/XModuleController.idl b/offapi/com/sun/star/drawing/framework/XModuleController.idl
index b115f955fac0..7a54c77e189a 100644
--- a/offapi/com/sun/star/drawing/framework/XModuleController.idl
+++ b/offapi/com/sun/star/drawing/framework/XModuleController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/framework/XPane.idl b/offapi/com/sun/star/drawing/framework/XPane.idl
index ad0bc7dbb791..d75cb68007a0 100644
--- a/offapi/com/sun/star/drawing/framework/XPane.idl
+++ b/offapi/com/sun/star/drawing/framework/XPane.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,7 +59,7 @@ interface XPane
     ::com::sun::star::awt::XWindow getWindow ();
 
     /** Return the <type scope="com::sun::star::awt">XCanvas</type> of the pane.  The
-        <type scope="com::sun::star::rendering">XCanvas</type> object is expected to
+        <type scope="com::sun::star::rendering">XCanvas</type> object is expected to 
         be associated with the <type
         scope="com::sun::star::awt">XWindow</type> object returned by
         <member>getWindow()</member>.
diff --git a/offapi/com/sun/star/drawing/framework/XPane2.idl b/offapi/com/sun/star/drawing/framework/XPane2.idl
index 85fec5a311cb..2784e5fe3ec0 100644
--- a/offapi/com/sun/star/drawing/framework/XPane2.idl
+++ b/offapi/com/sun/star/drawing/framework/XPane2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -61,7 +61,7 @@ interface XPane2
         object is usually set at the topmost window.  However, the details
         are implementation dependent.
         @param xAccessible
-            May be an empty reference.
+            May be an empty reference.  
     */
     void setAccessible ([in] ::com::sun::star::accessibility::XAccessible xAccessible);
 
diff --git a/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl b/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
index e9d875897a40..11b703dbd787 100644
--- a/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
+++ b/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,7 +52,7 @@ enum BorderType
 
 
 /** Paint the border around a rectangular region, typically a pane.
-
+    
     <p>Calling objects have to be able to derive inner bounding boxs of the
     border from the outer ones and inner ones from outer ones.  This
     conversion and the painting of the border involves three rectangles.
diff --git a/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl b/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
index 9c8af5a15620..f34013170673 100644
--- a/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
+++ b/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/framework/XResource.idl b/offapi/com/sun/star/drawing/framework/XResource.idl
index c0dbbe95141d..312d7ed2777f 100644
--- a/offapi/com/sun/star/drawing/framework/XResource.idl
+++ b/offapi/com/sun/star/drawing/framework/XResource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/framework/XResourceFactory.idl b/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
index 4bb8b09bc8ad..5193d09f8d1c 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl b/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
index 1926c38c2774..595f41314816 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ module com { module sun { module star { module drawing { module framework {
 
 interface XResourceId;
 interface XResourceFactory;
-
+                                                
 /** The XResourceFactoryManager is part of the configuration controller and
     manages the set of registered resource factories.
 
diff --git a/offapi/com/sun/star/drawing/framework/XResourceId.idl b/offapi/com/sun/star/drawing/framework/XResourceId.idl
index 6d24fbed092f..3ca156ad2b9e 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceId.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceId.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/framework/XTabBar.idl b/offapi/com/sun/star/drawing/framework/XTabBar.idl
index 8213b9babe0a..7ade5dfcd4f8 100644
--- a/offapi/com/sun/star/drawing/framework/XTabBar.idl
+++ b/offapi/com/sun/star/drawing/framework/XTabBar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/framework/XToolBar.idl b/offapi/com/sun/star/drawing/framework/XToolBar.idl
index 364406affc7f..7cb8c44f1175 100644
--- a/offapi/com/sun/star/drawing/framework/XToolBar.idl
+++ b/offapi/com/sun/star/drawing/framework/XToolBar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/framework/XView.idl b/offapi/com/sun/star/drawing/framework/XView.idl
index c773cd903a00..55291529055a 100644
--- a/offapi/com/sun/star/drawing/framework/XView.idl
+++ b/offapi/com/sun/star/drawing/framework/XView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/drawing/modules.idl b/offapi/com/sun/star/drawing/modules.idl
index 5c9fe1d58c31..ff869c7514d3 100644
--- a/offapi/com/sun/star/drawing/modules.idl
+++ b/offapi/com/sun/star/drawing/modules.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/Actions.idl b/offapi/com/sun/star/embed/Actions.idl
index 48ad78eb0ab2..e57f4aeca942 100644
--- a/offapi/com/sun/star/embed/Actions.idl
+++ b/offapi/com/sun/star/embed/Actions.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@ module com { module sun { module star { module embed {
 
 //============================================================================
 /** This constant set contains possible actions that could be approved by
-<type>ActionsApproval</type> implementation.
+<type>ActionsApproval</type> implementation. 
 */
 published constants Actions
 {
@@ -41,7 +41,7 @@ published constants Actions
     /** "Prevent Close" - throws veto excetion if target object is going to
         close.
 
-        <p>
+        <p> 
         Usually a <type scope="com::sun::star::util">XCloseListener</type>
         implementation could use this constant to request approval to throw
         veto exception.
@@ -53,7 +53,7 @@ published constants Actions
     /** "Prevent Termination" - throws veto excetion if target object is going
         to terminate.
 
-        <p>
+        <p> 
         Usually a <type scope="com::sun::star::frame">XTerminateListener</type>
         implementation could use this constant to request approval to throw
         veto exception.
diff --git a/offapi/com/sun/star/embed/Aspects.idl b/offapi/com/sun/star/embed/Aspects.idl
index 28431b60f87e..bc15254b5338 100644
--- a/offapi/com/sun/star/embed/Aspects.idl
+++ b/offapi/com/sun/star/embed/Aspects.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/BaseStorage.idl b/offapi/com/sun/star/embed/BaseStorage.idl
index 81df39792b75..cc55208ca500 100644
--- a/offapi/com/sun/star/embed/BaseStorage.idl
+++ b/offapi/com/sun/star/embed/BaseStorage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,11 +28,11 @@
 #ifndef __com_sun_star_embed_BaseStorage_idl__
 #define __com_sun_star_embed_BaseStorage_idl__
 
-#ifndef __com_sun_star_embed_XStorage_idl__
+#ifndef __com_sun_star_embed_XStorage_idl__ 
 #include <com/sun/star/embed/XStorage.idl>
 #endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
 
diff --git a/offapi/com/sun/star/embed/DocumentCloser.idl b/offapi/com/sun/star/embed/DocumentCloser.idl
index 9b0eaf617527..89e52c794324 100644
--- a/offapi/com/sun/star/embed/DocumentCloser.idl
+++ b/offapi/com/sun/star/embed/DocumentCloser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,14 +50,14 @@ module com {  module sun {  module star {  module embed {
 //-----------------------------------------------------------------------------
 /** The main task of this service is to close an office document frame embedded
     in an application running in another process correctly.
-
+    
     <p>
     The usual usage of this service is to create it, initialize with document
     frame, and to dispose the service. While disposing the service will do all
     the required actions to let the frame be closed using
     <type scope="com::sun::star::util">XCloseable</type>::close( true ). Thus
     in case there is a code that prevents closing of the frame the code
-    avtomatically becomes the owner of the frame.
+    avtomatically becomes the owner of the frame. 
     </p>
 
     <p>
diff --git a/offapi/com/sun/star/embed/ElementModes.idl b/offapi/com/sun/star/embed/ElementModes.idl
index 314036fd45ec..c43247ba4a65 100644
--- a/offapi/com/sun/star/embed/ElementModes.idl
+++ b/offapi/com/sun/star/embed/ElementModes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/EmbedMapUnits.idl b/offapi/com/sun/star/embed/EmbedMapUnits.idl
index ff8a3cebada5..045590dfa1dd 100644
--- a/offapi/com/sun/star/embed/EmbedMapUnits.idl
+++ b/offapi/com/sun/star/embed/EmbedMapUnits.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/EmbedMisc.idl b/offapi/com/sun/star/embed/EmbedMisc.idl
index a1e05224b00b..379f4d18bacd 100644
--- a/offapi/com/sun/star/embed/EmbedMisc.idl
+++ b/offapi/com/sun/star/embed/EmbedMisc.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/EmbedStates.idl b/offapi/com/sun/star/embed/EmbedStates.idl
index df94cfa045a5..89536b5fac46 100644
--- a/offapi/com/sun/star/embed/EmbedStates.idl
+++ b/offapi/com/sun/star/embed/EmbedStates.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,8 +42,8 @@ published constants EmbedStates
     /** "Loaded" - the persistent representation of the object is loaded in
         memory.
 
-        <p>
-        The object is created and assigned with a persistent entry,
+        <p> 
+        The object is created and assigned with a persistent entry, 
         and a view representation ( metafile and etc. ) can be retrieved
         ( if there is any ).
         </p>
@@ -52,7 +52,7 @@ published constants EmbedStates
 
     //------------------------------------------------------------------------
     /** "Running" - the object is connected and loaded.
-
+    
         <p>
         The object has a connection to the container client and a component
         loaded from persistent entry. In case of internal document it also
diff --git a/offapi/com/sun/star/embed/EmbedUpdateModes.idl b/offapi/com/sun/star/embed/EmbedUpdateModes.idl
index 9060aa965909..725469b0c3fe 100644
--- a/offapi/com/sun/star/embed/EmbedUpdateModes.idl
+++ b/offapi/com/sun/star/embed/EmbedUpdateModes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/EmbedVerbs.idl b/offapi/com/sun/star/embed/EmbedVerbs.idl
index 5d34fb1e8153..74b3584e495c 100644
--- a/offapi/com/sun/star/embed/EmbedVerbs.idl
+++ b/offapi/com/sun/star/embed/EmbedVerbs.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl b/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
index 5a47c8f8fafc..ec4e56c230dc 100644
--- a/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
+++ b/offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/EntryInitModes.idl b/offapi/com/sun/star/embed/EntryInitModes.idl
index ae67192d323a..f2a9bb920867 100644
--- a/offapi/com/sun/star/embed/EntryInitModes.idl
+++ b/offapi/com/sun/star/embed/EntryInitModes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/FileSystemStorage.idl b/offapi/com/sun/star/embed/FileSystemStorage.idl
index 2b4d7d456751..f8b6b6eb680a 100644
--- a/offapi/com/sun/star/embed/FileSystemStorage.idl
+++ b/offapi/com/sun/star/embed/FileSystemStorage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_embed_FileSystemStorage_idl__
 #define __com_sun_star_embed_FileSystemStorage_idl__
 
-#ifndef __com_sun_star_embed_BaseStorage_idl__
+#ifndef __com_sun_star_embed_BaseStorage_idl__ 
 #include <com/sun/star/embed/BaseStorage.idl>
 #endif
 
@@ -104,7 +104,7 @@ published service FileSystemStorage
                 This property is not optional for this service.
             </dd>
         </dl>
-
+                
      */
     service BaseStorage;
 };
diff --git a/offapi/com/sun/star/embed/FileSystemStorageFactory.idl b/offapi/com/sun/star/embed/FileSystemStorageFactory.idl
index d27541d703ef..5fc37023c192 100644
--- a/offapi/com/sun/star/embed/FileSystemStorageFactory.idl
+++ b/offapi/com/sun/star/embed/FileSystemStorageFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_embed_FileSystemStorageFactory_idl__
 #define __com_sun_star_embed_FileSystemStorageFactory_idl__
 
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
+#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__ 
 #include <com/sun/star/lang/XSingleServiceFactory.idl>
 #endif
 
@@ -55,7 +55,7 @@ published service FileSystemStorageFactory
         </p>
 
         <p>
-        In case
+        In case 
         <method scope="com::sun::star::lang">XSingleServiceFactory::createInstanceWithArguments</method>
         call is used a sequence of the following parameters can be used:
         </p>
@@ -66,13 +66,13 @@ published service FileSystemStorageFactory
                       specifies source of the object, it must be a string
                       containing URL.
             </dd>
-
+            
             <dt>parameter 2</dt>
             <dd>
                       specifies mode the storage should be open in, can take
                       values from <type>ElementModes</type> constant set.
             </dd>
-
+            
             <dt>parameter 3</dt>
             <dd>
                       allowes to provide
diff --git a/offapi/com/sun/star/embed/InsertedObjectInfo.idl b/offapi/com/sun/star/embed/InsertedObjectInfo.idl
index dedfabb75a8f..8453743d3a62 100644
--- a/offapi/com/sun/star/embed/InsertedObjectInfo.idl
+++ b/offapi/com/sun/star/embed/InsertedObjectInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,9 +24,9 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_embed_InsertedObjectInfo_idl__
-#define __com_sun_star_embed_InsertedObjectInfo_idl__
-
+#ifndef __com_sun_star_embed_InsertedObjectInfo_idl__ 
+#define __com_sun_star_embed_InsertedObjectInfo_idl__ 
+ 
 #ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
 #endif
@@ -35,25 +35,25 @@
 #include <com/sun/star/embed/XEmbeddedObject.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module embed {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module embed {  
+ 
+//============================================================================= 
+ 
 /** is intended to provide result of creation of an embedded object by dialog.
  */
 published struct InsertedObjectInfo
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** The new created embedded object.
      */
     XEmbeddedObject Object;
 
-     //-------------------------------------------------------------------------
+     //------------------------------------------------------------------------- 
     /** Container related options selected by user.
 
-        <p>
+        <p> 
         A dialog related to embedded object creation usually allows user
         to make some choiches that can be container related. This information
         can be provided by this member.
@@ -61,11 +61,11 @@ published struct InsertedObjectInfo
      */
     sequence < ::com::sun::star::beans::NamedValue > Options;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/embed/InstanceLocker.idl b/offapi/com/sun/star/embed/InstanceLocker.idl
index 3258dc3b9365..b5e378711909 100644
--- a/offapi/com/sun/star/embed/InstanceLocker.idl
+++ b/offapi/com/sun/star/embed/InstanceLocker.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ module com {  module sun {  module star {  module embed {
 //-----------------------------------------------------------------------------
 /** The main task of this service is to prevent closing, terminating and/or
     etc. of controlled object.
-
+    
     <p>
     After creation the service adds a listener of requested type
     ( close, terminate and/or etc. ) to the controlled object and let
@@ -69,7 +69,7 @@ published service InstanceLocker : com::sun::star::lang::XComponent
                 specifies the actions that should be done ( prevent closing,
                 prevent termination and/or etc. ). It must not be empty and can
                 currently contain following values or their combination:
-                <type>Actions</type>::PREVENT_CLOSE and
+                <type>Actions</type>::PREVENT_CLOSE and 
                 <type>Actions</type>::PREVENT_TERMINATION.
      */
     InstanceLockerCtor1( [in] com::sun::star::uno::XInterface xInstance,
@@ -88,7 +88,7 @@ published service InstanceLocker : com::sun::star::lang::XComponent
                 specifies the actions that should be done ( prevent closing,
                 prevent termination and/or etc. ). It must not be empty and can
                 currently contain following values or their combination:
-                <type>Actions</type>::PREVENT_CLOSE and
+                <type>Actions</type>::PREVENT_CLOSE and 
                 <type>Actions</type>::PREVENT_TERMINATION.
 
         @param xApprove
diff --git a/offapi/com/sun/star/embed/InvalidStorageException.idl b/offapi/com/sun/star/embed/InvalidStorageException.idl
index f4eabfb8908e..4e74f8a6e8e2 100644
--- a/offapi/com/sun/star/embed/InvalidStorageException.idl
+++ b/offapi/com/sun/star/embed/InvalidStorageException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_embed_InvalidStorageException_idl__
-#define __com_sun_star_embed_InvalidStorageException_idl__
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
+#ifndef __com_sun_star_embed_InvalidStorageException_idl__ 
+#define __com_sun_star_embed_InvalidStorageException_idl__ 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
 //============================================================================
-
- module com {  module sun {  module star {  module embed {
-
+ 
+ module com {  module sun {  module star {  module embed {  
+ 
 //============================================================================
-
+ 
 /** This exception can be thrown in case a storage is invalid.
 
     <p>
@@ -45,12 +45,12 @@
     </p>
  */
 published exception InvalidStorageException: com::sun::star::io::IOException
-{
-};
-
+{ 
+}; 
+ 
 //============================================================================
-
-}; }; }; };
-
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/embed/LinkageMisuseException.idl b/offapi/com/sun/star/embed/LinkageMisuseException.idl
index fec43851a373..88153d25cac8 100644
--- a/offapi/com/sun/star/embed/LinkageMisuseException.idl
+++ b/offapi/com/sun/star/embed/LinkageMisuseException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_embed_LinkageMisuseException_idl__
-#define __com_sun_star_embed_LinkageMisuseException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
+#ifndef __com_sun_star_embed_LinkageMisuseException_idl__ 
+#define __com_sun_star_embed_LinkageMisuseException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
 //============================================================================
-
- module com {  module sun {  module star {  module embed {
-
+ 
+ module com {  module sun {  module star {  module embed {  
+ 
 //============================================================================
-
+ 
 /** This exception can be thrown in case a linked object is misused.
 
     <p>
@@ -45,12 +45,12 @@
     </p>
  */
 published exception LinkageMisuseException: com::sun::star::uno::Exception
-{
-};
-
+{ 
+}; 
+ 
 //============================================================================
-
-}; }; }; };
-
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/embed/NeedsRunningStateException.idl b/offapi/com/sun/star/embed/NeedsRunningStateException.idl
index 8853049ab64f..adf3c7e25e80 100644
--- a/offapi/com/sun/star/embed/NeedsRunningStateException.idl
+++ b/offapi/com/sun/star/embed/NeedsRunningStateException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_embed_NeedsRunningStateException_idl__
-#define __com_sun_star_embed_NeedsRunningStateException_idl__
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
-#include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-
+#ifndef __com_sun_star_embed_NeedsRunningStateException_idl__ 
+#define __com_sun_star_embed_NeedsRunningStateException_idl__ 
+ 
+#ifndef __com_sun_star_embed_WrongStateException_idl__ 
+#include <com/sun/star/embed/WrongStateException.idl> 
+#endif 
+ 
+ 
 //============================================================================
-
- module com {  module sun {  module star {  module embed {
-
+ 
+ module com {  module sun {  module star {  module embed {  
+ 
 //============================================================================
-
+ 
 /** This exception can be thrown in case a list of accepted verbs of states is
     requested and the object is in loaded state and this information can be
     retrieved only when the object is in running state.
@@ -48,12 +48,12 @@
     detected only after object is switched to running state.
  */
 published exception NeedsRunningStateException: WrongStateException
-{
-};
-
+{ 
+}; 
+ 
 //============================================================================
-
-}; }; }; };
-
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl b/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl
index c5f8e5935b46..bdebbefa6dae 100644
--- a/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl
+++ b/offapi/com/sun/star/embed/NoVisualAreaSizeException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_embed_NoVisualAreaSizeException_idl__
-#define __com_sun_star_embed_NoVisualAreaSizeException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
+#ifndef __com_sun_star_embed_NoVisualAreaSizeException_idl__ 
+#define __com_sun_star_embed_NoVisualAreaSizeException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
 //============================================================================
-
- module com {  module sun {  module star {  module embed {
-
+ 
+ module com {  module sun {  module star {  module embed {  
+ 
 //============================================================================
-
+ 
 /** This exception can be thrown in case the object can not provide own visual
     area currently.
  */
 published exception NoVisualAreaSizeException: com::sun::star::uno::Exception
-{
-};
-
+{ 
+}; 
+ 
 //============================================================================
-
-}; }; }; };
-
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/embed/OLESimpleStorage.idl b/offapi/com/sun/star/embed/OLESimpleStorage.idl
index 8aa4630acd6b..59c3470ef0ac 100644
--- a/offapi/com/sun/star/embed/OLESimpleStorage.idl
+++ b/offapi/com/sun/star/embed/OLESimpleStorage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/ObjectSaveVetoException.idl b/offapi/com/sun/star/embed/ObjectSaveVetoException.idl
index 3d0252e912fe..c99970a25f5e 100644
--- a/offapi/com/sun/star/embed/ObjectSaveVetoException.idl
+++ b/offapi/com/sun/star/embed/ObjectSaveVetoException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_embed_ObjectSaveVetoException_idl__
-#define __com_sun_star_embed_ObjectSaveVetoException_idl__
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
+#ifndef __com_sun_star_embed_ObjectSaveVetoException_idl__ 
+#define __com_sun_star_embed_ObjectSaveVetoException_idl__ 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
 //============================================================================
-
- module com {  module sun {  module star {  module embed {
-
+ 
+ module com {  module sun {  module star {  module embed {  
+ 
 //============================================================================
-
+ 
 /** This exception can be thrown in case container whants to avoid objects
     saving.
 
     @see XEmbeddedClient
  */
 published exception ObjectSaveVetoException: com::sun::star::uno::Exception
-{
-};
-
+{ 
+}; 
+ 
 //============================================================================
-
-}; }; }; };
-
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/embed/StateChangeInProgressException.idl b/offapi/com/sun/star/embed/StateChangeInProgressException.idl
index 648e839383ba..932039abe5a2 100644
--- a/offapi/com/sun/star/embed/StateChangeInProgressException.idl
+++ b/offapi/com/sun/star/embed/StateChangeInProgressException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_embed_StateChangeInProgressException_idl__
-#define __com_sun_star_embed_StateChangeInProgressException_idl__
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
-#include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
-
+#ifndef __com_sun_star_embed_StateChangeInProgressException_idl__ 
+#define __com_sun_star_embed_StateChangeInProgressException_idl__ 
+ 
+#ifndef __com_sun_star_embed_WrongStateException_idl__ 
+#include <com/sun/star/embed/WrongStateException.idl> 
+#endif 
+ 
+ 
 //============================================================================
-
- module com {  module sun {  module star {  module embed {
-
+ 
+ module com {  module sun {  module star {  module embed {  
+ 
 //============================================================================
-
+ 
 /** This exception can be thrown in case the object does not allow
     to call requested functionality currently because the object is changing
     state.
@@ -52,11 +52,11 @@ published exception StateChangeInProgressException: com::sun::star::embed::Wrong
         </p>
      */
     long TargetState;
-};
-
+}; 
+ 
 //============================================================================
-
-}; }; }; };
-
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/embed/Storage.idl b/offapi/com/sun/star/embed/Storage.idl
index d34d736cf5cb..f12065ce255c 100644
--- a/offapi/com/sun/star/embed/Storage.idl
+++ b/offapi/com/sun/star/embed/Storage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,35 +28,35 @@
 #ifndef __com_sun_star_embed_Storage_idl__
 #define __com_sun_star_embed_Storage_idl__
 
-#ifndef __com_sun_star_embed_BaseStorage_idl__
+#ifndef __com_sun_star_embed_BaseStorage_idl__ 
 #include <com/sun/star/embed/BaseStorage.idl>
 #endif
 
-#ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__
+#ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__ 
 #include <com/sun/star/embed/XEncryptionProtectedSource.idl>
 #endif
 
-#ifndef __com_sun_star_embed_XTransactedObject_idl__
+#ifndef __com_sun_star_embed_XTransactedObject_idl__ 
 #include <com/sun/star/embed/XTransactedObject.idl>
 #endif
 
-#ifndef __com_sun_star_embed_XTransactionBroadcaster_idl__
+#ifndef __com_sun_star_embed_XTransactionBroadcaster_idl__ 
 #include <com/sun/star/embed/XTransactionBroadcaster.idl>
 #endif
 
-#ifndef __com_sun_star_util_XModifiable_idl__
+#ifndef __com_sun_star_util_XModifiable_idl__ 
 #include <com/sun/star/util/XModifiable.idl>
 #endif
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
 #include <com/sun/star/container/XNameAccess.idl>
 #endif
 
-#ifndef __com_sun_star_lang_XComponent_idl__
+#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl>
 #endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
 
@@ -232,7 +232,7 @@ published service Storage
                         the requested substorage. The latest commited version
                         of child storage will be used. So in case the child
                         storage was not commited after it was changed, the
-                        changes will not appear in the new created storage.
+                        changes will not appear in the new created storage. 
                         </p>
 
                         <p>
@@ -253,7 +253,7 @@ published service Storage
                 to retrieve it.
             </dd>
         </dl>
-
+                
      */
     service BaseStorage;
 
@@ -278,7 +278,7 @@ published service Storage
 
     // -----------------------------------------------------------------------
     /** allows to set password to a root storage.
-
+    
         <p>
         This interface can be supported by a storage to allow to set
         a common storage password. This password is used as default password
diff --git a/offapi/com/sun/star/embed/StorageFactory.idl b/offapi/com/sun/star/embed/StorageFactory.idl
index 4b4b40d01a4c..e36325ee1e6a 100644
--- a/offapi/com/sun/star/embed/StorageFactory.idl
+++ b/offapi/com/sun/star/embed/StorageFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_embed_StorageFactory_idl__
 #define __com_sun_star_embed_StorageFactory_idl__
 
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
+#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__ 
 #include <com/sun/star/lang/XSingleServiceFactory.idl>
 #endif
 
@@ -54,7 +54,7 @@ published service StorageFactory
         </p>
 
         <p>
-        In case
+        In case 
         <method scope="com::sun::star::lang">XSingleServiceFactory::createInstanceWithArguments</method>
         call is used a sequence of the following parameters can be used:
         </p>
@@ -73,13 +73,13 @@ published service StorageFactory
                       the <type scope="com::sun::star::io">XSeekable</type>
                       interface must be supported.
             </dd>
-
+            
             <dt>parameter 2</dt>
             <dd>
                       specifies mode the storage should be open in, can take
                       values from <type>ElementModes</type> constant set.
             </dd>
-
+            
             <dt>parameter 3</dt>
             <dd>
                       this paramenter represents
diff --git a/offapi/com/sun/star/embed/StorageFormats.idl b/offapi/com/sun/star/embed/StorageFormats.idl
index 128fb1190b15..99115e5aa401 100644
--- a/offapi/com/sun/star/embed/StorageFormats.idl
+++ b/offapi/com/sun/star/embed/StorageFormats.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/StorageStream.idl b/offapi/com/sun/star/embed/StorageStream.idl
index 1fb6733605f0..ec7afd2e2cfc 100644
--- a/offapi/com/sun/star/embed/StorageStream.idl
+++ b/offapi/com/sun/star/embed/StorageStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,23 +28,23 @@
 #ifndef __com_sun_star_embed_StorageStream_idl__
 #define __com_sun_star_embed_StorageStream_idl__
 
-#ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__
+#ifndef __com_sun_star_embed_XEncryptionProtectedSource_idl__ 
 #include <com/sun/star/embed/XEncryptionProtectedSource.idl>
 #endif
 
-#ifndef __com_sun_star_lang_XComponent_idl__
+#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl>
 #endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
 
-#ifndef __com_sun_star_io_XStream_idl__
+#ifndef __com_sun_star_io_XStream_idl__ 
 #include <com/sun/star/io/XStream.idl>
 #endif
 
-#ifndef __com_sun_star_io_XSeekable_idl__
+#ifndef __com_sun_star_io_XSeekable_idl__ 
 #include <com/sun/star/io/XSeekable.idl>
 #endif
 
@@ -72,7 +72,7 @@ published service StorageStream
         implementations.
 
         <p>
-        In case the storage stream is open readonly the returned reference
+        In case the storage stream is open readonly the returned reference 
         to <type scope="com::sun::star::io">XOutputStream</type> will be
         empty.
         </p>
@@ -103,7 +103,7 @@ published service StorageStream
         call or by explicit closing of input and output ( if provided )
         streams implementations with
         <member scope="com::sun::star::io">XInputStream::closeInput()</member>
-        and
+        and 
         <member scope="com::sun::star::io">XOutputStream::closeOutput()</member>
         calls.
         </p>
@@ -130,10 +130,10 @@ published service StorageStream
     /** allows to get access to stream properties.
      */
     interface ::com::sun::star::beans::XPropertySet;
-
+    
     // -----------------------------------------------------------------------
     /** allows to seek to a specified position within the stream.
-
+        
         <p>
         This interface must be supported in case either seekable readonly
         or read-write access is requested.
@@ -144,11 +144,11 @@ published service StorageStream
 
     // -----------------------------------------------------------------------
     /** allows to set password to the stream.
-
+    
         <p>
         This interface must be supported by a stream with readwrite access
         to allow to set a password that should be used next time the
-        stream is stored.
+        stream is stored. 
         </p>
 
         <p>
diff --git a/offapi/com/sun/star/embed/StorageWrappedTargetException.idl b/offapi/com/sun/star/embed/StorageWrappedTargetException.idl
index aed449eb90a1..eecd166a999c 100644
--- a/offapi/com/sun/star/embed/StorageWrappedTargetException.idl
+++ b/offapi/com/sun/star/embed/StorageWrappedTargetException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_embed_StorageWrappedTargetException_idl__
-#define __com_sun_star_embed_StorageWrappedTargetException_idl__
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-
+#ifndef __com_sun_star_embed_StorageWrappedTargetException_idl__ 
+#define __com_sun_star_embed_StorageWrappedTargetException_idl__ 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+ 
 //============================================================================
-
- module com {  module sun {  module star {  module embed {
-
+ 
+ module com {  module sun {  module star {  module embed {  
+ 
 //============================================================================
-
+ 
 /** This exception can wrap an exception thrown during <type>XStorage</type>
     methods execution.
  */
 published exception StorageWrappedTargetException: com::sun::star::lang::WrappedTargetException
-{
-};
-
+{ 
+}; 
+ 
 //============================================================================
-
-}; }; }; };
-
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/embed/UnreachableStateException.idl b/offapi/com/sun/star/embed/UnreachableStateException.idl
index be53beda3bc3..6c852c05a724 100644
--- a/offapi/com/sun/star/embed/UnreachableStateException.idl
+++ b/offapi/com/sun/star/embed/UnreachableStateException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_embed_UnreachableStateException_idl__
-#define __com_sun_star_embed_UnreachableStateException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
+#ifndef __com_sun_star_embed_UnreachableStateException_idl__ 
+#define __com_sun_star_embed_UnreachableStateException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
 //============================================================================
-
- module com {  module sun {  module star {  module embed {
-
+ 
+ module com {  module sun {  module star {  module embed {  
+ 
 //============================================================================
-
+ 
 /** This exception can be thrown in case specified state can not be reached.
  */
 published exception UnreachableStateException: com::sun::star::uno::Exception
@@ -51,11 +51,11 @@ published exception UnreachableStateException: com::sun::star::uno::Exception
     /** The state that could not be reached.
      */
     long NextState;
-};
-
+}; 
+ 
 //============================================================================
-
-}; }; }; };
-
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/embed/UseBackupException.idl b/offapi/com/sun/star/embed/UseBackupException.idl
index e7d74d30f52c..aef41fde2db9 100644
--- a/offapi/com/sun/star/embed/UseBackupException.idl
+++ b/offapi/com/sun/star/embed/UseBackupException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_embed_UseBackupException_idl__
-#define __com_sun_star_embed_UseBackupException_idl__
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
+#ifndef __com_sun_star_embed_UseBackupException_idl__ 
+#define __com_sun_star_embed_UseBackupException_idl__ 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
 //============================================================================
-
- module com {  module sun {  module star {  module embed {
-
+ 
+ module com {  module sun {  module star {  module embed {  
+ 
 //============================================================================
-
+ 
 /** This exception can be thrown in case a storage commit is failed.
     <p>
     If a commit process of a storage failes on last transfer and the original
@@ -56,11 +56,11 @@ published exception UseBackupException: com::sun::star::io::IOException
     /** The URL of the temporary file the storage is based on now.
      */
     string TemporaryFileURL;
-};
-
+}; 
+ 
 //============================================================================
-
-}; }; }; };
-
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/embed/VerbAttributes.idl b/offapi/com/sun/star/embed/VerbAttributes.idl
index 742e782eb5c9..e241242165f1 100644
--- a/offapi/com/sun/star/embed/VerbAttributes.idl
+++ b/offapi/com/sun/star/embed/VerbAttributes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/VerbDescriptor.idl b/offapi/com/sun/star/embed/VerbDescriptor.idl
index f213c5969952..de3b0861ffa8 100644
--- a/offapi/com/sun/star/embed/VerbDescriptor.idl
+++ b/offapi/com/sun/star/embed/VerbDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_embed_VerbDescriptor_idl__
-#define __com_sun_star_embed_VerbDescriptor_idl__
-
-
+#ifndef __com_sun_star_embed_VerbDescriptor_idl__ 
+#define __com_sun_star_embed_VerbDescriptor_idl__ 
+ 
+ 
 //============================================================================
-
- module com {  module sun {  module star {  module embed {
-
+ 
+ module com {  module sun {  module star {  module embed {  
+ 
 //============================================================================
-
+ 
 /** describes a verb.
  */
 published struct VerbDescriptor
@@ -41,7 +41,7 @@ published struct VerbDescriptor
     //------------------------------------------------------------------------
     /** specifies the id of the verb.
      */
-    long VerbID;
+    long VerbID; 
 
      //------------------------------------------------------------------------
     /** specifies the name of the verb.
@@ -64,13 +64,13 @@ published struct VerbDescriptor
         It can take values from <type>VerbAttributes</type>.
         </p>
      */
-    long VerbAttributes;
-
-};
+    long VerbAttributes; 
 
+}; 
+ 
 //============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/embed/VisualRepresentation.idl b/offapi/com/sun/star/embed/VisualRepresentation.idl
index 8d07575008bb..b118f88a2228 100644
--- a/offapi/com/sun/star/embed/VisualRepresentation.idl
+++ b/offapi/com/sun/star/embed/VisualRepresentation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_embed_VisualRepresentation_idl__
-#define __com_sun_star_embed_VisualRepresentation_idl__
-
+#ifndef __com_sun_star_embed_VisualRepresentation_idl__ 
+#define __com_sun_star_embed_VisualRepresentation_idl__ 
+ 
 #ifndef __com_sun_star_datatransfer_DataFlavor_idl__
 #include <com/sun/star/datatransfer/DataFlavor.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module embed {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module embed {  
+ 
+//============================================================================= 
+ 
 /** can contain a graphical representation in an arbitrary format.
  */
 published struct VisualRepresentation
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** The format of the visual representation.
      */
     ::com::sun::star::datatransfer::DataFlavor Flavor;
 
-     //-------------------------------------------------------------------------
+     //------------------------------------------------------------------------- 
     /** The data in the format specified by <member>Flavor</member>.
      */
     any Data;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/embed/WrongStateException.idl b/offapi/com/sun/star/embed/WrongStateException.idl
index 809389c3a1fa..18c625bbf809 100644
--- a/offapi/com/sun/star/embed/WrongStateException.idl
+++ b/offapi/com/sun/star/embed/WrongStateException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_embed_WrongStateException_idl__
-#define __com_sun_star_embed_WrongStateException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
+#ifndef __com_sun_star_embed_WrongStateException_idl__ 
+#define __com_sun_star_embed_WrongStateException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
 //============================================================================
-
- module com {  module sun {  module star {  module embed {
-
+ 
+ module com {  module sun {  module star {  module embed {  
+ 
 //============================================================================
-
+ 
 /** This exception can be thrown in case the object's state does not allow
     to call requested functionality.
  */
 published exception WrongStateException: com::sun::star::uno::Exception
-{
-};
-
+{ 
+}; 
+ 
 //============================================================================
-
-}; }; }; };
-
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/embed/XActionsApproval.idl b/offapi/com/sun/star/embed/XActionsApproval.idl
index d3b64367a97b..8aaa53e1878d 100644
--- a/offapi/com/sun/star/embed/XActionsApproval.idl
+++ b/offapi/com/sun/star/embed/XActionsApproval.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,7 +55,7 @@ published interface XActionsApproval: com::sun::star::uno::XInterface
             of the actions should be documented by the object that is going
             to use this interface for approval as for example
             <type>InstanceLocker</type> does.
-
+            
         @return
             returns <TRUE/> in case the specified action is approved.
      */
diff --git a/offapi/com/sun/star/embed/XClassifiedObject.idl b/offapi/com/sun/star/embed/XClassifiedObject.idl
index 2cde70fa8566..758a69eb51ec 100644
--- a/offapi/com/sun/star/embed/XClassifiedObject.idl
+++ b/offapi/com/sun/star/embed/XClassifiedObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@ published interface XClassifiedObject: com::sun::star::uno::XInterface
 {
     // -----------------------------------------------------------------------
     /** retrieves class ID of the object.
-
+        
         @return
             unique class ID of the object
      */
@@ -55,7 +55,7 @@ published interface XClassifiedObject: com::sun::star::uno::XInterface
 
     // -----------------------------------------------------------------------
     /** retrieves symbolic name for the object type to be used in UI.
-
+        
         @return
             the symbolic name for the object
      */
@@ -63,7 +63,7 @@ published interface XClassifiedObject: com::sun::star::uno::XInterface
 
     // -----------------------------------------------------------------------
     /** sets the class ID and symbolic name to an object.
-
+        
         @param aClassID
             the new class ID
 
diff --git a/offapi/com/sun/star/embed/XCommonEmbedPersist.idl b/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
index 8b82c44965e0..00445ebfdda8 100644
--- a/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
+++ b/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/XComponentSupplier.idl b/offapi/com/sun/star/embed/XComponentSupplier.idl
index 548b5aa24510..b266b0761af6 100644
--- a/offapi/com/sun/star/embed/XComponentSupplier.idl
+++ b/offapi/com/sun/star/embed/XComponentSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl b/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl
index 45f3aef06cd6..74940a823867 100644
--- a/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl
+++ b/offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -90,7 +90,7 @@ published interface XEmbedObjectClipboardCreator: com::sun::star::uno::XInterfac
 
         @param aObjectArgs
             optional parameters for the object persistence initialization
-            see also
+            see also 
             <type>EmbeddedObjectDescriptor</type>
 
         @returns
diff --git a/offapi/com/sun/star/embed/XEmbedObjectCreator.idl b/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
index a214851922ad..11cb6bf26bf7 100644
--- a/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
+++ b/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -86,7 +86,7 @@ published interface XEmbedObjectCreator: com::sun::star::uno::XInterface
 
         @param aObjectArgs
             optional parameters for the object persistence initialization
-            see also
+            see also 
             <type>EmbeddedObjectDescriptor</type>
 
         @throws ::com::sun::star::lang::IllegalArgumentException
@@ -116,7 +116,7 @@ published interface XEmbedObjectCreator: com::sun::star::uno::XInterface
         from the entry. In case a persistent representation of a link is
         specified, the result object will be a link.
         </p>
-
+        
         @param xStorage
             a parent storage the entry should be opened in
 
@@ -163,7 +163,7 @@ published interface XEmbedObjectCreator: com::sun::star::uno::XInterface
         <p> In case specified entry exists it's contents are ignored and will
         be overwritten on storing.
         </p>
-
+        
         @param xStorage
             a parent storage the entry should be created/opened in
 
diff --git a/offapi/com/sun/star/embed/XEmbedObjectFactory.idl b/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
index 67a355054c48..19a3c9cc3e4d 100644
--- a/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
+++ b/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -71,7 +71,7 @@ published interface XEmbedObjectFactory: com::sun::star::uno::XInterface
         This method can be used to have a full control over persistence
         initialization of a object.
         </p>
-
+    
         <p>
         If the service implementation does not support
         <type>XEmbedObjectCreator</type> interface, it must accept the empty
diff --git a/offapi/com/sun/star/embed/XEmbedPersist.idl b/offapi/com/sun/star/embed/XEmbedPersist.idl
index 73f807188ba6..daecb3c1bd2e 100644
--- a/offapi/com/sun/star/embed/XEmbedPersist.idl
+++ b/offapi/com/sun/star/embed/XEmbedPersist.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -71,7 +71,7 @@ published interface XEmbedPersist: XCommonEmbedPersist
 {
     //------------------------------------------------------------------------
     /** provides object with a parent storage and a name for object's entry.
-
+        
         <p>
         An entry with the specified name should be created/opened inside
         provided storage. It can be a storage or a stream. For example,
@@ -84,7 +84,7 @@ published interface XEmbedPersist: XCommonEmbedPersist
         The linked object can be initialized by factory in different way
         ( internally ).
         </p>
-
+        
         <p>
         It is also possible to switch object persistent representation through
         this call. Actually this is the way, this call can be used by user
@@ -232,7 +232,7 @@ published interface XEmbedPersist: XCommonEmbedPersist
         @param bUseNew
             <TRUE/> the new storage should be used
             <FALSE/> the old one
-
+            
         @throws com::sun::star::embed::WrongStateException
             the object is in wrong state
 
diff --git a/offapi/com/sun/star/embed/XEmbeddedClient.idl b/offapi/com/sun/star/embed/XEmbeddedClient.idl
index f361ea2d8653..5dedbbc7e76e 100644
--- a/offapi/com/sun/star/embed/XEmbeddedClient.idl
+++ b/offapi/com/sun/star/embed/XEmbeddedClient.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,7 +56,7 @@ published interface XEmbeddedClient: XComponentSupplier
 {
     //------------------------------------------------------------------------
     /** asks client to let the object store itself.
-
+    
         @throws com::sun::star::uno::ObjectSaveVetoException
             in case container whants to avoid saving of object
 
diff --git a/offapi/com/sun/star/embed/XEmbeddedObject.idl b/offapi/com/sun/star/embed/XEmbeddedObject.idl
index e0368736279f..96adbbd6681c 100644
--- a/offapi/com/sun/star/embed/XEmbeddedObject.idl
+++ b/offapi/com/sun/star/embed/XEmbeddedObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -130,7 +130,7 @@ published interface XEmbeddedObject
     //
     //------------------------------------------------------------------------
     /** changes the state of the object to the requested one.
-
+    
         @param nNewState
             specifies the new state, can take values from the constant set
             <type scope="com::sun::star::embed">EmbedStates</type>
@@ -181,7 +181,7 @@ published interface XEmbeddedObject
 
     //------------------------------------------------------------------------
     /** lets object perform an action referenced by nVerbID.
-
+    
         @param nVerbID
             specifies an action to perform, can take values from
             <type>EmbedVerbs</type>
@@ -274,7 +274,7 @@ published interface XEmbeddedObject
 
     //------------------------------------------------------------------------
     /** retrieves the status of the object.
-
+    
         @param nAspect
             the aspect specifying the form of object representation
 
diff --git a/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl b/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl
index 9a71b99e871b..c31cab6c378d 100644
--- a/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl
+++ b/offapi/com/sun/star/embed/XEncryptionProtectedSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,7 +55,7 @@ published interface XEncryptionProtectedSource: com::sun::star::uno::XInterface
      */
     void setEncryptionPassword( [in] string sPassword )
         raises( ::com::sun::star::io::IOException );
-
+    
     // -----------------------------------------------------------------------
     /** removes encryption from the object.
 
diff --git a/offapi/com/sun/star/embed/XExtendedStorageStream.idl b/offapi/com/sun/star/embed/XExtendedStorageStream.idl
index 397358db57ec..39ca580aa563 100644
--- a/offapi/com/sun/star/embed/XExtendedStorageStream.idl
+++ b/offapi/com/sun/star/embed/XExtendedStorageStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -79,7 +79,7 @@ published interface XExtendedStorageStream
 
     // -----------------------------------------------------------------------
     /** allows to seek to a specified position within the stream.
-
+        
         <p>
         This interface must be supported in case either seekable readonly
         or read-write access is requested.
@@ -89,11 +89,11 @@ published interface XExtendedStorageStream
 
     // -----------------------------------------------------------------------
     /** allows to set password to the stream.
-
+    
         <p>
         This interface must be supported by a stream with readwrite access
         to allow to set a password that should be used next time the
-        stream is stored if the encryption is supported.
+        stream is stored if the encryption is supported. 
         </p>
 
         <p>
@@ -116,7 +116,7 @@ published interface XExtendedStorageStream
 
     // -----------------------------------------------------------------------
     /** allows to register a listener for transaction actions.
-
+        
         <p>
         If <type>XTransactedObject</type> interface is implemented this
         interface must be implemented as well.
diff --git a/offapi/com/sun/star/embed/XHatchWindow.idl b/offapi/com/sun/star/embed/XHatchWindow.idl
index 33733958f6cd..0c6c68c8bbf5 100644
--- a/offapi/com/sun/star/embed/XHatchWindow.idl
+++ b/offapi/com/sun/star/embed/XHatchWindow.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/XHatchWindowController.idl b/offapi/com/sun/star/embed/XHatchWindowController.idl
index 7ec2e0c5a5bb..06f31eb516af 100644
--- a/offapi/com/sun/star/embed/XHatchWindowController.idl
+++ b/offapi/com/sun/star/embed/XHatchWindowController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/XHatchWindowFactory.idl b/offapi/com/sun/star/embed/XHatchWindowFactory.idl
index 79d8db04832d..cce67b8e843f 100644
--- a/offapi/com/sun/star/embed/XHatchWindowFactory.idl
+++ b/offapi/com/sun/star/embed/XHatchWindowFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,8 +24,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_embed_XHatchWindowFactory_idl__
-#define __com_sun_star_embed_XHatchWindowFactory_idl__
+#ifndef __com_sun_star_embed_XHatchWindowFactory_idl__ 
+#define __com_sun_star_embed_XHatchWindowFactory_idl__ 
 
 #ifndef __com_sun_star_embed_XHatchWindow_idl__
 #include <com/sun/star/embed/XHatchWindow.idl>
@@ -48,11 +48,11 @@
 #endif
 
 //============================================================================
-
- module com {  module sun {  module star {  module embed {
-
+ 
+ module com {  module sun {  module star {  module embed {  
+ 
 //============================================================================
-
+ 
 /** creates a hatch window implementation.
  */
 published interface XHatchWindowFactory: com::sun::star::uno::XInterface
@@ -74,18 +74,18 @@ published interface XHatchWindowFactory: com::sun::star::uno::XInterface
 
         @throws ::com::sun::star::IllegalArgumentException
             one of arguments is illegal
-
+            
      */
     ::com::sun::star::embed::XHatchWindow createHatchWindowInstance(
             [in] com::sun::star::awt::XWindowPeer xParent,
             [in] com::sun::star::awt::Rectangle aBounds,
             [in] com::sun::star::awt::Size aSize )
         raises( ::com::sun::star::lang::IllegalArgumentException );
-};
-
+}; 
+ 
 //============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl b/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl
index 1f2cdcf132f9..d5b399015f29 100644
--- a/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl
+++ b/offapi/com/sun/star/embed/XHierarchicalStorageAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -111,14 +111,14 @@ published interface XHierarchicalStorageAccess
 
         @param sStreamPath
             the path to the substream that should be open
-
+    
         @param nOpenMode
             a mode the stream should be open in,
             can be a combination of <type>ElementModes</type> values
 
         @throws ::com::sun::star::embed::InvalidStorageException
             this storage is in invalid state for any reason
-
+    
         @throws ::com::sun::star::lang::IllegalArgumentException
             one of provided arguments is illegal
 
@@ -148,7 +148,7 @@ published interface XHierarchicalStorageAccess
         If storage does not allow any encryption this method will always throw
         <type scope="com::sun::star::packages">NoEncryptionException</type>.
         </p>
-
+    
         <p>
         In case the stream is open in readonly mode the
         <method scope="com::sun::star::io">XStream::getOutputStream</method>
@@ -157,7 +157,7 @@ published interface XHierarchicalStorageAccess
 
         @param sStreamPath
             the path to the substream that should be open
-
+    
         @param nOpenMode
             a mode the stream should be open in,
             can be a combination of <type>ElementModes</type> values
@@ -201,7 +201,7 @@ published interface XHierarchicalStorageAccess
 
         @param sElementPath
             the path to the element to remove
-
+    
         @throws ::com::sun::star::embed::InvalidStorageException
             this storage is in invalid state for eny reason
 
@@ -210,7 +210,7 @@ published interface XHierarchicalStorageAccess
 
         @throws ::com::sun::star::container::NoSuchElementException
             there is no element with such name
-
+        
         @throws ::com::sun::star::io::IOException
             in case of io errors during removing
 
diff --git a/offapi/com/sun/star/embed/XInplaceClient.idl b/offapi/com/sun/star/embed/XInplaceClient.idl
index b4edc9794c7e..01209a94e670 100644
--- a/offapi/com/sun/star/embed/XInplaceClient.idl
+++ b/offapi/com/sun/star/embed/XInplaceClient.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -114,7 +114,7 @@ interface XInplaceClient: com::sun::star::uno::XInterface
     //------------------------------------------------------------------------
     /** notifies container through the client that the object is
         UI-deactivated.
-
+        
         <p>
         After this notification the container can restore it's own UI and take focus.
         </p>
@@ -126,12 +126,12 @@ interface XInplaceClient: com::sun::star::uno::XInterface
         raises( ::com::sun::star::embed::WrongStateException );
 
     //------------------------------------------------------------------------
-    /** allows to retrieve the
+    /** allows to retrieve the 
         <type scope="com::sun::star::frame">LayoutManager</type> of the
         container.
-
+        
         @return
-            reference to object representing the
+            reference to object representing the 
             <type scope="com::sun::star::frame">LayoutManager</type> of the
             container
 
@@ -143,7 +143,7 @@ interface XInplaceClient: com::sun::star::uno::XInterface
 
     //------------------------------------------------------------------------
     /** allows to retrieve the container's dispatch provider.
-
+        
         @return
             reference to object implementing the
             <type scope="com::sun::star::frame">XDispatchProvider</type>
@@ -180,7 +180,7 @@ interface XInplaceClient: com::sun::star::uno::XInterface
         <p>
         The rectangle is provided in object's parent window coordinates in
         pixels. The intersection of position and clip rectangles specifies
-        the visible part of the object.
+        the visible part of the object. 
         </p>
 
         @return
diff --git a/offapi/com/sun/star/embed/XInplaceObject.idl b/offapi/com/sun/star/embed/XInplaceObject.idl
index 3ca6bdf359fb..840b0b1cbd5a 100644
--- a/offapi/com/sun/star/embed/XInplaceObject.idl
+++ b/offapi/com/sun/star/embed/XInplaceObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/XInsertObjectDialog.idl b/offapi/com/sun/star/embed/XInsertObjectDialog.idl
index 7b98a1c767a2..a5e30c79fbea 100644
--- a/offapi/com/sun/star/embed/XInsertObjectDialog.idl
+++ b/offapi/com/sun/star/embed/XInsertObjectDialog.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/XLinkCreator.idl b/offapi/com/sun/star/embed/XLinkCreator.idl
index be4bbe613288..8c071ae40863 100644
--- a/offapi/com/sun/star/embed/XLinkCreator.idl
+++ b/offapi/com/sun/star/embed/XLinkCreator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,7 +65,7 @@
 published interface XLinkCreator: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** creates a new object based on
+    /** creates a new object based on 
         <type scope="com::sun::star::document">MediaDescriptor</type>
         and initializes it as a link.
 
diff --git a/offapi/com/sun/star/embed/XLinkFactory.idl b/offapi/com/sun/star/embed/XLinkFactory.idl
index cd77fbfe0dbb..e7cf1aee1b53 100644
--- a/offapi/com/sun/star/embed/XLinkFactory.idl
+++ b/offapi/com/sun/star/embed/XLinkFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,7 +68,7 @@ published interface XLinkFactory: com::sun::star::uno::XInterface
         This method can be used to have a full control over persistence
         initialization of a link.
         </p>
-
+        
         @param aClassID
             the class id of the new object
 
diff --git a/offapi/com/sun/star/embed/XLinkageSupport.idl b/offapi/com/sun/star/embed/XLinkageSupport.idl
index a4a53c36e7a8..033150c72dac 100644
--- a/offapi/com/sun/star/embed/XLinkageSupport.idl
+++ b/offapi/com/sun/star/embed/XLinkageSupport.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,7 +59,7 @@ published interface XLinkageSupport: XCommonEmbedPersist
     //------------------------------------------------------------------------
     /** breaks the link and provides the object with a parent storage and a
         name for object's entry
-
+    
         <p>
         This method can be used only for links implementations that implement
         the whole set of embedded object interfaces. Usually the sets of
diff --git a/offapi/com/sun/star/embed/XOLESimpleStorage.idl b/offapi/com/sun/star/embed/XOLESimpleStorage.idl
index ac39370e8a8f..cf378c28cc8b 100644
--- a/offapi/com/sun/star/embed/XOLESimpleStorage.idl
+++ b/offapi/com/sun/star/embed/XOLESimpleStorage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -88,10 +88,10 @@ published interface XOLESimpleStorage
     interface XTransactedObject;
 
     //------------------------------------------------------------------------
-    /** interface <type>XClassifiedObject</type> represents common
+    /** interface <type>XClassifiedObject</type> represents common 
         functionality for embedded objects
 
-        <p>the <type>XClassifiedObject</type> interface allows to set/get the
+        <p>the <type>XClassifiedObject</type> interface allows to set/get the 
         ClassID of the storage.</p>
     */
     interface XClassifiedObject;
diff --git a/offapi/com/sun/star/embed/XOptimizedStorage.idl b/offapi/com/sun/star/embed/XOptimizedStorage.idl
index d51371fadfbb..92c86c0d0624 100644
--- a/offapi/com/sun/star/embed/XOptimizedStorage.idl
+++ b/offapi/com/sun/star/embed/XOptimizedStorage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -83,8 +83,8 @@
 #include <com/sun/star/beans/UnknownPropertyException.idl>
 #endif
 
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
-#include <com/sun/star/beans/PropertyVetoException.idl>
+#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
+#include <com/sun/star/beans/PropertyVetoException.idl> 
 #endif
 
 //============================================================================
@@ -174,13 +174,13 @@ published interface XOptimizedStorage
         of the supported by element properties.
      */
     any getElementPropertyValue( [in] string sElementName,
-                                 [in] string sPropertyName )
+                                 [in] string sPropertyName ) 
         raises( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::container::NoSuchElementException,
                 ::com::sun::star::io::IOException,
-                ::com::sun::star::beans::UnknownPropertyException,
-                ::com::sun::star::beans::PropertyVetoException,
+                ::com::sun::star::beans::UnknownPropertyException, 
+                ::com::sun::star::beans::PropertyVetoException, 
                 ::com::sun::star::embed::StorageWrappedTargetException );
 
     // -----------------------------------------------------------------------
diff --git a/offapi/com/sun/star/embed/XPackageStructureCreator.idl b/offapi/com/sun/star/embed/XPackageStructureCreator.idl
index c76d4c787cc7..b83282fd0f68 100644
--- a/offapi/com/sun/star/embed/XPackageStructureCreator.idl
+++ b/offapi/com/sun/star/embed/XPackageStructureCreator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/XPersistanceHolder.idl b/offapi/com/sun/star/embed/XPersistanceHolder.idl
index 5528fe62e143..e5546cc088d1 100644
--- a/offapi/com/sun/star/embed/XPersistanceHolder.idl
+++ b/offapi/com/sun/star/embed/XPersistanceHolder.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/XRelationshipAccess.idl b/offapi/com/sun/star/embed/XRelationshipAccess.idl
index 3c934caf1f33..ff6b72a78346 100644
--- a/offapi/com/sun/star/embed/XRelationshipAccess.idl
+++ b/offapi/com/sun/star/embed/XRelationshipAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -193,7 +193,7 @@ published interface XRelationshipAccess : ::com::sun::star::uno::XInterface
 
         @param sID
             the value of "ID" tag
-
+        
         @param aEntry
             a sequence, each element of the sequence represents tag,
             <type scope="::com::sun::star::beans">StringPair</type>::First
@@ -225,7 +225,7 @@ published interface XRelationshipAccess : ::com::sun::star::uno::XInterface
 
         @param sID
             the value of "ID" tag
-
+    
         @throws ::com::sun::star::container::NoSuchElementException
             in case there is no entry with specified tag
 
diff --git a/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl b/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl
index 91a47e8f6288..291cfae531ab 100644
--- a/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl
+++ b/offapi/com/sun/star/embed/XStateChangeBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_embed_XStateChangeBroadcaster_idl__
-#define __com_sun_star_embed_XStateChangeBroadcaster_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XStateChangeListener_idl__
-#include <com/sun/star/embed/XStateChangeListener.idl>
-#endif
-
-
+#ifndef __com_sun_star_embed_XStateChangeBroadcaster_idl__ 
+#define __com_sun_star_embed_XStateChangeBroadcaster_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_embed_XStateChangeListener_idl__ 
+#include <com/sun/star/embed/XStateChangeListener.idl> 
+#endif 
+ 
+ 
 //============================================================================
-
-module com {  module sun {  module star {  module embed {
-
+ 
+module com {  module sun {  module star {  module embed {  
+ 
 //============================================================================
-
+ 
 /** broadcasts message in case embedded object object changes it's state.
  */
 published interface XStateChangeBroadcaster: com::sun::star::uno::XInterface
-{
+{ 
     //------------------------------------------------------------------------
     /** adds the specified listener to receive events about states change
      */
     void addStateChangeListener(
-            [in] com::sun::star::embed::XStateChangeListener xListener );
-
+            [in] com::sun::star::embed::XStateChangeListener xListener ); 
+ 
     //------------------------------------------------------------------------
     /** removes the specified listener
      */
     void removeStateChangeListener(
-            [in] com::sun::star::embed::XStateChangeListener xListener );
-};
-
+            [in] com::sun::star::embed::XStateChangeListener xListener ); 
+}; 
+ 
 //============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/embed/XStateChangeListener.idl b/offapi/com/sun/star/embed/XStateChangeListener.idl
index 3c552de33222..367a587c5dbb 100644
--- a/offapi/com/sun/star/embed/XStateChangeListener.idl
+++ b/offapi/com/sun/star/embed/XStateChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_embed_XStateChangeListener_idl__
-#define __com_sun_star_embed_XStateChangeListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_embed_WrongStateException_idl__
-#include <com/sun/star/embed/WrongStateException.idl>
-#endif
-
+#ifndef __com_sun_star_embed_XStateChangeListener_idl__ 
+#define __com_sun_star_embed_XStateChangeListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_embed_WrongStateException_idl__ 
+#include <com/sun/star/embed/WrongStateException.idl> 
+#endif 
+ 
 //============================================================================
-
-module com {  module sun {  module star {  module embed {
-
+ 
+module com {  module sun {  module star {  module embed {  
+ 
 //============================================================================
-
+ 
 /** makes it possible to receive events when an embedded object changes it's
     state.
  */
 published interface XStateChangeListener: com::sun::star::lang::XEventListener
-{
+{ 
     //------------------------------------------------------------------------
     /** is called just before the object changes state.
 
@@ -92,11 +92,11 @@ published interface XStateChangeListener: com::sun::star::lang::XEventListener
     void stateChanged( [in] com::sun::star::lang::EventObject aEvent,
                         [in] long nOldState,
                         [in] long nNewState );
-};
-
+}; 
+ 
 //============================================================================
-
-}; }; }; };
-
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/embed/XStorage.idl b/offapi/com/sun/star/embed/XStorage.idl
index 0a98cfa3e8eb..c6f216dcd84e 100644
--- a/offapi/com/sun/star/embed/XStorage.idl
+++ b/offapi/com/sun/star/embed/XStorage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -163,14 +163,14 @@ published interface XStorage
 
         @param sStreamName
             the name of the substream that should be open
-
+    
         @param nOpenMode
             a mode the stream should be open in,
             can be a combination of <type>ElementModes</type> values
 
         @throws ::com::sun::star::embed::InvalidStorageException
             this storage is in invalid state for any reason
-
+    
         @throws ::com::sun::star::lang::IllegalArgumentException
             one of provided arguments is illegal
 
@@ -199,7 +199,7 @@ published interface XStorage
         If storage does not allow any encryption this method will always throw
         <type scope="com::sun::star::packages">NoEncryptionException</type>.
         </p>
-
+    
         <p>
         In case the stream is open in readonly mode the
         <method scope="com::sun::star::io">XStream::getOutputStream</method>
@@ -208,7 +208,7 @@ published interface XStorage
 
         @param sStreamName
             the name of the substream that should be open
-
+    
         @param nOpenMode
             a mode the stream should be open in,
             can be a combination of <type>ElementModes</type> values
@@ -294,7 +294,7 @@ published interface XStorage
 
         @param sStreamName
             the name of the substream that should be copied
-
+    
         @throws ::com::sun::star::embed::InvalidStorageException
             this storage is in invalid state for any reason
 
@@ -338,7 +338,7 @@ published interface XStorage
 
         @param sStreamName
             the name of the substream that should be copied
-
+    
         @param sPassword
             this parameter allowes to specify a reading password for the
             stream, the password must be a correct one, otherwise an
@@ -382,16 +382,16 @@ published interface XStorage
 
         @param xStorage
             the target storage that will be filled in with copy.
-
+    
         @throws ::com::sun::star::embed::InvalidStorageException
             this storage is in invalid state for any reason
-
+    
         @throws ::com::sun::star::lang::IllegalArgumentException
             one of provided arguments is illegal
-
+    
         @throws ::com::sun::star::io::IOException
             in case of io errors during copying
-
+    
         @throws ::com::sun::star::embed::StorageWrappedTargetException
             wraps other exceptions
 
@@ -503,7 +503,7 @@ published interface XStorage
 
         @param sElementName
             the name of the element to remove
-
+    
         @throws ::com::sun::star::embed::InvalidStorageException
             this storage is in invalid state for eny reason
 
@@ -512,7 +512,7 @@ published interface XStorage
 
         @throws ::com::sun::star::container::NoSuchElementException
             there is no element with such name
-
+        
         @throws ::com::sun::star::io::IOException
             in case of io errors during removing
 
@@ -547,7 +547,7 @@ published interface XStorage
 
         @throws ::com::sun::star::container::ElementExistException
             an element with new name already exists in this storage
-
+        
         @throws ::com::sun::star::io::IOException
             in case of io errors during renaming
 
@@ -588,7 +588,7 @@ published interface XStorage
 
         @throws ::com::sun::star::container::ElementExistException
             an element with specified destination name already exists in destination storage
-
+        
         @throws ::com::sun::star::io::IOException
             in case of io errors during copying
 
@@ -632,7 +632,7 @@ published interface XStorage
 
         @throws ::com::sun::star::container::ElementExistException
             an element with specified destination name already exists in destination storage
-
+        
         @throws ::com::sun::star::io::IOException
             in case of io errors during moving
 
diff --git a/offapi/com/sun/star/embed/XStorageRawAccess.idl b/offapi/com/sun/star/embed/XStorageRawAccess.idl
index b70b2e3c1235..482b676c0635 100644
--- a/offapi/com/sun/star/embed/XStorageRawAccess.idl
+++ b/offapi/com/sun/star/embed/XStorageRawAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -96,7 +96,7 @@ published interface XStorageRawAccess
 
         @param sStreamName
             the name of the substream that should be open
-
+    
         @throws ::com::sun::star::embed::InvalidStorageException
             this storage is in invalid state for any reason
 
@@ -104,7 +104,7 @@ published interface XStorageRawAccess
             one of provided arguments is illegal
 
         @throws ::com::sun::star::container::NoSuchElementException
-            there is no element with specified name
+            there is no element with specified name 
 
         @throws ::com::sun::star::io::IOException
             in case of io errors during stream opening
@@ -143,7 +143,7 @@ published interface XStorageRawAccess
 
         @param sStreamName
             the name of the substream that should be open
-
+    
         @param xInputStream
             a raw stream representing encrypted stream
 
@@ -157,7 +157,7 @@ published interface XStorageRawAccess
             the stream is not an encrypted one
 
         @throws ::com::sun::star::container::NoSuchElementException
-            there is no element with specified name
+            there is no element with specified name 
 
         @throws ::com::sun::star::io::IOException
             in case of io errors during stream opening
@@ -194,7 +194,7 @@ published interface XStorageRawAccess
 
         @param sStreamName
             the name of the substream that should be open
-
+    
         @param xInputStream
             a raw stream representing encrypted stream
 
diff --git a/offapi/com/sun/star/embed/XTransactedObject.idl b/offapi/com/sun/star/embed/XTransactedObject.idl
index 80f86187a7c6..d27878f26b30 100644
--- a/offapi/com/sun/star/embed/XTransactedObject.idl
+++ b/offapi/com/sun/star/embed/XTransactedObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,10 +35,10 @@
 #include <com/sun/star/io/IOException.idl>
 #endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
 //============================================================================
 
  module com {  module sun {  module star {  module embed {
diff --git a/offapi/com/sun/star/embed/XTransactionBroadcaster.idl b/offapi/com/sun/star/embed/XTransactionBroadcaster.idl
index fb5b7d2acc06..29e86ce96be2 100644
--- a/offapi/com/sun/star/embed/XTransactionBroadcaster.idl
+++ b/offapi/com/sun/star/embed/XTransactionBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_embed_XTransactionBroadcaster_idl__
-#define __com_sun_star_embed_XTransactionBroadcaster_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_embed_XTransactionListener_idl__
-#include <com/sun/star/embed/XTransactionListener.idl>
-#endif
-
-
+#ifndef __com_sun_star_embed_XTransactionBroadcaster_idl__ 
+#define __com_sun_star_embed_XTransactionBroadcaster_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_embed_XTransactionListener_idl__ 
+#include <com/sun/star/embed/XTransactionListener.idl> 
+#endif 
+ 
+ 
 //============================================================================
-
-module com {  module sun {  module star {  module embed {
-
+ 
+module com {  module sun {  module star {  module embed {  
+ 
 //============================================================================
-
+ 
 /** broadcasts messege in case transacted object is commited or reverted.
  */
 published interface XTransactionBroadcaster: com::sun::star::uno::XInterface
-{
+{ 
     //------------------------------------------------------------------------
     /** adds the specified listener to receive events about commits and
         reverts.
      */
     void addTransactionListener(
-            [in] com::sun::star::embed::XTransactionListener aListener );
-
+            [in] com::sun::star::embed::XTransactionListener aListener ); 
+ 
     //------------------------------------------------------------------------
     /** removes the specified listener.
      */
     void removeTransactionListener(
-            [in] com::sun::star::embed::XTransactionListener aListener );
-};
-
+            [in] com::sun::star::embed::XTransactionListener aListener ); 
+}; 
+ 
 //============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/embed/XTransactionListener.idl b/offapi/com/sun/star/embed/XTransactionListener.idl
index 89e80956cf11..57b172574a78 100644
--- a/offapi/com/sun/star/embed/XTransactionListener.idl
+++ b/offapi/com/sun/star/embed/XTransactionListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_embed_XTransactionListener_idl__
-#define __com_sun_star_embed_XTransactionListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
+#ifndef __com_sun_star_embed_XTransactionListener_idl__ 
+#define __com_sun_star_embed_XTransactionListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
 //============================================================================
-
-module com {  module sun {  module star {  module embed {
-
+ 
+module com {  module sun {  module star {  module embed {  
+ 
 //============================================================================
-
+ 
 /** makes it possible to receive events when a transacted object is commited
     or reverted.
  */
 published interface XTransactionListener: com::sun::star::lang::XEventListener
-{
+{ 
     //------------------------------------------------------------------------
     /** is called just before the object is commited.
      */
@@ -59,7 +59,7 @@ published interface XTransactionListener: com::sun::star::lang::XEventListener
     //------------------------------------------------------------------------
     /** is called after the object is commited.
      */
-    void commited( [in] com::sun::star::lang::EventObject aEvent );
+    void commited( [in] com::sun::star::lang::EventObject aEvent ); 
 
     //------------------------------------------------------------------------
     /** is called just before the object is reverted.
@@ -70,12 +70,12 @@ published interface XTransactionListener: com::sun::star::lang::XEventListener
     //------------------------------------------------------------------------
     /** is called after the object is reverted.
      */
-    void reverted( [in] com::sun::star::lang::EventObject aEvent );
-};
-
+    void reverted( [in] com::sun::star::lang::EventObject aEvent ); 
+}; 
+ 
 //============================================================================
-
-}; }; }; };
-
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/embed/XTransferableSupplier.idl b/offapi/com/sun/star/embed/XTransferableSupplier.idl
index d22c6fb27769..1a5360abafdc 100644
--- a/offapi/com/sun/star/embed/XTransferableSupplier.idl
+++ b/offapi/com/sun/star/embed/XTransferableSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,14 +36,14 @@
  module com {  module sun {  module star {  module embed {
 
 //============================================================================
-/** provide access to a
+/** provide access to a 
     <type scope="com::sun::star::datatransfer">XTransferable</type>
     implementation from the object.
  */
 published interface XTransferableSupplier: com::sun::star::uno::XInterface
 {
     //------------------------------------------------------------------------
-    /** allows to get access to
+    /** allows to get access to 
         <type scope="com::sun::star::datatransfer">XTransferable</type>
         implementation.
 
diff --git a/offapi/com/sun/star/embed/XVisualObject.idl b/offapi/com/sun/star/embed/XVisualObject.idl
index 158c49851a6f..913507d423cf 100644
--- a/offapi/com/sun/star/embed/XVisualObject.idl
+++ b/offapi/com/sun/star/embed/XVisualObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/embed/XWindowSupplier.idl b/offapi/com/sun/star/embed/XWindowSupplier.idl
index e878a65d21d2..2cabfaada82e 100644
--- a/offapi/com/sun/star/embed/XWindowSupplier.idl
+++ b/offapi/com/sun/star/embed/XWindowSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/DataAwareControlModel.idl b/offapi/com/sun/star/form/DataAwareControlModel.idl
index d8d52376de8e..f8b6929461ca 100644
--- a/offapi/com/sun/star/form/DataAwareControlModel.idl
+++ b/offapi/com/sun/star/form/DataAwareControlModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
-#define __com_sun_star_form_DataAwareControlModel_idl__
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
-#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundComponent_idl__
-#include <com/sun/star/form/XBoundComponent.idl>
-#endif
-
-#ifndef __com_sun_star_form_XLoadListener_idl__
-#include <com/sun/star/form/XLoadListener.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
-#include <com/sun/star/form/XReset.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
+#define __com_sun_star_form_DataAwareControlModel_idl__ 
+ 
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
+#include <com/sun/star/form/FormControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XBoundComponent_idl__ 
+#include <com/sun/star/form/XBoundComponent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XLoadListener_idl__ 
+#include <com/sun/star/form/XLoadListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XReset_idl__ 
+#include <com/sun/star/form/XReset.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** is an abstract service for specialized <type>FormControlModel</type>s
     which are data aware and thus can be bound to a data source.
 
@@ -64,9 +64,9 @@
     always to be a <type scope="com::sun::star::form::component">DataForm</type>.</p>
  */
 published service DataAwareControlModel
-{
-    service com::sun::star::form::FormControlModel;
-
+{ 
+    service com::sun::star::form::FormControlModel; 
+     
     /** makes it possible to transfer the data of the model to the connected data field.
         <p>
         This interface is optional, if a component doesn't support it, it has to forward
@@ -74,18 +74,18 @@ published service DataAwareControlModel
         interaction changes it's content).
         </p>
      */
-    [optional] interface com::sun::star::form::XBoundComponent;
-
-
+    [optional] interface com::sun::star::form::XBoundComponent; 
+ 
+     
     /** must be implemented in order to recognize when the containing form of the model connects
         to its data source  (loads its data). After loading the form, the model may bind to its
         related field source.<br/>
         This interface will seldom be used directly from outside.
      */
-    interface com::sun::star::form::XLoadListener;
-
-
-    /** Each <type>DataAwareControlModel</type> should be resettable for setting default values.
+    interface com::sun::star::form::XLoadListener; 
+ 
+     
+    /** Each <type>DataAwareControlModel</type> should be resettable for setting default values. 
 
         <p>In the context of a control model which is data-aware, the semantics of <em>default value</em>
         (see <type>XReset</type>) is as follows:<br/>
@@ -108,10 +108,10 @@ published service DataAwareControlModel
         </ul>
         </p>
     */
-    interface com::sun::star::form::XReset;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::form::XReset; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the name of the bound database field.
 
         <p>This property makes sense in the <em>context</em> of the control model only. Normally, a control model
@@ -124,7 +124,7 @@ published service DataAwareControlModel
 
         @see DataAwareControlModel::BoundField
      */
-    [property] string DataField;
+    [property] string DataField; 
 
     /** determines whether or not input into this field is required, when it is actually bound to a database field.
 
@@ -137,18 +137,18 @@ published service DataAwareControlModel
         @since OOo 3.1
     */
     [optional, property] boolean InputRequired;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** references to the cursor field to which the control is bound.
         <p>Applies only if the form the control model belongs to is loaded and the control is valid bound.
         The referenced field supports the <type scope="com::sun::star::sdb">Column</type> service.
         </p>
         @see DataAwareControlModel::DataField
      */
-    [readonly, property] com::sun::star::beans::XPropertySet BoundField;
-
-    //-------------------------------------------------------------------------
+    [readonly, property] com::sun::star::beans::XPropertySet BoundField; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** references to a control model within the same document which should be used as a label.
         <p>Any user interface action which needs to refer to the control is assumed to use this
@@ -184,12 +184,12 @@ published service DataAwareControlModel
         </ul>
         </p>
      */
-    [property] com::sun::star::beans::XPropertySet LabelControl;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] com::sun::star::beans::XPropertySet LabelControl; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/DataSelectionType.idl b/offapi/com/sun/star/form/DataSelectionType.idl
index 6633c63050d0..16581dd0de65 100644
--- a/offapi/com/sun/star/form/DataSelectionType.idl
+++ b/offapi/com/sun/star/form/DataSelectionType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_DataSelectionType_idl__
-#define __com_sun_star_form_DataSelectionType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_DataSelectionType_idl__ 
+#define __com_sun_star_form_DataSelectionType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::form::DataSelectionType
 /** describes the type of datasource used for a form.
     <p>Please do <em><b>not</b></em> use anymore, this enum is deprecated.
     @deprecated
  */
 published enum DataSelectionType
-{
-    TABLE,
-    QUERY,
-    SQL,
-    SQLPASSTHROUGH
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+    TABLE, 
+    QUERY, 
+    SQL, 
+    SQLPASSTHROUGH 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/DatabaseDeleteEvent.idl b/offapi/com/sun/star/form/DatabaseDeleteEvent.idl
index adad03001091..29deeeff537d 100644
--- a/offapi/com/sun/star/form/DatabaseDeleteEvent.idl
+++ b/offapi/com/sun/star/form/DatabaseDeleteEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_DatabaseDeleteEvent_idl__
-#define __com_sun_star_form_DatabaseDeleteEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_DatabaseDeleteEvent_idl__ 
+#define __com_sun_star_form_DatabaseDeleteEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form { 
+ 
+//============================================================================= 
+ 
 /** is fired if a database record is going to be deleted.
     <p>Please do <em><b>not</b></em> use anymore, this struct is deprecated.
     @deprecated
  */
 published struct DatabaseDeleteEvent: com::sun::star::lang::EventObject
-{
-    sequence<any> Bookmarks;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    sequence<any> Bookmarks; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/DatabaseParameterEvent.idl b/offapi/com/sun/star/form/DatabaseParameterEvent.idl
index f933f612e345..d619d2e0e29c 100644
--- a/offapi/com/sun/star/form/DatabaseParameterEvent.idl
+++ b/offapi/com/sun/star/form/DatabaseParameterEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_DatabaseParameterEvent_idl__
-#define __com_sun_star_form_DatabaseParameterEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_DatabaseParameterEvent_idl__ 
+#define __com_sun_star_form_DatabaseParameterEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form { 
+ 
+//============================================================================= 
+ 
 /** is fired if values for parameters are needed.
  */
 published struct DatabaseParameterEvent: com::sun::star::lang::EventObject
-{
+{ 
     /** specifies the list of parameters which are required for opening a result set.
 
         <p>Usually, a <type scope="com::sun::star::form::component">DataForm</type> fires this
@@ -57,14 +57,14 @@ published struct DatabaseParameterEvent: com::sun::star::lang::EventObject
         @see com::sun::star::sdb::RowSet
         @see com::sun::star::form::component::DataForm
      */
-    com::sun::star::container::XIndexAccess Parameters;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::container::XIndexAccess Parameters; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/ErrorEvent.idl b/offapi/com/sun/star/form/ErrorEvent.idl
index b5267df0c7b5..89f811ac32f1 100644
--- a/offapi/com/sun/star/form/ErrorEvent.idl
+++ b/offapi/com/sun/star/form/ErrorEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_ErrorEvent_idl__
-#define __com_sun_star_form_ErrorEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_ErrorEvent_idl__ 
+#define __com_sun_star_form_ErrorEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::form::ErrorEvent
 /** occurs in case of fired database exceptions triggered by
     a database form.
@@ -45,16 +45,16 @@
     @deprecated
  */
 published struct ErrorEvent: com::sun::star::lang::EventObject
-{
-    any Reason;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+    any Reason; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/FormButtonType.idl b/offapi/com/sun/star/form/FormButtonType.idl
index a1ef60487786..e455b3530cf7 100644
--- a/offapi/com/sun/star/form/FormButtonType.idl
+++ b/offapi/com/sun/star/form/FormButtonType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_FormButtonType_idl__
-#define __com_sun_star_form_FormButtonType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_FormButtonType_idl__ 
+#define __com_sun_star_form_FormButtonType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** specifies the action to execute when a button is pressed.
     @see com::sun::star::form::component::CommandButton
  */
 published enum FormButtonType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** requires the button to act like a common push button, means no special action is triggered.
      */
-    PUSH,
-
-    //-------------------------------------------------------------------------
-
+    PUSH, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** When the button is clicked, it performs a submit on its containing form.
      */
-    SUBMIT,
-
-    //-------------------------------------------------------------------------
-
+    SUBMIT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** When the button is clicked, it performs a reset on its containing form.
      */
-    RESET,
-
-    //-------------------------------------------------------------------------
-
+    RESET, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** When the button is clicked, an URL set for the button is opened.
         @see com::sun::star::form::component::CommandButton::TargetURL
         @see com::sun::star::form::component::CommandButton::TargetFrame
      */
-    URL
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    URL 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/FormComponent.idl b/offapi/com/sun/star/form/FormComponent.idl
index 27bae9588631..a539838dc15d 100644
--- a/offapi/com/sun/star/form/FormComponent.idl
+++ b/offapi/com/sun/star/form/FormComponent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,65 +24,65 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_FormComponent_idl__
-#define __com_sun_star_form_FormComponent_idl__
-
-#ifndef __com_sun_star_form_XFormComponent_idl__
-#include <com/sun/star/form/XFormComponent.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-#ifndef __com_sun_star_container_XNamed_idl__
-#include <com/sun/star/container/XNamed.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_io_XPersistObject_idl__
-#include <com/sun/star/io/XPersistObject.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyBag_idl__
-#include <com/sun/star/beans/PropertyBag.idl>
+#ifndef __com_sun_star_form_FormComponent_idl__ 
+#define __com_sun_star_form_FormComponent_idl__ 
+ 
+#ifndef __com_sun_star_form_XFormComponent_idl__ 
+#include <com/sun/star/form/XFormComponent.idl> 
+#endif 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
+#ifndef __com_sun_star_container_XNamed_idl__ 
+#include <com/sun/star/container/XNamed.idl> 
+#endif 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+#ifndef __com_sun_star_io_XPersistObject_idl__ 
+#include <com/sun/star/io/XPersistObject.idl> 
+#endif 
+#ifndef __com_sun_star_beans_PropertyBag_idl__ 
+#include <com/sun/star/beans/PropertyBag.idl> 
 #endif
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** specifies a component which can be part of a form.
 
-    @see FormControlModel
+    @see FormControlModel 
     @see com::sun::star::form::component::Form
  */
 published service FormComponent
-{
+{ 
     /** identifies the component as a candidate for being part of a form.
         <p>This interface also provides the access to the component's parent.</p>
      */
-    interface com::sun::star::form::XFormComponent;
-
-
+    interface com::sun::star::form::XFormComponent; 
+ 
+     
     /** allows life-time control of form components.
      */
-    interface com::sun::star::lang::XComponent;
-
-
+    interface com::sun::star::lang::XComponent; 
+ 
+     
     /** Each FormComponent must supply a name for identification.
      */
-    interface com::sun::star::container::XNamed;
-
+    interface com::sun::star::container::XNamed; 
+    
     /** gives access to the properties.
     */
-    interface com::sun::star::beans::XPropertySet;
-
-
+    interface com::sun::star::beans::XPropertySet; 
+ 
+     
     /** Each FormComponent must be able to be stored into and read from a stream.
      */
-    interface com::sun::star::io::XPersistObject;
+    interface com::sun::star::io::XPersistObject; 
 
     /** allows to associate arbitrary properties with the form component
 
@@ -107,23 +107,23 @@ published service FormComponent
         @since OpenOffice.org 2.3.0
     */
     [optional] service com::sun::star::beans::PropertyBag;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** the name of the component.
 
         <p>Note that the name accessed here is the same as when using the
         <type scope="com::sun::star::container">XNamed</type> interface.</p>
      */
-    [property] string Name;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [property] string Name; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/FormComponentType.idl b/offapi/com/sun/star/form/FormComponentType.idl
index ac0655b3e42f..c4bdb3dcf534 100644
--- a/offapi/com/sun/star/form/FormComponentType.idl
+++ b/offapi/com/sun/star/form/FormComponentType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,121 +24,121 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_FormComponentType_idl__
-#define __com_sun_star_form_FormComponentType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_FormComponentType_idl__ 
+#define __com_sun_star_form_FormComponentType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form { 
+ 
+//============================================================================= 
+ 
 /** These constants specify the class types used to identify a component.
  */
 published constants FormComponentType
-{
-    //-------------------------------------------------------------------------
-
-    /** This generic identifier is for controls which cannot be identified by
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** This generic identifier is for controls which cannot be identified by 
                 an other specific identifier.
      */
-    const short CONTROL = 1;
-
+    const short CONTROL = 1; 
+ 
     /** specifies a control that is used to begin, interrupt, or end a process.
     */
-    const short COMMANDBUTTON = 2;
-
+    const short COMMANDBUTTON = 2; 
+ 
     /** specifies a control that acts like a radio button. Grouped together, such radio buttons
-        present a set of two or more mutually exclusive choices to the user.
+        present a set of two or more mutually exclusive choices to the user. 
     */
-    const short RADIOBUTTON = 3;
-
+    const short RADIOBUTTON = 3; 
+ 
     /** specifies a control that displays an image that responds to mouse clicks.
     */
-    const short IMAGEBUTTON = 4;
-
-    /** specifies a control that is used to check or uncheck to turn an option on or off.
+    const short IMAGEBUTTON = 4; 
+ 
+    /** specifies a control that is used to check or uncheck to turn an option on or off. 
     */
-    const short CHECKBOX = 5;
-
+    const short CHECKBOX = 5; 
+ 
     /** specifies a control that displays a list from which the user can select one or more items.
     */
-    const short LISTBOX = 6;
-
+    const short LISTBOX = 6; 
+ 
     /** specifies a control that is used when a list box combined with a static text control or an edit
         control is needed.
     */
-    const short COMBOBOX = 7;
-
+    const short COMBOBOX = 7; 
+ 
     /** specifies a control that displays a frame around a group of controls with or without a caption.
     */
-    const short GROUPBOX = 8;
-
-    /** specifies a control that is a text component that allows for the editing of a single line of text.
+    const short GROUPBOX = 8; 
+ 
+    /** specifies a control that is a text component that allows for the editing of a single line of text. 
     */
-    const short TEXTFIELD = 9;
-
+    const short TEXTFIELD = 9; 
+ 
     /** specifies a control to display a fixed text, usually used to label other controls.
     */
-    const short FIXEDTEXT = 10;
-
+    const short FIXEDTEXT = 10; 
+ 
     /** is a table like control to display database data.
     */
-    const short GRIDCONTROL = 11;
-
+    const short GRIDCONTROL = 11; 
+ 
     /** specifies an control which can be used to enter text, extended by an (user-startable) file dialog
         to browse for files.
     */
-    const short FILECONTROL = 12;
-
+    const short FILECONTROL = 12; 
+ 
     /** specifies a control that should not be visible.
     */
-    const short HIDDENCONTROL = 13;
-
+    const short HIDDENCONTROL = 13; 
+ 
     /** specifies a control to display an image.
     */
-    const short IMAGECONTROL = 14;
-
+    const short IMAGECONTROL = 14; 
+ 
     /** specifies a control to display and edit a date value.
     */
-    const short DATEFIELD = 15;
-
+    const short DATEFIELD = 15; 
+ 
     /** specifies a control to display and edit a time value.
     */
-    const short TIMEFIELD = 16;
-
+    const short TIMEFIELD = 16; 
+ 
     /** specifies a field to display and edit a numeric value.
     */
-    const short NUMERICFIELD = 17;
-
+    const short NUMERICFIELD = 17; 
+ 
     /** specifies a field to display and edit a currency value.
     */
-    const short CURRENCYFIELD = 18;
-
+    const short CURRENCYFIELD = 18; 
+ 
     /** specifies a control to display and edit a string according to a pattern.
     */
-    const short PATTERNFIELD = 19;
-
+    const short PATTERNFIELD = 19; 
+ 
     /** specifies a control to display and edit, in the form of a scrollbar, a value from a continuous value range
     */
-    const short SCROLLBAR = 20;
-
+    const short SCROLLBAR = 20; 
+ 
     /** specifies a control to edit, in the form of a spin field, a value from a continuous range of values
     */
-    const short SPINBUTTON = 21;
-
+    const short SPINBUTTON = 21; 
+ 
     /** specifies a control which provides controller functionality for the <type scope="com::sun::star::form::component">DataForm</type>
         it belongs to, such as functionality to navigate or filter this form.
     */
-    const short NAVIGATIONBAR = 22;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    const short NAVIGATIONBAR = 22; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/FormComponents.idl b/offapi/com/sun/star/form/FormComponents.idl
index 475deb7659d3..d2367268dcc3 100644
--- a/offapi/com/sun/star/form/FormComponents.idl
+++ b/offapi/com/sun/star/form/FormComponents.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_FormComponents_idl__
-#define __com_sun_star_form_FormComponents_idl__
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
-#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
-#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
-#include <com/sun/star/container/XContainer.idl>
-#endif
-
-#include <com/sun/star/script/XEventAttacherManager.idl>
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_FormComponents_idl__ 
+#define __com_sun_star_form_FormComponents_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#include <com/sun/star/container/XNameContainer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XIndexContainer_idl__ 
+#include <com/sun/star/container/XIndexContainer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
+#include <com/sun/star/container/XEnumerationAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XContainer_idl__ 
+#include <com/sun/star/container/XContainer.idl> 
+#endif 
+
+#include <com/sun/star/script/XEventAttacherManager.idl> 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** specifies the capabilities of a collection of <type>FormComponent</type>s.
-
+    
     <p>The collection must provide the possibility of adding and removing
     components by name and by index. The name of a component is not
     necessarily unique, so the collection must be able to handle duplicate
@@ -61,22 +61,22 @@
     @see FormComponent
  */
 published service FormComponents
-{
+{ 
     /** allows to register listeners to be notified of changes in the container.
     */
-    interface com::sun::star::container::XContainer;
-
+    interface com::sun::star::container::XContainer; 
+    
     /** allows to add/remove elements by name.
     */
-    interface com::sun::star::container::XNameContainer;
-
+    interface com::sun::star::container::XNameContainer; 
+    
     /** gives access to the elements by index.
     */
-    interface com::sun::star::container::XIndexContainer;
-
+    interface com::sun::star::container::XIndexContainer; 
+    
     /** creates an enumeration of the elements.
     */
-    interface com::sun::star::container::XEnumerationAccess;
+    interface com::sun::star::container::XEnumerationAccess; 
 
     /** This interface has to be implemented to supply the scripting environment
         for the contained components.
@@ -95,13 +95,13 @@ published service FormComponents
         inserted/removed elements into/from the container.</p>
      */
     interface com::sun::star::script::XEventAttacherManager;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/FormControlModel.idl b/offapi/com/sun/star/form/FormControlModel.idl
index c0cbc6051a75..b5eab1bcae8d 100644
--- a/offapi/com/sun/star/form/FormControlModel.idl
+++ b/offapi/com/sun/star/form/FormControlModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,87 +24,87 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_FormControlModel_idl__
-#define __com_sun_star_form_FormControlModel_idl__
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormComponent_idl__
-#include <com/sun/star/form/FormComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
-#include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyState_idl__
-#include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
+#define __com_sun_star_form_FormControlModel_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormComponent_idl__ 
+#include <com/sun/star/form/FormComponent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XFastPropertySet_idl__ 
+#include <com/sun/star/beans/XFastPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertyState_idl__ 
+#include <com/sun/star/beans/XPropertyState.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** specifies a control model within a form.
 
     <p>Note that the model-view-paradigm is used for form controls, too.</p>
  */
 published service FormControlModel
-{
-    service com::sun::star::awt::UnoControlModel;
-
-    service com::sun::star::form::FormComponent;
-
-    /** This optional interface gives an efficient access to all
+{ 
+    service com::sun::star::awt::UnoControlModel; 
+    
+    service com::sun::star::form::FormComponent; 
+ 
+    /** This optional interface gives an efficient access to all 
                 properties at once or an ability to set more than one property at once.
      */
-    [optional] interface com::sun::star::beans::XFastPropertySet;
-
-
-    /** This optional interface gives access to the state of the
-                properties, e.g. whether a default value
+    [optional] interface com::sun::star::beans::XFastPropertySet; 
+ 
+     
+    /** This optional interface gives access to the state of the 
+                properties, e.g. whether a default value 
                 is to be used or not for a certain property.
      */
-    [optional] interface com::sun::star::beans::XPropertyState;
-
-    //-------------------------------------------------------------------------
-
+    [optional] interface com::sun::star::beans::XPropertyState; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the ID for classification of the component.
         @see FormComponentType
      */
-    [readonly, property] short ClassId;
-
-    //-------------------------------------------------------------------------
-
+    [readonly, property] short ClassId; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines the relative taborder of the control associated with the model.
-
+        
         <p>The default -1 is used to indicate that the tab-order of this control should be
         determined automatically.</p>
-
+        
         <p>Each component which supports a tabstop must provide a
         <member>FormControlModel::TabIndex</member> property.</p>
 
         <p>Normally, a <type>FormController</type> instance is evaluating this property.</p>
      */
-    [optional, property] short TabIndex;
-
-    //-------------------------------------------------------------------------
-
+    [optional, property] short TabIndex; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** used for additional information.
         <p>No semantics is given for this property, it will usually be used by the creator of a document
         containing form controls.</p>
      */
-    [property] string Tag;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] string Tag; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/FormController.idl b/offapi/com/sun/star/form/FormController.idl
index f14fd5181355..f0afa6cd2af0 100644
--- a/offapi/com/sun/star/form/FormController.idl
+++ b/offapi/com/sun/star/form/FormController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,91 +24,91 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_FormController_idl__
-#define __com_sun_star_form_FormController_idl__
-
-#ifndef __com_sun_star_form_XFormController_idl__
-#include <com/sun/star/form/XFormController.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XTabController_idl__
-#include <com/sun/star/awt/XTabController.idl>
-#endif
-
-#ifndef __com_sun_star_container_XChild_idl__
-#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
-#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
-#include <com/sun/star/util/XModifyBroadcaster.idl>
+#ifndef __com_sun_star_form_FormController_idl__ 
+#define __com_sun_star_form_FormController_idl__ 
+ 
+#ifndef __com_sun_star_form_XFormController_idl__ 
+#include <com/sun/star/form/XFormController.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XTabController_idl__ 
+#include <com/sun/star/awt/XTabController.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XChild_idl__ 
+#include <com/sun/star/container/XChild.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
+#include <com/sun/star/container/XEnumerationAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XModifyBroadcaster_idl__ 
+#include <com/sun/star/util/XModifyBroadcaster.idl> 
+#endif 
+
+#ifndef __com_sun_star_form_XConfirmDeleteBroadcaster_idl__ 
+#include <com/sun/star/form/XConfirmDeleteBroadcaster.idl> 
 #endif
 
-#ifndef __com_sun_star_form_XConfirmDeleteBroadcaster_idl__
-#include <com/sun/star/form/XConfirmDeleteBroadcaster.idl>
+#ifndef __com_sun_star_sdb_XSQLErrorBroadcaster_idl__ 
+#include <com/sun/star/sdb/XSQLErrorBroadcaster.idl> 
 #endif
 
-#ifndef __com_sun_star_sdb_XSQLErrorBroadcaster_idl__
-#include <com/sun/star/sdb/XSQLErrorBroadcaster.idl>
+#ifndef __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__ 
+#include <com/sun/star/sdb/XRowSetApproveBroadcaster.idl> 
 #endif
-
-#ifndef __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__
-#include <com/sun/star/sdb/XRowSetApproveBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
-#include <com/sun/star/form/XDatabaseParameterBroadcaster.idl>
+ 
+#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__ 
+#include <com/sun/star/form/XDatabaseParameterBroadcaster.idl> 
 #endif
 
 #ifndef __com_sun_star_form_FormControllerDispatcher_idl__
 #include <com/sun/star/form/FormControllerDispatcher.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
 module runtime {
     published interface XFormOperations;
 };
 
-//=============================================================================
+//============================================================================= 
 
 /** is superseded by <type scope="com::sun::star::form::runtime">FormController</type>.
     @deprecated
 */
 published service FormController
-{
+{ 
     [optional] service FormControllerDispatcher;
     [optional, property] ::com::sun::star::form::runtime::XFormOperations FormOperations;
 
     /** is used for notifying the (de)activation of the controller.
      */
-    interface com::sun::star::form::XFormController;
-
-    interface com::sun::star::awt::XTabController;
-    interface com::sun::star::container::XChild;
-    interface com::sun::star::lang::XComponent;
-    interface com::sun::star::container::XEnumerationAccess;
-    interface com::sun::star::util::XModifyBroadcaster;
+    interface com::sun::star::form::XFormController; 
+ 
+    interface com::sun::star::awt::XTabController; 
+    interface com::sun::star::container::XChild; 
+    interface com::sun::star::lang::XComponent; 
+    interface com::sun::star::container::XEnumerationAccess; 
+    interface com::sun::star::util::XModifyBroadcaster; 
     interface com::sun::star::form::XConfirmDeleteBroadcaster;
     interface com::sun::star::sdb::XSQLErrorBroadcaster;
     interface com::sun::star::sdb::XRowSetApproveBroadcaster;
     interface com::sun::star::form::XDatabaseParameterBroadcaster;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/FormControllerDispatcher.idl b/offapi/com/sun/star/form/FormControllerDispatcher.idl
index e277f95c9949..0d88d292483c 100644
--- a/offapi/com/sun/star/form/FormControllerDispatcher.idl
+++ b/offapi/com/sun/star/form/FormControllerDispatcher.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/FormSubmitEncoding.idl b/offapi/com/sun/star/form/FormSubmitEncoding.idl
index 6fc95e8d5747..c1d346e08ea1 100644
--- a/offapi/com/sun/star/form/FormSubmitEncoding.idl
+++ b/offapi/com/sun/star/form/FormSubmitEncoding.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_FormSubmitEncoding_idl__
-#define __com_sun_star_form_FormSubmitEncoding_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_FormSubmitEncoding_idl__ 
+#define __com_sun_star_form_FormSubmitEncoding_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form { 
+ 
+//============================================================================= 
+ 
 /** specify the MIME encoding to be used when form data is submitted.
  */
 published enum FormSubmitEncoding
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** Specifies to use "application/x-www-form-urlencoded" as submit encoding.
         <p>Usually used if the FormSubmitMethod attribute has the value POST.
         </p>
      */
-    URL,
-
-    //-------------------------------------------------------------------------
-
+    URL, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Specifies to use "multipart/form-data" as submit encoding.
         <p>Usually used when the form contains a file upload element.</p>
      */
-    MULTIPART,
-
-    //-------------------------------------------------------------------------
-
+    MULTIPART, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies to use "text/plain"
         <p>Usually used if the FormSubmitMethod attribute has the value POST and
         the content should be reviewed as full text.</p>
      */
-    TEXT
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    TEXT 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/FormSubmitMethod.idl b/offapi/com/sun/star/form/FormSubmitMethod.idl
index a002dc32d990..23a8d8d309fe 100644
--- a/offapi/com/sun/star/form/FormSubmitMethod.idl
+++ b/offapi/com/sun/star/form/FormSubmitMethod.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_FormSubmitMethod_idl__
-#define __com_sun_star_form_FormSubmitMethod_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_FormSubmitMethod_idl__ 
+#define __com_sun_star_form_FormSubmitMethod_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** specifies how information is sent to a program invoked by submitting a form.
  */
 published enum FormSubmitMethod
-{
-    //-------------------------------------------------------------------------
-
-    /** specifies to append the input information of a form to the target
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies to append the input information of a form to the target 
         URL as parameters.
      */
-    GET,
-
-    //-------------------------------------------------------------------------
-
+    GET, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** speficies to send the input information in a data body.
     */
-    POST
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    POST 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/Forms.idl b/offapi/com/sun/star/form/Forms.idl
index 533113d4aafd..fd381961f391 100644
--- a/offapi/com/sun/star/form/Forms.idl
+++ b/offapi/com/sun/star/form/Forms.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@
 #include <com/sun/star/container/XEnumerationAccess.idl>
 #endif
 
-#ifndef __com_sun_star_form_FormComponents_idl__
+#ifndef __com_sun_star_form_FormComponents_idl__ 
 #include <com/sun/star/form/FormComponents.idl>
 #endif
 
diff --git a/offapi/com/sun/star/form/ListSourceType.idl b/offapi/com/sun/star/form/ListSourceType.idl
index 9953b3b31c81..87a169608c19 100644
--- a/offapi/com/sun/star/form/ListSourceType.idl
+++ b/offapi/com/sun/star/form/ListSourceType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,66 +24,66 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_ListSourceType_idl__
-#define __com_sun_star_form_ListSourceType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_ListSourceType_idl__ 
+#define __com_sun_star_form_ListSourceType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** describes the kind of data source used to fill the list data of a listbox or a combobox control.
     @see com::sun::star::form::component::ListBox
     @see com::sun::star::form::component::ComboBox
  */
 published enum ListSourceType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** The control should be filled with a list of string values.
      */
-    VALUELIST,
-
-    //-------------------------------------------------------------------------
-
+    VALUELIST, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The control should be filled with the data of a table.
      */
-    TABLE,
-
-    //-------------------------------------------------------------------------
-
+    TABLE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The control should be filled with the results of a database query.
      */
-    QUERY,
-
-    //-------------------------------------------------------------------------
-
+    QUERY, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The control should be filled with the results of a database statement.
      */
-    SQL,
-
-    //-------------------------------------------------------------------------
-
+    SQL, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The control should be filled with the results of a database statement,
         which is not evaluated by the database engine.
      */
-    SQLPASSTHROUGH,
-
-    //-------------------------------------------------------------------------
-
+    SQLPASSTHROUGH, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The control should be filled with the field names of a database table.
      */
-    TABLEFIELDS
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    TABLEFIELDS 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/NavigationBarMode.idl b/offapi/com/sun/star/form/NavigationBarMode.idl
index 35cd358e9538..ef09a25c9791 100644
--- a/offapi/com/sun/star/form/NavigationBarMode.idl
+++ b/offapi/com/sun/star/form/NavigationBarMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,22 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_NavigationBarMode_idl__
-#define __com_sun_star_form_NavigationBarMode_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_NavigationBarMode_idl__ 
+#define __com_sun_star_form_NavigationBarMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** describes in which way the navigation of the records of a database form is performed.
  */
 published enum NavigationBarMode
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** no navigation bar is provided and navigation on the current
         form is only possible with the keyboard (TAB/SHIFT TAB).
 
@@ -49,18 +49,18 @@ published enum NavigationBarMode
 
         @see TabulatorCycle
      */
-    NONE,
-
-    //-------------------------------------------------------------------------
-
+    NONE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** a navigation bar is provided and navigation will be performed
         on the current/active form.
         <p>This is the default and most often encountered mode.</p>
      */
-    CURRENT,
-
-    //-------------------------------------------------------------------------
-
+    CURRENT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** a navigation bar is provided and navigation will be performed
         on the parent of the current/active form.
 
@@ -69,15 +69,15 @@ published enum NavigationBarMode
         no need to use the navigation bar for the form, but rather for it's parent.
         </p>
      */
-    PARENT
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    PARENT 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/PropertyBrowserController.idl b/offapi/com/sun/star/form/PropertyBrowserController.idl
index 52e50979654f..ce2b3243e233 100644
--- a/offapi/com/sun/star/form/PropertyBrowserController.idl
+++ b/offapi/com/sun/star/form/PropertyBrowserController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,30 +25,30 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_form_PropertyBrowserController_idl__
-#define __com_sun_star_form_PropertyBrowserController_idl__
+#ifndef __com_sun_star_form_PropertyBrowserController_idl__ 
+#define __com_sun_star_form_PropertyBrowserController_idl__ 
 
-#ifndef __com_sun_star_frame_XController_idl__
-#include <com/sun/star/frame/XController.idl>
+#ifndef __com_sun_star_frame_XController_idl__ 
+#include <com/sun/star/frame/XController.idl> 
 #endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
 #endif
 
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
-#include <com/sun/star/beans/XFastPropertySet.idl>
+#ifndef __com_sun_star_beans_XFastPropertySet_idl__ 
+#include <com/sun/star/beans/XFastPropertySet.idl> 
 #endif
 
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
-#include <com/sun/star/beans/XMultiPropertySet.idl>
+#ifndef __com_sun_star_beans_XMultiPropertySet_idl__ 
+#include <com/sun/star/beans/XMultiPropertySet.idl> 
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
 
 /** describes a controller which can be used to browse and modify properties of form controls.
 
@@ -140,8 +140,8 @@ published service PropertyBrowserController
     interface com::sun::star::beans::XMultiPropertySet;
 };
 
-//=============================================================================
-
-}; }; }; };
-
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
diff --git a/offapi/com/sun/star/form/TabulatorCycle.idl b/offapi/com/sun/star/form/TabulatorCycle.idl
index 65da98a259bb..87e1936fb0b9 100644
--- a/offapi/com/sun/star/form/TabulatorCycle.idl
+++ b/offapi/com/sun/star/form/TabulatorCycle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_TabulatorCycle_idl__
-#define __com_sun_star_form_TabulatorCycle_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_TabulatorCycle_idl__ 
+#define __com_sun_star_form_TabulatorCycle_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** specifies how the TAB key should be used in a form.
 
     <p>If the last control of a form is focused, and the user pressed the TAB key, there are
@@ -50,35 +50,35 @@
     @see FormController
  */
 published enum TabulatorCycle
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** pressing the TAB key from the last control moves the focus to
         the first control in the tab order of the next record.
      */
-    RECORDS,
-
-    //-------------------------------------------------------------------------
-
+    RECORDS, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** pressing the TAB key from the last control moves the focus to
         the first control in the tab order of the same record.
      */
-    CURRENT,
-
-    //-------------------------------------------------------------------------
-
+    CURRENT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** pressing the TAB key from the last control of a form moves
         the focus to the first control of the next form in the tab order.
      */
-    PAGE
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    PAGE 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XApproveActionBroadcaster.idl b/offapi/com/sun/star/form/XApproveActionBroadcaster.idl
index ef53896fd501..1f04866b06d0 100644
--- a/offapi/com/sun/star/form/XApproveActionBroadcaster.idl
+++ b/offapi/com/sun/star/form/XApproveActionBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,58 +24,58 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
-#define __com_sun_star_form_XApproveActionBroadcaster_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_form_XApproveActionListener_idl__
-#include <com/sun/star/form/XApproveActionListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__ 
+#define __com_sun_star_form_XApproveActionBroadcaster_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XApproveActionListener_idl__ 
+#include <com/sun/star/form/XApproveActionListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** allows to probably veto actions to be performed on components.
 
-    <p> Usually, a component which supports the
-    <type>XApproveActionBroadcaster</type> interface implements
+    <p> Usually, a component which supports the 
+    <type>XApproveActionBroadcaster</type> interface implements 
     <type scope="com::sun::star::awt">XActionListener</type> as well.</p>
  */
 published interface XApproveActionBroadcaster: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** adds the specified listener to receive the <member>XApproveActionListener::approveAction</member>
         event.
 
         @param aListener
              the listener to be added
      */
-    [oneway] void addApproveActionListener( [in] com::sun::star::form::XApproveActionListener aListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addApproveActionListener( [in] com::sun::star::form::XApproveActionListener aListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified listener
 
         @param aListener
              the listener to be removed
      */
-    [oneway] void removeApproveActionListener( [in] com::sun::star::form::XApproveActionListener aListener );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void removeApproveActionListener( [in] com::sun::star::form::XApproveActionListener aListener ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XApproveActionListener.idl b/offapi/com/sun/star/form/XApproveActionListener.idl
index f35ef82ba509..7f6be2cddbb6 100644
--- a/offapi/com/sun/star/form/XApproveActionListener.idl
+++ b/offapi/com/sun/star/form/XApproveActionListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XApproveActionListener_idl__
-#define __com_sun_star_form_XApproveActionListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XApproveActionListener_idl__ 
+#define __com_sun_star_form_XApproveActionListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** can be implemented to listen and probably veto actions to be performed on components.
-
+    
     <p>An example for an action would be the click of a
         CommandButton.</p>
 
@@ -52,9 +52,9 @@
     @see com::sun::star::form::control::CommandButton
  */
 published interface XApproveActionListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when an action is performed.
 
         @param aEvent
@@ -63,15 +63,15 @@ published interface XApproveActionListener: com::sun::star::lang::XEventListener
         @returns
             <TRUE/> when the action is permitted, otherwise <FALSE/>.
      */
-    boolean approveAction( [in] com::sun::star::lang::EventObject aEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    boolean approveAction( [in] com::sun::star::lang::EventObject aEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XBoundComponent.idl b/offapi/com/sun/star/form/XBoundComponent.idl
index 8a64b441f58a..592f29530c54 100644
--- a/offapi/com/sun/star/form/XBoundComponent.idl
+++ b/offapi/com/sun/star/form/XBoundComponent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,22 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XBoundComponent_idl__
-#define __com_sun_star_form_XBoundComponent_idl__
-
-#ifndef __com_sun_star_form_XUpdateBroadcaster_idl__
-#include <com/sun/star/form/XUpdateBroadcaster.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
-/** specifies a (form) component which is bound to a data source.
-
+#ifndef __com_sun_star_form_XBoundComponent_idl__ 
+#define __com_sun_star_form_XBoundComponent_idl__ 
+ 
+#ifndef __com_sun_star_form_XUpdateBroadcaster_idl__ 
+#include <com/sun/star/form/XUpdateBroadcaster.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
+/**	specifies a (form) component which is bound to a data source.
+    
     <p>The interface provides the possibility of committing its respective
     data to a data source it is bound to. A <member>commit</member> will be
     performed by the environment (usually, a <type>FormController</type>).<br/>
@@ -53,23 +53,23 @@
     @see com::sun::star::form::XUpdateListener
  */
 published interface XBoundComponent: com::sun::star::form::XUpdateBroadcaster
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** commits the content of the component into the data source it is bound to.
 
         @returns
             <TRUE/> when the commitment was successful, otherwise <FALSE/>.
      */
-    boolean commit();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    boolean commit(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XBoundControl.idl b/offapi/com/sun/star/form/XBoundControl.idl
index 549e091ab1b5..4936518507e7 100644
--- a/offapi/com/sun/star/form/XBoundControl.idl
+++ b/offapi/com/sun/star/form/XBoundControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XBoundControl_idl__
-#define __com_sun_star_form_XBoundControl_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XBoundControl_idl__ 
+#define __com_sun_star_form_XBoundControl_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** allows locking the input on components.
  */
 
 published interface XBoundControl: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** determines whether the input is currently locked or not.
 
         @returns
             <TRUE/> when it is currently locked, otherwise <FALSE/>.
      */
-    boolean getLock();
-
-    //-------------------------------------------------------------------------
-
+    boolean getLock(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is used for altering the current lock state of the
         component.
 
         @param bLock
             the new lock state.
      */
-    [oneway] void setLock( [in] boolean bLock );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void setLock( [in] boolean bLock ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XChangeBroadcaster.idl b/offapi/com/sun/star/form/XChangeBroadcaster.idl
index e67f288c0433..23aa2f28903d 100644
--- a/offapi/com/sun/star/form/XChangeBroadcaster.idl
+++ b/offapi/com/sun/star/form/XChangeBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XChangeBroadcaster_idl__
-#define __com_sun_star_form_XChangeBroadcaster_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_form_XChangeListener_idl__
-#include <com/sun/star/form/XChangeListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XChangeBroadcaster_idl__ 
+#define __com_sun_star_form_XChangeBroadcaster_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XChangeListener_idl__ 
+#include <com/sun/star/form/XChangeListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** provides functionality to notify listeners of data changes.
 
     <p>The concrete semantics of a change (i.e. the conditions for when a change event
     is fired) must be specified in the service description of the providing service.</p>
-
+    
     @see XChangeListener
  */
 published interface XChangeBroadcaster: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** adds the specified listener to receive the "changed" event.
 
         @param aListener
@@ -60,10 +60,10 @@ published interface XChangeBroadcaster: com::sun::star::uno::XInterface
 
         @see com::sun::star::form::XChangeListener
      */
-    [oneway] void addChangeListener( [in] com::sun::star::form::XChangeListener aListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addChangeListener( [in] com::sun::star::form::XChangeListener aListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified listener.
 
         @param aListener
@@ -71,15 +71,15 @@ published interface XChangeBroadcaster: com::sun::star::uno::XInterface
 
         @see com::sun::star::form::XChangeListener
      */
-    [oneway] void removeChangeListener( [in] com::sun::star::form::XChangeListener aListener );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void removeChangeListener( [in] com::sun::star::form::XChangeListener aListener ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XChangeListener.idl b/offapi/com/sun/star/form/XChangeListener.idl
index 2b817320fb75..2f73918217c9 100644
--- a/offapi/com/sun/star/form/XChangeListener.idl
+++ b/offapi/com/sun/star/form/XChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XChangeListener_idl__
-#define __com_sun_star_form_XChangeListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XChangeListener_idl__ 
+#define __com_sun_star_form_XChangeListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** is the listener interface for receiving notifications about data changes.
-
+    
     <p>The concrete semantics of a change (i.e. the conditions for when a change event
     is fired) must be specified in the description of the service broadcasting the
     change.</p>
-
+    
     @see XChangeBroadcaster
  */
 published interface XChangeListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** is invoked when the data of a component has been changed.
 
         @param rEvent
             A dedscriptor specifying the source of the event.
      */
-    [oneway] void changed( [in] com::sun::star::lang::EventObject rEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void changed( [in] com::sun::star::lang::EventObject rEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl b/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl
index bf38373c2f49..6f771aea771d 100644
--- a/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl
+++ b/offapi/com/sun/star/form/XConfirmDeleteBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XConfirmDeleteBroadcaster_idl__
-#define __com_sun_star_form_XConfirmDeleteBroadcaster_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_form_XConfirmDeleteListener_idl__
-#include <com/sun/star/form/XConfirmDeleteListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XConfirmDeleteBroadcaster_idl__ 
+#define __com_sun_star_form_XConfirmDeleteBroadcaster_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XConfirmDeleteListener_idl__ 
+#include <com/sun/star/form/XConfirmDeleteListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** provides the possibility of receiving an event for confirming deletions of
     rows in a <type scope="com::sun::star::form::component">DataForm</type>.
 
     @see XConfirmDeleteListener
  */
 published interface XConfirmDeleteBroadcaster: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** remembers the specified listener to receive an event for confirming deletions
 
@@ -61,10 +61,10 @@ published interface XConfirmDeleteBroadcaster: com::sun::star::uno::XInterface
 
         @see com::sun::star::form::XConfirmDeleteListener
      */
-    [oneway] void addConfirmDeleteListener( [in] com::sun::star::form::XConfirmDeleteListener aListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addConfirmDeleteListener( [in] com::sun::star::form::XConfirmDeleteListener aListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified listener.
 
         @param aListener
@@ -72,15 +72,15 @@ published interface XConfirmDeleteBroadcaster: com::sun::star::uno::XInterface
 
         @see com::sun::star::form::XConfirmDeleteListener
      */
-    [oneway] void removeConfirmDeleteListener( [in] com::sun::star::form::XConfirmDeleteListener aListener );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void removeConfirmDeleteListener( [in] com::sun::star::form::XConfirmDeleteListener aListener ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XConfirmDeleteListener.idl b/offapi/com/sun/star/form/XConfirmDeleteListener.idl
index debd3db0265f..a9a8f6710a37 100644
--- a/offapi/com/sun/star/form/XConfirmDeleteListener.idl
+++ b/offapi/com/sun/star/form/XConfirmDeleteListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XConfirmDeleteListener_idl__
-#define __com_sun_star_form_XConfirmDeleteListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_RowChangeEvent_idl__
-#include <com/sun/star/sdb/RowChangeEvent.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XConfirmDeleteListener_idl__ 
+#define __com_sun_star_form_XConfirmDeleteListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdb_RowChangeEvent_idl__ 
+#include <com/sun/star/sdb/RowChangeEvent.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form { 
+ 
+//============================================================================= 
+ 
 /** allows to register a component for confirming deletions of
     rows in a <type scope="com::sun::star::form::component">DataForm</type>.
-
+    
     @see XConfirmDeleteBroadcaster
  */
 published interface XConfirmDeleteListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the current record of a database form will be deleted.
 
         @param aEvent
@@ -58,14 +58,14 @@ published interface XConfirmDeleteListener: com::sun::star::lang::XEventListener
         @returns
             <TRUE/> when the row caan be deleted, otherwise <FALSE/>.
      */
-    boolean confirmDelete( [in] com::sun::star::sdb::RowChangeEvent aEvent );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    boolean confirmDelete( [in] com::sun::star::sdb::RowChangeEvent aEvent ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl
index d73d1d4f9116..47f33de282fe 100644
--- a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl
+++ b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
-#define __com_sun_star_form_XDatabaseParameterBroadcaster_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_form_XDatabaseParameterListener_idl__
-#include <com/sun/star/form/XDatabaseParameterListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XDatabaseParameterBroadcaster_idl__ 
+#define __com_sun_star_form_XDatabaseParameterBroadcaster_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XDatabaseParameterListener_idl__ 
+#include <com/sun/star/form/XDatabaseParameterListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** provides the possibility of receiving an event for configuration of parameters.
     <p>This interface is usually implemented by components which are to execute a statement,
-    and may need parameter information. For example, the
+    and may need parameter information. For example, the 
     <type scope="com::sun::star::form::component">DataForm</type> is such a component. When it is
     bound to a statement which contains parameters, or to a query which is based upon a parametrized
     statement, it needs values to fill in the parameters with actual values when it is being loaded.
@@ -52,32 +52,32 @@
     can fill them in.</p>
  */
 published interface XDatabaseParameterBroadcaster: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** adds the specified listener, to allow it to fill in necessary parameter values.
         @param aListener
             the listener to add.
         @see com::sun::star::form::XDatabaseParameterListener
      */
-    [oneway] void addParameterListener( [in] com::sun::star::form::XDatabaseParameterListener aListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addParameterListener( [in] com::sun::star::form::XDatabaseParameterListener aListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified listener.
         @param aListener
             the listener to remove.
         @see com::sun::star::form::XDatabaseParameterListener
      */
-    [oneway] void removeParameterListener( [in] com::sun::star::form::XDatabaseParameterListener aListener );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void removeParameterListener( [in] com::sun::star::form::XDatabaseParameterListener aListener ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl
index 28448b136be9..063370eb54c2 100644
--- a/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl
+++ b/offapi/com/sun/star/form/XDatabaseParameterBroadcaster2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/XDatabaseParameterListener.idl b/offapi/com/sun/star/form/XDatabaseParameterListener.idl
index 38cd22bbee3f..66ce82d4ee10 100644
--- a/offapi/com/sun/star/form/XDatabaseParameterListener.idl
+++ b/offapi/com/sun/star/form/XDatabaseParameterListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XDatabaseParameterListener_idl__
-#define __com_sun_star_form_XDatabaseParameterListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_form_DatabaseParameterEvent_idl__
-#include <com/sun/star/form/DatabaseParameterEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XDatabaseParameterListener_idl__ 
+#define __com_sun_star_form_XDatabaseParameterListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_DatabaseParameterEvent_idl__ 
+#include <com/sun/star/form/DatabaseParameterEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** allows to intercept value request for parametrized SQL statements.
  */
 published interface XDatabaseParameterListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when there is a need for parameter values
 
         @param aEvent
@@ -58,15 +58,15 @@ published interface XDatabaseParameterListener: com::sun::star::lang::XEventList
 
         @see com::sun::star::form::DatabaseParameterEvent
      */
-    boolean approveParameter( [in] com::sun::star::form::DatabaseParameterEvent aEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    boolean approveParameter( [in] com::sun::star::form::DatabaseParameterEvent aEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XDeleteListener.idl b/offapi/com/sun/star/form/XDeleteListener.idl
index 48a3dc6c9d6a..0d25257ce55e 100644
--- a/offapi/com/sun/star/form/XDeleteListener.idl
+++ b/offapi/com/sun/star/form/XDeleteListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XDeleteListener_idl__
-#define __com_sun_star_form_XDeleteListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XDeleteListener_idl__ 
+#define __com_sun_star_form_XDeleteListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form { 
+ 
+//============================================================================= 
+ 
 /** This is the listener interface for receiving "approveDelete" and
     "deleted" events posted by a database form.
-
+    
     <p> "approveDelete" may be used to abort a deletion of the current data
     record.</p>
 
@@ -54,27 +54,27 @@
     @deprecated
  */
 published interface XDeleteListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the current record of the database form will be deleted.
      */
-    boolean approveDelete( [in] com::sun::star::lang::EventObject aEvent );
-
-    //-------------------------------------------------------------------------
-
+    boolean approveDelete( [in] com::sun::star::lang::EventObject aEvent ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a database form has finished the delete processing and
         the data has been successfully deleted from the datasource.
      */
-    void deleted( [in] com::sun::star::lang::EventObject aEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void deleted( [in] com::sun::star::lang::EventObject aEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XErrorBroadcaster.idl b/offapi/com/sun/star/form/XErrorBroadcaster.idl
index 7775f23e9c8e..ab115938eeed 100644
--- a/offapi/com/sun/star/form/XErrorBroadcaster.idl
+++ b/offapi/com/sun/star/form/XErrorBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,52 +24,52 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XErrorBroadcaster_idl__
-#define __com_sun_star_form_XErrorBroadcaster_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_form_XErrorListener_idl__
-#include <com/sun/star/form/XErrorListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XErrorBroadcaster_idl__ 
+#define __com_sun_star_form_XErrorBroadcaster_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XErrorListener_idl__ 
+#include <com/sun/star/form/XErrorListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form { 
+ 
+//============================================================================= 
+ 
 /** provides the possibility of receiving database error events.
-
+    
     <p>Please do <em><b>not</b></em> use anymore, this interface is superseeded
     by <type scope="com::sun::star::sdb">XSQLErrorBroadcaster</type>.</p>
 
     @deprecated
  */
 published interface XErrorBroadcaster: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** adds the specified listener to be notified of errors.
      */
-    [oneway] void addErrorListener( [in] com::sun::star::form::XErrorListener aListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addErrorListener( [in] com::sun::star::form::XErrorListener aListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified listener.
      */
-    [oneway] void removeErrorListener( [in] com::sun::star::form::XErrorListener aListener );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void removeErrorListener( [in] com::sun::star::form::XErrorListener aListener ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XErrorListener.idl b/offapi/com/sun/star/form/XErrorListener.idl
index 4b329e1e6d03..d791f554b353 100644
--- a/offapi/com/sun/star/form/XErrorListener.idl
+++ b/offapi/com/sun/star/form/XErrorListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,52 +24,52 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XErrorListener_idl__
-#define __com_sun_star_form_XErrorListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_form_ErrorEvent_idl__
-#include <com/sun/star/form/ErrorEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XErrorListener_idl__ 
+#define __com_sun_star_form_XErrorListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_ErrorEvent_idl__ 
+#include <com/sun/star/form/ErrorEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form { 
+ 
+//============================================================================= 
+ 
 /** used to be notified when errors in a database form happen.
-
+    
     <p>Each time an exception is triggered by a database form, the error
     event is posted to the error listeners. This event may be used to
     configure the error handling of a database form.</p>
-
+    
     <p>Please do <em><b>not</b></em> use anymore, this interface is superseeded
     by <type scope="com::sun::star::sdb">XSQLErrorListener</type>.</p>
-
+    
 @since foo
     @deprecated
  */
 published interface XErrorListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a database action performed by a database form raises
         an exception.
      */
-    void errorOccured( [in] com::sun::star::form::ErrorEvent aEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void errorOccured( [in] com::sun::star::form::ErrorEvent aEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XForm.idl b/offapi/com/sun/star/form/XForm.idl
index 4fc0daaf427a..f03b6a0aec05 100644
--- a/offapi/com/sun/star/form/XForm.idl
+++ b/offapi/com/sun/star/form/XForm.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XForm_idl__
-#define __com_sun_star_form_XForm_idl__
-
-#ifndef __com_sun_star_form_XFormComponent_idl__
-#include <com/sun/star/form/XFormComponent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XForm_idl__ 
+#define __com_sun_star_form_XForm_idl__ 
+ 
+#ifndef __com_sun_star_form_XFormComponent_idl__ 
+#include <com/sun/star/form/XFormComponent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** identifies a <type>FormComponent</type> as being a (sub-) form.
 
     <p>This interface does not really provide an own functionality, it is only for easier
@@ -46,14 +46,14 @@
     @see XFormComponent
  */
 published interface XForm: com::sun::star::form::XFormComponent
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XFormComponent.idl b/offapi/com/sun/star/form/XFormComponent.idl
index 7d32c30deef1..e85769157ca9 100644
--- a/offapi/com/sun/star/form/XFormComponent.idl
+++ b/offapi/com/sun/star/form/XFormComponent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XFormComponent_idl__
-#define __com_sun_star_form_XFormComponent_idl__
-
-#ifndef __com_sun_star_container_XChild_idl__
-#include <com/sun/star/container/XChild.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XFormComponent_idl__ 
+#define __com_sun_star_form_XFormComponent_idl__ 
+ 
+#ifndef __com_sun_star_container_XChild_idl__ 
+#include <com/sun/star/container/XChild.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** describes a component which may be part of a form.
-
+    
     <p>This interface does not really provide an own functionality, it is only for easier
     runtime identification of form components.</p>
 
     @see XForm
  */
 published interface XFormComponent: com::sun::star::container::XChild
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XFormController.idl b/offapi/com/sun/star/form/XFormController.idl
index e78de565f7ce..3855d84c2a2b 100644
--- a/offapi/com/sun/star/form/XFormController.idl
+++ b/offapi/com/sun/star/form/XFormController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XFormController_idl__
-#define __com_sun_star_form_XFormController_idl__
-
-#ifndef __com_sun_star_awt_XTabController_idl__
-#include <com/sun/star/awt/XTabController.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControl_idl__
-#include <com/sun/star/awt/XControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XFormControllerListener_idl__
-#include <com/sun/star/form/XFormControllerListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XFormController_idl__ 
+#define __com_sun_star_form_XFormController_idl__ 
+ 
+#ifndef __com_sun_star_awt_XTabController_idl__ 
+#include <com/sun/star/awt/XTabController.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XControl_idl__ 
+#include <com/sun/star/awt/XControl.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XFormControllerListener_idl__ 
+#include <com/sun/star/form/XFormControllerListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** is superseded by <type scope="com::sun::star::form::runtime">XFormController</type>.
     @deprecated
  */
 published interface XFormController: com::sun::star::awt::XTabController
-{
-    ::com::sun::star::awt::XControl getCurrentControl();
-    [oneway] void addActivateListener( [in] ::com::sun::star::form::XFormControllerListener l );
-    [oneway] void removeActivateListener( [in] ::com::sun::star::form::XFormControllerListener l );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+    ::com::sun::star::awt::XControl getCurrentControl(); 
+    [oneway] void addActivateListener( [in] ::com::sun::star::form::XFormControllerListener l ); 
+    [oneway] void removeActivateListener( [in] ::com::sun::star::form::XFormControllerListener l ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XFormControllerListener.idl b/offapi/com/sun/star/form/XFormControllerListener.idl
index 6d12ab85eba8..b2593bc0fa3c 100644
--- a/offapi/com/sun/star/form/XFormControllerListener.idl
+++ b/offapi/com/sun/star/form/XFormControllerListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,61 +24,61 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XFormControllerListener_idl__
-#define __com_sun_star_form_XFormControllerListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XFormControllerListener_idl__ 
+#define __com_sun_star_form_XFormControllerListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** allows to be notified when the activation status of a <type>FormController</type> changes.
-
-    <p> A form controller is activated if a form control gains the
+    
+    <p> A form controller is activated if a form control gains the 
     focus and none of its controls currently owned the focus before.</p>
 
     @see      XFormController
  */
 published interface XFormControllerListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
-    /** is invoked when a control of the controller gained the focus and
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** is invoked when a control of the controller gained the focus and 
         the controller was not previously activated.
 
         @param rEvent
             the event happend.
      */
-    [oneway] void formActivated( [in] com::sun::star::lang::EventObject rEvent );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void formActivated( [in] com::sun::star::lang::EventObject rEvent ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a control of the "XFormController" lost the focus
-        and no control of the controller received the focus. In other
+        and no control of the controller received the focus. In other 
         words, no control of the controller owns the focus.
 
         @param rEvent
             the event happend.
      */
-    [oneway] void formDeactivated( [in] com::sun::star::lang::EventObject rEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void formDeactivated( [in] com::sun::star::lang::EventObject rEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XFormsSupplier.idl b/offapi/com/sun/star/form/XFormsSupplier.idl
index 121ee9ffac8b..5bd9e901c0b6 100644
--- a/offapi/com/sun/star/form/XFormsSupplier.idl
+++ b/offapi/com/sun/star/form/XFormsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XFormsSupplier_idl__
-#define __com_sun_star_form_XFormsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XFormsSupplier_idl__ 
+#define __com_sun_star_form_XFormsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#include <com/sun/star/container/XNameContainer.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** provides the access to a collection of forms.
  */
 published interface XFormsSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** accesses the forms.
-
+        
         @example StarBASIC
         <listing>
         REM  *****  BASIC  *****
@@ -80,7 +80,7 @@ published interface XFormsSupplier: com::sun::star::uno::XInterface
                 xForm = thisComponent.createInstance( "com.sun.star.form.component.DataForm" )
                 xForm.Name = "SampleForm"
                 thisComponent.DrawPage.Forms.insertByIndex( 0, xForm )
-            End If
+            End If	
             ' insert the control model into the first form of the forms collection of the
             ' draw page of the document
             thisComponent.DrawPage.Forms.getByIndex(0).insertByIndex( 0, xControlModel )
@@ -91,15 +91,15 @@ published interface XFormsSupplier: com::sun::star::uno::XInterface
         @returns
             the container of all the top-level forms belonging to the component.
      */
-    com::sun::star::container::XNameContainer getForms();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::container::XNameContainer getForms(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XFormsSupplier2.idl b/offapi/com/sun/star/form/XFormsSupplier2.idl
index 30a22e02b91c..8b6fd355f45b 100644
--- a/offapi/com/sun/star/form/XFormsSupplier2.idl
+++ b/offapi/com/sun/star/form/XFormsSupplier2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/XGrid.idl b/offapi/com/sun/star/form/XGrid.idl
index f60fa5be9cee..38a1f3158cf0 100644
--- a/offapi/com/sun/star/form/XGrid.idl
+++ b/offapi/com/sun/star/form/XGrid.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,21 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XGrid_idl__
-#define __com_sun_star_form_XGrid_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
-/** provides the possibility of setting and retrieving the position
+#ifndef __com_sun_star_form_XGrid_idl__ 
+#define __com_sun_star_form_XGrid_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
+/** provides the possibility of setting and retrieving the position 
     of the current cell in a grid control.
 
     <p>Note that a grid control does not allow free control over the current row:
@@ -54,26 +54,26 @@
     @deprecated
  */
 published interface XGrid: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** retrieves the current column position.
      */
-    short getCurrentColumnPosition();
-
-    //-------------------------------------------------------------------------
-
+    short getCurrentColumnPosition(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the current column position.
      */
-    [oneway] void setCurrentColumnPosition( [in] short nPos );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void setCurrentColumnPosition( [in] short nPos ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XGridColumnFactory.idl b/offapi/com/sun/star/form/XGridColumnFactory.idl
index 76d1b3735b9f..671523dcbf8e 100644
--- a/offapi/com/sun/star/form/XGridColumnFactory.idl
+++ b/offapi/com/sun/star/form/XGridColumnFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XGridColumnFactory_idl__
-#define __com_sun_star_form_XGridColumnFactory_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XGridColumnFactory_idl__ 
+#define __com_sun_star_form_XGridColumnFactory_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form { 
+ 
+//============================================================================= 
+ 
 /** allows to create columns to be added into a grid control model.
 
     <p>Grid columns (more precise: models of grid columns) are direct children of
@@ -56,9 +56,9 @@
     @see com::sun::star::form::component::GridControl
  */
 published interface XGridColumnFactory: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** creates a new column object
 
         @param aColumnType
@@ -68,26 +68,26 @@ published interface XGridColumnFactory: com::sun::star::uno::XInterface
             the new column object
 
         @throws com::sun::star::lang::IllegalArgumentException
-            if <arg>aColumnType</arg> is not available.
+            if <arg>aColumnType</arg> is not available.			
      */
-    com::sun::star::beans::XPropertySet createColumn( [in] string aColumnType )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::beans::XPropertySet createColumn( [in] string aColumnType ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns a list of available column types.
 
         @returns
             a list of column types.
      */
-    sequence<string> getColumnTypes();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    sequence<string> getColumnTypes(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XGridControl.idl b/offapi/com/sun/star/form/XGridControl.idl
index 3f9e601fc310..d37f39a054a2 100644
--- a/offapi/com/sun/star/form/XGridControl.idl
+++ b/offapi/com/sun/star/form/XGridControl.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module form {
+module com { module sun { module star { module form { 
 
 //=============================================================================
 
@@ -62,7 +62,7 @@ interface XGridControl
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/XGridControlListener.idl b/offapi/com/sun/star/form/XGridControlListener.idl
index f84e99f837d2..99a1ce75319f 100644
--- a/offapi/com/sun/star/form/XGridControlListener.idl
+++ b/offapi/com/sun/star/form/XGridControlListener.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module form {
+module com { module sun { module star { module form { 
 
 //=============================================================================
 
@@ -50,7 +50,7 @@ interface XGridControlListener : ::com::sun::star::lang::XEventListener
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/XGridFieldDataSupplier.idl b/offapi/com/sun/star/form/XGridFieldDataSupplier.idl
index 5a4aa9b57fec..0c1dca16cfad 100644
--- a/offapi/com/sun/star/form/XGridFieldDataSupplier.idl
+++ b/offapi/com/sun/star/form/XGridFieldDataSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XGridFieldDataSupplier_idl__
-#define __com_sun_star_form_XGridFieldDataSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
-#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XGridFieldDataSupplier_idl__ 
+#define __com_sun_star_form_XGridFieldDataSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_XIdlClass_idl__ 
+#include <com/sun/star/reflection/XIdlClass.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form { 
+ 
+//============================================================================= 
+ 
 /** provides access to the data of a GridControl
-
+    
     <p>You can retrieve the data type information and the data in a row.</p>
 
     <p>This interface allows to retrieve data even for rows which are not current, which is quite usefull,
@@ -57,8 +57,8 @@
     @deprecated
  */
 published interface XGridFieldDataSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** checks whether or not the content of the grid's columns can be retrieved in the requested format.
 
         <p>Not every cell content can be retrieved in every representation. For example, in a text column,
@@ -73,9 +73,9 @@ published interface XGridFieldDataSupplier: com::sun::star::uno::XInterface
         @see DataAwareControlModel
         @see XGridFieldDataSupplier::queryFieldData
     */
-    sequence<boolean> queryFieldDataType( [in] type xType );
-
-    //-------------------------------------------------------------------------
+    sequence<boolean> queryFieldDataType( [in] type xType ); 
+ 
+    //------------------------------------------------------------------------- 
     /** retrieves the actual column data for the given row
 
         <p>If a column does not support the requested type, <NULL/> is returned at the respective
@@ -83,15 +83,15 @@ published interface XGridFieldDataSupplier: com::sun::star::uno::XInterface
 
         @see XGridFieldDataSupplier::queryFieldDataType
     */
-    sequence<any> queryFieldData( [in] long nRow,
-             [in] type xType );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    sequence<any> queryFieldData( [in] long nRow, 
+             [in] type xType ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XGridPeer.idl b/offapi/com/sun/star/form/XGridPeer.idl
index 57d815caa214..f81f02bf5cac 100644
--- a/offapi/com/sun/star/form/XGridPeer.idl
+++ b/offapi/com/sun/star/form/XGridPeer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XGridPeer_idl__
-#define __com_sun_star_form_XGridPeer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
-#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
-/** represents the window peer of a GridControl and allows you to set
+#ifndef __com_sun_star_form_XGridPeer_idl__ 
+#define __com_sun_star_form_XGridPeer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XIndexContainer_idl__ 
+#include <com/sun/star/container/XIndexContainer.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
+/** represents the window peer of a GridControl and allows you to set 
     and retrieve the model data.
-
+    
     <p>Usually, the columns used are the columns as supplied by the grid control model.</p>
 
     <p>You should use this interface only if you know exactly what you are doing. Tampering
@@ -55,26 +55,26 @@
     @see com::sun::star::form::component::GridControl
  */
 published interface XGridPeer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** retrieves the currently used column definitions of the peer.
      */
-    com::sun::star::container::XIndexContainer getColumns();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::container::XIndexContainer getColumns(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the column definition for the peer.
      */
-    [oneway] void setColumns( [in] com::sun::star::container::XIndexContainer aColumns );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void setColumns( [in] com::sun::star::container::XIndexContainer aColumns ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XImageProducerSupplier.idl b/offapi/com/sun/star/form/XImageProducerSupplier.idl
index 74a52e8e526c..6a9dbb9a45ee 100644
--- a/offapi/com/sun/star/form/XImageProducerSupplier.idl
+++ b/offapi/com/sun/star/form/XImageProducerSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
-#define __com_sun_star_form_XImageProducerSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XImageProducer_idl__
-#include <com/sun/star/awt/XImageProducer.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XImageProducerSupplier_idl__ 
+#define __com_sun_star_form_XImageProducerSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XImageProducer_idl__ 
+#include <com/sun/star/awt/XImageProducer.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** provides the access to an image producer.
 
     @see com::sun::star::awt::XImageProducer
  */
 published interface XImageProducerSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** accesses the image producer.
 
         @returns
             the image producer.
      */
-    com::sun::star::awt::XImageProducer getImageProducer();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::awt::XImageProducer getImageProducer(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XInsertListener.idl b/offapi/com/sun/star/form/XInsertListener.idl
index 63da8d514c4b..e634ef7dadcc 100644
--- a/offapi/com/sun/star/form/XInsertListener.idl
+++ b/offapi/com/sun/star/form/XInsertListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XInsertListener_idl__
-#define __com_sun_star_form_XInsertListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XInsertListener_idl__ 
+#define __com_sun_star_form_XInsertListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form { 
+ 
+//============================================================================= 
+ 
 /** allows to receive notifications about insertions into a database form.
-
+    
     <p>Please do <em><b>not</b></em> use anymore, this interface is deprecated, and
     superseeded by functionality from the <type scope="com::sun::star::form::component">DataForm</type>
     service, as well as the <type scope="com::sun::star::sdbc">XRowSetListener</type> and
@@ -52,26 +52,26 @@
     @deprecated
  */
 published interface XInsertListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a database form starts inserting a record.
      */
-    void inserting( [in] com::sun::star::lang::EventObject aEvent );
-
-    //-------------------------------------------------------------------------
-
+    void inserting( [in] com::sun::star::lang::EventObject aEvent ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked after a database form has inserted a record to a data source.
      */
-    void inserted( [in] com::sun::star::lang::EventObject aEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void inserted( [in] com::sun::star::lang::EventObject aEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XLoadListener.idl b/offapi/com/sun/star/form/XLoadListener.idl
index afbf72027e9b..952a5ace2c9b 100644
--- a/offapi/com/sun/star/form/XLoadListener.idl
+++ b/offapi/com/sun/star/form/XLoadListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XLoadListener_idl__
-#define __com_sun_star_form_XLoadListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XLoadListener_idl__ 
+#define __com_sun_star_form_XLoadListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form { 
+ 
+//============================================================================= 
+ 
 /** receives load-related events from a loadable object.
-
+    
     <p>The interface is typically implemented by data-bound components,
     which want to listen to the data source that contains their database
     form.</p>
@@ -52,18 +52,18 @@
     @see DataAwareControlModel
  */
 published interface XLoadListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the object has successfully connected to a datasource.
 
         @param aEvent
             the event happend.
      */
-    [oneway] void loaded( [in] com::sun::star::lang::EventObject aEvent );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void loaded( [in] com::sun::star::lang::EventObject aEvent ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the object is about to be unloaded.
         <p>Components may use this to stop any other event processing related to
         the event source before the object is unloaded.</p>
@@ -71,19 +71,19 @@ published interface XLoadListener: com::sun::star::lang::XEventListener
         @param aEvent
             the event happend.
      */
-    [oneway] void unloading( [in] com::sun::star::lang::EventObject aEvent );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void unloading( [in] com::sun::star::lang::EventObject aEvent ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked after the object has disconnected from a datasource.
 
         @param aEvent
             the event happend.
      */
-    [oneway] void unloaded( [in] com::sun::star::lang::EventObject aEvent );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void unloaded( [in] com::sun::star::lang::EventObject aEvent ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the object is about to be reloaded.
 
         <p>Components may use this to stop any other event processing related
@@ -92,23 +92,23 @@ published interface XLoadListener: com::sun::star::lang::XEventListener
         @param aEvent
             the event happend.
      */
-    [oneway] void reloading( [in] com::sun::star::lang::EventObject aEvent );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void reloading( [in] com::sun::star::lang::EventObject aEvent ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the object has been reloaded.
 
         @param aEvent
             the event happend.
      */
-    [oneway] void reloaded( [in] com::sun::star::lang::EventObject aEvent );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void reloaded( [in] com::sun::star::lang::EventObject aEvent ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XLoadable.idl b/offapi/com/sun/star/form/XLoadable.idl
index 1c1abb68059c..42130cca643f 100644
--- a/offapi/com/sun/star/form/XLoadable.idl
+++ b/offapi/com/sun/star/form/XLoadable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XLoadable_idl__
-#define __com_sun_star_form_XLoadable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_form_XLoadListener_idl__
-#include <com/sun/star/form/XLoadListener.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XLoadable_idl__ 
+#define __com_sun_star_form_XLoadable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XLoadListener_idl__ 
+#include <com/sun/star/form/XLoadListener.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form { 
+ 
+//============================================================================= 
+ 
 /** provides functionality to implement objects which may be loaded.
 
     <p>The object is typically implemented by high-level objects which can connect to a data source.</p>
@@ -48,60 +48,60 @@
     @see XLoadListener
  */
 published interface XLoadable: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** loads the data.
 
         <p>If the data is already loaded (->isLoaded), then the method returns silently.
         In this case, you should use ->reload.</p>
      */
-    [oneway] void load();
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void load(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** unloads the data.
      */
-    [oneway] void unload();
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void unload(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** does a smart refresh of the object.
 
         <p>The final state will be the same as if unload and load were called, but reload
         is the more efficient way to do the same. If the object isn't loaded, nothing happens.</p>
      */
-    [oneway] void reload();
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void reload(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns if the object is in loaded state.
      */
-    boolean isLoaded();
-
-    //-------------------------------------------------------------------------
-
+    boolean isLoaded(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** adds the specified listener to receive load-related events
 
         @param aListener
             the listener to add.
      */
-    [oneway] void addLoadListener( [in] com::sun::star::form::XLoadListener aListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addLoadListener( [in] com::sun::star::form::XLoadListener aListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified listener.
 
         @param aListener
             the listener to remove.
      */
-    [oneway] void removeLoadListener( [in] com::sun::star::form::XLoadListener aListener );
-};
-
-}; }; }; };
-
-#endif
-
-/*=============================================================================
-
-=============================================================================*/
+    [oneway] void removeLoadListener( [in] com::sun::star::form::XLoadListener aListener ); 
+}; 
+ 
+}; }; }; }; 
+ 
+#endif 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
diff --git a/offapi/com/sun/star/form/XPositioningListener.idl b/offapi/com/sun/star/form/XPositioningListener.idl
index 391380e1d3a4..d8811c34ece2 100644
--- a/offapi/com/sun/star/form/XPositioningListener.idl
+++ b/offapi/com/sun/star/form/XPositioningListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XPositioningListener_idl__
-#define __com_sun_star_form_XPositioningListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XPositioningListener_idl__ 
+#define __com_sun_star_form_XPositioningListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form { 
+ 
+//============================================================================= 
+ 
 /** allows to receive notifications about cursor movements into a database form.
-
+    
     <p>Please do <em><b>not</b></em> use anymore, this interface is deprecated, and
     superseeded by functionality from the <type scope="com::sun::star::form::component">DataForm</type>
     service, as well as the <type scope="com::sun::star::sdbc">XRowSetListener</type>.</p>
@@ -51,20 +51,20 @@
     @deprecated
  */
 published interface XPositioningListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when the database form has been positioned on a data record.
      */
-    [oneway] void positioned( [in] com::sun::star::lang::EventObject aEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void positioned( [in] com::sun::star::lang::EventObject aEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XReset.idl b/offapi/com/sun/star/form/XReset.idl
index 9ef8f37e649b..0bb67efa43d1 100644
--- a/offapi/com/sun/star/form/XReset.idl
+++ b/offapi/com/sun/star/form/XReset.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,62 +24,62 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XReset_idl__
-#define __com_sun_star_form_XReset_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_form_XResetListener_idl__
-#include <com/sun/star/form/XResetListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XReset_idl__ 
+#define __com_sun_star_form_XReset_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XResetListener_idl__ 
+#include <com/sun/star/form/XResetListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** provides functionality to reset components to some default values.
 
     <p>The semantincs of <em>default value</em> depends on the providing service.</p>
  */
 published interface XReset: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** resets a component to some default value.
      */
-    [oneway] void reset();
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void reset(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** adds the specified listener to receive events related to resetting the
         component.
 
         @param aListener
             the listener to add.
      */
-    [oneway] void addResetListener( [in] com::sun::star::form::XResetListener aListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addResetListener( [in] com::sun::star::form::XResetListener aListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified listener
 
         @param aListener
             the listener to remove
      */
-    [oneway] void removeResetListener( [in] com::sun::star::form::XResetListener aListener );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void removeResetListener( [in] com::sun::star::form::XResetListener aListener ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XResetListener.idl b/offapi/com/sun/star/form/XResetListener.idl
index b7f338fe59fb..d8409edfa8fc 100644
--- a/offapi/com/sun/star/form/XResetListener.idl
+++ b/offapi/com/sun/star/form/XResetListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XResetListener_idl__
-#define __com_sun_star_form_XResetListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XResetListener_idl__ 
+#define __com_sun_star_form_XResetListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** is the interface for receiving notificaions about reset events.
-
-    <p>The listener is called if a component implementing the
+    
+    <p>The listener is called if a component implementing the 
     <type>XReset</type> interface performs a reset.</br>
     Order of events:
     <ul><li>a reset is triggered on a component</li>
@@ -53,39 +53,39 @@
         <li>the component calls <member>XReset::resetted</member> on all its listeners</li>
     </ul>
     </p>
-
+    
     @see      XReset
  */
 published interface XResetListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked before a component is reset.
-
+        
         @param rEvent
             the event happend.
 
         @returns
             <TRUE/> when reset was approved, <FALSE/> when the reset operation should be cancelled.
      */
-    boolean approveReset( [in] com::sun::star::lang::EventObject rEvent );
-
-    //-------------------------------------------------------------------------
-
+    boolean approveReset( [in] com::sun::star::lang::EventObject rEvent ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a component has been reset.
 
         @param rEvent
             the event happend.
      */
-    [oneway] void resetted( [in] com::sun::star::lang::EventObject rEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void resetted( [in] com::sun::star::lang::EventObject rEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XRestoreListener.idl b/offapi/com/sun/star/form/XRestoreListener.idl
index f5b4c77325f5..04c3637e4c1a 100644
--- a/offapi/com/sun/star/form/XRestoreListener.idl
+++ b/offapi/com/sun/star/form/XRestoreListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XRestoreListener_idl__
-#define __com_sun_star_form_XRestoreListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XRestoreListener_idl__ 
+#define __com_sun_star_form_XRestoreListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form { 
+ 
+//============================================================================= 
+ 
 /** receives notifications about data beeing restored.
-
+    
     <p>Such a notification is typically sent when the user cancels updating the
     current record of a database form
     without saving the data. After restoring, the user operates on the original data.</p>
@@ -51,24 +51,24 @@
     <p>Please do <em><b>not</b></em> use anymore, this interface is deprecated, and
     superseeded by functionality from the <type scope="com::sun::star::form::component">DataForm</type>
     and <type scope="com::sun::star::sdb">RowSet</type> services</p>
-
+    
     @deprecated
  */
 published interface XRestoreListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a modified record has been restored
      */
-    void restored( [in] com::sun::star::lang::EventObject aEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void restored( [in] com::sun::star::lang::EventObject aEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XSubmit.idl b/offapi/com/sun/star/form/XSubmit.idl
index d7b766990fdc..9c902fd9df7c 100644
--- a/offapi/com/sun/star/form/XSubmit.idl
+++ b/offapi/com/sun/star/form/XSubmit.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XSubmit_idl__
-#define __com_sun_star_form_XSubmit_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControl_idl__
-#include <com/sun/star/awt/XControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_MouseEvent_idl__
-#include <com/sun/star/awt/MouseEvent.idl>
-#endif
-
-#ifndef __com_sun_star_form_XSubmitListener_idl__
-#include <com/sun/star/form/XSubmitListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XSubmit_idl__ 
+#define __com_sun_star_form_XSubmit_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XControl_idl__ 
+#include <com/sun/star/awt/XControl.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_MouseEvent_idl__ 
+#include <com/sun/star/awt/MouseEvent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XSubmitListener_idl__ 
+#include <com/sun/star/form/XSubmitListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** provides functionality to submit data from a component.
 
     <p>Usually, this is used by <type scope="com::sun::star::form::component">HTMLForm</type>s.
@@ -58,9 +58,9 @@
     to learn about submitting forms.</p>
  */
 published interface XSubmit: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** submits the component's data to a specified target.
 
         @param aControl
@@ -71,11 +71,11 @@ published interface XSubmit: com::sun::star::uno::XInterface
 
         @see com::sun::star::awt::MouseEvent
      */
-    [oneway] void submit( [in] com::sun::star::awt::XControl aControl,
-             [in] com::sun::star::awt::MouseEvent aMouseEvt );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void submit( [in] com::sun::star::awt::XControl aControl, 
+             [in] com::sun::star::awt::MouseEvent aMouseEvt ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** adds the specified listener to receive the "approveSubmit" event.
 
         @param aListener
@@ -83,24 +83,24 @@ published interface XSubmit: com::sun::star::uno::XInterface
 
         @see com::sun::star::form::XSubmitListener
      */
-    [oneway] void addSubmitListener( [in] com::sun::star::form::XSubmitListener aListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addSubmitListener( [in] com::sun::star::form::XSubmitListener aListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified listener.
         @param aListener
             the listener to remove.
         @see com::sun::star::form::XSubmitListener
      */
-    [oneway] void removeSubmitListener( [in] com::sun::star::form::XSubmitListener aListener );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void removeSubmitListener( [in] com::sun::star::form::XSubmitListener aListener ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XSubmitListener.idl b/offapi/com/sun/star/form/XSubmitListener.idl
index 1943c2071a2d..a71d71b3d093 100644
--- a/offapi/com/sun/star/form/XSubmitListener.idl
+++ b/offapi/com/sun/star/form/XSubmitListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XSubmitListener_idl__
-#define __com_sun_star_form_XSubmitListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XSubmitListener_idl__ 
+#define __com_sun_star_form_XSubmitListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** receives notifications about data beeing submitted.
-
+    
     <p>The submission may be cancelled, so the listener has the possibility
     of verifying the data before submission.</p>
 
@@ -54,9 +54,9 @@
         interface. New implementations should use the latter, if possible.
  */
 published interface XSubmitListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a component is about to submit it's data.
 
         @param aEvent
@@ -65,15 +65,15 @@ published interface XSubmitListener: com::sun::star::lang::XEventListener
         @returns
             <TRUE/> when submitting was approved, otherwise <FALSE/>.
      */
-    boolean approveSubmit( [in] com::sun::star::lang::EventObject rEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    boolean approveSubmit( [in] com::sun::star::lang::EventObject rEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XUpdateBroadcaster.idl b/offapi/com/sun/star/form/XUpdateBroadcaster.idl
index cf4f20a4da69..d49ae0606202 100644
--- a/offapi/com/sun/star/form/XUpdateBroadcaster.idl
+++ b/offapi/com/sun/star/form/XUpdateBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XUpdateBroadcaster_idl__
-#define __com_sun_star_form_XUpdateBroadcaster_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_form_XUpdateListener_idl__
-#include <com/sun/star/form/XUpdateListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XUpdateBroadcaster_idl__ 
+#define __com_sun_star_form_XUpdateBroadcaster_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XUpdateListener_idl__ 
+#include <com/sun/star/form/XUpdateListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  
+ 
+//============================================================================= 
+ 
 /** is the broadcaster interface for sending "approveUpdate" and "updated" events.
 
     <p>The component supporting this interface must do approval calls
@@ -52,33 +52,33 @@
     @see XUpdateListener
  */
 published interface XUpdateBroadcaster: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** adds the specified listener to receive the events "approveUpdate"
         and "updated".
         @param aListener
             the listener to add.
         @see com::sun::star::form::XUpdateListener
      */
-    [oneway] void addUpdateListener( [in] com::sun::star::form::XUpdateListener aListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addUpdateListener( [in] com::sun::star::form::XUpdateListener aListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified listener.
         @param aListener
             the listener to remove.
         @see com::sun::star::form::XUpdateListener
      */
-    [oneway] void removeUpdateListener( [in] com::sun::star::form::XUpdateListener aListener );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void removeUpdateListener( [in] com::sun::star::form::XUpdateListener aListener ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/XUpdateListener.idl b/offapi/com/sun/star/form/XUpdateListener.idl
index 172a3593c87f..a497ba782c13 100644
--- a/offapi/com/sun/star/form/XUpdateListener.idl
+++ b/offapi/com/sun/star/form/XUpdateListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_XUpdateListener_idl__
-#define __com_sun_star_form_XUpdateListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XUpdateListener_idl__ 
+#define __com_sun_star_form_XUpdateListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form { 
+ 
+//============================================================================= 
+ 
 /** used to listen on objects which allow updating their data.
     <p>In addition to just get notified when an data update happened, the listener
     has a chance to veto updates <em>before</em> they happen.</p>
-
+    
     @see XUpdateBroadcaster
  */
 published interface XUpdateListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked to check the current data.
 
         <p>For a given update process, if one of the <type>XUpdateListener</type>s
@@ -60,28 +60,28 @@ published interface XUpdateListener: com::sun::star::lang::XEventListener
         @param aEvent
             An event dedscriptor specifying the broadcaster of the change.
 
-        @returns
+        @returns 
             <TRUE/> when the update was approved, otherwise <FALSE/>.
      */
-    boolean approveUpdate( [in] com::sun::star::lang::EventObject aEvent );
-
-    //-------------------------------------------------------------------------
-
+    boolean approveUpdate( [in] com::sun::star::lang::EventObject aEvent ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when an object has finished processing the updates and
         the data has been successfully written.
 
         @param aEvent
             A event dedscriptor specifying the broadcaster of the change.
      */
-    void updated( [in] com::sun::star::lang::EventObject aEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void updated( [in] com::sun::star::lang::EventObject aEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/form/binding/BindableControlModel.idl b/offapi/com/sun/star/form/binding/BindableControlModel.idl
index 8b0d1058c77b..aeb8999d69a3 100644
--- a/offapi/com/sun/star/form/binding/BindableControlModel.idl
+++ b/offapi/com/sun/star/form/binding/BindableControlModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 #ifndef __com_sun_star_form_binding_XBindableValue_idl__
 #include <com/sun/star/form/binding/XBindableValue.idl>
 #endif
-#ifndef __com_sun_star_form_FormControlModel_idl__
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl>
 #endif
 
@@ -53,7 +53,7 @@ service BindableControlModel
         binding is also established at the clone. Effectively, this means that
         both control model instances share the same binding instance.</p>
     */
-    service com::sun::star::form::FormControlModel;
+    service com::sun::star::form::FormControlModel; 
 
     /** specifies support for being bound to an external value
 
diff --git a/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl b/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
index c16d53a9c304..a4f12d37418c 100644
--- a/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
+++ b/offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl b/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl
index 868fc02c1705..cd2a72b8b4c3 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseCheckBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl b/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl
index 9c379190afcc..a0514a18480f 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseComboBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl
index 2df7988e5d40..2a25a49fc317 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseDateField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl
index c6f433339295..d526aa7f76ce 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseFormattedField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl b/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
index d07665579638..e9bd4e685882 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl
index c34acbe14ce1..4094d5cdeab6 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseNumericField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl b/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl
index d2779ba1ea8d..376977acbec2 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseRadioButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl
index 81906b7759a5..674a4f285d96 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseTextField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl b/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl
index fafa1a06a507..93ba21b1a0fb 100644
--- a/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl
+++ b/offapi/com/sun/star/form/binding/BindableDatabaseTimeField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl b/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl
index 478c6875f717..7d88a5013f16 100644
--- a/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl
+++ b/offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl b/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl
index 4f0b6551e973..6349a187b64a 100644
--- a/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl
+++ b/offapi/com/sun/star/form/binding/IncompatibleTypesException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl b/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl
index d25f6159e88b..2e8518126521 100644
--- a/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl
+++ b/offapi/com/sun/star/form/binding/InvalidBindingStateException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/ListEntryEvent.idl b/offapi/com/sun/star/form/binding/ListEntryEvent.idl
index 046888d7b8cc..5112fda4df6d 100644
--- a/offapi/com/sun/star/form/binding/ListEntryEvent.idl
+++ b/offapi/com/sun/star/form/binding/ListEntryEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/ListEntrySource.idl b/offapi/com/sun/star/form/binding/ListEntrySource.idl
index 15ea1f3bcf27..a2bde630c37a 100644
--- a/offapi/com/sun/star/form/binding/ListEntrySource.idl
+++ b/offapi/com/sun/star/form/binding/ListEntrySource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/ValueBinding.idl b/offapi/com/sun/star/form/binding/ValueBinding.idl
index f7c99e8ca6af..9d9fa51e61be 100644
--- a/offapi/com/sun/star/form/binding/ValueBinding.idl
+++ b/offapi/com/sun/star/form/binding/ValueBinding.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/XBindableValue.idl b/offapi/com/sun/star/form/binding/XBindableValue.idl
index 2d8413029323..3e7a3e00574c 100644
--- a/offapi/com/sun/star/form/binding/XBindableValue.idl
+++ b/offapi/com/sun/star/form/binding/XBindableValue.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/XListEntryListener.idl b/offapi/com/sun/star/form/binding/XListEntryListener.idl
index b48ec45198fc..ff3873035679 100644
--- a/offapi/com/sun/star/form/binding/XListEntryListener.idl
+++ b/offapi/com/sun/star/form/binding/XListEntryListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/XListEntrySink.idl b/offapi/com/sun/star/form/binding/XListEntrySink.idl
index 0f2e84a8011d..e1e43d17dc43 100644
--- a/offapi/com/sun/star/form/binding/XListEntrySink.idl
+++ b/offapi/com/sun/star/form/binding/XListEntrySink.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/XListEntrySource.idl b/offapi/com/sun/star/form/binding/XListEntrySource.idl
index 4d6390b41ece..cfba37f47307 100644
--- a/offapi/com/sun/star/form/binding/XListEntrySource.idl
+++ b/offapi/com/sun/star/form/binding/XListEntrySource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/binding/XValueBinding.idl b/offapi/com/sun/star/form/binding/XValueBinding.idl
index 207b3ec7e7ad..56a50c6ace07 100644
--- a/offapi/com/sun/star/form/binding/XValueBinding.idl
+++ b/offapi/com/sun/star/form/binding/XValueBinding.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/component/CheckBox.idl b/offapi/com/sun/star/form/component/CheckBox.idl
index 5db7acb3d2a6..ff9409730ca0 100644
--- a/offapi/com/sun/star/form/component/CheckBox.idl
+++ b/offapi/com/sun/star/form/component/CheckBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/component/ComboBox.idl b/offapi/com/sun/star/form/component/ComboBox.idl
index c5d02077cad8..c54c2e459ec7 100644
--- a/offapi/com/sun/star/form/component/ComboBox.idl
+++ b/offapi/com/sun/star/form/component/ComboBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_ComboBox_idl__
-#define __com_sun_star_form_component_ComboBox_idl__
-
-#ifndef __com_sun_star_awt_UnoControlComboBoxModel_idl__
-#include <com/sun/star/awt/UnoControlComboBoxModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
-#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
-#include <com/sun/star/form/XReset.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_ComboBox_idl__ 
+#define __com_sun_star_form_component_ComboBox_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlComboBoxModel_idl__ 
+#include <com/sun/star/awt/UnoControlComboBoxModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
+#include <com/sun/star/form/FormControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XReset_idl__ 
+#include <com/sun/star/form/XReset.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component { 
+ 
+//============================================================================= 
+ 
 /** specifies a component which allows the input of text or selection
     of text from a list of text values.
  */
 published service ComboBox
-{
-    service com::sun::star::awt::UnoControlComboBoxModel;
-
-    service com::sun::star::form::FormControlModel;
-
+{ 
+    service com::sun::star::awt::UnoControlComboBoxModel; 
+    
+    service com::sun::star::form::FormControlModel; 
+    
     /** can be used to reset the control to it's default text.
 
         @see ComboBox::DefaultText
@@ -68,11 +68,11 @@ published service ComboBox
         @see com::sun::star::awt::UnoControlComboBoxModel::Text
         @see com::sun::star::form::XReset
      */
-    [property] string DefaultText;
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] string DefaultText; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/CommandButton.idl b/offapi/com/sun/star/form/component/CommandButton.idl
index 249f66c5923a..19dd8138dc1e 100644
--- a/offapi/com/sun/star/form/component/CommandButton.idl
+++ b/offapi/com/sun/star/form/component/CommandButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_CommandButton_idl__
-#define __com_sun_star_form_component_CommandButton_idl__
-
-#include <com/sun/star/form/FormControlModel.idl>
-#include <com/sun/star/awt/UnoControlButtonModel.idl>
-#include <com/sun/star/form/XImageProducerSupplier.idl>
-#include <com/sun/star/form/XApproveActionBroadcaster.idl>
-#include <com/sun/star/form/FormButtonType.idl>
-#include <com/sun/star/form/XReset.idl>
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_CommandButton_idl__ 
+#define __com_sun_star_form_component_CommandButton_idl__ 
+ 
+#include <com/sun/star/form/FormControlModel.idl> 
+#include <com/sun/star/awt/UnoControlButtonModel.idl> 
+#include <com/sun/star/form/XImageProducerSupplier.idl> 
+#include <com/sun/star/form/XApproveActionBroadcaster.idl> 
+#include <com/sun/star/form/FormButtonType.idl> 
+#include <com/sun/star/form/XReset.idl> 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component { 
+ 
+//============================================================================= 
+ 
 /** specifies the control model for a clickable button which is part of a form
     component hierarchy.
 
     @see ImageButton
  */
 published service CommandButton
-{
-    service com::sun::star::awt::UnoControlButtonModel;
-
-    service com::sun::star::form::FormControlModel;
+{ 
+    service com::sun::star::awt::UnoControlButtonModel; 
 
+    service com::sun::star::form::FormControlModel; 
+     
     /** supplies the image producer when the button is to display an image.
 
         <p>If the <member scope="com::sun::star::awt">UnoControlButtonModel::ImageURL</member> points to the location of an
@@ -61,14 +61,14 @@ published service CommandButton
         <p>Usually, a control belonging to the model will use this interface to obtain the
         image to be painted</p>
      */
-    interface com::sun::star::form::XImageProducerSupplier;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::form::XImageProducerSupplier; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** describes the action to be executed by the button when pressed.
      */
-    [property] com::sun::star::form::FormButtonType ButtonType;
-
+    [property] com::sun::star::form::FormButtonType ButtonType; 
+ 
     /** describes the frame, where to open the document specified by the TargetURL.
 
         <p>This property is evaluated if the button is of type URL.</p>
@@ -76,15 +76,15 @@ published service CommandButton
         <p>As always, there is a number of target names which have a special meaning, and force
         a special <type scope="com::sun::star::frame">Frame</type> to be used.</p>
      */
-    [property] string TargetFrame;
+    [property] string TargetFrame; 
 
     /** specifies the URL, which should be opened if the button was clicked.
-
+        
         <p>This property is evaluated if the button is of type URL.</p>
 
         @see com::sun::star::form::FormButtonType
      */
-    [property] string TargetURL;
+    [property] string TargetURL; 
 
     /** specifies the default toggle state for the button, used when it is reset.
 
@@ -107,10 +107,10 @@ published service CommandButton
         property <member>DefaultState</member> must be present.</p>
     */
     [optional] interface ::com::sun::star::form::XReset;
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/CurrencyField.idl b/offapi/com/sun/star/form/component/CurrencyField.idl
index 1e190f2ae1ca..2bf9352055d8 100644
--- a/offapi/com/sun/star/form/component/CurrencyField.idl
+++ b/offapi/com/sun/star/form/component/CurrencyField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_CurrencyField_idl__
-#define __com_sun_star_form_component_CurrencyField_idl__
-
-#ifndef __com_sun_star_awt_UnoControlCurrencyFieldModel_idl__
-#include <com/sun/star/awt/UnoControlCurrencyFieldModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
-#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
-#include <com/sun/star/form/XReset.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_CurrencyField_idl__ 
+#define __com_sun_star_form_component_CurrencyField_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlCurrencyFieldModel_idl__ 
+#include <com/sun/star/awt/UnoControlCurrencyFieldModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
+#include <com/sun/star/form/FormControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XReset_idl__ 
+#include <com/sun/star/form/XReset.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component {  
+ 
+//============================================================================= 
+ 
 /** This service specifies the ControlModel for an edit field which
     contains a currency value.
  */
 published service CurrencyField
-{
-    service com::sun::star::awt::UnoControlCurrencyFieldModel;
+{ 
+    service com::sun::star::awt::UnoControlCurrencyFieldModel; 
 
     service com::sun::star::form::FormControlModel;
-
+    
     /** can be used to reset the control to it's default state.
 
         @see CurrencyField::DefaultValue
@@ -66,12 +66,12 @@ published service CurrencyField
         @see com::sun::star::awt::UnoControlCurrencyFieldModel::Value
         @see com::sun::star::form::XReset
      */
-    [property] double DefaultValue;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] double DefaultValue; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/DataForm.idl b/offapi/com/sun/star/form/component/DataForm.idl
index 9b5f1f03f757..e3bf416eaa33 100644
--- a/offapi/com/sun/star/form/component/DataForm.idl
+++ b/offapi/com/sun/star/form/component/DataForm.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -196,7 +196,7 @@ published service DataForm
 
     //-------------------------------------------------------------------------
     /** determines if insertions into the form's row set are allowed.
-
+    
         <p>Note that this is a recommendation for user interface components displaying the
         form. Form implementations may decide to allow for insertions done via the API, even
         if the property is set to <FALSE/>, but the user interface should respect the property
@@ -206,7 +206,7 @@ published service DataForm
 
     //-------------------------------------------------------------------------
     /** determines if modifications of the current record of the form are allowed.
-
+    
         <p>Note that this is a recommendation for user interface components displaying the
         form. Form implementations may decide to allow for updates done via the API, even
         if the property is set to <FALSE/>, but the user interface should respect the property
@@ -216,7 +216,7 @@ published service DataForm
 
     //-------------------------------------------------------------------------
     /** determines if deletions of records of the form are allowed.
-
+    
         <p>Note that this is a recommendation for user interface components displaying the
         form. Form implementations may decide to allow for deletions done via the API, even
         if the property is set to <FALSE/>, but the user interface should respect the property
diff --git a/offapi/com/sun/star/form/component/DatabaseCheckBox.idl b/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
index 82f49ad55d02..d3d6127f0c4e 100644
--- a/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseCheckBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_DatabaseCheckBox_idl__
-#define __com_sun_star_form_component_DatabaseCheckBox_idl__
-
-#ifndef __com_sun_star_form_component_CheckBox_idl__
-#include <com/sun/star/form/component/CheckBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
-#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_DatabaseCheckBox_idl__ 
+#define __com_sun_star_form_component_DatabaseCheckBox_idl__ 
+ 
+#ifndef __com_sun_star_form_component_CheckBox_idl__ 
+#include <com/sun/star/form/component/CheckBox.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
+#include <com/sun/star/form/DataAwareControlModel.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component {  
+ 
+//============================================================================= 
+ 
 /** This service specifies a check box which is data-aware, and can be bound to a database field.
 
     <p>Mostly, you will create data-aware checkboxes as tristate checkboxes, because this
@@ -50,15 +50,15 @@
     @see ::com::sun::star::awt::UnoControlCheckBoxModel::TriState
  */
 published service DatabaseCheckBox
-{
-    service com::sun::star::form::component::CheckBox;
-
-    service com::sun::star::form::DataAwareControlModel;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+{ 
+    service com::sun::star::form::component::CheckBox; 
+    
+    service com::sun::star::form::DataAwareControlModel; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/DatabaseComboBox.idl b/offapi/com/sun/star/form/component/DatabaseComboBox.idl
index 2ccca56dbb3e..abdec878d5fc 100644
--- a/offapi/com/sun/star/form/component/DatabaseComboBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseComboBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_DatabaseComboBox_idl__
-#define __com_sun_star_form_component_DatabaseComboBox_idl__
-
-#ifndef __com_sun_star_form_component_ComboBox_idl__
-#include <com/sun/star/form/component/ComboBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
-#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_ListSourceType_idl__
-#include <com/sun/star/form/ListSourceType.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_DatabaseComboBox_idl__ 
+#define __com_sun_star_form_component_DatabaseComboBox_idl__ 
+ 
+#ifndef __com_sun_star_form_component_ComboBox_idl__ 
+#include <com/sun/star/form/component/ComboBox.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
+#include <com/sun/star/form/DataAwareControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_ListSourceType_idl__ 
+#include <com/sun/star/form/ListSourceType.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component { 
+ 
+//============================================================================= 
+ 
 /** This service specifies a combo box which is data-aware, and can be bound to a database field.
 
     <p>Like most other data aware controls, such a combo box will display the actual content
@@ -54,13 +54,13 @@
     a database, too.</p>
  */
 published service DatabaseComboBox
-{
-    service com::sun::star::form::component::ComboBox;
-
-    service com::sun::star::form::DataAwareControlModel;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    service com::sun::star::form::component::ComboBox; 
+    
+    service com::sun::star::form::DataAwareControlModel; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines if an empty text should be treated as a <NULL/> value.
 
         <p>When the user enters text into a combo box, and after this, the control
@@ -71,26 +71,26 @@ published service DatabaseComboBox
         <p>If the property is set to <TRUE/>, and an empty text is to be commited, this is
         converted into <NULL/>, else it is written as empty string.</p>
      */
-    [property] boolean ConvertEmptyToNull;
+    [property] boolean ConvertEmptyToNull; 
 
     /** describes the source of items in the combo box' list.
 
         <p>The concrete meaning of this property depends on the value of <member>ListSourceType</member></p>
      */
-    [property] string ListSource;
-    //-------------------------------------------------------------------------
-
+    [property] string ListSource; 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the kind of list source.
-
+        
         <p>Note: A value of <member scope="com::sun::star::form">ListSourceType::VALUELIST</member>
         is not valid for a combo box. It won't be rejected when setting it, but controls will usually ignore it
         and leave the list empty.</p>
      */
-    [property] com::sun::star::form::ListSourceType ListSourceType;
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] com::sun::star::form::ListSourceType ListSourceType; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl b/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
index 3d56099c31d7..c589ca062957 100644
--- a/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseCurrencyField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_DatabaseCurrencyField_idl__
-#define __com_sun_star_form_component_DatabaseCurrencyField_idl__
-
-#ifndef __com_sun_star_form_component_CurrencyField_idl__
-#include <com/sun/star/form/component/CurrencyField.idl>
-#endif
-
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
-#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_DatabaseCurrencyField_idl__ 
+#define __com_sun_star_form_component_DatabaseCurrencyField_idl__ 
+ 
+#ifndef __com_sun_star_form_component_CurrencyField_idl__ 
+#include <com/sun/star/form/component/CurrencyField.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
+#include <com/sun/star/form/DataAwareControlModel.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component {  
+ 
+//============================================================================= 
+ 
 /** This service specifies a currency field which is data-aware, and can be bound to a database field.
  */
 published service DatabaseCurrencyField
-{
-    service com::sun::star::form::component::CurrencyField;
-
-    service com::sun::star::form::DataAwareControlModel;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+{ 
+    service com::sun::star::form::component::CurrencyField; 
+    
+    service com::sun::star::form::DataAwareControlModel; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/DatabaseDateField.idl b/offapi/com/sun/star/form/component/DatabaseDateField.idl
index 8673636874b0..894a8d2386c5 100644
--- a/offapi/com/sun/star/form/component/DatabaseDateField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseDateField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_DatabaseDateField_idl__
-#define __com_sun_star_form_component_DatabaseDateField_idl__
-
-#ifndef __com_sun_star_form_component_DateField_idl__
-#include <com/sun/star/form/component/DateField.idl>
-#endif
-
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
-#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_DatabaseDateField_idl__ 
+#define __com_sun_star_form_component_DatabaseDateField_idl__ 
+ 
+#ifndef __com_sun_star_form_component_DateField_idl__ 
+#include <com/sun/star/form/component/DateField.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
+#include <com/sun/star/form/DataAwareControlModel.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component {  
+ 
+//============================================================================= 
+ 
 /** This service specifies a date field which is data-aware, and can be bound to a database field.
  */
 published service DatabaseDateField
 {
-    service com::sun::star::form::component::DateField;
-
-    service com::sun::star::form::DataAwareControlModel;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    service com::sun::star::form::component::DateField; 
+
+    service com::sun::star::form::DataAwareControlModel; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/DatabaseFormattedField.idl b/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
index 575ad5d8ff02..90dda9c87f8d 100644
--- a/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseFormattedField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_DatabaseFormattedField_idl__
-#define __com_sun_star_form_component_DatabaseFormattedField_idl__
-
-#ifndef __com_sun_star_form_component_FormattedField_idl__
-#include <com/sun/star/form/component/FormattedField.idl>
-#endif
-
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
-#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_DatabaseFormattedField_idl__ 
+#define __com_sun_star_form_component_DatabaseFormattedField_idl__ 
+ 
+#ifndef __com_sun_star_form_component_FormattedField_idl__ 
+#include <com/sun/star/form/component/FormattedField.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
+#include <com/sun/star/form/DataAwareControlModel.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component {  
+ 
+//============================================================================= 
+ 
 /** This service specifies a formatted field model which is data-aware, and can be bound to a database field.
  */
 published service DatabaseFormattedField
-{
-    service com::sun::star::form::component::FormattedField;
-
-    service com::sun::star::form::DataAwareControlModel;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    service com::sun::star::form::component::FormattedField; 
+    
+    service com::sun::star::form::DataAwareControlModel; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines if an empty text should be treated as a <NULL/> value.
 
         <p>When the user enters text into a formatted field control, and after this, the control
@@ -62,12 +62,12 @@ published service DatabaseFormattedField
         <p>If the property is set to <TRUE/>, and an empty text is to be commited, this is
         converted into <NULL/>, else it is written as empty string.</p>
      */
-    [property] boolean ConvertEmptyToNull;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] boolean ConvertEmptyToNull; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/DatabaseImageControl.idl b/offapi/com/sun/star/form/component/DatabaseImageControl.idl
index 731a27437bf5..f3c5e4cca079 100644
--- a/offapi/com/sun/star/form/component/DatabaseImageControl.idl
+++ b/offapi/com/sun/star/form/component/DatabaseImageControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_DatabaseImageControl_idl__
-#define __com_sun_star_form_component_DatabaseImageControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__
-#include <com/sun/star/awt/UnoControlImageControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
-#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
-#include <com/sun/star/form/XImageProducerSupplier.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_DatabaseImageControl_idl__ 
+#define __com_sun_star_form_component_DatabaseImageControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlImageControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
+#include <com/sun/star/form/DataAwareControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XImageProducerSupplier_idl__ 
+#include <com/sun/star/form/XImageProducerSupplier.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component {  
+ 
+//============================================================================= 
+ 
 /** specifies the model of a control used for displaying images stored in a database.
 
     <p>As every <type scope="com::sun::star::form">DataAwareControlModel</type>, an image control
@@ -54,7 +54,7 @@
     Unlike other more text-based controls, it does not interpret the content of the field as text or double,
     but as binary stream (see <member scope="com::sun::star::sdb">XColumn::getBinaryStream</member>).</p>
 
-    <p>Usually, an image control model can be bound to binary columns only, namely
+    <p>Usually, an image control model can be bound to binary columns only,	namely
     <member scope="com::sun::star::sdbc">DataType::BINARY</member>,
     <member scope="com::sun::star::sdbc">DataType::VARBINARY</member>,
     <member scope="com::sun::star::sdbc">DataType::LONGVARBINARY</member>,
@@ -95,28 +95,28 @@
     </p>
  */
 published service DatabaseImageControl
-{
-    service com::sun::star::awt::UnoControlImageControlModel;
-
-    service com::sun::star::form::DataAwareControlModel;
-
+{ 
+    service com::sun::star::awt::UnoControlImageControlModel; 
+    
+    service com::sun::star::form::DataAwareControlModel; 
+ 
     /** supplies the caller with an <type scope="com::sun::star::awt">XImageProducer</type>.
 
         <p>Other components can register as <type scope="com::sun::star::awt">XImageConsumer</type>
         at this producer. Then they will be notified of any change in the image to be displayed.</p>
      */
-    interface com::sun::star::form::XImageProducerSupplier;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::form::XImageProducerSupplier; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** indicates if it is possible to change the image being displayed.
      */
-    [property] boolean ReadOnly;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] boolean ReadOnly; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/DatabaseListBox.idl b/offapi/com/sun/star/form/component/DatabaseListBox.idl
index daa06fef61b3..92c9b4eb5c54 100644
--- a/offapi/com/sun/star/form/component/DatabaseListBox.idl
+++ b/offapi/com/sun/star/form/component/DatabaseListBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_DatabaseListBox_idl__
-#define __com_sun_star_form_component_DatabaseListBox_idl__
-
-#ifndef __com_sun_star_form_component_ListBox_idl__
-#include <com/sun/star/form/component/ListBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
-#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_ListSourceType_idl__
-#include <com/sun/star/form/ListSourceType.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_DatabaseListBox_idl__ 
+#define __com_sun_star_form_component_DatabaseListBox_idl__ 
+ 
+#ifndef __com_sun_star_form_component_ListBox_idl__ 
+#include <com/sun/star/form/component/ListBox.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
+#include <com/sun/star/form/DataAwareControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_ListSourceType_idl__ 
+#include <com/sun/star/form/ListSourceType.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component {  
+ 
+//============================================================================= 
+ 
 /** This service specifies a data-aware list box control model.
 
     <p>The base service for list boxes (<type>ListBox</type>) offers only
@@ -72,13 +72,13 @@
 
  */
 published service DatabaseListBox
-{
-    service com::sun::star::form::component::ListBox;
-
-    service com::sun::star::form::DataAwareControlModel;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    service com::sun::star::form::component::ListBox; 
+    
+    service com::sun::star::form::DataAwareControlModel; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies which column of the list result set should be used for data exchange.
 
         <p>When you make a selection from a list box, the "BoundColumn"
@@ -87,7 +87,7 @@ published service DatabaseListBox
         to a database field, the column value is stored in the
         database field identified by the property
         <member scope="com::sun::star::form">DataAwareControlModel::DataField</member>.
-
+        
         <dl>
             <dt>0</dt>
             <dd>The selected (displayed) list box string is stored in
@@ -107,10 +107,10 @@ published service DatabaseListBox
         Otherwise the property is ignored, as there is no result set from which to
         get the column values.</p>
     */
-    [property] short BoundColumn;
-
-    //-------------------------------------------------------------------------
-
+    [property] short BoundColumn; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** describes the kind of list source used.
 
         <p>Depending on the value of this property, the way the value of <member>ListBox::ListSource</member>
@@ -148,12 +148,12 @@ published service DatabaseListBox
         </p>
 
      */
-    [property] com::sun::star::form::ListSourceType ListSourceType;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] com::sun::star::form::ListSourceType ListSourceType; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/DatabaseNumericField.idl b/offapi/com/sun/star/form/component/DatabaseNumericField.idl
index 57853d6ddc83..e68d581d33bb 100644
--- a/offapi/com/sun/star/form/component/DatabaseNumericField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseNumericField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_DatabaseNumericField_idl__
-#define __com_sun_star_form_component_DatabaseNumericField_idl__
-
-#ifndef __com_sun_star_form_component_NumericField_idl__
-#include <com/sun/star/form/component/NumericField.idl>
-#endif
-
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
-#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_DatabaseNumericField_idl__ 
+#define __com_sun_star_form_component_DatabaseNumericField_idl__ 
+ 
+#ifndef __com_sun_star_form_component_NumericField_idl__ 
+#include <com/sun/star/form/component/NumericField.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
+#include <com/sun/star/form/DataAwareControlModel.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component {  
+ 
+//============================================================================= 
+ 
 /** This service specifies a numeric field which is data-aware, and can be bound to a database field.
  */
 published service DatabaseNumericField
-{
-    service com::sun::star::form::component::NumericField;
-
-    service com::sun::star::form::DataAwareControlModel;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+{ 
+    service com::sun::star::form::component::NumericField; 
+    
+    service com::sun::star::form::DataAwareControlModel; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/DatabasePatternField.idl b/offapi/com/sun/star/form/component/DatabasePatternField.idl
index 2488b4160cad..f7f19dd18e7d 100644
--- a/offapi/com/sun/star/form/component/DatabasePatternField.idl
+++ b/offapi/com/sun/star/form/component/DatabasePatternField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_DatabasePatternField_idl__
-#define __com_sun_star_form_component_DatabasePatternField_idl__
-
-#ifndef __com_sun_star_form_component_PatternField_idl__
-#include <com/sun/star/form/component/PatternField.idl>
-#endif
-
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
-#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_DatabasePatternField_idl__ 
+#define __com_sun_star_form_component_DatabasePatternField_idl__ 
+ 
+#ifndef __com_sun_star_form_component_PatternField_idl__ 
+#include <com/sun/star/form/component/PatternField.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
+#include <com/sun/star/form/DataAwareControlModel.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component {  
+ 
+//============================================================================= 
+ 
 /** This service specifies a data-aware control model for entering text which matches a specific
     pattern.
  */
 published service DatabasePatternField
-{
-    service com::sun::star::form::component::PatternField;
-
-    service com::sun::star::form::DataAwareControlModel;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    service com::sun::star::form::component::PatternField; 
+    
+    service com::sun::star::form::DataAwareControlModel; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines if an empty text should be treated as a <NULL/> value.
 
         <p>When the user enters text into a pattern field, and after this, the control
@@ -63,12 +63,12 @@ published service DatabasePatternField
         <p>If the property is set to <TRUE/>, and an empty text is to be commited, this is
         converted into <NULL/>, else it is written as empty string.</p>
      */
-    [property] boolean ConvertEmptyToNull;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] boolean ConvertEmptyToNull; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/DatabaseRadioButton.idl b/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
index 2b60c3fb5dd3..d2f07b71f57f 100644
--- a/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
+++ b/offapi/com/sun/star/form/component/DatabaseRadioButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_DatabaseRadioButton_idl__
-#define __com_sun_star_form_component_DatabaseRadioButton_idl__
-
-#ifndef __com_sun_star_form_component_RadioButton_idl__
-#include <com/sun/star/form/component/RadioButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
-#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_DatabaseRadioButton_idl__ 
+#define __com_sun_star_form_component_DatabaseRadioButton_idl__ 
+ 
+#ifndef __com_sun_star_form_component_RadioButton_idl__ 
+#include <com/sun/star/form/component/RadioButton.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
+#include <com/sun/star/form/DataAwareControlModel.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component {  
+ 
+//============================================================================= 
+ 
 /** This service specifies a radio button which is data-aware, and can be bound to a database field.
  */
 published service DatabaseRadioButton
-{
-    service com::sun::star::form::component::RadioButton;
-
-    service com::sun::star::form::DataAwareControlModel;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+{ 
+    service com::sun::star::form::component::RadioButton; 
+    
+    service com::sun::star::form::DataAwareControlModel; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/DatabaseTextField.idl b/offapi/com/sun/star/form/component/DatabaseTextField.idl
index 001f342d3c53..8709ec8909fc 100644
--- a/offapi/com/sun/star/form/component/DatabaseTextField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseTextField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_DatabaseTextField_idl__
-#define __com_sun_star_form_component_DatabaseTextField_idl__
-
-#ifndef __com_sun_star_form_component_TextField_idl__
-#include <com/sun/star/form/component/TextField.idl>
-#endif
-
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
-#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_DatabaseTextField_idl__ 
+#define __com_sun_star_form_component_DatabaseTextField_idl__ 
+ 
+#ifndef __com_sun_star_form_component_TextField_idl__ 
+#include <com/sun/star/form/component/TextField.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
+#include <com/sun/star/form/DataAwareControlModel.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component {  
+ 
+//============================================================================= 
+ 
 /** This service specifies a text field which is data-aware, and can be bound to a database field.
  */
 published service DatabaseTextField
-{
-    service com::sun::star::form::component::TextField;
-
-    service com::sun::star::form::DataAwareControlModel;
-
-    //-------------------------------------------------------------------------
-
+{ 
+    service com::sun::star::form::component::TextField; 
+    
+    service com::sun::star::form::DataAwareControlModel; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines if an empty text should be treated as a <NULL/> value.
 
         <p>When the user enters text into a text field, and after this, the control
@@ -62,12 +62,12 @@ published service DatabaseTextField
         <p>If the property is set to <TRUE/>, and an empty text is to be commited, this is
         converted into <NULL/>, else it is written as empty string.</p>
      */
-    [property] boolean ConvertEmptyToNull;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] boolean ConvertEmptyToNull; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/DatabaseTimeField.idl b/offapi/com/sun/star/form/component/DatabaseTimeField.idl
index 1ac3d51ccc36..7403635843e6 100644
--- a/offapi/com/sun/star/form/component/DatabaseTimeField.idl
+++ b/offapi/com/sun/star/form/component/DatabaseTimeField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_DatabaseTimeField_idl__
-#define __com_sun_star_form_component_DatabaseTimeField_idl__
-
-#ifndef __com_sun_star_form_component_TimeField_idl__
-#include <com/sun/star/form/component/TimeField.idl>
-#endif
-
-#ifndef __com_sun_star_form_DataAwareControlModel_idl__
-#include <com/sun/star/form/DataAwareControlModel.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_DatabaseTimeField_idl__ 
+#define __com_sun_star_form_component_DatabaseTimeField_idl__ 
+ 
+#ifndef __com_sun_star_form_component_TimeField_idl__ 
+#include <com/sun/star/form/component/TimeField.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_DataAwareControlModel_idl__ 
+#include <com/sun/star/form/DataAwareControlModel.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component {  
+ 
+//============================================================================= 
+ 
 /** This service specifies a data-aware field for inputting a time value.
  */
 published service DatabaseTimeField
-{
-    service com::sun::star::form::component::TimeField;
-
-    service com::sun::star::form::DataAwareControlModel;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+{ 
+    service com::sun::star::form::component::TimeField; 
+    
+    service com::sun::star::form::DataAwareControlModel; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/DateField.idl b/offapi/com/sun/star/form/component/DateField.idl
index b7764c8ea874..72b0afdac0d0 100644
--- a/offapi/com/sun/star/form/component/DateField.idl
+++ b/offapi/com/sun/star/form/component/DateField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_DateField_idl__
-#define __com_sun_star_form_component_DateField_idl__
-
-#ifndef __com_sun_star_awt_UnoControlDateFieldModel_idl__
-#include <com/sun/star/awt/UnoControlDateFieldModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
-#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
-#include <com/sun/star/form/XReset.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_DateField_idl__ 
+#define __com_sun_star_form_component_DateField_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlDateFieldModel_idl__ 
+#include <com/sun/star/awt/UnoControlDateFieldModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
+#include <com/sun/star/form/FormControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XReset_idl__ 
+#include <com/sun/star/form/XReset.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component {  
+ 
+//============================================================================= 
+ 
 /** specifies the model of a date field control, which is an edit field used to enter a date.
 */
 published service DateField
-{
-    service com::sun::star::awt::UnoControlDateFieldModel;
-
-    service com::sun::star::form::FormControlModel;
-
+{ 
+    service com::sun::star::awt::UnoControlDateFieldModel; 
+    
+    service com::sun::star::form::FormControlModel; 
+    
     /** resets the control.
-
+    
         <p>If you do not set a value for the <member>DefaultDate</member>, then resetting the control
         will result in setting to to the current system date. This is for HTML compatibility.</p>
     */
-    interface com::sun::star::form::XReset;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::form::XReset; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains a default value for the control.
 
         <p>This value is used when the control is initially displayed, and for resetting it.</p>
@@ -70,12 +70,12 @@ published service DateField
         @see com::sun::star::awt::UnoControlDateFieldModel::Date
         @see com::sun::star::form::XReset
     */
-    [property] long DefaultDate;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] long DefaultDate; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/FileControl.idl b/offapi/com/sun/star/form/component/FileControl.idl
index d9956c7114b6..e042d1264650 100644
--- a/offapi/com/sun/star/form/component/FileControl.idl
+++ b/offapi/com/sun/star/form/component/FileControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_FileControl_idl__
-#define __com_sun_star_form_component_FileControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControlFileControlModel_idl__
-#include <com/sun/star/awt/UnoControlFileControlModel.idl>
+#ifndef __com_sun_star_form_component_FileControl_idl__ 
+#define __com_sun_star_form_component_FileControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlFileControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlFileControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
+#include <com/sun/star/form/FormControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XReset_idl__ 
+#include <com/sun/star/form/XReset.idl> 
 #endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
-#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
-#include <com/sun/star/form/XReset.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component { 
+ 
+//============================================================================= 
+ 
 /** This service specifies the control model of an edit field for a
     file name.
  */
 published service FileControl
-{
-    service com::sun::star::awt::UnoControlFileControlModel;
-
-    service com::sun::star::form::FormControlModel;
-
+{ 
+    service com::sun::star::awt::UnoControlFileControlModel; 
+    
+    service com::sun::star::form::FormControlModel; 
+ 
     /** can be used to reset the control to it's default text.
 
         @see FileControl::DefaultText
@@ -67,12 +67,12 @@ published service FileControl
         @see com::sun::star::awt::UnoControlFileControlModel::Text
         @see com::sun::star::form::XReset
      */
-    [property] string DefaultText;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] string DefaultText; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/FixedText.idl b/offapi/com/sun/star/form/component/FixedText.idl
index 1bb60c47388e..4b3778be04c8 100644
--- a/offapi/com/sun/star/form/component/FixedText.idl
+++ b/offapi/com/sun/star/form/component/FixedText.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_FixedText_idl__
-#define __com_sun_star_form_component_FixedText_idl__
-
-#ifndef __com_sun_star_awt_UnoControlFixedTextModel_idl__
-#include <com/sun/star/awt/UnoControlFixedTextModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
-#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_FixedText_idl__ 
+#define __com_sun_star_form_component_FixedText_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlFixedTextModel_idl__ 
+#include <com/sun/star/awt/UnoControlFixedTextModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
+#include <com/sun/star/form/FormControlModel.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component {  
+ 
+//============================================================================= 
+ 
 /** This service specifies the control model for a text which can be
     displayed, but not edited by the user.
 
@@ -50,15 +50,15 @@
     @see com::sun::star::form::DataAwareControlModel::LabelControl
  */
 published service FixedText
-{
-    service com::sun::star::awt::UnoControlFixedTextModel;
-
-    service com::sun::star::form::FormControlModel;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+{ 
+    service com::sun::star::awt::UnoControlFixedTextModel; 
+    
+    service com::sun::star::form::FormControlModel; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/Form.idl b/offapi/com/sun/star/form/component/Form.idl
index 526a2febecb0..5b9be2cefa4c 100644
--- a/offapi/com/sun/star/form/component/Form.idl
+++ b/offapi/com/sun/star/form/component/Form.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/component/FormattedField.idl b/offapi/com/sun/star/form/component/FormattedField.idl
index 21ab49c523ff..90e3f04cc9a2 100644
--- a/offapi/com/sun/star/form/component/FormattedField.idl
+++ b/offapi/com/sun/star/form/component/FormattedField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_FormattedField_idl__
-#define __com_sun_star_form_component_FormattedField_idl__
-
-#ifndef __com_sun_star_awt_UnoControlFormattedFieldModel_idl__
-#include <com/sun/star/awt/UnoControlFormattedFieldModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
-#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
-#include <com/sun/star/form/XReset.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_FormattedField_idl__ 
+#define __com_sun_star_form_component_FormattedField_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlFormattedFieldModel_idl__ 
+#include <com/sun/star/awt/UnoControlFormattedFieldModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
+#include <com/sun/star/form/FormControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XReset_idl__ 
+#include <com/sun/star/form/XReset.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component { 
+ 
+//============================================================================= 
+ 
 /** This service specifies the control model of an edit field for entering text which can be
     (nearly) arbirtrarily formatted.
 
     @see com::sun::star::util::XNumberFormatsSupplier
  */
 published service FormattedField
-{
-    service com::sun::star::awt::UnoControlFormattedFieldModel;
-
-    service com::sun::star::form::FormControlModel;
-
+{ 
+    service com::sun::star::awt::UnoControlFormattedFieldModel; 
+    
+    service com::sun::star::form::FormControlModel; 
+    
     /** can be used to reset the control to it's default state.
 
         @see com::sun::star::awt::UnoControlFormattedFieldModel::EffectiveValue
         @see com::sun::star::awt::UnoControlFormattedFieldModel::EffectiveDefault
     */
     interface com::sun::star::form::XReset;
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/GridControl.idl b/offapi/com/sun/star/form/component/GridControl.idl
index f3077ec037ac..52ef5f20a628 100644
--- a/offapi/com/sun/star/form/component/GridControl.idl
+++ b/offapi/com/sun/star/form/component/GridControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,64 +24,64 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_GridControl_idl__
-#define __com_sun_star_form_component_GridControl_idl__
-
+#ifndef __com_sun_star_form_component_GridControl_idl__ 
+#define __com_sun_star_form_component_GridControl_idl__ 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
-#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XGridColumnFactory_idl__
-#include <com/sun/star/form/XGridColumnFactory.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormComponents_idl__
-#include <com/sun/star/form/FormComponents.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
-#include <com/sun/star/container/XContainer.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
-#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
-#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
-#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_script_XEventAttacherManager_idl__
-#include <com/sun/star/script/XEventAttacherManager.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
-#include <com/sun/star/form/XReset.idl>
-#endif
-
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
+#include <com/sun/star/form/FormControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XGridColumnFactory_idl__ 
+#include <com/sun/star/form/XGridColumnFactory.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormComponents_idl__ 
+#include <com/sun/star/form/FormComponents.idl> 
+#endif 
+
+#ifndef __com_sun_star_container_XContainer_idl__ 
+#include <com/sun/star/container/XContainer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_view_XSelectionSupplier_idl__ 
+#include <com/sun/star/view/XSelectionSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#include <com/sun/star/container/XNameContainer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XIndexContainer_idl__ 
+#include <com/sun/star/container/XIndexContainer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
+#include <com/sun/star/container/XEnumerationAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_XEventAttacherManager_idl__ 
+#include <com/sun/star/script/XEventAttacherManager.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XReset_idl__ 
+#include <com/sun/star/form/XReset.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component {  
+ 
+//============================================================================= 
+ 
 /** specifies a model for a control which can display form data in a table-like way.
 
     <p>In opposite to other form controls, grid controls do not only
@@ -97,11 +97,11 @@
     as own services. Instead, they need to be created using the <type scope="com::sun::star::form">XGridColumnFactory</type> interface.</p>
  */
 published service GridControl
-{
+{ 
     service com::sun::star::form::FormControlModel;
 
     /** provides basic functionality of a container of <type scope="com::sun::star::form">FormComponent</type>s.
-
+    
         <p>All the container-related methods of this service related to control models,
         this is what are the container elements for a <type>GridControl</type>.</p>
 
@@ -110,7 +110,7 @@ published service GridControl
         also provide a scripting environment for their columns.</p>
     */
     service com::sun::star::form::FormComponents;
-
+    
     /** allows to create column models to be inserted into the control model.
 
         <p>Note that the object returned by the <membere scope="com::sun::star::form">XGridColumnFactory::createColumn</member>
@@ -120,8 +120,8 @@ published service GridControl
         <p>You always need to use this interface for creating columns for the grid control.
         Column models not created this way will not be accepted when inserted later on.</p>
     */
-    interface com::sun::star::form::XGridColumnFactory;
-
+    interface com::sun::star::form::XGridColumnFactory; 
+    
     /** gives access to the currently selection.
 
         <p>In a grid control, single columns can be selected (at most one at a time).<br/>
@@ -133,18 +133,18 @@ published service GridControl
 
         @deprecated
     */
-    interface com::sun::star::view::XSelectionSupplier;
-
+    interface com::sun::star::view::XSelectionSupplier; 
+    
     /** resets the control.
 
         <p>The reset of the control is forwarded to all it's elements, means to all the column models.
         As grid columns are very much like data-aware stand-alone controls, you can find a description
         of the reset functionality in <member scope="com::sun::star::form">DataAwareControlModel::XReset</member>.
     */
-    interface com::sun::star::form::XReset;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::form::XReset; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the border style of the control.
 
         <pre>
@@ -153,9 +153,9 @@ published service GridControl
         2: simple border
         </pre>
      */
-    [property] short Border;
-
-    //-------------------------------------------------------------------------
+    [property] short Border; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** specifies the color of the border, if present
 
@@ -165,21 +165,21 @@ published service GridControl
         @since OOo 2.0.0
      */
     [optional, property] long BorderColor;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines whether the control is enabled or disabled.
      */
-    [property] boolean Enabled;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Enabled; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the font attributes of the text in the control.
      */
-    [property] com::sun::star::awt::FontDescriptor FontDescriptor;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::awt::FontDescriptor FontDescriptor; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the height of a row of the grid.
 
         <p>If the value is set to <NULL/>, the height is determined automatically according
@@ -187,24 +187,24 @@ published service GridControl
 
         @see GridControl::FontDescriptor
      */
-    [property] long RowHeight;
-
-    //-------------------------------------------------------------------------
-
+    [property] long RowHeight; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines whether the control can be reached by the tabulator key.
      */
-    [property] boolean Tabstop;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Tabstop; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the text color (RGB) of the control.
      */
-    [property] com::sun::star::util::Color TextColor;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] com::sun::star::util::Color TextColor; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/GroupBox.idl b/offapi/com/sun/star/form/component/GroupBox.idl
index d4f2b57375ae..535d59c50fdf 100644
--- a/offapi/com/sun/star/form/component/GroupBox.idl
+++ b/offapi/com/sun/star/form/component/GroupBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_GroupBox_idl__
-#define __com_sun_star_form_component_GroupBox_idl__
-
-#ifndef __com_sun_star_awt_UnoControlGroupBoxModel_idl__
-#include <com/sun/star/awt/UnoControlGroupBoxModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
-#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_GroupBox_idl__ 
+#define __com_sun_star_form_component_GroupBox_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlGroupBoxModel_idl__ 
+#include <com/sun/star/awt/UnoControlGroupBoxModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
+#include <com/sun/star/form/FormControlModel.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component {  
+ 
+//============================================================================= 
+ 
 /** This service specifies a model for a control which can be used to visually
     group controls.
  */
 published service GroupBox
-{
-    service com::sun::star::awt::UnoControlGroupBoxModel;
-
-    service com::sun::star::form::FormControlModel;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+{ 
+    service com::sun::star::awt::UnoControlGroupBoxModel; 
+    
+    service com::sun::star::form::FormControlModel; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/HTMLForm.idl b/offapi/com/sun/star/form/component/HTMLForm.idl
index 763f388a4185..08ebb1036823 100644
--- a/offapi/com/sun/star/form/component/HTMLForm.idl
+++ b/offapi/com/sun/star/form/component/HTMLForm.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,83 +24,83 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_HTMLForm_idl__
-#define __com_sun_star_form_component_HTMLForm_idl__
-
-#ifndef __com_sun_star_form_component_Form_idl__
-#include <com/sun/star/form/component/Form.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
-#include <com/sun/star/form/XReset.idl>
-#endif
-
-#ifndef __com_sun_star_form_XSubmit_idl__
-#include <com/sun/star/form/XSubmit.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormSubmitMethod_idl__
-#include <com/sun/star/form/FormSubmitMethod.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormSubmitEncoding_idl__
-#include <com/sun/star/form/FormSubmitEncoding.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_HTMLForm_idl__ 
+#define __com_sun_star_form_component_HTMLForm_idl__ 
+ 
+#ifndef __com_sun_star_form_component_Form_idl__ 
+#include <com/sun/star/form/component/Form.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XReset_idl__ 
+#include <com/sun/star/form/XReset.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XSubmit_idl__ 
+#include <com/sun/star/form/XSubmit.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormSubmitMethod_idl__ 
+#include <com/sun/star/form/FormSubmitMethod.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormSubmitEncoding_idl__ 
+#include <com/sun/star/form/FormSubmitEncoding.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component { 
+ 
+//============================================================================= 
+ 
 /** This service specifies the special kind of <type>Form</type>s for HTML documents.
-
+    
     <p>An HTMLForm fulfills the specification of forms in HTML. It supplies
     the possibility of submitting or resetting the contents of a form.
     For more information on HTML forms, please see the documentation of HTML.</p>
  */
 published service HTMLForm
-{
-    service com::sun::star::form::component::Form;
-
+{ 
+    service com::sun::star::form::component::Form; 
+    
     /** resets the control.
     */
-    interface com::sun::star::form::XReset;
-
+    interface com::sun::star::form::XReset; 
+    
     /** allows to submit changes.
 
-        <p>When a form is submitted, the data contained in the form is sent
+        <p>When a form is submitted, the data contained in the form is sent 
         to the target URL as a series of name/value pairs. The name portion
         of each pair is the name of a form component as specified by its NAME
-        attribute. In most cases the value portion is the value displayed
+        attribute. In most cases the value portion is the value displayed 
         by the element, for example, the text displayed in a text field.</p>
     */
-    interface com::sun::star::form::XSubmit;
-
+    interface com::sun::star::form::XSubmit; 
+ 
     /** describes the frame, where to open the document specified by the TargetURL.
      */
-    [property] string TargetFrame;
-
-    //-------------------------------------------------------------------------
+    [property] string TargetFrame; 
 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the URL, which should be used for submission.
      */
-    [property] string TargetURL;
-    //-------------------------------------------------------------------------
-
+    [property] string TargetURL; 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the kind of submission.
      */
-    [property] com::sun::star::form::FormSubmitMethod SubmitMethod;
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::form::FormSubmitMethod SubmitMethod; 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the kind of encoding for submission.
      */
-    [property] com::sun::star::form::FormSubmitEncoding SubmitEncoding;
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] com::sun::star::form::FormSubmitEncoding SubmitEncoding; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/HiddenControl.idl b/offapi/com/sun/star/form/component/HiddenControl.idl
index cf516df86d12..f9d972542645 100644
--- a/offapi/com/sun/star/form/component/HiddenControl.idl
+++ b/offapi/com/sun/star/form/component/HiddenControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_HiddenControl_idl__
-#define __com_sun_star_form_component_HiddenControl_idl__
-
-#ifndef __com_sun_star_form_FormComponent_idl__
-#include <com/sun/star/form/FormComponent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_HiddenControl_idl__ 
+#define __com_sun_star_form_component_HiddenControl_idl__ 
+ 
+#ifndef __com_sun_star_form_FormComponent_idl__ 
+#include <com/sun/star/form/FormComponent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component { 
+ 
+//============================================================================= 
+ 
 /** This service specifies the model of a hidden control.
 
     <p>The only sense of a hidden control is to store data in the form which is
     not visible to the user.</p>
-
+    
     <p>Usually, hidden controls are used in <type scope="com::sun::star::form::component">HTMLForm</type>s,
     where they contain data which is to be submitted.<br/>
     Nevertheless, you can use them in your own forms for storing any data, for instance
     to evaluate it in some scripting macro.</p>
  */
 published service HiddenControl
-{
-    service com::sun::star::form::FormComponent;
-
+{ 
+    service com::sun::star::form::FormComponent; 
+ 
     /** specifies the value of the component.
      */
-    [property] string HiddenValue;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] string HiddenValue; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/ImageButton.idl b/offapi/com/sun/star/form/component/ImageButton.idl
index 69df0e295106..48cc3f209439 100644
--- a/offapi/com/sun/star/form/component/ImageButton.idl
+++ b/offapi/com/sun/star/form/component/ImageButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_ImageButton_idl__
-#define __com_sun_star_form_component_ImageButton_idl__
-
-#ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__
-#include <com/sun/star/awt/UnoControlImageControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
-#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
-#include <com/sun/star/form/XApproveActionBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
-#include <com/sun/star/form/XImageProducerSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormButtonType_idl__
-#include <com/sun/star/form/FormButtonType.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_ImageButton_idl__ 
+#define __com_sun_star_form_component_ImageButton_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlImageControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlImageControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
+#include <com/sun/star/form/FormControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__ 
+#include <com/sun/star/form/XApproveActionBroadcaster.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XImageProducerSupplier_idl__ 
+#include <com/sun/star/form/XImageProducerSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormButtonType_idl__ 
+#include <com/sun/star/form/FormButtonType.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component { 
+ 
+//============================================================================= 
+ 
 /** This service specifies the control model for a clickable button which
     is represented by an image.
 
@@ -63,12 +63,12 @@
     @see CommandButton
 */
 published service ImageButton
-{
-    service com::sun::star::awt::UnoControlImageControlModel;
-
-    service com::sun::star::form::FormControlModel;
-
-
+{ 
+    service com::sun::star::awt::UnoControlImageControlModel; 
+    
+    service com::sun::star::form::FormControlModel; 
+ 
+     
     /** supplies the caller with an <type scope="com::sun::star::awt">XImageProducer</type>.
 
         <p>Other components can register as <type scope="com::sun::star::awt">XImageConsumer</type>
@@ -82,14 +82,14 @@ published service ImageButton
         Usually, controls acting for an <type>ImageButton</type> model are consumers, and use the
         data stream to display the image</p>
      */
-    interface com::sun::star::form::XImageProducerSupplier;
-
-    //-------------------------------------------------------------------------
+    interface com::sun::star::form::XImageProducerSupplier; 
+ 
+    //------------------------------------------------------------------------- 
     /** describes the action to be executed by the button when pressed.
      */
-    [property] com::sun::star::form::FormButtonType ButtonType;
+    [property] com::sun::star::form::FormButtonType ButtonType; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** describes the frame, where to open the document specified by the TargetURL.
 
         <p>This property is evaluated if the button is of type URL.</p>
@@ -97,20 +97,20 @@ published service ImageButton
         <p>As always, there is a number of target names which have a special meaning, and force
         a special <type scope="com::sun::star::frame">Frame</type> to be used.</p>
      */
-    [property] string TargetFrame;
+    [property] string TargetFrame; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies the URL, which should be opened if the button was clicked.
-
+        
         <p>This property is evaluated if the button is of type URL.</p>
 
         @see com::sun::star::form::FormButtonType
      */
-    [property] string TargetURL;
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] string TargetURL; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/ListBox.idl b/offapi/com/sun/star/form/component/ListBox.idl
index f636d25b77ee..3752e4d4460b 100644
--- a/offapi/com/sun/star/form/component/ListBox.idl
+++ b/offapi/com/sun/star/form/component/ListBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_ListBox_idl__
-#define __com_sun_star_form_component_ListBox_idl__
-
-#ifndef __com_sun_star_awt_UnoControlListBoxModel_idl__
-#include <com/sun/star/awt/UnoControlListBoxModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
-#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
-#include <com/sun/star/form/XReset.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_ListBox_idl__ 
+#define __com_sun_star_form_component_ListBox_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlListBoxModel_idl__ 
+#include <com/sun/star/awt/UnoControlListBoxModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
+#include <com/sun/star/form/FormControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XReset_idl__ 
+#include <com/sun/star/form/XReset.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component { 
+ 
+//============================================================================= 
+ 
 /** specifies a model for a control which allows to choose in a list of alternative values.
  */
 published service ListBox
-{
-    service com::sun::star::awt::UnoControlListBoxModel;
-
-    service com::sun::star::form::FormControlModel;
-
+{ 
+    service com::sun::star::awt::UnoControlListBoxModel; 
+    
+    service com::sun::star::form::FormControlModel; 
+    
     /** can be used to reset the control to it's default state.
 
         @see ListBox::DefaultSelection
     */
-    interface com::sun::star::form::XReset;
-
-    /** contains the indexes of entries of the listbox, which should selected
+    interface com::sun::star::form::XReset; 
+ 
+    /** contains the indexes of entries of the listbox, which should selected 
         by default.
 
         <p>This selection is used initially or for a reset.</p>
@@ -68,17 +68,17 @@ published service ListBox
         @see com::sun::star::awt::UnoControlListBoxModel::SelectedItems
         @see com::sun::star::form::XReset
      */
-    [property] sequence<short> DefaultSelection;
-
+    [property] sequence<short> DefaultSelection; 
+ 
 
     /** contains the listbox entries.
      */
-    [property] sequence<string> ListSource;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] sequence<string> ListSource; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/NavigationToolBar.idl b/offapi/com/sun/star/form/component/NavigationToolBar.idl
index 0e3880db707d..f6aa632d6336 100644
--- a/offapi/com/sun/star/form/component/NavigationToolBar.idl
+++ b/offapi/com/sun/star/form/component/NavigationToolBar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -69,12 +69,12 @@ service NavigationToolBar
      */
     [property] com::sun::star::awt::FontDescriptor FontDescriptor;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies the text color (as RGB value) of the control.
      */
-    [property] long TextColor;
+    [property] long TextColor; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies the text line color (as RGB value) of the control.
 
         <p>This color is used if the <member>FontDescriptor</member> defines
@@ -82,7 +82,7 @@ service NavigationToolBar
      */
     [property] long TextLineColor;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies the relief for the font described in <member>FontDescriptor</member>
 
         <p>The value must be one of the <type scope="com::sun::star::text">FontRelief</type>
@@ -90,7 +90,7 @@ service NavigationToolBar
      */
     [property] long FontRelief;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies the emphasis mark for the font described in <member>FontDescriptor</member>
 
         <p>The value must be one of the <type scope="com::sun::star::text">FontEmphasis</type>
@@ -98,7 +98,7 @@ service NavigationToolBar
      */
     [property] long FontEmphasisMark;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies the size of the icons in the control
 
         <p>At least the following values are to be supported:
@@ -108,31 +108,31 @@ service NavigationToolBar
     */
     [property] short IconSize;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** determines whether the control should provide functionality for positioning the
         parent form
     */
     [property] boolean ShowPosition;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** determines whether the control should provide functionality for navigating the
         parent form
     */
     [property] boolean ShowNavigation;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** determines whether the control should provide functionality for acting on the current record
         of the parent form
     */
     [property] boolean ShowRecordActions;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** determines whether the control should provide functionality for filtering and sorting the
         parent form
     */
     [property] boolean ShowFilterSort;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies a repeat delay for the control
 
         <p>Some buttons of a NavigationToolBar may show repeating behaviour, e.g. may be
diff --git a/offapi/com/sun/star/form/component/NumericField.idl b/offapi/com/sun/star/form/component/NumericField.idl
index 62336316eb0a..faba3d05c315 100644
--- a/offapi/com/sun/star/form/component/NumericField.idl
+++ b/offapi/com/sun/star/form/component/NumericField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_NumericField_idl__
-#define __com_sun_star_form_component_NumericField_idl__
-
-#ifndef __com_sun_star_awt_UnoControlNumericFieldModel_idl__
-#include <com/sun/star/awt/UnoControlNumericFieldModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
-#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
-#include <com/sun/star/form/XReset.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_NumericField_idl__ 
+#define __com_sun_star_form_component_NumericField_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlNumericFieldModel_idl__ 
+#include <com/sun/star/awt/UnoControlNumericFieldModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
+#include <com/sun/star/form/FormControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XReset_idl__ 
+#include <com/sun/star/form/XReset.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component {  
+ 
+//============================================================================= 
+ 
 /** specifies a component which allows the input of a numeric value.
  */
 published service NumericField
-{
-    service com::sun::star::awt::UnoControlNumericFieldModel;
-
-    service com::sun::star::form::FormControlModel;
-
+{ 
+    service com::sun::star::awt::UnoControlNumericFieldModel; 
+    
+    service com::sun::star::form::FormControlModel; 
+    
     /** can be used to reset the control to it's default value.
 
         @see NumericField::DefaultValue
     */
-    interface com::sun::star::form::XReset;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::form::XReset; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains a default value for the control.
 
         <p>This value is used when the control is initially displayed, and for resetting it.</p>
@@ -69,12 +69,12 @@ published service NumericField
         @see com::sun::star::awt::UnoControlNumericFieldModel::Value
         @see com::sun::star::form::XReset
      */
-    [property] double DefaultValue;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] double DefaultValue; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/PatternField.idl b/offapi/com/sun/star/form/component/PatternField.idl
index f41a12d2231e..4a4ee8616b82 100644
--- a/offapi/com/sun/star/form/component/PatternField.idl
+++ b/offapi/com/sun/star/form/component/PatternField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_PatternField_idl__
-#define __com_sun_star_form_component_PatternField_idl__
-
-#ifndef __com_sun_star_awt_UnoControlPatternFieldModel_idl__
-#include <com/sun/star/awt/UnoControlPatternFieldModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
-#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
-#include <com/sun/star/form/XReset.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_PatternField_idl__ 
+#define __com_sun_star_form_component_PatternField_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlPatternFieldModel_idl__ 
+#include <com/sun/star/awt/UnoControlPatternFieldModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
+#include <com/sun/star/form/FormControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XReset_idl__ 
+#include <com/sun/star/form/XReset.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component { 
+ 
+//============================================================================= 
+ 
 /** specifies a component which allows the input of text which matches a specific pattern.
  */
 published service PatternField
-{
-    service com::sun::star::awt::UnoControlPatternFieldModel;
-
-    service com::sun::star::form::FormControlModel;
-
+{ 
+    service com::sun::star::awt::UnoControlPatternFieldModel; 
+    
+    service com::sun::star::form::FormControlModel; 
+    
     /** can be used to reset the control to it's default text.
 
         @see PatternField::DefaultText
     */
-    interface com::sun::star::form::XReset;
-
+    interface com::sun::star::form::XReset; 
+ 
     /** contains a default value for the control.
 
         <p>This value is used when the control is initially displayed, and for resetting it.</p>
@@ -67,12 +67,12 @@ published service PatternField
         @see com::sun::star::awt::UnoControlPatternFieldModel::Text
         @see com::sun::star::form::XReset
      */
-    [property] string DefaultText;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] string DefaultText; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/RadioButton.idl b/offapi/com/sun/star/form/component/RadioButton.idl
index 76575e3450bd..089c3d8835ff 100644
--- a/offapi/com/sun/star/form/component/RadioButton.idl
+++ b/offapi/com/sun/star/form/component/RadioButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_RadioButton_idl__
-#define __com_sun_star_form_component_RadioButton_idl__
-
-#ifndef __com_sun_star_awt_UnoControlRadioButtonModel_idl__
-#include <com/sun/star/awt/UnoControlRadioButtonModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
-#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
-#include <com/sun/star/form/XReset.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_RadioButton_idl__ 
+#define __com_sun_star_form_component_RadioButton_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlRadioButtonModel_idl__ 
+#include <com/sun/star/awt/UnoControlRadioButtonModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
+#include <com/sun/star/form/FormControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XReset_idl__ 
+#include <com/sun/star/form/XReset.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component { 
+ 
+//============================================================================= 
+ 
 /** specifies a component which acts as a radio button as needed in <type>HTMLForm</type>s.
 
     <p>Radio buttons are controls which can be grouped together, and in every
@@ -57,19 +57,19 @@
     same name (see <member scope="com::sun::star::form">FormComponent::Name</member>).</p>
  */
 published service RadioButton
-{
-    service com::sun::star::awt::UnoControlRadioButtonModel;
-
-    service com::sun::star::form::FormControlModel;
-
+{ 
+    service com::sun::star::awt::UnoControlRadioButtonModel; 
+    
+    service com::sun::star::form::FormControlModel; 
+    
     /** can be used to reset the control to it's default text.
 
         @see RadioButton::DefaultState
     */
-    interface com::sun::star::form::XReset;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::form::XReset; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains a default value for the control.
 
         <p>This value is used when the control is initially displayed, and for resetting it.</p>
@@ -80,10 +80,10 @@ published service RadioButton
         @see com::sun::star::awt::UnoControlRadioButtonModel::State
         @see com::sun::star::form::XReset
      */
-    [property] short DefaultState;
-
-    //-------------------------------------------------------------------------
-
+    [property] short DefaultState; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains a reference value which is used for submission in a HTML
         form.
 
@@ -91,8 +91,8 @@ published service RadioButton
         <type scope="com::sun::star::form">XSubmit</type>), and the control is checked, this reference
         value is used for submission.</p>
      */
-    [property] string RefValue;
-
+    [property] string RefValue; 
+ 
 
     /** specifies a value which is to be associated with the control when it's <em>not</em>
         selected.
@@ -103,10 +103,10 @@ published service RadioButton
         the value should be associated with the control when it is <em>not</em> selected.</p>
     */
     [optional, property] string UncheckedRefValue;
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/RichTextControl.idl b/offapi/com/sun/star/form/component/RichTextControl.idl
index 0566f658a197..7cc56efcaed8 100644
--- a/offapi/com/sun/star/form/component/RichTextControl.idl
+++ b/offapi/com/sun/star/form/component/RichTextControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,9 +32,9 @@
 #include <com/sun/star/awt/UnoControlEditModel.idl>
 #endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
-#include <com/sun/star/form/FormControlModel.idl>
-#endif
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
+#include <com/sun/star/form/FormControlModel.idl> 
+#endif 
 
 #ifndef __com_sun_star_text_TextRange_idl__
 #include <com/sun/star/text/TextRange.idl>
@@ -53,7 +53,7 @@ published service RichTextControl
 {
     service com::sun::star::awt::UnoControlEditModel;
 
-    service com::sun::star::form::FormControlModel;
+    service com::sun::star::form::FormControlModel; 
 
     /** specifies capabilities to provide rich text, as opposed to the simple text provided by the
         <type scope="com::sun::star::awt">UnoControlEditModel</type>
diff --git a/offapi/com/sun/star/form/component/ScrollBar.idl b/offapi/com/sun/star/form/component/ScrollBar.idl
index 69e0fc7e78ff..8f8d8865f956 100644
--- a/offapi/com/sun/star/form/component/ScrollBar.idl
+++ b/offapi/com/sun/star/form/component/ScrollBar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/component/SpinButton.idl b/offapi/com/sun/star/form/component/SpinButton.idl
index 09be77ed47c3..33d1306f27f8 100644
--- a/offapi/com/sun/star/form/component/SpinButton.idl
+++ b/offapi/com/sun/star/form/component/SpinButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/component/SubmitButton.idl b/offapi/com/sun/star/form/component/SubmitButton.idl
index b540065cb989..544ef3a94138 100644
--- a/offapi/com/sun/star/form/component/SubmitButton.idl
+++ b/offapi/com/sun/star/form/component/SubmitButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/component/TextField.idl b/offapi/com/sun/star/form/component/TextField.idl
index bb4cf5ce046c..c9aa7a21935c 100644
--- a/offapi/com/sun/star/form/component/TextField.idl
+++ b/offapi/com/sun/star/form/component/TextField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_TextField_idl__
-#define __com_sun_star_form_component_TextField_idl__
-
-#ifndef __com_sun_star_awt_UnoControlEditModel_idl__
-#include <com/sun/star/awt/UnoControlEditModel.idl>
+#ifndef __com_sun_star_form_component_TextField_idl__ 
+#define __com_sun_star_form_component_TextField_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlEditModel_idl__ 
+#include <com/sun/star/awt/UnoControlEditModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
+#include <com/sun/star/form/FormControlModel.idl> 
+#endif 
+
+#ifndef __com_sun_star_form_component_RichTextControl_idl__ 
+#include <com/sun/star/form/component/RichTextControl.idl> 
 #endif
 
-#ifndef __com_sun_star_form_FormControlModel_idl__
-#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_component_RichTextControl_idl__
-#include <com/sun/star/form/component/RichTextControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
-#include <com/sun/star/form/XReset.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_XReset_idl__ 
+#include <com/sun/star/form/XReset.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component { 
+ 
+//============================================================================= 
+ 
 /** specifies a component which allows the input of text, either single- or multi-line.
  */
 published service TextField
-{
-    service com::sun::star::awt::UnoControlEditModel;
-
-    service com::sun::star::form::FormControlModel;
+{ 
+    service com::sun::star::awt::UnoControlEditModel; 
+    
+    service com::sun::star::form::FormControlModel; 
 
     /** specifies optional capabilities for displaying and inputting formatted text.
 
@@ -70,8 +70,8 @@ published service TextField
 
         @see TextField::DefaultText
     */
-    interface com::sun::star::form::XReset;
-
+    interface com::sun::star::form::XReset; 
+ 
     /** contains a default value for the control.
 
         <p>This value is used when the control is initially displayed, and for resetting it.</p>
@@ -79,11 +79,11 @@ published service TextField
         @see com::sun::star::awt::UnoControlEditModel::Text
         @see com::sun::star::form::XReset
      */
-    [property] string DefaultText;
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] string DefaultText; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/component/TimeField.idl b/offapi/com/sun/star/form/component/TimeField.idl
index d752ca28928a..77ad65947359 100644
--- a/offapi/com/sun/star/form/component/TimeField.idl
+++ b/offapi/com/sun/star/form/component/TimeField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_form_component_TimeField_idl__
-#define __com_sun_star_form_component_TimeField_idl__
-
-#ifndef __com_sun_star_awt_UnoControlTimeFieldModel_idl__
-#include <com/sun/star/awt/UnoControlTimeFieldModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_FormControlModel_idl__
-#include <com/sun/star/form/FormControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_form_XReset_idl__
-#include <com/sun/star/form/XReset.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module component {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_TimeField_idl__ 
+#define __com_sun_star_form_component_TimeField_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlTimeFieldModel_idl__ 
+#include <com/sun/star/awt/UnoControlTimeFieldModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_FormControlModel_idl__ 
+#include <com/sun/star/form/FormControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_form_XReset_idl__ 
+#include <com/sun/star/form/XReset.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module component {  
+ 
+//============================================================================= 
+ 
 /** sepecifies the control model for a field which can be used to input time values.
  */
 published service TimeField
-{
-    service com::sun::star::awt::UnoControlTimeFieldModel;
+{ 
+    service com::sun::star::awt::UnoControlTimeFieldModel; 
 
-    service com::sun::star::form::FormControlModel;
+    service com::sun::star::form::FormControlModel; 
 
     /** resets the control.
-
+    
         <p>If you do not set a value for the <member>DefaultTime</member>, then resetting the control
         will result in setting to to the current system time. This is for HTML compatibility.</p>
     */
-    interface com::sun::star::form::XReset;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::form::XReset; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains a default value for the control.
 
         <p>This value is used when the control is initially displayed, and for resetting it.</p>
@@ -70,12 +70,12 @@ published service TimeField
         @see com::sun::star::awt::UnoControlTimeFieldModel::Time
         @see com::sun::star::form::XReset
     */
-    [property] long DefaultTime;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    [property] long DefaultTime; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/form/control/CheckBox.idl b/offapi/com/sun/star/form/control/CheckBox.idl
index 763e8ec9132c..e098c7d594fb 100644
--- a/offapi/com/sun/star/form/control/CheckBox.idl
+++ b/offapi/com/sun/star/form/control/CheckBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,23 +25,23 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_form_component_checkbox_idl__
-#define __com_sun_star_form_component_checkbox_idl__
-
-#ifndef __com_sun_star_awt_UnoControlCheckBox_idl__
-#include <com/sun/star/awt/UnoControlCheckBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
-#include <com/sun/star/form/XBoundControl.idl>
-#endif
-
-//=============================================================================
+#ifndef __com_sun_star_form_component_checkbox_idl__ 
+#define __com_sun_star_form_component_checkbox_idl__ 
 
- module com {  module sun {  module star {  module form {  module control {
+#ifndef __com_sun_star_awt_UnoControlCheckBox_idl__ 
+#include <com/sun/star/awt/UnoControlCheckBox.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_form_XBoundControl_idl__ 
+#include <com/sun/star/form/XBoundControl.idl> 
+#endif 
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module control { 
+ 
+//============================================================================= 
+ 
 /** describes a check box control which can (but not necessarily has to) be bound to a database field.
 
     <p>The model of the control has to support the <type scope="com::sun::star::form::component">CheckBox</type>
@@ -57,14 +57,14 @@ published service CheckBox
     interface com::sun::star::form::XBoundControl;
 };
 
-//=============================================================================
-
-}; }; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 
-#endif
+#endif 
 
 
diff --git a/offapi/com/sun/star/form/control/ComboBox.idl b/offapi/com/sun/star/form/control/ComboBox.idl
index b4dbfac27509..46c0512fc9c8 100644
--- a/offapi/com/sun/star/form/control/ComboBox.idl
+++ b/offapi/com/sun/star/form/control/ComboBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,23 +25,23 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_form_control_ComboBox_idl__
-#define __com_sun_star_form_control_ComboBox_idl__
-
-#ifndef __com_sun_star_awt_UnoControlComboBox_idl__
-#include <com/sun/star/awt/UnoControlComboBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
-#include <com/sun/star/form/XBoundControl.idl>
-#endif
-
-//=============================================================================
+#ifndef __com_sun_star_form_control_ComboBox_idl__ 
+#define __com_sun_star_form_control_ComboBox_idl__ 
 
- module com {  module sun {  module star {  module form {  module control {
+#ifndef __com_sun_star_awt_UnoControlComboBox_idl__ 
+#include <com/sun/star/awt/UnoControlComboBox.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_form_XBoundControl_idl__ 
+#include <com/sun/star/form/XBoundControl.idl> 
+#endif 
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module control { 
+ 
+//============================================================================= 
+ 
 /** describes a combo box control.
 
     <p>The model of the control has to support the <type scope="com::sun::star::form::component">ComboBox</type>
@@ -57,14 +57,14 @@ published service ComboBox
     interface com::sun::star::form::XBoundControl;
 };
 
-//=============================================================================
-
-}; }; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 
-#endif
+#endif 
 
 
diff --git a/offapi/com/sun/star/form/control/CommandButton.idl b/offapi/com/sun/star/form/control/CommandButton.idl
index d4a4b48356ad..891153a0d2c7 100644
--- a/offapi/com/sun/star/form/control/CommandButton.idl
+++ b/offapi/com/sun/star/form/control/CommandButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,23 +25,23 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_form_control_CommandButton_idl__
-#define __com_sun_star_form_control_CommandButton_idl__
+#ifndef __com_sun_star_form_control_CommandButton_idl__ 
+#define __com_sun_star_form_control_CommandButton_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlButton_idl__
-#include <com/sun/star/awt/UnoControlButton.idl>
-#endif
+#ifndef __com_sun_star_awt_UnoControlButton_idl__ 
+#include <com/sun/star/awt/UnoControlButton.idl> 
+#endif 
 
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
-#include <com/sun/star/form/XApproveActionBroadcaster.idl>
+#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__ 
+#include <com/sun/star/form/XApproveActionBroadcaster.idl> 
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module control {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module control { 
+ 
+//============================================================================= 
+ 
 /** describes a button control.
 
     <p>The model of the control has to support the <type scope="com::sun::star::form::component">CommandButton</type>
@@ -75,14 +75,14 @@ published service CommandButton
     interface com::sun::star::form::XApproveActionBroadcaster;
 };
 
-//=============================================================================
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 
-}; }; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-
-#endif
+#endif 
 
 
diff --git a/offapi/com/sun/star/form/control/CurrencyField.idl b/offapi/com/sun/star/form/control/CurrencyField.idl
index 203278150878..6e05b6159c61 100644
--- a/offapi/com/sun/star/form/control/CurrencyField.idl
+++ b/offapi/com/sun/star/form/control/CurrencyField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,23 +25,23 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_form_control_CurrencyField_idl__
-#define __com_sun_star_form_control_CurrencyField_idl__
-
-#ifndef __com_sun_star_awt_UnoControlCurrencyField_idl__
-#include <com/sun/star/awt/UnoControlCurrencyField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
-#include <com/sun/star/form/XBoundControl.idl>
-#endif
-
-//=============================================================================
+#ifndef __com_sun_star_form_control_CurrencyField_idl__ 
+#define __com_sun_star_form_control_CurrencyField_idl__ 
 
- module com {  module sun {  module star {  module form {  module control {
+#ifndef __com_sun_star_awt_UnoControlCurrencyField_idl__ 
+#include <com/sun/star/awt/UnoControlCurrencyField.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_form_XBoundControl_idl__ 
+#include <com/sun/star/form/XBoundControl.idl> 
+#endif 
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module control { 
+ 
+//============================================================================= 
+ 
 /** describes a control which can be used for inputting currency values, and
     which can (but not necessarily has to) be bound to a database field.
 
@@ -58,14 +58,14 @@ published service CurrencyField
     interface com::sun::star::form::XBoundControl;
 };
 
-//=============================================================================
-
-}; }; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 
-#endif
+#endif 
 
 
diff --git a/offapi/com/sun/star/form/control/DateField.idl b/offapi/com/sun/star/form/control/DateField.idl
index ead9d296fb0e..ba137ce677dd 100644
--- a/offapi/com/sun/star/form/control/DateField.idl
+++ b/offapi/com/sun/star/form/control/DateField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,23 +25,23 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_form_control_DateField_idl__
-#define __com_sun_star_form_control_DateField_idl__
-
-#ifndef __com_sun_star_awt_UnoControlDateField_idl__
-#include <com/sun/star/awt/UnoControlDateField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
-#include <com/sun/star/form/XBoundControl.idl>
-#endif
-
-//=============================================================================
+#ifndef __com_sun_star_form_control_DateField_idl__ 
+#define __com_sun_star_form_control_DateField_idl__ 
 
- module com {  module sun {  module star {  module form {  module control {
+#ifndef __com_sun_star_awt_UnoControlDateField_idl__ 
+#include <com/sun/star/awt/UnoControlDateField.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_form_XBoundControl_idl__ 
+#include <com/sun/star/form/XBoundControl.idl> 
+#endif 
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module control { 
+ 
+//============================================================================= 
+ 
 /** describes a control which can be used for inputting date values, and
     which can (but not necessarily has to) be bound to a database field.
 
@@ -58,14 +58,14 @@ published service DateField
     interface com::sun::star::form::XBoundControl;
 };
 
-//=============================================================================
-
-}; }; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 
-#endif
+#endif 
 
 
diff --git a/offapi/com/sun/star/form/control/FormattedField.idl b/offapi/com/sun/star/form/control/FormattedField.idl
index f40453a4d1e9..18fc8211bd09 100644
--- a/offapi/com/sun/star/form/control/FormattedField.idl
+++ b/offapi/com/sun/star/form/control/FormattedField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,23 +25,23 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_form_control_FormattedField_idl__
-#define __com_sun_star_form_control_FormattedField_idl__
-
-#ifndef __com_sun_star_awt_UnoControlFormattedField_idl__
-#include <com/sun/star/awt/UnoControlFormattedField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
-#include <com/sun/star/form/XBoundControl.idl>
-#endif
-
-//=============================================================================
+#ifndef __com_sun_star_form_control_FormattedField_idl__ 
+#define __com_sun_star_form_control_FormattedField_idl__ 
 
- module com {  module sun {  module star {  module form {  module control {
+#ifndef __com_sun_star_awt_UnoControlFormattedField_idl__ 
+#include <com/sun/star/awt/UnoControlFormattedField.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_form_XBoundControl_idl__ 
+#include <com/sun/star/form/XBoundControl.idl> 
+#endif 
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module control { 
+ 
+//============================================================================= 
+ 
 /** describes a control which can be used for inputting values with a arbitrary formatting, and
     can (but not necessarily has to) be bound to a database field.
 
@@ -63,14 +63,14 @@ published service FormattedField
     interface com::sun::star::form::XBoundControl;
 };
 
-//=============================================================================
-
-}; }; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 
-#endif
+#endif 
 
 
diff --git a/offapi/com/sun/star/form/control/GridControl.idl b/offapi/com/sun/star/form/control/GridControl.idl
index 06395d41e38d..fc2a585426a2 100644
--- a/offapi/com/sun/star/form/control/GridControl.idl
+++ b/offapi/com/sun/star/form/control/GridControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,63 +25,63 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_form_control_GridControl_idl__
-#define __com_sun_star_form_control_GridControl_idl__
+#ifndef __com_sun_star_form_control_GridControl_idl__ 
+#define __com_sun_star_form_control_GridControl_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControl_idl__
+#ifndef __com_sun_star_awt_UnoControl_idl__ 
 #include <com/sun/star/awt/UnoControl.idl>
 #endif
 
-#ifndef __com_sun_star_form_XGrid_idl__
+#ifndef __com_sun_star_form_XGrid_idl__ 
 #include <com/sun/star/form/XGrid.idl>
 #endif
 
-#ifndef __com_sun_star_form_XBoundComponent_idl__
+#ifndef __com_sun_star_form_XBoundComponent_idl__ 
 #include <com/sun/star/form/XBoundComponent.idl>
 #endif
 
-#ifndef __com_sun_star_form_XGridFieldDataSupplier_idl__
+#ifndef __com_sun_star_form_XGridFieldDataSupplier_idl__ 
 #include <com/sun/star/form/XGridFieldDataSupplier.idl>
 #endif
 
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
+#ifndef __com_sun_star_util_XModifyBroadcaster_idl__ 
 #include <com/sun/star/util/XModifyBroadcaster.idl>
 #endif
 
-#ifndef __com_sun_star_util_XModeSelector_idl__
+#ifndef __com_sun_star_util_XModeSelector_idl__ 
 #include <com/sun/star/util/XModeSelector.idl>
 #endif
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
 #include <com/sun/star/container/XIndexAccess.idl>
 #endif
 
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
+#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
 #include <com/sun/star/container/XEnumerationAccess.idl>
 #endif
 
-#ifndef __com_sun_star_container_XContainer_idl__
+#ifndef __com_sun_star_container_XContainer_idl__ 
 #include <com/sun/star/container/XContainer.idl>
 #endif
 
-#ifndef __com_sun_star_frame_XDispatchProviderInterception_idl__
+#ifndef __com_sun_star_frame_XDispatchProviderInterception_idl__ 
 #include <com/sun/star/frame/XDispatchProviderInterception.idl>
 #endif
 
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
+#ifndef __com_sun_star_view_XSelectionSupplier_idl__ 
 #include <com/sun/star/view/XSelectionSupplier.idl>
 #endif
 
-//=============================================================================
-
-module com {  module sun {  module star {  module form {
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module form { 
 
 published interface XGridControl;
-
-module control {
-
-//=============================================================================
-
+     
+module control { 
+ 
+//============================================================================= 
+ 
 /** describes a table-like control for displaying data.
 
     <p>The model of the control has to support the <type scope="com::sun::star::form::component">GridControl</type>
@@ -164,9 +164,9 @@ published service GridControl
     [optional] interface com::sun::star::frame::XDispatchProviderInterception;
 };
 
-//=============================================================================
-
-}; }; }; }; };
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
 
-
-#endif
+#endif 
diff --git a/offapi/com/sun/star/form/control/GroupBox.idl b/offapi/com/sun/star/form/control/GroupBox.idl
index 5466f2c19c59..3395268270c1 100644
--- a/offapi/com/sun/star/form/control/GroupBox.idl
+++ b/offapi/com/sun/star/form/control/GroupBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,23 +25,23 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_form_control_GroupBox_idl__
-#define __com_sun_star_form_control_GroupBox_idl__
-
-#ifndef __com_sun_star_awt_UnoControlGroupBox_idl__
-#include <com/sun/star/awt/UnoControlGroupBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
-#include <com/sun/star/form/XBoundControl.idl>
-#endif
-
-//=============================================================================
+#ifndef __com_sun_star_form_control_GroupBox_idl__ 
+#define __com_sun_star_form_control_GroupBox_idl__ 
 
- module com {  module sun {  module star {  module form {  module control {
+#ifndef __com_sun_star_awt_UnoControlGroupBox_idl__ 
+#include <com/sun/star/awt/UnoControlGroupBox.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_form_XBoundControl_idl__ 
+#include <com/sun/star/form/XBoundControl.idl> 
+#endif 
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module control { 
+ 
+//============================================================================= 
+ 
 /** describes a control which can be used for visually grouping controls
 
     <p>The model of the control has to support the <type scope="com::sun::star::form::component">GroupBox</type>
@@ -55,14 +55,14 @@ published service GroupBox
     service com::sun::star::awt::UnoControlGroupBox;
 };
 
-//=============================================================================
-
-}; }; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 
-#endif
+#endif 
 
 
diff --git a/offapi/com/sun/star/form/control/ImageButton.idl b/offapi/com/sun/star/form/control/ImageButton.idl
index 278de5ca515d..1cd1629ca10b 100644
--- a/offapi/com/sun/star/form/control/ImageButton.idl
+++ b/offapi/com/sun/star/form/control/ImageButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,23 +25,23 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_form_control_ImageButton_idl__
-#define __com_sun_star_form_control_ImageButton_idl__
+#ifndef __com_sun_star_form_control_ImageButton_idl__ 
+#define __com_sun_star_form_control_ImageButton_idl__ 
 
-#ifndef __com_sun_star_awt_UnoControlImageControl_idl__
-#include <com/sun/star/awt/UnoControlImageControl.idl>
-#endif
+#ifndef __com_sun_star_awt_UnoControlImageControl_idl__ 
+#include <com/sun/star/awt/UnoControlImageControl.idl> 
+#endif 
 
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__
-#include <com/sun/star/form/XApproveActionBroadcaster.idl>
+#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__ 
+#include <com/sun/star/form/XApproveActionBroadcaster.idl> 
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module control {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module control { 
+ 
+//============================================================================= 
+ 
 /** describes a control which can be used for displaying images on a control acting like a button.
 
     <p>The model of the control has to support the <type scope="com::sun::star::form::component">ImageButton</type>
@@ -75,14 +75,14 @@ published service ImageButton
     interface com::sun::star::form::XApproveActionBroadcaster;
 };
 
-//=============================================================================
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 
-}; }; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-
-#endif
+#endif 
 
 
diff --git a/offapi/com/sun/star/form/control/ImageControl.idl b/offapi/com/sun/star/form/control/ImageControl.idl
index 10ef14cdf60b..de6711b03690 100644
--- a/offapi/com/sun/star/form/control/ImageControl.idl
+++ b/offapi/com/sun/star/form/control/ImageControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,23 +25,23 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_form_control_ImageControl_idl__
-#define __com_sun_star_form_control_ImageControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControlImageControl_idl__
-#include <com/sun/star/awt/UnoControlImageControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
-#include <com/sun/star/form/XBoundControl.idl>
-#endif
-
-//=============================================================================
+#ifndef __com_sun_star_form_control_ImageControl_idl__ 
+#define __com_sun_star_form_control_ImageControl_idl__ 
 
- module com {  module sun {  module star {  module form {  module control {
+#ifndef __com_sun_star_awt_UnoControlImageControl_idl__ 
+#include <com/sun/star/awt/UnoControlImageControl.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_form_XBoundControl_idl__ 
+#include <com/sun/star/form/XBoundControl.idl> 
+#endif 
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module control { 
+ 
+//============================================================================= 
+ 
 /** describes a control used for displaying images stored in a database.
 
     <p>The model of the control has to support the <type scope="com::sun::star::form::component">DatabaseImageControl</type>
@@ -61,14 +61,14 @@ published service ImageControl
     interface com::sun::star::form::XBoundControl;
 };
 
-//=============================================================================
-
-}; }; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 
-#endif
+#endif 
 
 
diff --git a/offapi/com/sun/star/form/control/InteractionGridControl.idl b/offapi/com/sun/star/form/control/InteractionGridControl.idl
index 480f4f26243d..2d60fc61d77b 100644
--- a/offapi/com/sun/star/form/control/InteractionGridControl.idl
+++ b/offapi/com/sun/star/form/control/InteractionGridControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,22 +25,22 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_form_component_InteractionGridControl_idl__
-#define __com_sun_star_form_component_InteractionGridControl_idl__
-
-#ifndef __com_sun_star_form_control_GridControl_idl__
-#include <com/sun/star/form/control/GridControl.idl>
-#endif
-#ifndef __com_sun_star_frame_XDispatch_idl__
-#include <com/sun/star/frame/XDispatch.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module control {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_component_InteractionGridControl_idl__ 
+#define __com_sun_star_form_component_InteractionGridControl_idl__ 
+
+#ifndef __com_sun_star_form_control_GridControl_idl__ 
+#include <com/sun/star/form/control/GridControl.idl> 
+#endif 
+#ifndef __com_sun_star_frame_XDispatch_idl__ 
+#include <com/sun/star/frame/XDispatch.idl> 
+#endif 
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module control { 
+ 
+//============================================================================= 
+ 
 /** is an extended grid control, which allows the user to customize some of it's user interface's aspects.
 */
 published service InteractionGridControl
@@ -72,14 +72,14 @@ published service InteractionGridControl
     interface com::sun::star::frame::XDispatch;
 };
 
-//=============================================================================
-
-}; }; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 
-#endif
+#endif 
 
 
diff --git a/offapi/com/sun/star/form/control/ListBox.idl b/offapi/com/sun/star/form/control/ListBox.idl
index b830a2b3d045..bad847c43205 100644
--- a/offapi/com/sun/star/form/control/ListBox.idl
+++ b/offapi/com/sun/star/form/control/ListBox.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,27 +25,27 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_form_control_ListBox_idl__
-#define __com_sun_star_form_control_ListBox_idl__
-
-#ifndef __com_sun_star_awt_UnoControlListBox_idl__
-#include <com/sun/star/awt/UnoControlListBox.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
-#include <com/sun/star/form/XBoundControl.idl>
-#endif
-
-#ifndef __com_sun_star_form_XChangeBroadcaster_idl__
-#include <com/sun/star/form/XChangeBroadcaster.idl>
-#endif
+#ifndef __com_sun_star_form_control_ListBox_idl__ 
+#define __com_sun_star_form_control_ListBox_idl__ 
 
-//=============================================================================
+#ifndef __com_sun_star_awt_UnoControlListBox_idl__ 
+#include <com/sun/star/awt/UnoControlListBox.idl> 
+#endif 
 
- module com {  module sun {  module star {  module form {  module control {
+#ifndef __com_sun_star_form_XBoundControl_idl__ 
+#include <com/sun/star/form/XBoundControl.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_form_XChangeBroadcaster_idl__ 
+#include <com/sun/star/form/XChangeBroadcaster.idl> 
+#endif 
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module control { 
+ 
+//============================================================================= 
+ 
 /** describes a list box control which can (but not necessarily has to) be bound to a database field.
 
     <p>The model of the control has to support the <type scope="com::sun::star::form::component">ListBox</type>
@@ -73,14 +73,14 @@ published service ListBox
     interface com::sun::star::form::XChangeBroadcaster;
 };
 
-//=============================================================================
-
-}; }; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 
-#endif
+#endif 
 
 
diff --git a/offapi/com/sun/star/form/control/NavigationToolBar.idl b/offapi/com/sun/star/form/control/NavigationToolBar.idl
index 7f792a221a34..ec8762eecb22 100644
--- a/offapi/com/sun/star/form/control/NavigationToolBar.idl
+++ b/offapi/com/sun/star/form/control/NavigationToolBar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/control/NumericField.idl b/offapi/com/sun/star/form/control/NumericField.idl
index b088f6a782eb..45d9b2b7bc9b 100644
--- a/offapi/com/sun/star/form/control/NumericField.idl
+++ b/offapi/com/sun/star/form/control/NumericField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,23 +25,23 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_form_control_NumericField_idl__
-#define __com_sun_star_form_control_NumericField_idl__
-
-#ifndef __com_sun_star_awt_UnoControlNumericField_idl__
-#include <com/sun/star/awt/UnoControlNumericField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
-#include <com/sun/star/form/XBoundControl.idl>
-#endif
-
-//=============================================================================
+#ifndef __com_sun_star_form_control_NumericField_idl__ 
+#define __com_sun_star_form_control_NumericField_idl__ 
 
- module com {  module sun {  module star {  module form {  module control {
+#ifndef __com_sun_star_awt_UnoControlNumericField_idl__ 
+#include <com/sun/star/awt/UnoControlNumericField.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_form_XBoundControl_idl__ 
+#include <com/sun/star/form/XBoundControl.idl> 
+#endif 
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module control { 
+ 
+//============================================================================= 
+ 
 /** describes a control for inputting numeric values and which can (but not necessarily has to)
     be bound to a database field.
 
@@ -58,14 +58,14 @@ published service NumericField
     interface com::sun::star::form::XBoundControl;
 };
 
-//=============================================================================
-
-}; }; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 
-#endif
+#endif 
 
 
diff --git a/offapi/com/sun/star/form/control/PatternField.idl b/offapi/com/sun/star/form/control/PatternField.idl
index 8c373702bd34..f09d31065418 100644
--- a/offapi/com/sun/star/form/control/PatternField.idl
+++ b/offapi/com/sun/star/form/control/PatternField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,23 +25,23 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_form_control_PatternField_idl__
-#define __com_sun_star_form_control_PatternField_idl__
-
-#ifndef __com_sun_star_awt_UnoControlPatternField_idl__
-#include <com/sun/star/awt/UnoControlPatternField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
-#include <com/sun/star/form/XBoundControl.idl>
-#endif
-
-//=============================================================================
+#ifndef __com_sun_star_form_control_PatternField_idl__ 
+#define __com_sun_star_form_control_PatternField_idl__ 
 
- module com {  module sun {  module star {  module form {  module control {
+#ifndef __com_sun_star_awt_UnoControlPatternField_idl__ 
+#include <com/sun/star/awt/UnoControlPatternField.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_form_XBoundControl_idl__ 
+#include <com/sun/star/form/XBoundControl.idl> 
+#endif 
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module control { 
+ 
+//============================================================================= 
+ 
 /** describes a control for inputting text complying to a given pattern,
     and which can (but not necessarily has to) be bound to a database field.
 
@@ -58,14 +58,14 @@ published service PatternField
     interface com::sun::star::form::XBoundControl;
 };
 
-//=============================================================================
-
-}; }; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 
-#endif
+#endif 
 
 
diff --git a/offapi/com/sun/star/form/control/RadioButton.idl b/offapi/com/sun/star/form/control/RadioButton.idl
index b600885453a8..1907ad7c5dcc 100644
--- a/offapi/com/sun/star/form/control/RadioButton.idl
+++ b/offapi/com/sun/star/form/control/RadioButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,22 +25,22 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_form_control_RadioButton_idl__
-#define __com_sun_star_form_control_RadioButton_idl__
-
-#ifndef __com_sun_star_awt_UnoControlRadioButton_idl__
-#include <com/sun/star/awt/UnoControlRadioButton.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
-#include <com/sun/star/form/XBoundControl.idl>
-#endif
+#ifndef __com_sun_star_form_control_RadioButton_idl__ 
+#define __com_sun_star_form_control_RadioButton_idl__ 
 
-//=============================================================================
+#ifndef __com_sun_star_awt_UnoControlRadioButton_idl__ 
+#include <com/sun/star/awt/UnoControlRadioButton.idl> 
+#endif 
 
- module com {  module sun {  module star {  module form {  module control {
+#ifndef __com_sun_star_form_XBoundControl_idl__ 
+#include <com/sun/star/form/XBoundControl.idl> 
+#endif 
 
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module control { 
+ 
+//============================================================================= 
 
 /** describes a radio button control which can (but not necessarily has to) be bound to a database field.
 
@@ -52,19 +52,19 @@
 */
 published service RadioButton
 {
-    service com::sun::star::awt::UnoControlRadioButton;
+    service com::sun::star::awt::UnoControlRadioButton; 
 
     interface com::sun::star::form::XBoundControl;
 };
 
-//=============================================================================
-
-}; }; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 
-#endif
+#endif 
 
 
diff --git a/offapi/com/sun/star/form/control/SubmitButton.idl b/offapi/com/sun/star/form/control/SubmitButton.idl
index a0174a45f673..790750341ddd 100644
--- a/offapi/com/sun/star/form/control/SubmitButton.idl
+++ b/offapi/com/sun/star/form/control/SubmitButton.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/control/TextField.idl b/offapi/com/sun/star/form/control/TextField.idl
index 71a1ace31ec2..6d2070f0c168 100644
--- a/offapi/com/sun/star/form/control/TextField.idl
+++ b/offapi/com/sun/star/form/control/TextField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,26 +25,26 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_form_control_TextField_idl__
-#define __com_sun_star_form_control_TextField_idl__
-
-#ifndef __com_sun_star_awt_UnoControlEdit_idl__
-#include <com/sun/star/awt/UnoControlEdit.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
-#include <com/sun/star/form/XBoundControl.idl>
-#endif
-#ifndef __com_sun_star_form_XChangeBroadcaster_idl__
-#include <com/sun/star/form/XChangeBroadcaster.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module form {  module control {
-
-//=============================================================================
-
+#ifndef __com_sun_star_form_control_TextField_idl__ 
+#define __com_sun_star_form_control_TextField_idl__ 
+
+#ifndef __com_sun_star_awt_UnoControlEdit_idl__ 
+#include <com/sun/star/awt/UnoControlEdit.idl> 
+#endif 
+
+#ifndef __com_sun_star_form_XBoundControl_idl__ 
+#include <com/sun/star/form/XBoundControl.idl> 
+#endif 
+#ifndef __com_sun_star_form_XChangeBroadcaster_idl__ 
+#include <com/sun/star/form/XChangeBroadcaster.idl> 
+#endif 
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module control { 
+ 
+//============================================================================= 
+ 
 /** describes a control for entering arbiotrary text which can (but not necessarily has to) be bound
     to a database field.
 
@@ -77,14 +77,14 @@ published service TextField
     interface com::sun::star::form::XChangeBroadcaster;
 };
 
-//=============================================================================
-
-}; }; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 
-#endif
+#endif 
 
 
diff --git a/offapi/com/sun/star/form/control/TimeField.idl b/offapi/com/sun/star/form/control/TimeField.idl
index 20cd540c82a2..f92fe724e15d 100644
--- a/offapi/com/sun/star/form/control/TimeField.idl
+++ b/offapi/com/sun/star/form/control/TimeField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,23 +25,23 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_form_control_TimeField_idl__
-#define __com_sun_star_form_control_TimeField_idl__
-
-#ifndef __com_sun_star_awt_UnoControlTimeField_idl__
-#include <com/sun/star/awt/UnoControlTimeField.idl>
-#endif
-
-#ifndef __com_sun_star_form_XBoundControl_idl__
-#include <com/sun/star/form/XBoundControl.idl>
-#endif
-
-//=============================================================================
+#ifndef __com_sun_star_form_control_TimeField_idl__ 
+#define __com_sun_star_form_control_TimeField_idl__ 
 
- module com {  module sun {  module star {  module form {  module control {
+#ifndef __com_sun_star_awt_UnoControlTimeField_idl__ 
+#include <com/sun/star/awt/UnoControlTimeField.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_form_XBoundControl_idl__ 
+#include <com/sun/star/form/XBoundControl.idl> 
+#endif 
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module form {  module control { 
+ 
+//============================================================================= 
+ 
 /** describes a control for inputting time values which can (but not necessarily has to) be bound
     to a database field.
 
@@ -58,14 +58,14 @@ published service TimeField
     interface com::sun::star::form::XBoundControl;
 };
 
-//=============================================================================
-
-}; }; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 
-#endif
+#endif 
 
 
diff --git a/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl b/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
index 99145dc4f036..11896c239801 100644
--- a/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
+++ b/offapi/com/sun/star/form/inspection/ButtonNavigationHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl b/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl
index 609f087f71f1..52cdadeb18a2 100644
--- a/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/CellBindingPropertyHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl b/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
index b743fe4be85b..81f086089b49 100644
--- a/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
+++ b/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 #ifndef __com_sun_star_inspection_XObjectInspectorModel_idl__
 #include <com/sun/star/inspection/XObjectInspectorModel.idl>
 #endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 
@@ -87,7 +87,7 @@ service DefaultFormComponentInspectorModel : com::sun::star::inspection::XObject
 
         @since OOo 2.2.0
     */
-    createWithHelpSection(
+    createWithHelpSection( 
         [in] long minHelpTextLines,
         [in] long maxHelpTextLines
     )
diff --git a/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl b/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl
index 2e206f7f1f52..4f4c1213c435 100644
--- a/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/EditPropertyHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/inspection/EventHandler.idl b/offapi/com/sun/star/form/inspection/EventHandler.idl
index 3940c082af22..4136be6bbaa6 100644
--- a/offapi/com/sun/star/form/inspection/EventHandler.idl
+++ b/offapi/com/sun/star/form/inspection/EventHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl b/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
index 3b51ba36b6ac..9fed13039d82 100644
--- a/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl b/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl
index 449368af6a1a..a84d76c947c3 100644
--- a/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/SubmissionPropertyHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl b/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl
index 654e17a21ba4..2017c7d6e230 100644
--- a/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/XMLFormsPropertyHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl b/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl
index 6896225cfbdd..34a40611b07e 100644
--- a/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/XSDValidationPropertyHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/modules.idl b/offapi/com/sun/star/form/modules.idl
index 176443733589..779fde8b806f 100644
--- a/offapi/com/sun/star/form/modules.idl
+++ b/offapi/com/sun/star/form/modules.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/runtime/FeatureState.idl b/offapi/com/sun/star/form/runtime/FeatureState.idl
index 996aff1e8076..6dc8aa8b3dd9 100644
--- a/offapi/com/sun/star/form/runtime/FeatureState.idl
+++ b/offapi/com/sun/star/form/runtime/FeatureState.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module form { module runtime {
+module com { module sun { module star { module form { module runtime { 
 
 //=============================================================================
 
@@ -54,7 +54,7 @@ struct FeatureState
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/runtime/FilterEvent.idl b/offapi/com/sun/star/form/runtime/FilterEvent.idl
index b7cc035113cb..10358f824176 100644
--- a/offapi/com/sun/star/form/runtime/FilterEvent.idl
+++ b/offapi/com/sun/star/form/runtime/FilterEvent.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -58,7 +58,7 @@ struct FilterEvent : ::com::sun::star::lang::EventObject
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/runtime/FormController.idl b/offapi/com/sun/star/form/runtime/FormController.idl
index 6a03270a1b52..6331a3f24d0a 100644
--- a/offapi/com/sun/star/form/runtime/FormController.idl
+++ b/offapi/com/sun/star/form/runtime/FormController.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/runtime/FormFeature.idl b/offapi/com/sun/star/form/runtime/FormFeature.idl
index 57ebcc8ef7b7..e04341661842 100644
--- a/offapi/com/sun/star/form/runtime/FormFeature.idl
+++ b/offapi/com/sun/star/form/runtime/FormFeature.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,13 +30,13 @@
 
 //=============================================================================
 
-module com { module sun { module star { module form { module runtime {
+module com { module sun { module star { module form { module runtime { 
 
 //=============================================================================
 
 /** specifies the operations on a user interface form, as supported by the
     <type>XFormOperations</type> interface.
-
+ 
     @since OpenOffice.org 2.2.0
 */
 constants FormFeature
@@ -148,7 +148,7 @@ constants FormFeature
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/runtime/FormOperations.idl b/offapi/com/sun/star/form/runtime/FormOperations.idl
index aa4b7e825c8c..209f0c692b3b 100644
--- a/offapi/com/sun/star/form/runtime/FormOperations.idl
+++ b/offapi/com/sun/star/form/runtime/FormOperations.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,19 +31,19 @@
 #ifndef __com_sun_star_form_runtime_XFormOperations_idl__
 #include <com/sun/star/form/runtime/XFormOperations.idl>
 #endif
-#ifndef __com_sun_star_form_runtime_XFormController_idl__
+#ifndef __com_sun_star_form_runtime_XFormController_idl__ 
 #include <com/sun/star/form/runtime/XFormController.idl>
 #endif
-#ifndef __com_sun_star_form_XForm_idl__
+#ifndef __com_sun_star_form_XForm_idl__ 
 #include <com/sun/star/form/XForm.idl>
 #endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 
 //=============================================================================
 
-module com { module sun { module star { module form { module runtime {
+module com { module sun { module star { module form { module runtime { 
 
 //=============================================================================
 
@@ -84,7 +84,7 @@ service FormOperations : XFormOperations
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl b/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
index b435e64a6d81..5821d8ae3154 100644
--- a/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
+++ b/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,13 @@
 #ifndef __com_sun_star_form_runtime_XFeatureInvalidation_idl__
 #define __com_sun_star_form_runtime_XFeatureInvalidation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
+#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
 //=============================================================================
 
-module com { module sun { module star { module form { module runtime {
+module com { module sun { module star { module form { module runtime { 
 
 //=============================================================================
 
@@ -69,7 +69,7 @@ interface XFeatureInvalidation
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/runtime/XFilterController.idl b/offapi/com/sun/star/form/runtime/XFilterController.idl
index 8f3fded592d9..40aa5d2f27f1 100644
--- a/offapi/com/sun/star/form/runtime/XFilterController.idl
+++ b/offapi/com/sun/star/form/runtime/XFilterController.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/runtime/XFilterControllerListener.idl b/offapi/com/sun/star/form/runtime/XFilterControllerListener.idl
index c737f9b24c70..c50b22d676ca 100644
--- a/offapi/com/sun/star/form/runtime/XFilterControllerListener.idl
+++ b/offapi/com/sun/star/form/runtime/XFilterControllerListener.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -78,7 +78,7 @@ interface XFilterControllerListener : ::com::sun::star::lang::XEventListener
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/runtime/XFormController.idl b/offapi/com/sun/star/form/runtime/XFormController.idl
index 983b0bd61f07..e7fa9139fba4 100644
--- a/offapi/com/sun/star/form/runtime/XFormController.idl
+++ b/offapi/com/sun/star/form/runtime/XFormController.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/runtime/XFormControllerContext.idl b/offapi/com/sun/star/form/runtime/XFormControllerContext.idl
index 434faba18288..07b828cc740e 100644
--- a/offapi/com/sun/star/form/runtime/XFormControllerContext.idl
+++ b/offapi/com/sun/star/form/runtime/XFormControllerContext.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,7 +51,7 @@ interface XFormControllerContext
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/runtime/XFormOperations.idl b/offapi/com/sun/star/form/runtime/XFormOperations.idl
index f6f040ccc199..bfb8c2338eec 100644
--- a/offapi/com/sun/star/form/runtime/XFormOperations.idl
+++ b/offapi/com/sun/star/form/runtime/XFormOperations.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,22 +32,22 @@
 #include <com/sun/star/form/runtime/FeatureState.idl>
 #endif
 
-#ifndef __com_sun_star_lang_XComponent_idl__
+#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl>
 #endif
-#ifndef __com_sun_star_sdbc_XRowSet_idl__
+#ifndef __com_sun_star_sdbc_XRowSet_idl__ 
 #include <com/sun/star/sdbc/XRowSet.idl>
 #endif
-#ifndef __com_sun_star_sdbc_XResultSetUpdate_idl__
+#ifndef __com_sun_star_sdbc_XResultSetUpdate_idl__ 
 #include <com/sun/star/sdbc/XResultSetUpdate.idl>
 #endif
-#ifndef __com_sun_star_form_runtime_XFormController_idl__
+#ifndef __com_sun_star_form_runtime_XFormController_idl__ 
 #include <com/sun/star/form/runtime/XFormController.idl>
 #endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
 #include <com/sun/star/lang/WrappedTargetException.idl>
 #endif
 #ifndef __com_sun_star_beans_NamedValue_idl__
@@ -56,7 +56,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module form { module runtime {
+module com { module sun { module star { module form { module runtime { 
 
 interface XFeatureInvalidation;
 
@@ -277,7 +277,7 @@ interface XFormOperations : ::com::sun::star::lang::XComponent
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/form/submission/XSubmission.idl b/offapi/com/sun/star/form/submission/XSubmission.idl
index 7eacf7f13935..28bebed6f832 100644
--- a/offapi/com/sun/star/form/submission/XSubmission.idl
+++ b/offapi/com/sun/star/form/submission/XSubmission.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -94,7 +94,7 @@ interface XSubmission : com::sun::star::uno::XInterface
      */
     void addSubmissionVetoListener( [in] XSubmissionVetoListener listener )
         raises ( com::sun::star::lang::NoSupportException );
-
+ 
     /** revokes a listener which has previously been registered to be notified when a submission occurs
 
         @param listener
diff --git a/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl b/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl
index 8132bfcdf1ac..08771226f320 100644
--- a/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl
+++ b/offapi/com/sun/star/form/submission/XSubmissionSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl b/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl
index 0c9f32f5fa91..f3473ed5e908 100644
--- a/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl
+++ b/offapi/com/sun/star/form/submission/XSubmissionVetoListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -61,7 +61,7 @@ interface XSubmissionVetoListener : com::sun::star::lang::XEventListener
      */
     void    submitting( [in] com::sun::star::lang::EventObject event )
                 raises ( com::sun::star::util::VetoException );
-
+ 
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl b/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl
index 9b436b605efa..e369f4a0d533 100644
--- a/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl
+++ b/offapi/com/sun/star/form/validation/ValidatableBindableControlModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/validation/ValidatableControlModel.idl b/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
index 5ca51efdab1f..ef4b4cc09afe 100644
--- a/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
+++ b/offapi/com/sun/star/form/validation/ValidatableControlModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl b/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl
index f28c054918b9..a967f388b26a 100644
--- a/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl
+++ b/offapi/com/sun/star/form/validation/XFormComponentValidityListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/validation/XValidatable.idl b/offapi/com/sun/star/form/validation/XValidatable.idl
index aa7799dfff85..2a8c014c717c 100644
--- a/offapi/com/sun/star/form/validation/XValidatable.idl
+++ b/offapi/com/sun/star/form/validation/XValidatable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl b/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl
index eae3a9f48518..c116c56ec135 100644
--- a/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl
+++ b/offapi/com/sun/star/form/validation/XValidatableFormComponent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/validation/XValidator.idl b/offapi/com/sun/star/form/validation/XValidator.idl
index 03753ef90fbb..18a981b7f459 100644
--- a/offapi/com/sun/star/form/validation/XValidator.idl
+++ b/offapi/com/sun/star/form/validation/XValidator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl b/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl
index 593b230f6d52..f462bbf58a65 100644
--- a/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl
+++ b/offapi/com/sun/star/form/validation/XValidityConstraintListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/formula/AccessibleFormulaText.idl b/offapi/com/sun/star/formula/AccessibleFormulaText.idl
index 98099f32ca27..7c1549774ea1 100644
--- a/offapi/com/sun/star/formula/AccessibleFormulaText.idl
+++ b/offapi/com/sun/star/formula/AccessibleFormulaText.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/formula/AccessibleFormulaView.idl b/offapi/com/sun/star/formula/AccessibleFormulaView.idl
index 3cbcf84950a5..800afeacd10a 100644
--- a/offapi/com/sun/star/formula/AccessibleFormulaView.idl
+++ b/offapi/com/sun/star/formula/AccessibleFormulaView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/formula/FormulaProperties.idl b/offapi/com/sun/star/formula/FormulaProperties.idl
index d6f0f6bfeb28..6f7b82794464 100644
--- a/offapi/com/sun/star/formula/FormulaProperties.idl
+++ b/offapi/com/sun/star/formula/FormulaProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,324 +24,324 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_formula_FormulaProperties_idl__
-#define __com_sun_star_formula_FormulaProperties_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module formula {
-
-//=============================================================================
-
+#ifndef __com_sun_star_formula_FormulaProperties_idl__ 
+#define __com_sun_star_formula_FormulaProperties_idl__ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module formula { 
+ 
+//============================================================================= 
+ 
 /** The formula properties provide access to the properties of a formula
     in a formula generator
  */
 published service FormulaProperties
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the alignment of the formula.
         @see HorizontalAlignment
      */
-    [property] short    Alignment;
-    //-------------------------------------------------------------------------
-
+    [property] short    Alignment; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the base font height in point the formula will be
         formatted in.
-
+        
         <p> All properties containing relative values are related to this value.
         </p>
      */
-    [property] short    BaseFontHeight;
-    //-------------------------------------------------------------------------
-
+    [property] short    BaseFontHeight; 
+    //------------------------------------------------------------------------- 
+     
     /** customized name for fixed font.
      */
-    [property] string   CustomFontNameFixed;
-    //-------------------------------------------------------------------------
-
+    [property] string   CustomFontNameFixed; 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the customized fixed font is italic.
      */
-    [property] boolean FontFixedIsItalic;
-    //-------------------------------------------------------------------------
-
+    [property] boolean FontFixedIsItalic; 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the customized fixed font is bold.
      */
-    [property] boolean FontFixedIsBold;
-    //-------------------------------------------------------------------------
-
+    [property] boolean FontFixedIsBold; 
+    //------------------------------------------------------------------------- 
+     
     /** customized name for sans serif font
      */
-    [property] string   CustomFontNameSans;
-    //-------------------------------------------------------------------------
-
+    [property] string   CustomFontNameSans; 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the customized sans serif font is italic.
      */
-    [property] boolean FontSansIsItalic;
-    //-------------------------------------------------------------------------
-
+    [property] boolean FontSansIsItalic; 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the customized sans serif font is bold.
      */
-    [property] boolean FontSansIsBold;
-    //-------------------------------------------------------------------------
-
+    [property] boolean FontSansIsBold; 
+    //------------------------------------------------------------------------- 
+     
     /** customized name for serif font
      */
-    [property] string   CustomFontNameSerif;
-    //-------------------------------------------------------------------------
-
+    [property] string   CustomFontNameSerif; 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the customized serif font is italic.
      */
-    [property] boolean FontSerifIsItalic;
-    //-------------------------------------------------------------------------
-
+    [property] boolean FontSerifIsItalic; 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the customized serif font is bold.
      */
-    [property] boolean FontSerifIsBold;
-    //-------------------------------------------------------------------------
-
+    [property] boolean FontSerifIsBold; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the name of the font that is used to
         display functions contained in the formula.
      */
-    [property] string FontNameFunctions;
-    //-------------------------------------------------------------------------
-
+    [property] string FontNameFunctions; 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the font that is used to display functions is italic.
      */
-    [property] boolean FontFunctionsIsItalic;
-    //-------------------------------------------------------------------------
-
+    [property] boolean FontFunctionsIsItalic; 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the font that is used to display functions is bold.
      */
-    [property] boolean FontFunctionsIsBold;
-    //-------------------------------------------------------------------------
-
+    [property] boolean FontFunctionsIsBold; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the name of the font that is used to
         display numbers contained in the formula.
      */
-    [property] string   FontNameNumbers;
-    //-------------------------------------------------------------------------
-
+    [property] string   FontNameNumbers; 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the font that is used to display numbers is italic.
      */
-    [property] boolean FontNumbersIsItalic;
-    //-------------------------------------------------------------------------
-
+    [property] boolean FontNumbersIsItalic; 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the font that is used to display numbers is bold.
      */
-    [property] boolean FontNumbersIsBold;
-    //-------------------------------------------------------------------------
-
+    [property] boolean FontNumbersIsBold; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the name of the font that is used to
         display text contained in the formula.
      */
-    [property] string   FontNameText;
-    //-------------------------------------------------------------------------
-
+    [property] string   FontNameText; 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the font that is used to display text is italic.
      */
-    [property] boolean FontTextIsItalic;
-    //-------------------------------------------------------------------------
-
+    [property] boolean FontTextIsItalic; 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the font that is used to display text is bold.
      */
-    [property] boolean FontTextIsBold;
-    //-------------------------------------------------------------------------
-
+    [property] boolean FontTextIsBold; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the name of the font that is used to
         display variables contained in the formula.
      */
-    [property] string   FontNameVariables;
-    //-------------------------------------------------------------------------
-
+    [property] string   FontNameVariables; 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the font that is used to display variables is italic.
      */
-    [property] boolean FontVariablesIsItalic;
-    //-------------------------------------------------------------------------
-
+    [property] boolean FontVariablesIsItalic; 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the font that is used to display variables is bold.
      */
-    [property] boolean FontVariablesIsBold;
-    //-------------------------------------------------------------------------
-
+    [property] boolean FontVariablesIsBold; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the command string of the formula
      */
-    [property] string   Formula;
-    //-------------------------------------------------------------------------
-
-    /** decides if all brackets (even those without 'left'/'right'
+    [property] string   Formula; 
+    //------------------------------------------------------------------------- 
+     
+    /** decides if all brackets (even those without 'left'/'right' 
         modifier) are scaled.
      */
-    [property] boolean  IsScaleAllBrackets;
-    //-------------------------------------------------------------------------
-
+    [property] boolean  IsScaleAllBrackets; 
+    //------------------------------------------------------------------------- 
+     
     /** switches into text mode.
      */
-    [property] boolean  IsTextMode;
-    //-------------------------------------------------------------------------
-
+    [property] boolean  IsTextMode; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative height of the font for functions.
 
-        The values unit is percent of the
+        The values unit is percent of the 
         <member scope="com::sun::star::formula">FormulaProperties::BaseFontHeight</member>
      */
-    [property] short    RelativeFontHeightFunctions;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeFontHeightFunctions; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative height of the font for indices.
 
-        The values unit is percent of the
+        The values unit is percent of the 
         <member scope="com::sun::star::formula">FormulaProperties::BaseFontHeight</member>
      */
-    [property] short    RelativeFontHeightIndices;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeFontHeightIndices; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative height of the font for limits.
 
-        The values unit is percent of the
+        The values unit is percent of the 
         <member scope="com::sun::star::formula">FormulaProperties::BaseFontHeight</member>
      */
-    [property] short    RelativeFontHeightLimits;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeFontHeightLimits; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative height of the font for operators.
 
-        The values unit is percent of the
+        The values unit is percent of the 
         <member scope="com::sun::star::formula">FormulaProperties::BaseFontHeight</member>
      */
-    [property] short    RelativeFontHeightOperators;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeFontHeightOperators; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative height of the font for text.
 
-        The values unit is percent of the
+        The values unit is percent of the 
         <member scope="com::sun::star::formula">FormulaProperties::BaseFontHeight</member>
      */
-    [property] short    RelativeFontHeightText;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeFontHeightText; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative distance of brackets.
      */
-    [property] short    RelativeBracketDistance;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeBracketDistance; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative excess size of brackets.
      */
-    [property] short    RelativeBracketExcessSize;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeBracketExcessSize; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative excess length of a fraction bar.
      */
-    [property] short    RelativeFractionBarExcessLength;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeFractionBarExcessLength; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative line weight of a fraction bar.
      */
-    [property] short    RelativeFractionBarLineWeight;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeFractionBarLineWeight; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative depth of the denominator of a fraction
      */
-    [property] short    RelativeFractionDenominatorDepth;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeFractionDenominatorDepth; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative height of the numerator of a fraction.
      */
-    [property] short    RelativeFractionNumeratorHeight;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeFractionNumeratorHeight; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative superscript of indices.
      */
-    [property] short    RelativeIndexSubscript;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeIndexSubscript; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative subscript of indices.
      */
-    [property] short    RelativeIndexSuperscript;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeIndexSuperscript; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative line spacing.
      */
-    [property] short    RelativeLineSpacing;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeLineSpacing; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative distance of lower limits.
      */
-    [property] short    RelativeLowerLimitDistance;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeLowerLimitDistance; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative column spacing of matrices.
      */
-    [property] short    RelativeMatrixColumnSpacing;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeMatrixColumnSpacing; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative line spacing of matrices.
      */
-    [property] short    RelativeMatrixLineSpacing;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeMatrixLineSpacing; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative excess of operators.
      */
-    [property] short    RelativeOperatorExcessSize;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeOperatorExcessSize; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative spacing of operators.
      */
-    [property] short    RelativeOperatorSpacing;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeOperatorSpacing; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative root spacing
      */
-    [property] short    RelativeRootSpacing;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeRootSpacing; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative scaling of the bracket excess.
      */
-    [property] short    RelativeScaleBracketExcessSize;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeScaleBracketExcessSize; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative spacing.
      */
-    [property] short    RelativeSpacing;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeSpacing; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative minimum height of the formula.
      */
-    [property] short    RelativeSymbolMinimumHeight;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeSymbolMinimumHeight; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative primary height of symbols.
      */
-    [property] short    RelativeSymbolPrimaryHeight;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeSymbolPrimaryHeight; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the relative distance of upper limits
      */
-    [property] short    RelativeUpperLimitDistance;
-    //-------------------------------------------------------------------------
-
+    [property] short    RelativeUpperLimitDistance; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the metric value of the top margin of the formula.
      */
-    [property] short    TopMargin;
-    //-------------------------------------------------------------------------
-
+    [property] short    TopMargin; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the metric value of the bottom margin of the formula.
      */
-    [property] short    BottomMargin;
-    //-------------------------------------------------------------------------
-
+    [property] short    BottomMargin; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the metric value of the left margin of the formula.
      */
-    [property] short    LeftMargin;
-    //-------------------------------------------------------------------------
-
+    [property] short    LeftMargin; 
+    //------------------------------------------------------------------------- 
+     
     /** contains the metric value of the right margin of the formula.
      */
-    [property] short    RightMargin;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] short    RightMargin; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/formula/SymbolDescriptor.idl b/offapi/com/sun/star/formula/SymbolDescriptor.idl
index da83b3dc8db1..a55de52fec5e 100644
--- a/offapi/com/sun/star/formula/SymbolDescriptor.idl
+++ b/offapi/com/sun/star/formula/SymbolDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,12 +26,12 @@
  ************************************************************************/
 #ifndef __com_sun_star_formula_Symbol_idl__
 #define __com_sun_star_formula_Symbol_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module formula {
-
-//=============================================================================
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module formula { 
+ 
+//============================================================================= 
 /** @deprecated draft
     - nWeight should be changed to float as in FontWeight.idl
     - nItalic probably needs to have FontItalic extended by the two
@@ -62,25 +62,25 @@ published struct SymbolDescriptor
     string sFontName;
 
     /** Specifies the character set which is supported by the font.
-
+        
         @see   <type scope="com::sun::star::awt">CharSet</type>
     */
     short nCharSet;
 
     /** Specifies the general style of the font.
-
+    
         @see   <type scope="com::sun::star::awt">FontFamily</type>
     */
     short nFamily;
 
     /** Specifies the pitch of the font.
-
+    
         @see   <type scope="com::sun::star::awt">FontPitch</type>
     */
     short nPitch;
 
     /** Specifies the thickness of the line.
-
+    
         @see   <type scope="com::sun::star::awt">FontWeight</type>
 
         The allowed integer values correspond as follows:
@@ -94,20 +94,20 @@ published struct SymbolDescriptor
         8 : <member scope="com::sun::star::awt">FontWeight::BOLD</member>
         9 : <member scope="com::sun::star::awt">FontWeight::ULTRABOLD</member>
         10 : <member scope="com::sun::star::awt">FontWeight::BLACK</member>
-
+        
     */
     short nWeight;
 
     /** Specifies if the font is italic.
-
+    
         @see   <type scope="com::sun::star::awt">FontSlant</type>
 
         The values
-        <member cope"com::sun::star::awt">FontSlant::REVERSE_OBLIQUE</member> and
-        <member scope="com::sun::star::awt">FontSlant::REVERSE_ITALIC</member>
+        <member cope"com::sun::star::awt">FontSlant::REVERSE_OBLIQUE</member> and 
+        <member scope="com::sun::star::awt">FontSlant::REVERSE_ITALIC</member> 
         may not be used.
     */
     short nItalic;
 };
-}; }; }; };
-#endif
+}; }; }; }; 
+#endif 
diff --git a/offapi/com/sun/star/frame/BorderWidths.idl b/offapi/com/sun/star/frame/BorderWidths.idl
index db3d4484a69f..b9469c3cb0bf 100644
--- a/offapi/com/sun/star/frame/BorderWidths.idl
+++ b/offapi/com/sun/star/frame/BorderWidths.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_frame_BorderWidths_idl__
-#define __com_sun_star_frame_BorderWidths_idl__
-
-
+#ifndef __com_sun_star_frame_BorderWidths_idl__ 
+#define __com_sun_star_frame_BorderWidths_idl__ 
+ 
+ 
 //============================================================================
-
- module com {  module sun {  module star {  module frame {
-
+ 
+ module com {  module sun {  module star {  module frame {  
+ 
 //============================================================================
-
+ 
 /** specifies a border area by offsets from each side.
  */
 struct BorderWidths
@@ -41,7 +41,7 @@ struct BorderWidths
     //------------------------------------------------------------------------
     /** specifies the offset from left border.
      */
-    long Left;
+    long Left; 
 
      //------------------------------------------------------------------------
     /** specifies the offset from top border.
@@ -56,13 +56,13 @@ struct BorderWidths
      //------------------------------------------------------------------------
     /** specifies the offset from bottom border.
      */
-    long Bottom;
-
-};
+    long Bottom; 
 
+}; 
+ 
 //============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/frame/CommandGroup.idl b/offapi/com/sun/star/frame/CommandGroup.idl
index d8058379922e..36454d07665f 100644
--- a/offapi/com/sun/star/frame/CommandGroup.idl
+++ b/offapi/com/sun/star/frame/CommandGroup.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,132 +41,132 @@ module com {  module sun {  module star {  module frame {
  */
 published constants CommandGroup
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 		
     /** specifies interal commands.
      */
     const short INTERNAL = 0;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies application based commands.
      */
     const short APPLICATION = 1;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies view specific commands.
      */
     const short VIEW = 2;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies document specific commands.
      */
     const short DOCUMENT = 3;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies edit specific commands.
      */
     const short EDIT = 4;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies commands used by the built-in Basic.
      */
     const short MACRO = 5;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies commands to change options.
      */
     const short OPTIONS = 6;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies math specific commands.
      */
     const short MATH = 7;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies navigate commands.
      */
     const short NAVIGATOR = 8;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies insert commands.
      */
     const short INSERT = 9;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies commands that are related to formats.
      */
     const short FORMAT = 10;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies commands that are related to templates.
      */
     const short TEMPLATE = 11;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies text specific commands.
      */
     const short TEXT = 12;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies frame specific commands.
      */
     const short FRAME = 13;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies commands that are related to graphical data.
      */
     const short GRAPHIC = 14;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies commands that are related to tables.
      */
     const short TABLE = 15;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies commands that are related to bullets and numbering.
      */
     const short ENUMERATION = 16;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies commands that are related to data.
      */
     const short DATA = 17;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies special commands.
      */
     const short SPECIAL = 18;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies commands that are related to images.
      */
     const short IMAGE = 19;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies chart specific commands.
      */
     const short CHART = 20;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies explorer specific commands.
      */
     const short EXPLORER = 21;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies commands that are related to connectors.
      */
     const short CONNECTOR = 22;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies commands that are related to modifications.
      */
     const short MODIFY = 23;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies commands that are related to drawing.
      */
     const short DRAWING = 24;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies commands that are related to controls.
      */
     const short CONTROLS = 25;
diff --git a/offapi/com/sun/star/frame/Components.idl b/offapi/com/sun/star/frame/Components.idl
index 705ad4364d73..0445553e192b 100644
--- a/offapi/com/sun/star/frame/Components.idl
+++ b/offapi/com/sun/star/frame/Components.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/ContentHandler.idl b/offapi/com/sun/star/frame/ContentHandler.idl
index ad30ccab2108..3be56a65f1c0 100644
--- a/offapi/com/sun/star/frame/ContentHandler.idl
+++ b/offapi/com/sun/star/frame/ContentHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/ContentHandlerFactory.idl b/offapi/com/sun/star/frame/ContentHandlerFactory.idl
index 7fb08ba7aa13..a3c1776bf345 100644
--- a/offapi/com/sun/star/frame/ContentHandlerFactory.idl
+++ b/offapi/com/sun/star/frame/ContentHandlerFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/ControlCommand.idl b/offapi/com/sun/star/frame/ControlCommand.idl
index 9be9a6948349..345659f1e2af 100644
--- a/offapi/com/sun/star/frame/ControlCommand.idl
+++ b/offapi/com/sun/star/frame/ControlCommand.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_frame_ControlCommand_idl__
-#define __com_sun_star_frame_ControlCommand_idl__
-
-
+#ifndef __com_sun_star_frame_ControlCommand_idl__ 
+#define __com_sun_star_frame_ControlCommand_idl__ 
+ 
+ 
 #ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
 #endif
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module frame {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** describes a command which can be send to a generic toolbar control.
-
+    
     @since OOo 2.0.3
  */
 struct ControlCommand
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** specifies the command which should be processed by the toolbar
         control.
      */
     string Command;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies a sequence of named values which are used as argument
         for the command. The number and type of arguments depend on the
         the command and control.
      */
-    sequence< com::sun::star::beans::NamedValue > Arguments;
-};
-
-//=============================================================================
-
+    sequence< com::sun::star::beans::NamedValue > Arguments;	
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; };
-
+ 
 #endif
diff --git a/offapi/com/sun/star/frame/ControlEvent.idl b/offapi/com/sun/star/frame/ControlEvent.idl
index 7cde5fc5ee54..2a701bf6edb8 100644
--- a/offapi/com/sun/star/frame/ControlEvent.idl
+++ b/offapi/com/sun/star/frame/ControlEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_frame_ControlEvent_idl__
-#define __com_sun_star_frame_ControlEvent_idl__
+#ifndef __com_sun_star_frame_ControlEvent_idl__ 
+#define __com_sun_star_frame_ControlEvent_idl__ 
 
 #ifndef __com_sun_star_util_URL_idl__
 #include <com/sun/star/util/URL.idl>
 #endif
-
+ 
 #ifndef __com_sun_star_beans_NamedValue_idl__
 #include <com/sun/star/beans/NamedValue.idl>
 #endif
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module frame {
-
-//=============================================================================
-
-/** describes a control event send by extended user interface
+ 
+//============================================================================= 
+ 
+/** describes a control event send by extended user interface 
     controls.
-
+    
     @since OOo 2.0.3
  */
 struct ControlEvent
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** fully parsed URL describing the control that sends this
         notification.
     */
     ::com::sun::star::util::URL aURL;
-
+    
     /** specifies the event which has occured.
      */
     string Event;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies a sequence of named values which are used as
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies a sequence of named values which are used as 
         additional values for the event. The number and types of
         named values depent on the event.
      */
-    sequence< com::sun::star::beans::NamedValue > aInformation;
-};
-
-//=============================================================================
-
+    sequence< com::sun::star::beans::NamedValue > aInformation;	
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; };
-
+ 
 #endif
diff --git a/offapi/com/sun/star/frame/Controller.idl b/offapi/com/sun/star/frame/Controller.idl
index 5371d3c331e0..8e8c4c2dd39d 100644
--- a/offapi/com/sun/star/frame/Controller.idl
+++ b/offapi/com/sun/star/frame/Controller.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/Desktop.idl b/offapi/com/sun/star/frame/Desktop.idl
index f7a92ca25df0..99f10105c2eb 100644
--- a/offapi/com/sun/star/frame/Desktop.idl
+++ b/offapi/com/sun/star/frame/Desktop.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/DesktopTask.idl b/offapi/com/sun/star/frame/DesktopTask.idl
index 3640f57c332f..07d57142d97f 100644
--- a/offapi/com/sun/star/frame/DesktopTask.idl
+++ b/offapi/com/sun/star/frame/DesktopTask.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/DesktopTasks.idl b/offapi/com/sun/star/frame/DesktopTasks.idl
index afb479209b3d..8a32609991cc 100644
--- a/offapi/com/sun/star/frame/DesktopTasks.idl
+++ b/offapi/com/sun/star/frame/DesktopTasks.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/DispatchDescriptor.idl b/offapi/com/sun/star/frame/DispatchDescriptor.idl
index f3b3867695f3..a4ce7fabfcb6 100644
--- a/offapi/com/sun/star/frame/DispatchDescriptor.idl
+++ b/offapi/com/sun/star/frame/DispatchDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/DispatchHelper.idl b/offapi/com/sun/star/frame/DispatchHelper.idl
index 088a113d1fc0..02950a036cf6 100644
--- a/offapi/com/sun/star/frame/DispatchHelper.idl
+++ b/offapi/com/sun/star/frame/DispatchHelper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/DispatchInformation.idl b/offapi/com/sun/star/frame/DispatchInformation.idl
index 49789f003b8a..d6ce8e0110c9 100644
--- a/offapi/com/sun/star/frame/DispatchInformation.idl
+++ b/offapi/com/sun/star/frame/DispatchInformation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,10 +49,10 @@ published struct DispatchInformation
     /** command URL of a supported command.
     */
     string Command;
-
+    
     //-------------------------------------------------------------------------
     /** group identifier to which the supported command belong.
-
+        
         <p>
         @see CommandGroup
         </p>
diff --git a/offapi/com/sun/star/frame/DispatchProvider.idl b/offapi/com/sun/star/frame/DispatchProvider.idl
index 0eb061d54971..316b4fbba50a 100644
--- a/offapi/com/sun/star/frame/DispatchProvider.idl
+++ b/offapi/com/sun/star/frame/DispatchProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/DispatchRecorder.idl b/offapi/com/sun/star/frame/DispatchRecorder.idl
index 276d332e45a4..ddc22cd694ed 100644
--- a/offapi/com/sun/star/frame/DispatchRecorder.idl
+++ b/offapi/com/sun/star/frame/DispatchRecorder.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl b/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
index 7dec99011b17..f94444b5e210 100644
--- a/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
+++ b/offapi/com/sun/star/frame/DispatchRecorderSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/DispatchResultEvent.idl b/offapi/com/sun/star/frame/DispatchResultEvent.idl
index c295f517b446..a2d4c43b30a9 100644
--- a/offapi/com/sun/star/frame/DispatchResultEvent.idl
+++ b/offapi/com/sun/star/frame/DispatchResultEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/DispatchResultState.idl b/offapi/com/sun/star/frame/DispatchResultState.idl
index aac075795045..95e1fb5db1b8 100644
--- a/offapi/com/sun/star/frame/DispatchResultState.idl
+++ b/offapi/com/sun/star/frame/DispatchResultState.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/DispatchStatement.idl b/offapi/com/sun/star/frame/DispatchStatement.idl
index c1965b0db838..662a5102460c 100644
--- a/offapi/com/sun/star/frame/DispatchStatement.idl
+++ b/offapi/com/sun/star/frame/DispatchStatement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/DocumentTemplates.idl b/offapi/com/sun/star/frame/DocumentTemplates.idl
index b3c44ffe83ad..3b7a14052d47 100644
--- a/offapi/com/sun/star/frame/DocumentTemplates.idl
+++ b/offapi/com/sun/star/frame/DocumentTemplates.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/DoubleInitializationException.idl b/offapi/com/sun/star/frame/DoubleInitializationException.idl
index f1121156a2cc..414e6155f672 100644
--- a/offapi/com/sun/star/frame/DoubleInitializationException.idl
+++ b/offapi/com/sun/star/frame/DoubleInitializationException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_frame_TerminationVetoException_idl__
-#define __com_sun_star_frame_TerminationVetoException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module frame {
-
-//=============================================================================
-
+#ifndef __com_sun_star_frame_TerminationVetoException_idl__ 
+#define __com_sun_star_frame_TerminationVetoException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module frame {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::frame::DoubleInitializationException
 /** This exception can be thrown in case an object is initialized second time.
 
     @since OOo 1.1.2
  */
 published exception DoubleInitializationException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/frame/FeatureStateEvent.idl b/offapi/com/sun/star/frame/FeatureStateEvent.idl
index c812424e42ac..8105257cdb66 100644
--- a/offapi/com/sun/star/frame/FeatureStateEvent.idl
+++ b/offapi/com/sun/star/frame/FeatureStateEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/Frame.idl b/offapi/com/sun/star/frame/Frame.idl
index 2111775c9948..ddb880ea6c28 100644
--- a/offapi/com/sun/star/frame/Frame.idl
+++ b/offapi/com/sun/star/frame/Frame.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -89,7 +89,7 @@ published service Frame
         @see    <type scope="com::sun::star::xml">UserDefinedAttributesSupplier</type>
      */
     [optional] service com::sun::star::xml::UserDefinedAttributesSupplier;
-
+    
     //-------------------------------------------------------------------------
     /** allows the component to be loaded and accessed
         within the frame; it is the main connection to the
@@ -126,11 +126,11 @@ published service Frame
 
     //-------------------------------------------------------------------------
     /** provides information about supported commands
-
+    
         @since OOo 2.0.0
     */
     [optional] interface XDispatchInformationProvider;
-
+    
     //-------------------------------------------------------------------------
     /** supports interception mechanism for dispatched URLs
 
@@ -192,9 +192,9 @@ published service Frame
     @since OOo 1.1.2
      */
     [optional, property] XDispatchRecorderSupplier RecorderSupplier;
-
+    
     //-------------------------------------------------------------------------
-    /** provides access to the <type>LayoutManager</type> of the frame.
+    /** provides access to the <type>LayoutManager</type> of the frame. 
     */
     [optional, property] com::sun::star::uno::XInterface LayoutManager;
 };
diff --git a/offapi/com/sun/star/frame/FrameAction.idl b/offapi/com/sun/star/frame/FrameAction.idl
index e3249900095e..de2cfb18eecf 100644
--- a/offapi/com/sun/star/frame/FrameAction.idl
+++ b/offapi/com/sun/star/frame/FrameAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/FrameActionEvent.idl b/offapi/com/sun/star/frame/FrameActionEvent.idl
index 563cf5ffe064..40f6d4002eea 100644
--- a/offapi/com/sun/star/frame/FrameActionEvent.idl
+++ b/offapi/com/sun/star/frame/FrameActionEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/FrameControl.idl b/offapi/com/sun/star/frame/FrameControl.idl
index d05819970559..d9872181a15a 100644
--- a/offapi/com/sun/star/frame/FrameControl.idl
+++ b/offapi/com/sun/star/frame/FrameControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/FrameLoader.idl b/offapi/com/sun/star/frame/FrameLoader.idl
index 3ba240608dbf..8308f239a451 100644
--- a/offapi/com/sun/star/frame/FrameLoader.idl
+++ b/offapi/com/sun/star/frame/FrameLoader.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,7 +65,7 @@ published service FrameLoader
     interface XFrameLoader;
 
     //-------------------------------------------------------------------------
-    /** support initialization of loader with its own configuration!
+    /**	support initialization of loader with its own configuration!
 
         <p>
         Concrete implementations should use it to get her own configuration data
@@ -82,9 +82,9 @@ published service FrameLoader
         The internal name is a part of his configuration and will be passed by
         the <type>FrameLoaderFactory</type> after creation
         if optional interface <type scope="com::sun::star::lang">XInitialization</type>
-        is supported. Value of function <member scope="com::sun::star::container">XNamed::getName()</member>
+        is supported. Value of function <member scope="com::sun::star::container">XNamed::getName()</member> 
     can be used on service <type>FrameLoaderFactory</type> to get further informations about this loader.
-        Setting of this name by calling <member scope="com::sun::star::container">XNamed::setName()</member>
+        Setting of this name by calling <member scope="com::sun::star::container">XNamed::setName()</member> 
     must be forwarded to same factory service. He should decide, if it's allowed or not.
         The reason: prevent code against name ambigities.
         </p>
diff --git a/offapi/com/sun/star/frame/FrameLoaderFactory.idl b/offapi/com/sun/star/frame/FrameLoaderFactory.idl
index 1866f286d2cf..0203c8179ae2 100644
--- a/offapi/com/sun/star/frame/FrameLoaderFactory.idl
+++ b/offapi/com/sun/star/frame/FrameLoaderFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -75,7 +75,7 @@ published service FrameLoaderFactory
     /** provides access to the whole frame loader configuration
 
     <p>This interface supports an access to the internal configuration of all accessible loader objects.
-        The return value of <member scope="com::sun::star::container">XNameAccess::getByName()</member>
+        The return value of <member scope="com::sun::star::container">XNameAccess::getByName()</member> 
     is a property sequence packed in an any.  </p>
         <table border=1>
             <tr>
diff --git a/offapi/com/sun/star/frame/FrameSearchFlag.idl b/offapi/com/sun/star/frame/FrameSearchFlag.idl
index ac3acee82f7e..4fb0ea97ab77 100644
--- a/offapi/com/sun/star/frame/FrameSearchFlag.idl
+++ b/offapi/com/sun/star/frame/FrameSearchFlag.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/FramesContainer.idl b/offapi/com/sun/star/frame/FramesContainer.idl
index 450da0ac0538..1d1d1972996f 100644
--- a/offapi/com/sun/star/frame/FramesContainer.idl
+++ b/offapi/com/sun/star/frame/FramesContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl b/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl
index 23c98809acbd..3af26c857eb3 100644
--- a/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl
+++ b/offapi/com/sun/star/frame/GlobalEventBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/IllegalArgumentIOException.idl b/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
index 2154daac70fe..c82fcf5054d2 100644
--- a/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
+++ b/offapi/com/sun/star/frame/IllegalArgumentIOException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_frame_TerminationVetoException_idl__
-#define __com_sun_star_frame_TerminationVetoException_idl__
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module frame {
-
-//=============================================================================
-
+#ifndef __com_sun_star_frame_TerminationVetoException_idl__ 
+#define __com_sun_star_frame_TerminationVetoException_idl__ 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module frame {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::frame::IllegalArgumentIOException
 /** This exception can be thrown in case arguments are wrong.
 
     @since OOo 1.1.2
  */
 published exception IllegalArgumentIOException: com::sun::star::io::IOException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/frame/LayoutManager.idl b/offapi/com/sun/star/frame/LayoutManager.idl
index 7a2f25f39d20..2465b0fb364b 100644
--- a/offapi/com/sun/star/frame/LayoutManager.idl
+++ b/offapi/com/sun/star/frame/LayoutManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,20 +56,20 @@
 #include <com/sun/star/frame/XLayoutManagerEventBroadcaster.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
  module com { module sun { module star { module frame {
 
-//=============================================================================
+//============================================================================= 
 /** controls the layout of user interface elements which are part of a frame.
 
     <p>
-    Layout management is the process of determining the size and position of
-    user interface elements. By default, each <type>Frame</type> has a layout
-    manager -- it performs layout management for the user interface elements
-    within the frame. User interface elements can provide size and alignment
-    hints to layout managers, but layout managers have the final decision on
-    the size and position of those user interface elements.
+    Layout management is the process of determining the size and position of 
+    user interface elements. By default, each <type>Frame</type> has a layout 
+    manager -- it performs layout management for the user interface elements 
+    within the frame. User interface elements can provide size and alignment 
+    hints to layout managers, but layout managers have the final decision on 
+    the size and position of those user interface elements. 
     </p>
 
     @since OOo 2.0.0
@@ -77,14 +77,14 @@
 
 service LayoutManager
 {
-    /** central interface to query for, create, destroy and manipulate user
+    /** central interface to query for, create, destroy and manipulate user 
         interface elements which are bound to a frame.
 
         @see ::com::sun::star::frame::XLayoutManager;
     */
     interface ::com::sun::star::frame::XLayoutManager;
-
-    /** notification interface to receive status information about the state
+        
+    /** notification interface to receive status information about the state 
         of the connected frame.
 
         <p>
@@ -97,7 +97,7 @@ service LayoutManager
     */
     interface ::com::sun::star::frame::XFrameActionListener;
 
-    /** notification interface to receive change messages of user interface
+    /** notification interface to receive change messages of user interface 
         elements which are part of the layout manager.
 
         <p>
@@ -119,11 +119,11 @@ service LayoutManager
     */
     [optional] interface ::com::sun::star::frame::XLayoutManagerEventBroadcaster;
 
-    /** interface to support settings a menu bar for inplace editing of
+    /** interface to support settings a menu bar for inplace editing of 
         components inside OpenOffice.org.
 
         @deprecated
-    */
+    */    
     [optional] interface ::com::sun::star::frame::XInplaceLayout;
 };
 
diff --git a/offapi/com/sun/star/frame/LayoutManagerEvents.idl b/offapi/com/sun/star/frame/LayoutManagerEvents.idl
index 8a7bafcf9880..7809d4afce8e 100644
--- a/offapi/com/sun/star/frame/LayoutManagerEvents.idl
+++ b/offapi/com/sun/star/frame/LayoutManagerEvents.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -105,7 +105,7 @@ constants LayoutManagerEvents
      */
     const short MERGEDMENUBAR = 5;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 		
     /** specifies that a certain user interface element has been made
         visible
 
@@ -116,7 +116,7 @@ constants LayoutManagerEvents
      */
     const short UIELEMENT_VISIBLE = 6;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 		
     /** specifies that a certain user interface element has been made
         invisible
 
diff --git a/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl b/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl
index d4f934c39f44..31f0d859bc6a 100644
--- a/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl
+++ b/offapi/com/sun/star/frame/MediaTypeDetectionHelper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/ModuleManager.idl b/offapi/com/sun/star/frame/ModuleManager.idl
index 4b8c1cb8723a..4513478d7ff9 100644
--- a/offapi/com/sun/star/frame/ModuleManager.idl
+++ b/offapi/com/sun/star/frame/ModuleManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ module com { module sun { module star { module frame {
 
 //===============================================
 /** can be used to identify office modules.
-
+ 
     <p>
     Further it provides read access to the configuration
     of office modules.
@@ -60,14 +60,14 @@ service ModuleManager
 
     //-------------------------------------------
     /** provides read access to the configuration of office modules.
-
+     
         <p>
         Every module is referenced by an unique service name
         (which is used inside configuration as set node name too)
         and is further represented by a sequence of elements of type
         <type scope="com::sun::star::beans">PropertyValue</type>.
         A list of properties can be getted from the configuration template
-        org.openoffice.Setup/Factory.
+        org.openoffice.Setup/Factory. 
         </p>
      */
     interface ::com::sun::star::container::XNameAccess;
diff --git a/offapi/com/sun/star/frame/PopupMenuController.idl b/offapi/com/sun/star/frame/PopupMenuController.idl
index 0d24f19e6cd5..ce9ebfa9a5d6 100644
--- a/offapi/com/sun/star/frame/PopupMenuController.idl
+++ b/offapi/com/sun/star/frame/PopupMenuController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,11 +36,11 @@
 #include <com/sun/star/lang/XInitialization.idl>
 #endif
 
-#ifndef __com_sun_star_frame_XStatusListener_idl__
+#ifndef __com_sun_star_frame_XStatusListener_idl__ 
 #include <com/sun/star/frame/XStatusListener.idl>
 #endif
 
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
+#ifndef __com_sun_star_frame_XDispatchProvider_idl__ 
 #include <com/sun/star/frame/XDispatchProvider.idl>
 #endif
 
@@ -49,19 +49,19 @@
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module frame {
 
-//=============================================================================
+//============================================================================= 
 
 /** provides access to a popup menu controller.
-
+    
     <p>
-    A popup menu controller is used to make special functions available to
+    A popup menu controller is used to make special functions available to 
     users, which depend on runtime or context specific conditions.<br/>
-    A typical example for a popup menu controller can be a recent file list
-    implementation which provides a list of latest files that a user has
+    A typical example for a popup menu controller can be a recent file list 
+    implementation which provides a list of latest files that a user has 
     worked on. This list gets changes consistently during a work session.
     </p>
 
@@ -75,26 +75,26 @@ service PopupMenuController
         implementation.
 
         <p>
-        A popup menu controller implementation gets initialized with a
+        A popup menu controller implementation gets initialized with a 
         <type scope="com::sun::star::awt">XPopupMenu</type> object. This assures
         that a popup menu controller can be implemented with any UNO based
         language.
         </p>
     */
     interface com::sun::star::frame::XPopupMenuController;
-
+    
     //-------------------------------------------------------------------------
-    /** provides functions to initialize a popup menu controller with
-        specific data which are needed.
-
+    /** provides functions to initialize a popup menu controller with 
+        specific data which are needed. 
+        
         <p>
-        This interface should not directly used. A factory service is responsible to
+        This interface should not directly used. A factory service is responsible to 
         initialize every controller correctly.<br/>
 
         A popup menu controller needs at least two additional arguments
         provided as <type scope="com::sun::star::beans">PropertyValue</type>:
         <ul>
-            <li><b>Frame</b><br>specifies the <type scope="com::sun::star::frame">XFrame</type>
+            <li><b>Frame</b><br>specifies the <type scope="com::sun::star::frame">XFrame</type> 
                    instance to which the popup menu controller belongs to.</li>
             <li><b>CommandURL</b><br>specifies which popup menu controller should be created.</li>
         </ul>
@@ -108,8 +108,8 @@ service PopupMenuController
     /** used to brief the popup menu controller with new status information.
 
         <p>
-        A popup menu controller makes special functions available to users which
-        normally depend on the state of other data. This interface is used to
+        A popup menu controller makes special functions available to users which 
+        normally depend on the state of other data. This interface is used to 
         send this data to a controller implementation.
         </p>
     */
@@ -127,7 +127,7 @@ service PopupMenuController
         Popup menu controller functions must be specified using the following
         the dispatch URL scheme: "vnd.sun.star.popup:" opaque_part [ "?" query ].
         </p>
-
+        
         @since OOo 2.2
     */
     [optional] interface com::sun::star::frame::XDispatchProvider;
@@ -140,7 +140,7 @@ service PopupMenuController
         life-time. For correct life-time handling a popup menu
         controller should support this interface.
         </p>
-
+        
         @since OOo 2.2
     */
     [optional] interface com::sun::star::lang::XComponent;
@@ -148,6 +148,6 @@ service PopupMenuController
 
 }; }; }; };
 
-//=============================================================================
+//============================================================================= 
 
 #endif
diff --git a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
index b0d6d71bb1bd..675b09f7e80d 100644
--- a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
+++ b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,17 +36,17 @@
 #include <com/sun/star/frame/XUIControllerRegistration.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module frame {
 
-//=============================================================================
+//============================================================================= 
 
 /** specifies a factory that creates instances of registered popup menu controller.
 
     <p>
-    A popup menu controller can be registered for a command URL and a model service name.
-    A menu bar or context menu will automatically create a popup menu controller if
+    A popup menu controller can be registered for a command URL and a model service name. 
+    A menu bar or context menu will automatically create a popup menu controller if 
     it contains a registered command URL.
     </p>
 
@@ -56,17 +56,17 @@ module com { module sun { module star { module frame {
 service PopupMenuControllerFactory
 {
     /** this interface provides functions to create new instances of a registered popup menu controller.
-
+    
         <p>
         Use <member scope="com.sun.star.lang">XMultiComponentFactory::createInstanceWithArguments()</member> to create
         a new popup menu controller instance. Use the CommandURL as the service specifier.
-
+        
         This call supports the following arguments provided as <type scope="com::sun::star::beans">PropertyValue</type>:
         <ul>
-            <li><b>Frame</b><br>specifies the <type scope="com::sun::star::frame">XFrame</type>
+            <li><b>Frame</b><br>specifies the <type scope="com::sun::star::frame">XFrame</type> 
                    instance to which the popup menu controller belongs to. This property must be provided to
                    the popup menu controller, otherwise it cannot dispatch its internal commands.</li>
-            <li><b>ModuleIdentifier</b><br>optional string that specifies in which module context the popup menu
+            <li><b>ModuleIdentifier</b><br>optional string that specifies in which module context the popup menu 
                    controller should be created.</li>
         </ul>
         </p>
@@ -80,6 +80,6 @@ service PopupMenuControllerFactory
 
 }; }; }; };
 
-//=============================================================================
+//============================================================================= 
 
 #endif
diff --git a/offapi/com/sun/star/frame/ProtocolHandler.idl b/offapi/com/sun/star/frame/ProtocolHandler.idl
index f1a6e9dbc6fc..f8fc95abf81c 100644
--- a/offapi/com/sun/star/frame/ProtocolHandler.idl
+++ b/offapi/com/sun/star/frame/ProtocolHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/SessionManager.idl b/offapi/com/sun/star/frame/SessionManager.idl
index 56c59705fd36..bf29963d8b50 100644
--- a/offapi/com/sun/star/frame/SessionManager.idl
+++ b/offapi/com/sun/star/frame/SessionManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -76,9 +76,9 @@ service SessionManager
         the session manager's signals as well as requests to the session manager.
     */
     interface XSessionManagerClient;
-
+    
 };
-
+ 
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/frame/Settings.idl b/offapi/com/sun/star/frame/Settings.idl
index 81a2a6a857d4..0da1527235db 100644
--- a/offapi/com/sun/star/frame/Settings.idl
+++ b/offapi/com/sun/star/frame/Settings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/StatusbarController.idl b/offapi/com/sun/star/frame/StatusbarController.idl
index 861c4364e1f0..6754d1443217 100644
--- a/offapi/com/sun/star/frame/StatusbarController.idl
+++ b/offapi/com/sun/star/frame/StatusbarController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,16 +48,16 @@
  module com {  module sun {  module star {  module frame {
 
 //=============================================================================
-/** is an abstract service for a component which offers a more complex user
+/** is an abstract service for a component which offers a more complex user 
     interface to users within a status bar.
 
     <p>
-    A generic status bar function is represented as a text field which
-    provides status information to the user. A status bar controller can be
-    added to a status bar and provides information or functions with a more
+    A generic status bar function is represented as a text field which 
+    provides status information to the user. A status bar controller can be 
+    added to a status bar and provides information or functions with a more 
     sophisticated user interface.<br/>
-    A typical example for a status bar controller is the zoom level chooser
-    within the statusbar. It provides an option to change the zoom level of
+    A typical example for a status bar controller is the zoom level chooser 
+    within the statusbar. It provides an option to change the zoom level of 
     an application.
     <p>
 
@@ -70,12 +70,12 @@
 service StatusbarController
 {
     //-------------------------------------------------------------------------
-    /** with this interface a component can receive events if a feature has
+    /** with this interface a component can receive events if a feature has 
         changed.
 
         <p>
-        The status bar controller implementation should register itself as a
-        listener when its <member scope="com::sun::star::util">XUpdatable</member>
+        The status bar controller implementation should register itself as a 
+        listener when its <member scope="com::sun::star::util">XUpdatable</member> 
         interface has been called.
         </p>
      */
@@ -83,52 +83,52 @@ service StatusbarController
 
     /** used to initialize a component with required arguments.
 
-        <b>A status bar controller needs at least three additional arguments
+        <b>A status bar controller needs at least three additional arguments 
         provided as <type scope="com::sun::star::beans">PropertyValue</type>:
         <ul>
-            <li><b>Frame</b><br>a
+            <li><b>Frame</b><br>a 
                    <type scope="com::sun::star::frame">XFrame</type> instance
                    to which the status bar controller belongs.</li>
-            <li><b>CommandURL</b><br>a string which specifies the command
-                   associated with the statusbar controller. The command is
-                   used to identify the status bar controller
+            <li><b>CommandURL</b><br>a string which specifies the command 
+                   associated with the statusbar controller. The command is 
+                   used to identify the status bar controller 
                    implementation.</li>
             <li><b>ServiceManager</b><br>a <type scope="com::sun::star::lang">
-                   XMultiServiceFactory</type> instance which can be used to
+                   XMultiServiceFactory</type> instance which can be used to 
                    create additional UNO services.</li>
             <li><b>Parent</b><br>a <type scope="com::sun::star::awt">Window</type>
-                   instance which represents the parent window (status bar
+                   instance which represents the parent window (status bar 
                    window).</li>
-            <li><b>Identifier</b><br>an integer value which is the unique id
-                   used by the status bar implementation to identify a status
-                   bar entry. This value is currently only used by internal
+            <li><b>Identifier</b><br>an integer value which is the unique id 
+                   used by the status bar implementation to identify a status 
+                   bar entry. This value is currently only used by internal 
                    OpenOffice.org status bar controller implementations.</li>
         </ul>
     */
     interface com::sun::star::lang::XInitialization;
 
-    /** used to notify an implementation that it needs to add its listener or
+    /** used to notify an implementation that it needs to add its listener or 
         remove and add them again.
 
         <p>
-        A status bar controller instance is ready for use after this call has
-        been made the first time. The status bar implementation guarentees that
-        the controller's item window has been added to the status bar and its
+        A status bar controller instance is ready for use after this call has 
+        been made the first time. The status bar implementation guarentees that 
+        the controller's item window has been added to the status bar and its 
         reference is held by it.
         </p>
     */
     interface com::sun::star::util::XUpdatable;
 
     //-------------------------------------------------------------------------
-    /** used to notify changed features and requests for additional user
+    /** used to notify changed features and requests for additional user 
         interface items.
 
         <p>
-        Mostly used by a status bar implementation to forward information to
-        and request services from a status bar controller component. This
-        interface must be useable after
-        <member scope="com::sun::star::lang">XInitialitation::initialize</member>
-        has been called.  The behavior of the interface is undefined if the
+        Mostly used by a status bar implementation to forward information to 
+        and request services from a status bar controller component. This 
+        interface must be useable after 
+        <member scope="com::sun::star::lang">XInitialitation::initialize</member> 
+        has been called.  The behavior of the interface is undefined if the 
         controller component hasn't been initialized.
         </p>
      */
diff --git a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
index 01d26117f1c1..fcffafa55a90 100644
--- a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
+++ b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,18 +36,18 @@
 #include <com/sun/star/frame/XUIControllerRegistration.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module frame {
 
-//=============================================================================
+//============================================================================= 
 
-/** specifies a factory that creates instances of registered status bar
+/** specifies a factory that creates instances of registered status bar 
     controller.
 
     <p>
-    A status bar controller can be registered for a command URL and a model
-    service name. A status bar will automatically create a status bar controller
+    A status bar controller can be registered for a command URL and a model 
+    service name. A status bar will automatically create a status bar controller 
     if it contains a registered command URL.
     </p>
 
@@ -56,29 +56,29 @@ module com { module sun { module star { module frame {
 
 service StatusbarControllerFactory
 {
-    /** this interface provides functions to create new instances of a registered
+    /** this interface provides functions to create new instances of a registered 
         status bar controller.
-
+    
         <p>
-        Use <member scope="com.sun.star.lang">XMultiComponentFactory::createInstanceWithArguments()</member>
-        to create a new status bar controller instance. Use the CommandURL as the
+        Use <member scope="com.sun.star.lang">XMultiComponentFactory::createInstanceWithArguments()</member> 
+        to create a new status bar controller instance. Use the CommandURL as the 
         service specifier.
-
-        This call supports the following arguments provided as
+        
+        This call supports the following arguments provided as 
         <type scope="com::sun::star::beans">PropertyValue</type>:
         <ul>
-            <li><b>Frame</b><br>specifies the <type scope="com::sun::star::frame">XFrame</type>
-                   instance to which the status bar controller belongs to. This
-                   property must be provided to the status bar controller, otherwise it
+            <li><b>Frame</b><br>specifies the <type scope="com::sun::star::frame">XFrame</type> 
+                   instance to which the status bar controller belongs to. This 
+                   property must be provided to the status bar controller, otherwise it 
                    cannot dispatch its internal commands.</li>
-            <li><b>ModuleIdentifier</b><br>optional string that specifies in which module
+            <li><b>ModuleIdentifier</b><br>optional string that specifies in which module 
                    context the status bar controller should be created.</li>
         </ul>
         </p>
      */
     interface com::sun::star::lang::XMultiComponentFactory;
 
-    /** provides functions to query for, register and deregister a status bar
+    /** provides functions to query for, register and deregister a status bar 
         controller.
      */
     interface com::sun::star::frame::XUIControllerRegistration;
@@ -86,6 +86,6 @@ service StatusbarControllerFactory
 
 }; }; }; };
 
-//=============================================================================
+//============================================================================= 
 
 #endif
diff --git a/offapi/com/sun/star/frame/SynchronousFrameLoader.idl b/offapi/com/sun/star/frame/SynchronousFrameLoader.idl
index b6c954c8fff8..15da61b46bf5 100644
--- a/offapi/com/sun/star/frame/SynchronousFrameLoader.idl
+++ b/offapi/com/sun/star/frame/SynchronousFrameLoader.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,7 +65,7 @@ published service SynchronousFrameLoader
     interface XSynchronousFrameLoader;
 
     //-------------------------------------------------------------------------
-    /** support initialization of loader with its own configuration!
+    /**	support initialization of loader with its own configuration!
 
         <p>
         Concrete implementations should use it to get her own configuration data
diff --git a/offapi/com/sun/star/frame/Task.idl b/offapi/com/sun/star/frame/Task.idl
index 76e7bef933a9..630d56cde4f9 100644
--- a/offapi/com/sun/star/frame/Task.idl
+++ b/offapi/com/sun/star/frame/Task.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/TemplateAccess.idl b/offapi/com/sun/star/frame/TemplateAccess.idl
index 049529a930c3..1bced8264dca 100644
--- a/offapi/com/sun/star/frame/TemplateAccess.idl
+++ b/offapi/com/sun/star/frame/TemplateAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/TerminationVetoException.idl b/offapi/com/sun/star/frame/TerminationVetoException.idl
index aa114abd98c4..39a4a3ba0dad 100644
--- a/offapi/com/sun/star/frame/TerminationVetoException.idl
+++ b/offapi/com/sun/star/frame/TerminationVetoException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/TitleChangedEvent.idl b/offapi/com/sun/star/frame/TitleChangedEvent.idl
index f93ef7ccc564..a67daddeb1df 100644
--- a/offapi/com/sun/star/frame/TitleChangedEvent.idl
+++ b/offapi/com/sun/star/frame/TitleChangedEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/ToolbarController.idl b/offapi/com/sun/star/frame/ToolbarController.idl
index 674b35af4e6c..b79fe669d5f2 100644
--- a/offapi/com/sun/star/frame/ToolbarController.idl
+++ b/offapi/com/sun/star/frame/ToolbarController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,15 +53,15 @@
  module com {  module sun {  module star {  module frame {
 
 //=============================================================================
-/** is an abstract service for a component which offers a more complex user
+/** is an abstract service for a component which offers a more complex user 
     interface to users within a toolbar.
 
     <p>
-    A generic toolbar function is represented as a button which has a state
-    (enabled,disabled and selected, not selected). A toolbar controller can
-    be added to a toolbar and provide information or functions within a more
-    sophisticated user interface.<br/> A typical example for toolbar controller
-    is the font chooser within the toolbar. It provides all available fonts in
+    A generic toolbar function is represented as a button which has a state 
+    (enabled,disabled and selected, not selected). A toolbar controller can 
+    be added to a toolbar and provide information or functions within a more 
+    sophisticated user interface.<br/> A typical example for toolbar controller 
+    is the font chooser within the toolbar. It provides all available fonts in 
     a dropdown box and shows the current chosen font.
     <p>
 
@@ -73,12 +73,12 @@
 service ToolbarController
 {
     //-------------------------------------------------------------------------
-    /** with this interface a component can receive events if a feature has
+    /** with this interface a component can receive events if a feature has 
         changed.
 
         <p>
-        The toolbar controller implementation should register itself as a
-        listener when its <member scope="com::sun::star::util">XUpdatable</member>
+        The toolbar controller implementation should register itself as a 
+        listener when its <member scope="com::sun::star::util">XUpdatable</member> 
         interface has been called.
         </p>
      */
@@ -86,53 +86,53 @@ service ToolbarController
 
     /** used to initialize a component with required arguments.
 
-        A toolbar controller needs at least three additional arguments
+        A toolbar controller needs at least three additional arguments 
         provided as <type scope="com::sun::star::beans">PropertyValue</type>:
         <ul>
-            <li><b>Frame</b><br>a <type scope="com::sun::star::frame">XFrame</type>
+            <li><b>Frame</b><br>a <type scope="com::sun::star::frame">XFrame</type> 
                    instance to which the toolbar controller belongs.</li>
-            <li><b>CommandURL</b><br>a string which specifies the command a
+            <li><b>CommandURL</b><br>a string which specifies the command a 
                    toolbar controller is bound.</li>
-            <li><b>ServiceManager</b><br>a
+            <li><b>ServiceManager</b><br>a 
                    <type scope="com::sun::star::lang">XMultiServiceFactory</type>
                    instance which can be used to create additional UNO services.</li>
         </ul>
     */
     interface com::sun::star::lang::XInitialization;
 
-    /** used to notify an implementation that it needs to add its listener or remove
+    /** used to notify an implementation that it needs to add its listener or remove 
         and add them again.
 
         <p>
-        A toolbar controller instance is ready for use after this call has been made
-        the first time. The toolbar implementation guarentees that the controller's
+        A toolbar controller instance is ready for use after this call has been made 
+        the first time. The toolbar implementation guarentees that the controller's 
         item window has been added to the toolbar and its reference is held by it.
         </p>
     */
     interface com::sun::star::util::XUpdatable;
 
     //-------------------------------------------------------------------------
-    /** used to notify changed features and requests for additional user interface
+    /** used to notify changed features and requests for additional user interface 
         items.
 
         <p>
         Mostly used by a toolbar implementation to forward information to and request
-        services from a toolbar controller component. This interface must be useable
-        after <member scope="com::sun::star::lang">XInitialitation::initialize</member>
-        has been called.  The behavior of the interface is undefined if the controller
+        services from a toolbar controller component. This interface must be useable 
+        after <member scope="com::sun::star::lang">XInitialitation::initialize</member> 
+        has been called.  The behavior of the interface is undefined if the controller 
         component hasn't been initialized.
         </p>
      */
     interface com::sun::star::frame::XToolbarController;
 
     //-------------------------------------------------------------------------
-    /** used to notify and retrieve information that are specific for sub-toolbar
+    /** used to notify and retrieve information that are specific for sub-toolbar 
         controllers.
 
         <p>
         Used by implementations that want to provide the toolbar button/sub-
-        toolbar function feature. A controller supporting this interface exchanges
-        the function of its own toolbar button, that opened the sub-toolbar, with
+        toolbar function feature. A controller supporting this interface exchanges 
+        the function of its own toolbar button, that opened the sub-toolbar, with 
         the one that has been selected on the sub-toolbar.
         </p>
      */
diff --git a/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl b/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
index 326981516522..2dfb26d38d7c 100644
--- a/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
+++ b/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/UnknownModuleException.idl b/offapi/com/sun/star/frame/UnknownModuleException.idl
index c1c9aad21d8a..39f47ef7bd1c 100644
--- a/offapi/com/sun/star/frame/UnknownModuleException.idl
+++ b/offapi/com/sun/star/frame/UnknownModuleException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module frame {
  *  module could not be classified or does not have
  *  a valid configuration.
 
-    @since OOo 2.0.0
+    @since OOo 2.0.0    
  */
 exception UnknownModuleException : ::com::sun::star::uno::Exception
 {
diff --git a/offapi/com/sun/star/frame/WindowArrange.idl b/offapi/com/sun/star/frame/WindowArrange.idl
index e16d0a01fb7f..0ee7a3dd41df 100644
--- a/offapi/com/sun/star/frame/WindowArrange.idl
+++ b/offapi/com/sun/star/frame/WindowArrange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XBorderResizeListener.idl b/offapi/com/sun/star/frame/XBorderResizeListener.idl
index c6c96dc9c7fc..0b0eb8161222 100644
--- a/offapi/com/sun/star/frame/XBorderResizeListener.idl
+++ b/offapi/com/sun/star/frame/XBorderResizeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl b/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl
index e6ee4b618519..92e664d04ae5 100644
--- a/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl
+++ b/offapi/com/sun/star/frame/XBrowseHistoryRegistry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XComponentLoader.idl b/offapi/com/sun/star/frame/XComponentLoader.idl
index 37589454b260..e987cd51038a 100644
--- a/offapi/com/sun/star/frame/XComponentLoader.idl
+++ b/offapi/com/sun/star/frame/XComponentLoader.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XComponentRegistry.idl b/offapi/com/sun/star/frame/XComponentRegistry.idl
index 9a9f32541b7b..8389798d55fc 100644
--- a/offapi/com/sun/star/frame/XComponentRegistry.idl
+++ b/offapi/com/sun/star/frame/XComponentRegistry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XConfigManager.idl b/offapi/com/sun/star/frame/XConfigManager.idl
index d46cf5696478..28362ad3c6f7 100644
--- a/offapi/com/sun/star/frame/XConfigManager.idl
+++ b/offapi/com/sun/star/frame/XConfigManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XControlNotificationListener.idl b/offapi/com/sun/star/frame/XControlNotificationListener.idl
index 1ebc134cc76f..5584f36a2749 100644
--- a/offapi/com/sun/star/frame/XControlNotificationListener.idl
+++ b/offapi/com/sun/star/frame/XControlNotificationListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_frame_XControlNotificationListener_idl__
-#define __com_sun_star_frame_XControlNotificationListener_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
+#ifndef __com_sun_star_frame_XControlNotificationListener_idl__ 
+#define __com_sun_star_frame_XControlNotificationListener_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
 #endif
 
 #ifndef __com_sun_star_frame_ControlEvent_idl__
 #include <com/sun/star/frame/ControlEvent.idl>
 #endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module frame {
-
-//=============================================================================
-
-/** Must be implemented by dispatch objects which want to get
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module frame {  
+ 
+//============================================================================= 
+ 
+/** Must be implemented by dispatch objects which want to get 
     notifications about control events.
-
-    @since OOo 2.0.3
+    
+    @since OOo 2.0.3	
  */
 interface XControlNotificationListener : com::sun::star::uno::XInterface
 {
@@ -54,12 +54,12 @@ interface XControlNotificationListener : com::sun::star::uno::XInterface
         @param Event
             contains the event informantion
         */
-    void controlEvent( [in] ControlEvent Event );
-
-};
-
-//=============================================================================
+    void controlEvent( [in] ControlEvent Event ); 
 
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/frame/XController.idl b/offapi/com/sun/star/frame/XController.idl
index 50d58246fb1a..1815d7b378ae 100644
--- a/offapi/com/sun/star/frame/XController.idl
+++ b/offapi/com/sun/star/frame/XController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XController2.idl b/offapi/com/sun/star/frame/XController2.idl
index 2c0157d99309..695d9fb11ddc 100644
--- a/offapi/com/sun/star/frame/XController2.idl
+++ b/offapi/com/sun/star/frame/XController2.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ module com {  module sun {  module star {  module frame {
 interface XController2 : XController
 {
     /** denotes the &quot;root window&quot; of the controller.
-
+    
         <p>If the controller is plugged into a frame, this window acts as the
         frame's <code>ComponentWindow</code>.</p>
 
diff --git a/offapi/com/sun/star/frame/XControllerBorder.idl b/offapi/com/sun/star/frame/XControllerBorder.idl
index 9f8659ee8da9..617f45ca7951 100644
--- a/offapi/com/sun/star/frame/XControllerBorder.idl
+++ b/offapi/com/sun/star/frame/XControllerBorder.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XDesktop.idl b/offapi/com/sun/star/frame/XDesktop.idl
index 18f531703da5..d633a0ba86ec 100644
--- a/offapi/com/sun/star/frame/XDesktop.idl
+++ b/offapi/com/sun/star/frame/XDesktop.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XDesktopTask.idl b/offapi/com/sun/star/frame/XDesktopTask.idl
index 7a1c3cdbc436..23a891a13618 100644
--- a/offapi/com/sun/star/frame/XDesktopTask.idl
+++ b/offapi/com/sun/star/frame/XDesktopTask.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XDispatch.idl b/offapi/com/sun/star/frame/XDispatch.idl
index bad1f6525079..26e8f9436469 100644
--- a/offapi/com/sun/star/frame/XDispatch.idl
+++ b/offapi/com/sun/star/frame/XDispatch.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XDispatchHelper.idl b/offapi/com/sun/star/frame/XDispatchHelper.idl
index 7d58677c19b7..5bb7cce1b125 100644
--- a/offapi/com/sun/star/frame/XDispatchHelper.idl
+++ b/offapi/com/sun/star/frame/XDispatchHelper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XDispatchInformationProvider.idl b/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
index 3bf6886ba17b..f3c722ff61f1 100644
--- a/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
+++ b/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,9 +48,9 @@ module com {  module sun {  module star {  module frame {
 
     <p>
     This interface can be used to retrieve additional information about
-    supported commands. This interface is normally used by configuration
-    implementations to retrieve all supported commands.
-    A dispatch information provider is normally supported by a
+    supported commands. This interface is normally used by configuration 
+    implementations to retrieve all supported commands. 
+    A dispatch information provider is normally supported by a 
     <type>Frame</type> service.
     </p>
 
@@ -71,12 +71,12 @@ published interface XDispatchInformationProvider: com::sun::star::uno::XInterfac
     sequence < short > getSupportedCommandGroups();
 
     //-------------------------------------------------------------------------
-    /** returns additional information about supported commands of a
+    /** returns additional information about supported commands of a 
         given command group.
-
+        
         @param CommandGroup
             specifies a command group.
-
+        
         @returns
             name and group name of every command supported. A group ID which is
             not supported returns an empty <type scope="com::sun::star::uno">Sequence</type>.
diff --git a/offapi/com/sun/star/frame/XDispatchProvider.idl b/offapi/com/sun/star/frame/XDispatchProvider.idl
index 8197d272a119..38ef9cf5f9b9 100644
--- a/offapi/com/sun/star/frame/XDispatchProvider.idl
+++ b/offapi/com/sun/star/frame/XDispatchProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XDispatchProviderInterception.idl b/offapi/com/sun/star/frame/XDispatchProviderInterception.idl
index 769a4acce3ac..4669f2bc6613 100644
--- a/offapi/com/sun/star/frame/XDispatchProviderInterception.idl
+++ b/offapi/com/sun/star/frame/XDispatchProviderInterception.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl b/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl
index 3b1ee2c16f71..3739ec2fa732 100644
--- a/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl
+++ b/offapi/com/sun/star/frame/XDispatchProviderInterceptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XDispatchRecorder.idl b/offapi/com/sun/star/frame/XDispatchRecorder.idl
index ed980d89f91d..a621f2c4b198 100644
--- a/offapi/com/sun/star/frame/XDispatchRecorder.idl
+++ b/offapi/com/sun/star/frame/XDispatchRecorder.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -79,12 +79,12 @@ published interface XDispatchRecorder: com::sun::star::uno::XInterface
         <p>
         Must be called in pairs with <member>XDispatchRecorder::startRecording()</member>.
         </p>
-
+        
         @attention  The recorder uses this method to control the lifetime of its internal
                     used macro buffer. It will be cleared here. So the macro must be fetched
                     before endRecording() is called.
-
-        @see        getRecordedMacro()
+                    
+        @see        getRecordedMacro()             
     */
     void endRecording();
 
diff --git a/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl b/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
index c63e34dec1e9..410a6908677c 100644
--- a/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
+++ b/offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XDispatchResultListener.idl b/offapi/com/sun/star/frame/XDispatchResultListener.idl
index 409bd4e0206e..10587ad14895 100644
--- a/offapi/com/sun/star/frame/XDispatchResultListener.idl
+++ b/offapi/com/sun/star/frame/XDispatchResultListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XDocumentTemplates.idl b/offapi/com/sun/star/frame/XDocumentTemplates.idl
index bc41386ea1fd..eec3042e52b1 100644
--- a/offapi/com/sun/star/frame/XDocumentTemplates.idl
+++ b/offapi/com/sun/star/frame/XDocumentTemplates.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XExtendedFilterDetection.idl b/offapi/com/sun/star/frame/XExtendedFilterDetection.idl
index b51feda6d406..a0ca005440ed 100644
--- a/offapi/com/sun/star/frame/XExtendedFilterDetection.idl
+++ b/offapi/com/sun/star/frame/XExtendedFilterDetection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XFilterDetect.idl b/offapi/com/sun/star/frame/XFilterDetect.idl
index 5add9f5e34e9..e55f527fa724 100644
--- a/offapi/com/sun/star/frame/XFilterDetect.idl
+++ b/offapi/com/sun/star/frame/XFilterDetect.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XFrame.idl b/offapi/com/sun/star/frame/XFrame.idl
index e74a15446d1e..d432ec3f017d 100644
--- a/offapi/com/sun/star/frame/XFrame.idl
+++ b/offapi/com/sun/star/frame/XFrame.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,7 +68,7 @@ published interface XFrame: com::sun::star::lang::XComponent
         </p>
 
         <p>This frame will take over ownership of the window refered from
-        <var>xWindow</var>.  Thus, the previous owner is not allowed to
+        <var>xWindow</var>.  Thus, the previous owner is not allowed to 
         dispose this window anymore. </p>
 
         @param xWindow
diff --git a/offapi/com/sun/star/frame/XFrameActionListener.idl b/offapi/com/sun/star/frame/XFrameActionListener.idl
index 52f87f960113..dfef212e2727 100644
--- a/offapi/com/sun/star/frame/XFrameActionListener.idl
+++ b/offapi/com/sun/star/frame/XFrameActionListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XFrameLoader.idl b/offapi/com/sun/star/frame/XFrameLoader.idl
index 4e830af1dc4e..40e5f9e0c807 100644
--- a/offapi/com/sun/star/frame/XFrameLoader.idl
+++ b/offapi/com/sun/star/frame/XFrameLoader.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XFrameLoaderQuery.idl b/offapi/com/sun/star/frame/XFrameLoaderQuery.idl
index 370386cc73e3..c6f0c538fdc6 100644
--- a/offapi/com/sun/star/frame/XFrameLoaderQuery.idl
+++ b/offapi/com/sun/star/frame/XFrameLoaderQuery.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XFrameSetModel.idl b/offapi/com/sun/star/frame/XFrameSetModel.idl
index d5baf6f86466..8635c31af122 100644
--- a/offapi/com/sun/star/frame/XFrameSetModel.idl
+++ b/offapi/com/sun/star/frame/XFrameSetModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XFrames.idl b/offapi/com/sun/star/frame/XFrames.idl
index 42a7b0eb35e8..0c65c3fa4700 100644
--- a/offapi/com/sun/star/frame/XFrames.idl
+++ b/offapi/com/sun/star/frame/XFrames.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XFramesSupplier.idl b/offapi/com/sun/star/frame/XFramesSupplier.idl
index 6674693e8fe2..1a0bc8709835 100644
--- a/offapi/com/sun/star/frame/XFramesSupplier.idl
+++ b/offapi/com/sun/star/frame/XFramesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -73,7 +73,7 @@ published interface XFramesSupplier: XFrame
     XFrame getActiveFrame();
 
     //-------------------------------------------------------------------------
-    /** is called on activation of a direct sub-frame.
+    /**	is called on activation of a direct sub-frame.
 
         <p>
         This method is only allowed to be called by a sub-frame according to
diff --git a/offapi/com/sun/star/frame/XInplaceLayout.idl b/offapi/com/sun/star/frame/XInplaceLayout.idl
index 71344418bda3..ba923da41cc9 100644
--- a/offapi/com/sun/star/frame/XInplaceLayout.idl
+++ b/offapi/com/sun/star/frame/XInplaceLayout.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,32 +32,32 @@
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module frame {
 
-//=============================================================================
+//============================================================================= 
 
-/** special interface to support inplace editing of components inside
+/** special interface to support inplace editing of components inside 
     OpenOffice.org.
 
     @deprecated
 
     @since OOo 2.0.0
 */
-
+    
 interface XInplaceLayout : com::sun::star::uno::XInterface
 {
     /** sets an inplace menu to the container window of the attached frame.
-
+        
         @param InplaceMenuBarPointer
             must be a VCL menu bar pointer which is accessible within the
             layout manager process.
     */
     void setInplaceMenuBar( [in] hyper InplaceMenuBarPointer );
-
+    
     /** removes an inplace menu and sets back a previously created menu bar if one
-        has been set before.
+        has been set before.    
     */
     void resetInplaceMenuBar();
 };
diff --git a/offapi/com/sun/star/frame/XInterceptorInfo.idl b/offapi/com/sun/star/frame/XInterceptorInfo.idl
index de135a517171..6282fd281e6a 100644
--- a/offapi/com/sun/star/frame/XInterceptorInfo.idl
+++ b/offapi/com/sun/star/frame/XInterceptorInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XLayoutManager.idl b/offapi/com/sun/star/frame/XLayoutManager.idl
index 5699fe00687b..f280d8606c06 100644
--- a/offapi/com/sun/star/frame/XLayoutManager.idl
+++ b/offapi/com/sun/star/frame/XLayoutManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -60,34 +60,34 @@
 #include <com/sun/star/ui/XDockingAreaAcceptor.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module frame {
 
-//=============================================================================
+//============================================================================= 
 
-/** central interface to query for, create, destroy and manipulate user
+/** central interface to query for, create, destroy and manipulate user 
     interface elements which are bound to a layout manager.
 
     <p>
-    Every user interface element which is controlled by a layout manager has
+    Every user interface element which is controlled by a layout manager has 
     a unique identifier called resource URL.
-
-    A resourcce URL must meet the following syntax:
-    "private:resource/$type/$name". It is only allowed to use ascii characters
+    
+    A resourcce URL must meet the following syntax: 
+    "private:resource/$type/$name". It is only allowed to use ascii characters 
     for type and name.
 
     Currently the following user interface element types are defined:
     <ul>
-        <li><b>menubar</b>A configurable user interface element representing
+        <li><b>menubar</b>A configurable user interface element representing 
         a menu bar.</li>
-        <li><b>popupmenu</b>A configurable user interface element representing
+        <li><b>popupmenu</b>A configurable user interface element representing 
         a popup menu.</li>
-        <li><b>toolbar</b>A configurable user interface element a tool
+        <li><b>toolbar</b>A configurable user interface element a tool 
         bar.</li>
-        <li><b>statusbar</b>A configurable user interfave element representing
+        <li><b>statusbar</b>A configurable user interfave element representing 
         a status bar.</li>
-        <li><b>floater</b>A basic user interface element representing a
+        <li><b>floater</b>A basic user interface element representing a 
         floating window.</li>
     </ul>
 
@@ -97,28 +97,28 @@ module com { module sun { module star { module frame {
 
     @since OOo 2.0.0
 */
-
+    
 interface XLayoutManager : com::sun::star::uno::XInterface
 {
-    /** attaches a <type scope="com::sun::star::frame">XFrame</type> to a layout manager.
-
+    /** attaches a <type scope="com::sun::star::frame">XFrame</type> to a layout manager. 
+        
         @param Frame
             specifies the frame that should be attached to the layout manager
-
+            
         <p>
-        A layout manager needs a <type scope="com::sun::star::frame">XFrame</type> to be
+        A layout manager needs a <type scope="com::sun::star::frame">XFrame</type> to be 
         able to work. Without a it no user interface elements can be created.
         </p>
     */
     void attachFrame( [in] com::sun::star::frame::XFrame Frame );
-
-    /** resets the layout manager and remove all of its internal user interface
+    
+    /** resets the layout manager and remove all of its internal user interface 
         elements.
 
         <p>
         This call should be handled with care as all user interface elements will
-        be destroyed and the layout manager is reseted to a state after a
-        <member>attachFrame</member> has been made. That means an attached frame
+        be destroyed and the layout manager is reseted to a state after a 
+        <member>attachFrame</member> has been made. That means an attached frame 
         which has been set by <member>attachFrame</member> is not released.
         The layout manager itself calls reset after a component has been attached
         or reattached to a frame.
@@ -127,9 +127,9 @@ interface XLayoutManager : com::sun::star::uno::XInterface
     void reset();
 
     /** provides the current docking area size of the layout manager.
-
+        
         @return
-            The <type scope="com::sun::star::awt">Rectangle</type> contains pixel values. The
+            The <type scope="com::sun::star::awt">Rectangle</type> contains pixel values. The 
             members of <type scope="com::sun::star::awt">Rectangle</type> are filled as following:
             <ul>
                 <li>X      = docking area on left side (in pixel)</li>
@@ -140,12 +140,12 @@ interface XLayoutManager : com::sun::star::uno::XInterface
     */
     com::sun::star::awt::Rectangle getCurrentDockingArea();
 
-    /** retrieves the current docking area acceptor that controls the border space of the frame's
+    /** retrieves the current docking area acceptor that controls the border space of the frame's 
         container window.
 
         @return
             current docking area acceptor which controls the border space of frame's container window.
-
+        
         <p>
         A docking area acceptor retrieved by this method is owned by the layout manager. It is not
         allowed to dispose this object, it will be destroyed on reference count!
@@ -157,7 +157,7 @@ interface XLayoutManager : com::sun::star::uno::XInterface
 
         @param xDockingAreaAcceptor
             a docking area acceptor which controls the border space of frame's container window.
-
+        
         <p>
         A docking area acceptor decides if the layout manager can use requested border space for
         docking windows. If the acceptor denies the requested space the layout manager automatically
@@ -167,41 +167,41 @@ interface XLayoutManager : com::sun::star::uno::XInterface
         </p>
     */
     void setDockingAreaAcceptor( [in] com::sun::star::ui::XDockingAreaAcceptor xDockingAreaAcceptor );
-
+    
     /** creates a new user interface element.
 
         @param ResourceURL
-            specifies which user interface element should be created. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be created. A resourcce URL must meet the following 
+            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and 
             name.
     */
     void createElement( [in] string ResourceURL );
-
-    /** destroys a user interface element.
-
+    
+    /** destroys a user interface element. 
+        
         @param ResourceURL
-            specifies which user interface element should be destroyed. A resourcce URL must meet
+            specifies which user interface element should be destroyed. A resourcce URL must meet 
             the following syntax: "private:resource/$type/$name". It is only allowed to use ascii
             characters for type and name.
     */
     void destroyElement( [in] string ResourceURL );
-
+    
     /** request to make a user interface element visible if it is not in hidden state.
 
         @param ResourceURL
-            specifies which user interface element should be made visible. A resourcce URL must
-            meet the following syntax: "private:resource/$type/$name". It is only allowed to use
-            ascii characters for type and
+            specifies which user interface element should be made visible. A resourcce URL must 
+            meet the following syntax: "private:resource/$type/$name". It is only allowed to use 
+            ascii characters for type and 
             name.
-
+        
         @return
-            returns <TRUE/> if the user interface element could be made visible, otherwise
+            returns <TRUE/> if the user interface element could be made visible, otherwise 
             <FALSE/> will be returned.
 
         <p>
-        If a user interface element should forced to the visible state
-        <member>XLayoutManager::showElement</member> should be used. This function can be
-        used for context dependent elements which should respect a the current visibility
+        If a user interface element should forced to the visible state 
+        <member>XLayoutManager::showElement</member> should be used. This function can be 
+        used for context dependent elements which should respect a the current visibility 
         state.
         </p>
     */
@@ -210,17 +210,17 @@ interface XLayoutManager : com::sun::star::uno::XInterface
     /** retrieves a user interface element which has been created before.
 
         @param ResourceURL
-            specifies which user interface element should be retrieved. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be retrieved. A resourcce URL must meet the following 
+            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and 
             name.
-
+        
         <p>
-        The layout manager instance is owner of the returned user interface element. That means that the life time of
+        The layout manager instance is owner of the returned user interface element. That means that the life time of 
         the user interface element is controlled by the layout manager. It can be disposed at every time!
         </p>
     */
     com::sun::star::ui::XUIElement getElement( [in] string ResourceURL );
-
+    
     /** retrieves all user interface elements which are currently instanciated.
 
         @return
@@ -228,7 +228,7 @@ interface XLayoutManager : com::sun::star::uno::XInterface
             interface.
 
         <p>
-        The layout manager instance is owner of the returned user interface elements. That means that the life time of
+        The layout manager instance is owner of the returned user interface elements. That means that the life time of 
         the user interface elements is controlled by the layout manager. They can be disposed at every time!
         </p>
     */
@@ -237,32 +237,32 @@ interface XLayoutManager : com::sun::star::uno::XInterface
     /** shows a user interface element.
 
         @param ResourceURL
-            specifies which user interface element should be shown. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be shown. A resourcce URL must meet the following 
+            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and 
             name.
-
+        
         @return
             returns <TRUE/> if the user interface element has been shown, otherwise <FALSE/> will be returned.
     */
     boolean showElement( [in] string ResourceURL );
-
+    
     /** hides a user interface element.
 
         @param ResourceURL
-            specifies which user interface element should be hidden. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be hidden. A resourcce URL must meet the following 
+            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and 
             name.
-
+        
         @return
             returns <TRUE/> if the user interface element has been hidden, otherwise <FALSE/> will be returned.
     */
     boolean hideElement( [in] string ResourceURL );
-
+    
     /** docks a window based user interface element to a specified docking area.
 
         @param ResourceURL
-            specifies which user interface element should be docked. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be docked. A resourcce URL must meet the following 
+            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and 
             name.
 
         @param DockingArea
@@ -270,44 +270,44 @@ interface XLayoutManager : com::sun::star::uno::XInterface
 
         @param Pos
             specifies the position inside the docking area.
-
+            
         @return
             returns <TRUE/> if the user interface element has been docked, otherwise <FALSE/> will be returned.
 
         @see com::sun::star::ui::DockingArea
     */
     boolean dockWindow( [in] string ResourceURL, [in] com::sun::star::ui::DockingArea DockingArea, [in] com::sun::star::awt::Point Pos );
-
+    
     /** docks all windows which are member of the provided user interface element type.
 
         @param nElementType
             specifies which user interface element type should be docked.
 
         @return
-            returns <TRUE/> if all user interface elements of the requested type could be
+            returns <TRUE/> if all user interface elements of the requested type could be 
             docked, otherwise <FALSE/> will be returned.
 
         @see com::sun::star::ui::UIElementType
     */
     boolean dockAllWindows( [in] short nElementType );
-
+    
     /** forces a window based user interface element to float.
 
         @param ResourceURL
-            specifies which user interface element should be float. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be float. A resourcce URL must meet the following 
+            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and 
             name.
 
         @return
             returns <TRUE/> if the user interface element has been docked, otherwise <FALSE/> will be returned.
     */
     boolean floatWindow( [in] string ResourceURL );
-
+    
     /** locks a window based user interface element if it's in a docked state.
 
         @param ResourceURL
-            specifies which user interface element should be locked. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be locked. A resourcce URL must meet the following 
+            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and 
             name.
 
         @return
@@ -318,12 +318,12 @@ interface XLayoutManager : com::sun::star::uno::XInterface
     /** unlocks a window based user interface element if it's in a docked state.
 
         @param ResourceURL
-            specifies which user interface element should be unlocked. A resourcce URL must
-            meet the following syntax: "private:resource/$type/$name". It is only allowed
+            specifies which user interface element should be unlocked. A resourcce URL must 
+            meet the following syntax: "private:resource/$type/$name". It is only allowed 
             to use ascii characters for type and name.
 
         @return
-            returns <TRUE/> if the user interface element has been unlocked, otherwise
+            returns <TRUE/> if the user interface element has been unlocked, otherwise 
             <FALSE/> will be returned.
     */
     boolean unlockWindow( [in] string ResourceURL );
@@ -331,8 +331,8 @@ interface XLayoutManager : com::sun::star::uno::XInterface
     /** sets a new size for a window based user interface element.
 
         @param ResourceURL
-            specifies which user interface element should be resized. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be resized. A resourcce URL must meet the following 
+            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and 
             name.
 
         @param Size
@@ -344,12 +344,12 @@ interface XLayoutManager : com::sun::star::uno::XInterface
         </p>
     */
     void setElementSize( [in] string ResourceURL, [in] com::sun::star::awt::Size Size );
-
+    
     /** sets a new position for a window based user interface element.
 
         @param ResourceURL
-            specifies which user interface element should be moved. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be moved. A resourcce URL must meet the following 
+            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and 
             name.
 
         @param Pos
@@ -361,12 +361,12 @@ interface XLayoutManager : com::sun::star::uno::XInterface
         </p>
     */
     void setElementPos( [in] string ResourceURL, [in] com::sun::star::awt::Point Pos );
-
+    
     /** sets a new position and size for a window based user interface element.
 
         @param ResourceURL
-            specifies which user interface element should be moved and resized. A resourcce URL must meet the following
-            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies which user interface element should be moved and resized. A resourcce URL must meet the following 
+            syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and 
             name.
 
         @param Pos
@@ -376,111 +376,111 @@ interface XLayoutManager : com::sun::star::uno::XInterface
             specifies the new position in pixel.
 
         <p>
-        It is up to the layout manager to decide if the user interface element can be moved and resized. The new position and size can
+        It is up to the layout manager to decide if the user interface element can be moved and resized. The new position and size can 
         be retrieved by calling <member>getElementPos</member> and <member>getElementSize</member>.
         </p>
     */
     void setElementPosSize( [in] string ResourceURL, [in] com::sun::star::awt::Point Pos, [in] com::sun::star::awt::Size Size );
-
+    
     /** retrieves the current visibility state of a window based user interface element.
 
         @param ResourceURL
-            specifies for which user interface element the visibility state should be retrieved. A resource URL must meet
-            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies for which user interface element the visibility state should be retrieved. A resource URL must meet 
+            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and 
             name.
-
+        
         @return
             <TRUE/> if the user interface element is visible, otherwise <FALSE/>.
     */
     boolean isElementVisible( [in] string ResourceURL );
-
+    
     /** retrieves the current floating state of a window based user interface element.
-
+        
         @param ResourceURL
-            specifies for which user interface element the floating state should be retrieved. A resource URL must meet
-            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies for which user interface element the floating state should be retrieved. A resource URL must meet 
+            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and 
             name.
-
+        
         @return
             <TRUE/> if the user interface element is floating, otherwise <FALSE/>.
     */
     boolean isElementFloating( [in] string ResourceURL );
-
+    
     /** retrieves the current docking state of a window based user interface element.
-
+        
         @param ResourceURL
-            specifies for which user interface element the docking state should be retrieved. A resource URL must meet
-            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies for which user interface element the docking state should be retrieved. A resource URL must meet 
+            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and 
             name.
-
+        
         @return
             <TRUE/> if the user interface element is docked, otherwise <FALSE/>.
     */
     boolean isElementDocked( [in] string ResourceURL );
-
+    
     /** retrieves the current lock state of a window based user interface element.
-
+        
         @param ResourceURL
-            specifies for which user interface element the lock state should be retrieved. A resource URL must meet
-            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies for which user interface element the lock state should be retrieved. A resource URL must meet 
+            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and 
             name.
-
+        
         @return
             <TRUE/> if the user interface element is locked, otherwise <FALSE/>.
     */
     boolean isElementLocked( [in] string ResourceURL  );
 
     /** retrieves the current size of a window based user interface element.
-
+        
         @param ResourceURL
-            specifies for which user interface element the current size should be retrieved. A resource URL must meet
-            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies for which user interface element the current size should be retrieved. A resource URL must meet 
+            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and 
             name.
-
+        
         @return
             the size in pixel of the user interface element. A non-window based user interface element provides a zero size.
     */
     com::sun::star::awt::Size getElementSize( [in] string ResourceURL );
-
+    
     /** retrieves the current pixel position of a window based user interface element.
-
+        
         @param ResourceURL
-            specifies for which user interface element the current position should be retrieved. A resource URL must meet
-            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and
+            specifies for which user interface element the current position should be retrieved. A resource URL must meet 
+            the following syntax: "private:resource/$type/$name". It is only allowed to use ascii characters for type and 
             name.
-
+        
         @return
             the size in pixel of the user interface element. A non-window based user interface element provides a zero size.
     */
     com::sun::star::awt::Point getElementPos( [in] string ResourceURL );
-
+    
     /** prohibit all layout updates until unlock is called again.
 
         <p>
-        This call can be used to speed up the creation process of serveral user interface elements. Otherwise the layout manager
+        This call can be used to speed up the creation process of serveral user interface elements. Otherwise the layout manager 
         would calculate the layout for every creation.
         </p>
     */
     void lock();
-
+    
     /** permit layout updates again.
-
+        
         <p>
         This function should be called to permit layout updates. The layout manager starts to calculate the new layout after
         this call.
         </p>
     */
     void unlock();
-
+    
     /** forces a complete new layouting of all user interface elements.
     */
     void doLayout();
 
-    /** sets the layout manager to invisible state and hides all user interface elements.
+    /** sets the layout manager to invisible state and hides all user interface elements. 
 
         <p>
-        A layout manager can be set to invisible state to force it to hide all of its
-        user interface elements. If another component wants to use the window for its
+        A layout manager can be set to invisible state to force it to hide all of its 
+        user interface elements. If another component wants to use the window for its 
         own user interface elements it can use this function. This function is normally
         used to implement inplace editing.
         </p>
@@ -494,8 +494,8 @@ interface XLayoutManager : com::sun::star::uno::XInterface
     /** retrieves the visibility state of a layout manager.
 
         <p>
-        A layout manager can be set to invisible state to force it to hide all of its
-        user interface elements. If another component wants to use the window for its
+        A layout manager can be set to invisible state to force it to hide all of its 
+        user interface elements. If another component wants to use the window for its 
         own user interface elements it can use this function. This function is normally
         used to implement inplace editing.
         </p>
diff --git a/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl b/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
index b79827dd4b3e..53d179139159 100644
--- a/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
+++ b/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,11 +53,11 @@ interface XLayoutManagerEventBroadcaster : com::sun::star::uno::XInterface
      */
     void addLayoutManagerEventListener( [in] XLayoutManagerListener aLayoutManagerListener );
 
-    /** removes a layout manager event listener from the object's listener
+    /** removes a layout manager event listener from the object's listener 
         list.
 
         @param aLayoutManagerListener
-            a listener that don't want to receive events regarding user
+            a listener that don't want to receive events regarding user 
             interface elements that are controlled by a layout manager.
      */
     void removeLayoutManagerEventListener( [in] XLayoutManagerListener aLayoutManagerListener );
diff --git a/offapi/com/sun/star/frame/XLayoutManagerListener.idl b/offapi/com/sun/star/frame/XLayoutManagerListener.idl
index 593ba510c08c..dbdc68ed6ce1 100644
--- a/offapi/com/sun/star/frame/XLayoutManagerListener.idl
+++ b/offapi/com/sun/star/frame/XLayoutManagerListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,9 @@
 #ifndef __com_sun_star_frame_XLayoutManagerListener_idl__
 #define __com_sun_star_frame_XLayoutManagerListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif  
 
 //=============================================================================
 
@@ -38,25 +38,25 @@ module com {  module sun {  module star {  module frame {
 //=============================================================================
 /** makes it possible to receive events from a layout manager.
 
-    <p>Events are provided <strong>only</strong> for notification
-    purposes only.  All operations are handled interally by the
-    layout manager component, so that GUI layout works properly
-    regardless of whether a component registers such a listener
+    <p>Events are provided <strong>only</strong> for notification 
+    purposes only.  All operations are handled interally by the 
+    layout manager component, so that GUI layout works properly 
+    regardless of whether a component registers such a listener 
     or not.</p>
 
     @see ::com::sun::star::frame::LayoutManager
     @see ::com::sun::star::frame::LayoutManagerEvents
-
+    
     @since OOo 2.0.0
  */
-interface XLayoutManagerListener : com::sun::star::lang::XEventListener
+interface XLayoutManagerListener : com::sun::star::lang::XEventListener 
 {
     //=============================================================================
     /** is invoked when a layout manager has made a certain operation.
 
         @param aSource
             reference to the layout manager which invoked the event.
-
+        
         @param eLayoutEvent
             identifies the layout event that has occured.
 
diff --git a/offapi/com/sun/star/frame/XLoadEventListener.idl b/offapi/com/sun/star/frame/XLoadEventListener.idl
index c682114f9234..c7963d43c712 100644
--- a/offapi/com/sun/star/frame/XLoadEventListener.idl
+++ b/offapi/com/sun/star/frame/XLoadEventListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XLoadable.idl b/offapi/com/sun/star/frame/XLoadable.idl
index 073ca9a55f34..e8ab52fc7b5f 100644
--- a/offapi/com/sun/star/frame/XLoadable.idl
+++ b/offapi/com/sun/star/frame/XLoadable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XMenuBarAcceptor.idl b/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
index 7eec81bb5308..51320a28fdf5 100644
--- a/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
+++ b/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,11 +36,11 @@
 #include <com/sun/star/awt/XMenuBar.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module frame {
 
-//=============================================================================
+//============================================================================= 
 
 /** provides function to update a menu bar for inplace editing.
 
@@ -52,10 +52,10 @@ module com { module sun { module star { module frame {
 interface XMenuBarAcceptor : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** update menu bar according to the current frame mode. This is used in
-        inplace editing mode where we have to merge our own menu into the
+    /** update menu bar according to the current frame mode. This is used in 
+        inplace editing mode where we have to merge our own menu into the 
         container applications menu.
-
+       
        @param xMenuBar
             the menu bar that should be merged with current one.
     */
diff --git a/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl b/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
index b7c6a1b13c19..5ae56391a944 100644
--- a/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
+++ b/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,11 +36,11 @@
 #include <com/sun/star/frame/XDispatchProvider.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module frame {
 
-//=============================================================================
+//============================================================================= 
 
 /** provides functions to set and remove a merged menu bar for inplace
     editing.
@@ -56,19 +56,19 @@ interface XMenuBarMergingAcceptor : com::sun::star::uno::XInterface
             specifies the merged menu bar.
 
         <p>
-        This function is normally used to provide inplace editing where
-        functions from two application parts, container application and
-        embedded object, are available to the user simultaneously. A menu
-        bar which is set by this method has a higher priority than others
-        created by <type scope="com::sun::star::frame">XLayoutManager</type>
+        This function is normally used to provide inplace editing where 
+        functions from two application parts, container application and 
+        embedded object, are available to the user simultaneously. A menu 
+        bar which is set by this method has a higher priority than others 
+        created by <type scope="com::sun::star::frame">XLayoutManager</type> 
         interface. Settings of a merged menu bar cannot be retrieved.
         </p>
-
+        
         @see com::sun::star::ui::UIElementSettings
         @see com::sun::star::frame::XDispatchProvider
         @see com::sun::star::frame::XLayoutManager
     */
-    boolean setMergedMenuBar(
+    boolean setMergedMenuBar( 
         [in] ::com::sun::star::container::XIndexAccess xMergedMenuBar );
 
     /** removes a previously set merged menu bar and sets a previously created
diff --git a/offapi/com/sun/star/frame/XModel.idl b/offapi/com/sun/star/frame/XModel.idl
index 7ae603a38df9..ce6bc3443646 100644
--- a/offapi/com/sun/star/frame/XModel.idl
+++ b/offapi/com/sun/star/frame/XModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XModel2.idl b/offapi/com/sun/star/frame/XModel2.idl
index 0b18ff02be1f..8993cc7a9a76 100644
--- a/offapi/com/sun/star/frame/XModel2.idl
+++ b/offapi/com/sun/star/frame/XModel2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,12 +39,12 @@
 
 //=============================================================================
 /** extends interface XModel.
-
+ 
     The foloowing functions are added:
-
+ 
     - enumeration of all currently connected controller objects.
       (not getCurrentController() only, which depends on focus)
-
+ 
     - establish new view controller factory methods, which will make
       it possible to create new views for this model.
  */
@@ -96,25 +96,25 @@ interface XModel2 : com::sun::star::frame::XModel
 
         <p>Effectively, this method is equivalent to calling <member>createView</member> with
         the <code>ViewName</code> being <code>&quot;Default&quot;</code>.</p>
-
+    
         @param Frame
                used to place the new created view there
-
+               
         @return the new view controller instance
-
+        
         @throws ::com::sun::star::lang::IllegalArgumentException
                 if one of the given parameter was wrong
-
+                
         @throws ::com::sun::star::uno::Exception
                 if creation of a new view failed by other reasons
      */
     com::sun::star::frame::XController2 createDefaultViewController( [in]  com::sun::star::frame::XFrame Frame )
         raises (com::sun::star::lang::IllegalArgumentException,
                 com::sun::star::uno::Exception                );
-
+               
     //-------------------------------------------------------------------------
     /** creates a new view instance classified by the specified name and arguments.
-
+    
         <p>The newly created controller must not be connected with the document and the
         frame. That is, you should neither call <member>XFrame::setComponent</member>, nor
         <member>XController::attachFrame</member>, nor <member>XController::attachModel</member>,
@@ -123,18 +123,18 @@ interface XModel2 : com::sun::star::frame::XModel
 
         @param ViewName
                classified name of instance
-
+               
         @param Arguments
                arguments used for creation
-
+               
         @param Frame
                used to place the new created view there
-
+               
         @return the new view controller instance
-
+        
         @throws ::com::sun::star::lang::IllegalArgumentException
                 if one of the given parameter was wrong
-
+                
         @throws ::com::sun::star::uno::Exception
                 if creation of a new view failed by other reasons
      */
diff --git a/offapi/com/sun/star/frame/XModule.idl b/offapi/com/sun/star/frame/XModule.idl
index c302892d5df5..b6ad30a0a5fe 100644
--- a/offapi/com/sun/star/frame/XModule.idl
+++ b/offapi/com/sun/star/frame/XModule.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@ module com { module sun { module star { module frame {
     </p>
 
     @see XModuleManager
-
+    
     @since OOo 2.3.0
  */
 interface XModule : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/frame/XModuleManager.idl b/offapi/com/sun/star/frame/XModuleManager.idl
index 7c8527c84d73..066ff40d2cca 100644
--- a/offapi/com/sun/star/frame/XModuleManager.idl
+++ b/offapi/com/sun/star/frame/XModuleManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ module com { module sun { module star { module frame {
 
 //===============================================
 /** can be used to identify office modules.
-
+    
     @since OOo 2.0.0
  */
 interface XModuleManager : com::sun::star::uno::XInterface
@@ -54,17 +54,17 @@ interface XModuleManager : com::sun::star::uno::XInterface
     //-------------------------------------------
     /**
        @short  identifies the given module.
-
+     
        @descr  This identifier can then be used at the service <type>ModuleManager</type>
                to get more information about this module.
-
+     
                For identification the interface <type scope="com::sun::star::lang">XServiceInfo</type>
                is requested on the given module. Because all module service registrations must be unique
                this value can be queried and checked against the configuration.
 
                Since OOo 2.3.0 also the optional interface <type>XModule</type> will be used.
                If its exists it will be preferred.
-
+     
        @param  Module
                Possible objects for this parameter can be the following one:
                <ul>
@@ -84,7 +84,7 @@ interface XModuleManager : com::sun::star::uno::XInterface
                        identification directly.
                    </li>
                </ul>
-
+     
        @throws <type scope="com::sun::star::lang">IllegalArgumentException</type>
                if the parameter Module is:
                <ul>
@@ -93,12 +93,12 @@ interface XModuleManager : com::sun::star::uno::XInterface
                        XFrame, XControllerm, XModel</li>
                    <li>or does not provide the needed interface XServiceInfo.</li>
                </ul>
-
+     
        @throws <type>UnknownModuleException</type>
                if the given module could not be identified.
                Note: If the module represent a XFrame instance with does not contain
                a document, this exception is thrown too!
-
+     
        @return An identifier for the given module.
                Note: This value is valie everytimes. Error will be transported
                by thrown exceptions!
@@ -106,8 +106,8 @@ interface XModuleManager : com::sun::star::uno::XInterface
     string identify( [in] ::com::sun::star::uno::XInterface Module )
         raises(::com::sun::star::lang::IllegalArgumentException,
                                        UnknownModuleException  );
-
-
+                                       
+                                           
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/frame/XNotifyingDispatch.idl b/offapi/com/sun/star/frame/XNotifyingDispatch.idl
index 2d1a9bbc203d..882dfa822c6c 100644
--- a/offapi/com/sun/star/frame/XNotifyingDispatch.idl
+++ b/offapi/com/sun/star/frame/XNotifyingDispatch.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XPopupMenuController.idl b/offapi/com/sun/star/frame/XPopupMenuController.idl
index ffc7db109f4a..b06d2a2b34b3 100644
--- a/offapi/com/sun/star/frame/XPopupMenuController.idl
+++ b/offapi/com/sun/star/frame/XPopupMenuController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,22 +32,22 @@
 #include <com/sun/star/awt/XPopupMenu.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module frame {
 
-//=============================================================================
+//============================================================================= 
 
 /** provides data to a popup menu controller implementation to
     fill and update a popup menu dynamically.
-
+    
     <p>
-    A popup menu controller gets a <type scope="com::sun::star::awt">XPopupMenu</type>
-    from its parent menu implementation. The controller has to fill this popup
-    menu with a set of menu items and/or sub menus. The parent menu implementation
+    A popup menu controller gets a <type scope="com::sun::star::awt">XPopupMenu</type> 
+    from its parent menu implementation. The controller has to fill this popup 
+    menu with a set of menu items and/or sub menus. The parent menu implementation 
     briefs the controller whenever the popup menu gets activated by a user.
     </p>
-
+    
     @since OOo 2.0.0
 */
 interface XPopupMenuController : com::sun::star::uno::XInterface
@@ -62,12 +62,12 @@ interface XPopupMenuController : com::sun::star::uno::XInterface
     void setPopupMenu( [in] com::sun::star::awt::XPopupMenu PopupMenu );
 
     /** briefs the popup menu controller to update the contents of the provided
-        popup menu to reflect the current state.
-
-        <p>A controller should <b>never</b> update the popup menu structure on its
-        own to prevent performance problems. A better way would be that a controller
-        registers itself as status listener to for a command URL and immediately
-        deregister after that. Therefor status updates will not be send regularly
+        popup menu to reflect the current state. 
+        
+        <p>A controller should <b>never</b> update the popup menu structure on its 
+        own to prevent performance problems. A better way would be that a controller 
+        registers itself as status listener to for a command URL and immediately 
+        deregister after that. Therefor status updates will not be send regularly 
         for a non visible popup menu.
         </p>
     */
@@ -76,6 +76,6 @@ interface XPopupMenuController : com::sun::star::uno::XInterface
 
 }; }; }; };
 
-//=============================================================================
+//============================================================================= 
 
 #endif
diff --git a/offapi/com/sun/star/frame/XRecordableDispatch.idl b/offapi/com/sun/star/frame/XRecordableDispatch.idl
index 189dfb04ab5a..8ece65792443 100644
--- a/offapi/com/sun/star/frame/XRecordableDispatch.idl
+++ b/offapi/com/sun/star/frame/XRecordableDispatch.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XSessionManagerClient.idl b/offapi/com/sun/star/frame/XSessionManagerClient.idl
index 8d1f51d4632a..1fe891935395 100644
--- a/offapi/com/sun/star/frame/XSessionManagerClient.idl
+++ b/offapi/com/sun/star/frame/XSessionManagerClient.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ module com {  module sun {  module star {  module frame {
     {
 
         /** addSessionManagerListener registers a listener for session management events
-
+            
         @param xListener
         listener for session management events
 
@@ -54,7 +54,7 @@ module com {  module sun {  module star {  module frame {
         [oneway] void addSessionManagerListener( [in] XSessionManagerListener xListener );
 
         /** removeSessionManagerListener deregisters a listener for session events
-
+        
         @param xListener
             listener to be removed
 
diff --git a/offapi/com/sun/star/frame/XSessionManagerListener.idl b/offapi/com/sun/star/frame/XSessionManagerListener.idl
index 2ee33c160240..7159b38b2c9d 100644
--- a/offapi/com/sun/star/frame/XSessionManagerListener.idl
+++ b/offapi/com/sun/star/frame/XSessionManagerListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,16 +40,16 @@ module com {  module sun {  module star {  module frame {
         /** doSave gets called when a save event was issued by the session manager
         the listener should do what is necessary to restore
         the current state of the application
-
+        
         <p>If the listener desires to interact with the user
         it must first issue a user interaction request and
         only do so if interaction was granted</p>
-
+        
         <p>When the save request is processed (with or without
         user interaction) the listener must call
         <member>XSessionManagerClient::saveDone()</member>
         on the session manager client service object.</p>
-
+        
         @param bShutdown
         <TRUE/> if a shutdown is in progress,
         <FALSE/> if just a save point was requested
@@ -57,13 +57,13 @@ module com {  module sun {  module star {  module frame {
         @param bCancelable
         <TRUE/> if a shutdown in progress can be canceled by the listener,
         <FALSE/> else
-
+        
         <p>the listener may choose to ignore the <member>saveDone</member>
         event in case no real shutdown is in progress. He
         still has to call
         <member>XSessionManagerClient::saveDone()</member>
         in that case.</p>
-
+        
         @see XSessionManagerClient
         @see XSessionManagerClient::saveDone()
         */
@@ -95,7 +95,7 @@ module com {  module sun {  module star {  module frame {
         /** returns true, if a session was restored
         */
         boolean doRestore();
-    };
+    }; 
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/frame/XSessionManagerListener2.idl b/offapi/com/sun/star/frame/XSessionManagerListener2.idl
index 233b7614ad2e..8db874ded149 100644
--- a/offapi/com/sun/star/frame/XSessionManagerListener2.idl
+++ b/offapi/com/sun/star/frame/XSessionManagerListener2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@ module com {  module sun {  module star {  module frame {
         further UI will usually be impossible and must be avoided.
         */
         [oneway] void doQuit();
-    };
+    }; 
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/frame/XStatusListener.idl b/offapi/com/sun/star/frame/XStatusListener.idl
index 250e22c2141d..7bb3bd22e592 100644
--- a/offapi/com/sun/star/frame/XStatusListener.idl
+++ b/offapi/com/sun/star/frame/XStatusListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XStatusbarController.idl b/offapi/com/sun/star/frame/XStatusbarController.idl
index d9e035ad03bc..466372817527 100644
--- a/offapi/com/sun/star/frame/XStatusbarController.idl
+++ b/offapi/com/sun/star/frame/XStatusbarController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,68 +52,68 @@ module com {  module sun {  module star {  module frame {
     to users within a status bar.
 
     <p>
-    A generic status bar field is represented as a simple text field. A status
-    bar controller can be added to a Statusbar and provide information or
+    A generic status bar field is represented as a simple text field. A status 
+    bar controller can be added to a Statusbar and provide information or 
     functions with a more sophisticated user interface.<br/>
-    A typical example for status bar controller is a zoom chooser. It shows
-    the current zoom and provides general zoom levels on a popup menu
+    A typical example for status bar controller is a zoom chooser. It shows 
+    the current zoom and provides general zoom levels on a popup menu 
     that can be activated by a mouse action for context menus.
     <p>
 
     @see com::sun::star::frame::XDispatchProvider
-
+    
     @since OOo 2.0.0
  */
 interface XStatusbarController : ::com::sun::star::uno::XInterface
 {
     //=============================================================================
-    /** is called by a status bar if the mouse position is within the controller
-        and a mouse button has been pressed. If the controller has captured the
-        mouse input this function is also called when the mouse position is not
+    /** is called by a status bar if the mouse position is within the controller 
+        and a mouse button has been pressed. If the controller has captured the 
+        mouse input this function is also called when the mouse position is not 
         within the controller.
-
+    
         @param aMouseEvent
             current information about the mouse pointer.
 
         @return
-            return <TRUE/> if the event should not be processed and <FALSE/>
+            return <TRUE/> if the event should not be processed and <FALSE/> 
             if the event should be processed by the status bar.
     */
     boolean mouseButtonDown( [in] ::com::sun::star::awt::MouseEvent aMouseEvent );
 
     //=============================================================================
-    /** is called by a status bar if the mouse position is within the controller
-        and a mouse has been moved. If the controller has captured the
-        mouse input this function is also called when the mouse position is not
+    /** is called by a status bar if the mouse position is within the controller 
+        and a mouse has been moved. If the controller has captured the 
+        mouse input this function is also called when the mouse position is not 
         within the controller.
-
+    
         @param aMouseEvent
             current information about the mouse pointer.
 
         @return
-            return <TRUE/> if the event should not be processed and <FALSE/>
+            return <TRUE/> if the event should not be processed and <FALSE/> 
             if the event should be processed by the status bar.
     */
     boolean mouseMove( [in] ::com::sun::star::awt::MouseEvent aMouseEvent );
 
     //=============================================================================
-    /** is called by a status bar if the mouse position is within the controller
-        and a mouse button has been released. If the controller has captured the
-        mouse input this function is also called when the mouse position is not
+    /** is called by a status bar if the mouse position is within the controller 
+        and a mouse button has been released. If the controller has captured the 
+        mouse input this function is also called when the mouse position is not 
         within the controller.
-
+    
         @param aMouseEvent
             current information about the mouse pointer.
 
         @return
-            return <TRUE/> if the event should not be processed and <FALSE/>
+            return <TRUE/> if the event should not be processed and <FALSE/> 
             if the event should be processed by the status bar.
     */
     boolean mouseButtonUp( [in] ::com::sun::star::awt::MouseEvent aMouseEvent );
 
     //=============================================================================
     /** is called by a status bar if a command event is available for a controller.
-
+    
         @param aPos
             the current mouse position in pixel.
 
@@ -130,11 +130,11 @@ interface XStatusbarController : ::com::sun::star::uno::XInterface
                   [in] long nCommand,
                   [in] boolean bMouseEvent,
                   [in] any aData );
-
+    
     //=============================================================================
     /** is called by a status bar if the controller has to update the visual
         representation.
-
+    
         @param xGraphics
             a reference to a <type scope="com::sun::star::awt">XGraphics</type>
             which has to be used to update the visual representation.
@@ -153,19 +153,19 @@ interface XStatusbarController : ::com::sun::star::uno::XInterface
                 [in] ::com::sun::star::awt::Rectangle rOutputRectangle,
                 [in] long nItemId,
                 [in] long nStyle );
-
+    
     //=============================================================================
-    /** is called by a status bar if the user clicked with mouse into the
+    /** is called by a status bar if the user clicked with mouse into the 
         field of the corresponding control.
     */
     void click();
 
     //=============================================================================
-    /** is called by a status bar if the user double-clicked with mouse
+    /** is called by a status bar if the user double-clicked with mouse 
         into the field of the corresponding control.
     */
     void doubleClick();
-};
+};          
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/frame/XStorable.idl b/offapi/com/sun/star/frame/XStorable.idl
index 6c54b5b84c1c..be9a3b2fc775 100644
--- a/offapi/com/sun/star/frame/XStorable.idl
+++ b/offapi/com/sun/star/frame/XStorable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XStorable2.idl b/offapi/com/sun/star/frame/XStorable2.idl
index d33f49da8b8b..05beeca35156 100644
--- a/offapi/com/sun/star/frame/XStorable2.idl
+++ b/offapi/com/sun/star/frame/XStorable2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,7 +64,7 @@ published interface XStorable2: XStorable
             This method allows to specify some additional parametes for
             storing process.
         </p>
-
+    
         @param lArguments
             optional parameters for saving, can take values from subset of
             <type scope="com::sun::star::document">MediaDescriptor</type>
diff --git a/offapi/com/sun/star/frame/XSubToolbarController.idl b/offapi/com/sun/star/frame/XSubToolbarController.idl
index e0de8b9b8e2f..413674c81553 100644
--- a/offapi/com/sun/star/frame/XSubToolbarController.idl
+++ b/offapi/com/sun/star/frame/XSubToolbarController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,19 +40,19 @@
 
     <p>
     This interface is normally used to implement the toolbar button/sub-
-    toolbar function feature. It exchanges the function of the toolbar
-    button, that opened the sub-toolbar, with the one that has been selected
+    toolbar function feature. It exchanges the function of the toolbar 
+    button, that opened the sub-toolbar, with the one that has been selected 
     on the sub-toolbar.
     </p>
-
+    
     @see com::sun::star::frame::ToolbarController
-
+    
     @since OOo 2.0.0
  */
 interface XSubToolbarController : com::sun::star::uno::XInterface
 {
     //=============================================================================
-    /** if the controller features a sub-toolbar.
+    /** if the controller features a sub-toolbar. 
 
         @return
             <TRUE/> if the controller offers a sub toolbar, otherwise <FALSE/>.
@@ -68,13 +68,13 @@ interface XSubToolbarController : com::sun::star::uno::XInterface
     /** provides the resource URL of the sub-toolbar this controller opens.
 
         @return
-            name of the sub-toolbar this controller offers. A empty string
+            name of the sub-toolbar this controller offers. A empty string 
             will be interpreted as if this controller offers no sub-toolbar.
     */
     string getSubToolbarName();
 
     //=============================================================================
-    /** gets called to notify a controller that a sub-toolbar function has been
+    /** gets called to notify a controller that a sub-toolbar function has been 
         selected.
 
         @param aCommand
@@ -89,7 +89,7 @@ interface XSubToolbarController : com::sun::star::uno::XInterface
 
         <p>
         Only the controller instance is able to set the correct image for the
-        current function. A toolbar implementation will ask sub-toolbar
+        current function. A toolbar implementation will ask sub-toolbar 
         controllers to update their image whenever it has to update the images
         of all its buttons.
         </p>
diff --git a/offapi/com/sun/star/frame/XSynchronousDispatch.idl b/offapi/com/sun/star/frame/XSynchronousDispatch.idl
index b016e42932a3..90fe07159ef7 100644
--- a/offapi/com/sun/star/frame/XSynchronousDispatch.idl
+++ b/offapi/com/sun/star/frame/XSynchronousDispatch.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl b/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl
index 6a39bbfeaf98..71043497ab68 100644
--- a/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl
+++ b/offapi/com/sun/star/frame/XSynchronousFrameLoader.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XTask.idl b/offapi/com/sun/star/frame/XTask.idl
index f0a59b25bcb0..88c75626db09 100644
--- a/offapi/com/sun/star/frame/XTask.idl
+++ b/offapi/com/sun/star/frame/XTask.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XTasksSupplier.idl b/offapi/com/sun/star/frame/XTasksSupplier.idl
index deb1b3cbb757..7fca1dcf7e7c 100644
--- a/offapi/com/sun/star/frame/XTasksSupplier.idl
+++ b/offapi/com/sun/star/frame/XTasksSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XTerminateListener.idl b/offapi/com/sun/star/frame/XTerminateListener.idl
index 937e3523817b..073faf6e88bc 100644
--- a/offapi/com/sun/star/frame/XTerminateListener.idl
+++ b/offapi/com/sun/star/frame/XTerminateListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XTerminateListener2.idl b/offapi/com/sun/star/frame/XTerminateListener2.idl
index e4b000bc2f0a..8a2b1f3164da 100644
--- a/offapi/com/sun/star/frame/XTerminateListener2.idl
+++ b/offapi/com/sun/star/frame/XTerminateListener2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XTitle.idl b/offapi/com/sun/star/frame/XTitle.idl
index 0ce06aecb8f0..eb2b10198edb 100644
--- a/offapi/com/sun/star/frame/XTitle.idl
+++ b/offapi/com/sun/star/frame/XTitle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl b/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl
index 3bc851f4a557..a2228df939a1 100644
--- a/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl
+++ b/offapi/com/sun/star/frame/XTitleChangeBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XTitleChangeListener.idl b/offapi/com/sun/star/frame/XTitleChangeListener.idl
index 8d1c4c1d8019..9f510ba8b486 100644
--- a/offapi/com/sun/star/frame/XTitleChangeListener.idl
+++ b/offapi/com/sun/star/frame/XTitleChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XToolbarController.idl b/offapi/com/sun/star/frame/XToolbarController.idl
index 1ca2c8fa9278..cd0c7f20dbfd 100644
--- a/offapi/com/sun/star/frame/XToolbarController.idl
+++ b/offapi/com/sun/star/frame/XToolbarController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,8 +44,8 @@
     to users within a toolbar.
 
     <p>
-    A generic toolbar function is represented as a button which has a state
-    (enabled,disabled and selected, not selected). A toolbar controller can be added to a
+    A generic toolbar function is represented as a button which has a state 
+    (enabled,disabled and selected, not selected). A toolbar controller can be added to a 
     toolbar and provide information or functions with a more sophisticated user interface.<br/>
     A typical example for toolbar controller is a font chooser on a toolbar. It provides
     all available fonts in a dropdown box and shows the current chosen font.
@@ -60,7 +60,7 @@ interface XToolbarController : com::sun::star::uno::XInterface
     //=============================================================================
     /** provides a function to execute the command which is bound to the toolbar controller.
 
-        @param
+        @param 
             a combination of <type scope="com::sun::star::awt">KeyModifier</type> value that represent
             the current state of the modifier keys.
 
@@ -85,7 +85,7 @@ interface XToolbarController : com::sun::star::uno::XInterface
     /** requests to create a popup window for additional functions.
 
         @return
-            a <type scope="com::sun::star::awt">XWindow</type> which provides additional functions
+            a <type scope="com::sun::star::awt">XWindow</type> which provides additional functions 
             to the user. The reference must be empty if component does not want to provide a separate
             window.
     */
@@ -97,9 +97,9 @@ interface XToolbarController : com::sun::star::uno::XInterface
         @param Parent
             a <type scope="com::sun::star::awt">XWindow</type> which must be used as a parent
             for the requested item window.
-
+        
         @return
-            a <type scope="com::sun::star::awt">XWindow</type> which can be added to a toolbar.
+            a <type scope="com::sun::star::awt">XWindow</type> which can be added to a toolbar. 
             The reference must be empty if a component does not want to provide an item window.
     */
     com::sun::star::awt::XWindow createItemWindow( [in] com::sun::star::awt::XWindow Parent );
diff --git a/offapi/com/sun/star/frame/XToolbarControllerListener.idl b/offapi/com/sun/star/frame/XToolbarControllerListener.idl
index 6450d8ef910e..5e1e5b3a8b85 100644
--- a/offapi/com/sun/star/frame/XToolbarControllerListener.idl
+++ b/offapi/com/sun/star/frame/XToolbarControllerListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
 /** is used to notify a toolbar controller about events
 
     @see com::sun::star::frame::ToolbarController
-
+    
     @since OOo 2.0.0
  */
 interface XToolbarControllerListener : com::sun::star::uno::XInterface
@@ -50,7 +50,7 @@ interface XToolbarControllerListener : com::sun::star::uno::XInterface
             a string which identifies the function that has been selected.
 
         <p>
-        This notification is normally used to implement the toolbar button/sub-toolbar
+        This notification is normally used to implement the toolbar button/sub-toolbar 
         function feature. It exchanges the function of the toolbar button, that opened
         the sub-toolbar, with the one that has been selected on the sub-toolbar.
         </p>
diff --git a/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl b/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
index ec3259b4ad06..318576465688 100644
--- a/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
+++ b/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XUIControllerRegistration.idl b/offapi/com/sun/star/frame/XUIControllerRegistration.idl
index 3fcc74e4c320..2bd8e96e2687 100644
--- a/offapi/com/sun/star/frame/XUIControllerRegistration.idl
+++ b/offapi/com/sun/star/frame/XUIControllerRegistration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,22 +32,22 @@
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module frame {
 
-//=============================================================================
+//============================================================================= 
 
 /** is used to query, register and unregister user interface controller.
 
     <p>
-    A user interface controller can be registered for a command URL. A certain user
-    interface controller will be created when a user interface element contains a
+    A user interface controller can be registered for a command URL. A certain user 
+    interface controller will be created when a user interface element contains a 
     registered command URL.
-
+    
     @see PopupMenuControllerFactory
     </p>
-
+    
     @since OOo 2.0
  */
 
@@ -69,9 +69,9 @@ published interface XUIControllerRegistration : com::sun::star::uno::XInterface
     */
     boolean hasController( [in] string aCommandURL, [in] string aModelName );
 
-    /** function to create an association between a user interface controller implementation
+    /** function to create an association between a user interface controller implementation 
         and a command URL and optional module.
-
+        
         @param aCommandURL
             a command URL which specifies an action which shoudl be associated with a user
             interface controller.
@@ -85,10 +85,10 @@ published interface XUIControllerRegistration : com::sun::star::uno::XInterface
             with the OpenOffice service manager.
     */
     void registerController( [in] string aCommandURL, [in] string aModelName, [in] string aControllerImplementationName );
-
-    /** function to remove a previously defined association between a user interface controller
+    
+    /** function to remove a previously defined association between a user interface controller 
         implementation and a command URL and optional module.
-
+        
         @param aCommandURL
             a command URL which specifies an action which shoudl be associated with a user
             interface controller.
@@ -102,6 +102,6 @@ published interface XUIControllerRegistration : com::sun::star::uno::XInterface
 
 }; }; }; };
 
-//=============================================================================
+//============================================================================= 
 
 #endif
diff --git a/offapi/com/sun/star/frame/XUntitledNumbers.idl b/offapi/com/sun/star/frame/XUntitledNumbers.idl
index e2864d709c2f..c2da9cfc1c48 100644
--- a/offapi/com/sun/star/frame/XUntitledNumbers.idl
+++ b/offapi/com/sun/star/frame/XUntitledNumbers.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ constants UntitledNumbersConst
 {
     const long INVALID_NUMBER = 0;
 };
-
+ 
 //=============================================================================
 /** knows all currently used and all free numbers for using with untitled
     but counted objects.
@@ -72,13 +72,13 @@ interface XUntitledNumbers : com::sun::star::uno::XInterface
 
         If the reqistered component does not use such leased number any longer
         it has to be released so it can be used for new components.
-
+        
         Note: calling this method with an unknown (but normaly valid number)
               has to be ignored. No exceptions - no errors.
-
+        
         @param  nNumber
                 specify number for release.
-
+                
         @throws [IllegalArgumentException]
                 if the given number is the special value 0.
      */
@@ -88,24 +88,24 @@ interface XUntitledNumbers : com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /** does the same then releaseNumber () but it searches the corresponding
         number for the specified component and deregister it.
-
+        
         @param  xComponent
                 the component for deregistration.
-
+                
         @throws [IllegalArgumentException]
                 if an invalid object reference was provided to this method.
      */
     void releaseNumberForComponent ( [in] com::sun::star::uno::XInterface xComponent )
         raises (com::sun::star::lang::IllegalArgumentException);
-
+        
     //-------------------------------------------------------------------------
     /** returns the localized string value to be used for untitles objects in
         combination with the leased number.
-
+        
         Note: Such string already contains leading spaces/tabs etcpp. !
         The only thing which an outside code has todo then ... adding a leased number
         to the string.
-
+        
         @return the localized string for untitled components.
      */
     string getUntitledPrefix ();
diff --git a/offapi/com/sun/star/frame/XUrlList.idl b/offapi/com/sun/star/frame/XUrlList.idl
index d4005ded9cd2..7b40fa359092 100644
--- a/offapi/com/sun/star/frame/XUrlList.idl
+++ b/offapi/com/sun/star/frame/XUrlList.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/XWindowArranger.idl b/offapi/com/sun/star/frame/XWindowArranger.idl
index ed5044b9d5aa..f4375cbc8d31 100644
--- a/offapi/com/sun/star/frame/XWindowArranger.idl
+++ b/offapi/com/sun/star/frame/XWindowArranger.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/frame/status/ClipboardFormats.idl b/offapi/com/sun/star/frame/status/ClipboardFormats.idl
index 2cc39db0696f..d8f7d1f14a6b 100644
--- a/offapi/com/sun/star/frame/status/ClipboardFormats.idl
+++ b/offapi/com/sun/star/frame/status/ClipboardFormats.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_frame_status_ClipboardFormats_idl__
-#define __com_sun_star_frame_status_ClipboardFormats_idl__
-
-
-//=============================================================================
-
+#ifndef __com_sun_star_frame_status_ClipboardFormats_idl__ 
+#define __com_sun_star_frame_status_ClipboardFormats_idl__ 
+ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module frame { module status {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** contains a list of format ID's and names which are part of the
     system clipboard.
-
+    
     @since OOo 2.0
  */
 struct ClipboardFormats
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** specifies a sequence of format IDs which are contained in the
         system clipboard.
      */
     sequence< hyper > Identifiers;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies a sequence of format names which are contained in the
         system clipboard.
      */
     sequence< string > Names;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/frame/status/FontHeight.idl b/offapi/com/sun/star/frame/status/FontHeight.idl
index 3cefd4aab7f9..7a610018ce45 100644
--- a/offapi/com/sun/star/frame/status/FontHeight.idl
+++ b/offapi/com/sun/star/frame/status/FontHeight.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_frame_status_FontHeight_idl__
-#define __com_sun_star_frame_status_FontHeight_idl__
-
-
-//=============================================================================
-
+#ifndef __com_sun_star_frame_status_FontHeight_idl__ 
+#define __com_sun_star_frame_status_FontHeight_idl__ 
+ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module frame { module status {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** describes the characteristics of a font.
-
+            
     <p>For example, this can be used to select a font.</p>
-
+    
     @since OOo 2.0
  */
 struct FontHeight
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** specifies the current height of the font.
      */
-    float Height;
-
-    //-------------------------------------------------------------------------
-
+    float Height; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the height of the font in the measure of the
         destination.
      */
-    short Prop;
-
-    //-------------------------------------------------------------------------
-
+    short Prop; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the width of the font in the measure of the
         destination.
      */
-    float Diff;
-};
-
-//=============================================================================
-
+    float Diff;  
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/frame/status/ItemState.idl b/offapi/com/sun/star/frame/status/ItemState.idl
index d1ade5b4589e..2e752375a7c6 100644
--- a/offapi/com/sun/star/frame/status/ItemState.idl
+++ b/offapi/com/sun/star/frame/status/ItemState.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_frame_status_ItemState_idl__
-#define __com_sun_star_frame_status_ItemState_idl__
-
-
-//=============================================================================
-
+#ifndef __com_sun_star_frame_status_ItemState_idl__ 
+#define __com_sun_star_frame_status_ItemState_idl__ 
+ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module frame { module status {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** these constants describe a state of a <type>ItemStatus</type>.
 
     @see ItemStatus
-
+    
     @since OOo 2.0
  */
 constants ItemState
@@ -59,9 +59,9 @@ constants ItemState
 
     //-------------------------------------------------------------------------
     /** specifies that the property is currently in a don't care state.
-
+        
         <p>
-        This is normally used if a selection provides more than one state
+        This is normally used if a selection provides more than one state 
         for a property at the same time.
         </p>
      */
@@ -76,10 +76,10 @@ constants ItemState
     /** specifies that the property is currently in a set state.
     */
     const short set            = 64;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/frame/status/ItemStatus.idl b/offapi/com/sun/star/frame/status/ItemStatus.idl
index ef49aca6a527..f6e1a1afa42e 100644
--- a/offapi/com/sun/star/frame/status/ItemStatus.idl
+++ b/offapi/com/sun/star/frame/status/ItemStatus.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_frame_status_ItemState_idl__
-#define __com_sun_star_frame_status_ItemState_idl__
-
-//=============================================================================
-
+#ifndef __com_sun_star_frame_status_ItemState_idl__ 
+#define __com_sun_star_frame_status_ItemState_idl__ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module frame { module status {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** describes a state of a property.
-
+    
     @since OOo 2.0
  */
 struct ItemStatus
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** numerical value which describes the current state of an item.
 
         @see <type>ItemState</type>
      */
     short State;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** optional data which can be used by an implementation to send additional
         information. The content is dependent on the specific implementation.
      */
     any aStateData;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/frame/status/LeftRightMargin.idl b/offapi/com/sun/star/frame/status/LeftRightMargin.idl
index 2112168f9286..44af045153c0 100644
--- a/offapi/com/sun/star/frame/status/LeftRightMargin.idl
+++ b/offapi/com/sun/star/frame/status/LeftRightMargin.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_frame_status_LeftRightMargin_idl__
-#define __com_sun_star_frame_status_LeftRightMargin_idl__
-
-
-//=============================================================================
-
+#ifndef __com_sun_star_frame_status_LeftRightMargin_idl__ 
+#define __com_sun_star_frame_status_LeftRightMargin_idl__ 
+ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module frame {  module status {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** specifies a left and right margin.
-
+    
     @since OOo 2.0
  */
 struct LeftRightMargin
 {
     /** specifies a left side margin in 1/100th mm.
      */
-    long Left;
-
-    //-------------------------------------------------------------------------
-
+    long Left; 
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a right side margin in 1/100th mm.
      */
-    long Right;
-};
-
-//=============================================================================
-
+    long Right;  
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/frame/status/Template.idl b/offapi/com/sun/star/frame/status/Template.idl
index 1377efabd5c7..4165bc0aff5c 100644
--- a/offapi/com/sun/star/frame/status/Template.idl
+++ b/offapi/com/sun/star/frame/status/Template.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_frame_status_Template_idl__
-#define __com_sun_star_frame_status_Template_idl__
-
-
-//=============================================================================
-
+#ifndef __com_sun_star_frame_status_Template_idl__ 
+#define __com_sun_star_frame_status_Template_idl__ 
+ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module frame { module status {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** contains an association between a style name and a value.
-
+    
     @since OOo 2.0
  */
 struct Template
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** specifies a style name.
      */
     string  StyleName;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** specifies a value that is bound to the style name.
      */
     long    Value;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/frame/status/UpperLowerMargin.idl b/offapi/com/sun/star/frame/status/UpperLowerMargin.idl
index b1a05a94fab7..6c9e4501c926 100644
--- a/offapi/com/sun/star/frame/status/UpperLowerMargin.idl
+++ b/offapi/com/sun/star/frame/status/UpperLowerMargin.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_frame_status_UpperLowerMargin_idl__
-#define __com_sun_star_frame_status_UpperLowerMargin_idl__
-
-
-//=============================================================================
-
+#ifndef __com_sun_star_frame_status_UpperLowerMargin_idl__ 
+#define __com_sun_star_frame_status_UpperLowerMargin_idl__ 
+ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module frame {  module status {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** specifies an upper and lower margin.
-
+    
     @since OOo 2.0
  */
 struct UpperLowerMargin
@@ -43,16 +43,16 @@ struct UpperLowerMargin
     /** specifies a upper margin in 1/100th mm.
      */
     long Upper;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a lower margin in 1/100th mm.
      */
     long Lower;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/frame/status/UpperLowerMarginScale.idl b/offapi/com/sun/star/frame/status/UpperLowerMarginScale.idl
index ae5e04e6bca8..0e7f611a1dfe 100644
--- a/offapi/com/sun/star/frame/status/UpperLowerMarginScale.idl
+++ b/offapi/com/sun/star/frame/status/UpperLowerMarginScale.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_frame_status_UpperLowerMarginScale_idl__
-#define __com_sun_star_frame_status_UpperLowerMarginScale_idl__
-
-
-//=============================================================================
-
+#ifndef __com_sun_star_frame_status_UpperLowerMarginScale_idl__ 
+#define __com_sun_star_frame_status_UpperLowerMarginScale_idl__ 
+ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module frame {  module status {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** specifies an upper and lower margin.
-
+    
     @since OOo 2.0
  */
 struct UpperLowerMarginScale
@@ -43,28 +43,28 @@ struct UpperLowerMarginScale
     /** specifies a upper margin in 1/100th mm.
      */
     long Upper;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies a lower margin in 1/100th mm.
      */
     long Lower;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** specifies a scale value for the upper margin.
      */
     short ScaleUpper;
-
-    //-------------------------------------------------------------------------
-
+    
+    //------------------------------------------------------------------------- 
+    
     /** specifies a scale value for the lower margin.
      */
     short ScaleLower;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/frame/status/Verb.idl b/offapi/com/sun/star/frame/status/Verb.idl
index caeaf6525f24..edc1d0f47392 100644
--- a/offapi/com/sun/star/frame/status/Verb.idl
+++ b/offapi/com/sun/star/frame/status/Verb.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_frame_status_Verb_idl__
-#define __com_sun_star_frame_status_Verb_idl__
-
-
-//=============================================================================
-
+#ifndef __com_sun_star_frame_status_Verb_idl__ 
+#define __com_sun_star_frame_status_Verb_idl__ 
+ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module frame { module status {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** describes a command that can be send to an OLE object
-
+            
     <p>For example, this can be used to select a font.</p>
 
     @since OOo 2.0
  */
 struct Verb
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** specifies the Id of the command.
      */
     long VerbId;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the name of the command. The name is localized.
      */
     string VerbName;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies if the command should be visible in a menu.
      */
     boolean VerbIsOnMenu;
-
+    
     /** specifies if the command is available for a constant object.
     */
     boolean VerbIsConst;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/frame/status/Visibility.idl b/offapi/com/sun/star/frame/status/Visibility.idl
index a061a89265d5..7fedffe3a11d 100644
--- a/offapi/com/sun/star/frame/status/Visibility.idl
+++ b/offapi/com/sun/star/frame/status/Visibility.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_frame_status_Visibility_idl__
-#define __com_sun_star_frame_status_Visiblilty_idl__
-
-//=============================================================================
-
+#ifndef __com_sun_star_frame_status_Visibility_idl__ 
+#define __com_sun_star_frame_status_Visiblilty_idl__ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module frame { module status {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** describes the visibility state of a property.
 
     @since OOo 2.0
  */
 struct Visibility
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** <TRUE/> if the property is visible otherwise <FALSE/>.
      */
     boolean bVisible;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/gallery/GalleryItem.idl b/offapi/com/sun/star/gallery/GalleryItem.idl
index ab588f988b67..9093f2e0c4ad 100644
--- a/offapi/com/sun/star/gallery/GalleryItem.idl
+++ b/offapi/com/sun/star/gallery/GalleryItem.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,13 +56,13 @@ service GalleryItem
     interface ::com::sun::star::beans::XPropertySet;
 
     /** The type of the Gallery item
-
+    
         @see GalleryItemType
     */
     [readonly, property] byte GalleryItemType;
-
+    
     /** the URL of the Gallery item
-
+    
         <p>The interpretation of the URL depends on the type
         of the Gallery item. In case of graphic and media items,
         the URL is a 'real' URL, in case of drawings it is a private
@@ -73,21 +73,21 @@ service GalleryItem
     /** the title of the Gallery item
      */
     [property] string Title;
-
+    
     /** the thumbnail of the Gallery item
-
+    
         <p>The thumbnail may be either a pixel or a vector graphic</p>
      */
     [readonly, property] com::sun::star::graphic::XGraphic Thumbnail;
-
+    
     /** the graphic content of the Gallery item
-
+    
         <p>This is an optional property and may not available for every item</p>
      */
     [optional, readonly, property ] ::com::sun::star::graphic::XGraphic Graphic;
-
+    
     /** the drawing content of the Gallery item
-
+    
         <p>This is an optional property and may not available for every item</p>
      */
     [optional, readonly, property ] ::com::sun::star::lang::XComponent Drawing;
diff --git a/offapi/com/sun/star/gallery/GalleryItemType.idl b/offapi/com/sun/star/gallery/GalleryItemType.idl
index f8bf62056080..8cad376eee55 100644
--- a/offapi/com/sun/star/gallery/GalleryItemType.idl
+++ b/offapi/com/sun/star/gallery/GalleryItemType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/gallery/GalleryTheme.idl b/offapi/com/sun/star/gallery/GalleryTheme.idl
index 207aec2c73a6..8220e755686e 100644
--- a/offapi/com/sun/star/gallery/GalleryTheme.idl
+++ b/offapi/com/sun/star/gallery/GalleryTheme.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,31 +27,31 @@
 
 #ifndef __com_sun_star_gallery_GalleryTheme_idl__
 #define __com_sun_star_gallery_GalleryTheme_idl__
-
-#ifndef __com_sun_star_gallery_XGalleryTheme_idl__
-#include <com/sun/star/gallery/XGalleryTheme.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module gallery {
-
-//=============================================================================
-
-/** provides access to a container of Gallery items and makes it
+ 
+#ifndef __com_sun_star_gallery_XGalleryTheme_idl__ 
+#include <com/sun/star/gallery/XGalleryTheme.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module gallery {  
+ 
+//============================================================================= 
+ 
+/** provides access to a container of Gallery items	and makes it
     possible for you to manipulate them.
-
+    
     @see XGalleryTheme
  */
 service GalleryTheme
-{
+{ 
     /** lets you access and create Gallery items
      */
-    interface com::sun::star::gallery::XGalleryTheme;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::gallery::XGalleryTheme; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/gallery/GalleryThemeProvider.idl b/offapi/com/sun/star/gallery/GalleryThemeProvider.idl
index f08b8756f20f..276a52abc05f 100644
--- a/offapi/com/sun/star/gallery/GalleryThemeProvider.idl
+++ b/offapi/com/sun/star/gallery/GalleryThemeProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,30 +27,30 @@
 
 #ifndef __com_sun_star_gallery_GalleryThemeProvider_idl__
 #define __com_sun_star_gallery_GalleryThemeProvider_idl__
+ 
+#ifndef __com_sun_star_gallery_XGalleryThemeProvider_idl__ 
+#include <com/sun/star/gallery/XGalleryThemeProvider.idl> 
+#endif 
+#ifndef __com_sun_star_lang_XInitialization_idl__ 
+#include <com/sun/star/lang/XInitialization.idl> 
+#endif 
 
-#ifndef __com_sun_star_gallery_XGalleryThemeProvider_idl__
-#include <com/sun/star/gallery/XGalleryThemeProvider.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
-#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module gallery {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module gallery {  
+ 
+//============================================================================= 
+ 
 /** provides access to a container of <type>GalleryTheme</type>s
     and makes it possible for you to manipulate them.
-
+    
     @see XGalleryThemeProvider
  */
 service GalleryThemeProvider
-{
+{ 
     /** lets you access and create <type>GalleryTheme</type>s
      */
-    interface com::sun::star::gallery::XGalleryThemeProvider;
+    interface com::sun::star::gallery::XGalleryThemeProvider; 
 
     /** allows initializing the provider
         <p>You do not need to call the initialize method directly, instead you may use the createInstanceWithArguments
@@ -60,14 +60,14 @@ service GalleryThemeProvider
         <type scope="com::sun::star::beans">PropertyValue</type>
         object(s) to the initialize method, where the <em>Name</em> field contains a string describing which aspect
         you want to affect, and the <em>Value</em> field containing a value.</p>
-
+        
         <p>Currently, there are no public properties available</p>
     */
     interface com::sun::star::lang::XInitialization;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/gallery/XGalleryItem.idl b/offapi/com/sun/star/gallery/XGalleryItem.idl
index fac404145e3b..2e0ed046fe89 100644
--- a/offapi/com/sun/star/gallery/XGalleryItem.idl
+++ b/offapi/com/sun/star/gallery/XGalleryItem.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ interface XGalleryItem : com::sun::star::uno::XInterface
 
         @returns
             The type of the Gallery item
-
+        
         @see GalleryItemType
      */
     byte getType();
diff --git a/offapi/com/sun/star/gallery/XGalleryTheme.idl b/offapi/com/sun/star/gallery/XGalleryTheme.idl
index ed8ac5230335..652078029433 100644
--- a/offapi/com/sun/star/gallery/XGalleryTheme.idl
+++ b/offapi/com/sun/star/gallery/XGalleryTheme.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
 
 #ifndef __com_sun_star_gallery_XGalleryTheme_idl__
 #define __com_sun_star_gallery_XGalleryTheme_idl__
-
+    
 #ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
 #endif
@@ -71,23 +71,23 @@ interface XGalleryTheme : com::sun::star::container::XIndexAccess
             The name of the Gallery theme
      */
     string getName();
-
+    
     /** updates the theme
-
+        
         <p>This method iterates over each item of the Gallery theme
         and updates it accordingly. Main purpose is to automatically
         regenerate the thumbnails and to remove invalid items, that is items
-        who have got an URL that has become invalid. This method also
+        who have got an URL that has become invalid. This method also 
         optimizes underlying data structures.</p>
      */
     void update();
-
-    /** inserts an item
+    
+    /** inserts an item 
 
         @param URL
             The URL of a graphic or media object, that should
             be added to the collection
-
+            
         @param Index
             The zero based index of the position where to insert
             the new object inside the collection. If the index is larger than
@@ -95,22 +95,22 @@ interface XGalleryTheme : com::sun::star::container::XIndexAccess
             item is inserted at the end of the collection. If the index
             is smaller than 0, the item is inserted at the beginning of
             the collection.
-
-        @returns
+            
+        @returns 
             The zero based position at which the object was inserted.
             If the object could not be inserted, -1 is returned.
-
+         
         @see XGalleryItem
         @see com::sun::star::lang::WrappedTargetException
     */
     long insertURLByIndex( [in] string URL, [in] long Index )
         raises ( com::sun::star::lang::WrappedTargetException );
-    /** inserts an item
+    /** inserts an item 
 
         @param Graphic
             The <type scope="com::sun::star::graphic">XGraphic</type> object
             that should be added to the collection
-
+            
         @param Index
             The zero based index of the position where to insert
             the new object inside the collection. If the index is larger than
@@ -118,23 +118,23 @@ interface XGalleryTheme : com::sun::star::container::XIndexAccess
             item is inserted at the end of the collection. If the index
             is smaller than 0, the item is inserted at the beginning of
             the collection.
-
-        @returns
+            
+        @returns 
             The zero based position at which the object was inserted.
             If the object could not be inserted, -1 is returned.
-
+         
         @see com::sun::star::graphic::XGraphic
         @see XGalleryItem
         @see com::sun::star::lang::WrappedTargetException
     */
     long insertGraphicByIndex( [in] com::sun::star::graphic::XGraphic Graphic, [in] long Index )
         raises ( com::sun::star::lang::WrappedTargetException );
-
-    /** inserts an item
+    
+    /** inserts an item 
 
         @param Drawing
             A drawing model that should be added to the collection
-
+            
         @param Index
             The zero based index of the position where to insert
             the new object inside the collection. If the index is larger than
@@ -142,23 +142,23 @@ interface XGalleryTheme : com::sun::star::container::XIndexAccess
             item is inserted at the end of the collection. If the index
             is smaller than 0, the item is inserted at the beginning of
             the collection.
-
-        @returns
+            
+        @returns 
             The zero based position at which the object was inserted.
             If the object could not be inserted, -1 is returned.
-
+         
         @see XGalleryItem
         @see com::sun::star::lang::WrappedTargetException
     */
     long insertDrawingByIndex( [in] com::sun::star::lang::XComponent Drawing, [in] long Index )
         raises ( com::sun::star::lang::WrappedTargetException );
-
-    /** deletes an item from the collection
+    
+    /** deletes an item from the collection 
 
         @param Index
-            The position of the item to be removed. The
+            The position of the item to be removed. The 
             position is zero based.
-
+         
         @see com::sun::star::container::NoSuchElementException
     */
     void removeByIndex( [in] long Index )
diff --git a/offapi/com/sun/star/gallery/XGalleryThemeProvider.idl b/offapi/com/sun/star/gallery/XGalleryThemeProvider.idl
index c7fa2dbfdc17..1f4f675dcd99 100644
--- a/offapi/com/sun/star/gallery/XGalleryThemeProvider.idl
+++ b/offapi/com/sun/star/gallery/XGalleryThemeProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -63,7 +63,7 @@ interface XGalleryThemeProvider : com::sun::star::container::XNameAccess
         @param ThemeName
             The name of the Gallery theme to be added to the collection.
             The name must be unique.
-
+        
         @returns XGalleryTheme
             The created theme interface
 
@@ -79,7 +79,7 @@ interface XGalleryThemeProvider : com::sun::star::container::XNameAccess
         @param ThemeName
             The name of the Gallery theme to be removed. The
             theme with the given name must exist.
-
+         
         @see com::sun::star::container::NoSuchElementException
     */
     void removeByName( [in] string ThemeName )
diff --git a/offapi/com/sun/star/geometry/AffineMatrix2D.idl b/offapi/com/sun/star/geometry/AffineMatrix2D.idl
index ad122bc7ebeb..e63df2fca1a0 100644
--- a/offapi/com/sun/star/geometry/AffineMatrix2D.idl
+++ b/offapi/com/sun/star/geometry/AffineMatrix2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@ module com {  module sun {  module star {  module geometry {
     to be [0,0,1].<p>
 
     An affine mapping, as performed by this matrix, can be written out
-    as follows, where <code>xs</code> and <code>ys</code> are the source, and
+    as follows, where <code>xs</code> and <code>ys</code> are the source, and 
     <code>xd</code> and <code>yd</code> the corresponding result coordinates:
 
     <code>
diff --git a/offapi/com/sun/star/geometry/AffineMatrix3D.idl b/offapi/com/sun/star/geometry/AffineMatrix3D.idl
index 945fccc1880c..7b9c769a00b2 100644
--- a/offapi/com/sun/star/geometry/AffineMatrix3D.idl
+++ b/offapi/com/sun/star/geometry/AffineMatrix3D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@ module com {  module sun {  module star {  module geometry {
     to be [0,0,0,1].<p>
 
     An affine mapping, as performed by this matrix, can be written out
-    as follows, where <code>xs, ys</code> and <code>zs</code> are the source, and
+    as follows, where <code>xs, ys</code> and <code>zs</code> are the source, and 
     <code>xd, yd</code> and <code>zd</code> the corresponding result coordinates:
 
     <code>
diff --git a/offapi/com/sun/star/geometry/EllipticalArc.idl b/offapi/com/sun/star/geometry/EllipticalArc.idl
index 620cbead640a..7c9bc1ee4af6 100644
--- a/offapi/com/sun/star/geometry/EllipticalArc.idl
+++ b/offapi/com/sun/star/geometry/EllipticalArc.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -60,26 +60,26 @@ struct EllipticalArc
     //-------------------------------------------------------------------------
 
     /// Main radius in x direction of the ellipse this arc is part of.
-    double  RadiusX;
+    double 	RadiusX;
 
     //-------------------------------------------------------------------------
 
     /// Main radius in y direction of the ellipse this arc is part of.
-    double  RadiusY;
+    double 	RadiusY;
 
     //-------------------------------------------------------------------------
 
     /** Rotation angle of the x axis of the ellipse relative to the x
         axis of the reference coordinate system.
      */
-    double  XAxisRotation;
+    double 	XAxisRotation;
 
     //-------------------------------------------------------------------------
 
     /** If <TRUE/>, and there's a choice, take the longer one of two arcs
         connecting start and end point.
      */
-    boolean IsLargeArc;
+    boolean	IsLargeArc;
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl b/offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl
index f26418aaf5c4..0d08afd38e94 100644
--- a/offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl
+++ b/offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/geometry/IntegerPoint2D.idl b/offapi/com/sun/star/geometry/IntegerPoint2D.idl
index 2b1e0d83efa6..1d30e5af29a9 100644
--- a/offapi/com/sun/star/geometry/IntegerPoint2D.idl
+++ b/offapi/com/sun/star/geometry/IntegerPoint2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/geometry/IntegerRectangle2D.idl b/offapi/com/sun/star/geometry/IntegerRectangle2D.idl
index 289c3f081665..075e0f4c4338 100644
--- a/offapi/com/sun/star/geometry/IntegerRectangle2D.idl
+++ b/offapi/com/sun/star/geometry/IntegerRectangle2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,12 +49,12 @@ module com {  module sun {  module star {  module geometry {
  */
 struct IntegerRectangle2D
 {
-    /// X coordinate of upper left corner.
+    /// X coordinate of upper left corner. 
     long X1;
 
     //-------------------------------------------------------------------------
 
-    /// Y coordinate of upper left corner.
+    /// Y coordinate of upper left corner. 
     long Y1;
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/geometry/IntegerSize2D.idl b/offapi/com/sun/star/geometry/IntegerSize2D.idl
index 3c8b665fedc3..1732c4a430b8 100644
--- a/offapi/com/sun/star/geometry/IntegerSize2D.idl
+++ b/offapi/com/sun/star/geometry/IntegerSize2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/geometry/Matrix2D.idl b/offapi/com/sun/star/geometry/Matrix2D.idl
index 4d2bacb24e2f..44f4c7dfeffc 100644
--- a/offapi/com/sun/star/geometry/Matrix2D.idl
+++ b/offapi/com/sun/star/geometry/Matrix2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module geometry {
     matrix does not include any translational components.<p>
 
     A linear mapping, as performed by this matrix, can be written out
-    as follows, where <code>xs</code> and <code>ys</code> are the source, and
+    as follows, where <code>xs</code> and <code>ys</code> are the source, and 
     <code>xd</code> and <code>yd</code> the corresponding result coordinates:
 
     <code>
diff --git a/offapi/com/sun/star/geometry/RealBezierSegment2D.idl b/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
index 97a9772fb006..f5bfce093c81 100644
--- a/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
+++ b/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/geometry/RealPoint2D.idl b/offapi/com/sun/star/geometry/RealPoint2D.idl
index 8c0e594aa5e6..8c64dda9ab07 100644
--- a/offapi/com/sun/star/geometry/RealPoint2D.idl
+++ b/offapi/com/sun/star/geometry/RealPoint2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/geometry/RealRectangle2D.idl b/offapi/com/sun/star/geometry/RealRectangle2D.idl
index b12ead639200..71b730ab4914 100644
--- a/offapi/com/sun/star/geometry/RealRectangle2D.idl
+++ b/offapi/com/sun/star/geometry/RealRectangle2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/geometry/RealRectangle3D.idl b/offapi/com/sun/star/geometry/RealRectangle3D.idl
index 826c73c27679..4b08544873dc 100644
--- a/offapi/com/sun/star/geometry/RealRectangle3D.idl
+++ b/offapi/com/sun/star/geometry/RealRectangle3D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/geometry/RealSize2D.idl b/offapi/com/sun/star/geometry/RealSize2D.idl
index 5ed2fc8a34c3..fa0d3cb2cd87 100644
--- a/offapi/com/sun/star/geometry/RealSize2D.idl
+++ b/offapi/com/sun/star/geometry/RealSize2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/geometry/XMapping2D.idl b/offapi/com/sun/star/geometry/XMapping2D.idl
index bf435389582a..2967d646e131 100644
--- a/offapi/com/sun/star/geometry/XMapping2D.idl
+++ b/offapi/com/sun/star/geometry/XMapping2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,9 @@
 #ifndef __com_sun_star_geometry_XMapping2D_idl__
 #define __com_sun_star_geometry_XMapping2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
 #endif
@@ -54,7 +54,7 @@ interface XMapping2D : ::com::sun::star::uno::XInterface
 {
     /** Forward 2D mapping function
      */
-    RealPoint2D     map( [in] RealPoint2D aPoint );
+    RealPoint2D 	map( [in] RealPoint2D aPoint );
 
     //-------------------------------------------------------------------------
 
@@ -64,7 +64,7 @@ interface XMapping2D : ::com::sun::star::uno::XInterface
         <code>map(mapInverse(p))=p</code>. This effectively rules out
         non-bijective mappings.<p>
      */
-    RealPoint2D     mapInverse( [in] RealPoint2D aPoint );
+    RealPoint2D 	mapInverse( [in] RealPoint2D aPoint );
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/graphic/Graphic.idl b/offapi/com/sun/star/graphic/Graphic.idl
index 02bb048096e0..a4492a3302b2 100755
--- a/offapi/com/sun/star/graphic/Graphic.idl
+++ b/offapi/com/sun/star/graphic/Graphic.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,10 +38,10 @@ module com { module sun { module star { module graphic
 
     <p>The main interface that has to be implemented for this service
     is the <type>XGraphic</type> interface, which itself exposes only
-    a few methods. Beside this, a <type>Graphic</type> service
+    a few methods. Beside this, a <type>Graphic</type> service 
     incorporates the <type>GraphicDescriptor</type> to give
     access to the attributes of the graphic.
-
+    
     @see XGraphic
     @see XGraphicTtransformer
     @see GraphicDescriptor
@@ -57,6 +57,6 @@ published service Graphic
     service ::com::sun::star::graphic::GraphicDescriptor;
 };
 
-} ; } ; } ; } ;
+} ; } ; } ; } ; 
 
 #endif
diff --git a/offapi/com/sun/star/graphic/GraphicColorMode.idl b/offapi/com/sun/star/graphic/GraphicColorMode.idl
index c22d1de56ee9..636c9667b5cb 100644
--- a/offapi/com/sun/star/graphic/GraphicColorMode.idl
+++ b/offapi/com/sun/star/graphic/GraphicColorMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module graphic {
+module com { module sun { module star { module graphic { 
 
 //=============================================================================
 
@@ -51,7 +51,7 @@ constants GraphicColorMode
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/graphic/GraphicDescriptor.idl b/offapi/com/sun/star/graphic/GraphicDescriptor.idl
index fce984008c71..f7b76274b9d3 100755
--- a/offapi/com/sun/star/graphic/GraphicDescriptor.idl
+++ b/offapi/com/sun/star/graphic/GraphicDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,21 +46,21 @@ published service GraphicDescriptor
         supported services are exchanged
     */
     interface ::com::sun::star::beans::XPropertySet;
-
+    
     /** The type of the graphic
-
+    
         @see GraphicType
     */
     [property] byte GraphicType;
 
     /** The MimeType of the loaded graphic
-
+    
         <p> The mime can be the original mime type of the graphic
-        source the graphic container was constructed from or it
+        source the graphic container was constructed from or it 
         can be the internal mime type image/x-vclgraphic, in which
         case the original mime type is not available anymore</p>
-
-        <p> Currently, the following mime types are supported for
+        
+        <p> Currently, the following mime types are supported for 
         loaded graphics:<\p>
         <ul>
             <li>image/bmp</li>
@@ -92,9 +92,9 @@ published service GraphicDescriptor
 
     */
     [property] string MimeType;
-
-    /** The Size of the graphic in pixel.
-
+        
+    /** The Size of the graphic in pixel. 
+    
         <p> This property may not be available in case of
         vector graphics or if the pixel size can not be
         determined correctly for some formats without loading
@@ -102,8 +102,8 @@ published service GraphicDescriptor
     */
     [optional, property] ::com::sun::star::awt::Size SizePixel;
 
-    /** The Size of the graphic in 100th mm.
-
+    /** The Size of the graphic in 100th mm. 
+    
         <p> This property may not be available in case of
         pixel graphics or if the logical size can not be
         determined correctly for some formats without loading
@@ -112,7 +112,7 @@ published service GraphicDescriptor
     [optional, property] ::com::sun::star::awt::Size Size100thMM;
 
     /** The number of bits per pixel used for the pixel graphic
-
+        
         <p> This property is not available for vector
         graphics and may not be available for some kinds
         of pixel graphics</p>
@@ -120,17 +120,17 @@ published service GraphicDescriptor
     [optional, property] byte BitsPerPixel;
 
     /** Indicates that it is a transparent graphic
-
+        
         <p>This property is always <TRUE/> for vector graphics.
-        The status of this flag is not always clear if the
+        The status of this flag is not always clear if the 
         graphic was not loaded at all, e.g. in case of just
         querying for the <type>GraphicDescriptor</type>.</p>
     */
     [optional, property] boolean Transparent;
 
     /** Indicates that it is a pixel graphic with an alpha channel
-
-        <p>The status of this flag is not always clear if the
+        
+        <p>The status of this flag is not always clear if the 
         graphic was not loaded at all, e.g. in case of just
         querying for the <type>GraphicDescriptor</type></p>
     */
@@ -138,14 +138,14 @@ published service GraphicDescriptor
 
     /** Indicates that it is a graphic that consists of several
         frames that can be played as an animation
-
-        <p>The status of this flag is not always clear if the
+        
+        <p>The status of this flag is not always clear if the 
         graphic was not loaded at all, e.g. in case of just
         querying for the <type>GraphicDescriptor</type></p>
     */
     [optional, property] boolean Animated;
 };
 
-} ; } ; } ; } ;
+} ; } ; } ; } ; 
 
 #endif
diff --git a/offapi/com/sun/star/graphic/GraphicObject.idl b/offapi/com/sun/star/graphic/GraphicObject.idl
index c3353724133f..3a222d83bcf2 100644
--- a/offapi/com/sun/star/graphic/GraphicObject.idl
+++ b/offapi/com/sun/star/graphic/GraphicObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,8 +40,8 @@ module com { module sun { module star { module graphic
     the associated image/graphic is available.</p>
 
     @see GraphicObject
-    @see GraphicProvider
-    @see MediaProperties
+    @see GraphicProvider 
+    @see MediaProperties 
 */
 
 service GraphicObject : XGraphicObject
@@ -51,13 +51,13 @@ service GraphicObject : XGraphicObject
     create();
 
     /** Creates an <type>GraphicObject</type> with <code>uniqueId</code>
-        @param uniqueId
+        @param uniqueId 
             If another <type>XGraphicObject</type> with <code>uniqueId</code> exists, this GraphicObject
             is populated with the other <type>GraphicObject</type>'s data.
     */
     createWithId( [in] string uniqueId );
 };
 
-} ; } ; } ; } ;
+} ; } ; } ; } ; 
 
 #endif
diff --git a/offapi/com/sun/star/graphic/GraphicProvider.idl b/offapi/com/sun/star/graphic/GraphicProvider.idl
index b8109919a349..6a6a131dcab4 100755
--- a/offapi/com/sun/star/graphic/GraphicProvider.idl
+++ b/offapi/com/sun/star/graphic/GraphicProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,14 +40,14 @@ module com { module sun { module star { module graphic
     to any location. The one and only interface that has to be implemented
     is the <type>XGraphicProvider</type> interface, that exposes the necessary
     methods for loading and storing the graphic contents and descriptors</p>
-
+    
     @see XGraphicProvider
-*/
+*/    
 published service GraphicProvider
 {
     interface ::com::sun::star::graphic::XGraphicProvider;
 };
 
-} ; } ; } ; } ;
+} ; } ; } ; } ; 
 
 #endif
diff --git a/offapi/com/sun/star/graphic/GraphicRendererVCL.idl b/offapi/com/sun/star/graphic/GraphicRendererVCL.idl
index 10cc215629d4..6d95165eee58 100755
--- a/offapi/com/sun/star/graphic/GraphicRendererVCL.idl
+++ b/offapi/com/sun/star/graphic/GraphicRendererVCL.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,10 +37,10 @@ module com { module sun { module star { module graphic
 
 /** Service that describes the necessary interfaces and properties
     to render a graphic container of <type>XGraphic</type> type
-
-    <p>To render a <type>XGraphic</type> container, just create an
+    
+    <p>To render a <type>XGraphic</type> container, just create an 
     instance of this service, set the appropriate properties and use
-    the <type>XGraphicRenderer</type> interface to initiate the rendering
+    the	<type>XGraphicRenderer</type> interface to initiate the rendering 
     process itself</p>
  */
 service GraphicRendererVCL
@@ -56,24 +56,24 @@ service GraphicRendererVCL
 
     /** Holds the device onto which the <type>XGraphic</type>
         container should be rendered
-
+        
         <p>In case of using VCL Devices, this property should
         hold a <type scope="com::sun::star::awt">XDevice</type>
         interface</p>
     */
     [property] any Device;
-
+    
     /** Specifies the destination rectangle, into which the graphic
     content is to be rendered onto the device
     */
     [property] ::com::sun::star::awt::Rectangle DestinationRect;
 
-
+    
     /** Additional properties for rendering, unspecified at the moment
     */
     [optional, property] any RenderData;
 };
 
-} ; } ; } ; } ;
+} ; } ; } ; } ; 
 
 #endif
diff --git a/offapi/com/sun/star/graphic/GraphicType.idl b/offapi/com/sun/star/graphic/GraphicType.idl
index 133b2621887d..35ec33725d48 100755
--- a/offapi/com/sun/star/graphic/GraphicType.idl
+++ b/offapi/com/sun/star/graphic/GraphicType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/graphic/MediaProperties.idl b/offapi/com/sun/star/graphic/MediaProperties.idl
index 889db82278fd..1ac563a2a789 100755
--- a/offapi/com/sun/star/graphic/MediaProperties.idl
+++ b/offapi/com/sun/star/graphic/MediaProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,16 +41,16 @@ module com { module sun { module star { module graphic
 published service MediaProperties
 {
     /** Property that describes the location of the source or target
-        of the graphic as URL.
-
-        <p>A URL can be used instead of the
+        of the graphic as URL. 
+        
+        <p>A URL can be used instead of the 
         <member>InputStream</member> or <member>OutputStream</member>
         property</p>
-
+    
         <p>In addition to the normal protocols like file:// or http://
         you can use private URL's as follows to get access to graphics
         lying inside the resource system within an Office context:
-
+        
         <ul>
             <li>private:resource/projectshortname/bitmap/12345</li>
             <li>private:resource/projectshortname/bitmapex/12345</li>
@@ -58,14 +58,14 @@ published service MediaProperties
             <li>private:resource/projectshortname/imagelist/12345</li>
             <li>private:resource/projectshortname/imagelist/12345/12</li>
         </ul>
-And additionally, GraphicObject scheme url's like
+And additionally, GraphicObject scheme url's like 
             <ul> <li>vnd.sun.star.GraphicObject:10000000000001940000012FB99807BD</li> </ul>
-              can be used to access graphics held by the GraphicCache implementation.
+              can be used to access graphics held by the GraphicCache implementation. 
         </p>
 
         <p>Yet more, you can access graphics in the application-wide image
         repository by specifying URLs of the form
-        <code>private:graphicrepository/<em>&lt;path_in_repository&gt;</em></code>.
+        <code>private:graphicrepository/<em>&lt;path_in_repository&gt;</em></code>. 
 </p>
     */
     [optional, property ] string URL;
@@ -73,28 +73,28 @@ And additionally, GraphicObject scheme url's like
     /** This property is only used for loading graphics or querying
         graphic descriptors
 
-        <p>A <member>InputStream</member> can be used instead of the
+        <p>A <member>InputStream</member> can be used instead of the 
         <member>URL</member> property</p>
-
+                
         @see com::sun::star::io::XInputStream
     */
     [optional, property ] ::com::sun::star::io::XInputStream InputStream;
-
+    
     /** This property is only used for storing graphics
 
-        <p>A <member>OutputStream</member> can be used instead of the
+        <p>A <member>OutputStream</member> can be used instead of the 
         <member>URL</member> property</p>
-
+            
         @see com::sun::star::io::XStream
     */
     [optional, property ] ::com::sun::star::io::XStream OutputStream;
 
     /** This property is only used for storing graphics and describes the
         format into which the graphic is to be converted
-
+    
         <p>At the moment, the following mime types are supported for storing
         graphics:</p>
-
+        
         <ul>
             <li>image/bmp</li>
             <li>image/gif</li>
@@ -116,13 +116,13 @@ And additionally, GraphicObject scheme url's like
         </ul>
     */
     [optional, property ] string MimeType;
-
+    
     /** Additional properties that will be passed to the
     appropriate filter module.
     */
     [optional, property] ::com::sun::star::beans::PropertyValues FilterData;
 };
 
-} ; } ; } ; } ;
+} ; } ; } ; } ; 
 
 #endif
diff --git a/offapi/com/sun/star/graphic/XGraphic.idl b/offapi/com/sun/star/graphic/XGraphic.idl
index 999d815be2ae..498bef88d26f 100755
--- a/offapi/com/sun/star/graphic/XGraphic.idl
+++ b/offapi/com/sun/star/graphic/XGraphic.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,29 +37,29 @@ module com { module sun { module star { module graphic
 /** This interface acts as a container for the loaded graphic.
 
     <p>The interface itself can be retrieved by using the appropriate
-    methods of <type>XGraphicProvider</type> interface.
+    methods of <type>XGraphicProvider</type> interface. 
     <type>XGraphicProvider</type> also offers a method to store
     the graphic content at a specific location</p>
-
+    
     <p>To render the graphic content onto a specific device, you
     have to create a <type>XGraphicRenderer</type> interface and pass
     this interface appropriately</p>
-
+    
     @see XGraphicProvider
     @see XGraphicRenderer
   */
 published interface XGraphic : ::com::sun::star::uno::XInterface
 {
     /** Get the type of the contained graphic
-
+    
         @returns
             The type of the contained graphic
-
+            
         @see GraphicType
     */
     byte getType();
 };
 
-} ; } ; } ; } ;
+} ; } ; } ; } ; 
 
 #endif
diff --git a/offapi/com/sun/star/graphic/XGraphicObject.idl b/offapi/com/sun/star/graphic/XGraphicObject.idl
index adc5d5ee5e1e..533758bc401b 100644
--- a/offapi/com/sun/star/graphic/XGraphicObject.idl
+++ b/offapi/com/sun/star/graphic/XGraphicObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@ module com { module sun { module star { module graphic
 interface XGraphic;
 /** <code>XGraphicObject</code> objects represent in-memory image and graphic
     objects.
-
+    
     <p>Such objects are accessable using GraphicObject scheme urls like
     <ul>
         <li>vnd.sun.star.GraphicObject:10000000000001940000012FB99807BD</li>
@@ -45,8 +45,8 @@ interface XGraphic;
     the associated image/graphic is available.</p>
 
     @see XGraphicObject
-    @see GraphicProvider
-    @see MediaProperties
+    @see GraphicProvider 
+    @see MediaProperties 
 */
 
 interface XGraphicObject : ::com::sun::star::uno::XInterface
@@ -55,11 +55,11 @@ interface XGraphicObject : ::com::sun::star::uno::XInterface
     */
     [attribute ] XGraphic Graphic;
 
-    /** is the id that can be used to form the <code>vnd.sun.star.GraphicObject</code> url to address this object.
+    /** is the id that can be used to form the <code>vnd.sun.star.GraphicObject</code> url to address this object. 
     */
     [attribute, readonly ] string UniqueID;
 };
 
-} ; } ; } ; } ;
+} ; } ; } ; } ; 
 
 #endif
diff --git a/offapi/com/sun/star/graphic/XGraphicProvider.idl b/offapi/com/sun/star/graphic/XGraphicProvider.idl
index de5a193961df..4e23b816d12b 100755
--- a/offapi/com/sun/star/graphic/XGraphicProvider.idl
+++ b/offapi/com/sun/star/graphic/XGraphicProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,74 +46,74 @@ module com { module sun { module star { module graphic
   */
 published interface XGraphicProvider : ::com::sun::star::uno::XInterface
 {
-    /** Calling this method returns a
+    /** Calling this method returns a 
         <type scope="com::sun::star::beans">XPropertySet</type>
-        interface that gives access to the properties of the
+        interface that gives access to the properties of the 
         unloaded graphic
-
-        <p>In most cases, this method will be used to query the
+        
+        <p>In most cases, this method will be used to query the 
         mime type of the graphic and, in the case of pixel graphics,
         the resulting size after loading</p>
-
+        
         @param MediaProperties
             A sequence of property values to describe the location
             of the graphic, for which the attributes should be returned
-
+        
         @returns
             A <type scope="com::sun::star::beans">XPropertySet</type> interface
             to get access to the different graphic properties
-
+        
         @see MediaProperties
         @see GraphicDescriptor
         @see com::sun::star::beans::PropertyValues
     */
-    ::com::sun::star::beans::XPropertySet   queryGraphicDescriptor( [in] ::com::sun::star::beans::PropertyValues MediaProperties )
+    ::com::sun::star::beans::XPropertySet	queryGraphicDescriptor( [in] ::com::sun::star::beans::PropertyValues MediaProperties ) 
                                                 raises( ::com::sun::star::io::IOException,
                                                         ::com::sun::star::lang::IllegalArgumentException,
                                                         ::com::sun::star::lang::WrappedTargetException );
 
 
-
+    
     /** Calling this method returns a <type>XGraphic</type> interface
         that holds the graphic content after loading the graphic
-
+    
         @param MediaProperties
             A sequence of property values to describe the location
             of the graphic from which the graphic is to be loaded
-
+        
         @returns
             The <type>XGraphic</type> interface
-
+        
         @see MediaProperties
         @see XGraphic
         @see com::sun::star::beans::PropertyValues
     */
-    XGraphic    queryGraphic( [in] ::com::sun::star::beans::PropertyValues MediaProperties )
+    XGraphic	queryGraphic( [in] ::com::sun::star::beans::PropertyValues MediaProperties )
                      raises( ::com::sun::star::io::IOException,
                               ::com::sun::star::lang::IllegalArgumentException,
                              ::com::sun::star::lang::WrappedTargetException );
-
+        
     /** Store the graphic content, represented through the <type>XGraphic</type>
         interface at the specified location
 
         @param Graphic
             The graphic that should be stored
-
+    
         @param MediaProperties
             A sequence of property values to describe the destination
             location of the graphic
-
+            
         @see XGraphic
         @see MediaProperties
         @see com::sun::star::beans::PropertyValues
     */
-    void        storeGraphic( [in] ::com::sun::star::graphic::XGraphic Graphic,
+    void		storeGraphic( [in] ::com::sun::star::graphic::XGraphic Graphic,
                               [in] ::com::sun::star::beans::PropertyValues MediaProperties  )
                     raises( ::com::sun::star::io::IOException,
                              ::com::sun::star::lang::IllegalArgumentException,
                             ::com::sun::star::lang::WrappedTargetException );
 };
 
-} ; } ; } ; } ;
+} ; } ; } ; } ; 
 
 #endif
diff --git a/offapi/com/sun/star/graphic/XGraphicRenderer.idl b/offapi/com/sun/star/graphic/XGraphicRenderer.idl
index f49746c4e5d5..e1a6b6222634 100755
--- a/offapi/com/sun/star/graphic/XGraphicRenderer.idl
+++ b/offapi/com/sun/star/graphic/XGraphicRenderer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,21 +34,21 @@
 module com { module sun { module star { module graphic
 {
 
-/** This interfaces exposes just one method to render
+/** This interfaces exposes just one method to render 
     a <type>XGraphic</type> container
   */
 interface XGraphicRenderer : ::com::sun::star::uno::XInterface
 {
     /** Renders the <type>XGraphic</type> container
-
+    
         @param Graphic
             The graphic container to be rendered
-
+        
         @see XGraphic
     */
     void render( [in] ::com::sun::star::graphic::XGraphic Graphic );
 };
 
-} ; } ; } ; } ;
+} ; } ; } ; } ; 
 
 #endif
diff --git a/offapi/com/sun/star/graphic/XGraphicTransformer.idl b/offapi/com/sun/star/graphic/XGraphicTransformer.idl
index 47fe2d9bbd54..b5425f7e5d97 100644
--- a/offapi/com/sun/star/graphic/XGraphicTransformer.idl
+++ b/offapi/com/sun/star/graphic/XGraphicTransformer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@ module com { module sun { module star { module graphic
 {
 
 /** This interface is allowing to transform a <type>XGraphic</type>
-
+    
     <p>To transform a <type>XGraphic</type>, just the corresponding
     method has to be used, a new XGraphic instance will be returned
     </p>
@@ -52,6 +52,6 @@ interface XGraphicTransformer : ::com::sun::star::uno::XInterface
             raises( ::com::sun::star::lang::IllegalArgumentException );
 };
 
-} ; } ; } ; } ;
+} ; } ; } ; } ; 
 
 #endif
diff --git a/offapi/com/sun/star/graphic/XPrimitive2D.idl b/offapi/com/sun/star/graphic/XPrimitive2D.idl
index 377bcb5b7802..15eff1c1efbc 100644
--- a/offapi/com/sun/star/graphic/XPrimitive2D.idl
+++ b/offapi/com/sun/star/graphic/XPrimitive2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,8 +34,8 @@
 #include <com/sun/star/beans/PropertyValue.idl>
 #endif
 #ifndef __com_sun_star_geometry_RealRectangle2D_idl__
-#include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
+#include <com/sun/star/geometry/RealRectangle2D.idl> 
+#endif 
 
 module com {  module sun {  module star {  module graphic {
 
@@ -52,7 +52,7 @@ interface XPrimitive2D : ::com::sun::star::uno::XInterface
         @param aViewParameters
         2D View-specific parameter set. The defined but not mandatory
         parameters include:
-
+        
         ::com::sun::star::geometry::AffineMatrix2D Transformation
 
         A transformation matrix which maps between world coordinates (which
@@ -78,7 +78,7 @@ interface XPrimitive2D : ::com::sun::star::uno::XInterface
     /** Retrieve bound rect of primitive
 
         This method calculates the actual bound rect of the area in
-        <em>world coordinates<em>. Note that for view-dependent primitives,
+        <em>world coordinates<em>. Note that for view-dependent primitives, 
         the necessary pixel adjustments are taken into account. For that reason
         the ViewParameters need to be given.
 
diff --git a/offapi/com/sun/star/graphic/XPrimitive3D.idl b/offapi/com/sun/star/graphic/XPrimitive3D.idl
index 5083ed338a76..36a560d6e35a 100644
--- a/offapi/com/sun/star/graphic/XPrimitive3D.idl
+++ b/offapi/com/sun/star/graphic/XPrimitive3D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,7 +65,7 @@ interface XPrimitive3D : ::com::sun::star::uno::XInterface
     /** Retrieve bound rect of primitive
 
         This method calculates the actual bound rect of the area in
-        <em>world coordinates<em>. Note that for view-dependent primitives,
+        <em>world coordinates<em>. Note that for view-dependent primitives, 
         the necessary pixel adjustments are taken into account. For that reason
         the ViewParameters need to be given.
 
diff --git a/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl b/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl
index 846d0c3d5154..00c20fd38712 100644
--- a/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl
+++ b/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,7 +68,7 @@ interface XPrimitiveFactory2D : ::com::sun::star::uno::XInterface
         @return a sequence of primitives, that consists of the
         geometrical representation from the given XShape.
      */
-    sequence< XPrimitive2D > createPrimitivesFromXShape(
+    sequence< XPrimitive2D > createPrimitivesFromXShape( 
         [in] ::com::sun::star::drawing::XShape xShape,
         [in] sequence< ::com::sun::star::beans::PropertyValue > aParms );
 
@@ -81,12 +81,12 @@ interface XPrimitiveFactory2D : ::com::sun::star::uno::XInterface
 
         @param aParms
         Sequence of factory parameters, whose semantics depend on the
-        page to be generated.
+        page to be generated.         
 
         @return a sequence of primitives, that consists of the
         geometrical representation for the given XDrawPage.
      */
-    sequence< XPrimitive2D > createPrimitivesFromXDrawPage(
+    sequence< XPrimitive2D > createPrimitivesFromXDrawPage( 
         [in] ::com::sun::star::drawing::XDrawPage xDrawPage,
         [in] sequence< ::com::sun::star::beans::PropertyValue > aParms );
 
diff --git a/offapi/com/sun/star/i18n/AmPmValue.idl b/offapi/com/sun/star/i18n/AmPmValue.idl
index 03abe18ff0b8..969f48f046e0 100644
--- a/offapi/com/sun/star/i18n/AmPmValue.idl
+++ b/offapi/com/sun/star/i18n/AmPmValue.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,9 +39,9 @@ module com { module sun { module star { module i18n {
 published constants AmPmValue
 {
     /// get display name string for AM
-    const short AM  = 0;
+    const short AM	= 0;
     /// get display name string for PM
-    const short PM  = 1;
+    const short PM	= 1;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/i18n/Boundary.idl b/offapi/com/sun/star/i18n/Boundary.idl
index 31cd38cad2e2..b7ca761f7862 100644
--- a/offapi/com/sun/star/i18n/Boundary.idl
+++ b/offapi/com/sun/star/i18n/Boundary.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@ module com {  module sun {  module star {  module i18n {
 //=============================================================================
 
 /** contains start and end position of a word.
-
+    
     <p> It is used in word break iterator and text conversion.
     </p>
 
diff --git a/offapi/com/sun/star/i18n/BreakIterator.idl b/offapi/com/sun/star/i18n/BreakIterator.idl
index 658ce5764d76..fca19fa8c0f5 100644
--- a/offapi/com/sun/star/i18n/BreakIterator.idl
+++ b/offapi/com/sun/star/i18n/BreakIterator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/BreakType.idl b/offapi/com/sun/star/i18n/BreakType.idl
index 33e731f91495..3698c95bead8 100644
--- a/offapi/com/sun/star/i18n/BreakType.idl
+++ b/offapi/com/sun/star/i18n/BreakType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,13 +41,13 @@ module com {  module sun {  module star {  module i18n {
 published constants BreakType
 {
     /// Line break is a word break.
-    const short WORDBOUNDARY            = 1;
+    const short WORDBOUNDARY			= 1;
 
     /// Line break is a result of hyphenation.
-    const short HYPHENATION             = 2;
+    const short HYPHENATION				= 2;
 
     /// Line break - hanging punctuation recognized.
-    const short HANGINGPUNCTUATION      = 3;
+    const short HANGINGPUNCTUATION		= 3;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/i18n/CTLScriptType.idl b/offapi/com/sun/star/i18n/CTLScriptType.idl
index a192f5f5d0c2..fd2e8417c029 100644
--- a/offapi/com/sun/star/i18n/CTLScriptType.idl
+++ b/offapi/com/sun/star/i18n/CTLScriptType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module i18n {
 //=============================================================================
 
 //--------------------------------------------------------------------------
-/** CTL tcript type constants for layout engine, returned by
+/** CTL tcript type constants for layout engine, returned by 
     <member>XScriptTypeDetector::getCTLScriptType()</member>
 
      @since OOo 1.1.2
diff --git a/offapi/com/sun/star/i18n/Calendar.idl b/offapi/com/sun/star/i18n/Calendar.idl
index 8e063c04e853..086c2242c562 100644
--- a/offapi/com/sun/star/i18n/Calendar.idl
+++ b/offapi/com/sun/star/i18n/Calendar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/CalendarDisplayCode.idl b/offapi/com/sun/star/i18n/CalendarDisplayCode.idl
index 780a88eb8fa7..33a7758d0c7c 100644
--- a/offapi/com/sun/star/i18n/CalendarDisplayCode.idl
+++ b/offapi/com/sun/star/i18n/CalendarDisplayCode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
- *
+ * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/CalendarDisplayIndex.idl b/offapi/com/sun/star/i18n/CalendarDisplayIndex.idl
index 4338ad50742f..de38f2ea4b71 100644
--- a/offapi/com/sun/star/i18n/CalendarDisplayIndex.idl
+++ b/offapi/com/sun/star/i18n/CalendarDisplayIndex.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,15 +41,15 @@ module com { module sun { module star { module i18n {
 published constants CalendarDisplayIndex
 {
     /// name of an AM/PM value
-    const short AM_PM   = 0;
+    const short AM_PM	= 0;
     /// name of a day of week
-    const short DAY     = 1;
+    const short DAY		= 1;
     /// name of a month
-    const short MONTH   = 2;
+    const short MONTH	= 2;
     /// name of a year (if used for a specific calendar)
-    const short YEAR    = 3;
+    const short YEAR	= 3;
     /// name of an era, like BC/AD
-    const short ERA     = 4;
+    const short ERA		= 4;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/i18n/CalendarFieldIndex.idl b/offapi/com/sun/star/i18n/CalendarFieldIndex.idl
index a2606f229d05..557e07324dec 100644
--- a/offapi/com/sun/star/i18n/CalendarFieldIndex.idl
+++ b/offapi/com/sun/star/i18n/CalendarFieldIndex.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/CalendarItem.idl b/offapi/com/sun/star/i18n/CalendarItem.idl
index 5fd2f1209f57..763866ea9904 100644
--- a/offapi/com/sun/star/i18n/CalendarItem.idl
+++ b/offapi/com/sun/star/i18n/CalendarItem.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/ChapterCollator.idl b/offapi/com/sun/star/i18n/ChapterCollator.idl
index eb7f9e40a58b..962f11b3aa4a 100644
--- a/offapi/com/sun/star/i18n/ChapterCollator.idl
+++ b/offapi/com/sun/star/i18n/ChapterCollator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/CharType.idl b/offapi/com/sun/star/i18n/CharType.idl
index 2e6406e9b4d0..ae30d57ebbef 100644
--- a/offapi/com/sun/star/i18n/CharType.idl
+++ b/offapi/com/sun/star/i18n/CharType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@ module com {  module sun {  module star {  module i18n {
 
 //=============================================================================
 
-/**
+/** 
     Constants to specify the character type that starts a character block.
     Character type is Unicode type defined in <type>UnicodeType</type>
 
diff --git a/offapi/com/sun/star/i18n/CharacterClassification.idl b/offapi/com/sun/star/i18n/CharacterClassification.idl
index 1c903b95033d..093f4cab8936 100644
--- a/offapi/com/sun/star/i18n/CharacterClassification.idl
+++ b/offapi/com/sun/star/i18n/CharacterClassification.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/CharacterIteratorMode.idl b/offapi/com/sun/star/i18n/CharacterIteratorMode.idl
index 3b233868b746..9678229504fd 100644
--- a/offapi/com/sun/star/i18n/CharacterIteratorMode.idl
+++ b/offapi/com/sun/star/i18n/CharacterIteratorMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,13 +41,13 @@ module com {  module sun {  module star {  module i18n {
 published constants CharacterIteratorMode
 {
     /// skip characters
-    const short SKIPCHARACTER           = 0;
+    const short SKIPCHARACTER 			= 0;
 
     /// skip cells
-    const short SKIPCELL                = 1;
+    const short SKIPCELL 				= 1;
 
     /// skip control characters
-    const short SKIPCONTROLCHARACTER    = 2;
+    const short SKIPCONTROLCHARACTER 	= 2;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/i18n/Collator.idl b/offapi/com/sun/star/i18n/Collator.idl
index 79cea254bb56..6cb51884115f 100644
--- a/offapi/com/sun/star/i18n/Collator.idl
+++ b/offapi/com/sun/star/i18n/Collator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/CollatorOptions.idl b/offapi/com/sun/star/i18n/CollatorOptions.idl
index 9af23dadde73..c4f64155b668 100644
--- a/offapi/com/sun/star/i18n/CollatorOptions.idl
+++ b/offapi/com/sun/star/i18n/CollatorOptions.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/Currency.idl b/offapi/com/sun/star/i18n/Currency.idl
index d4f6671c6fe9..c30e2ff58608 100644
--- a/offapi/com/sun/star/i18n/Currency.idl
+++ b/offapi/com/sun/star/i18n/Currency.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@ module com { module sun { module star { module i18n {
 
 //============================================================================
 
-/**
+/** 
     Symbols, names, and attributes of a specific currency, returned in a
     sequence by <member>XLocaleData::getAllCurrencies()</member>.
 
diff --git a/offapi/com/sun/star/i18n/Currency2.idl b/offapi/com/sun/star/i18n/Currency2.idl
index e6a7cc2a5090..e296d011a76d 100644
--- a/offapi/com/sun/star/i18n/Currency2.idl
+++ b/offapi/com/sun/star/i18n/Currency2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@ module com { module sun { module star { module i18n {
 
 //============================================================================
 
-/**
+/** 
     Symbols, names, and attributes of a specific currency, returned in a
     sequence by <member>XLocaleData2::getAllCurrencies2()</member>.
 
diff --git a/offapi/com/sun/star/i18n/DirectionProperty.idl b/offapi/com/sun/star/i18n/DirectionProperty.idl
index 7a46b8a5b6e9..8d407fe3b214 100644
--- a/offapi/com/sun/star/i18n/DirectionProperty.idl
+++ b/offapi/com/sun/star/i18n/DirectionProperty.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/ForbiddenCharacters.idl b/offapi/com/sun/star/i18n/ForbiddenCharacters.idl
index 11ec09f834fe..463f5c32eb52 100644
--- a/offapi/com/sun/star/i18n/ForbiddenCharacters.idl
+++ b/offapi/com/sun/star/i18n/ForbiddenCharacters.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/FormatElement.idl b/offapi/com/sun/star/i18n/FormatElement.idl
index deb39eba5123..0c8b5c163ec7 100644
--- a/offapi/com/sun/star/i18n/FormatElement.idl
+++ b/offapi/com/sun/star/i18n/FormatElement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module i18n {
 /**
     One number format code and its attributes, returned in a sequence by
     <member>XLocaleData::getAllFormats()</member>.
-
+    
     <p> Contains raw data defined in the XML locale data files. </p>
 
     @see XLocaleData
diff --git a/offapi/com/sun/star/i18n/Implementation.idl b/offapi/com/sun/star/i18n/Implementation.idl
index 15e99a22bdd8..f63dfa85db56 100644
--- a/offapi/com/sun/star/i18n/Implementation.idl
+++ b/offapi/com/sun/star/i18n/Implementation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/IndexEntrySupplier.idl b/offapi/com/sun/star/i18n/IndexEntrySupplier.idl
index cb988eeb7520..20fd7637f005 100644
--- a/offapi/com/sun/star/i18n/IndexEntrySupplier.idl
+++ b/offapi/com/sun/star/i18n/IndexEntrySupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/InputSequenceCheckMode.idl b/offapi/com/sun/star/i18n/InputSequenceCheckMode.idl
index f94970c106bc..65a34fa7690c 100644
--- a/offapi/com/sun/star/i18n/InputSequenceCheckMode.idl
+++ b/offapi/com/sun/star/i18n/InputSequenceCheckMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/InputSequenceChecker.idl b/offapi/com/sun/star/i18n/InputSequenceChecker.idl
index 38951efcbf30..26f04b13f3e1 100644
--- a/offapi/com/sun/star/i18n/InputSequenceChecker.idl
+++ b/offapi/com/sun/star/i18n/InputSequenceChecker.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/KCharacterType.idl b/offapi/com/sun/star/i18n/KCharacterType.idl
index 099c8a1a16af..c139df49b54e 100644
--- a/offapi/com/sun/star/i18n/KCharacterType.idl
+++ b/offapi/com/sun/star/i18n/KCharacterType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@ module com {  module sun {  module star {  module i18n {
 
 /**
     Constants to identify the character type.
-
+    
     <p> Returned by
     <member>XCharacterClassification::getCharacterType()</member> and
     <member>XCharacterClassification::getStringType()</member> </p>
@@ -45,28 +45,28 @@ published constants KCharacterType
 {
     /// digit
     const long DIGIT      = 0x00000001;
-
+    
     /// upper case alpha letter
     const long UPPER      = 0x00000002;
-
+    
     /// lower case alpha letter
     const long LOWER      = 0x00000004;
-
+    
     /// title case alpha letter
     const long TITLE_CASE = 0x00000008;
-
+    
     /// any alpha, ALPHA = UPPER | LOWER | TITLE_CASE
     const long ALPHA      = 0x0000000E;
-
+    
     /// control character
     const long CONTROL    = 0x00000010;
-
+    
     /// printable character
     const long PRINTABLE  = 0x00000020;
-
+    
     /// base form
     const long BASE_FORM  = 0x00000040;
-
+    
     /** any <type>UnicodeType</type>::..._LETTER.
         Note that a LETTER must not necessarily be ALPHA */
     const long LETTER     = 0x00000080;
diff --git a/offapi/com/sun/star/i18n/KNumberFormatType.idl b/offapi/com/sun/star/i18n/KNumberFormatType.idl
index 3d9ffc51b991..9aa6e46e926c 100644
--- a/offapi/com/sun/star/i18n/KNumberFormatType.idl
+++ b/offapi/com/sun/star/i18n/KNumberFormatType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/KNumberFormatUsage.idl b/offapi/com/sun/star/i18n/KNumberFormatUsage.idl
index 0300c4dfbd3a..95e14a5e4282 100644
--- a/offapi/com/sun/star/i18n/KNumberFormatUsage.idl
+++ b/offapi/com/sun/star/i18n/KNumberFormatUsage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/KParseTokens.idl b/offapi/com/sun/star/i18n/KParseTokens.idl
index fccaf55e31fb..28216d109977 100644
--- a/offapi/com/sun/star/i18n/KParseTokens.idl
+++ b/offapi/com/sun/star/i18n/KParseTokens.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module i18n {
 /**
     These constants specify the characters a name or identifier token to
     be parsed can have.
-
+    
     <p> They are passed to
     <member>XCharacterClassification::parseAnyToken()</member> and
     <member>XCharacterClassification::parsePredefinedToken()</member>.
@@ -144,7 +144,7 @@ published constants KParseTokens
 
     /// Unicode (above 127) alphanumeric
     const long UNI_ALNUM            = UNI_ALPHA | UNI_DIGIT;
-
+    
     /// Unicode (above 127) alpha or letter
     const long UNI_LETTER           = UNI_ALPHA | UNI_MODIFIER_LETTER |
                                         UNI_OTHER_LETTER;
@@ -167,7 +167,7 @@ published constants KParseTokens
 
     /// any (ASCII or Unicode) number
     const long ANY_NUMBER           = ASC_DIGIT | UNI_NUMBER;
-
+    
     /// any (ASCII or Unicode) letter or number
     const long ANY_LETTER_OR_NUMBER = ANY_LETTER | ANY_NUMBER;
 };
diff --git a/offapi/com/sun/star/i18n/KParseType.idl b/offapi/com/sun/star/i18n/KParseType.idl
index eaf34d2de4a9..c62f86095785 100644
--- a/offapi/com/sun/star/i18n/KParseType.idl
+++ b/offapi/com/sun/star/i18n/KParseType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/LanguageCountryInfo.idl b/offapi/com/sun/star/i18n/LanguageCountryInfo.idl
index 74c6ccf4aebd..6efe4e14f8b1 100644
--- a/offapi/com/sun/star/i18n/LanguageCountryInfo.idl
+++ b/offapi/com/sun/star/i18n/LanguageCountryInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/LineBreakHyphenationOptions.idl b/offapi/com/sun/star/i18n/LineBreakHyphenationOptions.idl
index fb58e57fc9d1..feadc27055e9 100644
--- a/offapi/com/sun/star/i18n/LineBreakHyphenationOptions.idl
+++ b/offapi/com/sun/star/i18n/LineBreakHyphenationOptions.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ published struct LineBreakHyphenationOptions
     /// Reference to the specific hyphenator - can be zero.
     ::com::sun::star::linguistic2::XHyphenator rHyphenator;
 
-    /** Sequence of property values to be used by the hyphenator - can be
+    /** Sequence of property values to be used by the hyphenator - can be 
         empty if the default values (from the property set) should be used. */
     ::com::sun::star::beans::PropertyValues aHyphenationOptions;
 
diff --git a/offapi/com/sun/star/i18n/LineBreakResults.idl b/offapi/com/sun/star/i18n/LineBreakResults.idl
index 00b34baeee68..7d1bfbea2f8b 100644
--- a/offapi/com/sun/star/i18n/LineBreakResults.idl
+++ b/offapi/com/sun/star/i18n/LineBreakResults.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/LineBreakUserOptions.idl b/offapi/com/sun/star/i18n/LineBreakUserOptions.idl
index 549a3ccba89e..f43736298aa1 100644
--- a/offapi/com/sun/star/i18n/LineBreakUserOptions.idl
+++ b/offapi/com/sun/star/i18n/LineBreakUserOptions.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/LocaleCalendar.idl b/offapi/com/sun/star/i18n/LocaleCalendar.idl
index e34d88731378..fd3c06ddd092 100644
--- a/offapi/com/sun/star/i18n/LocaleCalendar.idl
+++ b/offapi/com/sun/star/i18n/LocaleCalendar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/LocaleData.idl b/offapi/com/sun/star/i18n/LocaleData.idl
index 69846c11948f..0ccb1fdfe6b5 100644
--- a/offapi/com/sun/star/i18n/LocaleData.idl
+++ b/offapi/com/sun/star/i18n/LocaleData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/LocaleDataItem.idl b/offapi/com/sun/star/i18n/LocaleDataItem.idl
index d628c0a40196..11c707ce117d 100644
--- a/offapi/com/sun/star/i18n/LocaleDataItem.idl
+++ b/offapi/com/sun/star/i18n/LocaleDataItem.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/LocaleItem.idl b/offapi/com/sun/star/i18n/LocaleItem.idl
index ef2a19b4bc27..621f7e202d5e 100644
--- a/offapi/com/sun/star/i18n/LocaleItem.idl
+++ b/offapi/com/sun/star/i18n/LocaleItem.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,45 +50,45 @@ module com {  module sun {  module star {  module i18n {
 published constants LocaleItem
 {
     /// @see ::com::sun::star::i18n::LocaleDataItem::dateSeparator
-    const short DATE_SEPARATOR          = 0;
+    const short DATE_SEPARATOR			= 0;
     /// @see com::sun::star::i18n::LocaleDataItem::thousandSeparator
-    const short THOUSAND_SEPARATOR      = 1;
+    const short THOUSAND_SEPARATOR		= 1;
     /// @see com::sun::star::i18n::LocaleDataItem::decimalSeparator
-    const short DECIMAL_SEPARATOR       = 2;
+    const short DECIMAL_SEPARATOR		= 2;
     /// @see com::sun::star::i18n::LocaleDataItem::timeSeparator
-    const short TIME_SEPARATOR          = 3;
+    const short TIME_SEPARATOR			= 3;
     /// @see com::sun::star::i18n::LocaleDataItem::time100SecSeparator
-    const short TIME_100SEC_SEPARATOR   = 4;
+    const short TIME_100SEC_SEPARATOR	= 4;
     /// @see com::sun::star::i18n::LocaleDataItem::listSeparator
-    const short LIST_SEPARATOR          = 5;
+    const short LIST_SEPARATOR			= 5;
     /// @see com::sun::star::i18n::LocaleDataItem::quotationStart
-    const short SINGLE_QUOTATION_START  = 6;
+    const short SINGLE_QUOTATION_START	= 6;
     /// @see com::sun::star::i18n::LocaleDataItem::quotationEnd
-    const short SINGLE_QUOTATION_END    = 7;
+    const short SINGLE_QUOTATION_END	= 7;
     /// @see com::sun::star::i18n::LocaleDataItem::doubleQuotationStart
-    const short DOUBLE_QUOTATION_START  = 8;
+    const short DOUBLE_QUOTATION_START	= 8;
     /// @see com::sun::star::i18n::LocaleDataItem::doubleQuotationEnd
-    const short DOUBLE_QUOTATION_END    = 9;
+    const short DOUBLE_QUOTATION_END	= 9;
     /// @see com::sun::star::i18n::LocaleDataItem::timeAM
-    const short MEASUREMENT_SYSTEM      = 10;
+    const short MEASUREMENT_SYSTEM		= 10;
     /// @see com::sun::star::i18n::LocaleDataItem::timePM
-    const short TIME_AM                 = 11;
+    const short TIME_AM					= 11;
     /// @see com::sun::star::i18n::LocaleDataItem::measurementSystem
-    const short TIME_PM                 = 12;
+    const short TIME_PM					= 12;
     /// @see com::sun::star::i18n::LocaleDataItem::LongDateDayOfWeekSeparator
-    const short LONG_DATE_DAY_OF_WEEK_SEPARATOR = 13;
+    const short LONG_DATE_DAY_OF_WEEK_SEPARATOR	= 13;
     /// @see com::sun::star::i18n::LocaleDataItem::LongDateDaySeparator
-    const short LONG_DATE_DAY_SEPARATOR = 14;
+    const short LONG_DATE_DAY_SEPARATOR	= 14;
     /// @see com::sun::star::i18n::LocaleDataItem::LongDateMonthSeparator
-    const short LONG_DATE_MONTH_SEPARATOR   = 15;
+    const short LONG_DATE_MONTH_SEPARATOR	= 15;
     /// @see com::sun::star::i18n::LocaleDataItem::LongDateYearSeparator
-    const short LONG_DATE_YEAR_SEPARATOR    = 16;
+    const short LONG_DATE_YEAR_SEPARATOR	= 16;
 
     //! New values may be inserted here if locale data provides them.
     //! Do not forget to adjust the COUNT value.
 
     /// count of items available
-    const short COUNT                   = 17;
+    const short COUNT					= 17;
 };
 
 
diff --git a/offapi/com/sun/star/i18n/Months.idl b/offapi/com/sun/star/i18n/Months.idl
index 8ea0c03b25d0..1829928dd3bf 100644
--- a/offapi/com/sun/star/i18n/Months.idl
+++ b/offapi/com/sun/star/i18n/Months.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,29 +41,29 @@ module com { module sun { module star { module i18n {
 published constants Months
 {
     /// January
-    const short JANUARY     = 0;
+    const short JANUARY		= 0;
     /// February
-    const short FEBURARY    = 1;
-    /// March
-    const short MARCH       = 2;
+    const short FEBURARY	= 1;
+    /// March 
+    const short MARCH		= 2;
     /// April
-    const short APRIL       = 3;
+    const short APRIL		= 3;
     /// May
-    const short MAY         = 4;
+    const short MAY			= 4;
     /// June
-    const short JUNE        = 5;
+    const short JUNE		= 5;
     /// July
-    const short JULY        = 6;
+    const short JULY		= 6;
     /// August
-    const short AUGUST      = 7;
+    const short AUGUST		= 7;
     /// September
-    const short SEPTEMBER   = 8;
+    const short SEPTEMBER	= 8;
     /// October
-    const short OCTOBER     = 9;
+    const short OCTOBER		= 9;
     /// November
-    const short NOVEMBER    = 10;
+    const short NOVEMBER	= 10;
     /// December
-    const short DECEMBER    = 11;
+    const short DECEMBER	= 11;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/i18n/MultipleCharsOutputException.idl b/offapi/com/sun/star/i18n/MultipleCharsOutputException.idl
index f0dcd01ee0f9..57246988bc1f 100644
--- a/offapi/com/sun/star/i18n/MultipleCharsOutputException.idl
+++ b/offapi/com/sun/star/i18n/MultipleCharsOutputException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/NativeNumberMode.idl b/offapi/com/sun/star/i18n/NativeNumberMode.idl
index c3294973739c..ccba736db4fd 100644
--- a/offapi/com/sun/star/i18n/NativeNumberMode.idl
+++ b/offapi/com/sun/star/i18n/NativeNumberMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
- *
+ * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/NativeNumberSupplier.idl b/offapi/com/sun/star/i18n/NativeNumberSupplier.idl
index 2f0f6fda1dc8..4b750babb6f9 100644
--- a/offapi/com/sun/star/i18n/NativeNumberSupplier.idl
+++ b/offapi/com/sun/star/i18n/NativeNumberSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/NativeNumberXmlAttributes.idl b/offapi/com/sun/star/i18n/NativeNumberXmlAttributes.idl
index efc7e663cd4b..3063327246e0 100644
--- a/offapi/com/sun/star/i18n/NativeNumberXmlAttributes.idl
+++ b/offapi/com/sun/star/i18n/NativeNumberXmlAttributes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
- *
+ * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ module com { module sun { module star { module i18n {
 
 //=============================================================================
 
-/**
+/** 
     Attributes describing a native number mode for a specific locale,
     stored in XML file format.
 
@@ -52,7 +52,7 @@ published struct NativeNumberXmlAttributes
 {
     /// The locale of the native number representation
     ::com::sun::star::lang::Locale  Locale;
-
+    
     /// The number "1" expressed as a native number string.
     string  Format;
 
diff --git a/offapi/com/sun/star/i18n/NumberFormatCode.idl b/offapi/com/sun/star/i18n/NumberFormatCode.idl
index ca0039db5ce2..a2161ea9887e 100644
--- a/offapi/com/sun/star/i18n/NumberFormatCode.idl
+++ b/offapi/com/sun/star/i18n/NumberFormatCode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/NumberFormatIndex.idl b/offapi/com/sun/star/i18n/NumberFormatIndex.idl
index 38163215d054..46175429e1e2 100644
--- a/offapi/com/sun/star/i18n/NumberFormatIndex.idl
+++ b/offapi/com/sun/star/i18n/NumberFormatIndex.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -100,151 +100,151 @@ module com { module sun { module star { module i18n {
 published constants NumberFormatIndex
 {
     /// Start of simple numerical formats (first format)
-    const short NUMBER_START                = 0;
+    const short NUMBER_START				= 0;
     /// The "General" standard format
-    const short NUMBER_STANDARD             = NUMBER_START;
+    const short NUMBER_STANDARD				= NUMBER_START;
     /// 0           <br/>Integer number
-    const short NUMBER_INT                  = NUMBER_START+1;
+    const short NUMBER_INT					= NUMBER_START+1;
     /// 0.00        <br/>Decimal number with 2 decimals
-    const short NUMBER_DEC2                 = NUMBER_START+2;
+    const short NUMBER_DEC2 				= NUMBER_START+2;
     /// #,##0       <br/>Integer number with group separator
-    const short NUMBER_1000INT              = NUMBER_START+3;
+    const short NUMBER_1000INT				= NUMBER_START+3;
     /// #,##0.00    <br/>Decimal number with group separator
-    const short NUMBER_1000DEC2             = NUMBER_START+4;
+    const short NUMBER_1000DEC2				= NUMBER_START+4;
     /// #,##0.00    <br/> In SO5/Win this format was retrieved from the Regional Settings
-    const short NUMBER_SYSTEM               = NUMBER_START+5;
+    const short NUMBER_SYSTEM				= NUMBER_START+5;
     /// End of simple numerical formats (last format)
-    const short NUMBER_END                  = NUMBER_SYSTEM ;
+    const short NUMBER_END					= NUMBER_SYSTEM ;
 
 
     /// Start of Scientific formats (first format)
-    const short SCIENTIFIC_START            = NUMBER_END+1;
+    const short SCIENTIFIC_START			= NUMBER_END+1;
     /// 0.00E+000   <br/>Number in scientific notation with exponent in 3 digit placeholders
-    const short SCIENTIFIC_000E000          = SCIENTIFIC_START;
+    const short SCIENTIFIC_000E000			= SCIENTIFIC_START;
     /// 0.00E+00    <br/>Number in scientific notation with exponent in 2 digit placeholders
-    const short SCIENTIFIC_000E00           = SCIENTIFIC_START+1;
+    const short SCIENTIFIC_000E00			= SCIENTIFIC_START+1;
     /// End of Scientific formats (last format)
-    const short SCIENTIFIC_END              = SCIENTIFIC_000E00;
+    const short SCIENTIFIC_END				= SCIENTIFIC_000E00;
 
 
     /// Start of Percent formats (first format)
-    const short PERCENT_START               = SCIENTIFIC_END+1;
+    const short PERCENT_START				= SCIENTIFIC_END+1;
     /// 0%          <br/>Percentage format, rounded to integer
-    const short PERCENT_INT                 = PERCENT_START;
+    const short PERCENT_INT					= PERCENT_START;
     /// 0.00%       <br/>Percentage format, rounded to 2 decimals
-    const short PERCENT_DEC2                = PERCENT_START+1;
+    const short PERCENT_DEC2				= PERCENT_START+1;
     /// End of Percent formats (last format)
-    const short PERCENT_END                 = PERCENT_DEC2;
+    const short PERCENT_END					= PERCENT_DEC2;
 
 
     /// Start of Fraction formats (first format)
-    const short FRACTION_START              = PERCENT_END+1;
+    const short FRACTION_START				= PERCENT_END+1;
     /// # ?/?       <br/>Number with decimal in fraction in 1 digit placeholder
-    const short FRACTION_1                  = FRACTION_START;
+    const short FRACTION_1					= FRACTION_START;
     /// # ??/??     <br/>Number with decimal in fraction in 2 digit placeholders
-    const short FRACTION_2                  = FRACTION_START+1;
+    const short FRACTION_2					= FRACTION_START+1;
     /// End of Fraction formats (last format)
-    const short FRACTION_END                = FRACTION_2;
+    const short FRACTION_END				= FRACTION_2;
 
 
     /// Start of Currency formats (first format)
-    const short CURRENCY_START              = FRACTION_END+1;
+    const short CURRENCY_START				= FRACTION_END+1;
     /// #,##0 DM    <br/>Integer currency format with group separator
-    const short CURRENCY_1000INT            = CURRENCY_START;
+    const short CURRENCY_1000INT			= CURRENCY_START;
     /// #,##0.00 DM <br/>Decimal currency format with group separator
-    const short CURRENCY_1000DEC2           = CURRENCY_START+1;
+    const short CURRENCY_1000DEC2			= CURRENCY_START+1;
     /// #,##0 DM    <br/>Integer currency format with negative in red
-    const short CURRENCY_1000INT_RED        = CURRENCY_START+2;
+    const short CURRENCY_1000INT_RED		= CURRENCY_START+2;
     /// #,##0.00 DM <br/>Decimal currency format with negative in red
-    const short CURRENCY_1000DEC2_RED       = CURRENCY_START+3;
+    const short CURRENCY_1000DEC2_RED		= CURRENCY_START+3;
     /// #,##0.00 DEM <br/>Currency in ISO-4217 abbreviation format
-    const short CURRENCY_1000DEC2_CCC       = CURRENCY_START+4;
+    const short CURRENCY_1000DEC2_CCC		= CURRENCY_START+4;
     /// #,##0.-- DM <br/>Currency format with dash representing 0 in decimals
-    const short CURRENCY_1000DEC2_DASHED    = CURRENCY_START+5;
+    const short CURRENCY_1000DEC2_DASHED	= CURRENCY_START+5;
     /// End of Currency formats (last format)
-    const short CURRENCY_END                = CURRENCY_1000DEC2_DASHED;
+    const short CURRENCY_END				= CURRENCY_1000DEC2_DASHED;
 
 
     /// Start of Date formats (first format)
-    const short DATE_START                  = CURRENCY_END+1;
+    const short DATE_START					= CURRENCY_END+1;
     /// 08.10.97        <br/> see also DATE_SYSTEM_... <a href="#SYSTEM">explanation</a>
-    const short DATE_SYSTEM_SHORT           = DATE_START;
+    const short DATE_SYSTEM_SHORT			= DATE_START;
     /// Wednesday, 8. October 1997  <br/> see also DATE_SYSTEM_... <a href="#SYSTEM">explanation</a>
-    const short DATE_SYSTEM_LONG            = DATE_START+1;
+    const short DATE_SYSTEM_LONG			= DATE_START+1;
     /// 08.10.97        <br/> see also DATE_SYS_... <a href="#SYS">explanation</a>
-    const short DATE_SYS_DDMMYY             = DATE_START+2;
+    const short DATE_SYS_DDMMYY   			= DATE_START+2;
     /** 08.10.1997      <br/> see also DATE_SYS_... <a href="#SYS">explanation</a>
         <br/><b>Note:</b> When editing already existing date data this
         format is forced in order to always edit the full century.  */
-    const short DATE_SYS_DDMMYYYY           = DATE_START+3;
+    const short DATE_SYS_DDMMYYYY 			= DATE_START+3;
     /// 8. Oct 97       <br/> see also DATE_SYS_... <a href="#SYS">explanation</a>
-    const short DATE_SYS_DMMMYY             = DATE_START+4;
+    const short DATE_SYS_DMMMYY   			= DATE_START+4;
     /// 8. Oct 1997     <br/> see also DATE_SYS_... <a href="#SYS">explanation</a>
-    const short DATE_SYS_DMMMYYYY           = DATE_START+5;
+    const short DATE_SYS_DMMMYYYY 			= DATE_START+5;
     /// 8. Oct. 1997    <br/> DIN/EN
-    const short DATE_DIN_DMMMYYYY           = DATE_START+6;
+    const short DATE_DIN_DMMMYYYY 			= DATE_START+6;
     /// 8. October 1997 <br/> see also DATE_SYS_... <a href="#SYS">explanation</a>
-    const short DATE_SYS_DMMMMYYYY          = DATE_START+7;
+    const short DATE_SYS_DMMMMYYYY			= DATE_START+7;
     /// 8. October 1997 <br/> DIN/EN
-    const short DATE_DIN_DMMMMYYYY          = DATE_START+8;
+    const short DATE_DIN_DMMMMYYYY			= DATE_START+8;
     /// Wed, 8. Oct 97  <br/> see also DATE_SYS_... <a href="#SYS">explanation</a>
-    const short DATE_SYS_NNDMMMYY           = DATE_START+9;
+    const short DATE_SYS_NNDMMMYY 			= DATE_START+9;
     /// Wed 08.Oct 97   <br/> see also DATE_DEF_... <a href="#DEF">explanation</a>
-    const short DATE_DEF_NNDDMMMYY          = DATE_START+10;
+    const short DATE_DEF_NNDDMMMYY			= DATE_START+10;
     /// Wed, 8. October 1997    <br/> see also DATE_SYS_... <a href="#SYS">explanation</a>
-    const short DATE_SYS_NNDMMMMYYYY        = DATE_START+11;
+    const short DATE_SYS_NNDMMMMYYYY		= DATE_START+11;
     /// Wednesday, 8. October 1997
-    const short DATE_SYS_NNNNDMMMMYYYY      = DATE_START+12;
+    const short DATE_SYS_NNNNDMMMMYYYY		= DATE_START+12;
     /// 10-08           <br/> DIN/EN
-    const short DATE_DIN_MMDD               = DATE_START+13;
+    const short DATE_DIN_MMDD				= DATE_START+13;
     /// 97-10-08        <br/> DIN/EN/ISO
-    const short DATE_DIN_YYMMDD             = DATE_START+14;
+    const short DATE_DIN_YYMMDD				= DATE_START+14;
     /// 1997-10-08      <br/> DIN/EN/ISO
-    const short DATE_DIN_YYYYMMDD           = DATE_START+15;
+    const short DATE_DIN_YYYYMMDD			= DATE_START+15;
     /// 10.97           <br/> see also DATE_SYS_... <a href="#SYS">explanation</a>
-    const short DATE_SYS_MMYY               = DATE_START+16;
+    const short DATE_SYS_MMYY				= DATE_START+16;
     /// 08.Oct          <br/> see also DATE_SYS_... <a href="#SYS">explanation</a>
-    const short DATE_SYS_DDMMM              = DATE_START+17;
+    const short DATE_SYS_DDMMM				= DATE_START+17;
     /// October
-    const short DATE_MMMM                   = DATE_START+18;
+    const short DATE_MMMM					= DATE_START+18;
     /// 4th quarter 97
-    const short DATE_QQJJ                   = DATE_START+19;
+    const short DATE_QQJJ					= DATE_START+19;
     /// week of year
-    const short DATE_WW                     = DATE_START+20;
+    const short DATE_WW						= DATE_START+20;
     /// End of Date formats (last format)
-    const short DATE_END                    = DATE_WW;
+    const short DATE_END					= DATE_WW;
 
 
     /// Start of Time formats (first format)
-    const short TIME_START                  = DATE_END+1;
+    const short TIME_START					= DATE_END+1;
     /// HH:MM           <br/>Time format with hour and minute
-    const short TIME_HHMM                   = TIME_START;
+    const short TIME_HHMM					= TIME_START;
     /// HH:MM:SS        <br/>Time format with hour, minute and second
-    const short TIME_HHMMSS                 = TIME_START+1;
+    const short TIME_HHMMSS					= TIME_START+1;
     /// HH:MM AM/PM     <br/>Time format with hour, minute and morning/afternoon notation
-    const short TIME_HHMMAMPM               = TIME_START+2;
+    const short TIME_HHMMAMPM				= TIME_START+2;
     /// HH:MM:SS AM/PM  <br/>Time format with hour, minute, second and morning/afternoon notation
-    const short TIME_HHMMSSAMPM             = TIME_START+3;
+    const short TIME_HHMMSSAMPM				= TIME_START+3;
     /// [HH]:MM:SS      <br/>Time format with amount of hours
-    const short TIME_HH_MMSS                = TIME_START+4;
+    const short TIME_HH_MMSS				= TIME_START+4;
     /// MM:SS,00        <br/>Time format with second in fraction
-    const short TIME_MMSS00                 = TIME_START+5;
+    const short TIME_MMSS00					= TIME_START+5;
     /// [HH]:MM:SS,00   <br/>Time format with amount of hours and seconds with fraction
-    const short TIME_HH_MMSS00              = TIME_START+6;
+    const short TIME_HH_MMSS00				= TIME_START+6;
     /// End of Time formats (last format)
-    const short TIME_END                    = TIME_HH_MMSS00;
+    const short TIME_END					= TIME_HH_MMSS00;
 
 
     /// Start of DateTime formats (first format)
-    const short DATETIME_START              = TIME_END + 1;
+    const short DATETIME_START				= TIME_END + 1;
     /// 08.10.97 01:23 Date/time format
-    const short DATETIME_SYSTEM_SHORT_HHMM  = DATETIME_START;
+    const short DATETIME_SYSTEM_SHORT_HHMM	= DATETIME_START;
     /** 08.10.1997 01:23:45 Date/time format with second
         <br/><b>Note:</b> When editing already existing date/time data this
         format is forced in order to always edit the full century.  */
     const short DATETIME_SYS_DDMMYYYY_HHMMSS= DATETIME_START+1;
     /// End of DateTime formats (last format)
-    const short DATETIME_END                = DATETIME_SYS_DDMMYYYY_HHMMSS;
+    const short DATETIME_END				= DATETIME_SYS_DDMMYYYY_HHMMSS;
 
 
     /**
@@ -256,7 +256,7 @@ published constants NumberFormatIndex
             do it via <member scope="com::sun::star::util">XNumberFormatTypes::getFormatIndex()</member>
             instead of <member>XNumberFormatCode::getFormatCode()</member>.
     */
-    const short BOOLEAN                     = DATETIME_END+1;
+    const short BOOLEAN						= DATETIME_END+1;
 
     /**
         Text format
@@ -267,10 +267,10 @@ published constants NumberFormatIndex
             do it via <member scope="com::sun::star::util">XNumberFormatTypes::getFormatIndex()</member>
             instead of <member>XNumberFormatCode::getFormatCode()</member>
     */
-    const short TEXT                        = BOOLEAN+1;
+    const short TEXT						= BOOLEAN+1;
 
     /// count of built-in format codes.
-    const short INDEX_TABLE_ENTRIES         = TEXT+1;
+    const short INDEX_TABLE_ENTRIES			= TEXT+1;
 };
 
 
diff --git a/offapi/com/sun/star/i18n/NumberFormatMapper.idl b/offapi/com/sun/star/i18n/NumberFormatMapper.idl
index 043e9450f42e..544ada5f45ca 100644
--- a/offapi/com/sun/star/i18n/NumberFormatMapper.idl
+++ b/offapi/com/sun/star/i18n/NumberFormatMapper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/OrdinalSuffix.idl b/offapi/com/sun/star/i18n/OrdinalSuffix.idl
index 500ef74ccffc..a2909ad40f32 100644
--- a/offapi/com/sun/star/i18n/OrdinalSuffix.idl
+++ b/offapi/com/sun/star/i18n/OrdinalSuffix.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/ParseResult.idl b/offapi/com/sun/star/i18n/ParseResult.idl
index e50ac2053a07..8f531c853fe5 100644
--- a/offapi/com/sun/star/i18n/ParseResult.idl
+++ b/offapi/com/sun/star/i18n/ParseResult.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/ScriptDirection.idl b/offapi/com/sun/star/i18n/ScriptDirection.idl
index 97437d3f3b3a..600a6742046d 100644
--- a/offapi/com/sun/star/i18n/ScriptDirection.idl
+++ b/offapi/com/sun/star/i18n/ScriptDirection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ module com {  module sun {  module star {  module i18n {
      @since OOo 1.1.2
 */
 
-published constants ScriptDirection
+published constants ScriptDirection 
 {
     /// Script direction is neutral
     const short NEUTRAL         = 0;
diff --git a/offapi/com/sun/star/i18n/ScriptType.idl b/offapi/com/sun/star/i18n/ScriptType.idl
index f50ee82347f1..f046fed8df1c 100644
--- a/offapi/com/sun/star/i18n/ScriptType.idl
+++ b/offapi/com/sun/star/i18n/ScriptType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/TextConversion.idl b/offapi/com/sun/star/i18n/TextConversion.idl
index 42fcb192294e..ac40fb411e73 100644
--- a/offapi/com/sun/star/i18n/TextConversion.idl
+++ b/offapi/com/sun/star/i18n/TextConversion.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@ published service TextConversion
     /** to access the text conversion functionality.
     */
     interface ::com::sun::star::i18n::XTextConversion;
-
+    
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/i18n/TextConversionOption.idl b/offapi/com/sun/star/i18n/TextConversionOption.idl
index 8f70cfb08bac..79b0113fabd8 100644
--- a/offapi/com/sun/star/i18n/TextConversionOption.idl
+++ b/offapi/com/sun/star/i18n/TextConversionOption.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@ module com {  module sun {  module star {  module i18n {
 //--------------------------------------------------------------------------
 /** Text conversion options to be used with <type>XTextConversion</type>.
 
-    <p>These text conversion options are usuall selected by end users.
+    <p>These text conversion options are usuall selected by end users. 
     The options can be combined and may be related to
     <type>TextConversionType</type>. </p>
 
@@ -54,14 +54,14 @@ published constants TextConversionOption
     const long  CHARACTER_BY_CHARACTER          = 1;    // (1 << 0)
 
     /// Ignore post-positional word for Hangul to Hanja conversion
-    const long  IGNORE_POST_POSITIONAL_WORD     = 2;    // (1 << 1)
+    const long	IGNORE_POST_POSITIONAL_WORD 	= 2;	// (1 << 1)
 
-    /** Use Taiwan, HongKong SAR, and Macao SAR character variants for
+    /** Use Taiwan, HongKong SAR, and Macao SAR character variants for 
         Simplified to Traditionary Chinese conversion
 
         @since OOo 2.0.0
     */
-    const long  USE_CHARACTER_VARIANTS          = 2;    // (1 << 1)
+    const long	USE_CHARACTER_VARIANTS 	        = 2;	// (1 << 1)
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/i18n/TextConversionResult.idl b/offapi/com/sun/star/i18n/TextConversionResult.idl
index 226687ec3d67..fc87463598ed 100644
--- a/offapi/com/sun/star/i18n/TextConversionResult.idl
+++ b/offapi/com/sun/star/i18n/TextConversionResult.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,15 +49,15 @@ published struct TextConversionResult
 {
     /** The boundary of the first convertible word in the given text.
 
-        <p>If there is no convertible word found in the text, <var>startPos</var>
-        and <var>endPos</var> for Boundary equal 0.
+        <p>If there is no convertible word found in the text, <var>startPos</var> 
+        and <var>endPos</var> for Boundary equal 0. 
     */
     ::com::sun::star::i18n::Boundary Boundary;
 
     /** A list of replacement candidates for the first convertible word
         found in the given text.
     */
-    sequence < string >     Candidates;
+    sequence < string >		Candidates;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/i18n/TextConversionType.idl b/offapi/com/sun/star/i18n/TextConversionType.idl
index f7c29404aa0c..bcaa63837389 100644
--- a/offapi/com/sun/star/i18n/TextConversionType.idl
+++ b/offapi/com/sun/star/i18n/TextConversionType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module i18n {
 //=============================================================================
 
 //--------------------------------------------------------------------------
-/** These constansts specifiy the conversion type to be used with
+/** These constansts specifiy the conversion type to be used with 
     <type>XTextConversion</type>.
 
      @since OOo 1.1.2
@@ -45,16 +45,16 @@ module com {  module sun {  module star {  module i18n {
 published constants TextConversionType
 {
     /// Conversion from Hanja to Hangul
-    const short TO_HANGUL       = 1;
+    const short	TO_HANGUL 		= 1;
 
     /// Conversion from Hangul to Hanja
-    const short TO_HANJA        = 2;
+    const short	TO_HANJA 		= 2;
 
     /// Conversion from Traditional to Simplified Chinese
-    const short TO_SCHINESE     = 3;
+    const short	TO_SCHINESE 	= 3;
 
     /// Conversion from Simplified to Traditional Chinese
-    const short TO_TCHINESE     = 4;
+    const short	TO_TCHINESE 	= 4;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/i18n/Transliteration.idl b/offapi/com/sun/star/i18n/Transliteration.idl
index 2448a458115d..881a35b40cbc 100644
--- a/offapi/com/sun/star/i18n/Transliteration.idl
+++ b/offapi/com/sun/star/i18n/Transliteration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/TransliterationModules.idl b/offapi/com/sun/star/i18n/TransliterationModules.idl
index 1ac752d52fd8..0b629c034290 100644
--- a/offapi/com/sun/star/i18n/TransliterationModules.idl
+++ b/offapi/com/sun/star/i18n/TransliterationModules.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl b/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
index 17cd0d6a7ba6..142cfc6126c4 100644
--- a/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
+++ b/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,8 +38,8 @@ module com {  module sun {  module star {  module i18n {
 
 /** Extra transliteration module enumeration to use with
     <member>XTransliteration::loadModule()</member>
-
-    The values used in this group need to be different from the ones in
+    
+    The values used in this group need to be different from the ones in 
     <type>TransliterationModules</type> and <type>TransliterationModulesNew</type>!
  */
 
@@ -49,24 +49,24 @@ constants TransliterationModulesExtra
 {
     /** The first character of the sentence is put in upper case
      */
-    const short SENTENCE_CASE = 200;
-
-    //-------------------------------------------------------------------------
-
+    const short SENTENCE_CASE = 200; 
+     
+    //------------------------------------------------------------------------- 
+     
     /** The first character of the word is put in upper case.
-     * This one is part
+     * This one is part 
      */
-    const short TITLE_CASE = 201;
-
-    //-------------------------------------------------------------------------
-
+    const short TITLE_CASE = 201; 
+    
+    //------------------------------------------------------------------------- 
+    
     /** All characters of the word are to change their case from small letters
      * to capital letters and vice versa.
      */
-    const short TOGGLE_CASE = 202;
-
-    //-------------------------------------------------------------------------
-
+    const short TOGGLE_CASE = 202; 
+    
+    //------------------------------------------------------------------------- 
+     
     const long END_OF_MODULE    = 0;
 };
 
diff --git a/offapi/com/sun/star/i18n/TransliterationModulesNew.idl b/offapi/com/sun/star/i18n/TransliterationModulesNew.idl
index 796cf44f5b6e..444c88f8b124 100644
--- a/offapi/com/sun/star/i18n/TransliterationModulesNew.idl
+++ b/offapi/com/sun/star/i18n/TransliterationModulesNew.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/TransliterationType.idl b/offapi/com/sun/star/i18n/TransliterationType.idl
index 4a7b8223ab61..31b8db8c7795 100644
--- a/offapi/com/sun/star/i18n/TransliterationType.idl
+++ b/offapi/com/sun/star/i18n/TransliterationType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/UnicodeScript.idl b/offapi/com/sun/star/i18n/UnicodeScript.idl
index d69d08a60939..453161856f07 100644
--- a/offapi/com/sun/star/i18n/UnicodeScript.idl
+++ b/offapi/com/sun/star/i18n/UnicodeScript.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/UnicodeType.idl b/offapi/com/sun/star/i18n/UnicodeType.idl
index b9e37a8cd034..6432d131adaf 100644
--- a/offapi/com/sun/star/i18n/UnicodeType.idl
+++ b/offapi/com/sun/star/i18n/UnicodeType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/Weekdays.idl b/offapi/com/sun/star/i18n/Weekdays.idl
index 2d17715d56f9..323850281305 100644
--- a/offapi/com/sun/star/i18n/Weekdays.idl
+++ b/offapi/com/sun/star/i18n/Weekdays.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,19 +44,19 @@ module com { module sun { module star { module i18n {
 published constants Weekdays
 {
     /// Sunday
-    const short SUNDAY      = 0;
+    const short SUNDAY		= 0;
     /// Monday
-    const short MONDAY      = 1;
+    const short MONDAY		= 1;
     /// Tuesday
-    const short TUESDAY     = 2;
+    const short TUESDAY		= 2;
     /// Wednesday
-    const short WEDNESDAY   = 3;
+    const short WEDNESDAY	= 3;
     /// Thursday
-    const short THURSDAY    = 4;
+    const short THURSDAY	= 4;
     /// Friday
-    const short FRIDAY      = 5;
+    const short FRIDAY		= 5;
     /// Saturday
-    const short SATURDAY    = 6;
+    const short SATURDAY	= 6;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/i18n/WordType.idl b/offapi/com/sun/star/i18n/WordType.idl
index 44108d9f48ca..ad5f2ea1f1b1 100644
--- a/offapi/com/sun/star/i18n/WordType.idl
+++ b/offapi/com/sun/star/i18n/WordType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/XBreakIterator.idl b/offapi/com/sun/star/i18n/XBreakIterator.idl
index b1bf01526548..9413e8c09c95 100644
--- a/offapi/com/sun/star/i18n/XBreakIterator.idl
+++ b/offapi/com/sun/star/i18n/XBreakIterator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ module com {  module sun {  module star {  module i18n {
 
 //============================================================================
 
-/**
+/** 
     contains the base routines for iteration in Unicode string. Iterates over
     characters, words, sentences and line breaks.
 
@@ -63,7 +63,7 @@ module com {  module sun {  module star {  module i18n {
 published interface XBreakIterator: com::sun::star::uno::XInterface
 {
     //------------------------------------------------------------------------
-    /** Traverses specified number of characters/cells in Text from
+    /** Traverses specified number of characters/cells in Text from 
         <em>nStartPos</em> forwards.
         <type>CharacterIteratorMode</type> can be cell based or
         character based. A cell is made of more than one character.
@@ -79,7 +79,7 @@ published interface XBreakIterator: com::sun::star::uno::XInterface
                      [in] long nCount, [out] long nDone );
 
     //------------------------------------------------------------------------
-    /** Traverses specified number of characters/cells in Text from
+    /** Traverses specified number of characters/cells in Text from 
         <em>nStartPos</em> backwards.
         <type>CharacterIteratorMode</type> can be cell based or
         character based. A cell is made of more than one character.
@@ -174,8 +174,8 @@ published interface XBreakIterator: com::sun::star::uno::XInterface
         position <em>nPos</em>.
 
         <p> This method is mis-defined, since <type>WordType</type>
-        is not an attribute of a word, but a way to break words,
-        like excluding or including tail spaces for spellchecker
+        is not an attribute of a word, but a way to break words, 
+        like excluding or including tail spaces for spellchecker 
         or cursor traveling. It returns 0 always.
         </p>
      */
@@ -185,8 +185,8 @@ published interface XBreakIterator: com::sun::star::uno::XInterface
     //------------------------------------------------------------------------
     /** If a word starts at position <em>nPos</em>.
 
-        <p> It is possible that both of this method
-        and following method <em>isEndWord</em> all return
+        <p> It is possible that both of this method 
+        and following method <em>isEndWord</em> all return 
         <TRUE/>, since StartPos of a word is inclusive
         while EndPos of a word is exclusive.
         </p>
@@ -230,7 +230,7 @@ published interface XBreakIterator: com::sun::star::uno::XInterface
         @param nMinBreakPos
             Defines a minimum break position for hyphenated line break.
             When the position for hyphenated line break is less than
-            <em>nMinBreakPos</em>, break position in
+            <em>nMinBreakPos</em>, break position in 
             <type>LineBreakResults</type> is set to -1.
 
         @param aHyphOptions
@@ -241,8 +241,8 @@ published interface XBreakIterator: com::sun::star::uno::XInterface
             characters at the start/end of a line.
 
         @returns
-            The <type>LineBreakResults</type> contain the break
-            position of the line, <type>BreakType</type> and
+            The <type>LineBreakResults</type> contain the break 
+            position of the line, <type>BreakType</type> and 
             <type scope="com::sun::star::linguistic2">XHyphenatedWord</type>
      */
     LineBreakResults getLineBreak( [in] string aText, [in] long nStartPos,
diff --git a/offapi/com/sun/star/i18n/XCalendar.idl b/offapi/com/sun/star/i18n/XCalendar.idl
index 04fd12bf73e4..5501666bfcfa 100644
--- a/offapi/com/sun/star/i18n/XCalendar.idl
+++ b/offapi/com/sun/star/i18n/XCalendar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ published interface XCalendar : com::sun::star::uno::XInterface
 
     //------------------------------------------------------------------------
     /// Load a specific calendar for the given locale.
-    void    loadCalendar( [in] string uniqueID,
+    void    loadCalendar( [in] string uniqueID, 
                           [in] ::com::sun::star::lang::Locale rLocale );
 
     //------------------------------------------------------------------------
@@ -217,7 +217,7 @@ published interface XCalendar : com::sun::star::uno::XInterface
             <const>CalendarDisplayIndex::AM_PM</const> </p>
      */
 
-    string  getDisplayName( [in] short nCalendarDisplayIndex,
+    string  getDisplayName( [in] short nCalendarDisplayIndex, 
                             [in] short nIdx,
                             [in] short nNameType );
 };
diff --git a/offapi/com/sun/star/i18n/XCharacterClassification.idl b/offapi/com/sun/star/i18n/XCharacterClassification.idl
index 5b32c032b90a..9e22a2174436 100644
--- a/offapi/com/sun/star/i18n/XCharacterClassification.idl
+++ b/offapi/com/sun/star/i18n/XCharacterClassification.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -126,7 +126,7 @@ published interface XCharacterClassification : com::sun::star::uno::XInterface
 
     //------------------------------------------------------------------------
     /// Get <type>KCharacterType</type> of character at position <em>nPos</em>.
-    long getCharacterType( [in] string aText, [in] long nPos,
+    long getCharacterType( [in] string aText, [in] long nPos, 
                            [in] com::sun::star::lang::Locale aLocale );
 
     //------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/i18n/XCollator.idl b/offapi/com/sun/star/i18n/XCollator.idl
index 72d32886c299..5dbde7dea33b 100644
--- a/offapi/com/sun/star/i18n/XCollator.idl
+++ b/offapi/com/sun/star/i18n/XCollator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,10 +32,10 @@
 #include <com/sun/star/lang/Locale.idl>
 //=============================================================================
 
-module com { module sun { module star { module i18n {
+module com { module sun { module star { module i18n { 
 
 /** provides locale-sensitive collation algorithms for string comparison.
-
+    
 */
 published interface XCollator: com::sun::star::uno::XInterface
 {
@@ -85,7 +85,7 @@ published interface XCollator: com::sun::star::uno::XInterface
     long compareString( [in] string aStr1, [in] string aStr2 );
 
     //-------------------------------------------------------------------------
-    /** Load the collator with default algorithm defined in
+    /** Load the collator with default algorithm defined in 
         locale data.
 
         @param aLocale
@@ -133,7 +133,7 @@ published interface XCollator: com::sun::star::uno::XInterface
     */
     sequence <string> listCollatorAlgorithms(
                                 [in] ::com::sun::star::lang::Locale aLocale );
-
+ 
     //-------------------------------------------------------------------------
     /** Load a collator algorithm with options chosen by end user.
 
@@ -167,7 +167,7 @@ published interface XCollator: com::sun::star::uno::XInterface
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/i18n/XExtendedCalendar.idl b/offapi/com/sun/star/i18n/XExtendedCalendar.idl
index b8b6d9ed9936..795e1b92aa4a 100644
--- a/offapi/com/sun/star/i18n/XExtendedCalendar.idl
+++ b/offapi/com/sun/star/i18n/XExtendedCalendar.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
- *
+ * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/XExtendedIndexEntrySupplier.idl b/offapi/com/sun/star/i18n/XExtendedIndexEntrySupplier.idl
index 0e03605669fd..9c1513856170 100644
--- a/offapi/com/sun/star/i18n/XExtendedIndexEntrySupplier.idl
+++ b/offapi/com/sun/star/i18n/XExtendedIndexEntrySupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
- *
+ * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ module com { module sun { module star { module i18n {
     This interface provides information for creating "Table of Index"
 
     <p> It is derived from
-    <type scope="::com::sun::star::i18n">XIndexEntrySupplier</type> and
+    <type scope="::com::sun::star::i18n">XIndexEntrySupplier</type> and 
     provides following additional functionalities.</p>
     <ul>
     <li>Provide supported language/locale list.
@@ -87,7 +87,7 @@ published interface XExtendedIndexEntrySupplier : ::com::sun::star::i18n::XIndex
 
         @param aIndexAlgorithm
             Index algorithm to be loaded.
-
+            
         @param nCollatorOptions
             Sorting option of <type
             scope="::com::sun::star::i18n">CollatorOptions</type> for
@@ -104,8 +104,8 @@ published interface XExtendedIndexEntrySupplier : ::com::sun::star::i18n::XIndex
     //-------------------------------------------------------------------------
     /**
         Returns index key.
-
-        <p> Note that loadAlgorithm should be called before calling
+        
+        <p> Note that loadAlgorithm should be called before calling 
         this function. </p>
 
         @param aIndexEntry
@@ -127,10 +127,10 @@ published interface XExtendedIndexEntrySupplier : ::com::sun::star::i18n::XIndex
     /**
         Compares index entries
 
-        <p> Note that loadAlgorithm should be called before calling
+        <p> Note that loadAlgorithm should be called before calling 
         this function. </p>
 
-        @param aIndexEntry1
+        @param aIndexEntry1 
         @param aIndexEntry2
             Index entries to be compared
 
diff --git a/offapi/com/sun/star/i18n/XExtendedInputSequenceChecker.idl b/offapi/com/sun/star/i18n/XExtendedInputSequenceChecker.idl
index 50ed96871610..37f2432a7094 100644
--- a/offapi/com/sun/star/i18n/XExtendedInputSequenceChecker.idl
+++ b/offapi/com/sun/star/i18n/XExtendedInputSequenceChecker.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
- *
+ * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,14 +41,14 @@ module com { module sun { module star { module i18n {
     This interface perform input sequence correction for the languages like Thai and Hindi
 
     <p> It is derived from
-    <type scope="::com::sun::star::i18n">XInputSequenceChecker</type> and
+    <type scope="::com::sun::star::i18n">XInputSequenceChecker</type> and 
     provides additional functionality to correct input sequence.</p>
 
      @since OOo 2.0.1
  */
 published interface XExtendedInputSequenceChecker : ::com::sun::star::i18n::XInputSequenceChecker
 {
-    /** @returns
+    /** @returns 
             Next nPos, or length of aText if nothing is corrected.
 
         @param nInputCheckMode
diff --git a/offapi/com/sun/star/i18n/XExtendedTextConversion.idl b/offapi/com/sun/star/i18n/XExtendedTextConversion.idl
index 9c6c5ee43fce..6012314be913 100644
--- a/offapi/com/sun/star/i18n/XExtendedTextConversion.idl
+++ b/offapi/com/sun/star/i18n/XExtendedTextConversion.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
- *
+ * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@ module com { module sun { module star { module i18n {
 //=============================================================================
 
 
-/**
+/** 
     This interface provides Text Conversion service.
 
     <p> It is derived from
@@ -51,7 +51,7 @@ published interface XExtendedTextConversion : ::com::sun::star::i18n::XTextConve
 {
     //-------------------------------------------------------------------------
     /**
-        The functionality of this method is same as
+        The functionality of this method is same as 
         <member scope="::com::sun::star::i18n">XTextConversion::getConversion()</member>,
         except an additional output parameter rOffset.
 
@@ -60,19 +60,19 @@ published interface XExtendedTextConversion : ::com::sun::star::i18n::XTextConve
             grapheme of output string, rOffset provides the offset array
             whose index is the offset of output string, the element
             containing the position within the input string.
-            When the graphemes of input and output strings are simple
-            one to one mapping, to improve the performance, returned
+            When the graphemes of input and output strings are simple 
+            one to one mapping, to improve the performance, returned 
             rOffset will be a zero length array.
      */
     string getConversionWithOffset(
-            [in] string aText,
+            [in] string aText, 
             [in] long nStartPos,
             [in] long nLength,
             [in] ::com::sun::star::lang::Locale aLocale,
             [in] short nTextConversionType,
             [in] long nTextConversionOptions,
             [out] sequence <long> rOffset )
-        raises( com::sun::star::lang::IllegalArgumentException,
+        raises( com::sun::star::lang::IllegalArgumentException, 
                 com::sun::star::lang::NoSupportException );
 };
 
diff --git a/offapi/com/sun/star/i18n/XExtendedTransliteration.idl b/offapi/com/sun/star/i18n/XExtendedTransliteration.idl
index d7c852e772ea..3d2d4d694fa1 100644
--- a/offapi/com/sun/star/i18n/XExtendedTransliteration.idl
+++ b/offapi/com/sun/star/i18n/XExtendedTransliteration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/XForbiddenCharacters.idl b/offapi/com/sun/star/i18n/XForbiddenCharacters.idl
index 6b107c02bec5..4d086d0ea2bb 100644
--- a/offapi/com/sun/star/i18n/XForbiddenCharacters.idl
+++ b/offapi/com/sun/star/i18n/XForbiddenCharacters.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl b/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl
index 14244be6264f..1997275f9b2f 100644
--- a/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl
+++ b/offapi/com/sun/star/i18n/XIndexEntrySupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ published interface XIndexEntrySupplier : com::sun::star::uno::XInterface
 
         <p> For example, in English locale it returns <b>"K"</b> for
         "keyboard"
-     */
+     */  
     string getIndexCharacter( [in] string aIndexEntry, [in]
     com::sun::star::lang::Locale aLocale, [in] string aSortAlgorithm );
 
diff --git a/offapi/com/sun/star/i18n/XInputSequenceChecker.idl b/offapi/com/sun/star/i18n/XInputSequenceChecker.idl
index 74380bb73fe5..f9c1bbe70ec8 100644
--- a/offapi/com/sun/star/i18n/XInputSequenceChecker.idl
+++ b/offapi/com/sun/star/i18n/XInputSequenceChecker.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@ module com {  module sun {  module star {  module i18n {
 //=============================================================================
 
 //--------------------------------------------------------------------------
-/**
+/** 
     contains the routine to check Thai input sequence checking
 
      @since OOo 1.1.2
diff --git a/offapi/com/sun/star/i18n/XLocaleData.idl b/offapi/com/sun/star/i18n/XLocaleData.idl
index d71a2a937c82..76fd665885fd 100644
--- a/offapi/com/sun/star/i18n/XLocaleData.idl
+++ b/offapi/com/sun/star/i18n/XLocaleData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/XLocaleData2.idl b/offapi/com/sun/star/i18n/XLocaleData2.idl
index 9b06ef159e55..35541f8084a6 100644
--- a/offapi/com/sun/star/i18n/XLocaleData2.idl
+++ b/offapi/com/sun/star/i18n/XLocaleData2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/XNativeNumberSupplier.idl b/offapi/com/sun/star/i18n/XNativeNumberSupplier.idl
index a11ad7a9c84c..55838202ae9d 100644
--- a/offapi/com/sun/star/i18n/XNativeNumberSupplier.idl
+++ b/offapi/com/sun/star/i18n/XNativeNumberSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
- *
+ * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@ published interface XNativeNumberSupplier : ::com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** Returns native number string for given number string.
-
+    
         @param nNativeNumberMode
             One of <type>NativeNumberMode</type> values.
      */
@@ -58,7 +58,7 @@ published interface XNativeNumberSupplier : ::com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /** Check if the NatNum is valid for the given locale.
-
+    
         @param nNativeNumberMode
             One of <type>NativeNumberMode</type> values.
      */
diff --git a/offapi/com/sun/star/i18n/XNumberFormatCode.idl b/offapi/com/sun/star/i18n/XNumberFormatCode.idl
index 662657ff3ee4..5ae3b981e660 100644
--- a/offapi/com/sun/star/i18n/XNumberFormatCode.idl
+++ b/offapi/com/sun/star/i18n/XNumberFormatCode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,8 +57,8 @@ published interface XNumberFormatCode : com::sun::star::uno::XInterface
         @param nFormatUsage
             one of <type>KNumberFormatUsage</type> values
      */
-    NumberFormatCode getDefault( [in] short nFormatType,
-                                 [in] short nFormatUsage,
+    NumberFormatCode getDefault( [in] short nFormatType, 
+                                 [in] short nFormatUsage, 
                                  [in] com::sun::star::lang::Locale rLocale );
 
     //------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/i18n/XOrdinalSuffix.idl b/offapi/com/sun/star/i18n/XOrdinalSuffix.idl
index 7da294782791..e88c9005e656 100644
--- a/offapi/com/sun/star/i18n/XOrdinalSuffix.idl
+++ b/offapi/com/sun/star/i18n/XOrdinalSuffix.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/i18n/XScriptTypeDetector.idl b/offapi/com/sun/star/i18n/XScriptTypeDetector.idl
index 9ce7efb1f830..cd2a31384a98 100644
--- a/offapi/com/sun/star/i18n/XScriptTypeDetector.idl
+++ b/offapi/com/sun/star/i18n/XScriptTypeDetector.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@ module com {  module sun {  module star {  module i18n {
 //=============================================================================
 
 //--------------------------------------------------------------------------
-/**
+/** 
     contains the help routines for layouting complex text
 
     <p> Assumption - StartPos is inclusive and EndPos is exclusive. </p>
diff --git a/offapi/com/sun/star/i18n/XTextConversion.idl b/offapi/com/sun/star/i18n/XTextConversion.idl
index 0e22052ff93e..f6fb0e8829c2 100644
--- a/offapi/com/sun/star/i18n/XTextConversion.idl
+++ b/offapi/com/sun/star/i18n/XTextConversion.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -84,18 +84,18 @@ published interface XTextConversion : ::com::sun::star::uno::XInterface
             or when the locale is not supported.
     */
     TextConversionResult getConversions(
-            [in] string aText,
+            [in] string aText, 
             [in] long nStartPos,
             [in] long nLength,
             [in] ::com::sun::star::lang::Locale aLocale,
             [in] short nTextConversionType,
             [in] long nTextConversionOptions )
-        raises( com::sun::star::lang::IllegalArgumentException,
+        raises( com::sun::star::lang::IllegalArgumentException, 
                 com::sun::star::lang::NoSupportException );
 
     //---------------------------------------------------------------------
-    /** Method to search dictionaries for the conversion candidate, if there
-        are multiple candidates, it will return first one. This is for the
+    /** Method to search dictionaries for the conversion candidate, if there 
+        are multiple candidates, it will return first one. This is for the 
         conversion in non-interactive mode.
 
         @param aText
@@ -118,13 +118,13 @@ published interface XTextConversion : ::com::sun::star::uno::XInterface
             or when the locale is not supported.
     */
     string getConversion(
-            [in] string aText,
+            [in] string aText, 
             [in] long nStartPos,
             [in] long nLength,
             [in] ::com::sun::star::lang::Locale aLocale,
             [in] short nTextConversionType,
             [in] long nTextConversionOptions )
-        raises( com::sun::star::lang::IllegalArgumentException,
+        raises( com::sun::star::lang::IllegalArgumentException, 
                 com::sun::star::lang::NoSupportException );
 
     //---------------------------------------------------------------------
@@ -145,11 +145,11 @@ published interface XTextConversion : ::com::sun::star::uno::XInterface
             when <var>nConversionDictionaryType</var> is not known by the implementation,
             or when the locale is not supported.
     */
-    boolean interactiveConversion(
+    boolean interactiveConversion( 
             [in] ::com::sun::star::lang::Locale aLocale,
             [in] short nTextConversionType,
             [in] long nTextConversionOptions )
-        raises( com::sun::star::lang::IllegalArgumentException,
+        raises( com::sun::star::lang::IllegalArgumentException, 
                 com::sun::star::lang::NoSupportException );
 };
 
diff --git a/offapi/com/sun/star/i18n/XTransliteration.idl b/offapi/com/sun/star/i18n/XTransliteration.idl
index aa003604eadf..dfe4c6353824 100644
--- a/offapi/com/sun/star/i18n/XTransliteration.idl
+++ b/offapi/com/sun/star/i18n/XTransliteration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -170,7 +170,7 @@ published interface XTransliteration: com::sun::star::uno::XInterface
 
     //------------------------------------------------------------------------
     /** List the available transliteration modules for a given locale.
-        It can be filtered based on its type.
+        It can be filtered based on its type. 
 
         @param nType
             A bitmask field of values defined in
@@ -191,7 +191,7 @@ published interface XTransliteration: com::sun::star::uno::XInterface
 
         @param nStartPos
             Start position within aStr from where transliteration starts.
-
+            
         @param nCount
             Number of codepoints to be transliterated.
 
@@ -216,7 +216,7 @@ published interface XTransliteration: com::sun::star::uno::XInterface
     //------------------------------------------------------------------------
     /** Match two substrings and find if they are equivalent as per this
         transliteration.
-
+        
         <p> This method can be called if the object has
         <type>TransliterationType</type> IGNORE attribute. </p>
 
@@ -257,25 +257,25 @@ published interface XTransliteration: com::sun::star::uno::XInterface
             <FALSE/> else.
      */
 
-    boolean equals( [in] string aStr1, [in] long nPos1, [in] long nCount1,
+    boolean equals( [in] string aStr1, [in] long nPos1, [in] long nCount1, 
                     [out] long rMatch1,
                     [in] string aStr2, [in] long nPos2, [in] long nCount2,
                     [out] long rMatch2 );
 
     //------------------------------------------------------------------------
     /** Transliterate one set of characters to another.
-
+    
         <p> This method is intended for getting corresponding ranges and
         can be called if the object has <type>TransliterationType</type>
         IGNORE attribute. </p>
-
+     
         <p> For example: generic CASE_IGNORE transliterateRange( "a", "i" )
         returns {"A","I","a","i"}, transliterateRange( "a", "a" )
         returns {"A","A","a","a"}. </p>
-
+     
         <p> Use this transliteration to create regular expresssions like
         [a-i] --> [A-Ia-i]. </p>
-
+     
         @returns
             String sequence containing corresponding transliterated
             pairs of characters to represent a range.
@@ -283,7 +283,7 @@ published interface XTransliteration: com::sun::star::uno::XInterface
     sequence <string>   transliterateRange( [in] string aStr1, [in] string aStr2 );
 
     //------------------------------------------------------------------------
-    /** Compare 2 substrings as per this transliteration. It translates both
+    /** Compare 2 substrings as per this transliteration. It translates both 
         substrings before comparing them.
 
         @param aStr1
diff --git a/offapi/com/sun/star/i18n/reservedWords.idl b/offapi/com/sun/star/i18n/reservedWords.idl
index 846a85df1613..4d8be44ff58c 100644
--- a/offapi/com/sun/star/i18n/reservedWords.idl
+++ b/offapi/com/sun/star/i18n/reservedWords.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/image/ImageMap.idl b/offapi/com/sun/star/image/ImageMap.idl
index 45f82a157faa..8c1a401cf760 100644
--- a/offapi/com/sun/star/image/ImageMap.idl
+++ b/offapi/com/sun/star/image/ImageMap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_image_ImageMap_idl__
-#define __com_sun_star_image_ImageMap_idl__
-
-#ifndef __com_sun_star_container_XNamed_idl__
-#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
-#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module image {
-
-//=============================================================================
+#ifndef __com_sun_star_image_ImageMap_idl__ 
+#define __com_sun_star_image_ImageMap_idl__ 
+ 
+#ifndef __com_sun_star_container_XNamed_idl__ 
+#include <com/sun/star/container/XNamed.idl> 
+#endif 
 
+#ifndef __com_sun_star_container_XIndexContainer_idl__ 
+#include <com/sun/star/container/XIndexContainer.idl> 
+#endif 
+  
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module image {  
+ 
+//============================================================================= 
+ 
 /** This service specifies a html image map.
  */
 published service ImageMap
@@ -57,8 +57,8 @@ published service ImageMap
     interface ::com::sun::star::container::XIndexContainer;
 };
 
-//=============================================================================
-
-}; }; }; };
-
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/image/ImageMapCircleObject.idl b/offapi/com/sun/star/image/ImageMapCircleObject.idl
index aa4b881516e6..3418bbc36b69 100644
--- a/offapi/com/sun/star/image/ImageMapCircleObject.idl
+++ b/offapi/com/sun/star/image/ImageMapCircleObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_image_ImageMapCircleObject_idl__
-#define __com_sun_star_image_ImageMapCircleObject_idl__
-
-#ifndef __com_sun_star_image_ImageMapObject_idl__
-#include <com/sun/star/image/ImageMapObject.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
-#include <com/sun/star/awt/Point.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module image {
-
-//=============================================================================
+#ifndef __com_sun_star_image_ImageMapCircleObject_idl__ 
+#define __com_sun_star_image_ImageMapCircleObject_idl__ 
+ 
+#ifndef __com_sun_star_image_ImageMapObject_idl__ 
+#include <com/sun/star/image/ImageMapObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Point_idl__ 
+#include <com/sun/star/awt/Point.idl> 
+#endif 
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module image {  
+ 
+//============================================================================= 
+ 
 /** this service describes a circular-shaped region inside
     a html image map.
     @see ImageMap
@@ -57,9 +57,9 @@ published service ImageMapCircleObject
     /** This is the radius of the circle in pixels */
     [property] long Radius;
 };
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/image/ImageMapObject.idl b/offapi/com/sun/star/image/ImageMapObject.idl
index de29a2f22d3c..cd709fb56333 100644
--- a/offapi/com/sun/star/image/ImageMapObject.idl
+++ b/offapi/com/sun/star/image/ImageMapObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,22 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_image_ImageMapObject_idl__
-#define __com_sun_star_image_ImageMapObject_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_document_XEventsSupplier_idl__
-#include <com/sun/star/document/XEventsSupplier.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module image {
-
-//=============================================================================
+#ifndef __com_sun_star_image_ImageMapObject_idl__ 
+#define __com_sun_star_image_ImageMapObject_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_document_XEventsSupplier_idl__ 
+#include <com/sun/star/document/XEventsSupplier.idl> 
+#endif 
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module image {  
+ 
+//============================================================================= 
 
 /** this is a base service for objects inside a image maps.
     @see ImageMap
@@ -76,9 +76,9 @@ published service ImageMapObject
     */
     [property] boolean IsActive;
 };
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+  
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/image/ImageMapPolygonObject.idl b/offapi/com/sun/star/image/ImageMapPolygonObject.idl
index 298b9ac8db44..34b4cbc79950 100644
--- a/offapi/com/sun/star/image/ImageMapPolygonObject.idl
+++ b/offapi/com/sun/star/image/ImageMapPolygonObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_image_ImageMapPolygonObject_idl__
-#define __com_sun_star_image_ImageMapPolygonObject_idl__
-
-#ifndef __com_sun_star_image_ImageMapObject_idl__
-#include <com/sun/star/image/ImageMapObject.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_PointSequence_idl__
-#include <com/sun/star/drawing/PointSequence.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module image {
-
-//=============================================================================
-
+#ifndef __com_sun_star_image_ImageMapPolygonObject_idl__ 
+#define __com_sun_star_image_ImageMapPolygonObject_idl__ 
+ 
+#ifndef __com_sun_star_image_ImageMapObject_idl__ 
+#include <com/sun/star/image/ImageMapObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_PointSequence_idl__ 
+#include <com/sun/star/drawing/PointSequence.idl> 
+#endif 
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module image {  
+ 
+//============================================================================= 
+ 
 /** this service describes a polygon-shaped region inside
     a html image map.
     @see ImageMap
@@ -56,8 +56,8 @@ published service ImageMapPolygonObject
     [property] com::sun::star::drawing::PointSequence Polygon;
 };
 
-//=============================================================================
-
-}; }; }; };
-
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/image/ImageMapRectangleObject.idl b/offapi/com/sun/star/image/ImageMapRectangleObject.idl
index 8d1844736c86..5325d29bf511 100644
--- a/offapi/com/sun/star/image/ImageMapRectangleObject.idl
+++ b/offapi/com/sun/star/image/ImageMapRectangleObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,22 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_image_ImageMapRectangleObject_idl__
-#define __com_sun_star_image_ImageMapRectangleObject_idl__
-
-#ifndef __com_sun_star_image_ImageMapObject_idl__
-#include <com/sun/star/image/ImageMapObject.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Rectangle_idl__
-#include <com/sun/star/awt/Rectangle.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module image {
-
-//=============================================================================
+#ifndef __com_sun_star_image_ImageMapRectangleObject_idl__ 
+#define __com_sun_star_image_ImageMapRectangleObject_idl__ 
+ 
+#ifndef __com_sun_star_image_ImageMapObject_idl__ 
+#include <com/sun/star/image/ImageMapObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Rectangle_idl__ 
+#include <com/sun/star/awt/Rectangle.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module image {  
+ 
+//============================================================================= 
 
 /** this service describes a rectangular-shaped region inside
     a html image map.
@@ -54,9 +54,9 @@ published service ImageMapRectangleObject
     /** This is the boundary of this rectangle object */
     [property] com::sun::star::awt::Rectangle Boundary;
 };
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+  
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/inspection/DefaultHelpProvider.idl b/offapi/com/sun/star/inspection/DefaultHelpProvider.idl
index 900610538b35..bb47cbea7346 100644
--- a/offapi/com/sun/star/inspection/DefaultHelpProvider.idl
+++ b/offapi/com/sun/star/inspection/DefaultHelpProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module inspection {
+module com { module sun { module star { module inspection { 
 
 interface XObjectInspectorUI;
 
diff --git a/offapi/com/sun/star/inspection/GenericPropertyHandler.idl b/offapi/com/sun/star/inspection/GenericPropertyHandler.idl
index c93f7a958ba5..0b0a0e25f960 100644
--- a/offapi/com/sun/star/inspection/GenericPropertyHandler.idl
+++ b/offapi/com/sun/star/inspection/GenericPropertyHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl b/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl
index 0447da8ed4ab..34eef3a4a31b 100644
--- a/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl
+++ b/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/inspection/LineDescriptor.idl b/offapi/com/sun/star/inspection/LineDescriptor.idl
index 5bf9486f82ee..fc300d041169 100644
--- a/offapi/com/sun/star/inspection/LineDescriptor.idl
+++ b/offapi/com/sun/star/inspection/LineDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,7 +62,7 @@ struct LineDescriptor
     string  DisplayName;
 
     /** denotes the control which should be used to represent the property at the UI.
-
+    
         @see XPropertyControlFactory
     */
     XPropertyControl Control;
diff --git a/offapi/com/sun/star/inspection/ObjectInspector.idl b/offapi/com/sun/star/inspection/ObjectInspector.idl
index 9a0386bee9f0..bfa90ef802ad 100644
--- a/offapi/com/sun/star/inspection/ObjectInspector.idl
+++ b/offapi/com/sun/star/inspection/ObjectInspector.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/inspection/ObjectInspectorModel.idl b/offapi/com/sun/star/inspection/ObjectInspectorModel.idl
index 00a55a0b43c3..8c9b3d9aafe4 100644
--- a/offapi/com/sun/star/inspection/ObjectInspectorModel.idl
+++ b/offapi/com/sun/star/inspection/ObjectInspectorModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/inspection/PropertyCategoryDescriptor.idl b/offapi/com/sun/star/inspection/PropertyCategoryDescriptor.idl
index 5e58701e3c03..fed450ccca53 100644
--- a/offapi/com/sun/star/inspection/PropertyCategoryDescriptor.idl
+++ b/offapi/com/sun/star/inspection/PropertyCategoryDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/inspection/PropertyControlType.idl b/offapi/com/sun/star/inspection/PropertyControlType.idl
index 1f61dfe6ed97..77b24b8f7c46 100644
--- a/offapi/com/sun/star/inspection/PropertyControlType.idl
+++ b/offapi/com/sun/star/inspection/PropertyControlType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/inspection/PropertyLineElement.idl b/offapi/com/sun/star/inspection/PropertyLineElement.idl
index 35d7c47e7a17..e7fae48cdfb1 100644
--- a/offapi/com/sun/star/inspection/PropertyLineElement.idl
+++ b/offapi/com/sun/star/inspection/PropertyLineElement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/inspection/XHyperlinkControl.idl b/offapi/com/sun/star/inspection/XHyperlinkControl.idl
index f6daa5f8c179..9300b7bd9325 100644
--- a/offapi/com/sun/star/inspection/XHyperlinkControl.idl
+++ b/offapi/com/sun/star/inspection/XHyperlinkControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/inspection/XNumericControl.idl b/offapi/com/sun/star/inspection/XNumericControl.idl
index 13e4631a3959..e4d2ad8c1a25 100644
--- a/offapi/com/sun/star/inspection/XNumericControl.idl
+++ b/offapi/com/sun/star/inspection/XNumericControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/inspection/XObjectInspector.idl b/offapi/com/sun/star/inspection/XObjectInspector.idl
index 664221ff03fd..b6f8547448a2 100644
--- a/offapi/com/sun/star/inspection/XObjectInspector.idl
+++ b/offapi/com/sun/star/inspection/XObjectInspector.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/inspection/XObjectInspectorModel.idl b/offapi/com/sun/star/inspection/XObjectInspectorModel.idl
index b7248d87d25f..d1fea398fa00 100644
--- a/offapi/com/sun/star/inspection/XObjectInspectorModel.idl
+++ b/offapi/com/sun/star/inspection/XObjectInspectorModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -83,7 +83,7 @@ interface XObjectInspectorModel
         attribute, which is filled in <member>XPropertyHandler::describePropertyLine</member>
         method of your property handler.<br/>
         Those names provided by the handlers are programmatic names. All other information
-        about categories is part of the <type>PropertyCategoryDescriptor</type>, and
+        about categories is part of the <type>PropertyCategoryDescriptor</type>, and 
         <member>describeCategories</member> assembles information about all categories which
         all property handlers provided by the model use.</p>
 
@@ -135,7 +135,7 @@ interface XObjectInspectorModel
         Additionally, the inspector can optionally display a section dedicated to help
         texts. Clients could use this section to display context-sensitive help, for
         instance short texts explaining the currently selected property.</p>
-
+ 
         @since OOo 2.2
     */
     [attribute, readonly] boolean HasHelpSection;
@@ -169,7 +169,7 @@ interface XObjectInspectorModel
     [attribute, readonly] long MaxHelpTextLines;
 
     /** determines whether the object inspector's UI should be read-only.
-
+    
         <p>In this case, the user is able to browse through all properties, but cannot
         change any of them.</p>
 
diff --git a/offapi/com/sun/star/inspection/XObjectInspectorUI.idl b/offapi/com/sun/star/inspection/XObjectInspectorUI.idl
index f6a90c824426..ced380a6d526 100644
--- a/offapi/com/sun/star/inspection/XObjectInspectorUI.idl
+++ b/offapi/com/sun/star/inspection/XObjectInspectorUI.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@
 #ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
 #endif
-#ifndef __com_sun_star_lang_NoSupportException_idl__
+#ifndef __com_sun_star_lang_NoSupportException_idl__ 
 #include <com/sun/star/lang/NoSupportException.idl>
 #endif
 
@@ -136,7 +136,7 @@ interface XObjectInspectorUI
     void    showCategory( [in] string Category, [in] boolean Show );
 
     /** retrieves the control currently used to display a given property
-
+    
         @param PropertyName
             the name of the property whose control should be retrieved
 
diff --git a/offapi/com/sun/star/inspection/XPropertyControl.idl b/offapi/com/sun/star/inspection/XPropertyControl.idl
index b48f730fa7d9..d2231450202f 100644
--- a/offapi/com/sun/star/inspection/XPropertyControl.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,10 +28,10 @@
 #ifndef __com_sun_star_inspection_XPropertyControl_idl__
 #define __com_sun_star_inspection_XPropertyControl_idl__
 
-#ifndef __com_sun_star_beans_IllegalTypeException_idl__
+#ifndef __com_sun_star_beans_IllegalTypeException_idl__ 
 #include <com/sun/star/beans/IllegalTypeException.idl>
 #endif
-#ifndef __com_sun_star_awt_XWindow_idl__
+#ifndef __com_sun_star_awt_XWindow_idl__ 
 #include <com/sun/star/awt/XWindow.idl>
 #endif
 
diff --git a/offapi/com/sun/star/inspection/XPropertyControlContext.idl b/offapi/com/sun/star/inspection/XPropertyControlContext.idl
index 457ef549652d..be9a0c5f7e2f 100644
--- a/offapi/com/sun/star/inspection/XPropertyControlContext.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControlContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/inspection/XPropertyControlFactory.idl b/offapi/com/sun/star/inspection/XPropertyControlFactory.idl
index 964a2c4fb3e8..f83e13c38937 100644
--- a/offapi/com/sun/star/inspection/XPropertyControlFactory.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControlFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_inspection_XPropertyControlFactory_idl__
 #define __com_sun_star_inspection_XPropertyControlFactory_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 
diff --git a/offapi/com/sun/star/inspection/XPropertyControlObserver.idl b/offapi/com/sun/star/inspection/XPropertyControlObserver.idl
index 51263e6824a5..33542f2a4f6c 100644
--- a/offapi/com/sun/star/inspection/XPropertyControlObserver.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControlObserver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_inspection_XPropertyControlObserver_idl__
 #define __com_sun_star_inspection_XPropertyControlObserver_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
+#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
@@ -42,7 +42,7 @@ interface XPropertyControl;
 
 /** specifies an interface for components to observer certain aspects
     of an <type>XPropertyControl</type>.
-
+ 
     @since OOo 2.2
 */
 interface XPropertyControlObserver
diff --git a/offapi/com/sun/star/inspection/XPropertyHandler.idl b/offapi/com/sun/star/inspection/XPropertyHandler.idl
index 81a105b8b9a5..0219834c25c8 100644
--- a/offapi/com/sun/star/inspection/XPropertyHandler.idl
+++ b/offapi/com/sun/star/inspection/XPropertyHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,28 +27,28 @@
 #ifndef __com_sun_star_inspection_XPropertyHandler_idl__
 #define __com_sun_star_inspection_XPropertyHandler_idl__
 
-#ifndef __com_sun_star_beans_PropertyState_idl__
+#ifndef __com_sun_star_beans_PropertyState_idl__ 
 #include <com/sun/star/beans/PropertyState.idl>
 #endif
-#ifndef __com_sun_star_beans_Property_idl__
+#ifndef __com_sun_star_beans_Property_idl__ 
 #include <com/sun/star/beans/Property.idl>
 #endif
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
+#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__ 
 #include <com/sun/star/beans/XPropertyChangeListener.idl>
 #endif
 #ifndef __com_sun_star_inspection_LineDescriptor_idl__
 #include <com/sun/star/inspection/LineDescriptor.idl>
 #endif
-#ifndef __com_sun_star_lang_NullPointerException_idl__
+#ifndef __com_sun_star_lang_NullPointerException_idl__ 
 #include <com/sun/star/lang/NullPointerException.idl>
 #endif
 #ifndef __com_sun_star_beans_UnknownPropertyException_idl__
 #include <com/sun/star/beans/UnknownPropertyException.idl>
 #endif
-#ifndef __com_sun_star_lang_XComponent_idl__
+#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl>
 #endif
-#ifndef __com_sun_star_inspection_InteractiveSelectionResult_idl__
+#ifndef __com_sun_star_inspection_InteractiveSelectionResult_idl__ 
 #include <com/sun/star/inspection/InteractiveSelectionResult.idl>
 #endif
 
diff --git a/offapi/com/sun/star/inspection/XStringListControl.idl b/offapi/com/sun/star/inspection/XStringListControl.idl
index 640741961090..8da3796941bf 100644
--- a/offapi/com/sun/star/inspection/XStringListControl.idl
+++ b/offapi/com/sun/star/inspection/XStringListControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/inspection/XStringRepresentation.idl b/offapi/com/sun/star/inspection/XStringRepresentation.idl
index 66888f3cc240..8a7bad8125de 100644
--- a/offapi/com/sun/star/inspection/XStringRepresentation.idl
+++ b/offapi/com/sun/star/inspection/XStringRepresentation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_inspection_XStringRepresentation_idl__
 #define __com_sun_star_inspection_XStringRepresentation_idl__
 
-#ifndef __com_sun_star_script_XTypeConverter_idl__
+#ifndef __com_sun_star_script_XTypeConverter_idl__ 
 #include <com/sun/star/script/XTypeConverter.idl>
 #endif
 
@@ -37,7 +37,7 @@ module com {  module sun {  module star {  module inspection {
 
 //-----------------------------------------------------------------------------
 /** handles string representations of property values.
-    @see
+    @see 
 */
 interface XStringRepresentation
 {
diff --git a/offapi/com/sun/star/installation/InstallationCheck.idl b/offapi/com/sun/star/installation/InstallationCheck.idl
index 80b3b4ecbe19..4a73a5ebc7cc 100644
--- a/offapi/com/sun/star/installation/InstallationCheck.idl
+++ b/offapi/com/sun/star/installation/InstallationCheck.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_installation_InstallationCheck_idl__
-#define __com_sun_star_installation_InstallationCheck_idl__
-
-#ifndef __com_sun_star_installation_XInstallationCheck_idl__
-#include <com/sun/star/installation/XInstallationCheck.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module installation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_installation_InstallationCheck_idl__ 
+#define __com_sun_star_installation_InstallationCheck_idl__ 
+ 
+#ifndef __com_sun_star_installation_XInstallationCheck_idl__ 
+#include <com/sun/star/installation/XInstallationCheck.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module installation {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::installation::InstallationCheck
 /** is a simple implementation of the <type>XInstallationCheck</type>.
-
-    <p> This implementation only checks the fonts "StarBats" and "StarMath".
+    
+    <p>	This implementation only checks the fonts "StarBats" and "StarMath".
     </p>
     <p> When running under Win32 the methods check and checkWithDialog will try to
     fix any missing RegistryKey of fonts which still reside in the font directory.
     </p>
     <p>If it is possbile to fix, the method returns <TRUE/>.
     </p>
-
+    
     @see XInstallationCheck
     @deprecated
  */
 published service InstallationCheck
-{
+{ 
     // DocMerge: empty anyway
-    interface com::sun::star::installation::XInstallationCheck;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::installation::XInstallationCheck; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/installation/InstallationCheckService.idl b/offapi/com/sun/star/installation/InstallationCheckService.idl
index 0036c521d33f..f3a5f6b2d2cc 100644
--- a/offapi/com/sun/star/installation/InstallationCheckService.idl
+++ b/offapi/com/sun/star/installation/InstallationCheckService.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,11 +34,11 @@
 
 //=============================================================================
 
-module com { module sun { module star { module installation {
+module com { module sun { module star { module installation { 
 
 //=============================================================================
 /** This service is a simple implementation of the interface XInstallationCheck.
-
+    
     <p>This implementation only checks the fonts "StarBats" and "StarMath".
     When running under Win32 the methods check and checkWithDialog will try to
     fix any missing RegistryKey of fonts which still reside in the font directory.
@@ -56,6 +56,6 @@ published service InstallationCheckService
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/installation/InternetSettings.idl b/offapi/com/sun/star/installation/InternetSettings.idl
index 578bfa592f1e..c676932b8df6 100644
--- a/offapi/com/sun/star/installation/InternetSettings.idl
+++ b/offapi/com/sun/star/installation/InternetSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_installation_InternetSettings_idl__
-#define __com_sun_star_installation_InternetSettings_idl__
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module installation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_installation_InternetSettings_idl__ 
+#define __com_sun_star_installation_InternetSettings_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module installation {  
+ 
+//============================================================================= 
+ 
 /// @deprecated
 published service InternetSettings
-{
+{ 
     // DocMerge: empty anyway
-    interface com::sun::star::container::XNameAccess;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::container::XNameAccess; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/installation/ProtDlgRes.idl b/offapi/com/sun/star/installation/ProtDlgRes.idl
index a27b3776b19e..a17b80d2b25b 100644
--- a/offapi/com/sun/star/installation/ProtDlgRes.idl
+++ b/offapi/com/sun/star/installation/ProtDlgRes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_installation_ProtDlgRes_idl__
-#define __com_sun_star_installation_ProtDlgRes_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module installation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_installation_ProtDlgRes_idl__ 
+#define __com_sun_star_installation_ProtDlgRes_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module installation {  
+ 
+//============================================================================= 
+ 
 /** contains the status of a dialog with an 'always display Checkbox'.
 
-    @deprecated
+    @deprecated 
  */
 published enum ProtDlgRes
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::installation::ProtDlgRes::NOCHANGE
     /** dialog quit without the use of the YES/NO buttons.
      */
-    NOCHANGE,
-
-    //-------------------------------------------------------------------------
-
+    NOCHANGE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::installation::ProtDlgRes::CHECK
     /** when the dialog quit the checkbox, "Always display this message" was
         checked.
      */
-    CHECK,
-
-    //-------------------------------------------------------------------------
-
+    CHECK, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::installation::ProtDlgRes::UNCHECK
     /** when the dialog quit the checkbox, "Always display this message"
         was not checked.
      */
-    UNCHECK
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    UNCHECK 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/installation/ProtocolHandlerCheck.idl b/offapi/com/sun/star/installation/ProtocolHandlerCheck.idl
index e18062e667c5..d4fce7f69a21 100644
--- a/offapi/com/sun/star/installation/ProtocolHandlerCheck.idl
+++ b/offapi/com/sun/star/installation/ProtocolHandlerCheck.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_installation_ProtocolHandlerCheck_idl__
-#define __com_sun_star_installation_ProtocolHandlerCheck_idl__
-
-#ifndef __com_sun_star_installation_XProtocolHandlerCheck_idl__
-#include <com/sun/star/installation/XProtocolHandlerCheck.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module installation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_installation_ProtocolHandlerCheck_idl__ 
+#define __com_sun_star_installation_ProtocolHandlerCheck_idl__ 
+ 
+#ifndef __com_sun_star_installation_XProtocolHandlerCheck_idl__ 
+#include <com/sun/star/installation/XProtocolHandlerCheck.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module installation {  
+ 
+//============================================================================= 
+ 
 /// @deprecated
 published service ProtocolHandlerCheck
-{
+{ 
     // DocMerge: empty anyway
-    interface com::sun::star::installation::XProtocolHandlerCheck;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::installation::XProtocolHandlerCheck; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/installation/ProtocolHandlerCheckService.idl b/offapi/com/sun/star/installation/ProtocolHandlerCheckService.idl
index e2a9bc1b1830..4164cb6206e2 100644
--- a/offapi/com/sun/star/installation/ProtocolHandlerCheckService.idl
+++ b/offapi/com/sun/star/installation/ProtocolHandlerCheckService.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module installation {
+module com { module sun { module star { module installation { 
 
 //=============================================================================
 /** @deprecated
@@ -47,6 +47,6 @@ published service ProtocolHandlerCheckService
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/installation/XInstallationCheck.idl b/offapi/com/sun/star/installation/XInstallationCheck.idl
index 41fc7b1b90ad..e5deaf5ff8ab 100644
--- a/offapi/com/sun/star/installation/XInstallationCheck.idl
+++ b/offapi/com/sun/star/installation/XInstallationCheck.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,91 +24,91 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_installation_XInstallationCheck_idl__
-#define __com_sun_star_installation_XInstallationCheck_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module installation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_installation_XInstallationCheck_idl__ 
+#define __com_sun_star_installation_XInstallationCheck_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module installation {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::installation::XInstallationCheck
 /** a flag called "suppressed", changes the action of check and checkWithDialog
     @see com::sun::star::uno::XInterface
     @deprecated
  */
 published interface XInstallationCheck: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::installation::XInstallationCheck::check
     /** checks if something of the installation is missing.
-
+        
         <p>If missing parts are detected, check should try to automatically repair/
         reinstall these parts. Only if this is not possible, return <FALSE/>.
-
+        
         </p>@see resetSuppressed
      */
-    boolean check( [in] boolean bForce );
-
-    //-------------------------------------------------------------------------
-
+    boolean check( [in] boolean bForce ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::installation::XInstallationCheck::checkWithDialog
     /** same as check, but additionally shows a dialog if result is <FALSE/>.
-
+        
         <p>The dialog shows which parts of the installation are missing and
         can't be repaired/reinstalled automatically. It also contains some
         hints for the user to reinstall the missing parts on his own.
-        </p>@see check
+        </p>@see check 
                 @see resetSuppressed
      */
-    boolean checkWithDialog( [in] boolean bForce );
-
-    //-------------------------------------------------------------------------
-
+    boolean checkWithDialog( [in] boolean bForce ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::installation::XInstallationCheck::executeDialog
     /** shows a dialog if something of the installation is missing.
-
+        
         <p>The dialog shows which part(s) is (are) missing, and has a checkbox
         that represents the state of the flag suppressed. This dialog is
         the only way to set the flag suppressed to <TRUE/>. This method is
         not affected by the value of the flag suppressed.
         </p>@see resetSuppressed
      */
-    boolean executeDialog();
-
-    //-------------------------------------------------------------------------
-
+    boolean executeDialog(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::installation::XInstallationCheck::getSuppressed
     /** gets the status of flag suppressed
-
+                
         <p>The flag suppressed is stored in the OfficeRegistry. If suppressed is
         <FALSE/>, the methods check and checkWithDialog ignore the parameter
-        bForce.
+        bForce. 
         If suppressed is <TRUE/>, check and checkWithDialog only
         perform an action if their parameter bForce is <TRUE/>; otherwise,
-        they return TRUE.
+        they return TRUE.		
         </p>
      */
-    boolean getSuppressed();
-
-    //-------------------------------------------------------------------------
-
+    boolean getSuppressed(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::installation::XInstallationCheck::setSuppressed
     /** set status of flag "suppressed".
      */
-    void setSuppressed( [in] boolean bSuppress );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void setSuppressed( [in] boolean bSuppress ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/installation/XProtocolHandlerCheck.idl b/offapi/com/sun/star/installation/XProtocolHandlerCheck.idl
index 6961660b0e69..07c3d54a2b1c 100644
--- a/offapi/com/sun/star/installation/XProtocolHandlerCheck.idl
+++ b/offapi/com/sun/star/installation/XProtocolHandlerCheck.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_installation_XProtocolHandlerCheck_idl__
-#define __com_sun_star_installation_XProtocolHandlerCheck_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_installation_ProtDlgRes_idl__
-#include <com/sun/star/installation/ProtDlgRes.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module installation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_installation_XProtocolHandlerCheck_idl__ 
+#define __com_sun_star_installation_XProtocolHandlerCheck_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_installation_ProtDlgRes_idl__ 
+#include <com/sun/star/installation/ProtDlgRes.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module installation {  
+ 
+//============================================================================= 
+ 
 /// @deprecated
 published interface XProtocolHandlerCheck: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::installation::XProtocolHandlerCheck::isSingleSettingAvailable
     /** checks if it is possible to set particular protocols.
      */
-    boolean isSingleSettingAvailable();
-
-    //-------------------------------------------------------------------------
-
+    boolean isSingleSettingAvailable(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::installation::XProtocolHandlerCheck::isProtocolHandler
     /** checks if StarOffice is the protocol-handler, for the particular protocol
      */
-    boolean isProtocolHandler( [in] short nWhich );
-
-    //-------------------------------------------------------------------------
-
+    boolean isProtocolHandler( [in] short nWhich ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::installation::XProtocolHandlerCheck::setProtocolHandler
     /** Make StarOffice the protocol-handler.@see isProtocolHandler
      */
-    boolean setProtocolHandler( [in] short nWhich );
-
-    //-------------------------------------------------------------------------
-
+    boolean setProtocolHandler( [in] short nWhich ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::installation::XProtocolHandlerCheck::checkProtocolHandler
     /** First, the method checks if StarOffice is
         already the protocol-handler. If yes, simply
-        return NOCHANGE; otherwise, show a dialog which asks the user
+        return NOCHANGE; otherwise, show a dialog which asks the user 
         if he wants StarOffice to be the standard protocol-handler.
         The dialog has "Yes" and "No" buttons, and a checkbox
         with "Always display this message". The checkbox
@@ -80,12 +80,12 @@ published interface XProtocolHandlerCheck: com::sun::star::uno::XInterface
         protocol-handler. If the "No" button was pressed,
         don't perform any action. Both buttons closes the dialog.@see isProtocolHandler
      */
-    com::sun::star::installation::ProtDlgRes checkProtocolHandler( [in] short nWhich );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::installation::ProtDlgRes checkProtocolHandler( [in] short nWhich ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/installation/protocols.idl b/offapi/com/sun/star/installation/protocols.idl
index d6be9fae6e86..5d1825ea066b 100644
--- a/offapi/com/sun/star/installation/protocols.idl
+++ b/offapi/com/sun/star/installation/protocols.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,71 +24,71 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_installation_protocols_idl__
-#define __com_sun_star_installation_protocols_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module installation {
-
-//=============================================================================
-
-/** A protocol-handler is a part of StarOffice which performs
-        the comunication on a paticular protocol. This can be HTTP, FTP, HTTPS,
-        MAILTO, or NEWS. An implementation of this interface should be able
+#ifndef __com_sun_star_installation_protocols_idl__ 
+#define __com_sun_star_installation_protocols_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module installation {  
+ 
+//============================================================================= 
+ 
+/** A protocol-handler is a part of StarOffice which performs 
+        the comunication on a paticular protocol. This can be HTTP, FTP, HTTPS, 
+        MAILTO, or NEWS. An implementation of this interface should be able 
         to check/set all of these protocols.
 
     @deprecated
  */
 published constants protocols
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::installation::protocols::ALL
     /** check/set all supported protocols
      */
-    const short ALL = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short ALL = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::installation::protocols::HTTP
     /** check/set the HTTP protocol
      */
-    const short HTTP = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short HTTP = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::installation::protocols::FTP
     /** check/set the FTP protocol
      */
-    const short FTP = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short FTP = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::installation::protocols::HTTPS
     /** check/set the HTTPS protocol
      */
-    const short HTTPS = 3;
-
-    //-------------------------------------------------------------------------
-
+    const short HTTPS = 3; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::installation::protocols::MAIL
     /** check/set the MAIL protocol
      */
-    const short MAIL = 4;
-
-    //-------------------------------------------------------------------------
-
+    const short MAIL = 4; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::installation::protocols::NEWS
     /** check/set the NEWS protocol
      */
-    const short NEWS = 5;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short NEWS = 5; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/ldap/LdapConnectionException.idl b/offapi/com/sun/star/ldap/LdapConnectionException.idl
index df0d963807e9..437b907db2a3 100644
--- a/offapi/com/sun/star/ldap/LdapConnectionException.idl
+++ b/offapi/com/sun/star/ldap/LdapConnectionException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ module com { module sun { module star { module ldap {
 
 /**
   Indicates failure to connect to an LDAP server, usually because
-  of wrong parameters (host/port) or down server.
+  of wrong parameters (host/port) or down server. 
 
      @since OOo 1.1.2
   */
diff --git a/offapi/com/sun/star/ldap/LdapGenericException.idl b/offapi/com/sun/star/ldap/LdapGenericException.idl
index bcdaab0cf00f..022902348ffd 100644
--- a/offapi/com/sun/star/ldap/LdapGenericException.idl
+++ b/offapi/com/sun/star/ldap/LdapGenericException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,16 +34,16 @@
 
 module com { module sun { module star { module ldap {
 
-/**
+/** 
   Generic exception occurring during access to an LDAP server.
-  The actual LDAP error code is provided for more refined
+  The actual LDAP error code is provided for more refined 
   error management.
 
      @since OOo 1.1.2
   */
-published exception LdapGenericException : ::com::sun::star::uno::Exception
+published exception LdapGenericException : ::com::sun::star::uno::Exception 
 {
-    /**
+    /** 
       LDAP error code, see LDAP SDK documentation for complete
       list of possible values and their meaning.
      */
@@ -52,4 +52,4 @@ published exception LdapGenericException : ::com::sun::star::uno::Exception
 
 } ; } ; } ; } ;
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/linguistic2/ConversionDictionary.idl b/offapi/com/sun/star/linguistic2/ConversionDictionary.idl
index ab242d2c40f6..d56b4ffee8e2 100644
--- a/offapi/com/sun/star/linguistic2/ConversionDictionary.idl
+++ b/offapi/com/sun/star/linguistic2/ConversionDictionary.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,9 +46,9 @@ module com { module sun { module star { module linguistic2 {
 //=============================================================================
 /** represents a dictionary used in a conversion dictionary list.
 
-    <p>Specific implementations may put some restrictions for
-    the dictionary or it's entries.
-    Namely usually the order for the string pairs within a single entry
+    <p>Specific implementations may put some restrictions for 
+    the dictionary or it's entries. 
+    Namely usually the order for the string pairs within a single entry 
     will be defined.</p>
 
     @see    com::sun::star::linguistic2::ConversionDictionaryList
diff --git a/offapi/com/sun/star/linguistic2/ConversionDictionaryList.idl b/offapi/com/sun/star/linguistic2/ConversionDictionaryList.idl
index 825634af1849..c7c55cdcbd83 100644
--- a/offapi/com/sun/star/linguistic2/ConversionDictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/ConversionDictionaryList.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/linguistic2/ConversionDictionaryType.idl b/offapi/com/sun/star/linguistic2/ConversionDictionaryType.idl
index cf5d93d49f73..954c7dd21c10 100644
--- a/offapi/com/sun/star/linguistic2/ConversionDictionaryType.idl
+++ b/offapi/com/sun/star/linguistic2/ConversionDictionaryType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/linguistic2/ConversionDirection.idl b/offapi/com/sun/star/linguistic2/ConversionDirection.idl
index 27b648f1932b..eed46e76f15b 100644
--- a/offapi/com/sun/star/linguistic2/ConversionDirection.idl
+++ b/offapi/com/sun/star/linguistic2/ConversionDirection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,12 +41,12 @@ published enum ConversionDirection
 {
     /** the text to be looked for should match the left part of a
         dictionary entry.
-     */
+     */ 
     FROM_LEFT,
 
     /** the text to be looked for should match the right part of a
         dictionary entry.
-     */
+     */ 
     FROM_RIGHT
 };
 
diff --git a/offapi/com/sun/star/linguistic2/ConversionPropertyType.idl b/offapi/com/sun/star/linguistic2/ConversionPropertyType.idl
index e0e2e37357fe..b38e8956bf0d 100644
--- a/offapi/com/sun/star/linguistic2/ConversionPropertyType.idl
+++ b/offapi/com/sun/star/linguistic2/ConversionPropertyType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/linguistic2/Dictionary.idl b/offapi/com/sun/star/linguistic2/Dictionary.idl
index 397b882bc78d..fd8665967aec 100644
--- a/offapi/com/sun/star/linguistic2/Dictionary.idl
+++ b/offapi/com/sun/star/linguistic2/Dictionary.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,9 +65,9 @@ service Dictionary
     /** provide search for similar words functionality.
     */
     [optional] interface com::sun::star::linguistic2::XSearchableDictionary;
-
+    
     /** to save the dictionary content to file
-
+        
         <p>storeAsURL and storeToURL are empty implementations since the dictionaries are expected
         to be found in specific locations</p>
     */
diff --git a/offapi/com/sun/star/linguistic2/DictionaryEvent.idl b/offapi/com/sun/star/linguistic2/DictionaryEvent.idl
index e76395292204..c237bbea2aa5 100644
--- a/offapi/com/sun/star/linguistic2/DictionaryEvent.idl
+++ b/offapi/com/sun/star/linguistic2/DictionaryEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/linguistic2/DictionaryEventFlags.idl b/offapi/com/sun/star/linguistic2/DictionaryEventFlags.idl
index b5e3e3b46317..0e4c0ee68fe8 100644
--- a/offapi/com/sun/star/linguistic2/DictionaryEventFlags.idl
+++ b/offapi/com/sun/star/linguistic2/DictionaryEventFlags.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,37 +45,37 @@ published constants DictionaryEventFlags
     //-------------------------------------------------------------------------
     /** indicates that at least one entry has been added.
     */
-    const short ADD_ENTRY       = 1;
+    const short ADD_ENTRY		= 1;
 
     //-------------------------------------------------------------------------
     /** indicates that at least one entry has been deleted.
     */
-    const short DEL_ENTRY       = 2;
+    const short DEL_ENTRY		= 2;
 
     //-------------------------------------------------------------------------
     /** the dictionary's name has changed.
     */
-    const short CHG_NAME        = 4;
+    const short CHG_NAME		= 4;
 
     //-------------------------------------------------------------------------
     /** the dictionary's language has changed.
     */
-    const short CHG_LANGUAGE    = 8;
+    const short CHG_LANGUAGE	= 8;
 
     //-------------------------------------------------------------------------
     /** all entries have been removed.
     */
-    const short ENTRIES_CLEARED = 16;
+    const short ENTRIES_CLEARED	= 16;
 
     //-------------------------------------------------------------------------
     /** used when the dictionary was activated.
     */
-    const short ACTIVATE_DIC    = 32;
+    const short ACTIVATE_DIC	= 32;
 
     //-------------------------------------------------------------------------
     /** used when the dictionary was deactivated.
     */
-    const short DEACTIVATE_DIC  = 64;
+    const short DEACTIVATE_DIC	= 64;
 
 };
 
diff --git a/offapi/com/sun/star/linguistic2/DictionaryList.idl b/offapi/com/sun/star/linguistic2/DictionaryList.idl
index f7f61e95b884..9ace440501dd 100644
--- a/offapi/com/sun/star/linguistic2/DictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/DictionaryList.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,9 +41,9 @@ module com { module sun { module star { module linguistic2 {
  published interface XSearchableDictionaryList;
 
 //=============================================================================
-/** is the list of personal dictionaries.
+/**	is the list of personal dictionaries.
 
-     <P>The active dictionaries of this list will be used for
+     <P>The active dictionaries of this list will be used for 
      spellchecking and hyphenation.</P>
 
     @see <type scope="com::sun::star::linguistic2">XDictionary</type>
diff --git a/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl b/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl
index 8718219247dd..33c1e780143e 100644
--- a/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl
+++ b/offapi/com/sun/star/linguistic2/DictionaryListEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,9 +45,9 @@ module com { module sun { module star { module linguistic2 {
 
     <P>This structure is used by the dictionary-list to inform
     its listeners about certain events.
-    Since the dictionary-list is able to collect several single
-    events before broadcasting them to it's listeners the
-    integer argument may be a combination (logical or) of several
+    Since the dictionary-list is able to collect several single 
+    events before broadcasting them to it's listeners the 
+    integer argument may be a combination (logical or) of several 
     event types.
     If more specific information about the events is requested by a
     listener, a sequence of all dictionary-list events since the
diff --git a/offapi/com/sun/star/linguistic2/DictionaryListEventFlags.idl b/offapi/com/sun/star/linguistic2/DictionaryListEventFlags.idl
index 457807562a2d..abaab119870a 100644
--- a/offapi/com/sun/star/linguistic2/DictionaryListEventFlags.idl
+++ b/offapi/com/sun/star/linguistic2/DictionaryListEventFlags.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/linguistic2/DictionaryType.idl b/offapi/com/sun/star/linguistic2/DictionaryType.idl
index 591d11aa2e6b..9157ad971699 100644
--- a/offapi/com/sun/star/linguistic2/DictionaryType.idl
+++ b/offapi/com/sun/star/linguistic2/DictionaryType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/linguistic2/HangulHanjaConversionDictionary.idl b/offapi/com/sun/star/linguistic2/HangulHanjaConversionDictionary.idl
index 5b6e5dc1da32..920e976bb93f 100644
--- a/offapi/com/sun/star/linguistic2/HangulHanjaConversionDictionary.idl
+++ b/offapi/com/sun/star/linguistic2/HangulHanjaConversionDictionary.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,12 +36,12 @@ module com { module sun { module star { module linguistic2 {
 //=============================================================================
 /** represents a dictionary for Hangul/Hanja text conversion.
 
-    <p>A dictionary implementing this service will be used for
+    <p>A dictionary implementing this service will be used for 
     Hangul/Hanja conversion. Therefore the locale of the
     dictionary has to be Korean, and the conversion type
     <member scope="com::sun::star::linguistic2">ConversionDictionaryType::HANGUL_HANJA</member>.</p>
 
-    <p>Also for a pair (entry) to be added the
+    <p>Also for a pair (entry) to be added the 
     left part has to be in Hangul and the right in Hanja,
     and the number of characters for the left part has to be the
     same as for the right part.</p>
diff --git a/offapi/com/sun/star/linguistic2/Hyphenator.idl b/offapi/com/sun/star/linguistic2/Hyphenator.idl
index 630a0c64baa1..fdf7be0dc147 100644
--- a/offapi/com/sun/star/linguistic2/Hyphenator.idl
+++ b/offapi/com/sun/star/linguistic2/Hyphenator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,7 +48,7 @@ module com { module sun { module star { module linguistic2 {
  published interface XLinguServiceEventBroadcaster;
 
 //=============================================================================
-/** offers hyphenation functionality.
+/**	offers hyphenation functionality.
 */
 published service Hyphenator
 {
diff --git a/offapi/com/sun/star/linguistic2/LanguageGuessing.idl b/offapi/com/sun/star/linguistic2/LanguageGuessing.idl
index 1e99fbca1235..e90dc01d6d22 100644
--- a/offapi/com/sun/star/linguistic2/LanguageGuessing.idl
+++ b/offapi/com/sun/star/linguistic2/LanguageGuessing.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 #include <XLanguageGuessing.idl>
 
 module com { module sun { module star { module linguistic2 {
-
+    
     service LanguageGuessing:XLanguageGuessing;
 //     service LanguageGuessing{
 //         interface XLanguageGuessing;
diff --git a/offapi/com/sun/star/linguistic2/LinguProperties.idl b/offapi/com/sun/star/linguistic2/LinguProperties.idl
index d3b419e06b48..ca2ddf514639 100644
--- a/offapi/com/sun/star/linguistic2/LinguProperties.idl
+++ b/offapi/com/sun/star/linguistic2/LinguProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,7 +49,7 @@
 module com { module sun { module star { module linguistic2 {
 
 //=============================================================================
-/** the set of linguistic relevant properties.
+/**	the set of linguistic relevant properties.
 */
 published service LinguProperties
 {
@@ -59,8 +59,8 @@ published service LinguProperties
     interface com::sun::star::lang::XServiceInfo;
 
     //-------------------------------------------------------------------------
-    /** defines whether new German spelling rules should be used for German
-         text or not when doing spellchecking or hyphenation, or using the
+    /**	defines whether new German spelling rules should be used for German
+         text or not when doing spellchecking or hyphenation, or using the 
          thesaurus.
 
         @deprecated since OOo 3.0.1
@@ -68,48 +68,48 @@ published service LinguProperties
     [property, maybevoid] boolean IsGermanPreReform;
 
     //-------------------------------------------------------------------------
-    /** defines if the dictionary-list should be used for spellchecking
+    /**	defines if the dictionary-list should be used for spellchecking
          and hyphenation or not.
     */
     [property] boolean IsUseDictionaryList;
 
     //-------------------------------------------------------------------------
-    /** defines if control characters should be ignored or not, by the linguistic
+    /**	defines if control characters should be ignored or not, by the linguistic
          (i.e., spellchecker, hyphenator and thesaurus).
     */
     [property] boolean IsIgnoreControlCharacters;
 
     //-------------------------------------------------------------------------
-    /** defines if words with only uppercase letters should be
+    /**	defines if words with only uppercase letters should be 
          subject to spellchecking or not.
     */
     [property] boolean IsSpellUpperCase;
 
     //-------------------------------------------------------------------------
-    /** defines if words containing digits (or numbers) should be
+    /**	defines if words containing digits (or numbers) should be
          subject to spellchecking or not.
     */
     [property] boolean IsSpellWithDigits;
 
     //-------------------------------------------------------------------------
-    /** defines if the captitalization of words should be checked or not.
+    /**	defines if the captitalization of words should be checked or not.
     */
     [property] boolean IsSpellCapitalization;
 
     //-------------------------------------------------------------------------
-    /** the minimum number of characters of a word to remain before the
+    /**	the minimum number of characters of a word to remain before the 
          hyphen when doing hyphenation.
     */
     [property] short HyphMinLeading;
-
+    
     //-------------------------------------------------------------------------
-    /** the minimum number of characters of a word to remain after the
+    /**	the minimum number of characters of a word to remain after the 
          hyphen when doing hyphenation.
     */
     [property] short HyphMinTrailing;
-
+    
     //-------------------------------------------------------------------------
-    /** the minimum length of a word in order to be hyphenated.
+    /**	the minimum length of a word in order to be hyphenated.
     */
     [property] short HyphMinWordLength;
 
@@ -119,58 +119,58 @@ published service LinguProperties
     [property] com::sun::star::lang::Locale DefaultLocale;
 
     //-------------------------------------------------------------------------
-    /** defines whether interactive hyphenation should be performed without
-        requiring the user to select every hyphenation position after the user
+    /**	defines whether interactive hyphenation should be performed without
+        requiring the user to select every hyphenation position after the user 
         has triggered the hyphenation.
     */
     [property] boolean IsHyphAuto;
 
     //-------------------------------------------------------------------------
-    /** defines whether hyphenation should be done in special regions of
+    /**	defines whether hyphenation should be done in special regions of 
          documents or not.
     */
     [property] boolean IsHyphSpecial;
-
+    
     //-------------------------------------------------------------------------
-    /** indicates whether spellchecking should be done automatically or not.
+    /**	indicates whether spellchecking should be done automatically or not.
     */
     [property] boolean IsSpellAuto;
 
     //-------------------------------------------------------------------------
-    /** indicates whether the markings for incorrectly spelled text should be
+    /**	indicates whether the markings for incorrectly spelled text should be
          hidden or not.
-
+        
         @deprecated since OOo 3.0.1
     */
     [property, maybevoid] boolean IsSpellHide;
-
+    
     //-------------------------------------------------------------------------
-    /** indicates if spellchecking should be performed in all available
+    /**	indicates if spellchecking should be performed in all available
          languages.
-
+    
         @deprecated since OOo 3.0.1
     */
     [property, maybevoid] boolean IsSpellInAllLanguages;
 
     //-------------------------------------------------------------------------
-    /** defines whether spellchecking should be done in special regions of
+    /**	defines whether spellchecking should be done in special regions of
          documents or not.
     */
     [property] boolean IsSpellSpecial;
-
+    
     //-------------------------------------------------------------------------
-    /** defines whether spellchecking should be done in reverse
+    /**	defines whether spellchecking should be done in reverse 
          direction or not.
     */
     [property] boolean IsWrapReverse;
 
     //-------------------------------------------------------------------------
-    /** the default language for CJK languages.
+    /**	the default language for CJK languages.
     */
     [property] com::sun::star::lang::Locale DefaultLocale_CJK;
 
     //-------------------------------------------------------------------------
-    /** the default language for CTL languages.
+    /**	the default language for CTL languages.
     */
     [property] com::sun::star::lang::Locale DefaultLocale_CTL;
 
diff --git a/offapi/com/sun/star/linguistic2/LinguServiceEvent.idl b/offapi/com/sun/star/linguistic2/LinguServiceEvent.idl
index a3a79079301a..1065648ad34c 100644
--- a/offapi/com/sun/star/linguistic2/LinguServiceEvent.idl
+++ b/offapi/com/sun/star/linguistic2/LinguServiceEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/linguistic2/LinguServiceEventFlags.idl b/offapi/com/sun/star/linguistic2/LinguServiceEventFlags.idl
index 7b48cb1c75fe..2f19be19b6cf 100644
--- a/offapi/com/sun/star/linguistic2/LinguServiceEventFlags.idl
+++ b/offapi/com/sun/star/linguistic2/LinguServiceEventFlags.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -58,7 +58,7 @@ published constants LinguServiceEventFlags
 
     //-------------------------------------------------------------------------
     /** Request new proofreading of the document
-
+    
         @since OOo 3.0.1
     */
     const short PROOFREAD_AGAIN = 8;
diff --git a/offapi/com/sun/star/linguistic2/LinguServiceManager.idl b/offapi/com/sun/star/linguistic2/LinguServiceManager.idl
index eac83abc40d6..05e20743816a 100644
--- a/offapi/com/sun/star/linguistic2/LinguServiceManager.idl
+++ b/offapi/com/sun/star/linguistic2/LinguServiceManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/linguistic2/Proofreader.idl b/offapi/com/sun/star/linguistic2/Proofreader.idl
index 619cad181931..9b3d5b14db55 100644
--- a/offapi/com/sun/star/linguistic2/Proofreader.idl
+++ b/offapi/com/sun/star/linguistic2/Proofreader.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,12 +45,12 @@ module com { module sun { module star { module linguistic2 {
     the sentence end and report all errors found.</p>
 
     <p>An implementation of this service is not limited to grammar checking at all.
-    It might also check style, used terms etc. Basically it can check every
+    It might also check style, used terms etc. Basically it can check every 
     aspect of a single sentence. Since the text provided is always the complete
     paragraph it can also choose to analyze the context of the sentence currently
     required to be checked. However error reports need to be limited to the
     current sentence.</p>
-
+ 
     @since OOo 3.0.1
  */
 
diff --git a/offapi/com/sun/star/linguistic2/ProofreadingIterator.idl b/offapi/com/sun/star/linguistic2/ProofreadingIterator.idl
index d0307ebccde4..5ebef31da67c 100644
--- a/offapi/com/sun/star/linguistic2/ProofreadingIterator.idl
+++ b/offapi/com/sun/star/linguistic2/ProofreadingIterator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ module com { module sun { module star { module linguistic2 {
 /** provides a proofreading iterator
 
     <p>An implementation of this service acts as a mediator between documents
-    and proofreaders (often called just grammar checkers). It is responsible to
+    and proofreaders (often called just grammar checkers). It is responsible to 
     process requests for proofreading text portions.</p>
 
     @since OOo 3.0.1
diff --git a/offapi/com/sun/star/linguistic2/ProofreadingResult.idl b/offapi/com/sun/star/linguistic2/ProofreadingResult.idl
index 2a0fde6a0d12..38be5c8ade2c 100644
--- a/offapi/com/sun/star/linguistic2/ProofreadingResult.idl
+++ b/offapi/com/sun/star/linguistic2/ProofreadingResult.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,11 +51,11 @@ module com {  module sun {  module star {  module linguistic2 {
 
 // forward declaration
 interface XProofreader;
-
+    
 //=============================================================================
 /** holds the results from proofreading a sentence.
 
-    @since  OOo 3.0.1
+    @since	OOo 3.0.1
 */
 struct ProofreadingResult
 {
@@ -73,7 +73,7 @@ struct ProofreadingResult
 
     // the start of sentence position passed to the proofreader
     long nStartOfSentencePosition;
-
+    
     // the end of sentence position found by the proofreader
     // That is the index following the character terminating the sentence.
     long nBehindEndOfSentencePosition;
@@ -84,7 +84,7 @@ struct ProofreadingResult
 
     // the list of errors
     sequence< com::sun::star::linguistic2::SingleProofreadingError > aErrors;
-
+    
     // a list of properties
     sequence< com::sun::star::beans::PropertyValue > aProperties;
 
diff --git a/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl b/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl
index 95d4ce58991c..5a710d0a3ced 100644
--- a/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl
+++ b/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ module com {  module sun {  module star {  module linguistic2 {
 //=============================================================================
 /** holds a single error found by the proofreader.
 
-    @since  OOo 3.0.1
+    @since	OOo 3.0.1
 */
 struct SingleProofreadingError
 {
@@ -69,7 +69,7 @@ struct SingleProofreadingError
     // a list of correction suggestions
     // Usually emtpy if only automatic checking was done.
     sequence< string > aSuggestions;
-
+    
     // a list of properties
     sequence< com::sun::star::beans::PropertyValue > aProperties;
 };
diff --git a/offapi/com/sun/star/linguistic2/SpellChecker.idl b/offapi/com/sun/star/linguistic2/SpellChecker.idl
index 2ab83c0049c8..d1bf817de50f 100644
--- a/offapi/com/sun/star/linguistic2/SpellChecker.idl
+++ b/offapi/com/sun/star/linguistic2/SpellChecker.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,7 +48,7 @@ module com { module sun { module star { module linguistic2 {
  published interface XLinguServiceEventBroadcaster;
 
 //=============================================================================
-/** offers spellchecking functionality.
+/**	offers spellchecking functionality.
 */
 published service SpellChecker
 {
diff --git a/offapi/com/sun/star/linguistic2/SpellFailure.idl b/offapi/com/sun/star/linguistic2/SpellFailure.idl
index 0fcb12842823..544618a275c3 100644
--- a/offapi/com/sun/star/linguistic2/SpellFailure.idl
+++ b/offapi/com/sun/star/linguistic2/SpellFailure.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/linguistic2/Thesaurus.idl b/offapi/com/sun/star/linguistic2/Thesaurus.idl
index e181ea0f70a9..22d65d741dbd 100644
--- a/offapi/com/sun/star/linguistic2/Thesaurus.idl
+++ b/offapi/com/sun/star/linguistic2/Thesaurus.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@ module com { module sun { module star { module linguistic2 {
  published interface XThesaurus;
 
 //=============================================================================
-/** offers thesaurus functionality.
+/**	offers thesaurus functionality.
 */
 published service Thesaurus
 {
diff --git a/offapi/com/sun/star/linguistic2/XAvailableLocales.idl b/offapi/com/sun/star/linguistic2/XAvailableLocales.idl
index 97d75f7c0937..d50bd42697da 100644
--- a/offapi/com/sun/star/linguistic2/XAvailableLocales.idl
+++ b/offapi/com/sun/star/linguistic2/XAvailableLocales.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ published interface XAvailableLocales : com::sun::star::uno::XInterface
     /** retrieve the list of supported languages (Locales).
 
         @see    <type scope"com::sun::star::linguistic2">XSupportedLocales</type>
-
+        
         @param aServiceName
             the name of the service to get the list of available Locales for.
         @return
@@ -55,7 +55,7 @@ published interface XAvailableLocales : com::sun::star::uno::XInterface
             if there is no such language or the service is not known.
     */
     sequence< com::sun::star::lang::Locale > getAvailableLocales(
-        [in] string                         aServiceName );
+        [in] string 						aServiceName );
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/linguistic2/XConversionDictionary.idl b/offapi/com/sun/star/linguistic2/XConversionDictionary.idl
index ddcf471bcd39..0cf28878dd14 100644
--- a/offapi/com/sun/star/linguistic2/XConversionDictionary.idl
+++ b/offapi/com/sun/star/linguistic2/XConversionDictionary.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -101,7 +101,7 @@ published interface XConversionDictionary : com::sun::star::uno::XInterface
     /**
         @returns
             the conversion type supported by the dictionary.
-
+        
         @see    com::sun::star::linguistic2::ConversionDictionaryType
     */
     short getConversionType();
@@ -131,11 +131,11 @@ published interface XConversionDictionary : com::sun::star::uno::XInterface
     /** searches for entries or conversions that match the given text.
 
         <p>The exact string to be looked for is the substring from the
-        aText parameter that starts at position nStartPos and has the
+        aText parameter that starts at position nStartPos and has the 
         length nLength.</p>
 
         @returns
-            the list of conversions found for the supplied text.
+            the list of conversions found for the supplied text. 
             If no nothing was found, it is empty.
 
         @param  aText
@@ -151,22 +151,22 @@ published interface XConversionDictionary : com::sun::star::uno::XInterface
             specifies the direction of the conversion to look for.
             It is one of
             <type scope="com::sun::star::linguistic2">ConversionDirection</type>.
-
+        
         @param nTextConversionOptions
-            Combination of <type scope="com::sun::star::i18n">TextConversionOption</type>
+            Combination of <type scope="com::sun::star::i18n">TextConversionOption</type> 
             values.
 
-        @throws com::sun::star::lang::IllegalArgumentException
-            if the locale is not supported by the dictionary or if
+        @throws com::sun::star::lang::IllegalArgumentException 
+            if the locale is not supported by the dictionary or if 
             nTextConversionOptions is invalid for the given locale.
     */
-    sequence< string > getConversions(
+    sequence< string > getConversions( 
             [in] string aText,
             [in] long nStartPos,
             [in] long nLength,
             [in] com::sun::star::linguistic2::ConversionDirection eDirection,
             [in] long nTextConversionOptions )
-        raises( com::sun::star::lang::IllegalArgumentException );
+        raises( com::sun::star::lang::IllegalArgumentException ); 
 
     //-------------------------------------------------------------------------
     /** is used to add a conversion pair to the dictionary.
@@ -177,19 +177,19 @@ published interface XConversionDictionary : com::sun::star::uno::XInterface
         @param  aRightText
             the right text of the pair to be added.
 
-        @throws com::sun::star::lang::IllegalArgumentException
+        @throws com::sun::star::lang::IllegalArgumentException 
             if the arguments are invalid.
             For example if the specifications defined by the service
             implementing this object are not met.
 
-        @throws com::sun::star::container::ElementExistException
+        @throws com::sun::star::container::ElementExistException 
             if such an entry already exists.
     */
     void addEntry(
             [in] string     aLeftText,
             [in] string     aRightText )
-        raises( com::sun::star::lang::IllegalArgumentException,
-                com::sun::star::container::ElementExistException);
+        raises( com::sun::star::lang::IllegalArgumentException, 
+                com::sun::star::container::ElementExistException); 
 
     //-------------------------------------------------------------------------
     /** removes a conversion pair from the dictionary.
@@ -200,16 +200,16 @@ published interface XConversionDictionary : com::sun::star::uno::XInterface
         @param  aRightText
             the right text of the pair to be removed.
 
-        @throws com::sun::star::container::NoSuchElementException
+        @throws com::sun::star::container::NoSuchElementException 
             if there is no such entry.
     */
     void removeEntry(
             [in] string     aLeftText,
             [in] string     aRightText )
-        raises( com::sun::star::container::NoSuchElementException );
+        raises( com::sun::star::container::NoSuchElementException ); 
 
     //-------------------------------------------------------------------------
-    /** returns the maximum number of characters used as left or right text
+    /** returns the maximum number of characters used as left or right text 
         in entries.
 
         @param eDirection
@@ -222,15 +222,15 @@ published interface XConversionDictionary : com::sun::star::uno::XInterface
             [in] com::sun::star::linguistic2::ConversionDirection eDirection );
 
     //-------------------------------------------------------------------------
-    /**
-        @returns
-            a list of all left or right parts of the dictionaries entries.
+    /** 
+        @returns 
+            a list of all left or right parts of the dictionaries entries.    
         @param  eDirection
-            specifies if all left or all right parts of the entries
+            specifies if all left or all right parts of the entries 
             should be returned.
     */
 
-    sequence< string > getConversionEntries(
+    sequence< string > getConversionEntries( 
             [in] com::sun::star::linguistic2::ConversionDirection eDirection );
 
 };
diff --git a/offapi/com/sun/star/linguistic2/XConversionDictionaryList.idl b/offapi/com/sun/star/linguistic2/XConversionDictionaryList.idl
index 5df62f5dbb6d..464b57a3bd09 100644
--- a/offapi/com/sun/star/linguistic2/XConversionDictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/XConversionDictionaryList.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,7 +62,7 @@ module com { module sun { module star { module linguistic2 {
 
     <p>The dictionaries added to the list may or may not support the
     <type scope="com::sun::star::util">XFlushable</type> interface.
-    If they do those dictionaries have to be flushed upon termination
+    If they do those dictionaries have to be flushed upon termination 
     of the dictionary list.</p>
 
      @since OOo 1.1.2
@@ -74,19 +74,19 @@ published interface XConversionDictionaryList : com::sun::star::uno::XInterface
         @returns
             the name container interface to the dictionaries in the list.
 
-        <p>The interface can be used to add, remove or retrieve dictionaries
-        from the list by specifying the name of the dictionary, and
-        (in case of inserting) the interface to the dictionary as second
+        <p>The interface can be used to add, remove or retrieve dictionaries 
+        from the list by specifying the name of the dictionary, and 
+        (in case of inserting) the interface to the dictionary as second 
         parameter.</p>
 
-        <p>A dictionary to be added must support the
+        <p>A dictionary to be added must support the 
         <type scope="com::sun::star::linguistic2">XConversionDictionary</type>
         interface.
         The dictionary to be added needs not necessarily be created by
         this service.</p>
 
         <p>The <member scope="com::sun::star::container::XNameReplace">replaceByName</member>
-        function is implemented empty since renaming of dictionaries
+        function is implemented empty since renaming of dictionaries 
         is not allowed.</p>
     */
     com::sun::star::container::XNameContainer   getDictionaryContainer();
@@ -131,7 +131,7 @@ published interface XConversionDictionaryList : com::sun::star::uno::XInterface
         for entries matching the given text.</p>
 
         <p>The exact string to be looked for is the substring from the
-        aText parameter that starts at position nStartPos and has the
+        aText parameter that starts at position nStartPos and has the 
         length nLength.</p>
 
         @returns
@@ -148,7 +148,7 @@ published interface XConversionDictionaryList : com::sun::star::uno::XInterface
 
         @param aLocale
             Locale the conversion is refered to.
-
+        
         @param nConversionDictionaryType
             specifies the type of conversion the dictionary
             can be used for. It is one of
@@ -160,11 +160,11 @@ published interface XConversionDictionaryList : com::sun::star::uno::XInterface
             <type scope="com::sun::star::linguistic2">ConversionDirection</type>.
 
         @param nTextConversionOptions
-            Combination of <type scope="com::sun::star::i18n">TextConversionOption</type>
+            Combination of <type scope="com::sun::star::i18n">TextConversionOption</type> 
             values.
 
-        @throws com::sun::star::lang::IllegalArgumentException
-            if the nTextConversionOptions parameter is invalid for
+        @throws com::sun::star::lang::IllegalArgumentException 
+            if the nTextConversionOptions parameter is invalid for 
             the given locale.
 
         @throws NoSupportException
@@ -180,11 +180,11 @@ published interface XConversionDictionaryList : com::sun::star::uno::XInterface
             [in] short nConversionDictionaryType,
             [in] com::sun::star::linguistic2::ConversionDirection eDirection,
             [in] long nTextConversionOptions )
-        raises( com::sun::star::lang::IllegalArgumentException,
-                com::sun::star::lang::NoSupportException );
+        raises( com::sun::star::lang::IllegalArgumentException, 
+                com::sun::star::lang::NoSupportException ); 
 
     //-------------------------------------------------------------------------
-    /** returns the maximum number of characters used as left or right text
+    /** returns the maximum number of characters used as left or right text 
         in entries.
 
         <p>All active dictionaries of the specified locale and type
diff --git a/offapi/com/sun/star/linguistic2/XConversionPropertyType.idl b/offapi/com/sun/star/linguistic2/XConversionPropertyType.idl
index 0a847f046e78..7b1e2a27a8d3 100644
--- a/offapi/com/sun/star/linguistic2/XConversionPropertyType.idl
+++ b/offapi/com/sun/star/linguistic2/XConversionPropertyType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ module com { module sun { module star { module linguistic2 {
 /** allows set and retrieve the property type of an entry in a
     conversion dictionary
 
-    <p>The property type must be one of
+    <p>The property type must be one of 
     <type scope="com::sun::star::linguistic2">ConversionPropertyType</type></p>
 
     @see    com::sun::star::linguistic2::XConversionDictionary
@@ -64,7 +64,7 @@ published interface XConversionPropertyType : com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /** sets the property type for the specified entry.
 
-        <p>The conversion entry is specified by the pair
+        <p>The conversion entry is specified by the pair 
         ( aLeftText, aRightText ).</p>
 
         @param aLeftText
@@ -74,17 +74,17 @@ published interface XConversionPropertyType : com::sun::star::uno::XInterface
         @param nPropertyType
             the property type to be set for the entry
     */
-    void setPropertyType(
-            [in] string aLeftText,
-            [in] string aRightText,
+    void setPropertyType( 
+            [in] string aLeftText, 
+            [in] string aRightText, 
             [in] short nPropertyType )
         raises( com::sun::star::container::NoSuchElementException,
-                com::sun::star::lang::IllegalArgumentException );
+                com::sun::star::lang::IllegalArgumentException ); 
 
     //-------------------------------------------------------------------------
     /** returns the property type for the specified entry.
 
-        <p>The conversion entry is specified by the pair
+        <p>The conversion entry is specified by the pair 
         ( aLeftText, aRightText ).</p>
 
         @param aLeftText
@@ -95,10 +95,10 @@ published interface XConversionPropertyType : com::sun::star::uno::XInterface
             returns the property type for the entry with the specified
             left text.
     */
-    short getPropertyType(
-            [in] string aLeftText,
+    short getPropertyType( 
+            [in] string aLeftText, 
             [in] string aRightText )
-        raises( com::sun::star::container::NoSuchElementException );
+        raises( com::sun::star::container::NoSuchElementException ); 
 
 };
 
diff --git a/offapi/com/sun/star/linguistic2/XDictionary.idl b/offapi/com/sun/star/linguistic2/XDictionary.idl
index 305b508c1fa4..9ab99fbbc07a 100644
--- a/offapi/com/sun/star/linguistic2/XDictionary.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionary.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -85,7 +85,7 @@ published interface XDictionary : com::sun::star::container::XNamed
     //-------------------------------------------------------------------------
     /** specifies whether the dictionary should be used or not .
 
-        @param  bAcvtivate
+        @param	bAcvtivate
             <TRUE/> if the dictionary should be used, <FALSE/> otherwise.
 
     */
@@ -131,7 +131,7 @@ published interface XDictionary : com::sun::star::container::XNamed
             the reference to the entry found. If no entry was found,
             it is NULL.
 
-        @param  aWord
+        @param	aWord
             the word to be looked for.
 
         @see    <type scope="com::sun::star::linguistic2">XDictionaryEntry</type>
@@ -147,7 +147,7 @@ published interface XDictionary : com::sun::star::container::XNamed
         <P>In positive dictionaries only postive entries
         can be made, and in negative ones only negative entries.</P>
 
-        @param  xDicEntry
+        @param	xDicEntry
             the entry to be added.
 
         @returns
@@ -168,13 +168,13 @@ published interface XDictionary : com::sun::star::container::XNamed
         <P>In positive dictionaries only postive entries
         can be made, and in negative ones only negative entries.</P>
 
-        @param  aWord
+        @param	aWord
             the word to be added.
 
-        @param  bIsNegative
+        @param	bIsNegative
             specifies whether the entry will be a negative one or not.
 
-        @param  aRplcText
+        @param	aRplcText
             in the case of a negative entry, this is the replacement text to
             be used when replacing aWord. Otherwise, it is undefined.
 
@@ -191,7 +191,7 @@ published interface XDictionary : com::sun::star::container::XNamed
     //-------------------------------------------------------------------------
     /** removes an entry from the dictionary.
 
-        @param  aWord
+        @param	aWord
             the word matching the entry to be removed.
 
         @returns
@@ -210,9 +210,9 @@ published interface XDictionary : com::sun::star::container::XNamed
 
     //-------------------------------------------------------------------------
     /**
-        <p>This function should no longer be used since with the expansion of the
+        <p>This function should no longer be used since with the expansion of the 
         maximum number of allowed entries the result may become unreasonable large!</p>
-
+     
          @returns
              a sequence with all the entries of the dictionary.
 
@@ -235,12 +235,12 @@ published interface XDictionary : com::sun::star::container::XNamed
          be notified via a call to
         <member scope="com::sun::star::linguistic2">XDictionaryEventListener::processDictionaryEvent</member>.</P>
 
-        @param  xListener
+        @param	xListener
             the entry to be made, that is, the object that wants notifications.
 
         @returns
             <TRUE/> if the entry was successfully made, <FALSE/> otherwise.
-            If <member scope="com::sun::star::lang">XEventListener::disposing</member> was called before,
+            If <member scope="com::sun::star::lang">XEventListener::disposing</member> was called before, 
             it will always fail.
 
         @see    <member scope="com::sun::star::linguistic2">XDictionary::removeDictionaryEventListener</member>
@@ -252,7 +252,7 @@ published interface XDictionary : com::sun::star::container::XNamed
     //-------------------------------------------------------------------------
     /** removes an entry from the list of dictionary event listeners.
 
-        @param  xListener
+        @param	xListener
             the reference to the listening object to be removed.
 
         @returns
diff --git a/offapi/com/sun/star/linguistic2/XDictionary1.idl b/offapi/com/sun/star/linguistic2/XDictionary1.idl
index acf2b38fbc93..20b1390ddd41 100644
--- a/offapi/com/sun/star/linguistic2/XDictionary1.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionary1.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/linguistic2/XDictionaryEntry.idl b/offapi/com/sun/star/linguistic2/XDictionaryEntry.idl
index c9f2f89e588a..3f1ef8ab0650 100644
--- a/offapi/com/sun/star/linguistic2/XDictionaryEntry.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionaryEntry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/linguistic2/XDictionaryEventListener.idl b/offapi/com/sun/star/linguistic2/XDictionaryEventListener.idl
index 7436ab9283cc..f4d8ce1894c1 100644
--- a/offapi/com/sun/star/linguistic2/XDictionaryEventListener.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionaryEventListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,7 +55,7 @@ published interface XDictionaryEventListener : com::sun::star::lang::XEventListe
     //-------------------------------------------------------------------------
     /** is used to get notification of dictionary events.
 
-        @param  aDicEvent
+        @param	aDicEvent
             the event to be notified of.
 
     @see    <type scope="com::sun::star::lang">DictionaryEvent</type>
diff --git a/offapi/com/sun/star/linguistic2/XDictionaryList.idl b/offapi/com/sun/star/linguistic2/XDictionaryList.idl
index c45c18b8bb43..9c982fcd483e 100644
--- a/offapi/com/sun/star/linguistic2/XDictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionaryList.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -80,7 +80,7 @@ published interface XDictionaryList : com::sun::star::uno::XInterface
             the XDictionary with the specified name. If no such
             dictionary exists, <NULL/> will be returned.
 
-        @param  aDictionaryName
+        @param	aDictionaryName
             specifies the name of the dictionary to look for.
 
         @see    <type scope="com::sun::star::linguistic2">XDictionary</type>
@@ -98,7 +98,7 @@ published interface XDictionaryList : com::sun::star::uno::XInterface
              <TRUE/> if the dictionary was added successfully,
             <FALSE/> otherwise.
 
-        @param  xDictionary
+        @param	xDictionary
             the dictionary to be added.
 
         @see    <type scope="com::sun::star::linguistic2">XDictionary</type>
@@ -117,7 +117,7 @@ published interface XDictionaryList : com::sun::star::uno::XInterface
              <TRUE/> if the dictionary was removed successfully, <FALSE/>
              otherwise.
 
-        @param  xDictionary
+        @param	xDictionary
             dictionary to be removed from the list of dictionaries.
 
         @see    <type scope="com::sun::star::linguistic2">XDictionary</type>
@@ -137,10 +137,10 @@ published interface XDictionaryList : com::sun::star::uno::XInterface
             If <member scope="com::sun::star::lang">XEventListener::disposing</member>
             was called before, it will always fail.
 
-        @param  xListener
+        @param	xListener
             the object to be notified of dictionary-list events.
 
-        @param  bReceiveVerbose
+        @param	bReceiveVerbose
             <TRUE/> if the listener requires more detailed event
             notification than usual.
 
@@ -158,7 +158,7 @@ published interface XDictionaryList : com::sun::star::uno::XInterface
             <TRUE/> if the object to be removed was found and removed,
             <FALSE/> otherwise.
 
-        @param  xListener
+        @param	xListener
             the object to be removed from the listener list.
 
         @see    <type scope="com::sun::star::linguistic2">XDictionaryListEventListener</type>
@@ -233,7 +233,7 @@ published interface XDictionaryList : com::sun::star::uno::XInterface
              Use an empty aLocale for dictionaries which may contain
             entries of all languages.
 
-        @param  eDicType
+        @param	eDicType
             specifies the type of the dictionary.
 
          @param aURL
diff --git a/offapi/com/sun/star/linguistic2/XDictionaryListEventListener.idl b/offapi/com/sun/star/linguistic2/XDictionaryListEventListener.idl
index c1c251de04ae..23b4e73183f5 100644
--- a/offapi/com/sun/star/linguistic2/XDictionaryListEventListener.idl
+++ b/offapi/com/sun/star/linguistic2/XDictionaryListEventListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,7 +56,7 @@ published interface XDictionaryListEventListener : com::sun::star::lang::XEventL
     //-------------------------------------------------------------------------
     /** is used to notify the object about dictionary-list events.
 
-        @param  aDicListEvent
+        @param	aDicListEvent
             the event to be notified of.
 
     @see    <type scope="com::sun::star::linguistic2">DictionaryListEvent</type>
diff --git a/offapi/com/sun/star/linguistic2/XHyphenatedWord.idl b/offapi/com/sun/star/linguistic2/XHyphenatedWord.idl
index 94aa9166c2e9..aa0e10191d76 100644
--- a/offapi/com/sun/star/linguistic2/XHyphenatedWord.idl
+++ b/offapi/com/sun/star/linguistic2/XHyphenatedWord.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,7 +62,7 @@ published interface XHyphenatedWord : com::sun::star::uno::XInterface
          @returns
             the language of the hyphenated word.
 
-        @see    com::sun::star::lang::Locale
+        @see	com::sun::star::lang::Locale
     */
     com::sun::star::lang::Locale getLocale();
 
diff --git a/offapi/com/sun/star/linguistic2/XHyphenator.idl b/offapi/com/sun/star/linguistic2/XHyphenator.idl
index dce5a4674865..c7f8003a2dda 100644
--- a/offapi/com/sun/star/linguistic2/XHyphenator.idl
+++ b/offapi/com/sun/star/linguistic2/XHyphenator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -112,7 +112,7 @@ published interface XHyphenator : com::sun::star::linguistic2::XSupportedLocales
 
         @param aProperties
             provides property values to be used for this function call only.
-            It is usually empty in order to use the default values supplied
+            It is usually empty in order to use the default values supplied 
             with the property set.
 
         @see    <type scope="com::sun::star::linguistic2">XHyphenatedWord</type>
diff --git a/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl b/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
index b6b618d5a01e..b8f4298477af 100644
--- a/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
+++ b/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@
 #endif
 
 module com { module sun { module star { module linguistic2 {
-
+    
 /** This interface allows to guess the language of a text
 
     <p> The current set of supported languages is:
@@ -112,25 +112,25 @@ module com { module sun { module star { module linguistic2 {
         <li>zh-CN : Chinese (simplified)</li>
         <li>zh-TW : Chinese (traditional)</li>
     </ul>
-
+       
     </p>
 
     @since OOo 2.2
  */
 interface XLanguageGuessing
 {
-    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------    
     /** determines the single most probable language of a sub-string.
-
-        <p>Please note that because statistical analysis is part
-        of the algorithm the the likelihood to get the correct
-        result increases with the length of the sub-string.
+        
+        <p>Please note that because statistical analysis is part 
+        of the algorithm the the likelihood to get the correct 
+        result increases with the length of the sub-string. 
         A word is much less likely guessed correctly compared to
         a sentence or even a whole paragraph.</p>
 
         <p>Also note that some languages are that 'close' to each other
         that it will be quite unlikely to find a difference in them,
-        e.g. English (UK), English (IE) and English (AUS) and
+        e.g. English (UK), English (IE) and English (AUS) and 
         most liklely English (US) as well. And thus the result may
         be arbitrary.</p>
 
@@ -150,8 +150,8 @@ interface XLanguageGuessing
             The value must met 0 <= nLen <= (length of text).
 
         @see    <type scope="com::sun::star::lang">Locale</type>
-     */
-    com::sun::star::lang::Locale    guessPrimaryLanguage(
+     */ 
+    com::sun::star::lang::Locale    guessPrimaryLanguage( 
             [in] string  aText,
             [in] long    nStartPos,
             [in] long    nLen )
@@ -167,7 +167,7 @@ interface XLanguageGuessing
             [in] sequence< com::sun::star::lang::Locale > aLanguages )
         raises( com::sun::star::lang::IllegalArgumentException );
 
-    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------            
     /** allows to explicitly re-enable some languages that got previously
         disabled.
 
@@ -176,21 +176,21 @@ interface XLanguageGuessing
     void enableLanguages(
             [in] sequence< com::sun::star::lang::Locale > aLanguages )
         raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
+    
+    //-------------------------------------------------------------------------    
     /** returns a list of all supported languages.
 
         <p>This should be the same as the mathematical union of
         all enabled and disabled languages.</p>
     */
     sequence< com::sun::star::lang::Locale > getAvailableLanguages();
-
-    //-------------------------------------------------------------------------
+    
+    //-------------------------------------------------------------------------    
     /** returns the list of all enabled languages
     */
     sequence< com::sun::star::lang::Locale > getEnabledLanguages();
-
-    //-------------------------------------------------------------------------
+    
+    //-------------------------------------------------------------------------    
     /** returns the list of all disabled languages
     */
     sequence< com::sun::star::lang::Locale > getDisabledLanguages();
diff --git a/offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster.idl b/offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster.idl
index ec61bdca6679..d7af47c7153b 100644
--- a/offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster.idl
+++ b/offapi/com/sun/star/linguistic2/XLinguServiceEventBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ module com { module sun { module star { module linguistic2 {
 //=============================================================================
 /** is used to register a listener for LinguServiceEvents.
 
-    <P>This interface may be used by spellchecker or hyphenator
+    <P>This interface may be used by spellchecker or hyphenator 
     implementations to allow clients to be registered and informed about
     <type scope="com::sun::star::linguistic2">LinguServiceEvent</type>s.
     </P>
@@ -68,8 +68,8 @@ published interface XLinguServiceEventBroadcaster : com::sun::star::uno::XInterf
         @param xLstnr
             the listener to be addded.
      */
-    boolean addLinguServiceEventListener (
-        [in] com::sun::star::linguistic2::XLinguServiceEventListener    xLstnr );
+    boolean	addLinguServiceEventListener (
+        [in] com::sun::star::linguistic2::XLinguServiceEventListener	xLstnr );
 
     //-------------------------------------------------------------------------
     /**
@@ -80,8 +80,8 @@ published interface XLinguServiceEventBroadcaster : com::sun::star::uno::XInterf
         @param xLstnr
             the listener to be removed.
      */
-    boolean removeLinguServiceEventListener (
-        [in] com::sun::star::linguistic2::XLinguServiceEventListener    xLstnr );
+    boolean	removeLinguServiceEventListener (
+        [in] com::sun::star::linguistic2::XLinguServiceEventListener	xLstnr );
 
 };
 
diff --git a/offapi/com/sun/star/linguistic2/XLinguServiceEventListener.idl b/offapi/com/sun/star/linguistic2/XLinguServiceEventListener.idl
index f838529078e4..e5f1e408b2bb 100644
--- a/offapi/com/sun/star/linguistic2/XLinguServiceEventListener.idl
+++ b/offapi/com/sun/star/linguistic2/XLinguServiceEventListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -58,7 +58,7 @@ published interface XLinguServiceEventListener : com::sun::star::lang::XEventLis
         @param aLngSvcEvent
             the event the listener will be informed about.
      */
-    void    processLinguServiceEvent(
+    void	processLinguServiceEvent(
         [in] com::sun::star::linguistic2::LinguServiceEvent aLngSvcEvent );
 
 };
diff --git a/offapi/com/sun/star/linguistic2/XLinguServiceManager.idl b/offapi/com/sun/star/linguistic2/XLinguServiceManager.idl
index 15b8acc6322a..2d6bbccb347c 100644
--- a/offapi/com/sun/star/linguistic2/XLinguServiceManager.idl
+++ b/offapi/com/sun/star/linguistic2/XLinguServiceManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,7 +51,7 @@ module com { module sun { module star { module linguistic2 {
 //=============================================================================
 /** the basic interface to be used to access linguistic functionality.
 
-    <P>This interface is used to access spellchecker, hyphenator, and
+    <P>This interface is used to access spellchecker, hyphenator, and 
     thesaurus functionality.
     Additionally, it can query what implementations of those services are
     available (for specific languages or in general).
@@ -63,8 +63,8 @@ module com { module sun { module star { module linguistic2 {
     of creation/usage of those services.
     That is, if the first spellchecker implementation does not recognize
     the given word as correct, the second service implementation for that
-    language is created and gets queried. If that one fails, the third one
-    gets created and queried and so on.
+    language is created and gets queried. If that one fails, the third one 
+    gets created and queried and so on. 
     This chain stops if an implementation reports the word as correct or the
     end of the list is reached, in which case the word is reported as incorrect.
     </P>
@@ -84,7 +84,7 @@ published interface XLinguServiceManager : com::sun::star::uno::XInterface
             the <type scope="com::sun::star::linguistic2">XSpellChecker</type>
             interface to be used for spellchecking.
     */
-    com::sun::star::linguistic2::XSpellChecker  getSpellChecker();
+    com::sun::star::linguistic2::XSpellChecker	getSpellChecker();
 
     //-------------------------------------------------------------------------
     /**
@@ -92,7 +92,7 @@ published interface XLinguServiceManager : com::sun::star::uno::XInterface
             the <type scope="com::sun::star::linguistic2">XHyphenator</type>
             interface to be used for hyphenation.
     */
-    com::sun::star::linguistic2::XHyphenator    getHyphenator();
+    com::sun::star::linguistic2::XHyphenator	getHyphenator();
 
     //-------------------------------------------------------------------------
     /**
@@ -100,14 +100,14 @@ published interface XLinguServiceManager : com::sun::star::uno::XInterface
             the <type scope="com::sun::star::linguistic2">XThesaurus</type>
             interface to be used for thesaurus functionality.
     */
-    com::sun::star::linguistic2::XThesaurus     getThesaurus();
+    com::sun::star::linguistic2::XThesaurus		getThesaurus();
 
     //-------------------------------------------------------------------------
     /** adds a listener to the list of event listeners.
 
         <P>The listeners may support one or both of
         <type scope="com::sun::star::linguistic2">XDictionaryEventListener</type>
-        and
+        and 
         <type scope="com::sun::star::linguistic2">XLinguServiceEventListener</type>
         interfaces.
         </P>
@@ -118,7 +118,7 @@ published interface XLinguServiceManager : com::sun::star::uno::XInterface
         @param xListener
             the listener to be added.
     */
-    boolean     addLinguServiceManagerListener(
+    boolean		addLinguServiceManagerListener(
         [in] com::sun::star::lang::XEventListener xListener );
 
     //-------------------------------------------------------------------------
@@ -130,7 +130,7 @@ published interface XLinguServiceManager : com::sun::star::uno::XInterface
         @param xListener
             the listener to be removed.
     */
-    boolean     removeLinguServiceManagerListener(
+    boolean		removeLinguServiceManagerListener(
         [in] com::sun::star::lang::XEventListener xListener );
 
     //-------------------------------------------------------------------------
@@ -145,9 +145,9 @@ published interface XLinguServiceManager : com::sun::star::uno::XInterface
         @param aLocale
             the language used to query the list of available implementations.
     */
-    sequence< string >  getAvailableServices(
-        [in] string                         aServiceName,
-        [in] com::sun::star::lang::Locale   aLocale );
+    sequence< string >	getAvailableServices(
+        [in] string 						aServiceName,
+        [in] com::sun::star::lang::Locale 	aLocale );
 
     //-------------------------------------------------------------------------
     /** sets the list of service implementations to be used for a
@@ -163,10 +163,10 @@ published interface XLinguServiceManager : com::sun::star::uno::XInterface
         @param aServiceImplNames
             the name of the service to set the list.
     */
-    void                setConfiguredServices(
-        [in] string                         aServiceName,
-        [in] com::sun::star::lang::Locale   aLocale,
-        [in] sequence< string >             aServiceImplNames );
+    void				setConfiguredServices(
+        [in] string 						aServiceName,
+        [in] com::sun::star::lang::Locale 	aLocale,
+        [in] sequence< string > 			aServiceImplNames );
 
     //-------------------------------------------------------------------------
     /** queries the list of service implementations to be used for a
@@ -181,9 +181,9 @@ published interface XLinguServiceManager : com::sun::star::uno::XInterface
         @param aLocale
             the language to get queried.
     */
-    sequence< string >  getConfiguredServices(
-        [in] string                         aServiceName,
-        [in] com::sun::star::lang::Locale   aLocale );
+    sequence< string >	getConfiguredServices(
+        [in] string 						aServiceName,
+        [in] com::sun::star::lang::Locale 	aLocale );
 
 };
 
diff --git a/offapi/com/sun/star/linguistic2/XMeaning.idl b/offapi/com/sun/star/linguistic2/XMeaning.idl
index f7a0eb007817..a277bfb8c1c7 100644
--- a/offapi/com/sun/star/linguistic2/XMeaning.idl
+++ b/offapi/com/sun/star/linguistic2/XMeaning.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/linguistic2/XPossibleHyphens.idl b/offapi/com/sun/star/linguistic2/XPossibleHyphens.idl
index 14f45212f223..ffeb7a934f2c 100644
--- a/offapi/com/sun/star/linguistic2/XPossibleHyphens.idl
+++ b/offapi/com/sun/star/linguistic2/XPossibleHyphens.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,9 +44,9 @@ module com { module sun { module star { module linguistic2 {
 /** Gives information about a word's possible hyphenation points.
 
      <P>Example: In German pre-spelling-reform you may have the following:
-     getWord:                   Dampfschiffahrt
-     getPossibleHyphens:            Dampf=schiff=fahrt
-     getOrigHyphensPositions:   4, 9
+     getWord:					Dampfschiffahrt
+     getPossibleHyphens:			Dampf=schiff=fahrt
+     getOrigHyphensPositions:	4, 9
      That is "Dampfschiffahrt" can be hyphenated after the "pf" (4) and
      between the double "ff" (9). And if you are going to hyphenate it at
      position 9 you will get an additional "f" before the hyphen
@@ -88,7 +88,7 @@ published interface XPossibleHyphens : com::sun::star::uno::XInterface
              an ascending sequence of numbers where each number is an offset
              within the original word which denotes a hyphenation
              position corresponding to one of the hyphens in the
-            string returned by
+            string returned by 
             <member scope="com::sun::star::linguistic2">XPossibleHyphens::getPossibleHyphens</member>.
     */
     sequence<short> getHyphenationPositions();
diff --git a/offapi/com/sun/star/linguistic2/XProofreader.idl b/offapi/com/sun/star/linguistic2/XProofreader.idl
index 89a6bc8d7a3e..3e9b4a330c83 100644
--- a/offapi/com/sun/star/linguistic2/XProofreader.idl
+++ b/offapi/com/sun/star/linguistic2/XProofreader.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,18 +62,18 @@ module com {  module sun {  module star {  module linguistic2 {
 //=============================================================================
 /** API for proofreading a text
 
-    @since  OOo 3.0.1
+    @since	OOo 3.0.1
 */
 interface XProofreader: com::sun::star::linguistic2::XSupportedLocales
 {
 
     //-------------------------------------------------------------------------
-    /** whether is the text checked by the spellchecker
+    /** whether is the text checked by the spellchecker 
 
         @returns true if it is also a spell checker
     */
     boolean isSpellChecker();
-
+    
     //-------------------------------------------------------------------------
     /** start checking
 
@@ -108,13 +108,13 @@ interface XProofreader: com::sun::star::linguistic2::XSupportedLocales
 
     //-------------------------------------------------------------------------
     /** disables a specific rule for a given locale.
-
+     
         <p>If the locale is empty the rule should be ignored for all languages.</p>
     */
-    void ignoreRule( [in] string aRuleIdentifier,
+    void ignoreRule( [in] string aRuleIdentifier, 
                      [in] com::sun::star::lang::Locale aLocale )
             raises( com::sun::star::lang::IllegalArgumentException );
-
+    
     //-------------------------------------------------------------------------
     /** sets all rules back to their default settings.
     */
diff --git a/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl b/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl
index c7be591e86ad..447dcf946c07 100644
--- a/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl
+++ b/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -58,7 +58,7 @@ module com {  module sun {  module star {  module linguistic2 {
 //=============================================================================
 /** API for the proofreading iterator that mediates between the document and the proofreader.
 
-    @since  OOo 3.0.1
+    @since	OOo 3.0.1
 */
 interface XProofreadingIterator: com::sun::star::uno::XInterface
 {
@@ -107,7 +107,7 @@ interface XProofreadingIterator: com::sun::star::uno::XInterface
     /** clears the list of ignored rules for each prrofreader
     */
     void resetIgnoreRules();
-
+    
     //-------------------------------------------------------------------------
     /** checks if the given document is currently being checked
 
diff --git a/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl b/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl
index 69c8f00b3089..e4ce92eae8d2 100644
--- a/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl
+++ b/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,7 +51,7 @@ interface XSearchableDictionary : com::sun::star::linguistic2::XDictionary
 
         @param  aWord
             the word to find similar written entries for.
-
+        
         @returns
             the list of similar entries found.
 
diff --git a/offapi/com/sun/star/linguistic2/XSearchableDictionaryList.idl b/offapi/com/sun/star/linguistic2/XSearchableDictionaryList.idl
index 4e61072d7286..110760e99359 100644
--- a/offapi/com/sun/star/linguistic2/XSearchableDictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/XSearchableDictionaryList.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -78,7 +78,7 @@ published interface XSearchableDictionaryList : com::sun::star::linguistic2::XDi
             <TRUE/> if entries for purposes of spellchecking are required.
             <FALSE/> if only entries for hyphenation purposes are required.
 */
-    com::sun::star::linguistic2::XDictionaryEntry   queryDictionaryEntry(
+    com::sun::star::linguistic2::XDictionaryEntry	queryDictionaryEntry(
         [in] string  aWord ,
         [in] com::sun::star::lang::Locale  aLocale,
         [in] boolean bSearchPosDics,
diff --git a/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl b/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl
index 3d91e61a0d85..005b73dbf6c2 100644
--- a/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl
+++ b/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 module com { module sun { module star { module linguistic2 {
 
 //=============================================================================
-/**
+/** 
     allows to modify the suggestion list returned by a spell checker.
 
     <P>Basically this is needed to post-add further suggestions while keeping the
diff --git a/offapi/com/sun/star/linguistic2/XSpellAlternatives.idl b/offapi/com/sun/star/linguistic2/XSpellAlternatives.idl
index de14f5bdc420..c831845456f5 100644
--- a/offapi/com/sun/star/linguistic2/XSpellAlternatives.idl
+++ b/offapi/com/sun/star/linguistic2/XSpellAlternatives.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/linguistic2/XSpellChecker.idl b/offapi/com/sun/star/linguistic2/XSpellChecker.idl
index a8c432f6b6e9..b5596f0bd93b 100644
--- a/offapi/com/sun/star/linguistic2/XSpellChecker.idl
+++ b/offapi/com/sun/star/linguistic2/XSpellChecker.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -70,7 +70,7 @@ published interface XSpellChecker : com::sun::star::linguistic2::XSupportedLocal
             <TRUE/> if the word is spelled correctly using
              the specified language, <FALSE/> otherwise.
 
-        @param  aWord
+        @param	aWord
             the word to be checked.
 
         @param aLocale
@@ -104,7 +104,7 @@ published interface XSpellChecker : com::sun::star::linguistic2::XSupportedLocal
              object with information about the reason of failure and, if available,
              proposals for spelling alternatives will be returned.
 
-        @param  aWord
+        @param	aWord
             the word to be checked.
 
         @param aLocale
diff --git a/offapi/com/sun/star/linguistic2/XSpellChecker1.idl b/offapi/com/sun/star/linguistic2/XSpellChecker1.idl
index 39f649b383c4..bbcce2cb53c4 100644
--- a/offapi/com/sun/star/linguistic2/XSpellChecker1.idl
+++ b/offapi/com/sun/star/linguistic2/XSpellChecker1.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module linguistic2 {
+module com { module sun { module star { module linguistic2 { 
 
 //=============================================================================
 /** @deprecated
@@ -58,14 +58,14 @@ module com { module sun { module star { module linguistic2 {
 published interface XSpellChecker1 : com::sun::star::linguistic2::XSupportedLanguages
 {
     //-------------------------------------------------------------------------
-    boolean isValid(
+    boolean isValid( 
             [in] string aWord,
             [in] short nLanguage,
             [in] com::sun::star::beans::PropertyValues aProperties )
         raises( com::sun::star::lang::IllegalArgumentException );
 
     //-------------------------------------------------------------------------
-    com::sun::star::linguistic2::XSpellAlternatives spell(
+    com::sun::star::linguistic2::XSpellAlternatives spell( 
             [in] string aWord,
             [in] short nLanguage,
             [in] com::sun::star::beans::PropertyValues aProperties )
@@ -75,7 +75,7 @@ published interface XSpellChecker1 : com::sun::star::linguistic2::XSupportedLang
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/linguistic2/XSupportedLanguages.idl b/offapi/com/sun/star/linguistic2/XSupportedLanguages.idl
index 38410fb5e788..8cc2bd12f415 100644
--- a/offapi/com/sun/star/linguistic2/XSupportedLanguages.idl
+++ b/offapi/com/sun/star/linguistic2/XSupportedLanguages.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/linguistic2/XSupportedLocales.idl b/offapi/com/sun/star/linguistic2/XSupportedLocales.idl
index 6e145eaee2c3..a099d1f46e74 100644
--- a/offapi/com/sun/star/linguistic2/XSupportedLocales.idl
+++ b/offapi/com/sun/star/linguistic2/XSupportedLocales.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,7 +68,7 @@ published interface XSupportedLocales : com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /**
-        @param  aLocale
+        @param	aLocale
             specifies the language being checked for support
              by the object.
 
diff --git a/offapi/com/sun/star/linguistic2/XThesaurus.idl b/offapi/com/sun/star/linguistic2/XThesaurus.idl
index 602f78184bd7..f6cbfe04a430 100644
--- a/offapi/com/sun/star/linguistic2/XThesaurus.idl
+++ b/offapi/com/sun/star/linguistic2/XThesaurus.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,10 +65,10 @@ published interface XThesaurus : com::sun::star::linguistic2::XSupportedLocales
         @returns
             a list of meanings for the given word and language.
 
-         @param aTerm
+         @param	aTerm
              the word to query for its meanings.
 
-        @param  aLocale
+        @param	aLocale
             specifies the language of the word.
 
             <P>If the language is not supported, an
diff --git a/offapi/com/sun/star/logging/ConsoleHandler.idl b/offapi/com/sun/star/logging/ConsoleHandler.idl
index 92bd6fdc7e28..cffa793d972b 100644
--- a/offapi/com/sun/star/logging/ConsoleHandler.idl
+++ b/offapi/com/sun/star/logging/ConsoleHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_logging_ConsoleHandler_idl__
 #define __com_sun_star_logging_ConsoleHandler_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 #ifndef __com_sun_star_beans_NamedValue_idl__
@@ -37,7 +37,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module logging {
+module com { module sun { module star { module logging { 
 
 interface XConsoleHandler;
 
@@ -75,7 +75,7 @@ service ConsoleHandler : XConsoleHandler
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/CsvLogFormatter.idl b/offapi/com/sun/star/logging/CsvLogFormatter.idl
index 4db61b9be9d9..d67f25b41341 100644
--- a/offapi/com/sun/star/logging/CsvLogFormatter.idl
+++ b/offapi/com/sun/star/logging/CsvLogFormatter.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,13 +29,13 @@
 
 //=============================================================================
 
-module com { module sun { module star { module logging {
+module com { module sun { module star { module logging { 
 
 interface XCsvLogFormatter;
 
 //=============================================================================
 
-/** specifies a service which formats log records for RFC4180-style CSV-Files
+/** specifies a service which formats log records for RFC4180-style CSV-Files 
 
     <p>Every log record, as passed to <member>XCsvLogFormatter::format</member>,
     will be formatted into a single row for a CSV file.
@@ -56,7 +56,7 @@ service CsvLogFormatter : XCsvLogFormatter
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/DocumentIOLogRing.idl b/offapi/com/sun/star/logging/DocumentIOLogRing.idl
index 59593e2b3285..92ec359c0264 100644
--- a/offapi/com/sun/star/logging/DocumentIOLogRing.idl
+++ b/offapi/com/sun/star/logging/DocumentIOLogRing.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_logging_DocumentIOLogRing_idl__
 #define __com_sun_star_logging_DocumentIOLogRing_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 #ifndef __com_sun_star_beans_NamedValue_idl__
@@ -37,7 +37,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module logging {
+module com { module sun { module star { module logging { 
 
 interface XSimpleLogRing;
 
@@ -56,7 +56,7 @@ singleton DocumentIOLogRing : XSimpleLogRing;
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/FileHandler.idl b/offapi/com/sun/star/logging/FileHandler.idl
index b20a50618a56..1cd030a3b5d2 100644
--- a/offapi/com/sun/star/logging/FileHandler.idl
+++ b/offapi/com/sun/star/logging/FileHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_logging_FileHandler_idl__
 #define __com_sun_star_logging_FileHandler_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 #ifndef __com_sun_star_beans_NamedValue_idl__
@@ -37,7 +37,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module logging {
+module com { module sun { module star { module logging { 
 
 interface XLogHandler;
 
@@ -90,7 +90,7 @@ service FileHandler : XLogHandler
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/LogLevel.idl b/offapi/com/sun/star/logging/LogLevel.idl
index 7a5f96470aa9..3997f9a5a3b8 100644
--- a/offapi/com/sun/star/logging/LogLevel.idl
+++ b/offapi/com/sun/star/logging/LogLevel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module logging {
+module com { module sun { module star { module logging { 
 
 //=============================================================================
 
@@ -80,7 +80,7 @@ constants LogLevel
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/LogRecord.idl b/offapi/com/sun/star/logging/LogRecord.idl
index 9d35f351de04..801bd6c873fb 100644
--- a/offapi/com/sun/star/logging/LogRecord.idl
+++ b/offapi/com/sun/star/logging/LogRecord.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,13 @@
 #ifndef __com_sun_star_logging_LogRecord_idl__
 #define __com_sun_star_logging_LogRecord_idl__
 
-#ifndef __com_sun_star_util_DateTime_idl__
+#ifndef __com_sun_star_util_DateTime_idl__ 
 #include <com/sun/star/util/DateTime.idl>
 #endif
 
 //=============================================================================
 
-module com { module sun { module star { module logging {
+module com { module sun { module star { module logging { 
 
 //=============================================================================
 
@@ -89,7 +89,7 @@ struct LogRecord
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/LoggerPool.idl b/offapi/com/sun/star/logging/LoggerPool.idl
index 5372e09c088d..301749d15656 100644
--- a/offapi/com/sun/star/logging/LoggerPool.idl
+++ b/offapi/com/sun/star/logging/LoggerPool.idl
@@ -7,7 +7,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module logging {
+module com { module sun { module star { module logging { 
 
 //=============================================================================
 
@@ -27,7 +27,7 @@ singleton LoggerPool : XLoggerPool;
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/PlainTextFormatter.idl b/offapi/com/sun/star/logging/PlainTextFormatter.idl
index a8580ed5400a..11c0529ca2e9 100644
--- a/offapi/com/sun/star/logging/PlainTextFormatter.idl
+++ b/offapi/com/sun/star/logging/PlainTextFormatter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module logging {
+module com { module sun { module star { module logging { 
 
 interface XLogFormatter;
 
@@ -53,7 +53,7 @@ service PlainTextFormatter : XLogFormatter
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/SimpleLogRing.idl b/offapi/com/sun/star/logging/SimpleLogRing.idl
index fe3083724c26..6eda0b9f62ae 100644
--- a/offapi/com/sun/star/logging/SimpleLogRing.idl
+++ b/offapi/com/sun/star/logging/SimpleLogRing.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_logging_SimpleLogRing_idl__
 #define __com_sun_star_logging_SimpleLogRing_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 #ifndef __com_sun_star_beans_NamedValue_idl__
@@ -37,7 +37,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module logging {
+module com { module sun { module star { module logging { 
 
 interface XSimpleLogRing;
 
@@ -62,7 +62,7 @@ service SimpleLogRing : XSimpleLogRing
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/XConsoleHandler.idl b/offapi/com/sun/star/logging/XConsoleHandler.idl
index a8d634c78f05..335d9029963f 100644
--- a/offapi/com/sun/star/logging/XConsoleHandler.idl
+++ b/offapi/com/sun/star/logging/XConsoleHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module logging {
+module com { module sun { module star { module logging { 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/XCsvLogFormatter.idl b/offapi/com/sun/star/logging/XCsvLogFormatter.idl
index ca054060be87..5a814598ee7c 100644
--- a/offapi/com/sun/star/logging/XCsvLogFormatter.idl
+++ b/offapi/com/sun/star/logging/XCsvLogFormatter.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_logging_XCsvLogFormatter_idl__
 #define __com_sun_star_logging_XCsvLogFormatter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
+#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
@@ -38,15 +38,15 @@
 
 //=============================================================================
 
-module com { module sun { module star { module logging {
+module com { module sun { module star { module logging { 
 
 //=============================================================================
 
-/** specifies the interface used for formatting log records for RFC4180 csv
+/** specifies the interface used for formatting log records for RFC4180 csv 
     output
 
     @see XLogFormatter, XLogHandler
-
+ 
     @since OOo 3.0
 */
 interface XCsvLogFormatter : XLogFormatter
@@ -59,14 +59,14 @@ interface XCsvLogFormatter : XLogFormatter
     [attribute] boolean LogTimestamp;
     /** Defines if the Source should be logged */
     [attribute] boolean LogSource;
-    /** Defines the names of the additional columns
+    /** Defines the names of the additional columns 
         this defaults to only one row titled "message".
-        if this is set to more than one column, the
+        if this is set to more than one column, the 
         messages need to be preformatted using
         <code>formatMultiColumn</code>*/
     [attribute] sequence< string >  Columnnames;
     /** if the CsvLogFormatter is set to have more than one
-        column, any logged infomation has to be send through this
+        column, any logged infomation has to be send through this 
         method before calling log(). E.g.:
 
         <code>XLoggerInstance.log(1000, XCsvLogFormatterInstance.formatMultiColumn(column_data))</code>
@@ -76,7 +76,7 @@ interface XCsvLogFormatter : XLogFormatter
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/XLogFormatter.idl b/offapi/com/sun/star/logging/XLogFormatter.idl
index 4a0e5c68b6ef..383519ee7720 100644
--- a/offapi/com/sun/star/logging/XLogFormatter.idl
+++ b/offapi/com/sun/star/logging/XLogFormatter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_logging_XLogFormatter_idl__
 #define __com_sun_star_logging_XLogFormatter_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
+#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
@@ -38,14 +38,14 @@
 
 //=============================================================================
 
-module com { module sun { module star { module logging {
+module com { module sun { module star { module logging { 
 
 //=============================================================================
 
 /** specifies the interface to be used for formatting log records
 
     @see XLogHandler
-
+ 
     @since OOo 2.3
 */
 interface XLogFormatter
@@ -81,7 +81,7 @@ interface XLogFormatter
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/XLogHandler.idl b/offapi/com/sun/star/logging/XLogHandler.idl
index 6bf52bd9f2cd..def100e7b851 100644
--- a/offapi/com/sun/star/logging/XLogHandler.idl
+++ b/offapi/com/sun/star/logging/XLogHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_logging_XLogHandler_idl__
 #define __com_sun_star_logging_XLogHandler_idl__
 
-#ifndef __com_sun_star_lang_XComponent_idl__
+#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl>
 #endif
 
@@ -42,7 +42,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module logging {
+module com { module sun { module star { module logging { 
 
 //=============================================================================
 
@@ -103,7 +103,7 @@ interface XLogHandler
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/XLogger.idl b/offapi/com/sun/star/logging/XLogger.idl
index 74998458af88..45a2566d183e 100644
--- a/offapi/com/sun/star/logging/XLogger.idl
+++ b/offapi/com/sun/star/logging/XLogger.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,13 @@
 #ifndef __com_sun_star_logging_XLogger_idl__
 #define __com_sun_star_logging_XLogger_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
+#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
 //=============================================================================
 
-module com { module sun { module star { module logging {
+module com { module sun { module star { module logging { 
 
 interface XLogHandler;
 
@@ -98,7 +98,7 @@ interface XLogger
 
         @param Level
             level to be checked against
-
+        
         @returns
             <TRUE/> if there would be some output for this XLogger for the given level, <FALSE/>
             otherwise. Note that a return value of <FALSE/> could also indicate that the logger
@@ -141,7 +141,7 @@ interface XLogger
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/XLoggerPool.idl b/offapi/com/sun/star/logging/XLoggerPool.idl
index e7c1017dc8a4..91cb5a81388a 100644
--- a/offapi/com/sun/star/logging/XLoggerPool.idl
+++ b/offapi/com/sun/star/logging/XLoggerPool.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,13 @@
 #ifndef __com_sun_star_logging_XLoggerPool_idl__
 #define __com_sun_star_logging_XLoggerPool_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
+#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
 //=============================================================================
 
-module com { module sun { module star { module logging {
+module com { module sun { module star { module logging { 
 
 interface XLogger;
 
@@ -66,7 +66,7 @@ interface XLoggerPool
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/logging/XSimpleLogRing.idl b/offapi/com/sun/star/logging/XSimpleLogRing.idl
index a0a8d1f0483c..bc4c8a308f18 100644
--- a/offapi/com/sun/star/logging/XSimpleLogRing.idl
+++ b/offapi/com/sun/star/logging/XSimpleLogRing.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,13 @@
 #ifndef __com_sun_star_logging_XSimpleLogRing_idl__
 #define __com_sun_star_logging_XSimpleLogRing_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
+#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
 //=============================================================================
 
-module com { module sun { module star { module logging {
+module com { module sun { module star { module logging { 
 
 //=============================================================================
 
@@ -56,8 +56,8 @@ interface XSimpleLogRing
     void logString( [in] string aMessage );
 
     /** allows to get the collected messages from the logger
-
-        <p>
+        
+        <p> 
         It is up to logger implementation to provide only the limited
         number of last messages.
         </p>
@@ -67,7 +67,7 @@ interface XSimpleLogRing
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/mail/MailAttachment.idl b/offapi/com/sun/star/mail/MailAttachment.idl
index a30aadfa0304..7d335bfb7c20 100644
--- a/offapi/com/sun/star/mail/MailAttachment.idl
+++ b/offapi/com/sun/star/mail/MailAttachment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,29 +34,29 @@
 
 module com { module sun { module star { module mail {
 
-/**
+/** 
     A <type>MailAttachment</type> specifies a mail message attachment.
-
+    
     @see ::com::sun::star::mail::XMailMessage
-
+    
     @since OOo 2.0.0
 */
 struct MailAttachment
-{
+{            
     /**
         The actual data which should be attached to a mail message.
-        It is expected that the transferable delivers the data as
-        sequence of bytes. Although a transferable may support
-        multiple data flavors only the first data flavor supplied
-        will be used to retrive the data and it is expected that
+        It is expected that the transferable delivers the data as 
+        sequence of bytes. Although a transferable may support 
+        multiple data flavors only the first data flavor supplied 
+        will be used to retrive the data and it is expected that 
         the type of the data is a sequence of bytes.
-
-        @see ::com::sun::star::datatransfer::XTransferable
+        
+        @see ::com::sun::star::datatransfer::XTransferable        
     */
     ::com::sun::star::datatransfer::XTransferable Data;
-
+    
     /**
-        The name of the attachment as seen by the recipient of the
+        The name of the attachment as seen by the recipient of the 
         mail message. ReadableName must not be empty.
     */
     string ReadableName;
diff --git a/offapi/com/sun/star/mail/MailException.idl b/offapi/com/sun/star/mail/MailException.idl
index 5f5bfff11f81..bafbd8193cf6 100644
--- a/offapi/com/sun/star/mail/MailException.idl
+++ b/offapi/com/sun/star/mail/MailException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,13 +37,13 @@ module com { module sun { module star { module mail {
 /**
    An MailException is the base of all mail related
    exceptions.
-
+         
    @since OOo 2.0.0
  */
-exception MailException: com::sun::star::uno::Exception
+exception MailException: com::sun::star::uno::Exception 
 {
-};
-
+};    
+  
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/mail/MailMessage.idl b/offapi/com/sun/star/mail/MailMessage.idl
index 2112865d00f8..2ced59572367 100644
--- a/offapi/com/sun/star/mail/MailMessage.idl
+++ b/offapi/com/sun/star/mail/MailMessage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_mail_MailMessage_idl__
 #define __com_sun_star_mail_MailMessage_idl__
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 
@@ -49,61 +49,61 @@ interface XMailMessage;
  */
 service MailMessage: XMailMessage
 {
-    /**
+    /** 
         Constructs an instance of a mail message.
-
+        
         @param sTo
         [in] the e-mail address of the recipient.
         The e-mail address has to conform to <a href="http://www.ietf.org/rfc/rfc822.txt">RFC&nbsp;822</a>.
-
+        
         @param sFrom
         [in] the e-mail address of the sender of this mail message.
         The e-mail address has to conform to <a href="http://www.ietf.org/rfc/rfc822.txt">RFC&nbsp;822</a>.
-
+        
         @param sSubject
         [in] the subject of the mail message.
-
+        
         @param xBody
-        [in] the body of the mail message. It is expected that the
-        transferable delivers the data as a string. Although a
-        transferable may support multiple data flavors only the
+        [in] the body of the mail message. It is expected that the 
+        transferable delivers the data as a string. Although a 
+        transferable may support multiple data flavors only the 
         first data flavor supplied will be used to retrieve the data
         and it is expected that the data will be provided as a string.
-
+                
         @see com::sun::star::mail::XMailMessage
         @see com::sun::star::datatransfer::XTransferable
     */
-    create([in] string sTo, [in] string sFrom, [in] string sSubject, [in] com::sun::star::datatransfer::XTransferable xBody);
-
+    create([in] string sTo, [in] string sFrom, [in] string sSubject, [in] com::sun::star::datatransfer::XTransferable xBody);                  
+        
     /**
         Constructs an instance of a mail message.
-
+        
         @param sTo
         [in] the e-mail address of the recipient.
         The e-mail address has to conform to <a href="http://www.ietf.org/rfc/rfc822.txt">RFC&nbsp;822</a>.
-
+        
         @param sFrom
         [in] the e-mail address of the sender of this mail message.
         The e-mail address has to conform to <a href="http://www.ietf.org/rfc/rfc822.txt">RFC&nbsp;822</a>.
-
+        
         @param sSubject
         [in] the subject of the mail message.
-
+        
         @param xBody
-        [in] the body of the mail message. It is expected that the
-        transferable delivers the data as a string. Although a
-        transferable may support multiple data flavors only the
+        [in] the body of the mail message. It is expected that the 
+        transferable delivers the data as a string. Although a 
+        transferable may support multiple data flavors only the 
         first data flavor supplied will be used to retrieve the data
         and it is expected that the data will be provided as a string.
-
+        
         @param aMailAttachment
         [in] specifies an attachment which should be send with this mail message.
-
+                                                
         @see com::sun::star::mail::XMailMessage
         @see com::sun::star::datatransfer::XTransferable
         @see com::sun::star::mail::MailAttachment
     */
-    createWithAttachment([in] string sTo, [in] string sFrom, [in] string sSubject, [in] com::sun::star::datatransfer::XTransferable xBody, [in] MailAttachment aMailAttachment);
+    createWithAttachment([in] string sTo, [in] string sFrom, [in] string sSubject, [in] com::sun::star::datatransfer::XTransferable xBody, [in] MailAttachment aMailAttachment);            
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/mail/MailServer.idl b/offapi/com/sun/star/mail/MailServer.idl
index f6b448946eb4..0b1cb8b7cda3 100644
--- a/offapi/com/sun/star/mail/MailServer.idl
+++ b/offapi/com/sun/star/mail/MailServer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,28 +36,28 @@ module com { module sun { module star { module mail {
 
 interface XMailServer;
 
-/**
+/**    
     @since OOo 2.0.0
  */
 service MailServer: XMailServer
 {
-    /**
+    /** 
         Creation method.
-
+        
         @param sServerName
-        [in] the full qualified domain name of the mail server.
-
+        [in] the full qualified domain name of the mail server.    
+        
         @throws com::sun::star::mail::NoMailTransportProviderException
         if an appropriate provider for sending mail messages could not be found or
         could not be created.
-
+        
         @throws com::sun::star::uno::Exception
         on any other error which prevents the construction of an instance of this service.
-
+        
         @see com::sun::star::mail::XMailServer
     */
-    create([in] string sServerName)
-        raises(com::sun::star::mail::NoMailTransportProviderException, com::sun::star::uno::Exception);
+    create([in] string sServerName) 
+        raises(com::sun::star::mail::NoMailTransportProviderException, com::sun::star::uno::Exception);            
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/mail/MailServiceProvider.idl b/offapi/com/sun/star/mail/MailServiceProvider.idl
index af48d9e9b3e7..eabe2fc8fe73 100644
--- a/offapi/com/sun/star/mail/MailServiceProvider.idl
+++ b/offapi/com/sun/star/mail/MailServiceProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,17 +44,17 @@ module com { module sun { module star { module mail {
 
 interface XMailService;
 
-/**
+/**    
     @since OOo 2.0.0
  */
 service MailServiceProvider: XMailServiceProvider
 {
-    /**
+    /** 
         Creation method.
 
-        @see com::sun::star::mail::XMailServiceProvider
+        @see com::sun::star::mail::XMailServiceProvider        
     */
-    create();
+    create();            
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/mail/MailServiceType.idl b/offapi/com/sun/star/mail/MailServiceType.idl
index 94aa985a06c2..42c7023ea439 100644
--- a/offapi/com/sun/star/mail/MailServiceType.idl
+++ b/offapi/com/sun/star/mail/MailServiceType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,19 +30,19 @@
 
 module com { module sun { module star { module mail {
 
-/**
+/**    
     @since OOo 2.0.0
  */
 enum MailServiceType
 {
     /** A SMTP service */
     SMTP,
-
+    
     /** A POP3 service */
     POP3,
-
+    
     /** A IMAP service */
-    IMAP
+    IMAP 
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/mail/NoMailServiceProviderException.idl b/offapi/com/sun/star/mail/NoMailServiceProviderException.idl
index a8e3d52396b9..a8dfb851435e 100644
--- a/offapi/com/sun/star/mail/NoMailServiceProviderException.idl
+++ b/offapi/com/sun/star/mail/NoMailServiceProviderException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,18 +35,18 @@
 module com { module sun { module star { module mail {
 
 /**
-   A <type>NoMailServiceProviderException</type> will be thrown if an
-   appropriate provider for requested mail service could not be found or
+   A <type>NoMailServiceProviderException</type> will be thrown if an 
+   appropriate provider for requested mail service could not be found or 
    could not be created.
-
+   
    @see com::sun::star::mail::MailService
-
+   
    @since OOo 2.0.0
  */
-exception NoMailServiceProviderException: com::sun::star::mail::MailException
-{
-};
-
+exception NoMailServiceProviderException: com::sun::star::mail::MailException 
+{    
+};    
+  
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/mail/NoMailTransportProviderException.idl b/offapi/com/sun/star/mail/NoMailTransportProviderException.idl
index 3cad64b8f900..a8d50b78623a 100644
--- a/offapi/com/sun/star/mail/NoMailTransportProviderException.idl
+++ b/offapi/com/sun/star/mail/NoMailTransportProviderException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,18 +35,18 @@
 module com { module sun { module star { module mail {
 
 /**
-   A <type>NoMailTransportProviderException</type> will be thrown if an
-   appropriate provider for sending mail messages could not be found or
+   A <type>NoMailTransportProviderException</type> will be thrown if an 
+   appropriate provider for sending mail messages could not be found or 
    could not be created.
-
+   
    @see com::sun::star::mail::MailServer
-
+   
    @since OOo 2.0.0
  */
-exception NoMailTransportProviderException: com::sun::star::mail::MailException
-{
-};
-
+exception NoMailTransportProviderException: com::sun::star::mail::MailException 
+{    
+};    
+  
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/mail/SendMailMessageFailedException.idl b/offapi/com/sun/star/mail/SendMailMessageFailedException.idl
index 8987bf587596..a9cb18d38c8b 100644
--- a/offapi/com/sun/star/mail/SendMailMessageFailedException.idl
+++ b/offapi/com/sun/star/mail/SendMailMessageFailedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,31 +38,31 @@ module com { module sun { module star { module mail {
    A SendFailedException will be thrown if a mail message
    could not be sent because the e-mail addresses of some
    recipients are invalid. E-mail addresses have to conform
-   to <a href="http://www.ietf.org/rfc/rfc822.txt">RFC&nbsp;822</a>.
-
+   to <a href="http://www.ietf.org/rfc/rfc822.txt">RFC&nbsp;822</a>. 
+   
    @see com::sun::star::mail::XMailServer
-
+   
    @since OOo 2.0.0
  */
-exception SendMailMessageFailedException: com::sun::star::mail::MailException
+exception SendMailMessageFailedException: com::sun::star::mail::MailException 
 {
     /**
         The addresses which are invalid because they do not conform
-        to <a href="http://www.ietf.org/rfc/rfc822.txt">RFC&nbsp;822</a>.
+        to <a href="http://www.ietf.org/rfc/rfc822.txt">RFC&nbsp;822</a>.        
     */
     sequence<string> InvalidAddresses;
-
+    
     /**
         The addresses to which the mail message was sent successfully.
     */
     sequence<string> ValidSentAddresses;
-
+    
     /**
         The addresses which are valid but to which the message was not sent.
     */
     sequence<string> ValidUnsentAddresses;
-};
-
+};    
+  
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/mail/XAuthenticator.idl b/offapi/com/sun/star/mail/XAuthenticator.idl
index 564ad4e484f1..4f7ce9ce8fe4 100644
--- a/offapi/com/sun/star/mail/XAuthenticator.idl
+++ b/offapi/com/sun/star/mail/XAuthenticator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_mail_XAuthenticator_idl__
 #define __com_sun_star_mail_XAuthenticator_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
+#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
@@ -36,29 +36,29 @@ module com { module sun { module star { module mail {
 
 /**
    Represents an interface that will be used to query for user
-   information which are necessary to login to a network resource.
+   information which are necessary to login to a network resource.  
    An implementation of this interface may for instance show a
-   dialog to query the user for the necessary data.
-
+   dialog to query the user for the necessary data.      
+   
    @since OOo 2.0.0
  */
 interface XAuthenticator: ::com::sun::star::uno::XInterface {
-
-    /**
+    
+    /** 
         Will be called when the user name is needed.
-
-        @returns
-        the user name.
+    
+        @returns 
+        the user name. 
     */
-    string getUserName();
-
+    string getUserName();    
+    
     /**
         Will be called when the password of the user is needed.
-
+        
         @returns
         the password of the user.
     */
-    string getPassword();
+    string getPassword();    
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/mail/XConnectionListener.idl b/offapi/com/sun/star/mail/XConnectionListener.idl
index 5ca8511f7c97..70a4677f5dc1 100644
--- a/offapi/com/sun/star/mail/XConnectionListener.idl
+++ b/offapi/com/sun/star/mail/XConnectionListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,29 +40,29 @@ module com { module sun { module star { module mail {
 
 /**
    The listener interface for connection events.
-
+   
    @see com::sun::star::mail::XMailServer
-
+   
    @since OOo 2.0.0
  */
 interface XConnectionListener: ::com::sun::star::lang::XEventListener {
-
+   
     /**
         Invoked when the connection to the mail server is established.
-
+        
         @param aEvent
         [in] specific information regarding this event.
-
+        
         @see com::sun::star::lang::EventObject
     */
-    void connected([in] com::sun::star::lang::EventObject aEvent);
-
+    void connected([in] com::sun::star::lang::EventObject aEvent); 
+   
     /**
         Invoked when the connection to the mail server is closed.
-
+        
         @param aEvent
         [in] specific information regarding this event.
-
+        
         @see com::sun::star::lang::EventObject
     */
     void disconnected([in] com::sun::star::lang::EventObject aEvent);
diff --git a/offapi/com/sun/star/mail/XMailMessage.idl b/offapi/com/sun/star/mail/XMailMessage.idl
index b87ea1ca6c5c..15de75b951a9 100644
--- a/offapi/com/sun/star/mail/XMailMessage.idl
+++ b/offapi/com/sun/star/mail/XMailMessage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_mail_XMailMessage_idl__
 #define __com_sun_star_mail_XMailMessage_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
+#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
@@ -43,37 +43,37 @@
 module com { module sun { module star { module mail {
 
 /**
-   Represents a mail message.
-
+   Represents a mail message. 
+   
    @see com::sun::star::mail::XMailServer
-
+   
    @since OOo 2.0.0
  */
 interface XMailMessage: ::com::sun::star::uno::XInterface {
-
-     /**
-        The display name of the sender of this mail message.
-    */
+    
+     /** 
+        The display name of the sender of this mail message. 
+    */    
     [attribute, readonly] string SenderName;
-    /**
+    /** 
         The e-mail address of the sender of this mail message.
         The e-mail address has to conform to <a href="http://www.ietf.org/rfc/rfc822.txt">RFC&nbsp;822</a>.
-    */
+    */    
     [attribute, readonly] string SenderAddress;
-
-    /**
+    
+    /** 
         The e-mail address where replies on this mail message should be sent to.
         If the e-mail address doesn't conform to <a href="http://www.ietf.org/rfc/rfc822.txt">RFC&nbsp;822</a>
         sending the mail message later will fail.
-        If no ReplyToAddress is set replies go to the SenderAddress.
+        If no ReplyToAddress is set replies go to the SenderAddress.               
     */
     [attribute] string ReplyToAddress;
-
+    
     /**
         Add an recipients e-mail address to the list of recipients of this mail message.
         If the e-mail address doesn't conform to <a href="http://www.ietf.org/rfc/rfc822.txt">RFC&nbsp;822</a>
         sending the mail message will fail.
-
+        
         @param sRecipientAddress
         [in] the e-mail address of the recipient.
     */
@@ -83,74 +83,74 @@ interface XMailMessage: ::com::sun::star::uno::XInterface {
         Add an Cc recipients e-mail address to the list of recipients of this mail message.
         If the e-mail address doesn't conform to <a href="http://www.ietf.org/rfc/rfc822.txt">RFC&nbsp;822</a>
         sending the mail message will fail.
-
+        
         @param sRecipientAddress
         [in] the e-mail address of the Cc recipient.
     */
     void addCcRecipient([in] string sRecipientAddress);
-
+    
     /**
         Add an Bcc recipients e-mail address to the list of recipients of this mail message.
         If the e-mail address doesn't conform to <a href="http://www.ietf.org/rfc/rfc822.txt">RFC&nbsp;822</a>
-        sending the mail message will fail.
-
+        sending the mail message will fail. 
+        
         @param sRecipientAddress
         [in] the e-mail address of the Bcc recipient.
     */
     void addBccRecipient([in] string sRecipientAddress);
-
+                
     /**
-        Return a sequence of the e-mail addresses of all recipients of
+        Return a sequence of the e-mail addresses of all recipients of 
         this mail message.
     */
     sequence<string> getRecipients();
-
+    
     /**
         Return a sequence of the e-mail addresses of all the Cc recipients
         of this mail message.
     */
     sequence<string> getCcRecipients();
-
+    
     /**
         Return a sequence of the e-mail addresses of all the Bcc recipients
-        of this mail message.
+        of this mail message. 
     */
     sequence<string> getBccRecipients();
-
+    
     /**
         The subject of a mail message.
     */
     [attribute] string Subject;
-
+    
     /**
-        The body of the mail message.
-        It is expected that the transferable delivers the data as
-        a string. Although a transferable may support multiple
-        data flavors only the first data flavor supplied will be
-        used to retrieve the data and it is expected that the data
+        The body of the mail message. 
+        It is expected that the transferable delivers the data as 
+        a string. Although a transferable may support multiple 
+        data flavors only the first data flavor supplied will be 
+        used to retrieve the data and it is expected that the data 
         will be provided as a string.
-
+        
         @see com::sun::star::datatransfer::XTransferable
     */
-    [attribute] com::sun::star::datatransfer::XTransferable Body;
-
+    [attribute] com::sun::star::datatransfer::XTransferable Body;        
+        
     /**
         Add a file attachment to a mail message.
-
+        
         param aMailAttachment
         [in] specifies a file which should be attached to this mail message.
-
+                                       
         @see com::sun::star::mail::MailAttachment
     */
     void addAttachment([in] MailAttachment aMailAttachment);
-
+        
     /**
-        Return a sequence of <type>MailAttachment</type>'s that will
+        Return a sequence of <type>MailAttachment</type>'s that will 
         be attached to this mail message.
-
+        
         @see com::sun::star::mail::MailAttachment
     */
-    sequence<MailAttachment> getAttachments();
+    sequence<MailAttachment> getAttachments();        
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/mail/XMailServer.idl b/offapi/com/sun/star/mail/XMailServer.idl
index 8d0ad232ed61..57af147a596b 100644
--- a/offapi/com/sun/star/mail/XMailServer.idl
+++ b/offapi/com/sun/star/mail/XMailServer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_mail_XMailServer_idl__
 #define __com_sun_star_mail_XMailServer_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
+#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
@@ -64,7 +64,7 @@
 #include <com/sun/star/io/ConnectException.idl>
 #endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 
@@ -91,187 +91,187 @@
 module com { module sun { module star { module mail {
 
 /**
-   Represents a mail server abstraction.
-
+   Represents a mail server abstraction. 
+   
    @see com::sun::star::mail::XMailMessage
-
+   
    @since OOo 2.0.0
  */
 interface XMailServer: ::com::sun::star::uno::XInterface {
-
-    /**
-        The complete domain name of the mail server.
-    */
+    
+    /** 
+        The complete domain name of the mail server.        
+    */    
     [attribute, readonly] string Name;
-
-    /**
+    
+    /** 
         The port number that will be used to connect to the mail server.
-        If no port number has been set the default port number 25 will
-        be used.
+        If no port number has been set the default port number 25 will 
+        be used.              
     */
     [attribute] long Port;
 
     /**
-        Returns all connection types which are supported by the
-        mail server. Possible connection types are for instance
-        secure connections like 'SSL' or 'TLS'.
-
-        @returns
-        a sequence of supported connection types.
+        Returns all connection types which are supported by the 
+        mail server. Possible connection types are for instance 
+        secure connections like 'SSL' or 'TLS'.  
+        
+        @returns 
+        a sequence of supported connection types.       
     */
     sequence<string> getSupportedConnectionTypes();
-
+    
     /**
         Set the connection type that will be used to connect to the
         mail server. The supported connection types may be queried
-        using <code>getSupportedConnectionTypes()</code>.
+        using <code>getSupportedConnectionTypes()</code>. 
         If no connection types has explicitly been set the default
-        connection type will be used.
-
+        connection type will be used. 
+        
         @param sConnectionType
         [in] identifies the connection that should be used to connect
         to the mail server.
-
+        
         @throws com::sun::star::lang::IllegalArgumentException
         if the provided connection type is not supported.
-
+        
         @see getSupportedConnectionTypes
         @see isConnectionTypeSupported
     */
     void setConnectionType([in] string sConnectionType)
         raises (com::sun::star::lang::IllegalArgumentException);
-
+    
     /**
         Allow a client to query if a certain connection type is
         supported.
-
+        
         @param sConnectionType
         [in] query if a certain connection type is supported.
-
+        
         @returns
         <TRUE/> if the specified connection type is supported.
     */
     boolean isConnectionTypeSupported([in] string sConnectionType);
 
-    /**
+    /** 
         Register a connection listener.
-
+        
         @param xListener
         [in] a listener that will be informed about connection events.
-
+        
         @see com::sun::star::mail::XConnectionListener
     */
     void addConnectionListener([in] XConnectionListener xListener);
-
+      
     /**
         Unregister a connection listener.
-
+        
         @param xListener
         [in] a listener that no longer need to be informed about connection events.
-
+        
         @see com::sun::star::mail::XConnectionListener
     */
     void removeConnectionListener([in] XConnectionListener xListener);
-
-    /**
+                      
+    /** 
         Login a user to the mail server. Only one user may logged in
         at a time. An attempt to login while another user is logged in
         causes an exception to be thrown.
-
+                
         @param xAuthenticator
         [in] an interface used to query for the necessary user information
         needed to login to the mail server.
-
+        
         @throws com::sun::star::io::AlreadyConnectedException
         on a try to connect to an already connect mail server.
-
-        @throws com::sun::star::io::UnknownHostException
+        
+        @throws com::sun::star::io::UnknownHostException  
         usually if the IP address of the mail server could not be
         determined. Possible causes are a broken network connection,
         a wrong server name, an unreachable DNS server, etc.
-
-        @throws com::sun::star::io::NoRouteToHostException
+              
+        @throws com::sun::star::io::NoRouteToHostException        
         if an error occured to connect to the remote mail server.
-        Typically the remote mail server cannot be reach because of an
-        intervening firewall, or if an intermediate router is down,
+        Typically the remote mail server cannot be reach because of an 
+        intervening firewall, or if an intermediate router is down, 
         the network connection is broken, etc.
-
+        
         @throws com::sun::star::io::ConnectException
         if an error occured while attempting to connect to the remote
-        mail server. Typically the connection was refused remotely,
+        mail server. Typically the connection was refused remotely, 
         because the mail server is not listening on the remote address/port.
-
-        @throws com::sun::star::auth::AuthenticationException
-        if the specified user could not be logged in.
-
+        
+        @throws com::sun::star::auth::AuthenticationException 
+        if the specified user could not be logged in. 
+        
         @throws com::sun::star::mail::IllegalStateException
         if a user is currently logged in.
-
+        
         @throws com::sun::star::mail::MailException
-        for other errors during login.
-
+        for other errors during login.        
+        
         @see com::sun::star::mail::XAuthenticator
-        @see com::sun::star::io::AlreadyConnectedException
+        @see com::sun::star::io::AlreadyConnectedException                        
         @see com::sun::star::io::UnknownHostException
         @see com::sun::star::io::NoRouteToHostException
         @see com::sun::star::io::ConnectException
-        @see com::sun::star::auth::AuthenticationException
+        @see com::sun::star::auth::AuthenticationException         
         @see com::sun::star::mail::IllegalStateException
         @see com::sun::star::mail::MailException
-    */
+    */    
     void connectUser([in] XAuthenticator xAuthenticator)
-        raises(com::sun::star::io::AlreadyConnectedException,
+        raises(com::sun::star::io::AlreadyConnectedException, 
                com::sun::star::io::UnknownHostException,
                com::sun::star::io::NoRouteToHostException,
                com::sun::star::io::ConnectException,
-               com::sun::star::auth::AuthenticationFailedException,
+               com::sun::star::auth::AuthenticationFailedException, 
                com::sun::star::mail::MailException);
-
+         
     /**
-        Logoff the currently logged in user.
-
+        Logoff the currently logged in user. 
+        
         @throws com::sun::star::mail::MessagingException
         if errors occur during logoff.
     */
-    void disconnectUser()
+    void disconnectUser() 
         raises(com::sun::star::mail::MailException);
-
+    
     /**
         Returns whether a user is currently logged in to the mail server or not.
-
+        
         @returns
         <TRUE/> if a user is currently logged in to the mail server.
     */
-    boolean isUserConnected();
-
+    boolean isUserConnected();      
+    
     /**
-        Send a mail message to its recipients.
-
+        Send a mail message to its recipients. 
+        
         @throws com::sun::star::io::NotConnectedException
         if no user is currently connected to the mail server.
-
+                        
         @throws com::sun::star::mail::SendMailMessageFailedException
         if the message could not be sent because of invalid recipient
-        addresses. The e-mail addresses of recipients have to conform to
+        addresses. The e-mail addresses of recipients have to conform to 
         <a href="http://www.ietf.org/rfc/rfc822.txt">RFC&nbsp;822</a>.
-
+        
         @throws com::sun::star::mail::MailException
-        is thrown on other errors that may happen during sending.
+        is thrown on other errors that may happen during sending. 
         A possible reason may be for instance that a file attachment
         specified in a mail message could not be found or accessed.
 
         @throws com::sun::star::datatransfer::UnsupportedFlavorException
-        is thrown when the body of the mail message is provided in an
-        unsupported mime content type or may be thrown if one of the file
+        is thrown when the body of the mail message is provided in an 
+        unsupported mime content type or may be thrown if one of the file 
         attachments specifies an unspupported mime content type.
-
-        @see com::sun::star::io::NotConnectedExceptionException
+                         
+        @see com::sun::star::io::NotConnectedExceptionException                        
         @see com::sun::star::mail::SendMailMessageFailedException
-        @see com::sun::star::mail::MailException
-        @see com::sun::star::datatransfer::UnsupportedFlavorException
-    */
+        @see com::sun::star::mail::MailException  
+        @see com::sun::star::datatransfer::UnsupportedFlavorException      
+    */    
     void sendMailMessage([in] XMailMessage xMailMessage)
-        raises(com::sun::star::io::NotConnectedException, com::sun::star::mail::SendMailMessageFailedException, com::sun::star::mail::MailException, com::sun::star::datatransfer::UnsupportedFlavorException);
+        raises(com::sun::star::io::NotConnectedException, com::sun::star::mail::SendMailMessageFailedException, com::sun::star::mail::MailException, com::sun::star::datatransfer::UnsupportedFlavorException);   
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/mail/XMailService.idl b/offapi/com/sun/star/mail/XMailService.idl
index cc8ba05e0703..91076e0717ea 100644
--- a/offapi/com/sun/star/mail/XMailService.idl
+++ b/offapi/com/sun/star/mail/XMailService.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_mail_XMailService_idl__
 #define __com_sun_star_mail_XMailService_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
+#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
@@ -60,7 +60,7 @@
 #include <com/sun/star/io/ConnectException.idl>
 #endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 
@@ -72,7 +72,7 @@
 #include <com/sun/star/mail/MailException.idl>
 #endif
 
-#ifndef __com_sun_star_uno_XCurrentContext_idl__
+#ifndef __com_sun_star_uno_XCurrentContext_idl__ 
 #include <com/sun/star/uno/XCurrentContext.idl>
 #endif
 
@@ -80,42 +80,42 @@
 module com { module sun { module star { module mail {
 
 /**
-   Represents a mail server abstraction.
-
+   Represents a mail server abstraction. 
+      
    @since OOo 2.0.0
  */
 interface XMailService: ::com::sun::star::uno::XInterface {
-
+       
     /**
-        Returns all connection types which are supported to
-        connect to the mail service. At least support insecure
-        connections must be supported. Currently defined
+        Returns all connection types which are supported to 
+        connect to the mail service. At least support insecure 
+        connections must be supported. Currently defined 
         connection types are (the values should be handled
         case insensitive):
-        "Insecure" - insecure connections
-        "Ssl" - Secure Socket Layer 2.0/3.0 based connection
-
-        @returns
-        a sequence of supported connection types.
+        "Insecure" - insecure connections 
+        "Ssl" - Secure Socket Layer 2.0/3.0 based connection                        
+        
+        @returns 
+        a sequence of supported connection types.       
     */
     sequence<string> getSupportedConnectionTypes();
-
-    /**
+                    
+    /** 
         Register a connection listener.
-
+        
         @param xListener
         [in] a listener that will be informed about connection events.
-
+        
         @see com::sun::star::mail::XConnectionListener
     */
     void addConnectionListener([in] XConnectionListener xListener);
-
+      
     /**
         Unregister a connection listener.
-
+        
         @param xListener
         [in] a listener that no longer need to be informed about connection events.
-
+        
         @see com::sun::star::mail::XConnectionListener
     */
     void removeConnectionListener([in] XConnectionListener xListener);
@@ -124,104 +124,104 @@ interface XMailService: ::com::sun::star::uno::XInterface {
         Return the context of the current connnection. The context
         contains information like the server name, port, connection type
         etc.
-
-        @precond
+        
+        @precond 
         <code>isConnected</code> returns true.
-
+        
         @returns
         the current connection context.
-
+        
         @throws com::sun::star::io::NotConnectedException
         if no connection is currently established.
-
+        
         @see com::sun::star::mail::connectUser
         @see com::sun::star::io::NotConnectedException
     */
     com::sun::star::uno::XCurrentContext getCurrentConnectionContext()
         raises(com::sun::star::io::NotConnectedException);
-
-    /**
+                          
+    /** 
         Connect to a mail service. Only one connection to a mail service
-        can be established at a time.
-
+        can be established at a time. 
+        
         @param xConnectionContext
         [in] an interface used to query for connection related information.
         The context must contain the following values:
         "ServerName" of type 'string', "Port" of type 'long', "ConnectionType"
         of type 'string'. A list of supported connection types can be queried
         using <code>getSupportedConnectionTypes</code>.
-
+        
         @param xAuthenticator
         [in] an interface used to query for the necessary user information
         needed to login to the mail server. If no authentication is required
         the xAuthenticator must return an empty user name and an empty password.
-
+        
         @throws com::sun::star::lang::IllegalArgumentException
-        if the provided connection context contains invalid values or
+        if the provided connection context contains invalid values or 
         misses required connection parameters.
-
+        
         @throws com::sun::star::io::AlreadyConnectedException
         on a try to connect to an already connect mail server.
-
-        @throws com::sun::star::io::UnknownHostException
+        
+        @throws com::sun::star::io::UnknownHostException  
         usually if the IP address of the mail server could not be
         determined. Possible causes are a broken network connection,
         a wrong server name, an unreachable DNS server, etc.
-
-        @throws com::sun::star::io::NoRouteToHostException
+              
+        @throws com::sun::star::io::NoRouteToHostException        
         if an error occured to connect to the remote mail server.
-        Typically the remote mail server cannot be reach because of an
-        intervening firewall, or if an intermediate router is down,
+        Typically the remote mail server cannot be reach because of an 
+        intervening firewall, or if an intermediate router is down, 
         the network connection is broken, etc.
-
+        
         @throws com::sun::star::io::ConnectException
         if an error occured while attempting to connect to the remote
-        mail server. Typically the connection was refused remotely,
+        mail server. Typically the connection was refused remotely, 
         because the mail server is not listening on the remote address/port.
-
-        @throws com::sun::star::auth::AuthenticationException
-        if the specified user could not be logged in.
-
+        
+        @throws com::sun::star::auth::AuthenticationException 
+        if the specified user could not be logged in. 
+                
         @throws com::sun::star::mail::MailException
-        for other errors during login.
-
+        for other errors during login.        
+        
         @see com::sun::star::uno::XCurrentContext
         @see com::sun::star::mail::XAuthenticator
         @see com::sun::star::lang::IllegalArgumentException
-        @see com::sun::star::io::AlreadyConnectedException
+        @see com::sun::star::io::AlreadyConnectedException                        
         @see com::sun::star::io::UnknownHostException
         @see com::sun::star::io::NoRouteToHostException
         @see com::sun::star::io::ConnectException
-        @see com::sun::star::auth::AuthenticationException
+        @see com::sun::star::auth::AuthenticationException         
         @see com::sun::star::mail::IllegalStateException
         @see com::sun::star::mail::MailException
-    */
+    */    
     void connect([in] com::sun::star::uno::XCurrentContext xConnectionContext, [in] XAuthenticator xAuthenticator)
         raises(com::sun::star::lang::IllegalArgumentException,
-               com::sun::star::io::AlreadyConnectedException,
+               com::sun::star::io::AlreadyConnectedException, 
                com::sun::star::io::UnknownHostException,
                com::sun::star::io::NoRouteToHostException,
                com::sun::star::io::ConnectException,
-               com::sun::star::auth::AuthenticationFailedException,
+               com::sun::star::auth::AuthenticationFailedException, 
                com::sun::star::mail::MailException);
-
+         
     /**
         Disconnect from a mail service.
-
+        
         @throws com::sun::star::mail::MailException
         if errors occur during disconnecting.
     */
-    void disconnect()
+    void disconnect() 
         raises(com::sun::star::mail::MailException);
-
+    
     /**
-        Returns whether a connection to a mail service
+        Returns whether a connection to a mail service 
         currently exist or not.
-
+        
         @returns
         <TRUE/> if a connection to a mail service is established.
     */
-    boolean isConnected();
+    boolean isConnected();             
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/mail/XMailServiceProvider.idl b/offapi/com/sun/star/mail/XMailServiceProvider.idl
index 5f389a57ee58..ed265e8f03df 100644
--- a/offapi/com/sun/star/mail/XMailServiceProvider.idl
+++ b/offapi/com/sun/star/mail/XMailServiceProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,25 +44,25 @@ module com { module sun { module star { module mail {
 
 /**
    A factory for creating different mail services.
-
+   
    @since OOo 2.0.0
  */
 interface XMailServiceProvider: ::com::sun::star::uno::XInterface {
-
-    /**
+    
+    /** 
         A factory method.
-
+        
         @param aType
         [in] the type of the requested mail service.
-
-        @returns
+                                
+        @returns 
         A XMailService interface.
-
+        
         @see com::sun::star::mail::XMailServiceProvider
         @see com::sun::star::mail::MailServiceType
     */
     XMailService create([in] MailServiceType aType)
-        raises(com::sun::star::mail::NoMailServiceProviderException, com::sun::star::uno::Exception);
+        raises(com::sun::star::mail::NoMailServiceProviderException, com::sun::star::uno::Exception);            
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/mail/XSmtpService.idl b/offapi/com/sun/star/mail/XSmtpService.idl
index 278e9ebe85f1..5e490e0ebe1d 100644
--- a/offapi/com/sun/star/mail/XSmtpService.idl
+++ b/offapi/com/sun/star/mail/XSmtpService.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,47 +59,47 @@
 module com { module sun { module star { module mail {
 
 /**
-   Represents a SMTP service abstraction.
-
+   Represents a SMTP service abstraction. 
+   
    @see com::sun::star::mail::XMailService
    @see com::sun::star::mail::XMailMessage
-
+   
    @since OOo 2.0.0
  */
 interface XSmtpService: ::com::sun::star::mail::XMailService {
-
+            
     /**
-        Send a mail message to its recipients.
-
+        Send a mail message to its recipients. 
+        
         @param xMailMessage
         [in] the mail message to be sent.
-
+        
         @throws com::sun::star::io::NotConnectedException
         if no user is currently connected to the mail server.
-
+                        
         @throws com::sun::star::mail::SendMailMessageFailedException
         if the message could not be sent because of invalid recipient
-        addresses. The e-mail addresses of recipients have to conform to
+        addresses. The e-mail addresses of recipients have to conform to 
         <a href="http://www.ietf.org/rfc/rfc822.txt">RFC&nbsp;822</a>.
-
+        
         @throws com::sun::star::mail::MailException
-        is thrown on other errors that may happen during sending.
+        is thrown on other errors that may happen during sending. 
         A possible reason may be for instance that a file attachment
         specified in a mail message could not be found or accessed.
 
         @throws com::sun::star::datatransfer::UnsupportedFlavorException
-        is thrown when the body of the mail message is provided in an
-        unsupported mime content type or may be thrown if one of the file
+        is thrown when the body of the mail message is provided in an 
+        unsupported mime content type or may be thrown if one of the file 
         attachments specifies an unspupported mime content type.
-
-        @see com::sun::star::mail::XMailMessage
+        
+        @see com::sun::star::mail::XMailMessage                         
         @see com::sun::star::io::NotConnectedException
         @see com::sun::star::mail::SendMailMessageFailedException
-        @see com::sun::star::mail::MailException
-        @see com::sun::star::datatransfer::UnsupportedFlavorException
-    */
+        @see com::sun::star::mail::MailException  
+        @see com::sun::star::datatransfer::UnsupportedFlavorException      
+    */    
     void sendMailMessage([in] XMailMessage xMailMessage)
-        raises(com::sun::star::io::NotConnectedException, com::sun::star::mail::SendMailMessageFailedException, com::sun::star::mail::MailException, com::sun::star::datatransfer::UnsupportedFlavorException);
+        raises(com::sun::star::io::NotConnectedException, com::sun::star::mail::SendMailMessageFailedException, com::sun::star::mail::MailException, com::sun::star::datatransfer::UnsupportedFlavorException);   
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/media/Manager.idl b/offapi/com/sun/star/media/Manager.idl
index 2eed3fb47625..f97705cd7cd1 100644
--- a/offapi/com/sun/star/media/Manager.idl
+++ b/offapi/com/sun/star/media/Manager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,10 +33,10 @@
 
 module com {  module sun {  module star {  module media {
 
-/** a <type scope="com::sun::star::media">XPlayer</type> factory.
+/** a <type scope="com::sun::star::media">XPlayer</type> factory. 
     This helps creating new players.
  */
 service Manager : XManager;
-
+    
 }; }; }; };
 #endif
diff --git a/offapi/com/sun/star/media/XFrameGrabber.idl b/offapi/com/sun/star/media/XFrameGrabber.idl
index 36852c9802d3..2967c72ac36b 100644
--- a/offapi/com/sun/star/media/XFrameGrabber.idl
+++ b/offapi/com/sun/star/media/XFrameGrabber.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,13 +33,13 @@
 
 module com {  module sun {  module star {  module media {
 
-/** This interface provides an easy access to a stream images using
+/** This interface provides an easy access to a stream images using 
     their position in the time.
  */
 interface XFrameGrabber
 {
     /** returns the image of the underlying stream at a given position
-
+ 
         @param fMediaTime
             the time in seconds of the image to get. This time has to
             be a positive value inferior to the stream duration.
diff --git a/offapi/com/sun/star/media/XManager.idl b/offapi/com/sun/star/media/XManager.idl
index 1e63ee20bfc9..61df576b246c 100644
--- a/offapi/com/sun/star/media/XManager.idl
+++ b/offapi/com/sun/star/media/XManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@
 
 module com {  module sun {  module star {  module media {
 
-/** the <type scope="com::sun::star::media">XPlayer</type>
+/** the <type scope="com::sun::star::media">XPlayer</type> 
     factory interface
  */
 interface XManager
diff --git a/offapi/com/sun/star/media/XPlayer.idl b/offapi/com/sun/star/media/XPlayer.idl
index 7546e9d27d8c..81f2bd63379a 100644
--- a/offapi/com/sun/star/media/XPlayer.idl
+++ b/offapi/com/sun/star/media/XPlayer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,15 +47,15 @@ interface XPlayer
     /** starts reading the stream from the current position.
      */
     void start();
-
-    /** stops reading the stream and leave the cursor at its current
+    
+    /** stops reading the stream and leave the cursor at its current 
         position.
      */
     void stop();
 
     /** indicates whether the stream is played or not.
 
-        @returns
+        @returns 
             <TRUE/> if the stream is played, <FALSE/> otherwise
      */
     boolean isPlaying();
@@ -69,12 +69,12 @@ interface XPlayer
 
     /** sets the new cursor position in the media stream. After using
         this method the stream is stopped.
-
+ 
         @param fTime
             the new position to set in seconds
      */
     void setMediaTime( [in] double fTime );
-
+    
     /** gets the current position of the cursor in the stream
 
         @returns
@@ -88,7 +88,7 @@ interface XPlayer
             the time at which to stop reading the stream in seconds
      */
     void setStopTime( [in] double fTime );
-
+    
     /** gets the time at which the stream will stop. The result
         is not guaranteed if no stop time has been set.
      */
@@ -101,7 +101,7 @@ interface XPlayer
             the stream reading rate. <code>1.0</code> means normal speed.
      */
     void setRate( [in] double fRate );
-
+    
     /** gets the speed of the stream reading relatively to the normal
         reading.
 
@@ -110,45 +110,45 @@ interface XPlayer
      */
     double getRate();
 
-    /** sets whether the stream reading should restart at the stream
+    /** sets whether the stream reading should restart at the stream 
         start after the end of the stream.
-
+        
         @param bSet
-            loops if set to <TRUE/>, otherwise stops at the end of the
+            loops if set to <TRUE/>, otherwise stops at the end of the 
             stream.
      */
     void setPlaybackLoop( [in] boolean bSet );
-
-    /** indicates whether the stream reading will restart after the
+    
+    /** indicates whether the stream reading will restart after the 
         end of the stream.
 
         @returns
             <TRUE/> if the stream will loop, <FALSE/> otherwise.
      */
     boolean isPlaybackLoop();
-
+    
     /** sets the audio volume in decibel.
-
+        
         @param nDB
             the new volume in Decibel
      */
     void setVolumeDB( [in] short nDB );
-
+    
     /** gets the current audio volume in decibel
 
         @returns
             the volume in decibel
      */
     short getVolumeDB();
-
+    
     /** sets the volume to <code>0</code> or to its previous value.
-
+       
         @param bSet
-            sets the volume to <code>0</code> if <TRUE/>, and switch
+            sets the volume to <code>0</code> if <TRUE/>, and switch 
             to the previous non-null value if <FALSE/>
      */
     void setMute( [in] boolean bSet );
-
+    
     /** gets whether the volume is temporarily down to <code>0</code>
         or not.
 
@@ -164,14 +164,14 @@ interface XPlayer
             the <type scope="com::sun::star::awt">Size</type>
      */
     ::com::sun::star::awt::Size getPreferredPlayerWindowSize();
-
+    
     /** gets a new player window for this stream control
 
         @param aArguments
             arguments passed to the window during its creation.
      */
     XPlayerWindow createPlayerWindow( [in] sequence< any > aArguments );
-
+    
     /** gets a frame grabber for this stream.
      */
     XFrameGrabber createFrameGrabber();
diff --git a/offapi/com/sun/star/media/XPlayerWindow.idl b/offapi/com/sun/star/media/XPlayerWindow.idl
index efd8f6750243..134c8093a375 100644
--- a/offapi/com/sun/star/media/XPlayerWindow.idl
+++ b/offapi/com/sun/star/media/XPlayerWindow.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,13 +47,13 @@ interface XPlayerWindow : ::com::sun::star::awt::XWindow
     /** changes the zoom of the media played by the window.
      */
     boolean setZoomLevel( [in] ZoomLevel ZoomLevel );
-
+    
     /** gets the current media ratio.
      */
     ZoomLevel getZoomLevel();
-
+    
     /** changes the pointer for the player window.
-
+        
         @param SystemPointerType
             a <type scope="::com::sun::star::awt">SystemPointer</type>
      */
diff --git a/offapi/com/sun/star/media/ZoomLevel.idl b/offapi/com/sun/star/media/ZoomLevel.idl
index 7fafb9da755f..8f2d2a97d7c0 100644
--- a/offapi/com/sun/star/media/ZoomLevel.idl
+++ b/offapi/com/sun/star/media/ZoomLevel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/modules.idl b/offapi/com/sun/star/modules.idl
index 4224ab354dbf..4d159ba12085 100644
--- a/offapi/com/sun/star/modules.idl
+++ b/offapi/com/sun/star/modules.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -117,7 +117,7 @@ module ldap {};
 /// Spell checker, hyphenation and thesaurus interfaces.
 module linguistic2 {};
 
-/// Interfaces for Email connectivity
+/// Interfaces for Email connectivity 
 module mail {};
 
 /// Media type interfaces
diff --git a/offapi/com/sun/star/mozilla/MenuMultipleChange.idl b/offapi/com/sun/star/mozilla/MenuMultipleChange.idl
index 1fac0524bba7..f5dd8bc35395 100644
--- a/offapi/com/sun/star/mozilla/MenuMultipleChange.idl
+++ b/offapi/com/sun/star/mozilla/MenuMultipleChange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,22 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-
-#ifndef __com_sun_star_mozilla_MenuMultipleChange_idl__
-#define __com_sun_star_mozilla_MenuMultipleChange_idl__
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module mozilla {
-
-//=============================================================================
-
-
+ 
+ 
+#ifndef __com_sun_star_mozilla_MenuMultipleChange_idl__ 
+#define __com_sun_star_mozilla_MenuMultipleChange_idl__ 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module mozilla { 
+ 
+//============================================================================= 
+ 
+ 
 // DocMerge from idl: struct com::sun::star::mozilla::MenuMultipleChange
 /** Explains properties of a menu item
  */
@@ -48,69 +48,69 @@ published struct MenuMultipleChange
     // DocMerge from xml: field com::sun::star::mozilla::MenuMultipleChange::ID
     /** unique ID of this menu item
      */
-    short       ID;
-
-        //-------------------------------------------------------------------------
-
+    short		ID; 
+     
+        //------------------------------------------------------------------------- 
+         
     // DocMerge from xml: field com::sun::star::mozilla::MenuMultipleChange::GroupID
     /** unique ID of the group this menu item belongs to
      */
-    short       GroupID;
-
-        //-------------------------------------------------------------------------
-
+    short		GroupID; 
+     
+        //------------------------------------------------------------------------- 
+         
     // DocMerge from xml: field com::sun::star::mozilla::MenuMultipleChange::PreItemID
     /** unique ID of the item directly above this menu item, used for fuzzy placement
      */
-    short       PreItemID;
-
-        //-------------------------------------------------------------------------
-
+    short		PreItemID; 
+     
+        //------------------------------------------------------------------------- 
+         
     // DocMerge from xml: field com::sun::star::mozilla::MenuMultipleChange::ItemText
     /** text of the menu item
      */
-    string      ItemText;
-
-        //-------------------------------------------------------------------------
-
+    string		ItemText; 
+     
+        //------------------------------------------------------------------------- 
+         
     // DocMerge from xml: field com::sun::star::mozilla::MenuMultipleChange::IsVisible
     /** true if visible
      */
-    boolean     IsVisible;
-
-        //-------------------------------------------------------------------------
-
+    boolean		IsVisible; 
+     
+        //------------------------------------------------------------------------- 
+         
     // DocMerge from xml: field com::sun::star::mozilla::MenuMultipleChange::IsActive
     /** true if active, so clickable
      */
-    boolean     IsActive;
-
-        //-------------------------------------------------------------------------
-
+    boolean		IsActive; 
+     
+        //------------------------------------------------------------------------- 
+         
     // DocMerge from xml: field com::sun::star::mozilla::MenuMultipleChange::IsCheckable
     /** true if checkable, so there can be a checkmark
      */
-    boolean     IsCheckable;
-
-        //-------------------------------------------------------------------------
-
+    boolean		IsCheckable; 
+     
+        //------------------------------------------------------------------------- 
+         
     // DocMerge from xml: field com::sun::star::mozilla::MenuMultipleChange::IsChecked
     /** true if there is a checkmark
      */
-    boolean     IsChecked;
-
-        //-------------------------------------------------------------------------
-
+    boolean		IsChecked; 
+     
+        //------------------------------------------------------------------------- 
+         
     // DocMerge from idl: field com::sun::star::mozilla::MenuMultipleChange::Image
     /** sequence of bytes representing a possible image
      */
-    sequence<byte> Image;
-    };
-
-//=============================================================================
-
-}; }; }; };
-
-
-
-#endif
+    sequence<byte> Image; 
+    }; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+ 
+ 
+#endif 
diff --git a/offapi/com/sun/star/mozilla/MenuProxy.idl b/offapi/com/sun/star/mozilla/MenuProxy.idl
index 9e2bbf75eae1..1a1ea52e4500 100644
--- a/offapi/com/sun/star/mozilla/MenuProxy.idl
+++ b/offapi/com/sun/star/mozilla/MenuProxy.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-
-#ifndef __com_sun_star_mozilla_MenuProxy_idl__
-#define __com_sun_star_mozilla_MenuProxy_idl__
-
-#ifndef __com_sun_star_mozilla_XMenuProxy_idl__
-#include <com/sun/star/mozilla/XMenuProxy.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module mozilla {
-
-//=============================================================================
-
-
+ 
+ 
+#ifndef __com_sun_star_mozilla_MenuProxy_idl__ 
+#define __com_sun_star_mozilla_MenuProxy_idl__ 
+ 
+#ifndef __com_sun_star_mozilla_XMenuProxy_idl__ 
+#include <com/sun/star/mozilla/XMenuProxy.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module mozilla { 
+ 
+//============================================================================= 
+ 
+ 
 // DocMerge from idl: service com::sun::star::mozilla::MenuProxy
-/** Allows to execute dispatch for a menu item
+/** Allows to execute dispatch for a menu item 
     and handles listeners for changes in menu items.
  */
 published service MenuProxy
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: service com::sun::star::mozilla::MenuProxy: interface com::sun::star::mozilla::XMenuProxy
     /** @see XMenuProxy
      */
-    interface XMenuProxy;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-
-#endif
+    interface XMenuProxy; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+ 
+ 
+#endif 
diff --git a/offapi/com/sun/star/mozilla/MenuProxyListener.idl b/offapi/com/sun/star/mozilla/MenuProxyListener.idl
index b239ae302b58..ce5fcfada293 100644
--- a/offapi/com/sun/star/mozilla/MenuProxyListener.idl
+++ b/offapi/com/sun/star/mozilla/MenuProxyListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-
-#ifndef __com_sun_star_mozilla_MenuProxyListener_idl__
-#define __com_sun_star_mozilla_MenuProxyListener_idl__
-
-#ifndef __com_sun_star_mozilla_XMenuProxyListener_idl__
-#include <com/sun/star/mozilla/XMenuProxyListener.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module mozilla {
-
-//=============================================================================
-
-
+ 
+ 
+#ifndef __com_sun_star_mozilla_MenuProxyListener_idl__ 
+#define __com_sun_star_mozilla_MenuProxyListener_idl__ 
+ 
+#ifndef __com_sun_star_mozilla_XMenuProxyListener_idl__ 
+#include <com/sun/star/mozilla/XMenuProxyListener.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module mozilla { 
+ 
+//============================================================================= 
+ 
+ 
 // DocMerge from xml: service com::sun::star::mozilla::MenuProxyListener
 /** Listens for changes in menu items.
  */
 published service MenuProxyListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: service com::sun::star::mozilla::MenuProxyListener: interface com::sun::star::mozilla::XMenuProxyListener
     /** @see XMenuProxyListener
      */
-    interface XMenuProxyListener;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-
-#endif
+    interface XMenuProxyListener; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+ 
+ 
+#endif 
diff --git a/offapi/com/sun/star/mozilla/MenuSingleChange.idl b/offapi/com/sun/star/mozilla/MenuSingleChange.idl
index d46210ed9306..88f1e362687d 100644
--- a/offapi/com/sun/star/mozilla/MenuSingleChange.idl
+++ b/offapi/com/sun/star/mozilla/MenuSingleChange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,22 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-
-#ifndef __com_sun_star_mozilla_MenuSingleChange_idl__
-#define __com_sun_star_mozilla_MenuSingleChange_idl__
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module mozilla {
-
-//=============================================================================
-
-
+ 
+ 
+#ifndef __com_sun_star_mozilla_MenuSingleChange_idl__ 
+#define __com_sun_star_mozilla_MenuSingleChange_idl__ 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module mozilla { 
+ 
+//============================================================================= 
+ 
+ 
 // DocMerge from idl: struct com::sun::star::mozilla::MenuSingleChange
 /** Explains a change for a menu item
  */
@@ -48,27 +48,27 @@ published struct MenuSingleChange
     // DocMerge from xml: field com::sun::star::mozilla::MenuSingleChange::ID
     /** unique ID of this menu item
      */
-    short   ID;
-
-    //-------------------------------------------------------------------------
-
+    short	ID; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::mozilla::MenuSingleChange::ChangeID
     /** ID identifying the type of change in the any type change
      */
-    short   ChangeID;
-
-    //-------------------------------------------------------------------------
-
+    short	ChangeID; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::mozilla::MenuSingleChange::Change
     /** value of change
      */
-    any     Change;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-
-#endif
+    any		Change; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+ 
+ 
+#endif 
diff --git a/offapi/com/sun/star/mozilla/MozillaBootstrap.idl b/offapi/com/sun/star/mozilla/MozillaBootstrap.idl
index 5b15847fa352..782d6d3d4dad 100644
--- a/offapi/com/sun/star/mozilla/MozillaBootstrap.idl
+++ b/offapi/com/sun/star/mozilla/MozillaBootstrap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-
-#ifndef __com_sun_star_mozilla_MozillaBootstrap_idl__
-#define __com_sun_star_mozilla_MozillaBootstrap_idl__
-
-#ifndef __com_sun_star_mozilla_XMozillaBootstrap_idl__
-#include <com/sun/star/mozilla/XMozillaBootstrap.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module mozilla {
-
-//=============================================================================
-
-
+ 
+ 
+#ifndef __com_sun_star_mozilla_MozillaBootstrap_idl__ 
+#define __com_sun_star_mozilla_MozillaBootstrap_idl__ 
+ 
+#ifndef __com_sun_star_mozilla_XMozillaBootstrap_idl__ 
+#include <com/sun/star/mozilla/XMozillaBootstrap.idl> 
+#endif 
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module mozilla { 
+ 
+//============================================================================= 
+ 
+ 
 /** Allow to discover Mozilla/Thunderbird profiles
-    Allow init Mozilla XPCOM using selected profile and switch profiles.
+    Allow init Mozilla XPCOM using selected profile and switch profiles.	
  */
 published service MozillaBootstrap
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** @see XMozillaBootstrap
      */
-    interface XMozillaBootstrap;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-
-#endif
+    interface XMozillaBootstrap; 
+
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+ 
+ 
+#endif 
diff --git a/offapi/com/sun/star/mozilla/MozillaProductType.idl b/offapi/com/sun/star/mozilla/MozillaProductType.idl
index 21e6dcf2b593..ef6f77a88b81 100644
--- a/offapi/com/sun/star/mozilla/MozillaProductType.idl
+++ b/offapi/com/sun/star/mozilla/MozillaProductType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,19 +24,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-
-#ifndef __com_sun_star_mozilla_MozillaProductType_idl__
-#define __com_sun_star_mozilla_MozillaProductType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module mozilla {
-
-//=============================================================================
-
-
+ 
+ 
+#ifndef __com_sun_star_mozilla_MozillaProductType_idl__ 
+#define __com_sun_star_mozilla_MozillaProductType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module mozilla { 
+ 
+//============================================================================= 
+ 
+ 
 /** Mozilla Product Types
  */
 published enum  MozillaProductType
@@ -47,18 +47,18 @@ published enum  MozillaProductType
     /** Mozilla browse and mail suite
     */
     Mozilla = 1,
-    /** Mozilla's next generation web browser.
+    /** Mozilla's next generation web browser. 
     */
     Firefox = 2,
     /** Mozilla's next generation e-mail client.
     */
     Thunderbird = 3
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+ 
+ 
+#endif 
diff --git a/offapi/com/sun/star/mozilla/XCloseSessionListener.idl b/offapi/com/sun/star/mozilla/XCloseSessionListener.idl
index 2a62769e8094..6e178b2c6644 100644
--- a/offapi/com/sun/star/mozilla/XCloseSessionListener.idl
+++ b/offapi/com/sun/star/mozilla/XCloseSessionListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_mozilla_XCloseSessionListener_idl__
-#define __com_sun_star_mozilla_XCloseSessionListener_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module mozilla {
-
-//=============================================================================
-
-
+#ifndef __com_sun_star_mozilla_XCloseSessionListener_idl__ 
+#define __com_sun_star_mozilla_XCloseSessionListener_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module mozilla {  
+ 
+//============================================================================= 
+  
+ 
 // DocMerge from xml: interface com::sun::star::mozilla::XCloseSessionListener
 /** Listener for closing of the corresponding session.
 */
 published interface XCloseSessionListener: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-
+{ 
+    //------------------------------------------------------------------------- 
+     
+ 
     // DocMerge from xml: method com::sun::star::mozilla::XCloseSessionListener::sessionClosed
-    /** Notifies a closesession listener that the corresponding session was logged out
+    /** Notifies a closesession listener that the corresponding session was logged out 
 
-        @param sessionData  [in]:   the data identifying the session that was closed
+        @param sessionData	[in]:	the data identifying the session that was closed
 
      */
-    [oneway] void sessionClosed( [in] any sessionData );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void sessionClosed( [in] any sessionData ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/mozilla/XCodeProxy.idl b/offapi/com/sun/star/mozilla/XCodeProxy.idl
index c91eacd092ac..5df8d64f73f8 100644
--- a/offapi/com/sun/star/mozilla/XCodeProxy.idl
+++ b/offapi/com/sun/star/mozilla/XCodeProxy.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XCodeProxy_idl__
-#define __com_sun_star_sdbc_XCodeProxy_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_mozilla_MozillaProductType_idl__
+#ifndef __com_sun_star_sdbc_XCodeProxy_idl__ 
+#define __com_sun_star_sdbc_XCodeProxy_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+#ifndef __com_sun_star_mozilla_MozillaProductType_idl__ 
 #include <com/sun/star/mozilla/MozillaProductType.idl>
-#endif
-
- module com {  module sun {  module star {  module mozilla {
-
-
-
+#endif 
+ 
+ module com {  module sun {  module star {  module mozilla { 
+ 
+ 
+ 
 /** is the interface to run Mozilla XPCOM code
-    to run Mozilla XPCOM code in OOo,you should first implement this interface, then pass this object to
+    to run Mozilla XPCOM code in OOo,you should first implement this interface, then pass this object to 
     xProxyRunner->Run
-
+    
     @see XProxyRunner
     @see XMozillaBootstrap
  */
 published interface XCodeProxy: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** all Mozilla XPCOM code must be called in run() or functions called by run()
      */
     long run();
@@ -58,10 +58,10 @@ published interface XCodeProxy: com::sun::star::uno::XInterface
      */
     string getProfileName();
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/mozilla/XMenuProxy.idl b/offapi/com/sun/star/mozilla/XMenuProxy.idl
index 15aefc596ef0..e54bede8e581 100644
--- a/offapi/com/sun/star/mozilla/XMenuProxy.idl
+++ b/offapi/com/sun/star/mozilla/XMenuProxy.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,68 +24,68 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-
-#ifndef __com_sun_star_mozilla_XMenuProxy_idl__
-#define __com_sun_star_mozilla_XMenuProxy_idl__
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_mozilla_XMenuProxyListener_idl__
-#include <com/sun/star/mozilla/XMenuProxyListener.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module mozilla {
-
-//=============================================================================
-
-
+ 
+ 
+#ifndef __com_sun_star_mozilla_XMenuProxy_idl__ 
+#define __com_sun_star_mozilla_XMenuProxy_idl__ 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_mozilla_XMenuProxyListener_idl__ 
+#include <com/sun/star/mozilla/XMenuProxyListener.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module mozilla { 
+ 
+//============================================================================= 
+ 
+ 
 // DocMerge from xml: interface com::sun::star::mozilla::XMenuProxy
-/** Allows to execute dispatch for a menu item
+/** Allows to execute dispatch for a menu item 
     and handles listeners for changes in menu items.
  */
 published interface XMenuProxy: com::sun::star::lang::XComponent
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::mozilla::XMenuProxy::executeMenuItem
     /** Executes dispatch for the given menu id
 
-        @param ID   [in]:   the menu item
+        @param ID	[in]:	the menu item
 
      */
-    void executeMenuItem([in] short ID);
-
-    //-------------------------------------------------------------------------
-
+    void executeMenuItem([in] short ID); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::mozilla::XMenuProxy::addMenuProxyListener
     /** Registers an event listener, which will be called when the menu changes
 
-        @param xListener    [in]:   the listener to be set
+        @param xListener	[in]:	the listener to be set
 
      */
-    [oneway] void addMenuProxyListener([in] XMenuProxyListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addMenuProxyListener([in] XMenuProxyListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::mozilla::XMenuProxy::removeMenuProxyListener
     /** Unregisters an event listener which was registered with
         <member>XMenuProxy::addMenuProxyListener()</member>.
 
-        @param xListener    [in]:   the listener to be removed
+        @param xListener	[in]:	the listener to be removed
 
      */
-    [oneway] void removeMenuProxyListener([in] XMenuProxyListener xListener );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-
-#endif
+    [oneway] void removeMenuProxyListener([in] XMenuProxyListener xListener ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+ 
+ 
+#endif 
diff --git a/offapi/com/sun/star/mozilla/XMenuProxyListener.idl b/offapi/com/sun/star/mozilla/XMenuProxyListener.idl
index 78b3d7d5df21..dd0c94d34c6e 100644
--- a/offapi/com/sun/star/mozilla/XMenuProxyListener.idl
+++ b/offapi/com/sun/star/mozilla/XMenuProxyListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,66 +24,66 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-
-#ifndef __com_sun_star_mozilla_XMenuProxyListener_idl__
-#define __com_sun_star_mozilla_XMenuProxyListener_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mozilla_MenuMultipleChange_idl__
-#include <com/sun/star/mozilla/MenuMultipleChange.idl>
-#endif
-
-#ifndef __com_sun_star_mozilla_MenuSingleChange_idl__
-#include <com/sun/star/mozilla/MenuSingleChange.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module mozilla {
-
-//=============================================================================
-
-
+ 
+ 
+#ifndef __com_sun_star_mozilla_XMenuProxyListener_idl__ 
+#define __com_sun_star_mozilla_XMenuProxyListener_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_mozilla_MenuMultipleChange_idl__ 
+#include <com/sun/star/mozilla/MenuMultipleChange.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_mozilla_MenuSingleChange_idl__ 
+#include <com/sun/star/mozilla/MenuSingleChange.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module mozilla { 
+ 
+//============================================================================= 
+ 
+ 
 // DocMerge from xml: interface com::sun::star::mozilla::XMenuProxyListener
 /** Listens for changes in menu items.
  */
 published interface XMenuProxyListener: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::mozilla::XMenuProxyListener::menuChangedMultiple
-    /** is called, if the content or graphical representation/state of the menu changes
+    /** is called, if the content or graphical representation/state of the menu changes 
         completely, for one or more menu items
      */
-    void menuChangedMultiple([in] sequence<MenuMultipleChange> MenuMultipleChanges);
-
-    //-------------------------------------------------------------------------
-
+    void menuChangedMultiple([in] sequence<MenuMultipleChange> MenuMultipleChanges); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::mozilla::XMenuProxyListener::menuChangedSingle
-    /** is called, if the content or graphical representation/state of the menu changes,
+    /** is called, if the content or graphical representation/state of the menu changes, 
         by one property for one or more menu items
      */
-    void menuChangedSingle([in] sequence<MenuSingleChange> MenuSingleChanges);
-
-    //-------------------------------------------------------------------------
-
+    void menuChangedSingle([in] sequence<MenuSingleChange> MenuSingleChanges); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::mozilla::XMenuProxyListener::menuItemDeleted
     /** is called, if one menu item designated by the ID, is deleted.
 
-        @param ID   [in]:   the menu item
+        @param ID	[in]:	the menu item
 
      */
-    void menuItemDeleted([in] short ID);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-
-#endif
+    void menuItemDeleted([in] short ID); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+ 
+ 
+#endif 
diff --git a/offapi/com/sun/star/mozilla/XMozillaBootstrap.idl b/offapi/com/sun/star/mozilla/XMozillaBootstrap.idl
index e955ad2b93cb..09314d048433 100644
--- a/offapi/com/sun/star/mozilla/XMozillaBootstrap.idl
+++ b/offapi/com/sun/star/mozilla/XMozillaBootstrap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_mozilla_XMozillaBootstrap_idl__
-#define __com_sun_star_mozilla_XMozillaBootstrap_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mozilla_XProfileDiscover_idl__
-#include <com/sun/star/mozilla/XProfileDiscover.idl>
-#endif
-#ifndef __com_sun_star_mozilla_XProfileManager_idl__
-#include <com/sun/star/mozilla/XProfileManager.idl>
-#endif
-#ifndef __com_sun_star_mozilla_XProxyRunner_idl__
-#include <com/sun/star/mozilla/XProxyRunner.idl>
-#endif
-
-
- module com {  module sun {  module star {  module mozilla {
-
+#ifndef __com_sun_star_mozilla_XMozillaBootstrap_idl__ 
+#define __com_sun_star_mozilla_XMozillaBootstrap_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
+#ifndef __com_sun_star_mozilla_XProfileDiscover_idl__ 
+#include <com/sun/star/mozilla/XProfileDiscover.idl> 
+#endif 
+#ifndef __com_sun_star_mozilla_XProfileManager_idl__ 
+#include <com/sun/star/mozilla/XProfileManager.idl> 
+#endif 
+#ifndef __com_sun_star_mozilla_XProxyRunner_idl__ 
+#include <com/sun/star/mozilla/XProxyRunner.idl> 
+#endif 
+ 
+ 
+ module com {  module sun {  module star {  module mozilla { 
+ 
+ 
 published interface XProfileDiscover;
 published interface XProfileManager;
 published interface XProxyRunner;
@@ -60,10 +60,10 @@ published interface XMozillaBootstrap
     interface XProfileManager;
     interface XProxyRunner;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/mozilla/XPluginInstance.idl b/offapi/com/sun/star/mozilla/XPluginInstance.idl
index 614da9444144..43e621624590 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstance.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstance.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -83,8 +83,8 @@ published interface XPluginInstance: com::sun::star::uno::XInterface
     // DocMerge from xml: method com::sun::star::mozilla::XPluginInstance::createWindow
     /** Creates a new window for plugin operation.
 
-        @param PlatformParentData   [in]:   platform dependent window data
-        @param embedded             [in]:   selects embedded or full page plugin mode
+        @param PlatformParentData	[in]:	platform dependent window data
+        @param embedded				[in]:	selects embedded or full page plugin mode
 
      */
     [oneway] void createWindow( [in] any PlatformParentData, [in] boolean embedded );
@@ -95,11 +95,11 @@ published interface XPluginInstance: com::sun::star::uno::XInterface
     // DocMerge from xml: method com::sun::star::mozilla::XPluginInstance::newStream
     /** Notifies the plugin of a new stream to display.
 
-        @param MIMEDesc     [in]:   the MIMEtype of the data stream
-        @param theURL       [in]:   the URL that denotes the stream
-        @param filter       [in]:   a filter string to suggest a component that should handle the document
-        @param stream       [in]:   the data stream
-        @param sessiondata  [in]:   the data specifying the current session
+        @param MIMEDesc		[in]:	the MIMEtype of the data stream
+        @param theURL		[in]:	the URL that denotes the stream
+        @param filter		[in]:	a filter string to suggest a component that should handle the document
+        @param stream		[in]:	the data stream
+        @param sessiondata	[in]:	the data specifying the current session
 
      */
     [oneway] void newStream(
@@ -116,10 +116,10 @@ published interface XPluginInstance: com::sun::star::uno::XInterface
     // DocMerge from xml: method com::sun::star::mozilla::XPluginInstance::newURL
     /** Notifies the plugin of a new url to open as document.
 
-        @param MIMEDesc     [in]:   the MIMEtype of the data stream
-        @param theURL       [in]:   the URL to be openend
-        @param filter       [in]:   a filter string to suggest a component that should handle the document
-        @param sessiondata  [in]:   the data specifying the current session
+        @param MIMEDesc		[in]:	the MIMEtype of the data stream
+        @param theURL		[in]:	the URL to be openend
+        @param filter		[in]:	a filter string to suggest a component that should handle the document
+        @param sessiondata	[in]:	the data specifying the current session
 
      */
     [oneway] void newURL( [in] string MIMEDesc, [in] string theURL, [in] string filter, [in] any sessionData );
@@ -130,9 +130,9 @@ published interface XPluginInstance: com::sun::star::uno::XInterface
     // DocMerge from idl: method com::sun::star::mozilla::XPluginInstance::getHttpServerURL
     /** Retrieves the URL of the HTTP Loadbalancing Slave.
 
-        @param aURL     [out]:  the full qualified host name of the LBS
-        @param aPort    [out]:  the port number
-        @param aPrefix  [out]:  the url prefix to the portal
+        @param aURL		[out]:	the full qualified host name of the LBS
+        @param aPort	[out]:	the port number
+        @param aPrefix	[out]:	the url prefix to the portal
 
      */
     void getHttpServerURL( [out] string aHost, [out] unsigned short aPort,
@@ -143,4 +143,4 @@ published interface XPluginInstance: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl b/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl
index 20ad31aed362..da222bc1439b 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstanceNotifySink.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_mozilla_XPluginInstanceNotifySink_idl__
-#define __com_sun_star_mozilla_XPluginInstanceNotifySink_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module mozilla {
-
-//=============================================================================
-
-
+#ifndef __com_sun_star_mozilla_XPluginInstanceNotifySink_idl__ 
+#define __com_sun_star_mozilla_XPluginInstanceNotifySink_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module mozilla {  
+ 
+//============================================================================= 
+  
+ 
 // DocMerge from xml: interface com::sun::star::mozilla::XPluginInstanceNotifySink
 /** Allows a plugin to get notification from office side
     about status of new document opening.
     This interface is oriented for communication with browsers plugins.
  */
 published interface XPluginInstanceNotifySink: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-
+{ 
+    //------------------------------------------------------------------------- 
+     
+ 
     // DocMerge from xml: method com::sun::star::mozilla::XPluginInstanceNotifySink::notifyURL
-    /** Notifies the plugin that a getURL / postURL operation on the
+    /** Notifies the plugin that a getURL / postURL operation on the 
         corresponding XPluginInstancePeer was finished.
 
-        @param theURL   [in]:   name of the URL that was used during a previous getURL or postURL call
+        @param theURL	[in]:	name of the URL that was used during a previous getURL or postURL call
 
      */
-    [oneway] void notifyURL( [in] string theURL );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void notifyURL( [in] string theURL ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl b/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl
index 3e06b9940b9c..4ff348910237 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstancePeer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,147 +24,147 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_mozilla_XPluginInstancePeer_idl__
-#define __com_sun_star_mozilla_XPluginInstancePeer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
-#include <com/sun/star/io/XActiveDataSource.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
-#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
-#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module mozilla {
-
-//=============================================================================
-
- published interface XPluginInstanceNotifySink;
-
-//=============================================================================
-
-
+#ifndef __com_sun_star_mozilla_XPluginInstancePeer_idl__ 
+#define __com_sun_star_mozilla_XPluginInstancePeer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XActiveDataSource_idl__ 
+#include <com/sun/star/io/XActiveDataSource.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XInputStream_idl__ 
+#include <com/sun/star/io/XInputStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__ 
+#include <com/sun/star/lang/XMultiServiceFactory.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module mozilla { 
+ 
+//============================================================================= 
+ 
+ published interface XPluginInstanceNotifySink; 
+ 
+//============================================================================= 
+ 
+ 
 // DocMerge from xml: interface com::sun::star::mozilla::XPluginInstancePeer
 /** Allows to communicate with a plugin from the office side.
     This interface is oriented for communication with browsers plugins.
  */
 published interface XPluginInstancePeer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-
+{ 
+    //------------------------------------------------------------------------- 
+     
+ 
     // DocMerge from xml: method com::sun::star::mozilla::XPluginInstancePeer::setWindowSize
     /** Alters the plugin's window size in the browser window.
 
-        @param width    [in]: the new window width
-        @param height   [in]: the new window height
+        @param width	[in]: the new window width
+        @param height	[in]: the new window height
 
         @return <CODE>TRUE</CODE> on success
      */
-    boolean setWindowSize( [in] long width, [in] long heigth );
-
-    //-------------------------------------------------------------------------
-
-
+    boolean setWindowSize( [in] long width, [in] long heigth ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+ 
     // DocMerge from xml: method com::sun::star::mozilla::XPluginInstancePeer::showStatusMessage
     /** Show status / hint message in browser's message area.
 
-        @param message  [in]: the string to be displayed
+        @param message	[in]: the string to be displayed
      */
-    [oneway] void showStatusMessage( [in] string message );
-
-    //-------------------------------------------------------------------------
-
-
+    [oneway] void showStatusMessage( [in] string message ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+ 
     // DocMerge from xml: method com::sun::star::mozilla::XPluginInstancePeer::enableScripting
     /** Indicates to the plugin that the document was loaded successfully and scripting
         interfaces are now available.
 
-        @param document         [in]: the active document
-        @param servicemanager   [in]: the office servicemanager
+        @param document			[in]: the active document
+        @param servicemanager	[in]: the office servicemanager
 
      */
-    [oneway] void enableScripting( [in] com::sun::star::uno::XInterface document, [in] com::sun::star::lang::XMultiServiceFactory servicemanager );
-
-    //-------------------------------------------------------------------------
-
-
+    [oneway] void enableScripting( [in] com::sun::star::uno::XInterface document, [in] com::sun::star::lang::XMultiServiceFactory servicemanager ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+ 
     // DocMerge from xml: method com::sun::star::mozilla::XPluginInstancePeer::newStream
     /** Creates a new stream of data produced by the plug-in and consumed by
         the browser.
 
-        @param MIMEDesc [in]:   the MIME type of the plug-in to create
-        @param target   [in]:   the name of the target window or frame (supports _blank, _self)
-        @param data     [in]:   on success the outputstream will be associated with this instance
+        @param MIMEDesc	[in]:	the MIME type of the plug-in to create
+        @param target	[in]:	the name of the target window or frame (supports _blank, _self)
+        @param data		[in]:	on success the outputstream will be	associated with this instance
 
      */
-    [oneway] void newStream(
-        [in] string MIMEDesc,
-        [in] string target,
-        [in] com::sun::star::io::XActiveDataSource data
-    );
-
-    //-------------------------------------------------------------------------
-
-
+    [oneway] void newStream( 
+        [in] string MIMEDesc, 
+        [in] string target, 
+        [in] com::sun::star::io::XActiveDataSource data 
+    ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+ 
     // DocMerge from xml: method com::sun::star::mozilla::XPluginInstancePeer::getURL
-    /** Fetches an URL into the target window. The parameters and their meaning map to the
+    /** Fetches an URL into the target window. The parameters and their meaning map to the 
         corresponding Netscape-API call.
-
-        @param aURL             [in]: the URL to be fetched
-        @param target           [in]: the name of the target window or frame (supports _blank, _self)
-        @param alternativeHost  [in]: alternativeHost
-        @param referrer         [in]: referrer
-        @param sink             [in]: the sink is notified on success
+        
+        @param aURL				[in]: the URL to be fetched
+        @param target			[in]: the name of the target window or frame (supports _blank, _self)
+        @param alternativeHost	[in]: alternativeHost 
+        @param referrer			[in]: referrer
+        @param sink				[in]: the sink is notified on success
 
      */
-    [oneway] void getURL (
-        [in] string aURL,
-        [in] string target,
-        [in] string alternativeHost,
-        [in] string referrer,
-        [in] XPluginInstanceNotifySink sink
-    );
-
-    //-------------------------------------------------------------------------
-
-
+    [oneway] void getURL ( 
+        [in] string aURL, 
+        [in] string target, 
+        [in] string alternativeHost, 
+        [in] string referrer, 
+        [in] XPluginInstanceNotifySink sink 
+    ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+ 
     // DocMerge from xml: method com::sun::star::mozilla::XPluginInstancePeer::postURL
-    /** Posts to a URL with post data and/or post headers. The parameters and their meaning
+    /** Posts to a URL with post data and/or post headers. The parameters and their meaning 
         map to the corresponding Netscape-API call.
 
-        @param aURL             [in]: the URL to be posted to
-        @param postData         [in]: the data to be posted
-        @param target           [in]: the name of the target window or frame (supports _blank, _self)
-        @param alternativeHost  [in]: alternativeHost
-        @param referrer         [in]: referrer
-        @param postHeaders      [in]: the header to be posted
-        @param sink             [in]: the sink is notified on success
+        @param aURL				[in]: the URL to be posted to
+        @param postData			[in]: the data to be posted
+        @param target			[in]: the name of the target window or frame (supports _blank, _self)
+        @param alternativeHost	[in]: alternativeHost 
+        @param referrer			[in]: referrer
+        @param postHeaders		[in]: the header to be posted
+        @param sink				[in]: the sink is notified on success
 
      */
-    [oneway] void postURL (
-        [in] string aURL,
-        [in] com::sun::star::io::XInputStream postData,
-        [in] string target,
-        [in] string alternativeHost,
-        [in] string referrer,
-        [in] com::sun::star::io::XInputStream postHeaders,
-        [in] XPluginInstanceNotifySink sink
-    );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void postURL ( 
+        [in] string aURL, 
+        [in] com::sun::star::io::XInputStream postData, 
+        [in] string target, 
+        [in] string alternativeHost, 
+        [in] string referrer, 
+        [in] com::sun::star::io::XInputStream postHeaders, 
+        [in] XPluginInstanceNotifySink sink 
+    ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl b/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl
index 8818ef587be7..773108c9be71 100644
--- a/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl
+++ b/offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_mozilla_XPluginInstanceSyncPeer_idl__
-#define __com_sun_star_mozilla_XPluginInstanceSyncPeer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mozilla_XPluginInstance_idl__
-#include <com/sun/star/mozilla/XPluginInstance.idl>
-#endif
+#ifndef __com_sun_star_mozilla_XPluginInstanceSyncPeer_idl__ 
+#define __com_sun_star_mozilla_XPluginInstanceSyncPeer_idl__ 
 
-//=============================================================================
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
- module com {  module sun {  module star {  module mozilla {
-
-//=============================================================================
+#ifndef __com_sun_star_mozilla_XPluginInstance_idl__ 
+#include <com/sun/star/mozilla/XPluginInstance.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module mozilla { 
+ 
+//============================================================================= 
 
 // DocMerge from xml: interface com::sun::star::mozilla::XPluginInstanceSyncPeer
 /** This interface is an extention for <type>XPluginInstancePeer</type> interface.
     An object can support this interface in addition to <type>XPluginInstancePeer</type> interface.
  */
 published interface XPluginInstanceSyncPeer : com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-
+{ 
+    //------------------------------------------------------------------------- 
+     
+ 
     // DocMerge from xml: method com::sun::star::mozilla::XPluginInstanceSyncPeer::openNewBrowserWindow
     /** Opens a new browser window with a plugin instance synchronously.
 
-        @param aInstance            [out]:  new plugin instance in case of success
-        @param Any                  [out]:  linkage to the window data
-        @param embedded             [out]:  selects embedded or full page plugin mode
+        @param aInstance			[out]:	new plugin instance in case of success
+        @param Any					[out]:	linkage to the window data
+        @param embedded				[out]:	selects embedded or full page plugin mode
 
 
      */
     void openNewBrowserWindow(
                                         [out] XPluginInstance aInstance,
                                         [out] any aLinkage,
-                                        [out] boolean embeded);
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+                                        [out] boolean embeded); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl b/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl
index 3e8d86fba3c2..db3c7f0b9738 100644
--- a/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl
+++ b/offapi/com/sun/star/mozilla/XPluginWindowPeer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_mozilla_XPluginWindowPeer_idl__
-#define __com_sun_star_mozilla_XPluginWindowPeer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module mozilla {
-
-//=============================================================================
-
+#ifndef __com_sun_star_mozilla_XPluginWindowPeer_idl__ 
+#define __com_sun_star_mozilla_XPluginWindowPeer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module mozilla {  
+ 
+//============================================================================= 
+  
 // DocMerge from xml: interface com::sun::star::mozilla::XPluginWindowPeer
 /** Allows to notify a plugin from the office side about plugin window's child window creation.
     This interface is oriented for communication with browsers plugins.
  */
 published interface XPluginWindowPeer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-
+{ 
+    //------------------------------------------------------------------------- 
+     
+ 
     // DocMerge from xml: method com::sun::star::mozilla::XPluginWindowPeer::setChildWindow
     /** Notifies the peer of the created child window.
 
-        @param SystemWindowData [in]:   platform dependent window data
+        @param SystemWindowData	[in]:	platform dependent window data
 
      */
-    [oneway] void setChildWindow( [in] any SystemWindowData );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void setChildWindow( [in] any SystemWindowData ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/mozilla/XProfileDiscover.idl b/offapi/com/sun/star/mozilla/XProfileDiscover.idl
index bd36a6eb0b89..cbcd4c92c649 100644
--- a/offapi/com/sun/star/mozilla/XProfileDiscover.idl
+++ b/offapi/com/sun/star/mozilla/XProfileDiscover.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_mozilla_XProfileDiscover_idl__
-#define __com_sun_star_mozilla_XProfileDiscover_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_mozilla_MozillaProductType_idl__
+#ifndef __com_sun_star_mozilla_XProfileDiscover_idl__ 
+#define __com_sun_star_mozilla_XProfileDiscover_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+#ifndef __com_sun_star_mozilla_MozillaProductType_idl__ 
 #include <com/sun/star/mozilla/MozillaProductType.idl>
-#endif
-
-
- module com {  module sun {  module star {  module mozilla {
-
-
-
+#endif 
+ 
+ 
+ module com {  module sun {  module star {  module mozilla { 
+ 
+ 
+ 
 /** is the interface used to list and get information for Mozilla/Thunderbird profiles
-
-
+    
+    
     @see com::sun::star::mozilla::XProfileManager
     @see com::sun::star::mozilla::MozillaBootstrap
  */
 published interface XProfileDiscover: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** attempts to get the profiles count.
 
         @param product
-            is the product name to get profiles count.Currently support "Mozilla" and "Thunderbird".
-        @returns
+            is the product name to get profiles count.Currently support "Mozilla" and "Thunderbird". 
+        @returns 
             the profiles count of selected product.
 
      */
@@ -61,10 +61,10 @@ published interface XProfileDiscover: com::sun::star::uno::XInterface
     /** attempts to get the profile list for the given product.
 
         @param product
-            is the product name to get profile list.Currently support "Mozilla" and "Thunderbird".
+            is the product name to get profile list.Currently support "Mozilla" and "Thunderbird". 
         @param list
             is a list of all profile of the given product.
-        @returns
+        @returns 
             the profile count for the given product.
 
      */
@@ -73,21 +73,21 @@ published interface XProfileDiscover: com::sun::star::uno::XInterface
     /** attempts to get the default profile name for the given product.
 
         @param product
-            is the product name to get default profile.Currently support "Mozilla" and "Thunderbird".
-        @returns
+            is the product name to get default profile.Currently support "Mozilla" and "Thunderbird". 
+        @returns 
             the default profile name for the given product.
 
      */
     string getDefaultProfile( [in]MozillaProductType product);
 
-
+ 
     /** attempts to get the full path for the given profile.
 
         @param product
-            is the product name to get profile path.Currently support "Mozilla" and "Thunderbird".
+            is the product name to get profile path.Currently support "Mozilla" and "Thunderbird". 
         @param profileName
             the profile name to get full path.
-        @returns
+        @returns 
             the full path of the given profile.
 
      */
@@ -96,10 +96,10 @@ published interface XProfileDiscover: com::sun::star::uno::XInterface
     /** attempts to get whether profile is locked by other applications.
 
         @param product
-            is the product name to get profile path.Currently support "Mozilla" and "Thunderbird".
+            is the product name to get profile path.Currently support "Mozilla" and "Thunderbird". 
         @param profileName
             the profile name to check.
-        @returns
+        @returns 
             true is the given profile is locked.
 
      */
@@ -108,20 +108,20 @@ published interface XProfileDiscover: com::sun::star::uno::XInterface
     /** return true if the given profile exists
 
         @param product
-            is the product name to get profile path.Currently support "Mozilla" and "Thunderbird".
+            is the product name to get profile path.Currently support "Mozilla" and "Thunderbird". 
         @param profileName
             the profile name to check.
-        @returns
+        @returns 
             whether given profile exists
 
      */
     boolean getProfileExists( [in]MozillaProductType product,[in]string profileName);
 
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/mozilla/XProfileManager.idl b/offapi/com/sun/star/mozilla/XProfileManager.idl
index b409cc5adcf1..607c58e78beb 100644
--- a/offapi/com/sun/star/mozilla/XProfileManager.idl
+++ b/offapi/com/sun/star/mozilla/XProfileManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_mozilla_XProfileManager_idl__
-#define __com_sun_star_mozilla_XProfileManager_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_mozilla_MozillaProductType_idl__
+#ifndef __com_sun_star_mozilla_XProfileManager_idl__ 
+#define __com_sun_star_mozilla_XProfileManager_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+#ifndef __com_sun_star_mozilla_MozillaProductType_idl__ 
 #include <com/sun/star/mozilla/MozillaProductType.idl>
-#endif
-
-
-
- module com {  module sun {  module star {  module mozilla {
-
-
-
+#endif 
+ 
+ 
+ 
+ module com {  module sun {  module star {  module mozilla { 
+ 
+ 
+ 
 /** is the interface to bootup and switch Mozilla/Thunderbird profiles
-
+    
     @see com::sun::star::mozilla::MozillaProductType
     @see com::sun::star::mozilla::XProfileDiscover
     @see com::sun::star::mozilla::MozillaBootstrap
  */
 published interface XProfileManager: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     // DocMerge from xml: method com::sun::star::mozilla::XProfileManager::bootupProfile
     /** attempts to init xpcom runtime using given profile.
 
@@ -56,7 +56,7 @@ published interface XProfileManager: com::sun::star::uno::XInterface
             is the product to start up.
         @param profileName
             the profile name to be used.
-        @returns
+        @returns 
             the current refrence count for the given profile.
 
      */
@@ -64,7 +64,7 @@ published interface XProfileManager: com::sun::star::uno::XInterface
 
     /** attempts to shutdown the current profile.
 
-        @returns
+        @returns 
             the current refrence count for the current profile.
 
      */
@@ -72,7 +72,7 @@ published interface XProfileManager: com::sun::star::uno::XInterface
 
     /** attempts to get the current product.
 
-        @returns
+        @returns 
             the current used product.
 
      */
@@ -80,7 +80,7 @@ published interface XProfileManager: com::sun::star::uno::XInterface
 
     /** attempts to get the current profile name.
 
-        @returns
+        @returns 
             the current used profile.
 
      */
@@ -88,7 +88,7 @@ published interface XProfileManager: com::sun::star::uno::XInterface
 
     /** attempts to check whether the current profile locked or not
 
-        @returns
+        @returns 
             return sal_True is current profile is locked
 
      */
@@ -100,17 +100,17 @@ published interface XProfileManager: com::sun::star::uno::XInterface
             is the product to be used.
         @param profileName
             the profile name to be used.
-        @returns
+        @returns 
             the current used profile name for the given product.
 
      */
     string setCurrentProfile( [in]MozillaProductType product,[in]string profileName);
-
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+     
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/mozilla/XProxyRunner.idl b/offapi/com/sun/star/mozilla/XProxyRunner.idl
index 3848242cae36..59933af6fff0 100644
--- a/offapi/com/sun/star/mozilla/XProxyRunner.idl
+++ b/offapi/com/sun/star/mozilla/XProxyRunner.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_mozilla_XProxyRunner_idl__
-#define __com_sun_star_mozilla_XProxyRunner_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_mozilla_XCodeProxy_idl__
-#include <com/sun/star/mozilla/XCodeProxy.idl>
-#endif
-
-
- module com {  module sun {  module star {  module mozilla {
-
+#ifndef __com_sun_star_mozilla_XProxyRunner_idl__ 
+#define __com_sun_star_mozilla_XProxyRunner_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
+#ifndef __com_sun_star_mozilla_XCodeProxy_idl__ 
+#include <com/sun/star/mozilla/XCodeProxy.idl> 
+#endif 
+ 
+ 
+ module com {  module sun {  module star {  module mozilla { 
+ 
+ 
 published interface XCodeProxy;
 // DocMerge from xml: interface com::sun::star::mozilla::XProxyRunner
 /** is the interface run Mozilla XPCOM code in a managered environment
-
+    
     @see com::sun::star::mozilla::XProfileDiscover
     @see com::sun::star::mozilla::MozillaBootstrap
  */
 published interface XProxyRunner: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     // DocMerge from xml: method com::sun::star::mozilla::XProxyRunner::Run
     /** attempts to Run XPCOM code in a managered environment
 
         @param aCode
-            is a com:sun:star:mozilla:XCodeProxy object to be run.
-        @returns
+            is a com:sun:star:mozilla:XCodeProxy object to be run. 
+        @returns 
             the error code, is 0 when no error happened.
 
      */
     long Run( [in]XCodeProxy aCode);
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl b/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl
index a08da8b54155..10cfa1ac93d2 100644
--- a/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl
+++ b/offapi/com/sun/star/mozilla/XRemoteServiceManagerProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ module com { module sun { module star { module mozilla {
 
 /** Allows creation of the remote service manager for given session.
     This interface is oriented for communication with browsers plugins.
-
+    
     @deprecated
 */
 published interface XRemoteServiceManagerProvider: com::sun::star::uno::XInterface
@@ -48,14 +48,14 @@ published interface XRemoteServiceManagerProvider: com::sun::star::uno::XInterfa
     //-------------------------------------------------------------------------
     /** Returns the remote service manager for the given session
 
-        @param sessionData  [in]: contains the sessiondata (host, user, ticket)
+        @param sessionData	[in]: contains the sessiondata (host, user, ticket)
     */
     com::sun::star::lang::XMultiServiceFactory getServiceManager( [in] any sessionData );
 };
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 
 #endif
diff --git a/offapi/com/sun/star/office/XAnnotation.idl b/offapi/com/sun/star/office/XAnnotation.idl
index 7c601c5fe21a..a5d669676a2e 100644
--- a/offapi/com/sun/star/office/XAnnotation.idl
+++ b/offapi/com/sun/star/office/XAnnotation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@
 #include <com/sun/star/beans/XMultiPropertySet.idl>
 #endif
 
-#ifndef __com_sun_star_util_DateTime_idl__
+#ifndef __com_sun_star_util_DateTime_idl__ 
 #include <com/sun/star/util/DateTime.idl>
 #endif
 
@@ -75,7 +75,7 @@ interface XAnnotation
 
     /** a reference to the document content this annotation is anchored to. */
     [attribute, readonly] any Anchor;
-
+    
     /** this is an optional position that gives the user interface a hint where
         the annotation should be rendered. This could be an offset to the
         annotations anchor. */
diff --git a/offapi/com/sun/star/office/XAnnotationAccess.idl b/offapi/com/sun/star/office/XAnnotationAccess.idl
index 201151b7c0fc..60b770eedbc2 100644
--- a/offapi/com/sun/star/office/XAnnotationAccess.idl
+++ b/offapi/com/sun/star/office/XAnnotationAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_office_XAnnotationAccess_idl__
 #define __com_sun_star_office_XAnnotationAccess_idl__
 
-#ifndef __com_sun_star_office_XAnnotationEnumeration_idl__
+#ifndef __com_sun_star_office_XAnnotationEnumeration_idl__ 
 #include <com/sun/star/office/XAnnotationEnumeration.idl>
 #endif
 
@@ -49,7 +49,7 @@ module com {  module sun {  module star {  module office {
 /** This interface gives access to the annotation for a document content.
  */
 interface XAnnotationAccess
-{
+{    
     /** creates a new annotation and inserts it into the document content.
     */
     XAnnotation createAndInsertAnnotation();
@@ -58,11 +58,11 @@ interface XAnnotationAccess
     */
     void removeAnnotation( [in] XAnnotation annotation ) raises ( com::sun::star::lang::IllegalArgumentException );
 
-    /** @returns
+    /** @returns		 
             a new enumeration object for this annotation container.
             It returns NULL if there are no objects in this container.
      */
-    XAnnotationEnumeration createAnnotationEnumeration();
+    XAnnotationEnumeration createAnnotationEnumeration(); 
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/office/XAnnotationEnumeration.idl b/offapi/com/sun/star/office/XAnnotationEnumeration.idl
index aa252c9c5ded..05ad13425bfd 100644
--- a/offapi/com/sun/star/office/XAnnotationEnumeration.idl
+++ b/offapi/com/sun/star/office/XAnnotationEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_office_XAnnotationEnumeration_idl__
-#define __com_sun_star_office_XAnnotationEnumeration_idl__
-
-#ifndef __com_sun_star_office_XAnnotation_idl__
-#include <com/sun/star/office/XAnnotation.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module office {
-
-//=============================================================================
-
+#ifndef __com_sun_star_office_XAnnotationEnumeration_idl__ 
+#define __com_sun_star_office_XAnnotationEnumeration_idl__ 
+ 
+#ifndef __com_sun_star_office_XAnnotation_idl__ 
+#include <com/sun/star/office/XAnnotation.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+  
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module office {  
+ 
+//============================================================================= 
+ 
 /** An enumeration for a set of annotations.
  */
 interface XAnnotationEnumeration
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** tests whether this enumeration contains more elements.
      */
-    boolean hasMoreElements();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the next element of this enumeration.
-
-        @throws  NoSuchElementException
-            if no more elements exist.
+    boolean hasMoreElements(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns      
+            the next element of this enumeration.  
+                 
+        @throws  NoSuchElementException   
+            if no more elements exist. 
     */
-    XAnnotation nextElement()
-            raises( com::sun::star::container::NoSuchElementException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    XAnnotation nextElement() 
+            raises( com::sun::star::container::NoSuchElementException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/oooimprovement/Core.idl b/offapi/com/sun/star/oooimprovement/Core.idl
index 7ab8ec97541a..6576d0523b04 100644
--- a/offapi/com/sun/star/oooimprovement/Core.idl
+++ b/offapi/com/sun/star/oooimprovement/Core.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module oooimprovement {
+module com { module sun { module star { module oooimprovement { 
 
 interface XCore;
 
@@ -48,7 +48,7 @@ service Core : XCore
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/oooimprovement/CoreController.idl b/offapi/com/sun/star/oooimprovement/CoreController.idl
index 2ec833a5a5b4..b9eeb8414ddf 100644
--- a/offapi/com/sun/star/oooimprovement/CoreController.idl
+++ b/offapi/com/sun/star/oooimprovement/CoreController.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module oooimprovement {
+module com { module sun { module star { module oooimprovement { 
 
 interface XCoreController;
 
@@ -49,7 +49,7 @@ service CoreController : XCoreController
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/oooimprovement/XCore.idl b/offapi/com/sun/star/oooimprovement/XCore.idl
index aa9d246609af..420fe3b3ef85 100644
--- a/offapi/com/sun/star/oooimprovement/XCore.idl
+++ b/offapi/com/sun/star/oooimprovement/XCore.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,19 +25,19 @@
  ************************************************************************/
 
 
-#ifndef __com_sun_star_oooimprovement_XCore_idl__
+#ifndef __com_sun_star_oooimprovement_XCore_idl__  
 #define __com_sun_star_oooimprovement_XCore_idl__
 
 #include <com/sun/star/uno/XInterface.idl>
 
 //=============================================================================
 
-module com { module sun { module star { module oooimprovement {
+module com { module sun { module star { module oooimprovement { 
 
 //=============================================================================
 
 /** specifies the interface used to query the Core status
-
+ 
     @since OOo 3.0
 */
 interface XCore
@@ -47,12 +47,12 @@ interface XCore
     /** returns the current status of the Core */
     [readonly, attribute] boolean UiEventsLoggerEnabled;
     /** shows a dialog inviting the user to take part */
-    void inviteUser();
+    void inviteUser(); 
 };
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/oooimprovement/XCoreController.idl b/offapi/com/sun/star/oooimprovement/XCoreController.idl
index 8de545c0eeba..0032cdb7f6bd 100644
--- a/offapi/com/sun/star/oooimprovement/XCoreController.idl
+++ b/offapi/com/sun/star/oooimprovement/XCoreController.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,20 +25,20 @@
  ************************************************************************/
 
 
-#ifndef __com_sun_star_oooimprovement_XCoreController_idl__
+#ifndef __com_sun_star_oooimprovement_XCoreController_idl__  
 #define __com_sun_star_oooimprovement_XCoreController_idl__
 
 #include <com/sun/star/uno/XInterface.idl>
 
 //=============================================================================
 
-module com { module sun { module star { module oooimprovement {
+module com { module sun { module star { module oooimprovement { 
 
 //=============================================================================
 
 /** specifies the interface used to control the OOo Improvement core
     components
-
+ 
     @since OOo 3.0
 */
 interface XCoreController
@@ -50,7 +50,7 @@ interface XCoreController
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl b/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl
index 61f5dbbfe140..26f6a4146f0d 100644
--- a/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl
+++ b/offapi/com/sun/star/packages/EncryptionNotAllowedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_packages_EncryptionNotAllowedException_idl__
-#define __com_sun_star_packages_EncryptionNotAllowedException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module packages {
-
-//=============================================================================
-
+#ifndef __com_sun_star_packages_EncryptionNotAllowedException_idl__ 
+#define __com_sun_star_packages_EncryptionNotAllowedException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module packages {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::packages::EncryptionNotAllowedException
-/** This exception can be thrown in case object is encrypted when it is not allowed
+/** This exception can be thrown in case object is encrypted when it is not allowed 
  */
 exception EncryptionNotAllowedException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/packages/NoEncryptionException.idl b/offapi/com/sun/star/packages/NoEncryptionException.idl
index cffecf7bd637..711ebf76aea1 100644
--- a/offapi/com/sun/star/packages/NoEncryptionException.idl
+++ b/offapi/com/sun/star/packages/NoEncryptionException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_packages_NoEncryptionException_idl__
-#define __com_sun_star_packages_NoEncryptionException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module packages {
-
-//=============================================================================
-
+#ifndef __com_sun_star_packages_NoEncryptionException_idl__ 
+#define __com_sun_star_packages_NoEncryptionException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module packages {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::packages::NoEncryptionException
 /** This exception can be thrown in case object is not encrypted one as expected.
  */
 published exception NoEncryptionException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/packages/NoRawFormatException.idl b/offapi/com/sun/star/packages/NoRawFormatException.idl
index a2730b41da62..7795c27489e4 100644
--- a/offapi/com/sun/star/packages/NoRawFormatException.idl
+++ b/offapi/com/sun/star/packages/NoRawFormatException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_packages_NoRawFormatException_idl__
-#define __com_sun_star_packages_NoRawFormatException_idl__
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module packages {
-
-//=============================================================================
-
+#ifndef __com_sun_star_packages_NoRawFormatException_idl__ 
+#define __com_sun_star_packages_NoRawFormatException_idl__ 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module packages {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::packages::NoRawFormatException
 /** This exception can be thrown in case provided stream is not a raw stream
     representing encrypted package stream.
  */
 published exception NoRawFormatException: com::sun::star::io::IOException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/packages/Package.idl b/offapi/com/sun/star/packages/Package.idl
index 954b4434fbaa..9a75d9273aee 100644
--- a/offapi/com/sun/star/packages/Package.idl
+++ b/offapi/com/sun/star/packages/Package.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_packages_Package_idl__
-#define __com_sun_star_packages_Package_idl__
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
+#ifndef __com_sun_star_packages_Package_idl__ 
+#define __com_sun_star_packages_Package_idl__ 
+ 
+#ifndef __com_sun_star_lang_XInitialization_idl__ 
 #include <com/sun/star/lang/XInitialization.idl>
 #endif
 
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
+#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__ 
 #include <com/sun/star/container/XHierarchicalNameAccess.idl>
 #endif
 
@@ -39,31 +39,31 @@
 #include <com/sun/star/lang/XSingleServiceFactory.idl>
 #endif
 
-#ifndef __com_sun_star_util_XChangesBatch_idl__
+#ifndef __com_sun_star_util_XChangesBatch_idl__ 
 #include <com/sun/star/util/XChangesBatch.idl>
 #endif
 
 
-//=============================================================================
-
-module com {  module sun {  module star {  module packages {
-
-//=============================================================================
-/** The <type>Package</type> is a service that provides access to a set of
-    files and folders contained within a Package. One instance of the
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module packages {  
+ 
+//============================================================================= 
+/**	The <type>Package</type> is a service that provides access to a set of
+    files and folders contained within a Package. One instance of the 
     Package service exists for each Package file to be manipulated.
 
-    Each instance is created with an argument which specifies the URL of
+    Each instance is created with an argument which specifies the URL of 
     the Package file to which the user requires access. If the instance is
-    created without arguments, it must be initialised with the
-    <type scope="com::sun::star::lang">XInitialization</type> service methods
+    created without arguments, it must be initialised with the 
+    <type scope="com::sun::star::lang">XInitialization</type> service methods 
     before it is a valid instance of the service.
 */
 published service Package
 {
     /**
     A Package can be initialised with one of the following:
-
+    
     1. A file URL referring to a package.
     2. An XInputStream referring to a package (it must also
        support an XSeekable interface).
@@ -71,7 +71,7 @@ published service Package
        an XSeekable interface, and the XOutputStream must support an
        XTruncate interface.
 
-    It will throw a css::uno::Exception if initialised with bad data or
+    It will throw a css::uno::Exception if initialised with bad data or 
     if the package has an invalid format (for example, a corrupt central d
     irectory record if the file is a ZIP file).
     */
@@ -109,7 +109,7 @@ published service Package
         2. xDataStream = new MyStreamImpl(). (wherever the data comes from)
         3. xNewStream->setInputStream( xDataStream );
         4. parentFolder->insertByName( "image.png", xNewStream );
-
+    
     Replacing an existing stream would be very similar, except that the
     call ->insertByName would be replaced by ->replaceByName.
     */
@@ -122,5 +122,5 @@ published service Package
     interface com::sun::star::util::XChangesBatch;
 };
 }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/packages/PackageFolder.idl b/offapi/com/sun/star/packages/PackageFolder.idl
index dcf87f26911d..074d67a58740 100644
--- a/offapi/com/sun/star/packages/PackageFolder.idl
+++ b/offapi/com/sun/star/packages/PackageFolder.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_packages_PackageFolder_idl__
-#define __com_sun_star_packages_PackageFolder_idl__
-
-#ifndef __com_sun_star_container_XNamed_idl__
+#ifndef __com_sun_star_packages_PackageFolder_idl__ 
+#define __com_sun_star_packages_PackageFolder_idl__ 
+ 
+#ifndef __com_sun_star_container_XNamed_idl__ 
 #include <com/sun/star/container/XNamed.idl>
 #endif
 
-#ifndef __com_sun_star_container_XChild_idl__
+#ifndef __com_sun_star_container_XChild_idl__ 
 #include <com/sun/star/container/XChild.idl>
 #endif
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl>
 #endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
 
-#ifndef __com_sun_star_container_XEnumerationAccess_udl__
+#ifndef __com_sun_star_container_XEnumerationAccess_udl__ 
 #include <com/sun/star/container/XEnumerationAccess.idl>
 #endif
-//=============================================================================
-
-module com {  module sun {  module star {   module packages {
-
-//=============================================================================
+//============================================================================= 
+ 
+module com {  module sun {  module star {   module packages {  
+ 
+//============================================================================= 
 /**
-    The PackageFolder service represents a single folder or directory within
+    The PackageFolder service represents a single folder or directory within 
     a Package. Instances of this service can only be constructed by an
     implementation of the Package service and not via the service manager.
 */
@@ -63,7 +63,7 @@ published service PackageFolder
     */
     interface com::sun::star::container::XNamed;
     /**
-    The getParent method of XChild will return the PackageFolder that
+    The getParent method of XChild will return the PackageFolder that 
     contains this PackageFolder or nothing if this PackageFolder is
     the root PackageFolder.
 
@@ -82,16 +82,16 @@ published service PackageFolder
     */
     interface com::sun::star::container::XNameContainer;
     /**
-    This interface will return an implementation of service
+    This interface will return an implementation of service 
     PackageFolderEnumeration, which represents an iterator over the children
     of the PackageFolder, or the PackageStreams and PackageFolders contained
     within this instance of the PackageFolder service.
-
+    
     This provides a "snapshot" of the contents of the
     PackageFolder at the time of construction. It is the responsibility of the
     caller to ensure that any given member of the enumeration refers to a valid
-    PackageStream or PackageFolder.
-
+    PackageStream or PackageFolder. 
+    
     */
     interface com::sun::star::container::XEnumerationAccess;
 
@@ -104,5 +104,5 @@ published service PackageFolder
     interface com::sun::star::beans::XPropertySet;
 };
 }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/packages/PackageFolderEnumeration.idl b/offapi/com/sun/star/packages/PackageFolderEnumeration.idl
index 11e1d6f22b5a..b8f9a31ed2e0 100644
--- a/offapi/com/sun/star/packages/PackageFolderEnumeration.idl
+++ b/offapi/com/sun/star/packages/PackageFolderEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_packages_PackageFolderEnumeration_idl__
-#define __com_sun_star_packages_PackageFolderEnumeration_idl__
-
+#ifndef __com_sun_star_packages_PackageFolderEnumeration_idl__ 
+#define __com_sun_star_packages_PackageFolderEnumeration_idl__ 
+ 
 
-#ifndef __com_sun_star_container_XEnumeration_idl__
+#ifndef __com_sun_star_container_XEnumeration_idl__ 
 #include <com/sun/star/container/XEnumeration.idl>
 #endif
 
-//=============================================================================
-
-module com {  module sun {  module star {   module packages {
-
-//=============================================================================
+//============================================================================= 
+ 
+module com {  module sun {  module star {   module packages {  
+ 
+//============================================================================= 
 
 /**
 This service provides an iterator over the contents of a given instance
 of a PackageFolder. This provides a "snapshot" of the contents of the
 PackageFolder at the time of construction. It is the responsibility of the
 caller to ensure that any given member of the enumeration refers to a valid
-PackageStream or PackageFolder.
+PackageStream or PackageFolder. 
 */
 published service PackageFolderEnumeration
 {
     interface com::sun::star::container::XEnumeration;
 };
 }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/packages/PackageStream.idl b/offapi/com/sun/star/packages/PackageStream.idl
index c12860f1cf57..79aeea84dcca 100644
--- a/offapi/com/sun/star/packages/PackageStream.idl
+++ b/offapi/com/sun/star/packages/PackageStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_packages_PackageStream_idl__
-#define __com_sun_star_packages_PackageStream_idl__
-
+#ifndef __com_sun_star_packages_PackageStream_idl__ 
+#define __com_sun_star_packages_PackageStream_idl__ 
+ 
 
-#ifndef __com_sun_star_container_XNamed_idl__
+#ifndef __com_sun_star_container_XNamed_idl__ 
 #include <com/sun/star/container/XNamed.idl>
 #endif
 
-#ifndef __com_sun_star_container_XChild_idl__
+#ifndef __com_sun_star_container_XChild_idl__ 
 #include <com/sun/star/container/XChild.idl>
 #endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
 
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
+#ifndef __com_sun_star_io_XActiveDataSink_idl__ 
 #include <com/sun/star/io/XActiveDataSink.idl>
 #endif
 
-//=============================================================================
-
-module com {  module sun {  module star {   module packages {
-
-//=============================================================================
+//============================================================================= 
+ 
+module com {  module sun {  module star {   module packages {  
+ 
+//============================================================================= 
 
 /**This service represents a stream contained within a Package. Instances of
-this class can only be constructed by the implementation of the Package
+this class can only be constructed by the implementation of the Package 
 service.
 */
 published service PackageStream
@@ -91,5 +91,5 @@ published service PackageStream
     interface com::sun::star::beans::XPropertySet;
 };
 }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/packages/WrongPasswordException.idl b/offapi/com/sun/star/packages/WrongPasswordException.idl
index 954e0bd68afc..c37744c9d12f 100644
--- a/offapi/com/sun/star/packages/WrongPasswordException.idl
+++ b/offapi/com/sun/star/packages/WrongPasswordException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_packages_WrongPasswordException_idl__
-#define __com_sun_star_packages_WrongPasswordException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module packages {
-
-//=============================================================================
-
+#ifndef __com_sun_star_packages_WrongPasswordException_idl__ 
+#define __com_sun_star_packages_WrongPasswordException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module packages {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::packages::WrongPasswordException
 /** This exception can be thrown in case wrong password was provided.
  */
 published exception WrongPasswordException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/packages/XDataSinkEncrSupport.idl b/offapi/com/sun/star/packages/XDataSinkEncrSupport.idl
index 3f768b6a421d..0bd1c6a1f06f 100644
--- a/offapi/com/sun/star/packages/XDataSinkEncrSupport.idl
+++ b/offapi/com/sun/star/packages/XDataSinkEncrSupport.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_packages_XDataSinkEncrSupport_idl__
-#define __com_sun_star_packages_XDataSinkEncrSupport_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
-#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_WrongPasswordException_idl__
-#include <com/sun/star/packages/WrongPasswordException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoEncryptionException_idl__
-#include <com/sun/star/packages/NoEncryptionException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_EncryptionNotAllowedException_idl__
-#include <com/sun/star/packages/EncryptionNotAllowedException.idl>
-#endif
-
-#ifndef __com_sun_star_packages_NoRawFormatException_idl__
-#include <com/sun/star/packages/NoRawFormatException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module packages {
-
-//=============================================================================
-
+#ifndef __com_sun_star_packages_XDataSinkEncrSupport_idl__ 
+#define __com_sun_star_packages_XDataSinkEncrSupport_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XInputStream_idl__ 
+#include <com/sun/star/io/XInputStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+
+#ifndef __com_sun_star_packages_WrongPasswordException_idl__ 
+#include <com/sun/star/packages/WrongPasswordException.idl> 
+#endif 
+
+#ifndef __com_sun_star_packages_NoEncryptionException_idl__ 
+#include <com/sun/star/packages/NoEncryptionException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_packages_EncryptionNotAllowedException_idl__ 
+#include <com/sun/star/packages/EncryptionNotAllowedException.idl> 
+#endif 
+
+#ifndef __com_sun_star_packages_NoRawFormatException_idl__ 
+#include <com/sun/star/packages/NoRawFormatException.idl> 
+#endif 
+
+
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module packages {  
+ 
+//============================================================================= 
+ 
 /** Allows to get access to the stream of a <type>PackageStream</type>.
  */
 interface XDataSinkEncrSupport: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** Allows to get access to the data of the PackageStream.
     <p>
         In case stream is encrypted one and the key for the stream is not set,
@@ -84,10 +84,10 @@ interface XDataSinkEncrSupport: com::sun::star::uno::XInterface
      */
     ::com::sun::star::io::XInputStream getDataStream()
         raises( ::com::sun::star::packages::WrongPasswordException,
-                ::com::sun::star::io::IOException );
+                ::com::sun::star::io::IOException ); 
+ 
 
-
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** Allows to get access to the data of the PackageStream as to raw stream.
     In case stream is not encrypted an exception will be thrown.
     <p>
@@ -107,9 +107,9 @@ interface XDataSinkEncrSupport: com::sun::star::uno::XInterface
      */
     ::com::sun::star::io::XInputStream getRawStream()
         raises( ::com::sun::star::packages::NoEncryptionException,
-                ::com::sun::star::io::IOException );
+                ::com::sun::star::io::IOException ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** Allows to set a data stream for the PackageStream.
     <p>
         In case PackageStream is marked as encrypted the data stream will be encrypted on storing.
@@ -122,9 +122,9 @@ interface XDataSinkEncrSupport: com::sun::star::uno::XInterface
         in case of io problems
      */
     void setDataStream( [in] ::com::sun::star::io::XInputStream aStream )
-        raises( ::com::sun::star::io::IOException );
+        raises( ::com::sun::star::io::IOException ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** Allows to set raw stream for the PackageStream.
     The PackageStream object can not be marked as encrypted one,
     an exception will be thrown in such case.
@@ -144,9 +144,9 @@ interface XDataSinkEncrSupport: com::sun::star::uno::XInterface
     void setRawStream( [in] ::com::sun::star::io::XInputStream aStream )
         raises( ::com::sun::star::packages::EncryptionNotAllowedException,
                 ::com::sun::star::packages::NoRawFormatException,
-                ::com::sun::star::io::IOException );
+                ::com::sun::star::io::IOException ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** Allows to get access to the raw data of the stream as it is stored in
         the package.
 
@@ -157,15 +157,15 @@ interface XDataSinkEncrSupport: com::sun::star::uno::XInterface
         in case of io problems during retrieving
      */
     ::com::sun::star::io::XInputStream getPlainRawStream()
-        raises( ::com::sun::star::io::IOException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+        raises( ::com::sun::star::io::IOException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/packages/manifest/XManifestReader.idl b/offapi/com/sun/star/packages/manifest/XManifestReader.idl
index 91f589ee258e..e124f3b8b465 100644
--- a/offapi/com/sun/star/packages/manifest/XManifestReader.idl
+++ b/offapi/com/sun/star/packages/manifest/XManifestReader.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_packages_manifest_XManifestReader_idl__
-#define __com_sun_star_packages_manifest_XManifestReader_idl__
+#ifndef __com_sun_star_packages_manifest_XManifestReader_idl__ 
+#define __com_sun_star_packages_manifest_XManifestReader_idl__ 
 
 #ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
 
 #ifndef __com_sun_star_io_XInputStream_idl__
-#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-//=============================================================================
+#include <com/sun/star/io/XInputStream.idl> 
+#endif 
 
+//============================================================================= 
+ 
 module com {  module sun {  module star {   module packages {  module manifest {
-
-//=============================================================================
+ 
+//============================================================================= 
 /** This interface reads the manifest data from a file. The user
-    must supply an XInputStream when calling readManifestSequence() to recieve
+    must supply an XInputStream when calling readManifestSequence() to recieve 
     a sequence of manifest entries. Each manifest entry is represented by
     a sequence of PropertyValues. */
-//=============================================================================
+//============================================================================= 
 published interface XManifestReader: com::sun::star::uno::XInterface
 {
     /** Supplies the XManifestReader with an XInputStream to read from, reads
         the data and returns it to the caller.
     */
-    sequence < sequence < com::sun::star::beans::PropertyValue > > readManifestSequence( [in] com::sun::star::io::XInputStream rStream );
+    sequence < sequence < com::sun::star::beans::PropertyValue > > readManifestSequence( [in] com::sun::star::io::XInputStream rStream ); 
 };
 }; }; }; }; };
-#endif
+#endif 
diff --git a/offapi/com/sun/star/packages/manifest/XManifestWriter.idl b/offapi/com/sun/star/packages/manifest/XManifestWriter.idl
index c38b9cacaf76..729033f8c628 100644
--- a/offapi/com/sun/star/packages/manifest/XManifestWriter.idl
+++ b/offapi/com/sun/star/packages/manifest/XManifestWriter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_packages_manifest_XManifestWriter_idl__
-#define __com_sun_star_packages_manifest_XManifestWriter_idl__
+#ifndef __com_sun_star_packages_manifest_XManifestWriter_idl__ 
+#define __com_sun_star_packages_manifest_XManifestWriter_idl__ 
 
 #ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
 
 #ifndef __com_sun_star_io_XOutputStream_idl__
-#include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-//=============================================================================
+#include <com/sun/star/io/XOutputStream.idl> 
+#endif 
 
+//============================================================================= 
+ 
 module com {  module sun {  module star {   module packages {  module manifest {
-
+ 
 /** This interface writes the manifest data to a file. The user
     calls writeManifestSequence() with the XOutputStream to write the data to
     and the sequence of manifest entries to be written passed as parameters.
     Each manifest entry is represented by a sequence of PropertyValues.*/
 
-//=============================================================================
+//============================================================================= 
 published interface XManifestWriter: com::sun::star::uno::XInterface
 {
     /** Writes the supplied sequence of manifest entries to the supplied
         XOutputStream
     */
-    void writeManifestSequence([in] com::sun::star::io::XOutputStream rStream,
+    void writeManifestSequence([in] com::sun::star::io::XOutputStream rStream, 
                                [in] sequence < sequence < com::sun::star::beans::PropertyValue > > rSequence );
 };
 }; }; }; }; };
-#endif
+#endif 
diff --git a/offapi/com/sun/star/packages/zip/XZipFileAccess.idl b/offapi/com/sun/star/packages/zip/XZipFileAccess.idl
index 089b2e3a57cf..968174a2fabf 100644
--- a/offapi/com/sun/star/packages/zip/XZipFileAccess.idl
+++ b/offapi/com/sun/star/packages/zip/XZipFileAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,35 +25,35 @@
  *
  ************************************************************************/
 #ifndef __com_sun_star_packages_zip_XZipFileAccess_idl__
-#define __com_sun_star_packages_zip_XZipFileAccess_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_packages_zip_ZipEntry_idl__
-#include <com/sun/star/packages/zip/ZipEntry.idl>
-#endif
+#define __com_sun_star_packages_zip_XZipFileAccess_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_packages_zip_ZipEntry_idl__ 
+#include <com/sun/star/packages/zip/ZipEntry.idl> 
+#endif 
 
 #ifndef __com_sun_star_container_NoSuchElementException_idl_
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
-//=============================================================================
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {   module packages {  module zip {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** allows to get reading access to nonencrypted entries inside zip file.
  */
 interface XZipFileAccess: ::com::sun::star::uno::XInterface
-{
+{ 
     //-------------------------------------------------------------------------
     /** allows to get stream by specifying a pattern.
 
@@ -69,11 +69,11 @@ interface XZipFileAccess: ::com::sun::star::uno::XInterface
         raises( ::com::sun::star::container::NoSuchElementException,
                 ::com::sun::star::io::IOException );
 
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/packages/zip/ZipConstants.idl b/offapi/com/sun/star/packages/zip/ZipConstants.idl
index 1a823a889255..12cccb7e2664 100644
--- a/offapi/com/sun/star/packages/zip/ZipConstants.idl
+++ b/offapi/com/sun/star/packages/zip/ZipConstants.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,25 +26,25 @@
  ************************************************************************/
 #ifndef __com_sun_star_package_zip_ZipConstants_idl__
 #define __com_sun_star_package_zip_ZipConstants_idl__
+ 
 
 
-
-//=============================================================================
-
+//============================================================================= 
+ 
 module com {  module sun {  module star {   module packages {  module zip {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** defines the constants used by the ZIP interfaces.
  */
 published constants ZipConstants
-{
+{ 
     //-------------------------------------------------------------------------
-    /** Compression method for the deflate algorithm (the only one currently
+    /** Compression method for the deflate algorithm (the only one currently 
        supported).
      */
     const short DEFLATED = 8;
-
+    
     //-------------------------------------------------------------------------
     /** Compression level for no compression.
      */
@@ -66,8 +66,8 @@ published constants ZipConstants
     const short DEFAULT_COMPRESSION = -1;
 
     //-------------------------------------------------------------------------
-    /** Compression strategy best used for data consisting mostly of small
-      values with a somewhat random distribution. Forces more Huffman
+    /** Compression strategy best used for data consisting mostly of small 
+      values with a somewhat random distribution. Forces more Huffman 
       coding and less string matching.
      */
     const short FILTERED = 1;
@@ -303,9 +303,9 @@ published constants ZipConstants
      */
     const short ENDCOM = 20;
 
-};
-//=============================================================================
-
+}; 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/packages/zip/ZipEntry.idl b/offapi/com/sun/star/packages/zip/ZipEntry.idl
index f363c3244c41..dc56e177d70c 100644
--- a/offapi/com/sun/star/packages/zip/ZipEntry.idl
+++ b/offapi/com/sun/star/packages/zip/ZipEntry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,36 +25,36 @@
  *
  ************************************************************************/
 #ifndef __com_sun_star_packages_zip_ZipEntry_idl__
-#define __com_sun_star_packages_zip_ZipEntry_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
-#include <com/sun/star/xml/sax/InputSource.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
-//=============================================================================
-
+#define __com_sun_star_packages_zip_ZipEntry_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_InputSource_idl__ 
+#include <com/sun/star/xml/sax/InputSource.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {   module packages {  module zip {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** used to represent a ZIP file entry
-
-
-    <p>This interface is an IDL version of the Java interface
+    
+    
+    <p>This interface is an IDL version of the Java interface 
     <em>java.util.zip.ZipFile</em> with some minor adaptations.</p>
  */
 published struct ZipEntry
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** version needed to extract
      */
     short nVersion;
@@ -102,7 +102,7 @@ published struct ZipEntry
     //-------------------------------------------------------------------------
     /** the entry name
      */
-    string sName;
+    string sName; 
 
     //-------------------------------------------------------------------------
     /** optional extra field data for entry
@@ -113,10 +113,10 @@ published struct ZipEntry
     /** optional comment
      */
     string sComment;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/packages/zip/ZipException.idl b/offapi/com/sun/star/packages/zip/ZipException.idl
index 4e816287ee92..daaad4496641 100644
--- a/offapi/com/sun/star/packages/zip/ZipException.idl
+++ b/offapi/com/sun/star/packages/zip/ZipException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,35 +26,35 @@
  ************************************************************************/
 #ifndef __com_sun_star_packages_zip_ZipException_idl__
 #define __com_sun_star_packages_zip_ZipException_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
-#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-//=============================================================================
-
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XInputStream_idl__ 
+#include <com/sun/star/io/XInputStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {   module packages {  module zip {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** used to indicate that a ZIP exception has occurred.
-    <p>This interface is an IDL version of the Java interface
+    <p>This interface is an IDL version of the Java interface 
     <em>java.util.zip.ZipException</em> with some minor adaptations.</p>
  */
 published exception ZipException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
+{ 
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/packages/zip/ZipFileAccess.idl b/offapi/com/sun/star/packages/zip/ZipFileAccess.idl
index 1f8cd8efb999..896d031b53d6 100644
--- a/offapi/com/sun/star/packages/zip/ZipFileAccess.idl
+++ b/offapi/com/sun/star/packages/zip/ZipFileAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,48 +25,48 @@
  *
  ************************************************************************/
 #ifndef __com_sun_star_packages_zip_ZipFileAccess_idl__
-#define __com_sun_star_packages_zip_ZipFileAccess_idl__
-
-#ifndef __com_sun_star_packages_zip_XZipFileAccess_idl__
-#include <com/sun/star/packages/zip/XZipFileAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
-#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
+#define __com_sun_star_packages_zip_ZipFileAccess_idl__ 
+ 
+#ifndef __com_sun_star_packages_zip_XZipFileAccess_idl__ 
+#include <com/sun/star/packages/zip/XZipFileAccess.idl> 
+#endif 
 
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
+#ifndef __com_sun_star_lang_XInitialization_idl__ 
+#include <com/sun/star/lang/XInitialization.idl> 
+#endif 
 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {   module packages {  module zip {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** allows to get reading access to nonencrypted entries inside zip file.
  */
 service ZipFileAccess
-{
+{ 
     interface XZipFileAccess;
     interface ::com::sun::star::container::XNameAccess;
     interface ::com::sun::star::lang::XInitialization;
     interface ::com::sun::star::lang::XComponent;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/packages/zip/ZipIOException.idl b/offapi/com/sun/star/packages/zip/ZipIOException.idl
index 8d3edaba4466..ad09d8ea4451 100755
--- a/offapi/com/sun/star/packages/zip/ZipIOException.idl
+++ b/offapi/com/sun/star/packages/zip/ZipIOException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,30 +26,30 @@
  ************************************************************************/
 #ifndef __com_sun_star_packages_zip_ZipIOException_idl__
 #define __com_sun_star_packages_zip_ZipIOException_idl__
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-//=============================================================================
-
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {   module packages {  module zip {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** used to indicate that a ZIP exception has occurred.
     usualy can be thrown from XInputStream interface implementations.
-    <p>This interface is an IDL version of the Java interface
+    <p>This interface is an IDL version of the Java interface 
     <em>java.util.zip.ZipException</em> with some minor adaptations.</p>
 
     @since OOo 1.1.2
  */
 published exception ZipIOException: com::sun::star::io::IOException
-{
-};
-
-//=============================================================================
-
+{ 
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-#endif
+ 
+#endif 
diff --git a/offapi/com/sun/star/plugin/PluginDescription.idl b/offapi/com/sun/star/plugin/PluginDescription.idl
index 7c999fddf881..18032dcc0b63 100644
--- a/offapi/com/sun/star/plugin/PluginDescription.idl
+++ b/offapi/com/sun/star/plugin/PluginDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_plugin_PluginDescription_idl__
-#define __com_sun_star_plugin_PluginDescription_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module plugin {
-
-//=============================================================================
-
+#ifndef __com_sun_star_plugin_PluginDescription_idl__ 
+#define __com_sun_star_plugin_PluginDescription_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module plugin {  
+ 
+//============================================================================= 
+ 
 /** Describes a specific plugin.  If there are multiple mimetypes and/or
     extensions, multiple <type>PluginDescription</type>s will be created.
 */
 published struct PluginDescription
 {
     /** the plugin's name (usually the shared object file name) */
-    string PluginName;
+    string PluginName; 
     /** a mimetype for which this plugin should be registered */
-    string Mimetype;
+    string Mimetype; 
     /** the file extension for files the plugin can handle */
-    string Extension;
+    string Extension; 
     /** text description of the plugin */
     string Description;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/plugin/PluginException.idl b/offapi/com/sun/star/plugin/PluginException.idl
index 2101e0b45c4b..78f9a89237a5 100644
--- a/offapi/com/sun/star/plugin/PluginException.idl
+++ b/offapi/com/sun/star/plugin/PluginException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_plugin_PluginException_idl__
-#define __com_sun_star_plugin_PluginException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module plugin {
-
-//=============================================================================
-
+#ifndef __com_sun_star_plugin_PluginException_idl__ 
+#define __com_sun_star_plugin_PluginException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module plugin {  
+ 
+//============================================================================= 
+ 
 /** Indicates that an error occured in an NPN or NPP function call.
 
-    @see XPlugin
-    @see XPluginContext
+    @see XPlugin 
+    @see XPluginContext 
     @see XPluginManager
 */
 published exception PluginException: com::sun::star::uno::Exception
-{
+{ 
     /** original Netscape plugin error code */
     short ErrorCode;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/plugin/PluginManager.idl b/offapi/com/sun/star/plugin/PluginManager.idl
index 36421513e5a3..5f6ef5c6945d 100644
--- a/offapi/com/sun/star/plugin/PluginManager.idl
+++ b/offapi/com/sun/star/plugin/PluginManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_plugin_PluginManager_idl__
-#define __com_sun_star_plugin_PluginManager_idl__
-
-#ifndef __com_sun_star_plugin_XPluginManager_idl__
-#include <com/sun/star/plugin/XPluginManager.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module plugin {
-
-//=============================================================================
-
+#ifndef __com_sun_star_plugin_PluginManager_idl__ 
+#define __com_sun_star_plugin_PluginManager_idl__ 
+ 
+#ifndef __com_sun_star_plugin_XPluginManager_idl__ 
+#include <com/sun/star/plugin/XPluginManager.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module plugin {  
+ 
+//============================================================================= 
+ 
 /** This service manages all recognized Netscape plugins.
 */
 published service PluginManager
 {
-    interface com::sun::star::plugin::XPluginManager;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::plugin::XPluginManager; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/plugin/PluginMode.idl b/offapi/com/sun/star/plugin/PluginMode.idl
index 382727d7de28..0fc6ca0635c8 100644
--- a/offapi/com/sun/star/plugin/PluginMode.idl
+++ b/offapi/com/sun/star/plugin/PluginMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_plugin_PluginMode_idl__
-#define __com_sun_star_plugin_PluginMode_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module plugin {
-
-//=============================================================================
-
+#ifndef __com_sun_star_plugin_PluginMode_idl__ 
+#define __com_sun_star_plugin_PluginMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module plugin {  
+ 
+//============================================================================= 
+ 
 published constants PluginMode
 {
     /** embedded into document */
-    const short EMBED = 1;
+    const short EMBED = 1; 
     /** full size */
     const short FULL = 2;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; };
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/plugin/PluginVariable.idl b/offapi/com/sun/star/plugin/PluginVariable.idl
index 9f57ef636f55..906b03b76c19 100644
--- a/offapi/com/sun/star/plugin/PluginVariable.idl
+++ b/offapi/com/sun/star/plugin/PluginVariable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_plugin_PluginVariable_idl__
-#define __com_sun_star_plugin_PluginVariable_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module plugin {
-
-//=============================================================================
-
+#ifndef __com_sun_star_plugin_PluginVariable_idl__ 
+#define __com_sun_star_plugin_PluginVariable_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module plugin {  
+ 
+//============================================================================= 
+ 
 /** Describes the possible parameters to XPluginContext::getValue.
     It describes what kind of object is requested.
 */
 published enum PluginVariable
-{
+{ 
     /** XPluginContext::getValue will return the XWindow display pointer of
         a display connection (UNIX only)
     */
-    VxDisplay,
-
+    VxDisplay, 
+    
     /** XPluginContext::getValue will return the global Xt application context
         (UNIX only)
     */
     VxtAppContext
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/plugin/XPlugin.idl b/offapi/com/sun/star/plugin/XPlugin.idl
index 0cc1d3214a80..7d823f77967b 100644
--- a/offapi/com/sun/star/plugin/XPlugin.idl
+++ b/offapi/com/sun/star/plugin/XPlugin.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_plugin_XPlugin_idl__
-#define __com_sun_star_plugin_XPlugin_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
-#include <com/sun/star/io/XActiveDataSource.idl>
-#endif
-
-#ifndef __com_sun_star_plugin_PluginException_idl__
-#include <com/sun/star/plugin/PluginException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module plugin {
-
-//=============================================================================
-
+#ifndef __com_sun_star_plugin_XPlugin_idl__ 
+#define __com_sun_star_plugin_XPlugin_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XActiveDataSource_idl__ 
+#include <com/sun/star/io/XActiveDataSource.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_plugin_PluginException_idl__ 
+#include <com/sun/star/plugin/PluginException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module plugin {  
+ 
+//============================================================================= 
+ 
 /** This interface allows the container, e.g. document to control the plugin.
 */
 published interface XPlugin: com::sun::star::uno::XInterface
-{
+{ 
     /** Tells the plugin instance that a new stream is requested.
 
         @param mimetype
@@ -66,17 +66,17 @@ published interface XPlugin: com::sun::star::uno::XInterface
                whether data comes from a file
         @return true upon success
     */
-    boolean provideNewStream( [in] string mimetype,
-             [in] com::sun::star::io::XActiveDataSource aSource,
-             [in] string url,
-             [in] long length,
-             [in] long lastmodified,
-             [in] boolean isfile )
+    boolean provideNewStream( [in] string mimetype, 
+             [in] com::sun::star::io::XActiveDataSource aSource, 
+             [in] string url, 
+             [in] long length, 
+             [in] long lastmodified, 
+             [in] boolean isfile ) 
             raises( com::sun::star::plugin::PluginException );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/plugin/XPluginContext.idl b/offapi/com/sun/star/plugin/XPluginContext.idl
index e70479587a76..221d1575849a 100644
--- a/offapi/com/sun/star/plugin/XPluginContext.idl
+++ b/offapi/com/sun/star/plugin/XPluginContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_plugin_XPluginContext_idl__
-#define __com_sun_star_plugin_XPluginContext_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_plugin_XPlugin_idl__
-#include <com/sun/star/plugin/XPlugin.idl>
-#endif
-
-#ifndef __com_sun_star_plugin_PluginVariable_idl__
-#include <com/sun/star/plugin/PluginVariable.idl>
-#endif
-
-#ifndef __com_sun_star_plugin_PluginException_idl__
-#include <com/sun/star/plugin/PluginException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
-#include <com/sun/star/io/XActiveDataSource.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module plugin {
-
-//=============================================================================
-
-/** Interface receiving calls from a plugin library.
+#ifndef __com_sun_star_plugin_XPluginContext_idl__ 
+#define __com_sun_star_plugin_XPluginContext_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_plugin_XPlugin_idl__ 
+#include <com/sun/star/plugin/XPlugin.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_plugin_PluginVariable_idl__ 
+#include <com/sun/star/plugin/PluginVariable.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_plugin_PluginException_idl__ 
+#include <com/sun/star/plugin/PluginException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XActiveDataSource_idl__ 
+#include <com/sun/star/io/XActiveDataSource.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module plugin {  
+ 
+//============================================================================= 
+ 
+/** Interface receiving calls from a plugin library.	
     A default context can be created using the <type>PluginManager</type>.
 */
 published interface XPluginContext: com::sun::star::uno::XInterface
-{
+{ 
     /** Requests global application parameters like display connection
         on UNIX systems.
 
@@ -72,10 +72,10 @@ published interface XPluginContext: com::sun::star::uno::XInterface
                variable
         @return value
     */
-    string getValue( [in] com::sun::star::plugin::XPlugin xPlugin,
-             [in] com::sun::star::plugin::PluginVariable aVariable )
-            raises( com::sun::star::plugin::PluginException );
-
+    string getValue( [in] com::sun::star::plugin::XPlugin xPlugin, 
+             [in] com::sun::star::plugin::PluginVariable aVariable ) 
+            raises( com::sun::star::plugin::PluginException ); 
+ 
     /** Requests a notification of completion of the operation on an URL.
 
         @param plugin
@@ -87,12 +87,12 @@ published interface XPluginContext: com::sun::star::uno::XInterface
         @param listener
                event listener
     */
-    void getURLNotify( [in] com::sun::star::plugin::XPlugin plugin,
-             [in] string url,
-             [in] string target,
-             [in] com::sun::star::lang::XEventListener listener )
-            raises( com::sun::star::plugin::PluginException );
-
+    void getURLNotify( [in] com::sun::star::plugin::XPlugin plugin, 
+             [in] string url, 
+             [in] string target, 
+             [in] com::sun::star::lang::XEventListener listener ) 
+            raises( com::sun::star::plugin::PluginException ); 
+ 
     /** Requests an URL to be loaded into the frame target.
 
         @param plugin
@@ -102,11 +102,11 @@ published interface XPluginContext: com::sun::star::uno::XInterface
         @param target
                target frame
     */
-    void getURL( [in] com::sun::star::plugin::XPlugin plugin,
-             [in] string url,
-             [in] string target )
-            raises( com::sun::star::plugin::PluginException );
-
+    void getURL( [in] com::sun::star::plugin::XPlugin plugin, 
+             [in] string url, 
+             [in] string target ) 
+            raises( com::sun::star::plugin::PluginException ); 
+ 
     /** Posts data from a buffer or file to an URL and receives a
         notification upon completion.
 
@@ -123,14 +123,14 @@ published interface XPluginContext: com::sun::star::uno::XInterface
         @param listener
                event listener
     */
-    void postURLNotify( [in] com::sun::star::plugin::XPlugin plugin,
-             [in] string url,
-             [in] string target,
-             [in] sequence<byte> buf,
-             [in] boolean file,
-             [in] com::sun::star::lang::XEventListener listener )
-            raises( com::sun::star::plugin::PluginException );
-
+    void postURLNotify( [in] com::sun::star::plugin::XPlugin plugin, 
+             [in] string url, 
+             [in] string target, 
+             [in] sequence<byte> buf, 
+             [in] boolean file, 
+             [in] com::sun::star::lang::XEventListener listener ) 
+            raises( com::sun::star::plugin::PluginException ); 
+ 
     /** Posts data from a buffer or file to an URL.
 
         @param plugin
@@ -144,13 +144,13 @@ published interface XPluginContext: com::sun::star::uno::XInterface
         @param file
                whether data is from file
     */
-    void postURL( [in] com::sun::star::plugin::XPlugin plugin,
-             [in] string url,
-             [in] string target,
-             [in] sequence<byte> buf,
-             [in] boolean file )
-            raises( com::sun::star::plugin::PluginException );
-
+    void postURL( [in] com::sun::star::plugin::XPlugin plugin, 
+             [in] string url, 
+             [in] string target, 
+             [in] sequence<byte> buf, 
+             [in] boolean file ) 
+            raises( com::sun::star::plugin::PluginException ); 
+ 
     /** Requests a new stream that is created by the plugin and consumed
         by the browser.
 
@@ -163,23 +163,23 @@ published interface XPluginContext: com::sun::star::uno::XInterface
         @param aSource
                data source
     */
-    void newStream( [in] com::sun::star::plugin::XPlugin plugin,
-             [in] string mimetype,
-             [in] string target,
-             [in] com::sun::star::io::XActiveDataSource aSource )
-            raises( com::sun::star::plugin::PluginException );
-
+    void newStream( [in] com::sun::star::plugin::XPlugin plugin, 
+             [in] string mimetype, 
+             [in] string target, 
+             [in] com::sun::star::io::XActiveDataSource aSource ) 
+            raises( com::sun::star::plugin::PluginException ); 
+ 
     /** Displays a message in the browser status line.
-
+        
         @param plugin
                plugin
         @param message
                message
     */
-    void displayStatusText( [in] com::sun::star::plugin::XPlugin plugin,
-             [in] string message )
-            raises( com::sun::star::plugin::PluginException );
-
+    void displayStatusText( [in] com::sun::star::plugin::XPlugin plugin, 
+             [in] string message ) 
+            raises( com::sun::star::plugin::PluginException ); 
+ 
     /** Returns an application dependent identification string.
         This is the same string that is transmitted by a browser to an http server.
 
@@ -187,12 +187,12 @@ published interface XPluginContext: com::sun::star::uno::XInterface
                plugin
         @return id
     */
-    string getUserAgent( [in] com::sun::star::plugin::XPlugin plugin )
-            raises( com::sun::star::plugin::PluginException );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string getUserAgent( [in] com::sun::star::plugin::XPlugin plugin ) 
+            raises( com::sun::star::plugin::PluginException ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/plugin/XPluginManager.idl b/offapi/com/sun/star/plugin/XPluginManager.idl
index 56a118bfc97a..62530b00eddf 100644
--- a/offapi/com/sun/star/plugin/XPluginManager.idl
+++ b/offapi/com/sun/star/plugin/XPluginManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,61 +24,61 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_plugin_XPluginManager_idl__
-#define __com_sun_star_plugin_XPluginManager_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_plugin_XPluginContext_idl__
-#include <com/sun/star/plugin/XPluginContext.idl>
-#endif
-
-#ifndef __com_sun_star_plugin_PluginDescription_idl__
-#include <com/sun/star/plugin/PluginDescription.idl>
-#endif
-
-#ifndef __com_sun_star_plugin_XPlugin_idl__
-#include <com/sun/star/plugin/XPlugin.idl>
-#endif
-
-#ifndef __com_sun_star_plugin_PluginException_idl__
-#include <com/sun/star/plugin/PluginException.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XToolkit_idl__
-#include <com/sun/star/awt/XToolkit.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XWindowPeer_idl__
-#include <com/sun/star/awt/XWindowPeer.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module plugin {
-
-//=============================================================================
-
+#ifndef __com_sun_star_plugin_XPluginManager_idl__ 
+#define __com_sun_star_plugin_XPluginManager_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_plugin_XPluginContext_idl__ 
+#include <com/sun/star/plugin/XPluginContext.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_plugin_PluginDescription_idl__ 
+#include <com/sun/star/plugin/PluginDescription.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_plugin_XPlugin_idl__ 
+#include <com/sun/star/plugin/XPlugin.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_plugin_PluginException_idl__ 
+#include <com/sun/star/plugin/PluginException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XToolkit_idl__ 
+#include <com/sun/star/awt/XToolkit.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XWindowPeer_idl__ 
+#include <com/sun/star/awt/XWindowPeer.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module plugin {  
+ 
+//============================================================================= 
+ 
 /** Interface accessing all recognized Netscape plugins.
 */
 published interface XPluginManager: com::sun::star::uno::XInterface
-{
-    /** Creates a default context.  This context depends on the service
+{ 
+    /** Creates a default context.  This context depends on the service 
         <type scope="com::sun::star::frame">Desktop</type>.</p>
-
+        
         @return plugin context
     */
-    com::sun::star::plugin::XPluginContext createPluginContext();
-
+    com::sun::star::plugin::XPluginContext createPluginContext(); 
+    
     /** Returns the descriptions for all recognized plugins.
-
+        
         @return plugin descriptions
     */
-    sequence<com::sun::star::plugin::PluginDescription> getPluginDescriptions();
-
+    sequence<com::sun::star::plugin::PluginDescription> getPluginDescriptions(); 
+ 
     /** Creates a new plugin instance.
 
         @param acontext
@@ -94,15 +94,15 @@ published interface XPluginManager: com::sun::star::uno::XInterface
         @return plugin instance
     */
     com::sun::star::plugin::XPlugin createPlugin(
-        [in] com::sun::star::plugin::XPluginContext acontext,
-        [in] short mode,
-        [in] sequence<string> argn,
-        [in] sequence<string> argv,
-        [in] com::sun::star::plugin::PluginDescription plugintype )
-        raises( com::sun::star::plugin::PluginException );
-
+        [in] com::sun::star::plugin::XPluginContext acontext, 
+        [in] short mode, 
+        [in] sequence<string> argn, 
+        [in] sequence<string> argv, 
+        [in] com::sun::star::plugin::PluginDescription plugintype ) 
+        raises( com::sun::star::plugin::PluginException ); 
+ 
     /** Creates a new plugin instance.
-
+        
         @param acontext
                plugin context
         @param mode
@@ -120,18 +120,18 @@ published interface XPluginManager: com::sun::star::uno::XInterface
         @return plugin instance
     */
     com::sun::star::plugin::XPlugin createPluginFromURL(
-        [in] com::sun::star::plugin::XPluginContext acontext,
-        [in] short mode,
-        [in] sequence<string> argn,
-        [in] sequence<string> argv,
-        [in] com::sun::star::awt::XToolkit toolkit,
-        [in] com::sun::star::awt::XWindowPeer parent,
-        [in] string url );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+        [in] com::sun::star::plugin::XPluginContext acontext, 
+        [in] short mode, 
+        [in] sequence<string> argn, 
+        [in] sequence<string> argv, 
+        [in] com::sun::star::awt::XToolkit toolkit, 
+        [in] com::sun::star::awt::XWindowPeer parent, 
+        [in] string url ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/AnimationEffect.idl b/offapi/com/sun/star/presentation/AnimationEffect.idl
index 8770080783f0..d29ec7fb14e9 100644
--- a/offapi/com/sun/star/presentation/AnimationEffect.idl
+++ b/offapi/com/sun/star/presentation/AnimationEffect.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,921 +24,921 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_AnimationEffect_idl__
-#define __com_sun_star_presentation_AnimationEffect_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_AnimationEffect_idl__ 
+#define __com_sun_star_presentation_AnimationEffect_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::presentation::AnimationEffect
 /** specifies the animation effects for animating
     text or objects.
  */
 published enum AnimationEffect
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  NONE,
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	NONE, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::NONE
     /** use no animation effects.
      */
-    NONE,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_FROM_LEFT,
-
+    NONE, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	FADE_FROM_LEFT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_LEFT
     /** use the animation effect 'Fade from Left'.
      */
-    FADE_FROM_LEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_FROM_TOP,
-
+    FADE_FROM_LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	FADE_FROM_TOP, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_TOP
     /** use the animation effect 'Fade from Top'.
      */
-    FADE_FROM_TOP,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_FROM_RIGHT,
-
+    FADE_FROM_TOP, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	FADE_FROM_RIGHT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_RIGHT
     /** use the animation effect 'Fade from Right'.
      */
-    FADE_FROM_RIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_FROM_BOTTOM,
-
+    FADE_FROM_RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	FADE_FROM_BOTTOM, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_BOTTOM
     /** use the animation effect 'Fade from Bottom'.
      */
-    FADE_FROM_BOTTOM,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_TO_CENTER,
-
+    FADE_FROM_BOTTOM, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	FADE_TO_CENTER, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_TO_CENTER
     /** use the animation effect 'Fade to Center'.
      */
-    FADE_TO_CENTER,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_FROM_CENTER,
-
+    FADE_TO_CENTER, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	FADE_FROM_CENTER, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_CENTER
     /** use the animation effect 'Fade from Center'.
      */
-    FADE_FROM_CENTER,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_FROM_LEFT,
-
+    FADE_FROM_CENTER, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_FROM_LEFT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_LEFT
     /** use the animation effect 'Move from Left'.
      */
-    MOVE_FROM_LEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_FROM_TOP,
-
+    MOVE_FROM_LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_FROM_TOP, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_TOP
     /** use the animation effect 'Move from Top'.
      */
-    MOVE_FROM_TOP,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_FROM_RIGHT,
-
+    MOVE_FROM_TOP, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_FROM_RIGHT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_RIGHT
     /** use the animation effect 'Move from Right'.
      */
-    MOVE_FROM_RIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_FROM_BOTTOM,
-
+    MOVE_FROM_RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_FROM_BOTTOM, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_BOTTOM
     /** use the animation effect 'Move from Bottom'.
      */
-    MOVE_FROM_BOTTOM,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  VERTICAL_STRIPES,
-
+    MOVE_FROM_BOTTOM, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	VERTICAL_STRIPES, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::VERTICAL_STRIPES
     /** use the animation effect 'Vertical Stripes'.
      */
-    VERTICAL_STRIPES,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  HORIZONTAL_STRIPES,
-
+    VERTICAL_STRIPES, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	HORIZONTAL_STRIPES, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::HORIZONTAL_STRIPES
     /** use the animation effect 'Horizontal Stripes'.
      */
-    HORIZONTAL_STRIPES,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  CLOCKWISE,
-
+    HORIZONTAL_STRIPES, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	CLOCKWISE, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::CLOCKWISE
     /** use the animation effect 'Clockwise'.
      */
-    CLOCKWISE,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  COUNTERCLOCKWISE,
-
+    CLOCKWISE, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	COUNTERCLOCKWISE, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::COUNTERCLOCKWISE
     /** use the animation effect 'Counter Clockwise'.
      */
-    COUNTERCLOCKWISE,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_FROM_UPPERLEFT,
-
+    COUNTERCLOCKWISE, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	FADE_FROM_UPPERLEFT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_UPPERLEFT
     /** use the animation effect 'Fade from Upper Left'.
      */
-    FADE_FROM_UPPERLEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_FROM_UPPERRIGHT,
-
+    FADE_FROM_UPPERLEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	FADE_FROM_UPPERRIGHT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_UPPERRIGHT
     /** use the animation effect 'Fade from Upper Right'.
      */
-    FADE_FROM_UPPERRIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_FROM_LOWERLEFT,
-
+    FADE_FROM_UPPERRIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	FADE_FROM_LOWERLEFT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_LOWERLEFT
     /** use the animation effect 'Fade from Lower Left'.
      */
-    FADE_FROM_LOWERLEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  FADE_FROM_LOWERRIGHT,
-
+    FADE_FROM_LOWERLEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	FADE_FROM_LOWERRIGHT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::FADE_FROM_LOWERRIGHT
     /** use the animation effect 'Fade from Lower Right'.
      */
-    FADE_FROM_LOWERRIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  CLOSE_VERTICAL,
-
+    FADE_FROM_LOWERRIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	CLOSE_VERTICAL, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::CLOSE_VERTICAL
     /** use the animation effect 'Close Vertical'.
      */
-    CLOSE_VERTICAL,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  CLOSE_HORIZONTAL,
-
+    CLOSE_VERTICAL, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	CLOSE_HORIZONTAL, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::CLOSE_HORIZONTAL
     /** use the animation effect 'Close Horizontal'.
      */
-    CLOSE_HORIZONTAL,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  OPEN_VERTICAL,
-
+    CLOSE_HORIZONTAL, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	OPEN_VERTICAL, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::OPEN_VERTICAL
     /** use the animation effect 'Open Vertical'.
      */
-    OPEN_VERTICAL,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  OPEN_HORIZONTAL,
-
+    OPEN_VERTICAL, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	OPEN_HORIZONTAL, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::OPEN_HORIZONTAL
     /** use the animation effect 'Open Horizontal'.
      */
-    OPEN_HORIZONTAL,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  PATH,
-
+    OPEN_HORIZONTAL, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	PATH, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::PATH
     /** use the animation effect 'Path'.
      */
-    PATH,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_TO_LEFT,
-
+    PATH, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_TO_LEFT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_LEFT
     /** use the animation effect 'Move to Left'.
      */
-    MOVE_TO_LEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_TO_TOP,
-
+    MOVE_TO_LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_TO_TOP, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_TOP
     /** use the animation effect 'Move to Top'.
      */
-    MOVE_TO_TOP,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_TO_RIGHT,
-
+    MOVE_TO_TOP, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_TO_RIGHT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_RIGHT
     /** use the animation effect 'Move to Right'.
      */
-    MOVE_TO_RIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_TO_BOTTOM,
-
+    MOVE_TO_RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_TO_BOTTOM, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_BOTTOM
     /** use the animation effect 'Move to Bottom'.
      */
-    MOVE_TO_BOTTOM,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  SPIRALIN_LEFT,
-
+    MOVE_TO_BOTTOM, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	SPIRALIN_LEFT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::SPIRALIN_LEFT
     /** use the animation effect 'Spiral Inward Left'.
      */
-    SPIRALIN_LEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  SPIRALIN_RIGHT,
-
+    SPIRALIN_LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	SPIRALIN_RIGHT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::SPIRALIN_RIGHT
     /** use the animation effect 'Spiral Inward Right'.
      */
-    SPIRALIN_RIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  SPIRALOUT_LEFT,
-
+    SPIRALIN_RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	SPIRALOUT_LEFT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::SPIRALOUT_LEFT
     /** use the animation effect 'Spiral Outward Left'.
      */
-    SPIRALOUT_LEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  SPIRALOUT_RIGHT,
-
+    SPIRALOUT_LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	SPIRALOUT_RIGHT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::SPIRALOUT_RIGHT
     /** use the animation effect 'Spiral Outward Right'.
      */
-    SPIRALOUT_RIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  DISSOLVE,
-
+    SPIRALOUT_RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	DISSOLVE, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::DISSOLVE
     /** use the animation effect 'Spiral Inward Left'.
      */
-    DISSOLVE,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  WAVYLINE_FROM_LEFT,
-
+    DISSOLVE, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	WAVYLINE_FROM_LEFT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::WAVYLINE_FROM_LEFT
     /** use the animation effect 'Wavy Line from Left'.
      */
-    WAVYLINE_FROM_LEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  WAVYLINE_FROM_TOP,
-
+    WAVYLINE_FROM_LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	WAVYLINE_FROM_TOP, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::WAVYLINE_FROM_TOP
     /** use the animation effect 'Wavy Line from Top'.
      */
-    WAVYLINE_FROM_TOP,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  WAVYLINE_FROM_RIGHT,
-
+    WAVYLINE_FROM_TOP, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	WAVYLINE_FROM_RIGHT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::WAVYLINE_FROM_RIGHT
     /** use the animation effect 'Wavy Line from Right'.
      */
-    WAVYLINE_FROM_RIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  WAVYLINE_FROM_BOTTOM,
-
+    WAVYLINE_FROM_RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	WAVYLINE_FROM_BOTTOM, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::WAVYLINE_FROM_BOTTOM
     /** use the animation effect 'Wavy Line from Button'.
      */
-    WAVYLINE_FROM_BOTTOM,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  RANDOM,
-
+    WAVYLINE_FROM_BOTTOM, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	RANDOM, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::RANDOM
     /** use the animation effect 'Random'.
      */
-    RANDOM,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  VERTICAL_LINES,
-
+    RANDOM, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	VERTICAL_LINES, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::VERTICAL_LINES
     /** use the animation effect 'Vertical Lines'.
      */
-    VERTICAL_LINES,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  HORIZONTAL_LINES,
-
+    VERTICAL_LINES, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	HORIZONTAL_LINES, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::HORIZONTAL_LINES
     /** use the animation effect 'Horizontal Lines'.
      */
-    HORIZONTAL_LINES,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  LASER_FROM_LEFT,
-
+    HORIZONTAL_LINES, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	LASER_FROM_LEFT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_LEFT
     /** use the animation effect 'Wavy Line from Left'.
      */
-    LASER_FROM_LEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  LASER_FROM_TOP,
-
+    LASER_FROM_LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	LASER_FROM_TOP, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_TOP
     /** use the animation effect 'Laser from Top'.
      */
-    LASER_FROM_TOP,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  LASER_FROM_RIGHT,
-
+    LASER_FROM_TOP, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	LASER_FROM_RIGHT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_RIGHT
     /** use the animation effect 'Laser from Right'.
      */
-    LASER_FROM_RIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  LASER_FROM_BOTTOM,
-
+    LASER_FROM_RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	LASER_FROM_BOTTOM, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_BOTTOM
     /** use the animation effect 'Laser from Bottom'.
      */
-    LASER_FROM_BOTTOM,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  LASER_FROM_UPPERLEFT,
-
+    LASER_FROM_BOTTOM, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	LASER_FROM_UPPERLEFT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_UPPERLEFT
     /** use the animation effect 'Laser from Upper Left'.
      */
-    LASER_FROM_UPPERLEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  LASER_FROM_UPPERRIGHT,
-
+    LASER_FROM_UPPERLEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	LASER_FROM_UPPERRIGHT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_UPPERRIGHT
     /** use the animation effect 'Laser from Upper Right'.
      */
-    LASER_FROM_UPPERRIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  LASER_FROM_LOWERLEFT,
-
+    LASER_FROM_UPPERRIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	LASER_FROM_LOWERLEFT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_LOWERLEFT
     /** use the animation effect 'Laser from Lower Left'.
      */
-    LASER_FROM_LOWERLEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  LASER_FROM_LOWERRIGHT,
-
+    LASER_FROM_LOWERLEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	LASER_FROM_LOWERRIGHT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::LASER_FROM_LOWERRIGHT
     /** use the animation effect 'Laser from Lower Right'.
      */
-    LASER_FROM_LOWERRIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  APPEAR,
-
+    LASER_FROM_LOWERRIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	APPEAR, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::APPEAR
     /** use the animation effect 'Appear'.
      */
-    APPEAR,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  HIDE
-
+    APPEAR, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	HIDE 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::HIDE
     /** use the animation effect 'Hide'.
      */
     HIDE,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_FROM_UPPERLEFT,
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_FROM_UPPERLEFT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_UPPERLEFT
     /** use the animation effect 'Move from Upper Left'.
      */
-    MOVE_FROM_UPPERLEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_FROM_UPPERRIGHT,
-
+    MOVE_FROM_UPPERLEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_FROM_UPPERRIGHT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_UPPERRIGHT
     /** use the animation effect 'Move from Upper Right'.
      */
-    MOVE_FROM_UPPERRIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_FROM_LOWERRIGHT,
-
+    MOVE_FROM_UPPERRIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_FROM_LOWERRIGHT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_LOWERRIGHT
     /** use the animation effect 'Move from Lower Right'.
      */
-    MOVE_FROM_LOWERRIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_FROM_LOWERLEFT,
-
+    MOVE_FROM_LOWERRIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_FROM_LOWERLEFT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_FROM_LOWERLEFT
     /** use the animation effect 'Move from Lower Left'.
      */
-    MOVE_FROM_LOWERLEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_TO_UPPERLEFT,
+    MOVE_FROM_LOWERLEFT, 
 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_TO_UPPERLEFT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_UPPERLEFT
     /** use the animation effect 'Move to Upper Left'.
      */
-    MOVE_TO_UPPERLEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_TO_UPPERRIGHT,
-
+    MOVE_TO_UPPERLEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_TO_UPPERRIGHT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_UPPERRIGHT
     /** use the animation effect 'Move to Upper Right'.
      */
-    MOVE_TO_UPPERRIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_TO_LOWERRIGHT,
-
+    MOVE_TO_UPPERRIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_TO_LOWERRIGHT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_LOWERRIGHT
     /** use the animation effect 'Move to Lower Right'.
      */
-    MOVE_TO_LOWERRIGHT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_TO_LOWERLEFT,
-
+    MOVE_TO_LOWERRIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_TO_LOWERLEFT, 
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_TO_LOWERLEFT
     /** use the animation effect 'Move to Lower Left'.
      */
-    MOVE_TO_LOWERLEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_FROM_LEFT
+    MOVE_TO_LOWERLEFT, 
 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_SHORT_FROM_LEFT
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_LEFT
     /** use the animation effect 'Move Short from Left'.
      */
     MOVE_SHORT_FROM_LEFT,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_FROM_UPPERLEFT
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_SHORT_FROM_UPPERLEFT
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_UPPERLEFT
     /** use the animation effect 'Move Short from Upper Left'.
      */
     MOVE_SHORT_FROM_UPPERLEFT,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_FROM_TOP
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_SHORT_FROM_TOP
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_TOP
     /** use the animation effect 'Move Short from Top'.
      */
     MOVE_SHORT_FROM_TOP,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_FROM_UPPERRIGHT
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_SHORT_FROM_UPPERRIGHT
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_UPPERRIGHT
     /** use the animation effect 'Move Short from Upper Right'.
      */
     MOVE_SHORT_FROM_UPPERRIGHT,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_FROM_RIGHT
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_SHORT_FROM_RIGHT
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_RIGHT
     /** use the animation effect 'Move Short from Right'.
      */
     MOVE_SHORT_FROM_RIGHT,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_FROM_LOWERRIGHT
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_SHORT_FROM_LOWERRIGHT
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_LOWERRIGHT
     /** use the animation effect 'Move Short from Lower Right'.
      */
     MOVE_SHORT_FROM_LOWERRIGHT,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_FROM_BOTTOM
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_SHORT_FROM_BOTTOM
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_BOTTOM
     /** use the animation effect 'Move Short from Bottom'.
      */
     MOVE_SHORT_FROM_BOTTOM,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_FROM_LOWERLEFT
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_SHORT_FROM_LOWERLEFT
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_FROM_LOWERLEFT
     /** use the animation effect 'Move Short from Lower Left'.
      */
     MOVE_SHORT_FROM_LOWERLEFT,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_TO_LEFT
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_SHORT_TO_LEFT
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_LEFT
     /** use the animation effect 'Move Short to Left'.
      */
     MOVE_SHORT_TO_LEFT,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_TO_UPPERLEFT
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_SHORT_TO_UPPERLEFT
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_UPPERLEFT
     /** use the animation effect 'Move Short to Upper Left'.
      */
     MOVE_SHORT_TO_UPPERLEFT,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_TO_TOP
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_SHORT_TO_TOP
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_TOP
     /** use the animation effect 'Move Short to Top'.
      */
     MOVE_SHORT_TO_TOP,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_TO_UPPERRIGHT
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_SHORT_TO_UPPERRIGHT
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_UPPERRIGHT
     /** use the animation effect 'Move Short to Upper Right'.
      */
     MOVE_SHORT_TO_UPPERRIGHT,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_TO_RIGHT
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_SHORT_TO_RIGHT
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_RIGHT
     /** use the animation effect 'Move Short to Right'.
      */
     MOVE_SHORT_TO_RIGHT,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_TO_LOWERRIGHT
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_SHORT_TO_LOWERRIGHT
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_LOWERRIGHT
     /** use the animation effect 'Move Short to Lower Right'.
      */
     MOVE_SHORT_TO_LOWERRIGHT,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_TO_BOTTOM
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_SHORT_TO_BOTTOM
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_BOTTOM
     /** use the animation effect 'Move Short to Bottom'.
      */
     MOVE_SHORT_TO_BOTTOM,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  MOVE_SHORT_TO_LOWERLEFT
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	MOVE_SHORT_TO_LOWERLEFT
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::MOVE_SHORT_TO_LOWERLEFT
     /** use the animation effect 'Move Short to Lower Left'.
      */
     MOVE_SHORT_TO_LOWERLEFT,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  VERTICAL_CHECKERBOARD
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	VERTICAL_CHECKERBOARD
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::VERTICAL_CHECKERBOARD
     /** use the animation effect 'Vertical Checkerboard'.
      */
     VERTICAL_CHECKERBOARD,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  HORIZONTAL_CHECKERBOARD
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	HORIZONTAL_CHECKERBOARD
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::HORIZONTAL_CHECKERBOARD
     /** use the animation effect 'Horizontal Checkerboard'.
      */
     HORIZONTAL_CHECKERBOARD,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  HORIZONTAL_ROTATE
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	HORIZONTAL_ROTATE
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::HORIZONTAL_ROTATE
     /** use the animation effect 'Horizontal Rotate'.
      */
     HORIZONTAL_ROTATE,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  VERTICAL_ROTATE
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	VERTICAL_ROTATE
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::VERTICAL_ROTATE
     /** use the animation effect 'Vertical Rotate'.
      */
     VERTICAL_ROTATE,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  HORIZONTAL_STRETCH
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	HORIZONTAL_STRETCH
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::HORIZONTAL_STRETCH
     /** use the animation effect 'Horizontal Stretch'.
      */
     HORIZONTAL_STRETCH,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  VERTICAL_STRETCH
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	VERTICAL_STRETCH
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::VERTICAL_STRETCH
     /** use the animation effect 'Vertical Stretch'.
      */
     VERTICAL_STRETCH,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  STRETCH_FROM_LEFT
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	STRETCH_FROM_LEFT
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_LEFT
     /** use the animation effect 'Stretch From Left'.
      */
     STRETCH_FROM_LEFT,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  STRETCH_FROM_UPPERLEFT
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	STRETCH_FROM_UPPERLEFT
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_UPPERLEFT
     /** use the animation effect 'Stretch From Upper Left'.
      */
     STRETCH_FROM_UPPERLEFT,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  STRETCH_FROM_TOP
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	STRETCH_FROM_TOP
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_TOP
     /** use the animation effect 'Stretch From Top'.
      */
     STRETCH_FROM_TOP,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  STRETCH_FROM_UPPERRIGHT
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	STRETCH_FROM_UPPERRIGHT
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_UPPERRIGHT
     /** use the animation effect 'Stretch From Upper Right'.
      */
     STRETCH_FROM_UPPERRIGHT,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  STRETCH_FROM_RIGHT
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	STRETCH_FROM_RIGHT
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_RIGHT
     /** use the animation effect 'Stretch From Right'.
      */
     STRETCH_FROM_RIGHT,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  STRETCH_FROM_LOWERRIGHT
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	STRETCH_FROM_LOWERRIGHT
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_LOWERRIGHT
     /** use the animation effect 'Stretch From Lower Right'.
      */
     STRETCH_FROM_LOWERRIGHT,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  STRETCH_FROM_BOTTOM
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	STRETCH_FROM_BOTTOM
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_BOTTOM
     /** use the animation effect 'Stretch From Bottom'.
      */
     STRETCH_FROM_BOTTOM,
 
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR AnimationEffect::  STRETCH_FROM_LOWERLEFT
-
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR AnimationEffect::	STRETCH_FROM_LOWERLEFT
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::STRETCH_FROM_LOWERLEFT
     /** use the animation effect 'Stretch From Lower Left'.
      */
     STRETCH_FROM_LOWERLEFT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN
     /** use the animation effect 'Zoom In'.
      */
     ZOOM_IN,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_SMALL
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_SMALL
     /** use the animation effect 'Zoom In Small'.
      */
     ZOOM_IN_SMALL,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_SPIRAL
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_SPIRAL
     /** use the animation effect 'Zoom In Spiral'.
      */
     ZOOM_IN_SPIRAL,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT
     /** use the animation effect 'Zoom Out'.
      */
     ZOOM_OUT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_SMALL
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_SMALL
     /** use the animation effect 'Zoom Out Small'.
      */
     ZOOM_OUT_SMALL,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_SPIRAL
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_SPIRAL
     /** use the animation effect 'Zoom Out Spiral'.
      */
     ZOOM_OUT_SPIRAL,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_LEFT
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_LEFT
     /** use the animation effect 'Zoom In From Left'.
      */
     ZOOM_IN_FROM_LEFT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_UPPERLEFT
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_UPPERLEFT
     /** use the animation effect 'Zoom In From Upper Left'.
      */
     ZOOM_IN_FROM_UPPERLEFT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_TOP
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_TOP
     /** use the animation effect 'Zoom In From Top'.
      */
     ZOOM_IN_FROM_TOP,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_UPPERRIGHT
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_UPPERRIGHT
     /** use the animation effect 'Zoom In From Upper Right'.
      */
     ZOOM_IN_FROM_UPPERRIGHT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_RIGHT
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_RIGHT
     /** use the animation effect 'Zoom In From Right'.
      */
     ZOOM_IN_FROM_RIGHT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_LOWERRIGHT
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_LOWERRIGHT
     /** use the animation effect 'Zoom In From Lower Right'.
      */
     ZOOM_IN_FROM_LOWERRIGHT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_BOTTOM
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_BOTTOM
     /** use the animation effect 'Zoom In From Bottom'.
      */
     ZOOM_IN_FROM_BOTTOM,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_LOWERLEFT
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_LOWERLEFT
     /** use the animation effect 'Zoom In From Lower Left'.
      */
     ZOOM_IN_FROM_LOWERLEFT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_IN_FROM_CENTER
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_IN_FROM_CENTER
     /** use the animation effect 'Zoom In From Center'.
      */
     ZOOM_IN_FROM_CENTER,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_LEFT
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_LEFT
     /** use the animation effect 'Zoom Out From Left'.
      */
     ZOOM_OUT_FROM_LEFT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_UPPERLEFT
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_UPPERLEFT
     /** use the animation effect 'Zoom Out From Upper Left'.
      */
     ZOOM_OUT_FROM_UPPERLEFT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_TOP
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_TOP
     /** use the animation effect 'Zoom Out From Top'.
      */
     ZOOM_OUT_FROM_TOP,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_UPPERRIGHT
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_UPPERRIGHT
     /** use the animation effect 'Zoom Out From Upper Right'.
      */
     ZOOM_OUT_FROM_UPPERRIGHT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_RIGHT
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_RIGHT
     /** use the animation effect 'Zoom Out From Right'.
      */
     ZOOM_OUT_FROM_RIGHT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_LOWERRIGHT
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_LOWERRIGHT
     /** use the animation effect 'Zoom Out From Lower Right'.
      */
     ZOOM_OUT_FROM_LOWERRIGHT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_BOTTOM
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_BOTTOM
     /** use the animation effect 'Zoom Out From Bottom'.
      */
     ZOOM_OUT_FROM_BOTTOM,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_LOWERLEFT
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_LOWERLEFT
     /** use the animation effect 'Zoom Out From Lower Left'.
      */
     ZOOM_OUT_FROM_LOWERLEFT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // DOCUMENTATION OMITTED FOR AnimationEffect:: ZOOM_OUT_FROM_CENTER
-
+    
     // DocMerge from xml: value com::sun::star::presentation::AnimationEffect::ZOOM_OUT_FROM_CENTER
     /** use the animation effect 'Zoom Out From Center'.
      */
     ZOOM_OUT_FROM_CENTER
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/AnimationSpeed.idl b/offapi/com/sun/star/presentation/AnimationSpeed.idl
index dd309319e71e..8e95c5239468 100644
--- a/offapi/com/sun/star/presentation/AnimationSpeed.idl
+++ b/offapi/com/sun/star/presentation/AnimationSpeed.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_AnimationSpeed_idl__
-#define __com_sun_star_presentation_AnimationSpeed_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_AnimationSpeed_idl__ 
+#define __com_sun_star_presentation_AnimationSpeed_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** specifies the speed values of animation/fade effects.
  */
 published enum AnimationSpeed
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** set the speed from the animation/fade to slow.
      */
-    SLOW,
-
-    //-------------------------------------------------------------------------
+    SLOW, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** set the speed from the animation/fade to medium.
      */
-    MEDIUM,
-
-    //-------------------------------------------------------------------------
+    MEDIUM, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** set the speed from the animation/fade to fast.
      */
-    FAST
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    FAST 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/ChartShape.idl b/offapi/com/sun/star/presentation/ChartShape.idl
index 440e28df51b8..14baceb26c6e 100644
--- a/offapi/com/sun/star/presentation/ChartShape.idl
+++ b/offapi/com/sun/star/presentation/ChartShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_ChartShape_idl__
-#define __com_sun_star_presentation_ChartShape_idl__
-
-#ifndef __com_sun_star_presentation_Shape_idl__
-#include <com/sun/star/presentation/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_OLE2Shape_idl__
-#include <com/sun/star/drawing/OLE2Shape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_ChartShape_idl__ 
+#define __com_sun_star_presentation_ChartShape_idl__ 
+ 
+#ifndef __com_sun_star_presentation_Shape_idl__ 
+#include <com/sun/star/presentation/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_OLE2Shape_idl__ 
+#include <com/sun/star/drawing/OLE2Shape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This service is implemented by the chart presentation shape.
 
     <p>Presentation shapes can be used in a presentation
@@ -49,14 +49,14 @@
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 published service ChartShape
-{
-    service com::sun::star::presentation::Shape;
-
-    service com::sun::star::drawing::OLE2Shape;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::presentation::Shape; 
+    
+    service com::sun::star::drawing::OLE2Shape; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/ClickAction.idl b/offapi/com/sun/star/presentation/ClickAction.idl
index 3ad4d4b5c0d5..22696de9489d 100644
--- a/offapi/com/sun/star/presentation/ClickAction.idl
+++ b/offapi/com/sun/star/presentation/ClickAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,109 +24,109 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_ClickAction_idl__
-#define __com_sun_star_presentation_ClickAction_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
-/** This enumeration specifies the actions which can be processed when
+#ifndef __com_sun_star_presentation_ClickAction_idl__ 
+#define __com_sun_star_presentation_ClickAction_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
+/** This enumeration specifies the actions which can be processed when 
     a user clicks on an object.
  */
 published enum ClickAction
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** No action is performed on click.
      */
-    NONE,
-
-    //-------------------------------------------------------------------------
-
+    NONE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The presentation jumps to the previous page.
      */
-    PREVPAGE,
-
-    //-------------------------------------------------------------------------
-
+    PREVPAGE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The presentation jumps to the next page.
      */
-    NEXTPAGE,
-
-    //-------------------------------------------------------------------------
-
+    NEXTPAGE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The presentation continues with the first page.
      */
-    FIRSTPAGE,
-
-    //-------------------------------------------------------------------------
-
+    FIRSTPAGE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The presentation continues with the last page.
      */
-    LASTPAGE,
-
-    //-------------------------------------------------------------------------
-
+    LASTPAGE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The presentation jumps to a bookmark.
      */
-    BOOKMARK,
-
-    //-------------------------------------------------------------------------
-
+    BOOKMARK, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The presentation jumps to another document.
      */
-    DOCUMENT,
-
-    //-------------------------------------------------------------------------
-
+    DOCUMENT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The object renders itself invisible after a click.
      */
-    INVISIBLE,
-
-    //-------------------------------------------------------------------------
-
+    INVISIBLE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** A sound is played after a click.
      */
-    SOUND,
-
-    //-------------------------------------------------------------------------
-
+    SOUND, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** An ole verb is performed on this object.
      */
-    VERB,
-
-    //-------------------------------------------------------------------------
-
+    VERB, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The object vanishes with its effect.
      */
-    VANISH,
-
-    //-------------------------------------------------------------------------
-
+    VANISH, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Another program is executed after a click.
      */
-    PROGRAM,
-
-    //-------------------------------------------------------------------------
-
+    PROGRAM, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** A star basic macro is executed after the click.
      */
-    MACRO,
-
-    //-------------------------------------------------------------------------
-
+    MACRO, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The presentation is stopped after the click.
      */
-    STOPPRESENTATION
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    STOPPRESENTATION 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/CustomPresentation.idl b/offapi/com/sun/star/presentation/CustomPresentation.idl
index 68bd79aede66..9194b88b813c 100644
--- a/offapi/com/sun/star/presentation/CustomPresentation.idl
+++ b/offapi/com/sun/star/presentation/CustomPresentation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_CustomPresentation_idl__
-#define __com_sun_star_presentation_CustomPresentation_idl__
-
-#ifndef __com_sun_star_container_XIndexContainer_idl__
-#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
-#include <com/sun/star/container/XNamed.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_CustomPresentation_idl__ 
+#define __com_sun_star_presentation_CustomPresentation_idl__ 
+ 
+#ifndef __com_sun_star_container_XIndexContainer_idl__ 
+#include <com/sun/star/container/XIndexContainer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNamed_idl__ 
+#include <com/sun/star/container/XNamed.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** A custom presentation can show the pages of its presentation in a
     customized order.
-
-    <p>Such a presentation can use certain pages more than once,
+    
+    <p>Such a presentation can use certain pages more than once, 
     but it does not necessarily use all of the pages.</p>
  */
 published service CustomPresentation
-{
-    /** This is the container of the names of pages in this customized
+{ 
+    /** This is the container of the names of pages in this customized 
                 presentation.
      */
-    interface com::sun::star::container::XIndexContainer;
-
+    interface com::sun::star::container::XIndexContainer; 
+ 
     /** This gives you access to the name of this customized presentation.
      */
-    interface com::sun::star::container::XNamed;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::container::XNamed; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/CustomPresentationAccess.idl b/offapi/com/sun/star/presentation/CustomPresentationAccess.idl
index fe23098bfd36..5c6c05ea6907 100644
--- a/offapi/com/sun/star/presentation/CustomPresentationAccess.idl
+++ b/offapi/com/sun/star/presentation/CustomPresentationAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_CustomPresentationAccess_idl__
-#define __com_sun_star_presentation_CustomPresentationAccess_idl__
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
-#include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_CustomPresentationAccess_idl__ 
+#define __com_sun_star_presentation_CustomPresentationAccess_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#include <com/sun/star/container/XNameContainer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__ 
+#include <com/sun/star/lang/XSingleServiceFactory.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This is a container for custom presentations.
  */
 published service CustomPresentationAccess
-{
-    /** This is the container of the custom presentations.
-
-        <p>Each instance in this container implements the service
-        <type>CustomPresentation</type>.
-        <p>The methods insertByName and replaceByName both replace
+{ 
+    /** This is the container of the custom presentations. 
+                 
+        <p>Each instance in this container implements the service  
+        <type>CustomPresentation</type>. 
+        <p>The methods insertByName and replaceByName both replace 
         the name of the given <type>CustomPresentation</type>
      */
-    interface com::sun::star::container::XNameContainer;
-
-    /** This interface lets you create empty instances of
-                the service <type>CustomPresentation</type>.
+    interface com::sun::star::container::XNameContainer; 
+ 
+    /** This interface lets you create empty instances of 
+                the service <type>CustomPresentation</type>. 
 
-        <p>These services are needed for the <code>insertByName</code>
-        and <code>replaceByName</code> methods of this service
+        <p>These services are needed for the <code>insertByName</code> 
+        and <code>replaceByName</code> methods of this service 
         <type scope="com::sun::star::container">XNameContainer</type> interface.
      */
-    interface com::sun::star::lang::XSingleServiceFactory;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::lang::XSingleServiceFactory; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/DateTimeShape.idl b/offapi/com/sun/star/presentation/DateTimeShape.idl
index c4d68dd3a5b5..4a712553fdc1 100644
--- a/offapi/com/sun/star/presentation/DateTimeShape.idl
+++ b/offapi/com/sun/star/presentation/DateTimeShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_DateTimeShape_idl__
-#define __com_sun_star_presentation_DateTimeShape_idl__
-
-#ifndef __com_sun_star_presentation_Shape_idl__
-#include <com/sun/star/presentation/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextShape_idl__
-#include <com/sun/star/drawing/TextShape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_DateTimeShape_idl__ 
+#define __com_sun_star_presentation_DateTimeShape_idl__ 
+ 
+#ifndef __com_sun_star_presentation_Shape_idl__ 
+#include <com/sun/star/presentation/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_TextShape_idl__ 
+#include <com/sun/star/drawing/TextShape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This service is implemented by the date and time presentation shape.
 
     <p>Presentation shapes can be used in a presentation
@@ -49,14 +49,14 @@
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 service DateTimeShape
-{
-    service com::sun::star::presentation::Shape;
-
-    service com::sun::star::drawing::TextShape;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::presentation::Shape; 
+    
+    service com::sun::star::drawing::TextShape;  
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/DocumentSettings.idl b/offapi/com/sun/star/presentation/DocumentSettings.idl
index c97d205cf3ef..863a9161ee6f 100644
--- a/offapi/com/sun/star/presentation/DocumentSettings.idl
+++ b/offapi/com/sun/star/presentation/DocumentSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -107,7 +107,7 @@ published service DocumentSettings
     /** If this is true, the distance between two paragraphs is
         the sum of ParaTopMargin of the previous and ParaBottomMargin of
         the next paragraph. If false, only the greater of the two is
-        choosen.
+        choosen. 
      */
     [optional, property] boolean ParagraphSummation;
 
diff --git a/offapi/com/sun/star/presentation/DrawPage.idl b/offapi/com/sun/star/presentation/DrawPage.idl
index c939ae0267c3..3715a84155cd 100644
--- a/offapi/com/sun/star/presentation/DrawPage.idl
+++ b/offapi/com/sun/star/presentation/DrawPage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,84 +24,84 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_DrawPage_idl__
-#define __com_sun_star_presentation_DrawPage_idl__
-
-#ifndef __com_sun_star_drawing_DrawPage_idl__
-#include <com/sun/star/drawing/DrawPage.idl>
-#endif
-
-#ifndef __com_sun_star_document_LinkTarget_idl__
-#include <com/sun/star/document/LinkTarget.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_FadeEffect_idl__
-#include <com/sun/star/presentation/FadeEffect.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_AnimationSpeed_idl__
-#include <com/sun/star/presentation/AnimationSpeed.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
-/** This is the service provided by a <type scope="com::sun::star::drawing">DrawPage</type> inside a
+#ifndef __com_sun_star_presentation_DrawPage_idl__ 
+#define __com_sun_star_presentation_DrawPage_idl__ 
+ 
+#ifndef __com_sun_star_drawing_DrawPage_idl__ 
+#include <com/sun/star/drawing/DrawPage.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_document_LinkTarget_idl__ 
+#include <com/sun/star/document/LinkTarget.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_presentation_FadeEffect_idl__ 
+#include <com/sun/star/presentation/FadeEffect.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_presentation_AnimationSpeed_idl__ 
+#include <com/sun/star/presentation/AnimationSpeed.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
+/** This is the service provided by a <type scope="com::sun::star::drawing">DrawPage</type> inside a 
     <type>PresentationDocument</type>.
-
+    
     @see PresentationDocument
  */
 published service DrawPage
-{
-    service com::sun::star::drawing::DrawPage;
-
+{ 
+    service com::sun::star::drawing::DrawPage; 
+ 
     /** Every page is a link target inside the document object model.
      */
-    service com::sun::star::document::LinkTarget;
-
-    //-------------------------------------------------------------------------
-
+    service com::sun::star::document::LinkTarget; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies how the page change is triggered.
-
-        <p>If this is 0, the user must click to start each object animation
+        
+        <p>If this is 0, the user must click to start each object animation 
         and to change the page.  If set to 1, the page is
         automatically switched.  If it is set to 2, all object effects run
         automatically, but the user has to click on the page to change it.</p>
      */
-    [property] long Change;
-
-    //-------------------------------------------------------------------------
-
-    /** If the property <member scope="com::sun::star::drawing">DrawPage::Change</member> is set to 1,
-        this is the time in seconds this page is shown before switching
+    [property] long Change; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** If the property <member scope="com::sun::star::drawing">DrawPage::Change</member> is set to 1, 
+        this is the time in seconds this page is shown before switching 
         to the next page.
      */
-    [property] long Duration;
-
-    //-------------------------------------------------------------------------
-
+    [property] long Duration; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the effect that is used to fade in this page.
      */
-    [property] com::sun::star::presentation::FadeEffect Effect;
-
-    //-------------------------------------------------------------------------
-
-    /** If this property is not ZERO, this number specifies a presentation
+    [property] com::sun::star::presentation::FadeEffect Effect; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** If this property is not ZERO, this number specifies a presentation 
         layout for this page.
      */
-    [property] short Layout;
-
-    //-------------------------------------------------------------------------
-
+    [property] short Layout; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** defines the speed of the fade-in effect of this page.
      */
-    [property] com::sun::star::presentation::AnimationSpeed Speed;
+    [property] com::sun::star::presentation::AnimationSpeed Speed; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** defines if a header presentation shape from the master page is visible
         on this page.
@@ -109,14 +109,14 @@ published service DrawPage
 
     [optional, property] boolean IsHeaderVisible;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** defines the text that is displayd in a header textfield rendered on this
         page.
     */
     [optional, property] string HeaderText;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** defines if a footer presentation shape from the master page is visible
         on this page.
@@ -124,14 +124,14 @@ published service DrawPage
 
     [optional, property] boolean IsFooterVisible;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** defines the text that is displayd in a footer textfield rendered on this
         page.
     */
     [optional, property] string FooterText;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** defines if a page number presentation shape from the master page is visible
         on this page.
@@ -139,7 +139,7 @@ published service DrawPage
 
     [optional, property] boolean IsPageNumberVisible;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** defines if a date and time presentation shape from the master page is visible
         on this page.
@@ -147,7 +147,7 @@ published service DrawPage
 
     [optional, property] boolean IsDateTimeVisible;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** defines if a date and time text field shows a fixed string value or the
         current date on this page.
@@ -155,23 +155,23 @@ published service DrawPage
 
     [optional, property] boolean IsDateTimeFixed;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** defines the text that is displayd in a date and time textfield rendered on this
         page. This value is only used if <code>IsDateTimeFixed</code> is <true/>.
     */
     [optional, property] string DateTimeText;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** defines the format that is used to format a date and time text field on
         this page. This is only used if <code>IsDateTimeFixed</code> is <false/>.
     */
     [optional, property] long DateTimeFormat;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/EffectCommands.idl b/offapi/com/sun/star/presentation/EffectCommands.idl
index dbb5917a756f..e2e84f91ac75 100644
--- a/offapi/com/sun/star/presentation/EffectCommands.idl
+++ b/offapi/com/sun/star/presentation/EffectCommands.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_EffectCommands_idl__
-#define __com_sun_star_presentation_EffectCommands_idl__
-
-//=============================================================================
+#ifndef __com_sun_star_presentation_EffectCommands_idl__ 
+#define __com_sun_star_presentation_EffectCommands_idl__ 
 
- module com {  module sun {  module star {  module presentation {
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
 
-//=============================================================================
-
-/**
+/** 
     @see ::com::sun::star::animations::XCommand
 */
 constants EffectCommands
@@ -69,8 +69,8 @@ constants EffectCommands
     const short STOPAUDIO = 5;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/presentation/EffectNodeType.idl b/offapi/com/sun/star/presentation/EffectNodeType.idl
index 27776d66802a..219ca4e9e2cc 100644
--- a/offapi/com/sun/star/presentation/EffectNodeType.idl
+++ b/offapi/com/sun/star/presentation/EffectNodeType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_EffectNodeType_idl__
-#define __com_sun_star_presentation_EffectNodeType_idl__
-
-//=============================================================================
+#ifndef __com_sun_star_presentation_EffectNodeType_idl__ 
+#define __com_sun_star_presentation_EffectNodeType_idl__ 
 
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
 
 /** This constants defines a type for an animation effect node.
     <br>
@@ -74,8 +74,8 @@ constants EffectNodeType
     const short INTERACTIVE_SEQUENCE = 6;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/presentation/EffectPresetClass.idl b/offapi/com/sun/star/presentation/EffectPresetClass.idl
index e648a17fcb16..f98675ff502e 100644
--- a/offapi/com/sun/star/presentation/EffectPresetClass.idl
+++ b/offapi/com/sun/star/presentation/EffectPresetClass.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_EffectPresetClass_idl__
-#define __com_sun_star_presentation_EffectPresetClass_idl__
-
-//=============================================================================
+#ifndef __com_sun_star_presentation_EffectPresetClass_idl__ 
+#define __com_sun_star_presentation_EffectPresetClass_idl__ 
 
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
 
 /** This constants defines a the class for a preset animation effect.
     <br>
@@ -74,8 +74,8 @@ constants EffectPresetClass
     const short MEDIACALL = 6;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/presentation/FadeEffect.idl b/offapi/com/sun/star/presentation/FadeEffect.idl
index 08cc018e1084..428799b14378 100644
--- a/offapi/com/sun/star/presentation/FadeEffect.idl
+++ b/offapi/com/sun/star/presentation/FadeEffect.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,365 +24,365 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_FadeEffect_idl__
-#define __com_sun_star_presentation_FadeEffect_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_FadeEffect_idl__ 
+#define __com_sun_star_presentation_FadeEffect_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** specifies the fade effects to fade one page into another.
  */
 published enum FadeEffect
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+    
     /** use no fade effects.
      */
-    NONE,
-
-    //-------------------------------------------------------------------------
+    NONE, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Fade from Left'.
      */
-    FADE_FROM_LEFT,
-
-    //-------------------------------------------------------------------------
+    FADE_FROM_LEFT, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Fade from Top'.
      */
-    FADE_FROM_TOP,
-
-    //-------------------------------------------------------------------------
+    FADE_FROM_TOP, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Fade from Right'.
      */
-    FADE_FROM_RIGHT,
-
-    //-------------------------------------------------------------------------
+    FADE_FROM_RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Fade from Bottom'.
      */
-    FADE_FROM_BOTTOM,
-
-    //-------------------------------------------------------------------------
+    FADE_FROM_BOTTOM, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Fade to Center'.
      */
-    FADE_TO_CENTER,
-
-    //-------------------------------------------------------------------------
+    FADE_TO_CENTER, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Fade from Center'.
      */
-    FADE_FROM_CENTER,
-
-    //-------------------------------------------------------------------------
+    FADE_FROM_CENTER, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Move from Left'.
      */
-    MOVE_FROM_LEFT,
-
-    //-------------------------------------------------------------------------
+    MOVE_FROM_LEFT, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Move from Top'.
      */
-    MOVE_FROM_TOP,
-
-    //-------------------------------------------------------------------------
+    MOVE_FROM_TOP, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Move from Right'.
      */
-    MOVE_FROM_RIGHT,
-
-    //-------------------------------------------------------------------------
+    MOVE_FROM_RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Move from Bottom'.
      */
-    MOVE_FROM_BOTTOM,
-
-    //-------------------------------------------------------------------------
+    MOVE_FROM_BOTTOM, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Roll from Left'.
      */
-    ROLL_FROM_LEFT,
-
-    //-------------------------------------------------------------------------
+    ROLL_FROM_LEFT, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Roll from Top'.
      */
-    ROLL_FROM_TOP,
-
-    //-------------------------------------------------------------------------
+    ROLL_FROM_TOP, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Roll from Right'.
      */
-    ROLL_FROM_RIGHT,
-
-    //-------------------------------------------------------------------------
+    ROLL_FROM_RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Roll from Bottom'.
      */
-    ROLL_FROM_BOTTOM,
-
-    //-------------------------------------------------------------------------
+    ROLL_FROM_BOTTOM, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Vertical Stripes'.
      */
-    VERTICAL_STRIPES,
-
-    //-------------------------------------------------------------------------
+    VERTICAL_STRIPES, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Horizontal Stripes'.
      */
-    HORIZONTAL_STRIPES,
-
-    //-------------------------------------------------------------------------
+    HORIZONTAL_STRIPES, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Clockwise'.
      */
-    CLOCKWISE,
-
-    //-------------------------------------------------------------------------
+    CLOCKWISE, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Counter Clockwise'.
      */
-    COUNTERCLOCKWISE,
-
-    //-------------------------------------------------------------------------
+    COUNTERCLOCKWISE, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Fade from Upper Left'.
      */
-    FADE_FROM_UPPERLEFT,
-
-    //-------------------------------------------------------------------------
+    FADE_FROM_UPPERLEFT, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Fade from Upper Right'.
      */
-    FADE_FROM_UPPERRIGHT,
-
-    //-------------------------------------------------------------------------
+    FADE_FROM_UPPERRIGHT, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Fade from Lower Left'.
      */
-    FADE_FROM_LOWERLEFT,
-
-    //-------------------------------------------------------------------------
+    FADE_FROM_LOWERLEFT, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Fade from Lower Right'.
      */
-    FADE_FROM_LOWERRIGHT,
-
-    //-------------------------------------------------------------------------
+    FADE_FROM_LOWERRIGHT, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Close Vertical'.
      */
-    CLOSE_VERTICAL,
-
-    //-------------------------------------------------------------------------
+    CLOSE_VERTICAL, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Close Horizontal'.
      */
-    CLOSE_HORIZONTAL,
-
-    //-------------------------------------------------------------------------
+    CLOSE_HORIZONTAL, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Open Vertical'.
      */
-    OPEN_VERTICAL,
-
-    //-------------------------------------------------------------------------
+    OPEN_VERTICAL, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Open Horizontal'.
      */
-    OPEN_HORIZONTAL,
-
-    //-------------------------------------------------------------------------
+    OPEN_HORIZONTAL, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Spiral Inward Left'.
      */
-    SPIRALIN_LEFT,
-
-    //-------------------------------------------------------------------------
+    SPIRALIN_LEFT, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Spiral Inward Right'.
      */
-    SPIRALIN_RIGHT,
-
-    //-------------------------------------------------------------------------
+    SPIRALIN_RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Spiral Outward Left'.
      */
-    SPIRALOUT_LEFT,
-
-    //-------------------------------------------------------------------------
+    SPIRALOUT_LEFT, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Spiral Outward Right'.
      */
-    SPIRALOUT_RIGHT,
-
-    //-------------------------------------------------------------------------
+    SPIRALOUT_RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Dissolve'.
      */
-    DISSOLVE,
-
-    //-------------------------------------------------------------------------
+    DISSOLVE, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Wavy Line from Left'.
      */
-    WAVYLINE_FROM_LEFT,
-
-    //-------------------------------------------------------------------------
+    WAVYLINE_FROM_LEFT, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Wavy Line from Top'.
      */
-    WAVYLINE_FROM_TOP,
-
-    //-------------------------------------------------------------------------
+    WAVYLINE_FROM_TOP, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Wavy Line from Right'.
      */
-    WAVYLINE_FROM_RIGHT,
-
-    //-------------------------------------------------------------------------
+    WAVYLINE_FROM_RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Wavy Line from Bottom'.
      */
-    WAVYLINE_FROM_BOTTOM,
-
-    //-------------------------------------------------------------------------
+    WAVYLINE_FROM_BOTTOM, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Random'.
      */
-    RANDOM,
-
-    //-------------------------------------------------------------------------
+    RANDOM, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Stretch from Left'.
      */
-    STRETCH_FROM_LEFT,
-
-    //-------------------------------------------------------------------------
+    STRETCH_FROM_LEFT, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Stretch from Top'.
      */
-    STRETCH_FROM_TOP,
-
-    //-------------------------------------------------------------------------
+    STRETCH_FROM_TOP, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Stretch from Right'.
      */
-    STRETCH_FROM_RIGHT,
-
-    //-------------------------------------------------------------------------
+    STRETCH_FROM_RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Stretch from Bottom'.
      */
-    STRETCH_FROM_BOTTOM,
-
-    //-------------------------------------------------------------------------
+    STRETCH_FROM_BOTTOM, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Vertical Lines'.
      */
-    VERTICAL_LINES,
-
-    //-------------------------------------------------------------------------
+    VERTICAL_LINES, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Horizontal Lines'.
      */
     HORIZONTAL_LINES,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Move from Upper Left'.
      */
     MOVE_FROM_UPPERLEFT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Move from Upper Right'.
      */
     MOVE_FROM_UPPERRIGHT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Move from Lower Right'.
      */
     MOVE_FROM_LOWERRIGHT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Move from Lower Left'.
      */
     MOVE_FROM_LOWERLEFT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Uncover to Left'.
      */
     UNCOVER_TO_LEFT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Uncover to Upper Left'.
      */
     UNCOVER_TO_UPPERLEFT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Uncover to Top'.
      */
     UNCOVER_TO_TOP,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Uncover to Upper Right'.
      */
     UNCOVER_TO_UPPERRIGHT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Uncover to Right'.
      */
     UNCOVER_TO_RIGHT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Uncover to Lower Right'.
      */
     UNCOVER_TO_LOWERRIGHT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Uncover to Bottom'.
      */
     UNCOVER_TO_BOTTOM,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Uncover to Lower Left'.
      */
     UNCOVER_TO_LOWERLEFT,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Vertical Checkerboard'.
      */
     VERTICAL_CHECKERBOARD,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** use the fade effect 'Horizontal Checkerboard'.
      */
     HORIZONTAL_CHECKERBOARD
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/FooterShape.idl b/offapi/com/sun/star/presentation/FooterShape.idl
index 85262e21b072..784f8b87ee99 100644
--- a/offapi/com/sun/star/presentation/FooterShape.idl
+++ b/offapi/com/sun/star/presentation/FooterShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_FooterShape_idl__
-#define __com_sun_star_presentation_FooterShape_idl__
-
-#ifndef __com_sun_star_presentation_Shape_idl__
-#include <com/sun/star/presentation/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextShape_idl__
-#include <com/sun/star/drawing/TextShape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_FooterShape_idl__ 
+#define __com_sun_star_presentation_FooterShape_idl__ 
+ 
+#ifndef __com_sun_star_presentation_Shape_idl__ 
+#include <com/sun/star/presentation/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_TextShape_idl__ 
+#include <com/sun/star/drawing/TextShape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This service is implemented by the footer presentation shape.
 
     <p>Presentation shapes can be used in a presentation
@@ -49,14 +49,14 @@
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 service FooterShape
-{
-    service com::sun::star::presentation::Shape;
-
-    service com::sun::star::drawing::TextShape;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::presentation::Shape; 
+    
+    service com::sun::star::drawing::TextShape;  
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/GraphicObjectShape.idl b/offapi/com/sun/star/presentation/GraphicObjectShape.idl
index 3307b856d802..a0712bf76318 100644
--- a/offapi/com/sun/star/presentation/GraphicObjectShape.idl
+++ b/offapi/com/sun/star/presentation/GraphicObjectShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_GraphicObjectShape_idl__
-#define __com_sun_star_presentation_GraphicObjectShape_idl__
-
-#ifndef __com_sun_star_presentation_Shape_idl__
-#include <com/sun/star/presentation/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_GraphicObjectShape_idl__
-#include <com/sun/star/drawing/GraphicObjectShape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_GraphicObjectShape_idl__ 
+#define __com_sun_star_presentation_GraphicObjectShape_idl__ 
+ 
+#ifndef __com_sun_star_presentation_Shape_idl__ 
+#include <com/sun/star/presentation/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_GraphicObjectShape_idl__ 
+#include <com/sun/star/drawing/GraphicObjectShape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This service is implemented by the graphic presentation shape.
 
     <p>Presentation shapes can be used in a presentation
@@ -49,14 +49,14 @@
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 published service GraphicObjectShape
-{
-    service com::sun::star::presentation::Shape;
-
-    service com::sun::star::drawing::GraphicObjectShape;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::presentation::Shape; 
+    
+    service com::sun::star::drawing::GraphicObjectShape; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/HandoutShape.idl b/offapi/com/sun/star/presentation/HandoutShape.idl
index 609ec9cb39f1..ee296547a6a7 100644
--- a/offapi/com/sun/star/presentation/HandoutShape.idl
+++ b/offapi/com/sun/star/presentation/HandoutShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_HandoutShape_idl__
-#define __com_sun_star_presentation_HandoutShape_idl__
-
-#ifndef __com_sun_star_presentation_Shape_idl__
-#include <com/sun/star/presentation/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_PageShape_idl__
-#include <com/sun/star/drawing/PageShape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_HandoutShape_idl__ 
+#define __com_sun_star_presentation_HandoutShape_idl__ 
+ 
+#ifndef __com_sun_star_presentation_Shape_idl__ 
+#include <com/sun/star/presentation/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_PageShape_idl__ 
+#include <com/sun/star/drawing/PageShape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This service is implemented by the handout presentation shape.
 
     <p>Presentation shapes can be used in a presentation
@@ -49,14 +49,14 @@
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 published service HandoutShape
-{
-    service com::sun::star::presentation::Shape;
-
-    service com::sun::star::drawing::PageShape;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::presentation::Shape; 
+    
+    service com::sun::star::drawing::PageShape; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/HandoutView.idl b/offapi/com/sun/star/presentation/HandoutView.idl
index eb5b81849e47..e2f89bd9abab 100644
--- a/offapi/com/sun/star/presentation/HandoutView.idl
+++ b/offapi/com/sun/star/presentation/HandoutView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_HandoutView_idl__
-#define __com_sun_star_presentation_HandoutView_idl__
-
-#ifndef __com_sun_star_drawing_DrawingDocumentDrawView_idl__
-#include <com/sun/star/drawing/DrawingDocumentDrawView.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_HandoutView_idl__ 
+#define __com_sun_star_presentation_HandoutView_idl__ 
+ 
+#ifndef __com_sun_star_drawing_DrawingDocumentDrawView_idl__ 
+#include <com/sun/star/drawing/DrawingDocumentDrawView.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This componend integrates a view to a handout page inside a presentation
     document into the desktop.
 
     @since OOo 1.1.2
  */
 published service HandoutView
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** this services offers the  integration of this component into the
         desktop and the basic interfaces and properties of a draw view.
     */
     service com::sun::star::drawing::DrawingDocumentDrawView;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/HeaderShape.idl b/offapi/com/sun/star/presentation/HeaderShape.idl
index 5fe1feb94ced..65248c6e9f4a 100644
--- a/offapi/com/sun/star/presentation/HeaderShape.idl
+++ b/offapi/com/sun/star/presentation/HeaderShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_HeaderShape_idl__
-#define __com_sun_star_presentation_HeaderShape_idl__
-
-#ifndef __com_sun_star_presentation_Shape_idl__
-#include <com/sun/star/presentation/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextShape_idl__
-#include <com/sun/star/drawing/TextShape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_HeaderShape_idl__ 
+#define __com_sun_star_presentation_HeaderShape_idl__ 
+ 
+#ifndef __com_sun_star_presentation_Shape_idl__ 
+#include <com/sun/star/presentation/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_TextShape_idl__ 
+#include <com/sun/star/drawing/TextShape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This service is implemented by the header presentation shape.
 
     <p>Presentation shapes can be used in a presentation
@@ -49,14 +49,14 @@
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 service HeaderShape
-{
-    service com::sun::star::presentation::Shape;
-
-    service com::sun::star::drawing::TextShape;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::presentation::Shape; 
+    
+    service com::sun::star::drawing::TextShape;  
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/NotesShape.idl b/offapi/com/sun/star/presentation/NotesShape.idl
index e4961d0a4912..7f2f4aeece94 100644
--- a/offapi/com/sun/star/presentation/NotesShape.idl
+++ b/offapi/com/sun/star/presentation/NotesShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_NotesShape_idl__
-#define __com_sun_star_presentation_NotesShape_idl__
-
-#ifndef __com_sun_star_presentation_Shape_idl__
-#include <com/sun/star/presentation/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextShape_idl__
-#include <com/sun/star/drawing/TextShape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_NotesShape_idl__ 
+#define __com_sun_star_presentation_NotesShape_idl__ 
+ 
+#ifndef __com_sun_star_presentation_Shape_idl__ 
+#include <com/sun/star/presentation/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_TextShape_idl__ 
+#include <com/sun/star/drawing/TextShape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This service is implemented by the notes presentation shape.
 
     <p>Presentation shapes can be used in a presentation
@@ -49,14 +49,14 @@
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 published service NotesShape
-{
-    service com::sun::star::presentation::Shape;
-
-    service com::sun::star::drawing::TextShape;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::presentation::Shape; 
+    
+    service com::sun::star::drawing::TextShape;  
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/NotesView.idl b/offapi/com/sun/star/presentation/NotesView.idl
index b6eee742de41..9e683fb78795 100644
--- a/offapi/com/sun/star/presentation/NotesView.idl
+++ b/offapi/com/sun/star/presentation/NotesView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_NotesView_idl__
-#define __com_sun_star_presentation_NotesView_idl__
-
-#ifndef __com_sun_star_drawing_DrawingDocumentDrawView_idl__
-#include <com/sun/star/drawing/DrawingDocumentDrawView.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_NotesView_idl__ 
+#define __com_sun_star_presentation_NotesView_idl__ 
+ 
+#ifndef __com_sun_star_drawing_DrawingDocumentDrawView_idl__ 
+#include <com/sun/star/drawing/DrawingDocumentDrawView.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This componend integrates a view to a handout page inside a presentation
     document into the desktop.
 
     @since OOo 1.1.2
  */
 published service NotesView
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** this services offers the  integration of this component into the
         desktop and the basic interfaces and properties of a draw view.
     */
     service com::sun::star::drawing::DrawingDocumentDrawView;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/OLE2Shape.idl b/offapi/com/sun/star/presentation/OLE2Shape.idl
index 141f5efad901..a71ffe518c1b 100644
--- a/offapi/com/sun/star/presentation/OLE2Shape.idl
+++ b/offapi/com/sun/star/presentation/OLE2Shape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_OLE2Shape_idl__
-#define __com_sun_star_presentation_OLE2Shape_idl__
-
-#ifndef __com_sun_star_presentation_Shape_idl__
-#include <com/sun/star/presentation/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_OLE2Shape_idl__
-#include <com/sun/star/drawing/OLE2Shape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_OLE2Shape_idl__ 
+#define __com_sun_star_presentation_OLE2Shape_idl__ 
+ 
+#ifndef __com_sun_star_presentation_Shape_idl__ 
+#include <com/sun/star/presentation/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_OLE2Shape_idl__ 
+#include <com/sun/star/drawing/OLE2Shape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This service is implemented by the OLE2 presentation shape.
 
     <p>Presentation shapes can be used in a presentation
@@ -49,14 +49,14 @@
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 published service OLE2Shape
-{
-    service com::sun::star::presentation::Shape;
-
-    service com::sun::star::drawing::OLE2Shape;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::presentation::Shape; 
+    
+    service com::sun::star::drawing::OLE2Shape; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/OutlineView.idl b/offapi/com/sun/star/presentation/OutlineView.idl
index 4552b6777558..3351d3c15521 100644
--- a/offapi/com/sun/star/presentation/OutlineView.idl
+++ b/offapi/com/sun/star/presentation/OutlineView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_OutlineView_idl__
-#define __com_sun_star_presentation_OutlineView_idl__
-
-#ifndef __com_sun_star_drawing_XDrawView_idl__
-#include <com/sun/star/drawing/XDrawView.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_Controller_idl__
-#include <com/sun/star/frame/Controller.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
-#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
+#ifndef __com_sun_star_presentation_OutlineView_idl__ 
+#define __com_sun_star_presentation_OutlineView_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XDrawView_idl__ 
+#include <com/sun/star/drawing/XDrawView.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_frame_Controller_idl__ 
+#include <com/sun/star/frame/Controller.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XServiceInfo_idl__ 
+#include <com/sun/star/lang/XServiceInfo.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
+#include <com/sun/star/drawing/XDrawPage.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This componend integrates an outline view to a presentation
     document into the desktop.
 
@@ -66,44 +66,44 @@
     @since OOo 1.1.2
  */
 published service OutlineView
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** this services offers the  integration of this component into the
         desktop.
     */
     service com::sun::star::frame::Controller;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** lets you access the window for this view
     */
     interface com::sun::star::awt::XWindow;
 
-    //-------------------------------------------------------------------------
-
-
+    //------------------------------------------------------------------------- 
+ 
+     
     /** lets you access the properties of this service.
      */
-    interface com::sun::star::beans::XPropertySet;
-
-    //-------------------------------------------------------------------------
+    interface com::sun::star::beans::XPropertySet; 
 
-    /** provides the names of the services implemented by
+    //------------------------------------------------------------------------- 
+ 
+    /** provides the names of the services implemented by  
                 this instance.
      */
-    interface com::sun::star::lang::XServiceInfo;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::lang::XServiceInfo; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the area that is currently visible.
      */
     [readonly, property] com::sun::star::awt::Rectangle VisibleArea;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/OutlinerShape.idl b/offapi/com/sun/star/presentation/OutlinerShape.idl
index bd1b825cd84e..82eebe414938 100644
--- a/offapi/com/sun/star/presentation/OutlinerShape.idl
+++ b/offapi/com/sun/star/presentation/OutlinerShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_OutlinerShape_idl__
-#define __com_sun_star_presentation_OutlinerShape_idl__
-
-#ifndef __com_sun_star_presentation_Shape_idl__
-#include <com/sun/star/presentation/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextShape_idl__
-#include <com/sun/star/drawing/TextShape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_OutlinerShape_idl__ 
+#define __com_sun_star_presentation_OutlinerShape_idl__ 
+ 
+#ifndef __com_sun_star_presentation_Shape_idl__ 
+#include <com/sun/star/presentation/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_TextShape_idl__ 
+#include <com/sun/star/drawing/TextShape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This service is implemented by the outline presentation shape.
 
     <p>Presentation shapes can be used in a presentation
@@ -49,14 +49,14 @@
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 published service OutlinerShape
-{
-    service com::sun::star::presentation::Shape;
-
-    service com::sun::star::drawing::TextShape;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::presentation::Shape; 
+    
+    service com::sun::star::drawing::TextShape; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/PageShape.idl b/offapi/com/sun/star/presentation/PageShape.idl
index 722d3e102298..d2ad22ccdce4 100644
--- a/offapi/com/sun/star/presentation/PageShape.idl
+++ b/offapi/com/sun/star/presentation/PageShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_PageShape_idl__
-#define __com_sun_star_presentation_PageShape_idl__
-
-#ifndef __com_sun_star_presentation_Shape_idl__
-#include <com/sun/star/presentation/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_PageShape_idl__
-#include <com/sun/star/drawing/PageShape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_PageShape_idl__ 
+#define __com_sun_star_presentation_PageShape_idl__ 
+ 
+#ifndef __com_sun_star_presentation_Shape_idl__ 
+#include <com/sun/star/presentation/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_PageShape_idl__ 
+#include <com/sun/star/drawing/PageShape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This service is implemented by the page presentation shape.
 
     <p>Presentation shapes can be used in a presentation
@@ -49,14 +49,14 @@
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 published service PageShape
-{
-    service com::sun::star::presentation::Shape;
-
-    service com::sun::star::drawing::PageShape;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::presentation::Shape; 
+    
+    service com::sun::star::drawing::PageShape; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/ParagraphTarget.idl b/offapi/com/sun/star/presentation/ParagraphTarget.idl
index 755f10d835f0..e90c730ae896 100644
--- a/offapi/com/sun/star/presentation/ParagraphTarget.idl
+++ b/offapi/com/sun/star/presentation/ParagraphTarget.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_ParagraphTarget_idl__
-#define __com_sun_star_presentation_ParagraphTarget_idl__
+#ifndef __com_sun_star_presentation_ParagraphTarget_idl__ 
+#define __com_sun_star_presentation_ParagraphTarget_idl__ 
 
 #ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
 
 /** an event has a source that causes an event to be fired and a trigger
     that defines under which condition an event should be raised and
@@ -51,8 +51,8 @@ struct ParagraphTarget
     short Paragraph;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/presentation/Presentation.idl b/offapi/com/sun/star/presentation/Presentation.idl
index e8c220b00ff7..106fabb666ce 100644
--- a/offapi/com/sun/star/presentation/Presentation.idl
+++ b/offapi/com/sun/star/presentation/Presentation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,136 +24,136 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_Presentation_idl__
-#define __com_sun_star_presentation_Presentation_idl__
-
-#ifndef __com_sun_star_presentation_XPresentation_idl__
-#include <com/sun/star/presentation/XPresentation.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
-/** This service is a presentation that is available from a
-    <type>PresentationDocument</type> via the
+#ifndef __com_sun_star_presentation_Presentation_idl__ 
+#define __com_sun_star_presentation_Presentation_idl__ 
+ 
+#ifndef __com_sun_star_presentation_XPresentation_idl__ 
+#include <com/sun/star/presentation/XPresentation.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
+/** This service is a presentation that is available from a 
+    <type>PresentationDocument</type> via the 
     <type>XPresentationSupplier</type> interface.
  */
 published service Presentation
-{
-    /** lets you start and stop a presentation.
-
-        <p>It also gives you access to the more advanced features, like
+{ 
+    /** lets you start and stop a presentation.  
+             
+        <p>It also gives you access to the more advanced features, like 
         rehearse timing and the live modes.
      */
-    interface com::sun::star::presentation::XPresentation;
-
-    //-------------------------------------------------------------------------
+    interface com::sun::star::presentation::XPresentation; 
 
-    /** This is the standard interface for access to the properties from this
+    //------------------------------------------------------------------------- 
+ 
+    /** This is the standard interface for access to the properties from this 
         service.
      */
-    interface com::sun::star::beans::XPropertySet;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::beans::XPropertySet; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** enables/disables the shape animations.
      */
-    [property] boolean AllowAnimations;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean AllowAnimations; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If this string is not empty, it contains the name of a customized
         show that is used for the presentation.
      */
-    [property] string CustomShow;
-
-    //-------------------------------------------------------------------------
-
+    [property] string CustomShow; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If this string is not empty, it contains the name of the page where
         the presentation is started.
      */
-    [property] string FirstPage;
-
-    //-------------------------------------------------------------------------
-
-    /** If this property is set to <TRUE/>, the window of the presentation is
+    [property] string FirstPage; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** If this property is set to <TRUE/>, the window of the presentation is 
         always on top of all other windows.
      */
-    [property] boolean IsAlwaysOnTop;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean IsAlwaysOnTop; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If this property is <TRUE/>, all pages are changed automatically.
-
+        
         <p>This overrides the properties of the pages.</p>
      */
-    [property] boolean IsAutomatic;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean IsAutomatic; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If this property is set to <TRUE/>, the presentation is repeated
         endlessly.
      */
-    [property] boolean IsEndless;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean IsEndless; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If this property is set to <TRUE/>, the presentation runs in
         full-screen mode.
      */
-    [property] boolean IsFullScreen;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean IsFullScreen; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** With this property, you can set the presentation to live mode.
         <p>Implementations that have no live mode capability may ignore this
         property and always return false.
      */
-    [property] boolean IsLivePresentation;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean IsLivePresentation; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If this property is <TRUE/>, the mouse is visible during the
         presentation.
      */
-    [property] boolean IsMouseVisible;
-
-    //-------------------------------------------------------------------------
-
-    /** is the duration of the black screen after the
+    [property] boolean IsMouseVisible; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** is the duration of the black screen after the 
         presentation has finished.
-
+        
         <p>If this is set to <literal>0</literal>, no black screen is shown.</p>
      */
-    [property] long Pause;
-
-    //-------------------------------------------------------------------------
-
+    [property] long Pause; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If this is set to <TRUE/>, the Navigator is opened at the start of the
         presentation.
      */
-    [property] boolean StartWithNavigator;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean StartWithNavigator; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If this is <TRUE/>, a pen is shown during presentation.
 
         <p>You can draw on the presentation with this pen.</p>
      */
-    [property] boolean UsePen;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] boolean UsePen; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/Presentation2.idl b/offapi/com/sun/star/presentation/Presentation2.idl
index 9ed9a9b0dd23..0a1c1c22a1fb 100644
--- a/offapi/com/sun/star/presentation/Presentation2.idl
+++ b/offapi/com/sun/star/presentation/Presentation2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_Presentation2_idl__
-#define __com_sun_star_presentation_Presentation2_idl__
-
-#ifndef __com_sun_star_presentation_Presentation_idl__
-#include <com/sun/star/presentation/Presentation.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_XPresentation2_idl__
-#include <com/sun/star/presentation/XPresentation2.idl>
-#endif
-
-//=============================================================================
+#ifndef __com_sun_star_presentation_Presentation2_idl__ 
+#define __com_sun_star_presentation_Presentation2_idl__ 
 
- module com {  module sun {  module star {  module presentation {
+#ifndef __com_sun_star_presentation_Presentation_idl__ 
+#include <com/sun/star/presentation/Presentation.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_presentation_XPresentation2_idl__ 
+#include <com/sun/star/presentation/XPresentation2.idl> 
+#endif 
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** enhances the Presentation service to give access to a <type>XPresentation2</type> interface.
 
     @since OOo 3.0
 */
 service Presentation2
-{
+{ 
     service Presentation;
 
     /** enhances the XPresentation interface to give access to
@@ -55,11 +55,11 @@ service Presentation2
      */
     interface com::sun::star::presentation::XPresentation2;
 
-    //-------------------------------------------------------------------------
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    //------------------------------------------------------------------------- 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/PresentationDocument.idl b/offapi/com/sun/star/presentation/PresentationDocument.idl
index 401090dd09c2..d9c80a9c3813 100644
--- a/offapi/com/sun/star/presentation/PresentationDocument.idl
+++ b/offapi/com/sun/star/presentation/PresentationDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/presentation/PresentationRange.idl b/offapi/com/sun/star/presentation/PresentationRange.idl
index 3df71eca5e30..74fd0c3df3da 100644
--- a/offapi/com/sun/star/presentation/PresentationRange.idl
+++ b/offapi/com/sun/star/presentation/PresentationRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_PresentationRange_idl__
-#define __com_sun_star_presentation_PresentationRange_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_PresentationRange_idl__ 
+#define __com_sun_star_presentation_PresentationRange_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** specifies which part of the presentation is to show.
  */
 published enum PresentationRange
-{
+{ 
     /** use all slides.
      */
-    PRESENTATIONRANGE_ALL,
-
-    //-------------------------------------------------------------------------
+    PRESENTATIONRANGE_ALL, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use only the active slide.
      */
-    PRESENTATIONRANGE_FROM_PAGE,
-
-    //-------------------------------------------------------------------------
+    PRESENTATIONRANGE_FROM_PAGE, 
+ 
+    //------------------------------------------------------------------------- 
 
     /** use an individual choice of slides.
      */
-    PRESENTATIONRANGE_INDIVIDUAL
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    PRESENTATIONRANGE_INDIVIDUAL 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/PresentationView.idl b/offapi/com/sun/star/presentation/PresentationView.idl
index e989b8b075de..201ed44d80f2 100644
--- a/offapi/com/sun/star/presentation/PresentationView.idl
+++ b/offapi/com/sun/star/presentation/PresentationView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,94 +24,94 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_PresentationView_idl__
-#define __com_sun_star_presentation_PresentationView_idl__
-
-#ifndef __com_sun_star_drawing_XDrawView_idl__
-#include <com/sun/star/drawing/XDrawView.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_Controller_idl__
-#include <com/sun/star/frame/Controller.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
-#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
+#ifndef __com_sun_star_presentation_PresentationView_idl__ 
+#define __com_sun_star_presentation_PresentationView_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XDrawView_idl__ 
+#include <com/sun/star/drawing/XDrawView.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_frame_Controller_idl__ 
+#include <com/sun/star/frame/Controller.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XServiceInfo_idl__ 
+#include <com/sun/star/lang/XServiceInfo.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
+#include <com/sun/star/drawing/XDrawPage.idl> 
+#endif 
 
 #ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
 #endif
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This component integrates a view to a slide show of a presentation
     document into the desktop.
  */
 published service PresentationView
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** this services offers the  integration of this component into the
         desktop.
     */
     service com::sun::star::frame::Controller;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** lets you access the window for this view
     */
     interface com::sun::star::awt::XWindow;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** lets you set/get the current page displayed by this
         view.
      */
-    interface com::sun::star::drawing::XDrawView;
-
-    //-------------------------------------------------------------------------
+    interface com::sun::star::drawing::XDrawView; 
 
+    //------------------------------------------------------------------------- 
+      
     /** lets you access the properties of this service.
      */
-    interface com::sun::star::beans::XPropertySet;
-
-    //-------------------------------------------------------------------------
+    interface com::sun::star::beans::XPropertySet; 
 
-    /** provides the names of the services implemented by
+    //------------------------------------------------------------------------- 
+ 
+    /** provides the names of the services implemented by  
                 this instance.
      */
-    interface com::sun::star::lang::XServiceInfo;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::lang::XServiceInfo; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the drawing page that is currently visible.
      */
     [property] com::sun::star::drawing::XDrawPage CurrentPage;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** This is the area that is currently visible.
      */
     [readonly, property] com::sun::star::awt::Rectangle VisibleArea;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/PreviewView.idl b/offapi/com/sun/star/presentation/PreviewView.idl
index 943c260b71ae..df282747385d 100644
--- a/offapi/com/sun/star/presentation/PreviewView.idl
+++ b/offapi/com/sun/star/presentation/PreviewView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,96 +24,96 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_PreviewView_idl__
-#define __com_sun_star_presentation_PreviewView_idl__
-
-#ifndef __com_sun_star_drawing_XDrawView_idl__
-#include <com/sun/star/drawing/XDrawView.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_Controller_idl__
-#include <com/sun/star/frame/Controller.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
-#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
+#ifndef __com_sun_star_presentation_PreviewView_idl__ 
+#define __com_sun_star_presentation_PreviewView_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XDrawView_idl__ 
+#include <com/sun/star/drawing/XDrawView.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_frame_Controller_idl__ 
+#include <com/sun/star/frame/Controller.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XServiceInfo_idl__ 
+#include <com/sun/star/lang/XServiceInfo.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
+#include <com/sun/star/drawing/XDrawPage.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This componend integrates a preview view to a slide show of a presentation
     document into the desktop.
 
     @since OOo 1.1.2
  */
 published service PreviewView
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** this services offers the  integration of this component into the
         desktop.
     */
     service com::sun::star::frame::Controller;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** lets you access the window for this view
     */
     interface com::sun::star::awt::XWindow;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** lets you set/get the current page displayed by this
         view.
      */
-    interface com::sun::star::drawing::XDrawView;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::drawing::XDrawView; 
 
+    //------------------------------------------------------------------------- 
+ 
+     
     /** lets you access the properties of this service.
      */
-    interface com::sun::star::beans::XPropertySet;
-
-    //-------------------------------------------------------------------------
+    interface com::sun::star::beans::XPropertySet; 
 
-    /** provides the names of the services implemented by
+    //------------------------------------------------------------------------- 
+ 
+    /** provides the names of the services implemented by  
                 this instance.
      */
-    interface com::sun::star::lang::XServiceInfo;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::lang::XServiceInfo; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the drawing page that is currently visible.
      */
     [property] com::sun::star::drawing::XDrawPage CurrentPage;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** This is the area that is currently visible.
      */
     [readonly, property] com::sun::star::awt::Rectangle VisibleArea;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/Shape.idl b/offapi/com/sun/star/presentation/Shape.idl
index de88ce912445..f26f0f30c904 100644
--- a/offapi/com/sun/star/presentation/Shape.idl
+++ b/offapi/com/sun/star/presentation/Shape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,157 +24,157 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_Shape_idl__
-#define __com_sun_star_presentation_Shape_idl__
-
+#ifndef __com_sun_star_presentation_Shape_idl__ 
+#define __com_sun_star_presentation_Shape_idl__ 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
 
-#ifndef __com_sun_star_presentation_AnimationEffect_idl__
-#include <com/sun/star/presentation/AnimationEffect.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_ClickAction_idl__
-#include <com/sun/star/presentation/ClickAction.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_AnimationSpeed_idl__
-#include <com/sun/star/presentation/AnimationSpeed.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_AnimationEffect_idl__ 
+#include <com/sun/star/presentation/AnimationEffect.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_presentation_ClickAction_idl__ 
+#include <com/sun/star/presentation/ClickAction.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_presentation_AnimationSpeed_idl__ 
+#include <com/sun/star/presentation/AnimationSpeed.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** this service is supported from all shapes inside a <type>PresentationDocument</type>.
 
-
+    
     This usually enahnces objects of type <type scope="com::sun::star::drawing">Shape</type> with
     presentation properties.
 */
 published service Shape
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is a generic URL for the property OnClick.
      */
-    [property] string Bookmark;
-
-    //-------------------------------------------------------------------------
-
-    /** This is the color for dimming this shape.
-
-        <p>This color is used if the property <member scope="com::sun::star::drawing">Shape::DimPrev</member>
+    [property] string Bookmark; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** This is the color for dimming this shape. 
+        
+        <p>This color is used if the property <member scope="com::sun::star::drawing">Shape::DimPrev</member> 
         is <TRUE/> and <member scope="com::sun::star::drawing">Shape::DimHide</member> is <FALSE/>.</p>
      */
-    [property] com::sun::star::util::Color DimColor;
-
-    //-------------------------------------------------------------------------
-
-    /** If this property and the property <member scope="com::sun::star::drawing">Shape::DimPrev</member>
+    [property] com::sun::star::util::Color DimColor; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** If this property and the property <member scope="com::sun::star::drawing">Shape::DimPrev</member> 
         are both <TRUE/>, the shape is hidden instead of dimmed to a color.
      */
-    [property] boolean DimHide;
-
-    //-------------------------------------------------------------------------
-
-    /** If this property is <TRUE/>, this shape is dimmed to the color of
-        property <member scope="com::sun::star::drawing">Shape::DimColor</member> after executing its
+    [property] boolean DimHide; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** If this property is <TRUE/>, this shape is dimmed to the color of 
+        property <member scope="com::sun::star::drawing">Shape::DimColor</member> after executing its 
         animation effect.
      */
-    [property] boolean DimPrevious;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean DimPrevious; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** selects the animation effect of this shape.
      */
-    [property] com::sun::star::presentation::AnimationEffect Effect;
-
-    //-------------------------------------------------------------------------
+    [property] com::sun::star::presentation::AnimationEffect Effect; 
+ 
+    //------------------------------------------------------------------------- 
 
-    /** If this is a default presentation object and if it is empty,
+    /** If this is a default presentation object and if it is empty, 
         this property is <TRUE/>.
      */
-    [property] boolean IsEmptyPresentationObject;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean IsEmptyPresentationObject; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If this is a presentation object, this property is <TRUE/>.
-        <p>Presentation objects are objects like TitleTextShape and
+        <p>Presentation objects are objects like TitleTextShape and 
         OutlinerShape.</p>
      */
-    [readonly, property] boolean IsPresentationObject;
-
-    //-------------------------------------------------------------------------
-
-    /** selects an action performed after the user clicks
+    [readonly, property] boolean IsPresentationObject; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** selects an action performed after the user clicks 
         on this shape.
      */
-    [property] com::sun::star::presentation::ClickAction OnClick;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::presentation::ClickAction OnClick; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If this property is <TRUE/>, the sound of this shape is played in
         full.
-
+        
         <p>The default behavior is to stop the sound after completing the
         animation effect.</p>
      */
-    [property] boolean PlayFull;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean PlayFull; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the position of this shape in the order of the shapes which
         can be animated on its page.
-
-        <p>The animations are executed in this order, starting at the shape
+        
+        <p>The animations are executed in this order, starting at the shape 
         with the PresentationOrder "one."  You can change the order by
-        changing this number. Setting it to "one" makes this shape the
+        changing this number. Setting it to "one" makes this shape the 
         first shape in the execution order for the animation effects.</p>
      */
-    [property] long PresentationOrder;
-
-    //-------------------------------------------------------------------------
-
-    /** This is the URL to a soundfile that is played while the animation
+    [property] long PresentationOrder; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** This is the URL to a soundfile that is played while the animation 
         effect of this shape is running.
      */
-    [property] string Sound;
-
-    //-------------------------------------------------------------------------
-
+    [property] string Sound; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If this property is set to <TRUE/>, a sound is played while the
         animation effect is executed.
      */
-    [property] boolean SoundOn;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean SoundOn; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the speed of the animation effect.
      */
-    [property] com::sun::star::presentation::AnimationSpeed Speed;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::presentation::AnimationSpeed Speed; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the animation effect for the text inside this shape.
      */
-    [property] com::sun::star::presentation::AnimationEffect TextEffect;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::presentation::AnimationEffect TextEffect; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies an "ole2" verb for the ClickAction VERB in
         the property <member scope="com::sun::star::drawing">Shape::OnClick</member>.
      */
-    [property] long Verb;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] long Verb; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/ShapeAnimationSubType.idl b/offapi/com/sun/star/presentation/ShapeAnimationSubType.idl
index 022f33f86b0e..90c28cd49bdc 100644
--- a/offapi/com/sun/star/presentation/ShapeAnimationSubType.idl
+++ b/offapi/com/sun/star/presentation/ShapeAnimationSubType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_ShapeAnimationSubType_idl__
-#define __com_sun_star_presentation_ShapeAnimationSubType_idl__
-
-//=============================================================================
+#ifndef __com_sun_star_presentation_ShapeAnimationSubType_idl__ 
+#define __com_sun_star_presentation_ShapeAnimationSubType_idl__ 
 
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
 
 /** Defines the whole shape or a subitem as a target for an
     effect.
@@ -59,8 +59,8 @@ constants ShapeAnimationSubType
     const short ONLY_TEXT = 2;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/presentation/SlideNumberShape.idl b/offapi/com/sun/star/presentation/SlideNumberShape.idl
index 05e9363318b6..6769250ad54a 100644
--- a/offapi/com/sun/star/presentation/SlideNumberShape.idl
+++ b/offapi/com/sun/star/presentation/SlideNumberShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_SlideNumberShape_idl__
-#define __com_sun_star_presentation_SlideNumberShape_idl__
-
-#ifndef __com_sun_star_presentation_Shape_idl__
-#include <com/sun/star/presentation/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextShape_idl__
-#include <com/sun/star/drawing/TextShape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_SlideNumberShape_idl__ 
+#define __com_sun_star_presentation_SlideNumberShape_idl__ 
+ 
+#ifndef __com_sun_star_presentation_Shape_idl__ 
+#include <com/sun/star/presentation/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_TextShape_idl__ 
+#include <com/sun/star/drawing/TextShape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This service is implemented by the slide number presentation shape.
 
     <p>Presentation shapes can be used in a presentation
@@ -49,14 +49,14 @@
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 service SlideNumberShape
-{
-    service com::sun::star::presentation::Shape;
-
-    service com::sun::star::drawing::TextShape;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::presentation::Shape; 
+    
+    service com::sun::star::drawing::TextShape;  
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/SlidesView.idl b/offapi/com/sun/star/presentation/SlidesView.idl
index 915468c94bdb..ca60d7b76ac9 100644
--- a/offapi/com/sun/star/presentation/SlidesView.idl
+++ b/offapi/com/sun/star/presentation/SlidesView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_SlidesView_idl__
-#define __com_sun_star_presentation_SlidesView_idl__
-
-#ifndef __com_sun_star_drawing_XDrawView_idl__
-#include <com/sun/star/drawing/XDrawView.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_frame_Controller_idl__
-#include <com/sun/star/frame/Controller.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
-#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
+#ifndef __com_sun_star_presentation_SlidesView_idl__ 
+#define __com_sun_star_presentation_SlidesView_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XDrawView_idl__ 
+#include <com/sun/star/drawing/XDrawView.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_frame_Controller_idl__ 
+#include <com/sun/star/frame/Controller.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XServiceInfo_idl__ 
+#include <com/sun/star/lang/XServiceInfo.idl> 
+#endif 
+
+#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
+#include <com/sun/star/drawing/XDrawPage.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_awt_XWindow_idl__
 #include <com/sun/star/awt/XWindow.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This componend integrates a slides view to a presentation
     document into the desktop.
 
@@ -67,44 +67,44 @@
     @since OOo 1.1.2
  */
 published service SlidesView
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** this services offers the  integration of this component into the
         desktop.
     */
     service com::sun::star::frame::Controller;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** lets you access the window for this view
     */
     interface com::sun::star::awt::XWindow;
 
-    //-------------------------------------------------------------------------
-
-
+    //------------------------------------------------------------------------- 
+ 
+     
     /** lets you access the properties of this service.
      */
-    interface com::sun::star::beans::XPropertySet;
-
-    //-------------------------------------------------------------------------
+    interface com::sun::star::beans::XPropertySet; 
 
-    /** provides the names of the services implemented by
+    //------------------------------------------------------------------------- 
+ 
+    /** provides the names of the services implemented by  
                 this instance.
      */
-    interface com::sun::star::lang::XServiceInfo;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::lang::XServiceInfo; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This is the area that is currently visible.
      */
     [readonly, property] com::sun::star::awt::Rectangle VisibleArea;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/SubtitleShape.idl b/offapi/com/sun/star/presentation/SubtitleShape.idl
index 025800f0b205..5898881ded38 100644
--- a/offapi/com/sun/star/presentation/SubtitleShape.idl
+++ b/offapi/com/sun/star/presentation/SubtitleShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_SubtitleShape_idl__
-#define __com_sun_star_presentation_SubtitleShape_idl__
-
-#ifndef __com_sun_star_presentation_Shape_idl__
-#include <com/sun/star/presentation/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextShape_idl__
-#include <com/sun/star/drawing/TextShape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_SubtitleShape_idl__ 
+#define __com_sun_star_presentation_SubtitleShape_idl__ 
+ 
+#ifndef __com_sun_star_presentation_Shape_idl__ 
+#include <com/sun/star/presentation/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_TextShape_idl__ 
+#include <com/sun/star/drawing/TextShape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This service is implemented by the subtitle presentation shape.
 
     <p>Presentation shapes can be used in a presentation
@@ -49,14 +49,14 @@
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 published service SubtitleShape
-{
-    service com::sun::star::presentation::Shape;
-
-    service com::sun::star::drawing::TextShape;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::presentation::Shape; 
+    
+    service com::sun::star::drawing::TextShape; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/TextAnimationType.idl b/offapi/com/sun/star/presentation/TextAnimationType.idl
index e77cb9e70ed1..3007c2754bac 100644
--- a/offapi/com/sun/star/presentation/TextAnimationType.idl
+++ b/offapi/com/sun/star/presentation/TextAnimationType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_TextAnimationType_idl__
-#define __com_sun_star_presentation_TextAnimationType_idl__
-
-//=============================================================================
+#ifndef __com_sun_star_presentation_TextAnimationType_idl__ 
+#define __com_sun_star_presentation_TextAnimationType_idl__ 
 
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
 
 /** Defines how a target <type scope=::com::sun::star::text>XTextRange</type>
     is animated inside an <type scope=::com::sun::star::animations>IterateContainer</type>.
@@ -56,8 +56,8 @@ constants TextAnimationType
     const short BY_LETTER = 2;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/presentation/TitleTextShape.idl b/offapi/com/sun/star/presentation/TitleTextShape.idl
index 190bf5b38d1f..26a998ea2b0f 100644
--- a/offapi/com/sun/star/presentation/TitleTextShape.idl
+++ b/offapi/com/sun/star/presentation/TitleTextShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_TitleTextShape_idl__
-#define __com_sun_star_presentation_TitleTextShape_idl__
-
-#ifndef __com_sun_star_presentation_Shape_idl__
-#include <com/sun/star/presentation/Shape.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_TextShape_idl__
-#include <com/sun/star/drawing/TextShape.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_TitleTextShape_idl__ 
+#define __com_sun_star_presentation_TitleTextShape_idl__ 
+ 
+#ifndef __com_sun_star_presentation_Shape_idl__ 
+#include <com/sun/star/presentation/Shape.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_TextShape_idl__ 
+#include <com/sun/star/drawing/TextShape.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** This service is implemented by the title and subtitle presentation shape.
 
     <p>Presentation shapes can be used in a presentation
@@ -49,14 +49,14 @@
     by the presentation shapes on the <type scope="com::sun::star::drawing">MasterPage</type>.
  */
 published service TitleTextShape
-{
-    service com::sun::star::presentation::Shape;
-
-    service com::sun::star::drawing::TextShape;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::presentation::Shape; 
+    
+    service com::sun::star::drawing::TextShape;  
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/XCustomPresentationSupplier.idl b/offapi/com/sun/star/presentation/XCustomPresentationSupplier.idl
index 3949c9157932..51bd353d0fb8 100644
--- a/offapi/com/sun/star/presentation/XCustomPresentationSupplier.idl
+++ b/offapi/com/sun/star/presentation/XCustomPresentationSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_XCustomPresentationSupplier_idl__
-#define __com_sun_star_presentation_XCustomPresentationSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
-/** must be supported to provide access to customized
+#ifndef __com_sun_star_presentation_XCustomPresentationSupplier_idl__ 
+#define __com_sun_star_presentation_XCustomPresentationSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#include <com/sun/star/container/XNameContainer.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
+/** must be supported to provide access to customized 
     presentations of a presentation document.
-
-    @see        XCustomPresentation
-    @see        XCustomPresentationAccess
+    
+    @see 		XCustomPresentation 
+    @see		XCustomPresentationAccess
  */
 published interface XCustomPresentationSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
                 the <type>CustomPresentation</type>.
      */
-    com::sun::star::container::XNameContainer getCustomPresentations();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::container::XNameContainer getCustomPresentations(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/XHandoutMasterSupplier.idl b/offapi/com/sun/star/presentation/XHandoutMasterSupplier.idl
index c55af24981d3..7ece8b1b4593 100644
--- a/offapi/com/sun/star/presentation/XHandoutMasterSupplier.idl
+++ b/offapi/com/sun/star/presentation/XHandoutMasterSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_XHandoutMasterSupplier_idl__
-#define __com_sun_star_presentation_XHandoutMasterSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
-#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_XHandoutMasterSupplier_idl__ 
+#define __com_sun_star_presentation_XHandoutMasterSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
+#include <com/sun/star/drawing/XDrawPage.idl> 
+#endif 
+
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** returns the handout master page for this document
  */
 published interface XHandoutMasterSupplier: com::sun::star::uno::XInterface
-{
+{ 
     /** returns the <type>DrawPage</type>.
      */
-    com::sun::star::drawing::XDrawPage getHandoutMasterPage();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::drawing::XDrawPage getHandoutMasterPage(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/XPresentation.idl b/offapi/com/sun/star/presentation/XPresentation.idl
index 16c5715edff9..2b1ee78d3f18 100644
--- a/offapi/com/sun/star/presentation/XPresentation.idl
+++ b/offapi/com/sun/star/presentation/XPresentation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_XPresentation_idl__
-#define __com_sun_star_presentation_XPresentation_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_XPresentation_idl__ 
+#define __com_sun_star_presentation_XPresentation_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** With this interface you can control any object that implements
     a <type>Presentation</type>.
 */
 published interface XPresentation: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** The presentation is shown in full-screen and started from the
         beginning.
      */
-    void start();
-
-    //-------------------------------------------------------------------------
-
+    void start(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The presentation is stopped and the full-screen mode will end.
      */
-    void end();
-
-    //-------------------------------------------------------------------------
-
-    /** Starts the presentation from the beginning and shows the
+    void end(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** Starts the presentation from the beginning and shows the 
         actual running time to the user.
      */
-    void rehearseTimings();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void rehearseTimings(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/XPresentation2.idl b/offapi/com/sun/star/presentation/XPresentation2.idl
index c9609255d4df..2f5a553dcbb0 100644
--- a/offapi/com/sun/star/presentation/XPresentation2.idl
+++ b/offapi/com/sun/star/presentation/XPresentation2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_XPresentation2_idl__
-#define __com_sun_star_presentation_XPresentation2_idl__
+#ifndef __com_sun_star_presentation_XPresentation2_idl__ 
+#define __com_sun_star_presentation_XPresentation2_idl__ 
 
 #ifndef __com_sun_star_presentation_XPresentation_idl__
 #include <com/sun/star/presentation/XPresentation.idl>
 #endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_XSlideShowListener_idl__
-#include <com/sun/star/presentation/XSlideShowListener.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_XSlideShowController_idl__
-#include <com/sun/star/presentation/XSlideShowController.idl>
-#endif
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
 
- module com {  module sun {  module star {  module presentation {
+#ifndef __com_sun_star_presentation_XSlideShowListener_idl__ 
+#include <com/sun/star/presentation/XSlideShowListener.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_presentation_XSlideShowController_idl__ 
+#include <com/sun/star/presentation/XSlideShowController.idl> 
+#endif 
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** enhances the XPresentation interface to give access to
     a <type>XSlideShowController</type>  and
     to start a presentation with arguments.
@@ -61,39 +61,39 @@
 */
 interface XPresentation2
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** allows to start and stop the presentation.
     */
     interface XPresentation;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** gives access to the properties of the slideshow.
     */
     interface com::sun::star::beans::XPropertySet;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** start the slideshow with the given arguments.
         All arguments overide the values from <service>Presentation</service>
     */
-    void startWithArguments( [in] sequence< ::com::sun::star::beans::PropertyValue > Arguments );
+    void startWithArguments( [in] sequence< ::com::sun::star::beans::PropertyValue > Arguments ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** returns true if the slideshow is currently running */
     boolean isRunning();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** if the slideshow is running, this returns a controler object to
         control the running slideshow. */
     XSlideShowController getController();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/XPresentationPage.idl b/offapi/com/sun/star/presentation/XPresentationPage.idl
index ca41ed35c220..497871a073eb 100644
--- a/offapi/com/sun/star/presentation/XPresentationPage.idl
+++ b/offapi/com/sun/star/presentation/XPresentationPage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_XPresentationPage_idl__
-#define __com_sun_star_presentation_XPresentationPage_idl__
-
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
-#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_XPresentationPage_idl__ 
+#define __com_sun_star_presentation_XPresentationPage_idl__ 
+ 
+#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
+#include <com/sun/star/drawing/XDrawPage.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** describes a page from a presentation.
 
     @see com::sun::star::drawing::DrawPage
  */
 published interface XPresentationPage: com::sun::star::drawing::XDrawPage
-{
-    //-------------------------------------------------------------------------
-
-    /** return the note page from the current page in the presentation,
+{ 
+    //------------------------------------------------------------------------- 
+    
+    /** return the note page from the current page in the presentation, 
         the name for the note page in the user interface note view, and one of the views
         from a presentation page.
      */
-    com::sun::star::drawing::XDrawPage getNotesPage();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::drawing::XDrawPage getNotesPage(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/XPresentationSupplier.idl b/offapi/com/sun/star/presentation/XPresentationSupplier.idl
index f014ad9b379e..67b0ca305442 100644
--- a/offapi/com/sun/star/presentation/XPresentationSupplier.idl
+++ b/offapi/com/sun/star/presentation/XPresentationSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_XPresentationSupplier_idl__
-#define __com_sun_star_presentation_XPresentationSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_presentation_XPresentation_idl__
-#include <com/sun/star/presentation/XPresentation.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_presentation_XPresentationSupplier_idl__ 
+#define __com_sun_star_presentation_XPresentationSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_presentation_XPresentation_idl__ 
+#include <com/sun/star/presentation/XPresentation.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** controls a presentation directly. This supplier will do this.
  */
 published interface XPresentationSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+    
     /**
         @returns an interface to control a presentation.
      */
-    com::sun::star::presentation::XPresentation getPresentation();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::presentation::XPresentation getPresentation(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/XShapeEventListener.idl b/offapi/com/sun/star/presentation/XShapeEventListener.idl
index d2578ea8dfbe..fd960f0fad59 100644
--- a/offapi/com/sun/star/presentation/XShapeEventListener.idl
+++ b/offapi/com/sun/star/presentation/XShapeEventListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,15 +27,15 @@
 #ifndef __com_sun_star_presentation_XShapeEventListener_idl__
 #define __com_sun_star_presentation_XShapeEventListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XMouseListener_idl__
-#include <com/sun/star/awt/XMouseListener.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
-#endif
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+#ifndef __com_sun_star_awt_XMouseListener_idl__ 
+#include <com/sun/star/awt/XMouseListener.idl> 
+#endif 
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/drawing/XShape.idl> 
+#endif 
 
 module com {  module sun {  module star {  module presentation {
 
@@ -56,8 +56,8 @@ interface XShapeEventListener : ::com::sun::star::lang::XEventListener
         @param aOriginalEvent
         The original mouse click event that generated this notification.
      */
-    void click( [in] ::com::sun::star::drawing::XShape  xShape,
-                [in] ::com::sun::star::awt::MouseEvent  aOriginalEvent );
+    void click( [in] ::com::sun::star::drawing::XShape 	xShape,
+                [in] ::com::sun::star::awt::MouseEvent	aOriginalEvent );
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/presentation/XSlideShow.idl b/offapi/com/sun/star/presentation/XSlideShow.idl
index 2bbce811c00f..d63d71c342a7 100644
--- a/offapi/com/sun/star/presentation/XSlideShow.idl
+++ b/offapi/com/sun/star/presentation/XSlideShow.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,42 +27,42 @@
 #ifndef _com_sun_star_presentation_XSlideShow_idl
 #define _com_sun_star_presentation_XSlideShow_idl
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
-#include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
-#include <com/sun/star/rendering/XSpriteCanvas.idl>
-#endif
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
-#include <com/sun/star/animations/XAnimationNode.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+#ifndef __com_sun_star_geometry_RealRectangle2D_idl__ 
+#include <com/sun/star/geometry/RealRectangle2D.idl> 
+#endif 
+#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__ 
+#include <com/sun/star/rendering/XSpriteCanvas.idl> 
+#endif 
+#ifndef __com_sun_star_animations_XAnimationNode_idl__ 
+#include <com/sun/star/animations/XAnimationNode.idl> 
+#endif 
 #endif
 #ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
-#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
+#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
+#include <com/sun/star/drawing/XDrawPage.idl> 
+#endif 
 #ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
 #include <com/sun/star/drawing/XDrawPagesSupplier.idl>
 #endif
-#ifndef __com_sun_star_drawing_XShape_idl__
-#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_presentation_XSlideShowView_idl__
-#include <com/sun/star/presentation/XSlideShowView.idl>
-#endif
-#ifndef __com_sun_star_presentation_XSlideShowListener_idl__
-#include <com/sun/star/presentation/XSlideShowListener.idl>
-#endif
-#ifndef __com_sun_star_presentation_XShapeEventListener_idl__
-#include <com/sun/star/presentation/XShapeEventListener.idl>
-#endif
+#ifndef __com_sun_star_drawing_XShape_idl__ 
+#include <com/sun/star/drawing/XShape.idl> 
+#endif 
+#ifndef __com_sun_star_presentation_XSlideShowView_idl__ 
+#include <com/sun/star/presentation/XSlideShowView.idl> 
+#endif 
+#ifndef __com_sun_star_presentation_XSlideShowListener_idl__ 
+#include <com/sun/star/presentation/XSlideShowListener.idl> 
+#endif 
+#ifndef __com_sun_star_presentation_XShapeEventListener_idl__ 
+#include <com/sun/star/presentation/XShapeEventListener.idl> 
+#endif 
 
 module com {  module sun {  module star {  module presentation {
 
@@ -197,15 +197,15 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
 
     /** Change the pause state of the slide show.<p>
 
-        This method either pauses the slide show (all currently
-        running effects are stopped), or starts a previously stopped
+        This method either pauses the slide show (all currently 
+        running effects are stopped), or starts a previously stopped 
         show again (all paused effects start again).<p>
 
         @param bPauseShow
         When <TRUE>, the show is paused. When <FALSE>, and the show
         was paused, it starts running at the paused position again.
 
-        @return <TRUE>, if the requested action was successfully
+        @return <TRUE>, if the requested action was successfully 
         performed.
      */
     boolean pause( [in] boolean bPauseShow );
@@ -234,13 +234,13 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
         supported on show(). Currently, the following values
         are recognized:
         <ul>
-            <li>name: AutomaticAdvancement, value: double. When given, effects
-                and slides are advanced automatically. The double value specifies
-                the timeout between the end of one effect until the start of the
+            <li>name: AutomaticAdvancement, value: double. When given, effects 
+                and slides are advanced automatically. The double value specifies 
+                the timeout between the end of one effect until the start of the 
                 next one. Negative values are truncated to zero here. When given,
                 but with empty value, automatic advancement is disabled again.</li>
             <li>name: UserPaintColor, value: long. When given, the slide show
-                will display a small stylus as the mouse cursor. When pressing the
+                will display a small stylus as the mouse cursor. When pressing the 
                 left mouse key, the user can paint a thin line in the given color.</li>
         </ul>
         A changed property is effective immediately.
@@ -278,7 +278,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
     boolean removeView( [in] XSlideShowView xView );
 
     /** Update the animations.<p>
-
+        
         This method updates all currently active slide animations. The
         XSlideShow implementations do not render animations
         automatically, but must be called from their clients. This
diff --git a/offapi/com/sun/star/presentation/XSlideShowController.idl b/offapi/com/sun/star/presentation/XSlideShowController.idl
index 97a670c29486..0462a8c33735 100644
--- a/offapi/com/sun/star/presentation/XSlideShowController.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_presentation_XSlideShowController_idl__
-#define __com_sun_star_presentation_XSlideShowController_idl__
+#ifndef __com_sun_star_presentation_XSlideShowController_idl__ 
+#define __com_sun_star_presentation_XSlideShowController_idl__ 
 
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
-#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
+#ifndef __com_sun_star_drawing_XDrawPage_idl__ 
+#include <com/sun/star/drawing/XDrawPage.idl> 
+#endif 
 
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
 
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
 
 #ifndef __com_sun_star_presentation_XSlideShow_idl__
 #include <com/sun/star/presentation/XSlideShow.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module presentation {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module presentation {  
+ 
+//============================================================================= 
+ 
 /** interface to control a running slideshow.
 
     @see XPresentation2
@@ -56,7 +56,7 @@
 */
 interface XSlideShowController
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** returns true if the slideshow is still running.
         If this returns false, this component is already disposed.
@@ -65,49 +65,49 @@ interface XSlideShowController
     */
     boolean isRunning();
 
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
                 the number of slides in this slideshow.
 
         @see getSlideByIndex
      */
-    long getSlideCount();
-
-    //-------------------------------------------------------------------------
-
-    /** gives access to the slides that will be shown in this slideshow.
-
+    long getSlideCount(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /**	gives access to the slides that will be shown in this slideshow.
+        
         <p>Slides are returned in the order they will be displayed in the
         presentation which can be different than the orders of slides in
         the document. Not all slides must be present and each slide can
         be used more than once.
-
-        @returns
+        
+        @returns  
             the slide at the specified index.
-
-        @param Index
+                 
+        @param Index	 
             specifies the position in the list of slides that are displayed
-            in this slideshow. The first index is 0.
-
-        @throws com::sun::star::lang::IndexOutOfBoundException
-            if the index is not valid.
-
+            in this slideshow. The first index is 0. 
+                 
+        @throws com::sun::star::lang::IndexOutOfBoundException 
+            if the index is not valid. 
+                 
      */
-    ::com::sun::star::drawing::XDrawPage getSlideByIndex( [in] long Index )
-            raises( com::sun::star::lang::IndexOutOfBoundsException );
+    ::com::sun::star::drawing::XDrawPage getSlideByIndex( [in] long Index ) 
+            raises( com::sun::star::lang::IndexOutOfBoundsException ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** addes a listener that recieves events while the slideshow is running. */
     void addSlideShowListener( [in] XSlideShowListener Listener );
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** removes a listener. */
     void removeSlideShowListener( [in] XSlideShowListener Listener );
-
-    //-------------------------------------------------------------------------
+    
+    //------------------------------------------------------------------------- 
 
     /** start next effects that wait on a generic trigger.
         <p>If no generic triggers are waiting the next
@@ -115,7 +115,7 @@ interface XSlideShowController
     */
     void gotoNextEffect();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** undo the last effects that where triggered by a generic trigger.
         <p>If there is no previous effect that can be undone then the
@@ -123,35 +123,35 @@ interface XSlideShowController
     */
     void gotoPreviousEffect();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** goto and display first slide */
     void gotoFirstSlide();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** goto and display next slide.
         <p>Remaining effects on the current slide will be skiped.*/
     void gotoNextSlide();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** goto and display previous slide.
         <p>Remaining effects on the current slide will be skiped.*/
     void gotoPreviousSlide();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** goto and display last slide.
         <p>Remaining effects on the current slide will be skiped.*/
     void gotoLastSlide();
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** goto the given textual bookmark */
     void gotoBookmark( [in] string Bookmark );
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** jumps to the given slide.
         <p>The slide can also be a slide that would normaly not be shown during
@@ -165,18 +165,18 @@ interface XSlideShowController
     void gotoSlide( [in] com::sun::star::drawing::XDrawPage Page )
         raises( com::sun::star::lang::IllegalArgumentException );
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** jumps to the slide at the given index.
     */
     void gotoSlideIndex( [in] long Index );
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** stop all currently played sounds */
     void stopSound();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** pauses the slideshow. All effects are paused.
         <p>The slideshow continues on next user input or if
@@ -184,13 +184,13 @@ interface XSlideShowController
     */
     void pause();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** resumes a paused slideshow.
     */
     void resume();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** returns <TRUE/> if the slideshow is currently paused.
 
@@ -199,7 +199,7 @@ interface XSlideShowController
     */
     boolean isPaused();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** pauses the slideshow and blanks the screen in the given color.
         <p>Change attribute <member>Pause</member> to false to unpause
@@ -207,7 +207,7 @@ interface XSlideShowController
     */
     void blankScreen( [in] long Color );
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** activates the user interface of this slideshow.
 
@@ -219,7 +219,7 @@ interface XSlideShowController
     //-------------------------------------------------------------------------
     /** can be called to deactivate the user interface of this slideshow.
 
-        <p>A deactivated
+        <p>A deactivated 
         @see <member>activate()</member>
         @see <member>isActive()</member>
      */
@@ -236,61 +236,61 @@ interface XSlideShowController
      */
     boolean isActive();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** returns slide that is currently displayed */
     com::sun::star::drawing::XDrawPage getCurrentSlide();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** returns the index of the current slide. */
     long getCurrentSlideIndex();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** the index for the slide that is displayed next. */
     long getNextSlideIndex();
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** returns <TRUE/> if the slideshow was started to run endlessly.
      */
     boolean isEndless();
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Returns <TRUE/> if the slideshow was started in full-screen mode.
      */
     boolean isFullScreen();
 
-    //-------------------------------------------------------------------------
-
-    /** If this attribute is set to <TRUE/>, the window of the slideshow is
+    //------------------------------------------------------------------------- 
+     
+    /** If this attribute is set to <TRUE/>, the window of the slideshow is 
         always on top of all other windows.
      */
-    [attribute] boolean AlwaysOnTop;
-
-    //-------------------------------------------------------------------------
-
+    [attribute] boolean AlwaysOnTop; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If this attribute is <TRUE/>, the mouse is visible during the
         slideshow.
      */
-    [attribute] boolean MouseVisible;
-
-    //-------------------------------------------------------------------------
-
+    [attribute] boolean MouseVisible; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If this is <TRUE/>, a pen is shown during presentation.
 
         <p>You can draw on the presentation with this pen.</p>
      */
-    [attribute] boolean UsePen;
+    [attribute] boolean UsePen; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** This attribute changes the color of the pen. */
     [attribute] long PenColor;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** returns the actuall <type>XSlideShow</type> instance that runs the
         slideshow.
@@ -298,11 +298,11 @@ interface XSlideShowController
         not the <type>XSlideShow</type> itself. */
     XSlideShow getSlideShow();
 
-    //-------------------------------------------------------------------------
-};
+    //------------------------------------------------------------------------- 
+}; 
 
-//=============================================================================
-
-}; }; }; };
-
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/presentation/XSlideShowListener.idl b/offapi/com/sun/star/presentation/XSlideShowListener.idl
index 01127e66253f..016c0a2eefe1 100644
--- a/offapi/com/sun/star/presentation/XSlideShowListener.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,9 @@
 #ifndef __com_sun_star_presentation_XSlideShowListener_idl__
 #define __com_sun_star_presentation_XSlideShowListener_idl__
 
-#ifndef __com_sun_star_animations_XAnimationListener_idl__
-#include <com/sun/star/animations/XAnimationListener.idl>
-#endif
+#ifndef __com_sun_star_animations_XAnimationListener_idl__ 
+#include <com/sun/star/animations/XAnimationListener.idl> 
+#endif 
 
 module com {  module sun {  module star {  module presentation {
 
@@ -67,7 +67,7 @@ interface XSlideShowListener : ::com::sun::star::animations::XAnimationListener
             flag is <TRUE/>.
     */
     void slideEnded( [in] boolean reverse );
-
+    
     /** Notifies that a hyperlink has been clicked.
         @param hyperLink hyperlink URL
      */
diff --git a/offapi/com/sun/star/presentation/XSlideShowView.idl b/offapi/com/sun/star/presentation/XSlideShowView.idl
index 7a78a9861f71..d3d65a9357fc 100644
--- a/offapi/com/sun/star/presentation/XSlideShowView.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,27 +27,27 @@
 #ifndef __com_sun_star_presentation_XSlideShowView_idl__
 #define __com_sun_star_presentation_XSlideShowView_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
-#include <com/sun/star/rendering/XSpriteCanvas.idl>
-#endif
-#ifndef __com_sun_star_util_XModifyListener_idl__
-#include <com/sun/star/util/XModifyListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XPaintListener_idl__
-#include <com/sun/star/awt/XPaintListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XMouseListener_idl__
-#include <com/sun/star/awt/XMouseListener.idl>
-#endif
-#ifndef __com_sun_star_awt_XMouseMotionListener_idl__
-#include <com/sun/star/awt/XMouseMotionListener.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
-#include <com/sun/star/awt/Rectangle.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__ 
+#include <com/sun/star/rendering/XSpriteCanvas.idl> 
+#endif 
+#ifndef __com_sun_star_util_XModifyListener_idl__ 
+#include <com/sun/star/util/XModifyListener.idl> 
+#endif 
+#ifndef __com_sun_star_awt_XPaintListener_idl__ 
+#include <com/sun/star/awt/XPaintListener.idl> 
+#endif 
+#ifndef __com_sun_star_awt_XMouseListener_idl__ 
+#include <com/sun/star/awt/XMouseListener.idl> 
+#endif 
+#ifndef __com_sun_star_awt_XMouseMotionListener_idl__ 
+#include <com/sun/star/awt/XMouseMotionListener.idl> 
+#endif 
+#ifndef __com_sun_star_awt_Rectangle_idl__ 
+#include <com/sun/star/awt/Rectangle.idl> 
+#endif 
 
 module com {  module sun {  module star {  module presentation {
 
@@ -119,7 +119,7 @@ interface XSlideShowView : ::com::sun::star::uno::XInterface
         representation.<p>
 
         @param xListener
-        Listener interface to call when the view needs a repaint.
+        Listener interface to call when the view needs a repaint.        
      */
     void addPaintListener( [in] ::com::sun::star::awt::XPaintListener xListener );
 
@@ -138,15 +138,15 @@ interface XSlideShowView : ::com::sun::star::uno::XInterface
         @param xListener
         Listener interface to call when the mouse is clicked on the view.
      */
-    void addMouseListener( [in] com::sun::star::awt::XMouseListener xListener );
-
+    void addMouseListener( [in] com::sun::star::awt::XMouseListener xListener ); 
+ 
     /** Revoke a previously registered mouse listener.<p>
 
         @param xListener
         Listener interface to revoke from being called.
      */
-    void removeMouseListener( [in] com::sun::star::awt::XMouseListener xListener );
-
+    void removeMouseListener( [in] com::sun::star::awt::XMouseListener xListener ); 
+ 
     /** Add a mouse motion listener to the view.<p>
 
         This method registers a listener with the view, which will get
@@ -155,14 +155,14 @@ interface XSlideShowView : ::com::sun::star::uno::XInterface
         @param xListener
         Listener interface to call when the mouse is moved on the view.
      */
-    void addMouseMotionListener( [in] com::sun::star::awt::XMouseMotionListener xListener );
-
+    void addMouseMotionListener( [in] com::sun::star::awt::XMouseMotionListener xListener ); 
+ 
     /** Revoke a previously registered mouse move listener.<p>
 
         @param xListener
         Listener interface to revoke from being called.
      */
-    void removeMouseMotionListener( [in] com::sun::star::awt::XMouseMotionListener xListener );
+    void removeMouseMotionListener( [in] com::sun::star::awt::XMouseMotionListener xListener ); 
 
     /** Change the mouse cursor currently in effect.<p>
 
diff --git a/offapi/com/sun/star/presentation/XTransition.idl b/offapi/com/sun/star/presentation/XTransition.idl
index ddd201b05e0b..e6970524f979 100644
--- a/offapi/com/sun/star/presentation/XTransition.idl
+++ b/offapi/com/sun/star/presentation/XTransition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,9 @@
 #ifndef __com_sun_star_presentation_XTransition_idl__
 #define __com_sun_star_presentation_XTransition_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
 module com {  module sun {  module star {
 
@@ -47,7 +47,7 @@ interface XTransition : ::com::sun::star::uno::XInterface
 {
     /** Update transition on screen to given time state.<p>
 
-        @param t
+        @param t 
         Time on the transition timeline to display. Must be in the
         [0,1] range.
      */
diff --git a/offapi/com/sun/star/presentation/XTransitionFactory.idl b/offapi/com/sun/star/presentation/XTransitionFactory.idl
index 44fc8b89aea4..3126988f429c 100644
--- a/offapi/com/sun/star/presentation/XTransitionFactory.idl
+++ b/offapi/com/sun/star/presentation/XTransitionFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,15 +27,15 @@
 #ifndef __com_sun_star_presentation_XTransitionFactory_idl__
 #define __com_sun_star_presentation_XTransitionFactory_idl__
 
-#ifndef __com_sun_star_presentation_XTransition_idl__
-#include <com/sun/star/presentation/XTransition.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
-#include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
+#ifndef __com_sun_star_presentation_XTransition_idl__ 
+#include <com/sun/star/presentation/XTransition.idl> 
+#endif 
+#ifndef __com_sun_star_geometry_RealPoint2D_idl__ 
+#include <com/sun/star/geometry/RealPoint2D.idl> 
+#endif 
 
 
-module com {  module sun {  module star {
+module com {  module sun {  module star {  
 
 module rendering { interface XBitmap; };
 
@@ -77,7 +77,7 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface
         Offset in pixel from the top, left edge of the view, such that the
         slide displays similar to normal slideshow
      */
-    XTransition createTransition( [in] short                                 transitionType,
+    XTransition createTransition( [in] short                                 transitionType, 
                                   [in] short                                 transitionSubType,
                                   [in] XSlideShowView                        view,
                                   [in] com::sun::star::rendering::XBitmap    leavingBitmap,
diff --git a/offapi/com/sun/star/presentation/textfield/DateTime.idl b/offapi/com/sun/star/presentation/textfield/DateTime.idl
index 7c47e1b29d6d..dfb0c1f175cc 100644
--- a/offapi/com/sun/star/presentation/textfield/DateTime.idl
+++ b/offapi/com/sun/star/presentation/textfield/DateTime.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/presentation/textfield/Footer.idl b/offapi/com/sun/star/presentation/textfield/Footer.idl
index 7638565653d2..6c8973490a0d 100644
--- a/offapi/com/sun/star/presentation/textfield/Footer.idl
+++ b/offapi/com/sun/star/presentation/textfield/Footer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/presentation/textfield/Header.idl b/offapi/com/sun/star/presentation/textfield/Header.idl
index 9c2db2f64f79..279b8fa53518 100644
--- a/offapi/com/sun/star/presentation/textfield/Header.idl
+++ b/offapi/com/sun/star/presentation/textfield/Header.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/BlankNode.idl b/offapi/com/sun/star/rdf/BlankNode.idl
index 5829a3f02e9f..cad859471233 100644
--- a/offapi/com/sun/star/rdf/BlankNode.idl
+++ b/offapi/com/sun/star/rdf/BlankNode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/FileFormat.idl b/offapi/com/sun/star/rdf/FileFormat.idl
index e5814ca70828..2a54ebb3f4e6 100644
--- a/offapi/com/sun/star/rdf/FileFormat.idl
+++ b/offapi/com/sun/star/rdf/FileFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/Literal.idl b/offapi/com/sun/star/rdf/Literal.idl
index 17a197534c65..537c1b0ce635 100644
--- a/offapi/com/sun/star/rdf/Literal.idl
+++ b/offapi/com/sun/star/rdf/Literal.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/ParseException.idl b/offapi/com/sun/star/rdf/ParseException.idl
index 4c75afcadc98..92600ee7b792 100644
--- a/offapi/com/sun/star/rdf/ParseException.idl
+++ b/offapi/com/sun/star/rdf/ParseException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/QueryException.idl b/offapi/com/sun/star/rdf/QueryException.idl
index aa446de10012..ed6b55493744 100644
--- a/offapi/com/sun/star/rdf/QueryException.idl
+++ b/offapi/com/sun/star/rdf/QueryException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/Repository.idl b/offapi/com/sun/star/rdf/Repository.idl
index 5911d4dfe473..b6df3d7009bb 100644
--- a/offapi/com/sun/star/rdf/Repository.idl
+++ b/offapi/com/sun/star/rdf/Repository.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/RepositoryException.idl b/offapi/com/sun/star/rdf/RepositoryException.idl
index 8d15b23c943b..4ce493c4cc24 100644
--- a/offapi/com/sun/star/rdf/RepositoryException.idl
+++ b/offapi/com/sun/star/rdf/RepositoryException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/Statement.idl b/offapi/com/sun/star/rdf/Statement.idl
index 3979103fd4df..f035a60aff46 100644
--- a/offapi/com/sun/star/rdf/Statement.idl
+++ b/offapi/com/sun/star/rdf/Statement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/URI.idl b/offapi/com/sun/star/rdf/URI.idl
index a0a785c96a65..3f638c2ea115 100644
--- a/offapi/com/sun/star/rdf/URI.idl
+++ b/offapi/com/sun/star/rdf/URI.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/URIs.idl b/offapi/com/sun/star/rdf/URIs.idl
index ca12ba249377..826968294325 100644
--- a/offapi/com/sun/star/rdf/URIs.idl
+++ b/offapi/com/sun/star/rdf/URIs.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/XBlankNode.idl b/offapi/com/sun/star/rdf/XBlankNode.idl
index d63a4bd93a00..68ead6e29f68 100644
--- a/offapi/com/sun/star/rdf/XBlankNode.idl
+++ b/offapi/com/sun/star/rdf/XBlankNode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl b/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl
index f8bbade4ef74..4a657b2441c1 100644
--- a/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl
+++ b/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -121,7 +121,7 @@ interface XDocumentMetadataAccess
     //-------------------------------------------------------------------------
     /** get the unique ODF element with the given metadata reference.
 
-        @param MetadataReference
+        @param MetadataReference 
             a metadata reference, comprising the stream name and the XML ID
             For example: Pair("content.xml", "foo-element-1")
 
diff --git a/offapi/com/sun/star/rdf/XDocumentRepository.idl b/offapi/com/sun/star/rdf/XDocumentRepository.idl
index 215fd89fa954..d0d7cccb7051 100644
--- a/offapi/com/sun/star/rdf/XDocumentRepository.idl
+++ b/offapi/com/sun/star/rdf/XDocumentRepository.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/XLiteral.idl b/offapi/com/sun/star/rdf/XLiteral.idl
index 148809107212..0c0fafda8293 100644
--- a/offapi/com/sun/star/rdf/XLiteral.idl
+++ b/offapi/com/sun/star/rdf/XLiteral.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/XMetadatable.idl b/offapi/com/sun/star/rdf/XMetadatable.idl
index e7f01d9c05ba..a11009a37c52 100644
--- a/offapi/com/sun/star/rdf/XMetadatable.idl
+++ b/offapi/com/sun/star/rdf/XMetadatable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/XNamedGraph.idl b/offapi/com/sun/star/rdf/XNamedGraph.idl
index d71c5a599e9e..5f226ba739ca 100644
--- a/offapi/com/sun/star/rdf/XNamedGraph.idl
+++ b/offapi/com/sun/star/rdf/XNamedGraph.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/XNode.idl b/offapi/com/sun/star/rdf/XNode.idl
index 0c7f70d5e4f7..bf52f4e20b87 100644
--- a/offapi/com/sun/star/rdf/XNode.idl
+++ b/offapi/com/sun/star/rdf/XNode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/XQuerySelectResult.idl b/offapi/com/sun/star/rdf/XQuerySelectResult.idl
index 19ceecaf36d1..ff2d913827a4 100644
--- a/offapi/com/sun/star/rdf/XQuerySelectResult.idl
+++ b/offapi/com/sun/star/rdf/XQuerySelectResult.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ module com {   module sun {   module star {   module rdf {
     Note that each query result retrieved via
     <member scope="com::sun::star::container">XEnumeration::nextElement</member>
     has the type <type dim="[]">XNode</type>,
-    the length of the sequence being the same as the number of query variables.
+    the length of the sequence being the same as the number of query variables. 
     </p>
 
     @since OOo 3.0
diff --git a/offapi/com/sun/star/rdf/XReifiedStatement.idl b/offapi/com/sun/star/rdf/XReifiedStatement.idl
index 9f697552aa6e..aea1706598be 100644
--- a/offapi/com/sun/star/rdf/XReifiedStatement.idl
+++ b/offapi/com/sun/star/rdf/XReifiedStatement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/XRepository.idl b/offapi/com/sun/star/rdf/XRepository.idl
index 1b76ff1158a7..85718b403375 100644
--- a/offapi/com/sun/star/rdf/XRepository.idl
+++ b/offapi/com/sun/star/rdf/XRepository.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/XRepositorySupplier.idl b/offapi/com/sun/star/rdf/XRepositorySupplier.idl
index 15984a9438d4..a1b42491da04 100644
--- a/offapi/com/sun/star/rdf/XRepositorySupplier.idl
+++ b/offapi/com/sun/star/rdf/XRepositorySupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/XResource.idl b/offapi/com/sun/star/rdf/XResource.idl
index 3c10b586fd78..d6fcea6bc2c7 100644
--- a/offapi/com/sun/star/rdf/XResource.idl
+++ b/offapi/com/sun/star/rdf/XResource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rdf/XURI.idl b/offapi/com/sun/star/rdf/XURI.idl
index 6ba59cec0dd6..3960f48bee4d 100644
--- a/offapi/com/sun/star/rdf/XURI.idl
+++ b/offapi/com/sun/star/rdf/XURI.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rendering/AnimationAttributes.idl b/offapi/com/sun/star/rendering/AnimationAttributes.idl
index e1d2f1a1eeb5..50656d8ead7b 100644
--- a/offapi/com/sun/star/rendering/AnimationAttributes.idl
+++ b/offapi/com/sun/star/rendering/AnimationAttributes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,20 +40,20 @@ module com { module sun { module star { module rendering {
 struct AnimationAttributes
 {
     /// Preferred duration of the animation sequence in seconds.
-    double                                      Duration;
-
+    double 										Duration;
+    
     //-------------------------------------------------------------------------
 
     /** Repeat mode of the animation sequence.<p>
-
+    
         This value determines how the [0,1] parameter space of the animation
         should be sweeped through. Permissible values are given in
         <type>AnimationRepeat</type>.<p>
-
+        
         @see AnimationRepeat.
      */
-    byte                                        RepeatMode;
-
+    byte										RepeatMode;
+    
     //-------------------------------------------------------------------------
 
     /** Size of the untrasnformed animation sequence.<p>
@@ -63,8 +63,8 @@ struct AnimationAttributes
         e.g. <type>XSprite</type> implementations to cache rendered
         animation content in finite-sized bitmaps.<p>
      */
-    ::com::sun::star::geometry::RealSize2D  UntransformedSize;
-};
+    ::com::sun::star::geometry::RealSize2D	UntransformedSize;
+}; 
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/rendering/AnimationRepeat.idl b/offapi/com/sun/star/rendering/AnimationRepeat.idl
index 8bde41c46b99..c2986942209e 100644
--- a/offapi/com/sun/star/rendering/AnimationRepeat.idl
+++ b/offapi/com/sun/star/rendering/AnimationRepeat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,8 +37,8 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0.0
  */
-constants AnimationRepeat
-{
+constants AnimationRepeat 
+{ 
     /** The [0,1] parameter range is sweeped through exactly once.<p>
 
         The [0,1] parameter range is sweeped through exactly once,
diff --git a/offapi/com/sun/star/rendering/BlendMode.idl b/offapi/com/sun/star/rendering/BlendMode.idl
index 05d53892877a..d5ff655f2755 100755
--- a/offapi/com/sun/star/rendering/BlendMode.idl
+++ b/offapi/com/sun/star/rendering/BlendMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rendering/CanvasFactory.idl b/offapi/com/sun/star/rendering/CanvasFactory.idl
index d735dc368855..80edd3a5f182 100644
--- a/offapi/com/sun/star/rendering/CanvasFactory.idl
+++ b/offapi/com/sun/star/rendering/CanvasFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,9 +35,9 @@ module com { module sun { module star { module rendering {
 
 /** The <type>CanvasFactory</type> is used to create the <type>Canvas</type>
     objects, evaluating the user's configuration preferences from
-
+    
     <code>/org.openoffice.VCL/Settings/Canvas/PreferredServices</code>.
-
+    
     The latter specifies a string list of service names to use.
 
     <p>
@@ -48,11 +48,11 @@ module com { module sun { module star { module rendering {
     If you want to manually override the configured service list, you can pass
     a service name to try first.
     </p>
-
+    
     @since OOo 2.0.0
 */
 service CanvasFactory : com::sun::star::lang::XMultiComponentFactory;
-
+ 
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/rendering/Caret.idl b/offapi/com/sun/star/rendering/Caret.idl
index 7d04213987ee..439b33643165 100644
--- a/offapi/com/sun/star/rendering/Caret.idl
+++ b/offapi/com/sun/star/rendering/Caret.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,14 +36,14 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0.0
  */
-struct Caret
+struct Caret 
 {
     /** This contains the main caret index.<p>
 
         The main caret index corresponds to the insert position when
         inserting text in the layout's main text direction.
      */
-    long        MainCaretIndex;
+    long 		MainCaretIndex;
 
     /** This contains the secondary caret index.<p>
 
@@ -52,7 +52,7 @@ struct Caret
         at a direction change opposite to the layout's main text
         direction.
      */
-    long        SecondaryCaretIndex;
+    long 		SecondaryCaretIndex;
 
     /** The angle of the caret.<p>
 
@@ -62,7 +62,7 @@ struct Caret
         vertically). The rotation angle is positive for
         counter-clockwise rotations.<p>
      */
-    double      CaretAngle;
+    double		CaretAngle;
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/ColorComponentTag.idl b/offapi/com/sun/star/rendering/ColorComponentTag.idl
index 7c49edab6d8c..09262ab9891a 100644
--- a/offapi/com/sun/star/rendering/ColorComponentTag.idl
+++ b/offapi/com/sun/star/rendering/ColorComponentTag.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 module com { module sun { module star { module rendering {
 
 /** A collection of tags for the individual components of a color.<p>
-
+    
     Color components usually corrspond to physical attributes like the
     amount of red colorant contained in an output color. This constant
     field enumerates the most common ones.
diff --git a/offapi/com/sun/star/rendering/ColorProfile.idl b/offapi/com/sun/star/rendering/ColorProfile.idl
index 3dc533429ff8..7e7baefc9a8c 100644
--- a/offapi/com/sun/star/rendering/ColorProfile.idl
+++ b/offapi/com/sun/star/rendering/ColorProfile.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rendering/ColorSpaceType.idl b/offapi/com/sun/star/rendering/ColorSpaceType.idl
index 1f60100f7fc3..8f4a7d64077f 100644
--- a/offapi/com/sun/star/rendering/ColorSpaceType.idl
+++ b/offapi/com/sun/star/rendering/ColorSpaceType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 module com { module sun { module star { module rendering {
 
 /// Categories for color spaces
-constants ColorSpaceType
+constants ColorSpaceType 
 {
     /** Unspecified device color space - use conversion functions to
         convert to standard color spaces
@@ -51,7 +51,7 @@ constants ColorSpaceType
 
         See <a
         href="http://en.wikipedia.org/wiki/CMYK">wikipedia</a>
-        for a thorough explanation.
+        for a thorough explanation.    
      */
     const byte CMYK=3;
 
@@ -59,7 +59,7 @@ constants ColorSpaceType
 
         See <a
         href="http://en.wikipedia.org/wiki/Hexachrome">wikipedia</a>
-        for a thorough explanation.
+        for a thorough explanation.    
      */
     const byte CMYKOG=4;
 
diff --git a/offapi/com/sun/star/rendering/CompositeOperation.idl b/offapi/com/sun/star/rendering/CompositeOperation.idl
index 0c1c4448ee05..85e4c1e3501b 100644
--- a/offapi/com/sun/star/rendering/CompositeOperation.idl
+++ b/offapi/com/sun/star/rendering/CompositeOperation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@ module com { module sun { module star { module rendering {
     When performing this calculations, it is assumed that all color
     values are premultiplied with the corresponding alpha values (if
     no alpha is specified, 1.0 is assumed). Then, the following
-    general compositing operation is performed:
+    general compositing operation is performed: 
     <p>
     C = Ca * Fa + Cb * Fb
     <p>
@@ -61,7 +61,7 @@ constants CompositeOperation
         Fa = 1, Fb = 0.<p>
      */
     const byte SOURCE = 1;
-
+    
     /** Leave the destination as-is.<p>
 
         Leave the destination as-is. The function values are: Fa = 0,
@@ -70,7 +70,7 @@ constants CompositeOperation
     const byte DESTINATION = 2;
 
     /** Copy the source over the destination.<p>
-
+        
         Copy the source over the destination. The function values are:
         Fa = 1, Fb = 1-Aa.<p>
      */
@@ -98,7 +98,7 @@ constants CompositeOperation
     const byte INSIDE_REVERSE = 6;
 
     /** Copy the source to the destination<p>
-
+        
         Copy the source to the destination, but limited to where the
         destination is not. The function values are: Fa = 1-Ab, Fb =
         0.<p>
@@ -113,7 +113,7 @@ constants CompositeOperation
     const byte OUTSIDE_REVERSE = 8;
 
     /** Copy the source over the destination<p>
-
+        
         Copy the source over the destination, but only where the
         destination is. Keep the destination. The function values are:
         Fa = Ab, Fb = 1-Aa.<p>
diff --git a/offapi/com/sun/star/rendering/EmphasisMark.idl b/offapi/com/sun/star/rendering/EmphasisMark.idl
index be0847a0dcd2..abda617a1bfc 100644
--- a/offapi/com/sun/star/rendering/EmphasisMark.idl
+++ b/offapi/com/sun/star/rendering/EmphasisMark.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rendering/FillRule.idl b/offapi/com/sun/star/rendering/FillRule.idl
index ff0aab58ab9a..105fe3b173a1 100644
--- a/offapi/com/sun/star/rendering/FillRule.idl
+++ b/offapi/com/sun/star/rendering/FillRule.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rendering/FloatingPointBitmapFormat.idl b/offapi/com/sun/star/rendering/FloatingPointBitmapFormat.idl
index 7fd0a972f56f..69c0820444c1 100644
--- a/offapi/com/sun/star/rendering/FloatingPointBitmapFormat.idl
+++ b/offapi/com/sun/star/rendering/FloatingPointBitmapFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0.0
  */
-constants FloatingPointBitmapFormat
+constants FloatingPointBitmapFormat 
 {
     /** Half-float format.<p>
 
diff --git a/offapi/com/sun/star/rendering/FloatingPointBitmapLayout.idl b/offapi/com/sun/star/rendering/FloatingPointBitmapLayout.idl
index bef73dc7fc35..b49ab3504a56 100644
--- a/offapi/com/sun/star/rendering/FloatingPointBitmapLayout.idl
+++ b/offapi/com/sun/star/rendering/FloatingPointBitmapLayout.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,20 +50,20 @@ struct FloatingPointBitmapLayout
 
         This value must not be negative
      */
-    long                ScanLines;
+    long				ScanLines;
 
     /** Number of data bytes per scanline.
 
         This value must not be negative
      */
-    long                ScanLineBytes;
+    long 				ScanLineBytes;
 
     /** Byte offset between the start of two consecutive scanlines.
 
         This value is permitted to be negative, denoting a bitmap
         whose content is flipped at the x axis.
      */
-    long                ScanLineStride;
+    long				ScanLineStride;
 
     /** Byte offset between the start of two consecutive planes.
 
@@ -76,7 +76,7 @@ struct FloatingPointBitmapLayout
         layout, the first channel of all pixel is stored consecutive,
         followed by the second channel, and so forth.<p>
      */
-    long                PlaneStride;
+    long				PlaneStride;
 
     // TODO(F3): Need some specializations of XColorSpace for float
     // and half float formats. This maybe translates to the bitmap
@@ -86,26 +86,26 @@ struct FloatingPointBitmapLayout
     // interfaces...
 
     /// Color space the bitmap colors shall be interpreted within.
-    XColorSpace         ColorSpace;
+    XColorSpace			ColorSpace;
 
     /** Number of color components per pixel.
 
         This value must not be negative
      */
-    long                NumComponents;
+    long			    NumComponents;
 
     /** Endianness of the pixel values.
 
         This value must be one of the <type>Endianness</type> constants
      */
-    byte                Endianness;
+    byte			    Endianness;
 
     /** Format type of this bitmap.<p>
 
         This value must be one of the
         <type>FloatingPointBitmapFormat</type> constants.<p>
     */
-    byte                Format;
+    byte				Format;
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/FontInfo.idl b/offapi/com/sun/star/rendering/FontInfo.idl
index 1492168d45bc..bd8fd1a52c4e 100644
--- a/offapi/com/sun/star/rendering/FontInfo.idl
+++ b/offapi/com/sun/star/rendering/FontInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
 #ifndef __com_sun_star_rendering_FontInfo_idl__
 #define __com_sun_star_rendering_FontInfo_idl__
 
-#ifndef __com_sun_star_util_TriState_idl__
+#ifndef __com_sun_star_util_TriState_idl__ 
 #include <com/sun/star/util/TriState.idl>
 #endif
 
@@ -48,7 +48,7 @@ struct FontInfo
 
         TODO: Document semantics in Panose.idl
      */
-    Panose                              FontDescription;
+    Panose								FontDescription;
 
     //-------------------------------------------------------------------------
 
@@ -60,7 +60,7 @@ struct FontInfo
         Note: outlined fonts are now specified with 'outline' as part
         of the family name.<p>
      */
-    string                              FamilyName;
+    string								FamilyName;
 
     //-------------------------------------------------------------------------
 
@@ -68,7 +68,7 @@ struct FontInfo
 
         For example, oblique, italic, or narrow.<p>
      */
-    string                              StyleName;
+    string								StyleName;
 
     //-------------------------------------------------------------------------
 
@@ -93,10 +93,10 @@ struct FontInfo
         (0x3FFF<<15) + (0x0FFF<<70);
 
      */
-    long                                UnicodeRanges0;
-    long                                UnicodeRanges1;
-    long                                UnicodeRanges2;
-    long                                UnicodeRanges3;
+    long								UnicodeRanges0;
+    long								UnicodeRanges1;
+    long								UnicodeRanges2;
+    long								UnicodeRanges3;
 
     //-------------------------------------------------------------------------
 
@@ -105,7 +105,7 @@ struct FontInfo
         If yes, text written in this symbol font does not have a
         specified meaning.<p>
      */
-    ::com::sun::star::util::TriState    IsSymbolFont;
+    ::com::sun::star::util::TriState	IsSymbolFont;
 
     //-------------------------------------------------------------------------
 
@@ -116,7 +116,7 @@ struct FontInfo
         e.g. rotated or differently shaped glyphs, or special rotated
         versions of normally upright glyphs (e.g. brackets).<p>
      */
-    ::com::sun::star::util::TriState    IsVertical;
+    ::com::sun::star::util::TriState	IsVertical;
 
 
 };
diff --git a/offapi/com/sun/star/rendering/FontMetrics.idl b/offapi/com/sun/star/rendering/FontMetrics.idl
index 3339c17d9bdd..c802ab3173c5 100644
--- a/offapi/com/sun/star/rendering/FontMetrics.idl
+++ b/offapi/com/sun/star/rendering/FontMetrics.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,18 +53,18 @@ module com { module sun { module star { module rendering {
  */
 struct FontMetrics
 {
-    /// Ascent (above the baseline) part of the font.
-    double      Ascent;
+    /// Ascent (above the baseline) part of the font. 
+    double		Ascent;
 
     //-------------------------------------------------------------------------
 
     /// Descent (below the baseline) part of the font.
-    double      Descent;
+    double		Descent; 
 
     //-------------------------------------------------------------------------
 
     /// Extra space above ascent
-    double      InternalLeading;
+    double		InternalLeading; 
 
     //-------------------------------------------------------------------------
 
@@ -73,7 +73,7 @@ struct FontMetrics
         It should not contain ink marks and is typically used
         by the font designer to modify the line distance.<p>
      */
-    double      ExternalLeading;
+    double		ExternalLeading;
 
     //-------------------------------------------------------------------------
 
@@ -84,21 +84,21 @@ struct FontMetrics
         characters, and if one needs a font with double character
         width, the referenceCharSize should be doubled.<p>
      */
-    double      ReferenceCharSize;
+    double 		ReferenceCharSize;
 
     //-------------------------------------------------------------------------
 
     /** Specifies the offset to be added to the baseline when drawing
         underlined text.
      */
-    double      UnderlineOffset;
+    double 		UnderlineOffset;
 
     //-------------------------------------------------------------------------
 
     /** Specifies the offset to be added to the baseline when striking
         through the text.
      */
-    double      StrikeThroughOffset;
+    double		StrikeThroughOffset;
 
 };
 
diff --git a/offapi/com/sun/star/rendering/FontRequest.idl b/offapi/com/sun/star/rendering/FontRequest.idl
index a39871968297..bbc045c3d85f 100644
--- a/offapi/com/sun/star/rendering/FontRequest.idl
+++ b/offapi/com/sun/star/rendering/FontRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ module com { module sun { module star { module rendering {
 
 /** This structure contains all information necessary to describe a
     font to be queried from XCanvas.<p>
-
+    
     Note: Outline fonts are to be requested as a special family, set
     <member>FontInfo::FamilyName</member> appropriately. Emboss/relief
     must be emulated by upper layers.<p>
@@ -57,7 +57,7 @@ struct FontRequest
         This member contains the description of the font as returned
         by the font listing methods.<p>
      */
-    FontInfo                        FontDescription;
+    FontInfo						FontDescription;
 
     //-------------------------------------------------------------------------
 
@@ -84,8 +84,8 @@ struct FontRequest
         output equals the identity transform. This also applies to all
         query methods, for both <type>XCanvasFont</type> and
         <type>XTextLayout</type>.<p>
-    */
-    double                          CellSize;
+    */ 
+    double 							CellSize; 
 
     //-------------------------------------------------------------------------
 
@@ -100,10 +100,10 @@ struct FontRequest
         one of them has to be set to 0 (which means don't care). For
         distorted fonts, the font matrix must be used.<p>
      */
-    double                          ReferenceAdvancement;
+    double							ReferenceAdvancement;
 
     //-------------------------------------------------------------------------
-
+    
     /** The locale this font should be able to render.<p>
 
         This member supplements the
@@ -112,7 +112,7 @@ struct FontRequest
         traditional and simplified chinese is necessary (since the
         letters have the same unicode ranges and character values).<p>
      */
-    ::com::sun::star::lang::Locale  Locale;
+    ::com::sun::star::lang::Locale	Locale;
 
 };
 
diff --git a/offapi/com/sun/star/rendering/IntegerBitmapLayout.idl b/offapi/com/sun/star/rendering/IntegerBitmapLayout.idl
index 45787bc206e7..c4c6f10a3e9c 100644
--- a/offapi/com/sun/star/rendering/IntegerBitmapLayout.idl
+++ b/offapi/com/sun/star/rendering/IntegerBitmapLayout.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,20 +50,20 @@ struct IntegerBitmapLayout
 
         This value must not be negative
      */
-    long                     ScanLines;
+    long				     ScanLines;
 
     /** Number of data bytes per scanline.
 
         This value must not be negative
      */
-    long                     ScanLineBytes;
+    long 				     ScanLineBytes;
 
     /** Byte offset between the start of two consecutive scanlines.
 
         This value is permitted to be negative, denoting a bitmap
         whose content is flipped at the x axis.
      */
-    long                     ScanLineStride;
+    long				     ScanLineStride;
 
     /** Byte offset between the start of two consecutive planes.
 
@@ -76,7 +76,7 @@ struct IntegerBitmapLayout
         layout, the first channel of all pixel is stored consecutive,
         followed by the second channel, and so forth.<p>
      */
-    long                     PlaneStride;
+    long				     PlaneStride;
 
     /** Color space the bitmap colors shall be interpreted within.<p>
 
@@ -102,7 +102,7 @@ struct IntegerBitmapLayout
         <member>ColorComponentTag::INDEX</member>. That component is
         then used to index the palette.<p>
      */
-    XBitmapPalette           Palette;
+    XBitmapPalette		     Palette;
 
     /** This member determines the bit order (only relevant if a pixel
         uses less than 8 bits, of course).<p>
diff --git a/offapi/com/sun/star/rendering/InterpolationMode.idl b/offapi/com/sun/star/rendering/InterpolationMode.idl
index 01dc1e14c9a2..8ec16cd57437 100644
--- a/offapi/com/sun/star/rendering/InterpolationMode.idl
+++ b/offapi/com/sun/star/rendering/InterpolationMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -90,7 +90,7 @@ constants InterpolationMode
         quadric curve.<p>
      */
     const byte BEZIERSPLINE4=5;
-};
+}; 
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/rendering/Panose.idl b/offapi/com/sun/star/rendering/Panose.idl
index aaf3d3f8da4e..3f70151f912c 100644
--- a/offapi/com/sun/star/rendering/Panose.idl
+++ b/offapi/com/sun/star/rendering/Panose.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,37 +29,37 @@
 
 module com { module sun { module star { module rendering {
 
-struct Panose
+struct Panose 
 {
     /// <type>PanoseFamilyTypes</type>
-    byte    FamilyType;
+    byte	FamilyType; 
 
     /// <type>PanoseSerifStyle</type>
-    byte    SerifStyle;
+    byte	SerifStyle; 
 
     /// <type>PanoseWeight</type>
-    byte    Weight;
+    byte	Weight; 
 
     /// <type>PanoseProportion</type>
-    byte    Proportion;
+    byte	Proportion; 
 
     /// <type>PanoseContrast</type>
-    byte    Contrast;
+    byte	Contrast; 
 
     /// <type>PanoseStrokeVariation</type>
-    byte    StrokeVariation;
+    byte	StrokeVariation; 
 
     /// <type>PanoseArmStyle</type>
-    byte    ArmStyle;
+    byte	ArmStyle; 
 
     /// <type>PanoseLetterForm</type>
-    byte    Letterform;
+    byte	Letterform; 
 
     /// <type>PanoseMidline</type>
-    byte    Midline;
+    byte	Midline; 
 
     /// <type>PanoseXHeight</type>
-    byte    XHeight;
+    byte	XHeight; 
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/PanoseArmStyle.idl b/offapi/com/sun/star/rendering/PanoseArmStyle.idl
index 2840a73dc9e3..bb165960c96e 100644
--- a/offapi/com/sun/star/rendering/PanoseArmStyle.idl
+++ b/offapi/com/sun/star/rendering/PanoseArmStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rendering/PanoseContrast.idl b/offapi/com/sun/star/rendering/PanoseContrast.idl
index 6c24ad74d53e..72a3f5ce7060 100644
--- a/offapi/com/sun/star/rendering/PanoseContrast.idl
+++ b/offapi/com/sun/star/rendering/PanoseContrast.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rendering/PanoseFamilyTypes.idl b/offapi/com/sun/star/rendering/PanoseFamilyTypes.idl
index a25a2d7f9e71..74a363cfe884 100644
--- a/offapi/com/sun/star/rendering/PanoseFamilyTypes.idl
+++ b/offapi/com/sun/star/rendering/PanoseFamilyTypes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rendering/PanoseLetterForm.idl b/offapi/com/sun/star/rendering/PanoseLetterForm.idl
index a439a769cf9b..37322871b6b9 100644
--- a/offapi/com/sun/star/rendering/PanoseLetterForm.idl
+++ b/offapi/com/sun/star/rendering/PanoseLetterForm.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rendering/PanoseMidline.idl b/offapi/com/sun/star/rendering/PanoseMidline.idl
index 32516682f1eb..238b1a428819 100644
--- a/offapi/com/sun/star/rendering/PanoseMidline.idl
+++ b/offapi/com/sun/star/rendering/PanoseMidline.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rendering/PanoseProportion.idl b/offapi/com/sun/star/rendering/PanoseProportion.idl
index a28ce68c6149..e338e4c5cf61 100644
--- a/offapi/com/sun/star/rendering/PanoseProportion.idl
+++ b/offapi/com/sun/star/rendering/PanoseProportion.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rendering/PanoseSerifStyle.idl b/offapi/com/sun/star/rendering/PanoseSerifStyle.idl
index 82b5042be2a6..cd042d1a2d4e 100644
--- a/offapi/com/sun/star/rendering/PanoseSerifStyle.idl
+++ b/offapi/com/sun/star/rendering/PanoseSerifStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rendering/PanoseStrokeVariation.idl b/offapi/com/sun/star/rendering/PanoseStrokeVariation.idl
index ef66607fdb94..0f4c8788b437 100644
--- a/offapi/com/sun/star/rendering/PanoseStrokeVariation.idl
+++ b/offapi/com/sun/star/rendering/PanoseStrokeVariation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rendering/PanoseWeight.idl b/offapi/com/sun/star/rendering/PanoseWeight.idl
index 715ca666545e..1da8ef019b0f 100644
--- a/offapi/com/sun/star/rendering/PanoseWeight.idl
+++ b/offapi/com/sun/star/rendering/PanoseWeight.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rendering/PanoseXHeight.idl b/offapi/com/sun/star/rendering/PanoseXHeight.idl
index 7ae262aec841..401b25a2c2e3 100644
--- a/offapi/com/sun/star/rendering/PanoseXHeight.idl
+++ b/offapi/com/sun/star/rendering/PanoseXHeight.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rendering/PathCapType.idl b/offapi/com/sun/star/rendering/PathCapType.idl
index e436eaa738db..b00bfa2654a9 100644
--- a/offapi/com/sun/star/rendering/PathCapType.idl
+++ b/offapi/com/sun/star/rendering/PathCapType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,6 +54,6 @@ constants PathCapType
     const byte SQUARE=2;
 };
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/rendering/PathJoinType.idl b/offapi/com/sun/star/rendering/PathJoinType.idl
index b2fc8d31d747..294978b67a96 100644
--- a/offapi/com/sun/star/rendering/PathJoinType.idl
+++ b/offapi/com/sun/star/rendering/PathJoinType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rendering/RenderState.idl b/offapi/com/sun/star/rendering/RenderState.idl
index 7ba8d8e35536..3c80e39bfc0c 100644
--- a/offapi/com/sun/star/rendering/RenderState.idl
+++ b/offapi/com/sun/star/rendering/RenderState.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@ struct RenderState
         subsequently transformed to device space by the view
         transform).<p>
      */
-    ::com::sun::star::geometry::AffineMatrix2D  AffineTransform;
+    ::com::sun::star::geometry::AffineMatrix2D	AffineTransform;
 
     //-------------------------------------------------------------------------
 
@@ -76,7 +76,7 @@ struct RenderState
         clip. That means, nothing rendered to the canvas will be
         visible.<p>
      */
-    XPolyPolygon2D                                      Clip;
+    XPolyPolygon2D										Clip;
 
     //-------------------------------------------------------------------------
 
@@ -88,7 +88,7 @@ struct RenderState
         @see XGraphicDevice
         @see XColorSpace
      */
-    sequence<ColorComponent>                            DeviceColor;
+    sequence<ColorComponent>							DeviceColor;
 
     //-------------------------------------------------------------------------
 
@@ -100,7 +100,7 @@ struct RenderState
         values must be one out of the <type>CompositeOperation</type>
         constants.<p>
      */
-    byte                                                CompositeOperation;
+    byte												CompositeOperation;
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/RenderingIntent.idl b/offapi/com/sun/star/rendering/RenderingIntent.idl
index 51ed8a96767b..0d50ddf9b935 100644
--- a/offapi/com/sun/star/rendering/RenderingIntent.idl
+++ b/offapi/com/sun/star/rendering/RenderingIntent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 module com { module sun { module star { module rendering {
 
 /** The rendering intent for a color space.<p>
-
+    
     The rendering intent for a color space mostly determines how
     out-of-gamut color is treated. See <a
     href="http://en.wikipedia.org/wiki/Rendering_intent">Wikipedia</a>
@@ -45,7 +45,7 @@ constants RenderingIntent
         colors in a way that is perceived as natural to the
         human eye, although the color values themselves may
         change. This intent is most suitable for photographic
-        images.
+        images.  
     */
     const byte PERCEPTUAL=0;
 
@@ -59,19 +59,19 @@ constants RenderingIntent
         shift. This rendering intent is primarily designed for
         business graphics, where bright saturated colors are
         more important than the exact relationship between
-        colors (such as in a photographic image).
+        colors (such as in a photographic image). 
     */
     const byte SATURATION=1;
-
+    
     /** The rendering intent almost identical to Absolute
         Colorimetric except for the following difference:
         Relative Colorimetric compares the white point
         (extreme highlight) of the source color space to that
         of the destination color space and shifts all colors
-        accordingly.
+        accordingly. 
     */
     const byte RELATIVE_COLORIMETRIC=2;
-
+    
     /** The rendering intent that leaves colors that fall
         inside the destination gamut unchanged. Out of gamut
         colors are clipped. No scaling of colors to
@@ -79,7 +79,7 @@ constants RenderingIntent
         to maintain color accuracy at the expense of
         preserving relationships between colors, and is useful
         for seeing how output will look on a non-neutral
-        substrate.
+        substrate. 
     */
     const byte ABSOLUTE_COLORIMETRIC=3;
 };
diff --git a/offapi/com/sun/star/rendering/RepaintResult.idl b/offapi/com/sun/star/rendering/RepaintResult.idl
index 9e221b3ff504..7f5d36d490ec 100644
--- a/offapi/com/sun/star/rendering/RepaintResult.idl
+++ b/offapi/com/sun/star/rendering/RepaintResult.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,7 +48,7 @@ constants RepaintResult
 
     //-------------------------------------------------------------------------
 
-    /** Repaint failed altogether.
+    /**	Repaint failed altogether.
      */
     const byte FAILED=3;
 };
diff --git a/offapi/com/sun/star/rendering/StringContext.idl b/offapi/com/sun/star/rendering/StringContext.idl
index 54c4b5868e98..39b7f66e1fb9 100644
--- a/offapi/com/sun/star/rendering/StringContext.idl
+++ b/offapi/com/sun/star/rendering/StringContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ struct StringContext
     /** The complete text, from which a subset is selected by the
         parameters below.
      */
-    string  Text;
+    string 	Text;
 
     //-------------------------------------------------------------------------
 
@@ -51,7 +51,7 @@ struct StringContext
 
         The first character has index 0.<p>
      */
-    long    StartPosition;
+    long 	StartPosition;
 
     //-------------------------------------------------------------------------
 
@@ -59,7 +59,7 @@ struct StringContext
 
         Must be within the range [0,INTMAX].<p>
     */
-    long    Length;
+    long	Length;
 
 };
 
diff --git a/offapi/com/sun/star/rendering/StrokeAttributes.idl b/offapi/com/sun/star/rendering/StrokeAttributes.idl
index e02d4cf6c89e..2536888b1ae1 100644
--- a/offapi/com/sun/star/rendering/StrokeAttributes.idl
+++ b/offapi/com/sun/star/rendering/StrokeAttributes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,8 +51,8 @@ struct StrokeAttributes
         coordinate space.
 
         This value must be positive (or 0.0)
-     */
-    double              StrokeWidth;
+     */	
+    double 				StrokeWidth;
 
     //-------------------------------------------------------------------------
 
@@ -73,7 +73,7 @@ struct StrokeAttributes
         that, with phi being the angle between the two joining
         segments, MiterLimit=1/sin(phi/2.0).<p>
      */
-    double              MiterLimit;
+    double				MiterLimit;
 
     //-------------------------------------------------------------------------
 
@@ -88,7 +88,7 @@ struct StrokeAttributes
         here. Furthermore, each entry in this array must have a value
         that is positive (or 0.0)<p>
      */
-    sequence<double>    DashArray;
+    sequence<double>	DashArray;
 
     //-------------------------------------------------------------------------
 
@@ -107,8 +107,8 @@ struct StrokeAttributes
         ends with a spacing, this spacing is included in the total
         width of the multiple-line stroke. That is, the stroke becomes
         asymmetric.<p>
-     */
-    sequence<double>    LineArray;
+     */	
+    sequence<double>	LineArray;
 
     //-------------------------------------------------------------------------
 
@@ -119,7 +119,7 @@ struct StrokeAttributes
 
         @see <type>PathCapType</type>
      */
-    byte                StartCapType;
+    byte				StartCapType;
 
     //-------------------------------------------------------------------------
 
@@ -130,7 +130,7 @@ struct StrokeAttributes
 
         @see <type>PathCapType</type>
      */
-    byte                EndCapType;
+    byte				EndCapType;
 
     //-------------------------------------------------------------------------
 
@@ -145,7 +145,7 @@ struct StrokeAttributes
 
         @see <type>PathJoinType</type>
      */
-    byte                JoinType;
+    byte				JoinType;
 
 };
 
diff --git a/offapi/com/sun/star/rendering/TextDirection.idl b/offapi/com/sun/star/rendering/TextDirection.idl
index 33eea1fd4036..3629a1775856 100644
--- a/offapi/com/sun/star/rendering/TextDirection.idl
+++ b/offapi/com/sun/star/rendering/TextDirection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rendering/TextHit.idl b/offapi/com/sun/star/rendering/TextHit.idl
index 7451086d57a3..6c4e1960a030 100644
--- a/offapi/com/sun/star/rendering/TextHit.idl
+++ b/offapi/com/sun/star/rendering/TextHit.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0.0
  */
-struct TextHit
+struct TextHit 
 {
     /** This contains the entry index.<p>
 
@@ -49,7 +49,7 @@ struct TextHit
         containing the number of characters denotes an insertion
         <em>behind</em> the last character.<p>
      */
-    long        EntryIndex;
+    long 		EntryIndex;
 
     /** This member denotes whether the hit was on the leading
         edge.<p>
@@ -62,7 +62,7 @@ struct TextHit
         character). If the hit was on the leading edge, this member is
         set to <TRUE/>.
      */
-    boolean     IsLeadingEdge;
+    boolean		IsLeadingEdge;
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/Texture.idl b/offapi/com/sun/star/rendering/Texture.idl
index a8eacf515c76..02362c3cef4e 100644
--- a/offapi/com/sun/star/rendering/Texture.idl
+++ b/offapi/com/sun/star/rendering/Texture.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,7 +65,7 @@ struct Texture
         state and view state transformation being applied to the
         textured primitive).<p>
      */
-    ::com::sun::star::geometry::AffineMatrix2D  AffineTransform;
+    ::com::sun::star::geometry::AffineMatrix2D	AffineTransform;
 
     //-------------------------------------------------------------------------
 
@@ -74,7 +74,7 @@ struct Texture
         The valid range for this value is [0,1], where 0 denotes
         complete transparency, and 1 denotes fully opaque.<p>
      */
-    double                                      Alpha;
+    double					                    Alpha;
 
     //-------------------------------------------------------------------------
 
@@ -90,7 +90,7 @@ struct Texture
         0.5. Use this parameter to control the density of the
         hatching.<p>
      */
-    long                                        NumberOfHatchPolygons;
+    long					                    NumberOfHatchPolygons;
 
     //-------------------------------------------------------------------------
 
@@ -101,7 +101,7 @@ struct Texture
         The bitmap is scaled to a one-by-one rectangle, to cover the
         same area as both the gradient and the hatching.<p>
     */
-    XBitmap                                     Bitmap;
+    XBitmap					                    Bitmap;
 
     //-------------------------------------------------------------------------
 
@@ -129,25 +129,25 @@ struct Texture
 
         Use 0.0 as the strokeWidth here to indicate hair lines.<p>
      */
-    StrokeAttributes                            HatchAttributes;
+    StrokeAttributes		                    HatchAttributes;
 
     //-------------------------------------------------------------------------
 
     /** Repeat mode of the texture, x direction.<p>
 
         The repeat mode is separated into x and y direction, this is
-        the x direction part. Permissible values are from the
+        the x direction part. Permissible values are from the 
         <type>TexturingMode</type> constants.<p>
     */
-    byte                                        RepeatModeX;
+    byte				                		RepeatModeX;
 
     /** Repeat mode of the texture, y direction.<p>
 
         The repeat mode is separated into x and y direction, this is
-        the y direction part. Permissible values are from the
+        the y direction part. Permissible values are from the 
         <type>TexturingMode</type> constants.<p>
     */
-    byte                                        RepeatModeY;
+    byte				                		RepeatModeY;
 
 };
 
diff --git a/offapi/com/sun/star/rendering/TexturingMode.idl b/offapi/com/sun/star/rendering/TexturingMode.idl
index b44a78eae6ce..9dfcef6f69af 100644
--- a/offapi/com/sun/star/rendering/TexturingMode.idl
+++ b/offapi/com/sun/star/rendering/TexturingMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/rendering/ViewState.idl b/offapi/com/sun/star/rendering/ViewState.idl
index b0ed7b62d3b5..34c3bc034a9e 100644
--- a/offapi/com/sun/star/rendering/ViewState.idl
+++ b/offapi/com/sun/star/rendering/ViewState.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,8 +49,8 @@ struct ViewState
 
         This member is used to transform coordinates of draw
         operations from user space to screen space.<p>
-     */
-    ::com::sun::star::geometry::AffineMatrix2D  AffineTransform;
+     */	
+    ::com::sun::star::geometry::AffineMatrix2D	AffineTransform;
 
     //-------------------------------------------------------------------------
 
@@ -69,7 +69,7 @@ struct ViewState
         clip. That means, nothing rendered to the canvas will be
         visible.<p>
      */
-    XPolyPolygon2D                                      Clip;
+    XPolyPolygon2D										Clip;
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl b/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl
index 23e0531f876f..62fbc9ec9180 100644
--- a/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl
+++ b/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,15 +24,15 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
+#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__ 
 #define __com_sun_star_rendering_VolatileContentDestroyedException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-module com { module sun { module star { module rendering {
-
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+module com { module sun { module star { module rendering {  
+ 
     /** This exception indicates an invalid volatile bitmap content.<p>
 
         When accessing or rendering XVolatileBitmap data, that has
@@ -42,8 +42,8 @@ module com { module sun { module star { module rendering {
     */
     exception VolatileContentDestroyedException : ::com::sun::star::uno::Exception
     {
-    };
+    }; 
 
 }; }; }; };
-
+ 
 #endif
diff --git a/offapi/com/sun/star/rendering/XAnimatedSprite.idl b/offapi/com/sun/star/rendering/XAnimatedSprite.idl
index 6824b36e4f07..49f5be0018f7 100644
--- a/offapi/com/sun/star/rendering/XAnimatedSprite.idl
+++ b/offapi/com/sun/star/rendering/XAnimatedSprite.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,12 @@
 #ifndef __com_sun_star_rendering_XAnimatedSprite_idl__
 #define __com_sun_star_rendering_XAnimatedSprite_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
 #endif
@@ -58,7 +58,7 @@ module com { module sun { module star { module rendering {
  */
 interface XAnimatedSprite : XSprite
 {
-    /** Start animation sequence of this sprite.<p>
+    /**	Start animation sequence of this sprite.<p>
 
         The speed of the animation is given in cycles per second
         (where a cycle is defined as one full animation run, i.e. the
@@ -84,7 +84,7 @@ interface XAnimatedSprite : XSprite
     //-------------------------------------------------------------------------
 
     /** Stop the animation sequence.<p>
-
+        
         A subsequent <member>XAnimatedSprite::startAnimation</member>
         will commence the sequence at the point where it was stopped
         with here. Once an animation is stopped, the associated
@@ -106,7 +106,7 @@ interface XAnimatedSprite : XSprite
     void resetAnimation();
 
     //-------------------------------------------------------------------------
-
+    
     /** Issue an additional render call to this sprite's
         animation.<p>
 
@@ -151,7 +151,7 @@ interface XAnimatedSprite : XSprite
 
         This is useful at times where one does not want multiple
         redraws for every state change.<p>
-
+        
         Please note that if an animation is not started, the
         associated <type>XSpriteCanvas</type> does not update changed
         sprites automatically, but has to be told to do so via
@@ -165,12 +165,12 @@ interface XAnimatedSprite : XSprite
         New view state of the sprite, and part of the transformation
         that is applied to aNewPos. The view transformation matrix
         must not be singular.
-
+        
         @param aRenderState
         New render state of the sprite, and part of the transformation
         that is applied to aNewPos. The render transformation matrix
         must not be singular.
-
+        
         @param nAlpha
         New alpha value of the sprite. This value must be within the
         [0,1] range.
@@ -183,12 +183,12 @@ interface XAnimatedSprite : XSprite
         if one of the passed parameters does not lie in the specified,
         permissible range.
      */
-    void setAll( [in] ::com::sun::star::geometry::RealPoint2D   aNewPos,
-                 [in] ViewState                                         aViewState,
-                 [in] RenderState                                       aRenderState,
-                 [in] double                                            nAlpha,
-                 [in] boolean                                           bUpdateAnimation )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    void setAll( [in] ::com::sun::star::geometry::RealPoint2D	aNewPos, 
+                 [in] ViewState 										aViewState, 
+                 [in] RenderState 										aRenderState,
+                 [in] double 											nAlpha,
+                 [in] boolean											bUpdateAnimation )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/XAnimation.idl b/offapi/com/sun/star/rendering/XAnimation.idl
index 004f350ef564..b7ba4809ff8d 100644
--- a/offapi/com/sun/star/rendering/XAnimation.idl
+++ b/offapi/com/sun/star/rendering/XAnimation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,12 @@
 #ifndef __com_sun_star_rendering_XAnimation_idl__
 #define __com_sun_star_rendering_XAnimation_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
 #endif
@@ -72,7 +72,7 @@ interface XAnimation : ::com::sun::star::uno::XInterface
         same parameter set, identical output must be generated. This
         is because e.g. a Sprite might decide arbitrarily to render an
         animation once and cache the result, or repaint it via
-        XAnimation::render everytime.<p>
+        XAnimation::render everytime.<p> 
 
         The rendered content, although, must be exactly the same for
         identical viewState, canvas and t values. Or, for that
@@ -101,8 +101,8 @@ interface XAnimation : ::com::sun::star::uno::XInterface
         if one of the passed parameters does not lie in the specified,
         permissible range.
      */
-    void                    render( [in] XCanvas canvas, [in] ViewState viewState, [in] double t )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    void 					render( [in] XCanvas canvas, [in] ViewState viewState, [in] double t )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -115,7 +115,7 @@ interface XAnimation : ::com::sun::star::uno::XInterface
         @returns the requested <type>AnimationAttributes</type>
         structure.
      */
-    AnimationAttributes     getAnimationAttributes();
+    AnimationAttributes		getAnimationAttributes();
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl b/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
index 973d33e8dfd1..150be04e920d 100644
--- a/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,12 @@
 #ifndef __com_sun_star_rendering_XBezierPolyPolygon2D_idl__
 #define __com_sun_star_rendering_XBezierPolyPolygon2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_rendering_XPolyPolygon2D_idl__
 #include <com/sun/star/rendering/XPolyPolygon2D.idl>
 #endif
@@ -89,7 +89,7 @@ interface XBezierPolyPolygon2D : XPolyPolygon2D
         if one of the given values exceed the permissible range.
      */
     sequence< sequence < ::com::sun::star::geometry::RealBezierSegment2D > > getBezierSegments( [in] long nPolygonIndex, [in] long nNumberOfPolygons, [in] long nPointIndex, [in] long nNumberOfPoints )
-        raises (com::sun::star::lang::IndexOutOfBoundsException);
+        raises (com::sun::star::lang::IndexOutOfBoundsException); 
 
     //-------------------------------------------------------------------------
 
@@ -112,10 +112,10 @@ interface XBezierPolyPolygon2D : XPolyPolygon2D
         specified bezier segment data.
 
         @throws <type>com::sun::star::lang::IndexOutOfBoundsException</type>
-        if one of the given values exceed the permissible range.
+        if one of the given values exceed the permissible range.        
      */
     void setBezierSegments( [in] sequence< sequence< ::com::sun::star::geometry::RealBezierSegment2D > > points, [in] long nPolygonIndex )
-        raises (com::sun::star::lang::IndexOutOfBoundsException);
+        raises (com::sun::star::lang::IndexOutOfBoundsException); 
 
     //-------------------------------------------------------------------------
 
@@ -132,13 +132,13 @@ interface XBezierPolyPolygon2D : XPolyPolygon2D
         exceed the number of points in this polygon minus one.
 
         @returns the requested point.
-
+        
         @throws <type>com::sun::star::lang::IndexOutOfBoundsException</type>
         if one of the given values exceed the permissible range.
-
+        
      */
-    ::com::sun::star::geometry::RealBezierSegment2D getBezierSegment( [in] long nPolygonIndex, [in] long nPointIndex )
-        raises (com::sun::star::lang::IndexOutOfBoundsException);
+    ::com::sun::star::geometry::RealBezierSegment2D	getBezierSegment( [in] long nPolygonIndex, [in] long nPointIndex )
+        raises (com::sun::star::lang::IndexOutOfBoundsException); 
 
     //-------------------------------------------------------------------------
 
@@ -162,12 +162,12 @@ interface XBezierPolyPolygon2D : XPolyPolygon2D
         The index of the point in the polygon specified by
         nPolygonIndex, which is to be set.  This value must not
         exceed the number of points in this polygon.
-
+        
         @throws <type>com::sun::star::lang::IndexOutOfBoundsException</type>
         if one of the given values exceed the permissible range.
      */
     void setBezierSegment( [in] ::com::sun::star::geometry::RealBezierSegment2D point, [in] long nPolygonIndex, [in] long nPointIndex )
-        raises (com::sun::star::lang::IndexOutOfBoundsException);
+        raises (com::sun::star::lang::IndexOutOfBoundsException); 
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/XBitmap.idl b/offapi/com/sun/star/rendering/XBitmap.idl
index 3eedd46357e2..a8a287a70af3 100644
--- a/offapi/com/sun/star/rendering/XBitmap.idl
+++ b/offapi/com/sun/star/rendering/XBitmap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,7 +65,7 @@ interface XBitmap : ::com::sun::star::uno::XInterface
 
         @return the bitmap size in pixel.
       */
-    ::com::sun::star::geometry::IntegerSize2D   getSize();
+    ::com::sun::star::geometry::IntegerSize2D	getSize();
 
     //-------------------------------------------------------------------------
 
@@ -81,7 +81,7 @@ interface XBitmap : ::com::sun::star::uno::XInterface
         @return <TRUE/>, if the bitmap has alpha data, or <FALSE/> if
         not.
       */
-    boolean                                     hasAlpha();
+    boolean										hasAlpha();
 
     //-------------------------------------------------------------------------
 
@@ -105,7 +105,7 @@ interface XBitmap : ::com::sun::star::uno::XInterface
         if the contents of a volatile bitmap have been destroyed, and
         thus cannot be read to generate the scaled bitmap.
      */
-    XBitmap                         getScaledBitmap( [in] ::com::sun::star::geometry::RealSize2D newSize, [in] boolean beFast )
+    XBitmap							getScaledBitmap( [in] ::com::sun::star::geometry::RealSize2D newSize, [in] boolean beFast )
         raises (com::sun::star::lang::IllegalArgumentException,
                 VolatileContentDestroyedException);
 };
diff --git a/offapi/com/sun/star/rendering/XBitmapCanvas.idl b/offapi/com/sun/star/rendering/XBitmapCanvas.idl
index b87be2ae8394..48d56c575ddc 100644
--- a/offapi/com/sun/star/rendering/XBitmapCanvas.idl
+++ b/offapi/com/sun/star/rendering/XBitmapCanvas.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,12 @@
 #ifndef __com_sun_star_rendering_XBitmapCanvas_idl__
 #define __com_sun_star_rendering_XBitmapCanvas_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_geometry_RealRectangle2D_idl__
 #include <com/sun/star/geometry/RealRectangle2D.idl>
 #endif
@@ -74,7 +74,7 @@ interface XBitmapCanvas : XCanvas
         operation. The device color for both source and destination
         render state is ignored, the compositing mode only for the
         source render state.<p>
-
+        
         @param sourceCanvas
         Canvas from which to copy the bitmap data. Can be identical to
         the canvas this method is called on, but must be valid.
@@ -120,12 +120,12 @@ interface XBitmapCanvas : XCanvas
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the parameters are not within the specified range.
-     */
-    void copyRect( [in] XBitmapCanvas sourceCanvas,
+     */	
+    void copyRect( [in] XBitmapCanvas sourceCanvas, 
                    [in] ::com::sun::star::geometry::RealRectangle2D sourceRect, [in] ViewState sourceViewState, [in] RenderState sourceRenderState,
                    [in] ::com::sun::star::geometry::RealRectangle2D destRect, [in] ViewState destViewState, [in] RenderState destRenderState )
         raises (com::sun::star::lang::IllegalArgumentException,
-                VolatileContentDestroyedException);
+                VolatileContentDestroyedException);  
 
 };
 
diff --git a/offapi/com/sun/star/rendering/XBitmapPalette.idl b/offapi/com/sun/star/rendering/XBitmapPalette.idl
index b89bc8221cd0..86f0501e6f08 100644
--- a/offapi/com/sun/star/rendering/XBitmapPalette.idl
+++ b/offapi/com/sun/star/rendering/XBitmapPalette.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,15 +27,15 @@
 #ifndef __com_sun_star_rendering_XBitmapPalette_idl__
 #define __com_sun_star_rendering_XBitmapPalette_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_rendering_XColorSpace_idl__
 #include <com/sun/star/rendering/XColorSpace.idl>
 #endif
@@ -110,10 +110,10 @@ interface XBitmapPalette : ::com::sun::star::uno::XInterface
      */
     boolean setIndex( [in] sequence<ColorComponent> color, [in] boolean transparency, [in] long nIndex )
         raises (com::sun::star::lang::IndexOutOfBoundsException,
-                com::sun::star::lang::IllegalArgumentException);
+                com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
-
+    
     /** Query associated color space.<p>
 
         @return the color space that is associated with this palette.
diff --git a/offapi/com/sun/star/rendering/XBufferController.idl b/offapi/com/sun/star/rendering/XBufferController.idl
index d4222e263aac..e7238195e0ab 100644
--- a/offapi/com/sun/star/rendering/XBufferController.idl
+++ b/offapi/com/sun/star/rendering/XBufferController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,12 @@
 #ifndef __com_sun_star_rendering_XBufferController_idl__
 #define __com_sun_star_rendering_XBufferController_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 
 module com { module sun { module star { module rendering {
 
@@ -62,14 +62,14 @@ interface XBufferController : ::com::sun::star::uno::XInterface
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if nBuffers is smaller than one.
       */
-    long    createBuffers( [in] long nBuffers )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    long 	createBuffers( [in] long nBuffers )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
-    /** Destroy all buffers generated via this object.
+    /** Destroy all buffers generated via this object.    	
      */
-    void    destroyBuffers();
+    void 	destroyBuffers();
 
     //-------------------------------------------------------------------------
 
@@ -95,7 +95,7 @@ interface XBufferController : ::com::sun::star::uno::XInterface
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if nBuffer is outside the permissible range.
      */
-    boolean showBuffer( [in] boolean bUpdateAll );
+    boolean	showBuffer( [in] boolean bUpdateAll ); 
 
     //-------------------------------------------------------------------------
 
@@ -125,7 +125,7 @@ interface XBufferController : ::com::sun::star::uno::XInterface
 
         @return whether the switch was performed successfully.
      */
-    boolean switchBuffer( [in] boolean bUpdateAll );
+    boolean	switchBuffer( [in] boolean bUpdateAll );
 
 };
 
diff --git a/offapi/com/sun/star/rendering/XCachedPrimitive.idl b/offapi/com/sun/star/rendering/XCachedPrimitive.idl
index c24a74df3135..62aacef1a66a 100644
--- a/offapi/com/sun/star/rendering/XCachedPrimitive.idl
+++ b/offapi/com/sun/star/rendering/XCachedPrimitive.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,12 @@
 #ifndef __com_sun_star_rendering_XCachedPrimitive_idl__
 #define __com_sun_star_rendering_XCachedPrimitive_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
 #endif
diff --git a/offapi/com/sun/star/rendering/XCanvas.idl b/offapi/com/sun/star/rendering/XCanvas.idl
index e88de735ce7c..bb3df8a6cd8e 100644
--- a/offapi/com/sun/star/rendering/XCanvas.idl
+++ b/offapi/com/sun/star/rendering/XCanvas.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,12 @@
 #ifndef __com_sun_star_rendering_XCanvas_idl__
 #define __com_sun_star_rendering_XCanvas_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
 #endif
@@ -153,7 +153,7 @@ interface XTextLayout;
 interface XCanvas : ::com::sun::star::uno::XInterface
 {
     /** Clear the whole canvas area.<p>
-
+        
         This method clears the whole canvas area to the device default
         color (e.g. white for a printer, transparent for an
         <type>XCustomSprite</type>).
@@ -172,15 +172,15 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         The renderstate to be used when drawing this point.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
-        specified range.
+        if one of the view and renderstate parameters are outside the 
+        specified range.        
      */
-    void                drawPoint( [in] ::com::sun::star::geometry::RealPoint2D aPoint, [in] ViewState aViewState, [in] RenderState aRenderState )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    void				drawPoint( [in] ::com::sun::star::geometry::RealPoint2D aPoint, [in] ViewState aViewState, [in] RenderState aRenderState )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
-    /** Draw a line in device resolution width (i.e. one device pixel
+    /** Draw a line in device resolution width (i.e. one device	pixel
         wide).
 
          @param aStartPoint
@@ -196,11 +196,11 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         The renderstate to be used when drawing this line.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
-        specified range.
+        if one of the view and renderstate parameters are outside the 
+        specified range.        
      */
-    void                drawLine( [in] ::com::sun::star::geometry::RealPoint2D aStartPoint, [in] ::com::sun::star::geometry::RealPoint2D aEndPoint, [in] ViewState aViewState, [in] RenderState aRenderState )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    void				drawLine( [in] ::com::sun::star::geometry::RealPoint2D aStartPoint, [in] ::com::sun::star::geometry::RealPoint2D aEndPoint, [in] ViewState aViewState, [in] RenderState aRenderState )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -220,12 +220,12 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         The renderstate to be used when drawing this curve.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
-        specified range.
+        if one of the view and renderstate parameters are outside the 
+        specified range.        
      */
-    void                drawBezier( [in] ::com::sun::star::geometry::RealBezierSegment2D aBezierSegment, [in] ::com::sun::star::geometry::RealPoint2D aEndPoint, [in] ViewState aViewState, [in] RenderState aRenderState )
-        raises (com::sun::star::lang::IllegalArgumentException);
-
+    void				drawBezier( [in] ::com::sun::star::geometry::RealBezierSegment2D aBezierSegment, [in] ::com::sun::star::geometry::RealPoint2D aEndPoint, [in] ViewState aViewState, [in] RenderState aRenderState )
+        raises (com::sun::star::lang::IllegalArgumentException); 
+ 
     //-------------------------------------------------------------------------
 
     /** Draw a poly-polygon in device resolution line width (i.e. the
@@ -241,13 +241,13 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         The renderstate to be used when drawing this polygon.
 
         @return a handle to the cached rendering output.
-
+        
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
-        specified range.
+        if one of the view and renderstate parameters are outside the 
+        specified range.        
      */
-    XCachedPrimitive    drawPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    XCachedPrimitive	drawPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -274,13 +274,13 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         Further attributes used to parameterize the stroking.
 
         @return a handle to the cached rendering output.
-
+        
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
-        specified range.
+        if one of the view and renderstate parameters are outside the 
+        specified range.        
      */
-    XCachedPrimitive    strokePolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] StrokeAttributes aStrokeAttributes )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    XCachedPrimitive	strokePolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] StrokeAttributes aStrokeAttributes )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -312,18 +312,18 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         Further attributes used to parameterize the stroking.
 
         @return a handle to the cached rendering output.
-
+        
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
-        specified range.
+        if one of the view and renderstate parameters are outside the 
+        specified range.        
 
         @throws <type>VolatileContentDestroyedException</type>
         if a texture bitmap was volatile, and the content was
         destroyed before the rendering could take place.
      */
-    XCachedPrimitive    strokeTexturedPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] sequence<Texture> aTextures, [in] StrokeAttributes aStrokeAttributes )
+    XCachedPrimitive	strokeTexturedPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] sequence<Texture> aTextures, [in] StrokeAttributes aStrokeAttributes )
         raises (com::sun::star::lang::IllegalArgumentException,
-                VolatileContentDestroyedException);
+                VolatileContentDestroyedException); 
 
     //-------------------------------------------------------------------------
 
@@ -360,18 +360,18 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         Further attributes used to parameterize the stroking.
 
         @return a handle to the cached rendering output.
-
+        
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
-        specified range.
+        if one of the view and renderstate parameters are outside the 
+        specified range.        
 
         @throws <type>VolatileContentDestroyedException</type>
         if a texture bitmap was volatile, and the content was
         destroyed before the rendering could take place.
      */
-    XCachedPrimitive    strokeTextureMappedPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] sequence<Texture> aTextures, [in] ::com::sun::star::geometry::XMapping2D xMapping, [in] StrokeAttributes aStrokeAttributes )
+    XCachedPrimitive	strokeTextureMappedPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] sequence<Texture> aTextures, [in] ::com::sun::star::geometry::XMapping2D xMapping, [in] StrokeAttributes aStrokeAttributes )
         raises (com::sun::star::lang::IllegalArgumentException,
-                VolatileContentDestroyedException);
+                VolatileContentDestroyedException); 
 
     //-------------------------------------------------------------------------
 
@@ -391,7 +391,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @param aRenderState
         The renderstate to be used when generating the outline.
-
+        
         @param aStrokeAttributes
         Further attributes used to parameterize the stroking.
 
@@ -399,11 +399,11 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         area.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
-        specified range.
+        if one of the view and renderstate parameters are outside the 
+        specified range.        
      */
-    XPolyPolygon2D      queryStrokeShapes( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] StrokeAttributes aStrokeAttributes )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    XPolyPolygon2D 		queryStrokeShapes( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] StrokeAttributes aStrokeAttributes )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -421,15 +421,15 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @param aRenderState
         The renderstate to be used when filling this polygon.
-
+        
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
-        specified range.
+        if one of the view and renderstate parameters are outside the 
+        specified range.                
      */
-    XCachedPrimitive    fillPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    XCachedPrimitive	fillPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -447,7 +447,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @param aRenderState
         The renderstate to be used when filling this polygon.
-
+        
         @param aTextures
         A sequence of texture definitions, with which to fill the
         polygonal area.
@@ -455,16 +455,16 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
-        specified range.
+        if one of the view and renderstate parameters are outside the 
+        specified range.        
 
         @throws <type>VolatileContentDestroyedException</type>
         if a texture bitmap was volatile, and the content was
         destroyed before the rendering could take place.
     */
-    XCachedPrimitive    fillTexturedPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] sequence<Texture> xTextures )
+    XCachedPrimitive	fillTexturedPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] sequence<Texture> xTextures )
         raises (com::sun::star::lang::IllegalArgumentException,
-                VolatileContentDestroyedException);
+                VolatileContentDestroyedException); 
 
     //-------------------------------------------------------------------------
 
@@ -483,7 +483,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @param aRenderState
         The renderstate to be used when filling this polygon.
-
+        
         @param aTextures
         A sequence of texture definitions, with which to fill the
         polygonal area.
@@ -495,16 +495,16 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
-        specified range.
+        if one of the view and renderstate parameters are outside the 
+        specified range.        
 
         @throws <type>VolatileContentDestroyedException</type>
         if a texture bitmap was volatile, and the content was
         destroyed before the rendering could take place.
      */
-    XCachedPrimitive    fillTextureMappedPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] sequence<Texture> xTextures, [in] ::com::sun::star::geometry::XMapping2D xMapping )
+    XCachedPrimitive	fillTextureMappedPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] sequence<Texture> xTextures, [in] ::com::sun::star::geometry::XMapping2D xMapping )
         raises (com::sun::star::lang::IllegalArgumentException,
-                VolatileContentDestroyedException);
+                VolatileContentDestroyedException); 
 
     //-------------------------------------------------------------------------
 
@@ -515,7 +515,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         @param aExtraFontProperties
         Additional font properties to be applied when selecting this
         font. Normally, you should not need this parameter. Currently,
-        the following properties are recognized:
+        the following properties are recognized: 
         <ul>
 
             <il>Kerning: a <type>double</type> between 0 and 1, where
@@ -527,9 +527,9 @@ interface XCanvas : ::com::sun::star::uno::XInterface
             Hebrew. The default value, if this property is not
             specified, is <FALSE/>.</il>
 
-            <il>ExpandedSpacing: a <type>double</type> value which is added
-            between all cell distances for this font. The default value for
-            this property is zero. Use negative values for condensed output,
+            <il>ExpandedSpacing: a <type>double</type> value which is added 
+            between all cell distances for this font. The default value for 
+            this property is zero. Use negative values for condensed output, 
             and positive values for expanded output.</il>
 
             <il>OptionalLayoutFeatures: a sequence of <type
@@ -549,8 +549,8 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the parameters is not within the allowed range.
      */
-    XCanvasFont             createFont( [in] FontRequest aFontRequest, [in] sequence< ::com::sun::star::beans::PropertyValue > aExtraFontProperties, [in] ::com::sun::star::geometry::Matrix2D aFontMatrix )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    XCanvasFont				createFont( [in] FontRequest aFontRequest, [in] sequence< ::com::sun::star::beans::PropertyValue > aExtraFontProperties, [in] ::com::sun::star::geometry::Matrix2D aFontMatrix )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -573,8 +573,8 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         or if one of the <type>FontInfo</type> members is not within
         the permitted range.
      */
-    sequence< FontInfo >    queryAvailableFonts( [in] FontInfo aFilter, [in] sequence< ::com::sun::star::beans::PropertyValue > aFontProperties )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    sequence< FontInfo >	queryAvailableFonts( [in] FontInfo aFilter, [in] sequence< ::com::sun::star::beans::PropertyValue > aFontProperties )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -598,7 +598,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @param aRenderState
         The renderstate to be used when drawing this text.
-
+        
         @param nTextDirection
         A value from the <type>TextDirection</type> collection,
         denoting the main writing direction for this string. The main
@@ -609,11 +609,11 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
-        specified range.
+        if one of the view and renderstate parameters are outside the 
+        specified range.        
      */
-    XCachedPrimitive        drawText( [in] StringContext aText, [in] XCanvasFont xFont, [in] ViewState aViewState, [in] RenderState aRenderState, [in] byte nTextDirection )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    XCachedPrimitive		drawText( [in] StringContext aText, [in] XCanvasFont xFont, [in] ViewState aViewState, [in] RenderState aRenderState, [in] byte nTextDirection )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -641,11 +641,11 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
-        specified range.
+        if one of the view and renderstate parameters are outside the 
+        specified range.        
      */
-    XCachedPrimitive        drawTextLayout( [in] XTextLayout xLayoutetText, [in] ViewState aViewState, [in] RenderState aRenderState )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    XCachedPrimitive		drawTextLayout( [in] XTextLayout xLayoutetText, [in] ViewState aViewState, [in] RenderState aRenderState )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -670,16 +670,16 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
-        specified range.
+        if one of the view and renderstate parameters are outside the 
+        specified range.        
 
         @throws <type>VolatileContentDestroyedException</type>
         if a texture bitmap was volatile, and the content was
         destroyed before the rendering could take place.
      */
-    XCachedPrimitive        drawBitmap( [in] XBitmap xBitmap, [in] ViewState aViewState, [in] RenderState aRenderState )
+    XCachedPrimitive		drawBitmap( [in] XBitmap xBitmap, [in] ViewState aViewState, [in] RenderState aRenderState )
         raises (com::sun::star::lang::IllegalArgumentException,
-                VolatileContentDestroyedException);
+                VolatileContentDestroyedException); 
 
     /** Render the given bitmap, with a global color modulation.<p>
 
@@ -709,16 +709,16 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
-        specified range.
+        if one of the view and renderstate parameters are outside the 
+        specified range.        
 
         @throws <type>VolatileContentDestroyedException</type>
         if a texture bitmap was volatile, and the content was
         destroyed before the rendering could take place.
      */
-    XCachedPrimitive        drawBitmapModulated( [in] XBitmap xBitmap, [in] ViewState aViewState, [in] RenderState aRenderState )
+    XCachedPrimitive		drawBitmapModulated( [in] XBitmap xBitmap, [in] ViewState aViewState, [in] RenderState aRenderState )
         raises (com::sun::star::lang::IllegalArgumentException,
-                VolatileContentDestroyedException);
+                VolatileContentDestroyedException); 
 
     //-------------------------------------------------------------------------
 
@@ -731,7 +731,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
         @return the associated <type>XGraphicDevice</type>.
      */
-    XGraphicDevice          getDevice();
+    XGraphicDevice			getDevice();
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/rendering/XCanvasFont.idl b/offapi/com/sun/star/rendering/XCanvasFont.idl
index face4c16cee9..f6d3b549b8ed 100644
--- a/offapi/com/sun/star/rendering/XCanvasFont.idl
+++ b/offapi/com/sun/star/rendering/XCanvasFont.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,12 @@
 #ifndef __com_sun_star_rendering_XCanvasFont_idl__
 #define __com_sun_star_rendering_XCanvasFont_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_geometry_RealRectangle2D_idl__
 #include <com/sun/star/geometry/RealRectangle2D.idl>
 #endif
@@ -44,10 +44,10 @@
 #endif
 #ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_rendering_StringContext_idl__
 #include <com/sun/star/rendering/StringContext.idl>
 #endif
@@ -87,13 +87,13 @@ interface XCanvasFont : ::com::sun::star::uno::XInterface
         @param nRandomSeed
         Optional random seed for OpenType glyph variations.
      */
-    XTextLayout                                         createTextLayout( [in] StringContext aText, [in] byte nDirection, [in] hyper nRandomSeed );
+    XTextLayout											createTextLayout( [in] StringContext aText, [in] byte nDirection, [in] hyper nRandomSeed );
 
     //-------------------------------------------------------------------------
 
     /** Query the FontRequest that was used to generate this object.
      */
-    FontRequest                                         getFontRequest();
+    FontRequest											getFontRequest();
 
     //-------------------------------------------------------------------------
 
@@ -106,7 +106,7 @@ interface XCanvasFont : ::com::sun::star::uno::XInterface
         cell size of 20 units, the metrics returned are calculated
         relative to this size.
      */
-    FontMetrics                                         getFontMetrics();
+    FontMetrics											getFontMetrics();
 
     //-------------------------------------------------------------------------
 
@@ -122,13 +122,13 @@ interface XCanvasFont : ::com::sun::star::uno::XInterface
         contained in the list returned by this method can lead to
         visible disturbances.<p>
      */
-    sequence< double >                                  getAvailableSizes();
+    sequence< double > 									getAvailableSizes();
 
     //-------------------------------------------------------------------------
 
     /** Query the list of additional font properties.<p>
      */
-    sequence< ::com::sun::star::beans::PropertyValue >  getExtraFontProperties();
+    sequence< ::com::sun::star::beans::PropertyValue >	getExtraFontProperties();
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/rendering/XColorSpace.idl b/offapi/com/sun/star/rendering/XColorSpace.idl
index a08295d9565d..0a55a85021b0 100644
--- a/offapi/com/sun/star/rendering/XColorSpace.idl
+++ b/offapi/com/sun/star/rendering/XColorSpace.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,9 @@
 #ifndef __com_sun_star_rendering_XColorSpace_idl__
 #define __com_sun_star_rendering_XColorSpace_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
@@ -102,7 +102,7 @@ interface XColorSpace
         @return a value from the <type>ColorSpaceType</type> constant
         group.
      */
-    byte                     getType();
+    byte                     getType(); 
 
     /** Query the kind for each color component.<p>
 
@@ -112,7 +112,7 @@ interface XColorSpace
         tags, specifying for each component of a color value, to what
         color attribute (if any) it corresponds. The values must be
         one of the <type>ColorComponentTag</type> constants.<p>
-
+        
         At the same time, the number of elements in this sequence
         corresponds to the number of color channels for this color
         space.<p>
@@ -139,7 +139,7 @@ interface XColorSpace
         href="http://en.wikipedia.org/wiki/Color_temperature">here</a>.
      */
     sequence< ::com::sun::star::beans::PropertyValue > getProperties();
-
+    
 
     //=============================================================================
 
diff --git a/offapi/com/sun/star/rendering/XCustomSprite.idl b/offapi/com/sun/star/rendering/XCustomSprite.idl
index e02f3c62df84..03cb54261d08 100644
--- a/offapi/com/sun/star/rendering/XCustomSprite.idl
+++ b/offapi/com/sun/star/rendering/XCustomSprite.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,9 @@
 #ifndef __com_sun_star_rendering_XCustomSprite_idl__
 #define __com_sun_star_rendering_XCustomSprite_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
 #endif
diff --git a/offapi/com/sun/star/rendering/XGraphicDevice.idl b/offapi/com/sun/star/rendering/XGraphicDevice.idl
index a9caaefede7e..749f43cc9ba2 100644
--- a/offapi/com/sun/star/rendering/XGraphicDevice.idl
+++ b/offapi/com/sun/star/rendering/XGraphicDevice.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,12 @@
 #ifndef __com_sun_star_rendering_XGraphicDevice_idl__
 #define __com_sun_star_rendering_XGraphicDevice_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_geometry_IntegerSize2D_idl__
 #include <com/sun/star/geometry/IntegerSize2D.idl>
 #endif
@@ -81,37 +81,37 @@ interface XBufferController;
 interface XGraphicDevice : ::com::sun::star::uno::XInterface
 {
     /** Query the controller for multi buffering functionality on this
-        graphic device.
+        graphic device. 
 
         If there is no such functionality available, the NULL
         reference is returned.
      */
-    XBufferController                           getBufferController();
+    XBufferController 							getBufferController();
 
     //-------------------------------------------------------------------------
 
-    /** Query the color space interface for this graphic device.
+    /** Query the color space interface for this graphic device. 
 
         This is to be used when interpreting or setting device color
         values.
      */
-    XColorSpace                                 getDeviceColorSpace();
+    XColorSpace		 							getDeviceColorSpace();
 
     //-------------------------------------------------------------------------
 
     /** Query the physical resolution of the device in pixel per
-        millimeter.
+        millimeter. 
 
         A special floating point value of +infinity here indicates
         'unknown', i.e. at the time of rendering undetermined or
         possibly infinite resolution along the corresponding
         direction.
      */
-    ::com::sun::star::geometry::RealSize2D  getPhysicalResolution();
+    ::com::sun::star::geometry::RealSize2D	getPhysicalResolution();
 
     //-------------------------------------------------------------------------
 
-    /** Query the physical dimensions of the device in millimeter.
+    /** Query the physical dimensions of the device in millimeter. 
 
         A special floating point value of +infinity here indicates
         'unknown', i.e. at the time of rendering undetermined or
@@ -120,7 +120,7 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
 
         @see XBitmap::getSize()
      */
-    ::com::sun::star::geometry::RealSize2D  getPhysicalSize();
+    ::com::sun::star::geometry::RealSize2D	getPhysicalSize();
 
     //-------------------------------------------------------------------------
 
@@ -130,7 +130,7 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
         @param points
         The points of the poly-polygon, in a separate array for every polygon.
      */
-    XLinePolyPolygon2D              createCompatibleLinePolyPolygon( [in] sequence< sequence< ::com::sun::star::geometry::RealPoint2D > > points );
+    XLinePolyPolygon2D 				createCompatibleLinePolyPolygon( [in] sequence< sequence< ::com::sun::star::geometry::RealPoint2D > > points );
 
     //-------------------------------------------------------------------------
 
@@ -140,7 +140,7 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
         @param points
         The points of the poly-polygon, in a separate array for every polygon.
      */
-    XBezierPolyPolygon2D            createCompatibleBezierPolyPolygon( [in] sequence< sequence< ::com::sun::star::geometry::RealBezierSegment2D > > points );
+    XBezierPolyPolygon2D 			createCompatibleBezierPolyPolygon( [in] sequence< sequence< ::com::sun::star::geometry::RealBezierSegment2D > > points );
 
     //-------------------------------------------------------------------------
 
@@ -151,8 +151,8 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
         Size of the requested bitmap in pixel. Both components of the
         size must be greater than 0
      */
-    XBitmap                         createCompatibleBitmap( [in] ::com::sun::star::geometry::IntegerSize2D size )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    XBitmap			 				createCompatibleBitmap( [in] ::com::sun::star::geometry::IntegerSize2D size )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -171,8 +171,8 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
         Size of the requested bitmap in pixel. Both components of the
         size must be greater than 0
      */
-    XVolatileBitmap                 createVolatileBitmap( [in] ::com::sun::star::geometry::IntegerSize2D size )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    XVolatileBitmap	 				createVolatileBitmap( [in] ::com::sun::star::geometry::IntegerSize2D size )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -183,8 +183,8 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
         Size of the requested bitmap in pixel. Both components of the
         size must be greater than 0
      */
-    XBitmap                         createCompatibleAlphaBitmap( [in] ::com::sun::star::geometry::IntegerSize2D size )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    XBitmap			 				createCompatibleAlphaBitmap( [in] ::com::sun::star::geometry::IntegerSize2D size )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -204,8 +204,8 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
         Size of the requested bitmap in pixel. Both components of the
         size must be greater than 0
      */
-    XVolatileBitmap                 createVolatileAlphaBitmap( [in] ::com::sun::star::geometry::IntegerSize2D size )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    XVolatileBitmap	 				createVolatileAlphaBitmap( [in] ::com::sun::star::geometry::IntegerSize2D size )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -275,7 +275,7 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
           * "FourCrossingLinesHatch" - this hatching consists of
             vertical and horizontal lines plus diagonal lines in both
             directions.
-        </pre>
+        </pre>     
      */
     com::sun::star::lang::XMultiServiceFactory getParametricPolyPolygonFactory();
 
@@ -284,7 +284,7 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
     /** Tells whether this graphic device has a full screen mode,
         i.e. whether a window can cover the whole screen exclusively.
      */
-    boolean                         hasFullScreenMode();
+    boolean			 				hasFullScreenMode();
 
     //-------------------------------------------------------------------------
 
@@ -295,7 +295,7 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
         fullscreen mode can be left without a enterFullScreenMode(
         false ) call.
      */
-    boolean                         enterFullScreenMode( [in] boolean bEnter );
+    boolean							enterFullScreenMode( [in] boolean bEnter );
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/XHalfFloatBitmap.idl b/offapi/com/sun/star/rendering/XHalfFloatBitmap.idl
index e23ec8420388..2c2d6d787b33 100644
--- a/offapi/com/sun/star/rendering/XHalfFloatBitmap.idl
+++ b/offapi/com/sun/star/rendering/XHalfFloatBitmap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,10 +29,10 @@
 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
 #endif
@@ -68,11 +68,11 @@ interface XHalfFloatBitmap : XHalfFloatReadOnlyBitmap
         bitmap can be changed. When setting subsets of the bitmap, the
         same scanline padding takes place as when the whole bitmap is
         changed.<p>
-
+        
      */
-    void                        setData( [in] sequence<short> data, [in] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerRectangle2D rect )
+    void						setData( [in] sequence<short> data, [in] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerRectangle2D rect )
         raises (com::sun::star::lang::IllegalArgumentException,
-                com::sun::star::lang::IndexOutOfBoundsException);
+                com::sun::star::lang::IndexOutOfBoundsException); 
 
     //-------------------------------------------------------------------------
 
@@ -87,7 +87,7 @@ interface XHalfFloatBitmap : XHalfFloatReadOnlyBitmap
         IllegalArgumentException, if the memory layout changed between
         a call to getMemoryLayout() and setData().<p>
      */
-    void                        setPixel( [in] sequence<short> color, [in] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerPoint2D pos )
+    void						setPixel( [in] sequence<short> color, [in] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerPoint2D pos )
         raises (com::sun::star::lang::IllegalArgumentException,
                 com::sun::star::lang::IndexOutOfBoundsException);
 };
diff --git a/offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl b/offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl
index 166f38425d5c..e740949a98f8 100644
--- a/offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl
+++ b/offapi/com/sun/star/rendering/XHalfFloatReadOnlyBitmap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,10 +29,10 @@
 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
 #endif
@@ -85,9 +85,9 @@ interface XHalfFloatReadOnlyBitmap : XBitmap
         @throws <type>VolatileContentDestroyedException</type>
         if the bitmap is volatile, and the content has been destroyed by the system.
      */
-    sequence<short>             getData( [in] ::com::sun::star::geometry::IntegerRectangle2D rect )
+    sequence<short>				getData( [in] ::com::sun::star::geometry::IntegerRectangle2D rect )
         raises (com::sun::star::lang::IndexOutOfBoundsException,
-                VolatileContentDestroyedException);
+                VolatileContentDestroyedException); 
 
     //-------------------------------------------------------------------------
 
@@ -97,15 +97,15 @@ interface XHalfFloatReadOnlyBitmap : XBitmap
         @throws <type>VolatileContentDestroyedException</type>
         if the bitmap is volatile, and the content has been destroyed by the system.
      */
-    sequence<short>             getPixel( [in] ::com::sun::star::geometry::IntegerPoint2D pos )
+    sequence<short>				getPixel( [in] ::com::sun::star::geometry::IntegerPoint2D pos )
         raises (com::sun::star::lang::IndexOutOfBoundsException,
-                VolatileContentDestroyedException);
+                VolatileContentDestroyedException); 
 
     //-------------------------------------------------------------------------
 
     /** Query the memory layout for this bitmap.<p>
      */
-    FloatingPointBitmapLayout   getMemoryLayout();
+    FloatingPointBitmapLayout	getMemoryLayout();
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/XIeeeDoubleBitmap.idl b/offapi/com/sun/star/rendering/XIeeeDoubleBitmap.idl
index bdb8b657e625..eae58b546341 100644
--- a/offapi/com/sun/star/rendering/XIeeeDoubleBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIeeeDoubleBitmap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,10 +29,10 @@
 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
 #endif
@@ -66,7 +66,7 @@ interface XIeeeDoubleBitmap : XIeeeDoubleReadOnlyBitmap
         bitmap can be changed. When setting subsets of the bitmap, the
         same scanline padding takes place as when the whole bitmap is
         changed.<p>
-
+        
         When setting data on volatile bitmaps, always call isValid()
         before, and retrieve a new memory layout via
         getMemoryLayout(). At least under Windows, the memory layout
@@ -77,7 +77,7 @@ interface XIeeeDoubleBitmap : XIeeeDoubleReadOnlyBitmap
 
         @param data
         Data to set
-
+        
         @param bitmapLayout
         Layout of the data to set. Must match this bitmap's current
         layout.
@@ -95,9 +95,9 @@ interface XIeeeDoubleBitmap : XIeeeDoubleReadOnlyBitmap
         layout, or if the given data sequence has too few or too much
         elements.
      */
-    void                        setData( [in] sequence<double> data, [in] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerRectangle2D rect )
+    void						setData( [in] sequence<double> data, [in] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerRectangle2D rect )
         raises (com::sun::star::lang::IllegalArgumentException,
-                com::sun::star::lang::IndexOutOfBoundsException);
+                com::sun::star::lang::IndexOutOfBoundsException); 
 
     //-------------------------------------------------------------------------
 
@@ -130,9 +130,9 @@ interface XIeeeDoubleBitmap : XIeeeDoubleReadOnlyBitmap
         layout, or if the given data sequence has too few or too much
         elements.
      */
-    void                        setPixel( [in] sequence<double> color, [in] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerPoint2D pos )
+    void						setPixel( [in] sequence<double> color, [in] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerPoint2D pos )
         raises (com::sun::star::lang::IllegalArgumentException,
-                com::sun::star::lang::IndexOutOfBoundsException);
+                com::sun::star::lang::IndexOutOfBoundsException); 
 
 };
 
diff --git a/offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl b/offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl
index 80103467ad1d..04a13be59388 100644
--- a/offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIeeeDoubleReadOnlyBitmap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,10 +29,10 @@
 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
 #endif
@@ -96,9 +96,9 @@ interface XIeeeDoubleReadOnlyBitmap : XBitmap
         if parts of the given rectangle are outside the permissible
         bitmap area.
      */
-    sequence<double>            getData( [out] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerRectangle2D rect )
+    sequence<double>			getData( [out] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerRectangle2D rect )
         raises (com::sun::star::lang::IndexOutOfBoundsException,
-                VolatileContentDestroyedException);
+                VolatileContentDestroyedException); 
 
     //-------------------------------------------------------------------------
 
@@ -121,9 +121,9 @@ interface XIeeeDoubleReadOnlyBitmap : XBitmap
         @throws <type>com::sun::star::lang::IndexOutOfBoundsException</type>
         if the given position is outside the permissible bitmap area.
      */
-    sequence<double>            getPixel( [out] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerPoint2D pos )
+    sequence<double>			getPixel( [out] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerPoint2D pos )
         raises (com::sun::star::lang::IndexOutOfBoundsException,
-                VolatileContentDestroyedException);
+                VolatileContentDestroyedException); 
 
     //-------------------------------------------------------------------------
 
@@ -132,7 +132,7 @@ interface XIeeeDoubleReadOnlyBitmap : XBitmap
         Please note that for volatile bitmaps, the memory layout might
         change between subsequent calls.<p>
      */
-    FloatingPointBitmapLayout   getMemoryLayout();
+    FloatingPointBitmapLayout	getMemoryLayout();
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/XIeeeFloatBitmap.idl b/offapi/com/sun/star/rendering/XIeeeFloatBitmap.idl
index 6fd9f9552e9b..7b0b16f28582 100644
--- a/offapi/com/sun/star/rendering/XIeeeFloatBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIeeeFloatBitmap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,10 +29,10 @@
 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
 #endif
@@ -66,7 +66,7 @@ interface XIeeeFloatBitmap : XIeeeFloatReadOnlyBitmap
         bitmap can be changed. When setting subsets of the bitmap, the
         same scanline padding takes place as when the whole bitmap is
         changed.<p>
-
+        
         When setting data on volatile bitmaps, always call isValid()
         before, and retrieve a new memory layout via
         getMemoryLayout(). At least under Windows, the memory layout
@@ -77,7 +77,7 @@ interface XIeeeFloatBitmap : XIeeeFloatReadOnlyBitmap
 
         @param data
         Data to set
-
+        
         @param bitmapLayout
         Layout of the data to set. Must match this bitmap's current
         layout.
@@ -95,9 +95,9 @@ interface XIeeeFloatBitmap : XIeeeFloatReadOnlyBitmap
         layout, or if the given data sequence has too few or too much
         elements.
      */
-    void                        setData( [in] sequence<float> data, [in] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerRectangle2D rect )
+    void						setData( [in] sequence<float> data, [in] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerRectangle2D rect )
         raises (com::sun::star::lang::IllegalArgumentException,
-                com::sun::star::lang::IndexOutOfBoundsException);
+                com::sun::star::lang::IndexOutOfBoundsException); 
 
     //-------------------------------------------------------------------------
 
@@ -130,7 +130,7 @@ interface XIeeeFloatBitmap : XIeeeFloatReadOnlyBitmap
         layout, or if the given data sequence has too few or too much
         elements.
      */
-    void                        setPixel( [in] sequence<float> color, [in] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerPoint2D pos )
+    void						setPixel( [in] sequence<float> color, [in] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerPoint2D pos )
         raises (com::sun::star::lang::IllegalArgumentException,
                 com::sun::star::lang::IndexOutOfBoundsException);
 };
diff --git a/offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl b/offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl
index 04e5cf0e8865..1b7cf877992e 100644
--- a/offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIeeeFloatReadOnlyBitmap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,10 +29,10 @@
 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_rendering_FloatingPointBitmapLayout_idl__
 #include <com/sun/star/rendering/FloatingPointBitmapLayout.idl>
 #endif
@@ -95,9 +95,9 @@ interface XIeeeFloatReadOnlyBitmap : XBitmap
         if parts of the given rectangle are outside the permissible
         bitmap area.
      */
-    sequence<float>             getData( [out] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerRectangle2D rect )
+    sequence<float>				getData( [out] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerRectangle2D rect )
         raises (com::sun::star::lang::IndexOutOfBoundsException,
-                VolatileContentDestroyedException);
+                VolatileContentDestroyedException); 
 
     //-------------------------------------------------------------------------
 
@@ -120,9 +120,9 @@ interface XIeeeFloatReadOnlyBitmap : XBitmap
         @throws <type>com::sun::star::lang::IndexOutOfBoundsException</type>
         if the given position is outside the permissible bitmap area.
      */
-    sequence<float>             getPixel( [out] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerPoint2D pos )
+    sequence<float>				getPixel( [out] FloatingPointBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerPoint2D pos )
         raises (com::sun::star::lang::IndexOutOfBoundsException,
-                VolatileContentDestroyedException);
+                VolatileContentDestroyedException); 
 
     //-------------------------------------------------------------------------
 
@@ -131,7 +131,7 @@ interface XIeeeFloatReadOnlyBitmap : XBitmap
         Please note that for volatile bitmaps, the memory layout might
         change between subsequent calls.<p>
      */
-    FloatingPointBitmapLayout   getMemoryLayout();
+    FloatingPointBitmapLayout	getMemoryLayout();
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/XIntegerBitmap.idl b/offapi/com/sun/star/rendering/XIntegerBitmap.idl
index c56d46d948c1..4ce4579d1a26 100644
--- a/offapi/com/sun/star/rendering/XIntegerBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIntegerBitmap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,10 +29,10 @@
 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
 #include <com/sun/star/geometry/IntegerPoint2D.idl>
 #endif
@@ -55,7 +55,7 @@ module com { module sun { module star { module rendering {
     @since OOo 2.0.0
  */
 interface XIntegerBitmap : XIntegerReadOnlyBitmap
-{
+{		  
     //-------------------------------------------------------------------------
 
     /** Set raw data of a bitmap.<p>
@@ -68,7 +68,7 @@ interface XIntegerBitmap : XIntegerReadOnlyBitmap
         right of each scanline is ignored and left unchanged in the
         bitmap. When setting subsets of the bitmap, the same scanline
         padding takes place as when the whole bitmap is changed.<p>
-
+        
         When setting data on volatile bitmaps, always call isValid()
         before, and retrieve a new memory layout via
         getMemoryLayout(). At least under Windows, the memory layout
@@ -79,7 +79,7 @@ interface XIntegerBitmap : XIntegerReadOnlyBitmap
 
         @param data
         Data to set
-
+        
         @param bitmapLayout
         Layout of the data to set. Must match this bitmap's current
         layout.
@@ -97,9 +97,9 @@ interface XIntegerBitmap : XIntegerReadOnlyBitmap
         layout, or if the given data sequence has too few or too many
         elements.
      */
-    void                setData( [in] sequence<byte> data, [in] IntegerBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerRectangle2D rect )
+    void				setData( [in] sequence<byte> data, [in] IntegerBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerRectangle2D rect )
         raises (com::sun::star::lang::IllegalArgumentException,
-                com::sun::star::lang::IndexOutOfBoundsException);
+                com::sun::star::lang::IndexOutOfBoundsException); 
 
     //-------------------------------------------------------------------------
 
@@ -137,7 +137,7 @@ interface XIntegerBitmap : XIntegerReadOnlyBitmap
         layout, or if the given data sequence has too few or too many
         elements.
      */
-    void                setPixel( [in] sequence<byte> color, [in] IntegerBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerPoint2D pos )
+    void				setPixel( [in] sequence<byte> color, [in] IntegerBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerPoint2D pos )
         raises (com::sun::star::lang::IllegalArgumentException,
                 com::sun::star::lang::IndexOutOfBoundsException);
 };
diff --git a/offapi/com/sun/star/rendering/XIntegerBitmapColorSpace.idl b/offapi/com/sun/star/rendering/XIntegerBitmapColorSpace.idl
index f05c7a4b1303..32637e55b0fa 100644
--- a/offapi/com/sun/star/rendering/XIntegerBitmapColorSpace.idl
+++ b/offapi/com/sun/star/rendering/XIntegerBitmapColorSpace.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,9 @@
 #ifndef __com_sun_star_rendering_XIntegerBitmapColorSpace_idl__
 #define __com_sun_star_rendering_XIntegerBitmapColorSpace_idl__
 
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
-#include <com/sun/star/rendering/XColorSpace.idl>
-#endif
+#ifndef __com_sun_star_rendering_XColorSpace_idl__ 
+#include <com/sun/star/rendering/XColorSpace.idl> 
+#endif 
 
 module com { module sun { module star { module rendering {
 
diff --git a/offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap.idl b/offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap.idl
index a7385aa9973a..221bd1587bd2 100644
--- a/offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap.idl
+++ b/offapi/com/sun/star/rendering/XIntegerReadOnlyBitmap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,10 +29,10 @@
 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_geometry_IntegerPoint2D_idl__
 #include <com/sun/star/geometry/IntegerPoint2D.idl>
 #endif
@@ -72,7 +72,7 @@ interface XBitmapPalette;
     need consistent information.<p>
  */
 interface XIntegerReadOnlyBitmap : XBitmap
-{
+{		  
     /** Query the raw data of this bitmap.<p>
 
         Query the raw data of this bitmap, in the format as defined by
@@ -105,9 +105,9 @@ interface XIntegerReadOnlyBitmap : XBitmap
         if parts of the given rectangle are outside the permissible
         bitmap area.
      */
-    sequence<byte>      getData( [out] IntegerBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerRectangle2D rect )
+    sequence<byte> 		getData( [out] IntegerBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerRectangle2D rect )
         raises (com::sun::star::lang::IndexOutOfBoundsException,
-                VolatileContentDestroyedException);
+                VolatileContentDestroyedException); 
 
     //-------------------------------------------------------------------------
 
@@ -141,9 +141,9 @@ interface XIntegerReadOnlyBitmap : XBitmap
         @throws <type>com::sun::star::lang::IndexOutOfBoundsException</type>
         if the given position is outside the permissible bitmap area.
      */
-    sequence<byte>      getPixel( [out] IntegerBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerPoint2D pos )
+    sequence<byte>		getPixel( [out] IntegerBitmapLayout bitmapLayout, [in] ::com::sun::star::geometry::IntegerPoint2D pos )
         raises (com::sun::star::lang::IndexOutOfBoundsException,
-                VolatileContentDestroyedException);
+                VolatileContentDestroyedException); 
 
     //-------------------------------------------------------------------------
 
@@ -152,7 +152,7 @@ interface XIntegerReadOnlyBitmap : XBitmap
         Please note that for volatile bitmaps, the memory layout might
         change between subsequent calls.<p>
      */
-    IntegerBitmapLayout getMemoryLayout();
+    IntegerBitmapLayout	getMemoryLayout();
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl b/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl
index a44e1d4fa7dd..eedb1e14045e 100644
--- a/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,12 @@
 #ifndef __com_sun_star_rendering_XLinePolyPolygon2D_idl__
 #define __com_sun_star_rendering_XLinePolyPolygon2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
 #endif
@@ -51,7 +51,7 @@ interface XLinePolyPolygon2D : XPolyPolygon2D
     /** Query subset of this poly-polygon, starting at the given
         polygon and the given point within that polygon, and
         containing the specified number of polygons and points in the
-        last polygon.
+        last polygon. 
 
         @param nPolygonIndex
         The index number of the polygon to start with extracting
@@ -74,7 +74,7 @@ interface XLinePolyPolygon2D : XPolyPolygon2D
         from the last polygon.
      */
     sequence< sequence< ::com::sun::star::geometry::RealPoint2D > > getPoints( [in] long nPolygonIndex, [in] long nNumberOfPolygons, [in] long nPointIndex, [in] long nNumberOfPoints )
-        raises (com::sun::star::lang::IndexOutOfBoundsException);
+        raises (com::sun::star::lang::IndexOutOfBoundsException); 
 
     //-------------------------------------------------------------------------
 
@@ -97,17 +97,17 @@ interface XLinePolyPolygon2D : XPolyPolygon2D
         specified point data.
 
         @throws <type>com::sun::star::lang::IndexOutOfBoundsException</type>
-        if one of the given values exceed the permissible range.
+        if one of the given values exceed the permissible range.        
      */
     void setPoints( [in] sequence< sequence< ::com::sun::star::geometry::RealPoint2D > > points, [in] long nPolygonIndex )
-        raises (com::sun::star::lang::IndexOutOfBoundsException);
+        raises (com::sun::star::lang::IndexOutOfBoundsException); 
 
     //-------------------------------------------------------------------------
 
     /** Get a single point from the poly-polygon
      */
-    ::com::sun::star::geometry::RealPoint2D getPoint( [in] long nPolygonIndex, [in] long nPointIndex )
-        raises (com::sun::star::lang::IndexOutOfBoundsException);
+    ::com::sun::star::geometry::RealPoint2D	getPoint( [in] long nPolygonIndex, [in] long nPointIndex )
+        raises (com::sun::star::lang::IndexOutOfBoundsException); 
 
     //-------------------------------------------------------------------------
 
@@ -115,7 +115,7 @@ interface XLinePolyPolygon2D : XPolyPolygon2D
         the poly-polygon will not be changed by this method.
      */
     void setPoint( [in] ::com::sun::star::geometry::RealPoint2D point, [in] long nPolygonIndex, [in] long nPointIndex )
-        raises (com::sun::star::lang::IndexOutOfBoundsException);
+        raises (com::sun::star::lang::IndexOutOfBoundsException); 
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl b/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl
index 2102422147d7..d01474d1e117 100644
--- a/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,12 @@
 #ifndef __com_sun_star_rendering_XParametricPolyPolygon2D_idl__
 #define __com_sun_star_rendering_XParametricPolyPolygon2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
 #endif
@@ -54,11 +54,11 @@ module com { module sun { module star { module rendering {
  */
 interface XParametricPolyPolygon2D : ::com::sun::star::uno::XInterface
 {
-    /** Query the polygonal outline at the specified value.
+    /** Query the polygonal outline at the specified value. 
 
         The returned outline should be clipped to the [0,1]x[0,1]
         rectangle.
-
+    
         @param t
         Parameter value in the range [0,1]. During painting, this
         range is sweeped through starting from 0. When using such a
@@ -67,8 +67,8 @@ interface XParametricPolyPolygon2D : ::com::sun::star::uno::XInterface
         with t (unless singularities in e.g. the resulting gradient
         are desired).
      */
-    XPolyPolygon2D              getOutline( [in] double t )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    XPolyPolygon2D 				getOutline( [in] double t )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -79,27 +79,27 @@ interface XParametricPolyPolygon2D : ::com::sun::star::uno::XInterface
         Parameter value in the range [0,1]. During painting, this
         range is swept through starting from 0.
      */
-    sequence<ColorComponent>    getColor( [in] double t )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    sequence<ColorComponent> 	getColor( [in] double t )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
-    /** Query the color for a dedicated point in the plane.
-
+    /** Query the color for a dedicated point in the plane. 
+    
         @param point
         The permissible parameter range for point is [0,1]x[0,1]
      */
-    sequence<ColorComponent>    getPointColor( [in] ::com::sun::star::geometry::RealPoint2D point )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    sequence<ColorComponent>	getPointColor( [in] ::com::sun::star::geometry::RealPoint2D point )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
     /** Query the color space employed by this object
-
+    
         @return the color space the colors generated by this object
         are to be interpreted in.
      */
-    XColorSpace                 getColorSpace();
+    XColorSpace					getColorSpace();
 
 };
 
diff --git a/offapi/com/sun/star/rendering/XPolyPolygon2D.idl b/offapi/com/sun/star/rendering/XPolyPolygon2D.idl
index 47b61210d3fd..b663cd28a67d 100644
--- a/offapi/com/sun/star/rendering/XPolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XPolyPolygon2D.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,15 +27,15 @@
 #ifndef __com_sun_star_rendering_XPolyPolygon2D_idl__
 #define __com_sun_star_rendering_XPolyPolygon2D_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_rendering_FillRule_idl__
 #include <com/sun/star/rendering/FillRule.idl>
 #endif
@@ -51,7 +51,7 @@ module com { module sun { module star { module rendering {
  */
 interface XPolyPolygon2D : ::com::sun::star::uno::XInterface
 {
-    /** Add the specified poly-polygon at the given position.
+    /** Add the specified poly-polygon at the given position. 
 
         One can do symbolic path construction with this method. The
         poly-polygons added by this method are not joined in the sense
@@ -81,14 +81,14 @@ interface XPolyPolygon2D : ::com::sun::star::uno::XInterface
         (<type>XBezierPolyPolygon2D</type>,
         <type>XLinePolyPolygon2D</type>).
      */
-    void        addPolyPolygon( [in] ::com::sun::star::geometry::RealPoint2D position, [in] XPolyPolygon2D polyPolygon )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    void		addPolyPolygon( [in] ::com::sun::star::geometry::RealPoint2D position, [in] XPolyPolygon2D polyPolygon )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
     /** Query number of polygons inside this poly-polygon
      */
-    long        getNumberOfPolygons();
+    long		getNumberOfPolygons();
 
     //-------------------------------------------------------------------------
 
@@ -98,37 +98,37 @@ interface XPolyPolygon2D : ::com::sun::star::uno::XInterface
         The index of the polygon to query the number of points
         for. Must be in the range [0,getNumberOfPolygons()-1].
      */
-    long        getNumberOfPolygonPoints( [in] long polygon )
-        raises (com::sun::star::lang::IndexOutOfBoundsException);
+    long		getNumberOfPolygonPoints( [in] long polygon )
+        raises (com::sun::star::lang::IndexOutOfBoundsException); 
 
     //-------------------------------------------------------------------------
 
     /** Query the rule used to determine inside and outside of the
         poly-polygon.
      */
-    FillRule    getFillRule();
+    FillRule	getFillRule();
 
     //-------------------------------------------------------------------------
 
     /** Set the rule used to determine inside and outside of the
         poly-polygon.
      */
-    void        setFillRule( [in] FillRule fillRule );
+    void		setFillRule( [in] FillRule fillRule );
 
     //-------------------------------------------------------------------------
 
     /** Query whether the specified polygon outline is closed.
      */
-    boolean     isClosed( [in] long index )
-        raises (com::sun::star::lang::IndexOutOfBoundsException);
+    boolean		isClosed( [in] long index )
+        raises (com::sun::star::lang::IndexOutOfBoundsException); 
 
     //-------------------------------------------------------------------------
 
     /** Set the close state of the specified polygon outline. Use -1
         as the index to affect all polygons of this poly-polygon.
      */
-    void        setClosed( [in] long index, [in] boolean closedState )
-        raises (com::sun::star::lang::IndexOutOfBoundsException);
+    void		setClosed( [in] long index, [in] boolean closedState )
+        raises (com::sun::star::lang::IndexOutOfBoundsException); 
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/XSimpleCanvas.idl b/offapi/com/sun/star/rendering/XSimpleCanvas.idl
index 33626853e80a..c9d589750e1f 100644
--- a/offapi/com/sun/star/rendering/XSimpleCanvas.idl
+++ b/offapi/com/sun/star/rendering/XSimpleCanvas.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,10 +24,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_rendering_XSimpleCanvas_idl__
+#ifndef __com_sun_star_rendering_XSimpleCanvas_idl__ 
 #define __com_sun_star_rendering_XSimpleCanvas_idl__
 
-#ifndef __com_sun_star_util_Color_idl__
+#ifndef __com_sun_star_util_Color_idl__ 
 #include <com/sun/star/util/Color.idl>
 #endif
 #ifndef __com_sun_star_geometry_RealPoint2D_idl__
@@ -52,10 +52,10 @@
 #include <com/sun/star/rendering/FontMetrics.idl>
 #endif
 
-//=============================================================================
-
-module com {  module sun {  module star {  module rendering {
-
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module rendering {  
+ 
 interface XCanvas;
 interface XCanvasFont;
 interface XBitmap;
@@ -75,7 +75,7 @@ interface XPolyPolygon2D;
     setting appropriate pen and fill colors.<p>
  */
 interface XSimpleCanvas: com::sun::star::uno::XInterface
-{
+{ 
     /** Select a font.<p>
 
         This method selects the specified font (or a close substitute)
@@ -96,8 +96,8 @@ interface XSimpleCanvas: com::sun::star::uno::XInterface
         When true, selected font is italic
      */
     void selectFont( [in] string sFontName, [in]double size, [in] boolean bold, [in] boolean italic );
-
-    //-------------------------------------------------------------------------
+ 
+    //------------------------------------------------------------------------- 
 
     /** Sets the color used by line and text operations.<p>
 
@@ -107,10 +107,10 @@ interface XSimpleCanvas: com::sun::star::uno::XInterface
         @param nsRgbaColor
         RGBA color tuple, interpreted in the sRGB color space.
      */
-    void setPenColor( [in] com::sun::star::util::Color nsRgbaColor );
-
-    //-------------------------------------------------------------------------
-
+    void setPenColor( [in] com::sun::star::util::Color nsRgbaColor ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Sets the fill color.<p>
 
         To disable filling, simply set this color to something with
@@ -119,47 +119,47 @@ interface XSimpleCanvas: com::sun::star::uno::XInterface
         @param nsRgbaColor
         RGBA color tuple, interpreted in the sRGB color space.
      */
-    void setFillColor( [in] com::sun::star::util::Color nsRgbaColor );
-
-    //-------------------------------------------------------------------------
+    void setFillColor( [in] com::sun::star::util::Color nsRgbaColor ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** Sets the clip to the specified rectangle.<p>
      */
-    void setRectClip( [in] ::com::sun::star::geometry::RealRectangle2D aRect );
-
-    //-------------------------------------------------------------------------
+    void setRectClip( [in] ::com::sun::star::geometry::RealRectangle2D aRect ); 
 
+    //------------------------------------------------------------------------- 
+     
     /** Set the current transform matrix.<p>
      */
     void setTransformation( [in] ::com::sun::star::geometry::AffineMatrix2D aTransform );
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** Sets a single pixel on the canvas.<p>
      */
-    void drawPixel( [in] ::com::sun::star::geometry::RealPoint2D aPoint );
-
-    //-------------------------------------------------------------------------
-
+    void drawPixel( [in] ::com::sun::star::geometry::RealPoint2D aPoint ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Draws a line on the canvas.<p>
      */
-    void drawLine( [in] ::com::sun::star::geometry::RealPoint2D aStartPoint,
-                   [in] ::com::sun::star::geometry::RealPoint2D aEndPoint );
-
-    //-------------------------------------------------------------------------
-
+    void drawLine( [in] ::com::sun::star::geometry::RealPoint2D aStartPoint, 
+                   [in] ::com::sun::star::geometry::RealPoint2D aEndPoint ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Draws a rectangle on the canvas.<p>
      */
-    void drawRect( [in] ::com::sun::star::geometry::RealRectangle2D aRect );
-
-    //-------------------------------------------------------------------------
-
+    void drawRect( [in] ::com::sun::star::geometry::RealRectangle2D aRect ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Draws a poly-polygon on the canvas.<p>
      */
-    void drawPolyPolygon( [in] XPolyPolygon2D xPolyPolygon );
-
-    //-------------------------------------------------------------------------
-
+    void drawPolyPolygon( [in] XPolyPolygon2D xPolyPolygon ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Draws text on the canvas.<p>
 
         @param aText
@@ -177,11 +177,11 @@ interface XSimpleCanvas: com::sun::star::uno::XInterface
         i.e. the left edge for left-to-right and the right edge for
         right-to-left text.
      */
-    void drawText( [in] StringContext aText,
+    void drawText( [in] StringContext aText, 
                    [in] ::com::sun::star::geometry::RealPoint2D aOutPos,
                    [in] byte nTextDirection );
-
-    //-------------------------------------------------------------------------
+ 
+    //------------------------------------------------------------------------- 
 
     /** Draws the bitmap on the canvas.<p>
 
@@ -206,8 +206,8 @@ interface XSimpleCanvas: com::sun::star::uno::XInterface
         @return the associated <type>XGraphicDevice</type>.
      */
     XGraphicDevice getDevice();
-
-    //-------------------------------------------------------------------------
+ 
+    //------------------------------------------------------------------------- 
 
     /** Query the underlying <type>XCanvas</type>.<p>
 
@@ -216,15 +216,15 @@ interface XSimpleCanvas: com::sun::star::uno::XInterface
      */
     XCanvas getCanvas();
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** Request the font metrics of the current font.<p>
 
         @return the font metrics of the currently selected font.
      */
-    FontMetrics getFontMetrics();
-
-    //-------------------------------------------------------------------------
+    FontMetrics getFontMetrics(); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** Retrieve currently selected font.<p>
 
@@ -233,31 +233,31 @@ interface XSimpleCanvas: com::sun::star::uno::XInterface
      */
     XCanvasFont getCurrentFont();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** Retrieve color currently used for lines.
      */
     com::sun::star::util::Color getCurrentPenColor();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** Retrieve color currently used for fills
      */
     com::sun::star::util::Color getCurrentFillColor();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** Retrieve current clip rect
      */
     com::sun::star::geometry::RealRectangle2D getCurrentClipRect();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** Retrieve current transformation matrix
      */
     com::sun::star::geometry::AffineMatrix2D getCurrentTransformation();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** Retrieve view state.<p>
 
@@ -266,7 +266,7 @@ interface XSimpleCanvas: com::sun::star::uno::XInterface
      */
     ViewState getCurrentViewState();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** Retrieve render state.<p>
 
@@ -280,12 +280,12 @@ interface XSimpleCanvas: com::sun::star::uno::XInterface
      */
     RenderState getCurrentRenderState( [in] boolean bUseFillColor );
 
-    //-------------------------------------------------------------------------
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    //------------------------------------------------------------------------- 
+     
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/rendering/XSprite.idl b/offapi/com/sun/star/rendering/XSprite.idl
index 5ee4eb6dacd7..c644ea74f4c1 100644
--- a/offapi/com/sun/star/rendering/XSprite.idl
+++ b/offapi/com/sun/star/rendering/XSprite.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,12 @@
 #ifndef __com_sun_star_rendering_XSprite_idl__
 #define __com_sun_star_rendering_XSprite_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
 #endif
@@ -70,10 +70,10 @@ interface XSprite : ::com::sun::star::uno::XInterface
         background. Valid range is [0,1].
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if nAlpha is not within the permissible range.
+        if nAlpha is not within the permissible range.        
      */
     void setAlpha( [in] double nAlpha )
-        raises (com::sun::star::lang::IllegalArgumentException);
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -99,16 +99,16 @@ interface XSprite : ::com::sun::star::uno::XInterface
         The renderstate to be used when interpreting aNewPos.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
-        specified range.
+        if one of the view and renderstate parameters are outside the 
+        specified range.        
      */
     void move( [in] ::com::sun::star::geometry::RealPoint2D aNewPos, [in] ViewState aViewState, [in] RenderState aRenderState )
-        raises (com::sun::star::lang::IllegalArgumentException);
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
     /** Apply a local transformation to the sprite.<p>
-
+        
         The given transformation matrix locally transforms the sprite
         shape. If this transformation contains translational
         components, be aware that sprite content moved beyond the
@@ -135,7 +135,7 @@ interface XSprite : ::com::sun::star::uno::XInterface
         if the given transformation matrix is singular.
      */
     void transform( [in] com::sun::star::geometry::AffineMatrix2D aTransformation )
-        raises (com::sun::star::lang::IllegalArgumentException);
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -171,7 +171,7 @@ interface XSprite : ::com::sun::star::uno::XInterface
         @param aClip
         The clip poly-polygon to apply.
      */
-    void clip( [in] XPolyPolygon2D aClip );
+    void clip( [in] XPolyPolygon2D aClip ); 
 
     //-------------------------------------------------------------------------
 
@@ -188,7 +188,7 @@ interface XSprite : ::com::sun::star::uno::XInterface
         irregular floating point values here, the order position for
         sprites with such a priority value is undefined.
      */
-    void setPriority( [in] double nPriority );
+    void setPriority( [in] double nPriority ); 
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/rendering/XSpriteCanvas.idl b/offapi/com/sun/star/rendering/XSpriteCanvas.idl
index cc534013861a..0f1987158a94 100644
--- a/offapi/com/sun/star/rendering/XSpriteCanvas.idl
+++ b/offapi/com/sun/star/rendering/XSpriteCanvas.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_rendering_XBitmapCanvas_idl__
 #include <com/sun/star/rendering/XBitmapCanvas.idl>
 #endif
@@ -67,16 +67,16 @@ interface XSpriteCanvas : XBitmapCanvas
     /** Create a sprite object from the specified animation
         sequence. A sprite is a back-buffered object with its own,
         independent animation.
-     */
-    XAnimatedSprite createSpriteFromAnimation( [in] XAnimation animation )
-        raises (com::sun::star::lang::IllegalArgumentException);
+     */	
+    XAnimatedSprite	createSpriteFromAnimation( [in] XAnimation animation )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     /** Create a sprite object from the specified animation
         sequence.
 
         A sprite is a back-buffered object with its own,
         independent animation.
-
+        
         @param animationBitmaps
         Sequence of bitmaps. The bitmaps don't need to have the same
         size, but they are all rendered with their left, top edges
@@ -89,12 +89,12 @@ interface XSpriteCanvas : XBitmapCanvas
 
         @throws <type>VolatileContentDestroyedException</type>
         if at least one of the bitmap is volatile, and its content has been destroyed by the system.
-     */
-    XAnimatedSprite createSpriteFromBitmaps( [in] sequence<XBitmap> animationBitmaps, [in] byte interpolationMode )
+     */	
+    XAnimatedSprite	createSpriteFromBitmaps( [in] sequence<XBitmap> animationBitmaps, [in] byte interpolationMode )
         raises (com::sun::star::lang::IllegalArgumentException,
-                VolatileContentDestroyedException);
+                VolatileContentDestroyedException); 
 
-    /** Create a custom, user-handles-it-all sprite object.
+    /** Create a custom, user-handles-it-all sprite object. 
 
         A sprite is a back-buffered object with its own, independent
         animation.
@@ -106,9 +106,9 @@ interface XSpriteCanvas : XBitmapCanvas
         be greater than zero.
 
         @return an interface to a custom sprite object.
-     */
+     */	
     XCustomSprite createCustomSprite( [in] ::com::sun::star::geometry::RealSize2D spriteSize )
-        raises (com::sun::star::lang::IllegalArgumentException);
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     /** Create a cloned version of an already existing sprite
         object.
@@ -125,13 +125,13 @@ interface XSpriteCanvas : XBitmapCanvas
         IllegalArgumentException.
 
         @return an interface to a sprite object.
-     */
+     */	
     XSprite createClonedSprite( [in] XSprite original )
-        raises (com::sun::star::lang::IllegalArgumentException);
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     /** Tells the sprite canvas to now update the screen
          representation.
-
+        
         Required to display rendered changes to the canvas, and
         updates to stopped animations and XCustomSprites in
         general. This method will return only after the screen update
diff --git a/offapi/com/sun/star/rendering/XTextLayout.idl b/offapi/com/sun/star/rendering/XTextLayout.idl
index e4e2d2e76eca..1059eb6763dc 100644
--- a/offapi/com/sun/star/rendering/XTextLayout.idl
+++ b/offapi/com/sun/star/rendering/XTextLayout.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,15 +27,15 @@
 #ifndef __com_sun_star_rendering_XTextLayout_idl__
 #define __com_sun_star_rendering_XTextLayout_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
 #include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
+#endif 
 #ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
 #endif
@@ -102,7 +102,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         @returns a sequence of <type>XPolyPolygon2D</type> in font
         coordinate space, one for every glyph.
      */
-    sequence<XPolyPolygon2D>    queryTextShapes();
+    sequence<XPolyPolygon2D>	queryTextShapes(); 
 
     //-------------------------------------------------------------------------
 
@@ -120,7 +120,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
 
         @see <member>XTextLayout::queryMeasures()</member>
      */
-    sequence<::com::sun::star::geometry::RealRectangle2D >  queryInkMeasures();
+    sequence<::com::sun::star::geometry::RealRectangle2D >	queryInkMeasures(); 
 
     //-------------------------------------------------------------------------
 
@@ -137,7 +137,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
 
         @see <member>XTextLayout::queryInkMeasures()</member>
      */
-    sequence<::com::sun::star::geometry::RealRectangle2D>   queryMeasures();
+    sequence<::com::sun::star::geometry::RealRectangle2D>	queryMeasures(); 
 
     //-------------------------------------------------------------------------
 
@@ -159,7 +159,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
 
         @see <member>XTextLayout::applyLogicalAdvancements()</member>
      */
-    sequence<double>            queryLogicalAdvancements();
+    sequence<double>			queryLogicalAdvancements(); 
 
     //-------------------------------------------------------------------------
 
@@ -183,8 +183,8 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         if the size of aAdvancements does not match the number of
         characters in the text.
      */
-    void                        applyLogicalAdvancements( [in] sequence< double > aAdvancements )
-        raises (com::sun::star::lang::IllegalArgumentException);
+    void						applyLogicalAdvancements( [in] sequence< double > aAdvancements )
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -197,7 +197,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         @return the overall bounding box for the given layout, in font
         coordinate space.
      */
-    ::com::sun::star::geometry::RealRectangle2D   queryTextBounds();
+    ::com::sun::star::geometry::RealRectangle2D   queryTextBounds(); 
 
     //-------------------------------------------------------------------------
 
@@ -223,7 +223,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         if nSize is 0 or negative.
      */
     double justify( [in] double nSize )
-        raises (com::sun::star::lang::IllegalArgumentException);
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -257,10 +257,10 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         might even be significantly larger than nSize.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the parameters are not in the valid range.
+        if one of the parameters are not in the valid range.        
      */
     double combinedJustify( [in] sequence< XTextLayout > aNextLayouts, [in] double nSize )
-        raises (com::sun::star::lang::IllegalArgumentException);
+        raises (com::sun::star::lang::IllegalArgumentException); 
 
     //-------------------------------------------------------------------------
 
@@ -274,7 +274,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         underlying character index for.
 
      */
-    TextHit getTextHit( [in] ::com::sun::star::geometry::RealPoint2D aHitPoint );
+    TextHit getTextHit( [in] ::com::sun::star::geometry::RealPoint2D aHitPoint ); 
 
     //-------------------------------------------------------------------------
 
@@ -282,7 +282,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
 
         This method generates caret information for a given insertion
         point in the layout text.<p>
-
+    
         @param nInsertionIndex
         The insertion index, as e.g. returned by
         <member>XTextLayout::getTextHit()</member>. This value must be
@@ -298,9 +298,9 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         @throws <type>com::sun::star::lang::IndexOutOfBoundsException</type>
         if nInsertionIndex is outside the permissible range.
      */
-    Caret getCaret( [in] long nInsertionIndex,
+    Caret getCaret( [in] long nInsertionIndex, 
                     [in] boolean bExcludeLigatures )
-        raises (com::sun::star::lang::IndexOutOfBoundsException);
+        raises (com::sun::star::lang::IndexOutOfBoundsException); 
 
     //-------------------------------------------------------------------------
 
@@ -324,10 +324,10 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         if nStartIndex or nCaretAdvancement is outside the permissible
         range.
      */
-    long getNextInsertionIndex( [in] long nStartIndex,
-                                [in] long nCaretAdvancement,
+    long getNextInsertionIndex( [in] long nStartIndex, 
+                                [in] long nCaretAdvancement, 
                                 [in] boolean bExcludeLigatures )
-        raises (com::sun::star::lang::IndexOutOfBoundsException);
+        raises (com::sun::star::lang::IndexOutOfBoundsException); 
 
     //-------------------------------------------------------------------------
 
@@ -349,7 +349,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         if nStartIndex or nEndIndex are outside the permissible
         range.
      */
-    XPolyPolygon2D queryVisualHighlighting( [in] long nStartIndex,
+    XPolyPolygon2D queryVisualHighlighting( [in] long nStartIndex, 
                                             [in] long nEndIndex )
         raises (com::sun::star::lang::IndexOutOfBoundsException);
 
@@ -375,7 +375,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
         if nStartIndex or nEndIndex are outside the permissible
         range.
      */
-    XPolyPolygon2D queryLogicalHighlighting( [in] long nStartIndex,
+    XPolyPolygon2D queryLogicalHighlighting( [in] long nStartIndex, 
                                              [in] long nEndIndex )
         raises (com::sun::star::lang::IndexOutOfBoundsException);
 
@@ -419,7 +419,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
 
     /** Request the text this layout contains.
 
-        @returns the text this layout contains.
+        @returns the text this layout contains. 
      */
     StringContext getText();
 
diff --git a/offapi/com/sun/star/rendering/XVolatileBitmap.idl b/offapi/com/sun/star/rendering/XVolatileBitmap.idl
index 2597243f5505..f94bcf2dc095 100644
--- a/offapi/com/sun/star/rendering/XVolatileBitmap.idl
+++ b/offapi/com/sun/star/rendering/XVolatileBitmap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,16 +37,16 @@ module com { module sun { module star { module rendering {
     become invalid at any point in time).
  */
 interface XVolatileBitmap : XBitmap
-{
-    /** Query whether this volatile bitmap still has valid content.
+{		
+    /** Query whether this volatile bitmap still has valid content. 
 
         As the video RAM allocated to this bitmap can be reclaimed at
         any time, a return value of true here does not imply that the
         next draw operation with this bitmap will succeed. Instead,
         the exception VolatileContentDestroyed might then be thrown,
         if lost bitmap data is accessed.
-     */
-    boolean isValid();
+     */	
+    boolean	isValid();
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/Calculation.idl b/offapi/com/sun/star/report/Calculation.idl
index 228f7291c086..38f130981db5 100644
--- a/offapi/com/sun/star/report/Calculation.idl
+++ b/offapi/com/sun/star/report/Calculation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_Calculation_idl__
-#define __com_sun_star_report_Calculation_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module report {
-
-//=============================================================================
-
+#ifndef __com_sun_star_report_Calculation_idl__ 
+#define __com_sun_star_report_Calculation_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module report { 
+ 
+//============================================================================= 
+ 
 /** Specifies how to calculate a value.
     @see XFormattedField
  */
 constants Calculation
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the average of a field.
      */
     const short NONE = 0;
@@ -76,7 +76,7 @@ constants Calculation
     /** returns the smallest value from the field.
     */
     const short MINIMUM = 8;
-
+    
     /** returns the most frequently returning value from the field.
     */
     const short MODE = 9;
@@ -124,13 +124,13 @@ constants Calculation
     /** returns the weighted average for the field.
     */
     const short WEIGHTEDAVG = 20;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/report/ForceNewPage.idl b/offapi/com/sun/star/report/ForceNewPage.idl
index 38a15a56df9c..06b7b7089580 100644
--- a/offapi/com/sun/star/report/ForceNewPage.idl
+++ b/offapi/com/sun/star/report/ForceNewPage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_ForceNewPage_idl__
-#define __com_sun_star_report_ForceNewPage_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module report {
-
-//=============================================================================
-
+#ifndef __com_sun_star_report_ForceNewPage_idl__ 
+#define __com_sun_star_report_ForceNewPage_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module report { 
+ 
+//============================================================================= 
+ 
 /** Specifies if the section will be printed on an separte page.
     <p>This does not apply to page header or page footer.</p>
     @see XSection
  */
 constants ForceNewPage
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** The current section is printed on the current page.
      */
     const short NONE = 0;
@@ -57,13 +57,13 @@ constants ForceNewPage
     /** The current section is printed at the top of a new page as well as the next section.
      */
     const short BEFORE_AFTER_SECTION = 3;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/report/GroupKeepTogether.idl b/offapi/com/sun/star/report/GroupKeepTogether.idl
index 8c3a7110c2e4..a117d09bd510 100644
--- a/offapi/com/sun/star/report/GroupKeepTogether.idl
+++ b/offapi/com/sun/star/report/GroupKeepTogether.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_GroupKeepTogether_idl__
-#define __com_sun_star_report_GroupKeepTogether_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module report {
-
-//=============================================================================
-
+#ifndef __com_sun_star_report_GroupKeepTogether_idl__ 
+#define __com_sun_star_report_GroupKeepTogether_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module report { 
+ 
+//============================================================================= 
+ 
 /** Specifies if groups in a multi column report where the group has the property
     <member scope="XGroup">KeepTogether</member> set to WHOLE_GROUP or WITH_FIRST_DETAIL will keep together by page or column.
     @see XGroup
  */
 constants GroupKeepTogether
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** Groups are kept together by page.
      */
     const short PER_PAGE = 0;
@@ -49,13 +49,13 @@ constants GroupKeepTogether
     /** Groups are kept together by column.
      */
     const short PER_COLUMN = 1;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/report/GroupOn.idl b/offapi/com/sun/star/report/GroupOn.idl
index e3959e8885c7..653ef2f440ce 100644
--- a/offapi/com/sun/star/report/GroupOn.idl
+++ b/offapi/com/sun/star/report/GroupOn.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_GroupOn_idl__
-#define __com_sun_star_report_GroupOn_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module report {
-
-//=============================================================================
-
+#ifndef __com_sun_star_report_GroupOn_idl__ 
+#define __com_sun_star_report_GroupOn_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module report { 
+ 
+//============================================================================= 
+ 
 /** Specifies how to group data.
     @see XGroup
  */
 constants GroupOn
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** The same value in the column value or expression.
      */
     const short DEFAULT = 0;
@@ -49,7 +49,7 @@ constants GroupOn
      */
     const short PREFIX_CHARACTERS = 1;
 
-    /** Dates in the same calendar year.
+    /** Dates in the same calendar year. 
     */
     const short YEAR= 2;
 
@@ -72,7 +72,7 @@ constants GroupOn
     /** Times in the same hour.
     */
     const short HOUR = 7;
-
+    
     /** Times in the same minute.
     */
     const short MINUTE = 8;
@@ -80,13 +80,13 @@ constants GroupOn
     /** Values within an interval you specify.
     */
     const short INTERVAL = 9;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/report/KeepTogether.idl b/offapi/com/sun/star/report/KeepTogether.idl
index 0a5ccbc70d26..98f5cb1d23ad 100644
--- a/offapi/com/sun/star/report/KeepTogether.idl
+++ b/offapi/com/sun/star/report/KeepTogether.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_KeepTogether_idl__
-#define __com_sun_star_report_KeepTogether_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module report {
-
-//=============================================================================
-
+#ifndef __com_sun_star_report_KeepTogether_idl__ 
+#define __com_sun_star_report_KeepTogether_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module report { 
+ 
+//============================================================================= 
+ 
 /** Specifies that a group header, detail, and footer section is printed on the same page.
     @see XGroup
  */
 constants KeepTogether
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** Prints the group without keeping the header, detail, and footer together on the same page.
      */
     const short NO = 0;
@@ -52,13 +52,13 @@ constants KeepTogether
     /** Prints the group header on a page when the first detail record can fit on the same page.
     */
     const short WITH_FIRST_DETAIL = 2;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/report/ReportPrintOption.idl b/offapi/com/sun/star/report/ReportPrintOption.idl
index 218944d2b513..203cc6a6d0d2 100644
--- a/offapi/com/sun/star/report/ReportPrintOption.idl
+++ b/offapi/com/sun/star/report/ReportPrintOption.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_ReportPrintOption_idl__
-#define __com_sun_star_report_ReportPrintOption_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module report {
-
-//=============================================================================
-
+#ifndef __com_sun_star_report_ReportPrintOption_idl__ 
+#define __com_sun_star_report_ReportPrintOption_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module report { 
+ 
+//============================================================================= 
+ 
 /** Specifies wether a page header or footer is printed on the same page as the report header or report footer.
  */
 constants ReportPrintOption
-{
-    //-------------------------------------------------------------------------
-
-    /** The page header/footer is printed on all pages.
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** The page header/footer is printed on all pages. 
      */
     const short ALL_PAGES = 0;
 
@@ -55,13 +55,13 @@ constants ReportPrintOption
     /** The page header/footer is not printed on the same page as the report header or footer.
      */
     const short NOT_WITH_REPORT_HEADER_FOOTER = 3;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/report/SectionPageBreak.idl b/offapi/com/sun/star/report/SectionPageBreak.idl
index 04af47ae1609..6efbce102e61 100644
--- a/offapi/com/sun/star/report/SectionPageBreak.idl
+++ b/offapi/com/sun/star/report/SectionPageBreak.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_SectionPageBreak_idl__
-#define __com_sun_star_report_SectionPageBreak_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module report {
-
-//=============================================================================
-
-/** Specifies that page breaks are allowed inside this section.
+#ifndef __com_sun_star_report_SectionPageBreak_idl__ 
+#define __com_sun_star_report_SectionPageBreak_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module report { 
+ 
+//============================================================================= 
+ 
+/** Specifies that page breaks are allowed inside this section. 
     @see XSection
  */
 constants SectionPageBreak
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** Page breaks will never be inserted. If the section doesn't fit on a page than the content will be cut.
      */
     const short NONE = 0;
@@ -52,9 +52,9 @@ constants SectionPageBreak
     /** If the section doesn't fit on page than a page break will be inserted as long as the section fits.
      */
     const short AUTO = 2;
-};
-//=============================================================================
-}; }; }; };
-/*=============================================================================
-=============================================================================*/
-#endif
+}; 
+//============================================================================= 
+}; }; }; }; 
+/*============================================================================= 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/report/XFixedLine.idl b/offapi/com/sun/star/report/XFixedLine.idl
index f1f44f5fcf1a..c7ea3c200aee 100644
--- a/offapi/com/sun/star/report/XFixedLine.idl
+++ b/offapi/com/sun/star/report/XFixedLine.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XFixedLine_idl__
-#define __com_sun_star_report_XFixedLine_idl__
-
-#ifndef __com_sun_star_report_XReportControlModel_idl__
-#include <com/sun/star/report/XReportControlModel.idl>
+#ifndef __com_sun_star_report_XFixedLine_idl__ 
+#define __com_sun_star_report_XFixedLine_idl__ 
+ 
+#ifndef __com_sun_star_report_XReportControlModel_idl__ 
+#include <com/sun/star/report/XReportControlModel.idl> 
 #endif
 #ifndef __com_sun_star_drawing_CircleKind_idl__
 #include <com/sun/star/drawing/CircleKind.idl>
 #endif
-#ifndef __com_sun_star_drawing_LineStyle_idl__
-#include <com/sun/star/drawing/LineStyle.idl>
-#endif
-
+#ifndef __com_sun_star_drawing_LineStyle_idl__ 
+#include <com/sun/star/drawing/LineStyle.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
 
-#ifndef __com_sun_star_drawing_LineDash_idl__
-#include <com/sun/star/drawing/LineDash.idl>
-#endif
-//=============================================================================
-
- module com {  module sun {  module star {  module report {
-
-//=============================================================================
+#ifndef __com_sun_star_drawing_LineDash_idl__ 
+#include <com/sun/star/drawing/LineDash.idl> 
+#endif 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module report {  
+ 
+//============================================================================= 
 interface XFixedLine
-{
+{ 
     interface XReportControlModel;
 
     /** specifies the orientation of the control.
@@ -68,41 +68,41 @@ interface XFixedLine
 
     /** This property contains the type of the line.
      */
-    [attribute,bound] com::sun::star::drawing::LineStyle LineStyle;
-
-    //-------------------------------------------------------------------------
-
+    [attribute,bound] com::sun::star::drawing::LineStyle LineStyle; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This property contains the dash of the line.
      */
-    [attribute,bound] com::sun::star::drawing::LineDash LineDash;
-
-    //-------------------------------------------------------------------------
-
+    [attribute,bound] com::sun::star::drawing::LineDash LineDash; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This property contains the line color.
      */
-    [attribute,bound] com::sun::star::util::Color LineColor;
-
-    //-------------------------------------------------------------------------
-
+    [attribute,bound] com::sun::star::util::Color LineColor; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This property contains the extent of transparency.
      */
-    [attribute,bound] short LineTransparence;
-
-    //-------------------------------------------------------------------------
-
+    [attribute,bound] short LineTransparence; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This property contains the width of the line in 1/100th mm.
      */
-    [attribute,bound] long LineWidth;
-
-    //-------------------------------------------------------------------------
-};
-
+    [attribute,bound] long LineWidth; 
+ 
+    //------------------------------------------------------------------------- 
+}; 
+ 
 service FixedLine : XFixedLine;
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/report/XFixedText.idl b/offapi/com/sun/star/report/XFixedText.idl
index 8c10e1935548..4c971f1e091a 100644
--- a/offapi/com/sun/star/report/XFixedText.idl
+++ b/offapi/com/sun/star/report/XFixedText.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XFixedText_idl__
-#define __com_sun_star_report_XFixedText_idl__
-
-#ifndef __com_sun_star_report_XReportControlModel_idl__
-#include <com/sun/star/report/XReportControlModel.idl>
+#ifndef __com_sun_star_report_XFixedText_idl__ 
+#define __com_sun_star_report_XFixedText_idl__ 
+ 
+#ifndef __com_sun_star_report_XReportControlModel_idl__ 
+#include <com/sun/star/report/XReportControlModel.idl> 
 #endif
-//=============================================================================
-
- module com {  module sun {  module star {  module report {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module report {  
+ 
+//============================================================================= 
 interface XFixedText
-{
+{ 
     interface XReportControlModel;
 
     /** specifies the label of the control.
      */
     [attribute,bound] string Label;
-};
-
+}; 
+ 
 service FixedText : XFixedText;
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/report/XFormatCondition.idl b/offapi/com/sun/star/report/XFormatCondition.idl
index 187c1b524af2..2983577eb90d 100644
--- a/offapi/com/sun/star/report/XFormatCondition.idl
+++ b/offapi/com/sun/star/report/XFormatCondition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XFormatCondition_idl__
-#define __com_sun_star_report_XFormatCondition_idl__
+#ifndef __com_sun_star_report_XFormatCondition_idl__ 
+#define __com_sun_star_report_XFormatCondition_idl__ 
 
-#ifndef __com_sun_star_report_XReportControlFormat_idl__
-#include <com/sun/star/report/XReportControlFormat.idl>
+#ifndef __com_sun_star_report_XReportControlFormat_idl__ 
+#include <com/sun/star/report/XReportControlFormat.idl> 
 #endif
 
-//=============================================================================
- module com {  module sun {  module star {  module report {
-//=============================================================================
+//=============================================================================  
+ module com {  module sun {  module star {  module report {   
+//============================================================================= 
 /** specifies a format condition for a control.
-*/
+*/ 
 interface XFormatCondition
-{
+{ 
     interface XReportControlFormat;
 
     /** gives access to the properties.
     */
-    interface com::sun::star::beans::XPropertySet;
+    interface com::sun::star::beans::XPropertySet; 
 
     /** specifies if the condition is enabled or not.
     */
     [attribute,bound] boolean Enabled;
 
     /** defines the formula of the format condition.
-        If the formula evaluates to <TRUE/> then the format will be applied.
+        If the formula evaluates to <TRUE/> then the format will be applied. 
     */
     [attribute,bound] string Formula;
-};
-
+}; 
+ 
 service FormatCondition : XFormatCondition;
-//=============================================================================
-
-}; }; }; };
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+#endif 
diff --git a/offapi/com/sun/star/report/XFormattedField.idl b/offapi/com/sun/star/report/XFormattedField.idl
index 5de71ec50b64..04984e966be7 100644
--- a/offapi/com/sun/star/report/XFormattedField.idl
+++ b/offapi/com/sun/star/report/XFormattedField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XFormattedField_idl__
-#define __com_sun_star_report_XFormattedField_idl__
-
-#ifndef __com_sun_star_report_XReportControlModel_idl__
-#include <com/sun/star/report/XReportControlModel.idl>
+#ifndef __com_sun_star_report_XFormattedField_idl__ 
+#define __com_sun_star_report_XFormattedField_idl__ 
+ 
+#ifndef __com_sun_star_report_XReportControlModel_idl__ 
+#include <com/sun/star/report/XReportControlModel.idl> 
 #endif
 #ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module report {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module report {  
+ 
+//============================================================================= 
 /** describes a control which can be used for displaying values with a arbitrary formatting.
 
     @see com::sun::star::report::XReportControlModel
     @see com::sun::star::util::XNumberFormatsSupplier
 */
 interface XFormattedField
-{
+{ 
     interface XReportControlModel;
 
     /** specifies the format to be used when formatting the field input
         and output.
-
+        
         <p>This value is meaningful relative to the FormatsSupplier attribute
         only.</p>
      */
@@ -59,14 +59,14 @@ interface XFormattedField
     /** supplies the formats the field should work with.
      */
     [attribute,bound] com::sun::star::util::XNumberFormatsSupplier FormatsSupplier;
-};
-
+}; 
+ 
 service FormattedField : XFormattedField;
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/report/XFunction.idl b/offapi/com/sun/star/report/XFunction.idl
index 7f3ac1a136e3..e1d684be78c9 100644
--- a/offapi/com/sun/star/report/XFunction.idl
+++ b/offapi/com/sun/star/report/XFunction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,22 +33,22 @@
 #ifndef __com_sun_star_beans_Optional_idl__
 #include <com/sun/star/beans/Optional.idl>
 #endif
-#ifndef __com_sun_star_lang_XComponent_idl__
+#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl>
 #endif
-#ifndef __com_sun_star_container_XChild_idl__
-#include <com/sun/star/container/XChild.idl>
-#endif
-//=============================================================================
- module com {  module sun {  module star {  module report {
-//=============================================================================
+#ifndef __com_sun_star_container_XChild_idl__ 
+#include <com/sun/star/container/XChild.idl> 
+#endif 
+//=============================================================================  
+ module com {  module sun {  module star {  module report {   
+//============================================================================= 
 /** specifies a format condition for a control.
-*/
+*/ 
 interface XFunction
-{
+{ 
     /** gives access to the properties.
     */
-    interface com::sun::star::beans::XPropertySet;
+    interface com::sun::star::beans::XPropertySet; 
 
     /** allows life-time control of function instances.
      */
@@ -78,13 +78,13 @@ interface XFunction
     /** defines the formular for the intial value
     */
     [attribute,bound] com::sun::star::beans::Optional<string> InitialFormula;
-};
-
+}; 
+ 
 service Function : XFunction
 {
     create();
 };
-//=============================================================================
-
-}; }; }; };
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+#endif 
diff --git a/offapi/com/sun/star/report/XFunctions.idl b/offapi/com/sun/star/report/XFunctions.idl
index 5a6ab1e8930f..106346b8861d 100644
--- a/offapi/com/sun/star/report/XFunctions.idl
+++ b/offapi/com/sun/star/report/XFunctions.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,21 +27,21 @@
 #ifndef __com_sun_star_report_XFunctions_idl__
 #define __com_sun_star_report_XFunctions_idl__
 
-#ifndef __com_sun_star_container_XChild_idl__
-#include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_container_XContainer_idl__
-#include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
-#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
+#ifndef __com_sun_star_container_XChild_idl__ 
+#include <com/sun/star/container/XChild.idl> 
+#endif 
+#ifndef __com_sun_star_container_XContainer_idl__ 
+#include <com/sun/star/container/XContainer.idl> 
+#endif 
+#ifndef __com_sun_star_container_XIndexContainer_idl__ 
+#include <com/sun/star/container/XIndexContainer.idl> 
+#endif 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
 #endif
 //=============================================================================
 
- module com {  module sun {  module star {  module report {
+ module com {  module sun {  module star {  module report { 
 interface XReportDefinition;
 interface XFunction;
 //=============================================================================
@@ -54,7 +54,7 @@ interface XFunctions
 {
     /** allows to register listeners to be notified of changes in the container.
     */
-    interface com::sun::star::container::XContainer;
+    interface com::sun::star::container::XContainer; 
     /** gives access to the group elements.
         The elements are of type <type>XFunction</type>.
     */
diff --git a/offapi/com/sun/star/report/XFunctionsSupplier.idl b/offapi/com/sun/star/report/XFunctionsSupplier.idl
index d28c13f4dbdb..4620ed751f78 100644
--- a/offapi/com/sun/star/report/XFunctionsSupplier.idl
+++ b/offapi/com/sun/star/report/XFunctionsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,19 +33,19 @@
 #ifndef __com_sun_star_container_XNameContainer_idl__
 #include <com/sun/star/container/XNameContainer.idl>
 #endif
-//=============================================================================
- module com {  module sun {  module star {  module report {
-//=============================================================================
+//=============================================================================  
+ module com {  module sun {  module star {  module report {   
+//============================================================================= 
      interface XFunctions;
 /** specifies the functions supplier which are located in a report defintion or a group.
-*/
+*/ 
 interface XFunctionsSupplier
-{
+{ 
     /** access to the functions
     */
     [attribute,readonly] com::sun::star::report::XFunctions Functions;
-};
-//=============================================================================
-
-}; }; }; };
-#endif
+}; 
+//============================================================================= 
+ 
+}; }; }; };  
+#endif 
diff --git a/offapi/com/sun/star/report/XGroup.idl b/offapi/com/sun/star/report/XGroup.idl
index 469889ff6c7a..66cf7338f0d3 100644
--- a/offapi/com/sun/star/report/XGroup.idl
+++ b/offapi/com/sun/star/report/XGroup.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,9 +24,9 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XGroup_idl__
+#ifndef __com_sun_star_report_XGroup_idl__ 
 #define __com_sun_star_report_XGroup_idl__
-
+ 
 #ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
 #endif
@@ -37,19 +37,19 @@
 #include <com/sun/star/report/XGroups.idl>
 #endif
 #include <com/sun/star/report/XFunctions.idl>
-//=============================================================================
-
- module com {  module sun {  module star {  module report {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module report {  
+ 
+//============================================================================= 
+ 
 /** identifies a <type>XGroup</type>.
     A group is always a child of the groups collection in the report.
     @see XReportDefinition
     @see XGroups
  */
 interface XGroup
-{
+{ 
     /** allows access to the groups collection of the report.
     */
     interface com::sun::star::container::XChild;
@@ -65,7 +65,7 @@ interface XGroup
     /** gives access to functions defined in the group definition.
     */
     interface XFunctionsSupplier;
-
+    
     /** Defines if the group is sorted ascending or descending.
         The default is <TRUE/>.
      */
@@ -87,7 +87,7 @@ interface XGroup
 
     [attribute,readonly] XSection Header
     {
-        get raises (com::sun::star::container::NoSuchElementException);
+        get raises (com::sun::star::container::NoSuchElementException); 
     };
 
     /** returns the group footer.
@@ -97,7 +97,7 @@ interface XGroup
     */
     [attribute,readonly,bound] XSection Footer
     {
-        get raises (com::sun::star::container::NoSuchElementException);
+        get raises (com::sun::star::container::NoSuchElementException); 
     };
 
     /** Specifies how to group data.
@@ -136,14 +136,14 @@ interface XGroup
     /** Specifies that the group header should always be printed on a new page and the reset of the page number to zero.
     */
     [attribute,bound] boolean ResetPageNumber;
-};
-
+}; 
+ 
 service Group : XGroup;
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/report/XGroups.idl b/offapi/com/sun/star/report/XGroups.idl
index ee2324f10855..3e8c8bb79e01 100644
--- a/offapi/com/sun/star/report/XGroups.idl
+++ b/offapi/com/sun/star/report/XGroups.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,21 +27,21 @@
 #ifndef __com_sun_star_report_XGroups_idl__
 #define __com_sun_star_report_XGroups_idl__
 
-#ifndef __com_sun_star_container_XChild_idl__
-#include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_container_XContainer_idl__
-#include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
-#include <com/sun/star/container/XIndexContainer.idl>
-#endif
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
+#ifndef __com_sun_star_container_XChild_idl__ 
+#include <com/sun/star/container/XChild.idl> 
+#endif 
+#ifndef __com_sun_star_container_XContainer_idl__ 
+#include <com/sun/star/container/XContainer.idl> 
+#endif 
+#ifndef __com_sun_star_container_XIndexContainer_idl__ 
+#include <com/sun/star/container/XIndexContainer.idl> 
+#endif 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
 #endif
 //=============================================================================
 
- module com {  module sun {  module star {  module report {
+ module com {  module sun {  module star {  module report { 
 interface XReportDefinition;
 interface XGroup;
 //=============================================================================
@@ -54,7 +54,7 @@ interface XGroups
 {
     /** allows to register listeners to be notified of changes in the container.
     */
-    interface com::sun::star::container::XContainer;
+    interface com::sun::star::container::XContainer; 
     /** gives access to the group elements.
         The elements are of type <type>XGroup</type>.
     */
diff --git a/offapi/com/sun/star/report/XImageControl.idl b/offapi/com/sun/star/report/XImageControl.idl
index 48c18cb0b864..5396525e2b57 100644
--- a/offapi/com/sun/star/report/XImageControl.idl
+++ b/offapi/com/sun/star/report/XImageControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XImageControl_idl__
-#define __com_sun_star_report_XImageControl_idl__
-
-#ifndef __com_sun_star_report_XReportControlModel_idl__
-#include <com/sun/star/report/XReportControlModel.idl>
-#endif
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__
-#include <com/sun/star/form/XImageProducerSupplier.idl>
+#ifndef __com_sun_star_report_XImageControl_idl__ 
+#define __com_sun_star_report_XImageControl_idl__ 
+ 
+#ifndef __com_sun_star_report_XReportControlModel_idl__ 
+#include <com/sun/star/report/XReportControlModel.idl> 
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module report {
-
-//=============================================================================
+#ifndef __com_sun_star_form_XImageProducerSupplier_idl__ 
+#include <com/sun/star/form/XImageProducerSupplier.idl> 
+#endif 
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module report {  
+ 
+//============================================================================= 
 interface XImageControl
-{
+{ 
     interface XReportControlModel;
 
     /** supplies the caller with an <type scope="com::sun::star::awt">XImageProducer</type>.
@@ -56,7 +56,7 @@ interface XImageControl
         Usually, controls acting for an <type>ImageControl</type> model are consumers, and use the
         data stream to display the image</p>
      */
-    interface com::sun::star::form::XImageProducerSupplier;
+    interface com::sun::star::form::XImageProducerSupplier; 
 
     /** specifies an URL to an image to use for the control.
      */
@@ -79,14 +79,14 @@ interface XImageControl
         If the data field contains something different as string then this attribute will be ignored.
     */
     [attribute,bound] boolean PreserveIRI;
-};
-
+}; 
+ 
 service ImageControl : XImageControl;
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/report/XReportComponent.idl b/offapi/com/sun/star/report/XReportComponent.idl
index e3098a2246e8..86d990df8fd0 100644
--- a/offapi/com/sun/star/report/XReportComponent.idl
+++ b/offapi/com/sun/star/report/XReportComponent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XReportComponent_idl__
-#define __com_sun_star_report_XReportComponent_idl__
-
-#ifndef __com_sun_star_container_XChild_idl__
-#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
-#include <com/sun/star/container/XNamed.idl>
+#ifndef __com_sun_star_report_XReportComponent_idl__ 
+#define __com_sun_star_report_XReportComponent_idl__ 
+ 
+#ifndef __com_sun_star_container_XChild_idl__ 
+#include <com/sun/star/container/XChild.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
 #endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-#ifndef __com_sun_star_util_XCloneable_idl__
+ 
+#ifndef __com_sun_star_container_XNamed_idl__ 
+#include <com/sun/star/container/XNamed.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif  
+#ifndef __com_sun_star_util_XCloneable_idl__ 
 #include <com/sun/star/util/XCloneable.idl>
 #endif
-#ifndef __com_sun_star_awt_XControlModel_idl__
-#include <com/sun/star/awt/XControlModel.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
+#ifndef __com_sun_star_awt_XControlModel_idl__ 
+#include <com/sun/star/awt/XControlModel.idl> 
+#endif 
+#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module report {
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module report {  
  interface XSection;
-//=============================================================================
+//============================================================================= 
 /** describes a component which may be part of a report.
-
+    
     @see XReportDefinition
  */
 interface XReportComponent
-{
+{ 
     interface com::sun::star::util::XCloneable;
     /** identifies the component as a candidate for being part of a report.
         <p>This interface also provides the access to the component's parent.</p>
      */
-    interface com::sun::star::container::XChild;
-
+    interface com::sun::star::container::XChild; 
+     
     /** allows life-time control of report components.
      */
-    interface com::sun::star::lang::XComponent;
-
-    interface com::sun::star::drawing::XShape;
+    interface com::sun::star::lang::XComponent; 
 
+    interface com::sun::star::drawing::XShape; 
+          
     /** gives access to the properties.
     */
-    interface com::sun::star::beans::XPropertySet;
+    interface com::sun::star::beans::XPropertySet; 
 
     /** the name of the component.
      */
@@ -88,12 +88,12 @@ interface XReportComponent
 
     /** specifies the height of the control.
      */
-    [attribute,bound] long Height;
-
+    [attribute,bound] long Height; 
+ 
     /** specifies the horizontal position of the control.
      */
     [attribute,bound] long PositionX;
-
+    
     /** specifies the vertical position of the control.
      */
     [attribute,bound] long PositionY;
@@ -145,7 +145,7 @@ interface XReportComponent
     it's data based on the values of the master fields.</p>
     <p>If the report is no sub report (e.g. it's parent is not a report itself), this
     property is not evaluated.</p>
-
+    
     */
     [attribute,bound] sequence<string> MasterFields
     {
@@ -174,7 +174,7 @@ interface XReportComponent
     fields or their aliases of the detail report.</p>
     <p>If the report is no sub report (e.g. it's parent is not a report itself), this
     property is not evaluated.</p>
-    *
+    * 
     */
     [attribute,bound] sequence<string> DetailFields
     {
@@ -188,13 +188,13 @@ interface XReportComponent
         This value is <NULL/> when the control was not inserted in any section.
     */
     [attribute,readonly] com::sun::star::report::XSection Section;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/report/XReportControlFormat.idl b/offapi/com/sun/star/report/XReportControlFormat.idl
index 608b1e7aa5f4..2dbf1e5ba294 100644
--- a/offapi/com/sun/star/report/XReportControlFormat.idl
+++ b/offapi/com/sun/star/report/XReportControlFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XReportControlFormat_idl__
-#define __com_sun_star_report_XReportControlFormat_idl__
+#ifndef __com_sun_star_report_XReportControlFormat_idl__ 
+#define __com_sun_star_report_XReportControlFormat_idl__ 
 
 #include <com/sun/star/awt/FontDescriptor.idl>
 #include <com/sun/star/awt/FontSlant.idl>
 #include <com/sun/star/beans/XPropertySet.idl>
-#include <com/sun/star/lang/IllegalArgumentException.idl>
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
 #include <com/sun/star/lang/Locale.idl>
 #include <com/sun/star/style/ParagraphAdjust.idl>
 #include <com/sun/star/style/VerticalAlignment.idl>
 #include <com/sun/star/util/Color.idl>
-//=============================================================================
-
- module com {  module sun {  module star {  module report {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module report {  
+ 
+//============================================================================= 
 /** specifies a format condition for a control.
-*/
+*/ 
 interface XReportControlFormat
-{
+{ 
     /** specifies the background color (RGB) of the control.
      */
     [attribute,bound] com::sun::star::util::Color ControlBackground
@@ -60,7 +60,7 @@ interface XReportControlFormat
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
 
-    /** specifies the horizontal alignment of the text.
+    /** specifies the horizontal alignment of the text. 
         @see ::com::sun::star::style::ParagraphAdjust
      */
     [attribute,bound] short ParaAdjust
@@ -69,7 +69,7 @@ interface XReportControlFormat
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the font attributes of the text in the control.
      */
@@ -189,7 +189,7 @@ interface XReportControlFormat
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
 
-    /** specifies the percentage of raisement/lowerment of superscript/subscript
+    /** specifies the percentage of raisement/lowerment of superscript/subscript 
         characters.
 
         <p>Negative values denote subscripts and positive values superscripts.</p>
@@ -305,9 +305,9 @@ interface XReportControlFormat
         set raises ( com::sun::star::beans::UnknownPropertyException );
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
-
+ 
     //-------------------------------------------------------------------------
-
+    
     /** specifies the text line color (RGB) of the control.
      */
     [attribute,bound] com::sun::star::util::Color CharUnderlineColor
@@ -355,7 +355,7 @@ interface XReportControlFormat
     };
 
     //-------------------------------------------------------------------------
-    /** determins the type of the strike out of the character.
+    /**	determins the type of the strike out of the character.
         @see com.sun.star.awt.FontStrikeout
     */
     [attribute,bound] short CharStrikeout
@@ -364,7 +364,7 @@ interface XReportControlFormat
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
 
-    /** If this attribute is <TRUE/>, the underline and strike-through
+    /**	If this attribute is <TRUE/>, the underline and strike-through
         properties are not applied to white spaces.
      */
     [attribute,bound] boolean CharWordMode
@@ -388,7 +388,7 @@ interface XReportControlFormat
 
         <p>The value refers to the original width which is denoted by 100,
         and it has to be greater than 0.</p>
-
+        
      */
     [attribute,bound] short CharScaleWidth
     {
@@ -556,7 +556,7 @@ interface XReportControlFormat
         <p>This property may be empty.</p>
      */
     [attribute,bound] string CharFontStyleNameComplex
-
+    
     {
         set raises ( com::sun::star::beans::UnknownPropertyException );
         get raises ( com::sun::star::beans::UnknownPropertyException );
@@ -604,10 +604,10 @@ interface XReportControlFormat
         set raises ( com::sun::star::beans::UnknownPropertyException );
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
-};
-
+}; 
+ 
 service ReportControlFormat : XReportControlFormat;
-//=============================================================================
-
-}; }; }; };
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+#endif 
diff --git a/offapi/com/sun/star/report/XReportControlModel.idl b/offapi/com/sun/star/report/XReportControlModel.idl
index 2c28f5fcc570..2a5322d824cf 100644
--- a/offapi/com/sun/star/report/XReportControlModel.idl
+++ b/offapi/com/sun/star/report/XReportControlModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XReportControlModel_idl__
-#define __com_sun_star_report_XReportControlModel_idl__
-
-#ifndef __com_sun_star_report_XReportComponent_idl__
-#include <com/sun/star/report/XReportComponent.idl>
+#ifndef __com_sun_star_report_XReportControlModel_idl__ 
+#define __com_sun_star_report_XReportControlModel_idl__ 
+ 
+#ifndef __com_sun_star_report_XReportComponent_idl__ 
+#include <com/sun/star/report/XReportComponent.idl> 
 #endif
-#ifndef __com_sun_star_report_XReportControlFormat_idl__
+#ifndef __com_sun_star_report_XReportControlFormat_idl__ 
 #include <com/sun/star/report/XReportControlFormat.idl>
 #endif
-#ifndef __com_sun_star_container_XContainer_idl__
-#include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_container_XIndexContainer_idl__
-#include <com/sun/star/container/XIndexContainer.idl>
+#ifndef __com_sun_star_container_XContainer_idl__ 
+#include <com/sun/star/container/XContainer.idl> 
+#endif 
+#ifndef __com_sun_star_container_XIndexContainer_idl__ 
+#include <com/sun/star/container/XIndexContainer.idl> 
+#endif 
+#ifndef __com_sun_star_report_XFormatCondition_idl__ 
+#include <com/sun/star/report/XFormatCondition.idl> 
 #endif
-#ifndef __com_sun_star_report_XFormatCondition_idl__
-#include <com/sun/star/report/XFormatCondition.idl>
-#endif
-//=============================================================================
-
- module com {  module sun {  module star {  module report {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module report {  
+ 
+//============================================================================= 
 interface XReportControlModel
-{
+{ 
     /** allows the creation of sub reports.
     */
     interface XReportComponent;
@@ -57,19 +57,19 @@ interface XReportControlModel
 
     /** allows to register listeners to be notified of changes in the container.
     */
-    interface com::sun::star::container::XContainer;
+    interface com::sun::star::container::XContainer; 
 
     /** gives access to the <type scope="com::sun::star::report">XFormatCondition</type> elements by index.
     */
-    interface com::sun::star::container::XIndexContainer;
+    interface com::sun::star::container::XIndexContainer; 
 
     /** Creates a format condition.
         @return
                report component
     */
-    XFormatCondition createFormatCondition() raises( com::sun::star::uno::Exception );
-
+    XFormatCondition createFormatCondition() raises( com::sun::star::uno::Exception ); 
 
+    
     /** Specifies which content should be shown.
         The value can be <br/>
         <li>the name of a database column. The format to use is field:[name] </li>
@@ -94,7 +94,7 @@ interface XReportControlModel
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
 
-    /** Describes the print expression of the report control model.
+    /** Describes the print expression of the report control model. 
         If the expression evaluates to true than the report control model will be printed otherwise not.
     */
     [attribute,bound] string ConditionalPrintExpression
@@ -102,14 +102,14 @@ interface XReportControlModel
         set raises ( com::sun::star::beans::UnknownPropertyException );
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
-};
-
+}; 
+ 
 service ReportControlModel : XReportControlModel;
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/report/XReportDefinition.idl b/offapi/com/sun/star/report/XReportDefinition.idl
index 9af58a8d702e..ece2189bd749 100644
--- a/offapi/com/sun/star/report/XReportDefinition.idl
+++ b/offapi/com/sun/star/report/XReportDefinition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XReportDefinition_idl__
-#define __com_sun_star_report_XReportDefinition_idl__
-
-#ifndef __com_sun_star_report_XReportComponent_idl__
-#include <com/sun/star/report/XReportComponent.idl>
+#ifndef __com_sun_star_report_XReportDefinition_idl__ 
+#define __com_sun_star_report_XReportDefinition_idl__ 
+ 
+#ifndef __com_sun_star_report_XReportComponent_idl__ 
+#include <com/sun/star/report/XReportComponent.idl> 
 #endif
-#ifndef __com_sun_star_report_XFunctionsSupplier_idl__
+#ifndef __com_sun_star_report_XFunctionsSupplier_idl__ 
 #include <com/sun/star/report/XFunctionsSupplier.idl>
 #endif
-#ifndef __com_sun_star_view_PaperOrientation_idl__
-#include <com/sun/star/view/PaperOrientation.idl>
-#endif
+#ifndef __com_sun_star_view_PaperOrientation_idl__ 
+#include <com/sun/star/view/PaperOrientation.idl> 
+#endif 
 #ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
 #endif
 #ifndef __com_sun_star_style_GraphicLocation_idl__
 #include <com/sun/star/style/GraphicLocation.idl>
 #endif
-#ifndef __com_sun_star_view_PaperFormat_idl__
-#include <com/sun/star/view/PaperFormat.idl>
-#endif
+#ifndef __com_sun_star_view_PaperFormat_idl__ 
+#include <com/sun/star/view/PaperFormat.idl> 
+#endif 
 #ifndef __com_sun_star_util_XClosable_idl__
 #include <com/sun/star/util/XCloseable.idl>
 #endif
@@ -78,24 +78,24 @@
 #ifndef __com_sun_star_document_XEventBroadcaster_idl__
 #include <com/sun/star/document/XEventBroadcaster.idl>
 #endif
-#ifndef __com_sun_star_lang_DisposedException_idl__
+#ifndef __com_sun_star_lang_DisposedException_idl__ 
 #include <com/sun/star/lang/DisposedException.idl>
 #endif
-#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__
+#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__ 
 #include <com/sun/star/style/XStyleFamiliesSupplier.idl>
 #endif
 
-module com {  module sun {  module star {  module sdbc {
-published interface XConnection;
-};};};};
-//=============================================================================
-
- module com {  module sun {  module star {  module report {
-
+module com {  module sun {  module star {  module sdbc { 
+published interface XConnection; 
+};};};}; 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module report {  
+ 
      interface XSection;
      interface XGroups;
-//=============================================================================
-
+//============================================================================= 
+ 
 /** identifies a <type>XReportComponent</type> as being a (sub-) report.
 
     <p>This interface does not really provide an own functionality, it is only for easier
@@ -108,7 +108,7 @@ published interface XConnection;
     @see XReportComponent
  */
 interface XReportDefinition
-{
+{ 
     /** allows the access to the model embedded in the database storage.
     */
     interface com::sun::star::frame::XModel;
@@ -181,8 +181,8 @@ interface XReportDefinition
         raises( ::com::sun::star::lang::DisposedException,
                 ::com::sun::star::uno::Exception );
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     /** Represents the output format (media (mime) type) of the resulting document when executing this report.
     */
     [attribute,bound] string MimeType
@@ -224,8 +224,8 @@ interface XReportDefinition
     The default value for <member scope="com::sun::star::sdbc">RowSet::EscapeProcessing</member>
     is <TRUE/>. By switching it to <FALSE/>, you can pass backend-specific SQL statements,
     which are not standard SQL, to your database.</p>
-
-
+    
+    
     @see com::sun::star::sdb::CommandType
     */
     [attribute,bound] string Command;
@@ -303,7 +303,7 @@ interface XReportDefinition
 
     /** Represents the groups of the report.
     */
-    [attribute,readonly] com::sun::star::report::XGroups Groups;
+    [attribute,readonly] com::sun::star::report::XGroups Groups; 
 
     /** returns the report header if the <member>ReportHeaderOn</member>is <TRUE/>.
         @throws <type scope="com::sun::star::container">NoSuchElementException</type>
@@ -312,7 +312,7 @@ interface XReportDefinition
     */
     [attribute,readonly] com::sun::star::report::XSection ReportHeader
     {
-        get raises (com::sun::star::container::NoSuchElementException);
+        get raises (com::sun::star::container::NoSuchElementException); 
     };
 
     /** returns the page header if the <member>PageHeaderOn</member>is <TRUE/>.
@@ -322,7 +322,7 @@ interface XReportDefinition
     */
     [attribute,readonly] com::sun::star::report::XSection PageHeader
     {
-        get raises (com::sun::star::container::NoSuchElementException);
+        get raises (com::sun::star::container::NoSuchElementException); 
     };
 
     /** returns the detail section.
@@ -337,7 +337,7 @@ interface XReportDefinition
     */
     [attribute,readonly] com::sun::star::report::XSection PageFooter
     {
-        get raises (com::sun::star::container::NoSuchElementException);
+        get raises (com::sun::star::container::NoSuchElementException); 
     };
 
     /** returns the report footer if the <member>ReportFooterOn</member>is <TRUE/>.
@@ -347,16 +347,16 @@ interface XReportDefinition
     */
     [attribute,readonly] com::sun::star::report::XSection ReportFooter
     {
-        get raises (com::sun::star::container::NoSuchElementException);
+        get raises (com::sun::star::container::NoSuchElementException); 
     };
-};
-
+}; 
+ 
 service ReportDefinition : XReportDefinition;
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/report/XReportEngine.idl b/offapi/com/sun/star/report/XReportEngine.idl
index 7a154483ff20..c8a9aea9741a 100644
--- a/offapi/com/sun/star/report/XReportEngine.idl
+++ b/offapi/com/sun/star/report/XReportEngine.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -66,12 +66,12 @@ module com {  module sun {  module star {  module report {
 /** identifies a <type>XReportEngine</type> which allows the creation of OpenDocument files.
 
     <p>The following events are supported by the report engine.
-        OnPageStarted       Is fired when a new page started.
-        OnReportStarted     Is fired when a new report started.
-        OnGroupStarted      Is fired when a new group started.
-        OnGroupEnded        Is fired when the group ended.
-        OnReportEnded       Is fired when the report ended.
-        OnPageEnded         Is fired when the page ended.
+        OnPageStarted		Is fired when a new page started.
+        OnReportStarted		Is fired when a new report started.
+        OnGroupStarted		Is fired when a new group started.
+        OnGroupEnded		Is fired when the group ended.
+        OnReportEnded		Is fired when the report ended.
+        OnPageEnded			Is fired when the page ended.
 
     @see com.sun.star.document.OfficeDocument
 */
@@ -98,7 +98,7 @@ interface XReportEngine
                 ::com::sun::star::uno::Exception );
 
     /** creates a report document.
-        @param  _frame
+        @param	_frame
             The frame must have a controller set. This controller will be set at the model.
         @throws <type scope="com::sun::star::lang">DisposedException</type>
             If the report engine is already disposed.
diff --git a/offapi/com/sun/star/report/XSection.idl b/offapi/com/sun/star/report/XSection.idl
index 294bd449c6cc..80501b88d74b 100644
--- a/offapi/com/sun/star/report/XSection.idl
+++ b/offapi/com/sun/star/report/XSection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XSection_idl__
-#define __com_sun_star_report_XSection_idl__
-
-#ifndef __com_sun_star_container_XChild_idl__
-#include <com/sun/star/container/XChild.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShapes_idl__
-#include <com/sun/star/drawing/XShapes.idl>
-#endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
-#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-#ifndef __com_sun_star_container_XContainer_idl__
-#include <com/sun/star/container/XContainer.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
-#include <com/sun/star/util/Color.idl>
-#endif
+#ifndef __com_sun_star_report_XSection_idl__ 
+#define __com_sun_star_report_XSection_idl__ 
+ 
+#ifndef __com_sun_star_container_XChild_idl__ 
+#include <com/sun/star/container/XChild.idl> 
+#endif 
+#ifndef __com_sun_star_drawing_XShapes_idl__ 
+#include <com/sun/star/drawing/XShapes.idl> 
+#endif 
+#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
+#include <com/sun/star/container/XEnumerationAccess.idl> 
+#endif 
+#ifndef __com_sun_star_container_XContainer_idl__ 
+#include <com/sun/star/container/XContainer.idl> 
+#endif 
+#ifndef __com_sun_star_util_Color_idl__ 
+#include <com/sun/star/util/Color.idl> 
+#endif 
 #ifndef __com_sun_star_beans_XPropertySet_idl__
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
-#ifndef __com_sun_star_report_XReportDefinition_idl__
+#ifndef __com_sun_star_report_XReportDefinition_idl__ 
 #include <com/sun/star/report/XReportDefinition.idl>
 #endif
-#ifndef __com_sun_star_report_XReportComponent_idl__
+#ifndef __com_sun_star_report_XReportComponent_idl__ 
 #include <com/sun/star/report/XReportComponent.idl>
 #endif
-//=============================================================================
-
- module com {  module sun {  module star {  module report {
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module report {  
  interface XGroup;
-//=============================================================================
-
+//============================================================================= 
+ 
 /** identifies a <type>XSection</type> inside a report.
 
     <p>A section acts like a container of report components. This generic
@@ -67,21 +67,21 @@
     @see XGroup
  */
 interface XSection
-{
+{ 
     /** allows to navigate to group or report definition.
     */
     interface com::sun::star::container::XChild;
     /** allows to register listeners to be notified of changes in the container.
     */
-    interface com::sun::star::container::XContainer;
-
+    interface com::sun::star::container::XContainer; 
+    
     /** gives access to the elements by index.
     */
-    interface com::sun::star::drawing::XShapes;
-
+    interface com::sun::star::drawing::XShapes; 
+    
     /** creates an enumeration of the elements.
     */
-    interface com::sun::star::container::XEnumerationAccess;
+    interface com::sun::star::container::XEnumerationAccess; 
 
     /** provides generic access to the instance properties
     */
@@ -91,8 +91,8 @@ interface XSection
      */
     interface com::sun::star::lang::XComponent;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** Defines if the section should be visible in report.
     */
     [attribute,bound] boolean Visible;
@@ -139,7 +139,7 @@ interface XSection
     };
 
     /** Specifies that the section is printed on one page.
-    <p>Not valid for page header or page footer.</p>
+    <p>Not valid for page header or page footer.</p>  
     */
     [attribute,bound] boolean KeepTogether
     {
@@ -147,8 +147,8 @@ interface XSection
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
 
-    /** Specifies that elements with dynamic state will be expanded vertically when then content of the element is larger than it's container.
-        If this property is disabled the content will be truncated when it's size is larger than the container.
+    /** Specifies that elements with dynamic state will be expanded vertically when then content of the element is larger than it's container. 
+        If this property is disabled the content will be truncated when it's size is larger than the container.  
     */
     [attribute,bound] boolean CanGrow
     {
@@ -158,7 +158,7 @@ interface XSection
 
 /**
   <p>Represents ...</p>
-
+  
  */
     [attribute,bound] boolean CanShrink
     {
@@ -166,7 +166,7 @@ interface XSection
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
 
-    /** Defines that the group header should be repeated on the next page when a group spans more than one page.
+    /** Defines that the group header should be repeated on the next page when a group spans more than one page. 
         It only applies to group headers.
     */
     [attribute,bound] boolean RepeatSection
@@ -182,14 +182,14 @@ interface XSection
     /** Specifies the parent of the section if it is a page header or page footer.
     */
     [attribute,readonly] com::sun::star::report::XReportDefinition ReportDefinition;
-};
+}; 
 
 service Section : XSection;
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/report/XShape.idl b/offapi/com/sun/star/report/XShape.idl
index 50e366fc2a79..ccabe13fa7bf 100644
--- a/offapi/com/sun/star/report/XShape.idl
+++ b/offapi/com/sun/star/report/XShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_report_XShape_idl__
-#define __com_sun_star_report_XShape_idl__
-
-#ifndef __com_sun_star_report_XReportControlModel_idl__
-#include <com/sun/star/report/XReportControlModel.idl>
+#ifndef __com_sun_star_report_XShape_idl__ 
+#define __com_sun_star_report_XShape_idl__ 
+ 
+#ifndef __com_sun_star_report_XReportControlModel_idl__ 
+#include <com/sun/star/report/XReportControlModel.idl> 
 #endif
 #ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
 #endif
-#ifndef __com_sun_star_drawing_XShape_idl__
+#ifndef __com_sun_star_drawing_XShape_idl__ 
 #include <com/sun/star/drawing/XShape.idl>
 #endif
 #ifndef __com_sun_star_drawing_HomogenMatrix3_idl__
 #include <com/sun/star/drawing/HomogenMatrix3.idl>
 #endif
-//=============================================================================
-
- module com {  module sun {  module star {  module report {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module report {  
+ 
+//============================================================================= 
 interface XShape
-{
+{ 
     interface XReportControlModel;
 
     /** is used to query or change the ZOrder of this <type>Shape</type>. */
@@ -73,7 +73,7 @@ interface XShape
 
     /** This property describes the geometry of the CustomShape. The CustomShapeEngine
         that is used should be able to get on with the content of this property.
-
+        
         If the CustomShapeEngine property is "com.sun.star.drawing.EnhancedCustomShapeEngine",
         then this property is containing properties as they are specified in the service
         com.sun.star.drawing.EnhancedCustomShapeGeometry
@@ -83,14 +83,14 @@ interface XShape
     /** determines if the object is opaque or transparent for text.
      */
     [attribute,bound] boolean Opaque;
-};
-
+}; 
+ 
 service Shape : XShape;
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/report/inspection/DataProviderHandler.idl b/offapi/com/sun/star/report/inspection/DataProviderHandler.idl
index a7348b5aca9d..eed4e7e53775 100644
--- a/offapi/com/sun/star/report/inspection/DataProviderHandler.idl
+++ b/offapi/com/sun/star/report/inspection/DataProviderHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl b/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
index 842dd8d3b047..7bf0ac1f7b1e 100644
--- a/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
+++ b/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 #ifndef __com_sun_star_inspection_XObjectInspectorModel_idl__
 #include <com/sun/star/inspection/XObjectInspectorModel.idl>
 #endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 
@@ -82,7 +82,7 @@ service DefaultComponentInspectorModel : com::sun::star::inspection::XObjectInsp
 
         @since OOo 2.2
     */
-    createWithHelpSection(
+    createWithHelpSection( 
         [in] long minHelpTextLines,
         [in] long maxHelpTextLines
     )
diff --git a/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl b/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl
index 132cbab1eccb..ba4d99a75a09 100644
--- a/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl
+++ b/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/report/meta/XFormulaParser.idl b/offapi/com/sun/star/report/meta/XFormulaParser.idl
index 96ae63f4c5e8..ce99316000a6 100644
--- a/offapi/com/sun/star/report/meta/XFormulaParser.idl
+++ b/offapi/com/sun/star/report/meta/XFormulaParser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/report/meta/XFunctionCategory.idl b/offapi/com/sun/star/report/meta/XFunctionCategory.idl
index 9cb669c84573..08875e412344 100644
--- a/offapi/com/sun/star/report/meta/XFunctionCategory.idl
+++ b/offapi/com/sun/star/report/meta/XFunctionCategory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ interface XFunctionDescription;
 
 */
 
-interface XFunctionCategory
+interface XFunctionCategory 
 {
     /** gives access to the properties.
     */
@@ -53,8 +53,8 @@ interface XFunctionCategory
         @see com.ssun.star.container.XIndexAccess
     */
     XFunctionDescription getFunction([in] long position)
-        raises( com::sun::star::lang::IndexOutOfBoundsException,
-                    com::sun::star::lang::WrappedTargetException );
+        raises( com::sun::star::lang::IndexOutOfBoundsException, 
+                    com::sun::star::lang::WrappedTargetException ); 
 
     /** returns the localized category's name.
      */
diff --git a/offapi/com/sun/star/report/meta/XFunctionDescription.idl b/offapi/com/sun/star/report/meta/XFunctionDescription.idl
index 9ed060bcaa85..518caefb5289 100644
--- a/offapi/com/sun/star/report/meta/XFunctionDescription.idl
+++ b/offapi/com/sun/star/report/meta/XFunctionDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ interface XFunctionCategory;
 /** identifies a <type>XFunctionDescription</type> which allows to retrieve the meta data of all supported functions.
 
 */
-interface XFunctionDescription
+interface XFunctionDescription 
 {
     /** gives access to the properties.
     */
diff --git a/offapi/com/sun/star/report/meta/XFunctionManager.idl b/offapi/com/sun/star/report/meta/XFunctionManager.idl
index a862ad07dd59..87ee7a7c5d21 100644
--- a/offapi/com/sun/star/report/meta/XFunctionManager.idl
+++ b/offapi/com/sun/star/report/meta/XFunctionManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
 
 #include <com/sun/star/lang/XComponent.idl>
 #include <com/sun/star/container/XIndexAccess.idl>
-#include <com/sun/star/container/NoSuchElementException.idl>
+#include <com/sun/star/container/NoSuchElementException.idl> 
 #include <com/sun/star/lang/DisposedException.idl>
 #include <com/sun/star/report/meta/XFunctionCategory.idl>
 #include <com/sun/star/report/meta/XFunctionDescription.idl>
@@ -53,14 +53,14 @@ interface XFunctionManager
         @see com.ssun.star.container.XIndexAccess
     */
     XFunctionCategory getCategory([in] long position)
-        raises( com::sun::star::lang::IndexOutOfBoundsException,
-                    com::sun::star::lang::WrappedTargetException );
+        raises( com::sun::star::lang::IndexOutOfBoundsException, 
+                    com::sun::star::lang::WrappedTargetException ); 
 
     /** get the function description by name
         @param  name    the name of the function
     */
     XFunctionDescription getFunctionByName([in] string name)
-        raises( com::sun::star::container::NoSuchElementException);
+        raises( com::sun::star::container::NoSuchElementException); 
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/report/modules.idl b/offapi/com/sun/star/report/modules.idl
index b9c4c7f0c03d..ba77fbbe0d15 100644
--- a/offapi/com/sun/star/report/modules.idl
+++ b/offapi/com/sun/star/report/modules.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/resource/MissingResourceException.idl b/offapi/com/sun/star/resource/MissingResourceException.idl
index 7453f89c8e96..aea68a706228 100644
--- a/offapi/com/sun/star/resource/MissingResourceException.idl
+++ b/offapi/com/sun/star/resource/MissingResourceException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_resource_MissingResourceException_idl__
-#define __com_sun_star_resource_MissingResourceException_idl__
-
-#ifndef __com_sun_star_uno_RuntimeException_idl__
-#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module resource {
-
-//=============================================================================
-
+#ifndef __com_sun_star_resource_MissingResourceException_idl__ 
+#define __com_sun_star_resource_MissingResourceException_idl__ 
+ 
+#ifndef __com_sun_star_uno_RuntimeException_idl__ 
+#include <com/sun/star/uno/RuntimeException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module resource {  
+ 
+//============================================================================= 
+ 
 /** is used to signal that a resource is missing.
 
     @see XResourceBundle
  */
 published exception MissingResourceException: com::sun::star::uno::RuntimeException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/resource/OfficeResourceLoader.idl b/offapi/com/sun/star/resource/OfficeResourceLoader.idl
index 7930a34e5571..307b40d5ef76 100644
--- a/offapi/com/sun/star/resource/OfficeResourceLoader.idl
+++ b/offapi/com/sun/star/resource/OfficeResourceLoader.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_resource_OfficeResourceLoader_idl__
 #define __com_sun_star_resource_OfficeResourceLoader_idl__
 
-#ifndef __com_sun_star_resource_XResourceBundleLoader_idl__
+#ifndef __com_sun_star_resource_XResourceBundleLoader_idl__ 
 #include <com/sun/star/resource/XResourceBundleLoader.idl>
 #endif
 
diff --git a/offapi/com/sun/star/resource/StringResource.idl b/offapi/com/sun/star/resource/StringResource.idl
index 2c53e6a3cdc2..6d49859d2af6 100644
--- a/offapi/com/sun/star/resource/StringResource.idl
+++ b/offapi/com/sun/star/resource/StringResource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,23 +28,23 @@
 #ifndef __com_sun_star_resource_StringResourceManager_idl__
 #define __com_sun_star_resource_StringResourceManager_idl__
 
-#ifndef __com_sun_star_resource_XStringResourcePersistence_idl__
-#include <com/sun/star/resource/XStringResourcePersistence.idl>
+#ifndef __com_sun_star_resource_XStringResourcePersistence_idl__ 
+#include <com/sun/star/resource/XStringResourcePersistence.idl> 
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module resource {
 
-//=============================================================================
+//============================================================================= 
 
 /** specifies a service providing access to a resource string table implementing the
     <type scope="com::sun::star::awt">XDialog</type> interface.
  */
 service StringResource : com::sun::star::resource::XStringResourcePersistence;
 
-//=============================================================================
+//============================================================================= 
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/resource/StringResourceWithLocation.idl b/offapi/com/sun/star/resource/StringResourceWithLocation.idl
index 9115d9e22758..ab1b9bbf3d0f 100644
--- a/offapi/com/sun/star/resource/StringResourceWithLocation.idl
+++ b/offapi/com/sun/star/resource/StringResourceWithLocation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,11 +33,11 @@
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module resource {
 
-//=============================================================================
+//============================================================================= 
 
 /** specifies a service providing access to a resource string table implementing the
     <type scope="com::sun::star::resource">XStringResourceWithLocation</type> interface.
@@ -51,11 +51,11 @@ service StringResourceWithLocation : com::sun::star::resource::XStringResourceWi
             the ReadOnly state allows it - the string table data.
 
         @param ReadOnly
-            Specifies if the resource should be read only,
+            Specifies if the resource should be read only,	
             see <code>XStringResourceManager::isReadOnly</code>
 
         @param locale
-            Specifies if the locale first to be used as current locale. Internally
+            Specifies if the locale first to be used as current locale. Internally 
             the <code>XStringResourceManager::setCurrentLocale</code> method is
             called with FindClosestMatch=true.
             see <code>XStringResourceManager::setCurrentLocale</code>
@@ -64,7 +64,7 @@ service StringResourceWithLocation : com::sun::star::resource::XStringResourceWi
             Base string for the file names used to store the locale data.
             The locale data is stored in Java properties files also following
             the corresponding naming sceme. The files will be named like this:
-            "[BaseName]_[Language]_[Country].properties",
+            "[BaseName]_[Language]_[Country].properties", 
             e.g. "MyBaseName_en_US.properties"
             If an empty string is passed for BaseName, "strings" will be used
             as BaseName.
@@ -83,14 +83,14 @@ service StringResourceWithLocation : com::sun::star::resource::XStringResourceWi
         @throws <type scope="com::sun::star::lang">IllegalArgumentException</type>
             if no string or an empty string is passed as URL
      */
-    create( [in] string URL, [in] boolean ReadOnly,
+    create( [in] string URL, [in] boolean ReadOnly, 
             [in] com::sun::star::lang::Locale locale,
             [in] string BaseName, [in] string Comment,
             [in] com::sun::star::task::XInteractionHandler Handler )
         raises( ::com::sun::star::lang::IllegalArgumentException );
 };
 
-//=============================================================================
+//============================================================================= 
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/resource/StringResourceWithStorage.idl b/offapi/com/sun/star/resource/StringResourceWithStorage.idl
index 0d8c0678a97a..b74c9f0826ba 100644
--- a/offapi/com/sun/star/resource/StringResourceWithStorage.idl
+++ b/offapi/com/sun/star/resource/StringResourceWithStorage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,11 +33,11 @@
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module resource {
 
-//=============================================================================
+//============================================================================= 
 
 /** specifies a service providing access to a resource string table implementing the
     <type scope="com::sun::star::resource">XStringResourceWithStorage</type> interface.
@@ -55,7 +55,7 @@ service StringResourceWithStorage : com::sun::star::resource::XStringResourceWit
             see <code>XStringResourceManager::isReadOnly</code>
 
         @param locale
-            Specifies if the locale first to be used as current locale. Internally
+            Specifies if the locale first to be used as current locale. Internally 
             the <code>XStringResourceManager::setCurrentLocale</code> method is
             called with FindClosestMatch=true.
             see <code>XStringResourceManager::setCurrentLocale</code>
@@ -64,7 +64,7 @@ service StringResourceWithStorage : com::sun::star::resource::XStringResourceWit
             Base string for the file names used to store the locale data.
             The locale data is stored in Java properties files also following
             the corresponding naming sceme. The files will be named like this:
-            "[BaseName]_[Language]_[Country].properties",
+            "[BaseName]_[Language]_[Country].properties", 
             e.g. "MyBaseName_en_US.properties"
             If an empty string is passed for BaseName, "strings" will be used
             as BaseName.
@@ -79,13 +79,13 @@ service StringResourceWithStorage : com::sun::star::resource::XStringResourceWit
         @throws <type scope="com::sun::star::lang">IllegalArgumentException</type>
             if a null interface is passed as Storage
      */
-    create( [in] ::com::sun::star::embed::XStorage Storage,
+    create( [in] ::com::sun::star::embed::XStorage Storage, 
             [in] boolean ReadOnly, [in] com::sun::star::lang::Locale locale,
             [in] string BaseName, [in] string Comment )
         raises( ::com::sun::star::lang::IllegalArgumentException );
 };
 
-//=============================================================================
+//============================================================================= 
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/resource/XLocale.idl b/offapi/com/sun/star/resource/XLocale.idl
index 9ae947b1c474..092e15956c4f 100644
--- a/offapi/com/sun/star/resource/XLocale.idl
+++ b/offapi/com/sun/star/resource/XLocale.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,252 +24,252 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_resource_XLocale_idl__
-#define __com_sun_star_resource_XLocale_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
-#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_resource_MissingResourceException_idl__
-#include <com/sun/star/resource/MissingResourceException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module resource {
-
-//=============================================================================
-
+#ifndef __com_sun_star_resource_XLocale_idl__ 
+#define __com_sun_star_resource_XLocale_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_Locale_idl__ 
+#include <com/sun/star/lang/Locale.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_resource_MissingResourceException_idl__ 
+#include <com/sun/star/resource/MissingResourceException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module resource {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::resource::XLocale
-/** offers some operations on <type scope="com::sun::star::lang">Locale</type>
-    structures.@see         XResourceBundle
+/** offers some operations on <type scope="com::sun::star::lang">Locale</type> 
+    structures.@see         XResourceBundle 
         @see         Locale
  */
 published interface XLocale: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::resource::XLocale::create
     /** creates a locale from language, country, and variant.
-
+        
         <p>NOTE: ISO 639 is not a stable standard; some of the
         language codes it defines (specifically iw, ji, and in) have
         changed.  This constructor accepts both the old codes (iw, ji,
         and in) and the new codes (he, yi, and id), but all other API
-        on XLocale will return only the <b>NEW</b> codes.
+        on XLocale will return only the <b>NEW</b> codes.		
         </p>
         <p>Note: The Java class <code>Locale</code> returns the <strong>old</strong> codes.
-
+        
         </p>
      */
-    com::sun::star::lang::Locale create( [in] string aLanguage,
-             [in] string aCountry,
-             [in] string aVariant );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::lang::Locale create( [in] string aLanguage, 
+             [in] string aCountry, 
+             [in] string aVariant ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::resource::XLocale::getDefault
     /** the common method of getting the current default locale.
-
+        
         <p>It is used for the presentation (for menus, dialogs, etc.).
         It is, generally, set once when your applet or application is
         initialized, then never reset. (If you do reset the default
         locale, you probably want to reload your GUI, so that the
-        change is reflected in your interface.)
+        change is reflected in your interface.)		
         </p>
         <p>More advanced programs allow users to use different locales
         for different fields, for example, in a spreadsheet.
-
+        
         <br>Note that the initial setting will match the host system.</p>
      */
-    com::sun::star::lang::Locale getDefault();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::lang::Locale getDefault(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::resource::XLocale::setDefault
     /** sets the default locale for the whole environment.
-
+        
         <p>It is normally set once at the beginning of an application,
         then never reset. <code>setDefault</code> does not reset the host
         locale.
-
+        
         </p>
      */
-    void setDefault( [in] com::sun::star::lang::Locale newLocale );
-
-    //-------------------------------------------------------------------------
-
+    void setDefault( [in] com::sun::star::lang::Locale newLocale ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::resource::XLocale::getAvailableLocales
-    /** @returns
+    /** @returns 
                     a sequence of all locales which are available in the system.
      */
-    sequence<com::sun::star::lang::Locale> getAvailableLocales();
-
-    //-------------------------------------------------------------------------
-
+    sequence<com::sun::star::lang::Locale> getAvailableLocales(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::resource::XLocale::getISOCountries
-    /** @returns
+    /** @returns 
                     a sequence of all ISO country codes known to the component.
      */
-    sequence<string> getISOCountries();
-
-    //-------------------------------------------------------------------------
-
+    sequence<string> getISOCountries(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::resource::XLocale::getISOLanguages
-    /** @returns
+    /** @returns 
                     a sequence of all ISO language codes known to the component.
      */
-    sequence<string> getISOLanguages();
-
-    //-------------------------------------------------------------------------
-
+    sequence<string> getISOLanguages(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::resource::XLocale::getLanguagesForCountry
-    /** @returns
-                    a sequence for language codes which are valid within the
+    /** @returns 
+                    a sequence for language codes which are valid within the 
                     given country.
      */
-    sequence<string> getLanguagesForCountry( [in] string country );
-
-    //-------------------------------------------------------------------------
-
+    sequence<string> getLanguagesForCountry( [in] string country ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::resource::XLocale::getISO3Language
-    /** @returns
+    /** @returns 
                     the ISO language code for the specified locale.
      */
-    string getISO3Language( [in] com::sun::star::lang::Locale locale )
-            raises( com::sun::star::resource::MissingResourceException );
-
-    //-------------------------------------------------------------------------
-
+    string getISO3Language( [in] com::sun::star::lang::Locale locale ) 
+            raises( com::sun::star::resource::MissingResourceException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::resource::XLocale::getISO3Country
-    /** @returns
+    /** @returns 
                     the ISO country code for the specified locale.
      */
-    string getISO3Country( [in] com::sun::star::lang::Locale locale )
-            raises( com::sun::star::resource::MissingResourceException );
-
-    //-------------------------------------------------------------------------
-
+    string getISO3Country( [in] com::sun::star::lang::Locale locale ) 
+            raises( com::sun::star::resource::MissingResourceException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::resource::XLocale::getDisplayLanguage_Default
-    /** @returns
-                    language code for display of field to user. If the localized
-                    name is not found, returns the ISO code. The desired user language
+    /** @returns 
+                    language code for display of field to user. If the localized  
+                    name is not found, returns the ISO code. The desired user language  
                     is from the default locale.
      */
-    string getDisplayLanguage_Default( [in] com::sun::star::lang::Locale locale );
-
-    //-------------------------------------------------------------------------
-
-
+    string getDisplayLanguage_Default( [in] com::sun::star::lang::Locale locale ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+ 
     // DocMerge from idl: method com::sun::star::resource::XLocale::getDisplayLanguage
-    /** @return
-                    language code for display of field to user. If the localized
-                    name is not found, returns the ISO codes.
-
-                @param inLocale
-                    specifies the desired user language.
-
-                @example
+    /** @return 
+                    language code for display of field to user. If the localized  
+                    name is not found, returns the ISO codes.  
+         
+                @param inLocale 
+                    specifies the desired user language. 
+                     
+                @example 
                     "English (UK)", "Deutch", "Germany"
      */
-    string getDisplayLanguage( [in] com::sun::star::lang::Locale locale,
-             [in] com::sun::star::lang::Locale inLocale );
-
-    //-------------------------------------------------------------------------
-
+    string getDisplayLanguage( [in] com::sun::star::lang::Locale locale, 
+             [in] com::sun::star::lang::Locale inLocale ); 
+ 
+    //------------------------------------------------------------------------- 
+         
     // DocMerge from idl: method com::sun::star::resource::XLocale::getDisplayCountry_Default
-    /** @returns
-                    country code for display of field to user. If the localized
-                    name is not found, returns the ISO code. The desired user country
+    /** @returns 
+                    country code for display of field to user. If the localized  
+                    name is not found, returns the ISO code. The desired user country  
                     is from the default locale.
      */
-    string getDisplayCountry_Default( [in] com::sun::star::lang::Locale locale );
-
-    //-------------------------------------------------------------------------
-
+    string getDisplayCountry_Default( [in] com::sun::star::lang::Locale locale ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::resource::XLocale::getDisplayCountry
-    /** @returns
-                    country code for display of field to user. If the localized
-                    name is not found, returns the ISO codes.
-
-                @param inLocale
+    /** @returns 
+                    country code for display of field to user. If the localized  
+                    name is not found, returns the ISO codes.  
+         
+                @param inLocale 
                     specifies the desired user country.
      */
-    string getDisplayCountry( [in] com::sun::star::lang::Locale locale,
-             [in] com::sun::star::lang::Locale inLocale );
-
-    //-------------------------------------------------------------------------
-
+    string getDisplayCountry( [in] com::sun::star::lang::Locale locale, 
+             [in] com::sun::star::lang::Locale inLocale ); 
+ 
+    //------------------------------------------------------------------------- 
+         
     // DocMerge from idl: method com::sun::star::resource::XLocale::getDisplayVariant_Default
-    /** @returns
-                    variant code for display of field to user. The desired user variant
+    /** @returns 
+                    variant code for display of field to user. The desired user variant  
                     is from the default locale.
      */
-    string getDisplayVariant_Default( [in] com::sun::star::lang::Locale locale );
-
-    //-------------------------------------------------------------------------
-
+    string getDisplayVariant_Default( [in] com::sun::star::lang::Locale locale ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::resource::XLocale::getDisplayVariant
-    /** @returns
-                    variant code for display of field to user. If the localized
-                    name is not found, returns the ISO codes.
-
-                @param inLocale
+    /** @returns 
+                    variant code for display of field to user. If the localized  
+                    name is not found, returns the ISO codes.  
+         
+                @param inLocale 
                     specifies the desired user variant.
      */
-    string getDisplayVariant( [in] com::sun::star::lang::Locale locale,
-             [in] com::sun::star::lang::Locale inLocale );
-
-    //-------------------------------------------------------------------------
-
+    string getDisplayVariant( [in] com::sun::star::lang::Locale locale, 
+             [in] com::sun::star::lang::Locale inLocale ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::resource::XLocale::getDisplayName_Default
-    /** @returns
-                    a string to display the entire locale to user. If the localized
-                    name is not found, uses the ISO codes. The default locale is used
+    /** @returns 
+                    a string to display the entire locale to user. If the localized  
+                    name is not found, uses the ISO codes. The default locale is used  
                     for the presentation language.
      */
-    string getDisplayName_Default( [in] com::sun::star::lang::Locale locale );
-
-    //-------------------------------------------------------------------------
-
+    string getDisplayName_Default( [in] com::sun::star::lang::Locale locale ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::resource::XLocale::getDisplayName
-    /** @returns
-                    a string to display the entire locale to user. If the localized
-                    name is not found, uses the ISO codes.
-
-                @param inLocale
+    /** @returns 
+                    a string to display the entire locale to user. If the localized  
+                    name is not found, uses the ISO codes.  
+         
+                @param inLocale 
                     specifies the desired user locale.
      */
-    string getDisplayName( [in] com::sun::star::lang::Locale locale,
-             [in] com::sun::star::lang::Locale inLocale );
-
-    //-------------------------------------------------------------------------
-
+    string getDisplayName( [in] com::sun::star::lang::Locale locale, 
+             [in] com::sun::star::lang::Locale inLocale ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::resource::XLocale::equals
-    /** @returns
-                <TRUE/> if the <type scope="com::sun::star::lang">Locale</type> <var>l1</var> is equal to the
-                other one.
-
-                <p>A locale is deemed equal to another locale with identical
-                language, country, and variant, and unequal to all other
+    /** @returns  
+                <TRUE/> if the <type scope="com::sun::star::lang">Locale</type> <var>l1</var> is equal to the 
+                other one. 
+                 
+                <p>A locale is deemed equal to another locale with identical 
+                language, country, and variant, and unequal to all other 
                 objects.
      */
-    boolean equals( [in] com::sun::star::lang::Locale l1,
-             [in] com::sun::star::lang::Locale l2 );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    boolean equals( [in] com::sun::star::lang::Locale l1, 
+             [in] com::sun::star::lang::Locale l2 ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/resource/XResourceBundle.idl b/offapi/com/sun/star/resource/XResourceBundle.idl
index 15ff639663c3..45ee942459bd 100644
--- a/offapi/com/sun/star/resource/XResourceBundle.idl
+++ b/offapi/com/sun/star/resource/XResourceBundle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,31 +38,31 @@
 
 //=============================================================================
 
-module com { module sun { module star { module resource {
+module com { module sun { module star { module resource { 
 
 //=============================================================================
 /** Resource bundles contain locale-specific objects.
-
+    
     <p>When your program needs a locale-specific resource, such as
     <code>String</code> for example, your program can load it from the
     resource bundle that is appropriate for the current user's locale. In
     this way, you can write program code that is largely independent of
     the user's locale, which isolates most, if not all, of the
     locale-specific information in resource bundles.
-
+    
     <p>This allows you to write programs that can:
-
+    
     <UL type=SQUARE>
-
+    
     <LI> be easily localized, or translated, into different
     languages.
-
+    
     <LI> handle multiple locales at once.
-
+    
     <LI> be easily modified, later, to support even more locales.
-
+    
     </UL>
-
+    
     <P> One resource bundle is, conceptually, a set of related services
     that supports <code>XResourceBundle</code>. Each related service of
     <code>XResourceBundle</code> has the same base name plus an
@@ -71,10 +71,10 @@ module com { module sun { module star { module resource {
     service you are likely to implement is the default resource bundle,
     which has the same name as its family--<code>MyResources</code>. You
     can also provide as many related locale-specific services as you need.
-
+    
     For example, perhaps you would provide a German one named
     <code>MyResources_de</code>.
-
+    
     <P>
     Each related implementation of <code>XResourceBundle</code> contains
     the same items, but the items have been translated for the locale
@@ -84,29 +84,29 @@ module com { module sun { module star { module resource {
     confirming operations. In <code>MyResources</code> the
     <code>String</code> may contain <code>OK</code> and in
     <code>MyResources_de</code> it may contain <code>Gut</code>.
-
+    
     <P>
     If there are different resources for different countries, you
     can make specializations: for example, <code>MyResources_de_CH</code>
-    is the German language (de) in Switzerland (CH). If you only want to
+    is the German language (de) in Switzerland (CH). If you only want to 
     modify some of the resources in the specialization, you can do so.
-
+    
     <P>
     When your program needs a locale-specific object, it loads
-
+    
     the <code>XResourceBundle</code> implementation using the
     <type>XResourceBundleLoader</type> service:
-
+    
     <listing>
     XResourceBundle myResources = xLoader.getBundle("MyResources", currentLocale);
     </listing>
-
+    
     <p>The first argument specifies the family name of the resource
     bundle that contains the object in question. The second argument
     indicates the desired locale. <code>getBundle</code> uses these two
     arguments to construct the name of the <code>ResourceBundle</code>
     subclass it should load according to the following specifications.
-
+    
     <P>The resource bundle lookup searches for services with various
     suffixes on the basis of (1) the desired locale and (2) the current
     default locale as returned by Locale.getDefault(), and (3) the root
@@ -119,7 +119,7 @@ module com { module sun { module star { module resource {
     <BR> baseclass + "_" + language2 + "_" + country2
     <BR> baseclass + "_" + language2
     <BR> baseclass
-
+    
     <P> For example, if the current default locale is <TT>en_US</TT>, the
     locale that the caller is interested in is <TT>fr_CH</TT>, and the
     resource bundle name is <TT>MyResources</TT>; resource bundle lookup
@@ -129,27 +129,27 @@ module com { module sun { module star { module resource {
     <BR> MyResources_en_US
     <BR> MyResources_en
     <BR> MyResources</TT>
-
+    
     <P> The result of the lookup is a service, but that service may be
     backed by a property file on disk. If a lookup fails,
     <code>getBundle()</code> throws a
     <code>MissingResourceException</code>.
-
+    
     <P> The base service <strong>must</strong> be fully qualified (for
     example, <code>myPackage::MyResources</code>, not just
     <code>MyResources</code>).
-
+    
     <P> Resource bundles contain key/value pairs. The keys uniquely
     identify a locale-specific object in the bundle. Here is an
     example of a <code>XResourceBundle</code> implementation that contains
     two key/value pairs:
-
+    
     <listing>
-    class MyResource extends com.sun.star.resource.XResourceBundle
+    class MyResource extends com.sun.star.resource.XResourceBundle 
     {
         // some queryInterface stuff
         // ...
-        public final Object getDirectElement(String key)
+        public final Object getDirectElement(String key) 
         {
             if (key.equals("okKey")) return "Ok";
             if (key.equals("cancelKey")) return "Cancel";
@@ -157,26 +157,26 @@ module com { module sun { module star { module resource {
         }
     }
     </listing>
-
+    
     <p>Keys are always <code>String</code>s. In this example, the keys
     are <code>OkKey</code> and <code>CancelKey</code>. In the above
     example, the values are also <code>String</code>s--<code>OK</code>
     and <code>Cancel</code>--but they do not have to be. The values can
     be any type of object.
-
+    
     <P> You retrieve an object from resource bundle using the appropriate
     get method. Because <code>OkKey</code> and <code>CancelKey</code>
     are both strings, you use <code>getByName</code> to retrieve them:
-
+    
     <listing>
     button1 = new Button(myResourceBundle.getByName("OkKey").getString());
     button2 = new Button(myResourceBundle.getByName("CancelKey").getString());
     </listing>
-
+    
     <p>The get methods all require the key as an argument and return
     the object if found. If the object is not found, the get methods
     throw a <type scope="com::sun::star::container">NoSuchElementException</type>.
-
+    
     <P> <STRONG>NOTE:</STRONG> You should always supply a base service
     with no suffixes. This will be the class of "last resort" if a
     locale is requested that does not exist. In fact, you must provide
@@ -185,40 +185,40 @@ module com { module sun { module star { module resource {
     <TT>MyResources_fr_BE</TT>, you must provide <I>both</I>
     <TT>MyResources</TT> <I>and</I> <TT>MyResources_fr</TT>, or the
     resource bundle lookup will not work right.
-
+    
     <P>You do not have to restrict yourself to using a single family of
     <code>ResourceBundle</code>s. For example, you could have a set of
     bundles for exception messages, <code>ExceptionResources</code>
     (<code>ExceptionResources_fr</code>, <code>ExceptionResources_de</code>, ...),
     and one for widgets, <code>WidgetResource</code> (<code>WidgetResources_fr</code>,
     <code>WidgetResources_de</code>, ...); breaking up the resources however you like.
-
-    @see        MissingResourceException
+    
+    @see		MissingResourceException
     @see         Locale
     @version     0.1 26 May 1999
     @author      Mark Davis
     @author      Markus Meyer
-    @deprecated draft
+    @deprecated	draft
 */
 published interface XResourceBundle: com::sun::star::container::XNameAccess
 {
     //-------------------------------------------------------------------------
-    /** contains the parent bundle of this bundle.
-
-        <p>The parent bundle is searched by the method
-        <method scope="com::sun::star::container">XNameAccess::getByName</method>
+    /** contains the parent bundle of this bundle.  
+    
+        <p>The parent bundle is searched by the method 
+        <method scope="com::sun::star::container">XNameAccess::getByName</method> 
         when this bundle does not contain a particular resource.
      */
     [attribute] XResourceBundle Parent;
 
     //-------------------------------------------------------------------------
-    /** @returns
-        the locale for this resource bundle.
-
+    /** @returns 
+        the locale for this resource bundle. 
+        
         <p>This function can be used to determine whether the
         resource bundle that is returned really corresponds to the
         requested locale or is a fallback.
-
+        
     */
     com::sun::star::lang::Locale getLocale();
 
@@ -226,8 +226,8 @@ published interface XResourceBundle: com::sun::star::container::XNameAccess
     /** @returns
         an object from a resource bundle or NULL if no resource
         exists.
-
-        <p>It does not look in the parents.
+        
+        <p>It does not look in the parents. 
 
         @param key
             specifies the element.
@@ -238,6 +238,6 @@ published interface XResourceBundle: com::sun::star::container::XNameAccess
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/resource/XResourceBundleLoader.idl b/offapi/com/sun/star/resource/XResourceBundleLoader.idl
index 4440dbfdbdb7..65b335809ff5 100644
--- a/offapi/com/sun/star/resource/XResourceBundleLoader.idl
+++ b/offapi/com/sun/star/resource/XResourceBundleLoader.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,63 +24,63 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_resource_XResourceBundleLoader_idl__
-#define __com_sun_star_resource_XResourceBundleLoader_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_resource_XResourceBundle_idl__
-#include <com/sun/star/resource/XResourceBundle.idl>
-#endif
-
-#ifndef __com_sun_star_resource_MissingResourceException_idl__
-#include <com/sun/star/resource/MissingResourceException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
-#include <com/sun/star/lang/Locale.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module resource {
-
-//=============================================================================
-
+#ifndef __com_sun_star_resource_XResourceBundleLoader_idl__ 
+#define __com_sun_star_resource_XResourceBundleLoader_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_resource_XResourceBundle_idl__ 
+#include <com/sun/star/resource/XResourceBundle.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_resource_MissingResourceException_idl__ 
+#include <com/sun/star/resource/MissingResourceException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_Locale_idl__ 
+#include <com/sun/star/lang/Locale.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module resource {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to load resource bundles.
-
-    <p>The search algorithm is specified in the documentation of
-    <type>XResourceBundle</type>. The implementations must follow
+    
+    <p>The search algorithm is specified in the documentation of 
+    <type>XResourceBundle</type>. The implementations must follow 
     the name scheme, but it is allowed to search in several locations.
-
-    @see MissingResourceException
-    @see XResourceBundle
+    
+    @see MissingResourceException 
+    @see XResourceBundle 
     @see Locale
  */
 published interface XResourceBundleLoader: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** loads the appropriate resource bundle.
      */
-    com::sun::star::resource::XResourceBundle loadBundle_Default( [in] string aBaseName )
-            raises( com::sun::star::resource::MissingResourceException );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::resource::XResourceBundle loadBundle_Default( [in] string aBaseName ) 
+            raises( com::sun::star::resource::MissingResourceException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** loads the appropriate resource bundle subclass.
      */
-    com::sun::star::resource::XResourceBundle loadBundle( [in] string abaseName,
-             [in] com::sun::star::lang::Locale aLocale )
-            raises( com::sun::star::resource::MissingResourceException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::resource::XResourceBundle loadBundle( [in] string abaseName, 
+             [in] com::sun::star::lang::Locale aLocale ) 
+            raises( com::sun::star::resource::MissingResourceException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/resource/XStringResourceManager.idl b/offapi/com/sun/star/resource/XStringResourceManager.idl
index 140c6e832a59..a8a027d825c5 100644
--- a/offapi/com/sun/star/resource/XStringResourceManager.idl
+++ b/offapi/com/sun/star/resource/XStringResourceManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,12 @@
 #ifndef __com_sun_star_resource_XStringResourceManager_idl__
 #define __com_sun_star_resource_XStringResourceManager_idl__
 
-#ifndef __com_sun_star_resource_MissingResourceException_idl__
-#include <com/sun/star/resource/MissingResourceException.idl>
+#ifndef __com_sun_star_resource_MissingResourceException_idl__ 
+#include <com/sun/star/resource/MissingResourceException.idl> 
 #endif
 
-#ifndef __com_sun_star_resource_XStringResourceResolver_idl__
-#include <com/sun/star/resource/XStringResourceResolver.idl>
+#ifndef __com_sun_star_resource_XStringResourceResolver_idl__ 
+#include <com/sun/star/resource/XStringResourceResolver.idl> 
 #endif
 
 #ifndef __com_sun_star_container_ElementExistException_idl__
@@ -54,26 +54,26 @@
 
 //=============================================================================
 
-module com { module sun { module star { module resource {
+module com { module sun { module star { module resource { 
 
 //=============================================================================
-/**
-    Interface to manage a resource string table containing a set of
+/** 
+    Interface to manage a resource string table containing a set of 
     strings for different locales.
 
-    The interface is derived from
+    The interface is derived from 
     <type scope="com::sun::star::resource">XStringResourceResolver</type>
     that allows to access the string table but not to modify it. This
     interface also allows to modify the string table.
-
+    
     It's designed to be used in the context of creating a string table,
     e.g. from a string table editor or from a Dialog Editor designing
     localized dialogs.
-
+    
 */
 interface XStringResourceManager: com::sun::star::resource::XStringResourceResolver
 {
-    /**
+    /** 
         Returns the resource's read only state
 
         @return  <TRUE/> if the resource is read only, otherwise <FALSE/>
@@ -87,16 +87,16 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
             Specifies the current locale to be used.
 
         @param FindClosestMatch
-            <p>If true: If the exact locale that should be set is not available
+            <p>If true: If the exact locale that should be set is not available 
             the method tries to find the closest match. E.g. if en_US is re-
             quired but not available, en would be the next choice. Finally
-            the default locale will be used <TRUE/>.
-
-            <p>If false: If the exact locale that should be set is not available
+            the default locale will be used <TRUE/>. 
+            
+            <p>If false: If the exact locale that should be set is not available 
             a <type scope="com::sun::star::lang">IllegalArgumentException</type>
             is thrown.
-
-            <p>If false: If the exact locale that should be set is not available
+            
+            <p>If false: If the exact locale that should be set is not available 
             a <type scope="com::sun::star::lang">IllegalArgumentException</type>
             is thrown.
     */
@@ -111,8 +111,8 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
     /** Sets the default locale to be used
 
         @param aLocale
-            Specifies the default locale to be used.
-            If this locale is not available a
+            Specifies the default locale to be used. 
+            If this locale is not available a 
             <type scope="com::sun::star::lang">IllegalArgumentException</type>
             is thrown.
 
@@ -153,7 +153,7 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
         associated with it will be overwritten, otherwise a new
         entry will be created.
 
-        It's not recommended to use this method to get the best
+        It's not recommended to use this method to get the best 
         performance as the implementation may be optimized for
         the use of the current locale.
 
@@ -165,7 +165,7 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
 
         @param locale
             The locale the string should be set for.
-            The locale has to match exactly with one of the locales provided by
+            The locale has to match exactly with one of the locales provided by 
             <member>getLocales</member>. A closest match search is not supported.
 
         @throws <type scope="com::sun::star::lang">NoSupportException</type>
@@ -181,7 +181,7 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
 
 
     /**
-        Removes a Resource ID including the corresponding string for
+        Removes a Resource ID including the corresponding string for 
         the current locale.
 
         @param ResourceID
@@ -201,7 +201,7 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
 
 
     /**
-        Removes a Resource ID including the corresponding string for
+        Removes a Resource ID including the corresponding string for 
         s specific locale.
 
         @param ResourceID
@@ -209,7 +209,7 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
 
         @param locale
             The locale the Resource ID should be removed for.
-            The locale has to match exactly with one of the locales provided by
+            The locale has to match exactly with one of the locales provided by 
             <member>getLocales</member>. A closest match search is not supported.
 
         @throws
@@ -226,9 +226,9 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
 
 
     /**
-        Creates a new locale.
-
-        <p>For each existing ResourceID an empty string
+        Creates a new locale. 
+        
+        <p>For each existing ResourceID an empty string 
         will be created. The first locale created will
         automatically be the first default locale.
         Otherwise strings for all already created IDs
@@ -240,7 +240,7 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
 
         @throws
         <type scope="com::sun::star::lang">IllegalArgumentException</type>
-        if the Locale is not valid.
+        if the Locale is not valid.	
 
         @throws
         <type scope="com::sun::star::lang">NoSupportException</type>
@@ -272,10 +272,10 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
     /**
         Provides a numeric id that is unique within all Resource IDs
         used in the string table.
-
+        
         This method takes into account all Resource IDs starting with
-        a decimal number and only evaluates the ID until the first non
-        digit character is reached. This allows to extend unique IDs
+        a decimal number and only evaluates the ID until the first non 
+        digit character is reached. This allows to extend unique IDs 
         with individual identifiers without breaking the mechanism of
         this method.
 
@@ -285,12 +285,12 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
         ID "111.MyId.Something.Else" -> numeric id 111
         ID "No Digits" -> not considered for numeric id
 
-        The id returned will be 0 for an empty string table and it will
-        be reset to 0 if all locales are removed. In all other cases
+        The id returned will be 0 for an empty string table and it will 
+        be reset to 0 if all locales are removed. In all other cases 
         this method returns the maximum numeric id used so far at the
-        beginning of a Resource ID incremented by 1. When calling this
-        method more than once always the same number will be returned
-        until this number is really used at the beginning of a new
+        beginning of a Resource ID incremented by 1. When calling this 
+        method more than once always the same number will be returned 
+        until this number is really used at the beginning of a new 
         Resource ID passed to <member>setString</member> or
         <member>setStringForLocale</member>.
 
@@ -302,7 +302,7 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
         @throws
         <type scope="com::sun::star::lang">NoSupportException</type>
         if the next available id exceeds the range of type long.
-        So it's not recommended to use own Resource IDs starting
+        So it's not recommended to use own Resource IDs starting 
         with a decimal number near to the maximum long value if
         this methods should be used.
     */
@@ -312,6 +312,6 @@ interface XStringResourceManager: com::sun::star::resource::XStringResourceResol
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/resource/XStringResourcePersistence.idl b/offapi/com/sun/star/resource/XStringResourcePersistence.idl
index 880ff903e8b5..b160bb5086c9 100644
--- a/offapi/com/sun/star/resource/XStringResourcePersistence.idl
+++ b/offapi/com/sun/star/resource/XStringResourcePersistence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,8 +27,8 @@
 #ifndef __com_sun_star_resource_XStringResourcePersistence_idl__
 #define __com_sun_star_resource_XStringResourcePersistence_idl__
 
-#ifndef __com_sun_star_resource_XStringResourceManager_idl__
-#include <com/sun/star/resource/XStringResourceManager.idl>
+#ifndef __com_sun_star_resource_XStringResourceManager_idl__ 
+#include <com/sun/star/resource/XStringResourceManager.idl> 
 #endif
 
 #ifndef __com_sun_star_embed_XStorage_idl__
@@ -42,29 +42,29 @@
 
 //=============================================================================
 
-module com { module sun { module star { module resource {
+module com { module sun { module star { module resource { 
 
 //=============================================================================
-/**
+/** 
     Interface derived from XStringResourceManager containing
     basic persistence functionality limited to operations that
     are independend from a associated location or storage.
-
+    
     @see <type>XStringResourceManager</type>.
 */
 interface XStringResourcePersistence: com::sun::star::resource::XStringResourceManager
 {
     /**
-        Stores all string table data respectively all data modified since
-        the last call to <member>store</member> to the location or storage
+        Stores all string table data respectively all data modified since 
+        the last call to <member>store</member> to the location or storage 
         associated with the StringResourceManager. Each locale is stored
         in a single file following the format of Java properties files.
 
-        This interface is supported by the services
+        This interface is supported by the services 
         <type>StringResourceWithLocation</type> and
-        <type>StringResourceWithStorage</type>
-
-        The StringResourceWithLocation is initialised with an URL
+        <type>StringResourceWithStorage</type> 
+        
+        The StringResourceWithLocation is initialised with an URL 
         specifying a location used to load data from and store data to,
         see <type>StringResourceWithLocation</type>.
 
@@ -88,12 +88,12 @@ interface XStringResourcePersistence: com::sun::star::resource::XStringResourceM
         @throws <type scope="com::sun::star::lang">NoSupportException</type>
             if no URL or no valid storage are provided.
     */
-    void store()
+    void store() 
         raises( com::sun::star::lang::NoSupportException,
                 com::sun::star::uno::Exception );
 
 
-     /**
+     /** 
         provides the current modify state of the StringResourceManager instance.
 
         @return
@@ -104,14 +104,14 @@ interface XStringResourcePersistence: com::sun::star::resource::XStringResourceM
     */
     boolean isModified();
 
-
+ 
     /**
         Sets the comment stored first in each locale data file.
 
         This interface method can be used to overwrite the comment used
-        during initialisation of the services
+        during initialisation of the services 
         <type>StringResourceWithLocation</type> or
-        <type>StringResourceWithStorage</type>
+        <type>StringResourceWithStorage</type> 
 
         @param Comment
             Comment stored first in each properties file followed by a line
@@ -128,12 +128,12 @@ interface XStringResourcePersistence: com::sun::star::resource::XStringResourceM
 
         Calling this method does not affect the association with a location
         (in case of a <type>StringResourceWithLocation</type> instance)
-        repectively with a storage (in case of a
+        repectively with a storage (in case of a 
         <type>StringResourceWithStorage</type> instance).
         The modified state isn't affected either.
-
+        
         This method can be used to make a copy of the current string
-        table data to a storage. This method can throw all exceptions
+        table data to a storage. This method can throw all exceptions 
         thrown by the methods of <type scope="com::sun::star::embed">XStorage</type>
 
         @param Storage
@@ -143,7 +143,7 @@ interface XStringResourcePersistence: com::sun::star::resource::XStringResourceM
             Base string for the file names used to store the locale data.
             The locale data is stored in Java properties files also following
             the corresponding naming sceme. The files will be named like this:
-            "[BaseName]_[Language]_[Country].properties",
+            "[BaseName]_[Language]_[Country].properties", 
             e.g. "MyBaseName_en_US.properties"
             If an empty string is passed for BaseName, "strings" will be used
             as BaseName.
@@ -161,15 +161,15 @@ interface XStringResourcePersistence: com::sun::star::resource::XStringResourceM
 
 
     /**
-        Stores all string table data to the location specified by the
-        passed URL string.
+        Stores all string table data to the location specified by the 
+        passed URL string. 
 
         Calling this method does not affect the association with a location
         (in case of a <type>StringResourceWithLocation</type> instance)
-        repectively with a storage (in case of a
+        repectively with a storage (in case of a 
         <type>StringResourceWithStorage</type> instance).
         The modified state isn't affected either.
-
+        
         This method can be used to make a copy of the current string
         table data to a location.
 
@@ -180,7 +180,7 @@ interface XStringResourcePersistence: com::sun::star::resource::XStringResourceM
             Base string for the file names used to store the locale data.
             The locale data is stored in Java properties files also following
             the corresponding naming sceme. The files will be named like this:
-            "[BaseName]_[Language]_[Country].properties",
+            "[BaseName]_[Language]_[Country].properties", 
             e.g. "MyBaseName_en_US.properties"
             If an empty string is passed for BaseName, "strings" will be used
             as BaseName.
@@ -191,8 +191,8 @@ interface XStringResourcePersistence: com::sun::star::resource::XStringResourceM
 
         @param Handler
             a <type scope="com::sun::star::task">XInteractionHandler</type>.
-            It will be passed to ucb handle exceptions. Exceptions not processed
-            by this handler will be passed as com::sun::star::uno::Exception. If
+            It will be passed to ucb handle exceptions. Exceptions not processed 
+            by this handler will be passed as com::sun::star::uno::Exception. If 
             this parameter is null this applies to all exceptions thrown by ucb.
 
         @see com::sun::star::task::InteractionHandler
@@ -220,9 +220,9 @@ interface XStringResourcePersistence: com::sun::star::resource::XStringResourceM
     /**
         Initializes the string resource with binary data. This method
         expects the data format returned by <member>exportBinary</member>.
-
-        All locales and strings previously added to the string resource
-        will be deleted. So after calling this method the string resource
+        
+        All locales and strings previously added to the string resource 
+        will be deleted. So after calling this method the string resource 
         only contains the locales and strings specified in the binary data.
 
         This method is intended to support datatransfer functionality, e.g. provided
@@ -237,11 +237,11 @@ interface XStringResourcePersistence: com::sun::star::resource::XStringResourceM
     */
     void importBinary( [in] sequence<byte> Data )
         raises ( com::sun::star::lang::IllegalArgumentException );
-
+ 
 };
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/resource/XStringResourceResolver.idl b/offapi/com/sun/star/resource/XStringResourceResolver.idl
index f386c73abd08..f3fc6e929785 100644
--- a/offapi/com/sun/star/resource/XStringResourceResolver.idl
+++ b/offapi/com/sun/star/resource/XStringResourceResolver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,8 +27,8 @@
 #ifndef __com_sun_star_resource_XStringResourceResolver_idl__
 #define __com_sun_star_resource_XStringResourceResolver_idl__
 
-#ifndef __com_sun_star_resource_MissingResourceException_idl__
-#include <com/sun/star/resource/MissingResourceException.idl>
+#ifndef __com_sun_star_resource_MissingResourceException_idl__ 
+#include <com/sun/star/resource/MissingResourceException.idl> 
 #endif
 
 #ifndef __com_sun_star_util_XModifyBroadcaster_idl__
@@ -42,13 +42,13 @@
 
 //=============================================================================
 
-module com { module sun { module star { module resource {
+module com { module sun { module star { module resource { 
 
 //=============================================================================
-/**
+/** 
     Interface to access strings in a resource.
 
-    The interface is derived from
+    The interface is derived from 
     <type scope="com::sun::star::util">XModifyBroadcaster</type>
 
     All registered <type scope="com::sun::star::util">XModifyListener</type>
@@ -63,15 +63,15 @@ module com { module sun { module star { module resource {
 interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
 {
     /**
-        Resolves the passed ResoureID for the current locale. This
-        locale is set during initalisation of the object implementing
-        this interface or - in case that also the interface
+        Resolves the passed ResoureID for the current locale. This 
+        locale is set during initalisation of the object implementing 
+        this interface or - in case that also the interface 
         <type scope="com::sun::star::resource">XStringResourceManager</type>
-        is supported - by using the <code>XStringResourceManager::setLocale</code>
+        is supported - by using the <code>XStringResourceManager::setLocale</code> 
         method.
 
         @param ResourceID
-            ID to specify the string inside the resource.
+            ID to specify the string inside the resource. 
             The ID can - but not needs to - be a hierarchical
             name like "foo.nothing.invalid".
 
@@ -86,18 +86,18 @@ interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
 
     /** Resolves the passed ResoureID for a specific locale.
 
-        It's not recommended to use this method to get the best
+        It's not recommended to use this method to get the best 
         performance as the implementation may be optimized for
         the use of the current locale.
 
         @param ResourceID
-            ID to specify the string inside the resource.
+            ID to specify the string inside the resource. 
             The ID can - but not needs to - be a hierarchical
             name like "foo.nothing.invalid".
 
         @param locale
             The locale the string should be resolved for.
-            The locale has to match exactly with one of the locales provided by
+            The locale has to match exactly with one of the locales provided by 
             <member>getLocales</member>. A closest match search is not supported.
 
         @return  the localized string for the specified ID and Locale
@@ -114,7 +114,7 @@ interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
         and current locale.
 
         @param ResourceID
-            ID to specify the string inside the resource.
+            ID to specify the string inside the resource. 
 
         @return  <TRUE/> if an entry exists, otherwise <FALSE/>
 
@@ -125,16 +125,16 @@ interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
     /**
         Checks if the resource contains an entry for the given ResourceID and locale.
 
-        It's not recommended to use this method to get the best
+        It's not recommended to use this method to get the best 
         performance as the implementation may be optimized for
         the use of the current locale.
 
         @param ResourceID
-            ID to specify the string inside the resource.
+            ID to specify the string inside the resource. 
 
         @param locale
             The locale the entry should be checked for.
-            The locale has to match exactly with one of the locales provided by
+            The locale has to match exactly with one of the locales provided by 
             <member>getLocales</member>. A closest match search is not supported.
 
         @return  <TRUE/> if an entry exists, otherwise <FALSE/>
@@ -153,13 +153,13 @@ interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
     /**
         Returns a sequence of all valid Resource IDs for a specific locale
 
-        It's not recommended to use this method to get the best
+        It's not recommended to use this method to get the best 
         performance as the implementation may be optimized for
         the use of the current locale.
 
         @param locale
             The locale the ResourceIDs should be returned for.
-            The locale has to match exactly with one of the locales provided by
+            The locale has to match exactly with one of the locales provided by 
             <member>getLocales</member>. A closest match search is not supported.
 
         @return  a sequence of all valid Resource IDs
@@ -168,7 +168,7 @@ interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
 
 
     /** Returns the current locale specified in the accessed resource.
-
+        
         If no locale is available, the returned Locale structure
         only contains empty strings.
 
@@ -178,7 +178,7 @@ interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
 
 
     /** Returns the default locale of the accessed resource. In many
-        cases this will be the locale of the Office initially used
+        cases this will be the locale of the Office initially used 
         to create the resource.
 
         @return  the used locale
@@ -196,6 +196,6 @@ interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/resource/XStringResourceSupplier.idl b/offapi/com/sun/star/resource/XStringResourceSupplier.idl
index 1c56010b8ca2..6fff924cc1b2 100644
--- a/offapi/com/sun/star/resource/XStringResourceSupplier.idl
+++ b/offapi/com/sun/star/resource/XStringResourceSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef __com_sun_star_resource_XStringResourceSupplier_idl__
 #define __com_sun_star_resource_XStringResourceSupplier_idl__
 
-#ifndef __com_sun_star_resource_XStringResourceResolver_idl__
-#include <com/sun/star/resource/XStringResourceResolver.idl>
+#ifndef __com_sun_star_resource_XStringResourceResolver_idl__ 
+#include <com/sun/star/resource/XStringResourceResolver.idl> 
 #endif
 
 
-//=============================================================================
-
-module com {  module sun {  module star {  module resource {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module resource {  
+ 
+//============================================================================= 
+ 
 /**
     Provides access to a string resource represented by a
     <type scope="com::sun::star::resource">XStringResourceResolver</type>.
  */
 interface XStringResourceSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /**
         Provides access to a string resource.
         Depending on the context the returned object may also support
@@ -57,14 +57,14 @@ interface XStringResourceSupplier: com::sun::star::uno::XInterface
         @returns an interface
         <type scope="com::sun::star::resource">XStringResourceResolver</type>
      */
-    com::sun::star::resource::XStringResourceResolver getStringResource();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::resource::XStringResourceResolver getStringResource(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/resource/XStringResourceWithLocation.idl b/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
index 642187897ed3..bd320abd5617 100644
--- a/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
+++ b/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,17 +27,17 @@
 #ifndef __com_sun_star_resource_XStringResourceWithLocation_idl__
 #define __com_sun_star_resource_XStringResourceWithLocation_idl__
 
-#ifndef __com_sun_star_resource_XStringResourcePersistence_idl__
-#include <com/sun/star/resource/XStringResourcePersistence.idl>
+#ifndef __com_sun_star_resource_XStringResourcePersistence_idl__ 
+#include <com/sun/star/resource/XStringResourcePersistence.idl> 
 #endif
 
 
 //=============================================================================
 
-module com { module sun { module star { module resource {
+module com { module sun { module star { module resource { 
 
 //=============================================================================
-/**
+/** 
     Extends <type>XStringResourcePersistence</type> by methods to handle an
     associated location.
 
@@ -47,7 +47,7 @@ interface XStringResourceWithLocation: com::sun::star::resource::XStringResource
 {
     /**
         Stores all string table data to a location and associates this location
-        to this instance as if <member>setLocation</member> was called with this
+        to this instance as if <member>setLocation</member> was called with this 
         location. The modified state will be unmodified after the call.
 
         @param URL
@@ -58,20 +58,20 @@ interface XStringResourceWithLocation: com::sun::star::resource::XStringResource
 
 
     /**
-        Associates a location to the StringResourceWithStorage instance
+        Associates a location to the StringResourceWithStorage instance 
         which is used on subsequent calls of <member>store</member>.
-
+        
         @param URL
             the location to be associated to the StringResourceManager
 
         <p>
         This call has to be used carefully as it removes the location
-        previously connected to the StringResourceWithStorage. It may
-        force the implementation to reload data from the previous
-        location before releasing it. The StringResourceManager will
-        be modified after calling this method as the data isn't stored
-        to the new location yet. <member>storeAsURL</member> should
-        be prefered as it directly stores the data to the new location
+        previously connected to the StringResourceWithStorage. It may 
+        force the implementation to reload data from the previous 
+        location before releasing it. The StringResourceManager will 
+        be modified after calling this method as the data isn't stored 
+        to the new location yet. <member>storeAsURL</member> should 
+        be prefered as it directly stores the data to the new location 
         and afterwards this location is in sync with the resource data.
         </p>
 
@@ -84,6 +84,6 @@ interface XStringResourceWithLocation: com::sun::star::resource::XStringResource
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/resource/XStringResourceWithStorage.idl b/offapi/com/sun/star/resource/XStringResourceWithStorage.idl
index b4e5dd803efa..9055f16600a4 100644
--- a/offapi/com/sun/star/resource/XStringResourceWithStorage.idl
+++ b/offapi/com/sun/star/resource/XStringResourceWithStorage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,18 +27,18 @@
 #ifndef __com_sun_star_resource_XStringResourceWithStorage_idl__
 #define __com_sun_star_resource_XStringResourceWithStorage_idl__
 
-#ifndef __com_sun_star_resource_XStringResourcePersistence_idl__
-#include <com/sun/star/resource/XStringResourcePersistence.idl>
+#ifndef __com_sun_star_resource_XStringResourcePersistence_idl__ 
+#include <com/sun/star/resource/XStringResourcePersistence.idl> 
 #endif
 
 
 //=============================================================================
 
-module com { module sun { module star { module resource {
+module com { module sun { module star { module resource { 
 
 //=============================================================================
-/**
-    Extends <type>XStringResourcePersistence</type> by methods to handle an
+/** 
+    Extends <type>XStringResourcePersistence</type> by methods to handle an 
     associated <type scope="com::sun::star::embed">XStorage</type> instance.
 
     @see <type>XStringResourcePersistence</type>.
@@ -46,8 +46,8 @@ module com { module sun { module star { module resource {
 interface XStringResourceWithStorage: com::sun::star::resource::XStringResourcePersistence
 {
     /**
-        Stores all string table data to a storage and associates this storage
-        to this instance as if <member>setStorage</member> was called with
+        Stores all string table data to a storage and associates this storage 
+        to this instance as if <member>setStorage</member> was called with 
         this storage. The modified state will be unmodified after the call.
 
         This method can throw all exceptions thrown by the methods of
@@ -56,20 +56,20 @@ interface XStringResourceWithStorage: com::sun::star::resource::XStringResourceP
     void storeAsStorage( [in] ::com::sun::star::embed::XStorage Storage )
         raises( com::sun::star::uno::Exception );
 
-
+    
     /**
-        Associates a storage to the StringResourceWithStorage instance
+        Associates a storage to the StringResourceWithStorage instance 
         which is used on subsequent calls of <member>store</member>.
-
+        
         @param Storage
             the storage to be associated to the StringResourceManager
 
         <p>
         This call has to be used carefully as it removes the storage
-        previously connected to the StringResourceWithStorage. It may
+        previously connected to the StringResourceWithStorage. It may 
         force the implementation to reload data from the previous storage
         before releasing it. The StringResourceManager will be modified
-        after calling this method as the data isn't stored to the new
+        after calling this method as the data isn't stored to the new 
         storage yet. <member>storeAsStorage</member> should be prefered
         as it directly stores the data to the new storage and afterwards
         this storage is in sync with the resource data.
@@ -84,6 +84,6 @@ interface XStringResourceWithStorage: com::sun::star::resource::XStringResourceP
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/scanner/ScanError.idl b/offapi/com/sun/star/scanner/ScanError.idl
index ecb9544df3a4..cf40ccdc11e5 100644
--- a/offapi/com/sun/star/scanner/ScanError.idl
+++ b/offapi/com/sun/star/scanner/ScanError.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module scanner {
+module com { module sun { module star { module scanner { 
 
 //=============================================================================
 /** enum ScanError describes error codes of scanner component
@@ -38,38 +38,38 @@ module com { module sun { module star { module scanner {
 published enum ScanError
 {
     //-------------------------------------------------------------------------
-    // DOCUMENTATION CHANGED FOR ScanError::    ScanErrorNone,
+    // DOCUMENTATION CHANGED FOR ScanError::	ScanErrorNone,
     /** ScanErrorNone: no error occured
      */
     ScanErrorNone,
 
     //-------------------------------------------------------------------------
-    // DOCUMENTATION CHANGED FOR ScanError::    ScannerNotAvailable,
+    // DOCUMENTATION CHANGED FOR ScanError::	ScannerNotAvailable,
     /** ScannerNotAvailable: the requested device could not be opened
      */
     ScannerNotAvailable,
 
     //-------------------------------------------------------------------------
-    // DOCUMENTATION CHANGED FOR ScanError::    ScanFailed,
+    // DOCUMENTATION CHANGED FOR ScanError::	ScanFailed,
     /** ScanFailed: an error occured during scanning
      */
     ScanFailed,
 
     //-------------------------------------------------------------------------
-    // DOCUMENTATION CHANGED FOR ScanError::    ScanInProgress,
+    // DOCUMENTATION CHANGED FOR ScanError::	ScanInProgress,
     /** ScanInProgress: a scan is already in progress on this device that has
         to end before a new one can be started
     */
     ScanInProgress,
 
     //-------------------------------------------------------------------------
-    // DOCUMENTATION CHANGED FOR ScanError::    ScanCanceled,
+    // DOCUMENTATION CHANGED FOR ScanError::	ScanCanceled,
     /** ScanCanceled: the scan was canceled by the user
      */
     ScanCanceled,
 
     //-------------------------------------------------------------------------
-    // DOCUMENTATION CHANGED FOR ScanError::    InvalidContext
+    // DOCUMENTATION CHANGED FOR ScanError::	InvalidContext
     /** InvalidContext: a device was requested that does not exist
      */
     InvalidContext
@@ -78,6 +78,6 @@ published enum ScanError
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/scanner/ScannerContext.idl b/offapi/com/sun/star/scanner/ScannerContext.idl
index 41f1c8e1aacb..fa9267c36c11 100644
--- a/offapi/com/sun/star/scanner/ScannerContext.idl
+++ b/offapi/com/sun/star/scanner/ScannerContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module scanner {
+module com { module sun { module star { module scanner { 
 
 //=============================================================================
 /** a scanner context is an identifier for a specific scanner device
@@ -53,6 +53,6 @@ published struct ScannerContext
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/scanner/ScannerException.idl b/offapi/com/sun/star/scanner/ScannerException.idl
index a3b78111ca8d..02cd8929f053 100644
--- a/offapi/com/sun/star/scanner/ScannerException.idl
+++ b/offapi/com/sun/star/scanner/ScannerException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module scanner {
+module com { module sun { module star { module scanner { 
 
 //=============================================================================
 /** A ScannerException gets thrown if an object of type XScannerManager
@@ -56,6 +56,6 @@ published exception ScannerException: com::sun::star::uno::Exception
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/scanner/ScannerManager.idl b/offapi/com/sun/star/scanner/ScannerManager.idl
index 950b0c8dcb0d..38c917deba38 100644
--- a/offapi/com/sun/star/scanner/ScannerManager.idl
+++ b/offapi/com/sun/star/scanner/ScannerManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module scanner {
+module com { module sun { module star { module scanner { 
 
 //=============================================================================
 // DOCUMENTATION CHANGED FOR ScannerManager
@@ -51,6 +51,6 @@ published service ScannerManager
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/scanner/XScannerManager.idl b/offapi/com/sun/star/scanner/XScannerManager.idl
index ac933dd3cbb5..d76f1b33c02b 100644
--- a/offapi/com/sun/star/scanner/XScannerManager.idl
+++ b/offapi/com/sun/star/scanner/XScannerManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module scanner {
+module com { module sun { module star { module scanner { 
 
 //=============================================================================
 /**
@@ -102,6 +102,6 @@ published interface XScannerManager: com::sun::star::uno::XInterface
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/script/DocumentDialogLibraryContainer.idl b/offapi/com/sun/star/script/DocumentDialogLibraryContainer.idl
index 7dcb64bbdc0c..bcdc39bc803a 100644
--- a/offapi/com/sun/star/script/DocumentDialogLibraryContainer.idl
+++ b/offapi/com/sun/star/script/DocumentDialogLibraryContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,14 +34,14 @@
 #ifndef __com_sun_star_embed_XStorageBasedDocument_idl__
 #include <com/sun/star/document/XStorageBasedDocument.idl>
 #endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 
 
 //=============================================================================
 
-module com { module sun { module star { module script {
+module com { module sun { module star { module script { 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/script/DocumentScriptLibraryContainer.idl b/offapi/com/sun/star/script/DocumentScriptLibraryContainer.idl
index 4bb6838af681..c1d7dfe15ded 100644
--- a/offapi/com/sun/star/script/DocumentScriptLibraryContainer.idl
+++ b/offapi/com/sun/star/script/DocumentScriptLibraryContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,14 +34,14 @@
 #ifndef __com_sun_star_embed_XStorageBasedDocument_idl__
 #include <com/sun/star/document/XStorageBasedDocument.idl>
 #endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 
 
 //=============================================================================
 
-module com { module sun { module star { module script {
+module com { module sun { module star { module script { 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/script/LibraryNotLoadedException.idl b/offapi/com/sun/star/script/LibraryNotLoadedException.idl
index 8a825fe7ce09..da5ca71bef70 100644
--- a/offapi/com/sun/star/script/LibraryNotLoadedException.idl
+++ b/offapi/com/sun/star/script/LibraryNotLoadedException.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module script {
+module com { module sun { module star { module script { 
 
 //=============================================================================
 
@@ -48,7 +48,7 @@ exception LibraryNotLoadedException : com::sun::star::uno::Exception
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/script/ModuleInfo.idl b/offapi/com/sun/star/script/ModuleInfo.idl
index 158ba387be6b..0a35328bac0b 100644
--- a/offapi/com/sun/star/script/ModuleInfo.idl
+++ b/offapi/com/sun/star/script/ModuleInfo.idl
@@ -44,7 +44,7 @@
 module com {  module sun {  module star { module script {
 struct ModuleInfo
 {
-    com::sun::star::uno::XInterface ModuleObject;
+    com::sun::star::uno::XInterface ModuleObject; 
     long ModuleType;
 };
 
diff --git a/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl b/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl
index 44c0702b74d5..23ec8213d1ea 100644
--- a/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl
+++ b/offapi/com/sun/star/script/ModuleSizeExceededRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/script/ModuleType.idl b/offapi/com/sun/star/script/ModuleType.idl
index a9bde042fa5a..32c90d9d8d3c 100644
--- a/offapi/com/sun/star/script/ModuleType.idl
+++ b/offapi/com/sun/star/script/ModuleType.idl
@@ -43,7 +43,7 @@ module com {  module sun {  module star { module script {
 published constants ModuleType
 {
     // ------------------------------------------------------------------------
-
+    
     const long UNKNOWN = 0;
 
     // ------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/script/XLibraryContainer.idl b/offapi/com/sun/star/script/XLibraryContainer.idl
index 3974aaa436da..43cf7cfaf5b3 100644
--- a/offapi/com/sun/star/script/XLibraryContainer.idl
+++ b/offapi/com/sun/star/script/XLibraryContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,61 +24,61 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XLibraryContainer_idl__
-#define __com_sun_star_script_XLibraryContainer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
-#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
-#include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
-/**
-    Provides access to a library system.
+#ifndef __com_sun_star_script_XLibraryContainer_idl__ 
+#define __com_sun_star_script_XLibraryContainer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#include <com/sun/star/container/XNameContainer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_ElementExistException_idl__ 
+#include <com/sun/star/container/ElementExistException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_ElementExistException_idl__ 
+#include <com/sun/star/container/ElementExistException.idl> 
+#endif 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
+/** 
+    Provides access to a library system. 
  */
 published interface XLibraryContainer: com::sun::star::container::XNameAccess
-{
-    /**
+{ 
+    /** 
         Creates a new library
      */
-    com::sun::star::container::XNameContainer createLibrary( [in] string Name )
-        raises( com::sun::star::lang::IllegalArgumentException,
-                com::sun::star::container::ElementExistException );
+    com::sun::star::container::XNameContainer createLibrary( [in] string Name ) 
+        raises( com::sun::star::lang::IllegalArgumentException, 
+                com::sun::star::container::ElementExistException ); 
 
-    /**
-        Creates a link to an "external" library that then can be
+    /** 
+        Creates a link to an "external" library that then can be 
         accessed using this library manager. The format of the
         StorageURL is a matter of the implementation. If the read
         only flag is set, the linked library cannot be modified.
@@ -87,37 +87,37 @@ published interface XLibraryContainer: com::sun::star::container::XNameAccess
         storage allows write access) the returned interface also
         can be a <type scope="com::sun::star::container">XNameContainer</type>.
      */
-    com::sun::star::container::XNameAccess createLibraryLink( [in] string Name, [in] string StorageURL, [in] boolean ReadOnly )
-        raises( com::sun::star::lang::IllegalArgumentException,
-                com::sun::star::container::ElementExistException );
+    com::sun::star::container::XNameAccess createLibraryLink( [in] string Name, [in] string StorageURL, [in] boolean ReadOnly ) 
+        raises( com::sun::star::lang::IllegalArgumentException, 
+                com::sun::star::container::ElementExistException ); 
 
-    /** removes the library item with the specified name. If the accessed
+    /** removes the library item with the specified name. If the accessed 
         library item is a link only the link is removed, not the target library.
      */
-    void removeLibrary( [in] string Name )
-            raises( com::sun::star::container::NoSuchElementException,
-                    com::sun::star::lang::WrappedTargetException );
+    void removeLibrary( [in] string Name ) 
+            raises( com::sun::star::container::NoSuchElementException, 
+                    com::sun::star::lang::WrappedTargetException ); 
 
-    /**
+    /** 
         returns true if the accessed library is already loaded from
         the storage, otherwise false.
      */
     boolean isLibraryLoaded( [in] string Name )
-            raises( com::sun::star::container::NoSuchElementException );
+            raises( com::sun::star::container::NoSuchElementException ); 
 
-    /**
+    /** 
         Causes the accessed library to be loaded from its storage
         if it hasn't already been loaded.
      */
     void loadLibrary( [in] string Name )
-            raises( com::sun::star::container::NoSuchElementException,
-                    com::sun::star::lang::WrappedTargetException );
+            raises( com::sun::star::container::NoSuchElementException, 
+                    com::sun::star::lang::WrappedTargetException ); 
 
 };
 
-//=============================================================================
-
-
-}; }; }; };
-
-#endif
+//============================================================================= 
+ 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/script/XLibraryContainer2.idl b/offapi/com/sun/star/script/XLibraryContainer2.idl
index 2d315ca3a88f..a522ba11b1f4 100644
--- a/offapi/com/sun/star/script/XLibraryContainer2.idl
+++ b/offapi/com/sun/star/script/XLibraryContainer2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,76 +24,76 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XLibraryContainer2_idl__
-#define __com_sun_star_script_XLibraryContainer2_idl__
-
-#ifndef __com_sun_star_script_XLibraryContainer_idl__
-#include <com/sun/star/script/XLibraryContainer.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
-/**
+#ifndef __com_sun_star_script_XLibraryContainer2_idl__ 
+#define __com_sun_star_script_XLibraryContainer2_idl__ 
+ 
+#ifndef __com_sun_star_script_XLibraryContainer_idl__ 
+#include <com/sun/star/script/XLibraryContainer.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
+/** 
     Extension of <type>XLibraryContainer</type> to provide additional information
     about the libraries contained in a library container
  */
 published interface XLibraryContainer2: com::sun::star::script::XLibraryContainer
-{
-    /**
+{ 
+    /** 
         returns true if the accessed library item is a link,
         e.g., created by createLibraryLink, otherwise false.
      */
     boolean isLibraryLink( [in] string Name )
-            raises( com::sun::star::container::NoSuchElementException );
+            raises( com::sun::star::container::NoSuchElementException ); 
 
-    /**
+    /** 
         returns the location of the library link target.
-        Should return the same URL that was passed to
+        Should return the same URL that was passed to 
         createLibraryLink in the StorageURL parameter.
 
-        If the accessed library item exists but isn't a
+        If the accessed library item exists but isn't a 
         link, a IllegalArgumentException is thrown
      */
     string getLibraryLinkURL( [in] string Name )
-            raises( com::sun::star::lang::IllegalArgumentException,
+            raises( com::sun::star::lang::IllegalArgumentException, 
                     com::sun::star::container::NoSuchElementException );
 
-    /**
-        returns true if the accessed library item (library or library
-        link) is read only. A library can be read only because it was
-        set to read only using the methods provided by this interface
-        or because of other reasons depending on the implementation
+    /** 
+        returns true if the accessed library item (library or library 
+        link) is read only. A library can be read only because it was 
+        set to read only using the methods provided by this interface 
+        or because of other reasons depending on the implementation 
         (e.g., file system write protection)
      */
     boolean isLibraryReadOnly( [in] string Name )
-            raises( com::sun::star::container::NoSuchElementException );
+            raises( com::sun::star::container::NoSuchElementException ); 
 
-    /**
+    /** 
         Sets the accessed library item (library or library link) to
         read only according to the flag bReadOnly (true means read only)
      */
     void setLibraryReadOnly( [in] string Name, [in] boolean bReadOnly )
-            raises( com::sun::star::container::NoSuchElementException );
+            raises( com::sun::star::container::NoSuchElementException ); 
 
-    /** renames the library item with the specified name. If the accessed
+    /** renames the library item with the specified name. If the accessed 
         library item is a link only the link is renamed, not the target library.
-        If a library with the new name exists already a
+        If a library with the new name exists already a 
         com::sun::star::container::ElementExistException is thrown.
      */
-    void renameLibrary( [in] string Name, [in] string NewName )
+    void renameLibrary( [in] string Name, [in] string NewName ) 
             raises( com::sun::star::container::NoSuchElementException,
                     com::sun::star::container::ElementExistException );
 
 };
 
-//=============================================================================
-
-
-}; }; }; };
-
-#endif
+//============================================================================= 
+ 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/script/XLibraryContainer3.idl b/offapi/com/sun/star/script/XLibraryContainer3.idl
index 1045fc7a295c..167e57843d94 100644
--- a/offapi/com/sun/star/script/XLibraryContainer3.idl
+++ b/offapi/com/sun/star/script/XLibraryContainer3.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XLibraryContainer3_idl__
-#define __com_sun_star_script_XLibraryContainer3_idl__
-
-#ifndef __com_sun_star_script_XLibraryContainer2_idl__
-#include <com/sun/star/script/XLibraryContainer2.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
-/**
-    Extension of <type>XLibraryContainer2</type>.
+#ifndef __com_sun_star_script_XLibraryContainer3_idl__ 
+#define __com_sun_star_script_XLibraryContainer3_idl__ 
+ 
+#ifndef __com_sun_star_script_XLibraryContainer2_idl__ 
+#include <com/sun/star/script/XLibraryContainer2.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
+/** 
+    Extension of <type>XLibraryContainer2</type>. 
  */
 published interface XLibraryContainer3: com::sun::star::script::XLibraryContainer2
-{
+{ 
 
-    /**
+    /** 
         returns the location of the library link target.
 
         The returned URL is literally the same as the one provided in
@@ -52,15 +52,15 @@ published interface XLibraryContainer3: com::sun::star::script::XLibraryContaine
         is the same as <member>XLibraryContainer2::getLibraryLinkURL</member>
      */
     string getOriginalLibraryLinkURL( [in] string Name )
-            raises( com::sun::star::lang::IllegalArgumentException,
+            raises( com::sun::star::lang::IllegalArgumentException, 
                     com::sun::star::container::NoSuchElementException );
 
 
 };
 
-//=============================================================================
-
-
-}; }; }; };
-
-#endif
+//============================================================================= 
+ 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/script/XLibraryContainerExport.idl b/offapi/com/sun/star/script/XLibraryContainerExport.idl
index cdaa975f8d5e..3d51efa0318d 100644
--- a/offapi/com/sun/star/script/XLibraryContainerExport.idl
+++ b/offapi/com/sun/star/script/XLibraryContainerExport.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,57 +24,57 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XLibraryContainerExport_idl__
-#define __com_sun_star_script_XLibraryContainerExport_idl__
-
+#ifndef __com_sun_star_script_XLibraryContainerExport_idl__ 
+#define __com_sun_star_script_XLibraryContainerExport_idl__ 
+ 
 #ifndef __com_sun_star_task_XInteractionHandler_idl__
 #include <com/sun/star/task/XInteractionHandler.idl>
 #endif
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-
-//=============================================================================
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
 
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
-/**
-    Extension of XLibraryContainer to provide functionality to
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
+/** 
+    Extension of XLibraryContainer to provide functionality to 
     store a library to a location represented by a URL.
  */
 interface XLibraryContainerExport : com::sun::star::uno::XInterface
-{
-    /**
-        Exports a library specified by Name to the location
+{ 
+    /** 
+        Exports a library specified by Name to the location 
         specified by the passed URL string.
 
         An interaction handler can be passed to be used for internal
-        ucb operations. Exceptions not processed by this handler will
-        be passed as com::sun::star::uno::Exception. If this parameter
+        ucb operations. Exceptions not processed by this handler will 
+        be passed as com::sun::star::uno::Exception. If this parameter 
         is null this applies to all exceptions thrown by ucb.
 
         @see com::sun::star::task::InteractionHandler
-
-        If a library with the this name doesn't exist a
+ 
+        If a library with the this name doesn't exist a 
         com::sun::star::container::NoSuchElementException is thrown.
      */
     void exportLibrary( [in] string Name, [in] string URL,
         [in] com::sun::star::task::XInteractionHandler Handler )
-            raises( com::sun::star::uno::Exception,
+            raises( com::sun::star::uno::Exception, 
                     com::sun::star::container::NoSuchElementException );
 };
 
-//=============================================================================
-
-
-}; }; }; };
-
-#endif
+//============================================================================= 
+ 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/script/XLibraryContainerPassword.idl b/offapi/com/sun/star/script/XLibraryContainerPassword.idl
index 26cb1d211993..9d0f6c972322 100644
--- a/offapi/com/sun/star/script/XLibraryContainerPassword.idl
+++ b/offapi/com/sun/star/script/XLibraryContainerPassword.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XLibraryContainerPassword_idl__
-#define __com_sun_star_script_XLibraryContainerPassword_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
-/**
+#ifndef __com_sun_star_script_XLibraryContainerPassword_idl__ 
+#define __com_sun_star_script_XLibraryContainerPassword_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
+/** 
     Extension of XLibraryContainer to provide password functionality.
     This interface should be implemented together with XLibraryContainer2
     </p>
  */
 published interface XLibraryContainerPassword:  com::sun::star::uno::XInterface
-{
-    /**
+{ 
+    /** 
         Returns true if the accessed library item is protected
         by a password.
 
-        If a library with the this name doesn't exist a
+        If a library with the this name doesn't exist a 
         com::sun::star::container::NoSuchElementException is thrown.
      */
     boolean isLibraryPasswordProtected( [in] string Name )
-            raises( com::sun::star::container::NoSuchElementException );
+            raises( com::sun::star::container::NoSuchElementException ); 
 
-    /**
-        Returns true if the accessed library item is protected by a
-        password (see isLibraryPasswordProtected) and the password
-        was already verified with verifyLibraryPassword or if an
+    /** 
+        Returns true if the accessed library item is protected by a 
+        password (see isLibraryPasswordProtected) and the password 
+        was already verified with verifyLibraryPassword or if an 
         initial password was set with changeLibraryPassword.
 
         If a library with the this name doesn't exist a
@@ -76,10 +76,10 @@ published interface XLibraryContainerPassword:  com::sun::star::uno::XInterface
         com::sun::star::lang::IllegalArgumentException is thrown.
      */
     boolean isLibraryPasswordVerified( [in] string Name )
-            raises( com::sun::star::lang::IllegalArgumentException,
+            raises( com::sun::star::lang::IllegalArgumentException, 
                     com::sun::star::container::NoSuchElementException );
 
-    /**
+    /** 
         Verifies the library's password. If the correct password
         was passed, the method returns true and further calls to
         isLibraryPasswordVerified will also return true.
@@ -94,32 +94,32 @@ published interface XLibraryContainerPassword:  com::sun::star::uno::XInterface
         com::sun::star::lang::IllegalArgumentException is thrown.
      */
     boolean verifyLibraryPassword( [in] string Name, [in] string Password )
-            raises( com::sun::star::lang::IllegalArgumentException,
+            raises( com::sun::star::lang::IllegalArgumentException, 
                     com::sun::star::container::NoSuchElementException );
 
-    /**
-        Changes the library's password.
-
+    /** 
+        Changes the library's password. 
+        
         If the library wasn't password protected before:
-        The OldPassword parameter has to be an empty string.
-        Afterwards calls to isLibraryPasswordProtected and
-        isLibraryPasswordVerified for this library will
+        The OldPassword parameter has to be an empty string. 
+        Afterwards calls to isLibraryPasswordProtected and 
+        isLibraryPasswordVerified for this library will 
         return true.
 
         If the library already was password protected:
-        The OldPassword parameter has to be set to the
+        The OldPassword parameter has to be set to the 
         previous defined password. If then the NewPassword
         parameter is an empty string the library password
         protection will be disabled afterwards (afterwards
-        calls to isLibraryPasswordProtected for this library
+        calls to isLibraryPasswordProtected for this library 
         will return false). If the NewPassword parameter is
-        not an empty string it will accepted as the new
+        not an empty string it will accepted as the new 
         password for the library.
-
+        
         If a library with the this name doesn't exist but isn't
         com::sun::star::container::NoSuchElementException is thrown.
 
-        If the library exists and is password protected and a
+        If the library exists and is password protected and a 
         wrong OldPassword is passed to the method a
         com::sun::star::lang::IllegalArgumentException is thrown.
 
@@ -128,16 +128,16 @@ published interface XLibraryContainerPassword:  com::sun::star::uno::XInterface
         read only a
         com::sun::star::lang::IllegalArgumentException is thrown.
      */
-    void changeLibraryPassword( [in] string Name,
+    void changeLibraryPassword( [in] string Name, 
         [in] string OldPassword, [in] string NewPassword )
-            raises( com::sun::star::lang::IllegalArgumentException,
+            raises( com::sun::star::lang::IllegalArgumentException, 
                     com::sun::star::container::NoSuchElementException );
 
 };
 
-//=============================================================================
-
-
-}; }; }; };
-
-#endif
+//============================================================================= 
+ 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/script/XLibraryQueryExecutable.idl b/offapi/com/sun/star/script/XLibraryQueryExecutable.idl
index 7939154d87de..48dbfaa6d342 100644
--- a/offapi/com/sun/star/script/XLibraryQueryExecutable.idl
+++ b/offapi/com/sun/star/script/XLibraryQueryExecutable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,25 +27,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XLibraryQueryExecutable_idl__
-#define __com_sun_star_script_XLibraryQueryExecutable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module script {
-
+#ifndef __com_sun_star_script_XLibraryQueryExecutable_idl__ 
+#define __com_sun_star_script_XLibraryQueryExecutable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module script {  
+ 
 interface XLibraryQueryExecutable: com::sun::star::uno::XInterface
-{
-    boolean HasExecutableCode( [in] string name );
+{ 
+	boolean HasExecutableCode( [in] string name );
 };
 
-//=============================================================================
-
-
-}; }; }; };
-
-#endif
+//============================================================================= 
+ 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/script/XPersistentLibraryContainer.idl b/offapi/com/sun/star/script/XPersistentLibraryContainer.idl
index 200bd1d164ca..796dd73a09ad 100644
--- a/offapi/com/sun/star/script/XPersistentLibraryContainer.idl
+++ b/offapi/com/sun/star/script/XPersistentLibraryContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,13 @@
 #ifndef __com_sun_star_script_XPersistentLibraryContainer_idl__
 #define __com_sun_star_script_XPersistentLibraryContainer_idl__
 
-#ifndef __com_sun_star_util_XModifiable_idl__
+#ifndef __com_sun_star_util_XModifiable_idl__ 
 #include <com/sun/star/util/XModifiable.idl>
 #endif
-#ifndef __com_sun_star_script_XLibraryContainer2_idl__
+#ifndef __com_sun_star_script_XLibraryContainer2_idl__ 
 #include <com/sun/star/script/XLibraryContainer2.idl>
 #endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
 #include <com/sun/star/lang/WrappedTargetException.idl>
 #endif
 
diff --git a/offapi/com/sun/star/script/XStorageBasedLibraryContainer.idl b/offapi/com/sun/star/script/XStorageBasedLibraryContainer.idl
index 13c9ab990d44..acb18dc0ef0c 100644
--- a/offapi/com/sun/star/script/XStorageBasedLibraryContainer.idl
+++ b/offapi/com/sun/star/script/XStorageBasedLibraryContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module script {
+module com { module sun { module star { module script { 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/script/browse/BrowseNode.idl b/offapi/com/sun/star/script/browse/BrowseNode.idl
index fa209b84efa1..b7e3090df414 100755
--- a/offapi/com/sun/star/script/browse/BrowseNode.idl
+++ b/offapi/com/sun/star/script/browse/BrowseNode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl b/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl
index b54d8e7e6137..62113f0ca38d 100755
--- a/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl
+++ b/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 module com { module sun { module star { module script { module browse {
 
-/**
+/** 
     This service is used to create Root XBrowseNodes.
 
     @since OOo 2.0.0
@@ -51,7 +51,7 @@ service BrowseNodeFactory
     <pre>
     /singletons/com.sun.star.script.theBrowseNodeFactory
     </pre>
-
+                                                                                
     @since OOo 2.0.0
 */
 singleton theBrowseNodeFactory
diff --git a/offapi/com/sun/star/script/browse/BrowseNodeFactoryViewTypes.idl b/offapi/com/sun/star/script/browse/BrowseNodeFactoryViewTypes.idl
index 84ef8e8e1733..227422a9865f 100755
--- a/offapi/com/sun/star/script/browse/BrowseNodeFactoryViewTypes.idl
+++ b/offapi/com/sun/star/script/browse/BrowseNodeFactoryViewTypes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 
 module com { module sun { module star { module script { module browse {
 //==============================================================================
-/**
+/** 
     These constants define the three different types of views available from
     BrowseNodeFactory.
 */
diff --git a/offapi/com/sun/star/script/browse/BrowseNodeTypes.idl b/offapi/com/sun/star/script/browse/BrowseNodeTypes.idl
index f790541cb8a7..c017527c8a6e 100755
--- a/offapi/com/sun/star/script/browse/BrowseNodeTypes.idl
+++ b/offapi/com/sun/star/script/browse/BrowseNodeTypes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,14 +31,14 @@
 
 module com { module sun { module star { module script { module browse {
 //==============================================================================
-/**
+/** 
     These constants define the three different types of nodes in the BrowseNode
     hierarchy.
 */
 constants BrowseNodeTypes
 {
   /**
-    Indicates node is a script
+    Indicates node is a script 
   */
   const short SCRIPT = 0;
   /**
diff --git a/offapi/com/sun/star/script/browse/XBrowseNode.idl b/offapi/com/sun/star/script/browse/XBrowseNode.idl
index da493f604abb..aee601274a1d 100755
--- a/offapi/com/sun/star/script/browse/XBrowseNode.idl
+++ b/offapi/com/sun/star/script/browse/XBrowseNode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,8 +34,8 @@
 
 module com { module sun { module star { module script { module browse {
 //==============================================================================
-/**
-    This interface represents a node in the hierarchy used to browse
+/** 
+    This interface represents a node in the hierarchy used to browse 
     available scripts.
     Objects implementing this interface are expected to also implement
     com.sun.star.beans.XPropertySet and, optionally,
@@ -55,27 +55,27 @@ interface XBrowseNode : ::com::sun::star::uno::XInterface
 
   //----------------------------------------------------------------------
   /**
-    Get the children of this node
-
+    Get the children of this node 
+    
     @returns
     <type scope="::com::sun::star::script::browse">XBrowseNode</type> sequence of child nodes
   */
     sequence < XBrowseNode > getChildNodes();
-
+  
   //----------------------------------------------------------------------
   /**
-    Indicates if this node contains any children
-
+    Indicates if this node contains any children 
+    
     @returns
     <atom> boolean </atom> true if there are child nodes.
   */
-    boolean hasChildNodes();
+    boolean hasChildNodes(); 
 
     //-------------------------------------------------------------------
     /** the type of the node.
         @returns A <atom>short</atom> reresenting the type of this node.
     */
-    short getType();
+    short getType(); 
 
 };
 
diff --git a/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl b/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl
index 41ef7e038bde..32d012050ff4 100644
--- a/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl
+++ b/offapi/com/sun/star/script/browse/XBrowseNodeFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ interface XBrowseNodeFactory : ::com::sun::star::uno::XInterface {
     /** a factory method for the creation of XBrowseNodes
         ( view ) <type scope="::com::sun::star::script::browse">BrowseNodeFactoryViewTypes</type> specifies the type of view to be returned
 
-        @returns
+        @returns 
             an object implementing <type scope="::com::sun::star::script::browse">XBrowseNode</type>
 
     */
diff --git a/offapi/com/sun/star/script/provider/LanguageScriptProvider.idl b/offapi/com/sun/star/script/provider/LanguageScriptProvider.idl
index 8072416c62f1..6fab8ec699e4 100755
--- a/offapi/com/sun/star/script/provider/LanguageScriptProvider.idl
+++ b/offapi/com/sun/star/script/provider/LanguageScriptProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/script/provider/MasterScriptProvider.idl b/offapi/com/sun/star/script/provider/MasterScriptProvider.idl
index 7a2bb02a194c..987349a43787 100755
--- a/offapi/com/sun/star/script/provider/MasterScriptProvider.idl
+++ b/offapi/com/sun/star/script/provider/MasterScriptProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ module com { module sun { module star { module script { module provider {
 //===========================================================================
 /**
     This service acts as a wrapper around the various language specific
-    ScriptProviders.
+    ScriptProviders. 
 */
 service MasterScriptProvider {
     service ::com::sun::star::script::provider::ScriptProvider;
diff --git a/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl b/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl
index bbc5f74ff011..df64e2b8451a 100755
--- a/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl
+++ b/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
 
 module com { module sun { module star { module script { module provider {
 
-/**
+/** 
     This service is used to create MasterScriptProviders.
     Note: You shouldn't ever instantiate the MasterScriptProvider
     service directly, you should always use this service.
@@ -52,7 +52,7 @@ service MasterScriptProviderFactory
     <pre>
     /singletons/com.sun.star.script.provider.theMasterScriptProviderFactory
     </pre>
-
+                                                                                
 */
 singleton theMasterScriptProviderFactory
 {
diff --git a/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl b/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl
index 72fac1b09749..845d71ea08c8 100644
--- a/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl
+++ b/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl b/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl
index c7cc7b6f88f3..71e94e2c3b7a 100644
--- a/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl
+++ b/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl b/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl
index 6444e1f92b62..062145079b12 100644
--- a/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl
+++ b/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/script/provider/ScriptFrameworkErrorType.idl b/offapi/com/sun/star/script/provider/ScriptFrameworkErrorType.idl
index a80f1f36c318..117a95a68f0d 100644
--- a/offapi/com/sun/star/script/provider/ScriptFrameworkErrorType.idl
+++ b/offapi/com/sun/star/script/provider/ScriptFrameworkErrorType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/script/provider/ScriptProvider.idl b/offapi/com/sun/star/script/provider/ScriptProvider.idl
index a133301e392a..d9d4027df767 100755
--- a/offapi/com/sun/star/script/provider/ScriptProvider.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/script/provider/ScriptProviderForBasic.idl b/offapi/com/sun/star/script/provider/ScriptProviderForBasic.idl
index 97541eb0e863..f833f58dca0e 100644
--- a/offapi/com/sun/star/script/provider/ScriptProviderForBasic.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProviderForBasic.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ module com { module sun { module star { module script { module provider {
 
 //===========================================================================
 /**
-    This service is a Basic-specific LanguageScriptProvider.
+    This service is a Basic-specific LanguageScriptProvider. 
 */
 service ScriptProviderForBasic {
     service ::com::sun::star::script::provider::LanguageScriptProvider;
diff --git a/offapi/com/sun/star/script/provider/ScriptProviderForBeanShell.idl b/offapi/com/sun/star/script/provider/ScriptProviderForBeanShell.idl
index e9c2d7dd8241..d142803763c5 100755
--- a/offapi/com/sun/star/script/provider/ScriptProviderForBeanShell.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProviderForBeanShell.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/script/provider/ScriptProviderForJava.idl b/offapi/com/sun/star/script/provider/ScriptProviderForJava.idl
index 6d171c305dac..433ed4b2be71 100755
--- a/offapi/com/sun/star/script/provider/ScriptProviderForJava.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProviderForJava.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/script/provider/ScriptProviderForJavaScript.idl b/offapi/com/sun/star/script/provider/ScriptProviderForJavaScript.idl
index e64067084beb..21b36aac649f 100755
--- a/offapi/com/sun/star/script/provider/ScriptProviderForJavaScript.idl
+++ b/offapi/com/sun/star/script/provider/ScriptProviderForJavaScript.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/script/provider/ScriptURIHelper.idl b/offapi/com/sun/star/script/provider/ScriptURIHelper.idl
index 111a65cb4a26..fc6ed02a9de6 100755
--- a/offapi/com/sun/star/script/provider/ScriptURIHelper.idl
+++ b/offapi/com/sun/star/script/provider/ScriptURIHelper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,16 +46,16 @@ module com { module sun { module star { module script { module provider {
 */
 service ScriptURIHelper : XScriptURIHelper {
 
-    /**
+    /** 
         create a new ScriptURIHelper
 
-        @param language
+        @param language 
             The name of the scripting language for which this ScriptURIHelper
             is being created. It should be the same as the language name
             used for the service that inherits from the LanguageScriptProvider
             service
 
-        @param location
+        @param location 
             This location which was passed to the LanguageScriptProvider
             by the Scripting Framework on its creation
 
diff --git a/offapi/com/sun/star/script/provider/XScript.idl b/offapi/com/sun/star/script/provider/XScript.idl
index a96629fe9c68..11f76af18641 100644
--- a/offapi/com/sun/star/script/provider/XScript.idl
+++ b/offapi/com/sun/star/script/provider/XScript.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,17 +59,17 @@ module com { module sun { module star { module script { module provider {
 interface XScript : ::com::sun::star::uno::XInterface {
 
     //----------------------------------------------------------------------
-    /**
-        invoke the script or function represented by the implementing
+    /** 
+        invoke the script or function represented by the implementing 
             object
 
-        @param aParams
+        @param aParams 
             all parameters; pure, out params are undefined in sequence,
             i.e., the value has to be ignored by the callee
-        @param aOutParamIndex
-            out indices, indicating the position of the out or inout
+        @param aOutParamIndex 
+            out indices, indicating the position of the out or inout 
             parameters in the list of arguments to the script
-        @param aOutParam
+        @param aOutParam 
             out parameters<p>
             For example, if the script had the signature<br>
             <code>long foo( [inout] string a, [in] string b, [out] string c )</code>
@@ -78,22 +78,22 @@ interface XScript : ::com::sun::star::uno::XInterface {
             <br> and after the call the out sequences would contain<br>
             <listing>
             aOutParamIndex={0,2};
-            aOutParam={"string from a", "string from c"};
+            aOutParam={"string from a", "string from c"};   
             </listing>
 
-        @returns
+        @returns 
             the value returned from the function being invoked
 
         @throws ::com::sun::star::reflection::InvocationTargetException
             if and error occurs while attempting to invoke a script the information is captured. If the error or exception is generated by the script itself it is wrapped as either ScriptErrorRaisedException or ScriptExceptionRaisedException or ScriptingFrameworkErrorException are wrapped as ScriptFrameworkErrorExceptions.
     */
-    any invoke(
-        [in] sequence<any> aParams,
-        [out] sequence<short> aOutParamIndex,
-        [out] sequence<any> aOutParam ) raises(
+    any invoke( 
+        [in] sequence<any> aParams, 
+        [out] sequence<short> aOutParamIndex, 
+        [out] sequence<any> aOutParam ) raises( 
         ::com::sun::star::script::provider::ScriptFrameworkErrorException ,
         ::com::sun::star::reflection::InvocationTargetException);
-
+    
 };
 
 //===========================================================================
diff --git a/offapi/com/sun/star/script/provider/XScriptContext.idl b/offapi/com/sun/star/script/provider/XScriptContext.idl
index f673b18716d7..4cf1de6ebd4f 100644
--- a/offapi/com/sun/star/script/provider/XScriptContext.idl
+++ b/offapi/com/sun/star/script/provider/XScriptContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@
 #include <com/sun/star/frame/XModel.idl>
 #endif
 
-#ifndef __com_sun_star_uno_XComponentContext_idl__
+#ifndef __com_sun_star_uno_XComponentContext_idl__ 
 #include <com/sun/star/uno/XComponentContext.idl>
 #endif
 
@@ -55,18 +55,18 @@ module com { module sun { module star { module script { module provider {
 
 //===========================================================================
 /**
-    This interface is provided to scripts, and provides a means of access to
-    the various interfaces which they might need to perform some action on
-    a document. It is required to be passed as the first argument for any
+    This interface is provided to scripts, and provides a means of access to 
+    the various interfaces which they might need to perform some action on 
+    a document. It is required to be passed as the first argument for any 
     Java scripts.
 */
 interface XScriptContext : ::com::sun::star::uno::XInterface {
 
     //----------------------------------------------------------------------
-    /**
+    /** 
         Obtain the document reference on which the script can operate
 
-        @returns
+        @returns 
           <type scope="com::sun::star::frame">XModel</type> interface
     */
     ::com::sun::star::frame::XModel getDocument();
@@ -88,19 +88,19 @@ interface XScriptContext : ::com::sun::star::uno::XInterface {
     */
     ::com::sun::star::document::XScriptInvocationContext getInvocationContext();
 
-    /**
+    /** 
         Obtain the desktop reference on which the script can operate
 
-        @returns
+        @returns 
           <type scope="com::sun::star::frame">XDesktop</type> interface
     */
     ::com::sun::star::frame::XDesktop getDesktop();
 
-    /**
-        Obtain the component context which the script can use to create
+    /** 
+        Obtain the component context which the script can use to create 
         other uno components
 
-        @returns
+        @returns 
           <type scope="com::sun::star::uno">XComponentContext</type> interface
     */
     ::com::sun::star::uno::XComponentContext getComponentContext();
diff --git a/offapi/com/sun/star/script/provider/XScriptProvider.idl b/offapi/com/sun/star/script/provider/XScriptProvider.idl
index 944a37532251..07b984252bf5 100644
--- a/offapi/com/sun/star/script/provider/XScriptProvider.idl
+++ b/offapi/com/sun/star/script/provider/XScriptProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,10 +56,10 @@ interface XScriptProvider : ::com::sun::star::uno::XInterface {
     /** a factory method for the creation of XScript
         implementations.
 
-        @param sScriptURI
-            is the logical or language-dependent script URI
+        @param sScriptURI 
+            is the logical or language-dependent script URI 
 
-        @returns
+        @returns 
             an object implementing <type scope="::com::sun::star::script::provider">XScript</type> representing the script
 
         @throws ::com::sun::star::provider::ScriptFrameworkErrorException
diff --git a/offapi/com/sun/star/script/provider/XScriptProviderFactory.idl b/offapi/com/sun/star/script/provider/XScriptProviderFactory.idl
index 3663d6188420..b191b21026c1 100644
--- a/offapi/com/sun/star/script/provider/XScriptProviderFactory.idl
+++ b/offapi/com/sun/star/script/provider/XScriptProviderFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,10 +53,10 @@ interface XScriptProviderFactory : ::com::sun::star::uno::XInterface {
     /** a factory method for the creation of XScriptProviders
         implementations.
 
-        @param sContext
+        @param sContext 
             is context for which the ScriptProvider is to be created for
 
-        @returns
+        @returns 
             an object implementing <type scope="::com::sun::star::script::provider">XScriptProvider</type>
 
         @throws ::com::sun::star::lang::IllegalArgumentException
diff --git a/offapi/com/sun/star/script/provider/XScriptProviderSupplier.idl b/offapi/com/sun/star/script/provider/XScriptProviderSupplier.idl
index 6fa088c85a32..077302e9869f 100644
--- a/offapi/com/sun/star/script/provider/XScriptProviderSupplier.idl
+++ b/offapi/com/sun/star/script/provider/XScriptProviderSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,7 +51,7 @@ interface XScriptProviderSupplier : ::com::sun::star::uno::XInterface {
     //----------------------------------------------------------------------
     /** returns scripting provider related to the object.
 
-        @returns
+        @returns 
             an object implementing <type scope="::com::sun::star::script::provider">XScriptProvider</type> representing the script provider
     */
     XScriptProvider getScriptProvider();
diff --git a/offapi/com/sun/star/script/provider/XScriptURIHelper.idl b/offapi/com/sun/star/script/provider/XScriptURIHelper.idl
index 1790df0a4a08..a04f6486c52e 100644
--- a/offapi/com/sun/star/script/provider/XScriptURIHelper.idl
+++ b/offapi/com/sun/star/script/provider/XScriptURIHelper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,7 +49,7 @@ module com { module sun { module star { module script { module provider {
 interface XScriptURIHelper : ::com::sun::star::uno::XInterface {
 
     //----------------------------------------------------------------------
-    /**
+    /** 
         Obtain the root storage URI for this ScriptURIHelper. The
         resulting string can be used to access the storage for this
         using the Universal Content Broker
@@ -58,7 +58,7 @@ interface XScriptURIHelper : ::com::sun::star::uno::XInterface {
     */
     string getRootStorageURI();
 
-    /**
+    /** 
         Obtain the storage URI for a specific Scripting Framework
         script URI.
 
@@ -70,7 +70,7 @@ interface XScriptURIHelper : ::com::sun::star::uno::XInterface {
     string getStorageURI( [in] string scriptURI ) raises
         ( ::com::sun::star::lang::IllegalArgumentException );
 
-    /**
+    /** 
         Obtain the Scripting Framework script URI for a specific UCB URI
 
         @returns the URI as a <atom>string</atom>
diff --git a/offapi/com/sun/star/script/vba/VBAEventId.idl b/offapi/com/sun/star/script/vba/VBAEventId.idl
index fda83a18d495..fc305bc1aac5 100755
--- a/offapi/com/sun/star/script/vba/VBAEventId.idl
+++ b/offapi/com/sun/star/script/vba/VBAEventId.idl
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef __com_sun_star_script_vba_VBAEventId_idl__
 #define __com_sun_star_script_vba_VBAEventId_idl__
 
@@ -41,7 +41,7 @@ module com {  module sun {  module star { module script { module vba {
 
     <p>Each event expects some specific arguments to be passed to
     <member>XVBAEventProcessor::processVbaEvent</member>.</p>
-
+    
     @see XVBAEventProcessor
  */
 constants VBAEventId
@@ -50,7 +50,7 @@ constants VBAEventId
 
     /** An identifier not corresponding to any VBA document event. */
     const long NO_EVENT                             = -1;
-
+    
     //=========================================================================
     // Global events (identifiers from 1 to 999)
 
diff --git a/offapi/com/sun/star/script/vba/VBAEventProcessor.idl b/offapi/com/sun/star/script/vba/VBAEventProcessor.idl
index d993b37ae250..94ca1bc5777a 100755
--- a/offapi/com/sun/star/script/vba/VBAEventProcessor.idl
+++ b/offapi/com/sun/star/script/vba/VBAEventProcessor.idl
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef __com_sun_star_script_vba_VBAEventProcessor_idl__
 #define __com_sun_star_script_vba_VBAEventProcessor_idl__
 
diff --git a/offapi/com/sun/star/script/vba/VBASpreadsheetEventProcessor.idl b/offapi/com/sun/star/script/vba/VBASpreadsheetEventProcessor.idl
index ce202da4f54c..e55ea5fec416 100755
--- a/offapi/com/sun/star/script/vba/VBASpreadsheetEventProcessor.idl
+++ b/offapi/com/sun/star/script/vba/VBASpreadsheetEventProcessor.idl
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef __com_sun_star_script_vba_VBASpreadsheetEventProcessor_idl__
 #define __com_sun_star_script_vba_VBASpreadsheetEventProcessor_idl__
 
diff --git a/offapi/com/sun/star/script/vba/VBATextEventProcessor.idl b/offapi/com/sun/star/script/vba/VBATextEventProcessor.idl
index fd3c7f895d8d..ce986cd058f0 100755
--- a/offapi/com/sun/star/script/vba/VBATextEventProcessor.idl
+++ b/offapi/com/sun/star/script/vba/VBATextEventProcessor.idl
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef __com_sun_star_script_vba_VBATextEventProcessor_idl__
 #define __com_sun_star_script_vba_VBATextEventProcessor_idl__
 
diff --git a/offapi/com/sun/star/script/vba/XVBACompatibility.idl b/offapi/com/sun/star/script/vba/XVBACompatibility.idl
index bfa9d01655fa..87cb36b7d7fc 100644
--- a/offapi/com/sun/star/script/vba/XVBACompatibility.idl
+++ b/offapi/com/sun/star/script/vba/XVBACompatibility.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef __com_sun_star_script_vba_XVBACompatibility_idl__
 #define __com_sun_star_script_vba_XVBACompatibility_idl__
 
 #include <com/sun/star/uno/XInterface.idl>
 
 //=============================================================================
-
+ 
 module com {  module sun {  module star {  module script { module vba {
-
+ 
 interface XVBACompatibility
 {
     //-------------------------------------------------------------------------
@@ -47,4 +47,4 @@ interface XVBACompatibility
 
 //=============================================================================
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl b/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
index 4a3534de8412..a75e6fa4eae8 100755
--- a/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
+++ b/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef __com_sun_star_script_vba_XVBAEventProcessor_idl__
 #define __com_sun_star_script_vba_XVBAEventProcessor_idl__
 
@@ -65,16 +65,16 @@ interface XVBAEventProcessor
         raises (::com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
-
+    
     /** Executes a VBA event handler.
-
+    
         @param nEventId
             The identifier of the event. Must be a constant from <type>VBAEventId</type>.
-
+            
         @param aArgs
             The input arguments needed to create the argument list of the VBA
             event handler.
-
+            
         @throws <type scope="::com::sun::star::lang">IllegalArgumentException</type>
             if the passed event identifier is not supported, or if the passed
             arguments do not conform to the arguments expected by the specified
diff --git a/offapi/com/sun/star/script/vba/XVBAModuleInfo.idl b/offapi/com/sun/star/script/vba/XVBAModuleInfo.idl
index 9954281a5a71..25f3f9114bf0 100644
--- a/offapi/com/sun/star/script/vba/XVBAModuleInfo.idl
+++ b/offapi/com/sun/star/script/vba/XVBAModuleInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,10 +24,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef __com_sun_star_script_vba_XVBAModuleInfo_idl__
 #define __com_sun_star_script_vba_XVBAModuleInfo_idl__
-
+ 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/script/ModuleInfo.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
@@ -35,16 +35,16 @@
 #include <com/sun/star/lang/WrappedTargetException.idl>
 #include <com/sun/star/container/NoSuchElementException.idl>
 
-//=============================================================================
-
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module script { module vba {
-
+ 
 interface XVBAModuleInfo
-{
+{ 
     //-------------------------------------------------------------------------
-
+    
     com::sun::star::script::ModuleInfo getModuleInfo( [in] string ModuleName )
-        raises( com::sun::star::container::NoSuchElementException,
+        raises( com::sun::star::container::NoSuchElementException, 
                 com::sun::star::lang::WrappedTargetException );
 
     //-------------------------------------------------------------------------
@@ -53,16 +53,16 @@ interface XVBAModuleInfo
 
     //-------------------------------------------------------------------------
 
-    void insertModuleInfo( [in] string ModuleName,
-                           [in] com::sun::star::script::ModuleInfo ModuleInfo )
+    void insertModuleInfo( [in] string ModuleName, 
+                           [in] com::sun::star::script::ModuleInfo ModuleInfo ) 
         raises( com::sun::star::lang::IllegalArgumentException,
-                com::sun::star::container::ElementExistException,
+                com::sun::star::container::ElementExistException, 
                 com::sun::star::lang::WrappedTargetException );
 
     //-------------------------------------------------------------------------
 
     void removeModuleInfo( [in] string ModuleName )
-        raises( com::sun::star::container::NoSuchElementException,
+        raises( com::sun::star::container::NoSuchElementException, 
                 com::sun::star::lang::WrappedTargetException );
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/sdb/BooleanComparisonMode.idl b/offapi/com/sun/star/sdb/BooleanComparisonMode.idl
index 018658dc47e7..5d9a75ce665c 100644
--- a/offapi/com/sun/star/sdb/BooleanComparisonMode.idl
+++ b/offapi/com/sun/star/sdb/BooleanComparisonMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module sdb {
+module com { module sun { module star { module sdb { 
 
 //=============================================================================
 
@@ -67,7 +67,7 @@ constants BooleanComparisonMode
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/CallableStatement.idl b/offapi/com/sun/star/sdb/CallableStatement.idl
index 151ada30313f..1bfc56372912 100644
--- a/offapi/com/sun/star/sdb/CallableStatement.idl
+++ b/offapi/com/sun/star/sdb/CallableStatement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_CallableStatement_idl__
-#define __com_sun_star_sdb_CallableStatement_idl__
-
-#ifndef __com_sun_star_sdbc_CallableStatement_idl__
-#include <com/sun/star/sdbc/CallableStatement.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_PreparedStatement_idl__
-#include <com/sun/star/sdb/PreparedStatement.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_CallableStatement_idl__ 
+#define __com_sun_star_sdb_CallableStatement_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_CallableStatement_idl__ 
+#include <com/sun/star/sdbc/CallableStatement.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdb_PreparedStatement_idl__ 
+#include <com/sun/star/sdb/PreparedStatement.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** represents a procedure call. The service differs only in the access
-    of the columns and parameters to the service
+    of the columns and parameters to the service 
     <type scope="com::sun::star::sdbc">CallableStatement</type>
     .
 */
 published service CallableStatement
-{
-    service com::sun::star::sdbc::CallableStatement;
-
-    service com::sun::star::sdb::PreparedStatement;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+{ 
+    service com::sun::star::sdbc::CallableStatement; 
+    
+    service com::sun::star::sdb::PreparedStatement; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/Column.idl b/offapi/com/sun/star/sdb/Column.idl
index 982dfccbab49..6726fc8622a8 100644
--- a/offapi/com/sun/star/sdb/Column.idl
+++ b/offapi/com/sun/star/sdb/Column.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_Column_idl__
-#define __com_sun_star_sdb_Column_idl__
-
-#ifndef __com_sun_star_sdbcx_Column_idl__
-#include <com/sun/star/sdbcx/Column.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_ColumnSettings_idl__
-#include <com/sun/star/sdb/ColumnSettings.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_Column_idl__ 
+#define __com_sun_star_sdb_Column_idl__ 
+ 
+#ifndef __com_sun_star_sdbcx_Column_idl__ 
+#include <com/sun/star/sdbcx/Column.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdb_ColumnSettings_idl__ 
+#include <com/sun/star/sdb/ColumnSettings.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** describes the common properties of a database column.
  */
 published service Column
-{
-    service com::sun::star::sdbcx::Column;
-
-
+{ 
+    service com::sun::star::sdbcx::Column; 
+ 
+     
     /** is used for customization of data appearance.
      */
-    service com::sun::star::sdb::ColumnSettings;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    service com::sun::star::sdb::ColumnSettings;	 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl b/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl
index c28c615b2284..1bee8c1dfe65 100644
--- a/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl
+++ b/offapi/com/sun/star/sdb/ColumnDescriptorControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_ColumnDescriptorControl_idl__
-#define __com_sun_star_sdb_ColumnDescriptorControl_idl__
-
-#ifndef __com_sun_star_awt_UnoControl_idl__
-#include <com/sun/star/awt/UnoControl.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sdb {
-
-//=============================================================================
-
+#ifndef __com_sun_star_sdb_ColumnDescriptorControl_idl__ 
+#define __com_sun_star_sdb_ColumnDescriptorControl_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControl_idl__ 
+#include <com/sun/star/awt/UnoControl.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sdb {  
+ 
+//============================================================================= 
+ 
 /** specifies a column descriptor control.
  */
 service ColumnDescriptorControl
-{
-    service com::sun::star::awt::UnoControl;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::awt::UnoControl; 	
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl b/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl
index a1ba82c14b55..152a24b09059 100644
--- a/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl
+++ b/offapi/com/sun/star/sdb/ColumnDescriptorControlModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,71 +24,71 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_ColumnDescriptorControlModel_idl__
-#define __com_sun_star_sdb_ColumnDescriptorControlModel_idl__
-
-#ifndef __com_sun_star_awt_UnoControlModel_idl__
-#include <com/sun/star/awt/UnoControlModel.idl>
-#endif
+#ifndef __com_sun_star_sdb_ColumnDescriptorControlModel_idl__ 
+#define __com_sun_star_sdb_ColumnDescriptorControlModel_idl__ 
+ 
+#ifndef __com_sun_star_awt_UnoControlModel_idl__ 
+#include <com/sun/star/awt/UnoControlModel.idl> 
+#endif 
 
 
-//=============================================================================
- module com {  module sun {  module star {
-    module sdbc {
+//============================================================================= 
+ module com {  module sun {  module star {  
+    module sdbc {  
         interface XConnection;
     };
-     module beans {
+     module beans {  
         interface XPropertySet;
  };};};};
 
- module com {  module sun {  module star {  module sdb {
-
-//=============================================================================
-
+ module com {  module sun {  module star {  module sdb {  
+ 
+//============================================================================= 
+ 
 /** specifies the standard model of an <type>ColumnDescriptorControl</type>.
  */
 service ColumnDescriptorControlModel
-{
-    service com::sun::star::awt::UnoControlModel;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the border style of the control.
-
+{ 
+    service com::sun::star::awt::UnoControlModel; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the border style of the control. 
+                
         <pre>
         0: No border
         1: 3D border
         2: simple border
         </pre>
      */
-    [property] short Border;
-
-    //-------------------------------------------------------------------------
-
+    [property] short Border; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines whether the control is enabled or disabled.
      */
-    [property] boolean Enabled;
-
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean Enabled; 
+ 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies that the control can be reached with the TAB key.
      */
-    [property] boolean Tabstop;
+    [property] boolean Tabstop; 
 
     /** specifies the column descriptor where the values will be stored in.
      */
-    [property] ::com::sun::star::beans::XPropertySet Column;
+    [property] ::com::sun::star::beans::XPropertySet Column; 
 
     /** specifies the connection to a database.
      */
     [property] ::com::sun::star::sdbc::XConnection ActiveConnection;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/sdb/ColumnSettings.idl b/offapi/com/sun/star/sdb/ColumnSettings.idl
index 196373e3ede1..8765b99e2b47 100644
--- a/offapi/com/sun/star/sdb/ColumnSettings.idl
+++ b/offapi/com/sun/star/sdb/ColumnSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,111 +24,111 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_ColumnSettings_idl__
-#define __com_sun_star_sdb_ColumnSettings_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_ColumnSettings_idl__ 
+#define __com_sun_star_sdb_ColumnSettings_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** describes the common properties of a database column.
  */
 published service ColumnSettings
-{
-    interface com::sun::star::beans::XPropertySet;
-
-
+{ 
+    interface com::sun::star::beans::XPropertySet; 
+     
+     
     /** contains the index of the number format that is used for the
         column.
-
+        
         <p>The proper value can be determined by using the
         <type scope="com::sun::star::util">XNumberFormatter</type>
         interface.
         </p>
         <p>
-        If the value is
+        If the value is 
         <void/>
         , a default numberformat should be used according to the datatype of the column.
         </p>
-
+     
     */
-    [property] long FormatKey;
-
-
-    /** specifies the alignment of columns text.
-
+    [property] long FormatKey; 
+ 
+     
+    /** specifies the alignment of columns text. 		
+        
         <pre>
         0: left
         1: center
         2: right
-        </pre>
+        </pre> 
         <p>
-        If the value is
+        If the value is 
         <void/>
         , a default alignment should be used according
         to the datatype of the column.
         </p>
      */
-    [property] long Align;
-
-
+    [property] long Align; 
+ 
+     
     /** specifies the width of the column displayed in a grid, the unit is 10THMM.
-
+        
         <p>
-        If the value is
+        If the value is 
         <void/>
         , a default width should be used according to the label of the column.
         </p>
      */
-    [property] long Width;
-
-
-    /** Position of the column within a grid.
-
+    [property] long Width; 
+ 
+     
+    /** Position of the column within a grid.		
+        
         <p>
-        If the value is
+        If the value is 
         <void/>
-        , the default position should be taken according.
+        , the default position should be taken according.		
         </p>
      */
-    [property] long Position;
-
-
+    [property] long Position; 
+     
+     
     /** determines whether the column should be displayed or not.
      */
-    [property] boolean Hidden;
-
-
+    [property] boolean Hidden;	 
+ 
+     
     /** indicates a control model whichs defines the settings for layouting.
-        The default is
+        The default is 
         <NULL/>
         .
      */
-    [optional, property] com::sun::star::beans::XPropertySet ControlModel;
+    [optional, property] com::sun::star::beans::XPropertySet ControlModel; 
 
-    /** describes an optional help text which can be used by UI components
+    /** describes an optional help text which can be used by UI components 
         when representing this column.
-        The default is
+        The default is 
         <NULL/>
         .
     */
     [optional, property] string HelpText;
 
     /** describes the default value which should be displayed by a control when moving to a new row.
-        The default is
+        The default is 
         <NULL/>
         .
     */
     [optional, property] string ControlDefault;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/CommandType.idl b/offapi/com/sun/star/sdb/CommandType.idl
index 065fe9105157..f6748b1b6ed1 100644
--- a/offapi/com/sun/star/sdb/CommandType.idl
+++ b/offapi/com/sun/star/sdb/CommandType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_CommandType_idl__
-#define __com_sun_star_sdb_CommandType_idl__
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_CommandType_idl__ 
+#define __com_sun_star_sdb_CommandType_idl__ 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** indicates the type of a command.
  */
 published constants CommandType
-{
-
-    /** indicates that a command contains a table name, which can be used to
+{ 
+     
+    /** indicates that a command contains a table name, which can be used to 
              process a command like "select * from tablename".
      */
-    const long TABLE    = 0;
-    //-------------------------------------------------------------------------
-
-    /** indicates that a command contains a name of a query component, which
+    const long TABLE	= 0; 
+    //------------------------------------------------------------------------- 
+     
+    /** indicates that a command contains a name of a query component, which 
              contains a certain statement.
      */
-    const long QUERY    = 1;
-    //-------------------------------------------------------------------------
-
+    const long QUERY	= 1; 
+    //------------------------------------------------------------------------- 
+     
     /** indicates that the command is an SQL-Statement.
      */
-    const long COMMAND  = 2;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long COMMAND	= 2; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/Connection.idl b/offapi/com/sun/star/sdb/Connection.idl
index 66edbbf01b9d..b6b4f25f1457 100644
--- a/offapi/com/sun/star/sdb/Connection.idl
+++ b/offapi/com/sun/star/sdb/Connection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_Connection_idl__
-#define __com_sun_star_sdb_Connection_idl__
-
-#ifndef __com_sun_star_container_XChild_idl__
-#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_Connection_idl__
-#include <com/sun/star/sdbc/Connection.idl>
-#endif
-
-#ifndef __com_sun_star_sdbcx_DatabaseDefinition_idl__
-#include <com/sun/star/sdbcx/DatabaseDefinition.idl>
-#endif
-
-module com {  module sun {  module star {  module lang {
+#ifndef __com_sun_star_sdb_Connection_idl__ 
+#define __com_sun_star_sdb_Connection_idl__ 
+ 
+#ifndef __com_sun_star_container_XChild_idl__ 
+#include <com/sun/star/container/XChild.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_Connection_idl__ 
+#include <com/sun/star/sdbc/Connection.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbcx_DatabaseDefinition_idl__ 
+#include <com/sun/star/sdbcx/DatabaseDefinition.idl> 
+#endif 
+ 
+module com {  module sun {  module star {  module lang {  
      published interface XMultiServiceFactory;
 };};};};
 
- module com {  module sun {  module star {  module sdb {
-
- published interface XSQLQueryComposerFactory;
- published interface XQueriesSupplier;
- published interface XCommandPreparation;
-
+ module com {  module sun {  module star {  module sdb { 
+ 
+ published interface XSQLQueryComposerFactory; 
+ published interface XQueriesSupplier; 
+ published interface XCommandPreparation; 
+ 
  module application { interface XTableUIProvider; };
-
-/** extends the
+ 
+/** extends the 
     <type scope="com::sun::star::sdbc">Connection</type>
     of SDBC by providing the data definitions of a connected database.
  */
 published service Connection
-{
-    service com::sun::star::sdbc::Connection;
-
+{ 
+    service com::sun::star::sdbc::Connection; 
+ 
     /** access to the owning data source.
      */
-    interface com::sun::star::container::XChild;
-
+    interface com::sun::star::container::XChild; 
+ 
     /** interface for complex command execution.
      */
-    interface XCommandPreparation;
-
+    interface XCommandPreparation; 
+ 
     /** access to the database definition information of the connection.
      */
-    service com::sun::star::sdbcx::DatabaseDefinition;
-
+    service com::sun::star::sdbcx::DatabaseDefinition; 
+ 
     /** returns a container of associated queries.
      */
-    interface XQueriesSupplier;
-
+    interface XQueriesSupplier; 
+ 
     /** returns a tool for composing queries.
      */
-    interface XSQLQueryComposerFactory;
+    interface XSQLQueryComposerFactory; 
 
     /** allows the creation of different services which can only exists with a connection.
      */
@@ -87,12 +87,12 @@ published service Connection
         user interface for tables.
     */
 //    [optional] interface com::sun::star::sdb::application::XTableUIProvider;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/ContentLoader.idl b/offapi/com/sun/star/sdb/ContentLoader.idl
index 1322c6ba3197..9fee22edddc4 100644
--- a/offapi/com/sun/star/sdb/ContentLoader.idl
+++ b/offapi/com/sun/star/sdb/ContentLoader.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,16 +26,16 @@
  ************************************************************************/
 
 
-#ifndef __com_sun_star_sdb_ContentLoader_idl__
-#define __com_sun_star_sdb_ContentLoader_idl__
+#ifndef __com_sun_star_sdb_ContentLoader_idl__ 
+#define __com_sun_star_sdb_ContentLoader_idl__ 
 
-#ifndef __com_sun_star_frame_Frame_idl__
+#ifndef __com_sun_star_frame_Frame_idl__ 
 #include <com/sun/star/frame/FrameLoader.idl>
 #endif
 
-module com {  module sun {  module star {  module sdb {
+module com {  module sun {  module star {  module sdb { 
 
-//=============================================================================
+//============================================================================= 
 /** implements a loader for various datasource-related user interface components.
 
     <p>Usually, you don't deal with this loader directly. Instead, use an instance with
@@ -54,50 +54,50 @@ published service ContentLoader
         the loader can create into an arbitrary frame.
         </p>
 
-        The loader should be registered for the URL scheme
+        The loader should be registered for the URL scheme 
         <b>
         .component:DB/ *
         </b>
         , the concrete URLs supported are:
         <ul>
             <li><b>.component:DB/DataSourceBrowser</b><br/>
-                Using this URL creates an instance of the
+                Using this URL creates an instance of the 
                 <type scope="com::sun::star::sdb">DataSourceBrowser</type>
                 service and plugs it into the frame passed to the loader.
             </li>
             <li><b>.component:DB/FormGridView</b><br/>
-                Using this URL creates an instance of the
+                Using this URL creates an instance of the 
                 <type scope="com::sun::star::sdb">ExternalSourceBrowser</type>
                 service and plugs it into the frame passed to the loader.
             </li>
             <li><b>.component:DB/QueryDesign</b><br/>
-                Using this URL creates an instance of the
+                Using this URL creates an instance of the 
                 <type scope="com::sun::star::sdb">QueryDesign</type>
                 service and plugs it into the frame passed to the loader.
             </li>
             <li><b>.component:DB/TableDesign</b><br/>
-                Using this URL creates an instance of the
+                Using this URL creates an instance of the 
                 <type scope="com::sun::star::sdb">TableDesign</type>
                 service and plugs it into the frame passed to the loader.
             </li>
             <li><b>.component:DB/RelationDesign</b><br/>
-                Using this URL creates an instance of the
+                Using this URL creates an instance of the 
                 <type scope="com::sun::star::sdb">RelationDesign</type>
                 service and plugs it into the frame passed to the loader.
             </li>
         </ul>
 
-        The parameters passed to the
+        The parameters passed to the 
         <member scope="com::sun::star::frame">XFrameLoader::load()</member>
-        are forwarded to the object beeing created,
-        in particular to it's
+        are forwarded to the object beeing created, 
+        in particular to it's 
         <type scope="com::sun::star::lang">XInitialization</type>
         interface.
     **/
     service com::sun::star::frame::FrameLoader;
 };
-
-//=============================================================================
-}; }; }; };
-
-#endif
+ 
+//============================================================================= 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/DataAccessDescriptor.idl b/offapi/com/sun/star/sdb/DataAccessDescriptor.idl
index 10f9432b498b..738818819fb2 100644
--- a/offapi/com/sun/star/sdb/DataAccessDescriptor.idl
+++ b/offapi/com/sun/star/sdb/DataAccessDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,19 +28,19 @@
 #ifndef __com_sun_star_sdb_DataAccessDescriptor_idl__
 #define __com_sun_star_sdb_DataAccessDescriptor_idl__
 
-#ifndef __com_sun_star_sdbc_Connection_idl__
+#ifndef __com_sun_star_sdbc_Connection_idl__ 
 #include <com/sun/star/sdbc/Connection.idl>
 #endif
 
-#ifndef __com_sun_star_sdbc_ResultSet_idl__
+#ifndef __com_sun_star_sdbc_ResultSet_idl__ 
 #include <com/sun/star/sdbc/ResultSet.idl>
 #endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl>
 #endif
 
@@ -219,7 +219,7 @@ published service DataAccessDescriptor
         additionally refined with this property.</p>
 
         <p>The single elements of the <member>Selection</member> are either record numbers (see
-        <member scope="com::sun::star::sdbc">XResultSet::getRow</member>), or bookmarks (see
+        <member scope="com::sun::star::sdbc">XResultSet::getRow</member>), or bookmarks (see 
         <member scope="com::sun::star::sdbcx">XRowLocate::getBookmark</member>).<br/>
         It is up to the component which provides or requires a DataAccessDescriptor to specify which of the
         two alternatives it expects. If it does <em>not</em> specify this, then the property
diff --git a/offapi/com/sun/star/sdb/DataAccessDescriptorFactory.idl b/offapi/com/sun/star/sdb/DataAccessDescriptorFactory.idl
index bc4e141f133e..db997209ad79 100644
--- a/offapi/com/sun/star/sdb/DataAccessDescriptorFactory.idl
+++ b/offapi/com/sun/star/sdb/DataAccessDescriptorFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module sdb {
+module com { module sun { module star { module sdb { 
 
 //=============================================================================
 
@@ -42,7 +42,7 @@ singleton DataAccessDescriptorFactory : XDataAccessDescriptorFactory;
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/DataColumn.idl b/offapi/com/sun/star/sdb/DataColumn.idl
index 8e5bc34924a1..2c94feb19dd8 100644
--- a/offapi/com/sun/star/sdb/DataColumn.idl
+++ b/offapi/com/sun/star/sdb/DataColumn.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_DataColumn_idl__
-#define __com_sun_star_sdb_DataColumn_idl__
-
-#ifndef __com_sun_star_sdb_ResultColumn_idl__
-#include <com/sun/star/sdb/ResultColumn.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
- published interface XColumn;
- published interface XColumnUpdate;
-
-
+#ifndef __com_sun_star_sdb_DataColumn_idl__ 
+#define __com_sun_star_sdb_DataColumn_idl__ 
+ 
+#ifndef __com_sun_star_sdb_ResultColumn_idl__ 
+#include <com/sun/star/sdb/ResultColumn.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ published interface XColumn; 
+ published interface XColumnUpdate; 
+ 
+ 
 /** defines a column used for a result set which contains the data definition
     and the data of the column of the current row of a result set.
  */
 published service DataColumn
-{
-    service com::sun::star::sdb::ResultColumn;
-
-
+{ 
+    service com::sun::star::sdb::ResultColumn; 
+ 
+     
     /** is used to retrieve the columns value.
      */
-    interface XColumn;
-
-
+    interface XColumn; 
+ 
+     
     /** is used to update the columns value.
      */
-    interface XColumnUpdate;
-
-
+    interface XColumnUpdate;	 
+ 
+     
     /** contains the column's value. This could be a constraint property, to
-        veto modifications, if a new value does not fit into rules
+        veto modifications, if a new value does not fit into rules 
         defined for the column.
      */
-    [optional, property] any Value;
-
-
-    /** contains the original value of the column.
+    [optional, property] any Value; 
+ 
+     
+    /** contains the original value of the column. 
      */
-    [optional, readonly, property] any OriginalValue;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [optional, readonly, property] any OriginalValue; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/DataSettings.idl b/offapi/com/sun/star/sdb/DataSettings.idl
index 978a2cd9a5d9..0004ba72dabd 100644
--- a/offapi/com/sun/star/sdb/DataSettings.idl
+++ b/offapi/com/sun/star/sdb/DataSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,61 +24,61 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_DataSettings_idl__
-#define __com_sun_star_sdb_DataSettings_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
+#ifndef __com_sun_star_sdb_DataSettings_idl__ 
+#define __com_sun_star_sdb_DataSettings_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
-#include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
-/** extends the
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
+/** extends the 
     <type scope="com::sun::star::sdbcx">Table</type>
     with additional display information, sorting and filtering criterias.
-
+ 
     */
 published service DataSettings
-{
-
+{ 
+     
     /** additional filter for the data object.
      */
-    [property] string Filter;
-
-
+    [property] string Filter; 
+ 
+     
     /** indicates whether the filter should be applied or not,
         default is <FALSE/>.
      */
-    [property] boolean ApplyFilter;
-
-
+    [property] boolean ApplyFilter; 
+ 
+     
     /** is an additional sort order definition.
      */
-    [property] string Order;
-
-
+    [property] string Order; 
+ 
+     
     /** specifies the font attributes for data displaying.
      */
-    [property] com::sun::star::awt::FontDescriptor FontDescriptor;
-
-
+    [property] com::sun::star::awt::FontDescriptor FontDescriptor; 
+ 
+     
     /** specifies the height of a data row.
      */
-    [property] long RowHeight;
-
-
+    [property] long RowHeight;	 
+     
+     
     /** specifies the text color (RGB) for displaying text.
      */
-    [property] com::sun::star::util::Color TextColor;
+    [property] com::sun::star::util::Color TextColor;		 
 
     /** additional having clause for the data object.
      */
@@ -87,12 +87,12 @@ published service DataSettings
     /** additional group by for the data object.
      */
     [optional,property] string GroupBy;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/DataSource.idl b/offapi/com/sun/star/sdb/DataSource.idl
index 3b4594715532..305904942973 100644
--- a/offapi/com/sun/star/sdb/DataSource.idl
+++ b/offapi/com/sun/star/sdb/DataSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,89 +24,89 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_DataSource_idl__
-#define __com_sun_star_sdb_DataSource_idl__
-
-#ifndef __com_sun_star_io_XPersistObject_idl__
-#include <com/sun/star/io/XPersistObject.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushable_idl__
-#include <com/sun/star/util/XFlushable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
-#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
-
-
- module com {  module sun {  module star {  module sdbc {
-     published interface XIsolatedConnection;
-     published interface XDataSource;
+#ifndef __com_sun_star_sdb_DataSource_idl__ 
+#define __com_sun_star_sdb_DataSource_idl__ 
+ 
+#ifndef __com_sun_star_io_XPersistObject_idl__ 
+#include <com/sun/star/io/XPersistObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XFlushable_idl__ 
+#include <com/sun/star/util/XFlushable.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__ 
+#include <com/sun/star/util/XNumberFormatsSupplier.idl> 
+#endif 
+ 
+
+ module com {  module sun {  module star {  module sdbc { 
+     published interface XIsolatedConnection; 
+     published interface XDataSource; 
  };};};};
 
 
- module com {  module sun {  module star {  module sdb {
-
- published interface XCompletedConnection;
- published interface XQueryDefinitionsSupplier;
+ module com {  module sun {  module star {  module sdb { 
+ 
+ published interface XCompletedConnection; 
+ published interface XQueryDefinitionsSupplier; 
  published interface XBookmarksSupplier;
 
-
+ 
 /** is a factory to establish database connections. It should be registered at
     a <type scope="com::sun::star::uno">NamingService</type>.
     @see com::sun::star::sdb::DatabaseContext
  */
 published service DataSource
-{
-    interface com::sun::star::beans::XPropertySet;
-
-
-    /** useful for establishing connections with the completion of connection parameters
+{ 
+    interface com::sun::star::beans::XPropertySet; 
+ 
+     
+    /** useful for establishing connections with the completion of connection parameters 
                 provided during user interaction.
      */
-    interface XCompletedConnection;
+    interface XCompletedConnection; 
 
-    /** useful for establishing isolated connections which are not shared among others
+    /** useful for establishing isolated connections which are not shared among others 
         as it is the case when using <type>XCompletedConnection</type> or <type scope="com::sun::star::sdbc">XDataSource</type>.
         @see XCompletedConnection
         @see com::sun::star::sdbc::XDataSource
         @since OOo 1.1.2
      */
-    interface com::sun::star::sdbc::XIsolatedConnection;
-
-
+    interface com::sun::star::sdbc::XIsolatedConnection; 
+ 
+     
     /** is provided to flush a DataSource within to a Database Context.
      */
-    interface com::sun::star::util::XFlushable;
-
-
+    interface com::sun::star::util::XFlushable; 
+ 
+     
     /** provides the access to DataSource related queries.
         <p>
-        The object returned by the
+        The object returned by the 
         <method scope="com::sun::star::sdb">XQueryDefinitionsSupplier::getQueryDefinitions()</method>
         supports the
         <type scope="com::sun::star::sdb">DefinitionContainer</type>
         service.
         </p>
      */
-    interface XQueryDefinitionsSupplier;
+    interface XQueryDefinitionsSupplier; 
 
     /* useful for establishing connections and to get and set the login timeout.
     */
-    interface com::sun::star::sdbc::XDataSource;
-
+    interface com::sun::star::sdbc::XDataSource; 
+ 
     /** provides access to bookmarks to documents associated with the data source
         <p>
-        The object returned by the
+        The object returned by the 
         <method scope="com::sun::star::sdb">XBookmarksSupplier::getBookmarks()</method>
         supports the
         <type scope="com::sun::star::sdb">DefinitionContainer</type>
@@ -124,17 +124,17 @@ published service DataSource
         <p>If the same data source is registered under different names, the value of the <code>Name</code>
         property is not defined.</p>
      */
-    [readonly, property] string Name;
-
-
+    [readonly, property] string Name; 
+ 
+     
     /** indicates a database url of the form <br>
         <code> jdbc:<em>subprotocol</em>:<em>subname</em></code>
         or
         <code>sdbc:<em>subprotocol</em>:<em>subname</em></code>
      */
-    [property] string URL;
-
-
+    [property] string URL; 
+ 
+     
     /** is a list of arbitrary string tag/value pairs as connection arguments
 
         <p>The <type>DataSource</type> itself does not attempt to interpret any of those values.</p>
@@ -152,7 +152,7 @@ published service DataSource
                 working with the data source.</li>
         </ul>
     */
-    [property] sequence<com::sun::star::beans::PropertyValue> Info;
+    [property] sequence<com::sun::star::beans::PropertyValue> Info; 
 
     /** is a convenience wrapper around the <member>Info</member> property.
 
@@ -201,55 +201,55 @@ published service DataSource
         in state default are stripped, and <em>not</em> returned in the <code>Info</code> sequence.</p>
     */
     [property, readonly, optional] com::sun::star::beans::XPropertySet Settings;
-
+     
     /** determines a users login name.
      */
-    [property] string User;
-
-
+    [property] string User; 
+ 
+     
     /** determines a users password. The password is not persistent.
      */
-    [property] string Password;
-
-
+    [property] string Password; 
+ 
+     
     /** indicates that a password is always necessary.
      */
-    [property] boolean IsPasswordRequired;
-
-
-    /** indicates that components displaying data obtained from this
+    [property] boolean IsPasswordRequired; 
+ 
+     
+    /** indicates that components displaying data obtained from this 
         data source should suppress columns used for versioning.
      */
-    [property] boolean SuppressVersionColumns;
-
-
+    [property] boolean SuppressVersionColumns; 
+ 
+     
     /** determines whether modifications on the data source are allowed or not.
      */
-    [readonly, property] boolean IsReadOnly;
-
-
+    [readonly, property] boolean IsReadOnly; 
+ 
+     
     /** provides an object for formatting numbers.
      */
-    [readonly, property] com::sun::star::util::XNumberFormatsSupplier
-                        NumberFormatsSupplier;
-
-
-    /** defines a list of tables, on which the DataSource should have it's focus.
+    [readonly, property] com::sun::star::util::XNumberFormatsSupplier 
+                        NumberFormatsSupplier; 
+ 
+     
+    /** defines a list of tables, on which the DataSource should have it's focus. 
         If empty, all tables are rejected.
-
+     
     */
-    [property] sequence<string> TableFilter;
-
-
-    /** defines a list of table types, on which the DataSource should have it's focus.
+    [property] sequence<string> TableFilter; 
+ 
+     
+    /** defines a list of table types, on which the DataSource should have it's focus. 
              If empty, all table types are rejected.
 
     */
-    [property] sequence<string> TableTypeFilter;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] sequence<string> TableTypeFilter; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/DataSourceBrowser.idl b/offapi/com/sun/star/sdb/DataSourceBrowser.idl
index feaf0262e26d..82d26ddc2892 100644
--- a/offapi/com/sun/star/sdb/DataSourceBrowser.idl
+++ b/offapi/com/sun/star/sdb/DataSourceBrowser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,35 +26,35 @@
  ************************************************************************/
 
 
-#ifndef __com_sun_star_sdb_DataSourceBrowser_idl__
-#define __com_sun_star_sdb_DataSourceBrowser_idl__
+#ifndef __com_sun_star_sdb_DataSourceBrowser_idl__ 
+#define __com_sun_star_sdb_DataSourceBrowser_idl__ 
 
-#ifndef __com_sun_star_frame_XController_idl__
+#ifndef __com_sun_star_frame_XController_idl__ 
 #include <com/sun/star/frame/XController.idl>
 #endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
+#ifndef __com_sun_star_lang_XInitialization_idl__ 
 #include <com/sun/star/lang/XInitialization.idl>
 #endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
+#ifndef __com_sun_star_frame_XDispatchProvider_idl__ 
 #include <com/sun/star/frame/XDispatchProvider.idl>
 #endif
-#ifndef __com_sun_star_form_FormController_idl__
+#ifndef __com_sun_star_form_FormController_idl__ 
 #include <com/sun/star/form/FormController.idl>
 #endif
 #ifndef __com_sun_star_ui_XContextMenuInterception_idl__
 #include <com/sun/star/ui/XContextMenuInterception.idl>
 #endif
 
-module com {  module sun {  module star {  module sdb {
+module com {  module sun {  module star {  module sdb { 
 
-//=============================================================================
+//============================================================================= 
 /** implements a component which allows browsing the data sources registered on the system.
 
     <p>
     This service implements a user interface for browsing data sources registered on the
     <type scope="com::sun::star::sdb">
     DatabaseContext
-    </type>
+    </type> 
     instance of the system.
     </p>
 
@@ -67,16 +67,16 @@ module com {  module sun {  module star {  module sdb {
     <p>
     Usually, you won't instantiate this service directly, instead you use the dispatch mechanisms
     of the application framework to load the URL <b>.component:DB/DataSourceBrowser</b> into an arbitrary
-    frame. This should involve a
+    frame. This should involve a 
     <type scope="com::sun::star::sdb">
     ContentLoader
-    </type>
+    </type> 
     service, which creates and initializes
     the browser.
     </p>
 
     <p>
-    Some aspects of the browser can be controlled from outside, eg.,
+    Some aspects of the browser can be controlled from outside, eg., 
     it is possible to dispatch a sort or filter
     request, if a table or query is being displayed.
     </p>
@@ -84,17 +84,17 @@ module com {  module sun {  module star {  module sdb {
     <p
     >The communication between the browser and external instances works in two ways.
     <br/>
-    The way <em>in</em> is provided by the
+    The way <em>in</em> is provided by the 
     <type scope="com::sun::star::frame">XDispatchProvider</type>
     interface the service exports (Please see below for more details on this).
     <br/>
-    The way <em>out</em> works in another way. There are several URL's which an external
-    instance can provide dispatches for (usually by implementing a
+    The way <em>out</em> works in another way. There are several URL's which an external 
+    instance can provide dispatches for (usually by implementing a 
     <type scope="com::sun::star::frame">XDispatchProviderInterceptor</type>
     for the parent frame of the browser), thus indicating that the browser should provide special functionality.
     <br/>
     In this case, the browser displays and maintains some additional slots (to be more concrete: toolbox items), which,
-    upon triggering, call the
+    upon triggering, call the 
     <member scope="com::sun::star::frame">XDispatch::dispatch()</member>methodoftheobject
     provided by the external instance.
     </p>
@@ -168,7 +168,7 @@ published service DataSourceBrowser
             (see <method scope="com::sun::star::awt">XTabController::getControls</method>)
             </li>
             <li>the data form used for displaying objects. As always for components implementing this service,
-            the object returned by
+            the object returned by 
             <method scope="com::sun::star::awt">XTabController::getModel</method>is a dataform.
             </li>
         </ul>
@@ -181,7 +181,7 @@ published service DataSourceBrowser
     interface com::sun::star::frame::XController;
 
     /** is used to initialize the browser.
-
+        
         <p>
         Parameters (passed to the method <member scope="com::sun::star::lang">XInitialization::initialize()</member>)
         have to be instances of <type scope="com::sun::star::beans">PropertyValue</type>, or
@@ -226,12 +226,12 @@ published service DataSourceBrowser
     interface com::sun::star::lang::XInitialization;
 
     /** is used to control the browser from outside.
-
+    
     <p>
-    You may use the
+    You may use the 
     <member scope="com::sun::star::frame">XDispatchProvider::queryDispatch</member>
     method
-    to query for objects which implement the
+    to query for objects which implement the 
     <type scope="com::sun::star::frame">XDispatch</type>
     interface,
     and which allow you to be notified on status changes and to dispatch special requests.
@@ -283,8 +283,8 @@ published service DataSourceBrowser
     */
     [optional] interface ::com::sun::star::ui::XContextMenuInterception;
 };
-
-//=============================================================================
-}; }; }; };
-
+ 
+//============================================================================= 
+}; }; }; }; 
+ 
 #endif
diff --git a/offapi/com/sun/star/sdb/DatabaseAccess.idl b/offapi/com/sun/star/sdb/DatabaseAccess.idl
index 8eb187384f35..1b80b0f54129 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccess.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,96 +24,96 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_DatabaseAccess_idl__
-#define __com_sun_star_sdb_DatabaseAccess_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
-#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
-
-
- module com {  module sun {  module star {  module sdb {
-
- published interface XDatabaseAccess;
- published interface XCompletedConnection;
-
-
+#ifndef __com_sun_star_sdb_DatabaseAccess_idl__ 
+#define __com_sun_star_sdb_DatabaseAccess_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__ 
+#include <com/sun/star/util/XNumberFormatsSupplier.idl> 
+#endif 
+ 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ published interface XDatabaseAccess; 
+ published interface XCompletedConnection; 
+ 
+ 
 /** specifies a component, which controls DatabaseAccessConnections and acts like a
     shared DataSource.
 
     @deprecated
  */
 published service DatabaseAccess
-{
+{ 
     // gives access to the properties.
-    interface com::sun::star::beans::XPropertySet;
-
+    interface com::sun::star::beans::XPropertySet; 
+ 
     /** controls the establishing of the connections.
      */
-    interface XDatabaseAccess;
-
-    /** establishing a connection with user interaction, the implementation
+    interface XDatabaseAccess; 
+     
+    /** establishing a connection with user interaction, the implementation 
              is optional.
      */
-    [optional] interface XCompletedConnection;
-
+    [optional] interface XCompletedConnection; 
+ 
     /** is the URL of the bean.
      */
-    [readonly, property] string URL;
-
+    [readonly, property] string URL; 
+ 
     /** is the title of the bean.
      */
-    [property] string Title;
-
+    [property] string Title; 
+ 
     /** indicates a database url of the form <br>
         <code> jdbc:<em>subprotocol</em>:<em>subname</em></code> or
         <code> sdbc:<em>subprotocol</em>:<em>subname</em></code>
      */
-    [property] string ConnectURL;
-
-    /** is a list of arbitrary string tag/value pairs as
-             connection arguments; normally at least a "user" and
+    [property] string ConnectURL; 
+ 
+    /** is a list of arbitrary string tag/value pairs as 
+             connection arguments; normally at least a "user" and 
              "password" property should be included.
      */
-    [property] sequence<com::sun::star::beans::PropertyValue> ConnectInfo;
-
+    [property] sequence<com::sun::star::beans::PropertyValue> ConnectInfo; 
+ 
     /** determines whether modifications on the data access bean are allowed
         or not.
      */
-    [readonly, property] boolean IsReadOnly;
-
+    [readonly, property] boolean IsReadOnly; 
+ 
     /** provides an object for formatting numbers.
      */
-    [property] com::sun::star::util::XNumberFormatsSupplier
-                        NumberFormatsSupplier;
-
-    /** indicates that a password is always necessary.
+    [property] com::sun::star::util::XNumberFormatsSupplier 
+                        NumberFormatsSupplier; 
+ 
+    /** indicates that a password is always necessary. 
      */
-    [optional, property] boolean IsPasswordRequired;
-
-    /** defines a list of tables, on which the bean should have it's focus.
+    [optional, property] boolean IsPasswordRequired; 
+ 
+    /** defines a list of tables, on which the bean should have it's focus. 
         If empty, all tables are rejected.
-    */
-    [optional, property] sequence<string> TableFilter;
-
-    /** defines a list of table types, on which the bean should have it's focus.
+    */	 
+    [optional, property] sequence<string> TableFilter; 
+ 
+    /** defines a list of table types, on which the bean should have it's focus. 
          If empty, all tables types are rejected.
      */
-    [optional, property] sequence<string> TableTypeFilter;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [optional, property] sequence<string> TableTypeFilter; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl b/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl
index 4eb54d7db00a..4e3b59e23937 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccessConnection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,77 +24,77 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_DatabaseAccessConnection_idl__
-#define __com_sun_star_sdb_DatabaseAccessConnection_idl__
-
-#ifndef __com_sun_star_container_XChild_idl__
-#include <com/sun/star/container/XChild.idl>
-#endif
-
-#ifndef __com_sun_star_sdbcx_DatabaseDefinition_idl__
-#include <com/sun/star/sdbcx/DatabaseDefinition.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_Connection_idl__
-#include <com/sun/star/sdbc/Connection.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
- published interface XQueriesSupplier;
- published interface XFormDocumentsSupplier;
- published interface XReportDocumentsSupplier;
- published interface XSQLQueryComposerFactory;
-
-
+#ifndef __com_sun_star_sdb_DatabaseAccessConnection_idl__ 
+#define __com_sun_star_sdb_DatabaseAccessConnection_idl__ 
+ 
+#ifndef __com_sun_star_container_XChild_idl__ 
+#include <com/sun/star/container/XChild.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbcx_DatabaseDefinition_idl__ 
+#include <com/sun/star/sdbcx/DatabaseDefinition.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_Connection_idl__ 
+#include <com/sun/star/sdbc/Connection.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ published interface XQueriesSupplier; 
+ published interface XFormDocumentsSupplier; 
+ published interface XReportDocumentsSupplier; 
+ published interface XSQLQueryComposerFactory; 
+ 
+ 
 /** specifies a component, which supplies and stores additional information related
     to a certain database connection, such as, DatabaseQueries, FormDocuments, and ReportDocuments.
     Objects for data definition are supplied as well, for instance, Tables, Views, etc.
-
+    
     <p>
-    Implements the service
+    Implements the service 
     <type scope="com::sun::star::sdbc">Connection</type>
     .
-    It is possible to open more than one connection at the same time, but the method
+    It is possible to open more than one connection at the same time, but the method 
     <member scope="com::sun::star::sdb">DatabaseAccessConnection::dispose()</member>
-    will close only one of these connections. You have to close all connections in order
+    will close only one of these connections. You have to close all connections in order 
     to close the connection to the database.
     </p>
 
     @deprecated
 */
 published service DatabaseAccessConnection
-{
-    /** supporting of the base connection service.
-             <p><B>Note:</B><br/>
-                 Don't use the "dispose" method of the XComponent interface, as the DataAccess
-                 uses a more sophisticated interface for closing a connection.
+{ 
+    /** supporting of the base connection service. 
+             <p><B>Note:</B><br/> 
+                 Don't use the "dispose" method of the XComponent interface, as the DataAccess 
+                 uses a more sophisticated interface for closing a connection. 
                  @see XDatabaseAccess
              </p>
      */
-    service com::sun::star::sdbc::Connection;
-
+    service com::sun::star::sdbc::Connection; 
+ 
     /** access to the DatabaseDefinition beans of the connection.
      */
-    service com::sun::star::sdbcx::DatabaseDefinition;
-
+    service com::sun::star::sdbcx::DatabaseDefinition; 
+ 
     /** access to the owning data access bean.
      */
-    interface com::sun::star::container::XChild;
-
+    interface com::sun::star::container::XChild; 
+ 
     /** returns a tool for composing queries.
      */
-    interface XSQLQueryComposerFactory;
-
+    interface XSQLQueryComposerFactory; 
+ 
     /** provides access to the queries.
     */
-    interface XQueriesSupplier;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    interface XQueriesSupplier; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/DatabaseAccessContext.idl b/offapi/com/sun/star/sdb/DatabaseAccessContext.idl
index 34922be1cdec..e6ec14dfd873 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccessContext.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccessContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_DatabaseAccessContext_idl__
-#define __com_sun_star_sdb_DatabaseAccessContext_idl__
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
-#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_util_XLocalizedAliases_idl__
-#include <com/sun/star/util/XLocalizedAliases.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XLocalizable_idl__
-#include <com/sun/star/lang/XLocalizable.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
+#ifndef __com_sun_star_sdb_DatabaseAccessContext_idl__ 
+#define __com_sun_star_sdb_DatabaseAccessContext_idl__ 
+ 
+#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
+#include <com/sun/star/container/XEnumerationAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XLocalizedAliases_idl__ 
+#include <com/sun/star/util/XLocalizedAliases.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XLocalizable_idl__ 
+#include <com/sun/star/lang/XLocalizable.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
 /** is the context for data access beans. It allows to register aliases for database
     access beans. It is possible to have different aliases for different locales.
-
-
+    
+    
     <p>
-    A DatabaseContext stores an alias for the URL of a database access component
+    A DatabaseContext stores an alias for the URL of a database access component 
     for a given locale. It is also allowed to work with a default locale. This is useful
     in connection with Enumeration or NameAccess to the context. In common use, the
     default language is set during the initialization of the component.
@@ -59,34 +59,34 @@
     The service also provides a default handling for locales, where an alias isn't
     set. The first time an alias is registered for a programmatic name, the alias
     becomes the default for all other known locales.
-
+    
     </p>@see com::sun::star::util::XLocalizedAliases
 
     @deprecated
  */
 published service DatabaseAccessContext
-{
+{ 
     /** Enumeration on all registered data sources for a default locale.
      */
-    interface com::sun::star::container::XEnumerationAccess;
-
+    interface com::sun::star::container::XEnumerationAccess; 
+ 
     /** NameAccess on all registered data sources for a default locale.
      */
-    interface com::sun::star::container::XNameAccess;
-
+    interface com::sun::star::container::XNameAccess; 
+ 
     /** Interface for registering aliases for data sources.
      */
-    interface com::sun::star::util::XLocalizedAliases;
-
+    interface com::sun::star::util::XLocalizedAliases; 
+ 
     /** Interface for setting and retrieving the default language.
      */
-    interface com::sun::star::lang::XLocalizable;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    interface com::sun::star::lang::XLocalizable; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl b/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl
index 2b133c83b832..99b08e7cf825 100644
--- a/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl
+++ b/offapi/com/sun/star/sdb/DatabaseAccessDataSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,15 +57,15 @@ published service DatabaseAccessDataSource
     interface com::sun::star::beans::XPropertySet;
     interface com::sun::star::sdbc::XDataSource;
 
-    /** is optional for implementation.
+    /** is optional for implementation. 
     */
     [optional] interface XCompletedConnection;
 
-    /** locates the database access bean.
+    /** locates the database access bean. 
     */
     [property] string URL;
 
-    /** determines the password handling.
+    /** determines the password handling. 
     */
     [optional, property] com::sun::star::ucb::RememberAuthentication PasswordMode;
 };
diff --git a/offapi/com/sun/star/sdb/DatabaseContext.idl b/offapi/com/sun/star/sdb/DatabaseContext.idl
index d2e660058e70..c727733e3f0c 100644
--- a/offapi/com/sun/star/sdb/DatabaseContext.idl
+++ b/offapi/com/sun/star/sdb/DatabaseContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_DatabaseContext_idl__
-#define __com_sun_star_sdb_DatabaseContext_idl__
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
-#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
-#include <com/sun/star/container/XContainer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
-#include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XNamingService_idl__
-#include <com/sun/star/uno/XNamingService.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
+#ifndef __com_sun_star_sdb_DatabaseContext_idl__ 
+#define __com_sun_star_sdb_DatabaseContext_idl__ 
+ 
+#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
+#include <com/sun/star/container/XEnumerationAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XContainer_idl__ 
+#include <com/sun/star/container/XContainer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__ 
+#include <com/sun/star/lang/XSingleServiceFactory.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_XNamingService_idl__ 
+#include <com/sun/star/uno/XNamingService.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
 
 published interface XDatabaseRegistrations;
 
 /** is the context for accessing datasource.
-
+    
     <p>
-    A datasource contains information how to create a connection to a database, such as,
-    which database driver should be used, for which user should a connection be established, etc.
+    A datasource contains information how to create a connection to a database, such as, 
+    which database driver should be used, for which user should a connection be established, etc. 
     <br/>
-    The context stores datasources under a given name.
-
+    The context stores datasources under a given name. 
+    
     </p>
     @see com::sun::star::sdb::DataSource
  */
 published service DatabaseContext
-{
+{ 
     /** Enumeration on all registered data sources.
      */
-    interface com::sun::star::container::XEnumerationAccess;
-
+    interface com::sun::star::container::XEnumerationAccess; 
+ 
     /** NameAccess on all registered data sources.
-        <p>One exception is the <method "com.sun.star.container.XNameAccess">getByName</method>, this method also allows to ask
-        for a <member "DataAccessDescriptor">DatabaseLocation</member>.
+        <p>One exception is the <method "com.sun.star.container.XNameAccess">getByName</method>, this method also allows to ask 
+        for a <member "DataAccessDescriptor">DatabaseLocation</member>. 
         </p>
      */
-    interface com::sun::star::container::XNameAccess;
-
+    interface com::sun::star::container::XNameAccess;  
+     
     /** Interface for registering new datasources.
      */
-    interface com::sun::star::uno::XNamingService;
+    interface com::sun::star::uno::XNamingService;	 
 
     /** Interface for registering listener to get notified when new datasources are created or removed.
     */
@@ -99,12 +99,12 @@ published service DatabaseContext
         @since OpenOffice.org 3.3
     */
     [optional] interface XDatabaseRegistrations;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/DatabaseDocument.idl b/offapi/com/sun/star/sdb/DatabaseDocument.idl
index b7a626579ec5..6cfd84698133 100644
--- a/offapi/com/sun/star/sdb/DatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/DatabaseDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_DatabaseDocument_idl__
-#define __com_sun_star_sdb_DatabaseDocument_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_XProtectable_idl__
-#include <com/sun/star/util/XProtectable.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
- published interface XDataDescriptorFactory;
- published interface XRename;
-};};};};
-
- module com {  module sun {  module star {  module sdb {
-
+#ifndef __com_sun_star_sdb_DatabaseDocument_idl__ 
+#define __com_sun_star_sdb_DatabaseDocument_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XProtectable_idl__ 
+#include <com/sun/star/util/XProtectable.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ published interface XDataDescriptorFactory; 
+ published interface XRename; 
+};};};}; 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
 /** specifies a link to a document associated with a database document
     @since OOo 2.0.0
     @deprecated
  */
 published service DatabaseDocument
-{
+{ 
     // gives access to the properties.
-    interface com::sun::star::beans::XPropertySet;
-
+    interface com::sun::star::beans::XPropertySet; 
+    
     // allows to create new DatabaseDocument objects
-    interface com::sun::star::sdbcx::XDataDescriptorFactory;
+    interface com::sun::star::sdbcx::XDataDescriptorFactory; 
 
     // allows to rename the object.
-    interface com::sun::star::sdbcx::XRename;
-
+    interface com::sun::star::sdbcx::XRename; 
+     
     /** is the name of the document.
      */
-    [readonly, property] string Name;
-
-
+    [readonly, property] string Name; 
+ 
+     
     /** is the URL of the document.
      */
-    [readonly, property] string URL;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [readonly, property] string URL; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/DatabaseEnvironment.idl b/offapi/com/sun/star/sdb/DatabaseEnvironment.idl
index 72af2c84e7e8..9cc5a4efc123 100644
--- a/offapi/com/sun/star/sdb/DatabaseEnvironment.idl
+++ b/offapi/com/sun/star/sdb/DatabaseEnvironment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_DatabaseEnvironment_idl__
-#define __com_sun_star_sdb_DatabaseEnvironment_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
-#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
-
-
- module com {  module sun {  module star {  module sdb {
-
- published interface XDatabaseEnvironment;
-
-
-/** @deprecated
+#ifndef __com_sun_star_sdb_DatabaseEnvironment_idl__ 
+#define __com_sun_star_sdb_DatabaseEnvironment_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__ 
+#include <com/sun/star/util/XNumberFormatsSupplier.idl> 
+#endif 
+ 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ published interface XDatabaseEnvironment; 
+ 
+ 
+/** @deprecated 
     is the top level service for accessing database components.
-
-
-
+    
+    
+    
     <p>It enables the service user to establish connections to databases
     or to use database access beans to gain access to database components.
     This service takes control over all other database services.</p>
  */
 published service DatabaseEnvironment
-{
-    interface XDatabaseEnvironment;
-
-    interface com::sun::star::beans::XPropertySet;
-
-
+{ 
+    interface XDatabaseEnvironment; 
+    
+    interface com::sun::star::beans::XPropertySet; 
+ 
+     
     /** provides an object for formatting numbers.
      */
-    [readonly, property] com::sun::star::util::XNumberFormatsSupplier
-                               NumberFormatsSupplier;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [readonly, property] com::sun::star::util::XNumberFormatsSupplier 
+                               NumberFormatsSupplier; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl b/offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl
index 891929514826..b507f08316cd 100644
--- a/offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl
+++ b/offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,16 +27,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_InteractionHandler_idl__
-#define __com_sun_star_sdb_InteractionHandler_idl__
-
+#ifndef __com_sun_star_sdb_InteractionHandler_idl__ 
+#define __com_sun_star_sdb_InteractionHandler_idl__ 
+ 
 module com { module sun { module star { module task {
     interface XInteractionHandler2;
 }; }; }; };
+ 
+module com {  module sun {  module star {  module sdb { 
 
-module com {  module sun {  module star {  module sdb {
-
-/** describes a service which is able to handle database-related interactions.
+/**	describes a service which is able to handle database-related interactions.
 
     <p>Usually, you will not instantiate this service directly. Instead, you'll instantiate a generic
     <type scope="com::sun::star::task">InteractionHandler</type> service, and pass it your request. Based on
@@ -64,8 +64,8 @@ module com {  module sun {  module star {  module sdb {
 */
 service DatabaseInteractionHandler: com::sun::star::task::XInteractionHandler2;
 
-//=============================================================================
-
-}; }; }; };
-
-#endif
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/DatabaseRegistrationEvent.idl b/offapi/com/sun/star/sdb/DatabaseRegistrationEvent.idl
index f8bd571c5f8e..24e6693f5867 100644
--- a/offapi/com/sun/star/sdb/DatabaseRegistrationEvent.idl
+++ b/offapi/com/sun/star/sdb/DatabaseRegistrationEvent.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module sdb {
+module com { module sun { module star { module sdb { 
 
 //=============================================================================
 
@@ -54,7 +54,7 @@ struct DatabaseRegistrationEvent : ::com::sun::star::lang::EventObject
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl b/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl
index 79d5b31e6cbf..2d4ea77adab4 100644
--- a/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl
+++ b/offapi/com/sun/star/sdb/DatasourceAdministrationDialog.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,37 +25,37 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_sdb_DatasourceAdministrationDialog_idl__
-#define __com_sun_star_sdb_DatasourceAdministrationDialog_idl__
-
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
-#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
+#ifndef __com_sun_star_sdb_DatasourceAdministrationDialog_idl__ 
+#define __com_sun_star_sdb_DatasourceAdministrationDialog_idl__ 
+ 
+#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__ 
+#include <com/sun/star/ui/dialogs/XExecutableDialog.idl> 
+#endif 
 
-#ifndef __com_sun_star_awt_XWindow_idl__
-#include <com/sun/star/awt/XWindow.idl>
-#endif
+#ifndef __com_sun_star_awt_XWindow_idl__ 
+#include <com/sun/star/awt/XWindow.idl> 
+#endif 
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
-#include <com/sun/star/lang/XInitialization.idl>
-#endif
+#ifndef __com_sun_star_lang_XInitialization_idl__ 
+#include <com/sun/star/lang/XInitialization.idl> 
+#endif 
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module sdb {
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module sdb { 
+ 
 
 /** provides a user interface for administrating the system wide registered data sources.
     <p>
     Here, <em>system wide registered</em> means registered on the (one and only) instance
-    of the
+    of the 
     <type scope="com::sun::star::sdb">
     DatabaseContext
-    </type>
+    </type> 
     service.
     </p>
 */
@@ -83,25 +83,25 @@ published service DatasourceAdministrationDialog
     /** allows initializing the dialog
         <p>
         You do not need to call the initialize method directly, instead you may use the createInstanceWithArguments
-        method of your
+        method of your 
         <type scope="com::sun::star::lang">XMultiServiceFactory</type>
         .
         </p>
 
         <p>
-        You specify a parameter by passing one (or more)
+        You specify a parameter by passing one (or more) 
         <type scope="com::sun::star::beans">PropertyValue</type>
         object(s) to the initialize method, where the <em>Name</em> field contains a string describing which aspect
         you want to affect, and the <em>Value</em> field containing a value.
         <br/>
-        Imagine the initialization values as if you use setPropertyValue of the
+        Imagine the initialization values as if you use setPropertyValue of the 
         <type scope="com::sun::star::beans">XPropertySet</type>
         interface ...
         <br/>
         allowed parameters are
         <ul>
             <li><b>Title</b><br/>
-                String describing the initial title of the dialog.
+                String describing the initial title of the dialog. 
                 If not specified, a default title is used.
             </li>
             <li><b>ParentWindow</b><br/>
@@ -109,7 +109,7 @@ published service DatasourceAdministrationDialog
                 describing the parent window to use for the dialog.
             </li>
             <li><b>InitialSelection</b><br/>
-                String or XDataSource describing which data source should be selected initially.
+                String or XDataSource describing which data source should be selected initially. 
                 This String name must be known to the
                 <type scope="com::sun::star::sdb">
                 DatabaseContext
@@ -121,9 +121,9 @@ published service DatasourceAdministrationDialog
     */
     interface com::sun::star::lang::XInitialization;
 };
-
-//=============================================================================
-
-}; }; }; };
-
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
 #endif
diff --git a/offapi/com/sun/star/sdb/DefinitionContainer.idl b/offapi/com/sun/star/sdb/DefinitionContainer.idl
index d7206c40ab19..30fcee42e943 100644
--- a/offapi/com/sun/star/sdb/DefinitionContainer.idl
+++ b/offapi/com/sun/star/sdb/DefinitionContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,7 +56,7 @@
     </p>
     <p>
     To reflect the changes with the underlying database, a refresh mechanism
-    needs to be supported.
+    needs to be supported. 
     </p>
  */
 published service DefinitionContainer
diff --git a/offapi/com/sun/star/sdb/DefinitionContent.idl b/offapi/com/sun/star/sdb/DefinitionContent.idl
index d5ce22d9ff09..8fd62d2c17aa 100644
--- a/offapi/com/sun/star/sdb/DefinitionContent.idl
+++ b/offapi/com/sun/star/sdb/DefinitionContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module sdb {
+module com { module sun { module star { module sdb { 
 
 //=============================================================================
 
@@ -68,7 +68,7 @@ service DefinitionContent
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/Document.idl b/offapi/com/sun/star/sdb/Document.idl
index c442929d4572..1afce66dcad9 100644
--- a/offapi/com/sun/star/sdb/Document.idl
+++ b/offapi/com/sun/star/sdb/Document.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,17 +37,17 @@ module com { module sun { module star { module sdb {
 
     <p>
     These documents typically process information from a connected
-    data source. A
+    data source. A 
     <type>
     Document
-    </type>
-    could be a form or a report.
+    </type> 
+    could be a form or a report.	
 
 @deprecated
 */
 published service Document
 {
-    interface com::sun::star::beans::XPropertySet;
+    interface com::sun::star::beans::XPropertySet;	
 
     /** is the name of the document. If the document is part of the container,
         it is not possible to alter the name.*/
diff --git a/offapi/com/sun/star/sdb/DocumentContainer.idl b/offapi/com/sun/star/sdb/DocumentContainer.idl
index 31a7128022c7..a64e063ee4f0 100644
--- a/offapi/com/sun/star/sdb/DocumentContainer.idl
+++ b/offapi/com/sun/star/sdb/DocumentContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 #include <com/sun/star/sdb/DefinitionContent.idl>
 #endif
 
-
+ 
  module com {  module sun {  module star {  module lang {
  published interface XMultiServiceFactory;
 };};};};
@@ -46,7 +46,7 @@
   module com {  module sun {  module star {  module container {
  published interface XHierarchicalNameContainer;
 };};};};
-
+ 
 
  module com {  module sun {  module star {  module sdb {
 
@@ -91,17 +91,17 @@ service DocumentContainer
         URL: describes the name of the document definition to load,
         TargetFrameName: isn't used.
         SearchFlags: isn't used.
-        Arguments:
+        Arguments: 
         <ol>
             <li>PropertyValue</li>
                 Name = ActiveConnection
                 Value = The connection which should be used when opening the text document.
             <li>PropertyValue</li>
                 Name = OpenMode
-                Value = string, "open" if the document should be opened in live mode (editing is not possible),
+                Value = string, "open" if the document should be opened in live mode (editing is not possible), 
                                 "openDesign" if the document should be open in design mode (editing is possible)
         </ol>
-        @see com::sun::star::sdbc::XConnection
+        @see com::sun::star::sdbc::XConnection 
         </p>
     */
     interface com::sun::star::frame::XComponentLoader;
diff --git a/offapi/com/sun/star/sdb/DocumentDataSource.idl b/offapi/com/sun/star/sdb/DocumentDataSource.idl
index 818d7645b2a0..e9ad6f8a13b7 100644
--- a/offapi/com/sun/star/sdb/DocumentDataSource.idl
+++ b/offapi/com/sun/star/sdb/DocumentDataSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_DocumentDataSource_idl__
-#define __com_sun_star_sdb_DocumentDataSource_idl__
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
+#ifndef __com_sun_star_sdb_DocumentDataSource_idl__ 
+#define __com_sun_star_sdb_DocumentDataSource_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
 #ifndef __com_sun_star_sdb_XDocumentDataSource_idl__
-#include <com/sun/star/sdb/XDocumentDataSource.idl>
+#include <com/sun/star/sdb/XDocumentDataSource.idl> 
 #endif
 #ifndef __com_sun_star_sdb_DataSource_idl__
-#include <com/sun/star/sdb/DataSource.idl>
+#include <com/sun/star/sdb/DataSource.idl> 
 #endif
-//=============================================================================
-
- module com {  module sun {  module star {  module sdb {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+//============================================================================= 
 
 /** simplifies the accessing of data sources and it's corresponding database document.
-
+    
     @see DataSource
     @see XDocumentDataSource
  */
@@ -53,13 +53,13 @@ service DocumentDataSource
     service DataSource;
     interface XDocumentDataSource;
 };
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
 
 
diff --git a/offapi/com/sun/star/sdb/DocumentDefinition.idl b/offapi/com/sun/star/sdb/DocumentDefinition.idl
index c8f07fb69a18..e3930a1de321 100644
--- a/offapi/com/sun/star/sdb/DocumentDefinition.idl
+++ b/offapi/com/sun/star/sdb/DocumentDefinition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sdb/DocumentSaveRequest.idl b/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
index f3a90b4f467f..a6b726c642ac 100644
--- a/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
+++ b/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,22 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_DocumentSaveRequest_idl__
-#define __com_sun_star_sdb_DocumentSaveRequest_idl__
-
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
-#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-#ifndef __com_sun_star_ucb_XContent_idl__
-#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sdb {
-
-//=============================================================================
-
+#ifndef __com_sun_star_sdb_DocumentSaveRequest_idl__ 
+#define __com_sun_star_sdb_DocumentSaveRequest_idl__ 
+ 
+#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__ 
+#include <com/sun/star/task/ClassifiedInteractionRequest.idl> 
+#endif 
+#ifndef __com_sun_star_ucb_XContent_idl__ 
+#include <com/sun/star/ucb/XContent.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+//============================================================================= 
+ 
 /** an error specifying the lack of a document name
     <p>
     Usually thrown if someone tries to save a document which hasn't a name yet.
@@ -47,9 +47,9 @@
     @since OOo 2.0.0
 */
 exception DocumentSaveRequest: com::sun::star::task::ClassifiedInteractionRequest
-{
+{ 
     /** specifies the content where the document should save inside.
-        Somebody handling the request could, e.g., use the content as root content
+        Somebody handling the request could, e.g., use the content as root content 
         to display the hierarchy of the sub contents.
     */
     com::sun::star::ucb::XContent Content;
@@ -57,14 +57,14 @@ exception DocumentSaveRequest: com::sun::star::task::ClassifiedInteractionReques
     /** The default name of the document, may be empty.
      */
     string Name;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
 
diff --git a/offapi/com/sun/star/sdb/ErrorCondition.idl b/offapi/com/sun/star/sdb/ErrorCondition.idl
index 5336d05d52c1..38d166739d87 100644
--- a/offapi/com/sun/star/sdb/ErrorCondition.idl
+++ b/offapi/com/sun/star/sdb/ErrorCondition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sdb/ErrorMessageDialog.idl b/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
index 07f3514a4ca8..d1d160271514 100644
--- a/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
+++ b/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,29 +25,29 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_sdb_ErrorMessageDialog_idl__
-#define __com_sun_star_sdb_ErrorMessageDialog_idl__
-
-#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
-#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
-#endif
+#ifndef __com_sun_star_sdb_ErrorMessageDialog_idl__ 
+#define __com_sun_star_sdb_ErrorMessageDialog_idl__ 
+ 
+#ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__ 
+#include <com/sun/star/ui/dialogs/XExecutableDialog.idl> 
+#endif 
 
-#ifndef __com_sun_star_awt_XWindow_idl__
-#include <com/sun/star/awt/XWindow.idl>
-#endif
+#ifndef __com_sun_star_awt_XWindow_idl__ 
+#include <com/sun/star/awt/XWindow.idl> 
+#endif 
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
-#include <com/sun/star/lang/XInitialization.idl>
-#endif
+#ifndef __com_sun_star_lang_XInitialization_idl__ 
+#include <com/sun/star/lang/XInitialization.idl> 
+#endif 
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module sdb {
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module sdb { 
+ 
 
 /** provides a dialog for displaying database related exceptions.
     <p>
@@ -55,23 +55,23 @@ module com {  module sun {  module star {  module sdb {
     <module scope="com.sun.star">
     sdbc
     </module>
-    ,
+    , 
     <module scope="com.sun.star">
     sdbcx
     </module>
-     and
+     and 
      <module scope="com.sun.star">
      sdb
      </module>
      ,
-    they will - sooner or later - encounter
+    they will - sooner or later - encounter 
     <type scope="com::sun::star::sdbc">SQLException</type>
     's.
     <br/>
-    These exceptions can be chained, so the information wrapped in one single
+    These exceptions can be chained, so the information wrapped in one single 
     <type scope="com::sun::star::sdbc">SQLException</type>
     can be rather complex (e.g., every instance where such an exception is passing before it is finally caught, could
-    append a
+    append a 
     <type scope="com::sun::star::sdb">SQLContext</type>
     to explain what it was doing), and they should be
     presented to the user in a consistent way.
@@ -95,7 +95,7 @@ published service ErrorMessageDialog
 
     /** is the exception displayed by the dialog
         <p>
-        This should contain a
+        This should contain a 
         <type scope="com::sun::star::sdbc">SQLException</type>
         instance, or an instance
         of any class derived from this exception.
@@ -124,20 +124,20 @@ published service ErrorMessageDialog
     /** allows initializing the dialog
         <p>
         You do not need to call the initialize method directly, instead you may use the createInstanceWithArguments
-        method of your
+        method of your 
         <type scope="com::sun::star::lang">XMultiServiceFactory</type>
         .
         </p>
         <p>
-        You specify a parameter by passing one (or more)
+        You specify a parameter by passing one (or more) 
         <type scope="com::sun::star::beans">PropertyValue</type>
         object(s) to the initialize method, where the <em>Name</em> field contains a string describing which aspect
         you want to affect, and the <em>Value</em> field containing a value.
         <br/>
-        Imagine the initialization values, as if you use
+        Imagine the initialization values, as if you use 
         <method scope="com::sun::star::beans">XPropertySet::setPropertyValue()
         </method>
-         of the
+         of the 
         <type scope="com::sun::star::beans">XPropertySet</type>
         interface ...
         <br/>
@@ -153,7 +153,7 @@ published service ErrorMessageDialog
             <li><b>SQLException</b><br/>
                 <type scope="com::sun::star::sdbc">SQLException</type>
                 describing the error which is beeing displayed.<br/>
-                When initializing this value, you may use any derivative of
+                When initializing this value, you may use any derivative of 
                 <type scope="com::sun::star::sdbc">SQLException</type>
                 .
             </li>
@@ -162,10 +162,10 @@ published service ErrorMessageDialog
     */
     interface com::sun::star::lang::XInitialization;
 };
-
-//=============================================================================
-
-}; }; }; };
-
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
 #endif
 
diff --git a/offapi/com/sun/star/sdb/Forms.idl b/offapi/com/sun/star/sdb/Forms.idl
index 42d2f0dd3330..66a0c20124b8 100644
--- a/offapi/com/sun/star/sdb/Forms.idl
+++ b/offapi/com/sun/star/sdb/Forms.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 #include <com/sun/star/sdb/DocumentContainer.idl>
 #endif
 
-
+ 
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/InteractionHandler.idl b/offapi/com/sun/star/sdb/InteractionHandler.idl
index e76ef3d66f34..5254ea0649b6 100644
--- a/offapi/com/sun/star/sdb/InteractionHandler.idl
+++ b/offapi/com/sun/star/sdb/InteractionHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_InteractionHandler_idl__
-#define __com_sun_star_sdb_InteractionHandler_idl__
-
+#ifndef __com_sun_star_sdb_InteractionHandler_idl__ 
+#define __com_sun_star_sdb_InteractionHandler_idl__ 
+ 
 module com { module sun { module star { module task {
     published interface XInteractionHandler;
 }; }; }; };
+ 
+module com {  module sun {  module star {  module sdb { 
 
-module com {  module sun {  module star {  module sdb {
-
-/** is a service for user interaction for databases.
+/**	is a service for user interaction for databases.
     @deprecated
         Do not use this service anymore. Instead, create a generic <type scope="com::sun::star::task">InteractionHandler</type>
         instance, and pass it your request. It will determine, based on configuration data, which concrete interaction
@@ -42,8 +42,8 @@ module com {  module sun {  module star {  module sdb {
 */
 published service InteractionHandler: com::sun::star::task::XInteractionHandler;
 
-//=============================================================================
-
-}; }; }; };
-
-#endif
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl b/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
index afbf45b192bb..cbcba773fee3 100644
--- a/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_OfficeDatabaseDocument_idl__
-#define __com_sun_star_sdb_OfficeDatabaseDocument_idl__
-
+#ifndef __com_sun_star_sdb_OfficeDatabaseDocument_idl__ 
+#define __com_sun_star_sdb_OfficeDatabaseDocument_idl__ 
+ 
 #ifndef __com_sun_star_document_OfficeDocument_idl__
 #include <com/sun/star/document/OfficeDocument.idl>
 #endif
 #ifndef __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
-#include <com/sun/star/sdb/XOfficeDatabaseDocument.idl>
+#include <com/sun/star/sdb/XOfficeDatabaseDocument.idl> 
 #endif
 #ifndef __com_sun_star_document_XDocumentEventBroadcaster_idl__
-#include <com/sun/star/document/XDocumentEventBroadcaster.idl>
+#include <com/sun/star/document/XDocumentEventBroadcaster.idl> 
 #endif
 #ifndef __com_sun_star_script_provider_XScriptProviderSupplier_idl__
-#include <com/sun/star/script/provider/XScriptProviderSupplier.idl>
+#include <com/sun/star/script/provider/XScriptProviderSupplier.idl> 
 #endif
 #ifndef __com_sun_star_frame_XLoadable_idl__
-#include <com/sun/star/frame/XLoadable.idl>
+#include <com/sun/star/frame/XLoadable.idl> 
 #endif
 #ifndef __com_sun_star_util_XCloseable_idl__
-#include <com/sun/star/util/XCloseable.idl>
+#include <com/sun/star/util/XCloseable.idl> 
 #endif
 
-module com {  module sun {  module star {  module sdb {
-
+module com {  module sun {  module star {  module sdb { 
+ 
 /** specifies a office database document which is a storable document.
-
+    
     <p>These documents contain information about forms, and reports, and the properties of a data source.</p>
 
     <p>The database document contains no data per default. The following is stored inside the document:
@@ -65,8 +65,8 @@ module com {  module sun {  module star {  module sdb {
     @see com::sun::star::document::OfficeDocument
     @since OOo 2.0.0
  */
-service OfficeDatabaseDocument
-{
+service OfficeDatabaseDocument 
+{ 
     /** specifies basic functionality of a document in OpenOffice.org
 
         <p>Note that a database document actually does not support the <type scope="com::sun::star::view">XPrintable</type> interface.
@@ -238,13 +238,13 @@ service OfficeDatabaseDocument
         by the first client.</p>
     */
     interface com::sun::star::util::XCloseable;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
 
diff --git a/offapi/com/sun/star/sdb/OrderColumn.idl b/offapi/com/sun/star/sdb/OrderColumn.idl
index baaaa4ae1416..0bbdd58098fb 100644
--- a/offapi/com/sun/star/sdb/OrderColumn.idl
+++ b/offapi/com/sun/star/sdb/OrderColumn.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_OrderColumn_idl__
-#define __com_sun_star_sdb_OrderColumn_idl__
+#ifndef __com_sun_star_sdb_OrderColumn_idl__ 
+#define __com_sun_star_sdb_OrderColumn_idl__ 
 
-#ifndef __com_sun_star_sdbcx_Column_idl__
-#include <com/sun/star/sdbcx/Column.idl>
-#endif
+#ifndef __com_sun_star_sdbcx_Column_idl__ 
+#include <com/sun/star/sdbcx/Column.idl> 
+#endif 
 
-module com {  module sun {  module star {  module sdb {
+module com {  module sun {  module star {  module sdb { 
 
 /** describes a column which is part of the ORDER clause.
 
@@ -39,17 +39,17 @@ module com {  module sun {  module star {  module sdb {
 */
 service OrderColumn
 {
-    service com::sun::star::sdbcx::Column;
+    service com::sun::star::sdbcx::Column; 
 
     /** describes which sort order this column has..
         The default is <TRUE/>.
     */
-    [property] boolean IsAscending;
+    [property] boolean IsAscending; 
 };
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/ParametersRequest.idl b/offapi/com/sun/star/sdb/ParametersRequest.idl
index 547c49e7fd4b..156bdc4d044e 100644
--- a/offapi/com/sun/star/sdb/ParametersRequest.idl
+++ b/offapi/com/sun/star/sdb/ParametersRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_ParametersRequest_idl__
-#define __com_sun_star_sdb_ParametersRequest_idl__
-
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
-#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XConnection_idl__
-#include <com/sun/star/sdbc/XConnection.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sdb {
-
-//=============================================================================
+#ifndef __com_sun_star_sdb_ParametersRequest_idl__ 
+#define __com_sun_star_sdb_ParametersRequest_idl__ 
+ 
+#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__ 
+#include <com/sun/star/task/ClassifiedInteractionRequest.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+#ifndef __com_sun_star_sdbc_XConnection_idl__ 
+#include <com/sun/star/sdbc/XConnection.idl> 
+#endif 
 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+//============================================================================= 
+ 
 /** an error specifying the lack of parameters values
     <p>
     Usually thrown if someone tries to execute an SQL statement containing
@@ -51,9 +51,9 @@
     </p>
 */
 published exception ParametersRequest: com::sun::star::task::ClassifiedInteractionRequest
-{
+{ 
     /** is the list of parameters requested.
-        The objects returned by the
+        The objects returned by the 
         <type scope="com::sun::star::container">XIndexAccess</type>
         have to
         be property sets describing the respective parameter. For this, the objects have to support the
@@ -65,14 +65,14 @@ published exception ParametersRequest: com::sun::star::task::ClassifiedInteracti
         Somebody handling the request could, e.g., use the connection for determining
         the identifier quote string, etc.
     */
-    com::sun::star::sdbc::XConnection       Connection;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::sdbc::XConnection		Connection; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/PreparedStatement.idl b/offapi/com/sun/star/sdb/PreparedStatement.idl
index 1ff4883e12df..3bec0ef05798 100644
--- a/offapi/com/sun/star/sdb/PreparedStatement.idl
+++ b/offapi/com/sun/star/sdb/PreparedStatement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_PreparedStatement_idl__
-#define __com_sun_star_sdb_PreparedStatement_idl__
-
-#ifndef __com_sun_star_sdbc_PreparedStatement_idl__
-#include <com/sun/star/sdbc/PreparedStatement.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
- published interface XColumnsSupplier;
-};};};};
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_PreparedStatement_idl__ 
+#define __com_sun_star_sdb_PreparedStatement_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_PreparedStatement_idl__ 
+#include <com/sun/star/sdbc/PreparedStatement.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ published interface XColumnsSupplier; 
+};};};}; 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** represents a precompiled SQL statement. The service differs only in the access
-    of the columns and parameters to the service
+    of the columns and parameters to the service 
     <type scope="com::sun::star::sdbc">PreparedStatement</type>
     .
  */
 published service PreparedStatement
-{
-    service com::sun::star::sdbc::PreparedStatement;
-
-
+{ 
+    service com::sun::star::sdbc::PreparedStatement; 
+ 
+     
     /** access to the resulting columns of the statement.
      */
-    interface com::sun::star::sdbcx::XColumnsSupplier;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    interface com::sun::star::sdbcx::XColumnsSupplier; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/Query.idl b/offapi/com/sun/star/sdb/Query.idl
index d5fbe5e3579c..80e97ee7c77e 100644
--- a/offapi/com/sun/star/sdb/Query.idl
+++ b/offapi/com/sun/star/sdb/Query.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_Query_idl__
-#define __com_sun_star_sdb_Query_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
- published interface XDataDescriptorFactory;
- published interface XColumnsSupplier;
- published interface XRename;
-};};};};
-
-#ifndef __com_sun_star_sdb_DataSettings_idl__
-#include <com/sun/star/sdb/DataSettings.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_QueryDefinition_idl__
-#include <com/sun/star/sdb/QueryDefinition.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_Query_idl__ 
+#define __com_sun_star_sdb_Query_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ published interface XDataDescriptorFactory; 
+ published interface XColumnsSupplier; 
+ published interface XRename; 
+};};};}; 
+ 
+#ifndef __com_sun_star_sdb_DataSettings_idl__ 
+#include <com/sun/star/sdb/DataSettings.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdb_QueryDefinition_idl__ 
+#include <com/sun/star/sdb/QueryDefinition.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** is a stored definition of a SQL query.
-
+        
     <p>
     It can be used if there is a need to execute SQL statements more than once, or
     if you want to format the query result fields differently from the
@@ -57,35 +57,35 @@
     </p>
  */
 published service Query
-{
-
+{ 
+     
     /** defines the command of the query.
      */
-    service com::sun::star::sdb::QueryDefinition;
-
-
+    service com::sun::star::sdb::QueryDefinition; 
+     
+     
     /** is used for customization of data appearance.
      */
-    service com::sun::star::sdb::DataSettings;
-
-
+    service com::sun::star::sdb::DataSettings;	 
+     
+     
     /** is provided for creation of a new query descriptor based on the current information.
      */
-    interface com::sun::star::sdbcx::XDataDescriptorFactory;
-
+    interface com::sun::star::sdbcx::XDataDescriptorFactory; 
+     
     // allows to rename the object.
-    interface com::sun::star::sdbcx::XRename;
-
-
+    interface com::sun::star::sdbcx::XRename; 
+ 
+     
     /** access to the columns of the results sets query.
      */
-    interface com::sun::star::sdbcx::XColumnsSupplier;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    interface com::sun::star::sdbcx::XColumnsSupplier;	 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/QueryDefinition.idl b/offapi/com/sun/star/sdb/QueryDefinition.idl
index 8c995a64aba2..035a4f6a4012 100644
--- a/offapi/com/sun/star/sdb/QueryDefinition.idl
+++ b/offapi/com/sun/star/sdb/QueryDefinition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,65 +24,65 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_QueryDefinition_idl__
-#define __com_sun_star_sdb_QueryDefinition_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_QueryDefinition_idl__ 
+#define __com_sun_star_sdb_QueryDefinition_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** is a stored definition of a SQL "Select statement".
-
+    
     <p>
-    It can be used, if there is a need to execute SQL statement more than once.
+    It can be used, if there is a need to execute SQL statement more than once.	
     </p>
  */
 published service QueryDefinition
-{
-
+{ 
+     
     /** access to the owning database definition object.
      */
-    interface com::sun::star::beans::XPropertySet;
-
-
+    interface com::sun::star::beans::XPropertySet;		 
+     
+     
     /** is the name of the definition.
      */
-    [readonly, property] string Name;
-
-
+    [readonly, property] string Name; 
+ 
+     
     /** is the command of the query, this is typically a select statement.
      */
-    [property] string Command;
-
-
+    [property] string Command; 
+ 
+     
     /** should we use escape processing for the query.
      */
-    [property] boolean EscapeProcessing;
-
-
+    [property] boolean EscapeProcessing;	 
+ 
+     
     /** is the name of the table which should be updated. This is usually used
         for queries which relate on more than one table.
      */
-    [property] string UpdateTableName;
-
-
+    [property] string UpdateTableName; 
+ 
+     
     /** is the name of the update table catalog.
      */
-    [property] string UpdateCatalogName;
-
-
+    [property] string UpdateCatalogName; 
+ 
+     
     /** is the name of the update table schema.
      */
-    [property] string UpdateSchemaName;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [property] string UpdateSchemaName;	 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/QueryDescriptor.idl b/offapi/com/sun/star/sdb/QueryDescriptor.idl
index 89845599c309..f39091eef070 100644
--- a/offapi/com/sun/star/sdb/QueryDescriptor.idl
+++ b/offapi/com/sun/star/sdb/QueryDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_QueryDescriptor_idl__
-#define __com_sun_star_sdb_QueryDescriptor_idl__
-
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
-#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
- published interface XDataDescriptorFactory;
- published interface XColumnsSupplier;
-};};};};
-
-#ifndef __com_sun_star_sdb_DataSettings_idl__
-#include <com/sun/star/sdb/DataSettings.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_QueryDescriptor_idl__ 
+#define __com_sun_star_sdb_QueryDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
+#include <com/sun/star/sdbcx/Descriptor.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ published interface XDataDescriptorFactory; 
+ published interface XColumnsSupplier; 
+};};};}; 
+ 
+#ifndef __com_sun_star_sdb_DataSettings_idl__ 
+#include <com/sun/star/sdb/DataSettings.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** is a stored definition of a SQL "Select statement".
-
+    
     <p>
     It can be used, if there is a need to execute SQL statement more than once or
     if you want to format the query result fields different from the
@@ -52,55 +52,55 @@
     </p>
  */
 published service QueryDescriptor
-{
-    service com::sun::star::sdbcx::Descriptor;
-
-
+{ 
+    service com::sun::star::sdbcx::Descriptor;	 
+     
+     
     /** is provided for creation of a new query descriptor based on the current information.
      */
-    interface com::sun::star::sdbcx::XDataDescriptorFactory;
-
-
+    interface com::sun::star::sdbcx::XDataDescriptorFactory;	 
+ 
+     
     /** is used for customization of data appearance.
      */
-    service com::sun::star::sdb::DataSettings;
-
-
+    service com::sun::star::sdb::DataSettings; 
+ 
+     
     /** access to the columns of the results sets query.
      */
-    interface com::sun::star::sdbcx::XColumnsSupplier;
-
-
+    interface com::sun::star::sdbcx::XColumnsSupplier; 
+     
+     
     /** is the command of the query, this is typically a select statement.
      */
-    [property] string Command;
-
-
+    [property] string Command; 
+ 
+     
     /** should we use escape processing for the query.
      */
-    [property] boolean EscapeProcessing;
-
-
+    [property] boolean EscapeProcessing;	 
+ 
+     
     /** is the name of the table which should be updated. This is usually used
         for queries which relate on more than one table.
      */
-    [property] string UpdateTableName;
-
-
+    [property] string UpdateTableName; 
+ 
+     
     /** is the name of the update table catalog.
      */
-    [property] string UpdateCatalogName;
-
-
+    [property] string UpdateCatalogName; 
+ 
+     
     /** is the name of the update table schema.
      */
-    [property] string UpdateSchemaName;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [property] string UpdateSchemaName;	 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/QueryDesign.idl b/offapi/com/sun/star/sdb/QueryDesign.idl
index 539961bd6a00..a5407f8dc4ff 100644
--- a/offapi/com/sun/star/sdb/QueryDesign.idl
+++ b/offapi/com/sun/star/sdb/QueryDesign.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_QueryDesign_idl__
-#define __com_sun_star_sdb_QueryDesign_idl__
+#ifndef __com_sun_star_sdb_QueryDesign_idl__ 
+#define __com_sun_star_sdb_QueryDesign_idl__ 
 
-#ifndef __com_sun_star_frame_XController_idl__
+#ifndef __com_sun_star_frame_XController_idl__ 
 #include <com/sun/star/frame/XController.idl>
 #endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
+#ifndef __com_sun_star_lang_XInitialization_idl__ 
 #include <com/sun/star/lang/XInitialization.idl>
 #endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
+#ifndef __com_sun_star_frame_XDispatchProvider_idl__ 
 #include <com/sun/star/frame/XDispatchProvider.idl>
 #endif
-#ifndef __com_sun_star_form_FormController_idl__
+#ifndef __com_sun_star_form_FormController_idl__ 
 #include <com/sun/star/form/FormController.idl>
 #endif
 
-module com {  module sun {  module star {  module sdb {
+module com {  module sun {  module star {  module sdb { 
 
-//=============================================================================
+//============================================================================= 
 /** implements a component which allows the creation of SQL statements.
 
     <p>This service implements a user interface for creating SQL statements either through a graphical design
     interface or simply to enter the SQL statement directly.</p>
 
-    <p>The design view of the QueryDesign is divided into two parts. The first part contains the table windows
-    where columns can be selected for the SQL statement. The second part contains the columns which should appear
+    <p>The design view of the QueryDesign is divided into two parts. The first part contains the table windows 
+    where columns can be selected for the SQL statement. The second part contains the columns which should appear 
     in the selection of the SQL statement or criterias which narrow the query.</p>
 
     <h3>Operation Modes</h3>
@@ -194,8 +194,8 @@ published service QueryDesign
     */
     [readonly, property, optional] boolean EscapeProcessing;
 };
-
-//=============================================================================
-}; }; }; };
-
+ 
+//============================================================================= 
+}; }; }; }; 
+ 
 #endif
diff --git a/offapi/com/sun/star/sdb/RelationDesign.idl b/offapi/com/sun/star/sdb/RelationDesign.idl
index 7b69a335ae31..9b630a52f65e 100644
--- a/offapi/com/sun/star/sdb/RelationDesign.idl
+++ b/offapi/com/sun/star/sdb/RelationDesign.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,25 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_RelationDesign_idl__
-#define __com_sun_star_sdb_RelationDesign_idl__
+#ifndef __com_sun_star_sdb_RelationDesign_idl__ 
+#define __com_sun_star_sdb_RelationDesign_idl__ 
 
-#ifndef __com_sun_star_frame_XController_idl__
+#ifndef __com_sun_star_frame_XController_idl__ 
 #include <com/sun/star/frame/XController.idl>
 #endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
+#ifndef __com_sun_star_lang_XInitialization_idl__ 
 #include <com/sun/star/lang/XInitialization.idl>
 #endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
+#ifndef __com_sun_star_frame_XDispatchProvider_idl__ 
 #include <com/sun/star/frame/XDispatchProvider.idl>
 #endif
-#ifndef __com_sun_star_form_FormController_idl__
+#ifndef __com_sun_star_form_FormController_idl__ 
 #include <com/sun/star/form/FormController.idl>
 #endif
 
-module com {  module sun {  module star {  module sdb {
+module com {  module sun {  module star {  module sdb { 
 
-//=============================================================================
+//============================================================================= 
 /** implements a component which allows the creation of relation.
 
     <p>This service implements a user interface for relations through a graphical design interface.</p>
@@ -64,8 +64,8 @@ published service RelationDesign
     interface com::sun::star::frame::XController;
 
     /** is used to initialize the RelationDesign.
-
-        <p>Parameters (passed to the method
+        
+        <p>Parameters (passed to the method 
         <member scope="com::sun::star::lang">XInitialization::initialize</member>)
         have to be instances of <type scope="com::sun::star::beans">PropertyValue</type>, where the
         <member scope="com::sun::star::beans">PropertyValue::Name</member> member specifies what the parameter controls,
@@ -86,8 +86,8 @@ published service RelationDesign
     */
     interface com::sun::star::lang::XInitialization;
 };
-
-//=============================================================================
-}; }; }; };
-
+ 
+//============================================================================= 
+}; }; }; }; 
+ 
 #endif
diff --git a/offapi/com/sun/star/sdb/Reports.idl b/offapi/com/sun/star/sdb/Reports.idl
index 0951768c231b..28f438c02af7 100644
--- a/offapi/com/sun/star/sdb/Reports.idl
+++ b/offapi/com/sun/star/sdb/Reports.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 #include <com/sun/star/sdb/DocumentContainer.idl>
 #endif
 
-
+ 
 
  module com {  module sun {  module star {  module sdb {
 
diff --git a/offapi/com/sun/star/sdb/ResultColumn.idl b/offapi/com/sun/star/sdb/ResultColumn.idl
index 1ba3d261bc6c..47d90ac192dd 100644
--- a/offapi/com/sun/star/sdb/ResultColumn.idl
+++ b/offapi/com/sun/star/sdb/ResultColumn.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,100 +24,100 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_ResultColumn_idl__
-#define __com_sun_star_sdb_ResultColumn_idl__
-
-#ifndef __com_sun_star_sdbcx_Column_idl__
-#include <com/sun/star/sdbcx/Column.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_ColumnSettings_idl__
-#include <com/sun/star/sdb/ColumnSettings.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_ResultColumn_idl__ 
+#define __com_sun_star_sdb_ResultColumn_idl__ 
+ 
+#ifndef __com_sun_star_sdbcx_Column_idl__ 
+#include <com/sun/star/sdbcx/Column.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdb_ColumnSettings_idl__ 
+#include <com/sun/star/sdb/ColumnSettings.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** describes a column of a result set.
  */
 published service ResultColumn
-{
-    service com::sun::star::sdbcx::Column;
-
-
+{ 
+    service com::sun::star::sdbcx::Column;	 
+ 
+     
     /** [optional], access to layout settings for a column.
      */
-    service com::sun::star::sdb::ColumnSettings;
-
-
+    service com::sun::star::sdb::ColumnSettings; 
+ 
+     
     /** indicates whether the column can be used in a Where clause.
      */
-    [readonly, property] boolean IsSearchable;
-
-
+    [readonly, property] boolean IsSearchable; 
+ 
+     
     /** indicates whether values in the column are signed numbers.
      */
-    [readonly, property] boolean IsSigned;
-
-
+    [readonly, property] boolean IsSigned; 
+ 
+     
     /** indicates that a column is case sensitive.
      */
-    [readonly, property] boolean IsCaseSensitive;
-
-
+    [readonly, property] boolean IsCaseSensitive; 
+ 
+     
     /** indicates the column's normal max width in chars..
      */
-    [readonly, property] long DisplaySize;
-
-
+    [readonly, property] long DisplaySize; 
+ 
+     
     /** gets the suggested column title for use in printouts and
         displays.
      */
-    [readonly, property] string Label;
-
-
+    [readonly, property] string Label; 
+ 
+     
     /** indicates whether a column is definitely, not writable.
      */
-    [readonly, property] boolean IsReadOnly;
-
-
+    [readonly, property] boolean IsReadOnly; 
+ 
+     
     /** indicates whether it is possible for a write on the column to succeed.
      */
-    [readonly, property] boolean IsWritable;
-
-
+    [readonly, property] boolean IsWritable; 
+ 
+     
     /** indicates whether a write on the column will definitely succeed.
      */
-    [readonly, property] boolean IsDefinitelyWritable;
-
-
+    [readonly, property] boolean IsDefinitelyWritable; 
+ 
+     
     /** returns the fully-qualified name of the service whose instances
-        are manufactured if the method
+        are manufactured if the method 
         <method scope="com::sun::star::sdbc">XRow::getObject)=</method>
         is called to retrieve a value from the column.
      */
-    [readonly, property] string ServiceName;
-
-
+    [readonly, property] string ServiceName;	 
+ 
+     
     /** gets a column's table name.
      */
-    [readonly, property] string TableName;
-
-
+    [readonly, property] string TableName; 
+ 
+     
     /** gets a column's schema name.
      */
-    [readonly, property] string SchemaName;
-
-
+    [readonly, property] string SchemaName; 
+ 
+     
     /** gets a column's table's catalog name.
      */
-    [readonly, property] string CatalogName;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [readonly, property] string CatalogName;	 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/ResultSet.idl b/offapi/com/sun/star/sdb/ResultSet.idl
index 2ca4e304ebcf..013c8c3688d2 100644
--- a/offapi/com/sun/star/sdb/ResultSet.idl
+++ b/offapi/com/sun/star/sdb/ResultSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_ResultSet_idl__
-#define __com_sun_star_sdb_ResultSet_idl__
-
-#ifndef __com_sun_star_sdbcx_ResultSet_idl__
-#include <com/sun/star/sdbcx/ResultSet.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
- published interface XColumnsSupplier;
-};};};};
-
- module com {  module sun {  module star {  module sdb {
-
-
-/** extends the
+#ifndef __com_sun_star_sdb_ResultSet_idl__ 
+#define __com_sun_star_sdb_ResultSet_idl__ 
+ 
+#ifndef __com_sun_star_sdbcx_ResultSet_idl__ 
+#include <com/sun/star/sdbcx/ResultSet.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ published interface XColumnsSupplier; 
+};};};}; 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
+/** extends the 
     <type scope="com::sun::star::sdbcx">ResultSet</type>
     by a more sophisticated access to the result sets
     data.
  */
 published service ResultSet
-{
-    service com::sun::star::sdbcx::ResultSet;
-
-
+{ 
+    service com::sun::star::sdbcx::ResultSet; 
+ 
+     
     /** access to the description and data.
      */
-    interface com::sun::star::sdbcx::XColumnsSupplier;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    interface com::sun::star::sdbcx::XColumnsSupplier; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/RowChangeAction.idl b/offapi/com/sun/star/sdb/RowChangeAction.idl
index 37ba3ff68910..bf2228e184ca 100644
--- a/offapi/com/sun/star/sdb/RowChangeAction.idl
+++ b/offapi/com/sun/star/sdb/RowChangeAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_RowChangeAction_idl__
-#define __com_sun_star_sdb_RowChangeAction_idl__
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_RowChangeAction_idl__ 
+#define __com_sun_star_sdb_RowChangeAction_idl__ 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** determines the type of change which is going to be performed.
  */
 published constants RowChangeAction
-{
-
+{ 
+     
     /** indicates that an insert will be performed.
      */
-    const long INSERT   = 1;
-    //-------------------------------------------------------------------------
-
+    const long INSERT	= 1; 
+    //------------------------------------------------------------------------- 
+     
     /** indicates that an update will be performed.
      */
-    const long UPDATE   = 2;
-    //-------------------------------------------------------------------------
-
+    const long UPDATE	= 2; 
+    //------------------------------------------------------------------------- 
+     
     /** indicates that a delete will be performed.
      */
-    const long DELETE   = 3;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long DELETE	= 3; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/RowChangeEvent.idl b/offapi/com/sun/star/sdb/RowChangeEvent.idl
index a04eb97e0003..8897ec510ec1 100644
--- a/offapi/com/sun/star/sdb/RowChangeEvent.idl
+++ b/offapi/com/sun/star/sdb/RowChangeEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_RowChangeEvent_idl__
-#define __com_sun_star_sdb_RowChangeEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_RowChangeEvent_idl__ 
+#define __com_sun_star_sdb_RowChangeEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** indicates the type of change action on the data source.
  */
 published struct RowChangeEvent: com::sun::star::lang::EventObject
-{
-
+{ 
+     
     /** indicates the type of change.
         @see com::sun::star::sdb::RowChangeAction
      */
-    long Action;
-
-
+    long Action; 
+ 
+     
     /** indicates the number of rows affected by the change.
      */
-    long Rows;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    long Rows; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/RowSet.idl b/offapi/com/sun/star/sdb/RowSet.idl
index d52b6cf0cc39..2afa36cac663 100644
--- a/offapi/com/sun/star/sdb/RowSet.idl
+++ b/offapi/com/sun/star/sdb/RowSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sdb/RowSetVetoException.idl b/offapi/com/sun/star/sdb/RowSetVetoException.idl
index 66d27428f4c6..c020860ed1b6 100644
--- a/offapi/com/sun/star/sdb/RowSetVetoException.idl
+++ b/offapi/com/sun/star/sdb/RowSetVetoException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_RowSetVetoException_idl__
-#define __com_sun_star_sdb_RowSetVetoException_idl__
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_RowSetVetoException_idl__ 
+#define __com_sun_star_sdb_RowSetVetoException_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** is an exception fired whenever a rowset operation was cancelled because of
     of a veto of an approved listener.
     @see com::sun::star::sdb::XRowSetApproveListener
  */
 published exception RowSetVetoException: com::sun::star::sdbc::SQLException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/RowsChangeEvent.idl b/offapi/com/sun/star/sdb/RowsChangeEvent.idl
index 90bb50f4bf84..b94dc747414d 100644
--- a/offapi/com/sun/star/sdb/RowsChangeEvent.idl
+++ b/offapi/com/sun/star/sdb/RowsChangeEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,26 +27,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_RowsChangeEvent_idl__
-#define __com_sun_star_sdb_RowsChangeEvent_idl__
-
-#include <com/sun/star/sdb/RowChangeEvent.idl>
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_RowsChangeEvent_idl__ 
+#define __com_sun_star_sdb_RowsChangeEvent_idl__ 
+ 
+#include <com/sun/star/sdb/RowChangeEvent.idl> 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** indicates which rows have changed and the type of change action on the row set.
  */
 struct RowsChangeEvent: com::sun::star::sdb::RowChangeEvent
-{
-
+{ 
+     
     sequence< any > Bookmarks;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/SQLContext.idl b/offapi/com/sun/star/sdb/SQLContext.idl
index 1cf7d389d56f..e881627c363e 100644
--- a/offapi/com/sun/star/sdb/SQLContext.idl
+++ b/offapi/com/sun/star/sdb/SQLContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_SQLContext_idl__
-#define __com_sun_star_sdb_SQLContext_idl__
-
-#ifndef __com_sun_star_sdbc_SQLWarning_idl__
-#include <com/sun/star/sdbc/SQLWarning.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_SQLContext_idl__ 
+#define __com_sun_star_sdb_SQLContext_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_SQLWarning_idl__ 
+#include <com/sun/star/sdbc/SQLWarning.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** provides special information about the context where a
     <type scope="com::sun::star::sdbc">SQLException</type>
     occurred. As usual
@@ -45,21 +45,21 @@
     @see com::sun::star::sdbc::XStatement::getWarnings
  */
 published exception SQLContext: com::sun::star::sdbc::SQLWarning
-{
-    /** provides special info about the details where a
+{ 
+    /** provides special info about the details where a 
         <type scope="com::sun::star::sdbc">SQLException</type>
         occured.
         As usual for SQLExceptions, several SQLContext-objects may be chained, then the
         most recent context is appended to the list's tail
      */
-    string          Details;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
-
-/*===========================================================================
-===========================================================================*/
+    string			Details; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
diff --git a/offapi/com/sun/star/sdb/SQLErrorEvent.idl b/offapi/com/sun/star/sdb/SQLErrorEvent.idl
index 2be91d65a3dd..c8f75dfc9f6f 100644
--- a/offapi/com/sun/star/sdb/SQLErrorEvent.idl
+++ b/offapi/com/sun/star/sdb/SQLErrorEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_SQLErrorEvent_idl__
-#define __com_sun_star_sdb_SQLErrorEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_SQLErrorEvent_idl__ 
+#define __com_sun_star_sdb_SQLErrorEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** is invoked in case of fired database exception triggered by
     a database object.
  */
 published struct SQLErrorEvent: com::sun::star::lang::EventObject
-{
-
+{ 
+     
     /** contains the exception that is going to be fired.
      */
-    any Reason;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    any Reason; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/SQLFilterOperator.idl b/offapi/com/sun/star/sdb/SQLFilterOperator.idl
index e8aa55694462..fcc0b6a35427 100644
--- a/offapi/com/sun/star/sdb/SQLFilterOperator.idl
+++ b/offapi/com/sun/star/sdb/SQLFilterOperator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_SQLFilterOperator_idl__
-#define __com_sun_star_sdb_SQLFilterOperator_idl__
+#ifndef __com_sun_star_sdb_SQLFilterOperator_idl__ 
+#define __com_sun_star_sdb_SQLFilterOperator_idl__ 
 
-module com {  module sun {  module star {  module sdb {
+module com {  module sun {  module star {  module sdb { 
 
 
-/** These constants are used to specify the filter operator
-    which should be applied when creating a filter
+/** These constants are used to specify the filter operator 
+    which should be applied when creating a filter 
     with the method <method>XSingleSelectQueryComposer::setStructuredFilter</method>.
 
     @see com::sun::star::sdb::SingleSelectQueryComposer
@@ -40,39 +40,39 @@ module com {  module sun {  module star {  module sdb {
 constants SQLFilterOperator
 {
     /// equal to
-    const long EQUAL            = 1;
+    const long EQUAL			= 1;
 
     /// not equal to
-    const long NOT_EQUAL        = 2;
+    const long NOT_EQUAL		= 2;
 
     /// less than
-    const long LESS             = 3;
+    const long LESS				= 3;
 
     /// greater than
-    const long GREATER          = 4;
+    const long GREATER			= 4;
 
     /// less or eqal than
-    const long LESS_EQUAL       = 5;
+    const long LESS_EQUAL		= 5;
 
     /// greater or eqal than
-    const long GREATER_EQUAL    = 6;
+    const long GREATER_EQUAL	= 6;
 
-    /// like
-    const long LIKE             = 7;
+    /// like 
+    const long LIKE				= 7;
 
     /// not like
-    const long NOT_LIKE         = 8;
+    const long NOT_LIKE 		= 8;
 
     /// is null
-    const long SQLNULL          = 9;
+    const long SQLNULL			= 9;
 
     /// is not null
-    const long NOT_SQLNULL      = 10;
+    const long NOT_SQLNULL 		= 10;
 };
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/SQLQueryComposer.idl b/offapi/com/sun/star/sdb/SQLQueryComposer.idl
index 440011d8611a..fc55845b2ebb 100644
--- a/offapi/com/sun/star/sdb/SQLQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/SQLQueryComposer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_SQLQueryComposer_idl__
-#define __com_sun_star_sdb_SQLQueryComposer_idl__
-
-#ifndef __com_sun_star_sdb_XSQLQueryComposer_idl__
-#include <com/sun/star/sdb/XSQLQueryComposer.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
- published interface XTablesSupplier;
- published interface XColumnsSupplier;
-};};};};
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_SQLQueryComposer_idl__ 
+#define __com_sun_star_sdb_SQLQueryComposer_idl__ 
+ 
+#ifndef __com_sun_star_sdb_XSQLQueryComposer_idl__ 
+#include <com/sun/star/sdb/XSQLQueryComposer.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ published interface XTablesSupplier; 
+ published interface XColumnsSupplier; 
+};};};}; 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** represents a tool for composing SQL select statements.
-
-
+    
+    
     <p>
     It hides the complexity of parsing and evaluating SQL Statements and provides
     sophisticated methods for expanding a SQL-Statement with filter and order
@@ -49,27 +49,27 @@
     </p>
  */
 published service SQLQueryComposer
-{
-
+{ 
+     
     /** access to the composer interface.
      */
-    interface XSQLQueryComposer;
-
-
+    interface XSQLQueryComposer; 
+ 
+     
     /** access to the selected tables.
      */
-    interface com::sun::star::sdbcx::XTablesSupplier;
-
-
+    interface com::sun::star::sdbcx::XTablesSupplier; 
+ 
+     
     /** access the selected columns.
      */
-    interface com::sun::star::sdbcx::XColumnsSupplier;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    interface com::sun::star::sdbcx::XColumnsSupplier; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl b/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl
index 160e537c3e89..10b31ce0df21 100644
--- a/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl
+++ b/offapi/com/sun/star/sdb/SingleSelectQueryAnalyzer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_SingleSelectQueryAnalyzer_idl__
-#define __com_sun_star_sdb_SingleSelectQueryAnalyzer_idl__
-
-#ifndef __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__
-#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-interface XTablesSupplier;
-interface XColumnsSupplier;
-};};};};
-
- module com {  module sun {  module star {  module sdb {
-
+#ifndef __com_sun_star_sdb_SingleSelectQueryAnalyzer_idl__ 
+#define __com_sun_star_sdb_SingleSelectQueryAnalyzer_idl__ 
+ 
+#ifndef __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__ 
+#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+interface XTablesSupplier; 
+interface XColumnsSupplier; 
+};};};}; 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
  interface XParametersSupplier;
 /** represents a service for analyzing a single select statement.
-
+    
     <p>
     It hides the complexity of parsing and evaluating a single select statement and provides
     sophisticated methods for accessing a statements filter, group by, having and order
-    criteria, as well as the corresponding select columns and tables.
+    criteria, as well as the corresponding select columns and tables. 
     If supported, it even gives access to the parameters.
     </p>
 
     @see com::sun::star::sdb::SingleSelectQueryComposer
  */
 service SingleSelectQueryAnalyzer
-{
-    interface XSingleSelectQueryAnalyzer;
-
+{ 
+    interface XSingleSelectQueryAnalyzer; 
+ 
     /** access to the selected tables.
 
         <p>The selected tables are those present in the <code>FROM</code> part
@@ -70,21 +70,21 @@ service SingleSelectQueryAnalyzer
 
         @see XSingleSelectQueryAnalyzer::getQueryWithSubstitution
      */
-    interface com::sun::star::sdbcx::XTablesSupplier;
-
+    interface com::sun::star::sdbcx::XTablesSupplier; 
+ 
     /** access the selected columns.
      */
-    interface com::sun::star::sdbcx::XColumnsSupplier;
+    interface com::sun::star::sdbcx::XColumnsSupplier; 
 
     /** access to the parameters which are used in the where clause.
      */
-    [optional] interface com::sun::star::sdb::XParametersSupplier;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [optional] interface com::sun::star::sdb::XParametersSupplier; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl b/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl
index 73a5ed241243..2f76a8b98ca6 100644
--- a/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/SingleSelectQueryComposer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,21 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_SingleSelectQueryComposer_idl__
-#define __com_sun_star_sdb_SingleSelectQueryComposer_idl__
-
-#ifndef __com_sun_star_sdb_SingleSelectQueryAnalyzer_idl__
-#include <com/sun/star/sdb/SingleSelectQueryAnalyzer.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-module com {  module sun {  module star {  module sdb {
+#ifndef __com_sun_star_sdb_SingleSelectQueryComposer_idl__ 
+#define __com_sun_star_sdb_SingleSelectQueryComposer_idl__ 
+ 
+#ifndef __com_sun_star_sdb_SingleSelectQueryAnalyzer_idl__ 
+#include <com/sun/star/sdb/SingleSelectQueryAnalyzer.idl> 
+#endif 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
 
+module com {  module sun {  module star {  module sdb { 
+ 
 interface XSingleSelectQueryComposer;
 /** represents a service for composing a single select statement.
-
+    
     <p>
     It hides the complexity of parsing and evaluating a single select statement and provides
     sophisticated methods for expanding a statement with filter, group by, having and order
@@ -49,25 +49,25 @@ interface XSingleSelectQueryComposer;
     using the <type scope="com::sun::star::lang">XMultiServiceFactory</type> interface.</p>
  */
 service SingleSelectQueryComposer
-{
+{ 
     // gives access to the properties.
-    interface com::sun::star::beans::XPropertySet;
+    interface com::sun::star::beans::XPropertySet; 
 
     /** access to the analyzer service.
      */
-    service SingleSelectQueryAnalyzer;
+    service SingleSelectQueryAnalyzer; 
 
     interface XSingleSelectQueryComposer;
 
     /** is the orignal SQL statement set with the interface <type scope="com::sun::star::sdb">XSingleSelectQueryAnalyzer</type>.
     */
-    [readonly, property] string Original;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [readonly, property] string Original;  
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/Table.idl b/offapi/com/sun/star/sdb/Table.idl
index 71d4865db809..f754db14e0d2 100644
--- a/offapi/com/sun/star/sdb/Table.idl
+++ b/offapi/com/sun/star/sdb/Table.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_Table_idl__
-#define __com_sun_star_sdb_Table_idl__
-
-#ifndef __com_sun_star_sdbcx_Table_idl__
-#include <com/sun/star/sdbcx/Table.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_DataSettings_idl__
-#include <com/sun/star/sdb/DataSettings.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_Table_idl__ 
+#define __com_sun_star_sdb_Table_idl__ 
+ 
+#ifndef __com_sun_star_sdbcx_Table_idl__ 
+#include <com/sun/star/sdbcx/Table.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdb_DataSettings_idl__ 
+#include <com/sun/star/sdb/DataSettings.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** extends the service
     <type scope="com::sun::star::sdbcx">Table</type>
     with additional display information, sorting, and filtering criterias.
  */
 published service Table
-{
-    service com::sun::star::sdbcx::Table;
-
-
+{ 
+    service com::sun::star::sdbcx::Table; 
+ 
+     
     /** is used for customization of data appearance.
      */
-    service com::sun::star::sdb::DataSettings;
-
-
+    service com::sun::star::sdb::DataSettings;	 
+ 
+     
     /** indicates the privileges for the table.
         @see com::sun::star::sdbcx::Privilege
      */
-    [readonly, property] long Privileges;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [readonly, property] long Privileges;	 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/TableDescriptor.idl b/offapi/com/sun/star/sdb/TableDescriptor.idl
index 99fc7a056e36..daa48cc70708 100644
--- a/offapi/com/sun/star/sdb/TableDescriptor.idl
+++ b/offapi/com/sun/star/sdb/TableDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_TableDescriptor_idl__
-#define __com_sun_star_sdb_TableDescriptor_idl__
-
-#ifndef __com_sun_star_sdbcx_TableDescriptor_idl__
-#include <com/sun/star/sdbcx/TableDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_DataSettings_idl__
-#include <com/sun/star/sdb/DataSettings.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_TableDescriptor_idl__ 
+#define __com_sun_star_sdb_TableDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_sdbcx_TableDescriptor_idl__ 
+#include <com/sun/star/sdbcx/TableDescriptor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdb_DataSettings_idl__ 
+#include <com/sun/star/sdb/DataSettings.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** extends the service
     <type scope="com::sun::star::sdbcx">TableDescriptor</type>
     with additional display informations, sorting, and filtering criteria.
  */
 published service TableDescriptor
-{
-    service com::sun::star::sdbcx::TableDescriptor;
-
-
+{ 
+    service com::sun::star::sdbcx::TableDescriptor; 
+ 
+     
     /** is used for customization of data appearance.
      */
-    service com::sun::star::sdb::DataSettings;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    service com::sun::star::sdb::DataSettings;	 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/TableDesign.idl b/offapi/com/sun/star/sdb/TableDesign.idl
index a9ca8702f00b..be2b7190e771 100644
--- a/offapi/com/sun/star/sdb/TableDesign.idl
+++ b/offapi/com/sun/star/sdb/TableDesign.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_TableDesign_idl__
-#define __com_sun_star_sdb_TableDesign_idl__
+#ifndef __com_sun_star_sdb_TableDesign_idl__ 
+#define __com_sun_star_sdb_TableDesign_idl__ 
 
-#ifndef __com_sun_star_frame_XController_idl__
+#ifndef __com_sun_star_frame_XController_idl__ 
 #include <com/sun/star/frame/XController.idl>
 #endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
+#ifndef __com_sun_star_lang_XInitialization_idl__ 
 #include <com/sun/star/lang/XInitialization.idl>
 #endif
-#ifndef __com_sun_star_frame_XDispatchProvider_idl__
+#ifndef __com_sun_star_frame_XDispatchProvider_idl__ 
 #include <com/sun/star/frame/XDispatchProvider.idl>
 #endif
-#ifndef __com_sun_star_form_FormController_idl__
+#ifndef __com_sun_star_form_FormController_idl__ 
 #include <com/sun/star/form/FormController.idl>
 #endif
 
-module com {  module sun {  module star {  module sdb {
+module com {  module sun {  module star {  module sdb { 
 
-//=============================================================================
+//============================================================================= 
 /** implements a component which allows the creation of tables.
 
     <p>This service implements a user interface for creating tables through a graphical design interface.</p>
 
-    <p>The design view of the TableDesign is divided into two parts. The first part contains the rows
+    <p>The design view of the TableDesign is divided into two parts. The first part contains the rows  
     where columns can be defined for the table. The second part contains the properties of the selected column.</p>
 
     @see com::sun::star::sdb::ContentLoader
@@ -64,8 +64,8 @@ published service TableDesign
     interface com::sun::star::frame::XController;
 
     /** is used to initialize the TableDesign.
-
-        <p>Parameters (passed to the method
+        
+        <p>Parameters (passed to the method 
         <member scope="com::sun::star::lang">XInitialization::initialize</member>)
         have to be instances of <type scope="com::sun::star::beans">PropertyValue</type>, where the
         <member scope="com::sun::star::beans">PropertyValue::Name</member> member specifies what the parameter controls,
@@ -82,15 +82,15 @@ published service TableDesign
             meaningful together with the other parameters specifying the object to display.
             </li>
             <li><b>CurrentTable</b><br>
-            This is a string giving the name of the object to display initially.
+            This is a string giving the name of the object to display initially. 
             </li>
         </ul>
         </p>
     */
     interface com::sun::star::lang::XInitialization;
 };
-
-//=============================================================================
-}; }; }; };
-
+ 
+//============================================================================= 
+}; }; }; }; 
+ 
 #endif
diff --git a/offapi/com/sun/star/sdb/XAlterQuery.idl b/offapi/com/sun/star/sdb/XAlterQuery.idl
index 39d328d68074..da3d2c529ac4 100644
--- a/offapi/com/sun/star/sdb/XAlterQuery.idl
+++ b/offapi/com/sun/star/sdb/XAlterQuery.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XAlterQuery_idl__
-#define __com_sun_star_sdb_XAlterQuery_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
+#ifndef __com_sun_star_sdb_XAlterQuery_idl__ 
+#define __com_sun_star_sdb_XAlterQuery_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
 /** is used to alter the command of a query.
  */
 published interface XAlterQuery: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** is intended to alter the command of a query object.
         @param command
             the SQL statement
         @param useEscapeProcessing
             <TRUE/> when escape processing should be used
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void alterCommand([in]string command, [in]boolean useEscapeProcessing)
-        raises (com::sun::star::sdbc::SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void alterCommand([in]string command, [in]boolean useEscapeProcessing) 
+        raises (com::sun::star::sdbc::SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XBookmarksSupplier.idl b/offapi/com/sun/star/sdb/XBookmarksSupplier.idl
index fdb0e8adc7e0..c065967d58be 100644
--- a/offapi/com/sun/star/sdb/XBookmarksSupplier.idl
+++ b/offapi/com/sun/star/sdb/XBookmarksSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XBookmarksSupplier_idl__
-#define __com_sun_star_sdb_XBookmarksSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sdb {
-
-//=============================================================================
-
+#ifndef __com_sun_star_sdb_XBookmarksSupplier_idl__ 
+#define __com_sun_star_sdb_XBookmarksSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sdb {  
+ 
+//============================================================================= 
+ 
 /** provides access to the collection of all bookmarks associated with a data source.
  */
 published interface XBookmarksSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns    the collection of all bookmarks associated with a data source
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns	the collection of all bookmarks associated with a data source
             <p>
             A bookmark is simply a string specifying the location of the
             bookmarked document.
             </p>
      */
-    com::sun::star::container::XNameAccess getBookmarks();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::container::XNameAccess getBookmarks(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XColumn.idl b/offapi/com/sun/star/sdb/XColumn.idl
index 7cb25c0e78dd..18b4d8e8efb7 100644
--- a/offapi/com/sun/star/sdb/XColumn.idl
+++ b/offapi/com/sun/star/sdb/XColumn.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,281 +24,281 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XColumn_idl__
-#define __com_sun_star_sdb_XColumn_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
-#ifndef __com_sun_star_util_Date_idl__
-#include <com/sun/star/util/Date.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
-#include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_util_Time_idl__
-#include <com/sun/star/util/Time.idl>
-#endif
-
- module com {  module sun {  module star {  module io {
- published interface XInputStream;
-};};};};
-
- module com {  module sun {  module star {  module container {
- published interface XNameAccess;
-};};};};
-
- module com {  module sun {  module star {  module sdbc {
- published interface XRef;
- published interface XArray;
- published interface XBlob;
- published interface XClob;
-};};};};
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_XColumn_idl__ 
+#define __com_sun_star_sdb_XColumn_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_Date_idl__ 
+#include <com/sun/star/util/Date.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_DateTime_idl__ 
+#include <com/sun/star/util/DateTime.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_Time_idl__ 
+#include <com/sun/star/util/Time.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module io { 
+ published interface XInputStream; 
+};};};}; 
+ 
+ module com {  module sun {  module star {  module container { 
+ published interface XNameAccess; 
+};};};}; 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ published interface XRef; 
+ published interface XArray; 
+ published interface XBlob; 
+ published interface XClob; 
+};};};}; 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** is used to access data which is collected in a row.
  */
 published interface XColumn: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** reports whether the last column read had a value of SQL NULL.
         Note that you must first call getXXX on a column to try to read
-        its value and then call
+        its value and then call 
         <code>wasNull()</code>
         to see if the value read was SQL NULL.
-        @returns
+        @returns 
             <TRUE/> if so
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    boolean wasNull() raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean wasNull() raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a String.
-        @returns
+        @returns 
             the column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    string getString() raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    string getString() raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as boolean.
-        @returns
+        @returns 
             the column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    boolean getBoolean() raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean getBoolean() raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a byte.
-        @returns
+        @returns 
             the column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    byte getByte() raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    byte getByte() raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a short.
-        @returns
+        @returns 
             the column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    short getShort() raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    short getShort() raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a long.
-        @returns
+        @returns 
             the column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    long getInt() raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    long getInt() raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a hyper.
-        @returns
+        @returns 
             the column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    hyper getLong() raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    hyper getLong() raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a float.
-        @returns
+        @returns 
             the column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    float getFloat() raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    float getFloat() raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a double.
-        @returns
+        @returns 
             the column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    double getDouble() raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
-    /** gets the value of a column in the current row as a byte array.
-             The bytes represent the raw values returned by the driver.
-             @returns  the column value;
-                if the value is SQL NULL, the result is empty.
-             @throws com::sun::star::sdbc::SQLException
+    double getDouble() raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** gets the value of a column in the current row as a byte array. 
+             The bytes represent the raw values returned by the driver. 
+             @returns  the column value; 
+                if the value is SQL NULL, the result is empty. 
+             @throws com::sun::star::sdbc::SQLException 
                 if a database access error occurs.
     */
-    sequence<byte> getBytes() raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    sequence<byte> getBytes() raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a date object.
-        @returns
+        @returns 
             the column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    com::sun::star::util::Date getDate()
-        raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    com::sun::star::util::Date getDate() 
+        raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a time object.
-        @returns
+        @returns 
             the column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    com::sun::star::util::Time getTime()
-        raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    com::sun::star::util::Time getTime() 
+        raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a datetime object.
-        @returns
+        @returns 
             the column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    com::sun::star::util::DateTime getTimestamp()
-        raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    com::sun::star::util::DateTime getTimestamp() 
+        raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a stream of
         uninterpreted bytes. The value can then be read in chunks from the
         stream. This method is particularly suitable for retrieving large
         LONGVARBINARY or LONGVARCHAR values.
-
-
+        
+        
         <p>
         <b>Note:</b> All the data in the returned stream must be
         read prior to getting the value of any other column. The next
         call to a get method implicitly closes the stream. Also, a
-        stream may return 0 when the method
+        stream may return 0 when the method 
         <member scope="com::sun::star::io">XInputStream::available()</member>
         is called whether there is data available or not.
         </p>
-            @returns
+            @returns 
             the column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    com::sun::star::io::XInputStream getBinaryStream()
-        raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    com::sun::star::io::XInputStream getBinaryStream() 
+        raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a stream of
         uninterpreted bytes. The value can then be read in chunks from the
         stream. This method is particularly suitable for retrieving large
-        LONGVARCHAR values.
-
+        LONGVARCHAR values.		
+        
         <p>
         <b>Note:</b> All the data in the returned stream must be
         read prior to getting the value of any other column. The next
         call to a get method implicitly closes the stream. Also, a
-        stream may return 0 when the method
+        stream may return 0 when the method 
         <member scope="com::sun::star::io">XInputStream::available()</member>
         is called whether there is data available or not.
         </p>
-        @returns
+        @returns 
             the column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    com::sun::star::io::XInputStream getCharacterStream()
-        raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    com::sun::star::io::XInputStream getCharacterStream() 
+        raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** @returns the value of a column in the current row as an object.
-        This method uses the given
+        This method uses the given 
         <code>Map</code>
         object
         for the custom mapping of the SQL structure or distinct type
         that is being retrieved.
         @param typeMap
             the type map is used to fetch the correct type
-        @returns
+        @returns 
             the column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    any getObject([in]com::sun::star::container::XNameAccess typeMap)
-        raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    any getObject([in]com::sun::star::container::XNameAccess typeMap) 
+        raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a REF(&lt;structured-type&gt) column value from the current row.
 
-        @returns
+        @returns 
             the column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
     */
-    com::sun::star::sdbc::XRef getRef() raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    com::sun::star::sdbc::XRef getRef() raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a BLOB (Binary Large OBject) value in the current row.
-        @returns
+        @returns 
             the column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    com::sun::star::sdbc::XBlob getBlob() raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    com::sun::star::sdbc::XBlob getBlob() raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a CLOB value in the current row of this <code>ResultSet</code> object.
-        @returns
+        @returns 
             the column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    com::sun::star::sdbc::XClob getClob() raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    com::sun::star::sdbc::XClob getClob() raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a SQL ARRAY value from the current row.
-        @returns
+        @returns 
             the column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    com::sun::star::sdbc::XArray getArray() raises (com::sun::star::sdbc::SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    com::sun::star::sdbc::XArray getArray() raises (com::sun::star::sdbc::SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XColumnUpdate.idl b/offapi/com/sun/star/sdb/XColumnUpdate.idl
index cecad2439698..b0f238f31fd3 100644
--- a/offapi/com/sun/star/sdb/XColumnUpdate.idl
+++ b/offapi/com/sun/star/sdb/XColumnUpdate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,207 +24,207 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XColumnUpdate_idl__
-#define __com_sun_star_sdb_XColumnUpdate_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
-#ifndef __com_sun_star_util_Date_idl__
-#include <com/sun/star/util/Date.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
-#include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_util_Time_idl__
-#include <com/sun/star/util/Time.idl>
-#endif
-
- module com {  module sun {  module star {  module io {
- published interface XInputStream;
-};};};};
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_XColumnUpdate_idl__ 
+#define __com_sun_star_sdb_XColumnUpdate_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_Date_idl__ 
+#include <com/sun/star/util/Date.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_DateTime_idl__ 
+#include <com/sun/star/util/DateTime.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_Time_idl__ 
+#include <com/sun/star/util/Time.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module io { 
+ published interface XInputStream; 
+};};};}; 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** is used to update data which is collected in a row.
  */
 published interface XColumnUpdate: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** gives a nullable column a null value.
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void updateNull() raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateNull() raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a boolean value.
         @param x
             the new column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void updateBoolean([in]boolean x) raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateBoolean([in]boolean x) raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a byte value.
         @param x
             the new column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void updateByte([in]byte x) raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateByte([in]byte x) raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a short value.
         @param x
             the new column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void updateShort([in]short x) raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateShort([in]short x) raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a long value.
         @param x
             the new column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void updateInt([in]long x) raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateInt([in]long x) raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a hyper value.
         @param x
             the new column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void updateLong([in]hyper x) raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateLong([in]hyper x) raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a float value.
         @param x
             the new column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void updateFloat([in]float x) raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateFloat([in]float x) raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a double value.
         @param x
             the new column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void updateDouble([in]double x) raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateDouble([in]double x) raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a string value.
         @param x
             the new column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void updateString([in]string x) raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateString([in]string x) raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a byte array value.
         @param x
             the new column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void updateBytes([in]sequence<byte> x) raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateBytes([in]sequence<byte> x) raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a Date value.
         @param x
             the new column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void updateDate([in]com::sun::star::util::Date x)
-        raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateDate([in]com::sun::star::util::Date x) 
+        raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a Time value.
         @param x
             the new column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void updateTime([in]com::sun::star::util::Time x)
-        raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateTime([in]com::sun::star::util::Time x) 
+        raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a Timestamp value.
         @param x
             the new column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void updateTimestamp([in]com::sun::star::util::DateTime x)
-      raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateTimestamp([in]com::sun::star::util::DateTime x) 
+      raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a stream value.
         @param x
             the new column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void updateBinaryStream([in]com::sun::star::io::XInputStream x,
-                             [in]long length) raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateBinaryStream([in]com::sun::star::io::XInputStream x, 
+                             [in]long length) raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a stream value.
         @param x
             the new column value
         @param length
-            the length of the stream
-        @throws com::sun::star::sdbc::SQLException
+            the length of the stream	
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void updateCharacterStream([in]com::sun::star::io::XInputStream x,
-                                 [in]long length) raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateCharacterStream([in]com::sun::star::io::XInputStream x, 
+                                 [in]long length) raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with an Object value.
         @param x
             the new column value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void updateObject([in]any x)
-      raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateObject([in]any x) 
+      raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with an Object value.
         @param x
             the new column value
         @param scale
             the scale
-        @throws com::sun::star::sdbc::SQLException
-            if a database access error occurs.
-     */
-    void updateNumericObject([in]any x, [in]long scale)
-      raises (com::sun::star::sdbc::SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+        @throws com::sun::star::sdbc::SQLException 
+            if a database access error occurs.
+     */
+    void updateNumericObject([in]any x, [in]long scale) 
+      raises (com::sun::star::sdbc::SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XCommandPreparation.idl b/offapi/com/sun/star/sdb/XCommandPreparation.idl
index 25bed38357cd..b3a17147c1ae 100644
--- a/offapi/com/sun/star/sdb/XCommandPreparation.idl
+++ b/offapi/com/sun/star/sdb/XCommandPreparation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XCommandPreparation_idl__
-#define __com_sun_star_sdb_XCommandPreparation_idl__
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
- published interface XPreparedStatement;
-};};};};
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_XCommandPreparation_idl__ 
+#define __com_sun_star_sdb_XCommandPreparation_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ published interface XPreparedStatement; 
+};};};}; 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** is used for preparation of commands.
-
-    <p>
+    
+    <p> 
     A command could be a table, query, or any kind of SQL statement
     prepared by the user.
     </p>
  */
 published interface XCommandPreparation: com::sun::star::uno::XInterface
-{
-
-    /** creates a
+{ 
+     
+    /** creates a 
         <type scope="com::sun::star::sdbc">PreparedStatement</type>
         object for sending parameterized SQL statements to the database.
-
+        
         <p>
         A SQL statement with or without IN parameters can be
         pre-compiled and stored in a PreparedStatement object. This
@@ -65,17 +65,17 @@ published interface XCommandPreparation: com::sun::star::uno::XInterface
             <type scope="com::sun::star::sdb">CommandType</type>
         @returns
             the PreparedStatement object
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    com::sun::star::sdbc::XPreparedStatement prepareCommand([in]string command, [in] long commandType)
-         raises (com::sun::star::sdbc::SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    com::sun::star::sdbc::XPreparedStatement prepareCommand([in]string command, [in] long commandType) 
+         raises (com::sun::star::sdbc::SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XCompletedConnection.idl b/offapi/com/sun/star/sdb/XCompletedConnection.idl
index c40a4069c092..16c55e7a665c 100644
--- a/offapi/com/sun/star/sdb/XCompletedConnection.idl
+++ b/offapi/com/sun/star/sdb/XCompletedConnection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XCompletedConnection_idl__
-#define __com_sun_star_sdb_XCompletedConnection_idl__
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
-#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
- published interface XConnection;
-};};};};
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_XCompletedConnection_idl__ 
+#define __com_sun_star_sdb_XCompletedConnection_idl__ 
+ 
+#ifndef __com_sun_star_task_XInteractionHandler_idl__ 
+#include <com/sun/star/task/XInteractionHandler.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ published interface XConnection; 
+};};};}; 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** is used for establishing connections via a factory which is identified
     by it's name. To complete the information needed for establishing a connection
     an interaction handler is used.
  */
 published interface XCompletedConnection: com::sun::star::uno::XInterface
-{
-
-    /** attempts to establish a database connection. If information is missing, such as
+{ 
+     
+    /** attempts to establish a database connection. If information is missing, such as 
         a user's password, they are completed by user interaction.
         @param handler
             will be asked when more information is needed
         @returns
             the Connection object
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    com::sun::star::sdbc::XConnection
-        connectWithCompletion([in]com::sun::star::task::XInteractionHandler handler)
-             raises (com::sun::star::sdbc::SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    com::sun::star::sdbc::XConnection 
+        connectWithCompletion([in]com::sun::star::task::XInteractionHandler handler) 
+             raises (com::sun::star::sdbc::SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XCompletedExecution.idl b/offapi/com/sun/star/sdb/XCompletedExecution.idl
index 395598e1e70e..20a96ef3211d 100644
--- a/offapi/com/sun/star/sdb/XCompletedExecution.idl
+++ b/offapi/com/sun/star/sdb/XCompletedExecution.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XCompletedExecution_idl__
-#define __com_sun_star_sdb_XCompletedExecution_idl__
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
-#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_XCompletedExecution_idl__ 
+#define __com_sun_star_sdb_XCompletedExecution_idl__ 
+ 
+#ifndef __com_sun_star_task_XInteractionHandler_idl__ 
+#include <com/sun/star/task/XInteractionHandler.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** is used for execution where information for execution may be required from
     the user.
  */
 published interface XCompletedExecution: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** completes necessary information before execution, for example parameter values.
         @param handler
             will be asked when more information is needed
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void executeWithCompletion([in]com::sun::star::task::XInteractionHandler handler)
-         raises (com::sun::star::sdbc::SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void executeWithCompletion([in]com::sun::star::task::XInteractionHandler handler) 
+         raises (com::sun::star::sdbc::SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl b/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl
index 76680df46bec..daea6cb5e317 100644
--- a/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl
+++ b/offapi/com/sun/star/sdb/XDataAccessDescriptorFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,13 @@
 #ifndef __com_sun_star_sdb_XDataAccessDescriptorFactory_idl__
 #define __com_sun_star_sdb_XDataAccessDescriptorFactory_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
 
 //=============================================================================
 
-module com { module sun { module star { module sdb {
+module com { module sun { module star { module sdb { 
 
 //=============================================================================
 
@@ -57,7 +57,7 @@ interface XDataAccessDescriptorFactory
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/XDatabaseAccess.idl b/offapi/com/sun/star/sdb/XDatabaseAccess.idl
index 9339d3efcac1..2b14f17d9aa0 100644
--- a/offapi/com/sun/star/sdb/XDatabaseAccess.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XDatabaseAccess_idl__
-#define __com_sun_star_sdb_XDatabaseAccess_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XDataSource_idl__
-#include <com/sun/star/sdbc/XDataSource.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module task {
- published interface XInteractionHandler;
-};};};};
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sdb {
-
- published interface XDatabaseAccessListener;
-
-//=============================================================================
-
+#ifndef __com_sun_star_sdb_XDatabaseAccess_idl__ 
+#define __com_sun_star_sdb_XDatabaseAccess_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_XDataSource_idl__ 
+#include <com/sun/star/sdbc/XDataSource.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module task { 
+ published interface XInteractionHandler; 
+};};};}; 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ published interface XDatabaseAccessListener; 
+ 
+//============================================================================= 
+ 
 /** is not to be used anymore
     @deprecated
  */
 published interface XDatabaseAccess: com::sun::star::sdbc::XDataSource
-{
-    boolean hasConnections();
-    com::sun::star::sdbc::XConnection getIsolatedConnection([in]string user, [in]string password)
-      raises (com::sun::star::sdbc::SQLException);
-    boolean suspendConnections() raises (com::sun::star::sdbc::SQLException);
-    [oneway] void addDatabaseAccessListener([in]XDatabaseAccessListener listener);
-    [oneway] void removeDatabaseAccessListener([in]XDatabaseAccessListener listener);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+    boolean hasConnections(); 
+    com::sun::star::sdbc::XConnection getIsolatedConnection([in]string user, [in]string password) 
+      raises (com::sun::star::sdbc::SQLException); 
+    boolean suspendConnections() raises (com::sun::star::sdbc::SQLException); 
+    [oneway] void addDatabaseAccessListener([in]XDatabaseAccessListener listener); 
+    [oneway] void removeDatabaseAccessListener([in]XDatabaseAccessListener listener); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl b/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl
index 6826d9354a29..6547ed7899f4 100644
--- a/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseAccessListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XDatabaseAccessListener_idl__
-#define __com_sun_star_sdb_XDatabaseAccessListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_XDatabaseAccessListener_idl__ 
+#define __com_sun_star_sdb_XDatabaseAccessListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** is not to be used anymore
     @deprecated
  */
 published interface XDatabaseAccessListener: com::sun::star::lang::XEventListener
-{
-    [oneway] void connectionChanged([in]com::sun::star::lang::EventObject event);
-    boolean approveConnectionClosing([in]com::sun::star::lang::EventObject event);
-    [oneway] void connectionClosing([in]com::sun::star::lang::EventObject event);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+{ 
+    [oneway] void connectionChanged([in]com::sun::star::lang::EventObject event); 
+    boolean approveConnectionClosing([in]com::sun::star::lang::EventObject event); 
+    [oneway] void connectionClosing([in]com::sun::star::lang::EventObject event); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl b/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl
index bf244d52c0ba..cfa52c627a5d 100644
--- a/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseEnvironment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XDatabaseEnvironment_idl__
-#define __com_sun_star_sdb_XDatabaseEnvironment_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XDriverManager_idl__
-#include <com/sun/star/sdbc/XDriverManager.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sdb {
-
- published interface XDatabaseAccess;
-
-//=============================================================================
-
+#ifndef __com_sun_star_sdb_XDatabaseEnvironment_idl__ 
+#define __com_sun_star_sdb_XDatabaseEnvironment_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_XDriverManager_idl__ 
+#include <com/sun/star/sdbc/XDriverManager.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ published interface XDatabaseAccess; 
+ 
+//============================================================================= 
+ 
 /** is not to be used anymore.
 
     @deprecated
  */
 published interface XDatabaseEnvironment: com::sun::star::sdbc::XDriverManager
-{
-    XDatabaseAccess getDatabaseAccess([in]string URL)
-        raises (com::sun::star::sdbc::SQLException);
-    XDatabaseAccess createDatabaseAccess([in]string URL, [in]string title)
-        raises (com::sun::star::sdbc::SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+    XDatabaseAccess getDatabaseAccess([in]string URL) 
+        raises (com::sun::star::sdbc::SQLException); 
+    XDatabaseAccess createDatabaseAccess([in]string URL, [in]string title) 
+        raises (com::sun::star::sdbc::SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XDatabaseRegistrations.idl b/offapi/com/sun/star/sdb/XDatabaseRegistrations.idl
index 81f878d2441d..cd0db2011ac0 100644
--- a/offapi/com/sun/star/sdb/XDatabaseRegistrations.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseRegistrations.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sdb/XDatabaseRegistrationsListener.idl b/offapi/com/sun/star/sdb/XDatabaseRegistrationsListener.idl
index 57135f8de012..de38921bd3a9 100644
--- a/offapi/com/sun/star/sdb/XDatabaseRegistrationsListener.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseRegistrationsListener.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sdb/XDocumentDataSource.idl b/offapi/com/sun/star/sdb/XDocumentDataSource.idl
index b0e891b0a084..0eb77a813eb4 100644
--- a/offapi/com/sun/star/sdb/XDocumentDataSource.idl
+++ b/offapi/com/sun/star/sdb/XDocumentDataSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XDocumentDataSource_idl__
-#define __com_sun_star_sdb_XDocumentDataSource_idl__
-
+#ifndef __com_sun_star_sdb_XDocumentDataSource_idl__ 
+#define __com_sun_star_sdb_XDocumentDataSource_idl__ 
+ 
 #ifndef __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
-#include <com/sun/star/sdb/XOfficeDatabaseDocument.idl>
+#include <com/sun/star/sdb/XOfficeDatabaseDocument.idl> 
 #endif
 
-//=============================================================================
-
- module com {  module sun {  module star {  module sdb {
-
-//=============================================================================
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+//============================================================================= 
 /** simplifies the accessing of data sources and their corresponding database document.
-
+    
     <p>
     The interface can be used to access the data source of the database document.
     </p>
     @see OfficeDatabaseDocument
  */
-interface XDocumentDataSource
+interface XDocumentDataSource 
 {
     /** provides access to the one and only <type>OfficeDatabaseDocument</type>
         which the data source is based on.
@@ -63,13 +63,13 @@ interface XDocumentDataSource
     */
     [readonly, attribute] XOfficeDatabaseDocument DatabaseDocument;
 };
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
 
diff --git a/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl b/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
index 672505bc12ad..bd8d6db7cfcc 100644
--- a/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XFormDocumentsSupplier_idl__
-#define __com_sun_star_sdb_XFormDocumentsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_XFormDocumentsSupplier_idl__ 
+#define __com_sun_star_sdb_XFormDocumentsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** provides the access to a container of database forms.
     @see Forms
  */
 interface XFormDocumentsSupplier: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns the container of forms.
         @returns
             the form documents
         @see Forms
      */
-    com::sun::star::container::XNameAccess getFormDocuments();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    com::sun::star::container::XNameAccess getFormDocuments(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl b/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
index e4de2af39d98..f4617aebb46f 100644
--- a/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
+++ b/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,21 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XInteractionDocumentSave_idl__
-#define __com_sun_star_sdb_XInteractionDocumentSave_idl__
-
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
-#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-#ifndef __com_sun_star_ucb_XContent_idl__
-#include <com/sun/star/ucb/XContent.idl>
-#endif
-
-module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_XInteractionDocumentSave_idl__ 
+#define __com_sun_star_sdb_XInteractionDocumentSave_idl__ 
+ 
+#ifndef __com_sun_star_task_XInteractionContinuation_idl__ 
+#include <com/sun/star/task/XInteractionContinuation.idl> 
+#endif 
+#ifndef __com_sun_star_ucb_XContent_idl__ 
+#include <com/sun/star/ucb/XContent.idl> 
+#endif 
+ 
+module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** An interaction continuation handing back a document name.
-
+    
     <p>
     This continuation is typically used in conjunction with a
     <type scope="com::sun::star::sdb">DocumentSaveRequest</type>.
@@ -46,20 +46,20 @@ module com {  module sun {  module star {  module sdb {
     @since OOo 2.0.0
 */
 interface XInteractionDocumentSave: com::sun::star::task::XInteractionContinuation
-{
+{ 
     /** set the document name chosen by the interaction handler
-        @param  Name
+        @param	Name
             the name of the document
-        @param  Content
+        @param	Content
             the content where the document should store itself
     */
     void setName( [in] string Name, [in] com::sun::star::ucb::XContent Content);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl b/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl
index 56bed78ff8fe..50620517f48b 100644
--- a/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl
+++ b/offapi/com/sun/star/sdb/XInteractionSupplyParameters.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XInteractionSupplyParameters_idl__
-#define __com_sun_star_sdb_XInteractionSupplyParameters_idl__
-
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
-#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_XInteractionSupplyParameters_idl__ 
+#define __com_sun_star_sdb_XInteractionSupplyParameters_idl__ 
+ 
+#ifndef __com_sun_star_task_XInteractionContinuation_idl__ 
+#include <com/sun/star/task/XInteractionContinuation.idl> 
+#endif 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** An interaction continuation handing back parameter data.
-
+    
     <p>
     This continuation is typically used in conjunction with a
     <type scope="com::sun::star::sdb">ParametersRequest</type>.
     </p>
 */
 published interface XInteractionSupplyParameters: com::sun::star::task::XInteractionContinuation
-{
+{ 
     /** set the parameters chosen by the interaction handler
-        @param  Values
+        @param	Values
             the parameters to set
     */
     void setParameters( [in] sequence< com::sun::star::beans::PropertyValue > Values);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl b/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
index b2640704537c..d6ab4fc468dc 100644
--- a/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
-#define __com_sun_star_sdb_XOfficeDatabaseDocument_idl__
+#ifndef __com_sun_star_sdb_XOfficeDatabaseDocument_idl__ 
+#define __com_sun_star_sdb_XOfficeDatabaseDocument_idl__ 
 
 #ifndef __com_sun_star_sdb_XFormDocumentsSupplier_idl__
-#include <com/sun/star/sdb/XFormDocumentsSupplier.idl>
+#include <com/sun/star/sdb/XFormDocumentsSupplier.idl> 
 #endif
 #ifndef __com_sun_star_sdb_XReportDocumentsSupplier_idl__
-#include <com/sun/star/sdb/XReportDocumentsSupplier.idl>
+#include <com/sun/star/sdb/XReportDocumentsSupplier.idl> 
 #endif
 #ifndef __com_sun_star_sdbc_XDataSource_idl__
-#include <com/sun/star/sdbc/XDataSource.idl>
+#include <com/sun/star/sdbc/XDataSource.idl> 
 #endif
 #ifndef __com_sun_star_document_XDocumentSubStorageSupplier_idl__
 #include <com/sun/star/document/XDocumentSubStorageSupplier.idl>
 #endif
 
-//=============================================================================
-
-module com {  module sun {  module star {  module sdb {
-
-//=============================================================================
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module sdb { 
+ 
+//============================================================================= 
 /** simplifies the accessing of data sources, and it's corresponding database document and forms, and reports.
 */
 interface XOfficeDatabaseDocument
@@ -68,11 +68,11 @@ interface XOfficeDatabaseDocument
     */
     [readonly, attribute]   com::sun::star::sdbc::XDataSource DataSource;
 };
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 #endif
diff --git a/offapi/com/sun/star/sdb/XParametersSupplier.idl b/offapi/com/sun/star/sdb/XParametersSupplier.idl
index c5179eb02d7e..ba8f94d2f1de 100644
--- a/offapi/com/sun/star/sdb/XParametersSupplier.idl
+++ b/offapi/com/sun/star/sdb/XParametersSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XParametersSupplier_idl__
-#define __com_sun_star_sdb_XParametersSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_XParametersSupplier_idl__ 
+#define __com_sun_star_sdb_XParametersSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** provides the access to a container of parameters, typically used for a prepared
     statement.
  */
 published interface XParametersSupplier: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns the container of parameters.
-        @returns
+        @returns 
             the parameters
      */
-    com::sun::star::container::XIndexAccess getParameters();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    com::sun::star::container::XIndexAccess getParameters(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XQueriesSupplier.idl b/offapi/com/sun/star/sdb/XQueriesSupplier.idl
index a447b8fa598c..34aa14caae16 100644
--- a/offapi/com/sun/star/sdb/XQueriesSupplier.idl
+++ b/offapi/com/sun/star/sdb/XQueriesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,25 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XQueriesSupplier_idl__
-#define __com_sun_star_sdb_XQueriesSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_XQueriesSupplier_idl__ 
+#define __com_sun_star_sdb_XQueriesSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** provides the access to a container of database queries.
  */
 published interface XQueriesSupplier: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns the container of queries.
 
         <p>The single elements of the container support the <type>Query</type> service.</p>
@@ -51,13 +51,13 @@ published interface XQueriesSupplier: com::sun::star::uno::XInterface
             the queries belonging to database connection at which the <type>XQueriesSupplier</type> interface
             is exposed.
      */
-    com::sun::star::container::XNameAccess getQueries();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    com::sun::star::container::XNameAccess getQueries(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl b/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl
index e56d2fbafa56..d9fe956023f7 100644
--- a/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XQueryDefinitionsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XQueryDefinitionsSupplier_idl__
-#define __com_sun_star_sdb_XQueryDefinitionsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_XQueryDefinitionsSupplier_idl__ 
+#define __com_sun_star_sdb_XQueryDefinitionsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** provides the access to a container of database command definitions.
  */
 published interface XQueryDefinitionsSupplier: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns the container of commands.
         @returns
             the query definitions
      */
-    com::sun::star::container::XNameAccess getQueryDefinitions();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    com::sun::star::container::XNameAccess getQueryDefinitions(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl b/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
index d7b15fbc0018..8c3419540cae 100644
--- a/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XReportDocumentsSupplier_idl__
-#define __com_sun_star_sdb_XReportDocumentsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_XReportDocumentsSupplier_idl__ 
+#define __com_sun_star_sdb_XReportDocumentsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** provides the access to a container of database reports.
     @see Reports
  */
 interface XReportDocumentsSupplier: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns the container of reports.
         @returns
             the report documents
         @see Reports
      */
-    com::sun::star::container::XNameAccess getReportDocuments();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    com::sun::star::container::XNameAccess getReportDocuments(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XResultSetAccess.idl b/offapi/com/sun/star/sdb/XResultSetAccess.idl
index a0c388e9374a..79a96d59fdfd 100644
--- a/offapi/com/sun/star/sdb/XResultSetAccess.idl
+++ b/offapi/com/sun/star/sdb/XResultSetAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XResultSetAccess_idl__
-#define __com_sun_star_sdb_XResultSetAccess_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XResultSet;
-}; }; }; };
-
-
-
- module com {  module sun {  module star {  module sdb {
-
-
-/** is the interface to create a
+#ifndef __com_sun_star_sdb_XResultSetAccess_idl__ 
+#define __com_sun_star_sdb_XResultSetAccess_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XResultSet; 
+}; }; }; }; 
+ 
+ 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
+/** is the interface to create a 
     <type scope="com::sun::star::sdbc">ResultSet</type>
     based on the object providing the interface.
  */
 published interface XResultSetAccess: com::sun::star::uno::XInterface
-{
-
-    /** returns a new
+{ 
+     
+    /** returns a new 
         <type scope="com::sun::star::sdbc">ResultSet</type>
         based on the object.
         @returns
             the new created ResultSet object
      */
-    com::sun::star::sdbc::XResultSet createResultSet() raises (com::sun::star::sdbc::SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    com::sun::star::sdbc::XResultSet createResultSet() raises (com::sun::star::sdbc::SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl b/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl
index 76a6251d1d39..09eeb3bf5a05 100644
--- a/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl
+++ b/offapi/com/sun/star/sdb/XRowSetApproveBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__
-#define __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
- published interface XRowSetApproveListener;
-
-
+#ifndef __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__ 
+#define __com_sun_star_sdb_XRowSetApproveBroadcaster_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ published interface XRowSetApproveListener; 
+ 
+ 
 /** provides the possibility of reviving an event before changing the content
     of a rowset.
  */
 published interface XRowSetApproveBroadcaster: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** adds the specified listener to receive the events "approveCursorMove",
         "approveRowChange", and "appproveRowSetChange".
         @param com::sun::star::sdb::XRowSetApproveListener
      */
-    [oneway] void addRowSetApproveListener(
-            [in]XRowSetApproveListener listener );
-    //-------------------------------------------------------------------------
-
+    [oneway] void addRowSetApproveListener( 
+            [in]XRowSetApproveListener listener ); 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified listener.
         @param com::sun::star::sdb::XRowSetApproveListener
      */
-    [oneway] void removeRowSetApproveListener(
-            [in]XRowSetApproveListener listener );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [oneway] void removeRowSetApproveListener( 
+            [in]XRowSetApproveListener listener ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XRowSetApproveListener.idl b/offapi/com/sun/star/sdb/XRowSetApproveListener.idl
index 04d06b90fb56..02414ef61fff 100644
--- a/offapi/com/sun/star/sdb/XRowSetApproveListener.idl
+++ b/offapi/com/sun/star/sdb/XRowSetApproveListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XRowSetApproveListener_idl__
-#define __com_sun_star_sdb_XRowSetApproveListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_RowChangeEvent_idl__
-#include <com/sun/star/sdb/RowChangeEvent.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_XRowSetApproveListener_idl__ 
+#define __com_sun_star_sdb_XRowSetApproveListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdb_RowChangeEvent_idl__ 
+#include <com/sun/star/sdb/RowChangeEvent.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** is used for approving the moving and changing of rowset actions.
  */
 published interface XRowSetApproveListener: com::sun::star::lang::XEventListener
-{
-
+{ 
+     
     /** is called before a rowset's cursor is moved.
         @param event
             the event which happend
         @returns <TRUE/> when moving is allowed, otherwise <FALSE/>
      */
-    boolean approveCursorMove([in]com::sun::star::lang::EventObject event);
-    //-------------------------------------------------------------------------
-
+    boolean approveCursorMove([in]com::sun::star::lang::EventObject event); 
+    //------------------------------------------------------------------------- 
+     
     /** is called before a row is inserted, updated, or deleted.
         @param event
             the event which happend
-        @returns <TRUE/> when changing is allowed, otherwise <FALSE/>
+        @returns <TRUE/> when changing is allowed, otherwise <FALSE/>	 
      */
-    boolean approveRowChange([in]RowChangeEvent event);
-    //-------------------------------------------------------------------------
-
+    boolean approveRowChange([in]RowChangeEvent event); 
+    //------------------------------------------------------------------------- 
+     
     /** is called before a rowset is changed, or in other words
         before a rowset is reexecuted.
         @param event
             the event which happend
-        @returns <TRUE/> when changing is allowed, otherwise <FALSE/>
+        @returns <TRUE/> when changing is allowed, otherwise <FALSE/>	 
     */
-    boolean approveRowSetChange([in]com::sun::star::lang::EventObject event);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    boolean approveRowSetChange([in]com::sun::star::lang::EventObject event); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XRowSetChangeBroadcaster.idl b/offapi/com/sun/star/sdb/XRowSetChangeBroadcaster.idl
index 9ffe9cc53ecf..0550f6a28c55 100644
--- a/offapi/com/sun/star/sdb/XRowSetChangeBroadcaster.idl
+++ b/offapi/com/sun/star/sdb/XRowSetChangeBroadcaster.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,11 +27,11 @@
 #ifndef __com_sun_star_sdb_XRowSetChangeBroadcaster_idl__
 #define __com_sun_star_sdb_XRowSetChangeBroadcaster_idl__
 
-#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/uno/XInterface.idl> 
 
 //=============================================================================
 
-module com { module sun { module star { module sdb {
+module com { module sun { module star { module sdb { 
 
 interface XRowSetChangeListener;
 
@@ -56,7 +56,7 @@ interface XRowSetChangeBroadcaster
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/XRowSetChangeListener.idl b/offapi/com/sun/star/sdb/XRowSetChangeListener.idl
index eeab25471f05..d0671b090598 100644
--- a/offapi/com/sun/star/sdb/XRowSetChangeListener.idl
+++ b/offapi/com/sun/star/sdb/XRowSetChangeListener.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module sdb {
+module com { module sun { module star { module sdb { 
 
 //=============================================================================
 
@@ -52,7 +52,7 @@ module com { module sun { module star { module sdb {
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/XRowSetSupplier.idl b/offapi/com/sun/star/sdb/XRowSetSupplier.idl
index 7c7e2ab9ec42..ab91375d6297 100644
--- a/offapi/com/sun/star/sdb/XRowSetSupplier.idl
+++ b/offapi/com/sun/star/sdb/XRowSetSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XRowSetSupplier_idl__
-#define __com_sun_star_sdb_XRowSetSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XRowSet_idl__
-#include <com/sun/star/sdbc/XRowSet.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-//=============================================================================
-
+#ifndef __com_sun_star_sdb_XRowSetSupplier_idl__ 
+#define __com_sun_star_sdb_XRowSetSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_XRowSet_idl__ 
+#include <com/sun/star/sdbc/XRowSet.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+//============================================================================= 
+ 
 /** uses a row set as datasource.
 
     @see XRowSetChangeBroadcaster
  */
 published interface XRowSetSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** provides access to the data source.
         @returns
             the RowSet object
      */
-    com::sun::star::sdbc::XRowSet getRowSet();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::sdbc::XRowSet getRowSet(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the data source.
         @param xDataSource
             the RowSet object to set
      */
-    [oneway] void setRowSet( [in] com::sun::star::sdbc::XRowSet xDataSource );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
-
-/*===========================================================================
-===========================================================================*/
+    [oneway] void setRowSet( [in] com::sun::star::sdbc::XRowSet xDataSource ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
diff --git a/offapi/com/sun/star/sdb/XRowsChangeBroadcaster.idl b/offapi/com/sun/star/sdb/XRowsChangeBroadcaster.idl
index feb8191c44d9..0ef9fbc5b491 100644
--- a/offapi/com/sun/star/sdb/XRowsChangeBroadcaster.idl
+++ b/offapi/com/sun/star/sdb/XRowsChangeBroadcaster.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -30,11 +30,11 @@
 #ifndef __com_sun_star_sdb_XRowsChangeBroadcaster_idl__
 #define __com_sun_star_sdb_XRowsChangeBroadcaster_idl__
 
-#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/uno/XInterface.idl> 
 
 //=============================================================================
 
-module com { module sun { module star { module sdb {
+module com { module sun { module star { module sdb { 
 
 interface XRowsChangeListener;
 
@@ -59,7 +59,7 @@ interface XRowsChangeBroadcaster
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/XRowsChangeListener.idl b/offapi/com/sun/star/sdb/XRowsChangeListener.idl
index 995636e95e3f..e6b0e6305de8 100644
--- a/offapi/com/sun/star/sdb/XRowsChangeListener.idl
+++ b/offapi/com/sun/star/sdb/XRowsChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,34 +27,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XRowsChangeListener_idl__
-#define __com_sun_star_sdb_XRowsChangeListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-#include <com/sun/star/sdb/RowsChangeEvent.idl>
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_XRowsChangeListener_idl__ 
+#define __com_sun_star_sdb_XRowsChangeListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+#include <com/sun/star/sdb/RowsChangeEvent.idl> 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** is used for receiving "rowsChanged" events
     posted by, for example, a rowset.
  */
 interface XRowsChangeListener: com::sun::star::lang::XEventListener
-{
-
+{ 
+     
     /** is called when rows are inserted, updated, or deleted.
         @param event
             contains information about the event
      */
-    [oneway] void rowsChanged([in]com::sun::star::sdb::RowsChangeEvent event);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [oneway] void rowsChanged([in]com::sun::star::sdb::RowsChangeEvent event); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl b/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl
index 2583428ba6ee..b54ba0293770 100644
--- a/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl
+++ b/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XSQLErrorBroadcaster_idl__
-#define __com_sun_star_sdb_XSQLErrorBroadcaster_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XSQLErrorListener_idl__
-#include <com/sun/star/sdb/XSQLErrorListener.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_XSQLErrorBroadcaster_idl__ 
+#define __com_sun_star_sdb_XSQLErrorBroadcaster_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdb_XSQLErrorListener_idl__ 
+#include <com/sun/star/sdb/XSQLErrorListener.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** interface for notifying potential listeners
-    of
+    of 
     <type scope="com::sun::star::sdbc">SQLException</type>
     s posted by any database object.
  */
 published interface XSQLErrorBroadcaster: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** adds the specified listener to receive the event "errorOccured"
         @param com::sun::star::sdb::XSQLErrorListener
      */
-    [oneway] void addSQLErrorListener(
-            [in]XSQLErrorListener Listener );
-    //-------------------------------------------------------------------------
-
+    [oneway] void addSQLErrorListener( 
+            [in]XSQLErrorListener Listener ); 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified listener.
         @param com::sun::star::sdb::XSQLErrorListener
      */
-    [oneway] void removeSQLErrorListener(
-            [in]XSQLErrorListener Listener );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
-/*===========================================================================
-===========================================================================*/
+    [oneway] void removeSQLErrorListener( 
+            [in]XSQLErrorListener Listener ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+ 
+#endif 
+/*=========================================================================== 
+===========================================================================*/ 
diff --git a/offapi/com/sun/star/sdb/XSQLErrorListener.idl b/offapi/com/sun/star/sdb/XSQLErrorListener.idl
index 109e9b5043e1..2a8833a8dea5 100644
--- a/offapi/com/sun/star/sdb/XSQLErrorListener.idl
+++ b/offapi/com/sun/star/sdb/XSQLErrorListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XSQLErrorListener_idl__
-#define __com_sun_star_sdb_XSQLErrorListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_SQLErrorEvent_idl__
-#include <com/sun/star/sdb/SQLErrorEvent.idl>
-#endif
-
- module com {  module sun {  module star {  module sdb {
-
-
+#ifndef __com_sun_star_sdb_XSQLErrorListener_idl__ 
+#define __com_sun_star_sdb_XSQLErrorListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdb_SQLErrorEvent_idl__ 
+#include <com/sun/star/sdb/SQLErrorEvent.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+ 
 /** the listener interface for receiving "errorOccured" events
     posted by any database object.
  */
 published interface XSQLErrorListener: com::sun::star::lang::XEventListener
-{
-
-    /** invoked when a database error occurs, just before a
+{ 
+     
+    /** invoked when a database error occurs, just before a 
         <type scope="com::sun::star::sdbc">SQLException</type>
         is thrown to the application.
         @param aEvent
             the event which occured
      */
-    void errorOccured([in]com::sun::star::sdb::SQLErrorEvent aEvent);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void errorOccured([in]com::sun::star::sdb::SQLErrorEvent aEvent); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XSQLQueryComposer.idl b/offapi/com/sun/star/sdb/XSQLQueryComposer.idl
index bdfd321c2b09..bbf290c1e04c 100644
--- a/offapi/com/sun/star/sdb/XSQLQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/XSQLQueryComposer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,64 +24,64 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XSQLQueryComposer_idl__
-#define __com_sun_star_sdb_XSQLQueryComposer_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sdb {
-
-//=============================================================================
-
+#ifndef __com_sun_star_sdb_XSQLQueryComposer_idl__ 
+#define __com_sun_star_sdb_XSQLQueryComposer_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+//============================================================================= 
+ 
 /** should be provided by a tool which simplifies the handling with SQL select statements.
-
+    
     <p>
     The interface can be used for composing SELECT statements without knowing the
     structure of the used query.
     </p>
  */
 published interface XSQLQueryComposer: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns the query used for composing.
         @returns
             the query
      */
-    string getQuery();
-    //-------------------------------------------------------------------------
-
+    string getQuery(); 
+    //------------------------------------------------------------------------- 
+     
     /** sets a new query for the composer, which may be expanded by filters
         and sort criteria.
         @param command
             the command to set
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void setQuery([in] string command )
-            raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void setQuery([in] string command ) 
+            raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** returns the query composed with filters and sort criterias.
         @returns
             the composed query
      */
-    string getComposedQuery();
-    //-------------------------------------------------------------------------
-
+    string getComposedQuery(); 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently used filter.
-
+        
         <p>
         The filter criteria returned is part of the where condition of the
         select command, but it does not contain the where token.
@@ -89,26 +89,26 @@ published interface XSQLQueryComposer: com::sun::star::uno::XInterface
         @returns
             the filter
      */
-    string getFilter();
-    //-------------------------------------------------------------------------
-
-    /** returns the currently used filter.
+    string getFilter(); 
+    //------------------------------------------------------------------------- 
+     
+    /** returns the currently used filter. 
              <p>
-             The filter criteria is split into levels. Each level represents the
-             OR criterias. Within each level, the filters are provided as an AND criteria
-             with the name of the column and the filter condition. The filter condition
+             The filter criteria is split into levels. Each level represents the 
+             OR criterias. Within each level, the filters are provided as an AND criteria 
+             with the name of the column and the filter condition. The filter condition 
              is of type string.
              </p>
         @returns
             the structured filter
      */
-    sequence< sequence<com::sun::star::beans::PropertyValue> >
-        getStructuredFilter();
-    //-------------------------------------------------------------------------
-
+    sequence< sequence<com::sun::star::beans::PropertyValue> > 
+        getStructuredFilter(); 
+    //------------------------------------------------------------------------- 
+     
     /** returns the currently used sort order.
-
-
+        
+        
         <p>
         The order criteria returned is part of the ORDER BY clause of the
         select command, but it does not contain the ORDER BY keyword .
@@ -116,60 +116,60 @@ published interface XSQLQueryComposer: com::sun::star::uno::XInterface
         @returns
             the order
      */
-    string getOrder();
-    //-------------------------------------------------------------------------
-
-    /** appends a new filter condition by a
+    string getOrder(); 
+    //------------------------------------------------------------------------- 
+     
+    /** appends a new filter condition by a 
         <type scope="com::sun::star::sdb">DataColumn</type>
         providing the name and the value for the filter.
         @param column
             the column which is used to create a filter
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException  
             if a database access error occurs.
      */
-    void appendFilterByColumn([in] com::sun::star::beans::XPropertySet column)
-            raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void appendFilterByColumn([in] com::sun::star::beans::XPropertySet column) 
+            raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** appends an additional part to the sort order criteria of the select
         statement.
         @param column
             the column which is used to create a order part
-        @param  ascending
+        @param	ascending
             <TRUE/> when the order should be ascending, otherwise <FALSE/>
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException  
             if a database access error occurs.
      */
-    void appendOrderByColumn([in] com::sun::star::beans::XPropertySet column,
-                              [in] boolean ascending)
-            raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
-    /** makes it possible to set a filter condition for the query.
+    void appendOrderByColumn([in] com::sun::star::beans::XPropertySet column, 
+                              [in] boolean ascending) 
+            raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** makes it possible to set a filter condition	for the query.
         @param filter
             the filter to set
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException  
             if a database access error occurs.
      */
-    void setFilter([in] string filter)
-            raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void setFilter([in] string filter) 
+            raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** makes it possibile to set a sort condition for the query.
         @param order
             the order part to set
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException  
             if a database access error occurs.
      */
-    void setOrder([in] string order)
-            raises (com::sun::star::sdbc::SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void setOrder([in] string order) 
+            raises (com::sun::star::sdbc::SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl b/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl
index 1382966f264c..00fd8fe4e52f 100644
--- a/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl
+++ b/offapi/com/sun/star/sdb/XSQLQueryComposerFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XSQLQueryComposerFactory_idl__
-#define __com_sun_star_sdb_XSQLQueryComposerFactory_idl__
-
-#ifndef __com_sun_star_sdb_XSQLQueryComposer_idl__
-#include <com/sun/star/sdb/XSQLQueryComposer.idl>
-#endif
-
-//=============================================================================
- module com {  module sun {  module star {  module sdb {
-
-//=============================================================================
-
-/** is a factory for instances of service
+#ifndef __com_sun_star_sdb_XSQLQueryComposerFactory_idl__ 
+#define __com_sun_star_sdb_XSQLQueryComposerFactory_idl__ 
+ 
+#ifndef __com_sun_star_sdb_XSQLQueryComposer_idl__ 
+#include <com/sun/star/sdb/XSQLQueryComposer.idl> 
+#endif 
+ 
+//============================================================================= 
+ module com {  module sun {  module star {  module sdb { 
+ 
+//============================================================================= 
+ 
+/** is a factory for instances of service 
     <type scope="com::sun::star::sdb">SQLQueryComposer</type>
     .
  */
 published interface XSQLQueryComposerFactory: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** creates a new query composer.
         @returns
             the SQLQueryComposer object
      */
-    com::sun::star::sdb::XSQLQueryComposer createQueryComposer();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::sdb::XSQLQueryComposer createQueryComposer(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
index 96041b71e86b..ee764cc9ef20 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
index ad609262ecbe..c11938c11a75 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdb_XSingleSelectQueryComposer_idl__
-#define __com_sun_star_sdb_XSingleSelectQueryComposer_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
-#ifndef __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__
-#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sdb {
-
-//=============================================================================
-
+#ifndef __com_sun_star_sdb_XSingleSelectQueryComposer_idl__ 
+#define __com_sun_star_sdb_XSingleSelectQueryComposer_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdb_XSingleSelectQueryAnalyzer_idl__ 
+#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl> 
+#endif 
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sdb { 
+ 
+//============================================================================= 
+ 
 /** simplifies the composing of single select statements.
-
+    
     <p>
     The interface can be used for composing single SELECT statements without knowing the
     structure of the used query.
@@ -59,164 +59,164 @@
     @see com::sun::star::sdb::SingleSelectQueryComposer
  */
 interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     // FILTER
-    //-------------------------------------------------------------------------
-
-    /** makes it possible to set a filter condition for the query.
+    //------------------------------------------------------------------------- 
+     
+    /** makes it possible to set a filter condition	for the query.
         @param filter
             the filter to set
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException  
             if a database access error occurs
-            or the statement isn't valid
+            or the statement isn't valid 
             or the statement isn't parseable.
      */
-    void setFilter([in] string filter)
-            raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
+    void setFilter([in] string filter) 
+            raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
 
     /** appends a new set of filter criteria which is split into levels.
         @param filter
-            The filter criteria is split into levels. Each level represents the
-            OR criterias. Within each level, the filters are provided as an AND criteria
-            with the name of the column and the filter condition. The filter condition
+            The filter criteria is split into levels. Each level represents the 
+            OR criterias. Within each level, the filters are provided as an AND criteria 
+            with the name of the column and the filter condition. The filter condition 
             is of type string. The operator used, is defined by <type scope="com::sun::star::sdb">SQLFilterOperator</type>.
 
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException  
             if a database access error occurs.
      */
     void setStructuredFilter([in] sequence< sequence<com::sun::star::beans::PropertyValue> > filter)
-        raises (com::sun::star::sdbc::SQLException,com::sun::star::lang::IllegalArgumentException);
-    //-------------------------------------------------------------------------
-
-    /** appends a new filter condition by a
+        raises (com::sun::star::sdbc::SQLException,com::sun::star::lang::IllegalArgumentException); 
+    //------------------------------------------------------------------------- 
+     
+    /** appends a new filter condition by a 
         <type scope="com::sun::star::sdb">DataColumn</type>
-        providing the name and the value for the filter.
+        providing the name and the value for the filter. 
         The value property must be supported by the <type scope="com::sun::star::sdb">DataColumn</type>.
         @param column
             the column which is used to create a filter
-        @param  andCriteria
+        @param	andCriteria
             If <TRUE/> the filter condition will be appended as an AND condition, otherwise
             the new filter condition will be appended as OR criteria.
             E.g. (xx AND bb AND cc) OR newCriteria
         @param  filterOperator
             The operator used, is defined by <type scope="com::sun::star::sdb">SQLFilterOperator</type>.
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException  
             if a database access error occurs.
      */
     void appendFilterByColumn([in] com::sun::star::beans::XPropertySet column,[in] boolean andCriteria,[in] long filterOperator)
-            raises (com::sun::star::sdbc::SQLException);
+            raises (com::sun::star::sdbc::SQLException); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // GROUP BY
-    //-------------------------------------------------------------------------
-
-
+    //-------------------------------------------------------------------------  
+     
+     
     /** makes it possibile to set a group for the query.
         @param group
             the group part to set
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException  
             if a database access error occurs
-            or the statement isn't valid
+            or the statement isn't valid 
             or the statement isn't parseable..
      */
-    void setGroup([in] string group)
-            raises (com::sun::star::sdbc::SQLException);
-
-    //-------------------------------------------------------------------------
+    void setGroup([in] string group) 
+            raises (com::sun::star::sdbc::SQLException); 
 
+    //------------------------------------------------------------------------- 
+     
     /** appends an additional part to the group criteria of the select
         statement. The column must be a <type scope="com::sun::star::sdbcx">Column</type>.
         @param column
             the column which is used to create a group part
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException  
             if a database access error occurs.
      */
-    void appendGroupByColumn([in] com::sun::star::beans::XPropertySet column)
-            raises (com::sun::star::sdbc::SQLException);
-
-    //-------------------------------------------------------------------------
+    void appendGroupByColumn([in] com::sun::star::beans::XPropertySet column) 
+            raises (com::sun::star::sdbc::SQLException); 
+    
+    //------------------------------------------------------------------------- 
     // HAVING
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** makes it possible to set a HAVING filter condition for the query.
         @param filter
             the filter to set
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException  
             if a database access error occurs
-            or the statement isn't valid
+            or the statement isn't valid 
             or the statement isn't parseable.
      */
-    void setHavingClause([in] string filter)
-            raises (com::sun::star::sdbc::SQLException);
+    void setHavingClause([in] string filter) 
+            raises (com::sun::star::sdbc::SQLException); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** appends a new set of HAVING filter criteria which is split into levels.
         @param filter
-            The HAVING filter criteria is split into levels. Each level represents the
-            OR criterias. Within each level, the filters are provided as an AND criteria
-            with the name of the column and the filter condition. The filter condition
+            The HAVING filter criteria is split into levels. Each level represents the 
+            OR criterias. Within each level, the filters are provided as an AND criteria 
+            with the name of the column and the filter condition. The filter condition 
             is of type string. The operator used, is defined by <type scope="com::sun::star::sdb">SQLFilterOperator</type>.
 
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException  
             if a database access error occurs.
      */
     void setStructuredHavingClause([in] sequence< sequence<com::sun::star::beans::PropertyValue> > filter)
-            raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
-    /** appends a new HAVING filter condition by a
+            raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** appends a new HAVING filter condition by a 
         <type scope="com::sun::star::sdb">DataColumn</type>
         providing the name and the value for the filter.
         @param column
             the column which is used to create a filter
-        @param  andCriteria
+        @param	andCriteria
             If <TRUE/> the filter condition will be appended as an AND condition, otherwise
             the new filter condition will be appended as OR criteria.
             E.g. (xx AND bb AND cc) OR newCriteria
         @param  filterOperator
             The operator used, is defined by <type scope="com::sun::star::sdb">SQLFilterOperator</type>.
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException  
             if a database access error occurs.
      */
-    void appendHavingClauseByColumn([in] com::sun::star::beans::XPropertySet column,[in] boolean andCriteria,[in] long filterOperator)
-            raises (com::sun::star::sdbc::SQLException);
+    void appendHavingClauseByColumn([in] com::sun::star::beans::XPropertySet column,[in] boolean andCriteria,[in] long filterOperator) 
+            raises (com::sun::star::sdbc::SQLException); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     // ORDER BY
-    //-------------------------------------------------------------------------
-
+    //-------------------------------------------------------------------------  
+     
     /** makes it possibile to set a sort condition for the query.
         @param order
             the order part to set
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException  
             if a database access error occurs
-            or the order isn't valid
+            or the order isn't valid 
             or the statement isn't parseable.
      */
-    void setOrder([in] string order)
-            raises (com::sun::star::sdbc::SQLException);
-
-    //-------------------------------------------------------------------------
+    void setOrder([in] string order) 
+            raises (com::sun::star::sdbc::SQLException); 
 
+    //------------------------------------------------------------------------- 
+     
     /** appends an additional part to the sort order criteria of the select
         statement. The column must be a <type scope="com::sun::star::sdbcx">Column</type>.
         @param column
             the column which is used to create a order part
-        @param  ascending
+        @param	ascending
             <TRUE/> when the order should be ascending, otherwise if <FALSE/> descending.
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException  
             if a database access error occurs.
      */
-    void appendOrderByColumn([in] com::sun::star::beans::XPropertySet column,
-                              [in] boolean ascending)
-            raises (com::sun::star::sdbc::SQLException);
-
-    //-------------------------------------------------------------------------
+    void appendOrderByColumn([in] com::sun::star::beans::XPropertySet column, 
+                              [in] boolean ascending) 
+            raises (com::sun::star::sdbc::SQLException); 
+    
+    //------------------------------------------------------------------------- 
     // culmulative composing
-    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------  
 
     /** sets a new elementary query for the composer
 
@@ -261,14 +261,14 @@ interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
     {
         set raises (com::sun::star::sdbc::SQLException);
     };
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
 
diff --git a/offapi/com/sun/star/sdb/XSubDocument.idl b/offapi/com/sun/star/sdb/XSubDocument.idl
index 0592c6cffa0a..c722259f2bb0 100644
--- a/offapi/com/sun/star/sdb/XSubDocument.idl
+++ b/offapi/com/sun/star/sdb/XSubDocument.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module sdb {
+module com { module sun { module star { module sdb { 
 
 //=============================================================================
 
@@ -95,7 +95,7 @@ interface XSubDocument
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/CopyTableContinuation.idl b/offapi/com/sun/star/sdb/application/CopyTableContinuation.idl
index 7b8bad2cc841..1110d467f1b3 100644
--- a/offapi/com/sun/star/sdb/application/CopyTableContinuation.idl
+++ b/offapi/com/sun/star/sdb/application/CopyTableContinuation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module sdb { module application {
+module com { module sun { module star { module sdb { module application { 
 
 //=============================================================================
 
@@ -62,7 +62,7 @@ constants CopyTableContinuation
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/CopyTableOperation.idl b/offapi/com/sun/star/sdb/application/CopyTableOperation.idl
index d4c9f3870b4b..cfa55c9e8ac3 100644
--- a/offapi/com/sun/star/sdb/application/CopyTableOperation.idl
+++ b/offapi/com/sun/star/sdb/application/CopyTableOperation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,13 +30,13 @@
 
 //=============================================================================
 
-module com { module sun { module star { module sdb { module application {
+module com { module sun { module star { module sdb { module application { 
 
 //=============================================================================
 
 /** specifies the different basic operations a <type>CopyTableWizard</type>
     can do.
-
+ 
     @since OOo 2.4
 */
 constants CopyTableOperation
@@ -65,7 +65,7 @@ constants CopyTableOperation
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl b/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl
index 9a9fc8761d02..e7e47262296f 100644
--- a/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl
+++ b/offapi/com/sun/star/sdb/application/CopyTableRowEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,16 +28,16 @@
 #ifndef __com_sun_star_sdb_application_CopyTableRowEvent_idl__
 #define __com_sun_star_sdb_application_CopyTableRowEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
+#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl>
 #endif
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
+#ifndef __com_sun_star_sdbc_XResultSet_idl__ 
 #include <com/sun/star/sdbc/XResultSet.idl>
 #endif
 
 //=============================================================================
 
-module com { module sun { module star { module sdb { module application {
+module com { module sun { module star { module sdb { module application { 
 
 //=============================================================================
 
@@ -64,7 +64,7 @@ struct CopyTableRowEvent : ::com::sun::star::lang::EventObject
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/CopyTableWizard.idl b/offapi/com/sun/star/sdb/application/CopyTableWizard.idl
index f294c9f69d2c..f271a7d428f4 100644
--- a/offapi/com/sun/star/sdb/application/CopyTableWizard.idl
+++ b/offapi/com/sun/star/sdb/application/CopyTableWizard.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,16 +31,16 @@
 #ifndef __com_sun_star_sdb_application_XCopyTableWizard_idl__
 #include <com/sun/star/sdb/application/XCopyTableWizard.idl>
 #endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
 #include <com/sun/star/lang/WrappedTargetException.idl>
 #endif
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
+#ifndef __com_sun_star_task_XInteractionHandler_idl__ 
 #include <com/sun/star/task/XInteractionHandler.idl>
 #endif
 #ifndef __com_sun_star_sdbc_SQLException_idl__
@@ -49,7 +49,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module sdb { module application {
+module com { module sun { module star { module sdb { module application { 
 
 //=============================================================================
 
@@ -224,7 +224,7 @@ service CopyTableWizard : XCopyTableWizard
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/DatabaseObject.idl b/offapi/com/sun/star/sdb/application/DatabaseObject.idl
index 3239d69a58f4..abb5b356e77d 100644
--- a/offapi/com/sun/star/sdb/application/DatabaseObject.idl
+++ b/offapi/com/sun/star/sdb/application/DatabaseObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,13 @@
 #ifndef __com_sun_star_sdb_application_DatabaseObject_idl__
 #define __com_sun_star_sdb_application_DatabaseObject_idl__
 
-#ifndef __com_sun_star_sdb_CommandType_idl__
+#ifndef __com_sun_star_sdb_CommandType_idl__ 
 #include <com/sun/star/sdb/CommandType.idl>
 #endif
 
 //=============================================================================
 
-module com { module sun { module star { module sdb { module application {
+module com { module sun { module star { module sdb { module application { 
 
 //=============================================================================
 
@@ -69,7 +69,7 @@ constants DatabaseObject
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/DatabaseObjectContainer.idl b/offapi/com/sun/star/sdb/application/DatabaseObjectContainer.idl
index b773054a8943..fc67098c0bc5 100644
--- a/offapi/com/sun/star/sdb/application/DatabaseObjectContainer.idl
+++ b/offapi/com/sun/star/sdb/application/DatabaseObjectContainer.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module sdb { module application {
+module com { module sun { module star { module sdb { module application { 
 
 //=============================================================================
 
@@ -97,7 +97,7 @@ constants DatabaseObjectContainer
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/DefaultViewController.idl b/offapi/com/sun/star/sdb/application/DefaultViewController.idl
index f46c74467dc3..c9aa8c7e7b88 100644
--- a/offapi/com/sun/star/sdb/application/DefaultViewController.idl
+++ b/offapi/com/sun/star/sdb/application/DefaultViewController.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module sdb { module application {
+module com { module sun { module star { module sdb { module application { 
 
 //=============================================================================
 
@@ -94,7 +94,7 @@ service DefaultViewController
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/NamedDatabaseObject.idl b/offapi/com/sun/star/sdb/application/NamedDatabaseObject.idl
index f61fe3022a97..221e81deeb4e 100644
--- a/offapi/com/sun/star/sdb/application/NamedDatabaseObject.idl
+++ b/offapi/com/sun/star/sdb/application/NamedDatabaseObject.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,12 +29,12 @@
 
 //=============================================================================
 
-module com { module sun { module star { module sdb { module application {
+module com { module sun { module star { module sdb { module application { 
 
 //=============================================================================
 
 /** denotes a named database object, or a named folder of database objects
-
+    
     @since OOo 3.0
 */
 struct NamedDatabaseObject
@@ -80,7 +80,7 @@ struct NamedDatabaseObject
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/XCopyTableListener.idl b/offapi/com/sun/star/sdb/application/XCopyTableListener.idl
index d53f399b281c..52054372af06 100644
--- a/offapi/com/sun/star/sdb/application/XCopyTableListener.idl
+++ b/offapi/com/sun/star/sdb/application/XCopyTableListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_sdb_application_XCopyTableListener_idl__
 #define __com_sun_star_sdb_application_XCopyTableListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
 #include <com/sun/star/lang/XEventListener.idl>
 #endif
 #ifndef __com_sun_star_sdb_application_CopyTableRowEvent_idl__
@@ -37,7 +37,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module sdb { module application {
+module com { module sun { module star { module sdb { module application { 
 
 //=============================================================================
 
@@ -91,7 +91,7 @@ interface XCopyTableListener : ::com::sun::star::lang::XEventListener
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl b/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl
index 216c9fb45023..595bb128f174 100644
--- a/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl
+++ b/offapi/com/sun/star/sdb/application/XCopyTableWizard.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 #ifndef __com_sun_star_ui_dialogs_XExecutableDialog_idl__
 #include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
 #endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 #ifndef __com_sun_star_beans_Optional_idl__
@@ -40,7 +40,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module sdb { module application {
+module com { module sun { module star { module sdb { module application { 
 
 interface XCopyTableListener;
 
@@ -146,7 +146,7 @@ interface XCopyTableWizard : ::com::sun::star::ui::dialogs::XExecutableDialog
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
index 7c14255045e1..b90eb751aae8 100644
--- a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
+++ b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module sdb { module application {
+module com { module sun { module star { module sdb { module application { 
 
 //=============================================================================
 
@@ -322,7 +322,7 @@ interface XDatabaseDocumentUI
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/application/XTableUIProvider.idl b/offapi/com/sun/star/sdb/application/XTableUIProvider.idl
index ec31ace643aa..fbc71078e9dd 100644
--- a/offapi/com/sun/star/sdb/application/XTableUIProvider.idl
+++ b/offapi/com/sun/star/sdb/application/XTableUIProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module sdb { module application {
+module com { module sun { module star { module sdb { module application { 
 
 interface XDatabaseDocumentUI;
 
@@ -115,7 +115,7 @@ interface XTableUIProvider
 
 //=============================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdb/tools/CompositionType.idl b/offapi/com/sun/star/sdb/tools/CompositionType.idl
index 750df9b5e0d7..8195529a016a 100644
--- a/offapi/com/sun/star/sdb/tools/CompositionType.idl
+++ b/offapi/com/sun/star/sdb/tools/CompositionType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -81,7 +81,7 @@ constants CompositionType
     */
     const   long    Complete                 = 5;
 };
-
+    
 //=============================================================================
 }; }; }; }; };
 //=============================================================================
diff --git a/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl b/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
index c0ec570ccf60..a323fb8ff870 100644
--- a/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
+++ b/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
index 29e47c597e09..9d7c792eb2b8 100644
--- a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
+++ b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,11 +31,11 @@
 #ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
 #endif
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
 
-module com {  module sun {  module star {
+module com {  module sun {  module star {  
     module container {
         interface XNameAccess;
     };
@@ -44,7 +44,7 @@ module com {  module sun {  module star {
     };
 };};};
 //=============================================================================
-module com {  module sun {  module star {  module sdb {
+module com {  module sun {  module star {  module sdb { 
     interface XSingleSelectQueryComposer;
     module tools {
 //=============================================================================
@@ -133,7 +133,7 @@ interface XConnectionTools
         @param command
             the object. This may be a table name, a query name, or an SQL statement, depending on the value
             of <arg>_nCommandType</arg>
-        @return
+        @return 
             the composer filled with command and command type.
     */
     ::com::sun::star::sdb::XSingleSelectQueryComposer getComposer([in] long commandType,[in] string command);
diff --git a/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl b/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
index b2b00c758250..4ceaa0f7627c 100644
--- a/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
+++ b/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl b/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
index fdc7ce517ca8..d81ad8eaebca 100644
--- a/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
+++ b/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,11 +64,11 @@ interface XIndexAlteration
             the table to be altered
         @param index
             the name of the column to be dropped
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void dropIndex([in] com::sun::star::beans::XPropertySet table,[in] string index)
-        raises ( com::sun::star::sdbc::SQLException);
+    void dropIndex([in] com::sun::star::beans::XPropertySet table,[in] string index) 
+        raises ( com::sun::star::sdbc::SQLException); 
 
     /** creates a new object using the given descriptor and appends it
         to the related container.
@@ -80,10 +80,10 @@ interface XIndexAlteration
             the table to be altered
         @param descriptor
             the descriptor which should be serve to append a new object
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void addIndex([in] com::sun::star::beans::XPropertySet table,[in]com::sun::star::beans::XPropertySet descriptor)
+    void addIndex([in] com::sun::star::beans::XPropertySet table,[in]com::sun::star::beans::XPropertySet descriptor) 
         raises (com::sun::star::sdbc::SQLException);
 
 
diff --git a/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl b/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
index 44389dfe64fd..e570bd90b7b5 100644
--- a/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
+++ b/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,11 +64,11 @@ interface XKeyAlteration
             the table to be altered
         @param key
             the key to be dropped
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void dropKey([in] com::sun::star::beans::XPropertySet table,[in] com::sun::star::beans::XPropertySet key)
-        raises ( com::sun::star::sdbc::SQLException);
+    void dropKey([in] com::sun::star::beans::XPropertySet table,[in] com::sun::star::beans::XPropertySet key) 
+        raises ( com::sun::star::sdbc::SQLException); 
 
     /** creates a new object using the given descriptor and appends it
         to the related container.
@@ -80,10 +80,10 @@ interface XKeyAlteration
             the table to be altered
         @param descriptor
             the descriptor which should be serve to append a new object
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void addKey([in] com::sun::star::beans::XPropertySet table,[in]com::sun::star::beans::XPropertySet descriptor)
+    void addKey([in] com::sun::star::beans::XPropertySet table,[in]com::sun::star::beans::XPropertySet descriptor) 
         raises (com::sun::star::sdbc::SQLException);
 
 
diff --git a/offapi/com/sun/star/sdb/tools/XObjectNames.idl b/offapi/com/sun/star/sdb/tools/XObjectNames.idl
index 16b2bae93baa..db40a0e67b30 100644
--- a/offapi/com/sun/star/sdb/tools/XObjectNames.idl
+++ b/offapi/com/sun/star/sdb/tools/XObjectNames.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sdb/tools/XTableAlteration.idl b/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
index fe0fe494fead..b0adc8b08153 100644
--- a/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableAlteration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -88,11 +88,11 @@ interface XTableAlteration
             the table to be altered
         @param descriptor
             the descriptor which should be serve to append a new object
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
         @see com::sun::star::sdbcx::XAppend
      */
-    void addColumn([in] com::sun::star::beans::XPropertySet table,[in]com::sun::star::beans::XPropertySet descriptor)
+    void addColumn([in] com::sun::star::beans::XPropertySet table,[in]com::sun::star::beans::XPropertySet descriptor) 
         raises (com::sun::star::sdbc::SQLException);
 
     /** drops an object of the related container identified by its name.
@@ -100,12 +100,12 @@ interface XTableAlteration
             the table to be altered
         @param columnName
             the name of the column to be dropped
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
         @see com::sun::star::sdbcx::XDrop
      */
-    void dropColumn([in] com::sun::star::beans::XPropertySet table,[in]string columnName)
-        raises ( com::sun::star::sdbc::SQLException);
+    void dropColumn([in] com::sun::star::beans::XPropertySet table,[in]string columnName) 
+        raises ( com::sun::star::sdbc::SQLException); 
 };
 //=============================================================================
 }; }; }; }; };
diff --git a/offapi/com/sun/star/sdb/tools/XTableName.idl b/offapi/com/sun/star/sdb/tools/XTableName.idl
index 48070da02fe6..758af4fac55a 100644
--- a/offapi/com/sun/star/sdb/tools/XTableName.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableName.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -98,7 +98,7 @@ interface XTableName
 
         @see CompositionType
 
-        @throws com::sun::star::IllegalArgumentException
+        @throws com::sun::star::IllegalArgumentException    
             if the given <arg>Type</arg> does not denote a valid <type>CompositionType</type>
     */
     string  getComposedName( [in] long Type, [in] boolean Quote )
diff --git a/offapi/com/sun/star/sdb/tools/XTableRename.idl b/offapi/com/sun/star/sdb/tools/XTableRename.idl
index f61d736bae8c..266c4c6cc105 100644
--- a/offapi/com/sun/star/sdb/tools/XTableRename.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableRename.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sdb/tools/XViewAccess.idl b/offapi/com/sun/star/sdb/tools/XViewAccess.idl
index e64727341e81..8c957c5c311c 100644
--- a/offapi/com/sun/star/sdb/tools/XViewAccess.idl
+++ b/offapi/com/sun/star/sdb/tools/XViewAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sdbc/BatchUpdateException.idl b/offapi/com/sun/star/sdbc/BatchUpdateException.idl
index b3ef24879004..c3b59265fa4c 100644
--- a/offapi/com/sun/star/sdbc/BatchUpdateException.idl
+++ b/offapi/com/sun/star/sdbc/BatchUpdateException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,19 +24,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_BatchUpdateException_idl__
-#define __com_sun_star_sdbc_BatchUpdateException_idl__
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_BatchUpdateException_idl__ 
+#define __com_sun_star_sdbc_BatchUpdateException_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** is thrown when an error occurs during a batch update operation.
-
-
+    
+    
     <p>In addition to the information provided by
     <type scope="com::sun::star::sdbc">SQLException</type>
     , a
@@ -48,21 +48,21 @@
     to the batch.</p>
  */
 published exception BatchUpdateException: SQLException
-{
-
-    /** is an array of
+{ 
+     
+    /** is an array of 
         <code>long</code>
-        , with each element
-        indicating the update count for a SQL command that executed
+        , with each element 
+        indicating the update count for a SQL command that executed 
         successfully before the exception was thrown.
      */
-    sequence<long> UpdateCounts;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    sequence<long> UpdateCounts; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/BestRowScope.idl b/offapi/com/sun/star/sdbc/BestRowScope.idl
index 62b4a0344400..d6d3c500f3a0 100644
--- a/offapi/com/sun/star/sdbc/BestRowScope.idl
+++ b/offapi/com/sun/star/sdbc/BestRowScope.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,63 +24,63 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_BestRowScope_idl__
-#define __com_sun_star_sdbc_BestRowScope_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_BestRowScope_idl__ 
+#define __com_sun_star_sdbc_BestRowScope_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** determines how long a row identifier is valid.
  */
 published constants BestRowScope
-{
-
-    /** indicates that the scope of the best row identifier is
-             very temporary, lasting only while the row is being used.
-             A possible value for the column
+{ 
+     
+    /** indicates that the scope of the best row identifier is 
+             very temporary, lasting only while the row is being used. 
+             A possible value for the column 
              <code>SCOPE</code>
              in the
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             object
+             object 
              returned by the method
              <member>XDatabaseMetaData::getBestRowIdentifier()</member>
              .
      */
-    const long TEMPORARY   = 0;
-    //-------------------------------------------------------------------------
-
-    /** indicates that the scope of the best row identifier is
-             the remainder of the current transaction.
-             A possible value for the column
+    const long TEMPORARY   = 0; 
+    //------------------------------------------------------------------------- 
+     
+    /** indicates that the scope of the best row identifier is 
+             the remainder of the current transaction. 
+             A possible value for the column 
              <code>SCOPE</code>
              in the
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             object
+             object 
              returned by the method
              <member>XDatabaseMetaData::getBestRowIdentifier()</member>
              .
      */
-    const long TRANSACTION = 1;
-    //-------------------------------------------------------------------------
-
-    /** indicates that the scope of the best row identifier is
-             the remainder of the current session.
-             A possible value for the column
+    const long TRANSACTION = 1; 
+    //------------------------------------------------------------------------- 
+     
+    /** indicates that the scope of the best row identifier is 
+             the remainder of the current session. 
+             A possible value for the column 
              <code>SCOPE</code>
              in the
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             object
+             object 
              returned by the method
              <member>XDatabaseMetaData::getBestRowIdentifier()</member>
              .
      */
-    const long SESSION     = 2;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long SESSION     = 2; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/BestRowType.idl b/offapi/com/sun/star/sdbc/BestRowType.idl
index ae82ed607bea..96b63be72d89 100644
--- a/offapi/com/sun/star/sdbc/BestRowType.idl
+++ b/offapi/com/sun/star/sdbc/BestRowType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_BestRowType_idl__
-#define __com_sun_star_sdbc_BestRowType_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_BestRowType_idl__ 
+#define __com_sun_star_sdbc_BestRowType_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** determines the type of the best row identifier.
  */
 published constants BestRowType
-{
-
-    /** indicates that the best row identifier may or may not be a pseudo-column.
-             A possible value for the column
+{ 
+     
+    /** indicates that the best row identifier may or may not be a pseudo-column. 
+             A possible value for the column 
              <code>PSEUDO_COLUMN</code>
              in the
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             object
-             returned by the method
+             object 
+             returned by the method 
              <member>XDatabaseMetaData::getBestRowIdentifier()</member>
              .
      */
-    const long UNKNOWN  = 0;
-    //-------------------------------------------------------------------------
-
-    /** indicates that the best row identifier is NOT a pseudo-column.
-             A possible value for the column
+    const long UNKNOWN	= 0; 
+    //------------------------------------------------------------------------- 
+     
+    /** indicates that the best row identifier is NOT a pseudo-column. 
+             A possible value for the column 
              <code>PSEUDO_COLUMN</code>
              in the
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             object
-             returned by the method
+             object 
+             returned by the method 
              <member>XDatabaseMetaData::getBestRowIdentifier()</member>
              .
      */
-    const long NOT_PSEUDO   = 1;
-    //-------------------------------------------------------------------------
-
-    /** indicates that the best row identifier is a pseudo-column.
-             A possible value for the column
+    const long NOT_PSEUDO	= 1; 
+    //------------------------------------------------------------------------- 
+     
+    /** indicates that the best row identifier is a pseudo-column. 
+             A possible value for the column 
              <code>PSEUDO_COLUMN</code>
              in the
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             object
+             object 
              returned by the method
              <member>XDatabaseMetaData::getBestRowIdentifier()</member>
              .
      */
-    const long PSEUDO   = 2;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long PSEUDO	= 2; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/CallableStatement.idl b/offapi/com/sun/star/sdbc/CallableStatement.idl
index c0e8a49c1144..3efcd4fa46e9 100644
--- a/offapi/com/sun/star/sdbc/CallableStatement.idl
+++ b/offapi/com/sun/star/sdbc/CallableStatement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,22 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_CallableStatement_idl__
-#define __com_sun_star_sdbc_CallableStatement_idl__
-
-#ifndef __com_sun_star_sdbc_PreparedStatement_idl__
-#include <com/sun/star/sdbc/PreparedStatement.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XRow;
- published interface XOutParameters;
-
-
+#ifndef __com_sun_star_sdbc_CallableStatement_idl__ 
+#define __com_sun_star_sdbc_CallableStatement_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_PreparedStatement_idl__ 
+#include <com/sun/star/sdbc/PreparedStatement.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XRow; 
+ published interface XOutParameters; 
+ 
+ 
 /** is used to execute SQL stored procedures.
-
-
+    
+    
     <p>
     SDBC provides a stored procedure SQL escape that allows stored procedures
     to be called in a standard way for all RDBMSs. This escape syntax has one
@@ -57,21 +57,21 @@
     <type scope="com::sun::star::sdbc">PreparedStatement</type>
     . The type of all
     OUT parameters must be registered prior to executing the stored procedure;
-    their values are retrieved after execution via the
+    their values are retrieved after execution via the 
     <code>get</code>
     methods
-    provided by the
+    provided by the 
     <type scope="com::sun::star::sdbc">XRow</type>
     .
     </p>
     <p>
-    A
+    A 
     <code>CallableStatement</code>
     can return one
     <type scope="com::sun::star::sdbc">XResultSet</type>
     or multiple
     <type scope="com::sun::star::sdbc">ResultSet</type>
-    objects. Multiple
+    objects. Multiple 
     <code>ResultSet</code>
     objects are
     handled using operations inherited from
@@ -79,7 +79,7 @@
     .
     </p>
     <p>
-    For maximum portability, a call's
+    For maximum portability, a call's 
     <type scope="com::sun::star::sdbc">ResultSet</type>
     objects and
     update counts should be processed prior to getting the values of output
@@ -87,24 +87,24 @@
     </p>
 */
 published service CallableStatement
-{
-    service PreparedStatement;
-
-
+{ 
+    service PreparedStatement; 
+ 
+     
     /** is used for retrieve the values of OUT parameters.
      */
-    interface XRow;
-
-
+    interface XRow; 
+ 
+     
     /** is used to declare parameters as OUT parameters.
      */
-    interface XOutParameters;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    interface XOutParameters; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/ChangeAction.idl b/offapi/com/sun/star/sdbc/ChangeAction.idl
index e7809c988f8a..dd8b403db05d 100644
--- a/offapi/com/sun/star/sdbc/ChangeAction.idl
+++ b/offapi/com/sun/star/sdbc/ChangeAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,22 +36,22 @@ published constants ChangeAction
     /**
      indicates that a insert will be performed.
      */
-    const long INSERT   = 1;
+    const long INSERT	= 1;
     //-------------------------------------------------------------------------
     /**
      indicates that a update will be performed.
      */
-    const long UPDATE   = 2;
+    const long UPDATE	= 2;
     //-------------------------------------------------------------------------
     /**
      indicates that a delete will be performed.
      */
-    const long DELETE   = 3;
+    const long DELETE	= 3;
     //-------------------------------------------------------------------------
     /**
      indicates that a undo will be performed.
      */
-    const long UNDO = 4;
+    const long UNDO	= 4;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sdbc/ChangeEvent.idl b/offapi/com/sun/star/sdbc/ChangeEvent.idl
index 563d722bc3ee..77476db9bc8e 100644
--- a/offapi/com/sun/star/sdbc/ChangeEvent.idl
+++ b/offapi/com/sun/star/sdbc/ChangeEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sdbc/ColumnSearch.idl b/offapi/com/sun/star/sdbc/ColumnSearch.idl
index bdb7afba35e5..9d1d002d3bea 100644
--- a/offapi/com/sun/star/sdbc/ColumnSearch.idl
+++ b/offapi/com/sun/star/sdbc/ColumnSearch.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,84 +24,84 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_ColumnSearch_idl__
-#define __com_sun_star_sdbc_ColumnSearch_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_ColumnSearch_idl__ 
+#define __com_sun_star_sdbc_ColumnSearch_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** indicates in which way a column can be used in the WHERE search.
  */
 published constants ColumnSearch
-{
-    //-------------------------------------------------------------------------
-
-    /** A possible value for column <code>SEARCHABLE</code> in the
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** A possible value for column <code>SEARCHABLE</code> in the 
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             object returned by the method
+             object returned by the method 
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getTypeInfo()</member>
-             .
+             . 
              <p>
-             Indicates that
+             Indicates that 
              <code>WHERE</code>
-             search clauses are not supported
+             search clauses are not supported 
              for this type.
      */
-    const long NONE = 0;
-    //-------------------------------------------------------------------------
-
-    /** A possible value for column <code>SEARCHABLE</code> in the
+    const long NONE = 0; 
+    //------------------------------------------------------------------------- 
+     
+    /** A possible value for column <code>SEARCHABLE</code> in the 
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             object returned by the method
+             object returned by the method 
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getTypeInfo()</member>
              .
              <p>
-             Indicates that the only
+             Indicates that the only 
              <code>WHERE</code>
-             search clause that can
-             be based on this type is
+             search clause that can 
+             be based on this type is 
              <code>WHERE...LIKE</code>
              .
      */
-    const long CHAR = 1;
-    //-------------------------------------------------------------------------
-
-    /** A possible value for column <code>SEARCHABLE</code> in the
+    const long CHAR = 1; 
+    //------------------------------------------------------------------------- 
+     
+    /** A possible value for column <code>SEARCHABLE</code> in the 
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             object returned by the method
+             object returned by the method 
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getTypeInfo()</member>
              .
              <p>
-             Indicates that one can base all
+             Indicates that one can base all 
              <code>WHERE</code>
-             search clauses
-             except
+             search clauses 
+             except 
              <code>WHERE...LIKE</code>
              on this data type.
      */
-    const long BASIC = 2;
-    //-------------------------------------------------------------------------
-
-    /** A possible value for column
+    const long BASIC = 2; 
+    //------------------------------------------------------------------------- 
+     
+    /** A possible value for column 
             <code>SEARCHABLE</code>
-            in the
+            in the 
             <type scope="com::sun::star::sdbc">XResultSet</type>
-            object returned by the method
+            object returned by the method 
             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getTypeInfo()</member>
             .
             <p>
-            Indicates that all
+            Indicates that all 
             <code>WHERE</code>
-            search clauses can be
+            search clauses can be 
             based on this type.
      */
-    const long FULL  = 3;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long FULL  = 3; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/ColumnType.idl b/offapi/com/sun/star/sdbc/ColumnType.idl
index 259ff9015e91..1894a7818bc2 100644
--- a/offapi/com/sun/star/sdbc/ColumnType.idl
+++ b/offapi/com/sun/star/sdbc/ColumnType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_ColumnType_idl__
-#define __com_sun_star_sdbc_ColumnType_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_ColumnType_idl__ 
+#define __com_sun_star_sdbc_ColumnType_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** determines the type of a version column.
  */
 published constants ColumnType
-{
-
-    /** indicates that this column may or may not be a pseudo-column.
-             A possible value for the column
+{ 
+     
+    /** indicates that this column may or may not be a pseudo-column. 
+             A possible value for the column 
              <code>PSEUDO_COLUMN</code>
-             in the
+             in the 
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             object
-             returned by the method
+             object 
+             returned by the method 
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getVersionColumns()</member>
              .
      */
-    const long UNKNOWN  = 0;
-    //-------------------------------------------------------------------------
-
-    /** indicates that this column is NOT a pseudo-column.
-             A possible value for the column
+    const long UNKNOWN	= 0; 
+    //------------------------------------------------------------------------- 
+     
+    /** indicates that this column is NOT a pseudo-column. 
+             A possible value for the column 
              <code>PSEUDO_COLUMN</code>
              in the
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             object
-             returned by the method
+             object 
+             returned by the method 
              <member scope="com::sun::star::sdbc">XDatabaseMetaData::getVersionColumns()</member>
              .
      */
-    const long NOT_PSEUDO   = 1;
-    //-------------------------------------------------------------------------
-
-    /** indicates that this column is a pseudo-column.
-             A possible value for the column
+    const long NOT_PSEUDO	= 1; 
+    //------------------------------------------------------------------------- 
+     
+    /** indicates that this column is a pseudo-column. 
+             A possible value for the column 
              <code>PSEUDO_COLUMN</code>
              in the
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             object
-             returned by the method
+             object 
+             returned by the method 
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getVersionColumns()</member>
              .
      */
-    const long PSEUDO   = 2;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long PSEUDO	= 2; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/ColumnValue.idl b/offapi/com/sun/star/sdbc/ColumnValue.idl
index 607951b5c2cf..83bb73b4aea1 100644
--- a/offapi/com/sun/star/sdbc/ColumnValue.idl
+++ b/offapi/com/sun/star/sdbc/ColumnValue.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_ColumnValue_idl__
-#define __com_sun_star_sdbc_ColumnValue_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_ColumnValue_idl__ 
+#define __com_sun_star_sdbc_ColumnValue_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** determines whether a column allows SQL NULL values or not.
  */
 published constants ColumnValue
-{
-
+{ 
+     
     /** indicates that a column does not allow NULL values.
      */
-    const long NO_NULLS         =  0;
-
+    const long NO_NULLS			=  0; 
+     
     /** indicates that a column does allow NULL values.
      */
-    const long NULLABLE         =  1;
-
+    const long NULLABLE 		=  1; 
+     
     /** indicates that the nullability of the column is unknown.
      */
-    const long NULLABLE_UNKNOWN =  2;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long NULLABLE_UNKNOWN	=  2; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/Connection.idl b/offapi/com/sun/star/sdbc/Connection.idl
index d71e37e79f58..4d8005e6d06f 100644
--- a/offapi/com/sun/star/sdbc/Connection.idl
+++ b/offapi/com/sun/star/sdbc/Connection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_Connection_idl__
-#define __com_sun_star_sdbc_Connection_idl__
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XConnection;
- published interface XWarningsSupplier;
-
-
+#ifndef __com_sun_star_sdbc_Connection_idl__ 
+#define __com_sun_star_sdbc_Connection_idl__ 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XConnection; 
+ published interface XWarningsSupplier; 
+ 
+ 
 /** represents a connection (session) with a specific
     database. Within the context of a Connection, SQL statements are
     executed and results are returned.
-
+    
     <p>
     A Connection's database is able to provide information
     describing its tables, its supported SQL grammar, its stored
     procedures, and the capabilities of this connection. This
-    information is obtained with the
+    information is obtained with the 
     <member scope="com::sun::star::sdbc">XConnection::getMetaData()</member>
     method.
     </p>
@@ -57,36 +57,36 @@
     changes after executing each statement. If auto commit has been
     disabled, an explicit commit must be done or database changes will
     not be saved.
-
+    
     </p>
-    @see com::sun::star::sdbc::XStatement
-    @see com::sun::star::sdbc::XResultSet
+    @see com::sun::star::sdbc::XStatement 
+    @see com::sun::star::sdbc::XResultSet 
     @see com::sun::star::sdbc::XDatabaseMetaData
  */
 published service Connection
-{
-
+{ 
+     
     /** controls the closing of a connection.
      */
-    interface com::sun::star::lang::XComponent;
-
-
+    interface com::sun::star::lang::XComponent; 
+ 
+     
     /** the main interface for interaction with a connection to a database.
      */
-    interface XConnection;
-
-
-    /** controls the chaining of warnings, which may occur on every call
-             to the connected database. Chained warnings from previous calls will be
+    interface XConnection; 
+ 
+     
+    /** controls the chaining of warnings, which may occur on every call 
+             to the connected database. Chained warnings from previous calls will be 
              cleared before processing a new call.
      */
-    interface XWarningsSupplier;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    interface XWarningsSupplier; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/ConnectionPool.idl b/offapi/com/sun/star/sdbc/ConnectionPool.idl
index c1d3259d01d2..e9e4088c8f16 100644
--- a/offapi/com/sun/star/sdbc/ConnectionPool.idl
+++ b/offapi/com/sun/star/sdbc/ConnectionPool.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,33 +25,33 @@
  *
  ************************************************************************/
 #ifndef __com_sun_star_sdbc_ConnectionPool_idl__
-#define __com_sun_star_sdbc_ConnectionPool_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XDriverManager;
-
-
+#define __com_sun_star_sdbc_ConnectionPool_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XDriverManager; 
+ 
+ 
 /** is the basic service for pooling SDBC connections.
-
+    
     <p>
-    When the method
+    When the method 
     <member scope="com::sun::star::sdbc">XPooledConnection::getConnection()</member>
     is called,
     the ConnectionPool will attempt to locate a suitable pooled connection
     or create a new connection from the DriverManager. When the connection
     will be released it will move to the pool of unused connections.
-
+    
     </p>
-    @see com::sun::star::sdbc::XDriver
+    @see com::sun::star::sdbc::XDriver 
     @see com::sun::star::sdbc::XConnection
  */
 published service ConnectionPool: XDriverManager;
-
-//=============================================================================
-
-}; }; }; };
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
 
 
-#endif
+#endif 
 
diff --git a/offapi/com/sun/star/sdbc/ConnectionProperties.idl b/offapi/com/sun/star/sdbc/ConnectionProperties.idl
index 5d7a2a702441..64fa20813333 100644
--- a/offapi/com/sun/star/sdbc/ConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/ConnectionProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_ConnectionProperties_idl__
-#define __com_sun_star_sdbc_ConnectionProperties_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
-
-
+#ifndef __com_sun_star_sdbc_ConnectionProperties_idl__ 
+#define __com_sun_star_sdbc_ConnectionProperties_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
+ 
 /** represents the properties for a connection (session) with a specific
     database. These properties can be used when calling the method
-    <member scope="com::sun::star::sdbc">XDriver::connect()</member> or
+    <member scope="com::sun::star::sdbc">XDriver::connect()</member> or 
     <member scope="com::sun::star::sdbc">XDriverManager::getConnectionWithInfo()</member>.
-
+    
     <p>
-    The properties for a connection contain additonal information about how to connect to a database and
+    The properties for a connection contain additonal information about how to connect to a database and 
     how to control the behavior of the resulting connection should be.
-
+    
     </p>
-    @see com::sun::star::sdbc::XDriver
-    @see com::sun::star::sdbc::XDriverManager
+    @see com::sun::star::sdbc::XDriver 
+    @see com::sun::star::sdbc::XDriverManager 
     @see com::sun::star::sdbc::JDBCConnectionProperties
     @see com::sun::star::sdbc::ODBCConnectionProperties
     @see com::sun::star::sdbc::FILEConnectionProperties
     @see com::sun::star::sdbc::DBASEConnectionProperties
     @see com::sun::star::sdbc::FLATConnectionProperties
-
+    
  */
 published service ConnectionProperties
-{
+{ 
     /** the username
     */
-    [optional, property] string user;
+    [optional, property] string user; 
 
     /** the password
     */
-    [optional, property] string password;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-
-===========================================================================*/
-#endif
+    [optional, property] string password; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+     
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/DBASEConnectionProperties.idl b/offapi/com/sun/star/sdbc/DBASEConnectionProperties.idl
index 338e799e498c..1e1aa2172ada 100644
--- a/offapi/com/sun/star/sdbc/DBASEConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/DBASEConnectionProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_DBASEConnectionProperties_idl__
-#define __com_sun_star_sdbc_DBASEConnectionProperties_idl__
-
-#ifndef __com_sun_star_sdbc_FILEConnectionProperties_idl__
-#include <com/sun/star/sdbc/FILEConnectionProperties.idl>
-#endif
-
-module com {  module sun {  module star {  module sdbc {
-
+#ifndef __com_sun_star_sdbc_DBASEConnectionProperties_idl__ 
+#define __com_sun_star_sdbc_DBASEConnectionProperties_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_FILEConnectionProperties_idl__ 
+#include <com/sun/star/sdbc/FILEConnectionProperties.idl> 
+#endif     
+ 
+module com {  module sun {  module star {  module sdbc { 
+ 
 /** represents the properties for a dBase connection (session) with a specific
     database. These properties can be used when calling the method
-    <member scope="com::sun::star::sdbc">XDriver::connect()</member> or
+    <member scope="com::sun::star::sdbc">XDriver::connect()</member> or 
     <member scope="com::sun::star::sdbc">XDriverManager::getConnectionWithInfo()</member>.
-
+    
     <p>
-    The properties for a connection contain additonal information about how to connect to a database and
+    The properties for a connection contain additonal information about how to connect to a database and 
     how to control the behavior of the resulting connection should be.
-
+    
     </p>
-    @see com::sun::star::sdbc::XDriver
-    @see com::sun::star::sdbc::XDriverManager
-    @see com::sun::star::sdbc::FILEConnectionProperties
+    @see com::sun::star::sdbc::XDriver 
+    @see com::sun::star::sdbc::XDriverManager 
+    @see com::sun::star::sdbc::FILEConnectionProperties 
  */
 service DBASEConnectionProperties
-{
+{ 
     service com::sun::star::sdbc:: FILEConnectionProperties;
 
     /** <TRUE/> when deleted rows should be shown, otherwise <FALSE/>
     */
-    [optional, property] boolean ShowDeleted;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-
-===========================================================================*/
-#endif
+    [optional, property] boolean ShowDeleted; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+     
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/DataTruncation.idl b/offapi/com/sun/star/sdbc/DataTruncation.idl
index e200867014d0..c0689192e841 100644
--- a/offapi/com/sun/star/sdbc/DataTruncation.idl
+++ b/offapi/com/sun/star/sdbc/DataTruncation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,21 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_DataTruncation_idl__
-#define __com_sun_star_sdbc_DataTruncation_idl__
-
-#ifndef __com_sun_star_sdbc_SQLWarning_idl__
-#include <com/sun/star/sdbc/SQLWarning.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_DataTruncation_idl__ 
+#define __com_sun_star_sdbc_DataTruncation_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_SQLWarning_idl__ 
+#include <com/sun/star/sdbc/SQLWarning.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** reports a DataTruncation warning, on reads, or is thrown as a DataTruncation exception,
     on writes, when a data value is unexpectedly truncated.
-
+    
     <p>
-    The SQL state for a
+    The SQL state for a 
     <code>DataTruncation</code>
     is
     <code>01004</code>
@@ -46,47 +46,47 @@
     </p>
  */
 published exception DataTruncation: SQLWarning
-{
-
+{ 
+     
     /** is the index of the parameter or column value.
      */
-    long Index;
-
-
+    long Index; 
+ 
+     
     /** is
         <TRUE/>
         if a parameter value is truncated.
      */
-    boolean IsParameter;
-
-
+    boolean IsParameter; 
+ 
+     
     /** is
         <TRUE/>
         if a read was truncated.
      */
-    boolean DuringRead;
-
-
+    boolean DuringRead; 
+ 
+     
     /** contains the number of bytes of data that should have been transferred.
         This number may be approximate if data conversions were being
         performed. The value may be
         <code>-1</code>
         if the size is unknown.
      */
-    long DataSize;
-
-
+    long DataSize; 
+ 
+     
     /** contains the number of bytes of data actually transferred.
         The value may be
         <code>-1</code>
         if the size is unknown.
      */
-    long TransferSize;
-};
-
-//=============================================================================
-
-}; }; }; };
-/*===========================================================================
-===========================================================================*/
-#endif
+    long TransferSize; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/DataType.idl b/offapi/com/sun/star/sdbc/DataType.idl
index 2d07982530f6..915380923ca6 100644
--- a/offapi/com/sun/star/sdbc/DataType.idl
+++ b/offapi/com/sun/star/sdbc/DataType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,111 +24,111 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_DataType_idl__
-#define __com_sun_star_sdbc_DataType_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
-
-/** These constants are used to specify database data types which are used
-        to identify the generic SQL types. The definition is based on JDBC 3.0.
-
+#ifndef __com_sun_star_sdbc_DataType_idl__ 
+#define __com_sun_star_sdbc_DataType_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
+/** These constants are used to specify database data types which are used 
+        to identify the generic SQL types. The definition is based on JDBC 3.0. 
+     
         <p>
         The actual type constant values are equivalent to those in the X/Open CLI.
         </p>
         <p>
-        Precise information about the specfic types can be got from
+        Precise information about the specfic types can be got from 
         <member>XDatabaseMetaData::getTypeInfo()</member>
         .</p>
  */
 published constants DataType
-{
-    const long BIT          =  -7;
-
-    const long TINYINT      =  -6;
-
-    const long SMALLINT     =   5;
-
-    const long INTEGER      =   4;
-
-    const long BIGINT       =  -5;
-
-    const long FLOAT        =   6;
-
-    const long REAL         =   7;
-
-    const long DOUBLE       =   8;
-
-    const long NUMERIC      =   2;
-
-    const long DECIMAL      =   3;
-
-    const long CHAR         =   1;
-
-    const long VARCHAR      =  12;
-
-    const long LONGVARCHAR  =  -1;
-
-    const long DATE         =  91;
-
-    const long TIME         =  92;
-
-    const long TIMESTAMP    =  93;
-
-    const long BINARY       =  -2;
-
-    const long VARBINARY    =  -3;
-
-    const long LONGVARBINARY =  -4;
-
-    const long SQLNULL      =   0;
-
-
-    /** indicates that the SQL type is database-specific and
-             gets mapped to an object that can be accessed via
-             the method
+{ 
+    const long BIT 			=  -7; 
+    
+    const long TINYINT 		=  -6; 
+    
+    const long SMALLINT		=   5; 
+    
+    const long INTEGER 		=   4; 
+    
+    const long BIGINT 		=  -5; 
+ 
+    const long FLOAT 		=   6; 
+    
+    const long REAL 		=   7; 
+    
+    const long DOUBLE 		=   8; 
+ 
+    const long NUMERIC 		=   2; 
+    
+    const long DECIMAL		=   3; 
+ 
+    const long CHAR			=   1; 
+    
+    const long VARCHAR 		=  12; 
+    
+    const long LONGVARCHAR 	=  -1; 
+ 
+    const long DATE 		=  91; 
+    
+    const long TIME 		=  92; 
+    
+    const long TIMESTAMP 	=  93; 
+ 
+    const long BINARY		=  -2; 
+    
+    const long VARBINARY 	=  -3; 
+    
+    const long LONGVARBINARY =  -4; 
+ 
+    const long SQLNULL		=   0; 
+ 
+     
+    /** indicates that the SQL type is database-specific and 
+             gets mapped to an object that can be accessed via 
+             the method 
              <member scope="com::sun::star::sdbc">XRow::getObject()</member>
              .
      */
-    const long OTHER        = 1111;
-
-
-    /** indicates a type which is represented by an object which implements
+    const long OTHER		= 1111; 
+ 
+     
+    /** indicates a type which is represented by an object which implements 
              this type.
      */
-    const long OBJECT        = 2000;
-
-
-    /** describes a type based on a built-in type.
+    const long OBJECT        = 2000; 
+ 
+     
+    /** describes a type based on a built-in type. 
                  It is a user-defined data type (UDT).
      */
-    const long DISTINCT     = 2001;
-
-
-    /** indicates a type consisting of attributes that may be any type.
+    const long DISTINCT     = 2001; 
+ 
+     
+    /** indicates a type consisting of attributes that may be any type. 
                  It is a user-defined data type (UDT).
      */
-    const long STRUCT       = 2002;
-
-
+    const long STRUCT       = 2002; 
+ 
+     
     /** indicates a type representing an SQL ARRAY.
      */
-    const long ARRAY        = 2003;
-
-
+    const long ARRAY        = 2003; 
+ 
+     
     /** indicates a type representing an SQL Binary Large Object.
      */
-    const long BLOB         = 2004;
-
-
+    const long BLOB         = 2004; 
+ 
+     
     /** indicates a type representing an SQL Character Large Object.
      */
-    const long CLOB         = 2005;
-
-
+    const long CLOB         = 2005; 
+ 
+     
     /** indicates a type representing an SQL REF, a referencing type.
      */
-    const long REF          = 2006;
+    const long REF          = 2006; 
 
     /** identifies the generic SQL type
      * <code>BOOLEAN</code>.
@@ -136,12 +136,12 @@ published constants DataType
      * @since OOo 2.0.0
      */
     const long BOOLEAN = 16;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/Deferrability.idl b/offapi/com/sun/star/sdbc/Deferrability.idl
index 20c53e3cd0db..996dafb327e6 100644
--- a/offapi/com/sun/star/sdbc/Deferrability.idl
+++ b/offapi/com/sun/star/sdbc/Deferrability.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_Deferrability_idl__
-#define __com_sun_star_sdbc_Deferrability_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_Deferrability_idl__ 
+#define __com_sun_star_sdbc_Deferrability_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** indicates the Deferrability of key constraints.
  */
 published constants Deferrability
-{
-
-    /** A possible value for the column <code>DEFERRABILITY</code>
-             in the
-             <code>XResultSet</code> objects returned by the methods
-             <code>getImportedKeys</code>,  <code>getExportedKeys</code>,
-             and <code>getCrossReference</code>.
+{ 
+     
+    /** A possible value for the column <code>DEFERRABILITY</code> 
+             in the 
+             <code>XResultSet</code> objects returned by the methods 
+             <code>getImportedKeys</code>,  <code>getExportedKeys</code>, 
+             and <code>getCrossReference</code>. 
              <P>Indicates deferrability.  See SQL-92 for a definition.
-
-<!-- JRH: This and next two comments are identical. Is something missing?
+     
+<!-- JRH: This and next two comments are identical. Is something missing? 
             INITIALLY_DEFERRED, INITIALLY_IMMEDIATE, and NONE?              -->
 */
-    const long INITIALLY_DEFERRED  = 5;
-    //-------------------------------------------------------------------------
-
-    /** A possible value for the column <code>DEFERRABILITY</code>
-             in the
-             <code>XResultSet</code> objects returned by the methods
-             <code>getImportedKeys</code>,  <code>getExportedKeys</code>,
-             and <code>getCrossReference</code>.
+    const long INITIALLY_DEFERRED  = 5; 
+    //------------------------------------------------------------------------- 
+     
+    /** A possible value for the column <code>DEFERRABILITY</code> 
+             in the 
+             <code>XResultSet</code> objects returned by the methods 
+             <code>getImportedKeys</code>,  <code>getExportedKeys</code>, 
+             and <code>getCrossReference</code>. 
              <P>Indicates deferrability.  See SQL-92 for a definition.
      */
-    const long INITIALLY_IMMEDIATE  = 6;
-    //-------------------------------------------------------------------------
-
-    /** A possible value for the column <code>DEFERRABILITY</code>
-             in the
-             <code>XResultSet</code> objects returned by the methods
-             <code>getImportedKeys</code>,  <code>getExportedKeys</code>,
-             and <code>getCrossReference</code>.
+    const long INITIALLY_IMMEDIATE  = 6; 
+    //------------------------------------------------------------------------- 
+     
+    /** A possible value for the column <code>DEFERRABILITY</code> 
+             in the 
+             <code>XResultSet</code> objects returned by the methods 
+             <code>getImportedKeys</code>,  <code>getExportedKeys</code>, 
+             and <code>getCrossReference</code>. 
              <P>Indicates deferrability.  See SQL-92 for a definition.
      */
-    const long NONE         = 7;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long NONE  		= 7; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/Driver.idl b/offapi/com/sun/star/sdbc/Driver.idl
index d410213f8103..3d122c389c0a 100644
--- a/offapi/com/sun/star/sdbc/Driver.idl
+++ b/offapi/com/sun/star/sdbc/Driver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,52 +24,52 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_Driver_idl__
-#define __com_sun_star_sdbc_Driver_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XDriver;
-
-
+#ifndef __com_sun_star_sdbc_Driver_idl__ 
+#define __com_sun_star_sdbc_Driver_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XDriver; 
+ 
+ 
 /** is the service that every driver class must implement.
-
+    
     <p>
     Each driver should supply a service that implements
     the Driver interface.
-
+    
     </p>
     <p>
     The DriverManager will try to load as many drivers as it can
     find and then for any given connection request, it will ask each
     driver in turn to try to connect to the target URL.
-
+    
     </p>
     <p>
     It is strongly recommended that each Driver object should be
     small and standalone so that the Driver object can be loaded and
     queried without bringing in vast quantities of supporting code.
-
+    
     </p>
     <p>
     Each driver should be a one instance service.
 
     </p>
-    @see com::sun::star::sdbc::XDriverManager
+    @see com::sun::star::sdbc::XDriverManager 
     @see com::sun::star::sdbc::XConnection
  */
 published service Driver
-{
-
+{ 
+     
     /** is the main interface to access a database driver.
      */
-    interface XDriver;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    interface XDriver; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/DriverManager.idl b/offapi/com/sun/star/sdbc/DriverManager.idl
index 4324ea7da7d3..df67c42b5e16 100644
--- a/offapi/com/sun/star/sdbc/DriverManager.idl
+++ b/offapi/com/sun/star/sdbc/DriverManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_DriverManager_idl__
-#define __com_sun_star_sdbc_DriverManager_idl__
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
-#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XConnection;
- published interface XDriver;
- published interface XDriverManager;
-
-
+#ifndef __com_sun_star_sdbc_DriverManager_idl__ 
+#define __com_sun_star_sdbc_DriverManager_idl__ 
+ 
+#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
+#include <com/sun/star/container/XEnumerationAccess.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XConnection; 
+ published interface XDriver; 
+ published interface XDriverManager; 
+ 
+ 
 /** is the basic service for managing a set of SDBC drivers.
-
-
+    
+    
     <p>
     As part of its initialization, the DriverManager service will
     attempt to load the registered drivers.
-
+    
     </p>
     <p>
     When the method <code>getConnection</code> is called,
     the DriverManager will attempt to
     locate a suitable driver.
-
+    
     </p>
-    @see com::sun::star::sdbc::XDriver
+    @see com::sun::star::sdbc::XDriver 
     @see com::sun::star::sdbc::XConnection
  */
 published service DriverManager
-{
-
+{ 
+     
     /** is the basic interface for establishing database connections.
      */
-    interface XDriverManager;
-
+    interface XDriverManager; 
+     
     /** creates an enumeration on all installed / registered drivers.
      */
-    interface com::sun::star::container::XEnumerationAccess;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    interface com::sun::star::container::XEnumerationAccess; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/DriverPropertyInfo.idl b/offapi/com/sun/star/sdbc/DriverPropertyInfo.idl
index 181eea0554e4..51e99355feec 100644
--- a/offapi/com/sun/star/sdbc/DriverPropertyInfo.idl
+++ b/offapi/com/sun/star/sdbc/DriverPropertyInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,15 +24,15 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_DriverPropertyInfo_idl__
-#define __com_sun_star_sdbc_DriverPropertyInfo_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_DriverPropertyInfo_idl__ 
+#define __com_sun_star_sdbc_DriverPropertyInfo_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** describes the driver properties for making a connection.
-
-
+    
+    
     <p>
     The DriverPropertyInfo is of interest only to advanced programmers
     who need to interact with a driver to discover and supply properties
@@ -43,45 +43,45 @@ published struct DriverPropertyInfo
 {
     /** is the name of the property.
      */
-    string Name;
-
-
+    string Name; 
+ 
+     
     /** is a brief description of the property, which may be null.
      */
-    string Description;
-
-
+    string Description; 
+ 
+     
     /** is
         <TRUE/>
         if a value must be supplied for this property
-        during
+        during 
         <code>Driver.connect</code>
         and
         <FALSE/>
         otherwise.
      */
-    boolean IsRequired;
-
-
+    boolean IsRequired; 
+ 
+     
     /** specifies the current value of the property,
         based on the driver-supplied default values.  This field
         may be empty if no value is known.
      */
-    string Value;
-
-
-    /** contains a sequence of possible values if the value for the field
+    string Value; 
+ 
+     
+    /** contains a sequence of possible values if the value for the field 
             <code>DriverPropertyInfo.value</code>
-            may be selected
+            may be selected 
             from a particular set of values; otherwise empty.
      */
-    sequence<string> Choices;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    sequence<string> Choices; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl b/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl
index 55bc9090bed3..b4c77e2e69b4 100644
--- a/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_FILEConnectionProperties_idl__
-#define __com_sun_star_sdbc_FILEConnectionProperties_idl__
-
-#ifndef __com_sun_star_sdbc_ConnectionProperties_idl__
-#include <com/sun/star/sdbc/ConnectionProperties.idl>
-#endif
-
-module com {  module sun {  module star {  module sdbc {
-
+#ifndef __com_sun_star_sdbc_FILEConnectionProperties_idl__ 
+#define __com_sun_star_sdbc_FILEConnectionProperties_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_ConnectionProperties_idl__ 
+#include <com/sun/star/sdbc/ConnectionProperties.idl> 
+#endif    
+ 
+module com {  module sun {  module star {  module sdbc { 
+ 
 /** represents the properties for a FILE connection (session) with a specific
     database. These properties can be used when calling the method
-    <member scope="com::sun::star::sdbc">XDriver::connect()</member> or
+    <member scope="com::sun::star::sdbc">XDriver::connect()</member> or 
     <member scope="com::sun::star::sdbc">XDriverManager::getConnectionWithInfo()</member>.
-
+    
     <p>
-    The properties for a connection contain additonal information about how to connect to a database and
+    The properties for a connection contain additonal information about how to connect to a database and 
     how to control the behavior of the resulting connection should be.
-
+    
     </p>
-    @see com::sun::star::sdbc::XDriver
-    @see com::sun::star::sdbc::XDriverManager
-    @see com::sun::star::sdbc::ConnectionProperties
+    @see com::sun::star::sdbc::XDriver 
+    @see com::sun::star::sdbc::XDriverManager 
+    @see com::sun::star::sdbc::ConnectionProperties 
  */
 service FILEConnectionProperties
-{
+{ 
     service com::sun::star::sdbc::ConnectionProperties;
 
     /** specifies the encoding to use to translate the backend data
@@ -57,13 +57,13 @@ service FILEConnectionProperties
         for a list of valid values.</p>
     */
     [optional, property] string CharSet;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-
-===========================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+     
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/FLATConnectionProperties.idl b/offapi/com/sun/star/sdbc/FLATConnectionProperties.idl
index 7af8aca4e6a1..c6a2e0afa60a 100644
--- a/offapi/com/sun/star/sdbc/FLATConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/FLATConnectionProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,63 +24,63 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_FLATConnectionProperties_idl__
-#define __com_sun_star_sdbc_FLATConnectionProperties_idl__
-
-#ifndef __com_sun_star_sdbc_FILEConnectionProperties_idl__
-#include <com/sun/star/sdbc/FILEConnectionProperties.idl>
-#endif
-
-module com {  module sun {  module star {  module sdbc {
-
+#ifndef __com_sun_star_sdbc_FLATConnectionProperties_idl__ 
+#define __com_sun_star_sdbc_FLATConnectionProperties_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_FILEConnectionProperties_idl__ 
+#include <com/sun/star/sdbc/FILEConnectionProperties.idl> 
+#endif    
+ 
+module com {  module sun {  module star {  module sdbc { 
+ 
 /** represents the properties for a FLAT connection (session) with a specific
     database. These properties can be used when calling the method
-    <member scope="com::sun::star::sdbc">XDriver::connect()</member> or
+    <member scope="com::sun::star::sdbc">XDriver::connect()</member> or 
     <member scope="com::sun::star::sdbc">XDriverManager::getConnectionWithInfo()</member>.
-
+    
     <p>
-    The properties for a connection contain additonal information about how to connect to a database and
+    The properties for a connection contain additonal information about how to connect to a database and 
     how to control the behavior of the resulting connection should be.
-
+    
     </p>
-    @see com::sun::star::sdbc::XDriver
-    @see com::sun::star::sdbc::XDriverManager
-    @see com::sun::star::sdbc::FILEConnectionProperties
+    @see com::sun::star::sdbc::XDriver 
+    @see com::sun::star::sdbc::XDriverManager 
+    @see com::sun::star::sdbc::FILEConnectionProperties 
  */
 service FLATConnectionProperties
-{
+{ 
     service com::sun::star::sdbc::FILEConnectionProperties;
 
     /** <TRUE/> when the file contains a header line otherwise <FALSE/>
     */
-    [optional, property] boolean HeaderLine;
+    [optional, property] boolean HeaderLine; 
 
     /** A one character delimiter to seperate the fields.
     */
-    [optional, property] string FieldDelimiter;
+    [optional, property] string FieldDelimiter; 
 
     /** A one character delimiter to seperate the strings.
     */
-    [optional, property] string StringDelimiter;
+    [optional, property] string StringDelimiter; 
 
     /** A one character delimiter to seperate the decimal.
     */
-    [optional, property] string DecimalDelimiter;
+    [optional, property] string DecimalDelimiter; 
 
     /** A one character delimiter to seperate the thousands.
     */
-    [optional, property] string ThousandDelimiter;
+    [optional, property] string ThousandDelimiter; 
 
     /** the extension of the files to be used.
     */
-    [property] string Extension;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-
-===========================================================================*/
-#endif
+    [property] string Extension; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+     
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/FetchDirection.idl b/offapi/com/sun/star/sdbc/FetchDirection.idl
index e171a2311d40..398d072d45ff 100644
--- a/offapi/com/sun/star/sdbc/FetchDirection.idl
+++ b/offapi/com/sun/star/sdbc/FetchDirection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_FetchDirection_idl__
-#define __com_sun_star_sdbc_FetchDirection_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
-
-/** indicates in which direction a resultset should fetch next, just for
+#ifndef __com_sun_star_sdbc_FetchDirection_idl__ 
+#define __com_sun_star_sdbc_FetchDirection_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
+/** indicates in which direction a resultset should fetch next, just for 
      optimization.
  */
 published constants FetchDirection
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** The rows in a result set will be processed in a forward direction; first-to-last.
      */
-    const long FORWARD = 1000;
-    //-------------------------------------------------------------------------
-
+    const long FORWARD = 1000; 
+    //------------------------------------------------------------------------- 
+     
     /** The rows in a result set will be processed in a reverse direction; last-to-first.
      */
-    const long REVERSE = 1001;
-    //-------------------------------------------------------------------------
-
+    const long REVERSE = 1001; 
+    //------------------------------------------------------------------------- 
+     
     /** The order in which rows in a result set will be processed is unknown:
      */
-    const long UNKNOWN = 1002;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long UNKNOWN = 1002; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/IndexType.idl b/offapi/com/sun/star/sdbc/IndexType.idl
index 2a3a00923ba5..e9c4c972f731 100644
--- a/offapi/com/sun/star/sdbc/IndexType.idl
+++ b/offapi/com/sun/star/sdbc/IndexType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,80 +24,80 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_IndexType_idl__
-#define __com_sun_star_sdbc_IndexType_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_IndexType_idl__ 
+#define __com_sun_star_sdbc_IndexType_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** indicates the type of index.
  */
 published constants IndexType
-{
-
+{ 
+     
     /** A possible value for column
             <code>TYPE</code>
-            in the
+            in the 
             <type scope="com::sun::star::sdbc">XResultSet</type>
-            object returned by the method
+            object returned by the method 
             <member scope="com::sun::star::sdbc">XDatabaseMetaData::getIndexInfo()</member>
-            .
+            . 
             <P>
-            Indentifies table statistics that are returned in conjunction
+            Indentifies table statistics that are returned in conjunction 
             with a table's index description.
             </P>
      */
-    const short STATISTIC = 0;
-    //-------------------------------------------------------------------------
-
-    /** A possible value for column
+    const short STATISTIC = 0; 
+    //------------------------------------------------------------------------- 
+     
+    /** A possible value for column 
             <code>TYPE</code>
             in the
             <type scope="com::sun::star::sdbc">XResultSet</type>
-            object returned by the method
+            object returned by the method 
             <member scope="com::sun::star::sdbc">XDatabaseMetaData::getIndexInfo()</member>
             .
             <P>
             Indicates that this table index is a clustered index.
             </P>
      */
-    const short CLUSTERED = 1;
-    //-------------------------------------------------------------------------
-
+    const short CLUSTERED = 1; 
+    //------------------------------------------------------------------------- 
+     
     /** A possible value for column
             <code>TYPE</code>
-            in the
+            in the 
             <type scope="com::sun::star::sdbc">XResultSet</type>
-            object returned by the method
+            object returned by the method 
             <member scope="com::sun::star::sdbc">XDatabaseMetaData::getIndexInfo()</member>
             .
              <P>
              Indicates that this table index is a hashed index.
              </P>
      */
-    const short HASHED    = 2;
-    //-------------------------------------------------------------------------
-
+    const short HASHED    = 2; 
+    //------------------------------------------------------------------------- 
+     
     /** A possible value for column
             <code>TYPE</code>
-            in the
+            in the 
             <type scope="com::sun::star::sdbc">XResultSet</type>
-            object returned by the method
+            object returned by the method 
             <member scope="com::sun::star::sdbc">XDatabaseMetaData::getIndexInfo()</member>
             .
              <P>
-             Indicates that this table index is not a clustered
-             index, a hashed index, or table statistics;
+             Indicates that this table index is not a clustered 
+             index, a hashed index, or table statistics; 
              it is something other than these.
              </P>
      */
-    const short OTHER     = 3;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const short OTHER     = 3; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl b/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl
index cb59fe15eac6..88ffff2a3e7a 100644
--- a/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/JDBCConnectionProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_JDBCConnectionProperties_idl__
-#define __com_sun_star_sdbc_JDBCConnectionProperties_idl__
-
-#ifndef __com_sun_star_sdbc_ConnectionProperties_idl__
-#include <com/sun/star/sdbc/ConnectionProperties.idl>
-#endif
+#ifndef __com_sun_star_sdbc_JDBCConnectionProperties_idl__ 
+#define __com_sun_star_sdbc_JDBCConnectionProperties_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_ConnectionProperties_idl__ 
+#include <com/sun/star/sdbc/ConnectionProperties.idl> 
+#endif   
 #ifndef __com_sun_star_beans_NamedValue_idl__
-#include <com/sun/star/beans/NamedValue.idl>
+#include <com/sun/star/beans/NamedValue.idl> 
 #endif
 
-module com {  module sun {  module star {  module sdbc {
-
+module com {  module sun {  module star {  module sdbc { 
+ 
 /** represents the properties for a JDBC connection (session) with a specific
     database. These properties can be used when calling the method
-    <member scope="com::sun::star::sdbc">XDriver::connect()</member> or
+    <member scope="com::sun::star::sdbc">XDriver::connect()</member> or 
     <member scope="com::sun::star::sdbc">XDriverManager::getConnectionWithInfo()</member>.
-
+    
     <p>
-    The properties for a connection contain additonal information about how to connect to a database and
+    The properties for a connection contain additonal information about how to connect to a database and 
     how to control the behavior of the resulting connection should be.
-
+    
     </p>
-    @see com::sun::star::sdbc::XDriver
-    @see com::sun::star::sdbc::XDriverManager
-    @see com::sun::star::sdbc::ConnectionProperties
+    @see com::sun::star::sdbc::XDriver 
+    @see com::sun::star::sdbc::XDriverManager 
+    @see com::sun::star::sdbc::ConnectionProperties 
  */
 service JDBCConnectionProperties
-{
+{ 
     service com::sun::star::sdbc::ConnectionProperties;
 
     /** which jdbc driver class should be loaded to create the connection.
 
         @see com::sun::star::sdbc::JDBCConnectionProperties::JavaDriverClassPath
     */
-    [optional, property] string JavaDriverClass;
+    [optional, property] string JavaDriverClass; 
 
     /** an optional class path to locate the <member
         scope="com::sun::star::sdbc">JDBCConnectionProperties::JavaDriverClass
@@ -87,17 +87,17 @@ service JDBCConnectionProperties
     */
     [optional, property] boolean IsAutoRetrievingEnabled;
 
-    /** specifies the statement which should be executed
+    /** specifies the statement which should be executed 
         when asking an "INSERT" statement for the XGeneratedResultSet (future concept) interface.
     */
-    [optional, property] string AutoRetrievingStatement;
+    [optional, property] string AutoRetrievingStatement; 
 
     /** specifies how the type info returned by <member scope="com::sun::star::sdbc">XDatabaseMetaData::getTypeInfo()</member> will be modified.
-        <p>The sequence contains an even amount of string values. Each pair describes
+        <p>The sequence contains an even amount of string values. Each pair describes 
         <li>what should be searched for and </li>
         <li>what should be replaced if found.</li>
         <br>
-        The syntax is:
+        The syntax is: 
         <p>
             <li>COLUMN(2) = -5</li>
             <li>COLUMN(6) = PRECISION</li>
@@ -106,14 +106,14 @@ service JDBCConnectionProperties
         with the value -5. If this is true than column 6 will now return the value PRECISION.
         </p>
     */
-    [optional, property] sequence< any > TypeInfoSettings;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-
-===========================================================================*/
-#endif
+    [optional, property] sequence< any > TypeInfoSettings; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+     
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/KeyRule.idl b/offapi/com/sun/star/sdbc/KeyRule.idl
index 08806abccf94..bf3e46d54e75 100644
--- a/offapi/com/sun/star/sdbc/KeyRule.idl
+++ b/offapi/com/sun/star/sdbc/KeyRule.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,169 +24,169 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_KeyRule_idl__
-#define __com_sun_star_sdbc_KeyRule_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_KeyRule_idl__ 
+#define __com_sun_star_sdbc_KeyRule_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** determines the rules for foreign key constraints.
  */
 published constants KeyRule
-{
-
+{ 
+     
     /** a possible value for the column's
             <code>UPDATE_RULE</code>
             and
             <code>DELETE_RULE</code>
-            in the
+            in the 
             <type scope="com::sun::star::sdbc">XResultSet</type>
-             objects returned by the methods
+             objects returned by the methods 
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getImportedKeys()</member>
              ,
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getExportedKeys()</member>
-             ,
+             , 
              and
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getCrossReference()</member>
-             .
+             . 
              <P>
-             For the column
+             For the column 
              <code>UPDATE_RULE</code>
              ,
-             it indicates that
-             when the primary key is updated, the foreign key (imported key)
-             is changed to agree with it.
+             it indicates that 
+             when the primary key is updated, the foreign key (imported key) 
+             is changed to agree with it. 
              </P>
              <P>
-             For the column
+             For the column 
              <code>DELETE_RULE</code>
-            ,
-             it indicates that
-             when the primary key is deleted, rows that imported that key
+            , 
+             it indicates that 
+             when the primary key is deleted, rows that imported that key 
              are deleted.
              </P>
      */
-    const long CASCADE  = 0;
-    //-------------------------------------------------------------------------
-
-    /** a possible value for the column's
+    const long CASCADE	= 0; 
+    //------------------------------------------------------------------------- 
+     
+    /** a possible value for the column's 
              <code>UPDATE_RULE</code>
              and
              <code>DELETE_RULE</code>
-            in the
+            in the 
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             objects returned by the methods
+             objects returned by the methods 
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getImportedKeys()</member>
              ,
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getExportedKeys()</member>
-             ,
+             , 
              and
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getCrossReference()</member>
              .
              <P>
              For the column
              <code>UPDATE_RULE</code>
-            , it indicates that
-             a primary key may not be updated if it has been imported by
-             another table as a foreign key.
+            , it indicates that 
+             a primary key may not be updated if it has been imported by 
+             another table as a foreign key. 
              </P>
              <P>
              For the column
              <code>DELETE_RULE</code>
-            , it indicates that
-             a primary key may not be deleted if it has been imported by
+            , it indicates that 
+             a primary key may not be deleted if it has been imported by 
              another table as a foreign key.
              </P>
      */
-    const long RESTRICT = 1;
-    //-------------------------------------------------------------------------
-
+    const long RESTRICT = 1; 
+    //------------------------------------------------------------------------- 
+     
     /** a possible value for the column's
              <code>UPDATE_RULE</code>
              and
              <code>DELETE_RULE</code>
-            in the
+            in the 
              <type scope="com::sun::star::sdbc">XResultSet</type>
-              objects returned by the methods
+              objects returned by the methods 
             <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getImportedKeys()</member>
              ,
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getExportedKeys()</member>
              ,
              and
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getCrossReference()</member>
-             .
+             . 
              <P>
              For the columns
              <code>UPDATE_RULE</code>
              and
              <code>DELETE_RULE</code>
-            ,
-             it indicates that
-             when the primary key is updated or deleted, the foreign key (imported key)
+            , 
+             it indicates that 
+             when the primary key is updated or deleted, the foreign key (imported key) 
              is changed to <code>NULL</code>.
              </P>
      */
-    const long SET_NULL  = 2;
-    //-------------------------------------------------------------------------
-
+    const long SET_NULL  = 2; 
+    //------------------------------------------------------------------------- 
+     
     /** a possible value for the column's
             <code>UPDATE_RULE</code>
              and
              <code>DELETE_RULE</code>
-             in the
+             in the 
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             objects returned by the methods
+             objects returned by the methods 
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getImportedKeys()</member>
              ,
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getExportedKeys()</member>
              ,
-             and
+             and 
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getCrossReference()</member>
-             .
+             . 
              <P>
              For the columns
              <code>UPDATE_RULE</code>
              and
              <code>DELETE_RULE</code>
-            ,
+            , 
              it indicates that if the primary key has been imported, it cannot be updated or deleted.
              </P>
      */
-    const long NO_ACTION = 3;
-    //-------------------------------------------------------------------------
-
+    const long NO_ACTION = 3; 
+    //------------------------------------------------------------------------- 
+     
     /** a possible value for the column's
             <code>UPDATE_RULE</code>
              and
              <code>DELETE_RULE</code>
-            in the
+            in the 
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             objects returned by the methods
+             objects returned by the methods 
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getImportedKeys()</member>
              ,
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getExportedKeys()</member>
-             ,
+             , 
              and
              <member  scope="com::sun::star::sdbc">XDatabaseMetaData::getCrossReference()</member>
-             .
+             . 
              <P>
              For the columns
              <code>UPDATE_RULE</code>
              and
              <code>DELETE_RULE</code>
-            ,
-             it indicates that
-             if the primary key is updated or deleted, the foreign key (imported key)
+            , 
+             it indicates that 
+             if the primary key is updated or deleted, the foreign key (imported key) 
              is set to the default value.
              </P>
      */
-    const long SET_DEFAULT  = 4;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long SET_DEFAULT  = 4; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/ODBCConnectionProperties.idl b/offapi/com/sun/star/sdbc/ODBCConnectionProperties.idl
index 19d6fb0fd6aa..aefc18bdcd8e 100644
--- a/offapi/com/sun/star/sdbc/ODBCConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/ODBCConnectionProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,71 +24,71 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_ODBCConnectionProperties_idl__
-#define __com_sun_star_sdbc_ODBCConnectionProperties_idl__
-
-#ifndef __com_sun_star_sdbc_ConnectionProperties_idl__
-#include <com/sun/star/sdbc/ConnectionProperties.idl>
-#endif
+#ifndef __com_sun_star_sdbc_ODBCConnectionProperties_idl__ 
+#define __com_sun_star_sdbc_ODBCConnectionProperties_idl__ 
 
-module com {  module sun {  module star {  module sdbc {
+#ifndef __com_sun_star_sdbc_ConnectionProperties_idl__ 
+#include <com/sun/star/sdbc/ConnectionProperties.idl> 
+#endif  
 
+module com {  module sun {  module star {  module sdbc { 
+ 
 /** represents the properties for a ODBC connection (session) with a specific
     database. These properties can be used when calling the method
-    <member scope="com::sun::star::sdbc">XDriver::connect()</member> or
+    <member scope="com::sun::star::sdbc">XDriver::connect()</member> or 
     <member scope="com::sun::star::sdbc">XDriverManager::getConnectionWithInfo()</member>.
-
+    
     <p>
-    The properties for a connection contain additonal information about how to connect to a database and
+    The properties for a connection contain additonal information about how to connect to a database and 
     how to control the behavior of the resulting connection should be.
-
+    
     </p>
-    @see com::sun::star::sdbc::XDriver
-    @see com::sun::star::sdbc::XDriverManager
-    @see com::sun::star::sdbc::ConnectionProperties
+    @see com::sun::star::sdbc::XDriver 
+    @see com::sun::star::sdbc::XDriverManager 
+    @see com::sun::star::sdbc::ConnectionProperties 
  */
 service ODBCConnectionProperties
-{
+{ 
     service com::sun::star::sdbc::ConnectionProperties;
     /** should the parameter '?' in prepared statement be substituated with an distinct name
     */
-    [optional, property] boolean ParameterNameSubstitution;
+    [optional, property] boolean ParameterNameSubstitution; 
 
     /** the Timeout after which time a timeout should happen
     */
-    [optional, property] long Timeout;
+    [optional, property] long Timeout; 
 
     /** Silent - should the connection be silent. No user interaction while creating the connection.
     */
-    [optional, property] boolean Silent;
+    [optional, property] boolean Silent; 
 
     /** should the driver should support a catalog.
     */
-    [optional, property] boolean UseCatalog;
+    [optional, property] boolean UseCatalog; 
 
     /** specifies the encoding to use to translate the backend data
 
         <p>See the <a href="http://www.iana.org/assignments/character-sets">IANA character set list</a>
         for a list of valid values.</p>
     */
-    [optional, property] string CharSet;
+    [optional, property] string CharSet; 
 
     /** specifies if retrieving of auto generated values should be enabled or not.
         If <TRUE/> than the statement will support the XGeneratedResultSet (future concept) interface, otherwise not.
     */
     [optional, property] boolean IsAutoRetrievingEnabled;
 
-    /** specifies the statement which should be executed
+    /** specifies the statement which should be executed 
         when asking an "INSERT" statement for the XGeneratedResultSet (future concept) interface.
     */
-    [optional, property] string AutoRetrievingStatement;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-
-===========================================================================*/
-#endif
+    [optional, property] string AutoRetrievingStatement; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+     
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/PreparedStatement.idl b/offapi/com/sun/star/sdbc/PreparedStatement.idl
index 43bb4992fdda..ef72f6588133 100644
--- a/offapi/com/sun/star/sdbc/PreparedStatement.idl
+++ b/offapi/com/sun/star/sdbc/PreparedStatement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,153 +24,153 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_PreparedStatement_idl__
-#define __com_sun_star_sdbc_PreparedStatement_idl__
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCancellable_idl__
-#include <com/sun/star/util/XCancellable.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XPreparedStatement;
- published interface XPreparedBatchExecution;
- published interface XParameters;
- published interface XWarningsSupplier;
- published interface XMultipleResults;
- published interface XResultSetMetaDataSupplier;
- published interface XCloseable;
-
-
-/** represents a precompiled SQL statement.
+#ifndef __com_sun_star_sdbc_PreparedStatement_idl__ 
+#define __com_sun_star_sdbc_PreparedStatement_idl__ 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XCancellable_idl__ 
+#include <com/sun/star/util/XCancellable.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XPreparedStatement; 
+ published interface XPreparedBatchExecution; 
+ published interface XParameters; 
+ published interface XWarningsSupplier; 
+ published interface XMultipleResults; 
+ published interface XResultSetMetaDataSupplier; 
+ published interface XCloseable; 
+ 
+ 
+/** represents a precompiled SQL statement. 
      <P>
-     A SQL statement is pre-compiled and stored in a PreparedStatement object.
-     This object can then be used to efficiently execute this statement multiple
+     A SQL statement is pre-compiled and stored in a PreparedStatement object. 
+     This object can then be used to efficiently execute this statement multiple 
      times.
      </P>
      <P>
      <B>
      Note:
      </B>
-     The
+     The 
      <code>setXXX</code>
-     methods for setting IN parameter values
-     must specify types that are compatible with the defined SQL type of
-     the input parameter. For instance, if the IN parameter has SQL type
-     Integer, then the method
+     methods for setting IN parameter values 
+     must specify types that are compatible with the defined SQL type of 
+     the input parameter. For instance, if the IN parameter has SQL type 
+     Integer, then the method 
      <member scope="com::sun::star::sdbc">XParameters::setInt()</member>
-     should be used.
+     should be used. 
      </P>
      <p>
-     If arbitrary parameter type conversions are required, the method
+     If arbitrary parameter type conversions are required, the method 
      <member scope="com::sun::star::sdbc">XParameters::setObject()</member>
-     should be used with a target SQL type.
+     should be used with a target SQL type. 
      </p>
      <p>
-     Example of setting a parameter; <code>con</code> is an active connection.
-     @example:StarBASIC
-     <listing>
-     pstmt = con.prepareStatement("UPDATE EMPLOYEES SET SALARY = ? WHERE ID = ?")
-     pstmt.setDouble(1, 153833.00)
-     pstmt.setLong(2, 110592)
-     </listing>
+     Example of setting a parameter; <code>con</code> is an active connection. 
+     @example:StarBASIC 
+     <listing> 
+     pstmt = con.prepareStatement("UPDATE EMPLOYEES SET SALARY = ? WHERE ID = ?") 
+     pstmt.setDouble(1, 153833.00) 
+     pstmt.setLong(2, 110592) 
+     </listing> 
      </p>
      <P>
-     Only one
+     Only one 
      <type scope="com::sun::star::sdbc">ResultSet</type>
      per
      <type scope="com::sun::star::sdbc">Statement</type>
-     can be open at any point in
-     time. Therefore, if the reading of one ResultSet is interleaved
-     with the reading of another, each must have been generated by
-     different Statements. All statement
+     can be open at any point in 
+     time. Therefore, if the reading of one ResultSet is interleaved 
+     with the reading of another, each must have been generated by 
+     different Statements. All statement 
      <code>execute</code>
      methods implicitly close a statement's current ResultSet if an open one exists.
      </p>
  */
 published service PreparedStatement
-{
-
-    /** optional for implementation, controls the releasing of resources
+{ 
+     
+    /** optional for implementation, controls the releasing of resources 
              and the notification of registered listeners.
      */
-    [optional] interface com::sun::star::lang::XComponent;
-
-
-    /** freeing all resources of a statement. A related resultset will be
+    [optional] interface com::sun::star::lang::XComponent; 
+ 
+     
+    /** freeing all resources of a statement. A related resultset will be 
              freed as well.
      */
-    interface XCloseable;
-
+    interface XCloseable; 
+ 
     // gives access to the properties.
-    interface com::sun::star::beans::XPropertySet;
-
-    /** could be used for cancelling the execution of SQL statements, if both
-             the DBMS and the driver support aborting an SQL statement.
+    interface com::sun::star::beans::XPropertySet; 
+     
+    /** could be used for cancelling the execution of SQL statements, if both 
+             the DBMS and the driver support aborting an SQL statement. 
              The implementation is optional.
      */
     [optional] interface com::sun::star::util::XCancellable;
-
+    
     /** is the interface for executing SQL prepared commands.
      */
-    interface XPreparedStatement;
-
-
+    interface XPreparedStatement; 
+ 
+     
     /** provides access to the description of the result set which would be generated by executing the
         <type>PreparedStatement</type>.
      */
-    interface XResultSetMetaDataSupplier;
-
-
-    /** is used for setting parameters before execution of the precompiled
+    interface XResultSetMetaDataSupplier; 
+ 
+     
+    /** is used for setting parameters before execution of the precompiled 
              statement.
      */
-    interface XParameters;
-
-
-    /** provides the ability of batch execution. This interface is optional
-             for execution.
+    interface XParameters; 
+ 
+     
+    /** provides the ability of batch execution. This interface is optional 
+             for execution. 
              <p>
              A driver implementing batch execution must return
              <TRUE/>
-             for
+             for 
              <member scope= "com::sun::star::sdbc">XDatabaseMetaData::supportsBatchUpdates()</member>
              </p>
      */
-    [optional] interface XPreparedBatchExecution;
-
-
-    /** controls the chaining of warnings, which may occur on every call
-             to the connected database. Chained warnings from previous calls will be
+    [optional] interface XPreparedBatchExecution; 
+ 
+     
+    /** controls the chaining of warnings, which may occur on every call 
+             to the connected database. Chained warnings from previous calls will be 
              cleared before processing a new call.
      */
-    interface XWarningsSupplier;
-
-
+    interface XWarningsSupplier; 
+ 
+     
     /** covers the handling of multiple results after executing an SQL command.
      */
-    interface XMultipleResults;
-
-
-    /** retrieves the number of seconds the driver will wait for a Statement
-              to execute. If the limit is exceeded, a SQLException is thrown.
+    interface XMultipleResults; 
+ 
+     
+    /** retrieves the number of seconds the driver will wait for a Statement 
+              to execute. If the limit is exceeded, a SQLException is thrown. 
               There is no limitation, if set to zero.
      */
-    [property] long QueryTimeOut;
-
-
-    /** returns the maximum number of bytes allowed for any column value.
+    [property] long QueryTimeOut; 
+ 
+     
+    /** returns the maximum number of bytes allowed for any column value. 
               <p>
-              This limit is the maximum number of bytes that can be returned
-              for any column value. The limit applies only to
+              This limit is the maximum number of bytes that can be returned 
+              for any column value. The limit applies only to 
               <member scope= "com::sun::star::sdbc">DataType::BINARY</member>
               ,
               <member scope= "com::sun::star::sdbc">DataType::VARBINARY</member>
@@ -183,90 +183,90 @@ published service PreparedStatement
               ,
               and
               <member scope= "com::sun::star::sdbc">DataType::LONGVARCHAR</member>
-              columns.
+              columns. 
               If the limit is exceeded, the excess data is silently discarded.
               </p>
               <p>
               There is no limitation, if set to zero.
               </p>
      */
-    [property] long MaxFieldSize;
-
-
-    /** retrieves the maximum number of rows that a ResultSet can contain.
-             If the limit is exceeded, the excess rows are silently dropped.
+    [property] long MaxFieldSize; 
+ 
+     
+    /** retrieves the maximum number of rows that a ResultSet can contain. 
+             If the limit is exceeded, the excess rows are silently dropped. 
              <br>There is no limitation, if set to zero.
      */
-    [property] long MaxRows;
-
-
-    /** defines the SQL cursor name that will be used by subsequent Statement
+    [property] long MaxRows; 
+ 
+     
+    /** defines the SQL cursor name that will be used by subsequent Statement 
              <code>execute</code>
-             methods.
+             methods. 
              <p>
-             This name can then be used in SQL positioned update/delete statements to
-             identify the current row in the ResultSet generated by this statement. If
-             the database does not support positioned update/delete, this property is
-             a noop. To insure that a cursor has the proper isolation level to support
-             updates, the cursor's SELECT statement should be of the form
-             'select for update ...'. If the 'for update' phrase is omitted,
-             positioned updates may fail.
+             This name can then be used in SQL positioned update/delete statements to 
+             identify the current row in the ResultSet generated by this statement. If 
+             the database does not support positioned update/delete, this property is 
+             a noop. To insure that a cursor has the proper isolation level to support 
+             updates, the cursor's SELECT statement should be of the form 
+             'select for update ...'. If the 'for update' phrase is omitted, 
+             positioned updates may fail. 
              </p>
              <P>
              <B>
              Note:
              </B>
-             By definition, positioned update/delete
-             execution must be done by a different Statement than the one
-             which generated the ResultSet being used for positioning. Also,
+             By definition, positioned update/delete 
+             execution must be done by a different Statement than the one 
+             which generated the ResultSet being used for positioning. Also, 
              cursor names must be unique within a connection.
              </p>
      */
-    [property] string CursorName;
-
-
-    /** retrieves the result set concurrency.
+    [property] string CursorName; 
+ 
+     
+    /** retrieves the result set concurrency. 
              @see com::sun::star::sdbc::ResultSetConcurrency
      */
-    [property] long ResultSetConcurrency;
-
-
-    /** Determine the result set type.
+    [property] long ResultSetConcurrency; 
+ 
+     
+    /** Determine the result set type. 
              @see com::sun::star::sdbc::ResultSetType
      */
-    [property] long ResultSetType;
-
-
-    /** retrieves the direction for fetching rows from database tables
-             that is the default for result sets generated from this
+    [property] long ResultSetType; 
+ 
+     
+    /** retrieves the direction for fetching rows from database tables 
+             that is the default for result sets generated from this 
              <code>Statement</code>
              object.
              <p>
-             If this
+             If this 
              <code>Statement</code>
-             object has not set a fetch direction,
+             object has not set a fetch direction, 
              the return value is implementation-specific.
              </p>
      */
-    [property] long FetchDirection;
-
-
-    /** retrieves the number of result set rows that is the default fetch size
+    [property] long FetchDirection; 
+ 
+     
+    /** retrieves the number of result set rows that is the default fetch size 
              for result sets generated from this
              <code>Statement</code>
              object.
              <p>
              If this
              <code>Statement</code>
-             object has not set a fetch size,
+             object has not set a fetch size, 
              the return value is implementation-specific.
              </p>
      */
-    [property] long FetchSize;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] long FetchSize; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/ProcedureColumn.idl b/offapi/com/sun/star/sdbc/ProcedureColumn.idl
index bf6315d7318d..5c406cd8f234 100644
--- a/offapi/com/sun/star/sdbc/ProcedureColumn.idl
+++ b/offapi/com/sun/star/sdbc/ProcedureColumn.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_ProcedureColumn_idl__
-#define __com_sun_star_sdbc_ProcedureColumn_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_ProcedureColumn_idl__ 
+#define __com_sun_star_sdbc_ProcedureColumn_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** indicates the type of a procedure column.
  */
 published constants ProcedureColumn
-{
-
-    /** indicates that the type of the column is unknown. A possible value for
-             the column
+{ 
+     
+    /** indicates that the type of the column is unknown. A possible value for 
+             the column 
              <code>COLUMN_TYPE</code>
-             in the
+             in the 
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             returned by the method
+             returned by the method 
              <member scope="com::sun::star::sdbc">XDatabaseMetaData::getProcedureColumns()</member>
              .
      */
-    const long UNKNOWN          = 0;
-    //-------------------------------------------------------------------------
-
-    /** indicates that the column stores IN parameters.
-             A possible value for the column
+    const long UNKNOWN		 	= 0; 
+    //------------------------------------------------------------------------- 
+     
+    /** indicates that the column stores IN parameters. 
+             A possible value for the column 
              <code>COLUMN_TYPE</code>
-             in the
+             in the 
              <type scope="com::sun::star::sdbc">XResultSet</type>
              returned by the method
              <member scope="com::sun::star::sdbc">XDatabaseMetaData::getProcedureColumns()</member>
              .
      */
-    const long IN               = 1;
-    //-------------------------------------------------------------------------
-
-    /** indicates that the column stores INOUT parameters.
-             A possible value for the column
+    const long IN				= 1; 
+    //------------------------------------------------------------------------- 
+     
+    /** indicates that the column stores INOUT parameters. 
+             A possible value for the column 
              <code>COLUMN_TYPE</code>
              in the
              <type scope="com::sun::star::sdbc">XResultSet</type>
@@ -68,11 +68,11 @@ published constants ProcedureColumn
              <member scope="com::sun::star::sdbc">XDatabaseMetaData::getProcedureColumns()</member>
              .
      */
-    const long INOUT            = 2;
-    //-------------------------------------------------------------------------
-
-    /** indicates that the column stores results.
-             A possible value for the column
+    const long INOUT		 	= 2; 
+    //------------------------------------------------------------------------- 
+     
+    /** indicates that the column stores results. 
+             A possible value for the column 
              <code>COLUMN_TYPE</code>
              in the
              <type scope="com::sun::star::sdbc">XResultSet</type>
@@ -80,11 +80,11 @@ published constants ProcedureColumn
              <member scope="com::sun::star::sdbc">XDatabaseMetaData::getProcedureColumns()</member>
              .
      */
-    const long RESULT           = 3;
-    //-------------------------------------------------------------------------
-
-    /** indicates that the column stores OUT parameters.
-             A possible value for the column
+    const long RESULT 			= 3; 
+    //------------------------------------------------------------------------- 
+     
+    /** indicates that the column stores OUT parameters. 
+             A possible value for the column 
              <code>COLUMN_TYPE</code>
              in the
              <type scope="com::sun::star::sdbc">XResultSet</type>
@@ -92,11 +92,11 @@ published constants ProcedureColumn
              <member scope="com::sun::star::sdbc">XDatabaseMetaData::getProcedureColumns()</member>
              .
      */
-    const long OUT              = 4;
-    //-------------------------------------------------------------------------
-
-    /** Indicates that the column stores return values.
-             A possible value for the column
+    const long OUT		 		= 4; 
+    //------------------------------------------------------------------------- 
+     
+    /** Indicates that the column stores return values. 
+             A possible value for the column 
              <code>COLUMN_TYPE</code>
              in the
              <type scope="com::sun::star::sdbc">XResultSet</type>
@@ -104,13 +104,13 @@ published constants ProcedureColumn
              <member scope="com::sun::star::sdbc">XDatabaseMetaData::getProcedureColumns()</member>
              .
      */
-    const long RETURN           = 5;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long RETURN 			= 5; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/ProcedureResult.idl b/offapi/com/sun/star/sdbc/ProcedureResult.idl
index a896bea35108..7e714221d0cd 100644
--- a/offapi/com/sun/star/sdbc/ProcedureResult.idl
+++ b/offapi/com/sun/star/sdbc/ProcedureResult.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,66 +24,66 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_ProcedureResult_idl__
-#define __com_sun_star_sdbc_ProcedureResult_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_ProcedureResult_idl__ 
+#define __com_sun_star_sdbc_ProcedureResult_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** determines whether a procedure returns a result or not.
  */
 published constants ProcedureResult
-{
-
+{ 
+     
     /** A possible value for column
              <code>PROCEDURE_TYPE</code>
-             in the
+             in the 
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             object returned by the method
+             object returned by the method 
              <member scope="com::sun::star::sdbc">XDatabaseMetaData::getProcedures()</member>
              .
-             <p>
-             Indicates that it is not known whether the procedure returns
+             <p> 
+             Indicates that it is not known whether the procedure returns 
              a result.
              </p>
      */
-    const long UNKNOWN  = 0;
-    //-------------------------------------------------------------------------
-
+    const long UNKNOWN	= 0; 
+    //------------------------------------------------------------------------- 
+     
     /** A possible value for column
             <code>PROCEDURE_TYPE</code>
-             in the
+             in the 
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             object returned by the method
+             object returned by the method 
              <member scope="com::sun::star::sdbc">XDatabaseMetaData::getProcedures()</member>
-             .
+             . 
              <p>
-             Indicates that the procedure does not return
+             Indicates that the procedure does not return 
              a result.
              </p>
      */
-    const long NONE     = 1;
-    //-------------------------------------------------------------------------
-
-    /** A possible value for column
+    const long NONE		= 1; 
+    //------------------------------------------------------------------------- 
+     
+    /** A possible value for column 
             <code>PROCEDURE_TYPE</code>
-             in the
+             in the 
              <type scope="com::sun::star::sdbc">XResultSet</type>
-             object returned by the method
+             object returned by the method 
              <member scope="com::sun::star::sdbc">XDatabaseMetaData::getProcedures()</member>
-             .
+             . 
              <p>
-             Indicates that the procedure returns
+             Indicates that the procedure returns 
              a result.
              </p>
      */
-    const long RETURN   = 2;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long RETURN 	= 2; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/ResultSet.idl b/offapi/com/sun/star/sdbc/ResultSet.idl
index 1c19621e7e17..7463e0271415 100644
--- a/offapi/com/sun/star/sdbc/ResultSet.idl
+++ b/offapi/com/sun/star/sdbc/ResultSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_ResultSet_idl__
-#define __com_sun_star_sdbc_ResultSet_idl__
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCancellable_idl__
-#include <com/sun/star/util/XCancellable.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XStatement;
- published interface XRow;
- published interface XRowUpdate;
- published interface XResultSet;
- published interface XResultSetUpdate;
- published interface XResultSetMetaDataSupplier;
- published interface XWarningsSupplier;
- published interface XColumnLocate;
- published interface XCloseable;
-
-
+#ifndef __com_sun_star_sdbc_ResultSet_idl__ 
+#define __com_sun_star_sdbc_ResultSet_idl__ 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XCancellable_idl__ 
+#include <com/sun/star/util/XCancellable.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XStatement; 
+ published interface XRow; 
+ published interface XRowUpdate; 
+ published interface XResultSet; 
+ published interface XResultSetUpdate; 
+ published interface XResultSetMetaDataSupplier; 
+ published interface XWarningsSupplier; 
+ published interface XColumnLocate; 
+ published interface XCloseable; 
+ 
+ 
 /** provides access to a table of data. A ResultSet
     object is usually generated by executing a Statement.
-
-
-
+    
+    
+    
     <p>
     A ResultSet maintains a cursor pointing to its current row of
     data. Initially the cursor is positioned before the first row.
@@ -98,88 +98,88 @@
     </p>
  */
 published service ResultSet
-{
-
-    /** optional for implementation; controls the releasing of resources
+{ 
+     
+    /** optional for implementation; controls the releasing of resources 
              and the notification of registered listeners.
      */
-    [optional] interface com::sun::star::lang::XComponent;
-
-
-    /** freeing all resources of a result set.
-
+    [optional] interface com::sun::star::lang::XComponent; 
+ 
+     
+    /** freeing all resources of a result set.  
+             
                 <p>
-                The creating statement will still be open after disposing.
+                The creating statement will still be open after disposing. 
                 </p>
-
+         
                 <p>
-                This interface is mandatory only for JDBC conformance,
+                This interface is mandatory only for JDBC conformance, 
                 otherwise it is optional.
                 </p>
      */
-    [optional] interface XCloseable;
-
+    [optional] interface XCloseable; 
+ 
     // gives access to the properties.
-    interface com::sun::star::beans::XPropertySet;
-
-
-    /** controls the chaining of warnings, which may occur on every call
-                to the connected database.
-
+    interface com::sun::star::beans::XPropertySet; 
+ 
+     
+    /** controls the chaining of warnings, which may occur on every call 
+                to the connected database.  
+              
                  <p>
-                Chained warnings from previous calls will be cleared before processing a new call.
+                Chained warnings from previous calls will be cleared before processing a new call. 
                 </p>
-
+         
                 <p>
                 This interface is mandatory only for JDBC conformance, otherwise it is optional.
                 </p>
      */
-    [optional] interface XWarningsSupplier;
-
-
+    [optional] interface XWarningsSupplier; 
+ 
+     
     /** provides the access to the result set description.
      */
-    interface XResultSetMetaDataSupplier;
-
-
+    interface XResultSetMetaDataSupplier; 
+ 
+     
     /** is the interface for navigating on the rows on a result set.
      */
-    interface XResultSet;
-
-
-    /** is the interface for updating row data to the database.
-
+    interface XResultSet; 
+ 
+     
+    /** is the interface for updating row data to the database.  
+             
                 <p>
                 The implementation is optional.
                 </p>
      */
-    [optional] interface XResultSetUpdate;
-
-
+    [optional] interface XResultSetUpdate; 
+ 
+     
     /** is the interface for accessing the data of the current row.
      */
-    interface XRow;
-
-
+    interface XRow; 
+ 
+     
     /** is used for locating a column by it's name.
      */
-    interface XColumnLocate;
-
-
-    /** is the interface for updating the data of the current row.
-
+    interface XColumnLocate; 
+ 
+     
+    /** is the interface for updating the data of the current row.  
+         
                 <p>
                 The implementation is optional.
                 </p>
      */
-    [optional] interface XRowUpdate;
-
-
+    [optional] interface XRowUpdate; 
+ 
+     
     /** defines the SQL cursor name that will be used by subsequent Statement
         <code>execute</code>
         methods.
-
-
+        
+        
         <p>
         This name can then be used in SQL positioned update/delete statements to
         identify the current row in the ResultSet generated by this statement. If
@@ -199,23 +199,23 @@ published service ResultSet
         cursor names must be unique within a connection.
         </p>
      */
-    [optional, readonly, property] string CursorName;
-
-
+    [optional, readonly, property] string CursorName; 
+ 
+     
     /** retrieves the result set concurrency.
 
         @see com::sun::star::sdbc::ResultSetConcurrency
      */
-    [readonly, property] long ResultSetConcurrency;
-
-
+    [readonly, property] long ResultSetConcurrency; 
+ 
+     
     /** determines the result set type.
 
         @see com::sun::star::sdbc::ResultSetType
      */
-    [readonly, property] long ResultSetType;
-
-
+    [readonly, property] long ResultSetType; 
+ 
+     
     /** retrieves the direction for fetching rows from database tables
         that is the default for result sets generated from this
         <type scope="com::sun::star::sdbcx">Statement</type>
@@ -224,11 +224,11 @@ published service ResultSet
         If this <code>Statement</code> object has not set a fetch direction,
         the return value is implementation-specific.
      */
-    [property] long FetchDirection;
-
-
+    [property] long FetchDirection; 
+ 
+     
     /** retrieves the number of result set rows that is the default fetch size
-        for result sets generated from this
+        for result sets generated from this 
         <type scope="com::sun::star::sdbcx">Statement</type>
         object.
         <br/>
@@ -237,13 +237,13 @@ published service ResultSet
         object has not set a fetch size,
         the return value is implementation-specific.
      */
-    [property] long FetchSize;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [property] long FetchSize; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/ResultSetConcurrency.idl b/offapi/com/sun/star/sdbc/ResultSetConcurrency.idl
index 16dc6db17da4..1e3d0a1b7136 100644
--- a/offapi/com/sun/star/sdbc/ResultSetConcurrency.idl
+++ b/offapi/com/sun/star/sdbc/ResultSetConcurrency.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_ResultSetConcurrency_idl__
-#define __com_sun_star_sdbc_ResultSetConcurrency_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_ResultSetConcurrency_idl__ 
+#define __com_sun_star_sdbc_ResultSetConcurrency_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** describes the different scroll capabilities of a result set.
  */
 published constants ResultSetConcurrency
-{
-
-    /** is the concurrency mode for a
+{ 
+     
+    /** is the concurrency mode for a 
         <type scope="com::sun::star::sdb">ResultSet</type>
         object that may NOT be updated.
      */
-    const long READ_ONLY = 1007;
-
-
-    /** is the concurrency mode for a
+    const long READ_ONLY = 1007; 
+ 
+     
+    /** is the concurrency mode for a 
             <type scope="com::sun::star::sdb">ResultSet</type>
             object that may be updated.
      */
-    const long UPDATABLE = 1008;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long UPDATABLE = 1008; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/ResultSetType.idl b/offapi/com/sun/star/sdbc/ResultSetType.idl
index 446495d3f173..1c446d254a5f 100644
--- a/offapi/com/sun/star/sdbc/ResultSetType.idl
+++ b/offapi/com/sun/star/sdbc/ResultSetType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_ResultSetType_idl__
-#define __com_sun_star_sdbc_ResultSetType_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_ResultSetType_idl__ 
+#define __com_sun_star_sdbc_ResultSetType_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** describes the different scroll capabilities of a result set.
  */
 published constants ResultSetType
-{
-
-    /** is the type for a
+{ 
+     
+    /** is the type for a 
             <type scope="com::sun::star::sdb">ResultSet</type>
             object whose cursor may move only forward.
      */
-    const long FORWARD_ONLY         = 1003;
-
-
-    /** is the type for a
+    const long FORWARD_ONLY 		= 1003; 
+ 
+     
+    /** is the type for a 
             <type scope="com::sun::star::sdb">ResultSet</type>
-            object that is scrollable
+            object that is scrollable 
              but generally not sensitive to changes made by others.
      */
-    const long SCROLL_INSENSITIVE   = 1004;
-
-
+    const long SCROLL_INSENSITIVE 	= 1004; 
+ 
+     
     /** is the type for a
             <type scope="com::sun::star::sdb">ResultSet</type>
-            object that is scrollable
+            object that is scrollable 
              and generally sensitive to changes made by others.
      */
-    const long SCROLL_SENSITIVE     = 1005;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long SCROLL_SENSITIVE 	= 1005; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/RowSet.idl b/offapi/com/sun/star/sdbc/RowSet.idl
index 5c79c7a2076b..1f7a2e9dd661 100644
--- a/offapi/com/sun/star/sdbc/RowSet.idl
+++ b/offapi/com/sun/star/sdbc/RowSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_RowSet_idl__
-#define __com_sun_star_sdbc_RowSet_idl__
-
-#ifndef __com_sun_star_sdbc_ResultSet_idl__
-#include <com/sun/star/sdbc/ResultSet.idl>
-#endif
-#ifndef __com_sun_star_sdbc_XColumnLocate_idl__
+#ifndef __com_sun_star_sdbc_RowSet_idl__ 
+#define __com_sun_star_sdbc_RowSet_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_ResultSet_idl__ 
+#include <com/sun/star/sdbc/ResultSet.idl> 
+#endif 
+#ifndef __com_sun_star_sdbc_XColumnLocate_idl__ 
 #include <com/sun/star/sdbc/XColumnLocate.idl>
-#endif
-
- module com {  module sun {  module star {  module container {
- published interface XNameAccess;
-};};};};
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XRowSet;
- published interface XParameters;
-
-
-/** is a client side ResultSet, which combines the characteristics of a
+#endif 
+ 
+ module com {  module sun {  module star {  module container { 
+ published interface XNameAccess; 
+};};};}; 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XRowSet; 
+ published interface XParameters; 
+ 
+ 
+/** is a client side ResultSet, which combines the characteristics of a 
     <type scope="com::sun::star::sdbc">Statement</type>
-    and a
+    and a 
     <type scope="com::sun::star::sdbc">ResultSet</type>.
-
-
+    
+    
     <p>
     It acts like a typical bean. Before you use the RowSet, you have to specify a
     set of properties like a DataSource and a Command and other properties known of
@@ -67,69 +67,69 @@
     </p>
  */
 published service RowSet
-{
-    service com::sun::star::sdbc::ResultSet;
-
+{ 
+    service com::sun::star::sdbc::ResultSet; 
+    
     /** used to execute and to add/remove listeners.
 
         <p>To refresh the content of a <type>RowSet</type>, use this interface's <member>XRowSet::execute</member>
         method.</p>
     */
-    interface XRowSet;
-
+    interface XRowSet; 
+    
     // used to set parameters.
-    interface XParameters;
+    interface XParameters; 
 
     /** allows locating columns which's name is known only.
     */
     interface XColumnLocate;
-
+    
     /** is the name of a named datasource to use.@see com::sun::star::sdbc:XDataSource
      */
-    [property] string DataSourceName;
-
-
+    [property] string DataSourceName; 
+ 
+     
     /** is the connection URL. Could be used instead of the DataSourceName.
      */
-    [property] string URL;
-
-
+    [property] string URL; 
+ 
+     
     /** is the command which should be executed.
      */
-    [property] string Command;
-
-
+    [property] string Command; 
+ 
+     
     /** indicates the transaction isolation level, which should be used for the
         connection.@see com::sun::star::sdbc::TransactionIsolation
      */
-    [property] long TransactionIsolation;
-
-
+    [property] long TransactionIsolation; 
+ 
+     
     /** is the type map that will be used for the custom mapping of SQL structured types
         and distinct types.
      */
-    [property] com::sun::star::container::XNameAccess TypeMap;
-
-
+    [property] com::sun::star::container::XNameAccess TypeMap; 
+ 
+     
     /** returns if escape processing is on or off.
         If escape scanning is on (the default), the driver will do
         escape substitution before sending the SQL to the database.
         This is only evaluated, if the CommandType is COMMAND.
      */
-    [property] boolean EscapeProcessing;
-
-
+    [property] boolean EscapeProcessing; 
+ 
+     
     /** retrieves the number of seconds the driver will wait for a Statement
-        to execute. If the limit is exceeded, a
+        to execute. If the limit is exceeded, a 
         <type scope="com::sun::star::sdbc">SQLException</type>
         is thrown.
         There is no limitation, if set to zero.
      */
-    [property] long QueryTimeOut;
-
-
+    [property] long QueryTimeOut; 
+ 
+     
     /** returns the maximum number of bytes allowed for any column value.
-
+        
         <p>
         This limit is the maximum number of bytes that can be returned
         for any column value. The limit applies only to
@@ -151,38 +151,38 @@ published service RowSet
         There is no limitation, if set to zero.
         </p>
      */
-    [property] long MaxFieldSize;
-
-
+    [property] long MaxFieldSize; 
+ 
+     
     /** retrieves the maximum number of rows that a ResultSet can contain.
         If the limit is exceeded, the excess rows are silently dropped.
         <br/>
         There is no limitation, if set to zero.
      */
-    [property] long MaxRows;
-
-
+    [property] long MaxRows; 
+ 
+     
     /** determines the user for whom to open the connection.
      */
-    [property] string User;
-
-
+    [property] string User; 
+ 
+     
     /** determines the user for whom to open the connection.
      */
-    [property] string Password;
-
-
+    [property] string Password; 
+ 
+     
     /** determine the result set type.
 
         @see com::sun::star::sdbc::ResultSetType
      */
-    [property] long ResultSetType;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [property] long ResultSetType; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/SQLException.idl b/offapi/com/sun/star/sdbc/SQLException.idl
index 11d66fb3fd57..8acb588e75c3 100644
--- a/offapi/com/sun/star/sdbc/SQLException.idl
+++ b/offapi/com/sun/star/sdbc/SQLException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#define __com_sun_star_sdbc_SQLException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#define __com_sun_star_sdbc_SQLException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** is an exception that provides information on a database access error.
-
+    
     <p>
     Each
     <type scope="com::sun::star::sdbc">SQLException</type>
@@ -44,7 +44,7 @@
     <p>
     <ul>
     <li>
-    a string describing the error.  This is used as the
+    a string describing the error.  This is used as the 
     <type scope="com::sun::star::uno">Exception</type>
     message.
     </li>
@@ -52,30 +52,30 @@
     </p>
  */
 published exception SQLException: com::sun::star::uno::Exception
-{
+{ 
     /** returns a string, which uses the XOPEN SQLState conventions.
         The values of the SQLState string are described in the XOPEN SQL spec.
      */
-    string          SQLState;
-
+    string			SQLState; 
+    
     /** returns an integer error code that is specific to each vendor.  Normally this will
         be the actual error code returned by the underlying database.
         A chain to the next Exception.  This can be used to provide additional
         error information.
      */
-    long            ErrorCode;
-
+    long			ErrorCode; 
+    
     /** returns a chain to the next Exception.
         This can be used to provide additional
         error information.
      */
-    any             NextException;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    any				NextException; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/SQLWarning.idl b/offapi/com/sun/star/sdbc/SQLWarning.idl
index 3be1a07cef87..e95edef32c07 100644
--- a/offapi/com/sun/star/sdbc/SQLWarning.idl
+++ b/offapi/com/sun/star/sdbc/SQLWarning.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_SQLWarning_idl__
-#define __com_sun_star_sdbc_SQLWarning_idl__
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_SQLWarning_idl__ 
+#define __com_sun_star_sdbc_SQLWarning_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** is an exception that provides information on database access
     warnings. Warnings are silently chained to the object whose method
     caused it to be reported.
@@ -43,13 +43,13 @@
     @see XStatement::getWarnings
  */
 published exception SQLWarning: SQLException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/Statement.idl b/offapi/com/sun/star/sdbc/Statement.idl
index fc66d2cdac32..65ece8983927 100644
--- a/offapi/com/sun/star/sdbc/Statement.idl
+++ b/offapi/com/sun/star/sdbc/Statement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_Statement_idl__
-#define __com_sun_star_sdbc_Statement_idl__
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCancellable_idl__
-#include <com/sun/star/util/XCancellable.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XWarningsSupplier;
- published interface XStatement;
- published interface XBatchExecution;
- published interface XMultipleResults;
- published interface XCloseable;
-
-
+#ifndef __com_sun_star_sdbc_Statement_idl__ 
+#define __com_sun_star_sdbc_Statement_idl__ 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XCancellable_idl__ 
+#include <com/sun/star/util/XCancellable.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XWarningsSupplier; 
+ published interface XStatement; 
+ published interface XBatchExecution; 
+ published interface XMultipleResults; 
+ published interface XCloseable; 
+ 
+ 
 /** is used for executing a static SQL statement and obtaining the results
     produced by it.
-
+    
     <p>
     Only one ResultSet per Statement can be open at any point in
     time. Therefore, if the reading of one ResultSet is interleaved
@@ -60,67 +60,67 @@
     </p>
  */
 published service Statement
-{
-
-    /** optional for implementation, controls the releasing of resources
+{ 
+     
+    /** optional for implementation, controls the releasing of resources 
              and the notification of registered listeners.
      */
-    [optional] interface com::sun::star::lang::XComponent;
-
-
-    /** freeing all resources of a statement. A related resultset will be
+    [optional] interface com::sun::star::lang::XComponent; 
+ 
+     
+    /** freeing all resources of a statement. A related resultset will be 
              freed as well.
      */
-    interface XCloseable;
-
+    interface XCloseable; 
+ 
     // gives access to the properties.
-    interface com::sun::star::beans::XPropertySet;
-
-    /** could be used for cancelling the execution of SQL statements if both
-             the DBMS and the driver support aborting an SQL statement.
+    interface com::sun::star::beans::XPropertySet; 
+     
+    /** could be used for cancelling the execution of SQL statements if both 
+             the DBMS and the driver support aborting an SQL statement. 
              The implementation is optional.
      */
-    [optional] interface com::sun::star::util::XCancellable;
-
+    [optional] interface com::sun::star::util::XCancellable; 
+     
     /** is the interface for executing SQL commands.
      */
-    interface XStatement;
-
-
-    /** provides the ability of batch execution. This interface is optional
-             for execution.
+    interface XStatement; 
+ 
+     
+    /** provides the ability of batch execution. This interface is optional 
+             for execution. 
              <p>
              A driver implementing batch execution must return
              <TRUE/>
-             for
+             for 
              <member scope= "com::sun::star::sdbc"> XDatabaseMetaData::supportsBatchUpdates()</member>
              </p>
      */
-    [optional] interface XBatchExecution;
-
-
-    /** controls the chaining of warnings, which may occur on every call
-             to the connected database. Chained warnings from previous calls will be
+    [optional] interface XBatchExecution; 
+ 
+     
+    /** controls the chaining of warnings, which may occur on every call 
+             to the connected database. Chained warnings from previous calls will be 
              cleared before processing a new call.
      */
-    interface XWarningsSupplier;
-
-
-    /** covers the handling of multiple results after executing an SQL command.
+    interface XWarningsSupplier; 
+ 
+     
+    /** covers the handling of multiple results after executing an SQL command. 
                 The implementation is optional.
      */
-    [optional] interface XMultipleResults;
-
-
+    [optional] interface XMultipleResults; 
+ 
+     
     /** retrieves the number of seconds the driver will wait for a Statement
         to execute. If the limit is exceeded, a SQLException is thrown.
         There is no limitation, if set to zero.
      */
-    [property] long QueryTimeOut;
-
-
-    /**  returns the maximum number of bytes allowed for any column value.
-
+    [property] long QueryTimeOut; 
+ 
+     
+    /**	 returns the maximum number of bytes allowed for any column value.
+        
         <p>
         This limit is the maximum number of bytes that can be returned
         for any column value. The limit applies only to
@@ -142,21 +142,21 @@ published service Statement
         There is no limitation, if set to zero.
         </p>
      */
-    [property] long MaxFieldSize;
-
-
+    [property] long MaxFieldSize; 
+ 
+     
     /** retrieves the maximum number of rows that a ResultSet can contain.
         If the limit is exceeded, the excess rows are silently dropped.
         <br/>
         There is no limitation, if set to zero.
      */
-    [property] long MaxRows;
-
-
+    [property] long MaxRows; 
+ 
+     
     /** defines the SQL cursor name that will be used by subsequent Statement
         <code>execute</code>
-        methods.
-
+        methods.		
+        
         <p>
         This name can then be used in SQL positioned update/delete statements to
         identify the current row in the ResultSet generated by this statement. If
@@ -176,23 +176,23 @@ published service Statement
         cursor names must be unique within a connection.
         </p>
      */
-    [property] string CursorName;
-
-
+    [property] string CursorName; 
+ 
+     
     /** retrieves the result set concurrency.
 
         @see com::sun::star::sdbc::ResultSetConcurrency
      */
-    [property] long ResultSetConcurrency;
-
-
+    [property] long ResultSetConcurrency; 
+ 
+     
     /** determine the result set type.
 
         @see com::sun::star::sdbc::ResultSetType
      */
-    [property] long ResultSetType;
-
-
+    [property] long ResultSetType; 
+ 
+     
     /** retrieves the direction for fetching rows from database tables
         that is the default for result sets generated from this
         <code>Statement</code>
@@ -203,31 +203,31 @@ published service Statement
         object has not set a fetch direction,
         the return value is implementation-specific.
      */
-    [property] long FetchDirection;
-
-
+    [property] long FetchDirection; 
+ 
+     
     /** retrieves the number of result set rows that is the default fetch size
         for result sets generated from this
         <code>Statement</code>
         object.
         <br/>
-        If this
+        If this 
         <code>Statement</code>
         object has not set a fetch size,
         the return value is implementation-specific.
      */
-    [property] long FetchSize;
-
-
+    [property] long FetchSize; 
+ 
+     
     /** returns if escape processing is on or off.
         If escape scanning is on (the default), the driver will do
         escape substitution before sending the SQL to the database.
      */
-    [property] boolean EscapeProcessing;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] boolean EscapeProcessing; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/TransactionIsolation.idl b/offapi/com/sun/star/sdbc/TransactionIsolation.idl
index 426027be9a04..f61ae72c5c54 100644
--- a/offapi/com/sun/star/sdbc/TransactionIsolation.idl
+++ b/offapi/com/sun/star/sdbc/TransactionIsolation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,62 +24,62 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_TransactionIsolation_idl__
-#define __com_sun_star_sdbc_TransactionIsolation_idl__
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_TransactionIsolation_idl__ 
+#define __com_sun_star_sdbc_TransactionIsolation_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** distinguishes different possible transaction isolation levels.
  */
 published constants TransactionIsolation
-{
-
+{ 
+     
     /** indicates that transactions are not supported.
      */
-    const long NONE                 =  0;
-
-    /** Dirty reads, non-repeatable reads and phantom reads can occur.
-             This level allows a row changed by one transaction to be read
-             by another transaction before any changes in that row have been
-             committed (a "dirty read").  If any of the changes are rolled back,
+    const long NONE					=  0; 
+     
+    /** Dirty reads, non-repeatable reads and phantom reads can occur. 
+             This level allows a row changed by one transaction to be read 
+             by another transaction before any changes in that row have been 
+             committed (a "dirty read").  If any of the changes are rolled back, 
              the second transaction will have retrieved an invalid row.
      */
-    const long READ_UNCOMMITTED     =  1;
-
-    /** Dirty reads are prevented; non-repeatable reads and phantom
-             reads can occur.  This level only prohibits a transaction
+    const long READ_UNCOMMITTED 	=  1; 
+     
+    /** Dirty reads are prevented; non-repeatable reads and phantom 
+             reads can occur.  This level only prohibits a transaction 
              from reading a row with uncommitted changes in it.
      */
-    const long READ_COMMITTED       =  2;
-
-    /** Dirty reads and non-repeatable reads are prevented; phantom
-             reads can occur.  This level prohibits a transaction from
-             reading a row with uncommitted changes in it, and it also
-             prohibits the situation where one transaction reads a row,
-             a second transaction alters the row, and the first transaction
-             rereads the row, getting different values the second time
+    const long READ_COMMITTED		=  2; 
+     
+    /** Dirty reads and non-repeatable reads are prevented; phantom 
+             reads can occur.  This level prohibits a transaction from 
+             reading a row with uncommitted changes in it, and it also 
+             prohibits the situation where one transaction reads a row, 
+             a second transaction alters the row, and the first transaction 
+             rereads the row, getting different values the second time 
              (a "non-repeatable read").
      */
-    const long REPEATABLE_READ      =  4;
-
-    /** Dirty reads, non-repeatable reads and phantom reads are prevented.
-             This level includes the prohibitions in
+    const long REPEATABLE_READ 		=  4; 
+     
+    /** Dirty reads, non-repeatable reads and phantom reads are prevented. 
+             This level includes the prohibitions in 
              <code>REPEATABLE_READ</code>
-             and further prohibits the
-             situation where one transaction reads all rows that satisfy
-             a WHERE condition, a second transaction inserts a row that
-             satisfies that WHERE condition, and the first transaction
-             rereads for the same condition, retrieving the additional
+             and further prohibits the 
+             situation where one transaction reads all rows that satisfy 
+             a WHERE condition, a second transaction inserts a row that 
+             satisfies that WHERE condition, and the first transaction 
+             rereads for the same condition, retrieving the additional 
              "phantom" row in the second read.
      */
-    const long SERIALIZABLE         =  8;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long SERIALIZABLE 		=  8; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XArray.idl b/offapi/com/sun/star/sdbc/XArray.idl
index c9cb8656370d..ba4e87be91a8 100644
--- a/offapi/com/sun/star/sdbc/XArray.idl
+++ b/offapi/com/sun/star/sdbc/XArray.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XArray_idl__
-#define __com_sun_star_sdbc_XArray_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
- module com {  module sun {  module star {  module container {
- published interface XNameAccess;
-};};};};
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XResultSet;
-
-
-/** is used for mapping the SQL type
+#ifndef __com_sun_star_sdbc_XArray_idl__ 
+#define __com_sun_star_sdbc_XArray_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module container { 
+ published interface XNameAccess; 
+};};};}; 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XResultSet; 
+ 
+ 
+/** is used for mapping the SQL type 
     <member scope= "com::sun::star::sdbc">DataType::ARRAY</member>
     .
-    By default, an
+    By default, an 
     <code>Array</code>
     is a transaction duration
     reference to an SQL array. By default, an
-
+    
     <code>Array</code>
 
     is implemented using a SQL LOCATOR(array) internally.
  */
 published interface XArray: com::sun::star::uno::XInterface
-{
-
+{ 
+       
     /** returns the SQL type name of the elements in
-        the array designated by this
+        the array designated by this 
         <code>Array</code>
         object.
         <p>
@@ -72,114 +72,114 @@ published interface XArray: com::sun::star::uno::XInterface
         @returns
             a String that is the database-specific name for a built-in base type or the fully-qualified SQL type name for a base type that is a UDT
 
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getBaseTypeName() raises (SQLException);
-
-      //-------------------------------------------------------------------------
-
+    string getBaseTypeName() raises (SQLException); 
+ 
+      //------------------------------------------------------------------------- 
+       
     /** returns the SDBC type of the elements in the array designated
-        by this
+        by this 
         <code>Array</code>
         object.
         @returns
             a constant from the SDBC types that is the type code for the elements in the array designated by this Array object.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getBaseType() raises (SQLException);
-
-    //-------------------------------------------------------------------------
-
-    /** retrieves the contents of the SQL array designated by this
+    long getBaseType() raises (SQLException); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** retrieves the contents of the SQL array designated by this 
                 <code>Array</code>
-             object, using the specified
+             object, using the specified 
              <code>typeMap</code>
-             for type map customizations.
+             for type map customizations. 
              <p>
-             If the base type of the array does not match a user-defined type
+             If the base type of the array does not match a user-defined type 
              in
              <code>typeMap</code>
-             , the standard mapping is used instead.
-
-             @param typeMap
-                is a map object that contains mappings of SQL type names to
+             , the standard mapping is used instead. 
+         
+             @param typeMap 
+                is a map object that contains mappings of SQL type names to 
                 services. If the
                 <code>typeMap</code>
-                is
+                is 
                 <NULL/>
-                , the type-map
-                    associated with the connection for customizations of the type-mappings
-                 is used.
-
-             @returns
-                an sequence that contains the ordered elements
-                of the SQL array designated by this object.
-
-             @throws SQLException
+                , the type-map 
+                    associated with the connection for customizations of the type-mappings 
+                 is used. 
+         
+             @returns 
+                an sequence that contains the ordered elements 
+                of the SQL array designated by this object. 
+         
+             @throws SQLException 
                 if an error occurs while attempting to access the array.
      */
-    sequence<any> getArray([in]com::sun::star::container::XNameAccess typeMap)
-        raises (SQLException);
-
-      //-------------------------------------------------------------------------
-
-    /** returns an array containing a slice of the SQL array, beginning with the
-                specified
+    sequence<any> getArray([in]com::sun::star::container::XNameAccess typeMap) 
+        raises (SQLException); 
+ 
+      //------------------------------------------------------------------------- 
+     
+    /** returns an array containing a slice of the SQL array, beginning with the 
+                specified 
              <code>index</code>
              and containing up to
              <code>count</code>
-                successive elements of the SQL array.
-
-             @param index
-                is the array index of the first element to retrieve;
-                the first element is at index 1.
-                @param count
-                is the number of successive SQL array elements to retrieve.
-             @param typeMap
-                is a map object that contains mappings of SQL type names to
+                successive elements of the SQL array. 
+         
+             @param index 
+                is the array index of the first element to retrieve; 
+                the first element is at index 1. 
+                @param count 
+                is the number of successive SQL array elements to retrieve. 
+             @param typeMap 
+                is a map object that contains mappings of SQL type names to 
                 services. If the
                 <code>typeMap</code>
                 is
                 <NULL/>
-                , the type-map
-                   associated with the connection for customizations of the type-mappings
-                is used.
-             @returns
+                , the type-map 
+                   associated with the connection for customizations of the type-mappings 
+                is used. 
+             @returns 
                 an array containing up to
                 <code>count</code>
-                consecutive elements
+                consecutive elements 
                    of the SQL array, beginning with element
                 <code>index</code>
-                .
-                @throws SQLException
+                .				 
+                @throws SQLException 
                 if an error occurs while attempting to access the array.
      */
-    sequence<any> getArrayAtIndex([in]long index,
-                                  [in]long count,
-                                  [in]com::sun::star::container::XNameAccess
-                                                                      typeMap)
-            raises (SQLException);
-
-      //-------------------------------------------------------------------------
-
+    sequence<any> getArrayAtIndex([in]long index, 
+                                  [in]long count, 
+                                  [in]com::sun::star::container::XNameAccess 
+                                                                      typeMap) 
+            raises (SQLException); 
+ 
+      //------------------------------------------------------------------------- 
+     
     /** returns a result set that contains the elements of the array
-        designated by this
+        designated by this 
         <code>Array</code>
         object and uses the given
         <code>typeMap</code>
         to map the array elements.  If the base
         type of the array does not match a user-defined type in
         <code>typeMap</code>
-        or the
+        or the 
         <code>typeMap</code>
         is
         <NULL/>
         ,
         the connection type mapping is used instead.
-
-
+        
+        
         <p>
         The result set contains one row for each array element, with
         two columns in each row.  The second column stores the element
@@ -189,19 +189,19 @@ published interface XArray: com::sun::star::uno::XInterface
         the order of the indices.
         </p>
 
-        @param  typeMap
+        @param	typeMap
             contains mapping of SQL user-defined types to classes in the UNO programming language
-        @returns
-            a ResultSet object containing one row for each of the elements in the array designated by this Array object,
+        @returns 
+            a ResultSet object containing one row for each of the elements in the array designated by this Array object, 
             with the rows in ascending order based on the indices.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getResultSet([in]com::sun::star::container::XNameAccess typeMap)
-        raises (SQLException);
-
-      //-------------------------------------------------------------------------
-
+    XResultSet getResultSet([in]com::sun::star::container::XNameAccess typeMap) 
+        raises (SQLException); 
+ 
+      //------------------------------------------------------------------------- 
+     
     /** returns a result set holding the elements of the subarray that
         starts at index
         <code>index</code>
@@ -212,14 +212,14 @@ published interface XArray: com::sun::star::uno::XInterface
         to map the array elements. If the base
         type of the array does not match a user-defined type in
         <code>typeMap</code>
-        or the
+        or the 
         <code>typeMap</code>
         is
         <NULL/>
         ,
         the connection type mapping is used instead.
-
-
+        
+        
         <p>
         The result set contains one row for each array element, with
         two columns in each row.  The second column stores the element
@@ -235,21 +235,21 @@ published interface XArray: com::sun::star::uno::XInterface
         @param typeMap
             the Map object that contains the mapping of SQL type names to classes in the UNO programming language.
         @returns
-            a ResultSet object containing up to count consecutive elements of the SQL array
+            a ResultSet object containing up to count consecutive elements of the SQL array 
             designated by this Array object, starting at index index.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getResultSetAtIndex([in]long index,
-                                   [in]long count,
-                                   [in]com::sun::star::container::XNameAccess typeMap)
-        raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    XResultSet getResultSetAtIndex([in]long index, 
+                                   [in]long count, 
+                                   [in]com::sun::star::container::XNameAccess typeMap) 
+        raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XBatchExecution.idl b/offapi/com/sun/star/sdbc/XBatchExecution.idl
index 98bcc10514be..f89887617132 100644
--- a/offapi/com/sun/star/sdbc/XBatchExecution.idl
+++ b/offapi/com/sun/star/sdbc/XBatchExecution.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XBatchExecution_idl__
-#define __com_sun_star_sdbc_XBatchExecution_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XResultSet;
-
-
+#ifndef __com_sun_star_sdbc_XBatchExecution_idl__ 
+#define __com_sun_star_sdbc_XBatchExecution_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XResultSet; 
+ 
+ 
 /** is used for collecting and executing a set of SQL statements.
  */
 published interface XBatchExecution: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** adds a SQL command to the current batch of commmands for the statement
         object.
         @param sql
             the SQL statement which should be appended to the batch.
 
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void addBatch([in]string sql ) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void addBatch([in]string sql ) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** makes the set of commands in the current batch empty.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void clearBatch() raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /** submits a batch of commands to the database for execution.
-             @returns
-                an array of update counts containing one element for each
-                 command in the batch. The array is ordered according to the order in
-                which commands were inserted into the batch.
-             @throws SQLException
+    void clearBatch() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** submits a batch of commands to the database for execution. 
+             @returns 
+                an array of update counts containing one element for each 
+                 command in the batch. The array is ordered according to the order in 
+                which commands were inserted into the batch. 
+             @throws SQLException 
                 if a database access error occurs.
      */
-    sequence<long> executeBatch() raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    sequence<long> executeBatch() raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XBlob.idl b/offapi/com/sun/star/sdbc/XBlob.idl
index ef42045662b5..cf3fa1eb29c9 100644
--- a/offapi/com/sun/star/sdbc/XBlob.idl
+++ b/offapi/com/sun/star/sdbc/XBlob.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,80 +24,80 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XBlob_idl__
-#define __com_sun_star_sdbc_XBlob_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
- module com {  module sun {  module star {  module io {
- published interface XInputStream;
-};};};};
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
-
-/** is the representation (mapping) of an SQL
+#ifndef __com_sun_star_sdbc_XBlob_idl__ 
+#define __com_sun_star_sdbc_XBlob_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module io { 
+ published interface XInputStream; 
+};};};}; 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
+/** is the representation (mapping) of an SQL 
     <i>
     BLOB
     </i>
     .
-
+    
     <p>
-    A SQL
+    A SQL 
     <i>
     BLOB
     </i>
     is a built-in type that stores a
     Binary Large Object as a column value in a row of a database table.
-    The driver implements
+    The driver implements 
     <i>
     BLOB
     </i>
     using a
-    SQL
+    SQL 
     <code>locator(BLOB)</code>
-    , which means that a
+    , which means that a 
     <code>Blob</code>
-    object contains a logical pointer to the SQL
+    object contains a logical pointer to the SQL 
     <i>
     BLOB
     </i>
     data rather than the data itself.
     <br/>
-    A
+    A 
     <code>Blob</code>
     object is valid for the duration of the transaction in which is was created.
-
+    
     </p>
     <p>
-    Methods in the interfaces
+    Methods in the interfaces 
     <type scope="com::sun::star::sdbc">XResultSet</type>
     ,
-    and
+    and 
     <type scope="com::sun::star::sdbc">XPreparedStatement</type>
     , such as
     <code>getBlob</code>
     and
     <code>setBlob</code>
-    allow a programmer to access the SQL
+    allow a programmer to access the SQL 
     <i>
     BLOB
     </i>
     .
     <br/>
-    The
+    The 
     <code>Blob</code>
-    interface provides methods for getting the length of a SQL
+    interface provides methods for getting the length of a SQL 
     <i>
     BLOB
     </i>
-    (Binary Large Object) value, for materializing a
+    (Binary Large Object) value, for materializing a 
     <i>
     BLOB
     </i>
@@ -109,73 +109,73 @@
     </p>
  */
 published interface XBlob: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** returns the number of bytes in the
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** returns the number of bytes in the 
         <i>
         BLOB
         </i>
         value
-        designated by this
+        designated by this 
         <code>Blob</code>
         object.
         @returns
             the length
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    hyper length() raises (SQLException);
-
-      //-------------------------------------------------------------------------
-
+    hyper length() raises (SQLException); 
+ 
+      //------------------------------------------------------------------------- 
+     
     /** returns as an array of bytes part or all of the
             <i>
             BLOB
-            </i>
-             value that this
+            </i> 
+             value that this 
              <code>Blob</code>
-             object designates.  The byte
-             array contains up to
+             object designates.  The byte 
+             array contains up to 
              <code>length</code>
-             consecutive bytes
+             consecutive bytes 
              starting at position
              <code>pos</code>.
-             @param pos
-                is the ordinal position of the first byte in the
+             @param pos 
+                is the ordinal position of the first byte in the 
                     <i>
                 BLOB
-                </i>
-                value to be extracted; the first byte is at
-                    position 1.
-             @param length
-                is the number of consecutive bytes to be copied.
-             @returns
-                a byte array containing up to
+                </i> 
+                value to be extracted; the first byte is at 
+                    position 1. 
+             @param length 
+                is the number of consecutive bytes to be copied. 
+             @returns 
+                a byte array containing up to 
                 <code>length</code>
-                    consecutive bytes from the
+                    consecutive bytes from the 
                 <i>
                 BLOB
                 </i>
-                value designated
-                 by this
+                value designated 
+                 by this 
                 <code>Blob</code>
-                object, starting with the byte at position
+                object, starting with the byte at position 
                 <code>pos</code>
-                .
-             @throws SQLException
-                if there is an error accessing the
+                . 
+             @throws SQLException 
+                if there is an error accessing the 
                 <i>
                 BLOB
                 </i>
                 .
      */
-    sequence<byte> getBytes([in]hyper pos, [in]long length)
-        raises (SQLException);
-
-      //-------------------------------------------------------------------------
-
-    /** retrieves the
+    sequence<byte> getBytes([in]hyper pos, [in]long length) 
+        raises (SQLException); 
+ 
+      //------------------------------------------------------------------------- 
+     
+    /** retrieves the 
         <i>
         BLOB
         </i>
@@ -184,23 +184,23 @@ published interface XBlob: com::sun::star::uno::XInterface
         instance as a stream.
         @returns
             the stream
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    com::sun::star::io::XInputStream getBinaryStream()
-        raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    com::sun::star::io::XInputStream getBinaryStream() 
+        raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** determines the byte position at which the specified byte
         <code>pattern</code>
-        begins within the
+        begins within the 
         <i>
         BLOB
         </i>
-        value that this
+        value that this 
         <code>Blob</code>
         object represents.  The
-        search for
+        search for 
         <code>pattern</code>
         begins at position
         <code>start</code>
@@ -209,15 +209,15 @@ published interface XBlob: com::sun::star::uno::XInterface
             the pattern to search
         @returns
             the position
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    hyper position([in]sequence<byte> pattern, [in]hyper start)
-        raises (SQLException);
-
-      //-------------------------------------------------------------------------
-
-    /** determines the byte position in the
+    hyper position([in]sequence<byte> pattern, [in]hyper start) 
+        raises (SQLException); 
+ 
+      //------------------------------------------------------------------------- 
+     
+    /** determines the byte position in the 
         <i>
         BLOB
         </i>
@@ -235,17 +235,17 @@ published interface XBlob: com::sun::star::uno::XInterface
             position to start
         @returns
             the position
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    hyper positionOfBlob([in]XBlob pattern,[in] hyper start)
-         raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    hyper positionOfBlob([in]XBlob pattern,[in] hyper start) 
+         raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XClob.idl b/offapi/com/sun/star/sdbc/XClob.idl
index 8eec6d9e1645..36b5c98c4f39 100644
--- a/offapi/com/sun/star/sdbc/XClob.idl
+++ b/offapi/com/sun/star/sdbc/XClob.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,58 +24,58 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XClob_idl__
-#define __com_sun_star_sdbc_XClob_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
- module com {  module sun {  module star {  module io {
- published interface XInputStream;
-};};};};
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
-
-/** is the mapping for the SQL
+#ifndef __com_sun_star_sdbc_XClob_idl__ 
+#define __com_sun_star_sdbc_XClob_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module io { 
+ published interface XInputStream; 
+};};};}; 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
+/** is the mapping for the SQL 
     <code>CLOB</code>
     type.
-
-
+    
+    
     <p>
-    A SQL
+    A SQL 
     <code>CLOB</code>
     is a built-in type
     that stores a Character Large Object as a column value in a row of
     a database table.
-    The driver implements a
+    The driver implements a 
     <code>Clob</code>
     object using a SQL
     <code>locator(CLOB)</code>
-    , which means that a
+    , which means that a 
     <code>Clob</code>
     object
-    contains a logical pointer to the SQL
+    contains a logical pointer to the SQL 
     <code>CLOB</code>
     data rather than
-    the data itself. A
+    the data itself. A 
     <code>Clob</code>
     object is valid for the duration
     of the transaction in which it was created.
     </p>
     <p>
-    The
+    The 
     <code>Clob</code>
     interface provides methods for getting the
-    length of a SQL
+    length of a SQL 
     <code>CLOB</code>
     (Character Large Object) value,
-    for materializing a
+    for materializing a 
     <code>CLOB</code>
     value on the client, and for
     searching for a substring or
@@ -85,14 +85,14 @@
     value.
     </p>
     <p>
-    Methods in the interfaces
+    Methods in the interfaces 
     <type scope="com::sun::star::sdbc">XResultSet</type>
     ,
-    and
+    and 
     <type scope="com::sun::star::sdbc">XPreparedStatement</type>
     , such as
     <code>getClob</code>
-    and
+    and 
     <code>setClob</code>
     allow a programmer to
     access the SQL
@@ -101,32 +101,32 @@
     </p>
  */
 published interface XClob: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** returns the number of characters in the
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** returns the number of characters in the 
         <code>CLOB</code>
         value
-        designated by this
+        designated by this 
         <code>Clob</code>
         object.
         @returns
             the length of the CLOB object
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    hyper length() raises (SQLException);
-
-      //-------------------------------------------------------------------------
-
-    /** returns a copy of the specified substring in the
+    hyper length() raises (SQLException); 
+ 
+      //------------------------------------------------------------------------- 
+     
+    /** returns a copy of the specified substring in the 
         <code>Clob</code>
         value
         designated by this
         <code>Clob</code>
         object.
-
-
+        
+        
         <p>
         The substring begins at position <code>pos</code> and has up
         to
@@ -139,30 +139,30 @@ published interface XClob: com::sun::star::uno::XInterface
             the length of the substring
         @returns
             the substring
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getSubString([in]hyper pos, [in]long length) raises (SQLException);
-
-    //-------------------------------------------------------------------------
-
-    /** gets the
+    string getSubString([in]hyper pos, [in]long length) raises (SQLException); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** gets the 
         <code>Clob</code>
         contents as a stream.
         @returns
             the stream
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    com::sun::star::io::XInputStream getCharacterStream() raises (SQLException);
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::io::XInputStream getCharacterStream() raises (SQLException); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines the character position at which the specified substring
         <code>searchstr</code>
-        appears in the
+        appears in the 
         <code>Clob</code>
-        . The search begins at position
+        . The search begins at position 
         <code>start</code>
         .
         @param searchstr
@@ -171,14 +171,14 @@ published interface XClob: com::sun::star::uno::XInterface
             the starting position
         @returns
             the length of the CLOB object
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    hyper position([in]string searchstr, [in]long start)
-        raises (SQLException);
-
-      //-------------------------------------------------------------------------
-
+    hyper position([in]string searchstr, [in]long start) 
+        raises (SQLException); 
+ 
+      //------------------------------------------------------------------------- 
+     
     /** determines the position at which the specified
         <code>Clob</code>
         object
@@ -194,17 +194,17 @@ published interface XClob: com::sun::star::uno::XInterface
             the starting position
         @returns
             the position of the CLOB inside
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    hyper positionOfClob([in]XClob pattern, [in]hyper start)
-        raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    hyper positionOfClob([in]XClob pattern, [in]hyper start) 
+        raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XCloseable.idl b/offapi/com/sun/star/sdbc/XCloseable.idl
index 13f92f238f82..56aeae4cca27 100644
--- a/offapi/com/sun/star/sdbc/XCloseable.idl
+++ b/offapi/com/sun/star/sdbc/XCloseable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XCloseable_idl__
-#define __com_sun_star_sdbc_XCloseable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_XCloseable_idl__ 
+#define __com_sun_star_sdbc_XCloseable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** provides for the releasing of resources acquired by the implementing object.
  */
 published interface XCloseable: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** releases all resources connected to an object.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void close() raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void close() raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XColumnLocate.idl b/offapi/com/sun/star/sdbc/XColumnLocate.idl
index ec0e03624540..38e4cf57bad7 100644
--- a/offapi/com/sun/star/sdbc/XColumnLocate.idl
+++ b/offapi/com/sun/star/sdbc/XColumnLocate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,25 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XColumnLocate_idl__
-#define __com_sun_star_sdbc_XColumnLocate_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XResultSetMetaData;
-
-
+#ifndef __com_sun_star_sdbc_XColumnLocate_idl__ 
+#define __com_sun_star_sdbc_XColumnLocate_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XResultSetMetaData; 
+ 
+ 
 /** provides the possibility to find columns by their name.
-
-
+    
+    
     <p>
     When several columns have the same name, then the value
     of the first matching column will be returned. The column name option is
@@ -54,23 +54,23 @@
     </p>
  */
 published interface XColumnLocate: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** maps the given Resultset column name to its ResultSet column index.
         @param columnName
             the name of the column
         @returns
             the position of the column
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    long findColumn([in]string columnName) raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    long findColumn([in]string columnName) raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XConnection.idl b/offapi/com/sun/star/sdbc/XConnection.idl
index 37af3c7e43f9..77ad903cb71f 100644
--- a/offapi/com/sun/star/sdbc/XConnection.idl
+++ b/offapi/com/sun/star/sdbc/XConnection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,58 +24,58 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XConnection_idl__
-#define __com_sun_star_sdbc_XConnection_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
- module com {  module sun {  module star {  module container {
- published interface XNameAccess;
-};};};};
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_XCloseable_idl__
-#include <com/sun/star/sdbc/XCloseable.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XStatement;
- published interface XPreparedStatement;
- published interface XDatabaseMetaData;
-
-
+#ifndef __com_sun_star_sdbc_XConnection_idl__ 
+#define __com_sun_star_sdbc_XConnection_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module container { 
+ published interface XNameAccess; 
+};};};}; 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_XCloseable_idl__ 
+#include <com/sun/star/sdbc/XCloseable.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XStatement; 
+ published interface XPreparedStatement; 
+ published interface XDatabaseMetaData; 
+ 
+ 
 /** represents a connection (session) with a specific
     database. Within the context of a Connection, SQL statements are
     executed and results are returned.
-
-
+    
+    
     <p>
     A Connection's database is able to provide information
     describing its tables, its supported SQL grammar, its stored
     procedures, and the capabilities of this connection. This
-    information is obtained with the
+    information is obtained with the 
     <member scope="com::sun::star::sdbc">XDatabaseMetaData::getMetaData()</member>
     method.
-
+    
     </p>
-    @see com::sun::star::sdbc::XDriverManager
-    @see com::sun::star::sdbc::XStatement
+    @see com::sun::star::sdbc::XDriverManager 
+    @see com::sun::star::sdbc::XStatement 
     @see com::sun::star::sdbc::XDatabaseMetaData
  */
 published interface XConnection: com::sun::star::sdbc::XCloseable
-{
-
-    /** creates a new
+{ 
+     
+    /** creates a new 
         <type scope="com::sun::star::sdbc">Statement</type>
         object for sending SQL statements to the database.
-
-
+        
+        
         <p>
         SQL statements without parameters are normally
         executed using Statement objects. If the same SQL statement
@@ -93,23 +93,23 @@ published interface XConnection: com::sun::star::sdbc::XCloseable
 
         @returns
             a new Statement object
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XStatement createStatement() raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /** creates a
+    XStatement createStatement() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** creates a 
         <type scope="com::sun::star::sdbc">PreparedStatement</type>
         object for sending parameterized SQL statements to the database.
-
-
+        
+        
         <p>
         A SQL statement with or without IN parameters can be
         pre-compiled and stored in a PreparedStatement object. This
         object can then be used to efficiently execute this statement
         multiple times.
-
+        
         </p>
         <p>
         <b>
@@ -118,12 +118,12 @@ published interface XConnection: com::sun::star::sdbc::XCloseable
         This method is optimized for handling
         parametric SQL statements that benefit from precompilation. If
         the driver supports precompilation,
-        the method
+        the method 
         <code>prepareStatement</code>
         will send
         the statement to the database for precompilation. Some drivers
         may not support precompilation. In this case, the statement may
-        not be sent to the database until the
+        not be sent to the database until the 
         <type scope="com::sun::star::sdbc">PreparedStatement</type>
         is executed.  This has no direct effect on users; however, it does
         affect which method throws certain SQLExceptions.
@@ -140,18 +140,18 @@ published interface XConnection: com::sun::star::sdbc::XCloseable
             a SQL statement that may contain one or more '?' IN parameter placeholders
         @returns
             a new PreparedStatement object containing the pre-compiled statement
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XPreparedStatement prepareStatement([in]string sql) raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /** creates a
+    XPreparedStatement prepareStatement([in]string sql) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** creates a 
         <type scope="com::sun::star::sdbc">CallableStatement</type>
         object for calling
         database stored procedures.
-
-
+        
+        
         <p>
         The CallableStatement provides methods for setting up its IN and OUT
         parameters, and methods for executing the call to a stored procedure.
@@ -162,7 +162,7 @@ published interface XConnection: com::sun::star::sdbc::XCloseable
         </b>
         This method is optimized for handling stored
         procedure call statements. Some drivers may send the call
-        statement to the database when the method
+        statement to the database when the method 
         <code>prepareCall</code>
         is done;
         <br/>
@@ -177,12 +177,12 @@ published interface XConnection: com::sun::star::sdbc::XCloseable
             a SQL statement that may contain one or more '?' IN parameter placeholders
         @returns
             a new PreparedStatement object containing the pre-compiled statement
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XPreparedStatement prepareCall([in]string sql) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XPreparedStatement prepareCall([in]string sql) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** converts the given SQL statement into the system's native SQL grammar.
         A driver may convert the JDBC SQL grammar into its system's
         native SQL grammar prior to sending it; this method returns the
@@ -192,23 +192,23 @@ published interface XConnection: com::sun::star::sdbc::XCloseable
             a SQL statement that may contain one or more '?' parameter placeholders
         @returns
             the native form of this statement
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string nativeSQL([in]string sql) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string nativeSQL([in]string sql) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets this connection's auto-commit mode.
-
-
+        
+        
         <p>
         If a connection is in auto-commit mode, then all its SQL
         statements will be executed and committed as individual
         transactions. Otherwise, its SQL statements are grouped into
         transactions that are terminated by a call to either
-        the method
+        the method 
         <member scope="com::sun::star::sdbc">XConnection::commit()</member>
-        or the method
+        or the method 
         <member scope="com::sun::star::sdbc">XConnection::rollback()</member>
         .
         By default, new connections are in auto-commit mode.
@@ -226,52 +226,52 @@ published interface XConnection: com::sun::star::sdbc::XCloseable
 
         @param autoCommit
             <TRUE/> enables auto-commit; <FALSE/> disables auto-commit.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setAutoCommit([in] boolean autoCommit) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setAutoCommit([in] boolean autoCommit) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the current auto-commit state.
 
         @returns
             the current state of auto-commit mode.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
 
         @see setAutoCommit
      */
-    boolean getAutoCommit() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean getAutoCommit() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** makes all changes made since the previous commit/rollback
         permanent and releases any database locks currently held
         by the Connection. This method should be
         used only when auto-commit mode has been disabled.
 
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
 
         @see setAutoCommit
      */
-    void commit() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void commit() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** drops all changes made since the previous
         commit/rollback and releases any database locks currently held
         by this Connection. This method should be used only when auto-commit has been disabled.
-
-        @throws SQLException
+        
+        @throws SQLException 
             if a database access error occurs.
 
         @see setAutoCommit
      */
-    void rollback() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void rollback() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** tests to see if a connection is closed.
-
-
+        
+        
         <p>
         <b>
         Note:
@@ -282,15 +282,15 @@ published interface XConnection: com::sun::star::sdbc::XCloseable
 
         @returns
             <TRUE/> if the connection is closed; <FALSE/> if it's still open.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean isClosed() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean isClosed() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the metadata regarding this connection's database.
-
-
+        
+        
         <p>
         A Connection's database is able to provide information
         describing its tables, its supported SQL grammar, its stored
@@ -301,16 +301,16 @@ published interface XConnection: com::sun::star::sdbc::XCloseable
 
         @returns
             a DatabaseMetaData object for this Connection.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XDatabaseMetaData getMetaData() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XDatabaseMetaData getMetaData() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** puts this connection in read-only mode as a hint to enable
         database optimizations.
-
-
+        
+        
         <p>
         <b>
         Note:
@@ -324,45 +324,45 @@ published interface XConnection: com::sun::star::sdbc::XCloseable
 
         @param readONly
             <TRUE/> enables read-only mode; <FALSE/> disables read-only mode.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setReadOnly([in]boolean readOnly) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setReadOnly([in]boolean readOnly) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** tests to see if the connection is in read-only mode.
         @returns
             <TRUE/> if connection is read-only and <FALSE/> otherwise.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean isReadOnly() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean isReadOnly() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets a catalog name in order to select
         a subspace of this Connection's database in which to work.
         If the driver does not support catalogs, it will
         silently ignore this request.
         @param catalog
             the name of the catalog.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setCatalog([in]string catalog) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setCatalog([in]string catalog) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** returns the Connection's current catalog name.
         @returns
             the current catalog name or an empty string.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getCatalog() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getCatalog() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** attempts to change the transaction isolation level to the one given.
-
-
+        
+        
         <p>
         The constants defined in
         <type scope="com::sun::star::sdbc">TransactionIsolation</type>
@@ -377,27 +377,27 @@ published interface XConnection: com::sun::star::sdbc::XCloseable
         </p>
         @param level
             one of the TransactionIsolation values with the exception of NONE; some databases may not support other values.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
 
         @see com::sun::star::sdbc::XDatabaseMetaData::supportsTransactionIsolationLevel()
      */
-    void setTransactionIsolation([in]long level) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setTransactionIsolation([in]long level) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets this Connection's current transaction isolation level.
         @returns
             the current TransactionIsolation mode value.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getTransactionIsolation() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getTransactionIsolation() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the type map object associated with this connection. Only drivers
         which implement the custom type mapping facility will return an object otherwise
         NULL could be returned.
-
+        
         <p>
         Unless the application has added an entry to the type map, the map
         returned will be empty.
@@ -405,34 +405,34 @@ published interface XConnection: com::sun::star::sdbc::XCloseable
         @returns
             the XNameAccess object associated with this Connection object.
 
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    com::sun::star::container::XNameAccess getTypeMap() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    com::sun::star::container::XNameAccess getTypeMap() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** installs the given type map as the type map for this connection.
         The type map will be used for the custom mapping of SQL structured types
         and distinct types.
-
-
+        
+        
         <p>
         Only if the driver supports custom type mapping is the setting of a map allowed.
         </p>
 
         @param typeMap
             set the XNameAccess object associated with this Connection object.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setTypeMap([in]com::sun::star::container::XNameAccess typeMap)
-        raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void setTypeMap([in]com::sun::star::container::XNameAccess typeMap) 
+        raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XDataSource.idl b/offapi/com/sun/star/sdbc/XDataSource.idl
index 2c2f4f13323e..acb2fdbf4ed3 100644
--- a/offapi/com/sun/star/sdbc/XDataSource.idl
+++ b/offapi/com/sun/star/sdbc/XDataSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XDataSource_idl__
-#define __com_sun_star_sdbc_XDataSource_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XConnection;
-
-
+#ifndef __com_sun_star_sdbc_XDataSource_idl__ 
+#define __com_sun_star_sdbc_XDataSource_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XConnection; 
+ 
+ 
 /** is used for establishing connections via a factory which is identified
     by its name. A DataSource object is typically registered by a naming service
     provider.
  */
 published interface XDataSource: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+      
     /** attempts to establish a database connection.
         @param user
             the user name
@@ -55,17 +55,17 @@ published interface XDataSource: com::sun::star::uno::XInterface
             the password
         @returns
             the connection object
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XConnection getConnection([in]string user, [in]string password)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XConnection getConnection([in]string user, [in]string password) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets the maximum time in seconds that this data source will wait
         while attempting to connect to a database.
-
-
+        
+        
         <p>
         A value of zero specifies that the timeout is the default system
         timeout if there is one; otherwise, it specifies that there is no timeout.
@@ -73,17 +73,17 @@ published interface XDataSource: com::sun::star::uno::XInterface
         </p>
         @param seconds
             the login time limit in seconds
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setLoginTimeout([in]long seconds)
-         raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setLoginTimeout([in]long seconds) 
+         raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the maximum time in seconds that this data source can wait
         while attempting to connect to a database.
-
-
+        
+        
         <p>
         A value of zero means that the timeout is the default system timeout
         if there is one; otherwise, it means that there is no timeout. When a
@@ -91,16 +91,16 @@ published interface XDataSource: com::sun::star::uno::XInterface
         </p>
         @returns
             the login time limit in seconds
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getLoginTimeout() raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    long getLoginTimeout() raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
index 085b2ed966e4..86d297442a29 100644
--- a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
+++ b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XDatabaseMetaData_idl__
-#define __com_sun_star_sdbc_XDatabaseMetaData_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XResultSet;
- published interface XConnection;
-
+#ifndef __com_sun_star_sdbc_XDatabaseMetaData_idl__ 
+#define __com_sun_star_sdbc_XDatabaseMetaData_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XResultSet; 
+ published interface XConnection; 
+ 
 /** provides comprehensive information about the database as a whole.
-
-
+    
+    
     <p>Many of the methods here return lists of information in
-    the form of
+    the form of 
     <type scope="com::sun::star::sdbc">XResultSet</type>
     objects.
     You can use the normal <type scope="com::sun::star::sdbc">XResultSet</type>
-    methods such as
+    methods such as 
     <member scope="com::sun::star::sdbc">XResultSet::getString()</member>
     and
     <member scope="com::sun::star::sdbc">XResultSet::getInt()</member>
     to retrieve the data from these XResultSets. If a given form of
-    metadata is not available, these methods should throw a
+    metadata is not available, these methods should throw a 
     <type scope="com::sun::star::sdbc">SQLException</type>
     .
     That a value of <type scope="com::sun::star::sdbc">XResultSet</type> is <NULL/>
@@ -69,7 +69,7 @@
     that argument's criteria will be dropped from the search.
     </p>
     <p>
-    A
+    A 
     <type scope="com::sun::star::sdbc">SQLException</type>
     will be thrown if a driver does not support
     a meta data method. In the case of methods that return an XResultSet,
@@ -77,282 +77,282 @@
     SQLException is thrown.</p>
  */
 published interface XDatabaseMetaData: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** Can all the procedures returned by getProcedures be called by the
         current user?
 
-        @return
-        <TRUE/>
+        @return 
+        <TRUE/> 
         if the user is allowed to call all procedures returned by getProcedures
         otherwise
         <FALSE/>
         .
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean allProceduresAreCallable() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean allProceduresAreCallable() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can all the tables returned by getTable be SELECTed by the
         current user?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean allTablesAreSelectable() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean allTablesAreSelectable() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** returns the URL for the database connection
      */
-    string getURL() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getURL() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** returns the user name from this database connection.
      */
-    string getUserName() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getUserName() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** checks if the database in read-only mode.
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean isReadOnly() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean isReadOnly() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Are NULL values sorted high?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
     */
-    boolean nullsAreSortedHigh() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean nullsAreSortedHigh() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Are NULL values sorted low?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
     */
-    boolean nullsAreSortedLow() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean nullsAreSortedLow() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Are NULL values sorted at the start regardless of sort order?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean nullsAreSortedAtStart() raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /**  Are NULL values sorted at the end, regardless of sort order?
+    boolean nullsAreSortedAtStart() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /**	 Are NULL values sorted at the end, regardless of sort order?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean nullsAreSortedAtEnd() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean nullsAreSortedAtEnd() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** returns the name of the database product.
      */
-    string getDatabaseProductName() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getDatabaseProductName() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** returns the version of the database product.
      */
-    string getDatabaseProductVersion() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getDatabaseProductVersion() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** returns the name of the SDBC driver.
      */
-    string getDriverName() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getDriverName() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** returns the version number of the SDBC driver.
      */
-    string getDriverVersion() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getDriverVersion() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** returns the SDBC driver major version number.
      */
-    long getDriverMajorVersion();
-    //-------------------------------------------------------------------------
-
+    long getDriverMajorVersion(); 
+    //------------------------------------------------------------------------- 
+     
     /** returns the SDBC driver minor version number.
      */
-    long getDriverMinorVersion();
-    //-------------------------------------------------------------------------
-
+    long getDriverMinorVersion(); 
+    //------------------------------------------------------------------------- 
+     
     /** use the database local files to save the tables.
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean usesLocalFiles() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean usesLocalFiles() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** use the database one local file to save for each table.
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean usesLocalFilePerTable() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean usesLocalFilePerTable() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** use the database 'mixed case unquoted SQL identifiers' case sensitive.
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsMixedCaseIdentifiers() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsMixedCaseIdentifiers() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Does the database treat mixed case unquoted SQL identifiers as
         case insensitive and store them in upper case?
             @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean storesUpperCaseIdentifiers() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean storesUpperCaseIdentifiers() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Does the database treat mixed case unquoted SQL identifiers as
         case insensitive and store them in lower case?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean storesLowerCaseIdentifiers() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean storesLowerCaseIdentifiers() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Does the database treat mixed case unquoted SQL identifiers as
         case insensitive and store them in mixed case?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean storesMixedCaseIdentifiers() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean storesMixedCaseIdentifiers() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Does the database treat mixed case quoted SQL identifiers as
         case sensitive and as a result store them in mixed case?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsMixedCaseQuotedIdentifiers() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsMixedCaseQuotedIdentifiers() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Does the database treat mixed case quoted SQL identifiers as
         case insensitive and store them in upper case?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean storesUpperCaseQuotedIdentifiers() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean storesUpperCaseQuotedIdentifiers() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Does the database treat mixed case quoted SQL identifiers as
         case insensitive and store them in lower case?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean storesLowerCaseQuotedIdentifiers() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean storesLowerCaseQuotedIdentifiers() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Does the database treat mixed case quoted SQL identifiers as
         case insensitive and store them in mixed case?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean storesMixedCaseQuotedIdentifiers() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean storesMixedCaseQuotedIdentifiers() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** What's the string used to quote SQL identifiers?
         This returns a space " " if identifier quoting is not supported.
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getIdentifierQuoteString() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getIdentifierQuoteString() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a comma-separated list of all a database's SQL keywords
         that are NOT also SQL92 keywords.
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getSQLKeywords() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getSQLKeywords() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a comma-separated list of math functions. These are the
         X/Open CLI math function names used in the SDBC function escape
         clause.
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getNumericFunctions() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getNumericFunctions() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a comma-separated list of string functions. These are the
         X/Open CLI string function names used in the SDBC function escape
         clause.
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getStringFunctions() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getStringFunctions() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a comma-separated list of system functions. These are the
         X/Open CLI system function names used in the SDBC function escape
         clause.
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getSystemFunctions() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getSystemFunctions() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a comma-separated list of time and date functions.
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getTimeDateFunctions() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getTimeDateFunctions() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the string that can be used to escape wildcard characters.
         This is the string that can be used to escape '_' or '%' in
         the string pattern style catalog search parameters.
-
-
+        
+        
         <p>
         The '_' character represents any single character.
         </p>
@@ -362,766 +362,766 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         </p>
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getSearchStringEscape() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getSearchStringEscape() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets all the "extra" characters that can be used in unquoted
         identifier names (those beyond a-z, A-Z, 0-9 and _).
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getExtraNameCharacters() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getExtraNameCharacters() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** support the Database "ALTER TABLE" with add column?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsAlterTableWithAddColumn() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsAlterTableWithAddColumn() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** support the Database  "ALTER TABLE" with drop column?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsAlterTableWithDropColumn() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsAlterTableWithDropColumn() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** support the Database column aliasing?
-
-
+        
+        
         <p>
         The SQL AS clause can be used to provide names for
         computed columns or to provide alias names for columns as required.
         </p>
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsColumnAliasing() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsColumnAliasing() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** are concatenations between NULL and non-NULL values NULL?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean nullPlusNonNullIsNull() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean nullPlusNonNullIsNull() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** <TRUE/>
             , if the Database supports the CONVERT function between SQL types,
-            otherwise
+            otherwise 
             <FALSE/>
             .
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsTypeConversion() raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /**     <TRUE/>
+    boolean supportsTypeConversion() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** 	<TRUE/>
             , if the Database supports the CONVERT between the given SQL types
-            otherwise
+            otherwise 
             <FALSE/>
             .
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsConvert([in]long fromType, [in]long toType)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsConvert([in]long fromType, [in]long toType) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Are table correlation names supported?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsTableCorrelationNames() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsTableCorrelationNames() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** If table correlation names are supported, are they restricted
         to be different from the names of the tables?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsDifferentTableCorrelationNames()
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsDifferentTableCorrelationNames() 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Are expressions in "ORDER BY" lists supported?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsExpressionsInOrderBy() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsExpressionsInOrderBy() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can an "ORDER BY" clause use columns not in the SELECT statement?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsOrderByUnrelated() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsOrderByUnrelated() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Is some form of "GROUP BY" clause supported?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsGroupBy() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsGroupBy() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can a "GROUP BY" clause use columns not in the SELECT?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsGroupByUnrelated() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsGroupByUnrelated() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can a "GROUP BY" clause add columns not in the SELECT
         provided it specifies all the columns in the SELECT?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsGroupByBeyondSelect() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsGroupByBeyondSelect() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Is the escape character in "LIKE" clauses supported?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsLikeEscapeClause() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsLikeEscapeClause() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Are multiple XResultSets from a single execute supported?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsMultipleResultSets() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsMultipleResultSets() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can we have multiple transactions open at once (on different
         connections)?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsMultipleTransactions() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsMultipleTransactions() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can columns be defined as non-nullable?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsNonNullableColumns() raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /**     <TRUE/>, if the database supports ODBC Minimum SQL grammar,
+    boolean supportsNonNullableColumns() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** 	<TRUE/>, if the database supports ODBC Minimum SQL grammar,
             otherwise <FALSE/>.
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsMinimumSQLGrammar() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsMinimumSQLGrammar() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** <TRUE/>, if the database supports ODBC Core SQL grammar,
             otherwise <FALSE/>.
             @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsCoreSQLGrammar() raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /**
+    boolean supportsCoreSQLGrammar() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** 
             <TRUE/>, if the database supports ODBC Extended SQL grammar,
             otherwise <FALSE/>.
             @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsExtendedSQLGrammar() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsExtendedSQLGrammar() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** @returns
             <TRUE/>, if the database supports ANSI92 entry level SQL grammar,
             otherwise <FALSE/>.
-            @throws SQLException
+            @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsANSI92EntryLevelSQL() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsANSI92EntryLevelSQL() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** @returns
             <TRUE/>, if the database supports ANSI92 intermediate SQL grammar,
             otherwise <FALSE/>.
-            @throws SQLException
+            @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsANSI92IntermediateSQL() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsANSI92IntermediateSQL() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** @returns
             <TRUE/>, if the database supports ANSI92 full SQL grammar,
             otherwise <FALSE/>.
-            @throws SQLException
+            @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsANSI92FullSQL() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsANSI92FullSQL() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** returns
             <TRUE/>, if the Database supports SQL Integrity Enhancement Facility,
             otherwise <FALSE/>.
-            @throws SQLException
+            @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsIntegrityEnhancementFacility() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsIntegrityEnhancementFacility() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** @returns
             <TRUE/>, if some form of outer join is supported,
             otherwise <FALSE/>.
-            @throws SQLException
+            @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsOuterJoins() raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    boolean supportsOuterJoins() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             <TRUE/>, if full nested outer joins are supported,
             otherwise <FALSE/>.
-            @throws SQLException
+            @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsFullOuterJoins() raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    boolean supportsFullOuterJoins() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             <TRUE/>, if there is limited support for outer joins.
             (This will be <TRUE/> if supportFullOuterJoins is <TRUE/>.)
             <FALSE/> is returned otherwise.
-            @throws SQLException
+            @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsLimitedOuterJoins() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsLimitedOuterJoins() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the database vendor's preferred term for "schema"
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getSchemaTerm() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getSchemaTerm() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the database vendor's preferred term for "procedure"
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getProcedureTerm() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getProcedureTerm() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the database vendor's preferred term for "catalog"
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getCatalogTerm() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getCatalogTerm() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Does a catalog appear at the start of a qualified table name?
         (Otherwise it appears at the end)
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean isCatalogAtStart() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean isCatalogAtStart() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the separator between catalog and table name
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getCatalogSeparator() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getCatalogSeparator() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can a schema name be used in a data manipulation statement?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsSchemasInDataManipulation() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsSchemasInDataManipulation() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can a schema name be used in a procedure call statement?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsSchemasInProcedureCalls() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsSchemasInProcedureCalls() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can a schema name be used in a table definition statement?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsSchemasInTableDefinitions() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsSchemasInTableDefinitions() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can a schema name be used in an index definition statement?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsSchemasInIndexDefinitions() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsSchemasInIndexDefinitions() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can a schema name be used in a privilege definition statement?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsSchemasInPrivilegeDefinitions()
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsSchemasInPrivilegeDefinitions() 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can a catalog name be used in a data manipulation statement?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsCatalogsInDataManipulation() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsCatalogsInDataManipulation() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can a catalog name be used in a procedure call statement?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsCatalogsInProcedureCalls() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsCatalogsInProcedureCalls() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can a catalog name be used in a table definition statement?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsCatalogsInTableDefinitions() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsCatalogsInTableDefinitions() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can a catalog name be used in an index definition statement?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsCatalogsInIndexDefinitions() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsCatalogsInIndexDefinitions() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can a catalog name be used in a privilege definition statement?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsCatalogsInPrivilegeDefinitions()
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsCatalogsInPrivilegeDefinitions() 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Is positioned DELETE supported?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsPositionedDelete() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsPositionedDelete() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Is positioned UPDATE supported?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsPositionedUpdate() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsPositionedUpdate() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Is SELECT for UPDATE supported?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsSelectForUpdate() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsSelectForUpdate() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Are stored procedure calls using the stored procedure escape
         syntax supported?
             @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsStoredProcedures() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsStoredProcedures() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Are subqueries in comparison expressions supported?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsSubqueriesInComparisons() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsSubqueriesInComparisons() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Are subqueries in 'exists' expressions supported?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsSubqueriesInExists() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsSubqueriesInExists() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Are subqueries in 'in' statements supported?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsSubqueriesInIns() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsSubqueriesInIns() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Are subqueries in quantified expressions supported?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsSubqueriesInQuantifieds() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsSubqueriesInQuantifieds() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Are correlated subqueries supported?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsCorrelatedSubqueries() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsCorrelatedSubqueries() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Is SQL UNION supported?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsUnion() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsUnion() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Is SQL UNION ALL supported?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsUnionAll() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsUnionAll() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can cursors remain open across commits?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsOpenCursorsAcrossCommit() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsOpenCursorsAcrossCommit() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can cursors remain open across rollbacks?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsOpenCursorsAcrossRollback() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsOpenCursorsAcrossRollback() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can statements remain open across commits?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsOpenStatementsAcrossCommit() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsOpenStatementsAcrossCommit() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Can statements remain open across rollbacks?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsOpenStatementsAcrossRollback()
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsOpenStatementsAcrossRollback() 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the maximal number of hex characters in an inline binary literal
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxBinaryLiteralLength() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxBinaryLiteralLength() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the max length for a character literal
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxCharLiteralLength() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxCharLiteralLength() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the limit on column name length
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxColumnNameLength() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxColumnNameLength() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the maximum number of columns in a "GROUP BY" clause
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxColumnsInGroupBy() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxColumnsInGroupBy() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the maximum number of columns allowed in an index
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxColumnsInIndex() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxColumnsInIndex() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the maximum number of columns in an "ORDER BY" clause
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxColumnsInOrderBy() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxColumnsInOrderBy() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the maximum number of columns in a "SELECT" list
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxColumnsInSelect() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxColumnsInSelect() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the maximum number of columns in a table
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxColumnsInTable() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxColumnsInTable() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the number of active connections at a time to this database.
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxConnections() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxConnections() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the maximum cursor name length
     @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxCursorNameLength() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxCursorNameLength() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the maximum length of an index (in bytes)
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxIndexLength() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxIndexLength() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the maximum length allowed for a schema name
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxSchemaNameLength() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxSchemaNameLength() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the maximum length of a procedure name
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxProcedureNameLength() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxProcedureNameLength() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the maximum length of a catalog name
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxCatalogNameLength() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxCatalogNameLength() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the maximum length of a single row.
     @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxRowSize() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxRowSize() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Did getMaxRowSize() include LONGVARCHAR and LONGVARBINARY
         blobs?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean doesMaxRowSizeIncludeBlobs() raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /** return the maximum length of a SQL statement
+    boolean doesMaxRowSizeIncludeBlobs() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** return the maximum length of a SQL statement	
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxStatementLength() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxStatementLength() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the maximal number of open active statements at one time to this database
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxStatements() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxStatements() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the maximum length of a table name
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxTableNameLength() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxTableNameLength() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the maximum number of tables in a SELECT statement
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxTablesInSelect() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxTablesInSelect() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the maximum length of a user name
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getMaxUserNameLength() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getMaxUserNameLength() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** return the database default transaction isolation level.
-        The values are defined in
+        The values are defined in 
         <type scope="com::sun::star::sdbc">TransactionIsolation</type>.
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
         @see com::sun::star::sdbc::XConnection
      */
-    long getDefaultTransactionIsolation() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getDefaultTransactionIsolation() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** support the Database transactions?
         If not, invoking the method
         <member scope="com::sun::star::sdbc">XConnection::commit()</member>
@@ -1129,77 +1129,77 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         isolation level is TransactionIsolation_NONE.
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsTransactions() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsTransactions() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Does this database support the given transaction isolation level?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
  @see com::sun::star::sdbc::Connection
      */
-    boolean supportsTransactionIsolationLevel([in]long level)
-                            raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsTransactionIsolationLevel([in]long level) 
+                            raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** support the Database both data definition and data manipulation statements
         within a transaction?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
-<!-- JRH: Unclear on the intent of these many support questions.
+<!-- JRH: Unclear on the intent of these many support questions. 
         If asking, it should state, "Does the Database support both ....?
         If declaring, it should state something like the following:
 
-        metadata:   supportsDataDefinitionAndDataManipulationTransactions
+        metadata: 	supportsDataDefinitionAndDataManipulationTransactions 
 
     "provides support for both data definition and data manipulation statements within a transaction."
- -->     */
-    boolean supportsDataDefinitionAndDataManipulationTransactions()
-                             raises (SQLException);
-    //-------------------------------------------------------------------------
-
+ -->	 */
+    boolean supportsDataDefinitionAndDataManipulationTransactions() 
+                             raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** are only data manipulation statements within a transaction
         supported?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsDataManipulationTransactionsOnly()
-                            raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsDataManipulationTransactionsOnly() 
+                            raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** does a data definition statement within a transaction force the
         transaction to commit?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean dataDefinitionCausesTransactionCommit()
-                            raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean dataDefinitionCausesTransactionCommit() 
+                            raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** is a data definition statement within a transaction ignored?
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean dataDefinitionIgnoredInTransactions()
-                            raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean dataDefinitionIgnoredInTransactions() 
+                            raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Gets a description of the stored procedures available in a
         catalog.
-
-
+        
+        
         <p>
         Only procedure descriptions matching the schema and
         procedure name criteria are returned. They are ordered by
@@ -1247,17 +1247,17 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
             a procedure name pattern
         @returns
             each row is a procedure description
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getProcedures([in]any catalog, [in]string schemaPattern,
-                    [in]string procedureNamePattern) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getProcedures([in]any catalog, [in]string schemaPattern, 
+                    [in]string procedureNamePattern) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a description of a catalog's stored procedure parameters
         and result columns.
-
-
+        
+        
         <p>
         Only descriptions matching the schema, procedure and
         parameter name criteria are returned. They are ordered by
@@ -1347,18 +1347,18 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
             a column name pattern
         @returns
             each row describes a stored procedure parameter or column
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getProcedureColumns([in]any catalog, [in]string schemaPattern,
-                                   [in]string procedureNamePattern,
-                                   [in]string columnNamePattern)
-                        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getProcedureColumns([in]any catalog, [in]string schemaPattern, 
+                                   [in]string procedureNamePattern, 
+                                   [in]string columnNamePattern) 
+                        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a description of tables available in a catalog.
-
-
+        
+        
         <p>Only table descriptions matching the catalog, schema, table
         name, and type criteria are returned. They are ordered by
         TABLE_TYPE, TABLE_SCHEM, and TABLE_NAME.
@@ -1377,7 +1377,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         </li>
         <li>
         <b>TABLE_TYPE</b> string => table type. Typical types are "TABLE",
-        "VIEW", "SYSTEM TABLE", "GLOBAL TEMPORARY",
+        "VIEW",	"SYSTEM TABLE", "GLOBAL TEMPORARY",
         "LOCAL TEMPORARY", "ALIAS", "SYNONYM".
         </li>
         <li>
@@ -1398,18 +1398,18 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
             a list of table types to include
         @returns
             each row is a table description
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getTables([in]any catalog, [in]string schemaPattern,
-        [in]string tableNamePattern, [in]sequence<string> types)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getTables([in]any catalog, [in]string schemaPattern, 
+        [in]string tableNamePattern, [in]sequence<string> types) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Gets the schema names available in this database. The results
         are ordered by schema name.
-
-
+        
+        
         <p>The schema column is:
         </p>
         <ol>
@@ -1419,16 +1419,16 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         </ol>
         @returns
             each row has a single String column that is a schema name
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getSchemas() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getSchemas() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the catalog names available in this database. The results
         are ordered by catalog name.
-
-
+        
+        
         <p>The catalog column is:
         </p>
         <ol>
@@ -1438,37 +1438,37 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         </ol>
         @returns
             each row has a single String column that is a catalog name
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getCatalogs() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getCatalogs() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the table types available in this database. The results
         are ordered by table type.
-
-
+        
+        
         <p>The table type is:
         </p>
         <ol>
         <li>
         <b>TABLE_TYPE</b> string => table type. Typical types are "TABLE",
-        "VIEW", "SYSTEM TABLE", "GLOBAL TEMPORARY",
+        "VIEW",	"SYSTEM TABLE", "GLOBAL TEMPORARY",
         "LOCAL TEMPORARY", "ALIAS", "SYNONYM".
         </li>
         </ol>
         @returns
             each row has a single String column that is a table type
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getTableTypes() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getTableTypes() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a description of table columns available in
         the specified catalog.
-
-
+        
+        
         <p>Only column descriptions matching the catalog, schema, table
         and column name criteria are returned. They are ordered by
         TABLE_SCHEM, TABLE_NAME, and ORDINAL_POSITION.
@@ -1537,7 +1537,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         maximum number of bytes in the column
         </li>
         <li>
-        <b>ORDINAL_POSITION</b> int => index of column in table
+        <b>ORDINAL_POSITION</b> int	=> index of column in table
         (starting at 1)
         </li>
         <li>
@@ -1556,17 +1556,17 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
             a column name pattern
         @returns
             each row is a column description
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getColumns([in]any catalog, [in]string schemaPattern,
-        [in]string tableNamePattern, [in]string columnNamePattern)
-                    raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getColumns([in]any catalog, [in]string schemaPattern, 
+        [in]string tableNamePattern, [in]string columnNamePattern) 
+                    raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a description of the access rights for a table's columns.
-
-
+        
+        
         <p>
         Only privileges matching the column name criteria are
         returned. They are ordered by COLUMN_NAME and PRIVILEGE.
@@ -1606,25 +1606,25 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         @param schema
             a schema name ; "" retrieves those without a schema
         @param table
-            a table name
+            a table name 
         @param columnNamePattern
             a column name pattern
         @returns
             each row is a column privilege description
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getColumnPrivileges([in]any catalog, [in]string schema,
-        [in]string table, [in]string columnNamePattern) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getColumnPrivileges([in]any catalog, [in]string schema, 
+        [in]string table, [in]string columnNamePattern) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a description of the access rights for each table available
         in a catalog. Note that a table privilege applies to one or
         more columns in the table. It would be wrong to assume that
         this priviledge applies to all columns (this may be <TRUE/> for
         some systems but is not <TRUE/> for all.)
-
-
+        
+        
         <p>Only privileges matching the schema and table name
         criteria are returned. They are ordered by TABLE_SCHEM,
         TABLE_NAME, and PRIVILEGE.
@@ -1664,17 +1664,17 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
             a table name pattern
         @returns
             each row is a table privilege description
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getTablePrivileges([in]any catalog, [in]string schemaPattern,
-                [in]string tableNamePattern) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getTablePrivileges([in]any catalog, [in]string schemaPattern, 
+                [in]string tableNamePattern) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a description of a table's optimal set of columns that
         uniquely identifies a row. They are ordered by SCOPE.
-
-
+        
+        
         <p>Each column description has the following columns:
         </p>
         <ol>
@@ -1706,7 +1706,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         <b>BUFFER_LENGTH</b> long => not used
         </li>
         <li>
-        <b>DECIMAL_DIGITS</b> short  => scale
+        <b>DECIMAL_DIGITS</b> short	 => scale
         </li>
         <li>
         <b>PSEUDO_COLUMN</b> short => is this a pseudo column
@@ -1726,26 +1726,26 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         @param schema
             a schema name; "" retrieves those without a schema
         @param table
-            a table name
+            a table name 
         @param scope
             the scope of interest; use same values as SCOPE
         @param nullable
             include columns that are nullable?
         @returns
             each row is a column description
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getBestRowIdentifier([in]any catalog, [in]string schema,
-        [in]string table, [in]long scope, [in] boolean nullable)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getBestRowIdentifier([in]any catalog, [in]string schema, 
+        [in]string table, [in]long scope, [in] boolean nullable) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a description of a table's columns that are automatically
         updated when any value in a row is updated. They are
         unordered.
-
-
+        
+        
         <p>Each column description has the following columns:
         </p>
         <ol>
@@ -1768,7 +1768,7 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         <b>BUFFER_LENGTH</b> long => length of column value in bytes
         </li>
         <li>
-        <b>DECIMAL_DIGITS</b> short  => scale
+        <b>DECIMAL_DIGITS</b> short	 => scale
         </li>
         <li>
         <b>PSEUDO_COLUMN</b> short => is this a pseudo column
@@ -1788,20 +1788,20 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         @param schema
             a schema name; "" retrieves those without a schema
         @param table
-            a table name
+            a table name 
         @returns
             each row is a column description
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getVersionColumns([in]any catalog, [in]string schema,
-                [in]string table) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getVersionColumns([in]any catalog, [in]string schema, 
+                [in]string table) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a description of a table's primary key columns. They
         are ordered by COLUMN_NAME.
-
-
+        
+        
         <p>Each primary key column description has the following columns:
         </p>
         <ol>
@@ -1829,22 +1829,22 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         @param schema
             a schema name; "" retrieves those without a schema
         @param table
-            a table name
+            a table name 
         @returns
             each row is a primary key column description
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getPrimaryKeys([in]any catalog, [in]string schema,
-                [in]string table) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getPrimaryKeys([in]any catalog, [in]string schema, 
+                [in]string table) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a description of the primary key columns that are
         referenced by a table's foreign key columns (the primary keys
         imported by a table). They are ordered by PKTABLE_CAT,
         PKTABLE_SCHEM, PKTABLE_NAME, and KEY_SEQ.
-
-
+        
+        
         <p>Each primary key column description has the following columns:
         </p>
         <ol>
@@ -1944,22 +1944,22 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         @param schema
             a schema name; "" retrieves those without a schema
         @param table
-            a table name
+            a table name 
         @returns
             each row is a primary key column description
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getImportedKeys([in]any catalog, [in]string schema,
-                [in]string table) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getImportedKeys([in]any catalog, [in]string schema, 
+                [in]string table) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a description of the foreign key columns that reference a
         table's primary key columns (the foreign keys exported by a
         table). They are ordered by FKTABLE_CAT, FKTABLE_SCHEM,
         FKTABLE_NAME, and KEY_SEQ.
-
-
+        
+        
         <p>Each foreign key column description has the following columns:
         </p>
         <ol>
@@ -2059,16 +2059,16 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         @param schema
             a schema name; "" retrieves those without a schema
         @param table
-            a table name
+            a table name 
         @returns
             each row is a foreign key column description
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getExportedKeys([in]any catalog, [in]string schema,
-                [in]string table) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getExportedKeys([in]any catalog, [in]string schema, 
+                [in]string table) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a description of the foreign key columns in the foreign key
         table that reference the primary key columns of the primary key
         table (describe how one table imports another's key.) This
@@ -2076,8 +2076,8 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         (most tables only import a foreign key from a table once.). They
         are ordered by FKTABLE_CAT, FKTABLE_SCHEM, FKTABLE_NAME, and
         KEY_SEQ.
-
-
+        
+        
         <p>Each foreign key column description has the following columns:
         </p>
         <ol>
@@ -2186,22 +2186,22 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
             the table name that imports the key
         @returns
             each row is a foreign key column description
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getCrossReference(
-        [in]any primaryCatalog, [in]string primarySchema,
-        [in]string primaryTable,
-        [in]any foreignCatalog, [in]string foreignSchema,
-        [in]string foreignTable) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getCrossReference( 
+        [in]any primaryCatalog, [in]string primarySchema, 
+        [in]string primaryTable, 
+        [in]any foreignCatalog, [in]string foreignSchema, 
+        [in]string foreignTable) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a description of all the standard SQL types supported by
         this database. They are ordered by DATA_TYPE and then by how
         closely the data type maps to the corresponding SDBC SQL type.
-
-
-
+        
+        
+        
         <p>Each type description has the following columns:
         </p>
         <ol>
@@ -2285,16 +2285,16 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
         </ol>
         @returns
             each row is a SQL type description
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getTypeInfo() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getTypeInfo() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a description of a table's indices and statistics. They are
         ordered by NON_UNIQUE, TYPE, INDEX_NAME, and ORDINAL_POSITION.
-
-
+        
+        
         <p>Each index column description has the following columns:
         </p>
         <ol>
@@ -2373,174 +2373,174 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
             when <TRUE/>, result is allowed to reflect approximate or out of data values; when <FALSE/>, results are requested to be accurate
         @returns
             each row is an index column description
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getIndexInfo([in]any catalog, [in]string schema, [in]string table,
-            [in]boolean unique, [in]boolean approximate)
-                    raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getIndexInfo([in]any catalog, [in]string schema, [in]string table, 
+            [in]boolean unique, [in]boolean approximate) 
+                    raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Does the database support the given result set type?
         @param setType
-            defined in
+            defined in 
             <type scop="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsResultSetType([in]long setType) raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /** Does the database support the concurrency type in combination
+    boolean supportsResultSetType([in]long setType) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** Does the database support the concurrency type in combination 
         with the given result set type?
         @param setType
-            defined in
+            defined in 
             <type scop="com::sun::star::sdbc">ResultSetType</type>
         @param concurrency
-            defined in
+            defined in 
             <type scop="com::sun::star::sdbc">ResultSetConcurrency</type>
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsResultSetConcurrency([in]long setType,
-                                                  [in]long concurrency)
-      raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsResultSetConcurrency([in]long setType, 
+                                                  [in]long concurrency) 
+      raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether a result set's own updates are visible.
         @param setType
-            defined in
+            defined in 
             <type scop="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean ownUpdatesAreVisible([in]long setType) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean ownUpdatesAreVisible([in]long setType) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether a result set's own deletes are visible.
         @param setType
-            defined in
+            defined in 
             <type scop="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean ownDeletesAreVisible([in]long setType) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean ownDeletesAreVisible([in]long setType) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether a result set's own inserts are visible.
         @param setType
-            defined in
+            defined in 
             <type scop="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean ownInsertsAreVisible([in]long setType) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean ownInsertsAreVisible([in]long setType) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether updates made by others are visible.
         @param setType
-            defined in
+            defined in 
             <type scop="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean othersUpdatesAreVisible([in]long setType) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean othersUpdatesAreVisible([in]long setType) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether deletes made by others are visible.
         @param setType
-            defined in
+            defined in 
             <type scop="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean othersDeletesAreVisible([in]long setType) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean othersDeletesAreVisible([in]long setType) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether inserts made by others are visible.
         @param setType
-            defined in
+            defined in 
             <type scop="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean othersInsertsAreVisible([in]long setType) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean othersInsertsAreVisible([in]long setType) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether or not a visible row update can be detected by
-        calling the method
+        calling the method 
         <code>XResultSet.rowUpdated</code>.
         @param setType
-            defined in
+            defined in 
             <type scop="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean updatesAreDetected([in]long setType) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean updatesAreDetected([in]long setType) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether or not a visible row delete can be detected by
-        calling
+        calling 
         <member scope="com::sun::star::sdbc">XResultSet::rowDeleted()</member>
         . If deletesAreDetected()
         returns <FALSE/>, then deleted rows are removed from the result set.
         @param setType
-            defined in
+            defined in 
             <type scop="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean deletesAreDetected([in]long setType) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean deletesAreDetected([in]long setType) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether or not a visible row insert can be detected
-        by calling
+        by calling 
         <member scope="com::sun::star::sdbc">XResultSet::rowInserted().</member>
         @param setType
-            defined in
+            defined in 
             <type scop="com::sun::star::sdbc">ResultSetType</type>
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean insertsAreDetected([in]long setType) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean insertsAreDetected([in]long setType) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether the driver supports batch updates.
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean supportsBatchUpdates() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean supportsBatchUpdates() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** Gets a description of the user-defined types defined in a particular
         schema. Schema-specific UDTs may have type OBJECT, STRUCT,
         or DISTINCT.
-
-
+        
+        
         <p>Only types matching the catalog, schema, type name, and type
         criteria are returned. They are ordered by DATA_TYPE, TYPE_SCHEM,
         and TYPE_NAME. The type name parameter may be a fully-qualified
@@ -2584,27 +2584,27 @@ published interface XDatabaseMetaData: com::sun::star::uno::XInterface
             a list of user-named types to include (OBJECT, STRUCT, or DISTINCT)
         @returns
             each row is a type description
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getUDTs([in]any catalog, [in]string schemaPattern,
-              [in]string typeNamePattern, [in]sequence<long> types)
-      raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getUDTs([in]any catalog, [in]string schemaPattern, 
+              [in]string typeNamePattern, [in]sequence<long> types) 
+      raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** retrieves the connection that produced this metadata object.
         @returns
             the Connection object
-        @throws SQLException
-            if a database access error occurs.
-     */
-    XConnection getConnection() raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+        @throws SQLException 
+            if a database access error occurs.
+     */
+    XConnection getConnection() raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XDatabaseMetaData2.idl b/offapi/com/sun/star/sdbc/XDatabaseMetaData2.idl
index f6a5040d8415..487c2723b8de 100644
--- a/offapi/com/sun/star/sdbc/XDatabaseMetaData2.idl
+++ b/offapi/com/sun/star/sdbc/XDatabaseMetaData2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,16 +28,16 @@
 #ifndef __com_sun_star_sdbc_XDatabaseMetaData2_idl__
 #define __com_sun_star_sdbc_XDatabaseMetaData2_idl__
 
-#ifndef __com_sun_star_sdbc_XDatabaseMetaData_idl__
+#ifndef __com_sun_star_sdbc_XDatabaseMetaData_idl__ 
 #include <com/sun/star/sdbc/XDatabaseMetaData.idl>
 #endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
 #include <com/sun/star/beans/PropertyValue.idl>
 #endif
 
 //=============================================================================
 
-module com { module sun { module star { module sdbc {
+module com { module sun { module star { module sdbc { 
 
 //=============================================================================
 
@@ -58,7 +58,7 @@ interface XDatabaseMetaData2 : XDatabaseMetaData
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdbc/XDriver.idl b/offapi/com/sun/star/sdbc/XDriver.idl
index 623c232ceb2b..30764eb8b8f9 100644
--- a/offapi/com/sun/star/sdbc/XDriver.idl
+++ b/offapi/com/sun/star/sdbc/XDriver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,74 +24,74 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XDriver_idl__
-#define __com_sun_star_sdbc_XDriver_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_DriverPropertyInfo_idl__
-#include <com/sun/star/sdbc/DriverPropertyInfo.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XConnection;
- published interface XDriverManager;
-
-
+#ifndef __com_sun_star_sdbc_XDriver_idl__ 
+#define __com_sun_star_sdbc_XDriver_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_DriverPropertyInfo_idl__ 
+#include <com/sun/star/sdbc/DriverPropertyInfo.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XConnection; 
+ published interface XDriverManager; 
+ 
+ 
 /** is the interface that every driver class must implement.
-
-
-
+    
+    
+    
     <p>
     Each driver should supply a service that implements
     the Driver interface.
-
+    
     </p>
     <p>The DriverManager will try to load as many drivers as it can
     find, and then for any given connection request, it will ask each
     driver in turn to try to connect to the target URL.
-
+    
     </p>
     <p>
     It is strongly recommended that each Driver object should be
     small and standalone so that the Driver object can be loaded and
     queried without bringing in vast quantities of supporting code.
-
+    
     </p>
-    @see com::sun::star::sdbc::XDriverManager
+    @see com::sun::star::sdbc::XDriverManager 
      @see com::sun::star::sdbc::XConnection
  */
 published interface XDriver: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** attempts to make a database connection to the given URL.
-        The driver should return
+        The driver should return 
         <NULL/>
         if it realizes it is the wrong kind
         of driver to connect to the given URL.  This will be common, as when
         the driver manager is asked to connect to a given URL it passes
         the URL to each loaded driver in turn.
-
-
-
+        
+        
+        
         <p>
-        The driver should raise a
+        The driver should raise a 
         <type scope="com::sun::star::sdbc">SQLException</type>
         if it is the right
         driver to connect to the given URL, but has trouble connecting to
         the database.
-
+        
         </p>
         <p>
         The info argument can be used to pass arbitrary
@@ -106,77 +106,77 @@ published interface XDriver: com::sun::star::uno::XInterface
         </p>
 
         @param url
-            is the URL of the database to which to connect.
+            is the URL of the database to which to connect. 
         @param info
             a list of arbitrary string tag/value pairs as connection arguments. Normally at least a "user" and "password" property should be included.
             @see com::sun::star::sdbc::ConnectionProperties
-        @returns
-            a Connection object that represents a connection to the URL
-        @throws SQLException
+        @returns 
+            a Connection object that represents a connection to the URL			
+        @throws	SQLException
             if a database access error occurs
 
      */
-    XConnection connect(
-                [in]string url,
-                [in]sequence<com::sun::star::beans::PropertyValue> info)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XConnection connect( 
+                [in]string url, 
+                [in]sequence<com::sun::star::beans::PropertyValue> info) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** returns <TRUE/> if the driver thinks that it can open a connection
         to the given URL.  Typically drivers will return <TRUE/> if they
         understand the subprotocol specified in the URL and <FALSE/> if
         they do not.
 
         @param url
-            is the URL of the database to which to connect.
-        @returns
+            is the URL of the database to which to connect. 
+        @returns 
             <TRUE/> if this driver can connect to the given URL.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean acceptsURL([in]string url) raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /** gets information about the possible properties for this driver.
-             <p>The getPropertyInfo method is intended to allow a generic GUI tool to
-             discover what properties it should prompt a human for in order to get
-             enough information to connect to a database.  Note that depending on
-             the values the human has supplied so far, additional values may become
-             necessary, so it may be necessary to iterate though several calls
-             to getPropertyInfo.
-             @param url
-                is the URL of the database to which to connect.
-             @param info
-                is a proposed list of tag/value pairs that will be sent on
-                connect open.
-             @returns
-                an array of DriverPropertyInfo objects describing possible
-                properties. This array may be an empty array if no properties
-                are required.
-             @throws SQLException
+    boolean acceptsURL([in]string url) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** gets information about the possible properties for this driver. 
+             <p>The getPropertyInfo method is intended to allow a generic GUI tool to 
+             discover what properties it should prompt a human for in order to get 
+             enough information to connect to a database.  Note that depending on 
+             the values the human has supplied so far, additional values may become 
+             necessary, so it may be necessary to iterate though several calls 
+             to getPropertyInfo. 
+             @param url 
+                is the URL of the database to which to connect. 
+             @param info 
+                is a proposed list of tag/value pairs that will be sent on 
+                connect open. 
+             @returns 
+                an array of DriverPropertyInfo objects describing possible 
+                properties. This array may be an empty array if no properties 
+                are required. 
+             @throws SQLException 
                 if a database access error occurs.
      */
-    sequence<DriverPropertyInfo> getPropertyInfo([in]string url,
-                    [in] sequence<com::sun::star::beans::PropertyValue> info)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    sequence<DriverPropertyInfo> getPropertyInfo([in]string url, 
+                    [in] sequence<com::sun::star::beans::PropertyValue> info) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the driver's major version number. Initially this should be 1.
         @returns
             this driver's major version number
      */
-    long getMajorVersion();
-    //-------------------------------------------------------------------------
-
+    long getMajorVersion(); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the driver's minor version number. Initially this should be 0.
         @returns
             this driver's minor version number.
      */
-    long getMinorVersion();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    long getMinorVersion(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XDriverAccess.idl b/offapi/com/sun/star/sdbc/XDriverAccess.idl
index 112921f04e15..04ddbb10dbb9 100644
--- a/offapi/com/sun/star/sdbc/XDriverAccess.idl
+++ b/offapi/com/sun/star/sdbc/XDriverAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XDriverAccess_idl__
-#define __com_sun_star_sdbc_XDriverAccess_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XDriver;
-
-
-
+#ifndef __com_sun_star_sdbc_XDriverAccess_idl__ 
+#define __com_sun_star_sdbc_XDriverAccess_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XDriver; 
+ 
+ 
+ 
 /** provides the access of sdbc driver components
-    @see com::sun::star::sdbc::XDriverManager
+    @see com::sun::star::sdbc::XDriverManager 
     @see com::sun::star::sdbc::XDriver
  */
 published interface XDriverAccess: com::sun::star::uno::XInterface
-{
-
-    /** get a driver which accepts a given url.@see com::sun::star::sdbc::XDriver::acceptsURL
+{ 
+     
+    /** get a driver which accepts a given url.@see	com::sun::star::sdbc::XDriver::acceptsURL
         @param url
             a database url of the form sdbc:subprotocol:subname
         @returns
             a Driver that can connect to the URL
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    XDriver     getDriverByURL([in]string url);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    XDriver		getDriverByURL([in]string url); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XDriverManager.idl b/offapi/com/sun/star/sdbc/XDriverManager.idl
index 896d8a59deea..63173c803128 100644
--- a/offapi/com/sun/star/sdbc/XDriverManager.idl
+++ b/offapi/com/sun/star/sdbc/XDriverManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XDriverManager_idl__
-#define __com_sun_star_sdbc_XDriverManager_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XConnection;
- published interface XDriver;
-
-
+#ifndef __com_sun_star_sdbc_XDriverManager_idl__ 
+#define __com_sun_star_sdbc_XDriverManager_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XConnection; 
+ published interface XDriver; 
+ 
+ 
 /** is the basic interface for managing a set of SDBC drivers.
-
-
-
+    
+    
+    
     <p>
-    When the method
+    When the method 
     <member scope="com::sun::star::sdbc">XDriverManager::getConnection()</member>
     is called,
     the DriverManager will attempt to
     locate a suitable driver.
-
+    
     </p>
-    @see com::sun::star::sdbc::XDriver
+    @see com::sun::star::sdbc::XDriver 
      @see com::sun::star::sdbc::XConnection
  */
 published interface XDriverManager: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** attempts to establish a connection to the given database URL.
         The DriverManager attempts to select an appropriate driver from
         the set of registered JDBC/SDBC drivers.
@@ -71,56 +71,56 @@ published interface XDriverManager: com::sun::star::uno::XInterface
             a database url of the form  sdbc:subprotocol:subname
         @returns
             the Connection object
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XConnection getConnection([in]string url)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XConnection getConnection([in]string url) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** attempts to establish a connection to the given database URL.
         The DriverManager attempts to select an appropriate driver from
         the set of registered JDBC/SDBC drivers.
         @param url
             a database url of the form  sdbc:subprotocol:subname
         @param info
-            a list of arbitrary string tag/value pairs as connection arguments;
+            a list of arbitrary string tag/value pairs as connection arguments; 
             normally at least a "user" and "password" property should be included
             @see com::sun::star::sdbc::ConnectionProperties
         @returns
             the Connection object
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XConnection getConnectionWithInfo([in]string url,
-            [in]sequence<com::sun::star::beans::PropertyValue> info)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XConnection getConnectionWithInfo([in]string url, 
+            [in]sequence<com::sun::star::beans::PropertyValue> info) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets the maximum time in seconds that a driver will wait
         while attempting to connect to a database.
         @param seconds
             the login time limit in seconds
 
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setLoginTimeout([in]long seconds);
-    //-------------------------------------------------------------------------
-
+    void setLoginTimeout([in]long seconds); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the maximum time in seconds that a driver can wait
         when attempting to login to a database.
-        @returns
+        @returns 
             the driver login time limit in seconds
 
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getLoginTimeout();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    long getLoginTimeout(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XGeneratedResultSet.idl b/offapi/com/sun/star/sdbc/XGeneratedResultSet.idl
index edc6e4ab7c81..d9382cb6b9c7 100644
--- a/offapi/com/sun/star/sdbc/XGeneratedResultSet.idl
+++ b/offapi/com/sun/star/sdbc/XGeneratedResultSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XGeneratedResultSet_idl__
-#define __com_sun_star_sdbc_XGeneratedResultSet_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XResultSet;
-
+#ifndef __com_sun_star_sdbc_XGeneratedResultSet_idl__ 
+#define __com_sun_star_sdbc_XGeneratedResultSet_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XResultSet;  
+ 
 /** provides a result set which gives access to automatically generated values after a new row was inserted.
-
+    
     <p>The relative order of columns in the result set returned by <member>getGeneratedValues</member> must be the same
     as the relative order of the same columns as returned when executing a "SELECT * FROM table". This ensures that
     clients of this interface can reliably fetch the column values.</p>
@@ -50,22 +50,22 @@
     @since OOo 1.1.2
  */
 published interface XGeneratedResultSet: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** gives access to automatically generated values after a new row was inserted.
         @returns
             a result set that contains the data produced by the query
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
     */
-    XResultSet getGeneratedValues() raises (SQLException);
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    XResultSet getGeneratedValues() raises (SQLException); 
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XIsolatedConnection.idl b/offapi/com/sun/star/sdbc/XIsolatedConnection.idl
index 5f34df8e84ce..82c39fd32668 100644
--- a/offapi/com/sun/star/sdbc/XIsolatedConnection.idl
+++ b/offapi/com/sun/star/sdbc/XIsolatedConnection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XIsolatedConnection_idl__
-#define __com_sun_star_sdbc_XIsolatedConnection_idl__
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
-#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XConnection;
-/** is used for establishing isolated connections via a factory.
+#ifndef __com_sun_star_sdbc_XIsolatedConnection_idl__ 
+#define __com_sun_star_sdbc_XIsolatedConnection_idl__ 
+ 
+#ifndef __com_sun_star_task_XInteractionHandler_idl__ 
+#include <com/sun/star/task/XInteractionHandler.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XConnection;  
+/** is used for establishing isolated connections via a factory. 
     <p>
-    The <type>XIsolatedConnection</type> allows to create connections which are not shared among others
+    The <type>XIsolatedConnection</type> allows to create connections which are not shared among others 
     as it is the case when creating connections in normal way.
     </p>
     @see com::sun::star::sdb::DataSource
     @since OOo 1.1.2
  */
 published interface XIsolatedConnection: com::sun::star::uno::XInterface
-{
-    /** attempts to establish a database connection.
-        <p>If information is missing, such as
+{ 
+    /** attempts to establish a database connection. 
+        <p>If information is missing, such as 
         a user's password, they are completed by user interaction.</p>
         @param handler
             The handler which ask for the needed information when they are missing.
@@ -58,9 +58,9 @@ published interface XIsolatedConnection: com::sun::star::uno::XInterface
         @throws com::sun::star::sdbc::SQLException
             when an error occurs.
      */
-    XConnection
-        getIsolatedConnectionWithCompletion([in]com::sun::star::task::XInteractionHandler handler)
-             raises (SQLException);
+    XConnection 
+        getIsolatedConnectionWithCompletion([in]com::sun::star::task::XInteractionHandler handler) 
+             raises (SQLException); 
 
     /** attempts to establish a database connection.
         @param user
@@ -72,14 +72,14 @@ published interface XIsolatedConnection: com::sun::star::uno::XInterface
         @throws com::sun::star::sdbc::SQLException
             when an error occurs.
      */
-    XConnection getIsolatedConnection([in]string user, [in]string password)
-        raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    XConnection getIsolatedConnection([in]string user, [in]string password) 
+        raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XMultipleResults.idl b/offapi/com/sun/star/sdbc/XMultipleResults.idl
index 9bda09c36145..fa27ee4536c1 100644
--- a/offapi/com/sun/star/sdbc/XMultipleResults.idl
+++ b/offapi/com/sun/star/sdbc/XMultipleResults.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XMultipleResults_idl__
-#define __com_sun_star_sdbc_XMultipleResults_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XResultSet;
-
-
+#ifndef __com_sun_star_sdbc_XMultipleResults_idl__ 
+#define __com_sun_star_sdbc_XMultipleResults_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XResultSet; 
+ 
+ 
 /** is used for inspecting multiple results produced by the execution of a
     SQL statement.
-
-
+    
+    
     <p>
     Under some (uncommon) situations a single SQL statement may return
     multiple result sets and/or update counts.  Normally you can ignore
@@ -56,62 +56,62 @@
     and
     <member scope="com::sun::star::sdbc">XMultipleResults::getUpdateCount()</member>
     let you navigate through multiple results.
-
+    
     </p>
-    @see com::sun::star::sdbc::XStatement
+    @see com::sun::star::sdbc::XStatement 
      @see com::sun::star::sdbc::XPreparedStatement
  */
 published interface XMultipleResults: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns the current result as a
         <type scope="com::sun::star::sdbc">ResultSet</type>
         object.
         This method should be called only once per result.
         @returns
             the ResultSet object
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet getResultSet() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet getResultSet() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** returns the current result as an update count.
-
-
+        
+        
         <p>
         If the result is a ResultSet or there are no more results, -1
         is returned. This method should be called only once per result.
         </p>
         @returns
             the current result as an update count.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getUpdateCount() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getUpdateCount() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** moves to a Statement's next result. It returns <TRUE/> if
         this result is a ResultSet.  This method also implicitly
         closes any current ResultSet obtained with getResultSet.
-
+        
         <p>
         There are no more results when <code>(!getMoreResults() &amp;amp;&amp;amp;
         getUpdateCount() == -1)</code>.
-
+        
         </p>
         @returns
             <TRUE/> if there exists more ResultSet objects
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean getMoreResults() raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    boolean getMoreResults() raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XOutParameters.idl b/offapi/com/sun/star/sdbc/XOutParameters.idl
index a9047e958633..d615d3917b3e 100644
--- a/offapi/com/sun/star/sdbc/XOutParameters.idl
+++ b/offapi/com/sun/star/sdbc/XOutParameters.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XOutParameters_idl__
-#define __com_sun_star_sdbc_XOutParameters_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_XOutParameters_idl__ 
+#define __com_sun_star_sdbc_XOutParameters_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** is used to register Out-Parameters for stored procedures.
-
-
+    
+    
     <p>
     SDBC provides a stored procedure SQL escape that allows stored procedures
     to be called in a standard way for all RDBMSs. This escape syntax has one
@@ -51,16 +51,16 @@
     </p>
  */
 published interface XOutParameters: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** registers the designated output parameter.  This version of
-        the method
+        the method 
         <member scope="com::sun::star::sdbc">XOutParameters::registerOutParameter()</member>
         should be used for a user-named or REF output parameter. Examples
         of user-named types include: STRUCT, DISTINCT, OBJECT, and named array
         types.
-
-
+        
+        
         <p>
         Before executing a stored procedure call, you must explicitly
         call
@@ -83,7 +83,7 @@ published interface XOutParameters: com::sun::star::uno::XInterface
         </p>
         <p>
         <b>Note:</b> When reading the value of an out parameter, you
-        must use the
+        must use the 
         <code>getXXX</code>
         method whose type XXX corresponds to the
         parameter's registered SQL type.
@@ -94,29 +94,29 @@ published interface XOutParameters: com::sun::star::uno::XInterface
             the type of the column to register
         @param typeName
             the name of the type
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void registerOutParameter([in]long parameterIndex, [in]long sqlType,
-                              [in]string typeName)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void registerOutParameter([in]long parameterIndex, [in]long sqlType, 
+                              [in]string typeName) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** registers the OUT parameter in ordinal position
         <code>parameterIndex</code>
         to the SDBC type
         <code>sqlType</code>
         . All
         OUT parameters must be registered before a stored procedure is executed.
-
-
+        
+        
         <p>
-        The SDBC type specified by
+        The SDBC type specified by 
         <code>sqlType</code>
-        for an OUT parameter determines the type that must be used in the
+        for an OUT parameter determines the type that must be used in the 
         <code>get</code>
         method to read the value of that parameter.
-        This version of
+        This version of 
         <member scope="com::sun::star::sdbc">XOutParameters::registerOutParameter()</member>
         should be
         used when the parameter is of SDBC type
@@ -130,19 +130,19 @@ published interface XOutParameters: com::sun::star::uno::XInterface
             the type of the column to register
         @param scale
             the scale of the type
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
         </p>
      */
-    void registerNumericOutParameter([in]long parameterIndex, [in]long sqlType,
-                                       [in]long scale)
-        raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void registerNumericOutParameter([in]long parameterIndex, [in]long sqlType, 
+                                       [in]long scale) 
+        raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XParameters.idl b/offapi/com/sun/star/sdbc/XParameters.idl
index 173e71789c5c..fe0bfae6a4a4 100644
--- a/offapi/com/sun/star/sdbc/XParameters.idl
+++ b/offapi/com/sun/star/sdbc/XParameters.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XParameters_idl__
-#define __com_sun_star_sdbc_XParameters_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_Date_idl__
-#include <com/sun/star/util/Date.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
-#include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_util_Time_idl__
-#include <com/sun/star/util/Time.idl>
-#endif
-
- module com {  module sun {  module star {  module io {
- published interface XInputStream;
-};};};};
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XRef;
- published interface XArray;
- published interface XBlob;
- published interface XClob;
-
-
+#ifndef __com_sun_star_sdbc_XParameters_idl__ 
+#define __com_sun_star_sdbc_XParameters_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_Date_idl__ 
+#include <com/sun/star/util/Date.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_DateTime_idl__ 
+#include <com/sun/star/util/DateTime.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_Time_idl__ 
+#include <com/sun/star/util/Time.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module io { 
+ published interface XInputStream; 
+};};};}; 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XRef; 
+ published interface XArray; 
+ published interface XBlob; 
+ published interface XClob; 
+ 
+ 
 /** is used for parameter setting, commonly implemented in conjunction with
     PreparedStatements.
-
-
+    
+    
     <p>
     <b>Note:</b> The setXXX methods for setting IN parameter values
     must specify types that are compatible with the defined SQL type of
@@ -70,7 +70,7 @@
     Integer, then the method
     <member scope="com::sun::star::sdbc">XParameters::setInt()</member>
     should be used.
-
+    
     </p>
     <p>
     If arbitrary parameter type conversions are required, the method
@@ -78,31 +78,31 @@
     should be used with a target SQL type.
     <br/>
     <br/>
-    Example of setting a parameter;
+    Example of setting a parameter; 
     <code>con</code>
     is an active connection.
     </p>
-
+    
     @example <listing>pstmt = con.prepareStatement("UPDATE EMPLOYEES SET SALARY = ? WHERE ID = ?")
     pstmt.setDouble(1, 153833.00)
     pstmt.setLong(2, 110592)
     </listing>@see com::sun::star::sdbc::XPreparedStatement
  */
 published interface XParameters: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** sets the designated parameter to SQL NULL.
      */
-    void setNull([in]long parameterIndex,
-                 [in]long sqlType) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setNull([in]long parameterIndex, 
+                 [in]long sqlType) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets the designated parameter to SQL NULL.  This version of setNull should
         be used for user-named types and REF type parameters.  Examples
         of user-named types include: STRUCT, DISTINCT, OBJECT, and
         named array types.
-
-
+        
+        
         <p>
         <b>Note:</b> To be portable, applications must give the
         SQL type code and the fully-qualified SQL type name when specifying
@@ -123,99 +123,99 @@ published interface XParameters: com::sun::star::uno::XInterface
             the type of the column to set to <NULL/>
         @param typeName
             the name of the type
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setObjectNull([in]long parameterIndex,
-                        [in]long sqlType,
-                        [in]string typeName) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setObjectNull([in]long parameterIndex, 
+                        [in]long sqlType, 
+                        [in]string typeName) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets the designated parameter to a boolean value.  The driver converts this
         to a SQL BIT value when it sends it to the database.
         @param parameterIndex
             the first parameter is 1, the second is 2, ...
         @param x
             the parameter value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setBoolean([in]long parameterIndex, [in]boolean x)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setBoolean([in]long parameterIndex, [in]boolean x) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets the designated parameter to a byte value.  The driver converts this
         to a SQL TINYINT value when it sends it to the database.
         @param parameterIndex
             the first parameter is 1, the second is 2, ...
         @param x
             the parameter value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setByte([in]long parameterIndex, [in]byte x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setByte([in]long parameterIndex, [in]byte x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets the designated parameter to a short value.  The driver converts this
         to a SQL SMALLINT value when it sends it to the database.
         @param parameterIndex
             the first parameter is 1, the second is 2, ...
         @param x
             the parameter value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setShort([in]long parameterIndex, [in]short x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setShort([in]long parameterIndex, [in]short x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets the designated parameter to a long value.  The driver converts this
         to a SQL INTEGER value when it sends it to the database.
         @param parameterIndex
             the first parameter is 1, the second is 2, ...
         @param x
             the parameter value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setInt([in]long parameterIndex, [in]long x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setInt([in]long parameterIndex, [in]long x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets the designated parameter to a hyper value.  The driver converts this
         to a SQL BIGINT value when it sends it to the database.
         @param parameterIndex
             the first parameter is 1, the second is 2, ...
         @param x
             the parameter value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setLong([in]long parameterIndex, [in]hyper x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setLong([in]long parameterIndex, [in]hyper x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets the designated parameter to a float value. The driver converts this
         to a SQL FLOAT value when it sends it to the database.
         @param parameterIndex
             the first parameter is 1, the second is 2, ...
         @param x
             the parameter value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setFloat([in]long parameterIndex, [in]float x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setFloat([in]long parameterIndex, [in]float x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets the designated parameter to a double value.  The driver converts this
         to a SQL DOUBLE value when it sends it to the database.
         @param parameterIndex
             the first parameter is 1, the second is 2, ...
         @param x
             the parameter value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setDouble([in]long parameterIndex, [in]double x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setDouble([in]long parameterIndex, [in]double x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets the designated parameter to a string value. The driver converts this
         to a SQL VARCHAR or LONGVARCHAR value (depending on the argument's
         size relative to the driver's limits on VARCHARs) when it sends
@@ -224,12 +224,12 @@ published interface XParameters: com::sun::star::uno::XInterface
             the first parameter is 1, the second is 2, ...
         @param x
             the parameter value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setString([in]long parameterIndex, [in]string x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setString([in]long parameterIndex, [in]string x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets the designated parameter to a sequence of bytes.  The driver converts
         this to a SQL VARBINARY or LONGVARBINARY (depending on the
         argument's size relative to the driver's limits on VARBINARYs)
@@ -238,39 +238,39 @@ published interface XParameters: com::sun::star::uno::XInterface
             the first parameter is 1, the second is 2, ...
         @param x
             the parameter value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setBytes([in]long parameterIndex, [in]sequence<byte> x)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setBytes([in]long parameterIndex, [in]sequence<byte> x) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets the designated parameter to a date value. The driver converts this
         to a SQL DATE value when it sends it to the database.
         @param parameterIndex
             the first parameter is 1, the second is 2, ...
         @param x
             the parameter value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setDate([in]long parameterIndex, [in]com::sun::star::util::Date x)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setDate([in]long parameterIndex, [in]com::sun::star::util::Date x) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets the designated parameter to a time value. The driver converts this
         to a SQL TIME value when it sends it to the database.
         @param parameterIndex
             the first parameter is 1, the second is 2, ...
         @param x
             the parameter value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setTime([in]long parameterIndex, [in]com::sun::star::util::Time x)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setTime([in]long parameterIndex, [in]com::sun::star::util::Time x) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets the designated parameter to a datetime value.  The driver
         converts this to a SQL TIMESTAMP value when it sends it to the
         database.
@@ -278,13 +278,13 @@ published interface XParameters: com::sun::star::uno::XInterface
             the first parameter is 1, the second is 2, ...
         @param x
             the parameter value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setTimestamp([in]long parameterIndex,
-                      [in]com::sun::star::util::DateTime x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setTimestamp([in]long parameterIndex, 
+                      [in]com::sun::star::util::DateTime x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets the designated parameter to the given input stream, which will have
         the specified number of bytes.
         When a very large binary value is input to a LONGVARBINARY or LONGVARCHAR
@@ -297,14 +297,14 @@ published interface XParameters: com::sun::star::uno::XInterface
             the parameter value
         @param length
             the number of bytes in the stream
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setBinaryStream([in]long parameterIndex,
-                            [in]com::sun::star::io::XInputStream x,
-                             [in]long length) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setBinaryStream([in]long parameterIndex, 
+                            [in]com::sun::star::io::XInputStream x, 
+                             [in]long length) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets the designated parameter to the given input stream, which will have
         the specified number of bytes.
         When a very large binary value is input to a LONGVARCHAR
@@ -317,17 +317,17 @@ published interface XParameters: com::sun::star::uno::XInterface
             the parameter value
         @param length
             the number of characters in the stream
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setCharacterStream([in]long parameterIndex,
-                             [in]com::sun::star::io::XInputStream x,
-                             [in]long length) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setCharacterStream([in]long parameterIndex, 
+                             [in]com::sun::star::io::XInputStream x, 
+                             [in]long length) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets the value of a parameter using an any.
-
-
+        
+        
         <p>The given object will be converted to the targetSqlType
         before being sent to the database.
         If the object has a custom mapping (is of a class implementing SQLData),
@@ -344,17 +344,17 @@ published interface XParameters: com::sun::star::uno::XInterface
             the first parameter is 1, the second is 2, ...
         @param x
             the parameter value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setObject([in]long parameterIndex, [in]any x)
-            raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setObject([in]long parameterIndex, [in]any x) 
+            raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** set a value from the Datatype ANY for a parameter.
-
-
-
+        
+        
+        
         <p>The given object will be converted to the targetSqlType
         before being sent to the database.
         If the object has a custom mapping (is of a class implementing SQLData),
@@ -372,87 +372,87 @@ published interface XParameters: com::sun::star::uno::XInterface
         @param x
             the parameter value
         @param targetSqlType
-            the SQL type (as defined in
+            the SQL type (as defined in 
             <type scope="com::sun::star::sdbc">DataType</type>
             ) to be sent to the database. The scale argument may further qualify this type.
         @param scale
-            for
+            for 
             <member scope="com::sun::star::sdbc">DataType::DECIMAL</member>
-             or
+             or 
              <member scope="com::sun::star::sdbc">DataType::NUMERIC</member>
              types, this is the number of digits after the decimal point. For all other types, this value will be ignored.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setObjectWithInfo([in]long parameterIndex,
-                              [in]any x, [in]long targetSqlType, [in]long scale)
-            raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setObjectWithInfo([in]long parameterIndex, 
+                              [in]any x, [in]long targetSqlType, [in]long scale) 
+            raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets a REF(&amp;lt;structured-type&amp;gt;) parameter.
         @param parameterIndex
             the first parameter is 1, the second is 2, ...
         @param x
             the parameter value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setRef ([in]long parameterIndex, [in]XRef x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setRef ([in]long parameterIndex, [in]XRef x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets a BLOB parameter.
         @param parameterIndex
             the first parameter is 1, the second is 2, ...
         @param x
             the parameter value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setBlob ([in]long parameterIndex, [in]XBlob x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setBlob ([in]long parameterIndex, [in]XBlob x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets a CLOB parameter.
         @param parameterIndex
             the first parameter is 1, the second is 2, ...
         @param x
             the parameter value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setClob ([in]long parameterIndex, [in]XClob x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void setClob ([in]long parameterIndex, [in]XClob x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** sets an Array parameter.
         @param parameterIndex
             the first parameter is 1, the second is 2, ...
         @param x
             the parameter value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void setArray ([in]long parameterIndex, [in]XArray x) raises (SQLException);
-
-    //-------------------------------------------------------------------------
-
+    void setArray ([in]long parameterIndex, [in]XArray x) raises (SQLException); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** clears the current parameter values immediately.
-
-
+        
+        
         <p>In general, parameter values remain in force for repeated use of a
         Statement. Setting a parameter value automatically clears its
         previous value. However, in some cases it is useful to immediately
         release the resources used by the current parameter values; this can
         be done by calling clearParameters.
         </p>
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void clearParameters() raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void clearParameters() raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XPooledConnection.idl b/offapi/com/sun/star/sdbc/XPooledConnection.idl
index 5b7b2389676a..0cff113dfb95 100644
--- a/offapi/com/sun/star/sdbc/XPooledConnection.idl
+++ b/offapi/com/sun/star/sdbc/XPooledConnection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,25 +25,25 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_sdbc_XPooledConnection_idl__
-#define __com_sun_star_sdbc_XPooledConnection_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XConnection;
-
+#ifndef __com_sun_star_sdbc_XPooledConnection_idl__ 
+#define __com_sun_star_sdbc_XPooledConnection_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XConnection; 
+ 
 /** defines a pooled connection which can share a unused connection.
 
 <!-- JRH: unclear meaning -->
@@ -56,25 +56,25 @@
     <member scope="com::sun::star::sdbc">XPooledConnection::getConnection()</member>
     is called, the PooledConnection returns the connection which is pooled.
     </p>
-
+    
     @see com::sun::star::sdbc::XConnection
  */
 published interface XPooledConnection: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** return the connection which is pooled
-        @returns
+        @returns 
             the pooled Connection object
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XConnection getConnection()
-        raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    XConnection getConnection() 
+        raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl b/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl
index 7b610ce10f56..c9bd611bbdd3 100644
--- a/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl
+++ b/offapi/com/sun/star/sdbc/XPreparedBatchExecution.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,25 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XPreparedBatchExecution_idl__
-#define __com_sun_star_sdbc_XPreparedBatchExecution_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_XPreparedBatchExecution_idl__ 
+#define __com_sun_star_sdbc_XPreparedBatchExecution_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** is used for batch execution on PreparedStatements.
-
-
+    
+    
     <p>
-    A
+    A 
     <type scope="com::sun::star::sdbc">PreparedStatement</type>
     uses one precompiled SQL Statement. In batch execution
     it is possible to set collection of parameter settings, which are executed in
@@ -50,37 +50,37 @@
     </p>
  */
 published interface XPreparedBatchExecution: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** adds a set of parameters to the batch.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void addBatch() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void addBatch() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** makes the set of commands in the current batch empty.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void clearBatch() raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /** submits a batch of commands to the database for execution.
-             @returns
-                an array of update counts containing one element for each
-                 command in the batch. The array is ordered according to the order in
-                which commands were inserted into the batch.
-             @throws SQLException
+    void clearBatch() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** submits a batch of commands to the database for execution. 
+             @returns 
+                an array of update counts containing one element for each 
+                 command in the batch. The array is ordered according to the order in 
+                which commands were inserted into the batch. 
+             @throws SQLException 
                 if a database access error occurs.
      */
-    sequence<long> executeBatch() raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    sequence<long> executeBatch() raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XPreparedStatement.idl b/offapi/com/sun/star/sdbc/XPreparedStatement.idl
index f43ca9b8919c..22a836c21ec2 100644
--- a/offapi/com/sun/star/sdbc/XPreparedStatement.idl
+++ b/offapi/com/sun/star/sdbc/XPreparedStatement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XPreparedStatement_idl__
-#define __com_sun_star_sdbc_XPreparedStatement_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XConnection;
- published interface XResultSet;
-
-
+#ifndef __com_sun_star_sdbc_XPreparedStatement_idl__ 
+#define __com_sun_star_sdbc_XPreparedStatement_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XConnection; 
+ published interface XResultSet; 
+ 
+ 
 /** provides the possibilty of executing a precompiled SQL statement.
-
-
+    
+    
     <p>
     A SQL statement is pre-compiled and stored in a PreparedStatement object.
     This object can then be used to efficiently execute this statement multiple
@@ -51,19 +51,19 @@
     </p>
  */
 published interface XPreparedStatement: com::sun::star::uno::XInterface
-{
-
-    /** executes the SQL query in this
+{ 
+     
+    /** executes the SQL query in this 
         <code>PreparedStatement</code>
         object and returns the result set generated by the query.
         @returns
             the ResultSet object
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet executeQuery() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet executeQuery() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** executes the SQL INSERT, UPDATE or DELETE statement in this
         <type scope="com::sun::star::sdbc">PreparedStatement</type>
         object.
@@ -72,15 +72,15 @@ published interface XPreparedStatement: com::sun::star::uno::XInterface
         SQL DDL statements, can be executed.
         @returns
             either the row count for INSERT, UPDATE or DELETE statements; or 0 for SQL statements that return nothing
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long executeUpdate() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long executeUpdate() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** executes any kind of SQL statement.
-
-
+        
+        
         <p>
         Some prepared statements return multiple results; the execute
         method handles these complex statements as well as the simpler
@@ -88,30 +88,30 @@ published interface XPreparedStatement: com::sun::star::uno::XInterface
         </p>
         @returns
             <TRUE/> if successful
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean execute() raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /** returns the
+    boolean execute() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** returns the 
         <type scope="com::sun::star::sdbc">Connection</type>
         object
-        that produced this
+        that produced this 
         <type scope="com::sun::star::sdbc">Statement</type>
         object.
         @returns
             the Connection object
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XConnection getConnection() raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    XConnection getConnection() raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XRef.idl b/offapi/com/sun/star/sdbc/XRef.idl
index e14e30db6e3f..a6e6e3099a51 100644
--- a/offapi/com/sun/star/sdbc/XRef.idl
+++ b/offapi/com/sun/star/sdbc/XRef.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XRef_idl__
-#define __com_sun_star_sdbc_XRef_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_XRef_idl__ 
+#define __com_sun_star_sdbc_XRef_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** is the reference to a SQL structured type value in the database.  A
     Ref can be saved to persistent storage.  A Ref is dereferenced by
     passing it as a parameter to a SQL statement and executing the
     statement.
  */
 published interface XRef: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** gets the fully-qualified SQL structured type name of the referenced item.
         @returns
             the base type name
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getBaseTypeName() raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    string getBaseTypeName() raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XResultSet.idl b/offapi/com/sun/star/sdbc/XResultSet.idl
index cf908ca0760b..0d9f2556724a 100644
--- a/offapi/com/sun/star/sdbc/XResultSet.idl
+++ b/offapi/com/sun/star/sdbc/XResultSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
-#define __com_sun_star_sdbc_XResultSet_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XStatement;
-
-
-/** provides the navigation on a table of data.  A
+#ifndef __com_sun_star_sdbc_XResultSet_idl__ 
+#define __com_sun_star_sdbc_XResultSet_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XStatement; 
+ 
+ 
+/** provides the navigation on a table of data.  A 
     <type scope="com::sun::star::sdbc">ResultSet</type>
-    object is usually generated by executing a
+    object is usually generated by executing a 
     <type scope="com::sun::star::sdbc">Statement</type>
     .
-
-
+    
+    
     <p>
     A ResultSet maintains a cursor pointing to its current row of
     data. Initially the cursor is positioned before the first row.
@@ -54,127 +54,127 @@
     </p>
  */
 published interface XResultSet: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor down one row from its current position.
-
-
+        
+        
         <p>
         A ResultSet cursor is initially positioned before the first row; the
         first call to next makes the first row the current row; the
         second call makes the second row the current row, and so on.
         </p>
         <p>If an input stream is open for the current row, a call
-        to the method
+        to the method 
         <code>next</code>
         will implicitly close it.
         The ResultSet's warning chain is cleared when a new row is read.
         </p>
         @returns
          <TRUE/> if successful
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean next() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean next() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether the cursor is before the first row in the result
         set.
         @returns
          <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean isBeforeFirst() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean isBeforeFirst() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether the cursor is after the last row in the result
         set.
         @returns
          <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean isAfterLast() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean isAfterLast() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether the cursor is on the first row of the result set.
         @returns
          <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean isFirst() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean isFirst() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether the cursor is on the last row of the result set.
-
-
+        
+        
         <p>
         <B>
         Note:
         </B>
-        Calling the method
+        Calling the method 
         <code>isAtLast</code>
         may be expensive because the SDBC driver might need to fetch ahead one row in order
         to determine whether the current row is the last row in the result set.
         </p>
         @returns
          <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean isLast() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean isLast() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the front of the result set, just before the
         first row. Has no effect if the result set contains no rows.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void beforeFirst() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void beforeFirst() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the end of the result set, just after the last
         row. Has no effect if the result set contains no rows.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void afterLast() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void afterLast() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the first row in the result set.
         @returns
          <TRUE/> if successful
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean first() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean first() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the last row in the result set.
         @returns
          <TRUE/> if successful
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean last() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean last() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** retrieves the current row number. The first row is number 1, the
         second number 2, and so on.
         @returns
          the current position
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getRow() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getRow() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the given row number in the result set.
-
-
+        
+        
         <p>
         If the row number is positive, the cursor moves to
         the given row number with respect to the
@@ -187,7 +187,7 @@ published interface XResultSet: com::sun::star::uno::XInterface
         the end of the result set. For example, calling
         <code>absolute(-1)</code>
         positions the
-        cursor on the last row,
+        cursor on the last row, 
         <code>absolute(-2)</code>
         indicates the next-to-last row, and so on.
         </p>
@@ -197,35 +197,35 @@ published interface XResultSet: com::sun::star::uno::XInterface
         row, respectively.
         </p>
         <p>
-        Note: Calling
+        Note: Calling 
         <code>absolute(1)</code>
         is the same
-        as calling
+        as calling 
         <member scope="com::sun::star::sdbc">XResultSet::first()</member>
         .
         Calling <code>moveToPosition(-1)</code> is the same as calling
         <code>moveToLast()</code>.
         </p>
      */
-    boolean absolute([in] long row ) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean absolute([in] long row ) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor a relative number of rows, either positive or negative.
-
-
+        
+        
         <p>
         Attempting to move beyond the first/last row in the result set
-        positions the cursor before/after
-        the first/last row. Calling
+        positions the cursor before/after 
+        the first/last row. Calling 
         <code>relative(0)</code>
         is valid, but does not change the cursor position.
         </p>
         <p>
-        Note: Calling
+        Note: Calling 
         <code>relative(1)</code>
-        is different from calling
+        is different from calling 
         <member scope="com::sun::star::sdbc">XResultSet::next()</member>
-        because is makes sense to call
+        because is makes sense to call 
         <code>next()</code>
         when there is no current row, for example, when the cursor is positioned before
         the first row or after the last row of the result set.
@@ -234,112 +234,112 @@ published interface XResultSet: com::sun::star::uno::XInterface
             how many rows should be moved relative to the current row
         @returns
          <TRUE/> if successful
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean relative([in]long rows) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean relative([in]long rows) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the previous row in the result set.
-
-
+        
+        
         <p>
-        Note:
+        Note: 
         <code>previous()</code>
         is not the same as
         <code>relative(-1)</code>
-        because it makes sense to call
+        because it makes sense to call 
         <code>previous()</code>
         when there is no current row.
         </p>
         @returns
             <TRUE/> if successful
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean previous() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean previous() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** refreshes the current row with its most recent value in
         the database. Cannot be called when on the insert row.
-        The
+        The 
         <code>refreshRow</code>
         method provides a way for an application to
         explicitly tell the SDBC driver to refetch a row(s) from the
-        database. An application may want to call
+        database. An application may want to call 
         <code>refreshRow</code>
         when caching or prefetching is being done by the SDBC driver to
         fetch the latest value of a row from the database. The SDBC driver
         may actually refresh multiple rows at once if the fetch size is
         greater than one.
         All values are refetched subject to the transaction isolation
-        level and cursor sensitivity. If
+        level and cursor sensitivity. If 
         <code>refreshRow</code>
-        is called after calling
+        is called after calling 
         <code>updateXXX</code>
-        , but before calling
+        , but before calling 
         <member scope="com::sun::star::sdbc">XResultSet::updateRow()</member>
         , then the updates made to the row are lost.
-        Calling the method
+        Calling the method 
         <code>refreshRow</code>
         frequently will likely slow performance.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void refreshRow() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void refreshRow() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether the current row has been updated. The value returned
         depends on whether or not the result set can detect updates.
         @returns
             <TRUE/> if successful
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean rowUpdated() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean rowUpdated() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether the current row has had an insertion.  The value returned
         depends on whether or not the result set can detect visible inserts.
         @returns
             <TRUE/> if successful
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean rowInserted() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean rowInserted() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether a row has been deleted.  A deleted row may leave
         a visible "hole" in a result set.  This method can be used to
         detect holes in a result set.  The value returned depends on whether
         or not the result set can detect deletions.
         @returns
             <TRUE/> if successful
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean rowDeleted() raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /** returns the Statement that produced this
+    boolean rowDeleted() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** returns the Statement that produced this 
         <type scope="com::sun::star::sdbc">ResultSet</type>
         object. If the result set was generated some other way, such as by an
         <type scope="com::sun::star::sdbc">XDatabaseMetaData</type>
-        method, this method returns
+        method, this method returns 
         <NULL/>
         .
         @returns
             the statement object
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    com::sun::star::uno::XInterface getStatement() raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    com::sun::star::uno::XInterface getStatement() raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XResultSetMetaData.idl b/offapi/com/sun/star/sdbc/XResultSetMetaData.idl
index c0f7ff78364f..7aba7203b80a 100644
--- a/offapi/com/sun/star/sdbc/XResultSetMetaData.idl
+++ b/offapi/com/sun/star/sdbc/XResultSetMetaData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,263 +24,263 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XResultSetMetaData_idl__
-#define __com_sun_star_sdbc_XResultSetMetaData_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_XResultSetMetaData_idl__ 
+#define __com_sun_star_sdbc_XResultSetMetaData_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** can be used to find out about the types and properties
     of the columns in a ResultSet.
  */
 published interface XResultSetMetaData: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns the number of columns in this ResultSet.
         @returns
             the column count
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getColumnCount() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getColumnCount() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether the column is automatically numbered, thus read-only.
         @param column
             the first column is 1, the second is 2,
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean isAutoIncrement([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean isAutoIncrement([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether a column's case matters.
         @param column
             the first column is 1, the second is 2,
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean isCaseSensitive([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean isCaseSensitive([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether the column can be used in a where clause.
         @param column
             the first column is 1, the second is 2,
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean isSearchable([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean isSearchable([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether the column is a cash value.
         @param column
             the first column is 1, the second is 2,
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean isCurrency([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean isCurrency([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates the nullability of values in the designated column.@see com::sun::star::sdbc::ColumnValue
         @param column
             the first column is 1, the second is 2,
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long isNullable([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long isNullable([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether values in the column are signed numbers.
         @param column
             the first column is 1, the second is 2,
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean isSigned([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean isSigned([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates the column's normal max width in chars.
         @param column
             the first column is 1, the second is 2,
         @returns
             the normal maximum number of characters allowed as the width of the designated column
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getColumnDisplaySize([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getColumnDisplaySize([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the suggested column title for use in printouts and
         displays.
         @param column
             the first column is 1, the second is 2,
         @returns
             the suggested column title
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getColumnLabel([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getColumnLabel([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a column's name.
         @param column
             the first column is 1, the second is 2,
         @returns
             the column name
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getColumnName([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getColumnName([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a column's table's schema.
         @param column
             the first column is 1, the second is 2,
         @returns
             the schema name
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getSchemaName([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getSchemaName([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a column's number of decimal digits.
         @param column
             the first column is 1, the second is 2,
         @returns
             precision
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getPrecision([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getPrecision([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a column's number of digits to right of the decimal point.
         @param column
             the first column is 1, the second is 2,
         @returns
             scale
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getScale([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getScale([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a column's table name.
         @param column
             the first column is 1, the second is 2,
         @returns
             the table name
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getTableName([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getTableName([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a column's table's catalog name.
         @param column
             the first column is 1, the second is 2,
         @returns
             the catalog name
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getCatalogName([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getCatalogName([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** retrieves a column's SQL type.
         @param column
             the first column is 1, the second is 2,
         @returns
             the column type
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long getColumnType([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getColumnType([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** retrieves a column's database-specific type name.
         @param column
             the first column is 1, the second is 2,
         @returns
             the type name
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getColumnTypeName([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getColumnTypeName([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether a column is definitely not writable.
         @param column
             the first column is 1, the second is 2,
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean isReadOnly([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean isReadOnly([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether it is possible for a write on the column to succeed.
         @param column
             the first column is 1, the second is 2,
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean isWritable([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean isWritable([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** indicates whether a write on the column will definitely succeed.
         @param column
             the first column is 1, the second is 2,
         @returns
             <TRUE/> if so
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean isDefinitelyWritable([in]long column) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean isDefinitelyWritable([in]long column) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** returns the fully-qualified name of the service whose instances
-        are manufactured if the method
+        are manufactured if the method 
         <member scope="com::sun::star::sdbc">XResultSet::.getObject()</member>
         is called to retrieve a value from the column.
         @param column
             the first column is 1, the second is 2,
         @returns
             the service name
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getColumnServiceName([in]long column) raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    string getColumnServiceName([in]long column) raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl b/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl
index 55af74460126..abeca09c039f 100644
--- a/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl
+++ b/offapi/com/sun/star/sdbc/XResultSetMetaDataSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XResultSetMetaDataSupplier_idl__
-#define __com_sun_star_sdbc_XResultSetMetaDataSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XResultSetMetaData;
-
-
+#ifndef __com_sun_star_sdbc_XResultSetMetaDataSupplier_idl__ 
+#define __com_sun_star_sdbc_XResultSetMetaDataSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XResultSetMetaData; 
+ 
+ 
 /** provides access to the meta data of a result set.
-
-
+    
+    
     <p>
     The number, types, and properties of a ResultSet's columns are
     provided by the
     <type scope="com::sun::star::sdbc">XResultSetMetaData</type>
-    interface returned by the
+    interface returned by the 
     <member scope="com::sun::star::sdbc">XResultSetMetaDataSupplier::getMetaData()</member>
     method.
     </p>
  */
 published interface XResultSetMetaDataSupplier: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** retrieves the number, types, and properties of a ResultSet's columns.
         @returns
             the meta data of the ResultSet.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSetMetaData getMetaData() raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    XResultSetMetaData getMetaData() raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XResultSetUpdate.idl b/offapi/com/sun/star/sdbc/XResultSetUpdate.idl
index ea3075bf622b..fed35d344907 100644
--- a/offapi/com/sun/star/sdbc/XResultSetUpdate.idl
+++ b/offapi/com/sun/star/sdbc/XResultSetUpdate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,74 +24,74 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XResultSetUpdate_idl__
-#define __com_sun_star_sdbc_XResultSetUpdate_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_XResultSetUpdate_idl__ 
+#define __com_sun_star_sdbc_XResultSetUpdate_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** provides the possiblity to write changes made on a result set back to
     database.
  */
 published interface XResultSetUpdate: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** inserts the contents of the insert row into the result set and
         the database. Must be on the insert row when this method is called.
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    void insertRow() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void insertRow() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates the underlying database with the new contents of the
         current row. Cannot be called when on the insert row.
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    void updateRow() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateRow() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** deletes the current row from the result set and the underlying
         database. Cannot be called when on the insert row.
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    void deleteRow() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void deleteRow() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** cancels the updates made to a row.
-
-
+        
+        
         <p>
         This method may be called after calling an
         <code>updateXXX</code>
-        method(s) and before calling
+        method(s) and before calling 
         <member scope="com::sun::star::sdbc">XResultSetUpdate::updateRow()</member>
         to rollback the updates made to a row. If no updates have been made or
         <code>updateRow</code>
         has already been called, then this method has no
         effect.
         </p>
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    void cancelRowUpdates() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void cancelRowUpdates() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the insert row.  The current cursor position is
         remembered while the cursor is positioned on the insert row.
-
-
+        
+        
         <p>
         The insert row is a special row associated with an updatable
         result set. It is essentially a buffer where a new row may
@@ -101,43 +101,43 @@ published interface XResultSetUpdate: com::sun::star::uno::XInterface
         inserting the row into the result set.
         </p>
         <p>
-        Only the
+        Only the 
         <code>updateXXX</code>
         ,
         <code>getXXX</code>
         ,
-        and
+        and 
         <member scope="com::sun::star::sdbc">XResultSetUpdate::insertRow()</member>
         methods may be
         called when the cursor is on the insert row.  All of the columns in
         a result set must be given a value each time this method is
-        called before calling
+        called before calling 
         <code>insertRow</code>
-        . The method
+        . The method 
         <code>updateXXX</code>
         must be called before a
         <code>getXXX</code>
         method can be called on a column value.
         </p>
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    void moveToInsertRow() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void moveToInsertRow() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the remembered cursor position, usually the
         current row. This method has no effect if the cursor is not on the insert
         row.
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    void moveToCurrentRow() raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void moveToCurrentRow() raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XRow.idl b/offapi/com/sun/star/sdbc/XRow.idl
index 72ab3fba1885..58f1342604f7 100644
--- a/offapi/com/sun/star/sdbc/XRow.idl
+++ b/offapi/com/sun/star/sdbc/XRow.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XRow_idl__
-#define __com_sun_star_sdbc_XRow_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_Date_idl__
-#include <com/sun/star/util/Date.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
-#include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_util_Time_idl__
-#include <com/sun/star/util/Time.idl>
-#endif
-
- module com {  module sun {  module star {  module io {
- published interface XInputStream;
-};};};};
-
- module com {  module sun {  module star {  module container {
- published interface XNameAccess;
-};};};};
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XRef;
- published interface XArray;
- published interface XBlob;
- published interface XClob;
-
-
+#ifndef __com_sun_star_sdbc_XRow_idl__ 
+#define __com_sun_star_sdbc_XRow_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_Date_idl__ 
+#include <com/sun/star/util/Date.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_DateTime_idl__ 
+#include <com/sun/star/util/DateTime.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_Time_idl__ 
+#include <com/sun/star/util/Time.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module io { 
+ published interface XInputStream; 
+};};};}; 
+ 
+ module com {  module sun {  module star {  module container { 
+ published interface XNameAccess; 
+};};};}; 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XRef; 
+ published interface XArray; 
+ published interface XBlob; 
+ published interface XClob; 
+ 
+ 
 /** is used to access data which is collected in a row.
-    All methods raise a
+    All methods raise a 
     <type scope="com::sun::star::sdbc">SQLException</type>
     if a database access error occurs.
  */
 published interface XRow: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** reports whether the last column read had a value of SQL NULL.
         Note that you must first call getXXX on a column to try to read
         its value and then call wasNull() to see if the value read was
@@ -79,159 +79,159 @@ published interface XRow: com::sun::star::uno::XInterface
 
         @returns
             <TRUE/> if last column read was SQL NULL and <FALSE/> otherwise
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    boolean wasNull() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean wasNull() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a string.
         @param columnIndex
             the first column is 1, the second is 2,
         @returns
             the column value; if the value is SQL NULL, the result is null
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    string getString([in]long columnIndex) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string getString([in]long columnIndex) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as boolean.
         @param columnIndex
             the first column is 1, the second is 2,
         @returns
             the column value; if the value is SQL NULL, the result is null
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    boolean getBoolean([in]long columnIndex) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean getBoolean([in]long columnIndex) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** get the value of a column in the current row as a byte.
         @param columnIndex
             the first column is 1, the second is 2,
         @returns
             the column value; if the value is SQL NULL, the result is null
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    byte getByte([in]long columnIndex) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    byte getByte([in]long columnIndex) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a short.
         @param columnIndex
             the first column is 1, the second is 2,
         @returns
             the column value; if the value is SQL NULL, the result is null
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    short getShort([in]long columnIndex) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    short getShort([in]long columnIndex) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** get the value of a column in the current row as an integer.
         @param columnIndex
             the first column is 1, the second is 2,
         @returns
             the column value; if the value is SQL NULL, the result is null
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    long getInt([in]long columnIndex) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long getInt([in]long columnIndex) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** get the value of a column in the current row as a long.
         @param columnIndex
             the first column is 1, the second is 2,
         @returns
             the column value; if the value is SQL NULL, the result is null
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    hyper getLong([in]long columnIndex) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    hyper getLong([in]long columnIndex) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a float.
         @param columnIndex
             the first column is 1, the second is 2,
         @returns
             the column value; if the value is SQL NULL, the result is null
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    float getFloat([in]long columnIndex) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    float getFloat([in]long columnIndex) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a double.
         @param columnIndex
             the first column is 1, the second is 2,
         @returns
             the column value; if the value is SQL NULL, the result is null
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    double getDouble([in]long columnIndex) raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /** gets the value of a column in the current row as a byte array.
-             The bytes represent the raw values returned by the driver.
-             @param columnIndex
-                the first column is 1, the second is 2, ...
-             @returns
-                the column value; if the value is SQL NULL, the result is empty.
-             @throws SQLException
+    double getDouble([in]long columnIndex) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** gets the value of a column in the current row as a byte array. 
+             The bytes represent the raw values returned by the driver. 
+             @param columnIndex 
+                the first column is 1, the second is 2, ... 
+             @returns 
+                the column value; if the value is SQL NULL, the result is empty. 
+             @throws SQLException 
                 if a database access error occurs.
      */
-    sequence<byte> getBytes([in]long columnIndex) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    sequence<byte> getBytes([in]long columnIndex) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a date object.
         @param columnIndex
             the first column is 1, the second is 2,
         @returns
             the column value; if the value is SQL NULL, the result is null
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    com::sun::star::util::Date getDate([in]long columnIndex)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    com::sun::star::util::Date getDate([in]long columnIndex) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a time object.
         @param columnIndex
             the first column is 1, the second is 2,
         @returns
             the column value; if the value is SQL NULL, the result is null
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    com::sun::star::util::Time getTime([in]long columnIndex)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    com::sun::star::util::Time getTime([in]long columnIndex) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a datetime object.
         @param columnIndex
             the first column is 1, the second is 2,
         @returns
             the column value; if the value is SQL NULL, the result is null
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    com::sun::star::util::DateTime getTimestamp([in]long columnIndex)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    com::sun::star::util::DateTime getTimestamp([in]long columnIndex) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a stream of
         uninterpreted bytes. The value can then be read in chunks from the
         stream. This method is particularly suitable for retrieving large
         LONGVARBINARY values.
-
-
+        
+        
         <p>
         <b>Note:</b> All the data in the returned stream must be
         read prior to getting the value of any other column. The next
         call to a get method implicitly closes the stream. Also, a
-        stream may return 0 when the method
+        stream may return 0 when the method 
         <member scope="com::sun::star::io">XInputStream::available()</member>
         is called whether there is data
         available or not.
@@ -240,24 +240,24 @@ published interface XRow: com::sun::star::uno::XInterface
             the first column is 1, the second is 2,
         @returns
             the column value; if the value is SQL NULL, the result is null
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    com::sun::star::io::XInputStream getBinaryStream([in]long columnIndex)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    com::sun::star::io::XInputStream getBinaryStream([in]long columnIndex) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets the value of a column in the current row as a stream of
         uninterpreted bytes. The value can then be read in chunks from the
         stream. This method is particularly suitable for retrieving large
         LONGVARBINARY or LONGVARCHAR values.
-
-
+        
+        
         <p>
         <b>Note:</b> All the data in the returned stream must be
         read prior to getting the value of any other column. The next
         call to a get method implicitly closes the stream. Also, a
-        stream may return 0 when the method
+        stream may return 0 when the method 
         <member scope="com::sun::star::io">XInputStream::available()</member>
         is called whether there is data
         available or not.
@@ -266,15 +266,15 @@ published interface XRow: com::sun::star::uno::XInterface
             the first column is 1, the second is 2,
         @returns
             the column value; if the value is SQL NULL, the result is null
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    com::sun::star::io::XInputStream getCharacterStream([in]long columnIndex)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    com::sun::star::io::XInputStream getCharacterStream([in]long columnIndex) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** returns the value of a column in the current row as an object.
-        This method uses the given
+        This method uses the given 
         <code>Map</code>
         object for the custom mapping of the SQL structure or distinct type
         that is being retrieved.
@@ -284,66 +284,66 @@ published interface XRow: com::sun::star::uno::XInterface
             the map of types which should be used to get the column value
         @returns
             the column value; if the value is SQL NULL, the result is null
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    any getObject([in]long columnIndex,
-                  [in]com::sun::star::container::XNameAccess typeMap)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    any getObject([in]long columnIndex, 
+                  [in]com::sun::star::container::XNameAccess typeMap) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a REF(&amp;lt;structured-type&amp;gt;) column value from the current row.
         @param columnIndex
             the first column is 1, the second is 2,
         @returns
             the column value; if the value is SQL NULL, the result is null
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    XRef getRef([in]long columnIndex) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XRef getRef([in]long columnIndex) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** gets a BLOB value in the current row.
         @param columnIndex
             the first column is 1, the second is 2,
         @returns
             the column value; if the value is SQL NULL, the result is null
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    XBlob getBlob([in]long columnIndex) raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /** gets a CLOB value in the current row of this
-        <code>ResultSet</code>
+    XBlob getBlob([in]long columnIndex) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** gets a CLOB value in the current row of this 
+        <code>ResultSet</code> 
         object.
         @param columnIndex
             the first column is 1, the second is 2,
         @returns
             the column value; if the value is SQL NULL, the result is null
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XClob getClob([in]long columnIndex) raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /** gets a SQL ARRAY value from the current row of this
-        <code>ResultSet</code>
+    XClob getClob([in]long columnIndex) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** gets a SQL ARRAY value from the current row of this 
+        <code>ResultSet</code> 
         object.
         @param columnIndex
             the first column is 1, the second is 2,
         @returns
             the column value; if the value is SQL NULL, the result is null
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    XArray getArray([in]long columnIndex) raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    XArray getArray([in]long columnIndex) raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XRowSet.idl b/offapi/com/sun/star/sdbc/XRowSet.idl
index ebdc0022f5ad..f954510927ba 100644
--- a/offapi/com/sun/star/sdbc/XRowSet.idl
+++ b/offapi/com/sun/star/sdbc/XRowSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,25 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XRowSet_idl__
-#define __com_sun_star_sdbc_XRowSet_idl__
-
-#ifndef __com_sun_star_sdbc_XResultSet_idl__
-#include <com/sun/star/sdbc/XResultSet.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XRowSetListener;
- published interface XConnection;
-
-
-/** enhances the functionality of a result set. It allows implementation of
+#ifndef __com_sun_star_sdbc_XRowSet_idl__ 
+#define __com_sun_star_sdbc_XRowSet_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_XResultSet_idl__ 
+#include <com/sun/star/sdbc/XResultSet.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XRowSetListener; 
+ published interface XConnection; 
+ 
+ 
+/** enhances the functionality of a result set. It allows implementation of 
     a special behavior for a result set and notifies an application on
     certain row set events such as a change in its value.
-
-
-
+    
+    
+    
     <p>
     The XRowSet interface is unique in that it is intended to be
     a software layer on top of an SDBC driver. Implementations of the
@@ -50,37 +50,37 @@
     </p>
  */
 published interface XRowSet: XResultSet
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** populates a row set with data. The description of the data source and
         other important information for filling the row set with data.
 
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void execute() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void execute() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** adds the specified listener to receive the events "cursorMoved",
         "rowChanged", and "rowSetChanged".
         @param listener
             the listener which should be registered
      */
-    [oneway] void addRowSetListener([in]XRowSetListener listener );
-    //-------------------------------------------------------------------------
-
+    [oneway] void addRowSetListener([in]XRowSetListener listener ); 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified listener.
         @param listener
             the listener which should be registered
      */
-    [oneway] void removeRowSetListener([in]XRowSetListener listener );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [oneway] void removeRowSetListener([in]XRowSetListener listener ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XRowSetListener.idl b/offapi/com/sun/star/sdbc/XRowSetListener.idl
index d4aba4ab71ac..b2a68cd3f899 100644
--- a/offapi/com/sun/star/sdbc/XRowSetListener.idl
+++ b/offapi/com/sun/star/sdbc/XRowSetListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XRowSetListener_idl__
-#define __com_sun_star_sdbc_XRowSetListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_XRowSetListener_idl__ 
+#define __com_sun_star_sdbc_XRowSetListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** is used for receiving "cursorMoved", "rowChanged", and "rowSetChanged" events
     posted by, for example, a rowset.
  */
 published interface XRowSetListener: com::sun::star::lang::XEventListener
-{
-
+{ 
+     
     /** is called when a rowset's cursor is moved.
         @param event
             contains information about the event
      */
-    [oneway] void cursorMoved([in]com::sun::star::lang::EventObject event);
-    //-------------------------------------------------------------------------
-
+    [oneway] void cursorMoved([in]com::sun::star::lang::EventObject event); 
+    //------------------------------------------------------------------------- 
+     
     /** is called when a row is inserted, updated, or deleted.
         @param event
             contains information about the event
         @deprecated
         @see com.sun.star.sdb.XRowsChangeListener
      */
-    [oneway] void rowChanged([in]com::sun::star::lang::EventObject event);
-    //-------------------------------------------------------------------------
-
+    [oneway] void rowChanged([in]com::sun::star::lang::EventObject event); 
+    //------------------------------------------------------------------------- 
+     
     /** is called when the row set has changed, or in other words, when the row set has
         been reexecuted.
         @param event
             contains information about the event
      */
-    [oneway] void rowSetChanged([in]com::sun::star::lang::EventObject event);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [oneway] void rowSetChanged([in]com::sun::star::lang::EventObject event); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XRowUpdate.idl b/offapi/com/sun/star/sdbc/XRowUpdate.idl
index e61286e11605..bad8f6d25d3a 100644
--- a/offapi/com/sun/star/sdbc/XRowUpdate.idl
+++ b/offapi/com/sun/star/sdbc/XRowUpdate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,186 +24,186 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XRowUpdate_idl__
-#define __com_sun_star_sdbc_XRowUpdate_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_Date_idl__
-#include <com/sun/star/util/Date.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
-#include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_util_Time_idl__
-#include <com/sun/star/util/Time.idl>
-#endif
-
- module com {  module sun {  module star {  module io {
- published interface XInputStream;
-};};};};
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_XRowUpdate_idl__ 
+#define __com_sun_star_sdbc_XRowUpdate_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_Date_idl__ 
+#include <com/sun/star/util/Date.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_DateTime_idl__ 
+#include <com/sun/star/util/DateTime.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_Time_idl__ 
+#include <com/sun/star/util/Time.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module io { 
+ published interface XInputStream; 
+};};};}; 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** is used to update data which is collected in a row.
  */
 published interface XRowUpdate: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** gives a nullable column a null value.
         @param columnIndex
             the position of the column
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void updateNull([in]long columnIndex) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateNull([in]long columnIndex) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a boolean value.
         @param columnIndex
             the position of the column
         @param x
             the new column value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void updateBoolean([in]long columnIndex, [in]boolean x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateBoolean([in]long columnIndex, [in]boolean x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a byte value.
         @param columnIndex
             the position of the column
         @param x
             the new column value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void updateByte([in]long columnIndex, [in]byte x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateByte([in]long columnIndex, [in]byte x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a short value.
         @param columnIndex
             the position of the column
         @param x
             the new column value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void updateShort([in]long columnIndex, [in]short x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateShort([in]long columnIndex, [in]short x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with an long value.
         @param columnIndex
             the position of the column
         @param x
             the new column value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void updateInt([in]long columnIndex, [in]long x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateInt([in]long columnIndex, [in]long x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a hyper value.
         @param columnIndex
             the position of the column
         @param x
             the new column value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void updateLong([in]long columnIndex, [in]hyper x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateLong([in]long columnIndex, [in]hyper x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a float value.
         @param columnIndex
             the position of the column
         @param x
             the new column value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void updateFloat([in]long columnIndex, [in]float x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateFloat([in]long columnIndex, [in]float x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a double value.
         @param columnIndex
             the position of the column
         @param x
             the new column value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void updateDouble([in]long columnIndex, [in]double x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateDouble([in]long columnIndex, [in]double x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a string value.
         @param columnIndex
             the position of the column
         @param x
             the new column value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void updateString([in]long columnIndex, [in]string x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateString([in]long columnIndex, [in]string x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a byte array value.
         @param columnIndex
             the position of the column
         @param x
             the new column value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void updateBytes([in]long columnIndex, [in]sequence<byte> x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateBytes([in]long columnIndex, [in]sequence<byte> x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a date value.
         @param columnIndex
             the position of the column
         @param x
             the new column value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void updateDate([in]long columnIndex, [in]com::sun::star::util::Date x)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateDate([in]long columnIndex, [in]com::sun::star::util::Date x) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a time value.
         @param columnIndex
             the position of the column
         @param x
             the new column value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void updateTime([in]long columnIndex, [in]com::sun::star::util::Time x)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateTime([in]long columnIndex, [in]com::sun::star::util::Time x) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a timestamp value.
         @param columnIndex
             the position of the column
         @param x
             the new column value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void updateTimestamp([in]long columnIndex,
-                         [in]com::sun::star::util::DateTime x)
-      raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateTimestamp([in]long columnIndex, 
+                         [in]com::sun::star::util::DateTime x) 
+      raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a stream value.
         @param columnIndex
             the position of the column
@@ -211,14 +211,14 @@ published interface XRowUpdate: com::sun::star::uno::XInterface
             the new column value
         @param length
             how much data should be read out of the stream
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void updateBinaryStream([in]long columnIndex,
-                             [in]com::sun::star::io::XInputStream x,
-                              [in]long length) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateBinaryStream([in]long columnIndex, 
+                             [in]com::sun::star::io::XInputStream x, 
+                              [in]long length) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with a stream value.
         @param columnIndex
             the position of the column
@@ -226,26 +226,26 @@ published interface XRowUpdate: com::sun::star::uno::XInterface
             the new column value
         @param length
             how much data should be read out of the stream
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void updateCharacterStream([in]long columnIndex,
-                                [in]com::sun::star::io::XInputStream x,
-                                 [in]long length) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateCharacterStream([in]long columnIndex, 
+                                [in]com::sun::star::io::XInputStream x, 
+                                 [in]long length) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with an object value.
         @param columnIndex
             the position of the column
         @param x
             the new column value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void updateObject([in]long columnIndex, [in]any x)
-      raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void updateObject([in]long columnIndex, [in]any x) 
+      raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** updates a column with an object value.
         @param columnIndex
             the position of the column
@@ -253,17 +253,17 @@ published interface XRowUpdate: com::sun::star::uno::XInterface
             the new column value
         @param scale
             defines the scale which should be used to write the numeric value
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void updateNumericObject([in]long columnIndex, [in]any x, [in]long scale)
-      raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void updateNumericObject([in]long columnIndex, [in]any x, [in]long scale) 
+      raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XSQLData.idl b/offapi/com/sun/star/sdbc/XSQLData.idl
index f26a09e283fd..62e0aa033bfa 100644
--- a/offapi/com/sun/star/sdbc/XSQLData.idl
+++ b/offapi/com/sun/star/sdbc/XSQLData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XSQLData_idl__
-#define __com_sun_star_sdbc_XSQLData_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XSQLInput;
- published interface XSQLOutput;
-
-
+#ifndef __com_sun_star_sdbc_XSQLData_idl__ 
+#define __com_sun_star_sdbc_XSQLData_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XSQLInput; 
+ published interface XSQLOutput; 
+ 
+ 
 /** is used for the custom mapping of SQL user-defined types.
-
-
+    
+    
     <p>
     This interface must be implemented by a service that is
     registered in a type mapping.  It is expected that this interface
@@ -53,28 +53,28 @@
     </p>
  */
 published interface XSQLData: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns the fully-qualified name of the SQL user-defined type
         that this object represents.
-
-
+        
+        
         <p>
         This method is called by the SDBC driver to get the name of the
         UDT instance that is being mapped to this instance of SQLData.
         </p>
-        @returns
+        @returns 
             the name of the SQL type.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getSQLTypeName() raises (SQLException);
-
-     //-------------------------------------------------------------------------
-
+    string getSQLTypeName() raises (SQLException); 
+ 
+     //------------------------------------------------------------------------- 
+     
     /** populates this object with data read from the database.
-
-
+        
+        
         <p>
         The implementation of the method must follow this protocol:
         <br/>
@@ -82,12 +82,12 @@ published interface XSQLData: com::sun::star::uno::XInterface
         type from the given input stream. This is done
         by calling a method of the input stream to read each
         item, in the order that they appear in the SQL definition
-        of the type. The method
+        of the type. The method 
         <code>readSQL</code>
         then assigns the data to appropriate fields or elements (of this
         or other objects).
         <br/>
-        Specifically, it must call the appropriate
+        Specifically, it must call the appropriate 
         <code>XSQLInput.readXXX</code>
         method(s) to do the following:
         for a Distinct Type, read its single data element;
@@ -104,25 +104,25 @@ published interface XSQLData: com::sun::star::uno::XInterface
             the input SQL data stream
         @param typeName
             the SQL type of the value on the data stream
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
 
         @see com::sun::star::sdbc::XSQLInput
      */
-    void readSQL([in]XSQLInput stream, [in]string typeName)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void readSQL([in]XSQLInput stream, [in]string typeName) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+       
     /** writes this object to the given SQL data stream.
-
-
+        
+        
         <p>
         The implementation of the method must follow this protocol:
         <br/>
         It must write each of the attributes of the SQL type to the given output
         stream. This is done by calling a method of the output stream to write
         each item, in the order that they appear in the SQL definition of the type.
-        Specifically, it must call the appropriate
+        Specifically, it must call the appropriate 
         <code>XSQLOutput.writeXXX</code>
         method(s) to do the following:<br>
         for a Distinct Type, write its single data element;
@@ -130,17 +130,17 @@ published interface XSQLData: com::sun::star::uno::XInterface
         </p>
         @param stream
             the output SQL data stream
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
         @see com::sun::star::sdbc::XSQLOutput
      */
-    void writeSQL([in]XSQLOutput stream) raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void writeSQL([in]XSQLOutput stream) raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XSQLInput.idl b/offapi/com/sun/star/sdbc/XSQLInput.idl
index 4ae68b82aa6d..dcd5df6ba8f3 100644
--- a/offapi/com/sun/star/sdbc/XSQLInput.idl
+++ b/offapi/com/sun/star/sdbc/XSQLInput.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XSQLInput_idl__
-#define __com_sun_star_sdbc_XSQLInput_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_Date_idl__
-#include <com/sun/star/util/Date.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
-#include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_util_Time_idl__
-#include <com/sun/star/util/Time.idl>
-#endif
-
- module com {  module sun {  module star {  module io {
- published interface XInputStream;
-};};};};
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XRef;
- published interface XArray;
- published interface XBlob;
- published interface XClob;
-
-
+#ifndef __com_sun_star_sdbc_XSQLInput_idl__ 
+#define __com_sun_star_sdbc_XSQLInput_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_Date_idl__ 
+#include <com/sun/star/util/Date.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_DateTime_idl__ 
+#include <com/sun/star/util/DateTime.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_Time_idl__ 
+#include <com/sun/star/util/Time.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module io { 
+ published interface XInputStream; 
+};};};}; 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XRef; 
+ published interface XArray; 
+ published interface XBlob; 
+ published interface XClob; 
+ 
+ 
 /** represents an input stream that contains a stream of values representing an
     instance of a SQL structured or distinct type.
-
-
+    
+    
     <p>
     This interface, used only for custom mapping, is used by the driver
     behind the scenes, and a programmer never directly invokes
@@ -70,164 +70,164 @@
     methods.
     </p>
     <p>
-    When the method
+    When the method 
     <code>getObject</code>
-    is called with an object of a service implementing the interface
+    is called with an object of a service implementing the interface 
     <code>SQLData</code>
-    , the SDBC driver calls the method
+    , the SDBC driver calls the method 
     <member scope="com::sun::star::sdbc">XSQLData::getSQLType()</member>
     to determine the SQL type of the user-defined type (UDT) being custom mapped.
-    The driver creates an instance of
+    The driver creates an instance of 
     <type scope="com::sun::star::sdbc">XSQLInput</type>
     ,
     populating it with the attributes of the UDT. The driver then passes the input
-    stream to the method
+    stream to the method 
     <member scope="com::sun::star::sdbc">XSQLData::readSQL()</member>
-    , which in turn calls the
+    , which in turn calls the 
     <code>XSQLInput.readXXX</code>
     methods in its implementation for reading the attributes from the input stream.
     </p>
  */
 published interface XSQLInput: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** reads the next attribute in the stream as string.
         @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string readString() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    string readString() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** reads the next attribute in the stream as boolean.
         @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean readBoolean() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean readBoolean() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** reads the next attribute in the stream as byte.
         @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    byte readByte() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    byte readByte() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** reads the next attribute in the stream as short.
         @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    short readShort() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    short readShort() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** reads the next attribute in the stream as long.
         @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long readInt() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long readInt() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** reads the next attribute in the stream as hyper.
         @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    hyper readLong() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    hyper readLong() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** reads the next attribute in the stream as float.
         @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    float readFloat() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    float readFloat() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** reads the next attribute in the stream as double.
         @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    double readDouble() raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /** reads the next attribute in the stream as sequence of bytes.
+    double readDouble() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** reads the next attribute in the stream as sequence of bytes. 
                  @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    sequence<byte> readBytes() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    sequence<byte> readBytes() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** reads the next attribute in the stream as date.
         @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    com::sun::star::util::Date readDate() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    com::sun::star::util::Date readDate() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** reads the next attribute in the stream as time.
         @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    com::sun::star::util::Time readTime() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    com::sun::star::util::Time readTime() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** reads the next attribute in the stream as datetime.
         @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    com::sun::star::util::DateTime readTimestamp() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    com::sun::star::util::DateTime readTimestamp() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** reads the next attribute in the stream as sequence of bytes.
         @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    com::sun::star::io::XInputStream readBinaryStream() raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    com::sun::star::io::XInputStream readBinaryStream() raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** reads the next attribute in the stream as a unicode string.
         @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    com::sun::star::io::XInputStream readCharacterStream() raises (SQLException);
-       //-------------------------------------------------------------------------
-
+    com::sun::star::io::XInputStream readCharacterStream() raises (SQLException); 
+       //------------------------------------------------------------------------- 
+     
     /** returns the datum at the head of the stream as an any.
-
-
+        
+        
         <p>
         The actual type of the any returned is determined by the default
         type mapping, and any customizations present in this stream's type map.
-
+        
         <br/>
         A type map is registered with the stream by the SDBC driver before the
         stream is passed to the application.
-
+        
         <br/>
         When the datum at the head of the stream is a SQL NULL,
         the method returns <void/>. If the datum is a SQL structured or distinct
@@ -236,65 +236,65 @@ published interface XSQLInput: com::sun::star::uno::XInterface
         <member scope="com::sun::star::sdbc">XSQLData::readSQL()</member>
         on that object, which reads additional data
         from the stream using the protocol described for that method.
-
+        
         </p>
         @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    any readObject() raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    any readObject() raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** reads a REF(&amp;lt;structured-type&amp;gt;) from the stream.
         @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XRef readRef() raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    XRef readRef() raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** reads a BLOB from the stream.
         @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XBlob readBlob() raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    XBlob readBlob() raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** reads a CLOB from the stream.
         @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XClob readClob() raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    XClob readClob() raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** reads an array from the stream.
         @returns
             the attribute; if the value is SQL NULL, return null.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XArray readArray() raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    XArray readArray() raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** determines whether the last value read was null.
         @returns
             <TRUE/> if the most recently gotten SQL value was null; otherwise, <FALSE/>
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean wasNull() raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    boolean wasNull() raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XSQLOutput.idl b/offapi/com/sun/star/sdbc/XSQLOutput.idl
index e383dbbfe0b4..ccda8d7441a3 100644
--- a/offapi/com/sun/star/sdbc/XSQLOutput.idl
+++ b/offapi/com/sun/star/sdbc/XSQLOutput.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,287 +24,287 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XSQLOutput_idl__
-#define __com_sun_star_sdbc_XSQLOutput_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_Date_idl__
-#include <com/sun/star/util/Date.idl>
-#endif
-
-#ifndef __com_sun_star_util_DateTime_idl__
-#include <com/sun/star/util/DateTime.idl>
-#endif
-
-#ifndef __com_sun_star_util_Time_idl__
-#include <com/sun/star/util/Time.idl>
-#endif
-
- module com {  module sun {  module star {  module io {
- published interface XInputStream;
-};};};};
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XRef;
- published interface XArray;
- published interface XBlob;
- published interface XClob;
- published interface XStruct;
- published interface XSQLData;
-
-
+#ifndef __com_sun_star_sdbc_XSQLOutput_idl__ 
+#define __com_sun_star_sdbc_XSQLOutput_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_Date_idl__ 
+#include <com/sun/star/util/Date.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_DateTime_idl__ 
+#include <com/sun/star/util/DateTime.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_Time_idl__ 
+#include <com/sun/star/util/Time.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module io { 
+ published interface XInputStream; 
+};};};}; 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XRef; 
+ published interface XArray; 
+ published interface XBlob; 
+ published interface XClob; 
+ published interface XStruct; 
+ published interface XSQLData; 
+ 
+ 
 /** is used as an output stream for writing the attributes of a user-defined
     type back to the database.  This interface, used only for custom mapping,
     is used by the driver, and its methods are never directly invoked
     by a programmer.
-
-
+    
+    
     <p>
-    When an object of a class implementing interface
+    When an object of a class implementing interface 
     <type scope="com::sun::star::sdbc">XSQLData</type>
     is passed as an argument to a SQL statement, the JDBC driver calls
     <method scope="com::sun::star::sdbc">SQLData::getSQLType</method>
     to determine the kind of SQL datum being passed to the database.
     <br/>
-    The driver then creates an instance of
+    The driver then creates an instance of 
     <code>XSQLOutput</code>
-    and passes it to the method
+    and passes it to the method 
     <method scope="com::sun::star::sdbc">XSQLData::writeSQL</method>
-    . The method
+    . The method 
     <code>writeSQL</code>
-    in turn calls the appropriate
+    in turn calls the appropriate 
     <code>XSQLOutput.writeXXX</code>
-    methods to write data from the
+    methods to write data from the 
     <type scope="com::sun::star::sdbc">XSQLData</type>
-    object to the
+    object to the 
     <code>XSQLOutput</code>
     output stream as the representation of a SQL user-defined type.</p>
  */
 published interface XSQLOutput: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** writes the next attribute to the stream as a string.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeString([in]string x) raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    void writeString([in]string x) raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** writes the next attribute to the stream as boolean.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeBoolean([in]boolean x) raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    void writeBoolean([in]boolean x) raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** writes the next attribute to the stream as byte.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeByte([in]byte x) raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    void writeByte([in]byte x) raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** writes the next attribute to the stream as short.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeShort([in]short x) raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    void writeShort([in]short x) raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** writes the next attribute to the stream as long.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeInt([in]long x) raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    void writeInt([in]long x) raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** writes the next attribute to the stream as hyper.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeLong([in]hyper x) raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    void writeLong([in]hyper x) raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** writes the next attribute to the stream as float.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeFloat([in]float x) raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    void writeFloat([in]float x) raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** writes the next attribute to the stream as double.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeDouble([in]double x) raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    void writeDouble([in]double x) raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** writes the next attribute to the stream as byte sequence.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeBytes([in]sequence<byte> x) raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    void writeBytes([in]sequence<byte> x) raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** writes the next attribute to the stream as a date.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeDate([in]com::sun::star::util::Date x) raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    void writeDate([in]com::sun::star::util::Date x) raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** writes the next attribute to the stream as a time.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeTime([in]com::sun::star::util::Time x) raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    void writeTime([in]com::sun::star::util::Time x) raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** writes the next attribute to the stream as a datetime.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeTimestamp([in]com::sun::star::util::DateTime x)
-        raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    void writeTimestamp([in]com::sun::star::util::DateTime x) 
+        raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** writes the next attribute to the stream as a stream of uninterpreted
         bytes.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeBinaryStream([in]com::sun::star::io::XInputStream x)
-        raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    void writeBinaryStream([in]com::sun::star::io::XInputStream x) 
+        raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** writes the next attribute to the stream as a stream of unicode string.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeCharacterStream([in]com::sun::star::io::XInputStream x)
-        raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void writeCharacterStream([in]com::sun::star::io::XInputStream x) 
+        raises (SQLException); 
+    //------------------------------------------------------------------------- 
+        
     /** writes to the stream the data contained in the given
         <code>XSQLData</code> object.
-
-
+        
+        
         <p
-        >When the
+        >When the 
         <code>XSQLData</code>
-        object is
+        object is 
         <NULL/>
         , this method writes an SQL NULL to the stream.
-        Otherwise, it calls the
+        Otherwise, it calls the 
         <member scope="com::sun::star::sdbc">XSQLData::writeSQL()</member>
         method of the given object, which
         writes the object's attributes to the stream.
-        The implementation of the method
+        The implementation of the method 
         <code>XSQLData::writeSQL()</code>
-        calls the appropriate
+        calls the appropriate 
         <code>XSQLOutput.writeXXX</code>
         method(s) for writing each of the object's attributes in order.
         <br/>
-        The attributes must be read from an
+        The attributes must be read from an 
         <type scope="com::sun::star::sdbc">XSQLInput</type>
-        input stream and written to an
+        input stream and written to an 
         <code>XSQLOutput</code>
         output stream in the same order in which they were
         listed in the SQL definition of the user-defined type.
         </p>
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeObject([in]XSQLData x) raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    void writeObject([in]XSQLData x) raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** writes a REF(&amp;lt;structured-type&amp;gt;) to the stream.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeRef([in]XRef x) raises (SQLException);
-      //-------------------------------------------------------------------------
-
+    void writeRef([in]XRef x) raises (SQLException); 
+      //------------------------------------------------------------------------- 
+     
     /** writes a BLOB to the stream.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeBlob([in]XBlob x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void writeBlob([in]XBlob x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+       
     /** writes a CLOB to the stream.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeClob([in]XClob x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void writeClob([in]XClob x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+       
     /** writes a structured-type to the stream.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeStruct([in]XStruct x) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    void writeStruct([in]XStruct x) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+       
     /** writes an array to the stream.
         @param x
             the value to pass to the database.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    void writeArray([in]XArray x) raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void writeArray([in]XArray x) raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XStatement.idl b/offapi/com/sun/star/sdbc/XStatement.idl
index c07288c00c85..3255ff4115d5 100644
--- a/offapi/com/sun/star/sdbc/XStatement.idl
+++ b/offapi/com/sun/star/sdbc/XStatement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,52 +24,52 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XStatement_idl__
-#define __com_sun_star_sdbc_XStatement_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
- published interface XConnection;
- published interface XResultSet;
-
-
+#ifndef __com_sun_star_sdbc_XStatement_idl__ 
+#define __com_sun_star_sdbc_XStatement_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ published interface XConnection; 
+ published interface XResultSet; 
+ 
+ 
 /** is used for executing a static SQL statement and obtaining the results
     produced by it.
-
-
-
+    
+    
+    
     <p>
     Only one ResultSet per Statement can be open at any point in
     time; therefore, if the reading of one ResultSet is interleaved
     with the reading of another, each must have been generated by
-    different Statements. All statement
+    different Statements. All statement 
     <code>execute</code>
     methods implicitly
     close a statement's current ResultSet if an open one exists.
     </p>
  */
 published interface XStatement: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** executes a SQL statement that returns a single ResultSet.
         @param sql
             the SQL statement which should be executed
         @returns
             a ResultSet that contains the data produced by the query; never <NULL/>
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XResultSet executeQuery([in]string sql) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    XResultSet executeQuery([in]string sql) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** executes an SQL INSERT, UPDATE, or DELETE statement. In addition,
         SQL statements that return nothing, such as SQL DDL statements,
         can be executed.
@@ -78,15 +78,15 @@ published interface XStatement: com::sun::star::uno::XInterface
             a SQL INSERT, UPDATE or DELETE statement or a SQL statement that returns nothing
         @returns
             either the row count for INSERT, UPDATE or DELETE or 0 for SQL statements that return nothing
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    long executeUpdate([in]string sql) raises (SQLException);
-    //-------------------------------------------------------------------------
-
+    long executeUpdate([in]string sql) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** executes a SQL statement that may return multiple results.
-
-
+        
+        
         <p>
         Under some (uncommon) situations a single SQL statement may return
         multiple result sets and/or update counts. Normally you can ignore
@@ -96,10 +96,10 @@ published interface XStatement: com::sun::star::uno::XInterface
         <type scope="com::sun::star::sdbc">XMultipleResults</type>.
         </p>
         <p>
-        The
+        The 
         <code>execute</code>
         method executes a SQL statement and indicates
-        the form of the first result. You can then use
+        the form of the first result. You can then use 
         <member scope="com::sun::star::sdbc">XStatement::getResultSet()</member>
         or
         <member scope="com::sun::star::sdbc">XStatement::getUpdateCount()</member>
@@ -112,31 +112,31 @@ published interface XStatement: com::sun::star::uno::XInterface
             any SQL statement
         @returns
             <TRUE/> if the next result is a ResultSet; <FALSE/> if it is an update count or there are no more results
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    boolean execute([in]string sql) raises (SQLException);
-    //-------------------------------------------------------------------------
-
-    /** returns the
+    boolean execute([in]string sql) raises (SQLException); 
+    //------------------------------------------------------------------------- 
+     
+    /** returns the 
         <type scope="com::sun::star::sdbc">Connection</type>
         object
-        that produced this
+        that produced this 
         <code>Statement</code>
         object.
         @returns
             the connection that produced this statement
 
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    XConnection getConnection() raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    XConnection getConnection() raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XStruct.idl b/offapi/com/sun/star/sdbc/XStruct.idl
index a31535decf46..99f2610c199c 100644
--- a/offapi/com/sun/star/sdbc/XStruct.idl
+++ b/offapi/com/sun/star/sdbc/XStruct.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,88 +24,88 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XStruct_idl__
-#define __com_sun_star_sdbc_XStruct_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
- module com {  module sun {  module star {  module container {
- published interface XNameAccess;
-};};};};
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_XStruct_idl__ 
+#define __com_sun_star_sdbc_XStruct_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module container { 
+ published interface XNameAccess; 
+};};};}; 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** is used for the standard mapping for a SQL structured type.
-
-
+    
+    
     <p>
-    A
+    A 
     <code>Struct</code>
     object contains a value for each attribute
     of the SQL structured type that it represents.
-    By default, an instance of
+    By default, an instance of 
     <code>Struct</code>
     is valid as long as the
     application has a reference to it.
     </p>
  */
 published interface XStruct: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** retrieves the SQL type name of the SQL structured type
-        that this
+        that this 
         <code>Struct</code>
         object represents.
         @returns
             the name of the SQL type.
-        @throws SQLException
+        @throws SQLException 
             if a database access error occurs.
      */
-    string getSQLTypeName() raises (SQLException);
-
-      //-------------------------------------------------------------------------
-
-    /** produces the ordered values of the attributes of the SQL
-             structured type that this
+    string getSQLTypeName() raises (SQLException); 
+ 
+      //------------------------------------------------------------------------- 
+     
+    /** produces the ordered values of the attributes of the SQL 
+             structured type that this 
              <code>Struct</code>
-             object represents.
+             object represents. 
              <p>
-             This method uses the given type map for customizations of the type
-             mappings. If there is no entry in the given type map that matches or
-             the given type map is
+             This method uses the given type map for customizations of the type 
+             mappings. If there is no entry in the given type map that matches or 
+             the given type map is 
              <NULL/>
-             , the structured type that this
+             , the structured type that this 
              <code>Struct</code>
-             object represents, the driver uses
-             the connection type mapping.
-             @param typeMap
-                is a map object that contains mappings of SQL type names to
-                services. If the
+             object represents, the driver uses 
+             the connection type mapping. 
+             @param typeMap 
+                is a map object that contains mappings of SQL type names to 
+                services. If the 
                 <code>typeMap</code>is
                 <NULL/>
-                , the type-map
-                   associated with the connection for customizations of the type-mappings
-                is used.
-             @returns
-                an array containing the ordered attribute values.
-             @throws SQLException
+                , the type-map 
+                   associated with the connection for customizations of the type-mappings 
+                is used. 
+             @returns 
+                an array containing the ordered attribute values. 
+             @throws SQLException 
                 if a database access error occurs.
      */
-    sequence<any> getAttributes([in]com::sun::star::container::XNameAccess typeMap)
-        raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    sequence<any> getAttributes([in]com::sun::star::container::XNameAccess typeMap) 
+        raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbc/XWarningsSupplier.idl b/offapi/com/sun/star/sdbc/XWarningsSupplier.idl
index c19f977a8273..d0754611c007 100644
--- a/offapi/com/sun/star/sdbc/XWarningsSupplier.idl
+++ b/offapi/com/sun/star/sdbc/XWarningsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,61 +24,61 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbc_XWarningsSupplier_idl__
-#define __com_sun_star_sdbc_XWarningsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLWarning_idl__
-#include <com/sun/star/sdbc/SQLWarning.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
-
-
+#ifndef __com_sun_star_sdbc_XWarningsSupplier_idl__ 
+#define __com_sun_star_sdbc_XWarningsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLWarning_idl__ 
+#include <com/sun/star/sdbc/SQLWarning.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ 
+ 
 /** should be implemented of objects which may report warnings or non critical
     errors.
     @see com::sun::star::sdbc::SQLWarning
  */
 published interface XWarningsSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the first warning reported by calls on an object that supports
         the usage of warnings.
-
+        
         <p>
         <b>Note:</b> Subsequent warnings will be chained to this
         <type scope="com::sun::star::sdbc">SQLWarning</type>
-        .
+        .		
         </p>
         @returns
             the warnings
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    any getWarnings() raises (SQLException);
-
-    //-------------------------------------------------------------------------
-
+    any getWarnings() raises (SQLException); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** clears all warnings reported for the object implementing the interface.
-        After a call to this method, the method
+        After a call to this method, the method 
         <member scope="com::sun::star::sdbc">XWarningsSupplier::getWarnings()</member>
-        returns
+        returns 
         <void/>
         until a new warning is reported for the object.
-        @throws SQLException
+        @throws SQLException 
                 if a database access error occurs.
      */
-    void clearWarnings() raises (SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void clearWarnings() raises (SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/CheckOption.idl b/offapi/com/sun/star/sdbcx/CheckOption.idl
index a2bc26d6e002..f4fd051d7c64 100644
--- a/offapi/com/sun/star/sdbcx/CheckOption.idl
+++ b/offapi/com/sun/star/sdbcx/CheckOption.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_CheckOption_idl__
-#define __com_sun_star_sdbcx_CheckOption_idl__
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_CheckOption_idl__ 
+#define __com_sun_star_sdbcx_CheckOption_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** determines the check option for a view.
  */
 published constants CheckOption
-{
-
-    /** indicates that no value checking is applied during updates of
+{ 
+     
+    /** indicates that no value checking is applied during updates of 
              view data.
      */
-    const long NONE = 0;
-    //-------------------------------------------------------------------------
-
-    /** indicates that the value checking is applied for the view and all base
+    const long NONE	= 0; 
+    //------------------------------------------------------------------------- 
+     
+    /** indicates that the value checking is applied for the view and all base 
              views.
      */
-    const long CASCADE = 2;
-    //-------------------------------------------------------------------------
-
+    const long CASCADE = 2; 
+    //------------------------------------------------------------------------- 
+     
     /** indicates that the value checking is applied only for the view.
      */
-    const long LOCAL = 3;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long LOCAL = 3; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/Column.idl b/offapi/com/sun/star/sdbcx/Column.idl
index fd2fa91c6e3e..4cd6f60490b7 100644
--- a/offapi/com/sun/star/sdbcx/Column.idl
+++ b/offapi/com/sun/star/sdbcx/Column.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_Column_idl__
-#define __com_sun_star_sdbcx_Column_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
- published interface XDataDescriptorFactory;
-
-
+#ifndef __com_sun_star_sdbcx_Column_idl__ 
+#define __com_sun_star_sdbcx_Column_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ published interface XDataDescriptorFactory; 
+ 
+ 
 /** describes the common properties of a database column.
  */
 published service Column
-{
-
+{ 
+     
     /** optional, could be used to copy a database column.
      */
-    [optional] interface XDataDescriptorFactory;
-
+    [optional] interface XDataDescriptorFactory; 
+ 
     // gives access to the properties.
-    interface com::sun::star::beans::XPropertySet;
-
-
+    interface com::sun::star::beans::XPropertySet; 
+ 
+     
     /** is the name of the column.
      */
-    [readonly, property] string Name;
-
-
-    /** is the
+    [readonly, property] string Name; 
+ 
+     
+    /** is the 
         <type scope="com::sun::star::sdbc">DataType</type>
         of the column.
      */
-    [readonly, property] long Type;
-
-
+    [readonly, property] long Type; 
+ 
+     
     /** is the type name used by the database. If the column type is
         a user-defined type, then a fully-qualified type name is returned.
         <b>
@@ -68,58 +68,58 @@ published service Column
         </b>
         May be empty.
      */
-    [readonly, property] string TypeName;
-
-
+    [readonly, property] string TypeName; 
+ 
+     
     /** gets a column's number of decimal digits.
      */
-    [readonly, property] long Precision;
-
-
+    [readonly, property] long Precision; 
+ 
+     
     /** gets a column's number of digits to right of the decimal point.
      */
-    [readonly, property] long Scale;
-
-
+    [readonly, property] long Scale; 
+ 
+     
     /** indicates the nullability of values in the designated column.
         @see com::sun::star::sdbc::ColumnValue
      */
-    [readonly, property] long IsNullable;
-
-
+    [readonly, property] long IsNullable; 
+ 
+     
     /** indicates whether the column is automatically numbered, thus read-only.
         @see com::sun::star::sdbc::ColumnValue
      */
-    [readonly, property] boolean IsAutoIncrement;
-
-
+    [readonly, property] boolean IsAutoIncrement; 
+ 
+     
     /** indicates whether the column is a cash value.
      */
-    [readonly, property] boolean IsCurrency;
-
-
-
+    [readonly, property] boolean IsCurrency; 
+ 
+     
+ 
     /** indicates that the column contains some kind of time or date stamp
-        used to track updates.
+        used to track updates. 
      */
-    [optional, readonly, property] boolean IsRowVersion;
-
-
+    [optional, readonly, property] boolean IsRowVersion; 
+ 
+     
     /** keeps a description of the object.
      */
-    [optional, readonly, property] string Description;
-
-
+    [optional, readonly, property] string Description; 
+ 
+     
     /** keeps a default value for a column, is provided as string.
      */
-    [optional, readonly, property] string DefaultValue;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [optional, readonly, property] string DefaultValue; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/ColumnDescriptor.idl b/offapi/com/sun/star/sdbcx/ColumnDescriptor.idl
index 03d1b6c81204..dc46ec4c07b1 100644
--- a/offapi/com/sun/star/sdbcx/ColumnDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/ColumnDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,84 +24,84 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_ColumnDescriptor_idl__
-#define __com_sun_star_sdbcx_ColumnDescriptor_idl__
-
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
-#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_ColumnDescriptor_idl__ 
+#define __com_sun_star_sdbcx_ColumnDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
+#include <com/sun/star/sdbcx/Descriptor.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** describes the common properties of a database column. Could be used for the creation
     of a database columns within a table.
-    @see com::sun::star::sdbcx::Column
+    @see com::sun::star::sdbcx::Column 
     @see com::sun::star::sdbcx::Table
  */
 published service ColumnDescriptor
-{
-    service com::sun::star::sdbcx::Descriptor;
-
-
-    /** is the
+{ 
+    service com::sun::star::sdbcx::Descriptor;	 
+ 
+     
+    /** is the 
         <type scope="com::sun::star::sdbc">DataType</type>
         of the column.
      */
-    [property] long Type;
-
-
+    [property] long Type; 
+ 
+     
     /** is the type name used by the database. If the column type is
         a user-defined type, then a fully-qualified type name is returned.
         May be empty.
      */
-    [property] string TypeName;
-
-
+    [property] string TypeName; 
+ 
+     
     /** gets a column's number of decimal digits.
      */
-    [property] long Precision;
-
-
+    [property] long Precision; 
+ 
+     
     /** gets a column's number of digits to right of the decimal point.
      */
-    [property] long Scale;
-
-
+    [property] long Scale; 
+ 
+     
     /** indicates the nullability of values in the designated column.
         @see com::sun::star::sdbc::ColumnValue
      */
-    [property] long IsNullable;
-
-
+    [property] long IsNullable; 
+ 
+     
     /** indicates whether the column is automatically numbered, thus read-only.
         @see com::sun::star::sdbc::ColumnValue
      */
-    [property] boolean IsAutoIncrement;
-
-
+    [property] boolean IsAutoIncrement; 
+ 
+     
     /** indicates that the column contains some kind of time or date stamp
         used to track updates.
      */
-    [optional, property] boolean IsRowVersion;
-
-
+    [optional, property] boolean IsRowVersion; 
+ 
+     
     /** keeps a description of the object.
      */
-    [optional, property] string Description;
-
-
+    [optional, property] string Description; 
+ 
+     
     /** keeps a default value for a column, is provided as string.
      */
-    [optional, property] string DefaultValue;
+    [optional, property] string DefaultValue; 
 
     /** specifies how to create an autoincrement column.
      */
-    [optional, property] string AutoIncrementCreation;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [optional, property] string AutoIncrementCreation;  
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/CompareBookmark.idl b/offapi/com/sun/star/sdbcx/CompareBookmark.idl
index 383f3b45554d..3f1e4f848b0c 100644
--- a/offapi/com/sun/star/sdbcx/CompareBookmark.idl
+++ b/offapi/com/sun/star/sdbcx/CompareBookmark.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_CompareBookmark_idl__
-#define __com_sun_star_sdbcx_CompareBookmark_idl__
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_CompareBookmark_idl__ 
+#define __com_sun_star_sdbcx_CompareBookmark_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** describes the result of a comparision of two bookmarks.
  */
 published constants CompareBookmark
-{
-
+{ 
+     
     /** the first bookmark is before the second.
      */
-    const long LESS = -1;
-
-
+    const long LESS = -1; 
+ 
+     
     /** the first bookmark is equal to the second.
      */
-    const long EQUAL = 0;
-
-
+    const long EQUAL = 0; 
+ 
+     
     /** the first bookmark is after the second one.
      */
-    const long GREATER = 1;
-
-
+    const long GREATER = 1; 
+ 
+     
     /** the first bookmark is not the same as the second one.
      */
-    const long NOT_EQUAL = 2;
-
-
+    const long NOT_EQUAL = 2; 
+ 
+     
     /** the two bookmarks are not comparable.
      */
-    const long NOT_COMPARABLE = 3;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long NOT_COMPARABLE = 3; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/Container.idl b/offapi/com/sun/star/sdbcx/Container.idl
index df346d0c2907..bcda6d794b2d 100644
--- a/offapi/com/sun/star/sdbcx/Container.idl
+++ b/offapi/com/sun/star/sdbcx/Container.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_Container_idl__
-#define __com_sun_star_sdbcx_Container_idl__
-
- module com {  module sun {  module star {  module container {
- published interface XNameAccess;
- published interface XIndexAccess;
- published interface XEnumerationAccess;
-};};};};
-
- module com {  module sun {  module star {  module util {
- published interface XRefreshable;
-};};};};
-
- module com {  module sun {  module star {  module sdbcx {
-
- published interface XDataDescriptorFactory;
- published interface XAppend;
- published interface XDrop;
-
-
+#ifndef __com_sun_star_sdbcx_Container_idl__ 
+#define __com_sun_star_sdbcx_Container_idl__ 
+ 
+ module com {  module sun {  module star {  module container { 
+ published interface XNameAccess; 
+ published interface XIndexAccess; 
+ published interface XEnumerationAccess; 
+};};};}; 
+ 
+ module com {  module sun {  module star {  module util { 
+ published interface XRefreshable; 
+};};};}; 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ published interface XDataDescriptorFactory; 
+ published interface XAppend; 
+ published interface XDrop; 
+ 
+ 
 /** describes every container which is used for data definition. Each
     container must support access to its elements by the element's name or
-    by the element's position.
-
+    by the element's position.	
+    
     <p>
     Simple enumeration must be supported as well.
     </p>
@@ -62,40 +62,40 @@
     </p>
  */
 published service Container
-{
+{ 
     // gives access to the elements by name.
-    interface com::sun::star::container::XNameAccess;
-
+    interface com::sun::star::container::XNameAccess; 
+    
     // gives access to the elements by index.
-    interface com::sun::star::container::XIndexAccess;
-
+    interface com::sun::star::container::XIndexAccess; 
+    
     // used to create an enumeration of the elements.
-    interface com::sun::star::container::XEnumerationAccess;
-
-
-    /** is optional for implementation. Used to reflect changes.
+    interface com::sun::star::container::XEnumerationAccess; 
+ 
+     
+    /** is optional for implementation. Used to reflect changes. 
      */
-    [optional] interface com::sun::star::util::XRefreshable;
-
+    [optional] interface com::sun::star::util::XRefreshable; 
+     
     /** optional for implementation. Allows to create descriptor elements which then could be used to append new elements.
      */
-    [optional] interface XDataDescriptorFactory;
-
-    /** optional for implementation, provides the possibility of adding
+    [optional] interface XDataDescriptorFactory; 
+     
+    /** optional for implementation, provides the possibility of adding 
                 a new element to the container.
      */
-    [optional] interface XAppend;
-
-    /** optional for implementation, provides the possibility of dropping
+    [optional] interface XAppend; 
+     
+    /** optional for implementation, provides the possibility of dropping 
                 an element from the container.
      */
-    [optional] interface XDrop;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [optional] interface XDrop; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/DatabaseDefinition.idl b/offapi/com/sun/star/sdbcx/DatabaseDefinition.idl
index 7ba296809655..bd293ef35ff0 100644
--- a/offapi/com/sun/star/sdbcx/DatabaseDefinition.idl
+++ b/offapi/com/sun/star/sdbcx/DatabaseDefinition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,21 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_DatabaseDefinition_idl__
-#define __com_sun_star_sdbcx_DatabaseDefinition_idl__
-
- module com {  module sun {  module star {  module sdbcx {
-
- published interface XTablesSupplier;
- published interface XViewsSupplier;
- published interface XUsersSupplier;
- published interface XGroupsSupplier;
-
-
+#ifndef __com_sun_star_sdbcx_DatabaseDefinition_idl__ 
+#define __com_sun_star_sdbcx_DatabaseDefinition_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ published interface XTablesSupplier; 
+ published interface XViewsSupplier; 
+ published interface XUsersSupplier; 
+ published interface XGroupsSupplier; 
+ 
+ 
 /** could be used as an extension for performing data definition tasks on
     databases, and to control the access rights on database objects.
-
-
+    
+    
     <p>
     It may be implemented by a database driver provider, to encapsulate the
     complexity of data definition, and to give a common way for data definition as
@@ -54,27 +54,27 @@
     </p>
  */
 published service DatabaseDefinition
-{
+{ 
     // gives access to the tables.
-    interface XTablesSupplier;
-
+    interface XTablesSupplier; 
+     
     /** The implementation is optional.
      */
-    [optional] interface XViewsSupplier;
-
+    [optional] interface XViewsSupplier; 
+     
     /** The implementation is optional.
      */
-    [optional] interface XUsersSupplier;
-
+    [optional] interface XUsersSupplier; 
+     
     /** The implementation is optional.
      */
-    [optional] interface XGroupsSupplier;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [optional] interface XGroupsSupplier; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/Descriptor.idl b/offapi/com/sun/star/sdbcx/Descriptor.idl
index 0dba8ade4e3c..428b5df84a9d 100644
--- a/offapi/com/sun/star/sdbcx/Descriptor.idl
+++ b/offapi/com/sun/star/sdbcx/Descriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
-#define __com_sun_star_sdbcx_Descriptor_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
+#define __com_sun_star_sdbcx_Descriptor_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** is used to create a new object within a database.
-
+    
     <p>
     A descriptor is commonly created by the container of a specific object, such as, tables or views.
     After the creation of the descriptor the properties have to be filled.
@@ -48,20 +48,20 @@
     @see com::sun::star::sdbcx::XAppend
  */
 published service Descriptor
-{
+{ 
     // gives access to the properties.
-    interface com::sun::star::beans::XPropertySet;
-
-
+    interface com::sun::star::beans::XPropertySet; 
+ 
+     
     /** is the name for the object to create.
      */
-    [property] string Name;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [property] string Name; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/Driver.idl b/offapi/com/sun/star/sdbcx/Driver.idl
index 0388a4f3e063..7ab5f1408269 100644
--- a/offapi/com/sun/star/sdbcx/Driver.idl
+++ b/offapi/com/sun/star/sdbcx/Driver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,21 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_Driver_idl__
-#define __com_sun_star_sdbcx_Driver_idl__
-
-#ifndef __com_sun_star_sdbc_Driver_idl__
-#include <com/sun/star/sdbc/Driver.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
- published interface XDataDefinitionSupplier;
- published interface XCreateCatalog;
- published interface XDropCatalog;
-
-
-/** extends the service
+#ifndef __com_sun_star_sdbcx_Driver_idl__ 
+#define __com_sun_star_sdbcx_Driver_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_Driver_idl__ 
+#include <com/sun/star/sdbc/Driver.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ published interface XDataDefinitionSupplier; 
+ published interface XCreateCatalog; 
+ published interface XDropCatalog; 
+ 
+ 
+/** extends the service 
     <type scope="com::sun::star::sdbc">Driver</type>
     by beans for data definition.
 <p>
@@ -53,26 +53,26 @@
 </p>
  */
 published service Driver
-{
-    service com::sun::star::sdbc::Driver;
-
+{ 
+    service com::sun::star::sdbc::Driver; 
+    
     /** used to get access to the catalog.
         @see Catalog
     */
-    interface XDataDefinitionSupplier;
-
-
+    interface XDataDefinitionSupplier; 
+ 
+     
     /** is optional for implementation.
      */
-    [optional] interface XCreateCatalog;
-
+    [optional] interface XCreateCatalog; 
+     
     /** is optional for implementation.
      */
-    [optional] interface XDropCatalog;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [optional] interface XDropCatalog; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/Group.idl b/offapi/com/sun/star/sdbcx/Group.idl
index 51e528d16837..0d4394541cbf 100644
--- a/offapi/com/sun/star/sdbcx/Group.idl
+++ b/offapi/com/sun/star/sdbcx/Group.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_Group_idl__
-#define __com_sun_star_sdbcx_Group_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
- published interface XUsersSupplier;
- published interface XAuthorizable;
-
-
+#ifndef __com_sun_star_sdbcx_Group_idl__ 
+#define __com_sun_star_sdbcx_Group_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ published interface XUsersSupplier; 
+ published interface XAuthorizable; 
+ 
+ 
 /** represents a group of users, which has certain access rights for the objects
     of the database.
  */
 published service Group
-{
+{ 
     /** gives access to the users which contains to this group.
     */
-    interface XUsersSupplier;
-
+    interface XUsersSupplier; 
+    
     /** shows the access rights of this group.
     */
-    interface XAuthorizable;
-
+    interface XAuthorizable; 
+    
     // gives access to the properties.
-    interface com::sun::star::beans::XPropertySet;
-
-
+    interface com::sun::star::beans::XPropertySet; 
+ 
+     
     /** is the name of the group.
      */
-    [readonly, property] string Name;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [readonly, property] string Name; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/GroupDescriptor.idl b/offapi/com/sun/star/sdbcx/GroupDescriptor.idl
index 1b5386db3e5f..eb912f22f028 100644
--- a/offapi/com/sun/star/sdbcx/GroupDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/GroupDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_GroupDescriptor_idl__
-#define __com_sun_star_sdbcx_GroupDescriptor_idl__
-
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
-#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
- module com {  module sun {  module star {  module sdbcx {
-
+#ifndef __com_sun_star_sdbcx_GroupDescriptor_idl__ 
+#define __com_sun_star_sdbcx_GroupDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
+#include <com/sun/star/sdbcx/Descriptor.idl> 
+#endif  
+ module com {  module sun {  module star {  module sdbcx { 
+ 
 /** is used to create a new group in a database.
     @see com::sun::star::sdbcx::Group
  */
 published service GroupDescriptor
-{
-    service Descriptor;
+{ 
+    service Descriptor; 
 
     /** is the name of the group.
      */
-    [property] string Name;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [property] string Name; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/Index.idl b/offapi/com/sun/star/sdbcx/Index.idl
index 3fab8da51b63..14a5980b2c85 100644
--- a/offapi/com/sun/star/sdbcx/Index.idl
+++ b/offapi/com/sun/star/sdbcx/Index.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,19 +24,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_Index_idl__
-#define __com_sun_star_sdbcx_Index_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
- published interface XColumnsSupplier;
- published interface XDataDescriptorFactory;
-
-
+#ifndef __com_sun_star_sdbcx_Index_idl__ 
+#define __com_sun_star_sdbcx_Index_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ published interface XColumnsSupplier; 
+ published interface XDataDescriptorFactory; 
+ 
+ 
 /** is used to specify the index for a database table. It refers to one or
     more columns of a table.
     <p>
@@ -48,50 +48,50 @@
     </p>
  */
 published service Index
-{
-
+{ 
+     
     /** optional, could be used to copy an index.
      */
-    [optional] interface XDataDescriptorFactory;
-
-
+    [optional] interface XDataDescriptorFactory; 
+ 
+     
     /** access to the contained index columns.
      */
-    interface XColumnsSupplier;
-
+    interface XColumnsSupplier; 
+ 
     // gives access to the properties.
-    interface com::sun::star::beans::XPropertySet;
-
-
+    interface com::sun::star::beans::XPropertySet; 
+ 
+     
     /** is the name of the index.
      */
-    [readonly, property] string Name;
-
-
+    [readonly, property] string Name; 
+ 
+     
     /** is the name of the index catalog, may be empty.
      */
-    [readonly, property] string Catalog;
-
-
+    [readonly, property] string Catalog; 
+ 
+     
     /** indicates that the index allow only unique values.
      */
-    [readonly, property] boolean IsUnique;
-
-
+    [readonly, property] boolean IsUnique; 
+ 
+     
     /** indicates that the index is used for the primary key.
      */
-    [readonly, property] boolean IsPrimaryKeyIndex;
-
-
+    [readonly, property] boolean IsPrimaryKeyIndex; 
+ 
+     
     /** indicates that the index is clustered.
      */
-    [readonly, property] boolean IsClustered;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [readonly, property] boolean IsClustered; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/IndexColumn.idl b/offapi/com/sun/star/sdbcx/IndexColumn.idl
index 4aba576e4b38..4bb165da1b09 100644
--- a/offapi/com/sun/star/sdbcx/IndexColumn.idl
+++ b/offapi/com/sun/star/sdbcx/IndexColumn.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_IndexColumn_idl__
-#define __com_sun_star_sdbcx_IndexColumn_idl__
-
-#ifndef __com_sun_star_sdbcx_Column_idl__
-#include <com/sun/star/sdbcx/Column.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_IndexColumn_idl__ 
+#define __com_sun_star_sdbcx_IndexColumn_idl__ 
+ 
+#ifndef __com_sun_star_sdbcx_Column_idl__ 
+#include <com/sun/star/sdbcx/Column.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** adds a property to determine the sort order of the column values within the
     index. Some database drivers may ignore this property.
  */
 published service IndexColumn
-{
-    service Column;
-
-
+{ 
+    service Column; 
+ 
+     
     /** is the column sorted in ascending order.
      */
-    [readonly, property] boolean IsAscending;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [readonly, property] boolean IsAscending; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/IndexColumnDescriptor.idl b/offapi/com/sun/star/sdbcx/IndexColumnDescriptor.idl
index 7c8fb976b984..59d09c670c80 100644
--- a/offapi/com/sun/star/sdbcx/IndexColumnDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/IndexColumnDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_IndexColumnDescriptor_idl__
-#define __com_sun_star_sdbcx_IndexColumnDescriptor_idl__
-
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
-#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_IndexColumnDescriptor_idl__ 
+#define __com_sun_star_sdbcx_IndexColumnDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
+#include <com/sun/star/sdbcx/Descriptor.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** adds a property to determine the sort order of the column values within the
     index. Some database drivers may ignore this property.
  */
 published service IndexColumnDescriptor
-{
-    service Descriptor;
-
-
+{ 
+    service Descriptor; 
+ 
+     
     /** is the column sorted in ascending order.
      */
-    [property] boolean IsAscending;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [property] boolean IsAscending; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/IndexDescriptor.idl b/offapi/com/sun/star/sdbcx/IndexDescriptor.idl
index 4d7564c54abc..eaf2468e31fd 100644
--- a/offapi/com/sun/star/sdbcx/IndexDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/IndexDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_IndexDescriptor_idl__
-#define __com_sun_star_sdbcx_IndexDescriptor_idl__
-
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
-#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
- published interface XColumnsSupplier;
-
-
+#ifndef __com_sun_star_sdbcx_IndexDescriptor_idl__ 
+#define __com_sun_star_sdbcx_IndexDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
+#include <com/sun/star/sdbcx/Descriptor.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ published interface XColumnsSupplier; 
+ 
+ 
 /** is used to define a new index for a database table.
-    @see com::sun::star::sdbcx::Index
+    @see com::sun::star::sdbcx::Index				
  */
 published service IndexDescriptor
-{
-    service Descriptor;
-
-
+{ 
+    service Descriptor; 
+     
+     
     /** access to the contained index columns.
      */
-    interface XColumnsSupplier;
-
-
+    interface XColumnsSupplier;	 
+     
+     
     /** is the name of the index catalog, may be empty.
      */
-    [property] string Catalog;
-
-
+    [property] string Catalog; 
+ 
+     
     /** indicates that the index allow only unique values.
      */
-    [property] boolean IsUnique;
-
-
+    [property] boolean IsUnique; 
+ 
+     
     /** indicates that the index is clustered.
      */
-    [property] boolean IsClustered;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [property] boolean IsClustered; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/Key.idl b/offapi/com/sun/star/sdbcx/Key.idl
index f28a05933639..dde227738b2d 100644
--- a/offapi/com/sun/star/sdbcx/Key.idl
+++ b/offapi/com/sun/star/sdbcx/Key.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,70 +24,70 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_Key_idl__
-#define __com_sun_star_sdbcx_Key_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
- published interface XColumnsSupplier;
- published interface XDataDescriptorFactory;
-
-
+#ifndef __com_sun_star_sdbcx_Key_idl__ 
+#define __com_sun_star_sdbcx_Key_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ published interface XColumnsSupplier; 
+ published interface XDataDescriptorFactory; 
+ 
+ 
 /** is used to define a new key for a table.
  */
 published service Key
-{
-
+{ 
+     
     /** optional, could be used to copy a key.
      */
-    [optional] interface XDataDescriptorFactory;
-
-
+    [optional] interface XDataDescriptorFactory; 
+ 
+     
     /** access to the contained key columns.
      */
-    interface XColumnsSupplier;
-
+    interface XColumnsSupplier; 
+ 
     // gives access to the properties.
-    interface com::sun::star::beans::XPropertySet;
-
-
+    interface com::sun::star::beans::XPropertySet; 
+ 
+     
     /** is the name of the key
      */
-    [readonly, property] string Name;
-
-
+    [readonly, property] string Name; 
+ 
+     
     /** indicates the type of the key.
         @see com::sun::star::sdbcx::KeyType
      */
-    [readonly, property] long Type;
-
-
+    [readonly, property] long Type; 
+ 
+     
     /** is the name of the referenced table, only used for foreign
         keys.
      */
-    [readonly, property] string ReferencedTable;
-
-
+    [readonly, property] string ReferencedTable; 
+ 
+     
     /** is the rule which is applied for updates; only used for foreign keys.
         @see com::sun::star::sdbc::KeyRule
      */
-    [readonly, property] long UpdateRule;
-
-
+    [readonly, property] long UpdateRule; 
+ 
+     
     /** is the rule which is applied for deletions; only used for foreign keys.
         @see com::sun::star::sdbc::KeyRule
      */
-    [readonly, property] long DeleteRule;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [readonly, property] long DeleteRule; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/KeyColumn.idl b/offapi/com/sun/star/sdbcx/KeyColumn.idl
index f62c3f571206..b8f14914ef5f 100644
--- a/offapi/com/sun/star/sdbcx/KeyColumn.idl
+++ b/offapi/com/sun/star/sdbcx/KeyColumn.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,14 +35,14 @@ module com { module sun { module star { module sdbcx {
 
 /**
  adds a property to specify the referenced column. This is used to specify
- foreign keys.
-
+ foreign keys.  
+ 
  */
 published service KeyColumn
 {
     service Column;
 
-    /** is the name of a reference column out of the referenced table.
+    /** is the name of a reference column out of the referenced table. 
     */
     [readonly, property] string RelatedColumn;
 };
diff --git a/offapi/com/sun/star/sdbcx/KeyColumnDescriptor.idl b/offapi/com/sun/star/sdbcx/KeyColumnDescriptor.idl
index 4ae8ce69a27f..b11c6a15af0b 100644
--- a/offapi/com/sun/star/sdbcx/KeyColumnDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/KeyColumnDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_KeyColumnDescriptor_idl__
-#define __com_sun_star_sdbcx_KeyColumnDescriptor_idl__
-
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
-#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_KeyColumnDescriptor_idl__ 
+#define __com_sun_star_sdbcx_KeyColumnDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
+#include <com/sun/star/sdbcx/Descriptor.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** adds a property to specify the referenced column. This is used to specify
     foreign keys.
     @see com::sun::star::sdbcx::KeyColumn
  */
 published service KeyColumnDescriptor
-{
-    service Descriptor;
-
-
+{ 
+    service Descriptor; 
+ 
+     
     /** is the name of a reference column out of the referenced table.
      */
-    [property] string RelatedColumn;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [property] string RelatedColumn; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/KeyDescriptor.idl b/offapi/com/sun/star/sdbcx/KeyDescriptor.idl
index 21386156af08..f9f8d836012f 100644
--- a/offapi/com/sun/star/sdbcx/KeyDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/KeyDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,17 +43,17 @@ module com { module sun { module star { module sdbcx {
 published service KeyDescriptor
 {
     service Descriptor;
-
-    /** access to the contained key columns.
+    
+    /** access to the contained key columns. 
     */
-    interface XColumnsSupplier;
+    interface XColumnsSupplier;	
 
     /** indicates the type of the key.
         @see com::sun::star::sdbcx::KeyType
      */
     [property] long Type;
 
-    /** is the name of the referenced table, only used for foreign keys.
+    /** is the name of the referenced table, only used for foreign keys. 
     */
     [property] string ReferencedTable;
 
diff --git a/offapi/com/sun/star/sdbcx/KeyType.idl b/offapi/com/sun/star/sdbcx/KeyType.idl
index c22c29faedce..d3f2d67c98b8 100644
--- a/offapi/com/sun/star/sdbcx/KeyType.idl
+++ b/offapi/com/sun/star/sdbcx/KeyType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_KeyType_idl__
-#define __com_sun_star_sdbcx_KeyType_idl__
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_KeyType_idl__ 
+#define __com_sun_star_sdbcx_KeyType_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** determines the type of a key.
  */
 published constants KeyType
-{
-
+{ 
+     
     /** indicates that the key is the primary key of a table.
      */
-    const long PRIMARY  = 1;
-    //-------------------------------------------------------------------------
-
+    const long PRIMARY	= 1; 
+    //------------------------------------------------------------------------- 
+     
     /** indicates that the key is unique, NULL values are allowed.
      */
-    const long UNIQUE = 2;
-    //-------------------------------------------------------------------------
-
+    const long UNIQUE = 2; 
+    //------------------------------------------------------------------------- 
+     
     /** indicates that the key is a foreign key of a table.
      */
-    const long FOREIGN = 3;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long FOREIGN = 3; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/PreparedStatement.idl b/offapi/com/sun/star/sdbcx/PreparedStatement.idl
index 84458026e486..da6337df17ba 100644
--- a/offapi/com/sun/star/sdbcx/PreparedStatement.idl
+++ b/offapi/com/sun/star/sdbcx/PreparedStatement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 module com { module sun { module star { module sdbcx {
 
 /**
-    extends the definition of the service
+    extends the definition of the service 
     <type scope="com::sun::star::sdbc">PreparedStatement</type>
     with a flag for the usage of bookmarks.
     @see ResultSet
@@ -45,7 +45,7 @@ published service PreparedStatement
     service com::sun::star::sdbc::PreparedStatement;
     /**
      returns if a resultset should allow the navigation with bookmarks
-     or not. The default is
+     or not. The default is 
      <FALSE/>
      .
      */
diff --git a/offapi/com/sun/star/sdbcx/Privilege.idl b/offapi/com/sun/star/sdbcx/Privilege.idl
index f8cb811223a7..f29e59e50d10 100644
--- a/offapi/com/sun/star/sdbcx/Privilege.idl
+++ b/offapi/com/sun/star/sdbcx/Privilege.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,68 +24,68 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_Privilege_idl__
-#define __com_sun_star_sdbcx_Privilege_idl__
-
- module com {  module sun {  module star {  module sdbcx {
-
-
-/** defines a list of flags (bitmaps) which determines the accessrights of a
+#ifndef __com_sun_star_sdbcx_Privilege_idl__ 
+#define __com_sun_star_sdbcx_Privilege_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
+/** defines a list of flags (bitmaps) which determines the accessrights of a 
      user or a user group. This list may grow in the future.
  */
 published constants Privilege
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** indicates that a user is allowed to read the data.
      */
-    const long SELECT       = 0x00000001;
-    //-------------------------------------------------------------------------
-
+    const long SELECT 		= 0x00000001; 
+    //------------------------------------------------------------------------- 
+     
     /** indicates that a user is allowed to insert new data.
      */
-    const long INSERT       = 0x00000002;
-    //-------------------------------------------------------------------------
-
+    const long INSERT 		= 0x00000002; 
+    //------------------------------------------------------------------------- 
+     
     /** indicates that a user is allowed to update data.
      */
-    const long UPDATE       = 0x00000004;
-    //-------------------------------------------------------------------------
-
+    const long UPDATE 		= 0x00000004; 
+    //------------------------------------------------------------------------- 
+     
     /** indicates that a user is allowed to delete data.
      */
-    const long DELETE       = 0x00000008;
-    //-------------------------------------------------------------------------
-
+    const long DELETE 		= 0x00000008; 
+    //------------------------------------------------------------------------- 
+     
     /** indicates that a user is allowed to read the structure of a definition object.
      */
-    const long READ         = 0x00000010;
-    //-------------------------------------------------------------------------
-
+    const long READ		   	= 0x00000010; 
+    //------------------------------------------------------------------------- 
+     
     /** indicates that a user is allowed to create a definition object.
      */
-    const long CREATE       = 0x00000020;
-    //-------------------------------------------------------------------------
-
+    const long CREATE   	= 0x00000020; 
+    //------------------------------------------------------------------------- 
+     
     /** indicates that a user is allowed to alter an existing object.
      */
-    const long ALTER        = 0x00000040;
-    //-------------------------------------------------------------------------
-
+    const long ALTER   		= 0x00000040; 
+    //------------------------------------------------------------------------- 
+     
     /** indicates that a user is allowed to set foreign keys for a table.
      */
-    const long REFERENCE    = 0x00000080;
-    //-------------------------------------------------------------------------
-
+    const long REFERENCE	= 0x00000080; 
+    //------------------------------------------------------------------------- 
+     
     /** indicates that a user is allowed to drop a definition object.
      */
-    const long DROP         = 0x00000100;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long DROP   		= 0x00000100; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/PrivilegeObject.idl b/offapi/com/sun/star/sdbcx/PrivilegeObject.idl
index d627f362f21a..480a8ffaca5a 100644
--- a/offapi/com/sun/star/sdbcx/PrivilegeObject.idl
+++ b/offapi/com/sun/star/sdbcx/PrivilegeObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_PrivilegeObject_idl__
-#define __com_sun_star_sdbc_PrivilegeObject_idl__
-
- module com {  module sun {  module star {  module sdbcx {
-
-
-/** defines the list of objects for which a user may have accessrights or not.
+#ifndef __com_sun_star_sdbcx_PrivilegeObject_idl__ 
+#define __com_sun_star_sdbc_PrivilegeObject_idl__ 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
+/** defines the list of objects for which a user may have accessrights or not. 
         This list may grow in the future.
  */
 published constants PrivilegeObject
-{
-
+{ 
+     
     /** indicates a table.
      */
-    const long TABLE    = 0;
-    //-------------------------------------------------------------------------
-
+    const long TABLE   	= 0; 
+    //------------------------------------------------------------------------- 
+     
     /** indicates a view.
      */
-    const long VIEW     = 1;
-    //-------------------------------------------------------------------------
-
+    const long VIEW 	= 1; 
+    //------------------------------------------------------------------------- 
+     
     /** indicates a column of a table.
      */
-    const long COLUMN   = 2;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    const long COLUMN   = 2; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/ReferenceColumn.idl b/offapi/com/sun/star/sdbcx/ReferenceColumn.idl
index 14bc4c75e344..60daaef08eee 100644
--- a/offapi/com/sun/star/sdbcx/ReferenceColumn.idl
+++ b/offapi/com/sun/star/sdbcx/ReferenceColumn.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_ReferenceColumn_idl__
-#define __com_sun_star_sdbcx_ReferenceColumn_idl__
-
-#ifndef __com_sun_star_sdbcx_Column_idl__
-#include <com/sun/star/sdbcx/Column.idl>
-#endif
-
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_ReferenceColumn_idl__ 
+#define __com_sun_star_sdbcx_ReferenceColumn_idl__ 
+ 
+#ifndef __com_sun_star_sdbcx_Column_idl__ 
+#include <com/sun/star/sdbcx/Column.idl> 
+#endif 
+ 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** adds a property to specify the referenced column. This is used to specify
     foreign keys.
  */
 published service ReferenceColumn
-{
-    service Column;
-
-
+{ 
+    service Column; 
+ 
+     
     /** is the name of a reference column out of the referenced table.
      */
-    [readonly, property] string ReferencedColumn;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [readonly, property] string ReferencedColumn; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/ResultSet.idl b/offapi/com/sun/star/sdbcx/ResultSet.idl
index 94a9e6c1b8d7..1c083febcf76 100644
--- a/offapi/com/sun/star/sdbcx/ResultSet.idl
+++ b/offapi/com/sun/star/sdbcx/ResultSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,61 +24,61 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_ResultSet_idl__
-#define __com_sun_star_sdbcx_ResultSet_idl__
-
-#ifndef __com_sun_star_sdbc_ResultSet_idl__
-#include <com/sun/star/sdbc/ResultSet.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
- published interface XRowLocate;
- published interface XDeleteRows;
-
-
+#ifndef __com_sun_star_sdbcx_ResultSet_idl__ 
+#define __com_sun_star_sdbcx_ResultSet_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_ResultSet_idl__ 
+#include <com/sun/star/sdbc/ResultSet.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ published interface XRowLocate; 
+ published interface XDeleteRows; 
+ 
+ 
 /** extends the SDBC ResultSet by the possibility of bookmark positioning, cancelling
     the positioning, and updating of rows.
  */
 published service ResultSet
-{
-    service com::sun::star::sdbc::ResultSet;
-
-
-    /** could be used for cancelling the execution of SQL statements if both
- the DBMS and the driver support aborting of navigation commands.
+{ 
+    service com::sun::star::sdbc::ResultSet; 
+ 
+     
+    /** could be used for cancelling the execution of SQL statements if both 
+ the DBMS and the driver support aborting of navigation commands. 
  The implementation is optional.
      */
-    [optional] interface com::sun::star::util::XCancellable;
-
-
+    [optional] interface com::sun::star::util::XCancellable; 
+ 
+     
     /** is the interface for navigating on the result set by unique bookmarks.
      */
-    interface XRowLocate;
-
-
-    /** is the interface for deleting more than one row, identified by it's bookmark.
+    interface XRowLocate; 
+ 
+     
+    /** is the interface for deleting more than one row, identified by it's bookmark. 
               The implementation is optional.
      */
-    [optional] interface XDeleteRows;
-
-
+    [optional] interface XDeleteRows; 
+ 
+     
     /** returns if the resultset supports bookmark navigation.
      */
-    [readonly, property] boolean IsBookmarkable;
-
-
+    [readonly, property] boolean IsBookmarkable; 
+ 
+     
     /** returns whether the resultset supports updating of newly inserted rows.
         This may not work, as the result set may contain automatic generated data
         which is used as key information.
      */
-    [optional, readonly, property] boolean CanUpdateInsertedRows;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [optional, readonly, property] boolean CanUpdateInsertedRows; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/Statement.idl b/offapi/com/sun/star/sdbcx/Statement.idl
index 7e012db03cc5..578834a5ec36 100644
--- a/offapi/com/sun/star/sdbcx/Statement.idl
+++ b/offapi/com/sun/star/sdbcx/Statement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_Statement_idl__
-#define __com_sun_star_sdbcx_Statement_idl__
-
-#ifndef __com_sun_star_sdbc_Statement_idl__
-#include <com/sun/star/sdbc/Statement.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
-/** extends the definition of the service
+#ifndef __com_sun_star_sdbcx_Statement_idl__ 
+#define __com_sun_star_sdbcx_Statement_idl__ 
+ 
+#ifndef __com_sun_star_sdbc_Statement_idl__ 
+#include <com/sun/star/sdbc/Statement.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
+/** extends the definition of the service 
     <type scope="com::sun::star::sdbc">Statement</type>
     with a flag for the usage of bookmarks.
-    @see ResultSet
+    @see ResultSet 
     @see XRowLocate
  */
 published service Statement
-{
-    service com::sun::star::sdbc::Statement;
-
-
-    /** returns
+{ 
+    service com::sun::star::sdbc::Statement; 
+ 
+     
+    /** returns 
         <TRUE/>
-        if a resultset should allow navigation with bookmarks or not.
-        The default is
+        if a resultset should allow navigation with bookmarks or not. 
+        The default is 
         <FALSE/>
         .
      */
-    [property] boolean UseBookmarks;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [property] boolean UseBookmarks; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/Table.idl b/offapi/com/sun/star/sdbcx/Table.idl
index b5c0b25e34ca..df26c78923c5 100644
--- a/offapi/com/sun/star/sdbcx/Table.idl
+++ b/offapi/com/sun/star/sdbcx/Table.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_Table_idl__
-#define __com_sun_star_sdbcx_Table_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
- published interface XDataDescriptorFactory;
- published interface XColumnsSupplier;
- published interface XIndexesSupplier;
- published interface XKeysSupplier;
- published interface XRename;
- published interface XAlterTable;
-
-
+#ifndef __com_sun_star_sdbcx_Table_idl__ 
+#define __com_sun_star_sdbcx_Table_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ published interface XDataDescriptorFactory; 
+ published interface XColumnsSupplier; 
+ published interface XIndexesSupplier; 
+ published interface XKeysSupplier; 
+ published interface XRename; 
+ published interface XAlterTable; 
+ 
+ 
 /** used to specify a table in a database. A table is described by its
     name and one or more columns.
 
@@ -59,76 +59,76 @@
     the user's privileges.
     </p>
 
-    @see com::sun::star::sdbc::XDatabaseMetaData
+    @see com::sun::star::sdbc::XDatabaseMetaData 
     @see com::sun::star::sdbcx::Privilege
  */
 published service Table
-{
-
+{ 
+     
     /** optional, could be used to copy an table.
      */
-    [optional] interface XDataDescriptorFactory;
-
-
+    [optional] interface XDataDescriptorFactory; 
+ 
+     
     /** access to the contained table columns.
      */
-    interface XColumnsSupplier;
-
-
+    interface XColumnsSupplier; 
+ 
+     
     /** optional, provides the access of the table indexes.
      */
-    [optional] interface XIndexesSupplier;
-
-
+    [optional] interface XIndexesSupplier; 
+ 
+     
     /** optional, provides the access to the table keys.
      */
-    [optional] interface XKeysSupplier;
-
-
+    [optional] interface XKeysSupplier; 
+ 
+     
     /** optional, allows the renaming of tables.
      */
-    [optional] interface XRename;
-
-
+    [optional] interface XRename; 
+ 
+     
     /** optional, allows the altering of columns.
      */
-    [optional] interface XAlterTable;
-
+    [optional] interface XAlterTable; 
+ 
     // gives access to the properties
-    interface com::sun::star::beans::XPropertySet;
-
-
+    interface com::sun::star::beans::XPropertySet; 
+ 
+     
     /** is the name of the table.
      */
-    [readonly, property] string Name;
-
-
+    [readonly, property] string Name; 
+ 
+     
     /** is the name of the table catalog.
      */
-    [readonly, property] string CatalogName;
-
-
+    [readonly, property] string CatalogName; 
+ 
+     
     /** is the name of the table schema.
      */
-    [readonly, property] string SchemaName;
-
-
+    [readonly, property] string SchemaName; 
+ 
+     
     /** supplies a comment on the table. Could be empty, if not supported by
         the driver.
      */
-    [readonly, property] string Description;
-
-
+    [readonly, property] string Description; 
+ 
+     
     /** indicates the type of the table like (TABLE, VIEW, SYSTEM TABLE).
         Could be empty, if not supported by the driver.
      */
-    [optional, readonly, property] string Type;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [optional, readonly, property] string Type; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/TableDescriptor.idl b/offapi/com/sun/star/sdbcx/TableDescriptor.idl
index f3b14df2d953..a0cfe2a03b35 100644
--- a/offapi/com/sun/star/sdbcx/TableDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/TableDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,22 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_TableDescriptor_idl__
-#define __com_sun_star_sdbcx_TableDescriptor_idl__
-
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
-#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
- published interface XColumnsSupplier;
- published interface XKeysSupplier;
-
-
+#ifndef __com_sun_star_sdbcx_TableDescriptor_idl__ 
+#define __com_sun_star_sdbcx_TableDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
+#include <com/sun/star/sdbcx/Descriptor.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ published interface XColumnsSupplier; 
+ published interface XKeysSupplier; 
+ 
+ 
 /** is used to define a table of a database. A table is described by its
     name and one or more columns and the keys for semantic rules.
-
+    
     <p>
     In addition, it may contain keys, and to define semantic rules for the table.
     <b>
@@ -50,39 +50,39 @@
     @see com::sun::star::sdbcx::Table
  */
 published service TableDescriptor
-{
-
+{ 
+     
     /** access to the contained table columns.
      */
-    interface XColumnsSupplier;
-
-
+    interface XColumnsSupplier; 
+ 
+     
     /** optional, provides the access to the table keys.
      */
-    [optional] interface XKeysSupplier;
-
-    service Descriptor;
-
+    [optional] interface XKeysSupplier;	 
+ 
+    service Descriptor; 
+     
     /** is the name of the table catalog.
      */
-    [property] string CatalogName;
-
-
+    [property] string CatalogName; 
+ 
+     
     /** is the name of the table schema.
      */
-    [property] string SchemaName;
-
-
+    [property] string SchemaName; 
+ 
+     
     /** supplies a comment on the table, Could be emtpy if not supported by
         the driver.
      */
-    [property] string Description;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [property] string Description;	 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/User.idl b/offapi/com/sun/star/sdbcx/User.idl
index 6ffc5bfbe9a1..320092c2bfac 100644
--- a/offapi/com/sun/star/sdbcx/User.idl
+++ b/offapi/com/sun/star/sdbcx/User.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_User_idl__
-#define __com_sun_star_sdbcx_User_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
- published interface XGroupsSupplier;
- published interface XUser;
-
-
-/** represents a user of the database, who has certain access rights
+#ifndef __com_sun_star_sdbcx_User_idl__ 
+#define __com_sun_star_sdbcx_User_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ published interface XGroupsSupplier; 
+ published interface XUser; 
+ 
+ 
+/** represents a user of the database, who has certain access rights 
     for the objects of the database.
  */
 published service User
-{
+{ 
     // used to change the password.
-    interface XUser;
-
-    /** optional for implementation, if the database does not know the concept
+    interface XUser; 
+     
+    /** optional for implementation, if the database does not know the concept 
              of user groups. Provides for access to the groups to which a user belongs.
      */
-    [optional] interface XGroupsSupplier;
-
+    [optional] interface XGroupsSupplier; 
+ 
     // gives access to the properties
-    interface com::sun::star::beans::XPropertySet;
-
-
+    interface com::sun::star::beans::XPropertySet; 
+ 
+     
     /** is the name of the user.
      */
-    [readonly, property] string Name;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [readonly, property] string Name; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/UserDescriptor.idl b/offapi/com/sun/star/sdbcx/UserDescriptor.idl
index 4c9d7bbe3e55..c5673367f7df 100644
--- a/offapi/com/sun/star/sdbcx/UserDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/UserDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_UserDescriptor_idl__
-#define __com_sun_star_sdbcx_UserDescriptor_idl__
-
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
-#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_UserDescriptor_idl__ 
+#define __com_sun_star_sdbcx_UserDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
+#include <com/sun/star/sdbcx/Descriptor.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** is used to create a new user in a database.
     @see com::sun::star::sdbcx::User
  */
 published service UserDescriptor
-{
-    service Descriptor;
-
-
+{ 
+    service Descriptor; 
+ 
+     
     /** is the password for the user.
      */
-    [property] string Password;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [property] string Password;	 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/View.idl b/offapi/com/sun/star/sdbcx/View.idl
index b84fad819f92..9cd102f0f460 100644
--- a/offapi/com/sun/star/sdbcx/View.idl
+++ b/offapi/com/sun/star/sdbcx/View.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sdbcx/ViewDescriptor.idl b/offapi/com/sun/star/sdbcx/ViewDescriptor.idl
index dd481c3891d3..dd13fb4cd938 100644
--- a/offapi/com/sun/star/sdbcx/ViewDescriptor.idl
+++ b/offapi/com/sun/star/sdbcx/ViewDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_ViewDescriptor_idl__
-#define __com_sun_star_sdbcx_ViewDescriptor_idl__
-
-#ifndef __com_sun_star_sdbcx_Descriptor_idl__
-#include <com/sun/star/sdbcx/Descriptor.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_ViewDescriptor_idl__ 
+#define __com_sun_star_sdbcx_ViewDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_sdbcx_Descriptor_idl__ 
+#include <com/sun/star/sdbcx/Descriptor.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** is used to define a new view for a database.
     @see com::sun::star::sdbcx::View
  */
 published service ViewDescriptor
-{
-    service Descriptor;
-
-
+{ 
+    service Descriptor; 
+ 
+     
     /** is the name of the views catalog, may be empty.
      */
-    [property] string CatalogName;
-
-
+    [property] string CatalogName; 
+ 
+     
     /** is the name of the views schema, may be empty.
      */
-    [property] string SchemaName;
-
-
+    [property] string SchemaName; 
+ 
+     
     /** is the command for creating the view. After appending a view to it's
         container, the command may be empty. This is typically a
         SQL Select-Statement.
      */
-    [property] string Command;
-
-
+    [property] string Command; 
+ 
+     
     /** indicates if a check option should be used for the view.
         @see com::sun::star::sdbcx::CheckOption
      */
-    [property] long CheckOption;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    [property] long CheckOption; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/XAlterTable.idl b/offapi/com/sun/star/sdbcx/XAlterTable.idl
index 63363b7b309f..73287aafe030 100644
--- a/offapi/com/sun/star/sdbcx/XAlterTable.idl
+++ b/offapi/com/sun/star/sdbcx/XAlterTable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sdbcx/XAlterView.idl b/offapi/com/sun/star/sdbcx/XAlterView.idl
index d234562b3914..d56300a5a46e 100644
--- a/offapi/com/sun/star/sdbcx/XAlterView.idl
+++ b/offapi/com/sun/star/sdbcx/XAlterView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,13 @@
 #ifndef __offapi_com_sun_star_sdbcx_XAlterView_idl__
 #define __offapi_com_sun_star_sdbcx_XAlterView_idl__
 
-#ifndef __com_sun_star_sdbc_SQLException_idl__
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
 #include <com/sun/star/sdbc/SQLException.idl>
 #endif
 
 //=============================================================================
 
-module com { module sun { module star { module sdbcx {
+module com { module sun { module star { module sdbcx { 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sdbcx/XAppend.idl b/offapi/com/sun/star/sdbcx/XAppend.idl
index ed3ce7c483af..fcd3ec37416c 100644
--- a/offapi/com/sun/star/sdbcx/XAppend.idl
+++ b/offapi/com/sun/star/sdbcx/XAppend.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_XAppend_idl__
-#define __com_sun_star_sdbcx_XAppend_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
-#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
- module com {  module sun {  module star {  module beans {
- published interface XPropertySet;
-};};};};
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
+#ifndef __com_sun_star_sdbcx_XAppend_idl__ 
+#define __com_sun_star_sdbcx_XAppend_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_ElementExistException_idl__ 
+#include <com/sun/star/container/ElementExistException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module beans { 
+ published interface XPropertySet; 
+};};};}; 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
 /** is used for creating and appending new objects to a specific container.
  */
 published interface XAppend: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** creates a new object using the given descriptor and appends it
         to the related container.
         <b>
@@ -58,18 +58,18 @@ published interface XAppend: com::sun::star::uno::XInterface
         The descriptor will not be changed and can be used again to append another object.
         @param descriptor
             the descriptor which should be serve to append a new object
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void appendByDescriptor([in]com::sun::star::beans::XPropertySet descriptor)
-        raises (com::sun::star::sdbc::SQLException,
-                com::sun::star::container::ElementExistException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void appendByDescriptor([in]com::sun::star::beans::XPropertySet descriptor) 
+        raises (com::sun::star::sdbc::SQLException, 
+                com::sun::star::container::ElementExistException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/XAuthorizable.idl b/offapi/com/sun/star/sdbcx/XAuthorizable.idl
index c83018643ed4..3679020f6836 100644
--- a/offapi/com/sun/star/sdbcx/XAuthorizable.idl
+++ b/offapi/com/sun/star/sdbcx/XAuthorizable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,87 +24,87 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_XAuthorizable_idl__
-#define __com_sun_star_sdbcx_XAuthorizable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
+#ifndef __com_sun_star_sdbcx_XAuthorizable_idl__ 
+#define __com_sun_star_sdbcx_XAuthorizable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
 /** is used for accessing and setting the permissions of a user for a database
     object.
     @see com::sun::star::sdbcx::PrivilegeObject
  */
 published interface XAuthorizable: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** retrieves the permissions for a specific object.
         @param objName
             the name of the object
         @param objType
-            a value of
+            a value of 
             <type scope="com::sun::star::sdbcx">PrivilegeObject</Type>
         @returns
             the privileges
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
                 if a database access error occurs.
      */
-    long getPrivileges([in]string objName, [in]long objType) raises
-                        (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    long getPrivileges([in]string objName, [in]long objType) raises 
+                        (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** retrieves the permissions for a specific object, which could be granted
         to other users and groups.
         @param objName
             the name of the object
         @param objType
-            a value of
+            a value of 
             <type scope="com::sun::star::sdbcx">PrivilegeObject</Type>
         @returns
             the grant privileges
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    long getGrantablePrivileges([in]string objName, [in]long objType) raises
-                        (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    long getGrantablePrivileges([in]string objName, [in]long objType) raises 
+                        (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** adds additional permissions for a specific object.
         @param objName
             the name of the object
         @param objType
             a value from the <type scope="com::sun::star::sdbcx">PrivilegeObject</type> constants group
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void grantPrivileges([in]string objName, [in]long objType,
-                         [in]long objPrivileges) raises
-        (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    void grantPrivileges([in]string objName, [in]long objType, 
+                         [in]long objPrivileges) raises 
+        (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** removes permissions for a specific object from a group or user.
         @param objName
             the name of the object
         @param objType
             a value from the <type scope="com::sun::star::sdbcx">PrivilegeObject</type> constants group
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void revokePrivileges([in]string objName, [in]long objType,
-                          [in]long objPrivileges) raises
-        (com::sun::star::sdbc::SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void revokePrivileges([in]string objName, [in]long objType, 
+                          [in]long objPrivileges) raises 
+        (com::sun::star::sdbc::SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/XColumnsSupplier.idl b/offapi/com/sun/star/sdbcx/XColumnsSupplier.idl
index d97a10b477e4..8a294010e605 100644
--- a/offapi/com/sun/star/sdbcx/XColumnsSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XColumnsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_XColumnsSupplier_idl__
-#define __com_sun_star_sdbcx_XColumnsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
-/** provides the access to a container of columns, typically used for tables and
+#ifndef __com_sun_star_sdbcx_XColumnsSupplier_idl__ 
+#define __com_sun_star_sdbcx_XColumnsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
+/** provides the access to a container of columns, typically used for tables and 
     indexes.
  */
 published interface XColumnsSupplier: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns the container of columns.
-        @rerurns
+        @rerurns 
             the columns
      */
-    com::sun::star::container::XNameAccess getColumns();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    com::sun::star::container::XNameAccess getColumns(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/XCreateCatalog.idl b/offapi/com/sun/star/sdbcx/XCreateCatalog.idl
index ca4f7be00b99..0b0fc14245fe 100644
--- a/offapi/com/sun/star/sdbcx/XCreateCatalog.idl
+++ b/offapi/com/sun/star/sdbcx/XCreateCatalog.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_XCreateCatalog_idl__
-#define __com_sun_star_sdbcx_XCreateCatalog_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
-#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_XCreateCatalog_idl__ 
+#define __com_sun_star_sdbcx_XCreateCatalog_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_ElementExistException_idl__ 
+#include <com/sun/star/container/ElementExistException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** may be implemented to hide the complexity of creating a database catalog.
  */
 published interface XCreateCatalog: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** creates the catolog by using a sequence of property values. The kind
         of properties depends on the provider.
-
+                
         @param info
             driver specific information
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
 
      */
-    void createCatalog([in]sequence<com::sun::star::beans::PropertyValue> info)
-        raises (com::sun::star::sdbc::SQLException,
-                com::sun::star::container::ElementExistException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void createCatalog([in]sequence<com::sun::star::beans::PropertyValue> info) 
+        raises (com::sun::star::sdbc::SQLException, 
+                com::sun::star::container::ElementExistException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/XDataDefinitionSupplier.idl b/offapi/com/sun/star/sdbcx/XDataDefinitionSupplier.idl
index 3a1ad1010d99..5a78bd531059 100644
--- a/offapi/com/sun/star/sdbcx/XDataDefinitionSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XDataDefinitionSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,69 +24,69 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_XDataDefinitionSupplier_idl__
-#define __com_sun_star_sdbcx_XDataDefinitionSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbc {
- published interface XConnection;
-};};};};
-
- module com {  module sun {  module star {  module sdbcx {
-
- published interface XTablesSupplier;
-
-
+#ifndef __com_sun_star_sdbcx_XDataDefinitionSupplier_idl__ 
+#define __com_sun_star_sdbcx_XDataDefinitionSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbc { 
+ published interface XConnection; 
+};};};}; 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ published interface XTablesSupplier; 
+ 
+ 
 /** provides the access to data definition beans from a connected database.
  */
 published interface XDataDefinitionSupplier: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns at least the container of tables related to the given connection.
         @param connection
-            the related connection
+            the related connection 
         @returns
             the container
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    XTablesSupplier getDataDefinitionByConnection(
-                [in]com::sun::star::sdbc::XConnection connection)
-        raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    XTablesSupplier getDataDefinitionByConnection( 
+                [in]com::sun::star::sdbc::XConnection connection) 
+        raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** returns at least the container of tables related to the given Database URL.
         @param url
             a database url of the form  sdbc:subprotocol:subname
         @param info
-            a list of arbitrary string tag/value pairs as connection arguments;
+            a list of arbitrary string tag/value pairs as connection arguments; 
             normally at least a "user" and "password" property should be included
         @returns
             the container
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    XTablesSupplier getDataDefinitionByURL(
-                [in]string url,
-                [in]sequence<com::sun::star::beans::PropertyValue> info)
-        raises (com::sun::star::sdbc::SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    XTablesSupplier getDataDefinitionByURL( 
+                [in]string url, 
+                [in]sequence<com::sun::star::beans::PropertyValue> info) 
+        raises (com::sun::star::sdbc::SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/XDataDescriptorFactory.idl b/offapi/com/sun/star/sdbcx/XDataDescriptorFactory.idl
index 9b4356a6366f..386bdb3992d2 100644
--- a/offapi/com/sun/star/sdbcx/XDataDescriptorFactory.idl
+++ b/offapi/com/sun/star/sdbcx/XDataDescriptorFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_XDataDescriptorFactory_idl__
-#define __com_sun_star_sdbcx_XDataDescriptorFactory_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
- module com {  module sun {  module star {  module beans {
- published interface XPropertySet;
-};};};};
-
- module com {  module sun {  module star {  module sdbcx {
-
+#ifndef __com_sun_star_sdbcx_XDataDescriptorFactory_idl__ 
+#define __com_sun_star_sdbcx_XDataDescriptorFactory_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module beans { 
+ published interface XPropertySet; 
+};};};}; 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
 /** provides the creation of a descriptor for a definition object.
  */
 published interface XDataDescriptorFactory: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns a descriptor of a definition object.
         @returns
             the descriptor for that kind of objects
      */
-    com::sun::star::beans::XPropertySet createDataDescriptor();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    com::sun::star::beans::XPropertySet createDataDescriptor(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/XDeleteRows.idl b/offapi/com/sun/star/sdbcx/XDeleteRows.idl
index 03c772ce01ae..d1897d09c296 100644
--- a/offapi/com/sun/star/sdbcx/XDeleteRows.idl
+++ b/offapi/com/sun/star/sdbcx/XDeleteRows.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_XDeleteRows_idl__
-#define __com_sun_star_sdbcx_XDeleteRows_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_XDeleteRows_idl__ 
+#define __com_sun_star_sdbcx_XDeleteRows_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** provides for the deletion of more than one row at a time.
  */
 published interface XDeleteRows: com::sun::star::uno::XInterface
-{
-
-    /** deletes one or more rows identified by their bookmarks.
-             @param rows
-                list of bookmarks identifying the rows.
-             @returns
-                an array of update counts containing one element for each
-                 row. The array is ordered according to the order in
-                which bookmarks were given.
-             @throws com::sun::star::sdbc::SQLException
-                if a fatal error occurs, for intance, the connection gets lost if bookmarks
+{ 
+     
+    /** deletes one or more rows identified by their bookmarks. 
+             @param rows 
+                list of bookmarks identifying the rows. 
+             @returns 
+                an array of update counts containing one element for each 
+                 row. The array is ordered according to the order in 
+                which bookmarks were given. 
+             @throws com::sun::star::sdbc::SQLException 
+                if a fatal error occurs, for intance, the connection gets lost if bookmarks 
                 are used which do not belong to the according result set.
      */
-    sequence<long> deleteRows([in]sequence<any> rows)
-        raises (com::sun::star::sdbc::SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    sequence<long> deleteRows([in]sequence<any> rows) 
+        raises (com::sun::star::sdbc::SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/XDrop.idl b/offapi/com/sun/star/sdbcx/XDrop.idl
index d7e7520852a9..ee9b537981b0 100644
--- a/offapi/com/sun/star/sdbcx/XDrop.idl
+++ b/offapi/com/sun/star/sdbcx/XDrop.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,58 +24,58 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_XDrop_idl__
-#define __com_sun_star_sdbcx_XDrop_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
-#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
+#ifndef __com_sun_star_sdbcx_XDrop_idl__ 
+#define __com_sun_star_sdbcx_XDrop_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ 
+#include <com/sun/star/lang/IndexOutOfBoundsException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
 /** provides methods to remove an element of its container and to drop it from
     the related database.
  */
 published interface XDrop: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** drops an object of the related container identified by its name.
         @param elementName
             the name of the element to be dropped
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void dropByName([in]string elementName) raises
-    (com::sun::star::sdbc::SQLException,
-        com::sun::star::container::NoSuchElementException);
-    //-------------------------------------------------------------------------
-
+    void dropByName([in]string elementName) raises 
+    (com::sun::star::sdbc::SQLException, 
+        com::sun::star::container::NoSuchElementException); 
+    //------------------------------------------------------------------------- 
+     
     /** drops an object of the related container identified by its position.
         @param index
             the position of the element to be dropped
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void dropByIndex([in]long index) raises (com::sun::star::sdbc::SQLException,
-        com::sun::star::lang::IndexOutOfBoundsException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void dropByIndex([in]long index) raises (com::sun::star::sdbc::SQLException, 
+        com::sun::star::lang::IndexOutOfBoundsException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/XDropCatalog.idl b/offapi/com/sun/star/sdbcx/XDropCatalog.idl
index 8091d914aa86..b2195b4e1686 100644
--- a/offapi/com/sun/star/sdbcx/XDropCatalog.idl
+++ b/offapi/com/sun/star/sdbcx/XDropCatalog.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_XDropCatalog_idl__
-#define __com_sun_star_sdbcx_XDropCatalog_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_XDropCatalog_idl__ 
+#define __com_sun_star_sdbcx_XDropCatalog_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** may be implemented to hide the complexity of dropping a database catalog. Could
     normally be used only in offline mode, no connection on the database. This
     should be checked by the driver.
  */
 published interface XDropCatalog: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** drops a catalog identified by its name.
         @param catalogName
             the catalog name
         @param info
             driver specific information
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void dropCatalog([in]string catalogName,
-                     [in]sequence<com::sun::star::beans::PropertyValue> info)
-        raises (com::sun::star::sdbc::SQLException,
-                com::sun::star::container::NoSuchElementException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void dropCatalog([in]string catalogName, 
+                     [in]sequence<com::sun::star::beans::PropertyValue> info) 
+        raises (com::sun::star::sdbc::SQLException, 
+                com::sun::star::container::NoSuchElementException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/XGroupsSupplier.idl b/offapi/com/sun/star/sdbcx/XGroupsSupplier.idl
index e2bbae67c8b3..797bda5f9771 100644
--- a/offapi/com/sun/star/sdbcx/XGroupsSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XGroupsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_XGroupsSupplier_idl__
-#define __com_sun_star_sdbcx_XGroupsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_XGroupsSupplier_idl__ 
+#define __com_sun_star_sdbcx_XGroupsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** provides for access to a container of groups, typically used for a database
     definition object.
  */
 published interface XGroupsSupplier: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns the container of groups.
         @returns
             the groups
      */
-    com::sun::star::container::XNameAccess getGroups();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    com::sun::star::container::XNameAccess getGroups(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/XIndexesSupplier.idl b/offapi/com/sun/star/sdbcx/XIndexesSupplier.idl
index 666d02104201..381a892cd7e5 100644
--- a/offapi/com/sun/star/sdbcx/XIndexesSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XIndexesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_XIndexesSupplier_idl__
-#define __com_sun_star_sdbcx_XIndexesSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_XIndexesSupplier_idl__ 
+#define __com_sun_star_sdbcx_XIndexesSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** provides for access to a container of indexes, typically used for a table
     definition object.
  */
 published interface XIndexesSupplier: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns the container of indexes.
         @returns
             the indexes
      */
-    com::sun::star::container::XNameAccess getIndexes();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    com::sun::star::container::XNameAccess getIndexes(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/XKeysSupplier.idl b/offapi/com/sun/star/sdbcx/XKeysSupplier.idl
index 1954bd2056d6..f89a3875d363 100644
--- a/offapi/com/sun/star/sdbcx/XKeysSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XKeysSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_XKeysSupplier_idl__
-#define __com_sun_star_sdbcx_XKeysSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_XKeysSupplier_idl__ 
+#define __com_sun_star_sdbcx_XKeysSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** provides for access to a container of keys, typically used for a table
     definition object.
  */
 published interface XKeysSupplier: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns the container of keys.
         @returns
             the keys
      */
-    com::sun::star::container::XIndexAccess getKeys();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    com::sun::star::container::XIndexAccess getKeys(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/XRename.idl b/offapi/com/sun/star/sdbcx/XRename.idl
index 41e8807232a9..8f20951f9480 100644
--- a/offapi/com/sun/star/sdbcx/XRename.idl
+++ b/offapi/com/sun/star/sdbcx/XRename.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_XRename_idl__
-#define __com_sun_star_sdbcx_XRename_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
-#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
+#ifndef __com_sun_star_sdbcx_XRename_idl__ 
+#define __com_sun_star_sdbcx_XRename_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_ElementExistException_idl__ 
+#include <com/sun/star/container/ElementExistException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
 /** supports the renaming of definition objects.
-    <br/>
+    <br/> 
 
-    This is a very desirable feature which is not supported by all databases. There is no
+    This is a very desirable feature which is not supported by all databases. There is no 
     standard SQL statement provided for this feature.
  */
 published interface XRename: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** is intended to alter the name of a object.
         @param newName
             the new name
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void rename([in]string newName)
-        raises (com::sun::star::sdbc::SQLException,
-                com::sun::star::container::ElementExistException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void rename([in]string newName) 
+        raises (com::sun::star::sdbc::SQLException, 
+                com::sun::star::container::ElementExistException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/XRowLocate.idl b/offapi/com/sun/star/sdbcx/XRowLocate.idl
index 6d87b7faae92..0ac141c7d151 100644
--- a/offapi/com/sun/star/sdbcx/XRowLocate.idl
+++ b/offapi/com/sun/star/sdbcx/XRowLocate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_XRowLocate_idl__
-#define __com_sun_star_sdbcx_XRowLocate_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_XRowLocate_idl__ 
+#define __com_sun_star_sdbcx_XRowLocate_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** is used to identify rows within a result set and to find rows by a bookmark.
-
-
+    
+    
     <p>
-    Bookmarks are only valid in the scope of the current result set and
+    Bookmarks are only valid in the scope of the current result set and 
     are not interchangeable between result sets. A bookmark could be a complex data
     structure, so it could not be compared in a safe way. Because of that, a provider
     has to implement the compare method for bookmarks.
     </p>
  */
 published interface XRowLocate: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns the bookmark of the current row of a result set.
         @returns
             the current bookmark
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    any getBookmark() raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    any getBookmark() raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the row identified by an valid bookmark.
-
+        
         <p>
         If the bookmark could not be located, a result set will be positioned
         after the last record.
@@ -73,16 +73,16 @@ published interface XRowLocate: com::sun::star::uno::XInterface
             the bookmark where to move
         @returns
             <TRUE/> if successful
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    boolean moveToBookmark([in]any bookmark) raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean moveToBookmark([in]any bookmark) raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor a relative number of rows, either positive or negative
         starting at a given bookmark position.
-
-
+        
+        
         <p>
         If the bookmark could not be located, a result set will be positioned
         after the last record.
@@ -96,15 +96,15 @@ published interface XRowLocate: com::sun::star::uno::XInterface
             count of rows move relative to the bookmark
         @returns
             <TRUE/> if successful
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    boolean moveRelativeToBookmark([in]any bookmark, [in]long rows)
-        raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean moveRelativeToBookmark([in]any bookmark, [in]long rows) 
+        raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** compares two bookmarks and returns an indication of their relative values.
-
+        
         <p>
         The bookmarks must apply to the same ResultSet. You cannot reliably
         compare bookmarks from different ResultSets, even if they were created from
@@ -118,41 +118,41 @@ published interface XRowLocate: com::sun::star::uno::XInterface
             the second bookmark
         @returns
             a value of <type scope="com::sun::star::sdbcx">CompareBookmark</type>
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
 
         @see com::sun::star::sdbcx::CompareBookmark
 
      */
-    long compareBookmarks([in]any first, [in]any second)
-        raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    long compareBookmarks([in]any first, [in]any second) 
+        raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** determines whether the bookmarks of a result set are ordered or not.
         @returns
             <TRUE/> if so
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
         @see com::sun::star::sdbcx::CompareBookmark
      */
-    boolean hasOrderedBookmarks() raises (com::sun::star::sdbc::SQLException);
-    //-------------------------------------------------------------------------
-
+    boolean hasOrderedBookmarks() raises (com::sun::star::sdbc::SQLException); 
+    //------------------------------------------------------------------------- 
+     
     /** returns the hash value for a specified bookmark.
         @param bookmark
             the bookmark to hash
         @returns
             the hashed value
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    long hashBookmark([in]any bookmark) raises (com::sun::star::sdbc::SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    long hashBookmark([in]any bookmark) raises (com::sun::star::sdbc::SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/XTablesSupplier.idl b/offapi/com/sun/star/sdbcx/XTablesSupplier.idl
index 58b441b2acde..ad68b30768d6 100644
--- a/offapi/com/sun/star/sdbcx/XTablesSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XTablesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_XTablesSupplier_idl__
-#define __com_sun_star_sdbcx_XTablesSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_XTablesSupplier_idl__ 
+#define __com_sun_star_sdbcx_XTablesSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** provides for access to a container of tables, typically used for a database
     definition object.
  */
 published interface XTablesSupplier: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns the container of tables.
         @returns
             the tables
      */
-    com::sun::star::container::XNameAccess getTables();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    com::sun::star::container::XNameAccess getTables(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/XUser.idl b/offapi/com/sun/star/sdbcx/XUser.idl
index f99cbe1e5107..9dcbcf34d747 100644
--- a/offapi/com/sun/star/sdbcx/XUser.idl
+++ b/offapi/com/sun/star/sdbcx/XUser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_XUser_idl__
-#define __com_sun_star_sdbcx_XUser_idl__
-
-#ifndef __com_sun_star_sdbcx_XAuthorizable_idl__
-#include <com/sun/star/sdbcx/XAuthorizable.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
+#ifndef __com_sun_star_sdbcx_XUser_idl__ 
+#define __com_sun_star_sdbcx_XUser_idl__ 
+ 
+#ifndef __com_sun_star_sdbcx_XAuthorizable_idl__ 
+#include <com/sun/star/sdbcx/XAuthorizable.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
 /** allows for changing a users password.
  */
 published interface XUser: XAuthorizable
-{
-
+{ 
+     
     /** allows modifying a user password.
         @param oldPassword
             the old password to be reset
         @param newPassword
             the new password
-        @throws com::sun::star::sdbc::SQLException
+        @throws com::sun::star::sdbc::SQLException 
             if a database access error occurs.
      */
-    void changePassword([in]string oldPassword, [in]string newPassword)
-        raises (com::sun::star::sdbc::SQLException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    void changePassword([in]string oldPassword, [in]string newPassword) 
+        raises (com::sun::star::sdbc::SQLException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/XUsersSupplier.idl b/offapi/com/sun/star/sdbcx/XUsersSupplier.idl
index c1c77fddaf9c..7ed5810804b1 100644
--- a/offapi/com/sun/star/sdbcx/XUsersSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XUsersSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_XUsersSupplier_idl__
-#define __com_sun_star_sdbcx_XUsersSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_sdbc_SQLException_idl__
-#include <com/sun/star/sdbc/SQLException.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_XUsersSupplier_idl__ 
+#define __com_sun_star_sdbcx_XUsersSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sdbc_SQLException_idl__ 
+#include <com/sun/star/sdbc/SQLException.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** provides the access to a container of users, typically used for a database
     definition object.
  */
 published interface XUsersSupplier: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns the container of users.
         @returns
             the users
      */
-    com::sun::star::container::XNameAccess getUsers();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    com::sun::star::container::XNameAccess getUsers(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/sdbcx/XViewsSupplier.idl b/offapi/com/sun/star/sdbcx/XViewsSupplier.idl
index f0988c1c8bb1..b0ace05425af 100644
--- a/offapi/com/sun/star/sdbcx/XViewsSupplier.idl
+++ b/offapi/com/sun/star/sdbcx/XViewsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sdbcx_XViewsSupplier_idl__
-#define __com_sun_star_sdbcx_XViewsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
- module com {  module sun {  module star {  module sdbcx {
-
-
+#ifndef __com_sun_star_sdbcx_XViewsSupplier_idl__ 
+#define __com_sun_star_sdbcx_XViewsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module sdbcx { 
+ 
+ 
 /** provides for access to a container of views, typically used for a database
     definition object.
  */
 published interface XViewsSupplier: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** returns the container of views.
         @returns
             the views
      */
-    com::sun::star::container::XNameAccess getViews();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*===========================================================================
-===========================================================================*/
-#endif
+    com::sun::star::container::XNameAccess getViews(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*=========================================================================== 
+===========================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/security/CertificateCharacters.idl b/offapi/com/sun/star/security/CertificateCharacters.idl
index 4185759a2a95..a33cb4c4808d 100644
--- a/offapi/com/sun/star/security/CertificateCharacters.idl
+++ b/offapi/com/sun/star/security/CertificateCharacters.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -57,5 +57,5 @@ constants CertificateCharacters
 
 } ; } ; } ; } ;
 
-#endif
+#endif 
 
diff --git a/offapi/com/sun/star/security/CertificateContainer.idl b/offapi/com/sun/star/security/CertificateContainer.idl
index ca6573c9c13b..1e3dcb72eba4 100644
--- a/offapi/com/sun/star/security/CertificateContainer.idl
+++ b/offapi/com/sun/star/security/CertificateContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,4 +43,4 @@ service CertificateContainer: XCertificateContainer;
 
 }; }; }; };
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/security/CertificateContainerStatus.idl b/offapi/com/sun/star/security/CertificateContainerStatus.idl
index 302e301e562a..a580d5108c21 100644
--- a/offapi/com/sun/star/security/CertificateContainerStatus.idl
+++ b/offapi/com/sun/star/security/CertificateContainerStatus.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 /** -- idl definition -- **/
 
 #ifndef __com_sun_star_security_CertificateContainerStatus_idl_
@@ -60,5 +60,5 @@ enum CertificateContainerStatus
 
 } ; } ; } ; } ;
 
-#endif
+#endif 
 
diff --git a/offapi/com/sun/star/security/CertificateException.idl b/offapi/com/sun/star/security/CertificateException.idl
index 3c4c16ad4a86..617660f88bc3 100644
--- a/offapi/com/sun/star/security/CertificateException.idl
+++ b/offapi/com/sun/star/security/CertificateException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
 
 #ifndef __com_sun_star_security_CertificateException_idl__
-#define __com_sun_star_security_CertificateException_idl__
-
+#define __com_sun_star_security_CertificateException_idl__ 
+ 
 #ifndef __com_sun_star_uno_SecurityException_idl__
-#include <com/sun/star/uno/SecurityException.idl>
+#include <com/sun/star/uno/SecurityException.idl> 
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module security {
 
-//=============================================================================
-
+//============================================================================= 
+ 
 exception CertificateException : com::sun::star::uno::SecurityException
 {
 };
 
-//=============================================================================
-
+//============================================================================= 
+ 
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/security/CertificateValidity.idl b/offapi/com/sun/star/security/CertificateValidity.idl
index 3130a72ca713..b78f81f37092 100644
--- a/offapi/com/sun/star/security/CertificateValidity.idl
+++ b/offapi/com/sun/star/security/CertificateValidity.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -129,5 +129,5 @@ constants CertificateValidity
 
 } ; } ; } ; } ;
 
-#endif
+#endif 
 
diff --git a/offapi/com/sun/star/security/CryptographyException.idl b/offapi/com/sun/star/security/CryptographyException.idl
index d45ca6f76931..b91b0c75cc6f 100644
--- a/offapi/com/sun/star/security/CryptographyException.idl
+++ b/offapi/com/sun/star/security/CryptographyException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
 
 #ifndef __com_sun_star_security_CryptographyException_idl__
-#define __com_sun_star_security_CryptographyException_idl__
-
+#define __com_sun_star_security_CryptographyException_idl__ 
+ 
 #ifndef __com_sun_star_uno_SecurityException_idl__
-#include <com/sun/star/uno/SecurityException.idl>
+#include <com/sun/star/uno/SecurityException.idl> 
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module security {
 
-//=============================================================================
+//============================================================================= 
 
 exception CryptographyException : com::sun::star::uno::SecurityException
 {
 };
 
-//=============================================================================
-
+//============================================================================= 
+ 
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/security/DocumentDigitalSignatures.idl b/offapi/com/sun/star/security/DocumentDigitalSignatures.idl
index 64ad581602c4..e25ef28cbe06 100644
--- a/offapi/com/sun/star/security/DocumentDigitalSignatures.idl
+++ b/offapi/com/sun/star/security/DocumentDigitalSignatures.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 #ifndef __com_sun_star_security_documentdigitalsignatures_idl_
diff --git a/offapi/com/sun/star/security/DocumentSignatureInformation.idl b/offapi/com/sun/star/security/DocumentSignatureInformation.idl
index c57c68b05932..3810b9d81697 100644
--- a/offapi/com/sun/star/security/DocumentSignatureInformation.idl
+++ b/offapi/com/sun/star/security/DocumentSignatureInformation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
- *
+ * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef __com_sun_star_security_DocumentSignatureInformation_idl__
-#define __com_sun_star_security_DocumentSignatureInformation_idl__
+#define __com_sun_star_security_DocumentSignatureInformation_idl__ 
 
 #include <com/sun/star/security/XCertificate.idl>
 #include <com/sun/star/security/CertificateValidity.idl>
 
-
-//=============================================================================
+ 
+//============================================================================= 
 
 module com { module sun { module star { module security {
 
-//=============================================================================
-
+//============================================================================= 
+ 
 /** Status of digital signatures in a document.
 
     <p>
     This structure has the information about a digital signature in a document, and the status if the signature is valid.
     </p>
  */
-
+ 
 struct DocumentSignatureInformation
 {
     XCertificate    Signer;
@@ -58,18 +58,18 @@ struct DocumentSignatureInformation
     long CertificateStatus;
     /* indicates what content of a document is signed.
         <p>
-        This value can be ignored when this struct is returned as part of
+        This value can be ignored when this struct is returned as part of 
         a macro signature validation.
-        As of OpenOffice.org 3.2 and ODF 1.2 the document signature comprises
-        all files except the signature file itself.
+        As of OpenOffice.org 3.2 and ODF 1.2 the document signature comprises 
+        all files except the signature file itself. 
         Signatures in OOo 2.x were only
-        applied to the files in the root of the document, except mimetype, the
+        applied to the files in the root of the document, except mimetype, the 
         Pictures and ObjectReplacements/Objects folder. That is, macros
         were not part of the document signature.
         OOo 3.0 signed everthing, execept mimetype and the META-INF folder.
         <p>
         If PartialDocumentSignature is true, then the signature was created by OOo
-        with a version less then 3.2. In this case, not all files are signed. The
+        with a version less then 3.2. In this case, not all files are signed. The 
         signature can still be regarded as valid, as long as SignatureIsValid is true
         and the certificate could be validated. However, users should be notified about
         the fact, that not everything in this document is signed.
@@ -78,8 +78,8 @@ struct DocumentSignatureInformation
 
 };
 
-//=============================================================================
-
+//============================================================================= 
+ 
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/security/EncryptionException.idl b/offapi/com/sun/star/security/EncryptionException.idl
index 64e17bf5d260..eaeb64a9d0b2 100644
--- a/offapi/com/sun/star/security/EncryptionException.idl
+++ b/offapi/com/sun/star/security/EncryptionException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
 
 #ifndef __com_sun_star_security_EncryptionException_idl__
-#define __com_sun_star_security_EncryptionException_idl__
-
+#define __com_sun_star_security_EncryptionException_idl__ 
+ 
 #ifndef __com_sun_star_security_CryptographyException_idl__
-#include <com/sun/star/security/CryptographyException.idl>
+#include <com/sun/star/security/CryptographyException.idl> 
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module security {
 
-//=============================================================================
-
+//============================================================================= 
+ 
 exception EncryptionException : com::sun::star::security::CryptographyException
 {
 };
 
-//=============================================================================
-
+//============================================================================= 
+ 
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/security/KeyException.idl b/offapi/com/sun/star/security/KeyException.idl
index f323def3b585..884bedd7009a 100644
--- a/offapi/com/sun/star/security/KeyException.idl
+++ b/offapi/com/sun/star/security/KeyException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
 
 #ifndef __com_sun_star_security_KeyException_idl__
-#define __com_sun_star_security_KeyException_idl__
-
+#define __com_sun_star_security_KeyException_idl__ 
+ 
 #ifndef __com_sun_star_uno_SecurityException_idl__
-#include <com/sun/star/uno/SecurityException.idl>
+#include <com/sun/star/uno/SecurityException.idl> 
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module security {
 
-//=============================================================================
-
+//============================================================================= 
+ 
 exception KeyException : com::sun::star::uno::SecurityException
 {
 };
 
-//=============================================================================
-
+//============================================================================= 
+ 
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/security/KeyUsage.idl b/offapi/com/sun/star/security/KeyUsage.idl
index 0230762f436a..b37716a2b643 100644
--- a/offapi/com/sun/star/security/KeyUsage.idl
+++ b/offapi/com/sun/star/security/KeyUsage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef __com_sun_star_security_keyusage_idl_
 #define __com_sun_star_security_keyusage_idl_
 
diff --git a/offapi/com/sun/star/security/NoPasswordException.idl b/offapi/com/sun/star/security/NoPasswordException.idl
index b11abbaf6cba..093338c49fa3 100644
--- a/offapi/com/sun/star/security/NoPasswordException.idl
+++ b/offapi/com/sun/star/security/NoPasswordException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
 
 #ifndef __com_sun_star_security_NoPasswordException_idl__
-#define __com_sun_star_security_NoPasswordException_idl__
-
+#define __com_sun_star_security_NoPasswordException_idl__ 
+ 
 #ifndef __com_sun_star_uno_SecurityException_idl__
-#include <com/sun/star/uno/SecurityException.idl>
+#include <com/sun/star/uno/SecurityException.idl> 
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module security {
 
-//=============================================================================
+//============================================================================= 
 
 exception NoPasswordException : com::sun::star::uno::SecurityException
 {
 };
 
-//=============================================================================
-
+//============================================================================= 
+ 
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/security/SecurityInfrastructureException.idl b/offapi/com/sun/star/security/SecurityInfrastructureException.idl
index 2b68c42b52ec..10e89425072b 100644
--- a/offapi/com/sun/star/security/SecurityInfrastructureException.idl
+++ b/offapi/com/sun/star/security/SecurityInfrastructureException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
 
 #ifndef __com_sun_star_security_SecurityInfrastructureException_idl__
-#define __com_sun_star_security_SecurityInfrastructureException_idl__
-
+#define __com_sun_star_security_SecurityInfrastructureException_idl__ 
+ 
 #ifndef __com_sun_star_uno_SecurityException_idl__
-#include <com/sun/star/uno/SecurityException.idl>
+#include <com/sun/star/uno/SecurityException.idl> 
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module security {
 
-//=============================================================================
-
+//============================================================================= 
+ 
 exception SecurityInfrastructureException : com::sun::star::uno::SecurityException
 {
 };
 
-//=============================================================================
-
+//============================================================================= 
+ 
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/security/SerialNumberAdapter.idl b/offapi/com/sun/star/security/SerialNumberAdapter.idl
index 258426fe3f1b..c6fbcf5f0995 100644
--- a/offapi/com/sun/star/security/SerialNumberAdapter.idl
+++ b/offapi/com/sun/star/security/SerialNumberAdapter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/security/SignatureException.idl b/offapi/com/sun/star/security/SignatureException.idl
index d7bf72eb43cc..6fbc33a4f2ee 100644
--- a/offapi/com/sun/star/security/SignatureException.idl
+++ b/offapi/com/sun/star/security/SignatureException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
 
 #ifndef __com_sun_star_security_SignatureException_idl__
-#define __com_sun_star_security_SignatureException_idl__
-
+#define __com_sun_star_security_SignatureException_idl__ 
+ 
 #ifndef __com_sun_star_security_CryptographyException_idl__
-#include <com/sun/star/security/CryptographyException.idl>
+#include <com/sun/star/security/CryptographyException.idl> 
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module security {
 
-//=============================================================================
-
+//============================================================================= 
+ 
 exception SignatureException : com::sun::star::security::CryptographyException
 {
 };
 
-//=============================================================================
-
+//============================================================================= 
+ 
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/security/XCertificate.idl b/offapi/com/sun/star/security/XCertificate.idl
index 155ddc5e6b2f..826e469e3819 100644
--- a/offapi/com/sun/star/security/XCertificate.idl
+++ b/offapi/com/sun/star/security/XCertificate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -79,17 +79,17 @@ interface XCertificate : com::sun::star::uno::XInterface
      * the issuer unique ID attribute of the certificate.
      */
     [attribute, readonly] sequence< byte > IssuerUniqueID ;
-
+    
     /**
      * the subject unique ID attribute of the certificate.
      */
     [attribute, readonly] sequence< byte > SubjectUniqueID ;
-
+    
     /**
      * all extensions of a certificate.
      */
     [attribute, readonly] sequence< XCertificateExtension > Extensions ;
-
+    
     /**
      * the DER encoded form of the certificate
      */
@@ -124,7 +124,7 @@ interface XCertificate : com::sun::star::uno::XInterface
      * Find a extension with a object identifier.
      */
     XCertificateExtension findCertificateExtension( [in]sequence< byte > oid ) ;
-
+    
     /**
      * get the certificate usage
      */
@@ -133,5 +133,5 @@ interface XCertificate : com::sun::star::uno::XInterface
 
 } ; } ; } ; } ;
 
-#endif
+#endif 
 
diff --git a/offapi/com/sun/star/security/XCertificateContainer.idl b/offapi/com/sun/star/security/XCertificateContainer.idl
index c71f0d209aab..e7cdfc63ba94 100644
--- a/offapi/com/sun/star/security/XCertificateContainer.idl
+++ b/offapi/com/sun/star/security/XCertificateContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,10 +45,10 @@ interface XCertificateContainer
         @param trust
         @return boolean
      */
-
-    boolean addCertificate( [in] string url,
+    
+    boolean addCertificate( [in] string url, 
                               [in] string cert, [in] boolean trust );
-
+    
     /** Sheck if a certificate was stored earlier before.
         @param url
         @param cert
@@ -56,11 +56,11 @@ interface XCertificateContainer
 
       */
 
-    CertificateContainerStatus hasCertificate([in] string url,
+    CertificateContainerStatus hasCertificate([in] string url, 
                               [in] string cert );
-
+    
 };
 
 }; }; }; };
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/security/XCertificateExtension.idl b/offapi/com/sun/star/security/XCertificateExtension.idl
index 93148a74ac48..00044c2fd54a 100644
--- a/offapi/com/sun/star/security/XCertificateExtension.idl
+++ b/offapi/com/sun/star/security/XCertificateExtension.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -57,9 +57,9 @@ interface XCertificateExtension : com::sun::star::uno::XInterface
      * Get the extension value
      */
     [attribute, readonly] sequence< byte > ExtensionValue ;
-};
+}; 
 
 } ; } ; } ; } ;
 
-#endif
+#endif 
 
diff --git a/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl b/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
index aadcbe061912..78d78a317275 100644
--- a/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
+++ b/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -121,7 +121,7 @@ interface XDocumentDigitalSignatures : com::sun::star::uno::XInterface
     void showPackageSignatures(
                         [in] ::com::sun::star::embed::XStorage xStorage,
                         [in] ::com::sun::star::io::XInputStream xSignInStream );
-
+ 
     /** allows to get the default stream name for storing of the signature of
         the package.
      */
@@ -129,8 +129,8 @@ interface XDocumentDigitalSignatures : com::sun::star::uno::XInterface
 
 
     void showCertificate( [in] com::sun::star::security::XCertificate Certificate );
-
-
+    
+    
        /** manages trusted sources (Authors and pathes )
      */
 
@@ -141,13 +141,13 @@ interface XDocumentDigitalSignatures : com::sun::star::uno::XInterface
     // These method should raise confirmation dialog, so it can not used from bad macros...
     void    addAuthorToTrustedSources( [in] com::sun::star::security::XCertificate Author );
     void    addLocationToTrustedSources( [in] string Location );
-
+    
 
 
 } ;
 
 } ; } ; } ; } ;
 
-#endif
+#endif 
 
 
diff --git a/offapi/com/sun/star/security/XSerialNumberAdapter.idl b/offapi/com/sun/star/security/XSerialNumberAdapter.idl
index b21ba3065da9..2d3c72fe0277 100644
--- a/offapi/com/sun/star/security/XSerialNumberAdapter.idl
+++ b/offapi/com/sun/star/security/XSerialNumberAdapter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 /** -- idl definition -- **/
 
 #ifndef __com_sun_star_security_XSerialNumberAdapter_idl_
@@ -55,5 +55,5 @@ interface XSerialNumberAdapter : com::sun::star::uno::XInterface
 
 } ; } ; } ; } ;
 
-#endif
+#endif 
 
diff --git a/offapi/com/sun/star/setup/ActionType.idl b/offapi/com/sun/star/setup/ActionType.idl
index 912d9cc3f2ad..38bae0c0713c 100644
--- a/offapi/com/sun/star/setup/ActionType.idl
+++ b/offapi/com/sun/star/setup/ActionType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_setup_ActionType_idl__
-#define __com_sun_star_setup_ActionType_idl__
-
-module com {  module sun {  module star {  module setup {
+#ifndef __com_sun_star_setup_ActionType_idl__ 
+#define __com_sun_star_setup_ActionType_idl__ 
+ 
+module com {  module sun {  module star {  module setup { 
 
 /// @deprecated
 published enum ActionType
-{
-    INVALID,
-
-    DOWNLOAD,
-
-    MAKEDIR,
-
-    DELETEDIR,
-
-    COPYFILE,
-
-    UNZIPFILE,
-
-    DELETEFILE,
-
-    MAKEFOLDER,
-
-    MAKEFOLDERITEM,
-
-    DELETEFOLDER,
-
-    DELETEFOLDERITEM,
-
-    PROFILEITEM,
-
-    FONT,
-
-    CREATESHORTCUT,
-
-    WINREGISTRY
-    };
-}; }; }; };
-
-#endif
+{ 
+    INVALID, 
+ 
+    DOWNLOAD, 
+ 
+    MAKEDIR, 
+        
+    DELETEDIR, 
+ 
+    COPYFILE, 
+        
+    UNZIPFILE, 
+        
+    DELETEFILE, 
+ 
+    MAKEFOLDER, 
+        
+    MAKEFOLDERITEM, 
+        
+    DELETEFOLDER, 
+        
+    DELETEFOLDERITEM, 
+ 
+    PROFILEITEM, 
+ 
+    FONT, 
+ 
+    CREATESHORTCUT, 
+ 
+    WINREGISTRY 
+    }; 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/setup/BaseAction.idl b/offapi/com/sun/star/setup/BaseAction.idl
index f3edc68d8859..321ba4b73ee4 100644
--- a/offapi/com/sun/star/setup/BaseAction.idl
+++ b/offapi/com/sun/star/setup/BaseAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,25 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_setup_BaseAction_idl__
-#define __com_sun_star_setup_BaseAction_idl__
-
-#ifndef __com_sun_star_setup_ActionType_idl__
-#include <com/sun/star/setup/ActionType.idl>
-#endif
-
-module com {  module sun {  module star {  module setup {
-
+#ifndef __com_sun_star_setup_BaseAction_idl__ 
+#define __com_sun_star_setup_BaseAction_idl__ 
+ 
+#ifndef __com_sun_star_setup_ActionType_idl__ 
+#include <com/sun/star/setup/ActionType.idl> 
+#endif 
+ 
+module com {  module sun {  module star {  module setup { 
+     
 /// @deprecated
 published struct BaseAction
 {
     // DocMerge: empty anyway
-    ActionType                  eType;
-
+    ActionType					eType; 
+        
     // DocMerge: empty anyway
-    boolean                     bDone;
-    boolean                     bProcess;
-    };
-}; }; }; };
-
-#endif
+    boolean 					bDone; 
+    boolean 					bProcess; 
+    }; 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/setup/CopyFileAction.idl b/offapi/com/sun/star/setup/CopyFileAction.idl
index b7d8e8e900ea..26d71bc2d986 100644
--- a/offapi/com/sun/star/setup/CopyFileAction.idl
+++ b/offapi/com/sun/star/setup/CopyFileAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,23 +41,23 @@ module com {  module sun {  module star {  module setup {
 published struct CopyFileAction: BaseAction
 {
     // DocMerge: empty anyway
-    string              strSourceFilename;
+    string				strSourceFilename;
 
     // DocMerge: empty anyway
-    string              strDestinationFilename;
+    string				strDestinationFilename;
 
     // DocMerge: empty anyway
-    boolean             bUnoComponent;
-    boolean             bActiveX;
+    boolean				bUnoComponent;
+    boolean				bActiveX;
 
     // DocMerge: empty anyway
-    boolean             bOverwrite;
+    boolean				bOverwrite;
 
     // DocMerge: empty anyway
     com::sun::star::util::DateTime aDateTime;
 
     // DocMerge: empty anyway
-    long                nRights;
+    long				nRights;
     };
 }; }; }; };
 
diff --git a/offapi/com/sun/star/setup/DeleteDirAction.idl b/offapi/com/sun/star/setup/DeleteDirAction.idl
index 59f358c1a76c..0f6fc5a8d622 100644
--- a/offapi/com/sun/star/setup/DeleteDirAction.idl
+++ b/offapi/com/sun/star/setup/DeleteDirAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,21 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_setup_DeleteDirAction_idl__
-#define __com_sun_star_setup_DeleteDirAction_idl__
-
-#ifndef __com_sun_star_setup_BaseAction_idl__
-#include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-module com {  module sun {  module star {  module setup {
-
+#ifndef __com_sun_star_setup_DeleteDirAction_idl__ 
+#define __com_sun_star_setup_DeleteDirAction_idl__ 
+ 
+#ifndef __com_sun_star_setup_BaseAction_idl__ 
+#include <com/sun/star/setup/BaseAction.idl> 
+#endif 
+ 
+module com {  module sun {  module star {  module setup { 
+     
 /// @deprecated
 published struct DeleteDirAction: BaseAction
-{
+{ 
     // DocMerge: empty anyway
-    string          strDirname;
-    };
-}; }; }; };
-
-#endif
+    string			strDirname; 
+    }; 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/setup/DeleteFileAction.idl b/offapi/com/sun/star/setup/DeleteFileAction.idl
index dc58ef733277..09247d21bb20 100644
--- a/offapi/com/sun/star/setup/DeleteFileAction.idl
+++ b/offapi/com/sun/star/setup/DeleteFileAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,16 +41,16 @@ module com {  module sun {  module star {  module setup {
 published struct DeleteFileAction: BaseAction
 {
     // DocMerge: empty anyway
-    string              strDestinationPath;
+    string				strDestinationPath;
 
     // DocMerge: empty anyway
-    string              strPattern;
+    string				strPattern;
 
     // DocMerge: empty anyway
-    boolean             bUnoComponent;
-    boolean             bActiveX;
+    boolean				bUnoComponent;
+    boolean				bActiveX;
 
-    boolean             bTestDate;
+    boolean				bTestDate;
 
     // DocMerge: empty anyway
     com::sun::star::util::DateTime aDateTime;
diff --git a/offapi/com/sun/star/setup/DeleteFolderAction.idl b/offapi/com/sun/star/setup/DeleteFolderAction.idl
index 2a5a1c56568f..6f735f357b68 100644
--- a/offapi/com/sun/star/setup/DeleteFolderAction.idl
+++ b/offapi/com/sun/star/setup/DeleteFolderAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,21 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_setup_DeleteFolderAction_idl__
-#define __com_sun_star_setup_DeleteFolderAction_idl__
-
-#ifndef __com_sun_star_setup_BaseAction_idl__
-#include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-module com {  module sun {  module star {  module setup {
-
+#ifndef __com_sun_star_setup_DeleteFolderAction_idl__ 
+#define __com_sun_star_setup_DeleteFolderAction_idl__ 
+ 
+#ifndef __com_sun_star_setup_BaseAction_idl__ 
+#include <com/sun/star/setup/BaseAction.idl> 
+#endif 
+ 
+module com {  module sun {  module star {  module setup { 
+     
 /// @deprecated
 published struct DeleteFolderAction: BaseAction
-{
+{ 
     // DocMerge: empty anyway
-    string              strFoldername;
-    };
-}; }; }; };
-
-#endif
+    string				strFoldername; 
+    }; 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/setup/DeleteFolderItemAction.idl b/offapi/com/sun/star/setup/DeleteFolderItemAction.idl
index d17f39bcf135..2691a3d0f986 100644
--- a/offapi/com/sun/star/setup/DeleteFolderItemAction.idl
+++ b/offapi/com/sun/star/setup/DeleteFolderItemAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_setup_DeleteFolderItemAction_idl__
-#define __com_sun_star_setup_DeleteFolderItemAction_idl__
-
-#ifndef __com_sun_star_setup_BaseAction_idl__
-#include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-module com {  module sun {  module star {  module setup {
-
+#ifndef __com_sun_star_setup_DeleteFolderItemAction_idl__ 
+#define __com_sun_star_setup_DeleteFolderItemAction_idl__ 
+ 
+#ifndef __com_sun_star_setup_BaseAction_idl__ 
+#include <com/sun/star/setup/BaseAction.idl> 
+#endif 
+ 
+module com {  module sun {  module star {  module setup { 
+     
 /// @deprecated
 published struct DeleteFolderItemAction: BaseAction
-{
+{ 
     // DocMerge: empty anyway
-    string              strFoldername;
-
+    string				strFoldername; 
+        
     // DocMerge: empty anyway
-    string              strItemname;
-    };
-}; }; }; };
-
-#endif
+    string				strItemname; 
+    }; 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/setup/DownloadAction.idl b/offapi/com/sun/star/setup/DownloadAction.idl
index c83739715086..cbddd25b00fb 100644
--- a/offapi/com/sun/star/setup/DownloadAction.idl
+++ b/offapi/com/sun/star/setup/DownloadAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,13 +37,13 @@ module com {  module sun {  module star {  module setup {
 published struct DownloadAction: BaseAction
 {
     // DocMerge: empty anyway
-    string          strFilename;
+    string			strFilename;
 
     // DocMerge: empty anyway
-    long            nSizeKB;
+    long			nSizeKB;
 
     // DocMerge: empty anyway
-    long            nCRC;
+    long 			nCRC;
     };
 }; }; }; };
 
diff --git a/offapi/com/sun/star/setup/FontAction.idl b/offapi/com/sun/star/setup/FontAction.idl
index 5b8e54a3bc49..fc014d05543b 100644
--- a/offapi/com/sun/star/setup/FontAction.idl
+++ b/offapi/com/sun/star/setup/FontAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_setup_FontAction_idl__
-#define __com_sun_star_setup_FontAction_idl__
-
-#ifndef __com_sun_star_setup_BaseAction_idl__
-#include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-module com {  module sun {  module star {  module setup {
-
+#ifndef __com_sun_star_setup_FontAction_idl__ 
+#define __com_sun_star_setup_FontAction_idl__ 
+ 
+#ifndef __com_sun_star_setup_BaseAction_idl__ 
+#include <com/sun/star/setup/BaseAction.idl> 
+#endif 
+ 
+module com {  module sun {  module star {  module setup { 
+     
 /// @deprecated
 published struct FontAction: BaseAction
-{
+{ 
     // DocMerge: empty anyway
-    string              strFontFilename;
-
+    string				strFontFilename; 
+        
     // DocMerge: empty anyway
-    string              strFontname;
-
+    string				strFontname; 
+ 
     // DocMerge: empty anyway
-    boolean             bCreate;
-    };
-}; }; }; };
-
-#endif
+    boolean 			bCreate; 
+    }; 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/setup/InstallEnvironment.idl b/offapi/com/sun/star/setup/InstallEnvironment.idl
index 4929d4125cd5..d6cf7130d055 100644
--- a/offapi/com/sun/star/setup/InstallEnvironment.idl
+++ b/offapi/com/sun/star/setup/InstallEnvironment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,79 +37,79 @@ module com {  module sun {  module star {  module setup {
 published struct InstallEnvironment
 {
     // DocMerge: empty anyway
-    OSType                      eOSType;
+    OSType 						eOSType;
 
     // DocMerge: empty anyway
-    InstallType                 eInstallType;
+    InstallType 				eInstallType;
 
     // DocMerge: empty anyway
-    string                      strDestinationPath;
+    string						strDestinationPath;
 
     // DocMerge: empty anyway
-     long                       nClusterSize;
+     long						nClusterSize;
 
     // DocMerge: empty anyway
-    long                        nDriveSize;
+    long						nDriveSize;
 
     // DocMerge: empty anyway
-    sequence <short>            seqLanguages;
+    sequence <short>			seqLanguages;
 
     // DocMerge: empty anyway
-    sequence <short>            seqSwitchLanguages;
+    sequence <short>			seqSwitchLanguages;
 
     // DocMerge: empty anyway
-    sequence <ModuleState>      seqModuleIDList;
+    sequence <ModuleState>		seqModuleIDList;
 
     // DocMerge: empty anyway
-    string                      strUserName;
+    string   					strUserName;
 
     // DocMerge: empty anyway
-    string                      strUserFirstName;
+    string   					strUserFirstName;
 
     // DocMerge: empty anyway
-    string                      strUserId;
+    string   					strUserId;
 
     // DocMerge: empty anyway
-    string                      strCompanyname;
+    string   					strCompanyname;
 
     // DocMerge: empty anyway
-    string                      strStreet;
+    string   					strStreet;
 
     // DocMerge: empty anyway
-    string                      strCountry;
+    string   					strCountry;
 
     // DocMerge: empty anyway
-    string                      strZip;
+    string   					strZip;
 
     // DocMerge: empty anyway
-    string                      strCity;
+    string   					strCity;
 
     // DocMerge: empty anyway
-    string                      strTitle;
+    string   					strTitle;
 
     // DocMerge: empty anyway
-    string                      strPosition;
+    string   					strPosition;
 
     // DocMerge: empty anyway
-    string                      strPhonePriv;
+    string   					strPhonePriv;
 
     // DocMerge: empty anyway
-    string                      strPhoneCompany;
+    string   					strPhoneCompany;
 
     // DocMerge: empty anyway
-    string                      strPhoneFax;
+    string   					strPhoneFax;
 
     // DocMerge: empty anyway
-    string                      strEmail;
+    string   					strEmail;
 
     // DocMerge: empty anyway
-    string                      strState;
+    string   					strState;
 
     // DocMerge: empty anyway
-    string                      strFatherName;
+    string   					strFatherName;
 
     // DocMerge: empty anyway
-    string                      strApartmentNr;
+    string   					strApartmentNr;
     };
 }; }; }; };
 
diff --git a/offapi/com/sun/star/setup/InstallResponse.idl b/offapi/com/sun/star/setup/InstallResponse.idl
index 61930efdec91..0107f8508499 100644
--- a/offapi/com/sun/star/setup/InstallResponse.idl
+++ b/offapi/com/sun/star/setup/InstallResponse.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_setup_InstallResponse_idl__
-#define __com_sun_star_setup_InstallResponse_idl__
-
-module com {  module sun {  module star {  module setup {
-
+#ifndef __com_sun_star_setup_InstallResponse_idl__ 
+#define __com_sun_star_setup_InstallResponse_idl__ 
+ 
+module com {  module sun {  module star {  module setup { 
+     
 /// @deprecated
 published enum ResponseErrorCode
-{
+{ 
     // DocMerge: empty anyway
-    NOERROR,
-
+    NOERROR, 
+        
     // DocMerge: empty anyway
-    NOT_ENOUGH_SPACE
-    };
-
+    NOT_ENOUGH_SPACE 
+    }; 
+ 
 // DocMerge: empty anyway
 published struct InstallResponse
 {
     // DocMerge: empty anyway
-    boolean             bSuccess;
-
+    boolean     		bSuccess; 
+        
     // DocMerge: empty anyway
-    ResponseErrorCode   eErrorCode;
-
+    ResponseErrorCode	eErrorCode; 
+        
     // DocMerge: empty anyway
-    long                nSizeNeeded;
-
+    long				nSizeNeeded; 
+ 
     // DocMerge: empty anyway
-    boolean             bReboot;
-
+    boolean     		bReboot; 
+        
     // DocMerge: empty anyway
-    boolean             bLogout;
-    };
-}; }; }; };
-
-#endif
+    boolean     		bLogout; 
+    }; 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/setup/InstallType.idl b/offapi/com/sun/star/setup/InstallType.idl
index 2e79019f88f4..e71cc7e54604 100644
--- a/offapi/com/sun/star/setup/InstallType.idl
+++ b/offapi/com/sun/star/setup/InstallType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/setup/MakeDirAction.idl b/offapi/com/sun/star/setup/MakeDirAction.idl
index 3d2dd8a250ea..525b3bbbf6ac 100644
--- a/offapi/com/sun/star/setup/MakeDirAction.idl
+++ b/offapi/com/sun/star/setup/MakeDirAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_setup_MakeDirAction_idl__
-#define __com_sun_star_setup_MakeDirAction_idl__
-
-#ifndef __com_sun_star_setup_BaseAction_idl__
-#include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-module com {  module sun {  module star {  module setup {
-
+#ifndef __com_sun_star_setup_MakeDirAction_idl__ 
+#define __com_sun_star_setup_MakeDirAction_idl__ 
+ 
+#ifndef __com_sun_star_setup_BaseAction_idl__ 
+#include <com/sun/star/setup/BaseAction.idl> 
+#endif 
+ 
+module com {  module sun {  module star {  module setup { 
+     
 /// @deprecated
 published struct MakeDirAction: BaseAction
-{
+{ 
     // DocMerge: empty anyway
-    string          strDirname;
-
+    string			strDirname; 
+        
     // DocMerge: empty anyway
-    long            nRights;
-    };
-}; }; }; };
-
-#endif
+    long			nRights; 
+    }; 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/setup/MakeFolderAction.idl b/offapi/com/sun/star/setup/MakeFolderAction.idl
index 679c498703c2..ff1a3436bdfa 100644
--- a/offapi/com/sun/star/setup/MakeFolderAction.idl
+++ b/offapi/com/sun/star/setup/MakeFolderAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_setup_MakeFolderAction_idl__
-#define __com_sun_star_setup_MakeFolderAction_idl__
-
-#ifndef __com_sun_star_setup_BaseAction_idl__
-#include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-module com {  module sun {  module star {  module setup {
-
+#ifndef __com_sun_star_setup_MakeFolderAction_idl__ 
+#define __com_sun_star_setup_MakeFolderAction_idl__ 
+ 
+#ifndef __com_sun_star_setup_BaseAction_idl__ 
+#include <com/sun/star/setup/BaseAction.idl> 
+#endif 
+ 
+module com {  module sun {  module star {  module setup { 
+     
 /// @deprecated
 published struct MakeFolderAction: BaseAction
-{
+{ 
     // DocMerge: empty anyway
-    string              strFoldername;
-
+    string				strFoldername; 
+        
     // DocMerge: empty anyway
-    boolean             bUserFolder;
-    };
-}; }; }; };
-
-#endif
+    boolean				bUserFolder; 
+    }; 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/setup/MakeFolderItemAction.idl b/offapi/com/sun/star/setup/MakeFolderItemAction.idl
index d1de33a11a49..c0ec8c3c245e 100644
--- a/offapi/com/sun/star/setup/MakeFolderItemAction.idl
+++ b/offapi/com/sun/star/setup/MakeFolderItemAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_setup_MakeFolderItemAction_idl__
-#define __com_sun_star_setup_MakeFolderItemAction_idl__
-
-#ifndef __com_sun_star_setup_BaseAction_idl__
-#include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-module com {  module sun {  module star {  module setup {
-
+#ifndef __com_sun_star_setup_MakeFolderItemAction_idl__ 
+#define __com_sun_star_setup_MakeFolderItemAction_idl__ 
+ 
+#ifndef __com_sun_star_setup_BaseAction_idl__ 
+#include <com/sun/star/setup/BaseAction.idl> 
+#endif 
+ 
+module com {  module sun {  module star {  module setup { 
+     
 /// @deprecated
 published struct MakeFolderItemAction: BaseAction
-{
+{ 
     // DocMerge: empty anyway
-    string              strFoldername;
-
+    string				strFoldername; 
+        
     // DocMerge: empty anyway
-    string              strItemname;
-
+    string				strItemname; 
+        
     // DocMerge: empty anyway
-    string              strDestinationPath;
-
+    string				strDestinationPath; 
+        
     // DocMerge: empty anyway
-    string              strDestinationExecutable;
-
+    string				strDestinationExecutable; 
+        
     // DocMerge: empty anyway
-    string              strParameter;
-    };
-}; }; }; };
-
-#endif
+    string				strParameter; 
+    }; 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/setup/MakeShortcutAction.idl b/offapi/com/sun/star/setup/MakeShortcutAction.idl
index 15c2bbcde561..d52b9f356669 100644
--- a/offapi/com/sun/star/setup/MakeShortcutAction.idl
+++ b/offapi/com/sun/star/setup/MakeShortcutAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_setup_MakeShortcutAction_idl__
-#define __com_sun_star_setup_MakeShortcutAction_idl__
-
-#ifndef __com_sun_star_setup_BaseAction_idl__
-#include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-module com {  module sun {  module star {  module setup {
-
+#ifndef __com_sun_star_setup_MakeShortcutAction_idl__ 
+#define __com_sun_star_setup_MakeShortcutAction_idl__ 
+ 
+#ifndef __com_sun_star_setup_BaseAction_idl__ 
+#include <com/sun/star/setup/BaseAction.idl> 
+#endif 
+ 
+module com {  module sun {  module star {  module setup { 
+     
 /// @deprecated
 published struct MakeShortcutAction: BaseAction
-{
+{ 
     // DocMerge: empty anyway
-    string              strSource;
-
+    string				strSource; 
+        
     // DocMerge: empty anyway
-    string              strDestination;
-
+    string				strDestination; 
+ 
     // DocMerge: empty anyway
-    string              strPath;
-
+    string				strPath; 
+        
     // DocMerge: empty anyway
-    string              strDescription;
-    };
-}; }; }; };
-
-#endif
+    string				strDescription; 
+    }; 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/setup/MirrorEntry.idl b/offapi/com/sun/star/setup/MirrorEntry.idl
index bdd8029fea78..f19f421d3c74 100644
--- a/offapi/com/sun/star/setup/MirrorEntry.idl
+++ b/offapi/com/sun/star/setup/MirrorEntry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_setup_MirrorEntry_idl__
-#define __com_sun_star_setup_MirrorEntry_idl__
-
-module com {  module sun {  module star {  module setup {
-
+#ifndef __com_sun_star_setup_MirrorEntry_idl__ 
+#define __com_sun_star_setup_MirrorEntry_idl__ 
+ 
+module com {  module sun {  module star {  module setup { 
+     
 /// @deprecated
 published struct MirrorEntry
 {
     // DocMerge: empty anyway
-    string          strDisplayname;
-
+    string			strDisplayname; 
+        
     // DocMerge: empty anyway
-    string          strPath;
-
+    string			strPath; 
+        
     // DocMerge: empty anyway
-    short           nQuality;
-    };
-}; }; }; };
-
-#endif
+    short 			nQuality; 
+    }; 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/setup/ModuleInfo.idl b/offapi/com/sun/star/setup/ModuleInfo.idl
index a1d71aa84d55..39b22fed0ee2 100644
--- a/offapi/com/sun/star/setup/ModuleInfo.idl
+++ b/offapi/com/sun/star/setup/ModuleInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_setup_ModuleInfo_idl__
-#define __com_sun_star_setup_ModuleInfo_idl__
-
-module com {  module sun {  module star {  module setup {
-
+#ifndef __com_sun_star_setup_ModuleInfo_idl__ 
+#define __com_sun_star_setup_ModuleInfo_idl__ 
+ 
+module com {  module sun {  module star {  module setup { 
+     
 /// @deprecated
 published struct ModuleInfo
 {
     // DocMerge: empty anyway
-    string                      strID;
-
+    string						strID; 
+ 
     // DocMerge: empty anyway
-    string                      strName;
-
+    string						strName; 
+        
     // DocMerge: empty anyway
-    string                      strDescription;
-
+    string						strDescription; 
+        
     // DocMerge: empty anyway
-    string                      strOnSelect;
-
+    string						strOnSelect; 
+        
     // DocMerge: empty anyway
-    string                      strOnDeselect;
-
+    string						strOnDeselect; 
+ 
     // DocMerge: empty anyway
-    boolean                     isMinimal;
-
+    boolean						isMinimal; 
+        
     // DocMerge: empty anyway
-    boolean                     isDefault;
-
+    boolean						isDefault; 
+        
     // DocMerge: empty anyway
-    boolean                     isHiddenRoot;
-
+    boolean						isHiddenRoot; 
+        
     // DocMerge: empty anyway
-    boolean                     isDontSelectByUser;
-
+    boolean						isDontSelectByUser; 
+ 
     // DocMerge: empty anyway
-    long                        nSizeKB;
-
+    long						nSizeKB; 
+ 
     // DocMerge: empty anyway
-    sequence < any >            seqSubModules;
-    };
-}; }; }; };
-
-#endif
+    sequence < any >			seqSubModules; 
+    }; 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/setup/ModuleState.idl b/offapi/com/sun/star/setup/ModuleState.idl
index 54662fb68515..d5be3b7eea23 100644
--- a/offapi/com/sun/star/setup/ModuleState.idl
+++ b/offapi/com/sun/star/setup/ModuleState.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_setup_ModuleState_idl__
-#define __com_sun_star_setup_ModuleState_idl__
-
-module com {  module sun {  module star {  module setup {
-
+#ifndef __com_sun_star_setup_ModuleState_idl__ 
+#define __com_sun_star_setup_ModuleState_idl__ 
+ 
+module com {  module sun {  module star {  module setup { 
+     
 /// @deprecated
 published struct ModuleState
 {
     // DocMerge: empty anyway
-    string                      strID;
-
+    string						strID; 
+        
     // DocMerge: empty anyway
-    boolean                     isSelected;
-
+    boolean						isSelected; 
+        
     // DocMerge: empty anyway
-    boolean                     isInstalled;
-    };
-}; }; }; };
-
-#endif
+    boolean						isInstalled; 
+    }; 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/setup/OSType.idl b/offapi/com/sun/star/setup/OSType.idl
index eab1505194d7..1929c37ae9d6 100644
--- a/offapi/com/sun/star/setup/OSType.idl
+++ b/offapi/com/sun/star/setup/OSType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
 
 // dear porters: please do not apply any patches for new platforms here
 //               it depricated anyway and any patches will cause API
-//       incompatibity errors  mh
-
+//		 incompatibity errors  mh
+ 
 module com {  module sun {  module star {  module setup {
 
 /// @deprecated
diff --git a/offapi/com/sun/star/setup/ProductRegistration.idl b/offapi/com/sun/star/setup/ProductRegistration.idl
index 9f684b810fbe..9dd3fa804a4a 100644
--- a/offapi/com/sun/star/setup/ProductRegistration.idl
+++ b/offapi/com/sun/star/setup/ProductRegistration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@
 #include <com/sun/star/task/XJob.idl>
 #endif
 
-module com {  module sun {  module star {  module setup {
+module com {  module sun {  module star {  module setup { 
 
 /** provides a mechanism for registering the product.
 
@@ -88,6 +88,6 @@ published service ProductRegistration
     interface com::sun::star::task::XJob;
 };
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/setup/ProfileItemAction.idl b/offapi/com/sun/star/setup/ProfileItemAction.idl
index 68d432d2022f..5e4e2c2e5552 100644
--- a/offapi/com/sun/star/setup/ProfileItemAction.idl
+++ b/offapi/com/sun/star/setup/ProfileItemAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_setup_ProfileItemAction_idl__
-#define __com_sun_star_setup_ProfileItemAction_idl__
-
-#ifndef __com_sun_star_setup_BaseAction_idl__
-#include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-module com {  module sun {  module star {  module setup {
-
+#ifndef __com_sun_star_setup_ProfileItemAction_idl__ 
+#define __com_sun_star_setup_ProfileItemAction_idl__ 
+ 
+#ifndef __com_sun_star_setup_BaseAction_idl__ 
+#include <com/sun/star/setup/BaseAction.idl> 
+#endif 
+ 
+module com {  module sun {  module star {  module setup { 
+     
 /// @deprecated
 published struct ProfileItemAction: BaseAction
-{
+{ 
     // DocMerge: empty anyway
-    string              strProfilename;
-
+    string				strProfilename; 
+        
     // DocMerge: empty anyway
-    string              strSection;
-
+    string				strSection; 
+        
     // DocMerge: empty anyway
-    string              strKey;
-
+    string				strKey; 
+        
     // DocMerge: empty anyway
-    string              strValue;
-
+    string				strValue; 
+ 
     // DocMerge: empty anyway
-    boolean             bCreate;
-    };
-}; }; }; };
-
-#endif
+    boolean 			bCreate; 
+    }; 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/setup/Setup.idl b/offapi/com/sun/star/setup/Setup.idl
index b6012bc46ed8..4a9dca328506 100644
--- a/offapi/com/sun/star/setup/Setup.idl
+++ b/offapi/com/sun/star/setup/Setup.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifndef __com_sun_star_setup_XSetup_idl__
-#include <com/sun/star/setup/XSetup.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-module com {  module sun {  module star {  module setup {
-
+ 
+#ifndef __com_sun_star_setup_XSetup_idl__ 
+#include <com/sun/star/setup/XSetup.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XServiceInfo_idl__ 
+#include <com/sun/star/lang/XServiceInfo.idl> 
+#endif 
+ 
+module com {  module sun {  module star {  module setup { 
+     
 /// @deprecated
 published service Setup
-{
+{ 
     // DocMerge: empty anyway
-    interface com::sun::star::setup::XSetup;
-
+    interface com::sun::star::setup::XSetup; 
+        
     // DocMerge: empty anyway
-    interface com::sun::star::lang::XServiceInfo;
-    };
-
-}; }; }; };
-
+    interface com::sun::star::lang::XServiceInfo; 
+    }; 
+ 
+}; }; }; }; 
+ 
diff --git a/offapi/com/sun/star/setup/SizeInfo.idl b/offapi/com/sun/star/setup/SizeInfo.idl
index ae185838d4ec..a59359321445 100644
--- a/offapi/com/sun/star/setup/SizeInfo.idl
+++ b/offapi/com/sun/star/setup/SizeInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_setup_SizeInfo_idl__
-#define __com_sun_star_setup_SizeInfo_idl__
-
-module com {  module sun {  module star {  module setup {
-
+#ifndef __com_sun_star_setup_SizeInfo_idl__ 
+#define __com_sun_star_setup_SizeInfo_idl__ 
+ 
+module com {  module sun {  module star {  module setup { 
+     
 /// @deprecated
 published struct SizeInfo
 {
     // DocMerge: empty anyway
-    long                        nNormalSizeKB;
-
+    long						nNormalSizeKB; 
+        
     // DocMerge: empty anyway
-    long                        nNormalTempSizeKB;
-
+    long						nNormalTempSizeKB; 
+        
     // DocMerge: empty anyway
-    long                        nMinimalSizeKB;
-
+    long						nMinimalSizeKB; 
+        
     // DocMerge: empty anyway
-    long                        nMinimalTempSizeKB;
-    };
-}; }; }; };
-
-#endif
+    long						nMinimalTempSizeKB; 
+    }; 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/setup/UnzipAction.idl b/offapi/com/sun/star/setup/UnzipAction.idl
index 034de904d5d2..048bdfdb1720 100644
--- a/offapi/com/sun/star/setup/UnzipAction.idl
+++ b/offapi/com/sun/star/setup/UnzipAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,29 +41,29 @@ module com {  module sun {  module star {  module setup {
 published struct UnzipAction: BaseAction
 {
     // DocMerge: empty anyway
-    string              strSourceFilename;
+    string				strSourceFilename;
 
     // DocMerge: empty anyway
-    string              strDestinationPath;
+    string				strDestinationPath;
 
     // DocMerge: empty anyway
-    string              strPattern;
+    string				strPattern;
 
     // DocMerge: empty anyway
-    boolean             bUnoComponent;
-    boolean             bActiveX;
+    boolean				bUnoComponent;
+    boolean				bActiveX;
 
     // DocMerge: empty anyway
-    boolean             bOverwrite;
+    boolean				bOverwrite;
 
     // DocMerge: empty anyway
     com::sun::star::util::DateTime aDateTime;
 
     // DocMerge: empty anyway
-    long                nRights;
+    long				nRights;
 
     // DocMerge: empty anyway
-    sequence <string>   seqSubFiles;
+    sequence <string>	seqSubFiles;
     };
 }; }; }; };
 
diff --git a/offapi/com/sun/star/setup/UpdateType.idl b/offapi/com/sun/star/setup/UpdateType.idl
index aeaa7e329cf8..98df085c755e 100644
--- a/offapi/com/sun/star/setup/UpdateType.idl
+++ b/offapi/com/sun/star/setup/UpdateType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/setup/VersionIdentifier.idl b/offapi/com/sun/star/setup/VersionIdentifier.idl
index f7c9705b6061..4ff52054d730 100644
--- a/offapi/com/sun/star/setup/VersionIdentifier.idl
+++ b/offapi/com/sun/star/setup/VersionIdentifier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_setup_VersionIdentifier_idl__
-#define __com_sun_star_setup_VersionIdentifier_idl__
-
-#include <com/sun/star/setup/OSType.idl>
-
-module com {  module sun {  module star {  module setup {
-
+#ifndef __com_sun_star_setup_VersionIdentifier_idl__ 
+#define __com_sun_star_setup_VersionIdentifier_idl__ 
+ 
+#include <com/sun/star/setup/OSType.idl> 
+ 
+module com {  module sun {  module star {  module setup { 
+     
 /// @deprecated
 published struct VersionIdentifier
 {
     // DocMerge: empty anyway
-    OSType                      eOSType;
-
+    OSType 						eOSType; 
+        
     // DocMerge: empty anyway
-    short                       nLanguage;
-
+    short						nLanguage; 
+        
     // DocMerge: empty anyway
-    long                        nBuildnumber;
-
+    long						nBuildnumber; 
+        
     // DocMerge: empty anyway
-    string                      strProductKey;
-
+    string 						strProductKey; 
+ 
     // DocMerge: empty anyway
-    string                      strInstLanguages;
-
+    string						strInstLanguages; 
+        
     // DocMerge: empty anyway
-    string                      strInstMinor;
-    };
-}; }; }; };
-
-#endif
+    string 						strInstMinor; 
+    }; 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/setup/WindowsRegistryAction.idl b/offapi/com/sun/star/setup/WindowsRegistryAction.idl
index 33e9f839be3c..0d281d9ca73c 100644
--- a/offapi/com/sun/star/setup/WindowsRegistryAction.idl
+++ b/offapi/com/sun/star/setup/WindowsRegistryAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_setup_WindowsRegistryAction_idl__
-#define __com_sun_star_setup_WindowsRegistryAction_idl__
-
-#ifndef __com_sun_star_setup_BaseAction_idl__
-#include <com/sun/star/setup/BaseAction.idl>
-#endif
-
-module com {  module sun {  module star {  module setup {
-
+#ifndef __com_sun_star_setup_WindowsRegistryAction_idl__ 
+#define __com_sun_star_setup_WindowsRegistryAction_idl__ 
+ 
+#ifndef __com_sun_star_setup_BaseAction_idl__ 
+#include <com/sun/star/setup/BaseAction.idl> 
+#endif 
+ 
+module com {  module sun {  module star {  module setup { 
+     
 /// @deprecated
 published struct WindowsRegistryAction: BaseAction
-{
+{ 
     // DocMerge: empty anyway
-    string          strKey;
-
+    string			strKey; 
+        
     // DocMerge: empty anyway
-    string          strSubkey;
-
+    string			strSubkey; 
+        
     // DocMerge: empty anyway
-    string          strName;
-
+    string			strName; 
+        
     // DocMerge: empty anyway
-    string          strValue;
-
+    string			strValue; 
+ 
     // DocMerge: empty anyway
-    boolean         bCreate;
-
+    boolean			bCreate; 
+        
     // DocMerge: empty anyway
-    boolean         bHexValue;
-
+    boolean 		bHexValue; 
+        
     // DocMerge: empty anyway
-    boolean         bDeleteAll;
-    };
-}; }; }; };
-
-#endif
+    boolean			bDeleteAll; 
+    }; 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/setup/XSetup.idl b/offapi/com/sun/star/setup/XSetup.idl
index 68f35cda76ae..a918f0e2161f 100644
--- a/offapi/com/sun/star/setup/XSetup.idl
+++ b/offapi/com/sun/star/setup/XSetup.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,58 +46,58 @@ module com {  module sun {  module star {  module setup {
 published interface XSetup: com::sun::star::uno::XInterface
 {
     // DocMerge: empty anyway
-    boolean                 isVersionSupported          ( [in] VersionIdentifier aVerIdentifier );
+    boolean					isVersionSupported			( [in] VersionIdentifier aVerIdentifier );
 
     // DocMerge: empty anyway
-    sequence <short>        getAvailableLanguages       ( [in] VersionIdentifier aVerIdentifier );
+    sequence <short>		getAvailableLanguages		( [in] VersionIdentifier aVerIdentifier );
 
     // DocMerge: empty anyway
-    ModuleInfo              getRootModule               ( [in] VersionIdentifier aVerIdentifier );
+    ModuleInfo				getRootModule				( [in] VersionIdentifier aVerIdentifier );
 
     // DocMerge: empty anyway
-    void                    setHiddenModule             ( [in] VersionIdentifier aVerIdentifier,
+    void 					setHiddenModule				( [in] VersionIdentifier aVerIdentifier,
                                                           [in] string strModuleID,
                                                           [in] boolean bHidden );
 
     // DocMerge: empty anyway
-    string                  getProductname              ( [in] VersionIdentifier aVerIdentifier );
+    string					getProductname				( [in] VersionIdentifier aVerIdentifier );
 
     // DocMerge: empty anyway
-    string                  getVendorname               ( [in] VersionIdentifier aVerIdentifier );
+    string					getVendorname				( [in] VersionIdentifier aVerIdentifier );
 
     // DocMerge: empty anyway
-    string                  getDefaultDestinationPath   ( [in] VersionIdentifier aVerIdentifier );
+    string					getDefaultDestinationPath	( [in] VersionIdentifier aVerIdentifier );
 
     // DocMerge: empty anyway
-    SizeInfo                getStandardSizeValues       ( [in] VersionIdentifier aVerIdentifier,
+    SizeInfo				getStandardSizeValues		( [in] VersionIdentifier aVerIdentifier,
                                                           [in] sequence <short> seqLanguages );
 
     // DocMerge: empty anyway
-    string                  getHelpText                 ( [in] VersionIdentifier aVerIdentifier,
+    string					getHelpText					( [in] VersionIdentifier aVerIdentifier,
                                                           [in] string strPagename );
 
     // DocMerge: empty anyway
-    string                  getReadmeText               ( [in] VersionIdentifier aVerIdentifier );
+    string					getReadmeText				( [in] VersionIdentifier aVerIdentifier );
 
     // DocMerge: empty anyway
-    string                  getLicenseText              ( [in] VersionIdentifier aVerIdentifier );
+    string					getLicenseText				( [in] VersionIdentifier aVerIdentifier );
 
     // DocMerge: empty anyway
-    string                  getNativeLocation           ( [in] VersionIdentifier aVerIdentifier );
+    string					getNativeLocation			( [in] VersionIdentifier aVerIdentifier );
 
     // DocMerge: empty anyway
-    sequence < any >        getMirrorList               ( [in] VersionIdentifier aVerIdentifier );
+    sequence < any >   		getMirrorList				( [in] VersionIdentifier aVerIdentifier );
 
     // DocMerge: empty anyway
-    UpdateType              isUpdateAvailable           ( [in] VersionIdentifier aVerIdentifier,
+    UpdateType		   		isUpdateAvailable			( [in] VersionIdentifier aVerIdentifier,
                                                           [out] VersionIdentifier aNewVerIdentifier );
 
     // DocMerge: empty anyway
-    boolean                 isModuleAvailable           ( [in] VersionIdentifier aVerIdentifier,
+    boolean			   		isModuleAvailable			( [in] VersionIdentifier aVerIdentifier,
                                                           [in] string strModuleID );
 
     // DocMerge: empty anyway
-    sequence < any >        getActionListForInstall     ( [in] VersionIdentifier aVerIdentifier,
+    sequence < any >   		getActionListForInstall		( [in] VersionIdentifier aVerIdentifier,
                                                           [in] VersionIdentifier aOldVerIdentifier,
                                                           [in] InstallEnvironment aEnvironment,
                                                           [out] InstallResponse aResponse );
diff --git a/offapi/com/sun/star/sheet/AccessibleCell.idl b/offapi/com/sun/star/sheet/AccessibleCell.idl
index 014b5c84b82f..697c27ace55f 100644
--- a/offapi/com/sun/star/sheet/AccessibleCell.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCell.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -60,7 +60,7 @@ published service AccessibleCell
     /** This interface gives access to the whole content of the cell.
 
     <ul>
-        <li>The parent returned by
+        <li>The parent returned by 
             <method scope="::com::sun::star::accessibility"
             >XAccessibleContext::getAccessibleParent</method>
             is the accessible spreadsheet.</li>
@@ -87,27 +87,27 @@ published service AccessibleCell
                     >AccessibleStateType::MULTISELECTABLE</const> is always
                     true.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::OPAQUE</const> is false if the cell
-                    has no background color or graphic, otherwise it is
+                    >AccessibleStateType::OPAQUE</const> is false if the cell 
+                    has no background color or graphic, otherwise it is 
                     true.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::RESIZEABLE</const> is false if the
+                    >AccessibleStateType::RESIZEABLE</const> is false if the 
                     table is protected, otherwise is it true.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SELECTABLE</const> is always
+                    >AccessibleStateType::SELECTABLE</const> is always 
                     true.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SELECTED</const> is true, if the
+                    >AccessibleStateType::SELECTED</const> is true, if the 
                     cell is selected.</li>
                 <li><const scope="::com::sun::star::accessibility"
                     >AccessibleStateType::TRANSIENT</const> is always true.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SHOWING</const>Is true if the
+                    >AccessibleStateType::SHOWING</const>Is true if the 
                     Bounding Box lies in Bounding Box of the parent. Otherwise
                     it is false.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::VISIBLE</const>Is false if the
-                    column/row with this cell is filtered or hidden.
+                    >AccessibleStateType::VISIBLE</const>Is false if the 
+                    column/row with this cell is filtered or hidden. 
                     Otherwise is true.</li>
             </ul>
         </li>
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvCell.idl b/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
index 10e77f7bcbc6..5470880a358e 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl b/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
index 1ee7df9ddba1..48d7bbe8ba49 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvTable.idl b/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
index 95f4a91bdf6a..35e81d142bc9 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
index df8e41e875e1..9827aa6fff44 100644
--- a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
+++ b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,14 +59,14 @@ published service AccessiblePageHeaderFooterAreasView
         <li>The parent returned by <method scope="::com::sun::star::accessibility"
             >XAccessibleContext::getAccessibleParent</method>
             is the accessible spreadsheet page preview.</li>
-        <li>The children returned by
+        <li>The children returned by 
             <method scope="::com::sun::star::accessibility"
             >XAccessibleContext::getAccessibleChild</method> all
-            support the interface
-            <type scope="::com::sun::star::accessibility">XAccessible</type.
+            support the interface 
+            <type scope="::com::sun::star::accessibility">XAccessible</type. 
             Calling
             <method scope="::com::sun::star::accessibility"
-            >XAccessible::getAccessibleContext</method> for these children
+            >XAccessible::getAccessibleContext</method> for these children 
             returns an object that supports one of the following services.</li>
         <ul>
             <li><type scope="::com::sun::star::text">AccessibleHeaderFooterView</type>:
@@ -83,7 +83,7 @@ published service AccessiblePageHeaderFooterAreasView
         <li>The description is ???.</li>
         <li>The name is Header or Footer respectively.</li>
         <li>The role is <const scope="::com::sun::star::accessibility"
-            >AccessibleRole::HEADER</const> or
+            >AccessibleRole::HEADER</const> or 
             <const scope="::com::sun::star::accessibility"
             >AccessibleRole::FOOTER</const>.</li>
         <li>There are no relations.</li>
@@ -93,8 +93,8 @@ published service AccessiblePageHeaderFooterAreasView
                     >AccessibleStateType::DEFUNC</const> is always false until
                     the preview is closed.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::EDITABLE</const> is always false,
-                    because the document is not editable in the page preview.
+                    >AccessibleStateType::EDITABLE</const> is always false, 
+                    because the document is not editable in the page preview. 
                     So it is left out of the list.</li>
                 <li><const scope="::com::sun::star::accessibility"
                     >AccessibleStateType::ENABLED</const> is always true.</li>
@@ -102,15 +102,15 @@ published service AccessiblePageHeaderFooterAreasView
                     >AccessibleStateType::MULTILINE</const> makes no sense on
                     a document and so it is left out of the list.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::MULTISELECTABLE</const> is always
-                    false, because in a page preview a selection is not
+                    >AccessibleStateType::MULTISELECTABLE</const> is always 
+                    false, because in a page preview a selection is not 
                     possible. So it is left out of the list.</li>
                 <li><const scope="::com::sun::star::accessibility"
                     >AccessibleStateType::OPAQUE</const> is always true.</li>
                 <li><const scope="::com::sun::star::accessibility"
                     >AccessibleStateType::RESIZEABLE</const> is always false,
                     because you can resize the window of the page preview, but
-                    not the page preview itself. So it is left out of the
+                    not the page preview itself. So it is left out of the 
                     list.</li>
                 <li><const scope="::com::sun::star::accessibility"
                     >AccessibleStateType::SELECTABLE</const> is always false,
@@ -121,8 +121,8 @@ published service AccessiblePageHeaderFooterAreasView
                     because in the page preview is no selection possible. So it
                     is left out of the list.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SHOWING</const>Is true if the
-                    Bounding Box lies in the Bounding Box of the parent.
+                    >AccessibleStateType::SHOWING</const>Is true if the 
+                    Bounding Box lies in the Bounding Box of the parent. 
                     Otherwise it is false.</li>
                 <li><const scope="::com::sun::star::accessibility"
                     >AccessibleStateType::VISIBLE</const>Is always true.</li>
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
index 5d703ebe0a0d..77fb12bad97d 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -70,11 +70,11 @@ published service AccessibleSpreadsheet
             >XAccessibleContext::getAccessibleChild</method> all
             support the interface XAccessible. Calling
             <method scope="::com::sun::star::accessibility"
-            >XAccessible::getAccessibleContext</method> for these children
+            >XAccessible::getAccessibleContext</method> for these children 
             returns an object that supports the following service.</li>
         <ul>
             <li><type scope="::com::sun::star::sheet">AccessibleCell</type>:
-                A child where calling
+                A child where calling 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleChild</method>
                 an object that supports this service is returned for
@@ -111,17 +111,17 @@ published service AccessibleSpreadsheet
                 <li><const scope="::com::sun::star::accessibility"
                     >AccessibleStateType::OPAQUE</const> is always true.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::RESIZEABLE</const>is always
+                    >AccessibleStateType::RESIZEABLE</const>is always 
                     false.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SELECTABLE</const> is always
+                    >AccessibleStateType::SELECTABLE</const> is always 
                     true.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SELECTED</const> is true if the
+                    >AccessibleStateType::SELECTED</const> is true if the 
                     complete table (all cells) is selected.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SHOWING</const>Is true if the
-                    Bounding Box lies in the Bounding Box of the parent.
+                    >AccessibleStateType::SHOWING</const>Is true if the 
+                    Bounding Box lies in the Bounding Box of the parent. 
                     Otherwise it is false.</li>
                 <li><const scope="::com::sun::star::accessibility"
                     >AccessibleStateType::VISIBLE</const>Is always true.</li>
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
index 3070a71d6443..876ba34b6785 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
index bc676463c47b..fb60fa499df5 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,11 +56,11 @@ published service AccessibleSpreadsheetPageView
         visible on the screen in the page preview.
 
     <ul>
-        <li>The parent returned by
+        <li>The parent returned by 
             <method scope="::com::sun::star::accessibility"
             >XAccessibleContext::getAccessibleParent</method>
             is the window wich contains the view of these page preview.</li>
-        <li>The children returned by
+        <li>The children returned by 
             <method scope="::com::sun::star::accessibility"
             >XAccessibleContext::getAccessibleChild</method> all
             support the interface XAccessible. Calling
@@ -69,13 +69,13 @@ published service AccessibleSpreadsheetPageView
             an object that supports one of the following services.</li>
         <ul>
             <li><type scope="::com::sun::star::sheet"
-                >AccessiblePageHeaderFooterAreasView</type>: A child where calling
+                >AccessiblePageHeaderFooterAreasView</type>: A child where calling 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleChild</method>
                 an object that supports this service is returned for
                 every header and footer that is at least partially visible.</li>
             <li><type scope="::com::sun::star::table">AccessibleTableView</type>:
-                A child where calling
+                A child where calling 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleChild::getAccessibleChild</method>
                 an object that supports this service is returned for
@@ -83,7 +83,7 @@ published service AccessibleSpreadsheetPageView
                 and is at least partially visible. A table fragment is the
                 part of a table that is displayed on a certain page.</li>
             <li><type scope="::com::sun::star::drawing">AccessibleShape</type>:
-                A child where calling
+                A child where calling 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleChild</method>
                 an object that supports this service is returned
@@ -92,7 +92,7 @@ published service AccessibleSpreadsheetPageView
                 <type>AccessibleSpreadsheetPageView</type> regardless
                 whether they are bound to a table or a cell.</li>
             <li><type scope="::com::sun::star::text">AccessibleParagraphView</type>:
-                A child where calling
+                A child where calling 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleChild</method>
                 an object that supports this service is returned for
@@ -128,8 +128,8 @@ published service AccessibleSpreadsheetPageView
                     >AccessibleStateType::DEFUNC</const> is always false until
                     the preview is closed.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::EDITABLE</const> is always false,
-                    because the document is not editable in the page preview.
+                    >AccessibleStateType::EDITABLE</const> is always false, 
+                    because the document is not editable in the page preview. 
                     So it is left out of the list.</li>
                 <li><const scope="::com::sun::star::accessibility"
                     >AccessibleStateType::ENABLED</const> is always true.</li>
@@ -138,22 +138,22 @@ published service AccessibleSpreadsheetPageView
                     document and so it is left out of the list.</li>
                 <li><const scope="::com::sun::star::accessibility"
                     >AccessibleStateType::MULTI_SELECTABLE</const> is always
-                    false, because in a page preview a selection is not
+                    false, because in a page preview a selection is not 
                     possible. So it is left out of the list.</li>
                 <li><const scope="::com::sun::star::accessibility"
                     >AccessibleStateType::OPAQUE</const> is always true.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::RESIZEABLE</const> is always false,
+                    >AccessibleStateType::RESIZEABLE</const> is always false, 
                     because you can resize the window of the page preview, but
-                    not the page preview itself. So it is left out of the
+                    not the page preview itself. So it is left out of the 
                     list.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SELECTABLE</const> is always false,
-                    because in the page preview is no selection possible. So
+                    >AccessibleStateType::SELECTABLE</const> is always false, 
+                    because in the page preview is no selection possible. So 
                     it is left out of the list.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SELECTED</const> is always false,
-                    because in the page preview is no selection possible. So
+                    >AccessibleStateType::SELECTED</const> is always false, 
+                    because in the page preview is no selection possible. So 
                     it is left out of the list.</li>
                 <li><const scope="::com::sun::star::accessibility"
                     >AccessibleStateType::SHOWING</const>Is true if the
diff --git a/offapi/com/sun/star/sheet/ActivationEvent.idl b/offapi/com/sun/star/sheet/ActivationEvent.idl
index 481b4cca723a..d0f194be7355 100644
--- a/offapi/com/sun/star/sheet/ActivationEvent.idl
+++ b/offapi/com/sun/star/sheet/ActivationEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/AddIn.idl b/offapi/com/sun/star/sheet/AddIn.idl
index 8f76f268416e..c0081a48b918 100644
--- a/offapi/com/sun/star/sheet/AddIn.idl
+++ b/offapi/com/sun/star/sheet/AddIn.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -147,7 +147,7 @@ published service AddIn
 
     // ------------------------------------------------------------------------
 
-    /** provides access to compatibility names for the functions.
+    /**	provides access to compatibility names for the functions.
      */
     [optional] interface com::sun::star::sheet::XCompatibilityNames;
 };
diff --git a/offapi/com/sun/star/sheet/AddressConvention.idl b/offapi/com/sun/star/sheet/AddressConvention.idl
index 6eae6190477d..9d21135684c6 100644
--- a/offapi/com/sun/star/sheet/AddressConvention.idl
+++ b/offapi/com/sun/star/sheet/AddressConvention.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@ module com {  module sun {  module star {  module sheet {
 
 //=============================================================================
 
-/** These constants specify which address convention to use in the formula
+/** These constants specify which address convention to use in the formula 
     parser.  Each variation specifies a different cell and cell range address
     syntax.
 
@@ -42,7 +42,7 @@ module com {  module sun {  module star {  module sheet {
   */
 constants AddressConvention
 {
-
+    
     const short UNSPECIFIED = -1;
 
 
diff --git a/offapi/com/sun/star/sheet/Border.idl b/offapi/com/sun/star/sheet/Border.idl
index b93549545f80..b5b92deb26c9 100644
--- a/offapi/com/sun/star/sheet/Border.idl
+++ b/offapi/com/sun/star/sheet/Border.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/CellAnnotation.idl b/offapi/com/sun/star/sheet/CellAnnotation.idl
index 16c2f3620639..42fd49e25b44 100644
--- a/offapi/com/sun/star/sheet/CellAnnotation.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/CellAnnotationShape.idl b/offapi/com/sun/star/sheet/CellAnnotationShape.idl
index 1d5cc467f299..86d7a58ab090 100644
--- a/offapi/com/sun/star/sheet/CellAnnotationShape.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotationShape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/CellAnnotations.idl b/offapi/com/sun/star/sheet/CellAnnotations.idl
index 5831655d4634..c5429537f7f6 100644
--- a/offapi/com/sun/star/sheet/CellAnnotations.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotations.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl b/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl
index 1e70eb30c5c3..2d9aecdd334b 100644
--- a/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellAnnotationsEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/CellAreaLink.idl b/offapi/com/sun/star/sheet/CellAreaLink.idl
index 75c0a4d810b1..555f8515f475 100644
--- a/offapi/com/sun/star/sheet/CellAreaLink.idl
+++ b/offapi/com/sun/star/sheet/CellAreaLink.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/CellAreaLinks.idl b/offapi/com/sun/star/sheet/CellAreaLinks.idl
index 62b601752c10..ef91308af943 100644
--- a/offapi/com/sun/star/sheet/CellAreaLinks.idl
+++ b/offapi/com/sun/star/sheet/CellAreaLinks.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl b/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl
index 6fda9e4f824d..98cf349d2d19 100644
--- a/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellAreaLinksEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/CellDeleteMode.idl b/offapi/com/sun/star/sheet/CellDeleteMode.idl
index 1570cb547762..5329879186bb 100644
--- a/offapi/com/sun/star/sheet/CellDeleteMode.idl
+++ b/offapi/com/sun/star/sheet/CellDeleteMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/CellFlags.idl b/offapi/com/sun/star/sheet/CellFlags.idl
index 1c579412797f..65df13dd1fa7 100644
--- a/offapi/com/sun/star/sheet/CellFlags.idl
+++ b/offapi/com/sun/star/sheet/CellFlags.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/CellFormatRanges.idl b/offapi/com/sun/star/sheet/CellFormatRanges.idl
index c3002e1c80f6..a221dc24573a 100644
--- a/offapi/com/sun/star/sheet/CellFormatRanges.idl
+++ b/offapi/com/sun/star/sheet/CellFormatRanges.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl b/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl
index ef945a036225..fa104a423dc3 100644
--- a/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellFormatRangesEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/CellInsertMode.idl b/offapi/com/sun/star/sheet/CellInsertMode.idl
index 48e81a78d7f2..859a6ec1cbb6 100644
--- a/offapi/com/sun/star/sheet/CellInsertMode.idl
+++ b/offapi/com/sun/star/sheet/CellInsertMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/Cells.idl b/offapi/com/sun/star/sheet/Cells.idl
index 125c42f516c2..2f827573390a 100644
--- a/offapi/com/sun/star/sheet/Cells.idl
+++ b/offapi/com/sun/star/sheet/Cells.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/CellsEnumeration.idl b/offapi/com/sun/star/sheet/CellsEnumeration.idl
index 53e7a59a86e1..7e04193cc0d0 100644
--- a/offapi/com/sun/star/sheet/CellsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/CellsEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/ComplexReference.idl b/offapi/com/sun/star/sheet/ComplexReference.idl
index 12a8fd5db8e1..934a62dec91c 100644
--- a/offapi/com/sun/star/sheet/ComplexReference.idl
+++ b/offapi/com/sun/star/sheet/ComplexReference.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/ConditionOperator.idl b/offapi/com/sun/star/sheet/ConditionOperator.idl
index 5db568c7f660..0333f31397a9 100644
--- a/offapi/com/sun/star/sheet/ConditionOperator.idl
+++ b/offapi/com/sun/star/sheet/ConditionOperator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl b/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl
index 7c070b721ee4..13000e192514 100644
--- a/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl
+++ b/offapi/com/sun/star/sheet/ConsolidationDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DDEItemInfo.idl b/offapi/com/sun/star/sheet/DDEItemInfo.idl
index bf884ea7cbfb..0d4267e55bc5 100644
--- a/offapi/com/sun/star/sheet/DDEItemInfo.idl
+++ b/offapi/com/sun/star/sheet/DDEItemInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DDELink.idl b/offapi/com/sun/star/sheet/DDELink.idl
index 0ef60285ed3c..453049106ef8 100644
--- a/offapi/com/sun/star/sheet/DDELink.idl
+++ b/offapi/com/sun/star/sheet/DDELink.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DDELinkInfo.idl b/offapi/com/sun/star/sheet/DDELinkInfo.idl
index b9df62f3cd70..a7d6c9405452 100644
--- a/offapi/com/sun/star/sheet/DDELinkInfo.idl
+++ b/offapi/com/sun/star/sheet/DDELinkInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DDELinkMode.idl b/offapi/com/sun/star/sheet/DDELinkMode.idl
index 472b9626a64e..f9b427867126 100644
--- a/offapi/com/sun/star/sheet/DDELinkMode.idl
+++ b/offapi/com/sun/star/sheet/DDELinkMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DDELinks.idl b/offapi/com/sun/star/sheet/DDELinks.idl
index 8a8d8b093756..412f3e19c9b9 100644
--- a/offapi/com/sun/star/sheet/DDELinks.idl
+++ b/offapi/com/sun/star/sheet/DDELinks.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DDELinksEnumeration.idl b/offapi/com/sun/star/sheet/DDELinksEnumeration.idl
index 93a19a052c88..b5b6b7c97edb 100644
--- a/offapi/com/sun/star/sheet/DDELinksEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DDELinksEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataImportMode.idl b/offapi/com/sun/star/sheet/DataImportMode.idl
index a969960824a6..e96868bca70f 100644
--- a/offapi/com/sun/star/sheet/DataImportMode.idl
+++ b/offapi/com/sun/star/sheet/DataImportMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotDescriptor.idl b/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
index 992afdef5ed9..070ac31d042d 100644
--- a/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
+++ b/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotField.idl b/offapi/com/sun/star/sheet/DataPilotField.idl
index d558f0a86f50..b3fc3e78b56a 100644
--- a/offapi/com/sun/star/sheet/DataPilotField.idl
+++ b/offapi/com/sun/star/sheet/DataPilotField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldAutoShowInfo.idl b/offapi/com/sun/star/sheet/DataPilotFieldAutoShowInfo.idl
index 194287272546..22df75bd9c97 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldAutoShowInfo.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldAutoShowInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldFilter.idl b/offapi/com/sun/star/sheet/DataPilotFieldFilter.idl
index e678b3a18a0b..0a9df0862585 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldFilter.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldFilter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl
index da07a768a57d..e8b5d79a1fe2 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroup.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupBy.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupBy.idl
index a08826022609..a2183551699f 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupBy.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupBy.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl
index f486cb0d689a..aa6a1e9f1ca9 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl
index 380dab374dc5..15d995899191 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl
index 40a65552aa99..d68f02d9e883 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupItem.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl
index 544863db4d4b..7ba028b18c40 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroups.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl
index 6b94a42df494..aaf8dda5985c 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldGroupsEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldLayoutInfo.idl b/offapi/com/sun/star/sheet/DataPilotFieldLayoutInfo.idl
index fb3fff39a687..7e7037427a89 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldLayoutInfo.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldLayoutInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldLayoutMode.idl b/offapi/com/sun/star/sheet/DataPilotFieldLayoutMode.idl
index 6f2025739803..ff7b1847693f 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldLayoutMode.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldLayoutMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldOrientation.idl b/offapi/com/sun/star/sheet/DataPilotFieldOrientation.idl
index 03c74115540d..8f31d724eedf 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldOrientation.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldOrientation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldReference.idl b/offapi/com/sun/star/sheet/DataPilotFieldReference.idl
index 163917c79b78..f3f31364dd0b 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldReference.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldReference.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldReferenceItemType.idl b/offapi/com/sun/star/sheet/DataPilotFieldReferenceItemType.idl
index b3e4d86a6998..3ffd41f1dc4d 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldReferenceItemType.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldReferenceItemType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldReferenceType.idl b/offapi/com/sun/star/sheet/DataPilotFieldReferenceType.idl
index d6b677997c70..636ed086bf30 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldReferenceType.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldReferenceType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldShowItemsMode.idl b/offapi/com/sun/star/sheet/DataPilotFieldShowItemsMode.idl
index b0574945ef0c..1e0692e62569 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldShowItemsMode.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldShowItemsMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl b/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl
index b024613d6e51..b4a8284e3676 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldSortInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldSortMode.idl b/offapi/com/sun/star/sheet/DataPilotFieldSortMode.idl
index a167ab14244f..5f530ec20884 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldSortMode.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldSortMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFields.idl b/offapi/com/sun/star/sheet/DataPilotFields.idl
index aba253280da7..5695990cb79b 100644
--- a/offapi/com/sun/star/sheet/DataPilotFields.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFields.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl
index e96099eae8f7..963de8d4ba0d 100644
--- a/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotFieldsEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotItem.idl b/offapi/com/sun/star/sheet/DataPilotItem.idl
index 54f21820ed25..3addf5533f3a 100644
--- a/offapi/com/sun/star/sheet/DataPilotItem.idl
+++ b/offapi/com/sun/star/sheet/DataPilotItem.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotItems.idl b/offapi/com/sun/star/sheet/DataPilotItems.idl
index edc3bd474e04..a5fd2a6af114 100644
--- a/offapi/com/sun/star/sheet/DataPilotItems.idl
+++ b/offapi/com/sun/star/sheet/DataPilotItems.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl
index 074beb4e6215..7f18eae9add2 100644
--- a/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotItemsEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotOutputRangeType.idl b/offapi/com/sun/star/sheet/DataPilotOutputRangeType.idl
index 7bb0bbbc9438..911e86639720 100644
--- a/offapi/com/sun/star/sheet/DataPilotOutputRangeType.idl
+++ b/offapi/com/sun/star/sheet/DataPilotOutputRangeType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@ module com { module sun { module star { module sheet {
 /** specifies region type of DataPilot table range
 
     <p>This constant set is used to indicate the type of output range desired when
-    <method>XDataPilotTable2::getOutputRangeByType</method> is called, which
+    <method>XDataPilotTable2::getOutputRangeByType</method> is called, which 
     returns a different cell range depending upon the value passed to it as the argument.</p>
 
     @see com::sun::star::sheet::XDataPilotTable2
@@ -52,7 +52,7 @@ constants DataPilotOutputRangeType
 
     //------------------------------------------------------------------------
 
-    /** whole table but without the header area where the filter and page field
+    /** whole table but without the header area where the filter and page field 
         buttons are located. */
     const long TABLE = 1;
 
diff --git a/offapi/com/sun/star/sheet/DataPilotSource.idl b/offapi/com/sun/star/sheet/DataPilotSource.idl
index d96bd6d1ba76..66792647c4bc 100644
--- a/offapi/com/sun/star/sheet/DataPilotSource.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -106,7 +106,7 @@ published service DataPilotSource
 
     //-------------------------------------------------------------------------
 
-    /** specifies the number of column fields.
+    /** specifies the number of column fields. 
 
         @since OOo 3.0.0
      */
@@ -114,7 +114,7 @@ published service DataPilotSource
 
     //-------------------------------------------------------------------------
 
-    /** specifies the number of data fields.
+    /** specifies the number of data fields. 
 
         @since OOo 3.0.0
      */
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl b/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
index 9f5961731a05..4948945ac5a6 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceDimension.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl b/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
index 080f529e90e4..d6a6ce01e6c7 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceDimensions.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl b/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl
index f283e157c8e1..b2fcab9cb87d 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceHierarchies.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl b/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl
index ad300f8845e6..f17bbf66eee0 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceHierarchy.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl b/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl
index c94880508a2c..6d3d75539c13 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceLevel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl b/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl
index 5e09f51de346..78218f8e6c7c 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceLevels.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceMember.idl b/offapi/com/sun/star/sheet/DataPilotSourceMember.idl
index 754fc955c30a..6b01ebbdda2d 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceMember.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceMember.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl b/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl
index 02a93be58504..d8aeb3ed5194 100644
--- a/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl
+++ b/offapi/com/sun/star/sheet/DataPilotSourceMembers.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotTable.idl b/offapi/com/sun/star/sheet/DataPilotTable.idl
index c2385c46e5fa..672cafc2dadc 100644
--- a/offapi/com/sun/star/sheet/DataPilotTable.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotTableHeaderData.idl b/offapi/com/sun/star/sheet/DataPilotTableHeaderData.idl
index c98e4bbc2820..f88385774128 100644
--- a/offapi/com/sun/star/sheet/DataPilotTableHeaderData.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTableHeaderData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,11 +39,11 @@ module com {  module sun {  module star {  module sheet {
 
 /** information about a cell within the column or row header area of a DataPilot table.
 
-    This struct contains information about a particular cell located within the
+    This struct contains information about a particular cell located within the 
     column or row header area of a DataPilot table.  This is the type that is
-    contained in <member>DataPilotTablePositionData::PositionData</member> when
+    contained in <member>DataPilotTablePositionData::PositionData</member> when 
     the value of <member>DataPilotTablePositionData::PositionType</member> is
-    either <const>DataPilotTablePositionType::ROW_HEADER</const> or
+    either <const>DataPilotTablePositionType::ROW_HEADER</const> or 
     <const>DataPilotTablePositionType::COLUMN_HEADER</const>.
 
     @see com::sun::star::sheet::DataPilotTablePositionData
diff --git a/offapi/com/sun/star/sheet/DataPilotTablePositionData.idl b/offapi/com/sun/star/sheet/DataPilotTablePositionData.idl
index aa97b0dba922..3d2b9876aeac 100644
--- a/offapi/com/sun/star/sheet/DataPilotTablePositionData.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTablePositionData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@ struct DataPilotTablePositionData
 {
     //-------------------------------------------------------------------------
 
-    /** This parameter specifies which sub-area of a DataPilot table a given
+    /** This parameter specifies which sub-area of a DataPilot table a given 
         cell is positioned.  See <type>DataPilotTablePositionType</type>
         for how to interpret the value of this parameter.
 
@@ -64,15 +64,15 @@ struct DataPilotTablePositionData
 
     //-------------------------------------------------------------------------
 
-    /** <p>This member contains a structure of different types depending on the
+    /** <p>This member contains a structure of different types depending on the 
         position type specified in <member>PositionType</member> member.</p>
 
-        <p>When the value of <member>PositionType</member> is
-        <const>DataPilotTablePositionType::RESULT</const>, <member>DataPilotTablePositionData::PositionData</member>
-        contains an instance of type <type>DataPilotTableResultData</type>,
+        <p>When the value of <member>PositionType</member> is 
+        <const>DataPilotTablePositionType::RESULT</const>, <member>DataPilotTablePositionData::PositionData</member> 
+        contains an instance of type <type>DataPilotTableResultData</type>, 
         whereas when the value of <member>DataPilotTablePositionData::PositionType</member>
-        is either <const>DataPilotTablePositionType::ROW_HEADER</const>
-        or <const>DataPilotTablePositionType::COLUMN_HEADER</const>, then the
+        is either <const>DataPilotTablePositionType::ROW_HEADER</const> 
+        or <const>DataPilotTablePositionType::COLUMN_HEADER</const>, then the 
         <member>PositionData</member> member contains an instance of type <type>
         DataPilotTableHeaderData</type>.</p>
 
diff --git a/offapi/com/sun/star/sheet/DataPilotTablePositionType.idl b/offapi/com/sun/star/sheet/DataPilotTablePositionType.idl
index 8ef568079f12..5d669db6baf1 100644
--- a/offapi/com/sun/star/sheet/DataPilotTablePositionType.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTablePositionType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,7 +64,7 @@ constants DataPilotTablePositionType
 
     //------------------------------------------------------------------------
 
-    /** indicates that the specified cell is within the table but in areas
+    /** indicates that the specified cell is within the table but in areas 
         other than the result or header areas. */
     const long OTHER = 4;
 };
diff --git a/offapi/com/sun/star/sheet/DataPilotTableResultData.idl b/offapi/com/sun/star/sheet/DataPilotTableResultData.idl
index b0adfdfa4e3d..d3f4aa509c24 100644
--- a/offapi/com/sun/star/sheet/DataPilotTableResultData.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTableResultData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module sheet {
 
 /** information about a cell positioned within the result area of a DataPilot table.
 
-    <p><type>DataPilotTableResultData</type> contains information about a
+    <p><type>DataPilotTableResultData</type> contains information about a 
     particular cell positioned within the result area of a DataPilot table.</p>
 
     @see com::sun::star::sheet::DataPilotTablePositionData
@@ -70,7 +70,7 @@ struct DataPilotTableResultData
 
     //------------------------------------------------------------------------
 
-    /** more information about the result contained in the
+    /** more information about the result contained in the 
         <type>DataResult</type> type.
 
         @see com::sun::star::sheet::DataResult
diff --git a/offapi/com/sun/star/sheet/DataPilotTables.idl b/offapi/com/sun/star/sheet/DataPilotTables.idl
index f8dc00fa8e27..f85d697b590b 100644
--- a/offapi/com/sun/star/sheet/DataPilotTables.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTables.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl b/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl
index a8b52e65425c..997efbb08ca5 100644
--- a/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DataPilotTablesEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataResult.idl b/offapi/com/sun/star/sheet/DataResult.idl
index 70f213f4011e..885fe586c1e8 100644
--- a/offapi/com/sun/star/sheet/DataResult.idl
+++ b/offapi/com/sun/star/sheet/DataResult.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DataResultFlags.idl b/offapi/com/sun/star/sheet/DataResultFlags.idl
index 07f116a81c35..bfbe768fdb4e 100644
--- a/offapi/com/sun/star/sheet/DataResultFlags.idl
+++ b/offapi/com/sun/star/sheet/DataResultFlags.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl b/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl
index eab5d41f3adf..644c6cb2d533 100644
--- a/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl
+++ b/offapi/com/sun/star/sheet/DatabaseImportDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DatabaseRange.idl b/offapi/com/sun/star/sheet/DatabaseRange.idl
index ef8ddb62e508..26b695f1a5cc 100644
--- a/offapi/com/sun/star/sheet/DatabaseRange.idl
+++ b/offapi/com/sun/star/sheet/DatabaseRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DatabaseRanges.idl b/offapi/com/sun/star/sheet/DatabaseRanges.idl
index aed4f86aa308..3262dea804e4 100644
--- a/offapi/com/sun/star/sheet/DatabaseRanges.idl
+++ b/offapi/com/sun/star/sheet/DatabaseRanges.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl b/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl
index 56dde2367734..9aa2b2a96279 100644
--- a/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/DatabaseRangesEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DimensionFlags.idl b/offapi/com/sun/star/sheet/DimensionFlags.idl
index 2edb2368e863..f8bef5eeedbc 100644
--- a/offapi/com/sun/star/sheet/DimensionFlags.idl
+++ b/offapi/com/sun/star/sheet/DimensionFlags.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/DocumentSettings.idl b/offapi/com/sun/star/sheet/DocumentSettings.idl
index 4d7d6fdf3c81..a1533bc9dead 100644
--- a/offapi/com/sun/star/sheet/DocumentSettings.idl
+++ b/offapi/com/sun/star/sheet/DocumentSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
 #ifndef __com_sun_star_sheet_DocumentSettings_idl__
 #define __com_sun_star_sheet_DocumentSettings_idl__
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
 
@@ -55,7 +55,7 @@ module com {  module sun {  module star {  module sheet {
 published service DocumentSettings
 {
     service com::sun::star::document::Settings;
-
+    
     //-------------------------------------------------------------------------
     /** provides access to the properties.
      */
diff --git a/offapi/com/sun/star/sheet/ExternalDocLink.idl b/offapi/com/sun/star/sheet/ExternalDocLink.idl
index 357b0b4812ba..a58fd0fdd41d 100644
--- a/offapi/com/sun/star/sheet/ExternalDocLink.idl
+++ b/offapi/com/sun/star/sheet/ExternalDocLink.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@ module com {  module sun {  module star {  module sheet {
 
 //=============================================================================
 
-/** Represents a single external document link.
+/** Represents a single external document link. 
 
     <p>An external document link contains cached data used for external cell
     and cell range references as well as external range names.</p>
diff --git a/offapi/com/sun/star/sheet/ExternalDocLinks.idl b/offapi/com/sun/star/sheet/ExternalDocLinks.idl
index f0f216a0caf9..15ca94d1d572 100644
--- a/offapi/com/sun/star/sheet/ExternalDocLinks.idl
+++ b/offapi/com/sun/star/sheet/ExternalDocLinks.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/ExternalLinkInfo.idl b/offapi/com/sun/star/sheet/ExternalLinkInfo.idl
index fa8590f7f678..749d95b36fca 100644
--- a/offapi/com/sun/star/sheet/ExternalLinkInfo.idl
+++ b/offapi/com/sun/star/sheet/ExternalLinkInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/ExternalLinkType.idl b/offapi/com/sun/star/sheet/ExternalLinkType.idl
index 7803a4c3b291..7e54750b5efc 100644
--- a/offapi/com/sun/star/sheet/ExternalLinkType.idl
+++ b/offapi/com/sun/star/sheet/ExternalLinkType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/ExternalReference.idl b/offapi/com/sun/star/sheet/ExternalReference.idl
index 8096846f726a..6dd9c7b1f937 100644
--- a/offapi/com/sun/star/sheet/ExternalReference.idl
+++ b/offapi/com/sun/star/sheet/ExternalReference.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/ExternalSheetCache.idl b/offapi/com/sun/star/sheet/ExternalSheetCache.idl
index 93652a6058f7..bda4f4829559 100644
--- a/offapi/com/sun/star/sheet/ExternalSheetCache.idl
+++ b/offapi/com/sun/star/sheet/ExternalSheetCache.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,14 +33,14 @@
 module com {  module sun {  module star {  module sheet {
 
 /** A single sheet cache for an external document.
-
+   
     <p>This cached data is used for external cell and cell range references,
     as well as external range names.  An <type scope="com::sun::star::sheet">ExternalDocLink</type>
     instance contains a set of these sheet caches.</p>
 
     @see com::sun::star::sheet::ExternalDocLink
     @see com::sun::star::sheet::XExternalSheetCache
-
+    
     @since OOo 3.1.0
  */
 service ExternalSheetCache : XExternalSheetCache
diff --git a/offapi/com/sun/star/sheet/FillDateMode.idl b/offapi/com/sun/star/sheet/FillDateMode.idl
index 5cd9dff07dab..5c906895991a 100644
--- a/offapi/com/sun/star/sheet/FillDateMode.idl
+++ b/offapi/com/sun/star/sheet/FillDateMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/FillDirection.idl b/offapi/com/sun/star/sheet/FillDirection.idl
index b9c43e0527d8..37e336193361 100644
--- a/offapi/com/sun/star/sheet/FillDirection.idl
+++ b/offapi/com/sun/star/sheet/FillDirection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/FillMode.idl b/offapi/com/sun/star/sheet/FillMode.idl
index 74bb98001e9a..d302f7a512f2 100644
--- a/offapi/com/sun/star/sheet/FillMode.idl
+++ b/offapi/com/sun/star/sheet/FillMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/FilterConnection.idl b/offapi/com/sun/star/sheet/FilterConnection.idl
index 16d57a4f84b1..8d5c0e944496 100644
--- a/offapi/com/sun/star/sheet/FilterConnection.idl
+++ b/offapi/com/sun/star/sheet/FilterConnection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/FilterFormulaParser.idl b/offapi/com/sun/star/sheet/FilterFormulaParser.idl
index 9de579584c2d..50c6c1db825c 100644
--- a/offapi/com/sun/star/sheet/FilterFormulaParser.idl
+++ b/offapi/com/sun/star/sheet/FilterFormulaParser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/FilterOperator.idl b/offapi/com/sun/star/sheet/FilterOperator.idl
index 8497fd39213d..ee0c10de9290 100644
--- a/offapi/com/sun/star/sheet/FilterOperator.idl
+++ b/offapi/com/sun/star/sheet/FilterOperator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/FilterOperator2.idl b/offapi/com/sun/star/sheet/FilterOperator2.idl
index a8a3e182f1b0..f90055115a86 100644
--- a/offapi/com/sun/star/sheet/FilterOperator2.idl
+++ b/offapi/com/sun/star/sheet/FilterOperator2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/FormulaLanguage.idl b/offapi/com/sun/star/sheet/FormulaLanguage.idl
index 74c1fe9d4b14..0f3354184980 100644
--- a/offapi/com/sun/star/sheet/FormulaLanguage.idl
+++ b/offapi/com/sun/star/sheet/FormulaLanguage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/FormulaMapGroup.idl b/offapi/com/sun/star/sheet/FormulaMapGroup.idl
index 45223c16264d..17406a79f9cb 100644
--- a/offapi/com/sun/star/sheet/FormulaMapGroup.idl
+++ b/offapi/com/sun/star/sheet/FormulaMapGroup.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset.idl b/offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset.idl
index 06008bbc059d..f64c5690a337 100644
--- a/offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset.idl
+++ b/offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl b/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl
index 0c80854db357..78661a7a61f9 100644
--- a/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl
+++ b/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/FormulaParser.idl b/offapi/com/sun/star/sheet/FormulaParser.idl
index 27fba17ff0c0..ac13717e61ea 100644
--- a/offapi/com/sun/star/sheet/FormulaParser.idl
+++ b/offapi/com/sun/star/sheet/FormulaParser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/FormulaResult.idl b/offapi/com/sun/star/sheet/FormulaResult.idl
index dbd1b67723de..df57d4828c95 100644
--- a/offapi/com/sun/star/sheet/FormulaResult.idl
+++ b/offapi/com/sun/star/sheet/FormulaResult.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/FormulaToken.idl b/offapi/com/sun/star/sheet/FormulaToken.idl
index b9558fa164fb..d5fedeca9cb7 100644
--- a/offapi/com/sun/star/sheet/FormulaToken.idl
+++ b/offapi/com/sun/star/sheet/FormulaToken.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/FunctionAccess.idl b/offapi/com/sun/star/sheet/FunctionAccess.idl
index 0bce84d3627d..2112f5064c7c 100644
--- a/offapi/com/sun/star/sheet/FunctionAccess.idl
+++ b/offapi/com/sun/star/sheet/FunctionAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -58,7 +58,7 @@ published service FunctionAccess
     /** provides calculating the result of a spreadsheet function.
      */
     interface com::sun::star::sheet::XFunctionAccess;
-
+    
     //-------------------------------------------------------------------------
 
     /** specifies whether the function call is performed as array function
diff --git a/offapi/com/sun/star/sheet/FunctionArgument.idl b/offapi/com/sun/star/sheet/FunctionArgument.idl
index de413811ce4b..67aa31fe655b 100644
--- a/offapi/com/sun/star/sheet/FunctionArgument.idl
+++ b/offapi/com/sun/star/sheet/FunctionArgument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/FunctionCategory.idl b/offapi/com/sun/star/sheet/FunctionCategory.idl
index 323813080f14..133ed8ef9cb4 100644
--- a/offapi/com/sun/star/sheet/FunctionCategory.idl
+++ b/offapi/com/sun/star/sheet/FunctionCategory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/FunctionDescription.idl b/offapi/com/sun/star/sheet/FunctionDescription.idl
index 2e36034ea76b..31bcbf315b0a 100644
--- a/offapi/com/sun/star/sheet/FunctionDescription.idl
+++ b/offapi/com/sun/star/sheet/FunctionDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl b/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl
index 6749ea019903..b1f2920604c2 100644
--- a/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl
+++ b/offapi/com/sun/star/sheet/FunctionDescriptionEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/FunctionDescriptions.idl b/offapi/com/sun/star/sheet/FunctionDescriptions.idl
index 842979bb4d1e..580a79ee77a6 100644
--- a/offapi/com/sun/star/sheet/FunctionDescriptions.idl
+++ b/offapi/com/sun/star/sheet/FunctionDescriptions.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/GeneralFunction.idl b/offapi/com/sun/star/sheet/GeneralFunction.idl
index abf954cbec3e..86d4ca290dab 100644
--- a/offapi/com/sun/star/sheet/GeneralFunction.idl
+++ b/offapi/com/sun/star/sheet/GeneralFunction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/GlobalSheetSettings.idl b/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
index 508992fd1785..664aa584a035 100644
--- a/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
+++ b/offapi/com/sun/star/sheet/GlobalSheetSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/GoalResult.idl b/offapi/com/sun/star/sheet/GoalResult.idl
index e9a00a156064..1e1b433abe74 100644
--- a/offapi/com/sun/star/sheet/GoalResult.idl
+++ b/offapi/com/sun/star/sheet/GoalResult.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/HeaderFooterContent.idl b/offapi/com/sun/star/sheet/HeaderFooterContent.idl
index 39c551c0880c..c4a61313170b 100644
--- a/offapi/com/sun/star/sheet/HeaderFooterContent.idl
+++ b/offapi/com/sun/star/sheet/HeaderFooterContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/LabelRange.idl b/offapi/com/sun/star/sheet/LabelRange.idl
index a5e1b98302a2..f5537b7535cd 100644
--- a/offapi/com/sun/star/sheet/LabelRange.idl
+++ b/offapi/com/sun/star/sheet/LabelRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/LabelRanges.idl b/offapi/com/sun/star/sheet/LabelRanges.idl
index d8659f7a625b..cda8b60211b0 100644
--- a/offapi/com/sun/star/sheet/LabelRanges.idl
+++ b/offapi/com/sun/star/sheet/LabelRanges.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl b/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl
index 18817df0d228..a222eb77f75d 100644
--- a/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/LabelRangesEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/LocalizedName.idl b/offapi/com/sun/star/sheet/LocalizedName.idl
index 1f8a7a8eebf6..f43813060e40 100644
--- a/offapi/com/sun/star/sheet/LocalizedName.idl
+++ b/offapi/com/sun/star/sheet/LocalizedName.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,15 +46,15 @@ published struct LocalizedName
 {
     // ------------------------------------------------------------------------
 
-    /** The locale for which this name is valid.
+    /**	The locale for which this name is valid.
      */
-    ::com::sun::star::lang::Locale  Locale;
+    ::com::sun::star::lang::Locale	Locale;
 
     // ------------------------------------------------------------------------
 
-    /** The name itself.
+    /**	The name itself.
      */
-    string  Name;
+    string	Name;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/MemberResult.idl b/offapi/com/sun/star/sheet/MemberResult.idl
index c8f1c360543e..59a37312b3f8 100644
--- a/offapi/com/sun/star/sheet/MemberResult.idl
+++ b/offapi/com/sun/star/sheet/MemberResult.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/MemberResultFlags.idl b/offapi/com/sun/star/sheet/MemberResultFlags.idl
index 05bcc602ccc5..02e2f424aefb 100644
--- a/offapi/com/sun/star/sheet/MemberResultFlags.idl
+++ b/offapi/com/sun/star/sheet/MemberResultFlags.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -58,7 +58,7 @@ published constants MemberResultFlags
 
     //-------------------------------------------------------------------------
 
-    /** The element contains a grand total.
+    /** The element contains a grand total. 
      */
     const long GRANDTOTAL = 8;
 
diff --git a/offapi/com/sun/star/sheet/MoveDirection.idl b/offapi/com/sun/star/sheet/MoveDirection.idl
index 75b95961f72c..c04ba11d281d 100644
--- a/offapi/com/sun/star/sheet/MoveDirection.idl
+++ b/offapi/com/sun/star/sheet/MoveDirection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/NamedRange.idl b/offapi/com/sun/star/sheet/NamedRange.idl
index 445bf984c7e6..22e1f93ab9db 100644
--- a/offapi/com/sun/star/sheet/NamedRange.idl
+++ b/offapi/com/sun/star/sheet/NamedRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/NamedRangeFlag.idl b/offapi/com/sun/star/sheet/NamedRangeFlag.idl
index cb69c8ec782d..dd0c0874e0c1 100644
--- a/offapi/com/sun/star/sheet/NamedRangeFlag.idl
+++ b/offapi/com/sun/star/sheet/NamedRangeFlag.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/NamedRanges.idl b/offapi/com/sun/star/sheet/NamedRanges.idl
index e7be40c8c6e5..6d07c9c31c00 100644
--- a/offapi/com/sun/star/sheet/NamedRanges.idl
+++ b/offapi/com/sun/star/sheet/NamedRanges.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl b/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl
index 9bfeea931a01..6eb62167aadf 100644
--- a/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/NamedRangesEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/NoConvergenceException.idl b/offapi/com/sun/star/sheet/NoConvergenceException.idl
index b427b67f28ea..f846ec9aa9a9 100644
--- a/offapi/com/sun/star/sheet/NoConvergenceException.idl
+++ b/offapi/com/sun/star/sheet/NoConvergenceException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@ module com { module sun { module star { module sheet {
 
 //=============================================================================
 
-/** Thrown by a Calc Add-In function this exception indicates the
+/** Thrown by a Calc Add-In function this exception indicates the 
     function's algorithm did not converge to a meaningful result.
 
     @since OOo 3.3
diff --git a/offapi/com/sun/star/sheet/PasteOperation.idl b/offapi/com/sun/star/sheet/PasteOperation.idl
index 0e57b94e81de..def39154ab57 100644
--- a/offapi/com/sun/star/sheet/PasteOperation.idl
+++ b/offapi/com/sun/star/sheet/PasteOperation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/RangeSelectionArguments.idl b/offapi/com/sun/star/sheet/RangeSelectionArguments.idl
index 8c9f688d8989..f2e4e5e1e9ac 100644
--- a/offapi/com/sun/star/sheet/RangeSelectionArguments.idl
+++ b/offapi/com/sun/star/sheet/RangeSelectionArguments.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sheet_RangeSelectionArguments_idl__
-#define __com_sun_star_sheet_RangeSelectionArguments_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sheet {
-
-//=============================================================================
-
+#ifndef __com_sun_star_sheet_RangeSelectionArguments_idl__ 
+#define __com_sun_star_sheet_RangeSelectionArguments_idl__ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sheet {  
+ 
+//============================================================================= 
+ 
 /** contains the arguments for starting the range selection.
 
     @see com::sun::star::sheet::XRangeSelection
  */
 published service RangeSelectionArguments
-{
+{ 
     /** contains the initial value for the range descriptor.
      */
-    [property] string InitialValue;
+    [property] string InitialValue; 
 
     /** contains a title for the operation.
      */
-    [property] string Title;
+    [property] string Title; 
 
     /** specifies if the range selection is finished when the
         mouse button is released, after selecting cells.
      */
-    [property] boolean CloseOnMouseRelease;
-
+    [property] boolean CloseOnMouseRelease; 
+    
     /** specifies if the range selection is limited to a single
         cell only.
 
-        <p>If <TRUE/>, the selection is restricted to a
-        single cell.  If <FALSE/>, multiple adjoining cells can be
+        <p>If <TRUE/>, the selection is restricted to a 
+        single cell.  If <FALSE/>, multiple adjoining cells can be 
         selected.  The default value is <FALSE/>.</p>
 
     @since OOo 2.0.3
      */
     [optional, property] boolean SingleCellMode;
-};
-
-//=============================================================================
-
-}; }; }; };
-
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/sheet/RangeSelectionEvent.idl b/offapi/com/sun/star/sheet/RangeSelectionEvent.idl
index 859466b51d5d..e44d2954742c 100644
--- a/offapi/com/sun/star/sheet/RangeSelectionEvent.idl
+++ b/offapi/com/sun/star/sheet/RangeSelectionEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sheet_RangeSelectionEvent_idl__
-#define __com_sun_star_sheet_RangeSelectionEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sheet {
-
-//=============================================================================
-
+#ifndef __com_sun_star_sheet_RangeSelectionEvent_idl__ 
+#define __com_sun_star_sheet_RangeSelectionEvent_idl__ 
+
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sheet {  
+ 
+//============================================================================= 
+ 
 /** specifies an event from range selection.
 
     @see com::sun::star::sheet::XRangeSelectionListener
     @see com::sun::star::sheet::XRangeSelectionChangeListener
  */
 published struct RangeSelectionEvent: com::sun::star::lang::EventObject
-{
+{ 
     /** contains a textual representation of the selected range.
      */
-    string RangeDescriptor;
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    string RangeDescriptor; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/sheet/RecentFunctions.idl b/offapi/com/sun/star/sheet/RecentFunctions.idl
index 636a0bcf8f31..6336f44acded 100644
--- a/offapi/com/sun/star/sheet/RecentFunctions.idl
+++ b/offapi/com/sun/star/sheet/RecentFunctions.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/ReferenceFlags.idl b/offapi/com/sun/star/sheet/ReferenceFlags.idl
index 1c2c3d6aa534..2cf749e31aee 100644
--- a/offapi/com/sun/star/sheet/ReferenceFlags.idl
+++ b/offapi/com/sun/star/sheet/ReferenceFlags.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/ResultEvent.idl b/offapi/com/sun/star/sheet/ResultEvent.idl
index 3fc5184da6ae..7c99a3396ef0 100644
--- a/offapi/com/sun/star/sheet/ResultEvent.idl
+++ b/offapi/com/sun/star/sheet/ResultEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/Scenario.idl b/offapi/com/sun/star/sheet/Scenario.idl
index a47b2c3df484..c65c21511c28 100644
--- a/offapi/com/sun/star/sheet/Scenario.idl
+++ b/offapi/com/sun/star/sheet/Scenario.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/Scenarios.idl b/offapi/com/sun/star/sheet/Scenarios.idl
index 31f3da181f0b..9e2bc8109e40 100644
--- a/offapi/com/sun/star/sheet/Scenarios.idl
+++ b/offapi/com/sun/star/sheet/Scenarios.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/ScenariosEnumeration.idl b/offapi/com/sun/star/sheet/ScenariosEnumeration.idl
index ca6c0a7b8335..ce815fe9c829 100644
--- a/offapi/com/sun/star/sheet/ScenariosEnumeration.idl
+++ b/offapi/com/sun/star/sheet/ScenariosEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/Shape.idl b/offapi/com/sun/star/sheet/Shape.idl
index 0aca01b81b52..f41911177b71 100644
--- a/offapi/com/sun/star/sheet/Shape.idl
+++ b/offapi/com/sun/star/sheet/Shape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SheetCell.idl b/offapi/com/sun/star/sheet/SheetCell.idl
index ecde3d5c3594..2fb9bfef3394 100644
--- a/offapi/com/sun/star/sheet/SheetCell.idl
+++ b/offapi/com/sun/star/sheet/SheetCell.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SheetCellCursor.idl b/offapi/com/sun/star/sheet/SheetCellCursor.idl
index 23724f423174..2471f93bcff9 100644
--- a/offapi/com/sun/star/sheet/SheetCellCursor.idl
+++ b/offapi/com/sun/star/sheet/SheetCellCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SheetCellRange.idl b/offapi/com/sun/star/sheet/SheetCellRange.idl
index b87d52b7f0c4..b2ebc0952967 100644
--- a/offapi/com/sun/star/sheet/SheetCellRange.idl
+++ b/offapi/com/sun/star/sheet/SheetCellRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SheetCellRanges.idl b/offapi/com/sun/star/sheet/SheetCellRanges.idl
index 020521203af5..69a556e4b429 100644
--- a/offapi/com/sun/star/sheet/SheetCellRanges.idl
+++ b/offapi/com/sun/star/sheet/SheetCellRanges.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl b/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl
index f0989e3cffd2..717b90558de6 100644
--- a/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SheetCellRangesEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SheetFilterDescriptor.idl b/offapi/com/sun/star/sheet/SheetFilterDescriptor.idl
index 8e94a6b2edcf..fe57a0e0d243 100644
--- a/offapi/com/sun/star/sheet/SheetFilterDescriptor.idl
+++ b/offapi/com/sun/star/sheet/SheetFilterDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SheetLink.idl b/offapi/com/sun/star/sheet/SheetLink.idl
index b81b79ce19be..ec2db78a9c39 100644
--- a/offapi/com/sun/star/sheet/SheetLink.idl
+++ b/offapi/com/sun/star/sheet/SheetLink.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SheetLinkMode.idl b/offapi/com/sun/star/sheet/SheetLinkMode.idl
index 60794b5849ed..179d2e3daddb 100644
--- a/offapi/com/sun/star/sheet/SheetLinkMode.idl
+++ b/offapi/com/sun/star/sheet/SheetLinkMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SheetLinks.idl b/offapi/com/sun/star/sheet/SheetLinks.idl
index ee960b37e57c..f80b82906cd0 100644
--- a/offapi/com/sun/star/sheet/SheetLinks.idl
+++ b/offapi/com/sun/star/sheet/SheetLinks.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl b/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl
index 85749701c85a..a874132d9535 100644
--- a/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SheetLinksEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SheetRangesQuery.idl b/offapi/com/sun/star/sheet/SheetRangesQuery.idl
index 623220a1df20..9d541a058ec4 100644
--- a/offapi/com/sun/star/sheet/SheetRangesQuery.idl
+++ b/offapi/com/sun/star/sheet/SheetRangesQuery.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SheetSortDescriptor.idl b/offapi/com/sun/star/sheet/SheetSortDescriptor.idl
index 64e1e240434c..676652e6747d 100644
--- a/offapi/com/sun/star/sheet/SheetSortDescriptor.idl
+++ b/offapi/com/sun/star/sheet/SheetSortDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl b/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl
index 6c0723c06d55..fdeb4619f0f1 100644
--- a/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl
+++ b/offapi/com/sun/star/sheet/SheetSortDescriptor2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SingleReference.idl b/offapi/com/sun/star/sheet/SingleReference.idl
index a4e191d08280..cf802fb5a1f1 100644
--- a/offapi/com/sun/star/sheet/SingleReference.idl
+++ b/offapi/com/sun/star/sheet/SingleReference.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/Solver.idl b/offapi/com/sun/star/sheet/Solver.idl
index 25fb5ac92f41..08804e2b245c 100644
--- a/offapi/com/sun/star/sheet/Solver.idl
+++ b/offapi/com/sun/star/sheet/Solver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SolverConstraint.idl b/offapi/com/sun/star/sheet/SolverConstraint.idl
index 10d735f92a15..0a760c21ee3f 100644
--- a/offapi/com/sun/star/sheet/SolverConstraint.idl
+++ b/offapi/com/sun/star/sheet/SolverConstraint.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SolverConstraintOperator.idl b/offapi/com/sun/star/sheet/SolverConstraintOperator.idl
index c73be84a1ac6..a959749e8707 100644
--- a/offapi/com/sun/star/sheet/SolverConstraintOperator.idl
+++ b/offapi/com/sun/star/sheet/SolverConstraintOperator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/Spreadsheet.idl b/offapi/com/sun/star/sheet/Spreadsheet.idl
index 0b21a050d099..5ba0e5345085 100644
--- a/offapi/com/sun/star/sheet/Spreadsheet.idl
+++ b/offapi/com/sun/star/sheet/Spreadsheet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SpreadsheetDocument.idl b/offapi/com/sun/star/sheet/SpreadsheetDocument.idl
index 3c5ad45d7942..e6e7c6bee425 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDocument.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl b/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
index e89ae136053b..c719b78ab9e2 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl b/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl
index 75b685071eb9..64306912ba74 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -72,7 +72,7 @@ published service SpreadsheetDrawPage
 
                 <p>It also lets you add new <type scope="com::sun::star::drawing">Shape</type>s. The program currently
                 requires that these <type scope="com::sun::star::drawing">Shape</type>s be created by the factory of
-                the document.
+                the	document.
 
                 @see SpreadsheetDocument
      */
diff --git a/offapi/com/sun/star/sheet/SpreadsheetView.idl b/offapi/com/sun/star/sheet/SpreadsheetView.idl
index 40ade27fedad..9a76ef8b9beb 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetView.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl b/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl
index 254601559a16..48e505cf870d 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetViewPane.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sheet_SpreadsheetViewPane_idl__
-#define __com_sun_star_sheet_SpreadsheetViewPane_idl__
-
-#ifndef __com_sun_star_sheet_XViewPane_idl__
-#include <com/sun/star/sheet/XViewPane.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XCellRangeReferrer_idl__
-#include <com/sun/star/sheet/XCellRangeReferrer.idl>
-#endif
-
-#ifndef __com_sun_star_view_XControlAccess_idl__
-#include <com/sun/star/view/XControlAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sheet {
-
-//=============================================================================
-
+#ifndef __com_sun_star_sheet_SpreadsheetViewPane_idl__ 
+#define __com_sun_star_sheet_SpreadsheetViewPane_idl__ 
+ 
+#ifndef __com_sun_star_sheet_XViewPane_idl__ 
+#include <com/sun/star/sheet/XViewPane.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sheet_XCellRangeReferrer_idl__ 
+#include <com/sun/star/sheet/XCellRangeReferrer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_view_XControlAccess_idl__ 
+#include <com/sun/star/view/XControlAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sheet {  
+ 
+//============================================================================= 
+ 
 /** represents a single pane in a view of a spreadsheet document.
  */
 published service SpreadsheetViewPane
-{
+{ 
     /** allows to control which cells are shown in the view pane.
      */
-    interface com::sun::star::sheet::XViewPane;
-
+    interface com::sun::star::sheet::XViewPane; 
+    
     /** gives direct access to the cell range object for the visible range.
      */
-    interface com::sun::star::sheet::XCellRangeReferrer;
-
+    interface com::sun::star::sheet::XCellRangeReferrer; 
+ 
     /** provides access to a control model's control for the view pane.
      */
-    [optional] interface com::sun::star::view::XControlAccess;
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    [optional] interface com::sun::star::view::XControlAccess; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl b/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl
index de2d6c70fc8c..7ce81520423e 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetViewPanesEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl b/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl
index e40ea1dd8fe4..9d5c53cf140f 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,151 +25,151 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_sheet_SpreadsheetViewSettings_idl__
-#define __com_sun_star_sheet_SpreadsheetViewSettings_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
+#ifndef __com_sun_star_sheet_SpreadsheetViewSettings_idl__ 
+#define __com_sun_star_sheet_SpreadsheetViewSettings_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
 
-//=============================================================================
-
-module com {  module sun {  module star {  module sheet {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module sheet {  
+ 
+//============================================================================= 
+ 
 /** contains settings which are specific to each view of a spreadsheet
  */
 published service SpreadsheetViewSettings
-{
+{ 
     /** provides access to the properties.
      */
-    interface com::sun::star::beans::XPropertySet;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::beans::XPropertySet; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** controls whether formulas are displayed instead of their
         results.
      */
-    [property] boolean ShowFormulas;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean ShowFormulas; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** enables display of zero-values.
      */
-    [property] boolean ShowZeroValues;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean ShowZeroValues; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** controls whether strings, values, and formulas are
         displayed in different colors.
      */
-    [property] boolean IsValueHighlightingEnabled;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean IsValueHighlightingEnabled; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** controls whether a marker is shown for notes in cells.
      */
-    [property] boolean ShowNotes;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean ShowNotes; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** enables the vertical scroll bar of the view.
      */
-    [property] boolean HasVerticalScrollBar;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean HasVerticalScrollBar; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** enables the horizontal scroll bar of the view.
      */
-    [property] boolean HasHorizontalScrollBar;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean HasHorizontalScrollBar; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** enables the sheet tabs of the view.
      */
-    [property] boolean HasSheetTabs;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean HasSheetTabs; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** enables the display of outline symbols.
      */
-    [property] boolean IsOutlineSymbolsSet;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean IsOutlineSymbolsSet; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** enables the column and row headers of the view.
      */
-    [property] boolean HasColumnRowHeaders;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean HasColumnRowHeaders; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** enables the display of the cell grid.
      */
-    [property] boolean ShowGrid;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean ShowGrid; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the color in which the cell grid is
         displayed.
      */
-    [property] com::sun::star::util::Color GridColor;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::util::Color GridColor; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** enables display of help lines when moving drawing
         objects.
      */
-    [property] boolean ShowHelpLines;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean ShowHelpLines; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** enables display of anchor symbols when drawing
         objects are selected.
      */
-    [property] boolean ShowAnchor;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean ShowAnchor; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** enables display of page breaks.
      */
-    [property] boolean ShowPageBreaks;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean ShowPageBreaks; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** enables solid (colored) handles when drawing
         objects are selected.
      */
-    [property] boolean SolidHandles;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean SolidHandles; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** enables display of embedded objects in the view.
      */
-    [property] short ShowObjects;
-
-    //-------------------------------------------------------------------------
-
+    [property] short ShowObjects; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** enables the display of charts in the view.
      */
-    [property] short ShowCharts;
-
-    //-------------------------------------------------------------------------
-
+    [property] short ShowCharts; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** enables the display of drawing objects in the view.
      */
-    [property] short ShowDrawing;
-
-    //-------------------------------------------------------------------------
-
+    [property] short ShowDrawing; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** disables the display of marks from online spelling.
      */
-    [property] boolean HideSpellMarks;
-
+    [property] boolean HideSpellMarks; 
+ 
     //-------------------------------------------------------------------------
     /** This property defines the zoom type for the document.
 
@@ -183,11 +183,11 @@ published service SpreadsheetViewSettings
             <member scope="com::sun::star::view::DocumentZoomType">BY_VALUE</member>.
     */
         [property] short ZoomValue;
-};
-
-//=============================================================================
-
-}; }; }; };
-
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/sheet/Spreadsheets.idl b/offapi/com/sun/star/sheet/Spreadsheets.idl
index 0e04297f1a99..7051842b285f 100644
--- a/offapi/com/sun/star/sheet/Spreadsheets.idl
+++ b/offapi/com/sun/star/sheet/Spreadsheets.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl b/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl
index e42bb9d9d93b..4e6d9b053acd 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetsEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/StatusBarFunction.idl b/offapi/com/sun/star/sheet/StatusBarFunction.idl
index 8d2fe522ede7..a302f7ece6a9 100644
--- a/offapi/com/sun/star/sheet/StatusBarFunction.idl
+++ b/offapi/com/sun/star/sheet/StatusBarFunction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SubTotalColumn.idl b/offapi/com/sun/star/sheet/SubTotalColumn.idl
index 45ebf2b9853e..6c13e05cb291 100644
--- a/offapi/com/sun/star/sheet/SubTotalColumn.idl
+++ b/offapi/com/sun/star/sheet/SubTotalColumn.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SubTotalDescriptor.idl b/offapi/com/sun/star/sheet/SubTotalDescriptor.idl
index 399cb5b1d7d1..c971c83feb4a 100644
--- a/offapi/com/sun/star/sheet/SubTotalDescriptor.idl
+++ b/offapi/com/sun/star/sheet/SubTotalDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SubTotalField.idl b/offapi/com/sun/star/sheet/SubTotalField.idl
index bbec0c9706e8..f47ca69aa425 100644
--- a/offapi/com/sun/star/sheet/SubTotalField.idl
+++ b/offapi/com/sun/star/sheet/SubTotalField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl b/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl
index 49d6523a9d93..a015b7dfadce 100644
--- a/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/SubTotalFieldsEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/TableAutoFormat.idl b/offapi/com/sun/star/sheet/TableAutoFormat.idl
index 8f9af3b41ef7..f10cd415c1e8 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormat.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,7 +65,7 @@ published service TableAutoFormat
 {
     //-------------------------------------------------------------------------
 
-//! service com::sun::star::beans::PropertySet;
+//!	service com::sun::star::beans::PropertySet;
     /** provides access to the properties.
      */
     interface com::sun::star::beans::XPropertySet;
diff --git a/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl b/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl
index 636ca5d6e856..318aaa2c211c 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormatEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/TableAutoFormatField.idl b/offapi/com/sun/star/sheet/TableAutoFormatField.idl
index 90ae519a4c51..45a80f9aa110 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormatField.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormatField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -77,7 +77,7 @@ published service TableAutoFormatField
 {
     //-------------------------------------------------------------------------
 
-//! service com::sun::star::beans::PropertySet;
+//!	service com::sun::star::beans::PropertySet;
     /** provides access to the properties.
      */
     interface com::sun::star::beans::XPropertySet;
diff --git a/offapi/com/sun/star/sheet/TableAutoFormats.idl b/offapi/com/sun/star/sheet/TableAutoFormats.idl
index bffc1cdccbb2..25d5c4ccf244 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormats.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormats.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl b/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl
index 3d7b19ed411c..fdb6e7d27155 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormatsEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/TableCellStyle.idl b/offapi/com/sun/star/sheet/TableCellStyle.idl
index 94559721145a..09d996be210d 100644
--- a/offapi/com/sun/star/sheet/TableCellStyle.idl
+++ b/offapi/com/sun/star/sheet/TableCellStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/TableConditionalEntry.idl b/offapi/com/sun/star/sheet/TableConditionalEntry.idl
index d0a10cd8f4fc..5fd74a77db1b 100644
--- a/offapi/com/sun/star/sheet/TableConditionalEntry.idl
+++ b/offapi/com/sun/star/sheet/TableConditionalEntry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl b/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl
index 815563a4aa93..4221ba8c8a13 100644
--- a/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl
+++ b/offapi/com/sun/star/sheet/TableConditionalEntryEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/TableConditionalFormat.idl b/offapi/com/sun/star/sheet/TableConditionalFormat.idl
index 4c21a61ce712..473237f2941b 100644
--- a/offapi/com/sun/star/sheet/TableConditionalFormat.idl
+++ b/offapi/com/sun/star/sheet/TableConditionalFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/TableFilterField.idl b/offapi/com/sun/star/sheet/TableFilterField.idl
index 6000a1c0247e..b0e334e2a612 100644
--- a/offapi/com/sun/star/sheet/TableFilterField.idl
+++ b/offapi/com/sun/star/sheet/TableFilterField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/TableFilterField2.idl b/offapi/com/sun/star/sheet/TableFilterField2.idl
index cfbcfa4d143c..5285b29f3886 100644
--- a/offapi/com/sun/star/sheet/TableFilterField2.idl
+++ b/offapi/com/sun/star/sheet/TableFilterField2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/TableOperationMode.idl b/offapi/com/sun/star/sheet/TableOperationMode.idl
index bc7c610f40d0..4bbc1978c5b9 100644
--- a/offapi/com/sun/star/sheet/TableOperationMode.idl
+++ b/offapi/com/sun/star/sheet/TableOperationMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/TablePageBreakData.idl b/offapi/com/sun/star/sheet/TablePageBreakData.idl
index 5a80bfc19e2d..2c0b41698fae 100644
--- a/offapi/com/sun/star/sheet/TablePageBreakData.idl
+++ b/offapi/com/sun/star/sheet/TablePageBreakData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/TablePageStyle.idl b/offapi/com/sun/star/sheet/TablePageStyle.idl
index 6673fb80f9de..7715cf7d402c 100644
--- a/offapi/com/sun/star/sheet/TablePageStyle.idl
+++ b/offapi/com/sun/star/sheet/TablePageStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/TableValidation.idl b/offapi/com/sun/star/sheet/TableValidation.idl
index f71ab2b1e6aa..41ddbba007d1 100644
--- a/offapi/com/sun/star/sheet/TableValidation.idl
+++ b/offapi/com/sun/star/sheet/TableValidation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/TableValidationVisibility.idl b/offapi/com/sun/star/sheet/TableValidationVisibility.idl
index 3d122d13ba9f..6b1ceb9f5e57 100644
--- a/offapi/com/sun/star/sheet/TableValidationVisibility.idl
+++ b/offapi/com/sun/star/sheet/TableValidationVisibility.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl b/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl
index d8edb544e2d9..3e25e0ea2078 100644
--- a/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl
+++ b/offapi/com/sun/star/sheet/UniqueCellFormatRanges.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl b/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl
index ebfda93bf203..8f04a6971f4c 100644
--- a/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl
+++ b/offapi/com/sun/star/sheet/UniqueCellFormatRangesEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/ValidationAlertStyle.idl b/offapi/com/sun/star/sheet/ValidationAlertStyle.idl
index 3afbd65372df..061831b4b3a6 100644
--- a/offapi/com/sun/star/sheet/ValidationAlertStyle.idl
+++ b/offapi/com/sun/star/sheet/ValidationAlertStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/ValidationType.idl b/offapi/com/sun/star/sheet/ValidationType.idl
index 0c6d7a433570..46f24dfba248 100644
--- a/offapi/com/sun/star/sheet/ValidationType.idl
+++ b/offapi/com/sun/star/sheet/ValidationType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/VolatileResult.idl b/offapi/com/sun/star/sheet/VolatileResult.idl
index 791416855998..a9d9d099f287 100644
--- a/offapi/com/sun/star/sheet/VolatileResult.idl
+++ b/offapi/com/sun/star/sheet/VolatileResult.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XActivationBroadcaster.idl b/offapi/com/sun/star/sheet/XActivationBroadcaster.idl
index 7c57ab280508..117dee53931c 100644
--- a/offapi/com/sun/star/sheet/XActivationBroadcaster.idl
+++ b/offapi/com/sun/star/sheet/XActivationBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XActivationEventListener.idl b/offapi/com/sun/star/sheet/XActivationEventListener.idl
index ede31cf591d0..bec94c1389b2 100644
--- a/offapi/com/sun/star/sheet/XActivationEventListener.idl
+++ b/offapi/com/sun/star/sheet/XActivationEventListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XAddIn.idl b/offapi/com/sun/star/sheet/XAddIn.idl
index f506de2e5587..b59945941963 100644
--- a/offapi/com/sun/star/sheet/XAddIn.idl
+++ b/offapi/com/sun/star/sheet/XAddIn.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XAreaLink.idl b/offapi/com/sun/star/sheet/XAreaLink.idl
index 9d92564945c0..31ad7a518d4e 100644
--- a/offapi/com/sun/star/sheet/XAreaLink.idl
+++ b/offapi/com/sun/star/sheet/XAreaLink.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XAreaLinks.idl b/offapi/com/sun/star/sheet/XAreaLinks.idl
index aca3f2ac57ed..89e788ba557d 100644
--- a/offapi/com/sun/star/sheet/XAreaLinks.idl
+++ b/offapi/com/sun/star/sheet/XAreaLinks.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XArrayFormulaRange.idl b/offapi/com/sun/star/sheet/XArrayFormulaRange.idl
index 6941b8c5808d..07631618fe05 100644
--- a/offapi/com/sun/star/sheet/XArrayFormulaRange.idl
+++ b/offapi/com/sun/star/sheet/XArrayFormulaRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl b/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl
index 6761606bc4dd..cc39d1219cda 100644
--- a/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl
+++ b/offapi/com/sun/star/sheet/XArrayFormulaTokens.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XCalculatable.idl b/offapi/com/sun/star/sheet/XCalculatable.idl
index 4c46f8b5829a..f5a0bb751390 100644
--- a/offapi/com/sun/star/sheet/XCalculatable.idl
+++ b/offapi/com/sun/star/sheet/XCalculatable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XCellAddressable.idl b/offapi/com/sun/star/sheet/XCellAddressable.idl
index b057301da9fd..41d98838d612 100644
--- a/offapi/com/sun/star/sheet/XCellAddressable.idl
+++ b/offapi/com/sun/star/sheet/XCellAddressable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl b/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl
index f2c660513fdd..ca743a35d967 100644
--- a/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XCellFormatRangesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XCellRangeAddressable.idl b/offapi/com/sun/star/sheet/XCellRangeAddressable.idl
index f0391fafd856..cc921f5f5494 100644
--- a/offapi/com/sun/star/sheet/XCellRangeAddressable.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeAddressable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XCellRangeData.idl b/offapi/com/sun/star/sheet/XCellRangeData.idl
index 3e08587a3aa3..62a85c7e63af 100644
--- a/offapi/com/sun/star/sheet/XCellRangeData.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XCellRangeFormula.idl b/offapi/com/sun/star/sheet/XCellRangeFormula.idl
index 3de2eba0ddde..5c396f8b04fe 100644
--- a/offapi/com/sun/star/sheet/XCellRangeFormula.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeFormula.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XCellRangeMovement.idl b/offapi/com/sun/star/sheet/XCellRangeMovement.idl
index 230c3606b845..8cb34b781770 100644
--- a/offapi/com/sun/star/sheet/XCellRangeMovement.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeMovement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XCellRangeReferrer.idl b/offapi/com/sun/star/sheet/XCellRangeReferrer.idl
index 95ba302b90fe..027e0dc54485 100644
--- a/offapi/com/sun/star/sheet/XCellRangeReferrer.idl
+++ b/offapi/com/sun/star/sheet/XCellRangeReferrer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XCellRangesAccess.idl b/offapi/com/sun/star/sheet/XCellRangesAccess.idl
index d22d2a4c6e6e..dc0b03de7438 100644
--- a/offapi/com/sun/star/sheet/XCellRangesAccess.idl
+++ b/offapi/com/sun/star/sheet/XCellRangesAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XCellRangesQuery.idl b/offapi/com/sun/star/sheet/XCellRangesQuery.idl
index 44c9b8b4053b..43d2d6733a54 100644
--- a/offapi/com/sun/star/sheet/XCellRangesQuery.idl
+++ b/offapi/com/sun/star/sheet/XCellRangesQuery.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XCellSeries.idl b/offapi/com/sun/star/sheet/XCellSeries.idl
index 27e6794b6eec..72a15a8416dd 100644
--- a/offapi/com/sun/star/sheet/XCellSeries.idl
+++ b/offapi/com/sun/star/sheet/XCellSeries.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XCompatibilityNames.idl b/offapi/com/sun/star/sheet/XCompatibilityNames.idl
index 28170f8eadc8..3835d6849779 100644
--- a/offapi/com/sun/star/sheet/XCompatibilityNames.idl
+++ b/offapi/com/sun/star/sheet/XCompatibilityNames.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XConsolidatable.idl b/offapi/com/sun/star/sheet/XConsolidatable.idl
index ba02e0741480..e4c9ae526925 100644
--- a/offapi/com/sun/star/sheet/XConsolidatable.idl
+++ b/offapi/com/sun/star/sheet/XConsolidatable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl b/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl
index e23069c57a84..1cbda36d59fa 100644
--- a/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl
+++ b/offapi/com/sun/star/sheet/XConsolidationDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XDDELink.idl b/offapi/com/sun/star/sheet/XDDELink.idl
index 3f2a71ed4cbd..0916c0978bf0 100644
--- a/offapi/com/sun/star/sheet/XDDELink.idl
+++ b/offapi/com/sun/star/sheet/XDDELink.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XDDELinkResults.idl b/offapi/com/sun/star/sheet/XDDELinkResults.idl
index b0ca1afd5205..f342b5e55021 100644
--- a/offapi/com/sun/star/sheet/XDDELinkResults.idl
+++ b/offapi/com/sun/star/sheet/XDDELinkResults.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XDDELinks.idl b/offapi/com/sun/star/sheet/XDDELinks.idl
index 6863a4432c8c..58ccf8511260 100644
--- a/offapi/com/sun/star/sheet/XDDELinks.idl
+++ b/offapi/com/sun/star/sheet/XDDELinks.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl b/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl
index 06d74a921077..c0fa95086503 100644
--- a/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotDataLayoutFieldSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl b/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl
index ab86bf29e05a..7832205b0d8d 100644
--- a/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XDataPilotField.idl b/offapi/com/sun/star/sheet/XDataPilotField.idl
index 43f98d55f029..eb892ee890d6 100644
--- a/offapi/com/sun/star/sheet/XDataPilotField.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl b/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl
index 43ab69bb99d5..6538210ef5ae 100644
--- a/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotFieldGrouping.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl b/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl
index b8f51d27cfcd..7777b3adbfe7 100644
--- a/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotMemberResults.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XDataPilotResults.idl b/offapi/com/sun/star/sheet/XDataPilotResults.idl
index 38e4c2ec6886..9a5f0629f7cd 100644
--- a/offapi/com/sun/star/sheet/XDataPilotResults.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotResults.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XDataPilotTable.idl b/offapi/com/sun/star/sheet/XDataPilotTable.idl
index 00aae3780bd9..6613e722cb97 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTable.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XDataPilotTable2.idl b/offapi/com/sun/star/sheet/XDataPilotTable2.idl
index df7ec30041a8..0063105f95d0 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTable2.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTable2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,10 +57,10 @@
 
 module com {  module sun {  module star {  module sheet {
 
-/** additional methods to extend <type scope="com::sun::star::sheet">XDataPilotTable</type>.
+/** additional methods to extend <type scope="com::sun::star::sheet">XDataPilotTable</type>. 
 
-   <type scope="com::sun::star::sheet">XDataPilotTable2</type> extends the old
-   <type scope="com::sun::star::sheet">XDataPilotTable</type> interface with
+   <type scope="com::sun::star::sheet">XDataPilotTable2</type> extends the old 
+   <type scope="com::sun::star::sheet">XDataPilotTable</type> interface with 
    additional methods.
 
    @see com::sun::star::sheet::XDataPilotTable
@@ -69,8 +69,8 @@ module com {  module sun {  module star {  module sheet {
  */
 interface XDataPilotTable2: com::sun::star::sheet::XDataPilotTable
 {
-    /** When the address of a cell within the result area is given,
-        <method>XDataPilotTable2::getDrillDownData</method> returns its drill-down
+    /** When the address of a cell within the result area is given, 
+        <method>XDataPilotTable2::getDrillDownData</method> returns its drill-down 
         output table that includes only those rows that contribute to the value of
         that cell.
 
@@ -82,13 +82,13 @@ interface XDataPilotTable2: com::sun::star::sheet::XDataPilotTable
      */
     sequence< sequence< any > > getDrillDownData( [in] com::sun::star::table::CellAddress aAddr );
 
-    /** Given a cell address, it returns the information about that cell.  The
-        type of information returned depends upon whether the cell is within
+    /** Given a cell address, it returns the information about that cell.  The 
+        type of information returned depends upon whether the cell is within 
         the result area or column/row header area.
 
         @param aAddr address of the cell whose information is to be returned.
 
-        @returns <type>DataPilotTablePositionData</type> which contains the
+        @returns <type>DataPilotTablePositionData</type> which contains the 
         position type and the information for that cell position.
 
         @see com::sun::star::sheet::DataPilotTablePositionData
@@ -97,9 +97,9 @@ interface XDataPilotTable2: com::sun::star::sheet::XDataPilotTable
      */
     DataPilotTablePositionData getPositionData( [in] com::sun::star::table::CellAddress aAddr );
 
-    /** <p>This method inserts a new sheet to display the drill-down data for a
-        specified result cell.  A drill-down data for a result cell consists
-        of a subset of rows from the original data source that contribute to
+    /** <p>This method inserts a new sheet to display the drill-down data for a 
+        specified result cell.  A drill-down data for a result cell consists 
+        of a subset of rows from the original data source that contribute to 
         the value displayed in that cell.</p>
 
         <p>The new sheet is always inserted to the immediate left of the current
@@ -112,7 +112,7 @@ interface XDataPilotTable2: com::sun::star::sheet::XDataPilotTable
      */
     void insertDrillDownSheet( [in] com::sun::star::table::CellAddress aAddr );
 
-    /** <p>This method returns a different output range of a DataPilot table
+    /** <p>This method returns a different output range of a DataPilot table 
         per specified output range type.</p>
 
         @returns <type scope="com::sun::star::table">CellRangeAddress</type> depicting
@@ -121,7 +121,7 @@ interface XDataPilotTable2: com::sun::star::sheet::XDataPilotTable
 
         @see com::sun::star::sheet::DataPilotOutputRangeType
      */
-    com::sun::star::table::CellRangeAddress getOutputRangeByType( [in] long nType )
+    com::sun::star::table::CellRangeAddress getOutputRangeByType( [in] long nType ) 
         raises (com::sun::star::lang::IllegalArgumentException);
 };
 
diff --git a/offapi/com/sun/star/sheet/XDataPilotTables.idl b/offapi/com/sun/star/sheet/XDataPilotTables.idl
index f4706cdb223c..aab35d542a81 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTables.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTables.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl b/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl
index 1df209f6d669..68ecd365741e 100644
--- a/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDataPilotTablesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XDatabaseRange.idl b/offapi/com/sun/star/sheet/XDatabaseRange.idl
index 573578f0c355..f61bed1c344b 100644
--- a/offapi/com/sun/star/sheet/XDatabaseRange.idl
+++ b/offapi/com/sun/star/sheet/XDatabaseRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XDatabaseRanges.idl b/offapi/com/sun/star/sheet/XDatabaseRanges.idl
index 1794f3c7eb42..3ba23bec4ba4 100644
--- a/offapi/com/sun/star/sheet/XDatabaseRanges.idl
+++ b/offapi/com/sun/star/sheet/XDatabaseRanges.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XDimensionsSupplier.idl b/offapi/com/sun/star/sheet/XDimensionsSupplier.idl
index 309fdee4c522..40bcd69b062e 100644
--- a/offapi/com/sun/star/sheet/XDimensionsSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDimensionsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XDocumentAuditing.idl b/offapi/com/sun/star/sheet/XDocumentAuditing.idl
index 25a82ffb6970..b62610384ee4 100644
--- a/offapi/com/sun/star/sheet/XDocumentAuditing.idl
+++ b/offapi/com/sun/star/sheet/XDocumentAuditing.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl b/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl
index ec5e6e2cb9c7..3219b2fa0ce1 100644
--- a/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl
+++ b/offapi/com/sun/star/sheet/XDrillDownDataSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -61,7 +61,7 @@ module com {  module sun {  module star {  module sheet {
  */
 interface XDrillDownDataSupplier: com::sun::star::uno::XInterface
 {
-    /** This method returns filtered subset of the original source data based on
+    /** This method returns filtered subset of the original source data based on 
         a given set of filtering criteria.
 
         @param aFilters filtering criteria
@@ -69,13 +69,13 @@ interface XDrillDownDataSupplier: com::sun::star::uno::XInterface
         @returns a filtered subset of the origintal source data as 2-dimensional
         sequences of <type scope="com::sun::star::uno">Any</any>.  The first row
         must be the header row.  Each <type scope="com::sun::star::uno">Any</type>
-        instance must contain either <type>double</type> value for a numeric cell, or
+        instance must contain either <type>double</type> value for a numeric cell, or 
         a <type>string</type> value for a string cell.
 
         @see com::sun::star::sheet::DataPilotFieldFilter
         @see com::sun::star::sheet::XDataPilotTable2
      */
-    sequence< sequence< any > > getDrillDownData(
+    sequence< sequence< any > > getDrillDownData( 
         [in] sequence< com::sun::star::sheet::DataPilotFieldFilter > aFilters );
 };
 
diff --git a/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl b/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl
index 58461f90296a..4e9fe3227a6a 100644
--- a/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl
+++ b/offapi/com/sun/star/sheet/XEnhancedMouseClickBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XExternalDocLink.idl b/offapi/com/sun/star/sheet/XExternalDocLink.idl
index 1a9662dbeed7..2ca038f38e24 100644
--- a/offapi/com/sun/star/sheet/XExternalDocLink.idl
+++ b/offapi/com/sun/star/sheet/XExternalDocLink.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -60,11 +60,11 @@ interface XExternalDocLink
 
         @param aSheetName sheet name
 
-        @param DynamicCache specify whether or not the cache can grow when
-        non-cached regions are queried.  If <true/>, querying a non-cached
-        cell in this sheet cache will allow Calc to try to access the source
-        document to fetch the value in first access.  If <false/>, the source
-        document will not be accessed, and the non-cached regions are treated
+        @param DynamicCache specify whether or not the cache can grow when 
+        non-cached regions are queried.  If <true/>, querying a non-cached 
+        cell in this sheet cache will allow Calc to try to access the source 
+        document to fetch the value in first access.  If <false/>, the source 
+        document will not be accessed, and the non-cached regions are treated 
         as empty cells.
 
         @return com::sun::star::sheet::XExternalSheetCache sheet cache instance
diff --git a/offapi/com/sun/star/sheet/XExternalDocLinks.idl b/offapi/com/sun/star/sheet/XExternalDocLinks.idl
index 642b3c57eb14..16d9383e9d15 100644
--- a/offapi/com/sun/star/sheet/XExternalDocLinks.idl
+++ b/offapi/com/sun/star/sheet/XExternalDocLinks.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XExternalSheetCache.idl b/offapi/com/sun/star/sheet/XExternalSheetCache.idl
index 23827d7a04e2..8acc3452af30 100644
--- a/offapi/com/sun/star/sheet/XExternalSheetCache.idl
+++ b/offapi/com/sun/star/sheet/XExternalSheetCache.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XExternalSheetName.idl b/offapi/com/sun/star/sheet/XExternalSheetName.idl
index dd0cc73c67ec..8cbad974a6b7 100644
--- a/offapi/com/sun/star/sheet/XExternalSheetName.idl
+++ b/offapi/com/sun/star/sheet/XExternalSheetName.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,9 +32,9 @@
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
-#ifndef __com_sun_star_container_ElementExistException_idl__
-#include <com/sun/star/container/ElementExistException.idl>
-#endif
+#ifndef __com_sun_star_container_ElementExistException_idl__ 
+#include <com/sun/star/container/ElementExistException.idl> 
+#endif 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/sheet/XFillAcrossSheet.idl b/offapi/com/sun/star/sheet/XFillAcrossSheet.idl
index b00ccb8158c6..6a71ae5c17ea 100644
--- a/offapi/com/sun/star/sheet/XFillAcrossSheet.idl
+++ b/offapi/com/sun/star/sheet/XFillAcrossSheet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XFilterFormulaParser.idl b/offapi/com/sun/star/sheet/XFilterFormulaParser.idl
index e78c01d75876..b5e07896a6d1 100644
--- a/offapi/com/sun/star/sheet/XFilterFormulaParser.idl
+++ b/offapi/com/sun/star/sheet/XFilterFormulaParser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl b/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
index e0ca0655d3e3..0a53298d6b76 100644
--- a/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
+++ b/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XFormulaParser.idl b/offapi/com/sun/star/sheet/XFormulaParser.idl
index 73b317e7f848..db540bc75b01 100644
--- a/offapi/com/sun/star/sheet/XFormulaParser.idl
+++ b/offapi/com/sun/star/sheet/XFormulaParser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XFormulaQuery.idl b/offapi/com/sun/star/sheet/XFormulaQuery.idl
index 9188332dd184..09ef7803bc14 100644
--- a/offapi/com/sun/star/sheet/XFormulaQuery.idl
+++ b/offapi/com/sun/star/sheet/XFormulaQuery.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XFormulaTokens.idl b/offapi/com/sun/star/sheet/XFormulaTokens.idl
index 5edfe0b9840d..3b48ef349744 100644
--- a/offapi/com/sun/star/sheet/XFormulaTokens.idl
+++ b/offapi/com/sun/star/sheet/XFormulaTokens.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XFunctionAccess.idl b/offapi/com/sun/star/sheet/XFunctionAccess.idl
index c12401421b35..a66785150c46 100644
--- a/offapi/com/sun/star/sheet/XFunctionAccess.idl
+++ b/offapi/com/sun/star/sheet/XFunctionAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XFunctionDescriptions.idl b/offapi/com/sun/star/sheet/XFunctionDescriptions.idl
index 6346de137820..7e748ce565b7 100644
--- a/offapi/com/sun/star/sheet/XFunctionDescriptions.idl
+++ b/offapi/com/sun/star/sheet/XFunctionDescriptions.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XGoalSeek.idl b/offapi/com/sun/star/sheet/XGoalSeek.idl
index a6e627574f88..c3a7e0d31e31 100644
--- a/offapi/com/sun/star/sheet/XGoalSeek.idl
+++ b/offapi/com/sun/star/sheet/XGoalSeek.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XHeaderFooterContent.idl b/offapi/com/sun/star/sheet/XHeaderFooterContent.idl
index 6b491fadabf0..bc2380751724 100644
--- a/offapi/com/sun/star/sheet/XHeaderFooterContent.idl
+++ b/offapi/com/sun/star/sheet/XHeaderFooterContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl b/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl
index 8b96a2888a04..c28bd522244b 100644
--- a/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XHierarchiesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XLabelRange.idl b/offapi/com/sun/star/sheet/XLabelRange.idl
index 0fc837e8d244..7a6e771ac3d6 100644
--- a/offapi/com/sun/star/sheet/XLabelRange.idl
+++ b/offapi/com/sun/star/sheet/XLabelRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XLabelRanges.idl b/offapi/com/sun/star/sheet/XLabelRanges.idl
index b1cf0aaeac09..b4e4ceb5a751 100644
--- a/offapi/com/sun/star/sheet/XLabelRanges.idl
+++ b/offapi/com/sun/star/sheet/XLabelRanges.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XLevelsSupplier.idl b/offapi/com/sun/star/sheet/XLevelsSupplier.idl
index ec867a5ecf94..1224b49cd328 100644
--- a/offapi/com/sun/star/sheet/XLevelsSupplier.idl
+++ b/offapi/com/sun/star/sheet/XLevelsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XMembersSupplier.idl b/offapi/com/sun/star/sheet/XMembersSupplier.idl
index 44c9669bc247..87f466496a16 100644
--- a/offapi/com/sun/star/sheet/XMembersSupplier.idl
+++ b/offapi/com/sun/star/sheet/XMembersSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl b/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl
index eb6ade5c3883..d60272ba0e26 100644
--- a/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl
+++ b/offapi/com/sun/star/sheet/XMultiFormulaTokens.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XMultipleOperation.idl b/offapi/com/sun/star/sheet/XMultipleOperation.idl
index c0ba09d28674..962fb811099a 100644
--- a/offapi/com/sun/star/sheet/XMultipleOperation.idl
+++ b/offapi/com/sun/star/sheet/XMultipleOperation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XNamedRange.idl b/offapi/com/sun/star/sheet/XNamedRange.idl
index 678594c41d15..528198b83176 100644
--- a/offapi/com/sun/star/sheet/XNamedRange.idl
+++ b/offapi/com/sun/star/sheet/XNamedRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XNamedRanges.idl b/offapi/com/sun/star/sheet/XNamedRanges.idl
index 36fb40485ce6..ed0bef17c69a 100644
--- a/offapi/com/sun/star/sheet/XNamedRanges.idl
+++ b/offapi/com/sun/star/sheet/XNamedRanges.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XPrintAreas.idl b/offapi/com/sun/star/sheet/XPrintAreas.idl
index 78a0bf352512..5fcb77d90c2a 100644
--- a/offapi/com/sun/star/sheet/XPrintAreas.idl
+++ b/offapi/com/sun/star/sheet/XPrintAreas.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XRangeSelection.idl b/offapi/com/sun/star/sheet/XRangeSelection.idl
index e5a43d211a15..2c10890514ee 100644
--- a/offapi/com/sun/star/sheet/XRangeSelection.idl
+++ b/offapi/com/sun/star/sheet/XRangeSelection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sheet_XRangeSelection_idl__
-#define __com_sun_star_sheet_XRangeSelection_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_sheet_XRangeSelection_idl__ 
+#define __com_sun_star_sheet_XRangeSelection_idl__ 
 
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
 
- module com {  module sun {  module star {  module sheet {
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sheet {  
 
  published interface XRangeSelectionListener;
  published interface XRangeSelectionChangeListener;
 
-//=============================================================================
-
+//============================================================================= 
+ 
 /** allows to let the user to select a cell range.
 
     @see com::sun::star::sheet::SpreadsheetView
  */
 published interface XRangeSelection: com::sun::star::uno::XInterface
-{
+{ 
     /** starts the range selection.
 
-        @param aArguments
+        @param aArguments 
         the <type>RangeSelectionArguments</type> that specify how the
         range selection is done.
      */
@@ -67,8 +67,8 @@ published interface XRangeSelection: com::sun::star::uno::XInterface
         or aborted.
      */
     void addRangeSelectionListener(
-                [in] com::sun::star::sheet::XRangeSelectionListener aListener );
-
+                [in] com::sun::star::sheet::XRangeSelectionListener aListener ); 
+     
     /** removes the specified listener.
      */
     void removeRangeSelectionListener(
@@ -77,18 +77,18 @@ published interface XRangeSelection: com::sun::star::uno::XInterface
     /** adds a listener that is notified when the selected range is changed.
      */
     void addRangeSelectionChangeListener(
-                [in] com::sun::star::sheet::XRangeSelectionChangeListener aListener );
-
+                [in] com::sun::star::sheet::XRangeSelectionChangeListener aListener ); 
+     
     /** removes the specified listener.
      */
     void removeRangeSelectionChangeListener(
                 [in] com::sun::star::sheet::XRangeSelectionChangeListener aListener );
 
 };
-
-//=============================================================================
-
-}; }; }; };
+ 
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
 
diff --git a/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl b/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl
index b67d55f72728..575c6a14ffa3 100644
--- a/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl
+++ b/offapi/com/sun/star/sheet/XRangeSelectionChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sheet_XRangeSelectionChangeListener_idl__
-#define __com_sun_star_sheet_XRangeSelectionChangeListener_idl__
+#ifndef __com_sun_star_sheet_XRangeSelectionChangeListener_idl__ 
+#define __com_sun_star_sheet_XRangeSelectionChangeListener_idl__ 
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
 
-#ifndef __com_sun_star_sheet_RangeSelectionEvent_idl__
-#include <com/sun/star/sheet/RangeSelectionEvent.idl>
+#ifndef __com_sun_star_sheet_RangeSelectionEvent_idl__ 
+#include <com/sun/star/sheet/RangeSelectionEvent.idl> 
 #endif
+ 
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sheet {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sheet {  
+ 
+//============================================================================= 
+ 
 /** allows notification when the selected range is changed.
 
     @see com::sun::star::sheet::XRangeSelection
  */
 published interface XRangeSelectionChangeListener: com::sun::star::lang::XEventListener
-{
+{ 
     /** is called when the selected range is changed while
         range selection is active.
      */
-    void descriptorChanged( [in] com::sun::star::sheet::RangeSelectionEvent aEvent );
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    void descriptorChanged( [in] com::sun::star::sheet::RangeSelectionEvent aEvent ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 
 #endif
 
diff --git a/offapi/com/sun/star/sheet/XRangeSelectionListener.idl b/offapi/com/sun/star/sheet/XRangeSelectionListener.idl
index 41e9755127e2..6e676c07ee70 100644
--- a/offapi/com/sun/star/sheet/XRangeSelectionListener.idl
+++ b/offapi/com/sun/star/sheet/XRangeSelectionListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sheet_XRangeSelectionListener_idl__
-#define __com_sun_star_sheet_XRangeSelectionListener_idl__
+#ifndef __com_sun_star_sheet_XRangeSelectionListener_idl__ 
+#define __com_sun_star_sheet_XRangeSelectionListener_idl__ 
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
 
-#ifndef __com_sun_star_sheet_RangeSelectionEvent_idl__
-#include <com/sun/star/sheet/RangeSelectionEvent.idl>
+#ifndef __com_sun_star_sheet_RangeSelectionEvent_idl__ 
+#include <com/sun/star/sheet/RangeSelectionEvent.idl> 
 #endif
+ 
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sheet {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sheet {  
+ 
+//============================================================================= 
+ 
 /** allows notification when range selection is completed or aborted.
 
     @see com::sun::star::sheet::XRangeSelection
  */
 published interface XRangeSelectionListener: com::sun::star::lang::XEventListener
-{
+{ 
     /** is called when range selection is completed.
      */
-    void done( [in] com::sun::star::sheet::RangeSelectionEvent aEvent );
+    void done( [in] com::sun::star::sheet::RangeSelectionEvent aEvent ); 
 
     /** is called when range selection is aborted.
      */
-    void aborted( [in] com::sun::star::sheet::RangeSelectionEvent aEvent );
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    void aborted( [in] com::sun::star::sheet::RangeSelectionEvent aEvent ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 
 #endif
 
diff --git a/offapi/com/sun/star/sheet/XRecentFunctions.idl b/offapi/com/sun/star/sheet/XRecentFunctions.idl
index 91a3436f9bb9..04f647e3aa41 100644
--- a/offapi/com/sun/star/sheet/XRecentFunctions.idl
+++ b/offapi/com/sun/star/sheet/XRecentFunctions.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XResultListener.idl b/offapi/com/sun/star/sheet/XResultListener.idl
index 7f72f0fd0a35..682c612d72ad 100644
--- a/offapi/com/sun/star/sheet/XResultListener.idl
+++ b/offapi/com/sun/star/sheet/XResultListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XScenario.idl b/offapi/com/sun/star/sheet/XScenario.idl
index 4ff1ad532d6a..96b573893522 100644
--- a/offapi/com/sun/star/sheet/XScenario.idl
+++ b/offapi/com/sun/star/sheet/XScenario.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XScenarioEnhanced.idl b/offapi/com/sun/star/sheet/XScenarioEnhanced.idl
index cd4b895f1258..2e530b51b74d 100644
--- a/offapi/com/sun/star/sheet/XScenarioEnhanced.idl
+++ b/offapi/com/sun/star/sheet/XScenarioEnhanced.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XScenarios.idl b/offapi/com/sun/star/sheet/XScenarios.idl
index d294bdf72b42..9b8edf2229ce 100644
--- a/offapi/com/sun/star/sheet/XScenarios.idl
+++ b/offapi/com/sun/star/sheet/XScenarios.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XScenariosSupplier.idl b/offapi/com/sun/star/sheet/XScenariosSupplier.idl
index f04770fe08aa..8308e1b05c72 100644
--- a/offapi/com/sun/star/sheet/XScenariosSupplier.idl
+++ b/offapi/com/sun/star/sheet/XScenariosSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotation.idl b/offapi/com/sun/star/sheet/XSheetAnnotation.idl
index a999cf8f32b8..b3a332dc0d6a 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotation.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl b/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl
index e53477080bea..726e3b5c1b35 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotationAnchor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl b/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl
index 5075cc2f52b4..c54adf9cef40 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotationShapeSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotations.idl b/offapi/com/sun/star/sheet/XSheetAnnotations.idl
index c3fa31ac674e..4bf859c90e88 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotations.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotations.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl b/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl
index 9b696060a977..37213048099b 100644
--- a/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl
+++ b/offapi/com/sun/star/sheet/XSheetAnnotationsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetAuditing.idl b/offapi/com/sun/star/sheet/XSheetAuditing.idl
index 43342f5a6f6b..3e0e30bdf0fc 100644
--- a/offapi/com/sun/star/sheet/XSheetAuditing.idl
+++ b/offapi/com/sun/star/sheet/XSheetAuditing.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetCellCursor.idl b/offapi/com/sun/star/sheet/XSheetCellCursor.idl
index 3141231437cd..c9d0a47951ba 100644
--- a/offapi/com/sun/star/sheet/XSheetCellCursor.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetCellRange.idl b/offapi/com/sun/star/sheet/XSheetCellRange.idl
index f025a44e3e25..0d7b403bc4d1 100644
--- a/offapi/com/sun/star/sheet/XSheetCellRange.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl b/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl
index b063b2ed3f95..e77e3b4fbe9c 100644
--- a/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellRangeContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetCellRanges.idl b/offapi/com/sun/star/sheet/XSheetCellRanges.idl
index 7b87269d779f..527fe521e35b 100644
--- a/offapi/com/sun/star/sheet/XSheetCellRanges.idl
+++ b/offapi/com/sun/star/sheet/XSheetCellRanges.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetCondition.idl b/offapi/com/sun/star/sheet/XSheetCondition.idl
index 3fc4635f9b4a..4a7e8185027f 100644
--- a/offapi/com/sun/star/sheet/XSheetCondition.idl
+++ b/offapi/com/sun/star/sheet/XSheetCondition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl b/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl
index 8e8b10af5e14..c6f1489d168d 100644
--- a/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl
+++ b/offapi/com/sun/star/sheet/XSheetConditionalEntries.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl b/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl
index 2ecc635393b6..d2fe33a282d1 100644
--- a/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl
+++ b/offapi/com/sun/star/sheet/XSheetConditionalEntry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetFilterDescriptor.idl b/offapi/com/sun/star/sheet/XSheetFilterDescriptor.idl
index 49f44fd534d8..3f4c49d429ca 100644
--- a/offapi/com/sun/star/sheet/XSheetFilterDescriptor.idl
+++ b/offapi/com/sun/star/sheet/XSheetFilterDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetFilterDescriptor2.idl b/offapi/com/sun/star/sheet/XSheetFilterDescriptor2.idl
index 8f94ee65fc8e..113f8b61d350 100644
--- a/offapi/com/sun/star/sheet/XSheetFilterDescriptor2.idl
+++ b/offapi/com/sun/star/sheet/XSheetFilterDescriptor2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetFilterable.idl b/offapi/com/sun/star/sheet/XSheetFilterable.idl
index 0dbdca51a94f..cdb1fb40094e 100644
--- a/offapi/com/sun/star/sheet/XSheetFilterable.idl
+++ b/offapi/com/sun/star/sheet/XSheetFilterable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetFilterableEx.idl b/offapi/com/sun/star/sheet/XSheetFilterableEx.idl
index 591e9b18ed72..536e814835d6 100644
--- a/offapi/com/sun/star/sheet/XSheetFilterableEx.idl
+++ b/offapi/com/sun/star/sheet/XSheetFilterableEx.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetLinkable.idl b/offapi/com/sun/star/sheet/XSheetLinkable.idl
index 159176dce9d3..732d779adbd5 100644
--- a/offapi/com/sun/star/sheet/XSheetLinkable.idl
+++ b/offapi/com/sun/star/sheet/XSheetLinkable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetOperation.idl b/offapi/com/sun/star/sheet/XSheetOperation.idl
index a547cfa66e91..fadd3c80dbb2 100644
--- a/offapi/com/sun/star/sheet/XSheetOperation.idl
+++ b/offapi/com/sun/star/sheet/XSheetOperation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -66,7 +66,7 @@ published interface XSheetOperation: com::sun::star::uno::XInterface
      */
     double computeFunction(
             [in] com::sun::star::sheet::GeneralFunction nFunction )
-        raises( com::sun::star::uno::Exception );   //! unnecessary
+        raises( com::sun::star::uno::Exception );	//! unnecessary
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/sheet/XSheetOutline.idl b/offapi/com/sun/star/sheet/XSheetOutline.idl
index 0f3de869d980..bed3b6c2af7b 100644
--- a/offapi/com/sun/star/sheet/XSheetOutline.idl
+++ b/offapi/com/sun/star/sheet/XSheetOutline.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetPageBreak.idl b/offapi/com/sun/star/sheet/XSheetPageBreak.idl
index 7d590f18eac0..c6fd8d0e618c 100644
--- a/offapi/com/sun/star/sheet/XSheetPageBreak.idl
+++ b/offapi/com/sun/star/sheet/XSheetPageBreak.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSheetPastable.idl b/offapi/com/sun/star/sheet/XSheetPastable.idl
index db2053f83273..aaff93192a6f 100644
--- a/offapi/com/sun/star/sheet/XSheetPastable.idl
+++ b/offapi/com/sun/star/sheet/XSheetPastable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSolver.idl b/offapi/com/sun/star/sheet/XSolver.idl
index aaf54ddb7586..4d46c39d3ca6 100644
--- a/offapi/com/sun/star/sheet/XSolver.idl
+++ b/offapi/com/sun/star/sheet/XSolver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSolverDescription.idl b/offapi/com/sun/star/sheet/XSolverDescription.idl
index 0efe1e202e94..59192dcab9d3 100644
--- a/offapi/com/sun/star/sheet/XSolverDescription.idl
+++ b/offapi/com/sun/star/sheet/XSolverDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSpreadsheet.idl b/offapi/com/sun/star/sheet/XSpreadsheet.idl
index 3f7628ad5a4a..55b80630f4b5 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheet.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl b/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl
index a60248d22b75..67a1d2edff72 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheetDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSpreadsheetView.idl b/offapi/com/sun/star/sheet/XSpreadsheetView.idl
index baefdb2359c7..42568bdf6cda 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheetView.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheetView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sheet_XSpreadsheetView_idl__
-#define __com_sun_star_sheet_XSpreadsheetView_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_sheet_XSpreadsheet_idl__
-#include <com/sun/star/sheet/XSpreadsheet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sheet {
-
-//=============================================================================
-
+#ifndef __com_sun_star_sheet_XSpreadsheetView_idl__ 
+#define __com_sun_star_sheet_XSpreadsheetView_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_sheet_XSpreadsheet_idl__ 
+#include <com/sun/star/sheet/XSpreadsheet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sheet {  
+ 
+//============================================================================= 
+ 
 /** is the main interface of a <type>SpreadsheetView</type>. It
     manages the active sheet within this view.
  */
 published interface XSpreadsheetView: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the sheet that is shown in the view.
      */
-    com::sun::star::sheet::XSpreadsheet getActiveSheet();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::sheet::XSpreadsheet getActiveSheet(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the sheet that is shown in the view.
      */
-    void setActiveSheet( [in] com::sun::star::sheet::XSpreadsheet xActiveSheet );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    void setActiveSheet( [in] com::sun::star::sheet::XSpreadsheet xActiveSheet ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/sheet/XSpreadsheets.idl b/offapi/com/sun/star/sheet/XSpreadsheets.idl
index f50157768667..1020655bbbbe 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheets.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheets.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl b/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl
index c1c1524a14a5..9ac28744c1a0 100644
--- a/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl
+++ b/offapi/com/sun/star/sheet/XSubTotalCalculatable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl b/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl
index 2a2d0afe1293..a60134f77771 100644
--- a/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl
+++ b/offapi/com/sun/star/sheet/XSubTotalDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XSubTotalField.idl b/offapi/com/sun/star/sheet/XSubTotalField.idl
index 3af87e72df3c..4b69f62c6259 100644
--- a/offapi/com/sun/star/sheet/XSubTotalField.idl
+++ b/offapi/com/sun/star/sheet/XSubTotalField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl b/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl
index 73e758af6539..d2923ffed04b 100644
--- a/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XUniqueCellFormatRangesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XUsedAreaCursor.idl b/offapi/com/sun/star/sheet/XUsedAreaCursor.idl
index 528b55c07a5c..1a936f9d6d70 100644
--- a/offapi/com/sun/star/sheet/XUsedAreaCursor.idl
+++ b/offapi/com/sun/star/sheet/XUsedAreaCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XViewFreezable.idl b/offapi/com/sun/star/sheet/XViewFreezable.idl
index 46464036e704..2b5409ce8a18 100644
--- a/offapi/com/sun/star/sheet/XViewFreezable.idl
+++ b/offapi/com/sun/star/sheet/XViewFreezable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,52 +24,52 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sheet_XViewFreezable_idl__
-#define __com_sun_star_sheet_XViewFreezable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sheet {
-
-//=============================================================================
-
-/** enables a <type>SpreadsheetView</type> to freeze
+#ifndef __com_sun_star_sheet_XViewFreezable_idl__ 
+#define __com_sun_star_sheet_XViewFreezable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sheet {  
+ 
+//============================================================================= 
+ 
+/** enables a <type>SpreadsheetView</type> to freeze 
     columns and rows of the view.
  */
 published interface XViewFreezable: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns <TRUE/> if the view has frozen panes.
 
         <p>Only one of
-        <member>XViewSplitable::getIsWindowSplit()</member> and
+        <member>XViewSplitable::getIsWindowSplit()</member> and 
         <member>XViewFreezable::hasFrozenPanes()</member>
         can be <TRUE/>.</p>
      */
-    boolean hasFrozenPanes();
-
-    //-------------------------------------------------------------------------
-
-    /** freezes panes with the specified number of
+    boolean hasFrozenPanes(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** freezes panes with the specified number of 
         columns and rows.
 
         <p>To freeze only horizontally, specify nRows as 0.
         To freeze only vertically, specify nColumns as 0.</p>
      */
-    void freezeAtPosition( [in] long nColumns,
-             [in] long nRows );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    void freezeAtPosition( [in] long nColumns, 
+             [in] long nRows ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/sheet/XViewPane.idl b/offapi/com/sun/star/sheet/XViewPane.idl
index 41f441e6a803..52b175070f19 100644
--- a/offapi/com/sun/star/sheet/XViewPane.idl
+++ b/offapi/com/sun/star/sheet/XViewPane.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,66 +24,66 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sheet_XViewPane_idl__
-#define __com_sun_star_sheet_XViewPane_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_table_CellRangeAddress_idl__
-#include <com/sun/star/table/CellRangeAddress.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sheet {
-
-//=============================================================================
-
+#ifndef __com_sun_star_sheet_XViewPane_idl__ 
+#define __com_sun_star_sheet_XViewPane_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_table_CellRangeAddress_idl__ 
+#include <com/sun/star/table/CellRangeAddress.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sheet {  
+ 
+//============================================================================= 
+ 
 /** represents a pane in a view of a spreadsheet document.
 
     @see com::sun::star::sheet::SpreadsheetViewPane
  */
 published interface XViewPane: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the first column that is visible in the pane.
      */
-    long getFirstVisibleColumn();
-
-    //-------------------------------------------------------------------------
-
+    long getFirstVisibleColumn(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the first column that is visible in the pane.
      */
-    void setFirstVisibleColumn( [in] long nFirstVisibleColumn );
-
-    //-------------------------------------------------------------------------
-
+    void setFirstVisibleColumn( [in] long nFirstVisibleColumn ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the first row that is visible in the pane.
      */
-    long getFirstVisibleRow();
-
-    //-------------------------------------------------------------------------
-
+    long getFirstVisibleRow(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the first row that is visible in the pane.
      */
-    void setFirstVisibleRow( [in] long nFirstVisibleRow );
-
-    //-------------------------------------------------------------------------
-
+    void setFirstVisibleRow( [in] long nFirstVisibleRow ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the address of the cell range that consists of
         the cells which are visible in the pane.
      */
-    com::sun::star::table::CellRangeAddress getVisibleRange();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    com::sun::star::table::CellRangeAddress getVisibleRange(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/sheet/XViewPanesSupplier.idl b/offapi/com/sun/star/sheet/XViewPanesSupplier.idl
index 130498695c6e..38082fee1fc3 100644
--- a/offapi/com/sun/star/sheet/XViewPanesSupplier.idl
+++ b/offapi/com/sun/star/sheet/XViewPanesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/XViewSplitable.idl b/offapi/com/sun/star/sheet/XViewSplitable.idl
index d5145addb9ee..9c7cdf303b87 100644
--- a/offapi/com/sun/star/sheet/XViewSplitable.idl
+++ b/offapi/com/sun/star/sheet/XViewSplitable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,79 +24,79 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_sheet_XViewSplitable_idl__
-#define __com_sun_star_sheet_XViewSplitable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sheet {
-
-//=============================================================================
-
+#ifndef __com_sun_star_sheet_XViewSplitable_idl__ 
+#define __com_sun_star_sheet_XViewSplitable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sheet {  
+ 
+//============================================================================= 
+ 
 /** enables a <type>SpreadsheetView</type> to split the view.
 
     @deprecated
  */
 published interface XViewSplitable: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** returns <TRUE/> if the view is split
         into individual panes.
-
+        
         <p>Only one of
-        <member>XViewSplitable::getIsWindowSplit()</member> and
+        <member>XViewSplitable::getIsWindowSplit()</member> and 
         <member>XViewFreezable::hasFrozenPanes()</member>
         can be <TRUE/>.</p>
      */
-    boolean getIsWindowSplit();
-
-    //-------------------------------------------------------------------------
-
-    /** returns the horizontal position in pixels where
+    boolean getIsWindowSplit(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** returns the horizontal position in pixels where 
         the view is split.
      */
-    long getSplitHorizontal();
-
-    //-------------------------------------------------------------------------
-
-    /** returns the vertical position in pixels where
+    long getSplitHorizontal(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** returns the vertical position in pixels where 
         the view is split.
      */
-    long getSplitVertical();
-
-    //-------------------------------------------------------------------------
-
+    long getSplitVertical(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the column before which the view is split.
      */
-    long getSplitColumn();
-
-    //-------------------------------------------------------------------------
-
+    long getSplitColumn(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the row before which the view is split.
      */
-    long getSplitRow();
-
-    //-------------------------------------------------------------------------
-
+    long getSplitRow(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** splits the view at the specified position.
-
+        
         <p>To split only horizontally, specify <var>nPixelY</var> as 0.
         To split only vertically, specify <var>nPixelX</var> as 0.</p>
      */
-    void splitAtPosition( [in] long nPixelX,
-             [in] long nPixelY );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    void splitAtPosition( [in] long nPixelX, 
+             [in] long nPixelY ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/sheet/XVolatileResult.idl b/offapi/com/sun/star/sheet/XVolatileResult.idl
index 9378e09472f0..0926bb0ea641 100644
--- a/offapi/com/sun/star/sheet/XVolatileResult.idl
+++ b/offapi/com/sun/star/sheet/XVolatileResult.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/sheet/_NamedRange.idl b/offapi/com/sun/star/sheet/_NamedRange.idl
index 3218992d3d03..4c539f7bfba0 100644
--- a/offapi/com/sun/star/sheet/_NamedRange.idl
+++ b/offapi/com/sun/star/sheet/_NamedRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/smarttags/SmartTagAction.idl b/offapi/com/sun/star/smarttags/SmartTagAction.idl
index a07c93eb5385..9f43a6ada2c8 100644
--- a/offapi/com/sun/star/smarttags/SmartTagAction.idl
+++ b/offapi/com/sun/star/smarttags/SmartTagAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/smarttags/SmartTagRecognizer.idl b/offapi/com/sun/star/smarttags/SmartTagRecognizer.idl
index 60223c89d4ac..c1862bb0c6bf 100644
--- a/offapi/com/sun/star/smarttags/SmartTagRecognizer.idl
+++ b/offapi/com/sun/star/smarttags/SmartTagRecognizer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/smarttags/SmartTagRecognizerMode.idl b/offapi/com/sun/star/smarttags/SmartTagRecognizerMode.idl
index b72034a64cb7..3b64e2d9eb37 100644
--- a/offapi/com/sun/star/smarttags/SmartTagRecognizerMode.idl
+++ b/offapi/com/sun/star/smarttags/SmartTagRecognizerMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/smarttags/XSmartTagAction.idl b/offapi/com/sun/star/smarttags/XSmartTagAction.idl
index 271dd84b0d19..538c14b85b59 100644
--- a/offapi/com/sun/star/smarttags/XSmartTagAction.idl
+++ b/offapi/com/sun/star/smarttags/XSmartTagAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/smarttags/XSmartTagRecognizer.idl b/offapi/com/sun/star/smarttags/XSmartTagRecognizer.idl
index c84d75878a8b..4c7fd1c84a3e 100644
--- a/offapi/com/sun/star/smarttags/XSmartTagRecognizer.idl
+++ b/offapi/com/sun/star/smarttags/XSmartTagRecognizer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/style/BreakType.idl b/offapi/com/sun/star/style/BreakType.idl
index cbdc599a323b..848852456fa4 100644
--- a/offapi/com/sun/star/style/BreakType.idl
+++ b/offapi/com/sun/star/style/BreakType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,108 +24,108 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_BreakType_idl__
-#define __com_sun_star_style_BreakType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_BreakType_idl__ 
+#define __com_sun_star_style_BreakType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::style::BreakType
 /** These enumeration values are used to specify if and how a page or
     column break is applied.
  */
 published enum BreakType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::BreakType::NONE
     /** No column or page break is applied.
      */
-    NONE,
-
-    //-------------------------------------------------------------------------
-
+    NONE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::BreakType::COLUMN_BEFORE
     /** A column break is applied before the object to which it belongs.
-
-
-
+        
+        
+        
         <p>This implies that the object to which it belongs is the
         first in its column.</p>
      */
-    COLUMN_BEFORE,
-
-    //-------------------------------------------------------------------------
-
+    COLUMN_BEFORE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::BreakType::COLUMN_AFTER
     /** A column break is applied after the object to which it belongs.
-
-
-
+        
+        
+        
         <p>This implies that the object to which it belongs is the last
         in its column.</p>
      */
-    COLUMN_AFTER,
-
-    //-------------------------------------------------------------------------
-
+    COLUMN_AFTER, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::BreakType::COLUMN_BOTH
     /** A column break is applied before and after the object to which
         it belongs.
-
-
-
+        
+        
+        
         <p>This implies that this object is the only one in its column.</p>
      */
-    COLUMN_BOTH,
-
-    //-------------------------------------------------------------------------
-
+    COLUMN_BOTH, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::BreakType::PAGE_BEFORE
     /** A page break is applied before the object to which it belongs.
-
-
-
+        
+        
+        
         <p>This implies that the object to which it belongs is the
-        first on its page.      </p>
+        first on its page.  	</p>
      */
-    PAGE_BEFORE,
-
-    //-------------------------------------------------------------------------
-
+    PAGE_BEFORE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::BreakType::PAGE_AFTER
     /** A page break is applied after the object to which it belongs.
-
-
-
+        
+        
+        
         <p>This implies that the object to which it belongs is the last
         on its page.</p>
      */
-    PAGE_AFTER,
-
-    //-------------------------------------------------------------------------
-
+    PAGE_AFTER, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::BreakType::PAGE_BOTH
     /** A page break is applied before and after the object to which
         it belongs.
-
-
-
+        
+        
+        
         <p>This implies that this object is the only one on its page.</p>
      */
-    PAGE_BOTH
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    PAGE_BOTH 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/CaseMap.idl b/offapi/com/sun/star/style/CaseMap.idl
index 143a20240429..3298ad64a99d 100644
--- a/offapi/com/sun/star/style/CaseMap.idl
+++ b/offapi/com/sun/star/style/CaseMap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,64 +24,64 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_CaseMap_idl__
-#define __com_sun_star_style_CaseMap_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_CaseMap_idl__ 
+#define __com_sun_star_style_CaseMap_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::style::CaseMap
-/** These constants are used to specify a case-related mapping for
+/** These constants are used to specify a case-related mapping for 
         formatting and displaying characters.
  */
 published constants CaseMap
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::style::CaseMap::NONE
     /** The case of the characters is unchanged.
      */
-    const short NONE = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short NONE = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::style::CaseMap::UPPERCASE
     /** All characters are put in upper case.
      */
-    const short UPPERCASE = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short UPPERCASE = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::style::CaseMap::LOWERCASE
     /** All characters are put in lower case.
      */
-    const short LOWERCASE = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short LOWERCASE = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::style::CaseMap::TITLE
     /** The first character of each word is put in upper case.
      */
-    const short TITLE = 3;
-
-    //-------------------------------------------------------------------------
-
+    const short TITLE = 3; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::style::CaseMap::SMALLCAPS
     /** All characters are put in upper case, but with a smaller font height.
      */
-    const short SMALLCAPS = 4;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    const short SMALLCAPS = 4; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/CellStyle.idl b/offapi/com/sun/star/style/CellStyle.idl
index d0bb6ac2ce2c..ad57b46f9bcb 100644
--- a/offapi/com/sun/star/style/CellStyle.idl
+++ b/offapi/com/sun/star/style/CellStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/style/CharacterProperties.idl b/offapi/com/sun/star/style/CharacterProperties.idl
index 6c6bf3d99a7b..e7dcc6846938 100644
--- a/offapi/com/sun/star/style/CharacterProperties.idl
+++ b/offapi/com/sun/star/style/CharacterProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -188,7 +188,7 @@ published service CharacterProperties
 
     //-------------------------------------------------------------------------
 
-    /** If this property is <TRUE/>, the underline and strike-through
+    /**	If this property is <TRUE/>, the underline and strike-through
         properties are not applied to white spaces.
      */
     [optional, property] boolean CharWordMode;
diff --git a/offapi/com/sun/star/style/CharacterPropertiesAsian.idl b/offapi/com/sun/star/style/CharacterPropertiesAsian.idl
index 844bf2038e1b..4eeb2aa4959a 100644
--- a/offapi/com/sun/star/style/CharacterPropertiesAsian.idl
+++ b/offapi/com/sun/star/style/CharacterPropertiesAsian.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/style/CharacterPropertiesComplex.idl b/offapi/com/sun/star/style/CharacterPropertiesComplex.idl
index 12f7dab0d4a4..14a24e9ca27c 100644
--- a/offapi/com/sun/star/style/CharacterPropertiesComplex.idl
+++ b/offapi/com/sun/star/style/CharacterPropertiesComplex.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/style/CharacterStyle.idl b/offapi/com/sun/star/style/CharacterStyle.idl
index 568cb2fda40e..35701fa07609 100644
--- a/offapi/com/sun/star/style/CharacterStyle.idl
+++ b/offapi/com/sun/star/style/CharacterStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/style/DropCapFormat.idl b/offapi/com/sun/star/style/DropCapFormat.idl
index e9588f6cf736..5bc09c247d1b 100644
--- a/offapi/com/sun/star/style/DropCapFormat.idl
+++ b/offapi/com/sun/star/style/DropCapFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_DropCapFormat_idl__
-#define __com_sun_star_style_DropCapFormat_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_DropCapFormat_idl__ 
+#define __com_sun_star_style_DropCapFormat_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::style::DropCapFormat
 /** This struct describes drop caps at a paragraph object.
  */
@@ -42,29 +42,29 @@ published struct DropCapFormat
     // DocMerge from xml: field com::sun::star::style::DropCapFormat::Lines
     /** This is the number of lines used for a drop cap.
      */
-    byte Lines;
-
-    //-------------------------------------------------------------------------
-
+    byte Lines; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::style::DropCapFormat::Count
     /** This is the number of characters in the drop cap.
      */
-    byte Count;
-
-    //-------------------------------------------------------------------------
-
+    byte Count; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::style::DropCapFormat::Distance
     /** This is the distance between the drop cap in the following text.
      */
-    short Distance;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    short Distance; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/GraphicLocation.idl b/offapi/com/sun/star/style/GraphicLocation.idl
index d957c9efbdf6..9a6d3fe4badc 100644
--- a/offapi/com/sun/star/style/GraphicLocation.idl
+++ b/offapi/com/sun/star/style/GraphicLocation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,114 +24,114 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_GraphicLocation_idl__
-#define __com_sun_star_style_GraphicLocation_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_GraphicLocation_idl__ 
+#define __com_sun_star_style_GraphicLocation_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::style::GraphicLocation
 /** These enumeration values are used to specify the location of a
     graphic object within its surroundings.
  */
 published enum GraphicLocation
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::GraphicLocation::NONE
     /** This value specifies that a location is not yet assigned.
      */
-    NONE,
-
-    //-------------------------------------------------------------------------
-
+    NONE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::GraphicLocation::LEFT_TOP
     /** The graphic is located in the top left corner.
      */
-    LEFT_TOP,
-
-    //-------------------------------------------------------------------------
-
+    LEFT_TOP, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::GraphicLocation::MIDDLE_TOP
     /** The graphic is located in the middle of the top edge.
      */
-    MIDDLE_TOP,
-
-    //-------------------------------------------------------------------------
-
+    MIDDLE_TOP, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::GraphicLocation::RIGHT_TOP
     /** The graphic is located in the top right corner.
      */
-    RIGHT_TOP,
-
-    //-------------------------------------------------------------------------
-
+    RIGHT_TOP, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::GraphicLocation::LEFT_MIDDLE
     /** The graphic is located in the middle of the left edge.
      */
-    LEFT_MIDDLE,
-
-    //-------------------------------------------------------------------------
-
+    LEFT_MIDDLE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::GraphicLocation::MIDDLE_MIDDLE
     /** The graphic is located at the center of the surrounding object.
      */
-    MIDDLE_MIDDLE,
-
-    //-------------------------------------------------------------------------
-
+    MIDDLE_MIDDLE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::GraphicLocation::RIGHT_MIDDLE
     /** The graphic is located in the middle of the right edge.
      */
-    RIGHT_MIDDLE,
-
-    //-------------------------------------------------------------------------
-
+    RIGHT_MIDDLE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::GraphicLocation::LEFT_BOTTOM
     /** The graphic is located in the bottom left corner.
      */
-    LEFT_BOTTOM,
-
-    //-------------------------------------------------------------------------
-
+    LEFT_BOTTOM, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::GraphicLocation::MIDDLE_BOTTOM
     /** The graphic is located in the middle of the bottom edge.
      */
-    MIDDLE_BOTTOM,
-
-    //-------------------------------------------------------------------------
-
+    MIDDLE_BOTTOM, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::GraphicLocation::RIGHT_BOTTOM
     /** The graphic is located in the bottom right corner.
      */
-    RIGHT_BOTTOM,
-
-    //-------------------------------------------------------------------------
-
+    RIGHT_BOTTOM, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::GraphicLocation::AREA
     /** The graphic is scaled to fill the whole surrounding area.
      */
-    AREA,
-
-    //-------------------------------------------------------------------------
-
+    AREA, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::GraphicLocation::TILED
-    /** The graphic is repeatedly spread over the surrounding object
+    /** The graphic is repeatedly spread over the surrounding object 
         like tiles.
      */
-    TILED
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    TILED 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/HorizontalAlignment.idl b/offapi/com/sun/star/style/HorizontalAlignment.idl
index 8f66b5f8d541..d5a6c5434523 100644
--- a/offapi/com/sun/star/style/HorizontalAlignment.idl
+++ b/offapi/com/sun/star/style/HorizontalAlignment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_HorizontalAlignment_idl__
-#define __com_sun_star_style_HorizontalAlignment_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_HorizontalAlignment_idl__ 
+#define __com_sun_star_style_HorizontalAlignment_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::style::HorizontalAlignment
 /** values specify the horizontal alignment of
     an object within a container object.
  */
 published enum HorizontalAlignment
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HorizontalAlignment::  LEFT,
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HorizontalAlignment::	LEFT, 
+    
     // DocMerge from xml: value com::sun::star::style::HorizontalAlignment::LEFT
     /** set the horizontal alignment to the left margin from the container object
      */
-    LEFT,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HorizontalAlignment::  CENTER,
-
+    LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HorizontalAlignment::	CENTER, 
+    
     // DocMerge from xml: value com::sun::star::style::HorizontalAlignment::CENTER
     /** set the horizontal alignment to the center between the margins from the container object
      */
-    CENTER,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR HorizontalAlignment::  RIGHT
-
+    CENTER, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR HorizontalAlignment::	RIGHT 
+    
     // DocMerge from xml: value com::sun::star::style::HorizontalAlignment::RIGHT
     /** set the horizontal alignment to the right margin from the container object
      */
-    RIGHT
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    RIGHT 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/LineNumberPosition.idl b/offapi/com/sun/star/style/LineNumberPosition.idl
index da8cf4347b17..7f26475900ab 100644
--- a/offapi/com/sun/star/style/LineNumberPosition.idl
+++ b/offapi/com/sun/star/style/LineNumberPosition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,57 +24,57 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_LineNumberPosition_idl__
-#define __com_sun_star_style_LineNumberPosition_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_LineNumberPosition_idl__ 
+#define __com_sun_star_style_LineNumberPosition_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::style::LineNumberPosition
-/** These constants are used to specify the position of the numbering
+/** These constants are used to specify the position of the numbering 
         of lines.
  */
 published constants LineNumberPosition
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     // DocMerge from idl: value com::sun::star::style::LineNumberPosition::LEFT
     /** the number occurs on the left side of the pages.
      */
-    const short LEFT = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short LEFT = 0; 
+ 
+    //------------------------------------------------------------------------- 
+        
     // DocMerge from idl: value com::sun::star::style::LineNumberPosition::RIGHT
     /** the number occurs on the right side of the pages.
      */
-    const short RIGHT = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short RIGHT = 1; 
+ 
+    //------------------------------------------------------------------------- 
+        
     // DocMerge from idl: value com::sun::star::style::LineNumberPosition::INSIDE
     /** the number occurs alternating on the inner side of the pages.
      */
-    const short INSIDE = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short INSIDE = 2; 
+ 
+    //------------------------------------------------------------------------- 
+        
     // DocMerge from idl: value com::sun::star::style::LineNumberPosition::OUTSIDE
     /** the number occurs alternating on the outside side of the pages.
      */
-    const short OUTSIDE = 3;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    const short OUTSIDE = 3; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/LineSpacing.idl b/offapi/com/sun/star/style/LineSpacing.idl
index 03706c9fc354..2baed2b9a558 100644
--- a/offapi/com/sun/star/style/LineSpacing.idl
+++ b/offapi/com/sun/star/style/LineSpacing.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_LineSpacing_idl__
-#define __com_sun_star_style_LineSpacing_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_LineSpacing_idl__ 
+#define __com_sun_star_style_LineSpacing_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::style::LineSpacing
 /** This structure is used to specify the height of a text line.@see LineSpacingMode
  */
@@ -42,22 +42,22 @@ published struct LineSpacing
     // DocMerge from xml: field com::sun::star::style::LineSpacing::Mode
     /** This value specifies the way the height is specified.
      */
-    short Mode;
-
-    //-------------------------------------------------------------------------
-
+    short Mode; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::style::LineSpacing::Height
     /** This value specifies the height in regard to <var>Mode</var>.
      */
-    short Height;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    short Height; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/LineSpacingMode.idl b/offapi/com/sun/star/style/LineSpacingMode.idl
index fe90131b577d..add5058bd11a 100644
--- a/offapi/com/sun/star/style/LineSpacingMode.idl
+++ b/offapi/com/sun/star/style/LineSpacingMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,56 +24,56 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_LineSpacingMode_idl__
-#define __com_sun_star_style_LineSpacingMode_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_LineSpacingMode_idl__ 
+#define __com_sun_star_style_LineSpacingMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::style::LineSpacingMode
 /** These constants specify the interpretation of LineHeight.
  */
 published constants LineSpacingMode
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::style::LineSpacingMode::PROP
     /** This constant specifies the height value as a proportional value.
      */
-    const short PROP = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short PROP = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::style::LineSpacingMode::MINIMUM
     /** This constant specifies the height as the minimum line height.
      */
-    const short MINIMUM = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short MINIMUM = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::style::LineSpacingMode::LEADING
     /** This constant specifies the height value as the distance to the previous line.
      */
-    const short LEADING = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short LEADING = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::style::LineSpacingMode::FIX
     /** This constant specifies the height value as a fixed line height.
      */
-    const short FIX = 3;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    const short FIX = 3; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/NumberingAlignment.idl b/offapi/com/sun/star/style/NumberingAlignment.idl
index 8792b04101a5..11081a7e0823 100644
--- a/offapi/com/sun/star/style/NumberingAlignment.idl
+++ b/offapi/com/sun/star/style/NumberingAlignment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_NumberingAlignment_idl__
-#define __com_sun_star_style_NumberingAlignment_idl__
-
-#ifndef __com_sun_star_style_HorizontalAlignment_idl__
-#include <com/sun/star/style/HorizontalAlignment.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_NumberingAlignment_idl__ 
+#define __com_sun_star_style_NumberingAlignment_idl__ 
+ 
+#ifndef __com_sun_star_style_HorizontalAlignment_idl__ 
+#include <com/sun/star/style/HorizontalAlignment.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::style::NumberingAlignment
 /** specify the alignment of a numbering level.
  */
 published service NumberingAlignment
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::style::NumberingAlignment::Alignment
     /** set the alignment from the numbering. Use the com::sun::star::style::HorizontalAlignment enum to change the alignment.
      */
-    [property] com::sun::star::style::HorizontalAlignment Alignment;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::style::HorizontalAlignment Alignment; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::style::NumberingAlignment::TextMarginDistance
     /** the minimum distance between the numbering symbol and the following text.
      */
-    [property] short TextMarginDistance;
-
-    //-------------------------------------------------------------------------
-
+    [property] short TextMarginDistance; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::style::NumberingAlignment::TextNumberingDistance
     /** the distance between left margin and the numbering symbol.
      */
-    [property] short TextNumberingDistance;
-
-    //-------------------------------------------------------------------------
-
+    [property] short TextNumberingDistance; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::style::NumberingAlignment::Insertion
     /** the distance between the numbering symbol and text.
      */
-    [property] short Insertion;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [property] short Insertion; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/NumberingLevel.idl b/offapi/com/sun/star/style/NumberingLevel.idl
index a08fd8d040ba..1d180e4a11e0 100644
--- a/offapi/com/sun/star/style/NumberingLevel.idl
+++ b/offapi/com/sun/star/style/NumberingLevel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,98 +24,98 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_NumberingLevel_idl__
-#define __com_sun_star_style_NumberingLevel_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_NumberingLevel_idl__ 
+#define __com_sun_star_style_NumberingLevel_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::style::NumberingLevel
 /** These properties describe the numbering of a paragraph.
-
-
-
+    
+    
+    
     <p>NumberType determines the type of the numbering symbol.
     Depending on this setting, some of the following values will be
     ignored.</p>
  */
 published service NumberingLevel
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::style::NumberingLevel::NumberingType
     /** specifies the type of numbering.@see NumberingType
      */
-    [property] short NumberingType;
-
-    //-------------------------------------------------------------------------
-
+    [property] short NumberingType; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::style::NumberingLevel::ParentNumbering
-    /** specifies the number of higher numbering levels that
+    /** specifies the number of higher numbering levels that 
         are included in the representation of the current number.
      */
-    [property] short ParentNumbering;
-
-    //-------------------------------------------------------------------------
-
+    [property] short ParentNumbering; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::style::NumberingLevel::Prefix
     /** This prefix is inserted in front of the numbering symbol(s).
      */
-    [property] string Prefix;
-
-    //-------------------------------------------------------------------------
-
+    [property] string Prefix; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::style::NumberingLevel::Suffix
     /** This suffix is inserted after the numbering symbol(s).
      */
-    [property] string Suffix;
-
-    //-------------------------------------------------------------------------
-
+    [property] string Suffix; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::style::NumberingLevel::CharStyleName
     /** This is the name of the character style that is used for the symbol(s).
      */
-    [property] string CharStyleName;
-
-    //-------------------------------------------------------------------------
-
+    [property] string CharStyleName; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::style::NumberingLevel::BulletId
     /** The bullet symbol with this code in the assigned font is used.
      */
-    [property] short BulletId;
-
-    //-------------------------------------------------------------------------
-
+    [property] short BulletId; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::style::NumberingLevel::BulletFontName
     /** This is the name of the font that is used for the bullet.
      */
-    [property] string BulletFontName;
-
-    //-------------------------------------------------------------------------
-
+    [property] string BulletFontName; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::style::NumberingLevel::GraphicURL
     /** This is the URL of a graphic file to use as a symbol.
      */
-    [property] string GraphicURL;
-
-    //-------------------------------------------------------------------------
-
+    [property] string GraphicURL; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::style::NumberingLevel::StartWith
     /** This specifies the start value for the numbering.
      */
-    [property] short StartWith;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [property] short StartWith; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/NumberingRule.idl b/offapi/com/sun/star/style/NumberingRule.idl
index 72555e5d1913..c3a728042e86 100644
--- a/offapi/com/sun/star/style/NumberingRule.idl
+++ b/offapi/com/sun/star/style/NumberingRule.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_NumberingRule_idl__
-#define __com_sun_star_style_NumberingRule_idl__
-
-#ifndef __com_sun_star_style_NumberingAlignment_idl__
-#include <com/sun/star/style/NumberingAlignment.idl>
-#endif
-
-#ifndef __com_sun_star_style_NumberingLevel_idl__
-#include <com/sun/star/style/NumberingLevel.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_NumberingRule_idl__ 
+#define __com_sun_star_style_NumberingRule_idl__ 
+ 
+#ifndef __com_sun_star_style_NumberingAlignment_idl__ 
+#include <com/sun/star/style/NumberingAlignment.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_style_NumberingLevel_idl__ 
+#include <com/sun/star/style/NumberingLevel.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::style::NumberingRule
 /** specifies a rule to format numberings.
-
+    
     <p>It is normally represented by a sequence of
     <type scope="com::sun::star::beans">PropertyValue</type>s.</p>
  */
 published service NumberingRule
-{
+{ 
     // DocMerge: empty anyway
-    service com::sun::star::style::NumberingAlignment;
-
+    service com::sun::star::style::NumberingAlignment; 
+    
     // DocMerge: empty anyway
-    service com::sun::star::style::NumberingLevel;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    service com::sun::star::style::NumberingLevel; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/NumberingType.idl b/offapi/com/sun/star/style/NumberingType.idl
index 25094b1ed677..8a408f667f59 100644
--- a/offapi/com/sun/star/style/NumberingType.idl
+++ b/offapi/com/sun/star/style/NumberingType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -236,14 +236,14 @@ published constants NumberingType
         @since OOo 2.0.1
      */
     const short CHARS_NEPALI = 34;
-
+    
     //-------------------------------------------------------------------------
     /** Numbering in Khmer alphabet letters
 
         @since OOo 2.0.1
      */
     const short CHARS_KHMER = 35;
-
+    
     //-------------------------------------------------------------------------
     /** Numbering in Lao alphabet letters
 
@@ -256,7 +256,7 @@ published constants NumberingType
         @since OOo 2.0.3
       */
     const short CHARS_TIBETAN = 37;
-
+ 
     //-------------------------------------------------------------------------
     /** Numbering in Cyrillic alphabet upper case letters as
         "&#1040;, &#1041;,  &#1042;, &#1043;, ..., &#1070;, &#1071;, &#1040;&#1074;, &#1040;&#1072;, &#1040;&#1074;, ... &#1040;&#1072;&#1072;, &#1040;&#1072;&#1073;".
@@ -406,7 +406,7 @@ published constants NumberingType
 
     //-------------------------------------------------------------------------
     /** Numbering in Myanmar alphabet letters
-
+    
         @since OOo 3.1
      */
     const short CHARS_MYANMAR = 47;
diff --git a/offapi/com/sun/star/style/PageProperties.idl b/offapi/com/sun/star/style/PageProperties.idl
index 2ace32f8cc73..e5115a3fa0ac 100644
--- a/offapi/com/sun/star/style/PageProperties.idl
+++ b/offapi/com/sun/star/style/PageProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -99,7 +99,7 @@ published service PageProperties
 [property] com::sun::star::style::GraphicLocation BackGraphicLocation;
 //-----------------------------------------------------------------------------
 /** determins if the background color is transparent.
-
+ 
     <p>If this property is set to <TRUE/>,
     <member>PageStyle::BackColor</member> will not be used.</p>
  */
diff --git a/offapi/com/sun/star/style/PageStyle.idl b/offapi/com/sun/star/style/PageStyle.idl
index 9810198a3257..2510d81c62f7 100644
--- a/offapi/com/sun/star/style/PageStyle.idl
+++ b/offapi/com/sun/star/style/PageStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/style/PageStyleLayout.idl b/offapi/com/sun/star/style/PageStyleLayout.idl
index 6c91d53c3215..6165b3d8e659 100644
--- a/offapi/com/sun/star/style/PageStyleLayout.idl
+++ b/offapi/com/sun/star/style/PageStyleLayout.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/style/ParagraphAdjust.idl b/offapi/com/sun/star/style/ParagraphAdjust.idl
index fe77e6dd42d8..2dc8b2b62eaa 100644
--- a/offapi/com/sun/star/style/ParagraphAdjust.idl
+++ b/offapi/com/sun/star/style/ParagraphAdjust.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,63 +24,63 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_ParagraphAdjust_idl__
-#define __com_sun_star_style_ParagraphAdjust_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_ParagraphAdjust_idl__ 
+#define __com_sun_star_style_ParagraphAdjust_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::style::ParagraphAdjust
 /** These enumeration values describe the formatting of a text paragraph.
  */
 published enum ParagraphAdjust
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::ParagraphAdjust::LEFT
     /** adjusted to the left border
      */
-    LEFT,
-
-    //-------------------------------------------------------------------------
-
+    LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::ParagraphAdjust::RIGHT
     /** adjusted to the right border
      */
-    RIGHT,
-
-    //-------------------------------------------------------------------------
-
+    RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::ParagraphAdjust::BLOCK
     /** adjusted to both borders / stretched, except for last line
      */
-    BLOCK,
-
-    //-------------------------------------------------------------------------
-
+    BLOCK, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::ParagraphAdjust::CENTER
     /** adjusted to the center
      */
-    CENTER,
-
-    //-------------------------------------------------------------------------
-
+    CENTER, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::ParagraphAdjust::STRETCH
     /** adjusted to both borders / stretched, including last line
      */
-    STRETCH
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    STRETCH 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/ParagraphProperties.idl b/offapi/com/sun/star/style/ParagraphProperties.idl
index 65e24f2fa895..3a063305541a 100644
--- a/offapi/com/sun/star/style/ParagraphProperties.idl
+++ b/offapi/com/sun/star/style/ParagraphProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -272,7 +272,7 @@ published service ParagraphProperties
 
     //-------------------------------------------------------------------------
 
-    /** specifies the numbering level of the    paragraph.
+    /** specifies the numbering level of the	paragraph.
      */
     [optional, property] short NumberingLevel;
 
diff --git a/offapi/com/sun/star/style/ParagraphPropertiesAsian.idl b/offapi/com/sun/star/style/ParagraphPropertiesAsian.idl
index 48e513acd65b..7d92799c61cf 100644
--- a/offapi/com/sun/star/style/ParagraphPropertiesAsian.idl
+++ b/offapi/com/sun/star/style/ParagraphPropertiesAsian.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/style/ParagraphPropertiesComplex.idl b/offapi/com/sun/star/style/ParagraphPropertiesComplex.idl
index 987344c4528d..71b3e2885fad 100644
--- a/offapi/com/sun/star/style/ParagraphPropertiesComplex.idl
+++ b/offapi/com/sun/star/style/ParagraphPropertiesComplex.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/style/ParagraphStyle.idl b/offapi/com/sun/star/style/ParagraphStyle.idl
index 66836a9454ef..814ac3ef9a74 100644
--- a/offapi/com/sun/star/style/ParagraphStyle.idl
+++ b/offapi/com/sun/star/style/ParagraphStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -60,7 +60,7 @@ published service ParagraphStyle
         @see    <type scope="com::sun::star::xml">ParaUserDefinedAttributesSupplier</type>
      */
     [optional] service com::sun::star::xml::ParaUserDefinedAttributesSupplier;
-
+    
     //-------------------------------------------------------------------------
     /// specifies the style properties.
     service ParagraphProperties;
@@ -144,8 +144,8 @@ published service ParagraphStyle
 
     /** returns the name of the page style in use
 
-        <P>For setting the page style you have to use the
-        <member scope="com::sun::star::text">PageDescName</member>
+        <P>For setting the page style you have to use the 
+        <member scope="com::sun::star::text">PageDescName</member> 
         properties.
         </P>
     */
diff --git a/offapi/com/sun/star/style/ParagraphStyleCategory.idl b/offapi/com/sun/star/style/ParagraphStyleCategory.idl
index 7dde09ffd0cb..d7e2793e0d24 100644
--- a/offapi/com/sun/star/style/ParagraphStyleCategory.idl
+++ b/offapi/com/sun/star/style/ParagraphStyleCategory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,63 +24,63 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifndef __com_sun_star_style_ParagraphStyleCategory_idl__
-#define __com_sun_star_style_ParagraphStyleCategory_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-//=============================================================================
-
+ 
+#ifndef __com_sun_star_style_ParagraphStyleCategory_idl__ 
+#define __com_sun_star_style_ParagraphStyleCategory_idl__ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style { 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::style::ParagraphStyleCategory
 /** These constants are used to specify the category of paragraph styles in text documents.
  */
 published constants ParagraphStyleCategory
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::style::ParagraphStyleCategory::TEXT
     /** is applied to styles that are used for common text.
      */
-    const short TEXT = 0;
-    //-------------------------------------------------------------------------
-
+    const short TEXT = 0; 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::style::ParagraphStyleCategory::CHAPTER
     /** is applied to styles that are used as headings.
      */
-    const short CHAPTER = 1;
-    //-------------------------------------------------------------------------
-
+    const short CHAPTER = 1; 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::style::ParagraphStyleCategory::LIST
     /** is applied to styles that used in numberings and lists.
      */
-    const short LIST = 2;
-    //-------------------------------------------------------------------------
-
+    const short LIST = 2; 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::style::ParagraphStyleCategory::INDEX
     /** is applied to styles that are used in indexes.
      */
-    const short INDEX = 3;
-    //-------------------------------------------------------------------------
-
+    const short INDEX = 3; 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::style::ParagraphStyleCategory::EXTRA
     /** is applied to styles that are used in special regions like headers, footers, and footnote text.
      */
-    const short EXTRA = 4;
-    //-------------------------------------------------------------------------
-
+    const short EXTRA = 4; 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::style::ParagraphStyleCategory::HTML
     /** is applied to styles that are used to support HTML.
      */
-    const short HTML = 5;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
-
-
-
+    const short HTML = 5; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
+ 
+ 
+ 
diff --git a/offapi/com/sun/star/style/Style.idl b/offapi/com/sun/star/style/Style.idl
index e19a7f82c005..29747a990e96 100644
--- a/offapi/com/sun/star/style/Style.idl
+++ b/offapi/com/sun/star/style/Style.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,7 +64,7 @@ published service Style
         @see    <type scope="com::sun::star::xml">UserDefinedAttributesSupplier</type>
      */
     [optional] service com::sun::star::xml::UserDefinedAttributesSupplier;
-
+    
     //-------------------------------------------------------------------------
 
     interface com::sun::star::style::XStyle;
@@ -78,7 +78,7 @@ published service Style
     //-------------------------------------------------------------------------
 
     [optional] interface com::sun::star::beans::XMultiPropertyStates;
-
+    
     //-------------------------------------------------------------------------
 
     /** determines if a style is physically created.
@@ -116,14 +116,14 @@ published service Style
     //-------------------------------------------------------------------------
 
     /** defines the context and styles for conditional paragraphs.
-
+        
         <p>This property is only available if the style is a conditional
         paragraph style.</p>
 
-        <p>The sequence consists of pairs where the name part of the pair
+        <p>The sequence consists of pairs where the name part of the pair 
         defines the context where it should be applied and the value part
         is a string naming the style to be used in that context.</p>
-
+        
         <p>Assigning an empty string to the style name will disable
         the conditional style for that context.</p>
 
diff --git a/offapi/com/sun/star/style/StyleFamilies.idl b/offapi/com/sun/star/style/StyleFamilies.idl
index 5dd1afad2d39..708fe6c0b1f7 100644
--- a/offapi/com/sun/star/style/StyleFamilies.idl
+++ b/offapi/com/sun/star/style/StyleFamilies.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_StyleFamilies_idl__
-#define __com_sun_star_style_StyleFamilies_idl__
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_StyleFamilies_idl__ 
+#define __com_sun_star_style_StyleFamilies_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::style::StyleFamilies
 /** This service contains the collection of style families within the
     container document.
-
+        
     <p>Examples of style families may be:
     <dl>
     <dt>CharacterStyles
     </dt>
-    <dd>the container of style sheets for sequences of characters
+    <dd>the container of style sheets for sequences of characters 
     within a text
-
+    
     </dd>
     <dt>ParagraphStyles
     </dt>
     <dd>the container of style sheets for text paragraphs
-
+    
     </dd>
     <dt>FrameStyles
     </dt>
     <dd>the container of style sheets for text frames
-
+    
     </dd>
     <dt>PageStyles
     </dt>
     <dd>the container of style sheets for pages
-
+    
     </dd>
     <dt>NumberingStyles
     </dt>
     <dd>the container for style sheets for numbering
-
+    
     </dd>
     <dt>CellStyles
     </dt>
     <dd>the container for style sheets for cells
-
+    
     </dd>
     <dt>ShapeStyles
     </dt>
@@ -87,33 +87,33 @@
     </p>
  */
 published service StyleFamilies
-{
-
-
+{ 
+ 
+     
     // DocMerge from xml: service com::sun::star::style::StyleFamilies: interface com::sun::star::container::XNameAccess
-    /** This mandatory interface makes it possible to get access to the
-                style families by their names.
-
+    /** This mandatory interface makes it possible to get access to the  
+                style families by their names. 
+                 
                 <p>The elements within this collection are <type>StyleFamily</type> instances.
      */
-    interface com::sun::star::container::XNameAccess;
-
-
+    interface com::sun::star::container::XNameAccess; 
+ 
+     
     // DocMerge from xml: service com::sun::star::style::StyleFamilies: interface com::sun::star::container::XIndexAccess
-    /** This optional interface makes it possible to get access to the
-                style families by index.
-
+    /** This optional interface makes it possible to get access to the  
+                style families by index. 
+                 
                 <p>The elements within this collection are <type>StyleFamily</type> instances.
      */
-    [optional] interface com::sun::star::container::XIndexAccess;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [optional] interface com::sun::star::container::XIndexAccess; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/StyleFamily.idl b/offapi/com/sun/star/style/StyleFamily.idl
index ae4e1be0cad7..17c8d1a7b10f 100644
--- a/offapi/com/sun/star/style/StyleFamily.idl
+++ b/offapi/com/sun/star/style/StyleFamily.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,66 +24,66 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_StyleFamily_idl__
-#define __com_sun_star_style_StyleFamily_idl__
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_StyleFamily_idl__ 
+#define __com_sun_star_style_StyleFamily_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#include <com/sun/star/container/XNameContainer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::style::StyleFamily
 /** This service is a container of style sheets of the same style family.@see StyleFamilies
  */
 published service StyleFamily
-{
-
-
+{ 
+ 
+     
     // DocMerge from xml: service com::sun::star::style::StyleFamily: interface com::sun::star::container::XNameAccess
-    /** This mandatory interface makes it possible to access
-                the style sheets within this family by name.
-
-                <p>The elements in this container support the service
+    /** This mandatory interface makes it possible to access 
+                the style sheets within this family by name. 
+                 
+                <p>The elements in this container support the service 
                 <type>Style</type> and are accessed via an <type>XStyle</type>.
      */
-    interface com::sun::star::container::XNameAccess;
-
-
+    interface com::sun::star::container::XNameAccess; 
+ 
+     
     // DocMerge from xml: service com::sun::star::style::StyleFamily: interface com::sun::star::container::XNameContainer
-    /** This optional interface makes it possible to add and
-                remove the style sheets within this family by name.
-
-                <p>The elements in this container support the service
+    /** This optional interface makes it possible to add and 
+                remove the style sheets within this family by name. 
+                 
+                <p>The elements in this container support the service 
                 <type>Style</type> and are accessed via an <type>XStyle</type>.
      */
-    [optional] interface com::sun::star::container::XNameContainer;
-
+    [optional] interface com::sun::star::container::XNameContainer; 
+     
     // DocMerge from xml: service com::sun::star::style::StyleFamily: interface com::sun::star::container::XIndexAccess
-    /** This optional interface makes it possible to access the style sheets
-                within this family by index.
-
-                <p>The elements in this container support the service
+    /** This optional interface makes it possible to access the style sheets 
+                within this family by index. 
+                 
+                <p>The elements in this container support the service 
                 <type>Style</type> and are accessed via an <type>XStyle</type>.
      */
-    [optional] interface com::sun::star::container::XIndexAccess;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [optional] interface com::sun::star::container::XIndexAccess; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/TabAlign.idl b/offapi/com/sun/star/style/TabAlign.idl
index 74a9b11af128..0696a17db855 100644
--- a/offapi/com/sun/star/style/TabAlign.idl
+++ b/offapi/com/sun/star/style/TabAlign.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,68 +24,68 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_TabAlign_idl__
-#define __com_sun_star_style_TabAlign_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_TabAlign_idl__ 
+#define __com_sun_star_style_TabAlign_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::style::TabAlign
 /** These enumeration values are used to specify the alignment of
     the text range delimited by a tabulator.
  */
 published enum TabAlign
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::TabAlign::LEFT
     /** The text range is left-aligned between the previous tabulator
         (or the left border, if none) and this tabulator.
      */
-    LEFT,
-
-    //-------------------------------------------------------------------------
-
+    LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::TabAlign::CENTER
     /** The text range is centered between the previous tabulator
         (or the left border, if none) and this tabulator.
      */
-    CENTER,
-
-    //-------------------------------------------------------------------------
-
+    CENTER, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::TabAlign::RIGHT
     /** The text range is right-aligned between the previous tabulator
         (or the left border, if none) and this tabulator.
      */
-    RIGHT,
-
-    //-------------------------------------------------------------------------
-
+    RIGHT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::TabAlign::DECIMAL
     /** The decimal point of the text range to the left of this
         tabulator is aligned to the position of this tabulator.
      */
-    DECIMAL,
-
-    //-------------------------------------------------------------------------
-
+    DECIMAL, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::style::TabAlign::DEFAULT
     /** The default alignment for tabulators is applied.
      */
-    DEFAULT
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    DEFAULT 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/TabStop.idl b/offapi/com/sun/star/style/TabStop.idl
index 37a8eb47e2d7..5300dcca2079 100644
--- a/offapi/com/sun/star/style/TabStop.idl
+++ b/offapi/com/sun/star/style/TabStop.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_TabStop_idl__
-#define __com_sun_star_style_TabStop_idl__
-
-#ifndef __com_sun_star_style_TabAlign_idl__
-#include <com/sun/star/style/TabAlign.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_TabStop_idl__ 
+#define __com_sun_star_style_TabStop_idl__ 
+ 
+#ifndef __com_sun_star_style_TabAlign_idl__ 
+#include <com/sun/star/style/TabAlign.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::style::TabStop
 /** This structure is used to specify a single tabulator stop.
  */
@@ -47,38 +47,38 @@ published struct TabStop
     /** This field specifies the position of the tabulator in relation
         to the left border.
      */
-    long Position;
-
-    //-------------------------------------------------------------------------
-
+    long Position; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::style::TabStop::Alignment
-    /** This field specifies the alignment of the text range before the
+    /** This field specifies the alignment of the text range before the 
         tabulator.
      */
-    com::sun::star::style::TabAlign Alignment;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::style::TabAlign Alignment; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::style::TabStop::DecimalChar
     /** This field specifies which delimiter is used for the decimal.
      */
-    char DecimalChar;
-
-    //-------------------------------------------------------------------------
-
+    char DecimalChar; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::style::TabStop::FillChar
     /** This field specifies the character that is used to fill up the
         space between the text in the text range and the tabulators.
      */
-    char FillChar;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    char FillChar; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/VerticalAlignment.idl b/offapi/com/sun/star/style/VerticalAlignment.idl
index 940c16a6b681..30dc2afe905a 100644
--- a/offapi/com/sun/star/style/VerticalAlignment.idl
+++ b/offapi/com/sun/star/style/VerticalAlignment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_VerticalAlignment_idl__
-#define __com_sun_star_style_VerticalAlignment_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_VerticalAlignment_idl__ 
+#define __com_sun_star_style_VerticalAlignment_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::style::VerticalAlignment
 /** specify the horizontal alignment of
     an object within a container object.
  */
 published enum VerticalAlignment
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTING FOR VerticalAlignment::   TOP,
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTING FOR VerticalAlignment::	TOP, 
+    
     // DocMerge from xml: value com::sun::star::style::VerticalAlignment::TOP
     /** set the vertical alignment to the center between the top and bottom margins from the container object.
      */
-    TOP,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTING FOR VerticalAlignment::   MIDDLE,
-
+    TOP, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTING FOR VerticalAlignment::	MIDDLE, 
+    
     // DocMerge from xml: value com::sun::star::style::VerticalAlignment::MIDDLE
     /** set the vertical alignment to the top margin from the container object.
      */
-    MIDDLE,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTING FOR VerticalAlignment::   BOTTOM
-
+    MIDDLE, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTING FOR VerticalAlignment::	BOTTOM 
+    
     // DocMerge from xml: value com::sun::star::style::VerticalAlignment::BOTTOM
     /** set the vertical alignment to the bottom margin from the container object.
      */
-    BOTTOM
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    BOTTOM 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/XAutoStyle.idl b/offapi/com/sun/star/style/XAutoStyle.idl
index 41d40ce80af7..400d0685e9be 100644
--- a/offapi/com/sun/star/style/XAutoStyle.idl
+++ b/offapi/com/sun/star/style/XAutoStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/style/XAutoStyleFamily.idl b/offapi/com/sun/star/style/XAutoStyleFamily.idl
index 9a448b6392a9..2ec3158b9abe 100644
--- a/offapi/com/sun/star/style/XAutoStyleFamily.idl
+++ b/offapi/com/sun/star/style/XAutoStyleFamily.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_XAutoStyleFamily_idl__
+#ifndef __com_sun_star_style_XAutoStyleFamily_idl__ 
 #define __com_sun_star_style_XAutoStyleFamily_idl__
 #ifndef __com_sun_star_style_XAutoStyle_idl__
 #include <com/sun/star/style/XAutoStyle.idl>
 #endif
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
-#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
+#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
+#include <com/sun/star/container/XEnumerationAccess.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
 #endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::style::StyleFamilies
 /** This service contains the collection of automatic style families within the
     container document.
-
+        
  */
-interface XAutoStyleFamily
-{
+interface XAutoStyleFamily            
+{ 
     interface com::sun::star::container::XEnumerationAccess;
     /** */
     com::sun::star::style::XAutoStyle insertStyle( [in] com::sun::star::beans::PropertyValues Values);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/XAutoStyles.idl b/offapi/com/sun/star/style/XAutoStyles.idl
index 4293ab6cab65..b63d0b6d5a0a 100644
--- a/offapi/com/sun/star/style/XAutoStyles.idl
+++ b/offapi/com/sun/star/style/XAutoStyles.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_XAutoStyles_idl__
-#define __com_sun_star_style_XAutoStyles_idl__
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_XAutoStyles_idl__ 
+#define __com_sun_star_style_XAutoStyles_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 
 /** This service contains the collection of automatic style families within the
     container document.
-
+        
  */
 interface XAutoStyles
-
-{
+            
+{ 
     interface com::sun::star::container::XNameAccess;
     interface com::sun::star::container::XIndexAccess;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/XAutoStylesSupplier.idl b/offapi/com/sun/star/style/XAutoStylesSupplier.idl
index 2c4a3dc4f724..141a2785ea89 100644
--- a/offapi/com/sun/star/style/XAutoStylesSupplier.idl
+++ b/offapi/com/sun/star/style/XAutoStylesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/style/XDefaultsSupplier.idl b/offapi/com/sun/star/style/XDefaultsSupplier.idl
index 2ece9ece2a31..25b767ce0eb6 100644
--- a/offapi/com/sun/star/style/XDefaultsSupplier.idl
+++ b/offapi/com/sun/star/style/XDefaultsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_XDefaultsSupplier_idl__
-#define __com_sun_star_style_XDefaultsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_XDefaultsSupplier_idl__ 
+#define __com_sun_star_style_XDefaultsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 /** This interface provides access to an XPropertySet of defaults. This can
     either be the parent of an XPropertySet or the global property defaults
     for a document.
  */
 published interface XDefaultsSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //-------------------------------------------------------------------------  
     /** This method returns an XPropertySet of defaults.
      */
-    com::sun::star::beans::XPropertySet getDefaults();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::beans::XPropertySet getDefaults(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/style/XStyle.idl b/offapi/com/sun/star/style/XStyle.idl
index 0117bf5167a5..bf5d5d568074 100644
--- a/offapi/com/sun/star/style/XStyle.idl
+++ b/offapi/com/sun/star/style/XStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,62 +24,62 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_XStyle_idl__
-#define __com_sun_star_style_XStyle_idl__
-
-#ifndef __com_sun_star_container_XNamed_idl__
-#include <com/sun/star/container/XNamed.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_XStyle_idl__ 
+#define __com_sun_star_style_XStyle_idl__ 
+ 
+#ifndef __com_sun_star_container_XNamed_idl__ 
+#include <com/sun/star/container/XNamed.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 /** specifies a template for a style (aka style sheet).
  */
 published interface XStyle: com::sun::star::container::XNamed
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** identifies a style as defined by the user.
      */
-    boolean isUserDefined();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    boolean isUserDefined(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
                     <TRUE/> if this type is used in the document.
      */
-    boolean isInUse();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    boolean isInUse(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
                     the name of the parent style, probably empty.
      */
-    string getParentStyle();
-
-    //-------------------------------------------------------------------------
-
+    string getParentStyle(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the name of the parent style.
      */
-    void setParentStyle( [in] string aParentStyle )
-            raises( com::sun::star::container::NoSuchElementException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void setParentStyle( [in] string aParentStyle ) 
+            raises( com::sun::star::container::NoSuchElementException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/XStyleCondition.idl b/offapi/com/sun/star/style/XStyleCondition.idl
index e74f3f01a2df..c159de9feabb 100644
--- a/offapi/com/sun/star/style/XStyleCondition.idl
+++ b/offapi/com/sun/star/style/XStyleCondition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_XStyleCondition_idl__
-#define __com_sun_star_style_XStyleCondition_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_XStyleCondition_idl__ 
+#define __com_sun_star_style_XStyleCondition_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 /** This interface makes it possible to access conditional styles of the object.
 
     @deprecated This interface was never implemented or referenced.
  */
 published interface XStyleCondition: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
                     the style condition for the specified type.
      */
-    string getStyleConditionByType( [in] short TextType );
-
-    //-------------------------------------------------------------------------
-
+    string getStyleConditionByType( [in] short TextType ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the style condition for the specified type.
      */
-    [oneway] void setStyleConditionByType( [in] string StyleName,
-             [in] short TextType );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void setStyleConditionByType( [in] string StyleName, 
+             [in] short TextType ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl b/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl
index 8d26373ce6a6..0e6fb1d756f8 100644
--- a/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl
+++ b/offapi/com/sun/star/style/XStyleFamiliesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__
-#define __com_sun_star_style_XStyleFamiliesSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module style {
-
-//=============================================================================
-
+#ifndef __com_sun_star_style_XStyleFamiliesSupplier_idl__ 
+#define __com_sun_star_style_XStyleFamiliesSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module style {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::style::XStyleFamiliesSupplier
-/** This interface provides access to the style families within the
+/** This interface provides access to the style families within the 
     container document.
  */
 published interface XStyleFamiliesSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::style::XStyleFamiliesSupplier::getStyleFamilies
     /** This method returns the collection of style families available
         in the container document.@see StyleFamilies
      */
-    com::sun::star::container::XNameAccess getStyleFamilies();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::container::XNameAccess getStyleFamilies(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/style/XStyleLoader.idl b/offapi/com/sun/star/style/XStyleLoader.idl
index 5fbc1d6588a4..cc668028fafb 100644
--- a/offapi/com/sun/star/style/XStyleLoader.idl
+++ b/offapi/com/sun/star/style/XStyleLoader.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/svg/XSVGPrinter.idl b/offapi/com/sun/star/svg/XSVGPrinter.idl
index 059da696ac83..e21196873913 100644
--- a/offapi/com/sun/star/svg/XSVGPrinter.idl
+++ b/offapi/com/sun/star/svg/XSVGPrinter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifndef __com_sun_star_sync_XSVGPrinter_idl__
-#define __com_sun_star_sync_XSVGPrinter_idl__
-
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
-#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module svg {
-
-/** @deprecated
+ 
+#ifndef __com_sun_star_sync_XSVGPrinter_idl__ 
+#define __com_sun_star_sync_XSVGPrinter_idl__ 
+ 
+#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__ 
+#include <com/sun/star/xml/sax/XDocumentHandler.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module svg {  
+ 
+/**	@deprecated
 */
 published interface XSVGPrinter: com::sun::star::uno::XInterface
-{
+{ 
     // DocMerge: empty anyway
-    boolean         startJob( [in] com::sun::star::xml::sax::XDocumentHandler aHandler,
-                              [in] sequence< byte > aJobSetup,
-                              [in] string aJobName,
-                              [in] unsigned long nCopies,
-                              [in] boolean  bCollate );
-
+    boolean	 		startJob( [in] com::sun::star::xml::sax::XDocumentHandler aHandler, 
+                              [in] sequence< byte > aJobSetup, 
+                              [in] string aJobName, 
+                              [in] unsigned long nCopies,  
+                              [in] boolean  bCollate ); 
+     
     // DocMerge: empty anyway
-    void            printPage( [in] sequence< byte > aPrintPage );
-
+    void			printPage( [in] sequence< byte > aPrintPage ); 
+ 
     // DocMerge: empty anyway
-    void            endJob();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void			endJob(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/svg/XSVGWriter.idl b/offapi/com/sun/star/svg/XSVGWriter.idl
index d4ff549a8c53..d856c3a76c5e 100644
--- a/offapi/com/sun/star/svg/XSVGWriter.idl
+++ b/offapi/com/sun/star/svg/XSVGWriter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifndef __com_sun_star_sync_XSVGWriter_idl__
-#define __com_sun_star_sync_XSVGWriter_idl__
-
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
-#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module svg {
-
-/** @deprecated
+ 
+#ifndef __com_sun_star_sync_XSVGWriter_idl__ 
+#define __com_sun_star_sync_XSVGWriter_idl__ 
+ 
+#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__ 
+#include <com/sun/star/xml/sax/XDocumentHandler.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module svg {  
+ 
+/**	@deprecated
 */
 published interface XSVGWriter: com::sun::star::uno::XInterface
-{
+{ 
     // DocMerge: empty anyway
-    void        write(  [in] com::sun::star::xml::sax::XDocumentHandler aHandler,
-                        [in] sequence< byte > aMtf );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void		write(  [in] com::sun::star::xml::sax::XDocumentHandler aHandler, 
+                        [in] sequence< byte > aMtf ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/sync/SyncAction.idl b/offapi/com/sun/star/sync/SyncAction.idl
index aa7d689409d7..6131f87cafe1 100644
--- a/offapi/com/sun/star/sync/SyncAction.idl
+++ b/offapi/com/sun/star/sync/SyncAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifndef __com_sun_star_sync_SyncAction_idl__
-#define __com_sun_star_sync_SyncAction_idl__
-
-//=============================================================================
-
-module com {  module sun {  module star {  module sync {
-
-//=============================================================================
-
+ 
+#ifndef __com_sun_star_sync_SyncAction_idl__ 
+#define __com_sun_star_sync_SyncAction_idl__ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module sync {  
+ 
+//============================================================================= 
+ 
 /** contains a synchronization element
 
     @deprecated
  */
 published constants SyncAction
-{
-    const unsigned long NONE                    = 0x00000000;
-
-    const unsigned long COPY_TO_SERVER          = 0x00000001;
-
-    const unsigned long COPY_TO_CLIENT          = 0x00000002;
-
-    const unsigned long REMOVE_FROM_CLIENT      = 0x00000100;
-
-    const unsigned long REMOVE_FROM_SERVER      = 0x00000200;
-
-    const unsigned long CONFLICT_UID            = 0x01000000;
-
-    const unsigned long CONFLICT_AMBIGUITY      = 0x02000000;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    const unsigned long NONE					= 0x00000000; 
+     
+    const unsigned long COPY_TO_SERVER			= 0x00000001; 
+    
+    const unsigned long COPY_TO_CLIENT			= 0x00000002; 
+     
+    const unsigned long REMOVE_FROM_CLIENT		= 0x00000100; 
+    
+    const unsigned long REMOVE_FROM_SERVER		= 0x00000200; 
+ 
+    const unsigned long CONFLICT_UID			= 0x01000000; 
+    
+    const unsigned long CONFLICT_AMBIGUITY		= 0x02000000; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/sync/SyncCollector.idl b/offapi/com/sun/star/sync/SyncCollector.idl
index b174c87052ed..5a1e4b804a9c 100644
--- a/offapi/com/sun/star/sync/SyncCollector.idl
+++ b/offapi/com/sun/star/sync/SyncCollector.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifndef __com_sun_star_sync_SyncCollector_idl__
-#define __com_sun_star_sync_SyncCollector_idl__
-
-#ifndef __com_sun_star_sync_XSyncCollector_idl__
-#include <com/sun/star/sync/XSyncCollector.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module sync {
-
+ 
+#ifndef __com_sun_star_sync_SyncCollector_idl__ 
+#define __com_sun_star_sync_SyncCollector_idl__ 
+ 
+#ifndef __com_sun_star_sync_XSyncCollector_idl__ 
+#include <com/sun/star/sync/XSyncCollector.idl> 
+#endif 
+
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module sync { 
+ 
 /// @deprecated
 published service SyncCollector
-{
-    interface com::sun::star::sync::XSyncCollector;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    interface com::sun::star::sync::XSyncCollector; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/sync/SyncElement.idl b/offapi/com/sun/star/sync/SyncElement.idl
index c44136ad3c73..aff6b2b26777 100644
--- a/offapi/com/sun/star/sync/SyncElement.idl
+++ b/offapi/com/sun/star/sync/SyncElement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifndef __com_sun_star_sync_SyncElement_idl__
-#define __com_sun_star_sync_SyncElement_idl__
-
-//=============================================================================
-
-module com {  module sun {  module star {  module sync {
-
-//=============================================================================
-
+ 
+#ifndef __com_sun_star_sync_SyncElement_idl__ 
+#define __com_sun_star_sync_SyncElement_idl__ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module sync {  
+ 
+//============================================================================= 
+ 
 /** contains a synchronization element
 
     @deprecated
@@ -42,31 +42,31 @@ published struct SyncElement
 {
     /** contains the ContentIdentifier of this synchronization element
      */
-    string ContentIdentifier;
-
-    //-------------------------------------------------------------------------
-
-    unsigned long Type;
-
-    //-------------------------------------------------------------------------
-
-    unsigned long UID;
-
-    //-------------------------------------------------------------------------
-
-    unsigned long Generation;
-
-    //-------------------------------------------------------------------------
-
-    unsigned long Event;
-
-    //-------------------------------------------------------------------------
-
-    unsigned long Action;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string ContentIdentifier; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    unsigned long Type; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    unsigned long UID; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    unsigned long Generation; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    unsigned long Event; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    unsigned long Action; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/sync/SyncEvent.idl b/offapi/com/sun/star/sync/SyncEvent.idl
index 4fc64b0d7b67..63eb524cefcd 100644
--- a/offapi/com/sun/star/sync/SyncEvent.idl
+++ b/offapi/com/sun/star/sync/SyncEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifndef __com_sun_star_sync_SyncEvent_idl__
-#define __com_sun_star_sync_SyncEvent_idl__
-
-//=============================================================================
-
-module com {  module sun {  module star {  module sync {
-
-//=============================================================================
-
+ 
+#ifndef __com_sun_star_sync_SyncEvent_idl__ 
+#define __com_sun_star_sync_SyncEvent_idl__ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module sync {  
+ 
+//============================================================================= 
+ 
 /** contains a synchronization element
 
     @deprecated
  */
 published constants SyncEvent
-{
-    const unsigned long NONE = 0;
-
-    const unsigned long CREATED = 1;
-
-    const unsigned long DELETED = 2;
-
-    const unsigned long CHANGED = 3;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    const unsigned long NONE = 0; 
+    
+    const unsigned long CREATED = 1; 
+    
+    const unsigned long DELETED = 2; 
+    
+    const unsigned long CHANGED = 3; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/sync/SyncInfo.idl b/offapi/com/sun/star/sync/SyncInfo.idl
index b5400ee3a446..58d24fbf33b0 100644
--- a/offapi/com/sun/star/sync/SyncInfo.idl
+++ b/offapi/com/sun/star/sync/SyncInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifndef __com_sun_star_sync_SyncInfo_idl__
-#define __com_sun_star_sync_SyncInfo_idl__
-
-#ifndef __com_sun_star_sync_SyncScheme_idl__
-#include <com/sun/star/sync/SyncScheme.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module sync {
-
-published typedef sequence< string > FilterData;
-
-//=============================================================================
-
+ 
+#ifndef __com_sun_star_sync_SyncInfo_idl__ 
+#define __com_sun_star_sync_SyncInfo_idl__ 
+ 
+#ifndef __com_sun_star_sync_SyncScheme_idl__ 
+#include <com/sun/star/sync/SyncScheme.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module sync {  
+ 
+published typedef sequence< string > FilterData; 
+ 
+//============================================================================= 
+ 
 /// @deprecated
 published struct SyncInfo
 {
-    SyncScheme      ServerScheme;
-
-    SyncScheme      ClientScheme;
-
-    FilterData      SyncFilter;
-
-    unsigned long   SyncMode;
-
-    unsigned long   SyncOptions;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    SyncScheme		ServerScheme; 
+    
+    SyncScheme		ClientScheme; 
+    
+    FilterData		SyncFilter; 
+    
+    unsigned long	SyncMode; 
+    
+    unsigned long	SyncOptions; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/sync/SyncMode.idl b/offapi/com/sun/star/sync/SyncMode.idl
index 6b8739e4c06c..dfee026f8b6c 100644
--- a/offapi/com/sun/star/sync/SyncMode.idl
+++ b/offapi/com/sun/star/sync/SyncMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifndef __com_sun_star_sync_SyncMode_idl__
-#define __com_sun_star_sync_SyncMode_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sync {
-
-//=============================================================================
-
+ 
+#ifndef __com_sun_star_sync_SyncMode_idl__ 
+#define __com_sun_star_sync_SyncMode_idl__ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sync {  
+ 
+//============================================================================= 
+ 
 /** contains a synchronization element
 
     @deprecated
  */
 published constants SyncMode
-{
-    const unsigned long NONE                = 0x00000000;
-
-    const unsigned long CLIENT_TO_SERVER    = 0x00000001;
-
-    const unsigned long SERVER_TO_CLIENT    = 0x00000002;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    const unsigned long NONE				= 0x00000000; 
+    
+    const unsigned long CLIENT_TO_SERVER	= 0x00000001; 
+    
+    const unsigned long SERVER_TO_CLIENT	= 0x00000002; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/sync/SyncOptions.idl b/offapi/com/sun/star/sync/SyncOptions.idl
index 3a6f98fc0a97..30eb1b5b2d96 100644
--- a/offapi/com/sun/star/sync/SyncOptions.idl
+++ b/offapi/com/sun/star/sync/SyncOptions.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifndef __com_sun_star_sync_SyncOptions_idl__
-#define __com_sun_star_sync_SyncOptions_idl__
-
-//=============================================================================
-
-module com {  module sun {  module star {  module sync {
-
-//=============================================================================
-
+ 
+#ifndef __com_sun_star_sync_SyncOptions_idl__ 
+#define __com_sun_star_sync_SyncOptions_idl__ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module sync {  
+ 
+//============================================================================= 
+ 
 /** contains a synchronization element
 
     @deprecated
  */
 published constants SyncOptions
-{
-    const unsigned long NONE            = 0x00000000;
-
-    const unsigned long DONT_COPY       = 0x00000001;
-
-    const unsigned long DONT_REMOVE     = 0x00000002;
-
-    const unsigned long SERVER_WINS     = 0x00000100;
-
-    const unsigned long CLIENT_WINS     = 0x00000200;
-
-    const unsigned long CREATE_BACKUP   = 0x00010000;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    const unsigned long NONE			= 0x00000000; 
+    
+    const unsigned long DONT_COPY		= 0x00000001; 
+    
+    const unsigned long DONT_REMOVE		= 0x00000002; 
+    
+    const unsigned long	SERVER_WINS		= 0x00000100; 
+    
+    const unsigned long	CLIENT_WINS		= 0x00000200; 
+    
+    const unsigned long	CREATE_BACKUP	= 0x00010000; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/sync/SyncScheme.idl b/offapi/com/sun/star/sync/SyncScheme.idl
index 727479a74384..08d34953e72d 100644
--- a/offapi/com/sun/star/sync/SyncScheme.idl
+++ b/offapi/com/sun/star/sync/SyncScheme.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifndef __com_sun_star_sync_SyncScheme_idl__
-#define __com_sun_star_sync_SyncScheme_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module sync {
-
+ 
+#ifndef __com_sun_star_sync_SyncScheme_idl__ 
+#define __com_sun_star_sync_SyncScheme_idl__ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module sync {  
+ 
 /** contains the scheme name of this SyncScheme
 
     @derepcated
@@ -40,17 +40,17 @@ published struct SyncScheme
 {
     /** contains the scheme name of this SyncScheme
      */
-    string Scheme;
-
-    //-------------------------------------------------------------------------
-
+    string Scheme; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the root for this SyncScheme
      */
-    string Root;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string Root; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/sync/SyncType.idl b/offapi/com/sun/star/sync/SyncType.idl
index a80cd8ea7d99..3c85eb42b3ab 100644
--- a/offapi/com/sun/star/sync/SyncType.idl
+++ b/offapi/com/sun/star/sync/SyncType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifndef __com_sun_star_sync_SyncType_idl__
-#define __com_sun_star_sync_SyncType_idl__
-
-//=============================================================================
-
-module com {  module sun {  module star {  module sync {
-
-//=============================================================================
-
+ 
+#ifndef __com_sun_star_sync_SyncType_idl__ 
+#define __com_sun_star_sync_SyncType_idl__ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module sync {  
+ 
+//============================================================================= 
+ 
 /// @deprecated
 published constants SyncType
-{
-    const unsigned long NONE = 0;
-
-    const unsigned long FILE = 1;
-
-    const unsigned long FOLDER = 2;
-
-    const unsigned long VFS_FILE = 3;
-
-    const unsigned long VFS_FOLDER = 4;
-
-    const unsigned long POP3 = 5;
-
-    const unsigned long IMAP = 6;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    const unsigned long NONE = 0; 
+    
+    const unsigned long FILE = 1; 
+    
+    const unsigned long FOLDER = 2; 
+    
+    const unsigned long VFS_FILE = 3; 
+    
+    const unsigned long VFS_FOLDER = 4; 
+    
+    const unsigned long POP3 = 5; 
+    
+    const unsigned long IMAP = 6; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/sync/Synchronizer.idl b/offapi/com/sun/star/sync/Synchronizer.idl
index fd705bae00f1..bbe8d11b689d 100644
--- a/offapi/com/sun/star/sync/Synchronizer.idl
+++ b/offapi/com/sun/star/sync/Synchronizer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifndef __com_sun_star_sync_Synchronizer_idl__
-#define __com_sun_star_sync_Synchronizer_idl__
-
-#ifndef __com_sun_star_sync_XSynchronizer_idl__
-#include <com/sun/star/sync/XSynchronizer.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module sync {
-
+ 
+#ifndef __com_sun_star_sync_Synchronizer_idl__ 
+#define __com_sun_star_sync_Synchronizer_idl__ 
+ 
+#ifndef __com_sun_star_sync_XSynchronizer_idl__ 
+#include <com/sun/star/sync/XSynchronizer.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module sync { 
+ 
 /// @deprecated
 published service Synchronizer
-{
-    interface com::sun::star::sync::XSynchronizer;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    interface com::sun::star::sync::XSynchronizer; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/sync/XSyncCollector.idl b/offapi/com/sun/star/sync/XSyncCollector.idl
index 08dcf21c5ae0..1e2d6ea295f0 100644
--- a/offapi/com/sun/star/sync/XSyncCollector.idl
+++ b/offapi/com/sun/star/sync/XSyncCollector.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,65 +24,65 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifndef __com_sun_star_sync_XSyncCollector_idl__
-#define __com_sun_star_sync_XSyncCollector_idl__
-
-#ifndef __com_sun_star_ucb_XContentProviderManager_idl__
-#include <com/sun/star/ucb/XContentProviderManager.idl>
-#endif
-#ifndef __com_sun_star_ucb_XContent_idl__
-#include <com/sun/star/ucb/XContent.idl>
-#endif
-#ifndef __com_sun_star_sync_SyncScheme_idl__
-#include <com/sun/star/sync/SyncScheme.idl>
-#endif
-#ifndef __com_sun_star_sync_SyncInfo_idl__
-#include <com/sun/star/sync/SyncInfo.idl>
-#endif
-#ifndef __com_sun_star_sync_SyncElement_idl__
-#include <com/sun/star/sync/SyncElement.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module sync {
-
+ 
+#ifndef __com_sun_star_sync_XSyncCollector_idl__ 
+#define __com_sun_star_sync_XSyncCollector_idl__ 
+ 
+#ifndef __com_sun_star_ucb_XContentProviderManager_idl__ 
+#include <com/sun/star/ucb/XContentProviderManager.idl> 
+#endif 
+#ifndef __com_sun_star_ucb_XContent_idl__ 
+#include <com/sun/star/ucb/XContent.idl> 
+#endif 
+#ifndef __com_sun_star_sync_SyncScheme_idl__ 
+#include <com/sun/star/sync/SyncScheme.idl> 
+#endif 
+#ifndef __com_sun_star_sync_SyncInfo_idl__ 
+#include <com/sun/star/sync/SyncInfo.idl> 
+#endif 
+#ifndef __com_sun_star_sync_SyncElement_idl__ 
+#include <com/sun/star/sync/SyncElement.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module sync {  
+ 
 /// @deprecated
 published interface XSyncCollector: com::sun::star::uno::XInterface
-{
-    boolean                                         initialize( [in] com::sun::star::ucb::XContentProviderManager xMgr,
-                                                                [in] sequence<com::sun::star::sync::SyncScheme> aSyncSchemes,
-                                                                [in] string aBaseFileName );
-
-    sequence<com::sun::star::sync::SyncScheme>      getRegisteredSyncSchemes();
-
-    sequence<com::sun::star::sync::SyncElement>     getSyncSequence( [in] string aSyncSchemeName,
-                                                                     [in] com::sun::star::sync::SyncInfo aSyncInfo );
-
-    [oneway] void                                   beginSynchronize();
-
-    [oneway] void                                   endSynchronize();
-
-    boolean                                         getCorrespondingElement( [in] com::sun::star::sync::SyncScheme aSyncSchemeIn,
-                                                                             [in] com::sun::star::sync::SyncElement aSyncElementIn,
-                                                                             [out] com::sun::star::sync::SyncElement aSyncElementOut );
-
-    boolean                                         executeElementCommand( [in] string aSyncSchemeName,
-                                                                           [in] com::sun::star::sync::SyncElement aSyncElement,
-                                                                            [in] string aCommandName,
-                                                                           [out] any aAny );
-
-    [oneway] void                                   elementSynchronized( [in] string aSyncSchemeName,
-                                                                         [in] com::sun::star::sync::SyncElement aSyncElement,
-                                                                         [in] unsigned long nSyncAction );
-
-    [oneway] void                                   notify( [in] com::sun::star::ucb::XContent XCnt,
-                                                            [in] unsigned long nEvent );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    boolean											initialize( [in] com::sun::star::ucb::XContentProviderManager xMgr, 
+                                                                [in] sequence<com::sun::star::sync::SyncScheme> aSyncSchemes,  
+                                                                [in] string aBaseFileName ); 
+ 
+    sequence<com::sun::star::sync::SyncScheme>		getRegisteredSyncSchemes(); 
+ 
+    sequence<com::sun::star::sync::SyncElement>		getSyncSequence( [in] string aSyncSchemeName, 
+                                                                     [in] com::sun::star::sync::SyncInfo aSyncInfo ); 
+ 
+    [oneway] void									beginSynchronize(); 
+    
+    [oneway] void									endSynchronize(); 
+ 
+    boolean											getCorrespondingElement( [in] com::sun::star::sync::SyncScheme aSyncSchemeIn, 
+                                                                             [in] com::sun::star::sync::SyncElement aSyncElementIn,  
+                                                                             [out] com::sun::star::sync::SyncElement aSyncElementOut ); 
+ 
+    boolean											executeElementCommand( [in] string aSyncSchemeName,  
+                                                                           [in] com::sun::star::sync::SyncElement aSyncElement, 
+                                                                            [in] string aCommandName,  
+                                                                           [out] any aAny ); 
+ 
+    [oneway] void									elementSynchronized( [in] string aSyncSchemeName, 
+                                                                         [in] com::sun::star::sync::SyncElement aSyncElement, 
+                                                                         [in] unsigned long nSyncAction ); 
+ 
+    [oneway] void									notify( [in] com::sun::star::ucb::XContent XCnt, 
+                                                            [in] unsigned long nEvent ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/sync/XSynchronizer.idl b/offapi/com/sun/star/sync/XSynchronizer.idl
index 906a0cb78607..d3ed40e825d1 100644
--- a/offapi/com/sun/star/sync/XSynchronizer.idl
+++ b/offapi/com/sun/star/sync/XSynchronizer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifndef __com_sun_star_sync_XSynchronizer_idl__
-#define __com_sun_star_sync_XSynchronizer_idl__
-
-#ifndef __com_sun_star_sync_XSyncCollector_idl__
-#include <com/sun/star/sync/XSyncCollector.idl>
-#endif
-#ifndef __com_sun_star_sync_SyncInfo_idl__
-#include <com/sun/star/sync/SyncInfo.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module sync {
-
+ 
+#ifndef __com_sun_star_sync_XSynchronizer_idl__ 
+#define __com_sun_star_sync_XSynchronizer_idl__ 
+ 
+#ifndef __com_sun_star_sync_XSyncCollector_idl__ 
+#include <com/sun/star/sync/XSyncCollector.idl> 
+#endif 
+#ifndef __com_sun_star_sync_SyncInfo_idl__ 
+#include <com/sun/star/sync/SyncInfo.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module sync {  
+ 
 /// @deprecated
 published interface XSynchronizer: com::sun::star::uno::XInterface
-{
-    boolean                                         beginSynchronize( [in] com::sun::star::sync::XSyncCollector xClientCollector,
-                                                                      [in] com::sun::star::sync::XSyncCollector xServerCollector,
-                                                                      [in] string aSchemeName, [in] FilterData aFilterData,
-                                                                      [in] unsigned long nSyncMode, [in] unsigned long nSyncOptions );
-
-    boolean                                         getSyncList( [out] sequence<com::sun::star::sync::SyncElement> aSyncSeq );
-
-    boolean                                         performSync( [in] sequence<com::sun::star::sync::SyncElement> aSyncSeq );
-
-    boolean                                         endSynchronize();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    boolean											beginSynchronize( [in] com::sun::star::sync::XSyncCollector xClientCollector, 
+                                                                      [in] com::sun::star::sync::XSyncCollector xServerCollector, 
+                                                                      [in] string aSchemeName, [in] FilterData aFilterData,  
+                                                                      [in] unsigned long nSyncMode, [in] unsigned long nSyncOptions ); 
+ 
+    boolean											getSyncList( [out] sequence<com::sun::star::sync::SyncElement> aSyncSeq ); 
+     
+    boolean											performSync( [in] sequence<com::sun::star::sync::SyncElement> aSyncSeq ); 
+ 
+    boolean											endSynchronize(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/sync2/BadPartnershipException.idl b/offapi/com/sun/star/sync2/BadPartnershipException.idl
index 1fcfad42f633..de5df68cd566 100644
--- a/offapi/com/sun/star/sync2/BadPartnershipException.idl
+++ b/offapi/com/sun/star/sync2/BadPartnershipException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/system/ProxySettings.idl b/offapi/com/sun/star/system/ProxySettings.idl
index 826cf2ea4faf..4369aee8af90 100644
--- a/offapi/com/sun/star/system/ProxySettings.idl
+++ b/offapi/com/sun/star/system/ProxySettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,7 +49,7 @@ module com { module sun { module star { module system {
     installation or a central system database.
 
     @see com::sun::star::system::XProxySettings
-
+    
     @deprecated
 */
 
diff --git a/offapi/com/sun/star/system/SOffice52ProxySettings.idl b/offapi/com/sun/star/system/SOffice52ProxySettings.idl
index a745ed7a4bc1..fb53b5521a9b 100644
--- a/offapi/com/sun/star/system/SOffice52ProxySettings.idl
+++ b/offapi/com/sun/star/system/SOffice52ProxySettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,11 +45,11 @@
 module com { module sun { module star { module system {
 
 //=============================================================================
-/** Specifies a service for reading the proxy settings from an old
+/** Specifies a service for reading the proxy settings from an old 
     StarOffice 5.2 installation.
 
     @see com::sun::star::system::ProxySettings
-
+    
     @deprecated
 */
 
diff --git a/offapi/com/sun/star/system/SimpleCommandMail.idl b/offapi/com/sun/star/system/SimpleCommandMail.idl
index 7d2ee1833f3a..687cd6ef5be7 100644
--- a/offapi/com/sun/star/system/SimpleCommandMail.idl
+++ b/offapi/com/sun/star/system/SimpleCommandMail.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ module com { module sun { module star { module system {
 
 //=============================================================================
 /** Specifies a SimpleCommandMail service. Implementations of such a service, do
-    implement an interface to send mail messages via the current configured
+    implement an interface to send mail messages via the current configured 
     command line mail application.
 
     @see com::sun::star::system::XSimpleMailClient
@@ -59,7 +59,7 @@ module com { module sun { module star { module system {
 published service SimpleCommandMail
 {
     //-------------------------------------------------------------------------
-    /** Provides access to a <type>XSimpleMailClientSupplier</type> interface.
+    /** Provides access to a <type>XSimpleMailClientSupplier</type> interface.		
     */
     interface XSimpleMailClientSupplier;
 
diff --git a/offapi/com/sun/star/system/SimpleMailClientFlags.idl b/offapi/com/sun/star/system/SimpleMailClientFlags.idl
index 706ba72e21fc..9854890b3360 100644
--- a/offapi/com/sun/star/system/SimpleMailClientFlags.idl
+++ b/offapi/com/sun/star/system/SimpleMailClientFlags.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 module com { module sun { module star { module system {
 
 //=============================================================================
-/** These constants are used to specify how the SimpleMailClient Service
+/**	These constants are used to specify how the SimpleMailClient Service 
     should behave.
  */
 
@@ -40,16 +40,16 @@ published constants SimpleMailClientFlags
 {
     //---------------------------------------------------------------------
     /** Uses the default settings when sending a mail, e.g.
-        launches the current configured system mail client.
+        launches the current configured system mail client. 
     */
-    const long DEFAULTS             = 0;
+    const long DEFAULTS				= 0;
 
     //---------------------------------------------------------------------
     /** Does not show the current configured system mail client, but sends
         the mail without any further user interaction.
-        If this flag is specified, a recipient address must have been
+        If this flag is specified, a recipient address must have been 
         specified for the given <type>XSimpleMailMessage</type>
-        object given to the method
+        object given to the method 
         <member scope="com::sun::star::system">XSimpleMailClient::sendSimpleMailMessage()</member>.
      */
     const long NO_USER_INTERFACE    = 1;
@@ -57,13 +57,13 @@ published constants SimpleMailClientFlags
     //---------------------------------------------------------------------
     /** No logon dialog should be displayed to prompt the user for logon
         information if necessary.
-        When this flag is specified and the user needs to logon in order
-        to send a simple mail message via the method
+        When this flag is specified and the user needs to logon in order 
+        to send a simple mail message via the method 
         <member scope="com::sun::star::system">XSimpleMailClient::sendSimpleMailMessage()</member>,
-        an Exception will be thrown.
+        an Exception will be thrown. 
     */
-    const long NO_LOGON_DIALOG      = 2;
-};
+    const long NO_LOGON_DIALOG		= 2;
+};	
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/SimpleSystemMail.idl b/offapi/com/sun/star/system/SimpleSystemMail.idl
index 4fe46be81d0a..c4e29d79d365 100644
--- a/offapi/com/sun/star/system/SimpleSystemMail.idl
+++ b/offapi/com/sun/star/system/SimpleSystemMail.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,8 +45,8 @@ module com { module sun { module star { module system {
  published interface XSimpleMailClientSupplier;
 
 //=============================================================================
-/** Specifies a SimpleSystemMail service. Implementations of such a service
-    implement an interface to send mail messages via the currently configured
+/** Specifies a SimpleSystemMail service. Implementations of such a service 
+    implement an interface to send mail messages via the currently configured 
     system mail client.
 
     @see com::sun::star::system::XSimpleMailClient
@@ -55,7 +55,7 @@ module com { module sun { module star { module system {
 published service SimpleSystemMail
 {
     //-------------------------------------------------------------------------
-    /** Provides access to a <type>XSimpleMailClientSupplier</type> interface.
+    /** Provides access to a <type>XSimpleMailClientSupplier</type> interface.		
     */
     interface XSimpleMailClientSupplier;
 
diff --git a/offapi/com/sun/star/system/SystemProxySettings.idl b/offapi/com/sun/star/system/SystemProxySettings.idl
index 9093afe1f7cb..9faffd83a934 100644
--- a/offapi/com/sun/star/system/SystemProxySettings.idl
+++ b/offapi/com/sun/star/system/SystemProxySettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@ module com { module sun { module star { module system {
 //=============================================================================
 /** Specifies a service for reading the system proxy settings. Some  systems
     store this information in a central configuration database.
-
+    
     @deprecated
 */
 
diff --git a/offapi/com/sun/star/system/SystemShellExecute.idl b/offapi/com/sun/star/system/SystemShellExecute.idl
index 2440c9c2492b..7ec1e936693a 100644
--- a/offapi/com/sun/star/system/SystemShellExecute.idl
+++ b/offapi/com/sun/star/system/SystemShellExecute.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@ module com { module sun { module star { module system {
  published interface XSystemShellExecute;
 
 //=============================================================================
-/** Specifies a system executer service. Such a service makes it possible
+/** Specifies a system executer service. Such a service	makes it possible 
     to execute an arbitrary system command.
 
     @see com::sun::star::system::XSystemShellExecute
@@ -54,7 +54,7 @@ module com { module sun { module star { module system {
 published service SystemShellExecute
 {
     //-------------------------------------------------------------------------
-    /** Provides access to a <type>XSystemShellExecute</type> interface.
+    /** Provides access to a <type>XSystemShellExecute</type> interface.		
     */
     interface XSystemShellExecute;
 
diff --git a/offapi/com/sun/star/system/SystemShellExecuteException.idl b/offapi/com/sun/star/system/SystemShellExecuteException.idl
index f001a877e0ff..dc3bdc3efe3e 100644
--- a/offapi/com/sun/star/system/SystemShellExecuteException.idl
+++ b/offapi/com/sun/star/system/SystemShellExecuteException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ module com { module sun { module star { module system {
 published exception SystemShellExecuteException: com::sun::star::uno::Exception
 {
     //=========================================================================
-    /** A Posix conforming error code or -1 for unknown errors.
+    /** A Posix conforming error code or -1 for unknown errors.	
     */
     long PosixError;
 };
diff --git a/offapi/com/sun/star/system/SystemShellExecuteFlags.idl b/offapi/com/sun/star/system/SystemShellExecuteFlags.idl
index cd93fa1cdb5b..0b5719e0f645 100644
--- a/offapi/com/sun/star/system/SystemShellExecuteFlags.idl
+++ b/offapi/com/sun/star/system/SystemShellExecuteFlags.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 module com { module sun { module star { module system {
 
 //=============================================================================
-/** Different settings for the <type>SystemShellExecute</type> service.
+/**	Different settings for the <type>SystemShellExecute</type> service.
  */
 
 published constants SystemShellExecuteFlags
@@ -40,14 +40,14 @@ published constants SystemShellExecuteFlags
     //---------------------------------------------------------------------
     /** Uses the default settings for executing commands.
     */
-    const long DEFAULTS                = 0;
+    const long DEFAULTS				   = 0;
 
     //---------------------------------------------------------------------
-    /** Prevents the display of system error message boxes if the
+    /** Prevents the display of system error message boxes if the 
         method <member scope="com::sun::star::system">XSystemShellExecute::execute()</member> fails.
      */
     const long NO_SYSTEM_ERROR_MESSAGE = 1;
-};
+};	
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/system/XProxySettings.idl b/offapi/com/sun/star/system/XProxySettings.idl
index 711bac5b907e..cb67a96c73d6 100644
--- a/offapi/com/sun/star/system/XProxySettings.idl
+++ b/offapi/com/sun/star/system/XProxySettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,92 +43,92 @@ module com { module sun { module star { module system {
 //=============================================================================
 /** Enables access to different proxy settings. If particular settings are not
     available an empty string will be returned.
-
+    
     @deprecated
 */
-
+ 
 published interface XProxySettings: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** Access to the Ftp proxy address.
+    /**	Access to the Ftp proxy address.
         @returns
         The address of the ftp proxy server, if any has been specified.
     */
     string getFtpProxyAddress( );
-
+    
     //-------------------------------------------------------------------------
-    /** Access to the Ftp proxy port.
+    /**	Access to the Ftp proxy port.
         @returns
         The port of the ftp proxy server, if any has been specified.
     */
     string getFtpProxyPort( );
 
     //-------------------------------------------------------------------------
-    /** Access to the Gopher proxy address.
+    /**	Access to the Gopher proxy address.
         @returns
         The address of the gopher proxy server, if any has been specified.
     */
     string getGopherProxyAddress( );
 
     //-------------------------------------------------------------------------
-    /** Access to the Gopher proxy port.
+    /**	Access to the Gopher proxy port.
         @returns
         The port of the gopher proxy server, if any has been specified.
     */
     string getGopherProxyPort( );
 
     //-------------------------------------------------------------------------
-    /** Access to the Http proxy address.
+    /**	Access to the Http proxy address.
         @returns
         The address of the http proxy server, if any has been specified.
     */
     string getHttpProxyAddress( );
 
     //-------------------------------------------------------------------------
-    /** Access to the Http proxy port.
+    /**	Access to the Http proxy port.
         @returns
         The port of the http proxy server, if any has been specified.
     */
     string getHttpProxyPort( );
 
     //-------------------------------------------------------------------------
-    /** Access to the Https proxy address.
+    /**	Access to the Https proxy address.
         @returns
         The address of the https proxy server, if any has been specified.
     */
     string getHttpsProxyAddress( );
 
     //-------------------------------------------------------------------------
-    /** Access to the Https proxy port.
+    /**	Access to the Https proxy port.
         @returns
         The port of the https proxy server, if any has been specified.
     */
     string getHttpsProxyPort( );
 
     //-------------------------------------------------------------------------
-    /** Access to the Socks proxy address.
+    /**	Access to the Socks proxy address.
         @returns
         The address of the socks proxy server, if any has been specified.
     */
     string getSocksProxyAddress( );
 
     //-------------------------------------------------------------------------
-    /** Access to the Socks proxy port.
+    /**	Access to the Socks proxy port.
         @returns
         The port of the socks proxy server, if any has been specified.
     */
     string getSocksProxyPort( );
 
     //-------------------------------------------------------------------------
-    /** Access to the Proxy-Bypass address.
+    /**	Access to the Proxy-Bypass address.
         @returns
         A string of ';' separated addresses for which no proxy server
         should be used.
-    */
+    */	
     string getProxyBypassAddress( );
 
     //-------------------------------------------------------------------------
-    /** Either a proxy is enabled or not.
+    /**	Either a proxy is enabled or not.
         @returns
         A value of <TRUE/> if a proxy is enabled.
         <p>A value of <FALSE/> if a proxy is disabled.</p>
diff --git a/offapi/com/sun/star/system/XSimpleMailClient.idl b/offapi/com/sun/star/system/XSimpleMailClient.idl
index f768cf67c070..eb0f3073f91b 100644
--- a/offapi/com/sun/star/system/XSimpleMailClient.idl
+++ b/offapi/com/sun/star/system/XSimpleMailClient.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,23 +53,23 @@
 module com { module sun { module star { module system {
 
 //=============================================================================
-/** Specifies an interface for creating and sending email messages.
+/** Specifies an interface for creating and sending email messages.  
 */
-
+ 
 published interface XSimpleMailClient: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** Create a simple mail message object that implements the interface
+    /**	Create a simple mail message object that implements the interface 
         <type>XSimpleMailMessage</type>.
-        @returns
-        An object that implements the <type>XSimpleMailMessage</type> interface.
+        @returns 
+        An object that implements the <type>XSimpleMailMessage</type> interface.		
     */
     XSimpleMailMessage createSimpleMailMessage( );
 
     //-------------------------------------------------------------------------
-    /** Sends a given simple mail message object that implements the interface
+    /**	Sends a given simple mail message object that implements the interface 
         <type>XSimpleMailMessage</type>.
-
+        
         @param xSimpleMailMessage
         Specifies a configured mail object to be sent.
 
@@ -85,15 +85,15 @@ published interface XSimpleMailClient: com::sun::star::uno::XInterface
             address has been specified for the given xSimpleMailMessage object.</li>
             <li>The parameter xSimpleMailMessage is NULL.</li>
         </ul>
-
+        
         @throws com::sun::star::uno::Exception
-        if an error occurs while sending the mail.
+        if an error occurs while sending the mail. 
         <p>The Message member of the exception may contain an error description.</p>
-
+        
         @see com::sun::star::system::XSimpleMailMessage
-        @see com::sun::star::system::SimpleMailClientFlags
+        @see com::sun::star::system::SimpleMailClientFlags		
     */
-    void sendSimpleMailMessage( [in] XSimpleMailMessage xSimpleMailMessage, [in] long aFlag )
+    void sendSimpleMailMessage( [in] XSimpleMailMessage xSimpleMailMessage, [in] long aFlag ) 
         raises( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception );
 };
 
diff --git a/offapi/com/sun/star/system/XSimpleMailClientSupplier.idl b/offapi/com/sun/star/system/XSimpleMailClientSupplier.idl
index fce041b2892b..98df9d5dddef 100644
--- a/offapi/com/sun/star/system/XSimpleMailClientSupplier.idl
+++ b/offapi/com/sun/star/system/XSimpleMailClientSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,13 +54,13 @@ module com { module sun { module star { module system {
 
     @see com::sun::star::system::XSimpleMailClient
 */
-
+ 
 published interface XSimpleMailClientSupplier: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** Allows a client to query for an object that implements
+    /** Allows a client to query for an object that implements 
         <type>XSimpleMailClient</type>.
-        @returns
+        @returns 
         An interface to a simple mail client if there is one available on the system
         or an empty reference else.
 
diff --git a/offapi/com/sun/star/system/XSimpleMailMessage.idl b/offapi/com/sun/star/system/XSimpleMailMessage.idl
index 2ec696ec942e..f21e74787ab3 100644
--- a/offapi/com/sun/star/system/XSimpleMailMessage.idl
+++ b/offapi/com/sun/star/system/XSimpleMailMessage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,41 +45,41 @@
 module com { module sun { module star { module system {
 
 //=============================================================================
-/** This interface lets a client set or get the information of a simple mail
+/**	This interface lets a client set or get the information of a simple mail
     message.
 */
-
+ 
 
 published interface XSimpleMailMessage: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** To set the recipient of the simple mail message.
-        @param aRecipient
+    /**	To set the recipient of the simple mail message.
+        @param aRecipient 
         The email address of a recipient. The method doesn't check if
-        the given email address is valid.
+        the given email address is valid.		
     */
     void setRecipient( [in] string aRecipient );
 
     //-------------------------------------------------------------------------
-    /** To get the recipient of the simple mail message.
+    /**	To get the recipient of the simple mail message.
         @returns
-        The specified email address of a recipient
-        if any has been specified or an empty string.
+        The specified email address of a recipient 
+        if any has been specified or an empty string. 			
     */
     string getRecipient( );
 
     //-------------------------------------------------------------------------
-    /** To set the cc recipients of a simple mail message.
+    /**	To set the cc recipients of a simple mail message.
 
         @param aCcRecipient
-        Sets a sequence with the email addresses of one or more cc recipients.
+        Sets a sequence with the email addresses of one or more cc recipients. 
         <p>The method does not check if the given addresses are valid. An empty
         sequence means there are no cc recipients.</p>
     */
     void setCcRecipient( [in] sequence< string > aCcRecipient );
 
     //-------------------------------------------------------------------------
-    /** To get the cc recipients of a simple mail message.
+    /**	To get the cc recipients of a simple mail message.
         @returns
         A sequence with the email addresses of one or more cc recipients.
         <p>If no cc recipients have been specified an empty sequence will be returned.</p>
@@ -87,7 +87,7 @@ published interface XSimpleMailMessage: com::sun::star::uno::XInterface
     sequence< string > getCcRecipient( );
 
     //-------------------------------------------------------------------------
-    /** To set the bcc recipient of a simple mail message.
+    /**	To set the bcc recipient of a simple mail message.
         @param aBccRecipient
         A sequence with the email addresses of one or more bcc recipients. An empty
         sequence means there are no bcc recipients.</p>
@@ -95,7 +95,7 @@ published interface XSimpleMailMessage: com::sun::star::uno::XInterface
     void setBccRecipient( [in] sequence< string > aBccRecipient );
 
     //-------------------------------------------------------------------------
-    /** To get the bcc recipients of a simple mail message.
+    /**	To get the bcc recipients of a simple mail message.
         @returns
         A sequence with the email addresses of one or more bcc recipients.
         <p>If no bcc recipients have been specified an empty sequence will be returned.</p>
@@ -103,14 +103,14 @@ published interface XSimpleMailMessage: com::sun::star::uno::XInterface
     sequence< string > getBccRecipient( );
 
     //-------------------------------------------------------------------------
-    /** To set the email address of the originator of a simple mail message.
+    /**	To set the email address of the originator of a simple mail message.
         @param aOriginator
-        Sets the email address of the originator of the mail.
+        Sets the email address of the originator of the mail.	
     */
     void setOriginator( [in] string aOriginator );
 
     //-------------------------------------------------------------------------
-    /** To get the email address of the originator of a simple mail message.
+    /**	To get the email address of the originator of a simple mail message.
         @returns
         The email address of the originator of the mail.
         <p>If no originator has been specified an empty string will be returned.</p>
@@ -118,25 +118,25 @@ published interface XSimpleMailMessage: com::sun::star::uno::XInterface
     string getOriginator( );
 
     //-------------------------------------------------------------------------
-    /** To set the subject of a simple mail message.
+    /**	To set the subject of a simple mail message.
         @param aSubject
         Sets the subject of the simple mail message.
     */
     void setSubject( [in] string aSubject );
-
+    
     //-------------------------------------------------------------------------
-    /** To get the subject of a simple mail message.
+    /**	To get the subject of a simple mail message.
         @returns
         The subject of the simple mail message.
-        <p>If no subject has been specified an empty string will be returned.</p>
+        <p>If no subject has been specified an empty string will be returned.</p>		
     */
     string getSubject( );
 
     //-------------------------------------------------------------------------
-    /** To set an attachment of a simple mail message.
+    /**	To set an attachment of a simple mail message.
         @param aAttachement
         Sets a sequence of file URLs specifying the files that should be
-        attached to the mail. The given file URLs must be conform to
+        attached to the mail. The given file URLs must be conform to 
         <a href="http://www.w3.org/Addressing/rfc1738.txt">Rfc1738</a>.
         The method does not check if the specified file or files really exist.
 
@@ -148,9 +148,9 @@ published interface XSimpleMailMessage: com::sun::star::uno::XInterface
         raises( ::com::sun::star::lang::IllegalArgumentException );
 
     //-------------------------------------------------------------------------
-    /** To get the attachment of a simple mail message.
+    /**	To get the attachment of a simple mail message.
         @returns
-        A sequence of file URLs specifying the files that should be attached to
+        A sequence of file URLs specifying the files that should be attached to 
         the mail or an empty sequence if no attachments have been specified.
         The returned file URLs are conform to <a href="http://www.w3.org/Addressing/rfc1738.txt">Rfc1738</a>.
     */
diff --git a/offapi/com/sun/star/system/XSystemShellExecute.idl b/offapi/com/sun/star/system/XSystemShellExecute.idl
index f11e54c5b894..134bb399e0cc 100644
--- a/offapi/com/sun/star/system/XSystemShellExecute.idl
+++ b/offapi/com/sun/star/system/XSystemShellExecute.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,34 +51,34 @@ module com { module sun { module star { module system {
 //=============================================================================
 /** Specifies an interface for executing a system command.
 */
-
+ 
 
 published interface XSystemShellExecute: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** Executes an abitrary system command.
-
+    /**	Executes an abitrary system command. 
+        
         @param aCommand
         Specifies the command to execute. This may be an executable file or a
         document which is registered with an application on a specific platform,
         so that the platform knows what application to launch for that document.
-        If the command specifies a path to an executable, etc, this has to be
+        If the command specifies a path to an executable, etc, this has to be 
         a system specific path.
 
         @param aParameter
-        Specifies a list of space separated parameters. The method does not
+        Specifies a list of space separated parameters. The method does not 
         validate the given parameters, but only passes it as a parameter to the
         specified command.
 
         @param nFlags
         Specifies different flags to control the execution of this method, for example,
-        avoid showing system error messages, in case of failures, etc.
+        avoid showing system error messages, in case of failures, etc.		
 
-        @throws com::sun::star::lang::IllegalArgumentException
+        @throws com::sun::star::lang::IllegalArgumentException 
         when the specified flags are wrong or exclude each other.
-.
-        @throws com::sun::star::sys::SystemExecuteException
-        in the case of errors when trying to executed the specified command.
+.		
+        @throws com::sun::star::sys::SystemExecuteException 
+        in the case of errors when trying to executed the specified command.	
 
         @see com::sun::star::system::SystemShellExecuteFlags
     */
diff --git a/offapi/com/sun/star/table/AccessibleCellView.idl b/offapi/com/sun/star/table/AccessibleCellView.idl
index 8f42e9227c3a..3f1ff2b0f94a 100644
--- a/offapi/com/sun/star/table/AccessibleCellView.idl
+++ b/offapi/com/sun/star/table/AccessibleCellView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -58,9 +58,9 @@ module com {  module sun {  module star {  module table {
 
 //=============================================================================
 
-/** The accessible view of a cell in a text document or in the page preview
-      of a spreadsheet document. See
-    <type scope="::com::sun::star::sheet">AccessibleCell</type> for cells in
+/** The accessible view of a cell in a text document or in the page preview 
+      of a spreadsheet document. See 
+    <type scope="::com::sun::star::sheet">AccessibleCell</type> for cells in 
     the edit view of a spreadsheet.
     @since OOo 1.1.2
 */
@@ -72,7 +72,7 @@ published service AccessibleCellView
         <li>The parent returned by <method scope="::com::sun::star::accessibility"
             >XAccessibleContext::getAccessibleParent</method>
             is the accessible table view.</li>
-        <li>The children returned by
+        <li>The children returned by 
             <method scope="::com::sun::star::accessibility"
             >XAccessibleContext::getAccessibleChild</method> all
             support the interface XAccessible. Calling
@@ -90,7 +90,7 @@ published service AccessibleCellView
         <li>The description is the name or the content of the given note.</li>
         <li>The role is <const scope="::com::sun::star::accessibility"
             >AccessibleRole::TABLE_CELL</const></li>
-        <li>For spreadsheets, there are relations between the cell and the
+        <li>For spreadsheets, there are relations between the cell and the 
             shapes with an anchor on this cell.</li>
         <li>The following states are supported:
             <ul>
@@ -117,12 +117,12 @@ published service AccessibleCellView
                     >AccessibleStateType::SELECTED</const> is true, if the cell
                     is selected. This is not possible in the page preview.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SHOWING</const>Is true if the
-                    Bounding Box lies in the Bounding Box of the parent.
+                    >AccessibleStateType::SHOWING</const>Is true if the 
+                    Bounding Box lies in the Bounding Box of the parent. 
                     Otherwise it is false.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::TRANSIENT</const>Is true if the cell
-                    is showed in a spreadsheet page preview. Otherwise it is
+                    >AccessibleStateType::TRANSIENT</const>Is true if the cell 
+                    is showed in a spreadsheet page preview. Otherwise it is 
                     false.</li>
                 <li><const scope="::com::sun::star::accessibility"
                     >AccessibleStateType::VISIBLE</const>Is always true.</li>
diff --git a/offapi/com/sun/star/table/AccessibleTableView.idl b/offapi/com/sun/star/table/AccessibleTableView.idl
index 54d41dcb499b..dfa5ad12b1bd 100644
--- a/offapi/com/sun/star/table/AccessibleTableView.idl
+++ b/offapi/com/sun/star/table/AccessibleTableView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,9 +54,9 @@ module com {  module sun {  module star {  module table {
 
 //=============================================================================
 
-/** The accessible view of a table in a text document or in the page preview
-      of a spreadsheet document. See
-    <type scope="::com::sun::star::sheet">AccessibleSpreadsheet</type> for
+/** The accessible view of a table in a text document or in the page preview 
+      of a spreadsheet document. See 
+    <type scope="::com::sun::star::sheet">AccessibleSpreadsheet</type> for 
     tables in the edit view of a spreadsheet.
     @since OOo 1.1.2
 */
@@ -67,13 +67,13 @@ published service AccessibleTableView
         is the part of a table that is displayed at a single page.
 
     <ul>
-        <li>The parent returned by
+        <li>The parent returned by 
             <method scope="::com::sun::star::accessibility"
             >XAccessibleContext::getAccessibleParent</method>
             is the accessible text document view, a page of the accessible
             text documenent page preview, or the accessible spreadsheet
             page preview.</li>
-        <li>The children returned by
+        <li>The children returned by 
             <method scope="::com::sun::star::accessibility"
             >XAccessibleContext::getAccessibleChild</method> all
             support the interface XAccessible. Calling
@@ -81,7 +81,7 @@ published service AccessibleTableView
             >XAccessible::getAccessibleContext</method> for these children
             returns an object that supports the service.
             <type scope="::com::sun::star::table">AccessibleCellView</type>:
-            A child where calling
+            A child where calling 
             <method scope="::com::sun::star::accessibility"
             >XAccessibleContext::getAccessibleChild</method>
             an object that supports this service is returned for
@@ -98,18 +98,18 @@ published service AccessibleTableView
         <li>The name is the given table name and a number to make it non-ambiguous.</li>
         <li>The role is <const scope="::com::sun::star::accessibility"
             >AccessibleRole::TABLE</const></li>
-        <li>In a spreadsheet page preview there are relations between the
+        <li>In a spreadsheet page preview there are relations between the 
             table and the shapes with an anchor
             on this table (not with an anchor on a cell in this table).</li>
         <li>The following states are supported:
             <ul>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::DEFUNC</const> is always false if the
-                    table is not deleted, the document is open. Also it is
+                    >AccessibleStateType::DEFUNC</const> is always false if the 
+                    table is not deleted, the document is open. Also it is 
                     false if the table was showed in a page preview and the
                     page preview is allready opend, otherwise it is true.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::EDITABLE</const> is false if the
+                    >AccessibleStateType::EDITABLE</const> is false if the 
                     table is showed in a page preview or the table is
                     protected, otherwise it is true.</li>
                 <li><const scope="::com::sun::star::accessibility"
@@ -120,11 +120,11 @@ published service AccessibleTableView
                     true.</li>
                 <li><const scope="::com::sun::star::accessibility"
                     >AccessibleStateType::OPAQUE</const> is false, if the table
-                    has no background color or graphic, otherwise it is
+                    has no background color or graphic, otherwise it is 
                     false.</li>
                 <li><const scope="::com::sun::star::accessibility"
-                    >AccessibleStateType::SHOWING</const>Is true if the
-                    Bounding Box lies in the Bounding Box of the parent.
+                    >AccessibleStateType::SHOWING</const>Is true if the 
+                    Bounding Box lies in the Bounding Box of the parent. 
                     Otherwise it is false.</li>
                 <li><const scope="::com::sun::star::accessibility"
                     >AccessibleStateType::VISIBLE</const>Is always true.</li>
diff --git a/offapi/com/sun/star/table/BorderLine.idl b/offapi/com/sun/star/table/BorderLine.idl
index c40a416a0b82..0ecd6daf0283 100644
--- a/offapi/com/sun/star/table/BorderLine.idl
+++ b/offapi/com/sun/star/table/BorderLine.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/Cell.idl b/offapi/com/sun/star/table/Cell.idl
index 9cd81fb80fce..c1a44d772738 100644
--- a/offapi/com/sun/star/table/Cell.idl
+++ b/offapi/com/sun/star/table/Cell.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/CellAddress.idl b/offapi/com/sun/star/table/CellAddress.idl
index de5439e94517..bda704adee9c 100644
--- a/offapi/com/sun/star/table/CellAddress.idl
+++ b/offapi/com/sun/star/table/CellAddress.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/CellContentType.idl b/offapi/com/sun/star/table/CellContentType.idl
index fea75a3b51b5..b731f53a3c9c 100644
--- a/offapi/com/sun/star/table/CellContentType.idl
+++ b/offapi/com/sun/star/table/CellContentType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/CellCursor.idl b/offapi/com/sun/star/table/CellCursor.idl
index 996f1d80e75c..0ea732991003 100644
--- a/offapi/com/sun/star/table/CellCursor.idl
+++ b/offapi/com/sun/star/table/CellCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/CellHoriJustify.idl b/offapi/com/sun/star/table/CellHoriJustify.idl
index c2f350899f72..9f1d18683d6c 100644
--- a/offapi/com/sun/star/table/CellHoriJustify.idl
+++ b/offapi/com/sun/star/table/CellHoriJustify.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/CellOrientation.idl b/offapi/com/sun/star/table/CellOrientation.idl
index 0c58eee17cfc..5fbabac36272 100644
--- a/offapi/com/sun/star/table/CellOrientation.idl
+++ b/offapi/com/sun/star/table/CellOrientation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/CellProperties.idl b/offapi/com/sun/star/table/CellProperties.idl
index 0528415bdea3..4ba1101ab558 100644
--- a/offapi/com/sun/star/table/CellProperties.idl
+++ b/offapi/com/sun/star/table/CellProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -254,7 +254,7 @@ published service CellProperties
      */
     [optional, property] boolean ShrinkToFit;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/table/CellRange.idl b/offapi/com/sun/star/table/CellRange.idl
index 3b1387f859f3..74a433601a3c 100644
--- a/offapi/com/sun/star/table/CellRange.idl
+++ b/offapi/com/sun/star/table/CellRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/CellRangeAddress.idl b/offapi/com/sun/star/table/CellRangeAddress.idl
index 7475369f870c..bfcf704bec51 100644
--- a/offapi/com/sun/star/table/CellRangeAddress.idl
+++ b/offapi/com/sun/star/table/CellRangeAddress.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/CellRangeListSource.idl b/offapi/com/sun/star/table/CellRangeListSource.idl
index c6c5d710b8fe..65a55960fe31 100644
--- a/offapi/com/sun/star/table/CellRangeListSource.idl
+++ b/offapi/com/sun/star/table/CellRangeListSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/CellValueBinding.idl b/offapi/com/sun/star/table/CellValueBinding.idl
index 3115a8834f5f..90b285164f39 100644
--- a/offapi/com/sun/star/table/CellValueBinding.idl
+++ b/offapi/com/sun/star/table/CellValueBinding.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/CellVertJustify.idl b/offapi/com/sun/star/table/CellVertJustify.idl
index c4b0dcb741bc..adabe6d57c7d 100644
--- a/offapi/com/sun/star/table/CellVertJustify.idl
+++ b/offapi/com/sun/star/table/CellVertJustify.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/ListPositionCellBinding.idl b/offapi/com/sun/star/table/ListPositionCellBinding.idl
index 5058a30d870c..81423c21b098 100644
--- a/offapi/com/sun/star/table/ListPositionCellBinding.idl
+++ b/offapi/com/sun/star/table/ListPositionCellBinding.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ service ListPositionCellBinding
 {
     /** provides the basic functionality for exchanging values with a table cell.
 
-        <p>Additionally to the types supported by the super service, the
+        <p>Additionally to the types supported by the super service, the 
         <type>ListPositionCellBinding</type> allows exchanging integer values.</p>
 
         @see com::sun::star::form::binding::XValueBinding::getSupportedTypes
diff --git a/offapi/com/sun/star/table/ShadowFormat.idl b/offapi/com/sun/star/table/ShadowFormat.idl
index d88445d4a18d..562ca2f2b8d3 100644
--- a/offapi/com/sun/star/table/ShadowFormat.idl
+++ b/offapi/com/sun/star/table/ShadowFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/ShadowLocation.idl b/offapi/com/sun/star/table/ShadowLocation.idl
index 3ff56787700b..1039e8ad05ab 100644
--- a/offapi/com/sun/star/table/ShadowLocation.idl
+++ b/offapi/com/sun/star/table/ShadowLocation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/TableBorder.idl b/offapi/com/sun/star/table/TableBorder.idl
index 8688e6c8a3f0..4fa40e88fdd7 100644
--- a/offapi/com/sun/star/table/TableBorder.idl
+++ b/offapi/com/sun/star/table/TableBorder.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/TableBorderDistances.idl b/offapi/com/sun/star/table/TableBorderDistances.idl
index 86db15d99b64..36b7241b17ba 100644
--- a/offapi/com/sun/star/table/TableBorderDistances.idl
+++ b/offapi/com/sun/star/table/TableBorderDistances.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/TableChart.idl b/offapi/com/sun/star/table/TableChart.idl
index c12262019785..3b2134e9b24b 100644
--- a/offapi/com/sun/star/table/TableChart.idl
+++ b/offapi/com/sun/star/table/TableChart.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/TableCharts.idl b/offapi/com/sun/star/table/TableCharts.idl
index f2c646f6233b..563e95807dca 100644
--- a/offapi/com/sun/star/table/TableCharts.idl
+++ b/offapi/com/sun/star/table/TableCharts.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/TableChartsEnumeration.idl b/offapi/com/sun/star/table/TableChartsEnumeration.idl
index c29e3abbae46..5cbbb61e26ca 100644
--- a/offapi/com/sun/star/table/TableChartsEnumeration.idl
+++ b/offapi/com/sun/star/table/TableChartsEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/TableColumn.idl b/offapi/com/sun/star/table/TableColumn.idl
index 985cc3f7c401..5633872e158d 100644
--- a/offapi/com/sun/star/table/TableColumn.idl
+++ b/offapi/com/sun/star/table/TableColumn.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/TableColumns.idl b/offapi/com/sun/star/table/TableColumns.idl
index 9a3a32c062a1..a04a717d106d 100644
--- a/offapi/com/sun/star/table/TableColumns.idl
+++ b/offapi/com/sun/star/table/TableColumns.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/TableColumnsEnumeration.idl b/offapi/com/sun/star/table/TableColumnsEnumeration.idl
index b43bf7d320e6..4791acffc3bc 100644
--- a/offapi/com/sun/star/table/TableColumnsEnumeration.idl
+++ b/offapi/com/sun/star/table/TableColumnsEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/TableOrientation.idl b/offapi/com/sun/star/table/TableOrientation.idl
index a142d212ef2f..32457de376dd 100644
--- a/offapi/com/sun/star/table/TableOrientation.idl
+++ b/offapi/com/sun/star/table/TableOrientation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/TableRow.idl b/offapi/com/sun/star/table/TableRow.idl
index f3f87e7258a9..592eb020d478 100644
--- a/offapi/com/sun/star/table/TableRow.idl
+++ b/offapi/com/sun/star/table/TableRow.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/TableRows.idl b/offapi/com/sun/star/table/TableRows.idl
index dfb7db26c84b..65ad60173f34 100644
--- a/offapi/com/sun/star/table/TableRows.idl
+++ b/offapi/com/sun/star/table/TableRows.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/TableRowsEnumeration.idl b/offapi/com/sun/star/table/TableRowsEnumeration.idl
index 1ff0c074bd6f..af0f4b505d39 100644
--- a/offapi/com/sun/star/table/TableRowsEnumeration.idl
+++ b/offapi/com/sun/star/table/TableRowsEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/TableSortDescriptor.idl b/offapi/com/sun/star/table/TableSortDescriptor.idl
index 9e2277389be0..e6aab2994e97 100644
--- a/offapi/com/sun/star/table/TableSortDescriptor.idl
+++ b/offapi/com/sun/star/table/TableSortDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/TableSortDescriptor2.idl b/offapi/com/sun/star/table/TableSortDescriptor2.idl
index ff62fa490f18..cba145afefae 100644
--- a/offapi/com/sun/star/table/TableSortDescriptor2.idl
+++ b/offapi/com/sun/star/table/TableSortDescriptor2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #ifndef __com_sun_star_table_TableSortDescriptor2_idl__
 #define __com_sun_star_table_TableSortDescriptor2_idl__
 
-#ifndef __com_sun_star_util_SortDescriptor2_idl__
+#ifndef __com_sun_star_util_SortDescriptor2_idl__ 
 #include <com/sun/star/util/SortDescriptor2.idl>
 #endif
 #ifndef __com_sun_star_beans_XPropertySet_idl__
@@ -44,7 +44,7 @@ module com {  module sun {  module star {  module table {
 
 //=============================================================================
 
-/** specifies properties which describe sorting of fields (rows or columns)
+/** specifies properties which describe sorting of fields (rows or columns) 
     in a table.
 
     @since OOo 1.1.2
@@ -66,9 +66,9 @@ published service TableSortDescriptor2
      */
     [readonly, property] long MaxSortFieldsCount;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** specifies if the columns or rows are to be sorted.
-
+        
         <dl>
             <dt><TRUE/></dt>
             <dd>The columns are to be sorted.</dd>
@@ -76,7 +76,7 @@ published service TableSortDescriptor2
             <dd>The rows are to be sorted.</dd>
         </dl>
      */
-    [property] boolean IsSortColumns;
+    [property] boolean IsSortColumns; 
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/table/TableSortField.idl b/offapi/com/sun/star/table/TableSortField.idl
index 3fb8d718b588..3fb733de6364 100644
--- a/offapi/com/sun/star/table/TableSortField.idl
+++ b/offapi/com/sun/star/table/TableSortField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_table_TableSortField_idl__
-#define __com_sun_star_table_TableSortField_idl__
-
-#ifndef __com_sun_star_lang_Locale_idl__
-#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_table_TableSortFieldType_idl__
-#include <com/sun/star/table/TableSortFieldType.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module table {
-
-//=============================================================================
-/** describes how to sort a single field (row/column) in a tables
+#ifndef __com_sun_star_table_TableSortField_idl__ 
+#define __com_sun_star_table_TableSortField_idl__ 
+ 
+#ifndef __com_sun_star_lang_Locale_idl__ 
+#include <com/sun/star/lang/Locale.idl> 
+#endif 
+#ifndef __com_sun_star_table_TableSortFieldType_idl__ 
+#include <com/sun/star/table/TableSortFieldType.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module table {  
+ 
+//============================================================================= 
+/** describes how to sort a single field (row/column) in a tables 
     sort descriptor.
 
     @see com::sun::star::table::TableSortDescriptor2
@@ -49,45 +49,45 @@ module com {  module sun {  module star {  module table {
  */
 published struct TableSortField
 {
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** index of the row or column in the table to be sorted; 0-based.
      */
-    long Field;
-
-    //-------------------------------------------------------------------------
+    long Field; 
+ 
+    //------------------------------------------------------------------------- 
     /** <TRUE/> if data are sorted in ascending order,
         <FALSE/> if in descending order.
      */
-    boolean IsAscending;
-
-    //-------------------------------------------------------------------------
+    boolean IsAscending; 
+ 
+    //------------------------------------------------------------------------- 
     /** specifies if the case of letters is important when comparing entries.
      */
-    boolean IsCaseSensitive;
+    boolean IsCaseSensitive; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** type of contents in the field.
 
-        <p>If the value is
+        <p>If the value is 
         <member scope="com::sun::star::table::TableSortFieldType">AUTOMATIC</member>
         the algorithm used for sorting is application specific.
-        Especially it may or may not use the values given by
+        Especially it may or may not use the values given by 
         'CollatorLocale' and 'CollatorAlgorithm'.</p>
      */
-    com::sun::star::table::TableSortFieldType FieldType;
+    com::sun::star::table::TableSortFieldType FieldType; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** the locale used by the collator when comparing/sorting text.
-
+        
         <p>This property will not be used when the 'FieldType' is
         <member scope="com::sun::star::table::TableSortFieldType">NUMERIC</member>
         </p>
 
         @ see   com::sun::star::i18n::XCollator
      */
-    com::sun::star::lang::Locale CollatorLocale;
-
-    //-------------------------------------------------------------------------
+    com::sun::star::lang::Locale CollatorLocale; 
+ 
+    //------------------------------------------------------------------------- 
     /** the algorithm used by the collator when comparing/sorting text.
 
         <p>This property will not be used when the 'FieldType' is
@@ -96,12 +96,12 @@ published struct TableSortField
 
         @ see   com::sun::star::i18n::XCollator
      */
-    string CollatorAlgorithm;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string CollatorAlgorithm; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/table/TableSortFieldType.idl b/offapi/com/sun/star/table/TableSortFieldType.idl
index 99a546237358..aaf26b12827b 100644
--- a/offapi/com/sun/star/table/TableSortFieldType.idl
+++ b/offapi/com/sun/star/table/TableSortFieldType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_table_TableSortFieldType_idl__
-#define __com_sun_star_table_TableSortFieldType_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module table {
-
-//=============================================================================
-
-/** enumeration used to specify the type of contents in a sort field
+#ifndef __com_sun_star_table_TableSortFieldType_idl__ 
+#define __com_sun_star_table_TableSortFieldType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module table {  
+ 
+//============================================================================= 
+ 
+/** enumeration used to specify the type of contents in a sort field 
     (row/column) of a table.
 
     @since OOo 1.1.2
  */
 published enum TableSortFieldType
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** type is determined automatically.
      */
-    AUTOMATIC,
-
-    //-------------------------------------------------------------------------
+    AUTOMATIC, 
+ 
+    //------------------------------------------------------------------------- 
     /** sort field contains numerical data.
      */
-    NUMERIC,
-
-    //-------------------------------------------------------------------------
+    NUMERIC, 
+ 
+    //------------------------------------------------------------------------- 
     /** sort field contains text data.
      */
-    ALPHANUMERIC
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    ALPHANUMERIC 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/table/XAutoFormattable.idl b/offapi/com/sun/star/table/XAutoFormattable.idl
index 113c3a17de0a..eac9d19b20a2 100644
--- a/offapi/com/sun/star/table/XAutoFormattable.idl
+++ b/offapi/com/sun/star/table/XAutoFormattable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/XCell.idl b/offapi/com/sun/star/table/XCell.idl
index 7bc0fdffcafa..2319d2c6e848 100644
--- a/offapi/com/sun/star/table/XCell.idl
+++ b/offapi/com/sun/star/table/XCell.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/XCellCursor.idl b/offapi/com/sun/star/table/XCellCursor.idl
index e2b1a195ed98..1064b9b60a87 100644
--- a/offapi/com/sun/star/table/XCellCursor.idl
+++ b/offapi/com/sun/star/table/XCellCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/XCellRange.idl b/offapi/com/sun/star/table/XCellRange.idl
index 433d1173865f..3a0557089b63 100644
--- a/offapi/com/sun/star/table/XCellRange.idl
+++ b/offapi/com/sun/star/table/XCellRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/XColumnRowRange.idl b/offapi/com/sun/star/table/XColumnRowRange.idl
index b72e583495d5..7f3dc3f6703d 100644
--- a/offapi/com/sun/star/table/XColumnRowRange.idl
+++ b/offapi/com/sun/star/table/XColumnRowRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/XMergeableCell.idl b/offapi/com/sun/star/table/XMergeableCell.idl
index 6f1158f4a80f..42870a70fe9c 100644
--- a/offapi/com/sun/star/table/XMergeableCell.idl
+++ b/offapi/com/sun/star/table/XMergeableCell.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/XMergeableCellRange.idl b/offapi/com/sun/star/table/XMergeableCellRange.idl
index 51bf1cbc1a74..d4dd93dcc7b8 100644
--- a/offapi/com/sun/star/table/XMergeableCellRange.idl
+++ b/offapi/com/sun/star/table/XMergeableCellRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_table_XMergeableCellRange_idl__
-#define __com_sun_star_table_XMergeableCellRange_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_table_XMergeableCellRange_idl__ 
+#define __com_sun_star_table_XMergeableCellRange_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
 
 #ifndef __com_sun_star_lang_NoSupportException_idl__
 #include <com/sun/star/lang/NoSupportException.idl>
 #endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module table {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module table {  
+ 
+//============================================================================= 
+ 
 /** represents a range of cells that can possibly be merged or unmerged.
  */
 interface XMergeableCellRange : com::sun::star::uno::XInterface
-{
+{ 
     /** merges the area specified by this range.
 
         @throws <type scope="com::sun::star::lang">NoSupportException</type>
@@ -57,7 +57,7 @@ interface XMergeableCellRange : com::sun::star::uno::XInterface
      */
     void merge() raises( ::com::sun::star::lang::NoSupportException );
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** splits the cells in this range.
         This will be done by inserting rows and columns if needed or unmerging
@@ -78,20 +78,20 @@ interface XMergeableCellRange : com::sun::star::uno::XInterface
             if a split is not possible for this range.
     */
     void split( [in] long Columns, [in] long Rows )
-        raises( ::com::sun::star::lang::NoSupportException,
+        raises( ::com::sun::star::lang::NoSupportException, 
                 ::com::sun::star::lang::IllegalArgumentException );
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** @returns
             <TRUE/> if all cells from this range can be merged to one
             or <FALSE/> otherwise.
      */
-    boolean isMergeable();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean isMergeable(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/table/XTable.idl b/offapi/com/sun/star/table/XTable.idl
index 51e33324a797..346ac2525bd0 100644
--- a/offapi/com/sun/star/table/XTable.idl
+++ b/offapi/com/sun/star/table/XTable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@
 #include <com/sun/star/table/XCellCursor.idl>
 #endif
 
-#ifndef __com_sun_star_util_XModifiable_idl__
+#ifndef __com_sun_star_util_XModifiable_idl__ 
 #include <com/sun/star/util/XModifiable.idl>
 #endif
 
diff --git a/offapi/com/sun/star/table/XTableChart.idl b/offapi/com/sun/star/table/XTableChart.idl
index 745efea0e973..10b884448174 100644
--- a/offapi/com/sun/star/table/XTableChart.idl
+++ b/offapi/com/sun/star/table/XTableChart.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/XTableCharts.idl b/offapi/com/sun/star/table/XTableCharts.idl
index 6e7a5ea679bc..43fb021d25d8 100644
--- a/offapi/com/sun/star/table/XTableCharts.idl
+++ b/offapi/com/sun/star/table/XTableCharts.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/XTableChartsSupplier.idl b/offapi/com/sun/star/table/XTableChartsSupplier.idl
index 351557fbf1a9..2fb0418908b4 100644
--- a/offapi/com/sun/star/table/XTableChartsSupplier.idl
+++ b/offapi/com/sun/star/table/XTableChartsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/XTableColumns.idl b/offapi/com/sun/star/table/XTableColumns.idl
index a6a81b49f96a..6745b8692863 100644
--- a/offapi/com/sun/star/table/XTableColumns.idl
+++ b/offapi/com/sun/star/table/XTableColumns.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/table/XTableRows.idl b/offapi/com/sun/star/table/XTableRows.idl
index bd05abfc2a8f..5b8ab14b8b79 100644
--- a/offapi/com/sun/star/table/XTableRows.idl
+++ b/offapi/com/sun/star/table/XTableRows.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/AsyncJob.idl b/offapi/com/sun/star/task/AsyncJob.idl
index eed753549b75..f82988b6e75e 100644
--- a/offapi/com/sun/star/task/AsyncJob.idl
+++ b/offapi/com/sun/star/task/AsyncJob.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl b/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl
index fdd98037d6b3..117ecf0db3e2 100644
--- a/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl
+++ b/offapi/com/sun/star/task/ClassifiedInteractionRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__
-#define __com_sun_star_task_ClassifiedInteractionRequest_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_task_InteractionClassification_idl__
-#include <com/sun/star/task/InteractionClassification.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module task {
-
-//=============================================================================
-
+#ifndef __com_sun_star_task_ClassifiedInteractionRequest_idl__ 
+#define __com_sun_star_task_ClassifiedInteractionRequest_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_task_InteractionClassification_idl__ 
+#include <com/sun/star/task/InteractionClassification.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module task {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::task::ClassifiedInteractionRequest
 /** A classified interaction request.
  */
 published exception ClassifiedInteractionRequest: com::sun::star::uno::Exception
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::task::ClassifiedInteractionRequest::Classification
     /** The classification of the request.
      */
-    com::sun::star::task::InteractionClassification Classification;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::task::InteractionClassification Classification; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl b/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
index 1d453e41aa29..ed8ac898a2fa 100644
--- a/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
+++ b/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright IBM Corporation 2009.
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
diff --git a/offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl b/offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl
index 94ce75683dea..abd3b08fa4d5 100755
--- a/offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl
+++ b/offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl
@@ -39,7 +39,7 @@
 module com { module sun { module star { module task {
 
 //=============================================================================
-/** this request specifies if a password for opening or modifying of an encrypted Microsoft Office document is requested.
+/** this request specifies if a password for opening or modifying of an encrypted Microsoft Office document is requested. 
 
     <P>
     It is supported by <type>InteractionHandler</type> service, and can
@@ -49,7 +49,7 @@ module com { module sun { module star { module task {
 
     @see com::sun::star::task::PasswordRequest
     @see com::sun::star::task::DocumentMSPasswordRequest
-
+    
     @since OOo 3.3
 */
 exception DocumentMSPasswordRequest2 : DocumentMSPasswordRequest
diff --git a/offapi/com/sun/star/task/DocumentMacroConfirmationRequest.idl b/offapi/com/sun/star/task/DocumentMacroConfirmationRequest.idl
index a115e914afb8..59a5880090a5 100644
--- a/offapi/com/sun/star/task/DocumentMacroConfirmationRequest.idl
+++ b/offapi/com/sun/star/task/DocumentMacroConfirmationRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module task {
+module com { module sun { module star { module task { 
 
 //=============================================================================
 
@@ -72,7 +72,7 @@ exception DocumentMacroConfirmationRequest : ClassifiedInteractionRequest
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/DocumentPasswordRequest.idl b/offapi/com/sun/star/task/DocumentPasswordRequest.idl
index 5520dc14f0ba..f21913a465e2 100644
--- a/offapi/com/sun/star/task/DocumentPasswordRequest.idl
+++ b/offapi/com/sun/star/task/DocumentPasswordRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module task {
+module com { module sun { module star { module task { 
 
 //=============================================================================
 /** this request specifies the mode in wich the password should be asked
@@ -58,6 +58,6 @@ published exception DocumentPasswordRequest: PasswordRequest
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/task/DocumentPasswordRequest2.idl b/offapi/com/sun/star/task/DocumentPasswordRequest2.idl
index 0f49e29255f0..a9500133eb89 100755
--- a/offapi/com/sun/star/task/DocumentPasswordRequest2.idl
+++ b/offapi/com/sun/star/task/DocumentPasswordRequest2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module task {
+module com { module sun { module star { module task { 
 
 //=============================================================================
 /** this request specifies if a password for opening or modifying a document is requested.
@@ -48,7 +48,7 @@ module com { module sun { module star { module task {
 
     @see com::sun::star::task::PasswordRequest
     @see com::sun::star::task::DocumentPasswordRequest
-
+    
     @since OOo 3.3
 */
 exception DocumentPasswordRequest2 : DocumentPasswordRequest
@@ -62,6 +62,6 @@ exception DocumentPasswordRequest2 : DocumentPasswordRequest
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/task/ErrorCodeIOException.idl b/offapi/com/sun/star/task/ErrorCodeIOException.idl
index 93b8aaa67d1a..6ab4e16ea6d1 100644
--- a/offapi/com/sun/star/task/ErrorCodeIOException.idl
+++ b/offapi/com/sun/star/task/ErrorCodeIOException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/ErrorCodeRequest.idl b/offapi/com/sun/star/task/ErrorCodeRequest.idl
index fb594a8b5944..d44b53a5c66a 100644
--- a/offapi/com/sun/star/task/ErrorCodeRequest.idl
+++ b/offapi/com/sun/star/task/ErrorCodeRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/FutureDocumentVersionProductUpdateRequest.idl b/offapi/com/sun/star/task/FutureDocumentVersionProductUpdateRequest.idl
index 0bef641d3ff1..78ab7c574aae 100644
--- a/offapi/com/sun/star/task/FutureDocumentVersionProductUpdateRequest.idl
+++ b/offapi/com/sun/star/task/FutureDocumentVersionProductUpdateRequest.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module task {
+module com { module sun { module star { module task { 
 
 //=============================================================================
 
@@ -58,7 +58,7 @@ exception FutureDocumentVersionProductUpdateRequest : ClassifiedInteractionReque
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/InteractionClassification.idl b/offapi/com/sun/star/task/InteractionClassification.idl
index a5449bdd09e3..03d42ed92306 100644
--- a/offapi/com/sun/star/task/InteractionClassification.idl
+++ b/offapi/com/sun/star/task/InteractionClassification.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_task_InteractionClassification_idl__
-#define __com_sun_star_task_InteractionClassification_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module task {
-
-//=============================================================================
-
+#ifndef __com_sun_star_task_InteractionClassification_idl__ 
+#define __com_sun_star_task_InteractionClassification_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module task {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::task::InteractionClassification
 /** A classification of interaction requests.
 
@@ -41,33 +41,33 @@
     This is the base of classified interaction requests.
  */
 published enum InteractionClassification
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::task::InteractionClassification::ERROR
     /** An error.
      */
-    ERROR,
-
-    //-------------------------------------------------------------------------
-
+    ERROR, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::task::InteractionClassification::WARNING
     /** A warning, less severe than an error.
      */
-    WARNING,
-
-    //-------------------------------------------------------------------------
-
+    WARNING, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::task::InteractionClassification::INFO
     /** Some information for the client/user (which will typically lead to the
         selection of an
         <type scope="com::sun::star::task">XInteractionApprove</type>
         continuation).
      */
-    INFO,
-
-    //-------------------------------------------------------------------------
-
+    INFO, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::task::InteractionClassification::QUERY
     /** A query for the client/user (which will typically lead to the
         selection of an
@@ -75,12 +75,12 @@ published enum InteractionClassification
         <type scope="com::sun::star::task">XInteractionDisapprove</type>
         continuation).
      */
-    QUERY
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    QUERY 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/task/InteractionHandler.idl b/offapi/com/sun/star/task/InteractionHandler.idl
index f772754d6d56..dac9558c9764 100644
--- a/offapi/com/sun/star/task/InteractionHandler.idl
+++ b/offapi/com/sun/star/task/InteractionHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/InteractionRequestStringResolver.idl b/offapi/com/sun/star/task/InteractionRequestStringResolver.idl
index fac2a69de424..a28c94ad788f 100644
--- a/offapi/com/sun/star/task/InteractionRequestStringResolver.idl
+++ b/offapi/com/sun/star/task/InteractionRequestStringResolver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,10 +35,10 @@ module com { module sun { module star {
 module com { module sun { module star { module task {
 
 //============================================================================
-/* An interaction request string resolver that obtains human readable strings
-   from an <type>XInteractionRequest</type>.
+/* An interaction request string resolver that obtains human readable strings 
+   from an <type>XInteractionRequest</type>. 
  */
-/* published */
+/* published */ 
 service InteractionRequestStringResolver : XInteractionRequestStringResolver;
 
 }; }; }; };
diff --git a/offapi/com/sun/star/task/Job.idl b/offapi/com/sun/star/task/Job.idl
index 7d55dea68b56..c9c4f6c92394 100644
--- a/offapi/com/sun/star/task/Job.idl
+++ b/offapi/com/sun/star/task/Job.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/JobExecutor.idl b/offapi/com/sun/star/task/JobExecutor.idl
index 7f6a9581e0ab..1101dd240148 100644
--- a/offapi/com/sun/star/task/JobExecutor.idl
+++ b/offapi/com/sun/star/task/JobExecutor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/MasterPasswordRequest.idl b/offapi/com/sun/star/task/MasterPasswordRequest.idl
index 734c4e00c1e4..1ff5a13f7baf 100644
--- a/offapi/com/sun/star/task/MasterPasswordRequest.idl
+++ b/offapi/com/sun/star/task/MasterPasswordRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module task {
+module com { module sun { module star { module task { 
 
 //=============================================================================
 /** this request specifies the mode in wich the password should be asked
@@ -53,6 +53,6 @@ published exception MasterPasswordRequest: PasswordRequest
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/task/NoMasterException.idl b/offapi/com/sun/star/task/NoMasterException.idl
index 03440309db9d..9f3dd302bc0c 100644
--- a/offapi/com/sun/star/task/NoMasterException.idl
+++ b/offapi/com/sun/star/task/NoMasterException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module task {
+module com { module sun { module star { module task { 
 
 //=============================================================================
 /** is thrown when a master password is needed but not available/correct.
@@ -54,6 +54,6 @@ published exception NoMasterException: com::sun::star::uno::RuntimeException
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/task/OfficeRestartManager.idl b/offapi/com/sun/star/task/OfficeRestartManager.idl
index 9205992d169f..8f835ae7e18c 100644
--- a/offapi/com/sun/star/task/OfficeRestartManager.idl
+++ b/offapi/com/sun/star/task/OfficeRestartManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module task {
+module com { module sun { module star { module task { 
 
 interface XRestartManager;
 
@@ -44,7 +44,7 @@ singleton OfficeRestartManager : XRestartManager;
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/PasswordContainer.idl b/offapi/com/sun/star/task/PasswordContainer.idl
index e0bebf68f77d..a0b9836b8a98 100644
--- a/offapi/com/sun/star/task/PasswordContainer.idl
+++ b/offapi/com/sun/star/task/PasswordContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_task_PasswordContainer_idl__
-#define __com_sun_star_task_PasswordContainer_idl__
+#ifndef __com_sun_star_task_PasswordContainer_idl__ 
+#define __com_sun_star_task_PasswordContainer_idl__ 
 
-module com {  module sun {  module star {
+module com {  module sun {  module star {  
     module task {
         published interface XPasswordContainer;
         published interface XMasterPasswordHandling;
     };
 }; }; };
-
-module com {  module sun {  module star {  module task {
+ 
+module com {  module sun {  module star {  module task {  
 //============================================================================
-/** this service is kind of storage that allows to store passwords
+/** this service is kind of storage that allows to store passwords 
     and to retrieve already stored.
 
     <p>
-    A password can be stored for the session period or persistently.
-    The persistent way is only possible if configuration allows to use storage.
+    A password can be stored for the session period or persistently. 
+    The persistent way is only possible if configuration allows to use storage. 
     It stores passwords encripted with a super password. An interaction
     is used to ask a user for a super password.
-    To allow such an interaction, an object that implements <type>XInteractionHandler</type>
-    interface should be provided. For this purpose <type>InteractionHandler</type>
+    To allow such an interaction, an object that implements <type>XInteractionHandler</type> 
+    interface should be provided. For this purpose <type>InteractionHandler</type> 
     service can be used.
     </p>
 
     <p>
     In case no interaction handler is provided all passwords are stored
     for the session period. In case an interaction handler is provided, but
-    the super password interaction does not return super password ( for any reason ),
+    the super password interaction does not return super password ( for any reason ), 
     <type>NoMasterException</type> exception is thrown to let user use
     nonpersistent way explicitly.
     </p>
@@ -61,7 +61,7 @@ published service PasswordContainer
 {
     //------------------------------------------------------------------------
     /** handles passwords
-
+    
         <p>
         Use this interface to store\retrieve passwords.
         </p>
@@ -70,13 +70,13 @@ published service PasswordContainer
 
     //------------------------------------------------------------------------
     /** handles passwords
-
+    
         <p>
         Use this interface to store\retrieve passwords.
         </p>
      */
     [optional] interface com::sun::star::task::XMasterPasswordHandling;
 };
-
-}; }; }; };
-#endif
+ 
+}; }; }; };  
+#endif 
diff --git a/offapi/com/sun/star/task/PasswordContainerInteractionHandler.idl b/offapi/com/sun/star/task/PasswordContainerInteractionHandler.idl
index 62beab75eb30..80cda8b95276 100644
--- a/offapi/com/sun/star/task/PasswordContainerInteractionHandler.idl
+++ b/offapi/com/sun/star/task/PasswordContainerInteractionHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/PasswordRequest.idl b/offapi/com/sun/star/task/PasswordRequest.idl
index e9f32c86f72b..8aff5030cd20 100644
--- a/offapi/com/sun/star/task/PasswordRequest.idl
+++ b/offapi/com/sun/star/task/PasswordRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module task {
+module com { module sun { module star { module task { 
 
 //=============================================================================
 /** this request specifies the mode in wich the password should be asked
@@ -62,6 +62,6 @@ published exception PasswordRequest: ClassifiedInteractionRequest
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/task/PasswordRequestMode.idl b/offapi/com/sun/star/task/PasswordRequestMode.idl
index a7f710203f78..106276adf6fa 100644
--- a/offapi/com/sun/star/task/PasswordRequestMode.idl
+++ b/offapi/com/sun/star/task/PasswordRequestMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/UnsupportedOverwriteRequest.idl b/offapi/com/sun/star/task/UnsupportedOverwriteRequest.idl
index ac5358fbd002..c3ad06113a24 100644
--- a/offapi/com/sun/star/task/UnsupportedOverwriteRequest.idl
+++ b/offapi/com/sun/star/task/UnsupportedOverwriteRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module task {
+module com { module sun { module star { module task { 
 
 //=============================================================================
 /** this request is used in case a content can't keep files from overwriting
@@ -57,7 +57,7 @@ published exception UnsupportedOverwriteRequest: ClassifiedInteractionRequest
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/task/UrlRecord.idl b/offapi/com/sun/star/task/UrlRecord.idl
index 84a856a87510..4acf057260af 100644
--- a/offapi/com/sun/star/task/UrlRecord.idl
+++ b/offapi/com/sun/star/task/UrlRecord.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/UserRecord.idl b/offapi/com/sun/star/task/UserRecord.idl
index da9ba759bcbf..0290fcb9af83 100644
--- a/offapi/com/sun/star/task/UserRecord.idl
+++ b/offapi/com/sun/star/task/UserRecord.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/XAbortChannel.idl b/offapi/com/sun/star/task/XAbortChannel.idl
index 54f647bd7331..64c2b1bf6736 100644
--- a/offapi/com/sun/star/task/XAbortChannel.idl
+++ b/offapi/com/sun/star/task/XAbortChannel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/XAsyncJob.idl b/offapi/com/sun/star/task/XAsyncJob.idl
index 96dfe0365d9f..ad55c1ad9dfa 100644
--- a/offapi/com/sun/star/task/XAsyncJob.idl
+++ b/offapi/com/sun/star/task/XAsyncJob.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/XInteractionApprove.idl b/offapi/com/sun/star/task/XInteractionApprove.idl
index be39a0b21b2f..dc1d0c8d6d11 100644
--- a/offapi/com/sun/star/task/XInteractionApprove.idl
+++ b/offapi/com/sun/star/task/XInteractionApprove.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_task_XInteractionApprove_idl__
-#define __com_sun_star_task_XInteractionApprove_idl__
-
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
-#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module task {
-
-//=============================================================================
-
+#ifndef __com_sun_star_task_XInteractionApprove_idl__ 
+#define __com_sun_star_task_XInteractionApprove_idl__ 
+ 
+#ifndef __com_sun_star_task_XInteractionContinuation_idl__ 
+#include <com/sun/star/task/XInteractionContinuation.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module task {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::task::XInteractionApprove
 /** An intearaction continuation specifing 'approval'.
  */
 published interface XInteractionApprove: com::sun::star::task::XInteractionContinuation
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/task/XInteractionAskLater.idl b/offapi/com/sun/star/task/XInteractionAskLater.idl
index 04db83387f37..cb5baf4477ad 100644
--- a/offapi/com/sun/star/task/XInteractionAskLater.idl
+++ b/offapi/com/sun/star/task/XInteractionAskLater.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,11 +27,11 @@
 #ifndef __com_sun_star_task_XInteractionAskLater_idl__
 #define __com_sun_star_task_XInteractionAskLater_idl__
 
-#include <com/sun/star/task/XInteractionContinuation.idl>
+#include <com/sun/star/task/XInteractionContinuation.idl> 
 
 //=============================================================================
 
-module com { module sun { module star { module task {
+module com { module sun { module star { module task { 
 
 //=============================================================================
 
@@ -44,7 +44,7 @@ interface XInteractionAskLater : com::sun::star::task::XInteractionContinuation
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/task/XInteractionDisapprove.idl b/offapi/com/sun/star/task/XInteractionDisapprove.idl
index f4a21cc1c2b0..42a2b428615a 100644
--- a/offapi/com/sun/star/task/XInteractionDisapprove.idl
+++ b/offapi/com/sun/star/task/XInteractionDisapprove.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_task_XInteractionDisapprove_idl__
-#define __com_sun_star_task_XInteractionDisapprove_idl__
-
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
-#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module task {
-
-//=============================================================================
-
+#ifndef __com_sun_star_task_XInteractionDisapprove_idl__ 
+#define __com_sun_star_task_XInteractionDisapprove_idl__ 
+ 
+#ifndef __com_sun_star_task_XInteractionContinuation_idl__ 
+#include <com/sun/star/task/XInteractionContinuation.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module task {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::task::XInteractionDisapprove
 /** An interaction continuation specifing 'disapproval'.
  */
 published interface XInteractionDisapprove: com::sun::star::task::XInteractionContinuation
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/task/XInteractionPassword.idl b/offapi/com/sun/star/task/XInteractionPassword.idl
index 95309ccf5623..4d448dff959f 100644
--- a/offapi/com/sun/star/task/XInteractionPassword.idl
+++ b/offapi/com/sun/star/task/XInteractionPassword.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/XInteractionPassword2.idl b/offapi/com/sun/star/task/XInteractionPassword2.idl
index 925f96f30e5a..97bd6aff5350 100644
--- a/offapi/com/sun/star/task/XInteractionPassword2.idl
+++ b/offapi/com/sun/star/task/XInteractionPassword2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl b/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl
index f41bbcbddb93..1fbdf615ed7d 100644
--- a/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl
+++ b/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,59 +24,59 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_task_XInteractionRequestStringResolver_idl__
-#define __com_sun_star_task_XInteractionRequestStringResolver_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Optional_idl__
-#include <com/sun/star/beans/Optional.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionRequest_idl__
-#include <com/sun/star/task/XInteractionRequest.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module task {
-
-//=============================================================================
-
+#ifndef __com_sun_star_task_XInteractionRequestStringResolver_idl__ 
+#define __com_sun_star_task_XInteractionRequestStringResolver_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_Optional_idl__ 
+#include <com/sun/star/beans/Optional.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_task_XInteractionRequest_idl__ 
+#include <com/sun/star/task/XInteractionRequest.idl> 
+#endif 
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module task {  
+ 
+//============================================================================= 
+ 
 /** Obtains human readable strings from an <type>XInteractionRequest</type>.
  */
-/* published */
+/* published */ 
 interface XInteractionRequestStringResolver : com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** Obtains a string containing a human readable message from an
-        informational interaction request.
-
-        <p>An informational interaction request contains not more than one
-        interaction continuation (user has no choice; request is just
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** Obtains a string containing a human readable message from an 
+        informational interaction request. 
+
+        <p>An informational interaction request contains not more than one 
+        interaction continuation (user has no choice; request is just 
         informational). The supplies continuation must either be a
         <type>XInteractionAbort</type> or <type>XInteractionApprove</type>
 
-        @param Request the interaction request for that the message shall
+        @param Request the interaction request for that the message shall 
         be obtained.
 
-        @returns the message string or an empty
+        @returns the message string or an empty 
         <type scope="::com::sun::star::beans">Optional</type>.
      */
-    com::sun::star::beans::Optional< string >
-        getStringFromInformationalRequest(
-        [in] com::sun::star::task::XInteractionRequest Request );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::beans::Optional< string > 
+        getStringFromInformationalRequest( 
+        [in] com::sun::star::task::XInteractionRequest Request ); 
+
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/task/XJob.idl b/offapi/com/sun/star/task/XJob.idl
index 759d7ca223c1..6c5e53b0eb2a 100644
--- a/offapi/com/sun/star/task/XJob.idl
+++ b/offapi/com/sun/star/task/XJob.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/XJobExecutor.idl b/offapi/com/sun/star/task/XJobExecutor.idl
index d4ef207235e7..ea132baa0b1a 100644
--- a/offapi/com/sun/star/task/XJobExecutor.idl
+++ b/offapi/com/sun/star/task/XJobExecutor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/XJobListener.idl b/offapi/com/sun/star/task/XJobListener.idl
index d4f27b69bd8f..d393d02bff44 100644
--- a/offapi/com/sun/star/task/XJobListener.idl
+++ b/offapi/com/sun/star/task/XJobListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/XMasterPasswordHandling.idl b/offapi/com/sun/star/task/XMasterPasswordHandling.idl
index bd0637210052..86c6270f6368 100644
--- a/offapi/com/sun/star/task/XMasterPasswordHandling.idl
+++ b/offapi/com/sun/star/task/XMasterPasswordHandling.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/XMasterPasswordHandling2.idl b/offapi/com/sun/star/task/XMasterPasswordHandling2.idl
index 201ed9081cdb..c51e46f45219 100644
--- a/offapi/com/sun/star/task/XMasterPasswordHandling2.idl
+++ b/offapi/com/sun/star/task/XMasterPasswordHandling2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/XPasswordContainer.idl b/offapi/com/sun/star/task/XPasswordContainer.idl
index 20aaf752a8e5..aac29a9a0c04 100644
--- a/offapi/com/sun/star/task/XPasswordContainer.idl
+++ b/offapi/com/sun/star/task/XPasswordContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,8 +52,8 @@ published interface XPasswordContainer : com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /** Save passwords in to the container.
 
-        @param Url        URL-pattern, that will be used later to retrieve
-        passwords.
+        @param Url        URL-pattern, that will be used later to retrieve 
+        passwords. 
 
         @param UseName    The username.
 
@@ -68,8 +68,8 @@ published interface XPasswordContainer : com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /** Save passwords in to the container, and store them in the file.
 
-        @param Url        URL-pattern, that will be used later to retrieve
-                          passwords.
+        @param Url        URL-pattern, that will be used later to retrieve 
+                          passwords. 
 
         @param UseName    The username.
 
@@ -85,13 +85,13 @@ published interface XPasswordContainer : com::sun::star::uno::XInterface
     /** Find users with passwords for the url pattern.
 
         @param Url     URL-pattern to retrieve password for.
-
+ 
         @param Handler    The handler to get superpassword to en/decript passwords
-
+        
         @returns       Best matched url-pattern with user-records list.
     */
     UrlRecord find( [in] string Url, [in] XInteractionHandler Handler );
-
+    
     //-------------------------------------------------------------------------
     /** Find passwords for the url pattern and username.
 
@@ -104,14 +104,14 @@ published interface XPasswordContainer : com::sun::star::uno::XInterface
         @returns        Best matched url-pattern for the username.
     */
     UrlRecord findForName( [in] string Url, [in] string UserName , [in] XInteractionHandler Handler );
-
+        
     //-------------------------------------------------------------------------
     /** Remove passwords for the url pattern and username.
 
         @param Url      URL-pattern to remove passwords for.
 
         @param UserName Username to remove passwords for.
-
+        
     */
     void remove( [in] string Url, [in] string UserName );
 
@@ -122,7 +122,7 @@ published interface XPasswordContainer : com::sun::star::uno::XInterface
         @param Url      URL-pattern to remove passwords for.
 
         @param UserName Username to remove passwords for.
-
+        
     */
     void removePersistent( [in] string Url, [in] string UserName );
 
@@ -137,7 +137,7 @@ published interface XPasswordContainer : com::sun::star::uno::XInterface
         @returns        List of url-records.
     */
     sequence<UrlRecord> getAllPersistent( [in] XInteractionHandler Handler );
-
+    
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/task/XRestartManager.idl b/offapi/com/sun/star/task/XRestartManager.idl
index 102a1044d2e8..0bea91ccd688 100644
--- a/offapi/com/sun/star/task/XRestartManager.idl
+++ b/offapi/com/sun/star/task/XRestartManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/XStatusIndicator.idl b/offapi/com/sun/star/task/XStatusIndicator.idl
index d3a222d51a36..876309db2e55 100644
--- a/offapi/com/sun/star/task/XStatusIndicator.idl
+++ b/offapi/com/sun/star/task/XStatusIndicator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/XStatusIndicatorFactory.idl b/offapi/com/sun/star/task/XStatusIndicatorFactory.idl
index b7f6b0ea62c1..17e879352b48 100644
--- a/offapi/com/sun/star/task/XStatusIndicatorFactory.idl
+++ b/offapi/com/sun/star/task/XStatusIndicatorFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/XStatusIndicatorSupplier.idl b/offapi/com/sun/star/task/XStatusIndicatorSupplier.idl
index c7e8630e55eb..6fedb8b529ab 100644
--- a/offapi/com/sun/star/task/XStatusIndicatorSupplier.idl
+++ b/offapi/com/sun/star/task/XStatusIndicatorSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/task/XUrlContainer.idl b/offapi/com/sun/star/task/XUrlContainer.idl
index ac55107c67f0..e0456cb5fd81 100644
--- a/offapi/com/sun/star/task/XUrlContainer.idl
+++ b/offapi/com/sun/star/task/XUrlContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/AccessibleEndnoteView.idl b/offapi/com/sun/star/text/AccessibleEndnoteView.idl
index c242c3c806e1..be6bcfdf0512 100644
--- a/offapi/com/sun/star/text/AccessibleEndnoteView.idl
+++ b/offapi/com/sun/star/text/AccessibleEndnoteView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,21 +51,21 @@ module com {  module sun {  module star {  module text {
  */
 published service AccessibleEndnoteView
 {
-    /** This interface gives access to any paragraph fragment and table
+    /** This interface gives access to any paragraph fragment and table 
         fragment that is contained in a endnote and is at least
         partially visible on the screen.
-
+        
         <ul>
-            <li>The parent returned by
+            <li>The parent returned by 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleParent</method>
                 is either the accessible view of a text document,
                 a page of the accessible page preview of a text document,
                 or the accessible page preview of a spreadsheet document.
-            <li>The children returned by
+            <li>The children returned by 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleChild</method> all
-                support the interface XAccessible. Calling
+                support the interface XAccessible. Calling 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessible::getAccessibleContext</method> for these children returns
                 an object that supports one of the following services.
@@ -122,7 +122,7 @@ published service AccessibleEndnoteView
      */
     interface ::com::sun::star::accessibility::XAccessibleContext;
 
-    /** This interface describes the graphical representation of a
+    /** This interface describes the graphical representation of a 
           endnote.
      */
     interface ::com::sun::star::accessibility::XAccessibleComponent;
diff --git a/offapi/com/sun/star/text/AccessibleFootnoteView.idl b/offapi/com/sun/star/text/AccessibleFootnoteView.idl
index 06f0f02aaba0..6eb1e7f3a2ab 100644
--- a/offapi/com/sun/star/text/AccessibleFootnoteView.idl
+++ b/offapi/com/sun/star/text/AccessibleFootnoteView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,10 +53,10 @@ module com {  module sun {  module star {  module text {
  */
 published service AccessibleFootnoteView
 {
-    /** This interface gives access to any paragraph fragment and table
+    /** This interface gives access to any paragraph fragment and table 
         fragment that is contained in a footnote and is at least
         partially visible on the screen.
-
+        
         <ul>
             <li>The parent returned by <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleParent</method>
@@ -65,7 +65,7 @@ published service AccessibleFootnoteView
                 or the accessible page preview of a spreadsheet document.
             <li>The children returned by <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleChild</method> all
-                support the interface XAccessible. Calling
+                support the interface XAccessible. Calling 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessible::getAccessibleContext</method> for these children returns
                 an object that supports one of the following services.
@@ -122,7 +122,7 @@ published service AccessibleFootnoteView
      */
     interface ::com::sun::star::accessibility::XAccessibleContext;
 
-    /** This interface describes the graphical representation of a
+    /** This interface describes the graphical representation of a 
           footnote.
      */
     interface ::com::sun::star::accessibility::XAccessibleComponent;
diff --git a/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl b/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
index 5e2252352ed9..64f71e4316e5 100644
--- a/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
+++ b/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ module com {  module sun {  module star {  module text {
 
 //=============================================================================
 
-/** The accessible view of headers and footers.
+/** The accessible view of headers and footers. 
 
      @since OOo 1.1.2
 
@@ -56,18 +56,18 @@ published service AccessibleHeaderFooterView
     /** This interface gives access to any paragraph and table that is
           contained in the header and footer and is at least partially visible
         on the screen.
-
+        
         <ul>
-            <li>The parent returned by
+            <li>The parent returned by 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleParent</method>
                 is either the accessible view of a text document,
                 a page of the accessible page preview of a text document,
                 or the accessible page preview of a spreadsheet document.
-            <li>The children returned by
+            <li>The children returned by 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleChild</method> all
-                support the interface XAccessible. Calling
+                support the interface XAccessible. Calling 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessible::getAccessibleContext</method> for these children returns
                 an object that supports one of the following services.
@@ -90,9 +90,9 @@ published service AccessibleHeaderFooterView
                         footers.
                 </ul>
             <p>The logical order of paragraphs and tables is never changed.
-            <li>The role is either
+            <li>The role is either 
                 <const scope="::com::sun::star::accessibility"
-                >AccessibleRole::HEADER</const> or
+                >AccessibleRole::HEADER</const> or 
                 <const scope="::com::sun::star::accessibility"
                 >AccessibleRole::FOOTER</const>.
             <li>The name is "header" or "footer" (or the equivalent term
@@ -107,7 +107,7 @@ published service AccessibleHeaderFooterView
                 <ul>
                     <li><const scope="::com::sun::star::accessibility"
                         >AccessibleStateType::DEFUNC</const> (indicates that
-                        the document window has been closed or the header or
+                        the document window has been closed or the header or 
                         footer is not existing any longer)
                     <li><const scope="::com::sun::star::accessibility"
                         >AccessibleStateType::EDITABLE</const>
diff --git a/offapi/com/sun/star/text/AccessiblePageView.idl b/offapi/com/sun/star/text/AccessiblePageView.idl
index 8b05d62b1ce2..20d8854a071b 100644
--- a/offapi/com/sun/star/text/AccessiblePageView.idl
+++ b/offapi/com/sun/star/text/AccessiblePageView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,9 +55,9 @@ published service AccessiblePageView
 {
     /** This interface gives access to any page that is visible in the
           page preview of a text document.
-
+        
         <ul>
-            <li>The parent returned by
+            <li>The parent returned by 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleParent</method> is the
                 accessible page preview of a text document.  That is, the
@@ -66,7 +66,7 @@ published service AccessiblePageView
                 >XAccessible::getAccessibleContext</method> supports
                 <type scope="::com::sun::star::text"
                 >AccessibleTextDocumentPageView</type>.
-            <li>The children returned by
+            <li>The children returned by 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleChild</method> all
                 support the interface XAccessible. Calling
@@ -91,13 +91,13 @@ published service AccessiblePageView
                         >AccessibleParagraphView</type>:
                         A child of this kind is returned for every paragraph
                         fragment that is contained in the page.
-                        A paragraph fragment is the part of a paragraph that
+                        A paragraph fragment is the part of a paragraph that 
                         is displayed on a certain page.
                     <li><type scope="::com::sun::star::table"
                         >AccessibleTableView</type>:
                         A child of this kind is returned for every table
                         fragment that is contained in the page.
-                        A table fragment is the part of a table that is
+                        A table fragment is the part of a table that is 
                         displayed on a certain page.
                     <li><type scope="::com::sun::star::text"
                         >AccessibleTextFrameView</type>:
@@ -115,8 +115,8 @@ published service AccessiblePageView
                         is contained in the page. These objects are
                         children of the <type>AccessiblePageView</type>
                         regardless whether they are bound to a page, paragraph,
-                        a frame or a character. The only exception
-                        are text frames that are bound as character. They are
+                        a frame or a character. The only exception 
+                        are text frames that are bound as character. They are 
                         childen of the paragraph they are contained in.
                     <li><type scope="::com::sun::star::text"
                         >AccessibleTextEmbeddedObject</type>:
@@ -198,7 +198,7 @@ published service AccessiblePageView
      */
     interface ::com::sun::star::accessibility::XAccessibleContext;
 
-    /** This interface describes the graphical representation of a
+    /** This interface describes the graphical representation of a 
           endnote.
      */
     interface ::com::sun::star::accessibility::XAccessibleComponent;
diff --git a/offapi/com/sun/star/text/AccessibleParagraphView.idl b/offapi/com/sun/star/text/AccessibleParagraphView.idl
index 431882d7c4d2..8695595841ca 100644
--- a/offapi/com/sun/star/text/AccessibleParagraphView.idl
+++ b/offapi/com/sun/star/text/AccessibleParagraphView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl b/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
index 1f85b2cc9a77..aa0ccce2d996 100644
--- a/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,7 +59,7 @@ published service AccessibleTextDocumentPageView
     /** This interface gives access to page that are visible in the
           page preview of a text document.
         <ul>
-            <li>The children returned by
+            <li>The children returned by 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleChild</type> all support
                 the interface XAccessible. Calling
@@ -104,7 +104,7 @@ published service AccessibleTextDocumentPageView
     */
     interface ::com::sun::star::accessibility::XAccessibleComponent;
 
-    /** This is the interface for listeners
+    /** This is the interface for listeners 
     */
     interface ::com::sun::star::accessibility::XAccessibleEventBroadcaster;
 };
diff --git a/offapi/com/sun/star/text/AccessibleTextDocumentView.idl b/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
index d3a06d098579..044dda17b36f 100644
--- a/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,7 +62,7 @@ published service AccessibleTextDocumentView
         structure of the document as it is displayed.
 
         <ul>
-            <li>The children returned by
+            <li>The children returned by 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleChild</method> all support
                 the interface XAccessible. Calling
@@ -112,8 +112,8 @@ published service AccessibleTextDocumentView
                         is at least partially visible. These objects are
                         children of the <type>AccessibleTextDocumentView</type>
                         regardless whether they are bound to a page, paragraph,
-                        a frame or a character. The only exception
-                        are text frames that are bound as character. They are
+                        a frame or a character. The only exception 
+                        are text frames that are bound as character. They are 
                         childen of the paragraph they are contained in.
                     <li><type scope="::com::sun::star::text"
                         >AccessibleTextEmbeddedObject</type>:
@@ -206,7 +206,7 @@ published service AccessibleTextDocumentView
     */
     interface ::com::sun::star::accessibility::XAccessibleSelection;
 
-    /** This is the interface for listeners
+    /** This is the interface for listeners 
     */
     interface ::com::sun::star::accessibility::XAccessibleEventBroadcaster;
 };
diff --git a/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl b/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
index 3053acea669d..879dfc31fedc 100644
--- a/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
+++ b/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@ module com {  module sun {  module star {  module text {
 /** The accessible view of an inactive embedded object. If an embedded
     object gets active, the active document gets an accessible object
     tree of its own. This tree is not a subtree of the object that supports
-    this service but of the document service itself. The tree exist only
+    this service but of the document service itself. The tree exist only 
     until the ovject is deactivated.
 
      @since OOo 1.1.2
@@ -62,9 +62,9 @@ module com {  module sun {  module star {  module text {
 published service AccessibleTextEmbeddedObject
 {
     /** This interface comprises the basic accessibility of embedded objects.
-
+        
         <ul>
-            <li>The parent returned by
+            <li>The parent returned by 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleParent</method> is the
                 accessible view of a paragraph if the embedded object is
@@ -124,7 +124,7 @@ published service AccessibleTextEmbeddedObject
     */
     interface ::com::sun::star::accessibility::XAccessibleImage;
 
-    /** This is the interface for listeners
+    /** This is the interface for listeners 
     */
     interface ::com::sun::star::accessibility::XAccessibleEventBroadcaster;
 };
diff --git a/offapi/com/sun/star/text/AccessibleTextFrameView.idl b/offapi/com/sun/star/text/AccessibleTextFrameView.idl
index a11fef5a4f19..bda6d66dd61c 100644
--- a/offapi/com/sun/star/text/AccessibleTextFrameView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextFrameView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,18 +52,18 @@ module com {  module sun {  module star {  module text {
  */
 published service AccessibleTextFrameView
 {
-    /** This interface gives access to any paragraph fragment and table
+    /** This interface gives access to any paragraph fragment and table 
         fragment that is contained in a text frame and at least
         partially visible on the screen.
-
+        
         <ul>
-            <li>The parent returned by
+            <li>The parent returned by 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleParent</type> is the
                 accessible view of a paragraph if the text frame is bound as
                 character, and the accessible view (or of a page in the page
                 preview) of the document in any other case.
-            <li>The children returned by
+            <li>The children returned by 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleChild</type> all support the
                 interface XAccessible. Calling
@@ -133,7 +133,7 @@ published service AccessibleTextFrameView
      */
     interface ::com::sun::star::accessibility::XAccessibleContext;
 
-    /** This interface describes the graphical representation of a
+    /** This interface describes the graphical representation of a 
           text frame.
      */
     interface ::com::sun::star::accessibility::XAccessibleComponent;
diff --git a/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl b/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
index b9ee6ce4b199..58be835f0199 100644
--- a/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
+++ b/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,9 +57,9 @@ module com {  module sun {  module star {  module text {
 published service AccessibleTextGraphicObject
 {
     /** This interface comprises the basic accessibility of text graphics.
-
+        
         <ul>
-            <li>The parent returned by
+            <li>The parent returned by 
                 <method scope="::com::sun::star::accessibility"
                 >XAccessibleContext::getAccessibleParent</method> is the
                 accessible view of a paragraph if the graphic is bound as
@@ -110,7 +110,7 @@ published service AccessibleTextGraphicObject
      */
     interface ::com::sun::star::accessibility::XAccessibleContext;
 
-    /** This interface describes the graphical representation of a
+    /** This interface describes the graphical representation of a 
           graphic.
      */
     interface ::com::sun::star::accessibility::XAccessibleComponent;
diff --git a/offapi/com/sun/star/text/AdvancedTextDocument.idl b/offapi/com/sun/star/text/AdvancedTextDocument.idl
index b45c8998e419..1eed35b88443 100644
--- a/offapi/com/sun/star/text/AdvancedTextDocument.idl
+++ b/offapi/com/sun/star/text/AdvancedTextDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,58 +24,58 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_AdvancedTextDocument_idl__
-#define __com_sun_star_text_AdvancedTextDocument_idl__
-
-#ifndef __com_sun_star_lang_Locale_idl__
-#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_text_HypertextDocument_idl__
-#include <com/sun/star/text/HypertextDocument.idl>
-#endif
-
-#ifndef __com_sun_star_text_XFootnotesSupplier_idl__
-#include <com/sun/star/text/XFootnotesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XEndnotesSupplier_idl__
-#include <com/sun/star/text/XEndnotesSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_XReplaceable_idl__
-#include <com/sun/star/util/XReplaceable.idl>
-#endif
-
-#ifndef __com_sun_star_text_XPagePrintable_idl__
-#include <com/sun/star/text/XPagePrintable.idl>
-#endif
-
-#ifndef __com_sun_star_text_XReferenceMarksSupplier_idl__
-#include <com/sun/star/text/XReferenceMarksSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XLineNumberingSupplier_idl__
-#include <com/sun/star/text/XLineNumberingSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XChapterNumberingSupplier_idl__
-#include <com/sun/star/text/XChapterNumberingSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_AdvancedTextDocument_idl__ 
+#define __com_sun_star_text_AdvancedTextDocument_idl__ 
+ 
+#ifndef __com_sun_star_lang_Locale_idl__ 
+#include <com/sun/star/lang/Locale.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_HypertextDocument_idl__ 
+#include <com/sun/star/text/HypertextDocument.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XFootnotesSupplier_idl__ 
+#include <com/sun/star/text/XFootnotesSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XEndnotesSupplier_idl__ 
+#include <com/sun/star/text/XEndnotesSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XReplaceable_idl__ 
+#include <com/sun/star/util/XReplaceable.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XPagePrintable_idl__ 
+#include <com/sun/star/text/XPagePrintable.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XReferenceMarksSupplier_idl__ 
+#include <com/sun/star/text/XReferenceMarksSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XLineNumberingSupplier_idl__ 
+#include <com/sun/star/text/XLineNumberingSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XChapterNumberingSupplier_idl__ 
+#include <com/sun/star/text/XChapterNumberingSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::AdvancedTextDocument
-/** An advanced text document is an extension of a hypertext document
+/** An advanced text document is an extension of a hypertext document 
     which can also contain text-frames, foot- and endnotes, and some
     other advanced contents.
 
@@ -83,80 +83,80 @@
         use <type>TextDocument</type> instead.
  */
 published service AdvancedTextDocument
-{
+{ 
     // DocMerge: empty anyway
-    service com::sun::star::text::HypertextDocument;
-
+    service com::sun::star::text::HypertextDocument; 
+    
     // DocMerge: empty anyway
-    interface com::sun::star::text::XFootnotesSupplier;
-
+    interface com::sun::star::text::XFootnotesSupplier; 
+    
     // DocMerge: empty anyway
-    interface com::sun::star::text::XEndnotesSupplier;
-
+    interface com::sun::star::text::XEndnotesSupplier; 
+    
     // DocMerge: empty anyway
-    interface com::sun::star::util::XReplaceable;
-
+    interface com::sun::star::util::XReplaceable; 
+    
     // DocMerge: empty anyway
-    interface com::sun::star::text::XPagePrintable;
-
+    interface com::sun::star::text::XPagePrintable; 
+    
     // DocMerge: empty anyway
-    interface com::sun::star::text::XReferenceMarksSupplier;
-
+    interface com::sun::star::text::XReferenceMarksSupplier; 
+    
     // DocMerge: empty anyway
-    interface com::sun::star::text::XLineNumberingSupplier;
-
+    interface com::sun::star::text::XLineNumberingSupplier; 
+    
     // DocMerge: empty anyway
-    interface com::sun::star::text::XChapterNumberingSupplier;
-
+    interface com::sun::star::text::XChapterNumberingSupplier; 
+    
     // DocMerge: empty anyway
-    interface com::sun::star::beans::XPropertySet;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::beans::XPropertySet; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::AdvancedTextDocument::CharLocale
     /** contains the identifier of the default locale of the document.
      */
-    [property] com::sun::star::lang::Locale CharLocale;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::lang::Locale CharLocale; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::AdvancedTextDocument::CharacterCount
     /** contains the count of all characters in the document.
      */
-    [readonly, property] long CharacterCount;
-
-    //-------------------------------------------------------------------------
-
+    [readonly, property] long CharacterCount; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::AdvancedTextDocument::ParagraphCount
     /** contains the count of all paragraphs in the document.
      */
-    [readonly, property] long ParagraphCount;
-
-    //-------------------------------------------------------------------------
-
+    [readonly, property] long ParagraphCount; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::AdvancedTextDocument::WordCount
     /** contains the count of all words in the document.@see WordSeparator
      */
-    [readonly, property] long WordCount;
-
-    //-------------------------------------------------------------------------
-
+    [readonly, property] long WordCount; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::AdvancedTextDocument::WordSeparator
     /** contains a string that consists of characters that mark the
         separation of words in counting the words in a document.
-
-
-
+        
+        
+        
         <p> I.e., slash and backslash. Whitespaces (tab stop,
-        space, paragraph break, or line break) always separate
+        space, paragraph break, or line break) always separate 
         words.</p>@see WordCount
      */
-    [property] string WordSeparator;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] string WordSeparator; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/AuthorDisplayFormat.idl b/offapi/com/sun/star/text/AuthorDisplayFormat.idl
index a58b13c38735..22f095f3444e 100644
--- a/offapi/com/sun/star/text/AuthorDisplayFormat.idl
+++ b/offapi/com/sun/star/text/AuthorDisplayFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_AuthorDisplayFormat_idl__
-#define __com_sun_star_text_AuthorDisplayFormat_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
-/** These constants are used to specify which parts of an author name are displayed
+#ifndef __com_sun_star_text_AuthorDisplayFormat_idl__ 
+#define __com_sun_star_text_AuthorDisplayFormat_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
+/** These constants are used to specify which parts of an author name are displayed 
         in a field.
  */
 published constants AuthorDisplayFormat
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** The full name of the author is displayed
      */
-    const short FULL = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short FULL = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Only the last name of the author is displayed
      */
-    const short LAST_NAME = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short LAST_NAME = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Only the first name of the author is displayed
      */
-    const short FIRST_NAME = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short FIRST_NAME = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The initials of the author are displayed
      */
-    const short INITIALS = 3;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short INITIALS = 3; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/AutoTextContainer.idl b/offapi/com/sun/star/text/AutoTextContainer.idl
index e9ef091ff59c..b5d305b5b0c9 100644
--- a/offapi/com/sun/star/text/AutoTextContainer.idl
+++ b/offapi/com/sun/star/text/AutoTextContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_AutoTextContainer_idl__
-#define __com_sun_star_text_AutoTextContainer_idl__
-
-#ifndef __com_sun_star_text_XAutoTextContainer_idl__
-#include <com/sun/star/text/XAutoTextContainer.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_AutoTextContainer_idl__ 
+#define __com_sun_star_text_AutoTextContainer_idl__ 
+ 
+#ifndef __com_sun_star_text_XAutoTextContainer_idl__ 
+#include <com/sun/star/text/XAutoTextContainer.idl> 
+#endif 
+
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::AutoTextContainer
 /** provides access to groups of text blocks.
  */
 published service AutoTextContainer
-{
+{ 
     // DocMerge: empty anyway
-    interface com::sun::star::text::XAutoTextContainer;
-
-    [optional] interface com::sun::star::container::XIndexAccess;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::text::XAutoTextContainer; 
+    
+    [optional] interface com::sun::star::container::XIndexAccess; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/AutoTextEntry.idl b/offapi/com/sun/star/text/AutoTextEntry.idl
index 2bed15210757..400eb5b660e7 100644
--- a/offapi/com/sun/star/text/AutoTextEntry.idl
+++ b/offapi/com/sun/star/text/AutoTextEntry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_AutoTextEntry_idl__
-#define __com_sun_star_text_AutoTextEntry_idl__
-
-#ifndef __com_sun_star_text_XAutoTextEntry_idl__
-#include <com/sun/star/text/XAutoTextEntry.idl>
-#endif
+#ifndef __com_sun_star_text_AutoTextEntry_idl__ 
+#define __com_sun_star_text_AutoTextEntry_idl__ 
 
-#ifndef __com_sun_star_text_XText_idl__
-#include <com/sun/star/text/XText.idl>
-#endif
+#ifndef __com_sun_star_text_XAutoTextEntry_idl__ 
+#include <com/sun/star/text/XAutoTextEntry.idl> 
+#endif 
 
+#ifndef __com_sun_star_text_XText_idl__ 
+#include <com/sun/star/text/XText.idl> 
+#endif 
 
-//=============================================================================
 
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
+//============================================================================= 
 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::AutoTextEntry
 /** provides access to a text block in a group of
     an <type>AutoTextContainer</type>.
-        @see com::sun::star::text::AutoTextContainer
+        @see com::sun::star::text::AutoTextContainer 
         @see com::sun::star::text::AutoTextGroup
  */
 published service AutoTextEntry
-{
+{ 
     // DocMerge: empty anyway
-    interface com::sun::star::text::XAutoTextEntry;
-
-
+    interface com::sun::star::text::XAutoTextEntry; 
+ 
+     
     // DocMerge from xml: service com::sun::star::text::AutoTextEntry: interface com::sun::star::text::XText
-    /** provides access to the <type>Text</type> of this entry.
+    /** provides access to the <type>Text</type> of this entry. 
      */
-    interface com::sun::star::text::XText;
-
-};
-
-//=============================================================================
-
-}; }; }; };
+    interface com::sun::star::text::XText; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/text/AutoTextGroup.idl b/offapi/com/sun/star/text/AutoTextGroup.idl
index 1094649bfbb1..18adf9236305 100644
--- a/offapi/com/sun/star/text/AutoTextGroup.idl
+++ b/offapi/com/sun/star/text/AutoTextGroup.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_AutoTextGroup_idl__
-#define __com_sun_star_text_AutoTextGroup_idl__
-
-#ifndef __com_sun_star_text_XAutoTextGroup_idl__
-#include <com/sun/star/text/XAutoTextGroup.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
-#include <com/sun/star/container/XNamed.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_AutoTextGroup_idl__ 
+#define __com_sun_star_text_AutoTextGroup_idl__ 
+ 
+#ifndef __com_sun_star_text_XAutoTextGroup_idl__ 
+#include <com/sun/star/text/XAutoTextGroup.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNamed_idl__ 
+#include <com/sun/star/container/XNamed.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::AutoTextGroup
 /** provides access to text blocks in a group.@see com::sun::star::text::AutoTextContainer
  */
 published service AutoTextGroup
-{
+{ 
     // DocMerge: empty anyway
-    interface com::sun::star::text::XAutoTextGroup;
-
+    interface com::sun::star::text::XAutoTextGroup; 
+    
     // DocMerge: empty anyway
-    interface com::sun::star::container::XIndexAccess;
-
-
+    interface com::sun::star::container::XIndexAccess; 
+ 
+     
     // DocMerge from xml: service com::sun::star::text::AutoTextGroup: interface com::sun::star::container::XNamed
     /** provides access to the name of the group.
      */
-    interface com::sun::star::container::XNamed;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::container::XNamed; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/BaseFrame.idl b/offapi/com/sun/star/text/BaseFrame.idl
index 8864cfb14654..425c2f72f6a5 100644
--- a/offapi/com/sun/star/text/BaseFrame.idl
+++ b/offapi/com/sun/star/text/BaseFrame.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/BaseFrameProperties.idl b/offapi/com/sun/star/text/BaseFrameProperties.idl
index e6ede2e36349..ea01c4c1886f 100644
--- a/offapi/com/sun/star/text/BaseFrameProperties.idl
+++ b/offapi/com/sun/star/text/BaseFrameProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/BaseIndex.idl b/offapi/com/sun/star/text/BaseIndex.idl
index 0b40ec0e17f4..680f84b5b280 100644
--- a/offapi/com/sun/star/text/BaseIndex.idl
+++ b/offapi/com/sun/star/text/BaseIndex.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -150,9 +150,9 @@ published service BaseIndex
 
     // DocMerge from xml: property com::sun::star::text::BaseIndex::BackTransparent
     /** specifies the color of the background.
-     */
+     */  
     [property] com::sun::star::util::Color BackColor;
-
+    
     /** If <TRUE/>, the background color value in "BackColor" is not visible.
      */
     [property] boolean BackTransparent;
diff --git a/offapi/com/sun/star/text/BaseIndexMark.idl b/offapi/com/sun/star/text/BaseIndexMark.idl
index 97632664ae27..47cbf896f637 100644
--- a/offapi/com/sun/star/text/BaseIndexMark.idl
+++ b/offapi/com/sun/star/text/BaseIndexMark.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@ published service BaseIndexMark
     service com::sun::star::text::TextContent;
     //-------------------------------------------------------------------------
 
-    /** the string that will be inserted into the corresponding index. If AlternativeText is empty then
+    /**	the string that will be inserted into the corresponding index. If AlternativeText is empty then
         the string that is marked by the TextRange is inserted into the index.
      */
     [property] string AlternativeText;
diff --git a/offapi/com/sun/star/text/Bibliography.idl b/offapi/com/sun/star/text/Bibliography.idl
index bf13309bfd67..f2387ef22a4d 100644
--- a/offapi/com/sun/star/text/Bibliography.idl
+++ b/offapi/com/sun/star/text/Bibliography.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/BibliographyDataField.idl b/offapi/com/sun/star/text/BibliographyDataField.idl
index cdd650a78079..9270994920d0 100644
--- a/offapi/com/sun/star/text/BibliographyDataField.idl
+++ b/offapi/com/sun/star/text/BibliographyDataField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,185 +24,185 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_BibliographyDataField_idl__
-#define __com_sun_star_text_BibliographyDataField_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-//=============================================================================
-
+#ifndef __com_sun_star_text_BibliographyDataField_idl__ 
+#define __com_sun_star_text_BibliographyDataField_idl__ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::text::BibliographyDataField
-/** These values define parts of bibliographic data. They are used to create a
-        bibliography in a text document.
-     <p> Depending on the type of the data some of the fields will usually be left empty.
+/** These values define parts of bibliographic data. They are used to create a 
+        bibliography in a text document. 
+     <p> Depending on the type of the data some of the fields will usually be left empty. 
      </p>
  */
 published constants BibliographyDataField
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::IDENTIFIER
     /** This field contains a unique identifier for the bibliographic data.
      */
-    const short IDENTIFIER      = 0;
-
+    const short IDENTIFIER 		= 0; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::BIBILIOGRAPHIC_TYPE
-    /** This field contains the type of the bibliographic reference. It is of the
-             type BibliographyDataType.
+    /** This field contains the type of the bibliographic reference. It is of the 
+             type BibliographyDataType. 
              @see BibliographyDataType
      */
-    const short BIBILIOGRAPHIC_TYPE     = 1;
-
+    const short BIBILIOGRAPHIC_TYPE 	= 1; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::ADDRESS
     /** This field contains the address of the publisher.
      */
-    const short ADDRESS         = 2;
-
+    const short ADDRESS 		= 2; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::ANNOTE
     /** This field contains an annotation.
      */
-    const short ANNOTE          = 3;
-
+    const short ANNOTE 			= 3; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::AUTHOR
     /** This field contains the name(s) of the author(s)
      */
-    const short AUTHOR          = 4;
-
+    const short AUTHOR 			= 4; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::BOOKTITLE
     /** This field contains the title of the book.
      */
-    const short BOOKTITLE       = 5;
-
+    const short BOOKTITLE 		= 5; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::CHAPTER
     /** This field contains the name or number of the chapter.
      */
-    const short CHAPTER         = 6;
-
+    const short CHAPTER 		= 6; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::EDITION
     /** This field contains the number or name of the edition.
      */
-    const short EDITION         = 7;
-
+    const short EDITION 		= 7; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::EDITOR
     /** This field contains the name(s) of the editor(s)
      */
-    const short EDITOR          = 8;
-
+    const short EDITOR 			= 8; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::HOWPUBLISHED
     /** This field contains a description of the type of the publishing.
      */
-    const short HOWPUBLISHED    = 9;
-
+    const short HOWPUBLISHED 	= 9; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::INSTITUTION
     /** This field contains the name of the institution where the publishing was created.
      */
-    const short INSTITUTION     = 10;
-
+    const short INSTITUTION 	= 10; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::JOURNAL
     /** This field contains the name of the journal.
      */
-    const short JOURNAL         = 11;
-
+    const short JOURNAL 		= 11; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::MONTH
     /** This field contains number or name of the month of the publishing.
      */
-    const short MONTH           = 12;
-
+    const short MONTH 			= 12; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::NOTE
     /** This field contains a note.
      */
-    const short NOTE            = 13;
-
+    const short NOTE 			= 13; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::NUMBER
     /** This field contains the number of the publishing.
      */
-    const short NUMBER          = 14;
-
+    const short NUMBER 			= 14; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::ORGANIZATIONS
     /** This field contains the name of the organizations where the publishing was created.
      */
-    const short ORGANIZATIONS   = 15;
-
+    const short ORGANIZATIONS 	= 15; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::PAGES
     /** This field contains the number(s) of the page(s) of the reference into a publishing.
      */
-    const short PAGES           = 16;
-
+    const short PAGES 			= 16; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::PUBLISHER
     /** This field contains the name of the publisher.
      */
-    const short PUBLISHER       = 17;
-
+    const short PUBLISHER 		= 17; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::SCHOOL
     /** This field contains the name of the university or school where the publishing was created.
      */
-    const short SCHOOL          = 18;
-
+    const short SCHOOL 			= 18; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::SERIES
     /** This field contains the series of the publishing.
      */
-    const short SERIES          = 19;
-
+    const short SERIES			= 19; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::TITLE
     /** This field contains the title of the publishing.
      */
-    const short TITLE           = 20;
-
+    const short TITLE 			= 20; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::REPORT_TYPE
     /** This field contains a description of the type of the report.
      */
-    const short REPORT_TYPE     = 21;
-
+    const short REPORT_TYPE 	= 21; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::VOLUME
     /** This field contains the volume of the publishing.
      */
-    const short VOLUME          = 22;
-
+    const short VOLUME 			= 22; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::YEAR
     /** This field contains the year when the publishing was created.
      */
-    const short YEAR            = 23;
-
+    const short YEAR 			= 23; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::URL
     /** This field contains URL of the publishing.
      */
-    const short URL             = 24;
-
+    const short URL 			= 24; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::CUSTOM1
     /** This field contains user defined data.
      */
-    const short CUSTOM1         = 25;
-
+    const short CUSTOM1 		= 25; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::CUSTOM2
     /** This field contains user defined data.
      */
-    const short CUSTOM2         = 26;
-
+    const short CUSTOM2 		= 26; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::CUSTOM3
     /** This field contains user defined data.
      */
-    const short CUSTOM3         = 27;
-
+    const short CUSTOM3 		= 27; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::CUSTOM4
     /** This field contains user defined data.
      */
-    const short CUSTOM4         = 28;
-
+    const short CUSTOM4 		= 28; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::CUSTOM5
     /** This field contains user defined data.
      */
-    const short CUSTOM5         = 29;
-
+    const short CUSTOM5 		= 29; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataField::ISBN
     /** This field contains the ISBN data of the publishing.
      */
-    const short ISBN            = 30;
-};
-//=============================================================================
-
-}; }; }; };
-
-#endif
-
-
+    const short ISBN 			= 30; 
+}; 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
+ 
+ 
diff --git a/offapi/com/sun/star/text/BibliographyDataType.idl b/offapi/com/sun/star/text/BibliographyDataType.idl
index 072e8910b44b..97b175615595 100644
--- a/offapi/com/sun/star/text/BibliographyDataType.idl
+++ b/offapi/com/sun/star/text/BibliographyDataType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,134 +24,134 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_BibliographyDataType_idl__
-#define __com_sun_star_text_BibliographyDataType_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-//=============================================================================
-
+#ifndef __com_sun_star_text_BibliographyDataType_idl__ 
+#define __com_sun_star_text_BibliographyDataType_idl__ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::text::BibliographyDataType
 /** These values define the type of bibliographic data like book, journal, magazine, etc.
  */
 published constants BibliographyDataType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::ARTICLE
     /** An article from a journal or magazine.
      */
-    const short ARTICLE         = 0;
-
+    const short ARTICLE 		= 0; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::BOOK
     /** A book with an explicit publisher.
      */
-    const short BOOK            = 1;
-
+    const short BOOK 			= 1; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::BOOKLET
     /** A work that is printed and bound, but without a named publisher or sponsoring institution.
      */
-    const short BOOKLET         = 2;
-
+    const short BOOKLET 		= 2; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::CONFERENCE
-    /** An article in the proceedings of a conference. This entry is identical to the 'inproceedings'
+    /** An article in the proceedings of a conference. This entry is identical to the 'inproceedings' 
     entry and is included for compatibility with BiBTex.
      */
-    const short CONFERENCE      = 3;
-
+    const short CONFERENCE 		= 3; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::INBOOK
     /** A part of a book, which may be a chapter and/or a range of pages.
      */
-    const short INBOOK          = 4;
-
+    const short INBOOK 			= 4; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::INCOLLECTION
     /** A part of a book with its own title.
      */
-    const short INCOLLECTION    = 5;
-
+    const short INCOLLECTION 	= 5; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::INPROCEEDINGS
     /** An article in the proceedings of a conference.
      */
-    const short INPROCEEDINGS   = 6;
-
+    const short INPROCEEDINGS 	= 6; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::JOURNAL
     /** A journal or magazine.
      */
-    const short JOURNAL         = 7;
-
+    const short JOURNAL 		= 7; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::MANUAL
     /** Technical documentation.
      */
-    const short MANUAL          = 8;
-
+    const short MANUAL 			= 8; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::MASTERSTHESIS
     /** A Master's thesis.
      */
-    const short MASTERSTHESIS   = 9;
-
+    const short MASTERSTHESIS 	= 9; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::MISC
     /** This type is used when nothing else seems appropriate.
      */
-    const short MISC            = 10;
-
+    const short MISC 			= 10; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::PHDTHESIS
     /** A PhD thesis.
      */
-    const short PHDTHESIS       = 11;
-
+    const short PHDTHESIS 		= 11; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::PROCEEDINGS
     /** The proceedings of a conference.
      */
-    const short PROCEEDINGS     = 12;
-
+    const short PROCEEDINGS 	= 12; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::TECHREPORT
     /** A report published by a school or other institution, usually numbered within a series.
      */
-    const short TECHREPORT      = 13;
-
+    const short TECHREPORT 		= 13; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::UNPUBLISHED
     /** A document with an author and title, but not formally published.
      */
-    const short UNPUBLISHED     = 14;
-
+    const short UNPUBLISHED 	= 14; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::EMAIL
     /** An eMail document
      */
-    const short EMAIL           = 15;
-
+    const short EMAIL 			= 15; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::WWW
     /** A Web document
      */
-    const short WWW             = 16;
-
+    const short WWW 			= 16; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::CUSTOM1
     /** A user defined document type
      */
-    const short CUSTOM1         = 17;
-
+    const short CUSTOM1 		= 17; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::CUSTOM2
     /** A user defined document type
      */
-    const short CUSTOM2         = 18;
-
+    const short CUSTOM2 		= 18; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::CUSTOM3
     /** A user defined document type
      */
-    const short CUSTOM3         = 19;
-
+    const short CUSTOM3 		= 19; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::CUSTOM4
     /** A user defined document type
      */
-    const short CUSTOM4         = 20;
-
+    const short CUSTOM4 		= 20; 
+     
     // DocMerge from idl: value com::sun::star::text::BibliographyDataType::CUSTOM5
     /** A user defined document type
      */
-    const short CUSTOM5         = 21;
-};
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short CUSTOM5 		= 21; 
+}; 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/Bookmark.idl b/offapi/com/sun/star/text/Bookmark.idl
index d0e2f26db724..bd91dca8bbe4 100644
--- a/offapi/com/sun/star/text/Bookmark.idl
+++ b/offapi/com/sun/star/text/Bookmark.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_Bookmark_idl__
-#define __com_sun_star_text_Bookmark_idl__
-
-#ifndef __com_sun_star_text_TextContent_idl__
-#include <com/sun/star/text/TextContent.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNamed_idl__
-#include <com/sun/star/container/XNamed.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_Bookmark_idl__ 
+#define __com_sun_star_text_Bookmark_idl__ 
+ 
+#ifndef __com_sun_star_text_TextContent_idl__ 
+#include <com/sun/star/text/TextContent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNamed_idl__ 
+#include <com/sun/star/container/XNamed.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::Bookmark
-/** A bookmark is a <type>TextContent</type>, which is like a jump
+/** A bookmark is a <type>TextContent</type>, which is like a jump 
     target or a label.
  */
 published service Bookmark
-{
+{ 
     // DocMerge: empty anyway
-    service com::sun::star::text::TextContent;
-
-
+    service com::sun::star::text::TextContent; 
+ 
+     
     // DocMerge from xml: service com::sun::star::text::Bookmark: interface com::sun::star::container::XNamed
     /** This interface specifies the name of the bookmark.
      */
-    interface com::sun::star::container::XNamed;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::container::XNamed; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/Bookmarks.idl b/offapi/com/sun/star/text/Bookmarks.idl
index 537133ca68be..7f9081cd3c88 100644
--- a/offapi/com/sun/star/text/Bookmarks.idl
+++ b/offapi/com/sun/star/text/Bookmarks.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/Cell.idl b/offapi/com/sun/star/text/Cell.idl
index 7669f10afa34..539272034e66 100644
--- a/offapi/com/sun/star/text/Cell.idl
+++ b/offapi/com/sun/star/text/Cell.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,9 +64,9 @@ service Cell
     //-------------------------------------------------------------------------
     /** contains properties from table cells.
 
-        <p>All of these properties are either already availbale in the
+        <p>All of these properties are either already availbale in the 
         service
-        <type scope="com::sun::star::text">CellProperties</type>,
+        <type scope="com::sun::star::text">CellProperties</type>, 
         or get matched against one of those or are implemented
         non-functional since they serve no purpose for text tables.</p>
 
diff --git a/offapi/com/sun/star/text/CellProperties.idl b/offapi/com/sun/star/text/CellProperties.idl
index e108f96c3cf5..a1349efb95a9 100644
--- a/offapi/com/sun/star/text/CellProperties.idl
+++ b/offapi/com/sun/star/text/CellProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -70,93 +70,93 @@ published service CellProperties
         @see    <type scope="com::sun::star::xml">UserDefinedAttributesSupplier</type>
      */
     service com::sun::star::xml::UserDefinedAttributesSupplier;
-
+    
     //-------------------------------------------------------------------------
 
     /** gives access to the objects properties
      */
     interface com::sun::star::beans::XPropertySet;
-
+    
     //-------------------------------------------------------------------------
     /** contains the cell name, see SwXTextTable::getCellByName for more information
      */
     [property] string CellName;
-
+    
     //-------------------------------------------------------------------------
     /** contains the background color.
      */
     [property] com::sun::star::util::Color BackColor;
-
+    
     //-------------------------------------------------------------------------
     /** contains the URL to the background graphic.
      */
     [property] string BackGraphicURL;
-
+    
     //-------------------------------------------------------------------------
     /** contains the name of the graphic filter of the background graphic.
      */
     [property] string BackGraphicFilter;
-
+    
     //-------------------------------------------------------------------------
     /** determins the position of the background graphic.
      */
     [property] com::sun::star::style::GraphicLocation BackGraphicLocation;
-
+    
     //-------------------------------------------------------------------------
     /** contains the number format.
      */
     [property] long NumberFormat;
-
+    
     //-------------------------------------------------------------------------
     /** determins whether the background is transparent.
      */
     [property] boolean BackTransparent;
-
+    
     //-------------------------------------------------------------------------
     /** contains the left border line.
      */
     [property] com::sun::star::table::BorderLine LeftBorder;
-
+    
     //-------------------------------------------------------------------------
     /** contains the right border line.
      */
     [property] com::sun::star::table::BorderLine RightBorder;
-
+    
     //-------------------------------------------------------------------------
     /** contains the top border line.
      */
     [property] com::sun::star::table::BorderLine TopBorder;
-
+    
     //-------------------------------------------------------------------------
     /** contains the bottom border line.
      */
     [property] com::sun::star::table::BorderLine BottomBorder;
-
+    
     //-------------------------------------------------------------------------
     /** contains the distance of the left border.
      */
     [property] long LeftBorderDistance;
-
+    
     //-------------------------------------------------------------------------
     /** contains the distance of the right border.
      */
     [property] long RightBorderDistance;
-
+    
     //-------------------------------------------------------------------------
     /** contains the distance of the top border.
      */
     [property] long TopBorderDistance;
-
+    
     //-------------------------------------------------------------------------
     /** contains the distance of the bottom border.
      */
     [property] long BottomBorderDistance;
-
+    
     //-------------------------------------------------------------------------
     /** contains the text section the text table is contained in if there is any.
      */
     [readonly, property]com::sun::star::text::XTextSection TextSection;
-
+    
     //-------------------------------------------------------------------------
     /** determins whether the cell is write protected or not.
      */
diff --git a/offapi/com/sun/star/text/CellRange.idl b/offapi/com/sun/star/text/CellRange.idl
index b16e88e211a6..d188e301d8a9 100644
--- a/offapi/com/sun/star/text/CellRange.idl
+++ b/offapi/com/sun/star/text/CellRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -92,7 +92,7 @@ published service CellRange
     service com::sun::star::style::ParagraphProperties;
 
     [optional] service com::sun::star::style::ParagraphPropertiesAsian;
-
+        
     [optional] service com::sun::star::style::ParagraphPropertiesComplex;
 
     interface com::sun::star::table::XCellRange;
diff --git a/offapi/com/sun/star/text/ChainedTextFrame.idl b/offapi/com/sun/star/text/ChainedTextFrame.idl
index 2fea57dcb5c8..772fb3332ed2 100644
--- a/offapi/com/sun/star/text/ChainedTextFrame.idl
+++ b/offapi/com/sun/star/text/ChainedTextFrame.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_ChainedTextFrame_idl__
-#define __com_sun_star_text_ChainedTextFrame_idl__
-
-#ifndef __com_sun_star_text_TextFrame_idl__
-#include <com/sun/star/text/TextFrame.idl>
-#endif
-
-#ifndef __com_sun_star_util_XChainable_idl__
-#include <com/sun/star/util/XChainable.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
-/** extends a <type>TextFrame</type> which shares the same <type>Text</type>
-    with other <type>ChainedTextFrame</type> instances that will make the text
+#ifndef __com_sun_star_text_ChainedTextFrame_idl__ 
+#define __com_sun_star_text_ChainedTextFrame_idl__ 
+ 
+#ifndef __com_sun_star_text_TextFrame_idl__ 
+#include <com/sun/star/text/TextFrame.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XChainable_idl__ 
+#include <com/sun/star/util/XChainable.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
+/** extends a <type>TextFrame</type> which shares the same <type>Text</type> 
+    with other <type>ChainedTextFrame</type> instances that will make the text 
     flow through the chained frames. The text flows in the next frame if
     there is no space left in the current frame.
  */
 published service ChainedTextFrame
-{
-    service com::sun::star::text::TextFrame;
-
+{ 
+    service com::sun::star::text::TextFrame; 
+ 
     //-------------------------------------------------------------------------
     /** name of the previous frame in the chain
 
@@ -64,10 +64,10 @@ published service ChainedTextFrame
         <p>An empty string indicates that there is no next frame.</p>
      */
     [property, maybevoid] string ChainPrevName;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/ChapterFormat.idl b/offapi/com/sun/star/text/ChapterFormat.idl
index 2385d25ae402..ae06e8622413 100644
--- a/offapi/com/sun/star/text/ChapterFormat.idl
+++ b/offapi/com/sun/star/text/ChapterFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,61 +24,61 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_ChapterFormat_idl__
-#define __com_sun_star_text_ChapterFormat_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_ChapterFormat_idl__ 
+#define __com_sun_star_text_ChapterFormat_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::text::ChapterFormat
-/** These constants define the display format of the chapter number in a
+/** These constants define the display format of the chapter number in a 
         chapter text field.
  */
 published constants ChapterFormat
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::ChapterFormat::NAME
     /** The title of the chapter is displayed.
      */
-    const short NAME = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short NAME = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::ChapterFormat::NUMBER
     /** The number including prefix and suffix of the chapter is displayed.
      */
-    const short NUMBER = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short NUMBER = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::ChapterFormat::NAME_NUMBER
     /** The title and number including prefix and suffix of the chapter are displayed.
      */
-    const short NAME_NUMBER = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short NAME_NUMBER = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::ChapterFormat::NO_PREFIX_SUFFIX
     /** The name and number of the chapter are displayed.
      */
-    const short NO_PREFIX_SUFFIX = 3;
-
-    //-------------------------------------------------------------------------
-
+    const short NO_PREFIX_SUFFIX = 3; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::ChapterFormat::DIGIT
     /** The number of the chapter is displayed.
      */
-    const short DIGIT = 4;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short DIGIT = 4; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/ChapterNumberingRule.idl b/offapi/com/sun/star/text/ChapterNumberingRule.idl
index 1fac8ee733d5..d79a4b67e4d0 100644
--- a/offapi/com/sun/star/text/ChapterNumberingRule.idl
+++ b/offapi/com/sun/star/text/ChapterNumberingRule.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,64 +24,64 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_ChapterNumberingRule_idl__
-#define __com_sun_star_text_ChapterNumberingRule_idl__
-
-#ifndef __com_sun_star_style_NumberingRule_idl__
-#include <com/sun/star/style/NumberingRule.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_ChapterNumberingRule_idl__ 
+#define __com_sun_star_text_ChapterNumberingRule_idl__ 
+ 
+#ifndef __com_sun_star_style_NumberingRule_idl__ 
+#include <com/sun/star/style/NumberingRule.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::ChapterNumberingRule
 /** describes the rules for chapter numbering in a text document.
-
-
-
+    
+    
+    
     <p>Some of the properties that are available in the interface are
     ignored here.
-
+    
     </p>
     <p>The type of numbering can only be:
-    NUM_CHARS_UPPER_LETTER, NUM_CHARS_LOWER_LETTER, NUM_ROMAN_UPPER,
+    NUM_CHARS_UPPER_LETTER,	NUM_CHARS_LOWER_LETTER, NUM_ROMAN_UPPER,
     NUM_ROMAN_LOWER, NUM_ARABIC, or NUM_NUMBER_NONE
-
+    
     </p>
     <p>In the <type scope="com::sun::star::style">NumberingAlignment</type> only the field
     <member scope="com::sun::star::style">NumberingAlignment::Alignment</member> is applied.
-
+    
     </p>
     <p>Depending on the numbering types, the parameters for bullets or bit maps
     may be ignored.  The character style name for the numbering symbol is
     also ignored.</p>
  */
 published service ChapterNumberingRule
-{
+{ 
     // DocMerge: empty anyway
-    service com::sun::star::style::NumberingRule;
-
-    //-------------------------------------------------------------------------
-
+    service com::sun::star::style::NumberingRule; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::ChapterNumberingRule::HeadingStyleName
-    /** contains the name of the paragraph style that marks this heading
-        level.
-
-
-
+    /** contains the name of the paragraph style that marks this heading 
+        level.  
+        
+        
+        
         <p>It is necessary that each style name appears only
         once in the sequence of numbering rules.</p>
      */
-    [property] string HeadingStyleName;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] string HeadingStyleName; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/CharacterCompressionType.idl b/offapi/com/sun/star/text/CharacterCompressionType.idl
index 23abfd810d44..99c912ee423c 100644
--- a/offapi/com/sun/star/text/CharacterCompressionType.idl
+++ b/offapi/com/sun/star/text/CharacterCompressionType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/ContentIndex.idl b/offapi/com/sun/star/text/ContentIndex.idl
index b3a4c34ef630..c6d8dadf91aa 100644
--- a/offapi/com/sun/star/text/ContentIndex.idl
+++ b/offapi/com/sun/star/text/ContentIndex.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-
-#ifndef __com_sun_star_text_ContentIndex_idl__
-#define __com_sun_star_text_ContentIndex_idl__
-
-#include <com/sun/star/text/BaseIndex.idl>
-
-//=============================================================================
-
-module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+ 
+ 
+#ifndef __com_sun_star_text_ContentIndex_idl__ 
+#define __com_sun_star_text_ContentIndex_idl__ 
+ 
+#include <com/sun/star/text/BaseIndex.idl> 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 /** specifies service of content indexes within a document.@see com::sun::star::text::BaseIndex
  */
 published service ContentIndex
-{
+{ 
     // DocMerge: empty anyway
-    service  com::sun::star::text::BaseIndex;
-
-    /** determins the depth of outline levels that are included into the content index.*/
-
+    service  com::sun::star::text::BaseIndex; 
+ 
+    /** determins the depth of outline levels that are included into the content index.*/ 
+    
     /// @missing
-    [optional, property] short Level;
-
-    /** determins if the document index is created from outlines.
-    */
-    [optional, property] boolean CreateFromOutline;
-
-    /** contains the interface to access the paragraph style names that are included
-     in this index.
-     @see DocumentIndexParagraphStyles
-     */
-    [optional, property] com::sun::star::container::XIndexReplace LevelParagraphStyles;
-
-    /** contains <TRUE/> if the document index marks are included in this index.
-    */
-    [optional, property] boolean CreateFromMarks;
-
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
-
+    [optional, property] short Level; 
+
+    /** determins if the document index is created from outlines. 
+    */ 
+    [optional, property] boolean CreateFromOutline; 
+ 
+    /** contains the interface to access the paragraph style names that are included 
+     in this index. 
+     @see DocumentIndexParagraphStyles 
+     */ 
+    [optional, property] com::sun::star::container::XIndexReplace LevelParagraphStyles; 
+
+    /** contains <TRUE/> if the document index marks are included in this index. 
+    */ 
+    [optional, property] boolean CreateFromMarks; 
+ 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
+ 
diff --git a/offapi/com/sun/star/text/ContentIndexMark.idl b/offapi/com/sun/star/text/ContentIndexMark.idl
index 6ad0b8981f80..76a66d58a5b3 100644
--- a/offapi/com/sun/star/text/ContentIndexMark.idl
+++ b/offapi/com/sun/star/text/ContentIndexMark.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/ControlCharacter.idl b/offapi/com/sun/star/text/ControlCharacter.idl
index 43a9b40247e6..fffcb63daa16 100644
--- a/offapi/com/sun/star/text/ControlCharacter.idl
+++ b/offapi/com/sun/star/text/ControlCharacter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,62 +24,62 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_ControlCharacter_idl__
-#define __com_sun_star_text_ControlCharacter_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_ControlCharacter_idl__ 
+#define __com_sun_star_text_ControlCharacter_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::text::ControlCharacter
-/** These constants are the codes for inserting control characters
+/** These constants are the codes for inserting control characters 
         using <method>XSimpleText::insertControlCharacter</method> interface.
  */
 published constants ControlCharacter
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::ControlCharacter::PARAGRAPH_BREAK
     /** This control character starts a new paragraph.
      */
-    const short PARAGRAPH_BREAK = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short PARAGRAPH_BREAK = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::ControlCharacter::LINE_BREAK
     /** This control character starts a new line in a paragraph.
      */
-    const short LINE_BREAK = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short LINE_BREAK = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::ControlCharacter::HARD_HYPHEN
-    /** This control character equals a dash but prevents this
+    /** This control character equals a dash but prevents this  
                 position from being hyphenated.
      */
-    const short HARD_HYPHEN = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short HARD_HYPHEN = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::ControlCharacter::SOFT_HYPHEN
-    /** This control character defines a special position as a
-                hyphenation point. If a word containing a soft hyphen
-                must be split at the end of a line, then this position
+    /** This control character defines a special position as a 
+                hyphenation point. If a word containing a soft hyphen  
+                must be split at the end of a line, then this position 
                 is preferred.
      */
-    const short SOFT_HYPHEN = 3;
-
-    //-------------------------------------------------------------------------
-
+    const short SOFT_HYPHEN = 3; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::ControlCharacter::HARD_SPACE
-    /** This control character is used to link two words and
-                prevents this concatenation from being hyphenated.
+    /** This control character is used to link two words and 
+                prevents this concatenation from being hyphenated. 
                 It is printed as a space.
      */
-    const short HARD_SPACE = 4;
+    const short HARD_SPACE = 4; 
 
     //-------------------------------------------------------------------------
     /** This control character appends a new paragraph.
diff --git a/offapi/com/sun/star/text/DateDisplayFormat.idl b/offapi/com/sun/star/text/DateDisplayFormat.idl
index 209f17ea9444..8752cbb06893 100644
--- a/offapi/com/sun/star/text/DateDisplayFormat.idl
+++ b/offapi/com/sun/star/text/DateDisplayFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_DateDisplayFormat_idl__
-#define __com_sun_star_text_DateDisplayFormat_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_DateDisplayFormat_idl__ 
+#define __com_sun_star_text_DateDisplayFormat_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** This constants define how a date field is formated before it is displayed.
     The format may also depend on the system or document locale. The samples
     are in German.
@@ -41,56 +41,56 @@
     @deprecated
  */
 published constants DateDisplayFormat
-{
+{ 
     /** the shortest system standard
      */
     const short STANDARD_SHORT = 0;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** the longest system standard
      */
     const short STANDARD_LONG = 1;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** 22.11.73
      */
-    const short MMDDYY = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short MMDDYY = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** 22.11.1973
      */
-    const short MMDDYYYY = 3;
-
-    //-------------------------------------------------------------------------
-
+    const short MMDDYYYY = 3; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** 22. Nov 1973
      */
-    const short DDMMMYYYY = 4;
-
-    //-------------------------------------------------------------------------
-
+    const short DDMMMYYYY = 4; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** 22. November 1973
      */
-    const short DDMMMMYYYY = 5;
-
-    //-------------------------------------------------------------------------
-
+    const short DDMMMMYYYY = 5; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Do, 22. November 1973
      */
-    const short NNDDMMMMYYYY = 6;
-
-    //-------------------------------------------------------------------------
-
+    const short NNDDMMMMYYYY = 6; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Donnerstag, 22. November 1973
      */
-    const short NNNNDDMMMMYYYY = 7;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short NNNNDDMMMMYYYY = 7; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/DefaultNumberingProvider.idl b/offapi/com/sun/star/text/DefaultNumberingProvider.idl
index bc0861e9d92a..41756d5db3c2 100644
--- a/offapi/com/sun/star/text/DefaultNumberingProvider.idl
+++ b/offapi/com/sun/star/text/DefaultNumberingProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/Defaults.idl b/offapi/com/sun/star/text/Defaults.idl
index f8e8c6a56de1..d3b3cabafd93 100644
--- a/offapi/com/sun/star/text/Defaults.idl
+++ b/offapi/com/sun/star/text/Defaults.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -70,7 +70,7 @@ published service Defaults
     [optional] service com::sun::star::style::CharacterPropertiesComplex;
 
     [optional] service com::sun::star::style::ParagraphPropertiesAsian;
-
+    
     [optional] service com::sun::star::style::ParagraphPropertiesComplex;
 
 
diff --git a/offapi/com/sun/star/text/DependentTextField.idl b/offapi/com/sun/star/text/DependentTextField.idl
index b98d07a865f4..be2408393cd0 100644
--- a/offapi/com/sun/star/text/DependentTextField.idl
+++ b/offapi/com/sun/star/text/DependentTextField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_DependentTextField_idl__
-#define __com_sun_star_text_DependentTextField_idl__
-
-#ifndef __com_sun_star_text_TextField_idl__
-#include <com/sun/star/text/TextField.idl>
-#endif
-
-#ifndef __com_sun_star_text_XDependentTextField_idl__
-#include <com/sun/star/text/XDependentTextField.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_DependentTextField_idl__ 
+#define __com_sun_star_text_DependentTextField_idl__ 
+ 
+#ifndef __com_sun_star_text_TextField_idl__ 
+#include <com/sun/star/text/TextField.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XDependentTextField_idl__ 
+#include <com/sun/star/text/XDependentTextField.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::DependentTextField
 /** is a <type>TextField</type> which is not specified by itself,
     but dependent on a <type>TextFieldMaster</type>.@see TextFieldMaster
  */
 published service DependentTextField
-{
+{ 
     // DocMerge: empty anyway
-    service com::sun::star::text::TextField;
-
-
+    service com::sun::star::text::TextField; 
+ 
+     
     // DocMerge from xml: service com::sun::star::text::DependentTextField: interface com::sun::star::text::XDependentTextField
-    /** This interface makes it possible to attach a
+    /** This interface makes it possible to attach a 
                 <type>TextFieldMaster</type> to this <type>TextField</type>.
      */
-    interface com::sun::star::text::XDependentTextField;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    interface com::sun::star::text::XDependentTextField; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/DocumentIndex.idl b/offapi/com/sun/star/text/DocumentIndex.idl
index 8cee39a2327e..b465b5c5e97d 100644
--- a/offapi/com/sun/star/text/DocumentIndex.idl
+++ b/offapi/com/sun/star/text/DocumentIndex.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/DocumentIndexFormat.idl b/offapi/com/sun/star/text/DocumentIndexFormat.idl
index 3f4d305bfe17..8729b1399db9 100644
--- a/offapi/com/sun/star/text/DocumentIndexFormat.idl
+++ b/offapi/com/sun/star/text/DocumentIndexFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,14 +42,14 @@ module com { module sun { module star { module text {
 published service DocumentIndexFormat
 {
     //-------------------------------------------------------------------------
-    /**     This property contains the name of the paragraph style that is
+    /** 	This property contains the name of the paragraph style that is
     used for the index title.
 
     */
     [property] string TitleStyle;
 
     //-------------------------------------------------------------------------
-    /**     This property contains the name of the paragraph style that is
+    /** 	This property contains the name of the paragraph style that is
     used for the separator. This entry is ignored for user indexes
     and content indexes.
 
@@ -57,7 +57,7 @@ published service DocumentIndexFormat
     [property] string SeparatorStyle;
 
     //-------------------------------------------------------------------------
-    /** contains the number of levels in the document index.
+    /**	contains the number of levels in the document index.
     */
     [readonly, property] short LevelCount;
 
@@ -68,7 +68,7 @@ published service DocumentIndexFormat
     [property] sequence<string> LevelStyles;
 
     //-------------------------------------------------------------------------
-    /** This method specifies whether the form supports hyperlinks.
+    /**	This method specifies whether the form supports hyperlinks.
     */
     [readonly, property] boolean HasHyperlinks;
 
diff --git a/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl b/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl
index 059a3edab680..5d6c7d8c359a 100644
--- a/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl
+++ b/offapi/com/sun/star/text/DocumentIndexLevelFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_DocumentIndex_idl__
-#define __com_sun_star_text_DocumentIndex_idl__
-
-#ifndef _com_sun_star_container_XIndexReplace_idl__
-#include <com/sun/star/container/XIndexReplace.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_DocumentIndex_idl__ 
+#define __com_sun_star_text_DocumentIndex_idl__ 
+ 
+#ifndef _com_sun_star_container_XIndexReplace_idl__ 
+#include <com/sun/star/container/XIndexReplace.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::DocumentIndexLevelFormat
 /** This service provides access to the structure of the levels of document indexes.
-
-
+    
+    
     <p>
     The element type is Sequence&lt; PropertyValues &gt;. Each element in this sequence represents
     a member of an index line. The following properties are part of such an element.
@@ -134,23 +134,23 @@
     </ul>
  */
 published service DocumentIndexLevelFormat
-{
+{ 
     // DocMerge: empty anyway
-    interface com::sun::star::container::XIndexReplace;
-
-    //-------------------------------------------------------------------------
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
-
-
-
-
-
-
-
+    interface com::sun::star::container::XIndexReplace; 
+ 
+    //------------------------------------------------------------------------- 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
diff --git a/offapi/com/sun/star/text/DocumentIndexMark.idl b/offapi/com/sun/star/text/DocumentIndexMark.idl
index 97de1d2584f2..e269c6113afc 100644
--- a/offapi/com/sun/star/text/DocumentIndexMark.idl
+++ b/offapi/com/sun/star/text/DocumentIndexMark.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/DocumentIndexMarkAsian.idl b/offapi/com/sun/star/text/DocumentIndexMarkAsian.idl
index f2909be2dcca..13b70e658475 100644
--- a/offapi/com/sun/star/text/DocumentIndexMarkAsian.idl
+++ b/offapi/com/sun/star/text/DocumentIndexMarkAsian.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl b/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl
index c9e6eeb18c30..411fb4fb687e 100644
--- a/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl
+++ b/offapi/com/sun/star/text/DocumentIndexParagraphStyles.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_DocumentIndex_idl__
-#define __com_sun_star_text_DocumentIndex_idl__
-
-#ifndef _com_sun_star_container_XIndexReplace_idl__
-#include <com/sun/star/container/XIndexReplace.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_DocumentIndex_idl__ 
+#define __com_sun_star_text_DocumentIndex_idl__ 
+ 
+#ifndef _com_sun_star_container_XIndexReplace_idl__ 
+#include <com/sun/star/container/XIndexReplace.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::DocumentIndexParagraphStyles
 /** provides access to the names of paragraph styles that are included
     in content indexes of user defined indexes. The element type is  sequence of string.
  */
 published service DocumentIndexParagraphStyles
-{
+{ 
     // DocMerge: empty anyway
-    interface com::sun::star::container::XIndexReplace;
-    //-------------------------------------------------------------------------
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
-
-
-
-
-
-
-
+    interface com::sun::star::container::XIndexReplace; 
+    //------------------------------------------------------------------------- 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
diff --git a/offapi/com/sun/star/text/DocumentIndexes.idl b/offapi/com/sun/star/text/DocumentIndexes.idl
index d47a9c6bdfd4..204d9571352f 100644
--- a/offapi/com/sun/star/text/DocumentIndexes.idl
+++ b/offapi/com/sun/star/text/DocumentIndexes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/DocumentSettings.idl b/offapi/com/sun/star/text/DocumentSettings.idl
index 3ab98fdd2ddc..a33b372fea6e 100644
--- a/offapi/com/sun/star/text/DocumentSettings.idl
+++ b/offapi/com/sun/star/text/DocumentSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/DocumentStatistic.idl b/offapi/com/sun/star/text/DocumentStatistic.idl
index c8833985f018..4da84501a22a 100644
--- a/offapi/com/sun/star/text/DocumentStatistic.idl
+++ b/offapi/com/sun/star/text/DocumentStatistic.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_DocumentStatistic_idl__
-#define __com_sun_star_text_DocumentStatistic_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_DocumentStatistic_idl__ 
+#define __com_sun_star_text_DocumentStatistic_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::text::DocumentStatistic
-/** These constants are used to specify the type of a document statistic
+/** These constants are used to specify the type of a document statistic 
         field.
  */
 published constants DocumentStatistic
-{
-    //-------------------------------------------------------------------------
-    // The text field displays the number of pages of the document.
-
+{ 
+    //------------------------------------------------------------------------- 
+    // The text field displays the number of pages of the document. 
+    
     // DocMerge: empty anyway
-    const short PAGES = 0;
-
-    //-------------------------------------------------------------------------
-    // The text field displays the number of paragraphs of the document.
-
+    const short PAGES = 0; 
+ 
+    //------------------------------------------------------------------------- 
+    // The text field displays the number of paragraphs of the document. 
+    
     // DocMerge: empty anyway
-    const short PARAS = 1;
-
-    //-------------------------------------------------------------------------
-    // The text field words the number of paragraphs of the document.
-
+    const short PARAS = 1; 
+ 
+    //------------------------------------------------------------------------- 
+    // The text field words the number of paragraphs of the document. 
+    
     // DocMerge: empty anyway
-    const short WORDS = 2;
-
-    //-------------------------------------------------------------------------
-    // The text field characters the number of paragraphs of the document.
-
+    const short WORDS = 2; 
+ 
+    //------------------------------------------------------------------------- 
+    // The text field characters the number of paragraphs of the document. 
+    
     // DocMerge: empty anyway
-    const short CHARS = 3;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short CHARS = 3; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/Endnote.idl b/offapi/com/sun/star/text/Endnote.idl
index 0e4c64fdc2a9..9b4e0f216b7d 100644
--- a/offapi/com/sun/star/text/Endnote.idl
+++ b/offapi/com/sun/star/text/Endnote.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/EndnoteSettings.idl b/offapi/com/sun/star/text/EndnoteSettings.idl
index d64f55850a75..bc02e44fdcb8 100644
--- a/offapi/com/sun/star/text/EndnoteSettings.idl
+++ b/offapi/com/sun/star/text/EndnoteSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/FilenameDisplayFormat.idl b/offapi/com/sun/star/text/FilenameDisplayFormat.idl
index 38e937d8843a..3853d25a025b 100644
--- a/offapi/com/sun/star/text/FilenameDisplayFormat.idl
+++ b/offapi/com/sun/star/text/FilenameDisplayFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_FilenameDisplayFormat_idl__
-#define __com_sun_star_text_FilenameDisplayFormat_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_FilenameDisplayFormat_idl__ 
+#define __com_sun_star_text_FilenameDisplayFormat_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::text::FilenameDisplayFormat
-/** These constants are used to specify which parts of an URL are displayed
+/** These constants are used to specify which parts of an URL are displayed 
         in a field.
  */
 published constants FilenameDisplayFormat
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::FilenameDisplayFormat::FULL
     /** The content of the URL is completely displayed.
      */
-    const short FULL = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short FULL = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::FilenameDisplayFormat::PATH
     /** Only the path of the file is displayed.
      */
-    const short PATH = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short PATH = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::FilenameDisplayFormat::NAME
     /** Only the name of the file without the file extension is displayed.
      */
-    const short NAME = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short NAME = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::FilenameDisplayFormat::NAME_AND_EXT
     /** The file name including the file extension is displayed.
      */
-    const short NAME_AND_EXT = 3;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short NAME_AND_EXT = 3; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/FontEmphasis.idl b/offapi/com/sun/star/text/FontEmphasis.idl
index 2953afb80a60..a9aa7c7f5cbc 100644
--- a/offapi/com/sun/star/text/FontEmphasis.idl
+++ b/offapi/com/sun/star/text/FontEmphasis.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/FontRelief.idl b/offapi/com/sun/star/text/FontRelief.idl
index 96020038322c..378cd0b8ef77 100644
--- a/offapi/com/sun/star/text/FontRelief.idl
+++ b/offapi/com/sun/star/text/FontRelief.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/Footnote.idl b/offapi/com/sun/star/text/Footnote.idl
index 3e23ff718f3c..df126fbe15a1 100644
--- a/offapi/com/sun/star/text/Footnote.idl
+++ b/offapi/com/sun/star/text/Footnote.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -58,7 +58,7 @@ published service Footnote
 
     */
     interface com::sun::star::text::XText;
-    /** contains an internal identifier for the use as SequenceNumber property in reference fields.
+    /**	contains an internal identifier for the use as SequenceNumber property in reference fields.
      @see com.sun.star.text.textfield.GetReference.
      */
     [optional, readonly, property]short ReferenceId;
diff --git a/offapi/com/sun/star/text/FootnoteNumbering.idl b/offapi/com/sun/star/text/FootnoteNumbering.idl
index 55b4f5ddd9e4..be1f6de4273b 100644
--- a/offapi/com/sun/star/text/FootnoteNumbering.idl
+++ b/offapi/com/sun/star/text/FootnoteNumbering.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_FootnoteNumbering_idl__
-#define __com_sun_star_text_FootnoteNumbering_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_FootnoteNumbering_idl__ 
+#define __com_sun_star_text_FootnoteNumbering_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::text::FootnoteNumbering
 /** These constants are used to specify the footnote numbering.
  */
 published constants FootnoteNumbering
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::FootnoteNumbering::PER_PAGE
     /** The counter of the automatic footnote numbering restarts each page.
      */
-    const short PER_PAGE = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short PER_PAGE = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::FootnoteNumbering::PER_CHAPTER
-    /** The counter of the automatic footnote numbering restarts each
+    /** The counter of the automatic footnote numbering restarts each 
                 chapter.
      */
-    const short PER_CHAPTER = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short PER_CHAPTER = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::FootnoteNumbering::PER_DOCUMENT
     /** The counter of the automatic footnote numbering does not restart.
      */
-    const short PER_DOCUMENT = 2;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short PER_DOCUMENT = 2; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/FootnoteSettings.idl b/offapi/com/sun/star/text/FootnoteSettings.idl
index e11354bd1b7c..858b4f75c917 100644
--- a/offapi/com/sun/star/text/FootnoteSettings.idl
+++ b/offapi/com/sun/star/text/FootnoteSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/Footnotes.idl b/offapi/com/sun/star/text/Footnotes.idl
index d43811059d09..c68b2d5dde35 100644
--- a/offapi/com/sun/star/text/Footnotes.idl
+++ b/offapi/com/sun/star/text/Footnotes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_Footnotes_idl__
-#define __com_sun_star_text_Footnotes_idl__
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_Footnotes_idl__ 
+#define __com_sun_star_text_Footnotes_idl__ 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::Footnotes
 /** provides access to the footnotes or endnotes of a (text)
     document.
  */
 published service Footnotes
-{
-
-
+{ 
+ 
+     
     // DocMerge from xml: service com::sun::star::text::Footnotes: interface com::sun::star::container::XIndexAccess
     /** provides access to the footnotes of the document.
      */
-    interface com::sun::star::container::XIndexAccess;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::container::XIndexAccess; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/GenericTextDocument.idl b/offapi/com/sun/star/text/GenericTextDocument.idl
index c1562b5ddf49..f9ece957cc1b 100644
--- a/offapi/com/sun/star/text/GenericTextDocument.idl
+++ b/offapi/com/sun/star/text/GenericTextDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -148,7 +148,7 @@ published service GenericTextDocument
         manager.
      */
     interface com::sun::star::lang::XMultiServiceFactory;
-
+    
     interface com::sun::star::text::XTextDocument;
 
     interface com::sun::star::util::XSearchable;
diff --git a/offapi/com/sun/star/text/GlobalDocument.idl b/offapi/com/sun/star/text/GlobalDocument.idl
index 2e71c7ad3736..a2229f2b1630 100644
--- a/offapi/com/sun/star/text/GlobalDocument.idl
+++ b/offapi/com/sun/star/text/GlobalDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/GlobalSettings.idl b/offapi/com/sun/star/text/GlobalSettings.idl
index b0948f4a3f7b..fe564da6a323 100644
--- a/offapi/com/sun/star/text/GlobalSettings.idl
+++ b/offapi/com/sun/star/text/GlobalSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/GraphicCrop.idl b/offapi/com/sun/star/text/GraphicCrop.idl
index b697662cff16..7570541dc4aa 100644
--- a/offapi/com/sun/star/text/GraphicCrop.idl
+++ b/offapi/com/sun/star/text/GraphicCrop.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_GraphicCrop_idl__
-#define __com_sun_star_text_GraphicCrop_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_GraphicCrop_idl__ 
+#define __com_sun_star_text_GraphicCrop_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::text::GraphicCrop
 /** describes the cropping of graphic objects.
     Cropping means to show only parts of the object.
-
-
-
+    
+    
+    
     <p>Negative values cut the visible area; positive values
     extend the visible area by filling it with background color.
     The absolute sum of top and bottom crop must be smaller
     than the objects original height.  The absolute sum of the left and
     right crop must be smaller than the object's original width.
-
+    
     </p>
     <p>If this property is applied to a graphic object, then this object
     will correct these values if necessary.
@@ -56,33 +56,33 @@ published struct GraphicCrop
     // DocMerge from xml: field com::sun::star::text::GraphicCrop::Top
     /** contains the top value to cut (if negative) or to extend (if positive)
      */
-    long Top;
-
-    //-------------------------------------------------------------------------
-
+    long Top; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::text::GraphicCrop::Bottom
     /** contains the bottom value to cut (if negative) or to extend (if positive)
      */
-    long Bottom;
-
-    //-------------------------------------------------------------------------
-
+    long Bottom; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::text::GraphicCrop::Left
     /** contains the left value to cut (if negative) or to extend (if positive)
      */
-    long Left;
-
-    //-------------------------------------------------------------------------
-
+    long Left; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::text::GraphicCrop::Right
     /** contains the right value to cut (if negative) or to extend (if positive)
      */
-    long Right;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    long Right; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/HoriOrientation.idl b/offapi/com/sun/star/text/HoriOrientation.idl
index 6ec443a97613..e8ab1f45c251 100644
--- a/offapi/com/sun/star/text/HoriOrientation.idl
+++ b/offapi/com/sun/star/text/HoriOrientation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,89 +24,89 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_HoriOrientation_idl__
-#define __com_sun_star_text_HoriOrientation_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_HoriOrientation_idl__ 
+#define __com_sun_star_text_HoriOrientation_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::text::HoriOrientation
 /** These enumeration values specify the horizontal orientation.
  */
 published constants HoriOrientation
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::HoriOrientation::NONE
-    /** no hard alignment is applied.
-
-                <p>For text tables this means that the tables position is
-                defined by the left and right margins.
-
-                <p>For frame objects (text frames, graphics,...) this means
+    /** no hard alignment is applied. 
+                 
+                <p>For text tables this means that the tables position is 
+                defined by the left and right margins. 
+                 
+                <p>For frame objects (text frames, graphics,...) this means 
                 that the position is defined by a left offset.
      */
-    const short NONE = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short NONE = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::HoriOrientation::RIGHT
     /** The object is aligned at the right side.
      */
-    const short RIGHT = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short RIGHT = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::HoriOrientation::CENTER
     /** The object is aligned at the middle.
      */
-    const short CENTER = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short CENTER = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::HoriOrientation::LEFT
     /** The object is aligned at the left side.
      */
-    const short LEFT = 3;
-
-    //-------------------------------------------------------------------------
-
+    const short LEFT = 3; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::HoriOrientation::INSIDE
     /** TODO
-     */
-    const short INSIDE = 4;
-
-    //-------------------------------------------------------------------------
-
+     */ 
+    const short INSIDE = 4; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::HoriOrientation::OUTSIDE
     /** TODO
      */
-    const short OUTSIDE = 5;
-
-    //-------------------------------------------------------------------------
-
+    const short OUTSIDE = 5; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::HoriOrientation::FULL
     /** The object uses the full space (for text tables only).
      */
-    const short FULL = 6;
-
-    //-------------------------------------------------------------------------
-
+    const short FULL = 6; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::HoriOrientation::LEFT_AND_WIDTH
-    /** The left offset and the width of the object are defined.
-                <p> For text tables this means that the tables position is
+    /** The left offset and the width of the object are defined. 
+                <p> For text tables this means that the tables position is 
                 defined by the left margin and the width.
      */
-    const short LEFT_AND_WIDTH = 7;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short LEFT_AND_WIDTH = 7; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/HoriOrientationFormat.idl b/offapi/com/sun/star/text/HoriOrientationFormat.idl
index fddba556387f..cfc96b927e6b 100644
--- a/offapi/com/sun/star/text/HoriOrientationFormat.idl
+++ b/offapi/com/sun/star/text/HoriOrientationFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,25 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_HoriOrientationFormat_idl__
-#define __com_sun_star_text_HoriOrientationFormat_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_HoriOrientationFormat_idl__ 
+#define __com_sun_star_text_HoriOrientationFormat_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::text::HoriOrientationFormat
 /** describes the horizontal orientation of an object.
-
-
-
+    
+    
+    
     <p>If <code>HorizontalOrientation == HORI_NONE</code>, then the value
     "XPos" describes the distance from the left border of the context.
     Otherwise "XPos" is ignored.
-
+    
     </p>
     <p>The following flags are used to adapt the position of the object
     to odd and even pages. If "PositionToggle" is set, then the
@@ -54,34 +54,34 @@ published struct HoriOrientationFormat
     /** contains the distance from the left border. Only valid if
         the property HorizontalOrientation contains the value HORI_NONE.
      */
-    long XPos;
-
-    //-------------------------------------------------------------------------
-
+    long XPos; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::text::HoriOrientationFormat::HorizontalOrientation
     /** determines the horizontal alignment of an object.
         The values refer to com::sun::star::HoriOrientation.
      */
-    short HorizontalOrientation;
-
-    //-------------------------------------------------------------------------
-
+    short HorizontalOrientation; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::text::HoriOrientationFormat::HorizontalRelation
     /** determines the reference position of the horizontal alignment.@see com::sun::star::text::RelOrientation
      */
-    short HorizontalRelation;
-
-    //-------------------------------------------------------------------------
-
+    short HorizontalRelation; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::text::HoriOrientationFormat::PositionToggle
     /** determines if the orientation toggles between left and right pages.
      */
-    boolean PositionToggle;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean PositionToggle; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/HorizontalAdjust.idl b/offapi/com/sun/star/text/HorizontalAdjust.idl
index 4a440a68bd40..b6713103e1be 100644
--- a/offapi/com/sun/star/text/HorizontalAdjust.idl
+++ b/offapi/com/sun/star/text/HorizontalAdjust.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_HorizontalAdjust_idl__
-#define __com_sun_star_text_HorizontalAdjust_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_HorizontalAdjust_idl__ 
+#define __com_sun_star_text_HorizontalAdjust_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::text::HorizontalAdjust
 /** enumeration values define the horizontal adjustments of objects.
  */
 published enum HorizontalAdjust
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::text::HorizontalAdjust::LEFT
     /** the object is left adjusted.
      */
-    LEFT,
-
-    //-------------------------------------------------------------------------
-
+    LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::text::HorizontalAdjust::CENTER
     /** the object is adjusted to the center.
      */
-    CENTER,
-
-    //-------------------------------------------------------------------------
-
+    CENTER, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::text::HorizontalAdjust::RIGHT
     /** the object is right adjusted.
      */
-    RIGHT
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    RIGHT 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/HypertextDocument.idl b/offapi/com/sun/star/text/HypertextDocument.idl
index 57e4ad874c38..f71e6b195ecc 100644
--- a/offapi/com/sun/star/text/HypertextDocument.idl
+++ b/offapi/com/sun/star/text/HypertextDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_HypertextDocument_idl__
-#define __com_sun_star_text_HypertextDocument_idl__
-
-#ifndef __com_sun_star_text_TextDocument_idl__
-#include <com/sun/star/text/TextDocument.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextGraphicObjectsSupplier_idl__
-#include <com/sun/star/text/XTextGraphicObjectsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextEmbeddedObjectsSupplier_idl__
-#include <com/sun/star/text/XTextEmbeddedObjectsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextTablesSupplier_idl__
-#include <com/sun/star/text/XTextTablesSupplier.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_HypertextDocument_idl__ 
+#define __com_sun_star_text_HypertextDocument_idl__ 
+ 
+#ifndef __com_sun_star_text_TextDocument_idl__ 
+#include <com/sun/star/text/TextDocument.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XTextGraphicObjectsSupplier_idl__ 
+#include <com/sun/star/text/XTextGraphicObjectsSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XTextEmbeddedObjectsSupplier_idl__ 
+#include <com/sun/star/text/XTextEmbeddedObjectsSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XTextTablesSupplier_idl__ 
+#include <com/sun/star/text/XTextTablesSupplier.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::HypertextDocument
 /** is an extension of a text document which
     can also contain tables and certain kinds of embedded objects
@@ -59,23 +59,23 @@
         use <type>TextDocument</type> instead.
  */
 published service HypertextDocument
-{
+{ 
     // DocMerge: empty anyway
-    service com::sun::star::text::TextDocument;
-
+    service com::sun::star::text::TextDocument; 
+    
     // DocMerge: empty anyway
-    interface com::sun::star::text::XTextGraphicObjectsSupplier;
-
+    interface com::sun::star::text::XTextGraphicObjectsSupplier; 
+    
     // DocMerge: empty anyway
-    interface com::sun::star::text::XTextEmbeddedObjectsSupplier;
-
+    interface com::sun::star::text::XTextEmbeddedObjectsSupplier; 
+    
     // DocMerge: empty anyway
-    interface com::sun::star::text::XTextTablesSupplier;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::text::XTextTablesSupplier; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/IllustrationsIndex.idl b/offapi/com/sun/star/text/IllustrationsIndex.idl
index 004fbd356e21..750ac1bdc26b 100644
--- a/offapi/com/sun/star/text/IllustrationsIndex.idl
+++ b/offapi/com/sun/star/text/IllustrationsIndex.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
 module com { module sun { module star { module text {
 
 //=============================================================================
-/** specifies service of illustration indexes within a document.
+/**	specifies service of illustration indexes within a document.
     @see com::sun::star::text::BaseIndex
 */
 published service IllustrationsIndex
diff --git a/offapi/com/sun/star/text/InContentMetadata.idl b/offapi/com/sun/star/text/InContentMetadata.idl
index 5eac10714576..d08c534b333d 100755
--- a/offapi/com/sun/star/text/InContentMetadata.idl
+++ b/offapi/com/sun/star/text/InContentMetadata.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/InvalidTextContentException.idl b/offapi/com/sun/star/text/InvalidTextContentException.idl
index 08dba3fb86c8..8cdc027ce2e2 100644
--- a/offapi/com/sun/star/text/InvalidTextContentException.idl
+++ b/offapi/com/sun/star/text/InvalidTextContentException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_InvalidTextContentException_idl__
-#define __com_sun_star_text_InvalidTextContentException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextContent_idl__
-#include <com/sun/star/text/XTextContent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_InvalidTextContentException_idl__ 
+#define __com_sun_star_text_InvalidTextContentException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XTextContent_idl__ 
+#include <com/sun/star/text/XTextContent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::text::InvalidTextContentException
 /** is thrown whenever a method gets a <type>TextContent</type>
     as an actual argument when the text content cannot be used for that
     operation.
  */
 published exception InvalidTextContentException: com::sun::star::uno::Exception
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::text::InvalidTextContentException::TextContent
     /** contains the interface of the text content that caused the exception.
      */
-    com::sun::star::text::XTextContent TextContent;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    com::sun::star::text::XTextContent TextContent; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/LabelFollow.idl b/offapi/com/sun/star/text/LabelFollow.idl
index 59fe72c9cb7b..2c7d6310d04c 100644
--- a/offapi/com/sun/star/text/LabelFollow.idl
+++ b/offapi/com/sun/star/text/LabelFollow.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/LineNumberingProperties.idl b/offapi/com/sun/star/text/LineNumberingProperties.idl
index 5a965b100963..8b93d946bb2f 100644
--- a/offapi/com/sun/star/text/LineNumberingProperties.idl
+++ b/offapi/com/sun/star/text/LineNumberingProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/LineNumberingSettings.idl b/offapi/com/sun/star/text/LineNumberingSettings.idl
index 3a33757feaa2..0fe604028f61 100644
--- a/offapi/com/sun/star/text/LineNumberingSettings.idl
+++ b/offapi/com/sun/star/text/LineNumberingSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,88 +24,88 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_LineNumberingSettings_idl__
-#define __com_sun_star_text_LineNumberingSettings_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_LineNumberingSettings_idl__ 
+#define __com_sun_star_text_LineNumberingSettings_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** provides access to the settings of the line numbering.
     @deprecated
 
     Actually there never was an implementation for this service.
  */
 published service LineNumberingSettings
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** If <TRUE/>, line numbering is used.
      */
-    [property] boolean On;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean On; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The name of the character style that is used for the line number.
      */
-    [property] string CharStyle;
-
-    //-------------------------------------------------------------------------
-
+    [property] string CharStyle; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If <TRUE/>, empty lines are counted.
      */
-    [property] boolean CountEmptyLines;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean CountEmptyLines; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** If <TRUE/>, lines in frames are included in counting.
      */
-    [property] boolean CountLinesInFrames;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the distance between the line number and the start or
+    [property] boolean CountLinesInFrames; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the distance between the line number and the start or 
         end of the text area.
      */
-    [property] long Distance;
-
-    //-------------------------------------------------------------------------
-
+    [property] long Distance; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** Line numbers are shown on every <var>LineInterval</var>th line.
      */
-    [property] short LineInterval;
-
-    //-------------------------------------------------------------------------
-
+    [property] short LineInterval; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the symbol that is shown between the line numbers.
      */
-    [property] string LineSeparator;
-
-    //-------------------------------------------------------------------------
-
+    [property] string LineSeparator; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The line separator is shown every <var>SeparatorLineDistance</var>th line.
      */
-    [property] short SeparatorLineDistance;
-
-    //-------------------------------------------------------------------------
-
+    [property] short SeparatorLineDistance; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the position of the line number
         (constant <type scope="com::sun::star::style::">LineNumberPosition</type> - left/right/inside/outside).
      */
-    [property] short NumberPosition;
-
-    //-------------------------------------------------------------------------
-
+    [property] short NumberPosition; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the type of the numbering.
      */
-    [property] short NumberingType;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-#endif
+    [property] short NumberingType; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+#endif 
diff --git a/offapi/com/sun/star/text/MailMerge.idl b/offapi/com/sun/star/text/MailMerge.idl
index beb4fedf3d26..e6ad3968f635 100644
--- a/offapi/com/sun/star/text/MailMerge.idl
+++ b/offapi/com/sun/star/text/MailMerge.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,15 +62,15 @@
 published service MailMerge
 {
     /** interface to execute the mail merge action.
-
+     
         <p>The <member scope="com::sun::star::task">XJob::execute</member>
         method of the interface accepts exactly the same properties
         as provided by this service in its argument sequence.</p>
-
+     
         <p>The default values for the properties to be used in the method
-        call are those given by this service. If a property is also listed
+        call are those given by this service. If a property is also listed 
         in the argument sequence that value will be used for the call.
-        The value of the property in this service will remain unchanged
+        The value of the property in this service will remain unchanged 
         by that.</p>
      */
     interface com::sun::star::task::XJob;
@@ -82,10 +82,10 @@ published service MailMerge
     /** interface to notify mail merge listeners.
      */
     [optional] interface com::sun::star::text::XMailMergeBroadcaster;
-
+    
     //=============================================================================
 
-    /* database properties */
+    /* database properties */        
 
     //=============================================================================
     /** allows to specify the data which the mail merge should be based on.
@@ -97,36 +97,36 @@ published service MailMerge
     */
     service com::sun::star::sdb::DataAccessDescriptor;
 
-    /** contains the name of the data source that is to be used for merging.
+    /** contains the name of the data source that is to be used for merging. 
 
         <p>For the interaction of this property with other data access relevant properties, see
         the <type scope="com::sun::star::sdb">DataAccessDescriptor</type> service.</p>
      */
     [property] string DataSourceName;
-
+        
     //=============================================================================
 
-    /** determines the type of the database command as
+    /** determines the type of the database command as 
         described in <type scope="com::sun::star::sdb">CommandType</type>
-
+        
         <p>For the interaction of this property with other data access relevant properties, see
         the <type scope="com::sun::star::sdb">DataAccessDescriptor</type> service.</p>
      */
     [property] long CommandType;
-
+        
     //=============================================================================
 
     /** contains the database command.
-
+        
         <p>For the interaction of this property with other data access relevant properties, see
         the <type scope="com::sun::star::sdb">DataAccessDescriptor</type> service.</p>
      */
     [property] string Command;
-
+        
     //=============================================================================
 
-    /** provides access to a
-        <type scope="com::sun::star::sdbc">XResultSet</type> of
+    /** provides access to a 
+        <type scope="com::sun::star::sdbc">XResultSet</type> of 
         a <type scope="com::sun::star::sdbc">ResultSet</type> service.
 
         <p>Note that any superservices of <type scope="com::sun::star::sdbc">ResultSet</type>
@@ -140,16 +140,16 @@ published service MailMerge
         the <type scope="com::sun::star::sdb">DataAccessDescriptor</type> service.</p>
      */
     [property] com::sun::star::sdbc::XResultSet ResultSet;
-
+        
     //=============================================================================
 
-    /** contains the connection to the database.
+    /** contains the connection to the database. 
 
         <p>For the interaction of this property with other data access relevant properties, see
         the <type scope="com::sun::star::sdb">DataAccessDescriptor</type> service.</p>
      */
     [property] com::sun::star::sdbc::XConnection ActiveConnection;
-
+        
     //=============================================================================
 
     /** contains a selection that refers to bookmarks of the ResultSet.
@@ -167,20 +167,20 @@ published service MailMerge
         the <type scope="com::sun::star::sdb">DataAccessDescriptor</type> service.</p>
      */
     [property] sequence< any > Selection;
-
+        
     //=============================================================================
 
     /** returns if escape processing is on or off.
-
+     
         <p>For the interaction of this property with other data access relevant properties, see
         the <type scope="com::sun::star::sdb">DataAccessDescriptor</type> service.</p>
      */
     [property] boolean EscapeProcessing;
-
+        
     //=============================================================================
 
     /** contains a filter expression for an SQL statement.
-
+        
         <p>For the interaction of this property with other data access relevant properties, see
         the <type scope="com::sun::star::sdb">DataAccessDescriptor</type> service.</p>
      */
@@ -189,19 +189,19 @@ published service MailMerge
     //=============================================================================
 
     /* input properties */
-
+    
     //=============================================================================
 
-    /** contains the URL of a text document that is to be processed.
-
+    /** contains the URL of a text document that is to be processed. 
+        
         <p>If this property is not set an empty document is created.</p>
      */
     [property] string DocumentURL;
-
+        
     //=============================================================================
 
     /** provides access to the model of the document to be processed.
-
+     
         <p>This property will automatically be set to the documents model
         if a document URL was set.</p>
      */
@@ -210,11 +210,11 @@ published service MailMerge
     //=============================================================================
 
     /* output properties */
-
+    
     //=============================================================================
 
-    /** determines the destination of the mail merge action.
-
+    /** determines the destination of the mail merge action. 
+     
         @see com::sun::star::text::MailMergeType
      */
     [property] short OutputType;
@@ -222,47 +222,47 @@ published service MailMerge
     //=============================================================================
 
     /** determines whether single print jobs will be generated per output document.
-
+        
         <p>This property is only evaluated for printer output.</p>
      */
     [property] boolean SinglePrintJobs;
 
     //=============================================================================
 
-    /** contains the path where generated files are created.
-
+    /** contains the path where generated files are created. 
+        
         <p>If "OutputURL" or "FileNamePrefix" are empty the missing value is
         generated from the location or title of the source documents.</p>
-
+        
         <p>This property is only evaluated for file output.</p>
      */
     [property] string OutputURL;
 
     //=============================================================================
 
-    /** determines whether file names of created files are generated using
+    /** determines whether file names of created files are generated using 
         the content of a database column.
-
+        
         <p>This property is only evaluated for file output.</p>
      */
     [property] boolean FileNameFromColumn;
 
     //=============================================================================
 
-    /** contains the name of the column to generate the output file names.
-
-        <p>If FileNameFromColumn is true the content of the related column
+    /** contains the name of the column to generate the output file names. 
+        
+        <p>If FileNameFromColumn is true the content of the related column 
         is added to the OutputURL.</p>
         <p>If "OutputURL" or "FileNamePrefix" are empty the missing value is
         generated from the location or title of the source documents.</p>
-
+     
         <p>This property is only evaluated for file output.</p>
      */
     [property] string FileNamePrefix;
 
     //=============================================================================
-
-    /** Contains the password of the outgoing mail server. It is necessary to set this
+    
+    /** Contains the password of the outgoing mail server. It is necessary to set this 
         if the password is not already stored in the configuration for security reasons.
 
         <p>This property is only evaluated for e-Mail output.</p>
@@ -271,9 +271,9 @@ published service MailMerge
     */
     [property, optional] string OutServerPassword;
     //=============================================================================
-
-    /** Contains the password of the incoming mail server. It is necessary to set this
-        if the mail server configuration is set to 'SMTP after POP' authentication and
+    
+    /** Contains the password of the incoming mail server. It is necessary to set this 
+        if the mail server configuration is set to 'SMTP after POP' authentication and 
         the password is not already stored in the configuration for security reasons.
 
         <p>This property is only evaluated for e-Mail output.</p>
@@ -282,19 +282,19 @@ published service MailMerge
     */
     [property, optional] string InServerPassword;
     //=============================================================================
-
-    /** contains the subject of the e-Mail message.
-
+  
+    /** contains the subject of the e-Mail message.  
+        
         <p>This property is only evaluated for e-Mail output.</p>
         @since OOo 2.0
     */
     [property, optional] string Subject;
 
     //=============================================================================
-
-    /** contains the name of the data base column that contains the e-Mail address
+    
+    /** contains the name of the data base column that contains the e-Mail address 
         to the e-Mail to.
-
+        
         <p>This property is only evaluated for e-Mail output.</p>
 
         @since OOo 2.0
@@ -302,10 +302,10 @@ published service MailMerge
     [property, optional] string AddressFromColumn;
 
     //=============================================================================
-
-    /** determines that the created mail merge document is sent as body in HTML format.
+    
+    /** determines that the created mail merge document is sent as body in HTML format. 
         This property is only valid if the propery "SendAsAttachment" is set to <false/>.
-
+        
         <p>This property is only evaluated for e-Mail output.</p>
 
         @since OOo 2.0
@@ -315,8 +315,8 @@ published service MailMerge
     //=============================================================================
 
 
-    /** determines that the created mail merge document is sent as attachment.
-
+    /** determines that the created mail merge document is sent as attachment.  
+        
         <p>This property is only evaluated for e-Mail output.</p>
 
         @since OOo 2.0
@@ -324,9 +324,9 @@ published service MailMerge
     [property, optional] boolean SendAsAttachment;
 
     //=============================================================================
-
-    /** contains the text of the mail body.
-        This property is only valid if the property "SendAsAttachment" is set to <true/>
+    
+    /** contains the text of the mail body. 
+        This property is only valid if the property "SendAsAttachment" is set to <true/> 
         <p>This property is only evaluated for e-Mail output.</p>
 
         @since OOo 2.0
@@ -334,10 +334,10 @@ published service MailMerge
     [property, optional] string MailBody;
 
     //=============================================================================
-
-    /** contains the name of the attachment.
+    
+    /** contains the name of the attachment. 
         This property is only valid if "SendAsAttachment" is set to <true/>.
-
+        
         <p>This property is only evaluated for e-Mail output.</p>
 
         @since OOo 2.0
@@ -345,8 +345,8 @@ published service MailMerge
     [property, optional] string AttachmentName;
 
     //=============================================================================
-
-    /** contains the name of the document filter to save the attached mail merge document.
+    
+    /** contains the name of the document filter to save the attached mail merge document. 
         This property is only valid if "SendAsAttachment" is set to <true/>.
 
         <p>This property is only evaluated for e-Mail output.</p>
@@ -356,8 +356,8 @@ published service MailMerge
     [property, optional] string AttachmentFilter;
 
     //=============================================================================
-
-    /** contains a list of e-Mail addresses to
+    
+    /** contains a list of e-Mail addresses to  
         <p>This property is only evaluated for e-Mail output.</p>
 
         @since OOo 2.0
@@ -365,18 +365,18 @@ published service MailMerge
     [property, optional] sequence< string > CopiesTo;
 
     //=============================================================================
-
-    /**
+    
+    /** 
         <p>This property is only evaluated for e-Mail output.</p>
 
         @since OOo 2.0
     */
     [property, optional] sequence< string > BlindCopiesTo;
 
-
+  
     //=============================================================================
-
-    /** determines that the output of the mail merge is save in one single file.
+    
+    /** determines that the output of the mail merge is save in one single file.  
         <p>This property is only evaluated for file output.</p>
 
         @since OOo 2.0
@@ -384,7 +384,7 @@ published service MailMerge
     [property, optional] boolean SaveAsSingleFile;
 
     //=============================================================================
-
+    
     /** contains the name of the document filter to save the output file(s).
         <p>This property is only evaluated for file output.</p>
 
@@ -393,9 +393,9 @@ published service MailMerge
     [property, optional] string SaveFilter;
 
     //=============================================================================
-
-    /** contains the properties that are defined in <com::sun::star::view::PrintOptions>.
-
+    
+    /** contains the properties that are defined in <com::sun::star::view::PrintOptions>. 
+    
         <p>This property is only evaluated for printer output.</p>
 
         @since OOo 2.0
@@ -404,7 +404,7 @@ published service MailMerge
 
 };
 
-
+        
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/text/MailMergeEvent.idl b/offapi/com/sun/star/text/MailMergeEvent.idl
index 564ff0bfcf07..29682641efd2 100644
--- a/offapi/com/sun/star/text/MailMergeEvent.idl
+++ b/offapi/com/sun/star/text/MailMergeEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/MailMergeType.idl b/offapi/com/sun/star/text/MailMergeType.idl
index 0bac2eba47e2..88478267b126 100644
--- a/offapi/com/sun/star/text/MailMergeType.idl
+++ b/offapi/com/sun/star/text/MailMergeType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/NotePrintMode.idl b/offapi/com/sun/star/text/NotePrintMode.idl
index 263acfc2b1b3..c9a9f0ff2b3a 100644
--- a/offapi/com/sun/star/text/NotePrintMode.idl
+++ b/offapi/com/sun/star/text/NotePrintMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,55 +24,55 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_NotePrintMode_idl__
-#define __com_sun_star_text_NotePrintMode_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_NotePrintMode_idl__ 
+#define __com_sun_star_text_NotePrintMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::text::NotePrintMode
 /** enumeration values are used to define the printing of notes in a
     document.
  */
 published enum NotePrintMode
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::text::NotePrintMode::NOT
     /** Notes are not printed.
      */
-    NOT,
-
-    //-------------------------------------------------------------------------
-
+    NOT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::text::NotePrintMode::ONLY
     /** Only notes are printed.
      */
-    ONLY,
-
-    //-------------------------------------------------------------------------
-
+    ONLY, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::text::NotePrintMode::DOC_END
     /** Notes are collected at the end of the document.
      */
-    DOC_END,
-
-    //-------------------------------------------------------------------------
-
+    DOC_END, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::text::NotePrintMode::PAGE_END
     /** Notes are collected at the end of a page and printed on an inserted page.
      */
-    PAGE_END
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    PAGE_END 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/NumberingLevel.idl b/offapi/com/sun/star/text/NumberingLevel.idl
index 9443a9a2740e..f6b51b5c9102 100644
--- a/offapi/com/sun/star/text/NumberingLevel.idl
+++ b/offapi/com/sun/star/text/NumberingLevel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/NumberingRules.idl b/offapi/com/sun/star/text/NumberingRules.idl
index 352c58d2cf40..bf86f5db1301 100644
--- a/offapi/com/sun/star/text/NumberingRules.idl
+++ b/offapi/com/sun/star/text/NumberingRules.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/NumberingStyle.idl b/offapi/com/sun/star/text/NumberingStyle.idl
index 53573c606ade..d201585bc679 100644
--- a/offapi/com/sun/star/text/NumberingStyle.idl
+++ b/offapi/com/sun/star/text/NumberingStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/ObjectIndex.idl b/offapi/com/sun/star/text/ObjectIndex.idl
index 037bed653cd2..702af955c290 100644
--- a/offapi/com/sun/star/text/ObjectIndex.idl
+++ b/offapi/com/sun/star/text/ObjectIndex.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,59 +24,59 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-
-#ifndef __com_sun_star_text_ObjectIndex_idl__
-#define __com_sun_star_text_ObjectIndex_idl__
-
-#include <com/sun/star/text/BaseIndex.idl>
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+ 
+ 
+#ifndef __com_sun_star_text_ObjectIndex_idl__ 
+#define __com_sun_star_text_ObjectIndex_idl__ 
+ 
+#include <com/sun/star/text/BaseIndex.idl> 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::ObjectIndex
 /** specifies service of object indexes within a document.@see com::sun::star::text::BaseIndex
  */
 published service ObjectIndex
-{
+{ 
     // DocMerge: empty anyway
-    service  com::sun::star::text::BaseIndex;
-
-    /** Determines if star office math objects are included in the office.
-     */
+    service  com::sun::star::text::BaseIndex; 
+ 
+    /** Determines if star office math objects are included in the office. 
+     */ 
     // DocMerge: empty anyway
-    [optional, property] boolean CreateFromStarMath;//objects
-    /** Determines if star office image objects are included in the office.
+    [optional, property] boolean CreateFromStarMath;//objects 
+    /** Determines if star office image objects are included in the office. 
      */
     // DocMerge: empty anyway
-    [optional, property] boolean CreateFromStarImage;//objects
-    /** Determines if star office chart objects are included in the office.
-     */
+    [optional, property] boolean CreateFromStarImage;//objects 
+    /** Determines if star office chart objects are included in the office. 
+     */ 
     // DocMerge: empty anyway
-    [optional, property] boolean CreateFromStarChart;//objects
-    /** Determines if star office calc objects are included in the office.
-     */
+    [optional, property] boolean CreateFromStarChart;//objects 
+    /** Determines if star office calc objects are included in the office. 
+     */ 
     // DocMerge: empty anyway
-    [optional, property] boolean CreateFromStarCalc;//objects
-    /** Determines if star office draw objects are included in the office.
-     */
+    [optional, property] boolean CreateFromStarCalc;//objects 
+    /** Determines if star office draw objects are included in the office. 
+     */ 
     // DocMerge: empty anyway
-    [optional, property] boolean CreateFromStarDraw;//objects
-    /** Determines if external embedded objects are included in the office.
-     */
+    [optional, property] boolean CreateFromStarDraw;//objects 
+    /** Determines if external embedded objects are included in the office. 
+     */ 
     // DocMerge: empty anyway
-    [optional, property] boolean CreateFromOtherEmbeddedObjects;//objects
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
-
-
-
-
+    [optional, property] boolean CreateFromOtherEmbeddedObjects;//objects 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
+ 
+ 
+ 
+ 
diff --git a/offapi/com/sun/star/text/PageFootnoteInfo.idl b/offapi/com/sun/star/text/PageFootnoteInfo.idl
index e8f1931cc95a..224dd3bab8f1 100644
--- a/offapi/com/sun/star/text/PageFootnoteInfo.idl
+++ b/offapi/com/sun/star/text/PageFootnoteInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,83 +24,83 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_PageFootnoteInfo_idl__
-#define __com_sun_star_text_PageFootnoteInfo_idl__
-
-#ifndef __com_sun_star_text_HorizontalAdjust_idl__
-#include <com/sun/star/text/HorizontalAdjust.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_PageFootnoteInfo_idl__ 
+#define __com_sun_star_text_PageFootnoteInfo_idl__ 
+ 
+#ifndef __com_sun_star_text_HorizontalAdjust_idl__ 
+#include <com/sun/star/text/HorizontalAdjust.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::PageFootnoteInfo
 /** specifies the properties of the footnote area of a page or a
     page style.
  */
 published service PageFootnoteInfo
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::PageFootnoteInfo::FootnoteHeight
     /** contains the maximum height of the footnote section.
-
-
-
+        
+        
+        
         <p>If 0, the maximum is the height of the page.</p>
      */
-    [property] long FootnoteHeight;
-
-    //-------------------------------------------------------------------------
-
+    [property] long FootnoteHeight; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::PageFootnoteInfo::FootnoteSeparatorLineWidth
     /** contains the relative width of the footnote separator line.
      */
-    [property] long FootnoteSeparatorLineWidth;
-
-    //-------------------------------------------------------------------------
-
+    [property] long FootnoteSeparatorLineWidth; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::PageFootnoteInfo::FootnoteTopDistance
     /** contains the distance between the text and footnote section.
      */
-    [property] long FootnoteTopDistance;
-
-    //-------------------------------------------------------------------------
-
+    [property] long FootnoteTopDistance; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::PageFootnoteInfo::FootnoteBottomDistance
     /** contains the distance between the separator line and the footnote section.
      */
-    [property] long FootnoteBottomDistance;
-
-    //-------------------------------------------------------------------------
-
+    [property] long FootnoteBottomDistance; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::PageFootnoteInfo::FootnoteSeparatorLineWidthPercent
     /** contains the relative width of the footnote separator line.
      */
-    [property] short FootnoteSeparatorLineWidthPercent;
-
-    //-------------------------------------------------------------------------
-
+    [property] short FootnoteSeparatorLineWidthPercent; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::PageFootnoteInfo::FootnoteSeparatorLineAdjust
     /** contains the adjustment of the footnote separator line.
      */
-    [property] com::sun::star::text::HorizontalAdjust FootnoteSeparatorLineAdjust;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::text::HorizontalAdjust FootnoteSeparatorLineAdjust; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::PageFootnoteInfo::FootnoteSeparatorLinePenWidth
     /** contains the width of the pen for the footnote separator line.
      */
-    [property] short FootnoteSeparatorLinePenWidth;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] short FootnoteSeparatorLinePenWidth; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/PageNumberType.idl b/offapi/com/sun/star/text/PageNumberType.idl
index 380dbd5c28ce..47494e43bf8c 100644
--- a/offapi/com/sun/star/text/PageNumberType.idl
+++ b/offapi/com/sun/star/text/PageNumberType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/PagePrintSettings.idl b/offapi/com/sun/star/text/PagePrintSettings.idl
index ce31045f619b..bee2258c0c6d 100644
--- a/offapi/com/sun/star/text/PagePrintSettings.idl
+++ b/offapi/com/sun/star/text/PagePrintSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,89 +24,89 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_PagePrintSettings_idl__
-#define __com_sun_star_text_PagePrintSettings_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_PagePrintSettings_idl__ 
+#define __com_sun_star_text_PagePrintSettings_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::PagePrintSettings
-/** These properties describe the way the <type>XPagePrintable</type> interface
+/** These properties describe the way the <type>XPagePrintable</type> interface 
     prints the page on one printer page.
  */
 published service PagePrintSettings
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::PagePrintSettings::PageRows
     /** contains the number of pages per printed column of pages.
      */
-    [property] short PageRows;
-
-    //-------------------------------------------------------------------------
-
+    [property] short PageRows; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::PagePrintSettings::PageColumns
     /** contains the number of pages per printed row of pages.
      */
-    [property] short PageColumns;
-
-    //-------------------------------------------------------------------------
-
+    [property] short PageColumns; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::PagePrintSettings::LeftMargin
     /** contains the left margin of the printer page.
      */
-    [property] long LeftMargin;
-
-    //-------------------------------------------------------------------------
-
+    [property] long LeftMargin; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::PagePrintSettings::RightMargin
     /** contains the right margin of the printer page.
      */
-    [property] long RightMargin;
-
-    //-------------------------------------------------------------------------
-
+    [property] long RightMargin; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::PagePrintSettings::TopMargin
     /** contains the top margin of the printer page.
      */
-    [property] long TopMargin;
-
-    //-------------------------------------------------------------------------
-
+    [property] long TopMargin; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::PagePrintSettings::BottomMargin
     /** contains the right margin of the printer page.
      */
-    [property] long BottomMargin;
-
-    //-------------------------------------------------------------------------
-
+    [property] long BottomMargin; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::PagePrintSettings::HoriMargin
     /** contains the margin between the rows of printed pages.
      */
-    [property] long HoriMargin;
-
-    //-------------------------------------------------------------------------
-
+    [property] long HoriMargin; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::PagePrintSettings::VertMargin
     /** contains the margin between the columns of printed pages.
      */
-    [property] long VertMargin;
-
-    //-------------------------------------------------------------------------
-
+    [property] long VertMargin; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::PagePrintSettings::IsLandscape
     /** defines if the printer page is used in landscape format.
      */
-    [property] boolean IsLandscape;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] boolean IsLandscape; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/Paragraph.idl b/offapi/com/sun/star/text/Paragraph.idl
index 4c8330eb1f06..0602db4c9aee 100644
--- a/offapi/com/sun/star/text/Paragraph.idl
+++ b/offapi/com/sun/star/text/Paragraph.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/ParagraphEnumeration.idl b/offapi/com/sun/star/text/ParagraphEnumeration.idl
index 9e2ec8253e34..bb11718abbc3 100644
--- a/offapi/com/sun/star/text/ParagraphEnumeration.idl
+++ b/offapi/com/sun/star/text/ParagraphEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_ParagraphEnumeration_idl__
-#define __com_sun_star_text_ParagraphEnumeration_idl__
-
-#ifndef __com_sun_star_container_XEnumeration_idl__
-#include <com/sun/star/container/XEnumeration.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_ParagraphEnumeration_idl__ 
+#define __com_sun_star_text_ParagraphEnumeration_idl__ 
+ 
+#ifndef __com_sun_star_container_XEnumeration_idl__ 
+#include <com/sun/star/container/XEnumeration.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::ParagraphEnumeration
-/** provides access to the paragraphs of an <type>XText</type>
+/** provides access to the paragraphs of an <type>XText</type> 
     interface.
  */
 published service ParagraphEnumeration
-{
-
-
+{ 
+ 
+     
     // DocMerge from xml: service com::sun::star::text::ParagraphEnumeration: interface com::sun::star::container::XEnumeration
     /** provides access to the paragraph objects.
      */
-    interface com::sun::star::container::XEnumeration;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::container::XEnumeration; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/ParagraphVertAlign.idl b/offapi/com/sun/star/text/ParagraphVertAlign.idl
index 65d1a5b69dc2..5e47f343140a 100644
--- a/offapi/com/sun/star/text/ParagraphVertAlign.idl
+++ b/offapi/com/sun/star/text/ParagraphVertAlign.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/PlaceholderType.idl b/offapi/com/sun/star/text/PlaceholderType.idl
index 979bb2e62237..5e7f66e107cc 100644
--- a/offapi/com/sun/star/text/PlaceholderType.idl
+++ b/offapi/com/sun/star/text/PlaceholderType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_PlaceholderType_idl__
-#define __com_sun_star_text_PlaceholderType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_PlaceholderType_idl__ 
+#define __com_sun_star_text_PlaceholderType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::text::PlaceholderType
 /** These constants define how the place-holder text fields act in a document.
  */
 published constants PlaceholderType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::PlaceholderType::TEXT
     /** The field represents a piece of text.
      */
-    const short TEXT = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short TEXT = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::PlaceholderType::TABLE
     /** The field initiates the insertion of a text table.
      */
-    const short TABLE = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short TABLE = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::PlaceholderType::TEXTFRAME
     /** The field initiates the insertion of a text frame.
      */
-    const short TEXTFRAME = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short TEXTFRAME = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::PlaceholderType::GRAPHIC
     /** The field initiates the insertion of a graphic object.
      */
-    const short GRAPHIC = 3;
-
-    //-------------------------------------------------------------------------
-
+    const short GRAPHIC = 3; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::PlaceholderType::OBJECT
     /** The field initiates the insertion of an embedded object.
      */
-    const short OBJECT = 4;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short OBJECT = 4; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/PositionAndSpaceMode.idl b/offapi/com/sun/star/text/PositionAndSpaceMode.idl
index 86102b0ddfbe..f7a4f03a6fd7 100644
--- a/offapi/com/sun/star/text/PositionAndSpaceMode.idl
+++ b/offapi/com/sun/star/text/PositionAndSpaceMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/PositionLayoutDir.idl b/offapi/com/sun/star/text/PositionLayoutDir.idl
index 72e420876171..3be27611945d 100644
--- a/offapi/com/sun/star/text/PositionLayoutDir.idl
+++ b/offapi/com/sun/star/text/PositionLayoutDir.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/PrintPreviewSettings.idl b/offapi/com/sun/star/text/PrintPreviewSettings.idl
index 392143d061a7..bec086e30694 100644
--- a/offapi/com/sun/star/text/PrintPreviewSettings.idl
+++ b/offapi/com/sun/star/text/PrintPreviewSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_PrintPreviewSettings_idl__
-#define __com_sun_star_text_PrintPreviewSettings_idl__
-
-#ifndef __com_sun_star_text_NotePrintMode_idl__
-#include <com/sun/star/text/NotePrintMode.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_PrintPreviewSettings_idl__ 
+#define __com_sun_star_text_PrintPreviewSettings_idl__ 
+ 
+#ifndef __com_sun_star_text_NotePrintMode_idl__ 
+#include <com/sun/star/text/NotePrintMode.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** These properties describe the printing of the content of a text document.
  */
 published service PrintPreviewSettings
-{
+{ 
     /** All properties have the property attribute 'maybevoid'
     meaning: if none of them have been set, they all will return a void value, if any
     one of them has been set, then none of them will be void any longer */
@@ -57,10 +57,10 @@ published service PrintPreviewSettings
 
     /** Size of the bottom margin */
     [property, maybevoid] long PreviewPrintBottomMargin;
-
+    
     /** Size of the horizontal spacing */
     [property, maybevoid] long PreviewPrintHorizontalSpacing;
-
+    
     [property, maybevoid] long PreviewPrintVerticalSpacing;
 
     /** Number of Rows */
@@ -71,10 +71,10 @@ published service PrintPreviewSettings
 
     /** If the format is landscape (if false then the format is portrait */
     [property, maybevoid] boolean PreviewPrintLandscape;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/PrintSettings.idl b/offapi/com/sun/star/text/PrintSettings.idl
index 82f55f3bc2b6..5a246581514f 100644
--- a/offapi/com/sun/star/text/PrintSettings.idl
+++ b/offapi/com/sun/star/text/PrintSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/RedlinePortion.idl b/offapi/com/sun/star/text/RedlinePortion.idl
index c399d976e04a..42f0524ffd51 100644
--- a/offapi/com/sun/star/text/RedlinePortion.idl
+++ b/offapi/com/sun/star/text/RedlinePortion.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/ReferenceFieldPart.idl b/offapi/com/sun/star/text/ReferenceFieldPart.idl
index ab7bb5ac3c00..1dde7c707152 100644
--- a/offapi/com/sun/star/text/ReferenceFieldPart.idl
+++ b/offapi/com/sun/star/text/ReferenceFieldPart.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/ReferenceFieldSource.idl b/offapi/com/sun/star/text/ReferenceFieldSource.idl
index 1f25dd2502dd..11ef41f2172e 100644
--- a/offapi/com/sun/star/text/ReferenceFieldSource.idl
+++ b/offapi/com/sun/star/text/ReferenceFieldSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/ReferenceMark.idl b/offapi/com/sun/star/text/ReferenceMark.idl
index 1dc073beacdb..1820a813c633 100644
--- a/offapi/com/sun/star/text/ReferenceMark.idl
+++ b/offapi/com/sun/star/text/ReferenceMark.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module text {
+module com { module sun { module star { module text { 
 
 //=============================================================================
 /** is used for cross references in text documents.
@@ -52,6 +52,6 @@ published service ReferenceMark
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/text/ReferenceMarks.idl b/offapi/com/sun/star/text/ReferenceMarks.idl
index bbc38ec21eef..08aaa0d1d61d 100644
--- a/offapi/com/sun/star/text/ReferenceMarks.idl
+++ b/offapi/com/sun/star/text/ReferenceMarks.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module text {
+module com { module sun { module star { module text { 
 
 //=============================================================================
 /** provides access to the reference marks in a document.
@@ -52,6 +52,6 @@ published service ReferenceMarks
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/text/RelOrientation.idl b/offapi/com/sun/star/text/RelOrientation.idl
index eb30a465a1f6..ffe57851b306 100644
--- a/offapi/com/sun/star/text/RelOrientation.idl
+++ b/offapi/com/sun/star/text/RelOrientation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/RubyAdjust.idl b/offapi/com/sun/star/text/RubyAdjust.idl
index 0f86bc8e887d..33334f6d1a12 100644
--- a/offapi/com/sun/star/text/RubyAdjust.idl
+++ b/offapi/com/sun/star/text/RubyAdjust.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/SectionFileLink.idl b/offapi/com/sun/star/text/SectionFileLink.idl
index 025488b03a15..c15335719b94 100644
--- a/offapi/com/sun/star/text/SectionFileLink.idl
+++ b/offapi/com/sun/star/text/SectionFileLink.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_SectionFileLink_idl__
-#define __com_sun_star_text_SectionFileLink_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_SectionFileLink_idl__ 
+#define __com_sun_star_text_SectionFileLink_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::text::SectionFileLink
 /** describes the link for a text section.
-
-
-
+    
+    
+    
     <p>If the URL is an empty string, then the section is not linked.
-
+    
     </p>
     <p>The bookmark of the URL (after the "#") is the name of a bookmark
     or a section name in the linked document.  If a bookmark or section
@@ -58,19 +58,19 @@ published struct SectionFileLink
     // DocMerge from xml: field com::sun::star::text::SectionFileLink::FileURL
     /** contains the URL of the linked file.
      */
-    string FileURL;
-
-    //-------------------------------------------------------------------------
-
+    string FileURL; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::text::SectionFileLink::FilterName
     /** contains the name of the file filter that is used to load the linked file.
      */
-    string FilterName;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string FilterName; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/SetVariableType.idl b/offapi/com/sun/star/text/SetVariableType.idl
index aadb3286ee1d..30f077d6f4da 100644
--- a/offapi/com/sun/star/text/SetVariableType.idl
+++ b/offapi/com/sun/star/text/SetVariableType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_SetVariableType_idl__
-#define __com_sun_star_text_SetVariableType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_SetVariableType_idl__ 
+#define __com_sun_star_text_SetVariableType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::text::SetVariableType
 /** These constants define the type of a variable text field.
  */
 published constants SetVariableType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::SetVariableType::VAR
     /** specifies a simple variable.
      */
-    const short VAR = 0;
-    //-------------------------------------------------------------------------
-
+    const short VAR = 0; 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::SetVariableType::SEQUENCE
     /** specifies a number sequence field.
      */
-    const short SEQUENCE = 1;
-    //-------------------------------------------------------------------------
-
+    const short SEQUENCE = 1; 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::SetVariableType::FORMULA
     /** specifies a formula field.
      */
-    const short FORMULA = 2;
-    //-------------------------------------------------------------------------
-
+    const short FORMULA = 2; 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::SetVariableType::STRING
     /** specifies a string field.
      */
-    const short STRING = 3;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short STRING = 3; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/Shape.idl b/offapi/com/sun/star/text/Shape.idl
index 43d64efcf9c9..12a63b2e3ae9 100644
--- a/offapi/com/sun/star/text/Shape.idl
+++ b/offapi/com/sun/star/text/Shape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/SizeType.idl b/offapi/com/sun/star/text/SizeType.idl
index 879e75b11523..152de8415e09 100644
--- a/offapi/com/sun/star/text/SizeType.idl
+++ b/offapi/com/sun/star/text/SizeType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,52 +24,52 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_SizeType_idl__
-#define __com_sun_star_text_SizeType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_SizeType_idl__ 
+#define __com_sun_star_text_SizeType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::text::SizeType
-/** The height value of objects like text frames or table rows may
-        be interpreted in different ways.
-
-        <p>The values may specify the absolute height (SIZETYPE_FIX), the
-        minimum height (SIZETYPE_MIN), or they are ignored (SIZETYPE_VAR),
-        in which case the real height depends on the content. This information
+/** The height value of objects like text frames or table rows may 
+        be interpreted in different ways. 
+     
+        <p>The values may specify the absolute height (SIZETYPE_FIX), the 
+        minimum height (SIZETYPE_MIN), or they are ignored (SIZETYPE_VAR), 
+        in which case the real height depends on the content. This information 
         is contained in a property called "SizeType".
  */
 published constants SizeType
-{
-    //-------------------------------------------------------------------------
-    // The height of the object is determind by the content only.
-
+{ 
+    //------------------------------------------------------------------------- 
+    // The height of the object is determind by the content only. 
+    
     // DocMerge: empty anyway
-    const short VARIABLE = 0;
-
-    //-------------------------------------------------------------------------
-    // The height property determins the height of the object.
-
+    const short VARIABLE = 0; 
+ 
+    //------------------------------------------------------------------------- 
+    // The height property determins the height of the object. 
+    
     // DocMerge: empty anyway
-    const short FIX = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short FIX = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::SizeType::MIN
-    /** The height property determines the minimum height of the object, but the
+    /** The height property determines the minimum height of the object, but the 
              actual height will be increased if the content demands it.
      */
-    const short MIN = 2;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    const short MIN = 2; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/TableColumnSeparator.idl b/offapi/com/sun/star/text/TableColumnSeparator.idl
index 6c15897bd57d..547349f5be9a 100644
--- a/offapi/com/sun/star/text/TableColumnSeparator.idl
+++ b/offapi/com/sun/star/text/TableColumnSeparator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,19 +24,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_TableColumnSeparator_idl__
-#define __com_sun_star_text_TableColumnSeparator_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_TableColumnSeparator_idl__ 
+#define __com_sun_star_text_TableColumnSeparator_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 /** The width of the cells of a text table is defined by the position
     of the separator between neighboring cells.
-
+    
     <p>If cells of the table are merged, this separator is not removed, but
     it is hidden.
     </p>
@@ -44,22 +44,22 @@
     <p>A text table or a text table row provides the separators in a
     sequence of <type>TableColumnSeparator</type>s. If the table only
     consists of one column, then this sequence is empty.
-
+    
     </p>
     <p>The real width of a table depends on the environment (page style and
     number of text columns at the table's position, alignment, and left and
     right margins).  For that reason, the table column separator does not
     contain metric values for the column widths. The values are relative
     to the value of the property <member>TextTable::TableColumnRelativeSum</member>.
-
+    
     </p>
     <p>A table provides this property only if all rows have the same structure.
     If the table does not provide the property, then it cannot be set using.
     </p>
 
-    <p>The state of <member>TableColumnSeparator::IsVisible</member> and the
-    count of the sequence must be the same in as it was in.
-    Hidden separators cannot be moved and they cannot be overtaken by visible
+    <p>The state of <member>TableColumnSeparator::IsVisible</member> and the 
+    count of the sequence must be the same in as it was in. 
+    Hidden separators cannot be moved and they cannot be overtaken by visible 
     separators.</p>
 
     @see com::sun::star::text::TextTable
@@ -68,19 +68,19 @@ published struct TableColumnSeparator
 {
     /** contains the position of the separator.
      */
-    short Position;
-
-    //-------------------------------------------------------------------------
-
+    short Position; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the separator is visible.
      */
-    boolean IsVisible;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    boolean IsVisible; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/TableColumns.idl b/offapi/com/sun/star/text/TableColumns.idl
index bb83142f18ee..b89cdf80ce81 100644
--- a/offapi/com/sun/star/text/TableColumns.idl
+++ b/offapi/com/sun/star/text/TableColumns.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/TableIndex.idl b/offapi/com/sun/star/text/TableIndex.idl
index 88df41899776..52507a59b6d9 100644
--- a/offapi/com/sun/star/text/TableIndex.idl
+++ b/offapi/com/sun/star/text/TableIndex.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-
-#ifndef __com_sun_star_text_TableIndex_idl__
-#define __com_sun_star_text_TableIndex_idl__
-
-#include <com/sun/star/text/BaseIndex.idl>
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+ 
+ 
+#ifndef __com_sun_star_text_TableIndex_idl__ 
+#define __com_sun_star_text_TableIndex_idl__ 
+ 
+#include <com/sun/star/text/BaseIndex.idl> 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 /** specifies service of table indexes within a document.
     @see com::sun::star::text::BaseIndex
  */
 published service TableIndex
-{
-    service  com::sun::star::text::BaseIndex;
-
+{ 
+    service  com::sun::star::text::BaseIndex; 
+ 
     //-------------------------------------------------------------------------
-    /** determines if the name or the label of an object is used to create the index.
-     */
-    [optional, property] boolean CreateFromLabels; //tables, illustrations
-
+    /** determines if the name or the label of an object is used to create the index. 
+     */ 
+    [optional, property] boolean CreateFromLabels; //tables, illustrations 
+    
     //-------------------------------------------------------------------------
-    /** determines the name of the sequence field that is evaluated to create the index.
-     */
-    [optional, property] string LabelCategory; //tables, illustrations
-
+    /** determines the name of the sequence field that is evaluated to create the index. 
+     */ 
+    [optional, property] string LabelCategory; //tables, illustrations 
+    
     //-------------------------------------------------------------------------
-    /** determines the way the paragraph containing a label is included in the index.
+    /** determines the way the paragraph containing a label is included in the index. 
         @see ReferenceFieldPart allowed constant values: only TEXT, CATEGORY_AND_NUMBER and
         ONLY_CAPTION
-     */
-    [optional, property] short LabelDisplayType;//tables, illustrations
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
-
-
+     */ 
+    [optional, property] short LabelDisplayType;//tables, illustrations 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
+ 
+ 
diff --git a/offapi/com/sun/star/text/TableRows.idl b/offapi/com/sun/star/text/TableRows.idl
index f3989d11a891..48df1d5f64ed 100644
--- a/offapi/com/sun/star/text/TableRows.idl
+++ b/offapi/com/sun/star/text/TableRows.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/TemplateDisplayFormat.idl b/offapi/com/sun/star/text/TemplateDisplayFormat.idl
index 00733c721010..9469ceb3518b 100644
--- a/offapi/com/sun/star/text/TemplateDisplayFormat.idl
+++ b/offapi/com/sun/star/text/TemplateDisplayFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,68 +24,68 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_TemplateDisplayFormat_idl__
-#define __com_sun_star_text_TemplateDisplayFormat_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_TemplateDisplayFormat_idl__ 
+#define __com_sun_star_text_TemplateDisplayFormat_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::text::TemplateDisplayFormat
-/** These constants are used to specify which information about a template is
+/** These constants are used to specify which information about a template is 
         displayed in a field.
  */
 published constants TemplateDisplayFormat
-{
-    //-------------------------------------------------------------------------
-    // The complete path of the file will be displayed.
-
+{ 
+    //------------------------------------------------------------------------- 
+    // The complete path of the file will be displayed. 
+    
     // DocMerge: empty anyway
-    const short FULL = 0;
-
-    //-------------------------------------------------------------------------
-    // Only the path of the template file will be displayed.
-
+    const short FULL = 0; 
+ 
+    //------------------------------------------------------------------------- 
+    // Only the path of the template file will be displayed. 
+    
     // DocMerge: empty anyway
-    const short PATH = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short PATH = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::TemplateDisplayFormat::NAME
-    /** Only the file name, without file extension, of the template
+    /** Only the file name, without file extension, of the template 
                 file will be displayed.
      */
-    const short NAME = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short NAME = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::TemplateDisplayFormat::NAME_AND_EXT
-    /** The file name and the file extension of the template
+    /** The file name and the file extension of the template 
                 file will be displayed.
      */
-    const short NAME_AND_EXT = 3;
-
-    //-------------------------------------------------------------------------
-
+    const short NAME_AND_EXT = 3; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::TemplateDisplayFormat::AREA
     /** The name of the template area is displayed.
      */
-    const short AREA = 4;
-
-    //-------------------------------------------------------------------------
-
+    const short AREA = 4; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::TemplateDisplayFormat::TITLE
     /** The title of the template file is displayed.
      */
-    const short TITLE = 5;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short TITLE = 5; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/Text.idl b/offapi/com/sun/star/text/Text.idl
index bf3b26d0f943..14f7bd758e49 100644
--- a/offapi/com/sun/star/text/Text.idl
+++ b/offapi/com/sun/star/text/Text.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/TextColumn.idl b/offapi/com/sun/star/text/TextColumn.idl
index 3eb67e459bce..ed710e10200d 100644
--- a/offapi/com/sun/star/text/TextColumn.idl
+++ b/offapi/com/sun/star/text/TextColumn.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,55 +24,55 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_TextColumn_idl__
-#define __com_sun_star_text_TextColumn_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_TextColumn_idl__ 
+#define __com_sun_star_text_TextColumn_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::text::TextColumn
 /** defines a single text column.
  */
 published struct TextColumn
 {
     // DocMerge from xml: field com::sun::star::text::TextColumn::Width
-    /** contains the relative width of the column, including both margins.
-
-
+    /** contains the relative width of the column, including both margins. 
+        
+        
         Width isn't a metric value, its a relative value to the sum of the width of all columns.
      */
-    long Width;
-
-    //-------------------------------------------------------------------------
-
+    long Width; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::text::TextColumn::LeftMargin
-    /** contains the left margin of the column.
-
-
-
+    /** contains the left margin of the column. 
+        
+        
+        
         <p>This is a metric value.</p>
      */
-    long LeftMargin;
-
-    //-------------------------------------------------------------------------
-
+    long LeftMargin; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::text::TextColumn::RightMargin
-    /** contains the right margin of the column.
-
-
-
+    /** contains the right margin of the column. 
+        
+        
+        
         <p>This is a metric value.</p>
      */
-    long RightMargin;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    long RightMargin; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/TextColumnSequence.idl b/offapi/com/sun/star/text/TextColumnSequence.idl
index f580489f89ad..8494098fe119 100644
--- a/offapi/com/sun/star/text/TextColumnSequence.idl
+++ b/offapi/com/sun/star/text/TextColumnSequence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module text {
+module com { module sun { module star { module text { 
 
 //=============================================================================
 /**
@@ -42,6 +42,6 @@ published typedef sequence<TextColumn> TextColumnSequence;
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/text/TextColumns.idl b/offapi/com/sun/star/text/TextColumns.idl
index b233348277d0..0070af7d1192 100644
--- a/offapi/com/sun/star/text/TextColumns.idl
+++ b/offapi/com/sun/star/text/TextColumns.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -60,7 +60,7 @@ published service TextColumns
     [readonly, property]  boolean IsAutomatic;
     //------------------------------------------------------------------------
     /** contains the distance between the columns. It is valid if the property IsAutomatic is set.
- <!-- The h -->Half of this distance is set to the left and right margins of all columns,
+ <!-- The h -->Half of this distance is set to the left and right margins of all columns, 
     except for the left margin of the first column, and the right margin of the last column.*/
     [property]  long AutomaticDistance;
     //------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/text/TextContent.idl b/offapi/com/sun/star/text/TextContent.idl
index 4efab8af7377..6d2cc5e835fa 100644
--- a/offapi/com/sun/star/text/TextContent.idl
+++ b/offapi/com/sun/star/text/TextContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ module com { module sun { module star { module text {
 
 //=============================================================================
 /** is an object which can be anchored in a text, like instances of
-    <type>TextFrame</type> or <type>TextField</type>.
+    <type>TextFrame</type> or <type>TextField</type>. 
 
     <p>If the concrete <type>TextContent</type> has a textual
     representation which fades into the surrounding text, then
diff --git a/offapi/com/sun/star/text/TextContentAnchorType.idl b/offapi/com/sun/star/text/TextContentAnchorType.idl
index b9db2fb30225..a24bd5aa0400 100644
--- a/offapi/com/sun/star/text/TextContentAnchorType.idl
+++ b/offapi/com/sun/star/text/TextContentAnchorType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,75 +24,75 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_TextContentAnchorType_idl__
-#define __com_sun_star_text_TextContentAnchorType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_TextContentAnchorType_idl__ 
+#define __com_sun_star_text_TextContentAnchorType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::text::TextContentAnchorType
 /** specify how the text content is attached to its
     surrounding text.
  */
 published enum TextContentAnchorType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::text::TextContentAnchorType::AT_PARAGRAPH
     /** The anchor of the object is set at the top left position of the paragraph.
      */
-    AT_PARAGRAPH,
-
-    //-------------------------------------------------------------------------
-
+    AT_PARAGRAPH, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::text::TextContentAnchorType::AS_CHARACTER
     /** The object is anchored instead of a character.
-
-
-
+        
+        
+        
         <p>The size of the object influences the height of the text line.</p>
      */
-    AS_CHARACTER,
-
-    //-------------------------------------------------------------------------
-
+    AS_CHARACTER, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::text::TextContentAnchorType::AT_PAGE
     /** The object is anchored to the page.
-
-
-
+        
+        
+        
         <p>The position does not change if the content of the document is changed.</p>
      */
-    AT_PAGE,
-
-    //-------------------------------------------------------------------------
-
+    AT_PAGE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::text::TextContentAnchorType::AT_FRAME
     /** The object is anchored to a text frame.
      */
-    AT_FRAME,
-
-    //-------------------------------------------------------------------------
-
+    AT_FRAME, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::text::TextContentAnchorType::AT_CHARACTER
     /** The object is anchored to a character.
-
-
-
+        
+        
+        
         <p>The position of the object changes if the position of this
         character is changed.
         </p>
      */
-    AT_CHARACTER
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    AT_CHARACTER 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/TextContentCollection.idl b/offapi/com/sun/star/text/TextContentCollection.idl
index 602a6adb1fdb..602e690b5618 100644
--- a/offapi/com/sun/star/text/TextContentCollection.idl
+++ b/offapi/com/sun/star/text/TextContentCollection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_TextContentCollection_idl__
-#define __com_sun_star_text_TextContentCollection_idl__
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainer_idl__
-#include <com/sun/star/container/XContainer.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_TextContentCollection_idl__ 
+#define __com_sun_star_text_TextContentCollection_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XContainer_idl__ 
+#include <com/sun/star/container/XContainer.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::TextContentCollection
 /** Objects of this type are collections of text contents of the same type.@see Text
  */
 published service TextContentCollection
-{
-
-
+{ 
+ 
+     
     // DocMerge from xml: service com::sun::star::text::TextContentCollection: interface com::sun::star::container::XNameAccess
-    /** Each text content is accessible by its name, which is unique
+    /** Each text content is accessible by its name, which is unique  
                 within the collection.
      */
-    interface com::sun::star::container::XNameAccess;
-
-
+    interface com::sun::star::container::XNameAccess; 
+ 
+     
     // DocMerge from xml: service com::sun::star::text::TextContentCollection: interface com::sun::star::container::XContainer
-    /** The insertion and removal of text contents of this type are
+    /** The insertion and removal of text contents of this type are 
                 broadcasted via this interface.
      */
-    interface com::sun::star::container::XContainer;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::container::XContainer; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/TextCursor.idl b/offapi/com/sun/star/text/TextCursor.idl
index 2882fd5ab2fa..c7902f989c6e 100644
--- a/offapi/com/sun/star/text/TextCursor.idl
+++ b/offapi/com/sun/star/text/TextCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/TextDocument.idl b/offapi/com/sun/star/text/TextDocument.idl
index 586fc917e6f3..7db6e291d933 100644
--- a/offapi/com/sun/star/text/TextDocument.idl
+++ b/offapi/com/sun/star/text/TextDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/TextDocumentView.idl b/offapi/com/sun/star/text/TextDocumentView.idl
index cd87a4f31404..a3d8800f6787 100644
--- a/offapi/com/sun/star/text/TextDocumentView.idl
+++ b/offapi/com/sun/star/text/TextDocumentView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_TextDocumentView_idl__
-#define __com_sun_star_text_TextDocumentView_idl__
-
-#ifndef __com_sun_star_view_OfficeDocumentView_idl__
-#include <com/sun/star/view/OfficeDocumentView.idl>
-#endif
-
-#ifndef __com_sun_star_view_XViewSettingsSupplier_idl__
-#include <com/sun/star/view/XViewSettingsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextViewCursorSupplier_idl__
-#include <com/sun/star/text/XTextViewCursorSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_TextDocumentView_idl__ 
+#define __com_sun_star_text_TextDocumentView_idl__ 
+ 
+#ifndef __com_sun_star_view_OfficeDocumentView_idl__ 
+#include <com/sun/star/view/OfficeDocumentView.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_view_XViewSettingsSupplier_idl__ 
+#include <com/sun/star/view/XViewSettingsSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XTextViewCursorSupplier_idl__ 
+#include <com/sun/star/text/XTextViewCursorSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** specifies the view of a <type>TextDocument</type>.
  */
 published service TextDocumentView
-{
-    service com::sun::star::view::OfficeDocumentView;
-
-
+{ 
+    service com::sun::star::view::OfficeDocumentView; 
+ 
+     
     /** This interface permits access to the properties of the view.
      */
-    interface com::sun::star::view::XViewSettingsSupplier;
-
-
-    /** This interface makes it possible to access the cursor which belongs
+    interface com::sun::star::view::XViewSettingsSupplier; 
+ 
+     
+    /** This interface makes it possible to access the cursor which belongs 
                 to the view and can be visible for the user.
      */
-    interface com::sun::star::text::XTextViewCursorSupplier;
-
+    interface com::sun::star::text::XTextViewCursorSupplier; 
+ 
 
     /** Gives access to the objects properties.
-
+        
         @since OOo 2.0
      */
-    [optional] interface com::sun::star::beans::XPropertySet;
+    [optional] interface com::sun::star::beans::XPropertySet; 
 
 
     //-------------------------------------------------------------------------
@@ -83,7 +83,7 @@ published service TextDocumentView
         @since OOo 2.0
      */
     [optional, property, readonly] long PageCount;
-
+    
     //-------------------------------------------------------------------------
     /** returns the number of lines in the document
 
@@ -91,30 +91,30 @@ published service TextDocumentView
         obtaining this value may take some time.</p>
 
         <p>Empty paragraphs are not counted.</p>
-
+        
         @since OOo 2.0
      */
     [optional, property, readonly] long LineCount;
-
+    
     //-------------------------------------------------------------------------
     /** specifies if spellchecking should be done while typing.
 
         @since OOo 2.0
      */
     [optional, property] boolean IsConstantSpellcheck;
-
+    
     //-------------------------------------------------------------------------
     /** specifies if the marks for misspelled text should be displayed.
 
         @since OOo 2.0
      */
     [optional, property] boolean IsHideSpellMarks;
-
+    
     //-------------------------------------------------------------------------
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/TextEmbeddedObject.idl b/offapi/com/sun/star/text/TextEmbeddedObject.idl
index 6a94586377fb..e8c27235f061 100644
--- a/offapi/com/sun/star/text/TextEmbeddedObject.idl
+++ b/offapi/com/sun/star/text/TextEmbeddedObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -58,22 +58,22 @@ published service TextEmbeddedObject
     interface com::sun::star::document::XEmbeddedObjectSupplier;
         /* If you get this property you get the CLSID of the OLE2 document stream
                 contained in this OLE2 shape. If you set it, an empty OLE2 document stream
-                with this CLSID is created within this OLE2 shape.
+                with this CLSID is created within this OLE2 shape. 
             The property can only be set as long as the object is not inserted into the document.
         */
         [property] string CLSID;
-        //-------------------------------------------------------------------------
+        //------------------------------------------------------------------------- 
 
         /** This is the model for the OLE2 object.
             <p>This property if void if the ole2 is not an
             Office component.</p>
-
+        
         */
         [readonly, maybevoid, property] com::sun::star::frame::XModel Model;
-        //-------------------------------------------------------------------------
+        //------------------------------------------------------------------------- 
 
         /** This is the component for the OLE2 object.
-
+        
         */
         [readonly, maybevoid, property] com::sun::star::lang::XComponent Component;
 };
diff --git a/offapi/com/sun/star/text/TextEmbeddedObjects.idl b/offapi/com/sun/star/text/TextEmbeddedObjects.idl
index 61d76be3db50..420a8d8a3f53 100644
--- a/offapi/com/sun/star/text/TextEmbeddedObjects.idl
+++ b/offapi/com/sun/star/text/TextEmbeddedObjects.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/TextField.idl b/offapi/com/sun/star/text/TextField.idl
index af0973009223..b4a2a6352b6b 100644
--- a/offapi/com/sun/star/text/TextField.idl
+++ b/offapi/com/sun/star/text/TextField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_TextField_idl__
-#define __com_sun_star_text_TextField_idl__
+#ifndef __com_sun_star_text_TextField_idl__ 
+#define __com_sun_star_text_TextField_idl__ 
 
 #ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextContent_idl__
-#include <com/sun/star/text/TextContent.idl>
-#endif
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
 
-#ifndef __com_sun_star_text_XTextField_idl__
-#include <com/sun/star/text/XTextField.idl>
-#endif
+#ifndef __com_sun_star_text_TextContent_idl__ 
+#include <com/sun/star/text/TextContent.idl> 
+#endif 
 
+#ifndef __com_sun_star_text_XTextField_idl__ 
+#include <com/sun/star/text/XTextField.idl> 
+#endif 
 
-//=============================================================================
 
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
+//============================================================================= 
 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** A <type>TextField</type> is a <type>TextContent</type> which fades its
     textual representation into the text range to which it is anchored.
  */
 published service TextField
-{
-    service com::sun::star::text::TextContent;
-
-
-    /** This interface is used to access the textual representation of
+{ 
+    service com::sun::star::text::TextContent; 
+ 
+     
+    /** This interface is used to access the textual representation of 
         this field.
      */
-    interface com::sun::star::text::XTextField;
-
-    /** makes it possible to access the properties of the field, if any.
+    interface com::sun::star::text::XTextField; 
+ 
+    /** makes it possible to access the properties of the field, if any. 
     */
     [optional] interface com::sun::star::beans::XPropertySet;
 
@@ -67,7 +67,7 @@ published service TextField
 
     /** specifies if the text field is actually used in the document.
 
-        <p>Not all available text fields are used, for example fields
+        <p>Not all available text fields are used, for example fields 
         that are part of unused styles.</p>
 
         @since  OOo 2.0.1
@@ -88,11 +88,11 @@ published service TextField
 
     //-------------------------------------------------------------------------
 
-};
-
-
-//=============================================================================
+}; 
 
-}; }; }; };
+ 
+//============================================================================= 
+ 
+}; }; }; };  
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/text/TextFieldEnumeration.idl b/offapi/com/sun/star/text/TextFieldEnumeration.idl
index 5502559aa0d1..a40a70d70791 100644
--- a/offapi/com/sun/star/text/TextFieldEnumeration.idl
+++ b/offapi/com/sun/star/text/TextFieldEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ published service TextFieldEnumeration
 {
     /** This interface provides access to the text fields in a text document.
      */
-    interface   ::com::sun::star::container::XEnumeration;
+    interface 	::com::sun::star::container::XEnumeration;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextFieldMaster.idl b/offapi/com/sun/star/text/TextFieldMaster.idl
index 0bb13d5373c0..2c1f496d7442 100644
--- a/offapi/com/sun/star/text/TextFieldMaster.idl
+++ b/offapi/com/sun/star/text/TextFieldMaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/TextFieldMasters.idl b/offapi/com/sun/star/text/TextFieldMasters.idl
index e176b13fbcdb..289d32070ac2 100644
--- a/offapi/com/sun/star/text/TextFieldMasters.idl
+++ b/offapi/com/sun/star/text/TextFieldMasters.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/TextFields.idl b/offapi/com/sun/star/text/TextFields.idl
index c791be596186..3e8a0637a5b0 100644
--- a/offapi/com/sun/star/text/TextFields.idl
+++ b/offapi/com/sun/star/text/TextFields.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_TextFields_idl__
-#define __com_sun_star_text_TextFields_idl__
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
-#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshable_idl__
-#include <com/sun/star/util/XRefreshable.idl>
-#endif
+#ifndef __com_sun_star_text_TextFields_idl__ 
+#define __com_sun_star_text_TextFields_idl__ 
 
-//=============================================================================
+#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
+#include <com/sun/star/container/XEnumerationAccess.idl> 
+#endif 
 
- module com {  module sun {  module star {  module text {
+#ifndef __com_sun_star_util_XRefreshable_idl__ 
+#include <com/sun/star/util/XRefreshable.idl> 
+#endif 
 
-//=============================================================================
+//============================================================================= 
 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::TextFields
 /** This is a collection of <type>TextField</type> instances.
  */
 published service TextFields
-{
-
+{ 
+     
     // DocMerge from xml: service com::sun::star::text::TextFields: interface com::sun::star::container::XEnumerationAccess
-    /** This interface makes it possible to create an enumeration through
-                all text fields in this container.
-
+    /** This interface makes it possible to create an enumeration through 
+                all text fields in this container. 
+                 
         <p>All elements are of type <type>XTextField</type>.</p>
      */
-    interface com::sun::star::container::XEnumerationAccess;
-
-
+    interface com::sun::star::container::XEnumerationAccess; 
+ 
+     
     /** makes it possible to refresh (recalculate etc.) all fields.
     */
     interface com::sun::star::util::XRefreshable;
+        
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+#endif 
diff --git a/offapi/com/sun/star/text/TextFrame.idl b/offapi/com/sun/star/text/TextFrame.idl
index e43b3d79197c..a3af145e6506 100755
--- a/offapi/com/sun/star/text/TextFrame.idl
+++ b/offapi/com/sun/star/text/TextFrame.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -107,32 +107,32 @@ published service TextFrame
     //-------------------------------------------------------------------------
     /** determines the interpretation of the height and relative
         height properties.
-
+          
             @see SizeType
      */
     [property] short SizeType;
     //-------------------------------------------------------------------------
     /** determines if the text frame should be editable in a read-only document.
-        (This is usually used in forms.)
-
+        (This is usually used in forms.) 
+          
      */
     [optional, property] boolean EditInReadonly;
-
+    
     //-------------------------------------------------------------------------
     /** determines the interpretation of the width and relative
         width properties.
-
+            
         @see    SizeType
         @since  OOo 2.4
      */
     [optional, property] short WidthType;
-
+    
     //-----------------------------------------------------------------------------
     /** contains the writing direction, as represented by the
         <type scope="com::sun::star::text">WritingMode2</type> constants
      */
     [optional, property] short WritingMode;
-
+    
     //-----------------------------------------------------------------------------
     /** controls, if the frame follows the text flow or can leave its layout environment
 
diff --git a/offapi/com/sun/star/text/TextFrames.idl b/offapi/com/sun/star/text/TextFrames.idl
index b6be445057ea..9f459d19494f 100644
--- a/offapi/com/sun/star/text/TextFrames.idl
+++ b/offapi/com/sun/star/text/TextFrames.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/TextGraphicObject.idl b/offapi/com/sun/star/text/TextGraphicObject.idl
index e3f88c0331ed..d791345b4de9 100644
--- a/offapi/com/sun/star/text/TextGraphicObject.idl
+++ b/offapi/com/sun/star/text/TextGraphicObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/TextGraphicObjects.idl b/offapi/com/sun/star/text/TextGraphicObjects.idl
index 3aff7dbdce59..8f9e3193d1e8 100644
--- a/offapi/com/sun/star/text/TextGraphicObjects.idl
+++ b/offapi/com/sun/star/text/TextGraphicObjects.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/TextGridMode.idl b/offapi/com/sun/star/text/TextGridMode.idl
index 4ab6c14c1af7..2755def888ea 100644
--- a/offapi/com/sun/star/text/TextGridMode.idl
+++ b/offapi/com/sun/star/text/TextGridMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_TextGridMode_idl__
-#define __com_sun_star_text_TextGridMode_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_TextGridMode_idl__ 
+#define __com_sun_star_text_TextGridMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 /** this set of constants describes different modes for text grids
  */
 published constants TextGridMode
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** no text grid */
     const short NONE = 0;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** line positions will be determined by the grid */
     const short LINES = 1;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** character and line positions will be determined by the grid */
     const short LINES_AND_CHARS = 2;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+
+#endif 
diff --git a/offapi/com/sun/star/text/TextLayoutCursor.idl b/offapi/com/sun/star/text/TextLayoutCursor.idl
index 0849204150fa..6ca0c6c7fa84 100644
--- a/offapi/com/sun/star/text/TextLayoutCursor.idl
+++ b/offapi/com/sun/star/text/TextLayoutCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_TextLayoutCursor_idl__
-#define __com_sun_star_text_TextLayoutCursor_idl__
-
-#ifndef __com_sun_star_text_TextCursor_idl__
-#include <com/sun/star/text/TextCursor.idl>
-#endif
+#ifndef __com_sun_star_text_TextLayoutCursor_idl__ 
+#define __com_sun_star_text_TextLayoutCursor_idl__ 
 
-#ifndef __com_sun_star_text_XPageCursor_idl__
-#include <com/sun/star/text/XPageCursor.idl>
-#endif
+#ifndef __com_sun_star_text_TextCursor_idl__ 
+#include <com/sun/star/text/TextCursor.idl> 
+#endif 
 
+#ifndef __com_sun_star_text_XPageCursor_idl__ 
+#include <com/sun/star/text/XPageCursor.idl> 
+#endif 
 
-//=============================================================================
 
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
+//============================================================================= 
 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::TextLayoutCursor
-/** A <type>TextLayoutCursor</type> is a <type>TextRange</type> which can
+/** A <type>TextLayoutCursor</type> is a <type>TextRange</type> which can 
     travel within a layout of a <type>Text</type> object.
  */
 published service TextLayoutCursor
-{
+{ 
     // DocMerge: empty anyway
-    service com::sun::star::text::TextCursor;
-
+    service com::sun::star::text::TextCursor; 
+    
     // DocMerge: empty anyway
-    interface com::sun::star::text::XPageCursor;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::text::XPageCursor; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+
+#endif 
diff --git a/offapi/com/sun/star/text/TextMarkupDescriptor.idl b/offapi/com/sun/star/text/TextMarkupDescriptor.idl
index d6f2ba9c059e..e5abc252f203 100644
--- a/offapi/com/sun/star/text/TextMarkupDescriptor.idl
+++ b/offapi/com/sun/star/text/TextMarkupDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@
 module com {  module sun {  module star {  module text {
 
 //=============================================================================
-
+    
 /** A descriptor for a single text markup.
 
     @since OOo 3.0.1
@@ -51,17 +51,17 @@ module com {  module sun {  module star {  module text {
 struct TextMarkupDescriptor
 {
     /// Type of text markup see <type>TextMarkupType</type>
-    long        nType;
-
+    long		nType;
+    
     /// A string used to identify the caller
-    string      aIdentifier;
-
+    string		aIdentifier;
+    
     /// Start of the markup range
-    long        nOffset;
-
+    long		nOffset;
+    
     /// Length of the markup range
-    long        nLength;
-
+    long		nLength;
+    
     /// contains additional information about the markup
     com::sun::star::container::XStringKeyMap xMarkupInfoContainer;
 };
diff --git a/offapi/com/sun/star/text/TextPageStyle.idl b/offapi/com/sun/star/text/TextPageStyle.idl
index 781483ecd181..05fe9065c4c8 100644
--- a/offapi/com/sun/star/text/TextPageStyle.idl
+++ b/offapi/com/sun/star/text/TextPageStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/TextPortion.idl b/offapi/com/sun/star/text/TextPortion.idl
index 6c23d9fa1655..fa43106098cb 100644
--- a/offapi/com/sun/star/text/TextPortion.idl
+++ b/offapi/com/sun/star/text/TextPortion.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/TextPortionEnumeration.idl b/offapi/com/sun/star/text/TextPortionEnumeration.idl
index 0472a874d260..f4454536e075 100644
--- a/offapi/com/sun/star/text/TextPortionEnumeration.idl
+++ b/offapi/com/sun/star/text/TextPortionEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ published service TextPortionEnumeration
 {
     /** This interface provides access to the elements of a paragraph in a text document.
      */
-    interface   ::com::sun::star::container::XEnumeration;
+    interface 	::com::sun::star::container::XEnumeration;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/TextRange.idl b/offapi/com/sun/star/text/TextRange.idl
index 7fe5d2ed37c5..8679b8b43604 100644
--- a/offapi/com/sun/star/text/TextRange.idl
+++ b/offapi/com/sun/star/text/TextRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -79,7 +79,7 @@ module com {  module sun {  module star {  module text {
     for a single paragraph. Because this is the mechanism to use to export
     data, all formatting attributes and contents bound to this range have
     to be available from implementations of this service. </p>
-
+    
     @see Text
  */
 published service TextRange
diff --git a/offapi/com/sun/star/text/TextRanges.idl b/offapi/com/sun/star/text/TextRanges.idl
index 38ecb4c18662..a6c6b33521a8 100644
--- a/offapi/com/sun/star/text/TextRanges.idl
+++ b/offapi/com/sun/star/text/TextRanges.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_TextRanges_idl__
-#define __com_sun_star_text_TextRanges_idl__
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_TextRanges_idl__ 
+#define __com_sun_star_text_TextRanges_idl__ 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::TextRanges
 /** provides a container for <type>XTextRange</type> objects.
  */
 published service TextRanges
-{
+{ 
     // DocMerge: empty anyway
-    interface com::sun::star::container::XIndexAccess;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::container::XIndexAccess; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/TextSection.idl b/offapi/com/sun/star/text/TextSection.idl
index b253f73868e4..248de3e32798 100644
--- a/offapi/com/sun/star/text/TextSection.idl
+++ b/offapi/com/sun/star/text/TextSection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/TextSections.idl b/offapi/com/sun/star/text/TextSections.idl
index de333df8afeb..7a2011e0e418 100644
--- a/offapi/com/sun/star/text/TextSections.idl
+++ b/offapi/com/sun/star/text/TextSections.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_TextSections_idl__
-#define __com_sun_star_text_TextSections_idl__
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_TextSections_idl__ 
+#define __com_sun_star_text_TextSections_idl__ 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::TextSections
 /** provides access to the text sections in a text document.
  */
 published service TextSections
-{
+{ 
     // DocMerge: empty anyway
-    interface com::sun::star::container::XIndexAccess;
-
+    interface com::sun::star::container::XIndexAccess; 
+    
     // DocMerge: empty anyway
-    interface com::sun::star::container::XNameAccess;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::container::XNameAccess; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/TextSortDescriptor.idl b/offapi/com/sun/star/text/TextSortDescriptor.idl
index 19993c5fc442..0d5df55951b4 100644
--- a/offapi/com/sun/star/text/TextSortDescriptor.idl
+++ b/offapi/com/sun/star/text/TextSortDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,120 +24,120 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_TextSortDescriptor_idl__
-#define __com_sun_star_text_TextSortDescriptor_idl__
-
-#ifndef __com_sun_star_util_SortDescriptor_idl__
-#include <com/sun/star/util/SortDescriptor.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_TextSortDescriptor_idl__ 
+#define __com_sun_star_text_TextSortDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_util_SortDescriptor_idl__ 
+#include <com/sun/star/util/SortDescriptor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::TextSortDescriptor
 /** describes sort criteria for sorting text.
 
     @deprecated
  */
 published service TextSortDescriptor
-{
+{ 
     // DocMerge: empty anyway
-    service com::sun::star::util::SortDescriptor;
-
-    //-------------------------------------------------------------------------
-
+    service com::sun::star::util::SortDescriptor; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::Delimiter
     /** contains the character that marks the separation of columns.
      */
-    [property] char Delimiter;
-
-    //-------------------------------------------------------------------------
-
+    [property] char Delimiter; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::IsSortInTable
     /** determines if the content of a table is to be sorted.
      */
-    [property] boolean IsSortInTable;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean IsSortInTable; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::SortRowOrColumnNo0
     /** contains the row or column index used in the first search key.
      */
-    [property] long SortRowOrColumnNo0;
-
-    //-------------------------------------------------------------------------
-
+    [property] long SortRowOrColumnNo0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::IsSortNumeric0
     /** determines if the sorting in the first search key is done
         numeric or alphanumeric order.
      */
-    [property] boolean IsSortNumeric0;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean IsSortNumeric0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::IsSortAscending0
     /** determines if the sorting in the first search key is done
         in ascending or descending order.
      */
-    [property] boolean IsSortAscending0;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean IsSortAscending0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::SortRowOrColumnNo1
     /** contains the row or column index used in the second search key.
      */
-    [property] long SortRowOrColumnNo1;
-
-    //-------------------------------------------------------------------------
-
+    [property] long SortRowOrColumnNo1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::IsSortNumeric1
     /** determines if the sorting in the second search key is done
         in numeric or alphanumeric order.
      */
-    [property] boolean IsSortNumeric1;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean IsSortNumeric1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::IsSortAscending1
     /** determines if the sorting in the second search key is done
         in ascending or descending order.
      */
-    [property] boolean IsSortAscending1;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean IsSortAscending1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::SortRowOrColumnNo2
     /** contains the row or column index used in the third search key.
      */
-    [property] long SortRowOrColumnNo2;
-
-    //-------------------------------------------------------------------------
-
+    [property] long SortRowOrColumnNo2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::IsSortNumeric2
     /** determines if the sorting in the third search key is done
         in numeric or alphanumeric order.
      */
-    [property] boolean IsSortNumeric2;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean IsSortNumeric2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: property com::sun::star::text::TextSortDescriptor::IsSortAscending2
     /** determines if the sorting in the third search key is done
         in ascending or descending order.
      */
-    [property] boolean IsSortAscending2;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [property] boolean IsSortAscending2; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/text/TextSortDescriptor2.idl b/offapi/com/sun/star/text/TextSortDescriptor2.idl
index 1805272b368c..3892a6ea3f37 100644
--- a/offapi/com/sun/star/text/TextSortDescriptor2.idl
+++ b/offapi/com/sun/star/text/TextSortDescriptor2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_TextSortDescriptor2_idl__
-#define __com_sun_star_text_TextSortDescriptor2_idl__
-
-#ifndef __com_sun_star_table_TableSortDescriptor2_idl__
-#include <com/sun/star/table/TableSortDescriptor2.idl>
-#endif
-#ifndef __com_sun_star_table_TableSortField_idl__
-#include <com/sun/star/table/TableSortField.idl>
-#endif
-#ifndef __com_sun_star_table_TableSortFieldType_idl__
-#include <com/sun/star/table/TableSortFieldType.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_TextSortDescriptor2_idl__ 
+#define __com_sun_star_text_TextSortDescriptor2_idl__ 
+ 
+#ifndef __com_sun_star_table_TableSortDescriptor2_idl__ 
+#include <com/sun/star/table/TableSortDescriptor2.idl> 
+#endif 
+#ifndef __com_sun_star_table_TableSortField_idl__ 
+#include <com/sun/star/table/TableSortField.idl> 
+#endif 
+#ifndef __com_sun_star_table_TableSortFieldType_idl__ 
+#include <com/sun/star/table/TableSortFieldType.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** describes sort criterias for sorting paragraphs or table contents in
     a text document.
 
     @since OOo 1.1.2
  */
 published service TextSortDescriptor2
-{
+{ 
     service com::sun::star::table::TableSortDescriptor2;
-
-    //-------------------------------------------------------------------------
+ 
+    //------------------------------------------------------------------------- 
     /** determines if the content of a table or a selection of
         paragraphs is to be sorted.
      */
-    [property] boolean IsSortInTable;
-
-    //-------------------------------------------------------------------------
+    [property] boolean IsSortInTable; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the character that marks the column separator
         when a selection of paragraphs is to be sorted.
      */
-    [property] char Delimiter;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [property] char Delimiter; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/text/TextSortable.idl b/offapi/com/sun/star/text/TextSortable.idl
index f4c7cccc7d29..7ebedfc6d9d4 100644
--- a/offapi/com/sun/star/text/TextSortable.idl
+++ b/offapi/com/sun/star/text/TextSortable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_TextSortable_idl__
-#define __com_sun_star_util_TextSortable_idl__
-
-#ifndef __com_sun_star_text_TextSortDescriptor_idl__
-#include <com/sun/star/text/TextSortDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSortable_idl__
-#include <com/sun/star/util/XSortable.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module text {
-
-//=============================================================================
+#ifndef __com_sun_star_util_TextSortable_idl__ 
+#define __com_sun_star_util_TextSortable_idl__ 
+  
+#ifndef __com_sun_star_text_TextSortDescriptor_idl__ 
+#include <com/sun/star/text/TextSortDescriptor.idl> 
+#endif 
 
+#ifndef __com_sun_star_util_XSortable_idl__ 
+#include <com/sun/star/util/XSortable.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** provides an interface for sorting.
 
     @deprecated
-
+    
     @since OOo 1.1.2
-
+    
  */
 published service TextSortable
 {
         /** the properties returned by a call to the 'createSortDescriptor' method
             of this interfaces implementation are those of the
             'com.sun.star.text.TextSortDescriptor' service.
-
+         
            @see <type scope="com::sun::star::text">TextSortDescriptor</type>
          */
         interface com::sun::star::util::XSortable;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/TextTable.idl b/offapi/com/sun/star/text/TextTable.idl
index eea848cb4f64..dc3e16224d86 100644
--- a/offapi/com/sun/star/text/TextTable.idl
+++ b/offapi/com/sun/star/text/TextTable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -90,8 +90,8 @@
 
 /** is a table of text cells which is anchored to a surrounding text.
 
-    <p>Note: The anchor of the actual implementation for text tables
-    does not have a position in the text. Thus that anchor can not be
+    <p>Note: The anchor of the actual implementation for text tables 
+    does not have a position in the text. Thus that anchor can not be 
     used for some operation like <member>XTextContent::attach</member> or
     <member>XText::insertTextContent</member>
     or other function that require the object to have a position in the text.</p>
@@ -122,7 +122,7 @@
 published service TextTable
 {
     service com::sun::star::text::TextContent;
-
+    
     [optional] service com::sun::star::xml::UserDefinedAttributesSupplier;
 
     interface com::sun::star::text::XTextTable;
diff --git a/offapi/com/sun/star/text/TextTableCursor.idl b/offapi/com/sun/star/text/TextTableCursor.idl
index b5b108ef3a72..a53a16b3d4cc 100644
--- a/offapi/com/sun/star/text/TextTableCursor.idl
+++ b/offapi/com/sun/star/text/TextTableCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/TextTableRow.idl b/offapi/com/sun/star/text/TextTableRow.idl
index 1d5947a051a9..11e900959daa 100644
--- a/offapi/com/sun/star/text/TextTableRow.idl
+++ b/offapi/com/sun/star/text/TextTableRow.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/TextTables.idl b/offapi/com/sun/star/text/TextTables.idl
index 55daffa1a074..f92b22bb5560 100644
--- a/offapi/com/sun/star/text/TextTables.idl
+++ b/offapi/com/sun/star/text/TextTables.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_TextTables_idl__
-#define __com_sun_star_text_TextTables_idl__
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_TextTables_idl__ 
+#define __com_sun_star_text_TextTables_idl__ 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::TextTables
 /** provides access to all tables in a document.
  */
 published service TextTables
-{
+{ 
     // DocMerge: empty anyway
-    interface com::sun::star::container::XIndexAccess;
-
+    interface com::sun::star::container::XIndexAccess; 
+    
     // DocMerge: empty anyway
-    interface com::sun::star::container::XNameAccess;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::container::XNameAccess; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/TextViewCursor.idl b/offapi/com/sun/star/text/TextViewCursor.idl
index 119d13cf78c1..83f22ca7d5b0 100644
--- a/offapi/com/sun/star/text/TextViewCursor.idl
+++ b/offapi/com/sun/star/text/TextViewCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_TextViewCursor_idl__
-#define __com_sun_star_text_TextViewCursor_idl__
-
-#ifndef __com_sun_star_text_TextLayoutCursor_idl__
-#include <com/sun/star/text/TextLayoutCursor.idl>
-#endif
+#ifndef __com_sun_star_text_TextViewCursor_idl__ 
+#define __com_sun_star_text_TextViewCursor_idl__ 
 
-#ifndef __com_sun_star_view_XScreenCursor_idl__
-#include <com/sun/star/view/XScreenCursor.idl>
-#endif
+#ifndef __com_sun_star_text_TextLayoutCursor_idl__ 
+#include <com/sun/star/text/TextLayoutCursor.idl> 
+#endif 
 
+#ifndef __com_sun_star_view_XScreenCursor_idl__ 
+#include <com/sun/star/view/XScreenCursor.idl> 
+#endif 
 
-//=============================================================================
 
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
+//============================================================================= 
 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::text::TextViewCursor
-/** A <type>TextViewCursor</type> is a <type>TextRange</type> which can travel
+/** A <type>TextViewCursor</type> is a <type>TextRange</type> which can travel 
     within a view of a <type>Text</type> object.
     @see TextDocumentView
  */
 published service TextViewCursor
-{
+{ 
     // DocMerge: empty anyway
-    service com::sun::star::text::TextLayoutCursor;
-
+    service com::sun::star::text::TextLayoutCursor; 
+    
     // DocMerge: empty anyway
-    interface com::sun::star::view::XScreenCursor;
-
-};
-
-//=============================================================================
-
-}; }; }; };
+    interface com::sun::star::view::XScreenCursor; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/text/TimeDisplayFormat.idl b/offapi/com/sun/star/text/TimeDisplayFormat.idl
index 2f52830706ce..de1911f5e3b5 100644
--- a/offapi/com/sun/star/text/TimeDisplayFormat.idl
+++ b/offapi/com/sun/star/text/TimeDisplayFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,68 +24,68 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_TimeDisplayFormat_idl__
-#define __com_sun_star_text_TimeDisplayFormat_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_TimeDisplayFormat_idl__ 
+#define __com_sun_star_text_TimeDisplayFormat_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** This constants define how a time field is formated before it is displayed.
     The formate may also depend on the system or document locale.
 
     @deprecated
  */
 published constants TimeDisplayFormat
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** the system standard
      */
     const short STANDARD = 0;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** 13:49
      */
-    const short HHMM = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short HHMM = 1; 
+    
+    //------------------------------------------------------------------------- 
+     
     /** 13:49:20
      */
-    const short HHMMSS = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short HHMMSS = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** 13:49:20.30
      */
-    const short HHMMSS00 = 3;
-
-    //-------------------------------------------------------------------------
-
+    const short HHMMSS00 = 3; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** 01:49
      */
-    const short HHMMAMPM = 4;
-
-    //-------------------------------------------------------------------------
-
+    const short HHMMAMPM = 4; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** 01:49:20
      */
-    const short HHMMSSAMPM = 5;
-
-    //-------------------------------------------------------------------------
-
+    const short HHMMSSAMPM = 5; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** 01:49:20.30
      */
-    const short HHMMSS00AMPM = 6;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short HHMMSS00AMPM = 6; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/UserDataPart.idl b/offapi/com/sun/star/text/UserDataPart.idl
index 41a8a03f1a6c..e0419ecb6982 100644
--- a/offapi/com/sun/star/text/UserDataPart.idl
+++ b/offapi/com/sun/star/text/UserDataPart.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,131 +24,131 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_UserDataPart_idl__
-#define __com_sun_star_text_UserDataPart_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_UserDataPart_idl__ 
+#define __com_sun_star_text_UserDataPart_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::text::UserDataPart
-/** These constants define which part of the user data is displayed in a
+/** These constants define which part of the user data is displayed in a 
         user data text field (service "sun.one.text.TextField.ExtendedUser")
  */
 published constants UserDataPart
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::UserDataPart::COMPANY
     /** The field shows the company name.
      */
-    const short COMPANY = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short COMPANY = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::UserDataPart::FIRSTNAME
     /** The field shows the first name.
      */
-    const short FIRSTNAME = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short FIRSTNAME = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::UserDataPart::NAME
     /** The field shows the name.
      */
-    const short NAME = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short NAME = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::UserDataPart::SHORTCUT
     /** The field shows the initials.
      */
-    const short SHORTCUT = 3;
-
-    //-------------------------------------------------------------------------
-
+    const short SHORTCUT = 3; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::UserDataPart::STREET
     /** The field shows the street.
      */
-    const short STREET = 4;
-
-    //-------------------------------------------------------------------------
-
+    const short STREET = 4; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::UserDataPart::COUNTRY
     /** The field shows the country.
      */
-    const short COUNTRY = 5;
-
-    //-------------------------------------------------------------------------
-
+    const short COUNTRY = 5; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::UserDataPart::ZIP
     /** The field shows the zip code.
      */
-    const short ZIP = 6;
-
-    //-------------------------------------------------------------------------
-
+    const short ZIP = 6; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::UserDataPart::CITY
     /** The field shows the city.
      */
-    const short CITY = 7;
-
-    //-------------------------------------------------------------------------
-
+    const short CITY = 7; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::UserDataPart::TITLE
     /** The field shows the title.
      */
-    const short TITLE = 8;
-
-    //-------------------------------------------------------------------------
-
+    const short TITLE = 8; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::UserDataPart::POSITION
     /** The field shows the position.
      */
-    const short POSITION = 9;
-
-    //-------------------------------------------------------------------------
-
+    const short POSITION = 9; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::UserDataPart::PHONE_PRIVATE
     /** The field shows the no of the private phone.
      */
-    const short PHONE_PRIVATE = 10;
-
-    //-------------------------------------------------------------------------
-
+    const short PHONE_PRIVATE = 10; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::UserDataPart::PHONE_COMPANY
     /** The field shows the number of the business phone.
      */
-    const short PHONE_COMPANY = 11;
-
-    //-------------------------------------------------------------------------
-
+    const short PHONE_COMPANY = 11; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::UserDataPart::FAX
     /** The field shows the fax no.
      */
-    const short FAX = 12;
-
-    //-------------------------------------------------------------------------
-
+    const short FAX = 12; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::UserDataPart::EMAIL
     /** The field shows the e-Mail.
      */
-    const short EMAIL = 13;
-
-    //-------------------------------------------------------------------------
-
+    const short EMAIL = 13; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::UserDataPart::STATE
     /** The field shows the state.
      */
-    const short STATE = 14;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short STATE = 14; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/UserDefinedIndex.idl b/offapi/com/sun/star/text/UserDefinedIndex.idl
index 95da34ddeaaa..0ef3bdfccd35 100644
--- a/offapi/com/sun/star/text/UserDefinedIndex.idl
+++ b/offapi/com/sun/star/text/UserDefinedIndex.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/UserFieldFormat.idl b/offapi/com/sun/star/text/UserFieldFormat.idl
index 323446be3037..adb5248c9cee 100644
--- a/offapi/com/sun/star/text/UserFieldFormat.idl
+++ b/offapi/com/sun/star/text/UserFieldFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_UserFieldFormat_idl__
-#define __com_sun_star_text_UserFieldFormat_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_UserFieldFormat_idl__ 
+#define __com_sun_star_text_UserFieldFormat_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::text::UserFieldFormat
-/** These constants describe how the content of a user text field is
+/** These constants describe how the content of a user text field is 
         formatted.
  */
 published constants UserFieldFormat
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::UserFieldFormat::SYSTEM
     /** The number format of the operating system is used.
      */
-    const short SYSTEM = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short SYSTEM = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::UserFieldFormat::TEXT
     /** The content is formatted as text.
      */
-    const short TEXT = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short TEXT = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::UserFieldFormat::NUM
     /** The number format of the property "NumberFormat" is used.
      */
-    const short NUM = 2;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const short NUM = 2; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/UserIndex.idl b/offapi/com/sun/star/text/UserIndex.idl
index e284251122a2..ae9ce3d53651 100644
--- a/offapi/com/sun/star/text/UserIndex.idl
+++ b/offapi/com/sun/star/text/UserIndex.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
 module com { module sun { module star { module text {
 
 //=============================================================================
-/** specifies service of user defined indexes within a document.
+/**	specifies service of user defined indexes within a document.
     @see com::sun::star::text::BaseIndex
 */
 published service UserIndex
diff --git a/offapi/com/sun/star/text/UserIndexMark.idl b/offapi/com/sun/star/text/UserIndexMark.idl
index 140adc1487ed..ac84d87824d4 100644
--- a/offapi/com/sun/star/text/UserIndexMark.idl
+++ b/offapi/com/sun/star/text/UserIndexMark.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/VertOrientation.idl b/offapi/com/sun/star/text/VertOrientation.idl
index d56a74eed787..cda0813d67a7 100644
--- a/offapi/com/sun/star/text/VertOrientation.idl
+++ b/offapi/com/sun/star/text/VertOrientation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,98 +24,98 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_VertOrientation_idl__
-#define __com_sun_star_text_VertOrientation_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_VertOrientation_idl__ 
+#define __com_sun_star_text_VertOrientation_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::text::VertOrientation
 /** These enumeration values are used to specify the vertical orientation.
  */
 published constants VertOrientation
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::VertOrientation::NONE
     /** no hard alignment
      */
-    const short NONE = 0;
-
-    //-------------------------------------------------------------------------
-
+    const short NONE = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::VertOrientation::TOP
     /** aligned at the top
      */
-    const short TOP = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short TOP = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::VertOrientation::CENTER
     /** aligned at the center
      */
-    const short CENTER = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short CENTER = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::VertOrientation::BOTTOM
     /** aligned at the bottom
      */
-    const short BOTTOM = 3;
-
-    //-------------------------------------------------------------------------
-
+    const short BOTTOM = 3; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::VertOrientation::CHAR_TOP
     /** aligned at the top of a character (anchored to character)
      */
-    const short CHAR_TOP = 4;
-
-    //-------------------------------------------------------------------------
-
+    const short CHAR_TOP = 4; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::VertOrientation::CHAR_CENTER
     /** aligned at the center of a character (anchored to character )
      */
-    const short CHAR_CENTER = 5;
-
-    //-------------------------------------------------------------------------
-
+    const short CHAR_CENTER = 5; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::VertOrientation::CHAR_BOTTOM
     /** aligned at the bottom of a character (anchored to character )
      */
-    const short CHAR_BOTTOM = 6;
-
-    //-------------------------------------------------------------------------
-
+    const short CHAR_BOTTOM = 6; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::VertOrientation::LINE_TOP
     /** aligned at the top of the line (anchored to character )
      */
-    const short LINE_TOP = 7;
-
-    //-------------------------------------------------------------------------
-
+    const short LINE_TOP = 7; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::VertOrientation::LINE_CENTER
     /** aligned at the center of the line (anchored to character )
      */
-    const short LINE_CENTER = 8;
-
-    //-------------------------------------------------------------------------
-
+    const short LINE_CENTER = 8; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::text::VertOrientation::LINE_BOTTOM
     /** aligned at the bottom of the line (anchored to character )
      */
-    const short LINE_BOTTOM = 9;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    const short LINE_BOTTOM = 9; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/text/VertOrientationFormat.idl b/offapi/com/sun/star/text/VertOrientationFormat.idl
index e210a96d7fac..b4fabc8bc70d 100644
--- a/offapi/com/sun/star/text/VertOrientationFormat.idl
+++ b/offapi/com/sun/star/text/VertOrientationFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,21 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_VertOrientationFormat_idl__
-#define __com_sun_star_text_VertOrientationFormat_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_VertOrientationFormat_idl__ 
+#define __com_sun_star_text_VertOrientationFormat_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::text::VertOrientationFormat
 /** describes the vertical orientation of an object.
-
-
-
+    
+    
+    
     <p>If <code>VerticalOrientation == VERT_NONE</code>, then the value "YPos"
     describes the distance from the top of the context. Otherwise "YPos"
     is ignored.
@@ -50,28 +50,28 @@ published struct VertOrientationFormat
     /** contains the distance from top. Only valid if the property
         VerticalOrientation contains the value VERT_NONE.
      */
-    long YPos;
-
-    //-------------------------------------------------------------------------
-
+    long YPos; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::text::VertOrientationFormat::VerticalOrientation
     /** determines the vertical alignment of an object.
         The values refer to com::sun::star::VertOrientation.
      */
-    short VerticalOrientation;
-
-    //-------------------------------------------------------------------------
-
+    short VerticalOrientation; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::text::VertOrientationFormat::VerticalRelation
     /** determines the reference position of the vertical alignment.@see com::sun::star::text::RelOrientation
      */
-    short VerticalRelation;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    short VerticalRelation; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+
+#endif 
diff --git a/offapi/com/sun/star/text/ViewSettings.idl b/offapi/com/sun/star/text/ViewSettings.idl
index 007a8f1e617d..8f0bb6ee2701 100644
--- a/offapi/com/sun/star/text/ViewSettings.idl
+++ b/offapi/com/sun/star/text/ViewSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/WebDocument.idl b/offapi/com/sun/star/text/WebDocument.idl
index 62b6294ff5ac..60060994c9c6 100644
--- a/offapi/com/sun/star/text/WebDocument.idl
+++ b/offapi/com/sun/star/text/WebDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/WrapInfluenceOnPosition.idl b/offapi/com/sun/star/text/WrapInfluenceOnPosition.idl
index 881d22ea9415..ee49a2d7c26d 100644
--- a/offapi/com/sun/star/text/WrapInfluenceOnPosition.idl
+++ b/offapi/com/sun/star/text/WrapInfluenceOnPosition.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/WrapTextMode.idl b/offapi/com/sun/star/text/WrapTextMode.idl
index e366a9101014..ce5ac9be938e 100644
--- a/offapi/com/sun/star/text/WrapTextMode.idl
+++ b/offapi/com/sun/star/text/WrapTextMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,68 +24,68 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_WrapTextMode_idl__
-#define __com_sun_star_text_WrapTextMode_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_WrapTextMode_idl__ 
+#define __com_sun_star_text_WrapTextMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::text::WrapTextMode
 /** enumeration values specify the text wrap around objects in a text.
  */
 published enum WrapTextMode
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::text::WrapTextMode::NONE
     /** text does not flow around the object.
      */
-    NONE,
-
-    //-------------------------------------------------------------------------
-
+    NONE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::text::WrapTextMode::THROUGHT
     /** text flow ignores the object.
      */
-    THROUGHT,
-
-    //-------------------------------------------------------------------------
-
+    THROUGHT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::text::WrapTextMode::PARALLEL
     /** text flows to the left and right of the object.
      */
-    PARALLEL,
-
-    //-------------------------------------------------------------------------
-
+    PARALLEL, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::text::WrapTextMode::DYNAMIC
     /** text flow depends on the situation. The text formatting
         decides the best way.
      */
-    DYNAMIC,
-
-    //-------------------------------------------------------------------------
-
+    DYNAMIC, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::text::WrapTextMode::LEFT
     /** text flows to the left side of the object.
      */
-    LEFT,
-
-    //-------------------------------------------------------------------------
-
+    LEFT, 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: value com::sun::star::text::WrapTextMode::RIGHT
     /** text flows to the right side of the object.
      */
-    RIGHT
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    RIGHT 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/WritingMode.idl b/offapi/com/sun/star/text/WritingMode.idl
index d79c61b5ec9d..c533faf07871 100644
--- a/offapi/com/sun/star/text/WritingMode.idl
+++ b/offapi/com/sun/star/text/WritingMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_WritingMode_idl__
-#define __com_sun_star_text_WritingMode_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_WritingMode_idl__ 
+#define __com_sun_star_text_WritingMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 /** this enum covers the different writing directions
 
     @deprecated
         Use WritingMode2 instead
  */
 published enum WritingMode
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** text within lines is written left-to-right. lines and blocks are placed
         top-to-bottom.
         <p>
         Typically, this is the writing mode for normal "alphabetic" text.
      */
-    LR_TB,
-
-    //-------------------------------------------------------------------------
-
+    LR_TB, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** text within a line are written right-to-left. Lines and blocks are
         placed top-to-bottom.
         <p>
         Typically, this writing mode is used in Arabic and Hebrew text.
      */
     RL_TB,
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** text within a line is written top-to-bottom. Lines and blocks are
         placed right-to-left.
         <p>
         Typically, this writing mode is used in Chinese and Japanese text.
      */
     TB_RL
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+#endif 
diff --git a/offapi/com/sun/star/text/WritingMode2.idl b/offapi/com/sun/star/text/WritingMode2.idl
index a74dff328ba8..414adb4c5d60 100644
--- a/offapi/com/sun/star/text/WritingMode2.idl
+++ b/offapi/com/sun/star/text/WritingMode2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,52 +24,52 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_WritingMode2_idl__
-#define __com_sun_star_text_WritingMode2_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_WritingMode2_idl__ 
+#define __com_sun_star_text_WritingMode2_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 /** this set of constants describes different writing directions
 
     <p>In addition to numerous explicit writing directions, it allows allows to specify to take the writing
     direction from the object's context.</p>
  */
 published constants WritingMode2
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** text within lines is written left-to-right. Lines and blocks are placed
         top-to-bottom.
         <p>
         Typically, this is the writing mode for normal "alphabetic" text.
      */
     const short LR_TB = 0;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** text within a line are written right-to-left. Lines and blocks are
         placed top-to-bottom.
         <p>
         Typically, this writing mode is used in Arabic and Hebrew text.
      */
     const short RL_TB = 1;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** text within a line is written top-to-bottom. Lines and blocks are
         placed right-to-left.
         <p>
         Typically, this writing mode is used in Chinese and Japanese text.
      */
     const short TB_RL = 2;
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** text within a line is written top-to-bottom. Lines and blocks are
         placed left-ro-right.
         <p>
@@ -77,8 +77,8 @@ published constants WritingMode2
      */
     const short TB_LR = 3;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** obtain writing mode from the current page.
 
         <p>May not be used in page styles.</p>
@@ -91,10 +91,10 @@ published constants WritingMode2
     /** obtain actual writing mode from the context of the object.
     */
     const short CONTEXT = 4;
-};
-
-//=============================================================================
-
-}; }; }; };
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/text/XAutoTextContainer.idl b/offapi/com/sun/star/text/XAutoTextContainer.idl
index 9f091683c014..b1a7ee9882e3 100644
--- a/offapi/com/sun/star/text/XAutoTextContainer.idl
+++ b/offapi/com/sun/star/text/XAutoTextContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,84 +24,84 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XAutoTextContainer_idl__
-#define __com_sun_star_text_XAutoTextContainer_idl__
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_text_XAutoTextGroup_idl__
-#include <com/sun/star/text/XAutoTextGroup.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
-#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XAutoTextContainer_idl__ 
+#define __com_sun_star_text_XAutoTextContainer_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XAutoTextGroup_idl__ 
+#include <com/sun/star/text/XAutoTextGroup.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_ElementExistException_idl__ 
+#include <com/sun/star/container/ElementExistException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XAutoTextContainer
-/** handles blocks of <type>AutoTextEntry</type>.
-
-
-
-
-
-
-
+/** handles blocks of <type>AutoTextEntry</type>. 
+    
+    
+    
+    
+    
+    
+    
     @example <pre>
     AutoTextPath=d:\office\autotext;f:\user\autotext
-
-    groupname:  "standard*0"
+    
+    groupname:	"standard*0" 
     -&amp;amp;gt; the group file is located n the path d:\office\autotext
-    groupname:  "all*1"
-    -&amp;amp;gt; the group file is located in the path f:\user\autotext\
+    groupname:	"all*1" 
+    -&amp;amp;gt; the group file is located in the path f:\user\autotext\    
     </pre>
-
-    <p>If the path extension is not specified, then the first directory
+    
+    <p>If the path extension is not specified, then the first directory 
     is used.  For automatic text expansion, the name of an actual group is
     set to search first in this group.
-
+    
     </p>@see AutoTextContainer
  */
 published interface XAutoTextContainer: com::sun::star::container::XNameAccess
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XAutoTextContainer::insertNewByName
     /** creates a new AutoText group.
      */
-    com::sun::star::text::XAutoTextGroup insertNewByName( [in] string aGroupName )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::container::ElementExistException );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::text::XAutoTextGroup insertNewByName( [in] string aGroupName ) 
+            raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::container::ElementExistException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XAutoTextContainer::removeByName
     /** deletes the specified AutoText group.
      */
-    void removeByName( [in] string aGroupName )
-            raises( com::sun::star::container::NoSuchElementException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    void removeByName( [in] string aGroupName ) 
+            raises( com::sun::star::container::NoSuchElementException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XAutoTextEntry.idl b/offapi/com/sun/star/text/XAutoTextEntry.idl
index 89178464a4f4..78b72cc1bd8c 100644
--- a/offapi/com/sun/star/text/XAutoTextEntry.idl
+++ b/offapi/com/sun/star/text/XAutoTextEntry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,55 +24,55 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XAutoTextEntry_idl__
-#define __com_sun_star_text_XAutoTextEntry_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextRange_idl__
-#include <com/sun/star/text/XTextRange.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XAutoTextEntry_idl__ 
+#define __com_sun_star_text_XAutoTextEntry_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XTextRange_idl__ 
+#include <com/sun/star/text/XTextRange.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XAutoTextEntry
 /** identifies an autotext entry.
-
-
-
-
-
-
-
-
-
-
-
-
-
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     @deprecated
  */
 published interface XAutoTextEntry: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XAutoTextEntry::applyTo
     /** inserts the contents represented by this auto text entry at the
         specified text range.
      */
-    void applyTo( [in] com::sun::star::text::XTextRange xRange );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void applyTo( [in] com::sun::star::text::XTextRange xRange ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XAutoTextGroup.idl b/offapi/com/sun/star/text/XAutoTextGroup.idl
index b9f33cb71fb8..e68e1269a248 100644
--- a/offapi/com/sun/star/text/XAutoTextGroup.idl
+++ b/offapi/com/sun/star/text/XAutoTextGroup.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,98 +24,98 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XAutoTextGroup_idl__
-#define __com_sun_star_text_XAutoTextGroup_idl__
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
-#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XAutoTextEntry_idl__
-#include <com/sun/star/text/XAutoTextEntry.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextRange_idl__
-#include <com/sun/star/text/XTextRange.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XAutoTextGroup_idl__ 
+#define __com_sun_star_text_XAutoTextGroup_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_ElementExistException_idl__ 
+#include <com/sun/star/container/ElementExistException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XAutoTextEntry_idl__ 
+#include <com/sun/star/text/XAutoTextEntry.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XTextRange_idl__ 
+#include <com/sun/star/text/XTextRange.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XAutoTextGroup
 /** The interface provide methods to insert, rename and delete autotext entries from the current autotext group.
  */
 published interface XAutoTextGroup: com::sun::star::container::XNameAccess
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XAutoTextGroup::getTitles
-    /** returns the titles of all autotext entries. The order of the entries
+    /** returns the titles of all autotext entries. The order of the entries 
                 corresponds to the output of the function getElementNames().
      */
-    sequence<string> getTitles();
-
-    //-------------------------------------------------------------------------
-
+    sequence<string> getTitles(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XAutoTextGroup::renameByName
     /** renames an entry in the autotext group.
-
-
-
+        
+        
+        
         <p>The position of the autotext entry is not changed.
-
+        
         </p>
      */
-    void renameByName( [in] string aElementName,
-             [in] string aNewElementName,
-             [in] string aNewElementTitle )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::container::ElementExistException,
-                    com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    void renameByName( [in] string aElementName, 
+             [in] string aNewElementName, 
+             [in] string aNewElementTitle ) 
+            raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::container::ElementExistException, 
+                    com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XAutoTextGroup::insertNewByName
     /** creates a new <type>AutoTextEntry</type> entry.
      */
-    com::sun::star::text::XAutoTextEntry insertNewByName( [in] string aName,
-             [in] string aTitle,
-             [in] com::sun::star::text::XTextRange xTextRange )
-            raises( com::sun::star::container::ElementExistException );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::text::XAutoTextEntry insertNewByName( [in] string aName, 
+             [in] string aTitle, 
+             [in] com::sun::star::text::XTextRange xTextRange ) 
+            raises( com::sun::star::container::ElementExistException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XAutoTextGroup::removeByName
     /** removes the specified autotext entry.
      */
-    void removeByName( [in] string aEntryName )
-            raises( com::sun::star::container::NoSuchElementException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    void removeByName( [in] string aEntryName ) 
+            raises( com::sun::star::container::NoSuchElementException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+
+#endif 
diff --git a/offapi/com/sun/star/text/XBookmarkInsertTool.idl b/offapi/com/sun/star/text/XBookmarkInsertTool.idl
index c519407336ee..f80e92f6d991 100644
--- a/offapi/com/sun/star/text/XBookmarkInsertTool.idl
+++ b/offapi/com/sun/star/text/XBookmarkInsertTool.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XBookmarkInsertTool_idl__
-#define __com_sun_star_text_XBookmarkInsertTool_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextContent_idl__
-#include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextRange_idl__
-#include <com/sun/star/text/XTextRange.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XBookmarkInsertTool_idl__ 
+#define __com_sun_star_text_XBookmarkInsertTool_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XTextContent_idl__ 
+#include <com/sun/star/text/XTextContent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XTextRange_idl__ 
+#include <com/sun/star/text/XTextRange.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XBookmarkInsertTool
 /** offers an easy way to insert bookmarks by name.@see Text
  */
 published interface XBookmarkInsertTool: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XBookmarkInsertTool::insertNewBookmark
     /** inserts a bookmark at the specified text position.
      */
-    com::sun::star::text::XTextContent insertNewBookmark( [in] com::sun::star::text::XTextRange xTextRange,
-             [in] string aName );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    com::sun::star::text::XTextContent insertNewBookmark( [in] com::sun::star::text::XTextRange xTextRange, 
+             [in] string aName ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/text/XBookmarksSupplier.idl b/offapi/com/sun/star/text/XBookmarksSupplier.idl
index 46b841bfa649..3fcf3cffbc74 100644
--- a/offapi/com/sun/star/text/XBookmarksSupplier.idl
+++ b/offapi/com/sun/star/text/XBookmarksSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XBookmarksSupplier_idl__
-#define __com_sun_star_text_XBookmarksSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XBookmarksSupplier_idl__ 
+#define __com_sun_star_text_XBookmarksSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XBookmarksSupplier
 /** provides access to the collection of all bookmarks within this text container.
  */
 published interface XBookmarksSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XBookmarksSupplier::getBookmarks
-    /** @returns
-                the collection of all <type>Bookmark</type> instances which are
+    /** @returns 
+                the collection of all <type>Bookmark</type> instances which are 
                 within this context and which support the <type>Bookmarks</type> service.
      */
-    com::sun::star::container::XNameAccess getBookmarks();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    com::sun::star::container::XNameAccess getBookmarks(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/text/XChapterNumberingSupplier.idl b/offapi/com/sun/star/text/XChapterNumberingSupplier.idl
index de7ced8fa668..038bf4adbb4e 100644
--- a/offapi/com/sun/star/text/XChapterNumberingSupplier.idl
+++ b/offapi/com/sun/star/text/XChapterNumberingSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XChapterNumberingSupplier_idl__
-#define __com_sun_star_text_XChapterNumberingSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexReplace_idl__
-#include <com/sun/star/container/XIndexReplace.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XChapterNumberingSupplier_idl__ 
+#define __com_sun_star_text_XChapterNumberingSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XIndexReplace_idl__ 
+#include <com/sun/star/container/XIndexReplace.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XChapterNumberingSupplier
 /** contains the settings of the chapter numbering in a text
     document.
  */
 published interface XChapterNumberingSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XChapterNumberingSupplier::getChapterNumberingRules
-    /** @returns
-                the collection of numbering rules for this document.
-
-                <P>This interface allows access to the properties
+    /** @returns 
+                the collection of numbering rules for this document. 
+                 
+                <P>This interface allows access to the properties 
                 of the numbering level via a sequence of <type scope="com::sun::star::beans">PropertyValues</type>.
      */
-    com::sun::star::container::XIndexReplace getChapterNumberingRules();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    com::sun::star::container::XIndexReplace getChapterNumberingRules(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/text/XDefaultNumberingProvider.idl b/offapi/com/sun/star/text/XDefaultNumberingProvider.idl
index 354d79d882c8..0cc607ec2055 100644
--- a/offapi/com/sun/star/text/XDefaultNumberingProvider.idl
+++ b/offapi/com/sun/star/text/XDefaultNumberingProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,8 +45,8 @@ module com { module sun { module star { module text {
     <p></p>
     @see <type scope="com::sun::star::text">NumberingRules</type>
     @see <type scope="com::sun::star::lang">Locale</type>
-    @version    1.0
-    @author     <a href="mailto:oliver.specht@germany.sun.com">Oliver Specht</a>
+    @version	1.0
+    @author		<a href="mailto:oliver.specht@germany.sun.com">Oliver Specht</a>
 */
 published interface XDefaultNumberingProvider : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/text/XDependentTextField.idl b/offapi/com/sun/star/text/XDependentTextField.idl
index 3b659669a2ea..dca26be13988 100644
--- a/offapi/com/sun/star/text/XDependentTextField.idl
+++ b/offapi/com/sun/star/text/XDependentTextField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XDependentTextField_idl__
-#define __com_sun_star_text_XDependentTextField_idl__
-
-#ifndef __com_sun_star_text_XTextField_idl__
-#include <com/sun/star/text/XTextField.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XDependentTextField_idl__ 
+#define __com_sun_star_text_XDependentTextField_idl__ 
+ 
+#ifndef __com_sun_star_text_XTextField_idl__ 
+#include <com/sun/star/text/XTextField.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to attach this <type>TextField</type> to a
     <type>TextFieldMaster</type>.
  */
 published interface XDependentTextField: com::sun::star::text::XTextField
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** method must be called to attach the
         <type>TextFieldMaster</type> to this <type>TextField</type>.
         <p>A <type>TextFieldMaster</type> can only be assigned once.
         </p>
-
+        
         @example Create and insert a user field (with a
                 <code>UserField</code>):
-
+        
         <listing>
                 // Create a fieldmaster for our newly created User Text field, and access it's
                 // XPropertySet interface
-                XPropertySet xMasterPropSet = (XPropertySet) UnoRuntime.queryInterface(
+                XPropertySet xMasterPropSet = (XPropertySet) UnoRuntime.queryInterface( 
                                 XPropertySet.class, mxDocFactory.createInstance(
                                                 "com.sun.star.text.FieldMaster.User"));
                 // Set the name and value of the FieldMaster
@@ -81,21 +81,21 @@ published interface XDependentTextField: com::sun::star::text::XTextField
                 mxDocText.insertTextContent(mxDocText.getEnd(), xUserField, false);
                 </listing>
      */
-    void attachTextFieldMaster( [in] com::sun::star::beans::XPropertySet xFieldMaster )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-                the previously attached <type>TextFieldMaster</type>
+    void attachTextFieldMaster( [in] com::sun::star::beans::XPropertySet xFieldMaster ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+                the previously attached <type>TextFieldMaster</type> 
      */
-    com::sun::star::beans::XPropertySet getTextFieldMaster();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    com::sun::star::beans::XPropertySet getTextFieldMaster(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+
+#endif 
diff --git a/offapi/com/sun/star/text/XDocumentIndex.idl b/offapi/com/sun/star/text/XDocumentIndex.idl
index eda4fa42dfb9..7e1917dce0cf 100644
--- a/offapi/com/sun/star/text/XDocumentIndex.idl
+++ b/offapi/com/sun/star/text/XDocumentIndex.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,59 +24,59 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XDocumentIndex_idl__
-#define __com_sun_star_text_XDocumentIndex_idl__
-
-#ifndef __com_sun_star_text_XTextContent_idl__
-#include <com/sun/star/text/XTextContent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XDocumentIndex_idl__ 
+#define __com_sun_star_text_XDocumentIndex_idl__ 
+ 
+#ifndef __com_sun_star_text_XTextContent_idl__ 
+#include <com/sun/star/text/XTextContent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XDocumentIndex
 /** This is the main interface for a document index.
-
-
-
+    
+    
+    
     <p>Use <type scope="com::sun::star::util">XRefreshable</type> and
     <type scope="com::sun::star::lang">XServiceInfo</type> instead, if available.
-
+    
     </p>
-
-
-
-
-
-
+    
+    
+    
+    
+    
+    
     @deprecated
-    @see com::sun::star::util::XRefreshable
+    @see com::sun::star::util::XRefreshable 
     @see com::sun::star::lang::XServiceInfo
  */
 published interface XDocumentIndex: com::sun::star::text::XTextContent
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XDocumentIndex::getServiceName
     /** returns the service name that was used to create this document index type.
      */
-    string getServiceName();
-
-    //-------------------------------------------------------------------------
-
+    string getServiceName(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XDocumentIndex::update
     /** initiates an upate to the document index.
      */
-    void update();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void update(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XDocumentIndexMark.idl b/offapi/com/sun/star/text/XDocumentIndexMark.idl
index d643eb15cd39..8748b19d7ddc 100644
--- a/offapi/com/sun/star/text/XDocumentIndexMark.idl
+++ b/offapi/com/sun/star/text/XDocumentIndexMark.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XDocumentIndexMark_idl__
-#define __com_sun_star_text_XDocumentIndexMark_idl__
-
-#ifndef __com_sun_star_text_XTextContent_idl__
-#include <com/sun/star/text/XTextContent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XDocumentIndexMark_idl__ 
+#define __com_sun_star_text_XDocumentIndexMark_idl__ 
+ 
+#ifndef __com_sun_star_text_XTextContent_idl__ 
+#include <com/sun/star/text/XTextContent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XDocumentIndexMark
 /** gives access to the mark of a document index entry.@see DocumentIndexMark
  */
 published interface XDocumentIndexMark: com::sun::star::text::XTextContent
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XDocumentIndexMark::getMarkEntry
-    /** @returns
-                the explicitly set string for the index mark.
+    /** @returns 
+                the explicitly set string for the index mark. 
 
          @see setMarkEntry
      */
-    string getMarkEntry();
-
-    //-------------------------------------------------------------------------
-
+    string getMarkEntry(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XDocumentIndexMark::setMarkEntry
     /** sets an explicit string for this index mark to use
         in the index.
-
-
-
+        
+        
+        
         <p>If empty, the string of the <type>TextRange</type> to which
         the <type>TextContent</type> refers is used in the index.</p>
      */
-    void setMarkEntry( [in] string aIndexEntry );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    void setMarkEntry( [in] string aIndexEntry ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+
+#endif 
diff --git a/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl b/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl
index 6005771299b8..2da7deb2fad1 100644
--- a/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl
+++ b/offapi/com/sun/star/text/XDocumentIndexesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XDocumentIndexesSupplier_idl__
-#define __com_sun_star_text_XDocumentIndexesSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XDocumentIndexesSupplier_idl__ 
+#define __com_sun_star_text_XDocumentIndexesSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XDocumentIndexesSupplier
 /** gives access to the collection of document indexes.
-
-
-
+    
+    
+    
     <p>In general this interface is supported by a <type>TextDocument</type>.</p>
  */
 published interface XDocumentIndexesSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XDocumentIndexesSupplier::getDocumentIndexes
-    /** @returns
+    /** @returns 
                 the collection of "DocumentIndexes" currently contained in the object.
      */
-    com::sun::star::container::XIndexAccess getDocumentIndexes();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    com::sun::star::container::XIndexAccess getDocumentIndexes(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+
+#endif 
diff --git a/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl b/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl
index 51bb77195aae..c3c12d9dc960 100644
--- a/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl
+++ b/offapi/com/sun/star/text/XEndnotesSettingsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XEndnotesSettingsSupplier_idl__
-#define __com_sun_star_text_XEndnotesSettingsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XEndnotesSettingsSupplier_idl__ 
+#define __com_sun_star_text_XEndnotesSettingsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XEndnotesSettingsSupplier
 /** makes it possible to access the <type>FootnoteSettings</type>
     within the context (e.g. document).
  */
 published interface XEndnotesSettingsSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XEndnotesSettingsSupplier::getEndnotesSettings
-    /** @returns
+    /** @returns 
             <type>EndnoteSettings</type> of the object.
      */
-    com::sun::star::beans::XPropertySet getEndnotesSettings();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::beans::XPropertySet getEndnotesSettings(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/text/XEndnotesSupplier.idl b/offapi/com/sun/star/text/XEndnotesSupplier.idl
index 62d962aa6573..5eb2b48fd57f 100644
--- a/offapi/com/sun/star/text/XEndnotesSupplier.idl
+++ b/offapi/com/sun/star/text/XEndnotesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,57 +24,57 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XEndnotesSupplier_idl__
-#define __com_sun_star_text_XEndnotesSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XEndnotesSupplier_idl__ 
+#define __com_sun_star_text_XEndnotesSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XEndnotesSupplier
 /** makes it possible to access the endnotes within the
     context (e.g. document).
  */
 published interface XEndnotesSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XEndnotesSupplier::getEndnotes
-    /** @returns
+    /** @returns 
                 a collection of endnotes.
      */
-    com::sun::star::container::XIndexAccess getEndnotes();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::container::XIndexAccess getEndnotes(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XEndnotesSupplier::getEndnoteSettings
-    /** @returns
+    /** @returns 
                 the endnote settings of the document.
      */
-    com::sun::star::beans::XPropertySet getEndnoteSettings();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::beans::XPropertySet getEndnoteSettings(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/text/XFlatParagraph.idl b/offapi/com/sun/star/text/XFlatParagraph.idl
index d9e5143a860f..e687aba264eb 100644
--- a/offapi/com/sun/star/text/XFlatParagraph.idl
+++ b/offapi/com/sun/star/text/XFlatParagraph.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/XFlatParagraphIterator.idl b/offapi/com/sun/star/text/XFlatParagraphIterator.idl
index dd90fe398cb8..b0b75b7d8571 100644
--- a/offapi/com/sun/star/text/XFlatParagraphIterator.idl
+++ b/offapi/com/sun/star/text/XFlatParagraphIterator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/XFlatParagraphIteratorProvider.idl b/offapi/com/sun/star/text/XFlatParagraphIteratorProvider.idl
index b57187603548..1cc7c440ad2d 100644
--- a/offapi/com/sun/star/text/XFlatParagraphIteratorProvider.idl
+++ b/offapi/com/sun/star/text/XFlatParagraphIteratorProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/XFootnote.idl b/offapi/com/sun/star/text/XFootnote.idl
index dc01b8955cf1..7f0d6f6fcc9d 100644
--- a/offapi/com/sun/star/text/XFootnote.idl
+++ b/offapi/com/sun/star/text/XFootnote.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XFootnote_idl__
-#define __com_sun_star_text_XFootnote_idl__
-
-#ifndef __com_sun_star_text_XTextContent_idl__
-#include <com/sun/star/text/XTextContent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XFootnote_idl__ 
+#define __com_sun_star_text_XFootnote_idl__ 
+ 
+#ifndef __com_sun_star_text_XTextContent_idl__ 
+#include <com/sun/star/text/XTextContent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XFootnote
 /** specifies a footnote within a Text.@see Footnote
  */
 published interface XFootnote: com::sun::star::text::XTextContent
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XFootnote::getLabel
-    /** @returns the label of the footnote.
+    /** @returns the label of the footnote. 
 
          @see XFootnote::setLabel
      */
-    string getLabel();
-
-    //-------------------------------------------------------------------------
-
+    string getLabel(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XFootnote::setLabel
     /** sets the label of the footnote.
      */
-    void setLabel( [in] string aLabel );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void setLabel( [in] string aLabel ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl b/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl
index 41b68e586903..d7ed6af1f969 100644
--- a/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl
+++ b/offapi/com/sun/star/text/XFootnotesSettingsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XFootnotesSettingsSupplier_idl__
-#define __com_sun_star_text_XFootnotesSettingsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XFootnotesSettingsSupplier_idl__ 
+#define __com_sun_star_text_XFootnotesSettingsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XFootnotesSettingsSupplier
 /** makes it possible to access the <type>FootnoteSettings</type>
     with the context (e.g. document).
  */
 published interface XFootnotesSettingsSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XFootnotesSettingsSupplier::getFootnotesSettings
-    /** @returns
+    /** @returns 
                      <type>FootnoteSettings</type> of the object.
      */
-    com::sun::star::beans::XPropertySet getFootnotesSettings();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    com::sun::star::beans::XPropertySet getFootnotesSettings(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/text/XFootnotesSupplier.idl b/offapi/com/sun/star/text/XFootnotesSupplier.idl
index 91630c7275df..3405469e559b 100644
--- a/offapi/com/sun/star/text/XFootnotesSupplier.idl
+++ b/offapi/com/sun/star/text/XFootnotesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XFootnotesSupplier_idl__
-#define __com_sun_star_text_XFootnotesSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XFootnotesSupplier_idl__ 
+#define __com_sun_star_text_XFootnotesSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XFootnotesSupplier
 /** makes it possible to access the footnotes within
     the context (e.g. document).
  */
 published interface XFootnotesSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XFootnotesSupplier::getFootnotes
     /** returns a collection of footnotes.
      */
-    com::sun::star::container::XIndexAccess getFootnotes();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::container::XIndexAccess getFootnotes(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XFootnotesSupplier::getFootnoteSettings
-    /** @returns
+    /** @returns 
                 the footnotes settings of the document.
      */
-    com::sun::star::beans::XPropertySet getFootnoteSettings();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::beans::XPropertySet getFootnoteSettings(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XFormField.idl b/offapi/com/sun/star/text/XFormField.idl
index 53555728ba40..bf8465d7d974 100644
--- a/offapi/com/sun/star/text/XFormField.idl
+++ b/offapi/com/sun/star/text/XFormField.idl
@@ -4,14 +4,14 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/container/XNameContainer.idl>
 
-module com {  module sun {  module star {  module text {
+module com {  module sun {  module star {  module text { 
 
     /** @deprecated
      */
     interface XFormField : com::sun::star::uno::XInterface
     {
         string getFieldType();
-        void setFieldType([in] string fieldType);
+        void setFieldType([in] string fieldType);     
         com::sun::star::container::XNameContainer getParameters();
     };
 
diff --git a/offapi/com/sun/star/text/XHeaderFooter.idl b/offapi/com/sun/star/text/XHeaderFooter.idl
index 048e32cc8118..592be757ec5e 100644
--- a/offapi/com/sun/star/text/XHeaderFooter.idl
+++ b/offapi/com/sun/star/text/XHeaderFooter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XHeaderFooter_idl__
-#define __com_sun_star_text_XHeaderFooter_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
-#include <com/sun/star/text/XText.idl>
-#endif
+#ifndef __com_sun_star_text_XHeaderFooter_idl__ 
+#define __com_sun_star_text_XHeaderFooter_idl__ 
 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_text_XText_idl__ 
+#include <com/sun/star/text/XText.idl> 
+#endif 
 
- module com {  module sun {  module star {  module text {
 
-//=============================================================================
+//============================================================================= 
 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XHeaderFooter
 /** @deprecated     Use the properties of
             <type scope="com::sun::star::style">PageProperties</type> instead
  */
 published interface XHeaderFooter: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XHeaderFooter::getLeftPagesText
-    /** @returns
+    /** @returns  
                 the text interface for the header/footer text of a left page.
      */
-    com::sun::star::text::XText getLeftPagesText();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::text::XText getLeftPagesText(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XHeaderFooter::getRightPagesText
-    /** @returns
+    /** @returns 
                 the text interface for the header/footer text of a right page.
      */
-    com::sun::star::text::XText getRightPagesText();
-
-};
-
-//=============================================================================
-
-}; }; }; };
+    com::sun::star::text::XText getRightPagesText(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl b/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl
index 8cd1479f5df1..b87178c229cb 100644
--- a/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl
+++ b/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XHeaderFooterPageStyle_idl__
-#define __com_sun_star_text_XHeaderFooterPageStyle_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_text_XHeaderFooter_idl__
-#include <com/sun/star/text/XHeaderFooter.idl>
-#endif
+#ifndef __com_sun_star_text_XHeaderFooterPageStyle_idl__ 
+#define __com_sun_star_text_XHeaderFooterPageStyle_idl__ 
 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_text_XHeaderFooter_idl__ 
+#include <com/sun/star/text/XHeaderFooter.idl> 
+#endif 
 
- module com {  module sun {  module star {  module text {
 
-//=============================================================================
+//============================================================================= 
 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XHeaderFooterPageStyle
 /** @deprecated     Use the properties of
             <type scope="com::sun::star::style">PageProperties</type> instead
  */
 published interface XHeaderFooterPageStyle: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XHeaderFooterPageStyle::getHeader
-    /** @returns
+    /** @returns  
                 the interface of the header.
      */
-    com::sun::star::text::XHeaderFooter getHeader();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::text::XHeaderFooter getHeader(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XHeaderFooterPageStyle::getFooter
-    /** @returns
+    /** @returns 
                 the interface of the footer.
      */
-    com::sun::star::text::XHeaderFooter getFooter();
-
-};
-
-//=============================================================================
-
-}; }; }; };
+    com::sun::star::text::XHeaderFooter getFooter(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/text/XLineNumberingProperties.idl b/offapi/com/sun/star/text/XLineNumberingProperties.idl
index af52294119a0..952c737ec083 100644
--- a/offapi/com/sun/star/text/XLineNumberingProperties.idl
+++ b/offapi/com/sun/star/text/XLineNumberingProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@ published interface XLineNumberingProperties: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    /** @return
+    /** @return 
         the <type>LineNumberingProperties</type> of the object.
      */
     com::sun::star::beans::XPropertySet getLineNumberingProperties();
diff --git a/offapi/com/sun/star/text/XLineNumberingSupplier.idl b/offapi/com/sun/star/text/XLineNumberingSupplier.idl
index e12b433a5572..d910c6f11bd9 100644
--- a/offapi/com/sun/star/text/XLineNumberingSupplier.idl
+++ b/offapi/com/sun/star/text/XLineNumberingSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XLineNumberingSupplier_idl__
-#define __com_sun_star_text_XLineNumberingSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XLineNumberingSupplier_idl__ 
+#define __com_sun_star_text_XLineNumberingSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XLineNumberingSupplier
 /** contains the settings of the line numbering in a text document.
-
+    
     @deprecated
  */
 published interface XLineNumberingSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XLineNumberingSupplier::getLineNumberingRules
     /** @return the <type>LineNumberingSettings</type> of the object.
      */
-    sequence< sequence<com::sun::star::beans::PropertyValue> > getLineNumberingRules();
-
-    //-------------------------------------------------------------------------
-
+    sequence< sequence<com::sun::star::beans::PropertyValue> > getLineNumberingRules(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XLineNumberingSupplier::setLineNumberingRules
     /** sets a sequence of numbering rules.
-
-
-
+        
+        
+        
         <p>The elements of the sequence are representing the chapter levels,
         index 0 for the major chapter level.</p>
      */
-    void setLineNumberingRules( [in] sequence< sequence<com::sun::star::beans::PropertyValue> > aRules );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    void setLineNumberingRules( [in] sequence< sequence<com::sun::star::beans::PropertyValue> > aRules ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+
+#endif 
diff --git a/offapi/com/sun/star/text/XMailMergeBroadcaster.idl b/offapi/com/sun/star/text/XMailMergeBroadcaster.idl
index a4a0d0aa1192..83dfdbd8cb5b 100644
--- a/offapi/com/sun/star/text/XMailMergeBroadcaster.idl
+++ b/offapi/com/sun/star/text/XMailMergeBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 
 //module com { module sun { module star { module text {
 //     published interface XMailMergeListener;
-//}; }; }; };
+//}; }; }; }; 
 
 //=============================================================================
 
@@ -49,7 +49,7 @@ module com { module sun { module star { module text {
     <p>Registered listeners will be notified with a
     <type scope="com::sun::star::text">MailMergeEvent</type>
     when a document is about to get merged.</p>
-
+      
     @see    com::sun::star::text::MailMergeEvent
     @see    com::sun::star::text::MailMerge
 
@@ -59,20 +59,20 @@ published interface XMailMergeBroadcaster : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** Adds an entry to the list of mail merge listeners.
-
+    
         @param xListener
         The listener to be added.
     */
-    void addMailMergeEventListener(
+    void addMailMergeEventListener( 
                 [in] com::sun::star::text::XMailMergeListener xListener );
 
     //-------------------------------------------------------------------------
     /** Removes an entry to the list of mail merge listeners.
-
+        
         @param xListener
         The listener to be removed.
     */
-    void removeMailMergeEventListener(
+    void removeMailMergeEventListener( 
                 [in] com::sun::star::text::XMailMergeListener xListener );
 };
 
diff --git a/offapi/com/sun/star/text/XMailMergeListener.idl b/offapi/com/sun/star/text/XMailMergeListener.idl
index 1bc0a85a4504..105acf96a164 100644
--- a/offapi/com/sun/star/text/XMailMergeListener.idl
+++ b/offapi/com/sun/star/text/XMailMergeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ module com { module sun { module star { module text {
     <p>Registered listeners will be notified with a
     <type scope="com::sun::star::text">MailMergeEvent</type>
     when a document is about to get merged.</p>
-
+      
     @see    com::sun::star::text::MailMerge
     @see    com::sun::star::text::MailMergeEvent
 
@@ -56,12 +56,12 @@ published interface XMailMergeListener : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** Notifies the listener about mail merge events.
-
+    
         @param aEvent
         The Event containing the model of the document to be merged
         that is send to the listener.
     */
-    void notifyMailMergeEvent(
+    void notifyMailMergeEvent( 
                 [in] com::sun::star::text::MailMergeEvent aEvent );
 };
 
diff --git a/offapi/com/sun/star/text/XModule.idl b/offapi/com/sun/star/text/XModule.idl
index 49d0d38085b9..ed6aa4ceb39d 100644
--- a/offapi/com/sun/star/text/XModule.idl
+++ b/offapi/com/sun/star/text/XModule.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XModule_idl__
-#define __com_sun_star_text_XModule_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XModule_idl__ 
+#define __com_sun_star_text_XModule_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XModule
 /** @deprecated
  */
 published interface XModule: com::sun::star::uno::XInterface
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+
+#endif 
diff --git a/offapi/com/sun/star/text/XMultiTextMarkup.idl b/offapi/com/sun/star/text/XMultiTextMarkup.idl
index 27fdefb0472e..21ecac2f3d82 100644
--- a/offapi/com/sun/star/text/XMultiTextMarkup.idl
+++ b/offapi/com/sun/star/text/XMultiTextMarkup.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,23 +55,23 @@ interface XMultiTextMarkup
 {
     //-------------------------------------------------------------------------
     /** submits multiple new markup ranges.
-
-        <p>The main use of this function will probably be for proofreading to
+        
+        <p>The main use of this function will probably be for proofreading to 
         allow for setting the markup of all found errors in a sentence in a single
         call. For this the sequence needs to provide the markups for all errors along
         with the markup for the identified sentence boundaries.
         The order of those entries is arbitrary.</p>
-
+     
         @param aMarkups
                 a sequence of single text markups.
-
+        
         @see com::sun::star::text::XTextMarkup
         @see com::sun::star::text::TextMarkupType
-
+     
      */
-    void commitMultiTextMarkup(
+    void commitMultiTextMarkup( 
                     [in] sequence< com::sun::star::text::TextMarkupDescriptor > aMarkups )
-            raises( com::sun::star::lang::IllegalArgumentException );
+            raises( com::sun::star::lang::IllegalArgumentException ); 
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/text/XNumberingFormatter.idl b/offapi/com/sun/star/text/XNumberingFormatter.idl
index 2b86fc6b24c0..c45306c5ced9 100644
--- a/offapi/com/sun/star/text/XNumberingFormatter.idl
+++ b/offapi/com/sun/star/text/XNumberingFormatter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,8 +46,8 @@ module com { module sun { module star { module text {
     in various language environments.
     @see <type scope="com::sun::star::text">NumberingRules</type>
     @see <type scope="com::sun::star::text">NumberingLevel</type>
-    @version    1.0
-    @author     <a href="mailto:oliver.specht@germany.sun.com">Oliver Specht</a>
+    @version	1.0
+    @author		<a href="mailto:oliver.specht@germany.sun.com">Oliver Specht</a>
 */
 published interface XNumberingFormatter : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/text/XNumberingRulesSupplier.idl b/offapi/com/sun/star/text/XNumberingRulesSupplier.idl
index 818533169c2e..92d557370f4e 100644
--- a/offapi/com/sun/star/text/XNumberingRulesSupplier.idl
+++ b/offapi/com/sun/star/text/XNumberingRulesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/XNumberingTypeInfo.idl b/offapi/com/sun/star/text/XNumberingTypeInfo.idl
index c2705268915f..1d0fc22264b3 100644
--- a/offapi/com/sun/star/text/XNumberingTypeInfo.idl
+++ b/offapi/com/sun/star/text/XNumberingTypeInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,24 +38,24 @@ module com { module sun { module star { module text {
      correspond to an identifier.</p>
     @see <type scope="com::sun::star::text">NumberingRules</type>
     @see <type scope="com::sun::star::style">NumberingType</type>
-    @version    1.0
-    @author     <a href="mailto:oliver.specht@germany.sun.com">Oliver Specht</a>
+    @version	1.0
+    @author		<a href="mailto:oliver.specht@germany.sun.com">Oliver Specht</a>
 */
 published interface XNumberingTypeInfo : com::sun::star::uno::XInterface
 {
-    /** returns the numbering type values that are supported by the component.
+    /**	returns the numbering type values that are supported by the component.
         @see
     */
     sequence<short> getSupportedNumberingTypes();
     /** returns the corresponding numbering type to an identifier.
     */
-    short   getNumberingType([in]string NumberingIdentifier);
+    short	getNumberingType([in]string NumberingIdentifier);
     /** determins whether an identifier is supported.
     */
-    boolean hasNumberingType([in]string NumberingIdentifier);
+    boolean	hasNumberingType([in]string NumberingIdentifier);
     /** returns the corresponding identifiert to a numbering type.
     */
-    string  getNumberingIdentifier([in]short NumberingType);
+    string	getNumberingIdentifier([in]short NumberingType);
 };
 };};};};
 
diff --git a/offapi/com/sun/star/text/XPageCursor.idl b/offapi/com/sun/star/text/XPageCursor.idl
index 1cfc0dbcfa8c..a403329685c1 100644
--- a/offapi/com/sun/star/text/XPageCursor.idl
+++ b/offapi/com/sun/star/text/XPageCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,92 +24,92 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XPageCursor_idl__
-#define __com_sun_star_text_XPageCursor_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XPageCursor_idl__ 
+#define __com_sun_star_text_XPageCursor_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XPageCursor
 /** makes it possible to perform cursor movements between pages.
  */
 published interface XPageCursor: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XPageCursor::jumpToFirstPage
     /** moves the cursor to the first page.
      */
-    boolean jumpToFirstPage();
-
-    //-------------------------------------------------------------------------
-
+    boolean jumpToFirstPage(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XPageCursor::jumpToLastPage
     /** moves the cursor to the last page.
      */
-    boolean jumpToLastPage();
-
-    //-------------------------------------------------------------------------
-
+    boolean jumpToLastPage(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XPageCursor::jumpToPage
     /** moves the cursor to the specified page.
      */
-    boolean jumpToPage( [in] short nPage );
-
-    //-------------------------------------------------------------------------
-
+    boolean jumpToPage( [in] short nPage ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XPageCursor::getPage
-    /** @returns
+    /** @returns  
                 the number of the page within the document of this cursor.
      */
-    short getPage();
-
-    //-------------------------------------------------------------------------
-
+    short getPage(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XPageCursor::jumpToNextPage
     /** moves the cursor to the next page.
 
         @see XPageCursor::jumpToPreviousPage
      */
     boolean jumpToNextPage();
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XPageCursor::jumpToPreviousPage
     /** moves the cursor to the previous page.
 
         @see XPageCursor::jumpToNextPage
      */
     boolean jumpToPreviousPage();
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XPageCursor::jumpToEndOfPage
     /** moves the cursor to the end of the current page.
 
         @see XPageCursor::jumpToEndOfPreviousPage
      */
-    boolean jumpToEndOfPage();
-
-    //-------------------------------------------------------------------------
-
+    boolean jumpToEndOfPage(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XPageCursor::jumpToStartOfPage
     /** moves the cursor to the start of the current page.
      */
-    boolean jumpToStartOfPage();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean jumpToStartOfPage(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XPagePrintable.idl b/offapi/com/sun/star/text/XPagePrintable.idl
index 7a590613ec8a..b6945263e6fc 100644
--- a/offapi/com/sun/star/text/XPagePrintable.idl
+++ b/offapi/com/sun/star/text/XPagePrintable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/XParagraphAppend.idl b/offapi/com/sun/star/text/XParagraphAppend.idl
index 60d41b489693..b03319e2cba7 100644
--- a/offapi/com/sun/star/text/XParagraphAppend.idl
+++ b/offapi/com/sun/star/text/XParagraphAppend.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,71 +24,71 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XParagraphAppend_idl__
-#define __com_sun_star_text_XParagraphAppend_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_text_XParagraphAppend_idl__ 
+#define __com_sun_star_text_XParagraphAppend_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
 #ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
 #endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
-#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextRange_idl__
-#include <com/sun/star/text/XTextRange.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
+#include <com/sun/star/beans/UnknownPropertyException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XTextRange_idl__ 
+#include <com/sun/star/text/XTextRange.idl> 
+#endif 
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** .
  */
 interface XParagraphAppend : com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
         /** appends a new and empty paragraph at the end of the text.
-
+        
                 <p>The properties are applied to the new paragraph.
         </p>
 
-        @param
-            CharacterAndParagraphProperties can contain all the properties defined by the service
+        @param 
+            CharacterAndParagraphProperties can contain all the properties defined by the service 
                       <type scope="com::sun::star::text">Paragraph.
 
      */
-         com::sun::star::text::XTextRange appendParagraph(  [in] com::sun::star::beans::PropertyValues CharacterAndParagraphProperties )
+         com::sun::star::text::XTextRange appendParagraph(  [in] com::sun::star::beans::PropertyValues CharacterAndParagraphProperties ) 
                         raises( com::sun::star::lang::IllegalArgumentException,
-                                       com::sun::star::beans::UnknownPropertyException );
+                                       com::sun::star::beans::UnknownPropertyException ); 
          /** appends a new and empty paragraph at the end of the text.
-
+                
                 <p>The properties are applied to the last paragraph before the new pargraph is inserted.
                 </p>
 
-        @param
-            CharacterAndParagraphProperties can contain all the properties defined by the service
+        @param 
+            CharacterAndParagraphProperties can contain all the properties defined by the service 
                       <type scope="com::sun::star::text">Paragraph.
 
          */
-         com::sun::star::text::XTextRange finishParagraph(  [in] com::sun::star::beans::PropertyValues CharacterAndParagraphProperties )
+         com::sun::star::text::XTextRange finishParagraph(  [in] com::sun::star::beans::PropertyValues CharacterAndParagraphProperties ) 
                         raises( com::sun::star::lang::IllegalArgumentException,
-                                       com::sun::star::beans::UnknownPropertyException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+                                       com::sun::star::beans::UnknownPropertyException ); 
+   
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XParagraphCursor.idl b/offapi/com/sun/star/text/XParagraphCursor.idl
index 7e83557674f2..b2b807d4aaca 100644
--- a/offapi/com/sun/star/text/XParagraphCursor.idl
+++ b/offapi/com/sun/star/text/XParagraphCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,82 +24,82 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XParagraphCursor_idl__
-#define __com_sun_star_text_XParagraphCursor_idl__
-
-#ifndef __com_sun_star_text_XTextCursor_idl__
-#include <com/sun/star/text/XTextCursor.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XParagraphCursor_idl__ 
+#define __com_sun_star_text_XParagraphCursor_idl__ 
+ 
+#ifndef __com_sun_star_text_XTextCursor_idl__ 
+#include <com/sun/star/text/XTextCursor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to move paragraph by paragraph.
  */
 published interface XParagraphCursor: com::sun::star::text::XTextCursor
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the cursor is positioned at the start of a paragraph.
      */
-    boolean isStartOfParagraph();
-
-    //-------------------------------------------------------------------------
-
+    boolean isStartOfParagraph(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the cursor is positioned at the end of a paragraph.
      */
-    boolean isEndOfParagraph();
-
-    //-------------------------------------------------------------------------
-
+    boolean isEndOfParagraph(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the start of the current paragraph.
 
         @returns
-            <true/> if the cursor is now at the start of a paragraph,
+            <true/> if the cursor is now at the start of a paragraph, 
             <false/> otherwise. If <false/> was returned the cursor
             will remain at its original position.
      */
-    boolean gotoStartOfParagraph( [in] boolean bExpand );
-
-    //-------------------------------------------------------------------------
-
+    boolean gotoStartOfParagraph( [in] boolean bExpand ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the end of the current paragraph.
 
         @returns
-            <true/> if the cursor is now at the end of a paragraph,
+            <true/> if the cursor is now at the end of a paragraph, 
             <false/> otherwise. If <false/> was returned the cursor
             will remain at its original position.
      */
-    boolean gotoEndOfParagraph( [in] boolean bExpand );
-
-    //-------------------------------------------------------------------------
-
+    boolean gotoEndOfParagraph( [in] boolean bExpand ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the next paragraph.
 
         @returns
             <true/> if the cursor was moved. It returns <false/> it the
             cursor can not advance further.
      */
-    boolean gotoNextParagraph( [in] boolean bExpand );
-
-    //-------------------------------------------------------------------------
-
+    boolean gotoNextParagraph( [in] boolean bExpand ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the previous paragraph.
 
         @returns
             <true/> if the cursor was moved. It returns <false/> it the
             cursor can not advance further.
      */
-    boolean gotoPreviousParagraph( [in] boolean bExpand );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean gotoPreviousParagraph( [in] boolean bExpand ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XRedline.idl b/offapi/com/sun/star/text/XRedline.idl
index e11607871f21..8bd9aff0c066 100644
--- a/offapi/com/sun/star/text/XRedline.idl
+++ b/offapi/com/sun/star/text/XRedline.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XRedline_idl__
-#define __com_sun_star_text_XRedline_idl__
-
+#ifndef __com_sun_star_text_XRedline_idl__ 
+#define __com_sun_star_text_XRedline_idl__ 
+ 
 #ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
 #endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** enables creation of redlines (change tracking).
  */
 published interface XRedline
-{
-    //-------------------------------------------------------------------------
-
-        /**
+{ 
+    //------------------------------------------------------------------------- 
+     
+        /** 
                 @param RedlineType
                 <p> Valid type names are:</p>
                     <UL>
@@ -62,12 +62,12 @@ published interface XRedline
                 [readonly, property] com::sun::star::util::DateTime RedlineDateTime;
                 [readonly, property] string RedlineComment;
         */
-        void makeRedline( [in]string RedlineType, [in] com::sun::star::beans::PropertyValues  RedlineProperties)
-                        raises( com::sun::star::lang::IllegalArgumentException );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+        void makeRedline( [in]string RedlineType, [in] com::sun::star::beans::PropertyValues  RedlineProperties) 
+                        raises( com::sun::star::lang::IllegalArgumentException ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XReferenceMarksSupplier.idl b/offapi/com/sun/star/text/XReferenceMarksSupplier.idl
index dae6f4963e14..db2f40ea8879 100644
--- a/offapi/com/sun/star/text/XReferenceMarksSupplier.idl
+++ b/offapi/com/sun/star/text/XReferenceMarksSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XReferenceMarksSupplier_idl__
-#define __com_sun_star_text_XReferenceMarksSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XReferenceMarksSupplier_idl__ 
+#define __com_sun_star_text_XReferenceMarksSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XReferenceMarksSupplier
 /** provides access to the reference marks within this context (i.e. document).
-
-
-
-    <p>A reference mark is used to refer to text positions in a text
+    
+    
+    
+    <p>A reference mark is used to refer to text positions in a text 
     document.
-
+    
     </p>
  */
 published interface XReferenceMarksSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XReferenceMarksSupplier::getReferenceMarks
-    /** @returns
+    /** @returns 
                 the collection of reference marks.
      */
-    com::sun::star::container::XNameAccess getReferenceMarks();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+    com::sun::star::container::XNameAccess getReferenceMarks(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+
+#endif 
diff --git a/offapi/com/sun/star/text/XRelativeTextContentInsert.idl b/offapi/com/sun/star/text/XRelativeTextContentInsert.idl
index 9272ad9281d2..6b6db1bc5766 100644
--- a/offapi/com/sun/star/text/XRelativeTextContentInsert.idl
+++ b/offapi/com/sun/star/text/XRelativeTextContentInsert.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,63 +24,63 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XRelativeTextContentInsert_idl__
-#define __com_sun_star_text_XRelativeTextContentInsert_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
- published interface XTextContent;
-
-
+#ifndef __com_sun_star_text_XRelativeTextContentInsert_idl__ 
+#define __com_sun_star_text_XRelativeTextContentInsert_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+ published interface XTextContent; 
+ 
+ 
 // DocMerge from xml: interface com::sun::star::text::XRelativeTextContentInsert
 /** makes it possible to insert new text contents before or
     after existing text contents.
-
-
-
-
-
-
-
+    
+    
+    
+    
+    
+    
+    
     @deprecated
  */
 published interface XRelativeTextContentInsert: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XRelativeTextContentInsert::insertTextContentBefore
     /** inserts text the new text content before of the successor argument.
-
+        
         <p> This is helpful to insert paragraphs before of text tables. </p>
      */
-    void insertTextContentBefore(
-            [in] XTextContent xNewContent,
-            [in] XTextContent xSuccessor )
-        raises( com::sun::star::lang::IllegalArgumentException );
-    //-------------------------------------------------------------------------
-
+    void insertTextContentBefore( 
+            [in] XTextContent xNewContent, 
+            [in] XTextContent xSuccessor ) 
+        raises( com::sun::star::lang::IllegalArgumentException ); 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XRelativeTextContentInsert::insertTextContentAfter
     /** inserts text the new text content after the predecessor argument.
-
+        
         <p> This is helpful to insert paragraphs after text tables escpecially in
         headers, footers or text frames. </p>
      */
-    void insertTextContentAfter(
-            [in] XTextContent xNewContent,
-            [in] XTextContent xPredecessor )
-        raises( com::sun::star::lang::IllegalArgumentException );
-};
-
-};};};};
-
-#endif
-
+    void insertTextContentAfter( 
+            [in] XTextContent xNewContent, 
+            [in] XTextContent xPredecessor ) 
+        raises( com::sun::star::lang::IllegalArgumentException ); 
+}; 
+ 
+};};};}; 
+
+#endif 
+ 
diff --git a/offapi/com/sun/star/text/XRelativeTextContentRemove.idl b/offapi/com/sun/star/text/XRelativeTextContentRemove.idl
index da108323613f..217bb6ffde60 100644
--- a/offapi/com/sun/star/text/XRelativeTextContentRemove.idl
+++ b/offapi/com/sun/star/text/XRelativeTextContentRemove.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,59 +24,59 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XRelativeTextContentRemove_idl__
-#define __com_sun_star_text_XRelativeTextContentRemove_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
- published interface XTextContent;
-
+#ifndef __com_sun_star_text_XRelativeTextContentRemove_idl__ 
+#define __com_sun_star_text_XRelativeTextContentRemove_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+ published interface XTextContent; 
+ 
 // DocMerge from xml: interface com::sun::star::text::XRelativeTextContentRemove
 /** makes it possible to remove text contents before or
     after existing text contents.
-
-
-
-
-
-
-
+    
+    
+    
+    
+    
+    
+    
     @deprecated
  */
 published interface XRelativeTextContentRemove: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XRelativeTextContentRemove::removeTextContentBefore
     /** removes the text content that preceeds the argument.
-
+        
         <p> This is helpful to remove empty paragraphs before text tables. </p>
      */
-    void removeTextContentBefore(
-            [in] XTextContent xSuccessor )
-        raises( com::sun::star::lang::IllegalArgumentException );
-    //-------------------------------------------------------------------------
-
+    void removeTextContentBefore( 
+            [in] XTextContent xSuccessor ) 
+        raises( com::sun::star::lang::IllegalArgumentException ); 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XRelativeTextContentRemove::removeTextContentAfter
     /** removes the text content that follows the argument.
-
+        
         <p> This is helpful to remove empty paragraphs followin text tables espacially in
         headers, footers or text frames. </p>
      */
-    void removeTextContentAfter(
-            [in] XTextContent xPredecessor )
-        raises( com::sun::star::lang::IllegalArgumentException );
-};
-};};};};
-
-#endif
-
+    void removeTextContentAfter( 
+            [in] XTextContent xPredecessor ) 
+        raises( com::sun::star::lang::IllegalArgumentException ); 
+}; 
+};};};}; 
+
+#endif 
+ 
diff --git a/offapi/com/sun/star/text/XRubySelection.idl b/offapi/com/sun/star/text/XRubySelection.idl
index 156f501ec4ba..e33da371819e 100644
--- a/offapi/com/sun/star/text/XRubySelection.idl
+++ b/offapi/com/sun/star/text/XRubySelection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/XSentenceCursor.idl b/offapi/com/sun/star/text/XSentenceCursor.idl
index af9534972b69..00f0e54afc94 100644
--- a/offapi/com/sun/star/text/XSentenceCursor.idl
+++ b/offapi/com/sun/star/text/XSentenceCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,82 +24,82 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XSentenceCursor_idl__
-#define __com_sun_star_text_XSentenceCursor_idl__
-
-#ifndef __com_sun_star_text_XTextCursor_idl__
-#include <com/sun/star/text/XTextCursor.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XSentenceCursor_idl__ 
+#define __com_sun_star_text_XSentenceCursor_idl__ 
+ 
+#ifndef __com_sun_star_text_XTextCursor_idl__ 
+#include <com/sun/star/text/XTextCursor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to perform cursor movements through sentences.
  */
 published interface XSentenceCursor: com::sun::star::text::XTextCursor
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the cursor is positioned at the start of a sentence.
      */
-    boolean isStartOfSentence();
-
-    //-------------------------------------------------------------------------
-
+    boolean isStartOfSentence(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the cursor is positioned at the end of a sentence.
      */
-    boolean isEndOfSentence();
-
-    //-------------------------------------------------------------------------
-
+    boolean isEndOfSentence(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the start of the next sentence.
 
         @returns
             <true/> if the cursor was moved. It returns <false/> it the
             cursor can not advance further.
      */
-    boolean gotoNextSentence( [in] boolean Expand );
-
-    //-------------------------------------------------------------------------
-
+    boolean gotoNextSentence( [in] boolean Expand ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the start of the previous sentence.
 
         @returns
             <true/> if the cursor was moved. It returns <false/> it the
             cursor can not advance further.
      */
-    boolean gotoPreviousSentence( [in] boolean Expand );
-
-    //-------------------------------------------------------------------------
-
+    boolean gotoPreviousSentence( [in] boolean Expand ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the start of the current sentence.
 
         @returns
-            <true/> if the cursor is now at the start of a sentence,
+            <true/> if the cursor is now at the start of a sentence, 
             <false/> otherwise. If <false/> was returned the cursor
             will remain at its original position.
      */
-    boolean gotoStartOfSentence( [in] boolean Expand );
-
-    //-------------------------------------------------------------------------
-
+    boolean gotoStartOfSentence( [in] boolean Expand ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the end of the current sentence.
 
         @returns
-            <true/> if the cursor is now at the end of a sentence,
+            <true/> if the cursor is now at the end of a sentence, 
             <false/> otherwise. If <false/> was returned the cursor
             will remain at its original position.
      */
-    boolean gotoEndOfSentence( [in] boolean Expand );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean gotoEndOfSentence( [in] boolean Expand ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XSimpleText.idl b/offapi/com/sun/star/text/XSimpleText.idl
index f39c8ab334ab..f65308af07ad 100644
--- a/offapi/com/sun/star/text/XSimpleText.idl
+++ b/offapi/com/sun/star/text/XSimpleText.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,73 +24,73 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XSimpleText_idl__
-#define __com_sun_star_text_XSimplText_idl__
-
-#ifndef __com_sun_star_text_XTextRange_idl__
-#include <com/sun/star/text/XTextRange.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextCursor_idl__
-#include <com/sun/star/text/XTextCursor.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextContent_idl__
-#include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XSimpleText_idl__ 
+#define __com_sun_star_text_XSimplText_idl__ 
+ 
+#ifndef __com_sun_star_text_XTextRange_idl__ 
+#include <com/sun/star/text/XTextRange.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XTextCursor_idl__ 
+#include <com/sun/star/text/XTextCursor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XTextContent_idl__ 
+#include <com/sun/star/text/XTextContent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** is the main interface for a distinct text unit, i.e. the main text of
-    a document, the text for headers and footers or for single cells of a
+    a document, the text for headers and footers or for single cells of a 
     table.@see XText
  */
 published interface XSimpleText: com::sun::star::text::XTextRange
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
-                a new instance of a <type>TextCursor</type> service which can
-                be used to travel in the given text context.
-
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+                a new instance of a <type>TextCursor</type> service which can 
+                be used to travel in the given text context. 
+                 
                 @see com::sun::star::text::TextCursor
      */
-    com::sun::star::text::XTextCursor createTextCursor();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-                a new instance of a <type>TextCursor</type> which is located
-                at the specified <type>TextRange</type> to travel in the
-                given text context.
-
-                <p>The initial position is set to <var>aTextPosition</var>.
-
-                @param aTextPosition
-                specifies the start position for the new
-                <type>TextCursor</type>.
-
+    com::sun::star::text::XTextCursor createTextCursor(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+                a new instance of a <type>TextCursor</type> which is located  
+                at the specified <type>TextRange</type> to travel in the 
+                given text context. 
+                 
+                <p>The initial position is set to <var>aTextPosition</var>. 
+                 
+                @param aTextPosition 
+                specifies the start position for the new 
+                <type>TextCursor</type>. 
+                 
                 @see com::sun::star::text::TextCursor
      */
-    com::sun::star::text::XTextCursor createTextCursorByRange( [in] com::sun::star::text::XTextRange aTextPosition );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::text::XTextCursor createTextCursorByRange( [in] com::sun::star::text::XTextRange aTextPosition ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** inserts a string of characters into the text.
-
+        
         <p>The string may contain the following white spaces:
         </p>
         <ul>
@@ -117,35 +117,35 @@ published interface XSimpleText: com::sun::star::text::XTextRange
             replaced. If <TRUE/> then the content of <var>xRange</var> will
             be replaced by <var>aString</var>, otherwise <var>aString</var>
             will be inserted at the beginning of <var>xRange</var>.
-
-        @example
+        
+        @example 
             <listing>
             xText.insertString( xTextCursor, "Hello " + aName$ + ",", false )
-
+        
             xText.insertControlCharacter( xTextCursor,
             ControlCharacter_PARAGRAPH_BREAK, false );
-
+        
             xText.insertString( xTextCursor, "more text ...", false )
             </listing>
      */
-    [oneway] void insertString( [in] com::sun::star::text::XTextRange xRange,
-             [in] string aString,
-             [in] boolean bAbsorb );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void insertString( [in] com::sun::star::text::XTextRange xRange, 
+             [in] string aString, 
+             [in] boolean bAbsorb ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** inserts a control character (like a paragraph break or a hard
         space) into the text.@see com::sun::star::text::ControlCharacter
      */
-    void insertControlCharacter( [in] com::sun::star::text::XTextRange xRange,
-             [in] short nControlCharacter,
-             [in] boolean bAbsorb )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void insertControlCharacter( [in] com::sun::star::text::XTextRange xRange, 
+             [in] short nControlCharacter, 
+             [in] boolean bAbsorb ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XText.idl b/offapi/com/sun/star/text/XText.idl
index f0eee780802f..114daf0095ae 100644
--- a/offapi/com/sun/star/text/XText.idl
+++ b/offapi/com/sun/star/text/XText.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XText_idl__
-#define __com_sun_star_text_XText_idl__
-
-#ifndef __com_sun_star_text_XSimpleText_idl__
-#include <com/sun/star/text/XSimpleText.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextCursor_idl__
-#include <com/sun/star/text/XTextCursor.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextContent_idl__
-#include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
-/** extends a <type>XSimpleText</type> by the capability of inserting
+#ifndef __com_sun_star_text_XText_idl__ 
+#define __com_sun_star_text_XText_idl__ 
+ 
+#ifndef __com_sun_star_text_XSimpleText_idl__ 
+#include <com/sun/star/text/XSimpleText.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XTextCursor_idl__ 
+#include <com/sun/star/text/XTextCursor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XTextContent_idl__ 
+#include <com/sun/star/text/XTextContent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
+/** extends a <type>XSimpleText</type> by the capability of inserting 
         <type>XTextContent</type>s.
  */
 published interface XText: com::sun::star::text::XSimpleText
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** inserts a content, such as a text table, text frame or text
         field.
-
+        
         <p>Which contents are accepted is implementation-specific. Some
         implementations may only accept contents which were created by the
         factory that supplied the same text or the document which contains
@@ -82,24 +82,24 @@ published interface XText: com::sun::star::text::XSimpleText
             be replaced by <var>xContent</var>, otherwise <var>xContent</var>
             will be inserted at the end of <var>xRange</var>.
      */
-    void insertTextContent( [in] com::sun::star::text::XTextRange xRange,
-             [in] com::sun::star::text::XTextContent xContent,
-             [in] boolean bAbsorb )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-
+    void insertTextContent( [in] com::sun::star::text::XTextRange xRange, 
+             [in] com::sun::star::text::XTextContent xContent, 
+             [in] boolean bAbsorb ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified content from the text object.
-
+        
         @example xDoc.removeTextContent( xDoc.TextTables.MyOwnTableName )
      */
-    void removeTextContent( [in] com::sun::star::text::XTextContent xContent )
-            raises( com::sun::star::container::NoSuchElementException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void removeTextContent( [in] com::sun::star::text::XTextContent xContent ) 
+            raises( com::sun::star::container::NoSuchElementException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextAppend.idl b/offapi/com/sun/star/text/XTextAppend.idl
index 8e562fcf4ab3..1631a0eef4ad 100644
--- a/offapi/com/sun/star/text/XTextAppend.idl
+++ b/offapi/com/sun/star/text/XTextAppend.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextAppend_idl__
-#define __com_sun_star_text_XTextAppend_idl__
-
-
-#ifndef __com_sun_star_text_XText_idl__
-#include <com/sun/star/text/XText.idl>
-#endif
-#ifndef __com_sun_star_text_XTextPortionAppend_idl__
-#include <com/sun/star/text/XTextPortionAppend.idl>
-#endif
-#ifndef __com_sun_star_text_XParagraphAppend_idl__
-#include <com/sun/star/text/XParagraphAppend.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextAppend_idl__ 
+#define __com_sun_star_text_XTextAppend_idl__ 
+ 
+
+#ifndef __com_sun_star_text_XText_idl__ 
+#include <com/sun/star/text/XText.idl> 
+#endif 
+#ifndef __com_sun_star_text_XTextPortionAppend_idl__ 
+#include <com/sun/star/text/XTextPortionAppend.idl> 
+#endif 
+#ifndef __com_sun_star_text_XParagraphAppend_idl__ 
+#include <com/sun/star/text/XParagraphAppend.idl> 
+#endif 
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** .
  */
-     interface XTextAppend
-{
+     interface XTextAppend 
+{ 
     interface com::sun::star::text::XText;
     interface com::sun::star::text::XParagraphAppend;
     interface com::sun::star::text::XTextPortionAppend ;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextAppendAndConvert.idl b/offapi/com/sun/star/text/XTextAppendAndConvert.idl
index 48869f4303f8..9be7f2a10d57 100644
--- a/offapi/com/sun/star/text/XTextAppendAndConvert.idl
+++ b/offapi/com/sun/star/text/XTextAppendAndConvert.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextAppendAndConvert_idl__
-#define __com_sun_star_text_XTextAppendAndConvert_idl__
-
-
-#ifndef __com_sun_star_text_XTextAppend_idl__
-#include <com/sun/star/text/XTextAppend.idl>
-#endif
-#ifndef __com_sun_star_text_XTextContentAppend_idl__
-#include <com/sun/star/text/XTextContentAppend.idl>
-#endif
-#ifndef __com_sun_star_text_XTextConvert_idl__
-#include <com/sun/star/text/XTextConvert.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextAppendAndConvert_idl__ 
+#define __com_sun_star_text_XTextAppendAndConvert_idl__ 
+
+
+#ifndef __com_sun_star_text_XTextAppend_idl__ 
+#include <com/sun/star/text/XTextAppend.idl> 
+#endif 
+#ifndef __com_sun_star_text_XTextContentAppend_idl__ 
+#include <com/sun/star/text/XTextContentAppend.idl> 
+#endif 
+#ifndef __com_sun_star_text_XTextConvert_idl__ 
+#include <com/sun/star/text/XTextConvert.idl> 
+#endif 
+
+//============================================================================= 
+
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** merges the functions of <type>XTextAppend</type>,
     <type>XTextContentAppend</type> and <type>XTextConvert</type>.
  */
      interface XTextAppendAndConvert
-{
+{ 
     interface com::sun::star::text::XTextAppend;
     interface com::sun::star::text::XTextContentAppend;
     interface com::sun::star::text::XTextConvert;
-};
-
-//=============================================================================
-
-}; }; }; };
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/text/XTextColumns.idl b/offapi/com/sun/star/text/XTextColumns.idl
index 8afc1c2cfceb..70fa27a5f18f 100644
--- a/offapi/com/sun/star/text/XTextColumns.idl
+++ b/offapi/com/sun/star/text/XTextColumns.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,92 +24,92 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextColumns_idl__
-#define __com_sun_star_text_XTextColumns_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_text_TextColumn_idl__
-#include <com/sun/star/text/TextColumn.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextColumns_idl__ 
+#define __com_sun_star_text_XTextColumns_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_TextColumn_idl__ 
+#include <com/sun/star/text/TextColumn.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XTextColumns
 /** manages columns within the object.
-
-
-
+    
+    
+    
     <p>The values used are relative. So it is not necessary to know the
     width of the object. The sum of the relative width values depends on
     the object and is defined in "ReferenceValue."
-
+    
     </p>
  */
 published interface XTextColumns: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextColumns::getReferenceValue
-    /** @returns
-                the sum of all values.
-
+    /** @returns 
+                the sum of all values. 
+         
                 <p>As described above, the width values are relative.
      */
-    long getReferenceValue();
-
-    //-------------------------------------------------------------------------
-
+    long getReferenceValue(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextColumns::getColumnCount
-    /** @returns
+    /** @returns 
                 the number of columns.
      */
-    short getColumnCount();
-
-    //-------------------------------------------------------------------------
-
+    short getColumnCount(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XTextColumns::setColumnCount
     /** sets the number of columns.
-
-
-
+        
+        
+        
         <p>The minimum is 1 column.</p>
      */
-    void setColumnCount( [in] short nColumns );
-
-    //-------------------------------------------------------------------------
-
+    void setColumnCount( [in] short nColumns ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextColumns::getColumns
-    /** returns the column description of the object.
+    /** returns the column description of the object. 
                 @see TextColumn
      */
-    sequence<com::sun::star::text::TextColumn> getColumns();
-
-    //-------------------------------------------------------------------------
-
+    sequence<com::sun::star::text::TextColumn> getColumns(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XTextColumns::setColumns
     /** sets the descriptors of all columns.
-
-
-
+        
+        
+        
         <p>The number of members in the sequence must be the same as the
         number of columns of the object.
-
+        
         </p>@see TextColumn
      */
-    void setColumns( [in] sequence<com::sun::star::text::TextColumn> Columns );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void setColumns( [in] sequence<com::sun::star::text::TextColumn> Columns ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextContent.idl b/offapi/com/sun/star/text/XTextContent.idl
index 70b6a0be9f13..dbdde556b44e 100644
--- a/offapi/com/sun/star/text/XTextContent.idl
+++ b/offapi/com/sun/star/text/XTextContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -79,8 +79,8 @@ published interface XTextContent: com::sun::star::lang::XComponent
     /** @returns
                 the text range to which the content is attached.
 
-        <p>Note: The anchor of the actual implementation for text tables
-        does not have a position in the text. Thus that anchor can not be
+        <p>Note: The anchor of the actual implementation for text tables 
+        does not have a position in the text. Thus that anchor can not be 
         used for some operation like <member>attach</member> for example or
         <member scope="com::sun::star::text">insertTextContent</member>
         or other function that require the object to have a position in the text.</p>
diff --git a/offapi/com/sun/star/text/XTextContentAppend.idl b/offapi/com/sun/star/text/XTextContentAppend.idl
index 472e922a80f1..15bb020031b9 100644
--- a/offapi/com/sun/star/text/XTextContentAppend.idl
+++ b/offapi/com/sun/star/text/XTextContentAppend.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,65 +24,65 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextContentAppend_idl__
-#define __com_sun_star_text_XTextContentAppend_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_text_XTextContentAppend_idl__ 
+#define __com_sun_star_text_XTextContentAppend_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
 #ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
 #endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
-#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
+#include <com/sun/star/beans/UnknownPropertyException.idl> 
+#endif 
 
 #ifndef __com_sun_star_text_XTextContent_idl__
-#include <com/sun/star/text/XTextContent.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#include <com/sun/star/text/XTextContent.idl> 
+#endif 
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** .
  */
 interface XTextContentAppend : com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
         /** appends a text content at the end of the text.
-
-                <p> The sequence can contain all the properties defined by the service
+        
+                <p> The sequence can contain all the properties defined by the service 
                 <type scope="com::sun::star::text">.
         </p>
 
         @param TextContent
             contains the object to be inserted.
-        @param CharacterAndParagraphProperties
-            can contain all the properties defined by the service
+        @param CharacterAndParagraphProperties 
+            can contain all the properties defined by the service 
                       <type scope="com::sun::star::text">Paragraph.
         @return
             the anchor text range of the inserted text content.
      */
-         com::sun::star::text::XTextRange appendTextContent(
+         com::sun::star::text::XTextRange appendTextContent(  
              [in] com::sun::star::text::XTextContent TextContent,
-             [in] com::sun::star::beans::PropertyValues CharacterAndParagraphProperties )
+             [in] com::sun::star::beans::PropertyValues CharacterAndParagraphProperties ) 
                                 raises( com::sun::star::lang::IllegalArgumentException,
-                                       com::sun::star::beans::UnknownPropertyException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+                                       com::sun::star::beans::UnknownPropertyException ); 
+  
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextConvert.idl b/offapi/com/sun/star/text/XTextConvert.idl
index d80f7fec9305..b93fd69bbd50 100644
--- a/offapi/com/sun/star/text/XTextConvert.idl
+++ b/offapi/com/sun/star/text/XTextConvert.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,94 +24,94 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextConvert_idl__
-#define __com_sun_star_text_XTextConvert_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_text_XTextConvert_idl__ 
+#define __com_sun_star_text_XTextConvert_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
 #ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
 #endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
-#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextRange_idl__
-#include <com/sun/star/text/XTextRange.idl>
-#endif
-#ifndef __com_sun_star_text_XTextContent_idl__
-#include <com/sun/star/text/XTextContent.idl>
-#endif
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
+#include <com/sun/star/beans/UnknownPropertyException.idl> 
+#endif 
+
+#ifndef __com_sun_star_text_XTextRange_idl__ 
+#include <com/sun/star/text/XTextRange.idl> 
+#endif 
+#ifndef __com_sun_star_text_XTextContent_idl__ 
+#include <com/sun/star/text/XTextContent.idl> 
+#endif 
 #ifndef __com_sun_star_text_XTextTable_idl__
 #include <com/sun/star/text/XTextTable.idl>
 #endif
 
 
 
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** .
  */
 interface XTextConvert : com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
         /** moves the paragraphs from Start to End into a text frame.
-
+        
                 <p>FrameProperties contains the properties of the to-be-created text frame.</p>
 
-        @param
+        @param 
             .
 
-        @param
+        @param 
             .
         @return
-
+            
      */
-    ::com::sun::star::text::XTextContent convertToTextFrame(
+    ::com::sun::star::text::XTextContent convertToTextFrame( 
                         [in] com::sun::star::text::XTextRange Start,
                         [in] com::sun::star::text::XTextRange End,
                         [in] com::sun::star::beans::PropertyValues FrameProperties )
                         raises( com::sun::star::lang::IllegalArgumentException,
-                                       com::sun::star::beans::UnknownPropertyException );
-
+                                       com::sun::star::beans::UnknownPropertyException ); 
+ 
         /** .
+        
 
-
-        @param TableRanges contains the TextRange interfaces of the paragraphs, cells and rows of the table.
-            <p>The innter sequence contains the start and end paragraphs of each table cell.
+        @param TableRanges contains the TextRange interfaces of the paragraphs, cells and rows of the table. 
+            <p>The innter sequence contains the start and end paragraphs of each table cell. 
             The next sequence groups the cells to a row and the outer sequence groups the rows of the table.</p>
 
         @param CellProperties contains the properties of each cell.
         @param RowProperties contains the properties of each table row.
         @param TableProperties contains the properties of the table.
         @return the created table.
-
+            
      */
-    ::com::sun::star::text::XTextTable convertToTable(
+    ::com::sun::star::text::XTextTable convertToTable(  
                      [in] sequence< sequence< sequence< com::sun::star::text::XTextRange > > > TableRanges,
                      [in] sequence< sequence< com::sun::star::beans::PropertyValues > > CellProperties,
                      [in] sequence< com::sun::star::beans::PropertyValues > RowProperties,
                      [in] com::sun::star::beans::PropertyValues TableProperties )
                         raises( com::sun::star::lang::IllegalArgumentException,
-                                       com::sun::star::beans::UnknownPropertyException );
-
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+                                       com::sun::star::beans::UnknownPropertyException ); 
+
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextCopy.idl b/offapi/com/sun/star/text/XTextCopy.idl
index 5e1d91e5e82d..1fe7721d68ef 100644
--- a/offapi/com/sun/star/text/XTextCopy.idl
+++ b/offapi/com/sun/star/text/XTextCopy.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XText_idl__
-#define __com_sun_star_text_XText_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XText_idl__ 
+#define __com_sun_star_text_XText_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** enables a text object to copy attributed text from another text object.
  */
 published interface XTextCopy: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
         /** copies the content from another text object.
-
+        
         @param xSource
             specifies the source text object.
      */
-        void copyText( [in] com::sun::star::text::XTextCopy xSource );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+        void copyText( [in] com::sun::star::text::XTextCopy xSource ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextCursor.idl b/offapi/com/sun/star/text/XTextCursor.idl
index eda255e16ea5..f522db16fc0e 100644
--- a/offapi/com/sun/star/text/XTextCursor.idl
+++ b/offapi/com/sun/star/text/XTextCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,10 +68,10 @@ published interface XTextCursor: com::sun::star::text::XTextRange
             the number of characters to move.
 
         @param bExpand
-            specifies if the current selection of the cursor should
+            specifies if the current selection of the cursor should 
             be expanded or not.
-
-        @returns
+        
+        @returns 
             <TRUE/> if the command was successfully completed.
             <FALSE/> otherwise.
 
@@ -91,10 +91,10 @@ published interface XTextCursor: com::sun::star::text::XTextRange
             the number of characters to move.
 
         @param bExpand
-            specifies if the current selection of the cursor should
+            specifies if the current selection of the cursor should 
             be expanded or not.
-
-        @returns
+        
+        @returns 
             <TRUE/> if the command was successfully completed.
             <FALSE/> otherwise.
 
diff --git a/offapi/com/sun/star/text/XTextDocument.idl b/offapi/com/sun/star/text/XTextDocument.idl
index c1d8d04ed4ce..5c268c073c99 100644
--- a/offapi/com/sun/star/text/XTextDocument.idl
+++ b/offapi/com/sun/star/text/XTextDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextDocument_idl__
-#define __com_sun_star_text_XTextDocument_idl__
-
-#ifndef __com_sun_star_frame_XModel_idl__
-#include <com/sun/star/frame/XModel.idl>
-#endif
-
-#ifndef __com_sun_star_text_XText_idl__
-#include <com/sun/star/text/XText.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextDocument_idl__ 
+#define __com_sun_star_text_XTextDocument_idl__ 
+ 
+#ifndef __com_sun_star_frame_XModel_idl__ 
+#include <com/sun/star/frame/XModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XText_idl__ 
+#include <com/sun/star/text/XText.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XTextDocument
 /** is the main interface of a text document.@see com::sun::star::text::TextDocument
  */
 published interface XTextDocument: com::sun::star::frame::XModel
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextDocument::getText
-    /** @returns
-                the major <type scope="com::sun::star::text">Text</type> of the text document.
-
-                <p>This text does not contain texts in <type>TextFrame</type>s,
-                or cells of <type>TextTable</type>s etc. directly. These are
-                accessible from the contents via <code>X...Supplier</code>
+    /** @returns  
+                the major <type scope="com::sun::star::text">Text</type> of the text document. 
+                 
+                <p>This text does not contain texts in <type>TextFrame</type>s,  
+                or cells of <type>TextTable</type>s etc. directly. These are  
+                accessible from the contents via <code>X...Supplier</code>  
                 (e.g. <type>XTextTablesSupplier</type>).
      */
-    com::sun::star::text::XText getText();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::text::XText getText(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XTextDocument::reformat
     /** reformats the contents of the document.
      */
-    void reformat();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void reformat(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextEmbeddedObject.idl b/offapi/com/sun/star/text/XTextEmbeddedObject.idl
index c11d16f22969..2b9503cb9929 100644
--- a/offapi/com/sun/star/text/XTextEmbeddedObject.idl
+++ b/offapi/com/sun/star/text/XTextEmbeddedObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextEmbeddedObject_idl__
-#define __com_sun_star_text_XTextEmbeddedObject_idl__
-
-#ifndef __com_sun_star_text_XTextContent_idl__
-#include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextEmbeddedObject_idl__ 
+#define __com_sun_star_text_XTextEmbeddedObject_idl__ 
+ 
+#ifndef __com_sun_star_text_XTextContent_idl__ 
+#include <com/sun/star/text/XTextContent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XTextEmbeddedObject
 /** f t!
-
-
-
-
-
+    
+    
+    
+    
+    
     @deprecated
  */
 published interface XTextEmbeddedObject: com::sun::star::text::XTextContent
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextEmbeddedObject::getObject
-    /** @returns an interface to the linked object that is contained in
+    /** @returns an interface to the linked object that is contained in 
                 the TextEmbeddedObject.
      */
-    com::sun::star::uno::XInterface getObject();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::uno::XInterface getObject(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XTextEmbeddedObject::setObject
     /** sets an object into the TextEmbeddedObject.
      */
-    void setObject( [in] com::sun::star::uno::XInterface xObject );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void setObject( [in] com::sun::star::uno::XInterface xObject ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl b/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl
index 93c12aa1ad2d..d813afe7c2c8 100644
--- a/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextEmbeddedObjectsSupplier_idl__
-#define __com_sun_star_text_XTextEmbeddedObjectsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextEmbeddedObjectsSupplier_idl__ 
+#define __com_sun_star_text_XTextEmbeddedObjectsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XTextEmbeddedObjectsSupplier
-/** provides the collection of all embedded objects within this context
+/** provides the collection of all embedded objects within this context 
     (i.e. this document).
  */
 published interface XTextEmbeddedObjectsSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextEmbeddedObjectsSupplier::getEmbeddedObjects
-    /** @returns
+    /** @returns  
                 the collection of embedded objects.
      */
-    com::sun::star::container::XNameAccess getEmbeddedObjects();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::container::XNameAccess getEmbeddedObjects(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextField.idl b/offapi/com/sun/star/text/XTextField.idl
index 08060bef9d61..8dcb00e8f2af 100644
--- a/offapi/com/sun/star/text/XTextField.idl
+++ b/offapi/com/sun/star/text/XTextField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextField_idl__
-#define __com_sun_star_text_XTextField_idl__
-
-#ifndef __com_sun_star_text_XTextContent_idl__
-#include <com/sun/star/text/XTextContent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextField_idl__ 
+#define __com_sun_star_text_XTextField_idl__ 
+ 
+#ifndef __com_sun_star_text_XTextContent_idl__ 
+#include <com/sun/star/text/XTextContent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XTextField
 /** is the base interface for all text fields.
-
-
-
+    
+    
+    
     <p>A text field is embedded in text and expands to a sequence of
     characters.
-
+    
     </p>@see TextField
  */
 published interface XTextField: com::sun::star::text::XTextContent
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextField::getPresentation
-    /** @returns the display string of the text field either as the command
-                 of the field or as the output string.
-                @param bShowCommand
+    /** @returns the display string of the text field either as the command 
+                 of the field or as the output string. 
+                @param bShowCommand 
                     if <TRUE/> the command of the field will be returned
      */
-    string getPresentation( [in] boolean bShowCommand );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string getPresentation( [in] boolean bShowCommand ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextFieldsSupplier.idl b/offapi/com/sun/star/text/XTextFieldsSupplier.idl
index 14f0fc79569c..084e9c5d17b9 100644
--- a/offapi/com/sun/star/text/XTextFieldsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextFieldsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,57 +24,57 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextFieldsSupplier_idl__
-#define __com_sun_star_text_XTextFieldsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
-#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
+#ifndef __com_sun_star_text_XTextFieldsSupplier_idl__ 
+#define __com_sun_star_text_XTextFieldsSupplier_idl__ 
 
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
+#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
+#include <com/sun/star/container/XEnumerationAccess.idl> 
+#endif 
 
-//=============================================================================
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
 
- module com {  module sun {  module star {  module text {
 
-//=============================================================================
+//============================================================================= 
 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XTextFieldsSupplier
 /** makes it possible to access the text fields used in this context
-    (e.g. this document).@see com::sun::star::sheet::SpreadsheetDocument
+    (e.g. this document).@see com::sun::star::sheet::SpreadsheetDocument 
         @see TextDocument
  */
 published interface XTextFieldsSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextFieldsSupplier::getTextFields
-    /** @returns
-                the collection of <type>TextField</type> instances
+    /** @returns 
+                the collection of <type>TextField</type> instances 
                 in this context (i.e. this document).
      */
-    com::sun::star::container::XEnumerationAccess getTextFields();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::container::XEnumerationAccess getTextFields(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextFieldsSupplier::getTextFieldMasters
-    /** @returns
-                the collection of <type>TextFieldMaster</type> instances
+    /** @returns 
+                the collection of <type>TextFieldMaster</type> instances 
                 which are defined in this context (i.e. this document).
      */
-    com::sun::star::container::XNameAccess getTextFieldMasters();
-
-};
-
-//=============================================================================
-
-}; }; }; };
+    com::sun::star::container::XNameAccess getTextFieldMasters(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/text/XTextFrame.idl b/offapi/com/sun/star/text/XTextFrame.idl
index 0435e60cb86c..e6ef164590ae 100644
--- a/offapi/com/sun/star/text/XTextFrame.idl
+++ b/offapi/com/sun/star/text/XTextFrame.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextFrame_idl__
-#define __com_sun_star_text_XTextFrame_idl__
-
-#ifndef __com_sun_star_text_XTextContent_idl__
-#include <com/sun/star/text/XTextContent.idl>
-#endif
+#ifndef __com_sun_star_text_XTextFrame_idl__ 
+#define __com_sun_star_text_XTextFrame_idl__ 
 
-#ifndef __com_sun_star_text_XText_idl__
-#include <com/sun/star/text/XText.idl>
-#endif
+#ifndef __com_sun_star_text_XTextContent_idl__ 
+#include <com/sun/star/text/XTextContent.idl> 
+#endif 
 
+#ifndef __com_sun_star_text_XText_idl__ 
+#include <com/sun/star/text/XText.idl> 
+#endif 
 
-//=============================================================================
 
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
+//============================================================================= 
 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XTextFrame
 /** provides access to the <type>Text</type> of a <type>TextFrame</type>.
     @see TextFrame
  */
 published interface XTextFrame: com::sun::star::text::XTextContent
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextFrame::getText
-    /** @returns
-                the text within this frame. The returned interface belongs
+    /** @returns  
+                the text within this frame. The returned interface belongs 
                 to an object which implements the service <type>Text</type>.
      */
-    com::sun::star::text::XText getText();
-
-};
-
-//=============================================================================
-
-}; }; }; };
+    com::sun::star::text::XText getText(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/text/XTextFramesSupplier.idl b/offapi/com/sun/star/text/XTextFramesSupplier.idl
index ae7b3bf65f1e..5092b0c4d740 100644
--- a/offapi/com/sun/star/text/XTextFramesSupplier.idl
+++ b/offapi/com/sun/star/text/XTextFramesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextFramesSupplier_idl__
-#define __com_sun_star_text_XTextFramesSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextFramesSupplier_idl__ 
+#define __com_sun_star_text_XTextFramesSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XTextFramesSupplier
 /** makes it possible to access the <type>TextFrame</type> instances in this
     context (e.g. document).
  */
 published interface XTextFramesSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XTextFramesSupplier::getTextFrames
     /** returns a collection of text frames.
      */
-    com::sun::star::container::XNameAccess getTextFrames();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::container::XNameAccess getTextFrames(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl b/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl
index 5320f80e1b48..872d19a9ce53 100644
--- a/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextGraphicObjectsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextGraphicObjectsSupplier_idl__
-#define __com_sun_star_text_XTextGraphicObjectsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextGraphicObjectsSupplier_idl__ 
+#define __com_sun_star_text_XTextGraphicObjectsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XTextGraphicObjectsSupplier
 /** provides access to the collection of all embedded and linked graphics
     within this context (i.e. within this document).
  */
 published interface XTextGraphicObjectsSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextGraphicObjectsSupplier::getGraphicObjects
-    /** @returns
+    /** @returns  
                 the collection of graphic objects in this object (document).
      */
-    com::sun::star::container::XNameAccess getGraphicObjects();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::container::XNameAccess getGraphicObjects(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextMarkup.idl b/offapi/com/sun/star/text/XTextMarkup.idl
index f8dc3f834e73..ec5ae8514fd8 100644
--- a/offapi/com/sun/star/text/XTextMarkup.idl
+++ b/offapi/com/sun/star/text/XTextMarkup.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,7 +59,7 @@ interface XTextMarkup
      */
     com::sun::star::container::XStringKeyMap getMarkupInfoContainer();
 
-
+    
     //-------------------------------------------------------------------------
     /** submits a new markup range.
 
diff --git a/offapi/com/sun/star/text/XTextPortionAppend.idl b/offapi/com/sun/star/text/XTextPortionAppend.idl
index 84b121163e72..e113e1baf0bc 100644
--- a/offapi/com/sun/star/text/XTextPortionAppend.idl
+++ b/offapi/com/sun/star/text/XTextPortionAppend.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,63 +24,63 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextPortionAppend_idl__
-#define __com_sun_star_text_XTextPortionAppend_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_text_XTextPortionAppend_idl__ 
+#define __com_sun_star_text_XTextPortionAppend_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
 #ifndef __com_sun_star_beans_PropertyValues_idl__
 #include <com/sun/star/beans/PropertyValues.idl>
 #endif
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
-#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextRange_idl__
-#include <com/sun/star/text/XTextRange.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
+#include <com/sun/star/beans/UnknownPropertyException.idl> 
+#endif 
+
+#ifndef __com_sun_star_text_XTextRange_idl__ 
+#include <com/sun/star/text/XTextRange.idl> 
+#endif 
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** .
  */
 interface XTextPortionAppend : com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
         /** appends a new text portion to the paragraph at the end of the text.
-
+        
                 <p> The sequence can contain all the properties defined by the service <type scope="com::sun::star::text">TextPortion.
         </p>
 
-        @param
+        @param 
             Text contains the text to be appended.
 
-        @param
-            CharacterAndParagraphProperties can contain all the properties defined by the service
+        @param 
+            CharacterAndParagraphProperties can contain all the properties defined by the service 
                       <type scope="com::sun::star::text">Paragraph.
      */
-         com::sun::star::text::XTextRange  appendTextPortion(
+         com::sun::star::text::XTextRange  appendTextPortion(  
                                 [in] string Text,
-                                [in] com::sun::star::beans::PropertyValues CharacterAndParagraphProperties )
+                                [in] com::sun::star::beans::PropertyValues CharacterAndParagraphProperties ) 
                         raises( com::sun::star::lang::IllegalArgumentException,
-                                        com::sun::star::beans::UnknownPropertyException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+                                        com::sun::star::beans::UnknownPropertyException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextRange.idl b/offapi/com/sun/star/text/XTextRange.idl
index 58a59b33b09e..7eee212ef79b 100644
--- a/offapi/com/sun/star/text/XTextRange.idl
+++ b/offapi/com/sun/star/text/XTextRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,81 +24,81 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextRange_idl__
-#define __com_sun_star_text_XTextRange_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
- published interface XText;
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextRange_idl__ 
+#define __com_sun_star_text_XTextRange_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+ published interface XText; 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XTextRange
 /** describes the object's position in a text.
-
-
-
+    
+    
+    
     <p>It represents a text range. The beginning and end of the range may
     be identical.
     </p>
  */
 published interface XTextRange: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextRange::getText
-    /** @returns
+    /** @returns 
                 the text interface in which the text position is contained.
      */
-    XText getText();
-
-    //-------------------------------------------------------------------------
-
+    XText getText(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextRange::getStart
-    /** @returns
+    /** @returns 
                 a text range which contains only the start of this text range.
      */
-    XTextRange getStart();
-
-    //-------------------------------------------------------------------------
-
+    XTextRange getStart(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextRange::getEnd
-    /** @returns
+    /** @returns 
                 a text range which contains only the end of this text range.
      */
-    XTextRange getEnd();
-
-    //-------------------------------------------------------------------------
-
+    XTextRange getEnd(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextRange::getString
-    /** @returns
+    /** @returns 
                  the string that is included in this text range.
      */
-    string getString();
-
-    //-------------------------------------------------------------------------
-
+    string getString(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XTextRange::setString
     /** the whole string of characters of this piece of text is replaced.
-
-
-
+        
+        
+        
         <p>All styles are removed when applying this method.
-
+        
         </p>
      */
-    [oneway] void setString( [in] string aString );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void setString( [in] string aString ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextRangeCompare.idl b/offapi/com/sun/star/text/XTextRangeCompare.idl
index 5f15feab1905..862dd6c93a1f 100644
--- a/offapi/com/sun/star/text/XTextRangeCompare.idl
+++ b/offapi/com/sun/star/text/XTextRangeCompare.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,71 +24,71 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextRangeCompare_idl__
-#define __com_sun_star_text_XTextRangeCompare_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
- published interface XText;
- published interface XTextRange;
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextRangeCompare_idl__ 
+#define __com_sun_star_text_XTextRangeCompare_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+ published interface XText; 
+ published interface XTextRange; 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XTextRangeCompare
 /** compares the positions of two <type>TextRange</type>s within a
     <type>Text</type>.
-
-
-
+    
+    
+    
     <p>Only <type>TextRange</type> instances within the same <type>Text</type>
     can be compared.
     </p>
  */
 published interface XTextRangeCompare: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextRangeCompare::compareRegionStarts
-    /** @returns
-                    1 if <var>xR1</var> starts before <var>xR2</var>,
-                    0 if <var>xR1</var> starts at the same position as <var>xR2</var> and
-                    -1 if <var>xR1</var> starts behind <var>xR2</var>.
-
-                @throws com::sun::star::lang::IllegalArgumentException
-                    if either <var>xR1</var> or <var>xR2</var> is not within this
+    /** @returns 
+                    1 if <var>xR1</var> starts before <var>xR2</var>, 
+                    0 if <var>xR1</var> starts at the same position as <var>xR2</var> and 
+                    -1 if <var>xR1</var> starts behind <var>xR2</var>. 
+         
+                @throws com::sun::star::lang::IllegalArgumentException 
+                    if either <var>xR1</var> or <var>xR2</var> is not within this 
                     text.
      */
-    short compareRegionStarts( [in] XTextRange xR1, [in] XTextRange xR2 )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-
+    short compareRegionStarts( [in] XTextRange xR1, [in] XTextRange xR2 ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextRangeCompare::compareRegionEnds
-    /** @returns
-                    1, if <var>xR1</var> ends before <var>xR2</var>,
-                    0, if <var>xR1</var> ends at the same position as <var>xR2</var> and
-                    -1, if <var>xR1</var> ends behind <var>xR2</var>.
-
-                @throws com::sun::star::lang::IllegalArgumentException
-                    if either <var>xR1</var> or <var>xR2</var> is not within this
+    /** @returns 
+                    1, if <var>xR1</var> ends before <var>xR2</var>, 
+                    0, if <var>xR1</var> ends at the same position as <var>xR2</var> and 
+                    -1, if <var>xR1</var> ends behind <var>xR2</var>. 
+         
+                @throws com::sun::star::lang::IllegalArgumentException 
+                    if either <var>xR1</var> or <var>xR2</var> is not within this 
                     text.
      */
-    short compareRegionEnds( [in] XTextRange xR1, [in] XTextRange xR2 )
-            raises( com::sun::star::lang::IllegalArgumentException );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    short compareRegionEnds( [in] XTextRange xR1, [in] XTextRange xR2 ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextRangeMover.idl b/offapi/com/sun/star/text/XTextRangeMover.idl
index 59381de38854..b50cb81dbfd0 100644
--- a/offapi/com/sun/star/text/XTextRangeMover.idl
+++ b/offapi/com/sun/star/text/XTextRangeMover.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextRangeMover_idl__
-#define __com_sun_star_text_XTextRangeMover_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextRange_idl__
-#include <com/sun/star/text/XTextRange.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextRangeMover_idl__ 
+#define __com_sun_star_text_XTextRangeMover_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XTextRange_idl__ 
+#include <com/sun/star/text/XTextRange.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XTextRangeMover
-/** makes it possible to move a text range (e.g. a paragraph by itself)
+/** makes it possible to move a text range (e.g. a paragraph by itself) 
     within this text.
-
-
-
-    <p>The movement is specified by the number of paragraphs within the order
+    
+    
+    
+    <p>The movement is specified by the number of paragraphs within the order 
     of paragraphs.
-
+    
     </p>@see Text
  */
 published interface XTextRangeMover: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XTextRangeMover::moveTextRange
     /** moves the contents to which <var>xRange</var> refers forward or
         backward.
      */
-    void moveTextRange( [in] com::sun::star::text::XTextRange xRange,
-             [in] short nParagraphs );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void moveTextRange( [in] com::sun::star::text::XTextRange xRange, 
+             [in] short nParagraphs ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextSection.idl b/offapi/com/sun/star/text/XTextSection.idl
index 2a35e2bf0edb..039fce87f558 100644
--- a/offapi/com/sun/star/text/XTextSection.idl
+++ b/offapi/com/sun/star/text/XTextSection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextSection_idl__
-#define __com_sun_star_text_XTextSection_idl__
-
-#ifndef __com_sun_star_text_XTextContent_idl__
-#include <com/sun/star/text/XTextContent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextSection_idl__ 
+#define __com_sun_star_text_XTextSection_idl__ 
+ 
+#ifndef __com_sun_star_text_XTextContent_idl__ 
+#include <com/sun/star/text/XTextContent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XTextSection
 /** provide special data of a <type>TextSection</type>.@see TextSection
  */
 published interface XTextSection: com::sun::star::text::XTextContent
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XTextSection::getParentSection
     /** If the object is a child section, then this method returns
         the parent text section.
      */
-    com::sun::star::text::XTextSection getParentSection();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::text::XTextSection getParentSection(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextSection::getChildSections
-    /** @returns
+    /** @returns 
                 all text sections that are children of this text section (recursive).
      */
-    sequence<com::sun::star::text::XTextSection> getChildSections();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    sequence<com::sun::star::text::XTextSection> getChildSections(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextSectionsSupplier.idl b/offapi/com/sun/star/text/XTextSectionsSupplier.idl
index 0425534c275b..b099d3c0e895 100644
--- a/offapi/com/sun/star/text/XTextSectionsSupplier.idl
+++ b/offapi/com/sun/star/text/XTextSectionsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextSectionsSupplier_idl__
-#define __com_sun_star_text_XTextSectionsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextSectionsSupplier_idl__ 
+#define __com_sun_star_text_XTextSectionsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XTextSectionsSupplier
 /** manages the text sections within the context (i.e. the document).
  */
 published interface XTextSectionsSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextSectionsSupplier::getTextSections
-    /** @returns
+    /** @returns  
                 the collection of text sections.
      */
-    com::sun::star::container::XNameAccess getTextSections();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::container::XNameAccess getTextSections(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextShapesSupplier.idl b/offapi/com/sun/star/text/XTextShapesSupplier.idl
index 838e74a00110..5cb1fd2b58b9 100644
--- a/offapi/com/sun/star/text/XTextShapesSupplier.idl
+++ b/offapi/com/sun/star/text/XTextShapesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextShapesSupplier_idl__
-#define __com_sun_star_text_XTextShapesSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextShapesSupplier_idl__ 
+#define __com_sun_star_text_XTextShapesSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XTextShapesSupplier
 /** provides the collection of <type scope="com::sun::star::drawing">TextShape</type>s.
  */
 published interface XTextShapesSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XTextShapesSupplier::getShapes
     /** returns the collection of shapes.
 
         @see com::sun::star::drawing::DrawPage
      */
-    com::sun::star::container::XIndexAccess getShapes();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::container::XIndexAccess getShapes(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextTable.idl b/offapi/com/sun/star/text/XTextTable.idl
index 44b18be77648..025729062f6d 100644
--- a/offapi/com/sun/star/text/XTextTable.idl
+++ b/offapi/com/sun/star/text/XTextTable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,120 +24,120 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextTable_idl__
-#define __com_sun_star_text_XTextTable_idl__
-
-#ifndef __com_sun_star_text_XTextContent_idl__
-#include <com/sun/star/text/XTextContent.idl>
-#endif
-
-#ifndef __com_sun_star_table_XTableRows_idl__
-#include <com/sun/star/table/XTableRows.idl>
-#endif
-
-#ifndef __com_sun_star_table_XTableColumns_idl__
-#include <com/sun/star/table/XTableColumns.idl>
-#endif
-
-#ifndef __com_sun_star_table_XCell_idl__
-#include <com/sun/star/table/XCell.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextTableCursor_idl__
-#include <com/sun/star/text/XTextTableCursor.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextTable_idl__ 
+#define __com_sun_star_text_XTextTable_idl__ 
+ 
+#ifndef __com_sun_star_text_XTextContent_idl__ 
+#include <com/sun/star/text/XTextContent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_table_XTableRows_idl__ 
+#include <com/sun/star/table/XTableRows.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_table_XTableColumns_idl__ 
+#include <com/sun/star/table/XTableColumns.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_table_XCell_idl__ 
+#include <com/sun/star/table/XCell.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XTextTableCursor_idl__ 
+#include <com/sun/star/text/XTextTableCursor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text { 
+ 
+//============================================================================= 
+ 
 /** manages a text table.
 
     @see com::sun::star::text::TextTable
     @see com::sun::star::text::Cell
  */
 published interface XTextTable: com::sun::star::text::XTextContent
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** determines the numbers of rows and columns of the text table.
-
+        
         <p> This method must be called after the object is created and
             before the object is insert or attached elsewhere.
         </p>
      */
-    void initialize( [in] long nRows,
-             [in] long nColumns );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the access object for the text table rows.
-
+    void initialize( [in] long nRows, 
+             [in] long nColumns ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            the access object for the text table rows. 
+         
         @see com::sun::star::table::XTableRows
      */
-    com::sun::star::table::XTableRows getRows();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the access object for the text table columns.
-
+    com::sun::star::table::XTableRows getRows(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            the access object for the text table columns. 
+         
         @see com::sun::star::table::XTableColumns
      */
-    com::sun::star::table::XTableColumns getColumns();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the <type scope="com::sun::star::table">XCell</type> interface of the cell with the specified name.
-
-        @param aCellName
-            is a concatenation of the alphanumeric column name and the
-            index of the row.
-
-            <p>Example: The cell in the 4th column and third row has the name "D3".
-
-            <p>In cells that are split, the naming convention is more complex.
-            In this case the name is a concatenation of the former cell name
-            (i.e. "D3") and the number of the new column and row index inside
-            of the original table cell separated by dots. This is done
-            recursively.
-
-            <p>Example: If the cell "D3" is horizontally split, it now contains
-            the cells "D3.1.1" and "D3.1.2"
-
+    com::sun::star::table::XTableColumns getColumns(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            the <type scope="com::sun::star::table">XCell</type> interface of the cell with the specified name. 
+         
+        @param aCellName 
+            is a concatenation of the alphanumeric column name and the 
+            index of the row. 
+         
+            <p>Example: The cell in the 4th column and third row has the name "D3". 
+         
+            <p>In cells that are split, the naming convention is more complex. 
+            In this case the name is a concatenation of the former cell name 
+            (i.e. "D3") and the number of the new column and row index inside 
+            of the original table cell separated by dots. This is done 
+            recursively. 
+         
+            <p>Example: If the cell "D3" is horizontally split, it now contains 
+            the cells "D3.1.1" and "D3.1.2" 
+         
         @see com::sun::star::table::Cell
         @see com::sun::star::table::XCell
      */
-    com::sun::star::table::XCell getCellByName( [in] string aCellName );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    com::sun::star::table::XCell getCellByName( [in] string aCellName ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             the names of all cells of this text table.
      */
-    sequence<string> getCellNames();
-
-    //-------------------------------------------------------------------------
-
+    sequence<string> getCellNames(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** creates a text table cursor and returns the
         <type>XTextTableCursor</type> interface.
-
+        
         <p>Initially the cursor is positioned in the cell with the specified name.
         </p>
 
         @see com::sun::star::text::TextTableCursor
      */
-    com::sun::star::text::XTextTableCursor createCursorByCellName( [in] string aCellName );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::text::XTextTableCursor createCursorByCellName( [in] string aCellName ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextTableCursor.idl b/offapi/com/sun/star/text/XTextTableCursor.idl
index 54559fb89dc3..4efff5b42e3a 100644
--- a/offapi/com/sun/star/text/XTextTableCursor.idl
+++ b/offapi/com/sun/star/text/XTextTableCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/XTextTablesSupplier.idl b/offapi/com/sun/star/text/XTextTablesSupplier.idl
index b1c192ccd316..c154c94560ea 100644
--- a/offapi/com/sun/star/text/XTextTablesSupplier.idl
+++ b/offapi/com/sun/star/text/XTextTablesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextTablesSupplier_idl__
-#define __com_sun_star_text_XTextTablesSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextTablesSupplier_idl__ 
+#define __com_sun_star_text_XTextTablesSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** enables the object to handle text tables.
  */
 published interface XTextTablesSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+    /** @returns  
                 the collection of "TextTables" currently contained in the object.
 
         @see    com::sun::star::text::TextTables
         @see    com::sun::star::text::TextTable
      */
-    com::sun::star::container::XNameAccess getTextTables();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::container::XNameAccess getTextTables(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextViewCursor.idl b/offapi/com/sun/star/text/XTextViewCursor.idl
index b06b8bfbb481..7c8198207a2a 100644
--- a/offapi/com/sun/star/text/XTextViewCursor.idl
+++ b/offapi/com/sun/star/text/XTextViewCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,57 +24,57 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextViewCursor_idl__
-#define __com_sun_star_text_XTextViewCursor_idl__
-
-#ifndef __com_sun_star_text_XTextCursor_idl__
-#include <com/sun/star/text/XTextCursor.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Point_idl__
-#include <com/sun/star/awt/Point.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextViewCursor_idl__ 
+#define __com_sun_star_text_XTextViewCursor_idl__ 
+ 
+#ifndef __com_sun_star_text_XTextCursor_idl__ 
+#include <com/sun/star/text/XTextCursor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Point_idl__ 
+#include <com/sun/star/awt/Point.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XTextViewCursor
 /** describes a cursor in a text document's view.
  */
 published interface XTextViewCursor: com::sun::star::text::XTextCursor
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextViewCursor::isVisible
-    /** @returns
+    /** @returns  
                 <TRUE/> if this cursor is visible for the user.
      */
-    boolean isVisible();
-
-    //-------------------------------------------------------------------------
-
+    boolean isVisible(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::text::XTextViewCursor::setVisible
     /** shows or hides this cursor for the user.
      */
-    [oneway] void setVisible( [in] boolean bVisible );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void setVisible( [in] boolean bVisible ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextViewCursor::getPosition
-    /** @returns
-                the cursor's coordinates relative to the top left position of
+    /** @returns 
+                the cursor's coordinates relative to the top left position of  
                 the first page of the document.
      */
-    com::sun::star::awt::Point getPosition();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::awt::Point getPosition(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XTextViewCursorSupplier.idl b/offapi/com/sun/star/text/XTextViewCursorSupplier.idl
index 55f66b58395b..90d1a00db8a1 100644
--- a/offapi/com/sun/star/text/XTextViewCursorSupplier.idl
+++ b/offapi/com/sun/star/text/XTextViewCursorSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XTextViewCursorSupplier_idl__
-#define __com_sun_star_text_XTextViewCursorSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_text_XTextViewCursor_idl__
-#include <com/sun/star/text/XTextViewCursor.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XTextViewCursorSupplier_idl__ 
+#define __com_sun_star_text_XTextViewCursorSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_text_XTextViewCursor_idl__ 
+#include <com/sun/star/text/XTextViewCursor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::text::XTextViewCursorSupplier
 /** supplies access to the cursor in the view.
-
-
-
+    
+    
+    
     <p>This cursor is the same instance that is available in the user
     interface.
-
+    
     </p>@see TextDocumentView
  */
 published interface XTextViewCursorSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::text::XTextViewCursorSupplier::getViewCursor
-    /** @returns
+    /** @returns 
                 the cursor of the document view.
      */
-    com::sun::star::text::XTextViewCursor getViewCursor();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::text::XTextViewCursor getViewCursor(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/XWordCursor.idl b/offapi/com/sun/star/text/XWordCursor.idl
index 89da3ed370c0..e6ccfdc33d8f 100644
--- a/offapi/com/sun/star/text/XWordCursor.idl
+++ b/offapi/com/sun/star/text/XWordCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,90 +24,90 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_text_XWordCursor_idl__
-#define __com_sun_star_text_XWordCursor_idl__
-
-#ifndef __com_sun_star_text_XTextCursor_idl__
-#include <com/sun/star/text/XTextCursor.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module text {
-
-//=============================================================================
-
+#ifndef __com_sun_star_text_XWordCursor_idl__ 
+#define __com_sun_star_text_XWordCursor_idl__ 
+ 
+#ifndef __com_sun_star_text_XTextCursor_idl__ 
+#include <com/sun/star/text/XTextCursor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module text {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to move a cursor word by word.
  */
 published interface XWordCursor: com::sun::star::text::XTextCursor
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the cursor is positioned at the start of a word.
      */
-    boolean isStartOfWord();
-
-    //-------------------------------------------------------------------------
-
+    boolean isStartOfWord(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the cursor is positioned at the end of a word.
      */
-    boolean isEndOfWord();
-
-    //-------------------------------------------------------------------------
-
+    boolean isEndOfWord(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the next word.
 
-        <p>Note: the function returning <true/> does not necessarily mean
-        that the cursor is located at the next word, or any word at all!
+        <p>Note: the function returning <true/> does not necessarily mean 
+        that the cursor is located at the next word, or any word at all! 
         This may happen for example if it travels over empty paragraphs.</p>
 
         @returns
             <true/> if the cursor was moved. It returns <false/> it the
             cursor can not advance further.
      */
-    boolean gotoNextWord( [in] boolean bExpand );
-
-    //-------------------------------------------------------------------------
-
+    boolean gotoNextWord( [in] boolean bExpand ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the previous word.
 
-        <p>Note: the function returning <true/> does not necessarily mean
-        that the cursor is located at the previous word, or any word at all!
+        <p>Note: the function returning <true/> does not necessarily mean 
+        that the cursor is located at the previous word, or any word at all! 
         This may happen for example if it travels over empty paragraphs.</p>
 
         @returns
             <true/> if the cursor was moved. It returns <false/> it the
             cursor can not advance further.
      */
-    boolean gotoPreviousWord( [in] boolean bExpand );
-
-    //-------------------------------------------------------------------------
-
+    boolean gotoPreviousWord( [in] boolean bExpand ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the end of the current word.
 
         @returns
-            <true/> if the cursor is now at the end of a word,
+            <true/> if the cursor is now at the end of a word, 
             <false/> otherwise. If <false/> was returned the cursor
             will remain at its original position.
      */
-    boolean gotoEndOfWord( [in] boolean bExpand );
-
-    //-------------------------------------------------------------------------
-
+    boolean gotoEndOfWord( [in] boolean bExpand ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** moves the cursor to the start of the current word.
 
         @returns
-            <true/> if the cursor is now at the start of a word,
+            <true/> if the cursor is now at the start of a word, 
             <false/> otherwise. If <false/> was returned the cursor
             will remain at its original position.
      */
-    boolean gotoStartOfWord( [in] boolean bExpand );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean gotoStartOfWord( [in] boolean bExpand ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/text/fieldmaster/Bibliography.idl b/offapi/com/sun/star/text/fieldmaster/Bibliography.idl
index 844b01785500..818b5c848bba 100644
--- a/offapi/com/sun/star/text/fieldmaster/Bibliography.idl
+++ b/offapi/com/sun/star/text/fieldmaster/Bibliography.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/fieldmaster/DDE.idl b/offapi/com/sun/star/text/fieldmaster/DDE.idl
index 1f33ef5dac1d..15fcd872b86c 100644
--- a/offapi/com/sun/star/text/fieldmaster/DDE.idl
+++ b/offapi/com/sun/star/text/fieldmaster/DDE.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/fieldmaster/Database.idl b/offapi/com/sun/star/text/fieldmaster/Database.idl
index 921c86ff8c94..72e95393acd5 100644
--- a/offapi/com/sun/star/text/fieldmaster/Database.idl
+++ b/offapi/com/sun/star/text/fieldmaster/Database.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,10 +48,10 @@ published service Database
     service  com::sun::star::text::TextFieldMaster;
 
     //------------------------------------------------------------------------
-    /** specifies the database name.
+    /** specifies the database name. 
      */
     [property] string DataBaseName;
-
+    
     //------------------------------------------------------------------------
     /** contains the CommandType this
      can be the name of a data base table, a data query or a statement.
@@ -80,12 +80,12 @@ published service Database
      */
     [optional, property] string DataBaseResource;
     //------------------------------------------------------------------------
-    /** contains the DataColumnName but it enables the fieldmaster and its
+    /** contains the DataColumnName but it enables the fieldmaster and its 
         depending fields to work without setting DataSourceName, DataTableName and CommandType
         @since OOo 2.3
      */
     [optional, property] string Name;
-
+    
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/fieldmaster/SetExpression.idl b/offapi/com/sun/star/text/fieldmaster/SetExpression.idl
index 1c6276205f3b..d6e7f1791bb6 100644
--- a/offapi/com/sun/star/text/fieldmaster/SetExpression.idl
+++ b/offapi/com/sun/star/text/fieldmaster/SetExpression.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/fieldmaster/User.idl b/offapi/com/sun/star/text/fieldmaster/User.idl
index 555e93cfb0d1..4f6d8dd2c74c 100644
--- a/offapi/com/sun/star/text/fieldmaster/User.idl
+++ b/offapi/com/sun/star/text/fieldmaster/User.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/Annotation.idl b/offapi/com/sun/star/text/textfield/Annotation.idl
index 5127f728b109..a1995b78ea73 100644
--- a/offapi/com/sun/star/text/textfield/Annotation.idl
+++ b/offapi/com/sun/star/text/textfield/Annotation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/Author.idl b/offapi/com/sun/star/text/textfield/Author.idl
index 5650963b701f..2ead2f02a736 100644
--- a/offapi/com/sun/star/text/textfield/Author.idl
+++ b/offapi/com/sun/star/text/textfield/Author.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/Bibliography.idl b/offapi/com/sun/star/text/textfield/Bibliography.idl
index 2ba2c316f64b..12535cefa8a1 100644
--- a/offapi/com/sun/star/text/textfield/Bibliography.idl
+++ b/offapi/com/sun/star/text/textfield/Bibliography.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 module com { module sun { module star { module text { module textfield {
 
 //=============================================================================
-/** specifies service of a bibliography text field.
+/**	specifies service of a bibliography text field.
     @see com::sun::star::text::TextField
 */
 published service Bibliography
diff --git a/offapi/com/sun/star/text/textfield/Chapter.idl b/offapi/com/sun/star/text/textfield/Chapter.idl
index 819a4ff22b98..e785c7ada604 100644
--- a/offapi/com/sun/star/text/textfield/Chapter.idl
+++ b/offapi/com/sun/star/text/textfield/Chapter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/CharacterCount.idl b/offapi/com/sun/star/text/textfield/CharacterCount.idl
index 3d5336939c1d..812c126c0874 100644
--- a/offapi/com/sun/star/text/textfield/CharacterCount.idl
+++ b/offapi/com/sun/star/text/textfield/CharacterCount.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/CombinedCharacters.idl b/offapi/com/sun/star/text/textfield/CombinedCharacters.idl
index 0842b6016b7d..fc3bfeec053a 100644
--- a/offapi/com/sun/star/text/textfield/CombinedCharacters.idl
+++ b/offapi/com/sun/star/text/textfield/CombinedCharacters.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/ConditionalText.idl b/offapi/com/sun/star/text/textfield/ConditionalText.idl
index c13f367948bf..77c439bf5d7c 100644
--- a/offapi/com/sun/star/text/textfield/ConditionalText.idl
+++ b/offapi/com/sun/star/text/textfield/ConditionalText.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/DDE.idl b/offapi/com/sun/star/text/textfield/DDE.idl
index 95293d852f4a..55f1d1931c0e 100644
--- a/offapi/com/sun/star/text/textfield/DDE.idl
+++ b/offapi/com/sun/star/text/textfield/DDE.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/Database.idl b/offapi/com/sun/star/text/textfield/Database.idl
index f602db5977f9..c5429e236a40 100644
--- a/offapi/com/sun/star/text/textfield/Database.idl
+++ b/offapi/com/sun/star/text/textfield/Database.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/DatabaseName.idl b/offapi/com/sun/star/text/textfield/DatabaseName.idl
index f051aa72b7f1..0a34e1385772 100644
--- a/offapi/com/sun/star/text/textfield/DatabaseName.idl
+++ b/offapi/com/sun/star/text/textfield/DatabaseName.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,15 +47,15 @@ published service DatabaseName
 {
     service  com::sun::star::text::DependentTextField;
 
-    /** specifies the database name.
+    /** specifies the database name. 
      */
     [property] string DataBaseName;
-
+    
     /** determines the interpretation of the property DataTableName.
         @see com::sun::star::sdb::CommandType
      */
     [property] long DataCommandType;
-
+    
     /** contains the name of the database table, query or a statement depending
      on the DataCommandType property.
      */
@@ -70,7 +70,7 @@ published service DatabaseName
         @since OOo 2.0.0
      */
     [optional, property] string DataBaseResource;
-
+    
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/textfield/DatabaseNextSet.idl b/offapi/com/sun/star/text/textfield/DatabaseNextSet.idl
index 01b762b1e113..c6071f9d0045 100644
--- a/offapi/com/sun/star/text/textfield/DatabaseNextSet.idl
+++ b/offapi/com/sun/star/text/textfield/DatabaseNextSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,10 +47,10 @@ published service DatabaseNextSet
 {
     service  com::sun::star::text::DependentTextField;
 
-    /** specifies the database name.
+    /** specifies the database name. 
      */
     [property] string DataBaseName;
-
+    
     /** determines the interpretation of the property DataTableName.
         @see com::sun::star::sdb::CommandType
      */
@@ -74,7 +74,7 @@ published service DatabaseNextSet
         @since OOo 2.0.0
      */
     [optional, property] string DataBaseResource;
-
+    
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/textfield/DatabaseNumberOfSet.idl b/offapi/com/sun/star/text/textfield/DatabaseNumberOfSet.idl
index 1ad00c840bce..3f31ff2599e2 100644
--- a/offapi/com/sun/star/text/textfield/DatabaseNumberOfSet.idl
+++ b/offapi/com/sun/star/text/textfield/DatabaseNumberOfSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,24 +48,24 @@ published service DatabaseNumberOfSet
 {
     service  com::sun::star::text::DependentTextField;
 
-    /** specifies the database name.
+    /** specifies the database name. 
      */
     [property] string DataBaseName;
-
+    
     /** determines the interpretation of the property DataTableName.
         @see com::sun::star::sdb::CommandType
      */
     [property] long DataCommandType;
-
+    
     /** contains the name of the database table, query or a statement depending
      on the DataCommandType property.
      */
     [property] string DataTableName;
-
+    
     /** contains the conditions that determins whether the SetNumber is applied or not.
      */
     [property] string Condition;
-
+    
     /** cotains the set number that is to be applied.
      */
     [property] long SetNumber;
@@ -79,7 +79,7 @@ published service DatabaseNumberOfSet
         @since OOo 2.0.0
      */
     [optional, property] string DataBaseResource;
-
+    
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/textfield/DatabaseSetNumber.idl b/offapi/com/sun/star/text/textfield/DatabaseSetNumber.idl
index 3af3ab3516ce..67016dfcb986 100644
--- a/offapi/com/sun/star/text/textfield/DatabaseSetNumber.idl
+++ b/offapi/com/sun/star/text/textfield/DatabaseSetNumber.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,10 +48,10 @@ published service DatabaseSetNumber
 {
     service  com::sun::star::text::DependentTextField;
 
-    /** specifies the database name.
+    /** specifies the database name. 
      */
     [property] string DataBaseName;
-
+    
     /** determines the interpretation of the property DataTableName.
         @see com::sun::star::sdb::CommandType
      */
@@ -64,7 +64,7 @@ published service DatabaseSetNumber
 
     /** specifies the type of the numbering as
         <type scope="com::sun::star::style">NumberingType</type>
-     */
+     */       
     [property] short NumberingType;
 
     /** contains the number of the database set.
@@ -80,7 +80,7 @@ published service DatabaseSetNumber
         @since OOo 2.0.0
      */
     [optional, property] string DataBaseResource;
-
+    
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/text/textfield/DateTime.idl b/offapi/com/sun/star/text/textfield/DateTime.idl
index 5a2875b10c0e..7c0e8b5c5a48 100644
--- a/offapi/com/sun/star/text/textfield/DateTime.idl
+++ b/offapi/com/sun/star/text/textfield/DateTime.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@
 module com { module sun { module star { module text { module textfield {
 
 //=============================================================================
-/** specifies service of a date or time text field.
+/**	specifies service of a date or time text field.
     @see com::sun::star::text::TextField
 */
 published service DateTime
@@ -85,7 +85,7 @@ published service DateTime
     */
     [optional, property] long Adjust;
     /** determines whether changes in language attributes at the position the text field
-        is located also change the number format as appropriate for this language.
+        is located also change the number format as appropriate for this language. 
      */
     [optional, property] boolean IsFixedLanguage;
 };
diff --git a/offapi/com/sun/star/text/textfield/DropDown.idl b/offapi/com/sun/star/text/textfield/DropDown.idl
index c70f1a1db499..a7ec3cc2c4e1 100644
--- a/offapi/com/sun/star/text/textfield/DropDown.idl
+++ b/offapi/com/sun/star/text/textfield/DropDown.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/EmbeddedObjectCount.idl b/offapi/com/sun/star/text/textfield/EmbeddedObjectCount.idl
index 1e005d10ae95..0c5a3d5cb490 100644
--- a/offapi/com/sun/star/text/textfield/EmbeddedObjectCount.idl
+++ b/offapi/com/sun/star/text/textfield/EmbeddedObjectCount.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/ExtendedUser.idl b/offapi/com/sun/star/text/textfield/ExtendedUser.idl
index ae464dd579ed..71d684b02e06 100644
--- a/offapi/com/sun/star/text/textfield/ExtendedUser.idl
+++ b/offapi/com/sun/star/text/textfield/ExtendedUser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/FileName.idl b/offapi/com/sun/star/text/textfield/FileName.idl
index 062fb1255292..b18349a9705c 100644
--- a/offapi/com/sun/star/text/textfield/FileName.idl
+++ b/offapi/com/sun/star/text/textfield/FileName.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/GetExpression.idl b/offapi/com/sun/star/text/textfield/GetExpression.idl
index 9e95ceb46473..d81f6684a97f 100644
--- a/offapi/com/sun/star/text/textfield/GetExpression.idl
+++ b/offapi/com/sun/star/text/textfield/GetExpression.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -70,7 +70,7 @@ published service GetExpression
      */
     [property]short VariableSubtype;
     /** determines whether changes in language attributes at the position the text field
-        is located also change the number format as appropriate for this language.
+        is located also change the number format as appropriate for this language. 
 
     @since OOo 1.1.2
      */
diff --git a/offapi/com/sun/star/text/textfield/GetReference.idl b/offapi/com/sun/star/text/textfield/GetReference.idl
index 27e38613d3dd..3308cebaef58 100644
--- a/offapi/com/sun/star/text/textfield/GetReference.idl
+++ b/offapi/com/sun/star/text/textfield/GetReference.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
 module com { module sun { module star { module text { module textfield {
 
 //=============================================================================
-/** specifies service of a reference field.
+/**	specifies service of a reference field.
     @see com::sun::star::text::TextField
 */
 published service GetReference
diff --git a/offapi/com/sun/star/text/textfield/GraphicObjectCount.idl b/offapi/com/sun/star/text/textfield/GraphicObjectCount.idl
index 8b9c2f4cdddd..9d4160145933 100644
--- a/offapi/com/sun/star/text/textfield/GraphicObjectCount.idl
+++ b/offapi/com/sun/star/text/textfield/GraphicObjectCount.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/HiddenParagraph.idl b/offapi/com/sun/star/text/textfield/HiddenParagraph.idl
index 28648472cf38..e2d0d8ae828d 100644
--- a/offapi/com/sun/star/text/textfield/HiddenParagraph.idl
+++ b/offapi/com/sun/star/text/textfield/HiddenParagraph.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/HiddenText.idl b/offapi/com/sun/star/text/textfield/HiddenText.idl
index 56c40dacedc5..724271a8bdc0 100644
--- a/offapi/com/sun/star/text/textfield/HiddenText.idl
+++ b/offapi/com/sun/star/text/textfield/HiddenText.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
 module com { module sun { module star { module text { module textfield {
 
 //=============================================================================
-/** specifies service of a hidden text field.
+/**	specifies service of a hidden text field.
     @see com::sun::star::text::TextField
 */
 published service HiddenText
diff --git a/offapi/com/sun/star/text/textfield/Input.idl b/offapi/com/sun/star/text/textfield/Input.idl
index ba62be9ba095..1e02b9153cf7 100644
--- a/offapi/com/sun/star/text/textfield/Input.idl
+++ b/offapi/com/sun/star/text/textfield/Input.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,19 +35,19 @@
 module com { module sun { module star { module text { module textfield {
 
 //=============================================================================
-/** specifies service of a text input field.
+/**	specifies service of a text input field.
     @see com::sun::star::text::TextField
 */
 published service Input
 {
     service  com::sun::star::text::TextField;
-
+    
     //-------------------------------------------------------------------------
     /** contains the text content of the text field.
         <p> The field displays the text content.</p>
      */
     [optional, property] string Content;
-
+    
     //-------------------------------------------------------------------------
     /** contains a hint text.
      <p> This hint may be used as help tip or as headline of a corresponding
diff --git a/offapi/com/sun/star/text/textfield/InputUser.idl b/offapi/com/sun/star/text/textfield/InputUser.idl
index 8eba22062b4f..f4cb37ff7a88 100644
--- a/offapi/com/sun/star/text/textfield/InputUser.idl
+++ b/offapi/com/sun/star/text/textfield/InputUser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
 module com { module sun { module star { module text { module textfield {
 
 //=============================================================================
-/** specifies service of an input field that is used to change the content of a corresponding
+/**	specifies service of an input field that is used to change the content of a corresponding
      field master of a user defined text field.
 
     @see com::sun::star::text::TextField
diff --git a/offapi/com/sun/star/text/textfield/JumpEdit.idl b/offapi/com/sun/star/text/textfield/JumpEdit.idl
index 1ad1b8a6e00a..5c385e5b43a2 100644
--- a/offapi/com/sun/star/text/textfield/JumpEdit.idl
+++ b/offapi/com/sun/star/text/textfield/JumpEdit.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/Macro.idl b/offapi/com/sun/star/text/textfield/Macro.idl
index 7cd799d0c4b7..1300504aefaf 100644
--- a/offapi/com/sun/star/text/textfield/Macro.idl
+++ b/offapi/com/sun/star/text/textfield/Macro.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/MetadataField.idl b/offapi/com/sun/star/text/textfield/MetadataField.idl
index d98c4be39e96..c288f52f96aa 100755
--- a/offapi/com/sun/star/text/textfield/MetadataField.idl
+++ b/offapi/com/sun/star/text/textfield/MetadataField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/PageCount.idl b/offapi/com/sun/star/text/textfield/PageCount.idl
index 305a707ab62f..f499708c11e8 100644
--- a/offapi/com/sun/star/text/textfield/PageCount.idl
+++ b/offapi/com/sun/star/text/textfield/PageCount.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/PageNumber.idl b/offapi/com/sun/star/text/textfield/PageNumber.idl
index b6a45ae60619..42a0cd900f7c 100644
--- a/offapi/com/sun/star/text/textfield/PageNumber.idl
+++ b/offapi/com/sun/star/text/textfield/PageNumber.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/ParagraphCount.idl b/offapi/com/sun/star/text/textfield/ParagraphCount.idl
index cff2c0f8486e..4334a7b02c9b 100644
--- a/offapi/com/sun/star/text/textfield/ParagraphCount.idl
+++ b/offapi/com/sun/star/text/textfield/ParagraphCount.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/ReferencePageGet.idl b/offapi/com/sun/star/text/textfield/ReferencePageGet.idl
index a21d34d049d5..2b300e60019e 100644
--- a/offapi/com/sun/star/text/textfield/ReferencePageGet.idl
+++ b/offapi/com/sun/star/text/textfield/ReferencePageGet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/ReferencePageSet.idl b/offapi/com/sun/star/text/textfield/ReferencePageSet.idl
index dd12db2a42f0..58d1542b88eb 100644
--- a/offapi/com/sun/star/text/textfield/ReferencePageSet.idl
+++ b/offapi/com/sun/star/text/textfield/ReferencePageSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/Script.idl b/offapi/com/sun/star/text/textfield/Script.idl
index b5e6baf501d6..44e032da4bf2 100644
--- a/offapi/com/sun/star/text/textfield/Script.idl
+++ b/offapi/com/sun/star/text/textfield/Script.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/SetExpression.idl b/offapi/com/sun/star/text/textfield/SetExpression.idl
index cd727b6af827..042ee2cd793f 100644
--- a/offapi/com/sun/star/text/textfield/SetExpression.idl
+++ b/offapi/com/sun/star/text/textfield/SetExpression.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -86,7 +86,7 @@ published service SetExpression
      */
     [property]string VariableName;
     /** determines whether changes in language attributes at the position the text field
-        is located also change the number format as appropriate for this language.
+        is located also change the number format as appropriate for this language. 
 
     @since OOo 1.1.2
      */
diff --git a/offapi/com/sun/star/text/textfield/TableCount.idl b/offapi/com/sun/star/text/textfield/TableCount.idl
index 57d9ed10c420..64892c7515af 100644
--- a/offapi/com/sun/star/text/textfield/TableCount.idl
+++ b/offapi/com/sun/star/text/textfield/TableCount.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/TableFormula.idl b/offapi/com/sun/star/text/textfield/TableFormula.idl
index f9013595a578..f31554503186 100644
--- a/offapi/com/sun/star/text/textfield/TableFormula.idl
+++ b/offapi/com/sun/star/text/textfield/TableFormula.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/TemplateName.idl b/offapi/com/sun/star/text/textfield/TemplateName.idl
index 03b466ea5e06..6e572d7a730c 100644
--- a/offapi/com/sun/star/text/textfield/TemplateName.idl
+++ b/offapi/com/sun/star/text/textfield/TemplateName.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/URL.idl b/offapi/com/sun/star/text/textfield/URL.idl
index 16961361e177..c48be12a7d44 100644
--- a/offapi/com/sun/star/text/textfield/URL.idl
+++ b/offapi/com/sun/star/text/textfield/URL.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/User.idl b/offapi/com/sun/star/text/textfield/User.idl
index ba22607e6e37..d6fc525af5a2 100644
--- a/offapi/com/sun/star/text/textfield/User.idl
+++ b/offapi/com/sun/star/text/textfield/User.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@ published service User
     */
     [optional, property] long NumberFormat;
     /** determines whether changes in language attributes at the position the text field
-        is located also change the number format as appropriate for this language.
+        is located also change the number format as appropriate for this language. 
 
     @since OOo 1.1.2
      */
diff --git a/offapi/com/sun/star/text/textfield/WordCount.idl b/offapi/com/sun/star/text/textfield/WordCount.idl
index 2198715d2e93..6f38d0aaceb8 100644
--- a/offapi/com/sun/star/text/textfield/WordCount.idl
+++ b/offapi/com/sun/star/text/textfield/WordCount.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/docinfo/ChangeAuthor.idl b/offapi/com/sun/star/text/textfield/docinfo/ChangeAuthor.idl
index 6ae2b010fb3a..e8359173d06c 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/ChangeAuthor.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/ChangeAuthor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/docinfo/ChangeDateTime.idl b/offapi/com/sun/star/text/textfield/docinfo/ChangeDateTime.idl
index 20d8cc5afcb2..955fc5ec26aa 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/ChangeDateTime.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/ChangeDateTime.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -70,7 +70,7 @@ published service ChangeDateTime
     */
     [property]long NumberFormat;
     /** determines whether changes in language attributes at the position the text field
-        is located also change the number format as appropriate for this language.
+        is located also change the number format as appropriate for this language. 
      */
     [optional, property] boolean IsFixedLanguage;
 };
diff --git a/offapi/com/sun/star/text/textfield/docinfo/CreateAuthor.idl b/offapi/com/sun/star/text/textfield/docinfo/CreateAuthor.idl
index 5f95be467f0d..8270b217222d 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/CreateAuthor.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/CreateAuthor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/docinfo/CreateDateTime.idl b/offapi/com/sun/star/text/textfield/docinfo/CreateDateTime.idl
index b783517befdb..558712b2f0cf 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/CreateDateTime.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/CreateDateTime.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ published service CreateDateTime
      */
     /** If this flag is set to <FALSE/> the date or time
         is always displayed as the current date or time.
-
+    
     @since OOo 1.1.2
      */
     [optional, property] boolean IsFixed;
@@ -70,7 +70,7 @@ published service CreateDateTime
     */
     [property]long NumberFormat;
     /** determines whether changes in language attributes at the position the text field
-        is located also change the number format as appropriate for this language.
+        is located also change the number format as appropriate for this language. 
      */
     [optional, property] boolean IsFixedLanguage;
 };
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Custom.idl b/offapi/com/sun/star/text/textfield/docinfo/Custom.idl
index 8f2c242fade1..b503f1dd34b8 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Custom.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Custom.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,7 +56,7 @@ published service Custom
      */
     [property] string CurrentPresentation;
 
-    /** If this flag is set to <FALSE/>, the content is updated when
+    /** If this flag is set to <FALSE/>, the content is updated when 
         the document information changes.
      */
     [property] boolean IsFixed;
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Description.idl b/offapi/com/sun/star/text/textfield/docinfo/Description.idl
index 358f2af2202a..3bcc51fa8bad 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Description.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Description.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/docinfo/EditTime.idl b/offapi/com/sun/star/text/textfield/docinfo/EditTime.idl
index e83d12db3a19..8cd201a2cc2d 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/EditTime.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/EditTime.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,7 +65,7 @@ published service EditTime
     */
     [property]long NumberFormat;
     /** determines whether changes in language attributes at the position the text field
-        is located also change the number format as appropriate for this language.
+        is located also change the number format as appropriate for this language. 
      */
     [optional, property] boolean IsFixedLanguage;
 };
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Info0.idl b/offapi/com/sun/star/text/textfield/docinfo/Info0.idl
index 90a305563476..71706f75a685 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Info0.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Info0.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Info1.idl b/offapi/com/sun/star/text/textfield/docinfo/Info1.idl
index 71bab32a1f1e..284333edd9f1 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Info1.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Info1.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Info2.idl b/offapi/com/sun/star/text/textfield/docinfo/Info2.idl
index 65a0da3491ac..35785816697c 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Info2.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Info2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Info3.idl b/offapi/com/sun/star/text/textfield/docinfo/Info3.idl
index e0e013eb3448..f4542da97802 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Info3.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Info3.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Keywords.idl b/offapi/com/sun/star/text/textfield/docinfo/Keywords.idl
index fee9797e719c..011b379d3502 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Keywords.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Keywords.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/docinfo/PrintAuthor.idl b/offapi/com/sun/star/text/textfield/docinfo/PrintAuthor.idl
index bce811fb3ae0..4bc0e94d4da2 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/PrintAuthor.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/PrintAuthor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/docinfo/PrintDateTime.idl b/offapi/com/sun/star/text/textfield/docinfo/PrintDateTime.idl
index 87366468838d..49a26d37f444 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/PrintDateTime.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/PrintDateTime.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -70,7 +70,7 @@ published service PrintDateTime
     */
     [property]long NumberFormat;
     /** determines whether changes in language attributes at the position the text field
-        is located also change the number format as appropriate for this language.
+        is located also change the number format as appropriate for this language. 
      */
     [optional, property] boolean IsFixedLanguage;
 };
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Revision.idl b/offapi/com/sun/star/text/textfield/docinfo/Revision.idl
index 82897c4cbfd8..13a4fda61d0d 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Revision.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Revision.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Subject.idl b/offapi/com/sun/star/text/textfield/docinfo/Subject.idl
index c9251e734381..46a5b88fc8ac 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Subject.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Subject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/text/textfield/docinfo/Title.idl b/offapi/com/sun/star/text/textfield/docinfo/Title.idl
index 4025ae6aea15..b7718d853232 100644
--- a/offapi/com/sun/star/text/textfield/docinfo/Title.idl
+++ b/offapi/com/sun/star/text/textfield/docinfo/Title.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/AlreadyInitializedException.idl b/offapi/com/sun/star/ucb/AlreadyInitializedException.idl
index 56902f637599..e51e1901fe08 100644
--- a/offapi/com/sun/star/ucb/AlreadyInitializedException.idl
+++ b/offapi/com/sun/star/ucb/AlreadyInitializedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,14 +34,14 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** This exception is thrown to indicate that an attempt was made to
-    reinitialize an object that can only be initialized once.
-
-    @version    1.0
-    @author     Kai Sommerfeld
+    reinitialize an object that can only be	initialized once.
+    
+    @version	1.0
+    @author 	Kai Sommerfeld
 */
 published exception AlreadyInitializedException: com::sun::star::uno::Exception
 {
@@ -49,6 +49,6 @@ published exception AlreadyInitializedException: com::sun::star::uno::Exception
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/AnyCompareFactory.idl b/offapi/com/sun/star/ucb/AnyCompareFactory.idl
index 2e0d3542668c..a29ebcb42771 100644
--- a/offapi/com/sun/star/ucb/AnyCompareFactory.idl
+++ b/offapi/com/sun/star/ucb/AnyCompareFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/AuthenticationRequest.idl b/offapi/com/sun/star/ucb/AuthenticationRequest.idl
index ceda716c3d91..454315c463e6 100644
--- a/offapi/com/sun/star/ucb/AuthenticationRequest.idl
+++ b/offapi/com/sun/star/ucb/AuthenticationRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** An error specifing lack of correct authentication data (e.g., to log into
@@ -109,6 +109,6 @@ published exception AuthenticationRequest: com::sun::star::task::ClassifiedInter
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/CHAOSProgressStart.idl b/offapi/com/sun/star/ucb/CHAOSProgressStart.idl
index fc53292963c1..838085de3b9f 100644
--- a/offapi/com/sun/star/ucb/CHAOSProgressStart.idl
+++ b/offapi/com/sun/star/ucb/CHAOSProgressStart.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/CachedContentResultSet.idl b/offapi/com/sun/star/ucb/CachedContentResultSet.idl
index 26d6e66b3160..4c6f94fcd37c 100644
--- a/offapi/com/sun/star/ucb/CachedContentResultSet.idl
+++ b/offapi/com/sun/star/ucb/CachedContentResultSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl b/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl
index ab03429e7f84..12169f1ca2d4 100644
--- a/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedContentResultSetFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/CachedContentResultSetStub.idl b/offapi/com/sun/star/ucb/CachedContentResultSetStub.idl
index 5d2a4ed61956..b7fec47426bc 100644
--- a/offapi/com/sun/star/ucb/CachedContentResultSetStub.idl
+++ b/offapi/com/sun/star/ucb/CachedContentResultSetStub.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl b/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl
index cbfff8944311..a6d35b1e1b1a 100644
--- a/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedContentResultSetStubFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/CachedDynamicResultSet.idl b/offapi/com/sun/star/ucb/CachedDynamicResultSet.idl
index a6116d1db1a8..7757add47571 100644
--- a/offapi/com/sun/star/ucb/CachedDynamicResultSet.idl
+++ b/offapi/com/sun/star/ucb/CachedDynamicResultSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl b/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl
index 5ec157e15015..8ebe7f541165 100644
--- a/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedDynamicResultSetFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/CachedDynamicResultSetStub.idl b/offapi/com/sun/star/ucb/CachedDynamicResultSetStub.idl
index 6e88b77d74e9..52b3924010af 100644
--- a/offapi/com/sun/star/ucb/CachedDynamicResultSetStub.idl
+++ b/offapi/com/sun/star/ucb/CachedDynamicResultSetStub.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl b/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl
index e0357c3ee61b..098ef87a9e87 100644
--- a/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl
+++ b/offapi/com/sun/star/ucb/CachedDynamicResultSetStubFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/CertificateValidationRequest.idl b/offapi/com/sun/star/ucb/CertificateValidationRequest.idl
index 5d225aa0220c..baf7a3df8a97 100755
--- a/offapi/com/sun/star/ucb/CertificateValidationRequest.idl
+++ b/offapi/com/sun/star/ucb/CertificateValidationRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** An error specifing an invalid certificate.
@@ -50,7 +50,7 @@ exception CertificateValidationRequest: com::sun::star::task::ClassifiedInteract
     long CertificateValidity;
 
     //-------------------------------------------------------------------------
-    /** The certificate himself.
+    /** The certificate himself. 
      */
     com::sun::star::security::XCertificate Certificate;
 
@@ -60,6 +60,6 @@ exception CertificateValidationRequest: com::sun::star::task::ClassifiedInteract
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/Command.idl b/offapi/com/sun/star/ucb/Command.idl
index 9d39c3a3525e..bfa76158d0f2 100644
--- a/offapi/com/sun/star/ucb/Command.idl
+++ b/offapi/com/sun/star/ucb/Command.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/CommandAbortedException.idl b/offapi/com/sun/star/ucb/CommandAbortedException.idl
index a7fac87d48b3..49d0d3b0d960 100644
--- a/offapi/com/sun/star/ucb/CommandAbortedException.idl
+++ b/offapi/com/sun/star/ucb/CommandAbortedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,8 +39,8 @@ module com { module sun { module star { module ucb {
 //=============================================================================
 /** This exception is thrown to indicate that a command was aborted.
 
-    @version    1.0
-    @author     Kai Sommerfeld
+    @version	1.0
+    @author 	Kai Sommerfeld
     @see        XCommandProcessor
 */
 published exception CommandAbortedException : com::sun::star::uno::Exception
diff --git a/offapi/com/sun/star/ucb/CommandEnvironment.idl b/offapi/com/sun/star/ucb/CommandEnvironment.idl
index 6141a74da32a..501673e6e105 100644
--- a/offapi/com/sun/star/ucb/CommandEnvironment.idl
+++ b/offapi/com/sun/star/ucb/CommandEnvironment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/CommandFailedException.idl b/offapi/com/sun/star/ucb/CommandFailedException.idl
index e757e2c687d0..6a04d0d04688 100644
--- a/offapi/com/sun/star/ucb/CommandFailedException.idl
+++ b/offapi/com/sun/star/ucb/CommandFailedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,8 +45,8 @@ module com { module sun { module star { module ucb {
     decided to abort the command execution according to the selection made
     by the interaction handler.
 
-    @version    1.0
-    @author     Kai Sommerfeld
+    @version	1.0
+    @author 	Kai Sommerfeld
     @see        XCommandProcesssor
 */
 published exception CommandFailedException : com::sun::star::uno::Exception
diff --git a/offapi/com/sun/star/ucb/CommandInfo.idl b/offapi/com/sun/star/ucb/CommandInfo.idl
index aa4c07c5519f..f4b45e05d381 100644
--- a/offapi/com/sun/star/ucb/CommandInfo.idl
+++ b/offapi/com/sun/star/ucb/CommandInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/CommandInfoChange.idl b/offapi/com/sun/star/ucb/CommandInfoChange.idl
index 41ac487cbda6..69e2a6a87040 100644
--- a/offapi/com/sun/star/ucb/CommandInfoChange.idl
+++ b/offapi/com/sun/star/ucb/CommandInfoChange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/CommandInfoChangeEvent.idl b/offapi/com/sun/star/ucb/CommandInfoChangeEvent.idl
index 60cd2a06a847..acc2032a6f43 100644
--- a/offapi/com/sun/star/ucb/CommandInfoChangeEvent.idl
+++ b/offapi/com/sun/star/ucb/CommandInfoChangeEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/ConnectionMode.idl b/offapi/com/sun/star/ucb/ConnectionMode.idl
index b23389e740a6..9e7d3065257f 100644
--- a/offapi/com/sun/star/ucb/ConnectionMode.idl
+++ b/offapi/com/sun/star/ucb/ConnectionMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/Content.idl b/offapi/com/sun/star/ucb/Content.idl
index 85923c65fe15..7089d8286b90 100644
--- a/offapi/com/sun/star/ucb/Content.idl
+++ b/offapi/com/sun/star/ucb/Content.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/ContentAction.idl b/offapi/com/sun/star/ucb/ContentAction.idl
index 7e5a7370c067..db910783dfab 100644
--- a/offapi/com/sun/star/ucb/ContentAction.idl
+++ b/offapi/com/sun/star/ucb/ContentAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,14 +52,14 @@ module com { module sun { module star { module ucb {
                        </td></tr>
     <tr><td>D3</td><td>A folder content F has a set of children H(F) that is a
                        set of content identifiers. For example, an "open"
-                       command will usualy return a subset of the contents
+                       command will usualy return a	subset of the contents
                        denoted by H(F).</td></tr>
     </table>
 
     <p>
     The events that can happen to contents (and that are of interest in this
     context) are listed next.  Note that 'event' here does not mean an
-    ContentEvent, but rather some event that occurs either because some content
+    ContentEvent, but rather some event that occurs either because some	content
     processes a command, or because a content gets informed about a relevant
     change in the underlying system it represents.
     </p>
@@ -73,15 +73,15 @@ module com { module sun { module star { module ucb {
                        its identity.</td></tr>
     <tr><td>E2</td><td>The state of a content C changes from Alive to Deleted,
                        denoted as E2(C). For example, this event may occur when
-                       content C processes a "delete"   command, or when a content
-                       representing an IMAP message gets informed   by the IMAP
+                       content C processes a "delete"	command, or when a content
+                       representing an IMAP message gets informed	by the IMAP
                        server that the message has been deleted.</td></tr>
     <tr><td>E3</td><td>The set of children of a folder content F is enlarged by
                        some identifier A (that was not previously in that set,
                        i.e., !(A in H1(F)) && (A in H2(F))), denoted as E3(F, A).
                        For example, this event may occur when a new content
                        created at folder F processes its "insert" command, or
-                       when a folder representing   an IMAP mailbox gets informed
+                       when a folder representing	an IMAP mailbox gets informed
                        by the IMAP server that a new message has arrived at that
                        mailbox.</td></tr>
     </table>
diff --git a/offapi/com/sun/star/ucb/ContentCreationError.idl b/offapi/com/sun/star/ucb/ContentCreationError.idl
index 538ce0e09842..ba235aa6efd1 100644
--- a/offapi/com/sun/star/ucb/ContentCreationError.idl
+++ b/offapi/com/sun/star/ucb/ContentCreationError.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/ContentCreationException.idl b/offapi/com/sun/star/ucb/ContentCreationException.idl
index fdeca8a1c772..64d058d23636 100644
--- a/offapi/com/sun/star/ucb/ContentCreationException.idl
+++ b/offapi/com/sun/star/ucb/ContentCreationException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,8 +43,8 @@ module com { module sun { module star { module ucb {
 /** This exception is thrown to indicate that the creation of a UCB content
     failed.
 
-    @version    1.0
-    @author     Kai Sommerfeld
+    @version	1.0
+    @author 	Kai Sommerfeld
 */
 published exception ContentCreationException : com::sun::star::uno::Exception
 {
diff --git a/offapi/com/sun/star/ucb/ContentEvent.idl b/offapi/com/sun/star/ucb/ContentEvent.idl
index 8d69bfb3d23e..25a1fb4c2716 100644
--- a/offapi/com/sun/star/ucb/ContentEvent.idl
+++ b/offapi/com/sun/star/ucb/ContentEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/ContentInfo.idl b/offapi/com/sun/star/ucb/ContentInfo.idl
index f562d8f39670..c06cb3285f95 100644
--- a/offapi/com/sun/star/ucb/ContentInfo.idl
+++ b/offapi/com/sun/star/ucb/ContentInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/ContentInfoAttribute.idl b/offapi/com/sun/star/ucb/ContentInfoAttribute.idl
index 47dc7e8bb0df..f07eac71f9b9 100644
--- a/offapi/com/sun/star/ucb/ContentInfoAttribute.idl
+++ b/offapi/com/sun/star/ucb/ContentInfoAttribute.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/ContentProvider.idl b/offapi/com/sun/star/ucb/ContentProvider.idl
index 314b4f7c858d..bb5e1f87dae1 100644
--- a/offapi/com/sun/star/ucb/ContentProvider.idl
+++ b/offapi/com/sun/star/ucb/ContentProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,7 +62,7 @@ published service ContentProvider
         objects for the contents provided by this content provider.
 
         <p>This interface can be implemented in case the provider wants to
-        provide some additional interfaces with its implementation of the
+        provide some additional interfaces with its	implementation of the
         identifier objects.
      */
     [optional] interface com::sun::star::ucb::XContentIdentifierFactory;
diff --git a/offapi/com/sun/star/ucb/ContentProviderInfo.idl b/offapi/com/sun/star/ucb/ContentProviderInfo.idl
index 1c39ff7929f8..033dbba5da63 100644
--- a/offapi/com/sun/star/ucb/ContentProviderInfo.idl
+++ b/offapi/com/sun/star/ucb/ContentProviderInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,12 +34,12 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** A structure for content provider information.
-
-    @see        XContentProviderManager
+    
+    @see		XContentProviderManager
 */
 published struct ContentProviderInfo
 {
@@ -57,6 +57,6 @@ published struct ContentProviderInfo
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/ContentProviderProxy.idl b/offapi/com/sun/star/ucb/ContentProviderProxy.idl
index 1bbd1ebf8c8e..27d385364ce9 100644
--- a/offapi/com/sun/star/ucb/ContentProviderProxy.idl
+++ b/offapi/com/sun/star/ucb/ContentProviderProxy.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ module com { module sun { module star { module ucb {
     the real content provider object shall be deferred for some reason
     (i.e. performance) until the first method gets called on it. Instaead of
     instanciating and registering the real provider at the UCB, a proxy for
-    the real provider can be created and registered at the UCB.
+    the	real provider can be created and registered at the UCB.
 
     @see XContentProviderProxyFactory
 */
diff --git a/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl b/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl
index adc63748b95f..eb1fb452d10f 100644
--- a/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl
+++ b/offapi/com/sun/star/ucb/ContentProviderProxyFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/ContentResultSet.idl b/offapi/com/sun/star/ucb/ContentResultSet.idl
index 64867d800cfb..471d2cb3a09d 100644
--- a/offapi/com/sun/star/ucb/ContentResultSet.idl
+++ b/offapi/com/sun/star/ucb/ContentResultSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -66,7 +66,7 @@ module com { module sun { module star { module ucb {
 //=============================================================================
 /** provides access to the children of a folder content.
 
-    <p>It can be understand as a table containing a row for each child. The
+    <p>It can be understand as a table containing a row for	each child. The
     table columns may contain values of properties of the children.
 */
 published service ContentResultSet
@@ -75,7 +75,7 @@ published service ContentResultSet
     /** must be implemented to make it possible to resolve cyclic object
         references ( i.e. between an implementation of
         <type scope="com::sun::star::beans">XPropertySet</type>
-        - which may hold property change listeners - and
+        - which may	hold property change listeners - and
         <type scope="com::sun::star::beans">XPropertyChangeListener</type>
         - which may hold the property set ).
 
@@ -96,7 +96,7 @@ published service ContentResultSet
         This interface mainly provides a cursor for the result set.
 
         <p>Note that every method of this interface implementation additionally
-        may throw a <type>ResultSetException</type> ( which is derived from
+        may throw a	<type>ResultSetException</type> ( which is derived from
         <type scope="com::sun::star::sdbc">SQLException</type> to be compatible
         to that interface ). The new exception transports another exception,
         which indicates the reason for the failure of the method call.
@@ -106,10 +106,10 @@ published service ContentResultSet
     interface com::sun::star::sdbc::XResultSet;
 
     //-------------------------------------------------------------------------
-    /** provides access to data of the content the cursor is pointing to.
+    /**	provides access to data of the content the cursor is pointing to.
 
         <p>Note that every method of this interface implementation additionally
-        may throw a <type>ResultSetException</type> ( which is derived from
+        may throw a	<type>ResultSetException</type> ( which is derived from
         <type scope="com::sun::star::sdbc">SQLException</type> to be compatible
         to that interface ). The new exception transports another exception,
         which indicates the reason for the failure of the method call.
@@ -123,7 +123,7 @@ published service ContentResultSet
         retrieving data from a server ).
 
         <p>Note that every method of this interface implementation additionally
-        may throw a <type>ResultSetException</type> ( which is derived from
+        may throw a	<type>ResultSetException</type> ( which is derived from
         <type scope="com::sun::star::sdbc">SQLException</type> to be compatible
         to that interface ). The new exception transports another exception,
         which indicates the reason for the failure of the method call.
@@ -210,7 +210,7 @@ published service ContentResultSet
     [readonly, property] boolean IsRowCountFinal;
 
     //-------------------------------------------------------------------------
-    /** provides access to the content identifier and the content object
+    /**	provides access to the content identifier and the content object
         itself.
 
         <p>This interface is required.
diff --git a/offapi/com/sun/star/ucb/ContentResultSetCapability.idl b/offapi/com/sun/star/ucb/ContentResultSetCapability.idl
index a5c8c07353d9..e110bcd3fcc9 100644
--- a/offapi/com/sun/star/ucb/ContentResultSetCapability.idl
+++ b/offapi/com/sun/star/ucb/ContentResultSetCapability.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/ContentTransmitter.idl b/offapi/com/sun/star/ucb/ContentTransmitter.idl
index 7691dcf91036..68af6dc689fd 100644
--- a/offapi/com/sun/star/ucb/ContentTransmitter.idl
+++ b/offapi/com/sun/star/ucb/ContentTransmitter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/Cookie.idl b/offapi/com/sun/star/ucb/Cookie.idl
index 0c413322dd76..c15727662acf 100644
--- a/offapi/com/sun/star/ucb/Cookie.idl
+++ b/offapi/com/sun/star/ucb/Cookie.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** A cookie.
@@ -84,6 +84,6 @@ published struct Cookie
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/CookiePolicy.idl b/offapi/com/sun/star/ucb/CookiePolicy.idl
index 50d354cf618f..c27f2c3b5805 100644
--- a/offapi/com/sun/star/ucb/CookiePolicy.idl
+++ b/offapi/com/sun/star/ucb/CookiePolicy.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** A policy how to handle cookie requests.
@@ -56,6 +56,6 @@ published enum CookiePolicy
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/CookieRequest.idl b/offapi/com/sun/star/ucb/CookieRequest.idl
index cde1f143420e..df39352e2f5a 100644
--- a/offapi/com/sun/star/ucb/CookieRequest.idl
+++ b/offapi/com/sun/star/ucb/CookieRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** Cookie requests.
@@ -51,6 +51,6 @@ published enum CookieRequest
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/CrossReference.idl b/offapi/com/sun/star/ucb/CrossReference.idl
index 799cd245f809..9a18adeff520 100644
--- a/offapi/com/sun/star/ucb/CrossReference.idl
+++ b/offapi/com/sun/star/ucb/CrossReference.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@ module com { module sun { module star { module ucb {
 //=============================================================================
 /** This struct contains information describing a cross reference.
 
-    <p>Such references are kept by news servers for managing articles
+    <p>Such	references are kept by news servers for managing articles
     contained in multiple groups. An article can have a sequence of
     cross references.
 */
diff --git a/offapi/com/sun/star/ucb/DefaultHierarchyDataSource.idl b/offapi/com/sun/star/ucb/DefaultHierarchyDataSource.idl
index b2f3af2c01b7..f31bc26b8aa6 100644
--- a/offapi/com/sun/star/ucb/DefaultHierarchyDataSource.idl
+++ b/offapi/com/sun/star/ucb/DefaultHierarchyDataSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/DocumentHeaderField.idl b/offapi/com/sun/star/ucb/DocumentHeaderField.idl
index 2ae9fce14544..5389772e3fb1 100644
--- a/offapi/com/sun/star/ucb/DocumentHeaderField.idl
+++ b/offapi/com/sun/star/ucb/DocumentHeaderField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/DocumentStoreMode.idl b/offapi/com/sun/star/ucb/DocumentStoreMode.idl
index 59c3b727754a..c1865d881ffc 100644
--- a/offapi/com/sun/star/ucb/DocumentStoreMode.idl
+++ b/offapi/com/sun/star/ucb/DocumentStoreMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/DuplicateCommandIdentifierException.idl b/offapi/com/sun/star/ucb/DuplicateCommandIdentifierException.idl
index fb6153644e0e..e802585aba74 100644
--- a/offapi/com/sun/star/ucb/DuplicateCommandIdentifierException.idl
+++ b/offapi/com/sun/star/ucb/DuplicateCommandIdentifierException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,8 +45,8 @@ module com { module sun { module star { module ucb {
     identifier <code>0</code>, which indicates that the command shall never
     be aborted by a client, can be used by any thread.
 
-    @version    1.0
-    @author     Kai Sommerfeld
+    @version	1.0
+    @author 	Kai Sommerfeld
     @see        XCommandProcessor
 */
 published exception DuplicateCommandIdentifierException : com::sun::star::uno::Exception
diff --git a/offapi/com/sun/star/ucb/DuplicateProviderException.idl b/offapi/com/sun/star/ucb/DuplicateProviderException.idl
index 1cade82f18e0..888fbef6d1fa 100644
--- a/offapi/com/sun/star/ucb/DuplicateProviderException.idl
+++ b/offapi/com/sun/star/ucb/DuplicateProviderException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,15 +34,15 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** is thrown to indicate that a content provider with the same
     identifier already was registered with a content provider manager.
-
-    @version    1.0
-    @author     Kai Sommerfeld
-    @see        XContentProviderManager
+    
+    @version	1.0
+    @author 	Kai Sommerfeld
+    @see		XContentProviderManager
 */
 published exception DuplicateProviderException: com::sun::star::uno::Exception
 {
@@ -50,6 +50,6 @@ published exception DuplicateProviderException: com::sun::star::uno::Exception
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/DynamicResultSet.idl b/offapi/com/sun/star/ucb/DynamicResultSet.idl
index 637d15ab814a..313079159ca3 100644
--- a/offapi/com/sun/star/ucb/DynamicResultSet.idl
+++ b/offapi/com/sun/star/ucb/DynamicResultSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/Error.idl b/offapi/com/sun/star/ucb/Error.idl
index 681360f28b8f..1ffe938cebf1 100644
--- a/offapi/com/sun/star/ucb/Error.idl
+++ b/offapi/com/sun/star/ucb/Error.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/ExpandContentProvider.idl b/offapi/com/sun/star/ucb/ExpandContentProvider.idl
index 1db65c2f5150..38caaa4127c6 100644
--- a/offapi/com/sun/star/ucb/ExpandContentProvider.idl
+++ b/offapi/com/sun/star/ucb/ExpandContentProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,22 +34,22 @@ module com { module sun { module star { module ucb {
 
 /** The Expand Content Provider implements a <type>ContentProvider</type>
     for the <type>UniversalContentBroker</type> (UCB).
-
+    
     <p>
     It provides access to content via macrofied URLs, e.g.
     vnd.sun.star.expand://$UNO_USER_PACKAGES/abc.
-
+    
     Macros which will be expanded using the singleton
     /singletons/com.sun.star.util.theMacroExpander
     of the process' initial component context.
-
+    
     @see Content
 */
 service ExpandContentProvider
 {
     service ContentProvider;
 };
-
+ 
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/ucb/ExportStreamInfo.idl b/offapi/com/sun/star/ucb/ExportStreamInfo.idl
index bf8f2b59bc3d..a231e7384a7a 100644
--- a/offapi/com/sun/star/ucb/ExportStreamInfo.idl
+++ b/offapi/com/sun/star/ucb/ExportStreamInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** information needed to export an object in mbx format (supplying an output
@@ -56,6 +56,6 @@ published struct ExportStreamInfo
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/FTPContent.idl b/offapi/com/sun/star/ucb/FTPContent.idl
index b72ef1d660cd..1fb21da610da 100644
--- a/offapi/com/sun/star/ucb/FTPContent.idl
+++ b/offapi/com/sun/star/ucb/FTPContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,7 +68,7 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** A FTPContent provides an object representing either a (ftp-server-side)
+/** A FTPContent provides an object representing either a (ftp-server-side) 
     directory object allowing listing of children or a content object providing
     access to a (ftp-server-side) file.
 
@@ -194,7 +194,7 @@ published service FTPContent
         </p>
      */
     interface com::sun::star::ucb::XCommandProcessor;
-
+    
     //-------------------------------------------------------------------------
     /** This interface is implemented according to the specification of
         service <type>Content</type>.
diff --git a/offapi/com/sun/star/ucb/FTPContentProvider.idl b/offapi/com/sun/star/ucb/FTPContentProvider.idl
index dd1a6e8aea09..daef77e82dfe 100644
--- a/offapi/com/sun/star/ucb/FTPContentProvider.idl
+++ b/offapi/com/sun/star/ucb/FTPContentProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/FetchError.idl b/offapi/com/sun/star/ucb/FetchError.idl
index 49e9f5f7ed39..c987d5839449 100644
--- a/offapi/com/sun/star/ucb/FetchError.idl
+++ b/offapi/com/sun/star/ucb/FetchError.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/FetchResult.idl b/offapi/com/sun/star/ucb/FetchResult.idl
index ebd8dd4060aa..965ffd8765b2 100644
--- a/offapi/com/sun/star/ucb/FetchResult.idl
+++ b/offapi/com/sun/star/ucb/FetchResult.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ published struct FetchResult
         <p>One any contains the data of one whole row. Those methods which
         use this struct have to specify, what the any has to contain.
     */
-    sequence< any > Rows;
+    sequence< any >	Rows;
 
     //-------------------------------------------------------------------------
     /** indicates the index of the first row contained in
@@ -68,7 +68,7 @@ published struct FetchResult
         rows in <member>FetchResult::Rows</member> are ordered in the same way
         as in the original resultset.
     */
-    boolean Orientation;
+    boolean	Orientation;
 
     //-------------------------------------------------------------------------
     /** indicates whether and which error has occured, while fetching.
diff --git a/offapi/com/sun/star/ucb/FileContent.idl b/offapi/com/sun/star/ucb/FileContent.idl
index 7dfd2d7439ca..f75e1b9a2e3c 100644
--- a/offapi/com/sun/star/ucb/FileContent.idl
+++ b/offapi/com/sun/star/ucb/FileContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -195,7 +195,7 @@ published service FileContent
         string Title ( file name )
         </li>
         <li>
-        boolean IsVolume ( read-only )
+        boolean	IsVolume ( read-only )
         </li>
         <li>
         boolean IsRemoveable ( read-only )
diff --git a/offapi/com/sun/star/ucb/FileContentProvider.idl b/offapi/com/sun/star/ucb/FileContentProvider.idl
index 5951d852e2ca..f1545106bac5 100644
--- a/offapi/com/sun/star/ucb/FileContentProvider.idl
+++ b/offapi/com/sun/star/ucb/FileContentProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -76,10 +76,10 @@ published service FileContentProvider
     //-------------------------------------------------------------------------
     /** provides access to properties supported by the UCP.
 
-        <p> The supported properties give two kinds of meta-information about
-        the environment of the FCP, namely property <b>HostName</b> containing
+        <p> The supported properties give two kinds	of meta-information	about
+        the environment of the FCP, namely property	<b>HostName</b> containing
         the name of the computer, and property <b>FileSystemNotation</b>
-        determining which system dependent notation the file system identifier
+        determining which system dependent notation	the file system identifier
         follow.
 
            <p>
diff --git a/offapi/com/sun/star/ucb/FileSystemNotation.idl b/offapi/com/sun/star/ucb/FileSystemNotation.idl
index 70ded4100bf3..4bbc2640339b 100644
--- a/offapi/com/sun/star/ucb/FileSystemNotation.idl
+++ b/offapi/com/sun/star/ucb/FileSystemNotation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** The notational conventions used to denote file system paths on different
@@ -65,6 +65,6 @@ published constants FileSystemNotation
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/FolderList.idl b/offapi/com/sun/star/ucb/FolderList.idl
index 0966639725cf..790150d0ff5d 100644
--- a/offapi/com/sun/star/ucb/FolderList.idl
+++ b/offapi/com/sun/star/ucb/FolderList.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/FolderListCommand.idl b/offapi/com/sun/star/ucb/FolderListCommand.idl
index 243e66dc31b7..4e30213f515f 100644
--- a/offapi/com/sun/star/ucb/FolderListCommand.idl
+++ b/offapi/com/sun/star/ucb/FolderListCommand.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/FolderListEntry.idl b/offapi/com/sun/star/ucb/FolderListEntry.idl
index 0652dd17c87e..d80e956d5bed 100644
--- a/offapi/com/sun/star/ucb/FolderListEntry.idl
+++ b/offapi/com/sun/star/ucb/FolderListEntry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/GlobalTransferCommandArgument.idl b/offapi/com/sun/star/ucb/GlobalTransferCommandArgument.idl
index 65b479bb3c55..b88f43677b9c 100644
--- a/offapi/com/sun/star/ucb/GlobalTransferCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/GlobalTransferCommandArgument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/HandleCookiesRequest.idl b/offapi/com/sun/star/ucb/HandleCookiesRequest.idl
index 50dbac15ef0b..c81bea8f660d 100644
--- a/offapi/com/sun/star/ucb/HandleCookiesRequest.idl
+++ b/offapi/com/sun/star/ucb/HandleCookiesRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** An error requesting guidance on how to handle cookie requests.
@@ -68,6 +68,6 @@ published exception HandleCookiesRequest: com::sun::star::task::ClassifiedIntera
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/HelpContent.idl b/offapi/com/sun/star/ucb/HelpContent.idl
index 2dca8b8cf8b1..e10e612fa606 100644
--- a/offapi/com/sun/star/ucb/HelpContent.idl
+++ b/offapi/com/sun/star/ucb/HelpContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/HelpContentProvider.idl b/offapi/com/sun/star/ucb/HelpContentProvider.idl
index 32b51431436a..691dbea72c3d 100644
--- a/offapi/com/sun/star/ucb/HelpContentProvider.idl
+++ b/offapi/com/sun/star/ucb/HelpContentProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/HierarchyContentProvider.idl b/offapi/com/sun/star/ucb/HierarchyContentProvider.idl
index f5a975ed58b6..a5971e998bb3 100644
--- a/offapi/com/sun/star/ucb/HierarchyContentProvider.idl
+++ b/offapi/com/sun/star/ucb/HierarchyContentProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/HierarchyDataReadAccess.idl b/offapi/com/sun/star/ucb/HierarchyDataReadAccess.idl
index d5056f2c0afb..9eea31e6fd27 100644
--- a/offapi/com/sun/star/ucb/HierarchyDataReadAccess.idl
+++ b/offapi/com/sun/star/ucb/HierarchyDataReadAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl b/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl
index eda1b45094e4..56d6e258a815 100644
--- a/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl
+++ b/offapi/com/sun/star/ucb/HierarchyDataReadWriteAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/HierarchyDataSource.idl b/offapi/com/sun/star/ucb/HierarchyDataSource.idl
index 31ec3ea91ca1..ecd802129be6 100644
--- a/offapi/com/sun/star/ucb/HierarchyDataSource.idl
+++ b/offapi/com/sun/star/ucb/HierarchyDataSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/HierarchyFolderContent.idl b/offapi/com/sun/star/ucb/HierarchyFolderContent.idl
index 5db255975cae..295d35aa5ece 100644
--- a/offapi/com/sun/star/ucb/HierarchyFolderContent.idl
+++ b/offapi/com/sun/star/ucb/HierarchyFolderContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/HierarchyLinkContent.idl b/offapi/com/sun/star/ucb/HierarchyLinkContent.idl
index 53769e310488..a448f4cffde8 100644
--- a/offapi/com/sun/star/ucb/HierarchyLinkContent.idl
+++ b/offapi/com/sun/star/ucb/HierarchyLinkContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/HierarchyRootFolderContent.idl b/offapi/com/sun/star/ucb/HierarchyRootFolderContent.idl
index 3ef8c59bc24a..0c89050d6418 100644
--- a/offapi/com/sun/star/ucb/HierarchyRootFolderContent.idl
+++ b/offapi/com/sun/star/ucb/HierarchyRootFolderContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/IOErrorCode.idl b/offapi/com/sun/star/ucb/IOErrorCode.idl
index 91572ab45b3e..6d54039f98a4 100644
--- a/offapi/com/sun/star/ucb/IOErrorCode.idl
+++ b/offapi/com/sun/star/ucb/IOErrorCode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/IllegalIdentifierException.idl b/offapi/com/sun/star/ucb/IllegalIdentifierException.idl
index d0dc33dbcd5c..fd923fde1808 100644
--- a/offapi/com/sun/star/ucb/IllegalIdentifierException.idl
+++ b/offapi/com/sun/star/ucb/IllegalIdentifierException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,15 +34,15 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** This exception is thrown to indicate an illegal content identifier.
-
-    @version    1.0
-    @author     Kai Sommerfeld
-    @see        XContent
-    @see        XContentIdentifier
+    
+    @version	1.0
+    @author 	Kai Sommerfeld
+    @see		XContent
+    @see		XContentIdentifier
 */
 published exception IllegalIdentifierException: com::sun::star::uno::Exception
 {
@@ -50,6 +50,6 @@ published exception IllegalIdentifierException: com::sun::star::uno::Exception
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/InsertCommandArgument.idl b/offapi/com/sun/star/ucb/InsertCommandArgument.idl
index c8950ac87113..6aa2034efeb5 100644
--- a/offapi/com/sun/star/ucb/InsertCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/InsertCommandArgument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/InteractiveAppException.idl b/offapi/com/sun/star/ucb/InteractiveAppException.idl
index 5e75721b7cec..e37f1188d49b 100644
--- a/offapi/com/sun/star/ucb/InteractiveAppException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveAppException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/InteractiveAugmentedIOException.idl b/offapi/com/sun/star/ucb/InteractiveAugmentedIOException.idl
index 0949078f15f9..a2d6b772b725 100644
--- a/offapi/com/sun/star/ucb/InteractiveAugmentedIOException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveAugmentedIOException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ published exception InteractiveAugmentedIOException : com::sun::star::ucb::Inter
     //-------------------------------------------------------------------------
     /** Additional arguments.
 
-        <P>See <type scope="com::sun::star::task">InteractionHandler</type>
+        <P>See <type scope="com::sun::star::task">InteractionHandler</type> 
         for a description of well-known arguments.</P>
     */
         sequence< any > Arguments;
diff --git a/offapi/com/sun/star/ucb/InteractiveBadTransferURLException.idl b/offapi/com/sun/star/ucb/InteractiveBadTransferURLException.idl
index 37e3f09ae4c2..cd5c1e92c4a9 100644
--- a/offapi/com/sun/star/ucb/InteractiveBadTransferURLException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveBadTransferURLException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl b/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl
index 55a6caa756d4..b87beacd742a 100644
--- a/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/InteractiveFileIOException.idl b/offapi/com/sun/star/ucb/InteractiveFileIOException.idl
index 6d4f9015f206..9024ebc07904 100644
--- a/offapi/com/sun/star/ucb/InteractiveFileIOException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveFileIOException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ module com { module sun { module star { module ucb {
 //=============================================================================
 /** An input/output error while processing a file.
 
-    <p>This exception is deprecated. Use
+    <p>This exception is deprecated. Use 
     <type>InteractiveAugmentedIOException</type> instead.
 
     @deprecated
diff --git a/offapi/com/sun/star/ucb/InteractiveIOException.idl b/offapi/com/sun/star/ucb/InteractiveIOException.idl
index ef66bd57488a..0de89b2380c2 100644
--- a/offapi/com/sun/star/ucb/InteractiveIOException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveIOException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingException.idl b/offapi/com/sun/star/ucb/InteractiveLockingException.idl
index 8dc6444ef446..496ccd8dae72 100644
--- a/offapi/com/sun/star/ucb/InteractiveLockingException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveLockingException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl b/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl
index b47d4f55c3d1..90aff3a29b5d 100644
--- a/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl b/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl
index da243c4d2bbe..875306816622 100644
--- a/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl b/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl
index 7342ef87f35d..f97ba00fc7e5 100644
--- a/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkConnectException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkConnectException.idl
index bbb9afcb901e..d8fa03149f02 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkConnectException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkConnectException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** A network error specifing a connection failure.
@@ -50,6 +50,6 @@ published exception InteractiveNetworkConnectException: InteractiveNetworkExcept
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkException.idl
index deb741724ca1..131f5ba7f0c9 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,11 +34,11 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** An error related to network operations.
-
+    
     <p> Various meaningful errors are derived from this exception. </p>
 */
 published exception InteractiveNetworkException: com::sun::star::task::ClassifiedInteractionRequest
@@ -47,6 +47,6 @@ published exception InteractiveNetworkException: com::sun::star::task::Classifie
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkGeneralException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkGeneralException.idl
index 7ac16fa30bee..b4a7e126d6d8 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkGeneralException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkGeneralException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** A network error specifing a general failure.
@@ -45,6 +45,6 @@ published exception InteractiveNetworkGeneralException: com::sun::star::ucb::Int
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkOffLineException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkOffLineException.idl
index 70c7c3592604..14f83a20a748 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkOffLineException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkOffLineException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** A network error specifing an off line condition.
@@ -45,6 +45,6 @@ published exception InteractiveNetworkOffLineException: com::sun::star::ucb::Int
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkReadException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkReadException.idl
index edfdfe6392f2..79162d168ad6 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkReadException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkReadException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** A network error specifing a read failure.
@@ -51,6 +51,6 @@ published exception InteractiveNetworkReadException: com::sun::star::ucb::Intera
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException.idl
index 3e60d9b21e8d..1c7148f4cb10 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkResolveNameException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** A network error specifing a name resolution failure.
@@ -50,6 +50,6 @@ published exception InteractiveNetworkResolveNameException: com::sun::star::ucb:
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/InteractiveNetworkWriteException.idl b/offapi/com/sun/star/ucb/InteractiveNetworkWriteException.idl
index dbeff75142a0..6a8564af2e65 100644
--- a/offapi/com/sun/star/ucb/InteractiveNetworkWriteException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveNetworkWriteException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** A network error specifing a write failure.
@@ -51,6 +51,6 @@ published exception InteractiveNetworkWriteException: com::sun::star::ucb::Inter
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/InteractiveWrongMediumException.idl b/offapi/com/sun/star/ucb/InteractiveWrongMediumException.idl
index f3757b17b7fa..1a4ec3fa3e85 100644
--- a/offapi/com/sun/star/ucb/InteractiveWrongMediumException.idl
+++ b/offapi/com/sun/star/ucb/InteractiveWrongMediumException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** is thrown when the wrong medium is inserted into a removable drive during
@@ -44,12 +44,12 @@ published exception InteractiveWrongMediumException: com::sun::star::task::Class
     /** identifies the medium thats needed to continue with the pending
         operation.
     */
-    any Medium;
+    any	Medium;
 };
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/ucb/Link.idl b/offapi/com/sun/star/ucb/Link.idl
index 42998e3daae0..008d31b1e2e1 100644
--- a/offapi/com/sun/star/ucb/Link.idl
+++ b/offapi/com/sun/star/ucb/Link.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/ListAction.idl b/offapi/com/sun/star/ucb/ListAction.idl
index d7d9e2751eb5..a3d80ac77839 100644
--- a/offapi/com/sun/star/ucb/ListAction.idl
+++ b/offapi/com/sun/star/ucb/ListAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -70,32 +70,32 @@ published struct ListAction
                         <th>Count</th>
                         <th>ActionInfo</th></tr>
 
-        <tr align=left> <td>WELCOME</td>
+        <tr align=left>	<td>WELCOME</td>
                         <td>n/a</td>
                         <td>n/a</td>
                         <td><type>WelcomeDynamicResultSetStruct</type> required</td></tr>
 
-        <tr align=left> <td>CLEARED</td>
+        <tr align=left>	<td>CLEARED</td>
                         <td>n/a</td>
                         <td>n/a</td>
                         <td>n/a</td></tr>
 
-        <tr align=left> <td>INSERTED</td>
+        <tr align=left>	<td>INSERTED</td>
                         <td>required 1-x</td>
                         <td>required 1-x</td>
                         <td>allowed but not required... @todo </td></tr>
 
-        <tr align=left> <td>REMOVED</td>
+        <tr align=left>	<td>REMOVED</td>
                         <td>required 1-x</td>
                         <td>required 1-x</td>
                         <td>n/a</td></tr>
 
-        <tr align=left> <td>MOVED</td>
+        <tr align=left>	<td>MOVED</td>
                         <td>required 1-x</td>
                         <td>required 1-x</td>
                         <td>type long required</td></tr>
 
-        <tr align=left> <td>PROPERTIES_CHANGED</td>
+        <tr align=left>	<td>PROPERTIES_CHANGED</td>
                         <td>required 1-x</td>
                         <td>required 1-x</td>
                         <td>allowed but not required... @todo</td></tr>
diff --git a/offapi/com/sun/star/ucb/ListActionType.idl b/offapi/com/sun/star/ucb/ListActionType.idl
index d370ce00f1d7..396739264c69 100644
--- a/offapi/com/sun/star/ucb/ListActionType.idl
+++ b/offapi/com/sun/star/ucb/ListActionType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,11 +51,11 @@ published constants ListActionType
 
     <p>The member <member>ListAction::ActionInfo</member> is required to
     contain a struct <type>WelcomeDynamicResultSetStruct</type>.
-    This struct contains two
+    This struct contains two 
     <type scope="com::sun::star::sdbc">XResultSet</type>s (old and new).
     During and after the notification only the new set is valid for access.
     But the listener is required to remind both
-    <type scope="com::sun::star::sdbc">XResultSet</type>s as he will not get
+    <type scope="com::sun::star::sdbc">XResultSet</type>s as he	will not get
     another chance to get them again.
 
     <p>The members <member>ListAction::Count</member> and
@@ -71,7 +71,7 @@ published constants ListActionType
     <p>The members <member>ListAction::Count</member> and
     <member>ListAction::Position</member> contain the position and count of
     newly inserted rows. If the count is greater than one, the inserted rows
-    have to be one after the other.
+    have to	be one after the other.
 
     <p> <member>ListAction::ActionInfo</member> could contain something but
     this is not required. For example, it could contain the properties of
diff --git a/offapi/com/sun/star/ucb/ListEvent.idl b/offapi/com/sun/star/ucb/ListEvent.idl
index b739f6e11178..eb40a4120753 100644
--- a/offapi/com/sun/star/ucb/ListEvent.idl
+++ b/offapi/com/sun/star/ucb/ListEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ module com { module sun { module star { module ucb {
 published struct ListEvent: com::sun::star::lang::EventObject
 {
     //-------------------------------------------------------------------------
-    /** If you apply the given <type>ListAction</type>s one after the other
+    /**	If you apply the given <type>ListAction</type>s one after the other
         to the old version of an resultset in given order, you will get the
         positions in the new version.
     */
diff --git a/offapi/com/sun/star/ucb/ListenerAlreadySetException.idl b/offapi/com/sun/star/ucb/ListenerAlreadySetException.idl
index 5c279f974f94..c4176fb4dd08 100644
--- a/offapi/com/sun/star/ucb/ListenerAlreadySetException.idl
+++ b/offapi/com/sun/star/ucb/ListenerAlreadySetException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** This exception is thrown to indicate that a Listener is already set while
@@ -48,7 +48,7 @@ published exception ListenerAlreadySetException: com::sun::star::uno::Exception
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/Lock.idl b/offapi/com/sun/star/ucb/Lock.idl
index cf6276f9a4e2..a4ec2c40e209 100644
--- a/offapi/com/sun/star/ucb/Lock.idl
+++ b/offapi/com/sun/star/ucb/Lock.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/LockDepth.idl b/offapi/com/sun/star/ucb/LockDepth.idl
index 9ad463b16676..c0b439034886 100644
--- a/offapi/com/sun/star/ucb/LockDepth.idl
+++ b/offapi/com/sun/star/ucb/LockDepth.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/LockEntry.idl b/offapi/com/sun/star/ucb/LockEntry.idl
index be348e09a08b..2e42ede377de 100644
--- a/offapi/com/sun/star/ucb/LockEntry.idl
+++ b/offapi/com/sun/star/ucb/LockEntry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/LockScope.idl b/offapi/com/sun/star/ucb/LockScope.idl
index d3af9a2b61a1..42bbc37a8c40 100644
--- a/offapi/com/sun/star/ucb/LockScope.idl
+++ b/offapi/com/sun/star/ucb/LockScope.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/LockType.idl b/offapi/com/sun/star/ucb/LockType.idl
index d85cfb7baeb8..1691f425ec74 100644
--- a/offapi/com/sun/star/ucb/LockType.idl
+++ b/offapi/com/sun/star/ucb/LockType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,15 +44,15 @@ published enum LockType
     */
     WRITE
 
-//  //-------------------------------------------------------------------------
-//  /** read lock.
-//  */
-//  READ,
+//	//-------------------------------------------------------------------------
+//	/** read lock.
+//	*/
+//	READ,
 //
-//  //-------------------------------------------------------------------------
-//  /** readwrite lock.
-//  */
-//  READWRITE
+//	//-------------------------------------------------------------------------
+// 	/** readwrite lock.
+//	*/
+//	READWRITE
 
 };
 
diff --git a/offapi/com/sun/star/ucb/MissingInputStreamException.idl b/offapi/com/sun/star/ucb/MissingInputStreamException.idl
index 76dde6da44a8..450b5f9adc68 100644
--- a/offapi/com/sun/star/ucb/MissingInputStreamException.idl
+++ b/offapi/com/sun/star/ucb/MissingInputStreamException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,8 +44,8 @@ module com { module sun { module star { module ucb {
     expects that an input stream is supplied with the given
     <type>InsertCommandArgument</type>.
 
-    @version    1.0
-    @author     Kai Sommerfeld
+    @version	1.0
+    @author 	Kai Sommerfeld
     @see        Content
 */
 published exception MissingInputStreamException : com::sun::star::uno::Exception
diff --git a/offapi/com/sun/star/ucb/MissingPropertiesException.idl b/offapi/com/sun/star/ucb/MissingPropertiesException.idl
index 086c4a8ec8c7..fef04b92cf9f 100644
--- a/offapi/com/sun/star/ucb/MissingPropertiesException.idl
+++ b/offapi/com/sun/star/ucb/MissingPropertiesException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,8 +43,8 @@ module com { module sun { module star { module ucb {
     values must be set prior to executing the command 'insert', which makes
     the new resource persistent.
 
-    @version    1.0
-    @author     Kai Sommerfeld
+    @version	1.0
+    @author 	Kai Sommerfeld
     @see        Content
 */
 published exception MissingPropertiesException : com::sun::star::uno::Exception
diff --git a/offapi/com/sun/star/ucb/NameClash.idl b/offapi/com/sun/star/ucb/NameClash.idl
index 018b57c1c8f0..8661ecef3aa9 100644
--- a/offapi/com/sun/star/ucb/NameClash.idl
+++ b/offapi/com/sun/star/ucb/NameClash.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/NameClashException.idl b/offapi/com/sun/star/ucb/NameClashException.idl
index e3cbedcb4d4c..29748df6ab4c 100644
--- a/offapi/com/sun/star/ucb/NameClashException.idl
+++ b/offapi/com/sun/star/ucb/NameClashException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/NameClashResolveRequest.idl b/offapi/com/sun/star/ucb/NameClashResolveRequest.idl
index a76e8845d0c7..1891c3662fec 100644
--- a/offapi/com/sun/star/ucb/NameClashResolveRequest.idl
+++ b/offapi/com/sun/star/ucb/NameClashResolveRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,8 +53,8 @@ module com { module sun { module star { module ucb {
     <type>XInteractionReplaceExistingData</type> will be selected if the
     clashing resource shall be overwritten.
 
-    @version    1.0
-    @author     Kai Sommerfeld
+    @version	1.0
+    @author 	Kai Sommerfeld
 */
 published exception NameClashResolveRequest : com::sun::star::task::ClassifiedInteractionRequest
 {
diff --git a/offapi/com/sun/star/ucb/NumberedSortingInfo.idl b/offapi/com/sun/star/ucb/NumberedSortingInfo.idl
index f1b414974160..e7299661711b 100644
--- a/offapi/com/sun/star/ucb/NumberedSortingInfo.idl
+++ b/offapi/com/sun/star/ucb/NumberedSortingInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/ODMAContent.idl b/offapi/com/sun/star/ucb/ODMAContent.idl
index b74f8be34956..f662e5f458f0 100644
--- a/offapi/com/sun/star/ucb/ODMAContent.idl
+++ b/offapi/com/sun/star/ucb/ODMAContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -129,10 +129,10 @@ published service ODMAContent
         string ContentType ( read-only, always "application/vnd.sun.star.odma" )
         </li>
         <li>
-        boolean IsDocument
+        boolean IsDocument 
         </li>
         <li>
-        boolean IsFolder
+        boolean IsFolder 
         </li>
         <li>
         <type scope="com::sun::star::util">DateTime</type> DateCreated ( read-only )
diff --git a/offapi/com/sun/star/ucb/ODMAContentProvider.idl b/offapi/com/sun/star/ucb/ODMAContentProvider.idl
index b5f5106cd81c..9a429d004448 100644
--- a/offapi/com/sun/star/ucb/ODMAContentProvider.idl
+++ b/offapi/com/sun/star/ucb/ODMAContentProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/OpenCommandArgument.idl b/offapi/com/sun/star/ucb/OpenCommandArgument.idl
index c09241aa5728..e4f2b4122546 100644
--- a/offapi/com/sun/star/ucb/OpenCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/OpenCommandArgument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -66,7 +66,7 @@ published struct OpenCommandArgument
         <type scope="com::sun::star::io">XActiveDataStreamer</type>).
 
         <p>XActiveDataSink and XOutputStream give the caller read-only
-        access to the contents. XActiveDataStreamer offers both read and
+        access to the contents.	XActiveDataStreamer offers both read and
         write access to the contents.
 
         <p>If an XActiveDataSink is supplied, the implementation of the command
@@ -75,7 +75,7 @@ published struct OpenCommandArgument
         highly recommended that this object also implements the interface
         <type scope="com::sun::star::io">XSeekable</type>, if this can be done
         without wasting resources (i.e. allocating huge memory buffers).
-        The implementation object has to be supplied to the data sink.
+        The	implementation object has to be supplied to the data sink.
     */
     com::sun::star::uno::XInterface Sink;
 
diff --git a/offapi/com/sun/star/ucb/OpenCommandArgument2.idl b/offapi/com/sun/star/ucb/OpenCommandArgument2.idl
index a9ab8b66dd83..0c0caf437b37 100644
--- a/offapi/com/sun/star/ucb/OpenCommandArgument2.idl
+++ b/offapi/com/sun/star/ucb/OpenCommandArgument2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ module com { module sun { module star { module ucb {
 //=============================================================================
 /** The argument for commands like "open", "update", and "synchronize".
 
-    <p>This strcut extends the original OpenCommandArgument, which must not be
+    <p>This	strcut extends the original OpenCommandArgument, which must not be
     changed for compatibility reasons.
 
     @see XCommandProcessor
@@ -54,7 +54,7 @@ published struct OpenCommandArgument2 : OpenCommandArgument
         <type>ContentResultSet</type>.
 
         <p>The resultset implementation may ignore this parameter, if it
-        cannot sort the data by the given criteria in an efficient way (i.e.
+        cannot sort the	data by the given criteria in an efficient way (i.e.
         directly using the underlying data source -> SQL-database -> ORDER BY).
     */
     sequence< com::sun::star::ucb::NumberedSortingInfo > SortingInfo;
diff --git a/offapi/com/sun/star/ucb/OpenMode.idl b/offapi/com/sun/star/ucb/OpenMode.idl
index 4f709d579a5e..d906b0747c4b 100644
--- a/offapi/com/sun/star/ucb/OpenMode.idl
+++ b/offapi/com/sun/star/ucb/OpenMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -84,7 +84,7 @@ published constants OpenMode
     */
     const short DOCUMENT_SHARE_DENY_WRITE = 5;
 
-//  const short DOCUMENT_SHARE_DENY_READ = 6;
+//	const short DOCUMENT_SHARE_DENY_READ = 6;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/OutgoingMessageState.idl b/offapi/com/sun/star/ucb/OutgoingMessageState.idl
index cb2e660b3c13..8745b467d40f 100644
--- a/offapi/com/sun/star/ucb/OutgoingMessageState.idl
+++ b/offapi/com/sun/star/ucb/OutgoingMessageState.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/PackageContentProvider.idl b/offapi/com/sun/star/ucb/PackageContentProvider.idl
index 8a26b4044bdf..8ac286b63ef2 100644
--- a/offapi/com/sun/star/ucb/PackageContentProvider.idl
+++ b/offapi/com/sun/star/ucb/PackageContentProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,7 +55,7 @@ published service PackageContentProvider
         <ol>
         <li>
         A PCP Stream (<type>PackageStreamContent</type>) is a content which
-        represents a file inside a package. It is always contained in a PCP
+        represents a file inside a package.	It is always contained in a PCP
         Folder. A PCP Stream has no children.
         </li>
         <li>
diff --git a/offapi/com/sun/star/ucb/PackageFolderContent.idl b/offapi/com/sun/star/ucb/PackageFolderContent.idl
index 13668bc54ea6..0ef08a87aa74 100644
--- a/offapi/com/sun/star/ucb/PackageFolderContent.idl
+++ b/offapi/com/sun/star/ucb/PackageFolderContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -131,7 +131,7 @@ published service PackageFolderContent
         changes to the underlying package file. Note that the current
         implementation of PCP contents never flushes automatically! Operations
         which require a flush to get persistent, are:
-        "setPropertyValues( < any_non_read_only_property > ) ", "delete",
+        "setPropertyValues( < any_non_read_only_property > ) ",	"delete",
         "insert" )
         </li>
         </ul>
diff --git a/offapi/com/sun/star/ucb/PackageStreamContent.idl b/offapi/com/sun/star/ucb/PackageStreamContent.idl
index 7da23332c959..4cd766305612 100644
--- a/offapi/com/sun/star/ucb/PackageStreamContent.idl
+++ b/offapi/com/sun/star/ucb/PackageStreamContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/PersistentPropertySet.idl b/offapi/com/sun/star/ucb/PersistentPropertySet.idl
index b25e1dfa25cb..39a7dcb0ad22 100644
--- a/offapi/com/sun/star/ucb/PersistentPropertySet.idl
+++ b/offapi/com/sun/star/ucb/PersistentPropertySet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ module com { module sun { module star { module ucb {
 
 //=============================================================================
 /** This service containss the interfaces to implement by objects
-    returned by <member>XPropertySetRegistry::openPropertySet</member>.
+    returned by	<member>XPropertySetRegistry::openPropertySet</member>.
   */
 published service PersistentPropertySet
 {
diff --git a/offapi/com/sun/star/ucb/PostCommandArgument.idl b/offapi/com/sun/star/ucb/PostCommandArgument.idl
index c1c04c237af4..977d5da90531 100644
--- a/offapi/com/sun/star/ucb/PostCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/PostCommandArgument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/PostCommandArgument2.idl b/offapi/com/sun/star/ucb/PostCommandArgument2.idl
index 6ee276c013e5..fecff022b120 100644
--- a/offapi/com/sun/star/ucb/PostCommandArgument2.idl
+++ b/offapi/com/sun/star/ucb/PostCommandArgument2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/Priority.idl b/offapi/com/sun/star/ucb/Priority.idl
index 061676b26ab4..18d5602e9234 100644
--- a/offapi/com/sun/star/ucb/Priority.idl
+++ b/offapi/com/sun/star/ucb/Priority.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/PropertiesManager.idl b/offapi/com/sun/star/ucb/PropertiesManager.idl
index 9c855a9bb13b..3626a0fecebc 100644
--- a/offapi/com/sun/star/ucb/PropertiesManager.idl
+++ b/offapi/com/sun/star/ucb/PropertiesManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/PropertySetRegistry.idl b/offapi/com/sun/star/ucb/PropertySetRegistry.idl
index 2d626335bcf1..6c422b1f5764 100644
--- a/offapi/com/sun/star/ucb/PropertySetRegistry.idl
+++ b/offapi/com/sun/star/ucb/PropertySetRegistry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/PropertyValueInfo.idl b/offapi/com/sun/star/ucb/PropertyValueInfo.idl
index 1c55113e1eaa..e2a4e2d0fff1 100644
--- a/offapi/com/sun/star/ucb/PropertyValueInfo.idl
+++ b/offapi/com/sun/star/ucb/PropertyValueInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/PropertyValueState.idl b/offapi/com/sun/star/ucb/PropertyValueState.idl
index eee82bd78011..d90dc1fc738a 100644
--- a/offapi/com/sun/star/ucb/PropertyValueState.idl
+++ b/offapi/com/sun/star/ucb/PropertyValueState.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/RecipientInfo.idl b/offapi/com/sun/star/ucb/RecipientInfo.idl
index fe8f7d5d3a6b..dca4a71abc77 100644
--- a/offapi/com/sun/star/ucb/RecipientInfo.idl
+++ b/offapi/com/sun/star/ucb/RecipientInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** contains all information needed to send a message using one send protocol.
+/** contains all information needed to send a message using one	send protocol.
 
     <p>To send one message via two different protocols, two RecipientInfos
     are needed - to send one message to different users with one protocol,
diff --git a/offapi/com/sun/star/ucb/RememberAuthentication.idl b/offapi/com/sun/star/ucb/RememberAuthentication.idl
index 711eab079741..a4c3c3b04dd6 100644
--- a/offapi/com/sun/star/ucb/RememberAuthentication.idl
+++ b/offapi/com/sun/star/ucb/RememberAuthentication.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** A specification of how long to remember some authentication data.
@@ -58,6 +58,6 @@ published enum RememberAuthentication
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/RemoteAccessContentProvider.idl b/offapi/com/sun/star/ucb/RemoteAccessContentProvider.idl
index 2a0f84a5737f..6425ed6e2081 100644
--- a/offapi/com/sun/star/ucb/RemoteAccessContentProvider.idl
+++ b/offapi/com/sun/star/ucb/RemoteAccessContentProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/RemoteContentProviderAcceptor.idl b/offapi/com/sun/star/ucb/RemoteContentProviderAcceptor.idl
index 88f71abb9986..96936b5ad7c0 100644
--- a/offapi/com/sun/star/ucb/RemoteContentProviderAcceptor.idl
+++ b/offapi/com/sun/star/ucb/RemoteContentProviderAcceptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/RemoteContentProviderChangeAction.idl b/offapi/com/sun/star/ucb/RemoteContentProviderChangeAction.idl
index 8f9204518d2c..85e62911bb27 100644
--- a/offapi/com/sun/star/ucb/RemoteContentProviderChangeAction.idl
+++ b/offapi/com/sun/star/ucb/RemoteContentProviderChangeAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent.idl b/offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent.idl
index ddf2c668763d..1e0bb5ce9b59 100644
--- a/offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent.idl
+++ b/offapi/com/sun/star/ucb/RemoteContentProviderChangeEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/RemoteProxyContentProvider.idl b/offapi/com/sun/star/ucb/RemoteProxyContentProvider.idl
index 9415346aacaf..3fc7854a22a7 100644
--- a/offapi/com/sun/star/ucb/RemoteProxyContentProvider.idl
+++ b/offapi/com/sun/star/ucb/RemoteProxyContentProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/ResultSetException.idl b/offapi/com/sun/star/ucb/ResultSetException.idl
index 7e207d96867b..a54cfeaa3ab6 100644
--- a/offapi/com/sun/star/ucb/ResultSetException.idl
+++ b/offapi/com/sun/star/ucb/ResultSetException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,8 +40,8 @@ module com { module sun { module star { module ucb {
 /** This exception is thrown to propagate exceptions thrown by operations
     on <type>ContentResultSet</type>s.
 
-    @version    1.0
-    @author     Kai Sommerfeld
+    @version	1.0
+    @author 	Kai Sommerfeld
 */
 published exception ResultSetException: com::sun::star::sdbc::SQLException
 {
diff --git a/offapi/com/sun/star/ucb/Rule.idl b/offapi/com/sun/star/ucb/Rule.idl
index 213ac28b1f3d..b48bc07b25d7 100644
--- a/offapi/com/sun/star/ucb/Rule.idl
+++ b/offapi/com/sun/star/ucb/Rule.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -76,7 +76,7 @@ published struct Rule
     string Parameter;
 
     //-------------------------------------------------------------------------
-    /** the action to perform on the matching objects.
+    /**	the action to perform on the matching objects.
 
         <p>The value can be one of the <type>RuleAction</type> constants.
     */
diff --git a/offapi/com/sun/star/ucb/RuleAction.idl b/offapi/com/sun/star/ucb/RuleAction.idl
index b460e927f14a..e11f2c7ae487 100644
--- a/offapi/com/sun/star/ucb/RuleAction.idl
+++ b/offapi/com/sun/star/ucb/RuleAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/RuleOperator.idl b/offapi/com/sun/star/ucb/RuleOperator.idl
index 3e4674f8607c..2dfb278c6d29 100644
--- a/offapi/com/sun/star/ucb/RuleOperator.idl
+++ b/offapi/com/sun/star/ucb/RuleOperator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/RuleSet.idl b/offapi/com/sun/star/ucb/RuleSet.idl
index ae4af6d876cb..ffcc14b1e436 100644
--- a/offapi/com/sun/star/ucb/RuleSet.idl
+++ b/offapi/com/sun/star/ucb/RuleSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/RuleTerm.idl b/offapi/com/sun/star/ucb/RuleTerm.idl
index 375bdb1dde0a..fe007f9aaec4 100644
--- a/offapi/com/sun/star/ucb/RuleTerm.idl
+++ b/offapi/com/sun/star/ucb/RuleTerm.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/SearchCommandArgument.idl b/offapi/com/sun/star/ucb/SearchCommandArgument.idl
index 47353803dfa0..b7645b5dd1c1 100644
--- a/offapi/com/sun/star/ucb/SearchCommandArgument.idl
+++ b/offapi/com/sun/star/ucb/SearchCommandArgument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/SearchCriterium.idl b/offapi/com/sun/star/ucb/SearchCriterium.idl
index 09be35ed6152..208e30293acb 100644
--- a/offapi/com/sun/star/ucb/SearchCriterium.idl
+++ b/offapi/com/sun/star/ucb/SearchCriterium.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/SearchInfo.idl b/offapi/com/sun/star/ucb/SearchInfo.idl
index 5137db204c5c..d308c73a2454 100644
--- a/offapi/com/sun/star/ucb/SearchInfo.idl
+++ b/offapi/com/sun/star/ucb/SearchInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/SearchRecursion.idl b/offapi/com/sun/star/ucb/SearchRecursion.idl
index e682deb012d5..71778e7721e5 100644
--- a/offapi/com/sun/star/ucb/SearchRecursion.idl
+++ b/offapi/com/sun/star/ucb/SearchRecursion.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/SendInfo.idl b/offapi/com/sun/star/ucb/SendInfo.idl
index 6311f92967a9..692d196910fa 100644
--- a/offapi/com/sun/star/ucb/SendInfo.idl
+++ b/offapi/com/sun/star/ucb/SendInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/SendMediaTypes.idl b/offapi/com/sun/star/ucb/SendMediaTypes.idl
index 64a4710bbe1a..8df71ba167f1 100644
--- a/offapi/com/sun/star/ucb/SendMediaTypes.idl
+++ b/offapi/com/sun/star/ucb/SendMediaTypes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/ServiceNotFoundException.idl b/offapi/com/sun/star/ucb/ServiceNotFoundException.idl
index e5780837b9bd..76b9a3c06942 100644
--- a/offapi/com/sun/star/ucb/ServiceNotFoundException.idl
+++ b/offapi/com/sun/star/ucb/ServiceNotFoundException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** This exception is thrown to indicate that a needed service was
@@ -45,6 +45,6 @@ published exception ServiceNotFoundException: com::sun::star::uno::Exception
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/SimpleFileAccess.idl b/offapi/com/sun/star/ucb/SimpleFileAccess.idl
index 4a1d69d2458d..6d079fbe1b76 100644
--- a/offapi/com/sun/star/ucb/SimpleFileAccess.idl
+++ b/offapi/com/sun/star/ucb/SimpleFileAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ module com { module sun { module star { module ucb {
 /** Offers a simple access to resources, like files and folders located in a
 local file system or on an WebDAV server.
 
-    @author Andreas Bregas
+    @author	Andreas Bregas
     @version 1.0 07/25/2000
 */
 published service SimpleFileAccess
diff --git a/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl b/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl
index d9ad5d7cb6e6..08b64d8b26ba 100644
--- a/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/SortedDynamicResultSetFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/SortingInfo.idl b/offapi/com/sun/star/ucb/SortingInfo.idl
index 9fc586c0a474..0eaca011fce9 100644
--- a/offapi/com/sun/star/ucb/SortingInfo.idl
+++ b/offapi/com/sun/star/ucb/SortingInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/Store.idl b/offapi/com/sun/star/ucb/Store.idl
index 18eca0e9fb61..fd88a60044a0 100644
--- a/offapi/com/sun/star/ucb/Store.idl
+++ b/offapi/com/sun/star/ucb/Store.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/SynchronizePolicy.idl b/offapi/com/sun/star/ucb/SynchronizePolicy.idl
index 92a0fdd62661..39bce31e47ef 100644
--- a/offapi/com/sun/star/ucb/SynchronizePolicy.idl
+++ b/offapi/com/sun/star/ucb/SynchronizePolicy.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/TransferCommandOperation.idl b/offapi/com/sun/star/ucb/TransferCommandOperation.idl
index 5cf3d012ce6d..e3f5ab48146b 100644
--- a/offapi/com/sun/star/ucb/TransferCommandOperation.idl
+++ b/offapi/com/sun/star/ucb/TransferCommandOperation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/TransferInfo.idl b/offapi/com/sun/star/ucb/TransferInfo.idl
index dadf21dd5f08..57714e054420 100644
--- a/offapi/com/sun/star/ucb/TransferInfo.idl
+++ b/offapi/com/sun/star/ucb/TransferInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/TransferResult.idl b/offapi/com/sun/star/ucb/TransferResult.idl
index 289ae67b5c5f..3ba675a77ca1 100644
--- a/offapi/com/sun/star/ucb/TransferResult.idl
+++ b/offapi/com/sun/star/ucb/TransferResult.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsContentProvider.idl b/offapi/com/sun/star/ucb/TransientDocumentsContentProvider.idl
index d985376b4c78..e9719428d054 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsContentProvider.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsContentProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsDocumentContent.idl b/offapi/com/sun/star/ucb/TransientDocumentsDocumentContent.idl
index a6bf588ad873..99cd1a1f27d6 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsDocumentContent.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsDocumentContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsFolderContent.idl b/offapi/com/sun/star/ucb/TransientDocumentsFolderContent.idl
index a2233e4c5f40..50ba75059c51 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsFolderContent.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsFolderContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsRootContent.idl b/offapi/com/sun/star/ucb/TransientDocumentsRootContent.idl
index 0d33d0415560..f580548e8486 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsRootContent.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsRootContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/TransientDocumentsStreamContent.idl b/offapi/com/sun/star/ucb/TransientDocumentsStreamContent.idl
index aede99473933..594cfa6f35f9 100644
--- a/offapi/com/sun/star/ucb/TransientDocumentsStreamContent.idl
+++ b/offapi/com/sun/star/ucb/TransientDocumentsStreamContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl b/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
index 1d79ea42cf2f..668eb847b563 100644
--- a/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
+++ b/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/UniversalContentBroker.idl b/offapi/com/sun/star/ucb/UniversalContentBroker.idl
index 562508a74314..0c2e3cc0ac60 100644
--- a/offapi/com/sun/star/ucb/UniversalContentBroker.idl
+++ b/offapi/com/sun/star/ucb/UniversalContentBroker.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -78,16 +78,16 @@ published service UniversalContentBroker
     /** must be implemented to make it possible to resolve cyclic object
         references.
 
-        <p>Those references i.e. may occure if content provider implementations
+        <p>Those references i.e. may occure if content provider	implementations
         hold references to the Broker. The Broker itself always holds its
         providers. If the Broker shall be released,
         <member scope="com::sun::star::lang">XComponent::dispose</member>
         must be called at the Broker. The implementation of this method must
         call
         <member scope="com::sun::star::lang">XEventListener::disposing</member>
-        on the registered listeners (the providers holding the Broker must be
+        on the registered listeners	(the providers holding the Broker must be
         those listeners) and release the appropriate object references. At
-        the other hand, the implementation of XEventListener::disposing must
+        the other hand, the	implementation of XEventListener::disposing must
         release its appropriate references.
 
         <p>This interface is required.
@@ -118,13 +118,13 @@ published service UniversalContentBroker
     interface com::sun::star::ucb::XContentIdentifierFactory;
 
     //-------------------------------------------------------------------------
-    /** supports the configuration of a newly created broker.
+    /**	supports the configuration of a newly created broker.
 
         <p>The
         <member scope="com::sun::star::lang">XInitialization::initialize</member>
         method should be called with two arguments of type string. These strings
         are used as a pair of keys to retrieve a set of content provider
-        descriptions from the configuration management (stored at
+        descriptions from the configuration	management (stored at
         <code>org.openoffice.ucb.Configuration.ContentProviders.<var>key<sub>1</sub></var>.SecondaryKeys.<var>key<sub>2</sub></var>.ProviderData</code>
         within the configuration management's hierarchy). The retrieved
         descriptions are in turn used to register the corresponding content
@@ -139,7 +139,7 @@ published service UniversalContentBroker
     interface com::sun::star::lang::XInitialization;
 
     //-------------------------------------------------------------------------
-    /** enables the caller to execute commands at the broker.
+    /**	enables the caller to execute commands at the broker.
 
         <p>This interface is required.
 
@@ -185,7 +185,7 @@ published service UniversalContentBroker
         resource leaks. For a detailed description of the problem refer to
         <member>XCommandProcessor2::releaseCommandIdentifier</member>.
 
-        <p>Where many existing <type>UniversalContentBroker</type>
+        <p>Where many existing <type>UniversalContentBroker</type> 
         implementations do not (yet), every new implementation should support
         this interface.
      */
diff --git a/offapi/com/sun/star/ucb/UnsupportedCommandException.idl b/offapi/com/sun/star/ucb/UnsupportedCommandException.idl
index 03431da57906..bbbb9bd07633 100644
--- a/offapi/com/sun/star/ucb/UnsupportedCommandException.idl
+++ b/offapi/com/sun/star/ucb/UnsupportedCommandException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,9 +40,9 @@ module com { module sun { module star { module ucb {
 /** is thrown to indicate that the a command is not known by the
     implementation of an interface.
 
-    @version    1.0
-    @author     Kai Sommerfeld
-    @see        XCommandProcessor
+    @version	1.0
+    @author 	Kai Sommerfeld
+    @see		XCommandProcessor
 */
 published exception UnsupportedCommandException: com::sun::star::uno::Exception
 {
diff --git a/offapi/com/sun/star/ucb/UnsupportedDataSinkException.idl b/offapi/com/sun/star/ucb/UnsupportedDataSinkException.idl
index 47dcf76ca4a0..d0154cee2df9 100644
--- a/offapi/com/sun/star/ucb/UnsupportedDataSinkException.idl
+++ b/offapi/com/sun/star/ucb/UnsupportedDataSinkException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,8 +46,8 @@ module com { module sun { module star { module ucb {
     <p>For example, each <type>OpenCommandArgument</type> supplied as argument
     of the command 'open' contains such a data sink.
 
-    @version    1.0
-    @author     Kai Sommerfeld
+    @version	1.0
+    @author 	Kai Sommerfeld
     @see        Content
 */
 published exception UnsupportedDataSinkException : com::sun::star::uno::Exception
diff --git a/offapi/com/sun/star/ucb/UnsupportedNameClashException.idl b/offapi/com/sun/star/ucb/UnsupportedNameClashException.idl
index 2a4417291489..dd959f48eda0 100644
--- a/offapi/com/sun/star/ucb/UnsupportedNameClashException.idl
+++ b/offapi/com/sun/star/ucb/UnsupportedNameClashException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,25 +37,25 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** <p>This exception must be thrown in case the requested nameclash
-    directive is not supported, because it is not possible to implement
+/** <p>This exception must be thrown in case the requested nameclash 
+    directive is not supported, because it is not possible to implement 
     it or if it is just not (yet) implemented.
 
-    <p>Command 'transfer': Used if the nameclash directive specified in
-    parameter NameClash of the supplied <type>TransferInfo</type> is not
-    supported. For example, if the NameClash was set to NameClash::ERROR,
-    to NameClash::RENAME or to NameClash::ASK, the implementation must be
-    able determine whether there are existing data. This exception must also
-    be used if NameClash::RENAME was specified and the implementation is
+    <p>Command 'transfer': Used if the nameclash directive specified in 
+    parameter NameClash of the supplied <type>TransferInfo</type> is not 
+    supported. For example, if the NameClash was set to NameClash::ERROR, 
+    to NameClash::RENAME or to NameClash::ASK, the implementation must be 
+    able determine whether there are existing data. This exception must also 
+    be used if NameClash::RENAME was specified and the implementation is 
     unable to create a valid new name after a suitable number of tries.
 
-    <p>Command 'insert': Used if the parameter ReplaceExisting of the
-    supplied <type>InsertCommandArgument</type> was set to <false/> and the
-    implementation is unable to determine whether there are existing data.
+    <p>Command 'insert': Used if the parameter ReplaceExisting of the 
+    supplied <type>InsertCommandArgument</type> was set to <false/> and the 
+    implementation is unable to determine whether there are existing data. 
     The member NameClash of the exception must be set to NameClash::ERROR
-
-    @version    1.0
-    @author     Kai Sommerfeld
+   
+    @version	1.0
+    @author 	Kai Sommerfeld
     @see        Content
 */
 published exception UnsupportedNameClashException : com::sun::star::uno::Exception
diff --git a/offapi/com/sun/star/ucb/UnsupportedOpenModeException.idl b/offapi/com/sun/star/ucb/UnsupportedOpenModeException.idl
index 5e79f175ebd9..79eec0080ad1 100644
--- a/offapi/com/sun/star/ucb/UnsupportedOpenModeException.idl
+++ b/offapi/com/sun/star/ucb/UnsupportedOpenModeException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,8 +43,8 @@ module com { module sun { module star { module ucb {
     <p>For example, each <type>OpenCommandArgument</type> supplied as argument
     of the command 'open' contains such an open mode.
 
-    @version    1.0
-    @author     Kai Sommerfeld
+    @version	1.0
+    @author 	Kai Sommerfeld
     @see        Content
 */
 published exception UnsupportedOpenModeException : com::sun::star::uno::Exception
diff --git a/offapi/com/sun/star/ucb/VerificationMode.idl b/offapi/com/sun/star/ucb/VerificationMode.idl
index 399a64227019..06bef99d8121 100644
--- a/offapi/com/sun/star/ucb/VerificationMode.idl
+++ b/offapi/com/sun/star/ucb/VerificationMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/WebDAVContentProvider.idl b/offapi/com/sun/star/ucb/WebDAVContentProvider.idl
index 17c6d66e8c1f..b68d6e45d965 100644
--- a/offapi/com/sun/star/ucb/WebDAVContentProvider.idl
+++ b/offapi/com/sun/star/ucb/WebDAVContentProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,10 +39,10 @@ module com { module sun { module star { module ucb {
 /** The WebDAV Content Provider (DCP) implements a <type>ContentProvider</type>
     for the <type>UniversalContentBroker</type> (UCB).
 
-    <p>It provides access to WebDAV and standard HTTP servers. The DCP
-    communicates with the server using the WebDAV protocol which is an
+    <p>It provides access to WebDAV	and standard HTTP servers. The DCP
+    communicates with the server using the WebDAV protocol which is an 
     extention to the HTTP protocol or using the plain HTTP protocol in case
-    the server  is not WebDAV enabled.
+    the server	is not WebDAV enabled.
 
     @see com::sun::star::ucb::Content
 */
@@ -65,7 +65,7 @@ published service WebDAVContentProvider
         A DCP Document (<type>WebDAVDocumentContent</type>) is a container for
         Document data/content. The data/content may be anything, a WebDAV
         server, like an HTTP server, does not necessarily mandate what type of
-        data/content may be contained within Documents. The type of data/content
+        data/content may be	contained within Documents. The type of data/content
         is defined by the MediaType property which is different from the content
         type returned from the getContentType method. The MediaType property is
         mapped to the equivalent WebDAV property and the WebDAV server
@@ -81,7 +81,7 @@ published service WebDAVContentProvider
             <ul>
             <li>
             vnd.sun.star.webdav://host:port/&lt;path&gt; where &lt;path&gt; is
-            a hierarchical path of the form &lt;name&gt;/.../&lt;name&gt; and
+            a hierarchical path of the form	&lt;name&gt;/.../&lt;name&gt; and
             where &lt;name&gt; is a string encoded according to the URL
             conventions.
             </li>
diff --git a/offapi/com/sun/star/ucb/WebDAVDocumentContent.idl b/offapi/com/sun/star/ucb/WebDAVDocumentContent.idl
index 7fbfd36ebdb9..16c966aa7e78 100644
--- a/offapi/com/sun/star/ucb/WebDAVDocumentContent.idl
+++ b/offapi/com/sun/star/ucb/WebDAVDocumentContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -75,7 +75,7 @@ module com { module sun { module star { module ucb {
     within Documents. The type of data/content is defined by the MediaType
     property which is different from the content type returned from the
     <member>XContent::getContentType</member> method. The MediaType property
-    is mapped to the equivalent WebDAV property and the WebDAV server calculates
+    is mapped to the equivalent WebDAV property and	the WebDAV server calculates
     the value.
 
     @see com::sun::star::ucb::WebDAVContentProvider
diff --git a/offapi/com/sun/star/ucb/WebDAVFolderContent.idl b/offapi/com/sun/star/ucb/WebDAVFolderContent.idl
index 5363015cfb99..83f93b059557 100644
--- a/offapi/com/sun/star/ucb/WebDAVFolderContent.idl
+++ b/offapi/com/sun/star/ucb/WebDAVFolderContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct.idl b/offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct.idl
index 329f36f7696d..7ac2b0de2a19 100644
--- a/offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct.idl
+++ b/offapi/com/sun/star/ucb/WelcomeDynamicResultSetStruct.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,12 +50,12 @@ published struct WelcomeDynamicResultSetStruct
     //-------------------------------------------------------------------------
     /** The static resultset containing the previous version of resultset data.
     */
-    com::sun::star::sdbc::XResultSet    Old;
+    com::sun::star::sdbc::XResultSet	Old;
 
     //-------------------------------------------------------------------------
     /** The static resultset containing the new version of resultset data.
     */
-    com::sun::star::sdbc::XResultSet    New;
+    com::sun::star::sdbc::XResultSet	New;
 };
 
 
diff --git a/offapi/com/sun/star/ucb/XAnyCompare.idl b/offapi/com/sun/star/ucb/XAnyCompare.idl
index f718883ac582..852d059a6614 100644
--- a/offapi/com/sun/star/ucb/XAnyCompare.idl
+++ b/offapi/com/sun/star/ucb/XAnyCompare.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ module com { module sun { module star { module ucb {
 published interface XAnyCompare: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** allows comparision of two <atom>any</atom>s.
+    /**	allows comparision of two <atom>any</atom>s.
 
         @param Any1
         is the first compare value
@@ -64,7 +64,7 @@ published interface XAnyCompare: com::sun::star::uno::XInterface
         </ul>
     */
 
-    short   compare( [in] any Any1, [in] any Any2 );
+    short	compare( [in] any Any1, [in] any Any2 );
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ucb/XAnyCompareFactory.idl b/offapi/com/sun/star/ucb/XAnyCompareFactory.idl
index 6356c846aa47..f15c55475359 100644
--- a/offapi/com/sun/star/ucb/XAnyCompareFactory.idl
+++ b/offapi/com/sun/star/ucb/XAnyCompareFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ module com { module sun { module star { module ucb {
 published interface XAnyCompareFactory: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** creates an <type>XAnyCompare</type> instance.
+    /**	creates an <type>XAnyCompare</type> instance.
 
         @param PropertyName
         is the name of a property
diff --git a/offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl b/offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl
index 2f764a05c4f9..1fc80378d933 100644
--- a/offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ module com { module sun { module star { module ucb {
 published interface XCachedContentResultSetFactory: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** creates a remote optimized
+    /**	creates a remote optimized 
         <type scope="com::sun::star::sdbc">XResultSet</type>.
 
         @param xSource
@@ -64,7 +64,7 @@ published interface XCachedContentResultSetFactory: com::sun::star::uno::XInterf
         @returns
         an instance of service <type>CachedContentResultSet</type>.
     */
-    com::sun::star::sdbc::XResultSet    createCachedContentResultSet(
+    com::sun::star::sdbc::XResultSet	createCachedContentResultSet(
                 [in] com::sun::star::sdbc::XResultSet xSource,
                 [in] com::sun::star::ucb::XContentIdentifierMapping xMapping );
 };
diff --git a/offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory.idl b/offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory.idl
index 9a78bc2e0952..0f5ef794617d 100644
--- a/offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory.idl
+++ b/offapi/com/sun/star/ucb/XCachedContentResultSetStubFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ module com { module sun { module star { module ucb {
 published interface XCachedContentResultSetStubFactory: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** creates a remote optimized
+    /**	creates a remote optimized
         <type scope="com::sun::star::sdbc">XResultSet</type>.
 
         @param xSource
@@ -55,7 +55,7 @@ published interface XCachedContentResultSetStubFactory: com::sun::star::uno::XIn
         @returns
         an instance of service <type>CachedContentResultSetStub</type>.
     */
-    com::sun::star::sdbc::XResultSet    createCachedContentResultSetStub(
+    com::sun::star::sdbc::XResultSet	createCachedContentResultSetStub(
                         [in] com::sun::star::sdbc::XResultSet xSource );
 };
 
diff --git a/offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl b/offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl
index f7ccbc2c8804..0f39fc494edf 100644
--- a/offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,7 +48,7 @@ module com { module sun { module star { module ucb {
 
     <p>Pay attention to instanciate this helper on clientside where your want
     to read the data respectively where you have instantiated the listener to
-    the <type>XDynamicResultSet</type>.
+    the	<type>XDynamicResultSet</type>.
 
     <p>The needed stub on server side can be created using
     <type>XCachedDynamicResultSetStubFactory</type>.
@@ -57,7 +57,7 @@ module com { module sun { module star { module ucb {
 published interface XCachedDynamicResultSetFactory: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** creates a remote optimizes <type>XDynamicResultSet</type>.
+    /**	creates a remote optimizes <type>XDynamicResultSet</type>.
 
         @param SourceStub
         must be an instance of service <type>CachedDynamicResultSetStub</type>.
@@ -74,7 +74,7 @@ published interface XCachedDynamicResultSetFactory: com::sun::star::uno::XInterf
         @returns
         an instance of service <type>CachedDynamicResultSet</type>.
     */
-    com::sun::star::ucb::XDynamicResultSet  createCachedDynamicResultSet(
+    com::sun::star::ucb::XDynamicResultSet	createCachedDynamicResultSet(
           [in] com::sun::star::ucb::XDynamicResultSet SourceStub
         , [in] com::sun::star::ucb::XContentIdentifierMapping ContentIdentifierMapping );
 };
diff --git a/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl b/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl
index cb46cca15c82..4302a0af0e4a 100644
--- a/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl
+++ b/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,7 +55,7 @@ module com { module sun { module star { module ucb {
     <p>Pay attention to instanciate this helper on serverside where your source
     <type>DynamicResultSet</type> was instanciated.
 
-    <p>Method
+    <p>Method 
     <member>XCachedDynamicResultSetStubFactory::createCachedDynamicResultSetStub</member>
     can be used to create a stub on serverside.
 
@@ -70,7 +70,7 @@ module com { module sun { module star { module ucb {
 published interface XCachedDynamicResultSetStubFactory: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** creates a remote optimizes <type>XDynamicResultSet</type>.
+    /**	creates a remote optimizes <type>XDynamicResultSet</type>.
 
         @param Source
         must be an instance of service <type>DynamicResultSet</type>.
@@ -79,7 +79,7 @@ published interface XCachedDynamicResultSetStubFactory: com::sun::star::uno::XIn
         an instance of service <type>CachedDynamicResultSetStub</type>.
     */
 
-    com::sun::star::ucb::XDynamicResultSet  createCachedDynamicResultSetStub(
+    com::sun::star::ucb::XDynamicResultSet	createCachedDynamicResultSetStub(
                 [in] com::sun::star::ucb::XDynamicResultSet Source );
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/ucb/XCommandEnvironment.idl b/offapi/com/sun/star/ucb/XCommandEnvironment.idl
index 35e1af812e60..adf7985b3ec3 100644
--- a/offapi/com/sun/star/ucb/XCommandEnvironment.idl
+++ b/offapi/com/sun/star/ucb/XCommandEnvironment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XCommandInfo.idl b/offapi/com/sun/star/ucb/XCommandInfo.idl
index e262e658a424..292ee5c426bf 100644
--- a/offapi/com/sun/star/ucb/XCommandInfo.idl
+++ b/offapi/com/sun/star/ucb/XCommandInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XCommandInfoChangeListener.idl b/offapi/com/sun/star/ucb/XCommandInfoChangeListener.idl
index 3bd9012c5b4c..13bf2b7da57a 100644
--- a/offapi/com/sun/star/ucb/XCommandInfoChangeListener.idl
+++ b/offapi/com/sun/star/ucb/XCommandInfoChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@ module com { module sun { module star { module ucb {
     @version  1.0
     @author   Kai Sommerfeld
     @see      CommandInfoChangeEvent
-    @see      XCommandInfoChangeNotifier
+    @see	  XCommandInfoChangeNotifier
 */
 published interface XCommandInfoChangeListener : com::sun::star::lang::XEventListener
 {
diff --git a/offapi/com/sun/star/ucb/XCommandInfoChangeNotifier.idl b/offapi/com/sun/star/ucb/XCommandInfoChangeNotifier.idl
index 43379f86de83..aa6d1df60cef 100644
--- a/offapi/com/sun/star/ucb/XCommandInfoChangeNotifier.idl
+++ b/offapi/com/sun/star/ucb/XCommandInfoChangeNotifier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@ module com { module sun { module star { module ucb {
     @version  1.0
     @author   Kai Sommerfeld
     @see      CommandInfoChangeEvent
-    @see      XCommandInfoChangeListener
+    @see	  XCommandInfoChangeListener
 */
 published interface XCommandInfoChangeNotifier : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/ucb/XCommandProcessor.idl b/offapi/com/sun/star/ucb/XCommandProcessor.idl
index 92da7d7f1495..60f50d194579 100644
--- a/offapi/com/sun/star/ucb/XCommandProcessor.idl
+++ b/offapi/com/sun/star/ucb/XCommandProcessor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -58,7 +58,7 @@ module com { module sun { module star { module ucb {
     @see com::sun::star::ucb::XCommandProcessor2
     for the improved version of this interface.
 
-    @see      Command
+    @see	  Command
     @see      XCommandEnvironment
     @see      XContent
 */
@@ -95,7 +95,7 @@ published interface XCommandProcessor : com::sun::star::uno::XInterface
     /** executes a command.
 
         <p>Common command definitions can be found in the soecification of the
-        service <type>Content</type>.
+        service	<type>Content</type>.
 
         @param aCommand
         is the command to execute.
diff --git a/offapi/com/sun/star/ucb/XCommandProcessor2.idl b/offapi/com/sun/star/ucb/XCommandProcessor2.idl
index cc9d1c885a7a..4b8e9c19d707 100644
--- a/offapi/com/sun/star/ucb/XCommandProcessor2.idl
+++ b/offapi/com/sun/star/ucb/XCommandProcessor2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@ published interface XCommandProcessor2: com::sun::star::ucb::XCommandProcessor
         no longer used.
 
         <p>After this call the command identifier cannot be used any longer in
-        calls to <member>XCommandProcessor::execute</member> and
+        calls to <member>XCommandProcessor::execute</member> and 
         <member>XCommandProcessor::abort</member>.  (But it can happen that a
         call to <member>XCommandProcessor::createCommandIdentifier</member>
         reuses this identifier.)</p>
@@ -56,7 +56,7 @@ published interface XCommandProcessor2: com::sun::star::ucb::XCommandProcessor
         A command identifier obtained through
         <member>XCommandProcessor::createCommandIdentifier</member>.  If the
         identifier is zero, the request is silently ignored; but if the
-        identifier is invalid (not obtained via
+        identifier is invalid (not obtained via 
         <member>XCommandProcessor::createCommandIdentifier</member> or already
         handed to <member>XCommandProcessor2::releaseCommandIdentifier</member>
         before), the behaviour is undefined.
diff --git a/offapi/com/sun/star/ucb/XContent.idl b/offapi/com/sun/star/ucb/XContent.idl
index 2be61f32ac56..d19e6fd8a719 100644
--- a/offapi/com/sun/star/ucb/XContent.idl
+++ b/offapi/com/sun/star/ucb/XContent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,7 +64,7 @@ published interface XContent: com::sun::star::uno::XInterface
     com::sun::star::ucb::XContentIdentifier getIdentifier();
 
     //-------------------------------------------------------------------------
-    /** returns a type string, which is unique for that type of content (e.g.
+    /** returns a type string, which is unique for that type of content	(e.g.
         "application/vnd.sun.star.hierarchy-folder").
 
         @returns
diff --git a/offapi/com/sun/star/ucb/XContentAccess.idl b/offapi/com/sun/star/ucb/XContentAccess.idl
index 8ead478e660f..c9ebbd5afe46 100644
--- a/offapi/com/sun/star/ucb/XContentAccess.idl
+++ b/offapi/com/sun/star/ucb/XContentAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,10 +48,10 @@ module com { module sun { module star { module ucb {
     there is no need to first create the content object, then to obtain the
     string from it and after that to release the content.
 
-    @version    1.0
-    @author     Kai Sommerfeld
-    @see        XContent
-    @see        XContentIdentifier
+    @version	1.0
+    @author   	Kai Sommerfeld
+    @see      	XContent
+    @see	  	XContentIdentifier
 */
 
 published interface XContentAccess : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/ucb/XContentCreator.idl b/offapi/com/sun/star/ucb/XContentCreator.idl
index 6dcc42b37471..e726150a27e6 100644
--- a/offapi/com/sun/star/ucb/XContentCreator.idl
+++ b/offapi/com/sun/star/ucb/XContentCreator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XContentEventListener.idl b/offapi/com/sun/star/ucb/XContentEventListener.idl
index 069f9c1012cc..3eea9036e625 100644
--- a/offapi/com/sun/star/ucb/XContentEventListener.idl
+++ b/offapi/com/sun/star/ucb/XContentEventListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,11 +37,11 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /**  a listener for events related to <type>XContent</type>s.
-
+    
     @version  1.0
     @author   Kai Sommerfeld
     @see      XContent
@@ -50,7 +50,7 @@ published interface XContentEventListener: com::sun::star::lang::XEventListener
 {
     //-------------------------------------------------------------------------
     /** gets called whenever a content wishes to notify changes.
-
+        
         @param evt
         the event.
     */
@@ -60,6 +60,6 @@ published interface XContentEventListener: com::sun::star::lang::XEventListener
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/XContentIdentifier.idl b/offapi/com/sun/star/ucb/XContentIdentifier.idl
index 143bcfdb0ac7..25829afb1b7e 100644
--- a/offapi/com/sun/star/ucb/XContentIdentifier.idl
+++ b/offapi/com/sun/star/ucb/XContentIdentifier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,17 +46,17 @@ module com { module sun { module star { module ucb {
 published interface XContentIdentifier: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** returns the content identifier string.
+    /**	returns the content identifier string.
 
         @returns
         the content identifier string. This must be a valid URI
         (Uniform Resource Identifier, see RFC 2396). This string
         is required. If a content provider 'implements' some
         existent URI scheme (e.g., a content provider offering
-        access to a file system would implement the 'file' scheme,
+        access to a file system would implement the	'file' scheme,
         and a content provider offering access to IMAP servers
         would implement the 'imap' scheme), the content identifier
-        strings should use that scheme. If on the other hand a
+        strings	should use that scheme. If on the other hand a
         content provider offers access to content for which no
         appropriate URI scheme exists, a vendor-specific URL scheme
         starting with 'vnd.' must be created (see the Internet Draft
@@ -65,9 +65,9 @@ published interface XContentIdentifier: com::sun::star::uno::XInterface
     string getContentIdentifier();
 
     //-------------------------------------------------------------------------
-    /** returns the content provider scheme string.
+    /**	returns the content provider scheme string.
 
-          <p>This string will   be calculated from the content identifier string
+          <p>This string will	be calculated from the content identifier string
         and must be lower-cased(!). It is the 'scheme' the content provider is
         registered for. In example, a provider for FTP contents will use
         ftp-URL's as content identifiers. The content provider scheme for all
diff --git a/offapi/com/sun/star/ucb/XContentIdentifierFactory.idl b/offapi/com/sun/star/ucb/XContentIdentifierFactory.idl
index 5a89d4e59087..1237b89fdbea 100644
--- a/offapi/com/sun/star/ucb/XContentIdentifierFactory.idl
+++ b/offapi/com/sun/star/ucb/XContentIdentifierFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,11 +38,11 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** A factory for content identifiers.
-
+    
     @version  1.0
     @author   Kai Sommerfeld
     @see      XContentIdentifier
@@ -50,11 +50,11 @@ module com { module sun { module star { module ucb {
 published interface XContentIdentifierFactory: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /**  creates an identifier.
-
+    /**	 creates an identifier.
+        
         @param ContentId
         the content identifier string.
-
+        
         @returns
         the identifier.
     */
@@ -64,6 +64,6 @@ published interface XContentIdentifierFactory: com::sun::star::uno::XInterface
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl b/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl
index e4ab524fed8b..046d1be4833c 100644
--- a/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl
+++ b/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,14 +43,14 @@ module com { module sun { module star { module ucb {
     another (target) set of XContentIdentifiers.
 
     <p>For convenience and performance, mapping between the string
-    representations of source/target XContentIdentifiers, as well as mapping
+    representations	of source/target XContentIdentifiers, as well as mapping
     between <type>XContent</type>s identified by source/target
     XContentIdentifiers is also supported.
 
     <p>This interface can be useful in cases where the identifieres (and
     associated contents) returned by the various methods of an
-    <type>XContentAccess</type> need to be mapped to some other space of
-    identifiers (and associated contents).
+    <type>XContentAccess</type>	need to be mapped to some other space of
+    identifiers (and associated	contents).
 
     @see XContent
     @see XContentAccess
@@ -103,10 +103,10 @@ published interface XContentIdentifierMapping: com::sun::star::uno::XInterface
         of a <type scope="com::sun::star::sdbc">XRow</type>.
 
         @param Value  On input, a sequence of anys corresponding to the columns
-        of the XRow (the first column goes into the zeroth position of the
+        of the XRow (the first column goes into the	zeroth position of the
         sequence, and so on).  On output, the same sequence, but with the
         entries mapped as necessary.  This is an inout parameter rather than a
-        comination of in parameter and return value for performance reasons
+        comination of in parameter and return value for	performance reasons
         (assuming that in most cases most elements in the input sequence will
         be returned unmodified).
 
diff --git a/offapi/com/sun/star/ucb/XContentProvider.idl b/offapi/com/sun/star/ucb/XContentProvider.idl
index 1422441a8879..fcd3e99be75e 100644
--- a/offapi/com/sun/star/ucb/XContentProvider.idl
+++ b/offapi/com/sun/star/ucb/XContentProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ module com { module sun { module star { module ucb {
      @version  1.0
      @author   Kai Sommerfeld
      @see      XContent
-     @see      XContentIdentifier
+     @see	   XContentIdentifier
 */
 published interface XContentProvider: com::sun::star::uno::XInterface
 {
@@ -87,7 +87,7 @@ published interface XContentProvider: com::sun::star::uno::XInterface
 
         @returns
         <code>0</code> is returned, if the identifiers are equal.
-        A value less than <code>0</code> indiactes, that the Id1
+        A value	less than <code>0</code> indiactes, that the Id1
         is less than Id2. A value greater than <code>0</code>
         is returned, if Id1 is greater than Id2.
     */
diff --git a/offapi/com/sun/star/ucb/XContentProviderFactory.idl b/offapi/com/sun/star/ucb/XContentProviderFactory.idl
index 034be592ece0..c62659edb71c 100644
--- a/offapi/com/sun/star/ucb/XContentProviderFactory.idl
+++ b/offapi/com/sun/star/ucb/XContentProviderFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XContentProviderManager.idl b/offapi/com/sun/star/ucb/XContentProviderManager.idl
index 9e3ed70a1276..1fe1b0528136 100644
--- a/offapi/com/sun/star/ucb/XContentProviderManager.idl
+++ b/offapi/com/sun/star/ucb/XContentProviderManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -67,11 +67,11 @@ published interface XContentProviderManager: com::sun::star::uno::XInterface
 
         <p>This may be <NULL/>, in which case a later
         <member>XContentProvider::queryContent</member> with an
-        <type>XContentIdentifier</type> that matches the <var>Scheme</var>
+        <type>XContentIdentifier</type>	that matches the <var>Scheme</var>
         will simply return <NULL/>. These "dummy" content providers are useful
         in combination with other content providers that are registered on a
-        wildcard URL template: For example, imagine that you want to route all
-        http URLs to a HTTP content provider, but want to block all URLs for
+        wildcard URL template: For example,	imagine that you want to route all
+        http URLs to a HTTP content	provider, but want to block all URLs for
         the server <code>www.dont.go</code>. One solution would be to register
         the HTTP content provider on the <var>Scheme</var> <code>http</code>,
         and to register a "dummy" (i.e., <NULL/>) content provider on the
@@ -104,19 +104,19 @@ published interface XContentProviderManager: com::sun::star::uno::XInterface
         </ul>
 
         <p>A <code>&lt;scheme&gt:</code> matches any URL of exactly the given
-        scheme (ignoring case), keeping the extension from URL schemes to URL
-        templates backwards compatible.  The <code>&lt;simple&gt:</code>
-        regexps match any URL starting with a given string literal, followed
+        scheme (ignoring case),	keeping the extension from URL schemes to URL
+        templates backwards	compatible.  The <code>&lt;simple&gt:</code>
+        regexps match any URL starting with a given	string literal, followed
         by arbitrary characters (<code>&lt;simple-prefix&gt:</code>), or
         by arbitrary characters that start with one of '/', '?', or '#', if any
         (<code>&lt;simple-authority&gt:</code>), or by arbitrary characters not
         including any of '/', '?', or '#', followed by a given string literal,
-        followed by arbitrary characters that start with one of '/', '?', or
+        followed by	arbitrary characters that start with one of '/', '?', or
         '#', if any. The comparision of string literals is done ignoring the
         case of ASCII letters.  The <code>&lt;translation&gt:</code> regexps
         match the same URLs as their <code>&lt;simple&gt:</code> counterparts,
         but they also describe how a (local) URL is mapped to another (remote)
-        URL.  This mapping is only relevant for methods of the
+        URL.  This mapping is only relevant for	methods of the
         <type>RemoteAccessContentProvider</type>'s
           <type>XParameterizedContentProvider</type> interface; in all other
         cases, <code>&lt;translation&gt:</code> regexps have the same semantics
@@ -124,7 +124,7 @@ published interface XContentProviderManager: com::sun::star::uno::XInterface
 
         @param ReplaceExisting
         <TRUE/>: replace the provider possibly registered for the given URL
-        template. The replaced provider will not be deregistered automatically!
+        template. The replaced provider will not be	deregistered automatically!
         If the superseding provider gets deregistered, the superseded one will
         become active again.
         <p><FALSE/>: do not register, if another provider is already registered
diff --git a/offapi/com/sun/star/ucb/XContentProviderSupplier.idl b/offapi/com/sun/star/ucb/XContentProviderSupplier.idl
index cfa70cee5ddb..4ee752b8a7ff 100644
--- a/offapi/com/sun/star/ucb/XContentProviderSupplier.idl
+++ b/offapi/com/sun/star/ucb/XContentProviderSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XContentTransmitter.idl b/offapi/com/sun/star/ucb/XContentTransmitter.idl
index 0ef1aace93cf..40ed1e402ced 100644
--- a/offapi/com/sun/star/ucb/XContentTransmitter.idl
+++ b/offapi/com/sun/star/ucb/XContentTransmitter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,32 +34,32 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
-/**
+/** 
      @deprecated
 
      @version  1.0
      @author   Dirk Voelzke
-     @see
+     @see      
 */
 
 published interface XContentTransmitter: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /**
+    /** 
     */
     [oneway] void transmit( [in] string Source,
                             [in] string Destination,
-                            [in] long   Flags );
+                            [in] long	Flags );
 
 
 };
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/ucb/XDataContainer.idl b/offapi/com/sun/star/ucb/XDataContainer.idl
index 78437e0529a5..525827ad2ce0 100644
--- a/offapi/com/sun/star/ucb/XDataContainer.idl
+++ b/offapi/com/sun/star/ucb/XDataContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,8 +43,8 @@ module com { module sun { module star { module ucb {
     A typical container with children is a MIME message with
     attachments.
 
-    @version    1.0
-    @author     Kai Sommerfeld
+    @version	1.0
+    @author 	Kai Sommerfeld
 
     @deprecated
 */
diff --git a/offapi/com/sun/star/ucb/XDynamicResultSet.idl b/offapi/com/sun/star/ucb/XDynamicResultSet.idl
index 291cd397e767..5c0ac3798327 100644
--- a/offapi/com/sun/star/ucb/XDynamicResultSet.idl
+++ b/offapi/com/sun/star/ucb/XDynamicResultSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -71,7 +71,7 @@ module com { module sun { module star { module ucb {
     about changes on a <type>ContentResultSet</type> and have an
     listener-controlled update from one version to the next version. Two
     <type>ContentResultSet</type> implementations were given to the listener in
-    the first notification as interface
+    the first notification as interface 
     <type scope="com::sun::star::sdbc">XResultSet</type>.
     </p>
 
@@ -88,7 +88,7 @@ module com { module sun { module star { module ucb {
     <p>
     The calling of <member>XDynamicResultSetListener::notify</member> has
     to happen in an own thread, because it could take a longer time and any
-    actions til the listener returns the call. So don't block the notify-causing
+    actions	til the listener returns the call. So don't block the notify-causing
     action.
     </p>
 
@@ -110,10 +110,10 @@ module com { module sun { module star { module ucb {
     </p>
 
     <ol>
-    <li> The listener is allowed to access the new
+    <li> The listener is allowed to access the new 
          <type>ContentResultSet</type>. The new one is first assigned in the
          WELCOME-event and than the ResultSets are always swapped.</li>
-    <li> The listener is not allowed to access the old
+    <li> The listener is not allowed to access the old 
          <type>ContentResultSet</type>.</li>
     </ol>
 */
@@ -124,13 +124,13 @@ published interface XDynamicResultSet: com::sun::star::lang::XComponent
     /** Call this, if you don't care about any changes.
 
         @returns
-        an <type scope="com::sun::star::sdbc">XResultSet</type> that is
+        an <type scope="com::sun::star::sdbc">XResultSet</type> that is 
         implemented as <type>ContentResultSet</type>. Its content will never
         change.
 
         @trows ListenerAlreadySetException
         if someone already has registered as listener via
-        <member>XDynamicResultSet::setListener</member> or if someone has
+        <member>XDynamicResultSet::setListener</member>	or if someone has
         established a connection to a <type>CachedDynamicResultSet</type>
         via <member>XDynamicResultSet::connectToCache</member>.
     */
@@ -138,7 +138,7 @@ published interface XDynamicResultSet: com::sun::star::lang::XComponent
         raises( com::sun::star::ucb::ListenerAlreadySetException );
 
     //-------------------------------------------------------------------------
-    /** Call this, if you want to get notifications about changes.
+    /**	Call this, if you want to get notifications about changes.
 
         <p>The implementor has to call
         <member scope="com::sun::star::lang">XComponent::addEventListener</member>
@@ -152,7 +152,7 @@ published interface XDynamicResultSet: com::sun::star::lang::XComponent
         @throws ListenerAlreadySetException
         if this method is called more than once during the life of the
         implementation object or if this method is called if someone already
-        has fetched the <type>ContentResultSet</type> via
+        has	fetched the <type>ContentResultSet</type> via
         <member>XDynamicResultSet::getStaticResultSet</member>.
 
     */
@@ -160,7 +160,7 @@ published interface XDynamicResultSet: com::sun::star::lang::XComponent
         raises( com::sun::star::ucb::ListenerAlreadySetException );
 
     //-------------------------------------------------------------------------
-    /** Connects this to a <type>CachedDynamicResultSet</type> for optimized
+    /**	Connects this to a <type>CachedDynamicResultSet</type> for optimized
         remote data transport.
 
         <p>This method creates a <type>CachedDynamicResultSetStub</type>
@@ -189,7 +189,7 @@ published interface XDynamicResultSet: com::sun::star::lang::XComponent
                 , com::sun::star::ucb::ServiceNotFoundException );
 
     //-------------------------------------------------------------------------
-    /** Using this method you can get information, whether the offered
+    /**	Using this method you can get information, whether the offered
         <type>ContentResultSet</type>s are sorted or filtered etc correctly as
         demanded during the creation of the <type>XDynamicResultSet</type>.
 
diff --git a/offapi/com/sun/star/ucb/XDynamicResultSetListener.idl b/offapi/com/sun/star/ucb/XDynamicResultSetListener.idl
index 6bde84d89663..36660fef4d34 100644
--- a/offapi/com/sun/star/ucb/XDynamicResultSetListener.idl
+++ b/offapi/com/sun/star/ucb/XDynamicResultSetListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** used to receive notifications from an <type>XDynamicResultSet</type>.
+/**	used to receive notifications from an <type>XDynamicResultSet</type>.
 */
 
 published interface XDynamicResultSetListener: com::sun::star::lang::XEventListener
@@ -53,13 +53,13 @@ published interface XDynamicResultSetListener: com::sun::star::lang::XEventListe
         them. The <type scope="com::sun::star::sdbc">XResultSet</type>s are
         implementations of the service <type>ContentResultSet</type>.
 
-        <p>The notified new
+        <p>The notified new 
         <type scope="com::sun::star::sdbc">XResultSet</type> will stay valid
         after returning from this method. The old one will become invalid after
         returning.
 
         <p>While in notify-call the listener is allowed to read from old and
-        new resultset, except in the first call, where only the new resultset
+        new	resultset, except in the first call, where only the new resultset
         is valid.
 
         <p>The Listener is allowed to stay (block) this call, until he really
diff --git a/offapi/com/sun/star/ucb/XFetchProvider.idl b/offapi/com/sun/star/ucb/XFetchProvider.idl
index eb491caaaabf..244d9b9f25bf 100644
--- a/offapi/com/sun/star/ucb/XFetchProvider.idl
+++ b/offapi/com/sun/star/ucb/XFetchProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -61,7 +61,7 @@ published interface XFetchProvider: com::sun::star::uno::XInterface
 
         @param bDirection
         <TRUE/>, if you want the rows to be read in the same order, as they
-        are contained in the result set ( <TRUE/> &lt;-&gt; forward step;
+        are contained in the result set	( <TRUE/> &lt;-&gt; forward step;
         <FALSE/> &lt;-&gt; backward step )
     */
     com::sun::star::ucb::FetchResult fetch( [in] long nRowStartPosition
diff --git a/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl b/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl
index 5e6242e79e4e..b6b380a253d1 100644
--- a/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl
+++ b/offapi/com/sun/star/ucb/XFetchProviderForContentAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,7 +62,7 @@ published interface XFetchProviderForContentAccess: com::sun::star::uno::XInterf
 
         @param bDirection
         <TRUE/>, if you want the rows to be read in the same order, as they
-        are contained in the result set ( <TRUE/> &lt;-&gt; forward step;
+        are contained in the result set	( <TRUE/> &lt;-&gt; forward step;
         <FALSE/> &lt;-&gt; backward step )
     */
     com::sun::star::ucb::FetchResult
@@ -86,7 +86,7 @@ published interface XFetchProviderForContentAccess: com::sun::star::uno::XInterf
 
         @param bDirection
         <TRUE/>, if you want the rows to be read in the same order, as they
-        are contained in the result set ( <TRUE/> &lt;-&gt; forward step;
+        are contained in the result set	( <TRUE/> &lt;-&gt; forward step;
         <FALSE/> &lt;-&gt; backward step )
     */
     com::sun::star::ucb::FetchResult
@@ -109,7 +109,7 @@ published interface XFetchProviderForContentAccess: com::sun::star::uno::XInterf
 
         @param bDirection
         <TRUE/>, if you want the rows to be read in the same order, as they
-        are contained in the result set ( <TRUE/> &lt;-&gt; forward step;
+        are contained in the result set	( <TRUE/> &lt;-&gt; forward step;
         <FALSE/> &lt;-&gt; backward step )
     */
     com::sun::star::ucb::FetchResult
diff --git a/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl b/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl
index 1ff2579164ee..11a04a6ed8db 100644
--- a/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl
+++ b/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,8 +39,8 @@ module com { module sun { module star { module ucb {
 /** specifies methods to convert between (file) URLs and file paths in system
     dependent notation.
 
-    @version    1.0
-    @author     Andreas Bille
+    @version	1.0
+    @author   	Andreas Bille
 */
 published interface XFileIdentifierConverter : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl b/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
index fe31114241da..694d4f181ad8 100644
--- a/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
+++ b/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XInteractionHandlerSupplier.idl b/offapi/com/sun/star/ucb/XInteractionHandlerSupplier.idl
index a5ab34fc6af5..5995851709b4 100644
--- a/offapi/com/sun/star/ucb/XInteractionHandlerSupplier.idl
+++ b/offapi/com/sun/star/ucb/XInteractionHandlerSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,8 +37,8 @@
 module com { module sun { module star { module ucb {
 
 //=============================================================================
-/** This interface should be implemented by an internal
-    <type>XCommandEnvironment</type> that can not supply an
+/** This interface should be implemented by an internal 
+    <type>XCommandEnvironment</type> that can not supply an 
     <type scope="com::sun::star::task">XInteractionHandler</type>, but instead
     wants interaction requests to be handled by other internal error handling
     mechanism.
@@ -46,12 +46,12 @@ module com { module sun { module star { module ucb {
 published interface XInteractionHandlerSupplier: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** Returns whether an
+    /** Returns whether an 
         <type scope="com::sun::star::task">XInteractionHandler</type> can be
         supplied.
 
         @returns
-        <TRUE/>, if an
+        <TRUE/>, if an 
         <type scope="com::sun::star::task">XInteractionHandler</type> can be
         supplied, <FALSE/> otherwise.
     */
diff --git a/offapi/com/sun/star/ucb/XInteractionReplaceExistingData.idl b/offapi/com/sun/star/ucb/XInteractionReplaceExistingData.idl
index c5f03d720d49..d869f81d745c 100644
--- a/offapi/com/sun/star/ucb/XInteractionReplaceExistingData.idl
+++ b/offapi/com/sun/star/ucb/XInteractionReplaceExistingData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication.idl b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication.idl
index d89c06985044..9ebc6bdb9a94 100644
--- a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication.idl
+++ b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,11 +38,11 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** An interaction continuation handing back some authentication data.
-
+    
     <p> This continuation is typically used in conjunction with
     <type>AuthenticationRequest</type>. </p>
 */
@@ -55,10 +55,10 @@ published interface XInteractionSupplyAuthentication: com::sun::star::task::XInt
 
     //-------------------------------------------------------------------------
     /** Set a new 'realm' value to hand back.
-
-        <p>This method should be called before
+        
+        <p>This method should be called before 
         <member scope="com::sun::star::task">XInteractionContinuation::select</member>,
-        and should only be called if
+        and should only	be called if 
         <member>XInteractionSupplyAuthentication::canSetRealm</member> returned
         <true/>.</p>
     */
@@ -72,10 +72,10 @@ published interface XInteractionSupplyAuthentication: com::sun::star::task::XInt
     //-------------------------------------------------------------------------
     /** Set a new 'user name' value to hand back.
 
-        <p>This method should be called before
+        <p>This method should be called before 
         <member scope="com::sun::star::task">XInteractionContinuation::select</member>,
-        and should only be called if
-        <member>XInteractionSupplyAuthentication::canSetUserName</member>
+        and should only	be called if 
+        <member>XInteractionSupplyAuthentication::canSetUserName</member> 
         returned <true/>.</p>
     */
     void setUserName( [in] string UserName );
@@ -87,11 +87,11 @@ published interface XInteractionSupplyAuthentication: com::sun::star::task::XInt
 
     //-------------------------------------------------------------------------
     /** Set a new 'password' value to hand back.
-
-        <p>This method should be called before
+        
+        <p>This method should be called before 
         <member scope="com::sun::star::task">XInteractionContinuation::select</member>,
-        and should only be called if
-        <member>XInteractionSupplyAuthentication::canSetPassword</member>
+        and should only	be called if 
+        <member>XInteractionSupplyAuthentication::canSetPassword</member> 
         returned <true/>.</p>
     */
     void setPassword( [in] string Password );
@@ -104,7 +104,7 @@ published interface XInteractionSupplyAuthentication: com::sun::star::task::XInt
 
         @returns
         A sequence of available modes to hand back.  Each individual mode
-        should appear at most once in the sequence.  If the sequence is empty,
+        should appear at most once in the sequence.  If the sequence is	empty,
         a new mode cannot be handed back.
     */
     sequence<com::sun::star::ucb::RememberAuthentication> getRememberPasswordModes( [out] com::sun::star::ucb::RememberAuthentication Default );
@@ -112,13 +112,13 @@ published interface XInteractionSupplyAuthentication: com::sun::star::task::XInt
     //-------------------------------------------------------------------------
     /** Set a new mode of how long to remember the password.
 
-        <p>This method should be called before
+        <p>This method should be called before 
         <member scope="com::sun::star::task">XInteractionContinuation::select</member>,
-        and should only be called if
-        <member>XInteractionSupplyAuthentication::setPassword</member>
+        and should only	be called if 
+        <member>XInteractionSupplyAuthentication::setPassword</member> 
         is also called.</p>
-
-        @param Remember
+        
+        @param Remember  
         The mode to hand back, should be contained in the sequence returned by
         <member>XInteractionSupplyAuthentication::getRememberPasswordModes</member>.
     */
@@ -131,11 +131,11 @@ published interface XInteractionSupplyAuthentication: com::sun::star::task::XInt
 
     //-------------------------------------------------------------------------
     /** Set a new 'account' value to hand back.
-
-        <p>This method should be called before
+        
+        <p>This method should be called before 
         <member scope="com::sun::star::task">XInteractionContinuation::select</member>,
-        and should only be called if
-        <member>XInteractionSupplyAuthentication::canSetAccount</member>
+        and should only	be called if 
+        <member>XInteractionSupplyAuthentication::canSetAccount</member> 
         returned <true/>.</p>
 
     */
@@ -155,15 +155,15 @@ published interface XInteractionSupplyAuthentication: com::sun::star::task::XInt
 
     //-------------------------------------------------------------------------
     /** Set a new mode of how long to remember the account.
-
-        <p>This method should be called before
+        
+        <p>This method should be called before 
         <member scope="com::sun::star::task">XInteractionContinuation::select</member>,
-        and should only be called if
-        <member>XInteractionSupplyAuthentication::setAccount</member>
+        and should only	be called if 
+        <member>XInteractionSupplyAuthentication::setAccount</member> 
         is also called.</p>
-
+        
         @param Remember  The mode to hand back, should be contained in the
-        sequence returned by
+        sequence returned by 
         <member>XInteractionSupplyAuthentication::getRememberAccountModes</member>.
     */
     void setRememberAccount( [in] com::sun::star::ucb::RememberAuthentication Remember );
@@ -172,6 +172,6 @@ published interface XInteractionSupplyAuthentication: com::sun::star::task::XInt
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
index 252ba27c25c6..8da2e3282b85 100644
--- a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
+++ b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XInteractionSupplyName.idl b/offapi/com/sun/star/ucb/XInteractionSupplyName.idl
index 57009d3bd7fb..696bff6f3482 100644
--- a/offapi/com/sun/star/ucb/XInteractionSupplyName.idl
+++ b/offapi/com/sun/star/ucb/XInteractionSupplyName.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XParameterizedContentProvider.idl b/offapi/com/sun/star/ucb/XParameterizedContentProvider.idl
index e7b0feec1a3f..1b03be7b7754 100644
--- a/offapi/com/sun/star/ucb/XParameterizedContentProvider.idl
+++ b/offapi/com/sun/star/ucb/XParameterizedContentProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,7 +62,7 @@ published interface XParameterizedContentProvider: com::sun::star::uno::XInterfa
 
         @param Arguments  Any supplementary arguments required by this
         <type>XContentProvider</type>, represented as a single string.  If the
-        input is malformed, an
+        input is malformed, an 
         <type scope="com::sun::star::lang">IllegalArgumentException</type>
         may be raised.
 
diff --git a/offapi/com/sun/star/ucb/XPersistentPropertySet.idl b/offapi/com/sun/star/ucb/XPersistentPropertySet.idl
index 05a723972675..13f12f9675d5 100644
--- a/offapi/com/sun/star/ucb/XPersistentPropertySet.idl
+++ b/offapi/com/sun/star/ucb/XPersistentPropertySet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XProgressHandler.idl b/offapi/com/sun/star/ucb/XProgressHandler.idl
index 21665a0b3b3a..e1c8de960020 100644
--- a/offapi/com/sun/star/ucb/XProgressHandler.idl
+++ b/offapi/com/sun/star/ucb/XProgressHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ucb {
+module com { module sun { module star { module ucb { 
 
 //=============================================================================
 /** Handle a tasks notification that it has made some progress.
@@ -48,13 +48,13 @@ published interface XProgressHandler: com::sun::star::uno::XInterface
 
         @param Status  An object representing the new activity.  There has to
         be an agreement between caller and callee of methods
-        <member>XProgressHandler::push</member> and
+        <member>XProgressHandler::push</member> and 
         <member>XProgressHandler::update</member> as to which Status
         arguments are meaningful.  For example, a <atom>string</atom> argument
         to <member>XProgressHandler::push</member> should be used to transport
-        some status text that describes the progress being made (possibly
+        some status text that describes the progress being made (possibly 
         followed by one or more <member>XProgressHandler::update</member>s with
-        <atom>string</atom> arguments, if the appropriate status text changes
+        <atom>string</atom> arguments, if the appropriate status text changes 
         as progress is being made).
     */
     void push([in] any Status);
@@ -64,7 +64,7 @@ published interface XProgressHandler: com::sun::star::uno::XInterface
         progress.
 
         @param Status  An object representing the progress made.  See the
-        documentation of <member>XProgressHandler::push</member> for more
+        documentation of <member>XProgressHandler::push</member> for more 
         information.
     */
     void update([in] any Status);
@@ -78,6 +78,6 @@ published interface XProgressHandler: com::sun::star::uno::XInterface
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/ucb/XPropertyMatcher.idl b/offapi/com/sun/star/ucb/XPropertyMatcher.idl
index 3ca6f6005a32..b3905f7bd702 100644
--- a/offapi/com/sun/star/ucb/XPropertyMatcher.idl
+++ b/offapi/com/sun/star/ucb/XPropertyMatcher.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@ published interface XPropertyMatcher : com::sun::star::uno::XInterface
         A Command Processor through which the set of properties is accessible.
 
         @param Environment
-        The environment to use when accessing the property  set via the given
+        The environment to use when accessing the property	set via the given
          Command Processor.  It may be null.
 
         @returns
diff --git a/offapi/com/sun/star/ucb/XPropertyMatcherFactory.idl b/offapi/com/sun/star/ucb/XPropertyMatcherFactory.idl
index 32627ce4d37b..5f4cce06275b 100644
--- a/offapi/com/sun/star/ucb/XPropertyMatcherFactory.idl
+++ b/offapi/com/sun/star/ucb/XPropertyMatcherFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XPropertySetRegistry.idl b/offapi/com/sun/star/ucb/XPropertySetRegistry.idl
index ea283ae81589..a37e6eef8dad 100644
--- a/offapi/com/sun/star/ucb/XPropertySetRegistry.idl
+++ b/offapi/com/sun/star/ucb/XPropertySetRegistry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XPropertySetRegistryFactory.idl b/offapi/com/sun/star/ucb/XPropertySetRegistryFactory.idl
index a61210b78ba9..243ccd75a583 100644
--- a/offapi/com/sun/star/ucb/XPropertySetRegistryFactory.idl
+++ b/offapi/com/sun/star/ucb/XPropertySetRegistryFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XRecycler.idl b/offapi/com/sun/star/ucb/XRecycler.idl
index e3e193b6c460..6a0693c160ff 100644
--- a/offapi/com/sun/star/ucb/XRecycler.idl
+++ b/offapi/com/sun/star/ucb/XRecycler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,7 +56,7 @@ published interface XRecycler : com::sun::star::uno::XInterface
         into it.
 
         @param Properties
-        The trash can uses this interface to access the properties of the
+        The trash can uses this interface to access the	properties of the
         content being deleted, to copy them for later display etc.  The
         trash can will not use the interface after it has returned from this
         method.
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor.idl
index 54aee34f4e7d..b1d4851e75db 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderAcceptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -66,7 +66,7 @@ published interface XRemoteContentProviderAcceptor: com::sun::star::uno::XInterf
         @param DoneListener  If not null, the implementation of this interface
         can---through this callback---tell the calling side that the
         implementation no longer needs the remote content provider.  (And the
-        calling side should call
+        calling side should call 
         <member>XRemoteContentProviderAcceptor::removeRemoteContentProvider</member>
         then.)
 
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderActivator.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderActivator.idl
index e2c69ec0f8f7..f2554be0bd26 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderActivator.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderActivator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@ module com { module sun { module star { module ucb {
 
 //============================================================================
 /** This interface should be implemented together with
-    <type>XRemoteContentProviderAcceptor</type> and allows for a lazy
+    <type>XRemoteContentProviderAcceptor</type>	and allows for a lazy
     implementation of
     <member>XRemoteContentProviderAcceptor::addRemoteContentProvider</member>.
 
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl
index 3a8a22cc4da6..edafc882b685 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier.idl
index ca43be38e95a..8936a1a9f2fc 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderChangeNotifier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl.idl
index 1bb56c3d7616..5ff3db6da886 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderConnectionControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderDistributor.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderDistributor.idl
index c787fe32aa15..af01fb84510e 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderDistributor.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderDistributor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener.idl
index 8786c28b49e5..02bc4b1b9241 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderDoneListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderSupplier.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderSupplier.idl
index 037d67af4d36..e3b0ed6104f4 100644
--- a/offapi/com/sun/star/ucb/XRemoteContentProviderSupplier.idl
+++ b/offapi/com/sun/star/ucb/XRemoteContentProviderSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XSimpleFileAccess.idl b/offapi/com/sun/star/ucb/XSimpleFileAccess.idl
index 122bde51ef1c..8b89be7ab317 100644
--- a/offapi/com/sun/star/ucb/XSimpleFileAccess.idl
+++ b/offapi/com/sun/star/ucb/XSimpleFileAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XSimpleFileAccess2.idl b/offapi/com/sun/star/ucb/XSimpleFileAccess2.idl
index 92bdb9ca6365..c5b1eca748e1 100644
--- a/offapi/com/sun/star/ucb/XSimpleFileAccess2.idl
+++ b/offapi/com/sun/star/ucb/XSimpleFileAccess2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl b/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl
index 396a0d3892c4..5a1370e0ef5c 100644
--- a/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl
+++ b/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory.idl b/offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory.idl
index 91ae947b613f..87ff6fee1f82 100644
--- a/offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory.idl
+++ b/offapi/com/sun/star/ucb/XSortedDynamicResultSetFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ module com { module sun { module star { module ucb {
 published interface XSortedDynamicResultSetFactory: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** creates a sorted <type>XDynamicResultSet</type> depending on internal
+    /**	creates a sorted <type>XDynamicResultSet</type> depending on internal
         data, an (unsorted) XDynamicResultSet and the sorting info.
 
         @returns
@@ -68,7 +68,7 @@ published interface XSortedDynamicResultSetFactory: com::sun::star::uno::XInterf
         @param CompareFactory
         a factory for compare objects.
     */
-    com::sun::star::ucb::XDynamicResultSet  createSortedDynamicResultSet(
+    com::sun::star::ucb::XDynamicResultSet	createSortedDynamicResultSet(
                 [in] com::sun::star::ucb::XDynamicResultSet Source,
                 [in] sequence<com::sun::star::ucb::NumberedSortingInfo> Info,
                 [in] com::sun::star::ucb::XAnyCompareFactory CompareFactory );
diff --git a/offapi/com/sun/star/ucb/XSourceInitialization.idl b/offapi/com/sun/star/ucb/XSourceInitialization.idl
index b091faece81d..f738ee79b03d 100644
--- a/offapi/com/sun/star/ucb/XSourceInitialization.idl
+++ b/offapi/com/sun/star/ucb/XSourceInitialization.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ module com { module sun { module star { module ucb {
 published interface XSourceInitialization: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** provides the initialization of a component with any source object.
+    /**	provides the initialization of a component with any source object.
 
         <p>The service description has to specify which type of interface must
         be set as parameter.
@@ -66,7 +66,7 @@ published interface XSourceInitialization: com::sun::star::uno::XInterface
         object implementing this interface.
 
     */
-    void setSource( [in] com::sun::star::uno::XInterface Source )
+    void setSource(	[in] com::sun::star::uno::XInterface Source )
          raises (AlreadyInitializedException);
 };
 
diff --git a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
index 98d72c25e8ad..d586a8f58f27 100644
--- a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
+++ b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,20 +40,20 @@ module com { module sun { module star { module ucb {
 
 //=============================================================================
 /** A command environment that can be used to deal with WebDAV/HTTP specific
-    commands.
+    commands. 
 
     <p>Supply an implementation of this interface together with an
     <type>XCommandEnvironment</type> implementation, when executing a command
     using <type>XCommandProcessor</type>.
 */
-/* published */
+/* published */ 
 interface XWebDAVCommandEnvironment : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** This method gets called while assembling an WebDAV/HTTP request.
         The returned headername-headervalue pairs will be appended to
         the list of request headers before the request is dispatched.
-
+          
     @param aURI
     The request URI.
 
@@ -61,8 +61,8 @@ interface XWebDAVCommandEnvironment : com::sun::star::uno::XInterface
     The WebDAV/HTTP method ("GET","PUT","MKCOL",...).
 
     @return
-        A sequence of header name, header value pairs. The header
-        names must be the plain names and contain no trailing ":".
+        A sequence of header name, header value pairs. The header 
+        names must be the plain names and contain no trailing ":". 
         The header value must be an Any containing a string.
     */
     sequence<com::sun::star::beans::NamedValue> getUserRequestHeaders(
diff --git a/offapi/com/sun/star/ui/ActionTrigger.idl b/offapi/com/sun/star/ui/ActionTrigger.idl
index fd41e7ae38f2..0c1262b9d81b 100644
--- a/offapi/com/sun/star/ui/ActionTrigger.idl
+++ b/offapi/com/sun/star/ui/ActionTrigger.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ui/ActionTriggerContainer.idl b/offapi/com/sun/star/ui/ActionTriggerContainer.idl
index 63ef251ec83d..5120fbc6b8c0 100644
--- a/offapi/com/sun/star/ui/ActionTriggerContainer.idl
+++ b/offapi/com/sun/star/ui/ActionTriggerContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ui/ActionTriggerSeparator.idl b/offapi/com/sun/star/ui/ActionTriggerSeparator.idl
index 94e6cc319f3a..a824a601d76e 100644
--- a/offapi/com/sun/star/ui/ActionTriggerSeparator.idl
+++ b/offapi/com/sun/star/ui/ActionTriggerSeparator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ui/ActionTriggerSeparatorType.idl b/offapi/com/sun/star/ui/ActionTriggerSeparatorType.idl
index f3ea2240547b..02fe92d59b20 100644
--- a/offapi/com/sun/star/ui/ActionTriggerSeparatorType.idl
+++ b/offapi/com/sun/star/ui/ActionTriggerSeparatorType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ui/ConfigurableUIElement.idl b/offapi/com/sun/star/ui/ConfigurableUIElement.idl
index 88d2a96416e8..f1dac25000c6 100644
--- a/offapi/com/sun/star/ui/ConfigurableUIElement.idl
+++ b/offapi/com/sun/star/ui/ConfigurableUIElement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@
 #include <com/sun/star/ui/XUIElementSettings.idl>
 #endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
 
@@ -56,11 +56,11 @@
 #include <com/sun/star/lang/XInitialization.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module ui {
 
-//=============================================================================
+//============================================================================= 
 
 /** specifies a configurable user interface element that supports persistence.
 
@@ -73,27 +73,27 @@ module com { module sun { module star { module ui {
         <li>statusbar</li>
     </ul>
     </p>
-
+    
     @since OOo 2.0.0
 */
 
 service ConfigurableUIElement
 {
-    /** provides properties and functions to initialize and identify a user
+    /** provides properties and functions to initialize and identify a user 
         interface element.
-
+    
         <p>
-        A configurable user interface element must be initialized using
+        A configurable user interface element must be initialized using 
         <member scope=com::sun::star::lang>XInitialization::initialize</member> before
         it can be used. The following properties must be provided:
         <ul>
             <li><b>ResourceURL</b><br>specifies the user interface name.</li>
             <li><b>Frame</b><br>specifies to which frame instance the user interface belongs to.</li>
-            <li><b>ConfigurationSource</b><br>specifies to which configuration manager a user interface
+            <li><b>ConfigurationSource</b><br>specifies to which configuration manager a user interface 
             element instance is bound to.</li>
         </ul>
         </p>
-
+        
         A user interface element factory creates and initializes every user interface element
         correctly.
 
@@ -101,22 +101,22 @@ service ConfigurableUIElement
     */
     service UIElement;
 
-    /** provides functions to retrieve and change the user interface element structure data and to
+    /** provides functions to retrieve and change the user interface element structure data and to 
         update its visible representation.
     */
     interface com::sun::star::ui::XUIElementSettings;
 
-    /** specifies if the user interface element stores changes of its structure to its creator
+    /** specifies if the user interface element stores changes of its structure to its creator 
         source defined by the property <member>ConfigurationSource</member>. */
     [property] boolean Persistent;
 
     /** specifies the configuration source of this user interface element.
-
+    
         <p>
-        If the property <member>Persistent</member> is <TRUE/> changes on the structure of
+        If the property <member>Persistent</member> is <TRUE/> changes on the structure of 
         the user interface element are written back to configuration source. When this property is
         changed, afterwards <member>XUIElementSettings::updateSettings</member>  must be called so
-        the user interface element tries to retrieve its settings from the new user interface
+        the user interface element tries to retrieve its settings from the new user interface 
         configuration manager.
         </p>
     */
diff --git a/offapi/com/sun/star/ui/ConfigurationEvent.idl b/offapi/com/sun/star/ui/ConfigurationEvent.idl
index 9001f3d2b333..7b034f0471e3 100644
--- a/offapi/com/sun/star/ui/ConfigurationEvent.idl
+++ b/offapi/com/sun/star/ui/ConfigurationEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,15 +28,15 @@
 #ifndef __com_sun_star_ui_ConfigurationEvent_idl__
 #define __com_sun_star_ui_ConfigurationEvent_idl__
 
-#ifndef __com_sun_star_container_ContainerEvent_idl__
+#ifndef __com_sun_star_container_ContainerEvent_idl__ 
 #include <com/sun/star/container/ContainerEvent.idl>
 #endif
 
-module com { module sun { module star { module ui {
+module com { module sun { module star { module ui { 
 
 /** this event is broadcasted by a configuration manager whenever the state of
     user interface element has changed.
-
+    
     @since OOo 2.0.0
 */
 
diff --git a/offapi/com/sun/star/ui/ContextMenuExecuteEvent.idl b/offapi/com/sun/star/ui/ContextMenuExecuteEvent.idl
index 09fa6843efb7..0e8fc3b922df 100644
--- a/offapi/com/sun/star/ui/ContextMenuExecuteEvent.idl
+++ b/offapi/com/sun/star/ui/ContextMenuExecuteEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ui/ContextMenuInterceptorAction.idl b/offapi/com/sun/star/ui/ContextMenuInterceptorAction.idl
index e4fa8e0d7819..bbdb025819d5 100644
--- a/offapi/com/sun/star/ui/ContextMenuInterceptorAction.idl
+++ b/offapi/com/sun/star/ui/ContextMenuInterceptorAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ui/DockingArea.idl b/offapi/com/sun/star/ui/DockingArea.idl
index 9a4170dc1173..55ab469eebeb 100644
--- a/offapi/com/sun/star/ui/DockingArea.idl
+++ b/offapi/com/sun/star/ui/DockingArea.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,11 +28,11 @@
 #ifndef __com_sun_star_ui_DockingArea_idl__
 #define __com_sun_star_ui_DockingArea_idl__
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module ui {
 
-//=============================================================================
+//============================================================================= 
 
 /** specifies different docking areas a frame based layout manager
     supports.
@@ -40,10 +40,10 @@ module com { module sun { module star { module ui {
     <p>
     A frame based layout manager supports four different docking areas where
     dockable user interface elements can be docked.
-
+    
     @see com::sun::star::frame::XLayoutManager
     </p>
-
+    
     @since OOo 2.0.0
 */
 
@@ -52,15 +52,15 @@ enum DockingArea
     /** the top docking area below the menu bar.
     */
     DOCKINGAREA_TOP,
-
+    
     /** the bottom docking area above the status bar.
     */
     DOCKINGAREA_BOTTOM,
-
+    
     /** the left side docking area.
     */
     DOCKINGAREA_LEFT,
-
+    
     /** the right side docking area.
     */
     DOCKINGAREA_RIGHT,
diff --git a/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl b/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl
index 58ff8da73fa0..861f4f7fba50 100644
--- a/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl
+++ b/offapi/com/sun/star/ui/GlobalAcceleratorConfiguration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,10 +39,10 @@ module com {  module sun {  module star {  module ui {
     <p> The GlobalAcceleratorConfiguration service can be created
     by using an UNO service manager. It provides then access to
     the global accelerator configuration.</p>
-
+    
     @since OOo 2.0.0
 */
-service GlobalAcceleratorConfiguration : XAcceleratorConfiguration
+service GlobalAcceleratorConfiguration : XAcceleratorConfiguration 
 {};
 
 }; }; }; }; // com.sun.star
diff --git a/offapi/com/sun/star/ui/ImageType.idl b/offapi/com/sun/star/ui/ImageType.idl
index fb35073f9d38..b3887643c360 100644
--- a/offapi/com/sun/star/ui/ImageType.idl
+++ b/offapi/com/sun/star/ui/ImageType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@ module com {  module sun {  module star {  module ui {
     The constants describe bits in a bit field which determine
     the current image set of an image manager.
     </p>
-
+    
     @since OOo 2.0.0
  */
 constants ImageType
diff --git a/offapi/com/sun/star/ui/ItemDescriptor.idl b/offapi/com/sun/star/ui/ItemDescriptor.idl
index 8732f300b96d..fbc3313aab3d 100644
--- a/offapi/com/sun/star/ui/ItemDescriptor.idl
+++ b/offapi/com/sun/star/ui/ItemDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,7 +48,7 @@ module com {  module sun {  module star {  module ui {
        No assumption is made about any graphical representation:
        You could have a menu or a toolbox working with the same item descriptor.
     </p>
-
+    
     @since OOo 2.0.0
 */
 service ItemDescriptor
@@ -57,41 +57,41 @@ service ItemDescriptor
         <type>ItemType</type>.</p>
     */
     [property] short Type;
-
-    /** the text of the user interface item.
+    
+    /** the text of the user interface item. 
     */
     [property] string Label;
-
+    
     /** contains the command URL which specifies which action should be accomplished.
      */
     [property] string CommandURL;
-
+    
     /** contains the a URL that points to a help text.
      */
     [property] string HelpURL;
-
+    
     /** different styles which influence the appearance of the item and its behavior.
-        <p>This property is only valid if the item describes a toolbar or statusbar
+        <p>This property is only valid if the item describes a toolbar or statusbar 
         item. See <type>ItemStyle</type> for more information about possible styles.</p>
     */
     [optional, property] short Style;
-
-    /** specifies the pixel distance by which the text of the item is shifted on the x-axis.
+    
+    /** specifies the pixel distance by which the text of the item is shifted on the x-axis. 
         <p>This property is only valid if the item describes a statusbar item.</p>
     */
     [optional, property] short Offset;
-
+    
     /** specifies an optional sub container.
         <p>This property is valid for menus only. It can be used to define sub menus.</p>
     */
     [optional, property] com::sun::star::container::XIndexAccess ItemDescriptorContainer;
-
-    /** specifies if this item is visible or not.
+    
+    /** specifies if this item is visible or not. 
         <p>This property is only valid if the item describes a toolbar or statusbar item.</p>
     */
     [optional, property] boolean IsVisible;
 
-    /** specifies a pixel width for this item inside the user interface element.
+    /** specifies a pixel width for this item inside the user interface element. 
         <p>This property is only valid if the item describes a toolbar or statusbar item.</p>
     */
     [optional, property] short Width;
diff --git a/offapi/com/sun/star/ui/ItemStyle.idl b/offapi/com/sun/star/ui/ItemStyle.idl
index 78e11cde05fd..4e259ccff0db 100644
--- a/offapi/com/sun/star/ui/ItemStyle.idl
+++ b/offapi/com/sun/star/ui/ItemStyle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,9 +33,9 @@
 module com {  module sun {  module star {  module ui {
 
 /**
-    specifies styles which influence the appearance and the behavior of an
+    specifies styles which influence the appearance and the behavior of an 
     user interface item.
-
+    
     <p>
     These styles are only valid if the item describes a toolbar or statusbar item.
     The style values can be combined with the OR operator. Styles which are not valid
@@ -67,14 +67,14 @@ constants ItemStyle
         Draw item with a left aligned output.</p>
     */
     const short ALIGN_LEFT   = 1;
-
+    
     /** specifies how the output of the item is aligned in the bounding box of
         the user interface element.
         <p>This style is only valid for an item which describes a statusbar item.
         Draw item with a centered aligned output.</p>
     */
     const short ALIGN_CENTER = 2;
-
+    
     /** specifies how the output of the item is aligned in the bounding box of
         the user interface element.
         <p>This style is only valid for an item which describes a statusbar item.
@@ -83,19 +83,19 @@ constants ItemStyle
     const short ALIGN_RIGHT  = 3;
 
     //-------------------------------------------------------------------------
-    /** specifies how the implementation should draw the item.
+    /** specifies how the implementation should draw the item. 
         <p>This style is only valid for an item which describes a statusbar item.
         Draw item with an embossed 3D effect.</p>
     */
     const short DRAW_OUT3D   = 4;
-
-    /** specifies how the implementation should draw the item.
+    
+    /** specifies how the implementation should draw the item. 
         <p>This style is only valid for an item which describes a statusbar item.
         Draw item with an impressed 3D effect.</p>
     */
     const short DRAW_IN3D    = 8;
-
-    /** specifies how the implementation should draw the item.
+    
+    /** specifies how the implementation should draw the item. 
         <p>This style is only valid for an item which describes a statusbar item.
         Draw item without an 3D effect.</p>
     */
@@ -106,36 +106,36 @@ constants ItemStyle
         <p>This style is only valid if the item describes a statusbar item.</p>
     */
     const short OWNER_DRAW    = 16;
-
+    
     //-------------------------------------------------------------------------
     /** specifies whether or not the size of the item is set automatically by
         the parent user interface element.
         <p>This style is only valid if the item describes a toolbar or statusbar item.</p>
     */
     const short AUTO_SIZE     = 32;
-
+    
     //-------------------------------------------------------------------------
     /**  determines whether the item unchecks neighbor entries which have also this style set.
          <p>This style is only valid if the item describes a toolbar item.</p>
     */
     const short RADIO_CHECK   = 64;
-
+    
     //-------------------------------------------------------------------------
     /** specifies if an icon is placed on left side of the text, like an entry in a taskbar.
         <p>This style is only valid if the item describes a toolbar item and visible if
         style of the toolbar is set to symboltext.</p>
-        <p> This style can also be used for custom toolbars and menus, in a custom toolbar an item's Style setting can used to override the toolbar container setting, the style can be bitwise OR-ed with <member scope="::com::sun::star::ui::ItemStyle">TEXT</member> to define text, text+icon or icon only is to be displayed. Similarly for menu items, an items Style can override the application setting to display either text or icon ( note: for menu an icon only setting interpreted as icon+text ) </p>
+        <p> This style can also be used for custom toolbars and menus, in a custom toolbar an item's Style setting can used to override the toolbar container setting, the style can be bitwise OR-ed with <member scope="::com::sun::star::ui::ItemStyle">TEXT</member> to define text, text+icon or icon only is to be displayed. Similarly for menu items, an items Style can override the application setting to display either text or icon ( note: for menu an icon only setting interpreted as icon+text ) </p> 
     */
     const short ICON          = 128;
-
+    
     //-------------------------------------------------------------------------
     /** specifies that the item supports a dropdown menu or toolbar for additional functions.
         <p>This style is only valid if the item describes a toolbar item.</p>
     */
     const short DROP_DOWN     = 256;
-
+    
     //-------------------------------------------------------------------------
-    /** indicates that the item continues to execute the command while you click and hold
+    /** indicates that the item continues to execute the command while you click and hold 
         the mouse button.
         <p>This style is only valid if the item describes a toolbar item.</p>
     */
@@ -147,8 +147,8 @@ constants ItemStyle
         <p>This style is only valid if the item describes a toolbar item.</p>
     */
     const short DROPDOWN_ONLY = 1024;
-    /** indicates if icon, text or text+icon is displayed for the item.
-        <p> This style can be used for custom toolbars and menus, in a custom toolbar an item's Style setting can used to override the toolbar container setting, the style can be bitwise OR-ed with <member scope="com::sun::star::ui::ItemStyle">ICON</member> to define text, text+icon or icon only is to be displayed. Similarly for menu items, an items Style can override the application setting to display either text or icon ( note: for menu an icon only setting interpreted as icon+text ) </p>
+    /** indicates if icon, text or text+icon is displayed for the item. 
+        <p> This style can be used for custom toolbars and menus, in a custom toolbar an item's Style setting can used to override the toolbar container setting, the style can be bitwise OR-ed with <member scope="com::sun::star::ui::ItemStyle">ICON</member> to define text, text+icon or icon only is to be displayed. Similarly for menu items, an items Style can override the application setting to display either text or icon ( note: for menu an icon only setting interpreted as icon+text ) </p> 
     */
     const short TEXT = 2048;
 };
diff --git a/offapi/com/sun/star/ui/ItemType.idl b/offapi/com/sun/star/ui/ItemType.idl
index 35271779ca12..cadb2fe26ba1 100644
--- a/offapi/com/sun/star/ui/ItemType.idl
+++ b/offapi/com/sun/star/ui/ItemType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 module com {  module sun {  module star {  module ui {
 
 /** Determins the type of an item.
-
+    
     @since OOo 2.0.0
  */
 constants ItemType
@@ -38,7 +38,7 @@ constants ItemType
     //-------------------------------------------------------------------------
     /** a normal item
      */
-    const short DEFAULT = 0;
+    const short DEFAULT = 0;    
     //-------------------------------------------------------------------------
     /** a separarator is inserted as a line.
      */
diff --git a/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl b/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
index 3b410d9dc799..1d705460ea7e 100644
--- a/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
+++ b/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,41 +32,41 @@
 #include <com/sun/star/container/XNameAccess.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module ui {
 
-//=============================================================================
+//============================================================================= 
 
 /** a service which provides information about the user interface command
     categories of a single module.
 
     <p>
-    Every OpenOffice.org module has an amount of commands that can be used by
-    user interface elements. This service provides access to the user interface
-    commands that are part of a single OpenOffice.org module, like Writer
+    Every OpenOffice.org module has an amount of commands that can be used by 
+    user interface elements. This service provides access to the user interface 
+    commands that are part of a single OpenOffice.org module, like Writer 
     or Calc.
     </p>
-
+    
     @since OOo 2.0.0
 */
 
 service ModuleUICategoryDescription
 {
-    /** provides access to user interface command categories of an installed
+    /** provides access to user interface command categories of an installed 
         module.
-
+        
         <p>
         An implementation must provide a language dependent string which
         can be used by a UI to display the category name.
         The key to a user interface command category depends on the specific
-        implementation. OpenOffice.org uses a pre-defined number of
+        implementation. OpenOffice.org uses a pre-defined number of 
         identifiers defined in <type scope="::com::sun:star::frame">
         CommandGroup</type>.
         </p>
-
+        
         @see ::com::sun::star::frame::ModuleManager
-        @see ::com::sun::star::frame::CommandGroup
+        @see ::com::sun::star::frame::CommandGroup        
     */
 
     interface com::sun::star::container::XNameAccess;
diff --git a/offapi/com/sun/star/ui/ModuleUICommandDescription.idl b/offapi/com/sun/star/ui/ModuleUICommandDescription.idl
index 100c31073b7f..cc672ae5b133 100644
--- a/offapi/com/sun/star/ui/ModuleUICommandDescription.idl
+++ b/offapi/com/sun/star/ui/ModuleUICommandDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,47 +32,47 @@
 #include <com/sun/star/container/XNameAccess.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module ui {
 
-//=============================================================================
+//============================================================================= 
 
-/** a service which provides information about the user interface commands of
+/** a service which provides information about the user interface commands of 
     a single module.
 
     <p>
-    Every OpenOffice.org module has an amount of commands that can be used by
-    user interface elements. This service provides access to the user interface commands
+    Every OpenOffice.org module has an amount of commands that can be used by 
+    user interface elements. This service provides access to the user interface commands 
     that are part of a single OpenOffice.org module, like Writer or Calc.
     </p>
-
+    
     @since OOo 2.0.0
 */
 
 service ModuleUICommandDescription
 {
     /** provides access to user interface commands of an installed module.
-
+        
         <p>
         An implementation must provide a <type scope="com::sun::star::uno">Sequence</type> which
         has <type scope="com::sun::star::beans">PropertyValue</type> as entries. The following
         entries a defined:
         <ul>
-            <li><b>Label</b><br>a string which specifies the short name of the user interface command with
+            <li><b>Label</b><br>a string which specifies the short name of the user interface command with 
             mnemonic and optional subsequent ... if the command needs additional user input. This string
             can directly be used to set the text of a menu item.</li>
-            <li><b>Name</b><br>a string which specifies the short name of the user interface command without
+            <li><b>Name</b><br>a string which specifies the short name of the user interface command without 
             any additional information. It can be used for the bubble help.</li>
             <li><b>Popup</b><br>a boolean which specifies if the user interface command is a unique
             identifer for a popup menu. A popup menu has a label, but is not bound to a command.</li>
         </ul>
         The key to a user interface command description is the user interface command itself which has
         the following syntax ".uno:$Command". For example ".uno:Open" shows the file open dialog.
-        A complete list of user interface commands can be found inside the latest OpenOffice Developers Guide
+        A complete list of user interface commands can be found inside the latest OpenOffice Developers Guide 
         or online at http://framework.openoffice.org.
         </p>
-
+        
         @see com::sun::star::frame::ModuleManager
     */
 
diff --git a/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl b/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl
index 44ee22856610..7e740ca38f38 100644
--- a/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,36 +47,36 @@
 #include <com/sun/star/ui/XUIConfiguration.idl>
 #endif
 
-module com { module sun { module star { module ui {
+module com { module sun { module star { module ui { 
 
-/** specifies a user interface configuration manager which gives access to user interface
+/** specifies a user interface configuration manager which gives access to user interface 
     configuration data of a module.
-
+    
     <p>
     A module user interface configuratio manager supports two layers of configuration settings
-    data:<br/>
-    1. Layer: A module default user interface configuration which describe all user interface
+    data:<br/>   
+    1. Layer: A module default user interface configuration which describe all user interface 
     elements settings that are used by OpenOffice. It is not possible to insert, remove or change
     elements settings in this layer through the interfaces.</br>
-    2. Layer: A module user interface configuration which only contains customized user interface
+    2. Layer: A module user interface configuration which only contains customized user interface 
     elements and user-defined ones. All changes on user interface element settings are done on
     this layer.</br>
     </p>
-
+    
     @since OOo 2.0.0
 */
 
 service ModuleUIConfigurationManager
-{
+{    
     /** provides a function to initialize a module user interface configuration manager instance.
 
         <p>
-        A module user interface configuration manager instance needs the following arguments as
+        A module user interface configuration manager instance needs the following arguments as 
         <type scope="com::sun::star::beans">PropertyValue</type> to be in a working state:
         <ul>
-            <li><b>DefaultConfigStorage</b>a reference to a <type scope="com::sun::star::embed">Storage</type> that
+            <li><b>DefaultConfigStorage</b>a reference to a <type scope="com::sun::star::embed">Storage</type> that 
             contains the default module user interface configuration settings.</li>
-            <li><b>UserConfigStorage</b>a reference to a <type scope="com::sun::star::embed">Storage</type> that
+            <li><b>UserConfigStorage</b>a reference to a <type scope="com::sun::star::embed">Storage</type> that 
             contains the user-defined module user interface configuration settings.</li>
             <li><b>ModuleIdentifier</b>string that provides the module identifier.</li>
             <li><b>UserRootCommit</b>a reference to a <type scope="com::sun::star::embed">XTransactedObject</type> which
diff --git a/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
index 835fecc0e5ab..68f69b8c3d9f 100644
--- a/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,21 +35,21 @@
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
 
-module com { module sun { module star { module ui {
+module com { module sun { module star { module ui { 
 
 /** specifies a central user interface configuration provider which gives
     access to module based user interface configuration managers.
-
+    
     @since OOo 2.0.0
 */
 
 service ModuleUIConfigurationManagerSupplier
 {
     /** controls module based user interface configuration managers.
-
+        
         <p>
-        There can only exists one user interface configuration manager for
-        a module. A user interface configuration manager supports to get and set
+        There can only exists one user interface configuration manager for 
+        a module. A user interface configuration manager supports to get and set 
         user interface configuration data for configurable user interface elements.
 
         @see ConfigurableUIElement
diff --git a/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl b/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl
index 09c2d9657e49..d557d952ff98 100644
--- a/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl
+++ b/offapi/com/sun/star/ui/ModuleWindowStateConfiguration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,43 +32,43 @@
 #include <com/sun/star/container/XNameContainer.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module ui {
 
-//=============================================================================
+//============================================================================= 
 
-/** a service which provides window based information about user interface
+/** a service which provides window based information about user interface 
     elements of a single application module.
 
     <p>
-    Every OpenOffice.org module has an amout of user interface elements that can
-    be positioned, resized, closed and their style can be changed. This service
-    provides access to the window based information of available user interface
-    elements which are part of a single OpenOffice.org module, like Writer or
+    Every OpenOffice.org module has an amout of user interface elements that can 
+    be positioned, resized, closed and their style can be changed. This service 
+    provides access to the window based information of available user interface 
+    elements which are part of a single OpenOffice.org module, like Writer or 
     Calc.
     </p>
-
+    
     @since OOo 2.0.0
 */
 
 service ModuleWindowStateConfiguration
 {
-    /** provides read/write access to window based information of user interface
+    /** provides read/write access to window based information of user interface 
         elements which are part of single installed module.
-
+        
         <p>
         An implementation must provide a <type scope="com::sun::star::uno">Sequence</type> which
         has <type scope="com::sun::star::beans">PropertyValue</type> as entries. The following
         entries a defined:
         <ul>
             <li><b>Docked</b><br>a boolean which specifies if the window is docked or not.</li>
-            <li><b>DockingArea</b><br>a <type scope="com::sun::star::ui">DockingArea</type>
+            <li><b>DockingArea</b><br>a <type scope="com::sun::star::ui">DockingArea</type> 
             which specifies the docking area where the window is docked.</li>
             <li><b>DockPos</b><br>a <type scope="com::sun::star::awt">Point</type> which specifies the
             docked position of a window. The X and Y values are interpreted as a row/column number and
             a pixel position for top/bottom docked windows. For left/right docked windows this is</li>
-            <li><b>DockSize</b><br>a <type scope="com::sun::star::awt">Size</type> which specifies
+            <li><b>DockSize</b><br>a <type scope="com::sun::star::awt">Size</type> which specifies 
             the docked size of the window. This property is currently not used by the layout manager
             implementation. For future use.</li>
             <li><b>Locked</b><br>a boolean which specifies if the window is locked or not. This property
@@ -82,11 +82,11 @@ service ModuleWindowStateConfiguration
             <li><b>UIName</br><br>a localized string which specifies the default window title.</li>
         </ul>
         The key to a user interface element is the resource URL which has
-        the following syntax "private:resource/$type/$name". For example "private:resource/toolbar/standardbar"
+        the following syntax "private:resource/$type/$name". For example "private:resource/toolbar/standardbar" 
         addresses the standard bar of a module.
         A complete list of all user interface elements is available in the Developers Guide.
         </p>
-
+        
         @see com::sun::star::frame::ModuleManager
     */
 
diff --git a/offapi/com/sun/star/ui/UICategoryDescription.idl b/offapi/com/sun/star/ui/UICategoryDescription.idl
index 9853b43fc769..f6018ac2e8b6 100644
--- a/offapi/com/sun/star/ui/UICategoryDescription.idl
+++ b/offapi/com/sun/star/ui/UICategoryDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,37 +35,37 @@ module com {  module sun {  module star {  module ui {
 
 //=============================================================================
 
-/** a service which provides information about user interface command
+/** a service which provides information about user interface command 
     categories.
 
     <p>
-    OpenOffice.org has an amount of commands that can be used by user
-    interface elements. Every command is member of a single category.
-    Categories makes it easier to handle to huge amount of commands
-    provided by OpenOffice.org. This service is normally used by UI
+    OpenOffice.org has an amount of commands that can be used by user 
+    interface elements. Every command is member of a single category. 
+    Categories makes it easier to handle to huge amount of commands 
+    provided by OpenOffice.org. This service is normally used by UI 
     implementations which provides all commands to a user.
     </p>
-
+    
     @since OOo 2.0.0
 */
 
-//=============================================================================
+//============================================================================= 
 
 service UICategoryDescription
 {
-    /** provides access to user interface command categories of the installed
+    /** provides access to user interface command categories of the installed 
         modules.
 
         <p>
-        To access the user interface command categories of a module, a unique
-        module specifier must be provided to
-        <member scope="com::sun::star::container">XNameAccess::getByName()</member>
-        function. The module specifier can be retrieved from the
+        To access the user interface command categories of a module, a unique 
+        module specifier must be provided to 
+        <member scope="com::sun::star::container">XNameAccess::getByName()</member> 
+        function. The module specifier can be retrieved from the 
         <type scope="com::sun::star::frame">ModuleManager</type>
-        service. The interface provides references to
+        service. The interface provides references to 
         <type scope="com::sun:star::ui">ModuleUICommandDescription</type>.
         </p>
-
+        
         @see com::sun::star::frame::ModuleManager
     */
 
diff --git a/offapi/com/sun/star/ui/UICommandDescription.idl b/offapi/com/sun/star/ui/UICommandDescription.idl
index 76d7c179731b..5eca3c04afea 100644
--- a/offapi/com/sun/star/ui/UICommandDescription.idl
+++ b/offapi/com/sun/star/ui/UICommandDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,11 +32,11 @@
 #include <com/sun/star/container/XNameAccess.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module ui {
 
-//=============================================================================
+//============================================================================= 
 
 /** a service which provides information about user interface commands of modules.
 
@@ -45,7 +45,7 @@ module com { module sun { module star { module ui {
     elements. This service provides access to the user interface commands that
     are part of OpenOffice.org modules, like Writer or Calc.
     </p>
-
+    
     @since OOo 2.0.0
 */
 
@@ -54,12 +54,12 @@ service UICommandDescription
     /** provides access to user interface commands of the installed modules.
 
         <p>
-        To access the user interface command description of a module, a unique module specifier
+        To access the user interface command description of a module, a unique module specifier 
         must be provided to <member scope="com::sun::star::container">XNameAccess::getByName()</member> function.
         The module specifier can be retrieved from the <type scope="com::sun::star::frame">ModuleManager</type>
         service. The interface provides references to <type scope="com::sun:star::ui">ModuleUICommandDescription</type>.
         </p>
-
+        
         @see com::sun::star::frame::ModuleManager
     */
 
diff --git a/offapi/com/sun/star/ui/UIConfigurationManager.idl b/offapi/com/sun/star/ui/UIConfigurationManager.idl
index 4e9b56cd4c97..7ae757413f1b 100644
--- a/offapi/com/sun/star/ui/UIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/UIConfigurationManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,11 +47,11 @@
 #include <com/sun/star/ui/XUIConfigurationStorage.idl>
 #endif
 
-module com { module sun { module star { module ui {
+module com { module sun { module star { module ui { 
 
 /** specifies a user interface configuration manager which controls
     all customizeable user interface elements of an object.
-
+    
     @since OOo 2.0.0
 */
 
@@ -77,10 +77,10 @@ service UIConfigurationManager
     */
     interface com::sun::star::ui::XUIConfiguration;
 
-    /** allows controlling or observing the lifetime of a user interface configuration manager
+    /** allows controlling or observing the lifetime of a user interface configuration manager 
         instance.
 
-    <p>The owner of the object may dispose of this object using
+    <p>The owner of the object may dispose of this object using 
     <member scope="com::sun::star::lang">XComponent::dispose()</member>.
     </p>
     */
diff --git a/offapi/com/sun/star/ui/UIElement.idl b/offapi/com/sun/star/ui/UIElement.idl
index 580a660f734e..6572c7e16ca2 100644
--- a/offapi/com/sun/star/ui/UIElement.idl
+++ b/offapi/com/sun/star/ui/UIElement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 #include <com/sun/star/ui/XUIElement.idl>
 #endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
 
@@ -48,38 +48,38 @@
 #include <com/sun/star/util/XUpdatable.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module ui {
 
-//=============================================================================
+//============================================================================= 
 
 /** specifies a user interface element.
 
     <p>
     A user interface element consists of a unique identifier and a type specifier. It
-    provides an interface to retrieve a special purpose interface which depends on
+    provides an interface to retrieve a special purpose interface which depends on 
     the specific user interface element type. Every user interface must be initialized
     before it can be used.
     </p>
-
+    
     @since OOo 2.0.0
 */
 
 service UIElement
 {
-    /** provides a function to retrieve a special purpose interface which depends on
+    /** provides a function to retrieve a special purpose interface which depends on 
         the specific user interface element type.
     */
     interface ::com::sun::star::ui::XUIElement;
 
-    /** interface to initialize a user interface element instance.
-
-        A user interface element must be initialized using
+    /** interface to initialize a user interface element instance. 
+    
+        A user interface element must be initialized using 
         <member scope=com::sun::star::lang>XInitialization::initialize</member> before
         it can be used. The following property must be provided:
         <ul>
-            <li><b>ResourceURL</b>specifies a string property which is the unique identifier of
+            <li><b>ResourceURL</b>specifies a string property which is the unique identifier of 
             the user interface element.</li>
         </ul>
 
@@ -99,7 +99,7 @@ service UIElement
         </p>
     */
     [optional] interface com::sun::star::util::XUpdatable;
-
+    
     /** controls the life-time of the object.
     */
     interface ::com::sun::star::lang::XComponent;
@@ -107,6 +107,6 @@ service UIElement
 
 }; }; }; };
 
-//=============================================================================
+//============================================================================= 
 
 #endif
diff --git a/offapi/com/sun/star/ui/UIElementFactory.idl b/offapi/com/sun/star/ui/UIElementFactory.idl
index 5e0e171c7da1..4bcb2915db9d 100644
--- a/offapi/com/sun/star/ui/UIElementFactory.idl
+++ b/offapi/com/sun/star/ui/UIElementFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,31 +32,31 @@
 #include <com/sun/star/ui/XUIElementFactory.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module ui {
 
-//=============================================================================
+//============================================================================= 
 
 /** specifies a user interface element factory that can create and initialize
     a user interface element type.
-
+    
     <p>
-    It depends on the implementation which user interface element types can be
-    created. It is also possible that a factory is only able to create one
-    special user interface element. User interface element factories must be
-    registered at the single instance <type>UIElementFactoryManager</type>
+    It depends on the implementation which user interface element types can be 
+    created. It is also possible that a factory is only able to create one 
+    special user interface element. User interface element factories must be 
+    registered at the single instance <type>UIElementFactoryManager</type> 
     service to provide access to itself.
     </p>
-
+    
     @since OOo 2.0.0
 */
 
 service UIElementFactory
 {
-    /** this interface provides a function to create and initalize new
+    /** this interface provides a function to create and initalize new 
         instances of user interface elements.
-
+    
         @see XUIElementFactory
      */
     interface com::sun::star::ui::XUIElementFactory;
diff --git a/offapi/com/sun/star/ui/UIElementFactoryManager.idl b/offapi/com/sun/star/ui/UIElementFactoryManager.idl
index c814a58f6b8e..a5a2a0526a6b 100644
--- a/offapi/com/sun/star/ui/UIElementFactoryManager.idl
+++ b/offapi/com/sun/star/ui/UIElementFactoryManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,31 +36,31 @@
 #include <com/sun/star/ui/XUIElementFactoryRegistration.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module ui {
 
-//=============================================================================
+//============================================================================= 
 
-/** specifies a user interface factory manager that controls all registered user
+/** specifies a user interface factory manager that controls all registered user 
     interface element factories.
-
+    
     <p>An implementation is usually obtained from a
     <type scope="com::sun::star::lang">ServiceManager</type>.
     </p>
-
+    
     @since OOo 2.0.0
 */
 
 service UIElementFactoryManager
 {
     /** provides a function to create new instances of user interface elements.
-
+    
         <p>
-        A user interface element factory manager is also a user interface element factory. It
+        A user interface element factory manager is also a user interface element factory. It 
         retrieves the responsible user interface element factory from the provided arguments and passes
         the arguments to it.
-
+        
         see @XUIElementFactory
         </p>
      */
diff --git a/offapi/com/sun/star/ui/UIElementSettings.idl b/offapi/com/sun/star/ui/UIElementSettings.idl
index 575ff9ca1d71..4edb6774a8ef 100644
--- a/offapi/com/sun/star/ui/UIElementSettings.idl
+++ b/offapi/com/sun/star/ui/UIElementSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,10 +44,10 @@ module com {  module sun {  module star {  module ui {
 
 /**
     describes the internal structure of a configurable user interface element.
-
+    
     <p>
     No assumption is made about any graphical representation:
-    You could have a menu or a toolbar working with the same UIElementSettings
+    You could have a menu or a toolbar working with the same UIElementSettings 
     although limitations based on the real user interface element may be visible.
     </p>
 
@@ -55,8 +55,8 @@ module com {  module sun {  module star {  module ui {
 */
 service UIElementSettings
 {
-    /** provides access to the structure of the user interface element.
-
+    /** provides access to the structure of the user interface element. 
+    
         <p>
         The container contains the items of the user interface element. Every
         item is stored as a sequence of <type scope="com::sun::star::beans">PropertyValue</type>.
@@ -72,7 +72,7 @@ service UIElementSettings
 
 
     /** provides access to an optional factory interface to create sub container.
-
+    
         <p>
         The factory should be used to create sub container within this user interface element settings. This interface is only
         available if the container is exclusive writable.
@@ -81,7 +81,7 @@ service UIElementSettings
     [optional] interface ::com::sun::star::lang::XSingleComponentFactory;
 
     /** determine an optional user interface name of the user interface element.
-
+        
         <p>
         A toolbar can show a its user interface name on the window title, when it is in floating mode.
         </p>
diff --git a/offapi/com/sun/star/ui/UIElementType.idl b/offapi/com/sun/star/ui/UIElementType.idl
index f87d91ca6243..f57a17ee76ae 100644
--- a/offapi/com/sun/star/ui/UIElementType.idl
+++ b/offapi/com/sun/star/ui/UIElementType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ constants UIElementType
     /** unkown user interface element type, which can be used as a wildcard
        to specify all types.
     */
-    const short UNKNOWN         = 0;
+    const short UNKNOWN         = 0;    
 
     //-------------------------------------------------------------------------
     /** specifies a menu bar.
diff --git a/offapi/com/sun/star/ui/WindowContentFactory.idl b/offapi/com/sun/star/ui/WindowContentFactory.idl
index c1ea6a94d9b8..b8f309feee65 100644
--- a/offapi/com/sun/star/ui/WindowContentFactory.idl
+++ b/offapi/com/sun/star/ui/WindowContentFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,21 +32,21 @@
 #include <com/sun/star/lang/XSingleComponentFactory.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module ui {
 
-//=============================================================================
+//============================================================================= 
 
-/** specifies a factory which creates a window that is a container for user
+/** specifies a factory which creates a window that is a container for user 
     interface elements. Dependent on the provided arguments different window
-    types can be created. This container window must be capable of being
+    types can be created. This container window must be capable of being 
     integrated into another window (e.g. docking or floating windows).
-
+    
     <p>
     The specific type of the created window depends on the provided arguments.
     </p>
-
+    
     @since OOo 3.1.0
 */
 
diff --git a/offapi/com/sun/star/ui/WindowStateConfiguration.idl b/offapi/com/sun/star/ui/WindowStateConfiguration.idl
index c5243e4144fa..505ce1016626 100644
--- a/offapi/com/sun/star/ui/WindowStateConfiguration.idl
+++ b/offapi/com/sun/star/ui/WindowStateConfiguration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,15 +32,15 @@
 #include <com/sun/star/container/XNameAccess.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module ui {
 
-//=============================================================================
+//============================================================================= 
 
-/** a service which provides window based information about user interface
+/** a service which provides window based information about user interface 
     elements.
-
+    
     <p>
     OpenOffice.org has an amout of user interface elements that can be positioned,
     resized, closed and their style can be changed. This service provides access
@@ -53,16 +53,16 @@ module com { module sun { module star { module ui {
 
 service WindowStateConfiguration
 {
-    /** provides access to window based information about user interface elements
+    /** provides access to window based information about user interface elements 
         of all installed application modules.
 
         <p>
-        To access the window based information of a module, a unique module specifier
+        To access the window based information of a module, a unique module specifier 
         must be provided to <member scope="com::sun::star::container">XNameAccess::getByName()</member> function.
         The module specifier can be retrieved from the <type scope="com::sun::star::frame">ModuleManager</type>
         service. The interface provides references to a <type scope="com::sun:star::ui">ModuleWindowStateConfiguration</type>.
         </p>
-
+        
         @see com::sun::star::frame::ModuleManager
     */
 
diff --git a/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl b/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
index 2969f22a7f8c..ee0707c78dba 100644
--- a/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
+++ b/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -73,7 +73,7 @@ module com {  module sun {  module star {  module ui {
     (which must be available at the same implementation object too), to
     make it persistent.
     </p>
-
+    
     @see    AcceleratorConfiguration
     @see    <type scope="dom::sun::star::util">XFlushable</type>
 
@@ -84,26 +84,26 @@ interface XAcceleratorConfiguration
     //-------------------------------------------
     /** return the list of all key events, which
         are available at this configration set.
-
+        
         <p>
         The key events are the "primary keys" of this configuration sets.
         Means: Commands are registerd for key events.
         </p>
-
+        
         <p>
         Such key event can be mapped to its bound command,
-        using the method getCommandForKeyEvent().
+        using the method getCommandForKeyEvent(). 
         </p>
-
+        
         @see        getCommandForKeyEvent().
-
+        
         @return     A list of key events.
       */
     sequence< com::sun::star::awt::KeyEvent > getAllKeyEvents();
-
+    
     //-------------------------------------------
     /** return the registered command for the specified key event.
-
+    
         <p>
         This function can be used to:<br>
         <ul>
@@ -113,53 +113,53 @@ interface XAcceleratorConfiguration
                 accelerator bindings.</li>
         </ul>
         </p>
-
+        
         @param  aKeyEvent
                 the key event, where the registered command is searched for.
-
+                
         @return The registered command for the specified key event.
-
+                
         @throws ::com::sun::star::container::NoSuchElementException
                 if the key event is an invalid one or does not exists
                 inside this configuration set.
-     */
+     */        
     string getCommandByKeyEvent( [in] com::sun::star::awt::KeyEvent aKeyEvent )
         raises(com::sun::star::container::NoSuchElementException);
 
     //-------------------------------------------
     /** modify or create a key - command - binding.
-
+    
         <p>
         If the specified key event does not already exists inside this
         configuration access, it will be created and the command will be
         registered for it.
         </p>
-
+        
         <p>
         If the specified key event already exists, its command will
         be overwritten with the new command. There is no warning nor any error
         about that! The outside code has to use the method getCommandForKeyEvent()
         to check for possible collisions.
         </p>
-
+        
         <p>
         Note: This method cant be used to remove entities from the configuration set.
         Empty parameters will result into an exception!
         Use the method removeKeyEvent() instead.
         </p>
-
+        
         @see    removeKeyEvent()
-
+        
         @param  aKeyEvent
                 specify the key event, which must be updated or new created.
-
+                
         @param  sCommand
                 the new command for the specified key event.
 
         @throws ::com::sun::star::lang::IllegalArgumentException
                 if the key event isnt a valid one. Commands can be
                 checked only, if they are empty. Because every URL schema can be used
-                by commands in general, so its not possible to validate it.
+                by commands in general, so its not possible to validate it.                
      */
     void setKeyEvent( [in] com::sun::star::awt::KeyEvent aKeyEvent,
                       [in] string                        sCommand )
@@ -167,33 +167,33 @@ interface XAcceleratorConfiguration
 
     //-------------------------------------------
     /** remove a key-command-binding from this configuration set.
-
+    
         @param  aKeyEvent
                 the key event, which should be removed.
-
+                
         @throws ::com::sun::star::container::NoSuchElementException
                 if the key event does not exists inside this configuration set.
      */
     void removeKeyEvent( [in] com::sun::star::awt::KeyEvent aKeyEvent )
         raises(com::sun::star::container::NoSuchElementException);
-
+               
     //-------------------------------------------
     /** optimized access to the relation "command-key" instead
         of "key-command" which is provided normaly by this interface.
-
+        
         <p>
         It can be used to implement collision handling, if more then one
         key event match to the same command. The returned list contains all
         possible key events - and the outside code can select an possible one.
         Of course - mostly this list will contain only one key event ...
         </p>
-
+        
         @param  sCommand
                 the command, where key bindings are searched for.
-
+                
         @return A list of <type scope="com::sun::star::awt">KeyEvent</type> structures,
                 where the pecified command is registered for.
-
+                
         @throws ::com::sun::star::lang::IllegalArgumentException
                 if the specified command is empty. It cant be checked, if a command
                 is valid - because every URL schema can be used here.
@@ -205,34 +205,34 @@ interface XAcceleratorConfiguration
     sequence< com::sun::star::awt::KeyEvent > getKeyEventsByCommand( [in] string sCommand )
         raises(com::sun::star::lang::IllegalArgumentException   ,
                com::sun::star::container::NoSuchElementException);
-
+               
     //-------------------------------------------
     /** optimized function to map a list of commands to a corresponding
         list of key events.
-
+        
         <p>
         It provides a fast mapping, which is e.g. needed by a menu or toolbar implementation.
         E.g. a sub menu is described by a list of commands - and the implementation of the menu
         must show the corresponding shortcuts. Iteration over all items of this configuration
         set can be very expensive.
         </p>
-
+        
         <p>
         Instead to the method getKeyEventsForCommand() the returned list contains only
         one(!) key event bound to one(!) requested command. If more then one key event
         is bound to a command - a selection is done inside this method.
         This internal selection cant be influenced from outside.
         </p>
-
+        
         @attention  Because its not defined, that any command (e.g. configured inside a menu)
                     must have an accelerator - we cant reject the call if at least one command
                     does not occure inside this configuration set ...
                     We handle it more gracefully - and return an empty item instead of throwing
                     and exception.
-
+        
         @param  lCommandList
                 a list of commands
-
+                
         @return A (non packed!) list of key events, where every item match by index
                 directly to a command of the specified <var>CommandList</var>.
                 If a command does not exists inside this configuration set, the
@@ -249,40 +249,40 @@ interface XAcceleratorConfiguration
     //-------------------------------------------
     /** search for an key-command-binding inside this configuration set,
         where the specified command is used.
-
+        
         <p>
         If such binding could be located, the command will be removed
         from it. If as result of that the key binding will be empty,
         if will be removed too.
         </p>
-
+        
         <p>
         This is an optimized method, which can perform removing of commands
         from this configuration set. Because normaly Commands are "foreign keys"
         and key identifier the "primary keys" - it needs some work to remove
         all commands outside this container ...
         </p>
-
+        
         @param  sCommand
                 the command, which should be removed from any key binding.
-
+                
         @throws ::com::sun::star::lang::IllegalArgumentException
                 if the specified command is empty.
-
+                
         @throws ::com::sun::star::container::NoSuchElementException
                 if the specified command isnt used inside this configuration set.
      */
-    void removeCommandFromAllKeyEvents( [in] string sCommand )
+    void removeCommandFromAllKeyEvents( [in] string sCommand )        
         raises(com::sun::star::lang::IllegalArgumentException   ,
                com::sun::star::container::NoSuchElementException);
-
+               
     //-------------------------------------------
     /** specifies a persistence interface which supports to
         load/store accelerator configuration data to a storage
         and to retrieve information about the current state.
      */
     interface com::sun::star::ui::XUIConfigurationPersistence;
-
+    
     //-------------------------------------------
     /** connects this configuration to a new storage
         which must be used further on subsequent calls of
@@ -290,13 +290,13 @@ interface XAcceleratorConfiguration
         and <type scope="com::sun::star::util::">XConfigurationPersistence.store()</type>.
      */
     interface com::sun::star::ui::XUIConfigurationStorage;
-
+    
     //-------------------------------------------
     /** supports to notify other implementations about
         changes of this accelerator configuration.
      */
     interface com::sun::star::ui::XUIConfiguration;
-
+    
 }; // interface XAcceleratorConfiguration
 
 }; }; }; }; // com.sun.star
diff --git a/offapi/com/sun/star/ui/XContextMenuInterception.idl b/offapi/com/sun/star/ui/XContextMenuInterception.idl
index ab1b0416503f..7a0100b01f99 100644
--- a/offapi/com/sun/star/ui/XContextMenuInterception.idl
+++ b/offapi/com/sun/star/ui/XContextMenuInterception.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ui/XContextMenuInterceptor.idl b/offapi/com/sun/star/ui/XContextMenuInterceptor.idl
index 832197aa01b5..1a3c12c9c90b 100644
--- a/offapi/com/sun/star/ui/XContextMenuInterceptor.idl
+++ b/offapi/com/sun/star/ui/XContextMenuInterceptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl b/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
index 8e6d9a01a4ac..cc3c62713966 100644
--- a/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
+++ b/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,20 +40,20 @@
 #include <com/sun/star/awt/XWindow.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module ui {
 
-//=============================================================================
+//============================================================================= 
 
 /** this interface enables developer to implement different docking area
     acceptors which are used by the frame based layout manager.
 
     <p>
     A docking area acceptor is responsible to control the docking area of a
-    container window. As OLE for example supports inplace and outplace editing,
-    there are different parts of code responsible for the container window.
-    This interface enables developer to make support implementations for these
+    container window. As OLE for example supports inplace and outplace editing, 
+    there are different parts of code responsible for the container window. 
+    This interface enables developer to make support implementations for these 
     scenarios.
 
     @see com::sun::star::frame::XFrame
@@ -65,23 +65,23 @@ module com { module sun { module star { module ui {
 
 interface XDockingAreaAcceptor : com::sun::star::uno::XInterface
 {
-    /** provide the container window where the layout manager can request border
+    /** provide the container window where the layout manager can request border 
         space for docking windows.
-
+        
         <p>
-        Additionally the layout manager uses this window to create its own child
+        Additionally the layout manager uses this window to create its own child 
         windows for docking purposes.
         </p>
     */
     com::sun::star::awt::XWindow getContainerWindow();
-
-    /** method to ask an implementation if the provided space for docking windows
+    
+    /** method to ask an implementation if the provided space for docking windows 
         is available or not.
-
+        
         <p>
-        The <type scope="com::sun::star::awt">Rectangle</type> parameter is
-        filled by the caller with pixel data. The members of
-        <type scope="com::sun::star::awt">Rectangle</type> must be filled
+        The <type scope="com::sun::star::awt">Rectangle</type> parameter is 
+        filled by the caller with pixel data. The members of 
+        <type scope="com::sun::star::awt">Rectangle</type> must be filled 
         as following:
         <ul>
             <li>X      = requested area on left side (in pixel)</li>
@@ -96,10 +96,10 @@ interface XDockingAreaAcceptor : com::sun::star::uno::XInterface
     /** method to brief an implementation that we need new border space.
 
         <p>
-        The callee must size its document window so that we have the amount
+        The callee must size its document window so that we have the amount 
         of space we have provided. The <type scope="com::sun::star::awt">Rectangle</type>
-        parameter is filled by the caller with pixel data. The members of
-        <type scope="com::sun::star::awt">Rectangle</type> must be filled as
+        parameter is filled by the caller with pixel data. The members of 
+        <type scope="com::sun::star::awt">Rectangle</type> must be filled as 
         following:
         <ul>
             <li>X      = new area on left side (in pixel)</li>
@@ -114,6 +114,6 @@ interface XDockingAreaAcceptor : com::sun::star::uno::XInterface
 
 }; }; }; };
 
-//=============================================================================
+//============================================================================= 
 
 #endif
diff --git a/offapi/com/sun/star/ui/XImageManager.idl b/offapi/com/sun/star/ui/XImageManager.idl
index 2c5f3882fffe..fb5e622e1457 100644
--- a/offapi/com/sun/star/ui/XImageManager.idl
+++ b/offapi/com/sun/star/ui/XImageManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,34 +64,34 @@
 #include <com/sun/star/lang/IllegalAccessException.idl>
 #endif
 
-module com { module sun { module star { module ui {
+module com { module sun { module star { module ui { 
 
-/** specifies access functions to an images manager interface to add,
+/** specifies access functions to an images manager interface to add, 
     replace and remove images assocations to command URLs.
 
     <p>
-    An image manager controls a number of image sets which are specified
+    An image manager controls a number of image sets which are specified 
     by a <type>ImageType</type>.
     </p>
 */
-
+    
 interface XImageManager
 {
-    /** resets the image manager to default data.
-
+    /** resets the image manager to default data. 
+        
         <p>
         This means that all user images of the instance will be removed.
         </p>
     */
     void reset();
-
+    
     /** retrieves the list of command URLs which have images associated.
 
         @param nImageType
             specifies the image type for this operation.
-
+        
         @return
-            all command URLs within the images manager that have an image
+            all command URLs within the images manager that have an image 
             associated.
     */
     sequence< string > getAllImageNames( [in] short nImageType );
@@ -100,7 +100,7 @@ interface XImageManager
 
         @param nImageType
             specifies the image type for this operation.
-
+        
         @param ResourceURL
             a command URL that should be checked for an associated image.
 
@@ -113,16 +113,16 @@ interface XImageManager
 
         @param nImageType
             specifies the image type for this association operation.
-
+        
         @param aCommandURLSequence
             a sequence of command URLs for which the images are requested.
 
         @return
-            a sequence of graphics object which are associated with the
-            provided command URLs. If an unknown command URL is provided or
-            a command URL has no associated image a graphics object with an
-            empty image is provided. If the sequence
-            <var>aCommandURLSequence</var> contains an invalid command
+            a sequence of graphics object which are associated with the 
+            provided command URLs. If an unknown command URL is provided or 
+            a command URL has no associated image a graphics object with an 
+            empty image is provided. If the sequence 
+            <var>aCommandURLSequence</var> contains an invalid command 
             URL a <type scope="com::sun::star::lang">IllegalArgumentException</type>
             is thrown.
     */
@@ -132,20 +132,20 @@ interface XImageManager
 
         @param nImageType
             specifies the image type for this association operation.
-
+        
         @param aCommandURLSequence
             a sequence of command URLs for which images should be replaced.
 
         @param aGraphicsSequence
-            a sequence of graphic objects which should replace the old images
+            a sequence of graphic objects which should replace the old images 
             of the provided command URLs.
 
         <p>
-        If a command URL cannot be found the replace call will be omitted. If
-        <var>aCommandURLSequence</var> contains an invalid command URL a
-        <type scope="com::sun::star::lang">IllegalArgumentException</type>
-        is thrown. If the image manager is  associated with a read-only configuration
-        manager a <type scope="com::sun::star::lang">IllegalAccessException</type>
+        If a command URL cannot be found the replace call will be omitted. If 
+        <var>aCommandURLSequence</var> contains an invalid command URL a 
+        <type scope="com::sun::star::lang">IllegalArgumentException</type> 
+        is thrown. If the image manager is  associated with a read-only configuration 
+        manager a <type scope="com::sun::star::lang">IllegalAccessException</type> 
         is thrown.
         </p>
     */
@@ -155,38 +155,38 @@ interface XImageManager
 
         @param nImageType
             specifies the image type for this association operation.
-
+        
         @param aCommandURLSequence
             a sequence of command URLs for which the images should be removed.
-
+            
         <p>
-        If the <var>aCommandURLSequence</var> contains an invalid command URL a
-        <type scope="com::sun::star::lang">IllegalArgumentException</type> is
-        thrown. If  the image manager is associated with a read-only configuration
-        manager a <type scope="com::sun::star::lang">IllegalAccessException</type>
+        If the <var>aCommandURLSequence</var> contains an invalid command URL a 
+        <type scope="com::sun::star::lang">IllegalArgumentException</type> is 
+        thrown. If  the image manager is associated with a read-only configuration 
+        manager a <type scope="com::sun::star::lang">IllegalAccessException</type> 
         is thrown.
         </p>
     */
     void removeImages( [in] short nImageType, [in] sequence< string > aResourceURLSequence ) raises ( com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::IllegalAccessException );
-
+        
     /** inserts new image/command associations to a image manager.
 
         @param nImageType
             specifies the image type for this association operation.
-
+        
         @param aCommandURLSequence
             a sequence of command URLs which specify which commands get an new image.
 
         @param aGraphicSequence
-            a sequence of graphic objects which should be associated with the provided
+            a sequence of graphic objects which should be associated with the provided 
             command URLs.
 
         <p>
-        If an association is already present it is replaced. If
-        <var>aCommandURLSequence</var> contains an invalid command URL a
+        If an association is already present it is replaced. If 
+        <var>aCommandURLSequence</var> contains an invalid command URL a 
         <type scope="com::sun::star::lang">IllegalArgumentException</type>
-        is thrown. If the configuration manager is read-only a
-        <type scope="com::sun::star::lang">IllegalAccessException</type> is
+        is thrown. If the configuration manager is read-only a 
+        <type scope="com::sun::star::lang">IllegalAccessException</type> is 
         thrown.
         </p>
     */
@@ -203,44 +203,44 @@ interface XImageManager
         <p>
         An image manager implementation notifies its listener whenever an image
         set has been changed, due to insert, remove or replace operations. To
-        minimize the overhead for notifications an image manager places all
-        inserted and/or replaced images into a single notify call. A container
-        which implements <type scope="com::sun::star::container">XNameAccess</type>
-        holds the information. The access key is a command URL and provides a
-        <type scope="::com::sun::star::graphic">XGraphic</type>. This container
-        is placed into  the
+        minimize the overhead for notifications an image manager places all 
+        inserted and/or replaced images into a single notify call. A container 
+        which implements <type scope="com::sun::star::container">XNameAccess</type> 
+        holds the information. The access key is a command URL and provides a 
+        <type scope="::com::sun::star::graphic">XGraphic</type>. This container 
+        is placed into  the 
         <member scope="com::sun::star::ui">ConfigurationEvent::Element</member>.
-        The image set which has been changed is put into the
+        The image set which has been changed is put into the 
         <member scope="com::sun::star::ui">ConfigurationEvent::aInfo</member>.
         </p>
     */
     interface com::sun::star::ui::XUIConfiguration;
 
-    /** allows controlling or observing the lifetime of an imahge manager
+    /** allows controlling or observing the lifetime of an imahge manager 
         instance.
 
-    <p>The owner of the object may dispose of this object using
+    <p>The owner of the object may dispose of this object using 
     <member scope="com::sun::star::lang">XComponent::dispose()</member>.
     </p>
     */
     interface ::com::sun::star::lang::XComponent;
 
-    /** initializes an image manager instance.
-
-        An image manager instance must be initialized using
-        <member scope=com::sun::star::lang>XInitialization::initialize</member>
+    /** initializes an image manager instance. 
+    
+        An image manager instance must be initialized using 
+        <member scope=com::sun::star::lang>XInitialization::initialize</member> 
         before it can be used.<br>
         The following property must be provided if the image manager is
         related to a module:
         <ul>
-            <li><b>ModuleIdentifier</b>specifies a string property which is the
+            <li><b>ModuleIdentifier</b>specifies a string property which is the 
             unique identifier of module.
             </li>
-            <li><b>UserConfigStorage</b>specifies a
-            <type scope="com::sun::star::embed">XStorage</type> property which
+            <li><b>UserConfigStorage</b>specifies a 
+            <type scope="com::sun::star::embed">XStorage</type> property which 
             provides access to the configuration storage of the module.
             </li>
-            <li><b>UserRootCommit</b>specifies an optional
+            <li><b>UserRootCommit</b>specifies an optional 
             <type scope="com::sun::star::embed">XTransactedObject</type>
             property which makes it possible to commit a root storage.
             </li>
diff --git a/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl b/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl
index a6b6fd32ac64..2215d2f63da8 100644
--- a/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/XModuleUIConfigurationManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
index 0a6b9cfef0dc..6f23f3616e2d 100644
--- a/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,28 +36,28 @@
 #include <com/sun/star/container/NoSuchElementExceptio.idl>
 #endif
 
-module com { module sun { module star { module ui {
+module com { module sun { module star { module ui { 
 
 /** allows to retrieve user interface configuration managers related to
     OpenOffice.org modules.
 
     @since OOo 2.0.0
 */
-
+    
 interface XModuleUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterface
 {
     //----------------------------------------------------------------------
     /** returns the requested module based user interface configuration manager.
 
         @param ModuleIdentifier
-            a module identifier which identifies an OpenOffice.org module. The
-            module identifier can be retrieved from the
+            a module identifier which identifies an OpenOffice.org module. The 
+            module identifier can be retrieved from the 
             <type scope=com::sun::star::frame>ModuleManager</type> service.
 
-        @returns
-            an object implementing
-            <type scope="::com::sun::star::ui">ModuleUIConfigurationManager</type>
-            service. If the provided module identifier is unknown a
+        @returns 
+            an object implementing 
+            <type scope="::com::sun::star::ui">ModuleUIConfigurationManager</type> 
+            service. If the provided module identifier is unknown a 
             <type scope="com::sun::star::container">NoSuchElementException</type>
             is thrown.
     */
diff --git a/offapi/com/sun/star/ui/XToolPanel.idl b/offapi/com/sun/star/ui/XToolPanel.idl
index 261f4c20413d..fb10ddecea46 100644
--- a/offapi/com/sun/star/ui/XToolPanel.idl
+++ b/offapi/com/sun/star/ui/XToolPanel.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module ui {
+module com { module sun { module star { module ui { 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/XUIConfiguration.idl b/offapi/com/sun/star/ui/XUIConfiguration.idl
index d8c38e43bb70..4a2cf0cfbbb9 100644
--- a/offapi/com/sun/star/ui/XUIConfiguration.idl
+++ b/offapi/com/sun/star/ui/XUIConfiguration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,46 +32,46 @@
 #include <com/sun/star/ui/XUIConfigurationListener.idl>
 #endif
 
-module com { module sun { module star { module ui {
+module com { module sun { module star { module ui { 
 
-/** supports to notify other implementations about changes of a user
+/** supports to notify other implementations about changes of a user 
     interface configuration manager.
 
     <p>
-    The <type>XUIConfiguration</type> interface is provided for user
-    interface configuration managers which need to broadcast changes
-    within the container; that means the actions of adding, replacing
+    The <type>XUIConfiguration</type> interface is provided for user 
+    interface configuration managers which need to broadcast changes 
+    within the container; that means the actions of adding, replacing 
     and removing elements are broadcast to listeners.
     </p>
 
-    <p>This can be useful for UI to enable/disable some functions without
+    <p>This can be useful for UI to enable/disable some functions without 
     actually accessing the data.</p>
 
     @since OOo 2.0.0
 */
-
+    
 interface XUIConfiguration : ::com::sun::star::uno::XInterface
 {
-    /** adds the specified listener to receive events when elements are
+    /** adds the specified listener to receive events when elements are 
         changed, inserted or removed.
 
         <p>
-        It is suggested to allow multiple registration of the same
-        listener, thus for each time a listener is added, it has to be
+        It is suggested to allow multiple registration of the same 
+        listener, thus for each time a listener is added, it has to be 
         removed.
 
         @see XUIConfigurationListener
-        </p>
+        </p>      
     */
     void addConfigurationListener( [in] ::com::sun::star::ui::XUIConfigurationListener Listener );
 
-    /** removes the specified listener so it does not receive any events
+    /** removes the specified listener so it does not receive any events 
         from this user interface configuration manager.
 
-        <p>It is suggested to allow multiple registration of the same
-        listener, thus for each time a listener is added, it has to be
+        <p>It is suggested to allow multiple registration of the same 
+        listener, thus for each time a listener is added, it has to be 
         removed.
-
+        
         @see XUIConfigurationListener
         </p>
      */
diff --git a/offapi/com/sun/star/ui/XUIConfigurationListener.idl b/offapi/com/sun/star/ui/XUIConfigurationListener.idl
index cc8a8a14eed2..cdc2f739d792 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationListener.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,13 +36,13 @@
 #include <com/sun/star/ui/ConfigurationEvent.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
-module com { module sun { module star { module ui {
+module com { module sun { module star { module ui { 
 
-//=============================================================================
+//============================================================================= 
 
-/** supplies information about changes of a user interface
+/** supplies information about changes of a user interface 
     configuration manager.
 
     @since OOo 2.0.0
@@ -50,34 +50,34 @@ module com { module sun { module star { module ui {
 
 interface XUIConfigurationListener : com::sun::star::lang::XEventListener
 {
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a configuration has inserted an user interface element.
 
         @param Event
             provides information about the element which has been inserted.
      */
-    [oneway] void elementInserted( [in] ::com::sun::star::ui::ConfigurationEvent Event );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void elementInserted( [in] ::com::sun::star::ui::ConfigurationEvent Event ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a configuration has removed an user interface element.
-
+        
         @param Event
             provides information about the element which has been removed.
      */
-    [oneway] void elementRemoved( [in] ::com::sun::star::ui::ConfigurationEvent Event );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void elementRemoved( [in] ::com::sun::star::ui::ConfigurationEvent Event ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a configuration has replaced an user interface element.
-
+        
         @param Event
-            provides information about the element which has been
+            provides information about the element which has been 
             inserted/replaced.
      */
-    [oneway] void elementReplaced( [in] ::com::sun::star::ui::ConfigurationEvent Event );
-
+    [oneway] void elementReplaced( [in] ::com::sun::star::ui::ConfigurationEvent Event ); 
+ 
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ui/XUIConfigurationManager.idl b/offapi/com/sun/star/ui/XUIConfigurationManager.idl
index 3958441ee486..477c74412e3f 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,11 +48,11 @@
 #include <com/sun/star/ui/XUIConfigurationListener.idl>
 #endif
 
-#ifndef __com_sun_star_container_ElementExistException_idl__
+#ifndef __com_sun_star_container_ElementExistException_idl__ 
 #include <com/sun/star/container/ElementExistException.idl>
 #endif
 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
 #include <com/sun/star/container/NoSuchElementException.idl>
 #endif
 
@@ -64,51 +64,51 @@
 #include <com/sun/star/lang/IllegalAccessException.idl>
 #endif
 
-module com { module sun { module star { module ui {
+module com { module sun { module star { module ui { 
 
-/** specifies a user interface configuration manager interface which
-    controls the structure of all customizable user interface
+/** specifies a user interface configuration manager interface which 
+    controls the structure of all customizable user interface 
     elements.
-
+    
     @since OOo 2.0.0
 */
-
+    
 interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
 {
-    /** resets the configuration manager to the default user interface
-        configuration data.
+    /** resets the configuration manager to the default user interface 
+        configuration data. 
         <p>
-        This means that all user interface configuration data of the
-        instance will be removed. A module based user interface
+        This means that all user interface configuration data of the 
+        instance will be removed. A module based user interface 
         configuration manager removes user defined elements, but set all
-        other elements back to default. It is not possible to remove
-        default elements from a module user interface configuration
+        other elements back to default. It is not possible to remove 
+        default elements from a module user interface configuration 
         manager.
         </p>
     */
     void reset();
 
-    /** retrieves information about all user interface elements within
+    /** retrieves information about all user interface elements within 
         the user interface configuration manager.
 
         @param ElementType
-            makes it possible to narrow the result set to only one type
-            of user interface elements. If all user interface element
-            types should be returned
-            <value scope=com::sun::star::ui>UIElementType::UNKNOWN</value>
+            makes it possible to narrow the result set to only one type 
+            of user interface elements. If all user interface element 
+            types should be returned 
+            <value scope=com::sun::star::ui>UIElementType::UNKNOWN</value> 
             must be provided.
 
         @return
-            returns all user interface elements within the user interface
-            configuration manager that meet the given ElementType
-            specification. <p>The following
-            <type scope="com::sun::star::beans">PropertyValue</type> entries
+            returns all user interface elements within the user interface 
+            configuration manager that meet the given ElementType 
+            specification. <p>The following 
+            <type scope="com::sun::star::beans">PropertyValue</type> entries 
             are defined inside the sequence for every user interface element.
             <ul>
-                <li><b>ResourceURL<b/>specifies the unique resource URL for
+                <li><b>ResourceURL<b/>specifies the unique resource URL for 
                 the user interface element.</li>
-                <li><b>UIName<b/>specifies the user interface name for the
-                user interface element. Not all user interface elements have
+                <li><b>UIName<b/>specifies the user interface name for the 
+                user interface element. Not all user interface elements have 
                 set UIName. At least menubars do not.</li>
             </ul>
             <p>
@@ -120,19 +120,19 @@ interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
     /** creates an empty settings data container.
 
         @return
-            an empty user interface element settings data container, which
+            an empty user interface element settings data container, which 
             implements <type>UIElementSettings</type>.
     */
     ::com::sun::star::container::XIndexContainer createSettings();
 
-    /** determines if the settings of a user interface element is part the
+    /** determines if the settings of a user interface element is part the 
         user interface configuration manager.
 
         @param ResourceURL
-            a resource URL which identifies the user interface element. A
-            resourcce URL must meet the following syntax:
-            "private:resource/$type/$name. It is only allowed to use ascii
-            characters for type and name.
+            a resource URL which identifies the user interface element. A 
+            resourcce URL must meet the following syntax: 
+            "private:resource/$type/$name. It is only allowed to use ascii 
+            characters for type and name. 
 
         @return
             <TRUE/> if settings have been found, otherwise <FALSE/>.
@@ -142,23 +142,23 @@ interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
     /** retrieves the settings of a user interface element.
 
         @param ResourceURL
-            a resource URL which identifies the user interface element. A
-            resourcce URL must meet the following syntax:
-            "private:resource/$type/$name. It is only allowed to use ascii
-            characters for type and name.
+            a resource URL which identifies the user interface element. A 
+            resourcce URL must meet the following syntax: 
+            "private:resource/$type/$name. It is only allowed to use ascii 
+            characters for type and name. 
 
         @param bWriteable
-            must be <TRUE/> if the retrieved settings should be a writeable.
-            Otherwise <FALSE/> should be provided to get a shareable reference
+            must be <TRUE/> if the retrieved settings should be a writeable. 
+            Otherwise <FALSE/> should be provided to get a shareable reference 
             to the settings data.
 
         @return
-            settings data of an existing user interface element, which
-            implements <type>UIElementSettings</type>. If the settings data
-            cannot be found a
-            <type scope="com::sun::star::container">NoSuchElementException</type>
-            is thrown.  If the <member>ResourceURL</member> is not valid or
-            describes an unknown type a
+            settings data of an existing user interface element, which 
+            implements <type>UIElementSettings</type>. If the settings data 
+            cannot be found a 
+            <type scope="com::sun::star::container">NoSuchElementException</type> 
+            is thrown.  If the <member>ResourceURL</member> is not valid or 
+            describes an unknown type a 
             <type scope="com::sun::star::lang">IllegalArgumentException</type>
             is thrown.
     */
@@ -167,70 +167,70 @@ interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
     /** replaces the settings of a user interface element with new settings.
 
         @param ResourceURL
-            a resource URL which identifies the user interface element to
-            be replaced. If no element with the given resource URL exists a
-            <type scope="com::sun::star::container">NoSuchElementException</type>
+            a resource URL which identifies the user interface element to 
+            be replaced. If no element with the given resource URL exists a 
+            <type scope="com::sun::star::container">NoSuchElementException</type> 
             is thrown.
 
         @param aNewData
-            the new settings data of an existing user interface element, which
+            the new settings data of an existing user interface element, which 
             implements <type>UIElementSettings</type>.
 
         <p>
-        If the settings data cannot be found a
-        <type scope="com::sun::star::container">NoSuchElementException</type>
-        is thrown. If the <member>ResourceURL</member> is not valid or describes
-        an unknown type a
+        If the settings data cannot be found a 
+        <type scope="com::sun::star::container">NoSuchElementException</type> 
+        is thrown. If the <member>ResourceURL</member> is not valid or describes 
+        an unknown type a 
         <type scope="com::sun::star::lang">IllegalArgumentException</type>
-        is thrown. If the configuration manager is read-only a
-        <type scope="com::sun::star::lang">IllegalAccessException</type> is
+        is thrown. If the configuration manager is read-only a 
+        <type scope="com::sun::star::lang">IllegalAccessException</type> is 
         thrown.
         </p>
     */
     void replaceSettings( [in] string ResourceURL, [in] ::com::sun::star::container::XIndexAccess aNewData ) raises ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::IllegalAccessException );
 
-    /** removes the settings of an existing user interface element.
+    /** removes the settings of an existing user interface element. 
 
         @param ResourceURL
-            a resource URL which identifies the user interface element settings
-            to be removed.
-
+            a resource URL which identifies the user interface element settings 
+            to be removed. 
+            
         <p>
-        If the settings data cannot be found a
-        <type scope="com::sun::star::container">NoSuchElementException</type> is
-        thrown. If the <member>ResourceURL</member> is not valid or describes an
-        unknown type a <type scope="com::sun::star::lang">IllegalArgumentException</type>
-        is thrown. If the configuration manager is read-only a
+        If the settings data cannot be found a 
+        <type scope="com::sun::star::container">NoSuchElementException</type> is 
+        thrown. If the <member>ResourceURL</member> is not valid or describes an 
+        unknown type a <type scope="com::sun::star::lang">IllegalArgumentException</type> 
+        is thrown. If the configuration manager is read-only a 
         <type scope="com::sun::star::lang">IllegalAccessException</type> is thrown.
         </p>
     */
     void removeSettings( [in] string ResourceURL ) raises ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::IllegalAccessException );
-
+        
     /** inserts the settings of a new user interface element.
 
         @param ResourceURL
             a resource URL which identifies the new user interface element.
 
         @param aNewData
-            the settings data of the new user interface element, which implements
+            the settings data of the new user interface element, which implements 
             <type>UIElementSettings</type>.
 
         <p>
-        If the settings data is already present a
-        <type scope="com::sun::star::container">ElementExistException</type>
-        is thrown. If the <member>ResourceURL</member> is not valid or describes
+        If the settings data is already present a 
+        <type scope="com::sun::star::container">ElementExistException</type> 
+        is thrown. If the <member>ResourceURL</member> is not valid or describes 
         an unknown type a <type scope="com::sun::star::lang">IllegalArgumentException</type>
-        is thrown. If the configuration manager is read-only a
+        is thrown. If the configuration manager is read-only a 
         <type scope="com::sun::star::lang">IllegalAccessException</type> is thrown.
         </p>
     */
     void insertSettings( [in] string NewResourceURL, [in] ::com::sun::star::container::XIndexAccess aNewData ) raises ( com::sun::star::container::ElementExistException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::IllegalAccessException );
 
-    /** retrieves the image manager from the user interface configuration
+    /** retrieves the image manager from the user interface configuration 
         manager.
-
+    
         <p>
-        Every user interface configuration manager has one image manager
+        Every user interface configuration manager has one image manager 
         instance which controls all images of a module or document.
         </p>
 
@@ -239,11 +239,11 @@ interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
     */
     com::sun::star::uno::XInterface getImageManager();
 
-    /** retrieves the keyboard short cut manager from the user interface
-        configuration manager.
-
+    /** retrieves the keyboard short cut manager from the user interface 
+        configuration manager. 
+    
         <p>
-        Every user interface configuration manager has one keyboard short cut
+        Every user interface configuration manager has one keyboard short cut 
         manager instance which controls all short cuts of a module or document.
         </p>
 
@@ -252,16 +252,16 @@ interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
     */
     com::sun::star::uno::XInterface getShortCutManager();
 
-    /** retrieves the events manager from the user interface configuration manager.
-
+    /** retrieves the events manager from the user interface configuration manager. 
+    
         <p>
-        Every user interface configuration manager has one events manager
-        instance which controls the mapping of events to script URLs of a module
+        Every user interface configuration manager has one events manager 
+        instance which controls the mapping of events to script URLs of a module 
         or document.
         </p>
 
         @return
-            the events manager of the user interface configuration
+            the events manager of the user interface configuration 
             manager, if one exists.
     */
     com::sun::star::uno::XInterface getEventsManager();
diff --git a/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
index 8ffc2482d834..5d182fc85a54 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,23 +32,23 @@
 #include <com/sun/star/ui/XUIConfigurationManager.idl>
 #endif
 
-module com { module sun { module star { module ui {
+module com { module sun { module star { module ui { 
 
 /** allows to retrieve the user interface configuration manager related to
     an object.
-
+    
     @since OOo 2.0.0
 */
-
+    
 interface XUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterface
 {
     //----------------------------------------------------------------------
-    /** returns the user interface configuration manager related to the
+    /** returns the user interface configuration manager related to the 
         object.
 
-        @returns
-            an object implementing
-            <type scope="::com::sun::star::ui">UIConfigurationManager</type>
+        @returns 
+            an object implementing 
+            <type scope="::com::sun::star::ui">UIConfigurationManager</type> 
             service.
     */
     XUIConfigurationManager getUIConfigurationManager();
diff --git a/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl b/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
index 696362d0882c..ad37e9a483c5 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,10 +32,10 @@
 #include <com/sun/star/embed/XStorage.idl>
 #endif
 
-module com { module sun { module star { module ui {
+module com { module sun { module star { module ui { 
 
-/** specifies a persistence interface which supports to load/store user
-    interface configuration data to a storage and to retrieve information
+/** specifies a persistence interface which supports to load/store user 
+    interface configuration data to a storage and to retrieve information 
     about the current state.
 
     @since OOo 2.0.0
@@ -43,31 +43,31 @@ module com { module sun { module star { module ui {
 
 interface XUIConfigurationPersistence : ::com::sun::star::uno::XInterface
 {
-    /** reloads the configuration data from the storage and reinitialize
+    /** reloads the configuration data from the storage and reinitialize 
         the user interface configuration manager instance with this data.
 
         <p>
-        It is up to the implementation if it defers the first loading process
-        until the first data request using <type>XUIConfigurationManager</type>
+        It is up to the implementation if it defers the first loading process 
+        until the first data request using <type>XUIConfigurationManager</type> 
         interface.
         </p>
     */
     void reload() raises ( ::com::sun::star::uno::Exception );
-
-    /** stores the configuration data to the storage provided by
-        <member>setStorage</member> from the storage and initialize the
-        user interface configuration manager instance with the newly
-        data. This call can throw an
-        <type scope="com::sun::star::io">IOException</type> if
-        <member>store</member> cannot store its data into the internal
+    
+    /** stores the configuration data to the storage provided by 
+        <member>setStorage</member> from the storage and initialize the 
+        user interface configuration manager instance with the newly 
+        data. This call can throw an 
+        <type scope="com::sun::star::io">IOException</type> if 
+        <member>store</member> cannot store its data into the internal 
         storage.
     */
     void store() raises ( ::com::sun::star::uno::Exception );
-
-    /** stores the configuration data to the provided storage, ignoring
-        the previously set storage by <member>setStorage</member>. Can
-        be used to make copy of the current user interface configuration
-        data to another storage. This call will throw an
+        
+    /** stores the configuration data to the provided storage, ignoring 
+        the previously set storage by <member>setStorage</member>. Can 
+        be used to make copy of the current user interface configuration 
+        data to another storage. This call will throw an  
         <type scope="com::sun::star::io">IOException</type> if the provided
         storage is in read-only mode.
 
@@ -76,23 +76,23 @@ interface XUIConfigurationPersistence : ::com::sun::star::uno::XInterface
     */
     void storeToStorage( [in] ::com::sun::star::embed::XStorage Storage ) raises ( ::com::sun::star::uno::Exception );
 
-    /** provides the current modify state of the configuration manager
+    /** provides the current modify state of the configuration manager 
         instance.
 
         @return
-            <TRUE/> if the configuration manager has changed since the
-            last <member>store</member> call. <FALSE/> if the configuration
+            <TRUE/> if the configuration manager has changed since the 
+            last <member>store</member> call. <FALSE/> if the configuration 
             manager has not been changed.
     */
     boolean isModified();
 
-    /** provides the current read-only state of the user configuration
-        manager. Storing a user interface configuration to a read-only storage
-        is not possible. A read-only configuration manager instance will also
+    /** provides the current read-only state of the user configuration 
+        manager. Storing a user interface configuration to a read-only storage 
+        is not possible. A read-only configuration manager instance will also 
         not support any changes to its configuration settings.
 
         @return
-            <TRUE/> if the configuration manager storage is read-only otherwise
+            <TRUE/> if the configuration manager storage is read-only otherwise 
             <FALSE/>.
     */
     boolean isReadOnly();
diff --git a/offapi/com/sun/star/ui/XUIConfigurationStorage.idl b/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
index 2f07b995c486..ff7f369ed787 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,11 +32,11 @@
 #include <com/sun/star/embed/XStorage.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
-module com { module sun { module star { module ui {
+module com { module sun { module star { module ui { 
 
-//=============================================================================
+//============================================================================= 
 
 /** supplies functions to change or get information about the storage
     of a user interface configuration manager.
@@ -46,37 +46,37 @@ module com { module sun { module star { module ui {
 
 interface XUIConfigurationStorage : ::com::sun::star::uno::XInterface
 {
-    /** connects a storage to the user interface configuration manager
-        which is used on subsequent calls of <member>load</member> and
-        <member>store</member>.
-
+    /** connects a storage to the user interface configuration manager 
+        which is used on subsequent calls of <member>load</member> and 
+        <member>store</member>. 
+        
         @param Storage
-            all configuration data is loaded/stored from/into this storage.
-            If the storage is in read/write mode <member>load</member>
-            and <member>store</member> can be used otherwise only
+            all configuration data is loaded/stored from/into this storage. 
+            If the storage is in read/write mode <member>load</member> 
+            and <member>store</member> can be used otherwise only 
             <member>load</member> is possible.
 
         <p>
-        This call needs careful usage as data loss can occur. If the
-        implementation has modified data and a new storage is set the
+        This call needs careful usage as data loss can occur. If the 
+        implementation has modified data and a new storage is set the 
         implementation is not allowed to write back the data to the old
         storage. This must be done explicitly with <member>store</member>.
-        In general a user interface configuration manager instance is
-        created and initialize by the document model or the module user
-        interface configuration supplier. Normally there is no need to
-        set a storage for a user interface configuration manager. If a
-        copy of the configuration data to another storage should be made,
+        In general a user interface configuration manager instance is 
+        created and initialize by the document model or the module user 
+        interface configuration supplier. Normally there is no need to 
+        set a storage for a user interface configuration manager. If a 
+        copy of the configuration data to another storage should be made, 
         use <member>storeToStorage</member>.
         </p>
     */
     void setStorage( [in] ::com::sun::star::embed::XStorage Storage );
 
     /** checks if an instance has already a storage to load/store its data.
-
+        
         @return
             <TRUE/> if the instance has a storage otherwise <FALSE/>.
     */
-    boolean hasStorage();
+    boolean hasStorage();    
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ui/XUIElement.idl b/offapi/com/sun/star/ui/XUIElement.idl
index 26536a85f29f..63467eb677ca 100644
--- a/offapi/com/sun/star/ui/XUIElement.idl
+++ b/offapi/com/sun/star/ui/XUIElement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
 
@@ -40,21 +40,21 @@
 #include <com/sun/star/frame/XFrame.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module ui {
 
-//=============================================================================
+//============================================================================= 
 
 /** provides a function to retrieve a special purpose interface dependent
     on the user interface element type.
 
     <p>
-    The type of the interface depends on the real type of the user interface
-    element. A menubar user interface element provides access to its
+    The type of the interface depends on the real type of the user interface 
+    element. A menubar user interface element provides access to its 
     <type scope="com::sun::star::awt">XSystemDependentMenuBarPeer</type>
     which supports to retrieve the system dependent menu handle.
-    A floating window or a toolbar user interface element return a
+    A floating window or a toolbar user interface element return a 
     <type scope=com::sun::star::awt>XWindow</type>
     interface.
     </p>
@@ -63,18 +63,18 @@ module com { module sun { module star { module ui {
 interface XUIElement : com::sun::star::uno::XInterface
 {
     /** returns an interface to get access to user interface type specific functions.
-
+    
         @return
             a special purpose interface which depends on the type of the user
-            interface element.
+            interface element. 
     */
     ::com::sun::star::uno::XInterface getRealInterface();
 
-    /** determines the document frame to which this element is bound to.
-
-        <p>The life time of a user interface element does not explicitly depend on the
-        frame itself but on the visible component attached to the frame. It is possible
-        to exchange the visible component of a frame and that will lead to the end of
+    /** determines the document frame to which this element is bound to. 
+    
+        <p>The life time of a user interface element does not explicitly depend on the 
+        frame itself but on the visible component attached to the frame. It is possible 
+        to exchange the visible component of a frame and that will lead to the end of 
         life of all user interface elements.</p>
     */
     [readonly, attribute] ::com::sun::star::frame::XFrame Frame;
@@ -92,6 +92,6 @@ interface XUIElement : com::sun::star::uno::XInterface
 
 }; }; }; };
 
-//=============================================================================
+//============================================================================= 
 
 #endif
diff --git a/offapi/com/sun/star/ui/XUIElementFactory.idl b/offapi/com/sun/star/ui/XUIElementFactory.idl
index 7a86842508ac..4d39e73b3393 100644
--- a/offapi/com/sun/star/ui/XUIElementFactory.idl
+++ b/offapi/com/sun/star/ui/XUIElementFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,17 +44,17 @@
 #include <com/sun/star/beans/PropertyValue.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module ui {
 
-//=============================================================================
-
-/** specifies a user interface element factory that can create and initialize
-    user interface elements.
+//============================================================================= 
 
+/** specifies a user interface element factory that can create and initialize 
+    user interface elements. 
+    
     <p>
-    User interface element factories must be registered at a
+    User interface element factories must be registered at a 
     <type>UIElementFactoryManager</type> service to provide access to itself.
 
     Currently the following user interface element types are defined:
@@ -73,28 +73,28 @@ module com { module sun { module star { module ui {
 interface XUIElementFactory : ::com::sun::star::uno::XInterface
 {
     /** creates a new instances of a specific user interface element.
-
+    
         @param ResourceURL
-            specifies which unique user interface element should be created
-            by the factory. A resourcce URL must meet the following syntax:
+            specifies which unique user interface element should be created 
+            by the factory. A resourcce URL must meet the following syntax: 
             "private:resource/$type/$name. It is only allowed to use ascii
-            characters for type and name. This argument must not be empty to
-            have a working user interface element instance.The implementation
-            can throw an
-            <type scope="com::sun::star::container">NoSuchElementException</type>
-            if it doesn't know how to create the request user interface
+            characters for type and name. This argument must not be empty to 
+            have a working user interface element instance.The implementation 
+            can throw an 
+            <type scope="com::sun::star::container">NoSuchElementException</type> 
+            if it doesn't know how to create the request user interface 
             element.
 
         @param Args
-            The following arguments are supported:
+            The following arguments are supported:            
             <ul>
                 <li><b>Frame</b><br>
-                    specifies the <type scope="com::sun::star::frame">XFrame</type>
-                    instance to which the user interface element belongs to. To
-                    create a configurable user interface element the frame
-                    instance must contain a visible component. Otherwise it is
-                    not possible to determine the correct user interface
-                    configuration manager. This argument is <b>mandatory</b> to
+                    specifies the <type scope="com::sun::star::frame">XFrame</type> 
+                    instance to which the user interface element belongs to. To 
+                    create a configurable user interface element the frame 
+                    instance must contain a visible component. Otherwise it is 
+                    not possible to determine the correct user interface 
+                    configuration manager. This argument is <b>mandatory</b> to 
                     have a working configurable user interface element instance.
                 </li>
                 <li><b>ParentWindow</b><br/>
@@ -102,20 +102,20 @@ interface XUIElementFactory : ::com::sun::star::uno::XInterface
                     the UI element. Depending on the concrete UI element type, this parameter
                     might be required or ignored by an implementation.
                 </li>
-                <li><b>Persistent</b><br>specifies if changes to a configurable
-                    user interface element should be persistent. This is an
+                <li><b>Persistent</b><br>specifies if changes to a configurable 
+                    user interface element should be persistent. This is an 
                     optional argument. The default value is <TRUE/>.</li>
             </ul>
-
+        
         <p>
-        An implementation is responsible to initialize every newly created user
-        interface element if the necessary properties are provided. Especially
-        it must connect a configurable user interface element to the correct user
-        interface configuration manager. Without this connection the configurable
-        user interface element cannot retrieve its structure data and changes to
-        the user interface element structure won't be persistent. It is up to the
-        implementation to throw an
-        <type scope="com::sun::star::lang">IllegalArgumentException</type>
+        An implementation is responsible to initialize every newly created user 
+        interface element if the necessary properties are provided. Especially 
+        it must connect a configurable user interface element to the correct user 
+        interface configuration manager. Without this connection the configurable 
+        user interface element cannot retrieve its structure data and changes to 
+        the user interface element structure won't be persistent. It is up to the 
+        implementation to throw an 
+        <type scope="com::sun::star::lang">IllegalArgumentException</type> 
         if it cannot create a user interface element with the provided arguments.
 
         @see ConfigurableUIElement
diff --git a/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl b/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
index 1d945ad02609..5f2882486fbd 100644
--- a/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
+++ b/offapi/com/sun/star/ui/XUIElementFactoryRegistration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,11 +48,11 @@
 #include <com/sun/star/beans/PropertyValue.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module ui {
 
-//=============================================================================
+//============================================================================= 
 
 /** is used to query, register and deregister user interface element factories.
 
@@ -75,33 +75,33 @@ module com { module sun { module star { module ui {
         <li><b>floater</b></li>
     </ul>
     </p>
-
+    
     @since OOo 2.0.0
  */
 
 interface XUIElementFactoryRegistration : com::sun::star::uno::XInterface
 {
     /** function to retrieve a list of all registered user interface element factories
-
+        
         @returns
             a sequence of sequence of propert values which describe every registered
             user interface element factory.<br/>
-
+            
             The following properties are defined:
             <ul>
-                <li><b>Type</b>a string property that identifies the type of the user interface
+                <li><b>Type</b>a string property that identifies the type of the user interface 
                 element which this factory can create.</li>
-                <li><b>Name</b>an optional string property which identifies a single user interface
-                element within a type class which this factory can create. If this property is not
-                returned, the factory is a generic factory for all user interface elements of the
+                <li><b>Name</b>an optional string property which identifies a single user interface 
+                element within a type class which this factory can create. If this property is not 
+                returned, the factory is a generic factory for all user interface elements of the 
                 same type.</li>
-                <li><b>Module</b>an optional string property that specifies to which module this factory is
+                <li><b>Module</b>an optional string property that specifies to which module this factory is 
                 bound to. If this property is not returned, the factory is a generic factory.</li>
             </ul>
     */
     sequence< sequence< com::sun::star::beans::PropertyValue > > getRegisteredFactories();
 
-    /** function to retrieve a previously registered user interface element factory.
+    /** function to retrieve a previously registered user interface element factory. 
 
         @returns
             a reference to a registered user interface element factory if a factory has been
@@ -120,7 +120,7 @@ interface XUIElementFactoryRegistration : com::sun::star::uno::XInterface
     ::com::sun::star::ui::XUIElementFactory getFactory( [in] string ResourceURL, [in] string ModuleIdentifier );
 
     /** function to register a user interface element factory.
-
+    
         @param aType
             a string that identifies a type of a user interface element. Currently the following types
             are supported:
@@ -139,14 +139,14 @@ interface XUIElementFactoryRegistration : com::sun::star::uno::XInterface
             an optional module identifier that can be used to register a factory only for a single module. This value
             can remain empty if no special factory for a single module is needed. The module identifier can be retrieved
             from the <type scope="com::sun::star::frame">ModuleManager</type> service.
-
+        
         @param aFactoryImplementationName
             a UNO implementation name that can be used by an implementation to create a factory instance.
     */
     void registerFactory( [in] string aType, [in] string aName, [in] string aModuleIdentifier, [in] string aFactoryImplementationName ) raises (com::sun::star::container::ElementExistException);
-
+    
     /** function to remove a previously defined user interface element factory.
-
+        
         @param aType
             a string that identifies a type of a user interface element. Currently the following types
             are supported:
@@ -160,14 +160,14 @@ interface XUIElementFactoryRegistration : com::sun::star::uno::XInterface
             an optional name of a single user interface element. This name must be unique within a user
             interface element type class. This value can remain empty if no special factory for a single
             user interface element should be deregistered.
-
+        
         @param aModuleName
             an optional module name that can be used to deregister a factory only for a single module. This value
             can remain empty if not a module based factory should be deregisted. The module identifier can be retrieved
             from the <type scope="com::sun::star::frame">ModuleManager</type> service.
 
         <p>
-        <b>Using this function can be very dangerous as other implementation with OpenOffice may not be able to  create their
+        <b>Using this function can be very dangerous as other implementation with OpenOffice may not be able to  create their 
         user interface element anymore.
         </b>
         </p>
@@ -177,6 +177,6 @@ interface XUIElementFactoryRegistration : com::sun::star::uno::XInterface
 
 }; }; }; };
 
-//=============================================================================
+//============================================================================= 
 
 #endif
diff --git a/offapi/com/sun/star/ui/XUIElementSettings.idl b/offapi/com/sun/star/ui/XUIElementSettings.idl
index 082598935500..9219bd0a4c6f 100644
--- a/offapi/com/sun/star/ui/XUIElementSettings.idl
+++ b/offapi/com/sun/star/ui/XUIElementSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,41 +34,41 @@
 
 #ifndef __com_sun_star_container_XIndexAccess_idl__
 #include <com/sun/star/container/XIndexAccess.idl>
-#endif
+#endif  
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module ui {
 
-//=============================================================================
+//============================================================================= 
 
-/** provides functions to retrieve and change user interface element structure
+/** provides functions to retrieve and change user interface element structure 
     data and to update its visible representation.
-
+    
     @since OOo 2.0.0
 */
 
 interface XUIElementSettings : com::sun::star::uno::XInterface
 {
-    /** forces the user interface element to retrieve new settings from its
-        configuration source.
-
+    /** forces the user interface element to retrieve new settings from its 
+        configuration source. 
+        
         <p>
-        This is not done automatically as configurable user interface elements
-        are controlled by layout managers. It is more efficient to let the
-        responsible layout manager to control the update process in a single
+        This is not done automatically as configurable user interface elements 
+        are controlled by layout managers. It is more efficient to let the 
+        responsible layout manager to control the update process in a single 
         task.
         </p>
     */
     void updateSettings();
-
-    /** provides a <type>UIElementSettings</type> instance that provides access
-        to the structure of user interface element if the user interface element
+    
+    /** provides a <type>UIElementSettings</type> instance that provides access 
+        to the structure of user interface element if the user interface element 
         type supports it.
-
+        
         @param bWriteable
-            must be <TRUE/> if the retrieved settings should be a writeable.
-            Otherwise <FALSE/> should be provided to get a shareable reference
+            must be <TRUE/> if the retrieved settings should be a writeable. 
+            Otherwise <FALSE/> should be provided to get a shareable reference 
             to the settings data.
 
         @return
@@ -76,20 +76,20 @@ interface XUIElementSettings : com::sun::star::uno::XInterface
     */
     com::sun::star::container::XIndexAccess getSettings( [in] boolean bWriteable );
 
-    /** set changes to the structure of the user interface element.
-
+    /** set changes to the structure of the user interface element. 
+    
         @param UISettings
-            new data settings for the configurable user interface element.
-
+            new data settings for the configurable user interface element. 
+        
 
         <p>
-        User interface elements cannot be changed directly. The changed structure
-        data has to be set again. This speeds up the configuration process if many
-        changes have to be made on the structure. The persistence of changes are
+        User interface elements cannot be changed directly. The changed structure 
+        data has to be set again. This speeds up the configuration process if many 
+        changes have to be made on the structure. The persistence of changes are 
         controlled by the boolean property <member>Persistent</member>.
 
         </p>
-
+        
         @see com::sun::star::ui::UIElementSettings
     */
     void setSettings( [in] com::sun::star::container::XIndexAccess UISettings );
@@ -97,6 +97,6 @@ interface XUIElementSettings : com::sun::star::uno::XInterface
 
 }; }; }; };
 
-//=============================================================================
+//============================================================================= 
 
 #endif
diff --git a/offapi/com/sun/star/ui/XUIFunctionListener.idl b/offapi/com/sun/star/ui/XUIFunctionListener.idl
index 9325e59af751..b9f4e9cdc0e0 100644
--- a/offapi/com/sun/star/ui/XUIFunctionListener.idl
+++ b/offapi/com/sun/star/ui/XUIFunctionListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,9 +27,9 @@
 #ifndef __com_sun_star_frame_XUIFunctionListener_idl__
 #define __com_sun_star_frame_XUIFunctionListener_idl__
 
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif  
 
 //=============================================================================
 
@@ -38,7 +38,7 @@
 //=============================================================================
 /** special interface to receive notification that a user interface
     element will execute a function.
-
+    
     @since OOo 2.0.0
  */
 interface XUIFunctionListener : com::sun::star::lang::XEventListener
@@ -50,7 +50,7 @@ interface XUIFunctionListener : com::sun::star::lang::XEventListener
         @param aUIElementName
             a string which identifies the user interface element that wants
             to execute a function.
-
+        
         @param aCommand
             a string which identifies the function that has been selected by
             a user.
diff --git a/offapi/com/sun/star/ui/dialogs/CommonFilePickerElementIds.idl b/offapi/com/sun/star/ui/dialogs/CommonFilePickerElementIds.idl
index 8c2efee4f993..861acf8e6ed2 100644
--- a/offapi/com/sun/star/ui/dialogs/CommonFilePickerElementIds.idl
+++ b/offapi/com/sun/star/ui/dialogs/CommonFilePickerElementIds.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
 module com { module sun { module star { module ui { module dialogs {
 
 //=============================================================================
-/** These constants are used to specify common controls of a FilePicker dialog.
-
+/**	These constants are used to specify common controls of a FilePicker dialog.
+    
  */
 
 published constants CommonFilePickerElementIds
@@ -63,21 +63,21 @@ published constants CommonFilePickerElementIds
     /** Is used to refer to the edit line where a file or path can be entered by the user.
     */
     const short EDIT_FILEURL = 5;
-
+    
     //---------------------------------------------------------------------
     /** The label of the filter listbox of a FilePicker dialog.
 
         @since OOo 1.1.2
     */
     const short LISTBOX_FILTER_LABEL = 6;
-
+    
     //---------------------------------------------------------------------
     /** The label of the file name listbox of a FilePicker dialog.
 
         @since OOo 1.1.2
     */
     const short EDIT_FILEURL_LABEL = 7;
-};
+};	
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/ControlActions.idl b/offapi/com/sun/star/ui/dialogs/ControlActions.idl
index d3fe967311f0..36f7cc574eb2 100644
--- a/offapi/com/sun/star/ui/dialogs/ControlActions.idl
+++ b/offapi/com/sun/star/ui/dialogs/ControlActions.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 module com { module sun { module star { module ui { module dialogs {
 
 //=============================================================================
-/** Control actions for common and extended controls of a FilePicker.
+/**	Control actions for common and extended controls of a FilePicker.
 
     @see com::sun::star::ui::dialogs::XFilePickerControlAccess
     @see com::sun::star::ui::dialogs::CommonFilePickerElementIds
@@ -42,18 +42,18 @@ module com { module sun { module star { module ui { module dialogs {
 published constants ControlActions
 {
     //---------------------------------------------------------------------
-    /** Adds an item to the content of the listbox. The given item has to
+    /** Adds an item to the content of the listbox. The given item has to 
         be a string.
      */
     const short ADD_ITEM        = 1;
 
     //---------------------------------------------------------------------
-    /** Adds a sequence of strings to the content of the listbox.
+    /** Adds a sequence of strings to the content of the listbox. 
      */
-    const short ADD_ITEMS       = 2;
+    const short ADD_ITEMS	    = 2;			
 
     //---------------------------------------------------------------------
-    /** Removes an item from a listbox. The given value has to be a
+    /** Removes an item from a listbox. The given value has to be a 
         position. If the position is invalid an exception will be thrown.
         The index of the first position is 0.
         The value should be a sal_Int32.
@@ -67,7 +67,7 @@ published constants ControlActions
 
     //---------------------------------------------------------------------
     /** Selects an item in a listbox. The given value has to be a position.
-        The index of the first position is 0. A value of -1 removes the
+        The index of the first position is 0. A value of -1 removes the 
         selection.
         If the given position is invalid an exception will be thrown.
         The value should be a sal_Int32.
@@ -77,7 +77,7 @@ published constants ControlActions
     //---------------------------------------------------------------------
     /** Returns all items of the listbox as a sequence of strings.
     */
-    const short GET_ITEMS       = 6;
+    const short GET_ITEMS       = 6;				
 
     //---------------------------------------------------------------------
     /** Returns the currently selected item. The returned item is an empty
@@ -86,8 +86,8 @@ published constants ControlActions
     const short GET_SELECTED_ITEM = 7;
 
     //---------------------------------------------------------------------
-    /** Returns the zero based index of the currently selected item.
-        If the listbox is empty or there is no item selected -1 will be
+    /** Returns the zero based index of the currently selected item. 
+        If the listbox is empty or there is no item selected -1 will be 
         returned. The returned value is a sal_Int32.
      */
 
diff --git a/offapi/com/sun/star/ui/dialogs/DialogClosedEvent.idl b/offapi/com/sun/star/ui/dialogs/DialogClosedEvent.idl
index 107ec70ca2cc..87ccc292acd9 100644
--- a/offapi/com/sun/star/ui/dialogs/DialogClosedEvent.idl
+++ b/offapi/com/sun/star/ui/dialogs/DialogClosedEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ui/dialogs/ExecutableDialogException.idl b/offapi/com/sun/star/ui/dialogs/ExecutableDialogException.idl
index c509e50b7576..a7a1c4bb89bb 100644
--- a/offapi/com/sun/star/ui/dialogs/ExecutableDialogException.idl
+++ b/offapi/com/sun/star/ui/dialogs/ExecutableDialogException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ui/dialogs/ExecutableDialogResults.idl b/offapi/com/sun/star/ui/dialogs/ExecutableDialogResults.idl
index 3d8caf3a08ef..e28a20c77c4e 100644
--- a/offapi/com/sun/star/ui/dialogs/ExecutableDialogResults.idl
+++ b/offapi/com/sun/star/ui/dialogs/ExecutableDialogResults.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 module com { module sun { module star { module ui { module dialogs {
 
 //=============================================================================
-/** These constants are used to specify a result of executing a <type>XExecutableDialog</type>.
+/**	These constants are used to specify a result of executing a <type>XExecutableDialog</type>.	
 */
 
 published constants ExecutableDialogResults
@@ -46,7 +46,7 @@ published constants ExecutableDialogResults
     //-------------------------------------------------------------------------
     /** The user acknowledged the dialog.
      */
-    const short OK     = 1;
+    const short OK     = 1;	
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.idl b/offapi/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.idl
index 970d70e3c4b8..b281d1860792 100644
--- a/offapi/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.idl
+++ b/offapi/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,10 +32,10 @@
 module com { module sun { module star { module ui { module dialogs {
 
 //=============================================================================
-/** <p>These constants are used to specify extended controls of a FilePicker dialog.
-    A FilePicker service may be initialized so that it has additional controls
+/**	<p>These constants are used to specify extended controls of a FilePicker dialog.
+    A FilePicker service may be initialized so that it has additional controls 
     extending the set of common controls a FilePicker usually supports.</p>
-
+    
     @see com::sun::star::ui::dialogs::FilePicker
     @see com::sun::star::ui::dialogs::XFilePickerControlAccess
     @see com::sun::star::ui::dialogs::CommonFilePickerElementIds
@@ -44,81 +44,81 @@ module com { module sun { module star { module ui { module dialogs {
 published constants ExtendedFilePickerElementIds
 {
     //---------------------------------------------------------------------
-    /**
+    /** 
     */
     const short CHECKBOX_AUTOEXTENSION = 100;
 
     //---------------------------------------------------------------------
-    /**
+    /** 
     */
     const short CHECKBOX_PASSWORD      = 101;
 
     //---------------------------------------------------------------------
-    /**
+    /** 
     */
     const short CHECKBOX_FILTEROPTIONS = 102;
 
     //---------------------------------------------------------------------
-    /**
+    /** 
     */
     const short CHECKBOX_READONLY      = 103;
-
+        
     //---------------------------------------------------------------------
-    /**
+    /** 
     */
     const short CHECKBOX_LINK          = 104;
 
     //---------------------------------------------------------------------
-    /**
+    /** 
     */
     const short CHECKBOX_PREVIEW       = 105;
 
     //---------------------------------------------------------------------
-    /**
+    /** 
     */
     const short PUSHBUTTON_PLAY        = 106;
 
     //---------------------------------------------------------------------
-    /**
+    /** 
     */
     const short LISTBOX_VERSION        = 107;
 
     //---------------------------------------------------------------------
-    /**
+    /** 
     */
     const short LISTBOX_TEMPLATE       = 108;
 
 
     //---------------------------------------------------------------------
-    /**
+    /** 
     */
     const short LISTBOX_IMAGE_TEMPLATE = 109;
 
     //---------------------------------------------------------------------
-    /**
+    /** 
     */
     const short CHECKBOX_SELECTION     = 110;
 
     //---------------------------------------------------------------------
-    /**
+    /** 
     */
     const short LISTBOX_VERSION_LABEL  = 207;
 
     //---------------------------------------------------------------------
-    /**
+    /** 
     */
     const short LISTBOX_TEMPLATE_LABEL = 208;
 
     //---------------------------------------------------------------------
-    /**
+    /** 
     */
     const short LISTBOX_IMAGE_TEMPLATE_LABEL = 209;
 
     //---------------------------------------------------------------------
-    /**
+    /** 
     */
     const short LISTBOX_FILTER_SELECTOR = 210;
-};
+};	
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/FilePicker.idl b/offapi/com/sun/star/ui/dialogs/FilePicker.idl
index 230f289c10f4..741528d208e7 100644
--- a/offapi/com/sun/star/ui/dialogs/FilePicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/FilePicker.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@
 #include <com/sun/star/lang/XInitialization.idl>
 #endif
 
-#ifndef __com_sun_star_util_XCancellable_idl__
+#ifndef __com_sun_star_util_XCancellable_idl__ 
 #include <com/sun/star/util/XCancellable.idl>
 #endif
 
@@ -55,10 +55,10 @@ module com { module sun { module star { module ui { module dialogs {
 //=============================================================================
 
 //=============================================================================
-/** A FilePicker.
+/** A FilePicker. 
 
-    It is <strong>NOT</strong> recommended to cache a reference to a file
-    picker instance. Due to restrictions by the underlying system there can
+    It is <strong>NOT</strong> recommended to cache a reference to a file 
+    picker instance. Due to restrictions by the underlying system there can 
     be specific limitations possible. To overcome these problems it'
     s recommended to create a new instance on demand.
 
@@ -71,7 +71,7 @@ module com { module sun { module star { module ui { module dialogs {
  published interface XFilterManager;
  published interface XFilePreview;
  published interface XFilterGroupManager;
-
+    
 published service FilePicker
 {
     //-------------------------------------------------------------------------
@@ -80,7 +80,7 @@ published service FilePicker
     [optional, property] string HelpURL;
 
     //-------------------------------------------------------------------------
-    /** Provides access to the basic FilePicker functionality.
+    /** Provides access to the basic FilePicker functionality.		
     */
     interface XFilePicker;
 
@@ -90,13 +90,13 @@ published service FilePicker
     interface XFilePickerNotifier;
 
     //-------------------------------------------------------------------------
-    /** Provides the ability to add different filter, query for the current
-        filters and set a current filter
+    /** Provides the ability to add different filter, query for the current 
+        filters and set a current filter		
     */
     interface XFilterManager;
 
     //-------------------------------------------------------------------------
-    /** Provides the ability to show a preview of a selected file
+    /** Provides the ability to show a preview of a selected file		
     */
     [optional] interface XFilePreview;
 
@@ -106,8 +106,8 @@ published service FilePicker
         common controls that a FilePicker usually supports.
 
         @see com::sun::star::ui::dialogs::CommonFilePickerElementIds
-        @see com::sun::star::ui::dialogs::ExtendedFilePickerElementIds
-
+        @see com::sun::star::ui::dialogs::ExtendedFilePickerElementIds		
+        
         @deprecated
     */
     [optional] interface XFilePickerControlAccess;
@@ -119,19 +119,19 @@ published service FilePicker
 
     //-------------------------------------------------------------------------
     /** Provides the ability to choose between different custom templates that
-        do extend the subset of common controls a FilePicker usually supports.
+        do extend the subset of common controls a FilePicker usually supports. 
         Implementers may omit this interface if the FileOpen
         dialog doesn't support custom templates. In this case a createInstance
         will create an ordinary FileOpen dialog with only the common FilePicker
         elements.
-        The client has to provide one of the specified constants in
+        The client has to provide one of the specified constants in 
         TemplateDescription.
-        <br/><br/>
+        <br/><br/>	
         <p><strong>Notes for the implementation of a FileSave dialog:</strong>
-        The implementation of a FileSave dialog should automatically check
-        for existens of a file and issue a warning if a file with the same
+        The implementation of a FileSave dialog should automatically check 
+        for existens of a file and issue a warning if a file with the same 
         name already exist.</p>
-
+        
         @see com::sun::star::ui::dialogs::TemplateDescription
     */
     [optional] interface com::sun::star::lang::XInitialization;
diff --git a/offapi/com/sun/star/ui/dialogs/FilePickerEvent.idl b/offapi/com/sun/star/ui/dialogs/FilePickerEvent.idl
index d57f08a921b6..5bfa3c11541b 100644
--- a/offapi/com/sun/star/ui/dialogs/FilePickerEvent.idl
+++ b/offapi/com/sun/star/ui/dialogs/FilePickerEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,8 +44,8 @@ module com { module sun { module star { module ui { module dialogs {
 published struct FilePickerEvent: com::sun::star::lang::EventObject
 {
     //-------------------------------------------------------------------------
-    /**
-        @param ElementId
+    /**	
+        @param ElementId 
         Identifies the affected element
 
         @see com::sun::star::ui::dialogs::CommonFilePickerElementIds
diff --git a/offapi/com/sun/star/ui/dialogs/FilePreviewImageFormats.idl b/offapi/com/sun/star/ui/dialogs/FilePreviewImageFormats.idl
index 9d1b006c0e64..0b6152709b50 100644
--- a/offapi/com/sun/star/ui/dialogs/FilePreviewImageFormats.idl
+++ b/offapi/com/sun/star/ui/dialogs/FilePreviewImageFormats.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 module com { module sun { module star { module ui { module dialogs {
 
 //=============================================================================
-/** These constants are used to specify image formats supported by an implementation
+/**	These constants are used to specify image formats supported by an implementation
     of the interface <type scope="com::sun::star::ui::dialogs">XFilePreview</type>.
  */
 
@@ -44,7 +44,7 @@ published constants FilePreviewImageFormats
         The bitmap data should be provided as a sequence of sal_Int8.
     */
     const short BITMAP     = 1;
-};
+};	
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl b/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
index fc0f6c480b84..5f34ff6db93d 100644
--- a/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
+++ b/offapi/com/sun/star/ui/dialogs/FilterOptionsDialog.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@ module com { module sun { module star { module ui { module dialogs {
 
 //=============================================================================
 
-/** This service enables a filter developer to register a dialog to query
+/**	This service enables a filter developer to register a dialog to query
     for user options before the filter operation is performed.
 
     <p>The user options are stored inside the <type scope="com::sun::star::document">MediaDescriptor</type>
@@ -56,7 +56,7 @@ module com { module sun { module star { module ui { module dialogs {
     the application will retrieve the changed <type scope="com::sun::star::document">MediaDescriptor</type>
     back using the interface <type scope="com::sun::star::beans">XPropertyAccess</type>. The filter
     operation is than continued, using the new <type scope="com::sun::star::document">MediaDescriptor</type>.</p>
-
+    
     <p>Otherwise, the filter operation is canceled.</p>
 
     @since OOo 1.1.2
@@ -64,7 +64,7 @@ module com { module sun { module star { module ui { module dialogs {
 published service FilterOptionsDialog
 {
     //-------------------------------------------------------------------------
-    /** this interface is used to set the property values of the
+    /**	this interface is used to set the property values of the
         <type scope="com::sun::star::document">MediaDescriptor</type> before executing
         the dialog and to retrieve the changed <type scope="com::sun::star::document">MediaDescriptor</type>
 
@@ -73,7 +73,7 @@ published service FilterOptionsDialog
     interface com::sun::star::beans::XPropertyAccess;
 
     //-------------------------------------------------------------------------
-    /** this interface executes a dialog that displays the options
+    /**	this interface executes a dialog that displays the options
         for a filter.
         If <method>XExecutableDialog::execute<method>
         returns <code>ExecutableDialogResults::OK</code>,
diff --git a/offapi/com/sun/star/ui/dialogs/FolderPicker.idl b/offapi/com/sun/star/ui/dialogs/FolderPicker.idl
index adfad7fed497..c80e3c02fc62 100644
--- a/offapi/com/sun/star/ui/dialogs/FolderPicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/FolderPicker.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,18 +40,18 @@
 #include <com/sun/star/lang/XTypeProvider.idl>
 #endif
 
-#ifndef __com_sun_star_util_XCancellable_idl__
+#ifndef __com_sun_star_util_XCancellable_idl__ 
 #include <com/sun/star/util/XCancellable.idl>
 #endif
 
 //=============================================================================
 
 module com { module sun { module star { module ui { module dialogs {
-
+    
 //=============================================================================
 
  published interface XFolderPicker;
-
+    
 //=============================================================================
 /** A FolderPicker service.
 */
@@ -59,7 +59,7 @@ module com { module sun { module star { module ui { module dialogs {
 published service FolderPicker
 {
     //-------------------------------------------------------------------------
-    /** Provides the ability to execute a FolderPicker dialog and
+    /** Provides the ability to execute a FolderPicker dialog and 
         browse for and select folders.
     */
     interface XFolderPicker;
@@ -75,7 +75,7 @@ published service FolderPicker
     interface com::sun::star::lang::XTypeProvider;
 
     //-------------------------------------------------------------------------
-    /** For canceling a running dialog instance.
+    /** For canceling a running dialog instance. 
         <p>This may be usefull for automatic test tools for instance.</p>
     */
     [optional] interface com::sun::star::util::XCancellable;
diff --git a/offapi/com/sun/star/ui/dialogs/ListboxControlActions.idl b/offapi/com/sun/star/ui/dialogs/ListboxControlActions.idl
index 7bd5e5da0219..4bd6b7b2b7eb 100644
--- a/offapi/com/sun/star/ui/dialogs/ListboxControlActions.idl
+++ b/offapi/com/sun/star/ui/dialogs/ListboxControlActions.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,18 +40,18 @@ module com { module sun { module star { module ui { module dialogs {
 published constants ListboxControlActions
 {
     //---------------------------------------------------------------------
-    /** Adds an item to the content of the listbox. The given item has to
+    /** Adds an item to the content of the listbox. The given item has to 
         be a string.
      */
     const short ADD_ITEM        = 1;
 
     //---------------------------------------------------------------------
-    /** Adds a sequence of strings to the content of the listbox.
+    /** Adds a sequence of strings to the content of the listbox. 
      */
-    const short ADD_ITEMS       = 2;
+    const short ADD_ITEMS	    = 2;			
 
     //---------------------------------------------------------------------
-    /** Removes an item from a listbox. The given value has to be a
+    /** Removes an item from a listbox. The given value has to be a 
         position. If the position is invalid an exception will be thrown.
         The index of the first position is 0.
         The value should be a sal_Int32.
@@ -65,7 +65,7 @@ published constants ListboxControlActions
 
     //---------------------------------------------------------------------
     /** Selects an item in a listbox. The given value has to be a position.
-        The index of the first position is 0. A value of -1 removes the
+        The index of the first position is 0. A value of -1 removes the 
         selection.
         If the given position is invalid an exception will be thrown.
         The value should be a sal_Int32.
@@ -75,7 +75,7 @@ published constants ListboxControlActions
     //---------------------------------------------------------------------
     /** Returns all items of the listbox as a sequence of strings.
     */
-    const short GET_ITEMS       = 6;
+    const short GET_ITEMS       = 6;				
 
     //---------------------------------------------------------------------
     /** Returns the currently selected item. The returned item is an empty
diff --git a/offapi/com/sun/star/ui/dialogs/TemplateDescription.idl b/offapi/com/sun/star/ui/dialogs/TemplateDescription.idl
index 615fbe055b8e..69908450d74a 100644
--- a/offapi/com/sun/star/ui/dialogs/TemplateDescription.idl
+++ b/offapi/com/sun/star/ui/dialogs/TemplateDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,10 +32,10 @@
 module com { module sun { module star { module ui { module dialogs {
 
 //=============================================================================
-/** The implementation of a FilePicker service may support the usage of
-    different templates. The following constants define the currently
+/**	The implementation of a FilePicker service may support the usage of 
+    different templates. The following constants define the currently 
     specified templates.
-
+    
     @see com::sun::star::ui::dialogs::FilePicker
  */
 
@@ -50,7 +50,7 @@ published constants TemplateDescription
     /** A FileSave dialog without any additional controls.
     */
     const short FILESAVE_SIMPLE                                = 1;
-
+    
     //---------------------------------------------------------------------
     /** A FileSave dialog with additional controls.
         <ul>
@@ -124,7 +124,7 @@ published constants TemplateDescription
             <li>A window for displaying a file preview</li>
         </ul>
     */
-    const short FILEOPEN_LINK_PREVIEW                          = 9;
+    const short FILEOPEN_LINK_PREVIEW				           = 9;
 
     //---------------------------------------------------------------------
     /** A FileSave dialog with additional controls.
@@ -132,9 +132,9 @@ published constants TemplateDescription
             <li>A checkbox "Auto Extension"</li>
         </ul>
     */
-    const short FILESAVE_AUTOEXTENSION                         = 10;
+    const short FILESAVE_AUTOEXTENSION			               = 10;
 
-};
+};	
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/Wizard.idl b/offapi/com/sun/star/ui/dialogs/Wizard.idl
index 4e6b13f44ca2..b3237be3f011 100644
--- a/offapi/com/sun/star/ui/dialogs/Wizard.idl
+++ b/offapi/com/sun/star/ui/dialogs/Wizard.idl
@@ -32,7 +32,7 @@
 
 //==================================================================================================================
 
-module com { module sun { module star { module ui { module dialogs {
+module com { module sun { module star { module ui { module dialogs { 
 
 interface XWizardController;
 
@@ -68,7 +68,7 @@ service Wizard : XWizard
 
 //==================================================================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //==================================================================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/WizardButton.idl b/offapi/com/sun/star/ui/dialogs/WizardButton.idl
index 34c0d8074889..acba104e36e4 100644
--- a/offapi/com/sun/star/ui/dialogs/WizardButton.idl
+++ b/offapi/com/sun/star/ui/dialogs/WizardButton.idl
@@ -29,7 +29,7 @@
 
 //==================================================================================================================
 
-module com { module sun { module star { module ui { module dialogs {
+module com { module sun { module star { module ui { module dialogs { 
 
 //==================================================================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl b/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
index 271a006346b7..d46021266c18 100644
--- a/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
+++ b/offapi/com/sun/star/ui/dialogs/WizardTravelType.idl
@@ -47,7 +47,7 @@ constants WizardTravelType
 
 //==================================================================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //==================================================================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl b/offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl
index e844ab96b77c..c19de5ab74e4 100644
--- a/offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl
+++ b/offapi/com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ module com { module sun { module star { module ui { module dialogs {
 interface XAsynchronousExecutableDialog: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** Sets the title of the dialog.
+    /**	Sets the title of the dialog.
 
         @param aTitle
         Set an abitrary title for the dialog,
diff --git a/offapi/com/sun/star/ui/dialogs/XControlAccess.idl b/offapi/com/sun/star/ui/dialogs/XControlAccess.idl
index 6c7eeddf3972..c574da70d0a5 100644
--- a/offapi/com/sun/star/ui/dialogs/XControlAccess.idl
+++ b/offapi/com/sun/star/ui/dialogs/XControlAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,13 +41,13 @@
 module com { module sun { module star { module ui { module dialogs {
 
 //=============================================================================
-/** Generic control access interface.
+/** Generic control access interface. 
 
     <p>Use this interface to access user interface controls supported
-        by the implementing service. The supported controls, control
-        properties and the appropriate values are documented in the
+        by the implementing service. The supported controls, control 
+        properties and the appropriate values are documented in the 
         decription of the implementing service.</p>
-
+    
     @see com::sun::star::ui::dialogs::FilePicker
     @see com::sun::star::ui::dialogs::FilePicker
 
@@ -57,18 +57,18 @@ published interface XControlAccess: com::sun::star::uno::XInterface
 {
 //-------------------------------------------------------------------------
 /** Change a control property.
-
+    
     @param aControlName
         The name of the control. Common control names are for
         instance 'OkButton' or 'CancelButton'.
-
+    
     @param aControlProperty
         The control property to manipulate. Common control properties
         are for instance 'Label' or 'State'.
-
+    
     @param aValue
         A value appropriated for the property.
-
+    
     @throws com::sun::star::lang::IllegalArgumentException
         when the control is not supported, the control property is invalid or
         the value fits not the control action.
@@ -82,14 +82,14 @@ void setControlProperty( [in] string aControlName, [in] string aControlProperty,
     @param aControlName
        The name of the control. Common control names are for
         instance 'OkButton' or 'CancelButton'.
-
+       
     @param aControlProperty
         The requested control property. Common control properties
         are for instance 'Label' or 'State'.
-
-    @returns
+        
+    @returns 
         the requested value.
-
+        
     @throws com::sun::star::lang::IllegalArgumentException
         when the control is not supported or the control property is invalid.
 */
diff --git a/offapi/com/sun/star/ui/dialogs/XControlInformation.idl b/offapi/com/sun/star/ui/dialogs/XControlInformation.idl
index c632f4fa1f8b..cb6fa46393bf 100644
--- a/offapi/com/sun/star/ui/dialogs/XControlInformation.idl
+++ b/offapi/com/sun/star/ui/dialogs/XControlInformation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef __com_sun_star_ui_dialogs_XControlInformation_idl__
 #define __com_sun_star_ui_dialogs_XControlInformation_idl__
 
@@ -41,7 +41,7 @@
 module com { module sun { module star { module ui { module dialogs {
 
 //=============================================================================
-/** Interface to query for controls and control properties supported by the
+/** Interface to query for controls and control properties supported by the 
     implementing instance.
 
     @since OOo 1.1.2
@@ -51,54 +51,54 @@ published interface XControlInformation: com::sun::star::uno::XInterface
 //-------------------------------------------------------------------------
 /** Query for the supported controls of a service instance.
 
-    @returns
+    @returns 
         a sequence with the names of the supported controls.
 */
 sequence<string> getSupportedControls( );
 
 //-------------------------------------------------------------------------
 /** Returns whether the specified control is supported or not.
-
+    
     @param aControlName
         The name of the control. Common control names are for
         instance 'OkButton' or 'CancelButton'.
-
-    @returns
+    
+    @returns 
         <TRUE/> if the specified control is supported.
         <FALSE/> if the specified control is not supported.
 */
 boolean isControlSupported( [in] string aControlName );
-
+    
 //-------------------------------------------------------------------------
 /** Returns a sequence with properties supported by the specified
     control.
-
+    
     @param aControlName
         The name of the control. Common control names are for
         instance 'OkButton' or 'CancelButton'.
-
+        
     @returns
         a sequence of control properties supported by the specified control.
-
+        
     @throws com::sun::star::lang::IllegalArgumentException
         when the specified control is not supported.
 */
 sequence<string> getSupportedControlProperties( [in] string aControlName )
     raises( com::sun::star::lang::IllegalArgumentException );
-
+    
 //-------------------------------------------------------------------------
 /** Returns whether control property is supported by a control.
-
+    
     @param aControlName
        The name of the control.
-
+       
     @param aControlProperty
         The control property to query for.
-
-    @returns
+        
+    @returns 
         <TRUE/> if the specified control action is supported.
         <FALSE/> if the specified control action is not supported.
-
+        
     @throws com::sun::star::lang::IllegalArgumentException
         when the specified control is not supported.
 */
diff --git a/offapi/com/sun/star/ui/dialogs/XDialogClosedListener.idl b/offapi/com/sun/star/ui/dialogs/XDialogClosedListener.idl
index 0f03d37efea2..fcf9cf500bde 100644
--- a/offapi/com/sun/star/ui/dialogs/XDialogClosedListener.idl
+++ b/offapi/com/sun/star/ui/dialogs/XDialogClosedListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/ui/dialogs/XExecutableDialog.idl b/offapi/com/sun/star/ui/dialogs/XExecutableDialog.idl
index 556a9bf8cc0f..267eecce3ccb 100644
--- a/offapi/com/sun/star/ui/dialogs/XExecutableDialog.idl
+++ b/offapi/com/sun/star/ui/dialogs/XExecutableDialog.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,24 +43,24 @@ module com { module sun { module star { module ui { module dialogs {
 //=============================================================================
 /** Specifies an interface for an executable dialog.
 */
-
+ 
 
 published interface XExecutableDialog: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** Sets the title of the dialog.
+    /**	Sets the title of the dialog.
 
-        @param aTitle
-        Set an abitrary title for the dialog,
+        @param aTitle  
+        Set an abitrary title for the dialog, 
         may be an empty string if the dialog should not
         have a title.
     */
     void setTitle( [in] string aTitle );
 
     //-------------------------------------------------------------------------
-    /** Executes (shows) the dialog.
+    /**	Executes (shows) the dialog.
 
-        @returns
+        @returns 
         A status code of type <type>ExecutableDialogResults</type>.
     */
     short execute();
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePicker.idl b/offapi/com/sun/star/ui/dialogs/XFilePicker.idl
index d35683f71fc3..9d7b3639006d 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePicker.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,27 +46,27 @@ module com { module sun { module star { module ui { module dialogs {
 //=============================================================================
 /** Specifies an interface for a FilePicker
 */
-
+ 
 published interface XFilePicker: com::sun::star::ui::dialogs::XExecutableDialog
 {
 
     //-------------------------------------------------------------------------
-    /** Enable/disable multiselection mode
+    /**	Enable/disable multiselection mode 
 
-        <p>If the multiselection mode is enabled, multiple files
+        <p>If the multiselection mode is enabled, multiple files 
         may be selected by the user else only one file selection at a time is possible</p>
-
-        @param bMode
+    
+        @param bMode 
         <p>A value of <TRUE/> enables the multiselection mode.</p>
         <p>A value of <FALSE/> disables the multiselection mode, this is the default.</p>
     */
     void setMultiSelectionMode( [in] boolean bMode );
 
     //-------------------------------------------------------------------------
-    /** Sets the default string that appears in the file name box of a FilePicker.
+    /**	Sets the default string that appears in the file name box of a FilePicker.
 
         @param aName
-        <p> Specifies the default file name, displayed when the FilePicker
+        <p>	Specifies the default file name, displayed when the FilePicker 
             is shown. The implementation may accept any string, and does not
             have to check for a valid file name or if the file really exists.
         </p>
@@ -74,61 +74,61 @@ published interface XFilePicker: com::sun::star::ui::dialogs::XExecutableDialog
     void setDefaultName( [in] string aName );
 
     //-------------------------------------------------------------------------
-    /** Sets the directory that the file dialog initially displays.
+    /**	Sets the directory that the file dialog initially displays.
 
         @param aDirectory
         Specifies the initial directory in URL format. The given URL must be
-        conform to <a href="http://www.w3.org/Addressing/rfc1738.txt">Rfc1738</a>).
-
+        conform to <a href="http://www.w3.org/Addressing/rfc1738.txt">Rfc1738</a>). 
+            
         @throws com::sun::star::lang::IllegalArgumentException
-        if the URL is invalid (doesn't conform to <a href="http://www.w3.org/Addressing/rfc1738.txt">Rfc1738</a>).
+        if the URL is invalid (doesn't conform to <a href="http://www.w3.org/Addressing/rfc1738.txt">Rfc1738</a>).		
     */
     void setDisplayDirectory( [in] string aDirectory )
         raises( ::com::sun::star::lang::IllegalArgumentException );
 
     //-------------------------------------------------------------------------
-    /** Returns the directory that the file dialog is currently showing or
-        was last showing before closing the dialog with Ok. If the user
-        did cancel the dialog, the returned value is undefined.
+    /**	Returns the directory that the file dialog is currently showing or 
+        was last showing before closing the dialog with Ok. If the user 
+        did cancel the dialog, the returned value is undefined. 
 
-        @returns
-        The directory in URL format, must be conform to <a href="http://www.w3.org/Addressing/rfc1738.txt">Rfc1738</a>.
+        @returns 
+        The directory in URL format, must be conform to <a href="http://www.w3.org/Addressing/rfc1738.txt">Rfc1738</a>.		
      */
     string getDisplayDirectory();
 
     //-------------------------------------------------------------------------
-    /** Returns a sequence of the selected files including path information in
+    /**	Returns a sequence of the selected files including path information in
         URL format, conform to <a href="http://www.w3.org/Addressing/rfc1738.txt">Rfc1738</a>.
 
-        <p>If the user closed the dialog with cancel an empty sequence will be
+        <p>If the user closed the dialog with cancel an empty sequence will be 
         returned.</p>
         <br/>
-        <p>If the dialog is in execution mode and a single file is selected
+        <p>If the dialog is in execution mode and a single file is selected 
         the complete URL of this file will be returned.</p>
-        <p>If the dialog is in execution mode and multiple files are selected
+        <p>If the dialog is in execution mode and multiple files are selected 
         an empty sequence will be returned.</p>
         <p>If the dialog is in execution mode and the selected file name is false
         or any other error occurs an empty sequence will be returned.</p>
 
-        @returns
-        <p> The complete path of the file or directory currently selected
+        @returns 
+        <p>	The complete path of the file or directory currently selected
             in URL format. There are two different cases:
             <ol>
-                <li>Multiselection is disabled:
-                The first and only entry of the sequence contains the complete
+                <li>Multiselection is disabled: 
+                The first and only entry of the sequence contains the complete 
                 path/filename in URL format.</li>
 
-                <li>Multiselection is enabled:
+                <li>Multiselection is enabled:  
                 If only one file is selected, the first entry
-                of the sequence contains the complete path/filename in URL format.
-                If multiple files are selected, the first entry of the sequence contains
-                the path in URL format, and the other entries contains the names of the selected
+                of the sequence contains the complete path/filename in URL format. 
+                If multiple files are selected, the first entry of the sequence contains 
+                the path in URL format, and the other entries contains the names of the selected 
                 files without path information.</li>
             </ol>
-
+            
             <br/>
 
-            <p><strong>Notes for the implementation of a FileSave dialog:</strong>If there exists
+            <p><strong>Notes for the implementation of a FileSave dialog:</strong>If there exists 
             a checkbox "Automatic File Extension" which is checked and a valid filter is currently selected
             the dialog may automatically add an extension to the selected file name.</p>
         </p>
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl b/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl
index b80c198a5fa4..bac615f46406 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePicker2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ module com { module sun { module star { module ui { module dialogs {
 interface XFilePicker2 : ::com::sun::star::ui::dialogs::XFilePicker
 {
     //-------------------------------------------------------------------------
-    /** Returns a sequence of the selected files including path information in
+    /**	Returns a sequence of the selected files including path information in
         URL format, conform to <a href="http://www.w3.org/Addressing/rfc1738.txt">Rfc1738</a>.
 
         <p>If the user closed the dialog with cancel an empty sequence will be returned.</p>
@@ -56,11 +56,11 @@ interface XFilePicker2 : ::com::sun::star::ui::dialogs::XFilePicker
         full qualified URL's for every selected file.
         </p>
 
-        @returns
+        @returns 
         <p>A list of all selected file as complete URL's.</p>
         <br/>
 
-        <p><strong>Notes for the implementation of a FileSave dialog:</strong>If there exists
+        <p><strong>Notes for the implementation of a FileSave dialog:</strong>If there exists 
         a checkbox "Automatic File Extension" which is checked and a valid filter is currently selected
         the dialog may automatically add an extension to the selected file name(s).</p>
     */
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess.idl b/offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess.idl
index 1c57cce3243d..986c1e4ae28b 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePickerControlAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,7 +49,7 @@ published interface XFilePickerControlAccess: com::sun::star::ui::dialogs::XFile
 {
 
 //-------------------------------------------------------------------------
-/** Set the value of an additional element within a FilePicker.
+/** Set the value of an additional element within a FilePicker. 
 
     @param ControlId
     Identifies the element which value is to be set.
@@ -58,24 +58,24 @@ published interface XFilePickerControlAccess: com::sun::star::ui::dialogs::XFile
         Specifies an action to perform with the given value.
         aControlAction has to be one of the values defined in <type>ControlActions</type>.
         Not all of the values are valid for all controls.
-        To add a new filter to the FilePicker use the interface XFilterManager, but
+        To add a new filter to the FilePicker use the interface XFilterManager, but 
         optionally an implementation may also support adding new filter using this
         method.
-
-    @param aValue
+        
+    @param aValue 
     The value to set. For checkboxes aValue should be a boolean value that
     should be <TRUE/> if the checkbox should be checked and <FALSE/> otherwise.
-
+    
     @see com::sun::star::ui::dialogs::CommonFilePickerElementIds
     @see com::sun::star::ui::dialogs::ExtendedFilePickerElementIds
     @see com::sun::star::ui::dialogs::ControlActions
 */
-void setValue( [in] short aControlId, [in] short aControlAction, [in] any aValue );
+void setValue( [in] short aControlId, [in] short aControlAction, [in] any aValue );	
 
 //-------------------------------------------------------------------------
 /** Get the value of an additional element within a FilePicker
-
-    @param aControlId
+    
+    @param aControlId 
     Identifies the element for which value is requested.
 
     @param aControlAction
@@ -83,7 +83,7 @@ void setValue( [in] short aControlId, [in] short aControlAction, [in] any aValue
     aControlAction has to be one of the values defined in <type>ControlActions</type>.
     Not all of the values are valid for all controls.
 
-    @returns
+    @returns 
     The value of the specified element. If the specified control
     is a checkbox the returned value is a boolean that is <TRUE/>
     if the checkbox is checked <FALSE/> otherwise.
@@ -94,12 +94,12 @@ void setValue( [in] short aControlId, [in] short aControlAction, [in] any aValue
     @see com::sun::star::ui::dialogs::CommonFilePickerElementIds
     @see com::sun::star::ui::dialogs::ExtendedFilePickerElementIds
     @see com::sun::star::ui::dialogs::ControlActions
-*/
-any getValue( [in] short aControlId, [in] short aControlAction );
+*/	
+any getValue( [in] short aControlId, [in] short aControlAction );	
 
 //-------------------------------------------------------------------------
 /** Set the label of the specified element. If the specified element
-    doesn't support setting a label, this method has no effect.
+    doesn't support setting a label, this method has no effect.		
 
     @param aControlId
     Identifies the element for which the label should be set.
@@ -113,12 +113,12 @@ any getValue( [in] short aControlId, [in] short aControlAction );
 void setLabel( [in] short aControlId, [in] string aLabel );
 
 //-------------------------------------------------------------------------
-/** Returns the label of the specified element.
-
+/** Returns the label of the specified element. 
+    
     @param aControlId
     Identifies the element for which the label should be returned.
 
-    @returns
+    @returns 
     The label of the specified element or an empty string if
     the specified element has no or supports no label or the
     specified element doesn't exist.
@@ -131,7 +131,7 @@ string getLabel( [in] short aControlId );
 //-------------------------------------------------------------------------
 /** Enables or disables a control.
 
-    @param ControlId
+    @param ControlId 
     Identifies the control.
 
     @param bEnable
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePickerListener.idl b/offapi/com/sun/star/ui/dialogs/XFilePickerListener.idl
index cacdcd1afde5..915c6224dbcb 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePickerListener.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePickerListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ module com { module sun { module star { module ui { module dialogs {
 published interface XFilePickerListener: com::sun::star::lang::XEventListener
 {
     //-------------------------------------------------------------------------
-    /** A client receives this event if the file selection within the
+    /** A client receives this event if the file selection within the 
         FilePicker service dialog changes.
 
         @param aEvent
@@ -65,7 +65,7 @@ published interface XFilePickerListener: com::sun::star::lang::XEventListener
 
 
     //-------------------------------------------------------------------------
-    /** A client receives this event if the directory selection within the
+    /** A client receives this event if the directory selection within the 
         FilePicker dialog changes.
 
         @param aEvent
@@ -82,19 +82,19 @@ published interface XFilePickerListener: com::sun::star::lang::XEventListener
         @param aEvent
         of type <type>FilePickerEvent</type> that describes the event
 
-        @returns
+        @returns 
         A help string which the FilePicker dialog should use to display
         a help for a specific control. If the returned string is empty it is
         undefined how the FilePicker implementation will behave.
         It may show a message 'no help available' or may show no
-        help at all.
+        help at all. 
 
         @see com::sun::star::ui::dialogs::FilePickerEvent
     */
     string helpRequested( [in] FilePickerEvent aEvent );
 
     //-------------------------------------------------------------------------
-    /** A client receives this event if the state of a control within the
+    /** A client receives this event if the state of a control within the 
         FilePicker service dialog changes.
 
         @param aEvent
@@ -107,7 +107,7 @@ published interface XFilePickerListener: com::sun::star::lang::XEventListener
     //-------------------------------------------------------------------------
     /** A client receives this event if the size of the FilePicker dialog
         has changed. If the FilePicker dialog contains a preview the client
-        may ask for the new dimension of the preview area.
+        may ask for the new dimension of the preview area. 
     */
     void dialogSizeChanged( );
 };
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePickerNotifier.idl b/offapi/com/sun/star/ui/dialogs/XFilePickerNotifier.idl
index 862e92b7084d..658a24aa6622 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePickerNotifier.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePickerNotifier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ published interface XFilePickerNotifier: com::sun::star::uno::XInterface
         @param xListener
         The <type>XFilePickerListener</type> interface of the listener that
         wants to receive events of type <type>FilePickerEvent</type>.
-        <p>Invalid interfaces or NULL values will be ignored.</p>
+        <p>Invalid interfaces or NULL values will be ignored.</p>		
     */
     [oneway] void addFilePickerListener( [in] XFilePickerListener xListener );
 
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePreview.idl b/offapi/com/sun/star/ui/dialogs/XFilePreview.idl
index 935b1528db1e..a2ea68707bb6 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePreview.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePreview.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,16 +54,16 @@ published interface XFilePreview: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /** The method returns all image formats that the preview supports.
 
-        @returns
+        @returns 
         A sequence of all supported preview formats
-
+        
         @see com::sun::star::ui::dialogs::FilePreviewImageFormats
-    */
+    */		
     sequence< short > getSupportedImageFormats( );
 
     //-------------------------------------------------------------------------
     /** The method returns the supported color depth of the target device.
-
+        
         @returns
         The color depth in bit, e.g. 8 bit, 16 bit, 32 bit.
     */
@@ -87,17 +87,17 @@ published interface XFilePreview: com::sun::star::uno::XInterface
         0 will be returned.
 
         @returns
-        The heigth of the preview window in pixel.
+        The heigth of the preview window in pixel.	 
     */
     long getAvailableHeight( );
 
     //-------------------------------------------------------------------------
-    /** Sets a new image. If the preview is currently hidden the
+    /** Sets a new image. If the preview is currently hidden the 
         image will be ignored. An empty any will clear the preview window.
 
         @param aImageFormat
         Specifies the format of the data that will be delivered
-
+        
         @param aImage
         The image data, the image format defines how
         the image data have to be delivered
@@ -106,7 +106,7 @@ published interface XFilePreview: com::sun::star::uno::XInterface
         If the specified image format is invalid or not
         supported by the preview implementation
 
-        @see com::sun::star::ui::dialogs::FilePreviewImageFormats
+        @see com::sun::star::ui::dialogs::FilePreviewImageFormats 			
     */
     void setImage( [in] short aImageFormat, [in] any aImage )
         raises( ::com::sun::star::lang::IllegalArgumentException );
diff --git a/offapi/com/sun/star/ui/dialogs/XFilterGroupManager.idl b/offapi/com/sun/star/ui/dialogs/XFilterGroupManager.idl
index 75e5b6458f3d..5e0992cb7f9b 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilterGroupManager.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilterGroupManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,10 +37,10 @@
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 
-module com {  module sun {  module star {  module ui { module dialogs {
+module com {  module sun {  module star {  module ui { module dialogs { 
 
 //=============================================================================
-/** Specifies an interface which allows manipulation of groups of filters
+/** Specifies an interface which allows manipulation of groups of filters 
     for the <type>FilePicker</type> service.
 */
 published interface XFilterGroupManager : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/ui/dialogs/XFilterManager.idl b/offapi/com/sun/star/ui/dialogs/XFilterManager.idl
index 8e418b7519f0..8fa927ebfd24 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilterManager.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilterManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,12 +43,12 @@ module com { module sun { module star { module ui { module dialogs {
 //=============================================================================
 /** Specifies a filter manager interface for a FilePicker
 */
-
+ 
 published interface XFilterManager: com::sun::star::uno::XInterface
 {
 
     //-------------------------------------------------------------------------
-    /** Adds a filter identified by a title.
+    /**	Adds a filter identified by a title. 
 
         @param aTitle
         Specifies the name of the filter as shown in the filter box of the
@@ -61,13 +61,13 @@ published interface XFilterManager: com::sun::star::uno::XInterface
 
         @throws ::com::sun::star::lang::IllegalArgumentException
         If a filter with the specified title already exists.
-
+            
     */
     void appendFilter( [in] string aTitle, [in] string aFilter )
         raises( ::com::sun::star::lang::IllegalArgumentException );
 
     //-------------------------------------------------------------------------
-    /** Sets the current filter.
+    /**	Sets the current filter.
 
         @param aTitle
         Specifies the name of the filter to be set.
@@ -79,9 +79,9 @@ published interface XFilterManager: com::sun::star::uno::XInterface
         raises( ::com::sun::star::lang::IllegalArgumentException );
 
     //-------------------------------------------------------------------------
-    /** Returns the currently selected filter.
+    /**	Returns the currently selected filter.
 
-        @returns
+        @returns 
         The name of the selected filter or an empty string if
         there is no filter or no filter is currently selected.
     */
diff --git a/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl b/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl
index 2265ecab2346..75e63d7180de 100644
--- a/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFolderPicker.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,36 +46,36 @@ module com { module sun { module star { module ui { module dialogs {
 //=============================================================================
 /** Specifies a FolderPicker interface.
 */
-
+ 
 published interface XFolderPicker: com::sun::star::ui::dialogs::XExecutableDialog
 {
     //-------------------------------------------------------------------------
-    /** Sets the root directory that the FolderPicker should display.
-        It is not specified which root directory the FolderPicker
+    /**	Sets the root directory that the FolderPicker should display.
+        It is not specified which root directory the FolderPicker 
         chooses if the specified root directory doesn't exist.
-
+        
         @param aDirectory
-        Specifies the root directory in url format, conform to <a href="http://www.w3.org/Addressing/rfc1738.txt">Rfc1738</a>.
-
-        @throws com::sun::star::lang::IllegalArgumentException
+        Specifies the root directory in url format, conform to <a href="http://www.w3.org/Addressing/rfc1738.txt">Rfc1738</a>. 
+        
+        @throws	com::sun::star::lang::IllegalArgumentException
         if the given url is invalid.
     */
     void setDisplayDirectory( [in] string aDirectory )
         raises( ::com::sun::star::lang::IllegalArgumentException );
 
     //-------------------------------------------------------------------------
-    /** Returns the root directory that the FolderPicker is showing. The
-        return value is undefined if the client did not choose a root directory
+    /**	Returns the root directory that the FolderPicker is showing. The 
+        return value is undefined if the client did not choose a root directory 
         or the previously specified root directory doesn't exist.
 
-        @returns
+        @returns 
         The directory in url format.
      */
     string getDisplayDirectory();
 
     //-------------------------------------------------------------------------
     /** Returns the selected directory as url conform to <a href="http://www.w3.org/Addressing/rfc1738.txt">Rfc1738</a>.
-
+        
         @returns
         The selected directory as url if the user did close the dialog with ok
         else the returned value is undefined.
@@ -83,9 +83,9 @@ published interface XFolderPicker: com::sun::star::ui::dialogs::XExecutableDialo
     string getDirectory( );
 
     //-------------------------------------------------------------------------
-    /** The implementation may optionally show the given text as a description
-        for the user within the dialog, e.g. "Please select a directory".
-        If the client doesn't set a description the dialog may show a default
+    /** The implementation may optionally show the given text as a description 
+        for the user within the dialog, e.g. "Please select a directory". 
+        If the client doesn't set a description the dialog may show a default 
         description.
     */
     void setDescription( [in] string aDescription );
diff --git a/offapi/com/sun/star/ui/dialogs/XWizardController.idl b/offapi/com/sun/star/ui/dialogs/XWizardController.idl
index 6a51a67360fe..52a24542261e 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizardController.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizardController.idl
@@ -78,7 +78,7 @@ interface XWizardController
 
 //==================================================================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //==================================================================================================================
 
diff --git a/offapi/com/sun/star/ui/dialogs/XWizardPage.idl b/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
index 149f8c14709b..4eef97d00915 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
@@ -79,7 +79,7 @@ interface XWizardPage : ::com::sun::star::lang::XComponent
 
 //==================================================================================================================
 
-}; }; }; }; };
+}; }; }; }; }; 
 
 //==================================================================================================================
 
diff --git a/offapi/com/sun/star/util/AliasProgrammaticPair.idl b/offapi/com/sun/star/util/AliasProgrammaticPair.idl
index 6ceaa1f29ee2..647c982e5b12 100644
--- a/offapi/com/sun/star/util/AliasProgrammaticPair.idl
+++ b/offapi/com/sun/star/util/AliasProgrammaticPair.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_AliasProgrammaticPair_idl__
-#define __com_sun_star_util_AliasProgrammaticPair_idl__
-
-//=============================================================================
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
-/** represents an entry from a component which implements the
+#ifndef __com_sun_star_util_AliasProgrammaticPair_idl__ 
+#define __com_sun_star_util_AliasProgrammaticPair_idl__ 
+ 
+//============================================================================= 
+module com {  module sun {  module star {  module util { 
+ 
+//============================================================================= 
+ 
+/** represents an entry from a component which implements the 
     <type>XLocalizedAliases</type>.
  */
 published struct AliasProgrammaticPair
 {
     /** determines the name which is registered as an alias for a programmatic name.
      */
-    string Alias;
-    //-------------------------------------------------------------------------
-
-    /** determines which programmatic name belongs to the alias.
-
+    string Alias; 
+    //------------------------------------------------------------------------- 
+     
+    /** determines which programmatic name belongs to the alias. 
+    
         @see com::sun::star::util::XLocalizedAliases
      */
-    string ProgrammaticName;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string ProgrammaticName; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/AtomClassRequest.idl b/offapi/com/sun/star/util/AtomClassRequest.idl
index 9135ed26ddf4..3c59fbec9c13 100644
--- a/offapi/com/sun/star/util/AtomClassRequest.idl
+++ b/offapi/com/sun/star/util/AtomClassRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,11 +45,11 @@ published struct AtomClassRequest
     /** the class of the atoms described in member
         <member>AtomClassRequest::atoms</member>.
      */
-    long                atomClass;
+    long				atomClass;
 
     /** the atoms requested from class <member>AtomClassRequest::atomClass</member>.
     */
-    sequence< long >    atoms;
+    sequence< long >	atoms;
 };
 
 }; // module util
diff --git a/offapi/com/sun/star/util/AtomDescription.idl b/offapi/com/sun/star/util/AtomDescription.idl
index 5c8878f95139..cfe54db98519 100644
--- a/offapi/com/sun/star/util/AtomDescription.idl
+++ b/offapi/com/sun/star/util/AtomDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,11 +44,11 @@ published struct AtomDescription
 {
     /** the atom itself
      */
-    long        atom;
+    long		atom;
 
     /** the string it stands for
      */
-    string      description;
+    string		description;
 };
 
 }; // module util
diff --git a/offapi/com/sun/star/util/CellProtection.idl b/offapi/com/sun/star/util/CellProtection.idl
index 1f0775717195..2e05d2055c87 100644
--- a/offapi/com/sun/star/util/CellProtection.idl
+++ b/offapi/com/sun/star/util/CellProtection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_CellProtection_idl__
-#define __com_sun_star_util_CellProtection_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_CellProtection_idl__ 
+#define __com_sun_star_util_CellProtection_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** describes the kind of protection for a protectable cell.
  */
 published struct CellProtection
 {
     /** specifies if the cell is locked from modifications by the user.
      */
-    boolean IsLocked;
-
-    //-------------------------------------------------------------------------
+    boolean IsLocked; 
+ 
+    //------------------------------------------------------------------------- 
     /** specifies if the formula is hidden from the user.
      */
-    boolean IsFormulaHidden;
-
-    //-------------------------------------------------------------------------
+    boolean IsFormulaHidden; 
+ 
+    //------------------------------------------------------------------------- 
     /** specifies if the cell is hidden from the user.
      */
-    boolean IsHidden;
-
-    //-------------------------------------------------------------------------
+    boolean IsHidden; 
+ 
+    //------------------------------------------------------------------------- 
     /** specifies if the cell is hidden on printouts.
      */
-    boolean IsPrintHidden;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean IsPrintHidden; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/ChangesEvent.idl b/offapi/com/sun/star/util/ChangesEvent.idl
index e17893d52115..08fff08fe0bd 100644
--- a/offapi/com/sun/star/util/ChangesEvent.idl
+++ b/offapi/com/sun/star/util/ChangesEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_ChangesEvent_idl__
-#define __com_sun_star_util_ChangesEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_util_ElementChange_idl__
-#include <com/sun/star/util/ElementChange.idl>
-#endif
-
-#ifndef __com_sun_star_util_ChangesSet_idl__
-#include <com/sun/star/util/ChangesSet.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_ChangesEvent_idl__ 
+#define __com_sun_star_util_ChangesEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_ElementChange_idl__ 
+#include <com/sun/star/util/ElementChange.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_ChangesSet_idl__ 
+#include <com/sun/star/util/ChangesSet.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** This event is fired when a set of changes becomes effective on the source of the event.
 
-    @see XChangesSet
-    @see XChangesBatch
-    @see XChangesListener
-    @see XChangesNotifier
-    @see com::sun::star::container::ContainerEvent
+    @see XChangesSet 
+    @see XChangesBatch 
+    @see XChangesListener 
+    @see XChangesNotifier 
+    @see com::sun::star::container::ContainerEvent 
     @see ElementChange
  */
 published struct ChangesEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** contains the accessor to the common root of the changed elements.
-
+        
         <p>Type and value of the accessor depend on the service.</p>
      */
-    any Base;
-
-    //-------------------------------------------------------------------------
+    any Base; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the changes which occurred.
      */
-    ChangesSet Changes;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    ChangesSet Changes; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/ChangesSet.idl b/offapi/com/sun/star/util/ChangesSet.idl
index 439ff2e31861..9d3e72332c8b 100644
--- a/offapi/com/sun/star/util/ChangesSet.idl
+++ b/offapi/com/sun/star/util/ChangesSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,11 +39,11 @@
 
 //=============================================================================
 
-module com { module sun { module star { module util {
+module com { module sun { module star { module util { 
 
 //=============================================================================
 /** describes a set of changes occurring as a batch transaction.
-
+    
     @see XChangesBatch
     @see XChangesSet
     @see ChangesEvent
@@ -56,6 +56,6 @@ published typedef sequence<ElementChange> ChangesSet;
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/util/CloseVetoException.idl b/offapi/com/sun/star/util/CloseVetoException.idl
index 49608f76b0be..f469093114a6 100644
--- a/offapi/com/sun/star/util/CloseVetoException.idl
+++ b/offapi/com/sun/star/util/CloseVetoException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/Color.idl b/offapi/com/sun/star/util/Color.idl
index 572324a10715..f3ad40759c6b 100644
--- a/offapi/com/sun/star/util/Color.idl
+++ b/offapi/com/sun/star/util/Color.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,11 +30,11 @@
 
 //=============================================================================
 
-module com { module sun { module star { module util {
+module com { module sun { module star { module util { 
 
 //=============================================================================
 /** describes an RGB color value with an optional alpha channel.
-
+    
     <p>The byte order is from high to low:
     <ol>alpha channel
     <li>red</li>
@@ -46,7 +46,7 @@ published typedef long Color;
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/offapi/com/sun/star/util/DataEditorEvent.idl b/offapi/com/sun/star/util/DataEditorEvent.idl
index 0d5b34cc00ae..bcfb2c12e591 100644
--- a/offapi/com/sun/star/util/DataEditorEvent.idl
+++ b/offapi/com/sun/star/util/DataEditorEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_DataEditorEvent_idl__
-#define __com_sun_star_util_DataEditorEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_util_DataEditorEventType_idl__
-#include <com/sun/star/util/DataEditorEventType.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
+#ifndef __com_sun_star_util_DataEditorEvent_idl__ 
+#define __com_sun_star_util_DataEditorEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_DataEditorEventType_idl__ 
+#include <com/sun/star/util/DataEditorEventType.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
 /** specifies an event broadcasted by an <type>XDataEditor</type>.
  */
 published struct DataEditorEvent: com::sun::star::lang::EventObject
-{
+{ 
     /** specifies the type of the event.
      */
-    DataEditorEventType Type;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    DataEditorEventType Type; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/DataEditorEventType.idl b/offapi/com/sun/star/util/DataEditorEventType.idl
index d7c036b52c57..8bb2e202fd37 100644
--- a/offapi/com/sun/star/util/DataEditorEventType.idl
+++ b/offapi/com/sun/star/util/DataEditorEventType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_DataEditorEventType_idl__
-#define __com_sun_star_util_DataEditorEventType_idl__
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
+#ifndef __com_sun_star_util_DataEditorEventType_idl__ 
+#define __com_sun_star_util_DataEditorEventType_idl__ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
 /** specifies the type of an event from an <type>XDataEditor</type>.
  */
 published enum DataEditorEventType
-{
+{ 
     /** specifies that the data editing is done (data stored).
      */
-    DONE,
-
+    DONE, 
+    
     /** specifies that the data editing was cancelled by the user (data not stored).
      */
-    CANCELED
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    CANCELED 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/Date.idl b/offapi/com/sun/star/util/Date.idl
index 0835662faa1d..7065cb1594db 100644
--- a/offapi/com/sun/star/util/Date.idl
+++ b/offapi/com/sun/star/util/Date.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_Date_idl__
-#define __com_sun_star_util_Date_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_Date_idl__ 
+#define __com_sun_star_util_Date_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** represents a date value.
  */
 published struct Date
 {
     /** contains the day of month (1-31 or 0 for a void date).
      */
-    unsigned short Day;
-
-    //-------------------------------------------------------------------------
-
+    unsigned short Day; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the month of year (1-12 or 0 for a void date).
      */
-    unsigned short Month;
-
-    //-------------------------------------------------------------------------
-
+    unsigned short Month; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the year.
      */
-    unsigned short Year;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    unsigned short Year; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/DateTime.idl b/offapi/com/sun/star/util/DateTime.idl
index d208e425b678..9acb93554502 100644
--- a/offapi/com/sun/star/util/DateTime.idl
+++ b/offapi/com/sun/star/util/DateTime.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,64 +24,64 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_DateTime_idl__
-#define __com_sun_star_util_DateTime_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_DateTime_idl__ 
+#define __com_sun_star_util_DateTime_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** represents a combined date+time value.
  */
 published struct DateTime
 {
     /** contains the hundredth seconds (0-99).
      */
-    unsigned short HundredthSeconds;
-
-    //-------------------------------------------------------------------------
-
+    unsigned short HundredthSeconds; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the seconds (0-59).
      */
-    unsigned short Seconds;
-
-    //-------------------------------------------------------------------------
-
+    unsigned short Seconds; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the minutes (0-59).
      */
-    unsigned short Minutes;
-
-    //-------------------------------------------------------------------------
-
+    unsigned short Minutes; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the hour (0-23).
      */
-    unsigned short Hours;
-
-    //-------------------------------------------------------------------------
-
+    unsigned short Hours; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is the day of month (1-31 or 0 for a void date).
      */
-    unsigned short Day;
-
-    //-------------------------------------------------------------------------
-
+    unsigned short Day; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is the month of year (1-12 or 0 for a void date).
      */
-    unsigned short Month;
-
-    //-------------------------------------------------------------------------
-
+    unsigned short Month; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is the year.
      */
-    unsigned short Year;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    unsigned short Year; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/DateTimeRange.idl b/offapi/com/sun/star/util/DateTimeRange.idl
index 13612e79290f..2c1005c2077b 100644
--- a/offapi/com/sun/star/util/DateTimeRange.idl
+++ b/offapi/com/sun/star/util/DateTimeRange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,93 +24,93 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_DateTimeRange_idl__
-#define __com_sun_star_util_DateTimeRange_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_DateTimeRange_idl__ 
+#define __com_sun_star_util_DateTimeRange_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** represents a range of date+time values.
  */
 published struct DateTimeRange
 {
     /** contains the start hundredth seconds (0-99) for the range.
      */
-    unsigned short StartHundredthSeconds;
-
-    //-------------------------------------------------------------------------
+    unsigned short StartHundredthSeconds; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the start seconds (0-59) for the range.
      */
-    unsigned short StartSeconds;
-
-    //-------------------------------------------------------------------------
+    unsigned short StartSeconds; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the start minutes (0-59) for the range.
      */
-    unsigned short StartMinutes;
-
-    //-------------------------------------------------------------------------
+    unsigned short StartMinutes; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the start hour (0-23) for the range.
      */
-    unsigned short StartHours;
-
-    //-------------------------------------------------------------------------
+    unsigned short StartHours; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the start day of month (1-31 or 0 for a void date) for the range.
      */
-    unsigned short StartDay;
-
-    //-------------------------------------------------------------------------
+    unsigned short StartDay; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the start month of year (1-12 or 0 for a void date) for the range.
      */
-    unsigned short StartMonth;
-
-    //-------------------------------------------------------------------------
+    unsigned short StartMonth; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the start year for the range.
      */
-    unsigned short StartYear;
-
-    //-------------------------------------------------------------------------
+    unsigned short StartYear; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the end hundredth seconds (0-99) for the range.
      */
-    unsigned short EndHundredthSeconds;
-
-    //-------------------------------------------------------------------------
+    unsigned short EndHundredthSeconds; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the end seconds (0-59) for the range.
      */
-    unsigned short EndSeconds;
-
-    //-------------------------------------------------------------------------
+    unsigned short EndSeconds; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the end minutes (0-59) for the range.
      */
-    unsigned short EndMinutes;
-
-    //-------------------------------------------------------------------------
+    unsigned short EndMinutes; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the end hour (0-23) for the range.
      */
-    unsigned short EndHours;
-
-    //-------------------------------------------------------------------------
+    unsigned short EndHours; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the end day of month (1-31 or 0 for a void date) for the range.
      */
-    unsigned short EndDay;
-
-    //-------------------------------------------------------------------------
+    unsigned short EndDay; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the end month of year (1-12 or 0 for a void date) for the range.
      */
-    unsigned short EndMonth;
-
-    //-------------------------------------------------------------------------
+    unsigned short EndMonth; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the end year for the range.
      */
-    unsigned short EndYear;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    unsigned short EndYear; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/DiskFullException.idl b/offapi/com/sun/star/util/DiskFullException.idl
index 385a5d1f590a..9a61d37c7a8a 100644
--- a/offapi/com/sun/star/util/DiskFullException.idl
+++ b/offapi/com/sun/star/util/DiskFullException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_DiskFullException_idl__
-#define __com_sun_star_util_DiskFullException_idl__
-
-#ifndef __com_sun_star_util_FileIOException_idl__
-#include <com/sun/star/util/FileIOException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_DiskFullException_idl__ 
+#define __com_sun_star_util_DiskFullException_idl__ 
+ 
+#ifndef __com_sun_star_util_FileIOException_idl__ 
+#include <com/sun/star/util/FileIOException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** is thrown when a disk full error occurs.
  */
 published exception DiskFullException: com::sun::star::util::FileIOException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/Duration.idl b/offapi/com/sun/star/util/Duration.idl
index ef544189210f..a9030cebd649 100644
--- a/offapi/com/sun/star/util/Duration.idl
+++ b/offapi/com/sun/star/util/Duration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/ElementChange.idl b/offapi/com/sun/star/util/ElementChange.idl
index 9ceb3a14ac70..ca8819eafe39 100644
--- a/offapi/com/sun/star/util/ElementChange.idl
+++ b/offapi/com/sun/star/util/ElementChange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_ElementChange_idl__
-#define __com_sun_star_util_ElementChange_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_ElementChange_idl__ 
+#define __com_sun_star_util_ElementChange_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** This structure describes a single change that is part of a batch of changes.
  */
 published struct ElementChange
 {
     /** This contains the accessor to the element which changed.
-
+        
         <p>The type and the value of the accessor depends on the service.</p>
      */
-    any Accessor;
-
-    //-------------------------------------------------------------------------
-
+    any Accessor; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This contains the element that was inserted or changed.
      */
-    any Element;
-
-    //-------------------------------------------------------------------------
-
+    any Element; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This contains the element that was replaced or removed.
      */
-    any ReplacedElement;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    any ReplacedElement; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/Endianness.idl b/offapi/com/sun/star/util/Endianness.idl
index c48698a0cbc7..f63126d721c4 100644
--- a/offapi/com/sun/star/util/Endianness.idl
+++ b/offapi/com/sun/star/util/Endianness.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ module com { module sun { module star { module util {
 
     @since OOo 2.0.0
  */
-constants Endianness
+constants Endianness 
 {
     /** Little endian.<p>
 
@@ -46,7 +46,7 @@ constants Endianness
         lengths always starts with the least significant byte, and
         ends with the most significant one.<p>
      */
-    const byte  LITTLE=0;
+    const byte	LITTLE=0;
 
     /** Big endian.<p>
 
diff --git a/offapi/com/sun/star/util/FileIOException.idl b/offapi/com/sun/star/util/FileIOException.idl
index 2b1d2ae31400..9c1f30ba6057 100644
--- a/offapi/com/sun/star/util/FileIOException.idl
+++ b/offapi/com/sun/star/util/FileIOException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_FileIOException_idl__
-#define __com_sun_star_util_FileIOException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_FileIOException_idl__ 
+#define __com_sun_star_util_FileIOException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** thrown when file I/O error occurs.
  */
 published exception FileIOException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/InvalidStateException.idl b/offapi/com/sun/star/util/InvalidStateException.idl
index 7d59abbcbac6..58e368bd4878 100644
--- a/offapi/com/sun/star/util/InvalidStateException.idl
+++ b/offapi/com/sun/star/util/InvalidStateException.idl
@@ -27,11 +27,11 @@
 #ifndef __com_sun_star_util_InvalidStateException_idl__
 #define __com_sun_star_util_InvalidStateException_idl__
 
-#include <com/sun/star/uno/Exception.idl>
+#include <com/sun/star/uno/Exception.idl> 
 
 //==================================================================================================================
 
-module com { module sun { module star { module util {
+module com { module sun { module star { module util { 
 
 //==================================================================================================================
 
diff --git a/offapi/com/sun/star/util/JobManager.idl b/offapi/com/sun/star/util/JobManager.idl
index 371fa0ae3bb6..31498fc17dce 100644
--- a/offapi/com/sun/star/util/JobManager.idl
+++ b/offapi/com/sun/star/util/JobManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/Language.idl b/offapi/com/sun/star/util/Language.idl
index 8b1446414d04..c92b6b03c227 100644
--- a/offapi/com/sun/star/util/Language.idl
+++ b/offapi/com/sun/star/util/Language.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module util {
+module com { module sun { module star { module util { 
 
 //=============================================================================
 /** This type is used for a language identifier number.
@@ -39,6 +39,6 @@ published typedef short Language;
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/util/MalformedNumberFormatException.idl b/offapi/com/sun/star/util/MalformedNumberFormatException.idl
index f084663289d3..dbf06dcf6ab3 100644
--- a/offapi/com/sun/star/util/MalformedNumberFormatException.idl
+++ b/offapi/com/sun/star/util/MalformedNumberFormatException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_MalformedNumberFormatException_idl__
-#define __com_sun_star_util_MalformedNumberFormatException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
-/** is thrown when a NumberFormat string is syntactically
+#ifndef __com_sun_star_util_MalformedNumberFormatException_idl__ 
+#define __com_sun_star_util_MalformedNumberFormatException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
+/** is thrown when a NumberFormat string is syntactically 
     incorrect.
  */
 published exception MalformedNumberFormatException: com::sun::star::uno::Exception
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the character position in the string where the malformation
         begins.
      */
-    long CheckPos;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    long CheckPos; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/util/MeasureUnit.idl b/offapi/com/sun/star/util/MeasureUnit.idl
index 9071c44b27a5..fad6ba1385d0 100644
--- a/offapi/com/sun/star/util/MeasureUnit.idl
+++ b/offapi/com/sun/star/util/MeasureUnit.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,21 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_MeasureUnit_idl__
-#define __com_sun_star_util_MeasureUnit_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_MeasureUnit_idl__ 
+#define __com_sun_star_util_MeasureUnit_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** These constants are used to specify a measure.<p>
     A component using these constants may not support all units.
  */
 published constants MeasureUnit
-{
+{ 
     /** all measures for this component are in 100th millimeter */
     const short MM_100TH = 0;
 
@@ -96,11 +96,11 @@ published constants MeasureUnit
     /** all measures for this component are in SYSFONT */
     const short SYSFONT = 18;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/util/ModeChangeEvent.idl b/offapi/com/sun/star/util/ModeChangeEvent.idl
index f03b337e1bbc..7d38c6963687 100644
--- a/offapi/com/sun/star/util/ModeChangeEvent.idl
+++ b/offapi/com/sun/star/util/ModeChangeEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,9 +28,9 @@
 #ifndef __com_sun_star_util_ModeChangeEvent_idl__
 #define __com_sun_star_util_ModeChangeEvent_idl__
 
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/util/NotNumericException.idl b/offapi/com/sun/star/util/NotNumericException.idl
index ed1d550c2163..0bf9369f9c40 100644
--- a/offapi/com/sun/star/util/NotNumericException.idl
+++ b/offapi/com/sun/star/util/NotNumericException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_NotNumericException_idl__
-#define __com_sun_star_util_NotNumericException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_NotNumericException_idl__ 
+#define __com_sun_star_util_NotNumericException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** indicates that a non-numeric string is to be converted to a number.
  */
 published exception NotNumericException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/NumberFormat.idl b/offapi/com/sun/star/util/NumberFormat.idl
index f8f18e9874cc..260efd1313a2 100644
--- a/offapi/com/sun/star/util/NumberFormat.idl
+++ b/offapi/com/sun/star/util/NumberFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,103 +24,103 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_NumberFormat_idl__
-#define __com_sun_star_util_NumberFormat_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_NumberFormat_idl__ 
+#define __com_sun_star_util_NumberFormat_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** contains constants that are used to specify the type of a number format.
  */
 published constants NumberFormat
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** selects all number formats.
      */
-    const short ALL = 0;
-
-    //-------------------------------------------------------------------------
+    const short ALL = 0; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** selects only user-defined number formats.
      */
-    const short DEFINED = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short DEFINED = 1; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** selects date formats.
      */
-    const short DATE = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short DATE = 2; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** selects time formats.
      */
-    const short TIME = 4;
-
-    //-------------------------------------------------------------------------
-
+    const short TIME = 4; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** selects currency formats.
      */
-    const short CURRENCY = 8;
-
-    //-------------------------------------------------------------------------
-
+    const short CURRENCY = 8; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** selects decimal number formats.
      */
-    const short NUMBER = 16;
-
-    //-------------------------------------------------------------------------
-
+    const short NUMBER = 16; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** selects scientific number formats.
      */
-    const short SCIENTIFIC = 32;
-
-    //-------------------------------------------------------------------------
-
+    const short SCIENTIFIC = 32; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** selects number formats for fractions.
      */
-    const short FRACTION = 64;
-
-    //-------------------------------------------------------------------------
-
+    const short FRACTION = 64; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** selects percentage number formats.
      */
-    const short PERCENT = 128;
-
-    //-------------------------------------------------------------------------
-
+    const short PERCENT = 128; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** selects text number formats.
      */
-    const short TEXT = 256;
-
-    //-------------------------------------------------------------------------
-
+    const short TEXT = 256; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** selects number formats which contain date and time.
      */
-    const short DATETIME = 6;
-
-    //-------------------------------------------------------------------------
-
+    const short DATETIME = 6; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** selects boolean number formats.
      */
-    const short LOGICAL = 1024;
-
-    //-------------------------------------------------------------------------
-
+    const short LOGICAL = 1024; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** is used as a return value if no format exists.
      */
-    const short UNDEFINED = 2048;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    const short UNDEFINED = 2048; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/util/NumberFormatProperties.idl b/offapi/com/sun/star/util/NumberFormatProperties.idl
index 7c747aff3d0f..d017ff9998c2 100644
--- a/offapi/com/sun/star/util/NumberFormatProperties.idl
+++ b/offapi/com/sun/star/util/NumberFormatProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,58 +24,58 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_NumberFormatProperties_idl__
-#define __com_sun_star_util_NumberFormatProperties_idl__
-
-#ifndef __com_sun_star_lang_Locale_idl__
-#include <com/sun/star/lang/Locale.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_NumberFormatProperties_idl__ 
+#define __com_sun_star_util_NumberFormatProperties_idl__ 
+ 
+#ifndef __com_sun_star_lang_Locale_idl__ 
+#include <com/sun/star/lang/Locale.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** contains properties specifying the behavior of a <type>NumberFormatter</type>.
 
     @see NumberFormatter
  */
 published service NumberFormatProperties
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the format string of the number format.
      */
-    [readonly, property] string FormatString;
-
-    //-------------------------------------------------------------------------
-
+    [readonly, property] string FormatString; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the locale of the number format.
      */
-    [readonly, property] com::sun::star::lang::Locale Locale;
-
-    //-------------------------------------------------------------------------
-
+    [readonly, property] com::sun::star::lang::Locale Locale; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the type of the number format.
 
         @see NumberFormat
      */
-    [readonly, property] short Type;
-
-    //-------------------------------------------------------------------------
-
+    [readonly, property] short Type; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains a comment regarding the number format for
         display to the user.
      */
-    [property] string Comment;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    [property] string Comment; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/util/NumberFormatSettings.idl b/offapi/com/sun/star/util/NumberFormatSettings.idl
index 2f1013ae93ad..74a83cbab5d5 100644
--- a/offapi/com/sun/star/util/NumberFormatSettings.idl
+++ b/offapi/com/sun/star/util/NumberFormatSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,65 +24,65 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_NumberFormatSettings_idl__
-#define __com_sun_star_util_NumberFormatSettings_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_Date_idl__
-#include <com/sun/star/util/Date.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_NumberFormatSettings_idl__ 
+#define __com_sun_star_util_NumberFormatSettings_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_Date_idl__ 
+#include <com/sun/star/util/Date.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** specifies the settings for number formatting.
  */
 published service NumberFormatSettings
-{
+{ 
     /** provides access to the properties.
      */
-    interface com::sun::star::beans::XPropertySet;
-
-    //-------------------------------------------------------------------------
-
+    interface com::sun::star::beans::XPropertySet; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the date which is represented by the value 0.
 
         <p>The most common value for this is 12/30/1899.</p>
      */
-    [property] com::sun::star::util::Date NullDate;
-
-    //-------------------------------------------------------------------------
-
+    [property] com::sun::star::util::Date NullDate; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the maximum number of decimals used for the
         standard number format ("General").
      */
-    [property] short StandardDecimals;
-
-    //-------------------------------------------------------------------------
-
+    [property] short StandardDecimals; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is set to indicate that a zero value should be formatted as an empty string.
      */
-    [property] boolean NoZero;
-
-    //-------------------------------------------------------------------------
-
+    [property] boolean NoZero; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the first year to be generated from a two-digit
         year input.
      */
-    [property] short TwoDigitDateStart;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    [property] short TwoDigitDateStart; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/util/NumberFormats.idl b/offapi/com/sun/star/util/NumberFormats.idl
index a451fd1b7a4f..ff46c0b30854 100644
--- a/offapi/com/sun/star/util/NumberFormats.idl
+++ b/offapi/com/sun/star/util/NumberFormats.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_NumberFormats_idl__
-#define __com_sun_star_util_NumberFormats_idl__
-
-#ifndef __com_sun_star_util_XNumberFormats_idl__
-#include <com/sun/star/util/XNumberFormats.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatTypes_idl__
-#include <com/sun/star/util/XNumberFormatTypes.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_NumberFormats_idl__ 
+#define __com_sun_star_util_NumberFormats_idl__ 
+ 
+#ifndef __com_sun_star_util_XNumberFormats_idl__ 
+#include <com/sun/star/util/XNumberFormats.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XNumberFormatTypes_idl__ 
+#include <com/sun/star/util/XNumberFormatTypes.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** specifies a container of number formats.
  */
 published service NumberFormats
-{
+{ 
     /** is used to access or create individual formats.
      */
-    interface com::sun::star::util::XNumberFormats;
-
+    interface com::sun::star::util::XNumberFormats; 
+    
     /** is used to get specific, predefined number formats.
      */
-    interface com::sun::star::util::XNumberFormatTypes;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    interface com::sun::star::util::XNumberFormatTypes; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/util/NumberFormatsSupplier.idl b/offapi/com/sun/star/util/NumberFormatsSupplier.idl
index 3b7fae2d7ecb..077a09372fc5 100644
--- a/offapi/com/sun/star/util/NumberFormatsSupplier.idl
+++ b/offapi/com/sun/star/util/NumberFormatsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/NumberFormatter.idl b/offapi/com/sun/star/util/NumberFormatter.idl
index c130dfebc210..6c02eddd22b2 100644
--- a/offapi/com/sun/star/util/NumberFormatter.idl
+++ b/offapi/com/sun/star/util/NumberFormatter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_NumberFormatter_idl__
-#define __com_sun_star_util_NumberFormatter_idl__
-
-#ifndef __com_sun_star_util_XNumberFormatter_idl__
-#include <com/sun/star/util/XNumberFormatter.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatPreviewer_idl__
-#include <com/sun/star/util/XNumberFormatPreviewer.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_NumberFormatter_idl__ 
+#define __com_sun_star_util_NumberFormatter_idl__ 
+ 
+#ifndef __com_sun_star_util_XNumberFormatter_idl__ 
+#include <com/sun/star/util/XNumberFormatter.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XNumberFormatPreviewer_idl__ 
+#include <com/sun/star/util/XNumberFormatPreviewer.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** represents an object which can format numbers and strings.
 
     <p>A NumberFormatter, if available, can be created by the global
     service manager.</p>
  */
 published service NumberFormatter
-{
+{ 
     /** is used to format or parse numbers using formats from a
         <type>NumberFormats</type> object.
      */
-    interface com::sun::star::util::XNumberFormatter;
-
+    interface com::sun::star::util::XNumberFormatter; 
+    
     /** is used to format numbers using a number format string
         that is not inserted into a <type>NumberFormats</type> object.
      */
-    interface com::sun::star::util::XNumberFormatPreviewer;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    interface com::sun::star::util::XNumberFormatPreviewer; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/util/OfficeInstallationDirectories.idl b/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
index 3c127fa701d2..23d2d013d9f3 100644
--- a/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
+++ b/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/PathSettings.idl b/offapi/com/sun/star/util/PathSettings.idl
index e67f6813af93..3bdcdbc48c19 100644
--- a/offapi/com/sun/star/util/PathSettings.idl
+++ b/offapi/com/sun/star/util/PathSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,32 +25,32 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_util_PathSettings_idl__
-#define __com_sun_star_util_PathSettings_idl__
+#ifndef __com_sun_star_util_PathSettings_idl__ 
+#define __com_sun_star_util_PathSettings_idl__ 
 
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
 #endif
 
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
-#include <com/sun/star/beans/XFastPropertySet.idl>
+#ifndef __com_sun_star_beans_XFastPropertySet_idl__ 
+#include <com/sun/star/beans/XFastPropertySet.idl> 
 #endif
 
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
-#include <com/sun/star/beans/XMultiPropertySet.idl>
+#ifndef __com_sun_star_beans_XMultiPropertySet_idl__ 
+#include <com/sun/star/beans/XMultiPropertySet.idl> 
 #endif
 
-//=============================================================================
+//============================================================================= 
 
-module com {  module sun {  module star {  module  util {
+module com {  module sun {  module star {  module  util { 
 
-//=============================================================================
+//============================================================================= 
 
 /** Supports read/write access and listener for the paths properties that
     the Office uses.
     <p>
     The property names of the Office paths/directories are an exactly match
-    to the configuration entries found in the file
+    to the configuration entries found in the file 
     (org/openoffice/Office/Common.xml).<br>
     This service supports the usage of path variables to define
     paths that a relative to other office or system directories.
@@ -64,39 +64,39 @@ published service PathSettings
   /** Main interface to have access to the path properties. */
   interface com::sun::star::beans::XPropertySet;
 
-  /** An extension to the <type scope="com::sun::star::beans">XPropertySet</type> interface.
-      The get and set methods use handles to access the property values
+  /** An extension to the <type scope="com::sun::star::beans">XPropertySet</type> interface. 
+      The get and set methods use handles to access the property values 
       instead of character strings. */
   interface com::sun::star::beans::XFastPropertySet;
 
-  /** Provides access to multiple properties of this service with a
+  /** Provides access to multiple properties of this service with a 
       single call. */
   interface com::sun::star::beans::XMultiPropertySet;
 
-  /** Specifies the directory that contains spreadsheet add-ins which use
+  /** Specifies the directory that contains spreadsheet add-ins which use 
       the old add-in API */
   [property] string Addin;
-
-  /** The settings of the AutoCorrect dialog. The value can be more than
+  
+  /** The settings of the AutoCorrect dialog. The value can be more than 
       one path separated by a semicolon.
   */
   [property] string AutoCorrect;
 
-  /**The directory which contains the AutoText modules. The value can be more than
+  /**The directory which contains the AutoText modules. The value can be more than 
       one path separated by a semicolon.*/
   [property] string AutoText;
 
   /** Automatic backup copies of documents are stored here. */
   [property] string Backup;
 
-  /** The Basic files, used by the AutoPilots, can be found here. The value can be more than
+  /** The Basic files, used by the AutoPilots, can be found here. The value can be more than 
       one path separated by a semicolon.*/
   [property] string Basic;
 
   /** This directory contains the icons for the toolbars. */
   [property] string Bitmap;
 
-  /** The configuration files are located here. This entry cannot be changed
+  /** The configuration files are located here. This entry cannot be changed 
       by the user in Office user interface. */
   [property] string Config;
 
@@ -108,13 +108,13 @@ published service PathSettings
 
   /** Specifies the directory where all the filters are stored. */
   [property] string Filter;
-
+  
   /** Specifies the directories which contains the Gallery
-      database and multimedia files. The value can be more than
+      database and multimedia files. The value can be more than 
       one path separated by a semicolon.*/
   [property] string Gallery;
 
-  /** This directory is displayed when the dialog for opening a graphic
+  /** This directory is displayed when the dialog for opening a graphic 
       or for saving a new graphic is called. */
   [property] string Graphic;
 
@@ -127,47 +127,47 @@ published service PathSettings
   /** This is the path for the modules. */
   [property] string Module;
 
-  /** This is the path to the palette files *.SOB to *.SOF containing
+  /** This is the path to the palette files *.SOB to *.SOF containing 
       user-defined colors and patterns. */
   [property] string Palette;
 
-  /** Plugins are saved in these directories. The value can be more than
+  /** Plugins are saved in these directories. The value can be more than 
       one path separated by a semicolon.*/
   [property] string Plugin;
 
-  /** Mail, News files and other information (for example, about FTP Server)
+  /** Mail, News files and other information (for example, about FTP Server) 
       are stored here.*/
   [property] string Storage;
 
   /** The base url to the office temp-files */
   [property] string Temp;
 
-  /** The templates originate from these folders and sub-folders. The value
+  /** The templates originate from these folders and sub-folders. The value 
       can be more than one path separated by a semicolon.*/
   [property] string Template;
 
   /** Global directories to look for user interface configuration files. The
       user interface configuration will be merged with user settings stored
-      in the directory specified by <var>UserConfig</var>. The value can be more
+      in the directory specified by <var>UserConfig</var>. The value can be more 
       than one path separated by a semicolon.*/
   [property] string UIConfig;
 
   /** Specifies the folder with the user settings. */
   [property] string UserConfig;
 
-  /** The custom dictionaries are contained here.
+  /** The custom dictionaries are contained here. 
    * @deprecated
    * */
   [property] string UserDictionary;
 
-  /** The path of the work folder can be modified according to the
-      user's needs. The path specified here can be seen in the Open
+  /** The path of the work folder can be modified according to the 
+      user's needs. The path specified here can be seen in the Open 
       or Save dialog. */
   [property] string Work;
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/util/PathSubstitution.idl b/offapi/com/sun/star/util/PathSubstitution.idl
index 455465ddf06a..d17abd88d399 100644
--- a/offapi/com/sun/star/util/PathSubstitution.idl
+++ b/offapi/com/sun/star/util/PathSubstitution.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,8 +53,8 @@ module com {  module sun {  module star {  module  util {
     Path variables are not case sensitive and are always provided as a UCB-complient URL's
     (for example: "file:///c:/temp" or "file:///usr/install"). This is mandatory to support an
     optional remote file system.<br>
-    A user defined list of path variables is supported. This list is stored in the Office
-    configuration file (org/openoffice/Office/Substitution.xml). Please have a  look at the
+    A user defined list of path variables is supported. This list is stored	in the Office
+    configuration file (org/openoffice/Office/Substitution.xml). Please have a 	look at the
     schema definition file which configuration structure this file uses.<br>
     There is also a set of variables that have pre-defined values:
     </p>
diff --git a/offapi/com/sun/star/util/ReplaceDescriptor.idl b/offapi/com/sun/star/util/ReplaceDescriptor.idl
index 192c10707226..7f1e791451bc 100644
--- a/offapi/com/sun/star/util/ReplaceDescriptor.idl
+++ b/offapi/com/sun/star/util/ReplaceDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_ReplaceDescriptor_idl__
-#define __com_sun_star_util_ReplaceDescriptor_idl__
-
-#ifndef __com_sun_star_util_SearchDescriptor_idl__
-#include <com/sun/star/util/SearchDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_util_XReplaceDescriptor_idl__
-#include <com/sun/star/util/XReplaceDescriptor.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_ReplaceDescriptor_idl__ 
+#define __com_sun_star_util_ReplaceDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_util_SearchDescriptor_idl__ 
+#include <com/sun/star/util/SearchDescriptor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XReplaceDescriptor_idl__ 
+#include <com/sun/star/util/XReplaceDescriptor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** describes what and how to replace strings.
  */
 published service ReplaceDescriptor
-{
-    service com::sun::star::util::SearchDescriptor;
-
-    interface com::sun::star::util::XReplaceDescriptor;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    service com::sun::star::util::SearchDescriptor; 
+    
+    interface com::sun::star::util::XReplaceDescriptor; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/RevisionTag.idl b/offapi/com/sun/star/util/RevisionTag.idl
index d8db6304669f..321902f2b604 100644
--- a/offapi/com/sun/star/util/RevisionTag.idl
+++ b/offapi/com/sun/star/util/RevisionTag.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/SearchDescriptor.idl b/offapi/com/sun/star/util/SearchDescriptor.idl
index b49e174ccf50..68d3d5720767 100644
--- a/offapi/com/sun/star/util/SearchDescriptor.idl
+++ b/offapi/com/sun/star/util/SearchDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,61 +24,61 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_SearchDescriptor_idl__
-#define __com_sun_star_util_SearchDescriptor_idl__
-
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__
-#include <com/sun/star/util/XSearchDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_SearchDescriptor_idl__ 
+#define __com_sun_star_util_SearchDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_util_XSearchDescriptor_idl__ 
+#include <com/sun/star/util/XSearchDescriptor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** describes what and how to search within a container.
  */
 published service SearchDescriptor
-{
-    interface com::sun::star::util::XSearchDescriptor;
-
-    interface com::sun::star::beans::XPropertySet;
-
-    //-------------------------------------------------------------------------
+{ 
+    interface com::sun::star::util::XSearchDescriptor; 
+    
+    interface com::sun::star::beans::XPropertySet; 
+ 
+    //------------------------------------------------------------------------- 
     /** If <TRUE/>, the search is done backwards in the document.
      */
-    [property] boolean SearchBackwards;
-
-    //-------------------------------------------------------------------------
+    [property] boolean SearchBackwards; 
+ 
+    //------------------------------------------------------------------------- 
     /** If <TRUE/>, the case of the letters is important for the match.
      */
-    [property] boolean SearchCaseSensitive;
-
-    //-------------------------------------------------------------------------
+    [property] boolean SearchCaseSensitive; 
+ 
+    //------------------------------------------------------------------------- 
     /** If <TRUE/>, only complete words will be found.
      */
-    [property] boolean SearchWords;
-
-    //-------------------------------------------------------------------------
+    [property] boolean SearchWords; 
+ 
+    //------------------------------------------------------------------------- 
     /** If <TRUE/>, the search string is evaluated as a regular expression.
      */
-    [property] boolean SearchRegularExpression;
-
-    //-------------------------------------------------------------------------
-    /** If <TRUE/>, it is searched for positions where the paragraph style with
+    [property] boolean SearchRegularExpression; 
+ 
+    //------------------------------------------------------------------------- 
+    /** If <TRUE/>, it is searched for positions where the paragraph style with 
         the name of the search pattern is applied.
      */
-    [property] boolean SearchStyles;
-
-    //-------------------------------------------------------------------------
+    [property] boolean SearchStyles; 
+ 
+    //------------------------------------------------------------------------- 
     /** If <TRUE/>, a "similarity search" is performed.
-
+        
         <p>In the case of a similarity search, the following properties
         specify the kind of similarity:
         </p>
@@ -93,14 +93,14 @@ published service SearchDescriptor
         </li>
         </ul>
      */
-    [property] boolean SearchSimilarity;
-
-    //-------------------------------------------------------------------------
+    [property] boolean SearchSimilarity; 
+ 
+    //------------------------------------------------------------------------- 
     /** If <TRUE/>, all similarity rules are applied together.
-
+        
         <p>In the case of a relaxed similarity search, the following
         properties are applied together:
-
+        
         </p>
         <ul>
         <li>SearchSimilarityRemove
@@ -111,30 +111,30 @@ published service SearchDescriptor
         </li>
         </ul>
      */
-    [property] boolean SearchSimilarityRelax;
-
-    //-------------------------------------------------------------------------
-    /** This property specifies the number of characters that may be
+    [property] boolean SearchSimilarityRelax; 
+ 
+    //------------------------------------------------------------------------- 
+    /** This property specifies the number of characters that may be 
         ignored to match the search pattern.
      */
-    [property] short SearchSimilarityRemove;
-
-    //-------------------------------------------------------------------------
-    /** specifies the number of characters that must be
+    [property] short SearchSimilarityRemove; 
+ 
+    //------------------------------------------------------------------------- 
+    /** specifies the number of characters that must be 
         added to match the search pattern.
      */
-    [property] short SearchSimilarityAdd;
-
-    //-------------------------------------------------------------------------
-    /** This property specifies the number of characters that must
+    [property] short SearchSimilarityAdd; 
+ 
+    //------------------------------------------------------------------------- 
+    /** This property specifies the number of characters that must 
         be replaced to match the search pattern.
      */
-    [property] short SearchSimilarityExchange;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] short SearchSimilarityExchange; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/SortDescriptor.idl b/offapi/com/sun/star/util/SortDescriptor.idl
index cab1cf01f0e2..9c88b102694f 100644
--- a/offapi/com/sun/star/util/SortDescriptor.idl
+++ b/offapi/com/sun/star/util/SortDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,58 +24,58 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_SortDescriptor_idl__
-#define __com_sun_star_util_SortDescriptor_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
-#include <com/sun/star/lang/Locale.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_SortDescriptor_idl__ 
+#define __com_sun_star_util_SortDescriptor_idl__ 
+  
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_Locale_idl__ 
+#include <com/sun/star/lang/Locale.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** specifies the properties which can be used to describe
     a sort order applied to an XSortable.
-
+    
     @see XSortable
 
     @deprecated
  */
 published service SortDescriptor
-{
+{ 
      interface com::sun::star::beans::XPropertySet;
-
-    //-------------------------------------------------------------------------
+ 
+    //------------------------------------------------------------------------- 
     /** specifies if the case of letters is important when comparing entries.
      */
-        [property] boolean IsCaseSensitive;
+        [property] boolean IsCaseSensitive; 
 
-     //-------------------------------------------------------------------------
+     //------------------------------------------------------------------------- 
     /** specifies the sorting order.
-
+            
             The sorting order may be defined for sepearte keys in specific
             implementations. For those this property may not need to be set.
-
+            
             @see <type scope"com::sun::star::text">TextSortDescriptor</type>
      */
-        [optional, property] boolean SortAscending;
+        [optional, property] boolean SortAscending; 
 
-     //-------------------------------------------------------------------------
+     //------------------------------------------------------------------------- 
     /** specifies if the columns are sorted.
-
+        
         <dl>
         <dt>
         <TRUE/>
         </dt>
         <dd>The columns are sorted.
-
+        
         </dd>
         <dt>
         <FALSE/>
@@ -84,28 +84,28 @@ published service SortDescriptor
         </dd>
         </dl>
      */
-    [property] boolean SortColumns;
-
-     //-------------------------------------------------------------------------
+    [property] boolean SortColumns; 
+ 
+     //------------------------------------------------------------------------- 
     /** specifies the locale for the compare operator (collator).
      */
     [property] com::sun::star::lang::Locale CollatorLocale;
 
-     //-------------------------------------------------------------------------
+     //------------------------------------------------------------------------- 
     /** specifies the algorithm for the compare operator (collator).
 
             The collator algorithm may be defined for sepearte keys in specific
             implementations. For those this property may not need to be set.
-
+            
             @see <type scope"com::sun::star::text">TextSortDescriptor</type>
-
+         
             @see com::sun::star::i18n::XCollator
      */
         [optional, property] string CollatorAlgorithm;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/SortDescriptor2.idl b/offapi/com/sun/star/util/SortDescriptor2.idl
index 8d6e8606cab6..e2778bf55648 100644
--- a/offapi/com/sun/star/util/SortDescriptor2.idl
+++ b/offapi/com/sun/star/util/SortDescriptor2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/SortField.idl b/offapi/com/sun/star/util/SortField.idl
index 0c20871f3863..d1d15582f235 100644
--- a/offapi/com/sun/star/util/SortField.idl
+++ b/offapi/com/sun/star/util/SortField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,19 +24,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_SortField_idl__
-#define __com_sun_star_util_SortField_idl__
-
-#ifndef __com_sun_star_util_SortFieldType_idl__
-#include <com/sun/star/util/SortFieldType.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
+#ifndef __com_sun_star_util_SortField_idl__ 
+#define __com_sun_star_util_SortField_idl__ 
+ 
+#ifndef __com_sun_star_util_SortFieldType_idl__ 
+#include <com/sun/star/util/SortFieldType.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
 /** describes a single field in a sort descriptor.
 
     @deprecated
@@ -45,23 +45,23 @@ published struct SortField
 {
     /** index of the field in the table; 0-based.
      */
-    long Field;
-
-    //-------------------------------------------------------------------------
+    long Field; 
+ 
+    //------------------------------------------------------------------------- 
     /** <TRUE/> if data are sorted in ascending order,
         <FALSE/> if in descending order.
      */
-    boolean SortAscending;
-
-    //-------------------------------------------------------------------------
+    boolean SortAscending; 
+ 
+    //------------------------------------------------------------------------- 
     /** type of contents in the field.
      */
-    com::sun::star::util::SortFieldType FieldType;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::util::SortFieldType FieldType; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/SortFieldType.idl b/offapi/com/sun/star/util/SortFieldType.idl
index e27f94374772..0686b51ff76e 100644
--- a/offapi/com/sun/star/util/SortFieldType.idl
+++ b/offapi/com/sun/star/util/SortFieldType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_SortFieldType_idl__
-#define __com_sun_star_util_SortFieldType_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_SortFieldType_idl__ 
+#define __com_sun_star_util_SortFieldType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** enumeration used to specify the type of contents in a sort field.
 
     @deprecated
  */
 published enum SortFieldType
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** type is determined automatically.
      */
-    AUTOMATIC,
-
-    //-------------------------------------------------------------------------
+    AUTOMATIC, 
+ 
+    //------------------------------------------------------------------------- 
     /** sort field contains numerical data.
      */
-    NUMERIC,
-
-    //-------------------------------------------------------------------------
+    NUMERIC, 
+ 
+    //------------------------------------------------------------------------- 
     /** sort field contains text data.
      */
-    ALPHANUMERIC
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    ALPHANUMERIC 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/Sortable.idl b/offapi/com/sun/star/util/Sortable.idl
index 328a80517343..61279b2e449a 100644
--- a/offapi/com/sun/star/util/Sortable.idl
+++ b/offapi/com/sun/star/util/Sortable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_Sortable_idl__
-#define __com_sun_star_util_Sortable_idl__
-
-#ifndef __com_sun_star_util_SortDescriptor_idl__
-#include <com/sun/star/util/SortDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSortable_idl__
-#include <com/sun/star/util/XSortable.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
+#ifndef __com_sun_star_util_Sortable_idl__ 
+#define __com_sun_star_util_Sortable_idl__ 
+  
+#ifndef __com_sun_star_util_SortDescriptor_idl__ 
+#include <com/sun/star/util/SortDescriptor.idl> 
+#endif 
 
+#ifndef __com_sun_star_util_XSortable_idl__ 
+#include <com/sun/star/util/XSortable.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** provides an interface for sorting.
 
     @deprecated
-
+    
     @since OOo 1.1.2
-
+    
  */
 published service Sortable
 {
         /** the properties returned by a call to the 'createSortDescriptor' method
             of this interfaces implementation are those of the
             'com.sun.star.util.SortDescriptor' service.
-
+         
            @see <type scope="com::sun::star::util">SortDescriptor</type>
          */
         interface com::sun::star::util::XSortable;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/TextSearch.idl b/offapi/com/sun/star/util/TextSearch.idl
index f6abf8c088e1..eba0b8befcc0 100644
--- a/offapi/com/sun/star/util/TextSearch.idl
+++ b/offapi/com/sun/star/util/TextSearch.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/Time.idl b/offapi/com/sun/star/util/Time.idl
index 3c03745b6e79..bbc71b9a02b6 100644
--- a/offapi/com/sun/star/util/Time.idl
+++ b/offapi/com/sun/star/util/Time.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_Time_idl__
-#define __com_sun_star_util_Time_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_Time_idl__ 
+#define __com_sun_star_util_Time_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** represents a time value.
  */
 published struct Time
 {
     /** contains the hundredth seconds (0-99).
      */
-    unsigned short HundredthSeconds;
-
-    //-------------------------------------------------------------------------
+    unsigned short HundredthSeconds; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the seconds (0-59).
      */
-    unsigned short Seconds;
-
-    //-------------------------------------------------------------------------
+    unsigned short Seconds; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the minutes (0-59).
      */
-    unsigned short Minutes;
-
-    //-------------------------------------------------------------------------
+    unsigned short Minutes; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the hour (0-23).
      */
-    unsigned short Hours;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    unsigned short Hours; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/TriState.idl b/offapi/com/sun/star/util/TriState.idl
index 8b3c0f684e40..a093300c91ea 100644
--- a/offapi/com/sun/star/util/TriState.idl
+++ b/offapi/com/sun/star/util/TriState.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_TriState_idl__
-#define __com_sun_star_util_TriState_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_TriState_idl__ 
+#define __com_sun_star_util_TriState_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** This enumeration represents a tristate value.<p>
 
     This enumeration defines three values, <TRUE/>, <FALSE/> and a don't know
@@ -45,22 +45,22 @@ enum TriState
      */
     NO,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** The value is equivalent to <TRUE/>.
      */
     YES,
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** The value is indeterminate.
      */
     INDETERMINATE
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/URL.idl b/offapi/com/sun/star/util/URL.idl
index a869331ac9dd..dc2778b83129 100644
--- a/offapi/com/sun/star/util/URL.idl
+++ b/offapi/com/sun/star/util/URL.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/URLTransformer.idl b/offapi/com/sun/star/util/URLTransformer.idl
index 46b4879a7e7d..5a1f62352947 100644
--- a/offapi/com/sun/star/util/URLTransformer.idl
+++ b/offapi/com/sun/star/util/URLTransformer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_URLTransformer_idl__
-#define __com_sun_star_util_URLTransformer_idl__
-
-#ifndef __com_sun_star_util_XURLTransformer_idl__
-#include <com/sun/star/util/XURLTransformer.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_URLTransformer_idl__ 
+#define __com_sun_star_util_URLTransformer_idl__ 
+ 
+#ifndef __com_sun_star_util_XURLTransformer_idl__ 
+#include <com/sun/star/util/XURLTransformer.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** helps to split up a string containing a URL into its
     structural parts and assembles the parts into a single string.
  */
 published service URLTransformer
-{
-    interface com::sun::star::util::XURLTransformer;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    interface com::sun::star::util::XURLTransformer; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/UriAbbreviation.idl b/offapi/com/sun/star/util/UriAbbreviation.idl
index 2825fe74b32d..2145738a710b 100644
--- a/offapi/com/sun/star/util/UriAbbreviation.idl
+++ b/offapi/com/sun/star/util/UriAbbreviation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/VetoException.idl b/offapi/com/sun/star/util/VetoException.idl
index fdf4d084d790..e5ee621cd5f2 100644
--- a/offapi/com/sun/star/util/VetoException.idl
+++ b/offapi/com/sun/star/util/VetoException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/XArchiver.idl b/offapi/com/sun/star/util/XArchiver.idl
index d3aee96cf08c..8c374f658bed 100644
--- a/offapi/com/sun/star/util/XArchiver.idl
+++ b/offapi/com/sun/star/util/XArchiver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,57 +24,57 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XArchiver_idl__
-#define __com_sun_star_util_XArchiver_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XArchiver_idl__ 
+#define __com_sun_star_util_XArchiver_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** @deprecated
  */
 published interface XArchiver: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR XArchiver::pack
-    boolean pack( [in] sequence<string> input,
-             [in] string destination,
-             [in] sequence<com::sun::star::beans::PropertyValue> aArgs );
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR XArchiver::unpack
-    boolean unpack( [in] string destinationpath,
-             [in] string source,
-             [in] sequence<string> files,
-             [in] sequence<com::sun::star::beans::PropertyValue> aArgs );
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR XArchiver::getContent
-    com::sun::star::container::XIndexAccess getContent( [in] string source );
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR XArchiver::getExtraData
-    string getExtraData( [in] string source );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR XArchiver::pack 
+    boolean pack( [in] sequence<string> input, 
+             [in] string destination, 
+             [in] sequence<com::sun::star::beans::PropertyValue> aArgs ); 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR XArchiver::unpack 
+    boolean unpack( [in] string destinationpath, 
+             [in] string source, 
+             [in] sequence<string> files, 
+             [in] sequence<com::sun::star::beans::PropertyValue> aArgs ); 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR XArchiver::getContent 
+    com::sun::star::container::XIndexAccess getContent( [in] string source ); 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR XArchiver::getExtraData 
+    string getExtraData( [in] string source ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XAtomServer.idl b/offapi/com/sun/star/util/XAtomServer.idl
index 610476a0d6c3..cb2c883bf9e1 100644
--- a/offapi/com/sun/star/util/XAtomServer.idl
+++ b/offapi/com/sun/star/util/XAtomServer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -58,7 +58,7 @@ module util
    This way strings have to be transported only once over remote connections.
    Valid ids are (in this implementation) non zero, signed 32 bit values.
    An atom of 0 means that the string in question is not registered</p>
-
+ 
    <p>Additionally there is the abstraction of atom class:<br>
    Atoms are grouped into classes, so that an id can be assigned
    to multiple strings, depending on the class context. The main
@@ -126,7 +126,7 @@ published interface XAtomServer : com::sun::star::uno::XInterface
         @param description
             the string in question
 
-        @param create
+        @param create 
             if true a new atom will be created for an unknown string
             else the invalid atom (0) will be returned for an unknown string
 
diff --git a/offapi/com/sun/star/util/XBroadcaster.idl b/offapi/com/sun/star/util/XBroadcaster.idl
index feb09fe6124f..5e89bc9fedf4 100644
--- a/offapi/com/sun/star/util/XBroadcaster.idl
+++ b/offapi/com/sun/star/util/XBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,25 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XBroadcaster_idl__
-#define __com_sun_star_util_XBroadcaster_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XBroadcaster_idl__ 
+#define __com_sun_star_util_XBroadcaster_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** allows to control notification behaviour of a broadcaster.
-
+    
     @since 3.0
  */
 interface XBroadcaster: com::sun::star::uno::XInterface
-{
+{ 
     /** suspends broadcasts to the registered listeners.
 
         <p>
@@ -75,10 +75,10 @@ interface XBroadcaster: com::sun::star::uno::XInterface
         </p>
     */
     [oneway] void unlockBroadcasts();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XCancelManager.idl b/offapi/com/sun/star/util/XCancelManager.idl
index 36fac41e012e..8ee17be51943 100644
--- a/offapi/com/sun/star/util/XCancelManager.idl
+++ b/offapi/com/sun/star/util/XCancelManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XCancelManager_idl__
-#define __com_sun_star_util_XCancelManager_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XCancellable_idl__
-#include <com/sun/star/util/XCancellable.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XCancelManager_idl__ 
+#define __com_sun_star_util_XCancelManager_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XCancellable_idl__ 
+#include <com/sun/star/util/XCancellable.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** manages a list of cancellable objects.
-
+    
     @deprecated
  */
 published interface XCancelManager: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** registers a cancellable object.
      */
-    void registerCancellable( [in] com::sun::star::util::XCancellable Cancel );
-
-    //-------------------------------------------------------------------------
+    void registerCancellable( [in] com::sun::star::util::XCancellable Cancel ); 
+ 
+    //------------------------------------------------------------------------- 
     /** deregisters a cancellable object.
      */
-    void releaseCancellable( [in] com::sun::star::util::XCancellable Cancel );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void releaseCancellable( [in] com::sun::star::util::XCancellable Cancel ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XCancellable.idl b/offapi/com/sun/star/util/XCancellable.idl
index 6887942234e9..e46c2195cef8 100644
--- a/offapi/com/sun/star/util/XCancellable.idl
+++ b/offapi/com/sun/star/util/XCancellable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XCancellable_idl__
-#define __com_sun_star_util_XCancellable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XCancellable_idl__ 
+#define __com_sun_star_util_XCancellable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** offers the possibility of cancelling a job.
 
     <p>This is supported by objects which represent a job.
  */
 published interface XCancellable: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** cancels the current job of the object.
      */
-    void cancel();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void cancel(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XChainable.idl b/offapi/com/sun/star/util/XChainable.idl
index e381bc683839..c93010e3fa95 100644
--- a/offapi/com/sun/star/util/XChainable.idl
+++ b/offapi/com/sun/star/util/XChainable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XChainable_idl__
-#define __com_sun_star_util_XChainable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XChainable_idl__ 
+#define __com_sun_star_util_XChainable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** enables the object to be a member of a chain.
  */
 published interface XChainable: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-    /** @returns
-                the previous object in this chain or NULL, if this is the first
+{ 
+    //------------------------------------------------------------------------- 
+    /** @returns 
+                the previous object in this chain or NULL, if this is the first  
                 object of this chain.
      */
-    com::sun::star::util::XChainable getPredecessor();
-
-    //-------------------------------------------------------------------------
-    /** @returns
-                the next object in this chain or NULL, if this is the last
+    com::sun::star::util::XChainable getPredecessor(); 
+ 
+    //------------------------------------------------------------------------- 
+    /** @returns 
+                the next object in this chain or NULL, if this is the last  
                 object in this chain.
      */
-    com::sun::star::util::XChainable getSuccessor();
-
-    //-------------------------------------------------------------------------
-    /** connects the specified object to this object as the successor in a chain.
-
-        <p>This implies that this object will become the predecessor of
+    com::sun::star::util::XChainable getSuccessor(); 
+ 
+    //------------------------------------------------------------------------- 
+    /** connects the specified object to this object as the successor in a chain. 
+        
+        <p>This implies that this object will become the predecessor of 
         <var>xChainable</var>.  </p>
      */
-    void setSuccessor( [in] com::sun::star::util::XChainable xChainable )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
+    void setSuccessor( [in] com::sun::star::util::XChainable xChainable ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** checks if the specified object can be linked to this.
      */
-    boolean isChainable( [in] com::sun::star::util::XChainable xChainable );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean isChainable( [in] com::sun::star::util::XChainable xChainable ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XChangesBatch.idl b/offapi/com/sun/star/util/XChangesBatch.idl
index 253aa80abe33..156459ed4877 100644
--- a/offapi/com/sun/star/util/XChangesBatch.idl
+++ b/offapi/com/sun/star/util/XChangesBatch.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,63 +24,63 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XChangesBatch_idl__
-#define __com_sun_star_util_XChangesBatch_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_util_ChangesSet_idl__
-#include <com/sun/star/util/ChangesSet.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
+#ifndef __com_sun_star_util_XChangesBatch_idl__ 
+#define __com_sun_star_util_XChangesBatch_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_ChangesSet_idl__ 
+#include <com/sun/star/util/ChangesSet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
 /** this interface enables applying a set of changes in one batch transaction.
-
+    
     <p>An object implementing this interface allows other interfaces to change
     its state locally. It will keep a list of pending changes until such changes
-    are committed or cancelled. </p>
+    are committed or cancelled.	</p>
 
-    <p>Only when they are explicitly committed will these changes take effect
+    <p>Only when they are explicitly committed will these changes take effect 
     persistently or globally.  </p>
 
-    @see XChangesNotifier
-    @see XChangesSet
+    @see XChangesNotifier 
+    @see XChangesSet 
     @see XCancellable
  */
 published interface XChangesBatch: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** commits any pending changes.
-
+        
         <p>The exact action depends on the concrete service.  </p>
      */
-    void commitChanges()
-            raises( com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
+    void commitChanges() 
+            raises( com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** checks whether this object has any pending changes that can be committed.
      */
-    boolean hasPendingChanges();
-
-    //-------------------------------------------------------------------------
+    boolean hasPendingChanges(); 
+ 
+    //------------------------------------------------------------------------- 
     /** queries for any pending changes that can be committed.
      */
-    ChangesSet getPendingChanges();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    ChangesSet getPendingChanges(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XChangesListener.idl b/offapi/com/sun/star/util/XChangesListener.idl
index 5591c2caf091..ce44f3b84e28 100644
--- a/offapi/com/sun/star/util/XChangesListener.idl
+++ b/offapi/com/sun/star/util/XChangesListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XChangesListener_idl__
-#define __com_sun_star_util_XChangesListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_util_ChangesEvent_idl__
-#include <com/sun/star/util/ChangesEvent.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XChangesListener_idl__ 
+#define __com_sun_star_util_XChangesListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_ChangesEvent_idl__ 
+#include <com/sun/star/util/ChangesEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** receives events from batch change broadcaster objects.
 
-    @see ChangesEvent
-    @see XChangesNotifier
+    @see ChangesEvent 
+    @see XChangesNotifier 
     @see XChangesBatch
  */
 published interface XChangesListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** is invoked when a batch of changes occurred.
      */
-    [oneway] void changesOccurred( [in] com::sun::star::util::ChangesEvent Event );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void changesOccurred( [in] com::sun::star::util::ChangesEvent Event ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XChangesNotifier.idl b/offapi/com/sun/star/util/XChangesNotifier.idl
index 6ca009069509..9d8c76d7275e 100644
--- a/offapi/com/sun/star/util/XChangesNotifier.idl
+++ b/offapi/com/sun/star/util/XChangesNotifier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XChangesNotifier_idl__
-#define __com_sun_star_util_XChangesNotifier_idl__
-
-#ifndef __com_sun_star_util_XChangesListener_idl__
-#include <com/sun/star/util/XChangesListener.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XChangesNotifier_idl__ 
+#define __com_sun_star_util_XChangesNotifier_idl__ 
+ 
+#ifndef __com_sun_star_util_XChangesListener_idl__ 
+#include <com/sun/star/util/XChangesListener.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** broadcasts events about multiple changes that occur in bulk.
 
-    @see XChangesListener
-    @see XChangesBatch
+    @see XChangesListener 
+    @see XChangesBatch 
     @see ChangesEvent
  */
 published interface XChangesNotifier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** adds the specified listener to receive events when changes occured.
      */
-    [oneway] void addChangesListener( [in] com::sun::star::util::XChangesListener aListener );
-
-    //-------------------------------------------------------------------------
+    [oneway] void addChangesListener( [in] com::sun::star::util::XChangesListener aListener ); 
+ 
+    //------------------------------------------------------------------------- 
     /** removes the specified listener.
      */
-    [oneway] void removeChangesListener( [in] com::sun::star::util::XChangesListener aListener );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void removeChangesListener( [in] com::sun::star::util::XChangesListener aListener ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XChangesSet.idl b/offapi/com/sun/star/util/XChangesSet.idl
index b812d0389eef..ad2db051488d 100644
--- a/offapi/com/sun/star/util/XChangesSet.idl
+++ b/offapi/com/sun/star/util/XChangesSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XChangesSet_idl__
-#define __com_sun_star_util_XChangesSet_idl__
-
-#ifndef __com_sun_star_container_XElementAccess_idl__
-#include <com/sun/star/container/XElementAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_util_ElementChange_idl__
-#include <com/sun/star/util/ElementChange.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
+#ifndef __com_sun_star_util_XChangesSet_idl__ 
+#define __com_sun_star_util_XChangesSet_idl__ 
+ 
+#ifndef __com_sun_star_container_XElementAccess_idl__ 
+#include <com/sun/star/container/XElementAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_ElementChange_idl__ 
+#include <com/sun/star/util/ElementChange.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
 /** this interface enables inspecting a set of changes forming one batch transaction.
-
+    
     <p>An object implementing this interface should implement more
-    container interfaces to access individual changes as well.  </p>
-
-    @see XChangesBatch
-    @see ChangesEvent
-    @see XChangesListener
+    container interfaces to access individual changes as well.	</p>
+    
+    @see XChangesBatch 
+    @see ChangesEvent 
+    @see XChangesListener 
     @see XChangesNotifier
  */
 published interface XChangesSet: com::sun::star::container::XElementAccess
-{
-    //-------------------------------------------------------------------------
-    /** queries for all contained changes at once.
-
-        @returns an array of <type>ElementChange</type> holding information about
+{ 
+    //------------------------------------------------------------------------- 
+    /** queries for all contained changes at once. 
+             
+        @returns an array of <type>ElementChange</type> holding information about 
             each changes  that is part of this object.
      */
-    sequence<ElementChange> getAllChanges();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    sequence<ElementChange> getAllChanges(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XCloneable.idl b/offapi/com/sun/star/util/XCloneable.idl
index f89fcb9eb96d..062fdba1777c 100644
--- a/offapi/com/sun/star/util/XCloneable.idl
+++ b/offapi/com/sun/star/util/XCloneable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XCloneable_idl__
-#define __com_sun_star_util_XCloneable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XCloneable_idl__ 
+#define __com_sun_star_util_XCloneable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to create a copy of the object which supports this interface.
  */
 published interface XCloneable: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** creates a copy of the object.
      */
-    com::sun::star::util::XCloneable createClone();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::util::XCloneable createClone(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XCloseBroadcaster.idl b/offapi/com/sun/star/util/XCloseBroadcaster.idl
index 7bf7e0f892d5..72f38b363811 100644
--- a/offapi/com/sun/star/util/XCloseBroadcaster.idl
+++ b/offapi/com/sun/star/util/XCloseBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/XCloseListener.idl b/offapi/com/sun/star/util/XCloseListener.idl
index 8e45e3d7ad0f..8bba2b35f84f 100644
--- a/offapi/com/sun/star/util/XCloseListener.idl
+++ b/offapi/com/sun/star/util/XCloseListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/XCloseable.idl b/offapi/com/sun/star/util/XCloseable.idl
index 56fb5429d18f..19c5143007e2 100644
--- a/offapi/com/sun/star/util/XCloseable.idl
+++ b/offapi/com/sun/star/util/XCloseable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/XDataEditor.idl b/offapi/com/sun/star/util/XDataEditor.idl
index 82cc18d53eae..a395e04f8a11 100644
--- a/offapi/com/sun/star/util/XDataEditor.idl
+++ b/offapi/com/sun/star/util/XDataEditor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XDataEditor_idl__
-#define __com_sun_star_util_XDataEditor_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XDataEditorListener_idl__
-#include <com/sun/star/util/XDataEditorListener.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
+#ifndef __com_sun_star_util_XDataEditor_idl__ 
+#define __com_sun_star_util_XDataEditor_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XDataEditorListener_idl__ 
+#include <com/sun/star/util/XDataEditorListener.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
 /** connects to a model and broadcasts status change events.
  */
 published interface XDataEditor: com::sun::star::uno::XInterface
-{
+{ 
     /** makes the data editor visible to the user.
      */
-    void show();
-
+    void show(); 
+    
     //--------------------------------------------------------------------------
     /** connects the data editor to a data model.
      */
-    void setModel( [in] com::sun::star::uno::XInterface model );
-
+    void setModel( [in] com::sun::star::uno::XInterface model ); 
+    
     //--------------------------------------------------------------------------
-    /** @returns
+    /** @returns 
             the data model which was set by <method>XDataEditor::setModel</method>.
      */
-    com::sun::star::uno::XInterface getModel();
-
+    com::sun::star::uno::XInterface getModel(); 
+ 
     //--------------------------------------------------------------------------
     /** registers a listener to receive <type>DataEditorEvent</type>s.
      */
-    void addDataEditorListener( [in] XDataEditorListener listener );
-
+    void addDataEditorListener( [in] XDataEditorListener listener ); 
+    
     //--------------------------------------------------------------------------
     /** unregisters a listener which received <type>DataEditorEvent</type>s.
      */
-    void removeDataEditorListener( [in] XDataEditorListener listener );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void removeDataEditorListener( [in] XDataEditorListener listener ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XDataEditorListener.idl b/offapi/com/sun/star/util/XDataEditorListener.idl
index abe91ed2a36a..088bb43c56d8 100644
--- a/offapi/com/sun/star/util/XDataEditorListener.idl
+++ b/offapi/com/sun/star/util/XDataEditorListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XDataEditorListener_idl__
-#define __com_sun_star_util_XDataEditorListener_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_DataEditorEvent_idl__
-#include <com/sun/star/util/DataEditorEvent.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
+#ifndef __com_sun_star_util_XDataEditorListener_idl__ 
+#define __com_sun_star_util_XDataEditorListener_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_DataEditorEvent_idl__ 
+#include <com/sun/star/util/DataEditorEvent.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
 /** makes it possible to receive status change events from an
     <type>XDataEditor</type>.
  */
 published interface XDataEditorListener: com::sun::star::uno::XInterface
-{
+{ 
     /** is called when the state of a connected <type>XDataEditor</type> changes.
      */
-    void updateDataEditorState( [in] DataEditorEvent event );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void updateDataEditorState( [in] DataEditorEvent event ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XFlushListener.idl b/offapi/com/sun/star/util/XFlushListener.idl
index 521aebc5e003..9e45603771a2 100644
--- a/offapi/com/sun/star/util/XFlushListener.idl
+++ b/offapi/com/sun/star/util/XFlushListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XFlushListener_idl__
-#define __com_sun_star_util_XFlushListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XFlushListener_idl__ 
+#define __com_sun_star_util_XFlushListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive <em>flushed</em> events.
  */
 published interface XFlushListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** is called when the object data is flushed.
      */
-    void flushed( [in] com::sun::star::lang::EventObject rEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void flushed( [in] com::sun::star::lang::EventObject rEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XFlushable.idl b/offapi/com/sun/star/util/XFlushable.idl
index 668d64055ed8..4365cd742e38 100644
--- a/offapi/com/sun/star/util/XFlushable.idl
+++ b/offapi/com/sun/star/util/XFlushable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XFlushable_idl__
-#define __com_sun_star_util_XFlushable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XFlushListener_idl__
-#include <com/sun/star/util/XFlushListener.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XFlushable_idl__ 
+#define __com_sun_star_util_XFlushable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XFlushListener_idl__ 
+#include <com/sun/star/util/XFlushListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** is supported by objects with data that can be flushed to a data source.
  */
 published interface XFlushable: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** flushes the data of the object to the connected data source.
      */
-    void flush();
-
-    //-------------------------------------------------------------------------
+    void flush(); 
+ 
+    //------------------------------------------------------------------------- 
     /** adds the specified listener to receive event "flushed."
      */
-    [oneway] void addFlushListener( [in] com::sun::star::util::XFlushListener l );
-
-    //-------------------------------------------------------------------------
+    [oneway] void addFlushListener( [in] com::sun::star::util::XFlushListener l ); 
+ 
+    //------------------------------------------------------------------------- 
     /** removes the specified listener.
      */
-    [oneway] void removeFlushListener( [in] com::sun::star::util::XFlushListener l );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void removeFlushListener( [in] com::sun::star::util::XFlushListener l ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XImportable.idl b/offapi/com/sun/star/util/XImportable.idl
index 05872c6e3231..4163ad64b0a0 100644
--- a/offapi/com/sun/star/util/XImportable.idl
+++ b/offapi/com/sun/star/util/XImportable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XImportable_idl__
-#define __com_sun_star_util_XImportable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XImportable_idl__ 
+#define __com_sun_star_util_XImportable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::util::XImportable
 /** makes it possible to import files into the object.
  */
 published interface XImportable: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::util::XImportable::createImportDescriptor
-    /** @returns
+    /** @returns 
                     a descriptor which contains the arguments for an import.
      */
-    sequence<com::sun::star::beans::PropertyValue> createImportDescriptor( [in] boolean bEmpty );
-
-    //-------------------------------------------------------------------------
-
+    sequence<com::sun::star::beans::PropertyValue> createImportDescriptor( [in] boolean bEmpty ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::util::XImportable::doImport
     /** imports data from an external database.
      */
-    void doImport( [in] sequence<com::sun::star::beans::PropertyValue> aDescriptor );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void doImport( [in] sequence<com::sun::star::beans::PropertyValue> aDescriptor ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XIndent.idl b/offapi/com/sun/star/util/XIndent.idl
index dffd7334316b..55e1c7c7bf65 100644
--- a/offapi/com/sun/star/util/XIndent.idl
+++ b/offapi/com/sun/star/util/XIndent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XIndent_idl__
-#define __com_sun_star_util_XIndent_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module util {
-
-//=============================================================================
+#ifndef __com_sun_star_util_XIndent_idl__ 
+#define __com_sun_star_util_XIndent_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
 /** allows indentation of the object to be changed.
  */
 published interface XIndent: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** shifts the indentation by one default step to the left.
      */
-    void decrementIndent();
-
-    //-------------------------------------------------------------------------
+    void decrementIndent(); 
+ 
+    //------------------------------------------------------------------------- 
     /** shifts the indentation by one default step to the right.
      */
-    void incrementIndent();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void incrementIndent(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XJobManager.idl b/offapi/com/sun/star/util/XJobManager.idl
index 99bc7b5428a1..fb1fe0f0ce99 100644
--- a/offapi/com/sun/star/util/XJobManager.idl
+++ b/offapi/com/sun/star/util/XJobManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/XLinkUpdate.idl b/offapi/com/sun/star/util/XLinkUpdate.idl
index d4c3a1a41850..200ccbe48244 100644
--- a/offapi/com/sun/star/util/XLinkUpdate.idl
+++ b/offapi/com/sun/star/util/XLinkUpdate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/XLocalizedAliases.idl b/offapi/com/sun/star/util/XLocalizedAliases.idl
index cb3e0c7bc9f2..a3293955eb3a 100644
--- a/offapi/com/sun/star/util/XLocalizedAliases.idl
+++ b/offapi/com/sun/star/util/XLocalizedAliases.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,94 +24,94 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XLocalizedAliases_idl__
-#define __com_sun_star_util_XLocalizedAliases_idl__
-
-#ifndef __com_sun_star_lang_Locale_idl__
-#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
-#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_util_AliasProgrammaticPair_idl__
-#include <com/sun/star/util/AliasProgrammaticPair.idl>
-#endif
-
-//=============================================================================
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XLocalizedAliases_idl__ 
+#define __com_sun_star_util_XLocalizedAliases_idl__ 
+ 
+#ifndef __com_sun_star_lang_Locale_idl__ 
+#include <com/sun/star/lang/Locale.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_ElementExistException_idl__ 
+#include <com/sun/star/container/ElementExistException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_AliasProgrammaticPair_idl__ 
+#include <com/sun/star/util/AliasProgrammaticPair.idl> 
+#endif 
+ 
+//============================================================================= 
+module com {  module sun {  module star {  module util { 
+ 
+//============================================================================= 
+ 
 /** is the interface for binding programmatic names to aliases. Aliases
     can be provided in several locales for the same programmatic name.
  */
 published interface XLocalizedAliases: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** registers an alias for a programmatic name.
      */
-    void bindAlias([in]string programmaticName,
-                   [in]com::sun::star::lang::Locale locale,
-                    [in]string alias)
-        raises (com::sun::star::container::ElementExistException);
-    //-------------------------------------------------------------------------
+    void bindAlias([in]string programmaticName, 
+                   [in]com::sun::star::lang::Locale locale, 
+                    [in]string alias) 
+        raises (com::sun::star::container::ElementExistException); 
+    //------------------------------------------------------------------------- 
     /** revokes an alias for a programmatic name.
      */
-    void unbindAlias([in]com::sun::star::lang::Locale locale,
-                     [in]string alias)
-        raises (com::sun::star::container::NoSuchElementException);
-    //-------------------------------------------------------------------------
+    void unbindAlias([in]com::sun::star::lang::Locale locale, 
+                     [in]string alias) 
+        raises (com::sun::star::container::NoSuchElementException); 
+    //------------------------------------------------------------------------- 
     /** retrieves a registered porgrammatic name identified by an alias.
      */
-    string lookupAlias([in]com::sun::star::lang::Locale locale,
-                         [in]string Alias)
-        raises (com::sun::star::container::NoSuchElementException);
-    //-------------------------------------------------------------------------
+    string lookupAlias([in]com::sun::star::lang::Locale locale, 
+                         [in]string Alias) 
+        raises (com::sun::star::container::NoSuchElementException); 
+    //------------------------------------------------------------------------- 
     /** retrieves a given alias for a programmatic name.
      */
-    string lookupProgrammatic([in]com::sun::star::lang::Locale locale,
-                                [in]string programmatic)
-        raises (com::sun::star::container::NoSuchElementException);
-    //-------------------------------------------------------------------------
+    string lookupProgrammatic([in]com::sun::star::lang::Locale locale, 
+                                [in]string programmatic) 
+        raises (com::sun::star::container::NoSuchElementException); 
+    //------------------------------------------------------------------------- 
     /** removes all aliases for a programmatic name.
      */
-    void unbindAliases([in]string programmaticName)
-        raises (com::sun::star::container::NoSuchElementException);
-    //-------------------------------------------------------------------------
+    void unbindAliases([in]string programmaticName) 
+        raises (com::sun::star::container::NoSuchElementException); 
+    //------------------------------------------------------------------------- 
     /** rebinds all aliases registered to a given URL to a new one.
      */
-    void rebindAliases([in]string currentProgrammatic,
-                        [in]string newProgrammatic)
-        raises (com::sun::star::container::NoSuchElementException,
-                com::sun::star::container::ElementExistException);
-    //-------------------------------------------------------------------------
+    void rebindAliases([in]string currentProgrammatic, 
+                        [in]string newProgrammatic) 
+        raises (com::sun::star::container::NoSuchElementException, 
+                com::sun::star::container::ElementExistException); 
+    //------------------------------------------------------------------------- 
     /** renames an alias for a programmatic name.
      */
-    void renameAlias([in]com::sun::star::lang::Locale locale,
-                     [in]string oldName,
-                     [in]string aNewName)
-        raises (com::sun::star::container::NoSuchElementException,
-                com::sun::star::container::ElementExistException);
-    //-------------------------------------------------------------------------
-    /** retrieves a list of all registered aliases for a certain language.
+    void renameAlias([in]com::sun::star::lang::Locale locale, 
+                     [in]string oldName, 
+                     [in]string aNewName) 
+        raises (com::sun::star::container::NoSuchElementException, 
+                com::sun::star::container::ElementExistException); 
+    //------------------------------------------------------------------------- 
+    /** retrieves a list of all registered aliases for a certain language. 
 
-         @param locale
-            specifies the locale scope.
+         @param locale 
+            specifies the locale scope. 
 
-         @returns
+         @returns 
             a sequence of registered pair of alias and programmatic name.
      */
-    sequence<AliasProgrammaticPair> listAliases([in]com::sun::star::lang::Locale locale);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    sequence<AliasProgrammaticPair> listAliases([in]com::sun::star::lang::Locale locale); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XMergeable.idl b/offapi/com/sun/star/util/XMergeable.idl
index ba2ac3bc90ea..55612d39adeb 100644
--- a/offapi/com/sun/star/util/XMergeable.idl
+++ b/offapi/com/sun/star/util/XMergeable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XMergeable_idl__
-#define __com_sun_star_util_XMergeable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XMergeable_idl__ 
+#define __com_sun_star_util_XMergeable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** represents a range of cells that can be merged.
  */
 published interface XMergeable: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** merges/unmerges the area specified by this object.
      */
-    void merge( [in] boolean bMerge );
-
-    //-------------------------------------------------------------------------
+    void merge( [in] boolean bMerge ); 
+ 
+    //------------------------------------------------------------------------- 
     /** @returns
-            <TRUE/> if the area specified by this object is merged,
+            <TRUE/> if the area specified by this object is merged, 
             or <FALSE/> otherwise.
      */
-    boolean getIsMerged();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean getIsMerged(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XModeChangeApproveListener.idl b/offapi/com/sun/star/util/XModeChangeApproveListener.idl
index 76226462531f..4012a4f0fa02 100644
--- a/offapi/com/sun/star/util/XModeChangeApproveListener.idl
+++ b/offapi/com/sun/star/util/XModeChangeApproveListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/XModeChangeBroadcaster.idl b/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
index 1c9cbbde8fa8..f4c45dc18862 100644
--- a/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
+++ b/offapi/com/sun/star/util/XModeChangeBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/XModeChangeListener.idl b/offapi/com/sun/star/util/XModeChangeListener.idl
index 5f3437081585..ed6a1f36c8cb 100644
--- a/offapi/com/sun/star/util/XModeChangeListener.idl
+++ b/offapi/com/sun/star/util/XModeChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,13 +25,13 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_util_XModeChangeListener_idl__
-#define __com_sun_star_util_XModeChangeListener_idl__
+#ifndef __com_sun_star_util_XModeChangeListener_idl__ 
+#define __com_sun_star_util_XModeChangeListener_idl__ 
 
 #ifndef __com_sun_star_lang_XEventListener_idl__
 #include <com/sun/star/lang/XEventListener.idl>
 #endif
-
+ 
 #ifndef __com_sun_star_util_ModeChangeEvent_idl__
 #include <com/sun/star/util/ModeChangeEvent.idl>
 #endif
diff --git a/offapi/com/sun/star/util/XModeSelector.idl b/offapi/com/sun/star/util/XModeSelector.idl
index 7efefb361a04..d8916b6bd00a 100644
--- a/offapi/com/sun/star/util/XModeSelector.idl
+++ b/offapi/com/sun/star/util/XModeSelector.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,55 +24,55 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XModeSelector_idl__
-#define __com_sun_star_util_XModeSelector_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
-#include <com/sun/star/lang/NoSupportException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XModeSelector_idl__ 
+#define __com_sun_star_util_XModeSelector_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_NoSupportException_idl__ 
+#include <com/sun/star/lang/NoSupportException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** is supported by objects which supply different modes.
  */
 published interface XModeSelector: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** sets a new mode for the implementing object.
      */
-    void setMode( [in] string aMode )
-            raises( com::sun::star::lang::NoSupportException );
-
-    //-------------------------------------------------------------------------
-    /** @returns
+    void setMode( [in] string aMode ) 
+            raises( com::sun::star::lang::NoSupportException ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** @returns 
                     the current mode.
      */
-    string getMode();
-
-    //-------------------------------------------------------------------------
-    /** @returns
+    string getMode(); 
+ 
+    //------------------------------------------------------------------------- 
+    /** @returns 
                     a sequence of all supported modes.
      */
-    sequence<string> getSupportedModes();
-
-    //-------------------------------------------------------------------------
+    sequence<string> getSupportedModes(); 
+ 
+    //------------------------------------------------------------------------- 
     /** asks whether a mode is supported or not.
      */
-    boolean supportsMode( [in] string aMode );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean supportsMode( [in] string aMode ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XModifiable.idl b/offapi/com/sun/star/util/XModifiable.idl
index 2f0b37531aca..6b3dc7b19649 100644
--- a/offapi/com/sun/star/util/XModifiable.idl
+++ b/offapi/com/sun/star/util/XModifiable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XModifiable_idl__
-#define __com_sun_star_util_XModifiable_idl__
-
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
-#include <com/sun/star/util/XModifyBroadcaster.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
-#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XModifiable_idl__ 
+#define __com_sun_star_util_XModifiable_idl__ 
+ 
+#ifndef __com_sun_star_util_XModifyBroadcaster_idl__ 
+#include <com/sun/star/util/XModifyBroadcaster.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
+#include <com/sun/star/beans/PropertyVetoException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** makes the modify state of the object accessible.
-
+    
     <p>Additionally, it makes it possible to register listener objects, which
-    get notification whenever the status or content of the object changes.  </p>
+    get notification whenever the status or content of the object changes.	</p>
  */
 published interface XModifiable: com::sun::star::util::XModifyBroadcaster
-{
-    //-------------------------------------------------------------------------
-    /** @returns
-                <TRUE/> if the object is modified.
-
-        <p>The modification is always in relation to a certain state
+{ 
+    //------------------------------------------------------------------------- 
+    /** @returns 
+                <TRUE/> if the object is modified. 
+                 
+        <p>The modification is always in relation to a certain state  
         (i.e., the initial, loaded, or last stored version).
      */
-    boolean isModified();
-
-    //-------------------------------------------------------------------------
-    /** sets the status of the <em>modified</em>-flag from outside of the
+    boolean isModified(); 
+ 
+    //------------------------------------------------------------------------- 
+    /** sets the status of the <em>modified</em>-flag from outside of the 
         object.
      */
-    void setModified( [in] boolean bModified )
-            raises( com::sun::star::beans::PropertyVetoException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void setModified( [in] boolean bModified ) 
+            raises( com::sun::star::beans::PropertyVetoException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XModifiable2.idl b/offapi/com/sun/star/util/XModifiable2.idl
index fe2c7960e9d1..58adca4da994 100644
--- a/offapi/com/sun/star/util/XModifiable2.idl
+++ b/offapi/com/sun/star/util/XModifiable2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
 ************************************************************************/
-#ifndef __com_sun_star_util_XModifiable2_idl__
-#define __com_sun_star_util_XModifiable2_idl__
-
-#ifndef __com_sun_star_util_XModifiable_idl__
-#include <com/sun/star/util/XModifiable.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
-#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XModifiable2_idl__ 
+#define __com_sun_star_util_XModifiable2_idl__ 
+ 
+#ifndef __com_sun_star_util_XModifiable_idl__ 
+#include <com/sun/star/util/XModifiable.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
+#include <com/sun/star/beans/PropertyVetoException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** allows to control modifiable state change.
-
+    
     <p>
     This interface allows to prevent changing of the modified state of the
     object. It is introduced for performance optimizations, to allow to prevent
@@ -52,8 +52,8 @@ module com {  module sun {  module star {  module util {
     </p>
  */
 interface XModifiable2: com::sun::star::util::XModifiable
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** disable possibility to change modified state of the document
 
         @retuns the value that says whether the modified state change was
@@ -64,7 +64,7 @@ interface XModifiable2: com::sun::star::util::XModifiable
      */
     boolean disableSetModified();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** enable possibility to change modified state of the document
 
         @retuns the value that says whether the modified state change was
@@ -74,15 +74,15 @@ interface XModifiable2: com::sun::star::util::XModifiable
      */
     boolean enableSetModified();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** allows to detect whether the modified state change is enabled
      */
     boolean isSetModifiedEnabled();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/offapi/com/sun/star/util/XModifyBroadcaster.idl b/offapi/com/sun/star/util/XModifyBroadcaster.idl
index 657db5400126..8f29139b2160 100644
--- a/offapi/com/sun/star/util/XModifyBroadcaster.idl
+++ b/offapi/com/sun/star/util/XModifyBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XModifyBroadcaster_idl__
-#define __com_sun_star_util_XModifyBroadcaster_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XModifyListener_idl__
-#include <com/sun/star/util/XModifyListener.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XModifyBroadcaster_idl__ 
+#define __com_sun_star_util_XModifyBroadcaster_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XModifyListener_idl__ 
+#include <com/sun/star/util/XModifyListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** broadcasts each modification made on the date data of the object which
     supports this interface.
-
-    <p>The modified object must post the modification events immediately
+    
+    <p>The modified object must post the modification events immediately 
     after the modification is performed.</p>
  */
 published interface XModifyBroadcaster: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** adds the specified listener to receive events "modified."
      */
-    [oneway] void addModifyListener( [in] com::sun::star::util::XModifyListener aListener );
-
-    //-------------------------------------------------------------------------
+    [oneway] void addModifyListener( [in] com::sun::star::util::XModifyListener aListener ); 
+ 
+    //------------------------------------------------------------------------- 
     /** removes the specified listener.
      */
-    [oneway] void removeModifyListener( [in] com::sun::star::util::XModifyListener aListener );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void removeModifyListener( [in] com::sun::star::util::XModifyListener aListener ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XModifyListener.idl b/offapi/com/sun/star/util/XModifyListener.idl
index e31574aaff2a..01a6a98a9d94 100644
--- a/offapi/com/sun/star/util/XModifyListener.idl
+++ b/offapi/com/sun/star/util/XModifyListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XModifyListener_idl__
-#define __com_sun_star_util_XModifyListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XModifyListener_idl__ 
+#define __com_sun_star_util_XModifyListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive events when a model object changes.
  */
 published interface XModifyListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** is called when something changes in the object.
-
-        <p>Due to such an event, it may be necessary to update views or
+        
+        <p>Due to such an event, it may be necessary to update views or 
         controllers.  </p>
 
         <p>The source of the event may be the content of the object to
         which the listener is registered.</p>
      */
-    void modified( [in] com::sun::star::lang::EventObject aEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void modified( [in] com::sun::star::lang::EventObject aEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XNumberFormatPreviewer.idl b/offapi/com/sun/star/util/XNumberFormatPreviewer.idl
index cd94ebd1335f..4abd7d1dcb2d 100644
--- a/offapi/com/sun/star/util/XNumberFormatPreviewer.idl
+++ b/offapi/com/sun/star/util/XNumberFormatPreviewer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XNumberFormatPreviewer_idl__
-#define __com_sun_star_util_XNumberFormatPreviewer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
-#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
-#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_util_MalformedNumberFormatException_idl__
-#include <com/sun/star/util/MalformedNumberFormatException.idl>
-#endif
-
+#ifndef __com_sun_star_util_XNumberFormatPreviewer_idl__ 
+#define __com_sun_star_util_XNumberFormatPreviewer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
-/** represents a number formatter which can preview number
+#ifndef __com_sun_star_lang_Locale_idl__ 
+#include <com/sun/star/lang/Locale.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_MalformedNumberFormatException_idl__ 
+#include <com/sun/star/util/MalformedNumberFormatException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_Color_idl__ 
+#include <com/sun/star/util/Color.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
+/** represents a number formatter which can preview number 
     formats without inserting them.
 
     @see NumberFormatter
  */
 published interface XNumberFormatPreviewer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** formats a value using a format string, without inserting a
         number format into the list.
 
@@ -79,21 +79,21 @@ published interface XNumberFormatPreviewer: com::sun::star::uno::XInterface
             specifies if English language number format strings are accepted
             in addition to those from the selected locale.
 
-        @returns
+        @returns 
             the formatted string.
 
         @throws com::sun::star::util::MalformedNumberFormatException
             if the format string is invalid.
 
      */
-    string convertNumberToPreviewString( [in] string aFormat,
-             [in] double fValue,
-             [in] com::sun::star::lang::Locale nLocale,
-             [in] boolean bAllowEnglish )
-            raises( com::sun::star::util::MalformedNumberFormatException );
-
-    //-------------------------------------------------------------------------
-
+    string convertNumberToPreviewString( [in] string aFormat, 
+             [in] double fValue, 
+             [in] com::sun::star::lang::Locale nLocale, 
+             [in] boolean bAllowEnglish ) 
+            raises( com::sun::star::util::MalformedNumberFormatException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** returns the color which is to be used for a number.
 
         @param aFormat
@@ -113,25 +113,25 @@ published interface XNumberFormatPreviewer: com::sun::star::uno::XInterface
             is the color that should be returned if no color is set by
             the number format.
 
-        @returns
+        @returns 
             the color that should used to output the formatted string.
 
         @throws com::sun::star::util::MalformedNumberFormatException
             if the format string is invalid.
 
      */
-    com::sun::star::util::Color queryPreviewColorForNumber( [in] string aFormat,
-             [in] double fValue,
-             [in] com::sun::star::lang::Locale nLocale,
-             [in] boolean bAllowEnglish,
-             [in] com::sun::star::util::Color aDefaultColor )
-            raises( com::sun::star::util::MalformedNumberFormatException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    com::sun::star::util::Color queryPreviewColorForNumber( [in] string aFormat, 
+             [in] double fValue, 
+             [in] com::sun::star::lang::Locale nLocale, 
+             [in] boolean bAllowEnglish, 
+             [in] com::sun::star::util::Color aDefaultColor ) 
+            raises( com::sun::star::util::MalformedNumberFormatException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/util/XNumberFormatTypes.idl b/offapi/com/sun/star/util/XNumberFormatTypes.idl
index 9c896440e20e..285453eb040a 100644
--- a/offapi/com/sun/star/util/XNumberFormatTypes.idl
+++ b/offapi/com/sun/star/util/XNumberFormatTypes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -70,7 +70,7 @@ published interface XNumberFormatTypes: com::sun::star::uno::XInterface
     /** @returns
                 the key of a built-in format for a locale:
 
-                @param  nIndex
+                @param	nIndex
                 the index of the wanted number format within the formats for
                 the given locale. One of the
                  <type scope="com::sun::star::i18n">NumberFormatIndex</type>
diff --git a/offapi/com/sun/star/util/XNumberFormats.idl b/offapi/com/sun/star/util/XNumberFormats.idl
index 25954d8e4f99..f499b5c53491 100644
--- a/offapi/com/sun/star/util/XNumberFormats.idl
+++ b/offapi/com/sun/star/util/XNumberFormats.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,113 +24,113 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XNumberFormats_idl__
-#define __com_sun_star_util_XNumberFormats_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
-#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_util_MalformedNumberFormatException_idl__
-#include <com/sun/star/util/MalformedNumberFormatException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XNumberFormats_idl__ 
+#define __com_sun_star_util_XNumberFormats_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_Locale_idl__ 
+#include <com/sun/star/lang/Locale.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_MalformedNumberFormatException_idl__ 
+#include <com/sun/star/util/MalformedNumberFormatException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** provides access to multiple <type>NumberFormat</type>s.
  */
 published interface XNumberFormats: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
                     a readonly <type>NumberFormatProperties</type>.
      */
-    com::sun::star::beans::XPropertySet getByKey( [in] long nKey );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-                    a sequence of the keys of all number formats with the specified type and language.
-
-                @param  nType
-                        the type of number formats to return. Must be one of the
-                        <type>NumberFormat</type> constants.
-
-                @param  nLanguage
-                        the language of number formats to return.
-
-                @param  bCreate
-                        <TRUE/>: create new entries if no formats for the selected language exist<BR>
+    com::sun::star::beans::XPropertySet getByKey( [in] long nKey ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
+                    a sequence of the keys of all number formats with the specified type and language. 
+         
+                @param	nType 
+                        the type of number formats to return. Must be one of the 
+                        <type>NumberFormat</type> constants. 
+         
+                @param	nLanguage 
+                        the language of number formats to return. 
+         
+                @param	bCreate 
+                        <TRUE/>: create new entries if no formats for the selected language exist<BR> 
                         <FALSE/>: return an empty list if no formats for the selected language exist
      */
-    sequence<long> queryKeys( [in] short nType,
-             [in] com::sun::star::lang::Locale nLocale,
-             [in] boolean bCreate );
-
-    //-------------------------------------------------------------------------
-
+    sequence<long> queryKeys( [in] short nType, 
+             [in] com::sun::star::lang::Locale nLocale, 
+             [in] boolean bCreate ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** finds a number format by its format string and returns its key.
      */
-    long queryKey( [in] string aFormat,
-             [in] com::sun::star::lang::Locale nLocale,
-             [in] boolean bScan );
-
-    //-------------------------------------------------------------------------
-
+    long queryKey( [in] string aFormat, 
+             [in] com::sun::star::lang::Locale nLocale, 
+             [in] boolean bScan ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** adds a new number format to the list, using a format string.
      */
-    long addNew( [in] string aFormat,
-             [in] com::sun::star::lang::Locale nLocale )
-            raises( com::sun::star::util::MalformedNumberFormatException );
-
-    //-------------------------------------------------------------------------
-
-    /** adds a new number format to the list, using a format
-        string in a different locale than the desired locale of the
+    long addNew( [in] string aFormat, 
+             [in] com::sun::star::lang::Locale nLocale ) 
+            raises( com::sun::star::util::MalformedNumberFormatException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** adds a new number format to the list, using a format 
+        string in a different locale than the desired locale of the 
         resulting number format.
      */
-    long addNewConverted( [in] string aFormat,
-             [in] com::sun::star::lang::Locale nLocale,
-             [in] com::sun::star::lang::Locale nNewLocale )
-            raises( com::sun::star::util::MalformedNumberFormatException );
-
-    //-------------------------------------------------------------------------
-
+    long addNewConverted( [in] string aFormat, 
+             [in] com::sun::star::lang::Locale nLocale, 
+             [in] com::sun::star::lang::Locale nNewLocale ) 
+            raises( com::sun::star::util::MalformedNumberFormatException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes a number format from the list.
      */
-    void removeByKey( [in] long nKey );
-
-    //-------------------------------------------------------------------------
-
+    void removeByKey( [in] long nKey ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** generates a format string from several parameters without
         creating an actual number format.
      */
-    string generateFormat( [in] long nBaseKey,
-             [in] com::sun::star::lang::Locale nLocale,
-             [in] boolean bThousands,
-             [in] boolean bRed,
-             [in] short nDecimals,
-             [in] short nLeading );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    string generateFormat( [in] long nBaseKey, 
+             [in] com::sun::star::lang::Locale nLocale, 
+             [in] boolean bThousands, 
+             [in] boolean bRed, 
+             [in] short nDecimals, 
+             [in] short nLeading ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/util/XNumberFormatsSupplier.idl b/offapi/com/sun/star/util/XNumberFormatsSupplier.idl
index 505be56288bc..b600d6c1216a 100644
--- a/offapi/com/sun/star/util/XNumberFormatsSupplier.idl
+++ b/offapi/com/sun/star/util/XNumberFormatsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,52 +24,52 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
-#define __com_sun_star_util_XNumberFormatsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormats_idl__
-#include <com/sun/star/util/XNumberFormats.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
-/** supplies the collection of <type>NumberFormat</type>s (for example, in a
+#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__ 
+#define __com_sun_star_util_XNumberFormatsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XNumberFormats_idl__ 
+#include <com/sun/star/util/XNumberFormats.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
+/** supplies the collection of <type>NumberFormat</type>s (for example, in a 
     document) and the settings belonging to these formats.
  */
 published interface XNumberFormatsSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
                 the <type>NumberFormatSettings</type> of this object.
      */
-    com::sun::star::beans::XPropertySet getNumberFormatSettings();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    com::sun::star::beans::XPropertySet getNumberFormatSettings(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
                 the collection of number formats belonging to this object (e.g., to this document).
      */
-    com::sun::star::util::XNumberFormats getNumberFormats();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    com::sun::star::util::XNumberFormats getNumberFormats(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/util/XNumberFormatter.idl b/offapi/com/sun/star/util/XNumberFormatter.idl
index f01f1b30bf73..b32a5ba46c6c 100644
--- a/offapi/com/sun/star/util/XNumberFormatter.idl
+++ b/offapi/com/sun/star/util/XNumberFormatter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,126 +24,126 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XNumberFormatter_idl__
-#define __com_sun_star_util_XNumberFormatter_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_Color_idl__
-#include <com/sun/star/util/Color.idl>
-#endif
-
-#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__
-#include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_util_NotNumericException_idl__
-#include <com/sun/star/util/NotNumericException.idl>
-#endif
-
+#ifndef __com_sun_star_util_XNumberFormatter_idl__ 
+#define __com_sun_star_util_XNumberFormatter_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XNumberFormatsSupplier_idl__ 
+#include <com/sun/star/util/XNumberFormatsSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_NotNumericException_idl__ 
+#include <com/sun/star/util/NotNumericException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_Color_idl__ 
+#include <com/sun/star/util/Color.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** represents a number formatter.
  */
 published interface XNumberFormatter: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** attaches an <type>XNumberFormatsSupplier</type> to this
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** attaches an <type>XNumberFormatsSupplier</type> to this 
         <type>NumberFormatter</type>.
 
         <p>This <type>NumberFormatter</type> will only use the <type>NumberFormats</type>
-        specified in the attached <type>XNumberFormatsSupplier</type>. Without an attached
+        specified in the attached <type>XNumberFormatsSupplier</type>. Without an attached 
         <type>XNumberFormatsSupplier</type>, no formatting is possible.</p>
      */
-    void attachNumberFormatsSupplier( [in] com::sun::star::util::XNumberFormatsSupplier xSupplier );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    void attachNumberFormatsSupplier( [in] com::sun::star::util::XNumberFormatsSupplier xSupplier ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
                 the attached <type>XNumberFormatsSupplier</type>.
      */
-    com::sun::star::util::XNumberFormatsSupplier getNumberFormatsSupplier();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::util::XNumberFormatsSupplier getNumberFormatsSupplier(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** detects the number format in a string which contains a formatted number.
      */
-    long detectNumberFormat( [in] long nKey,
-             [in] string aString )
-            raises( com::sun::star::util::NotNumericException );
-
-    //-------------------------------------------------------------------------
-
+    long detectNumberFormat( [in] long nKey, 
+             [in] string aString ) 
+            raises( com::sun::star::util::NotNumericException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** converts a string which contains a formatted number into a number.
-
+        
         <p>If this is a text format, the string will not be converted.</p>
      */
-    double convertStringToNumber( [in] long nKey,
-             [in] string aString )
-            raises( com::sun::star::util::NotNumericException );
-
-    //-------------------------------------------------------------------------
-
+    double convertStringToNumber( [in] long nKey, 
+             [in] string aString ) 
+            raises( com::sun::star::util::NotNumericException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** converts a number into a string.
      */
-    string convertNumberToString( [in] long nKey,
-             [in] double fValue );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-                the color which is specified for the given value in the number format,
+    string convertNumberToString( [in] long nKey, 
+             [in] double fValue ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
+                the color which is specified for the given value in the number format,  
                 which is otherwise the value of <var>aDefaultColor</var>.
      */
-    com::sun::star::util::Color queryColorForNumber( [in] long nKey,
-             [in] double fValue,
-             [in] com::sun::star::util::Color aDefaultColor );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::util::Color queryColorForNumber( [in] long nKey, 
+             [in] double fValue, 
+             [in] com::sun::star::util::Color aDefaultColor ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** converts a string into another string.
      */
-    string formatString( [in] long nKey,
-             [in] string aString );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-                the color which is specified for the given string in the number format,
+    string formatString( [in] long nKey, 
+             [in] string aString ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
+                the color which is specified for the given string in the number format,  
                 which is otherwise the value of <var>aDefaultColor</var>.
      */
-    com::sun::star::util::Color queryColorForString( [in] long nKey,
-             [in] string aString,
-             [in] com::sun::star::util::Color aDefaultColor );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::util::Color queryColorForString( [in] long nKey, 
+             [in] string aString, 
+             [in] com::sun::star::util::Color aDefaultColor ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** converts a number into a string with the specified format.
-
+        
         <p>This string can always be converted back to a number using the same
         format.
         </p>
      */
-    string getInputString( [in] long nKey,
-             [in] double fValue );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
+    string getInputString( [in] long nKey, 
+             [in] double fValue ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 #endif
 
diff --git a/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl b/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
index c70fde8867e5..8da92550e7ba 100644
--- a/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
+++ b/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/XPropertyReplace.idl b/offapi/com/sun/star/util/XPropertyReplace.idl
index 7be1114220f3..8875aed8c5ab 100644
--- a/offapi/com/sun/star/util/XPropertyReplace.idl
+++ b/offapi/com/sun/star/util/XPropertyReplace.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,78 +24,78 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XPropertyReplace_idl__
-#define __com_sun_star_util_XPropertyReplace_idl__
-
-#ifndef __com_sun_star_util_XReplaceDescriptor_idl__
-#include <com/sun/star/util/XReplaceDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
-#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XPropertyReplace_idl__ 
+#define __com_sun_star_util_XPropertyReplace_idl__ 
+ 
+#ifndef __com_sun_star_util_XReplaceDescriptor_idl__ 
+#include <com/sun/star/util/XReplaceDescriptor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
+#include <com/sun/star/beans/UnknownPropertyException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to search and replace properties.
  */
 published interface XPropertyReplace: com::sun::star::util::XReplaceDescriptor
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** provides the information if specific property values are
         searched, or just the existence of the specified properties.
      */
-    boolean getValueSearch();
-
-    //-------------------------------------------------------------------------
+    boolean getValueSearch(); 
+ 
+    //------------------------------------------------------------------------- 
     /** specifies if specific property values are searched,
         or just the existence of the specified properties.
      */
-    void setValueSearch( [in] boolean bValueSearch );
-
-    //-------------------------------------------------------------------------
-    /** @returns
+    void setValueSearch( [in] boolean bValueSearch ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** @returns 
                     the attributes to search for.
      */
-    sequence<com::sun::star::beans::PropertyValue> getSearchAttributes();
-
-    //-------------------------------------------------------------------------
+    sequence<com::sun::star::beans::PropertyValue> getSearchAttributes(); 
+ 
+    //------------------------------------------------------------------------- 
     /** sets the properties to search for.
      */
-    void setSearchAttributes( [in] sequence<com::sun::star::beans::PropertyValue> aSearchAttribs )
-            raises( com::sun::star::beans::UnknownPropertyException,
-                    com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-    /** @returns
+    void setSearchAttributes( [in] sequence<com::sun::star::beans::PropertyValue> aSearchAttribs ) 
+            raises( com::sun::star::beans::UnknownPropertyException, 
+                    com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** @returns 
                     the attribute values which are used to replace the found occurrences.
      */
-    sequence<com::sun::star::beans::PropertyValue> getReplaceAttributes();
-
-    //-------------------------------------------------------------------------
+    sequence<com::sun::star::beans::PropertyValue> getReplaceAttributes(); 
+ 
+    //------------------------------------------------------------------------- 
     /** sets the properties to replace the found occurrences.
      */
-    void setReplaceAttributes( [in] sequence<com::sun::star::beans::PropertyValue> aSearchAttribs )
-            raises( com::sun::star::beans::UnknownPropertyException,
-                    com::sun::star::lang::IllegalArgumentException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void setReplaceAttributes( [in] sequence<com::sun::star::beans::PropertyValue> aSearchAttribs ) 
+            raises( com::sun::star::beans::UnknownPropertyException, 
+                    com::sun::star::lang::IllegalArgumentException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XProtectable.idl b/offapi/com/sun/star/util/XProtectable.idl
index 57685a168bf5..f46e99b778e8 100644
--- a/offapi/com/sun/star/util/XProtectable.idl
+++ b/offapi/com/sun/star/util/XProtectable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XProtectable_idl__
-#define __com_sun_star_util_XProtectable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XProtectable_idl__ 
+#define __com_sun_star_util_XProtectable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to protect objects from modifications.
  */
 published interface XProtectable: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** activates the protection.
      */
-    void protect( [in] string aPassword );
-
-    //-------------------------------------------------------------------------
+    void protect( [in] string aPassword ); 
+ 
+    //------------------------------------------------------------------------- 
     /** removes the protection.
      */
-    void unprotect( [in] string aPassword )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-    /** @returns
+    void unprotect( [in] string aPassword ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** @returns  
                 the current state of protection.
      */
-    boolean isProtected();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean isProtected(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XRefreshListener.idl b/offapi/com/sun/star/util/XRefreshListener.idl
index 8286583015e1..403616c63664 100644
--- a/offapi/com/sun/star/util/XRefreshListener.idl
+++ b/offapi/com/sun/star/util/XRefreshListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XRefreshListener_idl__
-#define __com_sun_star_util_XRefreshListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XRefreshListener_idl__ 
+#define __com_sun_star_util_XRefreshListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive <em>refreshed</em> events.
  */
 published interface XRefreshListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** is called when the object data is refreshed.
      */
-    void refreshed( [in] com::sun::star::lang::EventObject rEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void refreshed( [in] com::sun::star::lang::EventObject rEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XRefreshable.idl b/offapi/com/sun/star/util/XRefreshable.idl
index 1ed7e497a433..d3e6ccd634b5 100644
--- a/offapi/com/sun/star/util/XRefreshable.idl
+++ b/offapi/com/sun/star/util/XRefreshable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XRefreshable_idl__
-#define __com_sun_star_util_XRefreshable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XRefreshListener_idl__
-#include <com/sun/star/util/XRefreshListener.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XRefreshable_idl__ 
+#define __com_sun_star_util_XRefreshable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XRefreshListener_idl__ 
+#include <com/sun/star/util/XRefreshListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** is supported by objects with data that can be refreshed from a data source.
  */
 published interface XRefreshable: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** refreshes the data of the object from the connected data source.
      */
-    void refresh();
-
-    //-------------------------------------------------------------------------
+    void refresh(); 
+ 
+    //------------------------------------------------------------------------- 
     /** adds the specified listener to receive the event "refreshed."
      */
-    [oneway] void addRefreshListener( [in] com::sun::star::util::XRefreshListener l );
-
-    //-------------------------------------------------------------------------
+    [oneway] void addRefreshListener( [in] com::sun::star::util::XRefreshListener l ); 
+ 
+    //------------------------------------------------------------------------- 
     /** removes the specified listener.
      */
-    [oneway] void removeRefreshListener( [in] com::sun::star::util::XRefreshListener l );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void removeRefreshListener( [in] com::sun::star::util::XRefreshListener l ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XReplaceDescriptor.idl b/offapi/com/sun/star/util/XReplaceDescriptor.idl
index e3bb662a2a0a..38b5ce40e868 100644
--- a/offapi/com/sun/star/util/XReplaceDescriptor.idl
+++ b/offapi/com/sun/star/util/XReplaceDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XReplaceDescriptor_idl__
-#define __com_sun_star_util_XReplaceDescriptor_idl__
-
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__
-#include <com/sun/star/util/XSearchDescriptor.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XReplaceDescriptor_idl__ 
+#define __com_sun_star_util_XReplaceDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_util_XSearchDescriptor_idl__ 
+#include <com/sun/star/util/XSearchDescriptor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** specifies a string replace operation.
  */
 published interface XReplaceDescriptor: com::sun::star::util::XSearchDescriptor
-{
-    //-------------------------------------------------------------------------
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+    /** @returns 
                     the string which replaces the found occurrences.
      */
-    string getReplaceString();
-
-    //-------------------------------------------------------------------------
+    string getReplaceString(); 
+ 
+    //------------------------------------------------------------------------- 
     /** sets the string which replaces the found occurrences.
      */
-    void setReplaceString( [in] string aReplaceString );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void setReplaceString( [in] string aReplaceString ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XReplaceable.idl b/offapi/com/sun/star/util/XReplaceable.idl
index bb80fac433b0..196ca91e598d 100644
--- a/offapi/com/sun/star/util/XReplaceable.idl
+++ b/offapi/com/sun/star/util/XReplaceable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XReplaceable_idl__
-#define __com_sun_star_util_XReplaceable_idl__
-
-#ifndef __com_sun_star_util_XSearchable_idl__
-#include <com/sun/star/util/XSearchable.idl>
-#endif
-
-#ifndef __com_sun_star_util_XReplaceDescriptor_idl__
-#include <com/sun/star/util/XReplaceDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__
-#include <com/sun/star/util/XSearchDescriptor.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
-/** makes it possible to replace strings in a text described by a
+#ifndef __com_sun_star_util_XReplaceable_idl__ 
+#define __com_sun_star_util_XReplaceable_idl__ 
+ 
+#ifndef __com_sun_star_util_XSearchable_idl__ 
+#include <com/sun/star/util/XSearchable.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XReplaceDescriptor_idl__ 
+#include <com/sun/star/util/XReplaceDescriptor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XSearchDescriptor_idl__ 
+#include <com/sun/star/util/XSearchDescriptor.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
+/** makes it possible to replace strings in a text described by a 
     <type>SearchDescriptor</type>.
-
-    @example
+    
+    @example 
     <listing>
     'replace all bold words "search for" by "look for"
     xReplaceDescr = xDocument.createReplaceDescriptor()
@@ -59,22 +59,22 @@ module com {  module sun {  module star {  module util {
     </listing>
  */
 published interface XReplaceable: com::sun::star::util::XSearchable
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** creates a descriptor which contains properties that
         specify a search in this container.@see SearchDescriptor
      */
-    com::sun::star::util::XReplaceDescriptor createReplaceDescriptor();
-
-    //-------------------------------------------------------------------------
+    com::sun::star::util::XReplaceDescriptor createReplaceDescriptor(); 
+ 
+    //------------------------------------------------------------------------- 
     /** searches for all occurrences of whatever is specified.@see SearchDescriptor
      */
-    long replaceAll( [in] com::sun::star::util::XSearchDescriptor xDesc );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    long replaceAll( [in] com::sun::star::util::XSearchDescriptor xDesc ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XSearchDescriptor.idl b/offapi/com/sun/star/util/XSearchDescriptor.idl
index dde3589773dd..cc374cf4e890 100644
--- a/offapi/com/sun/star/util/XSearchDescriptor.idl
+++ b/offapi/com/sun/star/util/XSearchDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__
-#define __com_sun_star_util_XSearchDescriptor_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XSearchDescriptor_idl__ 
+#define __com_sun_star_util_XSearchDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** specifies a string search operation.
  */
 published interface XSearchDescriptor: com::sun::star::beans::XPropertySet
-{
-    //-------------------------------------------------------------------------
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+    /** @returns 
                     the string of characters to search for.
      */
-    string getSearchString();
-
-    //-------------------------------------------------------------------------
+    string getSearchString(); 
+ 
+    //------------------------------------------------------------------------- 
     /** sets the string of characters to look for.
      */
-    [oneway] void setSearchString( [in] string aString );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void setSearchString( [in] string aString ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XSearchable.idl b/offapi/com/sun/star/util/XSearchable.idl
index fce6b411ce9c..021829244088 100644
--- a/offapi/com/sun/star/util/XSearchable.idl
+++ b/offapi/com/sun/star/util/XSearchable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XSearchable_idl__
-#define __com_sun_star_util_XSearchable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_util_XSearchDescriptor_idl__
-#include <com/sun/star/util/XSearchDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
-/** enables the object to look for specified contents of the object
+#ifndef __com_sun_star_util_XSearchable_idl__ 
+#define __com_sun_star_util_XSearchable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_util_XSearchDescriptor_idl__ 
+#include <com/sun/star/util/XSearchDescriptor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
+/** enables the object to look for specified contents of the object 
     (in particular, for a text range which contains a specific string pattern).
-
-    @example
-        in a <type scope="com::sun::star::text">TextDocument</type>:
+    
+    @example 
+        in a <type scope="com::sun::star::text">TextDocument</type>: 
         set all "search for" to bold using findFirst()/findNext():
-
+    
     <listing>
     xSearchDescr = xDocument.createSearchDescriptor()
     xSearchDescr.SearchString = "search for"
@@ -64,49 +64,49 @@ module com {  module sun {  module star {  module util {
     xFound = xDocument.findNext( xFound.End, xSearchDescr )
     loop
     </listing>
-
+    
  */
 published interface XSearchable: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** creates a <type>SearchDescriptor</type> which contains properties that
         specify a search in this container.@see SearchDescriptor
      */
-    com::sun::star::util::XSearchDescriptor createSearchDescriptor();
-
-    //-------------------------------------------------------------------------
+    com::sun::star::util::XSearchDescriptor createSearchDescriptor(); 
+ 
+    //------------------------------------------------------------------------- 
     /** searches the contained texts for all occurrences of whatever is specified.@see SearchDescriptor
      */
-    com::sun::star::container::XIndexAccess findAll( [in] com::sun::star::util::XSearchDescriptor xDesc );
-
-    //-------------------------------------------------------------------------
+    com::sun::star::container::XIndexAccess findAll( [in] com::sun::star::util::XSearchDescriptor xDesc ); 
+ 
+    //------------------------------------------------------------------------- 
     /** searches the contained texts for the next occurrence of whatever is specified.
-
-        @returns
+    
+        @returns 
             the position within the component, e.g. a <type scope="com::sun::star::text">XTextRange</type>
             which determines the found elements.
 
         @see SearchDescriptor
      */
-    com::sun::star::uno::XInterface findFirst( [in] com::sun::star::util::XSearchDescriptor xDesc );
-
-    //-------------------------------------------------------------------------
+    com::sun::star::uno::XInterface findFirst( [in] com::sun::star::util::XSearchDescriptor xDesc ); 
+ 
+    //------------------------------------------------------------------------- 
     /** searches the contained texts for the next occurrence of whatever is specified.
 
         @param xStartAt
             represents a position within the component at which the search continues.
             This position is returned by <method>XSearchable::findFirst</method> or
             the previous <method>XSearchable::findNext</method>.
-
+    
         @see SearchDescriptor
      */
-    com::sun::star::uno::XInterface findNext( [in] com::sun::star::uno::XInterface xStartAt,
-             [in] com::sun::star::util::XSearchDescriptor xDesc );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::uno::XInterface findNext( [in] com::sun::star::uno::XInterface xStartAt, 
+             [in] com::sun::star::util::XSearchDescriptor xDesc ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XSimpleErrorHandler.idl b/offapi/com/sun/star/util/XSimpleErrorHandler.idl
index 1d3953d6ce14..67464ef7fb05 100644
--- a/offapi/com/sun/star/util/XSimpleErrorHandler.idl
+++ b/offapi/com/sun/star/util/XSimpleErrorHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XSimpleErrorHandler_idl__
-#define __com_sun_star_util_XSimpleErrorHandler_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-// DOCUMENTATION OMITTED FOR XSimpleErrorHandler
+#ifndef __com_sun_star_util_XSimpleErrorHandler_idl__ 
+#define __com_sun_star_util_XSimpleErrorHandler_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+// DOCUMENTATION OMITTED FOR XSimpleErrorHandler 
 /** @deprecated
  */
 published interface XSimpleErrorHandler: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR XSimpleErrorHandler::handleError
-    boolean handleError( [in] any Exception );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR XSimpleErrorHandler::handleError 
+    boolean handleError( [in] any Exception ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XSortable.idl b/offapi/com/sun/star/util/XSortable.idl
index 0ee7e98f5016..b06c85d91d1e 100644
--- a/offapi/com/sun/star/util/XSortable.idl
+++ b/offapi/com/sun/star/util/XSortable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XSortable_idl__
-#define __com_sun_star_util_XSortable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XSortable_idl__ 
+#define __com_sun_star_util_XSortable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to sort the contents of this object.
 
-    <p>The available properties describing the sort criterias are
+    <p>The available properties describing the sort criterias are 
     defined in the sort descriptor implemented by the object that
     implements this interface.</p>
 
@@ -54,7 +54,7 @@ module com {  module sun {  module star {  module util {
         <li>com::sun::star::table::TableSortDescriptor</li>
         <li>com::sun::star::text::TextSortDescriptor</li>
     </ul>
-
+    
     <p>And a new set of sort descriptors:</p>
     <ul>
         <li>com::sun::star::util::SortDescriptor2</li>
@@ -67,13 +67,13 @@ module com {  module sun {  module star {  module util {
     descriptors must not be mixed.</p>
  */
 published interface XSortable: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-    /** @returns
-            a sequence of properties which allows to specify/modify the
+{ 
+    //------------------------------------------------------------------------- 
+    /** @returns 
+            a sequence of properties which allows to specify/modify the 
             sort criteria.
 
-            <p>The set of properties is specific to the type of object that
+            <p>The set of properties is specific to the type of object that 
             implements this interface. Therefore they can usually be used
             only for objects of that same type.</p>
 
@@ -83,16 +83,16 @@ published interface XSortable: com::sun::star::uno::XInterface
         @see com::sun::star::util::SortDescriptor2
         @see com::sun::star::table::TableSortDescriptor2
         @see com::sun::star::text::TextSortDescriptor2
-
+     
      */
-    sequence< com::sun::star::beans::PropertyValue > createSortDescriptor();
-
-    //-------------------------------------------------------------------------
+    sequence< com::sun::star::beans::PropertyValue > createSortDescriptor(); 
+ 
+    //------------------------------------------------------------------------- 
     /** sorts the contents of the object according to the specified
         properties.
 
-        <p>The specified properties are usually the same or a subset of
-        those obtained by calling <member>createSortDescriptor</member>
+        <p>The specified properties are usually the same or a subset of 
+        those obtained by calling <member>createSortDescriptor</member> 
         on the same type of object.<p>
 
         @see com::sun::star::util::SortDescriptor
@@ -102,12 +102,12 @@ published interface XSortable: com::sun::star::uno::XInterface
         @see com::sun::star::table::TableSortDescriptor2
         @see com::sun::star::text::TextSortDescriptor2
      */
-    void sort( [in] sequence< com::sun::star::beans::PropertyValue > xDescriptor );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void sort( [in] sequence< com::sun::star::beans::PropertyValue > xDescriptor ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XStringAbbreviation.idl b/offapi/com/sun/star/util/XStringAbbreviation.idl
index 076b84b033c5..a746816e42b6 100644
--- a/offapi/com/sun/star/util/XStringAbbreviation.idl
+++ b/offapi/com/sun/star/util/XStringAbbreviation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/XStringEscape.idl b/offapi/com/sun/star/util/XStringEscape.idl
index f73bf84c59ae..e3d473bf66a9 100644
--- a/offapi/com/sun/star/util/XStringEscape.idl
+++ b/offapi/com/sun/star/util/XStringEscape.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,21 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XStringEscape_idl__
-#define __com_sun_star_util_XStringEscape_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
+#ifndef __com_sun_star_util_XStringEscape_idl__ 
+#define __com_sun_star_util_XStringEscape_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util { 
+ 
 /** This interface is used to encode an arbitrary String into a
     escaped form.
 
@@ -61,23 +61,23 @@ module com {  module sun {  module star {  module util {
     unchanged or minimally modified.</p>
  */
 published interface XStringEscape: com::sun::star::uno::XInterface
-{
+{ 
     /** encodes an arbitrary string into an escaped form compatible with some naming rules.
      */
-    string escapeString([in] string aString)
-        raises( com::sun::star::lang::IllegalArgumentException);
-
+    string escapeString([in] string aString) 
+        raises( com::sun::star::lang::IllegalArgumentException); 
+ 
     /** decodes an escaped string into the original form.
      */
-    string unescapeString([in] string aEscapedString)
-        raises( com::sun::star::lang::IllegalArgumentException);
-};
-
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
-
+    string unescapeString([in] string aEscapedString) 
+        raises( com::sun::star::lang::IllegalArgumentException); 
+}; 
+ 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
+ 
 
diff --git a/offapi/com/sun/star/util/XStringMapping.idl b/offapi/com/sun/star/util/XStringMapping.idl
index b6afc14642e7..bd06ad1c4abb 100644
--- a/offapi/com/sun/star/util/XStringMapping.idl
+++ b/offapi/com/sun/star/util/XStringMapping.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_util_XStringMapping_idl__
-#define __com_sun_star_util_XStringMapping_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-//=============================================================================
-
+#ifndef __com_sun_star_util_XStringMapping_idl__ 
+#define __com_sun_star_util_XStringMapping_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util { 
+ 
+//============================================================================= 
+ 
 /** provides a mapping from <atom>string</atom> to <atom>string</atom>
  */
 published interface XStringMapping: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** provides a mapping for a given sequence of strings to
         a sequence of belonging strings.
      */
-    boolean mapStrings( [inout] sequence< string > Parameter );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean mapStrings( [inout] sequence< string > Parameter ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XStringSubstitution.idl b/offapi/com/sun/star/util/XStringSubstitution.idl
index e8d5eb682cf0..1f96bfee511e 100644
--- a/offapi/com/sun/star/util/XStringSubstitution.idl
+++ b/offapi/com/sun/star/util/XStringSubstitution.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,29 +25,29 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_util_XStringSubstitution_idl__
-#define __com_sun_star_util_XStringSubstitution_idl__
+#ifndef __com_sun_star_util_XStringSubstitution_idl__ 
+#define __com_sun_star_util_XStringSubstitution_idl__ 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
 #ifndef __com_sun_star_container_NoSuchElementException_idl__
 #include <com/sun/star/container/NoSuchElementException.idl>
 #endif
 
-//=============================================================================
+//============================================================================= 
 
- module com {  module sun {  module star {  module  util {
+ module com {  module sun {  module star {  module  util { 
 
-//=============================================================================
+//============================================================================= 
 /** A common interface for substituting string variables with
     other strings.
-
+    
     <p>
-    The substitution algorithm and the syntax for a string variable are
-    not part of this interface definition.  Please look at the documentation
-    of the implementation that must specify these parameters.
+    The substitution algorithm and the syntax for a string variable are 
+    not part of this interface definition.	Please look at the documentation 
+    of the implementation that must	specify these parameters.
     </p>
 
     @since OOo 1.1.2
@@ -57,13 +57,13 @@ published interface XStringSubstitution : com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /** Exchanges variables inside a given text with a substitution text
         defined for the variables.
-
+        
         <p>
         The method iterates through it's internal variables list to match the
         variables in the given string. A match replaces the variable with the
         string defined for this variable. If no variable can be found in the string
         it will be returned unchanged. The behavior if a variable is found in
-        the string but it is unknown for the implementation depends on the parameter
+        the string but it is unknown for the implementation depends on the parameter 
         bSubstRequired.
         </p>
 
@@ -71,64 +71,64 @@ published interface XStringSubstitution : com::sun::star::uno::XInterface
             A string containing variables that should be substituted.
 
         @param bSubstRequired
-            Specifies if a successfull substitution is required. The
+            Specifies if a successfull substitution is required. The 
             function throws a <type scope="com::sun::star::container">NoSuchElementException</type>
-            if it finds a variable that is unknown. In this case it is possible
+            if it finds a variable that is unknown. In this case it is possible 
             that the returned string would not be what the caller expected!
-
+    
         @return
-            Returns a string based on <var>aText</var> where all variables were
+            Returns a string based on <var>aText</var> where all variables were 
             exchanged with their value defined at calling time.
     */
-    string substituteVariables( [in] string aText, [in] boolean bSubstRequired )
-        raises( com::sun::star::container::NoSuchElementException );
+    string substituteVariables( [in] string aText, [in] boolean bSubstRequired ) 
+        raises( com::sun::star::container::NoSuchElementException ); 
 
     //-------------------------------------------------------------------------
     /** Tries to replace parts of aText with variables that represents
         these sub strings.
-
+      
         <p>
         The method iterates through it's internal variable list and tries to match
-        parts of the given string Tries to replace parts of <var>aText</var> with
-        variables that represents these sub strings.If more than one variable
+        parts of the given string Tries to replace parts of <var>aText</var> with 
+        variables that represents these sub strings.If more than one variable 
         matches the one with the longest matching sub string will be chosen.
         </p>
-
+        
         @param aText
             A string where known substrings should be replaced by variables.
-
+            
         @return
             Returns the resubstituted string with variables for all parts
             that could be replaced. The unchanged argument will be returned
             if nothing can be resubtituted.
     */
-
+    
     string reSubstituteVariables( [in] string aText );
 
     //-------------------------------------------------------------------------
     /** Returns the current value of a variable.
-
+      
         <p>
-        The method iterates through it's internal variable list and tries to
-        find the given variable. If the variable is unkown a
+        The method iterates through it's internal variable list and tries to 
+        find the given variable. If the variable is unkown a 
         <type scope="com::sun::star::container">NoSuchElementException</type>
         is thrown.
         </p>
 
         @param variable
             The name of a variable.
-
+            
         @return
             Returns a string that represents the variable. If the
             variable is unknown a <type scope="com::sun::star::container">NoSuchElementException</type>
             is thrown.
     */
-    string getSubstituteVariableValue( [in] string variable )
+    string getSubstituteVariableValue( [in] string variable ) 
         raises (::com::sun::star::container::NoSuchElementException );
 };
 
-//=============================================================================
-
-}; }; }; };
+//============================================================================= 
+ 
+}; }; }; };  
 
 #endif
diff --git a/offapi/com/sun/star/util/XStringWidth.idl b/offapi/com/sun/star/util/XStringWidth.idl
index 81d76dd79475..503c301576d7 100644
--- a/offapi/com/sun/star/util/XStringWidth.idl
+++ b/offapi/com/sun/star/util/XStringWidth.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/util/XTextSearch.idl b/offapi/com/sun/star/util/XTextSearch.idl
index 4afbacd19894..6144b336eab0 100644
--- a/offapi/com/sun/star/util/XTextSearch.idl
+++ b/offapi/com/sun/star/util/XTextSearch.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,9 +36,9 @@
 module com { module sun { module star { module util {
 
 published enum SearchAlgorithms {
-    ABSOLUTE,       // "normal" a kind of Boyer-Moore
+    ABSOLUTE,		// "normal" a kind of Boyer-Moore
     REGEXP,                 // regular expression
-    APPROXIMATE     // Leveinstein distance
+    APPROXIMATE		// Leveinstein distance
 };
 
 published constants SearchFlags
@@ -51,22 +51,22 @@ published constants SearchFlags
                         the SearchOptions.
                         <p>@see TransliterationModulesNew
     */
-    const long  ALL_IGNORE_CASE     = 0x00000001;
+    const long	ALL_IGNORE_CASE		= 0x00000001;
 
     /// Flag for normal (Boyer-Moore) search
-    const long  NORM_WORD_ONLY      = 0x00000010;
+    const long 	NORM_WORD_ONLY		= 0x00000010;
 
     /// Flag for "regular expression" search / interpret as extended regular expression
-    const long  REG_EXTENDED        = 0x00000100;
+    const long 	REG_EXTENDED		= 0x00000100;
     /** Flag for "regular expression" search / No replace, i.e., avoid sub regular
          expresions, return true/false to match
 
 <!-- JRH: Check this for sense of the expression. -->
     */
-    const long  REG_NOSUB       = 0x00000200;
+    const long 	REG_NOSUB		= 0x00000200;
 
     /// Flag for "regular expression" search / Special new  line treatment
-    const long  REG_NEWLINE     = 0x00000400;
+    const long 	REG_NEWLINE		= 0x00000400;
 
     /** A NEWLINE character in string will not be matched by  a period outside bracket
         expression or by any form of a non matching list.
@@ -78,56 +78,56 @@ published constants SearchFlags
         will match zero-length string immediately before a new line in string,
         regardless of the setting of REG_NOTEOL
 */
-    const long  REG_NOT_BEGINOFLINE = 0x00000800;
+    const long 	REG_NOT_BEGINOFLINE	= 0x00000800;
 
     /** The first character in the string is not the beginning of the line therefore ^  will not
         match with first character of the string
     */
-    const long  REG_NOT_ENDOFLINE   = 0x00001000;
+    const long 	REG_NOT_ENDOFLINE	= 0x00001000;
 
 
     /// Flags for "Weight Levenshtein-Distance" search
-    const long  LEV_RELAXED     = 0x00010000;
+    const long 	LEV_RELAXED		= 0x00010000;
 };
 
 
 published  struct SearchOptions  {
     //-------------------------------------------------------------------------
     /// search type, can be: ABSOLUTE, REGEXP, APPROXIMATE
-    SearchAlgorithms    algorithmType;
+    SearchAlgorithms	algorithmType;
 
     /** some flags - can be mixed
 
         @see SearchFlags
     */
-    long            searchFlag;
+    long 			searchFlag;
 
     /// the search text
-    string          searchString;
+    string			searchString;
 
     /** the replace text
     (is for optional replacing - SearchOption is only the data container for it)*/
-    string          replaceString;
+    string			replaceString;
 
     /// this is the language for case insensitive search
     ::com::sun::star::lang::Locale  Locale;
 
     /** this many characters can be different between the found and search word
     in a "Weight Levenshtein-Distance"*/
-    long            changedChars;
+    long			changedChars;
 
     /** this many characters can be missed in the found word
     in a "Weight Levenshtein-Distance"*/
-    long            deletedChars;
+    long			deletedChars;
 
     /// this many characters can be additional in the found word in a "Weight Levenshtein-Distance"
-    long            insertedChars;
+    long			insertedChars;
 
     /** asian flags for the transliteration. Same meaning as the enum of TransliteratorModule
 
         @see com/sun/star/i18n/XTransliteration.idl
     */
-    long            transliterateFlags;
+    long			transliterateFlags;
 };
 
 
@@ -138,7 +138,7 @@ published  struct SearchResult  {
     The start and endOffset are always dependent on the search direction.
     For example:
     if you search "X" in the text "-X-" the offset are:
-        for forward:    start = 1, end = 2
+        for forward: 	start = 1, end = 2
         for backward:   start = 2, end = 1
     Forward, the startOffset is inclusive, the endOffset exclusive.
     Backward, the startOffset is exclusive, the endOffset inclusive.
@@ -149,8 +149,8 @@ published  struct SearchResult  {
     startoffset[i] and endoffset[i] points to the matching substring of i th matching substring.
     */
     long subRegExpressions;
-    sequence<long> startOffset;     // inclusive
-    sequence<long> endOffset;       // exclusive
+    sequence<long> startOffset;		// inclusive
+    sequence<long> endOffset;  		// exclusive
 };
 
 
diff --git a/offapi/com/sun/star/util/XTimeStamped.idl b/offapi/com/sun/star/util/XTimeStamped.idl
index 39b2f3f5085b..1650f057165d 100644
--- a/offapi/com/sun/star/util/XTimeStamped.idl
+++ b/offapi/com/sun/star/util/XTimeStamped.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@ module com { module sun { module star { module util {
 //============================================================================
 
 /**
-  provides timestamp information for an object
+  provides timestamp information for an object 
   in the form of an arbitrary string.
 
   <p> The format and meaning of the timestamp depends on the implementation.
@@ -45,27 +45,27 @@ module com { module sun { module star { module util {
      format they use.
   </p>
 
-  <p> If the timestamp is unchanged between two calls, the
-     associated object has not changed. Any properties beyond this,
-     particularly the presence of a meaningful order between
-     timestamps, depend on the implementation.
+  <p> If the timestamp is unchanged between two calls, the 
+     associated object has not changed. Any properties beyond this, 
+     particularly the presence of a meaningful order between 
+     timestamps, depend on the implementation. 
   </p>
 
     @since OOo 1.1.2
   */
-published interface XTimeStamped : ::com::sun::star::uno::XInterface
+published interface XTimeStamped : ::com::sun::star::uno::XInterface 
 {
     //------------------------------------------------------------------------
 
     /**
-      returns the timestamp of the object.
-
+      returns the timestamp of the object. 
+      
 
-      @return
+      @return   
         a <atom>string</atom> that represents a timestamp.
       */
     string getTimestamp() ;
-
+    
     //------------------------------------------------------------------------
 } ;
 
diff --git a/offapi/com/sun/star/util/XURLTransformer.idl b/offapi/com/sun/star/util/XURLTransformer.idl
index 38232255fa22..2874ceffb135 100644
--- a/offapi/com/sun/star/util/XURLTransformer.idl
+++ b/offapi/com/sun/star/util/XURLTransformer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,8 +54,8 @@ published interface XURLTransformer: com::sun::star::uno::XInterface
         a syntactically complete URL.
 
         <p>
-        The implementation is allowed to correct minor failures in <member>URL::Complete</member>
-        if the meaning of the URL remain unchanged. Parts of the URL are stored in the other
+        The implementation is allowed to correct minor failures in <member>URL::Complete</member> 
+        if the meaning of the URL remain unchanged. Parts of the URL are stored in the other 
         fields of <var>aURL</var>.
         </p>
 
@@ -75,23 +75,23 @@ published interface XURLTransformer: com::sun::star::uno::XInterface
         a syntactically complete URL or is specified by the provided protocol
 
         <p>
-        The implementation can use smart functions to correct or interpret
-        <member>URL::Complete</member> if it is not a syntactically complete URL.
+        The implementation can use smart functions to correct or interpret 
+        <member>URL::Complete</member> if it is not a syntactically complete URL. 
         The parts of the URL are stored in the other fields of <var>aURL</var>.
         </p>
 
         @param aURL
                 the URL which include the string notation and will contain
-                all parsed parts of it after finishing this call. This includes
+                all parsed parts of it after finishing this call. This includes 
                 <member>URL::Complete</member>.
 
         @param sSmartProtocol
-                optional information which protocol specification should be used to parse
+                optional information which protocol specification should be used to parse 
                 member<member>URL::Complete</member>. If empty the implementation can use a
                 protocol which fit best.
 
         @returns
-                <TRUE/> if parsing was successful (means if <member>URL::Complete</member> could
+                <TRUE/> if parsing was successful (means if <member>URL::Complete</member> could 
                 be syntactically correct) or <FALSE/> otherwise.
      */
     boolean parseSmart(
@@ -103,12 +103,12 @@ published interface XURLTransformer: com::sun::star::uno::XInterface
         stores it into <member>URL::Complete</member>
 
         @param aURL
-                the URL which contains alls neccessary information in a structured form. The
-                member <member>URL::Complete</member> contains the URL in string notation after
+                the URL which contains alls neccessary information in a structured form. The 
+                member <member>URL::Complete</member> contains the URL in string notation after 
                 the operation finished successfully. Otherwise the content of <member>URL::complete</member>
                 is not defined.
 
-        @returns
+        @returns 
             <TRUE/> if assembling was successfully or <FALSE/> otherwise.
      */
     boolean assemble( [inout] com::sun::star::util::URL aURL );
@@ -130,7 +130,7 @@ published interface XURLTransformer: com::sun::star::uno::XInterface
                 or not. Usually passwords should never be shown at the user
                 interface.
 
-        @returns
+        @returns 
                 a string representing the <var>aURL</var> if it is syntactically correct. A empty string if <var>aURL</var>
                 is not syntactically correct.
      */
diff --git a/offapi/com/sun/star/util/XUniqueIDFactory.idl b/offapi/com/sun/star/util/XUniqueIDFactory.idl
index e79c36ab9c09..86fb527fc94b 100644
--- a/offapi/com/sun/star/util/XUniqueIDFactory.idl
+++ b/offapi/com/sun/star/util/XUniqueIDFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XUniqueIDFactory_idl__
-#define __com_sun_star_container_XUniqueIDFactory_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module util {
-
-
+#ifndef __com_sun_star_container_XUniqueIDFactory_idl__ 
+#define __com_sun_star_container_XUniqueIDFactory_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module util {  
+ 
+ 
 /** creates IDs which are unique within the container.
  */
 published interface XUniqueIDFactory: com::sun::star::uno::XInterface
-{
+{ 
     /// creates a new ID, unique within this container.
-    string createUniqueID( );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string createUniqueID( ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/util/XUpdatable.idl b/offapi/com/sun/star/util/XUpdatable.idl
index ed221a36ecdd..173229d017ad 100644
--- a/offapi/com/sun/star/util/XUpdatable.idl
+++ b/offapi/com/sun/star/util/XUpdatable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/view/DocumentZoomType.idl b/offapi/com/sun/star/view/DocumentZoomType.idl
index f922e4c19dd0..3f72bbf1362f 100644
--- a/offapi/com/sun/star/view/DocumentZoomType.idl
+++ b/offapi/com/sun/star/view/DocumentZoomType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,12 +54,12 @@ published constants DocumentZoomType
     const short ENTIRE_PAGE = 2;
 
     //-------------------------------------------------------------------------
-    /** The zoom is relative and is to be set via the property
+    /** The zoom is relative and is to be set via the property 	
         <member>ViewSettings::ZoomValue</member>.
      */
     const short BY_VALUE = 3;
     //-------------------------------------------------------------------------
-    /** The page width at the current selection is fit into the view,
+    /** The page width at the current selection is fit into the view, 
         with zhe view ends exactly at the end of the page.
      */
     const short PAGE_WIDTH_EXACT = 4;
diff --git a/offapi/com/sun/star/view/DuplexMode.idl b/offapi/com/sun/star/view/DuplexMode.idl
index d25425232516..b9873e8654be 100644
--- a/offapi/com/sun/star/view/DuplexMode.idl
+++ b/offapi/com/sun/star/view/DuplexMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_DuplexMode_idl__
-#define __com_sun_star_view_DuplexMode_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_DuplexMode_idl__ 
+#define __com_sun_star_view_DuplexMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** These constants specify available duplex modes
  */
 constants DuplexMode
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** specifies an unknown duplex mode.
      */
     const short UNKNOWN = 0;
-
-    //-------------------------------------------------------------------------
+    
+    //------------------------------------------------------------------------- 
     /** specifies that there is no duplex mode enabled
      */
     const short OFF = 1;
-
-    //-------------------------------------------------------------------------
+    
+    //------------------------------------------------------------------------- 
     /** specifies a long edge duplex mode
      */
     const short LONGEDGE = 2;
-
-    //-------------------------------------------------------------------------
+    
+    //------------------------------------------------------------------------- 
     /** specifies a short edge duplex mode
      */
     const short SHORTEDGE = 3;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/OfficeDocumentView.idl b/offapi/com/sun/star/view/OfficeDocumentView.idl
index 1ff13bc13f54..1678fe78639f 100644
--- a/offapi/com/sun/star/view/OfficeDocumentView.idl
+++ b/offapi/com/sun/star/view/OfficeDocumentView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,57 +24,57 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_OfficeDocumentView_idl__
-#define __com_sun_star_view_OfficeDocumentView_idl__
-
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
-#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_view_XViewSettingsSupplier_idl__
-#include <com/sun/star/view/XViewSettingsSupplier.idl>
-#endif
-
-#ifndef __com_sun_star_view_XControlAccess_idl__
-#include <com/sun/star/view/XControlAccess.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_OfficeDocumentView_idl__ 
+#define __com_sun_star_view_OfficeDocumentView_idl__ 
+ 
+#ifndef __com_sun_star_view_XSelectionSupplier_idl__ 
+#include <com/sun/star/view/XSelectionSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_view_XViewSettingsSupplier_idl__ 
+#include <com/sun/star/view/XViewSettingsSupplier.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_view_XControlAccess_idl__ 
+#include <com/sun/star/view/XControlAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** specifies a view of a standard office document.
  */
 published service OfficeDocumentView
-{
-    /** This mandatory interface gives access to the current user selection
+{ 
+    /** This mandatory interface gives access to the current user selection 
                 within this office document view.
 
         <p>The type of the selection depends on the actual document type.</p>
      */
-    interface com::sun::star::view::XSelectionSupplier;
-
-
-    /** This optional interface gives access to the view properties within this
+    interface com::sun::star::view::XSelectionSupplier; 
+ 
+     
+    /** This optional interface gives access to the view properties within this 
         control for an office document.
 
         @see ViewSettings
      */
-    [optional] interface com::sun::star::view::XViewSettingsSupplier;
-
-
-    /** Within this office document view, this optional interface gives
+    [optional] interface com::sun::star::view::XViewSettingsSupplier; 
+ 
+     
+    /** Within this office document view, this optional interface gives 
         access to the controls which belong to specified control models.
      */
-    [optional] interface com::sun::star::view::XControlAccess;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [optional] interface com::sun::star::view::XControlAccess; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/PaperFormat.idl b/offapi/com/sun/star/view/PaperFormat.idl
index 89b197d41ef9..9d489cf4b750 100644
--- a/offapi/com/sun/star/view/PaperFormat.idl
+++ b/offapi/com/sun/star/view/PaperFormat.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,69 +24,69 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_PaperFormat_idl__
-#define __com_sun_star_view_PaperFormat_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_PaperFormat_idl__ 
+#define __com_sun_star_view_PaperFormat_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** specifies the format (size) of the paper on a text document.
  */
 published enum PaperFormat
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** specifies the paper format as A3.
      */
-    A3,
-
-    //-------------------------------------------------------------------------
+    A3, 
+ 
+    //------------------------------------------------------------------------- 
     /** specifies the paper format as A4.
      */
-    A4,
-
-    //-------------------------------------------------------------------------
+    A4, 
+ 
+    //------------------------------------------------------------------------- 
     /** specifies the paper format as A5.
      */
-    A5,
-
-    //-------------------------------------------------------------------------
+    A5, 
+ 
+    //------------------------------------------------------------------------- 
     /** specifies the paper format as B4.
      */
-    B4,
-
-    //-------------------------------------------------------------------------
+    B4, 
+ 
+    //------------------------------------------------------------------------- 
     /** specifies the paper format as B5.
      */
-    B5,
-
-    //-------------------------------------------------------------------------
+    B5, 
+ 
+    //------------------------------------------------------------------------- 
     /** specifies the paper format as Letter.
      */
-    LETTER,
-
-    //-------------------------------------------------------------------------
+    LETTER, 
+ 
+    //------------------------------------------------------------------------- 
     /** specifies the paper format as Legal.
      */
-    LEGAL,
-
-    //-------------------------------------------------------------------------
+    LEGAL, 
+ 
+    //------------------------------------------------------------------------- 
     /** specifies the paper format as Tabloid.
      */
-    TABLOID,
-
-    //-------------------------------------------------------------------------
+    TABLOID, 
+ 
+    //------------------------------------------------------------------------- 
     /** The real paper size is user defined in 100th mm.
      */
-    USER
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    USER 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/PaperOrientation.idl b/offapi/com/sun/star/view/PaperOrientation.idl
index 412c889b472e..a541a967725b 100644
--- a/offapi/com/sun/star/view/PaperOrientation.idl
+++ b/offapi/com/sun/star/view/PaperOrientation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_PaperOrientation_idl__
-#define __com_sun_star_view_PaperOrientation_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_PaperOrientation_idl__ 
+#define __com_sun_star_view_PaperOrientation_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** specifies the orientation of the paper.
  */
 published enum PaperOrientation
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** set the paper orientation to portrait.
      */
-    PORTRAIT,
-
-    //-------------------------------------------------------------------------
+    PORTRAIT, 
+ 
+    //------------------------------------------------------------------------- 
     /** set the paper orientation to landscape.
      */
-    LANDSCAPE
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    LANDSCAPE 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/PrintJobEvent.idl b/offapi/com/sun/star/view/PrintJobEvent.idl
index f1f81f3affa3..e7f49b3b4ebf 100644
--- a/offapi/com/sun/star/view/PrintJobEvent.idl
+++ b/offapi/com/sun/star/view/PrintJobEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,7 +51,7 @@ module com {  module sun {  module star {  module view {
  */
 published struct PrintJobEvent : com::sun::star::lang::EventObject
 {
-    /// contains the current state.
+    ///	contains the current state.
     PrintableState State;
 };
 
diff --git a/offapi/com/sun/star/view/PrintOptions.idl b/offapi/com/sun/star/view/PrintOptions.idl
index 3bad70f490e7..446e12fbd53b 100644
--- a/offapi/com/sun/star/view/PrintOptions.idl
+++ b/offapi/com/sun/star/view/PrintOptions.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,75 +24,75 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_PrintOptions_idl__
-#define __com_sun_star_view_PrintOptions_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_PrintOptions_idl__ 
+#define __com_sun_star_view_PrintOptions_idl__ 
+
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** describes the options for print jobs.
 
     <p>These options are only valid for a single print job. They do not
     change layout or formatting of the document.
  */
 published service PrintOptions
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** specifies the number of copies to print.
      */
-    [property] short CopyCount;
-
-    //-------------------------------------------------------------------------
+    [property] short CopyCount; 
+ 
+    //------------------------------------------------------------------------- 
     /** if set, specifies the name of a file to print to.
      */
-    [property] string FileName;
-
-    //-------------------------------------------------------------------------
+    [property] string FileName; 
+ 
+    //------------------------------------------------------------------------- 
     /** advises the printer to collate the pages of the copies.
      */
-    [property] boolean Collate;
-
-    //-------------------------------------------------------------------------
+    [property] boolean Collate; 
+ 
+    //------------------------------------------------------------------------- 
     /** advises the printer to sort the pages of the copies.
 
-        @deprecated
+        @deprecated 	
             Use <member>Collate</member> instead.
      */
-    [property] boolean Sort;
-
-    //-------------------------------------------------------------------------
+    [property] boolean Sort; 
+ 
+    //------------------------------------------------------------------------- 
     /** specifies which pages to print.
 
         <p>This range is given as at the user interface. For example: "1-4;10"
         to print the pages 1 to 4 and 10. </p>
      */
-    [property] string Pages;
-
-    //-------------------------------------------------------------------------
+    [property] string Pages; 
+ 
+    //------------------------------------------------------------------------- 
     /** if set to TRUE, the corresponding <type>XPrintable</type>.print() request will
         be executed synchronous.
-
+        
             <p>Default is the asynchronous print mode.</p>
-
-        @attention  Using of this property with TRUE as value is highly reommended.
+        
+        @attention	Using of this property with TRUE as value is highly reommended.
                 Otherwhise following actions (as e.g. closing the corresponding model) can fail.
      */
     [optional, property] boolean Wait;
-
-    //-------------------------------------------------------------------------
-    /** determines the duplex mode for the print job.
-
+    
+    //------------------------------------------------------------------------- 
+    /** determines the duplex mode for the print job. 
+        
         @see <type>DuplexMode</type> for more information about supported values
      */
-    [optional, property] short DuplexMode;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [optional, property] short DuplexMode; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/PrintSettings.idl b/offapi/com/sun/star/view/PrintSettings.idl
index 2b1c54d90578..ee20423cfcfc 100644
--- a/offapi/com/sun/star/view/PrintSettings.idl
+++ b/offapi/com/sun/star/view/PrintSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,88 +24,88 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_PrintSettings_idl__
-#define __com_sun_star_view_PrintSettings_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_PrintSettings_idl__ 
+#define __com_sun_star_view_PrintSettings_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** provides access to the settings for printing documents.
 
     <p>These settings are printer independet but affect the rendering of
     the document.
  */
 published service PrintSettings
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** If <TRUE/>, all characters are printed in black.
-
+        
         <p>It is useful for printing colored text on a b/w printer.</p>
      */
-    [property] boolean PrintBlackFonts;
-
-    //-------------------------------------------------------------------------
+    [property] boolean PrintBlackFonts; 
+ 
+    //------------------------------------------------------------------------- 
     /** If <TRUE/>, control shapes are included in printing.
      */
-    [property] boolean PrintControls;
-
-    //-------------------------------------------------------------------------
+    [property] boolean PrintControls; 
+ 
+    //------------------------------------------------------------------------- 
     /** If <TRUE/>, drawing objects (shapes)  are included in printing.
      */
-    [property] boolean PrintDrawings;
-
-    //-------------------------------------------------------------------------
+    [property] boolean PrintDrawings; 
+ 
+    //------------------------------------------------------------------------- 
     /** If <TRUE/>, graphic objects are included in printing.
      */
-    [property] boolean PrintGraphics;
-
-    //-------------------------------------------------------------------------
+    [property] boolean PrintGraphics; 
+ 
+    //------------------------------------------------------------------------- 
     /** If <TRUE/>, left pages are included in printing.
      */
-    [property] boolean PrintLeftPages;
-
-    //-------------------------------------------------------------------------
+    [property] boolean PrintLeftPages; 
+ 
+    //------------------------------------------------------------------------- 
     /** If <TRUE/>, right pages are included in printing.
      */
-    [property] boolean PrintRightPages;
-
-    //-------------------------------------------------------------------------
+    [property] boolean PrintRightPages; 
+ 
+    //------------------------------------------------------------------------- 
     /** If <TRUE/>, tables are included in printing.
      */
-    [property] boolean PrintTables;
-
-    //-------------------------------------------------------------------------
-    /** If <TRUE/>, the pages are printed in reverse order.
-
+    [property] boolean PrintTables; 
+ 
+    //------------------------------------------------------------------------- 
+    /** If <TRUE/>, the pages are printed in reverse order. 
+        
         <p>The last page is printed first.</p>
      */
-    [property] boolean PrintReversed;
-
-    //-------------------------------------------------------------------------
+    [property] boolean PrintReversed; 
+ 
+    //------------------------------------------------------------------------- 
     /** If <TRUE/>, the pages are printed in the order of prospects.
      */
-    [property] boolean PrintProspect;
-
-    //-------------------------------------------------------------------------
+    [property] boolean PrintProspect; 
+ 
+    //------------------------------------------------------------------------- 
     /** If <TRUE/>, the background of the page is printed.
      */
-    [property] boolean PrintPageBackground;
-
-    //-------------------------------------------------------------------------
+    [property] boolean PrintPageBackground; 
+ 
+    //------------------------------------------------------------------------- 
     /** determines how annotations are printed.
 
         @see NotePrintMode
      */
-    [property] short PrintAnnotationMode;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [property] short PrintAnnotationMode; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/PrintableState.idl b/offapi/com/sun/star/view/PrintableState.idl
index 683321578a7c..6968540878a1 100644
--- a/offapi/com/sun/star/view/PrintableState.idl
+++ b/offapi/com/sun/star/view/PrintableState.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_PrintableState_idl__
-#define __com_sun_star_view_PrintableState_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_PrintableState_idl__ 
+#define __com_sun_star_view_PrintableState_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** specifies the print progress of an <type>XPrintable</type>.
 
     <p>Printing consists of two abstract phases: rendering the document
@@ -58,7 +58,7 @@ published enum PrintableState
     */
     JOB_SPOOLED,
 
-    /** printing was aborted (e.g., by the user) while either printing or spooling.
+    /**	printing was aborted (e.g., by the user) while either printing or spooling.
      */
     JOB_ABORTED,
 
@@ -69,10 +69,10 @@ published enum PrintableState
     /** the document could be printed but not spooled.
      */
     JOB_SPOOLING_FAILED
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/PrintableStateEvent.idl b/offapi/com/sun/star/view/PrintableStateEvent.idl
index a0a92cc02c6c..9123ce5e5338 100644
--- a/offapi/com/sun/star/view/PrintableStateEvent.idl
+++ b/offapi/com/sun/star/view/PrintableStateEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,8 +24,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_PrintableStateEvent_idl__
-#define __com_sun_star_view_PrintableStateEvent_idl__
+#ifndef __com_sun_star_view_PrintableStateEvent_idl__ 
+#define __com_sun_star_view_PrintableStateEvent_idl__ 
 
 #ifndef __com_sun_star_lang_EventObject_idl__
 #include <com/sun/star/lang/EventObject.idl>
@@ -33,14 +33,14 @@
 
 #ifndef __com_sun_star_view_PrintableState_idl__
 #include <com/sun/star/view/PrintableState.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** specifies the print progress of an <type>XPrintable</type>.
 
     <p><member scope="com::sun::star::lang">EventObject::Source</member>
@@ -49,12 +49,12 @@ module com {  module sun {  module star {  module view {
  */
 published struct PrintableStateEvent : com::sun::star::lang::EventObject
 {
-    /// contains the current state.
+    ///	contains the current state.
     PrintableState State;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/PrinterDescriptor.idl b/offapi/com/sun/star/view/PrinterDescriptor.idl
index 006e1969fedb..178a31e2fe59 100644
--- a/offapi/com/sun/star/view/PrinterDescriptor.idl
+++ b/offapi/com/sun/star/view/PrinterDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,94 +24,94 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_PrinterDescriptor_idl__
-#define __com_sun_star_view_PrinterDescriptor_idl__
-
-#ifndef __com_sun_star_view_PaperOrientation_idl__
-#include <com/sun/star/view/PaperOrientation.idl>
-#endif
-
-#ifndef __com_sun_star_view_PaperFormat_idl__
-#include <com/sun/star/view/PaperFormat.idl>
-#endif
-
-#ifndef __com_sun_star_awt_Size_idl__
-#include <com/sun/star/awt/Size.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_PrinterDescriptor_idl__ 
+#define __com_sun_star_view_PrinterDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_view_PaperOrientation_idl__ 
+#include <com/sun/star/view/PaperOrientation.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_view_PaperFormat_idl__ 
+#include <com/sun/star/view/PaperFormat.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_Size_idl__ 
+#include <com/sun/star/awt/Size.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** describes a printer by specifying the queue name and some settings.
-
-    <p>This service may be represented by a <type scope="com::sun::star::beans" dim="[]">PropertyValue</type>.
+    
+    <p>This service may be represented by a <type scope="com::sun::star::beans" dim="[]">PropertyValue</type>.  
 
     @see com::sun::star::beans::PropertyValue
  */
 published service PrinterDescriptor
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** specifies the name of the printer queue to be used.
 
         <p>Which printer queues are available, can be figured out with the
         system library of the used programming language/environment.
      */
-    [property] string Name;
-
-    //-------------------------------------------------------------------------
+    [property] string Name; 
+ 
+    //------------------------------------------------------------------------- 
     /** specifies the orientation of the paper.
      */
-    [property] com::sun::star::view::PaperOrientation PaperOrientation;
-
-    //-------------------------------------------------------------------------
+    [property] com::sun::star::view::PaperOrientation PaperOrientation; 
+ 
+    //------------------------------------------------------------------------- 
     /** specifies a predefined paper size or if the paper size
         is a user-defined size.
 
-        <p>Setting this property may change the value of
+        <p>Setting this property may change the value of 
         <member>PrinterDescriptor</member>PaperSize</member.</p>
      */
-    [property] com::sun::star::view::PaperFormat PaperFormat;
-
-    //-------------------------------------------------------------------------
+    [property] com::sun::star::view::PaperFormat PaperFormat; 
+ 
+    //------------------------------------------------------------------------- 
     /** specifies the size of the paper in 100th mm.
-
+        
         <p>Setting this property may change the value of
         <member>PrinterDescriptor</member>PaperFormat</member.</p>
      */
     [property] com::sun::star::awt::Size PaperSize;
-
-    //-------------------------------------------------------------------------
+ 
+    //------------------------------------------------------------------------- 
     /** indicates, whether the printer is busy or not.
      */
-    [readonly, property] boolean IsBusy;
-
-    //-------------------------------------------------------------------------
-    /** indicates, whether the printer allows changes to
+    [readonly, property] boolean IsBusy; 
+ 
+    //------------------------------------------------------------------------- 
+    /** indicates, whether the printer allows changes to 
         <member>PrinterDescriptor::PaperOrientation</member>.
      */
-    [readonly, property] boolean CanSetPaperOrientation;
-
-    //-------------------------------------------------------------------------
-    /** indicates, whether the printer allows changes to
+    [readonly, property] boolean CanSetPaperOrientation; 
+ 
+    //------------------------------------------------------------------------- 
+    /** indicates, whether the printer allows changes to 
         <member>PrinterDescriptor::PaperFormat</member>.
      */
-    [readonly, property] boolean CanSetPaperFormat;
-
-    //-------------------------------------------------------------------------
-
-    /** indicates if the printer allows changes to
+    [readonly, property] boolean CanSetPaperFormat; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** indicates if the printer allows changes to 
         <member>PrinterDescriptor::PaperSize</member>.
      */
-    [readonly, property] boolean CanSetPaperSize;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [readonly, property] boolean CanSetPaperSize; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/RenderDescriptor.idl b/offapi/com/sun/star/view/RenderDescriptor.idl
index 7aa5e058471c..9f9121f5f0b9 100644
--- a/offapi/com/sun/star/view/RenderDescriptor.idl
+++ b/offapi/com/sun/star/view/RenderDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_RenderDescriptor_idl__
-#define __com_sun_star_view_RenderDescriptor_idl__
-
-#ifndef __com_sun_star_awt_Size_idl__
+#ifndef __com_sun_star_view_RenderDescriptor_idl__ 
+#define __com_sun_star_view_RenderDescriptor_idl__ 
+ 
+#ifndef __com_sun_star_awt_Size_idl__ 
 #include <com/sun/star/awt/Size.idl>
 #endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** describes the options for Render jobs.
 
     @since OOo 1.1.2
  */
 published service RenderDescriptor
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the page size for the current renderer. The unit of this page
     size is 1/100th mm.
      */
     [property] com::sun::star::awt::Size PageSize;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+
+#endif 
diff --git a/offapi/com/sun/star/view/RenderOptions.idl b/offapi/com/sun/star/view/RenderOptions.idl
index d018872ff47b..9584bce79a76 100644
--- a/offapi/com/sun/star/view/RenderOptions.idl
+++ b/offapi/com/sun/star/view/RenderOptions.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,89 +24,89 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_RenderOptions_idl__
-#define __com_sun_star_view_RenderOptions_idl__
-
-#ifndef __com_sun_star_awt_XDevice_idl__
-#include <com/sun/star/awt/XDevice.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_RenderOptions_idl__ 
+#define __com_sun_star_view_RenderOptions_idl__ 
+ 
+#ifndef __com_sun_star_awt_XDevice_idl__ 
+#include <com/sun/star/awt/XDevice.idl> 
+#endif 
+
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** describes the options for Render jobs.
 
     @since OOo 1.1.2
  */
 published service RenderOptions
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies the device the page should be rendered to
      */
     [property] com::sun::star::awt::XDevice RenderDevice;
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+        
     /** indicates that the current page is the first page to be exported.
-
-        <p>Hyperlinks, notes, and outlines cannot be exported on a per
-        page base. They have to be exported once *before* the first page
-        is exported. Therefore the IsFirstPage property has been introduced.
-        It is evaluated in the ::render function and indicates that the
+            
+        <p>Hyperlinks, notes, and outlines cannot be exported on a per 
+        page base. They have to be exported once *before* the first page 
+        is exported. Therefore the IsFirstPage property has been introduced. 
+        It is evaluated in the ::render function and indicates that the 
         current page is the first page to be exported.
         </p>
 
         @see XRenderable
      */
     [optional, property] boolean IsFirstPage;
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+        
     /** indicates that the current page is the last page to be exported.
 
-        <p>Hyperlinks from the EditEngine have to be exported once *after*
-        the last page has been processed. Therefore the IsLastPage property
-        has been introduced. It is evaluated in the ::render function and
+        <p>Hyperlinks from the EditEngine have to be exported once *after* 
+        the last page has been processed. Therefore the IsLastPage property 
+        has been introduced. It is evaluated in the ::render function and 
         indicates that the current page is the last page to be exported.
         </p>
 
         @see XRenderable
      */
     [optional, property] boolean IsLastPage;
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+        
     /** specifies if empty pages should be skipped.
 
-        <p>Tells the pdf export to skip empty pages. This flag also has
-        to be passed to the ::render function, in order to calculate to
-        correct page numbers during the export of hyperlinks, notes, and
+        <p>Tells the pdf export to skip empty pages. This flag also has 
+        to be passed to the ::render function, in order to calculate to 
+        correct page numbers during the export of hyperlinks, notes, and 
         outlines.
         </p>
 
         @see XRenderable
      */
     [optional, property] boolean IsSkipEmptyPages;
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+        
     /** specifies the page ranges to be rendered.
 
-        <p>Tells the pdf export to skip empty pages. This flag also has
-        to be passed to the ::render function, in order to calculate to
-        correct page numbers during the export of hyperlinks, notes,
+        <p>Tells the pdf export to skip empty pages. This flag also has 
+        to be passed to the ::render function, in order to calculate to 
+        correct page numbers during the export of hyperlinks, notes, 
         and outlines.
         </p>
 
         @see XRenderable
      */
     [optional, property] string PageRange;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+
+#endif 
diff --git a/offapi/com/sun/star/view/SelectionType.idl b/offapi/com/sun/star/view/SelectionType.idl
index c8aa07d27393..b179d6460fdc 100644
--- a/offapi/com/sun/star/view/SelectionType.idl
+++ b/offapi/com/sun/star/view/SelectionType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_SelectionType_idl__
-#define __com_sun_star_view_SelectionType_idl__
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_SelectionType_idl__ 
+#define __com_sun_star_view_SelectionType_idl__ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** Specifies a selection type for a view that supports a selection model.
  */
 enum SelectionType
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** No selection is possible.
     <p>The selection is always empty.</p>
      */
     NONE,
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+        
     /** The selection can only contain one or zero objects.
      */
     SINGLE,
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+        
     /** The selection can contain zero or more objects.
      */
     MULTI,
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+        
     /** The selection can contain zero or more objects.
         <p>all selected objects must be part of a continues range</p>
      */
     RANGE
-};
-
-//=============================================================================
-
-}; }; }; };
-
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/view/ViewSettings.idl b/offapi/com/sun/star/view/ViewSettings.idl
index 49947a40467f..92a8aa8d9a8e 100644
--- a/offapi/com/sun/star/view/ViewSettings.idl
+++ b/offapi/com/sun/star/view/ViewSettings.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_ViewSettings_idl__
-#define __com_sun_star_view_ViewSettings_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_ViewSettings_idl__ 
+#define __com_sun_star_view_ViewSettings_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** provides access to the settings of the controller of an office document.
  */
 published service ViewSettings
-{
-    interface com::sun::star::beans::XPropertySet;
+{ 
+    interface com::sun::star::beans::XPropertySet; 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** If this property is <TRUE/>, the horizontal ruler is displayed.
      */
-    [optional, property] boolean ShowHoriRuler;
-
-    //-------------------------------------------------------------------------
+    [optional, property] boolean ShowHoriRuler; 
+ 
+    //------------------------------------------------------------------------- 
     /** If this property is <TRUE/>, the horizontal scroll bar is displayed.
      */
-    [optional, property] boolean ShowHoriScrollBar;
-
-    //-------------------------------------------------------------------------
+    [optional, property] boolean ShowHoriScrollBar; 
+ 
+    //------------------------------------------------------------------------- 
     /** specfifies the zoom-value in percent.
      */
     [optional, property] short ZoomValue;
-
-    //-------------------------------------------------------------------------
+ 
+    //------------------------------------------------------------------------- 
     /** If this property is <TRUE/>, the vertical ruler is displayed.
      */
-    [optional, property] boolean ShowVertRuler;
-
-    //-------------------------------------------------------------------------
+    [optional, property] boolean ShowVertRuler; 
+ 
+    //------------------------------------------------------------------------- 
     /** If this property is <TRUE/>, the vertical scroll bar is displayed.
      */
-    [optional, property] boolean ShowVertScrollBar;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [optional, property] boolean ShowVertScrollBar; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/XControlAccess.idl b/offapi/com/sun/star/view/XControlAccess.idl
index 1a7264320fd8..27c35eecad0b 100644
--- a/offapi/com/sun/star/view/XControlAccess.idl
+++ b/offapi/com/sun/star/view/XControlAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_XControlAccess_idl__
-#define __com_sun_star_view_XControlAccess_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControl_idl__
-#include <com/sun/star/awt/XControl.idl>
-#endif
-
-#ifndef __com_sun_star_awt_XControlModel_idl__
-#include <com/sun/star/awt/XControlModel.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_XControlAccess_idl__ 
+#define __com_sun_star_view_XControlAccess_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XControl_idl__ 
+#include <com/sun/star/awt/XControl.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_awt_XControlModel_idl__ 
+#include <com/sun/star/awt/XControlModel.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** provides access to the controls in a view.
 
     @see com::sun::star::frame::XController
  */
 published interface XControlAccess: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** is called to get the control from the specified control model.
      */
-    com::sun::star::awt::XControl getControl( [in] com::sun::star::awt::XControlModel xModel )
-            raises( com::sun::star::container::NoSuchElementException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::awt::XControl getControl( [in] com::sun::star::awt::XControlModel xModel ) 
+            raises( com::sun::star::container::NoSuchElementException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/XFormLayerAccess.idl b/offapi/com/sun/star/view/XFormLayerAccess.idl
index 165f79dd0c44..cb5fe632e8ed 100644
--- a/offapi/com/sun/star/view/XFormLayerAccess.idl
+++ b/offapi/com/sun/star/view/XFormLayerAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,22 +28,22 @@
 #ifndef __offapi_com_sun_star_view_XFormLayerAccess_idl__
 #define __offapi_com_sun_star_view_XFormLayerAccess_idl__
 
-#ifndef __com_sun_star_view_XControlAccess_idl__
+#ifndef __com_sun_star_view_XControlAccess_idl__ 
 #include <com/sun/star/view/XControlAccess.idl>
 #endif
-#ifndef __com_sun_star_form_XForm_idl__
+#ifndef __com_sun_star_form_XForm_idl__ 
 #include <com/sun/star/form/XForm.idl>
 #endif
-#ifndef __com_sun_star_form_runtime_XFormController_idl__
+#ifndef __com_sun_star_form_runtime_XFormController_idl__ 
 #include <com/sun/star/form/runtime/XFormController.idl>
 #endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 
 //=============================================================================
 
-module com { module sun { module star { module view {
+module com { module sun { module star { module view { 
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/view/XLineCursor.idl b/offapi/com/sun/star/view/XLineCursor.idl
index 320831f308ba..faf7c9396ad7 100644
--- a/offapi/com/sun/star/view/XLineCursor.idl
+++ b/offapi/com/sun/star/view/XLineCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_XLineCursor_idl__
-#define __com_sun_star_view_XLineCursor_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_XLineCursor_idl__ 
+#define __com_sun_star_view_XLineCursor_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to move a cursor by lines within laid out text.
 
-    @see com::sun::star::table::CellCursor
-    @see com::sun::star::text::TextCursor
+    @see com::sun::star::table::CellCursor 
+    @see com::sun::star::text::TextCursor 
     @see com::sun::star::text::XTextViewCursor
  */
 published interface XLineCursor: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** determines if the cursor is positioned at the start of a line.
      */
-    boolean isAtStartOfLine();
-
-    //-------------------------------------------------------------------------
+    boolean isAtStartOfLine(); 
+ 
+    //------------------------------------------------------------------------- 
     /** determines if the cursor is positioned at the end of a line.
      */
-    boolean isAtEndOfLine();
-
-    //-------------------------------------------------------------------------
+    boolean isAtEndOfLine(); 
+ 
+    //------------------------------------------------------------------------- 
     /** moves the cursor to the end of the current line.
 
         @param bExpand
             determines whether the text range of the cursor is expanded (<TRUE/>)
             or the cursor will be just at the new position after the move (<FALSE/>).
      */
-    void gotoEndOfLine( [in] boolean bExpand );
-
-    //-------------------------------------------------------------------------
+    void gotoEndOfLine( [in] boolean bExpand ); 
+ 
+    //------------------------------------------------------------------------- 
     /** moves the cursor to the start of the current line.
 
         @param bExpand
             determines whether the text range of the cursor is expanded (<TRUE/>)
             or the cursor will be just at the new position after the move (<FALSE/>).
      */
-    void gotoStartOfLine( [in] boolean bExpand );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void gotoStartOfLine( [in] boolean bExpand ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/XMultiSelectionSupplier.idl b/offapi/com/sun/star/view/XMultiSelectionSupplier.idl
index 8d5d7e07fb52..f8d0ac311e01 100644
--- a/offapi/com/sun/star/view/XMultiSelectionSupplier.idl
+++ b/offapi/com/sun/star/view/XMultiSelectionSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,25 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_XMultiSelectionSupplier_idl__
-#define __com_sun_star_view_XMultiSelectionSupplier_idl__
-
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
-#include <com/sun/star/view/XSelectionSupplier.idl>
-#endif
+#ifndef __com_sun_star_view_XMultiSelectionSupplier_idl__ 
+#define __com_sun_star_view_XMultiSelectionSupplier_idl__ 
+ 
+#ifndef __com_sun_star_view_XSelectionSupplier_idl__ 
+#include <com/sun/star/view/XSelectionSupplier.idl> 
+#endif 
 #ifndef __com_sun_star_container_XEnumeration_idl__
 #include <com/sun/star/container/XEnumeration.idl>
 #endif
 
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to append and remove objects from a selection.
 
-    <p>The method <method>XSelectionSupplier::setSelection</method> for an
+    <p>The method <method>XSelectionSupplier::setSelection</method> for an 
     instance that also supports <type>XMultiSelectionSupplier</method> should
     be implemented that it also takes either a selectable object or a sequence
     of selectable objects.</p>
@@ -51,81 +51,81 @@ module com {  module sun {  module star {  module view {
     selection for that object but only select it once</p>
  */
 interface XMultiSelectionSupplier: XSelectionSupplier
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
 
     /** adds the object or the objects represented by <var>Selection</var> to the selection
         of this <type>XMultiSelectionSupplier</type>.
-
+        
         @param Selection
             either an Object that is selectable or a sequence of objects that are selectable.
-
+        
         @returns
             <TRUE/>/, if <var>Selection</var> was added to the current selection.
             <FALSE/>, if <var>Selection</var> or parts of <var>Selection</var> could not be
             added to the current selection. For example, if the selection already contains
             objects that are forbidden to be selected together with <var>Selection</var>
-
+        
         @raises com::sun::star::lang::IllegalArgumentException
             If <var>Selection</var> is not a selectable object for this <type>XMultiSelectionSupplier</type>.
             <p>Adding an object to the selection that is already part of the selection should not raise this exception</p>
      */
-    boolean addSelection( [in] any Selection )
-                raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
+    boolean addSelection( [in] any Selection ) 
+                raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
 
     /** remove the object or objects represented by <var>Selection</var> from the
         selection of this <type>XMultiSelectionSupplier</type>.
-
+        
         @param Selection
             either an Object that is selectable or a sequence of objects that are selectable.
-
+        
         @returns
             <TRUE/>/, if <var>Selection</var> was added to the current selection.
             <FALSE/>, if <var>Selection</var> or parts of <var>Selection</var> could not be
             added to the current selection. For example, if the selection already contains
             objects that are forbidden to be selected together with <var>Selection</var>.
-
+        
         @raises com::sun::star::lang::IllegalArgumentException
             If <var>Selection</var> is not a selectable object for this <type>XMultiSelectionSupplier</type>.
             <p>Removing an object from the selection that is not part of the selection should not raise this exception</p>
      */
-    void removeSelection( [in] any Selection )
-                raises( com::sun::star::lang::IllegalArgumentException );
+    void removeSelection( [in] any Selection ) 
+                raises( com::sun::star::lang::IllegalArgumentException ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** clears the selection of this <type>XMultiSelectionSupplier</type>.
     */
     void clearSelection();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** returns the number of selected objects of this <type>XMultiSelectionSupplier</type>.
     */
     long getSelectionCount();
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
-    /** @returns
+    /** @returns		 
             a new object to enumerate the selection of this <type>XMultiSelectionSupplier</type>.
             It returns NULL if there are no objects in the selection.
      */
-    com::sun::star::container::XEnumeration createSelectionEnumeration();
+    com::sun::star::container::XEnumeration createSelectionEnumeration(); 
 
 
-    /** @returns
+    /** @returns		 
             a new object to enumerate the selection of this <type>XMultiSelectionSupplier</type>
             in reverse order. If the order of the selected objects
             It returns NULL if there are no objects in the selection.
      */
-    com::sun::star::container::XEnumeration createReverseSelectionEnumeration();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::container::XEnumeration createReverseSelectionEnumeration(); 
+
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/XPrintJob.idl b/offapi/com/sun/star/view/XPrintJob.idl
index 5898b9f3a7ce..edb33e842acf 100644
--- a/offapi/com/sun/star/view/XPrintJob.idl
+++ b/offapi/com/sun/star/view/XPrintJob.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/view/XPrintJobBroadcaster.idl b/offapi/com/sun/star/view/XPrintJobBroadcaster.idl
index 54335f834a51..7ed4d57c4205 100644
--- a/offapi/com/sun/star/view/XPrintJobBroadcaster.idl
+++ b/offapi/com/sun/star/view/XPrintJobBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/view/XPrintJobListener.idl b/offapi/com/sun/star/view/XPrintJobListener.idl
index 74e6431e2848..18865c755744 100644
--- a/offapi/com/sun/star/view/XPrintJobListener.idl
+++ b/offapi/com/sun/star/view/XPrintJobListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/view/XPrintPreview.idl b/offapi/com/sun/star/view/XPrintPreview.idl
index dfc242753788..1b582775675c 100644
--- a/offapi/com/sun/star/view/XPrintPreview.idl
+++ b/offapi/com/sun/star/view/XPrintPreview.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module view {
+module com { module sun { module star { module view { 
 
 //=============================================================================
 /** @deprecated
@@ -52,6 +52,6 @@ published interface XPrintPreview: com::sun::star::uno::XInterface
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/view/XPrintSettingsSupplier.idl b/offapi/com/sun/star/view/XPrintSettingsSupplier.idl
index 349710d3b3cf..83b864be9e47 100644
--- a/offapi/com/sun/star/view/XPrintSettingsSupplier.idl
+++ b/offapi/com/sun/star/view/XPrintSettingsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_XPrintSettingsSupplier_idl__
-#define __com_sun_star_view_XPrintSettingsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_XPrintSettingsSupplier_idl__ 
+#define __com_sun_star_view_XPrintSettingsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** offers printing related settings, which affect document rendering,
     but are not related to the printer itself.
  */
 published interface XPrintSettingsSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            a set of properties which are related to printing.
-
+{ 
+    //------------------------------------------------------------------------- 
+         
+    /** @returns 
+            a set of properties which are related to printing. 
+         
         @see PrintSettings
      */
-    com::sun::star::beans::XPropertySet getPrintSettings();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::beans::XPropertySet getPrintSettings(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/XPrintable.idl b/offapi/com/sun/star/view/XPrintable.idl
index f4bf1a5c5867..500881389d57 100644
--- a/offapi/com/sun/star/view/XPrintable.idl
+++ b/offapi/com/sun/star/view/XPrintable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_XPrintable_idl__
-#define __com_sun_star_view_XPrintable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_XPrintable_idl__ 
+#define __com_sun_star_view_XPrintable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** offers printing functionality.
  */
 published interface XPrintable: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-    /** @returns
-            a descriptor of the current printer.
-
-        <p>The attributes of the current printer are used for formatting.
-
+{ 
+    //------------------------------------------------------------------------- 
+    /** @returns 
+            a descriptor of the current printer. 
+         
+        <p>The attributes of the current printer are used for formatting. 
+         
         @see PrinterDescriptor
      */
-    sequence<com::sun::star::beans::PropertyValue> getPrinter();
-
-    //-------------------------------------------------------------------------
+    sequence<com::sun::star::beans::PropertyValue> getPrinter(); 
+ 
+    //------------------------------------------------------------------------- 
     /** assigns a new printer to the object.
 
         <p>Setting a new printer will cause reformatting.
-
+        
         @see PrinterDescriptor
      */
-    void setPrinter( [in] sequence<com::sun::star::beans::PropertyValue> aPrinter )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
+    void setPrinter( [in] sequence<com::sun::star::beans::PropertyValue> aPrinter ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** prints the object.
 
         @param xOptions
@@ -79,13 +79,13 @@ published interface XPrintable: com::sun::star::uno::XInterface
 
         @see PrintOptions
      */
-    void print( [in] sequence<com::sun::star::beans::PropertyValue> xOptions )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void print( [in] sequence<com::sun::star::beans::PropertyValue> xOptions ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/XPrintableBroadcaster.idl b/offapi/com/sun/star/view/XPrintableBroadcaster.idl
index ab95537cd274..0d07578f5b98 100644
--- a/offapi/com/sun/star/view/XPrintableBroadcaster.idl
+++ b/offapi/com/sun/star/view/XPrintableBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,21 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_XPrintableBroadcaster_idl__
-#define __com_sun_star_view_XPrintableBroadcaster_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
+#ifndef __com_sun_star_view_XPrintableBroadcaster_idl__ 
+#define __com_sun_star_view_XPrintableBroadcaster_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
 #endif
 
 #ifndef __com_sun_star_view_XPrintableListener_idl__
 #include <com/sun/star/view/XPrintableListener.idl>
 #endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
 //-----------------------------------------------------------------------------
 /** allows for getting information about a print job.
 
diff --git a/offapi/com/sun/star/view/XPrintableListener.idl b/offapi/com/sun/star/view/XPrintableListener.idl
index 179e4c6e53f7..d80c83c1128d 100644
--- a/offapi/com/sun/star/view/XPrintableListener.idl
+++ b/offapi/com/sun/star/view/XPrintableListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_XPrintableListener_idl__
-#define __com_sun_star_view_XPrintableListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
+#ifndef __com_sun_star_view_XPrintableListener_idl__ 
+#define __com_sun_star_view_XPrintableListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
 #endif
 
 #ifndef __com_sun_star_view_XPrintable_idl__
 #include <com/sun/star/view/XPrintable.idl>
 #endif
-
+ 
 #ifndef __com_sun_star_view_PrintableState_idl__
 #include <com/sun/star/view/PrintableStateEvent.idl>
 #endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
 /** receives events about print job progress.
 
-    <p><type>XPrintableListener</type> can be registered to <type>XPrintableBroadcaster</type>.
+    <p><type>XPrintableListener</type> can be registered to <type>XPrintableBroadcaster</type>. 
     Then, the client object will receive events about print progress.  </p>
 
     @see XPrintableBroadcaster
@@ -55,7 +55,7 @@ published interface XPrintableListener : com::sun::star::lang::XEventListener
     //--------------------------------------------------------------------------
     /** informs the user of the new state in print progress.
 
-        @param Event
+        @param Event 
             contains the <type>XPrintable</type> having changed state and the new state.
     */
     [oneway] void stateChanged( [in] PrintableStateEvent Event );
diff --git a/offapi/com/sun/star/view/XRenderable.idl b/offapi/com/sun/star/view/XRenderable.idl
index 01c874e0e7ad..1aed140eea22 100644
--- a/offapi/com/sun/star/view/XRenderable.idl
+++ b/offapi/com/sun/star/view/XRenderable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,87 +24,87 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_XRenderable_idl__
-#define __com_sun_star_view_XRenderable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_XRenderable_idl__ 
+#define __com_sun_star_view_XRenderable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** represents something that can be rendered.
 
     @since OOo 1.1.2
  */
 published interface XRenderable : com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the count of renderers (based on paper count of a document, for example).
-
-        <p> If a selection is given, the count has to be calculated
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            the count of renderers (based on paper count of a document, for example). 
+            
+        <p> If a selection is given, the count has to be calculated 
             based on this selection. The other methods of this interface
             will rely on this value if called.
-
-        <p> If the selection contains a valid XModel interface,
+            
+        <p> If the selection contains a valid XModel interface, 
             it is assumed that the whole document should be rendered.
             If the selection is empty, nothing should be rendered.
 
         @see RenderOptions
      */
     long getRendererCount( [in] any aSelection, [in] sequence<com::sun::star::beans::PropertyValue> xOptions )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            a descriptor of the specific renderer.
-
-        <p> returns the specific renderer properties based on the given selection.
-
-        <p> If the selection contains a valid XModel interface,
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            a descriptor of the specific renderer. 
+         
+        <p> returns the specific renderer properties based on the given selection. 
+        
+        <p> If the selection contains a valid XModel interface, 
             it is assumed that the whole document should be rendered.
             If the selection is empty, nothing should be rendered.
-
+         
         @see RenderDescriptor
         @see RenderOptions
      */
     sequence<com::sun::star::beans::PropertyValue> getRenderer( [in] long nRenderer, [in] any aSelection, [in] sequence<com::sun::star::beans::PropertyValue> xOptions )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** renders the object.
 
-        <p> renders the object with the specific renderer based on the given selection.
+        <p> renders the object with the specific renderer based on the given selection. 
 
-        <p> If the selection contains a valid XModel interface,
+        <p> If the selection contains a valid XModel interface, 
             it is assumed that the whole document should be rendered.
             If the selection is empty, nothing should be rendered.
 
         @see RenderOptions
      */
-    void render( [in] long nRenderer, [in] any aSelection, [in] sequence<com::sun::star::beans::PropertyValue> xOptions )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void render( [in] long nRenderer, [in] any aSelection, [in] sequence<com::sun::star::beans::PropertyValue> xOptions ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/XScreenCursor.idl b/offapi/com/sun/star/view/XScreenCursor.idl
index 6a4b520d52c5..3b377dd94636 100644
--- a/offapi/com/sun/star/view/XScreenCursor.idl
+++ b/offapi/com/sun/star/view/XScreenCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_XScreenCursor_idl__
-#define __com_sun_star_view_XScreenCursor_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_XScreenCursor_idl__ 
+#define __com_sun_star_view_XScreenCursor_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to page through the document in steps of the displayed size.
  */
 published interface XScreenCursor: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** scrolls the view forward by one visible page.
      */
-    boolean screenDown();
-
-    //-------------------------------------------------------------------------
+    boolean screenDown(); 
+ 
+    //------------------------------------------------------------------------- 
     /** scrolls the view backward by one visible page.
      */
-    boolean screenUp();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean screenUp(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/XSelectionChangeListener.idl b/offapi/com/sun/star/view/XSelectionChangeListener.idl
index 91e9d72d17c1..e80ca5a64649 100644
--- a/offapi/com/sun/star/view/XSelectionChangeListener.idl
+++ b/offapi/com/sun/star/view/XSelectionChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_XSelectionChangeListener_idl__
-#define __com_sun_star_view_XSelectionChangeListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_XSelectionChangeListener_idl__ 
+#define __com_sun_star_view_XSelectionChangeListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to receive an event when the current selection changes.
 
     @see com::sun::star::view::XSelectionSupplier
  */
 published interface XSelectionChangeListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is called when the selection changes.
 
         <p>You can get the new selection via <type>XSelectionSupplier</type> from
         <member scope="com::sun::star::lang">EventObject::Source</member>.
-
+        
      */
-    [oneway] void selectionChanged( [in] com::sun::star::lang::EventObject aEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void selectionChanged( [in] com::sun::star::lang::EventObject aEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/XSelectionSupplier.idl b/offapi/com/sun/star/view/XSelectionSupplier.idl
index 84ed18ee8287..43eaa6c7b0aa 100644
--- a/offapi/com/sun/star/view/XSelectionSupplier.idl
+++ b/offapi/com/sun/star/view/XSelectionSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,66 +24,66 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_XSelectionSupplier_idl__
-#define __com_sun_star_view_XSelectionSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_view_XSelectionChangeListener_idl__
-#include <com/sun/star/view/XSelectionChangeListener.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_XSelectionSupplier_idl__ 
+#define __com_sun_star_view_XSelectionSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_view_XSelectionChangeListener_idl__ 
+#include <com/sun/star/view/XSelectionChangeListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to access and change the selection in a view.
 
     @see OfficeDocumentView
  */
 published interface XSelectionSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** selects the object represented by <var>xSelection</var> if it is
         known and selectable in this object.
      */
-    boolean select( [in] any xSelection )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-    /** @returns
-                the current selection.
-
-        <p>The selection is either specified by an object which is contained
-        in the component to which the view belongs, or it is an interface of a
+    boolean select( [in] any xSelection ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** @returns 
+                the current selection. 
+                 
+        <p>The selection is either specified by an object which is contained 
+        in the component to which the view belongs, or it is an interface of a 
         collection which contains such objects.
      */
-    any getSelection();
-
-    //-------------------------------------------------------------------------
+    any getSelection(); 
+ 
+    //------------------------------------------------------------------------- 
     /** registers an event listener, which is called when the selection changes.
      */
-    void addSelectionChangeListener( [in] com::sun::star::view::XSelectionChangeListener xListener );
-
-    //-------------------------------------------------------------------------
+    void addSelectionChangeListener( [in] com::sun::star::view::XSelectionChangeListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
     /** unregisters an event listener which was registered with
         <method>XSelectionSupplier::addSelectionChangeListener</method>.
      */
-    void removeSelectionChangeListener( [in] com::sun::star::view::XSelectionChangeListener xListener );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void removeSelectionChangeListener( [in] com::sun::star::view::XSelectionChangeListener xListener ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/XViewCursor.idl b/offapi/com/sun/star/view/XViewCursor.idl
index 5d5b855a357f..084f7415ebc9 100644
--- a/offapi/com/sun/star/view/XViewCursor.idl
+++ b/offapi/com/sun/star/view/XViewCursor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_XViewCursor_idl__
-#define __com_sun_star_view_XViewCursor_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_XViewCursor_idl__ 
+#define __com_sun_star_view_XViewCursor_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to move a cursor up/down/left/right within laid out text.
-
-    @see com::sun::star::table::CellCursor
-    @see com::sun::star::text::TextCursor
+    
+    @see com::sun::star::table::CellCursor 
+    @see com::sun::star::text::TextCursor 
     @see com::sun::star::view::XLineCursor
  */
 published interface XViewCursor: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** moves the cursor the specified number of lines down.
 
         @param nCount
@@ -57,12 +57,12 @@ published interface XViewCursor: com::sun::star::uno::XInterface
             or the cursor will be just at the new position after the move (<FALSE/>).
 
         @returns
-            <TRUE/> if the cursor was moved,
+            <TRUE/> if the cursor was moved, 
             or <FALSE/> if it was already in the bottom row.
      */
-    boolean goDown( [in] short nCount, [in] boolean bExpand );
-
-    //-------------------------------------------------------------------------
+    boolean goDown( [in] short nCount, [in] boolean bExpand ); 
+ 
+    //------------------------------------------------------------------------- 
     /** moves the cursor the specified number of lines up.
 
         @param nCount
@@ -72,12 +72,12 @@ published interface XViewCursor: com::sun::star::uno::XInterface
             determines whether the text range of the cursor is expanded (<TRUE/>)
 
         @returns
-            <TRUE/> if the cursor was moved,
+            <TRUE/> if the cursor was moved, 
             or <FALSE/> if it was already in the top row.
      */
-    boolean goUp( [in] short nCount, [in] boolean bExpand );
-
-    //-------------------------------------------------------------------------
+    boolean goUp( [in] short nCount, [in] boolean bExpand ); 
+ 
+    //------------------------------------------------------------------------- 
     /** moves the cursor the specified number of characters to the left.
 
         @param nCount
@@ -87,12 +87,12 @@ published interface XViewCursor: com::sun::star::uno::XInterface
             determines whether the text range of the cursor is expanded (<TRUE/>)
 
         @returns
-            <TRUE/> if the cursor was moved,
+            <TRUE/> if the cursor was moved, 
             or <FALSE/> if it was already at the leftmost position.
      */
-    boolean goLeft( [in] short nCount, [in] boolean bExpand );
-
-    //-------------------------------------------------------------------------
+    boolean goLeft( [in] short nCount, [in] boolean bExpand ); 
+ 
+    //------------------------------------------------------------------------- 
     /** moves the cursor the specified number of characters to the right.
 
         @param nCount
@@ -102,15 +102,15 @@ published interface XViewCursor: com::sun::star::uno::XInterface
             determines whether the text range of the cursor is expanded (<TRUE/>)
 
         @returns
-            <TRUE/> if the cursor was moved,
+            <TRUE/> if the cursor was moved, 
             or <FALSE/> if it was already at the rightmost position.
      */
-    boolean goRight( [in] short nCount, [in] boolean bExpand );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean goRight( [in] short nCount, [in] boolean bExpand ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/view/XViewSettingsSupplier.idl b/offapi/com/sun/star/view/XViewSettingsSupplier.idl
index dbcedcda2c17..7d2dc8fb5456 100644
--- a/offapi/com/sun/star/view/XViewSettingsSupplier.idl
+++ b/offapi/com/sun/star/view/XViewSettingsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_view_XViewSettingsSupplier_idl__
-#define __com_sun_star_view_XViewSettingsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module view {
-
-//=============================================================================
-
+#ifndef __com_sun_star_view_XViewSettingsSupplier_idl__ 
+#define __com_sun_star_view_XViewSettingsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module view {  
+ 
+//============================================================================= 
+ 
 /** provides access to the view settings of the object.
  */
 published interface XViewSettingsSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
                 an interface to the <type>ViewSettings</type>.
 
         <p>Subclasses might be returned instead, offering more settings. </p>
      */
-    com::sun::star::beans::XPropertySet getViewSettings();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::beans::XPropertySet getViewSettings(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/xforms/Binding.idl b/offapi/com/sun/star/xforms/Binding.idl
index 8885d56a4d9e..aab8edf5b42d 100644
--- a/offapi/com/sun/star/xforms/Binding.idl
+++ b/offapi/com/sun/star/xforms/Binding.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xforms/InvalidDataOnSubmitException.idl b/offapi/com/sun/star/xforms/InvalidDataOnSubmitException.idl
index 62174ddb8573..569d59f2dc22 100644
--- a/offapi/com/sun/star/xforms/InvalidDataOnSubmitException.idl
+++ b/offapi/com/sun/star/xforms/InvalidDataOnSubmitException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module xforms {
 //=============================================================================
 
 /** thrown if the user triggers an XForms submission with invalid
-    instance data
+    instance data 
 
     The <member scope="com::sun::star::uno">Exception::Source</member> member
     refers to the submission which was invoked.
diff --git a/offapi/com/sun/star/xforms/XDataTypeRepository.idl b/offapi/com/sun/star/xforms/XDataTypeRepository.idl
index f2c2f1d2fd67..dd244858995b 100644
--- a/offapi/com/sun/star/xforms/XDataTypeRepository.idl
+++ b/offapi/com/sun/star/xforms/XDataTypeRepository.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,15 +37,15 @@
 #ifndef __com_sun_star_xsd_XDataType_idl__
 #include <com/sun/star/xsd/XDataType.idl>
 #endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-#ifndef __com_sun_star_container_ElementExistException_idl__
-#include <com/sun/star/container/ElementExistException.idl>
-#endif
-#ifndef __com_sun_star_util_VetoException_idl__
-#include <com/sun/star/util/VetoException.idl>
-#endif
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+#ifndef __com_sun_star_container_ElementExistException_idl__ 
+#include <com/sun/star/container/ElementExistException.idl> 
+#endif 
+#ifndef __com_sun_star_util_VetoException_idl__ 
+#include <com/sun/star/util/VetoException.idl> 
+#endif 
 
 
 //=============================================================================
@@ -69,7 +69,7 @@ interface XDataTypeRepository
     interface com::sun::star::container::XNameAccess;
 
     /** retrieves the basic type for the given type class
-
+    
         @see com::sun::star::xsd::DataTypeClass
 
         @throws com::sun::star::container::NoSuchElementException
@@ -80,7 +80,7 @@ interface XDataTypeRepository
             raises ( com::sun::star::container::NoSuchElementException );
 
     /** creates a clone of the given data type, and inserts it into the repository
-
+    
         @throws com::sun::star::container::NoSuchElementException
             if the given name does not refer to a type in the repository
 
@@ -89,7 +89,7 @@ interface XDataTypeRepository
     */
     com::sun::star::xsd::XDataType
         cloneDataType( [in] string sourceName, [in] string newName )
-            raises( com::sun::star::container::NoSuchElementException, com::sun::star::container::ElementExistException );
+            raises( com::sun::star::container::NoSuchElementException, com::sun::star::container::ElementExistException ); 
 
     /** removes a data type given by name from the repository
 
diff --git a/offapi/com/sun/star/xforms/XFormsEvent.idl b/offapi/com/sun/star/xforms/XFormsEvent.idl
index 32fa94ec9ce9..c45a320a1354 100644
--- a/offapi/com/sun/star/xforms/XFormsEvent.idl
+++ b/offapi/com/sun/star/xforms/XFormsEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,12 +29,12 @@
 
 #include <com/sun/star/xml/dom/events/XEvent.idl>
 
-module com {  module sun {  module star {  module xforms {
+module com {  module sun {  module star {  module xforms {  
 
 interface XFormsEvent : com::sun::star::xml::dom::events::XEvent {
 
-    void initXFormsEvent([in] string typeArg,
-                         [in] boolean canBubbleArg,
+    void initXFormsEvent([in] string typeArg, 
+                         [in] boolean canBubbleArg, 
                          [in] boolean cancelableArg);
 };
 
diff --git a/offapi/com/sun/star/xforms/XFormsSupplier.idl b/offapi/com/sun/star/xforms/XFormsSupplier.idl
index 066cabc4918b..896db4d85544 100644
--- a/offapi/com/sun/star/xforms/XFormsSupplier.idl
+++ b/offapi/com/sun/star/xforms/XFormsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xforms_XFormsSupplier_idl__
-#define __com_sun_star_xforms_XFormsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xforms {
-
-//=============================================================================
-
+#ifndef __com_sun_star_xforms_XFormsSupplier_idl__ 
+#define __com_sun_star_xforms_XFormsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#include <com/sun/star/container/XNameContainer.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xforms {  
+ 
+//============================================================================= 
+ 
 /** provides access to the XForms models contained in the component
  */
 interface XFormsSupplier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** access XForms model container.
         @returns a container for the XForms models contained in the component
      */
-    com::sun::star::container::XNameContainer getXForms();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::container::XNameContainer getXForms(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/xforms/XFormsUIHelper1.idl b/offapi/com/sun/star/xforms/XFormsUIHelper1.idl
index 35488ba2883d..96054ef151e3 100644
--- a/offapi/com/sun/star/xforms/XFormsUIHelper1.idl
+++ b/offapi/com/sun/star/xforms/XFormsUIHelper1.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,59 +24,59 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xforms_XFormsUIHelper1_idl__
-#define __com_sun_star_xforms_XFormsUIHelper1_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_dom_XNode_idl__
-#include <com/sun/star/xml/dom/XNode.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XSet.idl>
-#endif
-
-#ifndef __com_sun_star_xforms_XDataTypeRepository_idl__
-#include <com/sun/star/xforms/XDataTypeRepository.idl>
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
-#include <com/sun/star/xml/dom/XDocument.idl>
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
-#include <com/sun/star/xml/dom/XNode.idl>
-#endif
+#ifndef __com_sun_star_xforms_XFormsUIHelper1_idl__ 
+#define __com_sun_star_xforms_XFormsUIHelper1_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_dom_XNode_idl__ 
+#include <com/sun/star/xml/dom/XNode.idl> 
+#endif 
+
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XSet.idl> 
+#endif 
+
+#ifndef __com_sun_star_xforms_XDataTypeRepository_idl__ 
+#include <com/sun/star/xforms/XDataTypeRepository.idl> 
+#endif 
+
+#ifndef __com_sun_star_xml_dom_XDocument_idl__ 
+#include <com/sun/star/xml/dom/XDocument.idl> 
+#endif 
+
+#ifndef __com_sun_star_xml_dom_XDocument_idl__ 
+#include <com/sun/star/xml/dom/XNode.idl> 
+#endif 
 
 #ifndef __com_sun_star_frame_XModel_idl__
 #include <com/sun/star/frame/XModel.idl>
-#endif
+#endif 
 
 #ifndef __com_sun_star_xforms_XModel_idl__
 #include <com/sun/star/xforms/XModel.idl>
-#endif
-
-
-//=============================================================================
+#endif 
 
-module com {  module sun {  module star {  module xforms {
-
-//=============================================================================
 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xforms {  
+ 
+//============================================================================= 
+ 
 /** provide several helper methods for the UI
 
     <b>This interfaces is for UI use only, and will likely be unsupported in
     future versions.</p>
 */
 interface XFormsUIHelper1
-{
+{ 
     string getDefaultServiceNameForNode( [in] com::sun::star::xml::dom::XNode xNode );
 
     string getDefaultBindingExpressionForNode( [in] com::sun::star::xml::dom::XNode xNode );
@@ -122,19 +122,19 @@ interface XFormsUIHelper1
 
 
     // DOM helpers
-    com::sun::star::xml::dom::XNode
+    com::sun::star::xml::dom::XNode 
         createElement( [in] com::sun::star::xml::dom::XNode xParent,
                        [in] string sName );
     com::sun::star::xml::dom::XNode
         createAttribute( [in] com::sun::star::xml::dom::XNode xParent,
                          [in] string sName );
-
-    com::sun::star::xml::dom::XNode renameNode(
+    
+    com::sun::star::xml::dom::XNode renameNode( 
         [in] com::sun::star::xml::dom::XNode xNode,
         [in] string sName );
 
     com::sun::star::beans::XPropertySet getBindingForNode(
-        [in] com::sun::star::xml::dom::XNode xNode,
+        [in] com::sun::star::xml::dom::XNode xNode, 
         [in] boolean bCreate );
 
     void removeBindingForNode(
@@ -149,17 +149,17 @@ interface XFormsUIHelper1
 
     boolean isValidPrefixName( [in] string sName );
 
-    void setNodeValue(
+    void setNodeValue( 
         [in] com::sun::star::xml::dom::XNode xNode,
         [in] string sValue );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/xforms/XModel.idl b/offapi/com/sun/star/xforms/XModel.idl
index ea2e71bdd39a..f1630ac096ca 100644
--- a/offapi/com/sun/star/xforms/XModel.idl
+++ b/offapi/com/sun/star/xforms/XModel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xforms_XModel_idl__
-#define __com_sun_star_xforms_XModel_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XSet.idl>
-#endif
-
-#ifndef __com_sun_star_xforms_XDataTypeRepository_idl__
-#include <com/sun/star/xforms/XDataTypeRepository.idl>
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
-#include <com/sun/star/xml/dom/XDocument.idl>
-#endif
+#ifndef __com_sun_star_xforms_XModel_idl__ 
+#define __com_sun_star_xforms_XModel_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XSet.idl> 
+#endif 
+
+#ifndef __com_sun_star_xforms_XDataTypeRepository_idl__ 
+#include <com/sun/star/xforms/XDataTypeRepository.idl> 
+#endif 
+
+#ifndef __com_sun_star_xml_dom_XDocument_idl__ 
+#include <com/sun/star/xml/dom/XDocument.idl> 
+#endif 
 
 #ifndef __com_sun_star_util_VetoException_idl__
 #include <com/sun/star/util/VetoException.idl>
@@ -59,18 +59,18 @@
 #include <com/sun/star/task/XInteractionHandler.idl>
 #endif
 
-//=============================================================================
-
-module com {  module sun {  module star {  module xforms {
-
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xforms {  
+ 
 interface XSubmission;
 
-//=============================================================================
-
+//============================================================================= 
+ 
 /** represent an XForms model
  */
 interface XModel
-{
+{ 
     /** get the XForms model ID */
     string getID();
 
@@ -148,7 +148,7 @@ interface XModel
     // instances
     //
 
-    /** gets container containing all instances;
+    /** gets container containing all instances; 
 
         <p>The elements of the set are arrays of <type scope="com::sun::star::beans">PropertyValue</type>s,
         containing the ID, the URL, and the instance itself.</p>
@@ -166,7 +166,7 @@ interface XModel
 
     //
     // bindings
-    //
+    // 
 
     /** create a binding element for this model
 
@@ -201,7 +201,7 @@ interface XModel
     //
 
     /** create a submission element for this model
-
+        
         <p>The returned submission element still needs to be inserted into the submission container.</p>
 
         @see getSubmissions
@@ -226,13 +226,13 @@ interface XModel
     /** get container containing all submissions; also supports XNameAccess
     */
     com::sun::star::container::XSet getSubmissions();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/offapi/com/sun/star/xforms/XSubmission.idl b/offapi/com/sun/star/xforms/XSubmission.idl
index a7c11f661666..48d2e60171e4 100644
--- a/offapi/com/sun/star/xforms/XSubmission.idl
+++ b/offapi/com/sun/star/xforms/XSubmission.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xml/Attribute.idl b/offapi/com/sun/star/xml/Attribute.idl
index e76137a311db..348e4c09c021 100644
--- a/offapi/com/sun/star/xml/Attribute.idl
+++ b/offapi/com/sun/star/xml/Attribute.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,15 +24,15 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_Attribute_idl__
-#define __com_sun_star_xml_Attribute_idl__
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {
-
-//=============================================================================
-
+#ifndef __com_sun_star_xml_Attribute_idl__ 
+#define __com_sun_star_xml_Attribute_idl__ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml { 
+ 
+//============================================================================= 
+ 
 /**
  * A struct to keep information of an element's attribute.
  */
@@ -47,15 +47,15 @@ struct Attribute
      * the attribute namespace URL
      */
     string NamespaceURL;
-
+    
     /**
      * the attribute value
      */
     string Value;
 };
+ 
+//============================================================================= 
+ 
+}; }; }; };  
 
-//=============================================================================
-
-}; }; }; };
-
-#endif
+#endif 
diff --git a/offapi/com/sun/star/xml/AttributeContainer.idl b/offapi/com/sun/star/xml/AttributeContainer.idl
index 74f34e7f5ac7..2e8b7187f475 100644
--- a/offapi/com/sun/star/xml/AttributeContainer.idl
+++ b/offapi/com/sun/star/xml/AttributeContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,15 +33,15 @@
 
 //=============================================================================
 
-module com { module sun { module star { module xml {
+module com { module sun { module star { module xml { 
 
 //=============================================================================
-/** This service describes a container for xml attributes.
+/** This service describes a container for xml attributes. 
 
-    <p>Each attribute is accessed with its local name, or optionally, its local
-    name with its namespace prefix. The type and value of an attribute is stored
-    in a <code>AttributeData</code> struct. If you use a namespace in the
-    <code>AttributeData</code>, you must use a prefix in the name and you must
+    <p>Each attribute is accessed with its local name, or optionally, its local 
+    name with its namespace prefix. The type and value of an attribute is stored 
+    in a <code>AttributeData</code> struct. If you use a namespace in the 
+    <code>AttributeData</code>, you must use a prefix in the name and you must 
     use a namespace, if you use a prefix.
 */
 published service AttributeContainer
@@ -51,6 +51,6 @@ published service AttributeContainer
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/xml/AttributeData.idl b/offapi/com/sun/star/xml/AttributeData.idl
index 4f8deab14a58..812d5ebb5d44 100644
--- a/offapi/com/sun/star/xml/AttributeData.idl
+++ b/offapi/com/sun/star/xml/AttributeData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifndef __com_sun_star_xml_AttributeData_idl__
-#define __com_sun_star_xml_AttributeData_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module xml {
-
-//=============================================================================
-
+ 
+#ifndef __com_sun_star_xml_AttributeData_idl__ 
+#define __com_sun_star_xml_AttributeData_idl__ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module xml {  
+ 
+//============================================================================= 
+ 
 /** store the type and value of an XML attribute
     inside a XNameContainer
  */
 published struct AttributeData
 {
     /** the namespace of this XML attribute.
-
+    
         <p>This string can be empty if you are not using namespaces.
      */
-    string Namespace;
-
-
-    /** the type of this XML attribute.
-
+    string Namespace; 
+ 
+     
+    /** the type of this XML attribute. 
+    
         <p>For non validating parsers this must be CDATA.
      */
-    string Type;
-
-
+    string Type; 
+ 
+     
     /** the string value of this XML attribute.
      */
-    string Value;
-};
-
-//=============================================================================
-
-}; }; }; };
+    string Value; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/xml/ExportFilter.idl b/offapi/com/sun/star/xml/ExportFilter.idl
index aae508180607..f42be92823fc 100644
--- a/offapi/com/sun/star/xml/ExportFilter.idl
+++ b/offapi/com/sun/star/xml/ExportFilter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,33 +33,33 @@
 #endif
 
 
-module com { module sun { module star { module xml {
+module com { module sun { module star { module xml { 
 
 /** describes an export filter for XML-based file formats.
 
-   <p>First, the <method>XExportFilter::exporter</method> method must be
-   called to provide the export component with the target location to
-   which the data should be exported. Then, the source document's XML
-   representation will be generated by calling the appropriate methods
-   of the <type scope="com::sun::star::xml::sax">XDocumentHandler</type>
-   interface.  Error conditions must be signalled by throwing
-   a <type scope="com::sun::star::xml::sax">SAXException</type> in the
+   <p>First, the <method>XExportFilter::exporter</method> method must be 
+   called to provide the export component with the target location to 
+   which the data should be exported. Then, the source document's XML 
+   representation will be generated by calling the appropriate methods 
+   of the <type scope="com::sun::star::xml::sax">XDocumentHandler</type> 
+   interface.  Error conditions must be signalled by throwing 
+   a <type scope="com::sun::star::xml::sax">SAXException</type> in the 
    <type scope="com::sun::star::xml::sax">XDocumentHandler</type> calls.
 
     @since OOo 1.1.2
  */
 published service ExportFilter
 {
-    /** The data will be passed in through the
+    /** The data will be passed in through the 
         <type scope="com::sun::star::xml::sax">XDocumentHandler</type> calls. */
     interface com::sun::star::xml::sax::XDocumentHandler;
 
-    /** The <method>XExportFilter:exporter()</method> call will provide the
-        <type scope="com::sun::star::document">TypeDetection</type> user data
+    /** The <method>XExportFilter:exporter()</method> call will provide the 
+        <type scope="com::sun::star::document">TypeDetection</type> user data 
         required to perform the filtering correctly.
-    */
+    */ 
     interface com::sun::star::xml::XExportFilter;
 };
 
-}; }; }; };
+}; }; }; }; 
 #endif
diff --git a/offapi/com/sun/star/xml/FastAttribute.idl b/offapi/com/sun/star/xml/FastAttribute.idl
index a5ac2e236c75..394acf5de8c0 100644
--- a/offapi/com/sun/star/xml/FastAttribute.idl
+++ b/offapi/com/sun/star/xml/FastAttribute.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,15 +24,15 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_FastAttribute_idl__
-#define __com_sun_star_xml_FastAttribute_idl__
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {
-
-//=============================================================================
-
+#ifndef __com_sun_star_xml_FastAttribute_idl__ 
+#define __com_sun_star_xml_FastAttribute_idl__ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml { 
+ 
+//============================================================================= 
+ 
 /**
  * A struct to keep information of an element's attribute.
  */
@@ -48,9 +48,9 @@ struct FastAttribute
      */
     string Value;
 };
+ 
+//============================================================================= 
+ 
+}; }; }; };  
 
-//=============================================================================
-
-}; }; }; };
-
-#endif
+#endif 
diff --git a/offapi/com/sun/star/xml/ImportFilter.idl b/offapi/com/sun/star/xml/ImportFilter.idl
index d95c7c099bf3..14b239b499b8 100644
--- a/offapi/com/sun/star/xml/ImportFilter.idl
+++ b/offapi/com/sun/star/xml/ImportFilter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 #endif
 
 
-module com { module sun { module star { module xml {
+module com { module sun { module star { module xml { 
 
 /** describes an import filter for XML-based file formats.
 
@@ -44,6 +44,6 @@ published service ImportFilter
     interface com::sun::star::xml::XImportFilter;
 };
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/xml/NamespaceContainer.idl b/offapi/com/sun/star/xml/NamespaceContainer.idl
index 03319c029fa4..f8909be9d913 100644
--- a/offapi/com/sun/star/xml/NamespaceContainer.idl
+++ b/offapi/com/sun/star/xml/NamespaceContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,10 +33,10 @@
 
 //=============================================================================
 
-module com { module sun { module star { module xml {
+module com { module sun { module star { module xml { 
 
 //=============================================================================
-/** This service describes a container for XML namespaces.
+/** This service describes a container for XML namespaces. 
 
     <p>Each namespace is accessed with its prefix and the URL is stored as a string.
 */
@@ -47,6 +47,6 @@ published service NamespaceContainer
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl b/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
index 9d85e30bb255..946b79015f86 100644
--- a/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
+++ b/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,11 +27,11 @@
 #ifndef _com_sun_star_xml_ParaUserDefinedAttributesSupplier_idl_
 #define _com_sun_star_xml_ParaUserDefinedAttributesSupplier_idl_
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl>
 #endif
 
-module com { module sun { module star { module xml {
+module com { module sun { module star { module xml { 
 
 /** A component that supports this service preserves XML attributes,
     unknown by its parser, that belong to the XML element representing
@@ -57,6 +57,6 @@ published service ParaUserDefinedAttributesSupplier
     [property] ::com::sun::star::container::XNameContainer  ParaUserDefinedAttributes;
 };
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl b/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
index cde995ba8872..b13b4748553c 100644
--- a/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
+++ b/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,11 +27,11 @@
 #ifndef _com_sun_star_xml_TextUserDefinedAttributesSupplier_idl_
 #define _com_sun_star_xml_TextUserDefinedAttributesSupplier_idl_
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl>
 #endif
 
-module com { module sun { module star { module xml {
+module com { module sun { module star { module xml { 
 
 /** A component that supports this service preserves XML attributes,
     unknown by its parser, that belong to the XML element representing
@@ -57,6 +57,6 @@ published service TextUserDefinedAttributesSupplier
     [property] ::com::sun::star::container::XNameContainer  TextUserDefinedAttributes;
 };
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl b/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
index 515ed93f7b07..d647b94cd41f 100644
--- a/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
+++ b/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,11 +27,11 @@
 #ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #define _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl>
 #endif
 
-module com { module sun { module star { module xml {
+module com { module sun { module star { module xml { 
 
 /** A component that supports this service preserves XML attributes,
     unknown by its parser, that belong to the XML element representing
@@ -66,6 +66,6 @@ published service UserDefinedAttributeSupplier
     [property] ::com::sun::star::container::XNameContainer  UserDefinedAttributes;
 };
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl b/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
index 9a90a0f06609..9a74daee2d62 100644
--- a/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
+++ b/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,11 +27,11 @@
 #ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 #define _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
 
-#ifndef __com_sun_star_container_XNameContainer_idl__
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
 #include <com/sun/star/container/XNameContainer.idl>
 #endif
 
-module com { module sun { module star { module xml {
+module com { module sun { module star { module xml { 
 
 /** A component that supports this service preserves XML attributes,
     unknown by its parser, that belong to the XML element representing
@@ -57,6 +57,6 @@ published service UserDefinedAttributesSupplier
     [property] ::com::sun::star::container::XNameContainer  UserDefinedAttributes;
 };
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/xml/XExportFilter.idl b/offapi/com/sun/star/xml/XExportFilter.idl
index 47051f579e2d..b00bb92bc3b6 100644
--- a/offapi/com/sun/star/xml/XExportFilter.idl
+++ b/offapi/com/sun/star/xml/XExportFilter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,38 +39,38 @@
 
 //=============================================================================
 
-module com { module sun { module star { module xml {
+module com { module sun { module star { module xml { 
 
 
-//=============================================================================
+//=============================================================================  
 
 /** interface to implement for an XML-based import filter. i
 
     @since OOo 1.1.2
  */
-published interface XExportFilter: com::sun::star::uno::XInterface
-{
-    /** performs the import.
-
-         <p>The source data (location indicated by <var>aSourceData</var>), and
-        the XML representation of the document must be generated by calls to
-        xocHandler (???) methods.
-
-      @param aSourceData
+published interface XExportFilter: com::sun::star::uno::XInterface				
+{	  
+    /** performs the import. 
+     
+         <p>The source data (location indicated by <var>aSourceData</var>), and 
+        the XML representation of the document must be generated by calls to 
+        xocHandler (???) methods. 
+      
+      @param aSourceData 
           <type scope="com::sun::star::document">MediaDescriptor</type>
           which defines the data source
 
       @param msUserData
-          Sequence of strings which contains the userdata defined in the
+          Sequence of strings which contains the userdata defined in the 
           TypeDetection.xml (???)
 
       @returns
           <TRUE/> if import process is successful
      */
-    boolean exporter(
+    boolean exporter( 
              [in] sequence< com::sun::star::beans::PropertyValue > aSourceData,
              [in] sequence< string > msUserData )
-        raises( com::sun::star::lang::IllegalArgumentException );
+        raises( com::sun::star::lang::IllegalArgumentException ); 
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/xml/XImportFilter.idl b/offapi/com/sun/star/xml/XImportFilter.idl
index 650a24d8b05c..d934ae93524a 100644
--- a/offapi/com/sun/star/xml/XImportFilter.idl
+++ b/offapi/com/sun/star/xml/XImportFilter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,42 +39,42 @@
 
 //=============================================================================
 
-module com { module sun { module star { module xml {
+module com { module sun { module star { module xml { 
 
 
-//=============================================================================
+//=============================================================================  
 
-/** interface to implement for an XML-based import filter.
+/** interface to implement for an XML-based import filter. 
 
     @since OOo 1.1.2
  */
-published interface XImportFilter: com::sun::star::uno::XInterface
-{
-     /** performs the import.
-
-         <p>The source data (location indicated by <var>aSourceData</var>),
-            and the XML representation of the document must be generated by calls
-            to xocHandler (???) methods.
-
-      @param aSourceData
+published interface XImportFilter: com::sun::star::uno::XInterface				
+{	  
+     /** performs the import. 
+     
+         <p>The source data (location indicated by <var>aSourceData</var>), 
+            and the XML representation of the document must be generated by calls 
+            to xocHandler (???) methods. 
+      
+      @param aSourceData 
           <type scope="com::sun::star::document">MediaDescriptor</type>
           which defines the data source
 
       @param msUserData
-          Sequence of strings which contains the userdata defined in the
+          Sequence of strings which contains the userdata defined in the 
           TypeDetection.xml
 
-      @param xDocHandler
+      @param xDocHandler 
           target for the XML document representation
 
       @returns
           <TRUE/> if import process is successful
      */
-    boolean importer(
+    boolean importer( 
              [in] sequence< com::sun::star::beans::PropertyValue > aSourceData,
              [in] com::sun::star::xml::sax::XDocumentHandler xDocHandler,
              [in] sequence< string > msUserData )
-        raises( com::sun::star::lang::IllegalArgumentException );
+        raises( com::sun::star::lang::IllegalArgumentException ); 
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/xml/XMLExportFilter.idl b/offapi/com/sun/star/xml/XMLExportFilter.idl
index c66b6cb3bc60..0a284b342303 100644
--- a/offapi/com/sun/star/xml/XMLExportFilter.idl
+++ b/offapi/com/sun/star/xml/XMLExportFilter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,26 +35,26 @@
 
 //=============================================================================
 
-module com { module sun { module star { module xml {
+module com { module sun { module star { module xml { 
 
 //=============================================================================
-/** describes an export filter for XML-based file formats.
+/** describes an export filter for XML-based file formats.  
 
-    <p>It is an extension of <type scope="com::sun::star::document">ExportFilter</type>
-    and differs from it only in that an
+    <p>It is an extension of <type scope="com::sun::star::document">ExportFilter</type> 
+    and differs from it only in that an 
     <type scope="com::sun::star::xml::sax">XDocumentHandler</type> needs to
     be passed through the XInitialization interface. This
     XDocumentHandler will then be used to export the XML data stream.  */
 published service XMLExportFilter
 {
     /** An com.sun.star.xml.sax.XDocumentHandler needs to be passed to
-       the <method scope="com::sun::star::lang">XInitialization::initialize</method> call.
+       the <method scope="com::sun::star::lang">XInitialization::initialize</method> call. 
     */
     service com::sun::star::document::ExportFilter;
 };
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/xml/XMLImportFilter.idl b/offapi/com/sun/star/xml/XMLImportFilter.idl
index 6e551859f720..ac68698abee5 100644
--- a/offapi/com/sun/star/xml/XMLImportFilter.idl
+++ b/offapi/com/sun/star/xml/XMLImportFilter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,13 +39,13 @@
 
 //=============================================================================
 
-module com { module sun { module star { module xml {
+module com { module sun { module star { module xml { 
 
 //=============================================================================
-/** describes an import filter for XML-based file formats.
+/** describes an import filter for XML-based file formats.  
 
-    <p>It is an extension of <type scope="com::sun::star::document">ImportFilter</type>
-    and differs from it in that this filter additionally supports the
+    <p>It is an extension of <type scope="com::sun::star::document">ImportFilter</type> 
+    and differs from it in that this filter additionally supports the 
     <type scope="com::sun::star::xml::sax">XDocumentHandler</type> interface.
 */
 published service XMLImportFilter
@@ -59,6 +59,6 @@ published service XMLImportFilter
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/offapi/com/sun/star/xml/crypto/SEInitializer.idl b/offapi/com/sun/star/xml/crypto/SEInitializer.idl
index bf947f5555d0..a978c86d8373 100644
--- a/offapi/com/sun/star/xml/crypto/SEInitializer.idl
+++ b/offapi/com/sun/star/xml/crypto/SEInitializer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
index 395ef0fb9201..28002431bf93 100644
--- a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl b/offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl
index f7f07658d6f5..82e7436507ce 100644
--- a/offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl
+++ b/offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -92,7 +92,7 @@ enum SecurityOperationStatus
  * XMLSEC_ERRORS_R_DSIG_NO_REFERENCES
  * XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE
  * XMLSEC_ERRORS_R_ASSERTION
- * XMLSEC_ERRORS_MAX_NUMBER
+ * XMLSEC_ERRORS_MAX_NUMBER	
  */
     ENGINE_FAILED,
     MALLOC_FAILED,
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
index 7dc93ed7497d..a9e4b80d1d08 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl b/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl
index 21b5b9beb618..20a4b0e65b57 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
 
 #ifndef __com_sun_star_xml_crypto_XMLEncryptionException_idl__
-#define __com_sun_star_xml_crypto_XMLEncryptionException_idl__
-
+#define __com_sun_star_xml_crypto_XMLEncryptionException_idl__ 
+ 
 #ifndef __com_sun_star_security_EncryptionException_idl__
-#include <com/sun/star/security/EncryptionException.idl>
+#include <com/sun/star/security/EncryptionException.idl> 
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module xml { module crypto {
 
-//=============================================================================
-
+//============================================================================= 
+ 
 exception XMLEncryptionException : com::sun::star::security::EncryptionException
 {
 };
 
-//=============================================================================
-
+//============================================================================= 
+ 
 }; }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
index 694e4ed56f9b..c6ef626edbcb 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
index c047e8ae45be..861fa1f70b10 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignature.idl b/offapi/com/sun/star/xml/crypto/XMLSignature.idl
index 1153b7bb9c8f..174e4cabb2d5 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignature.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignature.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl b/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl
index 87d2d0ba05a4..1e738c0bd521 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
 
 #ifndef __com_sun_star_xml_crypto_XMLSignatureException_idl__
-#define __com_sun_star_xml_crypto_XMLSignatureException_idl__
-
+#define __com_sun_star_xml_crypto_XMLSignatureException_idl__ 
+ 
 #ifndef __com_sun_star_security_SignatureException_idl__
-#include <com/sun/star/security/SignatureException.idl>
+#include <com/sun/star/security/SignatureException.idl> 
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module xml { module crypto {
 
-//=============================================================================
-
+//============================================================================= 
+ 
 exception XMLSignatureException : com::sun::star::security::SignatureException
 {
 };
 
-//=============================================================================
-
+//============================================================================= 
+ 
 }; }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
index 3a4971e12ba1..1d2450c92379 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/XSEInitializer.idl b/offapi/com/sun/star/xml/crypto/XSEInitializer.idl
index 5d41d3a03575..d3133efd90f9 100644
--- a/offapi/com/sun/star/xml/crypto/XSEInitializer.idl
+++ b/offapi/com/sun/star/xml/crypto/XSEInitializer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
index 2a22282be54c..d02df7aa5999 100644
--- a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -33,7 +33,7 @@
 #define __com_sun_star_xml_crypto_xsecurityenvironment_idl_
 
 #ifndef __com_sun_star_uno_SecurityException_idl__
-#include <com/sun/star/uno/SecurityException.idl>
+#include <com/sun/star/uno/SecurityException.idl> 
 #endif
 
 #include <com/sun/star/uno/XInterface.idl>
@@ -76,7 +76,7 @@ interface XSecurityEnvironment : com::sun::star::uno::XInterface
 
     /**
       Verify a certificate.
-
+     
       The method provides a way to verify a certificate.
       @param xEECertificate
           The certificate which is to be validated.
@@ -103,17 +103,17 @@ interface XSecurityEnvironment : com::sun::star::uno::XInterface
      * 1. Whether or not the certificate have a private key in the user profile.
      * 2. Whether or not the certificate is a trusted certificate.
      * 3. Whether or not the certificate is a self-signed certificate.
-     *
+     * 
      * The certificate characters is defined as bit-wise long, please refer to
      * CertificateCharacters definition.
      */
     long getCertificateCharacters( [in] com::sun::star::security::XCertificate xCertificate ) raises( com::sun::star::uno::SecurityException ) ;
-
+    
     /**
      * Get the Environment detail infos
      */
     string getSecurityEnvironmentInformation ( );
-
+    
 } ;
 
 } ; } ; } ; } ; } ;
diff --git a/offapi/com/sun/star/xml/crypto/XUriBinding.idl b/offapi/com/sun/star/xml/crypto/XUriBinding.idl
index 8d1609ff80e7..18f2a398acf9 100644
--- a/offapi/com/sun/star/xml/crypto/XUriBinding.idl
+++ b/offapi/com/sun/star/xml/crypto/XUriBinding.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -54,7 +54,7 @@ interface XUriBinding : com::sun::star::uno::XInterface
      */
     void setUriBinding([in] string uri, [in] com::sun::star::io::XInputStream aInputStream)
         raises( com::sun::star::uno::Exception );
-
+        
     /**
      * Gets the XInputStream interface for a uri.
      *
diff --git a/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl b/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
index 5788b0482349..68bb63a40978 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
index c2ec51908fb6..d075961f80e4 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -43,7 +43,7 @@ module com { module sun { module star { module xml { module crypto {
 /**
  * Interface of XML encryption template
  *
- * <p>This interface represents a encryption template, which is the same as the
+ * <p>This interface represents a encryption template, which is the same as the 
  * desired xml encryption element[ EncryptedType ] but some of the nodes may be
  * empty. The empty entities include CipherValue, which is a subset of
  * EncryptedData or EncryptedKey. Empty entities are not allowed in a encryption
@@ -57,7 +57,7 @@ module com { module sun { module star { module xml { module crypto {
  * encryption template.</p>
  *
  * <p>With the help of encryption context, the encrypter or decrypter specifies
- * the key from the KeyInfo in the encryption template.</p>
+ * the key from the KeyInfo in the encryption template.</p>   
  *
  *
  * <p>It isn't a good method to set the EncryptedKey here. In general, there is
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
index 6e08c6dee3b0..e4074d0e6624 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -48,7 +48,7 @@ module com { module sun { module star { module xml { module crypto {
 interface XXMLSecurityContext : com::sun::star::uno::XInterface
 {
     /**
-     * Add personal security environment , and return the index of the added env.
+     * Add personal security environment , and return the index of the added env. 
      */
     long addSecurityEnvironment( [in] XSecurityEnvironment aSecurityEnvironment
     ) raises( com::sun::star::security::SecurityInfrastructureException ) ;
@@ -73,7 +73,7 @@ interface XXMLSecurityContext : com::sun::star::uno::XInterface
      * Get the ID of the internal security environment
      */
     long getDefaultSecurityEnvironmentIndex( ) ;
-
+    
     /**
      * set the ID of the internal security environment
      */
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl
index bff443796200..1c723a282611 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSignature.idl b/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
index fc61c07d17d3..deff43bb68f6 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -74,7 +74,7 @@ interface XXMLSignature : com::sun::star::uno::XInterface
         [in] com::sun::star::xml::crypto::XXMLSecurityContext aContext
     ) raises( com::sun::star::xml::crypto::XMLSignatureException ,
         com::sun::star::uno::SecurityException ) ;
-
+        
     /**
      * get the time used by the engine, JSR105,
      * this method is used for evaluation.
@@ -82,7 +82,7 @@ interface XXMLSignature : com::sun::star::uno::XInterface
      /*
     hyper getEngineTime([in] long id);
     */
-};
+}; 
 
 } ; } ; } ; } ; } ;
-#endif
+#endif 
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
index 08098a8d590d..206246124af1 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -44,7 +44,7 @@ module com { module sun { module star { module xml { module crypto {
 /**
  * Interface of XML signature template
  *
- * <p>This interface represents a signature template, which is the same as the
+ * <p>This interface represents a signature template, which is the same as the 
  * desired xml signature element but some of the nodes may be empty. The empty
  * entities include digest value and signature value. Empty entities are not
  * allowed in a signature template when performing validation.</p>
@@ -53,7 +53,7 @@ module com { module sun { module star { module xml { module crypto {
  * contents to be signed from the template by dereference the URI.</p>
  *
  * <p>With the help of signature context, the signer or verifier specifies the
- * key from the KeyInfo in the signature template.</p>
+ * key from the KeyInfo in the signature template.</p>   
  *
  * Owner: Andrew Fan
  */
@@ -64,7 +64,7 @@ interface XXMLSignatureTemplate : XXMLSecurityTemplate
      */
     sequence< com::sun::star::xml::wrapper::XXMLElementWrapper > getTargets(
     ) ;
-
+    
     /**
      * Set the dynamic URI binding
      */
diff --git a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
index 6b8323b19893..9d3042cd6525 100644
--- a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -52,7 +52,7 @@ module com { module sun { module star { module xml { module crypto { module sax
 service Decryptor {
     interface XReferenceResolvedListener ;
     interface XBlockerMonitor ;
-    interface XDecryptionResultBroadcaster ;
+    interface XDecryptionResultBroadcaster ;	
     interface XKeyCollector ;
     interface XMissionTaker ;
     interface com::sun::star::lang::XInitialization ;
diff --git a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
index 82d32ebfbae1..c8b1df18d08a 100644
--- a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -54,7 +54,7 @@ service Encryptor {
     interface XReferenceResolvedListener ;
     interface XReferenceCollector ;
     interface XBlockerMonitor ;
-    interface XEncryptionResultBroadcaster ;
+    interface XEncryptionResultBroadcaster ;	
     interface XKeyCollector ;
     interface XMissionTaker ;
     interface com::sun::star::lang::XInitialization ;
diff --git a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
index 0a70aac82c80..e8660a5007f3 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
index 6660008a6d04..3e76d28b54c7 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
index b3355e2e98b4..26ea5e8c6513 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl b/offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl
index 07cec12ad824..33fd496a58e1 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl
index be29d4ee49fd..4293e91fd71c 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl b/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl
index e8a420b21f27..e831223b6ce9 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
index 7b3e1a1039bc..c8d6d08ea9b8 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -47,17 +47,17 @@ struct ElementStackItem
      * whether it is a startElement event
      */
     boolean isStartElementEvent;
-
+    
     /**
      * the name of the element
      */
     string elementName;
-
+    
     /**
      * attribute list for a startElement event
      */
     com::sun::star::xml::sax::XAttributeList xAttributes;
-};
+}; 
 
 /**
  * Manipulate the "key SAX events" in a SAX event stream.
@@ -70,12 +70,12 @@ interface XElementStackKeeper : com::sun::star::uno::XInterface
      * Starts to buffer key SAX events.
      */
     void start();
-
+    
     /**
      * Stops buffering key SAX events.
      */
     void stop();
-
+    
     /**
      * Transfers the bufferred key SAX events to a document handler.
      * <p>
diff --git a/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl
index 7d77439ed710..4cc581120fa3 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl b/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl
index 0eca5a84d413..3e1a4c80e860 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl b/offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl
index a7bc3c5c807f..2a561a33c40b 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -46,7 +46,7 @@ interface XKeyCollector : com::sun::star::uno::XInterface
 {
     /**
      * Set the keeper id of the key element.
-     *
+     * 
      * @param id   the keeper id of the key element. If the id is 0, then it represents
      *             that this security entity has included its key material internally.
      */
diff --git a/offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl b/offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl
index 6f902a867b65..bb4d0803ea44 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl b/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl
index 10e79fbcb58d..483d055e90bb 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -51,7 +51,7 @@ interface XReferenceCollector : com::sun::star::uno::XInterface
      */
     void setReferenceCount([in] long count)
         raises( com::sun::star::uno::Exception );
-
+    
     /**
      * Set the keeper id of the element colllector of the
      * referenced element.
diff --git a/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl
index dba649deea7c..550df9cdf07c 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -59,7 +59,7 @@ interface XReferenceResolvedBroadcaster : com::sun::star::uno::XInterface
     void addReferenceResolvedListener(
         [in] long referenceId,
         [in] XReferenceResolvedListener listener);
-
+        
     /**
      * Removes a listener from a element collector.
      * <p>
@@ -71,7 +71,7 @@ interface XReferenceResolvedBroadcaster : com::sun::star::uno::XInterface
      * @param listener      the listener to be removed
      */
     void removeReferenceResolvedListener(
-        [in] long referenceId,
+        [in] long referenceId, 
         [in] XReferenceResolvedListener listener);
 };
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl b/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl
index 485f6090725b..1d53b81eb6d9 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
index 20f8a0289f5c..228455614fa6 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -59,14 +59,14 @@ interface XSAXEventKeeper : com::sun::star::uno::XInterface
      * @return   the keeper id of the new element collector
      */
     long addElementCollector();
-
+    
     /**
      * Removes an element collector.
      *
      * @param id   the keeper id of the element collector to be removed
      */
     void removeElementCollector([in] long id);
-
+    
     /**
      * Adds a new blocker on the next element in the SAX event stream.
      * <p>
@@ -96,9 +96,9 @@ interface XSAXEventKeeper : com::sun::star::uno::XInterface
      *
      * @param id   the keeper id of the element mark, it can be a element
      *             collector or a blocker
-     */
+     */ 
     com::sun::star::xml::wrapper::XXMLElementWrapper getElement([in] long id);
-
+    
     /**
      * Sets the element of an element mark.
      * <p>
@@ -107,11 +107,11 @@ interface XSAXEventKeeper : com::sun::star::uno::XInterface
      *
      * @param id         the keeper id of the element mark to be set
      * @param aElement   the new element for this element mark.
-     */
+     */ 
     void setElement(
-        [in] long id,
+        [in] long id, 
         [in] com::sun::star::xml::wrapper::XXMLElementWrapper aElement);
-
+    
     /**
      * Sets the next document handler in the SAX chain.
      * <p>
@@ -122,14 +122,14 @@ interface XSAXEventKeeper : com::sun::star::uno::XInterface
      */
     com::sun::star::xml::sax::XDocumentHandler setNextHandler(
         [in] com::sun::star::xml::sax::XDocumentHandler nextHandler);
-
+        
     /**
      * Prints information about all bufferred elements.
      *
      * @return   a tree-style string including all buffer informtion
      */
     string printBufferNodeTree();
-
+    
     /**
      * Gets the element which current blocking happens.
      * <p>
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl
index 87991d07c7f9..4c4ab83c1ea7 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -49,7 +49,7 @@ interface XSAXEventKeeperStatusChangeBroadcaster : com::sun::star::uno::XInterfa
     /**
      * Adds a new status change listener.
      * <p>
-     * When the SAXEventKeeper's status changes, the listener will receive a
+     * When the SAXEventKeeper's status changes, the listener will receive a 
      * notification.
      *
      * @param listener         the listener to be added
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.idl b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.idl
index 9d04a0ba1757..4b274afe6335 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl b/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl
index 872f27d2a78f..75535b21db55 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
index 16b52279a556..bd09fcd3443d 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -53,7 +53,7 @@ constants ConstOfSecurityId
  * priority value, it is used when compare between different
  * priority values.
  * <p>
- * The PRI_AFTERMODIFY priority represents the notification will be
+ * The PRI_AFTERMODIFY priority represents the notification will be 
  * sent after any internal modification has finished.
  * <p>
  * The PRI_BEFOREMODIFY proirity represents the notification will be
@@ -96,7 +96,7 @@ interface XSecuritySAXEventKeeper : XSAXEventKeeper
      * @param priority                       the priority of the element collector. See
      *                                       ConstOfPriority
      * @param modifyElement                  a flag representing whether the element
-     *                                       collector will modify the content of its
+     *                                       collector will modify the content of its 
      *                                       element after notification
      * @return                               the keeper id of the new element collector
      */
@@ -116,7 +116,7 @@ interface XSecuritySAXEventKeeper : XSAXEventKeeper
     long cloneElementCollector(
         [in] long referenceId,
         [in] ElementMarkPriority priority);
-
+    
     /**
      * Sets security id for an element mark.
      *
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl
index ff65155a6491..4c30f160e313 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -57,7 +57,7 @@ interface XSignatureCreationResultBroadcaster : com::sun::star::uno::XInterface
     void addSignatureCreationResultListener(
         [in] XSignatureCreationResultListener listener)
         raises( com::sun::star::uno::Exception );
-
+        
     /**
      * Removes a signature creation result listener.
      * <p>
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.idl b/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.idl
index 7d488ef640bf..3094e53ff280 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl
index de557f356f44..41b0c7903952 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -57,7 +57,7 @@ interface XSignatureVerifyResultBroadcaster : com::sun::star::uno::XInterface
     void addSignatureVerifyResultListener(
         [in] XSignatureVerifyResultListener listener)
         raises( com::sun::star::uno::Exception );
-
+        
     /**
      * Removes a signature verify result listener.
      * <p>
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.idl b/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.idl
index a9de2fb7ef90..77424201d791 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl b/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
index bcab642f7155..c1604fe3aa45 100644
--- a/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
-#ifndef __com_sun_star_xml_csax_XCompressedDocumentHandler_idl__
-#define __com_sun_star_xml_csax_XCompressedDocumentHandler_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/xml/sax/SAXException.idl>
-
+#ifndef __com_sun_star_xml_csax_XCompressedDocumentHandler_idl__ 
+#define __com_sun_star_xml_csax_XCompressedDocumentHandler_idl__ 
 
+#include <com/sun/star/uno/XInterface.idl> 
+#include <com/sun/star/xml/sax/SAXException.idl> 
+ 
+ 
 module com { module sun { module star { module xml { module csax {
 
 /**
@@ -45,12 +45,12 @@ struct XMLAttribute
      * the attribute name
      */
     string sName;
-
+    
     /**
      * the attribute value
      */
     string sValue;
-};
+}; 
 
 /**
  * A compressed XDocumentHandler interface.
@@ -64,33 +64,33 @@ struct XMLAttribute
  * when UNO C++/Java bridge is involved.
  */
 interface XCompressedDocumentHandler: com::sun::star::uno::XInterface
-{
-    void _startDocument()
+{ 
+    void _startDocument() 
+        raises( com::sun::star::xml::sax::SAXException ); 
+        
+    void _endDocument() 
+        raises( com::sun::star::xml::sax::SAXException ); 
+        
+    void _startElement( [in] string aName, [in] sequence< XMLAttribute > aAttributes) 
         raises( com::sun::star::xml::sax::SAXException );
-
-    void _endDocument()
-        raises( com::sun::star::xml::sax::SAXException );
-
-    void _startElement( [in] string aName, [in] sequence< XMLAttribute > aAttributes)
-        raises( com::sun::star::xml::sax::SAXException );
-
-    void _endElement( [in] string aName )
-        raises( com::sun::star::xml::sax::SAXException );
-
-    void _characters( [in] string aChars )
-        raises( com::sun::star::xml::sax::SAXException );
-
-    void _ignorableWhitespace( [in] string aWhitespaces )
-        raises( com::sun::star::xml::sax::SAXException );
-
-    void _processingInstruction( [in] string aTarget, [in] string aData )
-        raises( com::sun::star::xml::sax::SAXException );
-
+        
+    void _endElement( [in] string aName ) 
+        raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    void _characters( [in] string aChars ) 
+        raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    void _ignorableWhitespace( [in] string aWhitespaces ) 
+        raises( com::sun::star::xml::sax::SAXException ); 
+        
+    void _processingInstruction( [in] string aTarget, [in] string aData ) 
+        raises( com::sun::star::xml::sax::SAXException ); 
+ 
     void _setDocumentLocator( [in] long columnNumber, [in] long lineNumber, [in] string publicId, [in] string systemId)
-        raises( com::sun::star::xml::sax::SAXException );
-
-};
+        raises( com::sun::star::xml::sax::SAXException ); 
+ 
+}; 
 
 } ; } ; } ; } ; } ;
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/xml/dom/DOMException.idl b/offapi/com/sun/star/xml/dom/DOMException.idl
index d344af889bbe..62b8cadbafdc 100644
--- a/offapi/com/sun/star/xml/dom/DOMException.idl
+++ b/offapi/com/sun/star/xml/dom/DOMException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,30 +25,30 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_xml_dom_DOMException_idl__
-#define __com_sun_star_xml_dom_DOMException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
+#ifndef __com_sun_star_xml_dom_DOMException_idl__ 
+#define __com_sun_star_xml_dom_DOMException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
 #ifndef __com_sun_star_xml_dom_DOMExceptionType_idl__
 #include <com/sun/star/xml/dom/DOMExceptionType.idl>
 #endif
-
-module com {  module sun {  module star {  module xml {  module dom {
-
-
-/**
-encapsulates the details of an XML parse error or warning.
+ 
+module com {  module sun {  module star {  module xml {  module dom {  
+ 
+ 
+/** 
+encapsulates the details of an XML parse error or warning. 
 */
 
 exception DOMException: com::sun::star::uno::Exception
-{
-    DOMExceptionType Code;
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+{ 
+    DOMExceptionType Code;	 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/xml/dom/DOMExceptionType.idl b/offapi/com/sun/star/xml/dom/DOMExceptionType.idl
index 2b83bf25fd74..920545837aad 100644
--- a/offapi/com/sun/star/xml/dom/DOMExceptionType.idl
+++ b/offapi/com/sun/star/xml/dom/DOMExceptionType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,21 +32,21 @@ module com { module sun { module star { module xml { module dom {
 
 enum DOMExceptionType
 {
-    DOMSTRING_SIZE_ERR,
-    HIERARCHY_REQUEST_ERR,
-    INDEX_SIZE_ERR,
-    INUSE_ATTRIBUTE_ERR,
-    INVALID_ACCESS_ERR,
-    INVALID_CHARACTER_ERR,
+    DOMSTRING_SIZE_ERR,      
+    HIERARCHY_REQUEST_ERR,  
+    INDEX_SIZE_ERR,        
+    INUSE_ATTRIBUTE_ERR,   
+    INVALID_ACCESS_ERR,  
+    INVALID_CHARACTER_ERR,   
     INVALID_MODIFICATION_ERR,
-    INVALID_STATE_ERR,
-    NAMESPACE_ERR,
-    NO_DATA_ALLOWED_ERR,
-    NO_MODIFICATION_ALLOWED_ERR,
-    NOT_FOUND_ERR,
-    NOT_SUPPORTED_ERR,
-    SYNTAX_ERR,
-    WRONG_DOCUMENT_ERR
+    INVALID_STATE_ERR,       
+    NAMESPACE_ERR,           
+    NO_DATA_ALLOWED_ERR,     
+    NO_MODIFICATION_ALLOWED_ERR,     
+    NOT_FOUND_ERR,           
+    NOT_SUPPORTED_ERR,       
+    SYNTAX_ERR,              
+    WRONG_DOCUMENT_ERR       
 };
 
 }; }; }; }; };
diff --git a/offapi/com/sun/star/xml/dom/NodeType.idl b/offapi/com/sun/star/xml/dom/NodeType.idl
index 1a70489e3c8e..bb381f3745d8 100644
--- a/offapi/com/sun/star/xml/dom/NodeType.idl
+++ b/offapi/com/sun/star/xml/dom/NodeType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xml/dom/SAXDocumentBuilderState.idl b/offapi/com/sun/star/xml/dom/SAXDocumentBuilderState.idl
index 61344a0b78c6..03ccfddcb9e2 100644
--- a/offapi/com/sun/star/xml/dom/SAXDocumentBuilderState.idl
+++ b/offapi/com/sun/star/xml/dom/SAXDocumentBuilderState.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 module com { module sun { module star { module xml { module dom {
 
-enum SAXDocumentBuilderState
+enum SAXDocumentBuilderState 
 {
     READY,
     BUILDING_DOCUMENT,
diff --git a/offapi/com/sun/star/xml/dom/XAttr.idl b/offapi/com/sun/star/xml/dom/XAttr.idl
index 7d4a010e3723..e0be5e1e4b10 100644
--- a/offapi/com/sun/star/xml/dom/XAttr.idl
+++ b/offapi/com/sun/star/xml/dom/XAttr.idl
@@ -1,7 +1,7 @@
 /************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,11 +25,11 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_xml_dom_XAttr_idl__
-#define __com_sun_star_xml_sax_XAttr_idl__
+#ifndef __com_sun_star_xml_dom_XAttr_idl__ 
+#define __com_sun_star_xml_sax_XAttr_idl__ 
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
-#include <com/sun/star/xml/dom/XNode.idl>
+#ifndef __com_sun_star_xml_dom_XNode_idl__ 
+#include <com/sun/star/xml/dom/XNode.idl> 
 #endif
 
 module com { module sun { module star { module xml { module dom {
@@ -44,13 +44,13 @@ interface XAttr: XNode
     string getName();
 
     /**
-    The Element node this attribute is attached to or null if this
+    The Element node this attribute is attached to or null if this 
     attribute is not in use.
     */
     XElement getOwnerElement();
 
     /**
-    If this attribute was explicitly given a value in the original
+    If this attribute was explicitly given a value in the original 
     document, this is true; otherwise, it is false.
     */
     boolean getSpecified();
@@ -69,5 +69,5 @@ interface XAttr: XNode
     void setValue([in] string value) raises (DOMException);
 };
 };};};};};
-
+                         
 #endif
diff --git a/offapi/com/sun/star/xml/dom/XCDATASection.idl b/offapi/com/sun/star/xml/dom/XCDATASection.idl
index a484ccabca34..10b2d0807a2c 100644
--- a/offapi/com/sun/star/xml/dom/XCDATASection.idl
+++ b/offapi/com/sun/star/xml/dom/XCDATASection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,11 +25,11 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_xml_dom_XCDATASection_idl__
+#ifndef __com_sun_star_xml_dom_XCDATASection_idl__ 
 #define __com_sun_star_xml_dom_XCDATASection_idl__
 
-#ifndef __com_sun_star_xml_dom_XText_idl__
-#include <com/sun/star/xml/dom/XText.idl>
+#ifndef __com_sun_star_xml_dom_XText_idl__ 
+#include <com/sun/star/xml/dom/XText.idl> 
 #endif
 
 module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XCharacterData.idl b/offapi/com/sun/star/xml/dom/XCharacterData.idl
index 380c705d6359..dd7100c933d1 100644
--- a/offapi/com/sun/star/xml/dom/XCharacterData.idl
+++ b/offapi/com/sun/star/xml/dom/XCharacterData.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,8 +28,8 @@
 #ifndef __com_sun_star_xml_dom_XCharacterData_idl__
 #define __com_sun_star_xml_dom_XCharacterData_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
-#include <com/sun/star/xml/dom/XNode.idl>
+#ifndef __com_sun_star_xml_dom_XNode_idl__ 
+#include <com/sun/star/xml/dom/XNode.idl> 
 #endif
 
 module com { module sun { module star { module xml { module dom {
@@ -42,11 +42,11 @@ interface XCharacterData: XNode
         DOMException - NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
     */
     void appendData([in] string arg) raises (DOMException);
-
+    
     /**
     Remove a range of 16-bit units from the node.
     Throws:
-        DOMException - INDEX_SIZE_ERR: Raised if the specified offset is negative or greater
+        DOMException - INDEX_SIZE_ERR: Raised if the specified offset is negative or greater 
             than the number of 16-bit units in data, or if the specified count is negative.
         NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
     */
@@ -55,8 +55,8 @@ interface XCharacterData: XNode
     /**
     Return the character data of the node that implements this interface.
     Throws:
-        DOMException - NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
-        DOMException - DOMSTRING_SIZE_ERR: Raised when it would return more characters
+        DOMException - NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly. 
+        DOMException - DOMSTRING_SIZE_ERR: Raised when it would return more characters 
             than fit in a DOMString variable on the implementation platform.
 
 
@@ -72,17 +72,17 @@ interface XCharacterData: XNode
     /**
     Insert a string at the specified 16-bit unit offset.
     Throws:
-    DOMException - INDEX_SIZE_ERR: Raised if the specified offset is negative or greater than
+    DOMException - INDEX_SIZE_ERR: Raised if the specified offset is negative or greater than 
                                    the number of 16-bit units in data.
                    NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
     */
     void insertData([in] long offset, [in] string arg) raises (DOMException);
 
     /**
-    Replace the characters starting at the specified 16-bit unit offset
+    Replace the characters starting at the specified 16-bit unit offset 
     with the specified string.
     Throws;
-    DOMException - INDEX_SIZE_ERR: Raised if the specified offset is negative or greater than
+    DOMException - INDEX_SIZE_ERR: Raised if the specified offset is negative or greater than 
                       the number of 16-bit units in data, or if the specified count is negative.
                    NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
     */
@@ -91,8 +91,8 @@ interface XCharacterData: XNode
     /**
     Set the character data of the node that implements this interface.
     Throws:
-        DOMException - NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
-        DOMException - DOMSTRING_SIZE_ERR: Raised when it would return more characters than
+        DOMException - NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly. 
+        DOMException - DOMSTRING_SIZE_ERR: Raised when it would return more characters than 
             fit in a DOMString variable on the implementation platform.
     */
     void setData([in] string data) raises (DOMException);
@@ -100,7 +100,7 @@ interface XCharacterData: XNode
     /**
     Extracts a range of data from the node.
     Throws:
-        DOMException - INDEX_SIZE_ERR: Raised if the specified offset is negative or greater
+        DOMException - INDEX_SIZE_ERR: Raised if the specified offset is negative or greater 
             than the number of 16-bit units in data, or if the specified count is negative.
         DOMSTRING_SIZE_ERR: Raised if the specified range of text does not fit into a DOMString.
     */
diff --git a/offapi/com/sun/star/xml/dom/XComment.idl b/offapi/com/sun/star/xml/dom/XComment.idl
index 36a6a6e6afe7..418dfe51066a 100644
--- a/offapi/com/sun/star/xml/dom/XComment.idl
+++ b/offapi/com/sun/star/xml/dom/XComment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,8 +28,8 @@
 #ifndef __com_sun_star_xml_dom_XComment_idl__
 #define __com_sun_star_xml_dom_XCComment_idl__
 
-#ifndef __com_sun_star_xml_dom_XCharacterData_idl__
-#include <com/sun/star/xml/dom/XCharacterData.idl>
+#ifndef __com_sun_star_xml_dom_XCharacterData_idl__ 
+#include <com/sun/star/xml/dom/XCharacterData.idl> 
 #endif
 
 
diff --git a/offapi/com/sun/star/xml/dom/XDOMImplementation.idl b/offapi/com/sun/star/xml/dom/XDOMImplementation.idl
index f8003fce26e2..0f00082e2139 100644
--- a/offapi/com/sun/star/xml/dom/XDOMImplementation.idl
+++ b/offapi/com/sun/star/xml/dom/XDOMImplementation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,8 +28,8 @@
 #ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__
 #define __com_sun_star_xml_dom_XDOMImplementation_idl__
 
-#ifndef __com_sun_star_uno__XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
+#ifndef __com_sun_star_uno__XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
 #endif
 #ifndef __com_sun_star_xml_dom_DOMException_idl__
 #include <com/sun/star/xml/dom/DOMException.idl>
@@ -47,20 +47,20 @@ interface XDOMImplementation : com::sun::star::uno::XInterface
     Creates a DOM Document object of the specified type with its document element.
     Throws:
     DOMException - INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an illegal character.
-                   NAMESPACE_ERR: Raised if the qualifiedName is malformed, if the qualifiedName has a prefix
-                      and the namespaceURI is null, or if the qualifiedName has a prefix that is "xml" and
-                      the namespaceURI is different from " http://www.w3.org/XML/1998/namespace" , or if the
-                      DOM implementation does not support the "XML" feature but a non-null namespace URI was
+                   NAMESPACE_ERR: Raised if the qualifiedName is malformed, if the qualifiedName has a prefix 
+                      and the namespaceURI is null, or if the qualifiedName has a prefix that is "xml" and 
+                      the namespaceURI is different from " http://www.w3.org/XML/1998/namespace" , or if the 
+                      DOM implementation does not support the "XML" feature but a non-null namespace URI was 
                       provided, since namespaces were defined by XML.
                    WRONG_DOCUMENT_ERR: Raised if doctype has already been used with a different document or
                       was created from a different implementation.
-                   NOT_SUPPORTED_ERR: May be raised by DOM implementations which do not support the
-                      "XML" feature, if they choose not to support this method. Other features introduced
-                      in the future, by the DOM WG or in extensions defined by other groups, may also
-                      demand support for this method; please consult the definition of the feature to see
+                   NOT_SUPPORTED_ERR: May be raised by DOM implementations which do not support the 
+                      "XML" feature, if they choose not to support this method. Other features introduced 
+                      in the future, by the DOM WG or in extensions defined by other groups, may also 
+                      demand support for this method; please consult the definition of the feature to see 
                       if it requires this method.
     */
-    XDocument createDocument([in] string namespaceURI, [in] string qualifiedName, [in] XDocumentType doctype)
+    XDocument createDocument([in] string namespaceURI, [in] string qualifiedName, [in] XDocumentType doctype) 
         raises (DOMException);
 
     /**
@@ -68,10 +68,10 @@ interface XDOMImplementation : com::sun::star::uno::XInterface
     Throws:
     DOMException - INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an illegal character.
                    NAMESPACE_ERR: Raised if the qualifiedName is malformed.
-                   NOT_SUPPORTED_ERR: May be raised by DOM implementations which do not support the
-                      "XML" feature, if they choose not to support this method. Other features introduced
-                      in the future, by the DOM WG or in extensions defined by other groups, may also demand
-                      support for this method; please consult the definition of the feature to see if it
+                   NOT_SUPPORTED_ERR: May be raised by DOM implementations which do not support the 
+                      "XML" feature, if they choose not to support this method. Other features introduced 
+                      in the future, by the DOM WG or in extensions defined by other groups, may also demand 
+                      support for this method; please consult the definition of the feature to see if it 
                       requires this method.
     */
     XDocumentType createDocumentType([in] string qualifiedName, [in] string publicId, [in] string systemId)
diff --git a/offapi/com/sun/star/xml/dom/XDocument.idl b/offapi/com/sun/star/xml/dom/XDocument.idl
index 6bd105d8e06c..3a0ee7374417 100644
--- a/offapi/com/sun/star/xml/dom/XDocument.idl
+++ b/offapi/com/sun/star/xml/dom/XDocument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,32 +28,32 @@
 #ifndef __com_sun_star_xml_dom_XDocument_idl__
 #define __com_sun_star_xml_dom_XDocument_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
-#include <com/sun/star/xml/dom/XNode.idl>
+#ifndef __com_sun_star_xml_dom_XNode_idl__ 
+#include <com/sun/star/xml/dom/XNode.idl> 
 #endif
-#ifndef __com_sun_star_xml_dom_XAttr_idl__
-#include <com/sun/star/xml/dom/XAttr.idl>
+#ifndef __com_sun_star_xml_dom_XAttr_idl__ 
+#include <com/sun/star/xml/dom/XAttr.idl> 
 #endif
-#ifndef __com_sun_star_xml_dom_XCDATASection_idl__
-#include <com/sun/star/xml/dom/XCDATASection.idl>
+#ifndef __com_sun_star_xml_dom_XCDATASection_idl__ 
+#include <com/sun/star/xml/dom/XCDATASection.idl> 
 #endif
-#ifndef __com_sun_star_xml_dom_XComment_idl__
-#include <com/sun/star/xml/dom/XComment.idl>
+#ifndef __com_sun_star_xml_dom_XComment_idl__ 
+#include <com/sun/star/xml/dom/XComment.idl> 
 #endif
-#ifndef __com_sun_star_xml_dom_XDocumentFragemnt_idl__
-#include <com/sun/star/xml/dom/XDocumentFragment.idl>
+#ifndef __com_sun_star_xml_dom_XDocumentFragemnt_idl__ 
+#include <com/sun/star/xml/dom/XDocumentFragment.idl> 
 #endif
-#ifndef __com_sun_star_xml_dom_XEntityReference_idl__
-#include <com/sun/star/xml/dom/XEntityReference.idl>
+#ifndef __com_sun_star_xml_dom_XEntityReference_idl__ 
+#include <com/sun/star/xml/dom/XEntityReference.idl> 
 #endif
-#ifndef __com_sun_star_xml_dom_XProcessingInstruction_idl__
-#include <com/sun/star/xml/dom/XProcessingInstruction.idl>
+#ifndef __com_sun_star_xml_dom_XProcessingInstruction_idl__ 
+#include <com/sun/star/xml/dom/XProcessingInstruction.idl> 
 #endif
-#ifndef __com_sun_star_xml_dom_XDocumentType_idl__
-#include <com/sun/star/xml/dom/XDocumentType.idl>
+#ifndef __com_sun_star_xml_dom_XDocumentType_idl__ 
+#include <com/sun/star/xml/dom/XDocumentType.idl> 
 #endif
-#ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__
-#include <com/sun/star/xml/dom/XDOMImplementation.idl>
+#ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__ 
+#include <com/sun/star/xml/dom/XDOMImplementation.idl> 
 #endif
 
 module com { module sun { module star { module xml { module dom {
@@ -70,14 +70,14 @@ interface XDocument: XNode
     /**
     Creates an attribute of the given qualified name and namespace URI.
     Throws:
-    DOMException - INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an illegal
+    DOMException - INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an illegal 
                       character, per the XML 1.0 specification .
-                   NAMESPACE_ERR: Raised if the qualifiedName is malformed per the Namespaces in XML
-                      specification, if the qualifiedName has a prefix and the namespaceURI is null, if
-                      the qualifiedName has a prefix that is "xml" and the namespaceURI is different from
-                      " http://www.w3.org/XML/1998/namespace", or if the qualifiedName, or its prefix, is
+                   NAMESPACE_ERR: Raised if the qualifiedName is malformed per the Namespaces in XML 
+                      specification, if the qualifiedName has a prefix and the namespaceURI is null, if 
+                      the qualifiedName has a prefix that is "xml" and the namespaceURI is different from 
+                      " http://www.w3.org/XML/1998/namespace", or if the qualifiedName, or its prefix, is 
                       "xmlns" and the namespaceURI is different from " http://www.w3.org/2000/xmlns/".
-                   NOT_SUPPORTED_ERR: Always thrown if the current document does not support the "XML"
+                   NOT_SUPPORTED_ERR: Always thrown if the current document does not support the "XML" 
                       feature, since namespaces were defined by XML.
     */
     XAttr createAttributeNS([in] string namespaceURI, [in] string qualifiedName) raises (DOMException);
@@ -111,13 +111,13 @@ interface XDocument: XNode
     /**
     Creates an element of the given qualified name and namespace URI.
     Throws:
-    DOMException - INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an
+    DOMException - INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an 
                       illegal character, per the XML 1.0 specification .
-                   NAMESPACE_ERR: Raised if the qualifiedName is malformed per the Namespaces in
-                      XML specification, if the qualifiedName has a prefix and the namespaceURI is
-                      null, or if the qualifiedName has a prefix that is "xml" and the namespaceURI
+                   NAMESPACE_ERR: Raised if the qualifiedName is malformed per the Namespaces in 
+                      XML specification, if the qualifiedName has a prefix and the namespaceURI is 
+                      null, or if the qualifiedName has a prefix that is "xml" and the namespaceURI 
                       is different from " http://www.w3.org/XML/1998/namespace" .
-                   NOT_SUPPORTED_ERR: Always thrown if the current document does not support the
+                   NOT_SUPPORTED_ERR: Always thrown if the current document does not support the 
                       "XML" feature, since namespaces were defined by XML.
     */
     XElement createElementNS([in] string namespaceURI, [in] string qualifiedName) raises (DOMException);
@@ -133,7 +133,7 @@ interface XDocument: XNode
     XEntityReference createEntityReference([in] string name) raises (DOMException);
 
     /**
-    Creates a ProcessingInstruction node given the specified name and
+    Creates a ProcessingInstruction node given the specified name and 
     data strings.
     Throws:
     DOMException - INVALID_CHARACTER_ERR: Raised if the specified target contains an illegal character.
@@ -165,15 +165,15 @@ interface XDocument: XNode
     XElement getElementById([in] string elementId);
 
     /**
-    Returns a NodeList of all the Elements with a given tag name in the
+    Returns a NodeList of all the Elements with a given tag name in the 
     order in which they are encountered in a preorder traversal of the
     Document tree.
     */
     XNodeList getElementsByTagName([in] string tagname);
 
     /**
-    Returns a NodeList of all the Elements with a given local name and
-    namespace URI in the order in which they are encountered in a preorder
+    Returns a NodeList of all the Elements with a given local name and 
+    namespace URI in the order in which they are encountered in a preorder 
     traversal of the Document tree.
     */
     XNodeList getElementsByTagNameNS([in] string namespaceURI, [in] string localName);
diff --git a/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl
index e2245e9d3153..68de037b6b41 100644
--- a/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,35 +28,35 @@
 #ifndef __com_sun_star_xml_dom_XDocumentBuilder_idl__
 #define __com_sun_star_xml_dom_XDocumentBuilder_idl__
 
-#ifndef __com_sun_star_uno__XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
+#ifndef __com_sun_star_uno__XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
 #endif
 
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
-#include <com/sun/star/xml/dom/XDocumentType.idl>
+#ifndef __com_sun_star_xml_dom_XDocument_idl__ 
+#include <com/sun/star/xml/dom/XDocumentType.idl> 
 #endif
-#ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__
-#include <com/sun/star/xml/dom/XDOMImplementation.idl>
+#ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__ 
+#include <com/sun/star/xml/dom/XDOMImplementation.idl> 
 #endif
-#ifndef __com_sun_star_io_XInputStream_idl__
-#include <com/sun/star/io/XInputStream.idl>
+#ifndef __com_sun_star_io_XInputStream_idl__ 
+#include <com/sun/star/io/XInputStream.idl> 
 #endif
 
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
-#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
+#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
+#include <com/sun/star/xml/sax/SAXException.idl> 
+#endif 
 
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
-#include <com/sun/star/xml/sax/XErrorHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
-#include <com/sun/star/xml/sax/XEntityResolver.idl>
-#endif
+#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__ 
+#include <com/sun/star/xml/sax/XErrorHandler.idl> 
+#endif 
+#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__ 
+#include <com/sun/star/xml/sax/XEntityResolver.idl> 
+#endif 
 
 
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
 
 module com { module sun { module star { module xml { module dom {
 
@@ -74,38 +74,38 @@ interface XDocumentBuilder : com::sun::star::uno::XInterface
     XDOMImplementation getDOMImplementation();
 
     /**
-    Indicates whether or not this parser is configured to understand
-    namespaces.
+    Indicates whether or not this parser is configured to understand 
+    namespaces.     
     */
     boolean isNamespaceAware();
 
-    /**
-    Indicates whether or not this parser is configured to validate XML
+    /**       
+    Indicates whether or not this parser is configured to validate XML 
     documents.
     */
     boolean isValidating();
 
     /**
-    Obtain a new instance of a DOM Document object to build a DOM tree
-    with.
+    Obtain a new instance of a DOM Document object to build a DOM tree 
+    with.          
     */
     XDocument newDocument();
 
     /**
-    Parse the content of the given InputStream as an XML document and
-    return a new DOM Document object.
+    Parse the content of the given InputStream as an XML document and 
+    return a new DOM Document object.     
     */
     XDocument parse([in] com::sun::star::io::XInputStream is)
-            raises( com::sun::star::xml::sax::SAXException,
-                    com::sun::star::io::IOException );
+            raises( com::sun::star::xml::sax::SAXException, 
+                    com::sun::star::io::IOException ); 
 
     /**
-    Parse the content of the given URI as an XML document and return
+    Parse the content of the given URI as an XML document and return 
     a new DOM Document object.
     */
     XDocument parseURI([in] string uri)
-            raises( com::sun::star::xml::sax::SAXException,
-                    com::sun::star::io::IOException );
+            raises( com::sun::star::xml::sax::SAXException, 
+                    com::sun::star::io::IOException ); 
 
     /**
     Specify the EntityResolver to be used to resolve entities present
diff --git a/offapi/com/sun/star/xml/dom/XDocumentFragment.idl b/offapi/com/sun/star/xml/dom/XDocumentFragment.idl
index cbc8af63b923..3a80bf98eb1b 100644
--- a/offapi/com/sun/star/xml/dom/XDocumentFragment.idl
+++ b/offapi/com/sun/star/xml/dom/XDocumentFragment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,8 +28,8 @@
 #ifndef __com_sun_star_xml_dom_XDocumentFragment_idl__
 #define __com_sun_star_xml_dom_XDocumentFragment_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
-#include <com/sun/star/xml/dom/XNode.idl>
+#ifndef __com_sun_star_xml_dom_XNode_idl__ 
+#include <com/sun/star/xml/dom/XNode.idl> 
 #endif
 
 module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDocumentType.idl b/offapi/com/sun/star/xml/dom/XDocumentType.idl
index ce6495214bcf..6cbf97e59195 100644
--- a/offapi/com/sun/star/xml/dom/XDocumentType.idl
+++ b/offapi/com/sun/star/xml/dom/XDocumentType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,11 +28,11 @@
 #ifndef __com_sun_star_xml_dom_XDocumentType_idl__
 #define __com_sun_star_xml_dom_XDocumentType_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
-#include <com/sun/star/xml/dom/XNode.idl>
+#ifndef __com_sun_star_xml_dom_XNode_idl__ 
+#include <com/sun/star/xml/dom/XNode.idl> 
 #endif
-#ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__
-#include <com/sun/star/xml/dom/XNamedNodeMap.idl>
+#ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__ 
+#include <com/sun/star/xml/dom/XNamedNodeMap.idl> 
 #endif
 
 module com { module sun { module star { module xml { module dom {
@@ -41,7 +41,7 @@ interface XDocumentType: XNode
 {
 
     /**
-    A NamedNodeMap containing the general entities, both external and
+    A NamedNodeMap containing the general entities, both external and 
     internal, declared in the DTD.
     */
     XNamedNodeMap getEntities();
@@ -52,7 +52,7 @@ interface XDocumentType: XNode
     string getInternalSubset();
 
     /**
-    The name of DTD; i.e., the name immediately following the DOCTYPE
+    The name of DTD; i.e., the name immediately following the DOCTYPE 
     keyword.
     */
     string getName();
diff --git a/offapi/com/sun/star/xml/dom/XElement.idl b/offapi/com/sun/star/xml/dom/XElement.idl
index dc0373467a53..c1d5b0e5d9a1 100644
--- a/offapi/com/sun/star/xml/dom/XElement.idl
+++ b/offapi/com/sun/star/xml/dom/XElement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,11 +28,11 @@
 #ifndef __com_sun_star_xml_dom_XElement_idl__
 #define __com_sun_star_xml_dom_XElement_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
-#include <com/sun/star/xml/dom/XNode.idl>
+#ifndef __com_sun_star_xml_dom_XNode_idl__ 
+#include <com/sun/star/xml/dom/XNode.idl> 
 #endif
-#ifndef __com_sun_star_xml_dom_XAttr_idl__
-#include <com/sun/star/xml/dom/XAttr.idl>
+#ifndef __com_sun_star_xml_dom_XAttr_idl__ 
+#include <com/sun/star/xml/dom/XAttr.idl> 
 #endif
 
 module com { module sun { module star { module xml { module dom {
@@ -52,7 +52,7 @@ interface XElement: XNode
     /**
     Retrieves an Attr node by local name and namespace URI.
     */
-    XAttr getAttributeNodeNS([in] string namespaceURI,[in]
+    XAttr getAttributeNodeNS([in] string namespaceURI,[in] 
     string localName);
 
     /**
@@ -61,14 +61,14 @@ interface XElement: XNode
     string getAttributeNS([in] string namespaceURI, [in] string localName);
 
     /**
-    Returns a NodeList of all descendant Elements with a given tag name,
-    in the order in which they are
+    Returns a NodeList of all descendant Elements with a given tag name, 
+    in the order in which they are 
     encountered in a preorder traversal of this Element tree.
     */
     XNodeList getElementsByTagName([in] string name);
 
     /**
-    Returns a NodeList of all the descendant Elements with a given local
+    Returns a NodeList of all the descendant Elements with a given local 
     name and namespace URI in the order in which they are encountered in
     a preorder traversal of this Element tree.
     */
diff --git a/offapi/com/sun/star/xml/dom/XEntity.idl b/offapi/com/sun/star/xml/dom/XEntity.idl
index 7396a42aa190..366971592653 100644
--- a/offapi/com/sun/star/xml/dom/XEntity.idl
+++ b/offapi/com/sun/star/xml/dom/XEntity.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,8 +28,8 @@
 #ifndef __com_sun_star_xml_dom_XEntety_idl__
 #define __com_sun_star_xml_dom_XEntety_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
-#include <com/sun/star/xml/dom/XNode.idl>
+#ifndef __com_sun_star_xml_dom_XNode_idl__ 
+#include <com/sun/star/xml/dom/XNode.idl> 
 #endif
 
 module com { module sun { module star { module xml { module dom {
@@ -50,7 +50,7 @@ interface XEntity: XNode
     The system identifier associated with the entity, if specified.
     */
     string getSystemId();
-
+ 
 };
 }; }; }; }; };
 
diff --git a/offapi/com/sun/star/xml/dom/XEntityReference.idl b/offapi/com/sun/star/xml/dom/XEntityReference.idl
index cec97fdf0219..f4b1871fa5c8 100644
--- a/offapi/com/sun/star/xml/dom/XEntityReference.idl
+++ b/offapi/com/sun/star/xml/dom/XEntityReference.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,8 +28,8 @@
 #ifndef __com_sun_star_xml_dom_XEntetyReference_idl__
 #define __com_sun_star_xml_dom_XEntetyReference_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
-#include <com/sun/star/xml/dom/XNode.idl>
+#ifndef __com_sun_star_xml_dom_XNode_idl__ 
+#include <com/sun/star/xml/dom/XNode.idl> 
 #endif
 
 module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl b/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl
index d5ea97e1ef69..60933b635997 100644
--- a/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl
+++ b/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,8 +28,8 @@
 #ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__
 #define __com_sun_star_xml_dom_XNamedNodeMap_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
 #endif
 #ifndef __com_sun_star_xml_dom_DOMException_idl__
 #include <com/sun/star/xml/dom/DOMException.idl>
@@ -48,7 +48,7 @@ interface XNamedNodeMap : com::sun::star::uno::XInterface
     long getLength();
 
     /**
-    Retrieves a node specified by local name
+    Retrieves a node specified by local name     	
     */
     XNode getNamedItem([in] string name);
 
diff --git a/offapi/com/sun/star/xml/dom/XNode.idl b/offapi/com/sun/star/xml/dom/XNode.idl
index a86220300412..bc6727dbcf8f 100644
--- a/offapi/com/sun/star/xml/dom/XNode.idl
+++ b/offapi/com/sun/star/xml/dom/XNode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,17 +28,17 @@
 #ifndef __com_sun_star_xml_dom_XNode_idl__
 #define __com_sun_star_xml_dom_XNode_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
 #endif
-#ifndef __com_sun_star_xml_dom_NodeType_idl__
-#include <com/sun/star/xml/dom/NodeType.idl>
+#ifndef __com_sun_star_xml_dom_NodeType_idl__ 
+#include <com/sun/star/xml/dom/NodeType.idl> 
 #endif
-#ifndef __com_sun_star_xml_dom_XNodeList_idl__
-#include <com/sun/star/xml/dom/XNodeList.idl>
+#ifndef __com_sun_star_xml_dom_XNodeList_idl__ 
+#include <com/sun/star/xml/dom/XNodeList.idl> 
 #endif
-#ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__
-#include <com/sun/star/xml/dom/XNamedNodeMap.idl>
+#ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__ 
+#include <com/sun/star/xml/dom/XNamedNodeMap.idl> 
 #endif
 
 
@@ -48,34 +48,34 @@ interface XDocument;
 
 /** The primary dom datatype
 
-<p>The Node interface is the primary datatype for the entire Document Object Model.
-It represents a single node in the document tree. While all objects implementing
-the Node interface expose methods for dealing with children, not all objects
-#implementing the Node interface may have children. For example, Text nodes may not
+<p>The Node interface is the primary datatype for the entire Document Object Model. 
+It represents a single node in the document tree. While all objects implementing 
+the Node interface expose methods for dealing with children, not all objects 
+#implementing the Node interface may have children. For example, Text nodes may not 
 have children, and adding children to such nodes results in a DOMException being raised.</p>
 
-<p>The attributes nodeName, nodeValue and attributes are included as a mechanism to get at
-node information without casting down to the specific derived interface. In cases where
-there is no obvious mapping of these attributes for a specific nodeType (e.g., nodeValue
-for an Element or attributes for a Comment ), this returns null. Note that the specialized
-interfaces may contain additional and more convenient mechanisms to get and set the relevant
+<p>The attributes nodeName, nodeValue and attributes are included as a mechanism to get at 
+node information without casting down to the specific derived interface. In cases where 
+there is no obvious mapping of these attributes for a specific nodeType (e.g., nodeValue 
+for an Element or attributes for a Comment ), this returns null. Note that the specialized 
+interfaces may contain additional and more convenient mechanisms to get and set the relevant 
 information.</p>
 
 <p>The values of nodeName, nodeValue, and attributes vary according to the node type as follows:
 <table align=left border=1>
 <tr><th>Interface </th><th>nodeName </th><th>nodeValue </th><th>attributes</th></tr>
-<tr><th>Attr                    </th><td>name of attribute  </td><td>value of attribute                 </td><td>null</td></tr>
-<tr><th>CDATASection            </th><td>"#cdata-section"   </td><td>content of the CDATA Section   </td><td>null</td></tr>
-<tr><th>Comment                 </th><td>"#comment"             </td><td>content of the comment          </td><td>null</td></tr>
-<tr><th>Document                </th><td>"#document"        </td><td>null   </td><td>null</td></tr>
-<tr><th>DocumentFragment        </th><td>"#document-fragment"</td><td>null  </td><td>null</td></tr>
-<tr><th>DocumentType            </th><td>document type name     </td><td>null   </td><td>null</td></tr>
-<tr><th>Element                 </th><td>tag name           </td><td>null   </td><td>NamedNodeMap</td></tr>
-<tr><th>Entity                  </th><td>entity name        </td><td>null   </td><td>null</td></tr>
-<tr><th>EntityReference         </th><td>name of entity referenced      </td><td>null   </td><td>null</td></tr>
-<tr><th>Notation                </th><td>notation name      </td><td>null   </td><td>null</td></tr>
-<tr><th>ProcessingInstruction   </th><td>target                 </td><td>entire content excluding the target    </td><td>null</td></tr>
-<tr><th>Text                    </th><td>"#text"            </td><td>content of the text node   </td><td>null</td></tr>
+<tr><th>Attr 	                </th><td>name of attribute 	</td><td>value of attribute 	            </td><td>null</td></tr>
+<tr><th>CDATASection 	        </th><td>"#cdata-section" 	</td><td>content of the CDATA Section 	</td><td>null</td></tr>
+<tr><th>Comment 	            </th><td>"#comment" 	        </td><td>content of the comment          </td><td>null</td></tr>
+<tr><th>Document 	            </th><td>"#document" 	    </td><td>null 	</td><td>null</td></tr>
+<tr><th>DocumentFragment        </th><td>"#document-fragment"</td><td>null 	</td><td>null</td></tr>
+<tr><th>DocumentType 	        </th><td>document type name 	</td><td>null 	</td><td>null</td></tr>
+<tr><th>Element 	            </th><td>tag name 	        </td><td>null 	</td><td>NamedNodeMap</td></tr>
+<tr><th>Entity 	                </th><td>entity name 	    </td><td>null 	</td><td>null</td></tr>
+<tr><th>EntityReference         </th><td>name of entity referenced 	    </td><td>null 	</td><td>null</td></tr>
+<tr><th>Notation 	            </th><td>notation name 	    </td><td>null 	</td><td>null</td></tr>
+<tr><th>ProcessingInstruction   </th><td>target 	            </td><td>entire content excluding the target 	</td><td>null</td></tr>
+<tr><th>Text 	                </th><td>"#text" 	        </td><td>content of the text node 	</td><td>null</td></tr>
 </table></p>
 
 @see <a href="http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113">Document Object Model (DOM) Level 2 Core Specification</a> </p>
@@ -83,24 +83,24 @@ information.</p>
 */
 interface XNode : com::sun::star::uno::XInterface
 {
-
+    
     /**
     Adds the node newChild to the end of the list of children of this node.
     @param newChild
     the new child node
     @throws com::sun::star::xml::dom::DOMException
-        <p>HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does
-           not allow children of the type of the newChild node, or if the
+        <p>HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does 
+           not allow children of the type of the newChild node, or if the 
            node to append is one of this node's ancestors or this node itself.</p>
-        <p>WRONG_DOCUMENT_ERR: Raised if newChild was created from a different
+        <p>WRONG_DOCUMENT_ERR: Raised if newChild was created from a different 
            document than the one that created this node.</p>
-        <p>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly or if
+        <p>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly or if 
            the previous parent of the node being inserted is readonly.</p>
     */
     XNode appendChild([in] XNode newChild) raises (DOMException);
 
     /**
-    Returns a duplicate of this node, i.e., serves as a generic copy
+    Returns a duplicate of this node, i.e., serves as a generic copy 
     constructor for nodes.
     <p></p>
     @param deep
@@ -112,7 +112,7 @@ interface XNode : com::sun::star::uno::XInterface
     XNode cloneNode([in] boolean deep);
 
     /**
-    A NamedNodeMap containing the attributes of this node (if it is an Element)
+    A NamedNodeMap containing the attributes of this node (if it is an Element) 
     or null otherwise.
     */
     XNamedNodeMap getAttributes();
@@ -133,7 +133,7 @@ interface XNode : com::sun::star::uno::XInterface
     XNode getLastChild();
 
     /**
-    Returns the local part of the qualified name of this node.
+    Returns the local part of the qualified name of this node.    
     */
     string getLocalName();
 
@@ -160,8 +160,8 @@ interface XNode : com::sun::star::uno::XInterface
     /**
     The value of this node, depending on its type; see the table above.
 
-    @throws com::sun::star::xml::dom::DOMException
-    <p>DOMSTRING_SIZE_ERR: Raised when it would return more characters
+    @throws com::sun::star::xml::dom::DOMException 
+    <p>DOMSTRING_SIZE_ERR: Raised when it would return more characters 
     than fit in a DOMString variable on the implementation platform.</p>
     */
     string getNodeValue() raises (DOMException);
@@ -198,13 +198,13 @@ interface XNode : com::sun::star::uno::XInterface
 
     /**
     Inserts the node newChild before the existing child node refChild.
-    @throws DOMException
-    <p>HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does
-                      not allow children of the type of the newChild node, or if the
+    @throws DOMException 
+    <p>HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does 
+                      not allow children of the type of the newChild node, or if the 
                       node to insert is one of this node's ancestors or this node itself.
-                   <p>WRONG_DOCUMENT_ERR: Raised if newChild was created from a different
+                   <p>WRONG_DOCUMENT_ERR: Raised if newChild was created from a different 
                       document than the one that created this node.
-                   <p>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly or if the
+                   <p>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly or if the 
                       parent of the node being inserted is readonly.
                    <p>NOT_FOUND_ERR: Raised if refChild is not a child of this node.
     */
@@ -217,9 +217,9 @@ interface XNode : com::sun::star::uno::XInterface
     boolean isSupported([in] string feature, [in] string ver);
 
     /**
-    Puts all Text nodes in the full depth of the sub-tree underneath this
+    Puts all Text nodes in the full depth of the sub-tree underneath this 
     Node, including attribute nodes, into a "normal" form where only structure
-    (e.g., elements, comments, processing instructions, CDATA sections, and
+    (e.g., elements, comments, processing instructions, CDATA sections, and 
     entity references) separates Text nodes, i.e., there are neither adjacent
     Text nodes nor empty Text nodes.
     */
@@ -237,14 +237,14 @@ interface XNode : com::sun::star::uno::XInterface
     /**
     Replaces the child node oldChild with newChild in the list of children,
     and returns the oldChild node.
-    @throws DOMException
-                   <p>HIERARCHY_REQUEST_ERR: Raised if this node is of a type that
-                      does not allow children of the type of the newChild node, or
-                      if the node to put in is one of this node's ancestors or this
+    @throws DOMException 
+                   <p>HIERARCHY_REQUEST_ERR: Raised if this node is of a type that 
+                      does not allow children of the type of the newChild node, or 
+                      if the node to put in is one of this node's ancestors or this 
                       node itself.
-                   <p>WRONG_DOCUMENT_ERR: Raised if newChild was created from a different
+                   <p>WRONG_DOCUMENT_ERR: Raised if newChild was created from a different 
                       document than the one that created this node.
-                   <p>NO_MODIFICATION_ALLOWED_ERR: Raised if this node or the parent of the
+                   <p>NO_MODIFICATION_ALLOWED_ERR: Raised if this node or the parent of the 
                       new node is readonly.
                    <p>NOT_FOUND_ERR: Raised if oldChild is not a child of this node.
     */
@@ -253,24 +253,24 @@ interface XNode : com::sun::star::uno::XInterface
     /**
     The value of this node, depending on its type; see the table above.
     @throws DOMException
-        <p>NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
-        <p>DOMSTRING_SIZE_ERR: Raised when it would return more characters
+        <p>NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly. 
+        <p>DOMSTRING_SIZE_ERR: Raised when it would return more characters 
                       than fit in a DOMString variable on the implementation platform.
     */
     void setNodeValue([in] string nodeValue) raises (DOMException);
 
     /**
     The namespace prefix of this node, or null if it is unspecified.
-    @throws DOMException
-        <p>INVALID_CHARACTER_ERR: Raised if the specified prefix contains an illegal character,
+    @throws DOMException 
+        <p>INVALID_CHARACTER_ERR: Raised if the specified prefix contains an illegal character, 
                       per the XML 1.0 specification .
                    <p>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-                   <p>NAMESPACE_ERR: Raised if the specified prefix is malformed per the Namespaces
-                      in XML specification, if the namespaceURI of this node is null, if the specified
-                      prefix is "xml" and the namespaceURI of this node is different from
-                      "http://www.w3.org/XML/1998/namespace", if this node is an attribute and the
-                      specified prefix is "xmlns" and the namespaceURI of this node is different from
-                      " http://www.w3.org/2000/xmlns/", or if this node is an attribute and the qualifiedName
+                   <p>NAMESPACE_ERR: Raised if the specified prefix is malformed per the Namespaces 
+                      in XML specification, if the namespaceURI of this node is null, if the specified 
+                      prefix is "xml" and the namespaceURI of this node is different from 
+                      "http://www.w3.org/XML/1998/namespace", if this node is an attribute and the 
+                      specified prefix is "xmlns" and the namespaceURI of this node is different from 
+                      " http://www.w3.org/2000/xmlns/", or if this node is an attribute and the qualifiedName 
                       of this node is "xmlns" .
     */
     void setPrefix([in] string prefix) raises (DOMException);
diff --git a/offapi/com/sun/star/xml/dom/XNodeList.idl b/offapi/com/sun/star/xml/dom/XNodeList.idl
index a59d2aa7a70a..a48fde8442ea 100644
--- a/offapi/com/sun/star/xml/dom/XNodeList.idl
+++ b/offapi/com/sun/star/xml/dom/XNodeList.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,8 +28,8 @@
 #ifndef __com_sun_star_xml_dom_XNodeList_idl__
 #define __com_sun_star_xml_dom_XNodeList_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
 #endif
 
 
diff --git a/offapi/com/sun/star/xml/dom/XNotation.idl b/offapi/com/sun/star/xml/dom/XNotation.idl
index 6198cdd491e9..d3b38e6a95c9 100644
--- a/offapi/com/sun/star/xml/dom/XNotation.idl
+++ b/offapi/com/sun/star/xml/dom/XNotation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,8 +28,8 @@
 #ifndef __com_sun_star_xml_dom_XNotation_idl__
 #define __com_sun_star_xml_dom_XNotation_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
-#include <com/sun/star/xml/dom/XNode.idl>
+#ifndef __com_sun_star_xml_dom_XNode_idl__ 
+#include <com/sun/star/xml/dom/XNode.idl> 
 #endif
 
 module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl b/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl
index 48277fc4a5c8..39f320b7b471 100644
--- a/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl
+++ b/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,8 +28,8 @@
 #ifndef __com_sun_star_xml_dom_XProcessingInstruction_idl__
 #define __com_sun_star_xml_dom_XProcessingInstruction_idl__
 
-#ifndef __com_sun_star_xml_dom_XNode_idl__
-#include <com/sun/star/xml/dom/XNode.idl>
+#ifndef __com_sun_star_xml_dom_XNode_idl__ 
+#include <com/sun/star/xml/dom/XNode.idl> 
 #endif
 
 module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl
index 05fafa20fc9f..ee3ad62db8ce 100644
--- a/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,18 +28,18 @@
 #ifndef __com_sun_star_xml_dom_XSAXDocumentBuilder_idl__
 #define __com_sun_star_xml_dom_XSAXDocumentBuilder_idl__
 
-#ifndef __com_sun_star_uno__XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
+#ifndef __com_sun_star_uno__XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
 #endif
 
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
-#include <com/sun/star/xml/dom/XDocument.idl>
+#ifndef __com_sun_star_xml_dom_XDocument_idl__ 
+#include <com/sun/star/xml/dom/XDocument.idl> 
 #endif
-#ifndef __com_sun_star_xml_dom_XDocumentFragment_idl__
-#include <com/sun/star/xml/dom/XDocumentFragment.idl>
+#ifndef __com_sun_star_xml_dom_XDocumentFragment_idl__ 
+#include <com/sun/star/xml/dom/XDocumentFragment.idl> 
 #endif
-#ifndef __com_sun_star_xml_dom_SAXDocumentBuilderState_idl__
-#include <com/sun/star/xml/dom/SAXDocumentBuilderState.idl>
+#ifndef __com_sun_star_xml_dom_SAXDocumentBuilderState_idl__ 
+#include <com/sun/star/xml/dom/SAXDocumentBuilderState.idl> 
 #endif
 
 module com { module sun { module star { module xml { module dom {
@@ -56,7 +56,7 @@ interface XSAXDocumentBuilder : com::sun::star::uno::XInterface
     XDocumentFragment getDocumentFragment();
     void startDocumentFragment( [in] XDocument ownerDoc);
     void endDocumentFragment();
-
+    
 
 };
 
diff --git a/offapi/com/sun/star/xml/dom/XText.idl b/offapi/com/sun/star/xml/dom/XText.idl
index 8d12d1466cdd..296a22325db6 100644
--- a/offapi/com/sun/star/xml/dom/XText.idl
+++ b/offapi/com/sun/star/xml/dom/XText.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,15 +28,15 @@
 #ifndef __com_sun_star_xml_dom_XText_idl__
 #define __com_sun_star_xml_dom_XText_idl__
 
-#ifndef __com_sun_star_xml_dom_XCharacterData_idl__
-#include <com/sun/star/xml/dom/XCharacterData.idl>
+#ifndef __com_sun_star_xml_dom_XCharacterData_idl__ 
+#include <com/sun/star/xml/dom/XCharacterData.idl> 
 #endif
 
 module com { module sun { module star { module xml { module dom {
 
 interface XText: XCharacterData
 {
-    /** Breaks this node into two nodes at the specified offset, keeping
+    /** Breaks this node into two nodes at the specified offset, keeping 
         both in the tree as siblings.
         Throws:
         DOMException - INDEX_SIZE_ERR: Raised if the specified offset is negative or greater than the number of 16-bit units in data.
diff --git a/offapi/com/sun/star/xml/dom/events/AttrChangeType.idl b/offapi/com/sun/star/xml/dom/events/AttrChangeType.idl
index 136ae69a9101..49cbe4b03876 100644
--- a/offapi/com/sun/star/xml/dom/events/AttrChangeType.idl
+++ b/offapi/com/sun/star/xml/dom/events/AttrChangeType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xml/dom/events/EventException.idl b/offapi/com/sun/star/xml/dom/events/EventException.idl
index e05e7c7623d2..4cdbae544cbb 100644
--- a/offapi/com/sun/star/xml/dom/events/EventException.idl
+++ b/offapi/com/sun/star/xml/dom/events/EventException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 #include <com/sun/star/uno/Exception.idl>
 #endif
 
-module com { module sun { module star { module xml { module dom { module events {
+module com { module sun { module star { module xml { module dom { module events {  
 
 // Introduced in DOM Level 2:
 exception EventException: com::sun::star::uno::Exception {
diff --git a/offapi/com/sun/star/xml/dom/events/EventType.idl b/offapi/com/sun/star/xml/dom/events/EventType.idl
index d0b10c05765e..73c672f24c1e 100644
--- a/offapi/com/sun/star/xml/dom/events/EventType.idl
+++ b/offapi/com/sun/star/xml/dom/events/EventType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -58,8 +58,8 @@ enum EventType
 
     click,
     /*
-    The click event occurs when the pointing device button is clicked over an element.
-    A click is defined as a mousedown and mouseup over the same screen location.
+    The click event occurs when the pointing device button is clicked over an element. 
+    A click is defined as a mousedown and mouseup over the same screen location. 
     The sequence of these events is:
 
     mousedown
diff --git a/offapi/com/sun/star/xml/dom/events/PhaseType.idl b/offapi/com/sun/star/xml/dom/events/PhaseType.idl
index c2c0a76fdd43..cb959c7df444 100644
--- a/offapi/com/sun/star/xml/dom/events/PhaseType.idl
+++ b/offapi/com/sun/star/xml/dom/events/PhaseType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xml/dom/events/XDocumentEvent.idl b/offapi/com/sun/star/xml/dom/events/XDocumentEvent.idl
index 4b506e646e6a..df078cade10e 100644
--- a/offapi/com/sun/star/xml/dom/events/XDocumentEvent.idl
+++ b/offapi/com/sun/star/xml/dom/events/XDocumentEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 #include <com/sun/star/xml/dom/events/EventType.idl>
 #include <com/sun/star/xml/dom/events/XEvent.idl>
 
-module com { module sun { module star { module xml { module dom { module events {
+module com { module sun { module star { module xml { module dom { module events {  
 
 // Introduced in DOM Level 2:
 interface XDocumentEvent : com::sun::star::uno::XInterface {
diff --git a/offapi/com/sun/star/xml/dom/events/XEvent.idl b/offapi/com/sun/star/xml/dom/events/XEvent.idl
index 215404b7a836..672f8055cd11 100644
--- a/offapi/com/sun/star/xml/dom/events/XEvent.idl
+++ b/offapi/com/sun/star/xml/dom/events/XEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ interface XEvent : com::sun::star::uno::XInterface
 {
 
     string getType();
-
+    
     XEventTarget getTarget();
 
     XEventTarget getCurrentTarget();
@@ -57,9 +57,9 @@ interface XEvent : com::sun::star::uno::XInterface
 
     void preventDefault();
 
-    void initEvent([in] string eventTypeArg,
-                   [in] boolean canBubbleArg,
-                   [in] boolean cancelableArg);
+    void initEvent([in] string eventTypeArg, 
+                   [in] boolean canBubbleArg, 
+                   [in] boolean cancelableArg);    
 };
 }; }; }; }; }; };
 
diff --git a/offapi/com/sun/star/xml/dom/events/XEventListener.idl b/offapi/com/sun/star/xml/dom/events/XEventListener.idl
index ffd9db3bf0fa..58a9d5910462 100644
--- a/offapi/com/sun/star/xml/dom/events/XEventListener.idl
+++ b/offapi/com/sun/star/xml/dom/events/XEventListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,13 +24,13 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef __com_sun_star_xml_dom_events_XEventListener_idl__
 #define __com_sun_star_xml_dom_events_XEventListener_idl__
 
 #include <com/sun/star/uno/XInterface.idl>
 
-module com { module sun { module star { module xml { module dom { module events {
+module com { module sun { module star { module xml { module dom { module events {  
 
 interface XEvent;
 
diff --git a/offapi/com/sun/star/xml/dom/events/XEventTarget.idl b/offapi/com/sun/star/xml/dom/events/XEventTarget.idl
index 203531c9165e..c31514b03538 100644
--- a/offapi/com/sun/star/xml/dom/events/XEventTarget.idl
+++ b/offapi/com/sun/star/xml/dom/events/XEventTarget.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef __com_sun_star_xml_dom_events_XEventTarget_idl__
 #define __com_sun_star_xml_dom_events_XEventTarget_idl__
 
@@ -40,12 +40,12 @@ interface XEvent;
 
 // Introduced in DOM Level 2:
 interface XEventTarget : com::sun::star::uno::XInterface {
-    void addEventListener([in] string eventType,
-                          [in] XEventListener listener,
+    void addEventListener([in] string eventType, 
+                          [in] XEventListener listener, 
                           [in] boolean useCapture);
 
-    void removeEventListener([in] string eventType,
-                             [in] XEventListener listener,
+    void removeEventListener([in] string eventType, 
+                             [in] XEventListener listener, 
                              [in] boolean useCapture);
 
     boolean dispatchEvent([in] XEvent evt) raises(EventException);
diff --git a/offapi/com/sun/star/xml/dom/events/XMouseEvent.idl b/offapi/com/sun/star/xml/dom/events/XMouseEvent.idl
index 659e7bdfbab2..18cb9f920d7f 100644
--- a/offapi/com/sun/star/xml/dom/events/XMouseEvent.idl
+++ b/offapi/com/sun/star/xml/dom/events/XMouseEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 #include <com/sun/star/xml/dom/events/XEventTarget.idl>
 #include <com/sun/star/xml/dom/events/XEventListener.idl>
 
-module com { module sun { module star { module xml { module dom { module events {
+module com { module sun { module star { module xml { module dom { module events {  
 
 // Introduced in DOM Level 2:
 interface XMouseEvent : XUIEvent {
@@ -49,20 +49,20 @@ interface XMouseEvent : XUIEvent {
     short getButton();
     XEventTarget getRelatedTarget();
 
-    void initMouseEvent([in] string typeArg,
-                        [in] boolean canBubbleArg,
-                        [in] boolean cancelableArg,
-                        [in] com::sun::star::xml::dom::views::XAbstractView viewArg,
-                        [in] long detailArg,
-                        [in] long screenXArg,
-                        [in] long screenYArg,
-                        [in] long clientXArg,
-                        [in] long clientYArg,
-                        [in] boolean ctrlKeyArg,
-                        [in] boolean altKeyArg,
-                        [in] boolean shiftKeyArg,
-                        [in] boolean metaKeyArg,
-                        [in] short buttonArg,
+    void initMouseEvent([in] string typeArg, 
+                        [in] boolean canBubbleArg, 
+                        [in] boolean cancelableArg, 
+                        [in] com::sun::star::xml::dom::views::XAbstractView viewArg, 
+                        [in] long detailArg, 
+                        [in] long screenXArg, 
+                        [in] long screenYArg, 
+                        [in] long clientXArg, 
+                        [in] long clientYArg, 
+                        [in] boolean ctrlKeyArg, 
+                        [in] boolean altKeyArg, 
+                        [in] boolean shiftKeyArg, 
+                        [in] boolean metaKeyArg, 
+                        [in] short buttonArg, 
                         [in] XEventTarget relatedTargetArg);
 };
 }; }; }; }; }; };
diff --git a/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl b/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl
index 724ea388fd75..a6a08f1f12af 100644
--- a/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl
+++ b/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
 
 #include <com/sun/star/xml/dom/XNode.idl>
 
-module com { module sun { module star { module xml { module dom { module events {
+module com { module sun { module star { module xml { module dom { module events {  
 
 interface XMutationEvent : XEvent {
 
@@ -46,13 +46,13 @@ interface XMutationEvent : XEvent {
     string getAttrName();
     AttrChangeType getAttrChange();
 
-    void initMutationEvent([in] string typeArg,
-                           [in] boolean canBubbleArg,
-                           [in] boolean cancelableArg,
-                           [in] com::sun::star::xml::dom::XNode relatedNodeArg,
-                           [in] string prevValueArg,
-                           [in] string newValueArg,
-                           [in] string attrNameArg,
+    void initMutationEvent([in] string typeArg, 
+                           [in] boolean canBubbleArg, 
+                           [in] boolean cancelableArg, 
+                           [in] com::sun::star::xml::dom::XNode relatedNodeArg, 
+                           [in] string prevValueArg, 
+                           [in] string newValueArg, 
+                           [in] string attrNameArg, 
                            [in] AttrChangeType attrChangeArg);
 };
 }; }; }; }; }; };
diff --git a/offapi/com/sun/star/xml/dom/events/XUIEvent.idl b/offapi/com/sun/star/xml/dom/events/XUIEvent.idl
index a58d41b2d918..79c7d14d494e 100644
--- a/offapi/com/sun/star/xml/dom/events/XUIEvent.idl
+++ b/offapi/com/sun/star/xml/dom/events/XUIEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,20 +29,20 @@
 
 #include <com/sun/star/xml/dom/events/XEvent.idl>
 
-module com { module sun { module star { module xml { module dom { module views {
+module com { module sun { module star { module xml { module dom { module views {  
     interface XAbstractView;
 }; }; }; }; }; };
 
-module com { module sun { module star { module xml { module dom { module events {
+module com { module sun { module star { module xml { module dom { module events {  
 
 // Introduced in DOM Level 2:
 interface XUIEvent : XEvent {
     com::sun::star::xml::dom::views::XAbstractView getView();
     long getDetail();
-    void initUIEvent([in] string typeArg,
-                     [in] boolean canBubbleArg,
-                     [in] boolean cancelableArg,
-                     [in] com::sun::star::xml::dom::views::XAbstractView viewArg,
+    void initUIEvent([in] string typeArg, 
+                     [in] boolean canBubbleArg, 
+                     [in] boolean cancelableArg, 
+                     [in] com::sun::star::xml::dom::views::XAbstractView viewArg, 
                      [in] long detailArg);
 };
 }; }; }; }; }; };
diff --git a/offapi/com/sun/star/xml/dom/views/XAbstractView.idl b/offapi/com/sun/star/xml/dom/views/XAbstractView.idl
index e0fc60c27a25..885af414f41a 100644
--- a/offapi/com/sun/star/xml/dom/views/XAbstractView.idl
+++ b/offapi/com/sun/star/xml/dom/views/XAbstractView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/xml/dom/events/XEvent.idl>
 
-module com { module sun { module star { module xml { module dom { module views {
+module com { module sun { module star { module xml { module dom { module views {  
 
 interface XDocumentView;
 
diff --git a/offapi/com/sun/star/xml/dom/views/XDocumentView.idl b/offapi/com/sun/star/xml/dom/views/XDocumentView.idl
index 5e6809dac6a7..79d993538643 100644
--- a/offapi/com/sun/star/xml/dom/views/XDocumentView.idl
+++ b/offapi/com/sun/star/xml/dom/views/XDocumentView.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/xml/dom/views/XAbstractView.idl>
 
-module com { module sun { module star { module xml { module dom { module views {
+module com { module sun { module star { module xml { module dom { module views {  
 
 interface XDocumentView : com::sun::star::uno::XInterface {
    XAbstractView getDefaultView();
diff --git a/offapi/com/sun/star/xml/input/SaxDocumentHandler.idl b/offapi/com/sun/star/xml/input/SaxDocumentHandler.idl
index d14e405fe8a4..d0d51811a988 100644
--- a/offapi/com/sun/star/xml/input/SaxDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/input/SaxDocumentHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@ service SaxDocumentHandler
     /** to be passed to a SAX parser
      */
     interface com::sun::star::xml::sax::XDocumentHandler;
-
+    
     /** to be used to pass XRoot object
      */
     interface com::sun::star::lang::XInitialization;
diff --git a/offapi/com/sun/star/xml/input/XAttributes.idl b/offapi/com/sun/star/xml/input/XAttributes.idl
index 2e026da99662..73079583ef7a 100644
--- a/offapi/com/sun/star/xml/input/XAttributes.idl
+++ b/offapi/com/sun/star/xml/input/XAttributes.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 module com { module sun { module star { module xml { module input {
 
 /** An element's attributes
-
+    
     @internal
 */
 interface XAttributes : com::sun::star::uno::XInterface
@@ -44,9 +44,9 @@ interface XAttributes : com::sun::star::uno::XInterface
                 number of attributes
     */
     long getLength();
-
+  
     /** Gets attribute index passing a QName.
-
+        
         @param qName
                QName
         @return
@@ -55,7 +55,7 @@ interface XAttributes : com::sun::star::uno::XInterface
     long getIndexByQName( [in] string qName );
 
     /** Gets attribute index passing a namespace uid and a localname.
-
+        
         @param uid
                namespace uid
         @param localName
@@ -64,7 +64,7 @@ interface XAttributes : com::sun::star::uno::XInterface
                 attribute index or -1, if not found
     */
     long getIndexByUidName( [in] long uid, [in] string localName );
-
+  
     /** Gets the QName of an attribute.
 
         @param nIndex
@@ -72,8 +72,8 @@ interface XAttributes : com::sun::star::uno::XInterface
         @return
                 QName of attribute or empty string, if invalid index
     */
-    string getQNameByIndex( [in] long nIndex );
-
+    string getQNameByIndex( [in] long nIndex ); 
+    
     /** Gets the namespace uid of an attribute.
 
         @param nIndex
@@ -82,7 +82,7 @@ interface XAttributes : com::sun::star::uno::XInterface
                 namespace uid of attribute or -1, if invalid index
     */
     long getUidByIndex( [in] long nIndex );
-
+  
     /** Gets the localname of an attribute.
 
         @param nIndex
@@ -90,8 +90,8 @@ interface XAttributes : com::sun::star::uno::XInterface
         @return
                 localname of attribute or empty string, if invalid index
     */
-    string getLocalNameByIndex( [in] long nIndex );
-
+    string getLocalNameByIndex( [in] long nIndex ); 
+  
     /** Gets the value of an attribute.
 
         @param nIndex
@@ -100,7 +100,7 @@ interface XAttributes : com::sun::star::uno::XInterface
                 value string or empty string, if invalid index
     */
     string getValueByIndex( [in] long nIndex );
-
+  
     /** For convenience: Gets the value of an attribute passing uid, localname.
 
         @param uid
@@ -111,7 +111,7 @@ interface XAttributes : com::sun::star::uno::XInterface
                 value string or empty string, if invalid uid/localname
     */
     string getValueByUidName( [in] long uid, [in] string localName );
-
+  
     /** Gets the type of an attribute, if possible.
 
         @param nIndex
@@ -119,7 +119,7 @@ interface XAttributes : com::sun::star::uno::XInterface
         @return
                 type of attribute (if possible, else empty string)
     */
-    string getTypeByIndex( [in] long nIndex );
+    string getTypeByIndex( [in] long nIndex ); 
 };
 
 }; }; }; }; };
diff --git a/offapi/com/sun/star/xml/input/XElement.idl b/offapi/com/sun/star/xml/input/XElement.idl
index 3c151cf4eed3..ea8cb83c5a85 100644
--- a/offapi/com/sun/star/xml/input/XElement.idl
+++ b/offapi/com/sun/star/xml/input/XElement.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,14 +40,14 @@ module com { module sun { module star { module xml { module input {
 interface XElement : com::sun::star::uno::XInterface
 {
     /** Gets the parent context.
-
+        
         @return
                 parent context
     */
     XElement getParent();
-
+    
     /** Gets the localname of this element.
-
+        
         @return
                 localname of this element
     */
@@ -61,14 +61,14 @@ interface XElement : com::sun::star::uno::XInterface
     long getUid();
 
     /** Gets the attributes of this element.
-
+        
         @return
                 attributes of this element
     */
     XAttributes getAttributes();
-
+    
     /** Called upon each occuring child element.
-
+        
         @param uid
                namespace uid of element
         @param localName
@@ -81,15 +81,15 @@ interface XElement : com::sun::star::uno::XInterface
     XElement startChildElement(
         [in] long uid, [in] string localName, [in] XAttributes xAttributes )
         raises (com::sun::star::xml::sax::SAXException);
-
+    
     /** Called upon retrieval of characters.
-
+        
         @param chars
                characters
     */
     void characters( [in] string chars )
         raises (com::sun::star::xml::sax::SAXException);
-
+    
     /** Receives notification of white space that can be ignored.
 
         @param whitespace
@@ -108,7 +108,7 @@ interface XElement : com::sun::star::uno::XInterface
     void processingInstruction(
         [in] string target, [in] string data )
         raises (com::sun::star::xml::sax::SAXException);
-
+    
     /** Receives notification of element closing.
      */
     void endElement()
diff --git a/offapi/com/sun/star/xml/input/XNamespaceMapping.idl b/offapi/com/sun/star/xml/input/XNamespaceMapping.idl
index 19c5150771ae..e7a614775a00 100644
--- a/offapi/com/sun/star/xml/input/XNamespaceMapping.idl
+++ b/offapi/com/sun/star/xml/input/XNamespaceMapping.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,20 +34,20 @@
 module com { module sun { module star { module xml { module input {
 
 /** Interface to map XML namespace URI strings to ordinals (URI-id, short uid).
-
+    
     @internal
 */
 interface XNamespaceMapping : com::sun::star::uno::XInterface
 {
     /** Creates a unique ordinal passing an XML namespace URI.
-
+        
         @param uri
                XML namespace URI
         @return
                 uid
      */
     long getUidByUri( [in] string uri );
-
+    
     /** Gets the corresponding XML namespace URI passing a uid (created using
         getUidByUri()).
 
diff --git a/offapi/com/sun/star/xml/input/XRoot.idl b/offapi/com/sun/star/xml/input/XRoot.idl
index 41bfefc2a76f..2b305d3cdc31 100644
--- a/offapi/com/sun/star/xml/input/XRoot.idl
+++ b/offapi/com/sun/star/xml/input/XRoot.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,13 +38,13 @@ module com { module sun { module star { module xml { module input {
 
 /** Root interface being passed to SaxDocumentHandler service upon
     instantiation.
-
+    
     @internal
 */
 interface XRoot : com::sun::star::uno::XInterface
 {
     /** Receives notification of the beginning of a document.
-
+         
          @param xMapping
                 mapping to obtain ids out of XML namespace URIs
                 and vice versa
@@ -52,12 +52,12 @@ interface XRoot : com::sun::star::uno::XInterface
     void startDocument(
         [in] XNamespaceMapping xMapping )
         raises (com::sun::star::xml::sax::SAXException);
-
+    
     /** Receives notification of the end of a document.
      */
     void endDocument()
         raises (com::sun::star::xml::sax::SAXException);
-
+    
     /** Receives notification of a processing instruction.
 
         @param target
@@ -68,7 +68,7 @@ interface XRoot : com::sun::star::uno::XInterface
     void processingInstruction(
         [in] string target, [in] string data )
         raises (com::sun::star::xml::sax::SAXException);
-
+    
     /** Receives an object for locating the origin of SAX document events.
 
         @param locator
diff --git a/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl b/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
index fae70b3c84c0..81ccb762bddc 100644
--- a/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
+++ b/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xml/sax/FastToken.idl b/offapi/com/sun/star/xml/sax/FastToken.idl
index baec31bb7fb9..6d0bbbfefe35 100644
--- a/offapi/com/sun/star/xml/sax/FastToken.idl
+++ b/offapi/com/sun/star/xml/sax/FastToken.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_sax_XFastToken_idl__
-#define __com_sun_star_xml_sax_XFastToken_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {  module sax {
-
-//============================================================================
+#ifndef __com_sun_star_xml_sax_XFastToken_idl__ 
+#define __com_sun_star_xml_sax_XFastToken_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml {  module sax {  
+ 
+//============================================================================ 
 
 constants FastToken
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** specifies an unknown token.
      */
     const long DONTKNOW = -1;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** specifies the first namespace token
     */
     const long NAMESPACE = 0x00010000;
 };
 
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/xml/sax/FastTokenHandler.idl b/offapi/com/sun/star/xml/sax/FastTokenHandler.idl
index e0020c33d883..f525d0e0710c 100644
--- a/offapi/com/sun/star/xml/sax/FastTokenHandler.idl
+++ b/offapi/com/sun/star/xml/sax/FastTokenHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xml/sax/InputSource.idl b/offapi/com/sun/star/xml/sax/InputSource.idl
index dafffbd31695..8afc6cf06911 100644
--- a/offapi/com/sun/star/xml/sax/InputSource.idl
+++ b/offapi/com/sun/star/xml/sax/InputSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
-#define __com_sun_star_xml_sax_InputSource_idl__
-
-#ifndef __com_sun_star_io_XInputStream_idl__
-#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {  module sax {
-
-//=============================================================================
-
+#ifndef __com_sun_star_xml_sax_InputSource_idl__ 
+#define __com_sun_star_xml_sax_InputSource_idl__ 
+ 
+#ifndef __com_sun_star_io_XInputStream_idl__ 
+#include <com/sun/star/io/XInputStream.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml {  module sax {  
+ 
+//============================================================================= 
+ 
 /** specifies the Datasource plus some additional information for the parser.
-
+    
     <p>There are two places where the application will deliver this input
-    source to the parser:
+    source to the parser: 
     </p>
     <ul>
         <li>as the argument of <method>XParser::parseStream</method></li>
@@ -53,36 +53,36 @@ published struct InputSource
 {
     /** contains the byte input stream of the document.
      */
-    com::sun::star::io::XInputStream aInputStream;
-
-    //-------------------------------------------------------------------------
-
-    /** contains the encoding of the data stream. This is used by the parser
-        to do unicode conversions.
-
-        <p>Note that in general you do not need to specify an encoding.
-        Either it is UTF-8 or UTF-16 which is recognized by the parser
-        or it is specified in the first line of the XML-File
+    com::sun::star::io::XInputStream aInputStream; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** contains the encoding of the data stream. This is used by the parser 
+        to do unicode conversions. 
+        
+        <p>Note that in general you do not need to specify an encoding. 
+        Either it is UTF-8 or UTF-16 which is recognized by the parser 
+        or it is specified in the first line of the XML-File 
         ( e.g. <em>?xml encoding="EUC-JP"?</em> ).</p>
      */
-    string sEncoding;
-
-    //-------------------------------------------------------------------------
-
-    /** constains the public Id of the document, for example, needed in
+    string sEncoding; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** constains the public Id of the document, for example, needed in 
         exception-message strings.
      */
-    string sPublicId;
-
-    //-------------------------------------------------------------------------
-
+    string sPublicId; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the sytemID of the document.
      */
-    string sSystemId;
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    string sSystemId; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/xml/sax/SAXException.idl b/offapi/com/sun/star/xml/sax/SAXException.idl
index e7257352fa45..0fcda1c1b6f0 100644
--- a/offapi/com/sun/star/xml/sax/SAXException.idl
+++ b/offapi/com/sun/star/xml/sax/SAXException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,25 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
-#define __com_sun_star_xml_sax_SAXException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {  module sax {
-
-//=============================================================================
-
-/** encapsulates the details of an XML parse error or warning.
-
-    <p>This structure is a replacement for the Java class
+#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
+#define __com_sun_star_xml_sax_SAXException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml {  module sax {  
+ 
+//============================================================================= 
+ 
+/** encapsulates the details of an XML parse error or warning. 
+    
+    <p>This structure is a replacement for the Java class 
     <em>org.xml.sax.SAXException</em>. </p>
-
+    
     <p>Some abbreviations: </p>
     <ul>
         <li>SAX = Simple API for XML </li>
@@ -50,17 +50,17 @@ module com {  module sun {  module star {  module xml {  module sax {
         <li>DTD = document type definition </li>
  */
 published exception SAXException: com::sun::star::uno::Exception
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** This field may contain a  wrapped exception.
      */
-    any WrappedException;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    any WrappedException; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl b/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl
index 162d8b3cbb83..107f66f9230c 100644
--- a/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl
+++ b/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xml/sax/SAXParseException.idl b/offapi/com/sun/star/xml/sax/SAXParseException.idl
index 9c7993fb854c..edc536501fc0 100644
--- a/offapi/com/sun/star/xml/sax/SAXParseException.idl
+++ b/offapi/com/sun/star/xml/sax/SAXParseException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,55 +24,55 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_sax_SAXParseException_idl__
-#define __com_sun_star_xml_sax_SAXParseException_idl__
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
-#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {  module sax {
-
-//=============================================================================
-
+#ifndef __com_sun_star_xml_sax_SAXParseException_idl__ 
+#define __com_sun_star_xml_sax_SAXParseException_idl__ 
+ 
+#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
+#include <com/sun/star/xml/sax/SAXException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml {  module sax {  
+ 
+//============================================================================= 
+ 
 /** stores information for locating the error in the original XML document.
 
     @see XLocater
  */
 published exception SAXParseException: com::sun::star::xml::sax::SAXException
-{
-    //-------------------------------------------------------------------------
-
-    /** contains the public identifier of the document where the exception
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** contains the public identifier of the document where the exception 
         has occurred.
      */
-    string PublicId;
-
-    //-------------------------------------------------------------------------
-
+    string PublicId; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the system identifier of the document.
      */
-    string SystemId;
-
-    //-------------------------------------------------------------------------
-
+    string SystemId; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the line number in the document.
      */
-    long LineNumber;
-
-    //-------------------------------------------------------------------------
-
+    long LineNumber; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the column number in the document.
      */
-    long ColumnNumber;
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    long ColumnNumber; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/xml/sax/XAttributeList.idl b/offapi/com/sun/star/xml/sax/XAttributeList.idl
index f7b24418410d..a299ba42547b 100644
--- a/offapi/com/sun/star/xml/sax/XAttributeList.idl
+++ b/offapi/com/sun/star/xml/sax/XAttributeList.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,79 +24,79 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_sax_XAttributeList_idl__
-#define __com_sun_star_xml_sax_XAttributeList_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {  module sax {
-
-//=============================================================================
-
-/** specifies an element's attributes.
-
-    <p>This interface describes a name-type-value triple which describes a
-    single attribute of a tag. Implementors are encouraged to implement the
-    <type scope="com::sun::star::util">XCloneable</type> interface also to
+#ifndef __com_sun_star_xml_sax_XAttributeList_idl__ 
+#define __com_sun_star_xml_sax_XAttributeList_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml {  module sax {  
+ 
+//============================================================================= 
+ 
+/** specifies an element's attributes. 
+    
+    <p>This interface describes a name-type-value triple which describes a 
+    single attribute of a tag. Implementors are encouraged to implement the 
+    <type scope="com::sun::star::util">XCloneable</type> interface also to 
     allow the user to make a copy of the instance.
-
+    
     </p>
     <p>This interface is an IDL version of the Java interface
     <em>org.xml.sax.AttributeList</em>.</p>
  */
 published interface XAttributeList: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
                     the number of attributes in this list.
      */
-    short getLength();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    short getLength(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
                     the name of an attribute in this list (by position).
      */
-    string getNameByIndex( [in] short i );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-                    the type of an attribute in the list (by position).
+    string getNameByIndex( [in] short i ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
+                    the type of an attribute in the list (by position). 
                     Non-validating parsers may return CDATA only.
      */
-    string getTypeByIndex( [in] short i );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-                    the type of an attribute in the list (by name).
+    string getTypeByIndex( [in] short i ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
+                    the type of an attribute in the list (by name). 
                     Non-validating parsers may return CDATA only.
      */
-    string getTypeByName( [in] string aName );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    string getTypeByName( [in] string aName ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
                     the value of an attribute in the list (by position).
      */
-    string getValueByIndex( [in] short i );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
+    string getValueByIndex( [in] short i ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
                     the value of an attribute in the list (by name).
      */
-    string getValueByName( [in] string aName );
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    string getValueByName( [in] string aName ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/xml/sax/XDTDHandler.idl b/offapi/com/sun/star/xml/sax/XDTDHandler.idl
index 184850386f11..4c0977011eba 100644
--- a/offapi/com/sun/star/xml/sax/XDTDHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XDTDHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,56 +24,56 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__
-#define __com_sun_star_xml_sax_XDTDHandler_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {  module sax {
-
-//=============================================================================
-
+#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__ 
+#define __com_sun_star_xml_sax_XDTDHandler_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml {  module sax {  
+ 
+//============================================================================= 
+ 
 /** receives events according to the DTD of the document.
-
-    <p>The SAX parser may report these events in any order, regardless of the
-    order in which the notations and unparsed entities were declared; however,
-    all DTD events must be reported after the document handler's
-    <code>startDocument</code> event, and before the first <code>startElement</code>
-    event.  It is up to the application to store the information for future
+    
+    <p>The SAX parser may report these events in any order, regardless of the 
+    order in which the notations and unparsed entities were declared; however, 
+    all DTD events must be reported after the document handler's 
+    <code>startDocument</code> event, and before the first <code>startElement</code> 
+    event.  It is up to the application to store the information for future 
     use (perhaps in a hash table or object tree). If the application encounters
-    attributes of type "NOTATION", "ENTITY", or "ENTITIES", it can use the
-    information that it obtained through this interface to find the entity
+    attributes of type "NOTATION", "ENTITY", or "ENTITIES", it can use the 
+    information that it obtained through this interface to find the entity 
     and/or notation that corresponds with the attribute value.
     </p>
  */
 published interface XDTDHandler: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification of a notation declaration event.
      */
-    void notationDecl( [in] string sName,
-             [in] string sPublicId,
-             [in] string sSystemId );
-
-    //-------------------------------------------------------------------------
-
+    void notationDecl( [in] string sName, 
+             [in] string sPublicId, 
+             [in] string sSystemId ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification of an unparsed entity declaration event.
      */
-    void unparsedEntityDecl( [in] string sName,
-             [in] string sPublicId,
-             [in] string sSystemId,
-             [in] string sNotationName );
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    void unparsedEntityDecl( [in] string sName, 
+             [in] string sPublicId, 
+             [in] string sSystemId, 
+             [in] string sNotationName ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/xml/sax/XDocumentHandler.idl b/offapi/com/sun/star/xml/sax/XDocumentHandler.idl
index 6586ba99a66b..1f3301241232 100644
--- a/offapi/com/sun/star/xml/sax/XDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XDocumentHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,102 +24,102 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
-#define __com_sun_star_xml_sax_XDocumentHandler_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
-#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XAttributeList_idl__
-#include <com/sun/star/xml/sax/XAttributeList.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XLocator_idl__
-#include <com/sun/star/xml/sax/XLocator.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {  module sax {
-
-//=============================================================================
-
-/** receives notification of general document events.
-
-    <p>This interface is an IDL version of the Java interface
+#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__ 
+#define __com_sun_star_xml_sax_XDocumentHandler_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
+#include <com/sun/star/xml/sax/SAXException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_XAttributeList_idl__ 
+#include <com/sun/star/xml/sax/XAttributeList.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_XLocator_idl__ 
+#include <com/sun/star/xml/sax/XLocator.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml {  module sax {  
+ 
+//============================================================================= 
+ 
+/** receives notification of general document events. 
+    
+    <p>This interface is an IDL version of the Java interface 
     <em>org.xml.sax.DocumentHandler</em> with some smaller
     adaptations.</p>
  */
 published interface XDocumentHandler: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification of the beginning of a document.
      */
-    void startDocument()
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
-
+    void startDocument() 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification of the end of a document.
      */
-    void endDocument()
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
-
+    void endDocument() 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification of the beginning of an element .
      */
-    void startElement( [in] string aName,
-             [in] com::sun::star::xml::sax::XAttributeList xAttribs )
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
-
+    void startElement( [in] string aName, 
+             [in] com::sun::star::xml::sax::XAttributeList xAttribs ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification of the end of an element.
      */
-    void endElement( [in] string aName )
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
-
+    void endElement( [in] string aName ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification of character data.
      */
-    void characters( [in] string aChars )
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
-
+    void characters( [in] string aChars ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification of white space that can be ignored.
      */
-    void ignorableWhitespace( [in] string aWhitespaces )
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
-
+    void ignorableWhitespace( [in] string aWhitespaces ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification of a processing instruction.
      */
-    void processingInstruction( [in] string aTarget,
-             [in] string aData )
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
-
+    void processingInstruction( [in] string aTarget, 
+             [in] string aData ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** receives an object for locating the origin of SAX document events.
      */
-    void setDocumentLocator( [in] com::sun::star::xml::sax::XLocator xLocator )
-            raises( com::sun::star::xml::sax::SAXException );
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    void setDocumentLocator( [in] com::sun::star::xml::sax::XLocator xLocator ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/xml/sax/XEntityResolver.idl b/offapi/com/sun/star/xml/sax/XEntityResolver.idl
index 0638f72ba94c..e9e1d2fc00b4 100644
--- a/offapi/com/sun/star/xml/sax/XEntityResolver.idl
+++ b/offapi/com/sun/star/xml/sax/XEntityResolver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
-#define __com_sun_star_xml_sax_XEntityResolver_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
-#include <com/sun/star/xml/sax/InputSource.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {  module sax {
-
-//=============================================================================
-
+#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__ 
+#define __com_sun_star_xml_sax_XEntityResolver_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_InputSource_idl__ 
+#include <com/sun/star/xml/sax/InputSource.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml {  module sax {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to modify the behaviour of resolving external
     preferences.
-
-    <p>Usually, the parser has a default behaviour of resolving external
-    references (See documentation of the parser implementation).
+    
+    <p>Usually, the parser has a default behaviour of resolving external 
+    references (See documentation of the parser implementation). 
     Use this interface to modify or reimplement this behaviour.</p>
  */
 published interface XEntityResolver: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
-                    <type>InputSource</type> for the external entity.
-
-        <p>If <var>aInputStream</var> is a valid reference to an input stream,
-        the parser uses this <type>InputSource</type>. Otherwise the
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 	 
+                    <type>InputSource</type> for the external entity.  
+                     
+        <p>If <var>aInputStream</var> is a valid reference to an input stream,  
+        the parser uses this <type>InputSource</type>. Otherwise the  
         parser seeks for the entity using its default behaviour.
      */
-    InputSource resolveEntity( [in] string sPublicId, [in] string sSystemId );
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    InputSource resolveEntity( [in] string sPublicId, [in] string sSystemId ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/xml/sax/XErrorHandler.idl b/offapi/com/sun/star/xml/sax/XErrorHandler.idl
index 2d799fc6afdc..6f9879a5966a 100644
--- a/offapi/com/sun/star/xml/sax/XErrorHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XErrorHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,61 +24,61 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
-#define __com_sun_star_xml_sax_XErrorHandler_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
-#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {  module sax {
-
-//=============================================================================
-
-/** is the basic interface for SAX error handlers.
-
-    <p>If a SAX application needs to implement customized error handling,
+#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__ 
+#define __com_sun_star_xml_sax_XErrorHandler_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
+#include <com/sun/star/xml/sax/SAXException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml {  module sax {  
+ 
+//============================================================================= 
+ 
+/** is the basic interface for SAX error handlers. 
+    
+    <p>If a SAX application needs to implement customized error handling, 
     it must implement this interface and then register an instance with the
     SAX parser using the parser's <method>XParser::setErrorhandler</method>
     method. The parser will then report all errors and warnings through this
     interface.  </p>
 
     <p>This interface is a slight adaption of the Java interface
-    <code>org.xml.sax.ErrorHandler</code>. In IDL, no exception can be passed
-    as an argument, so an <code>any</code> serves as the container. The type of the
+    <code>org.xml.sax.ErrorHandler</code>. In IDL, no exception can be passed 
+    as an argument, so an <code>any</code> serves as the container. The type of the 
     exception is <type>SAXParseException</type> or an instance of a derived class.</p>
  */
 published interface XErrorHandler: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** receives notification of a recoverable error.
      */
-    void error( [in] any aSAXParseException )
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
+    void error( [in] any aSAXParseException ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** receives notification of a non-recoverable error.
      */
-    void fatalError( [in] any aSAXParseException )
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
+    void fatalError( [in] any aSAXParseException ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** receives notification of a warning.
      */
-    void warning( [in] any aSAXParseException )
-            raises( com::sun::star::xml::sax::SAXException );
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
+    void warning( [in] any aSAXParseException ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl b/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl
index 5801a22a2517..86c78b298435 100644
--- a/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,72 +24,72 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_sax_XExtendedDocumentHandler_idl__
-#define __com_sun_star_xml_sax_XExtendedDocumentHandler_idl__
-
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
-#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
-#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {  module sax {
-
-//=============================================================================
-
-/** this interface does not conform to the SAX-standard.
-
-    <p>Note: Whether or not every callback is supported is dependent
+#ifndef __com_sun_star_xml_sax_XExtendedDocumentHandler_idl__ 
+#define __com_sun_star_xml_sax_XExtendedDocumentHandler_idl__ 
+ 
+#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__ 
+#include <com/sun/star/xml/sax/XDocumentHandler.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
+#include <com/sun/star/xml/sax/SAXException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml {  module sax {  
+ 
+//============================================================================= 
+ 
+/** this interface does not conform to the SAX-standard. 
+
+    <p>Note: Whether or not every callback is supported is dependent 
     on the parser implementation.
  */
 published interface XExtendedDocumentHandler: com::sun::star::xml::sax::XDocumentHandler
-{
-    //-------------------------------------------------------------------------
-    /** receives notification about the start of a CDATA section in the
+{ 
+    //------------------------------------------------------------------------- 
+    /** receives notification about the start of a CDATA section in the 
         XML-source.
-
-        <p>Any string comming in via character handler may include chars,
+        
+        <p>Any string comming in via character handler may include chars, 
         that would otherwise be interpreted as markup. </p>
      */
-    void startCDATA()
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
-    /** informs about the end of a CDATA-Section.
-
-        <p>Note that <code>startCDATA/endCDATA</code> MUST NOT enclose any
+    void startCDATA() 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** informs about the end of a CDATA-Section. 
+        
+        <p>Note that <code>startCDATA/endCDATA</code> MUST NOT enclose any 
         <code>startElement/endElement</code>-call!</p>
      */
-    void endCDATA();
-
-    //-------------------------------------------------------------------------
+    void endCDATA(); 
+ 
+    //------------------------------------------------------------------------- 
     /** receives notification about a comment in the XML-source.
      */
-    void comment( [in] string sComment )
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
+    void comment( [in] string sComment ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** informs a writer that it is allowable to insert a line break and
         indentation before the next <type>XDocumentHandler</type>-call.
      */
-    void allowLineBreak()
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
+    void allowLineBreak() 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** notifies that any characters that cannot be handled by other callback
         methods are announced through this method.
      */
-    void unknown( [in] string sString )
-            raises( com::sun::star::xml::sax::SAXException );
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    void unknown( [in] string sString ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/xml/sax/XFastAttributeList.idl b/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
index a48e0e5b9337..8a3d1180a39a 100644
--- a/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
+++ b/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,12 +24,12 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__
-#define __com_sun_star_xml_sax_XFastAttributeList_idl__
+#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__ 
+#define __com_sun_star_xml_sax_XFastAttributeList_idl__ 
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
 #ifndef __com_sun_star_xml_Attribute_idl__
 #include <com/sun/star/xml/Attribute.idl>
@@ -43,13 +43,13 @@
 #include <com/sun/star/xml/sax/SAXException.idl>
 #endif
 
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {  module sax {
-
-//=============================================================================
-
-/** a container for the attributes of an xml element.
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml {  module sax {  
+ 
+//============================================================================= 
+ 
+/** a container for the attributes of an xml element. 
 
     <br>Attributes are seperated into known attributes and unknown attributes.
     <p>Known attributes have a local name that is known to the <type>XFastTokenHandler</token>
@@ -166,15 +166,15 @@ interface XFastAttributeList: com::sun::star::uno::XInterface
         can not be translated to tokens.
     */
     sequence< ::com::sun::star::xml::Attribute > getUnknownAttributes();
-
+    
     /** returns a sequence of attributes which names and or namespaces URLS
         are translated to tokens.
     */
     sequence< ::com::sun::star::xml::FastAttribute > getFastAttributes();
 };
 
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/xml/sax/XFastContextHandler.idl b/offapi/com/sun/star/xml/sax/XFastContextHandler.idl
index 22feebe6f5a0..159deac17aef 100644
--- a/offapi/com/sun/star/xml/sax/XFastContextHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastContextHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_sax_XFastContextHandler_idl__
-#define __com_sun_star_xml_sax_XFastContextHandler_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
-#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__
-#include <com/sun/star/xml/sax/XFastAttributeList.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XLocator_idl__
-#include <com/sun/star/xml/sax/XLocator.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {  module sax {
-
-//=============================================================================
-
+#ifndef __com_sun_star_xml_sax_XFastContextHandler_idl__ 
+#define __com_sun_star_xml_sax_XFastContextHandler_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
+#include <com/sun/star/xml/sax/SAXException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__ 
+#include <com/sun/star/xml/sax/XFastAttributeList.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_XLocator_idl__ 
+#include <com/sun/star/xml/sax/XLocator.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml {  module sax {  
+ 
+//============================================================================= 
+ 
 /** receives notification of sax document events from a
     <type>XFastParser</type>.
-
+    
     @see XFastDocumentHandler
  */
 interface XFastContextHandler: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification of the beginning of an element .
 
         @param Element
@@ -76,10 +76,10 @@ interface XFastContextHandler: com::sun::star::uno::XInterface
             from the element.
 
     */
-    void startFastElement( [in] long Element, [in] XFastAttributeList Attribs )
-            raises( com::sun::star::xml::sax::SAXException );
+    void startFastElement( [in] long Element, [in] XFastAttributeList Attribs ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** receives notification of the beginning of an unknown element .
 
@@ -91,27 +91,27 @@ interface XFastContextHandler: com::sun::star::uno::XInterface
             Contains a <type>XFastAttrbitueList</type> to access the attributes
             from the element.
      */
-    void startUnknownElement( [in] string Namespace, [in] string Name, [in] XFastAttributeList Attribs )
-            raises( com::sun::star::xml::sax::SAXException );
+    void startUnknownElement( [in] string Namespace, [in] string Name, [in] XFastAttributeList Attribs ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** receives notification of the end of an known element.
         @see startFastElement
      */
-    void endFastElement( [in] long Element )
-            raises( com::sun::star::xml::sax::SAXException );
+    void endFastElement( [in] long Element ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** receives notification of the end of an kown element.
         @see startUnknownElement
      */
-    void endUnknownElement( [in] string Namespace, [in] string Name )
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
-
+    void endUnknownElement( [in] string Namespace, [in] string Name ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification of the beginning of a known child element.
 
         @param Element
@@ -128,11 +128,11 @@ interface XFastContextHandler: com::sun::star::uno::XInterface
             Contains a <type>XFastAttrbitueList</type> to access the attributes
             from the element.
      */
-    XFastContextHandler createFastChildContext( [in] long Element, [in] XFastAttributeList Attribs )
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
+    XFastContextHandler createFastChildContext( [in] long Element, [in] XFastAttributeList Attribs ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification of the beginning of a unknown child element .
 
         @param Namespace
@@ -143,19 +143,19 @@ interface XFastContextHandler: com::sun::star::uno::XInterface
             Contains a <type>XFastAttrbitueList</type> to access the attributes
             the element.
      */
-    XFastContextHandler createUnknownChildContext( [in] string Namespace, [in] string Name, [in] XFastAttributeList Attribs )
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
+    XFastContextHandler createUnknownChildContext( [in] string Namespace, [in] string Name, [in] XFastAttributeList Attribs ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification of character data.
      */
-    void characters( [in] string aChars )
-            raises( com::sun::star::xml::sax::SAXException );
-  };
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    void characters( [in] string aChars ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
+  }; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl b/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl
index a4b5c94b8142..6e95c9edc8b2 100644
--- a/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,66 +24,66 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__
-#define __com_sun_star_xml_sax_XFastDocumentHandler_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
-#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__
-#include <com/sun/star/xml/sax/XFastAttributeList.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastContextHandler_idl__
-#include <com/sun/star/xml/sax/XFastContextHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XLocator_idl__
-#include <com/sun/star/xml/sax/XLocator.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {  module sax {
-
-//=============================================================================
-
+#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__ 
+#define __com_sun_star_xml_sax_XFastDocumentHandler_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
+#include <com/sun/star/xml/sax/SAXException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__ 
+#include <com/sun/star/xml/sax/XFastAttributeList.idl> 
+#endif 
+
+#ifndef __com_sun_star_xml_sax_XFastContextHandler_idl__ 
+#include <com/sun/star/xml/sax/XFastContextHandler.idl> 
+#endif 
+
+#ifndef __com_sun_star_xml_sax_XLocator_idl__ 
+#include <com/sun/star/xml/sax/XLocator.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml {  module sax {  
+ 
+//============================================================================= 
+ 
 /** receives notification of sax document events from a
     <type>XFastParser</type>
  */
 interface XFastDocumentHandler: XFastContextHandler
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** called by the parser when parsing of an xml stream is started.
      */
-    void startDocument()
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
-
+    void startDocument() 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** called by the parser after the last xml element of a stream is processed.
      */
-    void endDocument()
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
+    void endDocument() 
+            raises( com::sun::star::xml::sax::SAXException ); 
 
+    //------------------------------------------------------------------------- 
+     
     /** receives an object for locating the origin of SAX document events.
      */
-    void setDocumentLocator( [in] com::sun::star::xml::sax::XLocator xLocator )
-            raises( com::sun::star::xml::sax::SAXException );
-
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    void setDocumentLocator( [in] com::sun::star::xml::sax::XLocator xLocator ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/xml/sax/XFastParser.idl b/offapi/com/sun/star/xml/sax/XFastParser.idl
index 037aa01f913b..ff4cfd5afa14 100644
--- a/offapi/com/sun/star/xml/sax/XFastParser.idl
+++ b/offapi/com/sun/star/xml/sax/XFastParser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,66 +24,66 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_sax_XFastParser_idl__
-#define __com_sun_star_xml_sax_XFastParser_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
-#include <com/sun/star/xml/sax/InputSource.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
-#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__
-#include <com/sun/star/xml/sax/XFastDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
-#include <com/sun/star/xml/sax/XFastTokenHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
-#include <com/sun/star/xml/sax/XErrorHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__
-#include <com/sun/star/xml/sax/XDTDHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
-#include <com/sun/star/xml/sax/XEntityResolver.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
-#include <com/sun/star/lang/Locale.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {  module sax {
-
-//=============================================================================
-
+#ifndef __com_sun_star_xml_sax_XFastParser_idl__ 
+#define __com_sun_star_xml_sax_XFastParser_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_InputSource_idl__ 
+#include <com/sun/star/xml/sax/InputSource.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
+#include <com/sun/star/xml/sax/SAXException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__ 
+#include <com/sun/star/xml/sax/XFastDocumentHandler.idl> 
+#endif 
+
+#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__ 
+#include <com/sun/star/xml/sax/XFastTokenHandler.idl> 
+#endif 
+
+#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__ 
+#include <com/sun/star/xml/sax/XErrorHandler.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__ 
+#include <com/sun/star/xml/sax/XDTDHandler.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__ 
+#include <com/sun/star/xml/sax/XEntityResolver.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_Locale_idl__ 
+#include <com/sun/star/lang/Locale.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml {  module sax {  
+ 
+//============================================================================= 
+ 
 /** specifies a SAX parser that uses integer values for known xml names
     (elements, attributes and attribute values). The parser also handles
     namespaces and allows to have individual contexts for each xml element.
 
     <p>Before parsing is possible you have to set your
     <type>XFastDocumentHandler</type> using <member>setFastDocumentHandler</member>.
-
+    
     <p>Parsing starts with calling <member>parseStream</member>. If the parser
     finds a valid xml file with the given <type>InputSource</type>, it calls
     <member>XFastDocumentHandler::startDocument</member> first.
@@ -106,13 +106,13 @@ module com {  module sun {  module star {  module xml {  module sax {
     in the namespace handling and/or the context feature.
 
     <p>For each element the parser sends a create child element event to the
-    elements parent context by calling
+    elements parent context by calling 
     <member>XFastContextHandler::createFastChildContext</member> for known
     elements or <member>XFastContextHandler::createUnknownChildContext</member>
     for unknown elements.
     <br>The parent context for the root element is the <type>XFastDocumentHandler</type>
     itself.
-
+    
     <p>If the parent context returns an empty reference, no further events for
     the element and all of its childs are created.
 
@@ -135,62 +135,62 @@ module com {  module sun {  module star {  module xml {  module sax {
     @see http://wiki.services.openoffice.org/wiki/FastParser
 */
 interface XFastParser: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-    /** parses an XML document from a stream.
-
+{ 
+    //------------------------------------------------------------------------- 
+    /** parses an XML document from a stream. 
+        
         <p>Set the desired handlers before calling this method.</p>
      */
-    void parseStream( [in] InputSource aInputSource )
-            raises( SAXException, com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    void parseStream( [in] InputSource aInputSource ) 
+            raises( SAXException, com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** Application must register a document event handler to get
         sax events for the parsed stream.
      */
-    void setFastDocumentHandler( [in] XFastDocumentHandler Handler );
-
-    //-------------------------------------------------------------------------
+    void setFastDocumentHandler( [in] XFastDocumentHandler Handler ); 
 
+    //------------------------------------------------------------------------- 
+    
     /** must be registered to translate known xml names to integer tokens.
      */
-    void setTokenHandler( [in] XFastTokenHandler Handler );
+    void setTokenHandler( [in] XFastTokenHandler Handler ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** registers a known namespace url with the given integer token.<br>
         @param NamespaceToken
             an integer token that must be greater than FastToken::NAMESPACE.
      */
     void registerNamespace( [in] string NamespaceURL, [in] long NamespaceToken )
-        raises( com::sun::star::lang::IllegalArgumentException );
+        raises( com::sun::star::lang::IllegalArgumentException ); 
 
-    //-------------------------------------------------------------------------
-    /** allows an application to register an error event handler.
-
-        <p>Note that the error handler can throw an exception when an error or
-        warning occurs.  Note that an exception is thrown by the parser when
+    //------------------------------------------------------------------------- 
+    /** allows an application to register an error event handler. 
+        
+        <p>Note that the error handler can throw an exception when an error or 
+        warning occurs.  Note that an exception is thrown by the parser when 
         an unrecoverable (fatal) error occurs.</p>
      */
-    void setErrorHandler( [in] XErrorHandler Handler );
-
-    //-------------------------------------------------------------------------
+    void setErrorHandler( [in] XErrorHandler Handler ); 
+ 
+    //------------------------------------------------------------------------- 
     /** allows an application to register a DTD-Handler.
      */
-    void setEntityResolver( [in] XEntityResolver Resolver );
-
-    //-------------------------------------------------------------------------
+    void setEntityResolver( [in] XEntityResolver Resolver ); 
+ 
+    //------------------------------------------------------------------------- 
     /** sets a locale specified for localization of warnings and error messages.
-
-        <p>Set the language of the error messages. Useful when the parsing
+        
+        <p>Set the language of the error messages. Useful when the parsing 
         errors will be presented to the user.</p>
      */
-    void setLocale( [in] com::sun::star::lang::Locale locale );
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    void setLocale( [in] com::sun::star::lang::Locale locale ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
index 949d8ef2386b..c79d5e893db1 100644
--- a/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
+++ b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,19 +28,19 @@
 #ifndef __com_sun_star_xml_sax_XFastSAXSerializable_idl__
 #define __com_sun_star_xml_sax_XFastSAXSerializable_idl__
 
-#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__
+#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__ 
 #include <com/sun/star/xml/sax/XFastDocumentHandler.idl>
 #endif
 
-#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
+#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__ 
 #include <com/sun/star/xml/sax/XFastTokenHandler.idl>
 #endif
 
-#ifndef __com_sun_star_beans_StringPair_idl__
+#ifndef __com_sun_star_beans_StringPair_idl__ 
 #include <com/sun/star/beans/StringPair.idl>
 #endif
 
-#ifndef __com_sun_star_beans_Pair_idl__
+#ifndef __com_sun_star_beans_Pair_idl__ 
 #include <com/sun/star/beans/Pair.idl>
 #endif
 
@@ -48,7 +48,7 @@ module com { module sun { module star { module xml { module sax {
 
 //=============================================================================
 /** serializes a DOM tree by generating FastSAX events.
-
+    
     <p>
     </p>
 
diff --git a/offapi/com/sun/star/xml/sax/XFastSerializer.idl b/offapi/com/sun/star/xml/sax/XFastSerializer.idl
index 3c61d0ffcbf4..3534fcc31a21 100644
--- a/offapi/com/sun/star/xml/sax/XFastSerializer.idl
+++ b/offapi/com/sun/star/xml/sax/XFastSerializer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,56 +24,56 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_sax_XFastSerializer_idl__
-#define __com_sun_star_xml_sax_XFastSerializer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
-#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastDocumentHanlder_idl__
-#include <com/sun/star/xml/sax/XFastDocumentHandler.idl>
-#endif
-
+#ifndef __com_sun_star_xml_sax_XFastSerializer_idl__ 
+#define __com_sun_star_xml_sax_XFastSerializer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
+#include <com/sun/star/xml/sax/SAXException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_XFastDocumentHanlder_idl__ 
+#include <com/sun/star/xml/sax/XFastDocumentHandler.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_io_XOutputStream_idl__
 #include <com/sun/star/io/XOutputStream.idl>
 #endif
 
-#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
-#include <com/sun/star/xml/sax/XFastTokenHandler.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {  module sax {
-
-//=============================================================================
-
+#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__ 
+#include <com/sun/star/xml/sax/XFastTokenHandler.idl> 
+#endif 
+
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml {  module sax {  
+ 
+//============================================================================= 
+ 
 /** receives notification of sax document events to write into an XOutputStream.
  */
 interface XFastSerializer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** called by the parser when parsing of an xml stream is started.
      */
-    void startDocument()
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
-
+    void startDocument() 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** called by the parser after the last xml element of a stream is processed.
      */
-    void endDocument()
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
+    void endDocument() 
+            raises( com::sun::star::xml::sax::SAXException ); 
 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification of the beginning of an element .
 
         @param Element
@@ -91,10 +91,10 @@ interface XFastSerializer: com::sun::star::uno::XInterface
             from the element.
 
     */
-    void startFastElement( [in] long Element, [in] XFastAttributeList Attribs )
-            raises( com::sun::star::xml::sax::SAXException );
+    void startFastElement( [in] long Element, [in] XFastAttributeList Attribs ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** receives notification of the beginning of an unknown element .
 
@@ -106,27 +106,27 @@ interface XFastSerializer: com::sun::star::uno::XInterface
             Contains a <type>XFastAttrbitueList</type> to access the attributes
             from the element.
      */
-    void startUnknownElement( [in] string Namespace, [in] string Name, [in] XFastAttributeList Attribs )
-            raises( com::sun::star::xml::sax::SAXException );
+    void startUnknownElement( [in] string Namespace, [in] string Name, [in] XFastAttributeList Attribs ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** receives notification of the end of an known element.
         @see startFastElement
      */
-    void endFastElement( [in] long Element )
-            raises( com::sun::star::xml::sax::SAXException );
+    void endFastElement( [in] long Element ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** receives notification of the end of an known element.
         @see startUnknownElement
      */
-    void endUnknownElement( [in] string Namespace, [in] string Name )
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
-
+    void endUnknownElement( [in] string Namespace, [in] string Name ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** receives notification of the beginning of a single element .
 
         @param Element
@@ -144,10 +144,10 @@ interface XFastSerializer: com::sun::star::uno::XInterface
             from the element.
 
     */
-    void singleFastElement( [in] long Element, [in] XFastAttributeList Attribs )
-            raises( com::sun::star::xml::sax::SAXException );
+    void singleFastElement( [in] long Element, [in] XFastAttributeList Attribs ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** receives notification of the beginning of a single unknown element .
 
@@ -159,33 +159,33 @@ interface XFastSerializer: com::sun::star::uno::XInterface
             Contains a <type>XFastAttrbitueList</type> to access the attributes
             from the element.
      */
-    void singleUnknownElement( [in] string Namespace, [in] string Name, [in] XFastAttributeList Attribs )
-            raises( com::sun::star::xml::sax::SAXException );
+    void singleUnknownElement( [in] string Namespace, [in] string Name, [in] XFastAttributeList Attribs ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** receives notification of character data.
      */
-    void characters( [in] string aChars )
-            raises( com::sun::star::xml::sax::SAXException );
-
-    //-------------------------------------------------------------------------
-
+    void characters( [in] string aChars ) 
+            raises( com::sun::star::xml::sax::SAXException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /**
      */
-    void setOutputStream ( [in] com::sun::star::io::XOutputStream xOutputStream )
-            /* raises( com::sun::star::xml::sax::SAXException ) */;
-
-    //-------------------------------------------------------------------------
-
+    void setOutputStream ( [in] com::sun::star::io::XOutputStream xOutputStream ) 
+            /* raises( com::sun::star::xml::sax::SAXException ) */; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /**
      */
-    void setFastTokenHandler ( [in] com::sun::star::xml::sax::XFastTokenHandler xFastTokenHandler )
-            /* raises( com::sun::star::xml::sax::SAXException ) */;
-  };
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    void setFastTokenHandler ( [in] com::sun::star::xml::sax::XFastTokenHandler xFastTokenHandler ) 
+            /* raises( com::sun::star::xml::sax::SAXException ) */; 
+  }; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl b/offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl
index 27c615cbaa3c..a48d3099f2a2 100644
--- a/offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl b/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
index e4af64500b6c..b311a5e42f49 100644
--- a/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,7 +51,7 @@ interface XFastTokenHandler: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    /** returns a integer token for the given string identifier.
+    /**	returns a integer token for the given string identifier.
 
         @returns
             a unique integer token for the given String or <const>FastToken::DONTKNOW</const>
diff --git a/offapi/com/sun/star/xml/sax/XLocator.idl b/offapi/com/sun/star/xml/sax/XLocator.idl
index e77d83000f8a..0bc74e766f34 100644
--- a/offapi/com/sun/star/xml/sax/XLocator.idl
+++ b/offapi/com/sun/star/xml/sax/XLocator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_sax_XLocator_idl__
-#define __com_sun_star_xml_sax_XLocator_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {  module sax {
-
-//============================================================================
-
-/** makes it possible to associate a SAX event with a document location.
-
-    <p>This interface is an IDL version of the Java interface
+#ifndef __com_sun_star_xml_sax_XLocator_idl__ 
+#define __com_sun_star_xml_sax_XLocator_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml {  module sax {  
+ 
+//============================================================================ 
+ 
+/** makes it possible to associate a SAX event with a document location. 
+    
+    <p>This interface is an IDL version of the Java interface 
     <em>org.xml.sax.Locator</em>.</p>
  */
 published interface XLocator: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+    /** @returns  
                     the column number where the current document event ends.
      */
-    long getColumnNumber();
-
-    //-------------------------------------------------------------------------
-    /** @returns
+    long getColumnNumber(); 
+ 
+    //------------------------------------------------------------------------- 
+    /** @returns  
                     the line number where the current document event ends.
      */
-    long getLineNumber();
-
-    //-------------------------------------------------------------------------
-    /** @returns
+    long getLineNumber(); 
+ 
+    //------------------------------------------------------------------------- 
+    /** @returns  
                     the public identifier for the current document event.
      */
-    string getPublicId();
-
-    //-------------------------------------------------------------------------
-    /** @returns
+    string getPublicId(); 
+ 
+    //------------------------------------------------------------------------- 
+    /** @returns  
                     the system identifier for the current document event.
      */
-    string getSystemId();
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    string getSystemId(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/xml/sax/XParser.idl b/offapi/com/sun/star/xml/sax/XParser.idl
index 0d29af5d6562..a1d104e81ce9 100644
--- a/offapi/com/sun/star/xml/sax/XParser.idl
+++ b/offapi/com/sun/star/xml/sax/XParser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,103 +24,103 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_xml_sax_XParser_idl__
-#define __com_sun_star_xml_sax_XParser_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
-#include <com/sun/star/xml/sax/InputSource.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
-#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
-#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
-#include <com/sun/star/xml/sax/XErrorHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__
-#include <com/sun/star/xml/sax/XDTDHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
-#include <com/sun/star/xml/sax/XEntityResolver.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
-#include <com/sun/star/lang/Locale.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module xml {  module sax {
-
-//=============================================================================
-
-/** specifies a SAX parser.
-
-    <p>This interface is an IDL version of the Java interface
+#ifndef __com_sun_star_xml_sax_XParser_idl__ 
+#define __com_sun_star_xml_sax_XParser_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_InputSource_idl__ 
+#include <com/sun/star/xml/sax/InputSource.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_SAXException_idl__ 
+#include <com/sun/star/xml/sax/SAXException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__ 
+#include <com/sun/star/xml/sax/XDocumentHandler.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__ 
+#include <com/sun/star/xml/sax/XErrorHandler.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__ 
+#include <com/sun/star/xml/sax/XDTDHandler.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__ 
+#include <com/sun/star/xml/sax/XEntityResolver.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_Locale_idl__ 
+#include <com/sun/star/lang/Locale.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module xml {  module sax {  
+ 
+//============================================================================= 
+ 
+/** specifies a SAX parser. 
+    
+    <p>This interface is an IDL version of the Java interface 
     <em>org.xml.sax.Parser</em> with some minor adaptations.</p>
  */
 published interface XParser: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-    /** parses an XML document from a stream.
-
+{ 
+    //------------------------------------------------------------------------- 
+    /** parses an XML document from a stream. 
+        
         <p>Set the desired handlers before calling this method.</p>
      */
-    void parseStream( [in] com::sun::star::xml::sax::InputSource aInputSource )
-            raises( com::sun::star::xml::sax::SAXException,
-                    com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
+    void parseStream( [in] com::sun::star::xml::sax::InputSource aInputSource ) 
+            raises( com::sun::star::xml::sax::SAXException, 
+                    com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** allows an application to register a document event handler.
      */
-    void setDocumentHandler( [in] com::sun::star::xml::sax::XDocumentHandler xHandler );
-
-    //-------------------------------------------------------------------------
-    /** allows an application to register an error event handler.
-
-        <p>Note that the error handler can throw an exception when an error or
-        warning occurs.  Note that an exception is thrown by the parser when
+    void setDocumentHandler( [in] com::sun::star::xml::sax::XDocumentHandler xHandler ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** allows an application to register an error event handler. 
+        
+        <p>Note that the error handler can throw an exception when an error or 
+        warning occurs.  Note that an exception is thrown by the parser when 
         an unrecoverable (fatal) error occurs.</p>
      */
-    void setErrorHandler( [in] com::sun::star::xml::sax::XErrorHandler xHandler );
-
-    //-------------------------------------------------------------------------
+    void setErrorHandler( [in] com::sun::star::xml::sax::XErrorHandler xHandler ); 
+ 
+    //------------------------------------------------------------------------- 
     /** allows an application to register a DTD-Handler.
      */
-    void setDTDHandler( [in] com::sun::star::xml::sax::XDTDHandler xHandler );
-
-    //-------------------------------------------------------------------------
+    void setDTDHandler( [in] com::sun::star::xml::sax::XDTDHandler xHandler ); 
+ 
+    //------------------------------------------------------------------------- 
     /** allows an application to register a DTD-Handler.
      */
-    void setEntityResolver( [in] com::sun::star::xml::sax::XEntityResolver xResolver );
-
-    //-------------------------------------------------------------------------
+    void setEntityResolver( [in] com::sun::star::xml::sax::XEntityResolver xResolver ); 
+ 
+    //------------------------------------------------------------------------- 
     /** sets a locale specified for localization of warnings and error messages.
-
-        <p>Set the language of the error messages. Useful when the parsing
+        
+        <p>Set the language of the error messages. Useful when the parsing 
         errors will be presented to the user.</p>
      */
-    void setLocale( [in] com::sun::star::lang::Locale locale );
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-#endif
+    void setLocale( [in] com::sun::star::lang::Locale locale ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/xml/sax/XSAXSerializable.idl b/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
index 94af79fc1444..e0dffb3a9ef7 100644
--- a/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
+++ b/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,11 +28,11 @@
 #ifndef __com_sun_star_xml_sax_XSAXSerializable_idl__
 #define __com_sun_star_xml_sax_XSAXSerializable_idl__
 
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
+#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__ 
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
 #endif
 
-#ifndef __com_sun_star_beans_StringPair_idl__
+#ifndef __com_sun_star_beans_StringPair_idl__ 
 #include <com/sun/star/beans/StringPair.idl>
 #endif
 
@@ -40,7 +40,7 @@ module com { module sun { module star { module xml { module sax {
 
 //=============================================================================
 /** serializes a DOM tree by generating SAX events.
-
+    
     <p>
     </p>
 
diff --git a/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl b/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
index 8fb0ed67d17a..d43876db51ba 100644
--- a/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl b/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
index 3a5edca4325e..96945d632ba8 100644
--- a/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl b/offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl
index 2145c23a941b..58109632317a 100644
--- a/offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
@@ -43,12 +43,12 @@ interface XXMLElementWrapper;
 /**
  * Interface of XML Document Wrapper.
  * <p>
- * When converting SAX events into a DOM tree, this interface is
- * used to manipulate the DOM data in UNO perspective.
+ * When converting SAX events into a DOM tree, this interface is 
+ * used to manipulate the DOM data in UNO perspective. 
  * <p>
  * Every lauguage has its own methods to manipulate its native DOM
  * data structure, this interface provides a common method set which
- * each lauguage have to implement.
+ * each lauguage have to implement. 
  * <p>
  * In another word, this interface wraps language dependant methods,
  * then other component can manipulate DOM data through UNO methods.
@@ -61,11 +61,11 @@ interface XXMLDocumentWrapper : com::sun::star::uno::XInterface
      * @return   the current element in the SAX event stream
      */
     XXMLElementWrapper getCurrentElement();
-
+    
     /**
      * Sets the current element.
      * <p>
-     * When the current element is replaced outside of this interface, then
+     * When the current element is replaced outside of this interface, then 
      * uses this method can update the current element pointer.
      *
      * @param element   the new current element
@@ -79,7 +79,7 @@ interface XXMLDocumentWrapper : com::sun::star::uno::XInterface
      * the new current element.
      */
     void removeCurrentElement();
-
+    
     /**
      * Checks whether an element is the current element.
      *
@@ -88,11 +88,11 @@ interface XXMLDocumentWrapper : com::sun::star::uno::XInterface
      *               <code>false</code> otherwise
      */
     boolean isCurrent([in] XXMLElementWrapper node);
-
+    
     /**
      * Checks whether the current element is empty.
      *
-     * @return   <code>true</code> if the current element is empty,
+     * @return   <code>true</code> if the current element is empty, 
      *           <code>false</code> otherwise
      */
     boolean isCurrentElementEmpty();
@@ -104,7 +104,7 @@ interface XXMLDocumentWrapper : com::sun::star::uno::XInterface
      * @return       the name of the element
      */
     string getNodeName([in] XXMLElementWrapper node);
-
+    
     /**
      * Clears all useless element in a branch of the DOM tree along the
      * tree order.
@@ -121,7 +121,7 @@ interface XXMLDocumentWrapper : com::sun::star::uno::XInterface
         [in] XXMLElementWrapper node,
         [in] sequence< XXMLElementWrapper > reservedDescendants,
         [in] XXMLElementWrapper stopAtNode);
-
+        
     /**
      * Collapses a tree path
      * <p>
@@ -132,7 +132,7 @@ interface XXMLDocumentWrapper : com::sun::star::uno::XInterface
      *               path will be collapsed
      */
     void collapse([in] XXMLElementWrapper node);
-
+        
     /**
      * Converts a part of the DOM tree into SAX events.
      *
@@ -144,12 +144,12 @@ interface XXMLDocumentWrapper : com::sun::star::uno::XInterface
      * @param endNode                 the end point where to stop generating
      */
     void generateSAXEvents(
-        [in] com::sun::star::xml::sax::XDocumentHandler handler,
-        [in] com::sun::star::xml::sax::XDocumentHandler saxEventKeeperHandler,
-        [in] XXMLElementWrapper startNode,
+        [in] com::sun::star::xml::sax::XDocumentHandler handler, 
+        [in] com::sun::star::xml::sax::XDocumentHandler saxEventKeeperHandler, 
+        [in] XXMLElementWrapper startNode, 
         [in] XXMLElementWrapper endNode)
         raises(  com::sun::star::xml::sax::SAXException );
-
+        
     /**
      * Converts the whole DOM tree into a SAX event stream.
      *
diff --git a/offapi/com/sun/star/xml/wrapper/XXMLElementWrapper.idl b/offapi/com/sun/star/xml/wrapper/XXMLElementWrapper.idl
index ef19b64826c7..c1b9008d7552 100644
--- a/offapi/com/sun/star/xml/wrapper/XXMLElementWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XXMLElementWrapper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 //i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl b/offapi/com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl
index 7b9eac727f52..06060aae22d3 100644
--- a/offapi/com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl
+++ b/offapi/com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#ifndef __com_sun_star_xml__xpath_Libxml2ExtensionHandle_idl__
-#define __com_sun_star_xml_Libxml2ExtensionHandle_idl__
-
-//=============================================================================
-
+ 
+#ifndef __com_sun_star_xml__xpath_Libxml2ExtensionHandle_idl__ 
+#define __com_sun_star_xml_Libxml2ExtensionHandle_idl__ 
+ 
+//============================================================================= 
+ 
  module com {  module sun {  module star {  module xml {  module xpath {
-
-//=============================================================================
-
-struct Libxml2ExtensionHandle
+ 
+//============================================================================= 
+ 
+struct Libxml2ExtensionHandle 
 {
     hyper functionLookupFunction;
     hyper functionData;
     hyper variableLookupFunction;
     hyper variableData;
-};
-
-//=============================================================================
-
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
 
-#endif
+#endif 
diff --git a/offapi/com/sun/star/xml/xpath/XPathException.idl b/offapi/com/sun/star/xml/xpath/XPathException.idl
index 37ee4eb789bb..9e94993703ac 100644
--- a/offapi/com/sun/star/xml/xpath/XPathException.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathException.idl
@@ -1,6 +1,6 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xml/xpath/XPathObjectType.idl b/offapi/com/sun/star/xml/xpath/XPathObjectType.idl
index c0445f9bd2f3..b57d3c2011c9 100644
--- a/offapi/com/sun/star/xml/xpath/XPathObjectType.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathObjectType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xml/xpath/XXPathAPI.idl b/offapi/com/sun/star/xml/xpath/XXPathAPI.idl
index e3501947cb4c..d91ab12d9b7c 100644
--- a/offapi/com/sun/star/xml/xpath/XXPathAPI.idl
+++ b/offapi/com/sun/star/xml/xpath/XXPathAPI.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xml/xpath/XXPathExtension.idl b/offapi/com/sun/star/xml/xpath/XXPathExtension.idl
index 527c37ba46f3..b6c8bca35c90 100644
--- a/offapi/com/sun/star/xml/xpath/XXPathExtension.idl
+++ b/offapi/com/sun/star/xml/xpath/XXPathExtension.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 #ifndef __com__sun_star_xml_xpath_Libxml2ExtensionHandle_idl__
 #include <com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl>
 #endif
-
+ 
 module com { module sun { module star { module xml { module xpath {
 
 
diff --git a/offapi/com/sun/star/xml/xpath/XXPathObject.idl b/offapi/com/sun/star/xml/xpath/XXPathObject.idl
index 3371a17fe93c..b33b58b0e576 100644
--- a/offapi/com/sun/star/xml/xpath/XXPathObject.idl
+++ b/offapi/com/sun/star/xml/xpath/XXPathObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,17 +28,17 @@
 #ifndef __com_sun_star_xml_XPath_XXPathObject_idl__
 #define __com_sun_star_xml_XPath_XXPathObject_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
 #endif
-#ifndef __com_sun_star_xml_dom_XNode_idl__
-#include <com/sun/star/xml/dom/XNode.idl>
+#ifndef __com_sun_star_xml_dom_XNode_idl__ 
+#include <com/sun/star/xml/dom/XNode.idl> 
 #endif
-#ifndef __com_sun_star_xml_dom_XNodeList_idl__
-#include <com/sun/star/xml/dom/XNodeList.idl>
+#ifndef __com_sun_star_xml_dom_XNodeList_idl__ 
+#include <com/sun/star/xml/dom/XNodeList.idl> 
 #endif
 #ifndef __com_sun_star_xml_XPath_XObjectType_idl__
-#include <com/sun/star/xml/xpath/XPathObjectType.idl>
+#include <com/sun/star/xml/xpath/XPathObjectType.idl> 
 #endif
 
 module com { module sun { module star { module xml { module xpath {
diff --git a/offapi/com/sun/star/xsd/Boolean.idl b/offapi/com/sun/star/xsd/Boolean.idl
index da715bc6ee22..4909e30f234e 100644
--- a/offapi/com/sun/star/xsd/Boolean.idl
+++ b/offapi/com/sun/star/xsd/Boolean.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xsd/DataTypeClass.idl b/offapi/com/sun/star/xsd/DataTypeClass.idl
index 81b5e16de489..90eebbe9a3b0 100644
--- a/offapi/com/sun/star/xsd/DataTypeClass.idl
+++ b/offapi/com/sun/star/xsd/DataTypeClass.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xsd/Date.idl b/offapi/com/sun/star/xsd/Date.idl
index 624f6af4ca2d..a6875079aa1c 100644
--- a/offapi/com/sun/star/xsd/Date.idl
+++ b/offapi/com/sun/star/xsd/Date.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xsd/DateTime.idl b/offapi/com/sun/star/xsd/DateTime.idl
index 06b7c945baf8..0d5f1c11e807 100644
--- a/offapi/com/sun/star/xsd/DateTime.idl
+++ b/offapi/com/sun/star/xsd/DateTime.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xsd/Day.idl b/offapi/com/sun/star/xsd/Day.idl
index c683ad3ebb4a..81c5c7781854 100644
--- a/offapi/com/sun/star/xsd/Day.idl
+++ b/offapi/com/sun/star/xsd/Day.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xsd/Decimal.idl b/offapi/com/sun/star/xsd/Decimal.idl
index 008fb9340b82..bfe1e0fe7dec 100644
--- a/offapi/com/sun/star/xsd/Decimal.idl
+++ b/offapi/com/sun/star/xsd/Decimal.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ service Decimal
     */
     [property, maybevoid] long TotalDigits;
 
-    /** fractionDigits is the maximum number of digits in the fractional part of values of
+    /** fractionDigits is the maximum number of digits in the fractional part of values of 
         decimal data
 
         <p>The value of fractionDigits must be a non negative integer.</p>
diff --git a/offapi/com/sun/star/xsd/Month.idl b/offapi/com/sun/star/xsd/Month.idl
index bc57ed265bfb..eaeaf0803129 100644
--- a/offapi/com/sun/star/xsd/Month.idl
+++ b/offapi/com/sun/star/xsd/Month.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xsd/String.idl b/offapi/com/sun/star/xsd/String.idl
index f86cc0c3fa2f..df8bc1e3cc18 100644
--- a/offapi/com/sun/star/xsd/String.idl
+++ b/offapi/com/sun/star/xsd/String.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xsd/Time.idl b/offapi/com/sun/star/xsd/Time.idl
index bca39677b8cd..51711ca7219c 100644
--- a/offapi/com/sun/star/xsd/Time.idl
+++ b/offapi/com/sun/star/xsd/Time.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xsd/WhiteSpaceTreatment.idl b/offapi/com/sun/star/xsd/WhiteSpaceTreatment.idl
index 05294e3a3217..baae0b605621 100644
--- a/offapi/com/sun/star/xsd/WhiteSpaceTreatment.idl
+++ b/offapi/com/sun/star/xsd/WhiteSpaceTreatment.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/com/sun/star/xsd/XDataType.idl b/offapi/com/sun/star/xsd/XDataType.idl
index b3009756e92c..dc0e665ea8b9 100644
--- a/offapi/com/sun/star/xsd/XDataType.idl
+++ b/offapi/com/sun/star/xsd/XDataType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -83,7 +83,7 @@ interface XDataType
     [attribute, readonly] boolean IsBasic;
 
     /** class of the type
-
+ 
         @see DataTypeClass
     */
     [attribute, readonly] short TypeClass;
diff --git a/offapi/com/sun/star/xsd/Year.idl b/offapi/com/sun/star/xsd/Year.idl
index 3e4a3438acec..9d02b1f1faf7 100644
--- a/offapi/com/sun/star/xsd/Year.idl
+++ b/offapi/com/sun/star/xsd/Year.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/drafts/com/sun/star/form/IncompatibleTypesException.idl b/offapi/drafts/com/sun/star/form/IncompatibleTypesException.idl
index ec784aa7c2bb..8702aebe0125 100644
--- a/offapi/drafts/com/sun/star/form/IncompatibleTypesException.idl
+++ b/offapi/drafts/com/sun/star/form/IncompatibleTypesException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/drafts/com/sun/star/form/ListEntryEvent.idl b/offapi/drafts/com/sun/star/form/ListEntryEvent.idl
index 9f7b8443f7da..e3f4aa36af42 100644
--- a/offapi/drafts/com/sun/star/form/ListEntryEvent.idl
+++ b/offapi/drafts/com/sun/star/form/ListEntryEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/drafts/com/sun/star/form/XBindableValue.idl b/offapi/drafts/com/sun/star/form/XBindableValue.idl
index fafb1edda83d..95bbe1f201d1 100644
--- a/offapi/drafts/com/sun/star/form/XBindableValue.idl
+++ b/offapi/drafts/com/sun/star/form/XBindableValue.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,7 +64,7 @@ interface XBindableValue : com::sun::star::uno::XInterface
             if the new binding (provided it's not <NULL/>) supports only types
             which are incompatible with the types of the bindable component.
      */
-    void    setValueBinding( [in] XValueBinding aBinding )
+    void    setValueBinding( [in] XValueBinding aBinding ) 
                 raises ( IncompatibleTypesException );
 
     /** retrieves the external instance which currently controls the value of the
diff --git a/offapi/drafts/com/sun/star/form/XListEntryListener.idl b/offapi/drafts/com/sun/star/form/XListEntryListener.idl
index e9e49d799d26..a65821150b30 100644
--- a/offapi/drafts/com/sun/star/form/XListEntryListener.idl
+++ b/offapi/drafts/com/sun/star/form/XListEntryListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/drafts/com/sun/star/form/XListEntrySink.idl b/offapi/drafts/com/sun/star/form/XListEntrySink.idl
index 3cd163189c1d..8825abe13b03 100644
--- a/offapi/drafts/com/sun/star/form/XListEntrySink.idl
+++ b/offapi/drafts/com/sun/star/form/XListEntrySink.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/drafts/com/sun/star/form/XListEntrySource.idl b/offapi/drafts/com/sun/star/form/XListEntrySource.idl
index 095b8a703d5a..499ed4311893 100644
--- a/offapi/drafts/com/sun/star/form/XListEntrySource.idl
+++ b/offapi/drafts/com/sun/star/form/XListEntrySource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/offapi/drafts/com/sun/star/form/XValueBinding.idl b/offapi/drafts/com/sun/star/form/XValueBinding.idl
index a62c164ebfce..db4f850fe081 100644
--- a/offapi/drafts/com/sun/star/form/XValueBinding.idl
+++ b/offapi/drafts/com/sun/star/form/XValueBinding.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -85,7 +85,7 @@ interface XValueBinding : com::sun::star::uno::XInterface
         @throws <type scope="com::sun::star::lang">NoSupportException</type>
             if the value currently cannot be changed (e.g. because it's readonly),
             or if the binding in general does not support write access to it's binding
-
+            
         @see getSupportedValueTypes
         @see supportsType
         @see ValueBinding
diff --git a/offapi/util/checknewapi.pl b/offapi/util/checknewapi.pl
index de7866f69716..69d79fc50cb1 100755
--- a/offapi/util/checknewapi.pl
+++ b/offapi/util/checknewapi.pl
@@ -37,13 +37,13 @@ $published = 0;
 $typeclass = "";
 while (<FILEIN>)
 {
-    if ($first == 0)
+    if ($first == 0) 
     {
-        if ( $linebefore =~ m#type class: published (.+)# )
+        if ( $linebefore =~ m#type class: published (.+)# ) 
         {
             $published = 1;
             $typeclass = $1;
-        } elsif ( $linebefore =~ m#type class: (.+)# )
+        } elsif ( $linebefore =~ m#type class: (.+)# ) 
         {
             $published = 0;
             $typeclass = $1;
@@ -52,12 +52,12 @@ while (<FILEIN>)
             $published = 0;
             $typeclass = "";
         }
-    } else
+    } else 
     {
         $first = 0;
     }
 
-    if ( (!$typeclass eq "") && ($_ =~ m# *type name: \"([^\[.]+)\"#) )
+    if ( (!$typeclass eq "") && ($_ =~ m# *type name: \"([^\[.]+)\"#) ) 
     {
         if ($DEBUG == 1)
         {
@@ -68,7 +68,7 @@ while (<FILEIN>)
             $main::currenttypes->{$1} = { PUBLISHED => $published,
                                           TYPECLASS => $typeclass,
                                           COUNT => 1 };
-#           print "### $main::currenttypes->{$1}->{PUBLISHED} $main::currenttypes->{$1}->{TYPECLASS} $main::currenttypes->{$1}->{COUNT}\n";
+#			print "### $main::currenttypes->{$1}->{PUBLISHED} $main::currenttypes->{$1}->{TYPECLASS} $main::currenttypes->{$1}->{COUNT}\n";
         }
     }
     $linebefore = $_;
@@ -90,13 +90,13 @@ $published = 0;
 $typeclass = "";
 while (<FILEIN>)
 {
-    if ($first == 0)
+    if ($first == 0) 
     {
-        if ( $linebefore =~ m#type class: published (.+)# )
+        if ( $linebefore =~ m#type class: published (.+)# ) 
         {
             $published = 1;
             $typeclass = $1;
-        } elsif ( $linebefore =~ m#type class: (.+)# )
+        } elsif ( $linebefore =~ m#type class: (.+)# ) 
         {
             $published = 0;
             $typeclass = $1;
@@ -105,12 +105,12 @@ while (<FILEIN>)
             $published = 0;
             $typeclass = "";
         }
-    } else
+    } else 
     {
         $first = 0;
     }
 
-    if ( (!$typeclass eq "") && ($_ =~ m# *type name: \"([^\[.]+)\"#) )
+    if ( (!$typeclass eq "") && ($_ =~ m# *type name: \"([^\[.]+)\"#) ) 
     {
         if ($DEBUG == 1)
         {
@@ -119,12 +119,12 @@ while (<FILEIN>)
         if ( ! exists $main::reftypes->{$1} )
         {
             $main::reftypes->{$1}++;
-
+            
             if ( exists $main::currenttypes->{$1} )
             {
                 $main::currenttypes->{$1}->{COUNT}++;
-#               print "###### $main::currenttypes->{$1}->{PUBLISHED} $main::currenttypes->{$1}->{TYPECLASS} $main::currenttypes->{$1}->{COUNT}\n";
-            } else
+#				print "###### $main::currenttypes->{$1}->{PUBLISHED} $main::currenttypes->{$1}->{TYPECLASS} $main::currenttypes->{$1}->{COUNT}\n";
+            } else 
             {
                 if ($published == 0)
                 {
@@ -132,7 +132,7 @@ while (<FILEIN>)
                                                   TYPECLASS => $typeclass };
                 } else
                 {
-                    print "ERROR: type $1 is only in reference type library, this can't be happen\n";
+                    print "ERROR: type $1 is only in reference type library, this can't be happen\n"; 
                 }
             }
         }
@@ -157,7 +157,7 @@ foreach $i ( sort @typekeys )
         $newunotypes++;
         my $t = $i;
         $t =~ s#/#\.#go;
-        if ($main::currenttypes->{$i}->{PUBLISHED} == 1)
+        if ($main::currenttypes->{$i}->{PUBLISHED} == 1) 
         {
             print "published ";
             $newpublished++;
@@ -165,7 +165,7 @@ foreach $i ( sort @typekeys )
         if ( $t =~ m#drafts\.com.+#)
         {
             $draftscount++;
-            if ($main::currenttypes->{$i}->{PUBLISHED} == 1)
+            if ($main::currenttypes->{$i}->{PUBLISHED} == 1) 
             {
                 $draftspublished++;
             }
diff --git a/pyuno/inc/pyuno/pyuno.hxx b/pyuno/inc/pyuno/pyuno.hxx
index 3e46b2c026ab..fcb051c33342 100644
--- a/pyuno/inc/pyuno/pyuno.hxx
+++ b/pyuno/inc/pyuno/pyuno.hxx
@@ -34,7 +34,7 @@
 */
 
 #ifdef WIN32
-#define PY_DLLEXPORT __declspec(dllexport)
+#define PY_DLLEXPORT __declspec(dllexport) 
 #else
 #define PY_DLLEXPORT
 #endif
@@ -43,7 +43,7 @@
     pyuno module.
 
     preconditions: python has been initialized before and
-                   the global interpreter lock is held
+                   the global interpreter lock is held 
 */
 extern "C" PY_DLLEXPORT void SAL_CALL initpyuno();
 
@@ -59,8 +59,8 @@ namespace pyuno
     PyRef( pointer, SAL_NO_ACQUIRE) ctor.
 
     precondition: python has been initialized before and
-    the global interpreter lock is held
-
+    the global interpreter lock is held 
+ 
 */
 class PyRef
 {
@@ -68,11 +68,11 @@ class PyRef
 public:
     PyRef () : m(0) {}
     PyRef( PyObject * p ) : m( p ) { Py_XINCREF( m ); }
-
+    
     PyRef( PyObject * p, __sal_NoAcquire ) : m( p ) {}
 
     PyRef( const PyRef &r ) : m( r.get() ) { Py_XINCREF( m ); }
-
+    
     ~PyRef() { Py_XDECREF( m ); }
 
     PyObject *get() const { return m; }
@@ -114,7 +114,7 @@ public:
     /** returns 1 when the reference points to a python object python object,
         otherwise 0.
     */
-    sal_Bool is() const
+    sal_Bool is() const 
     {
         return m != 0;
     }
@@ -144,7 +144,7 @@ class PY_DLLEXPORT Runtime
 public:
     ~Runtime( );
 
-    /**
+    /** 
         preconditions: python has been initialized before,
         the global interpreter lock is held and pyuno
         has been initialized for the currently used interpreter.
@@ -156,10 +156,10 @@ public:
                initialized before
      */
     Runtime() throw( com::sun::star::uno::RuntimeException );
-
+    
     Runtime( const Runtime & );
     Runtime & operator = ( const Runtime & );
-
+    
     /** Initializes the python-UNO bridge. May be called only once per python interpreter.
 
         @param ctx the component context is used to instantiate bridge services needed
@@ -184,7 +184,7 @@ public:
 
     /** disposes the UNO bridge in this interpreter. All existing stubs/proxies
         become non-functional, using these proxies/stubs leads to runtime errors.
-
+        
         preconditions: python has been initialized before and
         the global interpreter lock is held and pyuno was
         initialized before for the currently in use interpreter.
@@ -192,7 +192,7 @@ public:
     static void SAL_CALL finalize() throw(com::sun::star::uno::RuntimeException );
 
     /** converts something contained in an UNO Any to a Python object
-
+    
         preconditions: python has been initialized before,
         the global interpreter lock is held and pyuno::Runtime
         has been initialized.
@@ -201,7 +201,7 @@ public:
         throw ( com::sun::star::script::CannotConvertException,
                 com::sun::star::lang::IllegalArgumentException,
                 com::sun::star::uno::RuntimeException );
-
+    
     /** converts a Python object to a UNO any
 
         preconditions: python has been initialized before,
@@ -226,7 +226,7 @@ public:
 /** helper class for attaching the current thread to the python runtime.
 
     Attaching is done creating a new threadstate for the given interpreter
-    and acquiring the global interpreter lock.
+    and acquiring the global interpreter lock. 
 
     Usage:
 
@@ -252,7 +252,7 @@ class PY_DLLEXPORT PyThreadAttach
 {
     PyThreadState *tstate;
     PyThreadAttach ( const PyThreadAttach & ); // not implemented
-    PyThreadAttach & operator = ( const PyThreadAttach & );
+    PyThreadAttach & operator = ( const PyThreadAttach & ); 
 public:
 
     /** Creates a new python threadstate and acquires the global interpreter lock.
@@ -263,9 +263,9 @@ public:
              in case no pythread state could be created
      */
     PyThreadAttach( PyInterpreterState *interp) throw ( com::sun::star::uno::RuntimeException );
+    
 
-
-    /** Releases the global interpreter lock and destroys the thread state.
+    /** Releases the global interpreter lock and destroys the thread state. 
      */
     ~PyThreadAttach();
 };
@@ -280,7 +280,7 @@ class PY_DLLEXPORT PyThreadDetach
     PyThreadState *tstate;
     PyThreadDetach ( const PyThreadDetach & ); // not implemented
     PyThreadDetach & operator = ( const PyThreadDetach & ); // not implemented
-
+    
 public:
     /** Releases the global interpreter lock.
 
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index 73d6086c0119..fe0b6996bbb4 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -178,8 +178,8 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c
 
         if( pythonPath.getLength() )
             prependPythonPath( pythonPath );
-
-        // initialize python
+        
+        // initialize python 
         Py_Initialize();
         PyEval_InitThreads();
 
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 1e43f317d819..2a3914061777 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -84,12 +84,12 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef
     OSL_ASSERT( pVal );
     if (pTypeRef->eTypeClass == typelib_TypeClass_VOID)
         return OUString( RTL_CONSTASCII_USTRINGPARAM("void") );
-
+    
     OUStringBuffer buf( 64 );
     buf.append( (sal_Unicode)'(' );
     buf.append( pTypeRef->pTypeName );
     buf.append( (sal_Unicode)')' );
-
+    
     switch (pTypeRef->eTypeClass)
     {
     case typelib_TypeClass_INTERFACE:
@@ -135,13 +135,13 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef
     }
     case typelib_TypeClass_UNION:
     {
-//          typelib_TypeDescription * pTypeDescr = 0;
-//          TYPELIB_DANGER_GET( &pTypeDescr, pTypeRef );
-//          buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("{ ") );
-//          buf.append( val2str( (char *)pVal + ((typelib_UnionTypeDescription *)pTypeDescr)->nValueOffset,
-//                               union_getSetType( pVal, pTypeDescr ) ) );
-//          buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" }") );
-//          TYPELIB_DANGER_RELEASE( pTypeDescr );
+//  		typelib_TypeDescription * pTypeDescr = 0;
+//  		TYPELIB_DANGER_GET( &pTypeDescr, pTypeRef );
+//  		buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("{ ") );
+//  		buf.append( val2str( (char *)pVal + ((typelib_UnionTypeDescription *)pTypeDescr)->nValueOffset,
+//  							 union_getSetType( pVal, pTypeDescr ) ) );
+//  		buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" }") );
+//  		TYPELIB_DANGER_RELEASE( pTypeDescr );
         break;
     }
     case typelib_TypeClass_STRUCT:
@@ -151,21 +151,21 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef
         typelib_TypeDescription * pTypeDescr = 0;
         TYPELIB_DANGER_GET( &pTypeDescr, pTypeRef );
         OSL_ASSERT( pTypeDescr );
-
+        
         typelib_CompoundTypeDescription * pCompType = (typelib_CompoundTypeDescription *)pTypeDescr;
         sal_Int32 nDescr = pCompType->nMembers;
-
+        
         if (pCompType->pBaseTypeDescription)
         {
             buf.append( val2str( pVal, ((typelib_TypeDescription *)pCompType->pBaseTypeDescription)->pWeakRef,mode ) );
             if (nDescr)
                 buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(", ") );
         }
-
+        
         typelib_TypeDescriptionReference ** ppTypeRefs = pCompType->ppTypeRefs;
         sal_Int32 * pMemberOffsets = pCompType->pMemberOffsets;
         rtl_uString ** ppMemberNames = pCompType->ppMemberNames;
-
+        
         for ( sal_Int32 nPos = 0; nPos < nDescr; ++nPos )
         {
             buf.append( ppMemberNames[nPos] );
@@ -177,9 +177,9 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef
             if (nPos < (nDescr -1))
                 buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(", ") );
         }
-
+        
         TYPELIB_DANGER_RELEASE( pTypeDescr );
-
+        
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" }") );
         break;
     }
@@ -187,14 +187,14 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef
     {
         typelib_TypeDescription * pTypeDescr = 0;
         TYPELIB_DANGER_GET( &pTypeDescr, pTypeRef );
-
+        
         uno_Sequence * pSequence = *(uno_Sequence **)pVal;
         typelib_TypeDescription * pElementTypeDescr = 0;
         TYPELIB_DANGER_GET( &pElementTypeDescr, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType );
-
+        
         sal_Int32 nElementSize = pElementTypeDescr->nSize;
-        sal_Int32 nElements    = pSequence->nElements;
-
+        sal_Int32 nElements	   = pSequence->nElements;
+        
         if (nElements)
         {
             buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("{ ") );
@@ -234,7 +234,7 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef
     {
         typelib_TypeDescription * pTypeDescr = 0;
         TYPELIB_DANGER_GET( &pTypeDescr, pTypeRef );
-
+        
         sal_Int32 * pValues = ((typelib_EnumTypeDescription *)pTypeDescr)->pEnumValues;
         sal_Int32 nPos = ((typelib_EnumTypeDescription *)pTypeDescr)->nEnumValues;
         while (nPos--)
@@ -246,7 +246,7 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef
             buf.append( ((typelib_EnumTypeDescription *)pTypeDescr)->ppEnumNames[nPos] );
         else
             buf.append( (sal_Unicode)'?' );
-
+        
         TYPELIB_DANGER_RELEASE( pTypeDescr );
         break;
     }
@@ -301,7 +301,7 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef
         buf.append( *(sal_Int64 *)pVal, 16 );
 #endif
         break;
-
+        
     case typelib_TypeClass_VOID:
     case typelib_TypeClass_ARRAY:
     case typelib_TypeClass_UNKNOWN:
@@ -310,7 +310,7 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef
     default:
         buf.append( (sal_Unicode)'?' );
     }
-
+    
     return buf.makeStringAndClear();
 }
 
@@ -319,7 +319,7 @@ PyObject *PyUNO_repr( PyObject  * self )
 {
     PyUNO *me = (PyUNO * ) self;
     PyObject * ret = 0;
-
+    
     if( me->members->wrappedObject.getValueType().getTypeClass()
         == com::sun::star::uno::TypeClass_EXCEPTION )
     {
@@ -410,7 +410,7 @@ PyObject *PyUNO_invoke( PyObject *object, const char *name , PyObject *args )
     {
         raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) );
     }
-
+ 
     return ret.getAcquired();
 }
 
@@ -420,7 +420,7 @@ PyObject *PyUNO_str( PyObject * self )
 
     OStringBuffer buf;
 
-
+    
     if( me->members->wrappedObject.getValueType().getTypeClass()
         == com::sun::star::uno::TypeClass_STRUCT ||
         me->members->wrappedObject.getValueType().getTypeClass()
@@ -440,7 +440,7 @@ PyObject *PyUNO_str( PyObject * self )
         // a common UNO object
         PyThreadDetach antiguard;
         buf.append( "pyuno object " );
-
+        
         OUString s = val2str( (void*)me->members->wrappedObject.getValue(),
                               me->members->wrappedObject.getValueType().getTypeLibType() );
         buf.append( OUStringToOString(s,RTL_TEXTENCODING_ASCII_US) );
@@ -457,7 +457,7 @@ PyObject* PyUNO_getattr (PyObject* self, char* name)
     {
 
         Runtime runtime;
-
+    
         me = (PyUNO*) self;
         //Handle Python dir () stuff first...
         if (strcmp (name, "__members__") == 0)
@@ -474,7 +474,7 @@ PyObject* PyUNO_getattr (PyObject* self, char* name)
             }
             return member_list;
         }
-
+        
         if (strcmp (name, "__dict__") == 0)
         {
             Py_INCREF (Py_None);
@@ -511,7 +511,7 @@ PyObject* PyUNO_getattr (PyObject* self, char* name)
                 runtime.getImpl()->cargo->xTypeConverter);
             Py_XINCREF( ret.get() );
             return ret.get();
-
+      
         }
 
         //or a property
@@ -615,7 +615,7 @@ static int PyUNO_cmp( PyObject *self, PyObject *that )
             PyUNO *other = reinterpret_cast< PyUNO *> (that );
             com::sun::star::uno::TypeClass tcMe = me->members->wrappedObject.getValueTypeClass();
             com::sun::star::uno::TypeClass tcOther = other->members->wrappedObject.getValueTypeClass();
-
+        
             if( tcMe == tcOther )
             {
                 if( tcMe == com::sun::star::uno::TypeClass_STRUCT ||
@@ -705,7 +705,7 @@ PyObject* PyUNO_new (
     const Any & targetInterface, const Reference<XSingleServiceFactory> &ssf)
 {
     Reference<XInterface> tmp_interface;
-
+  
     targetInterface >>= tmp_interface;
     if (!tmp_interface.is ())
     {
diff --git a/pyuno/source/module/pyuno_adapter.cxx b/pyuno/source/module/pyuno_adapter.cxx
index df3f9fae5443..23f556ffc865 100644
--- a/pyuno/source/module/pyuno_adapter.cxx
+++ b/pyuno/source/module/pyuno_adapter.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -133,7 +133,7 @@ Sequence< sal_Int16 > Adapter::getOutIndexes( const OUString & functionName )
             // reference, which is never broken (as it is up to OOo1.1.0).
             Reference< XIntrospectionAccess > introspection =
                 runtime.getImpl()->cargo->xIntrospection->inspect( makeAny( unoAdapterObject ) );
-
+            
             if( !introspection.is() )
             {
                 throw RuntimeException(
@@ -206,7 +206,7 @@ Any Adapter::invoke( const OUString &aFunctionName,
         Sequence< sal_Int8 > id;
         if( aParams[0] >>= id )
             return com::sun::star::uno::makeAny( getSomething( id ) );
-
+        
     }
 
     RuntimeCargo *cargo = 0;
@@ -223,7 +223,7 @@ Any Adapter::invoke( const OUString &aFunctionName,
             logCall( cargo, "try     uno->py[0x",
                      mWrappedObject.get(), aFunctionName, aParams );
         }
-
+       
         sal_Int32 size = aParams.getLength();
         PyRef argsTuple(PyTuple_New( size ), SAL_NO_ACQUIRE );
         int i;
@@ -287,7 +287,7 @@ Any Adapter::invoke( const OUString &aFunctionName,
                              + aFunctionName),
                             Reference< XInterface > () );
                     }
-
+                    
                     if( aOutParamIndex.getLength() +1 != seq.getLength() )
                     {
                         OUStringBuffer buf;
@@ -300,7 +300,7 @@ Any Adapter::invoke( const OUString &aFunctionName,
                         buf.appendAscii( " elements as return value." );
                         throw RuntimeException(buf.makeStringAndClear(), *this );
                     }
-
+                    
                     aOutParam.realloc( aOutParamIndex.getLength() );
                     ret = seq[0];
                     for( i = 0 ; i < aOutParamIndex.getLength() ; i ++ )
@@ -311,7 +311,7 @@ Any Adapter::invoke( const OUString &aFunctionName,
                 // else { sequence is a return value !}
             }
         }
-
+        
         // log the reply, if desired
         if( isLog( cargo, LogLevel::CALL ) )
         {
@@ -319,7 +319,7 @@ Any Adapter::invoke( const OUString &aFunctionName,
                       mWrappedObject.get(), aFunctionName, ret, aOutParam );
         }
     }
-
+    
     }
     catch(InvocationTargetException & e )
     {
@@ -381,7 +381,7 @@ void Adapter::setValue( const OUString & aPropertyName, const Any & value )
             buf.appendAscii( " is unknown." );
             throw UnknownPropertyException( buf.makeStringAndClear(), Reference< XInterface > () );
         }
-
+        
         PyObject_SetAttrString(
             mWrappedObject.get(), (char*)TO_ASCII(aPropertyName), obj.get() );
         raiseInvocationTargetExceptionWhenNeeded( runtime);
@@ -434,7 +434,7 @@ sal_Bool Adapter::hasProperty( const OUString & aPropertyName )
     }
     return bRet;
 }
-
+                     
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/pyuno/source/module/pyuno_callable.cxx b/pyuno/source/module/pyuno_callable.cxx
index 68b2f39e30a5..74bf7e94e64f 100644
--- a/pyuno/source/module/pyuno_callable.cxx
+++ b/pyuno/source/module/pyuno_callable.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,11 +64,11 @@ typedef struct
 void PyUNO_callable_del (PyObject* self)
 {
     PyUNO_callable* me;
-
+  
     me = (PyUNO_callable*) self;
     delete me->members;
     PyObject_Del (self);
-
+  
     return;
 }
 
@@ -85,14 +85,14 @@ PyObject* PyUNO_callable_call (PyObject* self, PyObject* args, PyObject*)
     Any ret_value;
     RuntimeCargo *cargo = 0;
     me = (PyUNO_callable*) self;
-
+  
     PyRef ret;
     try
     {
         Runtime runtime;
         cargo = runtime.getImpl()->cargo;
         any_params = runtime.pyObject2Any (args, me->members->mode);
-
+    
         if (any_params.getValueTypeClass () == com::sun::star::uno::TypeClass_SEQUENCE)
         {
             any_params >>= aParams;
@@ -105,8 +105,8 @@ PyObject* PyUNO_callable_call (PyObject* self, PyObject* args, PyObject*)
 
         {
             PyThreadDetach antiguard; //pyhton free zone
-
-            // do some logging if desired ...
+            
+            // do some logging if desired ... 
             if( isLog( cargo, LogLevel::CALL ) )
             {
                 logCall( cargo, "try     py->uno[0x", me->members->xInvocation.get(),
@@ -124,7 +124,7 @@ PyObject* PyUNO_callable_call (PyObject* self, PyObject* args, PyObject*)
                           me->members->methodName, ret_value, aOutParam);
             }
         }
-
+        
 
         PyRef temp = runtime.any2PyObject (ret_value);
         if( aOutParam.getLength() )
@@ -139,7 +139,7 @@ PyObject* PyUNO_callable_call (PyObject* self, PyObject* args, PyObject*)
                 Py_INCREF( Py_None );
                 PyTuple_SetItem( return_list.get() , i , Py_None );
             }
-
+            
             for( i = 0 ; i < aOutParam.getLength() ; i ++ )
             {
                 PyRef ref = runtime.any2PyObject( aOutParam[i] );
@@ -154,7 +154,7 @@ PyObject* PyUNO_callable_call (PyObject* self, PyObject* args, PyObject*)
     }
     catch( com::sun::star::reflection::InvocationTargetException & e )
     {
-
+        
         if( isLog( cargo, LogLevel::CALL ) )
         {
             logException( cargo, "except  py->uno[0x", me->members->xInvocation.get() ,
@@ -256,7 +256,7 @@ PyRef PyUNO_callable_new (
     enum ConversionMode mode )
 {
     PyUNO_callable* self;
-
+  
     self = PyObject_New (PyUNO_callable, &PyUNO_callable_Type);
     if (self == NULL)
         return NULL; //NULL == Error!
diff --git a/pyuno/source/module/pyuno_dlopenwrapper.c b/pyuno/source/module/pyuno_dlopenwrapper.c
index 1ace0442ced6..0927bcb20652 100644
--- a/pyuno/source/module/pyuno_dlopenwrapper.c
+++ b/pyuno/source/module/pyuno_dlopenwrapper.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ void initpyuno ()
     Dl_info dl_info;
     void (*func)(void);
 
-    if (dladdr((void*)&initpyuno, &dl_info) != 0) {
+    if (dladdr((void*)&initpyuno, &dl_info) != 0) { 
         void* h = 0;
     size_t len = strrchr(dl_info.dli_fname, '/') - dl_info.dli_fname + 1;
     char* libname = malloc(len + RTL_CONSTASCII_LENGTH( SAL_DLLPREFIX "pyuno" SAL_DLLEXTENSION ) + 1);
@@ -57,7 +57,7 @@ void initpyuno ()
             func = (void (*)())dlsym (h, "initpyuno");
             (func) ();
         }
-    }
+    } 
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/pyuno/source/module/pyuno_except.cxx b/pyuno/source/module/pyuno_except.cxx
index e276be6ee451..0a2f70ad10ee 100644
--- a/pyuno/source/module/pyuno_except.cxx
+++ b/pyuno/source/module/pyuno_except.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -60,7 +60,7 @@ void raisePyExceptionWithAny( const com::sun::star::uno::Any &anyExc )
         {
             com::sun::star::uno::Exception e;
             anyExc >>= e;
-
+            
             OUStringBuffer buf;
             buf.appendAscii( "Couldn't convert uno exception to a python exception (" );
             buf.append(anyExc.getValueType().getTypeName());
@@ -165,7 +165,7 @@ static PyRef createClass( const OUString & name, const Runtime &runtime )
     PyTuple_SetItem( args.get(), 0, pyTypeName.getAcquired());
     PyTuple_SetItem( args.get(), 1, bases.getAcquired() );
     PyTuple_SetItem( args.get(), 2, PyDict_New() );
-
+    
     PyRef ret(
         PyObject_CallObject(reinterpret_cast<PyObject *>(&PyClass_Type) , args.get()),
         SAL_NO_ACQUIRE );
@@ -184,7 +184,7 @@ static PyRef createClass( const OUString & name, const Runtime &runtime )
         PyRef getter = getObjectFromUnoModule( runtime,"_uno_struct__getattr__" );
         PyRef repr = getObjectFromUnoModule( runtime,"_uno_struct__repr__" );
         PyRef eq = getObjectFromUnoModule( runtime,"_uno_struct__eq__" );
-
+        
         PyObject_SetAttrString(
             ret.get(), const_cast< char * >("__pyunostruct__"),
             ustring2PyString(name).get() );
@@ -225,7 +225,7 @@ sal_Bool isInterfaceClass( const Runtime &runtime, PyObject * obj )
 PyRef getClass( const OUString & name , const Runtime &runtime)
 {
     PyRef ret;
-
+    
     RuntimeCargo *cargo =runtime.getImpl()->cargo;
     ExceptionClassMap::iterator ii = cargo->exceptionMap.find( name );
     if( ii == cargo->exceptionMap.end() )
@@ -235,7 +235,7 @@ PyRef getClass( const OUString & name , const Runtime &runtime)
         if( PyObject_HasAttrString(
                 ret.get(), const_cast< char * >("__pyunointerface__") ) )
             cargo->interfaceSet.insert( ret );
-
+        
         PyObject_SetAttrString(
             ret.get(), const_cast< char * >("__pyunointerface__"),
             ustring2PyString(name).get() );
diff --git a/pyuno/source/module/pyuno_gc.cxx b/pyuno/source/module/pyuno_gc.cxx
index 77eb6885d04e..4c558321aeaa 100644
--- a/pyuno/source/module/pyuno_gc.cxx
+++ b/pyuno/source/module/pyuno_gc.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ class GCThread : public ::osl::Thread
     PyInterpreterState *mPyInterpreter;
     GCThread( const GCThread & ); // not implemented
     GCThread &operator =( const GCThread & ); // not implemented
-
+    
 public:
     GCThread( PyInterpreterState *interpreter, PyObject * object );
     virtual void SAL_CALL run();
@@ -83,7 +83,7 @@ void GCThread::run()
             {
                 runtime.getImpl()->cargo->mappedObjects.erase( ii );
             }
-
+            
             Py_XDECREF( mPyObject );
         }
     }
diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
index 537120e2457a..2d0d246e6490 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -132,7 +132,7 @@ PyRef ustring2PyUnicode( const rtl::OUString &source );
 PyRef ustring2PyString( const ::rtl::OUString & source );
 rtl::OUString pyString2ustring( PyObject *str );
 
-
+    
 PyRef AnyToPyObject (const com::sun::star::uno::Any & a, const Runtime &r )
     throw ( com::sun::star::uno::RuntimeException );
 
@@ -244,7 +244,7 @@ public:
     PyRef getWrappedObject() { return mWrappedObject; }
     com::sun::star::uno::Sequence< com::sun::star::uno::Type > getWrappedTypes() { return mTypes; }
     virtual ~Adapter();
-
+    
     // XInvocation
     virtual com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess >
            SAL_CALL getIntrospection(  ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index 7a9327894c21..669a39c3160e 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -165,7 +165,7 @@ static PyObject* getComponentContext (PyObject*, PyObject*)
                     "file for bootstrapping python uno bridge\n" );
                 return NULL;
             }
-
+            
             OUStringBuffer iniFileName;
             iniFileName.append( path );
             iniFileName.appendAscii( "/" );
@@ -180,11 +180,11 @@ static PyObject* getComponentContext (PyObject*, PyObject*)
             }
             else
             {
-                // defaulting to the standard bootstrapping
+                // defaulting to the standard bootstrapping 
                 PyThreadDetach antiguard;
                 ctx = cppu::defaultBootstrap_InitialComponentContext ();
             }
-
+            
         }
 
         if( ! Runtime::isInitialized() )
@@ -252,7 +252,7 @@ static PyObject *createUnoStructHelper(PyObject *, PyObject* args )
         {
             PyObject *structName = PyTuple_GetItem( args,0 );
             PyObject *initializer = PyTuple_GetItem( args ,1 );
-
+            
             if( PyString_Check( structName ) )
             {
                 if( PyTuple_Check( initializer ) )
@@ -368,7 +368,7 @@ static PyObject *getConstantByName( PyObject *, PyObject *args )
     try
     {
         char *name;
-
+        
         if (PyArg_ParseTuple (args, const_cast< char * >("s"), &name))
         {
             OUString typeName ( OUString::createFromAscii( name ) );
@@ -391,7 +391,7 @@ static PyObject *getConstantByName( PyObject *, PyObject *args )
     catch( NoSuchElementException & e )
     {
         // to the python programmer, this is a runtime exception,
-        // do not support tweakings with the type system
+        // do not support tweakings with the type system 
         RuntimeException runExc( e.Message, Reference< XInterface > () );
         raisePyExceptionWithAny( makeAny( runExc ) );
     }
@@ -420,7 +420,7 @@ static PyObject *checkType( PyObject *, PyObject *args )
         return NULL;
     }
     PyObject *obj = PyTuple_GetItem( args, 0 );
-
+    
     try
     {
         PyType2Type( obj );
@@ -444,7 +444,7 @@ static PyObject *checkEnum( PyObject *, PyObject *args )
         return NULL;
     }
     PyObject *obj = PyTuple_GetItem( args, 0 );
-
+    
     try
     {
         PyEnum2Enum( obj );
@@ -456,7 +456,7 @@ static PyObject *checkEnum( PyObject *, PyObject *args )
     }
     Py_INCREF( Py_None );
     return Py_None;
-}
+}    
 
 static PyObject *getClass( PyObject *, PyObject *args )
 {
@@ -581,7 +581,7 @@ static PyObject * absolutize( PyObject *, PyObject * args )
             buf.appendAscii( " for reason (" );
             buf.append( (sal_Int32) e );
             buf.appendAscii( ")" );
-
+                
             PyErr_SetString(
                 PyExc_OSError,
                 OUStringToOString(buf.makeStringAndClear(),osl_getThreadTextEncoding()));
@@ -654,17 +654,17 @@ static PyObject *setCurrentContext( PyObject *, PyObject * args )
     {
         if( PyTuple_Check( args ) && PyTuple_Size( args ) == 1 )
         {
-
+            
             Runtime runtime;
             Any a = runtime.pyObject2Any( PyTuple_GetItem( args, 0 ) );
-
+            
             Reference< com::sun::star::uno::XCurrentContext > context;
-
+            
             if( (a.hasValue() && (a >>= context)) || ! a.hasValue() )
             {
                 ret = com::sun::star::uno::setCurrentContext( context ) ? Py_True : Py_False;
             }
-            else
+            else 
             {
                 OStringBuffer buf;
                 buf.append( "uno.setCurrentContext expects an XComponentContext implementation, got " );
@@ -690,7 +690,7 @@ static PyObject *setCurrentContext( PyObject *, PyObject * args )
 
 struct PyMethodDef PyUNOModule_methods [] =
 {
-    {const_cast< char * >("getComponentContext"), getComponentContext, 1, NULL},
+    {const_cast< char * >("getComponentContext"), getComponentContext, 1, NULL}, 
     {const_cast< char * >("_createUnoStructHelper"), createUnoStructHelper, 2, NULL},
     {const_cast< char * >("getTypeByName"), getTypeByName, 1, NULL},
     {const_cast< char * >("getConstantByName"), getConstantByName,1, NULL},
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index f796b034373d..326bd4f6b909 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -201,9 +201,9 @@ static void readLoggingConfig( sal_Int32 *pLevel, FILE **ppFile )
         if( bootstrapHandle.getFrom( USTR_ASCII( "PYUNO_LOGTARGET" ), str ) )
         {
             if( str.equalsAscii( "stdout" ) )
-                *ppFile = stdout;
+                *ppFile = stdout; 
             else if( str.equalsAscii( "stderr" ) )
-                *ppFile = stderr;
+                *ppFile = stderr; 
             else
             {
                 oslProcessInfo data;
@@ -214,18 +214,18 @@ static void readLoggingConfig( sal_Int32 *pLevel, FILE **ppFile )
                 OString o = OUStringToOString( str, osl_getThreadTextEncoding() );
                 o += ".";
                 o += OString::valueOf( (sal_Int32)data.Ident );
-
+                
                 *ppFile = fopen( o.getStr() , "w" );
                 if ( *ppFile )
                 {
                     // do not buffer (useful if e.g. analyzing a crash)
-                    setvbuf( *ppFile, 0, _IONBF, 0 );
+                    setvbuf( *ppFile, 0, _IONBF, 0 ); 
                 }
                 else
                 {
                     fprintf( stderr, "couldn't create file %s\n",
                              OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr() );
-
+                    
                 }
             }
         }
@@ -249,7 +249,7 @@ PyRef stRuntimeImpl::create( const Reference< XComponentContext > &ctx )
     RuntimeCargo *c = new RuntimeCargo();
     readLoggingConfig( &(c->logLevel) , &(c->logFile) );
     log( c, LogLevel::CALL, "Instantiating pyuno bridge" );
-
+    
     c->valid = 1;
     c->xContext = ctx;
     c->xInvocation = Reference< XSingleServiceFactory > (
@@ -301,7 +301,7 @@ PyRef stRuntimeImpl::create( const Reference< XComponentContext > &ctx )
         throw RuntimeException(
             OUString( RTL_CONSTASCII_USTRINGPARAM( "pyuno: couldn't instantiate introspection service" )),
             Reference< XInterface > () );
-
+    
     Any a = ctx->getValueByName(OUString(
         RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.reflection.theTypeDescriptionManager" )) );
     a >>= c->xTdMgr;
@@ -309,7 +309,7 @@ PyRef stRuntimeImpl::create( const Reference< XComponentContext > &ctx )
         throw RuntimeException(
             OUString( RTL_CONSTASCII_USTRINGPARAM( "pyuno: couldn't retrieve typedescriptionmanager" )),
             Reference< XInterface > () );
-
+            
     me->cargo =c;
     return PyRef( reinterpret_cast< PyObject * > ( me ), SAL_NO_ACQUIRE );
 }
@@ -330,7 +330,7 @@ void Runtime::initialize( const Reference< XComponentContext > & ctx )
     PyRef globalDict, runtime;
     getRuntimeImpl( globalDict , runtime );
     RuntimeImpl *impl = reinterpret_cast< RuntimeImpl * > (runtime.get());
-
+    
     if( runtime.is() && impl->cargo->valid )
     {
         throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM(
@@ -415,7 +415,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const
             "pyuno runtime must be initialized before calling any2PyObject" )),
                                 Reference< XInterface > () );
     }
-
+    
     switch (a.getValueTypeClass ())
     {
     case typelib_TypeClass_VOID:
@@ -432,7 +432,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const
     {
         sal_Bool b = sal_Bool();
         if ((a >>= b) && b)
-            return Py_True;
+            return Py_True; 
         else
             return Py_False;
     }
@@ -542,7 +542,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const
         {
             // add the message in a standard python way !
             PyRef args( PyTuple_New( 1 ), SAL_NO_ACQUIRE );
-
+            
             // assuming that the Message is always the first member, wuuuu
             void *pData = (void*)a.getValue();
             OUString message = *(OUString * )pData;
@@ -740,7 +740,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
     else
     {
         Runtime runtime;
-        // should be removed, in case ByteSequence gets derived from String
+        // should be removed, in case ByteSequence gets derived from String 
         if( PyObject_IsInstance( o, getByteSequenceClass( runtime ).get() ) )
         {
             PyRef str(PyObject_GetAttrString( o , const_cast< char * >("value") ),SAL_NO_ACQUIRE);
@@ -750,7 +750,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
                 seq = Sequence<sal_Int8 > (
                     (sal_Int8*) PyString_AsString(str.get()), PyString_Size(str.get()));
             }
-            a <<= seq;
+            a <<= seq;                                                          
         }
         else
         if( PyObject_IsInstance( o, getTypeClass( runtime ).get() ) )
@@ -836,7 +836,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
         {
             Reference< XInterface > mappedObject;
             Reference< XInvocation > adapterObject;
-
+            
             // instance already mapped out to the world ?
             PyRef2Adapter::iterator ii = impl->cargo->mappedObjects.find( PyRef( o ) );
             if( ii != impl->cargo->mappedObjects.end() )
@@ -848,25 +848,25 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
             {
                 // object got already bridged !
                 Reference< com::sun::star::lang::XUnoTunnel > tunnel( adapterObject, UNO_QUERY );
-
+                
                 Adapter *pAdapter = ( Adapter * )
                     sal::static_int_cast< sal_IntPtr >(
                         tunnel->getSomething(
                             ::pyuno::Adapter::getUnoTunnelImplementationId() ) );
-
+                
                 mappedObject = impl->cargo->xAdapterFactory->createAdapter(
                     adapterObject, pAdapter->getWrappedTypes() );
             }
-            else
+            else 
             {
                 Sequence< Type > interfaces = invokeGetTypes( *this, o );
                 if( interfaces.getLength() )
                 {
                     Adapter *pAdapter = new Adapter( o, interfaces );
-                    mappedObject =
+                    mappedObject = 
                         getImpl()->cargo->xAdapterFactory->createAdapter(
                             pAdapter, interfaces );
-
+                    
                     // keep a list of exported objects to ensure object identity !
                     impl->cargo->mappedObjects[ PyRef(o) ] =
                         com::sun::star::uno::WeakReference< XInvocation > ( pAdapter );
@@ -901,7 +901,7 @@ Any Runtime::extractUnoException( const PyRef & excType, const PyRef &excValue,
         {
             PyRef extractTraceback(
                 PyDict_GetItemString(unoModule.get(),"_uno_extract_printable_stacktrace" ) );
-
+            
             if( extractTraceback.is() )
             {
                 PyRef args( PyTuple_New( 1), SAL_NO_ACQUIRE );
@@ -928,7 +928,7 @@ Any Runtime::extractUnoException( const PyRef & excType, const PyRef &excValue,
         // it may occur, that no traceback is given (e.g. only native code below)
         str = PyRef( PyString_FromString( "no traceback available" ), SAL_NO_ACQUIRE);
     }
-
+    
     if( isInstanceOfStructOrException( excValue.get() ) )
     {
         ret = pyObject2Any( excValue );
@@ -1020,7 +1020,7 @@ PyThreadAttach::~PyThreadAttach()
     PyThreadState_Clear( tstate );
     PyEval_ReleaseThread( tstate );
     PyThreadState_Delete( tstate );
-
+    
 }
 
 PyThreadDetach::PyThreadDetach() throw ( com::sun::star::uno::RuntimeException )
@@ -1044,7 +1044,7 @@ PyThreadDetach::~PyThreadDetach()
 
     // python requires C LC_NUMERIC locale,
     // always set even when it is already "C"
-    setlocale( LC_NUMERIC, "C" );
+    setlocale( LC_NUMERIC, "C" );    
 }
 
 
diff --git a/pyuno/source/module/pyuno_type.cxx b/pyuno/source/module/pyuno_type.cxx
index 3f9f00446101..206d053e4e7a 100644
--- a/pyuno/source/module/pyuno_type.cxx
+++ b/pyuno/source/module/pyuno_type.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -177,7 +177,7 @@ Any PyEnum2Enum( PyObject *obj ) throw ( RuntimeException )
             USTR_ASCII( "attributes typeName and/or value of uno.Enum are not strings" ),
             Reference< XInterface > () );
     }
-
+    
     OUString strTypeName( OUString::createFromAscii( PyString_AsString( typeName.get() ) ) );
     char *stringValue = PyString_AsString( value.get() );
 
@@ -193,9 +193,9 @@ Any PyEnum2Enum( PyObject *obj ) throw ( RuntimeException )
             buf.appendAscii( ", expected ENUM" );
             throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface>  () );
         }
-
+           
         desc.makeComplete();
-
+        
         typelib_EnumTypeDescription *pEnumDesc = (typelib_EnumTypeDescription*) desc.get();
         int i = 0;
         for( i = 0; i < pEnumDesc->nEnumValues ; i ++ )
@@ -377,7 +377,7 @@ static PyObject* callCtor( const Runtime &r , const char * clazz, const PyRef &
     PyRef instance( PyObject_CallObject( code.get(), args.get()  ), SAL_NO_ACQUIRE);
     Py_XINCREF( instance.get() );
     return instance.get();
-
+    
 }
 
 
@@ -401,11 +401,11 @@ PyObject* PyUNO_Type_new (const char *typeName , TypeClass t , const Runtime &r
     if( ! typeClass )
         return NULL;
     PyTuple_SetItem( args.get() , 1 , typeClass);
-
+    
     return callCtor( r, "Type" , args );
 }
 
-PyObject* PyUNO_char_new ( sal_Unicode val , const Runtime &r )
+PyObject* PyUNO_char_new ( sal_Unicode val , const Runtime &r ) 
 {
     // retrieve type object
     PyRef args( PyTuple_New( 1 ), SAL_NO_ACQUIRE );
@@ -427,7 +427,7 @@ PyObject *PyUNO_ByteSequence_new(
     PyRef args( PyTuple_New( 1 ), SAL_NO_ACQUIRE );
     PyTuple_SetItem( args.get() , 0 , str.getAcquired() );
     return callCtor( r, "ByteSequence" , args );
-
+    
 }
 }
 
diff --git a/pyuno/source/module/pyuno_util.cxx b/pyuno/source/module/pyuno_util.cxx
index ae645a7c32e4..fa53e7c53de6 100644
--- a/pyuno/source/module/pyuno_util.cxx
+++ b/pyuno/source/module/pyuno_util.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -198,7 +198,7 @@ void logReply(
     const char *intro,
     void * ptr,
     const rtl::OUString & aFunctionName,
-    const Any &returnValue,
+    const Any &returnValue, 
     const Sequence< Any > & aParams )
 {
     rtl::OUStringBuffer buf( 128 );
@@ -219,7 +219,7 @@ void logReply(
         }
     }
     log( cargo,LogLevel::CALL, buf.makeStringAndClear() );
-
+    
 }
 
 void logCall( RuntimeCargo *cargo, const char *intro,
diff --git a/pyuno/zipcore/python.cxx b/pyuno/zipcore/python.cxx
index 68991de1ff26..ee2f18ffb8fa 100644
--- a/pyuno/zipcore/python.cxx
+++ b/pyuno/zipcore/python.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -204,7 +204,7 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
         MultiByteToWideChar(CP_ACP, 0, argv[i], -1, buff, nNeededWStrBuffSize);
         buff[nNeededWStrBuffSize] = 0;
         cp = encode(cp, buff);
-        delete [] buff;
+        delete [] buff;        
 #else
         cp = encode(cp, argv[i]);
 #endif
diff --git a/pyuno/zipcore/python.sh b/pyuno/zipcore/python.sh
index d32158fe491e..219e7379ae86 100644
--- a/pyuno/zipcore/python.sh
+++ b/pyuno/zipcore/python.sh
@@ -2,7 +2,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 sd_cwd="`pwd`"
 if [ -h "$0" ] ; then
     sd_basename=`basename "$0"`
-     sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
+     sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"` 
     cd "`dirname "$0"`"
     cd "`dirname "$sd_script"`"
 else
diff --git a/rdbmaker/inc/codemaker/dependency.hxx b/rdbmaker/inc/codemaker/dependency.hxx
index bada8239de73..1bb496e079d1 100644
--- a/rdbmaker/inc/codemaker/dependency.hxx
+++ b/rdbmaker/inc/codemaker/dependency.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,38 +29,38 @@
 #ifndef _CODEMAKER_DEPENDENCY_HXX_
 #define _CODEMAKER_DEPENDENCY_HXX_
 
-#include    <hash_map>
-#include    <registry/registry.hxx>
-#include    <registry/reflread.hxx>
-#include    <codemaker/typemanager.hxx>
-#include    <codemaker/global.hxx>
+#include 	<hash_map>
+#include	<registry/registry.hxx>
+#include	<registry/reflread.hxx>
+#include	<codemaker/typemanager.hxx>
+#include	<codemaker/global.hxx>
 #include <osl/diagnose.h>
 
-#define TYPEUSE_NORMAL      0x0001
-#define TYPEUSE_SUPER       0x0002
-#define TYPEUSE_MEMBER      0x0004
-#define TYPEUSE_INPARAM     0x0008
-#define TYPEUSE_OUTPARAM    0x0010
-#define TYPEUSE_INOUTPARAM  0x0020
-#define TYPEUSE_RETURN      0x0040
-#define TYPEUSE_EXCEPTION   0x0080
-#define TYPEUSE_SCOPE       0x0100
+#define	TYPEUSE_NORMAL		0x0001
+#define	TYPEUSE_SUPER		0x0002
+#define	TYPEUSE_MEMBER		0x0004
+#define	TYPEUSE_INPARAM		0x0008
+#define	TYPEUSE_OUTPARAM 	0x0010
+#define	TYPEUSE_INOUTPARAM 	0x0020
+#define	TYPEUSE_RETURN		0x0040
+#define	TYPEUSE_EXCEPTION	0x0080
+#define	TYPEUSE_SCOPE       0x0100
 
 /**
  * Flag shows the state of the code generation. If the Flag is set
  * the code for this type is generated.
  */
-#define CODEGEN_DEFAULT     0x0001
+#define	CODEGEN_DEFAULT		0x0001
 
 struct TypeUsing
 {
     TypeUsing(const ::rtl::OString& type, sal_uInt16 use)
         : m_type(type)
-        , m_use(use)
+        , m_use(use) 
         {}
 
-    ::rtl::OString  m_type;
-    sal_uInt16      m_use;
+    ::rtl::OString 	m_type;
+    sal_uInt16		m_use;
 
     sal_Bool operator == (const TypeUsing & typeUsing) const
     {
@@ -77,41 +77,41 @@ struct LessTypeUsing
     }
 };
 
-typedef ::std::set< TypeUsing, LessTypeUsing > TypeUsingSet;
+typedef	::std::set< TypeUsing, LessTypeUsing > TypeUsingSet;
 
 
 #if (defined( _MSC_VER ) && ( _MSC_VER < 1200 ))
-typedef ::std::__hash_map__
-<
-    ::rtl::OString,
-    TypeUsingSet,
-    HashString,
-    EqualString,
+typedef	::std::__hash_map__
+<	
+    ::rtl::OString, 
+    TypeUsingSet, 
+    HashString, 
+    EqualString, 
     NewAlloc
 > DependencyMap;
 
-typedef ::std::__hash_map__
-<
-    ::rtl::OString,
-    sal_uInt16,
-    HashString,
+typedef	::std::__hash_map__
+<	
+    ::rtl::OString, 
+    sal_uInt16, 
+    HashString, 
     EqualString,
     NewAlloc
 > GenerationMap;
 #else
-typedef ::std::hash_map
-<
-    ::rtl::OString,
-    TypeUsingSet,
-    HashString,
+typedef	::std::hash_map
+<	
+    ::rtl::OString, 
+    TypeUsingSet, 
+    HashString, 
     EqualString
 > DependencyMap;
 
-typedef ::std::hash_map
-<
-    ::rtl::OString,
-    sal_uInt16,
-    HashString,
+typedef	::std::hash_map
+<	
+    ::rtl::OString, 
+    sal_uInt16, 
+    HashString, 
     EqualString
 > GenerationMap;
 
@@ -123,10 +123,10 @@ struct TypeDependencyImpl
         : m_refCount(0)
         {}
 
-    sal_Int32       m_refCount;
-    DependencyMap   m_dependencies;
-    GenerationMap   m_generatedTypes;
-};
+    sal_Int32		m_refCount;
+    DependencyMap	m_dependencies;
+    GenerationMap	m_generatedTypes;
+};	
 
 class TypeDependency
 {
@@ -148,12 +148,12 @@ public:
         return *this;
     }
 
-    sal_Bool        insert(const ::rtl::OString& type, const ::rtl::OString& depend, sal_uInt16);
-    TypeUsingSet    getDependencies(const ::rtl::OString& type);
-    sal_Bool        hasDependencies(const ::rtl::OString& type);
+    sal_Bool 		insert(const ::rtl::OString& type, const ::rtl::OString& depend, sal_uInt16);
+    TypeUsingSet	getDependencies(const ::rtl::OString& type);
+    sal_Bool		hasDependencies(const ::rtl::OString& type);
 
-    void        setGenerated(const ::rtl::OString& type, sal_uInt16 genFlag=CODEGEN_DEFAULT);
-    sal_Bool    isGenerated(const ::rtl::OString& type, sal_uInt16 genFlag=CODEGEN_DEFAULT);
+    void		setGenerated(const ::rtl::OString& type, sal_uInt16 genFlag=CODEGEN_DEFAULT);
+    sal_Bool	isGenerated(const ::rtl::OString& type, sal_uInt16 genFlag=CODEGEN_DEFAULT);
 
     sal_Int32 getSize() { return m_pImpl->m_generatedTypes.size(); }
 protected:
@@ -161,11 +161,11 @@ protected:
     void release();
 
 protected:
-    TypeDependencyImpl* m_pImpl;
+    TypeDependencyImpl*	m_pImpl;
 };
 
 sal_Bool checkTypeDependencies(TypeManager& typeMgr, TypeDependency& dependencies, const ::rtl::OString& type, sal_Bool bDepend = sal_False);
-
+    
 #endif // _CODEMAKER_DEPENDENCY_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/inc/codemaker/global.hxx b/rdbmaker/inc/codemaker/global.hxx
index 9ee538fc9f61..5f37495e5271 100644
--- a/rdbmaker/inc/codemaker/global.hxx
+++ b/rdbmaker/inc/codemaker/global.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,8 +34,8 @@
 #include <set>
 
 #include <stdio.h>
-#include <rtl/ustring.hxx>
-#include <rtl/strbuf.hxx>
+#include <rtl/ustring.hxx>	
+#include <rtl/strbuf.hxx>	
 
 struct EqualString
 {
@@ -66,9 +66,9 @@ typedef ::std::new_alloc NewAlloc;
 #endif
 
 
-typedef ::std::list< ::rtl::OString >               StringList;
-typedef ::std::vector< ::rtl::OString >             StringVector;
-typedef ::std::set< ::rtl::OString, LessString >    StringSet;
+typedef ::std::list< ::rtl::OString > 				StringList;
+typedef ::std::vector< ::rtl::OString > 			StringVector;
+typedef ::std::set< ::rtl::OString, LessString > 	StringSet;
 
 ::rtl::OString makeTempName();
 
@@ -92,15 +92,15 @@ enum FileAccessMode
 class FileStream //: public ofstream
 {
 public:
-    FileStream();
+    FileStream();	
     virtual ~FileStream();
-
+    
     sal_Bool isValid();
 
     void open(const ::rtl::OString& name, FileAccessMode nMode = FAM_READWRITE);
     void close();
 
-    ::rtl::OString  getName() { return m_name; }
+    ::rtl::OString 	getName() { return m_name; }
 
     // friend functions
     friend FileStream &operator<<(FileStream& o, sal_uInt32 i)
@@ -130,7 +130,7 @@ public:
 
 protected:
     const sal_Char* checkAccessMode(FileAccessMode mode);
-
+    
     FILE*               m_pFile;
     ::rtl::OString      m_name;
 };
diff --git a/rdbmaker/inc/codemaker/options.hxx b/rdbmaker/inc/codemaker/options.hxx
index 05cfcfc64265..bcf171b80c99 100644
--- a/rdbmaker/inc/codemaker/options.hxx
+++ b/rdbmaker/inc/codemaker/options.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,24 +29,24 @@
 #ifndef _CODEMAKER_OPTIONS_HXX_
 #define _CODEMAKER_OPTIONS_HXX_
 
-#include    <hash_map>
-#include    <codemaker/global.hxx>
+#include	<hash_map>
+#include	<codemaker/global.hxx>
 
 #if defined( _MSC_VER ) && ( _MSC_VER < 1200 )
-typedef ::std::__hash_map__
-<
-    ::rtl::OString,
-    ::rtl::OString,
-    HashString,
-    EqualString,
+typedef	::std::__hash_map__
+<	
+    ::rtl::OString, 
+    ::rtl::OString, 
+    HashString, 
+    EqualString, 
     NewAlloc
 > OptionMap;
 #else
-typedef ::std::hash_map
-<
-    ::rtl::OString,
-    ::rtl::OString,
-    HashString,
+typedef	::std::hash_map
+<	
+    ::rtl::OString, 
+    ::rtl::OString, 
+    HashString, 
     EqualString
 > OptionMap;
 #endif
@@ -57,7 +57,7 @@ public:
     CannotDumpException(const ::rtl::OString& msg)
         : m_message(msg) {}
 
-    ::rtl::OString  m_message;
+    ::rtl::OString	m_message;	
 };
 
 
@@ -67,7 +67,7 @@ public:
     IllegalArgument(const ::rtl::OString& msg)
         : m_message(msg) {}
 
-    ::rtl::OString  m_message;
+    ::rtl::OString	m_message;	
 };
 
 
@@ -77,24 +77,24 @@ public:
     Options();
     virtual ~Options();
 
-    virtual sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
+    virtual sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) 
         throw( IllegalArgument ) = 0;
 
-    virtual ::rtl::OString  prepareHelp() = 0;
+    virtual ::rtl::OString	prepareHelp() = 0;
 
-    const ::rtl::OString&   getProgramName() const;
-    sal_Bool                isValid(const ::rtl::OString& option);
-    const ::rtl::OString    getOption(const ::rtl::OString& option)
+    const ::rtl::OString&	getProgramName() const;
+    sal_Bool				isValid(const ::rtl::OString& option);
+    const ::rtl::OString	getOption(const ::rtl::OString& option)
         throw( IllegalArgument );
 
     const StringVector& getInputFiles();
 
 protected:
-    ::rtl::OString  m_program;
-    StringVector    m_inputFiles;
-    OptionMap       m_options;
+    ::rtl::OString 	m_program;
+    StringVector	m_inputFiles;
+    OptionMap		m_options;
 };
-
+    
 #endif // _CODEMAKER_OPTIONS_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/inc/codemaker/registry.hxx b/rdbmaker/inc/codemaker/registry.hxx
index 7686cc5a6fd8..6c89a49e3b59 100644
--- a/rdbmaker/inc/codemaker/registry.hxx
+++ b/rdbmaker/inc/codemaker/registry.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,15 +31,15 @@
 
 #include <rtl/alloc.h>
 #include <osl/interlck.h>
-#include    <registry/registry.hxx>
+#include	<registry/registry.hxx>
 #include "registry/reader.hxx"
 #include "registry/version.h"
-#include    <codemaker/options.hxx>
+#include	<codemaker/options.hxx>
 
 struct TypeReader_Impl
 {
-    TypeReader_Impl(const sal_uInt8* buffer,
-                       sal_uInt32 bufferLen,
+    TypeReader_Impl(const sal_uInt8* buffer, 
+                       sal_uInt32 bufferLen, 
                        sal_Bool copyData)
         : m_refCount(0)
         , m_copyData(copyData)
@@ -68,19 +68,19 @@ struct TypeReader_Impl
             }
         }
 
-    sal_Int32           m_refCount;
-    sal_Bool            m_copyData;
-    sal_Int32           m_blopSize;
-    const sal_uInt8*    m_pBlop;
-    typereg::Reader*    m_pReader;
-};
+    sal_Int32			m_refCount;
+    sal_Bool			m_copyData;
+    sal_Int32			m_blopSize;
+    const sal_uInt8* 	m_pBlop;
+    typereg::Reader*	m_pReader;
+};	
 
 class TypeReader
 {
 /*
     inline TypeReader(const RegistryTypeReader_Api* pApi,
-                              const sal_uInt8* buffer,
-                              sal_uInt32 bufferLen,
+                              const sal_uInt8* buffer, 
+                              sal_uInt32 bufferLen, 
                               sal_Bool copyData);
 */
 public:
@@ -88,8 +88,8 @@ public:
         : m_pImpl(NULL)
     {}
 
-    inline TypeReader(        const sal_uInt8* buffer,
-                              sal_uInt32 bufferLen,
+    inline TypeReader(        const sal_uInt8* buffer, 
+                              sal_uInt32 bufferLen, 
                               sal_Bool copyData)
     {
         m_pImpl = new TypeReader_Impl(buffer, bufferLen, copyData);
@@ -98,23 +98,23 @@ public:
 
     inline TypeReader(const TypeReader& toCopy)
         : m_pImpl(toCopy.m_pImpl)
-    {
+    { 
         acquire();
     }
 
     inline ~TypeReader()
-    {
+    { 
         release();
-    }
+    }    
 
     inline void acquire()
-    {
+    { 
         if (m_pImpl)
             osl_incrementInterlockedCount(&m_pImpl->m_refCount);
     }
 
     inline void release()
-    {
+    { 
         if (m_pImpl && 0 == osl_decrementInterlockedCount(&m_pImpl->m_refCount))
         {
             delete m_pImpl;
@@ -129,70 +129,70 @@ public:
         return *this;
     }
 
-    inline sal_Bool         isValid() const
-        {
+    inline sal_Bool			isValid() const 
+        { 
             if (m_pImpl)
                 return m_pImpl->m_pReader->isValid();
             else
                 return sal_False;
         }
 
-    inline RTTypeClass              getTypeClass() const
+    inline RTTypeClass 				getTypeClass() const
         { return m_pImpl->m_pReader->getTypeClass(); }
-    inline const ::rtl::OString     getTypeName() const
+    inline const ::rtl::OString 	getTypeName() const
         { return inGlobalSet( m_pImpl->m_pReader->getTypeName() ); }
     inline sal_uInt16 getSuperTypeCount() const
         { return m_pImpl->m_pReader->getSuperTypeCount(); }
-    inline const ::rtl::OString     getSuperTypeName(sal_uInt16 index) const
+    inline const ::rtl::OString 	getSuperTypeName(sal_uInt16 index) const
         { return inGlobalSet( m_pImpl->m_pReader->getSuperTypeName(index) ); }
-    inline const ::rtl::OString     getDoku() const
+    inline const ::rtl::OString 	getDoku() const
         { return inGlobalSet( m_pImpl->m_pReader->getDocumentation() ); }
-    inline const ::rtl::OString     getFileName() const
+    inline const ::rtl::OString 	getFileName() const
         { return inGlobalSet( m_pImpl->m_pReader->getFileName() ); }
-    inline sal_uInt32               getFieldCount() const
+    inline sal_uInt32				getFieldCount() const
         { return m_pImpl->m_pReader->getFieldCount(); }
-    inline const ::rtl::OString     getFieldName( sal_uInt16 index ) const
+    inline const ::rtl::OString 	getFieldName( sal_uInt16 index ) const
         { return inGlobalSet( m_pImpl->m_pReader->getFieldName(index) ); }
-    inline const ::rtl::OString     getFieldType( sal_uInt16 index ) const
+    inline const ::rtl::OString		getFieldType( sal_uInt16 index ) const
         { return inGlobalSet( m_pImpl->m_pReader->getFieldTypeName(index) ); }
-    inline RTFieldAccess            getFieldAccess( sal_uInt16 index ) const
+    inline RTFieldAccess			getFieldAccess( sal_uInt16 index ) const
         { return m_pImpl->m_pReader->getFieldFlags(index); }
-    inline RTConstValue             getFieldConstValue( sal_uInt16 index ) const
+    inline RTConstValue				getFieldConstValue( sal_uInt16 index ) const
         { return m_pImpl->m_pReader->getFieldValue(index); }
-    inline const ::rtl::OString     getFieldDoku( sal_uInt16 index ) const
+    inline const ::rtl::OString 	getFieldDoku( sal_uInt16 index ) const
         { return inGlobalSet( m_pImpl->m_pReader->getFieldDocumentation(index) ); }
-    inline const ::rtl::OString     getFieldFileName( sal_uInt16 index ) const
+    inline const ::rtl::OString 	getFieldFileName( sal_uInt16 index ) const
         { return inGlobalSet( m_pImpl->m_pReader->getFieldFileName(index) ); }
-    inline sal_uInt32               getMethodCount() const
+    inline sal_uInt32				getMethodCount() const
         { return m_pImpl->m_pReader->getMethodCount(); }
-    inline const ::rtl::OString     getMethodName( sal_uInt16 index ) const
+    inline const ::rtl::OString 	getMethodName( sal_uInt16 index ) const
         { return inGlobalSet( m_pImpl->m_pReader->getMethodName(index) ); }
-    inline sal_uInt32               getMethodParamCount( sal_uInt16 index ) const
+    inline sal_uInt32    			getMethodParamCount( sal_uInt16 index ) const
         { return m_pImpl->m_pReader->getMethodParameterCount(index); }
-    inline const ::rtl::OString     getMethodParamType( sal_uInt16 index, sal_uInt16 paramIndex ) const
+    inline const ::rtl::OString 	getMethodParamType( sal_uInt16 index, sal_uInt16 paramIndex ) const
         { return inGlobalSet( m_pImpl->m_pReader->getMethodParameterTypeName(index,paramIndex) ); }
-    inline const ::rtl::OString     getMethodParamName( sal_uInt16 index, sal_uInt16 paramIndex ) const
+    inline const ::rtl::OString 	getMethodParamName( sal_uInt16 index, sal_uInt16 paramIndex ) const
         { return inGlobalSet( m_pImpl->m_pReader->getMethodParameterName(index,paramIndex) ); }
-    inline RTParamMode              getMethodParamMode( sal_uInt16 index, sal_uInt16 paramIndex ) const
+    inline RTParamMode				getMethodParamMode( sal_uInt16 index, sal_uInt16 paramIndex ) const
         { return m_pImpl->m_pReader->getMethodParameterFlags(index,paramIndex); }
-    inline sal_uInt32               getMethodExcCount( sal_uInt16 index ) const
+    inline sal_uInt32    			getMethodExcCount( sal_uInt16 index ) const
         { return m_pImpl->m_pReader->getMethodExceptionCount(index); }
-    inline const ::rtl::OString     getMethodExcType( sal_uInt16 index, sal_uInt16 excIndex ) const
+    inline const ::rtl::OString 	getMethodExcType( sal_uInt16 index, sal_uInt16 excIndex ) const
         { return inGlobalSet( m_pImpl->m_pReader->getMethodExceptionTypeName(index,excIndex) ); }
-    inline const ::rtl::OString     getMethodReturnType( sal_uInt16 index ) const
+    inline const ::rtl::OString 	getMethodReturnType( sal_uInt16 index ) const
         { return inGlobalSet( m_pImpl->m_pReader->getMethodReturnTypeName(index) ); }
-    inline RTMethodMode             getMethodMode( sal_uInt16 index ) const
+    inline RTMethodMode				getMethodMode( sal_uInt16 index ) const
         { return m_pImpl->m_pReader->getMethodFlags(index); }
-    inline const ::rtl::OString     getMethodDoku( sal_uInt16 index ) const
+    inline const ::rtl::OString 	getMethodDoku( sal_uInt16 index ) const
         { return inGlobalSet( m_pImpl->m_pReader->getMethodDocumentation(index) ); }
 
-    inline sal_uInt32               getReferenceCount() const
+    inline sal_uInt32				getReferenceCount() const
         { return m_pImpl->m_pReader->getReferenceCount(); }
-    inline const ::rtl::OString     getReferenceName( sal_uInt16 index ) const
+    inline const ::rtl::OString 	getReferenceName( sal_uInt16 index ) const
         { return inGlobalSet( m_pImpl->m_pReader->getReferenceTypeName(index) ); }
-    inline RTReferenceType          getReferenceType( sal_uInt16 index ) const
+    inline RTReferenceType			getReferenceType( sal_uInt16 index ) const
         { return m_pImpl->m_pReader->getReferenceSort(index); }
-    inline const ::rtl::OString     getReferenceDoku( sal_uInt16 index ) const
+    inline const ::rtl::OString 	getReferenceDoku( sal_uInt16 index ) const
         { return inGlobalSet( m_pImpl->m_pReader->getReferenceDocumentation(index) ); }
 
     inline sal_uInt32 getBlopSize() const
@@ -203,9 +203,9 @@ public:
 
 private:
     TypeReader_Impl* m_pImpl;
-};
-
+};		
 
+    
 #endif // _CODEMAKER_REGISTRY_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/inc/codemaker/typemanager.hxx b/rdbmaker/inc/codemaker/typemanager.hxx
index 2abfeacedc78..d19e4473a62f 100644
--- a/rdbmaker/inc/codemaker/typemanager.hxx
+++ b/rdbmaker/inc/codemaker/typemanager.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,31 +25,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include    <hash_map>
+#include	<hash_map>
 
 #ifndef _CODEMAKER_TYPEMANAGER_HXX_
 #define _CODEMAKER_TYPEMANAGER_HXX_
-#include    <codemaker/registry.hxx>
+#include	<codemaker/registry.hxx>
 
-typedef ::std::list< Registry* >    RegistryList;
+typedef ::std::list< Registry* > 	RegistryList;
 
 #if defined( _MSC_VER ) && ( _MSC_VER < 1200 )
-typedef ::std::__hash_map__
-<
+typedef	::std::__hash_map__
+<	
     ::rtl::OString, // Typename
-    RTTypeClass,    // TypeClass
-    HashString,
-    EqualString,
+    RTTypeClass, 	// TypeClass
+    HashString, 
+    EqualString, 
     NewAlloc
-> T2TypeClassMap;
+> T2TypeClassMap; 
 #else
-typedef ::std::hash_map
-<
+typedef	::std::hash_map
+<	
     ::rtl::OString, // Typename
-    RTTypeClass,    // TypeClass
-    HashString,
+    RTTypeClass, 	// TypeClass
+    HashString, 
     EqualString
-> T2TypeClassMap;
+> T2TypeClassMap; 
 #endif
 
 struct TypeManagerImpl
@@ -58,8 +58,8 @@ struct TypeManagerImpl
         : m_refCount(0)
         {}
 
-    sal_Int32       m_refCount;
-};
+    sal_Int32		m_refCount;
+};	
 
 class TypeManager
 {
@@ -89,12 +89,12 @@ public:
     virtual sal_Bool isValidType(const ::rtl::OString& /*name*/)
         { return sal_False; }
 
-    virtual RegistryKey getTypeKey(const ::rtl::OString& /*name*/)
+    virtual RegistryKey	getTypeKey(const ::rtl::OString& /*name*/)
         { return RegistryKey(); }
     virtual TypeReader getTypeReader(const ::rtl::OString& /*name*/)
         { return TypeReader(); }
-    virtual RTTypeClass getTypeClass(const ::rtl::OString& /*name*/)
-        { return RT_TYPE_INVALID; }
+    virtual RTTypeClass	getTypeClass(const ::rtl::OString& /*name*/)
+        { return RT_TYPE_INVALID; } 
 
     virtual void setBase(const ::rtl::OString& /*base*/) {}
     virtual ::rtl::OString getBase() { return ::rtl::OString(); }
@@ -113,16 +113,16 @@ struct RegistryTypeManagerImpl
 {
     RegistryTypeManagerImpl()
         : m_pMergedRegistry(NULL)
-        , m_base("/")
+        , m_base("/") 
         , m_isMerged(sal_False)
         {}
 
-    T2TypeClassMap  m_t2TypeClass;
-    RegistryList    m_registries;
-    Registry*       m_pMergedRegistry;
-    ::rtl::OString  m_base;
-    sal_Bool        m_isMerged;
-};
+    T2TypeClassMap	m_t2TypeClass;
+    RegistryList	m_registries;
+    Registry*		m_pMergedRegistry;
+    ::rtl::OString 	m_base;
+    sal_Bool		m_isMerged;	
+};	
 
 class RegistryTypeManager : public TypeManager
 {
@@ -148,20 +148,20 @@ public:
     using TypeManager::init;
     sal_Bool init(sal_Bool bMerge, const StringVector& regFiles);
 
-    sal_Bool    isValidType(const ::rtl::OString& name)
+    sal_Bool  	isValidType(const ::rtl::OString& name)
         { return searchTypeKey(name).isValid(); }
-    RegistryKey getTypeKey(const ::rtl::OString& name)
+    RegistryKey	getTypeKey(const ::rtl::OString& name)
         { return searchTypeKey(name); }
-    TypeReader  getTypeReader(const ::rtl::OString& name);
-    RTTypeClass getTypeClass(const ::rtl::OString& name);
+    TypeReader 	getTypeReader(const ::rtl::OString& name);
+    RTTypeClass	getTypeClass(const ::rtl::OString& name);
 
     void setBase(const ::rtl::OString& base);
     ::rtl::OString getBase() { return m_pImpl->m_base; }
 
     sal_Int32 getSize() { return m_pImpl->m_t2TypeClass.size(); }
 protected:
-    RegistryKey searchTypeKey(const ::rtl::OString& name);
-    void        freeRegistries();
+    RegistryKey	searchTypeKey(const ::rtl::OString& name);
+    void		freeRegistries();
 
     void acquire();
     void release();
@@ -169,7 +169,7 @@ protected:
 protected:
     RegistryTypeManagerImpl* m_pImpl;
 };
-
+    
 #endif // _CODEMAKER_TYPEMANAGER_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/codemaker/dependency.cxx b/rdbmaker/source/codemaker/dependency.cxx
index 866abb452d5d..cf31c5fa85a1 100644
--- a/rdbmaker/source/codemaker/dependency.cxx
+++ b/rdbmaker/source/codemaker/dependency.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,8 +27,8 @@
  ************************************************************************/
 
 #include <osl/interlck.h>
-#include    <rtl/alloc.h>
-#include    <codemaker/dependency.hxx>
+#include	<rtl/alloc.h>
+#include	<codemaker/dependency.hxx>
 
 using namespace rtl;
 
@@ -36,20 +36,20 @@ TypeDependency::TypeDependency()
 {
     m_pImpl = new TypeDependencyImpl();
     acquire();
-}
+}	
 
 TypeDependency::~TypeDependency()
 {
     release();
-}
+}	
 
 void TypeDependency::acquire()
-{
+{ 
     osl_incrementInterlockedCount(&m_pImpl->m_refCount);
 }
 
 void TypeDependency::release()
-{
+{ 
     if (0 == osl_decrementInterlockedCount(&m_pImpl->m_refCount))
     {
         delete m_pImpl;
@@ -59,7 +59,7 @@ void TypeDependency::release()
 sal_Bool TypeDependency::insert(const OString& type, const OString& depend, sal_uInt16 use)
 {
     sal_Bool ret =  sal_False;
-
+    
     if (type.getLength() > 0 && depend.getLength() > 0)
     {
         if (m_pImpl->m_dependencies.count(type) > 0)
@@ -81,9 +81,9 @@ sal_Bool TypeDependency::insert(const OString& type, const OString& depend, sal_
             m_pImpl->m_dependencies[type]=tmpSet;
         }
     }
-
-    return ret;
-}
+    
+    return ret;	
+}	
 
 TypeUsingSet TypeDependency::getDependencies(const OString& type)
 {
@@ -94,9 +94,9 @@ TypeUsingSet TypeDependency::getDependencies(const OString& type)
             return m_pImpl->m_dependencies[type];
         }
     }
-
+        
     return TypeUsingSet();
-}
+}	
 
 sal_Bool TypeDependency::hasDependencies(const OString& type)
 {
@@ -107,18 +107,18 @@ sal_Bool TypeDependency::hasDependencies(const OString& type)
             return sal_True;
         }
     }
-
-    return sal_False;
-}
+        
+    return sal_False;	
+}	
 
 void TypeDependency::setGenerated(const OString& type, sal_uInt16 genFlag)
 {
-//  m_pImpl->m_generatedTypes.insert(type);
+//	m_pImpl->m_generatedTypes.insert(type);
     if (m_pImpl->m_generatedTypes.count(type) > 0)
         m_pImpl->m_generatedTypes[type]= m_pImpl->m_generatedTypes[type] | genFlag;
     else
         m_pImpl->m_generatedTypes[type]=genFlag;
-}
+}	
 
 sal_Bool TypeDependency::isGenerated(const OString& type, sal_uInt16 genFlag)
 {
@@ -135,7 +135,7 @@ sal_Bool TypeDependency::isGenerated(const OString& type, sal_uInt16 genFlag)
     }
 
     return sal_False;
-}
+}	
 
 static sal_Bool checkFieldDependencies(TypeManager& typeMgr, TypeDependency& dependencies,
                                        TypeReader& reader, const OString& type)
@@ -144,21 +144,21 @@ static sal_Bool checkFieldDependencies(TypeManager& typeMgr, TypeDependency& dep
 
     if (count == 0 || reader.getTypeClass() == RT_TYPE_ENUM)
         return sal_True;
-
+        
     OString fieldType;
     for (sal_uInt16 i=0; i < count; i++)
     {
         fieldType = reader.getFieldType(i);
-
+        
         if (fieldType.getLength() > 0)
         {
             dependencies.insert(type, fieldType, TYPEUSE_MEMBER);
             checkTypeDependencies(typeMgr, dependencies, fieldType);
         }
     }
-
-    return sal_True;
-}
+    
+    return sal_True;		
+}	
 
 static sal_Bool checkMethodDependencies(TypeManager& typeMgr, TypeDependency& dependencies,
                                         TypeReader& reader, const OString& type)
@@ -167,19 +167,19 @@ static sal_Bool checkMethodDependencies(TypeManager& typeMgr, TypeDependency& de
 
     if (count == 0)
         return sal_True;
-
+        
     OString returnType, paramType, excType;
     sal_uInt32 paramCount = 0;
-    sal_uInt32 excCount = 0;
+    sal_uInt32 excCount = 0;	
     RTParamMode paramMode = RT_PARAM_INVALID;
     for (sal_uInt16 i=0; i < count; i++)
     {
         returnType = reader.getMethodReturnType(i);
-
+        
         dependencies.insert(type, returnType, TYPEUSE_RETURN);
         checkTypeDependencies(typeMgr, dependencies, returnType);
 
-        paramCount = reader.getMethodParamCount(i);
+        paramCount = reader.getMethodParamCount(i);		
         excCount = reader.getMethodExcCount(i);
 
         sal_uInt16 j;
@@ -187,7 +187,7 @@ static sal_Bool checkMethodDependencies(TypeManager& typeMgr, TypeDependency& de
         {
             paramType = reader.getMethodParamType(i, j);
             paramMode = reader.getMethodParamMode(i, j);
-
+            
             switch (paramMode)
             {
                 case RT_PARAM_IN:
@@ -205,18 +205,18 @@ static sal_Bool checkMethodDependencies(TypeManager& typeMgr, TypeDependency& de
 
             checkTypeDependencies(typeMgr, dependencies, paramType);
         }
-
+        
         for (j=0; j < excCount; j++)
         {
             excType = reader.getMethodExcType(i, j);
             dependencies.insert(type, excType, TYPEUSE_EXCEPTION);
             checkTypeDependencies(typeMgr, dependencies, excType);
         }
-
+        
     }
-
-    return sal_True;
-}
+    
+    return sal_True;		
+}	
 
 static sal_Bool checkReferenceDependencies(TypeManager& typeMgr, TypeDependency& dependencies,
                                            TypeReader& reader, const OString& type)
@@ -225,18 +225,18 @@ static sal_Bool checkReferenceDependencies(TypeManager& typeMgr, TypeDependency&
 
     if (count == 0)
         return sal_True;
-
+        
     OString referenceName;
     for (sal_uInt16 i=0; i < count; i++)
     {
         referenceName = reader.getReferenceName(i);
-
+        
         dependencies.insert(type, referenceName, TYPEUSE_NORMAL);
         checkTypeDependencies(typeMgr, dependencies, referenceName);
     }
-
-    return sal_True;
-}
+    
+    return sal_True;	
+}	
 
 sal_Bool checkTypeDependencies(TypeManager& typeMgr, TypeDependency& dependencies, const OString& type, sal_Bool bDepend)
 {
@@ -244,10 +244,10 @@ sal_Bool checkTypeDependencies(TypeManager& typeMgr, TypeDependency& dependencie
         return sal_False;
 
     if (dependencies.hasDependencies(type))
-        return sal_True;
+        return sal_True;		
 
     TypeReader reader = typeMgr.getTypeReader(type);
-
+    
     if ( !reader.isValid() )
     {
         if (type.equals("/"))
@@ -261,7 +261,7 @@ sal_Bool checkTypeDependencies(TypeManager& typeMgr, TypeDependency& dependencie
         checkFieldDependencies(typeMgr, dependencies, reader, type);
         return sal_True;
     }
-
+    
     for (sal_uInt16 i = 0; i < reader.getSuperTypeCount(); ++i) {
         OString superType(reader.getSuperTypeName(i));
         dependencies.insert(type, superType, TYPEUSE_SUPER);
@@ -273,8 +273,8 @@ sal_Bool checkTypeDependencies(TypeManager& typeMgr, TypeDependency& dependencie
         dependencies.insert(type, "com/sun/star/uno/RuntimeException", TYPEUSE_EXCEPTION);
         dependencies.insert(type, "com/sun/star/uno/TypeClass", TYPEUSE_NORMAL);
         checkTypeDependencies(typeMgr, dependencies, "com/sun/star/uno/RuntimeException", bDepend);
-    }
-
+    }	
+    
     checkFieldDependencies(typeMgr, dependencies, reader, type);
     checkMethodDependencies(typeMgr, dependencies, reader, type);
     checkReferenceDependencies(typeMgr, dependencies, reader, type);
@@ -295,9 +295,9 @@ sal_Bool checkTypeDependencies(TypeManager& typeMgr, TypeDependency& dependencie
             tmpBuf.append('/');
         } while( nPos != -1 );
     }
-
+    
     return sal_True;
-}
-
+}	
+    
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/codemaker/global.cxx b/rdbmaker/source/codemaker/global.cxx
index 1651abb20292..23f1d55adc33 100644
--- a/rdbmaker/source/codemaker/global.cxx
+++ b/rdbmaker/source/codemaker/global.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 #include <osl/process.h>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustring.hxx>
-#include    <osl/thread.h>
+#include 	<osl/thread.h>
 #include    <osl/file.hxx>
 
 #include <stdlib.h>
@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <unistd.h>
 #endif
-#include    <codemaker/global.hxx>
+#include	<codemaker/global.hxx>
 
 #ifdef SAL_UNX
 #define SEPARATOR '/'
diff --git a/rdbmaker/source/codemaker/options.cxx b/rdbmaker/source/codemaker/options.cxx
index 0d87f38d8786..587dcf383337 100644
--- a/rdbmaker/source/codemaker/options.cxx
+++ b/rdbmaker/source/codemaker/options.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,28 +26,28 @@
  *
  ************************************************************************/
 
-#include    <codemaker/options.hxx>
+#include	<codemaker/options.hxx>
 
 using namespace rtl;
 
 Options::Options()
 {
-}
+}	
 
 Options::~Options()
 {
-
+    
 }
 
 const OString& Options::getProgramName() const
 {
     return m_program;
-}
+}	
 
 sal_Bool Options::isValid(const OString& option)
 {
-    return (m_options.count(option) > 0);
-}
+    return (m_options.count(option) > 0);	
+}	
 
 const OString Options::getOption(const OString& option)
     throw( IllegalArgument )
@@ -63,8 +63,8 @@ const OString Options::getOption(const OString& option)
 
 const StringVector& Options::getInputFiles()
 {
-    return m_inputFiles;
-}
-
+    return m_inputFiles;	
+}	
+    
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/codemaker/typemanager.cxx b/rdbmaker/source/codemaker/typemanager.cxx
index 382e74135d5a..5570fe130045 100644
--- a/rdbmaker/source/codemaker/typemanager.cxx
+++ b/rdbmaker/source/codemaker/typemanager.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,30 +26,30 @@
  *
  ************************************************************************/
 
-#include    <rtl/alloc.h>
-#include    <osl/file.hxx>
-#include    <codemaker/typemanager.hxx>
+#include	<rtl/alloc.h>
+#include	<osl/file.hxx>
+#include	<codemaker/typemanager.hxx>
 
 using namespace rtl;
 
 TypeManager::TypeManager()
 {
     m_pImpl = new TypeManagerImpl();
-    acquire();
-}
+    acquire();	
+}	
 
 TypeManager::~TypeManager()
 {
     release();
-}
+}	
 
 sal_Int32 TypeManager::acquire()
-{
+{ 
     return osl_incrementInterlockedCount(&m_pImpl->m_refCount);
 }
 
 sal_Int32 TypeManager::release()
-{
+{ 
     sal_Int32 refCount = 0;
     if (0 == (refCount = osl_decrementInterlockedCount(&m_pImpl->m_refCount)) )
     {
@@ -61,33 +61,33 @@ sal_Int32 TypeManager::release()
 RegistryTypeManager::RegistryTypeManager()
 {
     m_pImpl = new RegistryTypeManagerImpl();
-    acquire();
-}
+    acquire();	
+}	
 
 RegistryTypeManager::~RegistryTypeManager()
 {
     release();
-}
+}	
 
 void RegistryTypeManager::acquire()
-{
+{ 
     TypeManager::acquire();
 }
 
 void RegistryTypeManager::release()
-{
+{ 
     if (0 == TypeManager::release())
     {
         if (m_pImpl->m_pMergedRegistry)
-        {
+        {	
             if (m_pImpl->m_pMergedRegistry->isValid())
             {
                 m_pImpl->m_pMergedRegistry->destroy(OUString());
             }
-
+            
             delete m_pImpl->m_pMergedRegistry;
         }
-
+        
         if (m_pImpl->m_registries.size() > 0)
         {
             freeRegistries();
@@ -100,7 +100,7 @@ void RegistryTypeManager::release()
 sal_Bool RegistryTypeManager::init(sal_Bool bMerged, const StringVector& regFiles)
 {
     m_pImpl->m_isMerged = bMerged && (regFiles.size() > 1);
-
+    
     if (regFiles.empty())
         return sal_False;
 
@@ -126,12 +126,12 @@ sal_Bool RegistryTypeManager::init(sal_Bool bMerged, const StringVector& regFile
         osl::FileBase::createTempFile(0, 0, &tmpName);
         if (!pTmpReg->create(tmpName))
         {
-            RegistryKey rootKey;
+            RegistryKey rootKey;	
             RegError ret = REG_NO_ERROR;
             OUString aRoot( RTL_CONSTASCII_USTRINGPARAM("/") );
             iter = regFiles.begin();
             pTmpReg->openRootKey(rootKey);
-
+            
             while (iter != regFiles.end())
             {
                 if ( (ret = pTmpReg->mergeKey(rootKey, aRoot, convertToFileUrl( *iter ))) )
@@ -147,7 +147,7 @@ sal_Bool RegistryTypeManager::init(sal_Bool bMerged, const StringVector& regFile
                 }
                 iter++;
             }
-
+            
             m_pImpl->m_pMergedRegistry = pTmpReg;
             freeRegistries();
         } else
@@ -157,76 +157,76 @@ sal_Bool RegistryTypeManager::init(sal_Bool bMerged, const StringVector& regFile
             return sal_False;
         }
     }
-
+    
     return sal_True;
-}
+}	
 
 TypeReader RegistryTypeManager::getTypeReader(const OString& name)
 {
     TypeReader reader;
     RegistryKey key(searchTypeKey(name));
-
+    
     if (key.isValid())
     {
-        RegValueType    valueType;
-        sal_uInt32      valueSize;
+        RegValueType 	valueType;
+        sal_uInt32		valueSize;
 
         if (!key.getValueInfo(OUString(), &valueType, &valueSize))
         {
-            sal_uInt8*  pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);
+            sal_uInt8*	pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);	
             if (!key.getValue(OUString(), pBuffer))
             {
                 reader = TypeReader(pBuffer, valueSize, sal_True);
-            }
+            }		
             rtl_freeMemory(pBuffer);
         }
     }
     return reader;
-}
+}	
 
 RTTypeClass RegistryTypeManager::getTypeClass(const OString& name)
 {
     if (m_pImpl->m_t2TypeClass.count(name) > 0)
     {
-        return m_pImpl->m_t2TypeClass[name];
+        return m_pImpl->m_t2TypeClass[name];		
     } else
     {
         RegistryKey key(searchTypeKey(name));
-
+        
         if (key.isValid())
         {
-            RegValueType    valueType;
-            sal_uInt32      valueSize;
+            RegValueType 	valueType;
+            sal_uInt32		valueSize;
 
             if (!key.getValueInfo(OUString(), &valueType, &valueSize))
             {
-                sal_uInt8*  pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);
+                sal_uInt8*	pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);	
                 if (!key.getValue(OUString(), pBuffer))
                 {
                     TypeReader reader(pBuffer, valueSize, sal_False);
 
                     RTTypeClass ret = reader.getTypeClass();
-
+                    
                     rtl_freeMemory(pBuffer);
-
-                    m_pImpl->m_t2TypeClass[name] = ret;
+                    
+                    m_pImpl->m_t2TypeClass[name] = ret;				
                     return ret;
-                }
+                }		
                 rtl_freeMemory(pBuffer);
             }
         }
-    }
+    }	
 
-    return RT_TYPE_INVALID;
-}
+    return RT_TYPE_INVALID;	
+}	
 
 void RegistryTypeManager::setBase(const OString& base)
-{
+{ 
     m_pImpl->m_base = base;
 
     if (base.lastIndexOf('/') != (base.getLength() - 1))
     {
-        m_pImpl->m_base += "/";
+        m_pImpl->m_base += "/";			
     }
 }
 
@@ -239,11 +239,11 @@ void RegistryTypeManager::freeRegistries()
         delete *iter;
 
         iter++;
-    }
+    }	
 
-}
+}	
 
-RegistryKey RegistryTypeManager::searchTypeKey(const OString& name)
+RegistryKey	RegistryTypeManager::searchTypeKey(const OString& name)
 {
     RegistryKey key, rootKey;
 
@@ -266,11 +266,11 @@ RegistryKey RegistryTypeManager::searchTypeKey(const OString& name)
             }
 
             iter++;
-        }
+        }	
     }
-
+    
     return key;
-}
-
+}	
+    
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/rdbmaker/rdbmaker.cxx b/rdbmaker/source/rdbmaker/rdbmaker.cxx
index 2a92876e40c0..a5d233109519 100644
--- a/rdbmaker/source/rdbmaker/rdbmaker.cxx
+++ b/rdbmaker/source/rdbmaker/rdbmaker.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@
 #include <io.h>
 #include <direct.h>
 #include <errno.h>
-#endif
+#endif 
 
 #ifdef UNX
 #include <stdlib.h>
@@ -51,18 +51,18 @@
 #include "rdboptions.hxx"
 #include "rdbtype.hxx"
 
-#define PATH_DELEMITTER '/'
+#define PATH_DELEMITTER	'/'
 
 using namespace rtl;
 using namespace osl;
 
-FileStream          listFile;
-RegistryKey         rootKey;
-Registry            regFile;
-sal_Bool            useSpecial;
-TypeManager*        pTypeMgr = NULL;
-StringList          dirEntries;
-StringSet           filterTypes;
+FileStream 			listFile;
+RegistryKey			rootKey;
+Registry			regFile;
+sal_Bool			useSpecial;
+TypeManager*		pTypeMgr = NULL;
+StringList			dirEntries;
+StringSet			filterTypes;
 
 OString getFullNameOfApplicatRdb()
 {
@@ -70,21 +70,21 @@ OString getFullNameOfApplicatRdb()
     OUString uTmpStr;
     if( osl_getExecutableFile(&uTmpStr.pData) == osl_Process_E_None )
     {
-        sal_uInt32  lastIndex = uTmpStr.lastIndexOf(PATH_DELEMITTER);
-        OUString    tmpReg;
+        sal_uInt32 	lastIndex = uTmpStr.lastIndexOf(PATH_DELEMITTER);
+        OUString	tmpReg;
 
         if ( lastIndex > 0 )
         {
-            tmpReg =uTmpStr.copy(0, lastIndex + 1);
+            tmpReg =uTmpStr.copy(0, lastIndex + 1);	
         }
-
+        
         tmpReg += OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb") );
 
         FileBase::getSystemPathFromFileURL(tmpReg, bootReg);
     }
 
-    return OUStringToOString(bootReg, RTL_TEXTENCODING_ASCII_US);
-}
+    return OUStringToOString(bootReg, RTL_TEXTENCODING_ASCII_US);	
+}	
 
 void initFilterTypes(RdbOptions* pOptions)
 {
@@ -97,7 +97,7 @@ void initFilterTypes(RdbOptions* pOptions)
             filterTypes.insert( fOption.getToken( 0, ';', nIndex ).replace('.', '/') );
         }
         while ( nIndex >= 0 );
-    }
+    }	
     if (pOptions->isValid("-F"))
     {
         FILE  *f = fopen(pOptions->getOption("-F").getStr(), "r");
@@ -130,7 +130,7 @@ void initFilterTypes(RdbOptions* pOptions)
             fclose(f);
         }
     }
-}
+}	
 
 sal_Bool checkFilterTypes(const OString& type)
 {
@@ -139,14 +139,14 @@ sal_Bool checkFilterTypes(const OString& type)
     {
         if ( type.indexOf( *iter ) == 0 )
         {
-            return sal_True;
+            return sal_True;			
         }
 
         iter++;
     }
 
     return sal_False;
-}
+}	
 
 void cleanUp( sal_Bool bError)
 {
@@ -161,11 +161,11 @@ void cleanUp( sal_Bool bError)
     {
         pTypeMgr = new RegistryTypeManager();
     }
-
+    
     if ( rootKey.isValid() )
     {
-        rootKey.closeKey();
-    }
+        rootKey.closeKey();	
+    }	
     if ( regFile.isValid() )
     {
         if ( bError )
@@ -175,12 +175,12 @@ void cleanUp( sal_Bool bError)
         {
             regFile.close();
         }
-    }
+    }	
     if ( listFile.isValid() )
     {
-        listFile.close();
+        listFile.close();	
         unlink(listFile.getName().getStr());
-    }
+    }	
 
     StringList::reverse_iterator iter = dirEntries.rbegin();
     while ( iter != dirEntries.rend() )
@@ -189,10 +189,10 @@ void cleanUp( sal_Bool bError)
         {
             break;
         }
-
+        
         iter++;
     }
-}
+}	
 
 OString createFileName(const OString& path)
 {
@@ -206,9 +206,9 @@ OString createFileName(const OString& path)
     fileName = fileName.replace('/', '\\');
     token = '\\';
 #endif
-
+    
     OStringBuffer nameBuffer( path.getLength() );
-
+    
     sal_Int32 nIndex = 0;
     do
     {
@@ -233,39 +233,39 @@ OString createFileName(const OString& path)
         {
             dirEntries.push_back(nameBuffer.getStr());
         }
-
+        
         nameBuffer.append(token);
     }
     while ( nIndex >= 0 );
 
     return fileName;
-}
+}	
 
 sal_Bool produceAllTypes(const OString& typeName,
-                         TypeManager& typeMgr,
+                         TypeManager& typeMgr, 
                          TypeDependency& typeDependencies,
                          RdbOptions* pOptions,
                          sal_Bool bFullScope,
-                         FileStream& o,
+                         FileStream& o, 
                          RegistryKey& regKey,
                          StringSet& filterTypes2)
     throw( CannotDumpException )
 {
-    if (!produceType(typeName, typeMgr, typeDependencies, pOptions, o, regKey, filterTypes2))
+    if (!produceType(typeName, typeMgr,	typeDependencies, pOptions, o, regKey, filterTypes2))
     {
-        fprintf(stderr, "%s ERROR: %s\n",
-                pOptions->getProgramName().getStr(),
+        fprintf(stderr, "%s ERROR: %s\n", 
+                pOptions->getProgramName().getStr(), 
                 OString("cannot dump Type '" + typeName + "'").getStr());
         cleanUp(sal_True);
         exit(99);
     }
 
-    RegistryKey typeKey = typeMgr.getTypeKey(typeName);
+    RegistryKey	typeKey = typeMgr.getTypeKey(typeName);
     RegistryKeyNames subKeys;
-
+    
     if (typeKey.getKeyNames(OUString(), subKeys))
         return sal_False;
-
+    
     OString tmpName;
     for (sal_uInt32 i=0; i < subKeys.getLength(); i++)
     {
@@ -278,7 +278,7 @@ sal_Bool produceAllTypes(const OString& typeName,
 
         if (bFullScope)
         {
-            if (!produceAllTypes(tmpName, typeMgr, typeDependencies, pOptions, sal_True,
+            if (!produceAllTypes(tmpName, typeMgr, typeDependencies, pOptions, sal_True, 
                                  o, regKey, filterTypes2))
                 return sal_False;
         } else
@@ -287,8 +287,8 @@ sal_Bool produceAllTypes(const OString& typeName,
                 return sal_False;
         }
     }
-
-    return sal_True;
+    
+    return sal_True;			
 }
 
 
@@ -300,7 +300,7 @@ int _cdecl main( int argc, char * argv[] )
 {
     RdbOptions options;
 
-    try
+    try 
     {
         if (!options.initOptions(argc, argv))
         {
@@ -315,7 +315,7 @@ int _cdecl main( int argc, char * argv[] )
         exit(99);
     }
 
-    TypeDependency  typeDependencies;
+    TypeDependency	typeDependencies;
 
     OString bootReg;
 
@@ -329,7 +329,7 @@ int _cdecl main( int argc, char * argv[] )
             bootReg = getFullNameOfApplicatRdb();
         }
     }
-
+    
     if ( bootReg.getLength() )
     {
         pTypeMgr = new SpecialTypeManager();
@@ -347,7 +347,7 @@ int _cdecl main( int argc, char * argv[] )
         fprintf(stderr, "%s : init typemanager failed, check your environment for bootstrapping uno.\n", options.getProgramName().getStr());
         cleanUp(sal_True);
         exit(99);
-    }
+    } 
     if ( !useSpecial && !typeMgr.init(!options.isValid("-T"), options.getInputFiles()))
     {
         fprintf(stderr, "%s : init registries failed, check your registry files.\n", options.getProgramName().getStr());
@@ -364,8 +364,8 @@ int _cdecl main( int argc, char * argv[] )
 
     if ( !options.isValid("-O") )
     {
-        fprintf(stderr, "%s ERROR: %s\n",
-                options.getProgramName().getStr(),
+        fprintf(stderr, "%s ERROR: %s\n", 
+                options.getProgramName().getStr(), 
                 "no output file is specified.");
         cleanUp(sal_True);
         exit(99);
@@ -375,11 +375,11 @@ int _cdecl main( int argc, char * argv[] )
     {
         OString fileName = createFileName( options.getOption("-O") );
         listFile.open(fileName);
-
+        
         if ( !listFile.isValid() )
         {
-            fprintf(stderr, "%s ERROR: %s\n",
-                    options.getProgramName().getStr(),
+            fprintf(stderr, "%s ERROR: %s\n", 
+                    options.getProgramName().getStr(), 
                     "could not open output file.");
             cleanUp(sal_True);
             exit(99);
@@ -389,27 +389,27 @@ int _cdecl main( int argc, char * argv[] )
         OUString fileName( OStringToOUString(createFileName( options.getOption("-O") ), RTL_TEXTENCODING_UTF8) );
         if ( regFile.create(fileName) )
         {
-            fprintf(stderr, "%s ERROR: %s\n",
-                    options.getProgramName().getStr(),
+            fprintf(stderr, "%s ERROR: %s\n", 
+                    options.getProgramName().getStr(), 
                     "could not create registry output file.");
             cleanUp(sal_True);
             exit(99);
         }
-
+    
 
         if (options.isValid("-b"))
         {
             RegistryKey tmpKey;
-            regFile.openRootKey(tmpKey);
+            regFile.openRootKey(tmpKey);	
 
             tmpKey.createKey( OStringToOUString(options.getOption("-b"), RTL_TEXTENCODING_UTF8), rootKey);
         } else
         {
-            regFile.openRootKey(rootKey);
+            regFile.openRootKey(rootKey);	
         }
     }
 
-    try
+    try 
     {
         if (options.isValid("-T"))
         {
@@ -426,8 +426,8 @@ int _cdecl main( int argc, char * argv[] )
                 {
                     if (bootReg.getLength())
                     {
-                        fprintf(stderr, "%s ERROR: %s\n",
-                                options.getProgramName().getStr(),
+                        fprintf(stderr, "%s ERROR: %s\n", 
+                                options.getProgramName().getStr(), 
                                 "dumping all types of a scope is not possible if -R option is used.");
                         exit(99);
                     }
@@ -438,7 +438,7 @@ int _cdecl main( int argc, char * argv[] )
                     } else
                     {
                         tmpName = typeName.copy(0, typeName.lastIndexOf('.')).replace('.', '/');
-                        if (tmpName.getLength() == 0)
+                        if (tmpName.getLength() == 0) 
                             tmpName = "/";
                         else
                             tmpName.replace('.', '/');
@@ -448,18 +448,18 @@ int _cdecl main( int argc, char * argv[] )
                 } else
                 {
                     // produce only this type
-                    ret = produceType(typeName.replace('.', '/'), typeMgr, typeDependencies,
+                    ret = produceType(typeName.replace('.', '/'), typeMgr, typeDependencies, 
                                       &options, listFile, rootKey, filterTypes);
                 }
 /*
                 // produce only this type
-                ret = produceType(typeName.replace('.', '/'), typeMgr, typeDependencies,
+                ret = produceType(typeName.replace('.', '/'), typeMgr, typeDependencies, 
                                   &options, listFile, rootKey, filterTypes);
 */
                 if (!ret)
                 {
-                    fprintf(stderr, "%s ERROR: %s\n",
-                            options.getProgramName().getStr(),
+                    fprintf(stderr, "%s ERROR: %s\n", 
+                            options.getProgramName().getStr(), 
                             OString("cannot dump Type '" + typeName + "'").getStr());
                     cleanUp(sal_True);
                     exit(99);
@@ -474,18 +474,18 @@ int _cdecl main( int argc, char * argv[] )
             if (!bootReg.getLength())
             {
                 // produce all types
-                if (!produceAllTypes("/", typeMgr, typeDependencies, &options, sal_True,
+                if (!produceAllTypes("/", typeMgr, typeDependencies, &options, sal_True, 
                                      listFile, rootKey, filterTypes))
                 {
-                    fprintf(stderr, "%s ERROR: %s\n",
-                            options.getProgramName().getStr(),
+                    fprintf(stderr, "%s ERROR: %s\n", 
+                            options.getProgramName().getStr(), 
                             "an error occurs while dumping all types.");
                     exit(99);
                 }
             } else
             {
-                fprintf(stderr, "%s ERROR: %s\n",
-                        options.getProgramName().getStr(),
+                fprintf(stderr, "%s ERROR: %s\n", 
+                        options.getProgramName().getStr(), 
                         "dumping all types is not possible if -R option is used.");
                 exit(99);
             }
@@ -493,8 +493,8 @@ int _cdecl main( int argc, char * argv[] )
     }
     catch( CannotDumpException& e)
     {
-        fprintf(stderr, "%s ERROR: %s\n",
-                options.getProgramName().getStr(),
+        fprintf(stderr, "%s ERROR: %s\n", 
+                options.getProgramName().getStr(), 
                 e.m_message.getStr());
         cleanUp(sal_True);
         exit(99);
diff --git a/rdbmaker/source/rdbmaker/rdboptions.cxx b/rdbmaker/source/rdbmaker/rdboptions.cxx
index 7326da281152..b451b7bd874c 100644
--- a/rdbmaker/source/rdbmaker/rdboptions.cxx
+++ b/rdbmaker/source/rdbmaker/rdboptions.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,23 +25,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include    <stdio.h>
-#include    <string.h>
+#include 	<stdio.h>
+#include	<string.h>
 
-#include    "rdboptions.hxx"
+#include	"rdboptions.hxx"
 
 using namespace rtl;
 
-sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
+sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) 
     throw( IllegalArgument )
 {
-    sal_Bool    ret = sal_True;
-    sal_uInt16  i=0;
+    sal_Bool 	ret = sal_True;
+    sal_uInt16	i=0;
 
     if (!bCmdFile)
     {
         bCmdFile = sal_True;
-
+        
         m_program = av[0];
 
         if (ac < 2)
@@ -56,7 +56,7 @@ sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
         i = 0;
     }
 
-    char    *s=NULL;
+    char	*s=NULL;
     for (; i < ac; i++)
     {
         if (av[i][0] == '-')
@@ -77,14 +77,14 @@ sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     m_options["-O"] = OString(s);
                     break;
                 case 'X':
@@ -101,14 +101,14 @@ sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     m_options["-X"] = OString(s);
                     break;
                 case 'R':
@@ -125,14 +125,14 @@ sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     m_options["-R"] = OString(s);
                     break;
                 case 'B':
@@ -149,14 +149,14 @@ sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     m_options["-B"] = OString(s);
                     break;
                 case 'b':
@@ -173,14 +173,14 @@ sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     m_options["-b"] = OString(s);
                     break;
                 case 'T':
@@ -197,14 +197,14 @@ sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                             {
                                 tmp += " your input '" + OString(av[i+1]) + "'";
                             }
-
+                            
                             throw IllegalArgument(tmp);
                         }
                     } else
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     if (m_options.count("-T") > 0)
                     {
                         OString tmp(m_options["-T"]);
@@ -231,14 +231,14 @@ sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                                 {
                                     tmp += " your input '" + OString(av[i+1]) + "'";
                                 }
-
+                                
                                 throw IllegalArgument(tmp);
                             }
                         } else
                         {
                             s = av[i] + 3;
                         }
-
+                        
                         if (m_options.count("-FT") > 0)
                         {
                             OString tmp(m_options["-FT"]);
@@ -263,14 +263,14 @@ sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                                 {
                                     tmp += " your input '" + OString(av[i+1]) + "'";
                                 }
-
+                                
                                 throw IllegalArgument(tmp);
                             }
                         } else
                         {
                             s = av[i] + 2;
                         }
-
+                        
                         m_options["-F"] = OString(s);
                     }
                     break;
@@ -282,10 +282,10 @@ sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                         {
                             tmp += " your input '" + OString(av[i+1]) + "'";
                         }
-
+                        
                         throw IllegalArgument(tmp);
                     }
-
+                    
                     m_options["-L"] = OString();
                     m_generateTypeList = sal_True;
                     break;
@@ -313,25 +313,25 @@ sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                         rargc++;
                     }
                     fclose(cmdFile);
-
+                    
                     ret = initOptions(rargc, rargv, bCmdFile);
-
-                    for (long j=0; j < rargc; j++)
+                    
+                    for (long j=0; j < rargc; j++) 
                     {
                         free(rargv[j]);
                     }
-                }
+                }		
             } else
             {
                 m_inputFiles.push_back(av[i]);
-            }
+            }		
         }
     }
+    
+    return ret;	
+}	
 
-    return ret;
-}
-
-OString RdbOptions::prepareHelp()
+OString	RdbOptions::prepareHelp()
 {
     OString help("\nusing: ");
     help += m_program + " [-options] (-R<regname> | file_1 [... file_n])\n";
@@ -351,11 +351,11 @@ OString RdbOptions::prepareHelp()
     help += "    -L           = specifies that only a text file is generated with the\n";
     help += "                   names of the specified types and their dependencies.\n";
     help += "                   Default is that a registry file will be created\n";
-//  help += "    -X<xmlfile>  = xmlfile specifies the name of an xml description where\n";
-//  help += "                   all types are specified which will be generated.\n";
+//	help += "    -X<xmlfile>  = xmlfile specifies the name of an xml description where\n";
+//	help += "                   all types are specified which will be generated.\n";
     help += "    -T<name>     = name specifies a type or a list of types. The output for\n";
     help += "      [t1;...]     this type is generated.\n";
-    help += "                   Example: 'com.sun.star.uno.XInterface' is a valid type.\n";
+    help += "                   Example: 'com.sun.star.uno.XInterface' is a valid type.\n";		
     help += "    -FT<name>    = name specifies a type or a list of types. For this types\n";
     help += "      [t1;...]     nothing will be generated.\n";
     help += "     |F<file>    = file specifies an text file. For the specified types in\n" ;
@@ -367,18 +367,18 @@ OString RdbOptions::prepareHelp()
     help += "                   types will be generated under this node. Default is the\n";
     help += "                   root '/' of the registry file.\n";
     help += prepareVersion();
-
+    
     return help;
-}
+}	
 
-OString RdbOptions::prepareVersion()
+OString	RdbOptions::prepareVersion()
 {
     OString version("\nSun Microsystems (R) ");
     version += m_program + " Version 2.0\n\n";
 
     return version;
-}
-
+}	
 
+    
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/rdbmaker/rdboptions.hxx b/rdbmaker/source/rdbmaker/rdboptions.hxx
index b1ab63fadcb3..40abef4dd80f 100644
--- a/rdbmaker/source/rdbmaker/rdboptions.hxx
+++ b/rdbmaker/source/rdbmaker/rdboptions.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,32 +29,32 @@
 #ifndef _RDBMAKER_RDBOPTIONS_HXX_
 #define _RDBMAKER_RDBOPTIONS_HXX_
 
-#include    <codemaker/options.hxx>
+#include	<codemaker/options.hxx>
 
 class RdbOptions : public Options
 {
 public:
     RdbOptions()
-        : Options()
+        : Options() 
         , m_generateTypeList(sal_False)
         {}
 
     ~RdbOptions() {}
 
-    sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
+    sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) 
             throw( IllegalArgument );
 
-    ::rtl::OString  prepareHelp();
-
-    ::rtl::OString  prepareVersion();
+    ::rtl::OString	prepareHelp();
 
+    ::rtl::OString	prepareVersion();
+    
     sal_Bool generateTypeList()
         { return m_generateTypeList; }
 
 protected:
     sal_Bool m_generateTypeList;
 };
-
+    
 #endif // _RDBMAKER_RDBOPTIONS_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/rdbmaker/rdbtype.cxx b/rdbmaker/source/rdbmaker/rdbtype.cxx
index 6ac90d562829..4c8b8c83c0bc 100644
--- a/rdbmaker/source/rdbmaker/rdbtype.cxx
+++ b/rdbmaker/source/rdbmaker/rdbtype.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,12 +27,12 @@
  ************************************************************************/
 
 #include <stdio.h>
-#include    <rtl/alloc.h>
-#include    <rtl/ustring.hxx>
-#include    <rtl/strbuf.hxx>
+#include	<rtl/alloc.h>
+#include	<rtl/ustring.hxx>
+#include	<rtl/strbuf.hxx>
 
-#include    "rdbtype.hxx"
-#include    "rdboptions.hxx"
+#include	"rdbtype.hxx"
+#include	"rdboptions.hxx"
 
 using namespace rtl;
 
@@ -55,21 +55,21 @@ sal_Bool isBaseType(const OString& type)
           type.equals("unsigned short") ||
           type.equals("unsigned hyper") )
         return sal_True;
-
+        
     return sal_False;
-}
+}	
 
 sal_Bool produceDependedTypes(const OString& typeName,
-                              TypeManager& typeMgr,
+                              TypeManager& typeMgr, 
                               TypeDependency& typeDependencies,
                               RdbOptions* pOptions,
-                              FileStream& o,
+                              FileStream& o, 
                               RegistryKey& regKey,
                               StringSet& filterTypes)
     throw( CannotDumpException )
 {
     sal_Bool ret = sal_True;
-
+    
     TypeUsingSet usingSet(typeDependencies.getDependencies(typeName));
 
     TypeUsingSet::const_iterator iter = usingSet.begin();
@@ -80,7 +80,7 @@ sal_Bool produceDependedTypes(const OString& typeName,
         sTypeName = (*iter).m_type;
         if ((index = sTypeName.lastIndexOf(']')) > 0)
             sTypeName = sTypeName.copy(index + 1);
-
+        
         if ( !isBaseType(sTypeName) )
         {
             if (!produceType(sTypeName,
@@ -91,27 +91,27 @@ sal_Bool produceDependedTypes(const OString& typeName,
                              filterTypes,
                              sal_True))
             {
-                fprintf(stderr, "%s ERROR: %s\n",
-                        pOptions->getProgramName().getStr(),
+                fprintf(stderr, "%s ERROR: %s\n", 
+                        pOptions->getProgramName().getStr(), 
                         OString("cannot dump Type '" + sTypeName + "'").getStr());
                 cleanUp(sal_True);
                 exit(99);
             }
         }
         iter++;
-    }
+    }		
 
-    return ret;
+    return ret; 
 }
 
 //*************************************************************************
 // produceType
 //*************************************************************************
 sal_Bool produceType(const OString& typeName,
-                     TypeManager& typeMgr,
+                     TypeManager& typeMgr, 
                      TypeDependency& typeDependencies,
                      RdbOptions* pOptions,
-                     FileStream& o,
+                     FileStream& o, 
                      RegistryKey& regKey,
                      StringSet& filterTypes,
                      sal_Bool bDepend)
@@ -120,11 +120,11 @@ sal_Bool produceType(const OString& typeName,
     if (typeDependencies.isGenerated(typeName) )
         return sal_True;
 /*
-    RegistryKey     typeKey = typeMgr.getTypeKey(typeName);
+    RegistryKey		typeKey = typeMgr.getTypeKey(typeName);
 
     if (!typeKey.isValid())
-        return sal_False;
-*/
+        return sal_False;	
+*/		
     if( !checkTypeDependencies(typeMgr, typeDependencies, typeName, bDepend))
         return sal_False;
 
@@ -132,13 +132,13 @@ sal_Bool produceType(const OString& typeName,
     {
         if ( pOptions->generateTypeList() )
         {
-            o << typeName.getStr() << "\n";
+            o << typeName.getStr() << "\n";	
         } else
         {
 /*
-            RegValueType    valueType;
-            sal_uInt32      valueSize;
-
+            RegValueType 	valueType;
+            sal_uInt32		valueSize;
+            
             if (typeKey.getValueInfo(OUString(), &valueType, &valueSize))
             {
                 if (typeName.equals("/"))
@@ -148,7 +148,7 @@ sal_Bool produceType(const OString& typeName,
             }
 
             sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);
-
+        
             if (typeKey.getValue(OUString(), pBuffer))
             {
                 rtl_freeMemory(pBuffer);
@@ -170,24 +170,24 @@ sal_Bool produceType(const OString& typeName,
             RegistryKey typeKey;
             if ( regKey.createKey( OStringToOUString(typeName, RTL_TEXTENCODING_UTF8), typeKey) )
             {
-//              rtl_freeMemory(pBuffer);
+//				rtl_freeMemory(pBuffer);
                 return sal_False;
             }
-
+            
             if ( typeKey.setValue(OUString(), RG_VALUETYPE_BINARY, (void*)reader.getBlop(), reader.getBlopSize()) )
-//          if ( typeKey.setValue(OUString(), valueType, pBuffer, valueSize) )
+//			if ( typeKey.setValue(OUString(), valueType, pBuffer, valueSize) )
             {
-//              rtl_freeMemory(pBuffer);
+//				rtl_freeMemory(pBuffer);
                 return sal_False;
             }
-
-//          rtl_freeMemory(pBuffer);
+        
+//			rtl_freeMemory(pBuffer);
         }
     }
-
+    
     typeDependencies.setGenerated(typeName);
-    sal_Bool ret = produceDependedTypes(typeName, typeMgr, typeDependencies,
-                                        pOptions, o, regKey, filterTypes);
+    sal_Bool ret = produceDependedTypes(typeName, typeMgr, typeDependencies, 
+                                        pOptions, o, regKey, filterTypes);	
 
     return ret;
 }
diff --git a/rdbmaker/source/rdbmaker/rdbtype.hxx b/rdbmaker/source/rdbmaker/rdbtype.hxx
index 2b9e2230237b..6c8b9d1600da 100644
--- a/rdbmaker/source/rdbmaker/rdbtype.hxx
+++ b/rdbmaker/source/rdbmaker/rdbtype.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,21 +29,21 @@
 #ifndef _RDBMAKER_RDBTYPE_HXX_
 #define _RDBMAKER_RDBTYPE_HXX_
 
-#include    <codemaker/typemanager.hxx>
-#include    <codemaker/dependency.hxx>
+#include	<codemaker/typemanager.hxx>
+#include	<codemaker/dependency.hxx>
 
-sal_Bool    checkFilterTypes(const ::rtl::OString& type);
-void        cleanUp(sal_Bool);
+sal_Bool 	checkFilterTypes(const ::rtl::OString& type);
+void 		cleanUp(sal_Bool);
 
 class RdbOptions;
 class FileStream;
 class RegistryKey;
 
 sal_Bool produceType(const ::rtl::OString& typeName,
-                     TypeManager& typeMgr,
+                     TypeManager& typeMgr, 
                      TypeDependency& typeDependencies,
                      RdbOptions* pOptions,
-                     FileStream& o,
+                     FileStream& o, 
                      RegistryKey& regKey,
                      StringSet& filterTypes,
                      sal_Bool bDepend = sal_False)
diff --git a/rdbmaker/source/rdbmaker/specialtypemanager.cxx b/rdbmaker/source/rdbmaker/specialtypemanager.cxx
index 153f4e68de57..90bcb352390b 100644
--- a/rdbmaker/source/rdbmaker/specialtypemanager.cxx
+++ b/rdbmaker/source/rdbmaker/specialtypemanager.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,13 +26,13 @@
  *
  ************************************************************************/
 
-#include    <rtl/alloc.h>
+#include	<rtl/alloc.h>
 
-#include    "specialtypemanager.hxx"
+#include	"specialtypemanager.hxx"
 
-extern "C"
+extern "C" 
 {
-sal_Bool SAL_CALL initTypeMapper( const sal_Char* pRegName );
+sal_Bool SAL_CALL initTypeMapper( const sal_Char* pRegName );	
 sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop);
 }
 
@@ -41,21 +41,21 @@ using namespace rtl;
 SpecialTypeManager::SpecialTypeManager()
 {
     m_pImpl = new SpecialTypeManagerImpl();
-    acquire();
-}
+    acquire();	
+}	
 
 SpecialTypeManager::~SpecialTypeManager()
 {
     release();
-}
+}	
 
 void SpecialTypeManager::acquire()
-{
+{ 
     TypeManager::acquire();
 }
 
 void SpecialTypeManager::release()
-{
+{ 
     if (0 == TypeManager::release())
     {
         delete m_pImpl;
@@ -65,7 +65,7 @@ void SpecialTypeManager::release()
 sal_Bool SpecialTypeManager::init(const OString& registryName)
 {
     return initTypeMapper( registryName.getStr() );
-}
+}	
 
 TypeReader SpecialTypeManager::getTypeReader(const OString& name)
 {
@@ -85,20 +85,20 @@ TypeReader SpecialTypeManager::getTypeReader(const OString& name)
     }
 
     return reader;
-}
+}	
 
 RTTypeClass SpecialTypeManager::getTypeClass(const OString& name)
 {
     if (m_pImpl->m_t2TypeClass.count(name) > 0)
     {
-        return m_pImpl->m_t2TypeClass[name];
+        return m_pImpl->m_t2TypeClass[name];		
     } else
     {
-    }
-
-    return RT_TYPE_INVALID;
-}
+    }	
 
+    return RT_TYPE_INVALID;	
+}	
 
+    
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/rdbmaker/specialtypemanager.hxx b/rdbmaker/source/rdbmaker/specialtypemanager.hxx
index ee7321939097..de5d32522ba4 100644
--- a/rdbmaker/source/rdbmaker/specialtypemanager.hxx
+++ b/rdbmaker/source/rdbmaker/specialtypemanager.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,14 +29,14 @@
 #ifndef _SPECIALTYPEMANAGER_HXX_
 #define _SPECIALTYPEMANAGER_HXX_
 
-#include    <codemaker/registry.hxx>
-#include    <codemaker/typemanager.hxx>
+#include	<codemaker/registry.hxx>
+#include	<codemaker/typemanager.hxx>
 
 
 struct SpecialTypeManagerImpl
 {
-    T2TypeClassMap  m_t2TypeClass;
-};
+    T2TypeClassMap	m_t2TypeClass;
+};	
 
 class SpecialTypeManager : public TypeManager
 {
@@ -54,10 +54,10 @@ public:
     using TypeManager::init;
     sal_Bool init(const ::rtl::OString& registryName);
 
-    sal_Bool    isValidType(const ::rtl::OString&)
+    sal_Bool  	isValidType(const ::rtl::OString&)
         { return sal_True; }
-    TypeReader  getTypeReader(const ::rtl::OString& name);
-    RTTypeClass getTypeClass(const ::rtl::OString& name);
+    TypeReader 	getTypeReader(const ::rtl::OString& name);
+    RTTypeClass	getTypeClass(const ::rtl::OString& name);
 
     sal_Int32 getSize() { return m_pImpl->m_t2TypeClass.size(); }
 
@@ -68,7 +68,7 @@ protected:
 protected:
     SpecialTypeManagerImpl* m_pImpl;
 };
-
+    
 #endif // _CODEMAKER_TYPEMANAGER_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rdbmaker/source/rdbmaker/typeblop.cxx b/rdbmaker/source/rdbmaker/typeblop.cxx
index 88af2d64adc4..cb6326362147 100644
--- a/rdbmaker/source/rdbmaker/typeblop.cxx
+++ b/rdbmaker/source/rdbmaker/typeblop.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,75 +57,75 @@ static Reference< XHierarchicalNameAccess > xNameAccess;
 
 void writeConstantData( RegistryTypeWriter& rWriter, sal_uInt16 fieldIndex,
                       const Reference< XConstantTypeDescription >& xConstant)
-
-{
-    RTConstValue constValue;
+    
+{					  
+    RTConstValue constValue;						  
     OUString uConstTypeName;
     OUString uConstName = xConstant->getName();
     Any aConstantAny = xConstant->getConstantValue();
-
+    
     switch ( aConstantAny.getValueTypeClass() )
     {
         case TypeClass_BOOLEAN:
             {
                 uConstTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM("boolean") );
-                constValue.m_type = RT_TYPE_BOOL;
+                constValue.m_type = RT_TYPE_BOOL; 
                 aConstantAny >>= constValue.m_value.aBool;
             }
             break;
         case TypeClass_BYTE:
             {
                 uConstTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM("byte") );
-                constValue.m_type = RT_TYPE_BYTE;
+                constValue.m_type = RT_TYPE_BYTE; 
                 aConstantAny >>= constValue.m_value.aByte;
             }
             break;
         case TypeClass_SHORT:
             {
                 uConstTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM("short") );
-                constValue.m_type = RT_TYPE_INT16;
+                constValue.m_type = RT_TYPE_INT16; 
                 aConstantAny >>= constValue.m_value.aShort;
             }
             break;
         case TypeClass_UNSIGNED_SHORT:
             {
                 uConstTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM("unsigned short") );
-                constValue.m_type = RT_TYPE_UINT16;
+                constValue.m_type = RT_TYPE_UINT16; 
                 aConstantAny >>= constValue.m_value.aUShort;
             }
             break;
         case TypeClass_LONG:
             {
                 uConstTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM("long") );
-                constValue.m_type = RT_TYPE_INT32;
+                constValue.m_type = RT_TYPE_INT32; 
                 aConstantAny >>= constValue.m_value.aLong;
             }
             break;
         case TypeClass_UNSIGNED_LONG:
             {
                 uConstTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM("unsigned long") );
-                constValue.m_type = RT_TYPE_UINT32;
+                constValue.m_type = RT_TYPE_UINT32; 
                 aConstantAny >>= constValue.m_value.aULong;
             }
             break;
         case TypeClass_FLOAT:
             {
                 uConstTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM("float") );
-                constValue.m_type = RT_TYPE_FLOAT;
+                constValue.m_type = RT_TYPE_FLOAT; 
                 aConstantAny >>= constValue.m_value.aFloat;
             }
             break;
         case TypeClass_DOUBLE:
             {
                 uConstTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM("double") );
-                constValue.m_type = RT_TYPE_DOUBLE;
+                constValue.m_type = RT_TYPE_DOUBLE; 
                 aConstantAny >>= constValue.m_value.aDouble;
             }
             break;
         case TypeClass_STRING:
             {
                 uConstTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM("string") );
-                constValue.m_type = RT_TYPE_STRING;
+                constValue.m_type = RT_TYPE_STRING; 
                 constValue.m_value.aString = ((OUString*)aConstantAny.getValue())->getStr();
             }
             break;
@@ -134,9 +134,9 @@ void writeConstantData( RegistryTypeWriter& rWriter, sal_uInt16 fieldIndex,
             break;
     }
 
-    rWriter.setFieldData(fieldIndex, uConstName, uConstTypeName, OUString(),
+    rWriter.setFieldData(fieldIndex, uConstName, uConstTypeName, OUString(), 
                         OUString(), RT_ACCESS_CONST, constValue);
-}
+}	
 
 sal_uInt32 getInheritedMemberCount( Reference< XTypeDescription >& xType )
 {
@@ -155,21 +155,21 @@ sal_uInt32 getInheritedMemberCount( Reference< XTypeDescription >& xType )
 
         memberCount += xIFace->getMembers().getLength();
     }
-//  } else
-//  if ( xType->getTypeClass() == TypeClass_Struct || xType->getTypeClass() == TypeClass_Exception )
-//  {
-//      Reference< XCompoundTypeDescription > xComp(xType, UNO_QUERY);
+//	} else
+//	if ( xType->getTypeClass() == TypeClass_Struct || xType->getTypeClass() == TypeClass_Exception )
+//	{
+//		Reference< XCompoundTypeDescription > xComp(xType, UNO_QUERY);
 //
-//      if ( xComp.is() )
-//          return membercount;
+//		if ( xComp.is() )
+//			return membercount;
 //
-//      Reference< XTypeDescription > xSuperType = xComp->getBaseType();
+//		Reference< XTypeDescription > xSuperType = xComp->getBaseType();
 //
-//      if ( xSuperType.is() )
-//          memberCount = getInheritedMemberCount( xSuperType );
+//		if ( xSuperType.is() )
+//			memberCount = getInheritedMemberCount( xSuperType );
 //
-//      memberCount += xComp->getMemberNames().getLength();
-//  }
+//		memberCount += xComp->getMemberNames().getLength();
+//	}
 
     return memberCount;
 }
@@ -181,17 +181,17 @@ void writeMethodData( RegistryTypeWriter& rWriter, sal_uInt32 calculatedMemberOf
     RTMethodMode methodMode = RT_MODE_TWOWAY;
     if ( xMethod->isOneway() )
     {
-        methodMode = RT_MODE_ONEWAY;
+        methodMode = RT_MODE_ONEWAY;	
     }
-
+    
     Sequence< Reference< XMethodParameter > > parameters( xMethod->getParameters() );
     Sequence< Reference< XTypeDescription > > exceptions( xMethod->getExceptions() );
     sal_uInt16 methodIndex = (sal_uInt16)(xMember->getPosition() - calculatedMemberOffset);
     sal_uInt16 paramCount = (sal_uInt16)parameters.getLength();
     sal_uInt16 exceptionCount = (sal_uInt16)exceptions.getLength();
-
+    
     rWriter.setMethodData(methodIndex, xMember->getMemberName(),
-                          xMethod->getReturnType()->getName().replace('.', '/'),
+                          xMethod->getReturnType()->getName().replace('.', '/'), 
                           methodMode, paramCount, exceptionCount, OUString());
 
     RTParamMode paramMode = RT_PARAM_IN;
@@ -206,24 +206,24 @@ void writeMethodData( RegistryTypeWriter& rWriter, sal_uInt32 calculatedMemberOf
         } else
         if ( xParam->isIn() )
         {
-            paramMode = RT_PARAM_IN;
+            paramMode = RT_PARAM_IN;				
         } else
         if ( xParam->isOut() )
         {
             paramMode = RT_PARAM_OUT;
         }
 
-        rWriter.setParamData(methodIndex, (sal_uInt16)xParam->getPosition(), xParam->getType()->getName().replace('.', '/'),
-                             xParam->getName(), paramMode);
+        rWriter.setParamData(methodIndex, (sal_uInt16)xParam->getPosition(), xParam->getType()->getName().replace('.', '/'), 
+                             xParam->getName(), paramMode); 
     }
-
+        
     for (i=0; i < exceptionCount; i++)
     {
-        rWriter.setExcData(methodIndex, i, exceptions[i]->getName().replace('.', '/'));
+        rWriter.setExcData(methodIndex, i, exceptions[i]->getName().replace('.', '/')); 
     }
-}
+}	
 
-extern "C"
+extern "C" 
 {
 
 sal_Bool SAL_CALL initTypeMapper( const sal_Char* pRegName )
@@ -239,7 +239,7 @@ sal_Bool SAL_CALL initTypeMapper( const sal_Char* pRegName )
             return sal_False;
 
         Reference< XHierarchicalNameAccess > xNAccess;
-
+        
         Reference< beans::XPropertySet > xProps( xSMgr, UNO_QUERY );
         if (xProps.is())
         {
@@ -256,10 +256,10 @@ sal_Bool SAL_CALL initTypeMapper( const sal_Char* pRegName )
             {
             }
         }
-
+        
         if ( !xNAccess.is() )
             return sal_False;
-
+        
         xNameAccess = xNAccess;
     }
     catch( Exception& )
@@ -268,7 +268,7 @@ sal_Bool SAL_CALL initTypeMapper( const sal_Char* pRegName )
     }
 
     return sal_True;
-}
+}	
 
 sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
 {
@@ -286,7 +286,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
             return length;
 
         Reference< XTypeDescription > xType;
-        aTypeAny >>= xType;
+        aTypeAny >>= xType;	
 
         if ( !xType.is() )
             return length;
@@ -296,19 +296,19 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
             case TypeClass_CONSTANTS:
                 {
                     Reference< XConstantsTypeDescription > xCFace(xType, UNO_QUERY);
-
+                    
                     if ( !xCFace.is() )
                         return length;
-
+                    
                   Sequence< Reference< XConstantTypeDescription > > constTypes( xCFace->getConstants());
                     sal_uInt16 constCount = (sal_uInt16)constTypes.getLength();
-
-                    RegistryTypeWriter writer(RT_TYPE_MODULE, uTypeName.replace('.', '/'),
+                    
+                    RegistryTypeWriter writer(RT_TYPE_MODULE, uTypeName.replace('.', '/'), 
                                               OUString(), constCount, 0, 0);
-
+                    
                   for (sal_uInt16 i=0; i < constCount; i++)
-                      writeConstantData(writer, i, constTypes[i]);
-
+                      writeConstantData(writer, i, constTypes[i]); 
+                    
                     length = writer.getBlopSize();
                     *pBlop = (sal_uInt8*)rtl_allocateMemory( length );
                     rtl_copyMemory(*pBlop, writer.getBlop(), length);
@@ -317,12 +317,12 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
             case TypeClass_MODULE:
                 {
                     Reference< XModuleTypeDescription > xMFace(xType, UNO_QUERY);
-
+                    
                     if ( !xMFace.is() )
                         return length;
 
                   Sequence< Reference< XTypeDescription > > memberTypes( xMFace->getMembers());
-
+                  
                     sal_uInt16 memberCount = (sal_uInt16)memberTypes.getLength();
                     sal_uInt16 constCount = 0;
                     sal_Int16 i;
@@ -333,33 +333,33 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
                             constCount++;
                     }
 
-                    RegistryTypeWriter writer(RT_TYPE_MODULE, uTypeName.replace('.', '/'),
+                    RegistryTypeWriter writer(RT_TYPE_MODULE, uTypeName.replace('.', '/'), 
                                               OUString(), constCount, 0, 0);
-
+                    
                     if ( 0 < constCount )
                   {
                       Reference< XConstantTypeDescription > xConst;
-                      sal_uInt16 fieldIndex = 0;
+                      sal_uInt16 fieldIndex = 0;  
                       for (i=0; i < memberCount; i++)
                       {
                           if ( TypeClass_CONSTANT == memberTypes[i]->getTypeClass() )
                           {
                               xConst = Reference< XConstantTypeDescription >(memberTypes[i], UNO_QUERY);
-
-                              writeConstantData(writer, ++fieldIndex, xConst);
+                              
+                              writeConstantData(writer, ++fieldIndex, xConst); 
                           }
                       }
                   }
-
+                    
                     length = writer.getBlopSize();
                     *pBlop = (sal_uInt8*)rtl_allocateMemory( length );
-                    rtl_copyMemory(*pBlop, writer.getBlop(), length);
+                    rtl_copyMemory(*pBlop, writer.getBlop(), length);                    
                 }
                 break;
             case TypeClass_INTERFACE:
                 {
                     Reference< XInterfaceTypeDescription > xIFace(xType, UNO_QUERY);
-
+                    
                     if ( !xIFace.is() )
                         return length;
 
@@ -379,7 +379,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
                             attrCount++;
                         }
                     }
-
+                    
                     OUString uSuperType;
                     Reference< XTypeDescription > xSuperType = xIFace->getBaseType();
                     if ( xSuperType.is() )
@@ -388,33 +388,33 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
                         inheritedMemberCount = (sal_uInt16)getInheritedMemberCount( xSuperType );
                     }
 
-                    RegistryTypeWriter writer(RT_TYPE_INTERFACE, uTypeName.replace('.', '/'),
+                    RegistryTypeWriter writer(RT_TYPE_INTERFACE, uTypeName.replace('.', '/'), 
                                               uSuperType, attrCount, memberCount-attrCount, 0);
-
-                    Uik   uik = xIFace->getUik();
+                    
+                    Uik	  uik = xIFace->getUik();
                     RTUik rtUik = { uik.m_Data1, uik.m_Data2, uik.m_Data3, uik.m_Data4, uik.m_Data5 };
                     writer.setUik( rtUik );
-
+                    
                     RTFieldAccess attrAccess = RT_ACCESS_READWRITE;
                     // reset attrCount, used for method index calculation
-                    attrCount = 0;
-
+                    attrCount = 0;                    
+                    
                     for (i=0; i < memberCount; i++)
                     {
                         xAttr = Reference< XInterfaceAttributeTypeDescription >(memberTypes[i], UNO_QUERY);
                         if ( xAttr.is() )
                         {
-                            ++attrCount;
+                            ++attrCount;                            
                             if (xAttr->isReadOnly())
                             {
-                                attrAccess = RT_ACCESS_READONLY;
+                                attrAccess = RT_ACCESS_READONLY;	
                             } else
                             {
-                                attrAccess = RT_ACCESS_READWRITE;
-                            }
+                                attrAccess = RT_ACCESS_READWRITE;	
+                            }							
                             writer.setFieldData(sal::static_int_cast< sal_uInt16 >(memberTypes[i]->getPosition() - inheritedMemberCount),
                                                 memberTypes[i]->getMemberName(),
-                                                xAttr->getType()->getName().replace('.', '/'),
+                                                xAttr->getType()->getName().replace('.', '/'), 
                                                 OUString(), OUString(), attrAccess);
                             continue;
                         }
@@ -425,7 +425,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
                             writeMethodData( writer, attrCount+inheritedMemberCount, memberTypes[i], xMethod );
                         }
                     }
-
+                                              
                     length = writer.getBlopSize();
                     *pBlop = (sal_uInt8*)rtl_allocateMemory( length );
                     rtl_copyMemory(*pBlop, writer.getBlop(), length);
@@ -437,19 +437,19 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
                     RTTypeClass rtTypeClass = RT_TYPE_STRUCT;
                     if (xType->getTypeClass() == TypeClass_EXCEPTION)
                     {
-                        rtTypeClass = RT_TYPE_EXCEPTION;
+                        rtTypeClass = RT_TYPE_EXCEPTION;	
                     }
 #include <com/sun/star/reflection/XConstantsTypeDescription.hpp>
 
                     Reference< XCompoundTypeDescription > xComp(xType, UNO_QUERY);
-
+                    
                     if ( !xComp.is() )
                         return length;
 
                     Sequence< OUString > memberNames( xComp->getMemberNames());
                     Sequence< Reference< XTypeDescription > > memberTypes( xComp->getMemberTypes());
                     sal_uInt16 memberCount = (sal_uInt16)memberNames.getLength();
-
+                    
                     OUString uSuperType;
                     Reference< XTypeDescription > xSuperType = xComp->getBaseType();
                     if ( xSuperType.is() )
@@ -459,13 +459,13 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
 
                     RegistryTypeWriter writer(rtTypeClass, uTypeName.replace('.', '/'),
                                               uSuperType, memberCount, 0, 0);
-
+                    
                     for (sal_Int16 i=0; i < memberCount; i++)
                     {
-                        writer.setFieldData(i , memberNames[i], memberTypes[i]->getName().replace('.', '/'),
+                        writer.setFieldData(i , memberNames[i], memberTypes[i]->getName().replace('.', '/'), 
                                             OUString(), OUString(), RT_ACCESS_READWRITE);
                     }
-
+                                              
                     length = writer.getBlopSize();
                     *pBlop = (sal_uInt8*)rtl_allocateMemory( length );
                     rtl_copyMemory(*pBlop, writer.getBlop(), length);
@@ -474,27 +474,27 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
             case TypeClass_ENUM:
                 {
                     Reference< XEnumTypeDescription > xEnum(xType, UNO_QUERY);
-
+                    
                     if ( !xEnum.is() )
                         return length;
 
                     Sequence< OUString > enumNames( xEnum->getEnumNames());
                     Sequence< sal_Int32 > enumValues( xEnum->getEnumValues());
                     sal_uInt16 enumCount = (sal_uInt16)enumNames.getLength();
-
+                    
                     RegistryTypeWriter writer(RT_TYPE_ENUM, uTypeName.replace('.', '/'),
                                               OUString(), enumCount, 0, 0);
-
-                    RTConstValue constValue;
+                    
+                    RTConstValue constValue;						  
                     for (sal_Int16 i=0; i < enumCount; i++)
                     {
-                        constValue.m_type = RT_TYPE_INT32;
+                        constValue.m_type = RT_TYPE_INT32; 
                         constValue.m_value.aLong = enumValues[i];
-
+                        
                         writer.setFieldData(i, enumNames[i], OUString(), OUString(), OUString(),
                                             RT_ACCESS_CONST, constValue);
                     }
-
+                                              
                     length = writer.getBlopSize();
                     *pBlop = (sal_uInt8*)rtl_allocateMemory( length );
                     rtl_copyMemory(*pBlop, writer.getBlop(), length);
@@ -503,7 +503,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
             case TypeClass_TYPEDEF:
                 {
                     Reference< XIndirectTypeDescription > xTD(xType, UNO_QUERY);
-
+                    
                     if ( !xTD.is() )
                         return length;
 
@@ -525,12 +525,12 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
     {
     }
 
-    return length;
-}
+    return length;	
+}	
 
 } // extern "C"
 
 
-
+    
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/inc/pch/precompiled_registry.cxx b/registry/inc/pch/precompiled_registry.cxx
index 81ccbc19b576..e39f4c76c85a 100644
--- a/registry/inc/pch/precompiled_registry.cxx
+++ b/registry/inc/pch/precompiled_registry.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/registry/inc/pch/precompiled_registry.hxx b/registry/inc/pch/precompiled_registry.hxx
index 0b647d0fd083..1a0f2cd180fe 100644
--- a/registry/inc/pch/precompiled_registry.hxx
+++ b/registry/inc/pch/precompiled_registry.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/registry/inc/registry/reader.h b/registry/inc/registry/reader.h
index 645da283c9e2..f89b2c09d6f5 100644
--- a/registry/inc/registry/reader.h
+++ b/registry/inc/registry/reader.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/registry/inc/registry/reader.hxx b/registry/inc/registry/reader.hxx
index cbb0c68f8d30..9ed55e4c927e 100644
--- a/registry/inc/registry/reader.hxx
+++ b/registry/inc/registry/reader.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -178,7 +178,7 @@ public:
         }
         return rtl::OUString(s, SAL_NO_ACQUIRE);
     }
-
+    
     /**
        Returns the type class of this type reader.
 
@@ -295,7 +295,7 @@ public:
         }
         return rtl::OUString(s, SAL_NO_ACQUIRE);
     }
-
+    
     /**
        Returns the flags of a field of this type reader.
 
diff --git a/registry/inc/registry/reflread.hxx b/registry/inc/registry/reflread.hxx
index 9b480d57b390..c3e2f7e1c6fb 100644
--- a/registry/inc/registry/reflread.hxx
+++ b/registry/inc/registry/reflread.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 typedef void* TypeReaderImpl;
 
 /****************************************************************************
-
+    
     C-Api
 
 *****************************************************************************/
@@ -47,46 +47,46 @@ extern "C" {
 #endif
 
 /** specifies a collection of function pointers which represents the complete registry type reader C-API.
-
+    
     This funtions pointers are used by the C++ wrapper to call the C-API.
 */
 struct RegistryTypeReader_Api
 {
-    TypeReaderImpl      (TYPEREG_CALLTYPE *createEntry)         (const sal_uInt8*, sal_uInt32, sal_Bool);
-    void                (TYPEREG_CALLTYPE *acquire)             (TypeReaderImpl);
-    void                (TYPEREG_CALLTYPE *release)             (TypeReaderImpl);
-    sal_uInt16          (TYPEREG_CALLTYPE *getMinorVersion)     (TypeReaderImpl);
-    sal_uInt16          (TYPEREG_CALLTYPE *getMajorVersion)     (TypeReaderImpl);
-    RTTypeClass         (TYPEREG_CALLTYPE *getTypeClass)        (TypeReaderImpl);
-    void                (TYPEREG_CALLTYPE *getUik)              (TypeReaderImpl, RTUik*);
-    void                (TYPEREG_CALLTYPE *getDoku)             (TypeReaderImpl, rtl_uString**);
-    void                (TYPEREG_CALLTYPE *getFileName)         (TypeReaderImpl, rtl_uString**);
-    void                (TYPEREG_CALLTYPE *getTypeName)         (TypeReaderImpl, rtl_uString**);
-    void                (TYPEREG_CALLTYPE *getSuperTypeName)    (TypeReaderImpl, rtl_uString**);
-    sal_uInt32          (TYPEREG_CALLTYPE *getFieldCount)       (TypeReaderImpl);
-    void                (TYPEREG_CALLTYPE *getFieldName)        (TypeReaderImpl, rtl_uString**, sal_uInt16);
-    void                (TYPEREG_CALLTYPE *getFieldType)        (TypeReaderImpl, rtl_uString**, sal_uInt16);
-    RTFieldAccess       (TYPEREG_CALLTYPE *getFieldAccess)      (TypeReaderImpl, sal_uInt16);
-    RTValueType         (TYPEREG_CALLTYPE *getFieldConstValue)  (TypeReaderImpl, sal_uInt16, RTConstValueUnion*);
-    void                (TYPEREG_CALLTYPE *getFieldDoku)        (TypeReaderImpl, rtl_uString**, sal_uInt16);
-    void                (TYPEREG_CALLTYPE *getFieldFileName)    (TypeReaderImpl, rtl_uString**, sal_uInt16);
-    sal_uInt32          (TYPEREG_CALLTYPE *getMethodCount)      (TypeReaderImpl);
-    void                (TYPEREG_CALLTYPE *getMethodName)       (TypeReaderImpl, rtl_uString**, sal_uInt16);
-    sal_uInt32          (TYPEREG_CALLTYPE *getMethodParamCount) (TypeReaderImpl, sal_uInt16);
-    void                (TYPEREG_CALLTYPE *getMethodParamType)  (TypeReaderImpl, rtl_uString**, sal_uInt16, sal_uInt16);
-    void                (TYPEREG_CALLTYPE *getMethodParamName)  (TypeReaderImpl, rtl_uString**, sal_uInt16, sal_uInt16);
-    RTParamMode         (TYPEREG_CALLTYPE *getMethodParamMode)  (TypeReaderImpl, sal_uInt16, sal_uInt16);
-    sal_uInt32          (TYPEREG_CALLTYPE *getMethodExcCount)   (TypeReaderImpl, sal_uInt16);
-    void                (TYPEREG_CALLTYPE *getMethodExcType)    (TypeReaderImpl, rtl_uString**, sal_uInt16, sal_uInt16);
-    void                (TYPEREG_CALLTYPE *getMethodReturnType) (TypeReaderImpl, rtl_uString**, sal_uInt16);
-    RTMethodMode        (TYPEREG_CALLTYPE *getMethodMode)       (TypeReaderImpl, sal_uInt16);
-    void                (TYPEREG_CALLTYPE *getMethodDoku)       (TypeReaderImpl, rtl_uString**, sal_uInt16);
-
-    sal_uInt32          (TYPEREG_CALLTYPE *getReferenceCount)   (TypeReaderImpl);
-    void                (TYPEREG_CALLTYPE *getReferenceName)    (TypeReaderImpl, rtl_uString**, sal_uInt16);
-    RTReferenceType     (TYPEREG_CALLTYPE *getReferenceType)    (TypeReaderImpl, sal_uInt16);
-    void                (TYPEREG_CALLTYPE *getReferenceDoku)    (TypeReaderImpl, rtl_uString**, sal_uInt16);
-    RTFieldAccess       (TYPEREG_CALLTYPE *getReferenceAccess)  (TypeReaderImpl, sal_uInt16);
+    TypeReaderImpl		(TYPEREG_CALLTYPE *createEntry) 		(const sal_uInt8*, sal_uInt32, sal_Bool);
+    void				(TYPEREG_CALLTYPE *acquire) 			(TypeReaderImpl);
+    void				(TYPEREG_CALLTYPE *release) 			(TypeReaderImpl);
+    sal_uInt16			(TYPEREG_CALLTYPE *getMinorVersion) 	(TypeReaderImpl);
+    sal_uInt16			(TYPEREG_CALLTYPE *getMajorVersion) 	(TypeReaderImpl);
+    RTTypeClass 		(TYPEREG_CALLTYPE *getTypeClass) 		(TypeReaderImpl);
+    void 				(TYPEREG_CALLTYPE *getUik)				(TypeReaderImpl, RTUik*);
+    void 	  			(TYPEREG_CALLTYPE *getDoku) 			(TypeReaderImpl, rtl_uString**);
+    void		   		(TYPEREG_CALLTYPE *getFileName)			(TypeReaderImpl, rtl_uString**);
+    void		   		(TYPEREG_CALLTYPE *getTypeName) 		(TypeReaderImpl, rtl_uString**);
+    void   				(TYPEREG_CALLTYPE *getSuperTypeName) 	(TypeReaderImpl, rtl_uString**);
+    sal_uInt32			(TYPEREG_CALLTYPE *getFieldCount) 		(TypeReaderImpl);
+    void		   		(TYPEREG_CALLTYPE *getFieldName) 		(TypeReaderImpl, rtl_uString**, sal_uInt16);
+    void	  			(TYPEREG_CALLTYPE *getFieldType) 		(TypeReaderImpl, rtl_uString**, sal_uInt16);
+    RTFieldAccess		(TYPEREG_CALLTYPE *getFieldAccess) 		(TypeReaderImpl, sal_uInt16);
+    RTValueType			(TYPEREG_CALLTYPE *getFieldConstValue) 	(TypeReaderImpl, sal_uInt16, RTConstValueUnion*);
+    void		   		(TYPEREG_CALLTYPE *getFieldDoku) 		(TypeReaderImpl, rtl_uString**, sal_uInt16);
+    void		   		(TYPEREG_CALLTYPE *getFieldFileName)	(TypeReaderImpl, rtl_uString**, sal_uInt16);
+    sal_uInt32	  		(TYPEREG_CALLTYPE *getMethodCount) 		(TypeReaderImpl);
+    void		   		(TYPEREG_CALLTYPE *getMethodName) 		(TypeReaderImpl, rtl_uString**, sal_uInt16);
+    sal_uInt32    		(TYPEREG_CALLTYPE *getMethodParamCount) (TypeReaderImpl, sal_uInt16);
+    void		   		(TYPEREG_CALLTYPE *getMethodParamType) 	(TypeReaderImpl, rtl_uString**, sal_uInt16, sal_uInt16);
+    void   				(TYPEREG_CALLTYPE *getMethodParamName) 	(TypeReaderImpl, rtl_uString**, sal_uInt16, sal_uInt16);
+    RTParamMode			(TYPEREG_CALLTYPE *getMethodParamMode) 	(TypeReaderImpl, sal_uInt16, sal_uInt16);
+    sal_uInt32    		(TYPEREG_CALLTYPE *getMethodExcCount) 	(TypeReaderImpl, sal_uInt16);
+    void		   		(TYPEREG_CALLTYPE *getMethodExcType) 	(TypeReaderImpl, rtl_uString**, sal_uInt16, sal_uInt16);
+    void		   		(TYPEREG_CALLTYPE *getMethodReturnType) (TypeReaderImpl, rtl_uString**, sal_uInt16);
+    RTMethodMode		(TYPEREG_CALLTYPE *getMethodMode) 		(TypeReaderImpl, sal_uInt16);
+    void		   		(TYPEREG_CALLTYPE *getMethodDoku) 		(TypeReaderImpl, rtl_uString**, sal_uInt16);
+
+    sal_uInt32	  		(TYPEREG_CALLTYPE *getReferenceCount) 	(TypeReaderImpl);
+    void		   		(TYPEREG_CALLTYPE *getReferenceName)  	(TypeReaderImpl, rtl_uString**, sal_uInt16);
+    RTReferenceType		(TYPEREG_CALLTYPE *getReferenceType) 	(TypeReaderImpl, sal_uInt16);
+    void		   		(TYPEREG_CALLTYPE *getReferenceDoku)  	(TypeReaderImpl, rtl_uString**, sal_uInt16);
+    RTFieldAccess		(TYPEREG_CALLTYPE *getReferenceAccess)	(TypeReaderImpl, sal_uInt16);
 };
 
 /** the API initialization function.
@@ -111,15 +111,15 @@ class RegistryTypeReader
 public:
 
     /** Constructor.
-
+        
         @param buffer points to the binary data block.
         @param bufferlen specifies the size of the binary data block.
         @param copyData specifies if the data block should be copied.
                         The block can be copied to ensure that the data
                         is valid for the lifetime of this instance.
      */
-    inline RegistryTypeReader(const sal_uInt8* buffer,
-                              sal_uInt32 bufferLen,
+    inline RegistryTypeReader(const sal_uInt8* buffer, 
+                              sal_uInt32 bufferLen, 
                               sal_Bool copyData);
 
     /// Copy constructcor
@@ -132,202 +132,202 @@ public:
     inline RegistryTypeReader& operator == (const RegistryTypeReader& toAssign);
 
     /// checks if the registry type reader points to a valid Api.
-    inline sal_Bool         isValid() const;
+    inline sal_Bool			isValid() const;
 
     /** @deprecated
         returns the minor version number.
 
         We currently don't support a versioning concept of IDL interfaces and
         so this function is currently not used.
-     */
-    inline sal_uInt16       getMinorVersion() const;
+     */   
+    inline sal_uInt16		getMinorVersion() const;
 
     /** @deprecated
         returns the major version number.
 
         We currently don't support a versioning concept of IDL interfaces and
         so this function is currently not used.
-     */
-    inline sal_uInt16       getMajorVersion() const;
+     */   
+    inline sal_uInt16		getMajorVersion() const;
 
     /** returns the typeclass of the type represented by this blob.
 
         This function will always return the type class without the internal
         RT_TYPE_PUBLISHED flag set.
-     */
-    inline RTTypeClass      getTypeClass() const;
+     */   
+    inline RTTypeClass 		getTypeClass() const;
 
     /** returns the full qualified name of the type.
-     */
-    inline ::rtl::OUString  getTypeName() const;
+     */   
+    inline ::rtl::OUString 	getTypeName() const;
 
     /** returns the full qualified name of the supertype.
-     */
-    inline ::rtl::OUString  getSuperTypeName() const;
+     */   
+    inline ::rtl::OUString 	getSuperTypeName() const;
 
     /** @deprecated
         returns the unique identifier for an interface type as an out parameter.
 
         An earlier version of UNO used an unique identifier for interfaces. In the
-        current version of UNO this uik was eliminated and this function is
+        current version of UNO this uik was eliminated and this function is 
         not longer used.
-     */
-    inline void             getUik(RTUik& uik) const;
+     */   
+    inline void				getUik(RTUik& uik) const;
 
     /** returns the documentation string of this type.
-     */
-    inline ::rtl::OUString  getDoku() const;
+     */   
+    inline ::rtl::OUString 	getDoku() const;
 
     /** returns the IDL filename where the type is defined.
-     */
-    inline ::rtl::OUString  getFileName() const;
+     */   
+    inline ::rtl::OUString 	getFileName() const;
 
     /** returns the number of fields (attributes/properties, enum values or number
         of constants in a module).
-
-     */
-    inline sal_uInt32       getFieldCount() const;
+        
+     */   
+    inline sal_uInt32		getFieldCount() const;
 
     /** returns the name of the field specified by index.
-     */
-    inline ::rtl::OUString  getFieldName( sal_uInt16 index ) const;
+     */   
+    inline ::rtl::OUString 	getFieldName( sal_uInt16 index ) const;
 
     /** returns the full qualified name of the field specified by index.
-     */
-    inline ::rtl::OUString  getFieldType( sal_uInt16 index ) const;
+     */   
+    inline ::rtl::OUString	getFieldType( sal_uInt16 index ) const;
 
     /** returns the access mode of the field specified by index.
-     */
-    inline RTFieldAccess    getFieldAccess( sal_uInt16 index ) const;
+     */   
+    inline RTFieldAccess	getFieldAccess( sal_uInt16 index ) const;
 
     /** returns the value of the field specified by index.
 
         This function returns the value of an enum value or of a constant.
-     */
-    inline RTConstValue     getFieldConstValue( sal_uInt16 index ) const;
+     */   
+    inline RTConstValue		getFieldConstValue( sal_uInt16 index ) const;
 
     /** returns the documentation string for the field specified by index.
 
         Each field of a type can have their own documentation.
-     */
-    inline ::rtl::OUString  getFieldDoku( sal_uInt16 index ) const;
+     */   
+    inline ::rtl::OUString 	getFieldDoku( sal_uInt16 index ) const;
 
     /** returns the IDL filename of the field specified by index.
 
         The IDL filename of a field can differ from the filename of the ype itself
-        because modules and also constants can be defined in different IDL files.
-     */
-    inline ::rtl::OUString  getFieldFileName( sal_uInt16 index ) const;
+        because modules and also constants can be defined in different IDL files. 
+     */   
+    inline ::rtl::OUString 	getFieldFileName( sal_uInt16 index ) const;
 
     /** returns the number of methods of an interface type.
-     */
-    inline sal_uInt32       getMethodCount() const;
+     */   
+    inline sal_uInt32		getMethodCount() const;
 
     /** returns the name of the method specified by index.
-     */
-    inline ::rtl::OUString  getMethodName( sal_uInt16 index ) const;
+     */   
+    inline ::rtl::OUString 	getMethodName( sal_uInt16 index ) const;
 
     /** returns number of parameters of the method specified by index.
-     */
-    inline sal_uInt32       getMethodParamCount( sal_uInt16 index ) const;
+     */   
+    inline sal_uInt32    	getMethodParamCount( sal_uInt16 index ) const;
 
     /** returns the full qualified parameter typename.
 
         @param index indicates the method
         @param paramIndex indeciates the parameter which type will be returned.
-     */
-    inline ::rtl::OUString  getMethodParamType( sal_uInt16 index, sal_uInt16 paramIndex ) const;
+     */   
+    inline ::rtl::OUString 	getMethodParamType( sal_uInt16 index, sal_uInt16 paramIndex ) const;
 
     /** returns the name of a parameter.
 
         @param index indicates the method
         @param paramIndex indiciates the parameter which name will be returned.
-     */
-    inline ::rtl::OUString  getMethodParamName( sal_uInt16 index, sal_uInt16 paramIndex ) const;
+     */   
+    inline ::rtl::OUString 	getMethodParamName( sal_uInt16 index, sal_uInt16 paramIndex ) const;
 
     /** returns the parameter mode, if it is an in, out or inout parameter.
 
         @param index indicates the method
         @param paramIndex indeciates the parameter which mode will be returned.
-     */
-    inline RTParamMode      getMethodParamMode( sal_uInt16 index, sal_uInt16 paramIndex ) const;
+     */   
+    inline RTParamMode		getMethodParamMode( sal_uInt16 index, sal_uInt16 paramIndex ) const;
 
     /** returns the number of exceptions which are declared for the method specified by index.
 
         @param index indicates the method
-     */
-    inline sal_uInt32       getMethodExcCount( sal_uInt16 index ) const;
+     */   
+    inline sal_uInt32    	getMethodExcCount( sal_uInt16 index ) const;
 
     /** returns the full qualified exception type of the specified exception.
-
+        
         @param index indicates the method
         @param paramIndex indeciates the exception which typename will be returned.
-     */
-    inline ::rtl::OUString  getMethodExcType( sal_uInt16 index, sal_uInt16 excIndex ) const;
+     */   
+    inline ::rtl::OUString 	getMethodExcType( sal_uInt16 index, sal_uInt16 excIndex ) const;
 
     /** returns the full qualified return type of the method specified by index.
-     */
-    inline ::rtl::OUString  getMethodReturnType( sal_uInt16 index ) const;
+     */   
+    inline ::rtl::OUString 	getMethodReturnType( sal_uInt16 index ) const;
 
     /** returns the full qualified exception type of the specified exception.
-
+        
         @param index indicates the method
         @param paramIndex indeciates the exception which typename will be returned.
-     */
-    inline RTMethodMode     getMethodMode( sal_uInt16 index ) const;
+     */   
+    inline RTMethodMode		getMethodMode( sal_uInt16 index ) const;
 
     /** returns the documentation string of the method specified by index.
 
         @param index indicates the method.
-     */
-    inline ::rtl::OUString  getMethodDoku( sal_uInt16 index ) const;
+     */   
+    inline ::rtl::OUString 	getMethodDoku( sal_uInt16 index ) const;
 
     /** returns the number of references (supported interfaces, exported services).
-     */
-    inline sal_uInt32       getReferenceCount() const;
+     */   
+    inline sal_uInt32		getReferenceCount() const;
 
     /** returns the full qualified typename of the reference specified by index.
 
         @param index indicates the reference.
-     */
-    inline ::rtl::OUString  getReferenceName( sal_uInt16 index ) const;
+     */   
+    inline ::rtl::OUString 	getReferenceName( sal_uInt16 index ) const;
 
     /** returns the type of the reference specified by index.
 
         @param index indicates the reference.
-     */
-    inline RTReferenceType  getReferenceType( sal_uInt16 index ) const;
+     */   
+    inline RTReferenceType	getReferenceType( sal_uInt16 index ) const;
 
     /** returns the documentation string of the reference specified by index.
-
+ 
         @param index indicates the reference.
-    */
-    inline ::rtl::OUString  getReferenceDoku( sal_uInt16 index ) const;
+    */   
+    inline ::rtl::OUString 	getReferenceDoku( sal_uInt16 index ) const;
 
     /** returns the access mode of the reference specified by index.
 
         The only valid value is RT_ACCESS_OPTIONAL in the context of
         references.
         @param index indicates the reference.
-     */
-    inline RTFieldAccess    getReferenceAccess( sal_uInt16 index ) const;
+     */   
+    inline RTFieldAccess	getReferenceAccess( sal_uInt16 index ) const;
 
 protected:
 
     /// stores the registry type reader Api.
-    const RegistryTypeReader_Api*                               m_pApi;
+    const RegistryTypeReader_Api*							    m_pApi;
     /// stores the handle of an implementation class
-    TypeReaderImpl                                              m_hImpl;
-};
+    TypeReaderImpl												m_hImpl;
+};		
 
 
 
-inline RegistryTypeReader::RegistryTypeReader(const sal_uInt8* buffer,
-                                              sal_uInt32 bufferLen,
+inline RegistryTypeReader::RegistryTypeReader(const sal_uInt8* buffer, 
+                                              sal_uInt32 bufferLen, 
                                               sal_Bool copyData)
     : m_pApi(initRegistryTypeReader_Api())
     , m_hImpl(NULL)
-    {
+    { 
         m_hImpl = m_pApi->createEntry(buffer, bufferLen, copyData);
     }
 
@@ -342,7 +342,7 @@ inline RegistryTypeReader::~RegistryTypeReader()
     {  m_pApi->release(m_hImpl); }
 
 inline RegistryTypeReader& RegistryTypeReader::operator == (const RegistryTypeReader& toAssign)
-{
+{ 
     if (m_hImpl != toAssign.m_hImpl)
     {
         m_pApi->release(m_hImpl);
@@ -366,14 +366,14 @@ inline RTTypeClass RegistryTypeReader::getTypeClass() const
     {  return m_pApi->getTypeClass(m_hImpl); }
 
 inline ::rtl::OUString RegistryTypeReader::getTypeName() const
-    {
+    {  
         ::rtl::OUString sRet;
-        m_pApi->getTypeName(m_hImpl, &sRet.pData);
+        m_pApi->getTypeName(m_hImpl, &sRet.pData); 
         return sRet;
     }
 
 inline ::rtl::OUString RegistryTypeReader::getSuperTypeName() const
-    {
+    {  
         ::rtl::OUString sRet;
         m_pApi->getSuperTypeName(m_hImpl, &sRet.pData);
         return sRet;
@@ -383,33 +383,33 @@ inline void RegistryTypeReader::getUik(RTUik& uik) const
     {  m_pApi->getUik(m_hImpl, &uik); }
 
 inline ::rtl::OUString RegistryTypeReader::getDoku() const
-    {
+    {  
         ::rtl::OUString sRet;
-        m_pApi->getDoku(m_hImpl, &sRet.pData);
+        m_pApi->getDoku(m_hImpl, &sRet.pData); 
         return sRet;
     }
 
 inline ::rtl::OUString RegistryTypeReader::getFileName() const
-    {
+    {  
         ::rtl::OUString sRet;
-        m_pApi->getFileName(m_hImpl, &sRet.pData);
+        m_pApi->getFileName(m_hImpl, &sRet.pData); 
         return sRet;
     }
 
 inline sal_uInt32 RegistryTypeReader::getFieldCount() const
-    {   return m_pApi->getFieldCount(m_hImpl); }
+    {  	return m_pApi->getFieldCount(m_hImpl); }
 
 inline ::rtl::OUString RegistryTypeReader::getFieldName( sal_uInt16 index ) const
-    {
+    {  
         ::rtl::OUString sRet;
-        m_pApi->getFieldName(m_hImpl, &sRet.pData, index);
+        m_pApi->getFieldName(m_hImpl, &sRet.pData, index); 
         return sRet;
     }
 
 inline ::rtl::OUString RegistryTypeReader::getFieldType( sal_uInt16 index ) const
-    {
+    {  
         ::rtl::OUString sRet;
-        m_pApi->getFieldType(m_hImpl, &sRet.pData, index);
+        m_pApi->getFieldType(m_hImpl, &sRet.pData, index); 
         return sRet;
     }
 
@@ -417,23 +417,23 @@ inline RTFieldAccess RegistryTypeReader::getFieldAccess( sal_uInt16 index ) cons
     {  return m_pApi->getFieldAccess(m_hImpl, index); }
 
 inline RTConstValue RegistryTypeReader::getFieldConstValue( sal_uInt16 index ) const
-    {
+    {  
         RTConstValue ret;
-        ret.m_type = m_pApi->getFieldConstValue(m_hImpl, index, &ret.m_value);
+        ret.m_type = m_pApi->getFieldConstValue(m_hImpl, index, &ret.m_value); 
         return ret;
     }
 
 inline ::rtl::OUString RegistryTypeReader::getFieldDoku( sal_uInt16 index ) const
-    {
+    {  
         ::rtl::OUString sRet;
-        m_pApi->getFieldDoku(m_hImpl, &sRet.pData, index);
+        m_pApi->getFieldDoku(m_hImpl, &sRet.pData, index); 
         return sRet;
     }
 
 inline ::rtl::OUString RegistryTypeReader::getFieldFileName( sal_uInt16 index ) const
-    {
+    {  
         ::rtl::OUString sRet;
-        m_pApi->getFieldFileName(m_hImpl, &sRet.pData, index);
+        m_pApi->getFieldFileName(m_hImpl, &sRet.pData, index); 
         return sRet;
     }
 
@@ -441,9 +441,9 @@ inline sal_uInt32 RegistryTypeReader::getMethodCount() const
     {  return m_pApi->getMethodCount(m_hImpl); }
 
 inline ::rtl::OUString RegistryTypeReader::getMethodName( sal_uInt16 index ) const
-    {
+    {  
         ::rtl::OUString sRet;
-        m_pApi->getMethodName(m_hImpl, &sRet.pData, index);
+        m_pApi->getMethodName(m_hImpl, &sRet.pData, index); 
         return sRet;
     }
 
@@ -451,16 +451,16 @@ inline sal_uInt32 RegistryTypeReader::getMethodParamCount( sal_uInt16 index ) co
     {  return m_pApi->getMethodParamCount(m_hImpl, index); }
 
 inline ::rtl::OUString RegistryTypeReader::getMethodParamType( sal_uInt16 index, sal_uInt16 paramIndex ) const
-    {
+    {  
         ::rtl::OUString sRet;
-        m_pApi->getMethodParamType(m_hImpl, &sRet.pData, index, paramIndex);
+        m_pApi->getMethodParamType(m_hImpl, &sRet.pData, index, paramIndex); 
         return sRet;
     }
 
 inline ::rtl::OUString RegistryTypeReader::getMethodParamName( sal_uInt16 index, sal_uInt16 paramIndex ) const
-    {
+    {  
         ::rtl::OUString sRet;
-        m_pApi->getMethodParamName(m_hImpl, &sRet.pData, index, paramIndex);
+        m_pApi->getMethodParamName(m_hImpl, &sRet.pData, index, paramIndex); 
         return sRet;
     }
 
@@ -471,16 +471,16 @@ inline sal_uInt32 RegistryTypeReader::getMethodExcCount( sal_uInt16 index ) cons
     {  return m_pApi->getMethodExcCount(m_hImpl, index); }
 
 inline ::rtl::OUString RegistryTypeReader::getMethodExcType( sal_uInt16 index, sal_uInt16 excIndex ) const
-    {
+    {  
         ::rtl::OUString sRet;
-        m_pApi->getMethodExcType(m_hImpl, &sRet.pData, index, excIndex);
+        m_pApi->getMethodExcType(m_hImpl, &sRet.pData, index, excIndex); 
         return sRet;
     }
 
 inline ::rtl::OUString RegistryTypeReader::getMethodReturnType( sal_uInt16 index ) const
-    {
+    {  
         ::rtl::OUString sRet;
-        m_pApi->getMethodReturnType(m_hImpl, &sRet.pData, index);
+        m_pApi->getMethodReturnType(m_hImpl, &sRet.pData, index); 
         return sRet;
     }
 
@@ -488,9 +488,9 @@ inline RTMethodMode RegistryTypeReader::getMethodMode( sal_uInt16 index ) const
     {  return m_pApi->getMethodMode(m_hImpl, index); }
 
 inline ::rtl::OUString RegistryTypeReader::getMethodDoku( sal_uInt16 index ) const
-    {
+    {  
         ::rtl::OUString sRet;
-        m_pApi->getMethodDoku(m_hImpl, &sRet.pData, index);
+        m_pApi->getMethodDoku(m_hImpl, &sRet.pData, index); 
         return sRet;
     }
 
@@ -498,9 +498,9 @@ inline sal_uInt32 RegistryTypeReader::getReferenceCount() const
     {  return m_pApi->getReferenceCount(m_hImpl); }
 
 inline ::rtl::OUString RegistryTypeReader::getReferenceName( sal_uInt16 index ) const
-    {
+    {  
         ::rtl::OUString sRet;
-        m_pApi->getReferenceName(m_hImpl, &sRet.pData, index);
+        m_pApi->getReferenceName(m_hImpl, &sRet.pData, index); 
         return sRet;
     }
 
@@ -508,9 +508,9 @@ inline RTReferenceType RegistryTypeReader::getReferenceType( sal_uInt16 index )
     {  return m_pApi->getReferenceType(m_hImpl, index); }
 
 inline ::rtl::OUString RegistryTypeReader::getReferenceDoku( sal_uInt16 index ) const
-    {
+    {  
         ::rtl::OUString sRet;
-        m_pApi->getReferenceDoku(m_hImpl, &sRet.pData, index);
+        m_pApi->getReferenceDoku(m_hImpl, &sRet.pData, index); 
         return sRet;
     }
 
diff --git a/registry/inc/registry/refltype.hxx b/registry/inc/registry/refltype.hxx
index b1267e4097e7..8ebae745a984 100644
--- a/registry/inc/registry/refltype.hxx
+++ b/registry/inc/registry/refltype.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
     Currently only RT_UNO_IDL type is used.
  */
 enum RTTypeSource
-{
+{ 
     RT_UNO_IDL,
     RT_CORBA_IDL,
     RT_JAVA
@@ -52,13 +52,13 @@ class RTConstValue
 {
 public:
     /// stores the type of the constant value.
-    RTValueType         m_type;
+    RTValueType 		m_type;
     /// stores the value of the constant.
     RTConstValueUnion m_value;
 
     /// Default constructor.
-    RTConstValue()
-        : m_type(RT_TYPE_NONE)
+    RTConstValue() 
+        : m_type(RT_TYPE_NONE) 
     {
         m_value.aDouble = 0.0;
     }
@@ -82,7 +82,7 @@ struct RTUik
 };
 
 /// specifies the calling onvention for type reader/wrter api
-#define TYPEREG_CALLTYPE    SAL_CALL
+#define TYPEREG_CALLTYPE	SAL_CALL
 
 #endif
 
diff --git a/registry/inc/registry/reflwrit.hxx b/registry/inc/registry/reflwrit.hxx
index 2a326c5c40fb..2fc162990784 100644
--- a/registry/inc/registry/reflwrit.hxx
+++ b/registry/inc/registry/reflwrit.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 typedef void* TypeWriterImpl;
 
 /****************************************************************************
-
+    
     C-Api
 
 *****************************************************************************/
@@ -47,25 +47,25 @@ extern "C" {
 #endif
 
 /** specifies a collection of function pointers which represents the complete registry type writer C-API.
-
+    
     This funtions pointers are used by the C++ wrapper to call the C-API.
 */
 struct RegistryTypeWriter_Api
 {
-    TypeWriterImpl          (TYPEREG_CALLTYPE *createEntry)         (RTTypeClass, rtl_uString*, rtl_uString*, sal_uInt16, sal_uInt16, sal_uInt16);
-    void                    (TYPEREG_CALLTYPE *acquire)             (TypeWriterImpl);
-    void                    (TYPEREG_CALLTYPE *release)             (TypeWriterImpl);
-    void                    (TYPEREG_CALLTYPE *setUik)              (TypeWriterImpl, const RTUik*);
-    void                    (TYPEREG_CALLTYPE *setDoku)             (TypeWriterImpl, rtl_uString*);
-    void                    (TYPEREG_CALLTYPE *setFileName)         (TypeWriterImpl, rtl_uString*);
-    void                    (TYPEREG_CALLTYPE *setFieldData)        (TypeWriterImpl, sal_uInt16, rtl_uString*, rtl_uString*, rtl_uString*, rtl_uString*, RTFieldAccess, RTValueType, RTConstValueUnion);
-    void                    (TYPEREG_CALLTYPE *setMethodData)       (TypeWriterImpl, sal_uInt16, rtl_uString*, rtl_uString*, RTMethodMode, sal_uInt16, sal_uInt16, rtl_uString*);
-    void                    (TYPEREG_CALLTYPE *setParamData)        (TypeWriterImpl, sal_uInt16, sal_uInt16, rtl_uString*, rtl_uString*, RTParamMode);
-    void                    (TYPEREG_CALLTYPE *setExcData)          (TypeWriterImpl, sal_uInt16, sal_uInt16, rtl_uString*);
-    const sal_uInt8*        (TYPEREG_CALLTYPE *getBlop)             (TypeWriterImpl);
-    sal_uInt32              (TYPEREG_CALLTYPE *getBlopSize)         (TypeWriterImpl);
-
-    void                    (TYPEREG_CALLTYPE *setReferenceData)    (TypeWriterImpl, sal_uInt16, rtl_uString*, RTReferenceType, rtl_uString*, RTFieldAccess);
+    TypeWriterImpl	 		(TYPEREG_CALLTYPE *createEntry) 		(RTTypeClass, rtl_uString*, rtl_uString*, sal_uInt16, sal_uInt16, sal_uInt16);
+    void					(TYPEREG_CALLTYPE *acquire) 			(TypeWriterImpl);
+    void					(TYPEREG_CALLTYPE *release) 			(TypeWriterImpl);
+    void					(TYPEREG_CALLTYPE *setUik) 				(TypeWriterImpl, const RTUik*);
+    void					(TYPEREG_CALLTYPE *setDoku)				(TypeWriterImpl, rtl_uString*);
+    void					(TYPEREG_CALLTYPE *setFileName)			(TypeWriterImpl, rtl_uString*);
+    void 					(TYPEREG_CALLTYPE *setFieldData) 		(TypeWriterImpl, sal_uInt16, rtl_uString*, rtl_uString*, rtl_uString*, rtl_uString*, RTFieldAccess,	RTValueType, RTConstValueUnion);
+    void 					(TYPEREG_CALLTYPE *setMethodData)		(TypeWriterImpl, sal_uInt16, rtl_uString*, rtl_uString*, RTMethodMode, sal_uInt16, sal_uInt16, rtl_uString*);
+    void 					(TYPEREG_CALLTYPE *setParamData)		(TypeWriterImpl, sal_uInt16, sal_uInt16, rtl_uString*, rtl_uString*, RTParamMode);
+    void 					(TYPEREG_CALLTYPE *setExcData)			(TypeWriterImpl, sal_uInt16, sal_uInt16, rtl_uString*);
+    const sal_uInt8*		(TYPEREG_CALLTYPE *getBlop)				(TypeWriterImpl);
+    sal_uInt32 				(TYPEREG_CALLTYPE *getBlopSize)			(TypeWriterImpl);
+
+    void 					(TYPEREG_CALLTYPE *setReferenceData) 	(TypeWriterImpl, sal_uInt16, rtl_uString*, RTReferenceType, rtl_uString*, RTFieldAccess);
 };
 
 /** the API initialization function.
@@ -90,7 +90,7 @@ class RegistryTypeWriter
 public:
 
     /** Constructor.
-
+        
         @param RTTypeClass specifies the type of the new blob.
         @param typeName specifies the full qualified type name with '/' as separator.
         @param superTypeName specifies the full qualified type name of the base type
@@ -101,12 +101,12 @@ public:
         @param referenceCount specifies the number of references (eg. number of supported interfaces,
                               exported services ...)
      */
-    inline RegistryTypeWriter(RTTypeClass               RTTypeClass,
-                              const ::rtl::OUString&    typeName,
-                              const ::rtl::OUString&    superTypeName,
-                              sal_uInt16                fieldCount,
-                              sal_uInt16                methodCount,
-                              sal_uInt16                referenceCount);
+    inline RegistryTypeWriter(RTTypeClass 				RTTypeClass,
+                              const ::rtl::OUString& 	typeName,
+                              const ::rtl::OUString& 	superTypeName,
+                              sal_uInt16 				fieldCount,
+                              sal_uInt16 				methodCount,
+                              sal_uInt16				referenceCount);
 
     /// Copy constructcor
     inline RegistryTypeWriter(const RegistryTypeWriter& toCopy);
@@ -114,7 +114,7 @@ public:
     /** Destructor. The Destructor frees the internal data block.
 
         The pointer (returned by getBlop) will be set to NULL.
-     */
+     */    
     inline ~RegistryTypeWriter();
 
     /// Assign operator
@@ -124,20 +124,20 @@ public:
         sets the unique identifier for an interface type.
 
         An earlier version of UNO used an unique identifier for interfaces. In the
-        current version of UNO this uik was eliminated and this function is
+        current version of UNO this uik was eliminated and this function is 
         not longer used.
-     */
+     */   
     inline void setUik(const RTUik& uik);
 
     /** sets a documentation string for the type.
 
         This documentation should be the same as the documentation which is provided
         for this type in IDL.
-     */
+     */   
     inline void setDoku(const ::rtl::OUString& doku);
 
     /** sets the IDL filename where this type is defined.
-     */
+     */   
     inline void setFileName(const ::rtl::OUString& fileName);
 
     /** sets the data for a field member of a type blob.
@@ -150,14 +150,14 @@ public:
         @param access specifies the access mode of the field.
         @param constValue specifies the value of the field. The value is only interesting
                           for enum values or constants.
-     */
-    inline void setFieldData( sal_uInt16                index,
-                              const ::rtl::OUString&    name,
-                              const ::rtl::OUString&    typeName,
-                              const ::rtl::OUString&    doku,
-                              const ::rtl::OUString&    fileName,
-                              RTFieldAccess             access,
-                              RTConstValue              constValue = RTConstValue());
+     */   
+    inline void setFieldData( sal_uInt16 				index, 
+                              const ::rtl::OUString& 	name,
+                              const ::rtl::OUString& 	typeName,
+                              const ::rtl::OUString&	doku,
+                              const ::rtl::OUString& 	fileName,
+                              RTFieldAccess 			access,
+                              RTConstValue 				constValue = RTConstValue());
 
     /** sets the data for a method.
 
@@ -168,14 +168,14 @@ public:
         @param paramCount specifies the number of parameters.
         @param excCount specifies the number of exceptions.
         @param doku specifies the documentation string of the field.
-     */
-    inline void setMethodData(sal_uInt16                index,
-                              const ::rtl::OUString&    name,
-                              const ::rtl::OUString&    returnTypeName,
-                              RTMethodMode              mode,
-                              sal_uInt16                paramCount,
-                              sal_uInt16                excCount,
-                              const ::rtl::OUString&    doku);
+     */   
+    inline void setMethodData(sal_uInt16				index,
+                              const ::rtl::OUString& 	name,
+                              const ::rtl::OUString& 	returnTypeName,
+                              RTMethodMode				mode,
+                              sal_uInt16				paramCount,
+                              sal_uInt16				excCount,
+                              const ::rtl::OUString&	doku);
 
     /** sets the data for the specified parameter of a method.
 
@@ -184,64 +184,64 @@ public:
         @param type specifies the full qualified typename.
         @param name specifies the name.
         @param mode specifies the parameter mode.
-     */
-    inline void setParamData(sal_uInt16             index,
-                             sal_uInt16             paramIndex,
-                             const ::rtl::OUString& type,
-                             const ::rtl::OUString& name,
-                             RTParamMode            mode);
+     */   
+    inline void setParamData(sal_uInt16				index,
+                             sal_uInt16				paramIndex,
+                             const ::rtl::OUString&	type,
+                             const ::rtl::OUString&	name,
+                             RTParamMode			mode);
 
     /** sets the data for the specified exception of a mehtod.
-
+        
         @param index indicates the index of the method.
         @param excIndex specifies the index of the exception.
         @param type specifies the full qualified typename of the exception.
-     */
-    inline void setExcData(sal_uInt16               index,
-                           sal_uInt16               excIndex,
-                           const ::rtl::OUString&   type);
+     */   
+    inline void setExcData(sal_uInt16				index,
+                           sal_uInt16				excIndex,
+                           const ::rtl::OUString&	type);
 
     /** returns a pointer to the new type blob.
 
         The pointer will be invalid (NULL) if the instance of
         the RegistryTypeWriter will be destroyed.
-     */
-    inline const sal_uInt8*     getBlop();
+     */   
+    inline const sal_uInt8* 	getBlop();
 
     /** returns the size of the new type blob in bytes.
-     */
-    inline sal_uInt32       getBlopSize();
+     */   
+    inline sal_uInt32 		getBlopSize();
 
     /** sets the data for a reference member.
-
+        
         @param index indicates the index of the reference.
         @param name specifies the name.
         @param refType specifies the full qualified typename of the reference.
         @param doku specifies the documentation string of the reference.
         @param access specifies the access mode of the reference.
-     */
-    inline void setReferenceData( sal_uInt16                index,
-                                    const ::rtl::OUString&  name,
-                                    RTReferenceType             refType,
-                                    const ::rtl::OUString&  doku,
-                                    RTFieldAccess               access = RT_ACCESS_INVALID);
+     */   
+    inline void setReferenceData( sal_uInt16 				index, 
+                                    const ::rtl::OUString& 	name,
+                                    RTReferenceType 			refType,
+                                    const ::rtl::OUString& 	doku,
+                                    RTFieldAccess				access = RT_ACCESS_INVALID);
 
 protected:
 
     /// stores the registry type writer Api.
-    const RegistryTypeWriter_Api*                                m_pApi;
+    const RegistryTypeWriter_Api*								 m_pApi;
     /// stores the handle of an implementation class
-    TypeWriterImpl                                               m_hImpl;
-};
+    TypeWriterImpl												 m_hImpl;
+};		
 
 
 
-inline RegistryTypeWriter::RegistryTypeWriter(RTTypeClass               RTTypeClass,
-                                              const ::rtl::OUString&    typeName,
-                                              const ::rtl::OUString&    superTypeName,
-                                              sal_uInt16                fieldCount,
-                                              sal_uInt16                methodCount,
-                                              sal_uInt16                referenceCount)
+inline RegistryTypeWriter::RegistryTypeWriter(RTTypeClass 				RTTypeClass,
+                                              const ::rtl::OUString& 	typeName,
+                                              const ::rtl::OUString& 	superTypeName,
+                                              sal_uInt16 				fieldCount,
+                                              sal_uInt16 				methodCount,
+                                              sal_uInt16				referenceCount)
     : m_pApi(initRegistryTypeWriter_Api())
     , m_hImpl(NULL)
 {
@@ -257,17 +257,17 @@ inline RegistryTypeWriter::RegistryTypeWriter(RTTypeClass               RTTypeCl
 inline RegistryTypeWriter::RegistryTypeWriter(const RegistryTypeWriter& toCopy)
     : m_pApi(toCopy.m_pApi)
     , m_hImpl(toCopy.m_hImpl)
-{
-    m_pApi->acquire(m_hImpl);
+{ 
+    m_pApi->acquire(m_hImpl); 
 }
 
 inline RegistryTypeWriter::~RegistryTypeWriter()
-{
+{  
     m_pApi->release(m_hImpl);
 }
 
 inline RegistryTypeWriter& RegistryTypeWriter::operator == (const RegistryTypeWriter& toAssign)
-{
+{ 
     if (m_hImpl != toAssign.m_hImpl)
     {
         m_pApi->release(m_hImpl);
@@ -278,25 +278,25 @@ inline RegistryTypeWriter& RegistryTypeWriter::operator == (const RegistryTypeWr
     return *this;
 }
 
-inline void RegistryTypeWriter::setFieldData( sal_uInt16                index,
-                                              const ::rtl::OUString&    name,
-                                              const ::rtl::OUString&    typeName,
-                                              const ::rtl::OUString&    doku,
-                                              const ::rtl::OUString&    fileName,
-                                              RTFieldAccess             access,
-                                              RTConstValue              constValue)
+inline void RegistryTypeWriter::setFieldData( sal_uInt16 				index, 
+                                              const ::rtl::OUString& 	name,
+                                              const ::rtl::OUString& 	typeName,
+                                              const ::rtl::OUString&	doku,
+                                              const ::rtl::OUString&	fileName,
+                                              RTFieldAccess 			access,
+                                              RTConstValue 				constValue)
 {
     m_pApi->setFieldData(m_hImpl, index, name.pData, typeName.pData, doku.pData, fileName.pData, access, constValue.m_type, constValue.m_value);
 }
 
 
-inline void RegistryTypeWriter::setMethodData(sal_uInt16                index,
-                                              const ::rtl::OUString&    name,
-                                              const ::rtl::OUString&    returnTypeName,
-                                              RTMethodMode              mode,
-                                              sal_uInt16                paramCount,
-                                              sal_uInt16                excCount,
-                                              const ::rtl::OUString&    doku)
+inline void RegistryTypeWriter::setMethodData(sal_uInt16				index,
+                                              const ::rtl::OUString& 	name,
+                                              const ::rtl::OUString& 	returnTypeName,
+                                              RTMethodMode				mode,
+                                              sal_uInt16				paramCount,
+                                              sal_uInt16				excCount,
+                                              const ::rtl::OUString&	doku)
 {
     m_pApi->setMethodData(m_hImpl, index, name.pData, returnTypeName.pData, mode, paramCount, excCount, doku.pData);
 }
@@ -317,18 +317,18 @@ inline void RegistryTypeWriter::setFileName(const ::rtl::OUString& doku)
     m_pApi->setFileName(m_hImpl, doku.pData);
 }
 
-inline void RegistryTypeWriter::setParamData(sal_uInt16             index,
-                                             sal_uInt16             paramIndex,
-                                             const ::rtl::OUString& type,
-                                             const ::rtl::OUString& name,
-                                             RTParamMode            mode)
+inline void RegistryTypeWriter::setParamData(sal_uInt16				index,
+                                             sal_uInt16				paramIndex,
+                                             const ::rtl::OUString&	type,
+                                             const ::rtl::OUString&	name,
+                                             RTParamMode			mode)
 {
     m_pApi->setParamData(m_hImpl, index, paramIndex, type.pData, name.pData, mode);
 }
 
-inline void RegistryTypeWriter::setExcData(sal_uInt16               index,
-                                           sal_uInt16               excIndex,
-                                           const ::rtl::OUString&   type)
+inline void RegistryTypeWriter::setExcData(sal_uInt16				index,
+                                           sal_uInt16				excIndex,
+                                           const ::rtl::OUString&	type)
 {
     m_pApi->setExcData(m_hImpl, index, excIndex, type.pData);
 }
@@ -344,11 +344,11 @@ inline sal_uInt32 RegistryTypeWriter::getBlopSize()
 }
 
 
-inline void RegistryTypeWriter::setReferenceData( sal_uInt16                index,
-                                                    const ::rtl::OUString&  name,
-                                                    RTReferenceType             refType,
-                                                    const ::rtl::OUString&  doku,
-                                                    RTFieldAccess           access)
+inline void RegistryTypeWriter::setReferenceData( sal_uInt16 				index, 
+                                                    const ::rtl::OUString& 	name,
+                                                    RTReferenceType 			refType,
+                                                    const ::rtl::OUString& 	doku,
+                                                    RTFieldAccess 			access)
 {
     m_pApi->setReferenceData(m_hImpl, index, name.pData, refType, doku.pData, access);
 }
diff --git a/registry/inc/registry/registry.h b/registry/inc/registry/registry.h
index a35c9dfde82c..930f05ab8a45 100644
--- a/registry/inc/registry/registry.h
+++ b/registry/inc/registry/registry.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,276 +37,276 @@
 extern "C" {
 #endif  /* __cplusplus */
 
-/** This function creates the specified key.
+/**	This function creates the specified key.
 
     If the key already exists in the registry, the function opens the key only.
-    @param  hKey identifies a currently open key. The key which will be opened or created by this
+    @param	hKey identifies a currently open key. The key which will be opened or created by this
                  function is a subkey of the key identified by hKey.
-    @param  keyName points to a null terminated string specifying the name of a key.
-    @param  phNewKey points to a variable that receives the handle of the opened or created key.
-                     The memory to store this variable will be allocated and will be freed by the function
+    @param	keyName points to a null terminated string specifying the name of a key.
+    @param	phNewKey points to a variable that receives the handle of the opened or created key.
+                     The memory to store this variable will be allocated and will be freed by the function 
                      reg_closeKey. If the function fails, phNewKey is NULL.
-    @return REG_NO_ERROR if succeeds else an error code.
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_createKey(RegKeyHandle hKey,
-                                         rtl_uString* keyName,
+RegError REGISTRY_CALLTYPE reg_createKey(RegKeyHandle hKey, 
+                                         rtl_uString* keyName, 
                                          RegKeyHandle* phNewKey);
 
 
-/** This function opens the specified key.
-
-    @param  hKey identifies a currently open key. The key which will be opened by this function
+/**	This function opens the specified key.
+    
+    @param	hKey identifies a currently open key. The key which will be opened by this function 
                  is a subkey of the key identified by hKey
-    @param  keyName points to a null terminated string specifying the name of a key.
-    @param  phNewKey points to a variable that receives the handle of the opened key.
-                     The memory to store this variable will be allocated and will be freed by the function
+    @param	keyName points to a null terminated string specifying the name of a key.
+    @param	phNewKey points to a variable that receives the handle of the opened key. 
+                     The memory to store this variable will be allocated and will be freed by the function 
                      reg_closeKey. If the function fails, phNewKey is NULL.
-    @return REG_NO_ERROR if succeeds else an error code.
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_openKey(RegKeyHandle hKey,
-                                         rtl_uString* keyName,
+RegError REGISTRY_CALLTYPE reg_openKey(RegKeyHandle hKey, 
+                                         rtl_uString* keyName, 
                                          RegKeyHandle* phOpenKey);
+                      
 
 
+/**	This function opens all subkeys of the specified key.
 
-/** This function opens all subkeys of the specified key.
-
-    @param  hKey identifies a currently open key. The key that subkeys will be opened by this
+    @param	hKey identifies a currently open key. The key that subkeys will be opened by this 
                  function is a subkey of the key identified by hKey
-    @param  keyName points to a null terminated string specifying the name of a key whose subkeys
+    @param	keyName points to a null terminated string specifying the name of a key whose subkeys 
                     will be opened.
-    @param  pphSubKeys points to a variable that receives an array of all opened subkeys.
-                       The memory to store this variable will be allocated and will be freed by the function
+    @param	pphSubKeys points to a variable that receives an array of all opened subkeys. 
+                       The memory to store this variable will be allocated and will be freed by the function 
                        reg_closeSubKeys. If the function fails, pphSubKeys is NULL.
-    @param  pnSubKeys specifies the length of the array (the number of open subkeys).
-    @return REG_NO_ERROR if succeeds else an error code.
+    @param	pnSubKeys specifies the length of the array (the number of open subkeys).
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_openSubKeys(RegKeyHandle hKey,
-                                             rtl_uString* keyName,
-                                             RegKeyHandle** pphSubKeys,
+RegError REGISTRY_CALLTYPE reg_openSubKeys(RegKeyHandle hKey, 
+                                             rtl_uString* keyName, 
+                                             RegKeyHandle** pphSubKeys, 
                                              sal_uInt32* pnSubKeys);
 
 
-/** This function closes all subkeys specified in the array.
-
-    @param  phSubKeys points to a variable that containss an array of all opened subkeys.
+/**	This function closes all subkeys specified in the array.
+    
+    @param	phSubKeys points to a variable that containss an array of all opened subkeys. 
                       The allocated memory of pphSubKeys and all open subkeys will be freed.
-    @param  nSubKeys specifies the length of the array (the number of subkeys to closed).
-    @return REG_NO_ERROR if succeeds else an error code.
+    @param	nSubKeys specifies the length of the array (the number of subkeys to closed).
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_closeSubKeys(RegKeyHandle* phSubKeys,
+RegError REGISTRY_CALLTYPE reg_closeSubKeys(RegKeyHandle* phSubKeys, 
                                                sal_uInt32 nSubKeys);
 
 
-/** This function deletes the specified key.
-
-    @param  hKey identifies a currently open key. The key deleted by this function
+/**	This function deletes the specified key.
+    
+    @param	hKey identifies a currently open key. The key deleted by this function 
                  is a subkey of the key identified by hKey
-    @param  keyName points to a null terminated string specifying the name of a key which will
+    @param	keyName points to a null terminated string specifying the name of a key which will 
                     be deleted.
-    @return REG_NO_ERROR if succeeds else an error code.
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_deleteKey(RegKeyHandle hKey,
+RegError REGISTRY_CALLTYPE reg_deleteKey(RegKeyHandle hKey, 
                                          rtl_uString* keyName);
 
 
-/** This function closes the specified key.
-
-    @param  hKey identifies a currently open key which will be closed by this function.
+/**	This function closes the specified key.
+    
+    @param	hKey identifies a currently open key which will be closed by this function.
                  The memory of the variable specifying the key will be freed.
-    @return REG_NO_ERROR if succeeds else an error code.
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
 RegError REGISTRY_CALLTYPE reg_closeKey(RegKeyHandle hKey);
 
 
-/** This function returns the name of a key.
-
-    @param  hKey identifies a currently open key which name will be returned.
-    @param  pKeyName contains the keyname if succeeds else an empty string.
+/**	This function returns the name of a key.
+    
+    @param	hKey identifies a currently open key which name will be returned.
+    @param	pKeyName contains the keyname if succeeds else an empty string. 
 */
 RegError REGISTRY_CALLTYPE reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName);
 
 
-/** This function sets a value of a key.
-
-    @param  hKey identifies a currently open key. The key which value will be set by this
+/**	This function sets a value of a key.
+    
+    @param	hKey identifies a currently open key. The key which value will be set by this
                  function is a subkey of the key identified by hKey.
-    @param  keyName points to a null terminated string specifying the name of a key which value
+    @param	keyName points to a null terminated string specifying the name of a key which value
                     will be set. If keyName is NULL, then the value of the key specified by
                     hKey will be set.
-    @param  valueType specifies the type of the value.
-    @param  pData points to a memory block containing the data of the value.
-    @param  valueSize specifies the size of pData in bytes
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-RegError REGISTRY_CALLTYPE reg_setValue(RegKeyHandle hKey,
-                                           rtl_uString* keyName,
-                                           RegValueType valueType,
-                                           RegValue pData,
+    @param	valueType specifies the type of the value.
+    @param	pData points to a memory block containing the data of the value.
+    @param	valueSize specifies the size of pData in bytes
+    @return	REG_NO_ERROR if succeeds else an error code. 
+*/
+RegError REGISTRY_CALLTYPE reg_setValue(RegKeyHandle hKey, 
+                                           rtl_uString* keyName, 
+                                           RegValueType valueType, 
+                                           RegValue pData, 
                                            sal_uInt32 valueSize);
 
 
-/** This function sets an long list value of a key.
-
-    @param  keyName points to a null terminated string specifying the name of a key which value
+/**	This function sets an long list value of a key.
+    
+    @param	keyName	points to a null terminated string specifying the name of a key which value
                     will be set. If keyName is NULL, then the value of the key specified by
-                    hKey will be set.
-    @param  pValueList points to an array of longs containing the data of the value.
-    @param  len specifies the len of pValueList.
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-RegError REGISTRY_CALLTYPE reg_setLongListValue(RegKeyHandle hKey,
-                                                      rtl_uString* keyName,
-                                                      sal_Int32* pValueList,
+                    hKey will be set. 
+    @param	pValueList points to an array of longs containing the data of the value.
+    @param	len specifies the len of pValueList.
+    @return	REG_NO_ERROR if succeeds else an error code. 
+*/
+RegError REGISTRY_CALLTYPE reg_setLongListValue(RegKeyHandle hKey, 
+                                                      rtl_uString* keyName, 
+                                                      sal_Int32* pValueList, 
                                                       sal_uInt32 len);
 
 
-/** This function sets an ascii list value of a key.
-
-    @param  keyName points to a null terminated string specifying the name of a key which value
+/**	This function sets an ascii list value of a key.
+    
+    @param	keyName	points to a null terminated string specifying the name of a key which value
                     will be set. If keyName is NULL, then the value of the key specified by
                     hKey will be set.
-    @param  pValueList points to an array of sal_Char* containing the data of the value.
-    @param  len specifies the len of pValueList.
-    @return REG_NO_ERROR if succeeds else an error code.
+    @param	pValueList points to an array of sal_Char* containing the data of the value.
+    @param	len specifies the len of pValueList.
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_setStringListValue(RegKeyHandle hKey,
-                                                          rtl_uString* keyName,
-                                                          sal_Char** pValueList,
+RegError REGISTRY_CALLTYPE reg_setStringListValue(RegKeyHandle hKey, 
+                                                          rtl_uString* keyName, 
+                                                          sal_Char** pValueList, 
                                                           sal_uInt32 len);
 
 
-/** This function sets an unicode string list value of a key.
-
-    @param  keyName points to a null terminated string specifying the name of a key which value
+/**	This function sets an unicode string list value of a key.
+    
+    @param	keyName	points to a null terminated string specifying the name of a key which value
                     will be set. If keyName is NULL, then the value of the key specified by
                     hKey will be set.
-    @param  pValueList points to an array of sal_Unicode* containing the data of the value.
-    @param  len specifies the len of pValueList.
-    @return REG_NO_ERROR if succeeds else an error code.
+    @param	pValueList points to an array of sal_Unicode* containing the data of the value.
+    @param	len	specifies the len of pValueList.
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_setUnicodeListValue(RegKeyHandle hKey,
-                                                            rtl_uString* keyName,
-                                                            sal_Unicode** pValueList,
+RegError REGISTRY_CALLTYPE reg_setUnicodeListValue(RegKeyHandle hKey, 
+                                                            rtl_uString* keyName, 
+                                                            sal_Unicode** pValueList, 
                                                             sal_uInt32 len);
 
 
-/** This function gets info about type and size of a key value.
-
-    @param  hKey identifies a currently open key. The key which value info will be got by this
+/**	This function gets info about type and size of a key value.
+    
+    @param	hKey identifies a currently open key. The key which value info will be got by this
                  function is a subkey of the key identified by hKey.
-    @param  keyName points to a null terminated string specifying the name of a key which value
+    @param	keyName points to a null terminated string specifying the name of a key which value
                     will be got. If keyName is NULL, then the value info of the key specified by
                     hKey will be got.
-    @param  pValueType returns the type of the value.
-    @param  pValueSize returns the size of the value in bytes
-    @return REG_NO_ERROR if succeeds else an error code.
+    @param	pValueType returns the type of the value.
+    @param	pValueSize returns the size of the value in bytes
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_getValueInfo(RegKeyHandle hKey,
-                                               rtl_uString* keyName,
-                                               RegValueType* pValueType,
+RegError REGISTRY_CALLTYPE reg_getValueInfo(RegKeyHandle hKey, 
+                                               rtl_uString* keyName, 
+                                               RegValueType* pValueType, 
                                                sal_uInt32* pValueSize);
 
 
-/** This function gets the value of a key.
-
-    @param  hKey identifies a currently open key. The key which value will be got by this
+/**	This function gets the value of a key.
+    
+    @param	hKey identifies a currently open key. The key which value will be got by this
                  function is a subkey of the key identified by hKey.
-    @param  keyName points to a null terminated string specifying the name of a key which value
+    @param	keyName	points to a null terminated string specifying the name of a key which value
                     will be got. If keyName is NULL, then the value of the key specified by
                     hKey will be got.
-    @param  pData points to an allocated memory block receiving the data of the value.
-    @return REG_NO_ERROR if succeeds else an error code.
+    @param	pData points to an allocated memory block receiving the data of the value. 
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_getValue(RegKeyHandle hKey,
-                                           rtl_uString* keyName,
+RegError REGISTRY_CALLTYPE reg_getValue(RegKeyHandle hKey, 
+                                           rtl_uString* keyName, 
                                            RegValue pData);
 
 
-/** This function gets the long list value of a key.
-
-    @param  keyName points to a null terminated string specifying the name of a key which value
+/**	This function gets the long list value of a key.
+    
+    @param	keyName points to a null terminated string specifying the name of a key which value
                     will be got. If keyName is NULL, then the value of the key specified by
                     hKey will be got.
-    @param  pValueList a Pointer to a long value list which returns the data of the value.
-    @param  pLen returns the length of the value list.
-    @return REG_NO_ERROR if succeeds else an error code.
+    @param	pValueList a Pointer to a long value list which returns the data of the value.
+    @param	pLen returns the length of the value list.
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_getLongListValue(RegKeyHandle hKey,
-                                                      rtl_uString* keyName,
-                                                      sal_Int32** pValueList,
+RegError REGISTRY_CALLTYPE reg_getLongListValue(RegKeyHandle hKey, 
+                                                      rtl_uString* keyName, 
+                                                      sal_Int32** pValueList, 
                                                       sal_uInt32* pLen);
 
 
-/** This function gets the string list value of a key.
-
-    @param  keyName points to a null terminated string specifying the name of a key which value
+/**	This function gets the string list value of a key.
+    
+    @param	keyName	points to a null terminated string specifying the name of a key which value
                     will be got. If keyName is NULL, then the value of the key specified by
                     hKey will be got.
-    @param  pValueList a Pointer to an ascii value list which returns the data of the value.
-    @param  pLen returns the length of the value list.
-    @return REG_NO_ERROR if succeeds else an error code.
+    @param	pValueList a Pointer to an ascii value list which returns the data of the value.
+    @param	pLen returns the length of the value list.
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_getStringListValue(RegKeyHandle hKey,
-                                                       rtl_uString* keyName,
+RegError REGISTRY_CALLTYPE reg_getStringListValue(RegKeyHandle hKey, 
+                                                       rtl_uString* keyName, 
                                                        sal_Char*** pValueList,
                                                        sal_uInt32* pLen);
 
 
-/** This function gets the unicode list value of a key.
-
-    @param  keyName points to a null terminated string specifying the name of a key which value
+/**	This function gets the unicode list value of a key.
+    
+    @param	keyName points to a null terminated string specifying the name of a key which value
                     will be got. If keyName is NULL, then the value of the key specified by
                     hKey will be got.
-    @param  pValueList a Pointer to an unicode value list which returns the data of the value.
-    @param  pLen returns the length of the value list.
-    @return REG_NO_ERROR if succeeds else an error code.
+    @param	pValueList a Pointer to an unicode value list which returns the data of the value.
+    @param	pLen returns the length of the value list.
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_getUnicodeListValue(RegKeyHandle hKey,
-                                                         rtl_uString* keyName,
-                                                         sal_Unicode*** pValueList,
+RegError REGISTRY_CALLTYPE reg_getUnicodeListValue(RegKeyHandle hKey, 
+                                                         rtl_uString* keyName, 
+                                                         sal_Unicode*** pValueList, 
                                                          sal_uInt32* pLen);
 
 
-/** This function frees the memory of a value list.
-
-    @param  valueType specifies the type of the list values.
-    @param  pValueList a Pointer to the value list.
-    @param  len specifies the length of the value list.
-    @return REG_NO_ERROR if succeeds else an error code.
+/**	This function frees the memory of a value list.
+    
+    @param	valueType specifies the type of the list values.
+    @param	pValueList a Pointer to the value list.
+    @param	len specifies the length of the value list.
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_freeValueList(RegValueType valueType,
-                                                  RegValue pValueList,
+RegError REGISTRY_CALLTYPE reg_freeValueList(RegValueType valueType, 
+                                                  RegValue pValueList, 
                                                   sal_uInt32 len);
 
 /** This function used to create a link.
 
     @obsolete Links are no longer supported.
 
-    @return REG_INVALID_LINK
+    @return	REG_INVALID_LINK
 */
 RegError REGISTRY_CALLTYPE reg_createLink(RegKeyHandle hKey,
-                                               rtl_uString* linkName,
+                                               rtl_uString* linkName, 
                                           rtl_uString* linkTarget);
 
 /** This function used to delete a link.
 
     @obsolete Links are no longer supported.
 
-    @return REG_INVALID_LINK
+    @return	REG_INVALID_LINK
 */
 RegError REGISTRY_CALLTYPE reg_deleteLink(RegKeyHandle hKey,
                                             rtl_uString* linkName);
 
 /** This function returns the type of a key.
-
+    
     The registry differentiates two possible types:
     - RG_KEYTYPE represents a real key
     - RG_LINKTYPE used to represent a link (no longer used)
-    @param  keyName points to a null terminated string specifying the name of the key which keytype
+    @param	keyName points to a null terminated string specifying the name of the key which keytype
                     will be returned.
-    @param  pKeyType returns the type of the key.
-    @return REG_NO_ERROR if succeeds else an error code.
+    @param  pKeyType returns the type of the key.   
+    @return	REG_NO_ERROR if succeeds else an error code.    
 */
 RegError REGISTRY_CALLTYPE reg_getKeyType(RegKeyHandle hKey,
                                           rtl_uString* keyName,
@@ -316,157 +316,157 @@ RegError REGISTRY_CALLTYPE reg_getKeyType(RegKeyHandle hKey,
 
     @obsolete Links are no longer supported.
 
-    @return REG_INVALID_LINK
+    @return	REG_INVALID_LINK
 */
 RegError REGISTRY_CALLTYPE reg_getLinkTarget(RegKeyHandle hKey,
                                              rtl_uString* linkName,
                                                rtl_uString** pLinkTarget);
 
 /** This function resolves a keyname.
-
+    
     and returns the resolved keyName in pResolvedName.
-    @param  hKey identifies a currently open key. The key specified by keyName is a subkey
+    @param	hKey identifies a currently open key. The key specified by keyName is a subkey
                  of the key identified by hKey.
-    @param  keyName points to a null terminated string specifying the relativ name of a key.
+    @param	keyName	points to a null terminated string specifying the relativ name of a key.
                     The name of hKey together with keyName will be generated.
     @param firstLinkOnly ignored
-    @return REG_NO_ERROR if succeeds else an error code.
+    @return	REG_NO_ERROR if succeeds else an error code. 
  */
 RegError REGISTRY_CALLTYPE reg_getResolvedKeyName(RegKeyHandle hKey,
                                                     rtl_uString* keyName,
                                                    sal_Bool firstLinkOnly,
                                                       rtl_uString** pResolvedName);
 
-/** This function loads registry information from a file and save it under the
+/**	This function loads registry information from a file and save it under the 
     specified keyName.
-
-    @param  hKey identifies a currently open key. The key which should store the registry information
+    
+    @param	hKey identifies a currently open key. The key which should store the registry information
                  is a subkey of this key.
-    @param  keyName points to a null terminated string specifying the name of the key which stores the
+    @param	keyName	points to a null terminated string specifying the name of the key which stores the
                     registry information. If keyName is NULL the registry information will be saved under
                     the key specified by hKey.
-    @param  regFileName points to a null terminated string specifying the file which conains the
+    @param	regFileName	points to a null terminated string specifying the file which conains the 
                         registry information.
-    @return REG_NO_ERROR if succeeds else an error code.
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey,
-                                         rtl_uString* keyName,
+RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey, 
+                                         rtl_uString* keyName, 
                                          rtl_uString* regFileName);
 
 
-/** This function saves the registry information under a specified key and all of its subkeys and save
+/**	This function saves the registry information under a specified key and all of its subkeys and save 
     it in a registry file.
-
-    @param  hKey identifies a currently open key. The key which information is saved by this
+    
+    @param	hKey identifies a currently open key. The key which information is saved by this
                  function is a subkey of the key identified by hKey.
-    @param  keyName points to a null terminated string specifying the name of the subkey.
+    @param	keyName points to a null terminated string specifying the name of the subkey.
                     If keyName is NULL the registry information under the key specified by hKey
                     will be saved in the specified file.
-    @param  regFileName points to a null terminated string specifying the file which will contain the
+    @param	regFileName points to a null terminated string specifying the file which will contain the 
                         registry information.
-    @return REG_NO_ERROR if succeeds else an error code.
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey,
-                                         rtl_uString* keyName,
+RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey, 
+                                         rtl_uString* keyName, 
                                          rtl_uString* regFileName);
 
 
-/** This function merges the registry information from a specified source with the information of the
+/**	This function merges the registry information from a specified source with the information of the
     currently open registry.
 
     All existing keys will be extended and existing key values will be overwritten.
-    @param  hKey identifies a currently open key. The key which information is merged by this
+    @param	hKey identifies a currently open key. The key which information is merged by this
                  function is a subkey of the key identified by hKey.
-    @param  keyName points to a null terminated string specifying the name of the key which will be merged.
+    @param	keyName points to a null terminated string specifying the name of the key which will be merged.
                     If keyName is NULL the registry information under the key specified by hKey
                     is merged with the complete information from the specified file.
-    @param  regFileName points to a null terminated string specifying the file containing the
+    @param	regFileName points to a null terminated string specifying the file containing the 
                         registry information.
-    @param  bWarnings if TRUE the function returns an error if a key already exists.
-    @param  bReport if TRUE the function reports warnings on stdout if a key already exists.
-    @return REG_NO_ERROR if succeeds else an error code.
+    @param	bWarnings if TRUE the function returns an error if a key already exists. 
+    @param	bReport if TRUE the function reports warnings on stdout if a key already exists. 
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey,
-                                           rtl_uString* keyName,
+RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey, 
+                                           rtl_uString* keyName, 
                                            rtl_uString* regFileName,
                                            sal_Bool bWarnings,
                                            sal_Bool bReport);
 
 
-/** This function creates a new registry with the specified name and creates a root key.
-
-    @param  registryName points to a null terminated string specifying the name of the new registry.
-    @param  phRegistry points to a handle of the new registry if the function succeeds otherwise NULL.
-    @return REG_NO_ERROR if succeeds else an error code.
+/**	This function creates a new registry with the specified name and creates a root key.
+    
+    @param	registryName points to a null terminated string specifying the name of the new registry.
+    @param 	phRegistry points to a handle of the new registry if the function succeeds otherwise NULL.
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName,
+RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName, 
                                                RegHandle* phRegistry);
 
 
-/** This function opens the root key of a registry.
-
-    @param  hReg identifies a currently open registry whose rootKey will be returned.
-    @param  phRootKey points to a handle of the open root key if the function succeeds otherwise NULL.
-    @return REG_NO_ERROR if succeeds else an error code.
+/**	This function opens the root key of a registry.
+    
+    @param	hReg identifies a currently open registry whose rootKey will be returned.
+    @param 	phRootKey points to a handle of the open root key if the function succeeds otherwise NULL.
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry,
+RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry, 
                                              RegKeyHandle* phRootKey);
 
 
-/** This function returns the name of a registry.
-
-    @param  hReg identifies a currently open registry whose name will be returned.
-    @param  pName returns the name of the registry if the function succeeds otherwise an empty string.
-    @return REG_NO_ERROR if succeeds else an error code.
+/**	This function returns the name of a registry.
+    
+    @param	hReg identifies a currently open registry whose name will be returned.
+    @param  pName returns the name of the registry if the function succeeds otherwise an empty string. 
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
 RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName);
 
 
-/** This function returns the access mode of the registry.
-
-    @param  hReg identifies a currently open registry.
-    @return TRUE if accessmode is read only else FALSE.
+/**	This function returns the access mode of the registry.
+    
+    @param	hReg identifies a currently open registry.
+    @return	TRUE if accessmode is read only else FALSE. 
 */
 sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hReg);
 
 
-/** This function opens a registry with the specified name.
-
-    @param  registryName points to a null terminated string specifying the name of the registry.
-    @param  phRegistry points to a hanle of the opened registry if the function succeeds otherwise NULL.
-    @param  accessMode specifies the accessmode of the registry, REG_READONLY or REG_READWRITE.
-    @return REG_NO_ERROR if succeeds else an error code.
+/**	This function opens a registry with the specified name.
+    
+    @param	registryName points to a null terminated string specifying the name of the registry.
+    @param 	phRegistry points to a hanle of the opened registry if the function succeeds otherwise NULL.
+    @param 	accessMode specifies the accessmode of the registry, REG_READONLY or REG_READWRITE.
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
-RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName,
+RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName, 
                                                RegHandle* phRegistry,
                                                RegAccessMode accessMode);
 
 
-/** This function closes a registry.
-
-    @param  hRegistry identifies a currently open registry which should be closed.
-    @return REG_NO_ERROR if succeeds else an error code.
+/**	This function closes a registry.
+    
+    @param	hRegistry identifies a currently open registry which should be closed.
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
 RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry);
 
 
-/** This function destroys a registry.
-
-    @param  hRegistry identifies a currently open registry.
-    @param  registryName specifies a registry name of a registry which should be destroyed. If the
+/**	This function destroys a registry.
+    
+    @param	hRegistry identifies a currently open registry.
+    @param	registryName specifies a registry name of a registry which should be destroyed. If the
                          name is NULL the registry itselfs will be destroyed.
-    @return REG_NO_ERROR if succeeds else an error code.
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
 RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry,
                                                rtl_uString* registryName);
 
 
-/** This function reports the complete registry information of a key and all of its subkeys.
-
+/**	This function reports the complete registry information of a key and all of its subkeys.
+    
     All information which are available (keynames, value types, values, ...)
     will be printed to stdout for report issues only.
-    @param  hKey identifies a currently open key which content will be reported.
-    @return REG_NO_ERROR if succeeds else an error code.
+    @param	hKey identifies a currently open key which content will be reported.
+    @return	REG_NO_ERROR if succeeds else an error code. 
 */
 RegError REGISTRY_CALLTYPE reg_dumpRegistry(RegKeyHandle hKey);
 
diff --git a/registry/inc/registry/registry.hxx b/registry/inc/registry/registry.hxx
index 0ae9136fcf1d..13bcac610aec 100644
--- a/registry/inc/registry/registry.hxx
+++ b/registry/inc/registry/registry.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,51 +37,51 @@ extern "C" {
 #endif
 
 /** specifies a collection of function pointers which represents the complete registry C-API.
-
+    
     This funtions pointers are used by the C++ wrapper to call the C-API.
 */
 struct Registry_Api
 {
-    void        (REGISTRY_CALLTYPE *acquire)            (RegHandle);
-    void        (REGISTRY_CALLTYPE *release)            (RegHandle);
-    sal_Bool    (REGISTRY_CALLTYPE *isReadOnly)         (RegHandle);
-    RegError    (REGISTRY_CALLTYPE *openRootKey)        (RegHandle, RegKeyHandle*);
-    RegError    (REGISTRY_CALLTYPE *getName)            (RegHandle, rtl_uString**);
-    RegError    (REGISTRY_CALLTYPE *createRegistry)     (rtl_uString*, RegHandle*);
-    RegError    (REGISTRY_CALLTYPE *openRegistry)       (rtl_uString*, RegHandle*, RegAccessMode);
-    RegError    (REGISTRY_CALLTYPE *closeRegistry)      (RegHandle);
-    RegError    (REGISTRY_CALLTYPE *destroyRegistry)    (RegHandle, rtl_uString*);
-    RegError    (REGISTRY_CALLTYPE *loadKey)            (RegHandle, RegKeyHandle, rtl_uString*, rtl_uString*);
-    RegError    (REGISTRY_CALLTYPE *saveKey)            (RegHandle, RegKeyHandle, rtl_uString*, rtl_uString*);
-    RegError    (REGISTRY_CALLTYPE *mergeKey)           (RegHandle, RegKeyHandle, rtl_uString*, rtl_uString*, sal_Bool, sal_Bool);
-    RegError    (REGISTRY_CALLTYPE *dumpRegistry)       (RegHandle, RegKeyHandle);
-    void        (REGISTRY_CALLTYPE *acquireKey)         (RegKeyHandle);
-    void        (REGISTRY_CALLTYPE *releaseKey)         (RegKeyHandle);
-    sal_Bool    (REGISTRY_CALLTYPE *isKeyReadOnly)      (RegKeyHandle);
-    RegError    (REGISTRY_CALLTYPE *getKeyName)         (RegKeyHandle, rtl_uString**);
-    RegError    (REGISTRY_CALLTYPE *createKey)          (RegKeyHandle, rtl_uString*, RegKeyHandle*);
-    RegError    (REGISTRY_CALLTYPE *openKey)            (RegKeyHandle, rtl_uString*, RegKeyHandle*);
-    RegError    (REGISTRY_CALLTYPE *openSubKeys)        (RegKeyHandle, rtl_uString*, RegKeyHandle**, sal_uInt32*);
-    RegError    (REGISTRY_CALLTYPE *closeSubKeys)       (RegKeyHandle*, sal_uInt32);
-    RegError    (REGISTRY_CALLTYPE *deleteKey)          (RegKeyHandle, rtl_uString*);
-    RegError    (REGISTRY_CALLTYPE *closeKey)           (RegKeyHandle);
-    RegError    (REGISTRY_CALLTYPE *setValue)           (RegKeyHandle, rtl_uString*, RegValueType, RegValue, sal_uInt32);
-    RegError    (REGISTRY_CALLTYPE *setLongListValue)   (RegKeyHandle, rtl_uString*, sal_Int32*, sal_uInt32);
-    RegError    (REGISTRY_CALLTYPE *setStringListValue) (RegKeyHandle, rtl_uString*, sal_Char**, sal_uInt32);
-    RegError    (REGISTRY_CALLTYPE *setUnicodeListValue)(RegKeyHandle, rtl_uString*, sal_Unicode**, sal_uInt32);
-    RegError    (REGISTRY_CALLTYPE *getValueInfo)       (RegKeyHandle, rtl_uString*, RegValueType*, sal_uInt32*);
-    RegError    (REGISTRY_CALLTYPE *getValue)           (RegKeyHandle, rtl_uString*, RegValue);
-    RegError    (REGISTRY_CALLTYPE *getLongListValue)   (RegKeyHandle, rtl_uString*, sal_Int32**, sal_uInt32*);
-    RegError    (REGISTRY_CALLTYPE *getStringListValue) (RegKeyHandle, rtl_uString*, sal_Char***, sal_uInt32*);
-    RegError    (REGISTRY_CALLTYPE *getUnicodeListValue)(RegKeyHandle, rtl_uString*, sal_Unicode***, sal_uInt32*);
-    RegError    (REGISTRY_CALLTYPE *freeValueList)      (RegValueType, RegValue, sal_uInt32);
-    RegError    (REGISTRY_CALLTYPE *createLink)         (RegKeyHandle, rtl_uString*, rtl_uString*);
-    RegError    (REGISTRY_CALLTYPE *deleteLink)         (RegKeyHandle, rtl_uString*);
-    RegError    (REGISTRY_CALLTYPE *getKeyType)         (RegKeyHandle, rtl_uString*, RegKeyType*);
-    RegError    (REGISTRY_CALLTYPE *getLinkTarget)      (RegKeyHandle, rtl_uString*, rtl_uString**);
-    RegError    (REGISTRY_CALLTYPE *getResolvedKeyName) (RegKeyHandle, rtl_uString*, sal_Bool, rtl_uString**);
-    RegError    (REGISTRY_CALLTYPE *getKeyNames)        (RegKeyHandle, rtl_uString*, rtl_uString***, sal_uInt32*);
-    RegError    (REGISTRY_CALLTYPE *freeKeyNames)       (rtl_uString**, sal_uInt32);
+    void	  	(REGISTRY_CALLTYPE *acquire) 			(RegHandle);
+    void	  	(REGISTRY_CALLTYPE *release) 			(RegHandle);
+    sal_Bool 	(REGISTRY_CALLTYPE *isReadOnly)			(RegHandle);
+    RegError 	(REGISTRY_CALLTYPE *openRootKey)		(RegHandle, RegKeyHandle*);
+    RegError	(REGISTRY_CALLTYPE *getName)			(RegHandle, rtl_uString**);
+    RegError 	(REGISTRY_CALLTYPE *createRegistry)		(rtl_uString*, RegHandle*);
+    RegError 	(REGISTRY_CALLTYPE *openRegistry)		(rtl_uString*, RegHandle*, RegAccessMode);
+    RegError 	(REGISTRY_CALLTYPE *closeRegistry)		(RegHandle);
+    RegError 	(REGISTRY_CALLTYPE *destroyRegistry)	(RegHandle,	rtl_uString*);
+    RegError 	(REGISTRY_CALLTYPE *loadKey)			(RegHandle, RegKeyHandle, rtl_uString*, rtl_uString*);
+    RegError 	(REGISTRY_CALLTYPE *saveKey)			(RegHandle, RegKeyHandle, rtl_uString*, rtl_uString*);
+    RegError 	(REGISTRY_CALLTYPE *mergeKey)			(RegHandle, RegKeyHandle, rtl_uString*, rtl_uString*, sal_Bool, sal_Bool);
+    RegError 	(REGISTRY_CALLTYPE *dumpRegistry) 		(RegHandle, RegKeyHandle);
+    void	  	(REGISTRY_CALLTYPE *acquireKey) 	  	(RegKeyHandle);
+    void	  	(REGISTRY_CALLTYPE *releaseKey) 	  	(RegKeyHandle);
+    sal_Bool 	(REGISTRY_CALLTYPE *isKeyReadOnly)	  	(RegKeyHandle);
+    RegError  	(REGISTRY_CALLTYPE *getKeyName)			(RegKeyHandle, rtl_uString**);
+    RegError 	(REGISTRY_CALLTYPE *createKey)			(RegKeyHandle, rtl_uString*, RegKeyHandle*);
+    RegError 	(REGISTRY_CALLTYPE *openKey)			(RegKeyHandle, rtl_uString*, RegKeyHandle*);
+    RegError 	(REGISTRY_CALLTYPE *openSubKeys)		(RegKeyHandle, rtl_uString*, RegKeyHandle**, sal_uInt32*);
+    RegError 	(REGISTRY_CALLTYPE *closeSubKeys)		(RegKeyHandle*, sal_uInt32);
+    RegError 	(REGISTRY_CALLTYPE *deleteKey)			(RegKeyHandle, rtl_uString*);
+    RegError 	(REGISTRY_CALLTYPE *closeKey)			(RegKeyHandle);
+    RegError 	(REGISTRY_CALLTYPE *setValue)			(RegKeyHandle, rtl_uString*, RegValueType, RegValue, sal_uInt32);
+    RegError 	(REGISTRY_CALLTYPE *setLongListValue)	(RegKeyHandle, rtl_uString*, sal_Int32*, sal_uInt32);
+    RegError 	(REGISTRY_CALLTYPE *setStringListValue)	(RegKeyHandle, rtl_uString*, sal_Char**, sal_uInt32);
+    RegError 	(REGISTRY_CALLTYPE *setUnicodeListValue)(RegKeyHandle, rtl_uString*, sal_Unicode**, sal_uInt32);
+    RegError 	(REGISTRY_CALLTYPE *getValueInfo)		(RegKeyHandle, rtl_uString*, RegValueType*, sal_uInt32*);
+    RegError 	(REGISTRY_CALLTYPE *getValue)			(RegKeyHandle, rtl_uString*, RegValue);
+    RegError 	(REGISTRY_CALLTYPE *getLongListValue)	(RegKeyHandle, rtl_uString*, sal_Int32**, sal_uInt32*);
+    RegError 	(REGISTRY_CALLTYPE *getStringListValue)	(RegKeyHandle, rtl_uString*, sal_Char***, sal_uInt32*);
+    RegError 	(REGISTRY_CALLTYPE *getUnicodeListValue)(RegKeyHandle, rtl_uString*, sal_Unicode***, sal_uInt32*);
+    RegError 	(REGISTRY_CALLTYPE *freeValueList)		(RegValueType, RegValue, sal_uInt32);
+    RegError 	(REGISTRY_CALLTYPE *createLink) 		(RegKeyHandle, rtl_uString*, rtl_uString*);
+    RegError 	(REGISTRY_CALLTYPE *deleteLink)			(RegKeyHandle, rtl_uString*);
+    RegError 	(REGISTRY_CALLTYPE *getKeyType)			(RegKeyHandle, rtl_uString*, RegKeyType*);
+    RegError 	(REGISTRY_CALLTYPE *getLinkTarget)		(RegKeyHandle, rtl_uString*, rtl_uString**);
+    RegError 	(REGISTRY_CALLTYPE *getResolvedKeyName)	(RegKeyHandle, rtl_uString*, sal_Bool, rtl_uString**);
+    RegError 	(REGISTRY_CALLTYPE *getKeyNames)		(RegKeyHandle, rtl_uString*, rtl_uString***, sal_uInt32*);
+    RegError 	(REGISTRY_CALLTYPE *freeKeyNames)		(rtl_uString**, sal_uInt32);
 };
 
 /** the API initialization function.
@@ -98,10 +98,10 @@ class RegistryKey;
 //-----------------------------------------------------------------------------
 
 /** The Registry provides the functionality to read and write information in a registry file.
-
+    
     The class is implemented inline and use a C-Api.
 */
-class Registry
+class Registry	
 {
 public:
     /** Default constructor.
@@ -118,109 +118,109 @@ public:
     inline Registry& operator = (const Registry& toAssign);
 
     /// checks if the registry points to a valid registry data file.
-    inline sal_Bool isValid() const;
-
-    /** returns the access mode of the registry.
+    inline sal_Bool	isValid() const;
 
-        @return TRUE if the access mode is readonly else FALSE.
+    /**	returns the access mode of the registry.
+        
+        @return	TRUE if the access mode is readonly else FALSE. 
     */
-    inline sal_Bool     isReadOnly() const;
+    inline sal_Bool 	isReadOnly() const;
 
-    /** opens the root key of the registry.
-
-        @param  rRootKey reference to a RegistryKey which is filled with the rootkey.
-        @return REG_NO_ERROR if succeeds else an error code.
+    /**	opens the root key of the registry.
+        
+        @param 	rRootKey reference to a RegistryKey which is filled with the rootkey.
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
     inline RegError openRootKey(RegistryKey& rRootKey);
 
     /// returns the name of the current registry data file.
     inline ::rtl::OUString getName();
 
-    /** creates a new registry with the specified name and creates a root key.
-
-        @param  registryName specifies the name of the new registry.
-        @return REG_NO_ERROR if succeeds else an error code.
+    /**	creates a new registry with the specified name and creates a root key.
+        
+        @param	registryName specifies the name of the new registry.
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
     inline RegError create(const ::rtl::OUString& registryName);
 
-    /** opens a registry with the specified name.
-
+    /**	opens a registry with the specified name.
+        
         If the registry already points to a valid registry, the old registry will be closed.
-        @param  registryName specifies a registry name.
-        @param  accessMode specifies the access mode for the registry, REG_READONLY or REG_READWRITE.
-        @return REG_NO_ERROR if succeeds else an error code.
+        @param	registryName specifies a registry name.
+        @param 	accessMode specifies the access mode for the registry, REG_READONLY or REG_READWRITE.
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
-    inline RegError open(const ::rtl::OUString& registryName,
+    inline RegError open(const ::rtl::OUString& registryName, 
                             RegAccessMode accessMode);
 
     /// closes explicitly the current registry data file.
     inline RegError close();
 
-    /** destroys a registry.
-
+    /**	destroys a registry.
+        
         @param registryName specifies a registry name, if the name is an empty string the registry
                             itselfs will be destroyed.
-        @return REG_NO_ERROR if succeeds else an error code.
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
     inline RegError destroy(const ::rtl::OUString& registryName);
 
-    /** loads registry information from a specified file and save it under the
+    /**	loads registry information from a specified file and save it under the 
         specified keyName.
-
-        @param  rKey references a currently open key. The key which should store the registry information
+        
+        @param	rKey references a currently open key. The key which should store the registry information
                      is a subkey of this key.
-        @param  keyName specifies the name of the key which stores the registry information. If keyName is
+        @param	keyName	specifies the name of the key which stores the registry information. If keyName is
                         is an empty string the registry information will be saved under the key specified
                         by rKey.
-        @param  regFileName specifies the file containing the registry information.
-        @return REG_NO_ERROR if succeeds else an error code.
+        @param	regFileName	specifies the file containing the registry information.
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
-    inline RegError loadKey(RegistryKey& rKey,
-                               const ::rtl::OUString& keyName,
+    inline RegError loadKey(RegistryKey& rKey, 
+                               const ::rtl::OUString& keyName, 
                                const ::rtl::OUString& regFileName);
 
-    /** saves the registry information of the specified key and all subkeys and save
+    /**	saves the registry information of the specified key and all subkeys and save 
         it in the specified file.
-
-        @param  rKey references a currently open key. The key which information is saved by this
+        
+        @param	rKey references a currently open key. The key which information is saved by this
                      function is a subkey of this key.
-        @param  keyName specifies the name of the key which information should be stored.
+        @param	keyName	specifies the name of the key which information should be stored.
                         If keyName is an empty string the registry information under the key specified
                         by rKey is saved in the specified file.
-        @param  regFileName specifies the file containing the registry information.
-        @return REG_NO_ERROR if succeeds else an error code.
+        @param	regFileName	specifies the file containing the registry information.
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
-    inline RegError saveKey(RegistryKey& rKey,
-                               const ::rtl::OUString& keyName,
+    inline RegError saveKey(RegistryKey& rKey, 
+                               const ::rtl::OUString& keyName, 
                                const ::rtl::OUString& regFileName);
 
-    /** merges the registry information of the specified key with the registry
+    /**	merges the registry information of the specified key with the registry 
         information of the specified file.
 
         All existing keys will be extended and existing key values will be overwritten.
-        @param  rKey references a currently open key. The key which information is merged by this
+        @param	rKey references a currently open key. The key which information is merged by this
                      function is a subkey of this key
-        @param  keyName specifies the name of the key which will be merged.
-                        If keyName is an empty string the registry information under the key specified
+        @param	keyName	specifies the name of the key which will be merged.
+                        If keyName is an empty string the registry information under the key specified 
                         by rKey is merged with the information from the specified file.
-        @param  regFileName specifies the file containing the registry information.
-        @param  bWarnings if TRUE the function returns an error if a key already exists.
-        @param  bReport if TRUE the function reports warnings on stdout if a key already exists.
-        @return REG_NO_ERROR if succeeds else an error code. If it returns an error the registry will
-                restore the state before merging.
+        @param	regFileName	specifies the file containing the registry information.
+        @param	bWarnings if TRUE the function returns an error if a key already exists. 
+        @param	bReport if TRUE the function reports warnings on stdout if a key already exists. 
+        @return	REG_NO_ERROR if succeeds else an error code. If it returns an error the registry will 
+                restore the state before merging. 
     */
-    inline RegError mergeKey(RegistryKey& rKey,
-                                const ::rtl::OUString& keyName,
+    inline RegError mergeKey(RegistryKey& rKey, 
+                                const ::rtl::OUString& keyName, 
                                 const ::rtl::OUString& regFileName,
                              sal_Bool bWarnings = sal_False,
                                 sal_Bool bReport = sal_False);
 
-    /** This function reports the complete registry information of a key and all of its subkeys.
-
+    /**	This function reports the complete registry information of a key and all of its subkeys.
+        
         All information which are available (keynames, value types, values, ...)
         will be printed to stdout for report issues only.
-        @param  rKey references a currently open key which content will be reported.
-        @return REG_NO_ERROR if succeeds else an error code.
+        @param	rKey references a currently open key which content will be reported.
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
     inline RegError dumpRegistry(RegistryKey& rKey);
 
@@ -233,16 +233,16 @@ public:
 protected:
 
     /// stores the used and initialized registry Api.
-    const Registry_Api*                          m_pApi;
+    const Registry_Api*							 m_pApi;
     /// stores the handle of the underlying registry file on which most of the functions work.
-    RegHandle                                    m_hImpl;
+    RegHandle									 m_hImpl;
 };
 
 
 //-----------------------------------------------------------------------------
 
 /** RegistryKeyArray represents an array of open keys.
-
+    
     RegistryKeyArray is a helper class to work with an array of keys.
 */
 class RegistryKeyArray
@@ -253,7 +253,7 @@ public:
 
     /// Destructor, all subkeys will be closed.
     inline ~RegistryKeyArray();
-
+    
     /// returns the open key specified by index.
     inline RegistryKey getElement(sal_uInt32 index);
 
@@ -263,26 +263,26 @@ public:
     friend class RegistryKey;
 protected:
     /** sets the data of the key array.
-
+        
         @param registry specifies the registry files where the keys are located.
         @param phKeys points to an array of open keys.
         @param length specifies the length of the array specified by phKeys.
      */
     inline void setKeyHandles(Registry& registry, RegKeyHandle* phKeys, sal_uInt32 length);
     /// close all subkeys
-    inline RegError closeKeyHandles();
+    inline RegError closeKeyHandles(); 
 
     /// stores the number of open subkeys, the number of elements.
-    sal_uInt32      m_length;
+    sal_uInt32 	   	m_length;
     /// stores an array of open subkeys.
-    RegKeyHandle*   m_phKeys;
+    RegKeyHandle*	m_phKeys;
     /// stores the handle to the registry file where the appropriate keys are located.
-    Registry        m_registry;
-};
+    Registry		m_registry;
+};	
 
 
 /** RegistryKeyNames represents an array of key names.
-
+    
     RegistryKeyNames is a helper class to work with an array of key names.
 */
 class RegistryKeyNames
@@ -293,7 +293,7 @@ public:
 
     /// Destructor, the internal array with key names will be deleted.
     inline ~RegistryKeyNames();
-
+    
     /// returns the name of the key sepecified by index.
     inline ::rtl::OUString getElement(sal_uInt32 index);
 
@@ -301,29 +301,29 @@ public:
     inline sal_uInt32 getLength();
 
     friend class RegistryKey;
-protected:
+protected:	
     /** sets the data of the array.
-
+        
         @param registry specifies the registry files where the keys are located.
         @param pKeyNames points to an array of key names.
         @param length specifies the length of the array specified by pKeyNames.
      */
     inline void setKeyNames(Registry& registry, rtl_uString** pKeyNames, sal_uInt32 length);
     /// delete the array of key names.
-    inline RegError freeKeyNames();
+    inline RegError freeKeyNames(); 
 
     /// stores the number of key names, the number of elements.
-    sal_uInt32      m_length;
+    sal_uInt32 		m_length;
     /// stores an array of key names.
-    rtl_uString**   m_pKeyNames;
+    rtl_uString**	m_pKeyNames;
     /// stores the handle to the registry file where the appropriate keys are located.
-    Registry        m_registry;
-};
+    Registry		m_registry;
+};	
 
 //-----------------------------------------------------------------------------
 
 /** RegistryValueList represents a value list of the specified type.
-
+    
     RegistryValueList is a helper class to work with a list value.
 */
 template<class ValueType>
@@ -344,8 +344,8 @@ public:
         {
             m_registry.getApi()->freeValueList(m_valueType, m_pValueList, m_length);
         }
-    }
-
+    }	
+    
     /// returns the value of the list specified by index.
     ValueType getElement(sal_uInt32 index)
     {
@@ -362,12 +362,12 @@ public:
     sal_uInt32 getLength()
     {
         return m_length;
-    }
+    }	
 
     friend class RegistryKey;
-protected:
+protected:	
     /** sets the data of the value list.
-
+        
         @param registry specifies the registry files where the appropriate key is located.
         @param valueType specifies the type of the list values.
         @param pValueList points to a value list.
@@ -380,27 +380,27 @@ protected:
         m_pValueList = pValueList;
         m_valueType = valueType;
         m_registry = registry;
-    }
+    }	
 
     /// stores the length of the list, the number of elements.
-    sal_uInt32      m_length;
+    sal_uInt32 		m_length;
     /// stores the value list.
-    ValueType*      m_pValueList;
+    ValueType*		m_pValueList;
     /// stores the type of the list elements
-    RegValueType    m_valueType;
+    RegValueType	m_valueType;
     /** stores the handle to the registry file where the appropriate key to this
         value is located.
     */
-    Registry        m_registry;
-};
+    Registry		m_registry;
+};	
 
 //-----------------------------------------------------------------------------
 
 /** RegistryKey reads or writes information of the underlying key in a registry.
-
+    
     Class is inline and use a load on call C-Api.
 */
-class RegistryKey
+class RegistryKey	
 {
 public:
     /// Default constructor
@@ -416,68 +416,68 @@ public:
     inline RegistryKey& operator = (const RegistryKey& toAssign);
 
     /// checks if the key points to a valid registry key.
-    inline sal_Bool isValid() const;
-
-    /** returns the access mode of the key.
+    inline sal_Bool	isValid() const;
 
-        @return TRUE if access mode is read only else FALSE.
+    /**	returns the access mode of the key.
+        
+        @return	TRUE if access mode is read only else FALSE. 
     */
-    inline sal_Bool     isReadOnly() const;
+    inline sal_Bool 	isReadOnly() const;
 
     /// returns the full qualified name of the key beginning with the rootkey.
     inline ::rtl::OUString getName();
 
-    /** creates a new key or opens a key if the specified key already exists.
-
+    /**	creates a new key or opens a key if the specified key already exists.
+        
         The specified keyname is relativ to this key.
-        @param  keyName specifies the name of the key which will be opened or created.
-        @param  rNewKey references a RegistryKey which will be filled with the new or open key.
-        @return REG_NO_ERROR if succeeds else an error code.
+        @param	keyName	specifies the name of the key which will be opened or created.
+        @param	rNewKey	references a RegistryKey which will be filled with the new or open key. 
+        @return	REG_NO_ERROR if succeeds else an error code.
     */
-    inline RegError createKey(const ::rtl::OUString& keyName,
+    inline RegError createKey(const ::rtl::OUString& keyName, 
                               RegistryKey& rNewKey);
 
-    /** opens the specified key.
-
+    /**	opens the specified key.
+        
         The specified keyname is relativ to this key.
-        @param  keyName specifies the name of the key which will be opened.
-        @param  rOpenKey references a RegistryKey which will be filled with the open key.
-        @return REG_NO_ERROR if succeeds else an error code.
+        @param	keyName	specifies the name of the key which will be opened.
+        @param	rOpenKey references a RegistryKey which will be filled with the open key.
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
-    inline RegError openKey(const ::rtl::OUString& keyName,
+    inline RegError openKey(const ::rtl::OUString& keyName, 
                               RegistryKey& rOpenKey);
-
-    /** opens all subkeys of the specified key.
-
+    
+    /**	opens all subkeys of the specified key.
+        
         The specified keyname is relativ to this key.
-        @param  keyName specifies the name of the key which subkeys will be opened.
-        @param  rSubKeys reference a RegistryKeyArray which will be filled with the open subkeys.
-        @return REG_NO_ERROR if succeeds else an error code.
+        @param	keyName	specifies the name of the key which subkeys will be opened.
+        @param	rSubKeys reference a RegistryKeyArray which will be filled with the open subkeys.
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
-    inline RegError openSubKeys(const ::rtl::OUString& keyName,
+    inline RegError openSubKeys(const ::rtl::OUString& keyName, 
                                     RegistryKeyArray& rSubKeys);
 
-    /** returns an array with the names of all subkeys of the specified key.
-
+    /**	returns an array with the names of all subkeys of the specified key.
+        
         The specified keyname is relativ to this key.
-        @param  keyName specifies the name of the key which subkey names will be returned.
-        @param  rSubKeyNames reference a RegistryKeyNames array which will be filled with the subkey names.
-        @return REG_NO_ERROR if succeeds else an error code.
+        @param	keyName	specifies the name of the key which subkey names will be returned.
+        @param	rSubKeyNames reference a RegistryKeyNames array which will be filled with the subkey names.
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
     inline RegError getKeyNames(const ::rtl::OUString& keyName,
                                     RegistryKeyNames& rSubKeyNames);
 
-    /** closes all keys specified in the array.
-
-        @param  rSubKeys reference a RegistryKeyArray which contains the open keys.
-        @return REG_NO_ERROR if succeeds else an error code.
+    /**	closes all keys specified in the array.
+        
+        @param	rSubKeys reference a RegistryKeyArray which contains the open keys.
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
     inline RegError closeSubKeys(RegistryKeyArray& rSubKeys);
 
-    /** deletes the specified key.
-
-        @param  keyName specifies the name of the key which will be deleted.
-        @return REG_NO_ERROR if succeeds else an error code.
+    /**	deletes the specified key.
+        
+        @param	keyName	specifies the name of the key which will be deleted.
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
     inline RegError deleteKey(const ::rtl::OUString& keyName);
 
@@ -487,113 +487,113 @@ public:
     /// releases the current key
     inline void releaseKey();
 
-    /** sets a value of a key.
-
-        @param  keyName specifies the name of the key which value will be set.
-                        If keyName is an empty string, the value will be set for the key
+    /**	sets a value of a key.
+        
+        @param	keyName	specifies the name of the key which value will be set. 
+                        If keyName is an empty string, the value will be set for the key 
                         specified by hKey.
-        @param  valueType specifies the type of the value.
-        @param  pData points to a memory block containing the data for the value.
-        @param  valueSize specifies the size of pData in bytes
-        @return REG_NO_ERROR if succeeds else an error code.
+        @param	valueType specifies the type of the value.
+        @param	pData points to a memory block containing the data for the value.
+        @param	valueSize specifies the size of pData in bytes
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
-    inline RegError setValue(const ::rtl::OUString& keyName,
-                                RegValueType valueType,
-                                RegValue pValue,
+    inline RegError setValue(const ::rtl::OUString& keyName, 
+                                RegValueType valueType, 
+                                RegValue pValue, 
                                 sal_uInt32 valueSize);
 
-    /** sets a long list value of a key.
-
-        @param  keyName specifies the name of the key which value will be set.
-                        If keyName is an empty string, the value will be set for the key
+    /**	sets a long list value of a key.
+        
+        @param	keyName	specifies the name of the key which value will be set. 
+                        If keyName is an empty string, the value will be set for the key 
                         specified by hKey.
-        @param  pValueList points to an array of longs containing the data for the value.
-        @param  len specifies the length of the list (the array referenced by pValueList).
-        @return REG_NO_ERROR if succeeds else an error code.
+        @param	pValueList points to an array of longs containing the data for the value.
+        @param	len specifies the length of the list (the array referenced by pValueList).
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
-    inline RegError setLongListValue(const ::rtl::OUString& keyName,
-                                         sal_Int32* pValueList,
+    inline RegError setLongListValue(const ::rtl::OUString& keyName, 
+                                         sal_Int32* pValueList, 
                                          sal_uInt32 len);
 
-    /** sets an ascii list value of a key.
-
-        @param  keyName specifies the name of the key which value will be set.
-                        If keyName is an empty string, the value will be set for the key
+    /**	sets an ascii list value of a key.
+        
+        @param	keyName	specifies the name of the key which value will be set. 
+                        If keyName is an empty string, the value will be set for the key 
                         specified by hKey.
-        @param  pValueList points to an array of sal_Char* containing the data for the value.
-        @param  len specifies the length of the list (the array referenced by pValueList).
-        @return REG_NO_ERROR if succeeds else an error code.
+        @param	pValueList points to an array of sal_Char* containing the data for the value.
+        @param	len specifies the length of the list (the array referenced by pValueList).
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
-    inline RegError setStringListValue(const ::rtl::OUString& keyName,
-                                           sal_Char** pValueList,
+    inline RegError setStringListValue(const ::rtl::OUString& keyName, 
+                                           sal_Char** pValueList, 
                                            sal_uInt32 len);
 
-    /** sets an unicode string list value of a key.
-
-        @param  keyName specifies the name of the key which value will be set.
-                        If keyName is an empty string, the value will be set for the key
+    /**	sets an unicode string list value of a key.
+        
+        @param	keyName	specifies the name of the key which value will be set. 
+                        If keyName is an empty string, the value will be set for the key 
                         specified by hKey.
-        @param  pValueList points to an array of sal_Unicode* containing the data for the value.
-        @param  len specifies the length of the list (the array referenced by pValueList).
-        @return REG_NO_ERROR if succeeds else an error code.
+        @param	pValueList points to an array of sal_Unicode* containing the data for the value.
+        @param	len specifies the length of the list (the array referenced by pValueList).
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
-    inline RegError setUnicodeListValue(const ::rtl::OUString& keyName,
-                                            sal_Unicode** pValueList,
+    inline RegError setUnicodeListValue(const ::rtl::OUString& keyName, 
+                                            sal_Unicode** pValueList, 
                                               sal_uInt32 len);
 
-    /** gets info about type and size of a value.
-
-        @param  keyName specifies the name of the key which value info will be returned.
-                        If keyName is an empty string, the value info of the key
+    /**	gets info about type and size of a value.
+        
+        @param	keyName	specifies the name of the key which value info will be returned. 
+                        If keyName is an empty string, the value info of the key 
                         specified by hKey will be returned.
-        @param  pValueType returns the type of the value.
-        @param  pValueSize returns the size of the value in bytes or the length of a list value.
-        @return REG_NO_ERROR if succeeds else an error code.
+        @param	pValueType returns the type of the value.
+        @param	pValueSize returns the size of the value in bytes or the length of a list value.
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
-    inline RegError getValueInfo(const ::rtl::OUString& keyName,
-                                    RegValueType* pValueType,
+    inline RegError getValueInfo(const ::rtl::OUString& keyName, 
+                                    RegValueType* pValueType, 
                                     sal_uInt32* pValueSize);
 
-    /** gets the value of a key.
-
-        @param  keyName specifies the name of the key which value will be returned.
-                        If keyName is an empty string, the value is get from the key
+    /**	gets the value of a key.
+        
+        @param	keyName	specifies the name of the key which value will be returned. 
+                        If keyName is an empty string, the value is get from the key 
                         specified by hKey.
-        @param  pValue points to an allocated memory block receiving the data of the value.
-        @return REG_NO_ERROR if succeeds else an error code.
+        @param	pValue points to an allocated memory block receiving the data of the value. 
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
-    inline RegError getValue(const ::rtl::OUString& keyName,
+    inline RegError getValue(const ::rtl::OUString& keyName, 
                                 RegValue pValue);
 
-    /** gets a long list value of a key.
-
-        @param  keyName specifies the name of the key which value will be returned.
-                        If keyName is an empty string, the value is get from the key
+    /**	gets a long list value of a key.
+        
+        @param	keyName	specifies the name of the key which value will be returned. 
+                        If keyName is an empty string, the value is get from the key 
                         specified by hKey.
-        @param  rValueList references a RegistryValueList which will be filled with the long values.
-        @return REG_NO_ERROR if succeeds else an error code.
+        @param	rValueList references a RegistryValueList which will be filled with the long values.
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
     inline RegError getLongListValue(const ::rtl::OUString& keyName,
                                           RegistryValueList<sal_Int32>& rValueList);
 
-    /** gets an ascii list value of a key.
-
-        @param  keyName specifies the name of the key which value will be returned.
-                        If keyName is an empty string, the value is get from the key
+    /**	gets an ascii list value of a key.
+        
+        @param	keyName	specifies the name of the key which value will be returned. 
+                        If keyName is an empty string, the value is get from the key 
                         specified by hKey.
-        @param  rValueList references a RegistryValueList which will be filled with the ascii values.
-        @return REG_NO_ERROR if succeeds else an error code.
+        @param	rValueList references a RegistryValueList which will be filled with the ascii values.
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
     inline RegError getStringListValue(const ::rtl::OUString& keyName,
                                            RegistryValueList<sal_Char*>& rValueList);
 
-    /** gets a unicode value of a key.
+    /**	gets a unicode value of a key.
 
-        @param  keyName specifies the name of the key which value will be returned.
-                        If keyName is an empty string, the value is get from the key
+        @param	keyName	specifies the name of the key which value will be returned. 
+                        If keyName is an empty string, the value is get from the key 
                         specified by hKey.
-        @param  rValueList reference a RegistryValueList which will be filled with the unicode values.
-        @return REG_NO_ERROR if succeeds else an error code.
+        @param	rValueList reference a RegistryValueList which will be filled with the unicode values.
+        @return	REG_NO_ERROR if succeeds else an error code. 
     */
     inline RegError getUnicodeListValue(const ::rtl::OUString& keyName,
                                               RegistryValueList<sal_Unicode*>& rValueList);
@@ -602,43 +602,43 @@ public:
 
         @obsolete Links are no longer supported.
 
-        @return REG_INVALID_LINK
+        @return	REG_INVALID_LINK
      */
-    inline RegError createLink(const ::rtl::OUString& linkName,
+    inline RegError	createLink(const ::rtl::OUString& linkName, 
                                const ::rtl::OUString& linkTarget);
 
     /** used to delete a link.
 
         @obsolete Links are no longer supported.
 
-        @return REG_INVALID_LINK
+        @return	REG_INVALID_LINK
      */
-    inline RegError deleteLink(const ::rtl::OUString& linkName);
+    inline RegError	deleteLink(const ::rtl::OUString& linkName);
 
     /** returns the type of the specified key.
-
+        
         @param name specifies the name of the key or link.
         @param pKeyType returns the type of the key (always RG_KEYTYPE).
-        @return REG_NO_ERROR if succeeds else an error code.
+        @return	REG_NO_ERROR if succeeds else an error code. 
      */
-    inline RegError getKeyType(const ::rtl::OUString& name,
+    inline RegError	getKeyType(const ::rtl::OUString& name,
                                   RegKeyType* pKeyType) const;
-
+    
     /** used to return the target of a link.
 
         @obsolete Links are no longer supported.
 
-        @return REG_INVALID_LINK
+        @return	REG_INVALID_LINK
      */
     inline RegError getLinkTarget(const ::rtl::OUString& linkName,
                                     ::rtl::OUString& rLinkTarget) const;
 
     /** resolves a keyname.
 
-        @param  keyName specifies the name of the key which will be resolved relativ to this key.
+        @param	keyName specifies the name of the key which will be resolved relativ to this key.
                         The resolved name will be prefixed with the name of this key.
         @param firstLinkOnly ignored
-        @return REG_NO_ERROR if succeeds else an error code.
+        @return	REG_NO_ERROR if succeeds else an error code. 
      */
     inline RegError getResolvedKeyName(const ::rtl::OUString& keyName,
                                        sal_Bool firstLinkOnly,
@@ -657,11 +657,11 @@ public:
         This constructor is internal only.
         @internal
     */
-    inline RegistryKey(Registry&    registry,
+    inline RegistryKey(Registry&	registry,
                        RegKeyHandle hKey);
 
     /** returns the internal key handle.
-
+        
         @internal
      */
     RegKeyHandle getKeyHandle() const { return m_hImpl; }
@@ -670,13 +670,13 @@ protected:
     /** sets the internal registry on which this key should work.
 
         @internal
-     */
+     */    
     inline void setRegistry(Registry& registry);
 
     /// stores the registry on which this key works
-    Registry        m_registry;
+    Registry		m_registry;
     /// stores the current key handle of this key
-    RegKeyHandle    m_hImpl;
+    RegKeyHandle	m_hImpl;
 };
 
 
@@ -692,29 +692,29 @@ inline RegistryKeyArray::~RegistryKeyArray()
 {
     if (m_phKeys)
         m_registry.m_pApi->closeSubKeys(m_phKeys, m_length);
-}
-
+}	
+    
 inline RegistryKey RegistryKeyArray::getElement(sal_uInt32 index)
 {
     if (m_registry.isValid() && index < m_length)
         return RegistryKey(m_registry, m_phKeys[index]);
     else
         return RegistryKey();
-}
+}	
 
 inline sal_uInt32 RegistryKeyArray::getLength()
 {
     return m_length;
-}
+}	
 
-inline void RegistryKeyArray::setKeyHandles(Registry& registry,
-                                            RegKeyHandle* phKeys,
+inline void RegistryKeyArray::setKeyHandles(Registry& registry, 
+                                            RegKeyHandle* phKeys, 
                                             sal_uInt32 length)
 {
     m_phKeys = phKeys;
     m_length = length;
     m_registry = registry;
-}
+}	
 
 inline RegError RegistryKeyArray::closeKeyHandles()
 {
@@ -724,11 +724,11 @@ inline RegError RegistryKeyArray::closeKeyHandles()
         ret = m_registry.m_pApi->closeSubKeys(m_phKeys, m_length);
         m_registry = Registry();
         m_length = 0;
-        m_phKeys = NULL;
+        m_phKeys = NULL; 	
         return ret;
     } else
         return(REG_INVALID_KEY);
-}
+}	
 
 //-----------------------------------------------------------------------------
 
@@ -742,30 +742,30 @@ inline RegistryKeyNames::~RegistryKeyNames()
 {
     if (m_pKeyNames)
         m_registry.m_pApi->freeKeyNames(m_pKeyNames, m_length);
-}
-
+}	
+    
 inline ::rtl::OUString RegistryKeyNames::getElement(sal_uInt32 index)
 {
-
+    
     if (m_pKeyNames && index < m_length)
         return m_pKeyNames[index];
     else
         return ::rtl::OUString();
-}
+}	
 
 inline sal_uInt32 RegistryKeyNames::getLength()
 {
     return m_length;
-}
+}	
 
-inline void RegistryKeyNames::setKeyNames(Registry& registry,
-                                          rtl_uString** pKeyNames,
+inline void RegistryKeyNames::setKeyNames(Registry& registry, 
+                                          rtl_uString** pKeyNames, 
                                           sal_uInt32 length)
 {
     m_pKeyNames = pKeyNames;
     m_length = length;
     m_registry = registry;
-}
+}	
 
 inline RegError RegistryKeyNames::freeKeyNames()
 {
@@ -775,11 +775,11 @@ inline RegError RegistryKeyNames::freeKeyNames()
         ret = m_registry.m_pApi->freeKeyNames(m_pKeyNames, m_length);
         m_registry = Registry();
         m_length = 0;
-        m_pKeyNames = NULL;
+        m_pKeyNames = NULL; 	
         return ret;
     } else
         return REG_INVALID_KEY;
-}
+}	
 
 //-----------------------------------------------------------------------------
 
@@ -792,30 +792,30 @@ inline RegistryKey::RegistryKey(Registry& registry, RegKeyHandle hKey)
     , m_hImpl(hKey)
     {
         if (m_hImpl)
-            m_registry.m_pApi->acquireKey(m_hImpl);
+            m_registry.m_pApi->acquireKey(m_hImpl); 
     }
 
 inline RegistryKey::RegistryKey(const RegistryKey& toCopy)
     : m_registry(toCopy.m_registry)
     , m_hImpl(toCopy.m_hImpl)
-    {
+    { 
         if (m_hImpl)
-            m_registry.m_pApi->acquireKey(m_hImpl);
+            m_registry.m_pApi->acquireKey(m_hImpl); 
     }
 
 inline void RegistryKey::setRegistry(Registry& registry)
-    {
+    { 
         m_registry = registry;
     }
 
 inline RegistryKey::~RegistryKey()
-    {
-        if (m_hImpl)
-            m_registry.m_pApi->releaseKey(m_hImpl);
+    { 
+        if (m_hImpl) 
+            m_registry.m_pApi->releaseKey(m_hImpl); 
     }
 
 inline RegistryKey& RegistryKey::operator = (const RegistryKey& toAssign)
-{
+{ 
     m_registry = toAssign.m_registry;
 
     if (toAssign.m_hImpl)
@@ -831,57 +831,57 @@ inline sal_Bool RegistryKey::isValid() const
     {  return (m_hImpl != NULL); }
 
 inline sal_Bool RegistryKey::isReadOnly() const
-    {
-        if  (m_registry.isValid())
-            return (m_registry.m_pApi)->isKeyReadOnly(m_hImpl);
+    {  
+        if 	(m_registry.isValid())
+            return (m_registry.m_pApi)->isKeyReadOnly(m_hImpl); 
         else
             return sal_False;
     }
 
 inline ::rtl::OUString RegistryKey::getName()
-    {
+    {  
         ::rtl::OUString sRet;
         if (m_registry.isValid())
-            m_registry.m_pApi->getKeyName(m_hImpl, &sRet.pData);
+            m_registry.m_pApi->getKeyName(m_hImpl, &sRet.pData); 
         return sRet;;
     }
 
-inline RegError RegistryKey::createKey(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::createKey(const ::rtl::OUString& keyName, 
                                           RegistryKey& rNewKey)
-    {
+    {  	
         if (rNewKey.isValid()) rNewKey.closeKey();
         if (m_registry.isValid())
         {
-            RegError ret = m_registry.m_pApi->createKey(m_hImpl, keyName.pData, &rNewKey.m_hImpl);
+            RegError ret = m_registry.m_pApi->createKey(m_hImpl, keyName.pData, &rNewKey.m_hImpl); 
             if (!ret) rNewKey.setRegistry(m_registry);
             return ret;
         } else
             return REG_INVALID_KEY;
     }
 
-inline RegError RegistryKey::openKey(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::openKey(const ::rtl::OUString& keyName, 
                                      RegistryKey& rOpenKey)
-    {
+    {	
         if (rOpenKey.isValid()) rOpenKey.closeKey();
         if (m_registry.isValid())
         {
-            RegError ret = m_registry.m_pApi->openKey(m_hImpl, keyName.pData,
-                                                    &rOpenKey.m_hImpl);
+            RegError ret = m_registry.m_pApi->openKey(m_hImpl, keyName.pData, 
+                                                    &rOpenKey.m_hImpl); 
             if (!ret) rOpenKey.setRegistry(m_registry);
             return ret;
         } else
             return REG_INVALID_KEY;
     }
-
-inline RegError RegistryKey::openSubKeys(const ::rtl::OUString& keyName,
+    
+inline RegError RegistryKey::openSubKeys(const ::rtl::OUString& keyName, 
                                          RegistryKeyArray& rSubKeys)
-    {
+    {  
         if (m_registry.isValid())
         {
-            RegError        ret = REG_NO_ERROR;
-            RegKeyHandle*   pSubKeys;
-            sal_uInt32      nSubKeys;
-             ret = m_registry.m_pApi->openSubKeys(m_hImpl, keyName.pData,
+            RegError 		ret = REG_NO_ERROR;
+            RegKeyHandle* 	pSubKeys;
+            sal_uInt32 		nSubKeys;
+             ret = m_registry.m_pApi->openSubKeys(m_hImpl, keyName.pData, 
                                                       &pSubKeys, &nSubKeys);
              if ( ret )
             {
@@ -897,13 +897,13 @@ inline RegError RegistryKey::openSubKeys(const ::rtl::OUString& keyName,
 
 inline RegError RegistryKey::getKeyNames(const ::rtl::OUString& keyName,
                                              RegistryKeyNames& rSubKeyNames)
-    {
+    {  
         if (m_registry.isValid())
         {
-            RegError        ret = REG_NO_ERROR;
-            rtl_uString**   pSubKeyNames;
-            sal_uInt32      nSubKeys;
-             ret = m_registry.m_pApi->getKeyNames(m_hImpl, keyName.pData,
+            RegError 		ret = REG_NO_ERROR;
+            rtl_uString**	pSubKeyNames;
+            sal_uInt32 		nSubKeys;
+             ret = m_registry.m_pApi->getKeyNames(m_hImpl, keyName.pData, 
                                                   &pSubKeyNames, &nSubKeys);
              if ( ret )
             {
@@ -918,7 +918,7 @@ inline RegError RegistryKey::getKeyNames(const ::rtl::OUString& keyName,
     }
 
 inline RegError RegistryKey::closeSubKeys(RegistryKeyArray& rSubKeys)
-    {
+    {  
         if (m_registry.isValid())
             return rSubKeys.closeKeyHandles();
         else
@@ -926,24 +926,24 @@ inline RegError RegistryKey::closeSubKeys(RegistryKeyArray& rSubKeys)
     }
 
 inline RegError RegistryKey::deleteKey(const ::rtl::OUString& keyName)
-    {
+    {  
         if (m_registry.isValid())
-            return m_registry.m_pApi->deleteKey(m_hImpl, keyName.pData);
+            return m_registry.m_pApi->deleteKey(m_hImpl, keyName.pData); 
         else
             return REG_INVALID_KEY;
     }
 
 inline RegError RegistryKey::closeKey()
-    {
+    {  
         if (m_registry.isValid())
         {
             RegError ret = m_registry.m_pApi->closeKey(m_hImpl);
-            if (!ret)
+            if (!ret) 
             {
                 m_hImpl = NULL;
                 m_registry = Registry();
             }
-            return ret;
+            return ret; 
         } else
             return REG_INVALID_KEY;
     }
@@ -956,66 +956,66 @@ inline void RegistryKey::releaseKey()
     }
 }
 
-inline RegError RegistryKey::setValue(const ::rtl::OUString& keyName,
-                                              RegValueType valueType,
-                                           RegValue pValue,
+inline RegError RegistryKey::setValue(const ::rtl::OUString& keyName, 
+                                              RegValueType valueType, 
+                                           RegValue pValue, 
                                               sal_uInt32 valueSize)
-    {
+    {  
         if (m_registry.isValid())
-            return m_registry.m_pApi->setValue(m_hImpl, keyName.pData, valueType,
-                                                pValue, valueSize);
+            return m_registry.m_pApi->setValue(m_hImpl, keyName.pData, valueType, 
+                                                pValue, valueSize); 
         else
             return REG_INVALID_KEY;
     }
 
-inline RegError RegistryKey::setLongListValue(const ::rtl::OUString& keyName,
-                                                  sal_Int32* pValueList,
+inline RegError RegistryKey::setLongListValue(const ::rtl::OUString& keyName, 
+                                                  sal_Int32* pValueList, 
                                                   sal_uInt32 len)
-    {
+    {  
         if (m_registry.isValid())
-            return m_registry.m_pApi->setLongListValue(m_hImpl, keyName.pData,
-                                                           pValueList, len);
+            return m_registry.m_pApi->setLongListValue(m_hImpl, keyName.pData, 
+                                                           pValueList, len); 
         else
             return REG_INVALID_KEY;
     }
 
-inline RegError RegistryKey::setStringListValue(const ::rtl::OUString& keyName,
-                                                   sal_Char** pValueList,
+inline RegError RegistryKey::setStringListValue(const ::rtl::OUString& keyName, 
+                                                   sal_Char** pValueList, 
                                                    sal_uInt32 len)
-    {
+    {  
         if (m_registry.isValid())
-            return m_registry.m_pApi->setStringListValue(m_hImpl, keyName.pData,
-                                                            pValueList, len);
+            return m_registry.m_pApi->setStringListValue(m_hImpl, keyName.pData, 
+                                                            pValueList, len); 
         else
             return REG_INVALID_KEY;
     }
 
-inline RegError RegistryKey::setUnicodeListValue(const ::rtl::OUString& keyName,
-                                                        sal_Unicode** pValueList,
+inline RegError RegistryKey::setUnicodeListValue(const ::rtl::OUString& keyName, 
+                                                        sal_Unicode** pValueList, 
                                                         sal_uInt32 len)
-    {
+    {  
         if (m_registry.isValid())
-            return m_registry.m_pApi->setUnicodeListValue(m_hImpl, keyName.pData,
-                                                              pValueList, len);
+            return m_registry.m_pApi->setUnicodeListValue(m_hImpl, keyName.pData, 
+                                                              pValueList, len); 
         else
             return REG_INVALID_KEY;
     }
 
-inline RegError RegistryKey::getValueInfo(const ::rtl::OUString& keyName,
-                                                  RegValueType* pValueType,
+inline RegError RegistryKey::getValueInfo(const ::rtl::OUString& keyName, 
+                                                  RegValueType* pValueType, 
                                                   sal_uInt32* pValueSize)
-    {
+    {  
         if (m_registry.isValid())
-            return m_registry.m_pApi->getValueInfo(m_hImpl, keyName.pData, pValueType, pValueSize);
+            return m_registry.m_pApi->getValueInfo(m_hImpl, keyName.pData, pValueType, pValueSize); 
         else
             return REG_INVALID_KEY;
     }
 
-inline RegError RegistryKey::getValue(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::getValue(const ::rtl::OUString& keyName, 
                                         RegValue pValue)
-    {
+    {  
         if (m_registry.isValid())
-            return m_registry.m_pApi->getValue(m_hImpl, keyName.pData, pValue);
+            return m_registry.m_pApi->getValue(m_hImpl, keyName.pData, pValue); 
         else
             return REG_INVALID_KEY;
     }
@@ -1025,17 +1025,17 @@ inline RegError RegistryKey::getLongListValue(const ::rtl::OUString& keyName,
     {
         if (m_registry.isValid())
         {
-            RegError    ret = REG_NO_ERROR;
-            sal_Int32*  pValueList;
-            sal_uInt32  length;
-             ret = m_registry.m_pApi->getLongListValue(m_hImpl, keyName.pData,
+            RegError 	ret = REG_NO_ERROR;
+            sal_Int32* 	pValueList;
+            sal_uInt32 	length;
+             ret = m_registry.m_pApi->getLongListValue(m_hImpl, keyName.pData, 
                                                       &pValueList, &length);
              if ( ret )
             {
                 return ret;
             } else
             {
-                rValueList.setValueList(m_registry, RG_VALUETYPE_LONGLIST,
+                rValueList.setValueList(m_registry, RG_VALUETYPE_LONGLIST, 
                                         pValueList, length);
                 return ret;
             }
@@ -1048,17 +1048,17 @@ inline RegError RegistryKey::getStringListValue(const ::rtl::OUString& keyName,
     {
         if (m_registry.isValid())
         {
-            RegError    ret = REG_NO_ERROR;
-            sal_Char**  pValueList;
-            sal_uInt32  length;
-             ret = m_registry.m_pApi->getStringListValue(m_hImpl, keyName.pData,
+            RegError 	ret = REG_NO_ERROR;
+            sal_Char** 	pValueList;
+            sal_uInt32 	length;
+             ret = m_registry.m_pApi->getStringListValue(m_hImpl, keyName.pData, 
                                                       &pValueList, &length);
              if ( ret )
             {
                 return ret;
             } else
             {
-                rValueList.setValueList(m_registry, RG_VALUETYPE_STRINGLIST,
+                rValueList.setValueList(m_registry, RG_VALUETYPE_STRINGLIST, 
                                         pValueList, length);
                 return ret;
             }
@@ -1071,9 +1071,9 @@ inline RegError RegistryKey::getUnicodeListValue(const ::rtl::OUString& keyName,
     {
         if (m_registry.isValid())
         {
-            RegError        ret = REG_NO_ERROR;
-            sal_Unicode**   pValueList;
-            sal_uInt32      length;
+            RegError 		ret = REG_NO_ERROR;
+            sal_Unicode** 	pValueList;
+            sal_uInt32 		length;
              ret = m_registry.m_pApi->getUnicodeListValue(m_hImpl, keyName.pData,
                                                       &pValueList, &length);
              if ( ret )
@@ -1081,7 +1081,7 @@ inline RegError RegistryKey::getUnicodeListValue(const ::rtl::OUString& keyName,
                 return ret;
             } else
             {
-                rValueList.setValueList(m_registry, RG_VALUETYPE_UNICODELIST,
+                rValueList.setValueList(m_registry, RG_VALUETYPE_UNICODELIST, 
                                         pValueList, length);
                 return ret;
             }
@@ -1089,43 +1089,43 @@ inline RegError RegistryKey::getUnicodeListValue(const ::rtl::OUString& keyName,
             return REG_INVALID_KEY;
     }
 
-inline RegError RegistryKey::createLink(const ::rtl::OUString& linkName,
+inline RegError	RegistryKey::createLink(const ::rtl::OUString& linkName, 
                                            const ::rtl::OUString& linkTarget)
     {
         if (m_registry.isValid())
-            return m_registry.m_pApi->createLink(m_hImpl, linkName.pData, linkTarget.pData);
+            return m_registry.m_pApi->createLink(m_hImpl, linkName.pData, linkTarget.pData); 
         else
             return REG_INVALID_KEY;
     }
 
-inline RegError RegistryKey::deleteLink(const ::rtl::OUString& linkName)
+inline RegError	RegistryKey::deleteLink(const ::rtl::OUString& linkName)
     {
         if (m_registry.isValid())
-            return m_registry.m_pApi->deleteLink(m_hImpl, linkName.pData);
+            return m_registry.m_pApi->deleteLink(m_hImpl, linkName.pData); 
         else
-            return REG_INVALID_KEY;
-    }
+            return REG_INVALID_KEY;		
+    }	
 
-inline RegError RegistryKey::getKeyType(const ::rtl::OUString& keyName,
+inline RegError	RegistryKey::getKeyType(const ::rtl::OUString& keyName,
                                               RegKeyType* pKeyType) const
     {
         if (m_registry.isValid())
-            return m_registry.m_pApi->getKeyType(m_hImpl, keyName.pData, pKeyType);
+            return m_registry.m_pApi->getKeyType(m_hImpl, keyName.pData, pKeyType); 
         else
-            return REG_INVALID_KEY;
-    }
+            return REG_INVALID_KEY;		
+    }	
 
 inline RegError RegistryKey::getLinkTarget(const ::rtl::OUString& linkName,
                                                ::rtl::OUString& rLinkTarget) const
     {
         if (m_registry.isValid())
         {
-            return m_registry.m_pApi->getLinkTarget(m_hImpl,
-                                                    linkName.pData,
-                                                    &rLinkTarget.pData);
+            return m_registry.m_pApi->getLinkTarget(m_hImpl, 
+                                                    linkName.pData, 
+                                                    &rLinkTarget.pData); 
         } else
-            return REG_INVALID_KEY;
-    }
+            return REG_INVALID_KEY;		
+    }	
 
 
 inline RegError RegistryKey::getResolvedKeyName(const ::rtl::OUString& keyName,
@@ -1133,19 +1133,19 @@ inline RegError RegistryKey::getResolvedKeyName(const ::rtl::OUString& keyName,
                                                        ::rtl::OUString& rResolvedName) const
     {
         if (m_registry.isValid())
-            return m_registry.m_pApi->getResolvedKeyName(m_hImpl,
-                                                         keyName.pData,
+            return m_registry.m_pApi->getResolvedKeyName(m_hImpl, 
+                                                         keyName.pData, 
                                                          firstLinkOnly,
-                                                         &rResolvedName.pData);
+                                                         &rResolvedName.pData); 
         else
-            return REG_INVALID_KEY;
-    }
+            return REG_INVALID_KEY;		
+    }	
 
 inline ::rtl::OUString RegistryKey::getRegistryName()
-    {
+    {  
         if (m_registry.isValid())
         {
-            return m_registry.getName();
+            return m_registry.getName(); 
         } else
             return ::rtl::OUString();
     }
@@ -1160,23 +1160,23 @@ inline Registry::Registry()
 inline Registry::Registry(const Registry& toCopy)
     : m_pApi(toCopy.m_pApi)
     , m_hImpl(toCopy.m_hImpl)
-    {
+    { 
         if (m_hImpl)
-            m_pApi->acquire(m_hImpl);
+            m_pApi->acquire(m_hImpl); 
     }
 
 
 inline Registry::~Registry()
-    {
+    { 
         if (m_hImpl)
-            m_pApi->release(m_hImpl);
+            m_pApi->release(m_hImpl); 
     }
 
 inline Registry& Registry::operator = (const Registry& toAssign)
 {
     if (toAssign.m_hImpl)
         toAssign.m_pApi->acquire(toAssign.m_hImpl);
-    if (m_hImpl)
+    if (m_hImpl) 
         m_pApi->release(m_hImpl);
 
     m_pApi  = toAssign.m_pApi;
@@ -1192,35 +1192,35 @@ inline sal_Bool Registry::isReadOnly() const
     {  return m_pApi->isReadOnly(m_hImpl); }
 
 inline RegError Registry::openRootKey(RegistryKey& rRootKey)
-    {
+    {  
         rRootKey.setRegistry(*this);
-        return m_pApi->openRootKey(m_hImpl, &rRootKey.m_hImpl);
+        return m_pApi->openRootKey(m_hImpl, &rRootKey.m_hImpl); 
     }
 
 inline ::rtl::OUString Registry::getName()
-    {
+    {  
         ::rtl::OUString sRet;
         m_pApi->getName(m_hImpl, &sRet.pData);
         return sRet;
     }
 
 inline RegError Registry::create(const ::rtl::OUString& registryName)
-    {
+    {  
         if (m_hImpl)
             m_pApi->release(m_hImpl);
-        return m_pApi->createRegistry(registryName.pData, &m_hImpl);
+        return m_pApi->createRegistry(registryName.pData, &m_hImpl); 
     }
 
-inline RegError Registry::open(const ::rtl::OUString& registryName,
+inline RegError Registry::open(const ::rtl::OUString& registryName, 
                                   RegAccessMode accessMode)
-    {
+    {  	
         if (m_hImpl)
             m_pApi->release(m_hImpl);
-        return m_pApi->openRegistry(registryName.pData, &m_hImpl, accessMode);
+        return m_pApi->openRegistry(registryName.pData, &m_hImpl, accessMode); 
     }
 
 inline RegError Registry::close()
-    {
+    {  
         RegError ret = m_pApi->closeRegistry(m_hImpl);
         if (!ret)
             m_hImpl = NULL;
@@ -1228,34 +1228,34 @@ inline RegError Registry::close()
     }
 
 inline RegError Registry::destroy(const ::rtl::OUString& registryName)
-    {
+    {  
         RegError ret = m_pApi->destroyRegistry(m_hImpl, registryName.pData);
         if ( !ret && (registryName.getLength() == 0) )
             m_hImpl = NULL;
         return ret;
     }
 
-inline RegError Registry::loadKey(RegistryKey& rKey,
-                                      const ::rtl::OUString& keyName,
+inline RegError Registry::loadKey(RegistryKey& rKey, 
+                                      const ::rtl::OUString& keyName, 
                                       const ::rtl::OUString& regFileName)
     {  return m_pApi->loadKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData); }
 
-inline RegError Registry::saveKey(RegistryKey& rKey,
-                                     const ::rtl::OUString& keyName,
+inline RegError Registry::saveKey(RegistryKey& rKey, 
+                                     const ::rtl::OUString& keyName, 
                                      const ::rtl::OUString& regFileName)
     {  return m_pApi->saveKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData); }
 
-inline RegError Registry::mergeKey(RegistryKey& rKey,
-                                         const ::rtl::OUString& keyName,
+inline RegError Registry::mergeKey(RegistryKey& rKey, 
+                                         const ::rtl::OUString& keyName, 
                                          const ::rtl::OUString& regFileName,
-                                         sal_Bool bWarnings,
+                                         sal_Bool bWarnings, 
                                          sal_Bool bReport)
     {  return m_pApi->mergeKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData, bWarnings, bReport); }
 
 inline RegError Registry::dumpRegistry(RegistryKey& rKey)
     {  return m_pApi->dumpRegistry(m_hImpl, rKey.m_hImpl); }
 
-
+    
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/inc/registry/regtype.h b/registry/inc/registry/regtype.h
index 0f439b970733..ed44a8df6140 100644
--- a/registry/inc/registry/regtype.h
+++ b/registry/inc/registry/regtype.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,34 +32,34 @@
 #include <sal/types.h>
 #include <sal/udkversion.h>
 
-// version number of the library. This number is used for the load on call
+// version number of the library. This number is used for the load on call 
 // mechanism and must be modifed when the library will be upgraded to a new version.
 #define LIBRARY_VERSION SAL_UDK_MAJOR
 
 /// defines the type of a registry handle used in the C API.
-typedef void*       RegHandle;
+typedef void* 		RegHandle;
 
 /// defines the type of a registry key handle used in the C API.
-typedef void*       RegKeyHandle;
+typedef void* 		RegKeyHandle;
 
 /// defines the type of a registry key value handle used in the C API.
-typedef void*       RegValue;
+typedef void*		RegValue;	
 
 /** defines the open/access mode of the registry.
 
     Two modes are valid:
-    -REG_READONLY    allows readonly access
+    -REG_READONLY    allows readonly access 
     -REG_READWRITE   allows read and write access
  */
-typedef sal_uInt16  RegAccessMode;
+typedef sal_uInt16	RegAccessMode;
 
 /// Flag to specify the open mode of a registry. This mode allows readonly access.
-#define REG_READONLY        0x0001
+#define REG_READONLY		0x0001
 /// Flag to specify the open mode of a registry. This mode allows read and write access.
-#define REG_READWRITE       0x0002
+#define REG_READWRITE      	0x0002
 
 /** defines the type of a registry key.
-
+    
     The registry differs between normal keys which can contain subkeys or
     a value and link keys which navigate over the linktarget to an existing
     other key (which are no longer supported).
@@ -73,13 +73,13 @@ enum RegKeyType
 };
 
 /** defines the type of a key value.
-
+    
     A registry key can contain a value which has one of seven different types.
     Three simple types (long, ascii and unicode string) and a list type of
     these simple types. Furthermore a binary type which provides the possibilty
     to define own data structures and store these types in the registry. The UNO
-    core reflection data is stored as a binary blob in the type registry.
- */
+    core reflection data is stored as a binary blob in the type registry. 
+ */    
 enum RegValueType
 {
     /// The key has no value or the value type is unknown.
@@ -88,7 +88,7 @@ enum RegValueType
     RG_VALUETYPE_LONG,
     /// The key has a value of type ascii string
     RG_VALUETYPE_STRING,
-    /// The key has a value of type unicode string
+    /// The key has a value of type unicode string 
     RG_VALUETYPE_UNICODE,
     /// The key has a value of type binary
     RG_VALUETYPE_BINARY,
@@ -116,7 +116,7 @@ enum RegError
     REG_REGISTRY_READONLY,
     /// destroy a registry failed. There are may be any open keys.
     REG_DESTROY_REGISTRY_FAILED,
-    /** registry cannot be opened with readwrite access because the registry is already
+    /** registry cannot be opened with readwrite access because the registry is already 
         open with readwrite access anywhere.
     */
     REG_CANNOT_OPEN_FOR_READWRITE,
@@ -125,13 +125,13 @@ enum RegError
     */
     REG_INVALID_REGISTRY,
 
-    /// the key or key handle points to an invalid key or closed key.
+    ///	the key or key handle points to an invalid key or closed key.
     REG_KEY_NOT_OPEN,
-    /// the specified keyname points to a nonexisting key.
+    ///	the specified keyname points to a nonexisting key.
     REG_KEY_NOT_EXISTS,
-    /// the key with the specified keyname cannot be created.
+    ///	the key with the specified keyname cannot be created.
     REG_CREATE_KEY_FAILED,
-    /// the specified key cannot be deleted. Maybe an open key handle exists to this key.
+    /// the specified key cannot be deleted. Maybe an open key handle exists to this key. 
     REG_DELETE_KEY_FAILED,
     /** the keyname is invalid. This error will return if the keyname
         is NULL but should not be NULL in the context of a called function.
@@ -140,7 +140,7 @@ enum RegError
     /// the key is not in a valid state.
     REG_INVALID_KEY,
 
-    /// the key has no value
+    ///	the key has no value
     REG_VALUE_NOT_EXISTS,
     /// setting the specified value of a key failed.
     REG_SET_VALUE_FAILED,
@@ -151,7 +151,7 @@ enum RegError
 
     /// merging a key, the value and all subkeys failed.
     REG_MERGE_ERROR,
-    /** conflicts exists during the merge process of a key. This could happen if
+    /**	conflicts exists during the merge process of a key. This could happen if
         the value of a key already exists and the merge process will replace it.
     */
     REG_MERGE_CONFLICT,
@@ -170,12 +170,12 @@ enum RegError
     REG_INVALID_LINKTARGET,
     /// the link target points to a nonexisting key (no longer used).
     REG_LINKTARGET_NOT_EXIST,
-    /// the reserved buffer for the resolved keyname is to small.
+    /// the reserved buffer for the resolved keyname is to small. 
     REG_BUFFERSIZE_TOSMALL
 };
 
 /// specify the calling convention for the registry API
-#define REGISTRY_CALLTYPE   SAL_CALL
+#define REGISTRY_CALLTYPE	SAL_CALL
 
 #endif
 
diff --git a/registry/inc/registry/types.h b/registry/inc/registry/types.h
index 44ccda8abad6..d94e697d3876 100644
--- a/registry/inc/registry/types.h
+++ b/registry/inc/registry/types.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/registry/inc/registry/version.h b/registry/inc/registry/version.h
index bf4664287d0f..1f91655ada2c 100644
--- a/registry/inc/registry/version.h
+++ b/registry/inc/registry/version.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/registry/inc/registry/writer.h b/registry/inc/registry/writer.h
index 57a9f81c9684..5d90a9fd05ef 100644
--- a/registry/inc/registry/writer.h
+++ b/registry/inc/registry/writer.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/registry/inc/registry/writer.hxx b/registry/inc/registry/writer.hxx
index ce7433c31129..e9edca7cf4b4 100644
--- a/registry/inc/registry/writer.hxx
+++ b/registry/inc/registry/writer.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 4603ce41d163..e1576acd330e 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/registry/source/keyimpl.hxx b/registry/source/keyimpl.hxx
index a384d2024953..cab08a6e5958 100644
--- a/registry/source/keyimpl.hxx
+++ b/registry/source/keyimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,9 +29,9 @@
 #ifndef _KEYIMPL_HXX_
 #define _KEYIMPL_HXX_
 
-#include    <registry/registry.h>
-#include    "regimpl.hxx"
-#include    <rtl/ustring.hxx>
+#include 	<registry/registry.h>
+#include	"regimpl.hxx"
+#include	<rtl/ustring.hxx>
 
 class ORegKey
 {
@@ -40,73 +40,73 @@ public:
     ORegKey(const rtl::OUString& keyName, ORegistry* pReg);
     ~ORegKey();
 
-      sal_uInt32    acquire()
+      sal_uInt32	acquire()
         { return ++m_refCount; }
 
-    sal_uInt32  release()
+    sal_uInt32	release()
         { return --m_refCount; }
 
-    RegError    acquireKey(RegKeyHandle hKey);
-    RegError    releaseKey(RegKeyHandle hKey);
+    RegError	acquireKey(RegKeyHandle hKey);
+    RegError	releaseKey(RegKeyHandle hKey);
 
-    RegError    createKey(const rtl::OUString& keyName, RegKeyHandle* phNewKey);
+    RegError	createKey(const rtl::OUString& keyName, RegKeyHandle* phNewKey);
 
-    RegError    openKey(const rtl::OUString& keyName, RegKeyHandle* phOpenKey);
+    RegError	openKey(const rtl::OUString& keyName, RegKeyHandle* phOpenKey);
 
-    RegError    openSubKeys(const rtl::OUString& keyName,
-                            RegKeyHandle** phOpenSubKeys,
+    RegError	openSubKeys(const rtl::OUString& keyName, 
+                            RegKeyHandle** phOpenSubKeys, 
                             sal_uInt32* pnSubKeys);
 
-    RegError    getKeyNames(const rtl::OUString& keyName,
-                            rtl_uString*** pSubKeyNames,
+    RegError	getKeyNames(const rtl::OUString& keyName, 
+                            rtl_uString*** pSubKeyNames, 
                             sal_uInt32* pnSubKeys);
 
-    RegError    closeKey(RegKeyHandle hKey);
+    RegError	closeKey(RegKeyHandle hKey);
 
-    RegError    deleteKey(const rtl::OUString& keyName);
+    RegError	deleteKey(const rtl::OUString& keyName);
 
-    RegError    getValueInfo(const rtl::OUString& valueName,
-                             RegValueType* pValueTye,
+    RegError	getValueInfo(const rtl::OUString& valueName, 
+                             RegValueType* pValueTye, 
                              sal_uInt32* pValueSize) const;
 
-    RegError    setValue(const rtl::OUString& valueName,
-                         RegValueType vType,
-                         RegValue value,
+    RegError	setValue(const rtl::OUString& valueName, 
+                         RegValueType vType, 
+                         RegValue value, 
                          sal_uInt32 vSize);
 
-    RegError    setLongListValue(const rtl::OUString& valueName,
-                                  sal_Int32* pValueList,
+    RegError	setLongListValue(const rtl::OUString& valueName, 
+                                  sal_Int32* pValueList, 
                                  sal_uInt32 len);
 
-    RegError    setStringListValue(const rtl::OUString& valueName,
-                                   sal_Char** pValueList,
+    RegError	setStringListValue(const rtl::OUString& valueName, 
+                                   sal_Char** pValueList, 
                                   sal_uInt32 len);
 
-    RegError    setUnicodeListValue(const rtl::OUString& valueName,
-                                   sal_Unicode** pValueList,
+    RegError	setUnicodeListValue(const rtl::OUString& valueName, 
+                                   sal_Unicode** pValueList, 
                                   sal_uInt32 len);
 
-    RegError    getValue(const rtl::OUString& valueName, RegValue value) const;
+    RegError	getValue(const rtl::OUString& valueName, RegValue value) const; 	
 
-    RegError    getLongListValue(const rtl::OUString& valueName,
-                                  sal_Int32** pValueList,
+    RegError	getLongListValue(const rtl::OUString& valueName, 
+                                  sal_Int32** pValueList, 
                                  sal_uInt32* pLen) const;
 
-    RegError    getStringListValue(const rtl::OUString& valueName,
-                                    sal_Char*** pValueList,
+    RegError	getStringListValue(const rtl::OUString& valueName, 
+                                    sal_Char*** pValueList, 
                                    sal_uInt32* pLen) const;
 
-    RegError    getUnicodeListValue(const rtl::OUString& valueName,
-                                     sal_Unicode*** pValueList,
+    RegError	getUnicodeListValue(const rtl::OUString& valueName, 
+                                     sal_Unicode*** pValueList, 
                                     sal_uInt32* pLen) const;
 
-    RegError    getKeyType(const rtl::OUString& name,
+    RegError	getKeyType(const rtl::OUString& name,
                            RegKeyType* pKeyType) const;
-
-    RegError    getResolvedKeyName(const rtl::OUString& keyName,
+    
+    RegError 	getResolvedKeyName(const rtl::OUString& keyName,
                                    rtl::OUString& resolvedName);
 
-    bool isDeleted() const
+    bool isDeleted() const 
         { return m_bDeleted != 0; }
 
     void setDeleted (sal_Bool bKeyDeleted)
@@ -117,14 +117,14 @@ public:
 
     void setModified (bool bModified = true)
         { m_bModified = bModified ? 1 : 0; }
-
-    sal_Bool        isReadOnly() const
+            
+    sal_Bool		isReadOnly() const 
                     { return m_pRegistry->isReadOnly(); }
 
-    sal_uInt32      countSubKeys();
+    sal_uInt32		countSubKeys();
 
     ORegistry* getRegistry() const
-                    { return m_pRegistry; }
+                    { return m_pRegistry; }	
 
     const store::OStoreFile& getStoreFile() const
                     { return m_pRegistry->getStoreFile(); }
@@ -132,19 +132,19 @@ public:
     store::OStoreDirectory getStoreDir();
 
     const rtl::OUString& getName() const
-                    { return m_name; }
+                    { return m_name; }	
 
     sal_uInt32 getRefCount() const
-                    { return m_refCount; }
+                    { return m_refCount; }	
 
     rtl::OUString getFullPath(rtl::OUString const & path) const;
 
 private:
-    sal_uInt32              m_refCount;
-    rtl::OUString           m_name;
+    sal_uInt32				m_refCount;
+    rtl::OUString 			m_name;
     int                     m_bDeleted:1;
     int                     m_bModified:1;
-    ORegistry*              m_pRegistry;
+    ORegistry*				m_pRegistry;
 };
 
 #endif
diff --git a/registry/source/reflcnst.hxx b/registry/source/reflcnst.hxx
index 8d682d9a966b..323d5b30e378 100644
--- a/registry/source/reflcnst.hxx
+++ b/registry/source/reflcnst.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,65 +36,65 @@
 
 #define REGTYPE_IEEE_NATIVE 1
 
-extern const sal_uInt32 magic;
+extern const sal_uInt32	magic;
 extern const sal_uInt16 minorVersion;
 extern const sal_uInt16 majorVersion;
 
-#define OFFSET_MAGIC                0
-#define OFFSET_SIZE                 (OFFSET_MAGIC + sizeof(magic))
-#define OFFSET_MINOR_VERSION        (OFFSET_SIZE + sizeof(sal_uInt32))
-#define OFFSET_MAJOR_VERSION        (OFFSET_MINOR_VERSION + sizeof(minorVersion))
-#define OFFSET_N_ENTRIES            (OFFSET_MAJOR_VERSION + sizeof(sal_uInt16))
-#define OFFSET_TYPE_SOURCE          (OFFSET_N_ENTRIES + sizeof(sal_uInt16))
-#define OFFSET_TYPE_CLASS           (OFFSET_TYPE_SOURCE + sizeof(sal_uInt16))
-#define OFFSET_THIS_TYPE            (OFFSET_TYPE_CLASS + sizeof(sal_uInt16))
-#define OFFSET_UIK                  (OFFSET_THIS_TYPE + sizeof(sal_uInt16))
-#define OFFSET_DOKU                 (OFFSET_UIK + sizeof(sal_uInt16))
-#define OFFSET_FILENAME             (OFFSET_DOKU + sizeof(sal_uInt16))
-
-#define OFFSET_N_SUPERTYPES         (OFFSET_FILENAME + sizeof(sal_uInt16))
-#define OFFSET_SUPERTYPES           (OFFSET_N_SUPERTYPES + sizeof(sal_uInt16))
-
-#define OFFSET_CP_SIZE              (OFFSET_SUPERTYPES + sizeof(sal_uInt16))
-#define OFFSET_CP                   (OFFSET_CP_SIZE + sizeof(sal_uInt16))
-
-#define CP_OFFSET_ENTRY_SIZE        0
-#define CP_OFFSET_ENTRY_TAG         (CP_OFFSET_ENTRY_SIZE + sizeof(sal_uInt32))
-#define CP_OFFSET_ENTRY_DATA        (CP_OFFSET_ENTRY_TAG + sizeof(sal_uInt16))
-#define CP_OFFSET_ENTRY_UIK1        CP_OFFSET_ENTRY_DATA
-#define CP_OFFSET_ENTRY_UIK2        (CP_OFFSET_ENTRY_UIK1 + sizeof(sal_uInt32))
-#define CP_OFFSET_ENTRY_UIK3        (CP_OFFSET_ENTRY_UIK2 + sizeof(sal_uInt16))
-#define CP_OFFSET_ENTRY_UIK4        (CP_OFFSET_ENTRY_UIK3 + sizeof(sal_uInt16))
-#define CP_OFFSET_ENTRY_UIK5        (CP_OFFSET_ENTRY_UIK4 + sizeof(sal_uInt32))
-
-#define FIELD_OFFSET_ACCESS         0
-#define FIELD_OFFSET_NAME           (FIELD_OFFSET_ACCESS + sizeof(sal_uInt16))
-#define FIELD_OFFSET_TYPE           (FIELD_OFFSET_NAME + sizeof(sal_uInt16))
-#define FIELD_OFFSET_VALUE          (FIELD_OFFSET_TYPE + sizeof(sal_uInt16))
-#define FIELD_OFFSET_DOKU           (FIELD_OFFSET_VALUE + sizeof(sal_uInt16))
-#define FIELD_OFFSET_FILENAME       (FIELD_OFFSET_DOKU + sizeof(sal_uInt16))
-//#define FIELD_ENTRY_SIZE          (FIELD_OFFSET_FILENAME + sizeof(sal_uInt16))
-
-#define PARAM_OFFSET_TYPE           0
-#define PARAM_OFFSET_MODE           (PARAM_OFFSET_TYPE + sizeof(sal_uInt16))
-#define PARAM_OFFSET_NAME           (PARAM_OFFSET_MODE + sizeof(sal_uInt16))
-//#define PARAM_ENTRY_SIZE          (PARAM_OFFSET_NAME + sizeof(sal_uInt16))
-
-#define METHOD_OFFSET_SIZE          0
-#define METHOD_OFFSET_MODE          (METHOD_OFFSET_SIZE + sizeof(sal_uInt16))
-#define METHOD_OFFSET_NAME          (METHOD_OFFSET_MODE + sizeof(sal_uInt16))
-#define METHOD_OFFSET_RETURN        (METHOD_OFFSET_NAME + sizeof(sal_uInt16))
-#define METHOD_OFFSET_DOKU          (METHOD_OFFSET_RETURN + sizeof(sal_uInt16))
-#define METHOD_OFFSET_PARAM_COUNT   (METHOD_OFFSET_DOKU + sizeof(sal_uInt16))
-//#define METHOD_OFFSET_PARAM(i)        (METHOD_OFFSET_PARAM_COUNT + sizeof(sal_uInt16) + (i * PARAM_ENTRY_SIZE))
-
-#define REFERENCE_OFFSET_TYPE       0
-#define REFERENCE_OFFSET_NAME       (REFERENCE_OFFSET_TYPE + sizeof(sal_uInt16))
-#define REFERENCE_OFFSET_DOKU       (REFERENCE_OFFSET_NAME + sizeof(sal_uInt16))
-#define REFERENCE_OFFSET_ACCESS     (REFERENCE_OFFSET_DOKU + sizeof(sal_uInt16))
-//#define REFERENCE_ENTRY_SIZE      (REFERENCE_OFFSET_ACCESS + sizeof(sal_uInt16))
-
-enum CPInfoTag
+#define OFFSET_MAGIC 				0
+#define OFFSET_SIZE 				(OFFSET_MAGIC + sizeof(magic))
+#define OFFSET_MINOR_VERSION 		(OFFSET_SIZE + sizeof(sal_uInt32))
+#define OFFSET_MAJOR_VERSION 		(OFFSET_MINOR_VERSION + sizeof(minorVersion))
+#define OFFSET_N_ENTRIES   	 		(OFFSET_MAJOR_VERSION + sizeof(sal_uInt16))
+#define OFFSET_TYPE_SOURCE    		(OFFSET_N_ENTRIES + sizeof(sal_uInt16))
+#define OFFSET_TYPE_CLASS 			(OFFSET_TYPE_SOURCE + sizeof(sal_uInt16))
+#define OFFSET_THIS_TYPE 			(OFFSET_TYPE_CLASS + sizeof(sal_uInt16))
+#define OFFSET_UIK 					(OFFSET_THIS_TYPE + sizeof(sal_uInt16))
+#define OFFSET_DOKU 	   			(OFFSET_UIK + sizeof(sal_uInt16))
+#define OFFSET_FILENAME				(OFFSET_DOKU + sizeof(sal_uInt16))
+
+#define OFFSET_N_SUPERTYPES			(OFFSET_FILENAME + sizeof(sal_uInt16))
+#define OFFSET_SUPERTYPES			(OFFSET_N_SUPERTYPES + sizeof(sal_uInt16))
+
+#define OFFSET_CP_SIZE				(OFFSET_SUPERTYPES + sizeof(sal_uInt16))
+#define OFFSET_CP 					(OFFSET_CP_SIZE + sizeof(sal_uInt16))
+
+#define CP_OFFSET_ENTRY_SIZE		0
+#define CP_OFFSET_ENTRY_TAG			(CP_OFFSET_ENTRY_SIZE + sizeof(sal_uInt32))
+#define CP_OFFSET_ENTRY_DATA		(CP_OFFSET_ENTRY_TAG + sizeof(sal_uInt16))
+#define CP_OFFSET_ENTRY_UIK1		CP_OFFSET_ENTRY_DATA
+#define CP_OFFSET_ENTRY_UIK2		(CP_OFFSET_ENTRY_UIK1 + sizeof(sal_uInt32))
+#define CP_OFFSET_ENTRY_UIK3		(CP_OFFSET_ENTRY_UIK2 + sizeof(sal_uInt16))
+#define CP_OFFSET_ENTRY_UIK4		(CP_OFFSET_ENTRY_UIK3 + sizeof(sal_uInt16))
+#define CP_OFFSET_ENTRY_UIK5		(CP_OFFSET_ENTRY_UIK4 + sizeof(sal_uInt32))
+
+#define FIELD_OFFSET_ACCESS			0
+#define FIELD_OFFSET_NAME			(FIELD_OFFSET_ACCESS + sizeof(sal_uInt16))
+#define FIELD_OFFSET_TYPE			(FIELD_OFFSET_NAME + sizeof(sal_uInt16))
+#define FIELD_OFFSET_VALUE			(FIELD_OFFSET_TYPE + sizeof(sal_uInt16))
+#define FIELD_OFFSET_DOKU			(FIELD_OFFSET_VALUE + sizeof(sal_uInt16))
+#define FIELD_OFFSET_FILENAME		(FIELD_OFFSET_DOKU + sizeof(sal_uInt16))
+//#define FIELD_ENTRY_SIZE			(FIELD_OFFSET_FILENAME + sizeof(sal_uInt16))
+
+#define PARAM_OFFSET_TYPE			0
+#define PARAM_OFFSET_MODE			(PARAM_OFFSET_TYPE + sizeof(sal_uInt16))
+#define PARAM_OFFSET_NAME			(PARAM_OFFSET_MODE + sizeof(sal_uInt16))
+//#define PARAM_ENTRY_SIZE			(PARAM_OFFSET_NAME + sizeof(sal_uInt16))
+
+#define METHOD_OFFSET_SIZE			0
+#define METHOD_OFFSET_MODE			(METHOD_OFFSET_SIZE + sizeof(sal_uInt16))
+#define METHOD_OFFSET_NAME			(METHOD_OFFSET_MODE + sizeof(sal_uInt16))
+#define METHOD_OFFSET_RETURN		(METHOD_OFFSET_NAME + sizeof(sal_uInt16))
+#define METHOD_OFFSET_DOKU			(METHOD_OFFSET_RETURN + sizeof(sal_uInt16))
+#define METHOD_OFFSET_PARAM_COUNT	(METHOD_OFFSET_DOKU + sizeof(sal_uInt16))
+//#define METHOD_OFFSET_PARAM(i)		(METHOD_OFFSET_PARAM_COUNT + sizeof(sal_uInt16) + (i * PARAM_ENTRY_SIZE))
+
+#define REFERENCE_OFFSET_TYPE	   	0
+#define REFERENCE_OFFSET_NAME	   	(REFERENCE_OFFSET_TYPE + sizeof(sal_uInt16))
+#define REFERENCE_OFFSET_DOKU	   	(REFERENCE_OFFSET_NAME + sizeof(sal_uInt16))
+#define REFERENCE_OFFSET_ACCESS	   	(REFERENCE_OFFSET_DOKU + sizeof(sal_uInt16))
+//#define REFERENCE_ENTRY_SIZE	   	(REFERENCE_OFFSET_ACCESS + sizeof(sal_uInt16))
+
+enum CPInfoTag 
 {
     CP_TAG_INVALID = RT_TYPE_NONE,
     CP_TAG_CONST_BOOL = RT_TYPE_BOOL,
@@ -126,7 +126,7 @@ inline sal_uInt16 readBYTE(const sal_uInt8* buffer, sal_uInt8& v)
     return sizeof(sal_uInt8);
 }
 
-inline sal_uInt32 writeINT16(sal_uInt8* buffer, sal_Int16 v)
+inline sal_uInt32 writeINT16(sal_uInt8* buffer, sal_Int16 v) 
 {
     buffer[0] = (sal_uInt8)((v >> 8) & 0xFF);
     buffer[1] = (sal_uInt8)((v >> 0) & 0xFF);
@@ -134,14 +134,14 @@ inline sal_uInt32 writeINT16(sal_uInt8* buffer, sal_Int16 v)
     return sizeof(sal_Int16);
 }
 
-inline sal_uInt32 readINT16(const sal_uInt8* buffer, sal_Int16& v)
+inline sal_uInt32 readINT16(const sal_uInt8* buffer, sal_Int16& v) 
 {
     v = ((buffer[0] << 8) | (buffer[1] << 0));
 
     return sizeof(sal_Int16);
 }
 
-inline sal_uInt32 writeUINT16(sal_uInt8* buffer, sal_uInt16 v)
+inline sal_uInt32 writeUINT16(sal_uInt8* buffer, sal_uInt16 v) 
 {
     buffer[0] = (sal_uInt8)((v >> 8) & 0xFF);
     buffer[1] = (sal_uInt8)((v >> 0) & 0xFF);
@@ -149,14 +149,14 @@ inline sal_uInt32 writeUINT16(sal_uInt8* buffer, sal_uInt16 v)
     return sizeof(sal_uInt16);
 }
 
-inline sal_uInt32 readUINT16(const sal_uInt8* buffer, sal_uInt16& v)
+inline sal_uInt32 readUINT16(const sal_uInt8* buffer, sal_uInt16& v) 
 {
     v = ((buffer[0] << 8) | (buffer[1] << 0));
 
     return sizeof(sal_uInt16);
 }
 
-inline sal_uInt32 writeINT32(sal_uInt8* buffer, sal_Int32 v)
+inline sal_uInt32 writeINT32(sal_uInt8* buffer, sal_Int32 v) 
 {
     buffer[0] = (sal_uInt8)((v >> 24) & 0xFF);
     buffer[1] = (sal_uInt8)((v >> 16) & 0xFF);
@@ -166,19 +166,19 @@ inline sal_uInt32 writeINT32(sal_uInt8* buffer, sal_Int32 v)
     return sizeof(sal_Int32);
 }
 
-inline sal_uInt32 readINT32(const sal_uInt8* buffer, sal_Int32& v)
+inline sal_uInt32 readINT32(const sal_uInt8* buffer, sal_Int32& v) 
 {
     v = (
-            (buffer[0] << 24) |
-            (buffer[1] << 16) |
-            (buffer[2] << 8)  |
+            (buffer[0] << 24) | 
+            (buffer[1] << 16) | 
+            (buffer[2] << 8)  | 
             (buffer[3] << 0)
         );
 
     return sizeof(sal_Int32);
 }
 
-inline sal_uInt32 writeUINT32(sal_uInt8* buffer, sal_uInt32 v)
+inline sal_uInt32 writeUINT32(sal_uInt8* buffer, sal_uInt32 v) 
 {
     buffer[0] = (sal_uInt8)((v >> 24) & 0xFF);
     buffer[1] = (sal_uInt8)((v >> 16) & 0xFF);
@@ -188,19 +188,19 @@ inline sal_uInt32 writeUINT32(sal_uInt8* buffer, sal_uInt32 v)
     return sizeof(sal_uInt32);
 }
 
-inline sal_uInt32 readUINT32(const sal_uInt8* buffer, sal_uInt32& v)
+inline sal_uInt32 readUINT32(const sal_uInt8* buffer, sal_uInt32& v) 
 {
     v = (
-            (buffer[0] << 24) |
-            (buffer[1] << 16) |
-            (buffer[2] << 8)  |
+            (buffer[0] << 24) | 
+            (buffer[1] << 16) | 
+            (buffer[2] << 8)  | 
             (buffer[3] << 0)
         );
 
     return sizeof(sal_uInt32);
 }
 
-inline sal_uInt32 writeINT64(sal_uInt8* buffer, sal_Int64 v)
+inline sal_uInt32 writeINT64(sal_uInt8* buffer, sal_Int64 v) 
 {
     buffer[0] = (sal_uInt8)((v >> 56) & 0xFF);
     buffer[1] = (sal_uInt8)((v >> 48) & 0xFF);
@@ -214,23 +214,23 @@ inline sal_uInt32 writeINT64(sal_uInt8* buffer, sal_Int64 v)
     return sizeof(sal_Int64);
 }
 
-inline sal_uInt32 readINT64(const sal_uInt8* buffer, sal_Int64& v)
+inline sal_uInt32 readINT64(const sal_uInt8* buffer, sal_Int64& v) 
 {
     v = (
-            ((sal_Int64)buffer[0] << 56) |
-            ((sal_Int64)buffer[1] << 48) |
-            ((sal_Int64)buffer[2] << 40) |
+            ((sal_Int64)buffer[0] << 56) | 
+            ((sal_Int64)buffer[1] << 48) | 
+            ((sal_Int64)buffer[2] << 40) | 
             ((sal_Int64)buffer[3] << 32) |
-            ((sal_Int64)buffer[4] << 24) |
-            ((sal_Int64)buffer[5] << 16) |
-            ((sal_Int64)buffer[6] << 8)  |
+            ((sal_Int64)buffer[4] << 24) | 
+            ((sal_Int64)buffer[5] << 16) | 
+            ((sal_Int64)buffer[6] << 8)  | 
             ((sal_Int64)buffer[7] << 0)
         );
 
     return sizeof(sal_Int64);
 }
 
-inline sal_uInt32 writeUINT64(sal_uInt8* buffer, sal_uInt64 v)
+inline sal_uInt32 writeUINT64(sal_uInt8* buffer, sal_uInt64 v) 
 {
     buffer[0] = (sal_uInt8)((v >> 56) & 0xFF);
     buffer[1] = (sal_uInt8)((v >> 48) & 0xFF);
@@ -244,23 +244,23 @@ inline sal_uInt32 writeUINT64(sal_uInt8* buffer, sal_uInt64 v)
     return sizeof(sal_uInt64);
 }
 
-inline sal_uInt32 readUINT64(const sal_uInt8* buffer, sal_uInt64& v)
+inline sal_uInt32 readUINT64(const sal_uInt8* buffer, sal_uInt64& v) 
 {
     v = (
-            ((sal_uInt64)buffer[0] << 56) |
-            ((sal_uInt64)buffer[1] << 48) |
-            ((sal_uInt64)buffer[2] << 40) |
+            ((sal_uInt64)buffer[0] << 56) | 
+            ((sal_uInt64)buffer[1] << 48) | 
+            ((sal_uInt64)buffer[2] << 40) | 
             ((sal_uInt64)buffer[3] << 32) |
-            ((sal_uInt64)buffer[4] << 24) |
-            ((sal_uInt64)buffer[5] << 16) |
-            ((sal_uInt64)buffer[6] << 8)  |
+            ((sal_uInt64)buffer[4] << 24) | 
+            ((sal_uInt64)buffer[5] << 16) | 
+            ((sal_uInt64)buffer[6] << 8)  | 
             ((sal_uInt64)buffer[7] << 0)
         );
 
     return sizeof(sal_uInt64);
 }
 
-inline sal_uInt32 writeUtf8(sal_uInt8* buffer, const sal_Char* v)
+inline sal_uInt32 writeUtf8(sal_uInt8* buffer, const sal_Char* v) 
 {
     sal_uInt32 size = strlen(v) + 1;
 
@@ -269,14 +269,14 @@ inline sal_uInt32 writeUtf8(sal_uInt8* buffer, const sal_Char* v)
     return (size);
 }
 
-inline sal_uInt32 readUtf8(const sal_uInt8* buffer, sal_Char* v, sal_uInt32 maxSize)
+inline sal_uInt32 readUtf8(const sal_uInt8* buffer, sal_Char* v, sal_uInt32 maxSize) 
 {
     sal_uInt32 size = SAL_MIN(strlen((const sal_Char*) buffer) + 1, maxSize);
 
     memcpy(v, buffer, size);
 
     if (size == maxSize) v[size - 1] = '\0';
-
+        
     return (size);
 }
 
@@ -287,7 +287,7 @@ sal_uInt32 writeString(sal_uInt8* buffer, const sal_Unicode* v);
 sal_uInt32 readString(const sal_uInt8* buffer, sal_Unicode* v, sal_uInt32 maxSize);
 
 sal_uInt32 UINT16StringLen(const sal_uInt8* wstring);
-
+    
 #endif
 
 
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index cc098171c183..2c5363212995 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -263,20 +263,20 @@ public:
 
     CPInfoTag       readTag(sal_uInt16 index);
 
-    const sal_Char*     readUTF8NameConstant(sal_uInt16 index);
-    sal_Bool            readBOOLConstant(sal_uInt16 index);
-    sal_uInt8           readBYTEConstant(sal_uInt16 index);
-    sal_Int16           readINT16Constant(sal_uInt16 index);
-    sal_uInt16          readUINT16Constant(sal_uInt16 index);
-    sal_Int32           readINT32Constant(sal_uInt16 index);
-    sal_uInt32          readUINT32Constant(sal_uInt16 index);
-    sal_Int64           readINT64Constant(sal_uInt16 index);
-    sal_uInt64          readUINT64Constant(sal_uInt16 index);
-    float               readFloatConstant(sal_uInt16 index);
-    double              readDoubleConstant(sal_uInt16 index);
+    const sal_Char* 	readUTF8NameConstant(sal_uInt16 index);
+    sal_Bool        	readBOOLConstant(sal_uInt16 index);
+    sal_uInt8       	readBYTEConstant(sal_uInt16 index);
+    sal_Int16       	readINT16Constant(sal_uInt16 index);
+    sal_uInt16      	readUINT16Constant(sal_uInt16 index);
+    sal_Int32       	readINT32Constant(sal_uInt16 index);
+    sal_uInt32      	readUINT32Constant(sal_uInt16 index);
+    sal_Int64       	readINT64Constant(sal_uInt16 index);
+    sal_uInt64      	readUINT64Constant(sal_uInt16 index);
+    float           	readFloatConstant(sal_uInt16 index);
+    double          	readDoubleConstant(sal_uInt16 index);
     const sal_Unicode*  readStringConstant(sal_uInt16 index);
         // throws std::bad_alloc
-    void                readUIK(sal_uInt16 index, RTUik* uik);
+    void            	readUIK(sal_uInt16 index, RTUik* uik);
 };
 
 ConstantPool::~ConstantPool()
@@ -759,10 +759,10 @@ class ReferenceList : public BlopObject
 {
 public:
 
-    sal_uInt16      m_numOfEntries;
-    sal_uInt16      m_numOfReferenceEntries;
-    sal_uInt16      m_REFERENCE_ENTRY_SIZE;
-    ConstantPool*   m_pCP;
+    sal_uInt16		m_numOfEntries;
+    sal_uInt16		m_numOfReferenceEntries;
+    sal_uInt16		m_REFERENCE_ENTRY_SIZE;
+    ConstantPool*	m_pCP;
 
     ReferenceList(const sal_uInt8* buffer, sal_uInt16 numEntries, ConstantPool* pCP)
         : BlopObject(buffer, 0, sal_False)
@@ -785,7 +785,7 @@ public:
     const sal_Char* getReferenceName(sal_uInt16 index);
     RTReferenceType getReferenceType(sal_uInt16 index);
     const sal_Char* getReferenceDoku(sal_uInt16 index);
-    RTFieldAccess   getReferenceAccess(sal_uInt16 index);
+    RTFieldAccess 	getReferenceAccess(sal_uInt16 index);
 };
 
 sal_uInt32 ReferenceList::parseIndex()
@@ -851,12 +851,12 @@ class MethodList : public BlopObject
 {
 public:
 
-    sal_uInt16      m_numOfEntries;
-    sal_uInt16      m_numOfMethodEntries;
-    sal_uInt16      m_numOfParamEntries;
-    sal_uInt16      m_PARAM_ENTRY_SIZE;
-    sal_uInt32*     m_pIndex;
-    ConstantPool*   m_pCP;
+    sal_uInt16		m_numOfEntries;
+    sal_uInt16		m_numOfMethodEntries;
+    sal_uInt16		m_numOfParamEntries;
+    sal_uInt16		m_PARAM_ENTRY_SIZE;
+    sal_uInt32*		m_pIndex;
+    ConstantPool*	m_pCP;
 
     MethodList(const sal_uInt8* buffer, sal_uInt16 numEntries, ConstantPool* pCP)
         : BlopObject(buffer, 0, sal_False)
@@ -903,8 +903,8 @@ MethodList::~MethodList()
 
 sal_uInt16 MethodList::calcMethodParamIndex( const sal_uInt16 index )
 {
-    return (METHOD_OFFSET_PARAM_COUNT + sizeof(sal_uInt16) + (index * m_PARAM_ENTRY_SIZE));
-}
+    return (METHOD_OFFSET_PARAM_COUNT + sizeof(sal_uInt16) + (index * m_PARAM_ENTRY_SIZE));	
+}	
 
 sal_uInt32 MethodList::parseIndex()
 {
@@ -960,8 +960,8 @@ const sal_Char* MethodList::getMethodParamType(sal_uInt16 index, sal_uInt16 para
 {
     const sal_Char* aName = NULL;
 
-    if ((m_numOfEntries > 0) &&
-        (index <= m_numOfEntries) &&
+    if ((m_numOfEntries > 0) && 
+        (index <= m_numOfEntries) && 
         (paramIndex <= readUINT16(m_pIndex[index] + METHOD_OFFSET_PARAM_COUNT)))
     {
         aName = m_pCP->readUTF8NameConstant(
@@ -979,7 +979,7 @@ const sal_Char* MethodList::getMethodParamName(sal_uInt16 index, sal_uInt16 para
     const sal_Char* aName = NULL;
 
     if ((m_numOfEntries > 0) &&
-        (index <= m_numOfEntries) &&
+        (index <= m_numOfEntries) && 
         (paramIndex <= readUINT16(m_pIndex[index] + METHOD_OFFSET_PARAM_COUNT)))
     {
         aName = m_pCP->readUTF8NameConstant(
@@ -997,7 +997,7 @@ RTParamMode MethodList::getMethodParamMode(sal_uInt16 index, sal_uInt16 paramInd
     RTParamMode aMode = RT_PARAM_INVALID;
 
     if ((m_numOfEntries > 0) &&
-        (index <= m_numOfEntries) &&
+        (index <= m_numOfEntries) && 
         (paramIndex <= readUINT16(m_pIndex[index] + METHOD_OFFSET_PARAM_COUNT)))
     {
         aMode = (RTParamMode) readUINT16(
@@ -1091,8 +1091,8 @@ public:
     MethodList*     m_pMethods;
     ReferenceList*  m_pReferences;
     sal_uInt32      m_refCount;
-    sal_uInt16      m_nSuperTypes;
-    sal_uInt16      m_offset_SUPERTYPES;
+    sal_uInt16		m_nSuperTypes;
+    sal_uInt16		m_offset_SUPERTYPES;
 
     TypeRegistryEntry(
         const sal_uInt8* buffer, sal_uInt32 len, sal_Bool copyBuffer);
@@ -1114,7 +1114,7 @@ TypeRegistryEntry::TypeRegistryEntry(
     sal_uInt16 offset_N_SUPERTYPES = OFFSET_N_ENTRIES + entrySize + (nHeaderEntries * entrySize);
     m_offset_SUPERTYPES = offset_N_SUPERTYPES + entrySize;
     m_nSuperTypes = readUINT16(offset_N_SUPERTYPES);
-
+    
     sal_uInt16 offset_CP_SIZE = m_offset_SUPERTYPES + (m_nSuperTypes * entrySize);
     sal_uInt16 offset_CP = offset_CP_SIZE + entrySize;
 
@@ -1279,13 +1279,13 @@ static void TYPEREG_CALLTYPE getSuperTypeName(TypeReaderImpl hEntry, rtl_uString
 {
     TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry;
 
-    if (pEntry == NULL)
+    if (pEntry == NULL)	
     {
         rtl_uString_new(pSuperTypeName);
         return;
     }
 
-    if (pEntry->m_nSuperTypes == 0)
+    if (pEntry->m_nSuperTypes == 0)	
     {
         rtl_uString_new(pSuperTypeName);
         return;
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index c6e3d88328af..ebb792f5e306 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -66,7 +66,7 @@ ORealDynamicLoader* ODynamicLoader<RegistryTypeWriter_Api>::m_pLoader = NULL;
 #define BLOP_OFFSET_SIZE        (BLOP_OFFSET_MAGIC + sizeof(sal_uInt32))
 #define BLOP_OFFSET_MINOR       (BLOP_OFFSET_SIZE + sizeof(sal_uInt32))
 #define BLOP_OFFSET_MAJOR       (BLOP_OFFSET_MINOR + sizeof(sal_uInt16))
-#define BLOP_OFFSET_N_ENTRIES   (BLOP_OFFSET_MAJOR + sizeof(sal_uInt16))
+#define BLOP_OFFSET_N_ENTRIES	(BLOP_OFFSET_MAJOR + sizeof(sal_uInt16))
 #define BLOP_OFFSET_TYPE_SOURCE (BLOP_OFFSET_N_ENTRIES + sizeof(sal_uInt16))
 #define BLOP_OFFSET_TYPE_CLASS  (BLOP_OFFSET_TYPE_SOURCE + sizeof(sal_uInt16))
 #define BLOP_OFFSET_THIS        (BLOP_OFFSET_TYPE_CLASS + sizeof(sal_uInt16))
@@ -75,16 +75,16 @@ ORealDynamicLoader* ODynamicLoader<RegistryTypeWriter_Api>::m_pLoader = NULL;
 #define BLOP_OFFSET_FILENAME    (BLOP_OFFSET_DOKU + sizeof(sal_uInt16))
 #define BLOP_HEADER_N_ENTRIES   6
 
-#define BLOP_OFFSET_N_SUPERTYPES    0
-#define BLOP_OFFSET_SUPERTYPES      (BLOP_OFFSET_N_SUPERTYPES + sizeof(sal_uInt16))
+#define BLOP_OFFSET_N_SUPERTYPES 	0
+#define BLOP_OFFSET_SUPERTYPES 		(BLOP_OFFSET_N_SUPERTYPES + sizeof(sal_uInt16))
 
-#define BLOP_FIELD_ENTRY_ACCESS     0
+#define BLOP_FIELD_ENTRY_ACCESS 	0
 #define BLOP_FIELD_ENTRY_NAME       (BLOP_FIELD_ENTRY_ACCESS + sizeof(sal_uInt16))
 #define BLOP_FIELD_ENTRY_TYPE       (BLOP_FIELD_ENTRY_NAME + sizeof(sal_uInt16))
 #define BLOP_FIELD_ENTRY_VALUE      (BLOP_FIELD_ENTRY_TYPE + sizeof(sal_uInt16))
 #define BLOP_FIELD_ENTRY_DOKU       (BLOP_FIELD_ENTRY_VALUE + sizeof(sal_uInt16))
 #define BLOP_FIELD_ENTRY_FILENAME   (BLOP_FIELD_ENTRY_DOKU + sizeof(sal_uInt16))
-#define BLOP_FIELD_N_ENTRIES        6
+#define BLOP_FIELD_N_ENTRIES   		6
 
 #define BLOP_METHOD_SIZE        0
 #define BLOP_METHOD_MODE        (BLOP_METHOD_SIZE + sizeof(sal_uInt16))
@@ -101,7 +101,7 @@ ORealDynamicLoader* ODynamicLoader<RegistryTypeWriter_Api>::m_pLoader = NULL;
 #define BLOP_REFERENCE_TYPE         0
 #define BLOP_REFERENCE_NAME         (BLOP_REFERENCE_TYPE + sizeof(sal_uInt16))
 #define BLOP_REFERENCE_DOKU         (BLOP_REFERENCE_NAME + sizeof(sal_uInt16))
-#define BLOP_REFERENCE_ACCESS       (BLOP_REFERENCE_DOKU + sizeof(sal_uInt16))
+#define BLOP_REFERENCE_ACCESS   	(BLOP_REFERENCE_DOKU + sizeof(sal_uInt16))
 #define BLOP_REFERENCE_N_ENTRIES    4
 
 sal_uInt32 UINT16StringLen(const sal_uInt8* wstring)
@@ -216,12 +216,12 @@ struct CPInfo
     union
     {
         const sal_Char*     aUtf8;
-        RTUik*              aUik;
+        RTUik*          	aUik;
         RTConstValueUnion   aConst;
     } m_value;
 
-    sal_uInt16      m_index;
-    struct CPInfo*  m_next;
+    sal_uInt16		m_index;
+    struct CPInfo*	m_next;
 
     CPInfo(CPInfoTag tag, struct CPInfo* prev);
 
@@ -462,7 +462,7 @@ class ParamEntry
 {
 public:
 
-    OString     m_typeName;
+    OString    	m_typeName;
     OString     m_name;
     RTParamMode m_mode;
 
@@ -470,7 +470,7 @@ public:
     ~ParamEntry();
 
     void setData(const OString& typeName,
-                 const OString& name,
+                 const OString&	name,
                  RTParamMode    mode);
 };
 
@@ -484,8 +484,8 @@ ParamEntry::~ParamEntry()
 }
 
 void ParamEntry::setData(const OString& typeName,
-                         const OString& name,
-                         RTParamMode    mode)
+                         const OString&	name,
+                         RTParamMode   	mode)
 {
     m_name = name;
     m_typeName = typeName;
@@ -502,18 +502,18 @@ class ReferenceEntry
 {
 public:
 
-    OString         m_name;
-    OString         m_doku;
+    OString     	m_name;
+    OString			m_doku;
     RTReferenceType m_type;
     RTFieldAccess   m_access;
 
     ReferenceEntry();
     ~ReferenceEntry();
 
-    void setData(const OString&     name,
+    void setData(const OString&		name,
                  RTReferenceType    refType,
-                 const OString&     doku,
-                 RTFieldAccess      access);
+                 const OString&   	doku,
+                 RTFieldAccess     	access);
 };
 
 ReferenceEntry::ReferenceEntry()
@@ -547,14 +547,14 @@ class MethodEntry
 {
 public:
 
-    OString         m_name;
-    OString         m_returnTypeName;
+    OString       	m_name;
+    OString       	m_returnTypeName;
     RTMethodMode    m_mode;
     sal_uInt16      m_paramCount;
-    ParamEntry*     m_params;
-    sal_uInt16      m_excCount;
-    OString*        m_excNames;
-    OString         m_doku;
+    ParamEntry* 	m_params;
+    sal_uInt16    	m_excCount;
+    OString*      	m_excNames;
+    OString      	m_doku;
 
     MethodEntry();
     ~MethodEntry();
@@ -592,12 +592,12 @@ MethodEntry::~MethodEntry()
         delete[] m_excNames;
 }
 
-void MethodEntry::setData(const OString&    name,
-                          const OString&    returnTypeName,
-                          RTMethodMode      mode,
+void MethodEntry::setData(const OString&   	name,
+                          const OString&   	returnTypeName,
+                          RTMethodMode  	mode,
                           sal_uInt16        paramCount,
                           sal_uInt16        excCount,
-                          const OString&    doku)
+                          const OString&   	doku)
 {
     m_name = name;
     m_returnTypeName = returnTypeName;
@@ -679,12 +679,12 @@ public:
     sal_uInt32          m_refCount;
     typereg_Version     m_version;
     RTTypeClass         m_typeClass;
-    OString             m_typeName;
-    sal_uInt16          m_nSuperTypes;
+    OString		        m_typeName;
+    sal_uInt16			m_nSuperTypes;
     OString*            m_superTypeNames;
     RTUik*              m_pUik;
-    OString             m_doku;
-    OString             m_fileName;
+    OString		        m_doku;
+    OString		        m_fileName;
     sal_uInt16          m_fieldCount;
     FieldEntry*         m_fields;
     sal_uInt16          m_methodCount;
@@ -698,13 +698,13 @@ public:
     TypeWriter(typereg_Version version,
                rtl::OString const & documentation,
                rtl::OString const & fileName,
-               RTTypeClass      RTTypeClass,
+               RTTypeClass  	RTTypeClass,
                bool             published,
-               const OString&   typeName,
+               const OString& 	typeName,
                sal_uInt16       superTypeCount,
-               sal_uInt16       FieldCount,
-               sal_uInt16       methodCount,
-               sal_uInt16       referenceCount);
+               sal_uInt16  		FieldCount,
+               sal_uInt16   	methodCount,
+               sal_uInt16   	referenceCount);
 
     ~TypeWriter();
 
@@ -716,13 +716,13 @@ public:
 TypeWriter::TypeWriter(typereg_Version version,
                        rtl::OString const & documentation,
                        rtl::OString const & fileName,
-                       RTTypeClass      RTTypeClass,
+                       RTTypeClass  	RTTypeClass,
                        bool             published,
-                       const OString&   typeName,
+                       const OString& 	typeName,
                        sal_uInt16       superTypeCount,
-                       sal_uInt16       fieldCount,
-                       sal_uInt16       methodCount,
-                       sal_uInt16       referenceCount)
+                       sal_uInt16   	fieldCount,
+                       sal_uInt16   	methodCount,
+                       sal_uInt16   	referenceCount)
     : m_refCount(1)
     , m_version(version)
     , m_typeClass(
@@ -948,11 +948,11 @@ void TypeWriter::createBlop()
         for (sal_uInt16 i = 0; i < m_methodCount; i++)
         {
             pMethodEntrySize[i] = (sal_uInt16)
-                ( blopMethodEntrySize +                                 // header
-                  sizeof(sal_uInt16) +                                  // parameterCount
-                  (m_methods[i].m_paramCount * blopParamEntrySize) +    // exceptions
-                  sizeof(sal_uInt16) +                                  // exceptionCount
-                  (m_methods[i].m_excCount * sizeof(sal_uInt16)) );     // exceptions
+                ( blopMethodEntrySize +                   				// header
+                  sizeof(sal_uInt16) +                                 	// parameterCount
+                  (m_methods[i].m_paramCount * blopParamEntrySize) + 	// exceptions
+                  sizeof(sal_uInt16) +                                 	// exceptionCount
+                  (m_methods[i].m_excCount * sizeof(sal_uInt16)) );   	// exceptions
 
             blopMethodsSize += pMethodEntrySize[i];
         }
@@ -1056,7 +1056,7 @@ void TypeWriter::createBlop()
     {
         sal_uInt16 cpIndexName = 0;
         sal_uInt16 cpIndexDoku2 = 0;
-
+        
         // nReferenceEntries + n references
         blopReferenceSize = entrySize + (m_referenceCount * blopReferenceEntrySize);
 
@@ -1267,14 +1267,14 @@ sal_Bool typereg_writer_setFieldData(
 }
 
 static void TYPEREG_CALLTYPE setFieldData(TypeWriterImpl    hEntry,
-                                          sal_uInt16        index,
-                                          rtl_uString*      name,
-                                          rtl_uString*      typeName,
-                                          rtl_uString*      doku,
-                                          rtl_uString*      fileName,
-                                          RTFieldAccess     access,
+                                          sal_uInt16       	index,
+                                          rtl_uString*     	name,
+                                          rtl_uString*     	typeName,
+                                          rtl_uString*     	doku,
+                                          rtl_uString*     	fileName,
+                                          RTFieldAccess    	access,
                                           RTValueType       valueType,
-                                          RTConstValueUnion constValue)
+                                          RTConstValueUnion	constValue)
 {
     typereg_writer_setFieldData(
         hEntry, index, doku, fileName, access, name, typeName, valueType,
@@ -1300,12 +1300,12 @@ sal_Bool typereg_writer_setMethodData(
 
 static void TYPEREG_CALLTYPE setMethodData(TypeWriterImpl   hEntry,
                                            sal_uInt16       index,
-                                           rtl_uString*     name,
-                                           rtl_uString*     returnTypeName,
-                                           RTMethodMode     mode,
+                                           rtl_uString*  	name,
+                                           rtl_uString*  	returnTypeName,
+                                           RTMethodMode 	mode,
                                            sal_uInt16       paramCount,
                                            sal_uInt16       excCount,
-                                           rtl_uString*     doku)
+                                           rtl_uString*  	doku)
 {
     typereg_writer_setMethodData(
         hEntry, index, doku, mode, name, returnTypeName, paramCount, excCount);
@@ -1327,11 +1327,11 @@ sal_Bool typereg_writer_setMethodParameterData(
 }
 
 static void TYPEREG_CALLTYPE setParamData(TypeWriterImpl    hEntry,
-                                          sal_uInt16        index,
-                                          sal_uInt16        paramIndex,
-                                          rtl_uString*      type,
-                                          rtl_uString*      name,
-                                          RTParamMode       mode)
+                                          sal_uInt16       	index,
+                                          sal_uInt16  		paramIndex,
+                                          rtl_uString*     	type,
+                                          rtl_uString*     	name,
+                                          RTParamMode      	mode)
 {
     typereg_writer_setMethodParameterData(
         hEntry, index, paramIndex, mode, name, type);
@@ -1354,7 +1354,7 @@ sal_Bool typereg_writer_setMethodExceptionTypeName(
 static void TYPEREG_CALLTYPE setExcData(TypeWriterImpl  hEntry,
                                         sal_uInt16      index,
                                         sal_uInt16      excIndex,
-                                        rtl_uString*    type)
+                                        rtl_uString* 	type)
 {
     typereg_writer_setMethodExceptionTypeName(hEntry, index, excIndex, type);
 }
@@ -1404,10 +1404,10 @@ sal_Bool typereg_writer_setReferenceData(
 
 static void TYPEREG_CALLTYPE setReferenceData(TypeWriterImpl    hEntry,
                                               sal_uInt16        index,
-                                              rtl_uString*      name,
+                                              rtl_uString*   	name,
                                               RTReferenceType   refType,
-                                              rtl_uString*      doku,
-                                              RTFieldAccess     access)
+                                              rtl_uString*   	doku,
+                                              RTFieldAccess 	access)
 {
     typereg_writer_setReferenceData(hEntry, index, doku, refType, access, name);
 }
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index a3079c7fc123..2dcd4bc2d675 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 
 #include <memory>
 #include    <string.h>
-#include    <stdio.h>
+#include	<stdio.h>
 
 #if defined(UNX) || defined(OS2)
 #include    <unistd.h>
@@ -811,7 +811,7 @@ RegError ORegistry::eraseKey(ORegKey* pKey, const OUString& keyName)
     OUString     sFullKeyName(pKey->getName());
     OUString     sFullPath(sFullKeyName);
     OUString     sRelativKey;
-    sal_Int32    lastIndex = keyName.lastIndexOf('/');
+    sal_Int32	 lastIndex = keyName.lastIndexOf('/');
 
     if ( lastIndex >= 0 )
     {
@@ -1149,7 +1149,7 @@ RegError ORegistry::checkBlop(OStoreStream& rValue,
     RegValueType    valueType;
     sal_uInt32      valueSize;
     sal_uInt32      rwBytes;
-    OString         targetPath( OUStringToOString(sTargetPath, RTL_TEXTENCODING_UTF8) );
+    OString 		targetPath( OUStringToOString(sTargetPath, RTL_TEXTENCODING_UTF8) );
 
     if (!rValue.readAt(0, pBuffer, VALUE_HEADERSIZE, rwBytes) &&
         (rwBytes == VALUE_HEADERSIZE))
@@ -1699,8 +1699,8 @@ RegError ORegistry::dumpValue(const OUString& sPath, const OUString& sName, sal_
 //
 RegError ORegistry::dumpKey(const OUString& sPath, const OUString& sName, sal_Int16 nSpace) const
 {
-    OStoreDirectory     rStoreDir;
-    OUString            sFullPath(sPath);
+    OStoreDirectory 	rStoreDir;
+    OUString          	sFullPath(sPath);
     OString             sIndent;
     storeAccessMode     accessMode = KEY_MODE_OPEN;
     RegError            _ret = REG_NO_ERROR;
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index bbb4a5b2016d..1bd3abc5fa34 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,32 +32,32 @@
 #include <set>
 #include <hash_map>
 
-#include    <registry/registry.h>
-#include    <rtl/ustring.hxx>
-#include    <osl/mutex.hxx>
-#include    <store/store.hxx>
+#include 	<registry/registry.h>
+#include	<rtl/ustring.hxx>
+#include	<osl/mutex.hxx>
+#include	<store/store.hxx>
 
 #define REG_PAGESIZE 512
 
-#define REG_MODE_CREATE     store_AccessCreate
-#define REG_MODE_OPEN       store_AccessReadWrite
-#define REG_MODE_OPENREAD   store_AccessReadOnly
+#define	REG_MODE_CREATE		store_AccessCreate
+#define	REG_MODE_OPEN		store_AccessReadWrite 
+#define	REG_MODE_OPENREAD	store_AccessReadOnly 
 
-#define KEY_MODE_CREATE     store_AccessCreate
-#define KEY_MODE_OPEN       store_AccessReadWrite
-#define KEY_MODE_OPENREAD   store_AccessReadOnly
+#define	KEY_MODE_CREATE		store_AccessCreate
+#define	KEY_MODE_OPEN		store_AccessReadWrite 
+#define	KEY_MODE_OPENREAD	store_AccessReadOnly 
 
 
-#define VALUE_MODE_CREATE   store_AccessCreate
-#define VALUE_MODE_OPEN     store_AccessReadWrite
-#define VALUE_MODE_OPENREAD store_AccessReadOnly
+#define	VALUE_MODE_CREATE	store_AccessCreate
+#define	VALUE_MODE_OPEN		store_AccessReadWrite 
+#define	VALUE_MODE_OPENREAD	store_AccessReadOnly 
 
 // 5 Bytes = 1 (Byte fuer den Typ) + 4 (Bytes fuer die Groesse der Daten)
-#define VALUE_HEADERSIZE    5
-#define VALUE_TYPEOFFSET    1
-#define VALUE_HEADEROFFSET  5
+#define	VALUE_HEADERSIZE	5
+#define	VALUE_TYPEOFFSET	1
+#define	VALUE_HEADEROFFSET	5
 
-#define REG_CREATE      0x0004  // allow write accesses
+#define REG_CREATE  	0x0004  // allow write accesses
 
 #define REG_GUARD(mutex) \
     osl::Guard< osl::Mutex > aGuard( mutex );
@@ -73,110 +73,110 @@ class ORegistry
 public:
     ORegistry();
 
-    sal_uInt32  acquire()
+    sal_uInt32	acquire()
         { return ++m_refCount; }
 
-    sal_uInt32  release()
+    sal_uInt32	release()
         { return --m_refCount; }
 
-    RegError    initRegistry(const rtl::OUString& name,
+    RegError	initRegistry(const rtl::OUString& name, 
                              RegAccessMode accessMode);
 
-    RegError    closeRegistry();
+    RegError	closeRegistry();
 
-    RegError    destroyRegistry(const rtl::OUString& name);
+    RegError	destroyRegistry(const rtl::OUString& name);
 
-    RegError    acquireKey(RegKeyHandle hKey);
-    RegError    releaseKey(RegKeyHandle hKey);
+    RegError	acquireKey(RegKeyHandle hKey);
+    RegError	releaseKey(RegKeyHandle hKey);
 
-    RegError    createKey(RegKeyHandle hKey,
-                          const rtl::OUString& keyName,
+    RegError	createKey(RegKeyHandle hKey, 
+                          const rtl::OUString& keyName, 
                           RegKeyHandle* phNewKey);
 
-    RegError    openKey(RegKeyHandle hKey,
-                        const rtl::OUString& keyName,
+    RegError	openKey(RegKeyHandle hKey, 
+                        const rtl::OUString& keyName, 
                         RegKeyHandle* phOpenKey);
 
-    RegError    closeKey(RegKeyHandle hKey);
+    RegError	closeKey(RegKeyHandle hKey);
 
-    RegError    deleteKey(RegKeyHandle hKey, const rtl::OUString& keyName);
+    RegError	deleteKey(RegKeyHandle hKey, const rtl::OUString& keyName);
 
-    RegError    loadKey(RegKeyHandle hKey,
+    RegError	loadKey(RegKeyHandle hKey, 
                         const rtl::OUString& regFileName,
-                        sal_Bool bWarings=sal_False,
+                        sal_Bool bWarings=sal_False, 
                         sal_Bool bReport=sal_False);
 
-    RegError    saveKey(RegKeyHandle hKey,
+    RegError	saveKey(RegKeyHandle hKey, 
                         const rtl::OUString& regFileName,
-                        sal_Bool bWarings=sal_False,
+                        sal_Bool bWarings=sal_False, 
                         sal_Bool bReport=sal_False);
 
-    RegError    dumpRegistry(RegKeyHandle hKey) const;
+    RegError	dumpRegistry(RegKeyHandle hKey) const;
 
     ~ORegistry();
 
-    sal_Bool            isReadOnly() const
+    sal_Bool			isReadOnly() const
         { return m_readOnly; }
 
-    sal_Bool            isOpen() const
+    sal_Bool			isOpen() const
         { return m_isOpen; }
 
-    ORegKey*    getRootKey();
+    ORegKey* 	getRootKey();
 
     const store::OStoreFile& getStoreFile()
         { return m_file; }
 
-    const rtl::OUString&    getName() const
+    const rtl::OUString& 	getName() const
         { return m_name; }
 
-    friend class ORegKey;
+    friend class ORegKey;			
 
 private:
-    RegError    eraseKey(ORegKey* pKey, const rtl::OUString& keyName);
+    RegError	eraseKey(ORegKey* pKey, const rtl::OUString& keyName);
 
-    RegError    deleteSubkeysAndValues(ORegKey* pKey);
+    RegError	deleteSubkeysAndValues(ORegKey* pKey);
 
-    RegError    loadAndSaveValue(ORegKey* pTargetKey,
-                                 ORegKey* pSourceKey,
-                                 const rtl::OUString& valueName,
+    RegError	loadAndSaveValue(ORegKey* pTargetKey, 
+                                 ORegKey* pSourceKey, 
+                                 const rtl::OUString& valueName, 
                                  sal_uInt32 nCut,
                                  sal_Bool bWarnings=sal_False,
                                  sal_Bool bReport=sal_False);
 
-    RegError    checkBlop(store::OStoreStream& rValue,
+    RegError	checkBlop(store::OStoreStream& rValue,
                           const rtl::OUString& sTargetPath,
-                          sal_uInt32 srcValueSize,
+                          sal_uInt32 srcValueSize, 
                           sal_uInt8* pSrcBuffer,
                           sal_Bool bReport=sal_False);
 
-    RegError    mergeModuleValue(store::OStoreStream& rTargetValue,
-                                 RegistryTypeReader& reader,
+    RegError	mergeModuleValue(store::OStoreStream& rTargetValue,
+                                 RegistryTypeReader& reader, 
                                  RegistryTypeReader& reader2);
-
-    RegError    loadAndSaveKeys(ORegKey* pTargetKey,
-                                ORegKey* pSourceKey,
-                                const rtl::OUString& keyName,
+    
+    RegError	loadAndSaveKeys(ORegKey* pTargetKey, 
+                                ORegKey* pSourceKey, 
+                                const rtl::OUString& keyName, 
                                 sal_uInt32 nCut,
                                 sal_Bool bWarnings=sal_False,
                                 sal_Bool bReport=sal_False);
 
-    RegError    dumpValue(const rtl::OUString& sPath,
-                          const rtl::OUString& sName,
-                          sal_Int16 nSpace) const;
+    RegError	dumpValue(const rtl::OUString& sPath, 
+                          const rtl::OUString& sName, 
+                          sal_Int16 nSpace) const;			
 
-    RegError    dumpKey(const rtl::OUString& sPath,
-                        const rtl::OUString& sName,
+    RegError	dumpKey(const rtl::OUString& sPath, 
+                        const rtl::OUString& sName, 
                         sal_Int16 nSpace) const;
 
-    typedef std::hash_map< rtl::OUString, ORegKey*, rtl::OUStringHash > KeyMap;
+    typedef	std::hash_map< rtl::OUString, ORegKey*, rtl::OUStringHash > KeyMap;
 
-    sal_uInt32      m_refCount;
-    osl::Mutex          m_mutex;
-    sal_Bool        m_readOnly;
-    sal_Bool        m_isOpen;
-    rtl::OUString       m_name;
-    store::OStoreFile   m_file;
-    KeyMap          m_openKeyTable;
+    sal_uInt32 		m_refCount;
+    osl::Mutex	    	m_mutex;
+    sal_Bool   		m_readOnly;
+    sal_Bool   		m_isOpen;
+    rtl::OUString   	m_name;
+    store::OStoreFile 	m_file;
+    KeyMap	   		m_openKeyTable;
 
     const rtl::OUString ROOT;
 };
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx
index ecb1a44ec069..7e2c09badba3 100644
--- a/registry/source/registry.cxx
+++ b/registry/source/registry.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@ ORealDynamicLoader* ODynamicLoader<Registry_Api>::m_pLoader = NULL;
 extern "C" {
 
 //*********************************************************************
-//  acquire
+//	acquire
 //
 static void REGISTRY_CALLTYPE acquire(RegHandle hReg)
 {
@@ -66,7 +66,7 @@ static void REGISTRY_CALLTYPE acquire(RegHandle hReg)
 
 
 //*********************************************************************
-//  release
+//	release
 //
 static void REGISTRY_CALLTYPE release(RegHandle hReg)
 {
@@ -84,11 +84,11 @@ static void REGISTRY_CALLTYPE release(RegHandle hReg)
 
 
 //*********************************************************************
-//  getName
+//	getName
 //
 static RegError REGISTRY_CALLTYPE getName(RegHandle hReg, rtl_uString** pName)
 {
-    ORegistry*  pReg;
+    ORegistry* 	pReg;
 
     if (hReg)
     {
@@ -110,7 +110,7 @@ static RegError REGISTRY_CALLTYPE getName(RegHandle hReg, rtl_uString** pName)
 
 
 //*********************************************************************
-//  isReadOnly
+//	isReadOnly
 //
 static sal_Bool REGISTRY_CALLTYPE isReadOnly(RegHandle hReg)
 {
@@ -122,9 +122,9 @@ static sal_Bool REGISTRY_CALLTYPE isReadOnly(RegHandle hReg)
 
 
 //*********************************************************************
-//  createRegistry
+//	createRegistry
 //
-static RegError REGISTRY_CALLTYPE createRegistry(rtl_uString* registryName,
+static RegError REGISTRY_CALLTYPE createRegistry(rtl_uString* registryName, 
                                                  RegHandle* phRegistry)
 {
     RegError ret;
@@ -134,21 +134,21 @@ static RegError REGISTRY_CALLTYPE createRegistry(rtl_uString* registryName,
     {
         *phRegistry = NULL;
         return ret;
-    }
-
+    }	
+        
     *phRegistry = pReg;
-
+        
     return REG_NO_ERROR;
-}
+}	
 
 //*********************************************************************
-//  openRootKey
+//	openRootKey
 //
-static RegError REGISTRY_CALLTYPE openRootKey(RegHandle hReg,
+static RegError REGISTRY_CALLTYPE openRootKey(RegHandle hReg, 
                                               RegKeyHandle* phRootKey)
 {
     ORegistry* pReg;
-
+    
     if (hReg)
     {
         pReg = (ORegistry*)hReg;
@@ -159,18 +159,18 @@ static RegError REGISTRY_CALLTYPE openRootKey(RegHandle hReg,
         phRootKey = NULL;
         return REG_INVALID_REGISTRY;
     }
-
+    
     *phRootKey = pReg->getRootKey();
-
-    return REG_NO_ERROR;
-}
+    
+    return REG_NO_ERROR;	
+}	
 
 
 //*********************************************************************
-//  openRegistry
+//	openRegistry
 //
-static RegError REGISTRY_CALLTYPE openRegistry(rtl_uString* registryName,
-                                               RegHandle* phRegistry,
+static RegError REGISTRY_CALLTYPE openRegistry(rtl_uString* registryName, 
+                                               RegHandle* phRegistry, 
                                                RegAccessMode accessMode)
 {
     RegError _ret;
@@ -181,27 +181,27 @@ static RegError REGISTRY_CALLTYPE openRegistry(rtl_uString* registryName,
         *phRegistry = NULL;
         delete pReg;
         return _ret;
-    }
-
+    }	
 
+        
     *phRegistry = pReg;
 
     return REG_NO_ERROR;
-}
+}	
 
 //*********************************************************************
-//  closeRegistry
+//	closeRegistry
 //
 static RegError REGISTRY_CALLTYPE closeRegistry(RegHandle hReg)
 {
-    ORegistry   *pReg;
-
+    ORegistry	*pReg;
+    
     if (hReg)
     {
         pReg = (ORegistry*)hReg;
         if (!pReg->isOpen())
             return REG_REGISTRY_NOT_OPEN;
-
+        
         RegError ret = REG_NO_ERROR;
         if (pReg->release() == 0)
         {
@@ -216,23 +216,23 @@ static RegError REGISTRY_CALLTYPE closeRegistry(RegHandle hReg)
     {
         return REG_INVALID_REGISTRY;
     }
-}
+}	
 
 
 //*********************************************************************
-//  destroyRegistry
+//	destroyRegistry
 //
 static RegError REGISTRY_CALLTYPE destroyRegistry(RegHandle hReg,
                                                   rtl_uString* registryName)
 {
-    ORegistry   *pReg;
-
+    ORegistry	*pReg;
+    
     if (hReg)
     {
         pReg = (ORegistry*)hReg;
         if (!pReg->isOpen())
             return REG_INVALID_REGISTRY;
-
+        
         RegError ret = pReg->destroyRegistry(registryName);
         if (!ret)
         {
@@ -247,18 +247,18 @@ static RegError REGISTRY_CALLTYPE destroyRegistry(RegHandle hReg,
     {
         return REG_INVALID_REGISTRY;
     }
-}
+}	
 
 
 //*********************************************************************
-//  loadRegKey
+//	loadRegKey
 //
 static RegError REGISTRY_CALLTYPE loadKey(RegHandle hReg,
-                                              RegKeyHandle hKey,
-                                           rtl_uString* keyName,
+                                              RegKeyHandle hKey, 
+                                           rtl_uString* keyName, 
                                            rtl_uString* regFileName)
 {
-
+    
     ORegistry* pReg = static_cast< ORegistry* >(hReg);
     if (!pReg)
         return REG_INVALID_REGISTRY;
@@ -302,14 +302,14 @@ static RegError REGISTRY_CALLTYPE loadKey(RegHandle hReg,
 }
 
 //*********************************************************************
-//  saveKey
+//	saveKey
 //
 static RegError REGISTRY_CALLTYPE saveKey(RegHandle hReg,
-                                              RegKeyHandle hKey,
-                                           rtl_uString* keyName,
+                                              RegKeyHandle hKey, 
+                                           rtl_uString* keyName, 
                                            rtl_uString* regFileName)
 {
-
+    
     ORegistry* pReg = static_cast< ORegistry* >(hReg);
     if (!pReg)
         return REG_INVALID_REGISTRY;
@@ -339,14 +339,14 @@ static RegError REGISTRY_CALLTYPE saveKey(RegHandle hReg,
     }
 
     return pKey->releaseKey(pNewKey);
-}
+}	
 
 //*********************************************************************
-//  mergeKey
+//	mergeKey
 //
 static RegError REGISTRY_CALLTYPE mergeKey(RegHandle hReg,
-                                              RegKeyHandle hKey,
-                                           rtl_uString* keyName,
+                                              RegKeyHandle hKey, 
+                                           rtl_uString* keyName, 
                                            rtl_uString* regFileName,
                                            sal_Bool bWarnings,
                                            sal_Bool bReport)
@@ -388,10 +388,10 @@ static RegError REGISTRY_CALLTYPE mergeKey(RegHandle hReg,
     }
 
     return pReg->loadKey(pKey, regFileName, bWarnings, bReport);
-}
+}	
 
 //*********************************************************************
-//  dumpRegistry
+//	dumpRegistry
 //
 static RegError REGISTRY_CALLTYPE dumpRegistry(RegHandle hReg,
                                                RegKeyHandle hKey)
@@ -411,10 +411,10 @@ static RegError REGISTRY_CALLTYPE dumpRegistry(RegHandle hReg,
         return REG_INVALID_KEY;
 
     return pReg->dumpRegistry(hKey);
-}
+}	
 
 //*********************************************************************
-//  initRegistry_Api
+//	initRegistry_Api
 //
 Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(void)
 {
@@ -465,62 +465,62 @@ Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(void)
 }
 
 //*********************************************************************
-//  reg_loadRegKey
+//	reg_loadRegKey
 //
-RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey,
-                                       rtl_uString* keyName,
+RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey, 
+                                       rtl_uString* keyName, 
                                        rtl_uString* regFileName)
 {
     ORegKey *pKey;
-
+    
     if (hKey)
         pKey = (ORegKey*)hKey;
     else
         return REG_INVALID_KEY;
 
     return loadKey(pKey->getRegistry(), hKey, keyName, regFileName);
-}
+}	
 
 //*********************************************************************
-//  reg_saveKey
+//	reg_saveKey
 //
-RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey,
-                                       rtl_uString* keyName,
+RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey, 
+                                       rtl_uString* keyName, 
                                        rtl_uString* regFileName)
 {
     ORegKey *pKey;
-
+    
     if (hKey)
         pKey = (ORegKey*)hKey;
     else
         return REG_INVALID_KEY;
 
     return saveKey(pKey->getRegistry(), hKey, keyName, regFileName);
-}
+}	
 
 //*********************************************************************
-//  reg_mergeKey
+//	reg_mergeKey
 //
-RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey,
-                                        rtl_uString* keyName,
+RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey, 
+                                        rtl_uString* keyName, 
                                         rtl_uString* regFileName,
                                         sal_Bool bWarnings,
                                         sal_Bool bReport)
 {
     ORegKey *pKey;
-
+    
     if (hKey)
         pKey = (ORegKey*)hKey;
     else
         return REG_INVALID_KEY;
 
     return mergeKey(pKey->getRegistry(), hKey, keyName, regFileName, bWarnings, bReport);
-}
+}	
 
 //*********************************************************************
-//  reg_createRegistry
+//	reg_createRegistry
 //
-RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName,
+RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName, 
                                               RegHandle* phRegistry)
 {
     RegError ret;
@@ -530,34 +530,34 @@ RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName,
     {
         *phRegistry = NULL;
         return ret;
-    }
-
+    }	
+        
     *phRegistry = pReg;
-
+        
     return REG_NO_ERROR;
-}
+}	
 
 //*********************************************************************
-//  reg_openRootKey
+//	reg_openRootKey
 //
-RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry,
+RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry, 
                                           RegKeyHandle* phRootKey)
 {
     return openRootKey(hRegistry, phRootKey);
-}
+}	
 
 
 //*********************************************************************
-//  reg_getName
+//	reg_getName
 //
 RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName)
 {
     return getName(hRegistry, pName);
 }
 
-
+    
 //*********************************************************************
-//  reg_isReadOnly
+//	reg_isReadOnly
 //
 sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hRegistry)
 {
@@ -566,10 +566,10 @@ sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hRegistry)
 
 
 //*********************************************************************
-//  reg_openRegistry
+//	reg_openRegistry
 //
-RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName,
-                                            RegHandle* phRegistry,
+RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName, 
+                                            RegHandle* phRegistry, 
                                             RegAccessMode accessMode)
 {
     RegError _ret;
@@ -579,20 +579,20 @@ RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName,
     {
         *phRegistry = NULL;
         return _ret;
-    }
-
+    }	
+        
     *phRegistry = pReg;
 
     return REG_NO_ERROR;
-}
+}	
 
 //*********************************************************************
-//  reg_closeRegistry
+//	reg_closeRegistry
 //
 RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry)
 {
     ORegistry* pReg;
-
+    
     if (hRegistry)
     {
         pReg = (ORegistry*)hRegistry;
@@ -602,33 +602,33 @@ RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry)
     {
         return REG_REGISTRY_NOT_OPEN;
     }
-}
+}	
 
 
 //*********************************************************************
-//  reg_destroyRegistry
+//	reg_destroyRegistry
 //
 RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry,
                                                rtl_uString* registryName)
 {
     return destroyRegistry(hRegistry, registryName);
-}
+}	
 
 
 //*********************************************************************
-//  reg_dumpRegistry
+//	reg_dumpRegistry
 //
 RegError REGISTRY_CALLTYPE reg_dumpRegistry(RegKeyHandle hKey)
 {
     ORegKey *pKey;
-
+    
     if (hKey)
         pKey = (ORegKey*)hKey;
     else
         return REG_INVALID_KEY;
 
     return dumpRegistry(pKey->getRegistry(), hKey);
-}
+}	
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx
index 6ea83afe6a54..d700793eb542 100644
--- a/registry/source/regkey.cxx
+++ b/registry/source/regkey.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,15 +31,15 @@
 
 #include "regkey.hxx"
 
-#include    <registry/registry.hxx>
-#include    <rtl/alloc.h>
-#include    "regimpl.hxx"
-#include    "keyimpl.hxx"
+#include	<registry/registry.hxx>
+#include	<rtl/alloc.h>
+#include	"regimpl.hxx"
+#include	"keyimpl.hxx"
 
 using rtl::OUString;
 
 //*********************************************************************
-//  acquireKey
+//	acquireKey
 //
 void REGISTRY_CALLTYPE acquireKey(RegKeyHandle hKey)
 {
@@ -53,7 +53,7 @@ void REGISTRY_CALLTYPE acquireKey(RegKeyHandle hKey)
 
 
 //*********************************************************************
-//  releaseKey
+//	releaseKey
 //
 void REGISTRY_CALLTYPE releaseKey(RegKeyHandle hKey)
 {
@@ -67,7 +67,7 @@ void REGISTRY_CALLTYPE releaseKey(RegKeyHandle hKey)
 
 
 //*********************************************************************
-//  isKeyReadOnly
+//	isKeyReadOnly
 //
 sal_Bool REGISTRY_CALLTYPE isKeyReadOnly(RegKeyHandle hKey)
 {
@@ -77,7 +77,7 @@ sal_Bool REGISTRY_CALLTYPE isKeyReadOnly(RegKeyHandle hKey)
 
 
 //*********************************************************************
-//  getKeyName
+//	getKeyName
 //
 RegError REGISTRY_CALLTYPE getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName)
 {
@@ -95,10 +95,10 @@ RegError REGISTRY_CALLTYPE getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName)
 
 
 //*********************************************************************
-//  createKey
+//	createKey
 //
-RegError REGISTRY_CALLTYPE createKey(RegKeyHandle hKey,
-                                     rtl_uString* keyName,
+RegError REGISTRY_CALLTYPE createKey(RegKeyHandle hKey, 
+                                     rtl_uString* keyName, 
                                      RegKeyHandle* phNewKey)
 {
     *phNewKey = 0;
@@ -106,7 +106,7 @@ RegError REGISTRY_CALLTYPE createKey(RegKeyHandle hKey,
     ORegKey* pKey = static_cast< ORegKey* >(hKey);
     if (!pKey)
         return REG_INVALID_KEY;
-
+        
     if (pKey->isDeleted())
         return REG_INVALID_KEY;
 
@@ -114,13 +114,13 @@ RegError REGISTRY_CALLTYPE createKey(RegKeyHandle hKey,
         return REG_REGISTRY_READONLY;
 
     return pKey->createKey(keyName, phNewKey);
-}
+}	
 
 //*********************************************************************
-//  openKey
+//	openKey
 //
-RegError REGISTRY_CALLTYPE openKey(RegKeyHandle hKey,
-                                   rtl_uString* keyName,
+RegError REGISTRY_CALLTYPE openKey(RegKeyHandle hKey, 
+                                   rtl_uString* keyName, 
                                    RegKeyHandle* phOpenKey)
 {
     *phOpenKey = 0;
@@ -128,19 +128,19 @@ RegError REGISTRY_CALLTYPE openKey(RegKeyHandle hKey,
     ORegKey* pKey = static_cast< ORegKey* >(hKey);
     if (!pKey)
         return REG_INVALID_KEY;
-
+        
     if (pKey->isDeleted())
         return REG_INVALID_KEY;
 
     return pKey->openKey(keyName, phOpenKey);
-}
+}	
 
 //*********************************************************************
-//  openSubKeys
+//	openSubKeys
 //
-RegError REGISTRY_CALLTYPE openSubKeys(RegKeyHandle hKey,
-                                       rtl_uString* keyName,
-                                       RegKeyHandle** pphSubKeys,
+RegError REGISTRY_CALLTYPE openSubKeys(RegKeyHandle hKey, 
+                                       rtl_uString* keyName, 
+                                       RegKeyHandle** pphSubKeys, 
                                        sal_uInt32* pnSubKeys)
 {
     *pphSubKeys = NULL;
@@ -149,15 +149,15 @@ RegError REGISTRY_CALLTYPE openSubKeys(RegKeyHandle hKey,
     ORegKey* pKey = static_cast< ORegKey* >(hKey);
     if (!pKey)
         return REG_INVALID_KEY;
-
+        
     if (pKey->isDeleted())
         return REG_INVALID_KEY;
 
     return pKey->openSubKeys(keyName, pphSubKeys, pnSubKeys);
-}
+}	
 
 //*********************************************************************
-//  closeSubKeys
+//	closeSubKeys
 //
 RegError REGISTRY_CALLTYPE closeSubKeys(RegKeyHandle* phSubKeys,
                                         sal_uInt32 nSubKeys)
@@ -173,12 +173,12 @@ RegError REGISTRY_CALLTYPE closeSubKeys(RegKeyHandle* phSubKeys,
     rtl_freeMemory(phSubKeys);
 
     return REG_NO_ERROR;
-}
+}	
 
 //*********************************************************************
-//  deleteKey
+//	deleteKey
 //
-RegError REGISTRY_CALLTYPE deleteKey(RegKeyHandle hKey,
+RegError REGISTRY_CALLTYPE deleteKey(RegKeyHandle hKey, 
                                      rtl_uString* keyName)
 {
     ORegKey* pKey = static_cast< ORegKey* >(hKey);
@@ -192,10 +192,10 @@ RegError REGISTRY_CALLTYPE deleteKey(RegKeyHandle hKey,
         return REG_REGISTRY_READONLY;
 
     return pKey->deleteKey(keyName);
-}
+}	
 
 //*********************************************************************
-//  closeKey
+//	closeKey
 //
 RegError REGISTRY_CALLTYPE closeKey(RegKeyHandle hKey)
 {
@@ -204,15 +204,15 @@ RegError REGISTRY_CALLTYPE closeKey(RegKeyHandle hKey)
         return REG_INVALID_KEY;
 
     return pKey->closeKey(hKey);
-}
+}	
 
 //*********************************************************************
-//  setValue
+//	setValue
 //
-RegError REGISTRY_CALLTYPE setValue(RegKeyHandle hKey,
-                                       rtl_uString* keyName,
-                                       RegValueType valueType,
-                                       RegValue pData,
+RegError REGISTRY_CALLTYPE setValue(RegKeyHandle hKey, 
+                                       rtl_uString* keyName, 
+                                       RegValueType valueType, 
+                                       RegValue pData, 
                                        sal_uInt32 valueSize)
 {
     ORegKey* pKey = static_cast< ORegKey* >(hKey);
@@ -223,7 +223,7 @@ RegError REGISTRY_CALLTYPE setValue(RegKeyHandle hKey,
         return REG_INVALID_KEY;
 
     if (pKey->isReadOnly())
-        return REG_REGISTRY_READONLY;
+        return REG_REGISTRY_READONLY;		
 
     OUString valueName( RTL_CONSTASCII_USTRINGPARAM("value") );
     if (keyName->length)
@@ -242,19 +242,19 @@ RegError REGISTRY_CALLTYPE setValue(RegKeyHandle hKey,
             else
                 return _ret1;
         }
-
+        
         return pKey->closeKey(pSubKey);
     }
 
     return pKey->setValue(valueName, valueType, pData, valueSize);
-}
+}	
 
 //*********************************************************************
-//  setLongValueList
+//	setLongValueList
 //
-RegError REGISTRY_CALLTYPE setLongListValue(RegKeyHandle hKey,
-                                                  rtl_uString* keyName,
-                                                  sal_Int32* pValueList,
+RegError REGISTRY_CALLTYPE setLongListValue(RegKeyHandle hKey, 
+                                                  rtl_uString* keyName, 
+                                                  sal_Int32* pValueList, 
                                                   sal_uInt32 len)
 {
     ORegKey* pKey = static_cast< ORegKey* >(hKey);
@@ -284,19 +284,19 @@ RegError REGISTRY_CALLTYPE setLongListValue(RegKeyHandle hKey,
             else
                 return _ret1;
         }
-
+        
         return pKey->closeKey(pSubKey);
     }
 
     return pKey->setLongListValue(valueName, pValueList, len);
-}
+}	
 
 //*********************************************************************
-//  setStringValueList
+//	setStringValueList
 //
-RegError REGISTRY_CALLTYPE setStringListValue(RegKeyHandle hKey,
-                                                   rtl_uString* keyName,
-                                                   sal_Char** pValueList,
+RegError REGISTRY_CALLTYPE setStringListValue(RegKeyHandle hKey, 
+                                                   rtl_uString* keyName, 
+                                                   sal_Char** pValueList, 
                                                    sal_uInt32 len)
 {
     ORegKey* pKey = static_cast< ORegKey* >(hKey);
@@ -326,19 +326,19 @@ RegError REGISTRY_CALLTYPE setStringListValue(RegKeyHandle hKey,
             else
                 return _ret1;
         }
-
+        
         return pKey->closeKey(pSubKey);
     }
 
     return pKey->setStringListValue(valueName, pValueList, len);
-}
+}	
 
 //*********************************************************************
-//  setUnicodeValueList
+//	setUnicodeValueList
 //
-RegError REGISTRY_CALLTYPE setUnicodeListValue(RegKeyHandle hKey,
-                                                     rtl_uString* keyName,
-                                                     sal_Unicode** pValueList,
+RegError REGISTRY_CALLTYPE setUnicodeListValue(RegKeyHandle hKey, 
+                                                     rtl_uString* keyName, 
+                                                     sal_Unicode** pValueList, 
                                                      sal_uInt32 len)
 {
     ORegKey* pKey = static_cast< ORegKey* >(hKey);
@@ -368,24 +368,24 @@ RegError REGISTRY_CALLTYPE setUnicodeListValue(RegKeyHandle hKey,
             else
                 return _ret1;
         }
-
+        
         return pKey->closeKey(pSubKey);
     }
 
     return pKey->setUnicodeListValue(valueName, pValueList, len);
-}
+}	
 
 //*********************************************************************
-//  getValueInfo
+//	getValueInfo
 //
-RegError REGISTRY_CALLTYPE getValueInfo(RegKeyHandle hKey,
-                                        rtl_uString* keyName,
-                                        RegValueType* pValueType,
+RegError REGISTRY_CALLTYPE getValueInfo(RegKeyHandle hKey, 
+                                        rtl_uString* keyName, 
+                                        RegValueType* pValueType, 
                                         sal_uInt32* pValueSize)
 {
     *pValueType = RG_VALUETYPE_NOT_DEFINED;
     *pValueSize = 0;
-
+    
     ORegKey* pKey = static_cast< ORegKey* >(hKey);
     if (!pKey)
         return REG_INVALID_KEY;
@@ -403,13 +403,13 @@ RegError REGISTRY_CALLTYPE getValueInfo(RegKeyHandle hKey,
         RegError _ret = pKey->openKey(keyName, (RegKeyHandle*)&pSubKey);
         if (_ret != REG_NO_ERROR)
             return _ret;
-
+        
         if (pSubKey->getValueInfo(valueName, &valueType, &valueSize) != REG_NO_ERROR)
         {
             (void) pKey->releaseKey(pSubKey);
             return REG_INVALID_VALUE;
         }
-
+        
         *pValueType = valueType;
         *pValueSize = valueSize;
 
@@ -424,15 +424,15 @@ RegError REGISTRY_CALLTYPE getValueInfo(RegKeyHandle hKey,
 
     *pValueType = valueType;
     *pValueSize = valueSize;
-
+        
     return REG_NO_ERROR;
-}
+}	
 
 //*********************************************************************
-//  getValueInfo
+//	getValueInfo
 //
-RegError REGISTRY_CALLTYPE getValue(RegKeyHandle hKey,
-                                    rtl_uString* keyName,
+RegError REGISTRY_CALLTYPE getValue(RegKeyHandle hKey, 
+                                    rtl_uString* keyName, 
                                     RegValue pValue)
 {
     ORegKey* pKey = static_cast< ORegKey* >(hKey);
@@ -456,19 +456,19 @@ RegError REGISTRY_CALLTYPE getValue(RegKeyHandle hKey,
             (void) pKey->releaseKey(pSubKey);
             return _ret1;
         }
-
+        
         return pKey->releaseKey(pSubKey);
     }
 
     return pKey->getValue(valueName, pValue);
-}
+}	
 
 //*********************************************************************
-//  getLongValueList
+//	getLongValueList
 //
-RegError REGISTRY_CALLTYPE getLongListValue(RegKeyHandle hKey,
+RegError REGISTRY_CALLTYPE getLongListValue(RegKeyHandle hKey, 
                                             rtl_uString* keyName,
-                                            sal_Int32** pValueList,
+                                            sal_Int32** pValueList, 
                                             sal_uInt32* pLen)
 {
     OSL_PRECOND((pValueList != 0) && (pLen != 0), "registry::getLongListValue(): invalid parameter");
@@ -495,19 +495,19 @@ RegError REGISTRY_CALLTYPE getLongListValue(RegKeyHandle hKey,
             (void) pKey->releaseKey(pSubKey);
             return _ret1;
         }
-
+        
         return pKey->releaseKey(pSubKey);
     }
 
     return pKey->getLongListValue(valueName, pValueList, pLen);
-}
+}	
 
 //*********************************************************************
-//  getStringValueList
+//	getStringValueList
 //
-RegError REGISTRY_CALLTYPE getStringListValue(RegKeyHandle hKey,
+RegError REGISTRY_CALLTYPE getStringListValue(RegKeyHandle hKey, 
                                               rtl_uString* keyName,
-                                              sal_Char*** pValueList,
+                                              sal_Char*** pValueList, 
                                               sal_uInt32* pLen)
 {
     OSL_PRECOND((pValueList != 0) && (pLen != 0), "registry::getStringListValue(): invalid parameter");
@@ -534,19 +534,19 @@ RegError REGISTRY_CALLTYPE getStringListValue(RegKeyHandle hKey,
             (void) pKey->releaseKey(pSubKey);
             return _ret1;
         }
-
+        
         return pKey->releaseKey(pSubKey);
     }
 
     return pKey->getStringListValue(valueName, pValueList, pLen);
-}
+}	
 
 //*********************************************************************
-//  getUnicodeListValue
+//	getUnicodeListValue
 //
-RegError REGISTRY_CALLTYPE getUnicodeListValue(RegKeyHandle hKey,
+RegError REGISTRY_CALLTYPE getUnicodeListValue(RegKeyHandle hKey, 
                                                rtl_uString* keyName,
-                                               sal_Unicode*** pValueList,
+                                               sal_Unicode*** pValueList, 
                                                sal_uInt32* pLen)
 {
     OSL_PRECOND((pValueList != 0) && (pLen != 0), "registry::getUnicodeListValue(): invalid parameter");
@@ -573,18 +573,18 @@ RegError REGISTRY_CALLTYPE getUnicodeListValue(RegKeyHandle hKey,
             (void) pKey->releaseKey(pSubKey);
             return _ret1;
         }
-
+        
         return pKey->releaseKey(pSubKey);
     }
 
     return pKey->getUnicodeListValue(valueName, pValueList, pLen);
-}
+}	
 
 //*********************************************************************
-//  freeValueList
+//	freeValueList
 //
-RegError REGISTRY_CALLTYPE freeValueList(RegValueType valueType,
-                                              RegValue pValueList,
+RegError REGISTRY_CALLTYPE freeValueList(RegValueType valueType, 
+                                              RegValue pValueList, 
                                               sal_uInt32 len)
 {
     switch (valueType)
@@ -625,7 +625,7 @@ RegError REGISTRY_CALLTYPE freeValueList(RegValueType valueType,
 }
 
 //*********************************************************************
-//  createLink
+//	createLink
 //
 RegError REGISTRY_CALLTYPE createLink(RegKeyHandle, rtl_uString*, rtl_uString*)
 {
@@ -633,7 +633,7 @@ RegError REGISTRY_CALLTYPE createLink(RegKeyHandle, rtl_uString*, rtl_uString*)
 }
 
 //*********************************************************************
-//  deleteLink
+//	deleteLink
 //
 RegError REGISTRY_CALLTYPE deleteLink(RegKeyHandle, rtl_uString*)
 {
@@ -641,7 +641,7 @@ RegError REGISTRY_CALLTYPE deleteLink(RegKeyHandle, rtl_uString*)
 }
 
 //*********************************************************************
-//  getKeyType
+//	getKeyType
 //
 RegError REGISTRY_CALLTYPE getKeyType(RegKeyHandle hKey,
                                       rtl_uString* keyName,
@@ -650,15 +650,15 @@ RegError REGISTRY_CALLTYPE getKeyType(RegKeyHandle hKey,
     ORegKey* pKey = static_cast< ORegKey* >(hKey);
     if (!pKey)
         return REG_INVALID_KEY;
-
+        
     if (pKey->isDeleted())
         return REG_INVALID_KEY;
 
-    return pKey->getKeyType(keyName, pKeyType);
-}
+    return pKey->getKeyType(keyName, pKeyType);	
+}	
 
 //*********************************************************************
-//  getLinkTarget
+//	getLinkTarget
 //
 RegError REGISTRY_CALLTYPE getLinkTarget(
     RegKeyHandle, rtl_uString*, rtl_uString**)
@@ -667,7 +667,7 @@ RegError REGISTRY_CALLTYPE getLinkTarget(
 }
 
 //*********************************************************************
-//  getName
+//	getName
 //
 RegError REGISTRY_CALLTYPE getResolvedKeyName(RegKeyHandle hKey,
                                               rtl_uString* keyName,
@@ -677,7 +677,7 @@ RegError REGISTRY_CALLTYPE getResolvedKeyName(RegKeyHandle hKey,
     ORegKey* pKey = static_cast< ORegKey* >(hKey);
     if (!pKey)
         return REG_INVALID_KEY;
-
+        
     if (pKey->isDeleted())
         return REG_INVALID_KEY;
 
@@ -689,7 +689,7 @@ RegError REGISTRY_CALLTYPE getResolvedKeyName(RegKeyHandle hKey,
 }
 
 //*********************************************************************
-//  getKeyNames
+//	getKeyNames
 //
 RegError REGISTRY_CALLTYPE getKeyNames(RegKeyHandle hKey,
                                        rtl_uString* keyName,
@@ -699,15 +699,15 @@ RegError REGISTRY_CALLTYPE getKeyNames(RegKeyHandle hKey,
     ORegKey* pKey = static_cast< ORegKey* >(hKey);
     if (!pKey)
         return REG_INVALID_KEY;
-
+        
     if (pKey->isDeleted())
         return REG_INVALID_KEY;
 
-    return pKey->getKeyNames(keyName, pSubKeyNames, pnSubKeys);
-}
+    return pKey->getKeyNames(keyName, pSubKeyNames, pnSubKeys);		
+}	
 
 //*********************************************************************
-//  freeKeyNames
+//	freeKeyNames
 //
 RegError REGISTRY_CALLTYPE freeKeyNames(rtl_uString** pKeyNames,
                                           sal_uInt32 nKeys)
@@ -719,79 +719,79 @@ RegError REGISTRY_CALLTYPE freeKeyNames(rtl_uString** pKeyNames,
 
     rtl_freeMemory(pKeyNames);
 
-    return REG_NO_ERROR;
-}
+    return REG_NO_ERROR;		
+}	
 
 //*********************************************************************
 //  C API
 //
 
 //*********************************************************************
-//  reg_createKey
+//	reg_createKey
 //
-RegError REGISTRY_CALLTYPE reg_createKey(RegKeyHandle hKey,
-                                         rtl_uString* keyName,
+RegError REGISTRY_CALLTYPE reg_createKey(RegKeyHandle hKey, 
+                                         rtl_uString* keyName, 
                                          RegKeyHandle* phNewKey)
 {
     if (!hKey)
          return REG_INVALID_KEY;
 
     return createKey(hKey, keyName, phNewKey);
-}
+}	
 
 //*********************************************************************
-//  reg_openKey
+//	reg_openKey
 //
-RegError REGISTRY_CALLTYPE reg_openKey(RegKeyHandle hKey,
-                                       rtl_uString* keyName,
+RegError REGISTRY_CALLTYPE reg_openKey(RegKeyHandle hKey, 
+                                       rtl_uString* keyName, 
                                        RegKeyHandle* phOpenKey)
 {
     if (!hKey)
         return REG_INVALID_KEY;
 
     return openKey(hKey, keyName, phOpenKey);
-}
+}	
 
 //*********************************************************************
-//  reg_openSubKeys
+//	reg_openSubKeys
 //
-RegError REGISTRY_CALLTYPE reg_openSubKeys(RegKeyHandle hKey,
-                                           rtl_uString* keyName,
-                                           RegKeyHandle** pphSubKeys,
+RegError REGISTRY_CALLTYPE reg_openSubKeys(RegKeyHandle hKey, 
+                                           rtl_uString* keyName, 
+                                           RegKeyHandle** pphSubKeys, 
                                            sal_uInt32* pnSubKeys)
 {
     if (!hKey)
         return REG_INVALID_KEY;
 
     return openSubKeys(hKey, keyName, pphSubKeys, pnSubKeys);
-}
+}	
 
 //*********************************************************************
-//  reg_closeSubKeys
+//	reg_closeSubKeys
 //
-RegError REGISTRY_CALLTYPE reg_closeSubKeys(RegKeyHandle* pphSubKeys,
+RegError REGISTRY_CALLTYPE reg_closeSubKeys(RegKeyHandle* pphSubKeys, 
                                             sal_uInt32 nSubKeys)
 {
     if (!pphSubKeys)
         return REG_INVALID_KEY;
 
     return closeSubKeys(pphSubKeys, nSubKeys);
-}
+}	
 
 //*********************************************************************
-//  reg_deleteKey
+//	reg_deleteKey
 //
-RegError REGISTRY_CALLTYPE reg_deleteKey(RegKeyHandle hKey,
+RegError REGISTRY_CALLTYPE reg_deleteKey(RegKeyHandle hKey, 
                                          rtl_uString* keyName)
 {
     if (!hKey)
         return REG_INVALID_KEY;
 
     return deleteKey(hKey, keyName);
-}
+}	
 
 //*********************************************************************
-//  reg_closeKey
+//	reg_closeKey
 //
 RegError REGISTRY_CALLTYPE reg_closeKey(RegKeyHandle hKey)
 {
@@ -799,16 +799,16 @@ RegError REGISTRY_CALLTYPE reg_closeKey(RegKeyHandle hKey)
         return REG_INVALID_KEY;
 
     return closeKey(hKey);
-}
+}	
 
 
 //*********************************************************************
-//  reg_getKeyName
+//	reg_getKeyName
 //
 RegError REGISTRY_CALLTYPE reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName)
 {
     if (hKey)
-    {
+    {	
         rtl_uString_assign( pKeyName, ((ORegKey*)hKey)->getName().pData );
         return REG_NO_ERROR;
     } else
@@ -819,108 +819,108 @@ RegError REGISTRY_CALLTYPE reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyN
 }
 
 //*********************************************************************
-//  reg_setValue
+//	reg_setValue
 //
-RegError REGISTRY_CALLTYPE reg_setValue(RegKeyHandle hKey,
-                                        rtl_uString* keyName,
-                                        RegValueType valueType,
-                                        RegValue pData,
+RegError REGISTRY_CALLTYPE reg_setValue(RegKeyHandle hKey, 
+                                        rtl_uString* keyName, 
+                                        RegValueType valueType, 
+                                        RegValue pData, 
                                         sal_uInt32 valueSize)
 {
     if (!hKey)
         return REG_INVALID_KEY;
 
     return setValue(hKey, keyName, valueType, pData, valueSize);
-}
+}	
 
 //*********************************************************************
-//  reg_setLongListValue
+//	reg_setLongListValue
 //
-RegError REGISTRY_CALLTYPE reg_setLongListValue(RegKeyHandle hKey,
-                                                      rtl_uString* keyName,
-                                                      sal_Int32* pValueList,
+RegError REGISTRY_CALLTYPE reg_setLongListValue(RegKeyHandle hKey, 
+                                                      rtl_uString* keyName, 
+                                                      sal_Int32* pValueList, 
                                                       sal_uInt32 len)
 {
     if (!hKey)
         return REG_INVALID_KEY;
 
     return setLongListValue(hKey, keyName, pValueList, len);
-}
+}	
 
 //*********************************************************************
-//  reg_setStringListValue
+//	reg_setStringListValue
 //
-RegError REGISTRY_CALLTYPE reg_setStringListValue(RegKeyHandle hKey,
-                                                          rtl_uString* keyName,
-                                                          sal_Char** pValueList,
+RegError REGISTRY_CALLTYPE reg_setStringListValue(RegKeyHandle hKey, 
+                                                          rtl_uString* keyName, 
+                                                          sal_Char** pValueList, 
                                                           sal_uInt32 len)
 {
     if (!hKey)
         return REG_INVALID_KEY;
 
     return setStringListValue(hKey, keyName, pValueList, len);
-}
+}	
 
 //*********************************************************************
-//  reg_setUnicodeListValue
+//	reg_setUnicodeListValue
 //
-RegError REGISTRY_CALLTYPE reg_setUnicodeListValue(RegKeyHandle hKey,
-                                                            rtl_uString* keyName,
-                                                            sal_Unicode** pValueList,
+RegError REGISTRY_CALLTYPE reg_setUnicodeListValue(RegKeyHandle hKey, 
+                                                            rtl_uString* keyName, 
+                                                            sal_Unicode** pValueList, 
                                                             sal_uInt32 len)
 {
     if (!hKey)
         return REG_INVALID_KEY;
 
     return setUnicodeListValue(hKey, keyName, pValueList, len);
-}
+}	
 
 //*********************************************************************
-//  reg_getValueInfo
+//	reg_getValueInfo
 //
-RegError REGISTRY_CALLTYPE reg_getValueInfo(RegKeyHandle hKey,
-                                            rtl_uString* keyName,
-                                            RegValueType* pValueType,
+RegError REGISTRY_CALLTYPE reg_getValueInfo(RegKeyHandle hKey, 
+                                            rtl_uString* keyName, 
+                                            RegValueType* pValueType, 
                                             sal_uInt32* pValueSize)
 {
     if (!hKey)
         return REG_INVALID_KEY;
 
     return getValueInfo(hKey, keyName, pValueType, pValueSize);
-}
+}	
 
 //*********************************************************************
-//  reg_getValueInfo
+//	reg_getValueInfo
 //
-RegError REGISTRY_CALLTYPE reg_getValue(RegKeyHandle hKey,
-                                        rtl_uString* keyName,
+RegError REGISTRY_CALLTYPE reg_getValue(RegKeyHandle hKey, 
+                                        rtl_uString* keyName, 
                                         RegValue pData)
 {
     if (!hKey)
         return REG_INVALID_KEY;
 
     return getValue(hKey, keyName, pData);
-}
+}	
 
 //*********************************************************************
-//  reg_getLongListValue
+//	reg_getLongListValue
 //
-RegError REGISTRY_CALLTYPE reg_getLongListValue(RegKeyHandle hKey,
-                                                      rtl_uString* keyName,
-                                                      sal_Int32** pValueList,
+RegError REGISTRY_CALLTYPE reg_getLongListValue(RegKeyHandle hKey, 
+                                                      rtl_uString* keyName, 
+                                                      sal_Int32** pValueList, 
                                                       sal_uInt32* pLen)
 {
     if (!hKey)
         return REG_INVALID_KEY;
 
     return getLongListValue(hKey, keyName, pValueList, pLen);
-}
+}	
 
 //*********************************************************************
-//  reg_getStringListValue
+//	reg_getStringListValue
 //
-RegError REGISTRY_CALLTYPE reg_getStringListValue(RegKeyHandle hKey,
-                                                       rtl_uString* keyName,
+RegError REGISTRY_CALLTYPE reg_getStringListValue(RegKeyHandle hKey, 
+                                                       rtl_uString* keyName, 
                                                        sal_Char*** pValueList,
                                                        sal_uInt32* pLen)
 {
@@ -928,50 +928,50 @@ RegError REGISTRY_CALLTYPE reg_getStringListValue(RegKeyHandle hKey,
         return REG_INVALID_KEY;
 
     return getStringListValue(hKey, keyName, pValueList, pLen);
-}
+}	
 
 //*********************************************************************
-//  reg_getUnicodeListValue
+//	reg_getUnicodeListValue
 //
-RegError REGISTRY_CALLTYPE reg_getUnicodeListValue(RegKeyHandle hKey,
-                                                         rtl_uString* keyName,
-                                                         sal_Unicode*** pValueList,
+RegError REGISTRY_CALLTYPE reg_getUnicodeListValue(RegKeyHandle hKey, 
+                                                         rtl_uString* keyName, 
+                                                         sal_Unicode*** pValueList, 
                                                          sal_uInt32* pLen)
 {
     if (!hKey)
         return REG_INVALID_KEY;
 
     return getUnicodeListValue(hKey, keyName, pValueList, pLen);
-}
+}	
 
 //*********************************************************************
-//  reg_freeValueList
+//	reg_freeValueList
 //
-RegError REGISTRY_CALLTYPE reg_freeValueList(RegValueType valueType,
-                                                  RegValue pValueList,
+RegError REGISTRY_CALLTYPE reg_freeValueList(RegValueType valueType, 
+                                                  RegValue pValueList, 
                                                   sal_uInt32 len)
 {
     if (pValueList)
         return freeValueList(valueType, pValueList, len);
     else
         return REG_INVALID_VALUE;
-}
+}												 
 
 //*********************************************************************
-//  reg_createLink
+//	reg_createLink
 //
 RegError REGISTRY_CALLTYPE reg_createLink(RegKeyHandle hKey,
-                                               rtl_uString* linkName,
+                                               rtl_uString* linkName, 
                                           rtl_uString* linkTarget)
 {
     if (!hKey)
         return REG_INVALID_KEY;
 
     return createLink(hKey, linkName, linkTarget);
-}
+}	
 
 //*********************************************************************
-//  reg_deleteLink
+//	reg_deleteLink
 //
 RegError REGISTRY_CALLTYPE reg_deleteLink(RegKeyHandle hKey,
                                             rtl_uString* linkName)
@@ -980,10 +980,10 @@ RegError REGISTRY_CALLTYPE reg_deleteLink(RegKeyHandle hKey,
         return REG_INVALID_KEY;
 
     return deleteLink(hKey, linkName);
-}
+}	
 
 //*********************************************************************
-//  reg_getKeyType
+//	reg_getKeyType
 //
 RegError REGISTRY_CALLTYPE reg_getKeyType(RegKeyHandle hKey,
                                           rtl_uString* keyName,
@@ -993,10 +993,10 @@ RegError REGISTRY_CALLTYPE reg_getKeyType(RegKeyHandle hKey,
         return REG_INVALID_KEY;
 
     return getKeyType(hKey, keyName, pKeyType);
-}
+}	
 
 //*********************************************************************
-//  reg_getLinkTarget
+//	reg_getLinkTarget
 //
 RegError REGISTRY_CALLTYPE reg_getLinkTarget(RegKeyHandle hKey,
                                              rtl_uString* linkName,
@@ -1006,10 +1006,10 @@ RegError REGISTRY_CALLTYPE reg_getLinkTarget(RegKeyHandle hKey,
         return REG_INVALID_KEY;
 
     return getLinkTarget(hKey, linkName, pLinkTarget);
-}
+}	
 
 //*********************************************************************
-//  reg_getResolvedKeyName
+//	reg_getResolvedKeyName
 //
 RegError REGISTRY_CALLTYPE reg_getResolvedKeyName(RegKeyHandle hKey,
                                                     rtl_uString* keyName,
diff --git a/registry/source/regkey.hxx b/registry/source/regkey.hxx
index 0503c05772c9..557da4086ccb 100644
--- a/registry/source/regkey.hxx
+++ b/registry/source/regkey.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/registry/test/regdiagnose.h b/registry/test/regdiagnose.h
index 08e0ea6602eb..74db3d59d6c8 100644
--- a/registry/test/regdiagnose.h
+++ b/registry/test/regdiagnose.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/registry/test/testmerge.cxx b/registry/test/testmerge.cxx
index 6e4f31419eba..b4a1036a1c30 100644
--- a/registry/test/testmerge.cxx
+++ b/registry/test/testmerge.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -192,9 +192,9 @@ void test_merge()
     REG_ENSURE(!myRegistry->create(OUString::createFromAscii("mergetest.rdb")), "testMerge error 1");
     REG_ENSURE(myRegistry->getName().equals(OUString::createFromAscii("mergetest.rdb")), "testMerge error 1.a)");
     REG_ENSURE(!myRegistry->openRootKey(rootKey), "testMerge error 2");
-    REG_ENSURE(!myRegistry->loadKey(rootKey, OUString::createFromAscii("/stardiv/IchbineinMergeKey"),
+    REG_ENSURE(!myRegistry->loadKey(rootKey, OUString::createFromAscii("/stardiv/IchbineinMergeKey"), 
                 OUString::createFromAscii("merge1.rdb")), "testMerge error 3");
-    REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString::createFromAscii("/stardiv/IchbineinMergeKey"),
+    REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString::createFromAscii("/stardiv/IchbineinMergeKey"), 
                 OUString::createFromAscii("merge2.rdb")), "testMerge error 4");
 
     ///////////////////////////////////////////////////////////////////////////
diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx
index ef3f2e37ee03..96011941d8a2 100644
--- a/registry/test/testregcpp.cxx
+++ b/registry/test/testregcpp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -73,80 +73,80 @@ void test_coreReflection()
 
         aConst.m_type = RT_TYPE_BOOL;
         aConst.m_value.aBool = sal_True;
-        writer.setFieldData(0, OUString::createFromAscii("aConstBool"),
-                            OUString::createFromAscii("boolean"),
-                            OUString::createFromAscii("ich bin ein boolean"),
+        writer.setFieldData(0, OUString::createFromAscii("aConstBool"), 
+                            OUString::createFromAscii("boolean"), 
+                            OUString::createFromAscii("ich bin ein boolean"), 
                             OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_BYTE;
         aConst.m_value.aByte = 127;
-        writer.setFieldData(1, OUString::createFromAscii("aConstByte"),
-                            OUString::createFromAscii("byte"),
-                            OUString::createFromAscii("ich bin ein byte"),
+        writer.setFieldData(1, OUString::createFromAscii("aConstByte"), 
+                            OUString::createFromAscii("byte"), 
+                            OUString::createFromAscii("ich bin ein byte"), 
                             OUString::createFromAscii("DummyFile"),  RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_INT16;
         aConst.m_value.aShort = -10;
-        writer.setFieldData(2, OUString::createFromAscii("aConstShort"),
-                            OUString::createFromAscii("short"),
-                            OUString::createFromAscii("ich bin ein short"),
+        writer.setFieldData(2, OUString::createFromAscii("aConstShort"), 
+                            OUString::createFromAscii("short"), 
+                            OUString::createFromAscii("ich bin ein short"), 
                             OUString::createFromAscii("DummyFile"),  RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_UINT16;
         aConst.m_value.aUShort = 10;
-        writer.setFieldData(3, OUString::createFromAscii("aConstUShort"),
-                            OUString::createFromAscii("unsigned short"),
-                            OUString::createFromAscii("ich bin ein unsigned short"),
+        writer.setFieldData(3, OUString::createFromAscii("aConstUShort"), 
+                            OUString::createFromAscii("unsigned short"), 
+                            OUString::createFromAscii("ich bin ein unsigned short"), 
                             OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_INT32;
         aConst.m_value.aLong = -100000;
-        writer.setFieldData(4, OUString::createFromAscii("aConstLong"),
-                            OUString::createFromAscii("long"),
-                            OUString::createFromAscii("ich bin ein long"),
+        writer.setFieldData(4, OUString::createFromAscii("aConstLong"), 
+                            OUString::createFromAscii("long"), 
+                            OUString::createFromAscii("ich bin ein long"), 
                             OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_UINT32;
         aConst.m_value.aULong = 100000;
-        writer.setFieldData(5, OUString::createFromAscii("aConstULong"),
-                            OUString::createFromAscii("unsigned long"),
-                            OUString::createFromAscii("ich bin ein unsigned long"),
+        writer.setFieldData(5, OUString::createFromAscii("aConstULong"), 
+                            OUString::createFromAscii("unsigned long"), 
+                            OUString::createFromAscii("ich bin ein unsigned long"), 
                             OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_INT64;
         aConst.m_value.aHyper = -100000000;
-        writer.setFieldData(6, OUString::createFromAscii("aConstHyper"),
-                            OUString::createFromAscii("hyper"),
-                            OUString::createFromAscii("ich bin ein hyper"),
+        writer.setFieldData(6, OUString::createFromAscii("aConstHyper"), 
+                            OUString::createFromAscii("hyper"), 
+                            OUString::createFromAscii("ich bin ein hyper"), 
                             OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_UINT64;
         aConst.m_value.aUHyper = 100000000;
-        writer.setFieldData(7, OUString::createFromAscii("aConstULong"),
-                            OUString::createFromAscii("unsigned long"),
-                            OUString::createFromAscii("ich bin ein unsigned long"),
+        writer.setFieldData(7, OUString::createFromAscii("aConstULong"), 
+                            OUString::createFromAscii("unsigned long"), 
+                            OUString::createFromAscii("ich bin ein unsigned long"), 
                             OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_FLOAT;
         aConst.m_value.aFloat = -2e-10f;
-        writer.setFieldData(8, OUString::createFromAscii("aConstFloat"),
-                            OUString::createFromAscii("float"),
-                            OUString::createFromAscii("ich bin ein float"),
+        writer.setFieldData(8, OUString::createFromAscii("aConstFloat"), 
+                            OUString::createFromAscii("float"), 
+                            OUString::createFromAscii("ich bin ein float"), 
                             OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_DOUBLE;
-        aConst.m_value.aDouble = -2e-100; writer.setFieldData(9, OUString::createFromAscii("aConstDouble"),
-                                                              OUString::createFromAscii("double"),
-                                                              OUString::createFromAscii("ich bin ein double"),
+        aConst.m_value.aDouble = -2e-100; writer.setFieldData(9, OUString::createFromAscii("aConstDouble"), 
+                                                              OUString::createFromAscii("double"), 
+                                                              OUString::createFromAscii("ich bin ein double"), 
                                                               OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_STRING;
         OUString tmpStr(OUString::createFromAscii( "dies ist ein unicode string" ));
         aConst.m_value.aString = tmpStr.getStr();
 
-        writer.setFieldData(10, OUString::createFromAscii("aConstString"),
-                            OUString::createFromAscii("string"),
-                            OUString::createFromAscii("ich bin ein string"),
+        writer.setFieldData(10, OUString::createFromAscii("aConstString"), 
+                            OUString::createFromAscii("string"), 
+                            OUString::createFromAscii("ich bin ein string"), 
                             OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
 
         const sal_uInt8* pBlop = writer.getBlop();
         sal_uInt32      aBlopSize = writer.getBlopSize();
 
         REG_ENSURE(!key2.setValue(OUString(), RG_VALUETYPE_BINARY, (void*)pBlop, aBlopSize), "testCoreReflection error 9");
-
+    
         sal_uInt8* readBlop = (sal_uInt8*)rtl_allocateMemory(aBlopSize);
         REG_ENSURE(!key2.getValue(OUString(), (void*)readBlop) , "testCoreReflection error 9a");
-
+    
         RegistryTypeReader reader(readBlop, aBlopSize, sal_True);
 
         if (reader.isValid())
@@ -160,12 +160,12 @@ void test_coreReflection()
             aReadConst = reader.getFieldConstValue(6);
             REG_ENSURE( aReadConst.m_type == RT_TYPE_INT64, "testCoreReflection error 9a5");
             REG_ENSURE( aReadConst.m_value.aHyper == -100000000, "testCoreReflection error 9a6");
-
+            
             aReadConst = reader.getFieldConstValue(10);
             OString aConstStr = OUStringToOString(aConst.m_value.aString, RTL_TEXTENCODING_ASCII_US);
             REG_ENSURE(aConstStr.equals("dies ist ein unicode string"), "testCoreReflection error 9b");
-        }
-
+        }	
+    
     }
 
     {
@@ -176,20 +176,20 @@ void test_coreReflection()
         writer.setDoku(OUString::createFromAscii("Hallo ich bin eine Struktur"));
         writer.setFileName(OUString::createFromAscii("DummyFile"));
 
-        writer.setFieldData(0, OUString::createFromAscii("asal_uInt32"),
+        writer.setFieldData(0, OUString::createFromAscii("asal_uInt32"), 
                             OUString::createFromAscii("unsigned long"),
                             OUString(), OUString(), RT_ACCESS_READWRITE);
-        writer.setFieldData(1, OUString::createFromAscii("aXInterface"),
-                            OUString::createFromAscii("stardiv/uno/XInterface"),
+        writer.setFieldData(1, OUString::createFromAscii("aXInterface"), 
+                            OUString::createFromAscii("stardiv/uno/XInterface"), 
                             OUString(), OUString(), RT_ACCESS_READWRITE);
-        writer.setFieldData(2, OUString::createFromAscii("aSequence"),
-                            OUString::createFromAscii("[]ModuleA/EnumA"),
+        writer.setFieldData(2, OUString::createFromAscii("aSequence"), 
+                            OUString::createFromAscii("[]ModuleA/EnumA"), 
                             OUString(), OUString(), RT_ACCESS_READWRITE);
 
         const sal_uInt8* pBlop = writer.getBlop();
         sal_uInt32      aBlopSize = writer.getBlopSize();
 
-        REG_ENSURE(!key3.setValue(OUString(), RG_VALUETYPE_BINARY, (void*)pBlop, aBlopSize), "testCoreReflection error 9a");
+        REG_ENSURE(!key3.setValue(OUString(), RG_VALUETYPE_BINARY, (void*)pBlop, aBlopSize), "testCoreReflection error 9a");    
     }
 
     {
@@ -205,12 +205,12 @@ void test_coreReflection()
         writer.setDoku(OUString::createFromAscii("Hallo ich bin ein Enum"));
         writer.setFileName(OUString::createFromAscii("DummyFile"));
 
-        writer.setFieldData(0, OUString::createFromAscii("ENUM_VAL_1"),
-                            OUString(), OUString::createFromAscii("ich bin ein enum value"),
+        writer.setFieldData(0, OUString::createFromAscii("ENUM_VAL_1"), 
+                            OUString(), OUString::createFromAscii("ich bin ein enum value"), 
                             OUString(), RT_ACCESS_CONST, aConst);
 
         aConst.m_value.aULong = 10;
-        writer.setFieldData(1, OUString::createFromAscii("ENUM_VAL_2"),
+        writer.setFieldData(1, OUString::createFromAscii("ENUM_VAL_2"), 
                             OUString(), OUString(), OUString(), RT_ACCESS_CONST, aConst);
 
         const sal_uInt8* pBlop = writer.getBlop();
@@ -232,25 +232,25 @@ void test_coreReflection()
         writer.setDoku(OUString::createFromAscii("Hallo ich bin ein Interface"));
         writer.setFileName(OUString::createFromAscii("DummyFile"));
 
-        writer.setFieldData(0, OUString::createFromAscii("aString"),
+        writer.setFieldData(0, OUString::createFromAscii("aString"), 
                             OUString::createFromAscii("string"), OUString(), OUString(), RT_ACCESS_READWRITE);
-        writer.setFieldData(1, OUString::createFromAscii("aStruct"),
-                            OUString::createFromAscii("ModuleA/StructA"),
+        writer.setFieldData(1, OUString::createFromAscii("aStruct"), 
+                            OUString::createFromAscii("ModuleA/StructA"), 
                             OUString(), OUString(), RT_ACCESS_READONLY);
-        writer.setFieldData(2, OUString::createFromAscii("aEnum"),
+        writer.setFieldData(2, OUString::createFromAscii("aEnum"), 
                             OUString::createFromAscii("ModuleA/EnumA"), OUString(), OUString(), RT_ACCESS_BOUND);
         aConst.m_type = RT_TYPE_UINT16;
         aConst.m_value.aUShort = 12;
-        writer.setFieldData(3, OUString::createFromAscii("aConstUShort"),
-                            OUString::createFromAscii("unsigned short"), OUString(),
+        writer.setFieldData(3, OUString::createFromAscii("aConstUShort"), 
+                            OUString::createFromAscii("unsigned short"), OUString(), 
                             OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
 
-        writer.setMethodData(0, OUString::createFromAscii("methodA"),
-                             OUString::createFromAscii("double"), RT_MODE_TWOWAY, 2, 1,
+        writer.setMethodData(0, OUString::createFromAscii("methodA"), 
+                             OUString::createFromAscii("double"), RT_MODE_TWOWAY, 2, 1, 
                              OUString::createFromAscii("Hallo ich bin die methodA"));
-        writer.setParamData(0, 0, OUString::createFromAscii("ModuleA/StructA"),
+        writer.setParamData(0, 0, OUString::createFromAscii("ModuleA/StructA"), 
                             OUString::createFromAscii("aStruct"), RT_PARAM_IN);
-        writer.setParamData(0, 1, OUString::createFromAscii("unsigned short"),
+        writer.setParamData(0, 1, OUString::createFromAscii("unsigned short"), 
                             OUString::createFromAscii("aShort"), RT_PARAM_INOUT);
         writer.setExcData(0, 0, OUString::createFromAscii("ModuleA/ExceptionA"));
 
@@ -261,7 +261,7 @@ void test_coreReflection()
 
         sal_uInt8* readBlop = (sal_uInt8*)rtl_allocateMemory(aBlopSize);
         REG_ENSURE(!key5.getValue(OUString(), (void*)readBlop) , "testCoreReflection error 9c1");
-
+    
         RegistryTypeReader reader(readBlop, aBlopSize, sal_True);
 
         if (reader.isValid())
@@ -275,7 +275,7 @@ void test_coreReflection()
             REG_ENSURE(retUik.m_Data3 = 3, "testCoreReflection error 9c5");
             REG_ENSURE(retUik.m_Data4 = 4, "testCoreReflection error 9c6");
             REG_ENSURE(retUik.m_Data5 = 5, "testCoreReflection error 9c7");
-        }
+        }	
 
     }
 
@@ -286,9 +286,9 @@ void test_coreReflection()
 
         writer.setDoku(OUString::createFromAscii("Hallo ich bin eine Exception"));
 
-        writer.setFieldData(0, OUString::createFromAscii("aSource"),
-                            OUString::createFromAscii("stardiv/uno/XInterface"),
-                            OUString::createFromAscii("ich bin ein interface member"),
+        writer.setFieldData(0, OUString::createFromAscii("aSource"), 
+                            OUString::createFromAscii("stardiv/uno/XInterface"), 
+                            OUString::createFromAscii("ich bin ein interface member"), 
                             OUString(), RT_ACCESS_READWRITE);
 
         const sal_uInt8* pBlop = writer.getBlop();
@@ -305,9 +305,9 @@ void test_coreReflection()
         writer.setDoku(OUString::createFromAscii("Hallo ich bin ein Service"));
         writer.setFileName(OUString::createFromAscii("DummyFile"));
 
-        writer.setFieldData(0, OUString::createFromAscii("aProperty"),
-                            OUString::createFromAscii("stardiv/uno/XInterface"),
-                            OUString::createFromAscii("ich bin eine property"),
+        writer.setFieldData(0, OUString::createFromAscii("aProperty"), 
+                            OUString::createFromAscii("stardiv/uno/XInterface"), 
+                            OUString::createFromAscii("ich bin eine property"), 
                             OUString(), RT_ACCESS_READWRITE);
 
         writer.setReferenceData(0, OUString::createFromAscii("ModuleA/XInterfaceA"), RT_REF_SUPPORTS,
@@ -326,7 +326,7 @@ void test_coreReflection()
         REG_ENSURE(!key7.setValue(OUString(), RG_VALUETYPE_BINARY, (void*)pBlop, aBlopSize), "testCoreReflection error 9e");
         sal_uInt8* readBlop = (sal_uInt8*)rtl_allocateMemory(aBlopSize);
         REG_ENSURE(!key7.getValue(OUString(), (void*)readBlop) , "testCoreReflection error 9e2");
-
+    
         RegistryTypeReader reader(readBlop, aBlopSize, sal_True);
 
         if (reader.isValid())
@@ -335,10 +335,10 @@ void test_coreReflection()
 
             sal_uInt32 referenceCount = reader.getReferenceCount();
             REG_ENSURE( referenceCount == 4, "testCoreReflection error 9e4");
-
+            
             OUString refName = reader.getReferenceName(0);
             REG_ENSURE(refName.equals(OUString::createFromAscii("ModuleA/XInterfaceA")), "testCoreReflection error 9e5");
-        }
+        }	
     }
 
     {
@@ -353,21 +353,21 @@ void test_coreReflection()
 
         aConst.m_type = RT_TYPE_BOOL;
         aConst.m_value.aBool = sal_True;
-        writer.setFieldData(0, OUString::createFromAscii("ConstantsA_aConstBool"),
-                            OUString::createFromAscii("boolean"),
-                            OUString::createFromAscii("ich bin ein boolean"),
+        writer.setFieldData(0, OUString::createFromAscii("ConstantsA_aConstBool"), 
+                            OUString::createFromAscii("boolean"), 
+                            OUString::createFromAscii("ich bin ein boolean"), 
                             OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_BYTE;
         aConst.m_value.aByte = 127;
-        writer.setFieldData(1, OUString::createFromAscii("ConstantsA_aConstByte"),
-                            OUString::createFromAscii("byte"),
-                            OUString::createFromAscii("ich bin ein byte"),
+        writer.setFieldData(1, OUString::createFromAscii("ConstantsA_aConstByte"), 
+                            OUString::createFromAscii("byte"), 
+                            OUString::createFromAscii("ich bin ein byte"), 
                             OUString::createFromAscii("DummyFile"),  RT_ACCESS_CONST, aConst);
         aConst.m_type = RT_TYPE_INT16;
         aConst.m_value.aShort = -10;
-        writer.setFieldData(2, OUString::createFromAscii("ConstantsA_aConstShort"),
-                            OUString::createFromAscii("short"),
-                            OUString::createFromAscii("ich bin ein short"),
+        writer.setFieldData(2, OUString::createFromAscii("ConstantsA_aConstShort"), 
+                            OUString::createFromAscii("short"), 
+                            OUString::createFromAscii("ich bin ein short"), 
                             OUString::createFromAscii("DummyFile"),  RT_ACCESS_CONST, aConst);
 
         const sal_uInt8* pBlop = writer.getBlop();
@@ -441,7 +441,7 @@ void test_registry_CppApi()
 //    REG_ENSURE(key6.getName().equals(OUString::createFromAscii("/myFourthKey/X")), "test_registry_CppApi error 7m");
 
     REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("myFifthKey"), key6), "test_registry_CppApi error 7m1");
-    REG_ENSURE(!key6.createLink(OUString::createFromAscii("mySecondLink"),
+    REG_ENSURE(!key6.createLink(OUString::createFromAscii("mySecondLink"), 
                                  OUString::createFromAscii("/mySixthKey/myFirstLink")), "test_registry_CppApi error 7m2");
 
     REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/myFifthKey/mySecondLink"), key6), "test_registry_CppApi error 7m3");
@@ -570,7 +570,7 @@ void test_registry_CppApi()
     OUString w1(OUString::createFromAscii( "Hallo" ));
     OUString w2(OUString::createFromAscii( "jetzt komm" ));
     OUString w3(OUString::createFromAscii( "ich als unicode" ));
-
+    
     pUnicode[0]=w1.getStr();
     pUnicode[1]=w2.getStr();
     pUnicode[2]=w3.getStr();
@@ -633,18 +633,18 @@ void test_registry_CppApi()
     REG_ENSURE(!myRegistry->open(OUString::createFromAscii("test.rdb"), REG_READWRITE), "test_registry_CppApi error 33");
     REG_ENSURE(!myRegistry->openRootKey(rootKey), "test_registry_CppApi error 34");
 
-    REG_ENSURE(!myRegistry->loadKey(rootKey, OUString::createFromAscii("allFromTest2"),
+    REG_ENSURE(!myRegistry->loadKey(rootKey, OUString::createFromAscii("allFromTest2"), 
                     OUString::createFromAscii("test2.rdb")), "test_registry_CppApi error 35");
-    REG_ENSURE(!myRegistry->saveKey(rootKey, OUString::createFromAscii("allFromTest2"),
+    REG_ENSURE(!myRegistry->saveKey(rootKey, OUString::createFromAscii("allFromTest2"), 
                     OUString::createFromAscii("test3.rdb")), "test_registry_CppApi error 36");
 
     REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("allFromTest3"), key1), "test_registry_CppApi error 37");
     REG_ENSURE(!key1.createKey(OUString::createFromAscii("myFirstKey2"), key2), "test_registry_CppApi error 38");
     REG_ENSURE(!key1.createKey(OUString::createFromAscii("mySecondKey2"), key3), "test_registry_CppApi error 39");
 
-    REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString::createFromAscii("allFromTest3"),
+    REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString::createFromAscii("allFromTest3"), 
                     OUString::createFromAscii("test3.rdb")), "test_registry_CppApi error 40");
-    REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString::createFromAscii("allFromTest3"),
+    REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString::createFromAscii("allFromTest3"), 
                     OUString::createFromAscii("ucrtest.rdb"), sal_True), "test_registry_CppApi error 40.a)");
 
 //     REG_ENSURE(myRegistry->mergeKey(rootKey, OUString::createFromAscii("allFromTest3"), OUString::createFromAscii("ucrtest.rdb"), sal_True)
@@ -686,7 +686,7 @@ void test_registry_CppApi()
     REG_ENSURE(!myRegistry->open(OUString::createFromAscii("destroytest.rdb"), REG_READONLY), "test_registry_CppApi error 53");
     REG_ENSURE(!myRegistry->openRootKey(rootKey), "test_registry_CppApi error 54");
 
-    REG_ENSURE(myRegistry->mergeKey(rootKey, OUString::createFromAscii("allFromTest3"),
+    REG_ENSURE(myRegistry->mergeKey(rootKey, OUString::createFromAscii("allFromTest3"), 
                     OUString::createFromAscii("test3.rdb")), "test_registry_CppApi error 55");
     REG_ENSURE(!myRegistry->destroy(OUString::createFromAscii("test3.rdb")), "test_registry_CppApi error 56");
 
diff --git a/registry/tools/checksingleton.cxx b/registry/tools/checksingleton.cxx
index 1eb3dd09ca7c..c1df735a319a 100644
--- a/registry/tools/checksingleton.cxx
+++ b/registry/tools/checksingleton.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -111,12 +111,12 @@ public:
         {}
     ~Options()
         {}
-
+    
     sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False);
 
     OString prepareHelp();
     OString prepareVersion();
-
+    
     const OString& getProgramName()
         { return m_program; }
     const OString& getIndexReg()
@@ -128,24 +128,24 @@ public:
     const OString& getBase()
         { return m_base; }
     sal_Bool forceOutput()
-        { return m_bForceOutput; }
+        { return m_bForceOutput; }	
 protected:
-    OString     m_program;
-    OString     m_indexRegName;
-    OString     m_typeRegName;
-    OString     m_base;
-    sal_Bool    m_bForceOutput;
-};
+    OString		m_program;
+    OString 	m_indexRegName;	
+    OString 	m_typeRegName;	
+    OString		m_base;
+    sal_Bool	m_bForceOutput;
+};	
 
 sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
 {
     sal_Bool bRet = sal_True;
-    sal_uInt16  i=0;
+    sal_uInt16	i=0;
 
     if (!bCmdFile)
     {
         bCmdFile = sal_True;
-
+        
         m_program = av[0];
 
         if (ac < 2)
@@ -160,7 +160,7 @@ sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
         i = 0;
     }
 
-    char    *s=NULL;
+    char	*s=NULL;
     for (; i < ac; i++)
     {
         if (av[i][0] == '-')
@@ -274,10 +274,10 @@ sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                         rargc++;
                     }
                     fclose(cmdFile);
-
+                    
                     bRet = initOptions(rargc, rargv, bCmdFile);
-
-                    for (long j=0; j < rargc; j++)
+                    
+                    for (long j=0; j < rargc; j++) 
                     {
                         free(rargv[j]);
                     }
@@ -306,16 +306,16 @@ OString Options::prepareHelp()
     help += "    -f        = force the output of all found singletons.\n";
     help += "    -h|-?     = print this help message and exit.\n";
     help += prepareVersion();
-
+    
     return help;
-}
+}	
 
 OString Options::prepareVersion()
 {
     OString version("\nSun Microsystems (R) ");
     version += m_program + " Version 1.0\n\n";
     return version;
-}
+}	
 
 static Options options;
 
@@ -325,7 +325,7 @@ static sal_Bool checkSingletons(RegistryKey& singletonKey, RegistryKey& typeKey)
     sal_uInt32 size = 0;
     OUString tmpName;
     sal_Bool bRet = sal_False;
-
+    
     RegError e = typeKey.getValueInfo(tmpName, &valueType, &size);
 
     if ( e != REG_VALUE_NOT_EXISTS && e != REG_INVALID_VALUE && valueType == RG_VALUETYPE_BINARY)
@@ -334,7 +334,7 @@ static sal_Bool checkSingletons(RegistryKey& singletonKey, RegistryKey& typeKey)
         RegValue value = rtl_allocateMemory(size);
 
         typeKey.getValue(tmpName, value);
-
+        
         RegistryTypeReader reader((sal_uInt8*)value, size, sal_False);
 
         if ( reader.isValid() && reader.getTypeClass() == RT_TYPE_SINGLETON )
@@ -348,7 +348,7 @@ static sal_Bool checkSingletons(RegistryKey& singletonKey, RegistryKey& typeKey)
             {
                 bRet = sal_True;
                 OUString value2 = reader.getSuperTypeName();
-
+                
                 if ( entryKey.setValue(tmpName, RG_VALUETYPE_UNICODE,
                                        (RegValue)value2.getStr(), sizeof(sal_Unicode)* (value2.getLength()+1)) )
                 {
@@ -364,9 +364,9 @@ static sal_Bool checkSingletons(RegistryKey& singletonKey, RegistryKey& typeKey)
             }
         }
 
-        rtl_freeMemory(value);
+        rtl_freeMemory(value);	
     }
-
+    
        RegistryKeyArray subKeys;
 
     typeKey.openSubKeys(tmpName, subKeys);
@@ -382,7 +382,7 @@ static sal_Bool checkSingletons(RegistryKey& singletonKey, RegistryKey& typeKey)
         }
     }
     return bRet;
-}
+}	
 
 #if (defined UNX) || (defined OS2) || (defined __MINGW32__)
 int main( int argc, char * argv[] )
@@ -397,7 +397,7 @@ int _cdecl main( int argc, char * argv[] )
 
     OUString indexRegName( convertToFileUrl(options.getIndexReg()) );
     OUString typeRegName( convertToFileUrl(options.getTypeReg()) );
-
+    
     Registry indexReg;
     Registry typeReg;
 
@@ -444,7 +444,7 @@ int _cdecl main( int argc, char * argv[] )
     {
         typeKey = typeRoot;
     }
-
+        
     if ( indexRoot.createKey(OUString::createFromAscii("SINGLETONS"), singletonKey) )
     {
         fprintf(stderr, "%s: open/create SINGLETONS key of registry \"%s\" failed\n",
@@ -471,8 +471,8 @@ int _cdecl main( int argc, char * argv[] )
             fprintf(stderr, "%s: destroy registry \"%s\" failed\n",
                     options.getProgramName().getStr(), options.getIndexReg().getStr());
             exit(10);
-        }
-    }
+        }		
+    }	
     if ( typeReg.close() )
     {
         fprintf(stderr, "%s: closing registry \"%s\" failed\n",
diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx
index ec821a314fcb..1aab2adc8c90 100644
--- a/registry/tools/regcompare.cxx
+++ b/registry/tools/regcompare.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -124,12 +124,12 @@ public:
         {}
     ~Options()
         {}
-
+    
     sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False);
 
     OString prepareHelp();
     OString prepareVersion();
-
+    
     const OString& getProgramName()
         { return m_program; }
     const OString& getRegName1()
@@ -153,26 +153,26 @@ public:
         { return m_bUnoTypeCheck; }
     bool checkUnpublished() const { return m_checkUnpublished; }
 protected:
-    OString     m_program;
-    OString     m_regName1;
-    OString     m_regName2;
-    OString     m_startKey;
-    StringSet   m_excludeKeys;
-    sal_Bool    m_bFullCheck;
-    sal_Bool    m_bForceOutput;
-    sal_Bool    m_bUnoTypeCheck;
+    OString		m_program;
+    OString 	m_regName1;	
+    OString 	m_regName2;	
+    OString		m_startKey;
+    StringSet	m_excludeKeys;
+    sal_Bool	m_bFullCheck;
+    sal_Bool	m_bForceOutput;
+    sal_Bool	m_bUnoTypeCheck;
     bool m_checkUnpublished;
-};
+};	
 
 sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
 {
     sal_Bool bRet = sal_True;
-    sal_uInt16  i=0;
+    sal_uInt16	i=0;
 
     if (!bCmdFile)
     {
         bCmdFile = sal_True;
-
+        
         m_program = av[0];
 
         if (ac < 2)
@@ -187,7 +187,7 @@ sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
         i = 0;
     }
 
-    char    *s=NULL;
+    char	*s=NULL;
     for (; i < ac; i++)
     {
         if (av[i][0] == '-')
@@ -221,7 +221,7 @@ sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                     {
                         s = av[i] + 2;
                     }
-
+                    
                     if ( bFirst )
                     {
                         m_regName1 = OString(s);
@@ -342,10 +342,10 @@ sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                         rargc++;
                     }
                     fclose(cmdFile);
-
+                    
                     bRet = initOptions(rargc, rargv, bCmdFile);
-
-                    for (long j=0; j < rargc; j++)
+                    
+                    for (long j=0; j < rargc; j++) 
                     {
                         free(rargv[j]);
                     }
@@ -371,7 +371,7 @@ sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
             bRet = sal_False;
         }
     }
-
+    
     return bRet;
 }
 
@@ -400,16 +400,16 @@ OString Options::prepareHelp()
     help += "    -u|U      = additionally check types that are unpublished in registry 1.\n";
     help += "    -h|-?     = print this help message and exit.\n";
     help += prepareVersion();
-
+    
     return help;
-}
+}	
 
 OString Options::prepareVersion()
 {
     OString version("\nSun Microsystems (R) ");
     version += m_program + " Version 1.0\n\n";
     return version;
-}
+}	
 
 sal_Bool Options::matchedWithExcludeKey( const OUString& keyName)
 {
@@ -423,7 +423,7 @@ sal_Bool Options::matchedWithExcludeKey( const OUString& keyName)
     {
         if ( keyName.indexOf(*iter) == 0)
             return sal_True;
-
+        
         ++iter;
     }
 
@@ -457,11 +457,11 @@ static char const * getTypeClass(RTTypeClass typeClass)
         default:
             return "INVALID";
     }
-}
+}	
 
 static OString getFieldAccess(RTFieldAccess fieldAccess)
 {
-    OString ret;
+    OString ret;	
     if ( (fieldAccess & RT_ACCESS_INVALID) == RT_ACCESS_INVALID )
     {
         ret += OString("INVALID");
@@ -519,7 +519,7 @@ static OString getFieldAccess(RTFieldAccess fieldAccess)
         ret += OString(ret.getLength() > 0 ? ",READWRITE" : "READWRITE");
     }
     return ret;
-}
+} 
 
 static char const * getConstValueType(RTConstValue& constValue)
 {
@@ -537,10 +537,10 @@ static char const * getConstValueType(RTConstValue& constValue)
             return "sal_Int32";
         case RT_TYPE_UINT32:
             return "sal_uInt32";
-//      case RT_TYPE_INT64:
-//          return "sal_Int64";
-//      case RT_TYPE_UINT64:
-//          return "sal_uInt64";
+//		case RT_TYPE_INT64:
+//			return "sal_Int64";
+//		case RT_TYPE_UINT64:
+//			return "sal_uInt64";
         case RT_TYPE_FLOAT:
             return "float";
         case RT_TYPE_DOUBLE:
@@ -549,8 +549,8 @@ static char const * getConstValueType(RTConstValue& constValue)
             return "sal_Unicode*";
         default:
             return "NONE";
-    }
-}
+    }	
+}	
 static void printConstValue(RTConstValue& constValue)
 {
     switch (constValue.m_type)
@@ -581,10 +581,10 @@ static void printConstValue(RTConstValue& constValue)
                 sal::static_int_cast< unsigned long >(
                     constValue.m_value.aULong));
             break;
-//      case RT_TYPE_INT64:
-//          fprintf(stdout, "%d", constValue.m_value.aHyper);
-//      case RT_TYPE_UINT64:
-//          fprintf(stdout, "%d", constValue.m_value.aUHyper);
+//		case RT_TYPE_INT64:
+//			fprintf(stdout, "%d", constValue.m_value.aHyper);
+//		case RT_TYPE_UINT64:
+//			fprintf(stdout, "%d", constValue.m_value.aUHyper);
         case RT_TYPE_FLOAT:
             fprintf(stdout, "%f", constValue.m_value.aFloat);
             break;
@@ -600,8 +600,8 @@ static void printConstValue(RTConstValue& constValue)
             break;
         default:
             break;
-    }
-}
+    }	
+}	
 
 static sal_uInt32 checkConstValue(const OUString& keyName,
                                   RTTypeClass typeClass,
@@ -800,14 +800,14 @@ static sal_uInt32 checkConstValue(const OUString& keyName,
         default:
             OSL_ASSERT(false);
             break;
-    }
+    }	
     return 0;
-}
+}	
 
 static sal_uInt32 checkField(const OUString& keyName,
                              RTTypeClass typeClass,
                              sal_Bool& bDump,
-                             typereg::Reader& reader1,
+                             typereg::Reader& reader1, 
                              typereg::Reader& reader2,
                              sal_uInt16 index1,
                              sal_uInt16 index2)
@@ -863,7 +863,7 @@ static sal_uInt32 checkField(const OUString& keyName,
                 printConstValue(constValue1);
                 fprintf(stdout, "\n;");
             }
-            nError++;
+            nError++;				
         } else
         {
             nError += checkConstValue(keyName, typeClass, bDump, constValue1, constValue2, index1);
@@ -883,10 +883,10 @@ static sal_uInt32 checkField(const OUString& keyName,
                     getFieldAccess(reader1.getFieldFlags(index1)).getStr(),
                     getFieldAccess(reader1.getFieldFlags(index2)).getStr());
         }
-        nError++;
+        nError++;				
     }
 
-    if ( options.fullCheck() &&
+    if ( options.fullCheck() && 
          (reader1.getFieldDocumentation(index1) != reader2.getFieldDocumentation(index2)) )
     {
         if ( options.forceOutput() && !options.unoTypeCheck() )
@@ -919,7 +919,7 @@ static char const * getMethodMode(RTMethodMode methodMode)
         default:
             return "INVALID";
     }
-}
+} 
 
 static char const * getParamMode(RTParamMode paramMode)
 {
@@ -934,12 +934,12 @@ static char const * getParamMode(RTParamMode paramMode)
         default:
             return "INVALID";
     }
-}
+} 
 
 static sal_uInt32 checkMethod(const OUString& keyName,
                               RTTypeClass typeClass,
                               sal_Bool& bDump,
-                              typereg::Reader& reader1,
+                              typereg::Reader& reader1, 
                               typereg::Reader& reader2,
                               sal_uInt16 index)
 {
@@ -952,7 +952,7 @@ static sal_uInt32 checkMethod(const OUString& keyName,
             if ( bDump )
             {
                 fprintf(stdout, "%s: %s\n", getTypeClass(typeClass), U2S(keyName));
-                bDump = sal_False;
+                bDump = sal_False;	
             }
             fprintf(stdout, "  Method1 %d: Name1 = %s  !=  Name2 = %s\n", index,
                     U2S(reader1.getMethodName(index)),
@@ -979,7 +979,7 @@ static sal_uInt32 checkMethod(const OUString& keyName,
     }
 
     sal_uInt16 nParams1 = (sal_uInt16)reader1.getMethodParameterCount(index);
-    sal_uInt16 nParams2 = (sal_uInt16)reader2.getMethodParameterCount(index);
+    sal_uInt16 nParams2 = (sal_uInt16)reader2.getMethodParameterCount(index);	
     if ( nParams1 != nParams2 )
     {
         if ( options.forceOutput() )
@@ -1063,7 +1063,7 @@ static sal_uInt32 checkMethod(const OUString& keyName,
     }
 
     sal_uInt16 nExcep1 = (sal_uInt16)reader1.getMethodExceptionCount(index);
-    sal_uInt16 nExcep2 = (sal_uInt16)reader2.getMethodExceptionCount(index);
+    sal_uInt16 nExcep2 = (sal_uInt16)reader2.getMethodExceptionCount(index);	
     if ( nExcep1 != nExcep2 )
     {
         if ( options.forceOutput() )
@@ -1251,7 +1251,7 @@ static sal_uInt32 checkFieldsWithoutOrder(const OUString& keyName,
     sal_uInt32 nError = 0;
 
     sal_uInt16 nFields1 = (sal_uInt16)reader1.getFieldCount();
-    sal_uInt16 nFields2 = (sal_uInt16)reader2.getFieldCount();
+    sal_uInt16 nFields2 = (sal_uInt16)reader2.getFieldCount();	
     sal_uInt16 i=0, j=0;
 
     if ( nFields1 > nFields2 )
@@ -1324,11 +1324,11 @@ static sal_uInt32 checkFieldsWithoutOrder(const OUString& keyName,
             }
         }
     }
-
+    
     return nError;
 }
 
-static sal_uInt32 checkBlob(const OUString& keyName, typereg::Reader& reader1, sal_uInt32 size1,
+static sal_uInt32 checkBlob(const OUString& keyName, typereg::Reader& reader1, sal_uInt32 size1, 
                             typereg::Reader& reader2, sal_uInt32 size2)
 {
     sal_uInt32 nError = 0;
@@ -1371,7 +1371,7 @@ static sal_uInt32 checkBlob(const OUString& keyName, typereg::Reader& reader1, s
                     getTypeClass(reader2.getTypeClass()));
         }
         return ++nError;
-    }
+    }	
 
     RTTypeClass typeClass = reader1.getTypeClass();
 
@@ -1387,8 +1387,8 @@ static sal_uInt32 checkBlob(const OUString& keyName, typereg::Reader& reader1, s
             fprintf(stdout, "    TypeName1 = %s  !=  TypeName2 = %s\n",
                     U2S(reader1.getTypeName()), U2S(reader2.getTypeName()));
         }
-        nError++;
-    }
+        nError++;				
+    }	
     if ( (typeClass == RT_TYPE_INTERFACE ||
           typeClass == RT_TYPE_STRUCT ||
           typeClass == RT_TYPE_EXCEPTION) )
@@ -1422,9 +1422,9 @@ static sal_uInt32 checkBlob(const OUString& keyName, typereg::Reader& reader1, s
                 }
             }
         }
-    }
+    }	
     sal_uInt16 nFields1 = (sal_uInt16)reader1.getFieldCount();
-    sal_uInt16 nFields2 = (sal_uInt16)reader2.getFieldCount();
+    sal_uInt16 nFields2 = (sal_uInt16)reader2.getFieldCount();	
     sal_Bool bCheckNormal = sal_True;
 
     if ( (typeClass == RT_TYPE_SERVICE ||
@@ -1476,11 +1476,11 @@ static sal_uInt32 checkBlob(const OUString& keyName, typereg::Reader& reader1, s
     {
         nError += checkFieldsWithoutOrder(keyName, typeClass, bDump, reader1, reader2);
     }
-
+        
     if ( typeClass == RT_TYPE_INTERFACE )
     {
         sal_uInt16 nMethods1 = (sal_uInt16)reader1.getMethodCount();
-        sal_uInt16 nMethods2 = (sal_uInt16)reader2.getMethodCount();
+        sal_uInt16 nMethods2 = (sal_uInt16)reader2.getMethodCount();	
         if ( nMethods1 != nMethods2 )
         {
             if ( options.forceOutput() )
@@ -1511,7 +1511,7 @@ static sal_uInt32 checkBlob(const OUString& keyName, typereg::Reader& reader1, s
     if ( typeClass == RT_TYPE_SERVICE )
     {
         sal_uInt16 nReference1 = (sal_uInt16)reader1.getReferenceCount();
-        sal_uInt16 nReference2 = (sal_uInt16)reader2.getReferenceCount();
+        sal_uInt16 nReference2 = (sal_uInt16)reader2.getReferenceCount();	
 
         if ( !bCheckNormal )
         {
@@ -1533,7 +1533,7 @@ static sal_uInt32 checkBlob(const OUString& keyName, typereg::Reader& reader1, s
 
             sal_Bool bFound = sal_False;
             ::std::set< sal_uInt16 > moreReferences;
-
+            
             for (i=0; i < nReference1; i++)
             {
                 for (j=0; j < nReference2; j++)
@@ -1554,7 +1554,7 @@ static sal_uInt32 checkBlob(const OUString& keyName, typereg::Reader& reader1, s
                             fprintf(stdout, "%s: %s\n", getTypeClass(typeClass), U2S(keyName));
                             bDump = sal_False;
                         }
-                        fprintf(stdout, "  incompatible change: Reference %d ('%s') in 'r1' is not longer a reference of this service in 'r2'\n",
+                        fprintf(stdout, "  incompatible change: Reference %d ('%s') in 'r1' is not longer a reference of this service in 'r2'\n", 
                                 i, U2S(shortName(reader1.getReferenceTypeName(i))));
                     }
                     nError++;
@@ -1563,7 +1563,7 @@ static sal_uInt32 checkBlob(const OUString& keyName, typereg::Reader& reader1, s
                     bFound = sal_False;
                 }
             }
-
+            
             if ( !moreReferences.empty() )
             {
                 for (j=0; j < nReference2; j++)
@@ -1631,7 +1631,7 @@ static sal_uInt32 checkBlob(const OUString& keyName, typereg::Reader& reader1, s
                     U2S(reader1.getDocumentation()), U2S(reader2.getDocumentation()));
         }
         nError++;
-    }
+    }	
 /*
     if ( nError &&
          (!keyName.compareTo(OUString::createFromAscii("/UCR/drafts"), 11) ||
@@ -1648,9 +1648,9 @@ static sal_uInt32 checkBlob(const OUString& keyName, typereg::Reader& reader1, s
         }
         return 0;
     }
-*/
+*/        
     return nError;
-}
+}	
 
 static sal_uInt32 checkValueDifference(RegistryKey& key1, RegValueType valueType1, sal_uInt32 size1,
                                 RegistryKey& key2, RegValueType valueType2, sal_uInt32 size2)
@@ -1735,7 +1735,7 @@ static sal_uInt32 checkValueDifference(RegistryKey& key1, RegValueType valueType
         default:
             break;
         }
-
+        
         if ( bEqual)
         {
             RegValue value1 = rtl_allocateMemory(size1);
@@ -1743,7 +1743,7 @@ static sal_uInt32 checkValueDifference(RegistryKey& key1, RegValueType valueType
 
             key1.getValue(tmpName, value1);
             key2.getValue(tmpName, value2);
-
+        
             bEqual = (rtl_compareMemory(value1, value2, size1) == 0 );
 
             if ( !bEqual && valueType1 == RG_VALUETYPE_BINARY && valueType2 == RG_VALUETYPE_BINARY )
@@ -1776,7 +1776,7 @@ static sal_uInt32 checkValueDifference(RegistryKey& key1, RegValueType valueType
             }
         }
     }
-
+    
     if ( options.forceOutput() )
     {
         switch (valueType1)
@@ -1790,7 +1790,7 @@ static sal_uInt32 checkValueDifference(RegistryKey& key1, RegValueType valueType
         {
             RegValue value1 = rtl_allocateMemory(size1);
             key1.getValue(tmpName, value1);
-
+            
             switch (valueType1)
             {
             case RG_VALUETYPE_LONG:
@@ -1860,7 +1860,7 @@ static sal_uInt32 checkValueDifference(RegistryKey& key1, RegValueType valueType
                 fprintf(
                     stdout, "                       Data[%lu] = \"%s\"\n",
                     sal::static_int_cast< unsigned long >(i),
-                    valueList.getElement(i));
+                    valueList.getElement(i));		
             }
             }
             break;
@@ -1896,7 +1896,7 @@ static sal_uInt32 checkValueDifference(RegistryKey& key1, RegValueType valueType
         {
             RegValue value2 = rtl_allocateMemory(size2);
             key2.getValue(tmpName, value2);
-
+            
             switch (valueType2)
             {
             case RG_VALUETYPE_LONG:
@@ -1966,7 +1966,7 @@ static sal_uInt32 checkValueDifference(RegistryKey& key1, RegValueType valueType
                 fprintf(
                     stdout, "                       Data[%lu] = \"%s\"\n",
                     sal::static_int_cast< unsigned long >(i),
-                    valueList.getElement(i));
+                    valueList.getElement(i));		
             }
             }
             break;
@@ -1990,9 +1990,9 @@ static sal_uInt32 checkValueDifference(RegistryKey& key1, RegValueType valueType
             }
             break;
         }
-    }
-    return nError;
-}
+    }	
+    return nError;	
+}	
 
 static bool hasPublishedChildren(RegistryKey & key) {
     RegistryKeyNames subKeyNames;
@@ -2073,7 +2073,7 @@ static sal_uInt32 checkDifferences(
             {
                 bFound = sal_True;
                 keys.insert(subKeyNames1.getElement(i));
-                break;
+                break;					
             }
         }
         if ( !bFound )
@@ -2199,12 +2199,12 @@ static sal_uInt32 checkDifferences(
         }
     }
     return nError;
-}
+}	
 
 static sal_uInt32 compareKeys(RegistryKey& key1, RegistryKey& key2)
 {
     sal_uInt32 nError = 0;
-
+    
     RegValueType valueType1 = RG_VALUETYPE_NOT_DEFINED;
     RegValueType valueType2 = RG_VALUETYPE_NOT_DEFINED;
     sal_uInt32 size1 = 0;
@@ -2212,10 +2212,10 @@ static sal_uInt32 compareKeys(RegistryKey& key1, RegistryKey& key2)
     OUString tmpName;
     RegError e1 = key1.getValueInfo(tmpName, &valueType1, &size1);
     RegError e2 = key2.getValueInfo(tmpName, &valueType2, &size2);
-
+        
     if ( e1 == e2 && e1 != REG_VALUE_NOT_EXISTS && e1 != REG_INVALID_VALUE )
     {
-        nError += checkValueDifference(key1, valueType1, size1, key2, valueType2, size2);
+        nError += checkValueDifference(key1, valueType1, size1, key2, valueType2, size2);	
     } else
     {
         if ( e1 != REG_INVALID_VALUE || e2 != REG_INVALID_VALUE )
@@ -2227,7 +2227,7 @@ static sal_uInt32 compareKeys(RegistryKey& key1, RegistryKey& key2)
             nError++;
         }
     }
-
+    
     RegistryKeyNames subKeyNames1;
     RegistryKeyNames subKeyNames2;
 
@@ -2254,7 +2254,7 @@ static sal_uInt32 compareKeys(RegistryKey& key1, RegistryKey& key2)
         sal_Int32 nPos = keyName.lastIndexOf( '/' );
         keyName = keyName.copy( nPos != -1 ? nPos+1 : 0 );
         if ( key1.openKey(keyName, subKey1) )
-        {
+        {	
             if ( options.forceOutput() )
             {
                 fprintf(stdout, "ERROR: could not open key \"%s\" in registry \"%s\"\n",
@@ -2281,7 +2281,7 @@ static sal_uInt32 compareKeys(RegistryKey& key1, RegistryKey& key2)
     }
 
     return nError;
-}
+}	
 
 #if (defined UNX) || (defined OS2) || defined __MINGW32__
 int main( int argc, char * argv[] )
@@ -2296,7 +2296,7 @@ int _cdecl main( int argc, char * argv[] )
 
     OUString regName1( convertToFileUrl(options.getRegName1()) );
     OUString regName2( convertToFileUrl(options.getRegName2()) );
-
+    
     Registry reg1;
     Registry reg2;
 
@@ -2347,22 +2347,22 @@ int _cdecl main( int argc, char * argv[] )
                     options.getProgramName().getStr(), options.getRegName2().getStr());
             exit(8);
         }
-
+        
         key1 = sk1;
         key2 = sk2;
     }
-
+        
     sal_uInt32 nError = compareKeys(key1, key2);
     if ( nError )
     {
         if ( options.unoTypeCheck() )
         {
-            fprintf(stdout, "%s: registries are incompatible: %lu differences!\n",
+            fprintf(stdout, "%s: registries are incompatible: %lu differences!\n", 
                     options.getProgramName().getStr(),
                     sal::static_int_cast< unsigned long >(nError));
         } else
         {
-            fprintf(stdout, "%s: registries contain %lu differences!\n",
+            fprintf(stdout, "%s: registries contain %lu differences!\n", 
                     options.getProgramName().getStr(),
                     sal::static_int_cast< unsigned long >(nError));
         }
@@ -2370,11 +2370,11 @@ int _cdecl main( int argc, char * argv[] )
     {
         if ( options.unoTypeCheck() )
         {
-            fprintf(stdout, "%s: registries are compatible!\n",
+            fprintf(stdout, "%s: registries are compatible!\n", 
                     options.getProgramName().getStr());
         } else
         {
-            fprintf(stdout, "%s: registries are equal!\n",
+            fprintf(stdout, "%s: registries are equal!\n", 
                     options.getProgramName().getStr());
         }
     }
diff --git a/registry/tools/regmerge.cxx b/registry/tools/regmerge.cxx
index 81568a282128..c95ee72c5afa 100644
--- a/registry/tools/regmerge.cxx
+++ b/registry/tools/regmerge.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,8 +33,8 @@
 #include <string.h>
 
 #include "registry/registry.hxx"
-#include    <rtl/ustring.hxx>
-#include    <rtl/alloc.h>
+#include	<rtl/ustring.hxx>
+#include	<rtl/alloc.h>
 #include <osl/process.h>
 #include <osl/diagnose.h>
 #include <osl/thread.h>
@@ -95,7 +95,7 @@ char* realargv[2048];
 static void dumpHelp()
 {
     fprintf(stderr, "using: regmerge [-v|--verbose] mergefile mergeKeyName regfile_1 ... regfile_n\n");
-    fprintf(stderr, "       regmerge @regcmds\nOptions:\n");
+    fprintf(stderr, "       regmerge @regcmds\nOptions:\n");    
     fprintf(stderr, "  -v, --verbose : verbose output on stdout.\n");
     fprintf(stderr, "  mergefile     : specifies the merged registry file. If this file doesn't exists,\n");
     fprintf(stderr, "                  it is created.\n");
@@ -106,10 +106,10 @@ static void dumpHelp()
 
 static bool checkCommandFile(char* cmdfile)
 {
-    FILE    *commandfile;
-    char    option[256];
+    FILE	*commandfile;
+    char 	option[256];
     bool    bVerbose = false;
-
+    
     commandfile = fopen(cmdfile+1, "r");
     if( commandfile == NULL )
     {
@@ -134,7 +134,7 @@ static bool checkCommandFile(char* cmdfile)
                         fprintf(stderr, "ERROR: unknown option \"%s\"\n", option);
                         dumpHelp();
                         exit(-1);
-                    }
+                    }    
                 }else
                 {
                     realargv[realargc]= strdup(option);
@@ -151,15 +151,15 @@ static bool checkCommandFile(char* cmdfile)
     }
 
     return bVerbose;
-}
+}	
 
 static bool checkCommandArgs(int argc, char **argv)
 {
     bool bVerbose = false;
-
+    
     realargc = 0;
 
-    for (int i=0; i<argc; i++)
+    for (int i=0; i<argc; i++)        
     {
         if (argv[i][0]== '@')
         {
@@ -187,7 +187,7 @@ static bool checkCommandArgs(int argc, char **argv)
     }
 
     return bVerbose;
-}
+}	
 
 static void cleanCommandArgs()
 {
@@ -195,7 +195,7 @@ static void cleanCommandArgs()
     {
         free(realargv[i]);
     }
-}
+}	
 
 
 
diff --git a/registry/tools/regview.cxx b/registry/tools/regview.cxx
index 88c1632de867..d46c2fa76cd9 100644
--- a/registry/tools/regview.cxx
+++ b/registry/tools/regview.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
 #include <stdio.h>
 
 #include "registry/registry.h"
-#include    <rtl/ustring.hxx>
-#include    <rtl/alloc.h>
+#include	<rtl/ustring.hxx>
+#include	<rtl/alloc.h>
 #include <osl/process.h>
 #include <osl/diagnose.h>
 #include <osl/thread.h>
@@ -95,8 +95,8 @@ int main( int argc, char * argv[] )
 int _cdecl main( int argc, char * argv[] )
 #endif
 {
-    RegHandle       hReg;
-    RegKeyHandle    hRootKey, hKey;
+    RegHandle 		hReg;
+    RegKeyHandle	hRootKey, hKey;
 
     if (argc < 2 || argc > 3)
     {
@@ -107,7 +107,7 @@ int _cdecl main( int argc, char * argv[] )
     OUString regName( convertToFileUrl(argv[1]) );
     if (reg_openRegistry(regName.pData, &hReg, REG_READONLY))
     {
-        fprintf(stderr, "open registry \"%s\" failed\n", argv[1]);
+        fprintf(stderr, "open registry \"%s\" failed\n", argv[1]); 
         exit(1);
     }
 
@@ -120,39 +120,39 @@ int _cdecl main( int argc, char * argv[] )
             {
                 if (reg_dumpRegistry(hKey))
                 {
-                    fprintf(stderr, "dumping registry \"%s\" failed\n", argv[1]);
+                    fprintf(stderr, "dumping registry \"%s\" failed\n", argv[1]); 
                 }
-
+                
                 if (reg_closeKey(hKey))
                 {
-                    fprintf(stderr, "closing key \"%s\" of registry \"%s\" failed\n",
-                            argv[2], argv[1]);
+                    fprintf(stderr, "closing key \"%s\" of registry \"%s\" failed\n", 
+                            argv[2], argv[1]); 
                 }
             } else
             {
-                fprintf(stderr, "key \"%s\" not exists in registry \"%s\"\n",
-                        argv[2], argv[1]);
+                fprintf(stderr, "key \"%s\" not exists in registry \"%s\"\n", 
+                        argv[2], argv[1]); 
             }
         } else
         {
             if (reg_dumpRegistry(hRootKey))
             {
-                fprintf(stderr, "dumping registry \"%s\" failed\n", argv[1]);
+                fprintf(stderr, "dumping registry \"%s\" failed\n", argv[1]); 
             }
         }
 
         if (reg_closeKey(hRootKey))
         {
-            fprintf(stderr, "closing root key of registry \"%s\" failed\n", argv[1]);
+            fprintf(stderr, "closing root key of registry \"%s\" failed\n", argv[1]); 
         }
     } else
     {
-        fprintf(stderr, "open root key of registry \"%s\" failed\n", argv[1]);
+        fprintf(stderr, "open root key of registry \"%s\" failed\n", argv[1]); 
     }
 
     if (reg_closeRegistry(hReg))
     {
-        fprintf(stderr, "closing registry \"%s\" failed\n", argv[1]);
+        fprintf(stderr, "closing registry \"%s\" failed\n", argv[1]); 
         exit(1);
     }
 
diff --git a/registry/workben/regspeed.cxx b/registry/workben/regspeed.cxx
index 4cf828986abd..fb9cb41ef767 100644
--- a/registry/workben/regspeed.cxx
+++ b/registry/workben/regspeed.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,8 +37,8 @@
 #include <sys/types.h>
 
 #include "registry/registry.h"
-#include    <rtl/ustring.hxx>
-#include    <rtl/alloc.h>
+#include	<rtl/ustring.hxx>
+#include	<rtl/alloc.h>
 
 using namespace std;
 
@@ -51,7 +51,7 @@ class MyTimer
 public:
     void start() { _ftime( &m_start ); };
     void stop()
-    {
+    { 	
         _ftime( &m_stop );
         m_diff = difftime(m_stop.time, m_start.time);
         if (m_stop.millitm > m_start.millitm)
@@ -82,7 +82,7 @@ class MyTimer
 public:
     void start() { ftime( &m_start ); };
     void stop()
-    {
+    { 	
         ftime( &m_stop );
         m_diff = difftime(m_stop.time, m_start.time);
         if (m_stop.millitm > m_start.millitm)
@@ -111,95 +111,95 @@ int main( int argc, char * argv[] )
 int _cdecl main( int argc, char * argv[] )
 #endif
 {
-    RegHandle       hReg;
-    RegKeyHandle    hRootKey, hKey, hSubKey, hSubSubKey;
-    OUString        sName1(RTL_CONSTASCII_USTRINGPARAM("regkey"));
-    OUString        sName2(RTL_CONSTASCII_USTRINGPARAM("regSubkey"));
-    OUString        sName3(RTL_CONSTASCII_USTRINGPARAM("regSubSubkey"));
-    OUString        keyName1;
-    OUString        keyName2;
-    OUString        keyName3;
-    int             S1 = 10;
-    int             S2 = 10;
-    int             S3 = 10;
-    MyTimer         aTimer;
+    RegHandle 		hReg;
+    RegKeyHandle	hRootKey, hKey, hSubKey, hSubSubKey;
+    OUString 		sName1(RTL_CONSTASCII_USTRINGPARAM("regkey"));
+    OUString 		sName2(RTL_CONSTASCII_USTRINGPARAM("regSubkey"));
+    OUString 		sName3(RTL_CONSTASCII_USTRINGPARAM("regSubSubkey"));
+    OUString 		keyName1;
+    OUString 		keyName2;
+    OUString 		keyName3;
+    int 			S1 = 10;
+    int 			S2 = 10;
+    int 			S3 = 10;
+    MyTimer			aTimer;
 
     if (argc < 4)
     {
         cerr << "using regspeed count1 count2 count3\n";
-        exit(1);
-    }
+        exit(1);		
+    }	
 
     S1 = atoi(argv[1]);
     S2 = atoi(argv[2]);
     S3 = atoi(argv[3]);
 
-    OUString speedReg( RTL_CONSTASCII_USTRINGPARAM("speed.reg"));
+    OUString speedReg( RTL_CONSTASCII_USTRINGPARAM("speed.reg"));	
     if (reg_createRegistry(speedReg.pData, &hReg))
     {
-        cout << "creating registry \"test.reg\" failed\n";
+        cout << "creating registry \"test.reg\" failed\n"; 
     } else
     {
         if (reg_openRootKey(hReg, &hRootKey))
         {
-            cout << "open root key \"test.reg\" failed\n";
+            cout << "open root key \"test.reg\" failed\n"; 
         } else
         {
             printf("\n %d keys anlegen, oeffnen und schliessen dauert ... ", (S1 * S2 * S3));
             aTimer.start();
-
+            
             for (sal_Int32 i=0; i < S1; i++)
             {
                 keyName1 = sName1;
                 keyName1 += OUString().valueOf(i);
-                if (reg_createKey(hRootKey, keyName1.pData, &hKey))
-                    cout << "creating key \"" << OUStringToOString(keyName1, RTL_TEXTENCODING_ASCII_US).getStr()
-                         << "\" failed\n";
+                if (reg_createKey(hRootKey, keyName1.pData, &hKey))	
+                    cout << "creating key \"" << OUStringToOString(keyName1, RTL_TEXTENCODING_ASCII_US).getStr() 
+                         << "\" failed\n"; 
 
                 for (sal_Int32 j=0; j < S2; j++)
                 {
                     keyName2 = sName2;
                     keyName2 += OUString().valueOf(j);
-                    if (reg_createKey(hKey, keyName2.pData, &hSubKey))
+                    if (reg_createKey(hKey, keyName2.pData, &hSubKey))	
                         cout << "creating key \"" << OUStringToOString(keyName2, RTL_TEXTENCODING_ASCII_US).getStr()
-                             << "\" failed\n";
+                             << "\" failed\n"; 
 
                         for (sal_Int32 n=0; n < S3; n++)
                         {
                             keyName3 = sName3;
                             keyName3 += OUString().valueOf(n);
-                            if (reg_createKey(hSubKey, keyName3.pData, &hSubSubKey))
+                            if (reg_createKey(hSubKey, keyName3.pData, &hSubSubKey))	
                                 cout << "creating key \"" << OUStringToOString(keyName3, RTL_TEXTENCODING_ASCII_US).getStr()
-                                     << "\" failed\n";
+                                     << "\" failed\n"; 
 
                             if (reg_closeKey(hSubSubKey))
-                                cout << "closing key \"" << OUStringToOString(keyName3, RTL_TEXTENCODING_ASCII_US).getStr()
-                                     << "\" failed\n";
+                                cout << "closing key \"" << OUStringToOString(keyName3, RTL_TEXTENCODING_ASCII_US).getStr() 
+                                     << "\" failed\n";						
                         }
 
                     if (reg_closeKey(hSubKey))
-                        cout << "closing key \"" << OUStringToOString(keyName2, RTL_TEXTENCODING_ASCII_US).getStr()
-                             << "\" failed\n";
+                        cout << "closing key \"" << OUStringToOString(keyName2, RTL_TEXTENCODING_ASCII_US).getStr() 
+                             << "\" failed\n";						
                 }
 
                 if (reg_closeKey(hKey))
                     cout << "closing key \"" << OUStringToOString(keyName1, RTL_TEXTENCODING_ASCII_US).getStr()
-                         << "\" failed\n";
+                         << "\" failed\n";						
             }
-
+    
             aTimer.stop();
 
             printf("\n %d keys oeffnen und schliessen dauert ... ", (S1 * S2 * S3));
             aTimer.start();
-
+            
             for (sal_Int32 i=0; i < S1; i++)
             {
                 keyName1 = OUString::createFromAscii("/");
                 keyName1 += sName1;
                 keyName1 += OUString().valueOf(i);
-                if (reg_openKey(hRootKey, keyName1.pData, &hKey))
+                if (reg_openKey(hRootKey, keyName1.pData, &hKey))	
                     cout << "open key \"" << OUStringToOString(keyName1, RTL_TEXTENCODING_ASCII_US).getStr()
-                         << "\" failed\n";
+                         << "\" failed\n"; 
 
                 for (sal_Int32 j=0; j < S2; j++)
                 {
@@ -209,9 +209,9 @@ int _cdecl main( int argc, char * argv[] )
                     keyName2 += OUString::createFromAscii("/");
                     keyName2 += sName2;
                     keyName2 += OUString().valueOf(j);
-                    if (reg_openKey(hRootKey, keyName2.pData, &hSubKey))
+                    if (reg_openKey(hRootKey, keyName2.pData, &hSubKey))	
                         cout << "open key \"" << OUStringToOString(keyName2, RTL_TEXTENCODING_ASCII_US).getStr()
-                             << "\" failed\n";
+                             << "\" failed\n"; 
 
                         for (sal_Int32 n=0; n < S3; n++)
                         {
@@ -224,48 +224,48 @@ int _cdecl main( int argc, char * argv[] )
                             keyName3 += OUString::createFromAscii("/");
                             keyName3 += sName3;
                             keyName3 += OUString().valueOf(n);
-                            if (reg_openKey(hRootKey, keyName3.pData, &hSubSubKey))
+                            if (reg_openKey(hRootKey, keyName3.pData, &hSubSubKey))	
                                 cout << "open key \"" << OUStringToOString(keyName3, RTL_TEXTENCODING_ASCII_US).getStr()
-                                     << "\" failed\n";
+                                     << "\" failed\n"; 
 
                             if (reg_closeKey(hSubSubKey))
                                 cout << "open key \"" << OUStringToOString(keyName3, RTL_TEXTENCODING_ASCII_US).getStr()
-                                     << "\" failed\n";
+                                     << "\" failed\n";						
                         }
 
                     if (reg_closeKey(hSubKey))
-                        cout << "closing key \"" << OUStringToOString(keyName2, RTL_TEXTENCODING_ASCII_US).getStr()
-                             << "\" failed\n";
+                        cout << "closing key \"" << OUStringToOString(keyName2, RTL_TEXTENCODING_ASCII_US).getStr() 
+                             << "\" failed\n";						
                 }
 
                 if (reg_closeKey(hKey))
                     cout << "closing key \"" << OUStringToOString(keyName1, RTL_TEXTENCODING_ASCII_US).getStr()
-                         << "\" failed\n";
+                         << "\" failed\n";						
             }
-
+    
             aTimer.stop();
 
             printf("\n 1 key oeffnen und schliessen dauert ... ");
             aTimer.start();
 
-            if (reg_openKey(hRootKey, keyName3.pData, &hSubSubKey))
-                cout << "open key \"" << OUStringToOString(keyName3, RTL_TEXTENCODING_ASCII_US).getStr()
-                     << "\" failed\n";
+            if (reg_openKey(hRootKey, keyName3.pData, &hSubSubKey))	
+                cout << "open key \"" << OUStringToOString(keyName3, RTL_TEXTENCODING_ASCII_US).getStr() 
+                     << "\" failed\n"; 
 
             if (reg_closeKey(hSubSubKey))
-                cout << "open key \"" << OUStringToOString(keyName3, RTL_TEXTENCODING_ASCII_US).getStr()
-                     << "\" failed\n";
+                cout << "open key \"" << OUStringToOString(keyName3, RTL_TEXTENCODING_ASCII_US).getStr() 
+                     << "\" failed\n";						
 
             aTimer.stop();
 
         }
-
+        
         if (reg_closeKey(hRootKey))
-            cout << "closing root key failed\n";
+            cout << "closing root key failed\n";						
         if (reg_closeRegistry(hReg))
-            cout << "\t41. closing registry \"test.reg\" failed\n";
+            cout << "\t41. closing registry \"test.reg\" failed\n"; 
     }
-
+    
     return(0);
 }
 
diff --git a/registry/workben/regtest.cxx b/registry/workben/regtest.cxx
index b3b2f5004755..d0a306282620 100644
--- a/registry/workben/regtest.cxx
+++ b/registry/workben/regtest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,8 +33,8 @@
 #include <stdio.h>
 
 #include "registry/registry.h"
-#include    <rtl/ustring.hxx>
-#include    <rtl/alloc.h>
+#include	<rtl/ustring.hxx>
+#include	<rtl/alloc.h>
 
 using namespace std;
 using namespace rtl;
@@ -45,45 +45,45 @@ int main()
 int _cdecl main()
 #endif
 {
-    RegHandle       hReg;
-    RegKeyHandle    hRootKey, hKey1, hKey2, hKey3, hKey4, hKey5;
+    RegHandle 		hReg;
+    RegKeyHandle	hRootKey, hKey1, hKey2, hKey3, hKey4, hKey5;
 
-    cout << "\n     Simple Registry Test !!!     \n\n";
+    cout << "\n     Simple Registry Test !!!     \n\n";	
 
     if (reg_createRegistry(OUString::createFromAscii("test4.rdb").pData, &hReg))
-        cout << "\t0. creating registry \"test4.rdb\" failed\n";
+        cout << "\t0. creating registry \"test4.rdb\" failed\n"; 
     else
-        cout << "0. registry test4.rdb is created\n";
+        cout << "0. registry test4.rdb is created\n"; 
 
     if (reg_openRootKey(hReg, &hRootKey))
-        cout << "1. open root key \"test4.rdb\" failed\n";
+        cout << "1. open root key \"test4.rdb\" failed\n"; 
     else
-        cout << "1. root key of \"test4.rdb\" is opened\n";
-
-    if (reg_createKey(hRootKey, OUString::createFromAscii("myFirstKey").pData, &hKey1))
-        cout << "\t2. creating key \"myFirstKey\" failed\n";
+        cout << "1. root key of \"test4.rdb\" is opened\n"; 
+    
+    if (reg_createKey(hRootKey, OUString::createFromAscii("myFirstKey").pData, &hKey1))	
+        cout << "\t2. creating key \"myFirstKey\" failed\n"; 
     else
-        cout << "2. key \"myFirstKey\" is created\n";
+        cout << "2. key \"myFirstKey\" is created\n"; 
     if (reg_createKey(hRootKey, OUString::createFromAscii("mySecondKey").pData, &hKey2))
-        cout << "\t3. creating key \"mySecondKey\" failed\n";
+        cout << "\t3. creating key \"mySecondKey\" failed\n"; 
     else
-        cout << "3. key \"mySecondKey\" is created\n";
+        cout << "3. key \"mySecondKey\" is created\n"; 
     if (reg_createKey(hKey1, OUString::createFromAscii("myFirstSubKey").pData, &hKey3))
-        cout << "\t4. creating subkey \"myFirstSubKey\" failed\n";
+        cout << "\t4. creating subkey \"myFirstSubKey\" failed\n"; 
     else
-        cout << "4. subkey \"myFirstSubKey\" is created\n";
+        cout << "4. subkey \"myFirstSubKey\" is created\n"; 
     if (reg_createKey(hKey1, OUString::createFromAscii("mySecondSubKey").pData, &hKey4))
-        cout << "\t5. creating subkey \"mySecondSubKey\" failed\n";
+        cout << "\t5. creating subkey \"mySecondSubKey\" failed\n"; 
     else
-        cout << "5. subkey \"mySecondSubKey\" is created\n";
+        cout << "5. subkey \"mySecondSubKey\" is created\n"; 
     if (reg_createKey(hRootKey, OUString::createFromAscii("myThirdKey").pData, &hKey5))
-        cout << "\t6. creating key \"myThirdKey\" is created\n\n";
+        cout << "\t6. creating key \"myThirdKey\" is created\n\n"; 
     else
-        cout << "6. key \"myThirdKey\" is created\n\n";
+        cout << "6. key \"myThirdKey\" is created\n\n"; 
+    
 
-
-    RegKeyHandle*   phSubKeys;
-    sal_uInt32      nSubKeys;
+    RegKeyHandle* 	phSubKeys;
+    sal_uInt32		nSubKeys;
     if (reg_openSubKeys(hRootKey, OUString::createFromAscii("myFirstKey").pData, &phSubKeys, &nSubKeys))
         cout << "\t7. open subkeys of \"myfirstKey\" failed\n";
     else
@@ -99,23 +99,23 @@ int _cdecl main()
         cout << "\t8. close subkeys of \"myfirstKey\" failed\n\n";
     else
         cout << "8. close " << nSubKeys << "subkeys of \"myfirstKey\"\n\n";
-
+    
 
     char* Value=(char*)"Mein erster Value";
     if (reg_setValue(hRootKey, OUString::createFromAscii("mySecondKey").pData, RG_VALUETYPE_STRING, Value, 18))
         cout << "\t9. setValue of key \"mySecondKey\" failed\n";
     else
         cout << "9. setValue (string Value)  of key \"mySecondKey\"\n";
-
-    RegValueType    valueType;
-    sal_uInt32      valueSize;
-    sal_Char*       readValue;
+    
+    RegValueType 	valueType;
+    sal_uInt32		valueSize;
+    sal_Char*		readValue;
     if (reg_getValueInfo(hRootKey, OUString::createFromAscii("mySecondKey").pData, &valueType, &valueSize))
         cout << "\t10. getValueInfo of key \"mySecondKey\" failed\n";
     else
         cout << "10. getValueInfo of key \"mySecondKey\"\n";
 
-    readValue = (sal_Char*)rtl_allocateMemory(valueSize);
+    readValue = (sal_Char*)rtl_allocateMemory(valueSize);	
     if (reg_getValue(hKey2, OUString().pData, readValue))
         cout << "\t11. getValue of key \"mySecondKey\" failed\n";
     else
@@ -124,99 +124,99 @@ int _cdecl main()
 
         cout << "read Value,\n\tvalueType = " << (long)valueType
               << "\n\tvalueSize = " << valueSize
-             << "\n\tvalue = " << readValue << "\n\n";
+             << "\n\tvalue = " << readValue << "\n\n"; 
     }
-    rtl_freeMemory(readValue);
+    rtl_freeMemory(readValue);	
 
     if (reg_closeKey(hKey1) ||
         reg_closeKey(hKey3) ||
         reg_closeKey(hKey4))
-        cout << "\t12. closing \"myFirstKey\" \"myfistSubKey\" \"mySecondSubKey\" failed\n";
+        cout << "\t12. closing \"myFirstKey\" \"myfistSubKey\" \"mySecondSubKey\" failed\n"; 
     else
-        cout << "12. keys \"myFirstKey\" \"myfistSubKey\" \"mySecondSubKey\" are closed\n";
+        cout << "12. keys \"myFirstKey\" \"myfistSubKey\" \"mySecondSubKey\" are closed\n"; 
 
     if (reg_deleteKey(hRootKey, OUString::createFromAscii("myFirstKey").pData))
         cout << "13.\t delete key \"myFirstKey\" failed\n";
     else
-        cout << "13. key \"myFirstKey\" is deleted\n";
-
+        cout << "13. key \"myFirstKey\" is deleted\n"; 
+        
     if (reg_closeKey(hKey2))
-        cout << "\t14. closing key \"mySecondKey\" failed\n";
+        cout << "\t14. closing key \"mySecondKey\" failed\n"; 	
     else
-        cout << "14. key \"mySecondKey\" is closed\n";
+        cout << "14. key \"mySecondKey\" is closed\n"; 
 
     if (reg_openKey(hRootKey, OUString::createFromAscii("mySecondKey").pData, &hKey2))
         cout << "\n15. open key \"mySecondKey\" failed\n";
     else
-        cout << "15. key \"mySecondKey\" is opended\n";
-
+        cout << "15. key \"mySecondKey\" is opended\n"; 
+    
     if (reg_closeKey(hKey5))
-        cout << "\t15. closing key \"myThirdSubKey\" failed\n";
+        cout << "\t15. closing key \"myThirdSubKey\" failed\n"; 	
     else
-        cout << "15. key \"myThirdSubKey\" is closed\n";
+        cout << "15. key \"myThirdSubKey\" is closed\n"; 
     if (reg_deleteKey(hRootKey, OUString::createFromAscii("myThirdKey").pData))
         cout << "\t16. delete key \"myThirdKey\" failed\n";
     else
-        cout << "16. key \"myThirdKey\" is deleted\n";
+        cout << "16. key \"myThirdKey\" is deleted\n"; 
 
     if (reg_openKey(hRootKey, OUString::createFromAscii("myThirdKey").pData, &hKey5))
         cout << "\t17. open key \"myThirdKey\" failed\n";
     else
-        cout << "17. key \"myThirdKey\" is opened\n";
+        cout << "17. key \"myThirdKey\" is opened\n"; 
 
     cout << "\n close open keys\n\n";
 
     if (reg_closeKey(hKey2))
-        cout << "\t18. closing key \"mySecondKey\" failed\n";
+        cout << "\t18. closing key \"mySecondKey\" failed\n"; 	
     else
-        cout << "18. key \"mySecondKey\" is closed\n";
+        cout << "18. key \"mySecondKey\" is closed\n"; 
 
     if (reg_closeKey(hRootKey))
-        cout << "\t19. closing root key failed\n";
+        cout << "\t19. closing root key failed\n"; 	
     else
-        cout << "19. root key is closed\n";
+        cout << "19. root key is closed\n"; 
 
     if (reg_closeRegistry(hReg))
-        cout << "\t20. closing registry \"test4.rdb\" failed\n";
+        cout << "\t20. closing registry \"test4.rdb\" failed\n"; 
     else
-        cout << "20. registry \"test4.rdb\" is closed\n";
-
+        cout << "20. registry \"test4.rdb\" is closed\n"; 
+    
     // Test loadkey
-    cout << "\nTest load key\n\n";
-
-    RegHandle       hReg2;
-    RegKeyHandle    hRootKey2, h2Key1, h2Key2, h2Key3, h2Key4, h2Key5;
+    cout << "\nTest load key\n\n"; 
+    
+    RegHandle 		hReg2;
+    RegKeyHandle	hRootKey2, h2Key1, h2Key2, h2Key3, h2Key4, h2Key5;
 
     if (reg_createRegistry(OUString::createFromAscii("test5.rdb").pData, &hReg2))
-        cout << "\t21. creating registry \"test5.rdb\" failed\n";
+        cout << "\t21. creating registry \"test5.rdb\" failed\n"; 
     else
-        cout << "21. registry \"test5.rdb\" is created\n";
-
+        cout << "21. registry \"test5.rdb\" is created\n"; 
+        
     if (reg_openRootKey(hReg2, &hRootKey2))
-        cout << "\t22. open root key of \"test5.rdb\" failed\n";
+        cout << "\t22. open root key of \"test5.rdb\" failed\n"; 
     else
-        cout << "22. root key of \"test5.rdb\" is opened\n";
-
+        cout << "22. root key of \"test5.rdb\" is opened\n"; 
+        
     if (reg_createKey(hRootKey2, OUString::createFromAscii("reg2FirstKey").pData, &h2Key1))
-        cout << "\t23. creating key \"reg2FirstKey\" failed\n";
+        cout << "\t23. creating key \"reg2FirstKey\" failed\n"; 
     else
-        cout << "23. key \"reg2FirstKey\" is created\n";
+        cout << "23. key \"reg2FirstKey\" is created\n"; 
     if (reg_createKey(hRootKey2, OUString::createFromAscii("reg2SecondKey").pData, &h2Key2))
-        cout << "\t24. creating key \"reg2SecondKey\" failed\n";
+        cout << "\t24. creating key \"reg2SecondKey\" failed\n"; 
     else
-        cout << "24. key \"reg2SecondKey\" is created\n";
+        cout << "24. key \"reg2SecondKey\" is created\n"; 
     if (reg_createKey(h2Key1, OUString::createFromAscii("reg2FirstSubKey").pData, &h2Key3))
-        cout << "\t25. creating key \"reg2FirstSubKey\" failed\n";
+        cout << "\t25. creating key \"reg2FirstSubKey\" failed\n"; 
     else
-        cout << "25. key \"reg2FirstSubKey\" is created\n";
+        cout << "25. key \"reg2FirstSubKey\" is created\n"; 
     if (reg_createKey(h2Key1, OUString::createFromAscii("reg2SecondSubKey").pData, &h2Key4))
-        cout << "\26. creating key \"reg2SecondSubKey\" failed\n";
+        cout << "\26. creating key \"reg2SecondSubKey\" failed\n"; 
     else
-        cout << "26. key \"reg2SecondSubKey\" is created\n";
+        cout << "26. key \"reg2SecondSubKey\" is created\n"; 
     if (reg_createKey(hRootKey2, OUString::createFromAscii("reg2ThirdKey").pData, &h2Key5))
-        cout << "\n27. creating key \"reg2ThirdKey\" failed\n";
+        cout << "\n27. creating key \"reg2ThirdKey\" failed\n"; 
     else
-        cout << "27. key \"reg2ThirdKey\" is created\n";
+        cout << "27. key \"reg2ThirdKey\" is created\n"; 
 
     sal_uInt32 nValue= 123456789;
     if (reg_setValue(h2Key3, OUString().pData, RG_VALUETYPE_LONG, &nValue, sizeof(sal_uInt32)))
@@ -234,106 +234,106 @@ int _cdecl main()
         cout << "\n28. all keys of \"test5.rdb\" closed\n";
 
     if (reg_closeKey(hRootKey2))
-        cout << "\t29. root key of \"test5.rdb\" failed\n";
+        cout << "\t29. root key of \"test5.rdb\" failed\n"; 
     else
-        cout << "29. root key of \"test5.rdb\" is closed\n";
-
+        cout << "29. root key of \"test5.rdb\" is closed\n"; 
+        
     if (reg_closeRegistry(hReg2))
-        cout << "\t30. registry test5.rdb is closed\n";
+        cout << "\t30. registry test5.rdb is closed\n"; 
     else
-        cout << "30. registry test5.rdb is closed\n";
-
+        cout << "30. registry test5.rdb is closed\n"; 
+        
     if (reg_openRegistry(OUString::createFromAscii("test4.rdb").pData, &hReg, REG_READWRITE))
-        cout << "\t31. registry test4.rdb is opened\n";
+        cout << "\t31. registry test4.rdb is opened\n"; 
     else
-        cout << "31. registry test4.rdb is opened\n";
+        cout << "31. registry test4.rdb is opened\n"; 
 
     if (reg_openRootKey(hReg, &hRootKey))
-        cout << "\t32. open root key of \"test4.rdb\" is failed\n";
+        cout << "\t32. open root key of \"test4.rdb\" is failed\n"; 
     else
-        cout << "32. root key of \"test4.rdb\" is opened\n";
-
-    if (reg_loadKey(hRootKey, OUString::createFromAscii("allFromTest2").pData,
+        cout << "32. root key of \"test4.rdb\" is opened\n"; 
+    
+    if (reg_loadKey(hRootKey, OUString::createFromAscii("allFromTest2").pData, 
                     OUString::createFromAscii("test5.rdb").pData))
         cout << "\n\t33. load all keys from \"test5.rdb\" under key \"allFromTest2\" failed\n";
     else
         cout << "\n33. load all keys from test5.rdb under key \"allFromTest2\"\n";
-
-    if (reg_saveKey(hRootKey, OUString::createFromAscii("allFromTest2").pData,
+    
+    if (reg_saveKey(hRootKey, OUString::createFromAscii("allFromTest2").pData, 
                     OUString::createFromAscii("test6.rdb").pData))
         cout << "\n\t34. save all keys under \"allFromTest2\" in test6.rdb\n";
     else
         cout << "\n34. save all keys under \"allFromTest2\" in test6.rdb\n";
+    
 
-
-    if (reg_createKey(hRootKey, OUString::createFromAscii("allFromTest3").pData, &hKey1))
-        cout << "\t35. creating key \"allFromTest3\" failed\n";
+    if (reg_createKey(hRootKey, OUString::createFromAscii("allFromTest3").pData, &hKey1))	
+        cout << "\t35. creating key \"allFromTest3\" failed\n"; 
     else
-        cout << "36. key \"allFromTest3\" is created\n";
+        cout << "36. key \"allFromTest3\" is created\n"; 
     if (reg_createKey(hKey1, OUString::createFromAscii("myFirstKey2").pData, &hKey2))
-        cout << "\t37. creating key \"myFirstKey2\" failed\n";
+        cout << "\t37. creating key \"myFirstKey2\" failed\n"; 
     else
-        cout << "37. key \"myFirstKey2\" is created\n";
+        cout << "37. key \"myFirstKey2\" is created\n"; 
     if (reg_createKey(hKey1, OUString::createFromAscii("mySecondKey2").pData, &hKey3))
-        cout << "\t38. creating key \"mySecondKey2\" failed\n";
+        cout << "\t38. creating key \"mySecondKey2\" failed\n"; 
     else
-        cout << "38. key \"mySecondKey2\" is created\n";
+        cout << "38. key \"mySecondKey2\" is created\n"; 
 
-    if (reg_mergeKey(hRootKey, OUString::createFromAscii("allFromTest3").pData,
+    if (reg_mergeKey(hRootKey, OUString::createFromAscii("allFromTest3").pData, 
                     OUString::createFromAscii("test6.rdb").pData, sal_False, sal_False))
         cout << "\n\t39. merge all keys under \"allFromTest2\" with all in test6.rdb\n";
     else
         cout << "\n39. merge all keys under \"allFromTest2\" with all in test6.rdb\n";
 
     if (reg_closeKey(hKey1))
-        cout << "\n\t40. closing key \"allFromTest3\" of \"test5.rdb\" failed\n";
+        cout << "\n\t40. closing key \"allFromTest3\" of \"test5.rdb\" failed\n"; 	
     else
-        cout << "\n40. closing key \"allFromTest3\" of \"test5.rdb\"\n";
+        cout << "\n40. closing key \"allFromTest3\" of \"test5.rdb\"\n"; 	 
     if (reg_closeKey(hKey2))
-        cout << "\n\t41. closing key \"myFirstKey2\" of \"test5.rdb\" failed\n";
+        cout << "\n\t41. closing key \"myFirstKey2\" of \"test5.rdb\" failed\n"; 	
     else
-        cout << "\n41. closing key \"myFirstKey2\" of \"test5.rdb\"\n";
+        cout << "\n41. closing key \"myFirstKey2\" of \"test5.rdb\"\n"; 	 
     if (reg_closeKey(hKey3))
-        cout << "\n\t42. closing key \"mySecondKey2\" of \"test5.rdb\" failed\n";
+        cout << "\n\t42. closing key \"mySecondKey2\" of \"test5.rdb\" failed\n"; 	
     else
-        cout << "\n42. closing key \"mySecondKey2\" of \"test5.rdb\"\n";
+        cout << "\n42. closing key \"mySecondKey2\" of \"test5.rdb\"\n"; 	
 
 
     if (reg_deleteKey(hRootKey, OUString::createFromAscii("/allFromTest3/reg2FirstKey/reg2FirstSubKey").pData))
         cout << "\n\t43. delete key \"/allFromTest3/reg2FirstKey/reg2FirstSubKey\" failed\n";
     else
-        cout << "\n43. key \"/allFromTest3/reg2FirstKey/reg2FirstSubKey\" is deleted\n";
+        cout << "\n43. key \"/allFromTest3/reg2FirstKey/reg2FirstSubKey\" is deleted\n"; 
 
     if (reg_openRegistry(OUString::createFromAscii("test4.rdb").pData, &hReg2, REG_READONLY))
-        cout << "\n\t44. registry test4.rdb is opened for read only\n";
+        cout << "\n\t44. registry test4.rdb is opened for read only\n"; 
     else
-        cout << "\n44. registry test4.rdb is opened for read only\n";
+        cout << "\n44. registry test4.rdb is opened for read only\n"; 
 
     RegHandle hReg3;
     if (reg_openRegistry(OUString::createFromAscii("test4.rdb").pData, &hReg3, REG_READONLY))
-        cout << "\n\t44.a). registry test4.rdb is opened for read only\n";
+        cout << "\n\t44.a). registry test4.rdb is opened for read only\n"; 
     else
-        cout << "\n44.a). registry test4.rdb is opened for read only\n";
+        cout << "\n44.a). registry test4.rdb is opened for read only\n"; 
 
     if (reg_closeRegistry(hReg2))
-        cout << "\t45. closing registry \"test4.rdb\" failed\n";
+        cout << "\t45. closing registry \"test4.rdb\" failed\n"; 
     else
-        cout << "45. registry \"test4.rdb\" is closed\n";
+        cout << "45. registry \"test4.rdb\" is closed\n"; 
 
     if (reg_closeKey(hRootKey))
-        cout << "\n\t46. closing root key of \"test4.rdb\" failed\n";
+        cout << "\n\t46. closing root key of \"test4.rdb\" failed\n"; 	
     else
-        cout << "\n46. root key of \"test4.rdb\" is closed\n";
+        cout << "\n46. root key of \"test4.rdb\" is closed\n"; 
 
     if (reg_closeRegistry(hReg))
-        cout << "\t47. closing registry \"test4.rdb\" failed\n";
+        cout << "\t47. closing registry \"test4.rdb\" failed\n"; 
     else
-        cout << "47. registry \"test4.rdb\" is closed\n";
+        cout << "47. registry \"test4.rdb\" is closed\n"; 
 
     if (reg_closeRegistry(hReg3))
-        cout << "\t47.a). closing registry \"test4.rdb\" failed\n";
+        cout << "\t47.a). closing registry \"test4.rdb\" failed\n"; 
     else
-        cout << "47.a). registry \"test4.rdb\" is closed\n";
+        cout << "47.a). registry \"test4.rdb\" is closed\n"; 
 
     return(0);
 }
diff --git a/registry/workben/test.cxx b/registry/workben/test.cxx
index d869cda1aab4..add3421d4774 100644
--- a/registry/workben/test.cxx
+++ b/registry/workben/test.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/remotebridges/examples/officeclient.cxx b/remotebridges/examples/officeclient.cxx
index 92b1469c7ac6..8d8f7831d207 100644
--- a/remotebridges/examples/officeclient.cxx
+++ b/remotebridges/examples/officeclient.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -76,7 +76,7 @@ public:     // Methods
     virtual sal_Int32 SAL_CALL run( const Sequence< OUString >& aArguments )
         throw(RuntimeException);
 
-
+    
 private: // helper methods
     void testWriter( const Reference < XComponent > & rComponent );
     void registerServices();
@@ -107,7 +107,7 @@ void OfficeClientMain::registerServices( )
         m_xSMgr->createInstance(
             OUString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" )),
         UNO_QUERY );
-
+    
     if( ! rImplementationRegistration.is() )
     {
         printf( "Couldn't create registration component\n" );
@@ -164,25 +164,25 @@ sal_Int32 OfficeClientMain::run( const Sequence< OUString > & aArguments ) throw
             if( rNamingService.is() )
             {
                 printf( "got the remote NamingService\n" );
-
+            
                 r = rNamingService->getRegisteredObject(OUString::createFromAscii("StarOffice.ServiceManager"));
-
+                
                 Reference< XMultiServiceFactory > rRemoteSMgr( r , UNO_QUERY );
-
+                
                 Reference < XComponentLoader > rLoader(
                     rRemoteSMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop" ))),
                     UNO_QUERY );
-
+                
                 if( rLoader.is() )
                 {
-
+                    
                     sal_Char *urls[] = {
                         "private:factory/swriter",
                         "private:factory/sdraw",
                         "private:factory/simpress",
                         "private:factory/scalc"
                     };
-
+                    
                     sal_Char *docu[]= {
                         "a new writer document ...\n",
                         "a new draw document ...\n",
@@ -194,14 +194,14 @@ sal_Int32 OfficeClientMain::run( const Sequence< OUString > & aArguments ) throw
                     {
                         printf( "press any key to open %s\n" , docu[i] );
                         getchar();
-
-                        Reference< XComponent > rComponent =
+                        
+                        Reference< XComponent > rComponent = 
                             rLoader->loadComponentFromURL(
                                 OUString::createFromAscii( urls[i] ) ,
                                 OUString( RTL_CONSTASCII_USTRINGPARAM("_blank")),
                                 0 ,
                                 Sequence < ::com::sun::star::beans::PropertyValue >() );
-
+                        
                         if( 0 == i )
                         {
                             testWriter( rComponent );
@@ -212,7 +212,7 @@ sal_Int32 OfficeClientMain::run( const Sequence< OUString > & aArguments ) throw
                     }
                 }
             }
-
+            
         }
         catch( ConnectionSetupException &e )
         {
@@ -241,7 +241,7 @@ sal_Int32 OfficeClientMain::run( const Sequence< OUString > & aArguments ) throw
     }
     else
     {
-        printf( "usage: (uno officeclient-component --) uno-url\n"
+        printf( "usage: (uno officeclient-component --) uno-url\n" 
                 "e.g.:  uno:socket,host=localhost,port=2002;urp;StarOffice.NamingService\n" );
         return 1;
     }
@@ -294,12 +294,12 @@ sal_Bool SAL_CALL component_writeInfo(
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
                     OUString::createFromAscii( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) );
-
+            
             const Sequence< OUString > & rSNL = getSupportedServiceNames();
             const OUString * pArray = rSNL.getConstArray();
             for ( sal_Int32 nPos = rSNL.getLength(); nPos--; )
                 xNewKey->createKey( pArray[nPos] );
-
+            
             return sal_True;
         }
         catch (InvalidRegistryException &)
@@ -314,21 +314,21 @@ void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     void * pRet = 0;
-
+    
     if (pServiceManager && rtl_str_compare( pImplName, IMPLEMENTATION_NAME ) == 0)
     {
         Reference< XSingleServiceFactory > xFactory( createSingleFactory(
             reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
             OUString::createFromAscii( pImplName ),
             CreateInstance, getSupportedServiceNames() ) );
-
+        
         if (xFactory.is())
         {
             xFactory->acquire();
             pRet = xFactory.get();
         }
     }
-
+    
     return pRet;
 }
 }
diff --git a/remotebridges/source/bridge/bridge_connection.cxx b/remotebridges/source/bridge/bridge_connection.cxx
index 7fd40f244cf3..e83472e181fb 100644
--- a/remotebridges/source/bridge/bridge_connection.cxx
+++ b/remotebridges/source/bridge/bridge_connection.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/remotebridges/source/bridge/bridge_connection.hxx b/remotebridges/source/bridge/bridge_connection.hxx
index 629f99190af2..540c224c17cb 100644
--- a/remotebridges/source/bridge/bridge_connection.hxx
+++ b/remotebridges/source/bridge/bridge_connection.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/remotebridges/source/bridge/bridge_provider.cxx b/remotebridges/source/bridge/bridge_provider.cxx
index d3f86917416e..b02d1c4b38c5 100644
--- a/remotebridges/source/bridge/bridge_provider.cxx
+++ b/remotebridges/source/bridge/bridge_provider.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,13 +62,13 @@ namespace remotebridges_bridge
     {
         g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
     }
-
+    
     void OInstanceProviderWrapper::thisAcquire( remote_InstanceProvider *p )
     {
         OInstanceProviderWrapper * m = (OInstanceProviderWrapper *) p;
         osl_incrementInterlockedCount( &(m->m_nRef ) );
     }
-
+    
     void OInstanceProviderWrapper::thisRelease( remote_InstanceProvider *p )
     {
         OInstanceProviderWrapper * m = ( OInstanceProviderWrapper *) p;
@@ -88,24 +88,24 @@ namespace remotebridges_bridge
                                 0 ,
                                 getCppuType( (RuntimeException  *)0 ).getTypeLibType() ,
                                 0 );
-
+        
         typelib_CompoundTypeDescription * pCompType = 0 ;
         getCppuType( (Exception*)0 ).getDescription( (typelib_TypeDescription **) &pCompType );
         if( ! ((typelib_TypeDescription *)pCompType)->bComplete )
         {
             typelib_typedescription_complete( (typelib_TypeDescription**) &pCompType );
         }
-
+        
         char *pValue = (char*) (*ppException)->pData;
         rtl_uString_assign( (rtl_uString ** ) pValue  , sMessage.pData );
-
+        
         *((remote_Interface**) pValue+pCompType->pMemberOffsets[1]) =
             (remote_Interface*) map.mapInterface(
                 rContext.get(), getCppuType( &rContext) );
-
+        
         typelib_typedescription_release( (typelib_TypeDescription *) pCompType );
     }
-
+    
     void OInstanceProviderWrapper::thisGetInstance(
         remote_InstanceProvider * pProvider ,
         uno_Environment *pEnvRemote,
@@ -140,12 +140,12 @@ namespace remotebridges_bridge
             {
                 Reference< XInterface > r = m->m_rProvider->getInstance(
                     OUString( pInstanceName ) );
-
+                
                 *ppRemoteI = (remote_Interface*) map.mapInterface (
                     r.get(),
                     getCppuType( (Reference< XInterface > *) 0 )
                 );
-
+                
                 if( *ppRemoteI && m->m_pBridgeCallback )
                 {
                     m->m_pBridgeCallback->objectMappedSuccesfully();
diff --git a/remotebridges/source/bridge/remote_bridge.cxx b/remotebridges/source/bridge/remote_bridge.cxx
index d29412f2d2cf..1d2af80f1441 100644
--- a/remotebridges/source/bridge/remote_bridge.cxx
+++ b/remotebridges/source/bridge/remote_bridge.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,7 +65,7 @@ namespace remotebridges_bridge
     {
         if( m_pContext )
         {
-            m_pContext->aBase.release( (uno_Context *) m_pContext );
+            m_pContext->aBase.release( (uno_Context *) m_pContext );	
         }
         if( m_pEnvRemote )
         {
@@ -84,7 +84,7 @@ namespace remotebridges_bridge
             m_pEnvRemote = 0;
         }
     }
-
+    
     Any ORemoteBridge::queryInterface( const  Type & aType ) throw(RuntimeException)
     {
         Any a = ::cppu::queryInterface(
@@ -96,7 +96,7 @@ namespace remotebridges_bridge
         {
             return a;
         }
-
+        
         return OComponentHelper::queryInterface( aType );
     }
 
@@ -151,7 +151,7 @@ namespace remotebridges_bridge
         {
             m_sName = sName;
         }
-
+        
         m_pContext = remote_createContext( pConnection,
                                            sName.pData,
                                            m_sDescription.pData,
@@ -161,7 +161,7 @@ namespace remotebridges_bridge
         {
             throw BridgeExistsException();
         }
-
+        
         m_pContext->addDisposingListener( m_pContext ,
                                           (remote_DisposingListener *) this );
 
@@ -186,7 +186,7 @@ namespace remotebridges_bridge
             m_pContext->aBase.release( (uno_Context * ) m_pContext );
             m_pContext = 0;
 
-            // forgotten exception when specifying the interface
+            // forgotten exception when specifying the interface 
             throw RuntimeException( rtl::OUString::createFromAscii("couldn't create uno-remote-environment") ,
                                     Reference < XInterface > () );
         }
@@ -221,11 +221,11 @@ namespace remotebridges_bridge
             }
 
             Type type = getCppuType( (Reference < XInterface > * ) 0 );
-
+        
             remote_Interface *pRemoteI = 0;
             uno_Any exception;
             uno_Any *pException = &exception;
-
+            
             pContext->getRemoteInstance(
                 pEnvRemote,
                 &pRemoteI,
@@ -283,7 +283,7 @@ namespace remotebridges_bridge
         return rReturn;
     }
 
-
+    
     ::rtl::OUString SAL_CALL ORemoteBridge::getName(  )
             throw(::com::sun::star::uno::RuntimeException)
     {
@@ -295,7 +295,7 @@ namespace remotebridges_bridge
     {
         return m_sDescription;
     }
-
+    
     // XTypeProvider
     Sequence< Type > SAL_CALL ORemoteBridge::getTypes(void) throw( RuntimeException )
     {
@@ -313,10 +313,10 @@ namespace remotebridges_bridge
                 pCollection = &collection;
             }
         }
-
+        
         return (*pCollection).getTypes();
     }
-
+    
     Sequence< sal_Int8 > SAL_CALL ORemoteBridge::getImplementationId(  ) throw( RuntimeException)
     {
         static OImplementationId *pId = 0;
@@ -411,7 +411,7 @@ namespace remotebridges_bridge
         }
         return *pImplName;
     }
-
+    
     Sequence< OUString > getSupportedServiceNames()
     {
         static Sequence < OUString > *pNames = 0;
@@ -424,7 +424,7 @@ namespace remotebridges_bridge
                 seqNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.bridge.Bridge" );
                 seqNames.getArray()[1] = OUString::createFromAscii( "com.sun.star.bridge.IiopBridge" );
                 seqNames.getArray()[2] = OUString::createFromAscii( "com.sun.star.bridge.UrpBridge" );
-
+                
                 pNames = &seqNames;
             }
         }
diff --git a/remotebridges/source/bridge/remote_bridge.hxx b/remotebridges/source/bridge/remote_bridge.hxx
index 53cdb0d7b766..f7319e8cf2a7 100644
--- a/remotebridges/source/bridge/remote_bridge.hxx
+++ b/remotebridges/source/bridge/remote_bridge.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,7 +49,7 @@
 namespace remotebridges_bridge
 {
     extern rtl_StandardModuleCount g_moduleCount;
-
+    
     struct MyMutex
     {
         ::osl::Mutex m_mutex;
@@ -66,19 +66,19 @@ namespace remotebridges_bridge
         ORemoteBridge();
         ~ORemoteBridge();
 
-        // XInterface
+        // XInterface 
     public:
-        ::com::sun::star::uno::Any      SAL_CALL
+        ::com::sun::star::uno::Any     	SAL_CALL
                queryInterface( const ::com::sun::star::uno::Type & aType ) throw(::com::sun::star::uno::RuntimeException);
 
-        void        SAL_CALL acquire() throw()
+        void 		SAL_CALL acquire() throw()
             { OComponentHelper::acquire(); }
-        void        SAL_CALL release() throw()
+        void 		SAL_CALL release() throw()
             { OComponentHelper::release(); }
 
     public:
         virtual void SAL_CALL disposing(); // called by OComponentHelper
-
+        
     public:
         // Methods
         virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence<
@@ -109,7 +109,7 @@ namespace remotebridges_bridge
 
     public:
         void objectMappedSuccesfully();
-
+        
     public:
         remote_Context *m_pContext;
         uno_Environment *m_pEnvRemote;
diff --git a/remotebridges/source/bridge/remotebridge.xml b/remotebridges/source/bridge/remotebridge.xml
index be5e60b59eef..dc0a32f43644 100644
--- a/remotebridges/source/bridge/remotebridge.xml
+++ b/remotebridges/source/bridge/remotebridge.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   remotebridge.uno    </module-name>
+    <module-name>	remotebridge.uno	</module-name>
     <component-description>
         <author> Joerg Budischewski </author>
-        <name>  com.sun.star.comp.remotebridges.Bridge.various </name>
+        <name>	com.sun.star.comp.remotebridges.Bridge.various </name>
         <description>
             This component initializes the bridge between two processes
             using either iiop or urp (UnoRemoteProtocol) protocol.
         </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.bridge.Bridge  </supported-service>
-        <supported-service> com.sun.star.bridge.IiopBridge  </supported-service>
-        <supported-service> com.sun.star.bridge.UrpBridge   </supported-service>
-        <service-dependency>    ... </service-dependency>
-        <type>   com.sun.star.bridge.XBridgeFactory         </type>
-        <type>   com.sun.star.bridge.XInstanceProvider      </type>
-        <type>   com.sun.star.bridge.XBridge                </type>
-        <type>   com.sun.star.bridge.BridgeExistsException  </type>
-        <type>   com.sun.star.lang.DisposedException        </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory     </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory    </type>
-        <type>   com.sun.star.lang.XInitialization          </type>
-        <type>   com.sun.star.lang.XComponent               </type>
-        <type>   com.sun.star.lang.XServiceInfo             </type>
-        <type>   com.sun.star.lang.XTypeProvider            </type>
-        <type>   com.sun.star.lang.IllegalArgumentException </type>
-        <type>   com.sun.star.lang.XInitialization          </type>
-        <type>   com.sun.star.registry.XRegistryKey         </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>   com.sun.star.uno.XWeak                     </type>
-        <type>   com.sun.star.uno.TypeClass                 </type>
-        <type>   com.sun.star.uno.XAggregation              </type>
+        <supported-service>	com.sun.star.bridge.Bridge	</supported-service>
+        <supported-service>	com.sun.star.bridge.IiopBridge	</supported-service>
+        <supported-service>	com.sun.star.bridge.UrpBridge	</supported-service>
+        <service-dependency>	...	</service-dependency>
+        <type>	 com.sun.star.bridge.XBridgeFactory         </type>
+        <type>	 com.sun.star.bridge.XInstanceProvider      </type>
+        <type>	 com.sun.star.bridge.XBridge                </type>
+        <type>	 com.sun.star.bridge.BridgeExistsException  </type>
+        <type>	 com.sun.star.lang.DisposedException	    </type>
+        <type>	 com.sun.star.lang.XMultiServiceFactory     </type>
+        <type>	 com.sun.star.lang.XSingleServiceFactory    </type>
+        <type>	 com.sun.star.lang.XInitialization          </type>
+        <type>	 com.sun.star.lang.XComponent               </type>
+        <type>	 com.sun.star.lang.XServiceInfo             </type>
+        <type>	 com.sun.star.lang.XTypeProvider            </type>
+        <type>	 com.sun.star.lang.IllegalArgumentException	</type>
+        <type>	 com.sun.star.lang.XInitialization          </type>
+        <type>	 com.sun.star.registry.XRegistryKey         </type>
+        <type>	 com.sun.star.lang.XSingleComponentFactory         	</type>
+        <type>	 com.sun.star.uno.XComponentContext                	</type>
+        <type>	 com.sun.star.uno.XWeak                     </type>
+        <type>	 com.sun.star.uno.TypeClass                 </type>
+        <type>	 com.sun.star.uno.XAggregation              </type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> rmcxt           </runtime-module-dependency>
-    <runtime-module-dependency> cppuhelper3 </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
-    <runtime-module-dependency> rmcxt3      </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	rmcxt			</runtime-module-dependency>
+    <runtime-module-dependency>	cppuhelper3	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu3		</runtime-module-dependency>
+    <runtime-module-dependency>	sal3		</runtime-module-dependency>
+    <runtime-module-dependency>	rmcxt3		</runtime-module-dependency>
 </module-description>
diff --git a/remotebridges/source/dynamicloader/dynamicloader.cxx b/remotebridges/source/dynamicloader/dynamicloader.cxx
index 93b7a3b0329c..a84bbc98f5e7 100644
--- a/remotebridges/source/dynamicloader/dynamicloader.cxx
+++ b/remotebridges/source/dynamicloader/dynamicloader.cxx
@@ -190,7 +190,7 @@ namespace dynamic_loader {
         return implname;
     }
 
-    sal_Bool SAL_CALL DynamicLoader::supportsService(const OUString & ServiceName) throw(RuntimeException)  {
+    sal_Bool SAL_CALL DynamicLoader::supportsService(const OUString & ServiceName) throw(RuntimeException)	{
         sal_Bool bSupport = sal_False;
 
         Sequence<OUString> aSNL = getSupportedServiceNames();
@@ -378,7 +378,7 @@ namespace dynamic_loader {
 
 
 extern "C" {
-    void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment **)   {
+    void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment **)	{
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
 
@@ -386,7 +386,7 @@ extern "C" {
         sal_Bool bRes = sal_False;
 
         if (pRegistryKey) {
-            try {
+            try	{
                 OUString x = OUString::createFromAscii("/");
                 x += ::dynamic_loader::DynamicLoader::implname;
                 x += OUString::createFromAscii("/UNO/SERVICES");
diff --git a/remotebridges/source/dynamicloader/dynamicloader.xml b/remotebridges/source/dynamicloader/dynamicloader.xml
index 9735629b8a09..325c5d226bab 100644
--- a/remotebridges/source/dynamicloader/dynamicloader.xml
+++ b/remotebridges/source/dynamicloader/dynamicloader.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   dynamicloader.uno   </module-name>
+    <module-name>	dynamicloader.uno	</module-name>
     <component-description>
         <author> Kay Ramme </author>
-        <name>  com.sun.star.loader.Dynamic </name>
+        <name>	com.sun.star.loader.Dynamic </name>
         <description>
            This service allows the delegation of the resolution
            of a SingleServiceFactory for a service to be
            delegated to a resolver (e.g. UnoUrlResolver).
         </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.loader.Dynamic </supported-service>
-        <service-dependency>    com.sun.star.bridge.UnoUrlResolver  </service-dependency>
-        <type>  com.sun.star.bridge.XUnoUrlResolver       </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory    </type>
-        <type>  com.sun.star.lang.XServiceInfo            </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory   </type>
-        <type>  com.sun.star.lang.XTypeProvider           </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory </type>
-        <type>  com.sun.star.uno.XComponentContext        </type>
-        <type>  com.sun.star.loader.XImplementationLoader </type>
-        <type>  com.sun.star.registry.XRegistryKey        </type>
-        <type>  com.sun.star.uno.XWeak                    </type>
-        <type>  com.sun.star.uno.XAggregation             </type>
+        <supported-service>	com.sun.star.loader.Dynamic	</supported-service>
+        <service-dependency>	com.sun.star.bridge.UnoUrlResolver	</service-dependency>
+        <type>	com.sun.star.bridge.XUnoUrlResolver		  </type>
+        <type>	com.sun.star.lang.XMultiServiceFactory	  </type>
+        <type>	com.sun.star.lang.XServiceInfo			  </type>
+        <type>	com.sun.star.lang.XSingleServiceFactory	  </type>
+        <type>	com.sun.star.lang.XTypeProvider			  </type>
+        <type>	com.sun.star.lang.XSingleComponentFactory </type>
+        <type>	com.sun.star.uno.XComponentContext        </type>
+        <type>	com.sun.star.loader.XImplementationLoader </type>
+        <type>	com.sun.star.registry.XRegistryKey		  </type>
+        <type>	com.sun.star.uno.XWeak					  </type>
+        <type>	com.sun.star.uno.XAggregation             </type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper3 </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper3	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu3		</runtime-module-dependency>
+    <runtime-module-dependency>	sal3		</runtime-module-dependency>
 </module-description>
diff --git a/remotebridges/source/factory/brdgfctr.xml b/remotebridges/source/factory/brdgfctr.xml
index 9e2abf8eef1e..5e663a0637a7 100644
--- a/remotebridges/source/factory/brdgfctr.xml
+++ b/remotebridges/source/factory/brdgfctr.xml
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   bridgefac.uno   </module-name>
+    <module-name>	bridgefac.uno	</module-name>
     <component-description>
         <author> Joerg Budischewski </author>
-        <name>  com.sun.star.comp.remotebridges.BridgeFactory </name>
+        <name>	com.sun.star.comp.remotebridges.BridgeFactory </name>
         <description>
             This component allows
             to establish a connection to another process.
         </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.bridge.BridgeFactory   </supported-service>
-        <service-dependency>    ... </service-dependency>
-        <type>   com.sun.star.bridge.XBridgeFactory                 </type>
-        <type>   com.sun.star.bridge.XInstanceProvider              </type>
-        <type>   com.sun.star.bridge.XBridge                        </type>
-        <type>   com.sun.star.bridge.BridgeExistsException          </type>
-        <type>   com.sun.star.container.XContentEnumerationAccess   </type>
-        <type>   com.sun.star.lang.DisposedException                </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory            </type>
-        <type>   com.sun.star.lang.XInitialization                  </type>
-        <type>   com.sun.star.lang.XComponent                       </type>
-        <type>   com.sun.star.lang.XServiceInfo                     </type>
-        <type>   com.sun.star.lang.XTypeProvider                    </type>
-        <type>   com.sun.star.lang.IllegalArgumentException         </type>
-        <type>   com.sun.star.lang.XInitialization                  </type>
-        <type>   com.sun.star.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
+        <supported-service>	com.sun.star.bridge.BridgeFactory	</supported-service>
+        <service-dependency>	...	</service-dependency>
+        <type>	 com.sun.star.bridge.XBridgeFactory         		</type>
+        <type>	 com.sun.star.bridge.XInstanceProvider      		</type>
+        <type>	 com.sun.star.bridge.XBridge                		</type>
+        <type>	 com.sun.star.bridge.BridgeExistsException  		</type>
+        <type>	 com.sun.star.container.XContentEnumerationAccess	</type>
+        <type>	 com.sun.star.lang.DisposedException	     		</type>
+        <type>	 com.sun.star.lang.XMultiServiceFactory     		</type>
+        <type>	 com.sun.star.lang.XSingleServiceFactory    		</type>
+        <type>	 com.sun.star.lang.XInitialization          		</type>
+        <type>	 com.sun.star.lang.XComponent               		</type>
+        <type>	 com.sun.star.lang.XServiceInfo             		</type>
+        <type>	 com.sun.star.lang.XTypeProvider            		</type>
+        <type>	 com.sun.star.lang.IllegalArgumentException 		</type>
+        <type>	 com.sun.star.lang.XInitialization          		</type>
+        <type>	 com.sun.star.registry.XRegistryKey         		</type>
+        <type>	 com.sun.star.lang.XSingleComponentFactory         	</type>
+        <type>	 com.sun.star.uno.XComponentContext                	</type>
+        <type>	 com.sun.star.uno.XWeak                     		</type>
+        <type>	 com.sun.star.uno.TypeClass                 		</type>
+        <type>	 com.sun.star.uno.XAggregation              		</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper3 </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper3	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu3		</runtime-module-dependency>
+    <runtime-module-dependency>	sal3		</runtime-module-dependency>
 </module-description>
diff --git a/remotebridges/source/factory/bridgefactory.cxx b/remotebridges/source/factory/bridgefactory.cxx
index cc56cbf1d5db..794dabc627ab 100644
--- a/remotebridges/source/factory/bridgefactory.cxx
+++ b/remotebridges/source/factory/bridgefactory.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -69,7 +69,7 @@ using namespace ::com::sun::star::container;
 namespace remotebridges_factory
 {
     rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-
+    
     struct hashOUString
     {
         size_t operator()(const OUString & s) const
@@ -83,13 +83,13 @@ namespace remotebridges_factory
                 return s1 == s2;
             }
     };
-
+    
     typedef ::std::hash_map
     <
     OUString,
     WeakReference< XBridge >,
     hashOUString,
-    equalOUString
+    equalOUString	
     > BridgeHashMap;
 
 
@@ -98,9 +98,9 @@ namespace remotebridges_factory
     OUString,
     OUString,
     hashOUString,
-    equalOUString
+    equalOUString	
     > ServiceHashMap;
-
+    
     class OBridgeFactory :
         public MyMutex,
         public OComponentHelper,
@@ -110,14 +110,14 @@ namespace remotebridges_factory
     public:
         OBridgeFactory( const Reference < XComponentContext > &rCtx );
         ~OBridgeFactory();
-
+        
     public: // XInterface
-        ::com::sun::star::uno::Any      SAL_CALL
+        ::com::sun::star::uno::Any     	SAL_CALL
             queryInterface( const ::com::sun::star::uno::Type & aType ) throw(RuntimeException);
 
-        void        SAL_CALL acquire() throw()
+        void 		SAL_CALL acquire() throw()
             { OComponentHelper::acquire(); }
-        void        SAL_CALL release() throw()
+        void 		SAL_CALL release() throw()
             { OComponentHelper::release(); }
 
     public:
@@ -133,7 +133,7 @@ namespace remotebridges_factory
             getBridge( const ::rtl::OUString& sName )
               throw(::com::sun::star::uno::RuntimeException );
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::bridge::XBridge > > SAL_CALL
-              getExistingBridges(  ) throw(::com::sun::star::uno::RuntimeException);
+              getExistingBridges(  ) throw(::com::sun::star::uno::RuntimeException);		
 
     public: //XTypeProvider
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL
@@ -149,11 +149,11 @@ namespace remotebridges_factory
     public:
         static OUString getImplementationNameStatic(  ) SAL_THROW( () );
         static Sequence< OUString >  getSupportedServiceNamesStatic() SAL_THROW( () );
-
+        
     private:
         void init();
         OUString getServiceNameForProtocol( const OUString &sProtocol );
-
+        
     private:
         Reference < XMultiComponentFactory > m_rSMgr;
         Reference < XComponentContext > m_rCtx;
@@ -176,7 +176,7 @@ namespace remotebridges_factory
     {
         g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
     }
-
+    
     void OBridgeFactory::init()
     {
         MutexGuard guard( m_mutexInit );
@@ -245,7 +245,7 @@ namespace remotebridges_factory
         }
         return sService;
     }
-
+    
     Any OBridgeFactory::queryInterface( const Type &aType ) throw(RuntimeException)
     {
         Any a = ::cppu::queryInterface(
@@ -255,7 +255,7 @@ namespace remotebridges_factory
         {
             return a;
         }
-
+        
         return OComponentHelper::queryInterface( aType );
 
     }
@@ -275,7 +275,7 @@ namespace remotebridges_factory
             m_rSMgr->createInstanceWithContext(sService, m_rCtx );
         Reference < XInitialization > rInit(rXInterface, UNO_QUERY );
         Reference < XBridge > rBridge( rInit , UNO_QUERY );
-
+        
         if( rInit.is() && rBridge.is() )
         {
             Sequence < Any > seqAny( 4 );
@@ -309,7 +309,7 @@ namespace remotebridges_factory
         BridgeHashMap::iterator ii = m_mapBridge.find( sName );
 
         Reference < XBridge > rBridge;
-
+        
         if( ii != m_mapBridge.end() )
         {
             rBridge = (*ii).second;
@@ -348,7 +348,7 @@ namespace remotebridges_factory
         Sequence < Reference < XBridge > > seq( nCount );
         if( nCount )
         {
-
+            
             for( sal_Int32 i = 0;
                  i < nCount ;
                  i ++ )
@@ -379,7 +379,7 @@ namespace remotebridges_factory
         }
         return (*pCollection).getTypes();
     }
-
+    
     Sequence< sal_Int8 > SAL_CALL OBridgeFactory::getImplementationId(  ) throw( RuntimeException)
     {
         static OImplementationId *pId = 0;
@@ -409,7 +409,7 @@ namespace remotebridges_factory
         }
         return *pName;
     }
-
+    
     Sequence< OUString > OBridgeFactory::getSupportedServiceNamesStatic()
     {
         static Sequence < OUString > *pNames = 0;
@@ -430,7 +430,7 @@ namespace remotebridges_factory
     {
         return getImplementationNameStatic();
     }
-
+    
     sal_Bool SAL_CALL OBridgeFactory::supportsService( const OUString& ServiceName ) throw(RuntimeException)
     {
         Sequence< OUString > seq = getSupportedServiceNamesStatic();
@@ -445,13 +445,13 @@ namespace remotebridges_factory
         }
         return bReturn;
     }
-
+    
     Sequence< OUString > SAL_CALL OBridgeFactory::getSupportedServiceNames(  ) throw(RuntimeException)
     {
         return getSupportedServiceNamesStatic();
     }
-
-
+    
+    
     Reference< XInterface > SAL_CALL CreateInstance(Reference< XComponentContext > const & xContext)
     {
         return Reference < XInterface > ( *new OBridgeFactory( xContext ) );
@@ -461,7 +461,7 @@ namespace remotebridges_factory
 using namespace remotebridges_factory;
 static ImplementationEntry g_entries[] =
 {
-    {   CreateInstance, OBridgeFactory::getImplementationNameStatic,
+    {	CreateInstance, OBridgeFactory::getImplementationNameStatic,
         OBridgeFactory::getSupportedServiceNamesStatic, createSingleComponentFactory ,
         &g_moduleCount.modCnt , 0
     },
@@ -474,7 +474,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 {
     return g_moduleCount.canUnload( &g_moduleCount , pTime );
 }
-
+    
 //==================================================================================================
 void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
diff --git a/remotebridges/source/factory/bridgeimpl.cxx b/remotebridges/source/factory/bridgeimpl.cxx
index a6029a7c247e..3fa4f73d12c1 100644
--- a/remotebridges/source/factory/bridgeimpl.cxx
+++ b/remotebridges/source/factory/bridgeimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ namespace remotebridges_factory {
         m_pContext( pContext )
     {
         g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
-
+        
         remote_DisposingListener::acquire = thisAcquire;
         remote_DisposingListener::release = thisRelease;
         remote_DisposingListener::disposing = thisDisposing;
@@ -71,8 +71,8 @@ namespace remotebridges_factory {
         {
             return a;
         }
-
-        return OComponentHelper::queryInterface( aType );
+        
+        return OComponentHelper::queryInterface( aType );		
     }
 
     void OBridge::disposing()
@@ -105,7 +105,7 @@ namespace remotebridges_factory {
             m_pContext = 0;
         }
     }
-
+        
 
     Reference< XInterface > OBridge::getInstance( const ::rtl::OUString& sInstanceName )
             throw(::com::sun::star::uno::RuntimeException)
@@ -139,11 +139,11 @@ namespace remotebridges_factory {
             }
 
             Type type = getCppuType( (Reference < XInterface > * ) 0 );
-
+        
             remote_Interface *pRemoteI = 0;
             uno_Any exception;
             uno_Any *pException = &exception;
-
+            
             pContext->getRemoteInstance(
                 pEnvRemote,
                 &pRemoteI,
@@ -202,11 +202,11 @@ namespace remotebridges_factory {
 
     ::rtl::OUString SAL_CALL OBridge::getName(  )
                 throw(::com::sun::star::uno::RuntimeException)
-
+    
     {
         return OUString( m_pContext->m_pName );
     }
-
+    
     ::rtl::OUString OBridge::getDescription(  )
             throw(::com::sun::star::uno::RuntimeException)
     {
@@ -229,10 +229,10 @@ namespace remotebridges_factory {
                 pCollection = &collection;
             }
         }
-
+        
         return (*pCollection).getTypes();
     }
-
+    
     Sequence< sal_Int8 > SAL_CALL OBridge::getImplementationId(  ) throw( RuntimeException)
     {
         static OImplementationId *pId = 0;
@@ -247,7 +247,7 @@ namespace remotebridges_factory {
         }
         return (*pId).getImplementationId();
     }
-
+    
     //----------------------
     // static methods
     //----------------------
diff --git a/remotebridges/source/factory/bridgeimpl.hxx b/remotebridges/source/factory/bridgeimpl.hxx
index 54daea064ae0..310a66d1740e 100644
--- a/remotebridges/source/factory/bridgeimpl.hxx
+++ b/remotebridges/source/factory/bridgeimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@
 
 namespace remotebridges_factory {
     extern rtl_StandardModuleCount g_moduleCount;
-
+    
     struct MyMutex
     {
         ::osl::Mutex m_mutex;
@@ -63,19 +63,19 @@ namespace remotebridges_factory {
         OBridge( remote_Context *pContext );
         ~OBridge();
 
-        // XInterface
+        // XInterface 
     public:
-        ::com::sun::star::uno::Any      SAL_CALL
+        ::com::sun::star::uno::Any     	SAL_CALL
                queryInterface( const ::com::sun::star::uno::Type & aType ) throw(com::sun::star::uno::RuntimeException);
 
-        void        SAL_CALL acquire() throw()
+        void 		SAL_CALL acquire() throw()
             { OComponentHelper::acquire(); }
-        void        SAL_CALL release() throw()
+        void 		SAL_CALL release() throw()
             { OComponentHelper::release(); }
 
     public:
         virtual void SAL_CALL disposing(); // called by OComponentHelper
-
+        
     public:
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
                getInstance( const ::rtl::OUString& sInstanceName )
diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
index bcdeac609dde..d7486c92b5e6 100644
--- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx
+++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,8 +53,8 @@ using namespace com::sun::star::connection;
 using namespace com::sun::star::bridge;
 using namespace com::sun::star::registry;
 
-#define SERVICENAME     "com.sun.star.bridge.UnoUrlResolver"
-#define IMPLNAME        "com.sun.star.comp.bridge.UnoUrlResolver"
+#define SERVICENAME		"com.sun.star.bridge.UnoUrlResolver"
+#define IMPLNAME		"com.sun.star.comp.bridge.UnoUrlResolver"
 
 namespace unourl_resolver
 {
@@ -91,17 +91,17 @@ OUString resolver_getImplementationName()
     }
     return *pImplName;
 }
-
+    
 //==================================================================================================
 class ResolverImpl : public WeakImplHelper2< XServiceInfo, XUnoUrlResolver >
 {
     Reference< XMultiComponentFactory > _xSMgr;
     Reference< XComponentContext > _xCtx;
-
+    
 public:
     ResolverImpl( const Reference< XComponentContext > & xSMgr );
     virtual ~ResolverImpl();
-
+    
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw(::com::sun::star::uno::RuntimeException);
@@ -179,10 +179,10 @@ Reference< XInterface > ResolverImpl::resolve( const OUString & rUnoUrl )
             OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Connector") ),
             _xCtx ),
         UNO_QUERY );
-
+    
     if (! xConnector.is())
         throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("no connector!" ) ), Reference< XInterface >() );
-
+    
     Reference< XConnection > xConnection( xConnector->connect( aConnectDescr ) );
 
     // As soon as singletons are ready, switch to singleton !
@@ -191,17 +191,17 @@ Reference< XInterface > ResolverImpl::resolve( const OUString & rUnoUrl )
             OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory") ),
             _xCtx ),
         UNO_QUERY );
-
+    
     if (! xBridgeFactory.is())
         throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("no bridge factory!" ) ), Reference< XInterface >() );
-
+    
     // bridge
     Reference< XBridge > xBridge( xBridgeFactory->createBridge(
         OUString(), aProtocolDescr,
         xConnection, Reference< XInstanceProvider >() ) );
-
+    
     Reference< XInterface > xRet( xBridge->getInstance( aInstanceName ) );
-
+    
     return xRet;
 }
 
diff --git a/remotebridges/source/unourl_resolver/uuresolver.xml b/remotebridges/source/unourl_resolver/uuresolver.xml
index c959d4c7db2e..6608a6bbc9a5 100644
--- a/remotebridges/source/unourl_resolver/uuresolver.xml
+++ b/remotebridges/source/unourl_resolver/uuresolver.xml
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   uuresolver.uno  </module-name>
+    <module-name>	uuresolver.uno	</module-name>
     <component-description>
         <author> Daniel Boelzle </author>
-        <name>  com.sun.star.comp.bridge.UnoUrlResolver </name>
+        <name>	com.sun.star.comp.bridge.UnoUrlResolver </name>
         <description>
             This component allows
             to retrieve an object reference from another process.
         </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.bridge.UnoUrlResolver </supported-service>
+        <supported-service>	com.sun.star.bridge.UnoUrlResolver </supported-service>
         <service-dependency> ... </service-dependency>
-        <type>   com.sun.star.uno.TypeClass                 </type>
-        <type>   com.sun.star.lang.XTypeProvider            </type>
-        <type>   com.sun.star.lang.XServiceInfo             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory    </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory     </type>
-        <type>   com.sun.star.lang.XComponent               </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory </type>
-        <type>  com.sun.star.uno.XComponentContext        </type>
-        <type>   com.sun.star.registry.XRegistryKey         </type>
-        <type>   com.sun.star.connection.XConnector         </type>
-        <type>   com.sun.star.bridge.XBridgeFactory         </type>
-        <type>   com.sun.star.bridge.XUnoUrlResolver        </type>
-        <type>   com.sun.star.uno.XAggregation              </type>
-        <type>   com.sun.star.uno.XWeak                     </type>
+        <type>	 com.sun.star.uno.TypeClass             	</type>
+        <type>	 com.sun.star.lang.XTypeProvider        	</type>
+        <type>	 com.sun.star.lang.XServiceInfo         	</type>
+        <type>	 com.sun.star.lang.XSingleServiceFactory	</type>
+        <type>	 com.sun.star.lang.XMultiServiceFactory 	</type>
+        <type>	 com.sun.star.lang.XComponent           	</type>
+        <type>	com.sun.star.lang.XSingleComponentFactory </type>
+        <type>	com.sun.star.uno.XComponentContext        </type>
+        <type>	 com.sun.star.registry.XRegistryKey     	</type>
+        <type>	 com.sun.star.connection.XConnector     	</type>
+        <type>	 com.sun.star.bridge.XBridgeFactory     	</type>
+        <type>	 com.sun.star.bridge.XUnoUrlResolver    	</type>
+        <type>	 com.sun.star.uno.XAggregation          	</type>
+        <type>	 com.sun.star.uno.XWeak                 	</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper3 </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper3	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu3		</runtime-module-dependency>
+    <runtime-module-dependency>	sal3		</runtime-module-dependency>
 </module-description>
diff --git a/ridljar/com/sun/star/lib/uno/typedesc/FieldDescription.java b/ridljar/com/sun/star/lib/uno/typedesc/FieldDescription.java
index ec291f1a8470..c21abb2f1a97 100644
--- a/ridljar/com/sun/star/lib/uno/typedesc/FieldDescription.java
+++ b/ridljar/com/sun/star/lib/uno/typedesc/FieldDescription.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/com/sun/star/lib/uno/typedesc/MemberDescriptionHelper.java b/ridljar/com/sun/star/lib/uno/typedesc/MemberDescriptionHelper.java
index 0bc714374d64..125c93bdf2cd 100644
--- a/ridljar/com/sun/star/lib/uno/typedesc/MemberDescriptionHelper.java
+++ b/ridljar/com/sun/star/lib/uno/typedesc/MemberDescriptionHelper.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/com/sun/star/lib/uno/typedesc/MethodDescription.java b/ridljar/com/sun/star/lib/uno/typedesc/MethodDescription.java
index 56792fc913aa..97ea16273378 100644
--- a/ridljar/com/sun/star/lib/uno/typedesc/MethodDescription.java
+++ b/ridljar/com/sun/star/lib/uno/typedesc/MethodDescription.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java b/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java
index 35113bed0d47..d83be2e2a57e 100644
--- a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java
+++ b/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/AttributeTypeInfo.java b/ridljar/com/sun/star/lib/uno/typeinfo/AttributeTypeInfo.java
index e0d7bd3cc1e2..ea7af7d70635 100644
--- a/ridljar/com/sun/star/lib/uno/typeinfo/AttributeTypeInfo.java
+++ b/ridljar/com/sun/star/lib/uno/typeinfo/AttributeTypeInfo.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java b/ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java
index 44f9f9bc371d..e794285a756b 100644
--- a/ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java
+++ b/ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/MemberTypeInfo.java b/ridljar/com/sun/star/lib/uno/typeinfo/MemberTypeInfo.java
index 384295bb9cad..4f1094ae7440 100644
--- a/ridljar/com/sun/star/lib/uno/typeinfo/MemberTypeInfo.java
+++ b/ridljar/com/sun/star/lib/uno/typeinfo/MemberTypeInfo.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@ public class MemberTypeInfo extends TypeInfo
     int m_index;
     private final Type m_unoType; // @since UDK 3.2
     private final int m_typeParameterIndex; // @since UDK 3.2
-
+    
     /**
        Create a member type info with a UNO type that cannot unambiguously be
        represented as a Java&nbsp;1.2 type.
diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/MethodTypeInfo.java b/ridljar/com/sun/star/lib/uno/typeinfo/MethodTypeInfo.java
index 4b8ebe65a260..5c7d36a93dc3 100644
--- a/ridljar/com/sun/star/lib/uno/typeinfo/MethodTypeInfo.java
+++ b/ridljar/com/sun/star/lib/uno/typeinfo/MethodTypeInfo.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/ParameterTypeInfo.java b/ridljar/com/sun/star/lib/uno/typeinfo/ParameterTypeInfo.java
index 3aecce7a6891..09d9d6bdd381 100644
--- a/ridljar/com/sun/star/lib/uno/typeinfo/ParameterTypeInfo.java
+++ b/ridljar/com/sun/star/lib/uno/typeinfo/ParameterTypeInfo.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,8 +30,8 @@ import com.sun.star.uno.Type;
 
 public class ParameterTypeInfo extends TypeInfo
 {
-    protected int       m_index;
-    protected String    m_methodName;
+    protected int 		m_index;
+    protected String 	m_methodName;
     private final Type m_unoType; // @since UDK 3.2
 
     /**
diff --git a/ridljar/com/sun/star/lib/uno/typeinfo/TypeInfo.java b/ridljar/com/sun/star/lib/uno/typeinfo/TypeInfo.java
index 40745df56b44..ec334cee35bc 100644
--- a/ridljar/com/sun/star/lib/uno/typeinfo/TypeInfo.java
+++ b/ridljar/com/sun/star/lib/uno/typeinfo/TypeInfo.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,18 +27,18 @@
 package com.sun.star.lib.uno.typeinfo;
 
 
-/** Defines a class to describe additional type information.
+/** Defines a class to describe additional type information. 
  */
 public class TypeInfo
 {
-    public static final int IN          = 0x00000001;
-    public static final int OUT         = 0x00000002;
-    public static final int UNSIGNED    = 0x00000004;
-    public static final int READONLY    = 0x00000008;
-    public static final int ONEWAY      = 0x00000010;
-    public static final int CONST       = 0x00000020;
-    public static final int ANY         = 0x00000040;
-    public static final int INTERFACE   = 0x00000080;
+    public static final int IN 			= 0x00000001;
+    public static final int OUT 		= 0x00000002;
+    public static final int UNSIGNED 	= 0x00000004;
+    public static final int READONLY	= 0x00000008;
+    public static final int ONEWAY 	 	= 0x00000010;
+    public static final int CONST		= 0x00000020;
+    public static final int ANY			= 0x00000040;
+    public static final int INTERFACE	= 0x00000080;
 
     /**
        Marks an extended attribute of an interface type as bound.
@@ -50,8 +50,8 @@ public class TypeInfo
      */
     public static final int BOUND = 0x00000100;
 
-    protected int       m_flags;
-    protected String    m_name;
+    protected int		m_flags;
+    protected String	m_name;
 
     public TypeInfo(String name, int flags)
     {
diff --git a/ridljar/com/sun/star/lib/util/DisposeListener.java b/ridljar/com/sun/star/lib/util/DisposeListener.java
index a53834148708..7b67371b6711 100644
--- a/ridljar/com/sun/star/lib/util/DisposeListener.java
+++ b/ridljar/com/sun/star/lib/util/DisposeListener.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/com/sun/star/lib/util/DisposeNotifier.java b/ridljar/com/sun/star/lib/util/DisposeNotifier.java
index 7ef8bf740d01..055157d7cf74 100644
--- a/ridljar/com/sun/star/lib/util/DisposeNotifier.java
+++ b/ridljar/com/sun/star/lib/util/DisposeNotifier.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/com/sun/star/lib/util/WeakMap.java b/ridljar/com/sun/star/lib/util/WeakMap.java
index 7c2ccde1ded1..d13b01ab4f7f 100644
--- a/ridljar/com/sun/star/lib/util/WeakMap.java
+++ b/ridljar/com/sun/star/lib/util/WeakMap.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/com/sun/star/uno/Any.java b/ridljar/com/sun/star/uno/Any.java
index d83d6a5951ea..d24b315619d9 100644
--- a/ridljar/com/sun/star/uno/Any.java
+++ b/ridljar/com/sun/star/uno/Any.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@ package com.sun.star.uno;
  * an explicit interface type, so the remote counterpart doesn't need to invoke
  * a queryInterface).
  * <p>
- * @version     $Revision: 1.11 $ $ $Date: 2008-04-11 11:11:43 $
+ * @version 	$Revision: 1.11 $ $ $Date: 2008-04-11 11:11:43 $
  */
 public class Any {
     /**
@@ -54,12 +54,12 @@ public class Any {
      * @see #getObject
      */
     protected Object _object;
-
+    
     public static final Any VOID = new Any(new Type("void", TypeClass.VOID),
                                            null);
         // do not use Type.VOID here to avoid circular dependencies between
         // static members of Any and Type
-
+    
     /**
      * Constructs a new any.
      * <p>
diff --git a/ridljar/com/sun/star/uno/Enum.java b/ridljar/com/sun/star/uno/Enum.java
index eb509096c503..f9d5769dc2c1 100644
--- a/ridljar/com/sun/star/uno/Enum.java
+++ b/ridljar/com/sun/star/uno/Enum.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,20 +27,20 @@
 
 package com.sun.star.uno;
 
-/**
- * The Enum class is the base class for all classes generated
+/** 
+ * The Enum class is the base class for all classes generated 
  * as java binding for the IDL type enum.
- * Each java mapped enum class provides static member of this class
+ * Each java mapped enum class provides static member of this class 
  * which represents the enum values.
- * You cannot create a object of this class or subclass direct, to
+ * You cannot create a object of this class or subclass direct, to 
  * avoid enum values with integer values outside the defined range.
  * <p>
- * @version     $Revision: 1.5 $ $ $Date: 2008-04-11 11:11:59 $
+ * @version 	$Revision: 1.5 $ $ $Date: 2008-04-11 11:11:59 $
  */
 public abstract class Enum {
     private int m_value;
 
-    /**
+    /**	
      * Constructs a enum value.
      * <p>
      * @param  value   the integer value of this enum value.
@@ -49,13 +49,13 @@ public abstract class Enum {
         m_value = value;
     }
 
-    /**
+    /** 
      * Get the integer value of an enum value.
      * <p>
      * @return   the integer value.
      */
     public final int getValue() {
-        return m_value;
+        return m_value;	
     }
 }
 
diff --git a/ridljar/com/sun/star/uno/IBridge.java b/ridljar/com/sun/star/uno/IBridge.java
index f1150b661e1d..cdb137c6f246 100644
--- a/ridljar/com/sun/star/uno/IBridge.java
+++ b/ridljar/com/sun/star/uno/IBridge.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/com/sun/star/uno/IEnvironment.java b/ridljar/com/sun/star/uno/IEnvironment.java
index 028aff0916d8..9db8f0c947e0 100644
--- a/ridljar/com/sun/star/uno/IEnvironment.java
+++ b/ridljar/com/sun/star/uno/IEnvironment.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/com/sun/star/uno/IFieldDescription.java b/ridljar/com/sun/star/uno/IFieldDescription.java
index f68baca7f817..002e4f99c4bf 100644
--- a/ridljar/com/sun/star/uno/IFieldDescription.java
+++ b/ridljar/com/sun/star/uno/IFieldDescription.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/com/sun/star/uno/IMapping.java b/ridljar/com/sun/star/uno/IMapping.java
index 5bb39ac890f3..ebc0d78690d2 100644
--- a/ridljar/com/sun/star/uno/IMapping.java
+++ b/ridljar/com/sun/star/uno/IMapping.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/com/sun/star/uno/IMemberDescription.java b/ridljar/com/sun/star/uno/IMemberDescription.java
index c65441f9cb96..6a01eb1e0138 100644
--- a/ridljar/com/sun/star/uno/IMemberDescription.java
+++ b/ridljar/com/sun/star/uno/IMemberDescription.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -66,7 +66,7 @@ public interface IMemberDescription {
     boolean isInterface();
 
     /**
-     * Gives the relative index of this member in the declaring
+     * Gives the relative index of this member in the declaring 
      * interface or struct (including superclasses).
      * <p>
      * @return  the relative index of this member
diff --git a/ridljar/com/sun/star/uno/IMethodDescription.java b/ridljar/com/sun/star/uno/IMethodDescription.java
index 3e1664042bb9..71910283c559 100644
--- a/ridljar/com/sun/star/uno/IMethodDescription.java
+++ b/ridljar/com/sun/star/uno/IMethodDescription.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/com/sun/star/uno/IQueryInterface.java b/ridljar/com/sun/star/uno/IQueryInterface.java
index cb9a79c8b9d4..b59e616aeb02 100644
--- a/ridljar/com/sun/star/uno/IQueryInterface.java
+++ b/ridljar/com/sun/star/uno/IQueryInterface.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/com/sun/star/uno/ITypeDescription.java b/ridljar/com/sun/star/uno/ITypeDescription.java
index 51a32c6f5484..04d5bdf292a5 100644
--- a/ridljar/com/sun/star/uno/ITypeDescription.java
+++ b/ridljar/com/sun/star/uno/ITypeDescription.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ public interface ITypeDescription {
 
     /**
      * Gets the <code>IMethodDescription</code> for every
-     * method, if this type is an interface. Otherwise
+     * method, if this type is an interface. Otherwise 
      * returns <code>null</code>.
      * <p>
      * @return  the <code>IMethodDescription[]</code>.
@@ -64,7 +64,7 @@ public interface ITypeDescription {
 
     /**
      * Gets the <code>IMethodDescription</code> for the
-     * method with the name <code>name</code>, if it exists,
+     * method with the name <code>name</code>, if it exists, 
      * otherwise returns <code>null</code>.
      * <p>
      * @return  the <code>IMethodDescription</code>.
@@ -73,7 +73,7 @@ public interface ITypeDescription {
 
     /**
      * Gets the <code>IFieldDescription</code> for every
-     * field, if this type is an interface. Otherwise
+     * field, if this type is an interface. Otherwise 
      * returns <code>null</code>.
      * <p>
      * @return  the <code>IFieldDescription[]</code>.
@@ -82,7 +82,7 @@ public interface ITypeDescription {
 
     /**
      * Gets the <code>IFieldDescription</code> for the
-     * field with the name <code>name</code>, if it exists,
+     * field with the name <code>name</code>, if it exists, 
      * otherwise returns <code>null</code>.
      * <p>
      * @return  the <code>IFieldDescription</code>.
@@ -163,7 +163,7 @@ public interface ITypeDescription {
      * @return the type name.
      */
     String getTypeName();
-
+    
     /**
      * Gets the (Java) array type name.
      *
@@ -178,7 +178,7 @@ public interface ITypeDescription {
      * @return the array type name.
      */
     String getArrayTypeName();
-
+    
     /**
      * Gets the corresponding java class for the type.
      * <p>
diff --git a/ridljar/com/sun/star/uno/Type.java b/ridljar/com/sun/star/uno/Type.java
index b87674ccdf63..c1b816fa2177 100644
--- a/ridljar/com/sun/star/uno/Type.java
+++ b/ridljar/com/sun/star/uno/Type.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/com/sun/star/uno/Union.java b/ridljar/com/sun/star/uno/Union.java
index 5edb1988c820..bc7d45f9adb7 100644
--- a/ridljar/com/sun/star/uno/Union.java
+++ b/ridljar/com/sun/star/uno/Union.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,24 +27,24 @@
 
 package com.sun.star.uno;
 
-/**
- * The Union class is the base class for all classes generated
+/** 
+ * The Union class is the base class for all classes generated 
  * as java binding for the IDL type union.
  * <p>
  * Note: The idl type <code>union<code> is currently not fully
  * integrated into the UNO framework, so don't use it.
- *
- * @version     $Revision: 1.5 $ $ $Date: 2008-04-11 11:15:07 $
+ * 
+ * @version 	$Revision: 1.5 $ $ $Date: 2008-04-11 11:15:07 $
  */
 public class Union {
     /**
      * Get the value in the union.
      * The representation of the value is an any.
      * <p>
-     *  @return the any value.
+     *	@return the any value.
      */
     public final Object getValue() {
-        return m_value;
+        return m_value;	
     }
 
     protected Object m_value;
diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java b/ridljar/com/sun/star/uno/UnoRuntime.java
index 188ea54a74a6..d1503346a703 100644
--- a/ridljar/com/sun/star/uno/UnoRuntime.java
+++ b/ridljar/com/sun/star/uno/UnoRuntime.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java b/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java
index d43acfe4727d..e9317fc683b0 100644
--- a/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java
+++ b/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader.java b/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader.java
index b0829d11a1fb..7bca00496e98 100644
--- a/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader.java
+++ b/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test.java b/ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test.java
index 2032d53ab98a..871281aa7a39 100644
--- a/ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test.java
+++ b/ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/test/com/sun/star/lib/util/WeakMap_Test.java b/ridljar/test/com/sun/star/lib/util/WeakMap_Test.java
index de605502b172..d606f89b2054 100644
--- a/ridljar/test/com/sun/star/lib/util/WeakMap_Test.java
+++ b/ridljar/test/com/sun/star/lib/util/WeakMap_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/test/com/sun/star/uno/Any_Test.java b/ridljar/test/com/sun/star/uno/Any_Test.java
index 71ecac87cc0b..e01e9f1858cc 100644
--- a/ridljar/test/com/sun/star/uno/Any_Test.java
+++ b/ridljar/test/com/sun/star/uno/Any_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/test/com/sun/star/uno/Type_Test.java b/ridljar/test/com/sun/star/uno/Type_Test.java
index 6e1cb9b9edb6..3fab05712db9 100644
--- a/ridljar/test/com/sun/star/uno/Type_Test.java
+++ b/ridljar/test/com/sun/star/uno/Type_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ridljar/test/com/sun/star/uno/UnoRuntime_Test.java b/ridljar/test/com/sun/star/uno/UnoRuntime_Test.java
index 87b6d498b971..d2501d09922a 100644
--- a/ridljar/test/com/sun/star/uno/UnoRuntime_Test.java
+++ b/ridljar/test/com/sun/star/uno/UnoRuntime_Test.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/cpprt/operators_new_delete.cxx b/sal/cpprt/operators_new_delete.cxx
index f48ce1269236..e5d8ed0c88e4 100644
--- a/sal/cpprt/operators_new_delete.cxx
+++ b/sal/cpprt/operators_new_delete.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/internal/once.h b/sal/inc/internal/once.h
index cede77feacea..440be0eb8c79 100644
--- a/sal/inc/internal/once.h
+++ b/sal/inc/internal/once.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/osl/conditn.h b/sal/inc/osl/conditn.h
index 1811bcdf2107..7c71176563ac 100644
--- a/sal/inc/osl/conditn.h
+++ b/sal/inc/osl/conditn.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ extern "C" {
 typedef void* oslCondition;
 
 typedef enum {
-    osl_cond_result_ok,     /* successful completion */
+    osl_cond_result_ok,		/* successful completion */
     osl_cond_result_error,  /* error occured, check osl_getLastSocketError() for details */
     osl_cond_result_timeout, /* blocking operation timed out */
     osl_cond_result_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
diff --git a/sal/inc/osl/conditn.hxx b/sal/inc/osl/conditn.hxx
index bfd5169bd028..74f0d829d87d 100644
--- a/sal/inc/osl/conditn.hxx
+++ b/sal/inc/osl/conditn.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
 
 
 namespace osl
-{
+{     
 
     class Condition
     {
@@ -96,26 +96,26 @@ namespace osl
         oslCondition condition;
 
         /** The underlying oslCondition has no reference count.
-
+        
         Since the underlying oslCondition is not a reference counted object, copy
         constructed Condition may work on an already destructed oslCondition object.
-
+        
         */
         Condition(const Condition&);
-
+        
         /** The underlying oslCondition has no reference count.
-
+        
         When destructed, the Condition object destroys the undelying oslCondition,
         which might cause severe problems in case it's a temporary object.
-
+         
         */
         Condition(oslCondition condition);
-
+        
         /** This assignment operator is private for the same reason as
             the copy constructor.
         */
         Condition& operator= (const Condition&);
-
+        
         /** This assignment operator is private for the same reason as
             the constructor taking a oslCondition argument.
         */
@@ -125,6 +125,6 @@ namespace osl
 }
 
 #endif  /* __cplusplus */
-#endif  /* _OSL_CONDITN_HXX_ */
+#endif	/* _OSL_CONDITN_HXX_ */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/diagnose.h b/sal/inc/osl/diagnose.h
index 699703b73f1b..59f921ccf349 100644
--- a/sal/inc/osl/diagnose.h
+++ b/sal/inc/osl/diagnose.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,10 +40,10 @@ extern "C" {
     Diagnostic support
 */
 
-void        SAL_CALL osl_breakDebug(void);
-sal_Bool    SAL_CALL osl_assertFailedLine(const sal_Char* pszFileName, sal_Int32 nLine, const sal_Char* pszMessage);
-void        SAL_CALL osl_trace(const sal_Char* pszFormat, ...);
-sal_Int32   SAL_CALL osl_reportError(sal_uInt32 nType, const sal_Char* pszErrorMessage);
+void    	SAL_CALL osl_breakDebug(void);
+sal_Bool 	SAL_CALL osl_assertFailedLine(const sal_Char* pszFileName, sal_Int32 nLine, const sal_Char* pszMessage);
+void    	SAL_CALL osl_trace(const sal_Char* pszFormat, ...);
+sal_Int32	SAL_CALL osl_reportError(sal_uInt32 nType, const sal_Char* pszErrorMessage);
 
 /*
     For message delivery
@@ -104,18 +104,18 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf
 /* the macro OSL_LOG_PREFIX is intended to be an office internal macro for now */
 #define OSL_LOG_PREFIX OSL_THIS_FILE ":" OSL_THIS_FUNC ":" OSL_MACRO_VALUE_TO_STRING( __LINE__ ) "; "
 
-#define OSL_DEBUG_ONLY(s)   _OSL_DEBUG_ONLY(s)
+#define OSL_DEBUG_ONLY(s)	_OSL_DEBUG_ONLY(s)
 #define OSL_TRACE           _OSL_TRACE
-#define OSL_ASSERT(c)       _OSL_ASSERT(c, OSL_THIS_FILE, __LINE__)
+#define OSL_ASSERT(c) 	    _OSL_ASSERT(c, OSL_THIS_FILE, __LINE__)
 #define OSL_ENSURE(c, m)   _OSL_ENSURE(c, OSL_THIS_FILE, __LINE__, m)
 
 #define OSL_VERIFY(c) do { if (!(c)) OSL_ASSERT(0); } while (0)
-#define OSL_PRECOND(c, m)   OSL_ENSURE(c, m)
-#define OSL_POSTCOND(c, m)  OSL_ENSURE(c, m)
+#define OSL_PRECOND(c, m)  	OSL_ENSURE(c, m)
+#define OSL_POSTCOND(c, m) 	OSL_ENSURE(c, m)
 
 
 #ifdef __cplusplus
-#define _OSL_GLOBAL ::
+#define _OSL_GLOBAL	::
 #else
 #define _OSL_GLOBAL
 #endif  /* __cplusplus */
@@ -131,7 +131,7 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf
 
 #if OSL_DEBUG_LEVEL > 0
 
-#define _OSL_DEBUG_ONLY(f)  (f)
+#define _OSL_DEBUG_ONLY(f)	(f)
 #define _OSL_ASSERT(c, f, l) \
     do \
     {  \
@@ -148,9 +148,9 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf
 
 #else
 
-#define _OSL_DEBUG_ONLY(f)          ((void)0)
-#define _OSL_ASSERT(c, f, l)        ((void)0)
-#define _OSL_ENSURE(c, f, l, m)     ((void)0)
+#define _OSL_DEBUG_ONLY(f)			((void)0)
+#define _OSL_ASSERT(c, f, l)		((void)0)
+#define _OSL_ENSURE(c, f, l, m)	    ((void)0)
 
 #endif /* OSL_DEBUG_LEVEL */
 
diff --git a/sal/inc/osl/diagnose.hxx b/sal/inc/osl/diagnose.hxx
index 585adf2c30bb..1cda1337a2e6 100644
--- a/sal/inc/osl/diagnose.hxx
+++ b/sal/inc/osl/diagnose.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -103,7 +103,7 @@ struct ObjectRegistryData {
     ObjectRegistryData( ::std::type_info const& rTypeInfo )
         : m_pName(rTypeInfo.name()), m_nCount(0), m_addresses(),
           m_bStoreAddresses(osl_detail_ObjectRegistry_storeAddresses(m_pName)){}
-
+    
     char const* const m_pName;
     oslInterlockedCount m_nCount;
     VoidPointerSet m_addresses;
@@ -116,7 +116,7 @@ class ObjectRegistry
 public:
     ObjectRegistry() : m_data( typeid(T) ) {}
     ~ObjectRegistry() { checkObjectCount(0); }
-
+    
     bool checkObjectCount( ::std::size_t nExpected ) const {
         bool const bRet = osl_detail_ObjectRegistry_checkObjectCount(
             m_data, nExpected );
@@ -131,20 +131,20 @@ public:
         }
         return bRet;
     }
-
+    
     void registerObject( void const* pObj ) {
         osl_detail_ObjectRegistry_registerObject(m_data, pObj);
     }
-
+    
     void revokeObject( void const* pObj ) {
         osl_detail_ObjectRegistry_revokeObject(m_data, pObj);
     }
-
+    
 private:
     // not impl:
     ObjectRegistry( ObjectRegistry const& );
     ObjectRegistry const& operator=( ObjectRegistry const& );
-
+    
     ObjectRegistryData m_data;
 };
 
@@ -152,20 +152,20 @@ private:
 
 /** Helper class which indicates leaking object(s) of a particular class in
     non-pro builds; use e.g.
-
+    
     <pre>
     class MyClass : private osl::DebugBase<MyClass> {...};
     </pre>
-
+    
     Using the environment variable
-
+    
     OSL_DEBUGBASE_STORE_ADDRESSES=MyClass;YourClass;...
-
+    
     you can specify a ';'-separated list of strings matching to class names
     (or "all" for all classes), for which DebugBase stores addresses to created
     objects instead of just counting them.  This enables you to iterate over
     leaking objects in your debugger.
-
+    
     @tpl InheritingClassT binds the template instance to that class
     @internal Use at own risk.
               For now this is just public (yet unpublished) API and may change
@@ -184,7 +184,7 @@ public:
     static bool checkObjectCount( ::std::size_t nExpected = 0 ) {
         return StaticObjectRegistry::get().checkObjectCount(nExpected);
     }
-
+    
 protected:
     DebugBase() {
         StaticObjectRegistry::get().registerObject( this );
@@ -192,7 +192,7 @@ protected:
     ~DebugBase() {
         StaticObjectRegistry::get().revokeObject( this );
     }
-
+    
 private:
     struct StaticObjectRegistry
         : ::rtl::Static<detail::ObjectRegistry<InheritingClassT>,
diff --git a/sal/inc/osl/doublecheckedlocking.h b/sal/inc/osl/doublecheckedlocking.h
index 346f23787379..08ef81275947 100644
--- a/sal/inc/osl/doublecheckedlocking.h
+++ b/sal/inc/osl/doublecheckedlocking.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h
index c9004bdab642..157409b8cfc7 100644
--- a/sal/inc/osl/endian.h
+++ b/sal/inc/osl/endian.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,43 +38,43 @@ extern "C" {
 /** Determine the platform byte order as _BIG_ENDIAN, _LITTLE_ENDIAN, ...
  */
 #ifdef _WIN32
-#   if defined(_M_IX86)
-#       define _LITTLE_ENDIAN
-#   elif defined(_M_MRX000)
-#       define _LITTLE_ENDIAN
-#   elif defined(_M_ALPHA)
-#       define _LITTLE_ENDIAN
-#   elif defined(_M_PPC)
-#       define _LITTLE_ENDIAN
-#   endif
+#	if defined(_M_IX86)
+#		define _LITTLE_ENDIAN
+#	elif defined(_M_MRX000)
+#		define _LITTLE_ENDIAN
+#	elif defined(_M_ALPHA)
+#		define _LITTLE_ENDIAN
+#	elif defined(_M_PPC)
+#		define _LITTLE_ENDIAN
+#	endif
 #endif
 
 #ifdef LINUX
-#   include <endian.h>
-#   if __BYTE_ORDER == __LITTLE_ENDIAN
+#	include <endian.h>
+#	if __BYTE_ORDER == __LITTLE_ENDIAN
 #           ifndef _LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
+#		define _LITTLE_ENDIAN
 #           endif
-#   elif __BYTE_ORDER == __BIG_ENDIAN
+#	elif __BYTE_ORDER == __BIG_ENDIAN
 #           ifndef _BIG_ENDIAN
-#       define _BIG_ENDIAN
+#		define _BIG_ENDIAN
 #           endif
-#   elif __BYTE_ORDER == __PDP_ENDIAN
-#       define _PDP_ENDIAN
-#   endif
+#	elif __BYTE_ORDER == __PDP_ENDIAN
+#		define _PDP_ENDIAN
+#	endif
 #endif
 
 #ifdef NETBSD
 #   include <machine/endian.h>
 #   if BYTE_ORDER == LITTLE_ENDIAN
-#   undef _BIG_ENDIAN
-#   undef _PDP_ENDIAN
+#	undef _BIG_ENDIAN
+#	undef _PDP_ENDIAN
 #   elif BYTE_ORDER == BIG_ENDIAN
-#   undef _LITTLE_ENDIAN
-#   undef _PDP_ENDIAN
+#	undef _LITTLE_ENDIAN
+#	undef _PDP_ENDIAN
 #   elif BYTE_ORDER == PDP_ENDIAN
-#   undef _LITTLE_ENDIAN
-#   undef _BIG_ENDIAN
+#	undef _LITTLE_ENDIAN
+#	undef _BIG_ENDIAN
 #   endif
 #endif
 
@@ -83,11 +83,11 @@ extern "C" {
 #   include <machine/endian.h>
 #if __FreeBSD_version < 500000
 #   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
+#   	define _LITTLE_ENDIAN
 #   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN
+#   	define _BIG_ENDIAN
 #   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN
+#   	define _PDP_ENDIAN
 #   endif
 #endif
 #endif
@@ -96,11 +96,11 @@ extern "C" {
 #   include <sys/types.h>
 #   include <sys/byteorder.h>
 #   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
+#   	define _LITTLE_ENDIAN
 #   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN
+#   	define _BIG_ENDIAN
 #   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN
+#   	define _PDP_ENDIAN
 #   endif
 #endif
 
@@ -108,48 +108,48 @@ extern "C" {
 #   include <sys/machine.h>
 #   if BYTE_ORDER == LITTLE_ENDIAN
 #       ifndef _LITTLE_ENDIAN
-#           define _LITTLE_ENDIAN
+#   	    define _LITTLE_ENDIAN
 #       endif
 #   elif BYTE_ORDER == BIG_ENDIAN
-#       ifndef _BIG_ENDIAN
-#           define _BIG_ENDIAN
+#   	ifndef _BIG_ENDIAN
+#   	    define _BIG_ENDIAN
 #       endif
 #   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN
+#   	define _PDP_ENDIAN
 #   endif
 #endif
 
 #ifdef HPUX
-#   include <machine/param.h>
+#	include <machine/param.h>
 #endif
 
 #ifdef _WIN16
-#   define  _LITTLE_ENDIAN
+#	define	_LITTLE_ENDIAN
 #endif
 
 #ifdef OS2
-#   include <machine/endian.h>
+#	include <machine/endian.h>
 #endif
 
 #ifdef SOLARIS
-#   include <sys/isa_defs.h>
+#	include <sys/isa_defs.h>
 #endif
 
 #ifdef MACOSX
-#   include <machine/endian.h>
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#       ifndef _LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
-#       endif
-#   elif BYTE_ORDER == BIG_ENDIAN
-#       ifndef _BIG_ENDIAN
-#       define _BIG_ENDIAN
-#       endif
-#   elif BYTE_ORDER == PDP_ENDIAN
-#       ifndef _PDP_ENDIAN
-#       define _PDP_ENDIAN
-#       endif
-#   endif
+#	include <machine/endian.h>
+#	if BYTE_ORDER == LITTLE_ENDIAN
+#		ifndef _LITTLE_ENDIAN
+#		define _LITTLE_ENDIAN
+#		endif
+#	elif BYTE_ORDER == BIG_ENDIAN
+#		ifndef _BIG_ENDIAN
+#		define _BIG_ENDIAN
+#		endif
+#	elif BYTE_ORDER == PDP_ENDIAN
+#		ifndef _PDP_ENDIAN
+#		define _PDP_ENDIAN
+#		endif
+#	endif
 #endif
 
 /** Check supported platform.
@@ -158,51 +158,51 @@ extern "C" {
     !defined(LINUX)   && !defined(NETBSD) && !defined(SCO)     && \
     !defined(AIX)     && !defined(HPUX)   && !defined(OPENBSD) && \
     !defined(SOLARIS) && !defined(MACOSX) && !defined(FREEBSD)
-#   error "Target platform not specified !"
+#	error "Target platform not specified !"
 #endif
 
 
 /** Define the determined byte order as OSL_BIGENDIAN or OSL_LITENDIAN.
  */
 #if defined _LITTLE_ENDIAN
-#   define OSL_LITENDIAN
+#	define OSL_LITENDIAN
 #elif defined _BIG_ENDIAN
-#   define OSL_BIGENDIAN
+#	define OSL_BIGENDIAN
 #else
-#   error undetermined endianess
+#	error undetermined endianess
 #endif
 
 
 /** Define macros for byte order manipulation.
  */
 #ifndef OSL_MAKEBYTE
-#   define OSL_MAKEBYTE(nl, nh)    ((sal_uInt8)(((nl) & 0x0F) | (((nh) & 0x0F) << 4)))
+#	define OSL_MAKEBYTE(nl, nh)    ((sal_uInt8)(((nl) & 0x0F) | (((nh) & 0x0F) << 4)))
 #endif
 #ifndef OSL_LONIBBLE
-#   define OSL_LONIBBLE(b)         ((sal_uInt8)((b) & 0x0F))
+#	define OSL_LONIBBLE(b)         ((sal_uInt8)((b) & 0x0F))
 #endif
 #ifndef OSL_HINIBBLE
-#   define OSL_HINIBBLE(b)         ((sal_uInt8)(((b) >> 4) & 0x0F))
+#	define OSL_HINIBBLE(b)         ((sal_uInt8)(((b) >> 4) & 0x0F))
 #endif
 
 #ifndef OSL_MAKEWORD
-#   define OSL_MAKEWORD(bl, bh)    ((sal_uInt16)((bl) & 0xFF) | (((sal_uInt16)(bh) & 0xFF) << 8))
+#	define OSL_MAKEWORD(bl, bh)    ((sal_uInt16)((bl) & 0xFF) | (((sal_uInt16)(bh) & 0xFF) << 8))
 #endif
 #ifndef OSL_LOBYTE
-#   define OSL_LOBYTE(w)           ((sal_uInt8)((sal_uInt16)(w) & 0xFF))
+#	define OSL_LOBYTE(w)           ((sal_uInt8)((sal_uInt16)(w) & 0xFF))
 #endif
 #ifndef OSL_HIBYTE
-#   define OSL_HIBYTE(w)           ((sal_uInt8)(((sal_uInt16)(w) >> 8) & 0xFF))
+#	define OSL_HIBYTE(w)           ((sal_uInt8)(((sal_uInt16)(w) >> 8) & 0xFF))
 #endif
 
 #ifndef OSL_MAKEDWORD
-#   define OSL_MAKEDWORD(wl, wh)   ((sal_uInt32)((wl) & 0xFFFF) | (((sal_uInt32)(wh) & 0xFFFF) << 16))
+#	define OSL_MAKEDWORD(wl, wh)   ((sal_uInt32)((wl) & 0xFFFF) | (((sal_uInt32)(wh) & 0xFFFF) << 16))
 #endif
 #ifndef OSL_LOWORD
-#   define OSL_LOWORD(d)           ((sal_uInt16)((sal_uInt32)(d) & 0xFFFF))
+#	define OSL_LOWORD(d)           ((sal_uInt16)((sal_uInt32)(d) & 0xFFFF))
 #endif
 #ifndef OSL_HIWORD
-#   define OSL_HIWORD(d)           ((sal_uInt16)(((sal_uInt32)(d) >> 16) & 0xFFFF))
+#	define OSL_HIWORD(d)           ((sal_uInt16)(((sal_uInt32)(d) >> 16) & 0xFFFF))
 #endif
 
 
@@ -210,17 +210,17 @@ extern "C" {
  */
 #ifdef OSL_BIGENDIAN
 #ifndef OSL_NETWORD
-#   define OSL_NETWORD(w)          (sal_uInt16)(w)
+#	define OSL_NETWORD(w)          (sal_uInt16)(w)
 #endif
 #ifndef OSL_NETDWORD
-#   define OSL_NETDWORD(d)         (sal_uInt32)(d)
+#	define OSL_NETDWORD(d)         (sal_uInt32)(d)
 #endif
 #else  /* OSL_LITENDIAN */
 #ifndef OSL_NETWORD
-#   define OSL_NETWORD(w)          OSL_MAKEWORD(OSL_HIBYTE(w),OSL_LOBYTE(w))
+#	define OSL_NETWORD(w)          OSL_MAKEWORD(OSL_HIBYTE(w),OSL_LOBYTE(w))
 #endif
 #ifndef OSL_NETDWORD
-#   define OSL_NETDWORD(d)         OSL_MAKEDWORD(OSL_NETWORD(OSL_HIWORD(d)),OSL_NETWORD(OSL_LOWORD(d)))
+#	define OSL_NETDWORD(d)         OSL_MAKEDWORD(OSL_NETWORD(OSL_HIWORD(d)),OSL_NETWORD(OSL_LOWORD(d)))
 #endif
 #endif /* OSL_BIGENDIAN */
 
@@ -228,10 +228,10 @@ extern "C" {
 /** Define macros for swapping between byte orders.
  */
 #ifndef OSL_SWAPWORD
-#   define OSL_SWAPWORD(w)         OSL_MAKEWORD(OSL_HIBYTE(w),OSL_LOBYTE(w))
+#	define OSL_SWAPWORD(w)         OSL_MAKEWORD(OSL_HIBYTE(w),OSL_LOBYTE(w))
 #endif
 #ifndef OSL_SWAPDWORD
-#   define OSL_SWAPDWORD(d)        OSL_MAKEDWORD(OSL_SWAPWORD(OSL_HIWORD(d)),OSL_SWAPWORD(OSL_LOWORD(d)))
+#	define OSL_SWAPDWORD(d)        OSL_MAKEDWORD(OSL_SWAPWORD(OSL_HIWORD(d)),OSL_SWAPWORD(OSL_LOWORD(d)))
 #endif
 
 
diff --git a/sal/inc/osl/file.h b/sal/inc/osl/file.h
index e148b41073b7..bdb7693f5098 100644
--- a/sal/inc/osl/file.h
+++ b/sal/inc/osl/file.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,13 +32,13 @@
 #define _OSL_FILE_H_
 
 #include <osl/time.h>
-#   include <rtl/ustring.h>
+#	include <rtl/ustring.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/** @file
+/** @file 
 
 Main goals and usage hints
 
@@ -49,7 +49,7 @@ There are a few main goals:<p>
 
 1.The path specifications always has to be absolut. Any usage of relative path
 specifications is forbidden. Exceptions are <code>osl_getSystemPathFromFileURL</code>,
-<code>osl_getFileURLFromSystemPath</code> and <code>osl_getAbsoluteFileURL</code>. Most operating systems
+<code>osl_getFileURLFromSystemPath</code> and <code>osl_getAbsoluteFileURL</code>. Most operating systems 
 provide a "Current Directory" per process. This is the reason why relative path
 specifications can cause problems in multithreading environments.<p>
 
@@ -130,33 +130,33 @@ typedef enum {
     osl_File_E_NOLCK,
     osl_File_E_NOSYS,
     osl_File_E_NOTEMPTY,
-    osl_File_E_LOOP,
+    osl_File_E_LOOP,	
     osl_File_E_ILSEQ,
     osl_File_E_NOLINK,
     osl_File_E_MULTIHOP,
     osl_File_E_USERS,
     osl_File_E_OVERFLOW,
     osl_File_E_NOTREADY,
-    osl_File_E_invalidError,        /* unmapped error: always last entry in enum! */
+    osl_File_E_invalidError,		/* unmapped error: always last entry in enum! */
     osl_File_E_TIMEDOUT,
     osl_File_E_NETWORK,
     osl_File_E_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslFileError;
 
-typedef void *oslDirectory;
+typedef	void *oslDirectory;
 typedef void *oslDirectoryItem;
 
 
-/** Open a directory for enumerating its contents.
+/** Open a directory for enumerating its contents.	 
 
-    @param  pustrDirectoryURL [in]
+    @param	pustrDirectoryURL [in] 
     The full qualified URL of the directory.
-
-    @param  pDirectory [out]
-    On success it receives a handle used for subsequent calls by osl_getNextDirectoryItem().
+    
+    @param	pDirectory [out] 
+    On success it receives a handle used for subsequent calls by osl_getNextDirectoryItem(). 
     The handle has to be released by a call to osl_closeDirectory().
 
-    @return
+    @return 
     osl_File_E_None on success<br>
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_NOENT the specified path doesn't exist<br>
@@ -175,25 +175,25 @@ typedef void *oslDirectoryItem;
 oslFileError SAL_CALL osl_openDirectory( rtl_uString *pustrDirectoryURL, oslDirectory *pDirectory);
 
 
-/** Retrieve the next item of a previously opened directory.
+/**	Retrieve the next item of a previously opened directory. 
 
     Retrieves the next item of a previously opened directory.
     All handles have an initial refcount of 1.
 
-    @param  Directory [in]
+    @param	Directory [in] 
     A directory handle received from a previous call to osl_openDirectory().
-
-    @param  pItem [out]
+    
+    @param	pItem [out] 
     On success it receives a handle that can be used for subsequent calls to osl_getFileStatus().
     The handle has to be released by a call to osl_releaseDirectoryItem().
-
-    @param  uHint [in]
+    
+    @param	uHint [in] 
     With this parameter the caller can tell the implementation that (s)he
     is going to call this function uHint times afterwards. This enables the implementation to
     get the information for more than one file and cache it until the next calls.
 
-    @return
-    osl_File_E_None on success<br>
+    @return 
+    osl_File_E_None on success<br> 
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_NOMEM not enough memory for allocating structures <br>
     osl_File_E_NOENT no more entries in this directory<br>
@@ -209,17 +209,17 @@ oslFileError SAL_CALL osl_openDirectory( rtl_uString *pustrDirectoryURL, oslDire
 oslFileError SAL_CALL osl_getNextDirectoryItem(
     oslDirectory Directory,
     oslDirectoryItem *pItem,
-    sal_uInt32   uHint
+    sal_uInt32	 uHint
     );
 
 
-/** Release a directory handle.
-
-    @param Directory [in]
+/**	Release a directory handle.
+    
+    @param Directory [in] 
     A handle received by a call to osl_openDirectory().
 
-    @return
-    osl_File_E_None on success<br>
+    @return 
+    osl_File_E_None on success<br> 
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_NOMEM not enough memory for allocating structures<br>
     osl_File_E_BADF invalid oslDirectory parameter<br>
@@ -231,30 +231,30 @@ oslFileError SAL_CALL osl_getNextDirectoryItem(
 oslFileError SAL_CALL osl_closeDirectory(oslDirectory Directory);
 
 
-/** Retrieve a single directory item.
+/**	Retrieve a single directory item. 
 
     Retrieves a single directory item. The returned handle has an initial refcount of 1.
-    Due to performance issues it is not recommended to use this function while
+    Due to performance issues it is not recommended to use this function while 
     enumerating the contents of a directory. In this case use osl_getNextDirectoryItem() instead.
-
-    @param pustrFileURL [in]
-    An absolute file URL.
-
-    @param pItem [out]
+    
+    @param pustrFileURL [in] 
+    An absolute file URL. 
+    
+    @param pItem [out] 
     On success it receives a handle which can be used for subsequent calls to osl_getFileStatus().
     The handle has to be released by a call to osl_releaseDirectoryItem().
-
-    @return
-    osl_File_E_None on success<br>
+    
+    @return 
+    osl_File_E_None on success<br> 
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_NOMEM not enough memory for allocating structures <br>
     osl_File_E_ACCES permission denied<br>
     osl_File_E_MFILE too many open files used by the process<br>
     osl_File_E_NFILE too many open files in the system<br>
     osl_File_E_NOENT no such file or directory<br>
-    osl_File_E_LOOP too many symbolic links encountered<br>
+    osl_File_E_LOOP	too many symbolic links encountered<br>
     osl_File_E_NAMETOOLONG the file name is too long<br>
-    osl_File_E_NOTDIR a component of the path prefix of path is not a directory<br>
+    osl_File_E_NOTDIR a component of the path prefix of path is not a directory<br>	
     osl_File_E_IO on I/O errors<br>
     osl_File_E_MULTIHOP multihop attempted<br>
     osl_File_E_NOLINK link has been severed<br>
@@ -268,20 +268,20 @@ oslFileError SAL_CALL osl_closeDirectory(oslDirectory Directory);
 */
 
 oslFileError SAL_CALL osl_getDirectoryItem(
-    rtl_uString *pustrFileURL,
+    rtl_uString *pustrFileURL, 
     oslDirectoryItem *pItem
     );
 
 
-/** Increase the refcount of a directory item handle.
-
+/**	Increase the refcount of a directory item handle.
+    
     The caller responsible for releasing the directory item handle using osl_releaseDirectoryItem().
-
-    @param  Item [in]
+    
+    @param	Item [in] 
     A handle received by a call to osl_getDirectoryItem() or osl_getNextDirectoryItem().
 
-    @return
-    osl_File_E_None on success<br>
+    @return 
+    osl_File_E_None on success<br> 
     osl_File_E_NOMEM not enough memory for allocating structures<br>
     osl_File_E_INVAL the format of the parameters was not valid<br>
 
@@ -293,16 +293,16 @@ oslFileError SAL_CALL osl_getDirectoryItem(
 oslFileError SAL_CALL osl_acquireDirectoryItem( oslDirectoryItem Item );
 
 
-/** Decrease the refcount of a directory item handle.
+/**	Decrease the refcount of a directory item handle. 
 
-    Decreases the refcount of a directory item handle.
-    If the refcount reaches 0 the data associated with
+    Decreases the refcount of a directory item handle. 
+    If the refcount reaches 0 the data associated with 
     this directory item handle will be released.
-
-    @param  Item [in]
+    
+    @param	Item [in] 
     A handle received by a call to osl_getDirectoryItem() or osl_getNextDirectoryItem().
 
-    @return
+    @return 
     osl_File_E_None on success<br>
     osl_File_E_NOMEM not enough memory for allocating structures<br>
     osl_File_E_INVAL the format of the parameters was not valid<br>
@@ -312,7 +312,7 @@ oslFileError SAL_CALL osl_acquireDirectoryItem( oslDirectoryItem Item );
     @see osl_acquireDirectoryItem()
 */
 
-oslFileError SAL_CALL osl_releaseDirectoryItem( oslDirectoryItem Item );
+oslFileError SAL_CALL osl_releaseDirectoryItem( oslDirectoryItem Item ); 
 
 /* File types */
 
@@ -324,12 +324,12 @@ typedef enum {
     osl_File_Type_Socket,
     osl_File_Type_Link,
     osl_File_Type_Special,
-    osl_File_Type_Unknown
+    osl_File_Type_Unknown             
 } oslFileType;
 
 /* File attributes */
-#define osl_File_Attribute_ReadOnly             0x00000001
-#define osl_File_Attribute_Hidden               0x00000002
+#define osl_File_Attribute_ReadOnly				0x00000001
+#define osl_File_Attribute_Hidden				0x00000002
 #define osl_File_Attribute_Executable           0x00000010
 #define osl_File_Attribute_GrpWrite             0x00000020
 #define osl_File_Attribute_GrpRead              0x00000040
@@ -343,73 +343,73 @@ typedef enum {
 
 /* Flags specifying which fields to retreive by osl_getFileStatus */
 
-#define osl_FileStatus_Mask_Type                0x00000001
-#define osl_FileStatus_Mask_Attributes          0x00000002
-#define osl_FileStatus_Mask_CreationTime        0x00000010
-#define osl_FileStatus_Mask_AccessTime          0x00000020
-#define osl_FileStatus_Mask_ModifyTime          0x00000040
-#define osl_FileStatus_Mask_FileSize            0x00000080
-#define osl_FileStatus_Mask_FileName            0x00000100
-#define osl_FileStatus_Mask_FileURL             0x00000200
-#define osl_FileStatus_Mask_LinkTargetURL       0x00000400
-#define osl_FileStatus_Mask_All                 0x7FFFFFFF
-#define osl_FileStatus_Mask_Validate            0x80000000
+#define	osl_FileStatus_Mask_Type				0x00000001
+#define osl_FileStatus_Mask_Attributes			0x00000002
+#define osl_FileStatus_Mask_CreationTime		0x00000010
+#define osl_FileStatus_Mask_AccessTime			0x00000020
+#define osl_FileStatus_Mask_ModifyTime			0x00000040
+#define osl_FileStatus_Mask_FileSize			0x00000080
+#define osl_FileStatus_Mask_FileName			0x00000100
+#define osl_FileStatus_Mask_FileURL				0x00000200
+#define osl_FileStatus_Mask_LinkTargetURL		0x00000400
+#define osl_FileStatus_Mask_All					0x7FFFFFFF
+#define osl_FileStatus_Mask_Validate			0x80000000
 
 
 typedef
 
 /** Structure containing information about files and directories
 
-    @see    osl_getFileStatus()
-    @see    oslFileType
+    @see	osl_getFileStatus()
+    @see	oslFileType
 */
 
 struct _oslFileStatus {
-/** Must be initialized with the size in bytes of the structure before passing it to any function */
-    sal_uInt32      uStructSize;
+/** Must be initialized with the size in bytes of the structure before passing it to any function */		
+    sal_uInt32		uStructSize;
 /** Determines which members of the structure contain valid data */
-    sal_uInt32      uValidFields;
+    sal_uInt32		uValidFields;
 /** The type of the file (file, directory, volume). */
-    oslFileType eType;
+    oslFileType	eType;
 /** File attributes */
-    sal_uInt64  uAttributes;
-/** First creation time in nanoseconds since 1/1/1970. Can be the last modify time depending on
+    sal_uInt64	uAttributes;
+/** First creation time in nanoseconds since 1/1/1970. Can be the last modify time depending on 
     platform or file system. */
-    TimeValue   aCreationTime;
-/** Last access time in nanoseconds since 1/1/1970. Can be the last modify time depending on
+    TimeValue	aCreationTime;
+/** Last access time in nanoseconds since 1/1/1970. Can be the last modify time depending on 
     platform or file system. */
-    TimeValue   aAccessTime;
+    TimeValue	aAccessTime;
 /** Last modify time in nanoseconds since 1/1/1970. */
-    TimeValue   aModifyTime;
+    TimeValue	aModifyTime;
 /** Size in bytes of the file. Zero for directories and volumes. */
-    sal_uInt64  uFileSize;
+    sal_uInt64	uFileSize;
 /** Case correct name of the file. Should be set to zero before calling <code>osl_getFileStatus</code>
     and released after usage. */
-    rtl_uString *ustrFileName;
+    rtl_uString	*ustrFileName;
 /** Full URL of the file. Should be set to zero before calling <code>osl_getFileStatus</code>
     and released after usage. */
-    rtl_uString *ustrFileURL;
+    rtl_uString	*ustrFileURL;
 /** Full URL of the target file if the file itself is a link.
     Should be set to zero before calling <code>osl_getFileStatus</code>
     and released after usage. */
-    rtl_uString *ustrLinkTargetURL;
+    rtl_uString	*ustrLinkTargetURL;
 } oslFileStatus;
 
 
-/** Retrieve information about a single file or directory.
+/**	Retrieve information about a single file or directory.
 
-    @param  Item [in]
+    @param	Item [in] 
     A handle received by a previous call to osl_getDirectoryItem() or osl_getNextDirectoryItem().
-
-    @param  pStatus [in|out]
+    
+    @param	pStatus [in|out] 
     Points to a structure which receives the information of the file or directory
     represented by the handle Item. The member uStructSize has to be initialized to
     sizeof(oslFileStatus) before calling this function.
-
-    @param  uFieldMask [in]
+    
+    @param	uFieldMask [in] 
     Specifies which fields of the structure pointed to by pStatus are of interest to the caller.
 
-    @return
+    @return 
     osl_File_E_None on success<br>
     osl_File_E_NOMEM not enough memory for allocating structures <br>
     osl_File_E_INVAL the format of the parameters was not valid<br>
@@ -443,17 +443,17 @@ typedef void *oslVolumeDeviceHandle;
 
 /** Unmount a volume device.
 
-    Unmount the volume specified by the given oslVolumeDeviceHandle.
-
+    Unmount the volume specified by the given oslVolumeDeviceHandle. 
+    
     @param Handle [in]
     An oslVolumeDeviceHandle received by a call to osl_getVolumeInformation().
-
+    
     @return
     osl_File_E_None on success<br>
-
-    @todo
+    
+    @todo 
     specify all error codes that may be returned
-
+    
     @see osl_getVolumeInformation()
 */
 
@@ -463,16 +463,16 @@ oslFileError SAL_CALL osl_unmountVolumeDevice( oslVolumeDeviceHandle Handle );
 /** Automount a volume device.
 
     Automount the volume device specified by the given oslVolumeDeviceHandle.
-
+    
     @param Handle [in]
     An oslVolumeDeviceHandle received by a call to osl_getVolumeInformation().
-
+    
     @return
     osl_File_E_None on success<br>
-
-    @todo
+    
+    @todo 
     specify all error codes that may be returned
-
+    
     @see osl_getVolumeInformation()
 */
 
@@ -483,37 +483,37 @@ oslFileError SAL_CALL osl_automountVolumeDevice( oslVolumeDeviceHandle Handle );
 
     Releases the given oslVolumeDeviceHandle which was acquired by a call to
     osl_getVolumeInformation() or osl_acquireVolumeDeviceHandle().
-
+    
     @param Handle [in]
     An oslVolumeDeviceHandle received by a call to osl_getVolumeInformation().
-
+    
     @return
     osl_File_E_None on success<br>
-
-    @todo
+    
+    @todo 
     specify all error codes that may be returned
-
+    
     @see osl_acquireVolumeDeviceHandle()
-    @see osl_getVolumeInformation()
+    @see osl_getVolumeInformation()    
 */
 
 oslFileError SAL_CALL osl_releaseVolumeDeviceHandle( oslVolumeDeviceHandle Handle );
 
 /** Acquire a volume device handle.
 
-    Acquires the given oslVolumeDeviceHandle which was acquired by a call to
-    osl_getVolumeInformation(). The caller is responsible for releasing the
+    Acquires the given oslVolumeDeviceHandle which was acquired by a call to 
+    osl_getVolumeInformation(). The caller is responsible for releasing the 
     acquired handle by calling osl_releaseVolumeDeviceHandle().
-
+    
     @param Handle [in]
     An oslVolumeDeviceHandle received by a call to osl_getVolumeInformation().
-
+    
     @return
     osl_File_E_None on success<br>
-
-    @todo
+    
+    @todo 
     specify all error codes that may be returned
-
+    
     @see osl_getVolumeInformation()
 */
 
@@ -524,11 +524,11 @@ oslFileError SAL_CALL osl_acquireVolumeDeviceHandle( oslVolumeDeviceHandle Handl
 
     @param Handle [in]
     An oslVolumeDeviceHandle received by a call to osl_getVolumeInformation().
-
-    @param ppustrDirectoryURL [out]
+    
+    @param ppustrDirectoryURL [out] 
     Receives the full qualified URL where the device is mounted to.
-
-    @return
+    
+    @return 
     osl_File_E_None on success<br>
     osl_File_E_NOMEM not enough memory for allocating structures <br>
     osl_File_E_INVAL the format of the parameters was not valid<br>
@@ -543,71 +543,71 @@ oslFileError SAL_CALL osl_acquireVolumeDeviceHandle( oslVolumeDeviceHandle Handl
     osl_File_E_NOLINK link has been severed<br>
     osl_File_E_EOVERFLOW value too large for defined data type<br>
 
-    @see    osl_getVolumeInformation()
-    @see    osl_automountVolumeDevice()
-    @see    osl_unmountVolumeDevice()
+    @see	osl_getVolumeInformation()
+    @see	osl_automountVolumeDevice()
+    @see	osl_unmountVolumeDevice()
 */
 
 oslFileError SAL_CALL osl_getVolumeDeviceMountPath( oslVolumeDeviceHandle Handle, rtl_uString **ppustrDirectoryURL);
 
 /* Volume attributes */
 
-#define osl_Volume_Attribute_Removeable            0x00000001L
-#define osl_Volume_Attribute_Remote                0x00000002L
-#define osl_Volume_Attribute_CompactDisc           0x00000004L
-#define osl_Volume_Attribute_FixedDisk             0x00000008L
-#define osl_Volume_Attribute_RAMDisk               0x00000010L
-#define osl_Volume_Attribute_FloppyDisk            0x00000020L
+#define osl_Volume_Attribute_Removeable		       0x00000001L
+#define osl_Volume_Attribute_Remote			       0x00000002L
+#define osl_Volume_Attribute_CompactDisc	       0x00000004L
+#define osl_Volume_Attribute_FixedDisk		       0x00000008L
+#define osl_Volume_Attribute_RAMDisk		       0x00000010L
+#define osl_Volume_Attribute_FloppyDisk		       0x00000020L
 
 #define osl_Volume_Attribute_Case_Is_Preserved     0x00000040L
 #define osl_Volume_Attribute_Case_Sensitive        0x00000080L
 
 /* Flags specifying which fields to retreive by osl_getVolumeInfo */
 
-#define osl_VolumeInfo_Mask_Attributes             0x00000001L
-#define osl_VolumeInfo_Mask_TotalSpace             0x00000002L
-#define osl_VolumeInfo_Mask_UsedSpace              0x00000004L
-#define osl_VolumeInfo_Mask_FreeSpace              0x00000008L
-#define osl_VolumeInfo_Mask_MaxNameLength          0x00000010L
-#define osl_VolumeInfo_Mask_MaxPathLength          0x00000020L
-#define osl_VolumeInfo_Mask_FileSystemName         0x00000040L
-#define osl_VolumeInfo_Mask_DeviceHandle           0x00000080L
+#define osl_VolumeInfo_Mask_Attributes		       0x00000001L
+#define osl_VolumeInfo_Mask_TotalSpace		       0x00000002L
+#define osl_VolumeInfo_Mask_UsedSpace		       0x00000004L
+#define osl_VolumeInfo_Mask_FreeSpace		       0x00000008L
+#define osl_VolumeInfo_Mask_MaxNameLength	       0x00000010L
+#define osl_VolumeInfo_Mask_MaxPathLength	       0x00000020L
+#define osl_VolumeInfo_Mask_FileSystemName	       0x00000040L
+#define osl_VolumeInfo_Mask_DeviceHandle	       0x00000080L
 #define osl_VolumeInfo_Mask_FileSystemCaseHandling 0x00000100L
 
 typedef
 
 /** Structure containing information about volumes
 
-    @see    osl_getVolumeInformation()
-    @see    oslFileType
+    @see	osl_getVolumeInformation()
+    @see	oslFileType
 */
 
 struct _oslVolumeInfo {
-/** Must be initialized with the size in bytes of the structure before passing it to any function */
-    sal_uInt32      uStructSize;
+/** Must be initialized with the size in bytes of the structure before passing it to any function */		
+    sal_uInt32		uStructSize;
 /** Determines which members of the structure contain valid data */
-    sal_uInt32      uValidFields;
+    sal_uInt32		uValidFields;
 /** Attributes of the volume (remote and/or removable) */
-    sal_uInt32      uAttributes;
+    sal_uInt32		uAttributes;
 /** Total availiable space on the volume for the current process/user */
-    sal_uInt64      uTotalSpace;
+    sal_uInt64		uTotalSpace;
 /** Used space on the volume for the current process/user */
-    sal_uInt64      uUsedSpace;
+    sal_uInt64		uUsedSpace;
 /** Free space on the volume for the current process/user */
-    sal_uInt64      uFreeSpace;
+    sal_uInt64		uFreeSpace;
 /** Maximum length of file name of a single item */
-    sal_uInt32      uMaxNameLength;
+    sal_uInt32		uMaxNameLength;
 /** Maximum length of a full quallified path in system notation */
-    sal_uInt32      uMaxPathLength;
+    sal_uInt32		uMaxPathLength;
 /** Points to a string that receives the name of the file system type. String should be set to zero before calling <code>osl_getVolumeInformation</code>
     and released after usage. */
-    rtl_uString     *ustrFileSystemName;
+    rtl_uString		*ustrFileSystemName;
 /** Pointer to handle the receives underlying device. Handle should be set to zero before calling <code>osl_getVolumeInformation</code>*/
-    oslVolumeDeviceHandle   *pDeviceHandle;
+    oslVolumeDeviceHandle	*pDeviceHandle;
 } oslVolumeInfo;
 
 
-/** Retrieve information about a volume.
+/** Retrieve information about a volume. 
 
     Retrieves information about a volume. A volume can either be a mount point, a network
     resource or a drive depending on Operating System and File System. Before calling this
@@ -616,15 +616,15 @@ struct _oslVolumeInfo {
 
     @param pustrDirectoryURL [in]
     Full qualified URL of the volume
-
+    
     @param pInfo [out]
     On success it receives information about the volume.
-
+    
     @param uFieldMask [in]
     Specifies which members of the structure should be filled
-
-    @return
-    osl_File_E_None on success<br>
+    
+    @return 
+    osl_File_E_None on success<br> 
     osl_File_E_NOMEM not enough memory for allocating structures <br>
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_NOTDIR not a directory<br>
@@ -639,39 +639,39 @@ struct _oslVolumeInfo {
     osl_File_E_NOLINK link has been severed<br>
     osl_File_E_INTR function call was interrupted<br>
 
-    @see    osl_getFileStatus()
-    @see    oslVolumeInfo
-*/
+    @see	osl_getFileStatus()
+    @see	oslVolumeInfo
+*/	
 
 oslFileError SAL_CALL osl_getVolumeInformation(
-    rtl_uString *pustrDirectoryURL,
-    oslVolumeInfo *pInfo,
+    rtl_uString *pustrDirectoryURL, 
+    oslVolumeInfo *pInfo, 
     sal_uInt32 uFieldMask );
 
-typedef void *oslFileHandle;
+typedef	void *oslFileHandle;
 
 /* Open flags */
 
-#define osl_File_OpenFlag_Read      0x00000001L
-#define osl_File_OpenFlag_Write     0x00000002L
-#define osl_File_OpenFlag_Create    0x00000004L
-#define osl_File_OpenFlag_NoLock    0x00000008L
+#define osl_File_OpenFlag_Read		0x00000001L
+#define osl_File_OpenFlag_Write		0x00000002L
+#define osl_File_OpenFlag_Create	0x00000004L
+#define osl_File_OpenFlag_NoLock	0x00000008L
 
 /** Open a regular file.
 
-    Open a file. Only regular files can be openend.
-
-    @param pustrFileURL [in]
-    The full qualified URL of the file to open.
-
-    @param pHandle [out]
+    Open a file. Only regular files	can be openend.
+    
+    @param pustrFileURL [in] 
+    The full qualified URL of the file to open. 
+    
+    @param pHandle [out] 
     On success it receives a handle to the open file.
-
+    
     @param uFlags [in]
     Specifies the open mode.
-
-    @return
-    osl_File_E_None on success<br>
+    
+    @return 
+    osl_File_E_None on success<br> 
     osl_File_E_NOMEM not enough memory for allocating structures <br>
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_NAMETOOLONG pathname was too long<br>
@@ -714,37 +714,37 @@ oslFileError SAL_CALL osl_openFile( rtl_uString *pustrFileURL, oslFileHandle *pH
 
 /** Set the internal position pointer of an open file.
 
-    @param Handle [in]
+    @param Handle [in] 
     Handle to a file received by a previous call to osl_openFile().
-
-    @param uHow [in]
+    
+    @param uHow [in] 
     Distance to move the internal position pointer (from uPos).
-
+    
     @param uPos [in]
     Absolute position from the beginning of the file.
-
-    @return
-    osl_File_E_None on success<br>
+    
+    @return 
+    osl_File_E_None on success<br> 
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_OVERFLOW the resulting file offset would be a value which cannot be represented correctly for regular files<br>
 
-    @see    osl_openFile()
-    @see    osl_getFilePos()
+    @see	osl_openFile()
+    @see	osl_getFilePos()
 */
 
 oslFileError SAL_CALL osl_setFilePos( oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uPos );
 
 
-/** Retrieve the current position of the internal pointer of an open file.
+/**	Retrieve the current position of the internal pointer of an open file.
 
     @param Handle [in]
     Handle to a file received by a previous call to osl_openFile().
-
-    @param pPos [out]
+    
+    @param pPos [out] 
     On success receives the current position of the file pointer.
-
-    @return
-    osl_File_E_None on success<br>
+    
+    @return 
+    osl_File_E_None on success<br> 
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_OVERFLOW the resulting file offset would be a value which cannot be represented correctly for regular files<br>
 
@@ -757,21 +757,21 @@ oslFileError SAL_CALL osl_setFilePos( oslFileHandle Handle, sal_uInt32 uHow, sal
 oslFileError SAL_CALL osl_getFilePos( oslFileHandle Handle, sal_uInt64 *pPos );
 
 
-/** Set the file size of an open file.
+/**	Set the file size of an open file. 
 
     Sets the file size of an open file. The file can be truncated or enlarged by the function.
     The position of the file pointer is not affeced by this function.
-
-    @param Handle [in]
+    
+    @param Handle [in] 
     Handle to a file received by a previous call to osl_openFile().
-
-    @param uSize [in]
+    
+    @param uSize [in] 
     New size in bytes.
-
-    @return
-    osl_File_E_None on success<br>
+    
+    @return 
+    osl_File_E_None on success<br> 
     osl_File_E_INVAL the format of the parameters was not valid<br>
-    osl_File_E_OVERFLOW the resulting file offset would be a value which cannot be represented correctly for regular files<br>
+    osl_File_E_OVERFLOW the resulting file offset would be a value which cannot	be represented correctly for regular files<br>
 
     @see osl_openFile()
     @see osl_setFilePos()
@@ -782,21 +782,21 @@ oslFileError SAL_CALL osl_getFilePos( oslFileHandle Handle, sal_uInt64 *pPos );
 oslFileError SAL_CALL osl_setFileSize( oslFileHandle Handle, sal_uInt64 uSize );
 
 
-/** Get the file size of an open file.
+/**	Get the file size of an open file. 
 
     Gets the file size of an open file.
     The position of the file pointer is not affeced by this function.
-
-    @param Handle [in]
+    
+    @param Handle [in] 
     Handle to a file received by a previous call to osl_openFile().
-
-    @param pSize [out]
+    
+    @param pSize [out] 
     Current size in bytes.
-
-    @return
-    osl_File_E_None on success<br>
+    
+    @return 
+    osl_File_E_None on success<br> 
     osl_File_E_INVAL the format of the parameters was not valid<br>
-    osl_File_E_OVERFLOW the resulting file offset would be a value which cannot be represented correctly for regular files<br>
+    osl_File_E_OVERFLOW the resulting file offset would be a value which cannot	be represented correctly for regular files<br>
 
     @see osl_openFile()
     @see osl_setFilePos()
@@ -845,25 +845,25 @@ SAL_CALL osl_unmapFile (
 );
 
 
-/** Read a number of bytes from a file.
+/**	Read a number of bytes from a file. 
 
-    Reads a number of bytes from a file. The internal file pointer is
+    Reads a number of bytes from a file. The internal file pointer is 
     increased by the number of bytes read.
-
+    
     @param Handle [in]
     Handle to a file received by a previous call to osl_openFile().
-
+    
     @param pBuffer [out]
-    Points to a buffer which receives data. The buffer must be large enough
+    Points to a buffer which receives data. The buffer must be large enough	
     to hold uBytesRequested bytes.
-
+    
     @param uBytesRequested [in]
     Number of bytes which should be retrieved.
-
+    
     @param pBytesRead [out]
     On success the number of bytes which have actually been retrieved.
-
-    @return
+    
+    @return 
     osl_File_E_None on success<br>
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_INTR function call was interrupted<br>
@@ -883,16 +883,16 @@ SAL_CALL osl_unmapFile (
 oslFileError SAL_CALL osl_readFile( oslFileHandle Handle, void *pBuffer, sal_uInt64 uBytesRequested, sal_uInt64 *pBytesRead );
 
 
-/** Test if the end of a file is reached.
+/**	Test if the end of a file is reached.
 
     @param Handle [in]
     Handle to a file received by a previous call to osl_openFile().
-
+    
     @param pIsEOF [out]
     Points to a variable that receives the end-of-file status.
-
+    
     @return
-    osl_File_E_None on success <br>
+    osl_File_E_None on success <br> 
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_INTR function call was interrupted<br>
     osl_File_E_IO on I/O errors<br>
@@ -911,25 +911,25 @@ oslFileError SAL_CALL osl_readFile( oslFileHandle Handle, void *pBuffer, sal_uIn
 oslFileError SAL_CALL osl_isEndOfFile( oslFileHandle Handle, sal_Bool *pIsEOF );
 
 
-/** Write a number of bytes to a file.
-
-    Writes a number of bytes to a file.
+/** Write a number of bytes to a file. 
+    
+    Writes a number of bytes to a file. 
     The internal file pointer is increased by the number of bytes read.
-
+    
     @param Handle [in]
     Handle to a file received by a previous call to osl_openFile().
-
+    
     @param pBuffer [in]
     Points to a buffer which contains the data.
-
+    
     @param uBytesToWrite [in]
     Number of bytes which should be written.
-
+    
     @param pBytesWritten [out]
     On success the number of bytes which have actually been written.
 
-    @return
-    osl_File_E_None on success<br>
+    @return 
+    osl_File_E_None on success<br> 
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_FBIG file too large<br>
     osl_File_E_DQUOT quota exceeded<p>
@@ -980,16 +980,16 @@ oslFileError SAL_CALL osl_writeFileAt(
 );
 
 
-/** Read a line from a file.
+/** Read a line from a file. 
 
     Reads a line from a file. The new line delimiter is NOT returned!
 
     @param Handle [in]
     Handle to a file received by a previous call to osl_openFile().
-
-    @param  ppSequence [in/out]
+    
+    @param	ppSequence [in/out] 
     A pointer pointer to a sal_Sequence that will hold the line read on success.
-
+    
     @return
     osl_File_E_None on success<br>
     osl_File_E_INVAL the format of the parameters was not valid<br>
@@ -1011,21 +1011,21 @@ oslFileError SAL_CALL osl_readLine( oslFileHandle Handle, sal_Sequence** ppSeque
 
 /** Synchronize the memory representation of a file with that on the physical medium.
 
-     The function ensures that all modified data and attributes of the file associated with
-     the given file handle have been written to the physical medium.
-     In case the hard disk has a write cache enabled, the data may not really be on
+     The function ensures that all modified data and attributes of the file associated with 
+     the given file handle have been written to the physical medium. 
+     In case the hard disk has a write cache enabled, the data may not really be on 
      permanent storage when osl_syncFile returns.
-
+     
       @param Handle
-      [in] Handle to a file received by a previous call to osl_openFile().
-
+      [in] Handle to a file received by a previous call to osl_openFile().      
+      
       @return
       <dl>
       <dt>osl_File_E_None</dt>
       <dd>On success</dd>
       <dt>osl_File_E_INVAL</dt>
       <dd>The value of the input parameter is invalid</dd>
-      </dl>
+      </dl>      
       <br><p><strong>In addition to these error codes others may occur as well, for instance:</strong></p><br>
       <dl>
       <dt>osl_File_E_BADF</dt>
@@ -1039,39 +1039,39 @@ oslFileError SAL_CALL osl_readLine( oslFileHandle Handle, sal_Sequence** ppSeque
       <dt>osl_File_E_TIMEDOUT</dt>
       <dd>A remote connection timed out. This may happen when a file is on a remote location</dd>
       </dl>
-
+      
       @see osl_openFile()
-      @see osl_writeFile()
+      @see osl_writeFile()      
 */
 oslFileError SAL_CALL osl_syncFile(oslFileHandle Handle);
 
-/** Close an open file.
+/**	Close an open file.
 
     @param Handle [in]
     Handle to a file received by a previous call to osl_openFile().
-
-    @return
-    osl_File_E_None on success<br>
-    osl_File_E_INVAL the format of the parameters was not valid<br>
+    
+    @return 
+    osl_File_E_None on success<br> 
+    osl_File_E_INVAL the format of the parameters was not valid<br>	
     osl_File_E_BADF Bad file<br>
     osl_File_E_INTR function call was interrupted<br>
     osl_File_E_NOLINK link has been severed<br>
     osl_File_E_NOSPC no space left on device<br>
     osl_File_E_IO on I/O errors<br>
-
+    
     @see osl_openFile()
 */
 
 oslFileError SAL_CALL osl_closeFile( oslFileHandle Handle );
 
+    
+/**	Create a directory.
 
-/** Create a directory.
-
-    @param pustrDirectoryURL [in]
+    @param pustrDirectoryURL [in] 
     Full qualified URL of the directory to create.
 
-    @return
-    osl_File_E_None on success<br>
+    @return 
+    osl_File_E_None on success<br> 
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_NOMEM not enough memory for allocating structures <br>
     osl_File_E_EXIST file exists<br>
@@ -1095,13 +1095,13 @@ oslFileError SAL_CALL osl_closeFile( oslFileHandle Handle );
 oslFileError SAL_CALL osl_createDirectory( rtl_uString* pustrDirectoryURL );
 
 
-/** Remove an empty directory.
+/**	Remove an empty directory.
 
     @param pustrDirectoryURL [in]
     Full qualified URL of the directory.
-
-    @return
-    osl_File_E_None on success<br>
+    
+    @return 
+    osl_File_E_None on success<br> 
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_NOMEM not enough memory for allocating structures <br>
     osl_File_E_PERM operation not permitted<br>
@@ -1122,53 +1122,53 @@ oslFileError SAL_CALL osl_createDirectory( rtl_uString* pustrDirectoryURL );
 
     @see osl_createDirectory()
 */
-
+    
 oslFileError SAL_CALL osl_removeDirectory( rtl_uString* pustrDirectoryURL );
 
 /** Function pointer representing a function that will be called by osl_createDirectoryPath
     if a directory has been created.
 
-    To avoid unpredictable results the callee must not access the directory whose
-    creation is just notified.
-
+    To avoid unpredictable results the callee must not access the directory whose 
+    creation is just notified. 
+    
     @param pData
     [in] User specified data given in osl_createDirectoryPath.
-
+    
     @param aDirectoryUrl
     [in] The absolute file URL of the directory that was just created by
-    osl_createDirectoryPath.
-
+    osl_createDirectoryPath.        
+    
     @see osl_createDirectoryPath
 */
 typedef void (SAL_CALL *oslDirectoryCreationCallbackFunc)(void* pData, rtl_uString* aDirectoryUrl);
 
 /** Create a directory path.
 
-    The osl_createDirectoryPath function creates a specified directory path.
+    The osl_createDirectoryPath function creates a specified directory path. 
     All nonexisting sub directories will be created.
-    <p><strong>PLEASE NOTE:</strong> You cannot rely on getting the error code
-    osl_File_E_EXIST for existing directories. Programming against this error
+    <p><strong>PLEASE NOTE:</strong> You cannot rely on getting the error code 
+    osl_File_E_EXIST for existing directories. Programming against this error 
     code is in general a strong indication of a wrong usage of osl_createDirectoryPath.</p>
-
-    @param aDirectoryUrl
+    
+    @param aDirectoryUrl 
     [in] The absolute file URL of the directory path to create.
     A relative file URL will not be accepted.
-
+            
     @param aDirectoryCreationFunc
-    [in] Pointer to a function that will be called synchronously
-    for each sub directory that was created. The value of this
+    [in] Pointer to a function that will be called synchronously 
+    for each sub directory that was created. The value of this 
     parameter may be NULL, in this case notifications will not be
-    sent.
-
+    sent. 
+    
     @param pData
-    [in] User specified data to be passed to the directory creation
-    callback function. The value of this parameter may be arbitrary
-    and will not be interpreted by osl_createDirectoryPath.
-
-    @return
+    [in] User specified data to be passed to the directory creation 
+    callback function. The value of this parameter may be arbitrary 
+    and will not be interpreted by osl_createDirectoryPath. 
+    
+    @return 
     <dl>
-    <dt>osl_File_E_None</dt>
-    <dd>On success</dd>
+    <dt>osl_File_E_None</dt> 
+    <dd>On success</dd> 
     <dt>osl_File_E_INVAL</dt>
     <dd>The format of the parameters was not valid</dd>
     <dt>osl_File_E_ACCES</dt>
@@ -1196,23 +1196,23 @@ typedef void (SAL_CALL *oslDirectoryCreationCallbackFunc)(void* pData, rtl_uStri
     <dt>osl_File_E_invalidError</dt>
     <dd>An unknown error occurred</dd>
     </dl>
-
+    
     @see oslDirectoryCreationFunc
     @see oslFileError
     @see osl_createDirectory
 */
 oslFileError SAL_CALL osl_createDirectoryPath(
-    rtl_uString* aDirectoryUrl,
-    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
+    rtl_uString* aDirectoryUrl, 
+    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
     void* pData);
-
+    
 /** Remove a regular file.
 
     @param pustrFileURL [in]
     Full qualified URL of the file to remove.
-
-    @return
-    osl_File_E_None on success<br>
+    
+    @return 
+    osl_File_E_None on success<br> 
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_NOMEM not enough memory for allocating structures <br>
     osl_File_E_ACCES permission denied<br>
@@ -1230,25 +1230,25 @@ oslFileError SAL_CALL osl_createDirectoryPath(
     osl_File_E_MULTIHOP multihop attempted<br>
     osl_File_E_NOLINK link has been severed<br>
     osl_File_E_TXTBSY text file busy<br>
-
+    
     @see osl_openFile()
 */
 
 oslFileError SAL_CALL osl_removeFile( rtl_uString* pustrFileURL );
 
 
-/** Copy a file to a new destination.
+/** Copy a file to a new destination. 
 
-    Copies a file to a new destination. Copies only files not directories.
+    Copies a file to a new destination. Copies only files not directories. 
     No assumptions should be made about preserving attributes or file time.
-
-    @param pustrSourceFileURL [in]
+    
+    @param pustrSourceFileURL [in] 
     Full qualified URL of the source file.
-
+    
     @param pustrDestFileURL [in]
     Full qualified URL of the destination file. A directory is NOT a valid destination file!
-
-    @return
+    
+    @return 
     osl_File_E_None on success<br>
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_NOMEM not enough memory for allocating structures <br>
@@ -1259,26 +1259,26 @@ oslFileError SAL_CALL osl_removeFile( rtl_uString* pustrFileURL );
     osl_File_E_ISDIR is a directory<br>
     osl_File_E_ROFS read-only file system<p>
 
-    @see    osl_moveFile()
-    @see    osl_removeFile()
+    @see	osl_moveFile()
+    @see	osl_removeFile()
 */
 
 oslFileError SAL_CALL osl_copyFile( rtl_uString* pustrSourceFileURL, rtl_uString *pustrDestFileURL );
 
 
-/** Move a file or directory to a new destination or renames it.
+/** Move a file or directory to a new destination or renames it. 
 
-    Moves a file or directory to a new destination or renames it.
+    Moves a file or directory to a new destination or renames it. 
     File time and attributes are preserved.
-
+    
     @param pustrSourceFileURL [in]
     Full qualified URL of the source file.
-
+    
     @param pustrDestFileURL [in]
     Full qualified URL of the destination file. An existing directory is NOT a valid destination !
-
-    @return
-    osl_File_E_None on success<br>
+    
+    @return 
+    osl_File_E_None on success<br> 
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_NOMEM not enough memory for allocating structures <br>
     osl_File_E_ACCES permission denied<br>
@@ -1293,16 +1293,16 @@ oslFileError SAL_CALL osl_copyFile( rtl_uString* pustrSourceFileURL, rtl_uString
 oslFileError SAL_CALL osl_moveFile( rtl_uString* pustrSourceFileURL, rtl_uString *pustrDestFileURL );
 
 
-/** Determine a valid unused canonical name for a requested name.
+/**	Determine a valid unused canonical name for a requested name. 
 
-    Determines a valid unused canonical name for a requested name.
-    Depending on the Operating System and the File System the illegal characters are replaced by valid ones.
-    If a file or directory with the requested name already exists a new name is generated following
+    Determines a valid unused canonical name for a requested name. 
+    Depending on the Operating System and the File System the illegal characters are replaced by valid ones. 
+    If a file or directory with the requested name already exists a new name is generated following 
     the common rules on the actual Operating System and File System.
 
     @param pustrRequestedURL [in]
     Requested name of a file or directory.
-
+    
     @param ppustrValidURL [out]
     On success receives a name which is unused and valid on the actual Operating System and
     File System.
@@ -1317,25 +1317,25 @@ oslFileError SAL_CALL osl_moveFile( rtl_uString* pustrSourceFileURL, rtl_uString
 oslFileError SAL_CALL osl_getCanonicalName( rtl_uString *pustrRequestedURL, rtl_uString **ppustrValidURL);
 
 
-/** Convert a path relative to a given directory into an full qualified file URL.
-
+/**	Convert a path relative to a given directory into an full qualified file URL.
+    
     Convert a path relative to a given directory into an full qualified file URL.
     The function resolves symbolic links if possible and path ellipses, so on success
     the resulting absolute path is fully resolved.
-
+    
     @param pustrBaseDirectoryURL [in]
     Base directory URL to which the relative path is related to.
-
+    
     @param pustrRelativeFileURL [in]
     An URL of a file or directory relative to the directory path specified by pustrBaseDirectoryURL
     or an absolute path.
     If pustrRelativeFileURL denotes an absolute path pustrBaseDirectoryURL will be ignored.
-
+    
     @param ppustrAbsoluteFileURL [out]
     On success it receives the full qualified absoulte file URL.
 
-    @return
-    osl_File_E_None on success<br>
+    @return 
+    osl_File_E_None on success<br> 
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_NOMEM not enough memory for allocating structures <br>
     osl_File_E_NOTDIR not a directory<br>
@@ -1349,24 +1349,24 @@ oslFileError SAL_CALL osl_getCanonicalName( rtl_uString *pustrRequestedURL, rtl_
     osl_File_E_MULTIHOP multihop attempted<br>
     osl_File_E_NOLINK link has been severed<br>
 
-    @see    osl_getFileStatus()
+    @see	osl_getFileStatus()
 */
 
-oslFileError SAL_CALL osl_getAbsoluteFileURL(
-    rtl_uString* pustrBaseDirectoryURL,
-    rtl_uString *pustrRelativeFileURL,
+oslFileError SAL_CALL osl_getAbsoluteFileURL( 
+    rtl_uString* pustrBaseDirectoryURL, 
+    rtl_uString *pustrRelativeFileURL, 
     rtl_uString **ppustrAbsoluteFileURL );
 
 
-/** Convert a system dependend path into a file URL.
+/**	Convert a system dependend path into a file URL.
 
     @param pustrSystemPath [in]
     A System dependent path of a file or directory.
-
+    
     @param ppustrFileURL [out]
     On success it receives the file URL.
 
-    @return
+    @return 
     osl_File_E_None on success<br>
     osl_File_E_INVAL the format of the parameters was not valid<br>
 
@@ -1376,46 +1376,46 @@ oslFileError SAL_CALL osl_getAbsoluteFileURL(
 oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *pustrSystemPath, rtl_uString **ppustrFileURL);
 
 
-/** Searche a full qualified system path or a file URL.
+/**	Searche a full qualified system path or a file URL.
 
-    @param pustrFileName [in]
+    @param pustrFileName [in] 
     A system dependent path, a file URL, a file or relative directory.
-
+    
     @param pustrSearchPath [in]
-    A list of system paths, in which a given file has to be searched. The Notation of a path list is
+    A list of system paths, in which a given file has to be searched. The Notation of a path list is 
     system dependend, e.g. on UNIX system "/usr/bin:/bin" and on Windows "C:\BIN;C:\BATCH".
-    These paths are only for the search of a file or a relative path, otherwise it will be ignored.
-    If pustrSearchPath is NULL or while using the search path the search failed, the function searches for
-    a matching file in all system directories and in the directories listed in the PATH environment
-    variable.
-    The value of an environment variable should be used (e.g. LD_LIBRARY_PATH) if the caller is not
+    These paths are only for the search of a file or a relative path, otherwise it will be ignored. 
+    If pustrSearchPath is NULL or while using the search path the search failed, the function searches for 
+    a matching file in all system directories and in the directories listed in the PATH environment 
+    variable. 
+    The value of an environment variable should be used (e.g. LD_LIBRARY_PATH) if the caller is not 
     aware of the Operating System and so doesn't know which path list delimiter to use.
-
+                           
     @param ppustrFileURL [out]
     On success it receives the full qualified file URL.
 
-    @return
+    @return 
     osl_File_E_None on success<br>
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_NOTDIR not a directory<br>
     osl_File_E_NOENT no such file or directory not found<br>
-
+    
     @see osl_getFileURLFromSystemPath()
     @see osl_getSystemPathFromFileURL()
 */
 
-oslFileError SAL_CALL osl_searchFileURL( rtl_uString *pustrFileName, rtl_uString *pustrSearchPath, rtl_uString **ppustrFileURL );
+oslFileError SAL_CALL osl_searchFileURL( rtl_uString *pustrFileName, rtl_uString *pustrSearchPath, rtl_uString **ppustrFileURL ); 
 
 
-/** Convert a file URL into a system dependend path.
+/**	Convert a file URL into a system dependend path.
 
     @param pustrFileURL [in]
     A File URL.
-
+    
     @param ppustrSystemPath [out]
     On success it receives the system path.
 
-    @return
+    @return 
     osl_File_E_None on success
     osl_File_E_INVAL the format of the parameters was not valid
 
@@ -1429,9 +1429,9 @@ oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *pustrFileURL, r
 
     @param ustrText [in]
     Text to calculate the width for
-
+    
     @return
-    The width of the text specified by ustrText, e.g. it can return the width in pixel
+    The width of the text specified by ustrText, e.g. it can return the width in pixel 
     or the width in character count.
 
     @see osl_abbreviateSystemPath()
@@ -1444,59 +1444,59 @@ typedef sal_uInt32 (SAL_CALL *oslCalcTextWidthFunc)( rtl_uString *ustrText );
 
     @param ustrSystemPath [in]
     The full system path to abbreviate
-
+    
     @param pustrCompacted [out]
     Receives the compacted system path on output
-
-    @param pfnCalcWidth [in]
+    
+    @param pfnCalcWidth [in] 
     Function ptr that calculates the width of a string. Can be zero.
-
+    
     @param uMaxWidth [in]
-    Maximum width allowed that is retunrned from pfnCalcWidth.
+    Maximum width allowed that is retunrned from pfnCalcWidth. 
     If pfnCalcWidth is zero the character count is assumed as width.
 
-    @return
+    @return	
     osl_File_E_None on success<br>
 
-    @see    oslCalcTextWidthFunc
+    @see	oslCalcTextWidthFunc
 */
 
-oslFileError SAL_CALL osl_abbreviateSystemPath(
-    rtl_uString *ustrSystemPath,
-    rtl_uString **pustrCompacted,
-    sal_uInt32 uMaxWidth,
+oslFileError SAL_CALL osl_abbreviateSystemPath( 
+    rtl_uString *ustrSystemPath, 
+    rtl_uString **pustrCompacted, 
+    sal_uInt32 uMaxWidth, 
     oslCalcTextWidthFunc pCalcWidth );
 
 
-/** Set file attributes.
+/**	Set file attributes.
 
     @param pustrFileURL [in]
     The full qualified file URL.
-
+    
     @param uAttributes [in]
     Attributes of the file to be set.
 
-    @return
-    osl_File_E_None on success<br>
+    @return 
+    osl_File_E_None on success<br> 
     osl_File_E_INVAL the format of the parameters was not valid<br>
-
+    
     @see osl_getFileStatus()
 */
 
-oslFileError SAL_CALL osl_setFileAttributes( rtl_uString *pustrFileURL, sal_uInt64 uAttributes );
+oslFileError SAL_CALL osl_setFileAttributes( rtl_uString *pustrFileURL, sal_uInt64 uAttributes ); 
 
 
-/** Set the file time.
+/**	Set the file time.
 
     @param pustrFileURL [in]
     The full qualified URL of the file.
-
+    
     @param aCreationTime [in]
     Creation time of the given file.
-
+    
     @param aLastAccessTime [in]
     Time of the last access of the given file.
-
+    
     @param aLastWriteTime [in]
     Time of the last modifying of the given file.
 
@@ -1504,23 +1504,23 @@ oslFileError SAL_CALL osl_setFileAttributes( rtl_uString *pustrFileURL, sal_uInt
     osl_File_E_None on success<br>
     osl_File_E_INVAL the format of the parameters was not valid<br>
     osl_File_E_NOENT no such file or directory not found<br>
-
+    
     @see osl_getFileStatus()
 */
 
-oslFileError SAL_CALL osl_setFileTime(
-    rtl_uString *pustrFileURL,
+oslFileError SAL_CALL osl_setFileTime( 
+    rtl_uString *pustrFileURL,	
     const TimeValue *aCreationTime,
     const TimeValue *aLastAccessTime,
-    const TimeValue *aLastWriteTime);
+    const TimeValue *aLastWriteTime); 
 
 
-/** Retrieves the file URL of the system's temporary directory path
+/**	Retrieves the file URL of the system's temporary directory path
 
-    @param pustrTempDirURL[out]
-    On success receives the URL of system's temporary directory path.
+    @param pustrTempDirURL[out] 
+    On success receives the URL of system's	temporary directory path.
 
-    @return
+    @return 
     osl_File_E_None on success
     osl_File_E_NOENT no such file or directory not found
 */
@@ -1529,46 +1529,46 @@ oslFileError SAL_CALL osl_getTempDirURL( rtl_uString **pustrTempDirURL );
 
 
 /** Creates a temporary file in the directory provided by the caller or the
-    directory returned by osl_getTempDirURL.
-
+    directory returned by osl_getTempDirURL. 
+    
     Creates a temporary file in the directory provided by the caller or the
-    directory returned by osl_getTempDirURL.
-    Under UNIX Operating Systems the file will be created with read and write
-    access for the user exclusively.
-    If the caller requests only a handle to the open file but not the name of
-    it, the file will be automatically removed on close else the caller is
+    directory returned by osl_getTempDirURL. 
+    Under UNIX Operating Systems the file will be created with read and write 
+    access for the user exclusively. 
+    If the caller requests only a handle to the open file but not the name of 
+    it, the file will be automatically removed on close else the caller is 
     responsible for removing the file on success.
 
-    @param  pustrDirectoryURL [in]
-    Specifies the full qualified URL where the temporary file should be created.
+    @param  pustrDirectoryURL [in] 
+    Specifies the full qualified URL where the temporary file should be created. 
     If pustrDirectoryURL is 0 the path returned by osl_getTempDirURL will be used.
-
-    @param  pHandle [out]
-    On success receives a handle to the open file. If pHandle is 0 the file will
+            
+    @param  pHandle [out] 
+    On success receives a handle to the open file. If pHandle is 0 the file will 
     be closed on return, in this case ppustrTempFileURL must not be 0.
-
-    @param  ppustrTempFileURL [out]
+            
+    @param  ppustrTempFileURL [out] 
     On success receives the full qualified URL of the temporary file.
-    If ppustrTempFileURL is 0 the file will be automatically removed on close,
+    If ppustrTempFileURL is 0 the file will be automatically removed on close, 
     in this case pHandle must not be 0.
-    If ppustrTempFileURL is not 0 the caller receives the name of the created
+    If ppustrTempFileURL is not 0 the caller receives the name of the created 
     file and is responsible for removing the file, in this case
     *ppustrTempFileURL must be 0 or must point to a valid rtl_uString.
 
-    @descr
+    @descr  
     Description of the different pHandle, ppustrTempFileURL parameter combinations.
     pHandle is 0 and ppustrTempDirURL is 0 - this combination is invalid
-    pHandle is not 0 and ppustrTempDirURL is 0 - a handle to the open file
+    pHandle is not 0 and ppustrTempDirURL is 0 - a handle to the open file 
     will be returned on success and the file will be automatically removed on close.
-    pHandle is 0 and ppustrTempDirURL is not 0 - the name of the file will be returned,
+    pHandle is 0 and ppustrTempDirURL is not 0 - the name of the file will be returned, 
     the caller is responsible for opening, closing and removing the file.
     pHandle is not 0 and ppustrTempDirURL is not 0 - a handle to the open file as well as
-    the file name will be returned, the caller is responsible for closing and removing
+    the file name will be returned, the caller is responsible for closing and removing 
     the file.
-
-    @return
+                                
+    @return 
     osl_File_E_None   on success
-    osl_File_E_INVAL  the format of the parameter is invalid
+    osl_File_E_INVAL  the format of the parameter is invalid          
     osl_File_E_NOMEM  not enough memory for allocating structures
     osl_File_E_ACCES  Permission denied
     osl_File_E_NOENT  No such file or directory
@@ -1576,20 +1576,20 @@ oslFileError SAL_CALL osl_getTempDirURL( rtl_uString **pustrTempDirURL );
     osl_File_E_ROFS   Read-only file system
     osl_File_E_NOSPC  No space left on device
     osl_File_E_DQUOT  Quota exceeded
-
-    @see    osl_getTempDirURL()
+        
+    @see    osl_getTempDirURL()	
 */
 
 oslFileError SAL_CALL osl_createTempFile(
-    rtl_uString*   pustrDirectoryURL,
-    oslFileHandle* pHandle,
+    rtl_uString*   pustrDirectoryURL, 
+    oslFileHandle* pHandle, 
     rtl_uString**  ppustrTempFileURL);
-
+        
 #ifdef __cplusplus
 }
 #endif
 
-#endif  /* _OSL_FILE_H_ */
+#endif	/* _OSL_FILE_H_ */
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index 33083e0c8d49..68e278065ee5 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,16 +34,16 @@
 #ifdef __cplusplus
 
 #include <osl/time.h>
-#   include <rtl/memory.h>
-#   include <rtl/ustring.hxx>
+#	include <rtl/memory.h>
+#	include <rtl/ustring.hxx>
 
 #include <osl/file.h>
-#   include <rtl/byteseq.hxx>
+#	include <rtl/byteseq.hxx>
 
 #include <stdio.h>
 
 namespace osl
-{
+{     
 
 
 // -----------------------------------------------------------------------------
@@ -104,7 +104,7 @@ public:
         E_USERS        = osl_File_E_USERS,
         E_OVERFLOW     = osl_File_E_OVERFLOW,
         E_NOTREADY     = osl_File_E_NOTREADY,
-        E_invalidError = osl_File_E_invalidError,   /* unmapped error: always last entry in enum! */
+        E_invalidError = osl_File_E_invalidError,	/* unmapped error: always last entry in enum! */
         E_TIMEDOUT     = osl_File_E_TIMEDOUT,
         E_NETWORK      = osl_File_E_NETWORK
     };
@@ -112,16 +112,16 @@ public:
 
 public:
 
-    /** Determine a valid unused canonical name for a requested name.
+    /**	Determine a valid unused canonical name for a requested name. 
 
-        Determines a valid unused canonical name for a requested name.
-        Depending on the Operating System and the File System the illegal characters are replaced by valid ones.
-        If a file or directory with the requested name already exists a new name is generated following
+        Determines a valid unused canonical name for a requested name. 
+        Depending on the Operating System and the File System the illegal characters are replaced by valid ones. 
+        If a file or directory with the requested name already exists a new name is generated following 
         the common rules on the actual Operating System and File System.
 
         @param ustrRequestedURL [in]
         Requested name of a file or directory.
-
+        
         @param pustrValidURL [out]
         On success receives a name which is unused and valid on the actual Operating System and
         File System.
@@ -132,33 +132,33 @@ public:
 
         @see DirectoryItem::getFileStatus()
     */
-
+    
     static inline RC getCanonicalName( const ::rtl::OUString& ustrRequestedURL, ::rtl::OUString& ustrValidURL )
     {
         return (RC) osl_getCanonicalName( ustrRequestedURL.pData, &ustrValidURL.pData );
     }
 
-    /** Convert a path relative to a given directory into an full qualified file URL.
-
+    /**	Convert a path relative to a given directory into an full qualified file URL.
+    
         Convert a path relative to a given directory into an full qualified file URL.
         The function resolves symbolic links if possible and path ellipses, so on success
         the resulting absolute path is fully resolved.
-
+        
         @param ustrBaseDirectoryURL [in]
         Base directory URL to which the relative path is related to.
-
+        
         @param ustrRelativeFileURL [in]
         An URL of a file or directory relative to the directory path specified by ustrBaseDirectoryURL
         or an absolute path.
         If ustrRelativeFileURL denotes an absolute path ustrBaseDirectoryURL will be ignored.
-
+        
         @param ustrAbsoluteFileURL [out]
         On success it receives the full qualified absoulte file URL.
 
-        @return
-        E_None on success
+        @return 
+        E_None on success 
         E_INVAL the format of the parameters was not valid
-        E_NOMEM not enough memory for allocating structures
+        E_NOMEM not enough memory for allocating structures 
         E_NOTDIR not a directory
         E_ACCES permission denied
         E_NOENT no such file or directory
@@ -178,16 +178,16 @@ public:
         return (RC) osl_getAbsoluteFileURL( ustrBaseDirectoryURL.pData, ustrRelativeFileURL.pData, &ustrAbsoluteFileURL.pData );
     }
 
-    /** Convert a file URL into a system dependend path.
+    /**	Convert a file URL into a system dependend path.
 
         @param ustrFileURL [in]
         A File URL.
-
+        
         @param ustrSystemPath [out]
         On success it receives the system path.
 
-        @return
-        E_None on success
+        @return 
+        E_None on success 
         E_INVAL the format of the parameters was not valid
 
         @see getFileURLFromSystemPath()
@@ -198,15 +198,15 @@ public:
         return (RC) osl_getSystemPathFromFileURL( ustrFileURL.pData, &ustrSystemPath.pData );
     }
 
-    /** Convert a system dependend path into a file URL.
+    /**	Convert a system dependend path into a file URL.
 
         @param ustrSystemPath [in]
         A System dependent path of a file or directory.
-
+        
         @param ustrFileURL [out]
         On success it receives the file URL.
 
-        @return
+        @return 
         E_None on success
         E_INVAL the format of the parameters was not valid
 
@@ -218,30 +218,30 @@ public:
         return (RC) osl_getFileURLFromSystemPath( ustrSystemPath.pData, &ustrFileURL.pData );
     }
 
-    /** Searche a full qualified system path or a file URL.
-
-        @param ustrFileName [in]
-        A system dependent path, a file URL, a file or relative directory
+    /**	Searche a full qualified system path or a file URL.
 
+        @param ustrFileName [in] 
+        A system dependent path, a file URL, a file or relative directory 
+        
         @param ustrSearchPath [in]
-        A list of system paths, in which a given file has to be searched. The Notation of a path list is
+        A list of system paths, in which a given file has to be searched. The Notation of a path list is 
         system dependend, e.g. on UNIX system "/usr/bin:/bin" and on Windows "C:\BIN;C:\BATCH".
-        These paths are only for the search of a file or a relative path, otherwise it will be ignored.
-        If ustrSearchPath is NULL or while using the search path the search failed, the function searches for
-        a matching file in all system directories and in the directories listed in the PATH environment
-        variable.
-        The value of an environment variable should be used (e.g. LD_LIBRARY_PATH) if the caller is not
+        These paths are only for the search of a file or a relative path, otherwise it will be ignored. 
+        If ustrSearchPath is NULL or while using the search path the search failed, the function searches for 
+        a matching file in all system directories and in the directories listed in the PATH environment 
+        variable. 
+        The value of an environment variable should be used (e.g. LD_LIBRARY_PATH) if the caller is not 
         aware of the Operating System and so doesn't know which path list delimiter to use.
-
+                               
         @param ustrFileURL [out]
         On success it receives the full qualified file URL.
 
-        @return
+        @return 
         E_None on success
         E_INVAL the format of the parameters was not valid
         E_NOTDIR not a directory
         E_NOENT no such file or directory not found
-
+        
         @see getFileURLFromSystemPath()
         @see getSystemPathFromFileURL()
     */
@@ -251,79 +251,79 @@ public:
         return (RC) osl_searchFileURL( ustrFileName.pData, ustrSearchPath.pData, &ustrFileURL.pData );
     }
 
-    /** Retrieves the file URL of the system's temporary directory path.
+    /**	Retrieves the file URL of the system's temporary directory path.
 
-        @param ustrTempDirURL[out]
-        On success receives the URL of system's temporary directory path.
+        @param ustrTempDirURL[out] 
+        On success receives the URL of system's	temporary directory path.
 
-        @return
+        @return 
         E_None on success
-        E_NOENT no such file or directory not found
+        E_NOENT	no such file or directory not found
     */
 
     static inline RC getTempDirURL( ::rtl::OUString& ustrTempDirURL )
     {
         return (RC) osl_getTempDirURL( &ustrTempDirURL.pData );
     }
-
+    
     /** Creates a temporary file in the directory provided by the caller or the
-        directory returned by getTempDirURL.
-        Under UNIX Operating Systems the file will be created with read and write
-        access for the user exclusively.
-        If the caller requests only a handle to the open file but not the name of
-        it, the file will be automatically removed on close else the caller is
+        directory returned by getTempDirURL. 
+        Under UNIX Operating Systems the file will be created with read and write 
+        access for the user exclusively. 
+        If the caller requests only a handle to the open file but not the name of 
+        it, the file will be automatically removed on close else the caller is 
         responsible for removing the file on success.<br><br>
 
-        @param  pustrDirectoryURL [in]
-        Specifies the full qualified URL where the temporary file should be created.
+        @param  pustrDirectoryURL [in] 
+        Specifies the full qualified URL where the temporary file should be created. 
         If pustrDirectoryURL is 0 the path returned by osl_getTempDirURL will be used.
-
-        @param  pHandle [out]
+            
+        @param  pHandle [out] 
         On success receives a handle to the open file.
         If pHandle is 0 the file will be closed on return, in this case
         pustrTempFileURL must not be 0.
-
-        @param  pustrTempFileURL [out]
+            
+        @param  pustrTempFileURL [out] 
         On success receives the full qualified URL of the temporary file.
         If pustrTempFileURL is 0 the file will be automatically removed
         on close, in this case pHandle must not be 0.
         If pustrTempFileURL is not 0 the caller receives the name of the
-        created file and is responsible for removing the file.
+        created file and is responsible for removing the file.              
 
-        @descr
+        @descr  
         Description of the different pHandle, ppustrTempFileURL parameter combinations.
         pHandle is 0 and pustrTempDirURL is 0 - this combination is invalid<br>
-        pHandle is not 0 and pustrTempDirURL is 0 - a handle to the open file
+        pHandle is not 0 and pustrTempDirURL is 0 - a handle to the open file 
         will be returned on success and the file will be automatically removed on close<br>
         pHandle is 0 and pustrTempDirURL is not 0 - the name of the file will be
         returned, the caller is responsible for opening, closing and removing the file.<br>
         pHandle is not 0 and pustrTempDirURL is not 0 - a handle to the open file as well as
-        the file name will be returned, the caller is responsible for closing and removing
+        the file name will be returned, the caller is responsible for closing and removing 
         the file.<br>
-
-        @return
+                                    
+        @return 
         E_None   on success
-        E_INVAL  the format of the parameter is invalid
+        E_INVAL  the format of the parameter is invalid           
         E_NOMEM  not enough memory for allocating structures
-        E_ACCES  Permission denied
+        E_ACCES  Permission denied	        
         E_NOENT  No such file or directory
         E_NOTDIR Not a directory
         E_ROFS   Read-only file system
         E_NOSPC  No space left on device
         E_DQUOT  Quota exceeded
-
+            
         @see getTempDirURL()
     */
-
+    
     static inline RC createTempFile(
-        ::rtl::OUString* pustrDirectoryURL,
-        oslFileHandle*   pHandle,
+        ::rtl::OUString* pustrDirectoryURL, 
+        oslFileHandle*   pHandle, 
         ::rtl::OUString* pustrTempFileURL)
-    {
+    {	    	            
         rtl_uString*  pustr_dir_url       = pustrDirectoryURL ? pustrDirectoryURL->pData : 0;
         rtl_uString** ppustr_tmp_file_url = pustrTempFileURL  ? &pustrTempFileURL->pData : 0;
-
-        return (RC) osl_createTempFile(pustr_dir_url, pHandle, ppustr_tmp_file_url);
+        
+        return (RC) osl_createTempFile(pustr_dir_url, pHandle, ppustr_tmp_file_url);            
     }
 };
 
@@ -342,33 +342,33 @@ class VolumeDevice : public FileBase
 #ifdef OS2
 public:
 #endif
-    oslVolumeDeviceHandle   _aHandle;
+    oslVolumeDeviceHandle	_aHandle;
 
 public:
 
     /** Constructor.
     */
-
+    
     VolumeDevice() : _aHandle( NULL )
     {
     }
 
     /** Copy constructor.
-
+    
         @param rDevice
         The other volume device.
     */
-
+    
     VolumeDevice( const VolumeDevice & rDevice )
     {
         _aHandle = rDevice._aHandle;
         if ( _aHandle )
             osl_acquireVolumeDeviceHandle( _aHandle );
     }
-
+    
     /** Destructor.
     */
-
+    
     ~VolumeDevice()
     {
         if ( _aHandle )
@@ -376,14 +376,14 @@ public:
     }
 
     /** Assignment operator.
-
+    
         @param rDevice
         The other volume device.
     */
-
+    
     inline VolumeDevice & operator =( const VolumeDevice & rDevice )
     {
-        oslVolumeDeviceHandle   newHandle = rDevice._aHandle;
+        oslVolumeDeviceHandle	newHandle = rDevice._aHandle;
 
         if ( newHandle )
             osl_acquireVolumeDeviceHandle( newHandle );
@@ -397,41 +397,41 @@ public:
     }
 
     /** Automount a volume device.
-
+                        
         @return
         E_None on success
-
-        @todo
-        specify all error codes that may be returned
+        
+        @todo 
+        specify all error codes that may be returned                
     */
-
+    
     inline RC automount()
     {
         return (RC)osl_automountVolumeDevice( _aHandle );
     }
 
     /** Unmount a volume device.
-
+        
         @return
         E_None on success
-
-        @todo
-        specify all error codes that may be returned
+        
+        @todo 
+        specify all error codes that may be returned                
     */
-
+    
     inline RC unmount()
     {
         return (RC)osl_unmountVolumeDevice( _aHandle );
     }
 
     /** Get the full qualified URL where a device is mounted to.
-
-           @return
-        The full qualified URL where the device is mounted to.
+           
+           @return	    
+        The full qualified URL where the device is mounted to.    	
     */
     inline rtl::OUString getMountPath()
     {
-        rtl::OUString   aPath;
+        rtl::OUString	aPath;
         osl_getVolumeDeviceMountPath( _aHandle, &aPath.pData );
         return aPath;
     }
@@ -462,25 +462,25 @@ class Directory;
 
 class VolumeInfo
 {
-    oslVolumeInfo   _aInfo;
-    sal_uInt32      _nMask;
-    VolumeDevice    _aDevice;
+    oslVolumeInfo	_aInfo;
+    sal_uInt32		_nMask;
+    VolumeDevice	_aDevice;
 
     /** Copy constructor.
     */
 
     VolumeInfo( VolumeInfo& );
-
+    
     /** Assginment operator.
     */
-
+    
     VolumeInfo& operator = ( VolumeInfo& );
 
 public:
 
     /** Constructor.
 
-        @param nMask
+        @param nMask 
         Set of flaggs decribing the demanded information.
     */
 
@@ -504,7 +504,7 @@ public:
 
         @param nMask
         Set of flags for the fields to check.
-
+        
         @return sal_True if all fields are valid else sal_False.
     */
 
@@ -514,8 +514,8 @@ public:
     }
 
     /** Check the remote flag.
-
-        @return
+    
+        @return 
         sal_True if Attributes are valid and the volume is remote else sal_False.
     */
 
@@ -525,8 +525,8 @@ public:
     }
 
     /** Check the removeable flag.
-
-        @return
+    
+        @return 
         sal_True if attributes are valid and the volume is removable else sal_False.
     */
 
@@ -536,8 +536,8 @@ public:
     }
 
     /** Check the compact disc flag.
-
-        @return
+    
+        @return 
         sal_True if attributes are valid and the volume is a CDROM else sal_False.
     */
 
@@ -547,8 +547,8 @@ public:
     }
 
     /** Check the floppy disc flag.
-
-        @return
+        
+        @return 
         sal_True if attributes are valid and the volume is a floppy disk else sal_False.
     */
 
@@ -558,8 +558,8 @@ public:
     }
 
     /** Check the fixed disk flag.
-
-        @return
+    
+        @return 
         sal_True if attributes are valid and the volume is a fixed disk else sal_False.
     */
 
@@ -569,8 +569,8 @@ public:
     }
 
     /** Check the RAM disk flag.
-
-        @return
+    
+        @return 
         sal_True if attributes are valid and the volume is a RAM disk else sal_False.
     */
 
@@ -580,8 +580,8 @@ public:
     }
 
     /** Determine the total space of a volume device.
-
-        @return
+    
+        @return 
         The total diskspace of this volume if this information is valid,
         0 otherwise.
     */
@@ -592,8 +592,8 @@ public:
     }
 
     /** Determine the free space of a volume device.
-
-        @return
+    
+        @return 
         The free diskspace of this volume if this information is valid,
         0 otherwise.
     */
@@ -604,8 +604,8 @@ public:
     }
 
     /** Determine the used space of a volume device.
-
-        @return
+    
+        @return 
         The used diskspace of this volume if this information is valid,
         0 otherwise.
     */
@@ -616,7 +616,7 @@ public:
     }
 
     /** Determine the maximal length of a file name.
-
+    
         @return
         The maximal length of a file name if this information is valid,
         0 otherwise.
@@ -628,8 +628,8 @@ public:
     }
 
     /** Determine the maximal length of a path name.
-
-        @return
+    
+        @return 
         The maximal length of a path if this information is valid,
         0 otherwise.
     */
@@ -640,8 +640,8 @@ public:
     }
 
     /** Determine the name of the volume device's File System.
-
-        @return
+    
+        @return 
         The name of the volume's fielsystem if this information is valid,
         otherwise an empty string.
     */
@@ -653,8 +653,8 @@ public:
 
 
     /** Get the volume device handle.
-
-        @return
+    
+        @return 
         The device handle of the volume if this information is valid,
         otherwise returns NULL;
     */
@@ -664,9 +664,9 @@ public:
         return _aDevice;
     }
 
-    /** Return whether the file system is case sensitive or
-        case insensitive
-
+    /** Return whether the file system is case sensitive or 
+        case insensitive 
+        
         @return
         true if the file system is case sensitive false otherwise
     */
@@ -674,10 +674,10 @@ public:
     {
         return (_aInfo.uAttributes & osl_Volume_Attribute_Case_Sensitive);
     }
-
-    /** Return whether the file system preserves the case of
+    
+    /** Return whether the file system preserves the case of 
         file and directory names or not
-
+        
         @return
         true if the file system preserves the case of file and
         directory names false otherwise
@@ -686,23 +686,23 @@ public:
     {
         return (_aInfo.uAttributes & osl_Volume_Attribute_Case_Is_Preserved);
     }
-
+    
     friend class Directory;
 };
 
 // -----------------------------------------------------------------------------
 
-#define FileStatusMask_Type             osl_FileStatus_Mask_Type
-#define FileStatusMask_Attributes       osl_FileStatus_Mask_Attributes
-#define FileStatusMask_CreationTime     osl_FileStatus_Mask_CreationTime
-#define FileStatusMask_AccessTime       osl_FileStatus_Mask_AccessTime
-#define FileStatusMask_ModifyTime       osl_FileStatus_Mask_ModifyTime
-#define FileStatusMask_FileSize         osl_FileStatus_Mask_FileSize
-#define FileStatusMask_FileName         osl_FileStatus_Mask_FileName
-#define FileStatusMask_FileURL          osl_FileStatus_Mask_FileURL
-#define FileStatusMask_LinkTargetURL    osl_FileStatus_Mask_LinkTargetURL
-#define FileStatusMask_All              osl_FileStatus_Mask_All
-#define FileStatusMask_Validate         osl_FileStatus_Mask_Validate
+#define	FileStatusMask_Type				osl_FileStatus_Mask_Type
+#define FileStatusMask_Attributes		osl_FileStatus_Mask_Attributes
+#define FileStatusMask_CreationTime		osl_FileStatus_Mask_CreationTime
+#define FileStatusMask_AccessTime		osl_FileStatus_Mask_AccessTime
+#define FileStatusMask_ModifyTime		osl_FileStatus_Mask_ModifyTime
+#define FileStatusMask_FileSize			osl_FileStatus_Mask_FileSize
+#define FileStatusMask_FileName			osl_FileStatus_Mask_FileName
+#define FileStatusMask_FileURL			osl_FileStatus_Mask_FileURL
+#define FileStatusMask_LinkTargetURL	osl_FileStatus_Mask_LinkTargetURL
+#define FileStatusMask_All				osl_FileStatus_Mask_All
+#define FileStatusMask_Validate			osl_FileStatus_Mask_Validate
 
 #define Attribute_ReadOnly     osl_File_Attribute_ReadOnly
 #define Attribute_Hidden       osl_File_Attribute_Hidden
@@ -726,23 +726,23 @@ class DirectoryItem;
 
 class FileStatus
 {
-    oslFileStatus   _aStatus;
-    sal_uInt32      _nMask;
+    oslFileStatus	_aStatus;
+    sal_uInt32		_nMask;
 
     /** Copy constructor.
     */
 
     FileStatus( FileStatus& );
-
+    
     /** Assignment operator.
     */
-
+    
     FileStatus& operator = ( FileStatus& );
 
 public:
 
     enum Type {
-        Directory = osl_File_Type_Directory,
+        Directory =	osl_File_Type_Directory,
         Volume    = osl_File_Type_Volume,
         Regular   = osl_File_Type_Regular,
         Fifo      = osl_File_Type_Fifo,
@@ -758,7 +758,7 @@ public:
         Set of flaggs decribing the demanded information.
     */
 
-    FileStatus( sal_uInt32 nMask ): _nMask( nMask )
+    FileStatus( sal_uInt32 nMask ): _nMask( nMask ) 
     {
         _aStatus.uStructSize = sizeof( oslFileStatus );
         rtl_fillMemory( &_aStatus.uValidFields, sizeof( oslFileStatus ) - sizeof( sal_uInt32 ), 0 );
@@ -781,19 +781,19 @@ public:
 
         @param nMask
         Set of flags for the fields to check.
-
-        @return
+        
+        @return 
         sal_True if all fields are valid else sal_False.
     */
-
+    
     inline sal_Bool isValid( sal_uInt32 nMask ) const
     {
         return ( nMask & _aStatus.uValidFields ) == nMask;
     }
 
     /** Get the file type.
-
-        @return
+    
+        @return 
         The file type if this information is valid, Unknown otherwise.
     */
     inline Type getFileType() const
@@ -802,8 +802,8 @@ public:
     }
 
     /** Get the file attributes.
-
-        @return
+    
+        @return 
         The set of attribute flags of this file.
     */
 
@@ -813,8 +813,8 @@ public:
     }
 
     /** Get the creation time of this file.
-
-        @return
+    
+        @return 
         The creation time if this information is valid,
         an uninitialized TimeValue otherwise.
     */
@@ -825,8 +825,8 @@ public:
     }
 
     /** Get the file access time.
-
-        @return
+    
+        @return 
         The last access time if this information is valid,
         an uninitialized TimeValue otherwise.
     */
@@ -837,8 +837,8 @@ public:
     }
 
     /** Get the file modification time.
-
-        @return
+    
+        @return 
         The last modified time if this information is valid,
         an uninitialized TimeValue otherwise.
     */
@@ -849,8 +849,8 @@ public:
     }
 
     /** Get the size of the file.
-
-        @return
+    
+        @return 
         The actual file size if this information is valid, 0 otherwise.
     */
 
@@ -860,8 +860,8 @@ public:
     }
 
     /** Get the file name.
-
-        @return
+    
+        @return 
         The file name if this information is valid, an empty string otherwise.
     */
 
@@ -872,8 +872,8 @@ public:
 
 
     /** Get the URL of the file.
-
-        @return
+    
+        @return 
         The full qualified URL of the file if this information is valid, an empty string otherwise.
     */
 
@@ -883,8 +883,8 @@ public:
     }
 
     /** Get the link target URL.
-
-        @return
+    
+        @return 
         The link target URL if this information is valid, an empty string otherwise.
     */
 
@@ -905,25 +905,25 @@ public:
  */
 
 class File: public FileBase
-{
+{        
     oslFileHandle   _pData;
     ::rtl::OUString _aPath;
 
-    /** Copy constructor.
+    /** Copy constructor. 
     */
 
     File( File& );
-
+    
     /** Assginment operator.
     */
-
+    
     File& operator = ( File& );
 
 public:
 
     /** Constructor.
 
-        @param  ustrFileURL [in]
+        @param  ustrFileURL [in] 
         The full qualified URL of the file. Relative paths are not allowed.
     */
 
@@ -944,14 +944,14 @@ public:
 
     /** Open a regular file.
 
-        Open a file. Only regular files can be openend.
-
+        Open a file. Only regular files	can be openend.
+                        
         @param uFlags [in]
         Specifies the open mode.
-
-        @return
-        E_None on success
-        E_NOMEM not enough memory for allocating structures
+        
+        @return 
+        E_None on success 
+        E_NOMEM not enough memory for allocating structures 
         E_INVAL the format of the parameters was not valid
         E_NAMETOOLONG pathname was too long
         E_NOENT no such file or directory
@@ -990,17 +990,17 @@ public:
         return (RC) osl_openFile( _aPath.pData, &_pData, uFlags );
     }
 
-    /** Close an open file.
-
-        @return
-        E_None on success
-        E_INVAL the format of the parameters was not valid
+    /**	Close an open file.
+        
+        @return 
+        E_None on success 
+        E_INVAL the format of the parameters was not valid	
         E_BADF Bad file
         E_INTR function call was interrupted
         E_NOLINK link has been severed
         E_NOSPC no space left on device
         E_IO on I/O errors
-
+        
         @see open()
     */
 
@@ -1023,15 +1023,15 @@ public:
     #define Pos_End     osl_Pos_End
 
     /** Set the internal position pointer of an open file.
-
-        @param uHow [in]
+        
+        @param uHow [in] 
         Distance to move the internal position pointer (from uPos).
-
+        
         @param uPos [in]
         Absolute position from the beginning of the file.
-
-        @return
-        E_None on success
+        
+        @return 
+        E_None on success 
         E_INVAL the format of the parameters was not valid
         E_OVERFLOW the resulting file offset would be a value which cannot be represented correctly for regular files
 
@@ -1044,13 +1044,13 @@ public:
         return (RC) osl_setFilePos( _pData, uHow, uPos );
     }
 
-    /** Retrieve the current position of the internal pointer of an open file.
-
-        @param uPos [out]
+    /**	Retrieve the current position of the internal pointer of an open file.
+        
+        @param uPos [out] 
         On success receives the current position of the file pointer.
-
-        @return
-        E_None on success
+        
+        @return 
+        E_None on success 
         E_INVAL the format of the parameters was not valid
         E_OVERFLOW the resulting file offset would be a value which cannot be represented correctly for regular files
 
@@ -1065,13 +1065,13 @@ public:
         return (RC) osl_getFilePos( _pData, &uPos );
     }
 
-    /** Test if the end of a file is reached.
-
+    /**	Test if the end of a file is reached.
+        
         @param pIsEOF [out]
         Points to a variable that receives the end-of-file status.
-
+        
         @return
-        E_None on success
+        E_None on success  
         E_INVAL the format of the parameters was not valid
         E_INTR function call was interrupted
         E_IO on I/O errors
@@ -1092,18 +1092,18 @@ public:
         return (RC) osl_isEndOfFile( _pData, pIsEOF );
     }
 
-    /** Set the file size of an open file.
+    /**	Set the file size of an open file. 
 
         Sets the file size of an open file. The file can be truncated or enlarged by the function.
         The position of the file pointer is not affeced by this function.
-
-        @param uSize [in]
+                
+        @param uSize [in] 
         New size in bytes.
-
-        @return
-        E_None on success
+        
+        @return 
+        E_None on success 
         E_INVAL the format of the parameters was not valid
-        E_OVERFLOW the resulting file offset would be a value which cannot  be represented correctly for regular files
+        E_OVERFLOW the resulting file offset would be a value which cannot	be represented correctly for regular files
 
         @see open()
         @see setPos()
@@ -1115,18 +1115,18 @@ public:
         return (RC) osl_setFileSize( _pData, uSize );
     }
 
-    /** Get the file size of an open file.
+    /**	Get the file size of an open file. 
 
-        Gets the file size of an open file.
+        Gets the file size of an open file. 
         The position of the file pointer is not affeced by this function.
-
-        @param rSize [out]
+                
+        @param rSize [out] 
         Current size in bytes.
-
-        @return
-        E_None on success
+        
+        @return 
+        E_None on success 
         E_INVAL the format of the parameters was not valid
-        E_OVERFLOW the resulting file offset would be a value which cannot  be represented correctly for regular files
+        E_OVERFLOW the resulting file offset would be a value which cannot	be represented correctly for regular files
 
         @see open()
         @see setPos()
@@ -1140,22 +1140,22 @@ public:
         return (RC) osl_getFileSize( _pData, &rSize );
     }
 
-    /** Read a number of bytes from a file.
+    /**	Read a number of bytes from a file. 
 
-        Reads a number of bytes from a file. The internal file pointer is
+        Reads a number of bytes from a file. The internal file pointer is 
         increased by the number of bytes read.
-
+                
         @param pBuffer [out]
-        Points to a buffer which receives data. The buffer must be large enough
+        Points to a buffer which receives data. The buffer must be large enough	
         to hold uBytesRequested bytes.
-
+        
         @param uBytesRequested [in]
         Number of bytes which should be retrieved.
-
+        
         @param rBytesRead [out]
         On success the number of bytes which have actually been retrieved.
-
-        @return
+        
+        @return 
         E_None on success
         E_INVAL the format of the parameters was not valid
         E_INTR function call was interrupted
@@ -1177,22 +1177,22 @@ public:
         return (RC) osl_readFile( _pData, pBuffer, uBytesRequested, &rBytesRead );
     }
 
-    /** Write a number of bytes to a file.
-
-        Writes a number of bytes to a file.
+    /** Write a number of bytes to a file. 
+    
+        Writes a number of bytes to a file. 
         The internal file pointer is increased by the number of bytes read.
-
+                
         @param pBuffer [in]
         Points to a buffer which contains the data.
-
+        
         @param uBytesToWrite [in]
         Number of bytes which should be written.
-
+        
         @param rBytesWritten [out]
         On success the number of bytes which have actually been written.
 
-        @return
-        E_None on success
+        @return 
+        E_None on success 
         E_INVAL the format of the parameters was not valid
         E_FBIG file too large
         E_DQUOT quota exceeded
@@ -1217,13 +1217,13 @@ public:
     }
 
 
-    /** Read a line from a file.
+    /** Read a line from a file. 
 
         Reads a line from a file. The new line delimiter is NOT returned!
-
-        @param  aSeq [in/out]
+        
+        @param	aSeq [in/out] 
         A reference to a ::rtl::ByteSequence that will hold the line read on success.
-
+        
         @return
         E_None on success
         E_INVAL the format of the parameters was not valid
@@ -1247,13 +1247,13 @@ public:
     }
 
     /** Synchronize the memory representation of a file with that on the physical medium.
-
-    The function ensures that all modified data and attributes of the file associated with
-    the given file handle have been written to the physical medium.
-    In case the hard disk has a write cache enabled, the data may not really be on
+                
+    The function ensures that all modified data and attributes of the file associated with 
+    the given file handle have been written to the physical medium. 
+    In case the hard disk has a write cache enabled, the data may not really be on 
     permanent storage when osl_syncFile returns.
 
-    @return
+    @return 
     <dl>
     <dt>E_None</dt>
     <dd>On success</dd>
@@ -1282,22 +1282,22 @@ public:
         OSL_PRECOND(_pData, "File::sync(): File not open");
         return (RC)osl_syncFile(_pData);
     }
+    
+    /** Copy a file to a new destination. 
 
-    /** Copy a file to a new destination.
-
-        Copies a file to a new destination. Copies only files not directories.
+        Copies a file to a new destination. Copies only files not directories. 
         No assumptions should be made about preserving attributes or file time.
-
-        @param ustrSourceFileURL [in]
+        
+        @param ustrSourceFileURL [in] 
         Full qualified URL of the source file.
-
+        
         @param ustrDestFileURL [in]
         Full qualified URL of the destination file. A directory is NOT a valid destination file!
-
-        @return
+        
+        @return 
         E_None on success
         E_INVAL the format of the parameters was not valid
-        E_NOMEM not enough memory for allocating structures
+        E_NOMEM not enough memory for allocating structures 
         E_ACCES permission denied
         E_PERM operation not permitted
         E_NAMETOOLONG file name too long
@@ -1314,21 +1314,21 @@ public:
         return (RC) osl_copyFile( ustrSourceFileURL.pData, ustrDestFileURL.pData );
     }
 
-    /** Move a file or directory to a new destination or renames it.
+    /** Move a file or directory to a new destination or renames it. 
 
-        Moves a file or directory to a new destination or renames it.
+        Moves a file or directory to a new destination or renames it. 
         File time and attributes are preserved.
-
+        
         @param ustrSourceFileURL [in]
         Full qualified URL of the source file.
-
+        
         @param ustrDestFileURL [in]
         Full qualified URL of the destination file. An existing directory is NOT a valid destination !
-
-        @return
-        E_None on success
+        
+        @return 
+        E_None on success 
         E_INVAL the format of the parameters was not valid
-        E_NOMEM not enough memory for allocating structures
+        E_NOMEM not enough memory for allocating structures 
         E_ACCES permission denied
         E_PERM operation not permitted
         E_NAMETOOLONG file name too long
@@ -1347,11 +1347,11 @@ public:
 
         @param ustrFileURL [in]
         Full qualified URL of the file to remove.
-
-        @return
-        E_None on success
+        
+        @return 
+        E_None on success 
         E_INVAL the format of the parameters was not valid
-        E_NOMEM not enough memory for allocating structures
+        E_NOMEM not enough memory for allocating structures 
         E_ACCES permission denied
         E_PERM operation not permitted
         E_NAMETOOLONG file name too long
@@ -1367,7 +1367,7 @@ public:
         E_MULTIHOP multihop attempted
         E_NOLINK link has been severed
         E_TXTBSY text file busy
-
+        
         @see open()
     */
 
@@ -1376,18 +1376,18 @@ public:
         return (RC) osl_removeFile( ustrFileURL.pData );
     }
 
-    /** Set file attributes.
+    /**	Set file attributes.
 
         @param ustrFileURL [in]
         The full qualified file URL.
-
+        
         @param uAttributes [in]
         Attributes of the file to be set.
 
-        @return
-        E_None on success
+        @return 
+        E_None on success 
         E_INVAL the format of the parameters was not valid
-
+        
         @see FileStatus
     */
 
@@ -1396,17 +1396,17 @@ public:
         return (RC) osl_setFileAttributes( ustrFileURL.pData, uAttributes );
     }
 
-    /** Set the file time.
+    /**	Set the file time.
 
         @param ustrFileURL [in]
         The full qualified URL of the file.
-
+        
         @param rCreationTime [in]
         Creation time of the given file.
-
+        
         @param rLastAccessTime [in]
         Time of the last access of the given file.
-
+        
         @param rLastWriteTime [in]
         Time of the last modifying of the given file.
 
@@ -1414,18 +1414,18 @@ public:
         E_None on success
         E_INVAL the format of the parameters was not valid
         E_NOENT no such file or directory not found
-
+        
         @see FileStatus
     */
 
-    inline static RC setTime(
-        const ::rtl::OUString& ustrFileURL,
+    inline static RC setTime( 
+        const ::rtl::OUString& ustrFileURL, 
         const TimeValue& rCreationTime,
         const TimeValue& rLastAccessTime,
         const TimeValue& rLastWriteTime )
     {
         return (RC)  osl_setFileTime(
-            ustrFileURL.pData,
+            ustrFileURL.pData, 
             &rCreationTime,
             &rLastAccessTime,
             &rLastWriteTime );
@@ -1482,7 +1482,7 @@ public:
                 osl_releaseDirectoryItem( _pData );
 
             _pData = rItem._pData;
-
+        
             if( _pData )
                 osl_acquireDirectoryItem( _pData );
         }
@@ -1490,8 +1490,8 @@ public:
     }
 
     /** Check for validity of this instance.
-
-        @return
+    
+        @return 
         sal_True if object is valid directory item else sal_False.
      */
 
@@ -1500,36 +1500,36 @@ public:
         return _pData != NULL;
     }
 
-    /** Retrieve a single directory item.
+    /**	Retrieve a single directory item. 
 
         Retrieves a single directory item. The returned handle has an initial refcount of 1.
-        Due to performance issues it is not recommended to use this function while
+        Due to performance issues it is not recommended to use this function while 
         enumerating the contents of a directory. In this case use osl_getNextDirectoryItem() instead.
-
-        @param ustrFileURL [in]
-        An absolute file URL.
-
-        @param rItem [out]
+        
+        @param ustrFileURL [in] 
+        An absolute file URL. 
+        
+        @param rItem [out] 
         On success it receives a handle which can be used for subsequent calls to osl_getFileStatus().
         The handle has to be released by a call to osl_releaseDirectoryItem().
-
-        @return
-        E_None on success
+        
+        @return 
+        E_None on success 
         E_INVAL the format of the parameters was not valid
-        E_NOMEM not enough memory for allocating structures
+        E_NOMEM not enough memory for allocating structures 
         E_ACCES permission denied
         E_MFILE too many open files used by the process
         E_NFILE too many open files in the system
         E_NOENT no such file or directory
-        E_LOOP  too many symbolic links encountered
+        E_LOOP	too many symbolic links encountered
         E_NAMETOOLONG the file name is too long
-        E_NOTDIR a component of the path prefix of path is not a directory
+        E_NOTDIR a component of the path prefix of path is not a directory	
         E_IO on I/O errors
         E_MULTIHOP multihop attempted
         E_NOLINK link has been severed
         E_FAULT bad address
         E_INTR the function call was interrupted
-
+        
         @see FileStatus
         @see Directory::getNextItem()
     */
@@ -1545,15 +1545,15 @@ public:
         return (RC) osl_getDirectoryItem( ustrFileURL.pData, &rItem._pData );
     }
 
-    /** Retrieve information about a single file or directory.
-
-        @param  rStatus [in|out]
+    /**	Retrieve information about a single file or directory.
+        
+        @param	rStatus [in|out] 
         Reference to a class which receives the information of the file or directory
-        represented by this directory item.
-
-        @return
+        represented by this directory item. 
+                
+        @return 
         E_None on success
-        E_NOMEM not enough memory for allocating structures
+        E_NOMEM not enough memory for allocating structures 
         E_INVAL the format of the parameters was not valid
         E_LOOP too many symbolic links encountered
         E_ACCES permission denied
@@ -1573,8 +1573,8 @@ public:
         E_NOSYS function not implemented
 
         @see get()
-        @see Directory::getNextItem()
-        @see FileStatus
+        @see Directory::getNextItem()	   
+        @see FileStatus 
     */
 
     inline RC getFileStatus( FileStatus& rStatus )
@@ -1590,33 +1590,33 @@ public:
 /** Base class for observers of directory creation notifications.
 
     Clients which uses the method createDirectoryPath of the class
-    Directory may want to be informed about the directories that
-    have been created. This may be accomplished by deriving from
-    this base class and overwriting the virtual function
+    Directory may want to be informed about the directories that 
+    have been created. This may be accomplished by deriving from 
+    this base class and overwriting the virtual function 
     DirectoryCreated.
-
+    
     @see Directory::createPath
 */
 class DirectoryCreationObserver
-{
-public:
+{          
+public:    
     virtual ~DirectoryCreationObserver() {};
-
+    
     /** This method will be called when a new directory has been
         created and needs to be overwritten by derived classes.
-        You must not delete the directory that was just created
+        You must not delete the directory that was just created 
         otherwise you will run into an endless loop.
-
+        
         @param aDirectoryUrl
         [in]The absolute file URL of the directory that was just created by
         ::osl::Directory::createPath.
     */
-    virtual void DirectoryCreated(const rtl::OUString& aDirectoryUrl) = 0;
+    virtual void DirectoryCreated(const rtl::OUString& aDirectoryUrl) = 0;    
 };
 
 //###########################################
 // This just an internal helper function for
-// private use.
+// private use. 
 extern "C" inline void SAL_CALL onDirectoryCreated(void* pData, rtl_uString* aDirectoryUrl)
 {
     (static_cast<DirectoryCreationObserver*>(pData))->DirectoryCreated(aDirectoryUrl);
@@ -1635,19 +1635,19 @@ class Directory: public FileBase
 
     /** Copy constructor.
     */
-
+    
     Directory( Directory& );
-
+    
     /**  Assignment operator.
     */
-
+    
     Directory& operator = ( Directory& );
 
 public:
 
     /** Constructor.
 
-        @param strPath [in]
+        @param strPath [in] 
         The full qualified URL of the directory.
         Relative URLs are not allowed.
      */
@@ -1664,14 +1664,14 @@ public:
         close();
     }
 
-    /** Open a directory for enumerating its contents.
-
-        @return
+    /** Open a directory for enumerating its contents.	 
+       
+        @return 
         E_None on success
         E_INVAL the format of the parameters was not valid
         E_NOENT the specified path doesn't exist
-        E_NOTDIR the specified path is not an directory
-        E_NOMEM not enough memory for allocating structures
+        E_NOTDIR the specified path is not an directory 
+        E_NOMEM not enough memory for allocating structures 
         E_ACCES permission denied
         E_MFILE too many open files used by the process
         E_NFILE too many open files in the system
@@ -1688,10 +1688,10 @@ public:
     }
 
     /** Query if directory is open.
-
+    
         Query if directory is open and so item enumeration is valid.
 
-        @return
+        @return 
         sal_True if the directory is open else sal_False.
 
         @see open()
@@ -1700,10 +1700,10 @@ public:
 
     inline sal_Bool isOpen() { return _pData != NULL; };
 
-    /** Close a directory.
-
-         @return
-        E_None on success
+    /**	Close a directory.
+    
+         @return 
+        E_None on success 
         E_INVAL the format of the parameters was not valid
         E_NOMEM not enough memory for allocating structures
         E_BADF invalid oslDirectory parameter
@@ -1728,18 +1728,18 @@ public:
 
     /** Resets the directory item enumeration to the beginning.
 
-        @return
+        @return 
         E_None on success
         E_INVAL the format of the parameters was not valid
         E_NOENT the specified path doesn't exist
-        E_NOTDIR the specified path is not an directory
-        E_NOMEM not enough memory for allocating structures
+        E_NOTDIR the specified path is not an directory 
+        E_NOMEM not enough memory for allocating structures 
         E_ACCES permission denied
         E_MFILE too many open files used by the process
         E_NFILE too many open files in the system
         E_NAMETOOLONG File name too long
         E_LOOP Too many symbolic links encountered
-
+        
         @see open()
     */
 
@@ -1749,26 +1749,26 @@ public:
         return open();
     }
 
-    /** Retrieve the next item of a previously opened directory.
+    /**	Retrieve the next item of a previously opened directory. 
 
         Retrieves the next item of a previously opened directory.
-
-        @param  rItem [out]
+                   
+        @param	rItem [out] 
         On success a valid DirectoryItem.
-
-        @param  nHint [in]
+        
+        @param	nHint [in] 
         With this parameter the caller can tell the implementation that (s)he
         is going to call this function uHint times afterwards. This enables the implementation to
         get the information for more than one file and cache it until the next calls.
 
-        @return
-        E_None on success
+        @return 
+        E_None on success 
         E_INVAL the format of the parameters was not valid
-        E_NOMEM not enough memory for allocating structures
+        E_NOMEM not enough memory for allocating structures 
         E_NOENT no more entries in this directory
         E_BADF invalid oslDirectory parameter
         E_OVERFLOW the value too large for defined data type
-
+                
         @see DirectoryItem
     */
 
@@ -1783,20 +1783,20 @@ public:
     }
 
 
-    /** Retrieve information about a volume.
+    /** Retrieve information about a volume. 
 
         Retrieves information about a volume. A volume can either be a mount point, a network
-        resource or a drive depending on Operating System and File System.
+        resource or a drive depending on Operating System and File System. 
 
         @param ustrDirectoryURL [in]
         Full qualified URL of the volume
-
+        
         @param rInfo [out]
         On success it receives information about the volume.
-
-        @return
-        E_None on success
-        E_NOMEM not enough memory for allocating structures
+                
+        @return 
+        E_None on success 
+        E_NOMEM not enough memory for allocating structures 
         E_INVAL the format of the parameters was not valid
         E_NOTDIR not a directory
         E_NAMETOOLONG file name too long
@@ -1810,24 +1810,24 @@ public:
         E_NOLINK link has been severed
         E_INTR function call was interrupted
 
-        @see FileStatus
-        @see VolumeInfo
-    */
+        @see FileStatus	 
+        @see VolumeInfo   
+    */	
 
     inline static RC getVolumeInfo( const ::rtl::OUString& ustrDirectoryURL, VolumeInfo& rInfo )
     {
         return (RC) osl_getVolumeInformation( ustrDirectoryURL.pData, &rInfo._aInfo, rInfo._nMask );
     }
 
-    /** Create a directory.
+    /**	Create a directory.
 
-        @param ustrDirectoryURL [in]
+        @param ustrDirectoryURL [in] 
         Full qualified URL of the directory to create.
 
-        @return
-        E_None on success
+        @return 
+        E_None on success 
         E_INVAL the format of the parameters was not valid
-        E_NOMEM not enough memory for allocating structures
+        E_NOMEM not enough memory for allocating structures 
         E_EXIST file exists
         E_ACCES permission denied
         E_NAMETOOLONG file name too long
@@ -1851,15 +1851,15 @@ public:
         return (RC) osl_createDirectory( ustrDirectoryURL.pData );
     }
 
-    /** Remove an empty directory.
+    /**	Remove an empty directory.
 
         @param ustrDirectoryURL [in]
         Full qualified URL of the directory.
-
-        @return
-        E_None on success
+        
+        @return 
+        E_None on success 
         E_INVAL the format of the parameters was not valid
-        E_NOMEM not enough memory for allocating structures
+        E_NOMEM not enough memory for allocating structures 
         E_PERM operation not permitted
         E_ACCES permission denied
         E_NOENT no such file or directory
@@ -1883,28 +1883,28 @@ public:
     {
         return (RC) osl_removeDirectory( ustrDirectoryURL.pData );
     }
-
+    
     /** Create a directory path.
 
-        The osl_createDirectoryPath function creates a specified directory path.
+        The osl_createDirectoryPath function creates a specified directory path. 
         All nonexisting sub directories will be created.
-        <p><strong>PLEASE NOTE:</strong> You cannot rely on getting the error code
-        E_EXIST for existing directories. Programming against this error code is
+        <p><strong>PLEASE NOTE:</strong> You cannot rely on getting the error code 
+        E_EXIST for existing directories. Programming against this error code is 
         in general a strong indication of a wrong usage of osl_createDirectoryPath.</p>
-
-        @param aDirectoryUrl
+        
+        @param aDirectoryUrl 
         [in] The absolute file URL of the directory path to create.
         A relative file URL will not be accepted.
-
+                
         @param aDirectoryCreationObserver
         [in] Pointer to an instance of type DirectoryCreationObserver that will
-        be informed about the creation of a directory. The value of this
-        parameter may be NULL, in this case notifications will not be sent.
-
-        @return
+        be informed about the creation of a directory. The value of this 
+        parameter may be NULL, in this case notifications will not be sent. 
+                        
+        @return 
         <dl>
-        <dt>E_None</dt>
-        <dd>On success</dd>
+        <dt>E_None</dt> 
+        <dd>On success</dd> 
         <dt>E_INVAL</dt>
         <dd>The format of the parameters was not valid</dd>
         <dt>E_ACCES</dt>
@@ -1932,24 +1932,24 @@ public:
         <dt>E_invalidError</dt>
         <dd>An unknown error occurred</dd>
         </dl>
-
-        @see DirectoryCreationObserver
+        
+        @see DirectoryCreationObserver	    
         @see create
-    */
+    */	
     static RC createPath(
-        const ::rtl::OUString& aDirectoryUrl,
+        const ::rtl::OUString& aDirectoryUrl, 
         DirectoryCreationObserver* aDirectoryCreationObserver = NULL)
-    {
+    {	 
         return (RC)osl_createDirectoryPath(
-            aDirectoryUrl.pData,
-            (aDirectoryCreationObserver) ? onDirectoryCreated : NULL,
-            aDirectoryCreationObserver);
+            aDirectoryUrl.pData, 
+            (aDirectoryCreationObserver) ? onDirectoryCreated : NULL, 
+            aDirectoryCreationObserver);	 
     }
 };
 
 } /* namespace osl */
 
 #endif  /* __cplusplus */
-#endif  /* _OSL_FILE_HXX_ */
+#endif	/* _OSL_FILE_HXX_ */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/getglobalmutex.hxx b/sal/inc/osl/getglobalmutex.hxx
index 974c1f48b42a..e5aa7e9ed1f5 100644
--- a/sal/inc/osl/getglobalmutex.hxx
+++ b/sal/inc/osl/getglobalmutex.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/osl/interlck.h b/sal/inc/osl/interlck.h
index 63a4adfaa3fa..8891e8bc70cd 100644
--- a/sal/inc/osl/interlck.h
+++ b/sal/inc/osl/interlck.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,13 +37,13 @@ extern "C" {
 
 typedef sal_Int32 oslInterlockedCount;
 
-/** Increments the count variable addressed by pCount.
+/** Increments the count variable addressed by pCount. 
     @param Address of counter variable
     @return The result of the operation is zero, the value of the count variable.
 */
 oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount);
 
-/** Decrement the count variable addressed by pCount.
+/** Decrement the count variable addressed by pCount. 
     @param Address of counter variable
     @return The result of the operation is the new value is of the count variable.
 */
@@ -53,7 +53,7 @@ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount*
 }
 #endif
 
-#endif  /* _OSL_INTERLOCK_H_ */
+#endif	/* _OSL_INTERLOCK_H_ */
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/module.h b/sal/inc/osl/module.h
index 156a6d7be97a..3d502a5d4397 100644
--- a/sal/inc/osl/module.h
+++ b/sal/inc/osl/module.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,14 +25,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 /** @HTML */
 
 #ifndef _OSL_MODULE_H_
 #define _OSL_MODULE_H_
 
-#   include <rtl/ustring.h>
-#   include <rtl/tencinfo.h>
+#	include <rtl/ustring.h>
+#	include <rtl/tencinfo.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -67,7 +67,7 @@ typedef void* oslModule;
     @see osl_getFunctionSymbol.
     @see osl_getModuleURLFromFunctionAddress.
 */
-typedef void ( SAL_CALL *oslGenericFunction )( void );
+typedef void ( SAL_CALL *oslGenericFunction )( void ); 
 
 /** Load a shared library or module.
     @param strModuleName denotes the name of the module to be loaded.
@@ -100,35 +100,35 @@ oslModule SAL_CALL osl_loadModuleRelative(
     This function can be used to search for a function symbol in the process address space.
     Do not use the returned handle as an argument to osl_unloadModule. On Unix platforms,
     pModuleName gets ignored and the special handle RTLD_DEFAULT is returned.
-
+    
     @param pModuleName
     [in] denotes the name of the module to search for. Ignored on Unix
-
+    
     @param pResult
     [out] a pointer to a oslModule that is updated with the requested module handle
     on success.
-
-    @return
+    
+    @return 
     sal_True if the module handle could be retrieved and has been copied to *pResult.
     sal_False if the module has not been loaded yet.
-
+    
     @see osl_getFunctionSymbol
     @see osl_getAsciiFunctionSymbol
 */
 sal_Bool SAL_CALL osl_getModuleHandle(rtl_uString *pModuleName, oslModule *pResult);
 
-/** Release the module
+/** Release the module 
 */
 void SAL_CALL osl_unloadModule(oslModule Module);
 
-/** lookup the specified symbol name.
+/** lookup the specified symbol name. 
     @return address of the symbol or NULL if lookup failed.
 */
 void* SAL_CALL osl_getSymbol( oslModule Module, rtl_uString *strSymbolName);
 
 /** Lookup the specified function symbol name.
 
-    osl_getFunctionSymbol is an alternative function for osl_getSymbol.
+    osl_getFunctionSymbol is an alternative function for osl_getSymbol. 
     Use Function pointer as symbol address to conceal type conversion.
 
     @param Module
@@ -136,7 +136,7 @@ void* SAL_CALL osl_getSymbol( oslModule Module, rtl_uString *strSymbolName);
 
     @param ustrFunctionSymbolName
     [in] Name of the function that will be looked up.
-
+   
     @return
     <dl>
     <dt>Function address.</dt>
@@ -144,7 +144,7 @@ void* SAL_CALL osl_getSymbol( oslModule Module, rtl_uString *strSymbolName);
     <dt>NULL</dt>
     <dd>lookup failed or the parameter are invalid.</dd>
     </dl>
-
+   
     @see osl_getSymbol
     @see osl_getAsciiFunctionSymbol
 */
@@ -152,15 +152,15 @@ oslGenericFunction SAL_CALL osl_getFunctionSymbol( oslModule Module, rtl_uString
 
 /** Lookup the specified function symbol name.
 
-    osl_getAsciiFunctionSymbol is an alternative function for osl_getFunctionSymbol.
+    osl_getAsciiFunctionSymbol is an alternative function for osl_getFunctionSymbol. 
     It expects the C-style function name string to contain ascii characters only.
 
     @param Module
     [in] a module handle as returned by osl_loadModule or osl_getModuleHandle
 
     @param pFunctionSymbolName
-    [in] Name of the function that will be looked up.
-
+    [in] Name of the function that will be looked up. 
+   
     @return
     <dl>
     <dt>Function address.</dt>
@@ -168,7 +168,7 @@ oslGenericFunction SAL_CALL osl_getFunctionSymbol( oslModule Module, rtl_uString
     <dt>NULL</dt>
     <dd>lookup failed or the parameter are invalid.</dd>
     </dl>
-
+   
     @see osl_getModuleHandle
     @see osl_getFunctionSymbol
 */
@@ -180,19 +180,19 @@ oslGenericFunction SAL_CALL osl_getAsciiFunctionSymbol(oslModule Module, const s
     @param pustrURL receives the URL of the module that is mapped at pv.
     @return sal_True on success, sal_False if no module can be found at the specified address.
 */
-sal_Bool SAL_CALL osl_getModuleURLFromAddress( void *pv, rtl_uString **pustrURL );
+sal_Bool SAL_CALL osl_getModuleURLFromAddress( void *pv, rtl_uString **pustrURL ); 
 
 /** Lookup URL of module which is mapped at the specified function address.
 
-    osl_getModuleURLFromFunctionAddress is an alternative function for osl_getModuleURLFromAddress.
+    osl_getModuleURLFromFunctionAddress is an alternative function for osl_getModuleURLFromAddress. 
     Use Function pointer as symbol address to conceal type conversion.
-
+   
     @param pf
     [in] function address in oslGenericFunction format.
-
+           
     @param pustrFunctionURL
     [out] receives the URL of the module that is mapped at pf.
-
+   
     @return
     <dl>
     <dt>sal_True</dt>
@@ -200,7 +200,7 @@ sal_Bool SAL_CALL osl_getModuleURLFromAddress( void *pv, rtl_uString **pustrURL
     <dt>sal_False</dt>
     <dd>no module can be found at the specified function address or parameter is somewhat invalid.</dd>
     </dl>
-
+   
     @see osl_getModuleURLFromAddress
 */
 sal_Bool SAL_CALL osl_getModuleURLFromFunctionAddress( oslGenericFunction pf, rtl_uString **pustrFunctionURL );
diff --git a/sal/inc/osl/module.hxx b/sal/inc/osl/module.hxx
index cfc1c5e02fc1..425de2fe9a7e 100644
--- a/sal/inc/osl/module.hxx
+++ b/sal/inc/osl/module.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,7 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 /** @HTML */
 
 #ifndef _OSL_MODULE_HXX_
@@ -48,16 +48,16 @@ public:
     }
 
     /** Get module URL from the specified function address in the module.
-
-        Similar to getUrlFromAddress, but use a function address to get URL of the Module.
+    
+        Similar to getUrlFromAddress, but use a function address to get URL of the Module. 
         Use Function pointer as symbol address to conceal type conversion.
-
+       
         @param addr
         [in] function address in oslGenericFunction format.
-
+               
         @param libraryUrl
         [in|out] receives the URL of the module.
-
+           
         @return
         <dl>
         <dt>sal_True</dt>
@@ -65,7 +65,7 @@ public:
         <dt>sal_False</dt>
         <dd>can not get the URL from the specified function address or the parameter is invalid.</dd>
         </dl>
-
+           
         @see getUrlFromAddress
     */
     static sal_Bool getUrlFromAddress( oslGenericFunction addr, ::rtl::OUString & libraryUrl){
@@ -84,7 +84,7 @@ public:
         osl_unloadModule(m_Module);
     }
 
-    sal_Bool SAL_CALL load( const ::rtl::OUString& strModuleName,
+    sal_Bool SAL_CALL load( const ::rtl::OUString& strModuleName, 
         sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT)
     {
         unload();
@@ -113,7 +113,7 @@ public:
 
     sal_Bool SAL_CALL is() const
     {
-           return m_Module != NULL;
+           return m_Module != NULL; 
     }
 
     void* SAL_CALL getSymbol( const ::rtl::OUString& strSymbolName)
@@ -123,12 +123,12 @@ public:
 
     /** Get function address by the function name in the module.
 
-        getFunctionSymbol is an alternative function for getSymbol.
+        getFunctionSymbol is an alternative function for getSymbol. 
         Use Function pointer as symbol address to conceal type conversion.
 
         @param ustrFunctionSymbolName
         [in] Function name to be looked up.
-
+   
         @return
         <dl>
         <dt>oslGenericFunction format function address</dt>
@@ -136,7 +136,7 @@ public:
         <dt>NULL</dt>
         <dd>lookup failed or parameter is somewhat invalid</dd>
         </dl>
-
+   
         @see getSymbol
     */
     oslGenericFunction SAL_CALL getFunctionSymbol( const ::rtl::OUString& ustrFunctionSymbolName )
diff --git a/sal/inc/osl/mutex.h b/sal/inc/osl/mutex.h
index ca5e978111c9..9798254fc4aa 100644
--- a/sal/inc/osl/mutex.h
+++ b/sal/inc/osl/mutex.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,8 +43,8 @@ typedef struct _oslMutexImpl * oslMutex;
 */
 oslMutex SAL_CALL osl_createMutex(void);
 
-/** Release the OS-structures and free mutex data-structure.
-    @param Mutex the mutex-handle
+/** Release the OS-structures and free mutex data-structure. 
+    @param Mutex the mutex-handle 
 */
 void SAL_CALL osl_destroyMutex(oslMutex Mutex);
 
@@ -75,6 +75,6 @@ oslMutex * SAL_CALL osl_getGlobalMutex(void);
 }
 #endif
 
-#endif  /* _OSL_MUTEX_H_ */
+#endif	/* _OSL_MUTEX_H_ */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/mutex.hxx b/sal/inc/osl/mutex.hxx
index 4a2bd991a2ba..70ca4dc22a65 100644
--- a/sal/inc/osl/mutex.hxx
+++ b/sal/inc/osl/mutex.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,22 +35,22 @@
 
 
 namespace osl
-{
+{     
     /** A mutual exclusion synchronization object
     */
     class Mutex {
-
+    
     public:
         /** Create a thread-local mutex.
             @return 0 if the mutex could not be created, otherwise a handle to the mutex.
             @seealso ::osl_createMutex()
         */
-        Mutex()
+        Mutex() 
         {
             mutex = osl_createMutex();
         }
 
-        /** Release the OS-structures and free mutex data-structure.
+        /** Release the OS-structures and free mutex data-structure. 
             @seealso ::osl_destroyMutex()
         */
         ~Mutex()
@@ -86,7 +86,7 @@ namespace osl
         }
 
         /** Returns a global static mutex object.
-            The global and static mutex object can be used to initialize other
+            The global and static mutex object can be used to initialize other 
             static objects in a thread safe manner.
             @return the global mutex object
             @seealso ::osl_getGlobalMutex()
@@ -95,31 +95,31 @@ namespace osl
         {
             return (Mutex *)osl_getGlobalMutex();
         }
-
+        
     private:
         oslMutex mutex;
 
         /** The underlying oslMutex has no reference count.
-
+        
         Since the underlying oslMutex is not a reference counted object, copy
         constructed Mutex may work on an already destructed oslMutex object.
-
+        
         */
         Mutex(const Mutex&);
-
+        
         /** The underlying oslMutex has no reference count.
-
-        When destructed, the Mutex object destroys the undelying oslMutex,
+        
+        When destructed, the Mutex object destroys the undelying oslMutex, 
         which might cause severe problems in case it's a temporary object.
-
+         
         */
         Mutex(oslMutex Mutex);
-
+        
         /** This assignment operator is private for the same reason as
             the copy constructor.
         */
         Mutex& operator= (const Mutex&);
-
+        
         /** This assignment operator is private for the same reason as
             the constructor taking a oslMutex argument.
         */
@@ -171,7 +171,7 @@ namespace osl
     protected:
         T * pT;
     public:
-
+        
         /** Acquires the object specified as parameter.
         */
         ClearableGuard(T * pT_) : pT(pT_)
@@ -193,8 +193,8 @@ namespace osl
             if (pT)
                 pT->release();
         }
-
-        /** Releases the mutex or interface.
+        
+        /** Releases the mutex or interface. 
         */
         void clear()
         {
@@ -224,14 +224,14 @@ namespace osl
                 ClearableGuard<T>( pT_ ),
                 pResetT( pT_ )
         {}
-
+        
         /** Acquires the object specified as parameter.
         */
         ResettableGuard( T& rT ) :
                 ClearableGuard<T>( rT ),
                 pResetT( &rT )
         {}
-
+        
         /** Re-aquires the mutex or interface.
         */
         void reset()
@@ -275,6 +275,6 @@ namespace osl
 }
 
 #endif  /* __cplusplus */
-#endif  /* _OSL_MUTEX_HXX_ */
+#endif	/* _OSL_MUTEX_HXX_ */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/nlsupport.h b/sal/inc/osl/nlsupport.h
index 9c04d8cd0996..53bb7b2b6201 100644
--- a/sal/inc/osl/nlsupport.h
+++ b/sal/inc/osl/nlsupport.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,21 +30,21 @@
 #ifndef _OSL_NLSUPPORT_H_
 #define _OSL_NLSUPPORT_H_
 
-#   include <rtl/locale.h>
-#   include <rtl/textenc.h>
+#	include <rtl/locale.h>
+#	include <rtl/textenc.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/**
+/** 
     Determines the text encoding used by the underlying platform for the
     specified locale.
 
-    @param pLocale
+    @param pLocale 
     the locale to return the text encoding for. If this parameter is NULL,
     the default locale of the current process is used.
-
+    
     @returns the rtl_TextEncoding that matches the platform specific encoding
     description or RTL_TEXTENCODING_DONTKNOW if no mapping is available.
 */
@@ -56,7 +56,7 @@ rtl_TextEncoding SAL_CALL osl_getTextEncodingFromLocale( rtl_Locale * pLocale );
 }
 #endif
 
-#endif  /* _OSL_NLSUPPORT_H_ */
+#endif	/* _OSL_NLSUPPORT_H_ */
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/pipe.h b/sal/inc/osl/pipe.h
index f29b9f0b925d..0256eea5c651 100644
--- a/sal/inc/osl/pipe.h
+++ b/sal/inc/osl/pipe.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,37 +30,37 @@
 #ifndef _OSL_PIPE_H_
 #define _OSL_PIPE_H_
 
-#   include <rtl/ustring.h>
+#	include <rtl/ustring.h>
 
 
-#   include <osl/security.h>
+#	include <osl/security.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 typedef enum {
-    osl_Pipe_E_None,                /* no error */
-    osl_Pipe_E_NotFound,            /* Pipe could not be found */
-    osl_Pipe_E_AlreadyExists,       /* Pipe already exists */
-    osl_Pipe_E_NoProtocol,          /* Protocol not available */
-    osl_Pipe_E_NetworkReset,        /* Network dropped connection because of reset */
-    osl_Pipe_E_ConnectionAbort,     /* Software caused connection abort */
-    osl_Pipe_E_ConnectionReset,     /* Connection reset by peer */
-    osl_Pipe_E_NoBufferSpace,       /* No buffer space available */
-    osl_Pipe_E_TimedOut,            /* Connection timed out */
-    osl_Pipe_E_ConnectionRefused,   /* Connection refused */
-    osl_Pipe_E_invalidError,        /* unmapped error: always last entry in enum! */
+    osl_Pipe_E_None,				/* no error */
+    osl_Pipe_E_NotFound,	 		/* Pipe could not be found */
+    osl_Pipe_E_AlreadyExists,	 	/* Pipe already exists */
+    osl_Pipe_E_NoProtocol,			/* Protocol not available */
+    osl_Pipe_E_NetworkReset,		/* Network dropped connection because of reset */
+    osl_Pipe_E_ConnectionAbort,		/* Software caused connection abort */
+    osl_Pipe_E_ConnectionReset,		/* Connection reset by peer */
+    osl_Pipe_E_NoBufferSpace,		/* No buffer space available */
+    osl_Pipe_E_TimedOut,			/* Connection timed out */
+    osl_Pipe_E_ConnectionRefused,	/* Connection refused */
+    osl_Pipe_E_invalidError,		/* unmapped error: always last entry in enum! */
     osl_Pipe_E_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslPipeError;
 
 typedef sal_uInt32 oslPipeOptions;
-#define osl_Pipe_OPEN        0x0000     /* open existing pipe */
-#define osl_Pipe_CREATE      0x0001     /* create pipe and open it, fails if already existst */
+#define	osl_Pipe_OPEN        0x0000  	/* open existing pipe */   
+#define	osl_Pipe_CREATE      0x0001     /* create pipe and open it, fails if already existst */
 
 typedef struct oslPipeImpl * oslPipe;
 
-/**
+/** 
  */
 oslPipe SAL_CALL osl_createPipe(rtl_uString *strPipeName, oslPipeOptions Options, oslSecurity Security);
 
@@ -71,11 +71,11 @@ void    SAL_CALL osl_releasePipe( oslPipe );
 
 /** increases the refcount of the pipe.
  */
-void    SAL_CALL osl_acquirePipe( oslPipe Pipe );
+void 	SAL_CALL osl_acquirePipe( oslPipe Pipe );
 
 /** closes the pipe, any read,write or accept actions stop immeadiatly.
  */
-void    SAL_CALL osl_closePipe( oslPipe );
+void 	SAL_CALL osl_closePipe( oslPipe );
 
 
 oslPipe SAL_CALL osl_acceptPipe(oslPipe Pipe);
@@ -99,6 +99,6 @@ oslPipeError SAL_CALL osl_getLastPipeError(oslPipe Pipe);
 }
 #endif
 
-#endif  /* _OSL_PIPE_H_ */
+#endif	/* _OSL_PIPE_H_ */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/pipe.hxx b/sal/inc/osl/pipe.hxx
index 93a6d40e5102..1af08711f0b2 100644
--- a/sal/inc/osl/pipe.hxx
+++ b/sal/inc/osl/pipe.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -134,7 +134,7 @@ namespace osl
             m_handle = 0;
         }
     }
-
+    
     //______________________________________________________________________________
     inline oslPipeError SAL_CALL Pipe::accept(StreamPipe& Connection)
     {
@@ -158,7 +158,7 @@ namespace osl
     }
 
     //______________________________________________________________________________
-    inline StreamPipe::StreamPipe(){}
+    inline StreamPipe::StreamPipe(){} 
 
     //______________________________________________________________________________
     inline StreamPipe::StreamPipe(oslPipe hPipe)
diff --git a/sal/inc/osl/pipe_decl.hxx b/sal/inc/osl/pipe_decl.hxx
index c5d97e3d2914..7301bceff076 100644
--- a/sal/inc/osl/pipe_decl.hxx
+++ b/sal/inc/osl/pipe_decl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,16 +29,16 @@
 #define _OSL_PIPE_DECL_HXX_
 
 #include <osl/pipe.h>
-#   include <osl/security.hxx>
+#	include <osl/security.hxx>
 #include <rtl/ustring.hxx>
 
 namespace osl {
-
+    
 class StreamPipe;
 
 /** Represents a pipe.
 */
-class Pipe
+class Pipe 
 {
 protected:
     oslPipe m_handle;
@@ -51,13 +51,13 @@ public:
     inline Pipe();
 
     /** Creates an insecure pipe that is accessible for all users.
-        @param strName
+        @param strName 
         @param Options
     */
     inline Pipe(const ::rtl::OUString& strName, oslPipeOptions Options);
 
     /** Creates a secure pipe that access depends on the umask settings.
-        @param strName
+        @param strName 
         @param Options
         @param Security
     */
@@ -85,7 +85,7 @@ public:
     /** Creates an insecure pipe that is accessible for all users
         with the given attributes.
         If the pipe was already created, the old one will be discarded.
-        @param strName
+        @param strName 
         @param Options
         @param Security
         @return True if socket was successfully created.
@@ -94,10 +94,10 @@ public:
                             oslPipeOptions Options, const Security &rSec );
 
     /** Creates a secure that access rights depend on the umask settings
-        with the given attributes.
+        with the given attributes.	
 
         If socket was already created, the old one will be discarded.
-        @param strName
+        @param strName 
         @param Options
         @return True if socket was successfully created.
     */
@@ -124,14 +124,14 @@ public:
 
     inline sal_Bool SAL_CALL operator==( const Pipe& rPipe ) const;
 
-    /** Closes the pipe.
+    /** Closes the pipe. 
     */
     inline void SAL_CALL close();
 
     /** Accept connection on an existing pipe
     */
     inline oslPipeError SAL_CALL accept(StreamPipe& Connection);
-
+    
 
     /** Delivers a constant decribing the last error for the pipe system.
         @return ENONE if no error occured, invalid_PipeError if
@@ -166,13 +166,13 @@ public:
     inline StreamPipe(const StreamPipe& Pipe);
 
     /** Creates a pipe.
-        @param strName
+        @param strName 
         @param Options
     */
     inline StreamPipe(const ::rtl::OUString& strName, oslPipeOptions Options = osl_Pipe_OPEN);
 
     /** Creates a pipe.
-        @param strName
+        @param strName 
         @param Options
         @param rSec
     */
@@ -188,14 +188,14 @@ public:
         @param Pipe.
     */
     inline StreamPipe & SAL_CALL operator=(oslPipe Pipe);
-
+    
     /** Assignment operator
     */
     inline StreamPipe& SAL_CALL operator=(const Pipe& pipe);
 
     /** Tries to receives BytesToRead data from the connected pipe,
-
-        @param pBuffer [out] Points to a buffer that will be filled with the received
+        
+        @param pBuffer [out] Points to a buffer that will be filled with the received 
         data.
         @param BytesToRead [in] The number of bytes to read. pBuffer must have at least
         this size.
@@ -204,30 +204,30 @@ public:
     inline sal_Int32 SAL_CALL recv(void* pBuffer, sal_Int32 BytesToRead) const;
 
     /** Tries to sends BytesToSend data from the connected pipe.
-
+        
         @param pBuffer [in] Points to a buffer that contains the send-data.
         @param BytesToSend [in] The number of bytes to send. pBuffer must have at least
         this size.
         @return the number of transfered bytes.
     */
     inline sal_Int32 SAL_CALL send(const void* pBuffer, sal_Int32 BytesToSend) const;
-
+    
     /** Retrieves n bytes from the stream and copies them into pBuffer.
-        The method avoids incomplete reads due to packet boundaries.
+        The method avoids incomplete reads due to packet boundaries.		
         @param pBuffer receives the read data.
         @param n the number of bytes to read. pBuffer must be large enough
         to hold the n bytes!
-        @return the number of read bytes. The number will only be smaller than
-        n if an exceptional condition (e.g. connection closed) occurs.
+        @return	the number of read bytes. The number will only be smaller than
+        n if an exceptional condition (e.g. connection closed) occurs.				 
     */
     inline sal_Int32 SAL_CALL read(void* pBuffer, sal_Int32 n) const;
 
-    /** Writes n bytes from pBuffer to the stream. The method avoids
+    /** Writes n bytes from pBuffer to the stream. The method avoids 
         incomplete writes due to packet boundaries.
         @param pBuffer contains the data to be written.
         @param n the number of bytes to write.
         @return the number of written bytes. The number will only be smaller than
-        n if an exceptional condition (e.g. connection closed) occurs.
+        n if an exceptional condition (e.g. connection closed) occurs.				
     */
     sal_Int32 SAL_CALL write(const void* pBuffer, sal_Int32 n) const;
 };
diff --git a/sal/inc/osl/process.h b/sal/inc/osl/process.h
index 1c71a4fc5e02..823d484f290c 100644
--- a/sal/inc/osl/process.h
+++ b/sal/inc/osl/process.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,66 +46,66 @@ extern "C" {
 
 
 typedef sal_Int32 oslProcessOption;
-#define     osl_Process_WAIT       0x0001    /* wait for completion */
-#define     osl_Process_SEARCHPATH 0x0002    /* search path for executable */
-#define     osl_Process_DETACHED   0x0004    /* run detached */
-#define     osl_Process_NORMAL     0x0000    /* run in normal window */
-#define     osl_Process_HIDDEN     0x0010    /* run hidden */
-#define     osl_Process_MINIMIZED  0x0020    /* run in minimized window */
-#define     osl_Process_MAXIMIZED  0x0040    /* run in maximized window */
-#define     osl_Process_FULLSCREEN 0x0080    /* run in fullscreen window */
+#define		osl_Process_WAIT       0x0001    /* wait for completion */
+#define		osl_Process_SEARCHPATH 0x0002    /* search path for executable */
+#define		osl_Process_DETACHED   0x0004    /* run detached */
+#define		osl_Process_NORMAL     0x0000    /* run in normal window */
+#define		osl_Process_HIDDEN     0x0010    /* run hidden */
+#define		osl_Process_MINIMIZED  0x0020    /* run in minimized window */
+#define		osl_Process_MAXIMIZED  0x0040    /* run in maximized window */
+#define		osl_Process_FULLSCREEN 0x0080    /* run in fullscreen window */
 
 typedef sal_Int32 oslProcessData;
 
 /* defines for osl_getProcessInfo , can be OR'ed */
-#define     osl_Process_IDENTIFIER  0x0001   /* retrieves the process identifier   */
-#define     osl_Process_EXITCODE    0x0002   /* retrieves exit code of the process */
-#define     osl_Process_CPUTIMES    0x0004   /* retrieves used cpu time            */
-#define     osl_Process_HEAPUSAGE   0x0008   /* retrieves the used size of heap    */
+#define		osl_Process_IDENTIFIER  0x0001   /* retrieves the process identifier   */
+#define		osl_Process_EXITCODE	0x0002   /* retrieves exit code of the process */
+#define		osl_Process_CPUTIMES  	0x0004   /* retrieves used cpu time            */
+#define		osl_Process_HEAPUSAGE	0x0008   /* retrieves the used size of heap    */
 
-typedef sal_uInt32 oslProcessIdentifier;
-typedef sal_uInt32 oslProcessExitCode;
+typedef	sal_uInt32 oslProcessIdentifier;
+typedef	sal_uInt32 oslProcessExitCode;
 
 typedef enum {
-    osl_Process_E_None,                 /* no error */
-    osl_Process_E_NotFound,             /* image not found */
-    osl_Process_E_TimedOut,             /* timout occured */
-    osl_Process_E_NoPermission,         /* permission denied */
-    osl_Process_E_Unknown,              /* unknown error */
-    osl_Process_E_InvalidError,         /* unmapped error */
+    osl_Process_E_None,					/* no error */
+    osl_Process_E_NotFound,				/* image not found */
+    osl_Process_E_TimedOut,				/* timout occured */
+    osl_Process_E_NoPermission,	  	  	/* permission denied */
+    osl_Process_E_Unknown,			  	/* unknown error */
+    osl_Process_E_InvalidError,			/* unmapped error */
     osl_Process_E_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslProcessError;
 
 typedef enum {
-    osl_Process_TypeNone,       /* no descriptor */
-    osl_Process_TypeSocket,     /* socket */
-    osl_Process_TypeFile,       /* file   */
+    osl_Process_TypeNone,	  	/* no descriptor */
+    osl_Process_TypeSocket,		/* socket */
+    osl_Process_TypeFile,		/* file   */
     osl_Process_TypePipe,       /* pipe   */
     osl_Process_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslDescriptorType;
 
 typedef sal_Int32 oslDescriptorFlag;
-#define osl_Process_DFNONE       0x0000
-#define osl_Process_DFWAIT       0x0001
+#define	osl_Process_DFNONE       0x0000    
+#define	osl_Process_DFWAIT       0x0001    
 
 #ifdef SAL_W32
-#   pragma pack(push, 8)
+#	pragma pack(push, 8)
 #elif defined(SAL_OS2)
-#   pragma pack(push, 4)
+#	pragma pack(push, 4)
 #endif
 
 typedef struct {
-    sal_uInt32              Size;
-    oslProcessData          Fields;
-    oslProcessIdentifier    Ident;
-    oslProcessExitCode      Code;
-    TimeValue               UserTime;
-    TimeValue               SystemTime;
-    sal_uInt32              HeapUsage;
+    sal_uInt32				Size;
+    oslProcessData			Fields;
+    oslProcessIdentifier	Ident;
+    oslProcessExitCode		Code;
+    TimeValue				UserTime;
+    TimeValue				SystemTime;
+    sal_uInt32				HeapUsage;
 } oslProcessInfo;
 
 #if defined( SAL_W32) ||  defined(SAL_OS2)
-#   pragma pack(pop)
+#	pragma pack(pop)
 #endif
 
 /** Process handle
@@ -120,49 +120,49 @@ typedef void* oslProcess;
 
 /** Execute a process.
 
-    Executes the program image provided in strImageName in a new process.
-
-    @param ustrImageName
-    [in] The file URL of the executable to be started.
-    Can be NULL in this case the file URL of the executable must be the first element
+    Executes the program image provided in strImageName in a new process.     
+        
+    @param ustrImageName 
+    [in] The file URL of the executable to be started. 
+    Can be NULL in this case the file URL of the executable must be the first element 
     in ustrArguments.
-
+        
     @param ustrArguments
-    [in] An array of argument strings. Can be NULL if strImageName is not NULL.
-    If strImageName is NULL it is expected that the first element contains
+    [in] An array of argument strings. Can be NULL if strImageName is not NULL. 
+    If strImageName is NULL it is expected that the first element contains 
     the file URL of the executable to start.
-
+    
     @param nArguments
     [in] The number of arguments provided. If this number is 0 strArguments will be ignored.
-
+    
     @param Options
     [in] A combination of int-constants to describe the mode of execution.
-
+    
     @param Security
-    [in] The user and his rights for which the process is started. May be NULL in which case
+    [in] The user and his rights for which the process is started. May be NULL in which case 
     the process will be started in the context of the current user.
-
-    @param ustrDirectory
-    [in] The file URL of the working directory of the new proces. If the specified directory
-    does not exist or is inaccessible the working directory of the newly created process
-    is undefined. If this parameter is NULL or the caller provides an empty string the
+    
+    @param ustrDirectory 
+    [in] The file URL of the working directory of the new proces. If the specified directory 
+    does not exist or is inaccessible the working directory of the newly created process 
+    is undefined. If this parameter is NULL or the caller provides an empty string the 
     new process will have the same current working directory as the calling process.
-
+    
     @param ustrEnviroments
-    [in] An array of strings describing environment variables that should be merged into the
+    [in] An array of strings describing environment variables that should be merged into the 
     environment of the new process. Each string has to be in the form "variable=value".
-    This parameter can be NULL in which case the new process gets the same environment
-    as the parent process.
-
+    This parameter can be NULL in which case the new process gets the same environment 
+    as the parent process. 	                               
+    
     @param nEnvironmentVars
     [in] The number of environment variables to set.
-
+    
     @param pProcess
-    [out] Pointer to a oslProcess variable, wich receives the handle of the newly created process.
-    This parameter must not be NULL.
+    [out] Pointer to a oslProcess variable, wich receives the handle of the newly created process. 
+    This parameter must not be NULL.			
 
-    @return
-    <dl>
+    @return	
+    <dl> 
     <dt>osl_Process_E_None</dt>
     <dd>on success</dd>
     <dt>osl_Process_E_NotFound</dt>
@@ -172,7 +172,7 @@ typedef void* oslProcess;
     <dt>osl_Process_E_Unknown</dt>
     <dd>if arbitrary other errors occur</dd>
     </dl>
-
+        
     @see oslProcessOption
     @see osl_executeProcess_WithRedirectedIO
     @see osl_freeProcessHandle
@@ -192,62 +192,62 @@ oslProcessError SAL_CALL osl_executeProcess(
 
 /** Execute a process and redirect child process standard IO.
 
-    @param ustrImageName
-    [in] The file URL of the executable to be started.
-    Can be NULL in this case the file URL of the executable must be the first element
+    @param ustrImageName 
+    [in] The file URL of the executable to be started. 
+    Can be NULL in this case the file URL of the executable must be the first element 
     in ustrArguments.
-
+    
     @param ustrArguments
-    [in] An array of argument strings. Can be NULL if strImageName is not NULL.
-    If strImageName is NULL it is expected that the first element contains
+    [in] An array of argument strings. Can be NULL if strImageName is not NULL. 
+    If strImageName is NULL it is expected that the first element contains 
     the file URL of the executable to start.
-
+    
     @param nArguments
     [in] The number of arguments provided. If this number is 0 strArguments will be ignored.
-
+    
     @param Options
     [in] A combination of int-constants to describe the mode of execution.
-
+    
     @param Security
-    [in] The user and his rights for which the process is started. May be NULL in which case
+    [in] The user and his rights for which the process is started. May be NULL in which case 
     the process will be started in the context of the current user.
-
-    @param ustrDirectory
-    [in] The file URL of the working directory of the new proces. If the specified directory
-    does not exist or is inaccessible the working directory of the newly created process
-    is undefined. If this parameter is NULL or the caller provides an empty string the
+    
+    @param ustrDirectory 
+    [in] The file URL of the working directory of the new proces. If the specified directory 
+    does not exist or is inaccessible the working directory of the newly created process 
+    is undefined. If this parameter is NULL or the caller provides an empty string the 
     new process will have the same current working directory as the calling process.
-
+    
     @param ustrEnviroments
-    [in] An array of strings describing environment variables that should be merged into the
+    [in] An array of strings describing environment variables that should be merged into the 
     environment of the new process. Each string has to be in the form "variable=value".
-    This parameter can be NULL in which case the new process gets the same environment
-    as the parent process.
-
+    This parameter can be NULL in which case the new process gets the same environment 
+    as the parent process. 	                               
+    
     @param nEnvironmentVars
     [in] The number of environment variables to set.
-
+    
     @param pProcess
-    [out] Pointer to a oslProcess variable, wich receives the handle of the newly created process.
+    [out] Pointer to a oslProcess variable, wich receives the handle of the newly created process. 
     This parameter must not be NULL.
-
+    
     @param pChildInputWrite
-    [in] Pointer to a oslFileHandle variable that receives the handle which can be used to write
-    to the child process standard input device. The returned handle is not random accessible.
+    [in] Pointer to a oslFileHandle variable that receives the handle which can be used to write 
+    to the child process standard input device. The returned handle is not random accessible. 
     The handle has to be closed with osl_closeFile if no longer used. This parameter can be NULL.
-
+    
     @param pChildOutputRead
-    [in] Pointer to a oslFileHandle variable that receives the handle which can be used to read from
-    the child process standard output device. The returned handle is not random accessible.
-    The Handle has to be closed with osl_closeFile if no longer used. This parameter can be NULL.
-
+    [in] Pointer to a oslFileHandle variable that receives the handle which can be used to read from 
+    the child process standard output device. The returned handle is not random accessible. 
+    The Handle has to be closed with osl_closeFile if no longer used. This parameter can be NULL.	                               
+    
     @param pChildErrorRead
-    [in] Pointer to a oslFileHandle variable that receives the handle which can be used to read from
-    the child process standard error device. The returned handle is not random accessible.
+    [in] Pointer to a oslFileHandle variable that receives the handle which can be used to read from 
+    the child process standard error device. The returned handle is not random accessible. 
     The Handle has to be closed with osl_closeFile if no longer used. This parameter can be NULL.
-
+    
     @return
-    <dl>
+    <dl> 
     <dt>osl_Process_E_None</dt>
     <dd>on success</dd>
     <dt>osl_Process_E_NotFound</dt>
@@ -256,8 +256,8 @@ oslProcessError SAL_CALL osl_executeProcess(
     <dd>if invalid parameters will be detected</dd>
     <dt>osl_Process_E_Unknown</dt>
     <dd>if arbitrary other errors occur</dd>
-    </dl>
-
+    </dl>	
+    
     @see oslProcessOption
     @see osl_executeProcess
     @see osl_freeProcessHandle
@@ -333,7 +333,7 @@ oslProcessError SAL_CALL osl_joinProcessWithTimeout(oslProcess Process, const Ti
     @param Process [in] the process handle of the process
     @param Field   [in] the information which is to be retrieved
                         this can be one or more of
-                        osl_Process_IDENTIFIER
+                        osl_Process_IDENTIFIER  
                         osl_Process_EXITCODE
                         osl_Process_CPUTIMES
                         osl_Process_HEAPUSAGE
@@ -344,13 +344,13 @@ oslProcessError SAL_CALL osl_joinProcessWithTimeout(oslProcess Process, const Ti
                         retrieved valid information fields.
     @return osl_Process_E_None on success, osl_Process_E_Unknown on failure.
  */
-oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData Fields,
+oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData Fields, 
                                    oslProcessInfo* pInfo);
 
-/** Get the filename of the executable.
+/** Get the filename of the executable. 
     @param strFile [out] the string that receives the executable file path.
-    @return osl_Process_E_None or does not return.
-    @see osl_executeProcess
+    @return osl_Process_E_None or does not return. 	
+    @see osl_executeProcess 
 */
 oslProcessError SAL_CALL osl_getExecutableFile(rtl_uString **strFile);
 
@@ -363,7 +363,7 @@ sal_uInt32 SAL_CALL osl_getCommandArgCount(void);
 /** Get the nArg-th command-line argument passed to the main-function of this process.
     @param nArg [in] The number of the argument to return.
     @param strCommandArg [out] The string receives the nArg-th command-line argument.
-    @return osl_Process_E_None or does not return.
+    @return osl_Process_E_None or does not return. 	
     @see osl_executeProcess
 */
 oslProcessError SAL_CALL osl_getCommandArg(sal_uInt32 nArg, rtl_uString **strCommandArg);
@@ -404,36 +404,36 @@ oslProcessError SAL_CALL osl_setEnvironment(rtl_uString *strVar, rtl_uString *st
 */
 oslProcessError SAL_CALL osl_clearEnvironment(rtl_uString *strVar);
 
-/** Get the working directory of the current process as a file URL.
+/** Get the working directory of the current process as a file URL. 
 
     The file URL is encoded as common for the OSL file API.
-    @param  pustrWorkingDir [out] string that receives the working directory file URL.
+    @param	pustrWorkingDir [out] string that receives the working directory file URL.
 */
 
 oslProcessError SAL_CALL osl_getProcessWorkingDir( rtl_uString **pustrWorkingDir );
 
-/** Get the locale the process is currently running in.
+/** Get the locale the process is currently running in. 
 
     The unix implementation caches the value it returns, so if you have to change the locale
     your are running in, you will have to use osl_setProcessLocale therefor.
-
-    @param  ppLocale [out] a pointer that receives the currently selected locale structure
+    
+    @param	ppLocale [out] a pointer that receives the currently selected locale structure
     @see osl_setProcessLocale
 */
 
 oslProcessError SAL_CALL osl_getProcessLocale( rtl_Locale ** ppLocale );
 
-/** Change the locale of the process.
+/** Change the locale of the process. 
 
-    @param  pLocale [in] a pointer to the locale to be set
+    @param	pLocale [in] a pointer to the locale to be set
     @see osl_getProcessLocale
 */
 
 oslProcessError SAL_CALL osl_setProcessLocale( rtl_Locale * pLocale );
-
+ 
 
 sal_Bool SAL_CALL osl_sendResourcePipe(oslPipe Pipe, oslSocket Socket);
-
+ 
 oslSocket SAL_CALL osl_receiveResourcePipe(oslPipe Pipe);
 
 #ifdef __cplusplus
diff --git a/sal/inc/osl/profile.h b/sal/inc/osl/profile.h
index 341085918104..b0545f3cb8a4 100644
--- a/sal/inc/osl/profile.h
+++ b/sal/inc/osl/profile.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,11 +38,11 @@ extern "C" {
 
 typedef sal_uInt32 oslProfileOption;
 
-#define osl_Profile_DEFAULT     0x0000
-#define osl_Profile_SYSTEM      0x0001    /* use system depended functinality */
-#define osl_Profile_READLOCK    0x0002    /* lock file for reading            */
-#define osl_Profile_WRITELOCK   0x0004    /* lock file for writing            */
-#define osl_Profile_FLUSHWRITE  0x0010    /* writing only with flush          */
+#define	osl_Profile_DEFAULT     0x0000    
+#define	osl_Profile_SYSTEM      0x0001    /* use system depended functinality */
+#define	osl_Profile_READLOCK    0x0002    /* lock file for reading            */
+#define	osl_Profile_WRITELOCK   0x0004    /* lock file for writing            */
+#define	osl_Profile_FLUSHWRITE  0x0010    /* writing only with flush          */
 
 
 typedef void* oslProfile;
@@ -69,21 +69,21 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile);
 /** Deprecated API.
     @deprecated
 */
-sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
-                              const sal_Char* pszSection, const sal_Char* pszEntry,
-                              sal_Char* pszString, sal_uInt32 MaxLen,
+sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, 
+                              const sal_Char* pszSection, const sal_Char* pszEntry, 
+                              sal_Char* pszString, sal_uInt32 MaxLen, 
                               const sal_Char* pszDefault);
 /** Deprecated API.
     @deprecated
 */
-sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile,
-                            const sal_Char* pszSection, const sal_Char* pszEntry,
+sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile, 
+                            const sal_Char* pszSection, const sal_Char* pszEntry, 
                             sal_Bool Default);
 /** Deprecated API.
     @deprecated
 */
-sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile,
-                              const sal_Char* pszSection, const sal_Char* pszEntry,
+sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile, 
+                              const sal_Char* pszSection, const sal_Char* pszEntry, 
                               sal_uInt32 FirstId, const sal_Char* Strings[],
                               sal_uInt32 Default);
 
@@ -91,20 +91,20 @@ sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile,
     @deprecated
 */
 sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
-                               const sal_Char* pszSection, const sal_Char* pszEntry,
-                               const sal_Char* pszString);
+                               const sal_Char* pszSection, const sal_Char* pszEntry, 
+                               const sal_Char* pszString);								
 /** Deprecated API.
     @deprecated
 */
 sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile,
-                             const sal_Char* pszSection, const sal_Char* pszEntry,
+                             const sal_Char* pszSection, const sal_Char* pszEntry, 
                              sal_Bool Value);
 /** Deprecated API.
     @deprecated
 */
 sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile,
-                              const sal_Char* pszSection, const sal_Char* pszEntry,
-                              sal_uInt32 FirstId, const sal_Char* Strings[],
+                              const sal_Char* pszSection, const sal_Char* pszEntry, 
+                              sal_uInt32 FirstId, const sal_Char* Strings[], 
                               sal_uInt32 Value);
 
 /** Deprecated API.
@@ -113,7 +113,7 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile,
     @return False if section or entry could not be found.
     @deprecated
 */
-sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
+sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile, 
                                const sal_Char *pszSection, const sal_Char *pszEntry);
 
 /** Deprecated API.
@@ -137,6 +137,6 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char* pszBuff
 }
 #endif
 
-#endif  /* _OSL_PROFILE_H_ */
+#endif	/* _OSL_PROFILE_H_ */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/profile.hxx b/sal/inc/osl/profile.hxx
index d3982a5c39af..7e2ea697aabd 100644
--- a/sal/inc/osl/profile.hxx
+++ b/sal/inc/osl/profile.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,7 +59,7 @@ namespace osl {
             if( ! profile )
                 throw std::exception();
         }
-
+                
 
         /** Close the opened profile an flush all data to the disk.
             @param Profile handle to a opened profile.
@@ -75,7 +75,7 @@ namespace osl {
             return osl_flushProfile(profile);
         }
 
-        rtl::OString readString( const rtl::OString& rSection, const rtl::OString& rEntry,
+        rtl::OString readString( const rtl::OString& rSection, const rtl::OString& rEntry, 
                                  const rtl::OString& rDefault)
         {
             sal_Char aBuf[1024];
@@ -93,7 +93,7 @@ namespace osl {
             return osl_readProfileBool( profile, rSection, rEntry, bDefault );
         }
 
-        sal_uInt32 readIdent(const rtl::OString& rSection, const rtl::OString& rEntry,
+        sal_uInt32 readIdent(const rtl::OString& rSection, const rtl::OString& rEntry, 
                              sal_uInt32 nFirstId, const std::list< rtl::OString >& rStrings,
                              sal_uInt32 nDefault)
         {
@@ -112,7 +112,7 @@ namespace osl {
             return nRet;
         }
 
-        sal_Bool writeString(const rtl::OString& rSection, const rtl::OString& rEntry,
+        sal_Bool writeString(const rtl::OString& rSection, const rtl::OString& rEntry, 
                              const rtl::OString& rString)
         {
             return osl_writeProfileString(profile, rSection, rEntry, rString);
@@ -123,8 +123,8 @@ namespace osl {
             return osl_writeProfileBool(profile, rSection, rEntry, Value);
         }
 
-        sal_Bool writeIdent(const rtl::OString& rSection, const rtl::OString& rEntry,
-                            sal_uInt32 nFirstId, const std::list< rtl::OString >& rStrings,
+        sal_Bool writeIdent(const rtl::OString& rSection, const rtl::OString& rEntry, 
+                            sal_uInt32 nFirstId, const std::list< rtl::OString >& rStrings, 
                             sal_uInt32 nValue)
         {
             int nItems = rStrings.size();
@@ -200,7 +200,7 @@ namespace osl {
     };
 }
 
-#endif  /* _OSL_PROFILE_HXX_ */
+#endif	/* _OSL_PROFILE_HXX_ */
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/security.h b/sal/inc/osl/security.h
index 6c26df96a397..7e3797801f8a 100644
--- a/sal/inc/osl/security.h
+++ b/sal/inc/osl/security.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -76,7 +76,7 @@ oslSecurityError SAL_CALL osl_loginUser(
     );
 
 /** Create a security handle for the denoted user.
-    Try to log in the user on the denoted file server. On success the homedir will be
+    Try to log in the user on the denoted file server. On success the homedir will be 
     the maped drive on this server.
     @param strUserName [in] denotes the name of the user to logg in.
     @param strPasswd [in] the password for this user.
@@ -156,6 +156,6 @@ void SAL_CALL osl_unloadUserProfile(oslSecurity Security);
 }
 #endif
 
-#endif  /* _OSL_SECURITY_H_ */
+#endif	/* _OSL_SECURITY_H_ */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/security.hxx b/sal/inc/osl/security.hxx
index aa98bd240a0e..3b2ce9edd669 100644
--- a/sal/inc/osl/security.hxx
+++ b/sal/inc/osl/security.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,11 +32,11 @@
 #include <rtl/ustring.hxx>
 
 #ifndef _OSL_SECURITY_DECL_HXX
-#   include <osl/security_decl.hxx>
+#	include <osl/security_decl.hxx>
 #endif
 
 namespace osl
-{
+{     
 
 inline Security::Security()
 {
@@ -52,10 +52,10 @@ inline sal_Bool Security::logonUser(const rtl::OUString& strName,
                                     const rtl::OUString& strPasswd)
 {
     osl_freeSecurityHandle(m_handle);
-
+    
     m_handle = 0;
-
-    return (osl_loginUser( strName.pData, strPasswd.pData, &m_handle)
+    
+    return (osl_loginUser( strName.pData, strPasswd.pData, &m_handle) 
             == osl_Security_E_None);
 }
 
@@ -64,10 +64,10 @@ inline sal_Bool Security::logonUser( const rtl::OUString& strName,
                                       const rtl::OUString& strFileServer )
 {
     osl_freeSecurityHandle(m_handle);
-
+    
     m_handle = NULL;
-
-    return (osl_loginUserOnFileServer(strName.pData, strPasswd.pData, strFileServer.pData, &m_handle)
+    
+    return (osl_loginUserOnFileServer(strName.pData, strPasswd.pData, strFileServer.pData, &m_handle) 
             == osl_Security_E_None);
 }
 
@@ -107,6 +107,6 @@ inline oslSecurity Security::getHandle() const
 
 }
 
-#endif  // _OSL_SECURITY_HXX_
+#endif	// _OSL_SECURITY_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/security_decl.hxx b/sal/inc/osl/security_decl.hxx
index a6078ea62c8b..960137bf5017 100644
--- a/sal/inc/osl/security_decl.hxx
+++ b/sal/inc/osl/security_decl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,17 +30,17 @@
 #define _OSL_SECURITY_DECL_HXX_
 
 #include <rtl/ustring.hxx>
-#   include <osl/security.h>
+#	include <osl/security.h>
 
 namespace osl
-{
+{     
 
 /** capsulate security informations for one user.
-    A object of this class is used to execute a process with the rights an
-    security options of a scecified user.
+    A object of this class is used to execute a process with the rights an 
+    security options of a scecified user. 
     @see Process::executeProcess
 */
-class Security
+class Security 
 {
 protected:
     oslSecurity m_handle;
@@ -50,7 +50,7 @@ public:
     inline Security();
     /// destructor
     inline ~Security();
-    /** get the security information for one user.
+    /** get the security information for one user. 
         The underlying operating system is asked for this information.
         @param strName [in] denotes the name of the user
         @param strPasswd [in] denotes the password of this user
@@ -59,15 +59,15 @@ public:
     */
     inline sal_Bool SAL_CALL logonUser(const ::rtl::OUString& strName,
                                        const ::rtl::OUString& strPasswd);
-    /** get the security information for one user.
+    /** get the security information for one user. 
         This method will try to login the user at the denoted file server.
         If a network resource named \\server\username exists and this resource
         could be connected by this user, the methos will return true and getHomeDir
         will return \\server\username.
         @param strName [in] denotes the name of the user
         @param strPasswd [in] denotes the password of this user
-        @return True, if the specified user is known by file server and the
-        could be connected, otherwise False
+        @return True, if the specified user is known by file server and the 
+        could be connected,	otherwise False
     */
     inline sal_Bool SAL_CALL logonUser(const ::rtl::OUString & strName,
                                        const ::rtl::OUString & strPasswd,
@@ -105,7 +105,7 @@ public:
         @return True, if the user has administrator rights, otherwise false.
     */
     inline sal_Bool SAL_CALL isAdministrator() const;
-
+ 
     /** Returns the underlying oslSecurity handle
      */
     inline oslSecurity getHandle() const;
@@ -114,6 +114,6 @@ public:
 
 }
 
-#endif  // _OSL_SECURITY_HXX_
+#endif	// _OSL_SECURITY_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/semaphor.h b/sal/inc/osl/semaphor.h
index 8b117451f646..c02d6613ced1 100644
--- a/sal/inc/osl/semaphor.h
+++ b/sal/inc/osl/semaphor.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,9 +68,9 @@ void SAL_CALL osl_destroySemaphore(oslSemaphore Semaphore);
 */
 sal_Bool SAL_CALL osl_acquireSemaphore(oslSemaphore Semaphore);
 
-/** tryToAcquire() tries to decreases the count. It will
+/** tryToAcquire() tries to decreases the count. It will 
     return with False if it would decrease the count below zero.
-    (When acquire() would block.) If it could successfully
+    (When acquire() would block.) If it could successfully 
     decrease the count, it will return True.
 
     @deprecated
diff --git a/sal/inc/osl/semaphor.hxx b/sal/inc/osl/semaphor.hxx
index a36db2a8a6a8..bb81fca27c8e 100644
--- a/sal/inc/osl/semaphor.hxx
+++ b/sal/inc/osl/semaphor.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,14 +35,14 @@
 
 
 namespace osl
-{
+{     
     /** C++ wrapper class around C semaphore functions.
 
         @deprecated
         Must not be used, as unnamed semaphores are not supported on Mac OS X.
     */
     class Semaphore {
-
+    
     public:
 
         /** Creates a semaphore.<BR>
@@ -51,7 +51,7 @@ namespace osl
             immedeatly  successfull.
             @return 0 if the semaphore could not be created, otherwise a handle to the sem.
         */
-
+        
         Semaphore(sal_uInt32 initialCount)
         {
             semaphore = osl_createSemaphore(initialCount);
@@ -60,7 +60,7 @@ namespace osl
         /** Release the OS-structures and free semaphore data-structure
             @return fbbb
         */
-        ~Semaphore()
+        ~Semaphore() 
         {
             osl_destroySemaphore(semaphore);
         }
@@ -74,9 +74,9 @@ namespace osl
             return osl_acquireSemaphore(semaphore);
         }
 
-        /** tryToAcquire() tries to decreases the count. It will
+        /** tryToAcquire() tries to decreases the count. It will 
             return with False if it would decrease the count below zero.
-            (When acquire() would block.) If it could successfully
+            (When acquire() would block.) If it could successfully 
             decrease the count, it will return True.
         */
         sal_Bool tryToAcquire()
@@ -91,31 +91,31 @@ namespace osl
         {
             return osl_releaseSemaphore(semaphore);
         }
-
+        
     private:
         oslSemaphore semaphore;
 
         /** The underlying oslSemaphore has no reference count.
-
-        Since the underlying oslSemaphore is not a reference counted object, copy
+        
+        Since the underlying oslSemaphore is not a reference counted object, copy 
         constructed Semaphore may work on an already destructed oslSemaphore object.
-
+        
         */
         Semaphore(const Semaphore&);
-
+        
         /** The underlying oslSemaphore has no reference count.
-
+        
         When destructed, the Semaphore object destroys the undelying oslSemaphore,
         which might cause severe problems in case it's a temporary object.
-
+         
         */
         Semaphore(oslSemaphore Semaphore);
-
+        
         /** This assignment operator is private for the same reason as
             the copy constructor.
         */
         Semaphore& operator= (const Semaphore&);
-
+        
         /** This assignment operator is private for the same reason as
             the constructor taking a oslSemaphore argument.
         */
diff --git a/sal/inc/osl/signal.h b/sal/inc/osl/signal.h
index 7fec0636594e..37088227c018 100644
--- a/sal/inc/osl/signal.h
+++ b/sal/inc/osl/signal.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,11 +35,11 @@
 extern "C" {
 #endif
 
-#define OSL_SIGNAL_USER_RESERVED    0
+#define OSL_SIGNAL_USER_RESERVED	0
 
-#define OSL_SIGNAL_USER_RESOURCEFAILURE     (OSL_SIGNAL_USER_RESERVED - 1)
-#define OSL_SIGNAL_USER_X11SUBSYSTEMERROR   (OSL_SIGNAL_USER_RESERVED - 2)
-#define OSL_SIGNAL_USER_RVPCONNECTIONERROR  (OSL_SIGNAL_USER_RESERVED - 3)
+#define OSL_SIGNAL_USER_RESOURCEFAILURE		(OSL_SIGNAL_USER_RESERVED - 1)
+#define OSL_SIGNAL_USER_X11SUBSYSTEMERROR 	(OSL_SIGNAL_USER_RESERVED - 2)
+#define OSL_SIGNAL_USER_RVPCONNECTIONERROR 	(OSL_SIGNAL_USER_RESERVED - 3)
 
 typedef void* oslSignalHandler;
 
@@ -66,20 +66,20 @@ typedef enum
 } oslSignalAction;
 
 #ifdef SAL_W32
-#   pragma pack(push, 8)
+#	pragma pack(push, 8)
 #elif defined(SAL_OS2)
-#   pragma pack(push, 4)
+#	pragma pack(push, 4)
 #endif
 
 typedef struct
-{
-    oslSignal   Signal;
-    sal_Int32   UserSignal;
-    void*       UserData;
+{	
+    oslSignal	Signal;
+    sal_Int32	UserSignal;
+    void* 		UserData;
 } oslSignalInfo;
 
 #if defined( SAL_W32) ||  defined(SAL_OS2)
-#   pragma pack(pop)
+#	pragma pack(pop)
 #endif
 
 /** the function-ptr. representing the signal handler-function.
@@ -96,10 +96,10 @@ oslSignalAction SAL_CALL osl_raiseSignal(sal_Int32 UserSignal, void* UserData);
 
     On default error reporting is enabled after process startup.
 
-    @param  bEnable [in]
-    Enables or disables error reporting.
-
-    @return
+    @param	bEnable [in]
+    Enables or disables error reporting.	
+    
+    @return 
     sal_True if previous state of error reporting was enabled<br>
     sal_False if previous state of error reporting was disbaled<br>
 */
@@ -110,7 +110,7 @@ sal_Bool SAL_CALL osl_setErrorReporting( sal_Bool bEnable );
 }
 #endif
 
-#endif  /* _OSL_SIGNAL_H_ */
+#endif	/* _OSL_SIGNAL_H_ */
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/socket.h b/sal/inc/osl/socket.h
index fb2d32eb440e..0f36d8603f2c 100644
--- a/sal/inc/osl/socket.h
+++ b/sal/inc/osl/socket.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,12 +40,12 @@ extern "C" {
 #endif
 
 /* error returns */
-#define OSL_INADDR_NONE             0xffffffff
+#define OSL_INADDR_NONE				0xffffffff
 #define OSL_INVALID_PORT (-1)
-#define OSL_INVALID_IPX_SOCKET_NO   0xffffffff
+#define OSL_INVALID_IPX_SOCKET_NO	0xffffffff
 
 /**@HTML
-
+   
 */
 
 /**
@@ -57,10 +57,10 @@ typedef struct oslSocketAddrImpl * oslSocketAddr;
 /**
     Represents the address-family of a socket
 */
-typedef enum {
-    osl_Socket_FamilyInet,      /* IP */
-    osl_Socket_FamilyIpx,       /* Novell IPX/SPX */
-    osl_Socket_FamilyInvalid,   /* always last entry in enum! */
+typedef enum {	
+    osl_Socket_FamilyInet,  	/* IP */
+    osl_Socket_FamilyIpx,	  	/* Novell IPX/SPX */
+    osl_Socket_FamilyInvalid,	/* always last entry in enum! */
     osl_Socket_Family_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslAddrFamily;
 
@@ -68,10 +68,10 @@ typedef enum {
     represent a specific protocol within a address-family
 */
 typedef enum {
-    osl_Socket_ProtocolIp,      /* for all af_inet */
-    osl_Socket_ProtocolIpx,     /* af_ipx datagram sockets (IPX) */
-    osl_Socket_ProtocolSpx,     /* af_ipx seqpacket or stream for SPX */
-    osl_Socket_ProtocolSpxII,   /* af_ipx seqpacket or stream for SPX II */
+    osl_Socket_ProtocolIp,	   	/* for all af_inet */
+    osl_Socket_ProtocolIpx,	   	/* af_ipx datagram sockets (IPX) */
+    osl_Socket_ProtocolSpx,	   	/* af_ipx seqpacket or stream for SPX */
+    osl_Socket_ProtocolSpxII,  	/* af_ipx seqpacket or stream for SPX II */
     osl_Socket_ProtocolInvalid,
     osl_Socket_Protocol_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslProtocol;
@@ -86,7 +86,7 @@ typedef enum {
     osl_Socket_TypeRaw,
     osl_Socket_TypeRdm,
     osl_Socket_TypeSeqPacket,
-    osl_Socket_TypeInvalid,     /* always last entry in enum! */
+    osl_Socket_TypeInvalid,		/* always last entry in enum! */
     osl_Socket_Type_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslSocketType;
 
@@ -101,7 +101,7 @@ typedef enum {
     osl_Socket_OptionKeepAlive,
     osl_Socket_OptionDontRoute,
     osl_Socket_OptionBroadcast,
-    osl_Socket_OptionUseLoopback,
+    osl_Socket_OptionUseLoopback,	
     osl_Socket_OptionLinger,
     osl_Socket_OptionOOBinLine,
     osl_Socket_OptionSndBuf,
@@ -113,9 +113,9 @@ typedef enum {
     osl_Socket_OptionError,
     osl_Socket_OptionType,
     osl_Socket_OptionTcpNoDelay,
-    osl_Socket_OptionInvalid,       /* always last entry in enum! */
+    osl_Socket_OptionInvalid,		/* always last entry in enum! */
     osl_Socket_Option_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
-} oslSocketOption;
+} oslSocketOption;	
 
 /**
     Represents the different socket-option levels
@@ -123,7 +123,7 @@ typedef enum {
 typedef enum  {
     osl_Socket_LevelSocket,
     osl_Socket_LevelTcp,
-    osl_Socket_LevelInvalid,            /* always last entry in enum! */
+    osl_Socket_LevelInvalid,			/* always last entry in enum! */
     osl_Socket_Level_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslSocketOptionLevel;
 
@@ -137,7 +137,7 @@ typedef enum {
     osl_Socket_MsgPeek,
     osl_Socket_MsgDontRoute,
     osl_Socket_MsgMaxIOVLen,
-    osl_Socket_MsgInvalid,          /* always last entry in enum! */
+    osl_Socket_MsgInvalid,			/* always last entry in enum! */
     osl_Socket_Msg_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslSocketMsgFlag;
 
@@ -148,46 +148,46 @@ typedef enum {
     osl_Socket_DirRead,
     osl_Socket_DirWrite,
     osl_Socket_DirReadWrite,
-    osl_Socket_DirInvalid,          /* always last entry in enum! */
+    osl_Socket_DirInvalid,			/* always last entry in enum! */
     osl_Socket_Dir_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslSocketDirection;
 
 /** Describes the various error socket error conditions, which may
     occur */
 typedef enum {
-    osl_Socket_E_None,              /* no error */
-    osl_Socket_E_NotSocket,         /* Socket operation on non-socket */
-    osl_Socket_E_DestAddrReq,       /* Destination address required */
-    osl_Socket_E_MsgSize,           /* Message too long */
-    osl_Socket_E_Prototype,         /* Protocol wrong type for socket */
-    osl_Socket_E_NoProtocol,        /* Protocol not available */
-    osl_Socket_E_ProtocolNoSupport, /* Protocol not supported */
-    osl_Socket_E_TypeNoSupport,     /* Socket type not supported */
-    osl_Socket_E_OpNotSupport,      /* Operation not supported on socket */
-    osl_Socket_E_PfNoSupport,       /* Protocol family not supported */
-    osl_Socket_E_AfNoSupport,       /* Address family not supported by */
+    osl_Socket_E_None,				/* no error */
+    osl_Socket_E_NotSocket,			/* Socket operation on non-socket */
+    osl_Socket_E_DestAddrReq,		/* Destination address required */
+    osl_Socket_E_MsgSize,			/* Message too long */
+    osl_Socket_E_Prototype,			/* Protocol wrong type for socket */
+    osl_Socket_E_NoProtocol,		/* Protocol not available */
+    osl_Socket_E_ProtocolNoSupport,	/* Protocol not supported */
+    osl_Socket_E_TypeNoSupport,		/* Socket type not supported */
+    osl_Socket_E_OpNotSupport,		/* Operation not supported on socket */
+    osl_Socket_E_PfNoSupport,		/* Protocol family not supported */
+    osl_Socket_E_AfNoSupport,		/* Address family not supported by */
                                     /* protocol family */
-    osl_Socket_E_AddrInUse,         /* Address already in use */
-    osl_Socket_E_AddrNotAvail,      /* Can't assign requested address */
-    osl_Socket_E_NetDown,           /* Network is down */
-    osl_Socket_E_NetUnreachable,    /* Network is unreachable */
-    osl_Socket_E_NetReset,          /* Network dropped connection because */
+    osl_Socket_E_AddrInUse,			/* Address already in use */
+    osl_Socket_E_AddrNotAvail,		/* Can't assign requested address */
+    osl_Socket_E_NetDown,			/* Network is down */
+    osl_Socket_E_NetUnreachable, 	/* Network is unreachable */
+    osl_Socket_E_NetReset,			/* Network dropped connection because */
                                     /* of reset */
-    osl_Socket_E_ConnAborted,       /* Software caused connection abort */
-    osl_Socket_E_ConnReset,         /* Connection reset by peer */
-    osl_Socket_E_NoBufferSpace,     /* No buffer space available */
-    osl_Socket_E_IsConnected,       /* Socket is already connected */
-    osl_Socket_E_NotConnected,      /* Socket is not connected */
-    osl_Socket_E_Shutdown,          /* Can't send after socket shutdown */
-    osl_Socket_E_TooManyRefs,       /* Too many references: can't splice */
-    osl_Socket_E_TimedOut,          /* Connection timed out */
-    osl_Socket_E_ConnRefused,       /* Connection refused */
-    osl_Socket_E_HostDown,          /* Host is down */
-    osl_Socket_E_HostUnreachable,   /* No route to host */
-    osl_Socket_E_WouldBlock,        /* call would block on non-blocking socket */
-    osl_Socket_E_Already,           /* operation already in progress */
-    osl_Socket_E_InProgress,        /* operation now in progress */
-    osl_Socket_E_InvalidError,      /* unmapped error: always last entry in enum! */
+    osl_Socket_E_ConnAborted,		/* Software caused connection abort */
+    osl_Socket_E_ConnReset,			/* Connection reset by peer */
+    osl_Socket_E_NoBufferSpace,		/* No buffer space available */
+    osl_Socket_E_IsConnected,		/* Socket is already connected */
+    osl_Socket_E_NotConnected,		/* Socket is not connected */
+    osl_Socket_E_Shutdown,			/* Can't send after socket shutdown */
+    osl_Socket_E_TooManyRefs,		/* Too many references: can't splice */
+    osl_Socket_E_TimedOut,			/* Connection timed out */
+    osl_Socket_E_ConnRefused,		/* Connection refused */
+    osl_Socket_E_HostDown,			/* Host is down */
+    osl_Socket_E_HostUnreachable,	/* No route to host */
+    osl_Socket_E_WouldBlock,		/* call would block on non-blocking socket */
+    osl_Socket_E_Already,			/* operation already in progress */
+    osl_Socket_E_InProgress,		/* operation now in progress */
+    osl_Socket_E_InvalidError,		/* unmapped error: always last entry in enum! */
     osl_Socket_E_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslSocketError;
 
@@ -198,7 +198,7 @@ typedef enum {
     osl_Socket_Error,       /* error occured, check osl_getLastSocketError() for details */
     osl_Socket_TimedOut,    /* blocking operation timed out */
     osl_Socket_Interrupted, /* blocking operation was interrupted */
-    osl_Socket_InProgress,  /* nonblocking operation is in progress */
+    osl_Socket_InProgress,	/* nonblocking operation is in progress */
     osl_Socket_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslSocketResult;
 
@@ -211,19 +211,19 @@ typedef sal_uInt8 oslSocketIpxNodeNumber[6];
 /**@{ begin section oslSocketAddr
 */
 
-/** Creates a socket-address for the given family.
+/**	Creates a socket-address for the given family.
     @param family If family == osl_Socket_FamilyInet the address is
-                  set to INADDR_ANY port 0.
+                  set to INADDR_ANY	port 0.
     @return 0 if address could not be created.
 */
 oslSocketAddr SAL_CALL osl_createEmptySocketAddr(oslAddrFamily Family);
 
 
-/** Creates a new SocketAddress and fills it from Addr.
+/**	Creates a new SocketAddress and fills it from Addr.
 */
 oslSocketAddr SAL_CALL osl_copySocketAddr(oslSocketAddr Addr);
 
-/** Compares the values of two SocketAddresses.
+/**	Compares the values of two SocketAddresses.
     @return <code>sal_True</code> if both addresses denote the same socket address,
             <code>sal_False</code> otherwise.
 */
@@ -250,7 +250,7 @@ oslSocketAddr SAL_CALL osl_createInetBroadcastAddr (
     rtl_uString *strDottedAddr, sal_Int32 Port);
 
 
-/** Create an internet-address, consisting of hostaddress and port.
+/**	Create an internet-address, consisting of hostaddress and port.
     We interpret strDottedAddr as a dotted-decimal inet-addr
     (e.g. "141.99.128.50").
     @param strDottedAddr [in] String with dotted address.
@@ -266,7 +266,7 @@ oslSocketAddr SAL_CALL osl_createInetSocketAddr (
 */
 void SAL_CALL osl_destroySocketAddr(oslSocketAddr Addr);
 
-/** Looks up the port-number designated to the specified service/protocol-pair.
+/**	Looks up the port-number designated to the specified service/protocol-pair.
     (e.g. "ftp" "tcp").
     @return OSL_INVALID_PORT if no appropriate entry was found, otherwise the port-number.
 */
@@ -299,17 +299,17 @@ sal_Bool SAL_CALL osl_setInetPortOfSocketAddr(oslSocketAddr Addr, sal_Int32 Port
     @param strHostname out-parameter. The hostname represented by the address. If
     there is no hostname to be found, it returns 0.
 */
-oslSocketResult SAL_CALL osl_getHostnameOfSocketAddr(oslSocketAddr Addr, rtl_uString **strHostname);
+oslSocketResult	SAL_CALL osl_getHostnameOfSocketAddr(oslSocketAddr Addr, rtl_uString **strHostname);
 
 
 /** Gets the address in dotted decimal format.
     @param strDottedInetAddr out-parameter. Contains the dotted decimal address
-    (e.g. 141.99.20.34) represented by the address.
+    (e.g. 141.99.20.34) represented	by the address.
     If the address is invalid or not of type <code>osl_Socket_FamilyInet</code>,
     it returns 0.
     @return <code>osl_Socket_Ok</code> or <code>osl_Socket_Error</code>
 */
-oslSocketResult SAL_CALL osl_getDottedInetAddrOfSocketAddr(oslSocketAddr Addr, rtl_uString **strDottedInetAddr);
+oslSocketResult	SAL_CALL osl_getDottedInetAddrOfSocketAddr(oslSocketAddr Addr, rtl_uString **strDottedInetAddr);
 
 /** Sets the addr field in the struct sockaddr with pByteSeq. pByteSeq must be in network byte order.
  */
@@ -321,7 +321,7 @@ oslSocketResult SAL_CALL osl_setAddrOfSocketAddr( oslSocketAddr Addr, sal_Sequen
     @return <code>osl_Socket_Ok</code> or <code>osl_Socket_Error</code>
  */
 oslSocketResult SAL_CALL osl_getAddrOfSocketAddr( oslSocketAddr Addr, sal_Sequence **ppByteSeq );
-
+    
 /*
     Opaque datatype HostAddr.
 */
@@ -356,7 +356,7 @@ oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString *strHostname);
 oslHostAddr SAL_CALL osl_createHostAddrByAddr(const oslSocketAddr Addr);
 
 
-/** Create a copy of the given Addr.
+/**	Create a copy of the given Addr.
     @return The copied address or 0 upon failure.
 */
 oslHostAddr SAL_CALL osl_copyHostAddr(const oslHostAddr Addr);
@@ -410,17 +410,17 @@ void SAL_CALL osl_acquireSocket( oslSocket Socket );
     is destroyed and becomes invalid.
  */
 void SAL_CALL osl_releaseSocket( oslSocket Socket );
-
+    
 /** Create a socket of the specified Family and Type. The semantic of
     the Protocol parameter depends on the given family and type.
     @return 0 if socket could not be created, otherwise you get a handle
     to the allocated socket-datastructure.
 */
-oslSocket SAL_CALL osl_createSocket(oslAddrFamily   Family,
-                                    oslSocketType   Type,
+oslSocket SAL_CALL osl_createSocket(oslAddrFamily	Family,
+                                    oslSocketType	Type,
                                     oslProtocol     Protocol);
 
-/** Retrieves the Address of the local end of the socket.
+/**	Retrieves the Address of the local end of the socket.
     Note that a socket must be bound or connected before
     a vaild address can be returned.
     @return 0 if socket-address could not be created, otherwise you get
@@ -428,7 +428,7 @@ oslSocket SAL_CALL osl_createSocket(oslAddrFamily   Family,
 */
 oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket Socket);
 
-/** Retrieves the Address of the remote end of the socket.
+/**	Retrieves the Address of the remote end of the socket.
     Note that a socket must be connected before
     a vaild address can be returned.
     @return 0 if socket-address could not be created, otherwise you get
@@ -450,7 +450,7 @@ sal_Bool SAL_CALL osl_bindAddrToSocket(oslSocket Socket,
     @param Socket [in] a bound socket.
     @param Addr [in] the peer address.
     @param pTimeout Timeout value or NULL for blocking.
-
+    
     @return <code>osl_Socket_Ok</code> on successful connection,
             <code>osl_Socket_TimedOut</code> if operation timed out,
             <code>osl_Socket_Interrupted</code> if operation was interrupted
@@ -525,7 +525,7 @@ sal_Int32 SAL_CALL osl_receiveSocket(oslSocket Socket,
     <li><code>osl_Socket_MsgDontRoute</code>
     <li><code>osl_Socket_MsgMaxIOVLen</code>
     </ul>
-
+    
     @return the number of received bytes.
 */
 sal_Int32 SAL_CALL osl_receiveFromSocket(oslSocket Socket,
@@ -536,7 +536,7 @@ sal_Int32 SAL_CALL osl_receiveFromSocket(oslSocket Socket,
 
 /** Tries to send BytesToSend data from the connected socket,
     if no error occurs.
-
+    
     @param Socket [in] A connected socket.
     @param pBuffer [in] Points to a buffer that contains the send-data.
     @param BytesToSend [in] The number of bytes to send. pBuffer must have at least
@@ -589,15 +589,15 @@ sal_Int32 SAL_CALL osl_sendToSocket(oslSocket Socket,
                          oslSocketMsgFlag Flag);
 
 /** Checks if read operations will block.
-
+    
     You can specify a timeout-value in seconds/microseconds that denotes
     how long the operation will block if the Socket is not ready.
 
     @return <code>sal_True</code> if read operations (recv, recvFrom, accept) on the Socket
     will NOT block; <code>sal_False</code> if it would block or if an error occured.
-
+    
     @param Socket the Socket to perfom the operation on.
-    @param pTimeout if NULL, the operation will block without a timeout.
+    @param pTimeout if NULL, the operation will block without a timeout. 
 */
 sal_Bool SAL_CALL osl_isReceiveReady(oslSocket Socket, const TimeValue* pTimeout);
 
@@ -606,7 +606,7 @@ sal_Bool SAL_CALL osl_isReceiveReady(oslSocket Socket, const TimeValue* pTimeout
     how long the operation will block if the Socket is not ready.
     @return <code>sal_True</code> if send operations (send, sendTo) on the Socket
     will NOT block; <code>sal_False</code> if it would block or if an error occured.
-
+    
     @param Socket the Socket to perfom the operation on.
     @param pTimeout if NULL, the operation will block without a timeout. Otherwise
     the time define by timeout value.
@@ -618,9 +618,9 @@ sal_Bool SAL_CALL osl_isSendReady(oslSocket Socket, const TimeValue* pTimeout);
     how long the operation will block if the Socket has no pending OOB data.
     @return <code>sal_True</code> if OOB-request operations (recv with appropriate flags)
     on the Socket will NOT block; <code>sal_False</code> if it would block or if an error occured.
-
+    
     @param Socket the Socket to perfom the operation on.
-    @param pTimeout if NULL, the operation will block without a timeout.
+    @param pTimeout if NULL, the operation will block without a timeout. 
 */
 sal_Bool SAL_CALL osl_isExceptionPending(oslSocket Socket, const TimeValue* pTimeout);
 
@@ -628,7 +628,7 @@ sal_Bool SAL_CALL osl_isExceptionPending(oslSocket Socket, const TimeValue* pTim
     @param Direction denotes which end of the socket
     should be closed:
     <ul>
-    <li> <code>osl_Socket_DirRead</code>    closes read operations.
+    <li> <code>osl_Socket_DirRead</code>	closes read operations.
     <li> <code>osl_Socket_DirReadWrite</code> closes write operations.
     <li> <code>osl_Socket_DirWrite</code> closes read and write operations.
     </ul>
@@ -643,63 +643,63 @@ sal_Bool SAL_CALL osl_shutdownSocket(oslSocket Socket,
     @param Level selects the level for which an option should be queried.
     Valid values are:
     <ul>
-    <li> osl_sol_socket:    Socket Level
-    <li> osl_sol_tcp:       Level of Transmission Control Protocol
+    <li> osl_sol_socket:	Socket Level
+    <li> osl_sol_tcp:		Level of Transmission Control Protocol
     </ul>
-
+    
     @param Option denotes the option to query.
     Valid values (depending on the Level) are:
     <ul>
     <li> <code>osl_Socket_Option_Debug</code><br>
     (sal_Bool) Socket debug flag 1 = enabled, 0 = disabled.
-
+            
     <li> <code>osl_Socket_OptionAcceptConn</code><br>
     <li> <code>osl_Socket_OptionReuseAddr</code><br>
     (sal_Bool) Allows the socket to be bound to an address that is
     already in use.
     1 = multiple bound allowed, 0 = no multiple bounds allowed
-
+              
     <li><code>osl_Socket_OptionKeepAlive</code><br>
     (sal_Bool) Keepalive packets are sent by the underlying socket.
     1 = enabled, 0 = disabled
-
+              
     <li><code>osl_Socket_OptionDontRoute</code><br>
     (sal_Bool) Do not route: send directly to interface.
     1 = do not route , 0 = routing possible
-
+               
     <li><code>osl_Socket_OptionBroadcast</code><br>
-    (sal_Bool) Transmission of broadcast messages are allowed on the socket.
+    (sal_Bool) Transmission of broadcast messages are allowed on the socket. 
     1 = transmission allowed, 0 = transmission disallowed
-
+               
     <li><code>osl_Socket_OptionUseLoopback</code><br>
 
     <li><code>osl_Socket_OptionLinger</code><br>
     (sal_Int32) Linger on close if unsent data is present.
     0 = linger is off, > 0  = timeout in seconds.
-
+              
     <li><code>osl_Socket_OptionOOBinLine</code><br>
-
+              
 
     <li><code>osl_Socket_OptionSndBuf</code><br>
     (sal_Int32) Size of the send buffer in bytes. Data is sent after
     SndTimeo or when the buffer is full. This allows faster writing
     to the socket.
-
+            
     <li><code>osl_Socket_OptionRcvBuf</code><br>
     (sal_Int32) Size of the receive buffer in bytes. Data is sent after
     SndTimeo or when the buffer is full. This allows faster writing
     to the socket and larger packet sizes.
-
+            
     <li><code>osl_Socket_OptionSndLowat</code><br>
-
+            
     <li><code>osl_Socket_OptionRcvLowat</code><br>
-
+            
     <li><code>osl_Socket_OptionSndTimeo</code><br>
     (sal_Int32) Data is sent after this timeout. This allows gathering
     of data to send larger packages but increases latency times.
-
+            
     <li><code>osl_Socket_OptionRcvTimeo</code><br>
-
+            
     <li><code>osl_Socket_OptionError</code><br>
     <li><code>osl_Socket_OptionType</code><br>
 
@@ -707,7 +707,7 @@ sal_Bool SAL_CALL osl_shutdownSocket(oslSocket Socket,
     Disables the Nagle algorithm for send coalescing. (Do not
     collect data until a packet is full, instead send immediatly.
     This increases network traffic but might improve latency-times.)
-    1 = disables the algorithm, 0 = keeps it enabled.
+    1 = disables the algorithm, 0 = keeps it enabled. 
     </ul>
     If not above mentioned otherwise, the options are only valid for
     level <code>osl_Socket_LevelSocket</code>.
@@ -723,9 +723,9 @@ sal_Bool SAL_CALL osl_shutdownSocket(oslSocket Socket,
 */
 sal_Int32 SAL_CALL osl_getSocketOption(oslSocket            Socket,
                                oslSocketOptionLevel Level,
-                            oslSocketOption      Option,
-                            void*                pBuffer,
-                            sal_uInt32               BufferLen);
+                            oslSocketOption		 Option,
+                            void*				 pBuffer,
+                            sal_uInt32				 BufferLen);
 
 /** Sets the sockets attributes.
 
@@ -734,13 +734,13 @@ sal_Int32 SAL_CALL osl_getSocketOption(oslSocket            Socket,
     @param Level selects the level for which an option should be changed.
     Valid values are:
     <ul>
-    <li> osl_sol_socket:    Socket Level
-    <li> osl_sol_tcp:       Level of Transmission Control Protocol
+    <li> osl_sol_socket:	Socket Level
+    <li> osl_sol_tcp:		Level of Transmission Control Protocol
     </ul>
-
+    
     @param Option denotes the option to modify. See osl_setSocketOption() for more
     details.
-
+    
     @param pBuffer Pointer to a Buffer which contains the attribute-value.
 
     @param BufferSize contains the length of the Buffer.
@@ -748,10 +748,10 @@ sal_Int32 SAL_CALL osl_getSocketOption(oslSocket            Socket,
     @return True if the option could be changed.
 */
 sal_Bool SAL_CALL osl_setSocketOption(oslSocket Socket,
-                            oslSocketOptionLevel    Level,
-                            oslSocketOption         Option,
-                            void*                   pBuffer,
-                            sal_uInt32                  BufferLen);
+                            oslSocketOptionLevel	Level,
+                            oslSocketOption			Option,
+                            void*					pBuffer,
+                            sal_uInt32					BufferLen);
 
 /** Enables/disables non-blocking-mode of the socket.
     @param Socket Change mode for this socket.
@@ -780,7 +780,7 @@ sal_Bool SAL_CALL osl_isNonBlockingMode(oslSocket Socket);
     <li> osl_Socket_TypeSeqPacket
     <li> osl_invalid_SocketType, if an error occured
     </ul>
-
+    
 */
 oslSocketType SAL_CALL osl_getSocketType(oslSocket Socket);
 
@@ -791,8 +791,8 @@ void SAL_CALL osl_getLastSocketErrorDescription(oslSocket Socket, rtl_uString **
 
 /** returns a constant decribing the last error for the socket system.
     @return <code>osl_Socket_E_NONE</code> if no error occured,
-            <code>osl_invalid_SocketError</code> if an unknown (unmapped)
-            error occured, otherwise an enum describing the error.
+            <code>osl_invalid_SocketError</code> if	an unknown (unmapped)
+            error occured, otherwise an enum describing the	error.
 */
 oslSocketError SAL_CALL osl_getLastSocketError(oslSocket Socket);
 
@@ -858,24 +858,24 @@ sal_Int32 SAL_CALL osl_demultiplexSocketEvents(oslSocketSet IncomingSet,
  */
 void SAL_CALL osl_closeSocket(oslSocket Socket);
 
-
+    
 /** Retrieves n bytes from the stream and copies them into pBuffer.
-    The function avoids incomplete reads due to packet boundaries.
+    The function avoids incomplete reads due to packet boundaries.		
     @param pBuffer receives the read data.
     @param n the number of bytes to read. pBuffer must be large enough
     to hold the n bytes!
-    @return the number of read bytes. The number will only be smaller than
-    n if an exceptional condition (e.g. connection closed) occurs.
+    @return	the number of read bytes. The number will only be smaller than
+    n if an exceptional condition (e.g. connection closed) occurs. 
 */
 sal_Int32 SAL_CALL osl_readSocket( oslSocket Socket, void *pBuffer, sal_Int32 nSize );
 
 
-/** Writes n bytes from pBuffer to the stream. The method avoids
+/** Writes n bytes from pBuffer to the stream. The method avoids 
     incomplete writes due to packet boundaries.
     @param pBuffer contains the data to be written.
     @param n the number of bytes to write.
     @return the number of written bytes. The number will only be smaller than
-    n if an exceptional condition (e.g. connection closed) occurs.
+    n if an exceptional condition (e.g. connection closed) occurs.				
 */
 sal_Int32 SAL_CALL osl_writeSocket( oslSocket Socket, const void *pBuffer, sal_Int32 nSize );
 
@@ -888,6 +888,6 @@ sal_Int32 SAL_CALL osl_writeSocket( oslSocket Socket, const void *pBuffer, sal_I
 }
 #endif
 
-#endif  /* _OSL_SOCKET_H_ */
+#endif	/* _OSL_SOCKET_H_ */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/socket.hxx b/sal/inc/osl/socket.hxx
index 8e6115996bae..403307eb7616 100644
--- a/sal/inc/osl/socket.hxx
+++ b/sal/inc/osl/socket.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ namespace osl
         : m_handle( osl_copySocketAddr( Addr.m_handle ) )
     {
     }
-
+        
     //______________________________________________________________________________
     inline SocketAddr::SocketAddr(oslSocketAddr Addr)
         : m_handle( osl_copySocketAddr( Addr ) )
@@ -54,7 +54,7 @@ namespace osl
         : m_handle( Addr )
     {
     }
-
+    
     //______________________________________________________________________________
     inline SocketAddr::SocketAddr( const ::rtl::OUString& strAddrOrHostName, sal_Int32 nPort)
         : m_handle( osl_createInetSocketAddr( strAddrOrHostName.pData, nPort ) )
@@ -75,7 +75,7 @@ namespace osl
             }
         }
     }
-
+            
     //______________________________________________________________________________
     inline SocketAddr::~SocketAddr()
     {
@@ -92,7 +92,7 @@ namespace osl
             *pResult = result;
         return hostname;
     }
-
+    
     //______________________________________________________________________________
     inline sal_Int32 SAL_CALL SocketAddr::getPort() const
     {
@@ -126,14 +126,14 @@ namespace osl
             *pResult = result;
         return sequence;
     }
-
+    
     //______________________________________________________________________________
     inline SocketAddr & SAL_CALL SocketAddr::operator= (oslSocketAddr Addr)
     {
         oslSocketAddr pNewAddr = osl_copySocketAddr( Addr );
         if( m_handle )
             osl_destroySocketAddr( m_handle );
-        m_handle = pNewAddr;
+        m_handle = pNewAddr; 
         return *this;
     }
 
@@ -178,7 +178,7 @@ namespace osl
             *pResult = result;
         return hostname;
     }
-
+        
     // (static method)______________________________________________________________
     inline void SAL_CALL SocketAddr::resolveHostname(
         const ::rtl::OUString & strHostName, SocketAddr &Addr)
@@ -195,12 +195,12 @@ namespace osl
     }
 
     //______________________________________________________________________________
-    inline Socket::Socket(oslSocketType Type,
-                          oslAddrFamily Family,
+    inline Socket::Socket(oslSocketType Type, 
+                          oslAddrFamily Family, 
                           oslProtocol   Protocol)
         : m_handle( osl_createSocket(Family, Type, Protocol) )
     {}
-
+    
     //______________________________________________________________________________
     inline Socket::Socket( oslSocket socketHandle, __sal_NoAcquire )
         : m_handle( socketHandle )
@@ -212,7 +212,7 @@ namespace osl
     {
         osl_acquireSocket( m_handle );
     }
-
+    
     //______________________________________________________________________________
     inline Socket::Socket( const Socket & socket )
         : m_handle( socket.getHandle() )
@@ -225,7 +225,7 @@ namespace osl
     {
         osl_releaseSocket( m_handle );
     }
-
+        
     //______________________________________________________________________________
     inline Socket& Socket::operator= ( oslSocket socketHandle)
     {
@@ -234,7 +234,7 @@ namespace osl
         m_handle = socketHandle;
         return *this;
     }
-
+        
     //______________________________________________________________________________
     inline Socket&  Socket::operator= (const Socket& sock)
     {
@@ -248,7 +248,7 @@ namespace osl
     }
 
     //______________________________________________________________________________
-    inline sal_Bool Socket::operator==( const oslSocket socketHandle ) const
+    inline sal_Bool Socket::operator==( const oslSocket socketHandle ) const 
     {
         return m_handle == socketHandle;
     }
@@ -286,7 +286,7 @@ namespace osl
         getLocalAddr( addr );
         return addr.getHostname();
     }
-
+    
     //______________________________________________________________________________
     inline void Socket::getPeerAddr( SocketAddr &addr ) const
     {
@@ -316,23 +316,23 @@ namespace osl
     }
 
     //______________________________________________________________________________
-    inline sal_Bool Socket::isRecvReady(const TimeValue *pTimeout ) const
+    inline sal_Bool	Socket::isRecvReady(const TimeValue *pTimeout ) const
     {
         return osl_isReceiveReady( m_handle , pTimeout );
     }
 
     //______________________________________________________________________________
-    inline sal_Bool Socket::isSendReady(const TimeValue *pTimeout ) const
+    inline sal_Bool	Socket::isSendReady(const TimeValue *pTimeout ) const
     {
         return osl_isSendReady( m_handle, pTimeout );
     }
 
     //______________________________________________________________________________
-    inline sal_Bool Socket::isExceptionPending(const TimeValue *pTimeout ) const
+    inline sal_Bool	Socket::isExceptionPending(const TimeValue *pTimeout ) const
     {
         return osl_isExceptionPending( m_handle, pTimeout );
     }
-
+    
     //______________________________________________________________________________
     inline oslSocketType Socket::getType() const
     {
@@ -348,9 +348,9 @@ namespace osl
     {
         return osl_getSocketOption( m_handle, Level, Option, pBuffer , BufferLen );
     }
-
+        
     //______________________________________________________________________________
-    inline sal_Bool Socket::setOption(  oslSocketOption Option,
+    inline sal_Bool Socket::setOption(	oslSocketOption Option, 
                                         void* pBuffer,
                                         sal_uInt32 BufferLen,
                                         oslSocketOptionLevel Level ) const
@@ -385,7 +385,7 @@ namespace osl
     }
 
     //______________________________________________________________________________
-    inline void SAL_CALL Socket::clearError() const
+    inline void	SAL_CALL Socket::clearError() const
     {
         sal_Int32 err = 0;
         getOption(osl_Socket_OptionError, &err, sizeof(err));
@@ -414,10 +414,10 @@ namespace osl
     //______________________________________________________________________________
     inline StreamSocket::StreamSocket(oslAddrFamily Family,
                                       oslProtocol Protocol,
-                                      oslSocketType Type )
+                                      oslSocketType	Type )
         : Socket( Type, Family, Protocol )
     {}
-
+    
     //______________________________________________________________________________
     inline StreamSocket::StreamSocket( oslSocket socketHandle, __sal_NoAcquire noacquire )
         : Socket( socketHandle, noacquire )
@@ -427,7 +427,7 @@ namespace osl
     inline StreamSocket::StreamSocket( oslSocket socketHandle )
         : Socket( socketHandle )
     {}
-
+    
     //______________________________________________________________________________
     inline StreamSocket::StreamSocket( const StreamSocket & socket )
         : Socket( socket )
@@ -447,25 +447,25 @@ namespace osl
 
 
     //______________________________________________________________________________
-    inline sal_Int32 StreamSocket::recv(void* pBuffer,
-                                        sal_uInt32 BytesToRead,
+    inline sal_Int32 StreamSocket::recv(void* pBuffer, 
+                                        sal_uInt32 BytesToRead, 
                                         oslSocketMsgFlag Flag)
     {
         return osl_receiveSocket( m_handle, pBuffer,BytesToRead, Flag );
     }
-
+        
     //______________________________________________________________________________
-    inline sal_Int32 StreamSocket::send(const void* pBuffer,
-                                        sal_uInt32 BytesToSend,
+    inline sal_Int32 StreamSocket::send(const void* pBuffer, 
+                                        sal_uInt32 BytesToSend, 
                                         oslSocketMsgFlag Flag)
     {
         return osl_sendSocket( m_handle, pBuffer, BytesToSend, Flag );
     }
 
     //______________________________________________________________________________
-      inline ConnectorSocket::ConnectorSocket(oslAddrFamily Family,
-                                            oslProtocol Protocol,
-                                            oslSocketType   Type)
+      inline ConnectorSocket::ConnectorSocket(oslAddrFamily Family, 
+                                            oslProtocol	Protocol,
+                                            oslSocketType	Type)
         : StreamSocket( Family, Protocol ,Type )
     {}
 
@@ -475,14 +475,14 @@ namespace osl
     {
         return osl_connectSocketTo( m_handle , TargetHost.getHandle(), pTimeout );
     }
-
+    
     //______________________________________________________________________________
-    inline AcceptorSocket::AcceptorSocket(oslAddrFamily Family ,
-                                          oslProtocol   Protocol ,
-                                          oslSocketType Type )
+    inline AcceptorSocket::AcceptorSocket(oslAddrFamily Family , 
+                                          oslProtocol	Protocol ,
+                                          oslSocketType	Type )
         : Socket( Type, Family, Protocol )
     {}
-
+    
     //______________________________________________________________________________
     inline sal_Bool AcceptorSocket::listen(sal_Int32 MaxPendingConnections)
     {
@@ -505,10 +505,10 @@ namespace osl
         }
         return status;
     }
-
+    
     //______________________________________________________________________________
     inline oslSocketResult AcceptorSocket::acceptConnection(
-        StreamSocket&   Connection, SocketAddr & PeerAddr)
+        StreamSocket&	Connection, SocketAddr & PeerAddr)
     {
         // TODO change in/OUT parameter
         oslSocket o = osl_acceptConnectionOnSocket( m_handle, (oslSocketAddr *)&PeerAddr );
@@ -526,16 +526,16 @@ namespace osl
     }
 
     //______________________________________________________________________________
-    inline DatagramSocket::DatagramSocket(oslAddrFamily Family,
-                                          oslProtocol   Protocol,
-                                          oslSocketType Type)
+    inline DatagramSocket::DatagramSocket(oslAddrFamily Family, 
+                                          oslProtocol	Protocol,
+                                          oslSocketType	Type)
         : Socket( Type, Family, Protocol )
     {}
-
+        
     //______________________________________________________________________________
-    inline sal_Int32 DatagramSocket::recvFrom(void*  pBuffer,
-                                              sal_uInt32 BufferSize,
-                                              SocketAddr* pSenderAddr,
+    inline sal_Int32 DatagramSocket::recvFrom(void*  pBuffer, 
+                                              sal_uInt32 BufferSize, 
+                                              SocketAddr* pSenderAddr, 
                                               oslSocketMsgFlag Flag )
     {
         sal_Int32 nByteRead;
@@ -544,8 +544,8 @@ namespace osl
             // TODO : correct the out-parameter pSenderAddr outparameter
               nByteRead = osl_receiveFromSocket( m_handle, pSenderAddr->getHandle() , pBuffer,
                                                  BufferSize, Flag);
-//              nByteRead = osl_receiveFromSocket( m_handle, *(oslSocketAddr**) &pSenderAddr , pBuffer,
-//                                                 BufferSize, Flag);
+//  			nByteRead = osl_receiveFromSocket( m_handle, *(oslSocketAddr**) &pSenderAddr , pBuffer,
+//  											   BufferSize, Flag);
         }
         else
         {
@@ -555,9 +555,9 @@ namespace osl
     }
 
     //______________________________________________________________________________
-    inline sal_Int32  DatagramSocket::sendTo( const SocketAddr& ReceiverAddr,
+    inline sal_Int32  DatagramSocket::sendTo( const SocketAddr& ReceiverAddr, 
                                               const void* pBuffer,
-                                              sal_uInt32 BufferSize,
+                                              sal_uInt32 BufferSize, 
                                               oslSocketMsgFlag Flag )
     {
         return osl_sendToSocket( m_handle, ReceiverAddr.getHandle(), pBuffer, BufferSize, Flag );
diff --git a/sal/inc/osl/socket_decl.hxx b/sal/inc/osl/socket_decl.hxx
index 7660075e3e8a..051384c0ae6a 100644
--- a/sal/inc/osl/socket_decl.hxx
+++ b/sal/inc/osl/socket_decl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,10 +38,10 @@
 namespace osl
 {
     enum __osl_socket_NoCopy { SAL_NO_COPY };
-
+    
     /** The class should be understood as a reference to a socket address handle ( struct sockaddr ).
 
-        The handle is mutable.
+        The handle is mutable. 
      */
     class SocketAddr
     {
@@ -51,7 +51,7 @@ namespace osl
 
         /** Creates socket address of unknown type.
          */
-        inline SocketAddr();
+        inline SocketAddr();		
 
         /** Copy constructor.
          */
@@ -108,7 +108,7 @@ namespace osl
            @return true if successfule.
          */
         inline sal_Bool SAL_CALL setPort( sal_Int32 nPort );
-
+        
         /** Sets the address of the underlying socket address struct in network byte order.
             @return true on success, false signales falure.
          */
@@ -122,15 +122,15 @@ namespace osl
         */
         inline SocketAddr & SAL_CALL operator= (oslSocketAddr Addr);
 
-        /**
+        /** 
          */
         inline SocketAddr & SAL_CALL operator= (const SocketAddr& Addr);
 
-        /** Assigns the socket addr without copyconstructing it.
+        /** Assigns the socket addr without copyconstructing it. 
             @param nocopy use SAL_NO_COPY
           */
         inline SocketAddr & SAL_CALL assign( oslSocketAddr Addr, __osl_socket_NoCopy nocopy );
-
+        
         /** Returns true if the underlying handle is identical to the Addr handle.
          */
         inline sal_Bool SAL_CALL operator== (oslSocketAddr Addr) const;
@@ -145,11 +145,11 @@ namespace osl
 
         /** Get the hostname for the local interface.
             @param after the call *pResult contains osl_Socket_Ok on success or
-                   an error on failure.
-            @return the hostname
+                   an error on failure. 
+            @return the hostname 
         */
         static inline ::rtl::OUString SAL_CALL getLocalHostname( oslSocketResult *pResult = 0);
-
+        
         /** Tries to find an address for a host.
             @see osl_resolveHostname()
             @return A new created socket-address or 0 if the name could not be found.
@@ -167,7 +167,7 @@ namespace osl
             const ::rtl::OUString& strServiceName,
             const ::rtl::OUString & strProtocolName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tcp")) );
     };
-
+    
 
     class Socket
     {
@@ -179,8 +179,8 @@ namespace osl
             @param Family
             @param Protocol
         */
-        inline Socket(oslSocketType Type,
-                      oslAddrFamily Family = osl_Socket_FamilyInet,
+        inline Socket(oslSocketType Type, 
+                      oslAddrFamily Family = osl_Socket_FamilyInet, 
                       oslProtocol   Protocol = osl_Socket_ProtocolIp);
     public:
         inline Socket( );
@@ -194,35 +194,35 @@ namespace osl
             @param noacquire use SAL_NO_ACQUIRE
          */
         inline Socket( oslSocket socketHandle, __sal_NoAcquire noacquire );
-
+        
         /** Destructor. Releases the underlying handle
          */
         inline ~Socket();
-
+        
         /** Assignment operator. If socket was already created, the old one will
             be discarded.
         */
         inline Socket& SAL_CALL operator= ( oslSocket socketHandle);
-
+        
         /** Assignment operator. If socket was already created, the old one will
             be discarded.
         */
         inline Socket& SAL_CALL operator= (const Socket& sock);
 
-        /**
+        /** 
            @return <code>sal_True</code>, when the underlying handle of both
                          Socket instances are identical, <code>sal_False</code> otherwise.
          */
         inline sal_Bool SAL_CALL operator==( const Socket& rSocket ) const ;
 
-        /**
+        /** 
            @return <code>sal_True</code>, when the underlying handle of both
                          Socket instances are identical, <code>sal_False</code> otherwise.
          */
         inline sal_Bool SAL_CALL operator==( const oslSocket socketHandle ) const;
 
         /** Closes a definite or both directions of the bidirectional stream.
-
+            
            @param Direction
            @see osl_shutdownSocket()
          */
@@ -244,13 +244,13 @@ namespace osl
         /** Get the local port of the socket. Usually used after bind().
             @return the port number or OSL_INVALID_PORT on errors.
         */
-        inline sal_Int32    SAL_CALL getLocalPort() const;
+        inline sal_Int32	SAL_CALL getLocalPort() const;
 
         /** Get the hostname for the local interface.
             @return the hostname or an empty string ("").
         */
         inline ::rtl::OUString SAL_CALL getLocalHost() const;
-
+    
         /** Retrieves the address of the remote host of this socket.
             @param Addr [out] receives the address.
         */
@@ -259,7 +259,7 @@ namespace osl
         /** Get the remote port of the socket.
             @return the port number or OSL_INVALID_PORT on errors.
         */
-        inline sal_Int32    SAL_CALL getPeerPort() const;
+        inline sal_Int32	SAL_CALL getPeerPort() const;
 
         /** Get the hostname for the remote interface.
             @return the hostname or an empty string ("").
@@ -271,47 +271,47 @@ namespace osl
             @return True if bind was successful.
         */
         inline sal_Bool SAL_CALL bind(const SocketAddr& LocalInterface);
-
+        
         /** Checks if read operations will block.
-
+            
             You can specify a timeout-value in seconds/nanoseconds that denotes
             how the operation will block if the Socket is not ready.
             @return <code>sal_True</code> if read operations (recv, recvFrom, accept) on the Socket
             will NOT block; <code>sal_False</code> if it would block or if an error occured.
-
+            
             @param pTimeout if 0, the operation will block without a timeout. Otherwise
             the specified amout of time.
         */
-        inline sal_Bool SAL_CALL isRecvReady(const TimeValue *pTimeout = 0) const;
+        inline sal_Bool	SAL_CALL isRecvReady(const TimeValue *pTimeout = 0) const;
 
         /** Checks if send operations will block.
-
+            
             You can specify a timeout-value in seconds/nanoseconds that denotes
             how the operation will block if the Socket is not ready.
             @return <code>sal_True</code> if send operations (send, sendTo) on the Socket
             will NOT block; <code>sal_False</code> if it would block or if an error occured.
-
+            
             @param pTimeout if 0, the operation will block without a timeout. Otherwise
             the specified amout of time.
         */
-        inline sal_Bool SAL_CALL isSendReady(const TimeValue *pTimeout = 0) const;
-
+        inline sal_Bool	SAL_CALL isSendReady(const TimeValue *pTimeout = 0) const;
 
+        
         /** Checks if a request for out-of-band data will block.
-
+            
             You can specify a timeout-value in seconds/nanoseconds that denotes
             how the operation will block if the Socket has no pending OOB data.
-
-            @return <code>sal_True</code> if OOB-request operations (recv with appropriate flags)
+            
+            @return <code>sal_True</code> if OOB-request operations (recv with appropriate flags) 
             on the Socket will NOT block; <code>sal_False</code> if it would block or if
             an error occured.
-
+            
             @param pTimeout if 0, the operation will block without a timeout. Otherwise
             the specified amout of time.
         */
-        inline sal_Bool SAL_CALL isExceptionPending(const TimeValue *pTimeout = 0) const;
-
-
+        inline sal_Bool	SAL_CALL isExceptionPending(const TimeValue *pTimeout = 0) const;
+    
+        
         /** Queries the socket for its type.
             @return one of:
             <ul>
@@ -323,63 +323,63 @@ namespace osl
             <li> <code>osl_invalid_SocketType</code>, if an error occured
             </ul>
         */
-        inline oslSocketType    SAL_CALL getType() const;
-
+        inline oslSocketType	SAL_CALL getType() const;
+        
         /** Retrieves option-attributes associated with the socket.
             @param Option The attribute to query.
             Valid values (depending on the Level) are:
             <ul>
             <li> <code>osl_Socket_Option_Debug</code><br>
                  (sal_Bool) Socket debug flag 1 = enabled, 0 = disabled.
-
+            
             <li> <code>osl_Socket_OptionAcceptConn</code><br>
             <li> <code>osl_Socket_OptionReuseAddr</code><br>
               (sal_Bool) Allows the socket to be bound to an address that is
               already in use.
               1 = multiple bound allowed, 0 = no multiple bounds allowed
-
+              
             <li><code>osl_Socket_OptionKeepAlive</code><br>
                (sal_Bool) Keepalive packets are sent by the underlying socket.
                1 = enabled, 0 = disabled
-
+              
             <li><code>osl_Socket_OptionDontRoute</code><br>
                (sal_Bool) Do not route: send directly to interface.
                   1 = do not route , 0 = routing possible
-
+               
             <li><code>osl_Socket_OptionBroadcast</code><br>
-               (sal_Bool) Transmission of broadcast messages are allowed on the socket.
+               (sal_Bool) Transmission of broadcast messages are allowed on the socket. 
                1 = transmission allowed, 0 = transmission disallowed
-
+               
             <li><code>osl_Socket_OptionUseLoopback</code><br>
 
             <li><code>osl_Socket_OptionLinger</code><br>
                (linger) Linger on close if unsent data is present.
                linger has two members: l_onoff, l_linger
                l_onoff = 0 is off, l_onoff > 0 and l_linger= timeout in seconds.
-
+              
             <li><code>osl_Socket_OptionOOBinLine</code><br>
-
+              
 
             <li><code>osl_Socket_OptionSndBuf</code><br>
               (sal_Int32) Size of the send buffer in bytes. Data is sent after
               SndTimeo or when the buffer is full. This allows faster writing
               to the socket.
-
+            
             <li><code>osl_Socket_OptionRcvBuf</code><br>
               (sal_Int32) Size of the receive buffer in bytes. Data is sent after
               SndTimeo or when the buffer is full. This allows faster writing
               to the socket and larger packet sizes.
-
+            
             <li><code>osl_Socket_OptionSndLowat</code><br>
-
+            
             <li><code>osl_Socket_OptionRcvLowat</code><br>
-
+            
             <li><code>osl_Socket_OptionSndTimeo</code><br>
               (sal_Int32) Data is sent after this timeout. This allows gathering
               of data to send larger packages but increases latency times.
-
+            
             <li><code>osl_Socket_OptionRcvTimeo</code><br>
-
+            
             <li><code>osl_Socket_OptionError</code><br>
             <li><code>osl_Socket_OptionType</code><br>
 
@@ -387,15 +387,15 @@ namespace osl
               Disables the Nagle algorithm for send coalescing. (Do not
               collect data until a packet is full, instead send immediatly.
               This increases network traffic but might improve latency-times.)
-              1 = disables the algorithm, 0 = keeps it enabled.
+              1 = disables the algorithm, 0 = keeps it enabled. 
             </ul>
-
+            
               If not above mentioned otherwise, the options are only valid for
               level <code>osl_Socket_LevelSocket</code>.
             @param pBuffer The Buffer will be filled with the attribute.
-
+            
             @param BufferSize The size of pBuffer.
-
+            
             @param Level The option level.
 
             Valid values are:
@@ -413,37 +413,37 @@ namespace osl
             oslSocketOptionLevel Level= osl_Socket_LevelSocket) const;
 
         /** Sets the sockets attributes.
-
+            
             @param Option denotes the option to modify.
             Valid values (depending on the Level) are:
             <ul>
-            <li> osl_Socket_Option_Debug
-            <li> osl_Socket_OptionAcceptConn
-            <li> osl_Socket_OptionReuseAddr
-            <li> osl_Socket_OptionKeepAlive
-            <li> osl_Socket_OptionDontRoute
-            <li> osl_Socket_OptionBroadcast
+            <li> osl_Socket_Option_Debug      
+            <li> osl_Socket_OptionAcceptConn 
+            <li> osl_Socket_OptionReuseAddr  
+            <li> osl_Socket_OptionKeepAlive  
+            <li> osl_Socket_OptionDontRoute  
+            <li> osl_Socket_OptionBroadcast  
             <li> osl_Socket_OptionUseLoopback
-            <li> osl_Socket_OptionLinger
-            <li> osl_Socket_OptionOOBinLine
-            <li> osl_Socket_OptionSndBuf
-            <li> osl_Socket_OptionRcvBuf
-            <li> osl_Socket_OptionSndLowat
-            <li> osl_Socket_OptionRcvLowat
-            <li> osl_Socket_OptionSndTimeo
-            <li> osl_Socket_OptionRcvTimeo
-            <li> osl_Socket_OptionError
-            <li> osl_Socket_OptionType
+            <li> osl_Socket_OptionLinger     
+            <li> osl_Socket_OptionOOBinLine  
+            <li> osl_Socket_OptionSndBuf    
+            <li> osl_Socket_OptionRcvBuf     
+            <li> osl_Socket_OptionSndLowat   
+            <li> osl_Socket_OptionRcvLowat   
+            <li> osl_Socket_OptionSndTimeo   
+            <li> osl_Socket_OptionRcvTimeo   
+            <li> osl_Socket_OptionError      
+            <li> osl_Socket_OptionType       
             <li> osl_Socket_OptionTcpNoDelay
             </ul>
-
+            
             If not above mentioned otherwise, the options are only valid for
             level osl_Socket_LevelSocket.
-
-            @param pBuffer Pointer to a Buffer which contains the attribute-value.
-
+            
+            @param pBuffer Pointer to a Buffer which contains the attribute-value. 
+            
             @param BufferSize contains the length of the Buffer.
-
+            
             @param Level selects the level for which an option should be changed.
             Valid values are:
             <ul>
@@ -453,18 +453,18 @@ namespace osl
 
             @return True if the option could be changed.
         */
-        inline sal_Bool SAL_CALL setOption( oslSocketOption Option,
+        inline sal_Bool SAL_CALL setOption( oslSocketOption Option, 
                                             void* pBuffer,
                                             sal_uInt32 BufferLen,
                                             oslSocketOptionLevel Level= osl_Socket_LevelSocket ) const;
 
         /** Convenience function for setting sal_Bool and sal_Int32 option values.
-            @see setOption()
+            @see setOption() 
          */
         inline sal_Bool setOption( oslSocketOption option, sal_Int32 nValue  );
 
         /** Convenience function for retrieving sal_Bool and sal_Int32 option values.
-            @see setOption()
+            @see setOption() 
          */
         inline sal_Int32 getOption( oslSocketOption option ) const;
 
@@ -475,7 +475,7 @@ namespace osl
             @return <code>sal_True</code> if mode could be set.
         */
         inline sal_Bool SAL_CALL enableNonBlockingMode( sal_Bool bNonBlockingMode);
-
+        
         /** Query blocking mode of the socket.
             @return <code>sal_True</code> if non-blocking mode is set.
         */
@@ -484,10 +484,10 @@ namespace osl
 
         /** clears the error status
         */
-        inline void SAL_CALL clearError() const;
+        inline void	SAL_CALL clearError() const;
 
         /** returns a constant decribing the last error for the socket system.
-
+            
             @return osl_Socket_E_NONE if no error occured, invalid_SocketError if
             an unknown (unmapped) error occured, otherwise an enum describing the
             error.
@@ -505,18 +505,18 @@ namespace osl
     };
 
 
-    class StreamSocket : public Socket
+    class StreamSocket : public Socket 
     {
     public:
-        /** Creates a socket.
+        /** Creates a socket. 
             @param Type For some protocols it might be desirable to
             use a different type than <code>osl_Socket_TypeStream</code>
             (like <code>osl_Socket_TypeSeqPacket</code>).
             Therefore this parameter is not hidden.
         */
-          inline StreamSocket(oslAddrFamily Family = osl_Socket_FamilyInet,
-                            oslProtocol Protocol = osl_Socket_ProtocolIp,
-                            oslSocketType   Type = osl_Socket_TypeStream);
+          inline StreamSocket(oslAddrFamily Family = osl_Socket_FamilyInet, 
+                            oslProtocol	Protocol = osl_Socket_ProtocolIp,
+                            oslSocketType	Type = osl_Socket_TypeStream);
 
         inline StreamSocket( const StreamSocket & );
 
@@ -529,27 +529,27 @@ namespace osl
             blocking.
             @param pBuffer receives the read data. pBuffer must be large enough
             to hold n bytes.
-            @param n the number of bytes to read.
-            @return the number of read bytes. The number will only be smaller than
+            @param n the number of bytes to read. 
+            @return	the number of read bytes. The number will only be smaller than
             n if an exceptional condition (e.g. connection closed) occurs.
         */
         inline sal_Int32 SAL_CALL read(void* pBuffer, sal_uInt32 n);
 
-        /** Writes n bytes from pBuffer to the stream. The method avoids
+        /** Writes n bytes from pBuffer to the stream. The method avoids 
             incomplete writes due to packet boundaries and is thus blocking.
             @param pBuffer contains the data to be written.
             @param n the number of bytes to write.
             @return the number of written bytes. The number will only be smaller than
-            n if an exceptional condition (e.g. connection closed) occurs.
+            n if an exceptional condition (e.g. connection closed) occurs.				
         */
         inline sal_Int32 SAL_CALL write(const void* pBuffer, sal_uInt32 n);
 
 
         /** Tries to receive BytesToRead data from the connected socket,
-
-            @param pBuffer [out] Points to a buffer that will be filled with the received
+            
+            @param pBuffer [out] Points to a buffer that will be filled with the received 
             data. pBuffer must have at least have a size of BytesToRead.
-            @param BytesToRead [in] The number of bytes to read.
+            @param BytesToRead [in] The number of bytes to read. 
             @param Flag [in] Modifier for the call. Valid values are:
 
             <ul>
@@ -561,12 +561,12 @@ namespace osl
             </ul>
             @return the number of received bytes, which may be less than BytesToRead.
         */
-        inline sal_Int32 SAL_CALL recv(void* pBuffer,
-                                       sal_uInt32 BytesToRead,
+        inline sal_Int32 SAL_CALL recv(void* pBuffer, 
+                                       sal_uInt32 BytesToRead, 
                                        oslSocketMsgFlag flags= osl_Socket_MsgNormal);
 
         /** Tries to send BytesToSend data to the connected socket.
-
+            
             @param pBuffer [in] Points to a buffer that contains the send-data.
             @param BytesToSend [in] The number of bytes to send. pBuffer must have at least
             this size.
@@ -581,12 +581,12 @@ namespace osl
 
             @return the number of transfered bytes. It may be less than BytesToSend.
         */
-        sal_Int32 SAL_CALL send(const void* pBuffer,
-                                sal_uInt32 BytesToSend,
+        sal_Int32 SAL_CALL send(const void* pBuffer, 
+                                sal_uInt32 BytesToSend, 
                                 oslSocketMsgFlag= osl_Socket_MsgNormal);
     };
 
-    class ConnectorSocket : public StreamSocket
+    class ConnectorSocket : public StreamSocket 
     {
     public:
         /** Creates a socket that can connect to a (remote) host.
@@ -595,11 +595,11 @@ namespace osl
             (like <code>osl_Socket_TypeSeqPacket</code>).
             Therefore we do not hide this parameter here.
         */
-          ConnectorSocket(oslAddrFamily Family = osl_Socket_FamilyInet,
-                        oslProtocol Protocol = osl_Socket_ProtocolIp,
-                        oslSocketType   Type = osl_Socket_TypeStream);
-
+          ConnectorSocket(oslAddrFamily Family = osl_Socket_FamilyInet, 
+                        oslProtocol	Protocol = osl_Socket_ProtocolIp,
+                        oslSocketType	Type = osl_Socket_TypeStream);
 
+        
         /** Connects the socket to a (remote) host.
             @param TargetHost The address of the target.
             @param pTimeOut The timeout for blocking. If 0, a default system dependent timeout
@@ -617,10 +617,10 @@ namespace osl
     class AcceptorSocket : public Socket
     {
     public:
-        inline AcceptorSocket(oslAddrFamily Family = osl_Socket_FamilyInet,
-                              oslProtocol   Protocol = osl_Socket_ProtocolIp,
-                              oslSocketType Type = osl_Socket_TypeStream);
-
+        inline AcceptorSocket(oslAddrFamily Family = osl_Socket_FamilyInet, 
+                              oslProtocol	Protocol = osl_Socket_ProtocolIp,
+                              oslSocketType	Type = osl_Socket_TypeStream);
+        
         /** Prepare a socket for the accept-call. The socket must have been
             bound before to the local address.
             @param MaxPendingConnections The maximum number of pending
@@ -641,37 +641,37 @@ namespace osl
 
         /** Accepts incoming connections on the socket. You must
             precede this call with osl::Socket::bind() and listen().
-            @param PeerAddr receives the address of the connecting entity
-            (your communication partner).
+            @param PeerAddr receives the address of the connecting entity 
+            (your communication	partner).
             @param Connection receives the incoming connection.
             @return <code>osl_Socket_Ok</code>, if a connection has been accepted,
             <code>osl_Socket_TimedOut</code>, if m_RecvTimeout milliseconds passed without connect,
             <code>osl_Socket_Error</code> on errors.
         */
-        inline oslSocketResult SAL_CALL acceptConnection( StreamSocket& Connection, SocketAddr & PeerAddr);
+        inline oslSocketResult SAL_CALL acceptConnection( StreamSocket&	Connection, SocketAddr & PeerAddr);
     };
 
 
 
     /** A connectionless socket to send and receive datagrams.
      */
-    class DatagramSocket : public Socket
+    class DatagramSocket : public Socket 
     {
     public:
-
+        
         /** Creates a datagram socket.
             @param Type is sock_dgram by default.
         */
-        inline DatagramSocket(oslAddrFamily Family= osl_Socket_FamilyInet,
-                              oslProtocol   Protocol= osl_Socket_ProtocolIp,
-                              oslSocketType Type= osl_Socket_TypeDgram);
-
-        /** Tries to receives BufferSize data from the socket, if no error occurs.
-
+        inline DatagramSocket(oslAddrFamily Family= osl_Socket_FamilyInet, 
+                              oslProtocol	Protocol= osl_Socket_ProtocolIp,
+                              oslSocketType	Type= osl_Socket_TypeDgram);
+        
+        /** Tries to receives BufferSize data from the socket, if no error occurs. 
+            
             @param pSenderAddr [out] You must provide pointer to a SocketAddr.
-            It will be  filled with the address of the datagrams sender.
+            It will be	filled with the address of the datagrams sender. 
             If pSenderAddr is 0, it is ignored.
-            @param pBuffer [out] Points to a buffer that will be filled with the received
+            @param pBuffer [out] Points to a buffer that will be filled with the received 
             datagram.
             @param BufferSize [in] The size of pBuffer.
             @param Flag [in] Modifier for the call. Valid values are:
@@ -682,21 +682,21 @@ namespace osl
             <li><code>osl_Socket_MsgDontRoute</code>
             <li><code>osl_Socket_MsgMaxIOVLen</code>
             </ul>
-
+            
             @return the number of received bytes.
         */
-        inline sal_Int32 SAL_CALL recvFrom(void*  pBuffer,
-                                           sal_uInt32 BufferSize,
-                                           SocketAddr* pSenderAddr= 0,
+        inline sal_Int32 SAL_CALL recvFrom(void*  pBuffer, 
+                                           sal_uInt32 BufferSize, 
+                                           SocketAddr* pSenderAddr= 0, 
                                            oslSocketMsgFlag Flag= osl_Socket_MsgNormal);
-
+        
         /** Tries to send one datagram with BytesToSend size to the given ReceiverAddr.
             Since there is only send one packet, the function doesn't care about
             packet boundaries.
-
+            
             @param ReceiverAddr [in] A SocketAddr that contains
-            the destination address for this send.
-
+            the destination address for this send. 
+            
             @param pBuffer [in] Points to a buffer that contains the send-data.
             @param BufferSize [in] The number of bytes to send. pBuffer must have at least
             this size.
@@ -709,12 +709,12 @@ namespace osl
             <li><code>osl_Socket_MsgDontRoute</code>
             <li><code>osl_Socket_MsgMaxIOVLen</code>
             </ul>
-
+            
             @return the number of transfered bytes.
         */
-        inline sal_Int32    SAL_CALL sendTo( const SocketAddr& ReceiverAddr,
+        inline sal_Int32	SAL_CALL sendTo( const SocketAddr& ReceiverAddr, 
                                              const void* pBuffer,
-                                             sal_uInt32 BufferSize,
+                                             sal_uInt32 BufferSize, 
                                              oslSocketMsgFlag Flag= osl_Socket_MsgNormal);
     };
 
diff --git a/sal/inc/osl/thread.h b/sal/inc/osl/thread.h
index 1b160f09eef9..e234c822985c 100644
--- a/sal/inc/osl/thread.h
+++ b/sal/inc/osl/thread.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 #include <osl/time.h>
 
 #ifndef _RTL_TEXTENC_H_
-#   include <rtl/textenc.h>
+#	include <rtl/textenc.h>
 #endif
 
 #ifdef __cplusplus
@@ -61,7 +61,7 @@ typedef enum
     osl_Thread_PriorityNormal,
     osl_Thread_PriorityBelowNormal,
     osl_Thread_PriorityLowest,
-    osl_Thread_PriorityUnknown,         /* don't use to set */
+    osl_Thread_PriorityUnknown,			/* don't use to set */
     osl_Thread_Priority_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslThreadPriority;
 
@@ -179,7 +179,7 @@ sal_Bool SAL_CALL osl_setThreadKeyData(oslThreadKey Key, void *pData);
 /** Get the current thread local text encoding. */
 rtl_TextEncoding SAL_CALL osl_getThreadTextEncoding(void);
 
-/** Set the thread local text encoding.
+/** Set the thread local text encoding. 
     @return the old text encoding.
 */
 rtl_TextEncoding SAL_CALL osl_setThreadTextEncoding(rtl_TextEncoding Encoding);
@@ -188,6 +188,6 @@ rtl_TextEncoding SAL_CALL osl_setThreadTextEncoding(rtl_TextEncoding Encoding);
 }
 #endif
 
-#endif  /* _OSL_THREAD_H_ */
+#endif	/* _OSL_THREAD_H_ */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/thread.hxx b/sal/inc/osl/thread.hxx
index 923c68ecd41d..106351a86fa1 100644
--- a/sal/inc/osl/thread.hxx
+++ b/sal/inc/osl/thread.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,8 +41,8 @@
 namespace osl
 {
 /** threadFunc is the function which is executed by the threads
-    created by the osl::Thread class. The function's signature
-    matches the one of oslWorkerFunction which is declared in
+    created by the osl::Thread class. The function's signature 
+    matches the one of oslWorkerFunction which is declared in 
     osl/thread.h .
 */
 extern "C" inline void SAL_CALL threadFunc( void* param);
@@ -69,48 +69,48 @@ public:
         osl_destroyThread( m_hThread);
     }
 
-    sal_Bool SAL_CALL create()
+    sal_Bool SAL_CALL create() 
     {
-        OSL_ASSERT(m_hThread == 0); // only one running thread per instance
+        OSL_ASSERT(m_hThread == 0);	// only one running thread per instance
            if (m_hThread)
             return sal_False;
 
         m_hThread = osl_createSuspendedThread( threadFunc, (void*)this);
         if ( m_hThread )
-            osl_resumeThread(m_hThread);
+            osl_resumeThread(m_hThread);							             
 
         return m_hThread != 0;
     }
 
-    sal_Bool SAL_CALL createSuspended()
+    sal_Bool SAL_CALL createSuspended() 
     {
-        OSL_ASSERT(m_hThread == 0); // only one running thread per instance
+        OSL_ASSERT(m_hThread == 0);	// only one running thread per instance
         if( m_hThread)
             return sal_False;
-        m_hThread= osl_createSuspendedThread( threadFunc,
+        m_hThread= osl_createSuspendedThread( threadFunc, 
                                              (void*)this);
         return m_hThread != 0;
     }
 
-    virtual void SAL_CALL suspend()
+    virtual void SAL_CALL suspend() 
     {
         if( m_hThread )
             osl_suspendThread(m_hThread);
     }
 
-    virtual void SAL_CALL resume()
+    virtual void SAL_CALL resume() 
     {
         if( m_hThread )
             osl_resumeThread(m_hThread);
     }
 
-    virtual void SAL_CALL terminate()
+    virtual void SAL_CALL terminate() 
     {
         if( m_hThread )
             osl_terminateThread(m_hThread);
     }
 
-    virtual void SAL_CALL join()
+    virtual void SAL_CALL join() 
     {
         osl_joinWithThread(m_hThread);
     }
@@ -141,22 +141,22 @@ public:
         return osl_getThreadIdentifier(0);
     }
 
-    static void SAL_CALL wait(const TimeValue& Delay)
+    static void SAL_CALL wait(const TimeValue& Delay) 
     {
         osl_waitThread(&Delay);
     }
 
-    static void SAL_CALL yield()
-    {
+    static void SAL_CALL yield() 
+    { 
         osl_yieldThread();
     }
+    
 
-
-    virtual sal_Bool SAL_CALL schedule()
+    virtual sal_Bool SAL_CALL schedule() 
     {
         return m_hThread ? osl_scheduleThread(m_hThread) : sal_False;
     }
-
+    
     SAL_CALL operator oslThread() const
     {
         return m_hThread;
@@ -171,7 +171,7 @@ protected:
 
     virtual void SAL_CALL run() = 0;
 
-    virtual void SAL_CALL onTerminated()
+    virtual void SAL_CALL onTerminated() 
     {
     }
 
@@ -183,21 +183,21 @@ extern "C" inline void SAL_CALL threadFunc( void* param)
 {
         Thread* pObj= (Thread*)param;
         pObj->run();
-        pObj->onTerminated();
+        pObj->onTerminated();		
 }
 
-class ThreadData
+class ThreadData 
 {
     ThreadData( const ThreadData& );
     ThreadData& operator= (const ThreadData& );
 public:
-     /// Create a thread specific local data key
+     /// Create a thread specific local data key 
     ThreadData( oslThreadKeyCallbackFunction pCallback= 0 )
     {
         m_hKey = osl_createThreadKey( pCallback );
     }
 
-    /// Destroy a thread specific local data key
+    /// Destroy a thread specific local data key 
     ~ThreadData()
     {
            osl_destroyThreadKey(m_hKey);
@@ -212,7 +212,7 @@ public:
     }
 
     /** Get the data associated with the data key.
-        @returns The data asscoitaed with the data key or
+        @returns The data asscoitaed with the data key or 
         NULL if no data was set
     */
     void* SAL_CALL getData()
diff --git a/sal/inc/osl/time.h b/sal/inc/osl/time.h
index 8043164ffd07..b9e39279a621 100644
--- a/sal/inc/osl/time.h
+++ b/sal/inc/osl/time.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,9 +40,9 @@ extern "C" {
 /****************************************************************************/
 
 #ifdef SAL_W32
-#   pragma pack(push, 8)
+#	pragma pack(push, 8)
 #elif defined(SAL_OS2)
-#   pragma pack(push, 4)
+#	pragma pack(push, 4)
 #endif
 
 /* Time since Jan-01-1970 */
@@ -53,7 +53,7 @@ typedef struct {
 } TimeValue;
 
 #if defined( SAL_W32) ||  defined(SAL_OS2)
-#   pragma pack(pop)
+#	pragma pack(pop)
 #endif
 
 
@@ -103,7 +103,7 @@ typedef struct _oslDateTime
     sal_uInt16 Year;
 
 } oslDateTime;
-
+    
 
 /** Get the current system time as TimeValue.
     @return false if any error occurs.
@@ -129,7 +129,7 @@ sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( TimeValue* pTimeVal, oslDateTime
 sal_Bool SAL_CALL osl_getTimeValueFromDateTime( oslDateTime* pDateTime, TimeValue* pTimeVal );
 
 
-/** Convert GMT to local time
+/** Convert GMT to local time 
     @param pSystemTimeVal[in] system time to convert
     @param pLocalTimeVal[out] On success it receives the local time
 
@@ -152,11 +152,11 @@ sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( TimeValue* pLocalTimeVal, Time
  */
 
 sal_uInt32 SAL_CALL osl_getGlobalTimer(void);
-
+ 
 #ifdef __cplusplus
 }
 #endif
 
-#endif  /* _OSL_TIME_H_ */
+#endif	/* _OSL_TIME_H_ */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/osl/util.h b/sal/inc/osl/util.h
index e72cb7a9e172..9da2b0cf8833 100644
--- a/sal/inc/osl/util.h
+++ b/sal/inc/osl/util.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@ extern "C" {
            implemented on the platform. In this case, pEthernetAddr is
            unchanged.
 */
-sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 *pEthernetAddr );
+sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 *pEthernetAddr );	
 
 #ifdef __cplusplus
 }
diff --git a/sal/inc/pch/precompiled_sal.cxx b/sal/inc/pch/precompiled_sal.cxx
index 90b35cb1dbae..998ad2ed9e47 100644
--- a/sal/inc/pch/precompiled_sal.cxx
+++ b/sal/inc/pch/precompiled_sal.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/pch/precompiled_sal.hxx b/sal/inc/pch/precompiled_sal.hxx
index 2f285e5685a7..ede8f9f47698 100644
--- a/sal/inc/pch/precompiled_sal.hxx
+++ b/sal/inc/pch/precompiled_sal.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/rtl/alloc.h b/sal/inc/rtl/alloc.h
index dac0a2c42e53..7005b4f83825 100644
--- a/sal/inc/rtl/alloc.h
+++ b/sal/inc/rtl/alloc.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
 #ifndef _RTL_ALLOC_H_
 #define _RTL_ALLOC_H_
 
-#   include <sal/types.h>
+#	include <sal/types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/inc/rtl/allocator.hxx b/sal/inc/rtl/allocator.hxx
index 83ebb0faea43..a9040f44adb2 100644
--- a/sal/inc/rtl/allocator.hxx
+++ b/sal/inc/rtl/allocator.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,12 +38,12 @@
 #include <cstddef>
 
 //######################################################
-// This is no general purpose STL allocator but one
-// necessary to use STL for some implementation but
+// This is no general purpose STL allocator but one 
+// necessary to use STL for some implementation but 
 // avoid linking sal against the STLPort library!!!
-// For more information on when and how to define a
-// custom stl allocator have a look at Scott Meyers:
-// "Effective STL", Nicolai M. Josuttis:
+// For more information on when and how to define a 
+// custom stl allocator have a look at Scott Meyers: 
+// "Effective STL", Nicolai M. Josuttis: 
 // "The C++ Standard Library - A Tutorial and Reference"
 // and at http://www.josuttis.com/cppcode/allocator.html
 
@@ -60,9 +60,9 @@ public:
     typedef T& reference;
     typedef const T& const_reference;
     typedef ::std::size_t size_type;
-    typedef ::std::ptrdiff_t difference_type;
-
-    //-----------------------------------------
+    typedef ::std::ptrdiff_t difference_type;   
+    
+    //----------------------------------------- 
     template<class U>
     struct rebind
     {
@@ -74,7 +74,7 @@ public:
     {
         return &value;
     }
-
+    
     //-----------------------------------------
     const_pointer address (const_reference value) const
     {
@@ -84,16 +84,16 @@ public:
     //-----------------------------------------
     Allocator() SAL_THROW(())
     {}
-
+                
     //-----------------------------------------
     template<class U>
     Allocator (const Allocator<U>&) SAL_THROW(())
     {}
-
+    
     //-----------------------------------------
     Allocator(const Allocator&) SAL_THROW(())
     {}
-
+    
     //-----------------------------------------
     ~Allocator() SAL_THROW(())
     {}
@@ -105,36 +105,36 @@ public:
     }
 
     //-----------------------------------------
-    /* Normally the code for allocate should
+    /* Normally the code for allocate should 
        throw a std::bad_alloc exception if the
        requested memory could not be allocated:
        (C++ standard 20.4.1.1):
-
+       
        pointer allocate (size_type n, const void* hint = 0)
        {
          pointer p = reinterpret_cast<pointer>(
              rtl_allocateMemory(sal_uInt32(n * sizeof(T))));
-
+        
          if (NULL == p)
              throw ::std::bad_alloc();
-
+            
          return p;
        }
-
+       
        but some compilers do not compile it if exceptions
        are not enabled, e.g. GCC under Linux and it is
-       in general not desired to compile sal with exceptions
+       in general not desired to compile sal with exceptions 
        enabled. */
     pointer allocate (size_type n, const void* hint = 0)
-    {
+    {       
         hint = hint; /* avoid warnings */
         return reinterpret_cast<pointer>(
-            rtl_allocateMemory(sal_uInt32(n * sizeof(T))));
+            rtl_allocateMemory(sal_uInt32(n * sizeof(T))));     
     }
-
+    
     //-----------------------------------------
     void deallocate (pointer p, size_type /* n */)
-    {
+    {       
         rtl_freeMemory(p);
     }
 
@@ -143,7 +143,7 @@ public:
     {
         new ((void*)p)T(value);
     }
-
+    
     //-----------------------------------------
     void destroy (pointer p)
     {
@@ -152,8 +152,8 @@ public:
 };
 
 //######################################################
-// Custom STL allocators must be stateless (see
-// references above) that's why the operators below
+// Custom STL allocators must be stateless (see 
+// references above) that's why the operators below 
 // return always true or false
 
 /** @internal */
@@ -173,8 +173,8 @@ inline bool operator!= (const Allocator<T>&, const Allocator<U>&) SAL_THROW(())
 } /* namespace rtl */
 
 //######################################################
-/** REQUIRED BY STLPort (see stlport '_alloc.h'):
-    Hack for compilers that do not support member
+/** REQUIRED BY STLPort (see stlport '_alloc.h'): 
+    Hack for compilers that do not support member 
     template classes (e.g. MSVC 6)
 
     @internal
diff --git a/sal/inc/rtl/bootstrap.h b/sal/inc/rtl/bootstrap.h
index 18e3b64e76e8..f01b03c5a769 100644
--- a/sal/inc/rtl/bootstrap.h
+++ b/sal/inc/rtl/bootstrap.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,28 +37,28 @@ extern "C" {
 /**
    @HTML
    @file
-
-   The described concept provides a platform independent way to access
-   minimum bootstrap settings for every application by excplitly or
+   
+   The described concept provides a platform independent way to access 
+   minimum bootstrap settings for every application by excplitly or 
    implicitly passing the values to the application.<p>
 
    MULTI-LEVEL STRATEGY FOR RETRIEVAL OF BOOTSTRAP VALUES :<p>
 
-   The 1st level is tried first. On failure,
-   the next level is tried. Every query starts at the first level again, so
+   The 1st level is tried first. On failure, 
+   the next level is tried. Every query starts at the first level again, so 
    that one setting may be taken from the 3rd and one from the 1st level.<p>
 
    1st level: explicitly set variables via rtl_bootstrap_set()
-
-   2nd level: command line arguments. A "-env:SETTINGNAME=value" is given on
-   command line. This allows to give an application a certain setting, even
-   if an ini-file exists (espicially useful for e.g. daemons that want to
+   
+   2nd level: command line arguments. A "-env:SETTINGNAME=value" is given on 
+   command line. This allows to give an application a certain setting, even 
+   if an ini-file exists (espicially useful for e.g. daemons that want to 
    start an executable with dynamical changing settings).<p>
 
-   3rd level: environment variables. The application tries to get the
+   3rd level: environment variables. The application tries to get the 
    setting from the environment.<p>
 
-   4th level: executable ini-file. Every application looks for an ini-file.
+   4th level: executable ini-file. Every application looks for an ini-file.  
    The filename defaults to /absoulte/path/to/executable[rc|.ini]
    (without .bin or .exe suffix). The ini-filename can be
    set by the special command line parameter
@@ -68,20 +68,20 @@ extern "C" {
    5th level: URE_BOOTSTRAP ini-file. If the bootstrap variable URE_BOOTSTRAP
    expands to the URL of an ini-file, that ini-file is searched.<p>
 
-   6th level: default. An application can have some default settings decided
-   at compile time, which allow the application to run even with no
+   6th level: default. An application can have some default settings decided 
+   at compile time, which allow the application to run even with no 
    deployment settings. <p>
 
-   If neither of the above levels leads to an successful retrieval of the value
+   If neither of the above levels leads to an successful retrieval of the value 
    (no default possible), the application may  fail to start.<p>
 
    NAMING CONVENTIONS <p>
 
    Naming conventions for names of bootstrap values :
-   Names may only include characters, that are allowed charcters for
-   environment variables. This excludes '.', ' ', ';', ':' and any non-ascii
+   Names may only include characters, that are allowed charcters for 
+   environment variables. This excludes '.', ' ', ';', ':' and any non-ascii 
    character. Names are case insensitive.<p>
-
+   
    An ini-file is only allowed to have one section, which must be named '[Bootstrap]'.
    The section may be omitted.
    The section name does not appear in the name of the corresponding
@@ -89,7 +89,7 @@ extern "C" {
    Values maybe arbitrary unicode strings, they must be encoded in UTF8.<p>
 
    Example:<p>
-
+   
    in an ini-file:
    <code>
    [Sectionname]
@@ -104,7 +104,7 @@ extern "C" {
    setenv Name value
    set Name=value
    </code><p>
-
+   
    SPECIAL VARIABLES:
 
    <ul>
@@ -114,7 +114,7 @@ extern "C" {
      given the executable ini-file is ignored.
    </li>
 */
-
+    
 /** may be called by an application to set an ini-filename.
 
     <p>
@@ -122,19 +122,19 @@ extern "C" {
     If it is never called, a the filename executable.ini (win)
     or execuablerc (unx) is assumed.
 
-    @param pName Name of the inifile with path but WITHOUT
-    suffix (.ini or rc)
+    @param pName Name of the inifile with path but WITHOUT 
+    suffix (.ini or rc) 
 */
 void SAL_CALL rtl_bootstrap_setIniFileName( rtl_uString *pName )
     SAL_THROW_EXTERN_C();
 
-/**
+/** 
    @param ppValue
         out parameter. Contains always a valid rtl_uString pointer.
-   @param pName
-            The name of the bootstrap setting to be     retrieved.
-   @param pDefault
-        maybe NULL. If once the default is
+   @param pName 
+            The name of the bootstrap setting to be 	retrieved.
+   @param pDefault  
+        maybe NULL. If once the default is 
            returned, successive calls always return this
            default value, even when called with different
            defaults.
@@ -149,8 +149,8 @@ sal_Bool SAL_CALL rtl_bootstrap_get( rtl_uString *pName, rtl_uString **ppValue,
     SAL_THROW_EXTERN_C();
 
 /** Sets a bootstrap parameter.
-
-   @param pName
+   
+   @param pName 
           name of bootstrap parameter
    @param pValue
           value of bootstrap parameter
@@ -159,18 +159,18 @@ void SAL_CALL rtl_bootstrap_set( rtl_uString * pName, rtl_uString * pValue )
     SAL_THROW_EXTERN_C();
 
 
-typedef void * rtlBootstrapHandle;
+typedef	void * rtlBootstrapHandle;
 
 /**
    Opens a bootstrap argument container.
-   @param pIniName [in]   The name of the ini-file to use, if <code>NULL</code> defaults
+   @param pIniName [in]   The name of the ini-file to use, if <code>NULL</code> defaults 
                           to the excutables name
    @return                Handle for a boostrap argument container
 */
 rtlBootstrapHandle SAL_CALL rtl_bootstrap_args_open(rtl_uString * pIniName)
     SAL_THROW_EXTERN_C();
 
-/**
+/** 
    Closes a boostrap agument container.
    @param handle [in]     The handle got by <code>rtl_bootstrap_args_open()</code>
 */
@@ -190,14 +190,14 @@ sal_Bool SAL_CALL rtl_bootstrap_get_from_handle(rtlBootstrapHandle handle, rtl_u
 
 
 /** Returns the name of the inifile associated with this handle.
-
+   
    @param ppIniName contains after the call the name of the ini-filename.
 */
 void SAL_CALL rtl_bootstrap_get_iniName_from_handle(rtlBootstrapHandle handle, rtl_uString ** ppIniName)
     SAL_THROW_EXTERN_C();
 
 /** Expands a macro using bootstrap variables.
-
+    
     @param handle   [in]     The handle got by <code>rtl_bootstrap_args_open()</code>
     @param macro    [inout]  The macro to be expanded
 */
@@ -205,7 +205,7 @@ void SAL_CALL rtl_bootstrap_expandMacros_from_handle(
     rtlBootstrapHandle handle, rtl_uString ** macro )
     SAL_THROW_EXTERN_C();
 /** Expands a macro using default bootstrap variables.
-
+    
     @param macro    [inout]  The macro to be expanded
 */
 void SAL_CALL rtl_bootstrap_expandMacros(
@@ -229,7 +229,7 @@ void SAL_CALL rtl_bootstrap_encode(
 
 #ifdef __cplusplus
 }
-#endif
+#endif	
 
 #endif
 
diff --git a/sal/inc/rtl/bootstrap.hxx b/sal/inc/rtl/bootstrap.hxx
index 290bb1e38850..9cd1b382eeec 100644
--- a/sal/inc/rtl/bootstrap.hxx
+++ b/sal/inc/rtl/bootstrap.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,12 +35,12 @@ namespace rtl
     class Bootstrap
     {
         void * _handle;
-
+        
         /** @internal */
         inline Bootstrap( Bootstrap const & ); // not impl
         /** @internal */
         inline Bootstrap & operator = ( Bootstrap const & ); // not impl
-
+        
     public:
         /**
            @see rtl_bootstrap_setIniFileName()
@@ -59,12 +59,12 @@ namespace rtl
             ::rtl::OUString &outValue );
 
         /** Retrieves a bootstrap parameter
-
+           
            @param sName name of the bootstrap value. case insensitive.
            @param outValue (out parameter). Contains the value associated with sName.
            @param aDefault if none of the other methods retrieved a value, outValue
                            is assigned to a Default.
-
+                  
            @see rtl_bootstrap_get()
          */
         static inline void get(
@@ -73,8 +73,8 @@ namespace rtl
             const ::rtl::OUString &aDefault );
 
         /** Sets a bootstrap parameter.
-
-            @param pName
+            
+            @param pName 
                    name of bootstrap parameter
             @param pValue
                    value of bootstrap parameter
@@ -83,7 +83,7 @@ namespace rtl
         */
         static inline void set( ::rtl::OUString const & name, ::rtl::OUString const & value )
             SAL_THROW( () );
-
+        
         /** default ctor.
          */
         inline Bootstrap();
@@ -104,7 +104,7 @@ namespace rtl
             and second via the special bootstrap container.
             @see rtl_bootstrap_get_from_handle()
         */
-
+        
         inline sal_Bool getFrom(const ::rtl::OUString &sName,
                                 ::rtl::OUString &outValue) const;
 
@@ -122,16 +122,16 @@ namespace rtl
             @see rtl_bootstrap_get_iniName_from_handle()
          */
         inline void getIniName(::rtl::OUString & iniName) const;
-
+        
         /** Expands a macro using bootstrap variables.
-
+            
             @param macro    [inout]  The macro to be expanded
         */
         inline void expandMacrosFrom( ::rtl::OUString & macro ) const SAL_THROW( () )
             { rtl_bootstrap_expandMacros_from_handle( _handle, &macro.pData ); }
-
+        
         /** Expands a macro using default bootstrap variables.
-
+            
             @param macro    [inout]  The macro to be expanded
         */
         static inline void expandMacros( ::rtl::OUString & macro ) SAL_THROW( () )
@@ -200,7 +200,7 @@ namespace rtl
             _handle = 0;
     }
 
-    inline Bootstrap::~Bootstrap()
+    inline Bootstrap::~Bootstrap() 
     {
         rtl_bootstrap_args_close(_handle);
     }
diff --git a/sal/inc/rtl/byteseq.h b/sal/inc/rtl/byteseq.h
index d19db147d677..b099b8825be1 100644
--- a/sal/inc/rtl/byteseq.h
+++ b/sal/inc/rtl/byteseq.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@ extern "C"
 
 /** Assures that the reference count of the given byte sequence is one. Otherwise a new copy
     of the sequence is created with a reference count of one.
-
+    
     @param ppSequence sequence
 */
 void SAL_CALL rtl_byte_sequence_reference2One(
@@ -46,7 +46,7 @@ void SAL_CALL rtl_byte_sequence_reference2One(
     SAL_THROW_EXTERN_C();
 
 /** Reallocates length of byte sequence.
-
+    
     @param ppSequence sequence
     @param nSize new size of sequence
 */
@@ -55,15 +55,15 @@ void SAL_CALL rtl_byte_sequence_realloc(
     SAL_THROW_EXTERN_C();
 
 /** Acquires the byte sequence
-
+    
     @param pSequence sequence, that is to be acquired
 */
 void SAL_CALL rtl_byte_sequence_acquire(
     sal_Sequence *pSequence )
     SAL_THROW_EXTERN_C();
-
+    
 /** Releases the byte sequence. If the refcount drops to zero, the sequence is freed.
-
+    
     @param pSequence sequence, that is to be released; invalid after call
 */
 void SAL_CALL rtl_byte_sequence_release(
@@ -71,7 +71,7 @@ void SAL_CALL rtl_byte_sequence_release(
     SAL_THROW_EXTERN_C();
 
 /** Constructs a bytes sequence with length nLength. All bytes are set to zero.
-
+    
     @param ppSequence inout sequence; on entry *ppSequence may be null, otherwise it is released;
                       after the call, *ppSequence contains the newly constructed sequence
     @param nLength    length of new sequence
@@ -81,7 +81,7 @@ void SAL_CALL rtl_byte_sequence_construct(
     SAL_THROW_EXTERN_C();
 
 /** Constructs a bytes sequence with length nLength. The data is not initialized.
-
+    
     @param ppSequence inout sequence; on entry *ppSequence may be null, otherwise it is released;
                       after the call, *ppSequence contains the newly constructed sequence
     @param nLength    length of new sequence
@@ -102,17 +102,17 @@ void SAL_CALL rtl_byte_sequence_constructFromArray(
     SAL_THROW_EXTERN_C();
 
 /** Assigns the byte sequence pSequence to *ppSequence.
-
+    
     @param ppSequence inout sequence; on entry *ppSequence may be null, otherwise it is released;
                       after the call, *ppSequence references pSequence
-    @param pSequence  the source sequence
+    @param pSequence  the source sequence 
 */
 void SAL_CALL rtl_byte_sequence_assign(
     sal_Sequence **ppSequence , sal_Sequence *pSequence )
     SAL_THROW_EXTERN_C();
 
 /** Compares two byte sequences.
-
+    
     @return true, if the data within the sequences are identical; false otherwise
 */
 sal_Bool SAL_CALL rtl_byte_sequence_equals(
@@ -120,7 +120,7 @@ sal_Bool SAL_CALL rtl_byte_sequence_equals(
     SAL_THROW_EXTERN_C();
 
 /** Returns the data array pointer of the sequence.
-
+    
     @return read-pointer to the data array of the sequence. If rtl_byte_sequence_reference2One()
             has been called before, the pointer may be casted to a non const pointer and
             the sequence may be modified
@@ -130,7 +130,7 @@ const sal_Int8 *SAL_CALL rtl_byte_sequence_getConstArray(
     SAL_THROW_EXTERN_C();
 
 /** Returns the length of the sequence
-
+    
     @param pSequence sequence handle
     @return length of the sequence
 */
@@ -169,7 +169,7 @@ class ByteSequence
         @internal
     */
     sal_Sequence * _pSequence;
-
+    
 public:
     // these are here to force memory de/allocation to sal lib.
     /** @internal */
@@ -184,34 +184,34 @@ public:
     /** @internal */
     inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () )
         {}
-
+    
     /** Default constructor: Creates an empty sequence.
     */
     inline ByteSequence() SAL_THROW( () );
     /** Copy constructor: Creates a copy of given sequence.
-
+        
         @param rSeq another byte sequence
     */
     inline ByteSequence( const ByteSequence & rSeq ) SAL_THROW( () );
     /** Copy constructor Creates a copy from the C-Handle.
-
+        
         @param pSequence another byte sequence handle
     */
     inline ByteSequence( sal_Sequence *pSequence ) SAL_THROW( () );
     /** Constructor: Creates a copy of given data bytes.
-
+        
         @param pElements an array of bytes
         @param len number of bytes
     */
     inline ByteSequence( const sal_Int8 * pElements, sal_Int32 len );
     /** Constructor: Creates sequence of given length and initializes all bytes to 0.
-
+        
         @param len initial sequence length
     */
     inline ByteSequence( sal_Int32 len );
     /** Constructor: Creates sequence of given length and does NOT initialize data.
                      Use this ctor for performance optimization only.
-
+                     
         @param len initial sequence length
         @param nodefault dummy parameter forcing explicit BYTESEQ_NODEFAULT
     */
@@ -221,7 +221,7 @@ public:
         over owenership. Eitherway the handle is release by the destructor.
         This ctor is useful, when working with a c-interface (it safes a pair of
         acquire and release call and is thus a performance optimization only).
-
+                     
         @param pSequence sequence handle to be taken over
         @param noacquire dummy parameter forcing explicit BYTESEQ_NOACQUIRE
     */
@@ -229,24 +229,24 @@ public:
     /** Destructor: Releases sequence handle. Last handle will free memory.
     */
     inline ~ByteSequence() SAL_THROW( () );
-
+    
     /** Assignment operator: Acquires given sequence handle and releases a previously set handle.
-
+        
         @param rSeq another byte sequence
         @return this sequence
     */
     inline ByteSequence & SAL_CALL operator = ( const ByteSequence & rSeq ) SAL_THROW( () );
-
+    
     /** Gets the length of sequence.
-
+        
         @return length of sequence
     */
     inline sal_Int32 SAL_CALL getLength() const SAL_THROW( () )
         { return _pSequence->nElements; }
-
+    
     /** Gets a pointer to byte array for READING. If the sequence has a length of 0, then the
         returned pointer is undefined.
-
+        
         @return pointer to byte array
     */
     inline const sal_Int8 * SAL_CALL getConstArray() const SAL_THROW( () )
@@ -255,20 +255,20 @@ public:
         has a handle acquired by other sequences (reference count > 1), then a new sequence is
         created copying all bytes to keep value semantics!
         If the sequence has a length of 0, then the returned pointer is undefined.
-
+        
         @return pointer to elements array
     */
     inline sal_Int8 * SAL_CALL getArray();
-
+    
     /** Non-const index operator:
         Obtains a reference to byte indexed at given position.
         In general if the sequence has a handle acquired by other
         sequences (reference count > 1), then a new sequence is created
         copying all bytes to keep value semantics!
-
+        
         @attention
         The implementation does NOT check for array bounds!
-
+        
         @param nIndex index
         @return non-const C++ reference to element at index nIndex
     */
@@ -276,34 +276,34 @@ public:
 
     /** Const index operator: Obtains a reference to byte indexed at given position.
                               The implementation does NOT check for array bounds!
-
+                              
         @param nIndex index
         @return const C++ reference to byte at element of indenx nIndex
     */
     inline const sal_Int8 & SAL_CALL operator [] ( sal_Int32 nIndex ) const SAL_THROW( () )
         { return getConstArray()[ nIndex ]; }
-
+    
     /** Equality operator: Compares two sequences.
-
+        
         @param rSeq another byte sequence (right side)
         @return true if both sequences are equal, false otherwise
     */
     inline sal_Bool SAL_CALL operator == ( const ByteSequence & rSeq ) const SAL_THROW( () );
     /** Unequality operator: Compares two sequences.
-
+        
         @param rSeq another byte sequence (right side)
         @return false if both sequences are equal, true otherwise
     */
     inline sal_Bool SAL_CALL operator != ( const ByteSequence & rSeq ) const SAL_THROW( () );
-
+    
     /** Reallocates sequence to new length. If the sequence has a handle acquired by other sequences
         (reference count > 1), then the remaining elements are copied to a new sequence handle to
         keep value semantics!
-
+        
         @param nSize new size of sequence
     */
     inline void SAL_CALL realloc( sal_Int32 nSize );
-
+    
     /** Returns the UNnacquired C handle of the sequence
 
         @return UNacquired handle of the sequence
@@ -311,7 +311,7 @@ public:
     inline sal_Sequence * SAL_CALL getHandle() const SAL_THROW( () )
         { return _pSequence; }
     /** Returns the UNnacquired C handle of the sequence (for compatibility reasons)
-
+        
         @return UNacquired handle of the sequence
     */
     inline sal_Sequence * SAL_CALL get() const SAL_THROW( () )
diff --git a/sal/inc/rtl/byteseq.hxx b/sal/inc/rtl/byteseq.hxx
index c0ccc13f7b94..bca641008dc5 100644
--- a/sal/inc/rtl/byteseq.hxx
+++ b/sal/inc/rtl/byteseq.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/rtl/cipher.h b/sal/inc/rtl/cipher.h
index 1d00b6710735..2c2297707ba3 100644
--- a/sal/inc/rtl/cipher.h
+++ b/sal/inc/rtl/cipher.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/rtl/crc.h b/sal/inc/rtl/crc.h
index d2d145158742..1bc0aa751626 100644
--- a/sal/inc/rtl/crc.h
+++ b/sal/inc/rtl/crc.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/rtl/digest.h b/sal/inc/rtl/digest.h
index e1d03ad27cea..c59589c15061 100644
--- a/sal/inc/rtl/digest.h
+++ b/sal/inc/rtl/digest.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/rtl/instance.hxx b/sal/inc/rtl/instance.hxx
index 2ef1a8d3853e..a19ef501d453 100644
--- a/sal/inc/rtl/instance.hxx
+++ b/sal/inc/rtl/instance.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -344,7 +344,7 @@ namespace rtl {
 
 /** Helper base class for a late-initialized (default-constructed)
     static variable, implementing the double-checked locking pattern correctly.
-
+    
     @derive
     Derive from this class (common practice), e.g.
     <pre>
@@ -353,7 +353,7 @@ namespace rtl {
     MyType & rStatic = MyStatic::get();
     ...
     </pre>
-
+    
     @tplparam T
               variable's type
     @tplparam Unique
@@ -366,7 +366,7 @@ class Static {
 public:
     /** Gets the static.  Mutual exclusion is performed using the
         osl global mutex.
-
+        
         @return
                 static variable
     */
@@ -387,7 +387,7 @@ private:
 
 /** Helper class for a late-initialized static aggregate, e.g. an array,
     implementing the double-checked locking pattern correctly.
-
+    
     @tplparam T
               aggregate's element type
     @tplparam InitAggregate
@@ -398,7 +398,7 @@ class StaticAggregate {
 public:
     /** Gets the static aggregate, late-initializing.
         Mutual exclusion is performed using the osl global mutex.
-
+        
         @return
                 aggregate
     */
@@ -412,7 +412,7 @@ public:
 
 /** Helper base class for a late-initialized static variable,
     implementing the double-checked locking pattern correctly.
-
+    
     @derive
     Derive from this class (common practice),
     providing an initializer functor class, e.g.
@@ -427,7 +427,7 @@ public:
     MyType & rStatic = MyStatic::get();
     ...
     </pre>
-
+    
     @tplparam T
               variable's type
     @tplparam InitData
@@ -447,7 +447,7 @@ class StaticWithInit {
 public:
     /** Gets the static.  Mutual exclusion is performed using the
         osl global mutex.
-
+        
         @return
                 static variable
     */
diff --git a/sal/inc/rtl/locale.h b/sal/inc/rtl/locale.h
index 14ac74e5c873..8c978bb8b8a3 100644
--- a/sal/inc/rtl/locale.h
+++ b/sal/inc/rtl/locale.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,9 +36,9 @@ extern "C" {
 #endif
 
 #ifdef SAL_W32
-#   pragma pack(push, 8)
+#	pragma pack(push, 8)
 #elif defined(SAL_OS2)
-#   pragma pack(push, 4)
+#	pragma pack(push, 4)
 #endif
 
 /**
@@ -52,19 +52,19 @@ typedef struct _rtl_Locale
     /**
          Lowercase two-letter ISO 639-1 or three-letter ISO 639-3 code.
      */
-    rtl_uString *   Language;
+    rtl_uString *	Language;
     /**
          uppercase two-letter ISO-3166 code.
      */
-    rtl_uString *   Country;
+    rtl_uString *	Country;
     /**
          Lowercase vendor and browser specific code.
      */
-    rtl_uString *   Variant;
+    rtl_uString *	Variant;
     /**
          The merged hash value of the Language, Country and Variant strings.
      */
-    sal_Int32       HashCode;
+    sal_Int32		HashCode;
 } rtl_Locale;
 
 #if defined( SAL_W32) ||  defined(SAL_OS2)
diff --git a/sal/inc/rtl/locale.hxx b/sal/inc/rtl/locale.hxx
index 8af1a5013858..022c1ea07712 100644
--- a/sal/inc/rtl/locale.hxx
+++ b/sal/inc/rtl/locale.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -237,14 +237,14 @@ public:
         return pData == obj.pData;
     }
 
-    rtl_Locale *    getData() const { return pData; }
+    rtl_Locale *	getData() const { return pData; }
 
 private:
     /**
          Must be the first member in this class. OUString access this member with
          *(rtl_Locale **)&locale.
      */
-    rtl_Locale *    pData;
+    rtl_Locale *	pData;
 
     OLocale()
         : pData(rtl_locale_getDefault()) {}
diff --git a/sal/inc/rtl/logfile.h b/sal/inc/rtl/logfile.h
index fab9ed4d0264..9f0bf80aa930 100644
--- a/sal/inc/rtl/logfile.h
+++ b/sal/inc/rtl/logfile.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@ extern "C" {
 #endif
 
 
-/** This function allows to log arbitrary messages even in a product-environment.
+/**	This function allows to log arbitrary messages even in a product-environment.
 
     The logfile is created on first access and closed, when the sal-library gets unloaded.
     The file is line buffered. A log file is not created if no log messages are
@@ -94,9 +94,9 @@ sal_Bool SAL_CALL rtl_logfile_hasLogFile( void );
              rtl_logfile_trace( frmt, arg1 , arg2 , arg3 ); \
              rtl_logfile_trace( "\n" )
 
-//  Now the macros with project and author arguments.  The strings
-//  are formatted in a way, so that the log file can be parsed by
-//  post processing scripts.
+//	Now the macros with project and author arguments.  The strings
+//	are formatted in a way, so that the log file can be parsed by
+//	post processing scripts.
 #define RTL_LOGFILE_TRACE_AUTHOR( project, author, string )  \
              rtl_logfile_longTrace( "| %s (%s) : %s\n", \
                                 project,\
diff --git a/sal/inc/rtl/logfile.hxx b/sal/inc/rtl/logfile.hxx
index c67e67cb7fb5..356c7147bee0 100644
--- a/sal/inc/rtl/logfile.hxx
+++ b/sal/inc/rtl/logfile.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,28 +33,28 @@
 
 namespace rtl
 {
-/**
-@descr  The intended use for class Logfile is to write time stamp information
-        for profiling purposes.
-
+/**	
+@descr	The intended use for class Logfile is to write time stamp information
+        for profiling purposes. 
+        
         Profiling output should only be generated for a special product version of OpenOffice
-        which is compiled with a defined preprocessor symbol 'TIMELOG'.
+        which is compiled with a defined preprocessor symbol 'TIMELOG'.  
         Therefore we have provided a set of macros that uses the class Logfile only if
         this symbol is defined.  If the macros are not sufficient, i.e. you need more
         then three arguments for a printf style message, then you have to insert an
         #ifdef TIMELOG/#endif brace yourself.
-
+    
         Additionally the environment variable RTL_LOGFILE has to be defined in order to generate
         logging information. If the variable is not empty, it creates a file with the name
         $(RTL_LOGFILE)_$(PID).log, where $(PID) is the process id of the running process.
         It can be used as a run time switch for enabling or disabling the logging.
         Note that this variable is evaluated only once at the first attempt to write a message.
-
+        
         The class LogFile collects runtime data within its constructor and destructor. It can be
-        used for timing whole functions.
+        used for timing whole functions. 
         If you want to write timing data without context you can use the RTL_LOGFILE_TRACE-macros
         which are defined inside <rtl/logfile.h>.
-
+        
         The class LogFile should not be used directly, instead use the RTL_LOGFILE_CONTEXT/
         RTL_LOGFILE_TRACE-macros.
 
@@ -70,30 +70,30 @@ namespace rtl
         RTL_LOGFILE_CONTEXT_TRACEn( instance, frmt, arg1, .., arg3 );
         These macros can be used to log information in a "instance" context. The "instance" object
         is used to log message informations. All macros with "frmt" uses printf notation to log timing infos.
-
+        
         Example: RTL_LOGFILE_CONTEXT_TRACE( aLog, "Now we call an expensive function" );
                  RTL_LOGFIlE_CONTEXT_TRACE1( aLog, "Config entries read: %u", (unsigned short)i );
 
         RTL_LOGFILE_TRACE( string );
         RTL_LOGFILE_TRACEn( frmt, arg1, .., arg3 );
-        These macros can be used to log information outside a context. The macro directly calls
-        rtl_logfile_trace to write the info to the log file. All macros with "frmt" uses printf
+        These macros can be used to log information outside a context. The macro directly calls 
+        rtl_logfile_trace to write the info to the log file. All macros with "frmt" uses printf 
         notation to log timing infos.
-
+        
         Example: RTL_LOGFILE_TRACE( "Timing for loading a file" );
                  RTL_LOGFILE_TRACE1( aLog, "Timing for loading file: %s", aFileName );
 
         The lines written to the log file consist of the following space separated elements:
-        1.  The time relative to the start of the global timer in milliseconds.  The times is
+        1.	The time relative to the start of the global timer in milliseconds.  The times is
             started typically for the first logged line.
-        2.  Thread id.  It's absolut value is probably of less interest than providing a way to
+        2.	Thread id.  It's absolut value is probably of less interest than providing a way to
             distinguish different threads.
-        3.  a.  An opening or closing curly brace indicating the start or end of a scope.
+        3.	a.	An opening or closing curly brace indicating the start or end of a scope.
                 4a. Function name or general scope identifier.
-            b.  A vertical line indicating an arbitrary message.
+            b.	A vertical line indicating an arbitrary message.
                 4b optional function name or general scope identifier.
                 5b A colon followed by a space and a free form message terminated by a newline.
-
+            
         There is a second version of creating a context. RTL_LOGFILE_CONTEXT_AUTHOR takes
         two more arguments, the name of the project and the author's sign who is responsible
         for the code in which the macro is used.
@@ -102,13 +102,13 @@ namespace rtl
     {
     public:
         inline Logfile( const sal_Char *name );
-        /** @descr  Create a log file context where the message field consists of a project
+        /**	@descr	Create a log file context where the message field consists of a project
                 name, the author's shortcut, and the actual message.  These three strings
                 are written in a format that is understood by script that later parses the
                 log file and that so can extract the three strings.
-            @param  project Short name of the project, like sw for writer or sc for calc.
-            @param  author  The sign of the person responsible for the code.
-            @param  name    The actual message, typically a method name.
+            @param	project	Short name of the project, like sw for writer or sc for calc.
+            @param	author	The sign of the person responsible for the code.
+            @param	name	The actual message, typically a method name.
         */
         inline Logfile( const sal_Char *project, const sal_Char *author, const sal_Char *name );
         inline ~Logfile();
@@ -166,7 +166,7 @@ namespace rtl
                            instance.getName() ); \
         rtl_logfile_trace( frmt , arg1 , arg2 , arg3 ); \
         rtl_logfile_trace( "\n" )
-
+                           
 #else
 #define RTL_LOGFILE_CONTEXT( instance, name )  ((void)0)
 #define RTL_LOGFILE_CONTEXT_AUTHOR( instance, project, author, name )  ((void)0)
@@ -176,7 +176,7 @@ namespace rtl
 #define RTL_LOGFILE_CONTEXT_TRACE3( instance, frmt, arg1, arg2 , arg3 ) ((void)0)
 #endif
 
-// Normal RTL_LOGFILE_* entries will not make it into release versions,
+// Normal RTL_LOGFILE_* entries will not make it into release versions, 
 // TIMELOG is disabled a few versions prior relase build.
 //
 // We need some logs also in these builds, eg. for making performance regression tests.
@@ -200,7 +200,7 @@ namespace rtl
              rtl_logfile_trace( "\n" )
 #define RTL_LOGFILE_HASLOGFILE() \
              rtl_logfile_hasLogFile()
-
+            
 
 #endif
 
diff --git a/sal/inc/rtl/malformeduriexception.hxx b/sal/inc/rtl/malformeduriexception.hxx
index e67e3187e5a0..b7d56253ac87 100644
--- a/sal/inc/rtl/malformeduriexception.hxx
+++ b/sal/inc/rtl/malformeduriexception.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/rtl/math.h b/sal/inc/rtl/math.h
index dc51d9900ff8..b69a36676ddb 100644
--- a/sal/inc/rtl/math.h
+++ b/sal/inc/rtl/math.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/rtl/math.hxx b/sal/inc/rtl/math.hxx
index 8a70f7db51da..f7ef3b5bb55b 100644
--- a/sal/inc/rtl/math.hxx
+++ b/sal/inc/rtl/math.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/rtl/memory.h b/sal/inc/rtl/memory.h
index 5ead5914c1e5..d74bb22acff3 100644
--- a/sal/inc/rtl/memory.h
+++ b/sal/inc/rtl/memory.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 #ifndef _RTL_MEMORY_H_
 #define _RTL_MEMORY_H_
 
-#   include <sal/types.h>
+#	include <sal/types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/inc/rtl/process.h b/sal/inc/rtl/process.h
index ae27cda80fe5..debdc34acca5 100644
--- a/sal/inc/rtl/process.h
+++ b/sal/inc/rtl/process.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,12 +33,12 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif	
 
 
 /**
     gets a 16-byte fixed size identifier which is guaranteed not to change
-    during the current process.
+    during the current process. 
 
     The current implementation creates a 16-byte uuid without using
     the ethernet address of system. Thus the
@@ -55,17 +55,17 @@ void SAL_CALL rtl_getGlobalProcessId( sal_uInt8 *pTargetUUID );
     This functions differs from osl_getCommandArg() in filtering any bootstrap values
     given by command args, that means that all arguments starting with "-env:" will be
     ignored by this function.
-
+    
     @param nArg [in] The number of the argument to return.
     @param strCommandArg [out] The string receives the nArg-th command-line argument.
-    @return osl_Process_E_None or does not return.
+    @return osl_Process_E_None or does not return. 	
     @see osl_getCommandArg()
     @see rtl_getCommandArgCount()
 */
 oslProcessError SAL_CALL rtl_getAppCommandArg(sal_uInt32 nArg, rtl_uString **strCommandArg);
 
 /** Returns the number of command line arguments at process start.
-
+    
     This functions differs from osl_getCommandArg() in filtering any bootstrap values
     given by command args, that means that all arguments starting with "-env:" will be
     ignored by this function.
diff --git a/sal/inc/rtl/random.h b/sal/inc/rtl/random.h
index af26bdf26e5b..2993200f0fbf 100644
--- a/sal/inc/rtl/random.h
+++ b/sal/inc/rtl/random.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/rtl/ref.hxx b/sal/inc/rtl/ref.hxx
index abe96e947eed..f92bea0cd9cb 100644
--- a/sal/inc/rtl/ref.hxx
+++ b/sal/inc/rtl/ref.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -77,7 +77,7 @@ public:
         if (m_pBody)
             m_pBody->acquire();
     }
-
+    
 
     /** Copy constructor...
      */
diff --git a/sal/inc/rtl/strbuf.h b/sal/inc/rtl/strbuf.h
index 584137f6d38c..0156e6ed7f97 100644
--- a/sal/inc/rtl/strbuf.h
+++ b/sal/inc/rtl/strbuf.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,19 +36,19 @@ extern "C" {
 #endif
 
 /** @HTML
-    Allocates a new <code>String</code> that contains characters from
+    Allocates a new <code>String</code> that contains characters from 
     the character array argument.
 
-    The <code>count</code> argument specifies
-    the length of the array. The initial capacity of the string buffer is
-    <code>16</code> plus the length of the string argument.
+    The <code>count</code> argument specifies 
+    the length of the array. The initial capacity of the string buffer is 
+    <code>16</code> plus the length of the string argument. 
 
     @param  newStr   out parameter, contains the new string. The reference count is 1.
     @param  value    the initial value of the string.
     @param  count    the length of value.
  */
 void SAL_CALL rtl_stringbuffer_newFromStr_WithLength( rtl_String ** newStr,
-                                                      const sal_Char * value,
+                                                      const sal_Char * value, 
                                                       sal_Int32 count);
 
 /**
@@ -59,11 +59,11 @@ void SAL_CALL rtl_stringbuffer_newFromStr_WithLength( rtl_String ** newStr,
     <ul>
     <li> The <code>bufferLen</code> argument.
     <li> The <code>length</code> of the string argument.
-    </ul>
+    </ul> 
 
-    @param  newStr      out parameter, contains the new string. The reference count is 1.
-    @param  capacity    the initial len of the string buffer.
-    @param  oldStr      the initial value of the string.
+    @param  newStr   	out parameter, contains the new string. The reference count is 1.
+    @param  capacity   	the initial len of the string buffer.
+    @param  oldStr	    the initial value of the string.
     @return the new capacity of the string buffer
  */
 sal_Int32 SAL_CALL rtl_stringbuffer_newFromStringBuffer( rtl_String ** newStr,
@@ -74,49 +74,49 @@ sal_Int32 SAL_CALL rtl_stringbuffer_newFromStringBuffer( rtl_String ** newStr,
     Ensures that the capacity of the buffer is at least equal to the
     specified minimum.
 
-    If the current capacity of this string buffer is less than the
-    argument, then a new internal buffer is allocated with greater
-    capacity. The new capacity is the larger of:
+    If the current capacity of this string buffer is less than the 
+    argument, then a new internal buffer is allocated with greater 
+    capacity. The new capacity is the larger of: 
     <ul>
-    <li>The <code>minimumCapacity</code> argument.
-    <li>Twice the old capacity, plus <code>2</code>.
+    <li>The <code>minimumCapacity</code> argument. 
+    <li>Twice the old capacity, plus <code>2</code>. 
     </ul>
     If the <code>minimumCapacity</code> argument is nonpositive, this
     method takes no action and simply returns.
 
-    @param   capacity         in: old capicity, out: new capacity.
+    @param   capacity		  in: old capicity, out: new capacity.
     @param   minimumCapacity   the minimum desired capacity.
  */
-void SAL_CALL rtl_stringbuffer_ensureCapacity(  /*inout*/rtl_String ** This,
-                                                /*inout*/sal_Int32* capacity,
+void SAL_CALL rtl_stringbuffer_ensureCapacity(	/*inout*/rtl_String ** This, 
+                                                /*inout*/sal_Int32* capacity, 
                                                 sal_Int32 minimumCapacity);
 
 
 /**
-    Inserts the string representation of the <code>char</code> array
-    argument into this string buffer.
-
-    The characters of the array argument are inserted into the
-    contents of this string buffer at the position indicated by
-    <code>offset</code>. The length of this string buffer increases by
-    the length of the argument.
-
-    @param  capacity    the capacity of the string buffer
-    @param  offset      the offset.
-    @param  ch          a character array.
-    @param  len         the number of characters to append.
-    @return this string buffer.
+    Inserts the string representation of the <code>char</code> array 
+    argument into this string buffer. 
+
+    The characters of the array argument are inserted into the 
+    contents of this string buffer at the position indicated by 
+    <code>offset</code>. The length of this string buffer increases by 
+    the length of the argument. 
+
+    @param	capacity 	the capacity of the string buffer
+    @param 	offset  	the offset.
+    @param 	ch      	a character array.
+    @param	len    		the number of characters to append.
+    @return	this string buffer.
  */
-void SAL_CALL rtl_stringbuffer_insert( /*inout*/rtl_String ** This,
+void SAL_CALL rtl_stringbuffer_insert( /*inout*/rtl_String ** This, 
                                        /*inout*/sal_Int32 * capacity,
-                                       sal_Int32 offset,
-                                       const sal_Char * str,
+                                       sal_Int32 offset, 
+                                       const sal_Char * str, 
                                        sal_Int32 len);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif  /* _RTL_STRBUF_H_ */
+#endif	/* _RTL_STRBUF_H_ */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index b45c0ae37523..9a7804486edb 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/rtl/string.h b/sal/inc/rtl/string.h
index b9d1fdf42d97..8acdc035c58a 100644
--- a/sal/inc/rtl/string.h
+++ b/sal/inc/rtl/string.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -741,9 +741,9 @@ double SAL_CALL rtl_str_toDouble( const sal_Char * str ) SAL_THROW_EXTERN_C();
 /* ======================================================================= */
 
 #ifdef SAL_W32
-#   pragma pack(push, 8)
+#	pragma pack(push, 8)
 #elif defined(SAL_OS2)
-#   pragma pack(push, 4)
+#	pragma pack(push, 4)
 #endif
 
 /** The implementation of a byte string.
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index da2144d83323..86bc1a6a3863 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/rtl/tencinfo.h b/sal/inc/rtl/tencinfo.h
index cccdd229eaaf..5543fcf7f5ba 100644
--- a/sal/inc/rtl/tencinfo.h
+++ b/sal/inc/rtl/tencinfo.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/rtl/textcvt.h b/sal/inc/rtl/textcvt.h
index 8968c06f17b5..c0209751beb9 100644
--- a/sal/inc/rtl/textcvt.h
+++ b/sal/inc/rtl/textcvt.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,7 +55,7 @@ rtl_TextToUnicodeConverter SAL_CALL rtl_createTextToUnicodeConverter( rtl_TextEn
 
 /** see http://udk.openoffice.org/cpp/man/spec/textconversion.html
  */
-void                       SAL_CALL rtl_destroyTextToUnicodeConverter( rtl_TextToUnicodeConverter hConverter );
+void					   SAL_CALL rtl_destroyTextToUnicodeConverter( rtl_TextToUnicodeConverter hConverter );
 
 /** see http://udk.openoffice.org/cpp/man/spec/textconversion.html
  */
@@ -63,37 +63,37 @@ rtl_TextToUnicodeContext   SAL_CALL rtl_createTextToUnicodeContext( rtl_TextToUn
 
 /** see http://udk.openoffice.org/cpp/man/spec/textconversion.html
  */
-void                       SAL_CALL rtl_destroyTextToUnicodeContext( rtl_TextToUnicodeConverter hConverter, rtl_TextToUnicodeContext hContext );
+void					   SAL_CALL rtl_destroyTextToUnicodeContext( rtl_TextToUnicodeConverter hConverter, rtl_TextToUnicodeContext hContext );
 
 /** see http://udk.openoffice.org/cpp/man/spec/textconversion.html
  */
-void                       SAL_CALL rtl_resetTextToUnicodeContext( rtl_TextToUnicodeConverter hConverter, rtl_TextToUnicodeContext hContext );
+void					   SAL_CALL rtl_resetTextToUnicodeContext( rtl_TextToUnicodeConverter hConverter, rtl_TextToUnicodeContext hContext );
 
-#define RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR             ((sal_uInt32)0x0001)
-#define RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_IGNORE            ((sal_uInt32)0x0002)
-#define RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE      ((sal_uInt32)0x0003)
-#define RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT           ((sal_uInt32)0x0004)
-#define RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR           ((sal_uInt32)0x0010)
-#define RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_IGNORE          ((sal_uInt32)0x0020)
-#define RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT         ((sal_uInt32)0x0030)
-#define RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR               ((sal_uInt32)0x0100)
-#define RTL_TEXTTOUNICODE_FLAGS_INVALID_IGNORE              ((sal_uInt32)0x0200)
-#define RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT             ((sal_uInt32)0x0300)
-#define RTL_TEXTTOUNICODE_FLAGS_FLUSH                       ((sal_uInt32)0x8000)
+#define RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR 			((sal_uInt32)0x0001)
+#define RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_IGNORE			((sal_uInt32)0x0002)
+#define RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE		((sal_uInt32)0x0003)
+#define RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT			((sal_uInt32)0x0004)
+#define RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR			((sal_uInt32)0x0010)
+#define RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_IGNORE			((sal_uInt32)0x0020)
+#define RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT 		((sal_uInt32)0x0030)
+#define RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR				((sal_uInt32)0x0100)
+#define RTL_TEXTTOUNICODE_FLAGS_INVALID_IGNORE				((sal_uInt32)0x0200)
+#define RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT 			((sal_uInt32)0x0300)
+#define RTL_TEXTTOUNICODE_FLAGS_FLUSH						((sal_uInt32)0x8000)
 #define RTL_TEXTTOUNICODE_FLAGS_GLOBAL_SIGNATURE 0x10000
     /* Accept any global document signatures (for example, in UTF-8, a leading
        EF BB BF encoding the Byte Order Mark U+FEFF) */
 
-#define RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MASK              ((sal_uInt32)0x000F)
-#define RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_MASK            ((sal_uInt32)0x00F0)
-#define RTL_TEXTTOUNICODE_FLAGS_INVALID_MASK                ((sal_uInt32)0x0F00)
+#define RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MASK				((sal_uInt32)0x000F)
+#define RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_MASK			((sal_uInt32)0x00F0)
+#define RTL_TEXTTOUNICODE_FLAGS_INVALID_MASK				((sal_uInt32)0x0F00)
 
-#define RTL_TEXTTOUNICODE_INFO_ERROR                        ((sal_uInt32)0x0001)
-#define RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL             ((sal_uInt32)0x0002)
-#define RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL            ((sal_uInt32)0x0004)
-#define RTL_TEXTTOUNICODE_INFO_UNDEFINED                    ((sal_uInt32)0x0008)
-#define RTL_TEXTTOUNICODE_INFO_MBUNDEFINED                  ((sal_uInt32)0x0010)
-#define RTL_TEXTTOUNICODE_INFO_INVALID                      ((sal_uInt32)0x0020)
+#define RTL_TEXTTOUNICODE_INFO_ERROR						((sal_uInt32)0x0001)
+#define RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL 			((sal_uInt32)0x0002)
+#define RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL			((sal_uInt32)0x0004)
+#define RTL_TEXTTOUNICODE_INFO_UNDEFINED					((sal_uInt32)0x0008)
+#define RTL_TEXTTOUNICODE_INFO_MBUNDEFINED					((sal_uInt32)0x0010)
+#define RTL_TEXTTOUNICODE_INFO_INVALID						((sal_uInt32)0x0020)
 
 /** see http://udk.openoffice.org/cpp/man/spec/textconversion.html
  */
@@ -118,7 +118,7 @@ rtl_UnicodeToTextConverter SAL_CALL rtl_createUnicodeToTextConverter( rtl_TextEn
 
 /** see http://udk.openoffice.org/cpp/man/spec/textconversion.html
  */
-void                       SAL_CALL rtl_destroyUnicodeToTextConverter( rtl_UnicodeToTextConverter hConverter );
+void					   SAL_CALL rtl_destroyUnicodeToTextConverter( rtl_UnicodeToTextConverter hConverter );
 
 /** see http://udk.openoffice.org/cpp/man/spec/textconversion.html
  */
@@ -126,44 +126,44 @@ rtl_UnicodeToTextContext   SAL_CALL rtl_createUnicodeToTextContext( rtl_UnicodeT
 
 /** see http://udk.openoffice.org/cpp/man/spec/textconversion.html
  */
-void                       SAL_CALL rtl_destroyUnicodeToTextContext( rtl_UnicodeToTextConverter hConverter, rtl_UnicodeToTextContext hContext );
+void					   SAL_CALL rtl_destroyUnicodeToTextContext( rtl_UnicodeToTextConverter hConverter, rtl_UnicodeToTextContext hContext );
 
 /** see http://udk.openoffice.org/cpp/man/spec/textconversion.html
  */
-void                       SAL_CALL rtl_resetUnicodeToTextContext( rtl_UnicodeToTextConverter hConverter, rtl_UnicodeToTextContext hContext );
+void					   SAL_CALL rtl_resetUnicodeToTextContext( rtl_UnicodeToTextConverter hConverter, rtl_UnicodeToTextContext hContext );
 
-#define RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR             ((sal_uInt32)0x0001)
-#define RTL_UNICODETOTEXT_FLAGS_UNDEFINED_IGNORE            ((sal_uInt32)0x0002)
-#define RTL_UNICODETOTEXT_FLAGS_UNDEFINED_0                 ((sal_uInt32)0x0003)
-#define RTL_UNICODETOTEXT_FLAGS_UNDEFINED_QUESTIONMARK      ((sal_uInt32)0x0004)
-#define RTL_UNICODETOTEXT_FLAGS_UNDEFINED_UNDERLINE         ((sal_uInt32)0x0005)
-#define RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT           ((sal_uInt32)0x0006)
-#define RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR               ((sal_uInt32)0x0010)
-#define RTL_UNICODETOTEXT_FLAGS_INVALID_IGNORE              ((sal_uInt32)0x0020)
-#define RTL_UNICODETOTEXT_FLAGS_INVALID_0                   ((sal_uInt32)0x0030)
-#define RTL_UNICODETOTEXT_FLAGS_INVALID_QUESTIONMARK        ((sal_uInt32)0x0040)
-#define RTL_UNICODETOTEXT_FLAGS_INVALID_UNDERLINE           ((sal_uInt32)0x0050)
-#define RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT             ((sal_uInt32)0x0060)
-#define RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE           ((sal_uInt32)0x0100)
-#define RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACESTR        ((sal_uInt32)0x0200)
-#define RTL_UNICODETOTEXT_FLAGS_PRIVATE_MAPTO0              ((sal_uInt32)0x0400)
-#define RTL_UNICODETOTEXT_FLAGS_NONSPACING_IGNORE           ((sal_uInt32)0x0800)
-#define RTL_UNICODETOTEXT_FLAGS_CONTROL_IGNORE              ((sal_uInt32)0x1000)
-#define RTL_UNICODETOTEXT_FLAGS_PRIVATE_IGNORE              ((sal_uInt32)0x2000)
-#define RTL_UNICODETOTEXT_FLAGS_NOCOMPOSITE                 ((sal_uInt32)0x4000)
-#define RTL_UNICODETOTEXT_FLAGS_FLUSH                       ((sal_uInt32)0x8000)
+#define RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR 			((sal_uInt32)0x0001)
+#define RTL_UNICODETOTEXT_FLAGS_UNDEFINED_IGNORE			((sal_uInt32)0x0002)
+#define RTL_UNICODETOTEXT_FLAGS_UNDEFINED_0 				((sal_uInt32)0x0003)
+#define RTL_UNICODETOTEXT_FLAGS_UNDEFINED_QUESTIONMARK		((sal_uInt32)0x0004)
+#define RTL_UNICODETOTEXT_FLAGS_UNDEFINED_UNDERLINE 		((sal_uInt32)0x0005)
+#define RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT			((sal_uInt32)0x0006)
+#define RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR				((sal_uInt32)0x0010)
+#define RTL_UNICODETOTEXT_FLAGS_INVALID_IGNORE				((sal_uInt32)0x0020)
+#define RTL_UNICODETOTEXT_FLAGS_INVALID_0					((sal_uInt32)0x0030)
+#define RTL_UNICODETOTEXT_FLAGS_INVALID_QUESTIONMARK		((sal_uInt32)0x0040)
+#define RTL_UNICODETOTEXT_FLAGS_INVALID_UNDERLINE			((sal_uInt32)0x0050)
+#define RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT 			((sal_uInt32)0x0060)
+#define RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE			((sal_uInt32)0x0100)
+#define RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACESTR		((sal_uInt32)0x0200)
+#define RTL_UNICODETOTEXT_FLAGS_PRIVATE_MAPTO0				((sal_uInt32)0x0400)
+#define RTL_UNICODETOTEXT_FLAGS_NONSPACING_IGNORE			((sal_uInt32)0x0800)
+#define RTL_UNICODETOTEXT_FLAGS_CONTROL_IGNORE				((sal_uInt32)0x1000)
+#define RTL_UNICODETOTEXT_FLAGS_PRIVATE_IGNORE				((sal_uInt32)0x2000)
+#define RTL_UNICODETOTEXT_FLAGS_NOCOMPOSITE 				((sal_uInt32)0x4000)
+#define RTL_UNICODETOTEXT_FLAGS_FLUSH						((sal_uInt32)0x8000)
 #define RTL_UNICODETOTEXT_FLAGS_GLOBAL_SIGNATURE 0x10000
     /* Write any global document signatures (for example, in UTF-8, a leading
        EF BB BF encoding the Byte Order Mark U+FEFF) */
 
-#define RTL_UNICODETOTEXT_FLAGS_UNDEFINED_MASK              ((sal_uInt32)0x000F)
-#define RTL_UNICODETOTEXT_FLAGS_INVALID_MASK                ((sal_uInt32)0x00F0)
+#define RTL_UNICODETOTEXT_FLAGS_UNDEFINED_MASK				((sal_uInt32)0x000F)
+#define RTL_UNICODETOTEXT_FLAGS_INVALID_MASK				((sal_uInt32)0x00F0)
 
-#define RTL_UNICODETOTEXT_INFO_ERROR                        ((sal_uInt32)0x0001)
-#define RTL_UNICODETOTEXT_INFO_SRCBUFFERTOSMALL             ((sal_uInt32)0x0002)
-#define RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL            ((sal_uInt32)0x0004)
-#define RTL_UNICODETOTEXT_INFO_UNDEFINED                    ((sal_uInt32)0x0008)
-#define RTL_UNICODETOTEXT_INFO_INVALID                      ((sal_uInt32)0x0010)
+#define RTL_UNICODETOTEXT_INFO_ERROR						((sal_uInt32)0x0001)
+#define RTL_UNICODETOTEXT_INFO_SRCBUFFERTOSMALL 			((sal_uInt32)0x0002)
+#define RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL			((sal_uInt32)0x0004)
+#define RTL_UNICODETOTEXT_INFO_UNDEFINED					((sal_uInt32)0x0008)
+#define RTL_UNICODETOTEXT_INFO_INVALID						((sal_uInt32)0x0010)
 
 /** see http://udk.openoffice.org/cpp/man/spec/textconversion.html
  */
diff --git a/sal/inc/rtl/textenc.h b/sal/inc/rtl/textenc.h
index 1c9b1904fc32..5acc72aa3d9e 100644
--- a/sal/inc/rtl/textenc.h
+++ b/sal/inc/rtl/textenc.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/rtl/tres.hxx b/sal/inc/rtl/tres.hxx
index 2c0ee9906809..7bd401934e77 100644
--- a/sal/inc/rtl/tres.hxx
+++ b/sal/inc/rtl/tres.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/rtl/unload.h b/sal/inc/rtl/unload.h
index d67afb1ee961..4ac4f718eba6 100644
--- a/sal/inc/rtl/unload.h
+++ b/sal/inc/rtl/unload.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,11 +35,11 @@
 
 ///@HTML
 /** @file
-The API enables an effective way of unloading libraries in a centralized way.
-The mechanism ensures that used libraries are not unloaded. This prevents
-crashes if library code is being used after unloading the library.
-The unloading mechanism currently only works with libraries which contain
-UNO services. A library cannot be unloaded if one of the following conditions
+The API enables an effective way of unloading libraries in a centralized way. 
+The mechanism ensures that used libraries are not unloaded. This prevents 
+crashes if library code is being used after unloading the library. 
+The unloading mechanism currently only works with libraries which contain 
+UNO services. A library cannot be unloaded if one of the following conditions 
 apply
 
 <ul>
@@ -50,64 +50,64 @@ apply
 </ul>
 
 <b>Notification Mechanism</b>
-The API provides a notification mechanism. Clients can use it to do clean up,
-such as releasing cached references, in order to allow modules to be unloaded.
-As long as someone holds a reference to an object whose housing module
+The API provides a notification mechanism. Clients can use it to do clean up, 
+such as releasing cached references, in order to allow modules to be unloaded. 
+As long as someone holds a reference to an object whose housing module 
 supports unloading the module cannot be unloaded.<p>
 
-Because of the inherent danger of crashing the application by using this API
-all instances which control threads should be registered listeners. On
-notification they have to ensure that their threads assume a safe state, that
-is, they run outside of modules which could be unloaded and do not jump
-back into module code as a result of a finished function call. In other words,
+Because of the inherent danger of crashing the application by using this API 
+all instances which control threads should be registered listeners. On 
+notification they have to ensure that their threads assume a safe state, that 
+is, they run outside of modules which could be unloaded and do not jump 
+back into module code as a result of a finished function call. In other words, 
 there must not be an address of the module on the thread's stack.
 <p>
-Since current operating systems lack APIs in respect to controlling the
-position of threads within libraries, it would be a major effort to comply with
-that recommendation. The best and most efficient way of handling the unloading
-scenario is to let all threads, except for the main thread, die in case of a
+Since current operating systems lack APIs in respect to controlling the 
+position of threads within libraries, it would be a major effort to comply with 
+that recommendation. The best and most efficient way of handling the unloading 
+scenario is to let all threads, except for the main thread, die in case of a 
 notification.
 <p>
-Use this API with great care because it might crash the application. See the
+Use this API with great care because it might crash the application. See the 
 respective documentation (Library Unloading) on the udk.openoffice.org web site.
 */
 
 
 /**
-A library which supports unloading has to implement and export a function
+A library which supports unloading has to implement and export a function 
 called <code>component_canUnload</code>. <p>
-If the function returns <code>sal_True</code> then the module can be safely unloaded.
-That is the case when there are no external references to code within the
-library. In case a module houses UNO components then the function must return
-<code>sal_False</code> after the first factory has been handed out. The function then
-continues to return <code>sal_False</code> as long as there is at least one object (factory
+If the function returns <code>sal_True</code> then the module can be safely unloaded. 
+That is the case when there are no external references to code within the 
+library. In case a module houses UNO components then the function must return 
+<code>sal_False</code> after the first factory has been handed out. The function then 
+continues to return <code>sal_False</code> as long as there is at least one object (factory 
 or service instance)  which originated from the module.<p>
 
-Libraries which not only contain UNO components (or none at all) have to
-provide a means to control whether they can be unloaded or not, e.g. However,
+Libraries which not only contain UNO components (or none at all) have to 
+provide a means to control whether they can be unloaded or not, e.g. However, 
 there is no concept yet. <p>
 
-The argument <code>pTime</code> is an optional out-parameter. If the return value is
+The argument <code>pTime</code> is an optional out-parameter. If the return value is 
 <code>sal_True</code> then <code>pTime</code> reflects a point in time since
-when the module could have
-been unloaded. Since that time the function would have continually returned
+when the module could have 
+been unloaded. Since that time the function would have continually returned 
 <code>sal_True</code> up to the present. The value of <code>pTime</code> is
-important for the decision
-as to a module will be unloaded. When someone initiates the unloading of
-modules by calling <code>rtl_unloadUnusedModules</code> then the caller can specify a time
-span with the effect that only those modules are unloaded which are unused at
+important for the decision 
+as to a module will be unloaded. When someone initiates the unloading of 
+modules by calling <code>rtl_unloadUnusedModules</code> then the caller can specify a time 
+span with the effect that only those modules are unloaded which are unused at 
 least for that amount of time. If <code>component_canUnload</code> does not
 fill in <code>pTime</code>
 then the module is unloaded immediately.<p>
 
 <code>component_canUnload</code> is implicitly called by <code>rtl_unloadUnusedModules
-</code>. There is no need to call the function directly.
+</code>. There is no need to call the function directly.  
 */
-#define COMPONENT_CANUNLOAD         "component_canUnload"
+#define COMPONENT_CANUNLOAD			"component_canUnload"
 typedef sal_Bool (SAL_CALL * component_canUnloadFunc)( TimeValue* pTime);
 
 
-/** C-interface for a module reference counting
+/** C-interface for a module reference counting 
  */
 #ifdef __cplusplus
 extern "C"
@@ -115,40 +115,40 @@ extern "C"
 #endif
 
 /**
-By registering a module, one declares that a module supports the
+By registering a module, one declares that a module supports the 
 unloading mechanism. One registers a module by calling this function.<p>
 
-A module can only be unloaded from memory when it has been registered
-as many times as it has been loaded. The reason is that a library can
+A module can only be unloaded from memory when it has been registered 
+as many times as it has been loaded. The reason is that a library can 
 be &quot;loaded&quot; several times by <code>osl_loadModule</code>
-within the same process. The
-function will then return the same module handle because the library will
-effectively only be loaded once. To remove the library from memory it is
+within the same process. The 
+function will then return the same module handle because the library will 
+effectively only be loaded once. To remove the library from memory it is 
 necessary to call <code>osl_unloadModule</code> as often as <code>
-osl_loadModule</code> was called. The
+osl_loadModule</code> was called. The 
 function <code>rtl_unloadUnusedModules</code> calls <code>osl_unloadModule</code>
-for a module as many
-times as it was registered. If, for example, a module has been registered one
-time less then <code>osl_loadModule</code> has been called and the module can be unloaded
-then it needs a call to <code>rtl_unloadUnusedModules</code> and an explicit call to
+for a module as many 
+times as it was registered. If, for example, a module has been registered one 
+time less then <code>osl_loadModule</code> has been called and the module can be unloaded 
+then it needs a call to <code>rtl_unloadUnusedModules</code> and an explicit call to 
 <code>osl_unloadModule</code> to remove the module from memory. <p>
 
-A module must be registered every time it has been loaded otherwise the
+A module must be registered every time it has been loaded otherwise the 
 unloading mechanism is not effective.<p>
 
-Before a module is registered, one has to make sure that the module is in a
-state that prevents it from being unloaded. In other words,
+Before a module is registered, one has to make sure that the module is in a 
+state that prevents it from being unloaded. In other words, 
 <code>component_canUnload</code> must return <code>sal_False</code>. Assuming that
 <code>component_canUnload</code>
-returns <code>sal_True</code> and it is registered regardless, then a call to
-<code>rtl_unloadUnusedModules</code> causes the module to be unloaded. This unloading can
-be set off by a different thread and the thread which registered the module is
-&quot;unaware&quot; of this. Then when the first thread tries to obtain a factory or
-calls another function in the module, the application will crash, because the
-module has been unloaded before. Therefore one has to ensure that the module
-cannot be unloaded before it is registered. This is simply done by obtaining a
-factory from the module. As long as a factory or some other object, which has
-been created by the factory, is alive, the <code>component_canUnload</code> function will
+returns <code>sal_True</code> and it is registered regardless, then a call to 
+<code>rtl_unloadUnusedModules</code> causes the module to be unloaded. This unloading can 
+be set off by a different thread and the thread which registered the module is 
+&quot;unaware&quot; of this. Then when the first thread tries to obtain a factory or 
+calls another function in the module, the application will crash, because the 
+module has been unloaded before. Therefore one has to ensure that the module 
+cannot be unloaded before it is registered. This is simply done by obtaining a 
+factory from the module. As long as a factory or some other object, which has 
+been created by the factory, is alive, the <code>component_canUnload</code> function will 
 return <code>sal_False</code>.<p>
 Loading and registering have to be in this order:<br>
 <ul>
@@ -156,70 +156,70 @@ Loading and registering have to be in this order:<br>
 <li>get the <code>component_getFactory</code> function and get a factory</li>
 <li>register the module (rtl_registerModuleForUnloading</li>
 </ul>
-Usually the service manager is used to obtain an instance of a service.
-The service manager registers all modules which support the unloading mechanism.
-When the service manager is used to get service instances than one does not
+Usually the service manager is used to obtain an instance of a service. 
+The service manager registers all modules which support the unloading mechanism. 
+When the service manager is used to get service instances than one does not 
 have to bother about registering.
 
-@param module a module handle as is obtained by osl_loadModule
-@return sal_True - the module could be registered for unloading, sal_False otherwise
+@param module a module handle as is obtained by osl_loadModule 
+@return sal_True - the module could be registered for unloading, sal_False otherwise 
 */
 sal_Bool SAL_CALL rtl_registerModuleForUnloading( oslModule module);
 
 /**
-The function revokes the registration of a module. By calling the function for
-a previously registered module one prevents the module from being unloaded by
-this unloading mechanism. However, in order to completely unregister the module
-it is necessary to call the function as often as the module has been registered.
+The function revokes the registration of a module. By calling the function for 
+a previously registered module one prevents the module from being unloaded by 
+this unloading mechanism. However, in order to completely unregister the module 
+it is necessary to call the function as often as the module has been registered. 
 <p>
-<code>rtl_unloadUnusedModules</code> unregisters the modules which it unloads. Therefore
+<code>rtl_unloadUnusedModules</code> unregisters the modules which it unloads. Therefore 
 there is no need to call this function unless one means to prevent the unloading of a module.
 
 @param module a module handle as is obtained by osl_loadModule
 */
 void SAL_CALL rtl_unregisterModuleForUnloading( oslModule module);
 /**
-This function sets off the unloading mechanism. At first it notifies the
-unloading listeners in order to give them a chance to do cleanup and get
-their threads in a safe state. Then all registered modules are asked if they
-can be unloaded. That is, the function calls component_canUnload on every
+This function sets off the unloading mechanism. At first it notifies the 
+unloading listeners in order to give them a chance to do cleanup and get 
+their threads in a safe state. Then all registered modules are asked if they 
+can be unloaded. That is, the function calls component_canUnload on every 
 registered module. If <code>sal_True</code> is returned then <code>osl_unloadModule</code>
 is called for the belonging module as often as it is registered.
 <p>
-A call to <code>osl_unloadModule</code> does not guarantee that the module is unloaded even
+A call to <code>osl_unloadModule</code> does not guarantee that the module is unloaded even 
 if its <code>component_canUnload</code> function returns <code>sal_True</code>.
 <p>
-The optional in-parameter <code>libUnused</code> specifies a period of time which a library
-must be unused in order to qualify for being unloaded. By using this argument
-one can counter the multithreading problem as described further above. It is in
-the responsibility of the user of this function to provide a timespan big enough
+The optional in-parameter <code>libUnused</code> specifies a period of time which a library 
+must be unused in order to qualify for being unloaded. By using this argument 
+one can counter the multithreading problem as described further above. It is in 
+the responsibility of the user of this function to provide a timespan big enough 
 to ensure that all threads are out of modules (see <code>component_canUnload</code>).
 <p>
-The service managers which have been created by functions such as
-<code>createRegistryServiceFactory</code> (declared in cppuhelper/servicefactory.hxx) are
-registered listeners and release the references to factories on notification.
+The service managers which have been created by functions such as 
+<code>createRegistryServiceFactory</code> (declared in cppuhelper/servicefactory.hxx) are 
+registered listeners and release the references to factories on notification. 
 
 
-@param libUnused span of time that a module must be unused to be unloaded. the
+@param libUnused span of time that a module must be unused to be unloaded. the 
 argument is optional.
 */
 void SAL_CALL rtl_unloadUnusedModules( TimeValue* libUnused);
 
-/**
+/** 
 rtl_addUnloadingListener takes an argument of this type.
 
 @param id - The value that has been passed as second argument to rtl_addUnloadingListener
 */
 typedef void (SAL_CALL *rtl_unloadingListenerFunc)(void* id);
 /**
-The function registered an unloading listener. The callback argument is a
-function which is called  when the unloading procedure has been initiated by a call to
-<code>rtl_unloadUnusedLibraries</code>. The second argument is used to distinguish between different
-listener instances and may be <code>NULL</code>. It will be passed as argument when the callback
-function is being called. The return value identifies the registered listener and will
-be used for removing the listener later on. If the same listener is added more then
-once then every registration is treated as if made for a different listener. That is,
-a different cookie is returned and the callback function will be called as many times
+The function registered an unloading listener. The callback argument is a 
+function which is called  when the unloading procedure has been initiated by a call to 
+<code>rtl_unloadUnusedLibraries</code>. The second argument is used to distinguish between different 
+listener instances and may be <code>NULL</code>. It will be passed as argument when the callback 
+function is being called. The return value identifies the registered listener and will 
+be used for removing the listener later on. If the same listener is added more then 
+once then every registration is treated as if made for a different listener. That is, 
+a different cookie is returned and the callback function will be called as many times 
 as it has been registered.
 @param callback - a function that is called to notify listeners.
 @param this  - a value to distinguish different listener instances
@@ -228,9 +228,9 @@ as it has been registered.
 sal_Int32 SAL_CALL rtl_addUnloadingListener( rtl_unloadingListenerFunc callback, void* _this);
 
 /**
-Listeners (the callback functions) must be unregistered before the listener code
-becomes invalid. That is, if a module contains listener code, namely callback
-functions of type <code>rtl_unloadingListenerFunc</code>, then those functions must not be
+Listeners (the callback functions) must be unregistered before the listener code 
+becomes invalid. That is, if a module contains listener code, namely callback 
+functions of type <code>rtl_unloadingListenerFunc</code>, then those functions must not be 
 registered when <code>component_canUnload</code> returns <code>sal_True</code>.
 
 @param cookie is an identifier as returned by <code>rtl_addUnloadingListener</code> function.
@@ -238,24 +238,24 @@ registered when <code>component_canUnload</code> returns <code>sal_True</code>.
 void SAL_CALL rtl_removeUnloadingListener( sal_Int32 cookie );
 
 
-/**
+/** 
 Pointers to <code>rtl_ModuleCount</code> are passed as arguments to the default factory creator
 functions: <code>createSingleComponentFactory</code>, <code>createSingleFactory</code>,
 <code>createOneInstanceFactory</code>.
-The factory implementation is calling <code>rtl_ModuleCount.acquire</code> when it is being
+The factory implementation is calling <code>rtl_ModuleCount.acquire</code> when it is being 
 constructed and it is calling <code>rtl_ModuleCount.release</code>. The implementations of
 <code>acquire</code>
 and <code>release</code> should influence the return value of <code>component_canUnload</code>
 in a way that it
 returns <code>sal_False</code> after <code>acquire</code> has been called. That is the module will not be unloaded
-once a default factory has been created. A call to <code>release</code> may cause
+once a default factory has been created. A call to <code>release</code> may cause 
 <code>component_canUnload</code> to return <code>sal_False</code>, but only if there are
-no object alive which
+no object alive which 
 originated from the module. These objects are factory instances and the service instances
 which have been created by these factories.
 <p>
 It is not necessary to synchronize <code>acquire</code> and <code>release</code> as a whole.
-Simply sychronize the
+Simply sychronize the 
 access to a counter variable, e.g. the <code>rtl_moduleCount_release</code> implementation:
 <pre>
 extern "C" void rtl_moduleCount_acquire(rtl_ModuleCount * that )
@@ -264,9 +264,9 @@ extern "C" void rtl_moduleCount_acquire(rtl_ModuleCount * that )
     osl_incrementInterlockedCount( &pMod->counter);
 }
 </pre>
-The SAL library offers functions that can be used for <code>acquire</code> and <code>release</code>. See struct
+The SAL library offers functions that can be used for <code>acquire</code> and <code>release</code>. See struct 
 <code>_rtl_StandardModuleCount</code>.
-*/
+*/	
 typedef struct _rtl_ModuleCount
 {
     void ( SAL_CALL * acquire ) ( struct _rtl_ModuleCount * that );
@@ -278,8 +278,8 @@ typedef struct _rtl_ModuleCount
 { {rtl_moduleCount_acquire,rtl_moduleCount_release}, rtl_moduleCount_canUnload, 0, {0, 0}}
 
 /**
-This struct can be used to implement the unloading mechanism. To make a UNO library
-unloadable create one global instance of this struct in the module. To initialize it one
+This struct can be used to implement the unloading mechanism. To make a UNO library 
+unloadable create one global instance of this struct in the module. To initialize it one 
 uses the MODULE_COUNT_INIT macro.
 
 <pre>rtl_StandardModuleCount globalModuleCount= MODULE_COUNT_INIT</pre>;
@@ -287,22 +287,22 @@ uses the MODULE_COUNT_INIT macro.
 typedef struct _rtl_StandardModuleCount
 {
     rtl_ModuleCount modCnt;
-     sal_Bool ( *canUnload ) ( struct _rtl_StandardModuleCount* a, TimeValue* libUnused);
+     sal_Bool (	*canUnload ) ( struct _rtl_StandardModuleCount* a, TimeValue* libUnused);
     oslInterlockedCount counter;
     TimeValue unusedSince;
 } rtl_StandardModuleCount;
 
-/** Default implementation for <code>rtl_ModuleCount.acquire</code>. Use this function along with
+/** Default implementation for <code>rtl_ModuleCount.acquire</code>. Use this function along with 
 <code>rtl_StandardModuleCount</code>.
 */
 void rtl_moduleCount_acquire(rtl_ModuleCount * that );
 /** Default implementation for <code>rtl_ModuleCount.release</code>.
-Use this function along with
+Use this function along with 
 <code>rtl_StandardModuleCount</code>.
 */
 void rtl_moduleCount_release( rtl_ModuleCount * that );
 
-/** Default implementation for <code>component_canUnload</code>. Use this function along with
+/** Default implementation for <code>component_canUnload</code>. Use this function along with 
 <code>rtl_StandardModuleCount</code>.
 */
 sal_Bool rtl_moduleCount_canUnload( rtl_StandardModuleCount * that, TimeValue* libUnused);
diff --git a/sal/inc/rtl/uri.h b/sal/inc/rtl/uri.h
index 16c7ed592359..bce58ddcc111 100644
--- a/sal/inc/rtl/uri.h
+++ b/sal/inc/rtl/uri.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/rtl/uri.hxx b/sal/inc/rtl/uri.hxx
index c4bb81bd0e02..9ac0372386a0 100644
--- a/sal/inc/rtl/uri.hxx
+++ b/sal/inc/rtl/uri.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/rtl/ustrbuf.h b/sal/inc/rtl/ustrbuf.h
index a7295f5e5324..dfd8019ee8b1 100644
--- a/sal/inc/rtl/ustrbuf.h
+++ b/sal/inc/rtl/ustrbuf.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 94b7469433e6..4977aacaa090 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -345,7 +345,7 @@ public:
 
     /**
         Appends a 8-Bit ASCII character string to this string buffer.
-
+ 
        Since this method is optimized for performance. the ASCII
         character values are not converted in any way. The caller
         has to make sure that all ASCII characters are in the
diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h
index ad55be973e91..f01b5c68aadb 100644
--- a/sal/inc/rtl/ustring.h
+++ b/sal/inc/rtl/ustring.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -162,7 +162,7 @@ sal_Int32 SAL_CALL rtl_ustr_reverseCompare_WithLength( const sal_Unicode * first
 /** Compare two strings from back to front for equality.
 
     The comparison is based on the numeric value of each character in the
-    strings and returns 'true' if, ans only if, both strings are equal.
+    strings and returns 'true' if, ans only if, both strings are equal.  
     This function cannot be used for language-specific sorting.
 
     @param first
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 3952c6a78422..c412ba66cc38 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -230,13 +230,13 @@ public:
     {
         rtl_uString_release( pData );
     }
-
+    
     /** Provides an OUString const & passing a storage pointer of an
         rtl_uString * handle.
         It is more convenient to use C++ OUString member functions when dealing
         with rtl_uString * handles.  Using this function avoids unnecessary
         acquire()/release() calls for a temporary OUString object.
-
+        
         @param ppHandle
                pointer to storage
         @return
@@ -244,7 +244,7 @@ public:
     */
     static inline OUString const & unacquired( rtl_uString * const * ppHandle )
         { return * reinterpret_cast< OUString const * >( ppHandle ); }
-
+    
     /**
       Assign a new string.
 
@@ -553,7 +553,7 @@ public:
         if ( pData->length != asciiStrLength )
             return sal_False;
 
-        return rtl_ustr_asciil_reverseEquals_WithLength(
+        return rtl_ustr_asciil_reverseEquals_WithLength( 
                     pData->buffer, asciiStr, asciiStrLength );
     }
 
diff --git a/sal/inc/rtl/uuid.h b/sal/inc/rtl/uuid.h
index d17c328fe638..04289703edd8 100644
--- a/sal/inc/rtl/uuid.h
+++ b/sal/inc/rtl/uuid.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif	
 
 /** Generates a new Version 4 (random number based) UUID (Universally Unique
     IDentifier).
@@ -94,7 +94,7 @@ sal_Int32 SAL_CALL rtl_compareUuid( const sal_uInt8 *pUUID1 , const sal_uInt8 *p
     of names (and, implicitly, name spaces) might be DNS names, URLs, ISO
     Object IDs (OIDs), reserved words in a programming language, or X.500
     Distinguished Names (DNs); thus, the concept of name and name space
-    should be broadly construed, and not limited to textual names.
+    should be broadly construed, and not limited to textual names. 
 
     <p>
     The requirements for such UUIDs are as follows:
@@ -178,7 +178,7 @@ void SAL_CALL rtl_createNamedUuid(
       0x11, 0xd1,\
       0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8\
     }
-
+    
 
 /*
     This macro must have a value below the system time resolution of the
diff --git a/sal/inc/sal/alloca.h b/sal/inc/sal/alloca.h
index 0580a1faa42f..83bc5dffe1f9 100644
--- a/sal/inc/sal/alloca.h
+++ b/sal/inc/sal/alloca.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h
index 9cdf2ac3fd18..73b66bcbb90e 100644
--- a/sal/inc/sal/config.h
+++ b/sal/inc/sal/config.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h
index 536bf328a43a..bf7a82821a6d 100644
--- a/sal/inc/sal/main.h
+++ b/sal/inc/sal/main.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -73,18 +73,18 @@ int SAL_CALL main(int argc, char ** argv) \
 /* Sorry but this is neccessary cause HINSTANCE is a typedef that differs (C++ causes an error) */
 
 #ifndef WINAPI
-#   define WINAPI   __stdcall
+#	define WINAPI	__stdcall
 #endif
 
 #if !defined(DECLARE_HANDLE)
-#   ifdef STRICT
+#	ifdef STRICT
         typedef void *HANDLE;
-#       define DECLARE_HANDLE(name) struct name##__ { int unused; }; typedef struct name##__ *name
-#   else
+#		define DECLARE_HANDLE(name) struct name##__ { int unused; }; typedef struct name##__ *name
+#	else
         typedef void *PVOID;
         typedef PVOID HANDLE;
-#       define DECLARE_HANDLE(name) typedef HANDLE name
-#   endif
+#		define DECLARE_HANDLE(name) typedef HANDLE name
+#	endif
 DECLARE_HANDLE(HINSTANCE);
 #endif
 
@@ -98,9 +98,9 @@ int WINAPI WinMain( HINSTANCE _hinst, HINSTANCE _dummy, char* _cmdline, int _nsh
     return main(argc, argv); \
 }
 
-#else   /* ! SAL_W32 */
+#else	/* ! SAL_W32 */
 
-# define SAL_WIN_WinMain
+# define SAL_WIN_WinMain 
 
 #endif /* ! SAL_W32 */
 
@@ -140,9 +140,9 @@ int WINAPI WinMain( HINSTANCE _hinst, HINSTANCE _dummy, char* _cmdline, int _nsh
 */
 
 #ifdef __cplusplus
-}   /* extern "C" */
+}	/* extern "C" */
 #endif
 
-#endif  /* _SAL_MAIN_H_ */
+#endif	/* _SAL_MAIN_H_ */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h
index 6b7196285b27..5f6537dcfdfa 100644
--- a/sal/inc/sal/mathconf.h
+++ b/sal/inc/sal/mathconf.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,9 +62,9 @@ extern "C" {
 #if defined( WNT)
 #define SAL_MATH_FINITE(d) _finite(d)
 #elif defined OS2
-#define SAL_MATH_FINITE(x)              \
-    ((sizeof (x) == sizeof (float)) ? __isfinitef(x)    \
-    : (sizeof (x) == sizeof (double)) ? __isfinite(x)   \
+#define SAL_MATH_FINITE(x) 				\
+    ((sizeof (x) == sizeof (float)) ? __isfinitef(x)	\
+    : (sizeof (x) == sizeof (double)) ? __isfinite(x)	\
     : __isfinitel(x))
 #elif defined LINUX || defined UNX
 #define SAL_MATH_FINITE(d) finite(d)
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 9fac15ad319e..f4400941cab2 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,14 +37,14 @@
   #include <sal/typesizes.h>
 #elif defined(WNT) || defined(OS2)
   /* FIXME: autogeneration of type sizes on Win32/Win64? */
-  #define SAL_TYPES_ALIGNMENT2      1
-  #define SAL_TYPES_ALIGNMENT4      1
-  #define SAL_TYPES_ALIGNMENT8      1
-  #define SAL_TYPES_SIZEOFSHORT     2
-  #define SAL_TYPES_SIZEOFINT       4
-  #define SAL_TYPES_SIZEOFLONG      4
-  #define SAL_TYPES_SIZEOFLONGLONG      8
-  #define SAL_TYPES_SIZEOFPOINTER       4
+  #define SAL_TYPES_ALIGNMENT2		1
+  #define SAL_TYPES_ALIGNMENT4		1
+  #define SAL_TYPES_ALIGNMENT8		1
+  #define SAL_TYPES_SIZEOFSHORT		2
+  #define SAL_TYPES_SIZEOFINT 		4
+  #define SAL_TYPES_SIZEOFLONG		4
+  #define SAL_TYPES_SIZEOFLONGLONG		8
+  #define SAL_TYPES_SIZEOFPOINTER		4
 #endif
 
 #ifdef __cplusplus
@@ -57,13 +57,13 @@ extern "C" {
 
 /* Boolean */
 typedef unsigned char sal_Bool;
-#   define sal_False ((sal_Bool)0)
-#   define sal_True  ((sal_Bool)1)
-
+#   define sal_False ((sal_Bool)0)                
+#   define sal_True  ((sal_Bool)1) 
+  
 /* char is assumed to always be 1 byte long */
 typedef signed char         sal_Int8;
 typedef unsigned char       sal_uInt8;
-
+  
 #if SAL_TYPES_SIZEOFSHORT == 2
     typedef signed short      sal_Int16;
     typedef unsigned short    sal_uInt16;
@@ -151,7 +151,7 @@ typedef unsigned char            sal_uChar;
     #define SAL_UNICODE_NOTEQUAL_WCHAR_T
     typedef sal_uInt16          sal_Unicode;
 #endif
-
+  
 typedef void *                   sal_Handle;
 
 /* sal_Size should currently be the native width of the platform */
@@ -164,7 +164,7 @@ typedef void *                   sal_Handle;
 #else
     #error "Please make sure SAL_TYPES_SIZEOFPOINTER is defined for your architecture/compiler"
 #endif
-
+  
 /* sal_PtrDiff holds the result of a pointer subtraction */
 #if SAL_TYPES_SIZEOFPOINTER == 4
     typedef sal_Int32           sal_PtrDiff;
@@ -185,7 +185,7 @@ typedef void *                   sal_Handle;
 #endif
 
 /* sal_IntPtr, sal_uIntPtr are integer types designed to hold pointers so that any valid
- * pointer to void can be converted to this type and back to a pointer to void and the
+ * pointer to void can be converted to this type and back to a pointer to void and the 
  * result will compare to the original pointer */
 #if SAL_TYPES_SIZEOFPOINTER == 4
     typedef sal_Int32           sal_IntPtr;
@@ -208,7 +208,7 @@ typedef void *                   sal_Handle;
 /********************************************************************************/
 /* Useful defines
  */
-
+  
 /* The following SAL_MIN_INTn defines codify the assumption that the signed
  * sal_Int types use two's complement representation.  Defining them as
  * "-0x7F... - 1" instead of as "-0x80..." prevents warnings about applying the
@@ -228,11 +228,11 @@ typedef void *                   sal_Handle;
 #define SAL_MAX_UINT64        ((sal_uInt64) SAL_CONST_UINT64(0xFFFFFFFFFFFFFFFF))
 
 #if SAL_TYPES_SIZEOFLONG == 4
-#define SAL_MAX_SSIZE       SAL_MAX_INT32
-#define SAL_MAX_SIZE        SAL_MAX_UINT32
+#define SAL_MAX_SSIZE		SAL_MAX_INT32
+#define SAL_MAX_SIZE		SAL_MAX_UINT32
 #elif SAL_TYPES_SIZEOFLONG == 8
-#define SAL_MAX_SSIZE       SAL_MAX_INT64
-#define SAL_MAX_SIZE        SAL_MAX_UINT64
+#define SAL_MAX_SSIZE		SAL_MAX_INT64
+#define SAL_MAX_SIZE		SAL_MAX_UINT64
 #endif
 
 #if defined(SAL_W32) || defined(SAL_OS2) || defined(SAL_UNX)
@@ -314,7 +314,7 @@ typedef void *                   sal_Handle;
 #ifdef SAL_W32
 #   pragma pack(push, 8)
 #elif defined(SAL_OS2)
-#   pragma pack(push, 4)
+#	pragma pack(push, 4)
 #endif
 
 /** This is the binary specification of a SAL sequence.
@@ -324,13 +324,13 @@ typedef struct _sal_Sequence
 {
     /** reference count of sequence<br>
     */
-    sal_Int32           nRefCount;
+    sal_Int32			nRefCount;
     /** element count<br>
     */
-    sal_Int32           nElements;
+    sal_Int32			nElements;
     /** elements array<br>
     */
-    char                elements[1];
+    char				elements[1];
 } sal_Sequence;
 
 #define SAL_SEQUENCE_HEADER_SIZE ((sal_Size)&((sal_Sequence *)0)->elements)
@@ -360,12 +360,12 @@ typedef struct _sal_Sequence
 
 /** Definition of function throw clause macros.  These have been introduced
     to reduce code size by balancing out compiler bugs.
-
+    
     These macros are ONLY for function declarations,
     use common C++ throw statement for throwing exceptions, e.g.
     throw RuntimeException();
-
-    SAL_THROW()          should be used for all C++ functions, e.g. SAL_THROW( () )
+    
+    SAL_THROW()			 should be used for all C++ functions, e.g. SAL_THROW( () )
     SAL_THROW_EXTERN_C() should be used for all C functions
 */
 #ifdef __cplusplus
diff --git a/sal/inc/systools/win32/AutoSystoolInit.hxx b/sal/inc/systools/win32/AutoSystoolInit.hxx
index 3ebc7a6b5b36..cb22bd54c058 100644
--- a/sal/inc/systools/win32/AutoSystoolInit.hxx
+++ b/sal/inc/systools/win32/AutoSystoolInit.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 #endif
 
 //------------------------------------------------------------------------
-// class used to automatically initialize/deinitialize the systools
+// class used to automatically initialize/deinitialize the systools 
 //------------------------------------------------------------------------
 
 class OAutoSystoolInit
@@ -55,7 +55,7 @@ public:
         if ( NULL != m_lpfnDeInit )
             m_lpfnDeInit( );
     }
-
+    
 private:
     LPFNDEINIT_T m_lpfnDeInit; // address of the deinit function
 };
diff --git a/sal/inc/systools/win32/StrConvert.h b/sal/inc/systools/win32/StrConvert.h
index 80c24513a993..25ebec06ef4c 100644
--- a/sal/inc/systools/win32/StrConvert.h
+++ b/sal/inc/systools/win32/StrConvert.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/inc/systools/win32/SyncObjects.hxx b/sal/inc/systools/win32/SyncObjects.hxx
index 3966fca14391..273321581cdb 100644
--- a/sal/inc/systools/win32/SyncObjects.hxx
+++ b/sal/inc/systools/win32/SyncObjects.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,14 +37,14 @@
 #include <windows.h>
 
 //------------------------------------------------------------------------
-// a simple helper template for automatic locking/unlocking
+// a simple helper template for automatic locking/unlocking 
 //------------------------------------------------------------------------
 
 template< class LOCK >
 class CLockGuard
 {
 public:
-    CLockGuard( LOCK* aLock ) :
+    CLockGuard( LOCK* aLock ) : 
         m_pLock( aLock )
     {
         m_pLock->Lock( );
@@ -73,7 +73,7 @@ public:
 };
 
 //------------------------------------------------------------------------
-// if no synchronization is necessary this class will be used
+// if no synchronization is necessary this class will be used 
 // declaring the functions as inline safes runtime overhead
 //------------------------------------------------------------------------
 
diff --git a/sal/inc/systools/win32/advapi9x.h b/sal/inc/systools/win32/advapi9x.h
index da190fac22a9..6dc64f63381b 100644
--- a/sal/inc/systools/win32/advapi9x.h
+++ b/sal/inc/systools/win32/advapi9x.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,7 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#pragma once
+#pragma once 
 
 #ifndef _WINDOWS_
 #include <windows.h>
@@ -37,10 +37,10 @@ extern "C"{
 
 //------------------------------------------------------------------------
 // undefine the macros defined in the shlobj.h file in order to avoid
-// warnings because of multiple defines
+// warnings because of multiple defines 
 //------------------------------------------------------------------------
 
-// begin obsolete Win32 API functions -->
+// begin obsolete Win32 API functions --> 
 #ifdef RegOpenKey
 #undef RegOpenKey
 #endif
@@ -125,7 +125,7 @@ ADVAPI9X_API LONG (WINAPI *lpfnRegCreateKeyExW)(
   DWORD dwOptions,                            // special options
   REGSAM samDesired,                          // desired security access
   LPSECURITY_ATTRIBUTES lpSecurityAttributes, // inheritance
-  PHKEY phkResult,                            // key handle
+  PHKEY phkResult,                            // key handle 
   LPDWORD lpdwDisposition                     // disposition value buffer
 );
 
@@ -169,25 +169,25 @@ ADVAPI9X_API LONG (WINAPI *lpfnRegDeleteValueW) (
 );
 
 ADVAPI9X_API LONG (WINAPI *lpfnRegQueryInfoKeyW) (
-    HKEY hKey,                      // handle to key to query
-    LPWSTR lpClassW,                // address of buffer for class string
-    LPDWORD lpcbClass,              // address of size of class string buffer
-    LPDWORD lpReserved,             // reserved
-    LPDWORD lpcSubKeys,             // address of buffer for number of
+    HKEY hKey,						// handle to key to query
+    LPWSTR lpClassW,				// address of buffer for class string
+    LPDWORD lpcbClass,				// address of size of class string buffer
+    LPDWORD lpReserved,				// reserved
+    LPDWORD lpcSubKeys,				// address of buffer for number of 
                                     // subkeys
-    LPDWORD lpcbMaxSubKeyLen,       // address of buffer for longest subkey
+    LPDWORD lpcbMaxSubKeyLen,		// address of buffer for longest subkey 
                                     // name length
-    LPDWORD lpcbMaxClassLen,        // address of buffer for longest class
+    LPDWORD lpcbMaxClassLen,		// address of buffer for longest class 
                                     // string length
-    LPDWORD lpcValues,              // address of buffer for number of value
+    LPDWORD lpcValues,				// address of buffer for number of value 
                                     // entries
-    LPDWORD lpcbMaxValueNameLen,    // address of buffer for longest
+    LPDWORD lpcbMaxValueNameLen,	// address of buffer for longest 
                                     // value name length
-    LPDWORD lpcbMaxValueLen,        // address of buffer for longest value
+    LPDWORD lpcbMaxValueLen,		// address of buffer for longest value 
                                     // data length
-    LPDWORD lpcbSecurityDescriptor, // address of buffer for security
+    LPDWORD lpcbSecurityDescriptor,	// address of buffer for security 
                                     // descriptor length
-    PFILETIME lpftLastWriteTime     // address of buffer for last write time
+    PFILETIME lpftLastWriteTime		// address of buffer for last write time
 );
 
 //------------------------------------------------------------------------
diff --git a/sal/inc/systools/win32/comdlg9x.h b/sal/inc/systools/win32/comdlg9x.h
index 0d3dc2a176e4..e12fe895bdf3 100644
--- a/sal/inc/systools/win32/comdlg9x.h
+++ b/sal/inc/systools/win32/comdlg9x.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#pragma once
+#pragma once 
 
 #ifndef _WINDOWS_
 #include <windows.h>
@@ -42,7 +42,7 @@ extern "C"{
 
 //------------------------------------------------------------------------
 // undefine the macros defined in the shlobj.h file in order to avoid
-// warnings because of multiple defines
+// warnings because of multiple defines 
 //------------------------------------------------------------------------
 
 #ifdef GetOpenFileNameW
@@ -73,8 +73,8 @@ COMDLG9X_API BOOL ( WINAPI * lpfnGetSaveFileNameW ) ( LPOPENFILENAMEW lpofn );
 // all occurrences of this macros with our function pointer
 //------------------------------------------------------------------------
 
-#define GetOpenFileNameW    lpfnGetOpenFileNameW
-#define GetSaveFileNameW    lpfnGetSaveFileNameW
+#define GetOpenFileNameW	lpfnGetOpenFileNameW
+#define GetSaveFileNameW	lpfnGetSaveFileNameW
 
 #ifdef __cplusplus
 }
diff --git a/sal/inc/systools/win32/comptr.hxx b/sal/inc/systools/win32/comptr.hxx
index 22bce969cad0..fc224e6d7c23 100644
--- a/sal/inc/systools/win32/comptr.hxx
+++ b/sal/inc/systools/win32/comptr.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ template< class    T_INTERFACE          ,
 class ComPtr
 {
     public:
-
+        
         //---------------------------------------------------------------------
         /** initialize com ptr with null.
          */
@@ -47,7 +47,7 @@ class ComPtr
         {
             m_pInterface = NULL;
         }
-
+    
         //---------------------------------------------------------------------
         /** initialize com ptr with given interface.
          */
@@ -57,7 +57,7 @@ class ComPtr
             if (m_pInterface)
                 m_pInterface->AddRef();
         }
-
+    
         //---------------------------------------------------------------------
         /** copy ctor.
          */
@@ -67,7 +67,7 @@ class ComPtr
             if (m_pInterface)
                 m_pInterface->AddRef();
         }
-
+    
         //---------------------------------------------------------------------
         /** initialize object by quering external object for the right interface.
          */
@@ -76,7 +76,7 @@ class ComPtr
             if (pIUnknown)
                 pIUnknown->QueryInterface(P_IID, (void**)&m_pInterface);
         }
-
+    
         //---------------------------------------------------------------------
         /** deinitialize com object right.
          */
@@ -86,51 +86,51 @@ class ComPtr
         }
 
     public:
-
+        
         //---------------------------------------------------------------------
         HRESULT create()
         {
             return CoCreateInstance(P_CLSID, NULL, CLSCTX_ALL, P_IID, (void**)&m_pInterface);
         }
-
+    
         //---------------------------------------------------------------------
         operator T_INTERFACE*() const
         {
             return m_pInterface;
         }
-
+    
         //---------------------------------------------------------------------
         T_INTERFACE& operator*() const
         {
             return *m_pInterface;
         }
-
+    
         //---------------------------------------------------------------------
         T_INTERFACE** operator&()
         {
             return &m_pInterface;
         }
-
+    
         //---------------------------------------------------------------------
         T_INTERFACE* operator->() const
         {
             return m_pInterface;
         }
-
+    
         //---------------------------------------------------------------------
         T_INTERFACE* operator=(T_INTERFACE* pInterface)
         {
             if ( equals(pInterface) )
                 return m_pInterface;
-
+            
             m_pInterface->Release();
             m_pInterface = pInterface;
             if (m_pInterface)
                 m_pInterface->AddRef();
-
+            
             return m_pInterface;
         }
-
+    
         //---------------------------------------------------------------------
         T_INTERFACE* operator=(IUnknown* pIUnknown)
         {
@@ -138,23 +138,23 @@ class ComPtr
                 pIUnknown->QueryInterface(P_IID, (void**)&m_pInterface);
             return m_pInterface;
         }
-
+    
         //---------------------------------------------------------------------
         T_INTERFACE* operator=(const ComPtr< T_INTERFACE, P_IID, P_CLSID >& aCopy)
         {
             m_pInterface = aCopy.m_pInterface;
             if (m_pInterface)
                 m_pInterface->AddRef();
-
+            
             return m_pInterface;
         }
-
+    
         //---------------------------------------------------------------------
         T_INTERFACE* get() const
         {
             return m_pInterface;
         }
-
+    
         //---------------------------------------------------------------------
         void attach(T_INTERFACE* pInterface)
         {
@@ -164,7 +164,7 @@ class ComPtr
                 m_pInterface = pInterface;
             }
         }
-
+    
         //---------------------------------------------------------------------
         T_INTERFACE* detach()
         {
@@ -172,7 +172,7 @@ class ComPtr
             m_pInterface = NULL;
             return pInterface;
         }
-
+    
         //---------------------------------------------------------------------
         void release()
         {
@@ -182,27 +182,27 @@ class ComPtr
                 m_pInterface = NULL;
             }
         }
-
+    
         //---------------------------------------------------------------------
         template< class T_QUERYINTERFACE >
         HRESULT query(T_QUERYINTERFACE** pQuery)
         {
             return m_pInterface->QueryInterface(__uuidof(T_QUERYINTERFACE), (void**)pQuery);
         }
-
+    
         //---------------------------------------------------------------------
         HRESULT query(REFIID rIID  ,
                       void** pQuery)
         {
             return m_pInterface->QueryInterface(rIID, pQuery);
         }
-
+    
         //---------------------------------------------------------------------
         HRESULT unknown(IUnknown** pQuery)
         {
             return m_pInterface->QueryInterface(IID_IUnknown, (void**)pQuery);
         }
-
+    
         //---------------------------------------------------------------------
         ::sal_Bool equals(IUnknown* pCheck)
         {
@@ -211,16 +211,16 @@ class ComPtr
                 ( ! pCheck       )
                )
                 return sal_True;
-
+        
             IUnknown* pCurrent = NULL;
             m_pInterface->QueryInterface(IID_IUnknown, (void**)&pCurrent);
-
+        
             ::sal_Bool bEquals = (pCheck == pCurrent);
             pCurrent->Release();
-
+        
             return bEquals;
         }
-
+    
         //---------------------------------------------------------------------
         ::sal_Bool is()
         {
diff --git a/sal/inc/systools/win32/comtools.hxx b/sal/inc/systools/win32/comtools.hxx
index b4051f20e897..298d161f37e5 100644
--- a/sal/inc/systools/win32/comtools.hxx
+++ b/sal/inc/systools/win32/comtools.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ namespace sal
 namespace systools
 {
     typedef int HRESULT;
-
+    
     /* Simple exception class for propagating COM errors */
     class ComError : public std::runtime_error
     {
@@ -52,139 +52,139 @@ namespace systools
             std::runtime_error(message),
             hr_(hr)
         {}
-
+        
         HRESULT GetHresult() const
         {
             return hr_;
         }
-
-    private:
+        
+    private:                
         HRESULT hr_;
     };
-
+               
     /* A simple COM smart pointer template */
     template <typename T>
     class COMReference
     {
     public:
-        COMReference() :
+        COMReference() :            
             com_ptr_(NULL)
         {
         }
-
+                    
         explicit COMReference(T* comptr) :
             com_ptr_(comptr)
-        {
-            addRef();
+        {   
+            addRef();         
         }
-
+        
         /* Explicitly controllable whether AddRef will be called or not */
         COMReference(T* comptr, bool bAddRef) :
             com_ptr_(comptr)
         {
             if (bAddRef)
                 addRef();
-        }
-
+        }    
+          
         COMReference(const COMReference<T>& other) :
             com_ptr_(other.com_ptr_)
         {
             addRef();
         }
-
+        
         COMReference<T>& operator=(const COMReference<T>& other)
         {
             if (other.com_ptr_)
                 other.com_ptr_->AddRef();
             release();
             com_ptr_ = other.com_ptr_;
-            return *this;
+            return *this;                
         }
-
+                        
         COMReference<T>& operator=(T* comptr)
         {
-            release();
-            com_ptr_ = comptr;
+            release();                
+            com_ptr_ = comptr;            
             addRef();
             return *this;
         }
-
+        
         ~COMReference()
-        {
-            release();
+        {     
+            release();                      
         }
-
-        template<typename InterfaceType>
+        
+        template<typename InterfaceType>                
         COMReference<InterfaceType> QueryInterface(REFIID iid)
         {
             COMReference<InterfaceType> ip;
-            HRESULT hr = E_FAIL;
+            HRESULT hr = E_FAIL;            
             if (com_ptr_)
                 hr = com_ptr_->QueryInterface(iid, reinterpret_cast<LPVOID*>(&ip));
-
+            
             if (FAILED(hr))
-                throw ComError("QueryInterface failed: Interface not supported!", hr);
-
-            return ip;
+                throw ComError("QueryInterface failed: Interface not supported!", hr);                
+                
+            return ip;                
         }
-
+                        
         T* operator->() const
         {
             return com_ptr_;
         }
-
+        
         T& operator*() const
         {
             return *com_ptr_;
         }
-
+        
         /* Necessary for assigning com_ptr_ from functions like
-           CoCreateInstance which require a 'void**' */
+           CoCreateInstance which require a 'void**' */                
         T** operator&()
         {
             release();
             com_ptr_ = NULL;
             return &com_ptr_;
         }
-
+        
         T* get() const
         {
             return com_ptr_;
         }
-
+    
         COMReference<T>& clear()
         {
             release();
             com_ptr_ = NULL;
             return *this;
         }
-
+        
         bool is() const
         {
             return (com_ptr_ != NULL);
         }
-
+        
     private:
         ULONG addRef()
-        {
+        {            
             ULONG cnt = 0;
             if (com_ptr_)
                 cnt = com_ptr_->AddRef();
-            return cnt;
+            return cnt;                
         }
-
+        
         ULONG release()
-        {
+        {                        
             ULONG cnt = 0;
             if (com_ptr_)
                 cnt = com_ptr_->Release();
-            return cnt;
+            return cnt;                
         }
-
+                            
     private:
-        T* com_ptr_;
+        T* com_ptr_;                        
     };
-
+            
 } // systools
 } // sal
 
diff --git a/sal/inc/systools/win32/kernel9x.h b/sal/inc/systools/win32/kernel9x.h
index 4097804377fe..799ac5e177f2 100644
--- a/sal/inc/systools/win32/kernel9x.h
+++ b/sal/inc/systools/win32/kernel9x.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@ extern "C" {
 
 //------------------------------------------------------------------------
 // undefine the macros defined in the winbase.h file in order to avoid
-// warnings because of multiple defines
+// warnings because of multiple defines 
 //------------------------------------------------------------------------
 
 #ifdef LoadLibraryW
@@ -165,106 +165,106 @@ KERNEL9X_API HMODULE (WINAPI *lpfnLoadLibraryExW ) (
 KERNEL9X_API DWORD (WINAPI *lpfnGetModuleFileNameW ) (
     HMODULE hModule,    // handle to module
     LPWSTR lpFilename,  // file name of module
-    DWORD nSize         // size of buffer
+    DWORD nSize         // size of buffer 
 );
 
 KERNEL9X_API DWORD (WINAPI *lpfnGetLogicalDriveStringsW ) (
-    DWORD nBufferLength,    // size of buffer
-    LPWSTR lpBuffer         // drive strings buffer
+    DWORD nBufferLength,	// size of buffer
+    LPWSTR lpBuffer			// drive strings buffer
 );
 
 KERNEL9X_API HANDLE ( WINAPI *lpfnCreateFileW )(
-    LPCWSTR lpFileName,
-    DWORD   dwDesiredAccess,
-    DWORD   dwShareMode,
-    LPSECURITY_ATTRIBUTES   lpSecurityAttributes,
-    DWORD   dwCreationDisposition,
-    DWORD   dwFlagsAndAttributes,
-    HANDLE  hTemplateFile
+    LPCWSTR	lpFileName,
+    DWORD	dwDesiredAccess,
+    DWORD	dwShareMode,
+    LPSECURITY_ATTRIBUTES	lpSecurityAttributes,
+    DWORD	dwCreationDisposition,
+    DWORD	dwFlagsAndAttributes,
+    HANDLE	hTemplateFile
 );
 
 KERNEL9X_API DWORD WINAPI GetCanonicalPathNameA(
-    LPCSTR lpszPath,            // file name
-    LPSTR lpszCanonicalPath,    // path buffer
-    DWORD cchBuffer             // size of path buffer
+    LPCSTR lpszPath,			// file name
+    LPSTR lpszCanonicalPath,	// path buffer
+    DWORD cchBuffer				// size of path buffer
 );
 
 KERNEL9X_API DWORD WINAPI GetCanonicalPathNameW(
-    LPCWSTR lpszPath,           // file name
-    LPWSTR lpszCanonicalPath,   // path buffer
-    DWORD cchBuffer             // size of path buffer
+    LPCWSTR lpszPath,			// file name
+    LPWSTR lpszCanonicalPath,	// path buffer
+    DWORD cchBuffer				// size of path buffer
 );
 
 KERNEL9X_API HANDLE ( WINAPI * lpfnCreateFileW ) (
-    LPCWSTR lpFileName,
-    DWORD   dwDesiredAccess,
-    DWORD   dwShareMode,
-    LPSECURITY_ATTRIBUTES   lpSecurityAttributes,
-    DWORD   dwCreationDisposition,
-    DWORD   dwFlagsAndAttributes,
-    HANDLE  hTemplateFile );
+    LPCWSTR	lpFileName,
+    DWORD	dwDesiredAccess,
+    DWORD	dwShareMode,
+    LPSECURITY_ATTRIBUTES	lpSecurityAttributes,
+    DWORD	dwCreationDisposition,
+    DWORD	dwFlagsAndAttributes,
+    HANDLE	hTemplateFile );
 
 KERNEL9X_API BOOL (WINAPI *lpfnDeleteFileW ) (
-    LPCWSTR lpFileName          // file name
+    LPCWSTR	lpFileName			// file name
 );
 
 KERNEL9X_API BOOL (WINAPI *lpfnCopyFileW ) (
-    LPCWSTR lpExistingFileName, // file name
-    LPCWSTR lpNewFileName,      // new file name
-    BOOL    bFailIfExist        // operation if file exists
+    LPCWSTR lpExistingFileName,	// file name
+    LPCWSTR lpNewFileName,		// new file name
+    BOOL	bFailIfExist		// operation if file exists
 );
 
 KERNEL9X_API BOOL (WINAPI *lpfnMoveFileW ) (
-    LPCWSTR lpExistingFileName, // file name
-    LPCWSTR lpNewFileName       // new file name
+    LPCWSTR lpExistingFileName,	// file name
+    LPCWSTR lpNewFileName		// new file name
 );
 
 KERNEL9X_API BOOL (WINAPI *lpfnMoveFileExW ) (
-  LPCWSTR lpExistingFileName,   // file name
-  LPCWSTR lpNewFileName,        // new file name
-  DWORD dwFlags                 // move options
+  LPCWSTR lpExistingFileName,	// file name
+  LPCWSTR lpNewFileName,		// new file name
+  DWORD dwFlags					// move options
 );
 
 KERNEL9X_API BOOL (WINAPI *lpfnRemoveDirectoryW ) (
-    LPCWSTR lpPathName          // directory name
+    LPCWSTR	lpPathName			// directory name
 );
 
 KERNEL9X_API BOOL ( WINAPI * lpfnCreateDirectoryW ) (
-    LPCWSTR lpNewDirectory, LPSECURITY_ATTRIBUTES lpSecurityAttributes );
+    LPCWSTR	lpNewDirectory, LPSECURITY_ATTRIBUTES lpSecurityAttributes );
 
 KERNEL9X_API BOOL ( WINAPI * lpfnCreateDirectoryExW ) (
-    LPCWSTR lpTemplateDirectory,
-    LPCWSTR lpNewDirectory,
-    LPSECURITY_ATTRIBUTES   lpSecurityAttributes );
+    LPCWSTR	lpTemplateDirectory,
+    LPCWSTR	lpNewDirectory,
+    LPSECURITY_ATTRIBUTES	lpSecurityAttributes );
 
 KERNEL9X_API DWORD ( WINAPI * lpfnGetLongPathNameW ) (
   LPCWSTR lpszShortPath, // file name
   LPWSTR lpszLongPath,   // path buffer
-  DWORD cchBuffer        // size of path buffer
+  DWORD cchBuffer        // size of path buffer 
 );
 
 // GetCanonicalPath is a tool function with no exact counterpart
-// in the win32 api; we use nevertheless a function pointer
+// in the win32 api; we use nevertheless a function pointer 
 // because every variable etc. must root in the Kernel9x.lib else
 // we loose our AutoSystoolInit object during linking
 KERNEL9X_API DWORD ( WINAPI * lpfnGetCanonicalPathW ) (
-    LPCWSTR lpszPath,           // file name
-    LPWSTR lpszCanonicalPath,   // path buffer
-    DWORD cchBuffer             // size of path buffer
+    LPCWSTR lpszPath,			// file name
+    LPWSTR lpszCanonicalPath,	// path buffer
+    DWORD cchBuffer				// size of path buffer 
 );
 
 KERNEL9X_API int ( WINAPI* lpfnGetLocaleInfoW ) (
     LCID Locale,        // locale identifier
-    LCTYPE LCType,      // information type
+    LCTYPE LCType,      // information type 
     LPWSTR lpLCData,    // information buffer
     int cchData         // size of buffer
 );
 
 KERNEL9X_API DWORD ( WINAPI * lpfnGetFullPathNameW )(
-    LPCWSTR lpFileName,     // file name
-    DWORD   nBufferLength,  // size of path buffer
-    LPWSTR  lpBuffer,       // path buffer
-    LPWSTR  *lpFilePart     // address of file name in path
+    LPCWSTR	lpFileName,		// file name
+    DWORD	nBufferLength,	// size of path buffer
+    LPWSTR	lpBuffer,		// path buffer
+    LPWSTR	*lpFilePart		// address of file name in path
 );
 
 KERNEL9X_API BOOL ( WINAPI * lpfnCreateProcessW )(
@@ -302,7 +302,7 @@ KERNEL9X_API DWORD ( WINAPI * lpfnGetEnvironmentVariableW )(
 
 
 KERNEL9X_API UINT ( WINAPI * lpfnGetDriveTypeW )(
-    LPCWSTR lpRootPathName  // root directory
+    LPCWSTR lpRootPathName	// root directory
 );
 
 KERNEL9X_API DWORD ( WINAPI * lpfnGetCurrentDirectoryW )(
@@ -316,14 +316,14 @@ KERNEL9X_API BOOL ( WINAPI * lpfnSetCurrentDirectoryW )(
 
 // GetVolumeInformation
 KERNEL9X_API BOOL ( WINAPI* lpfnGetVolumeInformationW )(
-    LPCWSTR lpRootPathName,             // root directory
-    LPWSTR  lpVolumeNameBuffer,         // volume name buffer
-    DWORD   nVolumeNameSize,            // length of name buffer
-    LPDWORD lpVolumeSerialNumber,       // volume serial number
-    LPDWORD lpMaximumComponentLength,   // maximum file name length
-    LPDWORD lpFileSystemFlags,          // file system options
-    LPWSTR  lpFileSystemName,           // file system name buffer
-    DWORD   nFileSystemNameSize         // length of file system name buffer
+    LPCWSTR	lpRootPathName,				// root directory
+    LPWSTR	lpVolumeNameBuffer,			// volume name buffer
+    DWORD	nVolumeNameSize,			// length of name buffer
+    LPDWORD	lpVolumeSerialNumber,		// volume serial number
+    LPDWORD	lpMaximumComponentLength,	// maximum file name length
+    LPDWORD	lpFileSystemFlags,			// file system options
+    LPWSTR	lpFileSystemName,			// file system name buffer
+    DWORD	nFileSystemNameSize			// length of file system name buffer
 );
 
 // GetDiskFreeSpaceExA
@@ -347,35 +347,35 @@ KERNEL9X_API BOOL (WINAPI *lpfnGetDiskFreeSpaceExW)(
 // all occurrences of this macros with our function pointer
 //------------------------------------------------------------------------
 
-#define LoadLibraryExW              lpfnLoadLibraryExW
-#define LoadLibraryW(c)             LoadLibraryExW(c, NULL, 0)
-#define GetModuleFileNameW          lpfnGetModuleFileNameW
-#define GetLogicalDriveStringsW     lpfnGetLogicalDriveStringsW
-#define CreateFileW                 lpfnCreateFileW
-#define DeleteFileW                 lpfnDeleteFileW
-#define CopyFileW                   lpfnCopyFileW
-#define MoveFileW                   lpfnMoveFileW
-#define MoveFileExW                 lpfnMoveFileExW
-#define RemoveDirectoryW            lpfnRemoveDirectoryW
-#define CreateDirectoryW            lpfnCreateDirectoryW
-#define CreateDirectoryExW          lpfnCreateDirectoryExW
-#define GetLongPathNameW            lpfnGetLongPathNameW
-#define GetFullPathNameW            lpfnGetFullPathNameW
-
-#define GetCanonicalPath            lpfnGetCanonicalPathW
-#define GetLocaleInfoW              lpfnGetLocaleInfoW
+#define LoadLibraryExW				lpfnLoadLibraryExW
+#define LoadLibraryW(c)				LoadLibraryExW(c, NULL, 0)
+#define GetModuleFileNameW			lpfnGetModuleFileNameW
+#define GetLogicalDriveStringsW		lpfnGetLogicalDriveStringsW
+#define CreateFileW					lpfnCreateFileW
+#define DeleteFileW					lpfnDeleteFileW
+#define CopyFileW					lpfnCopyFileW
+#define MoveFileW					lpfnMoveFileW
+#define MoveFileExW					lpfnMoveFileExW
+#define RemoveDirectoryW			lpfnRemoveDirectoryW
+#define CreateDirectoryW			lpfnCreateDirectoryW
+#define CreateDirectoryExW			lpfnCreateDirectoryExW
+#define GetLongPathNameW			lpfnGetLongPathNameW
+#define GetFullPathNameW			lpfnGetFullPathNameW
+
+#define GetCanonicalPath			lpfnGetCanonicalPathW
+#define GetLocaleInfoW              lpfnGetLocaleInfoW      
 
 #define CreateProcessW              lpfnCreateProcessW
 #define CreateProcessAsUserW        lpfnCreateProcessAsUserW
 #define GetEnvironmentVariableW     lpfnGetEnvironmentVariableW
-#define GetDriveTypeW               lpfnGetDriveTypeW
+#define GetDriveTypeW				lpfnGetDriveTypeW
 
 #define GetCurrentDirectoryW        lpfnGetCurrentDirectoryW
 #define SetCurrentDirectoryW        lpfnSetCurrentDirectoryW
 
-#define GetVolumeInformationW       lpfnGetVolumeInformationW
-#define GetDiskFreeSpaceExA         lpfnGetDiskFreeSpaceExA
-#define GetDiskFreeSpaceExW         lpfnGetDiskFreeSpaceExW
+#define GetVolumeInformationW		lpfnGetVolumeInformationW
+#define GetDiskFreeSpaceExA			lpfnGetDiskFreeSpaceExA
+#define GetDiskFreeSpaceExW			lpfnGetDiskFreeSpaceExW
 
 #ifdef __cplusplus
 }
diff --git a/sal/inc/systools/win32/mpr9x.h b/sal/inc/systools/win32/mpr9x.h
index f35fb18cee5d..c8a53d11a7ac 100644
--- a/sal/inc/systools/win32/mpr9x.h
+++ b/sal/inc/systools/win32/mpr9x.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#pragma once
+#pragma once 
 
 #ifndef _WINDOWS_
 #include <windows.h>
@@ -38,7 +38,7 @@ extern "C"{
 
 //------------------------------------------------------------------------
 // undefine the macros defined in the winuser.h file in order to avoid
-// warnings because of multiple defines
+// warnings because of multiple defines 
 //------------------------------------------------------------------------
 
 #ifdef WNetGetConnectionW
@@ -56,9 +56,9 @@ extern "C"{
 //------------------------------------------------------------------------
 
 MPR9X_API DWORD (WINAPI *lpfnWNetGetConnectionW)(
-    LPCWSTR lpLocalName,    // pointer to local name
-    LPWSTR  lpRemoteName,   // pointer to buffer for remote name
-    LPDWORD lpnLength       // pointer to buffer size, in characters
+    LPCWSTR	lpLocalName,	// pointer to local name
+    LPWSTR	lpRemoteName,	// pointer to buffer for remote name
+    LPDWORD	lpnLength		// pointer to buffer size, in characters
 );
 
 //------------------------------------------------------------------------
@@ -66,7 +66,7 @@ MPR9X_API DWORD (WINAPI *lpfnWNetGetConnectionW)(
 // all occurrences of this macros with our function pointer
 //------------------------------------------------------------------------
 
-#define WNetGetConnectionW          lpfnWNetGetConnectionW
+#define WNetGetConnectionW			lpfnWNetGetConnectionW
 
 #ifdef __cplusplus
 }
diff --git a/sal/inc/systools/win32/shell9x.h b/sal/inc/systools/win32/shell9x.h
index eccc8f67242a..4e4fa350ae48 100644
--- a/sal/inc/systools/win32/shell9x.h
+++ b/sal/inc/systools/win32/shell9x.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#pragma once
+#pragma once 
 
 #ifndef _SHELL9X_H_
 #define _SHELL9X_H_
@@ -47,7 +47,7 @@ extern "C"{
 
 //------------------------------------------------------------------------
 // undefine the macros defined in the shlobj.h file in order to avoid
-// warnings because of multiple defines
+// warnings because of multiple defines 
 //------------------------------------------------------------------------
 
 #ifdef CommandLineToArgvW
@@ -79,7 +79,7 @@ extern "C"{
 //------------------------------------------------------------------------
 
 SHELL9X_API LPWSTR *     ( WINAPI * lpfnCommandLineToArgvW ) ( LPCWSTR lpCmdLine, int *pNumArgs );
-SHELL9X_API LPITEMIDLIST ( WINAPI * lpfnSHBrowseForFolderW ) ( LPBROWSEINFOW lpbi );
+SHELL9X_API LPITEMIDLIST ( WINAPI * lpfnSHBrowseForFolderW ) ( LPBROWSEINFOW lpbi );	
 SHELL9X_API BOOL         ( WINAPI * lpfnSHGetPathFromIDListW ) ( LPCITEMIDLIST pidl, LPWSTR pszPath );
 
 SHELL9X_API BOOL ( WINAPI * lpfnShellExecuteExW ) ( LPSHELLEXECUTEINFOW lpExecInfo );
diff --git a/sal/inc/systools/win32/snprintf.h b/sal/inc/systools/win32/snprintf.h
index cfed10fcaee2..20fd4bd73fca 100644
--- a/sal/inc/systools/win32/snprintf.h
+++ b/sal/inc/systools/win32/snprintf.h
@@ -9,30 +9,30 @@
 /* Macros for Unicode/ANSI support like in TCHAR.H */
 
 #ifdef _UNICODE
-#define sntprintf   snwprintf
-#define vsntprintf  vsnwprintf
+#define sntprintf	snwprintf
+#define vsntprintf	vsnwprintf
 #else
-#define sntprintf   snprintf
-#define vsntprintf  vsnprintf
+#define sntprintf	snprintf
+#define vsntprintf	vsnprintf
 #endif
 
 /* Define needed types if they are not yet defined */
 
 
-#   ifndef _VA_LIST_DEFINED
+#	ifndef _VA_LIST_DEFINED
     typedef char *  va_list;
-#   define _VA_LIST_DEFINED
-#   endif
+#	define _VA_LIST_DEFINED
+#	endif
 
 
-#   ifndef _WCHAR_T_DEFINED
+#	ifndef _WCHAR_T_DEFINED
     typedef unsigned short wchar_t;
-#   define _WCHAR_T_DEFINED
-#   endif
+#	define _WCHAR_T_DEFINED
+#	endif
 
 
 #ifndef _SNPRINTF_DLLIMPORT
-#define _SNPRINTF_DLLIMPORT __declspec( dllimport )
+#define _SNPRINTF_DLLIMPORT	__declspec( dllimport )
 #endif
 
 #ifdef __cplusplus
@@ -40,11 +40,11 @@ extern "C" {
 #endif
 
 
-/*  Implementations of snprintf following the ISO/IEC 9899:1999 (ISO C99)
+/*	Implementations of snprintf following the ISO/IEC 9899:1999 (ISO C99) 
     standard.
-    The difference compared to _snprintf is that the buffer always is zero
-    terminated (unless count is zero) and the return value is the number of
-    characters (not including terminating zero) that would have been written
+    The difference compared to _snprintf is that the buffer always is zero 
+    terminated (unless count is zero) and the return value is the number of 
+    characters (not including terminating zero) that would have been written 
     even if the buffer wasn't large
     enough to hold the string. */
 
diff --git a/sal/inc/systools/win32/user9x.h b/sal/inc/systools/win32/user9x.h
index e7441a7e2fdb..d502251601f6 100644
--- a/sal/inc/systools/win32/user9x.h
+++ b/sal/inc/systools/win32/user9x.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#pragma once
+#pragma once 
 
 #ifndef _WINDOWS_
 #include <windows.h>
@@ -38,7 +38,7 @@ extern "C"{
 
 //------------------------------------------------------------------------
 // undefine the macros defined in the winuser.h file in order to avoid
-// warnings because of multiple defines
+// warnings because of multiple defines 
 //------------------------------------------------------------------------
 
 #ifdef SendMessageW
@@ -92,10 +92,10 @@ extern "C"{
 //------------------------------------------------------------------------
 
 USER9X_API LRESULT ( WINAPI * lpfnSendMessageW) (
-    HWND hWnd,      // handle to the destination window
-    UINT Msg,       // message
-    WPARAM wParam,  // first message parameter
-    LPARAM lParam   // second message parameter
+    HWND hWnd,		// handle to the destination window
+    UINT Msg,		// message
+    WPARAM wParam,	// first message parameter
+    LPARAM lParam	// second message parameter
 );
 
 USER9X_API HWND ( WINAPI * lpfnCreateWindowExW ) (
@@ -113,13 +113,13 @@ USER9X_API HWND ( WINAPI * lpfnCreateWindowExW ) (
     LPVOID lpParam        // window-creation data
 );
 
-USER9X_API ATOM ( WINAPI * lpfnRegisterClassExW ) (
+USER9X_API ATOM ( WINAPI * lpfnRegisterClassExW ) ( 
     CONST WNDCLASSEXW* lpwcx // class data
 );
 
 USER9X_API BOOL ( WINAPI * lpfnUnregisterClassW ) (
     LPCWSTR lpClassName, // class name
-    HINSTANCE hInstance  // handle to application instance
+    HINSTANCE hInstance	 // handle to application instance
 );
 
 USER9X_API UINT (WINAPI * lpfnRegisterClipboardFormatW) (
@@ -127,9 +127,9 @@ USER9X_API UINT (WINAPI * lpfnRegisterClipboardFormatW) (
 );
 
 USER9X_API int ( WINAPI * lpfnGetClipboardFormatNameW ) (
-    UINT   format,          // clipboard format to retrieve
-    LPWSTR lpszFormatName,  // format name
-    int    cchMaxCount      // length of format name buffer
+    UINT   format,			// clipboard format to retrieve
+    LPWSTR lpszFormatName,	// format name
+    int    cchMaxCount		// length of format name buffer
 );
 
 USER9X_API BOOL ( WINAPI * lpfnSetWindowTextW ) (
@@ -138,9 +138,9 @@ USER9X_API BOOL ( WINAPI * lpfnSetWindowTextW ) (
 );
 
 USER9X_API int ( WINAPI * lpfnGetWindowTextW ) (
-    HWND hWnd,          // handle to the window or control
-    LPWSTR lpString,    // text buffer
-    int    nMaxCount        // length of text buffer
+    HWND hWnd,			// handle to the window or control
+    LPWSTR lpString,	// text buffer
+    int    nMaxCount		// length of text buffer
 );
 
 USER9X_API BOOL ( WINAPI * lpfnInsertMenuItemW ) (
@@ -176,15 +176,15 @@ USER9X_API BOOL ( WINAPI * lpfnDrawStateW ) (
 // all occurrences of this macros with our function pointer
 //------------------------------------------------------------------------
 
-#define SendMessageW                lpfnSendMessageW
-#define CreateWindowExW             lpfnCreateWindowExW
-#define RegisterClassExW            lpfnRegisterClassExW
-#define UnregisterClassW            lpfnUnregisterClassW
-#define RegisterClipboardFormatW    lpfnRegisterClipboardFormatW
-#define GetClipboardFormatNameW     lpfnGetClipboardFormatNameW
-#define SetWindowTextW              lpfnSetWindowTextW
+#define SendMessageW				lpfnSendMessageW
+#define CreateWindowExW				lpfnCreateWindowExW
+#define RegisterClassExW			lpfnRegisterClassExW
+#define UnregisterClassW			lpfnUnregisterClassW
+#define RegisterClipboardFormatW	lpfnRegisterClipboardFormatW
+#define GetClipboardFormatNameW		lpfnGetClipboardFormatNameW
+#define SetWindowTextW				lpfnSetWindowTextW
 #define GetWindowTextW              lpfnGetWindowTextW
-#define InsertMenuItemW             lpfnInsertMenuItemW
+#define InsertMenuItemW				lpfnInsertMenuItemW
 #define DrawTextW                   lpfnDrawTextW
 #define DrawStateW                  lpfnDrawStateW
 
diff --git a/sal/inc/systools/win32/uwinapi.h b/sal/inc/systools/win32/uwinapi.h
index b01554e8f47c..a9e6a9fded9e 100644
--- a/sal/inc/systools/win32/uwinapi.h
+++ b/sal/inc/systools/win32/uwinapi.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,16 +29,16 @@
 #pragma once
 #include <sal/macros.h>
 #ifdef _UWINAPI_
-#   define _KERNEL32_
-#   define _USER32_
-#   define _SHELL32_
+#	define _KERNEL32_
+#	define _USER32_
+#	define _SHELL32_
 #endif
 
 #ifndef _WINDOWS_
 #ifdef _MSC_VER
 #   pragma warning(push,1) /* disable warnings within system headers */
 #endif
-#   include <windows.h>
+#	include <windows.h>
 #ifdef _MSC_VER
 #   pragma warning(pop)
 #endif
@@ -51,9 +51,9 @@
 #endif
 #endif
 
-/** GetUserDomain
+/**	GetUserDomain
 
-The GetUserDomain function retrieves the name of the NT domain the user is
+The GetUserDomain function retrieves the name of the NT domain the user	is
 logged in.
 
 Parameters
@@ -96,9 +96,9 @@ EXTERN_C WINBASEAPI DWORD WINAPI GetUserDomainA( LPSTR lpBuffer, DWORD nBuffserS
 EXTERN_C WINBASEAPI DWORD WINAPI GetUserDomainW( LPWSTR lpBuffer, DWORD nBuffserSize );
 
 #ifdef UNICODE
-#define GetUserDomain   GetUserDomainW
+#define GetUserDomain	GetUserDomainW
 #else
-#define GetUserDomain   GetUserDomainA
+#define GetUserDomain	GetUserDomainA
 #endif
 
 EXTERN_C WINBASEAPI DWORD WINAPI GetProcessId( HANDLE hProcess );
@@ -107,13 +107,13 @@ EXTERN_C WINBASEAPI DWORD WINAPI GetProcessId( HANDLE hProcess );
 
 inline bool IsValidHandle(HANDLE handle)
 {
-    return  handle != INVALID_HANDLE_VALUE && handle != NULL;
+    return	handle != INVALID_HANDLE_VALUE && handle != NULL;
 }
 
-#else   /* __cplusplus */
+#else	/* __cplusplus */
 
-#define IsValidHandle(Handle)   ((DWORD)(Handle) + 1 > 1)
+#define IsValidHandle(Handle)	((DWORD)(Handle) + 1 > 1)
 
-#endif  /* __cplusplus */
+#endif	/* __cplusplus */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index 302de38d281a..126932447458 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -114,7 +114,7 @@ bool SAL_CALL osl_detail_ObjectRegistry_checkObjectCount(
         nSize = rData.m_addresses.size();
     else
         nSize = static_cast<std::size_t>(rData.m_nCount);
-
+    
     bool const bRet = (nSize == nExpected);
     if (! bRet) {
         rtl::OStringBuffer buf;
diff --git a/sal/osl/all/filepath.c b/sal/osl/all/filepath.c
index 2139a1803fa2..7489b1538351 100644
--- a/sal/osl/all/filepath.c
+++ b/sal/osl/all/filepath.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,16 +37,16 @@ static sal_uInt32 SAL_CALL osl_defCalcTextWidth( rtl_uString *ustrText )
 
 oslFileError SAL_CALL osl_abbreviateSystemPath( rtl_uString *ustrSystemPath, rtl_uString **pustrCompacted, sal_uInt32 uMaxWidth, oslCalcTextWidthFunc pfnCalcWidth )
 {
-    oslFileError    error = osl_File_E_None;
-    rtl_uString     *ustrPath = NULL;
-    rtl_uString     *ustrFile = NULL;
-    sal_uInt32      uPathWidth, uFileWidth;
+    oslFileError	error = osl_File_E_None;
+    rtl_uString		*ustrPath = NULL;
+    rtl_uString		*ustrFile = NULL;
+    sal_uInt32		uPathWidth, uFileWidth;
 
     if ( !pfnCalcWidth )
         pfnCalcWidth = osl_defCalcTextWidth;
 
     {
-        sal_Int32   iLastSlash = rtl_ustr_lastIndexOfChar_WithLength( ustrSystemPath->buffer, ustrSystemPath->length, SAL_PATHDELIMITER );
+        sal_Int32	iLastSlash = rtl_ustr_lastIndexOfChar_WithLength( ustrSystemPath->buffer, ustrSystemPath->length, SAL_PATHDELIMITER );
 
         if ( iLastSlash >= 0 )
         {
diff --git a/sal/osl/all/loadmodulerelative.cxx b/sal/osl/all/loadmodulerelative.cxx
index 341bc56d81a6..3d08754c6ca7 100644
--- a/sal/osl/all/loadmodulerelative.cxx
+++ b/sal/osl/all/loadmodulerelative.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/osl/all/utility.cxx b/sal/osl/all/utility.cxx
index fbb91d7ea318..b183653e119f 100644
--- a/sal/osl/all/utility.cxx
+++ b/sal/osl/all/utility.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,19 +45,19 @@ namespace osl
 
 class OGlobalTimer
 {
-
+    
 public:
-
+    
     OGlobalTimer() {
         getTime();
     }
-
+    
     sal_uInt32 getTime()
     {
         return osl_getGlobalTimer();
     }
 
-
+    
 };
 
 static OGlobalTimer aGlobalTimer;
@@ -65,7 +65,7 @@ static OGlobalTimer aGlobalTimer;
 }
 
 
-extern "C"
+extern "C" 
 {
 void debug_ustring(rtl_uString* ustr)
 {
diff --git a/sal/osl/os2/conditn.c b/sal/osl/os2/conditn.c
index 1982aaab69c1..08b6da69adf3 100644
--- a/sal/osl/os2/conditn.c
+++ b/sal/osl/os2/conditn.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/osl/os2/debug.c b/sal/osl/os2/debug.c
index 3de1ae22ecea..ccf1cc03afb2 100644
--- a/sal/osl/os2/debug.c
+++ b/sal/osl/os2/debug.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -367,7 +367,7 @@ typedef struct _XDEBUGINFO
     char            szNrLine[300];      // receives line number
     //YD 17/07/06 c++ namespace can generate really long
     //YD names, use a large buffer!
-    char            szNrPub[16*1024];   // receives function name
+    char            szNrPub[16*1024]; 	// receives function name
 
     struct new_seg  *pseg;
     struct o32_obj  *pobj;              // flat .EXE object table entry
@@ -1608,7 +1608,7 @@ int dbgPrintSYMInfo(FILE *LogFile,      // in: text log file to write to
     Buffer[MapDef.cbModName] = 0x00;
     fprintf(LogFile,"Module name '%s'\n",Buffer);
 #endif
-
+   
     SegOffset = SEGDEFOFFSET(MapDef);
 #ifdef DEBUG_SYMDUMP
     fprintf(LogFile,"SegOffset %0x\n",SegOffset);
diff --git a/sal/osl/os2/diagnose.c b/sal/osl/os2/diagnose.c
index 538f8d3fb95a..e51306b5cfd2 100644
--- a/sal/osl/os2/diagnose.c
+++ b/sal/osl/os2/diagnose.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -97,7 +97,7 @@ void SAL_CALL osl_trace__yd_os2(const sal_Char* lpszFormat, ...)
     {
         return;
     }
-
+    
     va_start(args, lpszFormat);
 
     nBuf = vsprintf(szBuffer, lpszFormat, args);
diff --git a/sal/osl/os2/dllentry.c b/sal/osl/os2/dllentry.c
index dbea0e13c6e4..8375c35baa2b 100644
--- a/sal/osl/os2/dllentry.c
+++ b/sal/osl/os2/dllentry.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/osl/os2/except.c b/sal/osl/os2/except.c
index ece3c9c6576f..ed8eedca4456 100644
--- a/sal/osl/os2/except.c
+++ b/sal/osl/os2/except.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/osl/os2/file.cxx b/sal/osl/os2/file.cxx
index 7430f0a4c3b7..956e1a621c46 100644
--- a/sal/osl/os2/file.cxx
+++ b/sal/osl/os2/file.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -73,15 +73,15 @@
 
 
 #ifdef DEBUG_OSL_FILE
-#   define PERROR( a, b ) perror( a ); fprintf( stderr, b )
+#	define PERROR( a, b ) perror( a ); fprintf( stderr, b )
 #else
-#   define PERROR( a, b )
+#	define PERROR( a, b )
 #endif
 
 extern "C" oslFileHandle osl_createFileHandleFromFD( int fd );
 
     struct errentry errtable[] = {
-        {  NO_ERROR,             osl_File_E_None     },  /* 0 */
+        {  NO_ERROR,			 osl_File_E_None     },  /* 0 */
         {  ERROR_INVALID_FUNCTION,       osl_File_E_INVAL    },  /* 1 */
         {  ERROR_FILE_NOT_FOUND,         osl_File_E_NOENT    },  /* 2 */
         {  ERROR_PATH_NOT_FOUND,         osl_File_E_NOENT    },  /* 3 */
@@ -130,10 +130,10 @@ extern "C" oslFileHandle osl_createFileHandleFromFD( int fd );
         {  ERROR_DIRECTORY,              osl_File_E_NOENT    },  /* 267 */
         //{  ERROR_NOT_ENOUGH_QUOTA,       osl_File_E_NOMEM    }    /* 1816 */
     };
-
+    
     //#####################################################
     oslFileError MapError(APIRET dwError)
-    {
+    {        
         for (int i = 0; i < SAL_N_ELEMENTS(errtable); ++i )
         {
             if (dwError == errtable[i].oscode)
@@ -187,7 +187,7 @@ rtl_uString*  oslMakeUStrFromPsz(const sal_Char* pszStr,rtl_uString** uStr);
 
 extern "C" int UnicodeToText( char *, size_t, const sal_Unicode *, sal_Int32 );
 extern "C" int TextToUnicode(
-    const char* text, size_t text_buffer_size,  sal_Unicode* unic_text, sal_Int32 unic_text_buffer_size);
+    const char* text, size_t text_buffer_size,	sal_Unicode* unic_text, sal_Int32 unic_text_buffer_size);
 
 /******************************************************************************
  *
@@ -209,9 +209,9 @@ static void           osl_printFloppyHandle(oslVolumeDeviceHandleImpl* hFloppy);
  *********************************************/
 static oslFileError _osl_openLocalRoot( rtl_uString *strDirectoryPath, oslDirectory *pDirectory)
 {
-    rtl_uString     *ustrSystemPath = NULL;
-    oslFileError    error;
-
+    rtl_uString		*ustrSystemPath = NULL;
+    oslFileError	error;
+    
     if ( !pDirectory )
         return osl_File_E_INVAL;
 
@@ -226,14 +226,14 @@ static oslFileError _osl_openLocalRoot( rtl_uString *strDirectoryPath, oslDirect
         if( pDirImpl )
         {
             ULONG   ulDriveNum;
-            APIRET  rc;
+            APIRET  rc;			
             pDirImpl->uType = DIRECTORYTYPE_LOCALROOT;
             pDirImpl->ustrPath = ustrSystemPath;
             rc = DosQueryCurrentDisk (&ulDriveNum, &pDirImpl->ulDriveMap);
             pDirImpl->pDirStruct = 0;
             pDirImpl->ulNextDrive = 1;
             pDirImpl->ulNextDriveMask = 1;
-
+            
             // determine number of floppy-drives
             BYTE nFloppies;
             rc = DosDevConfig( (void*) &nFloppies, DEVINFO_FLOPPY );
@@ -262,17 +262,17 @@ static oslFileError _osl_openLocalRoot( rtl_uString *strDirectoryPath, oslDirect
 /**********************************************
  * _osl_getNextDrive
  *********************************************/
-static oslFileError SAL_CALL _osl_getNextDrive(
+static oslFileError SAL_CALL _osl_getNextDrive( 
     oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint )
 {
-    DirectoryImpl   *pDirImpl = (DirectoryImpl *)Directory;
-    DirectoryItem_Impl  *pItemImpl = NULL;
-    rtl_uString         * ustrDrive = NULL;
-    BOOL                fSuccess;
-    char                buffer[3];
+    DirectoryImpl	*pDirImpl = (DirectoryImpl *)Directory;
+    DirectoryItem_Impl	*pItemImpl = NULL;
+    rtl_uString			* ustrDrive = NULL;
+    BOOL				fSuccess;
+    char				buffer[3];
 
     uHint = uHint; /* avoid warnings */
-
+            
     if ( !pItem )
         return osl_File_E_INVAL;
 
@@ -309,8 +309,8 @@ static oslFileError SAL_CALL _osl_getNextDrive(
         // scan next bit position
         pDirImpl->ulNextDrive++;
         pDirImpl->ulNextDriveMask <<= 1;
-
-        if (*pItem) // item assigned, return now.
+        
+        if (*pItem)	// item assigned, return now.
             return osl_File_E_None;
     }
 
@@ -342,7 +342,7 @@ static struct dirent* _osl_readdir_impl_(DIR* pdir, sal_Bool bFilterLocalAndPare
 }
 
 /*******************************************************************
- *  osl_openDirectory
+ *	osl_openDirectory
  ******************************************************************/
 
 oslFileError SAL_CALL osl_openDirectory(rtl_uString* ustrDirectoryURL, oslDirectory* pDirectory)
@@ -360,7 +360,7 @@ oslFileError SAL_CALL osl_openDirectory(rtl_uString* ustrDirectoryURL, oslDirect
 
     if ( 0 == rtl_ustr_compareIgnoreAsciiCase( ustrDirectoryURL->buffer, (const sal_Unicode*)L"file:///" ) )
         return _osl_openLocalRoot( ustrDirectoryURL, pDirectory );
-
+    
     /* convert file URL to system path */
     eRet = osl_getSystemPathFromFileURL_Ex(ustrDirectoryURL, &ustrSystemPath, sal_False);
 
@@ -411,13 +411,13 @@ oslFileError SAL_CALL osl_openDirectory(rtl_uString* ustrDirectoryURL, oslDirect
 
 
 /****************************************************************************
- *  osl_getNextDirectoryItem
+ *	osl_getNextDirectoryItem
  ***************************************************************************/
 
 oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirectoryItem* pItem, sal_uInt32 uHint)
 {
     DirectoryImpl* pDirImpl     = (DirectoryImpl*)Directory;
-    DirectoryItem_Impl  *pItemImpl = NULL;
+    DirectoryItem_Impl	*pItemImpl = NULL;
     rtl_uString*      ustrFileName = NULL;
     rtl_uString*      ustrFilePath = NULL;
     struct dirent*    pEntry;
@@ -439,7 +439,7 @@ oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirect
     pItemImpl = (DirectoryItem_Impl*) rtl_allocateMemory(sizeof(DirectoryItem_Impl));
     if ( !pItemImpl )
         return osl_File_E_NOMEM;
-
+    
     memset( pItemImpl, 0, sizeof(DirectoryItem_Impl) );
     pItemImpl->uType = DIRECTORYITEM_FILE;
     pItemImpl->nRefCount = 1;
@@ -458,7 +458,7 @@ oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirect
 }
 
 /****************************************************************************/
-/*  osl_closeDirectory */
+/*	osl_closeDirectory */
 /****************************************************************************/
 
 oslFileError SAL_CALL osl_closeDirectory( oslDirectory Directory )
@@ -494,15 +494,15 @@ oslFileError SAL_CALL osl_closeDirectory( oslDirectory Directory )
 }
 
 /****************************************************************************/
-/*  osl_getDirectoryItem */
+/*	osl_getDirectoryItem */
 /****************************************************************************/
 
 oslFileError SAL_CALL osl_getDirectoryItem( rtl_uString* ustrFileURL, oslDirectoryItem* pItem )
 {
-    rtl_uString*    strSysFilePath = NULL;
-    oslFileError    error      = osl_File_E_INVAL;
-    ULONG           dwPathType;
-    PATHTYPE        type = PATHTYPE_FILE;
+    rtl_uString* 	strSysFilePath = NULL;
+    oslFileError 	error      = osl_File_E_INVAL;
+    ULONG			dwPathType;
+    PATHTYPE		type = PATHTYPE_FILE;
 
     OSL_ASSERT(ustrFileURL);
     OSL_ASSERT(pItem);
@@ -533,7 +533,7 @@ oslFileError SAL_CALL osl_getDirectoryItem( rtl_uString* ustrFileURL, oslDirecto
     {
     case PATHTYPE_NETSERVER:
         {
-            DirectoryItem_Impl* pItemImpl =
+            DirectoryItem_Impl*	pItemImpl = 
                 reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
 
             if ( !pItemImpl )
@@ -552,7 +552,7 @@ oslFileError SAL_CALL osl_getDirectoryItem( rtl_uString* ustrFileURL, oslDirecto
         break;
     case PATHTYPE_VOLUME:
         {
-            DirectoryItem_Impl* pItemImpl =
+            DirectoryItem_Impl*	pItemImpl = 
                 reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
 
             if ( !pItemImpl )
@@ -566,7 +566,7 @@ oslFileError SAL_CALL osl_getDirectoryItem( rtl_uString* ustrFileURL, oslDirecto
                 rtl_uString_assign( &pItemImpl->ustrDrive, strSysFilePath );
 
                 if ( pItemImpl->ustrDrive->buffer[pItemImpl->ustrDrive->length-1] != sal_Unicode('\\') )
-                    rtl_uString_newConcat( &pItemImpl->ustrDrive,
+                    rtl_uString_newConcat( &pItemImpl->ustrDrive, 
                                             pItemImpl->ustrDrive, rtl::OUString::createFromAscii( "\\" ).pData);
 
                 *pItem = pItemImpl;
@@ -581,7 +581,7 @@ oslFileError SAL_CALL osl_getDirectoryItem( rtl_uString* ustrFileURL, oslDirecto
 
             if (0 == access_u(strSysFilePath, F_OK))
             {
-                DirectoryItem_Impl  *pItemImpl =
+                DirectoryItem_Impl	*pItemImpl = 
                     reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
 
                 memset( pItemImpl, 0, sizeof(DirectoryItem_Impl) );
@@ -604,13 +604,13 @@ oslFileError SAL_CALL osl_getDirectoryItem( rtl_uString* ustrFileURL, oslDirecto
 }
 
 /****************************************************************************/
-/*  osl_acquireDirectoryItem */
+/*	osl_acquireDirectoryItem */
 /****************************************************************************/
 
 oslFileError osl_acquireDirectoryItem( oslDirectoryItem Item )
 {
     OSL_ASSERT( Item );
-    DirectoryItem_Impl  *pItemImpl = (DirectoryItem_Impl *)Item;
+    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
 
     if ( !pItemImpl )
         return osl_File_E_INVAL;
@@ -620,13 +620,13 @@ oslFileError osl_acquireDirectoryItem( oslDirectoryItem Item )
 }
 
 /****************************************************************************/
-/*  osl_releaseDirectoryItem */
+/*	osl_releaseDirectoryItem */
 /****************************************************************************/
 
 oslFileError osl_releaseDirectoryItem( oslDirectoryItem Item )
 {
     OSL_ASSERT( Item );
-    DirectoryItem_Impl  *pItemImpl = (DirectoryItem_Impl *)Item;
+    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
 
     if ( !pItemImpl )
         return osl_File_E_INVAL;
@@ -643,7 +643,7 @@ oslFileError osl_releaseDirectoryItem( oslDirectoryItem Item )
 }
 
 /****************************************************************************
- *  osl_createFileHandleFromFD
+ *	osl_createFileHandleFromFD
  ***************************************************************************/
 
 oslFileHandle osl_createFileHandleFromFD( int fd )
@@ -669,7 +669,7 @@ oslFileHandle osl_createFileHandleFromFD( int fd )
 }
 
 /****************************************************************************
- *  osl_openFile
+ *	osl_openFile
  ***************************************************************************/
 
 oslFileError osl_openFile( rtl_uString* ustrFileURL, oslFileHandle* pHandle, sal_uInt32 uFlags )
@@ -804,7 +804,7 @@ oslFileError osl_openFile( rtl_uString* ustrFileURL, oslFileHandle* pHandle, sal
 }
 
 /****************************************************************************/
-/*  osl_closeFile */
+/*	osl_closeFile */
 /****************************************************************************/
 
 oslFileError osl_closeFile( oslFileHandle Handle )
@@ -852,7 +852,7 @@ oslFileError osl_closeFile( oslFileHandle Handle )
 }
 
 /****************************************************************************/
-/*  osl_isEndOfFile */
+/*	osl_isEndOfFile */
 /****************************************************************************/
 
 oslFileError SAL_CALL osl_isEndOfFile( oslFileHandle Handle, sal_Bool *pIsEOF )
@@ -890,7 +890,7 @@ oslFileError SAL_CALL osl_isEndOfFile( oslFileHandle Handle, sal_Bool *pIsEOF )
 
 
 /****************************************************************************/
-/*  osl_moveFile */
+/*	osl_moveFile */
 /****************************************************************************/
 
 oslFileError osl_moveFile( rtl_uString* ustrFileURL, rtl_uString* ustrDestURL )
@@ -925,7 +925,7 @@ oslFileError osl_moveFile( rtl_uString* ustrFileURL, rtl_uString* ustrDestURL )
 }
 
 /****************************************************************************/
-/*  osl_copyFile */
+/*	osl_copyFile */
 /****************************************************************************/
 
 #define TMP_DEST_FILE_EXTENSION ".osl-tmp"
@@ -938,7 +938,7 @@ static oslFileError oslDoCopy(const sal_Char* pszSourceFileName, const sal_Char*
 
     /* Quick fix for #106048, the whole copy file function seems
        to be erroneous anyway and needs to be rewritten.
-       Besides osl_copyFile is currently not used from OO/SO code.
+       Besides osl_copyFile	is currently not used from OO/SO code.
     */
     memset(pszTmpDestFile, 0, size_tmp_dest_buff);
 
@@ -1074,20 +1074,20 @@ static int oslDoCopyLink(const sal_Char* pszSourceFileName, const sal_Char* pszD
  ****************************************/
 
 static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, size_t nSourceSize, mode_t mode)
-{
+{    
     int SourceFileFD=0;
     int DestFileFD=0;
     int nRet=0;
     void* pSourceFile=0;
-    char    buffer[ 4096];
+    char	buffer[ 4096];
 
     SourceFileFD=open(pszSourceFileName,O_RDONLY | O_BINARY);
     if ( SourceFileFD < 0 )
-    {
+    {		
         nRet=errno;
         return nRet;
     }
-
+    
     DestFileFD=open(pszDestFileName, O_WRONLY | O_CREAT | O_BINARY, mode);
     if ( DestFileFD < 0 )
     {
@@ -1096,20 +1096,20 @@ static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszD
         return nRet;
     }
 
-    /* HACK: because memory mapping fails on various
+    /* HACK: because memory mapping fails on various 
        platforms if the size of the source file is  0 byte */
     if (0 == nSourceSize)
-    {
+    {						
         close(SourceFileFD);
         close(DestFileFD);
         return 0;
     }
-
+    
     while( (nRet = read(SourceFileFD, buffer, sizeof(buffer))) !=0 )
     {
         nRet = write( DestFileFD, buffer, nRet);
     }
-
+    
     close(SourceFileFD);
     close(DestFileFD);
 
@@ -1214,7 +1214,7 @@ oslFileError osl_copyFile( rtl_uString* ustrFileURL, rtl_uString* ustrDestURL )
 }
 
 /****************************************************************************/
-/*  osl_removeFile */
+/*	osl_removeFile */
 /****************************************************************************/
 
 oslFileError osl_removeFile( rtl_uString* ustrFileURL )
@@ -1240,7 +1240,7 @@ oslFileError osl_removeFile( rtl_uString* ustrFileURL )
 }
 
 /****************************************************************************/
-/*  osl_getVolumeInformation */
+/*	osl_getVolumeInformation */
 /****************************************************************************/
 
 #define TXFSDC_BLOCKR         0x00              // block device removable
@@ -1417,19 +1417,19 @@ BOOL TxFsIsRemovable                            // RET   drive is removable
 
 static oslFileError get_drive_type(const char* path, oslVolumeInfo* pInfo)
 {
-    char        Drive_Letter = toupper( *path);
-    char        fstype[ 64];
+    char		Drive_Letter = toupper( *path);
+    char		fstype[ 64];
 
-    pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
+    pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;		
 
     // check for floppy A/B
-    BYTE    nFloppies;
-    APIRET  rc;
+    BYTE 	nFloppies;
+    APIRET	rc;
     rc = DosDevConfig( (void*) &nFloppies, DEVINFO_FLOPPY );
     if ((Drive_Letter - 'A') < nFloppies) {
         pInfo->uAttributes |= osl_Volume_Attribute_Removeable;
         pInfo->uAttributes |= osl_Volume_Attribute_FloppyDisk;
-        return osl_File_E_None;
+        return osl_File_E_None;    
     }
 
     // query system for CD drives
@@ -1446,31 +1446,31 @@ static oslFileError get_drive_type(const char* path, oslVolumeInfo* pInfo)
     if (TxFsType( (char*)path, fstype, NULL) == FALSE) {
         // query failed, assume fixed disk
         pInfo->uAttributes |= osl_Volume_Attribute_FixedDisk;
-        return osl_File_E_None;
+        return osl_File_E_None;    
     }
 
     //- Note, connected Win-NT drives use the REAL FS-name like NTFS!
-    if ((strncasecmp( fstype, "LAN", 3) == 0)           //- OS/2 LAN drives
-        || (strncasecmp( fstype, "NDFS", 4) == 0)   //- NetDrive
+    if ((strncasecmp( fstype, "LAN", 3) == 0) 			//- OS/2 LAN drives
+        || (strncasecmp( fstype, "NDFS", 4) == 0)  	//- NetDrive
         || (strncasecmp( fstype, "REMOTE", 5) == 0)  )  //- NT disconnected
         pInfo->uAttributes |= osl_Volume_Attribute_Remote;
     else if (strncasecmp( fstype, "RAMFS", 5) == 0)
         pInfo->uAttributes |= osl_Volume_Attribute_RAMDisk;
-    else if ((strncasecmp( fstype, "CD",  2) == 0)      // OS2:CDFS, DOS/WIN:CDROM
-        || (strncasecmp( fstype, "UDF", 3) == 0)   )    // OS2:UDF DVD's
+    else if ((strncasecmp( fstype, "CD",  2) == 0)	 	// OS2:CDFS, DOS/WIN:CDROM
+        || (strncasecmp( fstype, "UDF", 3) == 0)   ) 	// OS2:UDF DVD's
         pInfo->uAttributes |= osl_Volume_Attribute_CompactDisc | osl_Volume_Attribute_Removeable;
     else
         pInfo->uAttributes |= osl_Volume_Attribute_FixedDisk;
 
-    return osl_File_E_None;
+    return osl_File_E_None;    
 }
 
 //#############################################
 inline bool is_volume_space_info_request(sal_uInt32 field_mask)
 {
-    return (field_mask &
-            (osl_VolumeInfo_Mask_TotalSpace |
-             osl_VolumeInfo_Mask_UsedSpace  |
+    return (field_mask & 
+            (osl_VolumeInfo_Mask_TotalSpace | 
+             osl_VolumeInfo_Mask_UsedSpace  | 
              osl_VolumeInfo_Mask_FreeSpace));
 }
 
@@ -1487,14 +1487,14 @@ static void get_volume_space_information(const char* path, oslVolumeInfo *pInfo)
     // enable error popups
     DosError(FERR_ENABLEHARDERR);
     if (!rc)
-    {
+    {			    			    
         uint64_t aBytesPerCluster( uint64_t(aFSInfoBuf.cbSector) *
                                  uint64_t(aFSInfoBuf.cSectorUnit) );
         pInfo->uFreeSpace = aBytesPerCluster * uint64_t(aFSInfoBuf.cUnitAvail);
         pInfo->uTotalSpace = aBytesPerCluster * uint64_t(aFSInfoBuf.cUnit);
         pInfo->uUsedSpace    = pInfo->uTotalSpace - pInfo->uFreeSpace;
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_TotalSpace |
-                               osl_VolumeInfo_Mask_UsedSpace |
+        pInfo->uValidFields |= osl_VolumeInfo_Mask_TotalSpace | 
+                               osl_VolumeInfo_Mask_UsedSpace | 
                                osl_VolumeInfo_Mask_FreeSpace;
     }
 }
@@ -1502,10 +1502,10 @@ static void get_volume_space_information(const char* path, oslVolumeInfo *pInfo)
 //#############################################
 inline bool is_filesystem_attributes_request(sal_uInt32 field_mask)
 {
-    return (field_mask &
-            (osl_VolumeInfo_Mask_MaxNameLength |
-             osl_VolumeInfo_Mask_MaxPathLength |
-             osl_VolumeInfo_Mask_FileSystemName |
+    return (field_mask & 
+            (osl_VolumeInfo_Mask_MaxNameLength | 
+             osl_VolumeInfo_Mask_MaxPathLength | 
+             osl_VolumeInfo_Mask_FileSystemName | 
              osl_VolumeInfo_Mask_FileSystemCaseHandling));
 }
 
@@ -1525,18 +1525,18 @@ typedef struct _FSQBUFFER_
 static oslFileError get_filesystem_attributes(const char* path, sal_uInt32 field_mask, oslVolumeInfo* pInfo)
 {
     pInfo->uAttributes = 0;
-
+    
     oslFileError osl_error = osl_File_E_None;
-
+    
     // osl_get_drive_type must be called first because
     // this function resets osl_VolumeInfo_Mask_Attributes
     // on failure
     if (is_drivetype_request(field_mask))
         osl_error = get_drive_type(path, pInfo);
-
+            
     if ((osl_File_E_None == osl_error) && is_filesystem_attributes_request(field_mask))
     {
-        FSQBUFFER_  aBuf;
+        FSQBUFFER_	aBuf;
         ULONG       nBufLen;
         APIRET      nRet;
 
@@ -1549,7 +1549,7 @@ static oslFileError get_filesystem_attributes(const char* path, sal_uInt32 field
             char *pType = (char*)(aBuf.aBuf.szName + aBuf.aBuf.cbName + 1);
             pInfo->uValidFields   |= osl_VolumeInfo_Mask_MaxNameLength;
             pInfo->uMaxNameLength  = _MAX_FNAME;
-
+        
             pInfo->uValidFields   |= osl_VolumeInfo_Mask_MaxPathLength;
             pInfo->uMaxPathLength  = _MAX_PATH;
 
@@ -1559,7 +1559,7 @@ static oslFileError get_filesystem_attributes(const char* path, sal_uInt32 field
             // case is preserved always except for FAT
             if (strcmp( pType, "FAT" ))
                 pInfo->uAttributes |= osl_Volume_Attribute_Case_Is_Preserved;
-
+                
             pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
         }
         // enable error popups
@@ -1585,11 +1585,11 @@ oslFileError SAL_CALL osl_getVolumeInformation( rtl_uString* ustrDirectoryURL, o
         return osl_File_E_INVAL;
 
     pInfo->uValidFields = 0;
-
+    
     if ((error = get_filesystem_attributes(volume_root, uFieldMask, pInfo)) != osl_File_E_None)
         return error;
 
-    if (is_volume_space_info_request(uFieldMask))
+    if (is_volume_space_info_request(uFieldMask)) 
         get_volume_space_information(volume_root, pInfo);
 
     if (uFieldMask & osl_VolumeInfo_Mask_DeviceHandle)
@@ -1605,14 +1605,14 @@ oslFileError SAL_CALL osl_getVolumeInformation( rtl_uString* ustrDirectoryURL, o
 }
 
 /****************************************************************************/
-/*  osl_getFileStatus */
+/*	osl_getFileStatus */
 /****************************************************************************/
 static oslFileError _osl_getDriveInfo(
     oslDirectoryItem Item, oslFileStatus *pStatus, sal_uInt32 uFieldMask)
 {
-    DirectoryItem_Impl  *pItemImpl = (DirectoryItem_Impl *)Item;
-    sal_Unicode         cDrive[3];
-    sal_Unicode         cRoot[4];
+    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
+    sal_Unicode			cDrive[3];
+    sal_Unicode			cRoot[4];
 
     if ( !pItemImpl )
         return osl_File_E_INVAL;
@@ -1631,11 +1631,11 @@ static oslFileError _osl_getDriveInfo(
         if ( pItemImpl->ustrDrive->buffer[0] == '\\' &&
             pItemImpl->ustrDrive->buffer[1] == '\\' )
         {
-            LPCWSTR lpFirstBkSlash = wcschr( (const wchar_t*)&pItemImpl->ustrDrive->buffer[2], '\\' );
+            LPCWSTR	lpFirstBkSlash = wcschr( (const wchar_t*)&pItemImpl->ustrDrive->buffer[2], '\\' );
 
             if ( lpFirstBkSlash && lpFirstBkSlash[1] )
             {
-                LPCWSTR lpLastBkSlash = wcschr( (const wchar_t*)&lpFirstBkSlash[1], '\\' );
+                LPCWSTR	lpLastBkSlash = wcschr( (const wchar_t*)&lpFirstBkSlash[1], '\\' );
 
                 if ( lpLastBkSlash )
                     rtl_uString_newFromStr_WithLength( &pStatus->ustrFileName, (sal_Unicode*)&lpFirstBkSlash[1], lpLastBkSlash - lpFirstBkSlash - 1 );
@@ -1644,12 +1644,12 @@ static oslFileError _osl_getDriveInfo(
                 pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
             }
         }
-        else
+        else 
         {
-            FSINFO  aFSInfoBuf;
+            FSINFO	aFSInfoBuf;
             ULONG   ulFSInfoLevel = FSIL_VOLSER;
             ULONG   nDriveNumber;
-            char    szFileName[ _MAX_PATH];
+            char	szFileName[ _MAX_PATH];
 
             nDriveNumber = toupper(*cDrive) - 'A' + 1;
             memset( &aFSInfoBuf, 0, sizeof(FSINFO) );
@@ -1675,7 +1675,7 @@ static oslFileError _osl_getDriveInfo(
 
     if ( uFieldMask & osl_FileStatus_Mask_FileURL )
     {
-        rtl_uString *ustrSystemPath = NULL;
+        rtl_uString	*ustrSystemPath = NULL;
 
         rtl_uString_newFromStr( &ustrSystemPath, pItemImpl->ustrDrive->buffer );
         osl_getFileURLFromSystemPath( ustrSystemPath, &pStatus->ustrFileURL );
@@ -1686,12 +1686,12 @@ static oslFileError _osl_getDriveInfo(
     return osl_File_E_None;
 }
 
-oslFileError SAL_CALL osl_getFileStatus(
-    oslDirectoryItem Item,
-    oslFileStatus *pStatus,
+oslFileError SAL_CALL osl_getFileStatus( 
+    oslDirectoryItem Item, 
+    oslFileStatus *pStatus, 
     sal_uInt32 uFieldMask )
 {
-    DirectoryItem_Impl  *pItemImpl = (DirectoryItem_Impl *)Item;
+    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
     struct stat file_stat;
 
     if ( !pItemImpl )
@@ -1703,7 +1703,7 @@ oslFileError SAL_CALL osl_getFileStatus(
     osl::lstat(pItemImpl->ustrFilePath, file_stat);
     if ( uFieldMask & osl_FileStatus_Mask_Validate )
     {
-        uFieldMask &= ~ osl_FileStatus_Mask_Validate;
+        uFieldMask &= ~	osl_FileStatus_Mask_Validate;
     }
 
     /* If no fields to retrieve left ignore pStatus */
@@ -1747,21 +1747,21 @@ oslFileError SAL_CALL osl_getFileStatus(
     osl_systemPathGetFileNameOrLastDirectoryPart(pItemImpl->ustrFilePath, &pStatus->ustrFileName);
     pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
 
-    if (S_ISLNK(file_stat.st_mode))
-       pStatus->eType = osl_File_Type_Link;
-    else if (S_ISDIR(file_stat.st_mode))
-       pStatus->eType = osl_File_Type_Directory;
-    else if (S_ISREG(file_stat.st_mode))
+    if (S_ISLNK(file_stat.st_mode)) 
+       pStatus->eType = osl_File_Type_Link;              
+    else if (S_ISDIR(file_stat.st_mode))                	   
+       pStatus->eType = osl_File_Type_Directory;       
+    else if (S_ISREG(file_stat.st_mode))       
        pStatus->eType = osl_File_Type_Regular;
-    else if (S_ISFIFO(file_stat.st_mode))
-       pStatus->eType = osl_File_Type_Fifo;
-    else if (S_ISSOCK(file_stat.st_mode))
-       pStatus->eType = osl_File_Type_Socket;
-    else if (S_ISCHR(file_stat.st_mode) || S_ISBLK(file_stat.st_mode))
-       pStatus->eType = osl_File_Type_Special;
-    else
+    else if (S_ISFIFO(file_stat.st_mode)) 
+       pStatus->eType = osl_File_Type_Fifo;      
+    else if (S_ISSOCK(file_stat.st_mode)) 
+       pStatus->eType = osl_File_Type_Socket;       
+    else if (S_ISCHR(file_stat.st_mode) || S_ISBLK(file_stat.st_mode))        
+       pStatus->eType = osl_File_Type_Special;    
+    else 
        pStatus->eType = osl_File_Type_Unknown;
-
+        
     pStatus->uValidFields |= osl_FileStatus_Mask_Type;
 
     pStatus->uAttributes = pItemImpl->d_attr;
@@ -1772,7 +1772,7 @@ oslFileError SAL_CALL osl_getFileStatus(
 
     if ( uFieldMask & osl_FileStatus_Mask_LinkTargetURL )
     {
-        rtl_uString *ustrFullPath = NULL;
+        rtl_uString	*ustrFullPath = NULL;
 
         rtl_uString_newFromStr( &ustrFullPath, rtl_uString_getStr(pItemImpl->ustrFilePath) );
         osl_getFileURLFromSystemPath( ustrFullPath, &pStatus->ustrLinkTargetURL );
@@ -1783,7 +1783,7 @@ oslFileError SAL_CALL osl_getFileStatus(
 
     if ( uFieldMask & osl_FileStatus_Mask_FileURL )
     {
-        rtl_uString *ustrFullPath = NULL;
+        rtl_uString	*ustrFullPath = NULL;
 
         rtl_uString_newFromStr( &ustrFullPath, rtl_uString_getStr(pItemImpl->ustrFilePath) );
         osl_getFileURLFromSystemPath( ustrFullPath, &pStatus->ustrFileURL );
@@ -1795,7 +1795,7 @@ oslFileError SAL_CALL osl_getFileStatus(
 }
 
 /****************************************************************************/
-/*  osl_createDirectory */
+/*	osl_createDirectory */
 /****************************************************************************/
 
 oslFileError osl_createDirectory( rtl_uString* ustrDirectoryURL )
@@ -1812,7 +1812,7 @@ oslFileError osl_createDirectory( rtl_uString* ustrDirectoryURL )
         return eRet;
 
     rc = DosCreateDir( (PCSZ)path, NULL);
-    if (rc == ERROR_ACCESS_DENIED)
+    if (rc == ERROR_ACCESS_DENIED) 
        rc=ERROR_FILE_EXISTS;
 
     if (!rc)
@@ -1824,7 +1824,7 @@ oslFileError osl_createDirectory( rtl_uString* ustrDirectoryURL )
 }
 
 /****************************************************************************/
-/*  osl_removeDirectory */
+/*	osl_removeDirectory */
 /****************************************************************************/
 
 oslFileError osl_removeDirectory( rtl_uString* ustrDirectoryURL )
@@ -1853,7 +1853,7 @@ oslFileError osl_removeDirectory( rtl_uString* ustrDirectoryURL )
 int path_make_parent(sal_Unicode* path)
 {
     int i = rtl_ustr_lastIndexOfChar(path, '/');
-
+    
     if (i > 0)
     {
         *(path + i) = 0;
@@ -1866,19 +1866,19 @@ int path_make_parent(sal_Unicode* path)
 //#############################################
 int create_dir_with_callback(
     sal_Unicode* directory_path,
-    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
+    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
     void* pData)
 {
     int mode = S_IRWXU | S_IRWXG | S_IRWXO;
-
+    
     if (osl::mkdir(directory_path, mode) == 0)
     {
         if (aDirectoryCreationCallbackFunc)
         {
-            rtl::OUString url;
-            osl::FileBase::getFileURLFromSystemPath(directory_path, url);
+            rtl::OUString url;                
+            osl::FileBase::getFileURLFromSystemPath(directory_path, url);                                
             aDirectoryCreationCallbackFunc(pData, url.pData);
-        }
+        }                
         return 0;
     }
     return errno;
@@ -1887,63 +1887,63 @@ int create_dir_with_callback(
 //#############################################
 oslFileError create_dir_recursively_(
     sal_Unicode* dir_path,
-    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
+    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
     void* pData)
-{
+{   
     OSL_PRECOND((rtl_ustr_getLength(dir_path) > 0) && ((dir_path + (rtl_ustr_getLength(dir_path) - 1)) != (dir_path + rtl_ustr_lastIndexOfChar(dir_path, '/'))), \
     "Path must not end with a slash");
-
+         
     int native_err = create_dir_with_callback(
         dir_path, aDirectoryCreationCallbackFunc, pData);
-
-    if (native_err == 0)
+        
+    if (native_err == 0)    
         return osl_File_E_None;
-
+                        
     if (native_err != ENOENT)
         return oslTranslateFileError(OSL_FET_ERROR, native_err);
-
+    
     // we step back until '/a_dir' at maximum because
     // we should get an error unequal ENOENT when
-    // we try to create 'a_dir' at '/' and would so
-    // return before
+    // we try to create 'a_dir' at '/' and would so 
+    // return before	    
     int pos = path_make_parent(dir_path);
-
+                    
     oslFileError osl_error = create_dir_recursively_(
         dir_path, aDirectoryCreationCallbackFunc, pData);
-
+                    
     if (osl_File_E_None != osl_error)
         return osl_error;
-
+                    
        dir_path[pos] = '/';
-
-    return create_dir_recursively_(dir_path, aDirectoryCreationCallbackFunc, pData);
+                               
+    return create_dir_recursively_(dir_path, aDirectoryCreationCallbackFunc, pData);     
 }
 
 //#######################################
 oslFileError SAL_CALL osl_createDirectoryPath(
-    rtl_uString* aDirectoryUrl,
+    rtl_uString* aDirectoryUrl, 
     oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
     void* pData)
 {
     if (aDirectoryUrl == NULL)
         return osl_File_E_INVAL;
-
-    rtl::OUString sys_path;
+    
+    rtl::OUString sys_path;         
     oslFileError osl_error = osl_getSystemPathFromFileURL_Ex(
-        aDirectoryUrl, &sys_path.pData, sal_False);
-
+        aDirectoryUrl, &sys_path.pData, sal_False);        
+    
     if (osl_error != osl_File_E_None)
         return osl_error;
-
+                                                                
     osl::systemPathRemoveSeparator(sys_path);
-
-    // const_cast because sys_path is a local copy which we want to modify inplace instead of
+    
+    // const_cast because sys_path is a local copy which we want to modify inplace instead of 
     // coyp it into another buffer on the heap again
-    return create_dir_recursively_(sys_path.pData->buffer, aDirectoryCreationCallbackFunc, pData);
+    return create_dir_recursively_(sys_path.pData->buffer, aDirectoryCreationCallbackFunc, pData);			
 }
 
 /****************************************************************************/
-/*  osl_getCanonicalName */
+/*	osl_getCanonicalName */
 /****************************************************************************/
 
 oslFileError osl_getCanonicalName( rtl_uString* ustrFileURL, rtl_uString** pustrValidURL )
@@ -1956,7 +1956,7 @@ oslFileError osl_getCanonicalName( rtl_uString* ustrFileURL, rtl_uString** pustr
 
 
 /****************************************************************************/
-/*  osl_setFileAttributes */
+/*	osl_setFileAttributes */
 /****************************************************************************/
 
 oslFileError osl_setFileAttributes( rtl_uString* ustrFileURL, sal_uInt64 uAttributes )
@@ -1973,7 +1973,7 @@ oslFileError osl_setFileAttributes( rtl_uString* ustrFileURL, sal_uInt64 uAttrib
     eRet = FileURLToPath( path, PATH_MAX, ustrFileURL );
     if( eRet != osl_File_E_None )
         return eRet;
-
+ 
     /* query current attributes */
     rc = DosQueryPathInfo( (PCSZ)path, FIL_STANDARD, &fsts3ConfigInfo, ulBufSize);
     if (rc != NO_ERROR)
@@ -1996,7 +1996,7 @@ oslFileError osl_setFileAttributes( rtl_uString* ustrFileURL, sal_uInt64 uAttrib
 }
 
 /****************************************************************************/
-/*  osl_setFileTime */
+/*	osl_setFileTime */
 /****************************************************************************/
 
 oslFileError osl_setFileTime( rtl_uString* ustrFileURL, const TimeValue* pCreationTime,
@@ -2034,7 +2034,7 @@ oslFileError osl_readFile(oslFileHandle Handle, void* pBuffer, sal_uInt64 uBytes
 
     if ((0 == pHandleImpl) || (pHandleImpl->fd < 0) || (0 == pBuffer) || (0 == pBytesRead))
         return osl_File_E_INVAL;
-
+    
     nBytes = read(pHandleImpl->fd, pBuffer, uBytesRequested);
 
     if (-1 == nBytes)
@@ -2168,11 +2168,11 @@ oslFileError osl_getFilePos( oslFileHandle Handle, sal_uInt64* pPos )
 }
 
 /****************************************************************************
- *  osl_getFileSize
+ *	osl_getFileSize
  ****************************************************************************/
 
 oslFileError osl_getFileSize( oslFileHandle Handle, sal_uInt64* pSize )
-{
+{	
     oslFileHandleImpl* pHandleImpl=(oslFileHandleImpl*) Handle;
     if (pHandleImpl == 0)
         return osl_File_E_INVAL;
@@ -2277,13 +2277,13 @@ oslFileError osl_setFileSize( oslFileHandle Handle, sal_uInt64 uSize )
 oslFileError SAL_CALL osl_syncFile(oslFileHandle Handle)
 {
     oslFileHandleImpl* handle_impl = (oslFileHandleImpl*)Handle;
-
+    
     if (handle_impl == 0)
         return osl_File_E_INVAL;
-
+    
     if (fsync(handle_impl->fd) == -1)
         return oslTranslateFileError(OSL_FET_ERROR, errno);
-
+    
     return osl_File_E_None;
 }
 
@@ -2296,58 +2296,58 @@ oslFileError SAL_CALL osl_syncFile(oslFileHandle Handle)
 #ifdef HAVE_STATFS_H
 
 #if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX)
-#   define __OSL_STATFS_STRUCT                  struct statfs
-#   define __OSL_STATFS(dir, sfs)               statfs((dir), (sfs))
-#   define __OSL_STATFS_BLKSIZ(a)               ((sal_uInt64)((a).f_bsize))
-#   define __OSL_STATFS_TYPENAME(a)             ((a).f_fstypename)
-#   define __OSL_STATFS_ISREMOTE(a)             (((a).f_type & MNT_LOCAL) == 0)
+#   define __OSL_STATFS_STRUCT      			struct statfs
+#   define __OSL_STATFS(dir, sfs)   			statfs((dir), (sfs))
+#   define __OSL_STATFS_BLKSIZ(a)   			((sal_uInt64)((a).f_bsize))
+#   define __OSL_STATFS_TYPENAME(a) 			((a).f_fstypename)
+#   define __OSL_STATFS_ISREMOTE(a) 			(((a).f_type & MNT_LOCAL) == 0)
 
 /* always return true if queried for the properties of
    the file system. If you think this is wrong under any
    of the target platforms fix it!!!! */
-#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  (1)
-#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
+#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
+#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
 #endif /* FREEBSD || NETBSD */
 
 #if defined(LINUX)
-#   define __OSL_NFS_SUPER_MAGIC                 0x6969
-#   define __OSL_SMB_SUPER_MAGIC                 0x517B
-#   define __OSL_MSDOS_SUPER_MAGIC               0x4d44
-#   define __OSL_NTFS_SUPER_MAGIC                0x5346544e
-#   define __OSL_STATFS_STRUCT                   struct statfs
-#   define __OSL_STATFS(dir, sfs)                statfs((dir), (sfs))
-#   define __OSL_STATFS_BLKSIZ(a)                ((sal_uInt64)((a).f_bsize))
-#   define __OSL_STATFS_IS_NFS(a)                (__OSL_NFS_SUPER_MAGIC == (a).f_type)
-#   define __OSL_STATFS_IS_SMB(a)                (__OSL_SMB_SUPER_MAGIC == (a).f_type)
-#   define __OSL_STATFS_ISREMOTE(a)              (__OSL_STATFS_IS_NFS((a)) || __OSL_STATFS_IS_SMB((a)))
-#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type) && (__OSL_NTFS_SUPER_MAGIC != (a).f_type))
-#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type))
+#	define __OSL_NFS_SUPER_MAGIC				 0x6969
+#	define __OSL_SMB_SUPER_MAGIC				 0x517B
+#	define __OSL_MSDOS_SUPER_MAGIC  			 0x4d44
+#	define __OSL_NTFS_SUPER_MAGIC				 0x5346544e
+#   define __OSL_STATFS_STRUCT       		     struct statfs
+#   define __OSL_STATFS(dir, sfs)    			 statfs((dir), (sfs))
+#   define __OSL_STATFS_BLKSIZ(a)    			 ((sal_uInt64)((a).f_bsize))
+#   define __OSL_STATFS_IS_NFS(a)     			 (__OSL_NFS_SUPER_MAGIC == (a).f_type) 
+#   define __OSL_STATFS_IS_SMB(a)     			 (__OSL_SMB_SUPER_MAGIC == (a).f_type) 
+#   define __OSL_STATFS_ISREMOTE(a)  			 (__OSL_STATFS_IS_NFS((a)) || __OSL_STATFS_IS_SMB((a)))
+#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type) && (__OSL_NTFS_SUPER_MAGIC != (a).f_type))
+#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type))
 #endif /* LINUX */
 
 #if defined(SOLARIS)
-#   define __OSL_STATFS_STRUCT                   struct statvfs
-#   define __OSL_STATFS(dir, sfs)                statvfs((dir), (sfs))
-#   define __OSL_STATFS_BLKSIZ(a)                ((sal_uInt64)((a).f_frsize))
-#   define __OSL_STATFS_TYPENAME(a)              ((a).f_basetype)
-#   define __OSL_STATFS_ISREMOTE(a)              (rtl_str_compare((a).f_basetype, "nfs") == 0)
+#   define __OSL_STATFS_STRUCT          		 struct statvfs
+#   define __OSL_STATFS(dir, sfs)	    		 statvfs((dir), (sfs))
+#   define __OSL_STATFS_BLKSIZ(a)       		 ((sal_uInt64)((a).f_frsize))
+#   define __OSL_STATFS_TYPENAME(a)     		 ((a).f_basetype)
+#   define __OSL_STATFS_ISREMOTE(a)     		 (rtl_str_compare((a).f_basetype, "nfs") == 0)
 
 /* always return true if queried for the properties of
    the file system. If you think this is wrong under any
    of the target platforms fix it!!!! */
-#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  (1)
-#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
+#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
+#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
 #endif /* SOLARIS */
 
-#   define __OSL_STATFS_INIT(a)         (memset(&(a), 0, sizeof(__OSL_STATFS_STRUCT)))
+#   define __OSL_STATFS_INIT(a) 	    (memset(&(a), 0, sizeof(__OSL_STATFS_STRUCT)))
 
 #else /* no statfs available */
 
-#   define __OSL_STATFS_STRUCT                   struct dummy {int i;}
-#   define __OSL_STATFS_INIT(a)                  ((void)0)
-#   define __OSL_STATFS(dir, sfs)                (1)
-#   define __OSL_STATFS_ISREMOTE(sfs)            (0)
-#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  (1)
-#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
+#   define __OSL_STATFS_STRUCT        			 struct dummy {int i;}
+#   define __OSL_STATFS_INIT(a)       			 ((void)0)
+#   define __OSL_STATFS(dir, sfs)     		     (1)
+#   define __OSL_STATFS_ISREMOTE(sfs) 			 (0)
+#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
+#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
 #endif /* HAVE_STATFS_H */
 
 
@@ -2356,46 +2356,46 @@ static oslFileError osl_psz_getVolumeInformation (
 {
     __OSL_STATFS_STRUCT sfs;
 
-    if (!pInfo)
+    if (!pInfo)   
         return osl_File_E_INVAL;
-
+    
     __OSL_STATFS_INIT(sfs);
-
+    
     pInfo->uValidFields = 0;
     pInfo->uAttributes  = 0;
-
+    
     if ((__OSL_STATFS(pszDirectory, &sfs)) < 0)
-    {
-        oslFileError result = oslTranslateFileError(OSL_FET_ERROR, errno);
+    {	
+        oslFileError result = oslTranslateFileError(OSL_FET_ERROR, errno);		
         return (result);
     }
 
     /* FIXME: how to detect the kind of storage (fixed, cdrom, ...) */
     if (uFieldMask & osl_VolumeInfo_Mask_Attributes)
-    {
+    {	
         if (__OSL_STATFS_ISREMOTE(sfs))
             pInfo->uAttributes  |= osl_Volume_Attribute_Remote;
-
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
+                        
+        pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;	
     }
 
     if (uFieldMask & osl_VolumeInfo_Mask_FileSystemCaseHandling)
     {
         if (__OSL_STATFS_IS_CASE_SENSITIVE_FS(sfs))
             pInfo->uAttributes |= osl_Volume_Attribute_Case_Sensitive;
-
+        
         if (__OSL_STATFS_IS_CASE_PRESERVING_FS(sfs))
             pInfo->uAttributes |= osl_Volume_Attribute_Case_Is_Preserved;
-
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
+            
+        pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;	
     }
-
+    
     pInfo->uTotalSpace = 0;
     pInfo->uFreeSpace  = 0;
     pInfo->uUsedSpace  = 0;
-
+    
 #if defined(__OSL_STATFS_BLKSIZ)
-
+    
     if ((uFieldMask & osl_VolumeInfo_Mask_TotalSpace) ||
         (uFieldMask & osl_VolumeInfo_Mask_UsedSpace))
     {
@@ -2403,29 +2403,29 @@ static oslFileError osl_psz_getVolumeInformation (
         pInfo->uTotalSpace  *= (sal_uInt64)(sfs.f_blocks);
         pInfo->uValidFields |= osl_VolumeInfo_Mask_TotalSpace;
     }
-
+    
     if ((uFieldMask & osl_VolumeInfo_Mask_FreeSpace) ||
         (uFieldMask & osl_VolumeInfo_Mask_UsedSpace))
     {
         pInfo->uFreeSpace = __OSL_STATFS_BLKSIZ(sfs);
-
-        if (getuid() == 0)
+        
+        if (getuid() == 0)		
             pInfo->uFreeSpace *= (sal_uInt64)(sfs.f_bfree);
-        else
+        else			
             pInfo->uFreeSpace *= (sal_uInt64)(sfs.f_bavail);
-
+    
         pInfo->uValidFields |= osl_VolumeInfo_Mask_FreeSpace;
     }
 
 #endif  /* __OSL_STATFS_BLKSIZ */
-
+    
     if ((pInfo->uValidFields & osl_VolumeInfo_Mask_TotalSpace) &&
         (pInfo->uValidFields & osl_VolumeInfo_Mask_FreeSpace ))
     {
         pInfo->uUsedSpace    = pInfo->uTotalSpace - pInfo->uFreeSpace;
         pInfo->uValidFields |= osl_VolumeInfo_Mask_UsedSpace;
     }
-
+    
     pInfo->uMaxNameLength = 0;
     if (uFieldMask & osl_VolumeInfo_Mask_MaxNameLength)
     {
@@ -2459,17 +2459,17 @@ static oslFileError osl_psz_getVolumeInformation (
             osl_getThreadTextEncoding(),
             OUSTRING_TO_OSTRING_CVTFLAGS);
         OSL_ASSERT(pInfo->ustrFileSystemName != 0);
-
+            
         pInfo->uValidFields |= osl_VolumeInfo_Mask_FileSystemName;
     }
-
+    
 #endif /* __OSL_STATFS_TYPENAME */
-
+    
     if (uFieldMask & osl_VolumeInfo_Mask_DeviceHandle)
     {
         /* FIXME: check also entries in mntent for the device
            and fill it with correct values */
-
+        
         *pInfo->pDeviceHandle = osl_isFloppyDrive(pszDirectory);
 
         if (*pInfo->pDeviceHandle)
@@ -2805,24 +2805,24 @@ oslFileError osl_releaseVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
     }
 
     --pItem->RefCount;
-
+    
     if ( pItem->RefCount == 0 )
     {
         rtl_freeMemory(pItem);
     }
-
+    
     return osl_File_E_None;
 }
 
 /*****************************************
  * osl_newVolumeDeviceHandleImpl
  ****************************************/
-
+ 
 static oslVolumeDeviceHandleImpl* osl_newVolumeDeviceHandleImpl()
 {
     oslVolumeDeviceHandleImpl* pHandle;
     const size_t               nSizeOfHandle = sizeof(oslVolumeDeviceHandleImpl);
-
+ 
     pHandle = (oslVolumeDeviceHandleImpl*) rtl_allocateMemory (nSizeOfHandle);
     if (pHandle != NULL)
     {
@@ -2835,13 +2835,13 @@ static oslVolumeDeviceHandleImpl* osl_newVolumeDeviceHandleImpl()
         pHandle->pszDevice[0]     = '\0';
         pHandle->RefCount         = 1;
     }
-    return pHandle;
+    return pHandle;   
 }
 
 /*****************************************
  * osl_freeVolumeDeviceHandleImpl
  ****************************************/
-
+ 
 static void osl_freeVolumeDeviceHandleImpl (oslVolumeDeviceHandleImpl* pHandle)
 {
     if (pHandle != NULL)
@@ -2897,13 +2897,13 @@ static void osl_printFloppyHandle(oslVolumeDeviceHandleImpl* pItem)
 #endif
         return;
     }
-
+    
 
     fprintf(stderr,"MountPoint : '%s'\n",pItem->pszMountPoint);
     fprintf(stderr,"FilePath   : '%s'\n",pItem->pszFilePath);
     fprintf(stderr,"Device     : '%s'\n",pItem->pszDevice);
 
-    return;
+    return;    
 }
 #endif
 
diff --git a/sal/osl/os2/file_error_transl.cxx b/sal/osl/os2/file_error_transl.cxx
index 44a801ccdf49..ffd83345a7d2 100644
--- a/sal/osl/os2/file_error_transl.cxx
+++ b/sal/osl/os2/file_error_transl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,41 +25,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
  #ifndef _ERRNO_H
  #include <errno.h>
  #endif
-
+ 
  #ifndef _FILE_ERROR_TRANSL_H_
  #include "file_error_transl.h"
  #endif
-
+ 
  #ifndef _OSL_DIAGNOSE_H_
  #include <osl/diagnose.h>
  #endif
-
-
+  
+ 
 /********************************************
  * oslTranslateFileError
  *******************************************/
-
+  
 oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
 {
     oslFileError osl_error = osl_File_E_invalidError;
 
     OSL_ENSURE((bIsError && (0 != Errno)) || (!bIsError && (0 == Errno)), "oslTranslateFileError strange input combination!");
-
-    /* Have a look at file_error_transl.h for
-       the reason that we do this here */
+    
+    /* Have a look at file_error_transl.h for 
+       the reason that we do this here */    
     if (bIsError && (0 == Errno))
         return osl_error;
-
+        
     switch(Errno)
     {
         case 0:
             osl_error = osl_File_E_None;
             break;
-
+            
         case EPERM:
             osl_error = osl_File_E_PERM;
             break;
@@ -83,11 +83,11 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
         case ENXIO:
             osl_error = osl_File_E_IO;
             break;
-
+            
         case E2BIG:
             osl_error = osl_File_E_2BIG;
             break;
-
+            
         case ENOEXEC:
             osl_error = osl_File_E_NOEXEC;
             break;
@@ -123,15 +123,15 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
         case EEXIST:
             osl_error = osl_File_E_EXIST;
             break;
-
+            
         case EXDEV:
             osl_error = osl_File_E_XDEV;
             break;
-
+            
         case ENODEV:
             osl_error = osl_File_E_NODEV;
             break;
-
+            
         case ENOTDIR:
             osl_error = osl_File_E_NOTDIR;
             break;
@@ -143,7 +143,7 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
         case EINVAL:
             osl_error = osl_File_E_INVAL;
             break;
-
+            
         case ENFILE:
             osl_error = osl_File_E_NFILE;
             break;
@@ -167,7 +167,7 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
         case ESPIPE:
             osl_error = osl_File_E_SPIPE;
             break;
-
+            
         case EROFS:
             osl_error = osl_File_E_ROFS;
             break;
@@ -175,7 +175,7 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
         case EMLINK:
             osl_error = osl_File_E_MLINK;
             break;
-
+            
         case EPIPE:
             osl_error = osl_File_E_PIPE;
             break;
@@ -191,16 +191,16 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
         case EDEADLK:
             osl_error = osl_File_E_DEADLK;
             break;
-
+            
         case ENAMETOOLONG:
             osl_error = osl_File_E_NAMETOOLONG;
             break;
-
+            
         case ENOLCK:
             osl_error = osl_File_E_NOLCK;
             break;
 
-        case ENOSYS:
+        case ENOSYS: 
            osl_error = osl_File_E_NOSYS;
             break;
 
@@ -217,13 +217,13 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
             osl_error = osl_File_E_ILSEQ;
             break;
 #endif /* MACOSX */
-
+            
 #if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2))
         case ENOLINK:
             osl_error = osl_File_E_NOLINK;
             break;
 #endif /* MACOSX */
-
+            
 #if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2))
         case EMULTIHOP:
             osl_error = osl_File_E_MULTIHOP;
@@ -237,11 +237,11 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
         case EOVERFLOW:
             osl_error = osl_File_E_OVERFLOW;
             break;
-
+        
         case ETIMEDOUT:
             osl_error = osl_File_E_TIMEDOUT;
             break;
-
+        
         default:
             /* FIXME translateFileError: is this alright? Or add a new one: osl_File_E_Unknown? */
             osl_error = osl_File_E_invalidError;
@@ -250,6 +250,6 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
 
     return osl_error;
 }
-
+ 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/file_error_transl.h b/sal/osl/os2/file_error_transl.h
index 2de5057a04ac..fbaf054fbb1b 100644
--- a/sal/osl/os2/file_error_transl.h
+++ b/sal/osl/os2/file_error_transl.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,42 +25,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef _FILE_ERROR_TRANSL_H_
 #define _FILE_ERROR_TRANSL_H_
 
 #include <osl/file.h>
 #include <sal/types.h>
-
+ 
 #ifdef __cplusplus
-extern "C"
+extern "C" 
 {
 #endif
 
 /*********************************************
-   oslTranslateFileError
+   oslTranslateFileError 
    Translate errno's to osl file errors
-
-   @param bIsError [in] specifies if nErrno
-           should be interpreted as error,
-          some libc functions signaling an error
+   
+   @param bIsError [in] specifies if nErrno 
+           should be interpreted as error, 
+          some libc functions signaling an error 
            but errno is nevertheless 0 in this
            case the function should at least
            return osl_File_E_Unknown but in no
            case osl_File_E_None!
-
+          
    @param nErrno [in] the errno if errno is 0
             and bIsError is true the function
            returns osl_File_E_Unknown
-
+  
    @returns the osl error code appropriate to
               the errno
-
+            
  *********************************************/
 
 #define OSL_FET_SUCCESS sal_False
 #define OSL_FET_ERROR   sal_True
-
+ 
 oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno);
 
 
@@ -68,6 +68,6 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno);
 }
 #endif
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/file_path_helper.cxx b/sal/osl/os2/file_path_helper.cxx
index 8402da30a606..155ae878cf29 100644
--- a/sal/osl/os2/file_path_helper.cxx
+++ b/sal/osl/os2/file_path_helper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,7 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
  /*******************************************
      Includes
   ******************************************/
@@ -33,23 +33,23 @@
  #ifndef _OSL_THREAD_H_
  #include "osl/thread.h"
  #endif
-
+  
  #ifndef _OSL_FILE_PATH_HELPER_H_
  #include "file_path_helper.h"
  #endif
-
+ 
  #ifndef _OSL_FILE_PATH_HELPER_HXX_
  #include "file_path_helper.hxx"
  #endif
-
+ 
  #ifndef _OSL_UUNXAPI_HXX_
  #include "uunxapi.hxx"
  #endif
-
+ 
  #ifndef _OSL_DIAGNOSE_H_
  #include <osl/diagnose.h>
  #endif
-
+ 
  #ifndef _RTL_USTRING_HXX_
  #include <rtl/ustring.hxx>
  #endif
@@ -57,76 +57,76 @@
  /*******************************************
      Constants
   ******************************************/
-
+  
   const sal_Unicode FPH_CHAR_PATH_SEPARATOR = (sal_Unicode)'\\';
   const sal_Unicode FPH_CHAR_DOT            = (sal_Unicode)'.';
   const sal_Unicode FPH_CHAR_COLON          = (sal_Unicode)':';
-
+  
   inline const rtl::OUString FPH_PATH_SEPARATOR()
       { return rtl::OUString::createFromAscii("\\"); }
   inline const rtl::OUString FPH_LOCAL_DIR_ENTRY()
       { return rtl::OUString::createFromAscii("."); }
   inline const rtl::OUString FPH_PARENT_DIR_ENTRY()
       { return rtl::OUString::createFromAscii(".."); }
-
+  
  /*******************************************
-  *  osl_systemPathRemoveSeparator
+  *  osl_systemPathRemoveSeparator   
   ******************************************/
-
+  
  void SAL_CALL osl_systemPathRemoveSeparator(rtl_uString* pustrPath)
  {
      OSL_PRECOND(pustrPath, "osl_systemPathRemoveSeparator: Invalid parameter");
-
-    // maybe there are more than one separator at end
+        
+    // maybe there are more than one separator at end 
     // so we run in a loop
     while ((pustrPath->length > 1) && (FPH_CHAR_PATH_SEPARATOR == pustrPath->buffer[pustrPath->length - 1]))
     {
         pustrPath->length--;
         pustrPath->buffer[pustrPath->length] = (sal_Unicode)'\0';
     }
-
+    
     OSL_POSTCOND((0 == pustrPath->length) || (1 == pustrPath->length) || \
                  (pustrPath->length > 1 && pustrPath->buffer[pustrPath->length - 1] != FPH_CHAR_PATH_SEPARATOR), \
-                 "osl_systemPathRemoveSeparator: Post condition failed");
+                 "osl_systemPathRemoveSeparator: Post condition failed");	
  }
-
+ 
  /*******************************************
-    osl_systemPathEnsureSeparator
+    osl_systemPathEnsureSeparator   
   ******************************************/
-
+  
  void SAL_CALL osl_systemPathEnsureSeparator(rtl_uString** ppustrPath)
  {
      OSL_PRECOND(ppustrPath && (NULL != *ppustrPath), \
                 "osl_systemPathEnsureSeparator: Invalid parameter");
-
+    
      rtl::OUString path(*ppustrPath);
-    sal_Int32     lp = path.getLength();
+    sal_Int32	  lp = path.getLength();
     sal_Int32     i  = path.lastIndexOf(FPH_CHAR_PATH_SEPARATOR);
-
+    
     if ((lp > 1 && i != (lp - 1)) || ((lp < 2) && i < 0))
     {
-        path += FPH_PATH_SEPARATOR();
-        rtl_uString_assign(ppustrPath, path.pData);
+        path += FPH_PATH_SEPARATOR(); 
+        rtl_uString_assign(ppustrPath, path.pData);			
     }
-
+    
     OSL_POSTCOND(path.lastIndexOf(FPH_CHAR_PATH_SEPARATOR) == (path.getLength() - 1), \
                  "osl_systemPathEnsureSeparator: Post condition failed");
  }
-
+ 
  /*******************************************
   *  osl_systemPathIsRelativePath
   ******************************************/
-
+  
  sal_Bool SAL_CALL osl_systemPathIsRelativePath(const rtl_uString* pustrPath)
  {
      OSL_PRECOND(pustrPath, "osl_systemPathIsRelativePath: Invalid parameter");
      return (!osl_systemPathIsAbsolutePath(pustrPath));
  }
-
+ 
  /******************************************
-  *  osl_systemPathIsAbsolutePath
+  *  osl_systemPathIsAbsolutePath   		 
   *****************************************/
-
+  
  sal_Bool SAL_CALL osl_systemPathIsAbsolutePath(const rtl_uString* pustrPath)
  {
      OSL_PRECOND(pustrPath, "osl_systemPathIsAbsolutePath: Invalid parameter");
@@ -139,90 +139,90 @@
         return sal_True;
     return sal_False;
  }
-
+ 
  /******************************************
     osl_systemPathMakeAbsolutePath
   *****************************************/
-
+  
  void SAL_CALL osl_systemPathMakeAbsolutePath(
-     const rtl_uString* pustrBasePath,
-    const rtl_uString* pustrRelPath,
-    rtl_uString**      ppustrAbsolutePath)
+     const rtl_uString* pustrBasePath, 
+    const rtl_uString* pustrRelPath, 
+    rtl_uString** 	   ppustrAbsolutePath)
 {
     rtl::OUString base(rtl_uString_getStr(const_cast<rtl_uString*>(pustrBasePath)));
     rtl::OUString rel(const_cast<rtl_uString*>(pustrRelPath));
-
+    
     if (base.getLength() > 0)
-        osl_systemPathEnsureSeparator(&base.pData);
-
+        osl_systemPathEnsureSeparator(&base.pData);		
+        
     base += rel;
-
+    
     rtl_uString_acquire(base.pData);
-    *ppustrAbsolutePath = base.pData;
+    *ppustrAbsolutePath = base.pData; 
 }
 
-
+ 
  /*****************************************
-    osl_systemPathGetParent
+    osl_systemPathGetParent	
   ****************************************/
-
+  
  sal_Int32 SAL_CALL osl_systemPathGetParent(rtl_uString* pustrPath)
  {
      return 0;
  }
-
+  
  /*******************************************
      osl_systemPathGetFileOrLastDirectoryPart
   ******************************************/
-
+  
  void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart(
-     const rtl_uString*     pustrPath,
-    rtl_uString**       ppustrFileNameOrLastDirPart)
+     const rtl_uString* 	pustrPath,
+    rtl_uString** 		ppustrFileNameOrLastDirPart)
 {
     OSL_PRECOND(pustrPath && ppustrFileNameOrLastDirPart, \
                 "osl_systemPathGetFileNameOrLastDirectoryPart: Invalid parameter");
-
-    rtl::OUString path(const_cast<rtl_uString*>(pustrPath));
-
+    
+    rtl::OUString path(const_cast<rtl_uString*>(pustrPath));	
+    
     osl_systemPathRemoveSeparator(path.pData);
-
+                
     rtl::OUString last_part;
-
+        
     if (path.getLength() > 1 || (1 == path.getLength() && *path.getStr() != FPH_CHAR_PATH_SEPARATOR))
     {
-        sal_Int32 idx_ps = path.lastIndexOf(FPH_CHAR_PATH_SEPARATOR);
+        sal_Int32 idx_ps = path.lastIndexOf(FPH_CHAR_PATH_SEPARATOR);		
         idx_ps++; // always right to increment by one even if idx_ps == -1!
-        last_part = rtl::OUString(path.getStr() + idx_ps);
-    }
-    rtl_uString_assign(ppustrFileNameOrLastDirPart, last_part.pData);
+        last_part = rtl::OUString(path.getStr() + idx_ps); 
+    }							
+    rtl_uString_assign(ppustrFileNameOrLastDirPart, last_part.pData);		
 }
-
+    
 
  /********************************************
-     osl_systemPathIsHiddenFileOrDirectoryEntry
+     osl_systemPathIsHiddenFileOrDirectoryEntry	
  *********************************************/
-
+ 
  sal_Bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry(
      const rtl_uString* pustrPath)
 {
     OSL_PRECOND(pustrPath, "osl_systemPathIsHiddenFileOrDirectoryEntry: Invalid parameter");
 
     sal_Bool is_hidden = sal_False;
-
+    
     if (pustrPath->length > 0)
     {
         rtl::OUString fdp;
-
+    
         osl_systemPathGetFileNameOrLastDirectoryPart(pustrPath, &fdp.pData);
-
-        is_hidden = ((fdp.pData->length > 0) && (fdp.pData->buffer[0] == FPH_CHAR_DOT) &&
-                     !osl_systemPathIsLocalOrParentDirectoryEntry(fdp.pData));
+        
+        is_hidden = ((fdp.pData->length > 0) && (fdp.pData->buffer[0] == FPH_CHAR_DOT) && 
+                     !osl_systemPathIsLocalOrParentDirectoryEntry(fdp.pData));					 
      }
-
+    
     return is_hidden;
 }
-
-
+    
+ 
  /************************************************
      osl_systemPathIsLocalOrParentDirectoryEntry
  ************************************************/
@@ -231,149 +231,149 @@ sal_Bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry(
     const rtl_uString* pustrPath)
 {
     OSL_PRECOND(pustrPath, "osl_systemPathIsLocalOrParentDirectoryEntry: Invalid parameter");
-
+    
     rtl::OUString dirent;
-
+    
     osl_systemPathGetFileNameOrLastDirectoryPart(pustrPath, &dirent.pData);
-
+        
     return (
-            (dirent == FPH_LOCAL_DIR_ENTRY()) ||
+            (dirent == FPH_LOCAL_DIR_ENTRY()) || 
             (dirent == FPH_PARENT_DIR_ENTRY())
            );
 }
-
+    
 /***********************************************
- Simple iterator for a path list separated by
+ Simple iterator for a path list separated by 
  the specified character
  **********************************************/
-
+ 
 class path_list_iterator
 {
 public:
-
+    
     /******************************************
       constructor
-
-     after construction get_current_item
+     
+     after construction get_current_item 
      returns the first path in list, no need
      to call reset first
-     *****************************************/
-    path_list_iterator(const rtl::OUString& path_list, sal_Unicode list_separator = FPH_CHAR_COLON) :
+     *****************************************/	 
+    path_list_iterator(const rtl::OUString& path_list, sal_Unicode list_separator = FPH_CHAR_COLON) : 
         m_path_list(path_list),
         m_end(m_path_list.getStr() + m_path_list.getLength() + 1),
         m_separator(list_separator)
     {
         reset();
     }
-
+    
     /******************************************
      reset the iterator
-     *****************************************/
+     *****************************************/	 
     void reset()
     {
         m_path_segment_begin = m_path_segment_end = m_path_list.getStr();
-        advance();
+        advance();				
     }
-
+    
     /******************************************
      move the iterator to the next position
-     *****************************************/
+     *****************************************/	 
     void next()
     {
         OSL_PRECOND(!done(), "path_list_iterator: Already done!");
-
-        m_path_segment_begin = ++m_path_segment_end;
-        advance();
+        
+        m_path_segment_begin = ++m_path_segment_end;				
+        advance();		
     }
-
+    
     /******************************************
      check if done
-     *****************************************/
+     *****************************************/	 
     bool done() const
     {
         return (m_path_segment_end >= m_end);
     }
-
+    
     /******************************************
      return the current item
-     *****************************************/
+     *****************************************/	 
     rtl::OUString get_current_item() const
     {
         return rtl::OUString(
-            m_path_segment_begin,
+            m_path_segment_begin, 
             (m_path_segment_end - m_path_segment_begin));
     }
-
+        
 private:
-
+    
     /******************************************
      move m_path_end to the next separator or
      to the edn of the string
-     *****************************************/
+     *****************************************/	 
     void advance()
     {
         while (!done() && *m_path_segment_end && (*m_path_segment_end != m_separator))
             ++m_path_segment_end;
-
+            
         OSL_ASSERT(m_path_segment_end <= m_end);
     }
-
+    
 private:
-    rtl::OUString       m_path_list;
+    rtl::OUString 		m_path_list;	
     const sal_Unicode*  m_end;
-    const sal_Unicode   m_separator;
+    const sal_Unicode 	m_separator;
     const sal_Unicode*  m_path_segment_begin;
-    const sal_Unicode*  m_path_segment_end;
-
-// prevent copy and assignment
+    const sal_Unicode*  m_path_segment_end;	
+    
+// prevent copy and assignment	
 private:
     /******************************************
      copy constructor
      remember: do not simply copy m_path_begin
-     and m_path_end because they point to
+     and m_path_end because they point to 
      the memory of other.m_path_list!
-     *****************************************/
+     *****************************************/	 
     path_list_iterator(const path_list_iterator& other);
-
+    
     /******************************************
      assignment operator
       remember: do not simply copy m_path_begin
-     and m_path_end because they point to
+     and m_path_end because they point to 
      the memory of other.m_path_list!
-     *****************************************/
+     *****************************************/	 
     path_list_iterator& operator=(const path_list_iterator& other);
 };
 
  /************************************************
       osl_searchPath
   ***********************************************/
-
-sal_Bool SAL_CALL osl_searchPath(
+  
+sal_Bool SAL_CALL osl_searchPath( 	
      const rtl_uString* pustrFilePath,
     const rtl_uString* pustrSearchPathList,
     rtl_uString**      ppustrPathFound)
 {
     OSL_PRECOND(pustrFilePath && pustrSearchPathList && ppustrPathFound, "osl_searchPath: Invalid parameter");
-
+    
     bool               bfound = false;
-    rtl::OUString      fp(const_cast<rtl_uString*>(pustrFilePath));
+    rtl::OUString      fp(const_cast<rtl_uString*>(pustrFilePath));	
     rtl::OUString      pl = rtl::OUString(const_cast<rtl_uString*>(pustrSearchPathList));
     path_list_iterator pli(pl);
-
+    
     while (!pli.done())
     {
-        rtl::OUString p = pli.get_current_item();
-        osl::systemPathEnsureSeparator(p);
+        rtl::OUString p = pli.get_current_item();						
+        osl::systemPathEnsureSeparator(p);		
         p += fp;
-
+        
         if (osl::access(p, F_OK) > -1)
         {
             bfound = true;
             rtl_uString_assign(ppustrPathFound, p.pData);
             break;
-        }
+        }					
         pli.next();
-    }
+    }	
     return bfound;
 }
 
diff --git a/sal/osl/os2/file_path_helper.h b/sal/osl/os2/file_path_helper.h
index be988e6f5524..6e179d547a30 100644
--- a/sal/osl/os2/file_path_helper.h
+++ b/sal/osl/os2/file_path_helper.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,271 +25,271 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
  #ifndef _OSL_FILE_PATH_HELPER_H_
  #define _OSL_FILE_PATH_HELPER_H_
-
-
+ 
+ 
  #ifndef _SAL_TYPES_H_
  #include <sal/types.h>
  #endif
-
+ 
  #ifndef _RTL_USTRING_H_
  #include <rtl/ustring.h>
  #endif
-
-
+ 
+ 
  #ifdef __cplusplus
  extern "C"
  {
  #endif
-
-
+ 
+ 
  /*******************************************
     osl_systemPathRemoveSeparator
-    Removes the last separator from the
+    Removes the last separator from the 
     given system path if any and if the path
     is not the root path '/'
-
-    @param  ppustrPath [inout] a system path
+   
+    @param	ppustrPath [inout] a system path
             if the path is not the root path
-            and the last character is a
+            and the last character is a 
             path separator it will be cut off
                ppustrPath must not be NULL and
             must point to a valid rtl_uString
-
+            
     @returns nothing
-
+    
   ******************************************/
-
+  
  void SAL_CALL osl_systemPathRemoveSeparator(
      /*inout*/ rtl_uString* pustrPath);
-
+ 
  /*******************************************
     osl_systemPathEnsureSeparator
     Adds a trailing path separator to the
     given system path if not already there
     and if the path is not the root path '/'
-
-      @param    pustrPath [inout] a system path
+  
+      @param 	pustrPath [inout] a system path
             if the path is not the root path
             '/' and has no trailing separator
             a separator will be added
             ppustrPath must not be NULL and
             must point to a valid rtl_uString
-
+            
     @returns nothing
-
+    
   ******************************************/
-
+  
  void SAL_CALL osl_systemPathEnsureSeparator(
      /*inout*/ rtl_uString** ppustrPath);
-
+ 
  /*******************************************
     osl_systemPathIsRelativePath
-    Returns true if the given path is a
+    Returns true if the given path is a 
     relative path and so starts not with '/'
-
-    @param  pustrPath [in] a system path
+    
+    @param 	pustrPath [in] a system path 
             pustrPath must not be NULL
-
-    @returns sal_True if the given path
+            
+    @returns sal_True if the given path 
              doesn't start with a separator
              else sal_False will be returned
-
+             
   ******************************************/
-
+  
  sal_Bool SAL_CALL osl_systemPathIsRelativePath(
      const rtl_uString* pustrPath);
-
+ 
  /******************************************
     osl_systemPathIsAbsolutePath
-    Returns true if the given path is an
+    Returns true if the given path is an 
     absolute path and so starts with a '/'
-
+    
     @param pustrPath [in] a system path
            pustrPath must not be NULL
-
-    @returns sal_True if the given path
+           
+    @returns sal_True if the given path 
              start's with a separator else
              sal_False will be returned
-
+             
   *****************************************/
-
+  
  sal_Bool SAL_CALL osl_systemPathIsAbsolutePath(
      const rtl_uString* pustrPath);
-
+ 
  /******************************************
     osl_systemPathMakeAbsolutePath
-    Append a relative path to a base path
-
-    @param  pustrBasePath [in] a system
+    Append a relative path to a base path 
+    
+    @param	pustrBasePath [in] a system
             path that will be considered as
             base path
+            pustrBasePath must not be NULL 
+            
+    @param	pustrRelPath [in] a system path
+            that will be considered as 
+            relative path 
             pustrBasePath must not be NULL
-
-    @param  pustrRelPath [in] a system path
-            that will be considered as
-            relative path
-            pustrBasePath must not be NULL
-
-    @param  ppustrAbsolutePath [out] the
-            resulting path which is a
-            concatination of the base and
+            
+    @param	ppustrAbsolutePath [out] the 
+            resulting path which is a 
+            concatination of the base and 
             the relative path
-            if base path is empty the
+            if base path is empty the 
             resulting absolute path is the
             relative path
             if relative path is empty the
             resulting absolute path is the
             base path
-            if base and relative path are
-            empty the resulting absolute
+            if base and relative path are 
+            empty the resulting absolute 
             path is also empty
             ppustrAbsolutePath must not be
             NULL and *ppustrAbsolutePath
             must be 0 or point to a valid
             rtl_uString
-
+            
   *****************************************/
-
+  
  void SAL_CALL osl_systemPathMakeAbsolutePath(
-     const rtl_uString* pustrBasePath,
-    const rtl_uString* pustrRelPath,
-    rtl_uString**      ppustrAbsolutePath);
-
+     const rtl_uString* pustrBasePath, 
+    const rtl_uString* pustrRelPath, 
+    rtl_uString** 	   ppustrAbsolutePath);
+ 
  /*****************************************
     osl_systemPathGetParent
     Replaces the last occurrance of a path
-    separator with '\0' and returns the
+    separator with '\0' and returns the 
     position where the '/' was replaced
-
-    @param  pustrPath [inout] a system
+    
+    @param	pustrPath [inout] a system
             path, the last separator of
             this path will be replaced by
-            a '\0'
-            if the path is the root path
-            '/' or the path is considered
-            as to have no parent, e.g.
+            a '\0' 
+            if the path is the root path 
+            '/' or the path is considered 
+            as to have no parent, e.g. 
             '/NoParent' or 'NoParent' or
-            the path is empty no
+            the path is empty no 
             replacement will be made
             pustrPath must not be NULL
-
+            
     @returns the position of the last path
-             separator that was replaced
+             separator that was replaced 
              or 0 if no replacement took
              place
-
+             
   ****************************************/
-
+  
  sal_Int32 SAL_CALL osl_systemPathGetParent(
     /*inout*/ rtl_uString* pustrPath);
-
+  
  /*****************************************
      osl_systemPathGetFileOrLastDirectoryPart
     Returns the file or the directory part
     of the given path
-
+    
     @param pustrPath [in] a system path,
            must not be NULL
-
+           
     @param ppustrFileOrDirPart [out] on
-           return receives the last part
-           of the given directory or the
-           file name
+           return receives the last part 
+           of the given directory or the 
+           file name 
            if pustrPath is the root path
-           '/' an empty string will be
+           '/' an empty string will be 
            returned
-           if pustrPath has a trailing
+           if pustrPath has a trailing 
            '/' the last part before the
-           '/' will be returned else
+           '/' will be returned else 
            the part after the last '/'
            will be returned
-
+                
     @returns nothing
-
+    
   ****************************************/
  void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart(
-     const rtl_uString*     pustrPath,
-    rtl_uString**       ppustrFileNameOrLastDirPart);
-
+     const rtl_uString* 	pustrPath,
+    rtl_uString** 		ppustrFileNameOrLastDirPart);
+    
 
  /********************************************
      osl_systemPathIsHiddenFileOrDirectoryEntry
-    Returns sal_True if the last part of
+    Returns sal_True if the last part of 
     given system path is not '.' or '..'
-    alone and starts with a '.'
-
+    alone and starts with a '.' 
+    
     @param pustrPath [in] a system path,
            must not be NULL
-
+          
     @returns sal_True if the last part of
              the given system path starts
              with '.' or sal_False the last
-             part is '.' or '..' alone or
+             part is '.' or	'..' alone or
              doesn't start with a dot
-
+             
  *********************************************/
-
+ 
  sal_Bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry(
      const rtl_uString* pustrPath);
-
+ 
 
  /************************************************
      osl_systemPathIsLocalOrParentDirectoryEntry
     Returns sal_True if the last part of the given
     system path is the local directory entry '.'
     or the parent directory entry '..'
-
+    
     @param pustrPath [in] a system path,
            must not be NULL
-
-    @returns sal_True if the last part of the
+           
+    @returns sal_True if the last part of the 
              given system path is '.' or '..'
              else sal_False
-
+             
  ************************************************/
 
  sal_Bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry(
      const rtl_uString* pustrPath);
-
+ 
 
  /************************************************
       osl_searchPath
     Searches for a file name or path name in all
     directories specified by a given path list.
-    Symbolic links in the resulting path will not be
+    Symbolic links in the resulting path will not be 
     resolved, it's up to the caller to do this.
-
+    
     @param pustrFilePath [in] a file name or
     directory name to search for, the name must
     be provided as system path not as a file URL
-
-    @param pustrSearchPathList [in] a ':'
+    
+    @param pustrSearchPathList [in] a ':' 
     separated list of paths in which to search for
     the file or directory name
-
+    
     @ppustrPathFound [out] on success receives the
     complete path of the file or directory found
     as a system path
-
-    @returns sal_True if the specified file or
+    
+    @returns sal_True if the specified file or 
     directory was found else sal_False
   ***********************************************/
-
+  
  sal_Bool SAL_CALL osl_searchPath(
      const rtl_uString* pustrFilePath,
     const rtl_uString* pustrSearchPathList,
     rtl_uString**      ppustrPathFound);
-
-
+ 
+ 
  #ifdef __cplusplus
  }
  #endif
-
-
+ 
+ 
  #endif /* #ifndef _OSL_PATH_HELPER_H_ */
-
+ 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/file_path_helper.hxx b/sal/osl/os2/file_path_helper.hxx
index fefe04a50198..adb86e3d407d 100644
--- a/sal/osl/os2/file_path_helper.hxx
+++ b/sal/osl/os2/file_path_helper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,273 +25,273 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef _OSL_FILE_PATH_HELPER_HXX_
 #define _OSL_FILE_PATH_HELPER_HXX_
 
 
 #include "file_path_helper.h"
-
+ 
 #include <rtl/ustring.hxx>
 
 
 namespace osl
 {
-
+ 
  /*******************************************
     systemPathRemoveSeparator
-    Removes the last separator from the
+    Removes the last separator from the 
     given system path if any and if the path
     is not the root path '/'
-
-    @param  ppustrPath [inout] a system path
+   
+    @param	ppustrPath [inout] a system path
             if the path is not the root path
-            and the last character is a
+            and the last character is a 
             path separator it will be cut off
                ppustrPath must not be NULL and
             must point to a valid rtl_uString
-
+            
     @returns nothing
-
+    
   ******************************************/
-
+  
  inline void systemPathRemoveSeparator(/*inout*/ rtl::OUString& Path)
  {
      osl_systemPathRemoveSeparator(Path.pData);
  }
-
+ 
  /*******************************************
     systemPathEnsureSeparator
     Adds a trailing path separator to the
     given system path if not already there
     and if the path is not the root path '/'
-
-      @param    pustrPath [inout] a system path
+  
+      @param 	pustrPath [inout] a system path
             if the path is not the root path
             '/' and has no trailing separator
             a separator will be added
             ppustrPath must not be NULL and
             must point to a valid rtl_uString
-
+            
     @returns nothing
-
+    
   ******************************************/
-
+  
  inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
  {
      osl_systemPathEnsureSeparator(&Path.pData);
  }
-
+ 
  /*******************************************
     systemPathIsRelativePath
-    Returns true if the given path is a
+    Returns true if the given path is a 
     relative path and so starts not with '/'
-
-    @param  pustrPath [in] a system path
+    
+    @param 	pustrPath [in] a system path 
             pustrPath must not be NULL
-
-    @returns sal_True if the given path
+            
+    @returns sal_True if the given path 
              doesn't start with a separator
              else sal_False will be returned
-
+             
   ******************************************/
-
+  
  inline bool systemPathIsRelativePath(const rtl::OUString& Path)
  {
     return osl_systemPathIsRelativePath(Path.pData);
  }
-
+ 
  /******************************************
     systemPathIsAbsolutePath
-    Returns true if the given path is an
+    Returns true if the given path is an 
     absolute path and so starts with a '/'
-
+    
     @param pustrPath [in] a system path
            pustrPath must not be NULL
-
-    @returns sal_True if the given path
+           
+    @returns sal_True if the given path 
              start's with a separator else
              sal_False will be returned
-
+             
   *****************************************/
-
+  
  inline bool systemPathIsAbsolutePath(const rtl::OUString& Path)
  {
      return osl_systemPathIsAbsolutePath(Path.pData);
  }
-
+ 
  /******************************************
     systemPathMakeAbsolutePath
-    Append a relative path to a base path
-
-    @param  pustrBasePath [in] a system
+    Append a relative path to a base path 
+    
+    @param	pustrBasePath [in] a system
             path that will be considered as
             base path
+            pustrBasePath must not be NULL 
+            
+    @param	pustrRelPath [in] a system path
+            that will be considered as 
+            relative path 
             pustrBasePath must not be NULL
-
-    @param  pustrRelPath [in] a system path
-            that will be considered as
-            relative path
-            pustrBasePath must not be NULL
-
-    @param  ppustrAbsolutePath [out] the
-            resulting path which is a
-            concatination of the base and
+            
+    @param	ppustrAbsolutePath [out] the 
+            resulting path which is a 
+            concatination of the base and 
             the relative path
-            if base path is empty the
+            if base path is empty the 
             resulting absolute path is the
             relative path
             if relative path is empty the
             resulting absolute path is the
             base path
-            if base and relative path are
-            empty the resulting absolute
+            if base and relative path are 
+            empty the resulting absolute 
             path is also empty
             ppustrAbsolutePath must not be
             NULL and *ppustrAbsolutePath
             must be 0 or point to a valid
             rtl_uString
-
+            
   *****************************************/
-
+  
  inline void systemPathMakeAbsolutePath(
-     const rtl::OUString& BasePath,
-    const rtl::OUString& RelPath,
-    rtl::OUString&       AbsolutePath)
+     const rtl::OUString& BasePath, 
+    const rtl::OUString& RelPath, 
+    rtl::OUString& 	     AbsolutePath)
  {
     osl_systemPathMakeAbsolutePath(
         BasePath.pData, RelPath.pData, &AbsolutePath.pData);
  }
-
+ 
  /*****************************************
     systemPathGetParent
     Replaces the last occurrance of a path
-    separator with '\0' and returns the
+    separator with '\0' and returns the 
     position where the '/' was replaced
-
-    @param  pustrPath [inout] a system
+    
+    @param	pustrPath [inout] a system
             path, the last separator of
             this path will be replaced by
-            a '\0'
-            if the path is the root path
-            '/' or the path is considered
-            as to have no parent, e.g.
+            a '\0' 
+            if the path is the root path 
+            '/' or the path is considered 
+            as to have no parent, e.g. 
             '/NoParent' or 'NoParent' or
-            the path is empty no
+            the path is empty no 
             replacement will be made
             pustrPath must not be NULL
-
+            
     @returns the position of the last path
-             separator that was replaced
+             separator that was replaced 
              or 0 if no replacement took
              place
-
+             
   ****************************************/
-
+  
  inline sal_Int32 systemPathGetParent(/*inout*/ rtl::OUString& Path)
  {
-    return osl_systemPathGetParent(Path.pData);
+    return osl_systemPathGetParent(Path.pData); 
  }
-
+  
  /*****************************************
      systemPathGetFileOrLastDirectoryPart
     Returns the file or the directory part
     of the given path
-
+    
     @param pustrPath [in] a system path,
            must not be NULL
-
+           
     @param ppustrFileOrDirPart [out] on
-           return receives the last part
-           of the given directory or the
-           file name
+           return receives the last part 
+           of the given directory or the 
+           file name 
            if pustrPath is the root path
-           '/' an empty string will be
+           '/' an empty string will be 
            returned
-           if pustrPath has a trailing
+           if pustrPath has a trailing 
            '/' the last part before the
-           '/' will be returned else
+           '/' will be returned else 
            the part after the last '/'
            will be returned
-
+                
     @returns nothing
-
+    
   ****************************************/
-
+   
  inline void systemPathGetFileNameOrLastDirectoryPart(
      const rtl::OUString& Path,
-    rtl::OUString&       FileNameOrLastDirPart)
+    rtl::OUString& 		 FileNameOrLastDirPart)
  {
     osl_systemPathGetFileNameOrLastDirectoryPart(
         Path.pData, &FileNameOrLastDirPart.pData);
  }
-
+    
 
  /********************************************
      systemPathIsHiddenFileOrDirectoryEntry
-    Returns sal_True if the last part of
+    Returns sal_True if the last part of 
     given system path is not '.' or '..'
-    alone and starts with a '.'
-
+    alone and starts with a '.' 
+    
     @param pustrPath [in] a system path,
            must not be NULL
-
+          
     @returns sal_True if the last part of
              the given system path starts
              with '.' or sal_False the last
-             part is '.' or '..' alone or
+             part is '.' or	'..' alone or
              doesn't start with a dot
-
+             
  *********************************************/
-
+ 
  inline bool systemPathIsHiddenFileOrDirectoryEntry(
      const rtl::OUString& Path)
  {
     return osl_systemPathIsHiddenFileOrDirectoryEntry(Path.pData);
  }
-
+ 
 
  /************************************************
      systemPathIsLocalOrParentDirectoryEntry
     Returns sal_True if the last part of the given
     system path is the local directory entry '.'
     or the parent directory entry '..'
-
+    
     @param pustrPath [in] a system path,
            must not be NULL
-
-    @returns sal_True if the last part of the
+           
+    @returns sal_True if the last part of the 
              given system path is '.' or '..'
              else sal_False
-
+             
  ************************************************/
 
  inline bool systemPathIsLocalOrParentDirectoryEntry(
      const rtl::OUString& Path)
  {
-    return osl_systemPathIsLocalOrParentDirectoryEntry(Path.pData);
- }
-
+    return osl_systemPathIsLocalOrParentDirectoryEntry(Path.pData); 
+ }	
+ 
  /************************************************
   searchPath
   ***********************************************/
-
+ 
  inline bool searchPath(
      const rtl::OUString& ustrFilePath,
     const rtl::OUString& ustrSearchPathList,
     rtl::OUString& ustrPathFound)
  {
      return osl_searchPath(
-        ustrFilePath.pData,
+        ustrFilePath.pData, 
         ustrSearchPathList.pData,
         &ustrPathFound.pData);
  }
-
-
+               
+            
  } // namespace osl
-
-
+ 
+ 
  #endif /* #ifndef _OSL_PATH_HELPER_HXX_ */
-
+ 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/file_url.cxx b/sal/osl/os2/file_url.cxx
index 395cfea13e41..e774f6d55504 100644
--- a/sal/osl/os2/file_url.cxx
+++ b/sal/osl/os2/file_url.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,44 +54,44 @@
 #include "file_url.h"
 #include <sal/macros.h>
 #include "file_path_helper.hxx"
-
+ 
 #include "uunxapi.hxx"
 
 #include <wchar.h>
 #include <wctype.h>
 
 /***************************************************
-
+ 
  General note
-
+ 
  This file contains the part that handles File URLs.
-
- File URLs as scheme specific notion of URIs
+ 
+ File URLs as scheme specific notion of URIs 
  (RFC2396) may be handled platform independend, but
  will not in osl which is considered wrong.
  Future version of osl should handle File URLs this
  way. In rtl/uri there is already an URI parser etc.
  so this code should be consolidated.
-
+ 
  **************************************************/
-
+ 
 oslMutex g_CurrentDirectoryMutex;
-
-
+ 
+ 
 /***************************************************
  * forward
  **************************************************/
-
+ 
 void _osl_warnFile(const char*, rtl_uString*);
 rtl_uString*  oslMakeUStrFromPsz(const sal_Char* pszStr,rtl_uString** uStr);
-
+ 
 extern "C" int UnicodeToText(char *, size_t, const sal_Unicode *, sal_Int32);
 extern "C" int TextToUnicode(const char* text, size_t text_buffer_size, sal_Unicode* unic_text, sal_Int32 unic_text_buffer_size);
 
 /***************************************************
  * namespace directives
  **************************************************/
-
+ 
 using namespace osl;
 
 /******************************************************************************
@@ -101,8 +101,8 @@ using namespace osl;
  *****************************************************************************/
 
 /* a slightly modified version of Pchar in rtl/source/uri.c */
-const sal_Bool uriCharClass[128] =
-{
+const sal_Bool uriCharClass[128] =  
+{ 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* Pchar but without encoding slashes */
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* !"#$%&'()*+,-./  */
@@ -120,17 +120,17 @@ static sal_Bool findWrongUsage( const sal_Unicode *path, sal_Int32 len )
 {
     rtl_uString *pTmp = NULL;
     sal_Bool bRet;
-
+    
     rtl_uString_newFromStr_WithLength( &pTmp, path, len );
-
+    
     rtl_ustr_toAsciiLowerCase_WithLength( pTmp->buffer, pTmp->length );
-
+        
     bRet = ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "ftp://", 6 ) ) ||
            ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "http://", 7 ) ) ||
            ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "vnd.sun.star", 12 ) ) ||
            ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "private:", 8 ) ) ||
            ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "slot:", 5) );
-
+           
     rtl_uString_release( pTmp );
     return bRet;
 }
@@ -138,16 +138,16 @@ static sal_Bool findWrongUsage( const sal_Unicode *path, sal_Int32 len )
 
 
 /****************************************************************************/
-/*  osl_getFileURLFromSystemPath */
+/*	osl_getFileURLFromSystemPath */
 /****************************************************************************/
 
 BOOL WINAPI IsValidFilePathComponent(
     LPCTSTR lpComponent, LPCTSTR *lppComponentEnd, DWORD dwFlags)
 {
-    LPCTSTR lpComponentEnd = NULL;
-    LPCTSTR lpCurrent = lpComponent;
-    BOOL    fValid = TRUE;  /* Assume success */
-    TCHAR   cLast = 0;
+    LPCTSTR	lpComponentEnd = NULL;
+    LPCTSTR	lpCurrent = lpComponent;
+    BOOL	fValid = TRUE;	/* Assume success */
+    TCHAR	cLast = 0;
 
     /* Path component length must not exceed MAX_PATH */
 
@@ -215,7 +215,7 @@ BOOL WINAPI IsValidFilePathComponent(
         cLast = *lpCurrent++;
     }
 
-    /*  If we don't reached the end of the component the length of the component was to long
+    /*	If we don't reached the end of the component the length of the component was to long 
         ( See condition of while loop ) */
     if ( !lpComponentEnd )
     {
@@ -224,8 +224,8 @@ BOOL WINAPI IsValidFilePathComponent(
     }
 
     /* Test wether the component specifies a device name what is not allowed */
-
-    // MT: PERFORMANCE:
+    
+    // MT: PERFORMANCE: 
     // This is very expensive. A lot of calls to _tcsicmp.
     // in SRC6870m71 67.000 calls of this method while empty office start result into more than 1.500.00 calls of _tcsicmp!
     // Possible optimizations
@@ -237,7 +237,7 @@ BOOL WINAPI IsValidFilePathComponent(
     /*
     if ( fValid )
     {
-        LPCTSTR alpDeviceNames[] =
+        LPCTSTR	alpDeviceNames[] =
         {
             TEXT("CON"),
             TEXT("PRN"),
@@ -263,11 +263,11 @@ BOOL WINAPI IsValidFilePathComponent(
             TEXT("COM8"),
             TEXT("COM9")
         };
-
-        TCHAR   szComponent[MAX_PATH];
-        int     nComponentLength;
-        LPCTSTR lpDot;
-        int     i;
+        
+        TCHAR	szComponent[MAX_PATH];
+        int		nComponentLength;
+        LPCTSTR	lpDot;
+        int		i;
 
         // A device name with an extension is also invalid
         lpDot = _tcschr( lpComponent, '.' );
@@ -310,12 +310,12 @@ BOOL WINAPI IsValidFilePathComponent(
     return fValid;
 }
 
-//#####################################################
+//##################################################### 
 DWORD WINAPI IsValidFilePath(LPCTSTR lpszPath, LPCTSTR *lppError, DWORD dwFlags)
 {
-    LPCTSTR lpComponent;
-    BOOL    fValid = TRUE;
-    DWORD   dwPathType = PATHTYPE_ERROR;
+    LPCTSTR	lpComponent;
+    BOOL	fValid = TRUE;
+    DWORD	dwPathType = PATHTYPE_ERROR;
 
     if ( dwFlags & VALIDATEPATH_ALLOW_RELATIVE )
         dwFlags |= VALIDATEPATH_ALLOW_ELLIPSE;
@@ -341,9 +341,9 @@ DWORD WINAPI IsValidFilePath(LPCTSTR lpszPath, LPCTSTR *lppError, DWORD dwFlags)
 
         if ( fValid )
         {
-            if ( lpComponent &&  !*++lpComponent )
+            if ( lpComponent &&	 !*++lpComponent )
                 lpComponent = NULL;
-
+            
             if ( !lpComponent )
             {
                 dwPathType |= PATHTYPE_IS_SERVER;
@@ -428,7 +428,7 @@ DWORD WINAPI IsValidFilePath(LPCTSTR lpszPath, LPCTSTR *lppError, DWORD dwFlags)
                 lpComponent = NULL;
         }
     }
-
+    
     if ( fValid && _tcslen( lpszPath ) >= _MAX_PATH )
     {
         fValid = FALSE;
@@ -443,12 +443,12 @@ DWORD WINAPI IsValidFilePath(LPCTSTR lpszPath, LPCTSTR *lppError, DWORD dwFlags)
 
 sal_Bool _osl_decodeURL( rtl_String* strUTF8, rtl_uString** pstrDecodedURL )
 {
-    sal_Char        *pBuffer;
-    const sal_Char  *pSrcEnd;
-    const sal_Char  *pSrc;
-    sal_Char        *pDest;
-    sal_Int32       nSrcLen;
-    sal_Bool        bValidEncoded = sal_True;   /* Assume success */
+    sal_Char		*pBuffer;
+    const sal_Char	*pSrcEnd;
+    const sal_Char	*pSrc;
+    sal_Char		*pDest;
+    sal_Int32		nSrcLen;
+    sal_Bool		bValidEncoded = sal_True;	/* Assume success */
 
     /* The resulting decoded string length is shorter or equal to the source length */
 
@@ -466,8 +466,8 @@ sal_Bool _osl_decodeURL( rtl_String* strUTF8, rtl_uString** pstrDecodedURL )
         {
         case '%':
             {
-                sal_Char    aToken[3];
-                sal_Char    aChar;
+                sal_Char	aToken[3];
+                sal_Char	aChar;
 
                 pSrc++;
                 aToken[0] = *pSrc++;
@@ -491,29 +491,29 @@ sal_Bool _osl_decodeURL( rtl_String* strUTF8, rtl_uString** pstrDecodedURL )
     }
 
     *pDest++ = 0;
-
+    
     if ( bValidEncoded ) {
         rtl_string2UString( pstrDecodedURL, pBuffer, rtl_str_getLength(pBuffer), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS );
         OSL_ASSERT(*pstrDecodedURL != 0);
     }
-
+    
     rtl_freeMemory( pBuffer );
 
     return bValidEncoded;
 }
 
-//#############################################
+//############################################# 
 void _osl_encodeURL( rtl_uString *strURL, rtl_String **pstrEncodedURL )
 {
     /* Encode non ascii characters within the URL */
 
-    rtl_String      *strUTF8 = NULL;
-    sal_Char        *pszEncodedURL;
-    const sal_Char  *pURLScan;
-    sal_Char        *pURLDest;
-    sal_Int32       nURLScanLen;
-    sal_Int32       nURLScanCount;
-
+    rtl_String		*strUTF8 = NULL;
+    sal_Char		*pszEncodedURL;
+    const sal_Char	*pURLScan;
+    sal_Char		*pURLDest;
+    sal_Int32		nURLScanLen;
+    sal_Int32		nURLScanCount;
+    
     rtl_uString2String( &strUTF8, rtl_uString_getStr( strURL ), rtl_uString_getLength( strURL ), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS );
 
     pszEncodedURL = (sal_Char*) rtl_allocateMemory( (rtl_string_getLength( strUTF8 ) * 3 + 1)  * sizeof(sal_Char) );
@@ -525,7 +525,7 @@ void _osl_encodeURL( rtl_uString *strURL, rtl_String **pstrEncodedURL )
 
     while ( nURLScanCount < nURLScanLen )
     {
-        sal_Char    cCurrent = *pURLScan;
+        sal_Char	cCurrent = *pURLScan;
 
         switch ( cCurrent )
         {
@@ -566,26 +566,26 @@ void _osl_encodeURL( rtl_uString *strURL, rtl_String **pstrEncodedURL )
     }
 
 
-    *pURLDest = 0;
+    *pURLDest = 0;	    
 
-    rtl_string_release( strUTF8 );
-    rtl_string_newFromStr( pstrEncodedURL, pszEncodedURL );
+    rtl_string_release( strUTF8 );        	  
+    rtl_string_newFromStr( pstrEncodedURL, pszEncodedURL );	    
     rtl_freeMemory( pszEncodedURL );
 }
 
-//#############################################
+//#############################################      
 oslFileError SAL_CALL _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString** pstrURL )
 {
     oslFileError nError = osl_File_E_INVAL; /* Assume failure */
-    rtl_uString *strTempURL = NULL;
+    rtl_uString	*strTempURL = NULL;
     DWORD dwPathType = PATHTYPE_ERROR;
 
     if (strPath)
         dwPathType = IsValidFilePath(strPath->buffer, NULL, VALIDATEPATH_ALLOW_RELATIVE);
-
+            
     if (dwPathType)
     {
-        rtl_uString *strTempPath = NULL;
+        rtl_uString	*strTempPath = NULL;
 
         /* Replace backslashes */
 
@@ -618,7 +618,7 @@ oslFileError SAL_CALL _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_u
 
     if ( osl_File_E_None == nError )
     {
-        rtl_String  *strEncodedURL = NULL;
+        rtl_String	*strEncodedURL = NULL;
 
         /* Encode the URL */
 
@@ -648,16 +648,16 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath,
     return _osl_getFileURLFromSystemPath( ustrSystemPath, pustrFileURL );
 }
 
-//#############################################
+//#############################################      
 oslFileError SAL_CALL _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **pustrPath, sal_Bool bAllowRelative )
 {
-    rtl_String          *strUTF8 = NULL;
-    rtl_uString         *strDecodedURL = NULL;
-    rtl_uString         *strTempPath = NULL;
-    const sal_Unicode   *pDecodedURL;
-    sal_uInt32          nDecodedLen;
-    sal_Bool            bValidEncoded;
-    oslFileError        nError = osl_File_E_INVAL;  /* Assume failure */
+    rtl_String			*strUTF8 = NULL;
+    rtl_uString			*strDecodedURL = NULL;
+    rtl_uString			*strTempPath = NULL;
+    const sal_Unicode	*pDecodedURL;
+    sal_uInt32			nDecodedLen;
+    sal_Bool			bValidEncoded;
+    oslFileError		nError = osl_File_E_INVAL;	/* Assume failure */
 
     /*  If someone hasn't encoded the complete URL we convert it to UTF8 now to prevent from
         having a mixed encoded URL later */
@@ -666,8 +666,8 @@ oslFileError SAL_CALL _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uS
 
     /* If the length of strUTF8 and strURL differs it indicates that the URL was not correct encoded */
 
-    OSL_ENSURE_FILE(
-        strUTF8->length == strURL->length ||
+    OSL_ENSURE_FILE( 
+        strUTF8->length == strURL->length || 
         0 != rtl_ustr_ascii_shortenedCompare_WithLength( strURL->buffer, strURL->length, "file:\\\\", 7 )
         ,"osl_getSystemPathFromFileURL: \"%s\" is not encoded !!!", strURL );
 
@@ -692,16 +692,16 @@ oslFileError SAL_CALL _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uS
 
         if ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pDecodedURL, nDecodedLen, "file:\\\\", 7 ) )
         {
-            sal_uInt32  nSkip;
+            sal_uInt32	nSkip;
 
             if ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pDecodedURL, nDecodedLen, "file:\\\\\\", 8 ) )
                 nSkip = 8;
-            else if (
+            else if ( 
                 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pDecodedURL, nDecodedLen, "file:\\\\localhost\\", 17 ) ||
-                0 == rtl_ustr_ascii_shortenedCompare_WithLength( pDecodedURL, nDecodedLen, "file:\\\\127.0.0.1\\", 17 )
+                0 == rtl_ustr_ascii_shortenedCompare_WithLength( pDecodedURL, nDecodedLen, "file:\\\\127.0.0.1\\", 17 ) 
             )
                 nSkip = 17;
-            else
+            else 
                 nSkip = 5;
 
             /* Indicates local root */
@@ -713,7 +713,7 @@ oslFileError SAL_CALL _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uS
             if ( IsValidFilePath( strTempPath->buffer, NULL, VALIDATEPATH_ALLOW_ELLIPSE ) )
                 nError = osl_File_E_None;
         }
-        else if ( bAllowRelative )  /* This maybe a relative file URL */
+        else if ( bAllowRelative )	/* This maybe a relative file URL */
         {
             rtl_uString_assign( &strTempPath, strDecodedURL );
 
@@ -726,13 +726,13 @@ oslFileError SAL_CALL _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uS
      */
 
     }
-
+    
     if ( strDecodedURL )
         rtl_uString_release( strDecodedURL );
-
+        
     if ( osl_File_E_None == nError )
         rtl_uString_assign( pustrPath, strTempPath );
-
+  
     if ( strTempPath )
         rtl_uString_release( strTempPath );
 
@@ -744,7 +744,7 @@ oslFileError SAL_CALL _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uS
 }
 
 /****************************************************************************/
-/*  osl_getSystemPathFromFileURL */
+/*	osl_getSystemPathFromFileURL */
 /****************************************************************************/
 
 oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath )
@@ -752,11 +752,11 @@ oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rt
     return _osl_getSystemPathFromFileURL( ustrFileURL, pustrSystemPath, sal_True );
 }
 
-
+        
 /****************************************************************************
- * osl_getSystemPathFromFileURL_Ex - helper function
- * clients may specify if they want to accept relative
- * URLs or not
+ * osl_getSystemPathFromFileURL_Ex - helper function                          
+ * clients may specify if they want to accept relative                      
+ * URLs or not                                                              
  ****************************************************************************/
 
 oslFileError osl_getSystemPathFromFileURL_Ex(
@@ -768,14 +768,14 @@ oslFileError osl_getSystemPathFromFileURL_Ex(
 
 #if OSL_DEBUG_LEVEL > 0
 
-    //#####################################################
+    //##################################################### 
     void _osl_warnFile( const char *message, rtl_uString *ustrFile )
     {
         char szBuffer[2048];
 
         if (ustrFile)
         {
-            rtl_String  *strFile = NULL;
+            rtl_String	*strFile = NULL;
 
             rtl_uString2String( &strFile, rtl_uString_getStr( ustrFile ), rtl_uString_getLength( ustrFile ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
             snprintf( szBuffer, sizeof(szBuffer), message, strFile->buffer );
@@ -791,13 +791,13 @@ oslFileError osl_getSystemPathFromFileURL_Ex(
 /******************************************************
  * osl_getAbsoluteFileURL
  ******************************************************/
-
+ 
 //oslFileError osl_getAbsoluteFileURL(rtl_uString*  ustrBaseDirURL, rtl_uString* ustrRelativeURL, rtl_uString** pustrAbsoluteURL)
 oslFileError SAL_CALL osl_getAbsoluteFileURL( rtl_uString* ustrBaseURL, rtl_uString* ustrRelativeURL, rtl_uString** pustrAbsoluteURL )
 {
-    oslFileError    eError;
-    rtl_uString     *ustrRelSysPath = NULL;
-    rtl_uString     *ustrBaseSysPath = NULL;
+    oslFileError	eError;
+    rtl_uString		*ustrRelSysPath = NULL;
+    rtl_uString		*ustrBaseSysPath = NULL;
 
     if ( ustrBaseURL && ustrBaseURL->length )
     {
@@ -814,24 +814,24 @@ oslFileError SAL_CALL osl_getAbsoluteFileURL( rtl_uString* ustrBaseURL, rtl_uStr
 
     if ( !eError )
     {
-        CHAR    szBuffer[_MAX_PATH];
-        CHAR    szRelSysPath[_MAX_PATH];
-        CHAR    szCurrentDir[_MAX_PATH];
-        int     result;
-        char*   cwd;
-        int     rc;
+        CHAR	szBuffer[_MAX_PATH];
+        CHAR	szRelSysPath[_MAX_PATH];
+        CHAR	szCurrentDir[_MAX_PATH];
+        int		result;
+        char*	cwd;
+        int		rc;
 
 /*@@@ToDo
   Bad, bad hack, this only works if the base path
   really exists which is not necessary according
   to RFC2396
-  The whole FileURL implementation should be merged
+  The whole FileURL implementation should be merged 
   with the rtl/uri class.
 */
         if ( ustrBaseSysPath )
         {
-            CHAR    szBaseSysPath[_MAX_PATH];
-
+            CHAR	szBaseSysPath[_MAX_PATH];
+            
             if (!g_CurrentDirectoryMutex)
                 g_CurrentDirectoryMutex = osl_createMutex();
 
@@ -854,7 +854,7 @@ oslFileError SAL_CALL osl_getAbsoluteFileURL( rtl_uString* ustrBaseURL, rtl_uStr
 
         if ( result )
         {
-                rtl_uString *ustrAbsSysPath = NULL;
+                rtl_uString	*ustrAbsSysPath = NULL;
 
                 oslMakeUStrFromPsz( szBuffer, &ustrAbsSysPath);
 
@@ -873,29 +873,29 @@ oslFileError SAL_CALL osl_getAbsoluteFileURL( rtl_uString* ustrBaseURL, rtl_uStr
     if ( ustrRelSysPath )
         rtl_uString_release( ustrRelSysPath );
 
-    return  eError;
-}
+    return	eError;
+}  
 
 
 namespace /* private */
 {
-
+                        
     /*********************************************
      No separate error code if unicode to text
      conversion or getenv fails because for the
      caller there is no difference why a file
-     could not be found in $PATH
+     could not be found in $PATH 
      ********************************************/
-
+ 
     bool find_in_PATH(const rtl::OUString& file_path, rtl::OUString& result)
-    {
-        bool          bfound = false;
+    {	
+        bool          bfound = false;		
         rtl::OUString path   = rtl::OUString::createFromAscii("PATH");
         rtl::OUString env_path;
-
+        
         if (osl_Process_E_None == osl_getEnvironment(path.pData, &env_path.pData))
             bfound = osl::searchPath(file_path, env_path, result);
-
+        
         return bfound;
     }
 
@@ -905,25 +905,25 @@ namespace /* private */
      caller there is no difference why a file
      could not be found in CDW
      ********************************************/
-
+ 
     bool find_in_CWD(const rtl::OUString& file_path, rtl::OUString& result)
-    {
-        bool bfound = false;
+    {		
+        bool bfound = false;		
         rtl::OUString cwd_url;
-
+        
         if (osl_Process_E_None == osl_getProcessWorkingDir(&cwd_url.pData))
         {
             rtl::OUString cwd;
-            FileBase::getSystemPathFromFileURL(cwd_url, cwd);
+            FileBase::getSystemPathFromFileURL(cwd_url, cwd);			
             bfound = osl::searchPath(file_path, cwd, result);
         }
         return bfound;
     }
-
+    
     /*********************************************
 
      ********************************************/
-
+ 
     bool find_in_searchPath(const rtl::OUString& file_path, rtl_uString* search_path, rtl::OUString& result)
     {
         return (search_path && osl::searchPath(file_path, rtl::OUString(search_path), result));
@@ -933,66 +933,66 @@ namespace /* private */
 
 
 /****************************************************************************
- *  osl_searchFileURL
+ *	osl_searchFileURL 
  ***************************************************************************/
-
+ 
 oslFileError osl_searchFileURL(rtl_uString* ustrFilePath, rtl_uString* ustrSearchPath, rtl_uString** pustrURL)
 {
     OSL_PRECOND(ustrFilePath && pustrURL, "osl_searchFileURL: invalid parameter");
-
+    
     FileBase::RC  rc;
     rtl::OUString file_path;
-
+        
     // try to interpret search path as file url else assume it's a system path list
     rc = FileBase::getSystemPathFromFileURL(rtl::OUString(ustrFilePath), file_path);
     if ((FileBase::E_None != rc) && (FileBase::E_INVAL == rc))
-        file_path = ustrFilePath;
+        file_path = ustrFilePath; 
     else if (FileBase::E_None != rc)
         return oslFileError(rc);
 
-    bool          bfound = false;
-    rtl::OUString result;
-
-    if (find_in_searchPath(file_path, ustrSearchPath, result) ||
-        find_in_PATH(file_path, result) ||
-        find_in_CWD(file_path, result))
-    {
+    bool          bfound = false;	
+    rtl::OUString result;	
+            
+    if (find_in_searchPath(file_path, ustrSearchPath, result) || 
+        find_in_PATH(file_path, result) || 
+        find_in_CWD(file_path, result))	
+    { 
         rtl::OUString resolved;
-
+        
         if (osl::realpath(result, resolved))
         {
-#if OSL_DEBUG_LEVEL > 0
-            oslFileError osl_error =
-#endif
-                osl_getFileURLFromSystemPath(resolved.pData, pustrURL);
+#if OSL_DEBUG_LEVEL > 0            
+            oslFileError osl_error = 
+#endif             
+                osl_getFileURLFromSystemPath(resolved.pData, pustrURL);		
             OSL_ASSERT(osl_File_E_None == osl_error);
             bfound = true;
         }
-    }
+    }    
     return bfound ? osl_File_E_None : osl_File_E_NOENT;
 }
 
 
 /****************************************************************************
- * FileURLToPath
+ * FileURLToPath 
  ***************************************************************************/
 
 oslFileError FileURLToPath(char * buffer, size_t bufLen, rtl_uString* ustrFileURL)
 {
     rtl_uString* ustrSystemPath = NULL;
-    oslFileError osl_error      = osl_getSystemPathFromFileURL(ustrFileURL, &ustrSystemPath);
-
+    oslFileError osl_error		= osl_getSystemPathFromFileURL(ustrFileURL, &ustrSystemPath);
+            
     if(osl_File_E_None != osl_error)
         return osl_error;
 
     osl_systemPathRemoveSeparator(ustrSystemPath);
-
+        
     /* convert unicode path to text */
     if(!UnicodeToText( buffer, bufLen, ustrSystemPath->buffer, ustrSystemPath->length))
-        osl_error = oslTranslateFileError(OSL_FET_ERROR, errno);
-
+        osl_error = oslTranslateFileError(OSL_FET_ERROR, errno); 
+        
     rtl_uString_release(ustrSystemPath);
-
+    
     return osl_error;
 }
 
diff --git a/sal/osl/os2/file_url.h b/sal/osl/os2/file_url.h
index 575976c09cae..bd4f31788723 100644
--- a/sal/osl/os2/file_url.h
+++ b/sal/osl/os2/file_url.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,28 +25,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
  /***************************************************
-  * Internal header file, declares all functions
-  * that are not part of the offical API and are
+  * Internal header file, declares all functions 
+  * that are not part of the offical API and are 
   * not defined in the osl header files
   **************************************************/
-
+ 
  #ifndef _FILE_URL_H_
  #define _FILE_URL_H_
-
+ 
  #ifndef _FILE_H_
  #include <osl/file.h>
  #endif
-
+ 
 
 /***************************************************
  * constants
  **************************************************/
 
-#define _tcslen(a)      wcslen((const wchar_t *) a)
-#define _tcsspn(a,b)    wcsspn((const wchar_t *) a, (const wchar_t *) b)
-#define _istalpha(a)    iswalpha((wint_t) a)
+#define _tcslen(a)		wcslen((const wchar_t *) a)
+#define _tcsspn(a,b)	wcsspn((const wchar_t *) a, (const wchar_t *) b)
+#define _istalpha(a)	iswalpha((wint_t) a)
 
 const sal_Unicode UNICHAR_SLASH = ((sal_Unicode)'/');
 const sal_Unicode UNICHAR_COLON = ((sal_Unicode)':');
@@ -58,16 +58,16 @@ const sal_Unicode UNICHAR_DOT   = ((sal_Unicode)'.');
 #define OSL_ENSURE_FILE( cond, msg, file ) ((void)0)
 #endif
 
-typedef sal_Unicode                         TCHAR;
-typedef sal_Unicode                         *LPTSTR;
-typedef const sal_Unicode                   *LPCTSTR;
-typedef wchar_t                         *LPWSTR;
-typedef const wchar_t                   *LPCWSTR;
-typedef sal_Unicode                         DWORD;
+typedef sal_Unicode            				TCHAR;
+typedef sal_Unicode           				*LPTSTR;
+typedef const sal_Unicode     				*LPCTSTR;
+typedef wchar_t           				*LPWSTR;
+typedef const wchar_t     				*LPCWSTR;
+typedef sal_Unicode							DWORD;
 #define WINAPI
 
-#define CHARSET_SEPARATOR                   L"\\/"
-#define WSTR_SYSTEM_ROOT_PATH               L"\\\\.\\"
+#define	CHARSET_SEPARATOR					L"\\/"
+#define WSTR_SYSTEM_ROOT_PATH				L"\\\\.\\"
 
 
 /******************************************************************************
@@ -76,45 +76,45 @@ typedef sal_Unicode                         DWORD;
  *
  ******************************************************************************/
 
-#define PATHTYPE_ERROR                      0
-#define PATHTYPE_RELATIVE                   1
-#define PATHTYPE_ABSOLUTE_UNC               2
-#define PATHTYPE_ABSOLUTE_LOCAL             3
-#define PATHTYPE_MASK_TYPE                  0xFF
-#define PATHTYPE_IS_VOLUME                  0x0100
-#define PATHTYPE_IS_SERVER                  0x0200
+#define PATHTYPE_ERROR						0
+#define PATHTYPE_RELATIVE					1
+#define PATHTYPE_ABSOLUTE_UNC				2
+#define PATHTYPE_ABSOLUTE_LOCAL				3
+#define PATHTYPE_MASK_TYPE					0xFF
+#define PATHTYPE_IS_VOLUME					0x0100
+#define PATHTYPE_IS_SERVER					0x0200
 
-#define VALIDATEPATH_NORMAL                 0x0000
-#define VALIDATEPATH_ALLOW_WILDCARDS        0x0001
-#define VALIDATEPATH_ALLOW_ELLIPSE          0x0002
-#define VALIDATEPATH_ALLOW_RELATIVE         0x0004
-#define VALIDATEPATH_ALLOW_UNC              0x0008
+#define VALIDATEPATH_NORMAL					0x0000
+#define VALIDATEPATH_ALLOW_WILDCARDS		0x0001
+#define VALIDATEPATH_ALLOW_ELLIPSE			0x0002
+#define VALIDATEPATH_ALLOW_RELATIVE			0x0004
+#define VALIDATEPATH_ALLOW_UNC				0x0008
 
 typedef struct {
-    UINT            uType;
-    rtl_uString*    ustrDrive;
-    rtl_uString*    ustrFilePath;   /* holds native directory path */
-    int             d_attr;         /* OS/2 file attributes */
-    int             nRefCount;
+    UINT			uType;
+    rtl_uString* 	ustrDrive;
+    rtl_uString* 	ustrFilePath;	/* holds native directory path */
+    int				d_attr;			/* OS/2 file attributes */
+    int				nRefCount;
 }DirectoryItem_Impl;
 
-#define DIRECTORYTYPE_LOCALROOT     0
-#define DIRECTORYTYPE_NETROOT       1
-#define DIRECTORYTYPE_NETRESORCE    2
-#define DIRECTORYTYPE_FILESYSTEM    3
+#define	DIRECTORYTYPE_LOCALROOT	    0
+#define	DIRECTORYTYPE_NETROOT		1
+#define	DIRECTORYTYPE_NETRESORCE	2
+#define	DIRECTORYTYPE_FILESYSTEM	3
 
-#define DIRECTORYITEM_DRIVE     0
-#define DIRECTORYITEM_FILE      1
-#define DIRECTORYITEM_SERVER    2
+#define DIRECTORYITEM_DRIVE		0
+#define DIRECTORYITEM_FILE		1
+#define DIRECTORYITEM_SERVER	2
 
 typedef struct
 {
-    UINT         uType;
+    UINT		 uType;
     rtl_uString* ustrPath;           /* holds native directory path */
     DIR*         pDirStruct;
-    ULONG        ulDriveMap;
-    ULONG        ulNextDrive;
-    ULONG        ulNextDriveMask;
+    ULONG		 ulDriveMap;
+    ULONG		 ulNextDrive;
+    ULONG		 ulNextDriveMask;
 } DirectoryImpl;
 
 /* Different types of paths */
@@ -148,15 +148,15 @@ typedef struct _oslVolumeDeviceHandleImpl
 
 /* OS error to errno values mapping table */
 struct errentry {
-    unsigned long oscode;   /* OS return value */
-    int errnocode;          /* System V error code */
+    unsigned long oscode;	/* OS return value */
+    int errnocode;			/* System V error code */
 };
 
 #ifdef __cplusplus
-extern "C"
+extern "C" 
 {
 #endif
-
+ 
 /**************************************************
 * _osl_getSystemPathFromFileURL
 *************************************************/
diff --git a/sal/osl/os2/helpers/debug.h b/sal/osl/os2/helpers/debug.h
index a8bcf5686cd7..5c17aec9e175 100644
--- a/sal/osl/os2/helpers/debug.h
+++ b/sal/osl/os2/helpers/debug.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/osl/os2/helpers/dosh.h b/sal/osl/os2/helpers/dosh.h
index 91fddd07294c..75f0b66f62b7 100644
--- a/sal/osl/os2/helpers/dosh.h
+++ b/sal/osl/os2/helpers/dosh.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/osl/os2/helpers/except.h b/sal/osl/os2/helpers/except.h
index 2749266c6fd8..a067e188fd00 100644
--- a/sal/osl/os2/helpers/except.h
+++ b/sal/osl/os2/helpers/except.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/osl/os2/helpers/setup.h b/sal/osl/os2/helpers/setup.h
index b0262fd8cfe7..61c7a3f17fe4 100644
--- a/sal/osl/os2/helpers/setup.h
+++ b/sal/osl/os2/helpers/setup.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/osl/os2/interlck.c b/sal/osl/os2/interlck.c
index cc4b00c49d43..6de04783ad84 100644
--- a/sal/osl/os2/interlck.c
+++ b/sal/osl/os2/interlck.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/osl/os2/module.c b/sal/osl/os2/module.c
index 57f4342a11b6..ca9193e7897e 100644
--- a/sal/osl/os2/module.c
+++ b/sal/osl/os2/module.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,8 +40,8 @@ int UnicodeToText(char *, size_t, const sal_Unicode *, sal_Int32);
 
 // static data for holding SAL dll module and full path
 static HMODULE hModSal;
-static char szSalDir[ _MAX_PATH];
-static char szSalDrive[ _MAX_PATH];
+static char	szSalDir[ _MAX_PATH];
+static char	szSalDrive[ _MAX_PATH];
 
 /*****************************************************************************/
 /* osl_loadModule */
@@ -50,7 +50,7 @@ static char szSalDrive[ _MAX_PATH];
 ULONG APIENTRY _DosLoadModule (PSZ pszObject, ULONG uObjectLen, PCSZ pszModule,
     PHMODULE phmod)
 {
-    APIRET  rc;
+    APIRET	rc;
     rc = DosLoadModule( pszObject, uObjectLen, pszModule, phmod);
     // YD 22/05/06 issue again if first call fails (why?)
     if (rc == ERROR_INVALID_PARAMETER)
@@ -86,10 +86,10 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *ustrModuleName, sal_Int32 nRtldMo
             // the build system
             _splitpath (buffer, drive, dir, fname, ext);
             if (strlen(fname)>8)
-                fname[8] = 0;   // truncate to 8.3
+                fname[8] = 0;	// truncate to 8.3
             dot = strchr( fname, '.');
             if (dot)
-                *dot = '\0';    // truncate on dot
+                *dot = '\0';	// truncate on dot
             // if drive is not specified, remove starting \ from dir name
             // so dll is loaded from LIBPATH
             if (drive[0] == 0 && dir[0] == '\\' && dir[1] == '\\') {
@@ -109,7 +109,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *ustrModuleName, sal_Int32 nRtldMo
                 {
                     sal_Char szError[ PATH_MAX*2 ];
                     sprintf( szError, "Module: %s; rc: %d;\nReason: %s;\n"
-                            "Please contact technical support and report above informations.\n\n",
+                            "Please contact technical support and report above informations.\n\n", 
                             buffer, rc, szErrorMessage );
 #if OSL_DEBUG_LEVEL>0
                     fprintf( stderr, szError);
@@ -134,7 +134,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *ustrModuleName, sal_Int32 nRtldMo
 /* osl_getModuleHandle */
 /*****************************************************************************/
 
-sal_Bool SAL_CALL
+sal_Bool SAL_CALL 
 osl_getModuleHandle(rtl_uString *pModuleName, oslModule *pResult)
 {
     HMODULE hmod;
@@ -145,7 +145,7 @@ osl_getModuleHandle(rtl_uString *pModuleName, oslModule *pResult)
         *pResult = (oslModule) hmod;
         return sal_True;
     }
-
+    
     return sal_False;
 }
 
@@ -165,7 +165,7 @@ void SAL_CALL osl_unloadModule(oslModule Module)
 /*****************************************************************************/
 /* osl_getSymbol */
 /*****************************************************************************/
-void* SAL_CALL
+void* SAL_CALL 
 osl_getSymbol(oslModule Module, rtl_uString* pSymbolName)
 {
     return (void *) osl_getFunctionSymbol(Module, pSymbolName);
@@ -182,10 +182,10 @@ oslGenericFunction SAL_CALL osl_getFunctionSymbol( oslModule Module, rtl_uString
     OSL_ASSERT(Module);
     OSL_ASSERT(strSymbolName);
 
-    rtl_uString2String(
-        &symbolName,
-        strSymbolName->buffer,
-        strSymbolName->length,
+    rtl_uString2String( 
+        &symbolName, 
+        strSymbolName->buffer, 
+        strSymbolName->length, 
         RTL_TEXTENCODING_UTF8,
         OUSTRING_TO_OSTRING_CVTFLAGS
     );
@@ -199,7 +199,7 @@ oslGenericFunction SAL_CALL osl_getFunctionSymbol( oslModule Module, rtl_uString
 /*****************************************************************************/
 /* osl_getAsciiFunctionSymbol */
 /*****************************************************************************/
-oslGenericFunction SAL_CALL
+oslGenericFunction SAL_CALL 
 osl_getAsciiFunctionSymbol( oslModule Module, const sal_Char *pSymbol )
 {
     PFN  pFunction;
@@ -238,13 +238,13 @@ osl_getAsciiFunctionSymbol( oslModule Module, const sal_Char *pSymbol )
 /*****************************************************************************/
 sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibraryUrl)
 {
-    //APIRET APIENTRY DosQueryModFromEIP (HMODULE *phMod, ULONG *pObjNum,
-    //          ULONG BuffLen, PCHAR pBuff, ULONG *pOffset, ULONG Address)
-    HMODULE hMod;
-    ULONG   ObjNum;
-    CHAR    Buff[2*_MAX_PATH];
-    ULONG   Offset;
-    APIRET  rc;
+    //APIRET APIENTRY DosQueryModFromEIP (HMODULE *phMod, ULONG *pObjNum, 
+    //          ULONG BuffLen, PCHAR pBuff, ULONG *pOffset, ULONG Address) 
+    HMODULE	hMod;
+    ULONG	ObjNum;
+    CHAR	Buff[2*_MAX_PATH];
+    ULONG	Offset;
+    APIRET	rc;
 
     // get module handle (and name)
     rc = DosQueryModFromEIP( &hMod, &ObjNum, sizeof( Buff), Buff, &Offset, (ULONG)addr);
@@ -261,7 +261,7 @@ sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibr
 #endif
 
     // convert to URL
-    rtl_uString *ustrSysPath = NULL;
+    rtl_uString	*ustrSysPath = NULL;
     rtl_string2UString( &ustrSysPath, Buff, strlen(Buff), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
     OSL_ASSERT(ustrSysPath != NULL);
     osl_getFileURLFromSystemPath( ustrSysPath, ppLibraryUrl );
@@ -275,7 +275,7 @@ sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibr
 /*****************************************************************************/
 sal_Bool SAL_CALL osl_getModuleURLFromFunctionAddress( oslGenericFunction addr, rtl_uString ** ppLibraryUrl )
 {
-    return osl_getModuleURLFromAddress( ( void * )addr, ppLibraryUrl );
+    return osl_getModuleURLFromAddress( ( void * )addr, ppLibraryUrl ); 
 }
 
 /*****************************************************************************/
diff --git a/sal/osl/os2/mutex.c b/sal/osl/os2/mutex.c
index b5aabb383428..4fba138808a9 100644
--- a/sal/osl/os2/mutex.c
+++ b/sal/osl/os2/mutex.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,10 +38,10 @@
     The void* hidden by oslMutex points to an OS/2 mutex semaphore.
 */
 typedef struct _oslMutexImpl {
-    HMTX                m_Mutex;
-    int                 m_Locks;
-    ULONG               m_Owner;
-    ULONG               m_Requests;
+    HMTX				m_Mutex;
+    int 				m_Locks;
+    ULONG				m_Owner;
+    ULONG				m_Requests;
 } oslMutexImpl;
 
 // static mutex to control access to private members of oslMutexImpl
@@ -58,7 +58,7 @@ oslMutex SAL_CALL osl_createMutex()
 
     pMutexImpl= (oslMutexImpl*)calloc(sizeof(oslMutexImpl), 1);
     OSL_ASSERT(pMutexImpl); /* alloc successful? */
-
+    
     /* create semaphore */
     rc = DosCreateMutexSem( NULL, &pMutexImpl->m_Mutex, 0, FALSE );
     if( rc != 0 )
@@ -116,7 +116,7 @@ sal_Bool SAL_CALL osl_acquireMutex(oslMutex Mutex)
 /*****************************************************************************/
 sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutex Mutex)
 {
-    sal_Bool     ret = sal_False;
+    sal_Bool 	 ret = sal_False;
     oslMutexImpl *pMutexImpl = (oslMutexImpl *)Mutex;
     OSL_ASSERT(Mutex);
 
@@ -127,7 +127,7 @@ sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutex Mutex)
         ret = osl_acquireMutex(Mutex);
 
     DosReleaseMutexSem( MutexLock);
-
+    
     return ret;
 }
 
@@ -160,7 +160,7 @@ sal_Bool SAL_CALL osl_releaseMutex(oslMutex Mutex)
 
 oslMutex g_Mutex = NULL;
 
-oslMutex * SAL_CALL osl_getGlobalMutex(void)
+oslMutex * SAL_CALL osl_getGlobalMutex(void) 
 {
     if (g_Mutex == NULL)
         g_Mutex = osl_createMutex();
diff --git a/sal/osl/os2/nlsupport.c b/sal/osl/os2/nlsupport.c
index 6c7ee0dc78ff..1167148140f4 100644
--- a/sal/osl/os2/nlsupport.c
+++ b/sal/osl/os2/nlsupport.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,7 +48,7 @@ typedef struct {
 
 
 /*****************************************************************************
- compare function for binary search
+ compare function for binary search   
  *****************************************************************************/
 
 static int
@@ -101,65 +101,65 @@ static char * _compose_locale( rtl_Locale * pLocale, char * buffer, size_t n )
     if( pLocale && pLocale->Language && (pLocale->Language->length == 2) )
     {
         size_t offset = 0;
-
+        
         /* convert language code to ascii */
         {
             rtl_String *pLanguage = NULL;
-
-            rtl_uString2String( &pLanguage,
+            
+            rtl_uString2String( &pLanguage, 
                 pLocale->Language->buffer, pLocale->Language->length,
                 RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS );
-
+            
             if( pLanguage->length < n )
-            {
+            {    
                 strcpy( buffer, pLanguage->buffer );
                 offset = pLanguage->length;
             }
-
+            
             rtl_string_release( pLanguage );
         }
-
+        
         /* convert country code to ascii */
         if( pLocale->Country && (pLocale->Country->length == 2) )
         {
             rtl_String *pCountry = NULL;
-
-            rtl_uString2String( &pCountry,
+            
+            rtl_uString2String( &pCountry, 
                 pLocale->Country->buffer, pLocale->Country->length,
                 RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS );
-
+             
             if( offset + pCountry->length + 1 < n )
-            {
-                strcpy( buffer + offset++, "_" );
+            {    
+                strcpy( buffer + offset++, "_" );   
                 strcpy( buffer + offset, pCountry->buffer );
                 offset += pCountry->length;
             }
-
+            
             rtl_string_release( pCountry );
         }
-
+        
         /* convert variant to ascii - check if there is enough space for the variant string */
         if( pLocale->Variant && pLocale->Variant->length &&
             ( pLocale->Variant->length < n - 6 ) )
         {
             rtl_String *pVariant = NULL;
-
+            
             rtl_uString2String( &pVariant,
                 pLocale->Variant->buffer, pLocale->Variant->length,
                 RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS );
-
+             
             if( offset + pVariant->length + 1 < n )
-            {
+            {    
                 strcpy( buffer + offset, pVariant->buffer );
                 offset += pVariant->length;
             }
 
             rtl_string_release( pVariant );
         }
-
+        
         return buffer;
     }
-
+    
     return NULL;
 }
 
@@ -170,7 +170,7 @@ static char * _compose_locale( rtl_Locale * pLocale, char * buffer, size_t n )
 static rtl_Locale * _parse_locale( const char * locale )
 {
     static sal_Unicode c_locale[2] = { (sal_Unicode) 'C', 0 };
-
+    
     /* check if locale contains a valid string */
     if( locale )
     {
@@ -181,7 +181,7 @@ static rtl_Locale * _parse_locale( const char * locale )
             rtl_uString * pLanguage = NULL;
             rtl_uString * pCountry  = NULL;
             rtl_uString * pVariant  = NULL;
-
+    
             size_t offset = 2;
 
             /* convert language code to unicode */
@@ -211,14 +211,14 @@ static rtl_Locale * _parse_locale( const char * locale )
             return ret;
         }
         else
-            return rtl_locale_register( c_locale, c_locale + 1, c_locale + 1 );
+            return rtl_locale_register( c_locale, c_locale + 1, c_locale + 1 ); 
     }
-
+    
     return NULL;
 }
-
+        
 /*
- * This implementation of osl_getTextEncodingFromLocale maps
+ * This implementation of osl_getTextEncodingFromLocale maps 
  * from the ISO language codes.
  */
 
@@ -229,15 +229,15 @@ const _pair _full_locale_list[] = {
     { "zh_CN.EUC",    RTL_TEXTENCODING_EUC_CN      },
     { "zh_TW.EUC",    RTL_TEXTENCODING_EUC_TW      }
 };
-
+ 
 const _pair _locale_extension_list[] = {
     { "big5",         RTL_TEXTENCODING_BIG5        },
     { "big5hk",       RTL_TEXTENCODING_BIG5_HKSCS  },
     { "gb18030",      RTL_TEXTENCODING_GB_18030    },
     { "euc",          RTL_TEXTENCODING_EUC_JP      },
     { "iso8859-1",    RTL_TEXTENCODING_ISO_8859_1  },
-    { "iso8859-10",   RTL_TEXTENCODING_ISO_8859_10 },
-    { "iso8859-13",   RTL_TEXTENCODING_ISO_8859_13 },
+    { "iso8859-10",   RTL_TEXTENCODING_ISO_8859_10 }, 
+    { "iso8859-13",   RTL_TEXTENCODING_ISO_8859_13 }, 
     { "iso8859-14",   RTL_TEXTENCODING_ISO_8859_14 },
     { "iso8859-15",   RTL_TEXTENCODING_ISO_8859_15 },
     { "iso8859-2",    RTL_TEXTENCODING_ISO_8859_2  },
@@ -260,63 +260,63 @@ const _pair _locale_extension_list[] = {
 };
 
 const _pair _iso_language_list[] = {
-    { "af",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "ar",  RTL_TEXTENCODING_ISO_8859_6 },
-    { "az",  RTL_TEXTENCODING_ISO_8859_9 },
-    { "be",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "bg",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "ca",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "cs",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "da",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "de",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "el",  RTL_TEXTENCODING_ISO_8859_7 },
-    { "en",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "es",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "et",  RTL_TEXTENCODING_ISO_8859_4 },
-    { "eu",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "fa",  RTL_TEXTENCODING_ISO_8859_6 },
-    { "fi",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "fo",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "fr",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "gr",  RTL_TEXTENCODING_ISO_8859_7 },
+    { "af",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "ar",  RTL_TEXTENCODING_ISO_8859_6 }, 
+    { "az",  RTL_TEXTENCODING_ISO_8859_9 }, 
+    { "be",  RTL_TEXTENCODING_ISO_8859_5 }, 
+    { "bg",  RTL_TEXTENCODING_ISO_8859_5 }, 
+    { "ca",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "cs",  RTL_TEXTENCODING_ISO_8859_2 }, 
+    { "da",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "de",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "el",  RTL_TEXTENCODING_ISO_8859_7 }, 
+    { "en",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "es",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "et",  RTL_TEXTENCODING_ISO_8859_4 }, 
+    { "eu",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "fa",  RTL_TEXTENCODING_ISO_8859_6 }, 
+    { "fi",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "fo",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "fr",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "gr",  RTL_TEXTENCODING_ISO_8859_7 }, 
     { "he",  RTL_TEXTENCODING_ISO_8859_8 },
-    { "hi",  RTL_TEXTENCODING_DONTKNOW },
-    { "hr",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "hu",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "hy",  RTL_TEXTENCODING_DONTKNOW },
-    { "id",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "is",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "it",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "iw",  RTL_TEXTENCODING_ISO_8859_8 },
-    { "ja",  RTL_TEXTENCODING_EUC_JP },
-    { "ka",  RTL_TEXTENCODING_DONTKNOW },
-    { "kk",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "ko",  RTL_TEXTENCODING_EUC_KR },
-    { "lt",  RTL_TEXTENCODING_ISO_8859_4 },
-    { "lv",  RTL_TEXTENCODING_ISO_8859_4 },
-    { "mk",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "mr",  RTL_TEXTENCODING_DONTKNOW },
-    { "ms",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "nl",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "no",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "pl",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "pt",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "ro",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "ru",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "sa",  RTL_TEXTENCODING_DONTKNOW },
-    { "sk",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "sl",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "sq",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "sv",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "sw",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "ta",  RTL_TEXTENCODING_DONTKNOW },
-    { "th",  RTL_TEXTENCODING_DONTKNOW },
-    { "tr",  RTL_TEXTENCODING_ISO_8859_9 },
-    { "tt",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "uk",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "ur",  RTL_TEXTENCODING_ISO_8859_6 },
-    { "uz",  RTL_TEXTENCODING_ISO_8859_9 },
-    { "vi",  RTL_TEXTENCODING_DONTKNOW },
+    { "hi",  RTL_TEXTENCODING_DONTKNOW }, 
+    { "hr",  RTL_TEXTENCODING_ISO_8859_2 }, 
+    { "hu",  RTL_TEXTENCODING_ISO_8859_2 }, 
+    { "hy",  RTL_TEXTENCODING_DONTKNOW }, 
+    { "id",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "is",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "it",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "iw",  RTL_TEXTENCODING_ISO_8859_8 }, 
+    { "ja",  RTL_TEXTENCODING_EUC_JP }, 
+    { "ka",  RTL_TEXTENCODING_DONTKNOW }, 
+    { "kk",  RTL_TEXTENCODING_ISO_8859_5 }, 
+    { "ko",  RTL_TEXTENCODING_EUC_KR }, 
+    { "lt",  RTL_TEXTENCODING_ISO_8859_4 }, 
+    { "lv",  RTL_TEXTENCODING_ISO_8859_4 }, 
+    { "mk",  RTL_TEXTENCODING_ISO_8859_5 }, 
+    { "mr",  RTL_TEXTENCODING_DONTKNOW }, 
+    { "ms",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "nl",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "no",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "pl",  RTL_TEXTENCODING_ISO_8859_2 }, 
+    { "pt",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "ro",  RTL_TEXTENCODING_ISO_8859_2 }, 
+    { "ru",  RTL_TEXTENCODING_ISO_8859_5 }, 
+    { "sa",  RTL_TEXTENCODING_DONTKNOW }, 
+    { "sk",  RTL_TEXTENCODING_ISO_8859_2 }, 
+    { "sl",  RTL_TEXTENCODING_ISO_8859_2 }, 
+    { "sq",  RTL_TEXTENCODING_ISO_8859_2 }, 
+    { "sv",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "sw",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "ta",  RTL_TEXTENCODING_DONTKNOW }, 
+    { "th",  RTL_TEXTENCODING_DONTKNOW }, 
+    { "tr",  RTL_TEXTENCODING_ISO_8859_9 }, 
+    { "tt",  RTL_TEXTENCODING_ISO_8859_5 }, 
+    { "uk",  RTL_TEXTENCODING_ISO_8859_5 }, 
+    { "ur",  RTL_TEXTENCODING_ISO_8859_6 }, 
+    { "uz",  RTL_TEXTENCODING_ISO_8859_9 }, 
+    { "vi",  RTL_TEXTENCODING_DONTKNOW }, 
     { "zh",  RTL_TEXTENCODING_BIG5 }
 };
 
@@ -378,7 +378,7 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
      * rtl-codeset */
     if ( language != NULL )
         return language->value;
-
+   
     return RTL_TEXTENCODING_DONTKNOW;
 }
 
@@ -390,7 +390,7 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
 {
     /* simulate behavior off setlocale */
     char * locale = getenv( "LC_ALL" );
-
+    
     if( NULL == locale )
         locale = getenv( "LC_CTYPE" );
 
@@ -410,7 +410,7 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
 int _imp_setProcessLocale( rtl_Locale * pLocale )
 {
     char locale_buf[64];
-
+    
     /* convert rtl_Locale to locale string */
     if( NULL != _compose_locale( pLocale, locale_buf, 64 ) )
     {
diff --git a/sal/osl/os2/path_helper.cxx b/sal/osl/os2/path_helper.cxx
index f433e79201f2..3c6eab9436d3 100644
--- a/sal/osl/os2/path_helper.cxx
+++ b/sal/osl/os2/path_helper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
 /*******************************************************************
  Includes
  ******************************************************************/
-
+ 
 #include "path_helper.hxx"
 #include <osl/diagnose.h>
 #include <rtl/ustring.hxx>
@@ -41,28 +41,28 @@
 /*******************************************************************
  Constants
  ******************************************************************/
-
+ 
 const rtl::OUString BACKSLASH = rtl::OUString::createFromAscii("\\");
 const rtl::OUString SLASH     = rtl::OUString::createFromAscii("/");
 
 /*******************************************************************
  osl_systemPathEnsureSeparator
  ******************************************************************/
-
+ 
 void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath)
 {
     OSL_PRECOND(ppustrPath && (NULL != *ppustrPath), \
                 "osl_systemPathEnsureSeparator: Invalid parameter");
-
-     rtl::OUString path(*ppustrPath);
+    
+     rtl::OUString path(*ppustrPath);	
     sal_Int32     i = std::max<sal_Int32>(path.lastIndexOf(BACKSLASH), path.lastIndexOf(SLASH));
-
+    
     if (i < (path.getLength()-1))
     {
-        path += BACKSLASH;
-        rtl_uString_assign(ppustrPath, path.pData);
+        path += BACKSLASH; 
+        rtl_uString_assign(ppustrPath, path.pData);			
     }
-
+    
     OSL_POSTCOND(path.lastIndexOf(BACKSLASH) == (path.getLength() - 1), \
                  "osl_systemPathEnsureSeparator: Post condition failed");
 }
@@ -70,18 +70,18 @@ void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath)
 /*******************************************************************
  osl_systemPathRemoveSeparator
  ******************************************************************/
-
+ 
 void SAL_CALL osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath)
 {
     rtl::OUString path(*ppustrPath);
-
+    
     if (!osl::systemPathIsLogicalDrivePattern(path))
-    {
+    {        
         sal_Int32 i = std::max<sal_Int32>(path.lastIndexOf(BACKSLASH), path.lastIndexOf(SLASH));
-
-        if (i > -1 && (i == (path.getLength() - 1)))
+        
+        if (i > -1 && (i == (path.getLength() - 1)))        
         {
-            path = rtl::OUString(path.getStr(), path.getLength() - 1);
+            path = rtl::OUString(path.getStr(), path.getLength() - 1);                    
             rtl_uString_assign(ppustrPath, path.pData);
         }
     }
@@ -95,22 +95,22 @@ void SAL_CALL osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath)
 const sal_Unicode* LDP                    = L":";
 const sal_Unicode* LDP_WITH_BACKSLASH     = L":\\";
 const sal_Unicode* LDP_WITH_SLASH         = L":/";
-
-// degenerated case returned by the Windows FileOpen dialog
+   
+// degenerated case returned by the Windows FileOpen dialog 
 // when someone enters for instance "x:filename", the Win32
 // API accepts this case
 const sal_Unicode* LDP_WITH_DOT_BACKSLASH = L":.\\";
-
+     
 sal_Int32 osl_systemPathIsLogicalDrivePattern(/*in*/ const rtl_uString* pustrPath)
 {
     const sal_Unicode* p = rtl_uString_getStr(const_cast<rtl_uString*>(pustrPath));
     if (iswalpha(*p++))
-    {
-        return ((0 == wcscmp(p, LDP)) ||
-                (0 == wcscmp(p, LDP_WITH_BACKSLASH)) ||
+    {                           
+        return ((0 == wcscmp(p, LDP)) || 
+                (0 == wcscmp(p, LDP_WITH_BACKSLASH)) || 
                 (0 == wcscmp(p, LDP_WITH_SLASH)) ||
                 (0 == wcscmp(p, LDP_WITH_DOT_BACKSLASH)));
-    }
+    }   
     return 0;
 }
 
diff --git a/sal/osl/os2/path_helper.h b/sal/osl/os2/path_helper.h
index cb39c49e36d6..41a0f4330bb2 100644
--- a/sal/osl/os2/path_helper.h
+++ b/sal/osl/os2/path_helper.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,19 +40,19 @@ extern "C"
 
 /*******************************************************************
  osl_systemPathEnsureSeparator
- Adds a trailing path separator to the given system path if not
+ Adds a trailing path separator to the given system path if not 
  already there and if the path is not the root path or a logical
  drive alone
  ******************************************************************/
-
+ 
 void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath);
 
 /*******************************************************************
  osl_systemPathRemoveSeparator
- Removes the last separator from the given system path if any and
+ Removes the last separator from the given system path if any and 
  if the path is not the root path '\'
  ******************************************************************/
-
+ 
 void SAL_CALL osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath);
 
 /*******************************************************************
@@ -61,9 +61,9 @@ void SAL_CALL osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath);
  A logical drive pattern is something like "a:\", "c:\".
  No logical drive pattern is something like "c:\test"
  ******************************************************************/
-
+ 
 sal_Int32 osl_systemPathIsLogicalDrivePattern(/*in*/ const rtl_uString* pustrPath);
-
+          
 #ifdef __cplusplus
 }
 #endif
diff --git a/sal/osl/os2/path_helper.hxx b/sal/osl/os2/path_helper.hxx
index ee1dbeebae51..9fde55ee9933 100644
--- a/sal/osl/os2/path_helper.hxx
+++ b/sal/osl/os2/path_helper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,11 +39,11 @@ namespace osl
 
 /*******************************************************************
  osl_systemPathEnsureSeparator
- Adds a trailing path separator to the given system path if not
+ Adds a trailing path separator to the given system path if not 
  already there and if the path is not the root path or a logical
  drive alone
  ******************************************************************/
-
+ 
 inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
 {
     osl_systemPathEnsureSeparator(&Path.pData);
@@ -51,26 +51,26 @@ inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
 
 /*******************************************************************
  osl_systemPathRemoveSeparator
- Removes the last separator from the given system path if any and
+ Removes the last separator from the given system path if any and 
  if the path is not the root path '\'
  ******************************************************************/
-
+ 
 inline void systemPathRemoveSeparator(/*inout*/ rtl::OUString& Path)
 {
     osl_systemPathRemoveSeparator(&Path.pData);
 }
 
 /*******************************************************************
- osl_systemPathIsLogicalDrivePattern
+ osl_systemPathIsLogicalDrivePattern 
  ******************************************************************/
-
+ 
 inline bool systemPathIsLogicalDrivePattern(/*in*/ const rtl::OUString& path)
 {
     return osl_systemPathIsLogicalDrivePattern(path.pData);
 }
-
+          
 } // end namespace osl
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/pipe.cxx b/sal/osl/os2/pipe.cxx
index 909c1dedb322..982648876e91 100644
--- a/sal/osl/os2/pipe.cxx
+++ b/sal/osl/os2/pipe.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,8 +39,8 @@
 #include <osl/process.h>
 #include <rtl/ustring.hxx>
 
-#define PIPENAMEMASK    "OSL_PIPE_%s"
-#define SECPIPENAMEMASK "OSL_PIPE_%s_%s"
+#define PIPENAMEMASK	"OSL_PIPE_%s"
+#define SECPIPENAMEMASK	"OSL_PIPE_%s_%s"
 
 typedef enum {
     MSG_SYN,
@@ -51,10 +51,10 @@ typedef enum {
 
 struct oslPipeImpl {
     oslInterlockedCount m_Reference;
-    HPIPE               hPipe;
-    HMTX                m_NamedObject;
-    APIRET              nLastError;
-    //oslSecurity       m_Security;
+    HPIPE  				hPipe;
+    HMTX				m_NamedObject;
+    APIRET 				nLastError;
+    //oslSecurity  		m_Security;
     sal_Bool            m_bClosed;
 };
 
@@ -105,11 +105,11 @@ void __osl_destroyPipeImpl(oslPipe pPipe)
 /*****************************************************************************/
 /* osl_createPipe  */
 /*****************************************************************************/
-oslPipe SAL_CALL osl_createPipe(rtl_uString *ustrPipeName, oslPipeOptions Options,
+oslPipe SAL_CALL osl_createPipe(rtl_uString *ustrPipeName, oslPipeOptions Options, 
                        oslSecurity Security)
 {
     oslPipe pPipe;
-
+    
     ULONG  ulAction;
     CHAR   strPipeNameBuffer [CCHMAXPATHCOMP];
     rtl_String* strPipeName=0;
@@ -137,7 +137,7 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *ustrPipeName, oslPipeOptions Option
     {
     case osl_Pipe_OPEN:
         {
-            APIRET  fPipeAvailable;
+            APIRET	fPipeAvailable;
 
             sprintf (strPipeNameBuffer, "\\PIPE\\OSL_PIPE_%s", sPipe.getStr());
 #if OSL_DEBUG_LEVEL>0
@@ -145,8 +145,8 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *ustrPipeName, oslPipeOptions Option
 #endif
             ngLastError = DosOpen( (PCSZ)strPipeNameBuffer,
                                 &(pPipe->hPipe), &ulAction,
-                                0, FILE_NORMAL, FILE_OPEN,
-                                OPEN_ACCESS_READWRITE | OPEN_SHARE_DENYREADWRITE,
+                                0, FILE_NORMAL,	FILE_OPEN,
+                                OPEN_ACCESS_READWRITE |	OPEN_SHARE_DENYREADWRITE,
                                 (PEAOP2) NULL);
             // if pipe is busy, wait for it
             if (ngLastError == ERROR_PIPE_BUSY)
@@ -218,7 +218,7 @@ oslPipe SAL_CALL osl_copyPipe(oslPipe pPipe)
     //oslPipe* pPipe = (oslPipe*) Pipe;
     oslPipe pNewPipe;
 
-
+    
     /* check parameter */
     OSL_ASSERT (pPipe);
 
@@ -250,16 +250,16 @@ void SAL_CALL osl_acquirePipe( oslPipe pPipe )
 
 void SAL_CALL osl_releasePipe( oslPipe pPipe )
 {
-//      OSL_ASSERT( pPipe );
-
+//  	OSL_ASSERT( pPipe );
+    
     if( 0 == pPipe )
         return;
-
+    
     if( 0 == osl_decrementInterlockedCount( &(pPipe->m_Reference) ) )
     {
         if( ! pPipe->m_bClosed )
             osl_closePipe( pPipe );
-
+        
         __osl_destroyPipeImpl( pPipe );
     }
 }
@@ -281,7 +281,7 @@ void SAL_CALL osl_closePipe(oslPipe pPipe)
         {
             /* disconnect client */
             DosDisConnectNPipe (pPipe->hPipe);
-
+            
             /* close the pipe */
             DosClose (pPipe->hPipe);
         }
@@ -293,9 +293,9 @@ void SAL_CALL osl_closePipe(oslPipe pPipe)
 /*****************************************************************************/
 oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
 {
-
+    
 #define PINFO ((PIPEINFO *) &PipeInfoBuffer)
-
+    
     ///oslPipe* pPipe = (oslPipe*) Pipe;
     oslPipe pNewPipe;
     BYTE     PipeInfoBuffer[sizeof(PIPEINFO) + CCHMAXPATHCOMP];
@@ -308,7 +308,7 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
                                          1,
                                          (PVOID) &PipeInfoBuffer,
                                          sizeof(PipeInfoBuffer));
-
+    
     if (pPipe->nLastError)
     {
         OSL_TRACE( "osl_acceptPipe failed for requesting pipe information.\n",
@@ -321,7 +321,7 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
         PINFO->cbMaxInst > PINFO->cbCurInst)
     {
         HPIPE hPipe;
-
+        
         pNewPipe = __osl_createPipeImpl();
 
         if (!pNewPipe)
@@ -332,7 +332,7 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
         }
 
         //pNewPipe->m_Security = pPipe->m_Security;
-
+        
         pNewPipe->nLastError =
             DosCreateNPipe( (PCSZ)PINFO->szName,
                             &(pNewPipe->hPipe),
@@ -342,7 +342,7 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
                             ulBufSize,           /* input buffer size */
                             0L                   /* use default time-out time */
                           );
-
+        
         if (pNewPipe->nLastError)
         {
             OSL_TRACE( "osl_acceptPipe failed creating new named pipe, Error-Code: %d.\n",
@@ -350,21 +350,21 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
             free(pNewPipe);
             return NULL;
         }
-
+        
         /* switch pipe handles */
         hPipe = pPipe->hPipe;
         pPipe->hPipe  = pNewPipe->hPipe;
         pNewPipe->hPipe = hPipe;
-
+        
         /* connect new handle to client */
         pNewPipe->nLastError = DosConnectNPipe( pNewPipe->hPipe );
-
+    
         /* if failed, release allocated memory */
         if (pNewPipe->nLastError)
         {
             OSL_TRACE( "osl_acceptPipe failed connecting pipe to client, Error-Code: %d.\n",
                        pNewPipe->nLastError );
-
+            
             osl_closePipe((oslPipe)pNewPipe);
             return NULL;
         }
@@ -374,14 +374,14 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
     {
         /* connect original handle to client */
         pPipe->nLastError = DosConnectNPipe( pPipe->hPipe );
-
+    
         if (pPipe->nLastError)
         {
             OSL_TRACE( "osl_acceptPipe failed connecting pipe to client, Error-Code: %d.\n",
                        pPipe->nLastError );
             return NULL;
         }
-
+    
         return (oslPipe)pPipe;
     }
 }
@@ -395,7 +395,7 @@ sal_Int32 SAL_CALL osl_receivePipe(oslPipe pPipe,
 {
     //oslPipe* pPipe = (oslPipe*) Pipe;
     ULONG  ulActual;
-
+    
     /* check parameter */
     OSL_ASSERT (pPipe);
 
@@ -423,7 +423,7 @@ sal_Int32 SAL_CALL osl_sendPipe(oslPipe pPipe,
 {
     //oslPipe* pPipe = (oslPipe*) Pipe;
     ULONG  ulActual;
-
+    
     /* check parameter */
     OSL_ASSERT (pPipe);
 
@@ -458,7 +458,7 @@ oslPipeError SAL_CALL osl_getLastPipeError(oslPipe pPipe)
         pPipe->nLastError = NO_ERROR;
     } else
         rc = ngLastError;
-
+    
     /* map OS/2 error values */
     switch (rc)
     {
@@ -534,7 +534,7 @@ sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n )
 /**********************************************
  osl_sendResourcePipe
  *********************************************/
-
+ 
 sal_Bool osl_sendResourcePipe(oslPipe pPipe, oslSocket pSocket)
 {
     sal_Bool bRet = sal_False;
@@ -545,7 +545,7 @@ sal_Bool osl_sendResourcePipe(oslPipe pPipe, oslSocket pSocket)
 /**********************************************
  osl_receiveResourcePipe
  *********************************************/
-
+ 
 oslSocket osl_receiveResourcePipe(oslPipe pPipe)
 {
     oslSocket pSocket=0;
diff --git a/sal/osl/os2/pipeimpl.cxx b/sal/osl/os2/pipeimpl.cxx
index 0ec2ba7f2887..4961c1b26fb6 100644
--- a/sal/osl/os2/pipeimpl.cxx
+++ b/sal/osl/os2/pipeimpl.cxx
@@ -1,15 +1,15 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#   include "pipeimpl.h"
+#	include "pipeimpl.h"
 
 #ifndef _INC_MALLOC
-#   include <malloc.h>
+#	include <malloc.h>
 #endif
 
 #ifndef _INC_TCHAR
-#   ifdef UNICODE
-#       define _UNICODE
-#   endif
-#   include <tchar.h>
+#	ifdef UNICODE
+#		define _UNICODE
+#	endif
+#	include <tchar.h>
 #endif
 
 const TCHAR PIPE_NAME_PREFIX_MAPPING[] = TEXT("PIPE_FILE_MAPPING_");
@@ -20,35 +20,35 @@ const DWORD PIPE_BUFFER_SIZE = 4096;
 
 
 //============================================================================
-//  PipeData
+//	PipeData
 //============================================================================
 
 struct PipeData
 {
-    DWORD   dwProcessId;
-    HANDLE  hReadPipe;
-    HANDLE  hWritePipe;
+    DWORD	dwProcessId;
+    HANDLE	hReadPipe;
+    HANDLE	hWritePipe;
 };
 
 //============================================================================
-//  Pipe
+//	Pipe
 //============================================================================
 
 #ifdef UNICODE
-#define Pipe        PipeW
-#define ClientPipe  ClientPipeW
-#define ServerPipe  ServerPipeW
+#define Pipe		PipeW
+#define ClientPipe	ClientPipeW
+#define ServerPipe	ServerPipeW
 #else
-#define Pipe        PipeA
-#define ClientPipe  ClientPipeA
-#define ServerPipe  ServerPipeA
+#define Pipe		PipeA
+#define ClientPipe	ClientPipeA
+#define ServerPipe	ServerPipeA
 #endif
 
 class Pipe
 {
 protected:
-    HANDLE  m_hReadPipe;    // Handle to use for reading
-    HANDLE  m_hWritePipe;   // Handle to use for writing
+    HANDLE	m_hReadPipe;	// Handle to use for reading
+    HANDLE	m_hWritePipe;	// Handle to use for writing
 
     Pipe( HANDLE hReadPipe, HANDLE hWritePipe );
 
@@ -90,7 +90,7 @@ public:
 };
 
 //============================================================================
-//  ClientPipe
+//	ClientPipe
 //============================================================================
 
 class ClientPipe : public Pipe
@@ -102,15 +102,15 @@ public:
 };
 
 //============================================================================
-//  ServerPipe
+//	ServerPipe
 //============================================================================
 
 class ServerPipe : public Pipe
 {
 protected:
-    HANDLE  m_hMapping;
-    HANDLE  m_hSynchronize;
-    LPTSTR  m_lpName;
+    HANDLE	m_hMapping;
+    HANDLE	m_hSynchronize;
+    LPTSTR	m_lpName;
 
     ServerPipe( LPCTSTR lpName, HANDLE hMapping, HANDLE hSynchronize, HANDLE hReadPipe, HANDLE hWritePipe );
 public:
@@ -122,24 +122,24 @@ public:
 };
 
 //----------------------------------------------------------------------------
-//
+//	
 //----------------------------------------------------------------------------
 
-HANDLE  Pipe::CreatePipeDataMapping( LPCTSTR lpName )
+HANDLE	Pipe::CreatePipeDataMapping( LPCTSTR lpName )
 {
-    HANDLE  hMapping = NULL;
-    LPTSTR  lpMappingName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_MAPPING) );
+    HANDLE	hMapping = NULL;
+    LPTSTR	lpMappingName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_MAPPING) );
 
     if ( lpMappingName )
     {
         _tcscpy( lpMappingName, PIPE_NAME_PREFIX_MAPPING );
         _tcscat( lpMappingName, lpName );
 
-        LPTSTR  lpMappingFileName = (LPTSTR)alloca( MAX_PATH * sizeof(TCHAR) );
+        LPTSTR	lpMappingFileName = (LPTSTR)alloca( MAX_PATH * sizeof(TCHAR) );
 
         if ( lpMappingFileName )
         {
-            DWORD   nChars = GetTempPath( MAX_PATH, lpMappingFileName );
+            DWORD	nChars = GetTempPath( MAX_PATH, lpMappingFileName );
 
             if ( MAX_PATH + _tcslen(lpName) < nChars + 1 )
             {
@@ -157,13 +157,13 @@ HANDLE  Pipe::CreatePipeDataMapping( LPCTSTR lpName )
             {
                 _tcscat( lpMappingFileName, lpMappingName );
 
-                HANDLE hFile = CreateFile(
-                    lpMappingFileName,
-                    GENERIC_READ | GENERIC_WRITE,
-                    FILE_SHARE_READ | FILE_SHARE_WRITE,
-                    NULL,
-                    OPEN_ALWAYS,
-                    FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_DELETE_ON_CLOSE,
+                HANDLE hFile = CreateFile( 
+                    lpMappingFileName, 
+                    GENERIC_READ | GENERIC_WRITE, 
+                    FILE_SHARE_READ | FILE_SHARE_WRITE, 
+                    NULL, 
+                    OPEN_ALWAYS, 
+                    FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_DELETE_ON_CLOSE, 
                     NULL );
 
                 if ( IsValidHandle(hFile) )
@@ -188,13 +188,13 @@ HANDLE  Pipe::CreatePipeDataMapping( LPCTSTR lpName )
 }
 
 //----------------------------------------------------------------------------
-//
+//	
 //----------------------------------------------------------------------------
 
-HANDLE  Pipe::OpenPipeDataMapping( LPCTSTR lpName )
+HANDLE	Pipe::OpenPipeDataMapping( LPCTSTR lpName )
 {
-    HANDLE  hMapping = NULL;
-    LPTSTR  lpMappingName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_MAPPING) );
+    HANDLE	hMapping = NULL;
+    LPTSTR	lpMappingName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_MAPPING) );
 
     if ( lpMappingName )
     {
@@ -208,13 +208,13 @@ HANDLE  Pipe::OpenPipeDataMapping( LPCTSTR lpName )
 }
 
 //----------------------------------------------------------------------------
-//
+//	
 //----------------------------------------------------------------------------
 
-HANDLE  Pipe::CreatePipeDataMutex( LPCTSTR lpName, BOOL bInitialOwner )
+HANDLE	Pipe::CreatePipeDataMutex( LPCTSTR lpName, BOOL bInitialOwner )
 {
-    HANDLE  hMutex = NULL;
-    LPTSTR  lpMutexName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_SYNCHRONIZE) );
+    HANDLE	hMutex = NULL;
+    LPTSTR	lpMutexName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_SYNCHRONIZE) );
 
     if ( lpMutexName )
     {
@@ -228,13 +228,13 @@ HANDLE  Pipe::CreatePipeDataMutex( LPCTSTR lpName, BOOL bInitialOwner )
 }
 
 //----------------------------------------------------------------------------
-//
+//	
 //----------------------------------------------------------------------------
 
 HANDLE Pipe::CreatePipeConnectionSemaphore( LPCTSTR lpName, LONG lInitialCount, LONG lMaximumCount )
 {
-    HANDLE  hSemaphore = NULL;
-    LPTSTR  lpSemaphoreName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_CONNECTION) );
+    HANDLE	hSemaphore = NULL;
+    LPTSTR	lpSemaphoreName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_CONNECTION) );
 
     if ( lpSemaphoreName )
     {
@@ -249,14 +249,14 @@ HANDLE Pipe::CreatePipeConnectionSemaphore( LPCTSTR lpName, LONG lInitialCount,
 
 
 //----------------------------------------------------------------------------
-//  Pipe copy ctor
+//	Pipe copy ctor
 //----------------------------------------------------------------------------
 
 Pipe::Pipe( const Pipe& rPipe ) :
 m_hReadPipe( INVALID_HANDLE_VALUE ),
 m_hWritePipe( INVALID_HANDLE_VALUE )
 {
-    DuplicateHandle(
+    DuplicateHandle( 
         GetCurrentProcess(),
         rPipe.m_hReadPipe,
         GetCurrentProcess(),
@@ -265,7 +265,7 @@ m_hWritePipe( INVALID_HANDLE_VALUE )
         FALSE,
         DUPLICATE_SAME_ACCESS );
 
-    DuplicateHandle(
+    DuplicateHandle( 
         GetCurrentProcess(),
         rPipe.m_hWritePipe,
         GetCurrentProcess(),
@@ -276,14 +276,14 @@ m_hWritePipe( INVALID_HANDLE_VALUE )
 }
 
 //----------------------------------------------------------------------------
-//  Pipe assignment operator
+//	Pipe assignment operator
 //----------------------------------------------------------------------------
 
 const Pipe& Pipe::operator = ( const Pipe& rPipe )
 {
     Close();
 
-    DuplicateHandle(
+    DuplicateHandle( 
         GetCurrentProcess(),
         rPipe.m_hReadPipe,
         GetCurrentProcess(),
@@ -292,7 +292,7 @@ const Pipe& Pipe::operator = ( const Pipe& rPipe )
         FALSE,
         DUPLICATE_SAME_ACCESS );
 
-    DuplicateHandle(
+    DuplicateHandle( 
         GetCurrentProcess(),
         rPipe.m_hWritePipe,
         GetCurrentProcess(),
@@ -300,19 +300,19 @@ const Pipe& Pipe::operator = ( const Pipe& rPipe )
         0,
         FALSE,
         DUPLICATE_SAME_ACCESS );
-
+    
     return *this;
 }
 
 //----------------------------------------------------------------------------
-//  Pipe ctor
+//	Pipe ctor
 //----------------------------------------------------------------------------
 
 Pipe::Pipe( HANDLE hReadPipe, HANDLE hWritePipe ) :
 m_hReadPipe( INVALID_HANDLE_VALUE ),
 m_hWritePipe( INVALID_HANDLE_VALUE )
 {
-    DuplicateHandle(
+    DuplicateHandle( 
         GetCurrentProcess(),
         hReadPipe,
         GetCurrentProcess(),
@@ -321,7 +321,7 @@ m_hWritePipe( INVALID_HANDLE_VALUE )
         FALSE,
         DUPLICATE_SAME_ACCESS );
 
-    DuplicateHandle(
+    DuplicateHandle( 
         GetCurrentProcess(),
         hWritePipe,
         GetCurrentProcess(),
@@ -332,7 +332,7 @@ m_hWritePipe( INVALID_HANDLE_VALUE )
 }
 
 //----------------------------------------------------------------------------
-//  Pipe dtor
+//	Pipe dtor
 //----------------------------------------------------------------------------
 
 Pipe::~Pipe()
@@ -341,12 +341,12 @@ Pipe::~Pipe()
 }
 
 //----------------------------------------------------------------------------
-//  Pipe Close
+//	Pipe Close
 //----------------------------------------------------------------------------
 
 bool Pipe::Close()
 {
-    bool    fSuccess = false;   // Assume failure
+    bool	fSuccess = false;	// Assume failure
 
     if ( IsValidHandle(m_hReadPipe) )
     {
@@ -364,13 +364,13 @@ bool Pipe::Close()
 }
 
 //----------------------------------------------------------------------------
-//  Pipe Write
+//	Pipe Write
 //----------------------------------------------------------------------------
 
 bool Pipe::Write( LPCVOID lpBuffer, DWORD dwBytesToWrite, LPDWORD lpBytesWritten, bool bWait )
 {
-    DWORD   dwBytesAvailable = 0;
-    BOOL    fSuccess = TRUE;
+    DWORD	dwBytesAvailable = 0;
+    BOOL	fSuccess = TRUE;
 
     if ( !bWait )
         fSuccess = PeekNamedPipe( m_hReadPipe, NULL, 0, NULL, &dwBytesAvailable, NULL );
@@ -387,13 +387,13 @@ bool Pipe::Write( LPCVOID lpBuffer, DWORD dwBytesToWrite, LPDWORD lpBytesWritten
 }
 
 //----------------------------------------------------------------------------
-//  Pipe Read
+//	Pipe Read
 //----------------------------------------------------------------------------
 
 bool Pipe::Read( LPVOID lpBuffer, DWORD dwBytesToRead, LPDWORD lpBytesRead, bool bWait )
 {
-    DWORD   dwBytesAvailable = 0;
-    BOOL    fSuccess = TRUE;
+    DWORD	dwBytesAvailable = 0;
+    BOOL	fSuccess = TRUE;
 
     if ( !bWait )
         fSuccess = PeekNamedPipe( m_hReadPipe, NULL, 0, NULL, &dwBytesAvailable, NULL );
@@ -415,7 +415,7 @@ bool Pipe::Read( LPVOID lpBuffer, DWORD dwBytesToRead, LPDWORD lpBytesRead, bool
 
 
 //----------------------------------------------------------------------------
-//  Client pipe dtor
+//	Client pipe dtor
 //----------------------------------------------------------------------------
 
 ClientPipe::ClientPipe( HANDLE hReadPipe, HANDLE hWritePipe ) : Pipe( hReadPipe, hWritePipe )
@@ -423,29 +423,29 @@ ClientPipe::ClientPipe( HANDLE hReadPipe, HANDLE hWritePipe ) : Pipe( hReadPipe,
 }
 
 //----------------------------------------------------------------------------
-//  Client pipe creation
+//	Client pipe creation
 //----------------------------------------------------------------------------
 
 ClientPipe *ClientPipe::Create( LPCTSTR lpName )
 {
-    ClientPipe  *pPipe = NULL;  // Assume failure
+    ClientPipe	*pPipe = NULL;	// Assume failure
 
-    HANDLE  hMapping = OpenPipeDataMapping( lpName );
+    HANDLE	hMapping = OpenPipeDataMapping( lpName );
 
     if ( IsValidHandle(hMapping) )
     {
-        PipeData    *pData = (PipeData*)MapViewOfFile( hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0 );
+        PipeData	*pData = (PipeData*)MapViewOfFile( hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0 );
 
         if ( pData )
         {
-            HANDLE  hSourceProcess = OpenProcess( PROCESS_DUP_HANDLE, FALSE, pData->dwProcessId );
+            HANDLE	hSourceProcess = OpenProcess( PROCESS_DUP_HANDLE, FALSE, pData->dwProcessId );
 
             if ( IsValidHandle(hSourceProcess) )
             {
                 BOOL fSuccess;
-                HANDLE  hReadPipe = INVALID_HANDLE_VALUE, hWritePipe = INVALID_HANDLE_VALUE;
-
-                fSuccess = DuplicateHandle(
+                HANDLE	hReadPipe = INVALID_HANDLE_VALUE, hWritePipe = INVALID_HANDLE_VALUE;
+                
+                fSuccess = DuplicateHandle( 
                     hSourceProcess,
                     pData->hReadPipe,
                     GetCurrentProcess(),
@@ -454,7 +454,7 @@ ClientPipe *ClientPipe::Create( LPCTSTR lpName )
                     FALSE,
                     DUPLICATE_SAME_ACCESS );
 
-                fSuccess = fSuccess && DuplicateHandle(
+                fSuccess = fSuccess && DuplicateHandle( 
                     hSourceProcess,
                     pData->hWritePipe,
                     GetCurrentProcess(),
@@ -472,12 +472,12 @@ ClientPipe *ClientPipe::Create( LPCTSTR lpName )
                 if ( IsValidHandle(hReadPipe) )
                     CloseHandle( hReadPipe );
 
-                HANDLE  hConnectionRequest = CreatePipeConnectionSemaphore( lpName, 0, 1 );
+                HANDLE	hConnectionRequest = CreatePipeConnectionSemaphore( lpName, 0, 1 );
 
                 ReleaseSemaphore( hConnectionRequest, 1, NULL );
 
                 CloseHandle( hConnectionRequest );
-
+                
                 CloseHandle( hSourceProcess );
             }
 
@@ -493,15 +493,15 @@ ClientPipe *ClientPipe::Create( LPCTSTR lpName )
 
 
 //----------------------------------------------------------------------------
-//  ServerPipe ctor
+//	ServerPipe ctor
 //----------------------------------------------------------------------------
 
-ServerPipe::ServerPipe( LPCTSTR lpName, HANDLE hMapping, HANDLE hSynchronize, HANDLE hReadPipe, HANDLE hWritePipe ) : Pipe( hReadPipe, hWritePipe ),
+ServerPipe::ServerPipe( LPCTSTR	lpName, HANDLE hMapping, HANDLE hSynchronize, HANDLE hReadPipe, HANDLE hWritePipe ) : Pipe( hReadPipe, hWritePipe ),
 m_hMapping( NULL ),
 m_hSynchronize( NULL ),
 m_lpName( NULL )
 {
-    DuplicateHandle(
+    DuplicateHandle( 
         GetCurrentProcess(),
         hMapping,
         GetCurrentProcess(),
@@ -525,7 +525,7 @@ m_lpName( NULL )
 }
 
 //----------------------------------------------------------------------------
-//  ServerPipe dtor
+//	ServerPipe dtor
 //----------------------------------------------------------------------------
 
 ServerPipe::~ServerPipe()
@@ -537,14 +537,14 @@ ServerPipe::~ServerPipe()
 }
 
 //----------------------------------------------------------------------------
-//  ServerPipe AcceptConnection
+//	ServerPipe AcceptConnection
 //----------------------------------------------------------------------------
 
 Pipe *ServerPipe::AcceptConnection()
 {
-    Pipe    *pPipe = NULL;  // Assume failure;
+    Pipe	*pPipe = NULL;	// Assume failure;
 
-    HANDLE  hConnectionRequest = CreatePipeConnectionSemaphore( m_lpName, 0, 1 );
+    HANDLE	hConnectionRequest = CreatePipeConnectionSemaphore( m_lpName, 0, 1 );
 
     if ( WAIT_OBJECT_0 == WaitForSingleObject( hConnectionRequest, INFINITE ) )
     {
@@ -553,25 +553,25 @@ Pipe *ServerPipe::AcceptConnection()
 
         // Create new inbound Pipe
 
-        HANDLE  hClientWritePipe = NULL, hServerReadPipe = NULL;
+        HANDLE	hClientWritePipe = NULL, hServerReadPipe = NULL;
 
-        BOOL    fSuccess = CreatePipe( &hServerReadPipe, &hClientWritePipe, NULL, PIPE_BUFFER_SIZE );
+        BOOL	fSuccess = CreatePipe( &hServerReadPipe, &hClientWritePipe, NULL, PIPE_BUFFER_SIZE );
 
 
         if ( fSuccess )
         {
             // Create outbound pipe
 
-            HANDLE  hClientReadPipe = NULL, hServerWritePipe = NULL;
+            HANDLE	hClientReadPipe = NULL, hServerWritePipe = NULL;
 
             if ( CreatePipe( &hClientReadPipe, &hServerWritePipe, NULL, PIPE_BUFFER_SIZE ) )
             {
                 m_hReadPipe = hServerReadPipe;
                 m_hWritePipe = hServerWritePipe;
 
-                PipeData    *pData = (PipeData *)MapViewOfFile( m_hMapping, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(PipeData) );
+                PipeData	*pData = (PipeData *)MapViewOfFile( m_hMapping, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(PipeData) );
 
-                HANDLE  hSynchronize = CreatePipeDataMutex( m_lpName, TRUE );
+                HANDLE	hSynchronize = CreatePipeDataMutex( m_lpName, TRUE );
 
                 CloseHandle( pData->hReadPipe );
                 CloseHandle( pData->hWritePipe );
@@ -587,7 +587,7 @@ Pipe *ServerPipe::AcceptConnection()
             else
             {
                 CloseHandle( hClientWritePipe );
-                CloseHandle( hServerWritePipe );
+                CloseHandle( hServerWritePipe );	
             }
         }
 
@@ -600,24 +600,24 @@ Pipe *ServerPipe::AcceptConnection()
 }
 
 //----------------------------------------------------------------------------
-//  Pipe creation
+//	Pipe creation
 //----------------------------------------------------------------------------
 
 ServerPipe *ServerPipe::Create( LPCTSTR lpName )
 {
-    ServerPipe  *pPipe = NULL;
+    ServerPipe	*pPipe = NULL;
 
-    HANDLE  hMapping = CreatePipeDataMapping( lpName );
+    HANDLE	hMapping = CreatePipeDataMapping( lpName );
 
     if ( IsValidHandle(hMapping) )
     {
         if ( ERROR_FILE_EXISTS != GetLastError() )
         {
-            HANDLE  hSynchronize = CreatePipeDataMutex( lpName, FALSE);
-
+            HANDLE	hSynchronize = CreatePipeDataMutex( lpName, FALSE);
+            
             WaitForSingleObject( hSynchronize, INFINITE );
 
-            PipeData    *pData = (PipeData*)MapViewOfFile( hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0 );
+            PipeData	*pData = (PipeData*)MapViewOfFile( hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0 );
 
             if ( pData )
             {
@@ -630,15 +630,15 @@ ServerPipe *ServerPipe::Create( LPCTSTR lpName )
 
                 // Create inbound pipe
 
-                HANDLE  hServerReadPipe = NULL, hClientWritePipe = NULL;
+                HANDLE	hServerReadPipe = NULL, hClientWritePipe = NULL;
 
-                BOOL    fSuccess = CreatePipe( &hServerReadPipe, &hClientWritePipe, NULL, PIPE_BUFFER_SIZE );
+                BOOL	fSuccess = CreatePipe( &hServerReadPipe, &hClientWritePipe, NULL, PIPE_BUFFER_SIZE );
 
                 if ( fSuccess )
                 {
                     // Create outbound pipe
 
-                    HANDLE  hServerWritePipe = NULL, hClientReadPipe = NULL;
+                    HANDLE	hServerWritePipe = NULL, hClientReadPipe = NULL;
 
                     fSuccess = CreatePipe( &hClientReadPipe, &hServerWritePipe, NULL, PIPE_BUFFER_SIZE );
 
@@ -674,14 +674,14 @@ ServerPipe *ServerPipe::Create( LPCTSTR lpName )
 
 
 //----------------------------------------------------------------------------
-//  C style API
+//	C style API
 //----------------------------------------------------------------------------
 
-const TCHAR LOCAL_PIPE_PREFIX[] = TEXT("\\\\.\\PIPE\\" );
+const TCHAR	LOCAL_PIPE_PREFIX[] = TEXT("\\\\.\\PIPE\\" );
 
 extern "C" HANDLE WINAPI CreateSimplePipe( LPCTSTR lpName )
 {
-    int nPrefixLen = _tcslen( LOCAL_PIPE_PREFIX );
+    int	nPrefixLen = _tcslen( LOCAL_PIPE_PREFIX );
     if ( 0 == _tcsnicmp( lpName, LOCAL_PIPE_PREFIX, nPrefixLen ) )
         lpName += nPrefixLen;
     return (HANDLE)ServerPipe::Create( lpName );
@@ -689,7 +689,7 @@ extern "C" HANDLE WINAPI CreateSimplePipe( LPCTSTR lpName )
 
 extern "C" HANDLE WINAPI OpenSimplePipe( LPCTSTR lpName )
 {
-    int nPrefixLen = _tcslen( LOCAL_PIPE_PREFIX );
+    int	nPrefixLen = _tcslen( LOCAL_PIPE_PREFIX );
     if ( 0 == _tcsnicmp( lpName, LOCAL_PIPE_PREFIX, nPrefixLen ) )
         lpName += nPrefixLen;
     return (HANDLE)ClientPipe::Create( lpName );
@@ -697,7 +697,7 @@ extern "C" HANDLE WINAPI OpenSimplePipe( LPCTSTR lpName )
 
 extern "C" HANDLE WINAPI AcceptSimplePipeConnection( HANDLE hPipe )
 {
-    Pipe    *pPipe = (Pipe *)hPipe;
+    Pipe	*pPipe = (Pipe *)hPipe;
 
     if ( pPipe->is() )
         return (HANDLE)pPipe->AcceptConnection();
@@ -715,7 +715,7 @@ extern "C" BOOL WINAPI WaitForSimplePipe( LPCTSTR /*lpName*/, DWORD /*dwTimeOut*
 
 extern "C" BOOL WINAPI WriteSimplePipe( HANDLE hPipe, LPCVOID lpBuffer, DWORD dwBytesToWrite, LPDWORD lpBytesWritten, BOOL bWait )
 {
-    Pipe    *pPipe = (Pipe *)hPipe;
+    Pipe	*pPipe = (Pipe *)hPipe;
 
     if ( pPipe->is() )
         return pPipe->Write( lpBuffer, dwBytesToWrite, lpBytesWritten, bWait );
@@ -728,7 +728,7 @@ extern "C" BOOL WINAPI WriteSimplePipe( HANDLE hPipe, LPCVOID lpBuffer, DWORD dw
 
 extern "C" BOOL WINAPI ReadSimplePipe( HANDLE hPipe, LPVOID lpBuffer, DWORD dwBytesToRead, LPDWORD lpBytesRead, BOOL bWait )
 {
-    Pipe    *pPipe = (Pipe *)hPipe;
+    Pipe	*pPipe = (Pipe *)hPipe;
 
     if ( pPipe->is() )
         return pPipe->Read( lpBuffer, dwBytesToRead, lpBytesRead, bWait );
@@ -741,7 +741,7 @@ extern "C" BOOL WINAPI ReadSimplePipe( HANDLE hPipe, LPVOID lpBuffer, DWORD dwBy
 
 extern "C" BOOL WINAPI CloseSimplePipe( HANDLE hPipe )
 {
-    Pipe    *pPipe = (Pipe *)hPipe;
+    Pipe	*pPipe = (Pipe *)hPipe;
 
     if ( pPipe->is() )
     {
diff --git a/sal/osl/os2/pipeimpl.h b/sal/osl/os2/pipeimpl.h
index 6c10b06a0101..c73412421471 100644
--- a/sal/osl/os2/pipeimpl.h
+++ b/sal/osl/os2/pipeimpl.h
@@ -3,27 +3,27 @@
 #define _PIPEIMPL_H_
 
 #ifndef _WINDOWS_
-#   include <windows.h>
+#	include <windows.h>
 #endif
 
 #ifndef _INC_MALLOC
-#   include <malloc.h>
+#	include <malloc.h>
 #endif
 
 #ifndef _INC_TCHAR
-#   ifdef UNICODE
-#       define _UNICODE
-#   endif
-#   include <tchar.h>
+#	ifdef UNICODE
+#		define _UNICODE
+#	endif
+#	include <tchar.h>
 #endif
 
 #define EXPORT_PIPE_API
 
 //============================================================================
-//  Helper functions
+//	Helper functions
 //============================================================================
 
-// Because the value of an invalid HANDLE returned by API functions differs
+// Because the value of an invalid HANDLE returned by API functions differs 
 // between different functions and differs on different Windows platforms,
 // this function checks wether the handle has a meaningfull value.
 #ifndef __cplusplus
@@ -39,25 +39,25 @@ inline bool IsValidHandle( HANDLE handle )
 
 extern "C" {
 
-#endif  // __cplusplus
+#endif	// __cplusplus
 
 
 EXPORT_PIPE_API HANDLE WINAPI CreateSimplePipeA( LPCSTR lpName );
 EXPORT_PIPE_API HANDLE WINAPI CreateSimplePipeW( LPCWSTR lpName );
 
 #ifdef UNICODE
-#define CreateSimplePipe    CreateSimplePipeW
+#define CreateSimplePipe	CreateSimplePipeW
 #else
-#define CreateSimplePipe    CreateSimplePipeA
+#define CreateSimplePipe	CreateSimplePipeA
 #endif
 
 EXPORT_PIPE_API HANDLE WINAPI OpenSimplePipeA( LPCSTR lpName );
 EXPORT_PIPE_API HANDLE WINAPI OpenSimplePipeW( LPCWSTR lpName );
 
 #ifdef UNICODE
-#define OpenSimplePipe  OpenSimplePipeW
+#define OpenSimplePipe	OpenSimplePipeW
 #else
-#define OpenSimplePipe  OpenSimplePipeA
+#define OpenSimplePipe	OpenSimplePipeA
 #endif
 
 EXPORT_PIPE_API HANDLE WINAPI AcceptSimplePipeConnection( HANDLE hPipe );
@@ -66,9 +66,9 @@ EXPORT_PIPE_API BOOL WINAPI WaitForSimplePipeA( LPCSTR lpName, DWORD dwTimeOut )
 EXPORT_PIPE_API BOOL WINAPI WaitForSimplePipeW( LPCWSTR lpName, DWORD dwTimeOut );
 
 #ifdef UNICODE
-#define WaitForSimplePipe   WaitForSimplePipeW
+#define WaitForSimplePipe	WaitForSimplePipeW
 #else
-#define WaitForSimplePipe   WaitForSimplePipeA
+#define WaitForSimplePipe	WaitForSimplePipeA
 #endif
 
 
@@ -77,9 +77,9 @@ EXPORT_PIPE_API BOOL WINAPI ReadSimplePipe( HANDLE hPipe, LPVOID lpBuffer, DWORD
 EXPORT_PIPE_API BOOL WINAPI CloseSimplePipe( HANDLE hPipe );
 
 #ifdef __cplusplus
-}   // extern "C"
+}	// extern "C"
 #endif
 
-#endif  // _PIPEIMPL_H_
+#endif	// _PIPEIMPL_H_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/process.c b/sal/osl/os2/process.c
index 53156108c85e..d65dd736d0e4 100644
--- a/sal/osl/os2/process.c
+++ b/sal/osl/os2/process.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -60,19 +60,19 @@ typedef enum {
 } MessageType;
 
 typedef struct {
-    MessageType       m_Type;
+    MessageType		  m_Type;
     oslDescriptorFlag m_Flags;
     oslDescriptorType m_Data;
-    HANDLE            m_Value;
+    HANDLE			  m_Value;
 } Message;
 
 typedef struct {
-    HPIPE   m_hPipe;
+    HPIPE	m_hPipe;
 } Pipe;
 
 typedef struct _oslSocketCallbackArg {
-    HANDLE  m_socket;
-    Pipe*   m_pipe;
+    HANDLE	m_socket;
+    Pipe*	m_pipe;
 } oslSocketCallbackArg;
 
 /* process termination queue */
@@ -116,7 +116,7 @@ static sal_Bool InitSessionTerm( void )
 /**********************************************
  osl_executeProcess_WithRedirectedIO
  *********************************************/
-
+ 
 oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
                                             rtl_uString *ustrImageName,
                                             rtl_uString *ustrArguments[],
@@ -127,9 +127,9 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
                                             rtl_uString *ustrEnvironment[],
                                             sal_uInt32   nEnvironmentVars,
                                             oslProcess *pProcess,
-                                            oslFileHandle   *pInputWrite,
-                                            oslFileHandle   *pOutputRead,
-                                            oslFileHandle   *pErrorRead
+                                            oslFileHandle	*pInputWrite,
+                                            oslFileHandle	*pOutputRead,
+                                            oslFileHandle	*pErrorRead
                                             )
 {
 
@@ -138,7 +138,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
     sal_Char** pArguments=0;
     sal_Char** pEnvironment=0;
     unsigned int index;
-
+    
     char szImagePath[PATH_MAX] = "";
     char szWorkDir[PATH_MAX] = "";
 
@@ -196,10 +196,10 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
         pEnvironment[index+1]=0;
     }
 
-    int     rc, pid;
-    int     saveOutput = -1, saveInput = -1, saveError = -1;
-    int     stdOutput[2] = { -1, -1 }, stdInput[2] = { -1, -1 }, stdError[2] = { -1, -1 };
-    FILE    *i, *o, *e;
+    int		rc, pid;
+    int		saveOutput = -1, saveInput = -1, saveError = -1;
+    int		stdOutput[2] = { -1, -1 }, stdInput[2] = { -1, -1 }, stdError[2] = { -1, -1 };
+    FILE	*i, *o, *e;
 
     if (pInputWrite)
         pipe( stdInput);
@@ -244,10 +244,10 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
 
     if ( pInputWrite )
         *(pInputWrite) = osl_createFileHandleFromFD( stdInput[1] );
-
+        
     if ( pOutputRead )
         *(pOutputRead) = osl_createFileHandleFromFD( stdOutput[0] );
-
+        
     if ( pErrorRead )
         *(pErrorRead) = osl_createFileHandleFromFD( stdError[0] );
 
@@ -289,7 +289,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
 /**********************************************
  osl_executeProcess
  *********************************************/
-
+ 
 oslProcessError SAL_CALL osl_executeProcess(
                                             rtl_uString *ustrImageName,
                                             rtl_uString *ustrArguments[],
@@ -321,7 +321,7 @@ oslProcessError SAL_CALL osl_executeProcess(
 /**********************************************
  osl_psz_executeProcess
  *********************************************/
-
+ 
 oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
                                                 sal_Char *pszArguments[],
                                                 oslProcessOption Options,
@@ -329,23 +329,23 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
                                                 sal_Char *pszDirectory,
                                                 sal_Char *pszEnvironments[],
                                                 oslProcess *pProcess,
-                                                oslFileHandle   *pInputWrite,
-                                                oslFileHandle   *pOutputRead,
-                                                oslFileHandle   *pErrorRead
+                                                oslFileHandle	*pInputWrite,
+                                                oslFileHandle	*pOutputRead,
+                                                oslFileHandle	*pErrorRead
                                                 )
 {
-    ULONG ulSessID  = 0;          /* Session ID returned          */
+    ULONG ulSessID	= 0;		  /* Session ID returned		  */
     PID pidProcess;
     APIRET rc;
     sal_Char* pStr;
-    sal_Char*        args;
-    sal_Char*        envs;
+    sal_Char*		 args;
+    sal_Char*		 envs;
     int i;
     int n = 1;
     oslProcessImpl* pProcImpl;
     ULONG nAppType, nOwnAppType;
     ULONG nCurrentDisk, nDriveMap, nBufSize;
-       int   first = 0;
+       int	 first = 0;
     sal_Char path[ _MAX_PATH ];
     sal_Char currentDir[ _MAX_PATH ];
     sal_Char ownfilename[ _MAX_PATH ];
@@ -397,7 +397,7 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
         CHAR    szName[CCHMAXPATH];
         PPIB    ppib;
         PTIB    ptib;
-        APIRET  rc;
+        APIRET	rc;
         rc = DosGetInfoBlocks(&ptib, &ppib);
         rc = DosQueryModuleName(ppib->pib_hmte, sizeof(szName), szName);
         DosQueryAppType( (PCSZ)szName, &nOwnAppType );
@@ -409,7 +409,7 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
 
     /* start in same session if possible and detached flag not set */
     if( ((nAppType & 0x00000007) == (nOwnAppType & 0x00000007))
-/*      && ((Options & osl_Process_DETACHED) == 0) */ )
+/*	    && ((Options & osl_Process_DETACHED) == 0) */ )
     {
         CHAR szbuf[CCHMAXPATH];
 
@@ -451,7 +451,7 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
         // existing enviroment size
         n = 0;
         p = environ;
-        while( *p)
+        while( *p) 
         {
             int l = strlen( *p);
             n += l + 1;
@@ -480,7 +480,7 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
         }
         // add existing vars
         p = environ;
-        while( *p)
+        while( *p) 
         {
             memcpy(pStr, *p, strlen( *p ) );
             pStr += strlen( *p );
@@ -564,7 +564,7 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
         /* OS/2 Application ? */
         if(nAppType & 0x00000007)
         {
-
+        
             /* inherit options from parent */
             SData.InheritOpt = SSF_INHERTOPT_PARENT;
 
@@ -608,8 +608,8 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
             SData.TermQ = (BYTE*) SessionTermQueueName;
         }
 
-        SData.FgBg  = SSF_FGBG_FORE;      /* start session in foreground  */
-        SData.TraceOpt = SSF_TRACEOPT_NONE;   /* No trace                */
+        SData.FgBg	= SSF_FGBG_FORE;	  /* start session in foreground  */
+        SData.TraceOpt = SSF_TRACEOPT_NONE;	  /* No trace				 */
 
         SData.PgmTitle = NULL;
         SData.PgmInputs = (BYTE*)args;
@@ -632,7 +632,7 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
         if( rc == ERROR_SMG_START_IN_BACKGROUND )
             rc = NO_ERROR;
 
-
+    
         if(envs)
             _tfree(envs);
         if(args)
@@ -692,17 +692,17 @@ oslProcessError SAL_CALL osl_terminateProcess(oslProcess Process)
 
 oslProcess SAL_CALL osl_getProcess(oslProcessIdentifier Ident)
 {
-    HANDLE        hProcess;
+    HANDLE		  hProcess;
     oslProcessImpl* pProcImpl;
 
     /* check, if given PID is a valid process */
     if (FALSE)
     {
         pProcImpl = (oslProcessImpl*)malloc(sizeof(oslProcessImpl));
-/*
+/*		
         pProcImpl->pProcess = pidProcess;
         pProcImpl->nSessionID = ulSessID;
-*/
+*/		
     }
     else
         pProcImpl = NULL;
@@ -734,7 +734,7 @@ oslProcessError SAL_CALL osl_joinProcess(oslProcess Process)
     {
         RESULTCODES resultCode;
         PID pidEnded;
-
+            
         rc = DosWaitChild( DCWA_PROCESS, DCWW_WAIT, &resultCode,
                 &pidEnded, pProcImpl->pProcess );
 
@@ -891,7 +891,7 @@ oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData F
     if (! pInfo || (pInfo->Size != sizeof(oslProcessInfo)))
         return osl_Process_E_Unknown;
 
-    pInfo->Fields = 0;
+    pInfo->Fields = 0;		
 
     if (Fields & osl_Process_IDENTIFIER)
     {
@@ -905,14 +905,14 @@ oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData F
         }
         else
             pInfo->Ident = ((oslProcessImpl*)Process)->pProcess;
-
-        pInfo->Fields |= osl_Process_IDENTIFIER;
+            
+        pInfo->Fields |= osl_Process_IDENTIFIER;		
     }
 
     if (Fields & osl_Process_EXITCODE)
     {
         oslProcessImpl* pProcImpl = (oslProcessImpl*) Process;
-
+        
         if( pProcImpl->bResultCodeValid )
         {
             pInfo->Code = pProcImpl->nResultCode;
@@ -926,7 +926,7 @@ oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData F
             {
                 RESULTCODES resultCode;
                 PID pidEnded;
-
+                    
                 rc = DosWaitChild( DCWA_PROCESS, DCWW_WAIT, &resultCode,
                         &pidEnded, pProcImpl->pProcess );
 
@@ -973,8 +973,8 @@ oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData F
                         break;
                     }
                 }
-            }
-        }
+            } 
+        } 
     }
 
     if (Fields & osl_Process_HEAPUSAGE)
diff --git a/sal/osl/os2/process_impl.cxx b/sal/osl/os2/process_impl.cxx
index 6553046fb3af..0c9730d68946 100644
--- a/sal/osl/os2/process_impl.cxx
+++ b/sal/osl/os2/process_impl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -84,20 +84,20 @@ oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
     CHAR    szName[CCHMAXPATH];
     PPIB    ppib;
     PTIB    ptib;
-    APIRET  rc;
+    APIRET	rc;
 
     rc = DosGetInfoBlocks(&ptib, &ppib);
     rc = DosQueryModuleName(ppib->pib_hmte, sizeof(szName), szName);
-
+    
     if (rc == 0)
     {
         rtl_uString * pAbsPath = 0;
-
-        rtl_string2UString(
-            &pAbsPath,
+        
+        rtl_string2UString( 
+            &pAbsPath, 
             szName, strlen(szName), osl_getThreadTextEncoding(),
             OSTRING_TO_OUSTRING_CVTFLAGS);
-
+        
         if (pAbsPath)
         {
             /* Convert from path to url. */
@@ -118,7 +118,7 @@ oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
  **************************************/
 struct CommandArgs_Impl
 {
-    oslMutex        m_mutex;
+    oslMutex		m_mutex;
     sal_uInt32      m_nCount;
     rtl_uString **  m_ppArgs;
 };
@@ -240,7 +240,7 @@ void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
         }
     }
     osl_releaseMutex(g_command_args.m_mutex);
-
+ 
 }
 
 /***************************************
@@ -377,15 +377,15 @@ oslProcessError SAL_CALL osl_getProcessWorkingDir(rtl_uString **ppustrWorkingDir
 {
     oslProcessError result = osl_Process_E_Unknown;
     char buffer[PATH_MAX];
-
+    
     OSL_PRECOND(ppustrWorkingDir, "osl_getProcessWorkingDir(): Invalid parameter");
 
     if (getcwd (buffer, sizeof(buffer)) != 0)
     {
         rtl_uString* ustrTmp = 0;
 
-        rtl_string2UString(
-            &ustrTmp,
+        rtl_string2UString( 
+            &ustrTmp, 
             buffer, strlen(buffer), osl_getThreadTextEncoding(),
             OSTRING_TO_OUSTRING_CVTFLAGS);
         if (ustrTmp != 0)
@@ -407,7 +407,7 @@ oslProcessError SAL_CALL osl_getProcessWorkingDir(rtl_uString **ppustrWorkingDir
 
 struct ProcessLocale_Impl
 {
-    oslMutex        m_mutex;
+    oslMutex		m_mutex;
     rtl_Locale *    m_pLocale;
 };
 
diff --git a/sal/osl/os2/procimpl.h b/sal/osl/os2/procimpl.h
index 2b772204638c..3dd7e1e3d495 100644
--- a/sal/osl/os2/procimpl.h
+++ b/sal/osl/os2/procimpl.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/osl/os2/profile.c b/sal/osl/os2/profile.c
index 92b919d02f6a..1615d0905f81 100644
--- a/sal/osl/os2/profile.c
+++ b/sal/osl/os2/profile.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,9 +46,9 @@
 
 #define STR_INI_EXTENSION   ".ini"
 #define STR_INI_METAHOME    "?~"
-#define STR_INI_METASYS     "?$"
-#define STR_INI_METACFG     "?^"
-#define STR_INI_METAINS     "?#"
+#define STR_INI_METASYS	    "?$"
+#define STR_INI_METACFG	    "?^"
+#define STR_INI_METAINS		"?#"
 
 #define STR_INI_BOOLYES     "yes"
 #define STR_INI_BOOLON      "on"
@@ -63,16 +63,16 @@
 
 #define SVERSION_LOCATION   STR_INI_METACFG
 #define SVERSION_FALLBACK   STR_INI_METASYS
-#define SVERSION_NAME       "sversion"
+#define SVERSION_NAME   	"sversion"
 #define SVERSION_SECTION    "Versions"
 #define SVERSION_SOFFICE    "StarOffice"
 #define SVERSION_PROFILE    "soffice.ini"
 #define SVERSION_OPTION     "userid:"
-#define SVERSION_DIRS       { "bin", "program" }
+#define SVERSION_DIRS		{ "bin", "program" }
 #define SVERSION_USER       "user"
 
-#define _BUILD_STR_(n)  # n
-#define BUILD_STR(n)    _BUILD_STR_(n)
+#define _BUILD_STR_(n)	# n
+#define BUILD_STR(n)	_BUILD_STR_(n)
 
 /* implemented in file.c */
 extern oslFileError FileURLToPath( char *, size_t, rtl_uString* );
@@ -103,8 +103,8 @@ typedef struct _osl_TFile
 */
     sal_Char*   m_pReadPtr;
     sal_Char    m_ReadBuf[512];
-/*      sal_Char*   m_pWritePtr; */
-/*      sal_Char    m_WriteBuf[512]; */
+/*  	sal_Char*   m_pWritePtr; */
+/*  	sal_Char    m_WriteBuf[512]; */
     sal_Char*   m_pWriteBuf;
     sal_uInt32  m_nWriteBufLen;
     sal_uInt32  m_nWriteBufFree;
@@ -133,8 +133,8 @@ typedef struct _osl_TProfileSection
 */
 typedef struct _osl_TProfileImpl
 {
-    sal_uInt32  m_Flags;
-    osl_TFile*  m_pFile;
+    sal_uInt32	m_Flags;
+    osl_TFile*	m_pFile;
     osl_TStamp  m_Stamp;
     //sal_Char    m_Filename[_MAX_PATH + 1];
     sal_uInt32  m_NoLines;
@@ -143,8 +143,8 @@ typedef struct _osl_TProfileImpl
     sal_uInt32  m_MaxSections;
     sal_Char**  m_Lines;
     rtl_uString *m_strFileName;
-    osl_TProfileSection*    m_Sections;
-    HINI                    m_hIni;
+    osl_TProfileSection*	m_Sections;
+    HINI        			m_hIni;
 } osl_TProfileImpl;
 
 
@@ -200,14 +200,14 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag
 {
     osl_TFile*        pFile;
     osl_TProfileImpl* pProfile;
-    rtl_uString       *FileName=NULL;
-
+    rtl_uString		  *FileName=NULL;
+    
 #ifdef TRACE_OSL_PROFILE
     OSL_TRACE("In  osl_openProfile\n");
 #endif
     OSL_VERIFY(strProfileName);
 
-/*  if (rtl_uString_getLength(strProfileName) == 0 )
+/*	if (rtl_uString_getLength(strProfileName) == 0 )
     {
         OSL_VERIFY(osl_getProfileName(NULL, NULL, &FileName));
     }
@@ -265,7 +265,7 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag
 
     pProfile->m_Flags = Flags & FLG_USER;
     osl_getSystemPathFromFileURL(strProfileName, &pProfile->m_strFileName);
-//  rtl_uString_assign(&pProfile->m_strFileName, strProfileName);
+//	rtl_uString_assign(&pProfile->m_strFileName, strProfileName);
 
     if (Flags & (osl_Profile_READLOCK | osl_Profile_WRITELOCK))
         pProfile->m_pFile = pFile;
@@ -276,7 +276,7 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag
 
     if (pProfile->m_pFile == NULL)
         closeFileImpl(pFile);
-
+    
 #ifdef TRACE_OSL_PROFILE
     OSL_TRACE("Out osl_openProfile [ok]\n");
 #endif
@@ -310,8 +310,8 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
         {
             if ( !( pProfile->m_Flags & osl_Profile_READLOCK )  && ( pProfile->m_Flags & FLG_MODIFIED ) )
             {
-/*                  if (pProfile->m_pFile == NULL) */
-/*                      pProfile->m_pFile = openFileImpl(pProfile->m_Filename, sal_True); */
+/*  				if (pProfile->m_pFile == NULL) */
+/*  					pProfile->m_pFile = openFileImpl(pProfile->m_Filename, sal_True); */
 
                 storeProfile(pProfile->m_pFile, pProfile, sal_False);
             }
@@ -881,7 +881,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char* pszBuff
 static osl_TStamp getFileStamp(osl_TFile* pFile)
 {
     osl_TStamp  FileTime;
-    FILESTATUS3 FileStatus;
+    FILESTATUS3	FileStatus;
     sal_uInt32  Bytes;
 
     Bytes = sizeof( FILESTATUS3 );
@@ -900,7 +900,7 @@ static osl_TStamp getFileStamp(osl_TFile* pFile)
 static sal_Bool lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
 {
     sal_uInt32  status = 1;
-    FILELOCK    Lock;
+    FILELOCK 	Lock;
 
     if (!pFile->m_Handle)
         return (sal_False);
@@ -929,9 +929,9 @@ static sal_Bool lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
 //static osl_TFile* openFile(rtl_uString* pszFilename, sal_Bool bWriteable)
 static osl_TFile* openFileImpl(rtl_uString *ustrFileName, oslProfileOption ProfileFlags )
 {
-    sal_uInt32  action;
-    APIRET      rc;
-    osl_TFile*  pFile = (osl_TFile*)calloc(1, sizeof(osl_TFile));
+    sal_uInt32 	action;
+    APIRET 		rc;
+    osl_TFile* 	pFile = (osl_TFile*)calloc(1, sizeof(osl_TFile));
 
         ULONG attributes;
         ULONG flags;
@@ -942,7 +942,7 @@ static osl_TFile* openFileImpl(rtl_uString *ustrFileName, oslProfileOption Profi
 
     /* check parameters */
     OSL_ASSERT( ustrFileName );
-
+    
     rtl_uString2String( &strFileName,
                             rtl_uString_getStr(ustrFileName),
                             rtl_uString_getLength(ustrFileName),
@@ -958,7 +958,7 @@ static osl_TFile* openFileImpl(rtl_uString *ustrFileName, oslProfileOption Profi
 #endif
         bWriteable=sal_True;
     }
-
+        
         if (bWriteable)
         {
             flags = FILE_NORMAL | FILE_ARCHIVED;
@@ -991,7 +991,7 @@ static osl_TFile* openFileImpl(rtl_uString *ustrFileName, oslProfileOption Profi
         }
 
     rtl_string_release(strFileName);
-
+        
     pFile->m_pWriteBuf=0;
     pFile->m_nWriteBufFree=0;
     pFile->m_nWriteBufLen=0;
@@ -1006,8 +1006,8 @@ static osl_TFile* openFileImpl(rtl_uString *ustrFileName, oslProfileOption Profi
     }
 
     /* mfe: new WriteBuf obsolete */
-/*  pFile->m_pWritePtr = pFile->m_Buf;*/
-/*  pFile->m_pReadPtr  = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf);*/
+/*	pFile->m_pWritePtr = pFile->m_Buf;*/
+/*	pFile->m_pReadPtr  = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf);*/
 
     return (pFile);
 }
@@ -1021,18 +1021,18 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile)
     {
         return stamp;
     }
-
+        
     if (pFile->m_Handle)
     {
         /* mfe: new WriteBuf obsolete */
         /* we just closing the file here, DO NOT write, it has to be handled in higher levels */
         //if (pFile->m_pWritePtr > pFile->m_WriteBuf)
         //{
-        //  sal_uInt32 Bytes;
+        //	sal_uInt32 Bytes;
 
-        //  DosWrite(pFile->m_Handle, pFile->m_WriteBuf,
-        //           pFile->m_pWritePtr - pFile->m_WriteBuf,
-        //           &Bytes);
+        //	DosWrite(pFile->m_Handle, pFile->m_WriteBuf,
+        //			 pFile->m_pWritePtr - pFile->m_WriteBuf,
+        //			 &Bytes);
         //}
 
         stamp = getFileStamp(pFile);
@@ -1046,7 +1046,7 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile)
     {
         free(pFile->m_pWriteBuf);
     }
-
+    
     free(pFile);
 
     return(stamp);
@@ -1072,9 +1072,9 @@ static sal_Bool rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
         } */
 
         pFile->m_pReadPtr = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf);
-
+        
         DosSetFilePtr(pFile->m_Handle, 0, FILE_BEGIN, &Position);
-
+        
         if (bTruncate)
             DosSetFileSize(pFile->m_Handle, 0);
     }
@@ -1087,7 +1087,7 @@ static sal_Bool getLine(osl_TFile* pFile, const sal_Char *pszLine, int MaxLen)
     int   Free, Bytes;
     sal_Char* pChr;
     sal_Char* pLine = (sal_Char *)pszLine;
-    sal_uInt32  Max;
+    sal_uInt32 	Max;
 
     if (pFile->m_Handle == 0)
         return (sal_False);
@@ -1221,7 +1221,7 @@ static sal_Bool putLine(osl_TFile* pFile, const sal_Char *pszLine)
 
 static const sal_Char* stripBlanks(const sal_Char* String, sal_uInt32* pLen)
 {
-    if  ( (pLen != NULL) && ( *pLen != 0 ) )
+    if  ( (pLen != NULL) && ( *pLen != 0 ) ) 
     {
         while ((String[*pLen - 1] == ' ') || (String[*pLen - 1] == '\t'))
             (*pLen)--;
@@ -1263,7 +1263,7 @@ static const sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line)
         }
 
     }
-
+    
     pProfile->m_Lines[pProfile->m_NoLines++] = strdup(Line);
 
     return (pProfile->m_Lines[pProfile->m_NoLines - 1]);
@@ -1308,7 +1308,7 @@ static const sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Li
         for (i = 0; i < pProfile->m_NoSections; i++)
         {
             pSec = &pProfile->m_Sections[i];
-
+            
             if (pSec->m_Line >= LineNo)
                 pSec->m_Line++;
 
@@ -1317,9 +1317,9 @@ static const sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Li
                     pSec->m_Entries[n].m_Line++;
         }
     }
-
+    
     pProfile->m_NoLines++;
-
+    
     pProfile->m_Lines[LineNo] = strdup(Line);
 
     return (pProfile->m_Lines[LineNo]);
@@ -1342,7 +1342,7 @@ static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo)
             for (i = 0; i < pProfile->m_NoSections; i++)
             {
                 pSec = &pProfile->m_Sections[i];
-
+                
                 if (pSec->m_Line > LineNo)
                     pSec->m_Line--;
 
@@ -1485,7 +1485,7 @@ static void removeSection(osl_TProfileImpl* pProfile, osl_TProfileSection *pSect
 
         pProfile->m_NoSections--;
     }
-
+    
     return;
 }
 
@@ -1520,7 +1520,7 @@ static  sal_uInt32    Sect = 0;
     {
         Len = strlen(Entry);
         Entry = stripBlanks(Entry, &Len);
-
+        
         *pNoEntry = pSec->m_NoEntries;
 
         for (i = 0; i < pSec->m_NoEntries; i++)
@@ -1706,7 +1706,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
         {
             sal_Bool bWriteable = sal_False;
             char pszFilename[PATH_MAX] = "";
-
+        
             if ( pProfile->m_strFileName != 0  && pProfile->m_strFileName->buffer[0] != 0 )
                 FileURLToPath( pszFilename, PATH_MAX, pProfile->m_strFileName );
             /* hack: usualy you have a specific HAB, but NULL works here... */
diff --git a/sal/osl/os2/salinit.cxx b/sal/osl/os2/salinit.cxx
index 1c2c44c3f845..9768ad8001dd 100644
--- a/sal/osl/os2/salinit.cxx
+++ b/sal/osl/os2/salinit.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -67,7 +67,7 @@ static FILE* APIENTRY _oslExceptOpenLogFile(VOID)
    file = fopen( szOOoExe, "a");
    if (!file) { // e.g. readonly drive
       // try again, usually C exist and is writable
-      file = fopen( "c:\\OOo.log", "a");
+      file = fopen( "c:\\OOo.log", "a"); 
    }
    if (file) {
         DosGetDateTime(&DT);
@@ -85,20 +85,20 @@ static FILE* APIENTRY _oslExceptOpenLogFile(VOID)
 
 /*----------------------------------------------------------------------------*/
 
-static EXCEPTSTRUCT     g_excptstruct = {0};
+static EXCEPTSTRUCT 	g_excptstruct = {0};
 
-void SAL_CALL sal_detail_initialize(int argc, char ** argv)
+void SAL_CALL sal_detail_initialize(int argc, char ** argv) 
 {
     APIRET rc = -1;
 
 #if OSL_DEBUG_LEVEL == 0
-    excRegisterHooks(_oslExceptOpenLogFile, NULL, NULL, FALSE);
+    excRegisterHooks(_oslExceptOpenLogFile, NULL, NULL, FALSE); 
 
     g_excptstruct.RegRec2.pfnHandler = (PFN)excHandlerLoud;
-    g_excptstruct.arc = DosSetExceptionHandler(
+    g_excptstruct.arc = DosSetExceptionHandler( 
                (PEXCEPTIONREGISTRATIONRECORD)&(g_excptstruct.RegRec2));
 
-    if (g_excptstruct.arc)
+    if (g_excptstruct.arc) 
         if (G_pfnExcHookError)
             G_pfnExcHookError(__FILE__, __LINE__, __FUNCTION__, g_excptstruct.arc);
         else
diff --git a/sal/osl/os2/secimpl.h b/sal/osl/os2/secimpl.h
index 34189e666458..14b4d1ad461b 100644
--- a/sal/osl/os2/secimpl.h
+++ b/sal/osl/os2/secimpl.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 
 #include <osl/security.h>
 
-#define PASSWD_BUFFER_SIZE 1024     /* recommended, see 'man getpwnam_r' */
+#define PASSWD_BUFFER_SIZE 1024		/* recommended, see 'man getpwnam_r' */
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,6 +47,6 @@ typedef struct _oslSecurityImpl {
 }
 #endif
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/security.c b/sal/osl/os2/security.c
index c0e7f5ae8e4f..1c0f78deac6a 100644
--- a/sal/osl/os2/security.c
+++ b/sal/osl/os2/security.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@
 
 extern oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode);
 extern void* SAL_CALL osl_psz_getSymbol(oslModule hModule, const sal_Char* pszSymbolName);
-extern oslSecurityError SAL_CALL
+extern oslSecurityError SAL_CALL 
 osl_psz_loginUser(const sal_Char* pszUserName, const sal_Char* pszPasswd,
                   oslSecurity* pSecurity);
 sal_Bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax);
@@ -56,9 +56,9 @@ sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirect
 
 oslSecurity SAL_CALL osl_getCurrentSecurity()
 {
-
+    
     oslSecurityImpl *pSecImpl = (oslSecurityImpl*) malloc(sizeof(oslSecurityImpl));
-    struct passwd   *pPasswd  = getpwuid(getuid());
+    struct passwd	*pPasswd  = getpwuid(getuid());
 
     if (pPasswd)
     {
@@ -69,21 +69,21 @@ oslSecurity SAL_CALL osl_getCurrentSecurity()
     {
         /* Some UNIX-OS don't implement getpwuid, e.g. NC OS (special NetBSD) 1.2.1 */
         /* so we have to catch this in this else branch */
-        pSecImpl->m_pPasswd.pw_name     = getenv("USER");
-        pSecImpl->m_pPasswd.pw_dir      = getenv("HOME");
+        pSecImpl->m_pPasswd.pw_name		= getenv("USER");
+        pSecImpl->m_pPasswd.pw_dir		= getenv("HOME");
         if (pSecImpl->m_pPasswd.pw_name && pSecImpl->m_pPasswd.pw_dir)
-            pSecImpl->m_isValid             = sal_True;
-        else
+            pSecImpl->m_isValid				= sal_True;
+        else 
         {
-            pSecImpl->m_pPasswd.pw_name     = "unknown";
-            pSecImpl->m_pPasswd.pw_dir      = "/tmp";
-            pSecImpl->m_isValid             = sal_False;
+            pSecImpl->m_pPasswd.pw_name		= "unknown";
+            pSecImpl->m_pPasswd.pw_dir		= "/tmp";
+            pSecImpl->m_isValid				= sal_False;
         }
-        pSecImpl->m_pPasswd.pw_passwd   = NULL;
-        pSecImpl->m_pPasswd.pw_uid      = getuid();
-        pSecImpl->m_pPasswd.pw_gid      = getgid();
-        pSecImpl->m_pPasswd.pw_gecos    = "unknown";
-        pSecImpl->m_pPasswd.pw_shell    = "unknown";
+        pSecImpl->m_pPasswd.pw_passwd	= NULL;
+        pSecImpl->m_pPasswd.pw_uid		= getuid();
+        pSecImpl->m_pPasswd.pw_gid		= getgid();
+        pSecImpl->m_pPasswd.pw_gecos	= "unknown";
+        pSecImpl->m_pPasswd.pw_shell	= "unknown";
     }
 
 
@@ -105,7 +105,7 @@ oslSecurityError SAL_CALL osl_loginUser(
     return ret;
 }
 
-
+    
 
 oslSecurityError SAL_CALL osl_loginUserOnFileServer(
     rtl_uString *strUserName,
@@ -115,7 +115,7 @@ oslSecurityError SAL_CALL osl_loginUserOnFileServer(
     )
 {
     oslSecurityError erg;
-    return erg = osl_Security_E_UserUnknown;
+    return erg = osl_Security_E_UserUnknown;   
 }
 
 
@@ -134,13 +134,13 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **ustrIdent
     sal_Char pszIdent[1024];
 
     pszIdent[0] = '\0';
-
+    
     bRet = osl_psz_getUserIdent(Security,pszIdent,sizeof(pszIdent));
 
     rtl_string2UString( ustrIdent, pszIdent, rtl_str_getLength( pszIdent ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
     OSL_ASSERT(*ustrIdent != NULL);
-
-    return bRet;
+    
+    return bRet;    
 }
 
 
@@ -168,17 +168,17 @@ sal_Bool SAL_CALL osl_getUserName(oslSecurity Security, rtl_uString **ustrName)
     sal_Char pszName[1024];
 
     pszName[0] = '\0';
-
+    
     bRet = osl_psz_getUserName(Security,pszName,sizeof(pszName));
-
+    
     rtl_string2UString( ustrName, pszName, rtl_str_getLength( pszName ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
     OSL_ASSERT(*ustrName != NULL);
-
+    
     return bRet;
 }
 
 
-
+ 
 sal_Bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32  nMax)
 {
     oslSecurityImpl *pSecImpl = (oslSecurityImpl *)Security;
@@ -197,7 +197,7 @@ sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirect
     sal_Char pszDirectory[PATH_MAX];
 
     pszDirectory[0] = '\0';
-
+    
     bRet = osl_psz_getHomeDir(Security,pszDirectory,sizeof(pszDirectory));
 
     if ( bRet == sal_True )
@@ -206,7 +206,7 @@ sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirect
         OSL_ASSERT(*pustrDirectory != NULL);
         osl_getFileURLFromSystemPath( *pustrDirectory, pustrDirectory );
     }
-
+    
     return bRet;
 }
 
@@ -223,7 +223,7 @@ sal_Bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirector
     {
         sal_Char *pStr = NULL;
 #ifdef SOLARIS
-        char    buffer[8192];
+        char	buffer[8192];
 
         struct passwd pwd;
         struct passwd *ppwd;
@@ -262,7 +262,7 @@ sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDire
     sal_Char pszDirectory[PATH_MAX];
 
     pszDirectory[0] = '\0';
-
+    
     bRet = osl_psz_getConfigDir(Security,pszDirectory,sizeof(pszDirectory));
 
     if ( bRet == sal_True )
diff --git a/sal/osl/os2/semaphor.c b/sal/osl/os2/semaphor.c
index 1c8db65709ec..65373a97087c 100644
--- a/sal/osl/os2/semaphor.c
+++ b/sal/osl/os2/semaphor.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/osl/os2/signal.c b/sal/osl/os2/signal.c
index f21a24e358c2..22ddf743397c 100644
--- a/sal/osl/os2/signal.c
+++ b/sal/osl/os2/signal.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,13 +37,13 @@
 typedef struct _oslSignalHandlerImpl
 {
     oslSignalHandlerFunction      Handler;
-    void*                         pData;
+    void*			        	  pData;
     struct _oslSignalHandlerImpl* pNext;
 } oslSignalHandlerImpl;
 
-static sal_Bool               bErrorReportingEnabled = sal_True;
-static sal_Bool               bInitSignal = sal_False;
-static oslMutex               SignalListMutex;
+static sal_Bool				  bErrorReportingEnabled = sal_True;
+static sal_Bool  			  bInitSignal = sal_False;
+static oslMutex 			  SignalListMutex;
 static oslSignalHandlerImpl*  SignalList;
 
 /*static*//* ULONG _Export APIENTRY SignalHandlerFunction(PEXCEPTIONREPORTRECORD pERepRec,
@@ -91,13 +91,13 @@ static oslSignalAction CallSignalHandler(oslSignalInfo *pInfo)
 }
 
 /*****************************************************************************/
-/* SignalHandlerFunction    */
+/* SignalHandlerFunction	*/
 /*****************************************************************************/
 /*static*/ ULONG __declspec(dllexport) APIENTRY SignalHandlerFunction(PEXCEPTIONREPORTRECORD pERepRec,
                                             PEXCEPTIONREGISTRATIONRECORD pERegRec,
                                             PCONTEXTRECORD pConRec, PVOID pReserved)
 {
-    oslSignalInfo    Info;
+    oslSignalInfo	 Info;
 
     Info.UserSignal = pERepRec->ExceptionNum;
     Info.UserData   = NULL;
@@ -112,9 +112,9 @@ static oslSignalAction CallSignalHandler(oslSignalInfo *pInfo)
             Info.Signal = osl_Signal_IntegerDivideByZero;
             break;
 
-        case XCPT_BREAKPOINT:
+        case XCPT_BREAKPOINT: 
             Info.Signal = osl_Signal_DebugBreak;
-            break;
+            break; 
 
         default:
             Info.Signal = osl_Signal_System;
diff --git a/sal/osl/os2/socket.c b/sal/osl/os2/socket.c
index 20212c72b6ad..cb85368719aa 100644
--- a/sal/osl/os2/socket.c
+++ b/sal/osl/os2/socket.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -94,8 +94,8 @@
 /* conceal the struct sockaddr from the eyes of the user. */
 
 
-#define OSL_INVALID_SOCKET      -1
-#define OSL_SOCKET_ERROR        -1
+#define OSL_INVALID_SOCKET		-1
+#define OSL_SOCKET_ERROR		-1
 
 
 /* Buffer size for gethostbyname */
@@ -107,9 +107,9 @@
 
 /* map */
 static unsigned long FamilyMap[]= {
-    AF_INET,                    /* osl_Socket_FamilyInet    */
-    AF_IPX,                     /* osl_Socket_FamilyIpx     */
-    0                           /* osl_Socket_FamilyInvalid */
+    AF_INET,					/* osl_Socket_FamilyInet    */
+    AF_IPX,						/* osl_Socket_FamilyIpx     */
+    0							/* osl_Socket_FamilyInvalid */
 };
 
 /* reverse map */
@@ -129,7 +129,7 @@ static oslAddrFamily osl_AddrFamilyFromNative(sal_uInt32 nativeType)
 
 /* macros */
 #define FAMILY_FROM_NATIVE(y) osl_AddrFamilyFromNative(y)
-#define FAMILY_TO_NATIVE(x) (short)FamilyMap[x]
+#define FAMILY_TO_NATIVE(x)	(short)FamilyMap[x]
 
 /*****************************************************************************/
 /* enum oslProtocol */
@@ -137,11 +137,11 @@ static oslAddrFamily osl_AddrFamilyFromNative(sal_uInt32 nativeType)
 
 /* map */
 static sal_uInt32 ProtocolMap[]= {
-    0,                          /* osl_Socket_ProtocolIp      */
-    NSPROTO_IPX,                /* osl_Socket_ProtocolIpx     */
-    NSPROTO_SPX,                /* osl_Socket_ProtocolSpx     */
-    NSPROTO_SPXII,              /* osl_Socket_ProtocolSpxII   */
-    0                           /* osl_Socket_ProtocolInvalid */
+    0,							/* osl_Socket_ProtocolIp	  */
+    NSPROTO_IPX,				/* osl_Socket_ProtocolIpx	  */
+    NSPROTO_SPX,				/* osl_Socket_ProtocolSpx	  */
+    NSPROTO_SPXII,				/* osl_Socket_ProtocolSpxII   */
+    0							/* osl_Socket_ProtocolInvalid */
 };
 
 /* reverse map */
@@ -163,7 +163,7 @@ static oslProtocol osl_ProtocolFromNative(sal_uInt32 nativeType)
 
 /* macros */
 #define PROTOCOL_FROM_NATIVE(y) osl_ProtocolFromNative(y)
-#define PROTOCOL_TO_NATIVE(x)   ProtocolMap[x]
+#define PROTOCOL_TO_NATIVE(x)	ProtocolMap[x]
 
 
 /*****************************************************************************/
@@ -172,12 +172,12 @@ static oslProtocol osl_ProtocolFromNative(sal_uInt32 nativeType)
 
 /* map */
 static sal_uInt32 TypeMap[]= {
-    SOCK_STREAM,                /* osl_Socket_TypeStream    */
-    SOCK_DGRAM,                 /* osl_Socket_TypeDgram     */
-    SOCK_RAW,                   /* osl_Socket_TypeRaw       */
-    SOCK_RDM,                   /* osl_Socket_TypeRdm       */
-    SOCK_SEQPACKET,             /* osl_Socket_TypeSeqPacket */
-    0                           /* osl_Socket_TypeInvalid   */
+    SOCK_STREAM,				/* osl_Socket_TypeStream    */
+    SOCK_DGRAM,					/* osl_Socket_TypeDgram     */
+    SOCK_RAW,					/* osl_Socket_TypeRaw       */
+    SOCK_RDM,					/* osl_Socket_TypeRdm       */
+    SOCK_SEQPACKET,				/* osl_Socket_TypeSeqPacket */
+    0							/* osl_Socket_TypeInvalid   */
 };
 
 /* reverse map */
@@ -196,8 +196,8 @@ static oslSocketType osl_SocketTypeFromNative(sal_uInt32 nativeType)
 }
 
 /* macros */
-#define TYPE_TO_NATIVE(x)       TypeMap[x]
-#define TYPE_FROM_NATIVE(y)     osl_SocketTypeFromNative(y)
+#define TYPE_TO_NATIVE(x)		TypeMap[x]
+#define TYPE_FROM_NATIVE(y)		osl_SocketTypeFromNative(y)
 
 
 /*****************************************************************************/
@@ -206,25 +206,25 @@ static oslSocketType osl_SocketTypeFromNative(sal_uInt32 nativeType)
 
 /* map */
 static sal_uInt32 OptionMap[]= {
-    SO_DEBUG,                   /* osl_Socket_OptionDebug       */
-    SO_ACCEPTCONN,              /* osl_Socket_OptionAcceptConn  */
-    SO_REUSEADDR,               /* osl_Socket_OptionReuseAddr   */
-    SO_KEEPALIVE,               /* osl_Socket_OptionKeepAlive   */
-    SO_DONTROUTE,               /* osl_Socket_OptionDontRoute   */
-    SO_BROADCAST,               /* osl_Socket_OptionBroadcast   */
-    SO_USELOOPBACK,             /* osl_Socket_OptionUseLoopback */
-    SO_LINGER,                  /* osl_Socket_OptionLinger      */
-    SO_OOBINLINE,               /* osl_Socket_OptionOOBinLine   */
-    SO_SNDBUF,                  /* osl_Socket_OptionSndBuf      */
-    SO_RCVBUF,                  /* osl_Socket_OptionRcvBuf      */
-    SO_SNDLOWAT,                /* osl_Socket_OptionSndLowat    */
-    SO_RCVLOWAT,                /* osl_Socket_OptionRcvLowat    */
-    SO_SNDTIMEO,                /* osl_Socket_OptionSndTimeo    */
-    SO_RCVTIMEO,                /* osl_Socket_OptionRcvTimeo    */
-    SO_ERROR,                   /* osl_Socket_OptionError       */
-    SO_TYPE,                    /* osl_Socket_OptionType        */
-    TCP_NODELAY,                /* osl_Socket_OptionTcpNoDelay  */
-    0                           /* osl_Socket_OptionInvalid     */
+    SO_DEBUG,					/* osl_Socket_OptionDebug 		*/
+    SO_ACCEPTCONN,				/* osl_Socket_OptionAcceptConn  */
+    SO_REUSEADDR,				/* osl_Socket_OptionReuseAddr   */
+    SO_KEEPALIVE,				/* osl_Socket_OptionKeepAlive   */
+    SO_DONTROUTE,				/* osl_Socket_OptionDontRoute   */
+    SO_BROADCAST,				/* osl_Socket_OptionBroadcast   */
+    SO_USELOOPBACK,				/* osl_Socket_OptionUseLoopback */
+    SO_LINGER,					/* osl_Socket_OptionLinger		*/
+    SO_OOBINLINE,				/* osl_Socket_OptionOOBinLine   */
+    SO_SNDBUF,					/* osl_Socket_OptionSndBuf      */
+    SO_RCVBUF,					/* osl_Socket_OptionRcvBuf      */
+    SO_SNDLOWAT,				/* osl_Socket_OptionSndLowat    */
+    SO_RCVLOWAT,				/* osl_Socket_OptionRcvLowat    */
+    SO_SNDTIMEO,				/* osl_Socket_OptionSndTimeo    */
+    SO_RCVTIMEO,				/* osl_Socket_OptionRcvTimeo    */
+    SO_ERROR,					/* osl_Socket_OptionError       */
+    SO_TYPE,					/* osl_Socket_OptionType        */
+    TCP_NODELAY,				/* osl_Socket_OptionTcpNoDelay  */
+    0							/* osl_Socket_OptionInvalid     */
 };
 
 /* reverse map */
@@ -244,8 +244,8 @@ static oslSocketOption osl_SocketOptionFromNative(sal_uInt32 nativeType)
 }
 */
 /* macros */
-#define OPTION_TO_NATIVE(x)     OptionMap[x]
-#define OPTION_FROM_NATIVE(y)       osl_SocketOptionFromNative(y)
+#define OPTION_TO_NATIVE(x)		OptionMap[x]
+#define OPTION_FROM_NATIVE(y)		osl_SocketOptionFromNative(y)
 
 
 /*****************************************************************************/
@@ -253,9 +253,9 @@ static oslSocketOption osl_SocketOptionFromNative(sal_uInt32 nativeType)
 /*****************************************************************************/
 
 static sal_uInt32 OptionLevelMap[]= {
-    SOL_SOCKET,                 /* osl_Socket_LevelSocket  */
-    IPPROTO_TCP,                /* osl_Socket_LevelTcp     */
-    0                           /* osl_Socket_LevelInvalid */
+    SOL_SOCKET,					/* osl_Socket_LevelSocket  */
+    IPPROTO_TCP,				/* osl_Socket_LevelTcp     */
+    0							/* osl_Socket_LevelInvalid */
 };
 
 /* reverse map */
@@ -275,20 +275,20 @@ static oslSocketOptionLevel osl_SocketOptionLevelFromNative(sal_uInt32 nativeTyp
 }
 */
 /* macros */
-#define OPTION_LEVEL_TO_NATIVE(x)       OptionLevelMap[x]
-#define OPTION_LEVEL_FROM_NATIVE(y)     osl_SocketOptionLevelFromNative(y)
+#define OPTION_LEVEL_TO_NATIVE(x)		OptionLevelMap[x]
+#define OPTION_LEVEL_FROM_NATIVE(y)		osl_SocketOptionLevelFromNative(y)
 
 /*****************************************************************************/
 /* enum oslSocketMsgFlag */
 /*****************************************************************************/
 
 static sal_uInt32 SocketMsgFlagMap[]= {
-    0,                          /* osl_Socket_MsgNormal    */
-    MSG_OOB,                    /* osl_Socket_MsgOOB       */
-    MSG_PEEK,                   /* osl_Socket_MsgPeek      */
-    MSG_DONTROUTE,              /* osl_Socket_MsgDontRoute */
-    MSG_MAXIOVLEN,              /* osl_Socket_MsgMaxIOVLen */
-    0                           /* osl_Socket_MsgInvalid   */
+    0,							/* osl_Socket_MsgNormal    */
+    MSG_OOB,					/* osl_Socket_MsgOOB       */
+    MSG_PEEK,					/* osl_Socket_MsgPeek      */
+    MSG_DONTROUTE,				/* osl_Socket_MsgDontRoute */
+    MSG_MAXIOVLEN,				/* osl_Socket_MsgMaxIOVLen */
+    0							/* osl_Socket_MsgInvalid   */
 };
 
 /* reverse map */
@@ -309,8 +309,8 @@ static oslSocketMsgFlag osl_SocketMsgFlagFromNative(sal_uInt32 nativeType)
 */
 
 /* macros */
-#define MSG_FLAG_TO_NATIVE(x)       SocketMsgFlagMap[x]
-#define MSG_FLAG_FROM_NATIVE(y)     osl_SocketMsgFlagFromNative(y)
+#define MSG_FLAG_TO_NATIVE(x)		SocketMsgFlagMap[x]
+#define MSG_FLAG_FROM_NATIVE(y)		osl_SocketMsgFlagFromNative(y)
 
 
 /*****************************************************************************/
@@ -318,10 +318,10 @@ static oslSocketMsgFlag osl_SocketMsgFlagFromNative(sal_uInt32 nativeType)
 /*****************************************************************************/
 
 static sal_uInt32 SocketDirection[]= {
-    SD_RECEIVE,                 /* osl_Socket_DirRead      */
-    SD_SEND,                    /* osl_Socket_DirWrite     */
-    SD_BOTH,                    /* osl_Socket_DirReadWrite */
-    0                           /* osl_Socket_DirInvalid   */
+    SD_RECEIVE,					/* osl_Socket_DirRead      */
+    SD_SEND,					/* osl_Socket_DirWrite     */
+    SD_BOTH,					/* osl_Socket_DirReadWrite */
+    0							/* osl_Socket_DirInvalid   */
 };
 
 /* reverse map */
@@ -342,8 +342,8 @@ static oslSocketDirection osl_SocketDirectionFromNative(sal_uInt32 nativeType)
 */
 
 /* macros */
-#define DIRECTION_TO_NATIVE(x)      SocketDirection[x]
-#define DIRECTION_FROM_NATIVE(y)    osl_SocketDirectionFromNative(y)
+#define DIRECTION_TO_NATIVE(x)		SocketDirection[x]
+#define DIRECTION_FROM_NATIVE(y)	osl_SocketDirectionFromNative(y)
 
 /*****************************************************************************/
 /* enum oslSocketError */
@@ -354,40 +354,40 @@ static struct
     int            errcode;
     oslSocketError error;
 } SocketError[]= {
-    { 0,               osl_Socket_E_None              }, /* no error */
-    { ENOTSOCK,        osl_Socket_E_NotSocket         }, /* Socket operation on non-socket */
-    { EDESTADDRREQ,    osl_Socket_E_DestAddrReq       }, /* Destination address required */
-    { EMSGSIZE,        osl_Socket_E_MsgSize           }, /* Message too long */
-    { EPROTOTYPE,      osl_Socket_E_Prototype         }, /* Protocol wrong type for socket */
-    { ENOPROTOOPT,     osl_Socket_E_NoProtocol        }, /* Protocol not available */
+    { 0,			   osl_Socket_E_None 			  }, /* no error */
+    { ENOTSOCK,		   osl_Socket_E_NotSocket 		  }, /* Socket operation on non-socket */
+    { EDESTADDRREQ,	   osl_Socket_E_DestAddrReq 	  }, /* Destination address required */
+    { EMSGSIZE,		   osl_Socket_E_MsgSize 		  }, /* Message too long */
+    { EPROTOTYPE,	   osl_Socket_E_Prototype 		  }, /* Protocol wrong type for socket */
+    { ENOPROTOOPT,	   osl_Socket_E_NoProtocol 		  }, /* Protocol not available */
     { EPROTONOSUPPORT, osl_Socket_E_ProtocolNoSupport }, /* Protocol not supported */
-    { ESOCKTNOSUPPORT, osl_Socket_E_TypeNoSupport     }, /* Socket type not supported */
-    { EOPNOTSUPP,      osl_Socket_E_OpNotSupport      }, /* Operation not supported on socket */
-    { EPFNOSUPPORT,    osl_Socket_E_PfNoSupport       }, /* Protocol family not supported */
-    { EAFNOSUPPORT,    osl_Socket_E_AfNoSupport       }, /* Address family not supported by */
+    { ESOCKTNOSUPPORT, osl_Socket_E_TypeNoSupport 	  }, /* Socket type not supported */
+    { EOPNOTSUPP,	   osl_Socket_E_OpNotSupport 	  }, /* Operation not supported on socket */
+    { EPFNOSUPPORT,	   osl_Socket_E_PfNoSupport 	  }, /* Protocol family not supported */
+    { EAFNOSUPPORT,	   osl_Socket_E_AfNoSupport 	  }, /* Address family not supported by */
                                                             /* protocol family */
-    { EADDRINUSE,      osl_Socket_E_AddrInUse         }, /* Address already in use */
-    { EADDRNOTAVAIL,   osl_Socket_E_AddrNotAvail      }, /* Can't assign requested address */
-    { ENETDOWN,        osl_Socket_E_NetDown           }, /* Network is down */
-    { ENETUNREACH,     osl_Socket_E_NetUnreachable    }, /* Network is unreachable */
-    { ENETRESET,       osl_Socket_E_NetReset          }, /* Network dropped connection because */
+    { EADDRINUSE,	   osl_Socket_E_AddrInUse 		  }, /* Address already in use */
+    { EADDRNOTAVAIL,   osl_Socket_E_AddrNotAvail 	  }, /* Can't assign requested address */
+    { ENETDOWN,		   osl_Socket_E_NetDown 		  }, /* Network is down */
+    { ENETUNREACH,	   osl_Socket_E_NetUnreachable    }, /* Network is unreachable */
+    { ENETRESET,	   osl_Socket_E_NetReset 		  }, /* Network dropped connection because */
                                                              /* of reset */
-    { ECONNABORTED,    osl_Socket_E_ConnAborted       }, /* Software caused connection abort */
-    { ECONNRESET,      osl_Socket_E_ConnReset         }, /* Connection reset by peer */
-    { ENOBUFS,         osl_Socket_E_NoBufferSpace     }, /* No buffer space available */
-    { EISCONN,         osl_Socket_E_IsConnected       }, /* Socket is already connected */
-    { ENOTCONN,        osl_Socket_E_NotConnected      }, /* Socket is not connected */
-    { ESHUTDOWN,       osl_Socket_E_Shutdown          }, /* Can't send after socket shutdown */
-    { ETOOMANYREFS,    osl_Socket_E_TooManyRefs       }, /* Too many references: can't splice */
-    { ETIMEDOUT,       osl_Socket_E_TimedOut          }, /* Connection timed out */
-    { ECONNREFUSED,    osl_Socket_E_ConnRefused       }, /* Connection refused */
-    { EHOSTDOWN,       osl_Socket_E_HostDown          }, /* Host is down */
-    { EHOSTUNREACH,    osl_Socket_E_HostUnreachable   }, /* No route to host */
-    { EWOULDBLOCK,     osl_Socket_E_WouldBlock        }, /* call would block on non-blocking socket */
-    { EALREADY,        osl_Socket_E_Already           }, /* operation already in progress */
-    { EINPROGRESS,     osl_Socket_E_InProgress        }, /* operation now in progress */
-    { EAGAIN,          osl_Socket_E_WouldBlock        }, /* same as EWOULDBLOCK */
-    { -1,              osl_Socket_E_InvalidError      }
+    { ECONNABORTED,	   osl_Socket_E_ConnAborted 	  }, /* Software caused connection abort */
+    { ECONNRESET,	   osl_Socket_E_ConnReset 		  }, /* Connection reset by peer */
+    { ENOBUFS,		   osl_Socket_E_NoBufferSpace 	  }, /* No buffer space available */
+    { EISCONN,		   osl_Socket_E_IsConnected 	  }, /* Socket is already connected */
+    { ENOTCONN,		   osl_Socket_E_NotConnected 	  }, /* Socket is not connected */
+    { ESHUTDOWN,	   osl_Socket_E_Shutdown 		  }, /* Can't send after socket shutdown */
+    { ETOOMANYREFS,	   osl_Socket_E_TooManyRefs 	  }, /* Too many references: can't splice */
+    { ETIMEDOUT,	   osl_Socket_E_TimedOut 		  }, /* Connection timed out */
+    { ECONNREFUSED,	   osl_Socket_E_ConnRefused 	  }, /* Connection refused */
+    { EHOSTDOWN,	   osl_Socket_E_HostDown 		  }, /* Host is down */
+    { EHOSTUNREACH,	   osl_Socket_E_HostUnreachable   }, /* No route to host */
+    { EWOULDBLOCK,	   osl_Socket_E_WouldBlock 		  }, /* call would block on non-blocking socket */
+    { EALREADY,		   osl_Socket_E_Already 		  }, /* operation already in progress */
+    { EINPROGRESS,	   osl_Socket_E_InProgress 		  }, /* operation now in progress */
+    { EAGAIN,		   osl_Socket_E_WouldBlock 		  }, /* same as EWOULDBLOCK */
+    { -1,		   	   osl_Socket_E_InvalidError      }
 };
 
 /* map */
@@ -415,8 +415,8 @@ static oslSocketError osl_SocketErrorFromNative(int nativeType)
 }
 
 /* macros */
-#define ERROR_TO_NATIVE(x)      osl_NativeFromSocketError(x)
-#define ERROR_FROM_NATIVE(y)    osl_SocketErrorFromNative(y)
+#define ERROR_TO_NATIVE(x)		osl_NativeFromSocketError(x)
+#define ERROR_FROM_NATIVE(y)	osl_SocketErrorFromNative(y)
 
 /*****************************************************************************/
 /* local function prototypes */
@@ -451,7 +451,7 @@ sal_Int32 SAL_CALL osl_psz_getServicePort (
 oslSocketResult SAL_CALL osl_psz_getHostnameOfSocketAddr (
     oslSocketAddr Addr, sal_Char *pBuffer, sal_uInt32 BufferSize);
 
-oslSocketResult SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr (
+oslSocketResult	SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr (
     oslSocketAddr Addr, sal_Char *pBuffer, sal_uInt32 BufferSize);
 
 void SAL_CALL osl_psz_getLastSocketErrorDescription (
@@ -809,9 +809,9 @@ static sal_Bool  _osl_getDomainName (sal_Char *buffer, sal_Int32 bufsiz)
 
 static sal_Char* _osl_getFullQualifiedDomainName (const sal_Char *pHostName)
 {
-#   define DOMAINNAME_LENGTH 512
-    sal_uInt32          nLengthOfHostName;
-    static sal_uInt32   nLengthOfDomainName = 0;
+#	define DOMAINNAME_LENGTH 512
+    sal_uInt32 			nLengthOfHostName;
+    static sal_uInt32 	nLengthOfDomainName = 0;
     static sal_Char    *pDomainName = NULL;
 
     sal_Char  *pFullQualifiedName;
@@ -871,10 +871,10 @@ static sal_Char* _osl_getFullQualifiedDomainName (const sal_Char *pHostName)
         sal_Bool        bHostsAreEqual;
 
         /* buffer for calls to reentrant version of gethostbyname */
-        struct hostent  aHostByName, aQualifiedHostByName;
-        sal_Char        pHostBuffer[ MAX_HOSTBUFFER_SIZE ];
+        struct hostent 	aHostByName, aQualifiedHostByName;
+        sal_Char		pHostBuffer[ MAX_HOSTBUFFER_SIZE ];
         sal_Char        pQualifiedHostBuffer[ MAX_HOSTBUFFER_SIZE ];
-        int     nErrorNo;
+        int		nErrorNo;
 
         pHostBuffer[0] = '\0';
         pQualifiedHostBuffer[0] = '\0';
@@ -1114,7 +1114,7 @@ oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString *ustrHostname)
 oslHostAddr SAL_CALL osl_psz_createHostAddrByName (const sal_Char *pszHostname)
 {
     struct hostent *he;
-        oslHostAddr addr;
+        oslHostAddr	addr;
 
     static oslMutex mutex = NULL;
 
@@ -1465,7 +1465,7 @@ sal_Bool SAL_CALL osl_setInetPortOfSocketAddr(oslSocketAddr pAddr, sal_Int32 Por
 /*****************************************************************************/
 /* osl_getHostnameOfSocketAddr */
 /*****************************************************************************/
-oslSocketResult SAL_CALL osl_getHostnameOfSocketAddr(oslSocketAddr Addr, rtl_uString **ustrHostname)
+oslSocketResult	SAL_CALL osl_getHostnameOfSocketAddr(oslSocketAddr Addr, rtl_uString **ustrHostname)
 {
     oslSocketResult Result;
     sal_Char pszHostname[1024];
@@ -1502,7 +1502,7 @@ oslSocketResult SAL_CALL osl_psz_getHostnameOfSocketAddr(oslSocketAddr pAddr,
 /*****************************************************************************/
 /* osl_getDottedInetAddrOfSocketAddr */
 /*****************************************************************************/
-oslSocketResult SAL_CALL osl_getDottedInetAddrOfSocketAddr(oslSocketAddr Addr, rtl_uString **ustrDottedInetAddr)
+oslSocketResult	SAL_CALL osl_getDottedInetAddrOfSocketAddr(oslSocketAddr Addr, rtl_uString **ustrDottedInetAddr)
 {
     oslSocketResult Result;
     sal_Char pszDottedInetAddr[1024];
@@ -1517,7 +1517,7 @@ oslSocketResult SAL_CALL osl_getDottedInetAddrOfSocketAddr(oslSocketAddr Addr, r
 
 }
 
-oslSocketResult SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr(oslSocketAddr pAddr,
+oslSocketResult	SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr(oslSocketAddr pAddr,
                                                   sal_Char *pBuffer, sal_uInt32 BufferSize)
 {
     OSL_ASSERT(pAddr);
@@ -1541,11 +1541,11 @@ oslSocketResult SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr(oslSocketAddr pAd
 /*****************************************************************************/
 /* osl_createSocket  */
 /*****************************************************************************/
-oslSocket SAL_CALL osl_createSocket(oslAddrFamily   Family,
-                           oslSocketType    Type,
-                           oslProtocol      Protocol)
+oslSocket SAL_CALL osl_createSocket(oslAddrFamily	Family,
+                           oslSocketType	Type,
+                           oslProtocol		Protocol)
 {
-    int            Flags;
+    int 		   Flags;
     oslSocket pSocket;
 
     /* alloc memory */
@@ -1586,8 +1586,8 @@ oslSocket SAL_CALL osl_createSocket(oslAddrFamily   Family,
         }
 
 
-        pSocket->m_CloseCallback    = NULL;
-        pSocket->m_CallbackArg  = NULL;
+        pSocket->m_CloseCallback 	= NULL;
+        pSocket->m_CallbackArg	= NULL;
     }
 
     return pSocket;
@@ -1889,8 +1889,8 @@ oslSocketResult SAL_CALL osl_connectSocketTo(oslSocket pSocket,
     if (pTimeout)
     {
         /* divide milliseconds into seconds and microseconds */
-        tv.tv_sec=  pTimeout->Seconds;
-        tv.tv_usec= pTimeout->Nanosec / 1000L;
+        tv.tv_sec=	pTimeout->Seconds;
+        tv.tv_usec=	pTimeout->Nanosec / 1000L;
     }
 
     /* select */
@@ -2044,12 +2044,12 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket pSocket,
 
     }
 
-    pConnectionSockImpl->m_Socket           = Connection;
-    pConnectionSockImpl->m_nLastError       = 0;
-    pConnectionSockImpl->m_CloseCallback    = NULL;
-    pConnectionSockImpl->m_CallbackArg      = NULL;
+    pConnectionSockImpl->m_Socket			= Connection;
+    pConnectionSockImpl->m_nLastError		= 0;
+    pConnectionSockImpl->m_CloseCallback	= NULL;
+    pConnectionSockImpl->m_CallbackArg		= NULL;
 #if defined(LINUX)
-    pConnectionSockImpl->m_bIsAccepting     = sal_False;
+    pConnectionSockImpl->m_bIsAccepting		= sal_False;
 
     pSocket->m_bIsAccepting = sal_False;
 #endif /* LINUX */
@@ -2479,10 +2479,10 @@ sal_Bool SAL_CALL osl_shutdownSocket(oslSocket pSocket,
 /* osl_getSocketOption  */
 /*****************************************************************************/
 sal_Int32 SAL_CALL osl_getSocketOption(oslSocket pSocket,
-                            oslSocketOptionLevel    Level,
-                            oslSocketOption         Option,
-                            void*                   pBuffer,
-                            sal_uInt32                  BufferLen)
+                            oslSocketOptionLevel	Level,
+                            oslSocketOption			Option,
+                            void*					pBuffer,
+                            sal_uInt32  				BufferLen)
 {
     OSL_ASSERT(pSocket);
     if ( pSocket == 0 )
@@ -2509,10 +2509,10 @@ sal_Int32 SAL_CALL osl_getSocketOption(oslSocket pSocket,
 /* osl_setSocketOption  */
 /*****************************************************************************/
 sal_Bool SAL_CALL osl_setSocketOption(oslSocket pSocket,
-                            oslSocketOptionLevel    Level,
-                            oslSocketOption         Option,
-                            void*                   pBuffer,
-                            sal_uInt32                  BufferLen)
+                            oslSocketOptionLevel	Level,
+                            oslSocketOption			Option,
+                            void*					pBuffer,
+                            sal_uInt32					BufferLen)
 {
     int nRet;
 
@@ -2602,7 +2602,7 @@ sal_Bool SAL_CALL osl_isNonBlockingMode(oslSocket pSocket)
 /*****************************************************************************/
 oslSocketType SAL_CALL osl_getSocketType(oslSocket pSocket)
 {
-    int Type=0;
+    int	Type=0;
     sal_uInt32 TypeSize= sizeof(Type);
 
     OSL_ASSERT(pSocket);
@@ -2678,8 +2678,8 @@ oslSocketError SAL_CALL osl_getLastSocketError(oslSocket pSocket)
 /*****************************************************************************/
 typedef struct _TSocketSetImpl
 {
-    int     m_MaxHandle;    /* for select(), the largest descriptor in the set */
-    fd_set  m_Set;          /* the set of descriptors */
+    int		m_MaxHandle;	/* for select(), the largest descriptor in the set */
+    fd_set	m_Set;			/* the set of descriptors */
 
 } TSocketSetImpl;
 
@@ -2779,7 +2779,7 @@ void SAL_CALL osl_removeFromSocketSet(oslSocketSet Set, oslSocket pSocket)
         pSet->m_MaxHandle--;
         if(pSet->m_MaxHandle < 0)
         {
-            pSet->m_MaxHandle= 0;   /* avoid underflow */
+            pSet->m_MaxHandle= 0;	/* avoid underflow */
         }
     }
 
@@ -2814,7 +2814,7 @@ sal_Int32 SAL_CALL osl_demultiplexSocketEvents(oslSocketSet IncomingSet,
                                     const TimeValue* pTimeout)
 {
     int MaxHandle= 0;
-    struct timeval  tv;
+    struct timeval 	tv;
     TSocketSetImpl* pInSet;
     TSocketSetImpl* pOutSet;
     TSocketSetImpl* pOOBSet;
diff --git a/sal/osl/os2/sockimpl.h b/sal/osl/os2/sockimpl.h
index 8efe3a306326..3f8fbb781860 100644
--- a/sal/osl/os2/sockimpl.h
+++ b/sal/osl/os2/sockimpl.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,12 +38,12 @@ extern "C" {
 #endif
 
 typedef void* (*oslCloseCallback) (void*);
-
+    
 struct oslSocketImpl {
-    int                 m_Socket;
+    int					m_Socket;
     int                 m_nLastError;
-    oslCloseCallback    m_CloseCallback;
-    void*               m_CallbackArg;
+    oslCloseCallback	m_CloseCallback;
+    void*				m_CallbackArg;
     oslInterlockedCount m_nRefCount;
 #if defined(LINUX)
     sal_Bool            m_bIsAccepting;
@@ -59,7 +59,7 @@ struct oslSocketAddrImpl
 
 /*
 struct oslPipeImpl {
-    int  m_Socket;
+    int	 m_Socket;
     sal_Char m_Name[PATH_MAX + 1];
     oslInterlockedCount m_nRefCount;
     sal_Bool m_bClosed;
@@ -69,7 +69,7 @@ struct oslPipeImpl {
 #endif
 };
 */
-
+    
 oslSocket __osl_createSocketImpl(int Socket);
 void __osl_destroySocketImpl(oslSocket pImpl);
 
@@ -77,6 +77,6 @@ void __osl_destroySocketImpl(oslSocket pImpl);
 }
 #endif
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/system.h b/sal/osl/os2/system.h
index ec1853baeb6a..e3c466d64938 100644
--- a/sal/osl/os2/system.h
+++ b/sal/osl/os2/system.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,30 +68,30 @@
 #include <os2.h>
 
 typedef ULONG HANDLE;
-#define _MAX_ENV        2048
-#define _MAX_CMD        2048
+#define _MAX_ENV		2048
+#define _MAX_CMD		2048
 
 #ifdef __cplusplus
-extern "C"
+extern "C" 
 #endif
 int debug_printf(const char *f, ...);
 
 /* Make sockets of type AF_UNIX use underlying FS rights */
 #ifdef SOLARIS
-#   define _XOPEN_SOURCE 500
-#   include <sys/socket.h>
-#   undef _XOPEN_SOURCE
+#	define _XOPEN_SOURCE 500
+#	include <sys/socket.h>
+#	undef _XOPEN_SOURCE
 #else
-#   include <sys/socket.h>
+#	include <sys/socket.h>
 #endif
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#define max(a, b)   ((a) < (b) ? (b) : (a))
-#define min(a, b)   ((a) > (b) ? (b) : (a))
+#define max(a, b)	((a) < (b) ? (b) : (a))
+#define min(a, b)	((a) > (b) ? (b) : (a))
 #ifndef abs
-#define abs(x)      ((x) >= 0 ? (x) : -(x))
+#define abs(x)		((x) >= 0 ? (x) : -(x))
 #endif
 
 #ifdef SYSV
@@ -111,26 +111,26 @@ int debug_printf(const char *f, ...);
 #   include <pthread.h>
 #   include <sys/file.h>
 #   include <sys/ioctl.h>
-#   include <sys/uio.h>
-#   include <sys/un.h>
+#	include <sys/uio.h>
+#	include <sys/un.h>
 #   include <netinet/tcp.h>
 #   include <dlfcn.h>
-#   include <endian.h>
-#   include <sys/time.h>
-#   include <semaphore.h>
-#   if __BYTE_ORDER == __LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
-#   elif __BYTE_ORDER == __BIG_ENDIAN
-#       define _BIG_ENDIAN
-#   elif __BYTE_ORDER == __PDP_ENDIAN
-#       define _PDP_ENDIAN
-#   endif
-#   define  PTR_SIZE_T(s)               ((size_t *)&(s))
-#   define  IORESOURCE_TRANSFER_BSD
-#   define  IOCHANNEL_TRANSFER_BSD_RENO
-#   define  pthread_testcancel()
-#   define  NO_PTHREAD_PRIORITY
-#   define  PTHREAD_SIGACTION           pthread_sigaction
+#	include <endian.h>
+#	include <sys/time.h>
+#	include <semaphore.h> 
+#	if __BYTE_ORDER == __LITTLE_ENDIAN
+#		define _LITTLE_ENDIAN
+#	elif __BYTE_ORDER == __BIG_ENDIAN
+#		define _BIG_ENDIAN
+#	elif __BYTE_ORDER == __PDP_ENDIAN
+#		define _PDP_ENDIAN
+#	endif
+#	define  PTR_SIZE_T(s)				((size_t *)&(s))
+#	define 	IORESOURCE_TRANSFER_BSD 
+#	define 	IOCHANNEL_TRANSFER_BSD_RENO
+#	define	pthread_testcancel()
+#	define  NO_PTHREAD_PRIORITY
+#	define  PTHREAD_SIGACTION 			pthread_sigaction
 #else
 #   include <shadow.h>
 #   include <asm/sigcontext.h>
@@ -138,56 +138,56 @@ int debug_printf(const char *f, ...);
 #   include <sys/file.h>
 #   include <sys/ioctl.h>
 #   include <linux/net.h>
-#   include <sys/un.h>
+#	include <sys/un.h>
 #   include <netinet/tcp.h>
 #   include <linux/elfcore.h>
 #   include <dlfcn.h>
-#   include <endian.h>
-#   if __BYTE_ORDER == __LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
-#   elif __BYTE_ORDER == __BIG_ENDIAN
-#       define _BIG_ENDIAN
-#   elif __BYTE_ORDER == __PDP_ENDIAN
-#       define _PDP_ENDIAN
-#   endif
-#   define  IORESOURCE_TRANSFER_BSD
-#   define  IOCHANNEL_TRANSFER_BSD_RENO
-#   define  pthread_testcancel()
-#   define  NO_PTHREAD_RTL
-#   define  NO_PTHREAD_PRIORITY
-#   define  PTHREAD_SIGACTION           pthread_sigaction
+#	include <endian.h>
+#	if __BYTE_ORDER == __LITTLE_ENDIAN
+#		define _LITTLE_ENDIAN
+#	elif __BYTE_ORDER == __BIG_ENDIAN
+#		define _BIG_ENDIAN
+#	elif __BYTE_ORDER == __PDP_ENDIAN
+#		define _PDP_ENDIAN
+#	endif
+#	define 	IORESOURCE_TRANSFER_BSD 
+#	define 	IOCHANNEL_TRANSFER_BSD_RENO
+#	define	pthread_testcancel()
+#	define  NO_PTHREAD_RTL
+#	define  NO_PTHREAD_PRIORITY
+#	define  PTHREAD_SIGACTION 			pthread_sigaction
 #endif
 #endif
 
 #ifdef NETBSD
-#   define  ETIME ETIMEDOUT
-#   define _POSIX_THREAD_SYSCALL_SOFT 1
-#   include <pthread.h>
-#   include <netdb.h>
-#   include <sys/sem.h>
-#   include <sys/exec.h>
-#   include <sys/filio.h>
-#   include <sys/ioctl.h>
-#   include <sys/time.h>
-#   include <sys/un.h>
-#   include <netinet/tcp.h>
-#   include <dlfcn.h>
+#	define  ETIME ETIMEDOUT
+#	define _POSIX_THREAD_SYSCALL_SOFT 1
+#	include <pthread.h>
+#	include <netdb.h>
+#	include <sys/sem.h>
+#	include <sys/exec.h>
+#	include <sys/filio.h>
+#	include <sys/ioctl.h>
+#	include <sys/time.h>
+#	include <sys/un.h>
+#	include <netinet/tcp.h>
+#	include <dlfcn.h>
 #   include <machine/endian.h>
 #   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN_OO
+#   	define _LITTLE_ENDIAN_OO
 #   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN_OO
+#   	define _BIG_ENDIAN_OO
 #   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN_OO
+#   	define _PDP_ENDIAN_OO
 #   endif
-#   define  PTR_SIZE_T(s)               ((size_t *)&(s))
-#   define  IORESOURCE_TRANSFER_BSD
-#   define  IOCHANNEL_TRANSFER_BSD_RENO
-#   define  pthread_testcancel()
-#   define  NO_PTHREAD_PRIORITY
+#	define  PTR_SIZE_T(s)				((size_t *)&(s))
+#	define 	IORESOURCE_TRANSFER_BSD 
+#	define 	IOCHANNEL_TRANSFER_BSD_RENO
+#	define	pthread_testcancel()
+#	define  NO_PTHREAD_PRIORITY
 #     define  NO_PTHREAD_SEMAPHORES
-#   define  NO_PTHREAD_RTL
-#   define  PTHREAD_SIGACTION           pthread_sigaction
+#	define  NO_PTHREAD_RTL
+#	define  PTHREAD_SIGACTION 			pthread_sigaction
 #endif
 
 #ifdef FREEBSD
@@ -206,152 +206,152 @@ int debug_printf(const char *f, ...);
 #   include <vm/vm_param.h>
 #   include <vm/pmap.h>
 #   include <vm/swap_pager.h>
-#   include <sys/un.h>
+#	include <sys/un.h>
 #   include <netinet/tcp.h>
-#   define  IORESOURCE_TRANSFER_BSD
+#	define 	IORESOURCE_TRANSFER_BSD 
 #   include <machine/endian.h>
 #if __FreeBSD_version < 500000
 #   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
+#   	define _LITTLE_ENDIAN
 #   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN
+#   	define _BIG_ENDIAN
 #   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN
+#   	define _PDP_ENDIAN
 #   endif
 #endif
-#   define  NO_PTHREAD_RTL
+#	define  NO_PTHREAD_RTL
 #endif
 
 #ifdef SCO
 #   define AF_IPX -1
-#   include <strings.h>
-#   include <pthread.h>
-#   include <shadow.h>
-#   include <netdb.h>
-#   include <sys/un.h>
-#   include <sys/netinet/tcp.h>
+#	include <strings.h>
+#	include <pthread.h>
+#	include <shadow.h>
+#	include <netdb.h>
+#	include <sys/un.h>
+#	include <sys/netinet/tcp.h>
 #   include <sys/types.h>
 #   include <sys/byteorder.h>
 #   include <dlfcn.h>
 #   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
+#   	define _LITTLE_ENDIAN
 #   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN
+#   	define _BIG_ENDIAN
 #   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN
+#   	define _PDP_ENDIAN
 #   endif
-#   define  sched_yield()               pthread_yield()
-#   define  pthread_testcancel()
-#   define  NO_PTHREAD_RTL
-#   define  NO_PTHREAD_PRIORITY
+#	define  sched_yield() 				pthread_yield()
+#	define	pthread_testcancel()
+#	define  NO_PTHREAD_RTL
+#	define  NO_PTHREAD_PRIORITY
 extern int pthread_cancel(pthread_t);
 extern unsigned int nanosleep(unsigned int);
-#   define  SLEEP_TIMESPEC(timespec)    (timespec .tv_sec > 0) ? sleep(timespec .tv_sec), nanosleep(timespec .tv_nsec) : nanosleep(timespec .tv_nsec)
-#   define  PATH_MAX                    _POSIX_PATH_MAX
-#   define  S_ISSOCK                    S_ISFIFO
-#   define  PTHREAD_SIGACTION           pthread_sigaction
-#   define  STAT_PARENT                 stat
+#	define  SLEEP_TIMESPEC(timespec)  	(timespec .tv_sec > 0) ? sleep(timespec .tv_sec), nanosleep(timespec .tv_nsec) : nanosleep(timespec .tv_nsec)
+#	define  PATH_MAX 					_POSIX_PATH_MAX
+#	define	S_ISSOCK					S_ISFIFO 
+#	define	PTHREAD_SIGACTION 			pthread_sigaction
+#	define	STAT_PARENT					stat
 #endif
 
 #ifdef AIX
 #   define AF_IPX -1
-#   include <strings.h>
-#   include <pthread.h>
-#   include <sys/time.h>
-#   include <sys/un.h>
-#   include <netinet/tcp.h>
-#   include <sys/machine.h>
+#	include <strings.h>
+#	include <pthread.h>
+#	include <sys/time.h>
+#	include <sys/un.h>
+#	include <netinet/tcp.h>
+#	include <sys/machine.h>
 #   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
+#   	define _LITTLE_ENDIAN
 #   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN
+#   	define _BIG_ENDIAN
 #   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN
+#   	define _PDP_ENDIAN
 #   endif
-#   define  sched_yield()               pthread_yield()
-#   define  SLEEP_TIMESPEC(timespec)    nsleep(&timespec, 0)
-#   define  LIBPATH "LIBPATH"
-#   define  PTR_SIZE_T(s)               ((size_t *)&(s))
-#   define  NO_PTHREAD_SEMAPHORES
+#	define  sched_yield() 				pthread_yield()
+#	define  SLEEP_TIMESPEC(timespec)  	nsleep(&timespec, 0)
+#	define  LIBPATH "LIBPATH"
+#	define  PTR_SIZE_T(s)				((size_t *)&(s))
+#	define  NO_PTHREAD_SEMAPHORES
 #   define  NO_DL_FUNCTIONS
 #endif
 
 #ifdef HPUX
 #   define  AF_IPX -1
-#   undef   howmany
-#   undef   MAXINT
-#   include <pthread.h>
-#   include <sys/un.h>
-#   include <sys/sched.h>
-#   include <sys/xti.h>
-#   include <sys/pstat.h>
-#   include <shadow.h>
-#   include <crypt.h>
-#   include <machine/param.h>
-#   define  LIBPATH "SHLIB_PATH"
-#   define  PTR_SIZE_T(s)               ((int *)&(s))
-#   define  PTR_FD_SET(s)               ((int *)&(s))
-#   define  PTHREAD_VALUE(t)            ((t).field2)
-#   define  PTHREAD_NONE_INIT           { 0, -1 }
-#   define  PTHREAD_ATTR_DEFAULT        pthread_attr_default
-#   define  PTHREAD_MUTEXATTR_DEFAULT   pthread_mutexattr_default
-#   define  PTHREAD_CONDATTR_DEFAULT    pthread_condattr_default
-#   define  pthread_detach(t)           pthread_detach(&(t))
-#   define  NO_PTHREAD_PRIORITY
-#   define  NO_PTHREAD_SEMAPHORES
+#   undef	howmany
+#   undef	MAXINT
+#	include <pthread.h>
+#	include <sys/un.h>
+#	include <sys/sched.h>
+#	include <sys/xti.h>
+#	include <sys/pstat.h>
+#	include <shadow.h>
+#	include <crypt.h>
+#	include <machine/param.h>
+#	define  LIBPATH "SHLIB_PATH"
+#	define  PTR_SIZE_T(s)				((int *)&(s))
+#	define  PTR_FD_SET(s)				((int *)&(s))
+#	define  PTHREAD_VALUE(t)			((t).field2)
+# 	define  PTHREAD_NONE_INIT			{ 0, -1 }
+#	define  PTHREAD_ATTR_DEFAULT		pthread_attr_default
+#	define  PTHREAD_MUTEXATTR_DEFAULT	pthread_mutexattr_default
+#	define  PTHREAD_CONDATTR_DEFAULT	pthread_condattr_default
+#	define  pthread_detach(t)			pthread_detach(&(t))
+#	define  NO_PTHREAD_PRIORITY
+#	define  NO_PTHREAD_SEMAPHORES
 #   define  NO_DL_FUNCTIONS
-#   undef   sigaction
-#   define  PTHREAD_SIGACTION           cma_sigaction
+#	undef	sigaction
+#	define  PTHREAD_SIGACTION 			cma_sigaction
 #endif
 
 #ifdef SOLARIS
-#   include <shadow.h>
-#   include <sys/procfs.h>
-#   include <sys/un.h>
-#   include <stropts.h>
-#   include <pthread.h>
-#   include <semaphore.h>
-#   include <netinet/tcp.h>
-#   include <sys/filio.h>
-#   include <dlfcn.h>
-#   include <sys/isa_defs.h>
-#   define  IORESOURCE_TRANSFER_SYSV
-#   define  IOCHANNEL_TRANSFER_BSD
-#   define  LIBPATH "LD_LIBRARY_PATH"
-#   define  PTR_SIZE_T(s)               ((int *)&(s))
+#	include <shadow.h>
+#	include <sys/procfs.h>
+#	include <sys/un.h>
+#	include <stropts.h>
+#	include <pthread.h>
+#	include <semaphore.h>
+#	include <netinet/tcp.h>
+#	include <sys/filio.h>
+#	include <dlfcn.h>
+#	include <sys/isa_defs.h>
+#	define 	IORESOURCE_TRANSFER_SYSV 
+#	define 	IOCHANNEL_TRANSFER_BSD
+#	define  LIBPATH "LD_LIBRARY_PATH"
+#	define  PTR_SIZE_T(s)				((int *)&(s))
 #endif
 
 #ifdef MACOSX
-#   define  ETIME ETIMEDOUT
-#   include <pthread.h>
-#   include <sys/file.h>
-#   include <sys/ioctl.h>
-#   include <sys/uio.h>
-#   include <sys/un.h>
-#   include <netinet/tcp.h>
-#   include <machine/endian.h>
-#   include <sys/time.h>
-#   include <sys/semaphore.h>
+#	define  ETIME ETIMEDOUT
+#	include <pthread.h>
+#	include <sys/file.h>
+#	include <sys/ioctl.h>
+#	include <sys/uio.h>
+#	include <sys/un.h>
+#	include <netinet/tcp.h>
+#	include <machine/endian.h>
+#	include <sys/time.h>
+#	include <sys/semaphore.h> 
 /* fixme are premac and postmac still needed here? */
-#   include <premac.h>
-#   include <mach-o/dyld.h>
-#   include <postmac.h>
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
-#   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN
-#   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN
-#   endif
-#   define  IOCHANNEL_TRANSFER_BSD_RENO
-#   define  NO_PTHREAD_RTL
+#	include <premac.h>
+#	include <mach-o/dyld.h> 
+#	include <postmac.h>
+#	if BYTE_ORDER == LITTLE_ENDIAN
+#		define _LITTLE_ENDIAN
+#	elif BYTE_ORDER == BIG_ENDIAN
+#		define _BIG_ENDIAN
+#	elif BYTE_ORDER == PDP_ENDIAN
+#		define _PDP_ENDIAN
+#	endif
+#	define 	IOCHANNEL_TRANSFER_BSD_RENO
+#	define  NO_PTHREAD_RTL
 /* for NSGetArgc/Argv/Environ */
 #       include <crt_externs.h>
 char *macxp_tempnam( const char *tmpdir, const char *prefix );
 #endif
 
 #ifdef OS2
-#   include <netinet/tcp.h>
+#	include <netinet/tcp.h>
 #endif
 
 #if !defined(_WIN32)  && !defined(_WIN16) && !defined(OS2)  && \
@@ -359,106 +359,106 @@ char *macxp_tempnam( const char *tmpdir, const char *prefix );
     !defined(AIX)     && !defined(HPUX)   && \
     !defined(SOLARIS) && !defined(MAC) && \
     !defined(MACOSX)
-#   error "Target plattform not specified !"
+#	error "Target plattform not specified !"
 #endif
 
 #if defined(NETBSD)
 #if defined _LITTLE_ENDIAN_OO
-#   define _OSL_BIGENDIAN
+#	define _OSL_BIGENDIAN
 #elif defined _BIG_ENDIAN_OO
-#   define _OSL_LITENDIAN
+#	define _OSL_LITENDIAN
 #else
-#   error undetermined endianess
+#	error undetermined endianess
 #endif
 #else
 #if defined _LITTLE_ENDIAN
-#   define _OSL_BIGENDIAN
+#	define _OSL_BIGENDIAN
 #elif defined _BIG_ENDIAN
-#   define _OSL_LITENDIAN
+#	define _OSL_LITENDIAN
 #else
-#   error undetermined endianess
+#	error undetermined endianess
 #endif
 #endif
 
 #ifndef PTR_SIZE_T
-#   define PTR_SIZE_T(s)                (&(s))
+#	define PTR_SIZE_T(s)				(&(s))
 #endif
 
 #ifndef PTR_FD_SET
-#   define PTR_FD_SET(s)                (&(s))
+#	define PTR_FD_SET(s)				(&(s))
 #endif
 
 #ifndef NORMALIZE_TIMESPEC
-#   define NORMALIZE_TIMESPEC(timespec) \
+#	define NORMALIZE_TIMESPEC(timespec) \
           timespec . tv_sec  += timespec . tv_nsec / 1000000000; \
-          timespec . tv_nsec %= 1000000000;
+          timespec . tv_nsec %= 1000000000; 
 #endif
 
 #ifndef SET_TIMESPEC
-#   define SET_TIMESPEC(timespec, sec, nsec) \
+#	define SET_TIMESPEC(timespec, sec, nsec) \
           timespec . tv_sec  = (sec);  \
           timespec . tv_nsec = (nsec); \
         NORMALIZE_TIMESPEC(timespec);
 #endif
 
 #ifndef SLEEP_TIMESPEC
-#   define SLEEP_TIMESPEC(timespec) nanosleep(&timespec, 0)
+#	define SLEEP_TIMESPEC(timespec) nanosleep(&timespec, 0)
 #endif
 
-#ifndef INIT_GROUPS
-#   define  INIT_GROUPS(name, gid)  ((setgid((gid)) == 0) && (initgroups((name), (gid)) == 0))
+#ifndef INIT_GROUPS	
+#	define  INIT_GROUPS(name, gid)	((setgid((gid)) == 0) && (initgroups((name), (gid)) == 0))
 #endif
 
 #ifndef PTHREAD_VALUE
-#   define PTHREAD_VALUE(t)             (t)
+#	define PTHREAD_VALUE(t) 			(t)
 #endif
 #ifndef PTHREAD_NONE
 extern pthread_t _pthread_none_;
-#   define PTHREAD_NONE                 _pthread_none_
+#	define PTHREAD_NONE					_pthread_none_
 #   ifndef PTHREAD_NONE_INIT
-#       define PTHREAD_NONE_INIT        ((pthread_t)-1)
-#   endif
+#		define PTHREAD_NONE_INIT		((pthread_t)-1)
+#	endif
 #endif
 
 #ifndef PTHREAD_ATTR_DEFAULT
-#   define PTHREAD_ATTR_DEFAULT         NULL
+#	define PTHREAD_ATTR_DEFAULT 		NULL
 #endif
-#ifndef PTHREAD_MUTEXATTR_DEFAULT
-#   define PTHREAD_MUTEXATTR_DEFAULT    NULL
+#ifndef PTHREAD_MUTEXATTR_DEFAULT 
+#	define PTHREAD_MUTEXATTR_DEFAULT 	NULL
 #endif
 #ifndef PTHREAD_CONDATTR_DEFAULT
-#   define PTHREAD_CONDATTR_DEFAULT     NULL
+#	define PTHREAD_CONDATTR_DEFAULT 	NULL
 #endif
 
 #ifndef PTHREAD_SIGACTION
-#   define PTHREAD_SIGACTION sigaction
+#	define PTHREAD_SIGACTION sigaction
 #endif
 
 #ifndef STAT_PARENT
-#   define STAT_PARENT                  lstat
+#	define STAT_PARENT					lstat
 #endif
 
 /* socket options which might not be defined on all unx flavors */
 #ifndef SO_ACCEPTCONN
-#   define SO_ACCEPTCONN    0
+#	define SO_ACCEPTCONN 	0
 #endif
 #ifndef SO_SNDLOWAT
-#   define SO_SNDLOWAT      0
+#	define SO_SNDLOWAT 		0
 #endif
 #ifndef SO_RCVLOWAT
-#   define SO_RCVLOWAT      0
+#	define SO_RCVLOWAT 		0
 #endif
 #ifndef SO_SNDTIMEO
-#   define  SO_SNDTIMEO     0
+#	define	SO_SNDTIMEO 	0
 #endif
 #ifndef SO_RCVTIMEO
-#   define SO_RCVTIMEO      0
+#	define SO_RCVTIMEO 		0
 #endif
 #ifndef SO_USELOOPBACK
-#   define SO_USELOOPBACK   0
+#	define SO_USELOOPBACK 	0
 #endif
 #ifndef MSG_MAXIOVLEN
-#   define MSG_MAXIOVLEN    0
+#	define MSG_MAXIOVLEN 	0
 #endif
 
 /* BEGIN HACK */
@@ -466,7 +466,7 @@ extern pthread_t _pthread_none_;
 /* original ipx headers when these are available for this platform */
 
 #ifndef SA_FAMILY_DECL
-#   define SA_FAMILY_DECL short sa_family
+#	define SA_FAMILY_DECL short sa_family
 #endif
 
 typedef struct sockaddr_ipx {
@@ -486,9 +486,9 @@ typedef struct sockaddr_ipx {
 
 typedef struct
 {
-    pthread_mutex_t mutex;
-    pthread_cond_t  increased;
-    int             value;
+    pthread_mutex_t	mutex;
+    pthread_cond_t	increased;
+    int			    value;
 } sem_t;
 extern int sem_init(sem_t* sem, int pshared, unsigned int value);
 extern int sem_destroy(sem_t* sem);
diff --git a/sal/osl/os2/tempfile.c b/sal/osl/os2/tempfile.c
index bf4512b9341c..d119cd055479 100644
--- a/sal/osl/os2/tempfile.c
+++ b/sal/osl/os2/tempfile.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@
 #ifndef _FILE_URL_H_
 #include "file_url.h"
 #endif
-
+ 
 /*****************************************************************/
 /* osl_getTempFirURL                                             */
 /*****************************************************************/
@@ -66,13 +66,13 @@ oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir )
     if ( pValue )
     {
         oslFileError error;
-        rtl_uString *ustrTempPath = NULL;
+        rtl_uString	*ustrTempPath = NULL;
 
         rtl_string2UString( &ustrTempPath, pValue, strlen( pValue ), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
         OSL_ASSERT(ustrTempPath != NULL);
         error = osl_getFileURLFromSystemPath( ustrTempPath, pustrTempDir );
         rtl_uString_release( ustrTempPath );
-
+        
         return error;
     }
     else
@@ -80,12 +80,12 @@ oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir )
 }
 
 /******************************************************************
- * Generates a random unique file name. We're using the scheme
- * from the standard c-lib function mkstemp to generate a more
- * or less random unique file name
- *
- * @param rand_name
- *        receives the random name
+ * Generates a random unique file name. We're using the scheme   
+ * from the standard c-lib function mkstemp to generate a more   
+ * or less random unique file name                               
+ *                                                               
+ * @param rand_name                                              
+ *        receives the random name                               
  ******************************************************************/
 
 static const char LETTERS[]        = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
@@ -94,28 +94,28 @@ static const int  COUNT_OF_LETTERS = SAL_N_ELEMENTS(LETTERS) - 1;
 #define RAND_NAME_LENGTH 6
 
 static void osl_gen_random_name_impl_(rtl_uString** rand_name)
-{
-    static uint64_t value;
-
+{	   
+    static uint64_t value; 
+    
     char     buffer[RAND_NAME_LENGTH];
     struct   timeval tv;
     uint64_t v;
     int      i;
-
+    
     gettimeofday(&tv, NULL);
-
+    
     value += ((uint64_t)tv.tv_usec << 16) ^ tv.tv_sec ^ getpid();
-
+    
     v = value;
-
+    
     for (i = 0; i < RAND_NAME_LENGTH; i++)
     {
         buffer[i] = LETTERS[v % COUNT_OF_LETTERS];
         v        /= COUNT_OF_LETTERS;
     }
-
+    
     rtl_string2UString(
-            rand_name,
+            rand_name, 
             buffer,
             RAND_NAME_LENGTH,
             RTL_TEXTENCODING_ASCII_US,
@@ -124,9 +124,9 @@ static void osl_gen_random_name_impl_(rtl_uString** rand_name)
 }
 
 /*****************************************************************
- * Helper function
- * Either use the directory provided or the result of
- * osl_getTempDirUrl and return it as system path and file url
+ * Helper function                                               
+ * Either use the directory provided or the result of            
+ * osl_getTempDirUrl and return it as system path and file url   
  ****************************************************************/
 
 static oslFileError osl_setup_base_directory_impl_(
@@ -135,44 +135,44 @@ static oslFileError osl_setup_base_directory_impl_(
 {
     rtl_uString* dir_url = 0;
     rtl_uString* dir     = 0;
-    oslFileError error   = osl_File_E_None;
-
+    oslFileError error   = osl_File_E_None;                     
+    
     if (pustrDirectoryURL)
         rtl_uString_assign(&dir_url, pustrDirectoryURL);
     else
         error = osl_getTempDirURL(&dir_url);
-
+        
     if (osl_File_E_None == error)
     {
-        error = osl_getSystemPathFromFileURL_Ex(dir_url, &dir, FURL_DENY_RELATIVE);
+        error = osl_getSystemPathFromFileURL_Ex(dir_url, &dir, FURL_DENY_RELATIVE);       						
         rtl_uString_release(dir_url);
     }
-
+        
     if (osl_File_E_None == error)
     {
         rtl_uString_assign(ppustr_base_dir, dir);
         rtl_uString_release(dir);
     }
-
-    return error;
+    
+    return error;	
 }
 
 /*****************************************************************
  * osl_setup_createTempFile_impl
  * validate input parameter, setup variables
  ****************************************************************/
-
+ 
  static oslFileError osl_setup_createTempFile_impl_(
      rtl_uString*   pustrDirectoryURL,
     oslFileHandle* pHandle,
     rtl_uString**  ppustrTempFileURL,
     rtl_uString**  ppustr_base_dir,
-    sal_Bool*      b_delete_on_close)
+    sal_Bool*	   b_delete_on_close)
  {
      oslFileError osl_error;
-
+    
     OSL_PRECOND(((0 != pHandle) || (0 != ppustrTempFileURL)), "Invalid parameter!");
-
+    
     if ((0 == pHandle) && (0 == ppustrTempFileURL))
     {
         osl_error = osl_File_E_INVAL;
@@ -181,20 +181,20 @@ static oslFileError osl_setup_base_directory_impl_(
     {
         osl_error = osl_setup_base_directory_impl_(
             pustrDirectoryURL, ppustr_base_dir);
-
+            
         *b_delete_on_close = (0 == ppustrTempFileURL);
     }
-
+    
     return osl_error;
  }
-
+ 
 /*****************************************************************
- * Create a unique file in the specified directory and return
- * it's name
+ * Create a unique file in the specified directory and return    
+ * it's name                                                     
  ****************************************************************/
 
 static oslFileError osl_create_temp_file_impl_(
-    const rtl_uString* pustr_base_directory,
+    const rtl_uString* pustr_base_directory, 
     oslFileHandle* file_handle,
     rtl_uString** ppustr_temp_file_name)
 {
@@ -206,45 +206,45 @@ static oslFileError osl_create_temp_file_impl_(
     oslFileError        osl_error        = osl_File_E_None;
     sal_Int32           offset_file_name;
     const sal_Unicode*  puchr;
-
+        
     OSL_PRECOND(pustr_base_directory, "Invalid Parameter");
     OSL_PRECOND(file_handle, "Invalid Parameter");
     OSL_PRECOND(ppustr_temp_file_name, "Invalid Parameter");
-
+    
     len_base_dir = rtl_uString_getLength(pustr_base_directory);
-
+    
     rtl_uStringbuffer_newFromStr_WithLength(
-        &tmp_file_path,
+        &tmp_file_path, 
         rtl_uString_getStr((rtl_uString*)pustr_base_directory),
         len_base_dir);
-
+                        
     rtl_uStringbuffer_ensureCapacity(
-        &tmp_file_path,
-        &capacity,
+        &tmp_file_path, 
+        &capacity, 
         (len_base_dir + 1 + RAND_NAME_LENGTH));
-
+        
     offset_file_name = len_base_dir;
-
+        
     puchr = rtl_uString_getStr(tmp_file_path);
-
+    
     /* ensure that the last character is a '\' */
-
+    
     if ((sal_Unicode)'\\' != puchr[len_base_dir - 1])
-    {
+    {		
         rtl_uStringbuffer_insert_ascii(
-            &tmp_file_path,
-            &capacity,
+            &tmp_file_path, 
+            &capacity, 
             len_base_dir,
             "\\",
             1);
-
-        offset_file_name++;
+        
+        offset_file_name++;					
     }
-
+         
     while(1) /* try until success */
-    {
+    {							
         osl_gen_random_name_impl_(&rand_name);
-
+                    
         rtl_uStringbuffer_insert(
             &tmp_file_path,
             &capacity,
@@ -253,110 +253,110 @@ static oslFileError osl_create_temp_file_impl_(
             rtl_uString_getLength(rand_name));
 
         osl_error = osl_getFileURLFromSystemPath(
-            tmp_file_path, &tmp_file_url);
-
+            tmp_file_path, &tmp_file_url);				
+        
         if (osl_File_E_None == osl_error)
         {
             /* RW permission for the user only! */
             mode_t old_mode = umask(077);
-
+            
             osl_error = osl_openFile(
-                tmp_file_url,
-                file_handle,
-                osl_File_OpenFlag_Read |
-                osl_File_OpenFlag_Write |
+                tmp_file_url, 
+                file_handle, 
+                osl_File_OpenFlag_Read | 
+                osl_File_OpenFlag_Write | 
                 osl_File_OpenFlag_Create);
-
+                
             umask(old_mode);
         }
-
-        /* in case of error osl_File_E_EXIST we simply try again else we give up */
-
+        
+        /* in case of error osl_File_E_EXIST we simply try again else we give up */	
+        
         if ((osl_File_E_None == osl_error) || (osl_error != osl_File_E_EXIST))
         {
             if (rand_name)
                 rtl_uString_release(rand_name);
-
+            
             if (tmp_file_url)
                 rtl_uString_release(tmp_file_url);
-
+                                
             break;
-        }
+        }					
     } /* while(1) */
-
+    
     if (osl_File_E_None == osl_error)
         rtl_uString_assign(ppustr_temp_file_name, tmp_file_path);
-
+    
     if (tmp_file_path)
         rtl_uString_release(tmp_file_path);
-
+        
     return osl_error;
 }
 
 /*****************************************************************
- * osl_createTempFile
+ * osl_createTempFile                                            
  *****************************************************************/
 
 oslFileError SAL_CALL osl_createTempFile(
     rtl_uString*   pustrDirectoryURL,
-    oslFileHandle* pHandle,
+    oslFileHandle* pHandle, 
     rtl_uString**  ppustrTempFileURL)
 {
-    rtl_uString*  base_directory     = 0;
+    rtl_uString*  base_directory     = 0;	
     rtl_uString*  temp_file_name     = 0;
     oslFileHandle temp_file_handle;
     sal_Bool      b_delete_on_close;
     oslFileError  osl_error;
-
+    
     osl_error = osl_setup_createTempFile_impl_(
-        pustrDirectoryURL,
+        pustrDirectoryURL, 
         pHandle,
-        ppustrTempFileURL,
+        ppustrTempFileURL,		
         &base_directory,
         &b_delete_on_close);
-
-    if (osl_File_E_None != osl_error)
+    
+    if (osl_File_E_None != osl_error)		
         return osl_error;
-
+        
     osl_error = osl_create_temp_file_impl_(
         base_directory, &temp_file_handle, &temp_file_name);
-
-    if (osl_File_E_None == osl_error)
-    {
-        rtl_uString* temp_file_url = 0;
-
+                                
+    if (osl_File_E_None == osl_error) 
+    {		
+        rtl_uString* temp_file_url = 0;		
+        
         /* assuming this works */
         osl_getFileURLFromSystemPath(temp_file_name, &temp_file_url);
-
+                                                
         if (b_delete_on_close)
-        {
+        {			
             osl_error = osl_removeFile(temp_file_url);
-
+            
             if (osl_File_E_None == osl_error)
                 *pHandle = temp_file_handle;
             else
                 osl_closeFile(temp_file_handle);
         }
-        else
-        {
+        else 
+        {		
             if (pHandle)
-                *pHandle = temp_file_handle;
+                *pHandle = temp_file_handle;				
             else
-                osl_closeFile(temp_file_handle);
-
-            rtl_uString_assign(ppustrTempFileURL, temp_file_url);
+                osl_closeFile(temp_file_handle);	
+                                     
+            rtl_uString_assign(ppustrTempFileURL, temp_file_url);                                       
         }
-
+        
         if (temp_file_url)
             rtl_uString_release(temp_file_url);
-
+                
         if (temp_file_name)
             rtl_uString_release(temp_file_name);
     }
-
+    
     if (base_directory)
-        rtl_uString_release(base_directory);
-
+        rtl_uString_release(base_directory);      
+        
     return osl_error;
 }
 
diff --git a/sal/osl/os2/thread.c b/sal/osl/os2/thread.c
index d751376a3978..c9a375e1181c 100644
--- a/sal/osl/os2/thread.c
+++ b/sal/osl/os2/thread.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -156,16 +156,16 @@ static oslThread oslCreateThread(oslWorkerFunction pWorker,
     pThreadImpl->m_hmq = 0;
 
     if ( nFlags == sal_True )
-    {
+    {    
         DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
     }
-
+    
     pThreadImpl->m_ThreadId = (TID) _beginthread( oslWorkerWrapperFunction,    /* worker-function */
                                                   NULL,                        /* unused parameter */
                                                   1024*1024,                   /* max. Stacksize */
                                                   pThreadImpl );
     if ( nFlags == sal_True )
-    {
+    {    
         if( pThreadImpl->m_ThreadId != -1 )
             DosSuspendThread( pThreadImpl->m_ThreadId );
         DosReleaseMutexSem( MutexLock);
@@ -552,12 +552,12 @@ void SAL_CALL osl_yieldThread()
 
 typedef struct _TLS
 {
-    PULONG                          pulPtr;
-    oslThreadKeyCallbackFunction    pfnCallback;
-    struct _TLS                     *pNext, *pPrev;
+    PULONG							pulPtr;
+    oslThreadKeyCallbackFunction	pfnCallback;
+    struct _TLS						*pNext, *pPrev;
 } TLS, *PTLS;
 
-static  PTLS        g_pThreadKeyList = NULL;
+static	PTLS		g_pThreadKeyList = NULL;
 
 static void AddKeyToList( PTLS pTls )
 {
@@ -567,7 +567,7 @@ static void AddKeyToList( PTLS pTls )
 
         pTls->pNext = g_pThreadKeyList;
         pTls->pPrev = 0;
-
+        
         if ( g_pThreadKeyList )
             g_pThreadKeyList->pPrev = pTls;
 
@@ -598,15 +598,15 @@ static void RemoveKeyFromList( PTLS pTls )
 
 void SAL_CALL _osl_callThreadKeyCallbackOnThreadDetach(void)
 {
-    PTLS    pTls;
-
+    PTLS	pTls;
+    
     DosRequestMutexSem( MutexLock, SEM_INDEFINITE_WAIT );
     pTls = g_pThreadKeyList;
     while ( pTls )
     {
         if ( pTls->pfnCallback )
         {
-            void    *pValue = (void*)*pTls->pulPtr;
+            void	*pValue	= (void*)*pTls->pulPtr;
 
             if ( pValue )
                 pTls->pfnCallback( pValue );
@@ -622,7 +622,7 @@ void SAL_CALL _osl_callThreadKeyCallbackOnThreadDetach(void)
 /*****************************************************************************/
 oslThreadKey SAL_CALL osl_createThreadKey(oslThreadKeyCallbackFunction pCallback)
 {
-    PTLS    pTls = (PTLS)rtl_allocateMemory( sizeof(TLS) );
+    PTLS	pTls = (PTLS)rtl_allocateMemory( sizeof(TLS) );
 
     if ( pTls )
     {
@@ -632,7 +632,7 @@ oslThreadKey SAL_CALL osl_createThreadKey(oslThreadKeyCallbackFunction pCallback
             rtl_freeMemory( pTls );
             pTls = 0;
         }
-        else
+        else 
         {
             *pTls->pulPtr = 0;
             AddKeyToList( pTls );
@@ -649,10 +649,10 @@ void SAL_CALL osl_destroyThreadKey(oslThreadKey Key)
 {
     if (Key != 0)
     {
-        PTLS    pTls = (PTLS)Key;
+        PTLS	pTls = (PTLS)Key;
 
         RemoveKeyFromList( pTls );
-        DosFreeThreadLocalMemory(pTls->pulPtr);
+        DosFreeThreadLocalMemory(pTls->pulPtr);     
         rtl_freeMemory( pTls );
     }
 }
@@ -664,7 +664,7 @@ void * SAL_CALL osl_getThreadKeyData(oslThreadKey Key)
 {
     if (Key != 0)
     {
-        PTLS    pTls = (PTLS)Key;
+        PTLS	pTls = (PTLS)Key;
 
         return ((void *) *pTls->pulPtr);
     }
@@ -679,9 +679,9 @@ sal_Bool SAL_CALL osl_setThreadKeyData(oslThreadKey Key, void *pData)
 {
     if (Key != 0)
     {
-        PTLS    pTls = (PTLS)Key;
-        void*   pOldData = NULL;
-        BOOL    fSuccess = TRUE; //YD cannot fail
+        PTLS	pTls = (PTLS)Key;
+        void*	pOldData = NULL;
+        BOOL	fSuccess = TRUE; //YD cannot fail
 
         if ( pTls->pfnCallback )
             pOldData = (void*)*pTls->pulPtr;
@@ -703,39 +703,39 @@ sal_Bool SAL_CALL osl_setThreadKeyData(oslThreadKey Key, void *pData)
 /* osl_getThreadTextEncoding */
 /*****************************************************************************/
 
-ULONG   g_dwTLSTextEncodingIndex = (ULONG)-1;
+ULONG	g_dwTLSTextEncodingIndex = (ULONG)-1;
 
 sal_uInt32 SAL_CALL _GetACP( void)
 {
-    APIRET  rc;
-    ULONG   aulCpList[8]  = {0};
-    ULONG   ulListSize;
-
-    rc = DosQueryCp( sizeof( aulCpList), aulCpList, &ulListSize);
+    APIRET	rc;
+    ULONG  	aulCpList[8]  = {0};
+    ULONG	ulListSize;
+    
+    rc = DosQueryCp( sizeof( aulCpList), aulCpList, &ulListSize);	
     if (rc)
-        return 437; // in case of error, return codepage EN_US
+        return 437;	// in case of error, return codepage EN_US
     // current codepage is first of list, others are the prepared codepages.
     return aulCpList[0];
 }
 
 rtl_TextEncoding SAL_CALL osl_getThreadTextEncoding(void)
 {
-    rtl_TextEncoding    _encoding;
+    rtl_TextEncoding	_encoding;
 
     if ( (ULONG)-1 == g_dwTLSTextEncodingIndex ) {
         rtl_TextEncoding defaultEncoding;
         const char *     pszEncoding;
-
+    
         /* create thread specific data key */
         g_dwTLSTextEncodingIndex = osl_createThreadKey( NULL);
-
+    
         /* determine default text encoding */
         pszEncoding = getenv ("SOLAR_USER_RTL_TEXTENCODING");
         if (pszEncoding)
             defaultEncoding = atoi(pszEncoding);
         else
             defaultEncoding = rtl_getTextEncodingFromWindowsCodePage( _GetACP());
-
+    
         //OSL_ASSERT(defaultEncoding != RTL_TEXTENCODING_DONTKNOW);
         //g_thread.m_textencoding.m_default = defaultEncoding;
         osl_setThreadKeyData( g_dwTLSTextEncodingIndex, (void*)defaultEncoding);
diff --git a/sal/osl/os2/time.c b/sal/osl/os2/time.c
index 22440f9660f1..2dae526d99dc 100644
--- a/sal/osl/os2/time.c
+++ b/sal/osl/os2/time.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -69,7 +69,7 @@ sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( TimeValue* pTimeVal, oslDateTime
     time_t atime;
 
     atime = (time_t)pTimeVal->Seconds;
-
+    
     /* Convert time from type time_t to struct tm */
     pSystemTime = gmtime_r( &atime, &tmBuf );
 
@@ -77,14 +77,14 @@ sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( TimeValue* pTimeVal, oslDateTime
     /* Convert struct tm to struct oslDateTime */
     if ( pSystemTime != NULL )
     {
-        pDateTime->NanoSeconds  =   pTimeVal->Nanosec;
-        pDateTime->Seconds      =   pSystemTime->tm_sec;
-        pDateTime->Minutes      =   pSystemTime->tm_min;
-        pDateTime->Hours        =   pSystemTime->tm_hour;
-        pDateTime->Day          =   pSystemTime->tm_mday;
-        pDateTime->DayOfWeek    =   pSystemTime->tm_wday;
-        pDateTime->Month        =   pSystemTime->tm_mon + 1;
-        pDateTime->Year         =   pSystemTime->tm_year  + 1900;
+        pDateTime->NanoSeconds	=	pTimeVal->Nanosec;
+        pDateTime->Seconds		=	pSystemTime->tm_sec;
+        pDateTime->Minutes		=	pSystemTime->tm_min;
+        pDateTime->Hours		=	pSystemTime->tm_hour;
+        pDateTime->Day			=	pSystemTime->tm_mday;
+        pDateTime->DayOfWeek	=	pSystemTime->tm_wday;
+        pDateTime->Month		=	pSystemTime->tm_mon + 1;
+        pDateTime->Year			=	pSystemTime->tm_year  + 1900;
 
         return sal_True;
     }
@@ -98,8 +98,8 @@ sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( TimeValue* pTimeVal, oslDateTime
 
 sal_Bool SAL_CALL osl_getTimeValueFromDateTime( oslDateTime* pDateTime, TimeValue* pTimeVal )
 {
-    struct tm   aTime;
-    time_t      nSeconds;
+    struct tm	aTime;
+    time_t		nSeconds;
 
     /* Convert struct oslDateTime to struct tm */
     aTime.tm_sec  = pDateTime->Seconds;
@@ -110,12 +110,12 @@ sal_Bool SAL_CALL osl_getTimeValueFromDateTime( oslDateTime* pDateTime, TimeValu
 
     if ( pDateTime->Month > 0 )
         aTime.tm_mon = pDateTime->Month - 1;
-    else
+    else 
         return sal_False;
 
     if ( pDateTime->Year >= 1900 )
         aTime.tm_year = pDateTime->Year - 1900;
-    else
+    else 
         return sal_False;
 
     aTime.tm_isdst = -1;
@@ -126,14 +126,14 @@ sal_Bool SAL_CALL osl_getTimeValueFromDateTime( oslDateTime* pDateTime, TimeValu
     nSeconds = mktime( &aTime );
 
     /*
-     * mktime expects the struct tm to be in local timezone, so we have to adjust
+     * mktime expects the struct tm to be in local timezone, so we have to adjust 
      * the returned value to be timezone neutral.
      */
-
+     
     if ( nSeconds != (time_t) -1 )
     {
         time_t bias;
-
+        
         /* timezone corrections */
         tzset();
 
@@ -148,13 +148,13 @@ sal_Bool SAL_CALL osl_getTimeValueFromDateTime( oslDateTime* pDateTime, TimeValu
         /* exspect daylight saving time to be one hour */
         bias = aTime.tm_isdst > 0 ? timezone - 3600 : timezone;
 #endif
-
+        
         pTimeVal->Seconds = nSeconds;
         pTimeVal->Nanosec = pDateTime->NanoSeconds;
 
         if ( nSeconds > bias )
             pTimeVal->Seconds -= bias;
-
+           
         return sal_True;
     }
 
@@ -167,7 +167,7 @@ sal_Bool SAL_CALL osl_getTimeValueFromDateTime( oslDateTime* pDateTime, TimeValu
  *--------------------------------------------------*/
 
 sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( TimeValue* pSystemTimeVal, TimeValue* pLocalTimeVal )
-{
+{ 
     struct tm *pLocalTime;
     struct tm tmBuf;
     time_t bias;
@@ -179,7 +179,7 @@ sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( TimeValue* pSystemTimeVal, Tim
 #if defined(STRUCT_TM_HAS_GMTOFF)
     /* members of struct tm are corrected by mktime */
     bias = 0 - pLocalTime->tm_gmtoff;
-
+       
 #elif defined(HAS_ALTZONE)
     /* check if daylight saving time is in effect */
     bias = pLocalTime->tm_isdst > 0 ? altzone : timezone;
@@ -225,7 +225,7 @@ sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( TimeValue* pLocalTimeVal, Time
 #if defined(STRUCT_TM_HAS_GMTOFF)
     /* members of struct tm are corrected by mktime */
     bias = 0 - pLocalTime->tm_gmtoff;
-
+       
 #elif defined(HAS_ALTZONE)
     /* check if daylight saving time is in effect */
     bias = pLocalTime->tm_isdst > 0 ? altzone : timezone;
@@ -242,7 +242,7 @@ sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( TimeValue* pLocalTimeVal, Time
         return sal_True;
     }
 
-    return sal_False;
+    return sal_False; 
 }
 
 
@@ -261,9 +261,9 @@ sal_uInt32 SAL_CALL osl_getGlobalTimer()
       gettimeofday( &startTime, NULL );
       bGlobalTimer=sal_True;
   }
-
+  
   gettimeofday( &currentTime, NULL );
-
+  
   nSeconds = (sal_uInt32)( currentTime.tv_sec - startTime.tv_sec );
 
   return ( nSeconds * 1000 ) + (long) (( currentTime.tv_usec - startTime.tv_usec) / 1000 );
diff --git a/sal/osl/os2/util.c b/sal/osl/os2/util.c
index 9c7e035fc350..762f7a3f9d27 100644
--- a/sal/osl/os2/util.c
+++ b/sal/osl/os2/util.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/osl/os2/uunxapi.cxx b/sal/osl/os2/uunxapi.cxx
index 726d2b5d4511..ee106d1a2998 100644
--- a/sal/osl/os2/uunxapi.cxx
+++ b/sal/osl/os2/uunxapi.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,65 +25,65 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
  #ifndef _LIMITS_H
  #include <limits.h>
  #endif
-
+  
  #ifndef _RTL_USTRING_HXX_
  #include <rtl/ustring.hxx>
  #endif
-
+ 
  #ifndef _OSL_THREAD_H_
  #include <osl/thread.h>
  #endif
-
+ 
  #ifndef _OSL_UUNXAPI_HXX_
  #include "uunxapi.hxx"
- #endif
-
+ #endif 
+ 
  //###########################
- //access_u
+ //access_u     
  int access_u(const rtl_uString* pustrPath, int mode)
- {
+ { 		
     return access(OUStringToOString(pustrPath).getStr(), mode);
  }
-
+ 
  //#########################
- //realpath_u
+ //realpath_u  
  sal_Bool realpath_u(const rtl_uString* pustrFileName, rtl_uString** ppustrResolvedName)
  {
      rtl::OString fn = rtl::OUStringToOString(
         rtl::OUString(const_cast<rtl_uString*>(pustrFileName)),
         osl_getThreadTextEncoding());
-
+        
     char  rp[PATH_MAX];
-    bool  bRet = realpath(fn.getStr(), rp);
-
+    bool  bRet = realpath(fn.getStr(), rp); 
+    
     if (bRet)
     {
         rtl::OUString resolved = rtl::OStringToOUString(
             rtl::OString(static_cast<sal_Char*>(rp)),
             osl_getThreadTextEncoding());
-
+            
         rtl_uString_assign(ppustrResolvedName, resolved.pData);
     }
     return bRet;
  }
-
+ 
  //#########################
- //lstat_u
+ //lstat_u 
   int lstat_u(const rtl_uString* pustrPath, struct stat* buf)
- {
+ { 	
     return lstat(OUStringToOString(pustrPath).getStr(), buf);
- }
-
+ } 
+ 
  //#########################
  // @see mkdir
  int mkdir_u(const rtl_uString* path, mode_t mode)
- {
-    return mkdir(OUStringToOString(path).getStr(), mode);
+ {    
+    return mkdir(OUStringToOString(path).getStr(), mode);     
  }
-
+ 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/uunxapi.h b/sal/osl/os2/uunxapi.h
index 9ac7ddd7ebb5..1082a3e7a25b 100644
--- a/sal/osl/os2/uunxapi.h
+++ b/sal/osl/os2/uunxapi.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,65 +25,65 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
  #ifndef _OSL_UUNXAPI_H_
  #define _OSL_UUNXAPI_H_
-
+  
  #ifndef _UNISTD_H
  #include <unistd.h>
  #endif
-
+ 
  #ifndef _STDLIB_H
  #include <stdlib.h>
  #endif
-
+ 
  #ifndef _TYPES_H
  #include <sys/types.h>
  #endif
-
+ 
  #ifndef _STAT_H
  #include <sys/stat.h>
  #endif
-
+ 
  #ifndef _RTL_USTRING_H_
  #include <rtl/ustring.h>
  #endif
-
-
+ 
+ 
  #ifdef __cplusplus
  extern "C"
  {
  #endif
-
- /* @see access */
+    
+ /* @see access */   
  int access_u(const rtl_uString* pustrPath, int mode);
-
- /***********************************
+ 
+ /***********************************  
   @descr
   The return value differs from the
   realpath function
-
+  
   @returns sal_True on success else
   sal_False
-
+  
   @see realpath
-  **********************************/
+  **********************************/  
  sal_Bool realpath_u(
-     const rtl_uString* pustrFileName,
+     const rtl_uString* pustrFileName, 
     rtl_uString** ppustrResolvedName);
-
+   
  /* @see lstat */
  int lstat_u(const rtl_uString* pustrPath, struct stat* buf);
-
+ 
  /* @see mkdir */
  int mkdir_u(const rtl_uString* path, mode_t mode);
-
+ 
  #ifdef __cplusplus
  }
  #endif
-
-
+ 
+ 
  #endif /* _OSL_UUNXAPI_H_ */
-
+ 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/os2/uunxapi.hxx b/sal/osl/os2/uunxapi.hxx
index 55d045083cea..fece9240b02d 100644
--- a/sal/osl/os2/uunxapi.hxx
+++ b/sal/osl/os2/uunxapi.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,18 +25,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
  #ifndef _OSL_UUNXAPI_HXX_
  #define _OSL_UUNXAPI_HXX_
-
+  
  #ifndef _OSL_UUNXAPI_H_
  #include "uunxapi.h"
  #endif
-
+ 
  #ifndef _RTL_USTRING_HXX_
  #include <rtl/ustring.hxx>
  #endif
-
+ 
  //###########################
  inline rtl::OString OUStringToOString(const rtl_uString* s)
  {
@@ -44,53 +44,53 @@
         rtl::OUString(const_cast<rtl_uString*>(s)),
         osl_getThreadTextEncoding());
  }
-
+ 
  namespace osl
  {
-
+ 
      /***********************************
-      osl::access
-
+      osl::access 
+  
       @see access
       **********************************/
-
+  
      inline int access(const rtl::OUString& ustrPath, int mode)
       {
          return access_u(ustrPath.pData, mode);
        }
-
+ 
      /***********************************
       osl::realpath
-
+  
       @descr
       The return value differs from the
       realpath function
-
+  
       @returns sal_True on success else
       sal_False
-
+  
       @see realpath
       **********************************/
-
+  
      inline sal_Bool realpath(
-         const rtl::OUString& ustrFileName,
+         const rtl::OUString& ustrFileName, 
         rtl::OUString& ustrResolvedName)
      {
          return realpath_u(ustrFileName.pData, &ustrResolvedName.pData);
       }
-
-
+ 
+     
      /***********************************
       osl::lstat
-
+  
       @see lstat
       **********************************/
-
+     
       inline int lstat(const rtl::OUString& ustrPath, struct stat& buf)
       {
            return lstat_u(ustrPath.pData, &buf);
       }
-
+    
     /***********************************
           osl::mkdir
           @see mkdir
@@ -99,11 +99,11 @@
     {
         return mkdir_u(aPath.pData, aMode);
     }
-
+    
  } // end namespace osl
-
-
+ 
+ 
  #endif /* _OSL_UUNXAPI_HXX_ */
-
+ 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index 7787ee997c52..c32b3af46d45 100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -60,7 +60,7 @@
 
 #else
 
-#error Unknown Solaris target platform.
+#error Unknown Solaris target platform. 
 
 #endif /* defined SPARC or INTEL */
 
@@ -105,7 +105,7 @@ int backtrace( void **buffer, int max_frames )
 
 void backtrace_symbols_fd( void **buffer, int size, int fd )
 {
-    FILE    *fp = fdopen( fd, "w" );
+    FILE	*fp = fdopen( fd, "w" );
 
     if ( fp )
     {
@@ -113,8 +113,8 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
 
         for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- )
         {
-            Dl_info     dli;
-            ptrdiff_t   offset;
+            Dl_info		dli;
+            ptrdiff_t	offset;
 
             if ( 0 != dladdr( *pFramePtr, &dli ) )
             {
@@ -174,15 +174,15 @@ int backtrace( void **buffer, int max_frames )
 
 void backtrace_symbols_fd( void **buffer, int size, int fd )
 {
-    FILE    *fp = fdopen( fd, "w" );
+    FILE	*fp = fdopen( fd, "w" );
 
     if ( fp )
     {
         void **pFramePtr;
         for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- )
         {
-            Dl_info     dli;
-            ptrdiff_t   offset;
+            Dl_info		dli;
+            ptrdiff_t	offset;
 
             if ( 0 != dladdr( *pFramePtr, &dli ) )
             {
@@ -259,7 +259,7 @@ int backtrace( void **buffer, int max_frames )
 
 void backtrace_symbols_fd( void **buffer, int size, int fd )
 {
-    FILE    *fp = fdopen( fd, "w" );
+    FILE	*fp = fdopen( fd, "w" );
 
     if ( fp )
     {
@@ -267,8 +267,8 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
 
         for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- )
         {
-            Dl_info     dli;
-            ptrdiff_t   offset;
+            Dl_info		dli;
+            ptrdiff_t	offset;
 
             if ( 0 != dladdr( *pFramePtr, &dli ) )
             {
@@ -299,9 +299,9 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
 #include <stdio.h>
 #include "backtrace.h"
 
-typedef unsigned     ptrdiff_t;
+typedef unsigned	 ptrdiff_t;
 
-/* glib backtrace is only available on MacOsX 10.5 or higher
+/* glib backtrace is only available on MacOsX 10.5 or higher 
    so we do it on our own */
 
 int backtrace( void **buffer, int max_frames )
@@ -309,7 +309,7 @@ int backtrace( void **buffer, int max_frames )
     void **frame = (void **)__builtin_frame_address(0);
     void **bp = ( void **)(*frame);
     void *ip = frame[1];
-    int i;
+    int	i;
 
     for ( i = 0; bp && ip && i < max_frames; i++ )
     {
@@ -325,7 +325,7 @@ int backtrace( void **buffer, int max_frames )
 
 void backtrace_symbols_fd( void **buffer, int size, int fd )
 {
-    FILE    *fp = fdopen( fd, "w" );
+    FILE	*fp = fdopen( fd, "w" );
 
     if ( fp )
     {
@@ -333,8 +333,8 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
 
         for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- )
         {
-            Dl_info     dli;
-            ptrdiff_t   offset;
+            Dl_info		dli;
+            ptrdiff_t	offset;
 
             if ( 0 != dladdr( *pFramePtr, &dli ) )
             {
diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h
index 63b5fd33f93b..1f6687b3fd76 100644
--- a/sal/osl/unx/backtrace.h
+++ b/sal/osl/unx/backtrace.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 
 
 #if defined (SOLARIS) || defined (FREEBSD) || defined (NETBSD) || \
-    defined (OPENBSD)
+	defined (OPENBSD)
 
 #ifdef __cplusplus
 extern "C" {
@@ -43,10 +43,10 @@ void backtrace_symbols_fd( void **buffer, int size, int fd );
 /* no frame.h on FreeBSD */
 #if defined (FREEBSD) || defined (NETBSD) || defined (OPENBSD)
 struct frame {
-    long    arg0[8];
-    long    arg1[6];
+    long	arg0[8];
+    long	arg1[6];
     struct frame *fr_savfp;
-    long    fr_savpc;
+    long	fr_savpc;
 };
 #endif
 
@@ -70,10 +70,10 @@ void backtrace_symbols_fd( void **buffer, int size, int fd );
 
 /* no frame.h on linux sparc */
 struct frame {
-    long    arg0[8];
-    long    arg1[6];
+    long	arg0[8];
+    long	arg1[6];
     struct frame *fr_savfp;
-    long    fr_savpc;
+    long	fr_savpc;
 };
 
 #ifdef __cplusplus
diff --git a/sal/osl/unx/conditn.c b/sal/osl/unx/conditn.c
index ac6c92630d0f..4b407df35c4a 100644
--- a/sal/osl/unx/conditn.c
+++ b/sal/osl/unx/conditn.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,9 +37,9 @@
 
 typedef struct _oslConditionImpl
 {
-    pthread_cond_t  m_Condition;
-    pthread_mutex_t m_Lock;
-    sal_Bool            m_State;
+    pthread_cond_t	m_Condition;
+    pthread_mutex_t	m_Lock;
+    sal_Bool			m_State;
 } oslConditionImpl;
 
 
@@ -50,7 +50,7 @@ oslCondition SAL_CALL osl_createCondition()
 {
       oslConditionImpl* pCond;
     int nRet=0;
-
+    
     pCond = (oslConditionImpl*) malloc(sizeof(oslConditionImpl));
 
     OSL_ASSERT(pCond);
@@ -59,7 +59,7 @@ oslCondition SAL_CALL osl_createCondition()
     {
         return 0;
     }
-
+    
     pCond->m_State = sal_False;
 
     /* init condition variable with default attr. (PTHREAD_PROCESS_PRIVAT) */
@@ -78,7 +78,7 @@ oslCondition SAL_CALL osl_createCondition()
     {
         OSL_TRACE("osl_createCondition : mutex init failed. Errno: %d; %s\n",
                   nRet, strerror(nRet));
-
+        
         nRet = pthread_cond_destroy(&pCond->m_Condition);
         if ( nRet != 0 )
         {
@@ -100,7 +100,7 @@ void SAL_CALL osl_destroyCondition(oslCondition Condition)
 {
     oslConditionImpl* pCond;
     int nRet = 0;
-
+    
     if ( Condition )
     {
         pCond = (oslConditionImpl*)Condition;
@@ -115,12 +115,12 @@ void SAL_CALL osl_destroyCondition(oslCondition Condition)
         if ( nRet != 0 )
         {
             OSL_TRACE("osl_destroyCondition : destroy mutex failed. Errno: %d; '%s'\n",
-                      nRet, strerror(nRet));
+                      nRet, strerror(nRet));            
         }
 
         free(Condition);
     }
-
+    
     return;
 }
 
@@ -131,7 +131,7 @@ sal_Bool SAL_CALL osl_setCondition(oslCondition Condition)
 {
    oslConditionImpl* pCond;
    int nRet=0;
-
+   
    OSL_ASSERT(Condition);
    pCond = (oslConditionImpl*)Condition;
 
@@ -164,7 +164,7 @@ sal_Bool SAL_CALL osl_setCondition(oslCondition Condition)
                   nRet, strerror(nRet));
        return sal_False;
    }
-
+   
    return sal_True;
 
 }
@@ -176,7 +176,7 @@ sal_Bool SAL_CALL osl_resetCondition(oslCondition Condition)
 {
     oslConditionImpl* pCond;
     int nRet=0;
-
+    
     OSL_ASSERT(Condition);
 
     pCond = (oslConditionImpl*)Condition;
@@ -203,7 +203,7 @@ sal_Bool SAL_CALL osl_resetCondition(oslCondition Condition)
                   nRet, strerror(nRet));
         return sal_False;
     }
-
+    
     return sal_True;
 }
 
@@ -221,7 +221,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time
 
     if ( pCond == 0 )
     {
-        return osl_cond_result_error;
+        return osl_cond_result_error; 
     }
 
     nRet = pthread_mutex_lock(&pCond->m_Lock);
@@ -236,10 +236,10 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time
     {
         if ( ! pCond->m_State )
         {
-            int                 ret;
+            int					ret;
             struct timeval      tp;
-            struct timespec     to;
-
+            struct timespec		to;
+            
             gettimeofday(&tp, NULL);
 
             SET_TIMESPEC( to, tp.tv_sec + pTimeout->Seconds,
@@ -254,20 +254,20 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time
                     if ( ret == ETIME || ret == ETIMEDOUT )
                     {
                         Result = osl_cond_result_timeout;
-                        nRet = pthread_mutex_unlock(&pCond->m_Lock);
-                        if (nRet != 0)
+                        nRet = pthread_mutex_unlock(&pCond->m_Lock);                        
+                        if (nRet != 0)    
                         {
                             OSL_TRACE("osl_waitCondition : mutex unlock failed. Errno: %d; %s\n",
                                       nRet, strerror(nRet));
                         }
-
+                        
                         return Result;
                     }
                     else if ( ret != EINTR )
                     {
                         Result = osl_cond_result_error;
-                        nRet = pthread_mutex_unlock(&pCond->m_Lock);
-                        if ( nRet != 0 )
+                        nRet = pthread_mutex_unlock(&pCond->m_Lock);                        
+                        if ( nRet != 0 )    
                         {
                             OSL_TRACE("osl_waitCondition : mutex unlock failed. Errno: %d; %s\n",
                                       nRet, strerror(nRet));
@@ -296,7 +296,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time
                     OSL_TRACE("osl_waitCondition : mutex unlock failed. Errno: %d; %s\n",
                               nRet, strerror(nRet));
                 }
-
+                
                 return Result;
             }
         }
@@ -320,7 +320,7 @@ sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition)
     sal_Bool State;
     oslConditionImpl* pCond;
     int nRet=0;
-
+    
     OSL_ASSERT(Condition);
     pCond = (oslConditionImpl*)Condition;
 
@@ -328,14 +328,14 @@ sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition)
     {
         return sal_False;
     }
-
+    
     nRet = pthread_mutex_lock(&pCond->m_Lock);
     if ( nRet != 0 )
     {
         OSL_TRACE("osl_checkCondition : mutex unlock failed. Errno: %d; %s\n",
-                  nRet, strerror(nRet));
+                  nRet, strerror(nRet));        
     }
-
+    
     State = pCond->m_State;
 
     nRet = pthread_mutex_unlock(&pCond->m_Lock);
diff --git a/sal/osl/unx/diagnose.c b/sal/osl/unx/diagnose.c
index 83f4e90da733..a6910593e69f 100644
--- a/sal/osl/unx/diagnose.c
+++ b/sal/osl/unx/diagnose.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index c18960f4d872..94ef6704b023 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -60,10 +60,10 @@
 
 #ifdef DEBUG_OSL_FILE
 #   define OSL_FILE_TRACE 0 ? (void)(0) : osl_trace
-#   define PERROR( a, b ) perror( a ); fprintf( stderr, b )
+#	define PERROR( a, b ) perror( a ); fprintf( stderr, b )
 #else
 #   define OSL_FILE_TRACE 1 ? (void)(0) : osl_trace
-#   define PERROR( a, b )
+#	define PERROR( a, b )
 #endif
 
 /*******************************************************************
@@ -273,7 +273,7 @@ void FileHandle_Impl::operator delete (void * p, size_t)
 size_t FileHandle_Impl::getpagesize()
 {
 #if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX) || \
-    defined(OPENBSD)
+	defined(OPENBSD)
     return sal::static_int_cast< size_t >(::getpagesize());
 #else /* POSIX */
     return sal::static_int_cast< size_t >(::sysconf(_SC_PAGESIZE));
@@ -730,7 +730,7 @@ oslFileError FileHandle_Impl::syncFile()
 }
 
 /****************************************************************************
- *  osl_createFileHandleFromFD
+ *	osl_createFileHandleFromFD
  ***************************************************************************/
 extern "C" oslFileHandle osl_createFileHandleFromFD( int fd )
 {
@@ -770,7 +770,7 @@ static int osl_file_adjustLockFlags (const char * path, int flags)
 {
 #ifdef MACOSX
     /*
-     * The AFP implementation of MacOS X 10.4 treats O_EXLOCK in a way
+     * The AFP implementation of MacOS X 10.4 treats O_EXLOCK in a way 
      * that makes it impossible for OOo to create a backup copy of the
      * file it keeps opened. OTOH O_SHLOCK for AFP behaves as desired by
      * the OOo file handling, so we need to check the path of the file
@@ -783,7 +783,7 @@ static int osl_file_adjustLockFlags (const char * path, int flags)
         {
             flags &= ~O_EXLOCK;
             flags |=  O_SHLOCK;
-        }
+        }    
         else
         {
             /* Needed flags to allow opening a webdav file */
@@ -797,7 +797,7 @@ static int osl_file_adjustLockFlags (const char * path, int flags)
 }
 
 /****************************************************************************
- *  osl_file_queryLocking
+ *	osl_file_queryLocking
  ***************************************************************************/
 struct Locking_Impl
 {
@@ -823,7 +823,7 @@ static int osl_file_queryLocking (sal_uInt32 uFlags)
 }
 
 /****************************************************************************
- *  osl_openFile
+ *	osl_openFile
  ***************************************************************************/
 #ifdef HAVE_O_EXLOCK
 #define OPEN_WRITE_FLAGS ( O_RDWR | O_EXLOCK | O_NONBLOCK )
@@ -846,7 +846,7 @@ SAL_CALL osl_openFile( rtl_uString* ustrFileURL, oslFileHandle* pHandle, sal_uIn
     eRet = FileURLToPath (buffer, sizeof(buffer), ustrFileURL);
     if (eRet != osl_File_E_None)
         return eRet;
-#ifdef MACOSX
+#ifdef MACOSX 
     if (macxp_resolveAlias (buffer, sizeof(buffer)) != 0)
         return oslTranslateFileError (OSL_FET_ERROR, errno);
 #endif /* MACOSX */
@@ -966,7 +966,7 @@ SAL_CALL osl_openFile( rtl_uString* ustrFileURL, oslFileHandle* pHandle, sal_uIn
 }
 
 /****************************************************************************/
-/*  osl_closeFile */
+/*	osl_closeFile */
 /****************************************************************************/
 oslFileError
 SAL_CALL osl_closeFile( oslFileHandle Handle )
@@ -1004,7 +1004,7 @@ oslFileError
 SAL_CALL osl_syncFile(oslFileHandle Handle)
 {
     FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle);
-
+    
     if ((0 == pImpl) || (-1 == pImpl->m_fd))
         return osl_File_E_INVAL;
 
@@ -1016,7 +1016,7 @@ SAL_CALL osl_syncFile(oslFileHandle Handle)
         return (result);
     if (-1 == fsync (pImpl->m_fd))
         return oslTranslateFileError (OSL_FET_ERROR, errno);
-
+    
     return osl_File_E_None;
 }
 
@@ -1164,7 +1164,7 @@ SAL_CALL osl_readFile (
 
     if ((0 == pImpl) || (-1 == pImpl->m_fd) || (0 == pBuffer) || (0 == pBytesRead))
         return osl_File_E_INVAL;
-
+    
     static sal_uInt64 const g_limit_ssize_t = std::numeric_limits< ssize_t >::max();
     if (g_limit_ssize_t < uBytesRequested)
         return osl_File_E_OVERFLOW;
@@ -1279,7 +1279,7 @@ SAL_CALL osl_writeFileAt (
 }
 
 /****************************************************************************/
-/*  osl_isEndOfFile */
+/*	osl_isEndOfFile */
 /****************************************************************************/
 oslFileError
 SAL_CALL osl_isEndOfFile( oslFileHandle Handle, sal_Bool *pIsEOF )
@@ -1358,11 +1358,11 @@ SAL_CALL osl_setFilePos (oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffse
 }
 
 /****************************************************************************
- *  osl_getFileSize
+ *	osl_getFileSize
  ****************************************************************************/
 oslFileError
 SAL_CALL osl_getFileSize( oslFileHandle Handle, sal_uInt64* pSize )
-{
+{	
     FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle);
 
     if ((0 == pImpl) || (-1 == pImpl->m_fd) || (0 == pSize))
diff --git a/sal/osl/unx/file_error_transl.cxx b/sal/osl/unx/file_error_transl.cxx
index f9c858078c1d..a5297c752a88 100644
--- a/sal/osl/unx/file_error_transl.cxx
+++ b/sal/osl/unx/file_error_transl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,41 +28,41 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-
+ 
  #ifndef _ERRNO_H
  #include <errno.h>
  #endif
-
+ 
  #ifndef _FILE_ERROR_TRANSL_H_
  #include "file_error_transl.h"
  #endif
-
+ 
  #ifndef _OSL_DIAGNOSE_H_
  #include <osl/diagnose.h>
  #endif
-
-
+  
+ 
 /********************************************
  * oslTranslateFileError
  *******************************************/
-
+  
 oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
 {
     oslFileError osl_error = osl_File_E_invalidError;
 
     OSL_ENSURE((bIsError && (0 != Errno)) || (!bIsError && (0 == Errno)), "oslTranslateFileError strange input combination!");
-
-    /* Have a look at file_error_transl.h for
-       the reason that we do this here */
+    
+    /* Have a look at file_error_transl.h for 
+       the reason that we do this here */    
     if (bIsError && (0 == Errno))
         return osl_error;
-
+        
     switch(Errno)
     {
         case 0:
             osl_error = osl_File_E_None;
             break;
-
+            
         case EPERM:
             osl_error = osl_File_E_PERM;
             break;
@@ -86,11 +86,11 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
         case ENXIO:
             osl_error = osl_File_E_IO;
             break;
-
+            
         case E2BIG:
             osl_error = osl_File_E_2BIG;
             break;
-
+            
         case ENOEXEC:
             osl_error = osl_File_E_NOEXEC;
             break;
@@ -126,15 +126,15 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
         case EEXIST:
             osl_error = osl_File_E_EXIST;
             break;
-
+            
         case EXDEV:
             osl_error = osl_File_E_XDEV;
             break;
-
+            
         case ENODEV:
             osl_error = osl_File_E_NODEV;
             break;
-
+            
         case ENOTDIR:
             osl_error = osl_File_E_NOTDIR;
             break;
@@ -146,7 +146,7 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
         case EINVAL:
             osl_error = osl_File_E_INVAL;
             break;
-
+            
         case ENFILE:
             osl_error = osl_File_E_NFILE;
             break;
@@ -170,7 +170,7 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
         case ESPIPE:
             osl_error = osl_File_E_SPIPE;
             break;
-
+            
         case EROFS:
             osl_error = osl_File_E_ROFS;
             break;
@@ -178,7 +178,7 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
         case EMLINK:
             osl_error = osl_File_E_MLINK;
             break;
-
+            
         case EPIPE:
             osl_error = osl_File_E_PIPE;
             break;
@@ -194,16 +194,16 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
         case EDEADLK:
             osl_error = osl_File_E_DEADLK;
             break;
-
+            
         case ENAMETOOLONG:
             osl_error = osl_File_E_NAMETOOLONG;
             break;
-
+            
         case ENOLCK:
             osl_error = osl_File_E_NOLCK;
             break;
 
-        case ENOSYS:
+        case ENOSYS: 
            osl_error = osl_File_E_NOSYS;
             break;
 
@@ -222,13 +222,13 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
             osl_error = osl_File_E_ILSEQ;
             break;
 #endif /* MACOSX */
-
+            
 #if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
         case ENOLINK:
             osl_error = osl_File_E_NOLINK;
             break;
 #endif /* MACOSX */
-
+            
 #if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
         case EMULTIHOP:
             osl_error = osl_File_E_MULTIHOP;
@@ -242,11 +242,11 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
         case EOVERFLOW:
             osl_error = osl_File_E_OVERFLOW;
             break;
-
+        
         case ETIMEDOUT:
             osl_error = osl_File_E_TIMEDOUT;
             break;
-
+        
         default:
             /* FIXME translateFileError: is this alright? Or add a new one: osl_File_E_Unknown? */
             osl_error = osl_File_E_invalidError;
@@ -255,6 +255,6 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
 
     return osl_error;
 }
-
+ 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_error_transl.h b/sal/osl/unx/file_error_transl.h
index 2de5057a04ac..fbaf054fbb1b 100644
--- a/sal/osl/unx/file_error_transl.h
+++ b/sal/osl/unx/file_error_transl.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,42 +25,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef _FILE_ERROR_TRANSL_H_
 #define _FILE_ERROR_TRANSL_H_
 
 #include <osl/file.h>
 #include <sal/types.h>
-
+ 
 #ifdef __cplusplus
-extern "C"
+extern "C" 
 {
 #endif
 
 /*********************************************
-   oslTranslateFileError
+   oslTranslateFileError 
    Translate errno's to osl file errors
-
-   @param bIsError [in] specifies if nErrno
-           should be interpreted as error,
-          some libc functions signaling an error
+   
+   @param bIsError [in] specifies if nErrno 
+           should be interpreted as error, 
+          some libc functions signaling an error 
            but errno is nevertheless 0 in this
            case the function should at least
            return osl_File_E_Unknown but in no
            case osl_File_E_None!
-
+          
    @param nErrno [in] the errno if errno is 0
             and bIsError is true the function
            returns osl_File_E_Unknown
-
+  
    @returns the osl error code appropriate to
               the errno
-
+            
  *********************************************/
 
 #define OSL_FET_SUCCESS sal_False
 #define OSL_FET_ERROR   sal_True
-
+ 
 oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno);
 
 
@@ -68,6 +68,6 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno);
 }
 #endif
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_impl.hxx b/sal/osl/unx/file_impl.hxx
index 011c34c01ae4..591da90bcdbb 100644
--- a/sal/osl/unx/file_impl.hxx
+++ b/sal/osl/unx/file_impl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 961e29775b86..f942ed4e6d83 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -140,7 +140,7 @@ static oslFileError osl_psz_createDirectory(const sal_Char* pszPath);
 static oslFileError osl_psz_removeDirectory(const sal_Char* pszPath);
 
 /*******************************************************************
- *  osl_openDirectory
+ *	osl_openDirectory
  ******************************************************************/
 
 oslFileError SAL_CALL osl_openDirectory(rtl_uString* ustrDirectoryURL, oslDirectory* pDirectory)
@@ -162,9 +162,9 @@ oslFileError SAL_CALL osl_openDirectory(rtl_uString* ustrDirectoryURL, oslDirect
     osl_systemPathRemoveSeparator(ustrSystemPath);
 
     /* convert unicode path to text */
-    if ( UnicodeToText( path, PATH_MAX, ustrSystemPath->buffer, ustrSystemPath->length )
-#ifdef MACOSX
-     && macxp_resolveAlias( path, PATH_MAX ) == 0
+    if ( UnicodeToText( path, PATH_MAX, ustrSystemPath->buffer, ustrSystemPath->length ) 
+#ifdef MACOSX 
+     && macxp_resolveAlias( path, PATH_MAX ) == 0 
 #endif /* MACOSX */
      )
     {
@@ -204,7 +204,7 @@ oslFileError SAL_CALL osl_openDirectory(rtl_uString* ustrDirectoryURL, oslDirect
 }
 
 /****************************************************************************/
-/*  osl_closeDirectory */
+/*	osl_closeDirectory */
 /****************************************************************************/
 
 oslFileError SAL_CALL osl_closeDirectory( oslDirectory Directory )
@@ -255,7 +255,7 @@ static struct dirent* osl_readdir_impl_(DIR* pdir, sal_Bool bFilterLocalAndParen
 }
 
 /****************************************************************************
- *  osl_getNextDirectoryItem
+ *	osl_getNextDirectoryItem
  ***************************************************************************/
 
 oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirectoryItem* pItem, sal_uInt32 /*uHint*/)
@@ -279,8 +279,8 @@ oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirect
 
 #if defined(MACOSX)
 
-    // convert decomposed filename to precomposed unicode
-    char composed_name[BUFSIZ];
+    // convert decomposed filename to precomposed unicode 
+    char composed_name[BUFSIZ];  
     CFMutableStringRef strRef = CFStringCreateMutable (NULL, 0 );
     CFStringAppendCString( strRef, pEntry->d_name, kCFStringEncodingUTF8 );  //UTF8 is default on Mac OSX
     CFStringNormalize( strRef, kCFStringNormalizationFormC );
@@ -317,7 +317,7 @@ oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirect
 }
 
 /****************************************************************************/
-/*  osl_getDirectoryItem */
+/*	osl_getDirectoryItem */
 /****************************************************************************/
 
 oslFileError SAL_CALL osl_getDirectoryItem( rtl_uString* ustrFileURL, oslDirectoryItem* pItem )
@@ -352,7 +352,7 @@ oslFileError SAL_CALL osl_getDirectoryItem( rtl_uString* ustrFileURL, oslDirecto
 
 
 /****************************************************************************/
-/*  osl_acquireDirectoryItem */
+/*	osl_acquireDirectoryItem */
 /****************************************************************************/
 
 oslFileError SAL_CALL osl_acquireDirectoryItem( oslDirectoryItem Item )
@@ -366,7 +366,7 @@ oslFileError SAL_CALL osl_acquireDirectoryItem( oslDirectoryItem Item )
 }
 
 /****************************************************************************/
-/*  osl_releaseDirectoryItem */
+/*	osl_releaseDirectoryItem */
 /****************************************************************************/
 
 oslFileError SAL_CALL osl_releaseDirectoryItem( oslDirectoryItem Item )
@@ -380,7 +380,7 @@ oslFileError SAL_CALL osl_releaseDirectoryItem( oslDirectoryItem Item )
 }
 
 /****************************************************************************/
-/*  osl_createDirectory */
+/*	osl_createDirectory */
 /****************************************************************************/
 
 oslFileError SAL_CALL osl_createDirectory( rtl_uString* ustrDirectoryURL )
@@ -404,7 +404,7 @@ oslFileError SAL_CALL osl_createDirectory( rtl_uString* ustrDirectoryURL )
 }
 
 /****************************************************************************/
-/*  osl_removeDirectory */
+/*	osl_removeDirectory */
 /****************************************************************************/
 
 oslFileError SAL_CALL osl_removeDirectory( rtl_uString* ustrDirectoryURL )
@@ -467,13 +467,13 @@ static oslFileError osl_psz_removeDirectory( const sal_Char* pszPath )
 }
 
 /****************************************************************************/
-/*  osl_createDirectoryPath */
+/*	osl_createDirectoryPath */
 /****************************************************************************/
 
 static int path_make_parent(sal_Unicode* path)
 {
     int i = rtl_ustr_lastIndexOfChar(path, '/');
-
+    
     if (i > 0)
     {
         *(path + i) = 0;
@@ -485,19 +485,19 @@ static int path_make_parent(sal_Unicode* path)
 
 static int create_dir_with_callback(
     sal_Unicode* directory_path,
-    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
+    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
     void* pData)
 {
     int mode = S_IRWXU | S_IRWXG | S_IRWXO;
-
+    
     if (osl::mkdir(directory_path, mode) == 0)
     {
         if (aDirectoryCreationCallbackFunc)
         {
-            rtl::OUString url;
-            osl::FileBase::getFileURLFromSystemPath(directory_path, url);
+            rtl::OUString url;                
+            osl::FileBase::getFileURLFromSystemPath(directory_path, url);                                
             aDirectoryCreationCallbackFunc(pData, url.pData);
-        }
+        }                
         return 0;
     }
     return errno;
@@ -505,58 +505,58 @@ static int create_dir_with_callback(
 
 static oslFileError create_dir_recursively_(
     sal_Unicode* dir_path,
-    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
+    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
     void* pData)
-{
+{   
     OSL_PRECOND((rtl_ustr_getLength(dir_path) > 0) && ((dir_path + (rtl_ustr_getLength(dir_path) - 1)) != (dir_path + rtl_ustr_lastIndexOfChar(dir_path, '/'))), \
     "Path must not end with a slash");
-
+         
     int native_err = create_dir_with_callback(
         dir_path, aDirectoryCreationCallbackFunc, pData);
-
-    if (native_err == 0)
+        
+    if (native_err == 0)    
         return osl_File_E_None;
-
+                        
     if (native_err != ENOENT)
         return oslTranslateFileError(OSL_FET_ERROR, native_err);
-
+    
     // we step back until '/a_dir' at maximum because
     // we should get an error unequal ENOENT when
-    // we try to create 'a_dir' at '/' and would so
-    // return before
+    // we try to create 'a_dir' at '/' and would so 
+    // return before	    
     int pos = path_make_parent(dir_path);
-
+                    
     oslFileError osl_error = create_dir_recursively_(
         dir_path, aDirectoryCreationCallbackFunc, pData);
-
+                    
     if (osl_File_E_None != osl_error)
         return osl_error;
-
+                    
        dir_path[pos] = '/';
-
-    return create_dir_recursively_(dir_path, aDirectoryCreationCallbackFunc, pData);
+                               
+    return create_dir_recursively_(dir_path, aDirectoryCreationCallbackFunc, pData);     
 }
 
 oslFileError SAL_CALL osl_createDirectoryPath(
-    rtl_uString* aDirectoryUrl,
+    rtl_uString* aDirectoryUrl, 
     oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
     void* pData)
 {
     if (aDirectoryUrl == NULL)
         return osl_File_E_INVAL;
-
-    rtl::OUString sys_path;
+    
+    rtl::OUString sys_path;         
     oslFileError osl_error = osl_getSystemPathFromFileURL_Ex(
-        aDirectoryUrl, &sys_path.pData, sal_False);
-
+        aDirectoryUrl, &sys_path.pData, sal_False);        
+    
     if (osl_error != osl_File_E_None)
         return osl_error;
-
+                                                                
     osl::systemPathRemoveSeparator(sys_path);
-
-    // const_cast because sys_path is a local copy which we want to modify inplace instead of
+    
+    // const_cast because sys_path is a local copy which we want to modify inplace instead of 
     // coyp it into another buffer on the heap again
-    return create_dir_recursively_(sys_path.pData->buffer, aDirectoryCreationCallbackFunc, pData);
+    return create_dir_recursively_(sys_path.pData->buffer, aDirectoryCreationCallbackFunc, pData);			
 }
 
 /******************************************************************************
@@ -583,7 +583,7 @@ static int           oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_
 static oslFileError  oslDoMoveFile(const sal_Char* pszPath, const sal_Char* pszDestPath);
 
 /****************************************************************************/
-/*  osl_moveFile */
+/*	osl_moveFile */
 /****************************************************************************/
 
 oslFileError SAL_CALL osl_moveFile( rtl_uString* ustrFileURL, rtl_uString* ustrDestURL )
@@ -614,7 +614,7 @@ oslFileError SAL_CALL osl_moveFile( rtl_uString* ustrFileURL, rtl_uString* ustrD
 }
 
 /****************************************************************************/
-/*  osl_copyFile */
+/*	osl_copyFile */
 /****************************************************************************/
 
 oslFileError SAL_CALL osl_copyFile( rtl_uString* ustrFileURL, rtl_uString* ustrDestURL )
@@ -645,7 +645,7 @@ oslFileError SAL_CALL osl_copyFile( rtl_uString* ustrFileURL, rtl_uString* ustrD
 }
 
 /****************************************************************************/
-/*  osl_removeFile */
+/*	osl_removeFile */
 /****************************************************************************/
 
 oslFileError SAL_CALL osl_removeFile( rtl_uString* ustrFileURL )
@@ -856,7 +856,7 @@ static oslFileError oslDoCopy(const sal_Char* pszSourceFileName, const sal_Char*
 
     /* Quick fix for #106048, the whole copy file function seems
        to be erroneous anyway and needs to be rewritten.
-       Besides osl_copyFile is currently not used from OO/SO code.
+       Besides osl_copyFile	is currently not used from OO/SO code.
     */
     memset(pszTmpDestFile, 0, size_tmp_dest_buff);
 
@@ -992,20 +992,20 @@ static int oslDoCopyLink(const sal_Char* pszSourceFileName, const sal_Char* pszD
  ****************************************/
 
 static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, size_t nSourceSize, mode_t mode)
-{
+{    
     int SourceFileFD=0;
     int DestFileFD=0;
     int nRet=0;
 
     SourceFileFD=open(pszSourceFileName,O_RDONLY);
     if ( SourceFileFD < 0 )
-    {
+    {		
         nRet=errno;
         return nRet;
     }
-
+ 
     DestFileFD=open(pszDestFileName, O_WRONLY | O_CREAT, mode);
-
+        
     if ( DestFileFD < 0 )
     {
         nRet=errno;
@@ -1015,9 +1015,9 @@ static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszD
 
     size_t nWritten = 0;
     size_t nRemains = nSourceSize;
-
+   
     if ( nRemains )
-    {
+    {	
         /* mmap has problems, try the direct streaming */
         char pBuffer[0x7FFF];
         size_t nRead = 0;
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index 76045efe661a..5e581d3de1b5 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,174 +28,174 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-
+ 
  /*******************************************
      Includes
   ******************************************/
-
+  
  #ifndef _OSL_FILE_PATH_HELPER_H_
  #include "file_path_helper.h"
  #endif
-
+ 
  #ifndef _OSL_FILE_PATH_HELPER_HXX_
  #include "file_path_helper.hxx"
  #endif
-
+ 
  #ifndef _OSL_UUNXAPI_HXX_
  #include "uunxapi.hxx"
  #endif
-
+ 
  #ifndef _OSL_DIAGNOSE_H_
  #include <osl/diagnose.h>
  #endif
-
+ 
  #ifndef _RTL_USTRING_HXX_
  #include <rtl/ustring.hxx>
  #endif
-
+ 
  /*******************************************
      Constants
   ******************************************/
-
+  
   const sal_Unicode FPH_CHAR_PATH_SEPARATOR = (sal_Unicode)'/';
   const sal_Unicode FPH_CHAR_DOT            = (sal_Unicode)'.';
   const sal_Unicode FPH_CHAR_COLON          = (sal_Unicode)':';
-
+  
   inline const rtl::OUString FPH_PATH_SEPARATOR()
       { return rtl::OUString(FPH_CHAR_PATH_SEPARATOR); }
   inline const rtl::OUString FPH_LOCAL_DIR_ENTRY()
       { return rtl::OUString(FPH_CHAR_PATH_SEPARATOR); }
   inline const rtl::OUString FPH_PARENT_DIR_ENTRY()
       { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..")); }
-
+  
  /*******************************************
-  *  osl_systemPathRemoveSeparator
+  *  osl_systemPathRemoveSeparator   
   ******************************************/
-
+  
  void SAL_CALL osl_systemPathRemoveSeparator(rtl_uString* pustrPath)
  {
      OSL_PRECOND(pustrPath, "osl_systemPathRemoveSeparator: Invalid parameter");
-
-    // maybe there are more than one separator at end
+        
+    // maybe there are more than one separator at end 
     // so we run in a loop
     while ((pustrPath->length > 1) && (FPH_CHAR_PATH_SEPARATOR == pustrPath->buffer[pustrPath->length - 1]))
     {
         pustrPath->length--;
         pustrPath->buffer[pustrPath->length] = (sal_Unicode)'\0';
     }
-
+    
     OSL_POSTCOND((0 == pustrPath->length) || (1 == pustrPath->length) || \
                  (pustrPath->length > 1 && pustrPath->buffer[pustrPath->length - 1] != FPH_CHAR_PATH_SEPARATOR), \
-                 "osl_systemPathRemoveSeparator: Post condition failed");
+                 "osl_systemPathRemoveSeparator: Post condition failed");	
  }
-
+ 
  /*******************************************
-    osl_systemPathEnsureSeparator
+    osl_systemPathEnsureSeparator   
   ******************************************/
-
+  
  void SAL_CALL osl_systemPathEnsureSeparator(rtl_uString** ppustrPath)
  {
      OSL_PRECOND(ppustrPath && (NULL != *ppustrPath), \
                 "osl_systemPathEnsureSeparator: Invalid parameter");
-
+    
      rtl::OUString path(*ppustrPath);
-    sal_Int32     lp = path.getLength();
+    sal_Int32	  lp = path.getLength();
     sal_Int32     i  = path.lastIndexOf(FPH_CHAR_PATH_SEPARATOR);
-
+    
     if ((lp > 1 && i != (lp - 1)) || ((lp < 2) && i < 0))
     {
-        path += FPH_PATH_SEPARATOR();
-        rtl_uString_assign(ppustrPath, path.pData);
+        path += FPH_PATH_SEPARATOR(); 
+        rtl_uString_assign(ppustrPath, path.pData);			
     }
-
+    
     OSL_POSTCOND(path.lastIndexOf(FPH_CHAR_PATH_SEPARATOR) == (path.getLength() - 1), \
                  "osl_systemPathEnsureSeparator: Post condition failed");
  }
-
+ 
  /*******************************************
   *  osl_systemPathIsRelativePath
   ******************************************/
-
+  
  sal_Bool SAL_CALL osl_systemPathIsRelativePath(const rtl_uString* pustrPath)
  {
-     OSL_PRECOND(pustrPath, "osl_systemPathIsRelativePath: Invalid parameter");
+     OSL_PRECOND(pustrPath, "osl_systemPathIsRelativePath: Invalid parameter");		
      return ((0 == pustrPath->length) || (pustrPath->buffer[0] != FPH_CHAR_PATH_SEPARATOR));
  }
-
+ 
  /******************************************
     osl_systemPathMakeAbsolutePath
   *****************************************/
-
+  
  void SAL_CALL osl_systemPathMakeAbsolutePath(
-     const rtl_uString* pustrBasePath,
-    const rtl_uString* pustrRelPath,
-    rtl_uString**      ppustrAbsolutePath)
+     const rtl_uString* pustrBasePath, 
+    const rtl_uString* pustrRelPath, 
+    rtl_uString** 	   ppustrAbsolutePath)
 {
     rtl::OUString base(rtl_uString_getStr(const_cast<rtl_uString*>(pustrBasePath)));
     rtl::OUString rel(const_cast<rtl_uString*>(pustrRelPath));
-
+    
     if (base.getLength() > 0)
-        osl_systemPathEnsureSeparator(&base.pData);
-
+        osl_systemPathEnsureSeparator(&base.pData);		
+        
     base += rel;
-
+    
     rtl_uString_acquire(base.pData);
-    *ppustrAbsolutePath = base.pData;
+    *ppustrAbsolutePath = base.pData; 
 }
 
-
+ 
  /*******************************************
      osl_systemPathGetFileOrLastDirectoryPart
   ******************************************/
-
+  
  void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart(
-     const rtl_uString*     pustrPath,
-    rtl_uString**       ppustrFileNameOrLastDirPart)
+     const rtl_uString* 	pustrPath,
+    rtl_uString** 		ppustrFileNameOrLastDirPart)
 {
     OSL_PRECOND(pustrPath && ppustrFileNameOrLastDirPart, \
                 "osl_systemPathGetFileNameOrLastDirectoryPart: Invalid parameter");
-
-    rtl::OUString path(const_cast<rtl_uString*>(pustrPath));
-
+    
+    rtl::OUString path(const_cast<rtl_uString*>(pustrPath));	
+    
     osl_systemPathRemoveSeparator(path.pData);
-
+                
     rtl::OUString last_part;
-
+        
     if (path.getLength() > 1 || (1 == path.getLength() && *path.getStr() != FPH_CHAR_PATH_SEPARATOR))
     {
-        sal_Int32 idx_ps = path.lastIndexOf(FPH_CHAR_PATH_SEPARATOR);
+        sal_Int32 idx_ps = path.lastIndexOf(FPH_CHAR_PATH_SEPARATOR);		
         idx_ps++; // always right to increment by one even if idx_ps == -1!
-        last_part = rtl::OUString(path.getStr() + idx_ps);
-    }
-    rtl_uString_assign(ppustrFileNameOrLastDirPart, last_part.pData);
+        last_part = rtl::OUString(path.getStr() + idx_ps); 
+    }							
+    rtl_uString_assign(ppustrFileNameOrLastDirPart, last_part.pData);		
 }
-
+    
 
  /********************************************
-     osl_systemPathIsHiddenFileOrDirectoryEntry
+     osl_systemPathIsHiddenFileOrDirectoryEntry	
  *********************************************/
-
+ 
  sal_Bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry(
      const rtl_uString* pustrPath)
 {
     OSL_PRECOND(pustrPath, "osl_systemPathIsHiddenFileOrDirectoryEntry: Invalid parameter");
 
     sal_Bool is_hidden = sal_False;
-
+    
     if (pustrPath->length > 0)
     {
         rtl::OUString fdp;
-
+    
         osl_systemPathGetFileNameOrLastDirectoryPart(pustrPath, &fdp.pData);
-
-        is_hidden = ((fdp.pData->length > 0) && (fdp.pData->buffer[0] == FPH_CHAR_DOT) &&
-                     !osl_systemPathIsLocalOrParentDirectoryEntry(fdp.pData));
+        
+        is_hidden = ((fdp.pData->length > 0) && (fdp.pData->buffer[0] == FPH_CHAR_DOT) && 
+                     !osl_systemPathIsLocalOrParentDirectoryEntry(fdp.pData));					 
      }
-
+    
     return is_hidden;
 }
-
-
+    
+ 
  /************************************************
      osl_systemPathIsLocalOrParentDirectoryEntry
  ************************************************/
@@ -204,149 +204,149 @@ sal_Bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry(
     const rtl_uString* pustrPath)
 {
     OSL_PRECOND(pustrPath, "osl_systemPathIsLocalOrParentDirectoryEntry: Invalid parameter");
-
+    
     rtl::OUString dirent;
-
+    
     osl_systemPathGetFileNameOrLastDirectoryPart(pustrPath, &dirent.pData);
-
+        
     return (
-            (dirent == FPH_LOCAL_DIR_ENTRY()) ||
+            (dirent == FPH_LOCAL_DIR_ENTRY()) || 
             (dirent == FPH_PARENT_DIR_ENTRY())
            );
 }
-
+    
 /***********************************************
- Simple iterator for a path list separated by
+ Simple iterator for a path list separated by 
  the specified character
  **********************************************/
-
+ 
 class path_list_iterator
 {
 public:
-
+    
     /******************************************
       constructor
-
-     after construction get_current_item
+     
+     after construction get_current_item 
      returns the first path in list, no need
      to call reset first
-     *****************************************/
-    path_list_iterator(const rtl::OUString& path_list, sal_Unicode list_separator = FPH_CHAR_COLON) :
+     *****************************************/	 
+    path_list_iterator(const rtl::OUString& path_list, sal_Unicode list_separator = FPH_CHAR_COLON) : 
         m_path_list(path_list),
         m_end(m_path_list.getStr() + m_path_list.getLength() + 1),
         m_separator(list_separator)
     {
         reset();
     }
-
+    
     /******************************************
      reset the iterator
-     *****************************************/
+     *****************************************/	 
     void reset()
     {
         m_path_segment_begin = m_path_segment_end = m_path_list.getStr();
-        advance();
+        advance();				
     }
-
+    
     /******************************************
      move the iterator to the next position
-     *****************************************/
+     *****************************************/	 
     void next()
     {
         OSL_PRECOND(!done(), "path_list_iterator: Already done!");
-
-        m_path_segment_begin = ++m_path_segment_end;
-        advance();
+        
+        m_path_segment_begin = ++m_path_segment_end;				
+        advance();		
     }
-
+    
     /******************************************
      check if done
-     *****************************************/
+     *****************************************/	 
     bool done() const
     {
         return (m_path_segment_end >= m_end);
     }
-
+    
     /******************************************
      return the current item
-     *****************************************/
+     *****************************************/	 
     rtl::OUString get_current_item() const
     {
         return rtl::OUString(
-            m_path_segment_begin,
+            m_path_segment_begin, 
             (m_path_segment_end - m_path_segment_begin));
     }
-
+        
 private:
-
+    
     /******************************************
      move m_path_end to the next separator or
      to the edn of the string
-     *****************************************/
+     *****************************************/	 
     void advance()
     {
         while (!done() && *m_path_segment_end && (*m_path_segment_end != m_separator))
             ++m_path_segment_end;
-
+            
         OSL_ASSERT(m_path_segment_end <= m_end);
     }
-
+    
 private:
-    rtl::OUString       m_path_list;
+    rtl::OUString 		m_path_list;	
     const sal_Unicode*  m_end;
-    const sal_Unicode   m_separator;
+    const sal_Unicode 	m_separator;
     const sal_Unicode*  m_path_segment_begin;
-    const sal_Unicode*  m_path_segment_end;
-
-// prevent copy and assignment
+    const sal_Unicode*  m_path_segment_end;	
+    
+// prevent copy and assignment	
 private:
     /******************************************
      copy constructor
      remember: do not simply copy m_path_begin
-     and m_path_end because they point to
+     and m_path_end because they point to 
      the memory of other.m_path_list!
-     *****************************************/
+     *****************************************/	 
     path_list_iterator(const path_list_iterator& other);
-
+    
     /******************************************
      assignment operator
       remember: do not simply copy m_path_begin
-     and m_path_end because they point to
+     and m_path_end because they point to 
      the memory of other.m_path_list!
-     *****************************************/
+     *****************************************/	 
     path_list_iterator& operator=(const path_list_iterator& other);
 };
 
  /************************************************
       osl_searchPath
   ***********************************************/
-
-sal_Bool SAL_CALL osl_searchPath(
+  
+sal_Bool SAL_CALL osl_searchPath( 	
      const rtl_uString* pustrFilePath,
     const rtl_uString* pustrSearchPathList,
     rtl_uString**      ppustrPathFound)
 {
     OSL_PRECOND(pustrFilePath && pustrSearchPathList && ppustrPathFound, "osl_searchPath: Invalid parameter");
-
+    
     bool               bfound = false;
-    rtl::OUString      fp(const_cast<rtl_uString*>(pustrFilePath));
+    rtl::OUString      fp(const_cast<rtl_uString*>(pustrFilePath));	
     rtl::OUString      pl = rtl::OUString(const_cast<rtl_uString*>(pustrSearchPathList));
     path_list_iterator pli(pl);
-
+    
     while (!pli.done())
     {
-        rtl::OUString p = pli.get_current_item();
-        osl::systemPathEnsureSeparator(p);
+        rtl::OUString p = pli.get_current_item();						
+        osl::systemPathEnsureSeparator(p);		
         p += fp;
-
+        
         if (osl::access(p, F_OK) > -1)
         {
             bfound = true;
             rtl_uString_assign(ppustrPathFound, p.pData);
             break;
-        }
+        }					
         pli.next();
-    }
+    }	
     return bfound;
 }
 
diff --git a/sal/osl/unx/file_path_helper.h b/sal/osl/unx/file_path_helper.h
index ce0f0276d2ab..9ccadfd6ce6c 100644
--- a/sal/osl/unx/file_path_helper.h
+++ b/sal/osl/unx/file_path_helper.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,226 +25,226 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
  #ifndef _OSL_FILE_PATH_HELPER_H_
  #define _OSL_FILE_PATH_HELPER_H_
-
-
+ 
+ 
  #ifndef _SAL_TYPES_H_
  #include <sal/types.h>
  #endif
-
+ 
  #ifndef _RTL_USTRING_H_
  #include <rtl/ustring.h>
  #endif
-
-
+ 
+ 
  #ifdef __cplusplus
  extern "C"
  {
  #endif
-
-
+ 
+ 
  /*******************************************
     osl_systemPathRemoveSeparator
-    Removes the last separator from the
+    Removes the last separator from the 
     given system path if any and if the path
     is not the root path '/'
-
-    @param  ppustrPath [inout] a system path
+   
+    @param	ppustrPath [inout] a system path
             if the path is not the root path
-            and the last character is a
+            and the last character is a 
             path separator it will be cut off
                ppustrPath must not be NULL and
             must point to a valid rtl_uString
-
+            
     @returns nothing
-
+    
   ******************************************/
-
+  
  void SAL_CALL osl_systemPathRemoveSeparator(
      /*inout*/ rtl_uString* pustrPath);
-
+ 
  /*******************************************
     osl_systemPathEnsureSeparator
     Adds a trailing path separator to the
     given system path if not already there
     and if the path is not the root path '/'
-
-      @param    pustrPath [inout] a system path
+  
+      @param 	pustrPath [inout] a system path
             if the path is not the root path
             '/' and has no trailing separator
             a separator will be added
             ppustrPath must not be NULL and
             must point to a valid rtl_uString
-
+            
     @returns nothing
-
+    
   ******************************************/
-
+  
  void SAL_CALL osl_systemPathEnsureSeparator(
      /*inout*/ rtl_uString** ppustrPath);
-
+ 
  /*******************************************
     osl_systemPathIsRelativePath
-    Returns true if the given path is a
+    Returns true if the given path is a 
     relative path and so starts not with '/'
-
-    @param  pustrPath [in] a system path
+    
+    @param 	pustrPath [in] a system path 
             pustrPath must not be NULL
-
-    @returns sal_True if the given path
+            
+    @returns sal_True if the given path 
              doesn't start with a separator
              else sal_False will be returned
-
+             
   ******************************************/
-
+  
  sal_Bool SAL_CALL osl_systemPathIsRelativePath(
      const rtl_uString* pustrPath);
-
+ 
  /******************************************
     osl_systemPathMakeAbsolutePath
-    Append a relative path to a base path
-
-    @param  pustrBasePath [in] a system
+    Append a relative path to a base path 
+    
+    @param	pustrBasePath [in] a system
             path that will be considered as
             base path
+            pustrBasePath must not be NULL 
+            
+    @param	pustrRelPath [in] a system path
+            that will be considered as 
+            relative path 
             pustrBasePath must not be NULL
-
-    @param  pustrRelPath [in] a system path
-            that will be considered as
-            relative path
-            pustrBasePath must not be NULL
-
-    @param  ppustrAbsolutePath [out] the
-            resulting path which is a
-            concatination of the base and
+            
+    @param	ppustrAbsolutePath [out] the 
+            resulting path which is a 
+            concatination of the base and 
             the relative path
-            if base path is empty the
+            if base path is empty the 
             resulting absolute path is the
             relative path
             if relative path is empty the
             resulting absolute path is the
             base path
-            if base and relative path are
-            empty the resulting absolute
+            if base and relative path are 
+            empty the resulting absolute 
             path is also empty
             ppustrAbsolutePath must not be
             NULL and *ppustrAbsolutePath
             must be 0 or point to a valid
             rtl_uString
-
+            
   *****************************************/
-
+  
  void SAL_CALL osl_systemPathMakeAbsolutePath(
-     const rtl_uString* pustrBasePath,
-    const rtl_uString* pustrRelPath,
-    rtl_uString**      ppustrAbsolutePath);
-
+     const rtl_uString* pustrBasePath, 
+    const rtl_uString* pustrRelPath, 
+    rtl_uString** 	   ppustrAbsolutePath);
+ 
  /*****************************************
      osl_systemPathGetFileOrLastDirectoryPart
     Returns the file or the directory part
     of the given path
-
+    
     @param pustrPath [in] a system path,
            must not be NULL
-
+           
     @param ppustrFileOrDirPart [out] on
-           return receives the last part
-           of the given directory or the
-           file name
+           return receives the last part 
+           of the given directory or the 
+           file name 
            if pustrPath is the root path
-           '/' an empty string will be
+           '/' an empty string will be 
            returned
-           if pustrPath has a trailing
+           if pustrPath has a trailing 
            '/' the last part before the
-           '/' will be returned else
+           '/' will be returned else 
            the part after the last '/'
            will be returned
-
+                
     @returns nothing
-
+    
   ****************************************/
  void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart(
-     const rtl_uString*     pustrPath,
-    rtl_uString**       ppustrFileNameOrLastDirPart);
-
+     const rtl_uString* 	pustrPath,
+    rtl_uString** 		ppustrFileNameOrLastDirPart);
+    
 
  /********************************************
      osl_systemPathIsHiddenFileOrDirectoryEntry
-    Returns sal_True if the last part of
+    Returns sal_True if the last part of 
     given system path is not '.' or '..'
-    alone and starts with a '.'
-
+    alone and starts with a '.' 
+    
     @param pustrPath [in] a system path,
            must not be NULL
-
+          
     @returns sal_True if the last part of
              the given system path starts
              with '.' or sal_False the last
-             part is '.' or '..' alone or
+             part is '.' or	'..' alone or
              doesn't start with a dot
-
+             
  *********************************************/
-
+ 
  sal_Bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry(
      const rtl_uString* pustrPath);
-
+ 
 
  /************************************************
      osl_systemPathIsLocalOrParentDirectoryEntry
     Returns sal_True if the last part of the given
     system path is the local directory entry '.'
     or the parent directory entry '..'
-
+    
     @param pustrPath [in] a system path,
            must not be NULL
-
-    @returns sal_True if the last part of the
+           
+    @returns sal_True if the last part of the 
              given system path is '.' or '..'
              else sal_False
-
+             
  ************************************************/
 
  sal_Bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry(
      const rtl_uString* pustrPath);
-
+ 
 
  /************************************************
       osl_searchPath
     Searches for a file name or path name in all
     directories specified by a given path list.
-    Symbolic links in the resulting path will not be
+    Symbolic links in the resulting path will not be 
     resolved, it's up to the caller to do this.
-
+    
     @param pustrFilePath [in] a file name or
     directory name to search for, the name must
     be provided as system path not as a file URL
-
-    @param pustrSearchPathList [in] a ':'
+    
+    @param pustrSearchPathList [in] a ':' 
     separated list of paths in which to search for
     the file or directory name
-
+    
     @ppustrPathFound [out] on success receives the
     complete path of the file or directory found
     as a system path
-
-    @returns sal_True if the specified file or
+    
+    @returns sal_True if the specified file or 
     directory was found else sal_False
   ***********************************************/
-
+  
  sal_Bool SAL_CALL osl_searchPath(
      const rtl_uString* pustrFilePath,
     const rtl_uString* pustrSearchPathList,
     rtl_uString**      ppustrPathFound);
-
-
+ 
+ 
  #ifdef __cplusplus
  }
  #endif
-
-
+ 
+ 
  #endif /* #ifndef _OSL_PATH_HELPER_H_ */
-
+ 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx
index 62d508278027..07d501b48be6 100644
--- a/sal/osl/unx/file_path_helper.hxx
+++ b/sal/osl/unx/file_path_helper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,224 +25,224 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef _OSL_FILE_PATH_HELPER_HXX_
 #define _OSL_FILE_PATH_HELPER_HXX_
 
 
 #include "file_path_helper.h"
-
+ 
 #include <rtl/ustring.hxx>
 
 
 namespace osl
 {
-
+ 
  /*******************************************
     systemPathRemoveSeparator
-    Removes the last separator from the
+    Removes the last separator from the 
     given system path if any and if the path
     is not the root path '/'
-
-    @param  ppustrPath [inout] a system path
+   
+    @param	ppustrPath [inout] a system path
             if the path is not the root path
-            and the last character is a
+            and the last character is a 
             path separator it will be cut off
                ppustrPath must not be NULL and
             must point to a valid rtl_uString
-
+            
     @returns nothing
-
+    
   ******************************************/
-
+  
  inline void systemPathRemoveSeparator(/*inout*/ rtl::OUString& Path)
  {
      osl_systemPathRemoveSeparator(Path.pData);
  }
-
+ 
  /*******************************************
     systemPathEnsureSeparator
     Adds a trailing path separator to the
     given system path if not already there
     and if the path is not the root path '/'
-
-      @param    pustrPath [inout] a system path
+  
+      @param 	pustrPath [inout] a system path
             if the path is not the root path
             '/' and has no trailing separator
             a separator will be added
             ppustrPath must not be NULL and
             must point to a valid rtl_uString
-
+            
     @returns nothing
-
+    
   ******************************************/
-
+  
  inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
  {
      osl_systemPathEnsureSeparator(&Path.pData);
  }
-
+ 
  /*******************************************
     systemPathIsRelativePath
-    Returns true if the given path is a
+    Returns true if the given path is a 
     relative path and so starts not with '/'
-
-    @param  pustrPath [in] a system path
+    
+    @param 	pustrPath [in] a system path 
             pustrPath must not be NULL
-
-    @returns sal_True if the given path
+            
+    @returns sal_True if the given path 
              doesn't start with a separator
              else sal_False will be returned
-
+             
   ******************************************/
-
+  
  inline bool systemPathIsRelativePath(const rtl::OUString& Path)
  {
     return osl_systemPathIsRelativePath(Path.pData);
  }
-
+ 
  /******************************************
     systemPathMakeAbsolutePath
-    Append a relative path to a base path
-
-    @param  pustrBasePath [in] a system
+    Append a relative path to a base path 
+    
+    @param	pustrBasePath [in] a system
             path that will be considered as
             base path
+            pustrBasePath must not be NULL 
+            
+    @param	pustrRelPath [in] a system path
+            that will be considered as 
+            relative path 
             pustrBasePath must not be NULL
-
-    @param  pustrRelPath [in] a system path
-            that will be considered as
-            relative path
-            pustrBasePath must not be NULL
-
-    @param  ppustrAbsolutePath [out] the
-            resulting path which is a
-            concatination of the base and
+            
+    @param	ppustrAbsolutePath [out] the 
+            resulting path which is a 
+            concatination of the base and 
             the relative path
-            if base path is empty the
+            if base path is empty the 
             resulting absolute path is the
             relative path
             if relative path is empty the
             resulting absolute path is the
             base path
-            if base and relative path are
-            empty the resulting absolute
+            if base and relative path are 
+            empty the resulting absolute 
             path is also empty
             ppustrAbsolutePath must not be
             NULL and *ppustrAbsolutePath
             must be 0 or point to a valid
             rtl_uString
-
+            
   *****************************************/
-
+  
  inline void systemPathMakeAbsolutePath(
-     const rtl::OUString& BasePath,
-    const rtl::OUString& RelPath,
-    rtl::OUString&       AbsolutePath)
+     const rtl::OUString& BasePath, 
+    const rtl::OUString& RelPath, 
+    rtl::OUString& 	     AbsolutePath)
  {
     osl_systemPathMakeAbsolutePath(
         BasePath.pData, RelPath.pData, &AbsolutePath.pData);
  }
-
+ 
  /*****************************************
      systemPathGetFileOrLastDirectoryPart
     Returns the file or the directory part
     of the given path
-
+    
     @param pustrPath [in] a system path,
            must not be NULL
-
+           
     @param ppustrFileOrDirPart [out] on
-           return receives the last part
-           of the given directory or the
-           file name
+           return receives the last part 
+           of the given directory or the 
+           file name 
            if pustrPath is the root path
-           '/' an empty string will be
+           '/' an empty string will be 
            returned
-           if pustrPath has a trailing
+           if pustrPath has a trailing 
            '/' the last part before the
-           '/' will be returned else
+           '/' will be returned else 
            the part after the last '/'
            will be returned
-
+                
     @returns nothing
-
+    
   ****************************************/
-
+   
  inline void systemPathGetFileNameOrLastDirectoryPart(
      const rtl::OUString& Path,
-    rtl::OUString&       FileNameOrLastDirPart)
+    rtl::OUString& 		 FileNameOrLastDirPart)
  {
     osl_systemPathGetFileNameOrLastDirectoryPart(
         Path.pData, &FileNameOrLastDirPart.pData);
  }
-
+    
 
  /********************************************
      systemPathIsHiddenFileOrDirectoryEntry
-    Returns sal_True if the last part of
+    Returns sal_True if the last part of 
     given system path is not '.' or '..'
-    alone and starts with a '.'
-
+    alone and starts with a '.' 
+    
     @param pustrPath [in] a system path,
            must not be NULL
-
+          
     @returns sal_True if the last part of
              the given system path starts
              with '.' or sal_False the last
-             part is '.' or '..' alone or
+             part is '.' or	'..' alone or
              doesn't start with a dot
-
+             
  *********************************************/
-
+ 
  inline bool systemPathIsHiddenFileOrDirectoryEntry(
      const rtl::OUString& Path)
  {
     return osl_systemPathIsHiddenFileOrDirectoryEntry(Path.pData);
  }
-
+ 
 
  /************************************************
      systemPathIsLocalOrParentDirectoryEntry
     Returns sal_True if the last part of the given
     system path is the local directory entry '.'
     or the parent directory entry '..'
-
+    
     @param pustrPath [in] a system path,
            must not be NULL
-
-    @returns sal_True if the last part of the
+           
+    @returns sal_True if the last part of the 
              given system path is '.' or '..'
              else sal_False
-
+             
  ************************************************/
 
  inline bool systemPathIsLocalOrParentDirectoryEntry(
      const rtl::OUString& Path)
  {
-    return osl_systemPathIsLocalOrParentDirectoryEntry(Path.pData);
- }
-
+    return osl_systemPathIsLocalOrParentDirectoryEntry(Path.pData); 
+ }	
+ 
  /************************************************
   searchPath
   ***********************************************/
-
+ 
  inline bool searchPath(
      const rtl::OUString& ustrFilePath,
     const rtl::OUString& ustrSearchPathList,
     rtl::OUString& ustrPathFound)
  {
      return osl_searchPath(
-        ustrFilePath.pData,
+        ustrFilePath.pData, 
         ustrSearchPathList.pData,
         &ustrPathFound.pData);
  }
-
-
+               
+            
  } // namespace osl
-
-
+ 
+ 
  #endif /* #ifndef _OSL_PATH_HELPER_HXX_ */
-
+ 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index 62f8fe56cf35..95ecfc2e6ae3 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,59 +50,59 @@ namespace /* private */
     inline void set_file_type(const struct stat& file_stat, oslFileStatus* pStat)
     {
         /* links to directories state also to be a directory */
-       if (S_ISLNK(file_stat.st_mode))
-           pStat->eType = osl_File_Type_Link;
-       else if (S_ISDIR(file_stat.st_mode))
-           pStat->eType = osl_File_Type_Directory;
-       else if (S_ISREG(file_stat.st_mode))
+       if (S_ISLNK(file_stat.st_mode)) 
+           pStat->eType = osl_File_Type_Link;              
+       else if (S_ISDIR(file_stat.st_mode))                	   
+           pStat->eType = osl_File_Type_Directory;       
+       else if (S_ISREG(file_stat.st_mode))       
            pStat->eType = osl_File_Type_Regular;
-       else if (S_ISFIFO(file_stat.st_mode))
-           pStat->eType = osl_File_Type_Fifo;
-       else if (S_ISSOCK(file_stat.st_mode))
-           pStat->eType = osl_File_Type_Socket;
-       else if (S_ISCHR(file_stat.st_mode) || S_ISBLK(file_stat.st_mode))
-           pStat->eType = osl_File_Type_Special;
-       else
+       else if (S_ISFIFO(file_stat.st_mode)) 
+           pStat->eType = osl_File_Type_Fifo;      
+       else if (S_ISSOCK(file_stat.st_mode)) 
+           pStat->eType = osl_File_Type_Socket;       
+       else if (S_ISCHR(file_stat.st_mode) || S_ISBLK(file_stat.st_mode))        
+           pStat->eType = osl_File_Type_Special;    
+       else 
            pStat->eType = osl_File_Type_Unknown;
 
        pStat->uValidFields |= osl_FileStatus_Mask_Type;
     }
-
+            
     inline void set_file_access_mask(const struct stat& file_stat, oslFileStatus* pStat)
     {
-        // user permissions
-        if (S_IRUSR & file_stat.st_mode)
-            pStat->uAttributes |= osl_File_Attribute_OwnRead;
+        // user permissions       
+        if (S_IRUSR & file_stat.st_mode)           
+            pStat->uAttributes |= osl_File_Attribute_OwnRead;           
 
-        if (S_IWUSR & file_stat.st_mode)
-            pStat->uAttributes |= osl_File_Attribute_OwnWrite;
+        if (S_IWUSR & file_stat.st_mode)           
+            pStat->uAttributes |= osl_File_Attribute_OwnWrite;           
 
-        if (S_IXUSR & file_stat.st_mode)
-            pStat->uAttributes |= osl_File_Attribute_OwnExe;
+        if (S_IXUSR & file_stat.st_mode)          
+            pStat->uAttributes |= osl_File_Attribute_OwnExe;           
 
         // group permissions
-        if (S_IRGRP & file_stat.st_mode)
-            pStat->uAttributes |= osl_File_Attribute_GrpRead;
+        if (S_IRGRP & file_stat.st_mode)           
+            pStat->uAttributes |= osl_File_Attribute_GrpRead;           
 
-        if (S_IWGRP & file_stat.st_mode)
-            pStat->uAttributes |= osl_File_Attribute_GrpWrite;
+        if (S_IWGRP & file_stat.st_mode)           
+            pStat->uAttributes |= osl_File_Attribute_GrpWrite;           
 
-        if (S_IXGRP & file_stat.st_mode)
-            pStat->uAttributes |= osl_File_Attribute_GrpExe;
+        if (S_IXGRP & file_stat.st_mode)           
+            pStat->uAttributes |= osl_File_Attribute_GrpExe;           
 
         // others permissions
-        if (S_IROTH & file_stat.st_mode)
-            pStat->uAttributes |= osl_File_Attribute_OthRead;
+        if (S_IROTH & file_stat.st_mode)           
+            pStat->uAttributes |= osl_File_Attribute_OthRead;           
 
-        if (S_IWOTH & file_stat.st_mode)
-            pStat->uAttributes |= osl_File_Attribute_OthWrite;
+        if (S_IWOTH & file_stat.st_mode)           
+            pStat->uAttributes |= osl_File_Attribute_OthWrite;           
 
-        if (S_IXOTH & file_stat.st_mode)
+        if (S_IXOTH & file_stat.st_mode)           
             pStat->uAttributes |= osl_File_Attribute_OthExe;
-
+            
         pStat->uValidFields |= osl_FileStatus_Mask_Attributes;
     }
-
+    
     inline void set_file_access_rights(const struct stat& file_stat, int S_IR, int S_IW, int S_IX, oslFileStatus* pStat)
     {
         /* we cannot really map osl_File_Attribute_ReadOnly to
@@ -113,29 +113,29 @@ namespace /* private */
            to read because that's better than to give them incorrect one.
         */
         pStat->uValidFields |= osl_FileStatus_Mask_Attributes;
-
-        if ((0 == (S_IW & file_stat.st_mode)) && (S_IR & file_stat.st_mode))
+        
+        if ((0 == (S_IW & file_stat.st_mode)) && (S_IR & file_stat.st_mode))			
             pStat->uAttributes |= osl_File_Attribute_ReadOnly;
 
         if (S_IX & file_stat.st_mode)
-            pStat->uAttributes |= osl_File_Attribute_Executable;
+            pStat->uAttributes |= osl_File_Attribute_Executable;						
     }
-
+    
     /* a process may belong to up to NGROUPS_MAX groups, so when
        checking group access rights, we have to check all belonging
        groups */
     inline bool is_in_process_grouplist(const gid_t file_group)
     {
         // check primary process group
-
+        
         if (getgid() == file_group)
             return true;
-
+        
         // check supplementary process groups
-
+            
         gid_t grplist[NGROUPS_MAX];
         int   grp_number = getgroups(NGROUPS_MAX, grplist);
-
+        
         for (int i = 0; i < grp_number; i++)
         {
             if (grplist[i] == file_group)
@@ -143,17 +143,17 @@ namespace /* private */
         }
         return false;
     }
-
+    
     /* Currently we are determining the file access right based
        on the real user ID not the effective user ID!
        We don't use access(...) because access follows links which
        may cause performance problems see #97133.
     */
     inline void set_file_access_rights(const struct stat& file_stat, oslFileStatus* pStat)
-    {
+    {			  
         if (getuid() == file_stat.st_uid)
         {
-            set_file_access_rights(file_stat, S_IRUSR, S_IWUSR, S_IXUSR, pStat);
+            set_file_access_rights(file_stat, S_IRUSR, S_IWUSR, S_IXUSR, pStat);			        	
         }
         else if (is_in_process_grouplist(file_stat.st_gid))
         {
@@ -161,44 +161,44 @@ namespace /* private */
         }
         else
         {
-            set_file_access_rights(file_stat, S_IROTH, S_IWOTH, S_IXOTH, pStat);
-        }
+            set_file_access_rights(file_stat, S_IROTH, S_IWOTH, S_IXOTH, pStat);			
+        }						
     }
-
+    
     inline void set_file_hidden_status(const rtl::OUString& file_path, oslFileStatus* pStat)
     {
-        pStat->uAttributes   = osl::systemPathIsHiddenFileOrDirectoryEntry(file_path) ? osl_File_Attribute_Hidden : 0;
+        pStat->uAttributes   = osl::systemPathIsHiddenFileOrDirectoryEntry(file_path) ? osl_File_Attribute_Hidden : 0;        
         pStat->uValidFields |= osl_FileStatus_Mask_Attributes;
     }
-
+    
     /* the set_file_access_rights must be called after set_file_hidden_status(...) and
        set_file_access_mask(...) because of the hack in set_file_access_rights(...) */
     inline void set_file_attributes(
         const rtl::OUString& file_path, const struct stat& file_stat, const sal_uInt32 uFieldMask, oslFileStatus* pStat)
     {
-        set_file_hidden_status(file_path, pStat);
-        set_file_access_mask(file_stat, pStat);
-
+        set_file_hidden_status(file_path, pStat);	   	   				               	   
+        set_file_access_mask(file_stat, pStat);		              
+        
         // we set the file access rights only on demand
-        // because it's potentially expensive
-        if (uFieldMask & osl_FileStatus_Mask_Attributes)
+        // because it's potentially expensive		       
+        if (uFieldMask & osl_FileStatus_Mask_Attributes)                  			   		   
                set_file_access_rights(file_stat, pStat);
     }
-
+    
     inline void set_file_access_time(const struct stat& file_stat, oslFileStatus* pStat)
     {
         pStat->aAccessTime.Seconds  = file_stat.st_atime;
         pStat->aAccessTime.Nanosec  = 0;
            pStat->uValidFields        |= osl_FileStatus_Mask_AccessTime;
     }
-
+    
     inline void set_file_modify_time(const struct stat& file_stat, oslFileStatus* pStat)
     {
         pStat->aModifyTime.Seconds  = file_stat.st_mtime;
         pStat->aModifyTime.Nanosec  = 0;
         pStat->uValidFields        |= osl_FileStatus_Mask_ModifyTime;
     }
-
+    
     inline void set_file_size(const struct stat& file_stat, oslFileStatus* pStat)
     {
         if (S_ISREG(file_stat.st_mode))
@@ -207,8 +207,8 @@ namespace /* private */
                pStat->uValidFields |= osl_FileStatus_Mask_FileSize;
            }
     }
-
-    /* we only need to call stat or lstat if one of the
+    
+    /* we only need to call stat or lstat if one of the 
        following flags is set */
     inline bool is_stat_call_necessary(sal_uInt32 field_mask, oslFileType file_type = osl_File_Type_Unknown)
     {
@@ -220,54 +220,54 @@ namespace /* private */
                 (field_mask & osl_FileStatus_Mask_ModifyTime) ||
                 (field_mask & osl_FileStatus_Mask_FileSize) ||
                 (field_mask & osl_FileStatus_Mask_LinkTargetURL) ||
-                (field_mask & osl_FileStatus_Mask_Validate));
+                (field_mask & osl_FileStatus_Mask_Validate));				
     }
-
+    
     inline oslFileError set_link_target_url(const rtl::OUString& file_path, oslFileStatus* pStat)
     {
-        rtl::OUString link_target;
+        rtl::OUString link_target;					
         if (!osl::realpath(file_path, link_target))
             return oslTranslateFileError(OSL_FET_ERROR, errno);
 
         oslFileError osl_error = osl_getFileURLFromSystemPath(link_target.pData, &pStat->ustrLinkTargetURL);
         if (osl_error != osl_File_E_None)
             return osl_error;
-
-        pStat->uValidFields |= osl_FileStatus_Mask_LinkTargetURL;
-        return osl_File_E_None;
+                                
+        pStat->uValidFields |= osl_FileStatus_Mask_LinkTargetURL;							
+        return osl_File_E_None;			
     }
-
+    
     inline oslFileError setup_osl_getFileStatus(
         DirectoryItem_Impl * pImpl, oslFileStatus* pStat, rtl::OUString& file_path)
-    {
+    {		
         if ((NULL == pImpl) || (NULL == pStat))
             return osl_File_E_INVAL;
-
+                            
         file_path = rtl::OUString(pImpl->m_ustrFilePath);
         OSL_ASSERT(file_path.getLength() > 0);
         if (file_path.getLength() <= 0)
             return osl_File_E_INVAL;
-
+                            
         pStat->uValidFields = 0;
-        return osl_File_E_None;
+        return osl_File_E_None;		
     }
-
+    
 } // end namespace private
 
 
 /****************************************************************************
- *  osl_getFileStatus
+ *	osl_getFileStatus 
  ****************************************************************************/
 
 oslFileError SAL_CALL osl_getFileStatus(oslDirectoryItem Item, oslFileStatus* pStat, sal_uInt32 uFieldMask)
-{
+{	
     DirectoryItem_Impl * pImpl = static_cast< DirectoryItem_Impl* >(Item);
 
-    rtl::OUString file_path;
+    rtl::OUString file_path;	
     oslFileError  osl_error = setup_osl_getFileStatus(pImpl, pStat, file_path);
     if (osl_File_E_None != osl_error)
         return osl_error;
-
+    
 #if defined(__GNUC__) && (__GNUC__ < 3)
     struct ::stat file_stat;
 #else
@@ -277,21 +277,21 @@ oslFileError SAL_CALL osl_getFileStatus(oslDirectoryItem Item, oslFileStatus* pS
     bool bStatNeeded = is_stat_call_necessary(uFieldMask, pImpl->getFileType());
     if (bStatNeeded && (0 != osl::lstat(file_path, file_stat)))
         return oslTranslateFileError(OSL_FET_ERROR, errno);
-
+    
     if (bStatNeeded)
     {
-        // we set all these attributes because it's cheap
+        // we set all these attributes because it's cheap				
         set_file_type(file_stat, pStat);
         set_file_access_time(file_stat, pStat);
         set_file_modify_time(file_stat, pStat);
-        set_file_size(file_stat, pStat);
+        set_file_size(file_stat, pStat);		
         set_file_attributes(file_path, file_stat, uFieldMask, pStat);
-
-        // file exists semantic of osl_FileStatus_Mask_Validate
-        if ((uFieldMask & osl_FileStatus_Mask_LinkTargetURL) && S_ISLNK(file_stat.st_mode))
+                           
+        // file exists semantic of osl_FileStatus_Mask_Validate 
+        if ((uFieldMask & osl_FileStatus_Mask_LinkTargetURL) && S_ISLNK(file_stat.st_mode)) 
         {
             osl_error = set_link_target_url(file_path, pStat);
-            if (osl_error != osl_File_E_None)
+            if (osl_error != osl_File_E_None)      
                 return osl_error;
         }
     }
@@ -302,31 +302,31 @@ oslFileError SAL_CALL osl_getFileStatus(oslDirectoryItem Item, oslFileStatus* pS
         pStat->uValidFields |= osl_FileStatus_Mask_Type;
     }
 #endif /* _DIRENT_HAVE_D_TYPE */
-
+            
     if (uFieldMask & osl_FileStatus_Mask_FileURL)
     {
         if ((osl_error = osl_getFileURLFromSystemPath(file_path.pData, &pStat->ustrFileURL)) != osl_File_E_None)
             return osl_error;
-
-        pStat->uValidFields |= osl_FileStatus_Mask_FileURL;
+                            
+        pStat->uValidFields |= osl_FileStatus_Mask_FileURL;		
     }
-
+   
     if (uFieldMask & osl_FileStatus_Mask_FileName)
-    {
+    {	  
         osl_systemPathGetFileNameOrLastDirectoryPart(file_path.pData, &pStat->ustrFileName);
         pStat->uValidFields |= osl_FileStatus_Mask_FileName;
-       }
+       }	               
     return osl_File_E_None;
 }
 
 /****************************************************************************/
-/*  osl_setFileAttributes */
+/*	osl_setFileAttributes */
 /****************************************************************************/
 
 static oslFileError osl_psz_setFileAttributes( const sal_Char* pszFilePath, sal_uInt64 uAttributes )
 {
     oslFileError osl_error = osl_File_E_None;
-    mode_t       nNewMode  = 0;
+    mode_t 		 nNewMode  = 0;
 
      OSL_ENSURE(!(osl_File_Attribute_Hidden & uAttributes), "osl_File_Attribute_Hidden doesn't work under Unix");
 
@@ -384,7 +384,7 @@ oslFileError SAL_CALL osl_setFileAttributes( rtl_uString* ustrFileURL, sal_uInt6
 }
 
 /****************************************************************************/
-/*  osl_setFileTime */
+/*	osl_setFileTime */
 /****************************************************************************/
 
 static oslFileError osl_psz_setFileTime (
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index dcda0e4dc804..3c886411f0b3 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,22 +51,22 @@
 
 #include "file_error_transl.h"
 #include "file_path_helper.hxx"
-
+ 
 #include "uunxapi.hxx"
-
+ 
 /***************************************************
-
+ 
  General note
-
+ 
  This file contains the part that handles File URLs.
-
- File URLs as scheme specific notion of URIs
+ 
+ File URLs as scheme specific notion of URIs 
  (RFC2396) may be handled platform independend, but
  will not in osl which is considered wrong.
  Future version of osl should handle File URLs this
  way. In rtl/uri there is already an URI parser etc.
  so this code should be consolidated.
-
+ 
  **************************************************/
 /************************************************************************
  *   ToDo
@@ -74,18 +74,18 @@
  *   Fix osl_getCanonicalName
  *
  ***********************************************************************/
-
-
+ 
+ 
 /***************************************************
  * namespace directives
  **************************************************/
-
+ 
 using namespace osl;
 
 /***************************************************
  * constants
  **************************************************/
-
+ 
 const sal_Unicode UNICHAR_SLASH = ((sal_Unicode)'/');
 const sal_Unicode UNICHAR_COLON = ((sal_Unicode)':');
 const sal_Unicode UNICHAR_DOT   = ((sal_Unicode)'.');
@@ -97,8 +97,8 @@ const sal_Unicode UNICHAR_DOT   = ((sal_Unicode)'.');
  *****************************************************************************/
 
 /* a slightly modified version of Pchar in rtl/source/uri.c */
-const sal_Bool uriCharClass[128] =
-{
+const sal_Bool uriCharClass[128] =  
+{ 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* Pchar but without encoding slashes */
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* !"#$%&'()*+,-./  */
@@ -116,24 +116,24 @@ static sal_Bool findWrongUsage( const sal_Unicode *path, sal_Int32 len )
 {
     rtl_uString *pTmp = NULL;
     sal_Bool bRet;
-
+    
     rtl_uString_newFromStr_WithLength( &pTmp, path, len );
-
+    
     rtl_ustr_toAsciiLowerCase_WithLength( pTmp->buffer, pTmp->length );
-
+        
     bRet = ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "ftp://", 6 ) ) ||
            ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "http://", 7 ) ) ||
            ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "vnd.sun.star", 12 ) ) ||
            ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "private:", 8 ) ) ||
            ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pTmp->buffer, pTmp->length, "slot:", 5) );
-
+           
     rtl_uString_release( pTmp );
     return bRet;
 }
 */
 
 /****************************************************************************/
-/*  osl_getCanonicalName */
+/*	osl_getCanonicalName */
 /****************************************************************************/
 
 oslFileError SAL_CALL osl_getCanonicalName( rtl_uString* ustrFileURL, rtl_uString** pustrValidURL )
@@ -145,7 +145,7 @@ oslFileError SAL_CALL osl_getCanonicalName( rtl_uString* ustrFileURL, rtl_uStrin
 }
 
 /****************************************************************************/
-/*  osl_getSystemPathFromFileURL */
+/*	osl_getSystemPathFromFileURL */
 /****************************************************************************/
 
 oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath )
@@ -158,14 +158,14 @@ oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rt
 
     /* temporary hack: if already system path, return ustrFileURL */
     /*
-    if( (sal_Unicode) '/' == ustrFileURL->buffer[0] )
+    if( (sal_Unicode) '/' == ustrFileURL->buffer[0] ) 
     {
         OSL_ENSURE( 0, "osl_getSystemPathFromFileURL: input is already system path" );
         rtl_uString_assign( pustrSystemPath, ustrFileURL );
         return osl_File_E_None;
     }
     */
-
+        
     /* a valid file url may not start with '/' */
     if( ( 0 == ustrFileURL->length ) || ( (sal_Unicode) '/' == ustrFileURL->buffer[0] ) )
     {
@@ -179,7 +179,7 @@ oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rt
     {
         return osl_File_E_INVAL;
     }
-
+    
     /* search for encoded slashes (%2F) and decode every single token if we find one */
 
     nIndex = 0;
@@ -188,21 +188,21 @@ oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rt
     {
         rtl_uString * ustrPathToken = NULL;
         sal_Int32 nOffset = 7;
-
+        
         do
         {
             nOffset += nIndex;
 
             /* break url down in '/' devided tokens tokens */
             nIndex = rtl_ustr_indexOfChar_WithLength( ustrFileURL->buffer + nOffset, ustrFileURL->length - nOffset, (sal_Unicode) '/' );
-
+            
             /* copy token to new string */
-            rtl_uString_newFromStr_WithLength( &ustrPathToken, ustrFileURL->buffer + nOffset,
+            rtl_uString_newFromStr_WithLength( &ustrPathToken, ustrFileURL->buffer + nOffset, 
                 -1 == nIndex ? ustrFileURL->length - nOffset : nIndex++ );
 
             /* decode token */
             rtl_uriDecode( ustrPathToken, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8, &pTmp );
-
+            
             /* the result should not contain any '/' */
             if( -1 != rtl_ustr_indexOfChar_WithLength( pTmp->buffer, pTmp->length, (sal_Unicode) '/' ) )
             {
@@ -211,33 +211,33 @@ oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rt
 
                 return osl_File_E_INVAL;
             }
-
+                
         } while( -1 != nIndex );
 
         /* release temporary string and restore index variable */
         rtl_uString_release( ustrPathToken );
-        nIndex = 0;
+        nIndex = 0;        
     }
-
+ 
     /* protocol and server should not be encoded, so decode the whole string */
     rtl_uriDecode( ustrFileURL, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8, &pTmp );
-
-    /* check if file protocol specified */
+    
+    /* check if file protocol specified */    
     /* FIXME: use rtl_ustr_ascii_shortenedCompareIgnoreCase_WithLength when available */
     if( 7 <= pTmp->length )
     {
         rtl_uString * pProtocol = NULL;
         rtl_uString_newFromStr_WithLength( &pProtocol, pTmp->buffer, 7 );
-
+        
         /* protocol is case insensitive */
         rtl_ustr_toAsciiLowerCase_WithLength( pProtocol->buffer, pProtocol->length );
-
+        
         if( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pProtocol->buffer, pProtocol->length,"file://", 7 ) )
             nIndex = 7;
-
+            
         rtl_uString_release( pProtocol );
     }
-
+     
     /* skip "localhost" or "127.0.0.1" if "file://" is specified */
     /* FIXME: use rtl_ustr_ascii_shortenedCompareIgnoreCase_WithLength when available */
     if( nIndex && ( 10 <= pTmp->length - nIndex ) )
@@ -247,7 +247,7 @@ oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rt
 
         /* server is case insensitive */
         rtl_ustr_toAsciiLowerCase_WithLength( pServer->buffer, pServer->length );
-
+        
         if( ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pServer->buffer, pServer->length,"localhost/", 10 ) ) ||
             ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( pServer->buffer, pServer->length,"127.0.0.1/", 10 ) ) )
         {
@@ -257,7 +257,7 @@ oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rt
 
         rtl_uString_release( pServer );
     }
-
+                
     if( nIndex )
         rtl_uString_newFromStr_WithLength( &pTmp, pTmp->buffer + nIndex, pTmp->length - nIndex );
 
@@ -275,7 +275,7 @@ oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rt
             /* remove "file://" prefix */
             rtl_uString_newFromStr_WithLength( &pTmp2, pTmp2->buffer + 7, pTmp2->length - 7 );
 
-            /* replace '~' in original string */
+            /* replace '~' in original string */             
             rtl_uString_newReplaceStrAt( &pTmp, pTmp, 0, 1, pTmp2 );
             rtl_uString_release( pTmp2 );
         }
@@ -291,19 +291,19 @@ oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rt
     /*
     OSL_ASSERT( !findWrongUsage( pTmp->buffer, pTmp->length ) );
     */
-
+        
     *pustrSystemPath = pTmp;
     return osl_File_E_None;
 }
 
 /****************************************************************************/
-/*  osl_getFileURLFromSystemPath */
+/*	osl_getFileURLFromSystemPath */
 /****************************************************************************/
 
 oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath, rtl_uString **pustrFileURL )
 {
     static const sal_Unicode pDoubleSlash[2] = { '/', '/' };
-
+    
     rtl_uString *pTmp = NULL;
     sal_Int32 nIndex;
 
@@ -311,7 +311,7 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath,
         return osl_File_E_INVAL;
 
     /* temporary hack: if already file url, return ustrSystemPath */
-
+    
     if( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( ustrSystemPath->buffer, ustrSystemPath->length,"file:", 5 ) )
     {
     /*
@@ -334,8 +334,8 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath,
         */
         return osl_File_E_INVAL;
     }
-
-
+    
+        
     /* check if system path starts with ~ or ~user and replace it with the appropriate home dir */
     if( (sal_Unicode) '~' == ustrSystemPath->buffer[0] )
     {
@@ -348,7 +348,7 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath,
             /* remove "file://" prefix */
             rtl_uString_newFromStr_WithLength( &pTmp, pTmp->buffer + 7, pTmp->length - 7 );
 
-            /* replace '~' in original string */
+            /* replace '~' in original string */             
             rtl_uString_newReplaceStrAt( &pTmp, ustrSystemPath, 0, 1, pTmp );
         }
 
@@ -358,21 +358,21 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath,
             return osl_File_E_INVAL;
         }
     }
-
-    /* check if initial string contains double instances of '/' */
+    
+    /* check if initial string contains double instances of '/' */ 
     nIndex = rtl_ustr_indexOfStr_WithLength( ustrSystemPath->buffer, ustrSystemPath->length, pDoubleSlash, 2 );
     if( -1 != nIndex )
     {
         sal_Int32 nSrcIndex;
         sal_Int32 nDeleted = 0;
-
+        
         /* if pTmp is not already allocated, copy ustrSystemPath for modification */
         if( NULL == pTmp )
             rtl_uString_newFromString( &pTmp, ustrSystemPath );
-
+        
         /* adapt index to pTmp */
         nIndex += pTmp->length - ustrSystemPath->length;
-
+        
         /* remove all occurances of '//' */
         for( nSrcIndex = nIndex + 1; nSrcIndex < pTmp->length; nSrcIndex++ )
         {
@@ -381,29 +381,29 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath,
             else
                 pTmp->buffer[++nIndex] = pTmp->buffer[nSrcIndex];
         }
-
+        
         /* adjust length member */
         pTmp->length -= nDeleted;
-    }
-
+    }               
+    
     if( NULL == pTmp )
-        rtl_uString_assign( &pTmp, ustrSystemPath );
+        rtl_uString_assign( &pTmp, ustrSystemPath ); 
 
     /* temporary check for top 5 wrong usage strings (which are valid but unlikly filenames) */
     /*
     OSL_ASSERT( !findWrongUsage( pTmp->buffer, pTmp->length ) );
     */
-
+        
     /* file URLs must be URI encoded */
     rtl_uriEncode( pTmp, uriCharClass, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8, pustrFileURL );
-
-    rtl_uString_release( pTmp );
-
+    
+    rtl_uString_release( pTmp );    
+    
     /* absolute urls should start with 'file://' */
     if( (sal_Unicode)'/' == (*pustrFileURL)->buffer[0] )
     {
         rtl_uString *pProtocol = NULL;
-
+        
         rtl_uString_newFromAscii( &pProtocol, "file://" );
         rtl_uString_newConcat( pustrFileURL, pProtocol, *pustrFileURL );
         rtl_uString_release( pProtocol );
@@ -413,9 +413,9 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath,
 }
 
 /****************************************************************************
- * osl_getSystemPathFromFileURL_Ex - helper function
- * clients may specify if they want to accept relative
- * URLs or not
+ * osl_getSystemPathFromFileURL_Ex - helper function                          
+ * clients may specify if they want to accept relative                      
+ * URLs or not                                                              
  ****************************************************************************/
 
 oslFileError osl_getSystemPathFromFileURL_Ex(
@@ -423,7 +423,7 @@ oslFileError osl_getSystemPathFromFileURL_Ex(
 {
     rtl_uString* temp = 0;
     oslFileError osl_error = osl_getSystemPathFromFileURL(ustrFileURL, &temp);
-
+    
     if (osl_File_E_None == osl_error)
     {
         if (bAllowRelative || (UNICHAR_SLASH == temp->buffer[0]))
@@ -433,10 +433,10 @@ oslFileError osl_getSystemPathFromFileURL_Ex(
         else
         {
             rtl_uString_release(temp);
-            osl_error = osl_File_E_INVAL;
+            osl_error = osl_File_E_INVAL;                  
         }
     }
-
+    
     return osl_error;
 }
 
@@ -447,49 +447,49 @@ namespace /* private */
      * Helper function, return a pinter to the final '\0'
      * of a string
      ******************************************************/
-
+ 
     sal_Unicode* ustrtoend(sal_Unicode* pStr)
-    {
+    {		
         return (pStr + rtl_ustr_getLength(pStr));
     }
-
+    
     /*********************************************
 
      ********************************************/
-
+     
     sal_Unicode* ustrchrcat(const sal_Unicode chr, sal_Unicode* d)
     {
         sal_Unicode* p = ustrtoend(d);
         *p++ = chr;
-        *p   = 0;
-        return d;
+        *p   = 0;		
+        return d;	
     }
 
     /******************************************************
      *
      ******************************************************/
-
+ 
     bool _islastchr(sal_Unicode* pStr, sal_Unicode Chr)
     {
            sal_Unicode* p = ustrtoend(pStr);
            if (p > pStr)
                p--;
-           return (*p == Chr);
+           return (*p == Chr);  
     }
 
     /******************************************************
-     * Remove the last part of a path, a path that has
+     * Remove the last part of a path, a path that has 
      * only a '/' or no '/' at all will be returned
-     * unmodified
+     * unmodified 
      ******************************************************/
-
+ 
     sal_Unicode* _rmlastpathtoken(sal_Unicode* aPath)
     {
-        /*  we always may skip -2 because we
+        /* 	we always may skip -2 because we
                may at least stand on a '/' but
                either there is no other character
-               before this '/' or it's another
-               character than the '/'
+               before this '/' or it's another 
+               character than the '/' 
         */
         sal_Unicode* p = ustrtoend(aPath) - 2;
 
@@ -510,34 +510,34 @@ namespace /* private */
                    *p = '\0';
             }
         }
-
+    
         return aPath;
     }
 
     /******************************************************
-     *
+     * 
      ******************************************************/
-
+ 
     oslFileError _osl_resolvepath(
-        /*inout*/ sal_Unicode* path,
-        /*inout*/ sal_Unicode* current_pos,
+        /*inout*/ sal_Unicode* path, 
+        /*inout*/ sal_Unicode* current_pos, 
         /*inout*/ bool* failed)
     {
         oslFileError ferr = osl_File_E_None;
-
+    
         if (!*failed)
         {
-            char unresolved_path[PATH_MAX];
+            char unresolved_path[PATH_MAX];			
             if (!UnicodeToText(unresolved_path, sizeof(unresolved_path), path, rtl_ustr_getLength(path)))
                 return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
-
-            char resolved_path[PATH_MAX];
+                
+            char resolved_path[PATH_MAX];			
             if (realpath(unresolved_path, resolved_path))
             {
-                if (!TextToUnicode(resolved_path, strlen(resolved_path), path, PATH_MAX))
+                if (!TextToUnicode(resolved_path, strlen(resolved_path), path, PATH_MAX))		
                     return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
-
-                current_pos = ustrtoend(path) - 1;
+                    
+                current_pos = ustrtoend(path) - 1;	    					
             }
             else
             {
@@ -547,44 +547,44 @@ namespace /* private */
                     ferr = oslTranslateFileError(OSL_FET_ERROR, errno);
             }
         }
-
+        
         return ferr;
-    }
+    }	
 
     /******************************************************
-     * Works even with non existing paths. The resulting
-     * path must not exceed PATH_MAX else
+     * Works even with non existing paths. The resulting 
+     * path must not exceed PATH_MAX else 
      * osl_File_E_NAMETOOLONG is the result
      ******************************************************/
-
+ 
     oslFileError osl_getAbsoluteFileURL_impl_(const rtl::OUString& unresolved_path, rtl::OUString& resolved_path)
     {
-        // the given unresolved path must not exceed PATH_MAX
+        // the given unresolved path must not exceed PATH_MAX 
         if (unresolved_path.getLength() >= (PATH_MAX - 2))
             return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
-
-        sal_Unicode        path_resolved_so_far[PATH_MAX];
-        const sal_Unicode* punresolved = unresolved_path.getStr();
+        
+        sal_Unicode        path_resolved_so_far[PATH_MAX];	    
+        const sal_Unicode* punresolved = unresolved_path.getStr(); 
         sal_Unicode*       presolvedsf = path_resolved_so_far;
-
+    
         // reserve space for leading '/' and trailing '\0'
-        // do not exceed this limit
-        sal_Unicode* sentinel = path_resolved_so_far + PATH_MAX - 2;
-
+        // do not exceed this limit 
+        sal_Unicode* sentinel = path_resolved_so_far + PATH_MAX - 2; 
+    
         // if realpath fails with error ENOTDIR, EACCES or ENOENT
         // we will not call it again, because _osl_realpath should also
-        // work with non existing directories etc.
+        // work with non existing directories etc. 
         bool realpath_failed = false;
         oslFileError ferr;
-
+              
         path_resolved_so_far[0] = '\0';
-
+    
         while (*punresolved != '\0')
         {
-            // ignore '/.' , skip one part back when '/..'
-
+            // ignore '/.' , skip one part back when '/..' 
+    
             if ((UNICHAR_DOT == *punresolved) && (UNICHAR_SLASH == *presolvedsf))
-            {
+            {            
                 if ('\0' == *(punresolved + 1))
                 {
                     punresolved++;
@@ -594,62 +594,62 @@ namespace /* private */
                 {
                     punresolved += 2;
                     continue;
-                }
+                }            
                 else if ((UNICHAR_DOT == *(punresolved + 1)) && ('\0' == *(punresolved + 2) || (UNICHAR_SLASH == *(punresolved + 2))))
-                {
+                {                
                     _rmlastpathtoken(path_resolved_so_far);
-
+                
                     presolvedsf = ustrtoend(path_resolved_so_far) - 1;
-
+                
                     if (UNICHAR_SLASH == *(punresolved + 2))
                         punresolved += 3;
                     else
                         punresolved += 2;
-
+                    
                     continue;
-                }
-                else // a file or directory name may start with '.'
+                }                    
+                else // a file or directory name may start with '.' 
                 {
                     if ((presolvedsf = ustrtoend(path_resolved_so_far)) > sentinel)
                         return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
-
-                    ustrchrcat(*punresolved++, path_resolved_so_far);
-
+                    
+                    ustrchrcat(*punresolved++, path_resolved_so_far); 
+                
                     if ('\0' == *punresolved && !realpath_failed)
                     {
                         ferr = _osl_resolvepath(
-                            path_resolved_so_far,
-                            presolvedsf,
+                            path_resolved_so_far, 
+                            presolvedsf, 
                             &realpath_failed);
-
+                    
                         if (osl_File_E_None != ferr)
                             return ferr;
                     }
                 }
             }
             else if (UNICHAR_SLASH == *punresolved)
-            {
+            {  
                 if ((presolvedsf = ustrtoend(path_resolved_so_far)) > sentinel)
                     return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
-
-                ustrchrcat(*punresolved++, path_resolved_so_far);
-
+                        
+                ustrchrcat(*punresolved++, path_resolved_so_far); 
+            
                 if (!realpath_failed)
-                {
+                {                
                     ferr = _osl_resolvepath(
-                        path_resolved_so_far,
-                        presolvedsf,
+                        path_resolved_so_far, 
+                        presolvedsf, 
                         &realpath_failed);
-
+            
                     if (osl_File_E_None != ferr)
                         return ferr;
-
+                
                     if (!_islastchr(path_resolved_so_far, UNICHAR_SLASH))
                     {
                         if ((presolvedsf = ustrtoend(path_resolved_so_far)) > sentinel)
                             return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
-
-                        ustrchrcat(UNICHAR_SLASH, path_resolved_so_far);
+                    
+                        ustrchrcat(UNICHAR_SLASH, path_resolved_so_far); 
                     }
                 }
             }
@@ -657,16 +657,16 @@ namespace /* private */
             {
                 if ((presolvedsf = ustrtoend(path_resolved_so_far)) > sentinel)
                     return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
-
-                ustrchrcat(*punresolved++, path_resolved_so_far);
-
+                
+                ustrchrcat(*punresolved++, path_resolved_so_far); 
+            
                 if ('\0' == *punresolved && !realpath_failed)
-                {
+                {            
                     ferr = _osl_resolvepath(
-                        path_resolved_so_far,
-                        presolvedsf,
+                        path_resolved_so_far, 
+                        presolvedsf, 
                         &realpath_failed);
-
+            
                     if (osl_File_E_None != ferr)
                         return ferr;
                 }
@@ -674,11 +674,11 @@ namespace /* private */
         }
 
         sal_Int32 len = rtl_ustr_getLength(path_resolved_so_far);
-
+        
         OSL_ASSERT(len < PATH_MAX);
-
+        
         resolved_path = rtl::OUString(path_resolved_so_far, len);
-
+        
         return osl_File_E_None;
     }
 
@@ -688,30 +688,30 @@ namespace /* private */
 /******************************************************
  * osl_getAbsoluteFileURL
  ******************************************************/
-
+ 
 oslFileError osl_getAbsoluteFileURL(rtl_uString*  ustrBaseDirURL, rtl_uString* ustrRelativeURL, rtl_uString** pustrAbsoluteURL)
 {
     FileBase::RC  rc;
-    rtl::OUString unresolved_path;
+    rtl::OUString unresolved_path;    
     static char *allow_symlinks = getenv( "SAL_ALLOW_LINKOO_SYMLINKS" );
-
+    
     rc = FileBase::getSystemPathFromFileURL(rtl::OUString(ustrRelativeURL), unresolved_path);
-
+    
     if(FileBase::E_None != rc)
         return oslFileError(rc);
 
     if (systemPathIsRelativePath(unresolved_path))
     {
-        rtl::OUString base_path;
+        rtl::OUString base_path;		
         rc = (FileBase::RC) osl_getSystemPathFromFileURL_Ex(ustrBaseDirURL, &base_path.pData, sal_False);
 
-        if (FileBase::E_None != rc)
+        if (FileBase::E_None != rc)		
             return oslFileError(rc);
-
-        rtl::OUString abs_path;
+        
+        rtl::OUString abs_path;				
         systemPathMakeAbsolutePath(base_path, unresolved_path, abs_path);
 
-        unresolved_path = abs_path;
+        unresolved_path = abs_path;        
     }
 
     rtl::OUString resolved_path;
@@ -741,36 +741,36 @@ oslFileError osl_getAbsoluteFileURL(rtl_uString*  ustrBaseDirURL, rtl_uString* u
             resolved_path += base;
         }
     }
-
+        
     if (FileBase::E_None == rc)
     {
-        rc = (FileBase::RC) osl_getFileURLFromSystemPath(resolved_path.pData, pustrAbsoluteURL);
-        OSL_ASSERT(FileBase::E_None == rc);
+        rc = (FileBase::RC) osl_getFileURLFromSystemPath(resolved_path.pData, pustrAbsoluteURL);            
+        OSL_ASSERT(FileBase::E_None == rc);            
     }
-
+    
     return oslFileError(rc);
-}
+}  
 
 
 namespace /* private */
 {
-
+                        
     /*********************************************
      No separate error code if unicode to text
      conversion or getenv fails because for the
      caller there is no difference why a file
-     could not be found in $PATH
+     could not be found in $PATH 
      ********************************************/
-
+ 
     bool find_in_PATH(const rtl::OUString& file_path, rtl::OUString& result)
-    {
-        bool          bfound = false;
+    {	
+        bool          bfound = false;		
         rtl::OUString path(RTL_CONSTASCII_USTRINGPARAM("PATH"));
         rtl::OUString env_path;
-
+        
         if (osl_Process_E_None == osl_getEnvironment(path.pData, &env_path.pData))
             bfound = osl::searchPath(file_path, env_path, result);
-
+        
         return bfound;
     }
 
@@ -780,25 +780,25 @@ namespace /* private */
      caller there is no difference why a file
      could not be found in CDW
      ********************************************/
-
+ 
     bool find_in_CWD(const rtl::OUString& file_path, rtl::OUString& result)
-    {
-        bool bfound = false;
+    {		
+        bool bfound = false;		
         rtl::OUString cwd_url;
-
+        
         if (osl_Process_E_None == osl_getProcessWorkingDir(&cwd_url.pData))
         {
             rtl::OUString cwd;
-            FileBase::getSystemPathFromFileURL(cwd_url, cwd);
+            FileBase::getSystemPathFromFileURL(cwd_url, cwd);			
             bfound = osl::searchPath(file_path, cwd, result);
         }
         return bfound;
     }
-
+    
     /*********************************************
 
      ********************************************/
-
+ 
     bool find_in_searchPath(const rtl::OUString& file_path, rtl_uString* search_path, rtl::OUString& result)
     {
         return (search_path && osl::searchPath(file_path, rtl::OUString(search_path), result));
@@ -808,66 +808,66 @@ namespace /* private */
 
 
 /****************************************************************************
- *  osl_searchFileURL
+ *	osl_searchFileURL 
  ***************************************************************************/
-
+ 
 oslFileError osl_searchFileURL(rtl_uString* ustrFilePath, rtl_uString* ustrSearchPath, rtl_uString** pustrURL)
 {
     OSL_PRECOND(ustrFilePath && pustrURL, "osl_searchFileURL: invalid parameter");
-
+    
     FileBase::RC  rc;
     rtl::OUString file_path;
-
+        
     // try to interpret search path as file url else assume it's a system path list
     rc = FileBase::getSystemPathFromFileURL(rtl::OUString(ustrFilePath), file_path);
     if ((FileBase::E_None != rc) && (FileBase::E_INVAL == rc))
-        file_path = ustrFilePath;
+        file_path = ustrFilePath; 
     else if (FileBase::E_None != rc)
         return oslFileError(rc);
 
-    bool          bfound = false;
-    rtl::OUString result;
-
-    if (find_in_searchPath(file_path, ustrSearchPath, result) ||
-        find_in_PATH(file_path, result) ||
-        find_in_CWD(file_path, result))
-    {
+    bool          bfound = false;	
+    rtl::OUString result;	
+            
+    if (find_in_searchPath(file_path, ustrSearchPath, result) || 
+        find_in_PATH(file_path, result) || 
+        find_in_CWD(file_path, result))	
+    { 
         rtl::OUString resolved;
-
+        
         if (osl::realpath(result, resolved))
         {
-#if OSL_DEBUG_LEVEL > 0
-            oslFileError osl_error =
-#endif
-                osl_getFileURLFromSystemPath(resolved.pData, pustrURL);
+#if OSL_DEBUG_LEVEL > 0            
+            oslFileError osl_error = 
+#endif             
+                osl_getFileURLFromSystemPath(resolved.pData, pustrURL);		
             OSL_ASSERT(osl_File_E_None == osl_error);
             bfound = true;
         }
-    }
+    }    
     return bfound ? osl_File_E_None : osl_File_E_NOENT;
 }
 
 
 /****************************************************************************
- * FileURLToPath
+ * FileURLToPath 
  ***************************************************************************/
 
 oslFileError FileURLToPath(char * buffer, size_t bufLen, rtl_uString* ustrFileURL)
 {
     rtl_uString* ustrSystemPath = NULL;
-    oslFileError osl_error      = osl_getSystemPathFromFileURL(ustrFileURL, &ustrSystemPath);
-
+    oslFileError osl_error		= osl_getSystemPathFromFileURL(ustrFileURL, &ustrSystemPath);
+            
     if(osl_File_E_None != osl_error)
         return osl_error;
 
     osl_systemPathRemoveSeparator(ustrSystemPath);
-
+        
     /* convert unicode path to text */
     if(!UnicodeToText( buffer, bufLen, ustrSystemPath->buffer, ustrSystemPath->length))
-        osl_error = oslTranslateFileError(OSL_FET_ERROR, errno);
-
+        osl_error = oslTranslateFileError(OSL_FET_ERROR, errno); 
+        
     rtl_uString_release(ustrSystemPath);
-
+    
     return osl_error;
 }
 
diff --git a/sal/osl/unx/file_url.h b/sal/osl/unx/file_url.h
index 6dd1c324fd96..283a55c05a7d 100644
--- a/sal/osl/unx/file_url.h
+++ b/sal/osl/unx/file_url.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,48 +25,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #ifndef INCLUDED_FILE_URL_H
 #define INCLUDED_FILE_URL_H
-
+ 
 #include "osl/file.h"
-
+ 
 #ifdef __cplusplus
-extern "C"
+extern "C" 
 {
 #endif
-
+ 
 /**************************************************
  * osl_getSystemPathFromFileURL_Ex
  *************************************************/
-
+ 
 #define FURL_ALLOW_RELATIVE sal_True
 #define FURL_DENY_RELATIVE  sal_False
-
+  
 oslFileError osl_getSystemPathFromFileURL_Ex(rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath, sal_Bool bAllowRelative);
 
 /**************************************************
  * FileURLToPath
  *************************************************/
-
+  
 oslFileError FileURLToPath(char * buffer, size_t bufLen, rtl_uString* ustrFileURL);
-
+ 
 /***************************************************
  * UnicodeToText
  **************************************************/
-
+ 
 int UnicodeToText(char * buffer, size_t bufLen, const sal_Unicode * uniText, sal_Int32 uniTextLen);
 
 /***************************************************
  * TextToUniCode
  **************************************************/
-
+ 
 int TextToUnicode(const char* text, size_t text_buffer_size, sal_Unicode* unic_text, sal_Int32 unic_text_buffer_size);
 
 #ifdef __cplusplus
 }
 #endif
-
+ 
 #endif /* #define INCLUDED_FILE_URL_H */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index bc3812839979..124f267e1b73 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -148,7 +148,7 @@ static void           osl_printFloppyHandle(oslVolumeDeviceHandleImpl* hFloppy);
 static oslFileError osl_psz_getVolumeInformation(const sal_Char* , oslVolumeInfo* pInfo, sal_uInt32 uFieldMask);
 
 /****************************************************************************/
-/*  osl_getVolumeInformation */
+/*	osl_getVolumeInformation */
 /****************************************************************************/
 
 oslFileError osl_getVolumeInformation( rtl_uString* ustrDirectoryURL, oslVolumeInfo* pInfo, sal_uInt32 uFieldMask )
@@ -181,21 +181,21 @@ oslFileError osl_getVolumeInformation( rtl_uString* ustrDirectoryURL, oslVolumeI
 #ifdef HAVE_STATFS_H
 
 #if defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD)
-#   define __OSL_STATFS_STRUCT                  struct statfs
-#   define __OSL_STATFS(dir, sfs)               statfs((dir), (sfs))
-#   define __OSL_STATFS_BLKSIZ(a)               ((sal_uInt64)((a).f_bsize))
-#   define __OSL_STATFS_TYPENAME(a)             ((a).f_fstypename)
+#   define __OSL_STATFS_STRUCT      			struct statfs
+#   define __OSL_STATFS(dir, sfs)   			statfs((dir), (sfs))
+#   define __OSL_STATFS_BLKSIZ(a)   			((sal_uInt64)((a).f_bsize))
+#   define __OSL_STATFS_TYPENAME(a) 			((a).f_fstypename)
 #if defined(OPENBSD)
-#   define __OSL_STATFS_ISREMOTE(a)             (rtl_str_compare((a).f_fstypename, "nfs") == 0)
+#   define __OSL_STATFS_ISREMOTE(a)     		(rtl_str_compare((a).f_fstypename, "nfs") == 0)
 #else
-#   define __OSL_STATFS_ISREMOTE(a)             (((a).f_type & MNT_LOCAL) == 0)
+#   define __OSL_STATFS_ISREMOTE(a) 			(((a).f_type & MNT_LOCAL) == 0)
 #endif
 
 /* always return true if queried for the properties of
    the file system. If you think this is wrong under any
    of the target platforms fix it!!!! */
-#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  (1)
-#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
+#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
+#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
 #endif /* FREEBSD || MACOSX || OPENBSD */
 
 #if defined(NETBSD)
@@ -205,64 +205,64 @@ oslFileError osl_getVolumeInformation( rtl_uString* ustrDirectoryURL, oslVolumeI
 /* statvfs() replaced statfs() in 2.99.9 */
 # if __NetBSD_Version__ >= 299000900
        /* 2.0D or later */
-#   define __OSL_STATFS_STRUCT              struct statvfs
-#   define __OSL_STATFS(dir, sfs)           statvfs((dir), (sfs))
-#   define __OSL_STATFS_ISREMOTE(a)         (((a).f_flag & ST_LOCAL) == 0)
+#   define __OSL_STATFS_STRUCT				struct statvfs
+#   define __OSL_STATFS(dir, sfs)			statvfs((dir), (sfs))
+#   define __OSL_STATFS_ISREMOTE(a)			(((a).f_flag & ST_LOCAL) == 0)
 
 # else
        /* version before 2.0D */
-#   define __OSL_STATFS_STRUCT              struct statfs
-#   define __OSL_STATFS(dir, sfs)           statfs((dir), (sfs))
-#   define __OSL_STATFS_ISREMOTE(a)         (((a).f_type & MNT_LOCAL) == 0)
+#   define __OSL_STATFS_STRUCT				struct statfs
+#   define __OSL_STATFS(dir, sfs)			statfs((dir), (sfs))
+#   define __OSL_STATFS_ISREMOTE(a)			(((a).f_type & MNT_LOCAL) == 0)
 
 # endif /* >2.0D */
 
-#   define __OSL_STATFS_BLKSIZ(a)           ((sal_uInt64)((a).f_bsize))
-#   define __OSL_STATFS_TYPENAME(a)         ((a).f_fstypename)
+#   define __OSL_STATFS_BLKSIZ(a)			((sal_uInt64)((a).f_bsize))
+#   define __OSL_STATFS_TYPENAME(a)			((a).f_fstypename)
 
-#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a) (strcmp((a).f_fstypename, "msdos") != 0 && strcmp((a).f_fstypename, "ntfs") != 0 && strcmp((a).f_fstypename, "smbfs") != 0)
-#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a)    (strcmp((a).f_fstypename, "msdos") != 0)
+#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	(strcmp((a).f_fstypename, "msdos") != 0 && strcmp((a).f_fstypename, "ntfs") != 0 && strcmp((a).f_fstypename, "smbfs") != 0)
+#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a)	(strcmp((a).f_fstypename, "msdos") != 0)
 #endif /* NETBSD */
 
 #if defined(LINUX)
-#   define __OSL_NFS_SUPER_MAGIC                 0x6969
-#   define __OSL_SMB_SUPER_MAGIC                 0x517B
-#   define __OSL_MSDOS_SUPER_MAGIC               0x4d44
-#   define __OSL_NTFS_SUPER_MAGIC                0x5346544e
-#   define __OSL_STATFS_STRUCT                   struct statfs
-#   define __OSL_STATFS(dir, sfs)                statfs((dir), (sfs))
-#   define __OSL_STATFS_BLKSIZ(a)                ((sal_uInt64)((a).f_bsize))
-#   define __OSL_STATFS_IS_NFS(a)                (__OSL_NFS_SUPER_MAGIC == (a).f_type)
-#   define __OSL_STATFS_IS_SMB(a)                (__OSL_SMB_SUPER_MAGIC == (a).f_type)
-#   define __OSL_STATFS_ISREMOTE(a)              (__OSL_STATFS_IS_NFS((a)) || __OSL_STATFS_IS_SMB((a)))
-#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type) && (__OSL_NTFS_SUPER_MAGIC != (a).f_type))
-#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type))
+#	define __OSL_NFS_SUPER_MAGIC				 0x6969
+#	define __OSL_SMB_SUPER_MAGIC				 0x517B
+#	define __OSL_MSDOS_SUPER_MAGIC  			 0x4d44
+#	define __OSL_NTFS_SUPER_MAGIC				 0x5346544e
+#   define __OSL_STATFS_STRUCT       		     struct statfs
+#   define __OSL_STATFS(dir, sfs)    			 statfs((dir), (sfs))
+#   define __OSL_STATFS_BLKSIZ(a)    			 ((sal_uInt64)((a).f_bsize))
+#   define __OSL_STATFS_IS_NFS(a)     			 (__OSL_NFS_SUPER_MAGIC == (a).f_type) 
+#   define __OSL_STATFS_IS_SMB(a)     			 (__OSL_SMB_SUPER_MAGIC == (a).f_type) 
+#   define __OSL_STATFS_ISREMOTE(a)  			 (__OSL_STATFS_IS_NFS((a)) || __OSL_STATFS_IS_SMB((a)))
+#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type) && (__OSL_NTFS_SUPER_MAGIC != (a).f_type))
+#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type))
 #endif /* LINUX */
 
 #if defined(SOLARIS)
-#   define __OSL_STATFS_STRUCT                   struct statvfs
-#   define __OSL_STATFS(dir, sfs)                statvfs((dir), (sfs))
-#   define __OSL_STATFS_BLKSIZ(a)                ((sal_uInt64)((a).f_frsize))
-#   define __OSL_STATFS_TYPENAME(a)              ((a).f_basetype)
-#   define __OSL_STATFS_ISREMOTE(a)              (rtl_str_compare((a).f_basetype, "nfs") == 0)
+#   define __OSL_STATFS_STRUCT          		 struct statvfs
+#   define __OSL_STATFS(dir, sfs)	    		 statvfs((dir), (sfs))
+#   define __OSL_STATFS_BLKSIZ(a)       		 ((sal_uInt64)((a).f_frsize))
+#   define __OSL_STATFS_TYPENAME(a)     		 ((a).f_basetype)
+#   define __OSL_STATFS_ISREMOTE(a)     		 (rtl_str_compare((a).f_basetype, "nfs") == 0)
 
 /* always return true if queried for the properties of
    the file system. If you think this is wrong under any
    of the target platforms fix it!!!! */
-#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  (1)
-#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
+#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
+#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
 #endif /* SOLARIS */
 
-#   define __OSL_STATFS_INIT(a)         (memset(&(a), 0, sizeof(__OSL_STATFS_STRUCT)))
+#   define __OSL_STATFS_INIT(a) 	    (memset(&(a), 0, sizeof(__OSL_STATFS_STRUCT)))
 
 #else /* no statfs available */
 
-#   define __OSL_STATFS_STRUCT                   struct dummy {int i;}
-#   define __OSL_STATFS_INIT(a)                  ((void)a)
-#   define __OSL_STATFS(dir, sfs)                (1)
-#   define __OSL_STATFS_ISREMOTE(sfs)            (0)
-#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  (1)
-#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
+#   define __OSL_STATFS_STRUCT        			 struct dummy {int i;}
+#   define __OSL_STATFS_INIT(a)       			 ((void)a)
+#   define __OSL_STATFS(dir, sfs)     		     (1)
+#   define __OSL_STATFS_ISREMOTE(sfs) 			 (0)
+#	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
+#	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
 #endif /* HAVE_STATFS_H */
 
 
@@ -271,46 +271,46 @@ static oslFileError osl_psz_getVolumeInformation (
 {
     __OSL_STATFS_STRUCT sfs;
 
-    if (!pInfo)
+    if (!pInfo)   
         return osl_File_E_INVAL;
-
+    
     __OSL_STATFS_INIT(sfs);
-
+    
     pInfo->uValidFields = 0;
     pInfo->uAttributes  = 0;
-
+    
     if ((__OSL_STATFS(pszDirectory, &sfs)) < 0)
-    {
-        oslFileError result = oslTranslateFileError(OSL_FET_ERROR, errno);
+    {	
+        oslFileError result = oslTranslateFileError(OSL_FET_ERROR, errno);		
         return (result);
     }
 
     /* FIXME: how to detect the kind of storage (fixed, cdrom, ...) */
     if (uFieldMask & osl_VolumeInfo_Mask_Attributes)
-    {
+    {	
         if (__OSL_STATFS_ISREMOTE(sfs))
             pInfo->uAttributes  |= osl_Volume_Attribute_Remote;
-
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
+                        
+        pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;	
     }
 
     if (uFieldMask & osl_VolumeInfo_Mask_FileSystemCaseHandling)
     {
         if (__OSL_STATFS_IS_CASE_SENSITIVE_FS(sfs))
             pInfo->uAttributes |= osl_Volume_Attribute_Case_Sensitive;
-
+        
         if (__OSL_STATFS_IS_CASE_PRESERVING_FS(sfs))
             pInfo->uAttributes |= osl_Volume_Attribute_Case_Is_Preserved;
-
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
+            
+        pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;	
     }
-
+    
     pInfo->uTotalSpace = 0;
     pInfo->uFreeSpace  = 0;
     pInfo->uUsedSpace  = 0;
-
+    
 #if defined(__OSL_STATFS_BLKSIZ)
-
+    
     if ((uFieldMask & osl_VolumeInfo_Mask_TotalSpace) ||
         (uFieldMask & osl_VolumeInfo_Mask_UsedSpace))
     {
@@ -318,29 +318,29 @@ static oslFileError osl_psz_getVolumeInformation (
         pInfo->uTotalSpace  *= (sal_uInt64)(sfs.f_blocks);
         pInfo->uValidFields |= osl_VolumeInfo_Mask_TotalSpace;
     }
-
+    
     if ((uFieldMask & osl_VolumeInfo_Mask_FreeSpace) ||
         (uFieldMask & osl_VolumeInfo_Mask_UsedSpace))
     {
         pInfo->uFreeSpace = __OSL_STATFS_BLKSIZ(sfs);
-
-        if (getuid() == 0)
+        
+        if (getuid() == 0)		
             pInfo->uFreeSpace *= (sal_uInt64)(sfs.f_bfree);
-        else
+        else			
             pInfo->uFreeSpace *= (sal_uInt64)(sfs.f_bavail);
-
+    
         pInfo->uValidFields |= osl_VolumeInfo_Mask_FreeSpace;
     }
 
 #endif  /* __OSL_STATFS_BLKSIZ */
-
+    
     if ((pInfo->uValidFields & osl_VolumeInfo_Mask_TotalSpace) &&
         (pInfo->uValidFields & osl_VolumeInfo_Mask_FreeSpace ))
     {
         pInfo->uUsedSpace    = pInfo->uTotalSpace - pInfo->uFreeSpace;
         pInfo->uValidFields |= osl_VolumeInfo_Mask_UsedSpace;
     }
-
+    
     pInfo->uMaxNameLength = 0;
     if (uFieldMask & osl_VolumeInfo_Mask_MaxNameLength)
     {
@@ -374,17 +374,17 @@ static oslFileError osl_psz_getVolumeInformation (
             osl_getThreadTextEncoding(),
             OUSTRING_TO_OSTRING_CVTFLAGS);
         OSL_ASSERT(pInfo->ustrFileSystemName != 0);
-
+            
         pInfo->uValidFields |= osl_VolumeInfo_Mask_FileSystemName;
     }
-
+    
 #endif /* __OSL_STATFS_TYPENAME */
-
+    
     if (uFieldMask & osl_VolumeInfo_Mask_DeviceHandle)
     {
         /* FIXME: check also entries in mntent for the device
            and fill it with correct values */
-
+        
         *pInfo->pDeviceHandle = osl_isFloppyDrive(pszDirectory);
 
         if (*pInfo->pDeviceHandle)
@@ -537,12 +537,12 @@ oslFileError osl_releaseVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
     }
 
     --pItem->RefCount;
-
+    
     if ( pItem->RefCount == 0 )
     {
         rtl_freeMemory(pItem);
     }
-
+    
     return osl_File_E_None;
 }
 
@@ -551,12 +551,12 @@ oslFileError osl_releaseVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
 /*****************************************
  * osl_newVolumeDeviceHandleImpl
  ****************************************/
-
+ 
 static oslVolumeDeviceHandleImpl* osl_newVolumeDeviceHandleImpl()
 {
     oslVolumeDeviceHandleImpl* pHandle;
     const size_t               nSizeOfHandle = sizeof(oslVolumeDeviceHandleImpl);
-
+ 
     pHandle = (oslVolumeDeviceHandleImpl*) rtl_allocateMemory (nSizeOfHandle);
     if (pHandle != NULL)
     {
@@ -569,13 +569,13 @@ static oslVolumeDeviceHandleImpl* osl_newVolumeDeviceHandleImpl()
         pHandle->pszDevice[0]     = '\0';
         pHandle->RefCount         = 1;
     }
-    return pHandle;
+    return pHandle;   
 }
 
 /*****************************************
  * osl_freeVolumeDeviceHandleImpl
  ****************************************/
-
+ 
 static void osl_freeVolumeDeviceHandleImpl (oslVolumeDeviceHandleImpl* pHandle)
 {
     if (pHandle != NULL)
@@ -594,10 +594,10 @@ static void osl_freeVolumeDeviceHandleImpl (oslVolumeDeviceHandleImpl* pHandle)
 static sal_Bool
 osl_isAFloppyDevice (const char* pDeviceName)
 {
-    const char* pFloppyDevice [] = {
-        "/dev/fd",           "/dev/rfd",
-        "/dev/diskette",     "/dev/rdiskette",
-        "/vol/dev/diskette", "/vol/dev/rdiskette"
+    const char* pFloppyDevice [] = { 
+        "/dev/fd",           "/dev/rfd", 
+        "/dev/diskette",     "/dev/rdiskette", 
+        "/vol/dev/diskette", "/vol/dev/rdiskette" 
     };
 
     int i;
@@ -614,13 +614,13 @@ osl_isAFloppyDevice (const char* pDeviceName)
 static sal_Bool
 osl_isAParentDirectory (const char* pParentDir, const char* pSubDir)
 {
-    return strncmp(pParentDir, pSubDir, strlen(pParentDir)) == 0;
+    return strncmp(pParentDir, pSubDir, strlen(pParentDir)) == 0; 
 }
 
-/* the name of the routine is obviously silly. But anyway create a
+/* the name of the routine is obviously silly. But anyway create a 
  * oslVolumeDeviceHandle with correct mount point, device name and a resolved filepath
  * only if pszPath points to file or directory on a floppy */
-static oslVolumeDeviceHandle
+static oslVolumeDeviceHandle 
 osl_isFloppyDrive(const sal_Char* pszPath)
 {
     FILE*                       pMountTab;
@@ -645,31 +645,31 @@ osl_isFloppyDrive(const sal_Char* pszPath)
     while (getmntent(pMountTab, &aMountEnt) == 0)
     {
         const char *pMountPoint = aMountEnt.mnt_mountp;
-        const char *pDevice     = aMountEnt.mnt_special;
+        const char *pDevice     = aMountEnt.mnt_special; 
         if (   osl_isAParentDirectory (aMountEnt.mnt_mountp, pHandle->pszFilePath)
             && osl_isAFloppyDevice    (aMountEnt.mnt_special))
         {
             /* skip the last item for it is the name of the disk */
             char * pc = strrchr( aMountEnt.mnt_special, '/' );
-
+            
             if ( NULL != pc )
             {
                 int len = pc - aMountEnt.mnt_special;
-
+                                
                 strncpy( pHandle->pszDevice, aMountEnt.mnt_special, len );
                 pHandle->pszDevice[len] = '\0';
             }
             else
             {
                 /* #106048 use save str functions to avoid buffer overflows */
-                memset(pHandle->pszDevice, 0, sizeof(pHandle->pszDevice));
-                strncpy(pHandle->pszDevice, aMountEnt.mnt_special, sizeof(pHandle->pszDevice) - 1);
+                memset(pHandle->pszDevice, 0, sizeof(pHandle->pszDevice));				
+                strncpy(pHandle->pszDevice, aMountEnt.mnt_special, sizeof(pHandle->pszDevice) - 1);				                
             }
-
+            
             /* remember the mount point */
             memset(pHandle->pszMountPoint, 0, sizeof(pHandle->pszMountPoint));
             strncpy(pHandle->pszMountPoint, aMountEnt.mnt_mountp, sizeof(pHandle->pszMountPoint) - 1);
-
+                        
             fclose (pMountTab);
             return pHandle;
         }
@@ -688,21 +688,21 @@ static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
 
     int nRet=0;
     sal_Char pszCmd[512] = "";
-
+   
     if ( pHandle == 0 )
         return osl_File_E_INVAL;
 
-    /* FIXME: don't know what this is good for */
+    /* FIXME: don't know what this is good for */    
     if ( pHandle->ident[0] != 'O' || pHandle->ident[1] != 'V' || pHandle->ident[2] != 'D' || pHandle->ident[3] != 'H' )
         return osl_File_E_INVAL;
 
     snprintf(pszCmd, sizeof(pszCmd), "eject -q %s > /dev/null 2>&1", pHandle->pszDevice);
-
+    
     nRet = system( pszCmd );
 
     switch ( WEXITSTATUS(nRet) )
     {
-    case 0:
+    case 0:        
         {
             /* lookup the device in mount tab again */
             if ((pMountTab = fopen (MOUNTTAB, "r")) == NULL)
@@ -711,12 +711,12 @@ static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
             while (getmntent(pMountTab, &aMountEnt) == 0)
             {
                 const char *pMountPoint = aMountEnt.mnt_mountp;
-                const char *pDevice     = aMountEnt.mnt_special;
+                const char *pDevice     = aMountEnt.mnt_special; 
                 if ( 0 == strncmp( pHandle->pszDevice, aMountEnt.mnt_special, strlen(pHandle->pszDevice) ) )
                 {
                     memset(pHandle->pszMountPoint, 0, sizeof(pHandle->pszMountPoint));
                     strncpy (pHandle->pszMountPoint, aMountEnt.mnt_mountp, sizeof(pHandle->pszMountPoint) - 1);
-
+                                        
                     fclose (pMountTab);
                     return osl_File_E_None;
                 }
@@ -726,7 +726,7 @@ static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
             return osl_File_E_BUSY;
         }
         //break; // break not necessary here, see return statements before
-
+         
     case 1:
         return osl_File_E_BUSY;
 
@@ -741,29 +741,29 @@ static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
 {
 //    FILE*                       pMountTab;
 //    struct mnttab               aMountEnt;
-    oslVolumeDeviceHandleImpl*  pHandle = (oslVolumeDeviceHandleImpl*) hFloppy;
-
+    oslVolumeDeviceHandleImpl*  pHandle = (oslVolumeDeviceHandleImpl*) hFloppy;    
+    
     int nRet=0;
     sal_Char pszCmd[512] = "";
-
+    
     if ( pHandle == 0 )
         return osl_File_E_INVAL;
 
-    /* FIXME: don't know what this is good for */
+    /* FIXME: don't know what this is good for */    
     if ( pHandle->ident[0] != 'O' || pHandle->ident[1] != 'V' || pHandle->ident[2] != 'D' || pHandle->ident[3] != 'H' )
         return osl_File_E_INVAL;
-
+    
     snprintf(pszCmd, sizeof(pszCmd), "eject %s > /dev/null 2>&1", pHandle->pszDevice);
-
+    
     nRet = system( pszCmd );
 
     switch ( WEXITSTATUS(nRet) )
     {
-    case 0:
+    case 0:        
         {
             FILE*         pMountTab;
             struct mnttab aMountEnt;
-
+            
             /* lookup if device is still in mount tab */
             if ((pMountTab = fopen (MOUNTTAB, "r")) == NULL)
                 return osl_File_E_BUSY;
@@ -771,7 +771,7 @@ static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
             while (getmntent(pMountTab, &aMountEnt) == 0)
             {
                 const char *pMountPoint = aMountEnt.mnt_mountp;
-                const char *pDevice     = aMountEnt.mnt_special;
+                const char *pDevice     = aMountEnt.mnt_special; 
                 if ( 0 == strncmp( pHandle->pszDevice, aMountEnt.mnt_special, strlen(pHandle->pszDevice) ) )
                 {
                     fclose (pMountTab);
@@ -783,9 +783,9 @@ static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
             pHandle->pszMountPoint[0] = 0;
             return osl_File_E_None;
         }
-
+        
         //break; //break not necessary, see return statements before
-
+        
     case 1:
         return osl_File_E_NODEV;
 
@@ -809,13 +809,13 @@ static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
  *****************************************************************************/
 
 #if defined(LINUX)
-static oslVolumeDeviceHandle
+static oslVolumeDeviceHandle 
 osl_isFloppyDrive (const sal_Char* pszPath)
 {
-    oslVolumeDeviceHandleImpl* pItem = osl_newVolumeDeviceHandleImpl();
+    oslVolumeDeviceHandleImpl* pItem = osl_newVolumeDeviceHandleImpl(); 
     if (osl_getFloppyMountEntry(pszPath, pItem))
         return (oslVolumeDeviceHandle) pItem;
-
+    
     osl_freeVolumeDeviceHandleImpl (pItem);
     return 0;
 }
@@ -823,7 +823,7 @@ osl_isFloppyDrive (const sal_Char* pszPath)
 
 #if defined(LINUX)
 static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
-{
+{       
     sal_Bool bRet = sal_False;
     oslVolumeDeviceHandleImpl* pItem=0;
     int nRet;
@@ -833,19 +833,19 @@ static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
     sal_Char* pszTmp = 0;
 
     pszCmd[0] = '\0';
-
+    
 #ifdef TRACE_OSL_FILE
     fprintf(stderr,"In  osl_mountFloppy\n");
 #endif
 
     pItem = (oslVolumeDeviceHandleImpl*) hFloppy;
-
+    
     if ( pItem == 0 )
     {
 #ifdef TRACE_OSL_FILE
         fprintf(stderr,"Out osl_mountFloppy [pItem == 0]\n");
 #endif
-
+        
         return osl_File_E_INVAL;
     }
 
@@ -856,7 +856,7 @@ static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
 #endif
         return osl_File_E_INVAL;
     }
-
+    
     bRet = osl_isFloppyMounted(pItem);
     if ( bRet == sal_True )
     {
@@ -892,35 +892,35 @@ static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
     {
         pszSuDo=pszTmp;
     }
-
+    
     if ( pszSuDo != 0 )
     {
         snprintf(pszCmd, sizeof(pszCmd), "%s %s %s %s",pszSuDo,pszMountProg,pItem->pszDevice,pItem->pszMountPoint);
     }
     else
     {
-        snprintf(pszCmd, sizeof(pszCmd), "%s %s",pszMountProg,pItem->pszMountPoint);
+        snprintf(pszCmd, sizeof(pszCmd), "%s %s",pszMountProg,pItem->pszMountPoint);        
     }
-
-
+    
+    
 #ifdef DEBUG_OSL_FILE
     fprintf(stderr,"executing '%s'\n",pszCmd);
 #endif
-
-    nRet = system(pszCmd);
+    
+    nRet = system(pszCmd);    
 
 #ifdef DEBUG_OSL_FILE
     fprintf(stderr,"call returned '%i'\n",nRet);
     fprintf(stderr,"exit status is '%i'\n", WEXITSTATUS(nRet));
 #endif
-
-
+    
+    
     switch ( WEXITSTATUS(nRet) )
     {
     case 0:
         nRet=0;
         break;
-
+        
     case 2:
         nRet=EPERM;
         break;
@@ -949,7 +949,7 @@ static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
         nRet=EBUSY;
         break;
     }
-
+    
     return ((0 == nRet) ? oslTranslateFileError(OSL_FET_SUCCESS, nRet) : oslTranslateFileError(OSL_FET_ERROR, nRet));
 }
 #endif /* LINUX */
@@ -966,13 +966,13 @@ static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
     const sal_Char* pszUmountProg = "umount";
 
     pszCmd[0] = '\0';
-
+    
 #ifdef TRACE_OSL_FILE
     fprintf(stderr,"In  osl_unmountFloppy\n");
-#endif
+#endif    
 
     pItem = (oslVolumeDeviceHandleImpl*) hFloppy;
-
+    
     if ( pItem == 0 )
     {
 #ifdef TRACE_OSL_FILE
@@ -999,13 +999,13 @@ static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
 /*      if ( nRet != 0 ) */
 /*      { */
 /*          nRet = errno; */
-
+        
 /*  #ifdef DEBUG_OSL_FILE */
 /*          perror("mount"); */
 /*  #endif */
 /*      } */
-
-
+    
+    
     pszTmp = getenv("SAL_MOUNT_UMOUNTPROG");
     if ( pszTmp != 0 )
     {
@@ -1019,26 +1019,26 @@ static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
     }
 
     if ( pszSuDo != 0 )
-    {
-        snprintf(pszCmd, sizeof(pszCmd), "%s %s %s",pszSuDo,pszUmountProg,pItem->pszMountPoint);
+    {    
+        snprintf(pszCmd, sizeof(pszCmd), "%s %s %s",pszSuDo,pszUmountProg,pItem->pszMountPoint);        
     }
     else
     {
         snprintf(pszCmd, sizeof(pszCmd), "%s %s",pszUmountProg,pItem->pszMountPoint);
     }
-
+    
 
 #ifdef DEBUG_OSL_FILE
     fprintf(stderr,"executing '%s'\n",pszCmd);
 #endif
-
-    nRet = system(pszCmd);
+    
+    nRet = system(pszCmd);    
 
 #ifdef DEBUG_OSL_FILE
     fprintf(stderr,"call returned '%i'\n",nRet);
     fprintf(stderr,"exit status is '%i'\n", WEXITSTATUS(nRet));
 #endif
-
+    
     switch ( WEXITSTATUS(nRet) )
     {
     case 0:
@@ -1049,20 +1049,20 @@ static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
         nRet=EBUSY;
         break;
     }
-
+    
 #ifdef TRACE_OSL_FILE
     fprintf(stderr,"Out osl_unmountFloppy [ok]\n");
-#endif
+#endif    
 
     return ((0 == nRet) ? oslTranslateFileError(OSL_FET_SUCCESS, nRet) : oslTranslateFileError(OSL_FET_ERROR, nRet));
-
+    
 /*    return osl_File_E_None;*/
 }
 
 #endif /* LINUX */
 
 #if defined(LINUX)
-static sal_Bool
+static sal_Bool 
 osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem)
 {
     struct mntent* pMountEnt;
@@ -1074,22 +1074,22 @@ osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pIte
 
     while ((pMountEnt = getmntent(pMountTab)) != 0)
     {
-        if (   strncmp(pMountEnt->mnt_dir,    pszPath,   strlen(pMountEnt->mnt_dir)) == 0
+        if (   strncmp(pMountEnt->mnt_dir,    pszPath,   strlen(pMountEnt->mnt_dir)) == 0 
             && strncmp(pMountEnt->mnt_fsname, "/dev/fd", strlen("/dev/fd")) == 0)
         {
-            memset(pItem->pszMountPoint, 0, sizeof(pItem->pszMountPoint));
+            memset(pItem->pszMountPoint, 0, sizeof(pItem->pszMountPoint));			
             strncpy(pItem->pszMountPoint, pMountEnt->mnt_dir, sizeof(pItem->pszMountPoint) - 1);
-
+            
             memset(pItem->pszFilePath, 0, sizeof(pItem->pszFilePath));
             strncpy(pItem->pszFilePath, pMountEnt->mnt_dir, sizeof(pItem->pszFilePath) - 1);
-
+            
             memset(pItem->pszDevice, 0, sizeof(pItem->pszDevice));
             strncpy(pItem->pszDevice, pMountEnt->mnt_fsname, sizeof(pItem->pszDevice) - 1);
-
+                       
             endmntent (pMountTab);
-            return sal_True;
+            return sal_True; 
         }
-    }
+    }    
 
     endmntent (pMountTab);
     return sal_False;
@@ -1097,22 +1097,22 @@ osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pIte
 #endif /* LINUX */
 
 #if defined(LINUX)
-static sal_Bool
+static sal_Bool 
 osl_isFloppyMounted (oslVolumeDeviceHandleImpl* pDevice)
 {
-    oslVolumeDeviceHandleImpl aItem;
+    oslVolumeDeviceHandleImpl aItem;    
 
     if (   osl_getFloppyMountEntry (pDevice->pszMountPoint, &aItem)
-        && strcmp (aItem.pszMountPoint, pDevice->pszMountPoint) == 0
+        && strcmp (aItem.pszMountPoint, pDevice->pszMountPoint) == 0 
         && strcmp (aItem.pszDevice,     pDevice->pszDevice) == 0)
     {
         return sal_True;
     }
-    return sal_False;
+    return sal_False;    
 }
 #endif /* LINUX */
 
-/* NetBSD floppy functions have to be added here. Until we have done that,
+/* NetBSD floppy functions have to be added here. Until we have done that, 
  * we use the MACOSX definitions for nonexistent floppy.
  * */
 
@@ -1123,7 +1123,7 @@ osl_isFloppyMounted (oslVolumeDeviceHandleImpl* pDevice)
  *****************************************************************************/
 
 #if (defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || \
-    defined(AIX) || defined(OPENBSD))
+	defined(AIX) || defined(OPENBSD))
 static oslVolumeDeviceHandle osl_isFloppyDrive(const sal_Char* pszPath)
 {
     (void)pszPath;
@@ -1132,7 +1132,7 @@ static oslVolumeDeviceHandle osl_isFloppyDrive(const sal_Char* pszPath)
 #endif /* MACOSX */
 
 #if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || \
-    defined(AIX) || defined(OPENBSD))
+	defined(AIX) || defined(OPENBSD))
 static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
 {
     (void)hFloppy;
@@ -1141,7 +1141,7 @@ static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
 #endif /* MACOSX */
 
 #if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || \
-    defined(AIX) || defined(OPENBSD))
+	defined(AIX) || defined(OPENBSD))
 static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
 {
     (void)hFloppy;
@@ -1179,13 +1179,13 @@ static void osl_printFloppyHandle(oslVolumeDeviceHandleImpl* pItem)
 #endif
         return;
     }
-
+    
 
     fprintf(stderr,"MountPoint : '%s'\n",pItem->pszMountPoint);
     fprintf(stderr,"FilePath   : '%s'\n",pItem->pszFilePath);
     fprintf(stderr,"Device     : '%s'\n",pItem->pszDevice);
 
-    return;
+    return;    
 }
 #endif
 
diff --git a/sal/osl/unx/interlck.c b/sal/osl/unx/interlck.c
index f8630c97a4f1..f164371a7fef 100644
--- a/sal/osl/unx/interlck.c
+++ b/sal/osl/unx/interlck.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -84,7 +84,7 @@ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount*
     }
     else {
         __asm__ __volatile__ (
-            "lock\n\t"
+            "lock\n\t" 
             "xaddl %0, %1\n\t"
         :   "+r" (nCount), "+m" (*pCount)
         :   /* nothing */
diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
index ee8142fdd1c6..f56a9177e36d 100644
--- a/sal/osl/unx/module.c
+++ b/sal/osl/unx/module.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -110,7 +110,7 @@ oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 n
 /* osl_getModuleHandle */
 /*****************************************************************************/
 
-sal_Bool SAL_CALL
+sal_Bool SAL_CALL 
 osl_getModuleHandle(rtl_uString *pModuleName, oslModule *pResult)
 {
     (void) pModuleName; /* avoid warning about unused parameter */
@@ -127,7 +127,7 @@ void SAL_CALL osl_unloadModule(oslModule hModule)
     {
 #ifndef NO_DL_FUNCTIONS
         int nRet = dlclose(hModule);
-
+        
 #if OSL_DEBUG_LEVEL > 1
         if (nRet != 0)
         {
@@ -144,7 +144,7 @@ void SAL_CALL osl_unloadModule(oslModule hModule)
 /*****************************************************************************/
 /* osl_getSymbol */
 /*****************************************************************************/
-void* SAL_CALL
+void* SAL_CALL 
 osl_getSymbol(oslModule Module, rtl_uString* pSymbolName)
 {
     return (void *) osl_getFunctionSymbol(Module, pSymbolName);
@@ -154,16 +154,16 @@ osl_getSymbol(oslModule Module, rtl_uString* pSymbolName)
 /*****************************************************************************/
 /* osl_getAsciiFunctionSymbol */
 /*****************************************************************************/
-oslGenericFunction SAL_CALL
+oslGenericFunction SAL_CALL 
 osl_getAsciiFunctionSymbol(oslModule Module, const sal_Char *pSymbol)
 {
     void *fcnAddr = NULL;
-
+    
 #ifndef NO_DL_FUNCTIONS
     if (pSymbol)
     {
         fcnAddr = dlsym(Module, pSymbol);
-
+        
         if (!fcnAddr)
             OSL_TRACE("Error osl_getAsciiFunctionSymbol: %s\n", dlerror());
     }
@@ -175,15 +175,15 @@ osl_getAsciiFunctionSymbol(oslModule Module, const sal_Char *pSymbol)
 /*****************************************************************************/
 /* osl_getFunctionSymbol */
 /*****************************************************************************/
-oslGenericFunction SAL_CALL
+oslGenericFunction SAL_CALL 
 osl_getFunctionSymbol(oslModule module, rtl_uString *puFunctionSymbolName)
 {
     oslGenericFunction pSymbol = NULL;
-
+    
     if( puFunctionSymbolName )
     {
         rtl_String* pSymbolName = NULL;
-
+        
         rtl_uString2String( &pSymbolName,
             rtl_uString_getStr(puFunctionSymbolName),
             rtl_uString_getLength(puFunctionSymbolName),
@@ -196,7 +196,7 @@ osl_getFunctionSymbol(oslModule module, rtl_uString *puFunctionSymbolName)
             rtl_string_release(pSymbolName);
         }
     }
-
+    
     return pSymbol;
 }
 
@@ -278,16 +278,16 @@ sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibr
 #if OSL_DEBUG_LEVEL > 1
             OSL_TRACE("module.c::osl_getModuleURLFromAddress - %s\n", dl_info.dli_fname);
 #endif
-            rtl_string2UString(ppLibraryUrl,
-                               dl_info.dli_fname,
-                               strlen(dl_info.dli_fname),
-                               osl_getThreadTextEncoding(),
+            rtl_string2UString(ppLibraryUrl, 
+                               dl_info.dli_fname, 
+                               strlen(dl_info.dli_fname), 
+                               osl_getThreadTextEncoding(), 
                                OSTRING_TO_OUSTRING_CVTFLAGS);
-
+            
             OSL_ASSERT(*ppLibraryUrl != NULL);
-            osl_getFileURLFromSystemPath(*ppLibraryUrl, ppLibraryUrl);
-            osl_getAbsoluteFileURL(workDir, *ppLibraryUrl, ppLibraryUrl);
-
+            osl_getFileURLFromSystemPath(*ppLibraryUrl, ppLibraryUrl); 
+            osl_getAbsoluteFileURL(workDir, *ppLibraryUrl, ppLibraryUrl); 
+            
             rtl_uString_release(workDir);
             result = sal_True;
         }
@@ -305,7 +305,7 @@ sal_Bool SAL_CALL osl_getModuleURLFromAddress(void * addr, rtl_uString ** ppLibr
 /*****************************************************************************/
 sal_Bool SAL_CALL osl_getModuleURLFromFunctionAddress(oslGenericFunction addr, rtl_uString ** ppLibraryUrl)
 {
-    return osl_getModuleURLFromAddress((void*)addr, ppLibraryUrl);
+    return osl_getModuleURLFromAddress((void*)addr, ppLibraryUrl); 
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/mutex.c b/sal/osl/unx/mutex.c
index 9eaa8b598ca1..c44b332469ba 100644
--- a/sal/osl/unx/mutex.c
+++ b/sal/osl/unx/mutex.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,47 +44,47 @@ int pthread_mutexattr_setkind_np(pthread_mutexattr_t *, int);
     Implementation notes:
     oslMutex hides a pointer to the oslMutexImpl structure, which
     ist needed to manage recursive locks on a mutex.
-
+    
 */
 
 typedef struct _oslMutexImpl
 {
-    pthread_mutex_t mutex;
+    pthread_mutex_t	mutex;
 } oslMutexImpl;
 
 
 /*****************************************************************************/
 /* osl_createMutex */
 /*****************************************************************************/
-oslMutex SAL_CALL osl_createMutex()
+oslMutex SAL_CALL osl_createMutex() 
 {
     oslMutexImpl* pMutex = (oslMutexImpl*) malloc(sizeof(oslMutexImpl));
     pthread_mutexattr_t aMutexAttr;
     int nRet=0;
-
+    
     OSL_ASSERT(pMutex);
 
     if ( pMutex == 0 )
     {
         return 0;
     }
-
+        
     pthread_mutexattr_init(&aMutexAttr);
 
     nRet = pthread_mutexattr_settype(&aMutexAttr, PTHREAD_MUTEX_RECURSIVE);
-
+    
     nRet = pthread_mutex_init(&(pMutex->mutex), &aMutexAttr);
     if ( nRet != 0 )
     {
-        OSL_TRACE("osl_createMutex : mutex init failed. Errno: %d; %s\n",
+        OSL_TRACE("osl_createMutex : mutex init failed. Errno: %d; %s\n",  
                   nRet, strerror(nRet));
-
+        
         free(pMutex);
         pMutex = 0;
     }
 
     pthread_mutexattr_destroy(&aMutexAttr);
-
+    
     return (oslMutex) pMutex;
 }
 
@@ -96,45 +96,45 @@ void SAL_CALL osl_destroyMutex(oslMutex Mutex)
     oslMutexImpl* pMutex = (oslMutexImpl*) Mutex;
 
     OSL_ASSERT(pMutex);
-
+    
     if ( pMutex != 0 )
     {
         int nRet=0;
-
+        
         nRet = pthread_mutex_destroy(&(pMutex->mutex));
         if ( nRet != 0 )
         {
-            OSL_TRACE("osl_destroyMutex : mutex destroy failed. Errno: %d; %s\n",
+            OSL_TRACE("osl_destroyMutex : mutex destroy failed. Errno: %d; %s\n",  
                       nRet, strerror(nRet));
         }
 
         free(pMutex);
     }
-
+    
     return;
 }
 
 /*****************************************************************************/
 /* osl_acquireMutex */
 /*****************************************************************************/
-sal_Bool SAL_CALL osl_acquireMutex(oslMutex Mutex)
+sal_Bool SAL_CALL osl_acquireMutex(oslMutex Mutex) 
 {
     oslMutexImpl* pMutex = (oslMutexImpl*) Mutex;
-
+    
     OSL_ASSERT(pMutex);
 
     if ( pMutex != 0 )
     {
         int nRet=0;
-
+        
         nRet = pthread_mutex_lock(&(pMutex->mutex));
         if ( nRet != 0 )
         {
-            OSL_TRACE("osl_acquireMutex : mutex lock failed. Errno: %d; %s\n",
+            OSL_TRACE("osl_acquireMutex : mutex lock failed. Errno: %d; %s\n",  
                       nRet, strerror(nRet));
             return sal_False;
         }
-        return sal_True;
+        return sal_True;		
     }
 
     /* not initialized */
@@ -144,22 +144,22 @@ sal_Bool SAL_CALL osl_acquireMutex(oslMutex Mutex)
 /*****************************************************************************/
 /* osl_tryToAcquireMutex */
 /*****************************************************************************/
-sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutex Mutex)
+sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutex Mutex) 
 {
     oslMutexImpl* pMutex = (oslMutexImpl*) Mutex;
 
     OSL_ASSERT(pMutex);
 
-    if ( pMutex )
+    if ( pMutex ) 
     {
         int nRet = 0;
         nRet = pthread_mutex_trylock(&(pMutex->mutex));
         if ( nRet != 0  )
             return sal_False;
-
+        
         return sal_True;
     }
-
+    
     /* not initialized */
     return sal_False;
 }
@@ -167,25 +167,25 @@ sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutex Mutex)
 /*****************************************************************************/
 /* osl_releaseMutex */
 /*****************************************************************************/
-sal_Bool SAL_CALL osl_releaseMutex(oslMutex Mutex)
+sal_Bool SAL_CALL osl_releaseMutex(oslMutex Mutex) 
 {
     oslMutexImpl* pMutex = (oslMutexImpl*) Mutex;
-
+    
     OSL_ASSERT(pMutex);
 
-    if ( pMutex )
+    if ( pMutex ) 
     {
         int nRet=0;
         nRet = pthread_mutex_unlock(&(pMutex->mutex));
         if ( nRet != 0 )
         {
-            OSL_TRACE("osl_releaseMutex : mutex unlock failed. Errno: %d; %s\n",
+            OSL_TRACE("osl_releaseMutex : mutex unlock failed. Errno: %d; %s\n",  
                       nRet, strerror(nRet));
             return sal_False;
         }
-
+            
         return sal_True;
-    }
+    } 
 
     /* not initialized */
     return sal_False;
@@ -208,7 +208,7 @@ static void globalMutexInitImpl(void) {
     }
 }
 
-oslMutex * SAL_CALL osl_getGlobalMutex()
+oslMutex * SAL_CALL osl_getGlobalMutex() 
 {
     /* necessary to get a "oslMutex *" */
     static oslMutex globalMutex = (oslMutex) &globalMutexImpl;
@@ -217,7 +217,7 @@ oslMutex * SAL_CALL osl_getGlobalMutex()
     if (pthread_once(&once, &globalMutexInitImpl) != 0) {
         abort();
     }
-
+    
     return &globalMutex;
 }
 
diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index f78aa92c25dd..f7ae5a24eabc 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 #include <rtl/memory.h>
 
 #if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || \
-    defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD)
+	defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD)
 #include <pthread.h>
 #ifndef MACOSX
  #include <locale.h>
@@ -40,8 +40,8 @@
 #else
 #include <osl/module.h>
 #include <osl/thread.h>
-#endif  /* !MACOSX */
-#endif  /* LINUX || SOLARIS || NETBSD || MACOSX */
+#endif	/* !MACOSX */
+#endif	/* LINUX || SOLARIS || NETBSD || MACOSX */
 
 #include <string.h>
 
@@ -57,7 +57,7 @@ typedef struct {
 
 
 /*****************************************************************************
- compare function for binary search
+ compare function for binary search   
  *****************************************************************************/
 
 static int
@@ -111,65 +111,65 @@ static char * _compose_locale( rtl_Locale * pLocale, char * buffer, size_t n )
             (pLocale->Language->length == 2 || pLocale->Language->length == 3) )
     {
         size_t offset = 0;
-
+        
         /* convert language code to ascii */
         {
             rtl_String *pLanguage = NULL;
-
-            rtl_uString2String( &pLanguage,
+            
+            rtl_uString2String( &pLanguage, 
                 pLocale->Language->buffer, pLocale->Language->length,
                 RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS );
-
+            
             if( SAL_INT_CAST(sal_uInt32, pLanguage->length) < n )
-            {
+            {    
                 strcpy( buffer, pLanguage->buffer );
                 offset = pLanguage->length;
             }
-
+            
             rtl_string_release( pLanguage );
         }
-
+        
         /* convert country code to ascii */
         if( pLocale->Country && (pLocale->Country->length == 2) )
         {
             rtl_String *pCountry = NULL;
-
-            rtl_uString2String( &pCountry,
+            
+            rtl_uString2String( &pCountry, 
                 pLocale->Country->buffer, pLocale->Country->length,
                 RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS );
-
+             
             if( offset + pCountry->length + 1 < n )
-            {
-                strcpy( buffer + offset++, "_" );
+            {    
+                strcpy( buffer + offset++, "_" );   
                 strcpy( buffer + offset, pCountry->buffer );
                 offset += pCountry->length;
             }
-
+            
             rtl_string_release( pCountry );
         }
-
+        
         /* convert variant to ascii - check if there is enough space for the variant string */
         if( pLocale->Variant && pLocale->Variant->length &&
             ( SAL_INT_CAST(sal_uInt32, pLocale->Variant->length) < n - 6 ) )
         {
             rtl_String *pVariant = NULL;
-
+            
             rtl_uString2String( &pVariant,
                 pLocale->Variant->buffer, pLocale->Variant->length,
                 RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS );
-
+             
             if( offset + pVariant->length + 1 < n )
-            {
+            {    
                 strcpy( buffer + offset, pVariant->buffer );
                 offset += pVariant->length;
             }
 
             rtl_string_release( pVariant );
         }
-
+        
         return buffer;
     }
-
+    
     return NULL;
 }
 
@@ -180,7 +180,7 @@ static char * _compose_locale( rtl_Locale * pLocale, char * buffer, size_t n )
 static rtl_Locale * _parse_locale( const char * locale )
 {
     static sal_Unicode c_locale[2] = { (sal_Unicode) 'C', 0 };
-
+    
     /* check if locale contains a valid string */
     if( locale )
     {
@@ -191,7 +191,7 @@ static rtl_Locale * _parse_locale( const char * locale )
             rtl_uString * pLanguage = NULL;
             rtl_uString * pCountry  = NULL;
             rtl_uString * pVariant  = NULL;
-
+    
             size_t offset = 2;
 
             rtl_Locale * ret;
@@ -227,14 +227,14 @@ static rtl_Locale * _parse_locale( const char * locale )
             return ret;
         }
         else
-            return rtl_locale_register( c_locale, c_locale + 1, c_locale + 1 );
+            return rtl_locale_register( c_locale, c_locale + 1, c_locale + 1 ); 
     }
-
+    
     return NULL;
 }
-
+        
 #if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || \
-    defined(FREEBSD) || defined(OPENBSD)
+	defined(FREEBSD) || defined(OPENBSD)
 
 /*
  * This implementation of osl_getTextEncodingFromLocale maps
@@ -281,7 +281,7 @@ const _pair _nl_language_list[] = {
     { "GB2312",         RTL_TEXTENCODING_GB_2312        }, /* zh_CN */
     { "GBK",            RTL_TEXTENCODING_GBK            }, /* zh_CN.GBK */
     { "ISO8859-1",      RTL_TEXTENCODING_ISO_8859_1     },
-    { "ISO8859-10",     RTL_TEXTENCODING_ISO_8859_10    },
+    { "ISO8859-10",     RTL_TEXTENCODING_ISO_8859_10    }, 
     { "ISO8859-13",     RTL_TEXTENCODING_ISO_8859_13    }, /* lt_LT lv_LV */
     { "ISO8859-14",     RTL_TEXTENCODING_ISO_8859_14    },
     { "ISO8859-15",     RTL_TEXTENCODING_ISO_8859_15    },
@@ -580,7 +580,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
 rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
 {
     const _pair *language=0;
-
+    
     char  locale_buf[64] = "";
     char  codeset_buf[64];
 
@@ -593,22 +593,22 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
 
     /* convert rtl_Locale to locale string */
     _compose_locale( pLocale, locale_buf, 64 );
-
+        
     /* basic thread safeness */
     pthread_mutex_lock( &aLocalMutex );
 
     /* remember the charset as indicated by the LC_CTYPE locale */
     ctype_locale = setlocale( LC_CTYPE, NULL );
-
+    
     /* set the desired LC_CTYPE locale */
     if( NULL == setlocale( LC_CTYPE, locale_buf ) )
     {
         pthread_mutex_unlock(&aLocalMutex);
         return RTL_TEXTENCODING_DONTKNOW;
     }
-
+        
     /* get the charset as indicated by the LC_CTYPE locale */
-#if defined(NETBSD) && !defined(CODESET)
+#if defined(NETBSD) && !defined(CODESET) 
     codeset = NULL;
 #else
     codeset = nl_langinfo( CODESET );
@@ -618,7 +618,7 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
     {
         /* get codeset into mt save memory */
         strncpy( codeset_buf, codeset, sizeof(codeset_buf) );
-        codeset_buf[sizeof(codeset_buf) - 1] = 0;
+        codeset_buf[sizeof(codeset_buf) - 1] = 0; 
         codeset = codeset_buf;
     }
 
@@ -627,7 +627,7 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
         setlocale( LC_CTYPE, ctype_locale );
 
     pthread_mutex_unlock( &aLocalMutex );
-
+   
     /* search the codeset in our language list */
     if ( codeset != NULL )
     {
@@ -641,7 +641,7 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
      * rtl-codeset */
     if ( language != NULL )
         return language->value;
-
+   
     return RTL_TEXTENCODING_DONTKNOW;
 }
 
@@ -652,13 +652,13 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
 void _imp_getProcessLocale( rtl_Locale ** ppLocale )
 {
     char * locale;
-
+    
     /* basic thread safeness */
     pthread_mutex_lock( &aLocalMutex );
 
     /* set the locale defined by the env vars */
     locale = setlocale( LC_CTYPE, "" );
-
+    
     /* fallback to the current locale */
     if( NULL == locale )
         locale = setlocale( LC_CTYPE, NULL );
@@ -680,7 +680,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
 
     /* convert rtl_Locale to locale string */
     _compose_locale( pLocale, locale_buf, 64 );
-
+    
     /* basic thread safeness */
     pthread_mutex_lock( &aLocalMutex );
 
@@ -695,7 +695,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
 #else /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
 
 /*
- * This implementation of osl_getTextEncodingFromLocale maps
+ * This implementation of osl_getTextEncodingFromLocale maps 
  * from the ISO language codes.
  */
 
@@ -706,15 +706,15 @@ const _pair _full_locale_list[] = {
     { "zh_CN.EUC",    RTL_TEXTENCODING_EUC_CN      },
     { "zh_TW.EUC",    RTL_TEXTENCODING_EUC_TW      }
 };
-
+ 
 const _pair _locale_extension_list[] = {
     { "big5",         RTL_TEXTENCODING_BIG5        },
     { "big5hk",       RTL_TEXTENCODING_BIG5_HKSCS  },
     { "gb18030",      RTL_TEXTENCODING_GB_18030    },
     { "euc",          RTL_TEXTENCODING_EUC_JP      },
     { "iso8859-1",    RTL_TEXTENCODING_ISO_8859_1  },
-    { "iso8859-10",   RTL_TEXTENCODING_ISO_8859_10 },
-    { "iso8859-13",   RTL_TEXTENCODING_ISO_8859_13 },
+    { "iso8859-10",   RTL_TEXTENCODING_ISO_8859_10 }, 
+    { "iso8859-13",   RTL_TEXTENCODING_ISO_8859_13 }, 
     { "iso8859-14",   RTL_TEXTENCODING_ISO_8859_14 },
     { "iso8859-15",   RTL_TEXTENCODING_ISO_8859_15 },
     { "iso8859-2",    RTL_TEXTENCODING_ISO_8859_2  },
@@ -737,63 +737,63 @@ const _pair _locale_extension_list[] = {
 };
 
 const _pair _iso_language_list[] = {
-    { "af",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "ar",  RTL_TEXTENCODING_ISO_8859_6 },
-    { "az",  RTL_TEXTENCODING_ISO_8859_9 },
-    { "be",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "bg",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "ca",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "cs",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "da",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "de",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "el",  RTL_TEXTENCODING_ISO_8859_7 },
-    { "en",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "es",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "et",  RTL_TEXTENCODING_ISO_8859_4 },
-    { "eu",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "fa",  RTL_TEXTENCODING_ISO_8859_6 },
-    { "fi",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "fo",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "fr",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "gr",  RTL_TEXTENCODING_ISO_8859_7 },
+    { "af",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "ar",  RTL_TEXTENCODING_ISO_8859_6 }, 
+    { "az",  RTL_TEXTENCODING_ISO_8859_9 }, 
+    { "be",  RTL_TEXTENCODING_ISO_8859_5 }, 
+    { "bg",  RTL_TEXTENCODING_ISO_8859_5 }, 
+    { "ca",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "cs",  RTL_TEXTENCODING_ISO_8859_2 }, 
+    { "da",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "de",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "el",  RTL_TEXTENCODING_ISO_8859_7 }, 
+    { "en",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "es",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "et",  RTL_TEXTENCODING_ISO_8859_4 }, 
+    { "eu",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "fa",  RTL_TEXTENCODING_ISO_8859_6 }, 
+    { "fi",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "fo",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "fr",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "gr",  RTL_TEXTENCODING_ISO_8859_7 }, 
     { "he",  RTL_TEXTENCODING_ISO_8859_8 },
-    { "hi",  RTL_TEXTENCODING_DONTKNOW },
-    { "hr",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "hu",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "hy",  RTL_TEXTENCODING_DONTKNOW },
-    { "id",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "is",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "it",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "iw",  RTL_TEXTENCODING_ISO_8859_8 },
-    { "ja",  RTL_TEXTENCODING_EUC_JP },
-    { "ka",  RTL_TEXTENCODING_DONTKNOW },
-    { "kk",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "ko",  RTL_TEXTENCODING_EUC_KR },
-    { "lt",  RTL_TEXTENCODING_ISO_8859_4 },
-    { "lv",  RTL_TEXTENCODING_ISO_8859_4 },
-    { "mk",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "mr",  RTL_TEXTENCODING_DONTKNOW },
-    { "ms",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "nl",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "no",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "pl",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "pt",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "ro",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "ru",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "sa",  RTL_TEXTENCODING_DONTKNOW },
-    { "sk",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "sl",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "sq",  RTL_TEXTENCODING_ISO_8859_2 },
-    { "sv",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "sw",  RTL_TEXTENCODING_ISO_8859_1 },
-    { "ta",  RTL_TEXTENCODING_DONTKNOW },
-    { "th",  RTL_TEXTENCODING_DONTKNOW },
-    { "tr",  RTL_TEXTENCODING_ISO_8859_9 },
-    { "tt",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "uk",  RTL_TEXTENCODING_ISO_8859_5 },
-    { "ur",  RTL_TEXTENCODING_ISO_8859_6 },
-    { "uz",  RTL_TEXTENCODING_ISO_8859_9 },
-    { "vi",  RTL_TEXTENCODING_DONTKNOW },
+    { "hi",  RTL_TEXTENCODING_DONTKNOW }, 
+    { "hr",  RTL_TEXTENCODING_ISO_8859_2 }, 
+    { "hu",  RTL_TEXTENCODING_ISO_8859_2 }, 
+    { "hy",  RTL_TEXTENCODING_DONTKNOW }, 
+    { "id",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "is",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "it",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "iw",  RTL_TEXTENCODING_ISO_8859_8 }, 
+    { "ja",  RTL_TEXTENCODING_EUC_JP }, 
+    { "ka",  RTL_TEXTENCODING_DONTKNOW }, 
+    { "kk",  RTL_TEXTENCODING_ISO_8859_5 }, 
+    { "ko",  RTL_TEXTENCODING_EUC_KR }, 
+    { "lt",  RTL_TEXTENCODING_ISO_8859_4 }, 
+    { "lv",  RTL_TEXTENCODING_ISO_8859_4 }, 
+    { "mk",  RTL_TEXTENCODING_ISO_8859_5 }, 
+    { "mr",  RTL_TEXTENCODING_DONTKNOW }, 
+    { "ms",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "nl",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "no",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "pl",  RTL_TEXTENCODING_ISO_8859_2 }, 
+    { "pt",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "ro",  RTL_TEXTENCODING_ISO_8859_2 }, 
+    { "ru",  RTL_TEXTENCODING_ISO_8859_5 }, 
+    { "sa",  RTL_TEXTENCODING_DONTKNOW }, 
+    { "sk",  RTL_TEXTENCODING_ISO_8859_2 }, 
+    { "sl",  RTL_TEXTENCODING_ISO_8859_2 }, 
+    { "sq",  RTL_TEXTENCODING_ISO_8859_2 }, 
+    { "sv",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "sw",  RTL_TEXTENCODING_ISO_8859_1 }, 
+    { "ta",  RTL_TEXTENCODING_DONTKNOW }, 
+    { "th",  RTL_TEXTENCODING_DONTKNOW }, 
+    { "tr",  RTL_TEXTENCODING_ISO_8859_9 }, 
+    { "tt",  RTL_TEXTENCODING_ISO_8859_5 }, 
+    { "uk",  RTL_TEXTENCODING_ISO_8859_5 }, 
+    { "ur",  RTL_TEXTENCODING_ISO_8859_6 }, 
+    { "uz",  RTL_TEXTENCODING_ISO_8859_9 }, 
+    { "vi",  RTL_TEXTENCODING_DONTKNOW }, 
     { "zh",  RTL_TEXTENCODING_BIG5 }
 };
 
@@ -850,7 +850,7 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
      * rtl-codeset */
     if ( language != NULL )
         return language->value;
-
+   
     return RTL_TEXTENCODING_DONTKNOW;
 }
 
@@ -924,7 +924,7 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
 {
     /* simulate behavior off setlocale */
     char * locale = getenv( "LC_ALL" );
-
+    
     if( NULL == locale )
         locale = getenv( "LC_CTYPE" );
 
@@ -945,14 +945,14 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
 int _imp_setProcessLocale( rtl_Locale * pLocale )
 {
     char locale_buf[64];
-
+    
     /* convert rtl_Locale to locale string */
     if( NULL != _compose_locale( pLocale, locale_buf, 64 ) )
     {
         /* only change env vars that exist already */
         if( getenv( "LC_ALL" ) ) {
 #if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || \
-    defined( AIX ) || defined( OPENBSD )
+	defined( AIX ) || defined( OPENBSD )
             setenv( "LC_ALL", locale_buf, 1);
 #else
             setenv( "LC_ALL", locale_buf );
@@ -961,7 +961,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
 
         if( getenv( "LC_CTYPE" ) ) {
 #if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || \
-    defined( AIX ) || defined( OPENBSD )
+	defined( AIX ) || defined( OPENBSD )
             setenv("LC_CTYPE", locale_buf, 1 );
 #else
             setenv( "LC_CTYPE", locale_buf );
@@ -970,7 +970,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
 
         if( getenv( "LANG" ) ) {
 #if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || \
-    defined( AIX ) || defined( OPENBSD)
+	defined( AIX ) || defined( OPENBSD)
             setenv("LC_CTYPE", locale_buf, 1 );
 #else
             setenv( "LANG", locale_buf );
diff --git a/sal/osl/unx/osxlocale.cxx b/sal/osl/unx/osxlocale.cxx
index c8bcc6dae756..26434ef4ef6e 100644
--- a/sal/osl/unx/osxlocale.cxx
+++ b/sal/osl/unx/osxlocale.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,62 +48,62 @@ namespace /* private */
     private:
         T& rT_;
     };
-
+        
     typedef CFGuard<CFArrayRef> CFArrayGuard;
     typedef CFGuard<CFStringRef> CFStringGuard;
     typedef CFGuard<CFPropertyListRef> CFPropertyListGuard;
-
-    /** Get the current process locale from system
+    
+    /** Get the current process locale from system 
     */
     CFStringRef getProcessLocale()
     {
         CFPropertyListRef pref = CFPreferencesCopyAppValue(CFSTR("AppleLocale"), kCFPreferencesCurrentApplication);
         CFPropertyListGuard proplGuard(pref);
-
+        
         if (pref == NULL) // return fallback value 'en_US'
              return CFStringCreateWithCString(kCFAllocatorDefault, "en_US", kCFStringEncodingASCII);
-
+        
         CFStringRef sref = (CFGetTypeID(pref) == CFArrayGetTypeID()) ? (CFStringRef)CFArrayGetValueAtIndex((CFArrayRef)pref, 0) : (CFStringRef)pref;
-
+        
         // NOTE: this API is only available with Mac OS X >=10.3. We need to use it because
         // Apple used non-ISO values on systems <10.2 like "German" for instance but didn't
         // upgrade those values during upgrade to newer Mac OS X versions. See also #i54337#
-        return CFLocaleCreateCanonicalLocaleIdentifierFromString(kCFAllocatorDefault, sref);
-    }
+        return CFLocaleCreateCanonicalLocaleIdentifierFromString(kCFAllocatorDefault, sref);	
+    }	
 } // namespace private
-
+    
 /** Grab current locale from system.
 */
 extern "C" {
 int macosx_getLocale(char *locale, sal_uInt32 bufferLen)
-{
+{	
     CFStringRef sref = getProcessLocale();
     CFStringGuard sGuard(sref);
-
+    
     assert(sref != NULL && "osxlocale.cxx: getProcessLocale must return a non-NULL value");
-
-    // split the string into substrings; the first two (if there are two) substrings
+    
+    // split the string into substrings; the first two (if there are two) substrings 
     // are language and country
-    CFArrayRef subs = CFStringCreateArrayBySeparatingStrings(NULL, sref, CFSTR("_"));
+    CFArrayRef subs = CFStringCreateArrayBySeparatingStrings(NULL, sref, CFSTR("_"));	
     CFArrayGuard arrGuard(subs);
-
+        
     CFStringRef lang = (CFStringRef)CFArrayGetValueAtIndex(subs, 0);
     CFStringGetCString(lang, locale, bufferLen, kCFStringEncodingASCII);
-
+        
     // country also available? Assumption: if the array contains more than one
     // value the second value is always the country!
     if (CFArrayGetCount(subs) > 1)
     {
         strlcat(locale, "_", bufferLen - strlen(locale));
-
+            
         CFStringRef country = (CFStringRef)CFArrayGetValueAtIndex(subs, 1);
-        CFStringGetCString(country, locale + strlen(locale), bufferLen - strlen(locale), kCFStringEncodingASCII);
-    }
+        CFStringGetCString(country, locale + strlen(locale), bufferLen - strlen(locale), kCFStringEncodingASCII);			
+    }	    
     // Append 'UTF-8' to the locale because the Mac OS X file
     // system interface is UTF-8 based and sal tries to determine
-    // the file system locale from the locale information
-    strlcat(locale, ".UTF-8", bufferLen - strlen(locale));
-
+    // the file system locale from the locale information 
+    strlcat(locale, ".UTF-8", bufferLen - strlen(locale));							
+        
     return noErr;
 }
 }
@@ -117,7 +117,7 @@ int macosx_getLocale(char *locale, sal_uInt32 bufferLen)
  */
 extern "C" int macxp_OSXConvertCFEncodingToIANACharSetName( char *buffer, unsigned int bufferLen, CFStringEncoding cfEncoding )
 {
-    CFStringRef sCFEncodingName;
+    CFStringRef	sCFEncodingName;
 
     sCFEncodingName = CFStringConvertEncodingToIANACharSetName( cfEncoding );
     CFStringGetCString( sCFEncodingName, buffer, bufferLen, cfEncoding );
diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c
index f121a3519fd4..8a0248f6cdaf 100644
--- a/sal/osl/unx/pipe.c
+++ b/sal/osl/unx/pipe.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,11 +35,11 @@
 
 #include "sockimpl.h"
 
-#define PIPEDEFAULTPATH     "/tmp"
-#define PIPEALTERNATEPATH   "/var/tmp"
+#define PIPEDEFAULTPATH		"/tmp"
+#define PIPEALTERNATEPATH	"/var/tmp"
 
-#define PIPENAMEMASK    "OSL_PIPE_%s"
-#define SECPIPENAMEMASK "OSL_PIPE_%s_%s"
+#define PIPENAMEMASK	"OSL_PIPE_%s"
+#define SECPIPENAMEMASK	"OSL_PIPE_%s_%s"
 
 sal_Bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax);
 oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions Options, oslSecurity Security);
@@ -54,22 +54,22 @@ static struct
     int            errcode;
     oslPipeError   error;
 } PipeError[]= {
-    { 0,               osl_Pipe_E_None              },  /* no error */
-    { EPROTOTYPE,      osl_Pipe_E_NoProtocol        },  /* Protocol wrong type for socket */
-    { ENOPROTOOPT,     osl_Pipe_E_NoProtocol        },  /* Protocol not available */
-    { EPROTONOSUPPORT, osl_Pipe_E_NoProtocol        },  /* Protocol not supported */
-    { ESOCKTNOSUPPORT, osl_Pipe_E_NoProtocol        },  /* Socket type not supported */
-    { EPFNOSUPPORT,    osl_Pipe_E_NoProtocol        },  /* Protocol family not supported */
-    { EAFNOSUPPORT,    osl_Pipe_E_NoProtocol        },  /* Address family not supported by */
+    { 0,			   osl_Pipe_E_None		    	},	/* no error */
+    { EPROTOTYPE,	   osl_Pipe_E_NoProtocol	    },	/* Protocol wrong type for socket */
+    { ENOPROTOOPT,	   osl_Pipe_E_NoProtocol	    },	/* Protocol not available */
+    { EPROTONOSUPPORT, osl_Pipe_E_NoProtocol		},	/* Protocol not supported */
+    { ESOCKTNOSUPPORT, osl_Pipe_E_NoProtocol 		},	/* Socket type not supported */
+    { EPFNOSUPPORT,	   osl_Pipe_E_NoProtocol     	},	/* Protocol family not supported */
+    { EAFNOSUPPORT,	   osl_Pipe_E_NoProtocol     	},	/* Address family not supported by */
                                                         /* protocol family */
-    { ENETRESET,       osl_Pipe_E_NetworkReset      },  /* Network dropped connection because */
+    { ENETRESET,	   osl_Pipe_E_NetworkReset 		},	/* Network dropped connection because */
                                                          /* of reset */
-    { ECONNABORTED,    osl_Pipe_E_ConnectionAbort   },  /* Software caused connection abort */
-    { ECONNRESET,      osl_Pipe_E_ConnectionReset   },  /* Connection reset by peer */
-    { ENOBUFS,         osl_Pipe_E_NoBufferSpace     },  /* No buffer space available */
-    { ETIMEDOUT,       osl_Pipe_E_TimedOut          },  /* Connection timed out */
-    { ECONNREFUSED,    osl_Pipe_E_ConnectionRefused },  /* Connection refused */
-    { -1,              osl_Pipe_E_invalidError      }
+    { ECONNABORTED,	   osl_Pipe_E_ConnectionAbort 	},	/* Software caused connection abort */
+    { ECONNRESET,	   osl_Pipe_E_ConnectionReset 	},	/* Connection reset by peer */
+    { ENOBUFS,		   osl_Pipe_E_NoBufferSpace 	},	/* No buffer space available */
+    { ETIMEDOUT,	   osl_Pipe_E_TimedOut 			},	/* Connection timed out */
+    { ECONNREFUSED,	   osl_Pipe_E_ConnectionRefused	},	/* Connection refused */
+    { -1,		   	   osl_Pipe_E_invalidError 		}
 };
 
 
@@ -100,8 +100,8 @@ static oslPipeError osl_PipeErrorFromNative(int nativeType)
 
 
 /* macros */
-#define ERROR_TO_NATIVE(x)      osl_NativeFromPipeError(x)
-#define ERROR_FROM_NATIVE(y)    osl_PipeErrorFromNative(y)
+#define ERROR_TO_NATIVE(x)		osl_NativeFromPipeError(x)
+#define ERROR_FROM_NATIVE(y)	osl_PipeErrorFromNative(y)
 
 
 /*****************************************************************************/
@@ -162,10 +162,10 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
                        oslSecurity Security)
 {
     int    Flags;
-    size_t     len;
+    size_t	   len;
     struct sockaddr_un addr;
 
-    sal_Char     name[PATH_MAX + 1];
+    sal_Char  	 name[PATH_MAX + 1];
     oslPipe  pPipe;
 
     if (access(PIPEDEFAULTPATH, R_OK|W_OK) == 0)
@@ -260,7 +260,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
             return NULL;
         }
 
-        /*  Only give access to all if no security handle was specified, otherwise security
+        /*	Only give access to all if no security handle was specified, otherwise security
             depends on umask */
 
         if ( !Security )
@@ -272,7 +272,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
         if ( listen(pPipe->m_Socket, 5) < 0 )
         {
             OSL_TRACE("osl_createPipe failed to listen. Errno: %d; %s\n",errno,strerror(errno));
-            unlink(name);   /* remove filesystem entry */
+            unlink(name);	/* remove filesystem entry */
             close (pPipe->m_Socket);
             __osl_destroyPipeImpl(pPipe);
             return NULL;
@@ -322,7 +322,7 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
 {
     int nRet;
 #if defined(LINUX)
-    size_t     len;
+    size_t	   len;
     struct sockaddr_un addr;
     int fd;
 #endif
diff --git a/sal/osl/unx/process.c b/sal/osl/unx/process.c
index 5a94380f0020..0c85bf074d71 100644
--- a/sal/osl/unx/process.c
+++ b/sal/osl/unx/process.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@
 
 #if defined(SOLARIS)
   // The procfs may only be used without LFS in 32bits.
-# ifdef _FILE_OFFSET_BITS
+# ifdef _FILE_OFFSET_BITS     
 #   undef   _FILE_OFFSET_BITS
 # endif
 #endif
@@ -97,13 +97,13 @@ typedef struct {
     const sal_Char*  m_pszDir;
     sal_Char*        m_pszEnv[MAX_ENVS + 1];
     uid_t            m_uid;
-    gid_t            m_gid;
-    sal_Char*        m_name;
+    gid_t 		     m_gid;
+    sal_Char* 		 m_name;
     oslCondition     m_started;
     oslProcessImpl*  m_pProcImpl;
-    oslFileHandle    *m_pInputWrite;
-    oslFileHandle    *m_pOutputRead;
-    oslFileHandle    *m_pErrorRead;
+    oslFileHandle	 *m_pInputWrite;
+    oslFileHandle	 *m_pOutputRead;
+    oslFileHandle	 *m_pErrorRead;
 } ProcessData;
 
 typedef struct _oslPipeImpl {
@@ -129,12 +129,12 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
                                                 oslFileHandle *pOutputRead,
                                                 oslFileHandle *pErrorRead );
 
-
+                                                
 oslProcessError SAL_CALL osl_searchPath_impl(
-    const sal_Char* pszName,
-    const sal_Char* pszPath,
-    sal_Char Separator,
-    sal_Char *pszBuffer,
+    const sal_Char* pszName, 
+    const sal_Char* pszPath, 
+    sal_Char Separator, 
+    sal_Char *pszBuffer, 
     sal_uInt32 Max);
 
 
@@ -157,7 +157,7 @@ oslProcessError SAL_CALL osl_searchPath_impl(const sal_Char* pszName, const sal_
     sal_Char *pchr;
 
     path[0] = '\0';
-
+    
     OSL_ASSERT(pszName != NULL);
 
     if ( pszName == 0 )
@@ -193,7 +193,7 @@ oslProcessError SAL_CALL osl_searchPath_impl(const sal_Char* pszName, const sal_
             if (access(path, 0) == 0)
             {
                 char szRealPathBuf[PATH_MAX] = "";
-
+                
                 if( NULL == realpath(path, szRealPathBuf) || (strlen(szRealPathBuf) >= (sal_uInt32)Max))
                     return osl_Process_E_Unknown;
 
@@ -220,22 +220,22 @@ oslProcessError SAL_CALL osl_searchPath_impl(const sal_Char* pszName, const sal_
 /**********************************************
  sendFdPipe
  *********************************************/
-
+ 
 static sal_Bool sendFdPipe(int PipeFD, int SocketFD)
 {
     sal_Bool bRet = sal_False;
 
-    struct iovec    iov[1];
-    struct msghdr   msg;
-    char            buf[2]; /* send_fd()/recv_fd() 2-byte protocol */
+    struct iovec	iov[1];
+    struct msghdr	msg;
+    char			buf[2];	/* send_fd()/recv_fd() 2-byte protocol */
     int nSend;
     int RetCode=0;
-
+    
 #if defined(IOCHANNEL_TRANSFER_BSD)
 
     OSL_TRACE("IOCHANNEL_TRANSFER_BSD send");
 /*      OSL_TRACE("sending fd %i\n",SocketFD); */
-
+    
     iov[0].iov_base = buf;
     iov[0].iov_len  = sizeof(buf);
     msg.msg_iov     = iov;
@@ -243,13 +243,13 @@ static sal_Bool sendFdPipe(int PipeFD, int SocketFD)
     msg.msg_name    = NULL;
     msg.msg_namelen = 0;
 
-    msg.msg_accrights    = (caddr_t) &SocketFD; /* addr of descriptor */
-    msg.msg_accrightslen = sizeof(int);     /* pass 1 descriptor */
-    buf[1] = 0;                             /* zero status means OK */
-    buf[0] = 0;                             /* null byte flag to recv_fd() */
-
+    msg.msg_accrights    = (caddr_t) &SocketFD;	/* addr of descriptor */
+    msg.msg_accrightslen = sizeof(int);		/* pass 1 descriptor */
+    buf[1] = 0;								/* zero status means OK */
+    buf[0] = 0;								/* null byte flag to recv_fd() */
+        
 #else
-
+    
     struct cmsghdr* cmptr = (struct cmsghdr*)malloc(CONTROLLEN);
 
     OSL_TRACE("!!!!!! IOCHANNEL_TRANSFER_BSD_RENO send");
@@ -270,7 +270,7 @@ static sal_Bool sendFdPipe(int PipeFD, int SocketFD)
     memcpy(CMSG_DATA(cmptr), &SocketFD, sizeof(int));
 
 #endif
-
+    
     if ( ( nSend = sendmsg(PipeFD, &msg, 0) ) > 0 )
     {
         bRet = sal_True;
@@ -290,9 +290,9 @@ static sal_Bool sendFdPipe(int PipeFD, int SocketFD)
     }
     else
     {
-        OSL_TRACE("sendFdPipe : resource wasn't received\n");
-    }
-
+        OSL_TRACE("sendFdPipe : resource wasn't received\n");        
+    }    
+    
 #if defined(IOCHANNEL_TRANSFER_BSD_RENO)
     free(cmptr);
 #endif
@@ -303,7 +303,7 @@ static sal_Bool sendFdPipe(int PipeFD, int SocketFD)
 /**********************************************
  receiveFdPipe
  *********************************************/
-
+ 
 static oslSocket receiveFdPipe(int PipeFD)
 {
     oslSocket pSocket = 0;
@@ -316,9 +316,9 @@ static oslSocket receiveFdPipe(int PipeFD)
 /*      char *ptr; */
 
 #if defined(IOCHANNEL_TRANSFER_BSD)
-
+    
     OSL_TRACE("IOCHANNEL_TRANSFER_BSD receive\n");
-
+    
     iov[0].iov_base = buffer;
     iov[0].iov_len = sizeof(buffer);
     msghdr.msg_name = NULL;
@@ -326,13 +326,13 @@ static oslSocket receiveFdPipe(int PipeFD)
     msghdr.msg_iov = iov;
     msghdr.msg_iovlen = 1;
     msghdr.msg_accrights = (caddr_t) &newfd; /* addr of descriptor   */
-    msghdr.msg_accrightslen = sizeof(int);   /* receive 1 descriptor */
-
+    msghdr.msg_accrightslen = sizeof(int);	 /* receive 1 descriptor */
+    
 #else
     struct cmsghdr* cmptr = (struct cmsghdr*)malloc(CONTROLLEN);
 
     OSL_TRACE(" !!!! IOCHANNEL_TRANSFER_BSD_RENO receive");
-
+    
     iov[0].iov_base = buffer;
     iov[0].iov_len = sizeof(buffer);
     msghdr.msg_name = NULL;
@@ -344,10 +344,10 @@ static oslSocket receiveFdPipe(int PipeFD)
     msghdr.msg_controllen = CONTROLLEN;
 
 #endif
-
+    
 
 #if defined(IOCHANNEL_TRANSFER_BSD)
-
+    
     if ( ( nRead = recvmsg(PipeFD, &msghdr, 0) ) > 0 )
     {
         OSL_TRACE("receiveFdPipe : received '%i' bytes\n",nRead);
@@ -365,11 +365,11 @@ static oslSocket receiveFdPipe(int PipeFD)
     {
         OSL_TRACE("receiveFdPipe : receiving failed (%s)",strerror(errno));
     }
-
+    
     if ( newfd >= 0 )
     {
         pSocket = __osl_createSocketImpl(newfd);
-        nRetCode=1;
+        nRetCode=1;        
         OSL_TRACE("received fd %i\n",newfd);
     }
 
@@ -386,7 +386,7 @@ static oslSocket receiveFdPipe(int PipeFD)
 /**********************************************
  osl_sendResourcePipe
  *********************************************/
-
+ 
 sal_Bool osl_sendResourcePipe(oslPipe pPipe, oslSocket pSocket)
 {
     sal_Bool bRet = sal_False;
@@ -404,7 +404,7 @@ sal_Bool osl_sendResourcePipe(oslPipe pPipe, oslSocket pSocket)
 /**********************************************
  osl_receiveResourcePipe
  *********************************************/
-
+ 
 oslSocket osl_receiveResourcePipe(oslPipe pPipe)
 {
     oslSocket pSocket=0;
@@ -434,7 +434,7 @@ static void ChildStatusProc(void *pData)
     int   channel[2];
     ProcessData  data;
     ProcessData *pdata;
-    int     stdOutput[2] = { -1, -1 }, stdInput[2] = { -1, -1 }, stdError[2] = { -1, -1 };
+    int		stdOutput[2] = { -1, -1 }, stdInput[2] = { -1, -1 }, stdError[2] = { -1, -1 };
 
     pdata = (ProcessData *)pData;
 
@@ -472,7 +472,7 @@ static void ChildStatusProc(void *pData)
 
         if ((data.m_uid != (uid_t)-1) && ((data.m_uid != getuid()) || (data.m_gid != getgid())))
         {
-            OSL_ASSERT(geteuid() == 0);     /* must be root */
+            OSL_ASSERT(geteuid() == 0);		/* must be root */
 
             if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))
                 OSL_TRACE("Failed to change uid and guid, errno=%d (%s)\n", errno, strerror(errno));
@@ -502,7 +502,7 @@ static void ChildStatusProc(void *pData)
             }
 
             OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]);
-
+     
             /* Connect std IO to pipe ends */
 
             /* Write end of stdInput not used in child process */
@@ -541,7 +541,7 @@ static void ChildStatusProc(void *pData)
         OSL_TRACE("Failed to exec, errno=%d (%s)\n", errno, strerror(errno));
 
         OSL_TRACE("ChildStatusProc : starting '%s' failed",data.m_pszArgs[0]);
-
+        
         /* if we reach here, something went wrong */
         nWrote = write(channel[1], &errno, sizeof(errno));
         if (nWrote != sizeof(errno))
@@ -574,7 +574,7 @@ static void ChildStatusProc(void *pData)
 
         if ((pid > 0) && (i == 0))
         {
-            pid_t   child_pid;
+            pid_t	child_pid;
             osl_acquireMutex(ChildListMutex);
 
             pdata->m_pProcImpl->m_pid = pid;
@@ -585,17 +585,17 @@ static void ChildStatusProc(void *pData)
 
             if ( pdata->m_pInputWrite )
                 *(pdata->m_pInputWrite) = osl_createFileHandleFromFD( stdInput[1] );
-
+                
             if ( pdata->m_pOutputRead )
                 *(pdata->m_pOutputRead) = osl_createFileHandleFromFD( stdOutput[0] );
-
+                
             if ( pdata->m_pErrorRead )
                 *(pdata->m_pErrorRead) = osl_createFileHandleFromFD( stdError[0] );
 
             osl_releaseMutex(ChildListMutex);
 
             osl_setCondition(pdata->m_started);
-
+            
             do
             {
                 child_pid = waitpid(pid, &status, 0);
@@ -605,14 +605,14 @@ static void ChildStatusProc(void *pData)
             {
                 OSL_TRACE("Failed to wait for child process, errno=%d (%s)\n", errno, strerror(errno));
 
-                /*
+                /* 
                 We got an other error than EINTR. Anyway we have to wake up the
                 waiting thread under any circumstances */
 
                 child_pid = pid;
             }
 
-
+            
             if ( child_pid > 0 )
             {
                 oslProcessImpl* pChild;
@@ -642,7 +642,7 @@ static void ChildStatusProc(void *pData)
         }
         else
         {
-            OSL_TRACE("ChildStatusProc : starting '%s' failed",data.m_pszArgs[0]);
+            OSL_TRACE("ChildStatusProc : starting '%s' failed",data.m_pszArgs[0]);            
             OSL_TRACE("Failed to launch child process, child reports errno=%d (%s)\n", status, strerror(status));
 
             /* Close pipe ends */
@@ -680,7 +680,7 @@ static void ChildStatusProc(void *pData)
 /**********************************************
  osl_executeProcess_WithRedirectedIO
  *********************************************/
-
+ 
 oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
                                             rtl_uString *ustrImageName,
                                             rtl_uString *ustrArguments[],
@@ -691,9 +691,9 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
                                             rtl_uString *ustrEnvironment[],
                                             sal_uInt32   nEnvironmentVars,
                                             oslProcess *pProcess,
-                                            oslFileHandle   *pInputWrite,
-                                            oslFileHandle   *pOutputRead,
-                                            oslFileHandle   *pErrorRead
+                                            oslFileHandle	*pInputWrite,
+                                            oslFileHandle	*pOutputRead,
+                                            oslFileHandle	*pErrorRead
                                             )
 {
 
@@ -702,7 +702,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
     sal_Char** pArguments=0;
     sal_Char** pEnvironment=0;
     unsigned int idx;
-
+    
     char szImagePath[PATH_MAX] = "";
     char szWorkDir[PATH_MAX] = "";
 
@@ -802,7 +802,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
 /**********************************************
  osl_executeProcess
  *********************************************/
-
+ 
 oslProcessError SAL_CALL osl_executeProcess(
                                             rtl_uString *ustrImageName,
                                             rtl_uString *ustrArguments[],
@@ -834,7 +834,7 @@ oslProcessError SAL_CALL osl_executeProcess(
 /**********************************************
  osl_psz_executeProcess
  *********************************************/
-
+ 
 oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
                                                 sal_Char *pszArguments[],
                                                 oslProcessOption Options,
@@ -842,9 +842,9 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
                                                 sal_Char *pszDirectory,
                                                 sal_Char *pszEnvironments[],
                                                 oslProcess *pProcess,
-                                                oslFileHandle   *pInputWrite,
-                                                oslFileHandle   *pOutputRead,
-                                                oslFileHandle   *pErrorRead
+                                                oslFileHandle	*pInputWrite,
+                                                oslFileHandle	*pOutputRead,
+                                                oslFileHandle	*pErrorRead
                                                 )
 {
     int     i;
@@ -853,7 +853,7 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
     oslThread hThread;
 
     path[0] = '\0';
-
+    
     memset(&Data,0,sizeof(ProcessData));
     Data.m_pInputWrite = pInputWrite;
     Data.m_pOutputRead = pOutputRead;
@@ -959,7 +959,7 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
 /**********************************************
  osl_terminateProcess
  *********************************************/
-
+ 
 oslProcessError SAL_CALL osl_terminateProcess(oslProcess Process)
 {
     if (Process == NULL)
@@ -986,7 +986,7 @@ oslProcessError SAL_CALL osl_terminateProcess(oslProcess Process)
 /**********************************************
  osl_getProcess
  *********************************************/
-
+ 
 oslProcess SAL_CALL osl_getProcess(oslProcessIdentifier Ident)
 {
     oslProcessImpl *pProcImpl;
@@ -1040,7 +1040,7 @@ oslProcess SAL_CALL osl_getProcess(oslProcessIdentifier Ident)
 /**********************************************
  osl_freeProcessHandle
  *********************************************/
-
+ 
 void SAL_CALL osl_freeProcessHandle(oslProcess Process)
 {
     if (Process != NULL)
@@ -1124,10 +1124,10 @@ struct osl_procStat
     char sigignore[24];       /* ignored signals */
     char sigcatch[24];        /* catched signals */
 /*#else*/
-/*  long long signal;*/
-/*  long long blocked;*/
-/*  long long sigignore;*/
-/*  long long sigcatch;*/
+/*	long long signal;*/
+/*	long long blocked;*/
+/*	long long sigignore;*/
+/*	long long sigcatch;*/
 /*#endif */
     unsigned long wchan;      /* 'channel' the process is waiting in */
     unsigned long nswap;      /* ? */
@@ -1154,7 +1154,7 @@ struct osl_procStat
 /**********************************************
  osl_getProcStat
  *********************************************/
-
+ 
 sal_Bool osl_getProcStat(pid_t pid, struct osl_procStat* procstat)
 {
     int fd = 0;
@@ -1207,7 +1207,7 @@ sal_Bool osl_getProcStat(pid_t pid, struct osl_procStat* procstat)
 /**********************************************
  osl_getProcStatus
  *********************************************/
-
+ 
 sal_Bool osl_getProcStatus(pid_t pid, struct osl_procStat* procstat)
 {
     int fd = 0;
@@ -1225,7 +1225,7 @@ sal_Bool osl_getProcStatus(pid_t pid, struct osl_procStat* procstat)
 
         close(fd);
 
-        /*      printf("\n\n%s\n\n",prstatusbuf);*/
+        /*		printf("\n\n%s\n\n",prstatusbuf);*/
 
         if (!bRet)
             return sal_False;
@@ -1279,7 +1279,7 @@ sal_Bool osl_getProcStatus(pid_t pid, struct osl_procStat* procstat)
 /**********************************************
  osl_getProcessInfo
  *********************************************/
-
+ 
 oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData Fields, oslProcessInfo* pInfo)
 {
     pid_t   pid;
@@ -1412,7 +1412,7 @@ oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData F
                 pInfo->UserTime.Nanosec   = procstat.utime - (userseconds * hz);
                 pInfo->SystemTime.Seconds = systemseconds;
                 pInfo->SystemTime.Nanosec = procstat.stime - (systemseconds * hz);
-
+    
                 pInfo->Fields |= osl_Process_CPUTIMES;
             }
 
@@ -1445,39 +1445,39 @@ oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData F
 static int is_timeout(const struct timeval* tend)
 {
     struct timeval tcurrent;
-    gettimeofday(&tcurrent, NULL);
+    gettimeofday(&tcurrent, NULL);				
     return (tcurrent.tv_sec >= tend->tv_sec);
 }
 
 /**********************************************
- kill(pid, 0) is usefull for checking if a
- process is still alive, but remember that
+ kill(pid, 0) is usefull for checking if a 
+ process is still alive, but remember that 
  kill even returns 0 if the process is already
  a zombie.
  *********************************************/
-
+ 
 static int is_process_dead(pid_t pid)
-{
+{		
     return ((-1 == kill(pid, 0)) && (ESRCH == errno));
 }
 
 /**********************************************
  osl_joinProcessWithTimeout
  *********************************************/
-
+ 
 oslProcessError SAL_CALL osl_joinProcessWithTimeout(oslProcess Process, const TimeValue* pTimeout)
 {
     oslProcessImpl* pChild    = ChildList;
     oslProcessError osl_error = osl_Process_E_None;
-
+        
     OSL_PRECOND(Process, "osl_joinProcess: Invalid parameter");
     OSL_ASSERT(ChildListMutex);
-
+    
     if (NULL == Process || 0 == ChildListMutex)
         return osl_Process_E_Unknown;
-
+                     
     osl_acquireMutex(ChildListMutex);
-
+    
     /* check if process is a child of ours */
     while (pChild != NULL)
     {
@@ -1488,33 +1488,33 @@ oslProcessError SAL_CALL osl_joinProcessWithTimeout(oslProcess Process, const Ti
     }
 
     osl_releaseMutex(ChildListMutex);
-
+        
     if (pChild != NULL)
     {
         oslConditionResult cond_res = osl_waitCondition(pChild->m_terminated, pTimeout);
-
+        
         if (osl_cond_result_timeout == cond_res)
             osl_error = osl_Process_E_TimedOut;
         else if (osl_cond_result_ok != cond_res)
-            osl_error = osl_Process_E_Unknown;
+            osl_error = osl_Process_E_Unknown;		    
     }
     else /* alien process; StatusThread will not be able
                to set the condition terminated */
     {
         pid_t pid = ((oslProcessImpl*)Process)->m_pid;
-
+        
         if (pTimeout)
         {
             int timeout = 0;
-            struct timeval tend;
-
-            gettimeofday(&tend, NULL);
-
-            tend.tv_sec += pTimeout->Seconds;
-
+            struct timeval tend;		
+                
+            gettimeofday(&tend, NULL);									
+            
+            tend.tv_sec += pTimeout->Seconds;			
+                                                
             while (!is_process_dead(pid) && ((timeout = is_timeout(&tend)) == 0))
                 sleep(1);
-
+                
             if (timeout)
                 osl_error = osl_Process_E_TimedOut;
         }
@@ -1522,9 +1522,9 @@ oslProcessError SAL_CALL osl_joinProcessWithTimeout(oslProcess Process, const Ti
         {
             while (!is_process_dead(pid))
                 sleep(1);
-        }
+        }				
     }
-    return osl_error;
+    return osl_error;	
 }
 
 /**********************************************
@@ -1533,7 +1533,7 @@ oslProcessError SAL_CALL osl_joinProcessWithTimeout(oslProcess Process, const Ti
 
 oslProcessError SAL_CALL osl_joinProcess(oslProcess Process)
 {
-    return osl_joinProcessWithTimeout(Process, NULL);
+    return osl_joinProcessWithTimeout(Process, NULL);        
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 941a87776519..3301f263ec11 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -432,15 +432,15 @@ oslProcessError SAL_CALL osl_getProcessWorkingDir(rtl_uString **ppustrWorkingDir
 {
     oslProcessError result = osl_Process_E_Unknown;
     char buffer[PATH_MAX];
-
+    
     OSL_PRECOND(ppustrWorkingDir, "osl_getProcessWorkingDir(): Invalid parameter");
 
     if (getcwd (buffer, sizeof(buffer)) != 0)
     {
         rtl_uString* ustrTmp = 0;
 
-        rtl_string2UString(
-            &ustrTmp,
+        rtl_string2UString( 
+            &ustrTmp, 
             buffer, strlen(buffer), osl_getThreadTextEncoding(),
             OSTRING_TO_OUSTRING_CVTFLAGS);
         if (ustrTmp != 0)
diff --git a/sal/osl/unx/procimpl.h b/sal/osl/unx/procimpl.h
index dd1d965b7146..3b30116d149a 100644
--- a/sal/osl/unx/procimpl.h
+++ b/sal/osl/unx/procimpl.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,9 +37,9 @@ extern "C" {
 #endif
 
 typedef struct _oslProcessImpl {
-    pid_t                   m_pid;
-    oslCondition            m_terminated;
-    int                     m_status;
+    pid_t 		 			m_pid;
+    oslCondition     		m_terminated;
+    int		  				m_status;
     struct _oslProcessImpl* m_pnext;
 } oslProcessImpl;
 
diff --git a/sal/osl/unx/profile.c b/sal/osl/unx/profile.c
index 3d3edb9ab79e..d9accbac6b8b 100644
--- a/sal/osl/unx/profile.c
+++ b/sal/osl/unx/profile.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,11 +44,11 @@
 #define ENTRIES_ADD     3
 
 
-#define STR_INI_EXTENSION   "rc"
-#define STR_INI_METAHOME    "?~"
-#define STR_INI_METASYS     "?$"
-#define STR_INI_METACFG     "?^"
-#define STR_INI_METAINS     "?#"
+#define STR_INI_EXTENSION	"rc"
+#define STR_INI_METAHOME	"?~"
+#define STR_INI_METASYS		"?$"
+#define STR_INI_METACFG		"?^"
+#define STR_INI_METAINS		"?#"
 
 #define STR_INI_BOOLYES     "yes"
 #define STR_INI_BOOLON      "on"
@@ -57,24 +57,24 @@
 #define STR_INI_BOOLOFF     "off"
 #define STR_INI_BOOLZERO    "0"
 
-#define FLG_USER            0x00FF
-#define FLG_AUTOOPEN        0x0100
-#define FLG_MODIFIED        0x0200
+#define FLG_USER			0x00FF
+#define FLG_AUTOOPEN		0x0100
+#define FLG_MODIFIED		0x0200
 
 #define SVERSION_LOCATION   STR_INI_METACFG
 #define SVERSION_FALLBACK   STR_INI_METASYS
-#define SVERSION_NAME       "sversion"
+#define SVERSION_NAME   	"sversion"
 #define SVERSION_SECTION    "Versions"
 #define SVERSION_SOFFICE    "StarOffice"
 #define SVERSION_PROFILE    "sofficerc"
 #define SVERSION_OPTION     "userid:"
-#define SVERSION_DIRS       { "bin", "program" }
+#define SVERSION_DIRS		{ "bin", "program" }
 #define SVERSION_USER       "user"
 
-#define DEFAULT_PMODE   (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
+#define DEFAULT_PMODE 	(S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
 
-#define _BUILD_STR_(n)  # n
-#define BUILD_STR(n)    _BUILD_STR_(n)
+#define _BUILD_STR_(n)	# n
+#define BUILD_STR(n)	_BUILD_STR_(n)
 
 
 /*#define DEBUG_OSL_PROFILE*/
@@ -93,9 +93,9 @@ typedef enum _osl_TLockMode
 
 typedef struct _osl_TFile
 {
-    int     m_Handle;
-    sal_Char*   m_pReadPtr;
-    sal_Char    m_ReadBuf[512];
+    int		m_Handle;
+    sal_Char*	m_pReadPtr;
+    sal_Char	m_ReadBuf[512];
     sal_Char*   m_pWriteBuf;
     sal_uInt32  m_nWriteBufLen;
     sal_uInt32  m_nWriteBufFree;
@@ -103,19 +103,19 @@ typedef struct _osl_TFile
 
 typedef struct _osl_TProfileEntry
 {
-    sal_uInt32  m_Line;
+    sal_uInt32	m_Line;
     sal_uInt32  m_Offset;
     sal_uInt32  m_Len;
 } osl_TProfileEntry;
 
 typedef struct _osl_TProfileSection
 {
-    sal_uInt32  m_Line;
-    sal_uInt32  m_Offset;
-    sal_uInt32  m_Len;
-    sal_uInt32  m_NoEntries;
-    sal_uInt32  m_MaxEntries;
-    osl_TProfileEntry*  m_Entries;
+    sal_uInt32	m_Line;
+    sal_uInt32	m_Offset;
+    sal_uInt32	m_Len;
+    sal_uInt32	m_NoEntries;
+    sal_uInt32	m_MaxEntries;
+    osl_TProfileEntry*	m_Entries;
 } osl_TProfileSection;
 
 
@@ -124,15 +124,15 @@ typedef struct _osl_TProfileSection
 */
 typedef struct _osl_TProfileImpl
 {
-    sal_uInt32  m_Flags;
-    osl_TFile*  m_pFile;
-    osl_TStamp  m_Stamp;
+    sal_uInt32	m_Flags;
+    osl_TFile*	m_pFile;
+    osl_TStamp	m_Stamp;
     sal_Char    m_FileName[PATH_MAX + 1];
-    sal_uInt32  m_NoLines;
+    sal_uInt32	m_NoLines;
     sal_uInt32  m_MaxLines;
     sal_uInt32  m_NoSections;
     sal_uInt32  m_MaxSections;
-    sal_Char**  m_Lines;
+    sal_Char**	m_Lines;
     osl_TProfileSection* m_Sections;
     pthread_mutex_t m_AccessLock;
     sal_Bool    m_bIsValid;
@@ -195,7 +195,7 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *ustrProfileName, oslProfileOpti
 
 static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, oslProfileOption Flags)
 {
-    osl_TFile*        pFile;
+    osl_TFile*		  pFile;
     osl_TProfileImpl* pProfile;
     sal_Char          Filename[PATH_MAX];
     sal_Bool bRet = sal_False;
@@ -620,7 +620,7 @@ sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile,
                               sal_uInt32 FirstId, const sal_Char* Strings[],
                               sal_uInt32 Default)
 {
-    sal_uInt32  i;
+    sal_uInt32	i;
     sal_Char    Line[256];
     Line[0] = '\0';
 
@@ -652,11 +652,11 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
                                const sal_Char* pszSection, const sal_Char* pszEntry,
                                const sal_Char* pszString)
 {
-    sal_uInt32  i;
+    sal_uInt32	i;
     sal_Bool bRet = sal_False;
     sal_uInt32    NoEntry;
     sal_Char* pStr;
-    sal_Char*       Line = 0;
+    sal_Char*		Line = 0;
     osl_TProfileSection* pSec;
     osl_TProfileImpl*    pProfile = 0;
     osl_TProfileImpl*    pTmpProfile = 0;
@@ -1208,7 +1208,7 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
 #else
     /* Mac OSX will return ENOTSUP for webdav drives so we should ignore it */
     if ( fcntl(pFile->m_Handle, F_SETLKW, &lock) == -1 && errno != ENOTSUP )
-#endif  /* MACOSX */
+#endif  /* MACOSX */ 
     {
         OSL_TRACE("fcntl returned -1 (%s)\n",strerror(errno));
 #ifdef TRACE_OSL_PROFILE
@@ -1826,8 +1826,8 @@ static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, const sal_Char
 {
 static  sal_uInt32    Sect = 0;
         sal_uInt32    i, n;
-        sal_uInt32  Len;
-        const sal_Char* pStr;
+        sal_uInt32	Len;
+        const sal_Char*	pStr;
         osl_TProfileSection* pSec=0;
 
     Len = strlen(Section);
@@ -1874,9 +1874,9 @@ static  sal_uInt32    Sect = 0;
 
 static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile)
 {
-    sal_uInt32  i;
-    sal_Char*       pStr;
-    sal_Char*       pChar;
+    sal_uInt32	i;
+    sal_Char*		pStr;
+    sal_Char*		pChar;
 
     sal_Char* pLine;
     sal_Char* bWasAdded = NULL;
diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx
index 1ed1363500e9..dd12d2f1ce0f 100644
--- a/sal/osl/unx/salinit.cxx
+++ b/sal/osl/unx/salinit.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/osl/unx/secimpl.h b/sal/osl/unx/secimpl.h
index 8ff03722c934..c3a2b676aeb6 100644
--- a/sal/osl/unx/secimpl.h
+++ b/sal/osl/unx/secimpl.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,6 +44,6 @@ typedef struct _oslSecurityImpl {
 }
 #endif
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/security.c b/sal/osl/unx/security.c
index 1dc1b519d191..8cda0876eefb 100644
--- a/sal/osl/unx/security.c
+++ b/sal/osl/unx/security.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,7 +48,7 @@
 
 #include "secimpl.h"
 
-static oslSecurityError SAL_CALL
+static oslSecurityError SAL_CALL 
 osl_psz_loginUser(const sal_Char* pszUserName, const sal_Char* pszPasswd,
                   oslSecurity* pSecurity);
 sal_Bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax);
@@ -187,7 +187,7 @@ oslSecurityError SAL_CALL osl_loginUser(
 }
 
 
-static oslSecurityError SAL_CALL
+static oslSecurityError SAL_CALL 
 osl_psz_loginUser(const sal_Char* pszUserName, const sal_Char* pszPasswd,
                oslSecurity* pSecurity)
 {
@@ -209,7 +209,7 @@ oslSecurityError SAL_CALL osl_loginUserOnFileServer(
     (void) strPasswd; /* unused */
     (void) strFileServer; /* unused */
     (void) pSecurity; /* unused */
-    return osl_Security_E_UserUnknown;
+    return osl_Security_E_UserUnknown;   
 }
 
 
@@ -219,13 +219,13 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **ustrIdent
     sal_Char pszIdent[1024];
 
     pszIdent[0] = '\0';
-
+    
     bRet = osl_psz_getUserIdent(Security,pszIdent,sizeof(pszIdent));
 
     rtl_string2UString( ustrIdent, pszIdent, rtl_str_getLength( pszIdent ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
     OSL_ASSERT(*ustrIdent != NULL);
-
-    return bRet;
+    
+    return bRet;    
 }
 
 
@@ -254,17 +254,17 @@ sal_Bool SAL_CALL osl_getUserName(oslSecurity Security, rtl_uString **ustrName)
     sal_Char pszName[1024];
 
     pszName[0] = '\0';
-
+    
     bRet = osl_psz_getUserName(Security,pszName,sizeof(pszName));
-
+    
     rtl_string2UString( ustrName, pszName, rtl_str_getLength( pszName ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
     OSL_ASSERT(*ustrName != NULL);
-
+    
     return bRet;
 }
 
 
-
+ 
 static sal_Bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32  nMax)
 {
     oslSecurityImpl *pSecImpl = (oslSecurityImpl *)Security;
@@ -283,7 +283,7 @@ sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirect
     sal_Char pszDirectory[PATH_MAX];
 
     pszDirectory[0] = '\0';
-
+    
     bRet = osl_psz_getHomeDir(Security,pszDirectory,sizeof(pszDirectory));
 
     if ( bRet == sal_True )
@@ -292,7 +292,7 @@ sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirect
         OSL_ASSERT(*pustrDirectory != NULL);
         osl_getFileURLFromSystemPath( *pustrDirectory, pustrDirectory );
     }
-
+    
     return bRet;
 }
 
@@ -309,7 +309,7 @@ static sal_Bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszD
     {
         sal_Char *pStr = NULL;
 #ifdef SOLARIS
-        char    buffer[8192];
+        char	buffer[8192];
 
         struct passwd pwd;
         struct passwd *ppwd;
@@ -345,7 +345,7 @@ sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDire
     sal_Char pszDirectory[PATH_MAX];
 
     pszDirectory[0] = '\0';
-
+    
     bRet = osl_psz_getConfigDir(Security,pszDirectory,sizeof(pszDirectory));
 
     if ( bRet == sal_True )
@@ -363,7 +363,7 @@ sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDire
 static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax)
 {
     sal_Char *pStr = getenv("XDG_CONFIG_HOME");
-
+    
     if ((pStr == NULL) || (strlen(pStr) == 0) ||
         (access(pStr, 0) != 0))
         return (osl_psz_getHomeDir(Security, pszDirectory, nMax));
@@ -380,7 +380,7 @@ static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* ps
  * as soon as we can bumb the baseline to Tiger (for NSApplicationSupportDirectory) and have
  * support for Objective-C in the build environment
  */
-
+ 
 #define MACOSX_CONFIG_DIR "/Library/Application Support"
 static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax)
 {
@@ -389,7 +389,7 @@ static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* ps
         strcat( pszDirectory, MACOSX_CONFIG_DIR );
         return sal_True;
     }
-
+    
     return sal_False;
 }
 
diff --git a/sal/osl/unx/semaphor.c b/sal/osl/unx/semaphor.c
index b34395eb44ce..9763adf65fb8 100644
--- a/sal/osl/unx/semaphor.c
+++ b/sal/osl/unx/semaphor.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,20 +46,20 @@
 /* osl_createSemaphore  */
 /*****************************************************************************/
 
-oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount)
+oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount) 
 {
     int ret = 0;
     oslSemaphore Semaphore;
 
     Semaphore= malloc(sizeof(sem_t));
 
-    OSL_ASSERT(Semaphore);      /* ptr valid? */
+    OSL_ASSERT(Semaphore);		/* ptr valid? */
 
     if ( Semaphore == 0 )
     {
         return 0;
     }
-
+    
     /* unnamed semaphore, not shared between processes */
 
        ret= sem_init((sem_t*)Semaphore, 0, initialCount);
@@ -67,14 +67,14 @@ oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount)
     /* create failed? */
     if (ret != 0)
     {
-        OSL_TRACE("osl_createSemaphore failed. Errno: %d; %s\n",
-                  errno,
+        OSL_TRACE("osl_createSemaphore failed. Errno: %d; %s\n", 
+                  errno, 
                   strerror(errno));
 
         free(Semaphore);
         Semaphore = NULL;
     }
-
+    
     return Semaphore;
 }
 
@@ -83,7 +83,7 @@ oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount)
 /*****************************************************************************/
 void SAL_CALL osl_destroySemaphore(oslSemaphore Semaphore)
 {
-    if(Semaphore)           /* ptr valid? */
+    if(Semaphore)			/* ptr valid? */
     {
         sem_destroy((sem_t*)Semaphore);
         free(Semaphore);
@@ -94,10 +94,10 @@ void SAL_CALL osl_destroySemaphore(oslSemaphore Semaphore)
 /* osl_acquireSemaphore  */
 /*****************************************************************************/
 sal_Bool SAL_CALL osl_acquireSemaphore(oslSemaphore Semaphore) {
+    
+    OSL_ASSERT(Semaphore != 0);	/* abort in debug mode */
 
-    OSL_ASSERT(Semaphore != 0); /* abort in debug mode */
-
-    if (Semaphore != 0)     /* be tolerant in release mode */
+    if (Semaphore != 0)		/* be tolerant in release mode */
     {
         return (sem_wait((sem_t*)Semaphore) == 0);
     }
@@ -109,9 +109,9 @@ sal_Bool SAL_CALL osl_acquireSemaphore(oslSemaphore Semaphore) {
 /* osl_tryToAcquireSemaphore  */
 /*****************************************************************************/
 sal_Bool SAL_CALL osl_tryToAcquireSemaphore(oslSemaphore Semaphore) {
-
-    OSL_ASSERT(Semaphore != 0); /* abort in debug mode */
-    if (Semaphore != 0)     /* be tolerant in release mode */
+    
+    OSL_ASSERT(Semaphore != 0);	/* abort in debug mode */
+    if (Semaphore != 0)		/* be tolerant in release mode */
     {
         return (sem_trywait((sem_t*)Semaphore) == 0);
     }
@@ -124,9 +124,9 @@ sal_Bool SAL_CALL osl_tryToAcquireSemaphore(oslSemaphore Semaphore) {
 /*****************************************************************************/
 sal_Bool SAL_CALL osl_releaseSemaphore(oslSemaphore Semaphore) {
 
-    OSL_ASSERT(Semaphore != 0);     /* abort in debug mode */
-
-    if (Semaphore != 0)         /* be tolerant in release mode */
+    OSL_ASSERT(Semaphore != 0);		/* abort in debug mode */
+    
+    if (Semaphore != 0)			/* be tolerant in release mode */
     {
         return (sem_post((sem_t*)Semaphore) == 0);
     }
@@ -164,15 +164,15 @@ typedef struct _osl_TSemImpl
 /*****************************************************************************/
 /* osl_createSemaphore  */
 /*****************************************************************************/
-oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount)
+oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount) 
 {
     union semun arg;
-
+    
     oslSemaphore Semaphore;
     osl_TSemImpl* pSem;
 
     Semaphore= malloc(sizeof(osl_TSemImpl));
-    OSL_POSTCOND(Semaphore, "malloc failed\n");     /* ptr valid? */
+    OSL_POSTCOND(Semaphore, "malloc failed\n");		/* ptr valid? */
 
     pSem= (osl_TSemImpl*)Semaphore;
 
@@ -185,8 +185,8 @@ oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount)
     /* create failed? */
     if (pSem->m_Id < 0)
     {
-        OSL_TRACE("osl_createSemaphore failed (semget). Errno: %d; %s\n",
-               errno,
+        OSL_TRACE("osl_createSemaphore failed (semget). Errno: %d; %s\n", 
+               errno, 
                strerror(errno));
 
         free(Semaphore);
@@ -199,20 +199,20 @@ oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount)
 
     if(semctl(pSem->m_Id, 0, SETVAL, arg) < 0)
     {
-        OSL_TRACE("osl_createSemaphore failed (semctl(SETVAL)). Errno: %d; %s\n",
-               errno,
+        OSL_TRACE("osl_createSemaphore failed (semctl(SETVAL)). Errno: %d; %s\n", 
+               errno, 
                strerror(errno));
 
         if(semctl(pSem->m_Id, 0, IPC_RMID, arg) < 0)
         {
             OSL_TRACE("semctl(IPC_RMID) failed. Errno: %d; %s\n", errno, strerror(errno));
         }
-
+        
         free(Semaphore);
         return 0;
     }
-
-
+    
+    
     return Semaphore;
 }
 
@@ -220,8 +220,8 @@ oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount)
 /* osl_destroySemaphore  */
 /*****************************************************************************/
 void SAL_CALL osl_destroySemaphore(oslSemaphore Semaphore) {
-
-    if(Semaphore)           /* ptr valid? */
+    
+    if(Semaphore)			/* ptr valid? */
     {
         union semun arg;
 
@@ -230,11 +230,11 @@ void SAL_CALL osl_destroySemaphore(oslSemaphore Semaphore) {
         if(semctl(pSem->m_Id, 0, IPC_RMID, arg) < 0)
 
         {
-            OSL_TRACE("osl_destroySemaphore failed. (semctl(IPC_RMID)). Errno: %d; %s\n",
-                   errno,
-                   strerror(errno));
+            OSL_TRACE("osl_destroySemaphore failed. (semctl(IPC_RMID)). Errno: %d; %s\n", 
+                   errno, 
+                   strerror(errno));			
         }
-
+        
         free(Semaphore);
     }
 }
@@ -243,12 +243,12 @@ void SAL_CALL osl_destroySemaphore(oslSemaphore Semaphore) {
 /* osl_acquireSemaphore  */
 /*****************************************************************************/
 sal_Bool SAL_CALL osl_acquireSemaphore(oslSemaphore Semaphore) {
-
+    
     /* abort in debug mode */
-    OSL_PRECOND(Semaphore != 0, "Semaphore not created\n");
+    OSL_PRECOND(Semaphore != 0, "Semaphore not created\n");	
 
 
-    if (Semaphore != 0)     /* be tolerant in release mode */
+    if (Semaphore != 0)		/* be tolerant in release mode */
     {
         struct sembuf op;
         osl_TSemImpl* pSem= (osl_TSemImpl*)Semaphore;
@@ -268,11 +268,11 @@ sal_Bool SAL_CALL osl_acquireSemaphore(oslSemaphore Semaphore) {
 /* osl_tryToAcquireSemaphore  */
 /*****************************************************************************/
 sal_Bool SAL_CALL osl_tryToAcquireSemaphore(oslSemaphore Semaphore) {
-
+    
     /* abort in debug mode */
-    OSL_PRECOND(Semaphore != 0, "Semaphore not created\n");
+    OSL_PRECOND(Semaphore != 0, "Semaphore not created\n");	
 
-    if (Semaphore != 0)     /* be tolerant in release mode */
+    if (Semaphore != 0)		/* be tolerant in release mode */
     {
         struct sembuf op;
         osl_TSemImpl* pSem= (osl_TSemImpl*)Semaphore;
@@ -290,13 +290,13 @@ sal_Bool SAL_CALL osl_tryToAcquireSemaphore(oslSemaphore Semaphore) {
 /*****************************************************************************/
 /* osl_releaseSemaphore  */
 /*****************************************************************************/
-sal_Bool SAL_CALL osl_releaseSemaphore(oslSemaphore Semaphore)
+sal_Bool SAL_CALL osl_releaseSemaphore(oslSemaphore Semaphore) 
 {
 
     /* abort in debug mode */
-    OSL_PRECOND(Semaphore != 0, "Semaphore not created\n");
-
-    if (Semaphore != 0)         /* be tolerant in release mode */
+    OSL_PRECOND(Semaphore != 0, "Semaphore not created\n");	
+    
+    if (Semaphore != 0)			/* be tolerant in release mode */
     {
         struct sembuf op;
         osl_TSemImpl* pSem= (osl_TSemImpl*)Semaphore;
diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c
index 8f42e97048fa..add11b59e5c6 100644
--- a/sal/osl/unx/signal.c
+++ b/sal/osl/unx/signal.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -75,22 +75,22 @@
 
 #include "file_path_helper.h"
 
-#define ACT_IGNORE  1
-#define ACT_EXIT    2
-#define ACT_SYSTEM  3
-#define ACT_HIDE    4
+#define ACT_IGNORE	1
+#define ACT_EXIT	2
+#define ACT_SYSTEM	3
+#define ACT_HIDE	4
 #ifdef SAL_ENABLE_CRASH_REPORT
-#    define ACT_ABORT   5
+#    define ACT_ABORT	5
 #else
 #    define ACT_ABORT   ACT_SYSTEM
 #endif
 
-#define MAX_PATH_LEN    2048
+#define MAX_PATH_LEN	2048
 
 typedef struct _oslSignalHandlerImpl
 {
     oslSignalHandlerFunction      Handler;
-    void*                         pData;
+    void*			        	  pData;
     struct _oslSignalHandlerImpl* pNext;
 } oslSignalHandlerImpl;
 
@@ -109,14 +109,14 @@ static struct SignalAction
     { SIGTRAP,   ACT_ABORT,  NULL },    /* trace trap (not reset when caught) */
 #if ( SIGIOT != SIGABRT )
     { SIGIOT,    ACT_ABORT,  NULL },    /* IOT instruction */
-#endif
+#endif 
     { SIGABRT,   ACT_ABORT,  NULL },    /* used by abort, replace SIGIOT in the future */
-#ifdef SIGEMT
+#ifdef SIGEMT	
     { SIGEMT,    ACT_SYSTEM,  NULL },    /* EMT instruction */
 /* changed from ACT_ABORT to ACT_SYSTEM to remove handler*/
 /* SIGEMT may also be used by the profiler - so it is probably not a good
 plan to have the new handler use this signal*/
-#endif
+#endif	
     { SIGFPE,    ACT_ABORT,  NULL },    /* floating point exception */
     { SIGKILL,   ACT_SYSTEM, NULL },    /* kill (cannot be caught or ignored) */
     { SIGBUS,    ACT_ABORT,  NULL },    /* bus error */
@@ -146,7 +146,7 @@ plan to have the new handler use this signal*/
     { SIGVTALRM, ACT_EXIT,   NULL },    /* virtual timer expired */
     { SIGPROF,   ACT_SYSTEM,   NULL },    /* profiling timer expired */
 /*Change from ACT_EXIT to ACT_SYSTEM for SIGPROF is so that profiling signals do
-not get taken by the new handler - the new handler does not pass on context
+not get taken by the new handler - the new handler does not pass on context 
 information which causes 'collect' to crash. This is a way of avoiding
 what looks like a bug in the new handler*/
     { SIGXCPU,   ACT_ABORT,  NULL },    /* exceeded cpu limit */
@@ -155,12 +155,12 @@ what looks like a bug in the new handler*/
 const int NoSignals = sizeof(Signals) / sizeof(struct SignalAction);
 
 static sal_Bool               bErrorReportingEnabled = sal_True;
-static sal_Bool               bInitSignal = sal_False;
-static oslMutex               SignalListMutex;
+static sal_Bool  			  bInitSignal = sal_False;
+static oslMutex 			  SignalListMutex;
 static oslSignalHandlerImpl*  SignalList;
-static sal_Bool               bDoHardKill = sal_False;
-static sal_Bool               bSetSEGVHandler = sal_False;
-static sal_Bool               bSetWINCHHandler = sal_False;
+static sal_Bool				  bDoHardKill = sal_False;
+static sal_Bool				  bSetSEGVHandler = sal_False;
+static sal_Bool				  bSetWINCHHandler = sal_False;
 static sal_Bool               bSetILLHandler = sal_False;
 
 static void SignalHandlerFunction(int);
@@ -209,8 +209,8 @@ static sal_Bool InitSignal()
 
     if (is_soffice_Impl())
     {
-        sal_uInt32  argi;
-        sal_uInt32  argc;
+        sal_uInt32	argi;
+        sal_uInt32	argc;
         rtl_uString *ustrCommandArg = 0;
 
         argc = osl_getCommandArgCount();
@@ -233,10 +233,10 @@ static sal_Bool InitSignal()
 
         // WORKAROUND FOR SEGV HANDLER CONFLICT
         //
-        // the java jit needs SIGSEGV for proper work
+        // the java jit needs SIGSEGV for proper work 
         // and we need SIGSEGV for the office crashguard
         //
-        // TEMPORARY SOLUTION:
+        // TEMPORARY SOLUTION: 
         //   the office sets the signal handler during startup
         //   java can than overwrite it, if needed
         bSetSEGVHandler = sal_True;
@@ -256,7 +256,7 @@ static sal_Bool InitSignal()
     sigfillset(&(act.sa_mask));
 
     /* Initialize the rest of the signals */
-    for (i = 0; i < NoSignals; i++)
+    for (i = 0; i < NoSignals; i++) 
     {
         /* hack: stomcatd is attaching JavaVM wich dont work with an sigaction(SEGV) */
         if ((bSetSEGVHandler || Signals[i].Signal != SIGSEGV)
@@ -309,7 +309,7 @@ static sal_Bool DeInitSignal()
     sigemptyset(&(act.sa_mask));
 
     /* Initialize the rest of the signals */
-    for (i = NoSignals - 1; i >= 0; i--)
+    for (i = NoSignals - 1; i >= 0; i--) 
         if (Signals[i].Action != ACT_SYSTEM)
         {
             act.sa_handler = Signals[i].Handler;
@@ -325,12 +325,12 @@ static sal_Bool DeInitSignal()
 #if defined (SAL_ENABLE_CRASH_REPORT) && defined(INCLUDE_BACKTRACE)
 
 /*****************************************************************************/
-/* Generate MD5 checksum    */
+/* Generate MD5 checksum	*/
 /*****************************************************************************/
 
 static sal_uInt32 calc_md5_checksum( const char *filename, sal_uInt8 *pChecksum, sal_uInt32 nChecksumLen )
 {
-    sal_uInt32  nBytesProcessed = 0;
+    sal_uInt32	nBytesProcessed = 0;
 
     FILE *fp = fopen( filename, "r" );
 
@@ -340,14 +340,14 @@ static sal_uInt32 calc_md5_checksum( const char *filename, sal_uInt8 *pChecksum,
 
         if ( digest )
         {
-            size_t          nBytesRead;
-            sal_uInt8       buffer[4096];
-            rtlDigestError  error = rtl_Digest_E_None;
+            size_t			nBytesRead;
+            sal_uInt8		buffer[4096];
+            rtlDigestError	error = rtl_Digest_E_None;
 
             while ( rtl_Digest_E_None == error &&
                 0 != (nBytesRead = fread( buffer, 1, sizeof(buffer), fp )) )
             {
-                error = rtl_digest_updateMD5( digest, buffer, nBytesRead );
+                error = rtl_digest_updateMD5( digest, buffer, nBytesRead );	
                 nBytesProcessed += nBytesRead;
             }
 
@@ -369,7 +369,7 @@ static sal_uInt32 calc_md5_checksum( const char *filename, sal_uInt8 *pChecksum,
 }
 
 /*****************************************************************************/
-/* Call crash reporter  */
+/* Call crash reporter	*/
 /*****************************************************************************/
 
 /* Helper function to encode and write a string to a stream */
@@ -405,7 +405,7 @@ static int fputs_xml( const char *string, FILE *stream )
 
 /* Create intermediate files and run crash reporter */
 
-#define REPORTENV_PARAM     "-crashreportenv:"
+#define REPORTENV_PARAM		"-crashreportenv:"
 
 #if defined SAL_ENABLE_CRASH_REPORT && defined INCLUDE_BACKTRACE && \
     defined LINUX
@@ -444,7 +444,7 @@ callback(struct dl_phdr_info *info, size_t size, void *data)
         dynamic_entry* entry = (dynamic_entry*)data;
 
         if (strcmp(dsoname, "") == 0)
-        {
+        { 
             snprintf(buffer, sizeof(buffer), "/proc/%d/exe", getpid());
             if ((len = readlink(buffer, exe, PATH_MAX)) != -1)
             {
@@ -463,14 +463,14 @@ callback(struct dl_phdr_info *info, size_t size, void *data)
 }
 
 /* Get the location of the .dynamic section offset for the given elf file.
- * i.e. same as the "Offset" value shown for DYNAMIC from readelf -l foo
+ * i.e. same as the "Offset" value shown for DYNAMIC from readelf -l foo 
  *
  * We want to know this value so that if the binaries have been modifed
- * by prelink then we can still process the call stack on server side
+ * by prelink then we can still process the call stack on server side 
  * by comparing this value to that of an "un-prelinked but known to be
- * otherwise equivalent" version of those binaries and adjust the call
- * stack addresses by the differences between .dynamic addresses so as
- * to be able to map the prelinked addresses back to the unprelinked
+ * otherwise equivalent" version of those binaries and adjust the call 
+ * stack addresses by the differences between .dynamic addresses so as 
+ * to be able to map the prelinked addresses back to the unprelinked 
  * addresses
  *
  * cmc@openoffice.org
@@ -493,17 +493,17 @@ static int ReportCrash( int Signal )
 {
 #ifdef SAL_ENABLE_CRASH_REPORT
     static sal_Bool bCrashReporterExecuted = sal_False;
-    sal_Bool        bAutoCrashReport = sal_False;
+    sal_Bool		bAutoCrashReport = sal_False;
 
-    sal_uInt32  argi;
-    sal_uInt32  argc;
+    sal_uInt32	argi;
+    sal_uInt32	argc;
     rtl_uString *ustrCommandArg = NULL;
-
+    
     if ( !bErrorReportingEnabled )
         return -1;
 
     argc = osl_getCommandArgCount();
-
+    
     for ( argi = 0; argi < argc; argi++ )
     {
         if ( osl_Process_E_None == osl_getCommandArg( argi, &ustrCommandArg ) )
@@ -517,23 +517,23 @@ static int ReportCrash( int Signal )
             {
                 bAutoCrashReport = sal_True;
             }
-            else if ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength(
-                rtl_uString_getStr( ustrCommandArg ), rtl_uString_getLength( ustrCommandArg ),
-                REPORTENV_PARAM, strlen(REPORTENV_PARAM) )
+            else if ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( 
+                rtl_uString_getStr( ustrCommandArg ), rtl_uString_getLength( ustrCommandArg ), 
+                REPORTENV_PARAM, strlen(REPORTENV_PARAM) ) 
                 )
             {
-                rtl_uString *ustrEnvironment = NULL;
+                rtl_uString	*ustrEnvironment = NULL;
                 rtl_String *strEnv = NULL;
 
                 rtl_uString_newFromStr( &ustrEnvironment, rtl_uString_getStr( ustrCommandArg ) + strlen(REPORTENV_PARAM) );
 
                 if ( ustrEnvironment )
                 {
-                    rtl_uString2String(
-                        &strEnv,
-                        rtl_uString_getStr( ustrEnvironment ), rtl_uString_getLength( ustrEnvironment ),
-                        osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS
-                        );
+                    rtl_uString2String( 
+                        &strEnv, 
+                        rtl_uString_getStr( ustrEnvironment ), rtl_uString_getLength( ustrEnvironment ), 
+                        osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS 
+                        ); 
 
                     if ( strEnv )
                     {
@@ -548,16 +548,16 @@ static int ReportCrash( int Signal )
 
         }
     }
-
+    
     if ( ustrCommandArg )
         rtl_uString_release( ustrCommandArg );
-
+    
     if ( !bCrashReporterExecuted )
     {
         int i;
         /* struct sigaction act; */
 
-        for (i = 0; i < NoSignals; i++)
+        for (i = 0; i < NoSignals; i++) 
         {
             if (Signals[i].Signal == Signal && Signals[i].Action == ACT_ABORT )
             {
@@ -595,7 +595,7 @@ static int ReportCrash( int Signal )
                 xmlout = fdopen( fdxml , "w" );
                 stackout = fdopen( fdstk , "w" );
                 checksumout = fdopen( fdchksum, "w" );
-
+            
                 pXMLTempName = szXMLTempNameBuffer;
                 pStackTempName = szStackTempNameBuffer;
                 pChecksumTempName = szChecksumTempNameBuffer;
@@ -649,9 +649,9 @@ static int ReportCrash( int Signal )
                             /* create checksum of library on stack */
                             if ( dli_fname )
                             {
-                                sal_uInt8   checksum[RTL_DIGEST_LENGTH_MD5];
+                                sal_uInt8	checksum[RTL_DIGEST_LENGTH_MD5];
 
-                                sal_uInt32 nBytesProcessed = calc_md5_checksum(
+                                sal_uInt32 nBytesProcessed = calc_md5_checksum( 
                                     dl_info.dli_fname, checksum, sizeof(checksum) );
                                 if ( nBytesProcessed )
                                 {
@@ -697,12 +697,12 @@ static int ReportCrash( int Signal )
                             {
                                 fputs( " (", stackout );
                                 fputs_xml( dl_info.dli_sname, stackout );
-                                fprintf( stackout, " + 0x%" SAL_PRI_PTRDIFFT "x)",
+                                fprintf( stackout, " + 0x%" SAL_PRI_PTRDIFFT "x)", 
                                     (char*)stackframes[iFrame] - (char*)dl_info.dli_saddr );
 
                                 fputs( " ordinal=\"", xmlout );
                                 fputs_xml( dl_info.dli_sname, xmlout );
-                                fprintf( xmlout, "+0x%" SAL_PRI_PTRDIFFT "x\"",
+                                fprintf( xmlout, "+0x%" SAL_PRI_PTRDIFFT "x\"", 
                                     (char *)stackframes[iFrame] - (char *)dl_info.dli_saddr );
                             }
 
@@ -726,7 +726,7 @@ static int ReportCrash( int Signal )
                     pStackTempName = NULL;
                     pChecksumTempName = NULL;
                 }
-
+                
                 if ( stackout )
                     fclose( stackout );
                 if ( xmlout )
@@ -760,19 +760,19 @@ static int ReportCrash( int Signal )
                     snprintf( szShellCmd, SAL_N_ELEMENTS(szShellCmd),
                         "%s -p %d -s %d -xml %s -chksum %s -stack %s -noui%s",
                         rtl_string_getStr(crashrep_path_system),
-                        getpid(),
-                        Signal,
-                        pXMLTempName,
-                        pChecksumTempName,
+                        getpid(), 
+                        Signal, 
+                        pXMLTempName, 
+                        pChecksumTempName, 
                         pStackTempName,
                         bAutoCrashReport ? " -send" : "" );
 #elif defined INCLUDE_BACKTRACE && defined SOLARIS
                     snprintf( szShellCmd, SAL_N_ELEMENTS(szShellCmd),
                         "%s -p %d -s %d -xml %s -chksum %s -noui%s",
                         rtl_string_getStr(crashrep_path_system),
-                        getpid(),
-                        Signal,
-                        pXMLTempName,
+                        getpid(), 
+                        Signal, 
+                        pXMLTempName, 
                         pChecksumTempName,
                         bAutoCrashReport ? " -send" : "" );
 #else
@@ -794,7 +794,7 @@ static int ReportCrash( int Signal )
 
                 if ( pChecksumTempName )
                     unlink( pChecksumTempName );
-
+                    
                 if ( -1 != ret )
                 {
                     bCrashReporterExecuted = sal_True;
@@ -802,13 +802,13 @@ static int ReportCrash( int Signal )
                 }
                 else
                     return -1;
-
+                
             }
         }
-
+        
         return 0;
     }
-
+    
     return 1;
 #else /* defined SAL_ENABLE_CRASH_REPORT */
     /* the utility crash_report is not build, so do the same as when
@@ -845,13 +845,13 @@ static oslSignalAction CallSignalHandler(oslSignalInfo *pInfo)
 
     while (pHandler != NULL)
     {
-        if ((Action = pHandler->Handler(pHandler->pData, pInfo))
+        if ((Action = pHandler->Handler(pHandler->pData, pInfo)) 
             != osl_Signal_ActCallNextHdl)
             break;
 
         pHandler = pHandler->pNext;
     }
-
+    
     return Action;
 }
 
@@ -860,7 +860,7 @@ void CallSystemHandler(int Signal)
     int i;
     struct sigaction act;
 
-    for (i = 0; i < NoSignals; i++)
+    for (i = 0; i < NoSignals; i++) 
     {
         if (Signals[i].Signal == Signal)
             break;
@@ -875,12 +875,12 @@ void CallSystemHandler(int Signal)
         {
             switch (Signals[i].Action)
             {
-                case ACT_EXIT:      /* terminate */
+                case ACT_EXIT:		/* terminate */
                     /* prevent dumping core on exit() */
                     _exit(255);
                     break;
 
-                case ACT_ABORT:     /* terminate witch core dump */
+                case ACT_ABORT:		/* terminate witch core dump */
                     ReportCrash( Signal );
                     act.sa_handler = SIG_DFL;
                     act.sa_flags   = 0;
@@ -890,10 +890,10 @@ void CallSystemHandler(int Signal)
                     abort();
                     break;
 
-                case ACT_IGNORE:    /* ignore */
+                case ACT_IGNORE:	/* ignore */
                     break;
 
-                default:            /* should never happen */
+                default:			/* should never happen */
                     OSL_ASSERT(0);
             }
         }
@@ -904,11 +904,11 @@ void CallSystemHandler(int Signal)
 
 
 /*****************************************************************************/
-/* SignalHandlerFunction    */
+/* SignalHandlerFunction	*/
 /*****************************************************************************/
 void SignalHandlerFunction(int Signal)
 {
-    oslSignalInfo    Info;
+    oslSignalInfo	 Info;
     struct sigaction act;
 
     Info.UserSignal = Signal;
@@ -924,35 +924,35 @@ void SignalHandlerFunction(int Signal)
         case SIGABRT:
 #endif
             Info.Signal = osl_Signal_AccessViolation;
-            break;
+            break; 
 
         case -1:
             Info.Signal = osl_Signal_IntegerDivideByZero;
-            break;
+            break; 
 
         case SIGFPE:
             Info.Signal = osl_Signal_FloatDivideByZero;
-            break;
+            break; 
 
         case SIGINT:
         case SIGTERM:
     case SIGQUIT:
     case SIGHUP:
             Info.Signal = osl_Signal_Terminate;
-            break;
+            break; 
 
         default:
             Info.Signal = osl_Signal_System;
-            break;
+            break; 
     }
 
     ReportCrash( Signal );
-
+    
     /* Portal Demo HACK !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
     if (bDoHardKill && (Info.Signal == osl_Signal_AccessViolation))
         _exit(255);
     /* Portal Demo HACK !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-
+    
 
     switch (CallSignalHandler(&Info))
     {
@@ -1003,7 +1003,7 @@ oslSignalHandler SAL_CALL osl_addSignalHandler(oslSignalHandlerFunction Handler,
         pHandler->pData   = pData;
 
         osl_acquireMutex(SignalListMutex);
-
+    
         pHandler->pNext = SignalList;
         SignalList      = pHandler;
 
@@ -1011,7 +1011,7 @@ oslSignalHandler SAL_CALL osl_addSignalHandler(oslSignalHandlerFunction Handler,
 
         return (pHandler);
     }
-
+    
     return (NULL);
 }
 
diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c
index e736e7c52e85..90fe9eb553de 100644
--- a/sal/osl/unx/socket.c
+++ b/sal/osl/unx/socket.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@
 #endif
 
 #if defined(LINUX) || defined(NETBSD) || defined ( FREEBSD ) || \
-    defined (MACOSX) || defined (OPENBSD)
+	defined (MACOSX) || defined (OPENBSD)
 #include <sys/poll.h>
 #define HAVE_POLL_H
 #endif /* HAVE_POLL_H */
@@ -95,8 +95,8 @@
 /* conceal the struct sockaddr from the eyes of the user. */
 
 
-#define OSL_INVALID_SOCKET      -1
-#define OSL_SOCKET_ERROR        -1
+#define OSL_INVALID_SOCKET		-1
+#define OSL_SOCKET_ERROR		-1
 
 
 /* Buffer size for gethostbyname */
@@ -108,9 +108,9 @@
 
 /* map */
 static unsigned long FamilyMap[]= {
-    AF_INET,                    /* osl_Socket_FamilyInet    */
-    AF_IPX,                     /* osl_Socket_FamilyIpx     */
-    0                           /* osl_Socket_FamilyInvalid */
+    AF_INET,					/* osl_Socket_FamilyInet    */
+    AF_IPX,						/* osl_Socket_FamilyIpx     */
+    0							/* osl_Socket_FamilyInvalid */
 };
 
 /* reverse map */
@@ -130,7 +130,7 @@ static oslAddrFamily osl_AddrFamilyFromNative(sal_uInt32 nativeType)
 
 /* macros */
 #define FAMILY_FROM_NATIVE(y) osl_AddrFamilyFromNative(y)
-#define FAMILY_TO_NATIVE(x) (short)FamilyMap[x]
+#define FAMILY_TO_NATIVE(x)	(short)FamilyMap[x]
 
 /*****************************************************************************/
 /* enum oslProtocol */
@@ -138,11 +138,11 @@ static oslAddrFamily osl_AddrFamilyFromNative(sal_uInt32 nativeType)
 
 /* map */
 static sal_uInt32 ProtocolMap[]= {
-    0,                          /* osl_Socket_ProtocolIp      */
-    NSPROTO_IPX,                /* osl_Socket_ProtocolIpx     */
-    NSPROTO_SPX,                /* osl_Socket_ProtocolSpx     */
-    NSPROTO_SPXII,              /* osl_Socket_ProtocolSpxII   */
-    0                           /* osl_Socket_ProtocolInvalid */
+    0,							/* osl_Socket_ProtocolIp	  */
+    NSPROTO_IPX,				/* osl_Socket_ProtocolIpx	  */
+    NSPROTO_SPX,				/* osl_Socket_ProtocolSpx	  */
+    NSPROTO_SPXII,				/* osl_Socket_ProtocolSpxII   */
+    0							/* osl_Socket_ProtocolInvalid */
 };
 
 /* reverse map */
@@ -164,7 +164,7 @@ static oslProtocol osl_ProtocolFromNative(sal_uInt32 nativeType)
 
 /* macros */
 #define PROTOCOL_FROM_NATIVE(y) osl_ProtocolFromNative(y)
-#define PROTOCOL_TO_NATIVE(x)   ProtocolMap[x]
+#define PROTOCOL_TO_NATIVE(x)	ProtocolMap[x]
 
 
 /*****************************************************************************/
@@ -173,12 +173,12 @@ static oslProtocol osl_ProtocolFromNative(sal_uInt32 nativeType)
 
 /* map */
 static sal_uInt32 TypeMap[]= {
-    SOCK_STREAM,                /* osl_Socket_TypeStream    */
-    SOCK_DGRAM,                 /* osl_Socket_TypeDgram     */
-    SOCK_RAW,                   /* osl_Socket_TypeRaw       */
-    SOCK_RDM,                   /* osl_Socket_TypeRdm       */
-    SOCK_SEQPACKET,             /* osl_Socket_TypeSeqPacket */
-    0                           /* osl_Socket_TypeInvalid   */
+    SOCK_STREAM,				/* osl_Socket_TypeStream    */
+    SOCK_DGRAM,					/* osl_Socket_TypeDgram     */
+    SOCK_RAW,					/* osl_Socket_TypeRaw       */
+    SOCK_RDM,					/* osl_Socket_TypeRdm       */
+    SOCK_SEQPACKET,				/* osl_Socket_TypeSeqPacket */
+    0							/* osl_Socket_TypeInvalid   */
 };
 
 /* reverse map */
@@ -197,8 +197,8 @@ static oslSocketType osl_SocketTypeFromNative(sal_uInt32 nativeType)
 }
 
 /* macros */
-#define TYPE_TO_NATIVE(x)       TypeMap[x]
-#define TYPE_FROM_NATIVE(y)     osl_SocketTypeFromNative(y)
+#define TYPE_TO_NATIVE(x)		TypeMap[x]
+#define TYPE_FROM_NATIVE(y)		osl_SocketTypeFromNative(y)
 
 
 /*****************************************************************************/
@@ -207,25 +207,25 @@ static oslSocketType osl_SocketTypeFromNative(sal_uInt32 nativeType)
 
 /* map */
 static sal_uInt32 OptionMap[]= {
-    SO_DEBUG,                   /* osl_Socket_OptionDebug       */
-    SO_ACCEPTCONN,              /* osl_Socket_OptionAcceptConn  */
-    SO_REUSEADDR,               /* osl_Socket_OptionReuseAddr   */
-    SO_KEEPALIVE,               /* osl_Socket_OptionKeepAlive   */
-    SO_DONTROUTE,               /* osl_Socket_OptionDontRoute   */
-    SO_BROADCAST,               /* osl_Socket_OptionBroadcast   */
-    SO_USELOOPBACK,             /* osl_Socket_OptionUseLoopback */
-    SO_LINGER,                  /* osl_Socket_OptionLinger      */
-    SO_OOBINLINE,               /* osl_Socket_OptionOOBinLine   */
-    SO_SNDBUF,                  /* osl_Socket_OptionSndBuf      */
-    SO_RCVBUF,                  /* osl_Socket_OptionRcvBuf      */
-    SO_SNDLOWAT,                /* osl_Socket_OptionSndLowat    */
-    SO_RCVLOWAT,                /* osl_Socket_OptionRcvLowat    */
-    SO_SNDTIMEO,                /* osl_Socket_OptionSndTimeo    */
-    SO_RCVTIMEO,                /* osl_Socket_OptionRcvTimeo    */
-    SO_ERROR,                   /* osl_Socket_OptionError       */
-    SO_TYPE,                    /* osl_Socket_OptionType        */
-    TCP_NODELAY,                /* osl_Socket_OptionTcpNoDelay  */
-    0                           /* osl_Socket_OptionInvalid     */
+    SO_DEBUG,					/* osl_Socket_OptionDebug 		*/
+    SO_ACCEPTCONN,				/* osl_Socket_OptionAcceptConn  */
+    SO_REUSEADDR,				/* osl_Socket_OptionReuseAddr   */
+    SO_KEEPALIVE,				/* osl_Socket_OptionKeepAlive   */
+    SO_DONTROUTE,				/* osl_Socket_OptionDontRoute   */
+    SO_BROADCAST,				/* osl_Socket_OptionBroadcast   */
+    SO_USELOOPBACK,				/* osl_Socket_OptionUseLoopback */
+    SO_LINGER,					/* osl_Socket_OptionLinger		*/
+    SO_OOBINLINE,				/* osl_Socket_OptionOOBinLine   */
+    SO_SNDBUF,					/* osl_Socket_OptionSndBuf      */
+    SO_RCVBUF,					/* osl_Socket_OptionRcvBuf      */
+    SO_SNDLOWAT,				/* osl_Socket_OptionSndLowat    */
+    SO_RCVLOWAT,				/* osl_Socket_OptionRcvLowat    */
+    SO_SNDTIMEO,				/* osl_Socket_OptionSndTimeo    */
+    SO_RCVTIMEO,				/* osl_Socket_OptionRcvTimeo    */
+    SO_ERROR,					/* osl_Socket_OptionError       */
+    SO_TYPE,					/* osl_Socket_OptionType        */
+    TCP_NODELAY,				/* osl_Socket_OptionTcpNoDelay  */
+    0							/* osl_Socket_OptionInvalid     */
 };
 
 /* reverse map */
@@ -245,8 +245,8 @@ static oslSocketOption osl_SocketOptionFromNative(sal_uInt32 nativeType)
 }
 */
 /* macros */
-#define OPTION_TO_NATIVE(x)     OptionMap[x]
-#define OPTION_FROM_NATIVE(y)       osl_SocketOptionFromNative(y)
+#define OPTION_TO_NATIVE(x)		OptionMap[x]
+#define OPTION_FROM_NATIVE(y)		osl_SocketOptionFromNative(y)
 
 
 /*****************************************************************************/
@@ -254,9 +254,9 @@ static oslSocketOption osl_SocketOptionFromNative(sal_uInt32 nativeType)
 /*****************************************************************************/
 
 static sal_uInt32 OptionLevelMap[]= {
-    SOL_SOCKET,                 /* osl_Socket_LevelSocket  */
-    IPPROTO_TCP,                /* osl_Socket_LevelTcp     */
-    0                           /* osl_Socket_LevelInvalid */
+    SOL_SOCKET,					/* osl_Socket_LevelSocket  */
+    IPPROTO_TCP,				/* osl_Socket_LevelTcp     */
+    0							/* osl_Socket_LevelInvalid */
 };
 
 /* reverse map */
@@ -276,20 +276,20 @@ static oslSocketOptionLevel osl_SocketOptionLevelFromNative(sal_uInt32 nativeTyp
 }
 */
 /* macros */
-#define OPTION_LEVEL_TO_NATIVE(x)       OptionLevelMap[x]
-#define OPTION_LEVEL_FROM_NATIVE(y)     osl_SocketOptionLevelFromNative(y)
+#define OPTION_LEVEL_TO_NATIVE(x)		OptionLevelMap[x]
+#define OPTION_LEVEL_FROM_NATIVE(y)		osl_SocketOptionLevelFromNative(y)
 
 /*****************************************************************************/
 /* enum oslSocketMsgFlag */
 /*****************************************************************************/
 
 static sal_uInt32 SocketMsgFlagMap[]= {
-    0,                          /* osl_Socket_MsgNormal    */
-    MSG_OOB,                    /* osl_Socket_MsgOOB       */
-    MSG_PEEK,                   /* osl_Socket_MsgPeek      */
-    MSG_DONTROUTE,              /* osl_Socket_MsgDontRoute */
-    MSG_MAXIOVLEN,              /* osl_Socket_MsgMaxIOVLen */
-    0                           /* osl_Socket_MsgInvalid   */
+    0,							/* osl_Socket_MsgNormal    */
+    MSG_OOB,					/* osl_Socket_MsgOOB       */
+    MSG_PEEK,					/* osl_Socket_MsgPeek      */
+    MSG_DONTROUTE,				/* osl_Socket_MsgDontRoute */
+    MSG_MAXIOVLEN,				/* osl_Socket_MsgMaxIOVLen */
+    0							/* osl_Socket_MsgInvalid   */
 };
 
 /* reverse map */
@@ -310,8 +310,8 @@ static oslSocketMsgFlag osl_SocketMsgFlagFromNative(sal_uInt32 nativeType)
 */
 
 /* macros */
-#define MSG_FLAG_TO_NATIVE(x)       SocketMsgFlagMap[x]
-#define MSG_FLAG_FROM_NATIVE(y)     osl_SocketMsgFlagFromNative(y)
+#define MSG_FLAG_TO_NATIVE(x)		SocketMsgFlagMap[x]
+#define MSG_FLAG_FROM_NATIVE(y)		osl_SocketMsgFlagFromNative(y)
 
 
 /*****************************************************************************/
@@ -319,10 +319,10 @@ static oslSocketMsgFlag osl_SocketMsgFlagFromNative(sal_uInt32 nativeType)
 /*****************************************************************************/
 
 static sal_uInt32 SocketDirection[]= {
-    SD_RECEIVE,                 /* osl_Socket_DirRead      */
-    SD_SEND,                    /* osl_Socket_DirWrite     */
-    SD_BOTH,                    /* osl_Socket_DirReadWrite */
-    0                           /* osl_Socket_DirInvalid   */
+    SD_RECEIVE,					/* osl_Socket_DirRead      */
+    SD_SEND,					/* osl_Socket_DirWrite     */
+    SD_BOTH,					/* osl_Socket_DirReadWrite */
+    0							/* osl_Socket_DirInvalid   */
 };
 
 /* reverse map */
@@ -343,8 +343,8 @@ static oslSocketDirection osl_SocketDirectionFromNative(sal_uInt32 nativeType)
 */
 
 /* macros */
-#define DIRECTION_TO_NATIVE(x)      SocketDirection[x]
-#define DIRECTION_FROM_NATIVE(y)    osl_SocketDirectionFromNative(y)
+#define DIRECTION_TO_NATIVE(x)		SocketDirection[x]
+#define DIRECTION_FROM_NATIVE(y)	osl_SocketDirectionFromNative(y)
 
 /*****************************************************************************/
 /* enum oslSocketError */
@@ -355,40 +355,40 @@ static struct
     int            errcode;
     oslSocketError error;
 } SocketError[]= {
-    { 0,               osl_Socket_E_None              }, /* no error */
-    { ENOTSOCK,        osl_Socket_E_NotSocket         }, /* Socket operation on non-socket */
-    { EDESTADDRREQ,    osl_Socket_E_DestAddrReq       }, /* Destination address required */
-    { EMSGSIZE,        osl_Socket_E_MsgSize           }, /* Message too long */
-    { EPROTOTYPE,      osl_Socket_E_Prototype         }, /* Protocol wrong type for socket */
-    { ENOPROTOOPT,     osl_Socket_E_NoProtocol        }, /* Protocol not available */
+    { 0,			   osl_Socket_E_None 			  }, /* no error */
+    { ENOTSOCK,		   osl_Socket_E_NotSocket 		  }, /* Socket operation on non-socket */
+    { EDESTADDRREQ,	   osl_Socket_E_DestAddrReq 	  }, /* Destination address required */
+    { EMSGSIZE,		   osl_Socket_E_MsgSize 		  }, /* Message too long */
+    { EPROTOTYPE,	   osl_Socket_E_Prototype 		  }, /* Protocol wrong type for socket */
+    { ENOPROTOOPT,	   osl_Socket_E_NoProtocol 		  }, /* Protocol not available */
     { EPROTONOSUPPORT, osl_Socket_E_ProtocolNoSupport }, /* Protocol not supported */
-    { ESOCKTNOSUPPORT, osl_Socket_E_TypeNoSupport     }, /* Socket type not supported */
-    { EOPNOTSUPP,      osl_Socket_E_OpNotSupport      }, /* Operation not supported on socket */
-    { EPFNOSUPPORT,    osl_Socket_E_PfNoSupport       }, /* Protocol family not supported */
-    { EAFNOSUPPORT,    osl_Socket_E_AfNoSupport       }, /* Address family not supported by */
+    { ESOCKTNOSUPPORT, osl_Socket_E_TypeNoSupport 	  }, /* Socket type not supported */
+    { EOPNOTSUPP,	   osl_Socket_E_OpNotSupport 	  }, /* Operation not supported on socket */
+    { EPFNOSUPPORT,	   osl_Socket_E_PfNoSupport 	  }, /* Protocol family not supported */
+    { EAFNOSUPPORT,	   osl_Socket_E_AfNoSupport 	  }, /* Address family not supported by */
                                                             /* protocol family */
-    { EADDRINUSE,      osl_Socket_E_AddrInUse         }, /* Address already in use */
-    { EADDRNOTAVAIL,   osl_Socket_E_AddrNotAvail      }, /* Can't assign requested address */
-    { ENETDOWN,        osl_Socket_E_NetDown           }, /* Network is down */
-    { ENETUNREACH,     osl_Socket_E_NetUnreachable    }, /* Network is unreachable */
-    { ENETRESET,       osl_Socket_E_NetReset          }, /* Network dropped connection because */
+    { EADDRINUSE,	   osl_Socket_E_AddrInUse 		  }, /* Address already in use */
+    { EADDRNOTAVAIL,   osl_Socket_E_AddrNotAvail 	  }, /* Can't assign requested address */
+    { ENETDOWN,		   osl_Socket_E_NetDown 		  }, /* Network is down */
+    { ENETUNREACH,	   osl_Socket_E_NetUnreachable    }, /* Network is unreachable */
+    { ENETRESET,	   osl_Socket_E_NetReset 		  }, /* Network dropped connection because */
                                                              /* of reset */
-    { ECONNABORTED,    osl_Socket_E_ConnAborted       }, /* Software caused connection abort */
-    { ECONNRESET,      osl_Socket_E_ConnReset         }, /* Connection reset by peer */
-    { ENOBUFS,         osl_Socket_E_NoBufferSpace     }, /* No buffer space available */
-    { EISCONN,         osl_Socket_E_IsConnected       }, /* Socket is already connected */
-    { ENOTCONN,        osl_Socket_E_NotConnected      }, /* Socket is not connected */
-    { ESHUTDOWN,       osl_Socket_E_Shutdown          }, /* Can't send after socket shutdown */
-    { ETOOMANYREFS,    osl_Socket_E_TooManyRefs       }, /* Too many references: can't splice */
-    { ETIMEDOUT,       osl_Socket_E_TimedOut          }, /* Connection timed out */
-    { ECONNREFUSED,    osl_Socket_E_ConnRefused       }, /* Connection refused */
-    { EHOSTDOWN,       osl_Socket_E_HostDown          }, /* Host is down */
-    { EHOSTUNREACH,    osl_Socket_E_HostUnreachable   }, /* No route to host */
-    { EWOULDBLOCK,     osl_Socket_E_WouldBlock        }, /* call would block on non-blocking socket */
-    { EALREADY,        osl_Socket_E_Already           }, /* operation already in progress */
-    { EINPROGRESS,     osl_Socket_E_InProgress        }, /* operation now in progress */
-    { EAGAIN,          osl_Socket_E_WouldBlock        }, /* same as EWOULDBLOCK */
-    { -1,              osl_Socket_E_InvalidError      }
+    { ECONNABORTED,	   osl_Socket_E_ConnAborted 	  }, /* Software caused connection abort */
+    { ECONNRESET,	   osl_Socket_E_ConnReset 		  }, /* Connection reset by peer */
+    { ENOBUFS,		   osl_Socket_E_NoBufferSpace 	  }, /* No buffer space available */
+    { EISCONN,		   osl_Socket_E_IsConnected 	  }, /* Socket is already connected */
+    { ENOTCONN,		   osl_Socket_E_NotConnected 	  }, /* Socket is not connected */
+    { ESHUTDOWN,	   osl_Socket_E_Shutdown 		  }, /* Can't send after socket shutdown */
+    { ETOOMANYREFS,	   osl_Socket_E_TooManyRefs 	  }, /* Too many references: can't splice */
+    { ETIMEDOUT,	   osl_Socket_E_TimedOut 		  }, /* Connection timed out */
+    { ECONNREFUSED,	   osl_Socket_E_ConnRefused 	  }, /* Connection refused */
+    { EHOSTDOWN,	   osl_Socket_E_HostDown 		  }, /* Host is down */
+    { EHOSTUNREACH,	   osl_Socket_E_HostUnreachable   }, /* No route to host */
+    { EWOULDBLOCK,	   osl_Socket_E_WouldBlock 		  }, /* call would block on non-blocking socket */
+    { EALREADY,		   osl_Socket_E_Already 		  }, /* operation already in progress */
+    { EINPROGRESS,	   osl_Socket_E_InProgress 		  }, /* operation now in progress */
+    { EAGAIN,		   osl_Socket_E_WouldBlock 		  }, /* same as EWOULDBLOCK */
+    { -1,		   	   osl_Socket_E_InvalidError      }
 };
 
 /* map */
@@ -416,8 +416,8 @@ static oslSocketError osl_SocketErrorFromNative(int nativeType)
 }
 
 /* macros */
-#define ERROR_TO_NATIVE(x)      osl_NativeFromSocketError(x)
-#define ERROR_FROM_NATIVE(y)    osl_SocketErrorFromNative(y)
+#define ERROR_TO_NATIVE(x)		osl_NativeFromSocketError(x)
+#define ERROR_FROM_NATIVE(y)	osl_SocketErrorFromNative(y)
 
 /*****************************************************************************/
 /* local function prototypes */
@@ -452,7 +452,7 @@ sal_Int32 SAL_CALL osl_psz_getServicePort (
 oslSocketResult SAL_CALL osl_psz_getHostnameOfSocketAddr (
     oslSocketAddr Addr, sal_Char *pBuffer, sal_uInt32 BufferSize);
 
-oslSocketResult SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr (
+oslSocketResult	SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr (
     oslSocketAddr Addr, sal_Char *pBuffer, sal_uInt32 BufferSize);
 
 void SAL_CALL osl_psz_getLastSocketErrorDescription (
@@ -854,9 +854,9 @@ static sal_Bool  _osl_getDomainName (sal_Char *buffer, sal_Int32 bufsiz)
 
 static sal_Char* _osl_getFullQualifiedDomainName (const sal_Char *pHostName)
 {
-#   define DOMAINNAME_LENGTH 512
-    sal_uInt32          nLengthOfHostName;
-    static sal_uInt32   nLengthOfDomainName = 0;
+#	define DOMAINNAME_LENGTH 512
+    sal_uInt32 			nLengthOfHostName;
+    static sal_uInt32 	nLengthOfDomainName = 0;
     static sal_Char    *pDomainName = NULL;
 
     sal_Char  *pFullQualifiedName;
@@ -913,10 +913,10 @@ static sal_Char* _osl_getFullQualifiedDomainName (const sal_Char *pHostName)
         sal_Bool        bHostsAreEqual;
 
         /* buffer for calls to reentrant version of gethostbyname */
-        struct hostent  aHostByName, aQualifiedHostByName;
-        sal_Char        pHostBuffer[ MAX_HOSTBUFFER_SIZE ];
+        struct hostent 	aHostByName, aQualifiedHostByName;
+        sal_Char		pHostBuffer[ MAX_HOSTBUFFER_SIZE ];
         sal_Char        pQualifiedHostBuffer[ MAX_HOSTBUFFER_SIZE ];
-        int     nErrorNo;
+        int		nErrorNo;
 
         pHostBuffer[0] = '\0';
         pQualifiedHostBuffer[0] = '\0';
@@ -1166,7 +1166,7 @@ oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString *ustrHostname)
 oslHostAddr SAL_CALL osl_psz_createHostAddrByName (const sal_Char *pszHostname)
 {
     struct hostent *he;
-        oslHostAddr addr;
+        oslHostAddr	addr;
 
     static oslMutex mutex = NULL;
 
@@ -1516,7 +1516,7 @@ sal_Bool SAL_CALL osl_setInetPortOfSocketAddr(oslSocketAddr pAddr, sal_Int32 Por
 /*****************************************************************************/
 /* osl_getHostnameOfSocketAddr */
 /*****************************************************************************/
-oslSocketResult SAL_CALL osl_getHostnameOfSocketAddr(oslSocketAddr Addr, rtl_uString **ustrHostname)
+oslSocketResult	SAL_CALL osl_getHostnameOfSocketAddr(oslSocketAddr Addr, rtl_uString **ustrHostname)
 {
     oslSocketResult Result;
     sal_Char pszHostname[1024];
@@ -1553,7 +1553,7 @@ oslSocketResult SAL_CALL osl_psz_getHostnameOfSocketAddr(oslSocketAddr pAddr,
 /*****************************************************************************/
 /* osl_getDottedInetAddrOfSocketAddr */
 /*****************************************************************************/
-oslSocketResult SAL_CALL osl_getDottedInetAddrOfSocketAddr(oslSocketAddr Addr, rtl_uString **ustrDottedInetAddr)
+oslSocketResult	SAL_CALL osl_getDottedInetAddrOfSocketAddr(oslSocketAddr Addr, rtl_uString **ustrDottedInetAddr)
 {
     oslSocketResult Result;
     sal_Char pszDottedInetAddr[1024];
@@ -1568,7 +1568,7 @@ oslSocketResult SAL_CALL osl_getDottedInetAddrOfSocketAddr(oslSocketAddr Addr, r
 
 }
 
-oslSocketResult SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr(oslSocketAddr pAddr,
+oslSocketResult	SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr(oslSocketAddr pAddr,
                                                   sal_Char *pBuffer, sal_uInt32 BufferSize)
 {
     OSL_ASSERT(pAddr);
@@ -1592,11 +1592,11 @@ oslSocketResult SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr(oslSocketAddr pAd
 /*****************************************************************************/
 /* osl_createSocket  */
 /*****************************************************************************/
-oslSocket SAL_CALL osl_createSocket(oslAddrFamily   Family,
-                           oslSocketType    Type,
-                           oslProtocol      Protocol)
+oslSocket SAL_CALL osl_createSocket(oslAddrFamily	Family,
+                           oslSocketType	Type,
+                           oslProtocol		Protocol)
 {
-    int            Flags;
+    int 		   Flags;
     oslSocket pSocket;
 
     /* alloc memory */
@@ -1637,8 +1637,8 @@ oslSocket SAL_CALL osl_createSocket(oslAddrFamily   Family,
         }
 
 
-        pSocket->m_CloseCallback    = NULL;
-        pSocket->m_CallbackArg  = NULL;
+        pSocket->m_CloseCallback 	= NULL;
+        pSocket->m_CallbackArg	= NULL;
     }
 
     return pSocket;
@@ -1938,8 +1938,8 @@ oslSocketResult SAL_CALL osl_connectSocketTo(oslSocket pSocket,
     if (pTimeout)
     {
         /* divide milliseconds into seconds and microseconds */
-        tv.tv_sec=  pTimeout->Seconds;
-        tv.tv_usec= pTimeout->Nanosec / 1000L;
+        tv.tv_sec=	pTimeout->Seconds;
+        tv.tv_usec=	pTimeout->Nanosec / 1000L;
     }
 
     /* select */
@@ -2078,12 +2078,12 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket pSocket,
 
     }
 
-    pConnectionSockImpl->m_Socket           = Connection;
-    pConnectionSockImpl->m_nLastError       = 0;
-    pConnectionSockImpl->m_CloseCallback    = NULL;
-    pConnectionSockImpl->m_CallbackArg      = NULL;
+    pConnectionSockImpl->m_Socket			= Connection;
+    pConnectionSockImpl->m_nLastError		= 0;
+    pConnectionSockImpl->m_CloseCallback	= NULL;
+    pConnectionSockImpl->m_CallbackArg		= NULL;
 #if defined(LINUX)
-    pConnectionSockImpl->m_bIsAccepting     = sal_False;
+    pConnectionSockImpl->m_bIsAccepting		= sal_False;
 
     pSocket->m_bIsAccepting = sal_False;
 #endif /* LINUX */
@@ -2513,10 +2513,10 @@ sal_Bool SAL_CALL osl_shutdownSocket(oslSocket pSocket,
 /* osl_getSocketOption  */
 /*****************************************************************************/
 sal_Int32 SAL_CALL osl_getSocketOption(oslSocket pSocket,
-                            oslSocketOptionLevel    Level,
-                            oslSocketOption         Option,
-                            void*                   pBuffer,
-                            sal_uInt32                  BufferLen)
+                            oslSocketOptionLevel	Level,
+                            oslSocketOption			Option,
+                            void*					pBuffer,
+                            sal_uInt32  				BufferLen)
 {
     socklen_t nOptLen = (socklen_t) BufferLen;
 
@@ -2545,10 +2545,10 @@ sal_Int32 SAL_CALL osl_getSocketOption(oslSocket pSocket,
 /* osl_setSocketOption  */
 /*****************************************************************************/
 sal_Bool SAL_CALL osl_setSocketOption(oslSocket pSocket,
-                            oslSocketOptionLevel    Level,
-                            oslSocketOption         Option,
-                            void*                   pBuffer,
-                            sal_uInt32                  BufferLen)
+                            oslSocketOptionLevel	Level,
+                            oslSocketOption			Option,
+                            void*					pBuffer,
+                            sal_uInt32					BufferLen)
 {
     int nRet;
 
@@ -2638,7 +2638,7 @@ sal_Bool SAL_CALL osl_isNonBlockingMode(oslSocket pSocket)
 /*****************************************************************************/
 oslSocketType SAL_CALL osl_getSocketType(oslSocket pSocket)
 {
-    int Type=0;
+    int	Type=0;
     socklen_t TypeSize= sizeof(Type);
 
     OSL_ASSERT(pSocket);
@@ -2714,8 +2714,8 @@ oslSocketError SAL_CALL osl_getLastSocketError(oslSocket pSocket)
 /*****************************************************************************/
 typedef struct _TSocketSetImpl
 {
-    int     m_MaxHandle;    /* for select(), the largest descriptor in the set */
-    fd_set  m_Set;          /* the set of descriptors */
+    int		m_MaxHandle;	/* for select(), the largest descriptor in the set */
+    fd_set	m_Set;			/* the set of descriptors */
 
 } TSocketSetImpl;
 
@@ -2815,7 +2815,7 @@ void SAL_CALL osl_removeFromSocketSet(oslSocketSet Set, oslSocket pSocket)
         pSet->m_MaxHandle--;
         if(pSet->m_MaxHandle < 0)
         {
-            pSet->m_MaxHandle= 0;   /* avoid underflow */
+            pSet->m_MaxHandle= 0;	/* avoid underflow */
         }
     }
 
@@ -2850,7 +2850,7 @@ sal_Int32 SAL_CALL osl_demultiplexSocketEvents(oslSocketSet IncomingSet,
                                     const TimeValue* pTimeout)
 {
     int MaxHandle= 0;
-    struct timeval  tv;
+    struct timeval 	tv;
     TSocketSetImpl* pInSet;
     TSocketSetImpl* pOutSet;
     TSocketSetImpl* pOOBSet;
diff --git a/sal/osl/unx/sockimpl.h b/sal/osl/unx/sockimpl.h
index 0ffd9bd951b1..c4b5eebd963d 100644
--- a/sal/osl/unx/sockimpl.h
+++ b/sal/osl/unx/sockimpl.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,12 +38,12 @@ extern "C" {
 #endif
 
 typedef void* (*oslCloseCallback) (void*);
-
+    
 struct oslSocketImpl {
-    int                 m_Socket;
+    int					m_Socket;
     int                 m_nLastError;
-    oslCloseCallback    m_CloseCallback;
-    void*               m_CallbackArg;
+    oslCloseCallback	m_CloseCallback;
+    void*				m_CallbackArg;
     oslInterlockedCount m_nRefCount;
 #if defined(LINUX)
     sal_Bool            m_bIsAccepting;
@@ -58,7 +58,7 @@ struct oslSocketAddrImpl
 };
 
 struct oslPipeImpl {
-    int  m_Socket;
+    int	 m_Socket;
     sal_Char m_Name[PATH_MAX + 1];
     oslInterlockedCount m_nRefCount;
     sal_Bool m_bClosed;
@@ -67,7 +67,7 @@ struct oslPipeImpl {
     sal_Bool m_bIsInShutdown;
 #endif
 };
-
+    
 oslSocket __osl_createSocketImpl(int Socket);
 void __osl_destroySocketImpl(oslSocket pImpl);
 
@@ -75,6 +75,6 @@ void __osl_destroySocketImpl(oslSocket pImpl);
 }
 #endif
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index 953d473605d4..c6154971badd 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,7 +51,7 @@ struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int
         ndir= strlen(res->pw_dir)+1;
 
         if (nname+npasswd+nclass+ngecos
-                +ndir+strlen(res->pw_shell) < size)
+                +ndir+strlen(res->pw_shell) < size) 
         {
             memcpy(s, res, sizeof(struct passwd));
 
@@ -79,11 +79,11 @@ struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int
               s->pw_shell = buffer;
 
                res = s;
-        }
-        else
+        } 
+        else 
             res = 0;
-    }
-
+    }  	
+      
     pthread_mutex_unlock(&getrtl_mutex);
 
         return(res);
@@ -215,8 +215,8 @@ struct spwd *getspnam_r(const char *name, struct spwd* s, char* buffer, int size
               s->sp_pwdp = buffer;
 
                res = s;
-        }
-        else
+        } 
+        else 
             res = 0;
     }
 
@@ -244,7 +244,7 @@ struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int
         ndir= strlen(res->pw_dir)+1;
 
         if (nname+npasswd+nage+ncomment+ngecos+ndir
-                +strlen(res->pw_shell) < size)
+                +strlen(res->pw_shell) < size) 
         {
             memcpy(s, res, sizeof(struct passwd));
 
@@ -276,11 +276,11 @@ struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int
               s->pw_shell = buffer;
 
                res = s;
-        }
-        else
+        } 
+        else 
             res = 0;
-    }
-
+    }  	
+      
     pthread_mutex_unlock(&getrtl_mutex);
 
       return res;
@@ -294,13 +294,13 @@ extern int h_errno;
 struct hostent *gethostbyname_r(const char *name, struct hostent *result,
                                 char *buffer, int buflen, int *h_errnop)
 {
-    /* buffer layout:   name\0
-     *                  array_of_pointer_to_aliases
-     *                  NULL
-     *                  alias1\0...aliasn\0
+    /* buffer layout: 	name\0
+     *					array_of_pointer_to_aliases
+     *					NULL
+     *					alias1\0...aliasn\0
      *                  array_of_pointer_to_addresses
-     *                  NULL
-     *                  addr1addr2addr3...addrn
+     * 					NULL
+     * 					addr1addr2addr3...addrn
      */
       struct hostent* res;
 
@@ -310,7 +310,7 @@ struct hostent *gethostbyname_r(const char *name, struct hostent *result,
       {
         int nname, naliases, naddr_list, naliasesdata, n;
         char **p, **parray, *data;
-
+        
         /* Check buffer size before copying, we want to leave the
          * buffers unmodified in case something goes wrong.
          *
@@ -328,11 +328,11 @@ struct hostent *gethostbyname_r(const char *name, struct hostent *result,
 
         for ( p = res->h_addr_list; *p != NULL; p++)
             naddr_list++;
-
+            
         if ( nname
              + (naliases+1)*sizeof(char*) + naliasesdata
              + (naddr_list+1)*sizeof(char*) + naddr_list*res->h_length
-             <= buflen )
+             <= buflen ) 
         {
             memcpy(result, res, sizeof(struct hostent));
 
@@ -362,7 +362,7 @@ struct hostent *gethostbyname_r(const char *name, struct hostent *result,
             *parray = NULL;
 
                res = result;
-        }
+        } 
         else
         {
             errno = ERANGE;
@@ -373,7 +373,7 @@ struct hostent *gethostbyname_r(const char *name, struct hostent *result,
     {
         *h_errnop = h_errno;
     }
-
+      
     pthread_mutex_unlock(&getrtl_mutex);
 
       return res;
@@ -392,7 +392,7 @@ int macxp_resolveAlias(char *path, int buflen)
   Boolean bFolder;
   Boolean bAliased;
   char *unprocessedPath = path;
-
+  
   if ( *unprocessedPath == '/' )
     unprocessedPath++;
 
@@ -402,7 +402,7 @@ int macxp_resolveAlias(char *path, int buflen)
       unprocessedPath = strchr( unprocessedPath, '/' );
       if ( unprocessedPath )
     *unprocessedPath = '\0';
-
+      
       nErr = noErr;
       bFolder = FALSE;
       bAliased = FALSE;
@@ -443,11 +443,11 @@ int macxp_resolveAlias(char *path, int buflen)
         }
         }
     }
-
+      
       if ( unprocessedPath )
     *unprocessedPath++ = '/';
     }
-
+  
   return nRet;
 }
 
@@ -478,7 +478,7 @@ pid_t getpid(void)
 {
     if (pid == -1)
         savePid();
-
+    
     return (pid);
 }
 #endif /*  (defined (LINUX) && (GLIBC >= 2)) */
@@ -558,31 +558,31 @@ char *fcvt(double value, int ndigit, int *decpt, int *sign)
   static char ret[256];
   char buf[256],zahl[256],format[256]="%";
   char *v1,*v2;
-
+ 
   if (value==0.0) value=1e-30;
-
+  
   if (value<0.0) *sign=1; else *sign=0;
-
-  if (value<1.0)
+ 
+  if (value<1.0) 
   {
-    *decpt=(int)log10(value);
+    *decpt=(int)log10(value); 
     value*=pow(10.0,1-*decpt);
     ndigit+=*decpt-1;
     if (ndigit<0) ndigit=0;
   }
-  else
+  else 
   {
     *decpt=(int)log10(value)+1;
   }
-
+  
   sprintf(zahl,"%d",ndigit);
   strcat(format,zahl);
   strcat(format,".");
   strcat(format,zahl);
   strcat(format,"f");
-
+  
   sprintf(buf,format,value);
-
+  
   if (ndigit!=0)
   {
     v1=strtok(buf,".");
@@ -594,7 +594,7 @@ char *fcvt(double value, int ndigit, int *decpt, int *sign)
   {
     strcpy(ret,buf);
   }
-
+    
   return(ret);
 }
 
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index 3a61f67aec40..4b6b7661d20f 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,11 +53,11 @@
 
 /* Make sockets of type AF_UNIX use underlying FS rights */
 #ifdef SOLARIS
-#   define _XOPEN_SOURCE 500
-#   include <sys/socket.h>
-#   undef _XOPEN_SOURCE
+#	define _XOPEN_SOURCE 500
+#	include <sys/socket.h>
+#	undef _XOPEN_SOURCE
 #else
-#   include <sys/socket.h>
+#	include <sys/socket.h>
 #endif
 
 #include <netinet/in.h>
@@ -77,27 +77,27 @@
 #   include <pthread.h>
 #   include <sys/file.h>
 #   include <sys/ioctl.h>
-#   include <sys/uio.h>
-#   include <sys/un.h>
+#	include <sys/uio.h>
+#	include <sys/un.h>
 #   include <netinet/tcp.h>
 #   include <dlfcn.h>
-#   include <endian.h>
-#   include <sys/time.h>
-#   include <semaphore.h>
-#   if __BYTE_ORDER == __LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
-#   elif __BYTE_ORDER == __BIG_ENDIAN
+#	include <endian.h>
+#	include <sys/time.h>
+#	include <semaphore.h> 
+#	if __BYTE_ORDER == __LITTLE_ENDIAN
+#		define _LITTLE_ENDIAN
+#	elif __BYTE_ORDER == __BIG_ENDIAN
 #               ifndef _BIG_ENDIAN
 #               define _BIG_ENDIAN
 #               endif
-#   elif __BYTE_ORDER == __PDP_ENDIAN
-#       define _PDP_ENDIAN
-#   endif
-#   define  IORESOURCE_TRANSFER_BSD
-#   define  IOCHANNEL_TRANSFER_BSD_RENO
-#   define  pthread_testcancel()
-#   define  NO_PTHREAD_PRIORITY
-#   define  PTHREAD_SIGACTION           pthread_sigaction
+#	elif __BYTE_ORDER == __PDP_ENDIAN
+#		define _PDP_ENDIAN
+#	endif
+#	define 	IORESOURCE_TRANSFER_BSD 
+#	define 	IOCHANNEL_TRANSFER_BSD_RENO
+#	define	pthread_testcancel()
+#	define  NO_PTHREAD_PRIORITY
+#	define  PTHREAD_SIGACTION 			pthread_sigaction
 #else
 #   include <shadow.h>
 #   include <asm/sigcontext.h>
@@ -105,28 +105,28 @@
 #   include <sys/file.h>
 #   include <sys/ioctl.h>
 #   include <linux/net.h>
-#   include <sys/un.h>
+#	include <sys/un.h>
 #   include <netinet/tcp.h>
 #   include <linux/elfcore.h>
 #   include <dlfcn.h>
-#   include <endian.h>
-#   if __BYTE_ORDER == __LITTLE_ENDIAN
+#	include <endian.h>
+#	if __BYTE_ORDER == __LITTLE_ENDIAN
 #       ifndef _LITTLE_ENDIAN
-#           define _LITTLE_ENDIAN
+#		    define _LITTLE_ENDIAN
 #       endif
-#   elif __BYTE_ORDER == __BIG_ENDIAN
+#	elif __BYTE_ORDER == __BIG_ENDIAN
 #       ifndef _BIG_ENDIAN
-#           define _BIG_ENDIAN
+#		    define _BIG_ENDIAN
 #       endif
-#   elif __BYTE_ORDER == __PDP_ENDIAN
-#       define _PDP_ENDIAN
-#   endif
-#   define  IORESOURCE_TRANSFER_BSD
-#   define  IOCHANNEL_TRANSFER_BSD_RENO
-#   define  pthread_testcancel()
-#   define  NO_PTHREAD_RTL
-#   define  NO_PTHREAD_PRIORITY
-#   define  PTHREAD_SIGACTION           pthread_sigaction
+#	elif __BYTE_ORDER == __PDP_ENDIAN
+#		define _PDP_ENDIAN
+#	endif
+#	define 	IORESOURCE_TRANSFER_BSD 
+#	define 	IOCHANNEL_TRANSFER_BSD_RENO
+#	define	pthread_testcancel()
+#	define  NO_PTHREAD_RTL
+#	define  NO_PTHREAD_PRIORITY
+#	define  PTHREAD_SIGACTION 			pthread_sigaction
 #endif
 
 #   ifndef ETIME
@@ -136,36 +136,36 @@
 #endif
 
 #ifdef NETBSD
-#   include <sys/param.h>
+#	include <sys/param.h>
 #       ifndef ETIME
-#     define  ETIME ETIMEDOUT
+#	  define  ETIME ETIMEDOUT
 #       endif
-#   define _POSIX_THREAD_SYSCALL_SOFT 1
-#   include <pthread.h>
-#   include <netdb.h>
-#   include <sys/sem.h>
-#   include <sys/exec.h>
-#   include <sys/filio.h>
-#   include <sys/ioctl.h>
-#   include <sys/time.h>
-#   include <sys/un.h>
-#   include <netinet/tcp.h>
-#   include <dlfcn.h>
+#	define _POSIX_THREAD_SYSCALL_SOFT 1
+#	include <pthread.h>
+#	include <netdb.h>
+#	include <sys/sem.h>
+#	include <sys/exec.h>
+#	include <sys/filio.h>
+#	include <sys/ioctl.h>
+#	include <sys/time.h>
+#	include <sys/un.h>
+#	include <netinet/tcp.h>
+#	include <dlfcn.h>
 #   include <machine/endian.h>
 #   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN_OO
+#   	define _LITTLE_ENDIAN_OO
 #   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN_OO
+#   	define _BIG_ENDIAN_OO
 #   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN_OO
+#   	define _PDP_ENDIAN_OO
 #   endif
-#   define  IORESOURCE_TRANSFER_BSD
-#   define  IOCHANNEL_TRANSFER_BSD_RENO
-#   define  pthread_testcancel()
-#   define  NO_PTHREAD_PRIORITY
+#	define 	IORESOURCE_TRANSFER_BSD 
+#	define 	IOCHANNEL_TRANSFER_BSD_RENO
+#	define	pthread_testcancel()
+#	define  NO_PTHREAD_PRIORITY
 #     define  NO_PTHREAD_SEMAPHORES
-#   define  NO_PTHREAD_RTL
-#   define  PTHREAD_SIGACTION           pthread_sigaction
+#	define  NO_PTHREAD_RTL
+#	define  PTHREAD_SIGACTION 			pthread_sigaction
 #endif
 
 #ifdef FREEBSD
@@ -184,20 +184,20 @@
 #   include <vm/vm_param.h>
 #   include <vm/pmap.h>
 #   include <vm/swap_pager.h>
-#   include <sys/un.h>
+#	include <sys/un.h>
 #   include <netinet/tcp.h>
-#   define  IORESOURCE_TRANSFER_BSD
+#	define 	IORESOURCE_TRANSFER_BSD 
 #   include <machine/endian.h>
 #if __FreeBSD_version < 500000
 #   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
+#   	define _LITTLE_ENDIAN
 #   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN
+#   	define _BIG_ENDIAN
 #   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN
+#   	define _PDP_ENDIAN
 #   endif
 #endif
-#   define  NO_PTHREAD_RTL
+#	define  NO_PTHREAD_RTL
 #endif
 
 #ifdef OPENBSD
@@ -228,100 +228,100 @@
 
 #ifdef SCO
 #   define AF_IPX -1
-#   include <strings.h>
-#   include <pthread.h>
-#   include <shadow.h>
-#   include <netdb.h>
-#   include <sys/un.h>
-#   include <sys/netinet/tcp.h>
+#	include <strings.h>
+#	include <pthread.h>
+#	include <shadow.h>
+#	include <netdb.h>
+#	include <sys/un.h>
+#	include <sys/netinet/tcp.h>
 #   include <sys/types.h>
 #   include <sys/byteorder.h>
 #   include <dlfcn.h>
 #   if BYTE_ORDER == LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
+#   	define _LITTLE_ENDIAN
 #   elif BYTE_ORDER == BIG_ENDIAN
-#       define _BIG_ENDIAN
+#   	define _BIG_ENDIAN
 #   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN
+#   	define _PDP_ENDIAN
 #   endif
-#   define  sched_yield()               pthread_yield()
-#   define  pthread_testcancel()
-#   define  NO_PTHREAD_RTL
-#   define  NO_PTHREAD_PRIORITY
+#	define  sched_yield() 				pthread_yield()
+#	define	pthread_testcancel()
+#	define  NO_PTHREAD_RTL
+#	define  NO_PTHREAD_PRIORITY
 extern int pthread_cancel(pthread_t);
 extern unsigned int nanosleep(unsigned int);
-#   define  SLEEP_TIMESPEC(timespec)    (timespec .tv_sec > 0) ? sleep(timespec .tv_sec), nanosleep(timespec .tv_nsec) : nanosleep(timespec .tv_nsec)
-#   define  PATH_MAX                    _POSIX_PATH_MAX
-#   define  S_ISSOCK                    S_ISFIFO
-#   define  PTHREAD_SIGACTION           pthread_sigaction
-#   define  STAT_PARENT                 stat
+#	define  SLEEP_TIMESPEC(timespec)  	(timespec .tv_sec > 0) ? sleep(timespec .tv_sec), nanosleep(timespec .tv_nsec) : nanosleep(timespec .tv_nsec)
+#	define  PATH_MAX 					_POSIX_PATH_MAX
+#	define	S_ISSOCK					S_ISFIFO 
+#	define	PTHREAD_SIGACTION 			pthread_sigaction
+#	define	STAT_PARENT					stat
 #endif
 
 #ifdef AIX
 #   define AF_IPX -1
-#   include <strings.h>
-#   include <pthread.h>
-#   include <dlfcn.h>
-#   include <sys/time.h>
-#   include <sys/un.h>
-#   include <netinet/tcp.h>
-#   include <sys/machine.h>
+#	include <strings.h>
+#	include <pthread.h>
+#	include <dlfcn.h>
+#	include <sys/time.h>
+#	include <sys/un.h>
+#	include <netinet/tcp.h>
+#	include <sys/machine.h>
 #   if BYTE_ORDER == LITTLE_ENDIAN
-#       ifndef _LITTLE_ENDIAN
-#           define _LITTLE_ENDIAN
-#       endif
+#   	ifndef _LITTLE_ENDIAN
+#   	    define _LITTLE_ENDIAN
+#   	endif
 #   elif BYTE_ORDER == BIG_ENDIAN
-#       ifndef _BIG_ENDIAN
-#           define _BIG_ENDIAN
-#       endif
+#   	ifndef _BIG_ENDIAN
+#   	    define _BIG_ENDIAN
+#   	endif
 #   elif BYTE_ORDER == PDP_ENDIAN
-#       define _PDP_ENDIAN
+#   	define _PDP_ENDIAN
 #   endif
-#   define  SLEEP_TIMESPEC(timespec)    nsleep(&timespec, 0)
-#   define  LIBPATH "LIBPATH"
-#   define  NO_PTHREAD_SEMAPHORES
+#	define  SLEEP_TIMESPEC(timespec)  	nsleep(&timespec, 0)
+#	define  LIBPATH "LIBPATH"
+#	define  NO_PTHREAD_SEMAPHORES
 #endif
 
 #ifdef HPUX
 #   define  AF_IPX -1
-#   undef   howmany
-#   undef   MAXINT
-#   include <pthread.h>
-#   include <sys/un.h>
-#   include <sys/sched.h>
-#   include <sys/xti.h>
-#   include <sys/pstat.h>
-#   include <shadow.h>
-#   include <crypt.h>
-#   include <machine/param.h>
-#   define  LIBPATH "SHLIB_PATH"
-#   define  PTR_FD_SET(s)               ((int *)&(s))
-#   define  PTHREAD_VALUE(t)            ((t).field2)
-#   define  PTHREAD_NONE_INIT           { 0, -1 }
-#   define  PTHREAD_ATTR_DEFAULT        pthread_attr_default
-#   define  PTHREAD_MUTEXATTR_DEFAULT   pthread_mutexattr_default
-#   define  PTHREAD_CONDATTR_DEFAULT    pthread_condattr_default
-#   define  pthread_detach(t)           pthread_detach(&(t))
-#   define  NO_PTHREAD_PRIORITY
-#   define  NO_PTHREAD_SEMAPHORES
+#   undef	howmany
+#   undef	MAXINT
+#	include <pthread.h>
+#	include <sys/un.h>
+#	include <sys/sched.h>
+#	include <sys/xti.h>
+#	include <sys/pstat.h>
+#	include <shadow.h>
+#	include <crypt.h>
+#	include <machine/param.h>
+#	define  LIBPATH "SHLIB_PATH"
+#	define  PTR_FD_SET(s)				((int *)&(s))
+#	define  PTHREAD_VALUE(t)			((t).field2)
+# 	define  PTHREAD_NONE_INIT			{ 0, -1 }
+#	define  PTHREAD_ATTR_DEFAULT		pthread_attr_default
+#	define  PTHREAD_MUTEXATTR_DEFAULT	pthread_mutexattr_default
+#	define  PTHREAD_CONDATTR_DEFAULT	pthread_condattr_default
+#	define  pthread_detach(t)			pthread_detach(&(t))
+#	define  NO_PTHREAD_PRIORITY
+#	define  NO_PTHREAD_SEMAPHORES
 #   define  NO_DL_FUNCTIONS
-#   undef   sigaction
-#   define  PTHREAD_SIGACTION           cma_sigaction
+#	undef	sigaction
+#	define  PTHREAD_SIGACTION 			cma_sigaction
 #endif
 
 #ifdef SOLARIS
-#   include <shadow.h>
-#   include <sys/un.h>
-#   include <stropts.h>
-#   include <pthread.h>
-#   include <semaphore.h>
-#   include <netinet/tcp.h>
-#   include <sys/filio.h>
-#   include <dlfcn.h>
-#   include <sys/isa_defs.h>
-#   define  IORESOURCE_TRANSFER_SYSV
-#   define  IOCHANNEL_TRANSFER_BSD
-#   define  LIBPATH "LD_LIBRARY_PATH"
+#	include <shadow.h>
+#	include <sys/un.h>
+#	include <stropts.h>
+#	include <pthread.h>
+#	include <semaphore.h>
+#	include <netinet/tcp.h>
+#	include <sys/filio.h>
+#	include <dlfcn.h>
+#	include <sys/isa_defs.h>
+#	define 	IORESOURCE_TRANSFER_SYSV 
+#	define 	IOCHANNEL_TRANSFER_BSD
+#	define  LIBPATH "LD_LIBRARY_PATH"
 #endif
 
 #ifdef MACOSX
@@ -329,38 +329,38 @@ extern unsigned int nanosleep(unsigned int);
 #define TimeValue CFTimeValue      // Do not conflict with TimeValue in sal/inc/osl/time.h
 #include <Carbon/Carbon.h>
 #undef TimeValue
-#   ifndef ETIME
-#       define  ETIME ETIMEDOUT
-#   endif
-#   include <dlfcn.h>
-#   include <pthread.h>
-#   include <sys/file.h>
-#   include <sys/ioctl.h>
-#   include <sys/uio.h>
-#   include <sys/un.h>
-#   include <netinet/tcp.h>
-#   include <machine/endian.h>
-#   include <sys/time.h>
-#   include <sys/semaphore.h>
+#	ifndef ETIME
+#		define  ETIME ETIMEDOUT
+#	endif
+#	include <dlfcn.h>    
+#	include <pthread.h>
+#	include <sys/file.h>
+#	include <sys/ioctl.h>
+#	include <sys/uio.h>
+#	include <sys/un.h>
+#	include <netinet/tcp.h>
+#	include <machine/endian.h>
+#	include <sys/time.h>
+#	include <sys/semaphore.h> 
 /* fixme are premac and postmac still needed here? */
-#   include <premac.h>
-#   include <mach-o/dyld.h>
-#   include <postmac.h>
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#       ifndef _LITTLE_ENDIAN
-#       define _LITTLE_ENDIAN
-#       endif
-#   elif BYTE_ORDER == BIG_ENDIAN
-#       ifndef _BIG_ENDIAN
-#       define _BIG_ENDIAN
-#       endif
-#   elif BYTE_ORDER == PDP_ENDIAN
-#       ifndef _PDP_ENDIAN
-#       define _PDP_ENDIAN
-#       endif
-#   endif
-#   define  IOCHANNEL_TRANSFER_BSD_RENO
-#   define  NO_PTHREAD_RTL
+#	include <premac.h>
+#	include <mach-o/dyld.h> 
+#	include <postmac.h>
+#	if BYTE_ORDER == LITTLE_ENDIAN
+#		ifndef _LITTLE_ENDIAN
+#		define _LITTLE_ENDIAN
+#		endif
+#	elif BYTE_ORDER == BIG_ENDIAN
+#		ifndef _BIG_ENDIAN
+#		define _BIG_ENDIAN
+#		endif
+#	elif BYTE_ORDER == PDP_ENDIAN
+#		ifndef _PDP_ENDIAN
+#		define _PDP_ENDIAN
+#		endif
+#	endif
+#	define 	IOCHANNEL_TRANSFER_BSD_RENO
+#	define  NO_PTHREAD_RTL
 /* for NSGetArgc/Argv/Environ */
 #       include <crt_externs.h>
 #ifdef __cplusplus
@@ -377,104 +377,104 @@ int macxp_resolveAlias(char *path, int buflen);
     !defined(AIX)     && !defined(HPUX)   && \
     !defined(SOLARIS) && !defined(MACOSX) && \
     !defined(OPENBSD)
-#   error "Target platform not specified!"
+#	error "Target platform not specified!"
 #endif
 
 #if defined(NETBSD)
 #if defined _LITTLE_ENDIAN_OO
-#   define _OSL_BIGENDIAN
+#	define _OSL_BIGENDIAN
 #elif defined _BIG_ENDIAN_OO
-#   define _OSL_LITENDIAN
+#	define _OSL_LITENDIAN
 #else
-#   error undetermined endianess
+#	error undetermined endianess
 #endif
 #else
 #if defined _LITTLE_ENDIAN
-#   define _OSL_BIGENDIAN
+#	define _OSL_BIGENDIAN
 #elif defined _BIG_ENDIAN
-#   define _OSL_LITENDIAN
+#	define _OSL_LITENDIAN
 #else
-#   error undetermined endianess
+#	error undetermined endianess
 #endif
 #endif
 
 #ifndef PTR_FD_SET
-#   define PTR_FD_SET(s)                (&(s))
+#	define PTR_FD_SET(s)				(&(s))
 #endif
 
 #ifndef NORMALIZE_TIMESPEC
-#   define NORMALIZE_TIMESPEC(timespec) \
+#	define NORMALIZE_TIMESPEC(timespec) \
           timespec . tv_sec  += timespec . tv_nsec / 1000000000; \
-          timespec . tv_nsec %= 1000000000;
+          timespec . tv_nsec %= 1000000000; 
 #endif
 
 #ifndef SET_TIMESPEC
-#   define SET_TIMESPEC(timespec, sec, nsec) \
+#	define SET_TIMESPEC(timespec, sec, nsec) \
           timespec . tv_sec  = (sec);  \
           timespec . tv_nsec = (nsec); \
         NORMALIZE_TIMESPEC(timespec);
 #endif
 
 #ifndef SLEEP_TIMESPEC
-#   define SLEEP_TIMESPEC(timespec) nanosleep(&timespec, 0)
+#	define SLEEP_TIMESPEC(timespec) nanosleep(&timespec, 0)
 #endif
 
-#ifndef INIT_GROUPS
-#   define  INIT_GROUPS(name, gid)  ((setgid((gid)) == 0) && (initgroups((name), (gid)) == 0))
+#ifndef INIT_GROUPS	
+#	define  INIT_GROUPS(name, gid)	((setgid((gid)) == 0) && (initgroups((name), (gid)) == 0))
 #endif
 
 #ifndef PTHREAD_VALUE
-#   define PTHREAD_VALUE(t)             (t)
+#	define PTHREAD_VALUE(t) 			(t)
 #endif
 #ifndef PTHREAD_NONE
 # if (__GNUC__ < 4) && !defined(MACOSX)
 extern pthread_t _pthread_none_;
 # endif
-#   define PTHREAD_NONE                 _pthread_none_
+#	define PTHREAD_NONE					_pthread_none_
 #   ifndef PTHREAD_NONE_INIT
-#       define PTHREAD_NONE_INIT        ((pthread_t)-1)
-#   endif
+#		define PTHREAD_NONE_INIT		((pthread_t)-1)
+#	endif
 #endif
 
 #ifndef PTHREAD_ATTR_DEFAULT
-#   define PTHREAD_ATTR_DEFAULT         NULL
+#	define PTHREAD_ATTR_DEFAULT 		NULL
 #endif
-#ifndef PTHREAD_MUTEXATTR_DEFAULT
-#   define PTHREAD_MUTEXATTR_DEFAULT    NULL
+#ifndef PTHREAD_MUTEXATTR_DEFAULT 
+#	define PTHREAD_MUTEXATTR_DEFAULT 	NULL
 #endif
 #ifndef PTHREAD_CONDATTR_DEFAULT
-#   define PTHREAD_CONDATTR_DEFAULT     NULL
+#	define PTHREAD_CONDATTR_DEFAULT 	NULL
 #endif
 
 #ifndef PTHREAD_SIGACTION
-#   define PTHREAD_SIGACTION sigaction
+#	define PTHREAD_SIGACTION sigaction
 #endif
 
 #ifndef STAT_PARENT
-#   define STAT_PARENT                  lstat
+#	define STAT_PARENT					lstat
 #endif
 
 /* socket options which might not be defined on all unx flavors */
 #ifndef SO_ACCEPTCONN
-#   define SO_ACCEPTCONN    0
+#	define SO_ACCEPTCONN 	0
 #endif
 #ifndef SO_SNDLOWAT
-#   define SO_SNDLOWAT      0
+#	define SO_SNDLOWAT 		0
 #endif
 #ifndef SO_RCVLOWAT
-#   define SO_RCVLOWAT      0
+#	define SO_RCVLOWAT 		0
 #endif
 #ifndef SO_SNDTIMEO
-#   define  SO_SNDTIMEO     0
+#	define	SO_SNDTIMEO 	0
 #endif
 #ifndef SO_RCVTIMEO
-#   define SO_RCVTIMEO      0
+#	define SO_RCVTIMEO 		0
 #endif
 #ifndef SO_USELOOPBACK
-#   define SO_USELOOPBACK   0
+#	define SO_USELOOPBACK 	0
 #endif
 #ifndef MSG_MAXIOVLEN
-#   define MSG_MAXIOVLEN    0
+#	define MSG_MAXIOVLEN 	0
 #endif
 
 /* BEGIN HACK */
@@ -482,7 +482,7 @@ extern pthread_t _pthread_none_;
 /* original ipx headers when these are available for this platform */
 
 #ifndef SA_FAMILY_DECL
-#   define SA_FAMILY_DECL short sa_family
+#	define SA_FAMILY_DECL short sa_family
 #endif
 
 typedef struct sockaddr_ipx {
@@ -502,9 +502,9 @@ typedef struct sockaddr_ipx {
 
 typedef struct
 {
-    pthread_mutex_t mutex;
-    pthread_cond_t  increased;
-    int             value;
+    pthread_mutex_t	mutex;
+    pthread_cond_t	increased;
+    int			    value;
 } sem_t;
 extern int sem_init(sem_t* sem, int pshared, unsigned int value);
 extern int sem_destroy(sem_t* sem);
diff --git a/sal/osl/unx/tempfile.c b/sal/osl/unx/tempfile.c
index 4e5abae826a2..862aff2c8de5 100644
--- a/sal/osl/unx/tempfile.c
+++ b/sal/osl/unx/tempfile.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,7 +48,7 @@
 #ifndef _FILE_URL_H_
 #include "file_url.h"
 #endif
-
+ 
 /*****************************************************************/
 /* osl_getTempFirURL                                             */
 /*****************************************************************/
@@ -85,13 +85,13 @@ oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir )
     if ( pValue )
     {
         oslFileError error;
-        rtl_uString *ustrTempPath = NULL;
+        rtl_uString	*ustrTempPath = NULL;
 
         rtl_string2UString( &ustrTempPath, pValue, strlen( pValue ), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
         OSL_ASSERT(ustrTempPath != NULL);
         error = osl_getFileURLFromSystemPath( ustrTempPath, pustrTempDir );
         rtl_uString_release( ustrTempPath );
-
+        
         return error;
     }
     else
@@ -99,12 +99,12 @@ oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir )
 }
 
 /******************************************************************
- * Generates a random unique file name. We're using the scheme
- * from the standard c-lib function mkstemp to generate a more
- * or less random unique file name
- *
- * @param rand_name
- *        receives the random name
+ * Generates a random unique file name. We're using the scheme   
+ * from the standard c-lib function mkstemp to generate a more   
+ * or less random unique file name                               
+ *                                                               
+ * @param rand_name                                              
+ *        receives the random name                               
  ******************************************************************/
 
 static const char LETTERS[]        = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
@@ -113,28 +113,28 @@ static const int  COUNT_OF_LETTERS = SAL_N_ELEMENTS(LETTERS) - 1;
 #define RAND_NAME_LENGTH 6
 
 static void osl_gen_random_name_impl_(rtl_uString** rand_name)
-{
-    static uint64_t value;
-
+{	   
+    static uint64_t value; 
+    
     char     buffer[RAND_NAME_LENGTH];
     struct   timeval tv;
     uint64_t v;
     int      i;
-
+    
     gettimeofday(&tv, NULL);
-
+    
     value += ((uint64_t)tv.tv_usec << 16) ^ tv.tv_sec ^ getpid();
-
+    
     v = value;
-
+    
     for (i = 0; i < RAND_NAME_LENGTH; i++)
     {
         buffer[i] = LETTERS[v % COUNT_OF_LETTERS];
         v        /= COUNT_OF_LETTERS;
     }
-
+    
     rtl_string2UString(
-            rand_name,
+            rand_name, 
             buffer,
             RAND_NAME_LENGTH,
             RTL_TEXTENCODING_ASCII_US,
@@ -143,9 +143,9 @@ static void osl_gen_random_name_impl_(rtl_uString** rand_name)
 }
 
 /*****************************************************************
- * Helper function
- * Either use the directory provided or the result of
- * osl_getTempDirUrl and return it as system path and file url
+ * Helper function                                               
+ * Either use the directory provided or the result of            
+ * osl_getTempDirUrl and return it as system path and file url   
  ****************************************************************/
 
 static oslFileError osl_setup_base_directory_impl_(
@@ -154,44 +154,44 @@ static oslFileError osl_setup_base_directory_impl_(
 {
     rtl_uString* dir_url = 0;
     rtl_uString* dir     = 0;
-    oslFileError error   = osl_File_E_None;
-
+    oslFileError error   = osl_File_E_None;                     
+    
     if (pustrDirectoryURL)
         rtl_uString_assign(&dir_url, pustrDirectoryURL);
     else
         error = osl_getTempDirURL(&dir_url);
-
+        
     if (osl_File_E_None == error)
     {
-        error = osl_getSystemPathFromFileURL_Ex(dir_url, &dir, FURL_DENY_RELATIVE);
+        error = osl_getSystemPathFromFileURL_Ex(dir_url, &dir, FURL_DENY_RELATIVE);       						
         rtl_uString_release(dir_url);
     }
-
+        
     if (osl_File_E_None == error)
     {
         rtl_uString_assign(ppustr_base_dir, dir);
         rtl_uString_release(dir);
     }
-
-    return error;
+    
+    return error;	
 }
 
 /*****************************************************************
  * osl_setup_createTempFile_impl
  * validate input parameter, setup variables
  ****************************************************************/
-
+ 
  static oslFileError osl_setup_createTempFile_impl_(
      rtl_uString*   pustrDirectoryURL,
     oslFileHandle* pHandle,
     rtl_uString**  ppustrTempFileURL,
     rtl_uString**  ppustr_base_dir,
-    sal_Bool*      b_delete_on_close)
+    sal_Bool*	   b_delete_on_close)
  {
      oslFileError osl_error;
-
+    
     OSL_PRECOND(((0 != pHandle) || (0 != ppustrTempFileURL)), "Invalid parameter!");
-
+    
     if ((0 == pHandle) && (0 == ppustrTempFileURL))
     {
         osl_error = osl_File_E_INVAL;
@@ -200,20 +200,20 @@ static oslFileError osl_setup_base_directory_impl_(
     {
         osl_error = osl_setup_base_directory_impl_(
             pustrDirectoryURL, ppustr_base_dir);
-
+            
         *b_delete_on_close = (0 == ppustrTempFileURL);
     }
-
+    
     return osl_error;
  }
-
+ 
 /*****************************************************************
- * Create a unique file in the specified directory and return
- * it's name
+ * Create a unique file in the specified directory and return    
+ * it's name                                                     
  ****************************************************************/
 
 static oslFileError osl_create_temp_file_impl_(
-    const rtl_uString* pustr_base_directory,
+    const rtl_uString* pustr_base_directory, 
     oslFileHandle* file_handle,
     rtl_uString** ppustr_temp_file_name)
 {
@@ -225,45 +225,45 @@ static oslFileError osl_create_temp_file_impl_(
     oslFileError        osl_error        = osl_File_E_None;
     sal_Int32           offset_file_name;
     const sal_Unicode*  puchr;
-
+        
     OSL_PRECOND(pustr_base_directory, "Invalid Parameter");
     OSL_PRECOND(file_handle, "Invalid Parameter");
     OSL_PRECOND(ppustr_temp_file_name, "Invalid Parameter");
-
+    
     len_base_dir = rtl_uString_getLength(pustr_base_directory);
-
+    
     rtl_uStringbuffer_newFromStr_WithLength(
-        &tmp_file_path,
+        &tmp_file_path, 
         rtl_uString_getStr((rtl_uString*)pustr_base_directory),
         len_base_dir);
-
+                        
     rtl_uStringbuffer_ensureCapacity(
-        &tmp_file_path,
-        &capacity,
+        &tmp_file_path, 
+        &capacity, 
         (len_base_dir + 1 + RAND_NAME_LENGTH));
-
+        
     offset_file_name = len_base_dir;
-
+        
     puchr = rtl_uString_getStr(tmp_file_path);
-
+    
     /* ensure that the last character is a '/' */
-
+    
     if ((sal_Unicode)'/' != puchr[len_base_dir - 1])
-    {
+    {		
         rtl_uStringbuffer_insert_ascii(
-            &tmp_file_path,
-            &capacity,
+            &tmp_file_path, 
+            &capacity, 
             len_base_dir,
             "/",
             1);
-
-        offset_file_name++;
+        
+        offset_file_name++;					
     }
-
+         
     while(1) /* try until success */
-    {
+    {							
         osl_gen_random_name_impl_(&rand_name);
-
+                    
         rtl_uStringbuffer_insert(
             &tmp_file_path,
             &capacity,
@@ -272,110 +272,110 @@ static oslFileError osl_create_temp_file_impl_(
             rtl_uString_getLength(rand_name));
 
         osl_error = osl_getFileURLFromSystemPath(
-            tmp_file_path, &tmp_file_url);
-
+            tmp_file_path, &tmp_file_url);				
+        
         if (osl_File_E_None == osl_error)
         {
             /* RW permission for the user only! */
             mode_t old_mode = umask(077);
-
+            
             osl_error = osl_openFile(
-                tmp_file_url,
-                file_handle,
-                osl_File_OpenFlag_Read |
-                osl_File_OpenFlag_Write |
+                tmp_file_url, 
+                file_handle, 
+                osl_File_OpenFlag_Read | 
+                osl_File_OpenFlag_Write | 
                 osl_File_OpenFlag_Create);
-
+                
             umask(old_mode);
         }
-
-        /* in case of error osl_File_E_EXIST we simply try again else we give up */
-
+        
+        /* in case of error osl_File_E_EXIST we simply try again else we give up */	
+        
         if ((osl_File_E_None == osl_error) || (osl_error != osl_File_E_EXIST))
         {
             if (rand_name)
                 rtl_uString_release(rand_name);
-
+            
             if (tmp_file_url)
                 rtl_uString_release(tmp_file_url);
-
+                                
             break;
-        }
+        }					
     } /* while(1) */
-
+    
     if (osl_File_E_None == osl_error)
         rtl_uString_assign(ppustr_temp_file_name, tmp_file_path);
-
+    
     if (tmp_file_path)
         rtl_uString_release(tmp_file_path);
-
+        
     return osl_error;
 }
 
 /*****************************************************************
- * osl_createTempFile
+ * osl_createTempFile                                            
  *****************************************************************/
 
 oslFileError SAL_CALL osl_createTempFile(
     rtl_uString*   pustrDirectoryURL,
-    oslFileHandle* pHandle,
+    oslFileHandle* pHandle, 
     rtl_uString**  ppustrTempFileURL)
 {
-    rtl_uString*  base_directory     = 0;
+    rtl_uString*  base_directory     = 0;	
     rtl_uString*  temp_file_name     = 0;
     oslFileHandle temp_file_handle;
     sal_Bool      b_delete_on_close;
     oslFileError  osl_error;
-
+    
     osl_error = osl_setup_createTempFile_impl_(
-        pustrDirectoryURL,
+        pustrDirectoryURL, 
         pHandle,
-        ppustrTempFileURL,
+        ppustrTempFileURL,		
         &base_directory,
         &b_delete_on_close);
-
-    if (osl_File_E_None != osl_error)
+    
+    if (osl_File_E_None != osl_error)		
         return osl_error;
-
+        
     osl_error = osl_create_temp_file_impl_(
         base_directory, &temp_file_handle, &temp_file_name);
-
-    if (osl_File_E_None == osl_error)
-    {
-        rtl_uString* temp_file_url = 0;
-
+                                
+    if (osl_File_E_None == osl_error) 
+    {		
+        rtl_uString* temp_file_url = 0;		
+        
         /* assuming this works */
         osl_getFileURLFromSystemPath(temp_file_name, &temp_file_url);
-
+                                                
         if (b_delete_on_close)
-        {
+        {			
             osl_error = osl_removeFile(temp_file_url);
-
+            
             if (osl_File_E_None == osl_error)
                 *pHandle = temp_file_handle;
             else
                 osl_closeFile(temp_file_handle);
         }
-        else
-        {
+        else 
+        {		
             if (pHandle)
-                *pHandle = temp_file_handle;
+                *pHandle = temp_file_handle;				
             else
-                osl_closeFile(temp_file_handle);
-
-            rtl_uString_assign(ppustrTempFileURL, temp_file_url);
+                osl_closeFile(temp_file_handle);	
+                                     
+            rtl_uString_assign(ppustrTempFileURL, temp_file_url);                                       
         }
-
+        
         if (temp_file_url)
             rtl_uString_release(temp_file_url);
-
+                
         if (temp_file_name)
             rtl_uString_release(temp_file_name);
     }
-
+    
     if (base_directory)
-        rtl_uString_release(base_directory);
-
+        rtl_uString_release(base_directory);      
+        
     return osl_error;
 }
 
diff --git a/sal/osl/unx/thread.c b/sal/osl/unx/thread.c
index 689b78dc748a..0e5ccc740110 100644
--- a/sal/osl/unx/thread.c
+++ b/sal/osl/unx/thread.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,25 +59,25 @@
  ****************************************************************************/
 
 /*****************************************************************************/
-/*  Internal data structures and functions */
+/*	Internal data structures and functions */
 /*****************************************************************************/
 
 #define THREADIMPL_FLAGS_TERMINATE  0x00001
-#define THREADIMPL_FLAGS_STARTUP    0x00002
-#define THREADIMPL_FLAGS_SUSPENDED  0x00004
+#define THREADIMPL_FLAGS_STARTUP	0x00002
+#define THREADIMPL_FLAGS_SUSPENDED	0x00004
 #define THREADIMPL_FLAGS_ACTIVE     0x00008
 #define THREADIMPL_FLAGS_ATTACHED   0x00010
 #define THREADIMPL_FLAGS_DESTROYED  0x00020
 
 typedef struct osl_thread_impl_st
 {
-    pthread_t           m_hThread;
-    sal_uInt16          m_Ident; /* @@@ see TODO @@@ */
+    pthread_t			m_hThread;
+    sal_uInt16			m_Ident; /* @@@ see TODO @@@ */
     short               m_Flags;
-    oslWorkerFunction   m_WorkerFunction;
-    void*               m_pData;
-    pthread_mutex_t     m_Lock;
-    pthread_cond_t      m_Cond;
+    oslWorkerFunction	m_WorkerFunction;
+    void*				m_pData;
+    pthread_mutex_t		m_Lock;
+    pthread_cond_t		m_Cond;
 } Thread_Impl;
 
 struct osl_thread_priority_st
@@ -599,7 +599,7 @@ void SAL_CALL osl_yieldThread()
 typedef struct _HashEntry
 {
     pthread_t         Handle;
-    sal_uInt16        Ident;
+    sal_uInt16	      Ident;
     struct _HashEntry *Next;
 } HashEntry;
 
@@ -872,7 +872,7 @@ void SAL_CALL osl_setThreadPriority (
             break;
 
         case osl_Thread_PriorityUnknown:
-            OSL_ASSERT(sal_False);      /* only fools try this...*/
+            OSL_ASSERT(sal_False);		/* only fools try this...*/
 
             /* let release-version behave friendly */
             return;
diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c
index bc0931bd4ce5..db03442e78a8 100644
--- a/sal/osl/unx/time.c
+++ b/sal/osl/unx/time.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 /* FIXME: detection should be done in configure script */
 #if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || \
-    defined(LINUX) || defined(OPENBSD)
+	defined(LINUX) || defined(OPENBSD)
 #define STRUCT_TM_HAS_GMTOFF 1
 
 #elif defined(SOLARIS)
@@ -70,7 +70,7 @@ sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( TimeValue* pTimeVal, oslDateTime
     time_t atime;
 
     atime = (time_t)pTimeVal->Seconds;
-
+    
     /* Convert time from type time_t to struct tm */
     pSystemTime = gmtime_r( &atime, &tmBuf );
 
@@ -78,14 +78,14 @@ sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( TimeValue* pTimeVal, oslDateTime
     /* Convert struct tm to struct oslDateTime */
     if ( pSystemTime != NULL )
     {
-        pDateTime->NanoSeconds  =   pTimeVal->Nanosec;
-        pDateTime->Seconds      =   pSystemTime->tm_sec;
-        pDateTime->Minutes      =   pSystemTime->tm_min;
-        pDateTime->Hours        =   pSystemTime->tm_hour;
-        pDateTime->Day          =   pSystemTime->tm_mday;
-        pDateTime->DayOfWeek    =   pSystemTime->tm_wday;
-        pDateTime->Month        =   pSystemTime->tm_mon + 1;
-        pDateTime->Year         =   pSystemTime->tm_year  + 1900;
+        pDateTime->NanoSeconds	=	pTimeVal->Nanosec;
+        pDateTime->Seconds		=	pSystemTime->tm_sec;
+        pDateTime->Minutes		=	pSystemTime->tm_min;
+        pDateTime->Hours		=	pSystemTime->tm_hour;
+        pDateTime->Day			=	pSystemTime->tm_mday;
+        pDateTime->DayOfWeek	=	pSystemTime->tm_wday;
+        pDateTime->Month		=	pSystemTime->tm_mon + 1;
+        pDateTime->Year			=	pSystemTime->tm_year  + 1900;
 
         return sal_True;
     }
@@ -99,8 +99,8 @@ sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( TimeValue* pTimeVal, oslDateTime
 
 sal_Bool SAL_CALL osl_getTimeValueFromDateTime( oslDateTime* pDateTime, TimeValue* pTimeVal )
 {
-    struct tm   aTime;
-    time_t      nSeconds;
+    struct tm	aTime;
+    time_t		nSeconds;
 
     /* Convert struct oslDateTime to struct tm */
     aTime.tm_sec  = pDateTime->Seconds;
@@ -111,12 +111,12 @@ sal_Bool SAL_CALL osl_getTimeValueFromDateTime( oslDateTime* pDateTime, TimeValu
 
     if ( pDateTime->Month > 0 )
         aTime.tm_mon = pDateTime->Month - 1;
-    else
+    else 
         return sal_False;
 
     if ( pDateTime->Year >= 1900 )
         aTime.tm_year = pDateTime->Year - 1900;
-    else
+    else 
         return sal_False;
 
     aTime.tm_isdst = -1;
@@ -127,14 +127,14 @@ sal_Bool SAL_CALL osl_getTimeValueFromDateTime( oslDateTime* pDateTime, TimeValu
     nSeconds = mktime( &aTime );
 
     /*
-     * mktime expects the struct tm to be in local timezone, so we have to adjust
+     * mktime expects the struct tm to be in local timezone, so we have to adjust 
      * the returned value to be timezone neutral.
      */
-
+     
     if ( nSeconds != (time_t) -1 )
     {
         time_t bias;
-
+        
         /* timezone corrections */
         tzset();
 
@@ -149,13 +149,13 @@ sal_Bool SAL_CALL osl_getTimeValueFromDateTime( oslDateTime* pDateTime, TimeValu
         /* exspect daylight saving time to be one hour */
         bias = aTime.tm_isdst > 0 ? timezone - 3600 : timezone;
 #endif
-
+        
         pTimeVal->Seconds = nSeconds;
         pTimeVal->Nanosec = pDateTime->NanoSeconds;
 
         if ( nSeconds > bias )
             pTimeVal->Seconds -= bias;
-
+           
         return sal_True;
     }
 
@@ -168,7 +168,7 @@ sal_Bool SAL_CALL osl_getTimeValueFromDateTime( oslDateTime* pDateTime, TimeValu
  *--------------------------------------------------*/
 
 sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( TimeValue* pSystemTimeVal, TimeValue* pLocalTimeVal )
-{
+{ 
     struct tm *pLocalTime;
     struct tm tmBuf;
     time_t bias;
@@ -180,7 +180,7 @@ sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( TimeValue* pSystemTimeVal, Tim
 #if defined(STRUCT_TM_HAS_GMTOFF)
     /* members of struct tm are corrected by mktime */
     bias = 0 - pLocalTime->tm_gmtoff;
-
+       
 #elif defined(HAS_ALTZONE)
     /* check if daylight saving time is in effect */
     bias = pLocalTime->tm_isdst > 0 ? altzone : timezone;
@@ -226,7 +226,7 @@ sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( TimeValue* pLocalTimeVal, Time
 #if defined(STRUCT_TM_HAS_GMTOFF)
     /* members of struct tm are corrected by mktime */
     bias = 0 - pLocalTime->tm_gmtoff;
-
+       
 #elif defined(HAS_ALTZONE)
     /* check if daylight saving time is in effect */
     bias = pLocalTime->tm_isdst > 0 ? altzone : timezone;
@@ -243,7 +243,7 @@ sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( TimeValue* pLocalTimeVal, Time
         return sal_True;
     }
 
-    return sal_False;
+    return sal_False; 
 }
 
 
@@ -262,9 +262,9 @@ sal_uInt32 SAL_CALL osl_getGlobalTimer()
       gettimeofday( &startTime, NULL );
       bGlobalTimer=sal_True;
   }
-
+  
   gettimeofday( &currentTime, NULL );
-
+  
   nSeconds = (sal_uInt32)( currentTime.tv_sec - startTime.tv_sec );
 
   return ( nSeconds * 1000 ) + (long) (( currentTime.tv_usec - startTime.tv_usec) / 1000 );
diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c
index c687e6ce7e76..dad9934cf465 100644
--- a/sal/osl/unx/util.c
+++ b/sal/osl/unx/util.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
  ************************************************************************/
 
 
-#include <unistd.h>
+#include <unistd.h> 
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
@@ -68,37 +68,37 @@ sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 * pAddr )
     /** algorithm doesn't work on solaris */
     return sal_False;
 #else
-
+    
     if ( pAddr == 0 )
     {
         return sal_False;
     }
 
-
+    
     /*
      * All we need is ... a network file descriptor.
      * Normally, this is a very socket.
      */
+    
+    so = socket(AF_INET, SOCK_DGRAM, 0);	
 
-    so = socket(AF_INET, SOCK_DGRAM, 0);
-
-
+    
     /*
      * The first thing we have to do, get the interface configuration.
      * It is a list of attached/configured interfaces
      */
-
+    
     ifc.ifc_len = sizeof(buff);
     ifc.ifc_buf = buff;
     if ( ioctl(so, SIOCGIFCONF, &ifc) < 0 )
     {
-/*      fprintf(stderr, "SIOCGIFCONF: %s\n", strerror(errno));*/
+/*		fprintf(stderr, "SIOCGIFCONF: %s\n", strerror(errno));*/
         close(so);
         return sal_False;
     }
 
     close(so);
-
+    
     /*
      *  For each of the interfaces in the interface list,
      *  try to get the hardware address
@@ -113,7 +113,7 @@ sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 * pAddr )
         {
             memcpy( pAddr , hard_addr, 6 );
             return sal_True;
-        }
+        }		
     }
 
     return sal_False;
@@ -129,36 +129,36 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
 {
     int ret=0;
     struct ifreq ifr;
-    int so = socket(AF_INET, SOCK_DGRAM, 0);
-
+    int so = socket(AF_INET, SOCK_DGRAM, 0);	
+    
     strcpy(ifr.ifr_name, ifname);
 
     /*
-     *   First, get the Interface-FLAGS
+     *   First, get the Interface-FLAGS	 
      */
-
+    
     ret=ioctl(so, SIOCGIFFLAGS, &ifr) ;
 
     if ( ret < 0 )
-    {
-/*      fprintf(stderr, "SIOCGIFFLAGS: %s\n", strerror(errno)); */
+    { 
+/*		fprintf(stderr, "SIOCGIFFLAGS: %s\n", strerror(errno)); */
         close(so);
         return ret;
-    }
-
+    } 
 
+    
     /*
      *  If it is the loopback device, do not consider it any further
      */
-
+    
     if (ifr.ifr_flags & IFF_LOOPBACK)
     {
-/*      fprintf(stderr, "SIOCGIFFLAGS : is LOOPBACK : %s\n", strerror(errno));*/
+/*		fprintf(stderr, "SIOCGIFFLAGS : is LOOPBACK : %s\n", strerror(errno));*/
         close(so);
         return 0;
     }
 
-
+    
     /*
      *  And now, the real thing: the get address
      */
@@ -166,15 +166,15 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
 #ifdef SIOCGIFHWADDR
     ret=ioctl(so, SIOCGIFHWADDR, &ifr);
 #else
-    ret=ioctl(so, SIOCGIFADDR, &ifr);
+    ret=ioctl(so, SIOCGIFADDR, &ifr); 
 #endif
 
-    if (ret < 0) {
-/*      fprintf(stderr, "SIOCGIFADDR: %s\n", strerror(errno));*/
+    if (ret < 0) {	
+/*		fprintf(stderr, "SIOCGIFADDR: %s\n", strerror(errno));*/
         memset(hard_addr, 0, 32);
         close(so);
         return ret;
-    }
+    } 
 
     close(so);
 
@@ -184,21 +184,21 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
     memcpy(hard_addr,ifr.ifr_ifru.ifru_addr.sa_data,8);
 #endif
 
-
+    
     /*
      *  Check, if no real, i.e. 00:00:00:00:00:00, address was retrieved.
      *  The Linux dummy device has this kind of behaviour
      */
-
+    
     ret=osl_checkAddr(hard_addr);
 
     if (ret < 0) {
-/*      fprintf(stderr, "SIOCGIFADDR got '00:00:00:00:00:00'\n"); */
-        return ret;
+/*		fprintf(stderr, "SIOCGIFADDR got '00:00:00:00:00:00'\n"); */
+        return ret;  
     }
-
-/*  fprintf(stderr,"interface : %s -- ",ifname);*/
-/*  fprintf(stderr,"HWaddr : %s\n", print_ether(hard_addr));*/
+    
+/*	fprintf(stderr,"interface : %s -- ",ifname);*/
+/*	fprintf(stderr,"HWaddr : %s\n",	print_ether(hard_addr));*/
 
     return 1;
 }
@@ -233,7 +233,7 @@ static int osl_checkAddr(const char* addr)
 void osl_InterlockedCountSetV9(sal_Bool bV9);
 
 /*
- * osl_InitSparcV9() should be executed as early as possible. We place it in the
+ * osl_InitSparcV9() should be executed as early as possible. We place it in the 
  * .init section of sal
  */
 #if defined ( __SUNPRO_C ) || defined ( __SUNPRO_CC )
@@ -244,7 +244,7 @@ void osl_InitSparcV9(void)  __attribute__((constructor));
 #endif
 
 void osl_InitSparcV9(void)
-{
+{	
     /* processor_info() identifies SPARCV8 (ie sun4c machines) simply as "sparc"
      * and SPARCV9 (ie ultra sparcs, sun4u) as "sparcv9". Since we know that we
      * run at least on a SPARCV8 architecture or better, any processor type != "sparc"
@@ -254,19 +254,19 @@ void osl_InitSparcV9(void)
      * "foobar"
      */
     processor_info_t aInfo;
-    int rc;
+    int rc;	
 
     rc = processor_info(0, &aInfo);
 
     if ( rc != -1 ) {
         if ( !strcmp( "sparc", aInfo.pi_processor_type )    /* SPARCV8 */
-            || !strcmp( "i386", aInfo.pi_processor_type ) ) /* can't happen, but ... */
+            || !strcmp( "i386", aInfo.pi_processor_type ) )	/* can't happen, but ... */
             return;
-        /* we are reasonably certain to be on sparcv9/sparcv8plus or better */
+        /* we are reasonably certain to be on sparcv9/sparcv8plus or better */	
         osl_InterlockedCountSetV9(sal_True);
     }
-}
-
+}	
+    
 #endif /* SOLARIS */
 
 #if defined(NETBSD) && defined(GCC) && !defined(__sparcv9) && !defined(__sparc_v9__)
@@ -307,10 +307,10 @@ void osl_InterlockedCountSetV9(sal_Bool bV9);
 void osl_InitSparcV9(void)
 {
     struct utsname name;
-    int rc;
+    int rc;	
     rc = uname(&name);
     if ( rc != -1 ) {
-        if ( !strcmp( "sparc", name.machine ))
+        if ( !strcmp( "sparc", name.machine )) 
         return;
     osl_InterlockedCountSetV9(sal_True);
     }
@@ -326,7 +326,7 @@ int osl_isSingleCPU = 0;
 /* Determine if we are on a multiprocessor/multicore/HT x86/x64 system
  *
  * The lock prefix for atomic operations in osl_[inc|de]crementInterlockedCount()
- * comes with a cost and is especially expensive on pre HT x86 single processor
+ * comes with a cost and is especially expensive on pre HT x86 single processor 
  * systems, where it isn't needed at all.
  *
  * This should be run as early as possible, thus it's placed in the init section
@@ -341,8 +341,8 @@ void osl_interlockedCountCheckForSingleCPU(void);
 
 void osl_interlockedCountCheckForSingleCPU(void)
 {
-    /* In case sysconfig fails be on the safe side,
-     * consider it a multiprocessor/multicore/HT system */
+    /* In case sysconfig fails be on the safe side, 
+     * consider it a multiprocessor/multicore/HT system */   
     if ( sysconf(_SC_NPROCESSORS_CONF) == 1 ) {
         osl_isSingleCPU = 1;
     }
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index a8fe90603c8f..2ba1f9d957a3 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,10 +28,10 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-
+ 
  #ifndef _OSL_UUNXAPI_H_
  #include "uunxapi.h"
- #endif
+ #endif 
 
  #ifndef __OSL_SYSTEM_H__
  #include "system.h"
@@ -40,15 +40,15 @@
  #ifndef _LIMITS_H
  #include <limits.h>
  #endif
-
+  
  #ifndef _RTL_USTRING_HXX_
  #include <rtl/ustring.hxx>
  #endif
-
+ 
  #ifndef _OSL_THREAD_H_
  #include <osl/thread.h>
  #endif
-
+ 
  //###########################
  inline rtl::OString OUStringToOString(const rtl_uString* s)
  {
@@ -56,11 +56,11 @@
         rtl::OUString(const_cast<rtl_uString*>(s)),
         osl_getThreadTextEncoding());
  }
-
+ 
  //###########################
 #ifdef MACOSX
 /*
- * Helper function for resolving Mac native alias files (not the same as unix alias files)
+ * Helper function for resolving Mac native alias files (not the same as unix alias files)  
  * and to return the resolved alias as rtl::OString
  */
  inline rtl::OString macxp_resolveAliasAndConvert(const rtl_uString* s)
@@ -76,58 +76,58 @@
   return p;
  }
 #endif /* MACOSX */
-
+ 
  //###########################
- //access_u
+ //access_u     
  int access_u(const rtl_uString* pustrPath, int mode)
  {
-#ifndef MACOSX // not MACOSX
+#ifndef MACOSX // not MACOSX  
     return access(OUStringToOString(pustrPath).getStr(), mode);
 #else
     return access(macxp_resolveAliasAndConvert(pustrPath).getStr(), mode);
 #endif
  }
-
+ 
  //#########################
- //realpath_u
+ //realpath_u  
  sal_Bool realpath_u(const rtl_uString* pustrFileName, rtl_uString** ppustrResolvedName)
  {
-#ifndef MACOSX // not MACOSX
+#ifndef MACOSX // not MACOSX  
         rtl::OString fn = OUStringToOString(pustrFileName);
 #else
     rtl::OString fn = macxp_resolveAliasAndConvert(pustrFileName);
 #endif
     char  rp[PATH_MAX];
-    bool  bRet = realpath(fn.getStr(), rp);
-
+    bool  bRet = realpath(fn.getStr(), rp); 
+    
     if (bRet)
     {
         rtl::OUString resolved = rtl::OStringToOUString(
             rtl::OString(static_cast<sal_Char*>(rp)),
             osl_getThreadTextEncoding());
-
+            
         rtl_uString_assign(ppustrResolvedName, resolved.pData);
     }
     return bRet;
  }
-
+ 
  //#########################
- //lstat_u
+ //lstat_u 
   int lstat_u(const rtl_uString* pustrPath, struct stat* buf)
- {
-#ifndef MACOSX  // not MACOSX
+ { 	
+#ifndef MACOSX  // not MACOSX  
     return lstat(OUStringToOString(pustrPath).getStr(), buf);
 #else
     return lstat(macxp_resolveAliasAndConvert(pustrPath).getStr(), buf);
 #endif
- }
-
+ } 
+ 
  //#########################
  // @see mkdir
  int mkdir_u(const rtl_uString* path, mode_t mode)
- {
-    return mkdir(OUStringToOString(path).getStr(), mode);
+ {    
+    return mkdir(OUStringToOString(path).getStr(), mode);     
  }
-
+ 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/uunxapi.h b/sal/osl/unx/uunxapi.h
index 9ac7ddd7ebb5..1082a3e7a25b 100644
--- a/sal/osl/unx/uunxapi.h
+++ b/sal/osl/unx/uunxapi.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,65 +25,65 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
  #ifndef _OSL_UUNXAPI_H_
  #define _OSL_UUNXAPI_H_
-
+  
  #ifndef _UNISTD_H
  #include <unistd.h>
  #endif
-
+ 
  #ifndef _STDLIB_H
  #include <stdlib.h>
  #endif
-
+ 
  #ifndef _TYPES_H
  #include <sys/types.h>
  #endif
-
+ 
  #ifndef _STAT_H
  #include <sys/stat.h>
  #endif
-
+ 
  #ifndef _RTL_USTRING_H_
  #include <rtl/ustring.h>
  #endif
-
-
+ 
+ 
  #ifdef __cplusplus
  extern "C"
  {
  #endif
-
- /* @see access */
+    
+ /* @see access */   
  int access_u(const rtl_uString* pustrPath, int mode);
-
- /***********************************
+ 
+ /***********************************  
   @descr
   The return value differs from the
   realpath function
-
+  
   @returns sal_True on success else
   sal_False
-
+  
   @see realpath
-  **********************************/
+  **********************************/  
  sal_Bool realpath_u(
-     const rtl_uString* pustrFileName,
+     const rtl_uString* pustrFileName, 
     rtl_uString** ppustrResolvedName);
-
+   
  /* @see lstat */
  int lstat_u(const rtl_uString* pustrPath, struct stat* buf);
-
+ 
  /* @see mkdir */
  int mkdir_u(const rtl_uString* path, mode_t mode);
-
+ 
  #ifdef __cplusplus
  }
  #endif
-
-
+ 
+ 
  #endif /* _OSL_UUNXAPI_H_ */
-
+ 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/uunxapi.hxx b/sal/osl/unx/uunxapi.hxx
index 44ad6a0df4b1..5886d11e8f15 100644
--- a/sal/osl/unx/uunxapi.hxx
+++ b/sal/osl/unx/uunxapi.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,64 +25,64 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
  #ifndef _OSL_UUNXAPI_HXX_
  #define _OSL_UUNXAPI_HXX_
-
+  
  #ifndef _OSL_UUNXAPI_H_
  #include "uunxapi.h"
  #endif
-
+ 
  #ifndef _RTL_USTRING_HXX_
  #include <rtl/ustring.hxx>
  #endif
-
+ 
  namespace osl
  {
-
+ 
      /***********************************
-      osl::access
-
+      osl::access 
+  
       @see access
       **********************************/
-
+  
      inline int access(const rtl::OUString& ustrPath, int mode)
       {
          return access_u(ustrPath.pData, mode);
        }
-
+ 
      /***********************************
       osl::realpath
-
+  
       @descr
       The return value differs from the
       realpath function
-
+  
       @returns sal_True on success else
       sal_False
-
+  
       @see realpath
       **********************************/
-
+  
      inline sal_Bool realpath(
-         const rtl::OUString& ustrFileName,
+         const rtl::OUString& ustrFileName, 
         rtl::OUString& ustrResolvedName)
      {
          return realpath_u(ustrFileName.pData, &ustrResolvedName.pData);
       }
-
-
+ 
+     
      /***********************************
       osl::lstat
-
+  
       @see lstat
       **********************************/
-
+     
       inline int lstat(const rtl::OUString& ustrPath, struct stat& buf)
       {
            return lstat_u(ustrPath.pData, &buf);
       }
-
+    
     /***********************************
           osl::mkdir
           @see mkdir
@@ -91,11 +91,11 @@
     {
         return mkdir_u(aPath.pData, aMode);
     }
-
+    
  } // end namespace osl
-
-
+ 
+ 
  #endif /* _OSL_UUNXAPI_HXX_ */
-
+ 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/conditn.c b/sal/osl/w32/conditn.c
index 745c3317fbb2..d05dce2e2a0b 100644
--- a/sal/osl/w32/conditn.c
+++ b/sal/osl/w32/conditn.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,22 +33,22 @@
 #include <osl/time.h>
 
 /*
-    under WIN32, we use the void* oslCondition
+    under WIN32, we use the void* oslCondition 
     as a WIN32 HANDLE (which is also a 32-bit value)
 */
 
 /*****************************************************************************/
 /* osl_createCondition */
 /*****************************************************************************/
-oslCondition SAL_CALL osl_createCondition(void)
+oslCondition SAL_CALL osl_createCondition(void) 
 {
     oslCondition Condition;
 
-    Condition= (oslCondition)CreateEvent(0,         /* no security */
-                                         sal_True,      /* manual reset */
-                                         sal_False,     /* initial state not signaled */
-                                         0);        /* automatic name */
-
+    Condition= (oslCondition)CreateEvent(0,			/* no security */
+                                         sal_True,		/* manual reset */
+                                         sal_False,		/* initial state not signaled */
+                                         0);		/* automatic name */
+    
     return Condition;
 
 }
@@ -56,9 +56,9 @@ oslCondition SAL_CALL osl_createCondition(void)
 /*****************************************************************************/
 /* osl_destroyCondition */
 /*****************************************************************************/
-void SAL_CALL osl_destroyCondition(oslCondition Condition)
+void SAL_CALL osl_destroyCondition(oslCondition Condition) 
 {
-    if(Condition)
+    if(Condition) 
     {
         OSL_VERIFY(CloseHandle(Condition));
     }
@@ -67,7 +67,7 @@ void SAL_CALL osl_destroyCondition(oslCondition Condition)
 /*****************************************************************************/
 /* osl_setCondition */
 /*****************************************************************************/
-sal_Bool SAL_CALL osl_setCondition(oslCondition Condition)
+sal_Bool SAL_CALL osl_setCondition(oslCondition Condition) 
 {
     OSL_ASSERT(Condition);
 
@@ -77,7 +77,7 @@ sal_Bool SAL_CALL osl_setCondition(oslCondition Condition)
 /*****************************************************************************/
 /* osl_resetCondition */
 /*****************************************************************************/
-sal_Bool SAL_CALL osl_resetCondition(oslCondition Condition)
+sal_Bool SAL_CALL osl_resetCondition(oslCondition Condition) 
 {
     OSL_ASSERT(Condition);
 
@@ -87,8 +87,8 @@ sal_Bool SAL_CALL osl_resetCondition(oslCondition Condition)
 /*****************************************************************************/
 /* osl_waitCondition */
 /*****************************************************************************/
-oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition,
-                                     const TimeValue* pTimeout)
+oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, 
+                                     const TimeValue* pTimeout) 
 {
     DWORD timeout;
 
@@ -109,7 +109,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition,
         {
             case WAIT_OBJECT_0 + 1:
                 {
-                MSG msg;
+                MSG	msg;
 
                 /* We Must not dispatch the message. PM_NOREMOVE leaves the message queue untouched
                  but dispatches SendMessage calls automatically */
@@ -122,10 +122,10 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition,
                 return (osl_cond_result_ok);
 
             case WAIT_TIMEOUT:
-                return (osl_cond_result_timeout);
+                return (osl_cond_result_timeout);				
 
             default:
-                return (osl_cond_result_error);
+                return (osl_cond_result_error);			
         }
     }
 }
@@ -133,7 +133,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition,
 /*****************************************************************************/
 /* osl_checkCondition */
 /*****************************************************************************/
-sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition)
+sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition) 
 {
     OSL_ASSERT(Condition);
 
diff --git a/sal/osl/w32/diagnose.c b/sal/osl/w32/diagnose.c
index 58f02de8a86f..caf511a4a89d 100644
--- a/sal/osl/w32/diagnose.c
+++ b/sal/osl/w32/diagnose.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,12 +35,12 @@
 
 #define NO_DEBUG_CRT
 
-static pfunc_osl_printDebugMessage  _pPrintDebugMessage = NULL;
-static pfunc_osl_printDetailedDebugMessage  _pPrintDetailedDebugMessage = NULL;
+static pfunc_osl_printDebugMessage	_pPrintDebugMessage = NULL;
+static pfunc_osl_printDetailedDebugMessage	_pPrintDetailedDebugMessage = NULL;
 
 pfunc_osl_printDebugMessage SAL_CALL osl_setDebugMessageFunc( pfunc_osl_printDebugMessage pNewFunc )
 {
-    pfunc_osl_printDebugMessage pOldFunc = _pPrintDebugMessage;
+    pfunc_osl_printDebugMessage	pOldFunc = _pPrintDebugMessage;
     _pPrintDebugMessage = pNewFunc;
 
     return pOldFunc;
@@ -48,7 +48,7 @@ pfunc_osl_printDebugMessage SAL_CALL osl_setDebugMessageFunc( pfunc_osl_printDeb
 
 pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pfunc_osl_printDetailedDebugMessage pNewFunc )
 {
-    pfunc_osl_printDetailedDebugMessage pOldFunc = _pPrintDetailedDebugMessage;
+    pfunc_osl_printDetailedDebugMessage	pOldFunc = _pPrintDetailedDebugMessage;
     _pPrintDetailedDebugMessage = pNewFunc;
     return pOldFunc;
 }
@@ -87,7 +87,7 @@ void SAL_CALL osl_trace(const sal_Char* lpszFormat, ...)
 
     if ( IsDebuggerPresent() )
     {
-        sal_Char    szMessage[512];
+        sal_Char	szMessage[512];
         written = _vsnprintf( szMessage, sizeof(szMessage) - 2, lpszFormat, args );
         if ( written == -1 )
             written = sizeof(szMessage) - 2;
@@ -101,7 +101,7 @@ void SAL_CALL osl_trace(const sal_Char* lpszFormat, ...)
     fprintf(stderr,"\n");
 
     fflush(stderr);
-
+     
     va_end(args);
 }
 
@@ -117,11 +117,11 @@ sal_Bool SAL_CALL osl_assertFailedLine(const sal_Char* pszFileName, sal_Int32 nL
     /* get app name or NULL if unknown (don't call assert) */
     LPCSTR lpszAppName = "Error";
     sal_Char   szMessage[512];
-
+    
     /* format message into buffer */
-    szMessage[sizeof(szMessage)-1] = '\0';  /* zero terminate always */
+    szMessage[sizeof(szMessage)-1] = '\0';	/* zero terminate always */
     _snprintf(szMessage, sizeof(szMessage)-1, "%s: File %hs, Line %d\n:%s\n",
-               lpszAppName, pszFileName, nLine, pszMessage);
+               lpszAppName, pszFileName, nLine,	pszMessage);
 
     OutputDebugString(szMessage);
 
@@ -131,7 +131,7 @@ sal_Bool SAL_CALL osl_assertFailedLine(const sal_Char* pszFileName, sal_Int32 nL
         _pPrintDebugMessage( szMessage );
     else if ( !getenv( "DISABLE_SAL_DBGBOX" ) )
     {
-        TCHAR   szBoxMessage[1024];
+        TCHAR	szBoxMessage[1024];
 
         /* active popup window for the current thread */
         hWndParent = GetActiveWindow();
@@ -148,9 +148,9 @@ sal_Bool SAL_CALL osl_assertFailedLine(const sal_Char* pszFileName, sal_Int32 nL
         szBoxMessage[sizeof(szBoxMessage)-1] = 0;
         _snprintf(szBoxMessage, sizeof(szBoxMessage)-1, "%s\n( Yes=Abort / No=Ignore / Cancel=Debugger )",
                    szMessage);
-
+        
         nCode = MessageBox(hWndParent, szBoxMessage, "Assertion Failed!", nFlags);
-
+ 
         if (nCode == IDYES)
             FatalExit(-1);
 
@@ -168,14 +168,14 @@ sal_Int32 SAL_CALL osl_reportError(sal_uInt32 nType, const sal_Char* pszMessage)
 {
     UINT nFlags;
     int nDisposition;
-
+        
     // active popup window for the current thread
     HWND hWndParent = GetActiveWindow();
     if (hWndParent != NULL)
         hWndParent = GetLastActivePopup(hWndParent);
 
     nType = nType; /* avoid warnings */
-
+    
     /* set message box flags */
     nFlags = MB_TASKMODAL | MB_ICONERROR | MB_YESNOCANCEL | MB_DEFBUTTON2 | MB_SETFOREGROUND;
     if (hWndParent == NULL)
diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c
index 2004d30669ca..9a398656544e 100644
--- a/sal/osl/w32/dllentry.c
+++ b/sal/osl/w32/dllentry.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -70,7 +70,7 @@ static void do_cleanup(void);
 
 #else
 
-/*
+/* 
 This is needed because DllMain is called after static constructors. A DLL's
 startup and shutdown sequence looks like this:
 
@@ -137,7 +137,7 @@ __do_global_ctors (void)
     ;
     }
 
-  /*
+  /* 
    * Go through the list backwards calling constructors.
    */
   for (i = nptrs; i >= 1; i--)
@@ -171,13 +171,13 @@ static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvR
 {
     (void)hinstDLL; /* avoid warnings */
     (void)lpvReserved; /* avoid warnings */
-
+    
     switch (fdwReason)
     {
         case DLL_PROCESS_ATTACH:
             {
 #endif
-                OSVERSIONINFO aInfo;
+                OSVERSIONINFO aInfo;                
 
 #ifdef _M_IX86
                 SYSTEM_INFO SystemInfo;
@@ -205,16 +205,16 @@ static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvR
                 /* initialize "current directory" mutex */
                 g_CurrentDirectoryMutex = osl_createMutex();
 
-
-                /* initialize Win9x unicode functions */
+      
+                /* initialize Win9x unicode functions */                
                 aInfo.dwOSVersionInfoSize = sizeof( OSVERSIONINFO );
 
                 if ( GetVersionEx(&aInfo) )
                     g_dwPlatformId = aInfo.dwPlatformId;
-
+                
                 g_dwTLSTextEncodingIndex = TlsAlloc();
                 InitializeCriticalSection( &g_ThreadKeyListCS );
-
+        
                 //We disable floating point exceptions. This is the usual state at program startup
                 //but on Windows 98 and ME this is not always the case.
                 _control87(_MCW_EM, _MCW_EM);
@@ -261,7 +261,7 @@ void do_cleanup( void )
             {
                 /* cleanup locale hashtable */
                 rtl_locale_fini();
-
+ 
                 /* finalize memory management */
                 rtl_memory_fini();
                 rtl_cache_fini();
@@ -361,7 +361,7 @@ BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
             return TRUE;
         }
 
-        case DLL_THREAD_ATTACH:
+        case DLL_THREAD_ATTACH:         
             break;
 
         case DLL_THREAD_DETACH:
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 678434acddc1..d42b0ada7494 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -347,7 +347,7 @@ oslFileError FileHandle_Impl::writeAt (
             return oslTranslateFileError( GetLastError() );
         m_offset = nOffset;
     }
-
+    
     DWORD dwDone = 0;
     if (!::WriteFile(m_hFile, pBuffer, nBytesToWrite, &dwDone, 0))
         return oslTranslateFileError( GetLastError() );
@@ -662,7 +662,7 @@ oslFileError FileHandle_Impl::syncFile()
     }
     return (result);
 }
-
+ 
 //##################################################################
 // File I/O functions
 //##################################################################
@@ -707,7 +707,7 @@ SAL_CALL osl_createFileHandleFromOSHandle (
 }
 
 //#############################################
-oslFileError
+oslFileError 
 SAL_CALL osl_openFile(
     rtl_uString *   strPath,
     oslFileHandle * pHandle,
@@ -763,7 +763,7 @@ SAL_CALL osl_syncFile(oslFileHandle Handle)
 
     if (!FlushFileBuffers(pImpl->m_hFile))
         return oslTranslateFileError(GetLastError());
-
+        
     return osl_File_E_None;
 }
 
@@ -816,7 +816,7 @@ SAL_CALL osl_mapFile(
             (void)::CloseHandle(m_handle);
         }
     };
-
+        
     FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
     if ((0 == pImpl) || !IsValidHandle(pImpl->m_hFile) || (0 == ppAddr))
         return osl_File_E_INVAL;
@@ -910,11 +910,11 @@ SAL_CALL osl_readLine(
 }
 
 //#############################################
-oslFileError
-SAL_CALL osl_readFile(
-    oslFileHandle Handle,
-    void *        pBuffer,
-    sal_uInt64    uBytesRequested,
+oslFileError 
+SAL_CALL osl_readFile( 
+    oslFileHandle Handle, 
+    void *        pBuffer, 
+    sal_uInt64    uBytesRequested, 
     sal_uInt64 *  pBytesRead)
 {
     FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
@@ -933,9 +933,9 @@ SAL_CALL osl_readFile(
 //#############################################
 oslFileError
 SAL_CALL osl_writeFile(
-    oslFileHandle Handle,
-    const void *  pBuffer,
-    sal_uInt64    uBytesToWrite,
+    oslFileHandle Handle, 
+    const void *  pBuffer, 
+    sal_uInt64    uBytesToWrite, 
     sal_uInt64 *  pBytesWritten )
 {
     FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle);
@@ -1116,12 +1116,12 @@ SAL_CALL osl_setFileSize (oslFileHandle Handle, sal_uInt64 uSize)
 //##################################################################
 // File handling functions
 //##################################################################
-
+ 
 //#############################################
 oslFileError SAL_CALL osl_removeFile( rtl_uString* strPath )
 {
-    rtl_uString *strSysPath = NULL;
-    oslFileError    error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
+    rtl_uString	*strSysPath = NULL;
+    oslFileError	error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
 
     if ( osl_File_E_None == error )
     {
@@ -1136,13 +1136,13 @@ oslFileError SAL_CALL osl_removeFile( rtl_uString* strPath )
 }
 
 //#############################################
-#define osl_File_CopyRecursive  0x0001
-#define osl_File_CopyOverwrite  0x0002
+#define osl_File_CopyRecursive	0x0001
+#define osl_File_CopyOverwrite	0x0002
 
 oslFileError SAL_CALL osl_copyFile( rtl_uString* strPath, rtl_uString *strDestPath )
 {
-    rtl_uString *strSysPath = NULL, *strSysDestPath = NULL;
-    oslFileError    error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
+    rtl_uString	*strSysPath = NULL, *strSysDestPath = NULL;
+    oslFileError	error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
 
     if ( osl_File_E_None == error )
         error = _osl_getSystemPathFromFileURL( strDestPath, &strSysDestPath, sal_False );
@@ -1169,8 +1169,8 @@ oslFileError SAL_CALL osl_copyFile( rtl_uString* strPath, rtl_uString *strDestPa
 //#############################################
 oslFileError SAL_CALL osl_moveFile( rtl_uString* strPath, rtl_uString *strDestPath )
 {
-    rtl_uString *strSysPath = NULL, *strSysDestPath = NULL;
-    oslFileError    error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
+    rtl_uString	*strSysPath = NULL, *strSysDestPath = NULL;
+    oslFileError	error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
 
     if ( osl_File_E_None == error )
         error = _osl_getSystemPathFromFileURL( strDestPath, &strSysDestPath, sal_False );
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 3b0529f1e713..85d067f39437 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@
 #include <tchar.h>
 #ifdef __MINGW32__
 #include <ctype.h>
-#endif
+#endif 
 
 //#####################################################
 static const wchar_t UNC_PREFIX[] = L"\\\\";
@@ -57,11 +57,11 @@ static const wchar_t SLASH = '/';
 //#####################################################
 extern "C" BOOL TimeValueToFileTime(const TimeValue *cpTimeVal, FILETIME *pFTime)
 {
-    SYSTEMTIME  BaseSysTime;
-    FILETIME    BaseFileTime;
-    FILETIME    FTime;
-    __int64     localTime;
-    BOOL        fSuccess = FALSE;
+    SYSTEMTIME	BaseSysTime;
+    FILETIME	BaseFileTime;
+    FILETIME	FTime;
+    __int64		localTime;
+    BOOL		fSuccess = FALSE;
 
     BaseSysTime.wYear         = 1970;
     BaseSysTime.wMonth        = 1;
@@ -90,9 +90,9 @@ extern "C" BOOL TimeValueToFileTime(const TimeValue *cpTimeVal, FILETIME *pFTime
 //#####################################################
 extern "C" BOOL FileTimeToTimeValue(const FILETIME *cpFTime, TimeValue *pTimeVal)
 {
-    SYSTEMTIME  BaseSysTime;
-    FILETIME    BaseFileTime;
-    BOOL        fSuccess = FALSE;   /* Assume failure */
+    SYSTEMTIME	BaseSysTime;
+    FILETIME	BaseFileTime;
+    BOOL		fSuccess = FALSE;	/* Assume failure */
 
     BaseSysTime.wYear         = 1970;
     BaseSysTime.wMonth        = 1;
@@ -105,7 +105,7 @@ extern "C" BOOL FileTimeToTimeValue(const FILETIME *cpFTime, TimeValue *pTimeVal
 
     if ( SystemTimeToFileTime(&BaseSysTime, &BaseFileTime) )
     {
-        __int64     Value;
+        __int64		Value;
 
         fSuccess = 0 <= (Value = *((__int64 *)cpFTime) - *((__int64 *)&BaseFileTime));
 
@@ -120,104 +120,104 @@ extern "C" BOOL FileTimeToTimeValue(const FILETIME *cpFTime, TimeValue *pTimeVal
 
 //#####################################################
 namespace /* private */
-{
+{       
     //#####################################################
     struct Component
-    {
-        Component() :
+    {       
+        Component() : 
             begin_(0), end_(0)
         {}
 
         bool isPresent() const
-        { return (static_cast<sal_IntPtr>(end_ - begin_) > 0); }
-
+        { return (static_cast<sal_IntPtr>(end_ - begin_) > 0); }        
+        
         const sal_Unicode* begin_;
         const sal_Unicode* end_;
     };
-
+                    
     //#####################################################
     struct UNCComponents
-    {
+    {                        
         Component server_;
         Component share_;
         Component resource_;
     };
-
+    
     //#####################################################
     inline bool is_UNC_path(const sal_Unicode* path)
     { return (0 == wcsncmp(UNC_PREFIX, reinterpret_cast<LPCWSTR>(path), SAL_N_ELEMENTS(UNC_PREFIX) - 1)); }
-
+    
     //#####################################################
     inline bool is_UNC_path(const rtl::OUString& path)
     { return is_UNC_path(path.getStr()); }
-
+    
     //#####################################################
     void parse_UNC_path(const sal_Unicode* path, UNCComponents* puncc)
-    {
+    {                
         OSL_PRECOND(is_UNC_path(path), "Precondition violated: No UNC path");
         OSL_PRECOND(rtl_ustr_indexOfChar(path, SLASH) != -1, "Path must not contain slashes");
-
+                        
         const sal_Unicode* pend = path + rtl_ustr_getLength(path);
         const sal_Unicode* ppos = path + 2;
-
-        puncc->server_.begin_ = ppos;
+                
+        puncc->server_.begin_ = ppos;                                    
         while ((ppos < pend) && (*ppos != BACKSLASH))
             ppos++;
-
+        
         puncc->server_.end_ = ppos;
-
-        if (BACKSLASH == *ppos)
-        {
-            puncc->share_.begin_ = ++ppos;
+        
+        if (BACKSLASH == *ppos)    
+        {                                                
+            puncc->share_.begin_ = ++ppos;                                
             while ((ppos < pend) && (*ppos != BACKSLASH))
                 ppos++;
-
+                
             puncc->share_.end_ = ppos;
-
+                                        
             if (BACKSLASH == *ppos)
-            {
-                puncc->resource_.begin_ = ++ppos;
+            {                                                                                                                                                                               
+                puncc->resource_.begin_ = ++ppos;                                                        
                 while (ppos < pend)
                     ppos++;
-
+                
                 puncc->resource_.end_ = ppos;
-            }
-        }
-
+            }                                 
+        }     
+        
         OSL_POSTCOND(puncc->server_.isPresent() && puncc->share_.isPresent(), \
-        "Postcondition violated: Invalid UNC path detected");
+        "Postcondition violated: Invalid UNC path detected");   
     }
-
+    
     //#####################################################
     void parse_UNC_path(const rtl::OUString& path, UNCComponents* puncc)
     { parse_UNC_path(path.getStr(), puncc); }
-
-
+    
+                                   
     //#####################################################
     bool has_path_parent(const sal_Unicode* path)
-    {
-        // Has the given path a parent or are we already there,
+    {                
+        // Has the given path a parent or are we already there, 
         // e.g. 'c:\' or '\\server\share\'?
 
         bool has_parent = false;
         if (is_UNC_path(path))
         {
             UNCComponents unc_comp;
-            parse_UNC_path(path, &unc_comp);
+            parse_UNC_path(path, &unc_comp);                        
             has_parent = unc_comp.resource_.isPresent();
         }
-        else
+        else 
         {
             has_parent = !osl::systemPathIsLogicalDrivePattern(path);
         }
         return has_parent;
     }
-
+    
     //#####################################################
     inline bool has_path_parent(const rtl::OUString& path)
     { return has_path_parent(path.getStr()); }
-
-} // end namespace private
+    
+} // end namespace private 
 
 //#####################################################
 // volume handling functions
@@ -281,53 +281,53 @@ oslFileError SAL_CALL osl_getVolumeDeviceMountPath( oslVolumeDeviceHandle Handle
 // directory handling functions
 //##################################################################
 
-#define DIRECTORYITEM_DRIVE     0
-#define DIRECTORYITEM_FILE      1
-#define DIRECTORYITEM_SERVER    2
+#define DIRECTORYITEM_DRIVE		0
+#define DIRECTORYITEM_FILE		1
+#define DIRECTORYITEM_SERVER	2
 
 struct DirectoryItem_Impl
 {
     UINT uType;
     union {
-        WIN32_FIND_DATA FindData;
-        TCHAR           cDriveString[MAX_PATH];
+        WIN32_FIND_DATA	FindData;
+        TCHAR			cDriveString[MAX_PATH];
     };
     rtl_uString*    m_pFullPath;
-    BOOL            bFullPathNormalized;
-    int             nRefCount;
+    BOOL			bFullPathNormalized;
+    int				nRefCount;
 };
 
 //#####################################################
 
-#define DIRECTORYTYPE_LOCALROOT     0
-#define DIRECTORYTYPE_NETROOT       1
-#define DIRECTORYTYPE_NETRESORCE    2
-#define DIRECTORYTYPE_FILESYSTEM    3
+#define	DIRECTORYTYPE_LOCALROOT	    0
+#define	DIRECTORYTYPE_NETROOT		1
+#define	DIRECTORYTYPE_NETRESORCE	2
+#define	DIRECTORYTYPE_FILESYSTEM	3
 
 struct Directory_Impl
 {
     UINT uType;
     union {
-        HANDLE  hDirectory;
-        HANDLE  hEnumDrives;
+        HANDLE	hDirectory;
+        HANDLE	hEnumDrives;
     };
     rtl_uString*    m_pDirectoryPath;
 };
 
-//#####################################################
+//##################################################### 
 
 typedef struct tagDRIVEENUM
 {
-    LPCTSTR lpIdent;
-    TCHAR   cBuffer[/*('Z' - 'A' + 1) * sizeof("A:\\") + 1*/256];
-    LPCTSTR lpCurrent;
+    LPCTSTR	lpIdent;
+    TCHAR	cBuffer[/*('Z' - 'A' + 1) * sizeof("A:\\") + 1*/256];
+    LPCTSTR	lpCurrent;
 } DRIVEENUM, * PDRIVEENUM, FAR * LPDRIVEENUM;
 
-//#####################################################
+//##################################################### 
 
 static HANDLE WINAPI OpenLogicalDrivesEnum(void)
 {
-    LPDRIVEENUM pEnum = (LPDRIVEENUM)HeapAlloc( GetProcessHeap(), 0, sizeof(DRIVEENUM) );
+    LPDRIVEENUM	pEnum = (LPDRIVEENUM)HeapAlloc( GetProcessHeap(), 0, sizeof(DRIVEENUM) );
     if ( pEnum )
     {
         DWORD dwNumCopied = GetLogicalDriveStrings( (sizeof(pEnum->cBuffer) - 1) / sizeof(TCHAR), pEnum->cBuffer );
@@ -346,15 +346,15 @@ static HANDLE WINAPI OpenLogicalDrivesEnum(void)
     return pEnum ? (HANDLE)pEnum : INVALID_HANDLE_VALUE;
 }
 
-//#####################################################
+//##################################################### 
 static BOOL WINAPI EnumLogicalDrives(HANDLE hEnum, LPTSTR lpBuffer)
 {
-    BOOL        fSuccess = FALSE;
-    LPDRIVEENUM pEnum = (LPDRIVEENUM)hEnum;
+    BOOL		fSuccess = FALSE;
+    LPDRIVEENUM	pEnum = (LPDRIVEENUM)hEnum;
 
     if ( pEnum )
     {
-        int nLen = _tcslen( pEnum->lpCurrent );
+        int	nLen = _tcslen( pEnum->lpCurrent );
 
         if ( nLen )
         {
@@ -371,11 +371,11 @@ static BOOL WINAPI EnumLogicalDrives(HANDLE hEnum, LPTSTR lpBuffer)
     return fSuccess;
 }
 
-//#####################################################
+//##################################################### 
 static BOOL WINAPI CloseLogicalDrivesEnum(HANDLE hEnum)
 {
-    BOOL        fSuccess = FALSE;
-    LPDRIVEENUM pEnum = (LPDRIVEENUM)hEnum;
+    BOOL		fSuccess = FALSE;
+    LPDRIVEENUM	pEnum = (LPDRIVEENUM)hEnum;
 
     if ( pEnum )
     {
@@ -398,7 +398,7 @@ typedef struct tagDIRECTORY
 //#####################################################
 static HANDLE WINAPI OpenDirectory( rtl_uString* pPath)
 {
-    LPDIRECTORY pDirectory = NULL;
+    LPDIRECTORY	pDirectory = NULL;
 
     if ( pPath )
     {
@@ -427,7 +427,7 @@ static HANDLE WINAPI OpenDirectory( rtl_uString* pPath)
             pDirectory = (LPDIRECTORY)HeapAlloc(GetProcessHeap(), 0, sizeof(DIRECTORY));
             pDirectory->hFind = FindFirstFile(szFileMask, &pDirectory->aFirstData);
 
-            if (!IsValidHandle(pDirectory->hFind))
+            if (!IsValidHandle(pDirectory->hFind))		
             {
                 if ( GetLastError() != ERROR_NO_MORE_FILES )
                 {
@@ -444,12 +444,12 @@ static HANDLE WINAPI OpenDirectory( rtl_uString* pPath)
 //#####################################################
 BOOL WINAPI EnumDirectory(HANDLE hDirectory, LPWIN32_FIND_DATA pFindData)
 {
-    BOOL        fSuccess = FALSE;
-    LPDIRECTORY pDirectory = (LPDIRECTORY)hDirectory;
+    BOOL		fSuccess = FALSE;
+    LPDIRECTORY	pDirectory = (LPDIRECTORY)hDirectory;
 
     if ( pDirectory )
     {
-        BOOL    fValid;
+        BOOL	fValid;
 
         do
         {
@@ -480,8 +480,8 @@ BOOL WINAPI EnumDirectory(HANDLE hDirectory, LPWIN32_FIND_DATA pFindData)
 //#####################################################
 static BOOL WINAPI CloseDirectory(HANDLE hDirectory)
 {
-    BOOL        fSuccess = FALSE;
-    LPDIRECTORY pDirectory = (LPDIRECTORY)hDirectory;
+    BOOL		fSuccess = FALSE;
+    LPDIRECTORY	pDirectory = (LPDIRECTORY)hDirectory;
 
     if (pDirectory)
     {
@@ -500,9 +500,9 @@ static BOOL WINAPI CloseDirectory(HANDLE hDirectory)
 static oslFileError osl_openLocalRoot(
     rtl_uString *strDirectoryPath, oslDirectory *pDirectory)
 {
-    rtl_uString     *strSysPath = NULL;
-    oslFileError    error;
-
+    rtl_uString		*strSysPath = NULL;
+    oslFileError	error;
+        
     if ( !pDirectory )
         return osl_File_E_INVAL;
 
@@ -511,7 +511,7 @@ static oslFileError osl_openLocalRoot(
     error = _osl_getSystemPathFromFileURL( strDirectoryPath, &strSysPath, sal_False );
     if ( osl_File_E_None == error )
     {
-        Directory_Impl  *pDirImpl;
+        Directory_Impl	*pDirImpl;
 
         pDirImpl = reinterpret_cast<Directory_Impl*>(rtl_allocateMemory( sizeof(Directory_Impl)));
         ZeroMemory( pDirImpl, sizeof(Directory_Impl) );
@@ -573,7 +573,7 @@ static oslFileError SAL_CALL osl_openFileDirectory(
     rtl_uString *strDirectoryPath, oslDirectory *pDirectory)
 {
     oslFileError error = osl_File_E_None;
-
+        
     if ( !pDirectory )
         return osl_File_E_INVAL;
     *pDirectory = NULL;
@@ -625,29 +625,29 @@ static oslFileError SAL_CALL osl_openFileDirectory(
 static oslFileError SAL_CALL osl_openNetworkServer(
     rtl_uString *strSysDirPath, oslDirectory *pDirectory)
 {
-    NETRESOURCEW    aNetResource;
-    HANDLE          hEnum;
-    DWORD           dwError;
+    NETRESOURCEW	aNetResource;
+    HANDLE			hEnum;
+    DWORD			dwError;
 
     ZeroMemory( &aNetResource, sizeof(aNetResource) );
 
     aNetResource.lpRemoteName = reinterpret_cast<LPWSTR>(strSysDirPath->buffer);
 
-    dwError = WNetOpenEnumW(
-        RESOURCE_GLOBALNET,
-        RESOURCETYPE_DISK,
-        RESOURCEUSAGE_CONNECTABLE | RESOURCEUSAGE_CONTAINER,
-        &aNetResource,
+    dwError = WNetOpenEnumW( 
+        RESOURCE_GLOBALNET, 
+        RESOURCETYPE_DISK, 
+        RESOURCEUSAGE_CONNECTABLE | RESOURCEUSAGE_CONTAINER, 
+        &aNetResource, 
         &hEnum );
 
     if ( ERROR_SUCCESS == dwError )
     {
-        Directory_Impl  *pDirImpl;
+        Directory_Impl	*pDirImpl;
 
         pDirImpl = reinterpret_cast<Directory_Impl*>(rtl_allocateMemory(sizeof(Directory_Impl)));
         ZeroMemory( pDirImpl, sizeof(Directory_Impl) );
         pDirImpl->uType = DIRECTORYTYPE_NETROOT;
-        pDirImpl->hDirectory = hEnum;
+        pDirImpl->hDirectory = hEnum;	
         *pDirectory = (oslDirectory)pDirImpl;
     }
     return oslTranslateFileError( dwError );
@@ -656,10 +656,10 @@ static oslFileError SAL_CALL osl_openNetworkServer(
 //#############################################
 static DWORD create_dir_with_callback(
     rtl_uString * dir_path,
-    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
+    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
     void* pData)
 {
-    // Create the specified directory and call the
+    // Create the specified directory and call the 
     // user specified callback function. On success
     // the function returns ERROR_SUCCESS else a Win32 error code.
 
@@ -682,43 +682,43 @@ static DWORD create_dir_with_callback(
 
 //#############################################
 static int path_make_parent(sal_Unicode* path)
-{
-    /*  Cut off the last part of the given path to
-    get the parent only, e.g. 'c:\dir\subdir' ->
+{    
+    /*  Cut off the last part of the given path to 
+    get the parent only, e.g. 'c:\dir\subdir' -> 
     'c:\dir' or '\\share\sub\dir' -> '\\share\sub'
-    @return The position where the path has been cut
+    @return The position where the path has been cut 
     off (this is the posistion of the last backslash).
-    If there are no more parents 0 will be returned,
-    e.g. 'c:\' or '\\Share' have no more parents */
+    If there are no more parents 0 will be returned, 
+    e.g. 'c:\' or '\\Share' have no more parents */        
 
     OSL_PRECOND(rtl_ustr_indexOfChar(path, SLASH) == -1, "Path must not contain slashes");
-    OSL_PRECOND(has_path_parent(path), "Path must have a parent");
-
+    OSL_PRECOND(has_path_parent(path), "Path must have a parent");                
+                    
     sal_Unicode* pos_last_backslash = path + rtl_ustr_lastIndexOfChar(path, BACKSLASH);
-    *pos_last_backslash = 0;
-    return (pos_last_backslash - path);
+    *pos_last_backslash = 0; 
+    return (pos_last_backslash - path);        
 }
-
+    
 //#############################################
 static DWORD create_dir_recursively_(
     rtl_uString * dir_path,
-    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
+    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
     void* pData)
 {
     OSL_PRECOND(
         rtl_ustr_lastIndexOfChar_WithLength(dir_path->buffer, dir_path->length, BACKSLASH) != dir_path->length,
         "Path must not end with a backslash");
-
+        
     DWORD w32_error = create_dir_with_callback(
         dir_path, aDirectoryCreationCallbackFunc, pData);
     if (w32_error == ERROR_SUCCESS)
-        return ERROR_SUCCESS;
-
+        return ERROR_SUCCESS;   
+                                
     if ((w32_error != ERROR_PATH_NOT_FOUND) || !has_path_parent(dir_path->buffer))
         return w32_error;
 
     int pos = path_make_parent(dir_path->buffer); // dir_path->buffer[pos] = 0, restore below
-
+                            
     w32_error = create_dir_recursively_(
         dir_path, aDirectoryCreationCallbackFunc, pData);
 
@@ -732,51 +732,51 @@ static DWORD create_dir_recursively_(
 
 //#############################################
 oslFileError SAL_CALL osl_createDirectoryPath(
-    rtl_uString* aDirectoryUrl,
-    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
+    rtl_uString* aDirectoryUrl, 
+    oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
     void* pData)
-{
+{   
     if (aDirectoryUrl == NULL)
         return osl_File_E_INVAL;
-
-    rtl::OUString sys_path;
-    oslFileError osl_error =
-        _osl_getSystemPathFromFileURL(aDirectoryUrl, &sys_path.pData, sal_False);
-
+        
+    rtl::OUString sys_path;         
+    oslFileError osl_error = 
+        _osl_getSystemPathFromFileURL(aDirectoryUrl, &sys_path.pData, sal_False);        
+    
     if (osl_error != osl_File_E_None)
         return osl_error;
-
+                                                                
     osl::systemPathRemoveSeparator(sys_path);
-
+    
     // const_cast because sys_path is a local copy
-    // which we want to modify inplace instead of
+    // which we want to modify inplace instead of 
     // coyp it into another buffer on the heap again
     return oslTranslateFileError(create_dir_recursively_(
-        sys_path.pData, aDirectoryCreationCallbackFunc, pData));
+        sys_path.pData, aDirectoryCreationCallbackFunc, pData));                     
 }
 
 //#####################################################
 oslFileError SAL_CALL osl_createDirectory(rtl_uString* strPath)
 {
-    rtl_uString *strSysPath = NULL;
-    oslFileError    error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
+    rtl_uString	*strSysPath = NULL;
+    oslFileError	error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
 
     if ( osl_File_E_None == error )
     {
         BOOL bCreated = FALSE;
 
         bCreated = CreateDirectoryW( reinterpret_cast<LPCWSTR>(rtl_uString_getStr( strSysPath )), NULL );
-
+        
         if ( !bCreated )
         {
             /*@@@ToDo
-              The following case is a hack because the ucb or the webtop had some
+              The following case is a hack because the ucb or the webtop had some 
               problems with the error code that CreateDirectory returns in
               case the path is only a logical drive, should be removed!
-            */
+            */			
 
-            const sal_Unicode   *pBuffer = rtl_uString_getStr( strSysPath );
-            sal_Int32           nLen = rtl_uString_getLength( strSysPath );
+            const sal_Unicode	*pBuffer = rtl_uString_getStr( strSysPath );
+            sal_Int32			nLen = rtl_uString_getLength( strSysPath );
 
             if (
                 ( ( pBuffer[0] >= 'A' && pBuffer[0] <= 'Z' ) ||
@@ -796,8 +796,8 @@ oslFileError SAL_CALL osl_createDirectory(rtl_uString* strPath)
 //#####################################################
 oslFileError SAL_CALL osl_removeDirectory(rtl_uString* strPath)
 {
-    rtl_uString *strSysPath = NULL;
-    oslFileError    error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
+    rtl_uString	*strSysPath = NULL;
+    oslFileError	error = _osl_getSystemPathFromFileURL( strPath, &strSysPath, sal_False );
 
     if ( osl_File_E_None == error )
     {
@@ -814,14 +814,14 @@ oslFileError SAL_CALL osl_removeDirectory(rtl_uString* strPath)
 //#####################################################
 oslFileError SAL_CALL osl_openDirectory(rtl_uString *strDirectoryPath, oslDirectory *pDirectory)
 {
-    oslFileError    error;
+    oslFileError	error;			
 
     if ( 0 == rtl_ustr_ascii_compareIgnoreAsciiCase( strDirectoryPath->buffer, "file:///" ) )
         error = osl_openLocalRoot( strDirectoryPath, pDirectory );
     else
     {
-        rtl_uString *strSysDirectoryPath = NULL;
-        DWORD       dwPathType;
+        rtl_uString	*strSysDirectoryPath = NULL;
+        DWORD		dwPathType;
 
         error = _osl_getSystemPathFromFileURL( strDirectoryPath, &strSysDirectoryPath, sal_False );
 
@@ -843,16 +843,16 @@ oslFileError SAL_CALL osl_openDirectory(rtl_uString *strDirectoryPath, oslDirect
 }
 
 //#####################################################
-static oslFileError SAL_CALL osl_getNextNetResource(
+static oslFileError SAL_CALL osl_getNextNetResource( 
     oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint )
 {
-    Directory_Impl      *pDirImpl = (Directory_Impl *)Directory;
-    DirectoryItem_Impl  *pItemImpl = NULL;
-    BYTE                buffer[16384];
-    LPNETRESOURCEW      lpNetResource = (LPNETRESOURCEW)buffer;
-    DWORD               dwError, dwCount, dwBufSize;
+    Directory_Impl		*pDirImpl = (Directory_Impl *)Directory;
+    DirectoryItem_Impl	*pItemImpl = NULL;
+    BYTE				buffer[16384];
+    LPNETRESOURCEW		lpNetResource = (LPNETRESOURCEW)buffer;
+    DWORD				dwError, dwCount, dwBufSize;
 
-    uHint = uHint; /* to get no warning */
+    uHint = uHint; /* to get no warning */        	    
 
     if ( !pItem )
         return osl_File_E_INVAL;
@@ -890,16 +890,16 @@ static oslFileError SAL_CALL osl_getNextNetResource(
     }
 }
 
-//#####################################################
-static oslFileError SAL_CALL osl_getNextDrive(
+//##################################################### 
+static oslFileError SAL_CALL osl_getNextDrive( 
     oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint )
 {
-    Directory_Impl      *pDirImpl = (Directory_Impl *)Directory;
-    DirectoryItem_Impl  *pItemImpl = NULL;
-    BOOL                fSuccess;
+    Directory_Impl		*pDirImpl = (Directory_Impl *)Directory;
+    DirectoryItem_Impl	*pItemImpl = NULL;
+    BOOL				fSuccess;
 
     uHint = uHint; /* avoid warnings */
-
+                
     if ( !pItem )
         return osl_File_E_INVAL;
     *pItem = NULL;
@@ -934,16 +934,16 @@ static oslFileError SAL_CALL osl_getNextDrive(
     }
 }
 
-//#####################################################
-static oslFileError SAL_CALL osl_getNextFileItem(
+//##################################################### 
+static oslFileError SAL_CALL osl_getNextFileItem( 
     oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint)
 {
-    Directory_Impl      *pDirImpl = (Directory_Impl *)Directory;
-    DirectoryItem_Impl  *pItemImpl = NULL;
-    BOOL                fFound;
+    Directory_Impl		*pDirImpl = (Directory_Impl *)Directory;
+    DirectoryItem_Impl	*pItemImpl = NULL;
+    BOOL				fFound;
 
     uHint = uHint; /* avoid warnings */
-
+                
     if ( !pItem )
         return osl_File_E_INVAL;
     *pItem = NULL;
@@ -985,12 +985,12 @@ static oslFileError SAL_CALL osl_getNextFileItem(
     }
 }
 
-//#####################################################
+//##################################################### 
 oslFileError SAL_CALL osl_getNextDirectoryItem(
     oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 uHint)
 {
-    Directory_Impl      *pDirImpl = (Directory_Impl *)Directory;
-
+    Directory_Impl		*pDirImpl = (Directory_Impl *)Directory;
+    
     /* Assume failure */
 
     if ( !pItem )
@@ -1016,8 +1016,8 @@ oslFileError SAL_CALL osl_getNextDirectoryItem(
 //#####################################################
 oslFileError SAL_CALL osl_closeDirectory(oslDirectory Directory)
 {
-    Directory_Impl  *pDirImpl = (Directory_Impl *)Directory;
-    oslFileError    eError = osl_File_E_INVAL;
+    Directory_Impl	*pDirImpl = (Directory_Impl *)Directory;
+    oslFileError	eError = osl_File_E_INVAL;
 
     if ( pDirImpl )
     {
@@ -1047,7 +1047,7 @@ oslFileError SAL_CALL osl_closeDirectory(oslDirectory Directory)
         }
 
         rtl_freeMemory(pDirImpl);
-    }
+    }	
     return eError;
 }
 
@@ -1064,10 +1064,10 @@ typedef enum _PATHTYPE
 
 oslFileError SAL_CALL osl_getDirectoryItem(rtl_uString *strFilePath, oslDirectoryItem *pItem)
 {
-    oslFileError    error = osl_File_E_None;
-    rtl_uString*    strSysFilePath = NULL;
-    PATHTYPE        type = PATHTYPE_FILE;
-    DWORD           dwPathType;
+    oslFileError	error = osl_File_E_None;
+    rtl_uString*	strSysFilePath = NULL;
+    PATHTYPE		type = PATHTYPE_FILE;
+    DWORD			dwPathType;
 
     /* Assume failure */
 
@@ -1095,7 +1095,7 @@ oslFileError SAL_CALL osl_getDirectoryItem(rtl_uString *strFilePath, oslDirector
     {
     case PATHTYPE_NETSERVER:
         {
-            DirectoryItem_Impl* pItemImpl =
+            DirectoryItem_Impl*	pItemImpl = 
                 reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
 
             if ( !pItemImpl )
@@ -1112,7 +1112,7 @@ oslFileError SAL_CALL osl_getDirectoryItem(rtl_uString *strFilePath, oslDirector
                 // Assign a title anyway
                 {
                     int iSrc = 2;
-                    int iDst = 0;
+                    int	iDst = 0;
 
                     while( iSrc < strSysFilePath->length && strSysFilePath->buffer[iSrc] && strSysFilePath->buffer[iSrc] != '\\' )
                     {
@@ -1126,7 +1126,7 @@ oslFileError SAL_CALL osl_getDirectoryItem(rtl_uString *strFilePath, oslDirector
         break;
     case PATHTYPE_VOLUME:
         {
-            DirectoryItem_Impl* pItemImpl =
+            DirectoryItem_Impl*	pItemImpl = 
                 reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
 
             if ( !pItemImpl )
@@ -1153,8 +1153,8 @@ oslFileError SAL_CALL osl_getDirectoryItem(rtl_uString *strFilePath, oslDirector
     case PATHTYPE_NETROOT:
     case PATHTYPE_FILE:
         {
-            HANDLE              hFind;
-            WIN32_FIND_DATA     aFindData;
+            HANDLE				hFind;
+            WIN32_FIND_DATA		aFindData;
 
             if ( strSysFilePath->length > 0 && strSysFilePath->buffer[strSysFilePath->length - 1] == '\\' )
                 rtl_uString_newFromStr_WithLength( &strSysFilePath, strSysFilePath->buffer, strSysFilePath->length - 1 );
@@ -1163,7 +1163,7 @@ oslFileError SAL_CALL osl_getDirectoryItem(rtl_uString *strFilePath, oslDirector
 
             if ( hFind != INVALID_HANDLE_VALUE )
             {
-                DirectoryItem_Impl  *pItemImpl =
+                DirectoryItem_Impl	*pItemImpl = 
                     reinterpret_cast<DirectoryItem_Impl*>(rtl_allocateMemory(sizeof(DirectoryItem_Impl)));
 
                 ZeroMemory( pItemImpl, sizeof(DirectoryItem_Impl) );
@@ -1194,7 +1194,7 @@ oslFileError SAL_CALL osl_getDirectoryItem(rtl_uString *strFilePath, oslDirector
 //#####################################################
 oslFileError SAL_CALL osl_acquireDirectoryItem( oslDirectoryItem Item )
 {
-    DirectoryItem_Impl  *pItemImpl = (DirectoryItem_Impl *)Item;
+    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
 
     if ( !pItemImpl )
         return osl_File_E_INVAL;
@@ -1206,7 +1206,7 @@ oslFileError SAL_CALL osl_acquireDirectoryItem( oslDirectoryItem Item )
 //#####################################################
 oslFileError SAL_CALL osl_releaseDirectoryItem( oslDirectoryItem Item )
 {
-    DirectoryItem_Impl  *pItemImpl = (DirectoryItem_Impl *)Item;
+    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
 
     if ( !pItemImpl )
         return osl_File_E_INVAL;
@@ -1232,31 +1232,31 @@ oslFileError SAL_CALL osl_releaseDirectoryItem( oslDirectoryItem Item )
 //#####################################################
 static inline bool is_floppy_A_present()
 { return (GetLogicalDrives() & 1); }
-
+    
 //#####################################################
 static inline bool is_floppy_B_present()
 { return (GetLogicalDrives() & 2); }
-
+    
 //#####################################################
 bool is_floppy_volume_mount_point(const rtl::OUString& path)
-{
+{                   
     // determines if a volume mount point shows to a floppy
-    // disk by comparing the unique volume names
+    // disk by comparing the unique volume names           
     static const LPCWSTR FLOPPY_A = L"A:\\";
     static const LPCWSTR FLOPPY_B = L"B:\\";
 
     rtl::OUString p(path);
     osl::systemPathEnsureSeparator(p);
-
+        
     TCHAR vn[51];
     if (GetVolumeNameForVolumeMountPoint(reinterpret_cast<LPCTSTR>(p.getStr()), vn, SAL_N_ELEMENTS(vn)))
-    {
+    {       
         TCHAR vnfloppy[51];
-        if (is_floppy_A_present() &&
+        if (is_floppy_A_present() && 
             GetVolumeNameForVolumeMountPoint(FLOPPY_A, vnfloppy, SAL_N_ELEMENTS(vnfloppy)) &&
             (0 == wcscmp(vn, vnfloppy)))
             return true;
-
+                    
         if (is_floppy_B_present() &&
             GetVolumeNameForVolumeMountPoint(FLOPPY_B, vnfloppy, SAL_N_ELEMENTS(vnfloppy)) &&
             (0 == wcscmp(vn, vnfloppy)))
@@ -1264,46 +1264,46 @@ bool is_floppy_volume_mount_point(const rtl::OUString& path)
     }
     return false;
 }
-
+    
 //################################################
 static bool is_floppy_drive(const rtl::OUString& path)
 {
-    static const LPCWSTR FLOPPY_DRV_LETTERS = TEXT("AaBb");
+    static const LPCWSTR FLOPPY_DRV_LETTERS = TEXT("AaBb"); 
 
-    // we must take into account that even a floppy
+    // we must take into account that even a floppy 
     // drive may be mounted to a directory so checking
     // for the drive letter alone is not sufficient
-    // we must compare the unique volume name with
+    // we must compare the unique volume name with 
     // that of the available floppy disks
-
+ 
     const sal_Unicode* pszPath = path.getStr();
     return ((wcschr(FLOPPY_DRV_LETTERS, pszPath[0]) && (L':' == pszPath[1])) || is_floppy_volume_mount_point(path));
 }
-
+    
 //#####################################################
 static bool is_volume_mount_point(const rtl::OUString& path)
 {
-    rtl::OUString p(path);
+    rtl::OUString p(path);        
     osl::systemPathRemoveSeparator(p);
-
+            
     bool  is_volume_root = false;
-
+        
     if (!is_floppy_drive(p))
     {
         DWORD fattr = GetFileAttributes(reinterpret_cast<LPCTSTR>(p.getStr()));
-
-        if ((INVALID_FILE_ATTRIBUTES != fattr) &&
+            
+        if ((INVALID_FILE_ATTRIBUTES != fattr) && 
             (FILE_ATTRIBUTE_REPARSE_POINT & fattr))
         {
             WIN32_FIND_DATA find_data;
-            HANDLE h_find = FindFirstFile(reinterpret_cast<LPCTSTR>(p.getStr()), &find_data);
-
+            HANDLE h_find = FindFirstFile(reinterpret_cast<LPCTSTR>(p.getStr()), &find_data);    
+                           
             if (IsValidHandle(h_find) &&
-                (FILE_ATTRIBUTE_REPARSE_POINT & find_data.dwFileAttributes) &&
+                (FILE_ATTRIBUTE_REPARSE_POINT & find_data.dwFileAttributes) && 
                 (IO_REPARSE_TAG_MOUNT_POINT == find_data.dwReserved0))
-            {
+            {            
                 is_volume_root = true;
-            }
+            }        
             if (IsValidHandle(h_find))
                 FindClose(h_find);
         }
@@ -1316,15 +1316,15 @@ static UINT get_volume_mount_point_drive_type(const rtl::OUString& path)
 {
     if (0 == path.getLength())
         return GetDriveType(NULL);
-
+        
     rtl::OUString p(path);
     osl::systemPathEnsureSeparator(p);
-
-    TCHAR vn[51];
+        
+    TCHAR vn[51];  
     if (GetVolumeNameForVolumeMountPoint(reinterpret_cast<LPCTSTR>(p.getStr()), vn, SAL_N_ELEMENTS(vn)))
         return GetDriveType(vn);
-
-    return DRIVE_NO_ROOT_DIR;
+        
+    return DRIVE_NO_ROOT_DIR;  
 }
 
 //#############################################
@@ -1344,11 +1344,11 @@ static oslFileError osl_get_drive_type(
         drive_type = get_volume_mount_point_drive_type(path);
     else
         drive_type = GetDriveType(reinterpret_cast<LPCTSTR>(path.getStr()));
-
+        
     if (DRIVE_NO_ROOT_DIR == drive_type)
         return oslTranslateFileError(ERROR_INVALID_DRIVE);
-
-    pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
+                
+    pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;		
 
     switch (drive_type)
     {
@@ -1371,59 +1371,59 @@ static oslFileError osl_get_drive_type(
             break;
         case DRIVE_UNKNOWN:
             pInfo->uAttributes = 0;
-            break;
+            break;		
         default:
             pInfo->uValidFields &= ~osl_VolumeInfo_Mask_Attributes;
             pInfo->uAttributes = 0;
             break;
     }
-    return osl_File_E_None;
+    return osl_File_E_None;    
 }
 
 //#############################################
 static inline bool is_volume_space_info_request(sal_uInt32 field_mask)
 {
-    return (field_mask &
-            (osl_VolumeInfo_Mask_TotalSpace |
-             osl_VolumeInfo_Mask_UsedSpace  |
+    return (field_mask & 
+            (osl_VolumeInfo_Mask_TotalSpace | 
+             osl_VolumeInfo_Mask_UsedSpace  | 
              osl_VolumeInfo_Mask_FreeSpace));
 }
-
+    
 //#############################################
 static void get_volume_space_information(
     const rtl::OUString& path, oslVolumeInfo *pInfo)
 {
     BOOL ret = GetDiskFreeSpaceEx(
-        reinterpret_cast<LPCTSTR>(path.getStr()),
+        reinterpret_cast<LPCTSTR>(path.getStr()), 
         (PULARGE_INTEGER)&(pInfo->uFreeSpace),
         (PULARGE_INTEGER)&(pInfo->uTotalSpace),
         NULL);
-
+            
     if (ret)
-    {
+    {			    			    
         pInfo->uUsedSpace    = pInfo->uTotalSpace - pInfo->uFreeSpace;
-        pInfo->uValidFields |= osl_VolumeInfo_Mask_TotalSpace |
-            osl_VolumeInfo_Mask_UsedSpace |
+        pInfo->uValidFields |= osl_VolumeInfo_Mask_TotalSpace | 
+            osl_VolumeInfo_Mask_UsedSpace | 
             osl_VolumeInfo_Mask_FreeSpace;
     }
 }
-
+    
 //#############################################
 static inline bool is_filesystem_attributes_request(sal_uInt32 field_mask)
 {
-    return (field_mask &
-            (osl_VolumeInfo_Mask_MaxNameLength |
-             osl_VolumeInfo_Mask_MaxPathLength |
-             osl_VolumeInfo_Mask_FileSystemName |
+    return (field_mask & 
+            (osl_VolumeInfo_Mask_MaxNameLength | 
+             osl_VolumeInfo_Mask_MaxPathLength | 
+             osl_VolumeInfo_Mask_FileSystemName | 
              osl_VolumeInfo_Mask_FileSystemCaseHandling));
 }
-
+    
 //#############################################
 static oslFileError get_filesystem_attributes(
     const rtl::OUString& path, sal_uInt32 field_mask, oslVolumeInfo* pInfo)
 {
     pInfo->uAttributes = 0;
-
+        
     // osl_get_drive_type must be called first because
     // this function resets osl_VolumeInfo_Mask_Attributes
     // on failure
@@ -1442,105 +1442,105 @@ static oslFileError get_filesystem_attributes(
         DWORD serial;
         DWORD mcl;
         DWORD flags;
-
+            
         LPCTSTR pszPath = reinterpret_cast<LPCTSTR>(path.getStr());
         if (GetVolumeInformation(pszPath, vn, MAX_PATH+1, &serial, &mcl, &flags, fsn, MAX_PATH+1))
-        {
+        {		
             // Currently sal does not use this value, instead MAX_PATH is used
             pInfo->uValidFields   |= osl_VolumeInfo_Mask_MaxNameLength;
             pInfo->uMaxNameLength  = mcl;
-
+            
             // Should the uMaxPathLength be set to 32767, "\\?\" prefix allowes it
             pInfo->uValidFields   |= osl_VolumeInfo_Mask_MaxPathLength;
             pInfo->uMaxPathLength  = MAX_PATH;
 
             pInfo->uValidFields   |= osl_VolumeInfo_Mask_FileSystemName;
             rtl_uString_newFromStr(&pInfo->ustrFileSystemName, reinterpret_cast<const sal_Unicode*>(fsn));
-
+                
             // volumes (even NTFS) will always be considered case
             // insensitive because the Win32 API is not able to
             // deal with case sensitive volumes see M$ Knowledge Base
             // article 100625 that's why we never set the attribute
             // osl_Volume_Attribute_Case_Sensitive
-
+                
             if (flags & FS_CASE_IS_PRESERVED)
                 pInfo->uAttributes |= osl_Volume_Attribute_Case_Is_Preserved;
-
+                    
             pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
         }
     }
     return osl_File_E_None;
 }
-
+    
 //#####################################################
 static bool path_get_parent(rtl::OUString& path)
-{
+{   
     OSL_PRECOND(path.lastIndexOf(SLASH) == -1, "Path must not have slashes");
-
+        
     if (!has_path_parent(path))
     {
-        sal_Int32 i = path.lastIndexOf(BACKSLASH);
+        sal_Int32 i = path.lastIndexOf(BACKSLASH);                        
         if (-1 < i)
         {
             path = rtl::OUString(path.getStr(), i);
-            return true;
+            return true;                    
         }
     }
     return false;
 }
-
-//#####################################################
+    
+//##################################################### 
 static void path_travel_to_volume_root(const rtl::OUString& system_path, rtl::OUString& volume_root)
 {
     rtl::OUString sys_path(system_path);
-
+        
     while(!is_volume_mount_point(sys_path) && path_get_parent(sys_path))
         /**/;
-
+        
     volume_root = sys_path;
-    osl::systemPathEnsureSeparator(volume_root);
+    osl::systemPathEnsureSeparator(volume_root);                            
 }
 
 //#############################################
-oslFileError SAL_CALL osl_getVolumeInformation(
+oslFileError SAL_CALL osl_getVolumeInformation( 
     rtl_uString *ustrURL, oslVolumeInfo *pInfo, sal_uInt32 uFieldMask )
-{
+{			
     if (!pInfo)
         return osl_File_E_INVAL;
 
-    rtl::OUString system_path;
+    rtl::OUString system_path;		
     oslFileError error = _osl_getSystemPathFromFileURL(ustrURL, &system_path.pData, sal_False);
-
+    
     if (osl_File_E_None != error)
         return error;
-
+    
     rtl::OUString volume_root;
-    path_travel_to_volume_root(system_path, volume_root);
-
+    path_travel_to_volume_root(system_path, volume_root);        
+                
     pInfo->uValidFields = 0;
-
+    
     if ((error = get_filesystem_attributes(volume_root, uFieldMask, pInfo)) != osl_File_E_None)
         return error;
-
-    if (is_volume_space_info_request(uFieldMask))
+                
+    if (is_volume_space_info_request(uFieldMask)) 
         get_volume_space_information(volume_root, pInfo);
-
+                
     if (uFieldMask & osl_VolumeInfo_Mask_DeviceHandle)
     {
         pInfo->uValidFields |= osl_VolumeInfo_Mask_DeviceHandle;
         osl_getFileURLFromSystemPath(volume_root.pData, (rtl_uString**)&pInfo->pDeviceHandle);
     }
-
+    
     return osl_File_E_None;
 }
 
-//#####################################################
+//##################################################### 
 static oslFileError SAL_CALL osl_getDriveInfo(
     oslDirectoryItem Item, oslFileStatus *pStatus, sal_uInt32 uFieldMask)
 {
-    DirectoryItem_Impl  *pItemImpl = (DirectoryItem_Impl *)Item;
-    TCHAR               cDrive[3] = TEXT("A:");
-    TCHAR               cRoot[4] = TEXT("A:\\");
+    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
+    TCHAR				cDrive[3] = TEXT("A:");
+    TCHAR				cRoot[4] = TEXT("A:\\");
 
     if ( !pItemImpl )
         return osl_File_E_INVAL;
@@ -1554,11 +1554,11 @@ static oslFileError SAL_CALL osl_getDriveInfo(
     {
         if ( pItemImpl->cDriveString[0] == '\\' && pItemImpl->cDriveString[1] == '\\' )
         {
-            LPCWSTR lpFirstBkSlash = wcschr( &pItemImpl->cDriveString[2], '\\' );
+            LPCWSTR	lpFirstBkSlash = wcschr( &pItemImpl->cDriveString[2], '\\' );
 
             if ( lpFirstBkSlash && lpFirstBkSlash[1] )
             {
-                LPCWSTR lpLastBkSlash = wcschr( &lpFirstBkSlash[1], '\\' );
+                LPCWSTR	lpLastBkSlash = wcschr( &lpFirstBkSlash[1], '\\' );
 
                 if ( lpLastBkSlash )
                     rtl_uString_newFromStr_WithLength( &pStatus->ustrFileName, reinterpret_cast<const sal_Unicode*>(&lpFirstBkSlash[1]), lpLastBkSlash - lpFirstBkSlash - 1 );
@@ -1595,7 +1595,7 @@ static oslFileError SAL_CALL osl_getDriveInfo(
 
                 if ( GetVolumeInformation( cRoot, szVolumeNameBuffer, dwBufsizeConst, NULL, NULL, NULL, NULL, 0 ) )
                 {
-                    TCHAR   szFileName[dwBufsizeConst + 16];
+                    TCHAR	szFileName[dwBufsizeConst + 16];
 
                     swprintf( szFileName, L"%s [%s]", cDrive, szVolumeNameBuffer );
                     rtl_uString_newFromStr( &pStatus->ustrFileName, reinterpret_cast<const sal_Unicode*>(szFileName) );
@@ -1621,7 +1621,7 @@ static oslFileError SAL_CALL osl_getDriveInfo(
 
     if ( uFieldMask & osl_FileStatus_Mask_FileURL )
     {
-        rtl_uString *ustrSystemPath = NULL;
+        rtl_uString	*ustrSystemPath = NULL;
 
         rtl_uString_newFromStr( &ustrSystemPath, reinterpret_cast<const sal_Unicode*>(pItemImpl->cDriveString) );
         osl_getFileURLFromSystemPath( ustrSystemPath, &pStatus->ustrFileURL );
@@ -1631,22 +1631,22 @@ static oslFileError SAL_CALL osl_getDriveInfo(
     return osl_File_E_None;
 }
 
-//#####################################################
-static oslFileError SAL_CALL osl_getServerInfo(
+//##################################################### 
+static oslFileError SAL_CALL osl_getServerInfo( 
     oslDirectoryItem Item, oslFileStatus *pStatus, sal_uInt32 uFieldMask )
 {
-    DirectoryItem_Impl  *pItemImpl = (DirectoryItem_Impl *)Item;
+    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
     if ( !pItemImpl )
         return osl_File_E_INVAL;
 
     pStatus->uValidFields = 0;
 
-    //  pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
+    //	pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
 
-    //  if ( _tcscmp( pItemImpl->FindData.cFileName, TEXT(".") ) == 0 )
-    //      rtl_uString_newFromAscii( &pStatus->ustrFileName, "/" );
-    //  else
-    //      rtl_uString_newFromStr( &pStatus->ustrFileName, pItemImpl->FindData.cFileName );
+    //	if ( _tcscmp( pItemImpl->FindData.cFileName, TEXT(".") ) == 0 )
+    //		rtl_uString_newFromAscii( &pStatus->ustrFileName, "/" );
+    //	else
+    //		rtl_uString_newFromStr( &pStatus->ustrFileName, pItemImpl->FindData.cFileName );
 
     pStatus->eType = osl_File_Type_Directory;
     pStatus->uValidFields |= osl_FileStatus_Mask_Type;
@@ -1660,12 +1660,12 @@ static oslFileError SAL_CALL osl_getServerInfo(
 }
 
 //#############################################
-oslFileError SAL_CALL osl_getFileStatus(
-    oslDirectoryItem Item,
-    oslFileStatus *pStatus,
+oslFileError SAL_CALL osl_getFileStatus( 
+    oslDirectoryItem Item, 
+    oslFileStatus *pStatus, 
     sal_uInt32 uFieldMask )
 {
-    DirectoryItem_Impl  *pItemImpl = (DirectoryItem_Impl *)Item;
+    DirectoryItem_Impl	*pItemImpl = (DirectoryItem_Impl *)Item;
 
     if ( !pItemImpl )
         return osl_File_E_INVAL;
@@ -1682,14 +1682,14 @@ oslFileError SAL_CALL osl_getFileStatus(
 
     if ( uFieldMask & osl_FileStatus_Mask_Validate )
     {
-        HANDLE  hFind = FindFirstFile( reinterpret_cast<LPCTSTR>( rtl_uString_getStr( pItemImpl->m_pFullPath ) ), &pItemImpl->FindData );
+        HANDLE	hFind = FindFirstFile( reinterpret_cast<LPCTSTR>( rtl_uString_getStr( pItemImpl->m_pFullPath ) ), &pItemImpl->FindData );
 
         if ( hFind != INVALID_HANDLE_VALUE )
             FindClose( hFind );
         else
             return oslTranslateFileError( GetLastError() );
 
-        uFieldMask &= ~ osl_FileStatus_Mask_Validate;
+        uFieldMask &= ~	osl_FileStatus_Mask_Validate;
     }
 
     /* If no fields to retrieve left ignore pStatus */
@@ -1729,9 +1729,9 @@ oslFileError SAL_CALL osl_getFileStatus(
         pStatus->eType = osl_File_Type_Volume;
     else if (pItemImpl->FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
         pStatus->eType = osl_File_Type_Directory;
-    else
+    else    
         pStatus->eType = osl_File_Type_Regular;
-
+        
     pStatus->uValidFields |= osl_FileStatus_Mask_Type;
 
     pStatus->uAttributes = pItemImpl->FindData.dwFileAttributes;
@@ -1777,14 +1777,14 @@ oslFileError SAL_CALL osl_getFileStatus(
 //#####################################################
 
 //#############################################
-oslFileError SAL_CALL osl_setFileAttributes(
-    rtl_uString *ustrFileURL,
+oslFileError SAL_CALL osl_setFileAttributes( 
+    rtl_uString *ustrFileURL, 
     sal_uInt64 uAttributes )
 {
-    oslFileError    error;
-    rtl_uString     *ustrSysPath = NULL;
-    DWORD           dwFileAttributes;
-    BOOL            fSuccess;
+    oslFileError	error;
+    rtl_uString		*ustrSysPath = NULL;
+    DWORD			dwFileAttributes;
+    BOOL			fSuccess;
 
     // Converts the normalized path into a systempath
     error = _osl_getSystemPathFromFileURL( ustrFileURL, &ustrSysPath, sal_False );
@@ -1817,11 +1817,11 @@ oslFileError SAL_CALL osl_setFileAttributes(
     return error;
 }
 
-//#####################################################
+//##################################################### 
 oslFileError SAL_CALL osl_setFileTime(
-    rtl_uString *filePath,
-    const TimeValue *aCreationTime,
-    const TimeValue *aLastAccessTime,
+    rtl_uString *filePath, 
+    const TimeValue *aCreationTime, 
+    const TimeValue *aLastAccessTime, 
     const TimeValue *aLastWriteTime)
 {
     oslFileError error;
diff --git a/sal/osl/w32/file_error.c b/sal/osl/w32/file_error.c
index 42f57a5e839f..3d33cdfdaf2c 100644
--- a/sal/osl/w32/file_error.c
+++ b/sal/osl/w32/file_error.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@ struct osl_file_error_entry
 };
 
 static const struct osl_file_error_entry errtable[] = {
-  {  ERROR_SUCCESS,                osl_File_E_None     },  /* 0 */
+  {  ERROR_SUCCESS,				   osl_File_E_None     },  /* 0 */
   {  ERROR_INVALID_FUNCTION,       osl_File_E_INVAL    },  /* 1 */
   {  ERROR_FILE_NOT_FOUND,         osl_File_E_NOENT    },  /* 2 */
   {  ERROR_PATH_NOT_FOUND,         osl_File_E_NOENT    },  /* 3 */
@@ -95,7 +95,7 @@ static const struct osl_file_error_entry errtable[] = {
   {  ERROR_NOT_ENOUGH_QUOTA,       osl_File_E_NOMEM    },  /* 1816 */
   {  ERROR_UNEXP_NET_ERR,          osl_File_E_NETWORK  }   /* 59 */
 };
-
+    
 /* The following two constants must be the minimum and maximum
    values in the (contiguous) range of osl_File_E_xec Failure errors.
 */
@@ -119,8 +119,8 @@ oslFileError oslTranslateFileError (/*DWORD*/ unsigned long dwError)
             return (oslFileError)(errtable[i].errnocode);
     }
 
-    /* The error code wasn't in the table.  We check for a range of
-       osl_File_E_ACCES errors or exec failure errors (ENOEXEC).
+    /* The error code wasn't in the table.  We check for a range of 
+       osl_File_E_ACCES errors or exec failure errors (ENOEXEC).  
        Otherwise osl_File_E_INVAL is returned.
     */
     if ( (dwError >= MIN_EACCES_RANGE) && (dwError <= MAX_EACCES_RANGE) )
@@ -131,7 +131,7 @@ oslFileError oslTranslateFileError (/*DWORD*/ unsigned long dwError)
         return osl_File_E_INVAL;
 }
 
-//#####################################################
+//##################################################### 
 #if OSL_DEBUG_LEVEL > 0
 void _osl_warnFile( const char *message, rtl_uString *ustrFile )
 {
@@ -139,7 +139,7 @@ void _osl_warnFile( const char *message, rtl_uString *ustrFile )
 
     if (ustrFile)
     {
-        rtl_String  *strFile = NULL;
+        rtl_String	*strFile = NULL;
 
         rtl_uString2String( &strFile, rtl_uString_getStr( ustrFile ), rtl_uString_getLength( ustrFile ),
                             osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
diff --git a/sal/osl/w32/file_error.h b/sal/osl/w32/file_error.h
index f4ac71763c26..5ed392e3aa7c 100644
--- a/sal/osl/w32/file_error.h
+++ b/sal/osl/w32/file_error.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index fb837821cfe0..f04570569216 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,9 +51,9 @@
 #define OSL_ENSURE_FILE( cond, msg, file ) ((void)0)
 #endif
 
-#define WSTR_SYSTEM_ROOT_PATH               L"\\\\.\\"
-#define WSTR_LONG_PATH_PREFIX               L"\\\\?\\"
-#define WSTR_LONG_PATH_PREFIX_UNC           L"\\\\?\\UNC\\"
+#define WSTR_SYSTEM_ROOT_PATH				L"\\\\.\\"
+#define WSTR_LONG_PATH_PREFIX				L"\\\\?\\"
+#define WSTR_LONG_PATH_PREFIX_UNC			L"\\\\?\\UNC\\"
 
 
 //##################################################################
@@ -67,10 +67,10 @@ oslMutex g_CurrentDirectoryMutex = 0;
 static BOOL IsValidFilePathComponent(
     LPCTSTR lpComponent, LPCTSTR *lppComponentEnd, DWORD dwFlags)
 {
-        LPCTSTR lpComponentEnd = NULL;
-        LPCTSTR lpCurrent = lpComponent;
-        BOOL    fValid = TRUE;  /* Assume success */
-        TCHAR   cLast = 0;
+        LPCTSTR	lpComponentEnd = NULL;
+        LPCTSTR	lpCurrent = lpComponent;
+        BOOL	fValid = TRUE;	/* Assume success */
+        TCHAR	cLast = 0;
 
         /* Path component length must not exceed MAX_PATH even if long path with "\\?\" prefix is used */
 
@@ -144,7 +144,7 @@ static BOOL IsValidFilePathComponent(
             cLast = *lpCurrent++;
         }
 
-        /*  If we don't reached the end of the component the length of the component was to long
+        /*	If we don't reached the end of the component the length of the component was to long 
             ( See condition of while loop ) */
         if ( !lpComponentEnd )
         {
@@ -153,8 +153,8 @@ static BOOL IsValidFilePathComponent(
         }
 
         /* Test wether the component specifies a device name what is not allowed */
-
-        // MT: PERFORMANCE:
+        
+        // MT: PERFORMANCE: 
         // This is very expensive. A lot of calls to _tcsicmp.
         // in SRC6870m71 67.000 calls of this method while empty office start result into more than 1.500.00 calls of _tcsicmp!
         // Possible optimizations
@@ -166,7 +166,7 @@ static BOOL IsValidFilePathComponent(
         /*
         if ( fValid )
         {
-            LPCTSTR alpDeviceNames[] =
+            LPCTSTR	alpDeviceNames[] =
             {
                 TEXT("CON"),
                 TEXT("PRN"),
@@ -192,11 +192,11 @@ static BOOL IsValidFilePathComponent(
                 TEXT("COM8"),
                 TEXT("COM9")
             };
-
-            TCHAR   szComponent[MAX_PATH];
-            int     nComponentLength;
-            LPCTSTR lpDot;
-            int     i;
+            
+            TCHAR	szComponent[MAX_PATH];
+            int		nComponentLength;
+            LPCTSTR	lpDot;
+            int		i;
 
             // A device name with an extension is also invalid
             lpDot = _tcschr( lpComponent, '.' );
@@ -239,15 +239,15 @@ static BOOL IsValidFilePathComponent(
         return fValid;
 }
 
-//#####################################################
-#define CHARSET_SEPARATOR TEXT("\\/")
+//##################################################### 
+#define	CHARSET_SEPARATOR TEXT("\\/")
 
 DWORD IsValidFilePath(rtl_uString *path, LPCTSTR *lppError, DWORD dwFlags, rtl_uString **corrected)
 {
         LPCTSTR lpszPath = reinterpret_cast< LPCTSTR >(path->buffer);
-        LPCTSTR lpComponent = lpszPath;
-        BOOL    fValid = TRUE;
-        DWORD   dwPathType = PATHTYPE_ERROR;
+        LPCTSTR	lpComponent = lpszPath;
+        BOOL	fValid = TRUE;
+        DWORD	dwPathType = PATHTYPE_ERROR;
         sal_Int32 nLength = rtl_uString_getLength( path );
 
         if ( dwFlags & VALIDATEPATH_ALLOW_RELATIVE )
@@ -256,7 +256,7 @@ DWORD IsValidFilePath(rtl_uString *path, LPCTSTR *lppError, DWORD dwFlags, rtl_u
         if ( !lpszPath )
             fValid = FALSE;
 
-        DWORD   dwCandidatPathType = PATHTYPE_ERROR;
+        DWORD	dwCandidatPathType = PATHTYPE_ERROR;
 
         if ( 0 == rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( path->buffer, nLength, reinterpret_cast<const sal_Unicode *>(WSTR_LONG_PATH_PREFIX_UNC), SAL_N_ELEMENTS(WSTR_LONG_PATH_PREFIX_UNC) - 1, SAL_N_ELEMENTS(WSTR_LONG_PATH_PREFIX_UNC) - 1 ) )
         {
@@ -298,9 +298,9 @@ DWORD IsValidFilePath(rtl_uString *path, LPCTSTR *lppError, DWORD dwFlags, rtl_u
 
             if ( fValid )
             {
-                if ( lpComponent &&  !*++lpComponent )
+                if ( lpComponent &&	 !*++lpComponent )
                     lpComponent = NULL;
-
+                
                 if ( !lpComponent )
                 {
                     dwPathType |= PATHTYPE_IS_SERVER;
@@ -386,7 +386,7 @@ DWORD IsValidFilePath(rtl_uString *path, LPCTSTR *lppError, DWORD dwFlags, rtl_u
                     lpComponent = NULL;
             }
         }
-
+        
         /* The path can be longer than MAX_PATH only in case it has the longpath prefix */
         if ( fValid && !( dwPathType &  PATHTYPE_IS_LONGPATH ) && _tcslen( lpszPath ) >= MAX_PATH )
         {
@@ -408,9 +408,9 @@ static sal_Int32 PathRemoveFileSpec(LPTSTR lpPath, LPTSTR lpFileName, sal_Int32
     if ( nFileBufLen )
     {
         lpFileName[0] = 0;
-        LPTSTR  lpLastBkSlash = _tcsrchr( lpPath, '\\' );
-        LPTSTR  lpLastSlash = _tcsrchr( lpPath, '/' );
-        LPTSTR  lpLastDelimiter = lpLastSlash > lpLastBkSlash ? lpLastSlash : lpLastBkSlash;
+        LPTSTR	lpLastBkSlash = _tcsrchr( lpPath, '\\' );
+        LPTSTR	lpLastSlash = _tcsrchr( lpPath, '/' );
+        LPTSTR	lpLastDelimiter = lpLastSlash > lpLastBkSlash ? lpLastSlash : lpLastBkSlash;
 
         if ( lpLastDelimiter )
         {
@@ -435,16 +435,16 @@ static sal_Int32 PathRemoveFileSpec(LPTSTR lpPath, LPTSTR lpFileName, sal_Int32
 
     return nRemoved;
 }
-
+        
 //#####################################################
-// Undocumented in SHELL32.DLL ordinal 32
+// Undocumented in SHELL32.DLL ordinal 32 
 static LPTSTR PathAddBackslash(LPTSTR lpPath, sal_Int32 nBufLen)
 {
-    LPTSTR  lpEndPath = NULL;
+    LPTSTR	lpEndPath = NULL;
 
     if ( lpPath )
     {
-            int     nLen = _tcslen(lpPath);
+            int		nLen = _tcslen(lpPath);
 
             if ( !nLen || lpPath[nLen-1] != '\\' && lpPath[nLen-1] != '/' && nLen < nBufLen - 1 )
             {
@@ -457,11 +457,11 @@ static LPTSTR PathAddBackslash(LPTSTR lpPath, sal_Int32 nBufLen)
 }
 
 //#####################################################
-// Same as GetLongPathName but also 95/NT4
+// Same as GetLongPathName but also 95/NT4 
 static DWORD GetCaseCorrectPathNameEx(
-    LPTSTR  lpszPath,   // path buffer to convert
-    DWORD   cchBuffer,      // size of path buffer
-    DWORD   nSkipLevels,
+    LPTSTR	lpszPath,	// path buffer to convert
+    DWORD	cchBuffer,		// size of path buffer 
+    DWORD	nSkipLevels,
     BOOL bCheckExistence )
 {
         ::osl::LongPathBuffer< WCHAR > szFile( MAX_PATH + 1 );
@@ -508,8 +508,8 @@ static DWORD GetCaseCorrectPathNameEx(
                     _tcscpy( aShortPath, lpszPath );
                     _tcscat( aShortPath, szFile );
 
-                    WIN32_FIND_DATA aFindFileData;
-                    HANDLE  hFind = FindFirstFile( aShortPath, &aFindFileData );
+                    WIN32_FIND_DATA	aFindFileData;
+                    HANDLE	hFind = FindFirstFile( aShortPath, &aFindFileData );
 
                     if ( IsValidHandle(hFind) )
                     {
@@ -530,7 +530,7 @@ static DWORD GetCaseCorrectPathNameEx(
         else
         {
             /* File specification can't be removed therefore the short path is either a drive
-               or a network share. If still levels to skip are left, the path specification
+               or a network share. If still levels to skip are left, the path specification 
                tries to travel below the file system root */
             if ( nSkipLevels )
                     lpszPath[0] = 0;
@@ -541,13 +541,13 @@ static DWORD GetCaseCorrectPathNameEx(
         return _tcslen( lpszPath );
 }
 
-//#####################################################
-#define WSTR_SYSTEM_ROOT_PATH               L"\\\\.\\"
+//##################################################### 
+#define WSTR_SYSTEM_ROOT_PATH				L"\\\\.\\"
 
 DWORD GetCaseCorrectPathName(
-    LPCTSTR lpszShortPath,  // file name
-    LPTSTR  lpszLongPath,   // path buffer
-    DWORD   cchBuffer,      // size of path buffer
+    LPCTSTR	lpszShortPath,	// file name
+    LPTSTR	lpszLongPath,	// path buffer
+    DWORD	cchBuffer,		// size of path buffer 
     BOOL bCheckExistence
 )
 {
@@ -577,15 +577,15 @@ DWORD GetCaseCorrectPathName(
 }
 
 
-//#############################################
+//############################################# 
 static sal_Bool _osl_decodeURL( rtl_String* strUTF8, rtl_uString** pstrDecodedURL )
 {
-    sal_Char        *pBuffer;
-    const sal_Char  *pSrcEnd;
-    const sal_Char  *pSrc;
-    sal_Char        *pDest;
-    sal_Int32       nSrcLen;
-    sal_Bool        bValidEncoded = sal_True;   /* Assume success */
+    sal_Char		*pBuffer;
+    const sal_Char	*pSrcEnd;
+    const sal_Char	*pSrc;
+    sal_Char		*pDest;
+    sal_Int32		nSrcLen;
+    sal_Bool		bValidEncoded = sal_True;	/* Assume success */
 
     /* The resulting decoded string length is shorter or equal to the source length */
 
@@ -603,8 +603,8 @@ static sal_Bool _osl_decodeURL( rtl_String* strUTF8, rtl_uString** pstrDecodedUR
         {
         case '%':
             {
-                sal_Char    aToken[3];
-                sal_Char    aChar;
+                sal_Char	aToken[3];
+                sal_Char	aChar;
 
                 pSrc++;
                 aToken[0] = *pSrc++;
@@ -628,30 +628,30 @@ static sal_Bool _osl_decodeURL( rtl_String* strUTF8, rtl_uString** pstrDecodedUR
     }
 
     *pDest++ = 0;
-
+        
     if ( bValidEncoded )
     {
         rtl_string2UString( pstrDecodedURL, pBuffer, rtl_str_getLength(pBuffer), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS );
         OSL_ASSERT(*pstrDecodedURL != 0);
     }
-
+        
     rtl_freeMemory( pBuffer );
 
     return bValidEncoded;
 }
 
-//#############################################
+//############################################# 
 static void _osl_encodeURL( rtl_uString *strURL, rtl_String **pstrEncodedURL )
 {
     /* Encode non ascii characters within the URL */
 
-    rtl_String      *strUTF8 = NULL;
-    sal_Char        *pszEncodedURL;
-    const sal_Char  *pURLScan;
-    sal_Char        *pURLDest;
-    sal_Int32       nURLScanLen;
-    sal_Int32       nURLScanCount;
-
+    rtl_String		*strUTF8 = NULL;
+    sal_Char		*pszEncodedURL;
+    const sal_Char	*pURLScan;
+    sal_Char		*pURLDest;
+    sal_Int32		nURLScanLen;
+    sal_Int32		nURLScanCount;
+        
     rtl_uString2String( &strUTF8, rtl_uString_getStr( strURL ), rtl_uString_getLength( strURL ), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS );
 
     pszEncodedURL = (sal_Char*) rtl_allocateMemory( (rtl_string_getLength( strUTF8 ) * 3 + 1)  * sizeof(sal_Char) );
@@ -709,17 +709,17 @@ static void _osl_encodeURL( rtl_uString *strURL, rtl_String **pstrEncodedURL )
     rtl_freeMemory( pszEncodedURL );
 }
 
-//#############################################
+//#############################################      
 
 oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **pustrPath, sal_Bool bAllowRelative )
 {
-    rtl_String          *strUTF8 = NULL;
-    rtl_uString         *strDecodedURL = NULL;
-    rtl_uString         *strTempPath = NULL;
-    const sal_Unicode   *pDecodedURL;
-    sal_uInt32          nDecodedLen;
-    sal_Bool            bValidEncoded;
-    oslFileError        nError = osl_File_E_INVAL;  /* Assume failure */
+    rtl_String			*strUTF8 = NULL;
+    rtl_uString			*strDecodedURL = NULL;
+    rtl_uString			*strTempPath = NULL;
+    const sal_Unicode	*pDecodedURL;
+    sal_uInt32			nDecodedLen;
+    sal_Bool			bValidEncoded;
+    oslFileError		nError = osl_File_E_INVAL;	/* Assume failure */
 
     /*  If someone hasn't encoded the complete URL we convert it to UTF8 now to prevent from
         having a mixed encoded URL later */
@@ -728,8 +728,8 @@ oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **p
 
     /* If the length of strUTF8 and strURL differs it indicates that the URL was not correct encoded */
 
-    OSL_ENSURE_FILE(
-        strUTF8->length == strURL->length ||
+    OSL_ENSURE_FILE( 
+        strUTF8->length == strURL->length || 
         0 != rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( strURL->buffer, strURL->length, "file:\\\\", 7 )
         ,"osl_getSystemPathFromFileURL: \"%s\" is not encoded !!!", strURL );
 
@@ -751,16 +751,16 @@ oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **p
         /* Must start with "file://" */
         if ( 0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL, nDecodedLen, "file:\\\\", 7 ) )
         {
-            sal_uInt32  nSkip;
+            sal_uInt32	nSkip;
 
             if ( 0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL, nDecodedLen, "file:\\\\\\", 8 ) )
                 nSkip = 8;
-            else if (
+            else if ( 
                 0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL, nDecodedLen, "file:\\\\localhost\\", 17 ) ||
-                0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL, nDecodedLen, "file:\\\\127.0.0.1\\", 17 )
+                0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL, nDecodedLen, "file:\\\\127.0.0.1\\", 17 ) 
                       )
                 nSkip = 17;
-            else
+            else 
                 nSkip = 5;
 
             /* Indicates local root */
@@ -780,7 +780,7 @@ oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **p
                                                                  ::osl::mingw_reinterpret_cast<LPTSTR>(aBuf),
                                                                  aBuf.getBufSizeInSymbols(),
                                                                  sal_False );
-
+                    
                     if ( nNewLen <= MAX_PATH - 12
                       || 0 == rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL + nSkip, nDecodedLen - nSkip, reinterpret_cast<const sal_Unicode*>(WSTR_SYSTEM_ROOT_PATH), SAL_N_ELEMENTS(WSTR_SYSTEM_ROOT_PATH) - 1, SAL_N_ELEMENTS(WSTR_SYSTEM_ROOT_PATH) - 1 )
                       || 0 == rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL + nSkip, nDecodedLen - nSkip, reinterpret_cast<const sal_Unicode*>(WSTR_LONG_PATH_PREFIX), SAL_N_ELEMENTS(WSTR_LONG_PATH_PREFIX) - 1, SAL_N_ELEMENTS(WSTR_LONG_PATH_PREFIX) - 1 ) )
@@ -818,7 +818,7 @@ oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **p
             if ( IsValidFilePath( strTempPath, NULL, VALIDATEPATH_ALLOW_ELLIPSE, &strTempPath ) )
                 nError = osl_File_E_None;
         }
-        else if ( bAllowRelative )  /* This maybe a relative file URL */
+        else if ( bAllowRelative )	/* This maybe a relative file URL */
         {
             /* In future the relative path could be converted to absolute if it is too long */
             rtl_uString_assign( &strTempPath, strDecodedURL );
@@ -832,13 +832,13 @@ oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **p
         */
 
     }
-
+        
     if ( strDecodedURL )
         rtl_uString_release( strDecodedURL );
-
+            
     if ( osl_File_E_None == nError )
         rtl_uString_assign( pustrPath, strTempPath );
-
+      
     if ( strTempPath )
         rtl_uString_release( strTempPath );
 
@@ -849,19 +849,19 @@ oslFileError _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uString **p
     return nError;
 }
 
-//#############################################
+//#############################################      
 oslFileError _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString** pstrURL )
 {
     oslFileError nError = osl_File_E_INVAL; /* Assume failure */
-    rtl_uString *strTempURL = NULL;
+    rtl_uString	*strTempURL = NULL;
     DWORD dwPathType = PATHTYPE_ERROR;
 
     if (strPath)
         dwPathType = IsValidFilePath(strPath, NULL, VALIDATEPATH_ALLOW_RELATIVE, NULL);
-
+                
     if (dwPathType)
     {
-        rtl_uString *strTempPath = NULL;
+        rtl_uString	*strTempPath = NULL;
 
         if ( dwPathType & PATHTYPE_IS_LONGPATH )
         {
@@ -904,7 +904,7 @@ oslFileError _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString**
             }
         }
         else
-        {
+        { 
             /* Replace backslashes */
             rtl_uString_newReplace( &strTempPath, strPath, '\\', '/' );
         }
@@ -935,7 +935,7 @@ oslFileError _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString**
 
     if ( osl_File_E_None == nError )
     {
-        rtl_String  *strEncodedURL = NULL;
+        rtl_String	*strEncodedURL = NULL;
 
         /* Encode the URL */
         _osl_encodeURL( strTempURL, &strEncodedURL );
@@ -957,66 +957,66 @@ oslFileError _osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString**
 }
 
 //#####################################################
-oslFileError SAL_CALL osl_getFileURLFromSystemPath(
+oslFileError SAL_CALL osl_getFileURLFromSystemPath( 
     rtl_uString* ustrPath, rtl_uString** pustrURL )
 {
     return _osl_getFileURLFromSystemPath( ustrPath, pustrURL );
 }
 
 //#####################################################
-oslFileError SAL_CALL osl_getSystemPathFromFileURL(
+oslFileError SAL_CALL osl_getSystemPathFromFileURL( 
     rtl_uString *ustrURL, rtl_uString **pustrPath)
 {
     return _osl_getSystemPathFromFileURL( ustrURL, pustrPath, sal_True );
 }
 
 //#####################################################
-oslFileError SAL_CALL osl_searchFileURL(
-    rtl_uString *ustrFileName,
-    rtl_uString *ustrSystemSearchPath,
+oslFileError SAL_CALL osl_searchFileURL( 
+    rtl_uString *ustrFileName, 
+    rtl_uString *ustrSystemSearchPath, 
     rtl_uString **pustrPath)
 {
-    rtl_uString     *ustrUNCPath = NULL;
-    rtl_uString     *ustrSysPath = NULL;
-    oslFileError    error;
+    rtl_uString		*ustrUNCPath = NULL;
+    rtl_uString		*ustrSysPath = NULL;
+    oslFileError	error;
 
     /* First try to interpret the file name as an URL even a relative one */
     error = _osl_getSystemPathFromFileURL( ustrFileName, &ustrUNCPath, sal_True );
 
-    /* So far we either have an UNC path or something invalid
+    /* So far we either have an UNC path or something invalid 
        Now create a system path */
     if ( osl_File_E_None == error )
         error = _osl_getSystemPathFromFileURL( ustrUNCPath, &ustrSysPath, sal_True );
 
     if ( osl_File_E_None == error )
     {
-        DWORD   nBufferLength;
-        DWORD   dwResult;
-        LPTSTR  lpBuffer = NULL;
-        LPTSTR  lpszFilePart;
+        DWORD	nBufferLength;
+        DWORD	dwResult;		
+        LPTSTR	lpBuffer = NULL;
+        LPTSTR	lpszFilePart;
 
-        /* Repeat calling SearchPath ...
-           Start with MAX_PATH for the buffer. In most cases this
+        /* Repeat calling SearchPath ... 
+           Start with MAX_PATH for the buffer. In most cases this 
            will be enough and does not force the loop to runtwice */
         dwResult = MAX_PATH;
 
         do
         {
             /* If search path is empty use a NULL pointer instead according to MSDN documentation of SearchPath */
-            LPCTSTR lpszSearchPath = ustrSystemSearchPath && ustrSystemSearchPath->length ? reinterpret_cast<LPCTSTR>(ustrSystemSearchPath->buffer) : NULL;
-            LPCTSTR lpszSearchFile = reinterpret_cast<LPCTSTR>(ustrSysPath->buffer);
+            LPCTSTR	lpszSearchPath = ustrSystemSearchPath && ustrSystemSearchPath->length ? reinterpret_cast<LPCTSTR>(ustrSystemSearchPath->buffer) : NULL;
+            LPCTSTR	lpszSearchFile = reinterpret_cast<LPCTSTR>(ustrSysPath->buffer);
 
             /* Allocate space for buffer according to previous returned count of required chars */
             /* +1 is not neccessary if we follow MSDN documentation but for robustness we do so */
             nBufferLength = dwResult + 1;
-            lpBuffer = lpBuffer ?
-                reinterpret_cast<LPTSTR>(rtl_reallocateMemory(lpBuffer, nBufferLength * sizeof(TCHAR))) :
+            lpBuffer = lpBuffer ? 
+                reinterpret_cast<LPTSTR>(rtl_reallocateMemory(lpBuffer, nBufferLength * sizeof(TCHAR))) : 
                 reinterpret_cast<LPTSTR>(rtl_allocateMemory(nBufferLength * sizeof(TCHAR)));
 
-            dwResult = SearchPath( lpszSearchPath, lpszSearchFile, NULL, nBufferLength, lpBuffer, &lpszFilePart );
+            dwResult = SearchPath( lpszSearchPath, lpszSearchFile, NULL, nBufferLength, lpBuffer, &lpszFilePart ); 
         } while ( dwResult && dwResult >= nBufferLength );
 
-        /*  ... until an error occures or buffer is large enough.
+        /*	... until an error occures or buffer is large enough. 
             dwResult == nBufferLength can not happen according to documentation but lets be robust ;-) */
 
         if ( dwResult )
@@ -1026,8 +1026,8 @@ oslFileError SAL_CALL osl_searchFileURL(
         }
         else
         {
-            WIN32_FIND_DATA aFindFileData;
-            HANDLE  hFind;
+            WIN32_FIND_DATA	aFindFileData;
+            HANDLE	hFind;
 
             /* Somthing went wrong, perhaps the path was absolute */
             error = oslTranslateFileError( GetLastError() );
@@ -1043,7 +1043,7 @@ oslFileError SAL_CALL osl_searchFileURL(
 
         rtl_freeMemory( lpBuffer );
     }
-
+    
     if ( ustrSysPath )
         rtl_uString_release( ustrSysPath );
 
@@ -1057,9 +1057,9 @@ oslFileError SAL_CALL osl_searchFileURL(
 
 oslFileError SAL_CALL osl_getAbsoluteFileURL( rtl_uString* ustrBaseURL, rtl_uString* ustrRelativeURL, rtl_uString** pustrAbsoluteURL )
 {
-    oslFileError    eError;
-    rtl_uString     *ustrRelSysPath = NULL;
-    rtl_uString     *ustrBaseSysPath = NULL;
+    oslFileError	eError;
+    rtl_uString		*ustrRelSysPath = NULL;
+    rtl_uString		*ustrBaseSysPath = NULL;
 
     if ( ustrBaseURL && ustrBaseURL->length )
     {
@@ -1078,14 +1078,14 @@ oslFileError SAL_CALL osl_getAbsoluteFileURL( rtl_uString* ustrBaseURL, rtl_uStr
     {
         ::osl::LongPathBuffer< sal_Unicode > aBuffer( MAX_LONG_PATH );
         ::osl::LongPathBuffer< sal_Unicode > aCurrentDir( MAX_LONG_PATH );
-        LPTSTR  lpFilePart = NULL;
-        DWORD   dwResult;
+        LPTSTR	lpFilePart = NULL;
+        DWORD	dwResult;
 
 /*@@@ToDo
   Bad, bad hack, this only works if the base path
   really exists which is not necessary according
   to RFC2396
-  The whole FileURL implementation should be merged
+  The whole FileURL implementation should be merged 
   with the rtl/uri class.
 */
         if ( ustrBaseSysPath )
@@ -1111,7 +1111,7 @@ oslFileError SAL_CALL osl_getAbsoluteFileURL( rtl_uString* ustrBaseURL, rtl_uStr
                 eError = osl_File_E_INVAL;
             else
             {
-                rtl_uString *ustrAbsSysPath = NULL;
+                rtl_uString	*ustrAbsSysPath = NULL;
 
                 rtl_uString_newFromStr( &ustrAbsSysPath, aBuffer );
 
@@ -1131,7 +1131,7 @@ oslFileError SAL_CALL osl_getAbsoluteFileURL( rtl_uString* ustrBaseURL, rtl_uStr
     if ( ustrRelSysPath )
         rtl_uString_release( ustrRelSysPath );
 
-    return  eError;
+    return	eError;
 }
 
 //#####################################################
diff --git a/sal/osl/w32/file_url.h b/sal/osl/w32/file_url.h
index 3f12151442a9..3652dffb1e77 100644
--- a/sal/osl/w32/file_url.h
+++ b/sal/osl/w32/file_url.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,20 +48,20 @@
 extern "C" {
 #endif
 
-#define PATHTYPE_ERROR                      0
-#define PATHTYPE_RELATIVE                   1
-#define PATHTYPE_ABSOLUTE_UNC               2
-#define PATHTYPE_ABSOLUTE_LOCAL             3
-#define PATHTYPE_MASK_TYPE                  0xFF
-#define PATHTYPE_IS_VOLUME                  0x0100
-#define PATHTYPE_IS_SERVER                  0x0200
-#define PATHTYPE_IS_LONGPATH                0x0400
-
-#define VALIDATEPATH_NORMAL                 0x0000
-#define VALIDATEPATH_ALLOW_WILDCARDS        0x0001
-#define VALIDATEPATH_ALLOW_ELLIPSE          0x0002
-#define VALIDATEPATH_ALLOW_RELATIVE         0x0004
-#define VALIDATEPATH_ALLOW_UNC              0x0008
+#define PATHTYPE_ERROR						0
+#define PATHTYPE_RELATIVE					1
+#define PATHTYPE_ABSOLUTE_UNC				2
+#define PATHTYPE_ABSOLUTE_LOCAL				3
+#define PATHTYPE_MASK_TYPE					0xFF
+#define PATHTYPE_IS_VOLUME					0x0100
+#define PATHTYPE_IS_SERVER					0x0200
+#define PATHTYPE_IS_LONGPATH				0x0400
+
+#define VALIDATEPATH_NORMAL					0x0000
+#define VALIDATEPATH_ALLOW_WILDCARDS		0x0001
+#define VALIDATEPATH_ALLOW_ELLIPSE			0x0002
+#define VALIDATEPATH_ALLOW_RELATIVE			0x0004
+#define VALIDATEPATH_ALLOW_UNC				0x0008
 #define VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD 0x0010
 
 #define MAX_LONG_PATH 32767
@@ -74,9 +74,9 @@ DWORD IsValidFilePath (
 );
 
 DWORD GetCaseCorrectPathName (
-    LPCTSTR lpszShortPath,  // file name
-    LPTSTR  lpszLongPath,   // path buffer
-    DWORD   cchBuffer,      // size of path buffer
+    LPCTSTR	lpszShortPath,	// file name
+    LPTSTR	lpszLongPath,	// path buffer
+    DWORD	cchBuffer,		// size of path buffer 
     BOOL bCheckExistence
 );
 
diff --git a/sal/osl/w32/interlck.c b/sal/osl/w32/interlck.c
index 5c9e566a4a2d..799437dd22da 100644
--- a/sal/osl/w32/interlck.c
+++ b/sal/osl/w32/interlck.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,14 +34,14 @@
 extern int osl_isSingleCPU;
 
 /* For all Intel x86 above x486 we use a spezial inline assembler implementation.
-   The main reason is that WIN9? does not return the result of the operation.
-   Instead there is only returned a value greater than zero is the increment
-   result is greater than zero, but not the the result of the addition.
-   For Windows NT the native function could be used, because the correct result
+   The main reason is that WIN9? does not return the result of the operation. 
+   Instead there is only returned a value greater than zero is the increment 
+   result is greater than zero, but not the the result of the addition. 
+   For Windows NT the native function could be used, because the correct result 
    is returned. Beacuse of simpler code maintance and performace reasons we use
    on every x86-Windows-Platform the inline assembler implementation.
 */
-
+ 
 /*****************************************************************************/
 /* osl_incrementInterlockedCount */
 /*****************************************************************************/
@@ -51,22 +51,22 @@ oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount*
 {
     asm
     (
-     "  movl        %0, %%ecx\n"
-     "      movl        $1, %%eax\n"
-     "  movl        %1, %%edx\n"
-     "  cmpl        $0, %%edx\n"
-     "  je          1f\n"
-     "      xadd        %%eax, (%%ecx)\n"
-     "  jmp         2f\n"
+     "	movl        %0, %%ecx\n"
+     "  	movl        $1, %%eax\n"
+     "	movl        %1, %%edx\n"
+     "	cmpl        $0, %%edx\n"
+     "	je          1f\n"
+     "  	xadd        %%eax, (%%ecx)\n"
+     "	jmp         2f\n"
      "1:\n"
-     "      lock xadd   %%eax, (%%ecx)\n"
+     "  	lock xadd   %%eax, (%%ecx)\n"
      "2:\n"
-     "      incl        %%eax\n"
+     "  	incl        %%eax\n"
      ::"m"(pCount),"m"(osl_isSingleCPU)
     );
 }
 #else
-#pragma warning(disable: 4035)
+#pragma warning(disable: 4035) 
 {
     __asm
     {
@@ -83,10 +83,10 @@ oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount*
         inc         eax
     }
 }
-#pragma warning(default: 4035)
+#pragma warning(default: 4035) 
 #endif
 #else
-#pragma message("WARNING: Using system InterlockedIncrement")
+#pragma message("WARNING: Using system InterlockedIncrement") 
 {
     return (InterlockedIncrement(pCount));
 }
@@ -101,22 +101,22 @@ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount*
 {
     asm
     (
-     "  movl        %0, %%ecx\n"
-     "      orl         $-1, %%eax\n"
-     "  movl        %1, %%edx\n"
-     "  cmpl        $0, %%edx\n"
-     "  je          1f\n"
-     "      xadd        %%eax, (%%ecx)\n"
-     "  jmp         2f\n"
+     "	movl        %0, %%ecx\n"
+     "  	orl         $-1, %%eax\n"
+     "	movl        %1, %%edx\n"
+     "	cmpl        $0, %%edx\n"
+     "	je          1f\n"
+     "  	xadd        %%eax, (%%ecx)\n"
+     "	jmp         2f\n"
      "1:\n"
-     "      lock xadd   %%eax, (%%ecx)\n"
+     "  	lock xadd   %%eax, (%%ecx)\n"
      "2:\n"
-     "      decl        %%eax\n"
+     "  	decl        %%eax\n"
      ::"m"(pCount),"m"(osl_isSingleCPU)
     );
 }
 #else
-#pragma warning(disable: 4035)
+#pragma warning(disable: 4035) 
 {
     __asm
     {
@@ -133,10 +133,10 @@ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount*
         dec         eax
     }
 }
-#pragma warning(default: 4035)
+#pragma warning(default: 4035) 
 #endif
 #else
-#pragma message("WARNING: Using system InterlockedDecrement")
+#pragma message("WARNING: Using system InterlockedDecrement") 
 {
     return (InterlockedDecrement(pCount));
 }
diff --git a/sal/osl/w32/libutil.c b/sal/osl/w32/libutil.c
index c7f4501b156d..54576194e2db 100644
--- a/sal/osl/w32/libutil.c
+++ b/sal/osl/w32/libutil.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index 1171401fe0c1..ad674874a5fc 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -39,7 +39,7 @@
 #include <rtl/logfile.h>
 
 /*
-    under WIN32, we use the void* oslModule
+    under WIN32, we use the void* oslModule 
     as a WIN32 HANDLE (which is also a 32-bit value)
 */
 
@@ -54,14 +54,14 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMod
 #endif
     rtl_uString* Module = NULL;
     oslModule ret = 0;
-    oslFileError    nError;
-
+    oslFileError	nError;
+    
     RTL_LOGFILE_TRACE1( "{ osl_loadModule start: %S", (LPTSTR)&strModuleName->buffer );
 
     OSL_ASSERT(strModuleName);
 
     nRtldMode = nRtldMode; /* avoid warnings */
-
+    
     nError = osl_getSystemPathFromFileURL(strModuleName, &Module);
 
     if ( osl_File_E_None != nError )
@@ -90,7 +90,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMod
 /* osl_getModuleHandle */
 /*****************************************************************************/
 
-sal_Bool SAL_CALL
+sal_Bool SAL_CALL 
 osl_getModuleHandle(rtl_uString *pModuleName, oslModule *pResult)
 {
     HINSTANCE hInstance = GetModuleHandleW(reinterpret_cast<LPCWSTR>(pModuleName->buffer));
@@ -99,7 +99,7 @@ osl_getModuleHandle(rtl_uString *pModuleName, oslModule *pResult)
         *pResult = (oslModule) hInstance;
         return sal_True;
     }
-
+    
     return sal_False;
 }
 
@@ -107,7 +107,7 @@ osl_getModuleHandle(rtl_uString *pModuleName, oslModule *pResult)
 /* osl_unloadModule */
 /*****************************************************************************/
 void SAL_CALL osl_unloadModule(oslModule Module)
-{
+{	
     FreeLibrary((HINSTANCE)Module);
 }
 
@@ -117,7 +117,7 @@ void SAL_CALL osl_unloadModule(oslModule Module)
 void* SAL_CALL osl_getSymbol(oslModule Module, rtl_uString *strSymbolName)
 {
     /* casting from a function pointer to a data pointer is invalid
-       be in this case unavoidable because the API has to stay
+       be in this case unavoidable because the API has to stay 
        compitable we need to keep this function which returns a
        void* by definition */
 #ifdef _MSC_VER
@@ -134,17 +134,17 @@ void* SAL_CALL osl_getSymbol(oslModule Module, rtl_uString *strSymbolName)
 /* osl_getFunctionSymbol */
 /*****************************************************************************/
 oslGenericFunction SAL_CALL osl_getFunctionSymbol( oslModule Module, rtl_uString *strSymbolName )
-{
+{    
     rtl_String *symbolName = NULL;
     oslGenericFunction address;
 
     OSL_ASSERT(Module);
     OSL_ASSERT(strSymbolName);
 
-    rtl_uString2String(
-        &symbolName,
-        strSymbolName->buffer,
-        strSymbolName->length,
+    rtl_uString2String( 
+        &symbolName, 
+        strSymbolName->buffer, 
+        strSymbolName->length, 
         RTL_TEXTENCODING_UTF8,
         OUSTRING_TO_OSTRING_CVTFLAGS
     );
@@ -158,14 +158,14 @@ oslGenericFunction SAL_CALL osl_getFunctionSymbol( oslModule Module, rtl_uString
 /*****************************************************************************/
 /* osl_getAsciiFunctionSymbol */
 /*****************************************************************************/
-oslGenericFunction SAL_CALL
+oslGenericFunction SAL_CALL 
 osl_getAsciiFunctionSymbol( oslModule Module, const sal_Char *pSymbol )
 {
     oslGenericFunction fncAddr = NULL;
-
+    
     if( pSymbol )
         fncAddr=(oslGenericFunction)GetProcAddress((HINSTANCE) Module, pSymbol);
-
+    
     return fncAddr;
 }
 
@@ -190,40 +190,40 @@ osl_getAsciiFunctionSymbol( oslModule Module, const sal_Char *pSymbol )
 #endif
 
 typedef HANDLE (WINAPI *CreateToolhelp32Snapshot_PROC)( DWORD dwFlags, DWORD th32ProcessID );
-typedef BOOL (WINAPI *Module32First_PROC)( HANDLE   hSnapshot, LPMODULEENTRY32 lpme32 );
-typedef BOOL (WINAPI *Module32Next_PROC)( HANDLE    hSnapshot, LPMODULEENTRY32 lpme32 );
+typedef BOOL (WINAPI *Module32First_PROC)( HANDLE	hSnapshot, LPMODULEENTRY32 lpme32 );
+typedef BOOL (WINAPI *Module32Next_PROC)( HANDLE	hSnapshot, LPMODULEENTRY32 lpme32 );
 
 static sal_Bool SAL_CALL _osl_addressGetModuleURL_Windows( void *pv, rtl_uString **pustrURL )
 {
-    sal_Bool    bSuccess        = sal_False;    /* Assume failure */
-    HMODULE     hModKernel32    = GetModuleHandleA( "KERNEL32.DLL" );
+    sal_Bool	bSuccess		= sal_False;	/* Assume failure */
+    HMODULE		hModKernel32	= GetModuleHandleA( "KERNEL32.DLL" );
 
     if ( hModKernel32 )
     {
-        CreateToolhelp32Snapshot_PROC   lpfnCreateToolhelp32Snapshot = (CreateToolhelp32Snapshot_PROC)GetProcAddress( hModKernel32, "CreateToolhelp32Snapshot" );
-        Module32First_PROC              lpfnModule32First = (Module32First_PROC)GetProcAddress( hModKernel32, "Module32First" );
-        Module32Next_PROC               lpfnModule32Next = (Module32Next_PROC)GetProcAddress( hModKernel32, "Module32Next" );
+        CreateToolhelp32Snapshot_PROC	lpfnCreateToolhelp32Snapshot = (CreateToolhelp32Snapshot_PROC)GetProcAddress( hModKernel32, "CreateToolhelp32Snapshot" );
+        Module32First_PROC				lpfnModule32First = (Module32First_PROC)GetProcAddress( hModKernel32, "Module32First" );
+        Module32Next_PROC				lpfnModule32Next = (Module32Next_PROC)GetProcAddress( hModKernel32, "Module32Next" );
 
         if ( lpfnCreateToolhelp32Snapshot && lpfnModule32First && lpfnModule32Next )
         {
-            HANDLE  hModuleSnap = NULL;
-            DWORD   dwProcessId = GetCurrentProcessId();
-
-            // Take a snapshot of all modules in the specified process.
+            HANDLE	hModuleSnap	= NULL;			
+            DWORD	dwProcessId = GetCurrentProcessId();
+ 
+            // Take a snapshot of all modules in the specified process. 
 
-            hModuleSnap = lpfnCreateToolhelp32Snapshot(TH32CS_SNAPMODULE, dwProcessId );
+            hModuleSnap = lpfnCreateToolhelp32Snapshot(TH32CS_SNAPMODULE, dwProcessId ); 
 
             if ( INVALID_HANDLE_VALUE != hModuleSnap )
             {
-                MODULEENTRY32   me32    = {0};
-
-                // Fill the size of the structure before using it.
+                MODULEENTRY32	me32	= {0}; 
 
-                me32.dwSize = sizeof(MODULEENTRY32);
+                // Fill the size of the structure before using it. 
 
-                // Walk the module list of the process, and find the module of
-                // interest. Then copy the information to the buffer pointed
-                // to by lpMe32 so that it can be returned to the caller.
+                me32.dwSize = sizeof(MODULEENTRY32); 
+ 
+                // Walk the module list of the process, and find the module of 
+                // interest. Then copy the information to the buffer pointed 
+                // to by lpMe32 so that it can be returned to the caller. 
 
                 if ( lpfnModule32First(hModuleSnap, &me32) )
                 {
@@ -231,7 +231,7 @@ static sal_Bool SAL_CALL _osl_addressGetModuleURL_Windows( void *pv, rtl_uString
                     {
                         if ( (BYTE *)pv >= (BYTE *)me32.hModule && (BYTE *)pv < (BYTE *)me32.hModule + me32.modBaseSize )
                         {
-                            rtl_uString *ustrSysPath = NULL;
+                            rtl_uString	*ustrSysPath = NULL;
 
                             rtl_string2UString( &ustrSysPath, me32.szExePath, strlen(me32.szExePath), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
                             OSL_ASSERT(ustrSysPath != NULL);
@@ -245,15 +245,15 @@ static sal_Bool SAL_CALL _osl_addressGetModuleURL_Windows( void *pv, rtl_uString
                 }
 
 
-                // Do not forget to clean up the snapshot object.
+                // Do not forget to clean up the snapshot object. 
 
-                CloseHandle (hModuleSnap);
+                CloseHandle (hModuleSnap); 
             }
-
+            
         }
     }
 
-    return  bSuccess;
+    return	bSuccess;
 }
 
 /***************************************************************************************/
@@ -285,28 +285,28 @@ typedef BOOL (WINAPI *SymGetModuleInfo_PROC)(
     );
 
 /* Seems that IMAGEHLP.DLL is always availiable on NT 4. But MSDN from Platform SDK says Win 2K is required. MSDN from VS 6.0a says
-    it's O.K on NT 4 ???!!!
-    BTW: We are using ANSI function because not all version of IMAGEHLP.DLL contain Unicode support
+    it's O.K on NT 4 ???!!! 
+    BTW: We are using ANSI function because not all version of IMAGEHLP.DLL contain Unicode support 
 */
 
 static sal_Bool SAL_CALL _osl_addressGetModuleURL_NT4( void *pv, rtl_uString **pustrURL )
 {
-    sal_Bool    bSuccess    = sal_False;    /* Assume failure */
+    sal_Bool	bSuccess	= sal_False;	/* Assume failure */
 
-    /*  IMAGEHELP.DLL has a bug that it recursivly scans subdirectories of
-        the root when calling SymInitialize(), so we preferr DBGHELP.DLL
+    /*	IMAGEHELP.DLL has a bug that it recursivly scans subdirectories of 
+        the root when calling SymInitialize(), so we preferr DBGHELP.DLL 
         which exports the same symbols and is shipped with OOo */
 
-    HMODULE     hModImageHelp = LoadLibrary( "DBGHELP.DLL" );
+    HMODULE		hModImageHelp = LoadLibrary( "DBGHELP.DLL" );
 
     if ( !hModImageHelp )
         hModImageHelp = LoadLibrary( "IMAGEHLP.DLL" );
 
     if ( hModImageHelp )
     {
-        SymGetModuleInfo_PROC   lpfnSymGetModuleInfo;
-        SymInitialize_PROC      lpfnSymInitialize;
-        SymCleanup_PROC         lpfnSymCleanup;
+        SymGetModuleInfo_PROC	lpfnSymGetModuleInfo;
+        SymInitialize_PROC		lpfnSymInitialize;
+        SymCleanup_PROC			lpfnSymCleanup;
 
 
         lpfnSymInitialize = (SymInitialize_PROC)GetProcAddress( hModImageHelp, "SymInitialize" );
@@ -316,18 +316,18 @@ static sal_Bool SAL_CALL _osl_addressGetModuleURL_NT4( void *pv, rtl_uString **p
 
         if ( lpfnSymInitialize && lpfnSymCleanup && lpfnSymGetModuleInfo )
         {
-            IMAGEHLP_MODULE ModuleInfo;
+            IMAGEHLP_MODULE	ModuleInfo;
             ::osl::LongPathBuffer< sal_Char > aModuleFileName( MAX_LONG_PATH );
-            LPSTR   lpSearchPath = NULL;
+            LPSTR	lpSearchPath = NULL;
 
             if ( GetModuleFileNameA( NULL, aModuleFileName, aModuleFileName.getBufSizeInSymbols() ) )
             {
                 char *pLastBkSlash = strrchr( aModuleFileName, '\\' );
 
-                if (
-                    pLastBkSlash &&
+                if ( 
+                    pLastBkSlash && 
                     pLastBkSlash > (sal_Char*)aModuleFileName
-                    && *(pLastBkSlash - 1) != ':'
+                    && *(pLastBkSlash - 1) != ':' 
                     && *(pLastBkSlash - 1) != '\\'
                     )
                 {
@@ -345,14 +345,14 @@ static sal_Bool SAL_CALL _osl_addressGetModuleURL_NT4( void *pv, rtl_uString **p
 
             if ( bSuccess )
             {
-                /*  #99182 On localized (non-english) NT4 and XP (!!!) for some libraries the LoadedImageName member of ModuleInfo isn't filled. Because
+                /*	#99182 On localized (non-english) NT4 and XP (!!!) for some libraries the LoadedImageName member of ModuleInfo isn't filled. Because
                     other members ModuleName and ImageName do not contain the full path we can cast the Member
                     BaseOfImage to a HMODULE (on NT it's the same) and use GetModuleFileName to retrieve the full
                     path of the loaded image */
 
                 if ( ModuleInfo.LoadedImageName[0] || GetModuleFileNameA( (HMODULE)ModuleInfo.BaseOfImage, ModuleInfo.LoadedImageName, sizeof(ModuleInfo.LoadedImageName) ) )
                 {
-                    rtl_uString *ustrSysPath = NULL;
+                    rtl_uString	*ustrSysPath = NULL;
 
                     rtl_string2UString( &ustrSysPath, ModuleInfo.LoadedImageName, strlen(ModuleInfo.LoadedImageName), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
                     OSL_ASSERT(ustrSysPath != NULL);
@@ -379,7 +379,7 @@ typedef struct _MODULEINFO {
     LPVOID EntryPoint;
 } MODULEINFO, *LPMODULEINFO;
 
-typedef BOOL (WINAPI *EnumProcessModules_PROC)(
+typedef BOOL (WINAPI *EnumProcessModules_PROC)( 
   HANDLE hProcess,      // handle to the process
   HMODULE * lphModule,  // array to receive the module handles
   DWORD cb,             // size of the array
@@ -397,24 +397,24 @@ typedef BOOL (WINAPI *GetModuleInformation_PROC)(
 
 static sal_Bool SAL_CALL _osl_addressGetModuleURL_NT( void *pv, rtl_uString **pustrURL )
 {
-    sal_Bool    bSuccess    = sal_False;    /* Assume failure */
-    static HMODULE      hModPsapi = NULL;
-
+    sal_Bool	bSuccess	= sal_False;	/* Assume failure */
+    static HMODULE		hModPsapi = NULL;
+    
     if ( !hModPsapi )
         hModPsapi = LoadLibrary( "PSAPI.DLL" );
 
     if ( hModPsapi )
     {
-        EnumProcessModules_PROC     lpfnEnumProcessModules      = (EnumProcessModules_PROC)GetProcAddress( hModPsapi, "EnumProcessModules" );
-        GetModuleInformation_PROC   lpfnGetModuleInformation    = (GetModuleInformation_PROC)GetProcAddress( hModPsapi, "GetModuleInformation" );
+        EnumProcessModules_PROC		lpfnEnumProcessModules		= (EnumProcessModules_PROC)GetProcAddress( hModPsapi, "EnumProcessModules" );
+        GetModuleInformation_PROC	lpfnGetModuleInformation	= (GetModuleInformation_PROC)GetProcAddress( hModPsapi, "GetModuleInformation" );
 
         if ( lpfnEnumProcessModules && lpfnGetModuleInformation )
         {
-            DWORD       cbNeeded = 0;
-            HMODULE     *lpModules = NULL;
-            DWORD       nModules = 0;
-            UINT        iModule = 0;
-            MODULEINFO  modinfo;
+            DWORD		cbNeeded = 0;
+            HMODULE		*lpModules = NULL;
+            DWORD		nModules = 0;
+            UINT		iModule = 0;
+            MODULEINFO	modinfo;
 
             lpfnEnumProcessModules( GetCurrentProcess(), NULL, 0, &cbNeeded );
 
@@ -430,7 +430,7 @@ static sal_Bool SAL_CALL _osl_addressGetModuleURL_NT( void *pv, rtl_uString **pu
                 if ( (BYTE *)pv >= (BYTE *)modinfo.lpBaseOfDll && (BYTE *)pv < (BYTE *)modinfo.lpBaseOfDll + modinfo.SizeOfImage )
                 {
                     ::osl::LongPathBuffer< sal_Unicode > aBuffer( MAX_LONG_PATH );
-                    rtl_uString *ustrSysPath = NULL;
+                    rtl_uString	*ustrSysPath = NULL;
 
                     GetModuleFileNameW( lpModules[iModule], ::osl::mingw_reinterpret_cast<LPWSTR>(aBuffer), aBuffer.getBufSizeInSymbols() );
 
@@ -468,13 +468,13 @@ sal_Bool SAL_CALL osl_getModuleURLFromFunctionAddress( oslGenericFunction addr,
 {
     /* casting a function pointer to a data pointer (void*) is
        not allowed according to the C/C++ standards. In this case
-       it is unavoidable because we have to stay compatible we
+       it is unavoidable because we have to stay compatible we 
        cannot remove any function. */
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4054)
 #endif
-    return osl_getModuleURLFromAddress((void*)addr, ppLibraryUrl);
+    return osl_getModuleURLFromAddress((void*)addr, ppLibraryUrl); 
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
diff --git a/sal/osl/w32/mutex.c b/sal/osl/w32/mutex.c
index 34f27d2f74ee..009062334f55 100644
--- a/sal/osl/w32/mutex.c
+++ b/sal/osl/w32/mutex.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,10 +38,10 @@
 */
 
 typedef struct _oslMutexImpl {
-    CRITICAL_SECTION    m_Mutex;
-    int                 m_Locks;
-    DWORD               m_Owner;
-    DWORD               m_Requests;
+    CRITICAL_SECTION	m_Mutex;
+    int 				m_Locks;
+    DWORD				m_Owner;
+    DWORD				m_Requests;
 } oslMutexImpl;
 
 static BOOL (WINAPI *lpfTryEnterCriticalSection)(LPCRITICAL_SECTION)
@@ -61,14 +61,14 @@ oslMutex SAL_CALL osl_createMutex(void)
     if (lpfTryEnterCriticalSection ==
                 (BOOL (WINAPI *)(LPCRITICAL_SECTION))0xFFFFFFFF)
     {
-        OSVERSIONINFO VersionInformation =
+        OSVERSIONINFO VersionInformation = 
 
         {
             sizeof(OSVERSIONINFO),
+            0, 
+            0, 
             0,
-            0,
-            0,
-            0,
+            0, 
             "",
         };
 
@@ -149,7 +149,7 @@ sal_Bool SAL_CALL osl_acquireMutex(oslMutex Mutex)
 /*****************************************************************************/
 sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutex Mutex)
 {
-    sal_Bool     ret = sal_False;
+    sal_Bool 	 ret = sal_False;
     oslMutexImpl *pMutexImpl = (oslMutexImpl *)Mutex;
 
     OSL_ASSERT(Mutex);
@@ -201,7 +201,7 @@ sal_Bool SAL_CALL osl_releaseMutex(oslMutex Mutex)
 /* initialized in dllentry.c */
 oslMutex g_Mutex;
 
-oslMutex * SAL_CALL osl_getGlobalMutex(void)
+oslMutex * SAL_CALL osl_getGlobalMutex(void) 
 {
     return &g_Mutex;
 }
diff --git a/sal/osl/w32/nlsupport.c b/sal/osl/w32/nlsupport.c
index ea2b33e8e30d..9affc96bb581 100644
--- a/sal/osl/w32/nlsupport.c
+++ b/sal/osl/w32/nlsupport.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ static DWORD g_dwTLSLocaleEncId = (DWORD) -1;
 
 /*****************************************************************************/
 /* callback function test
-/*
+/* 
 /* osl_getTextEncodingFromLocale calls EnumSystemLocalesA, so that we don't
 /* need to provide a unicode wrapper for this function under Win9x
 /* that means the callback function has an ansi prototype and receives
@@ -64,12 +64,12 @@ BOOL CALLBACK EnumLocalesProcA( LPSTR lpLocaleStringA )
 {
     struct EnumLocalesParams * params;
 
-    LCID  localeId;
+    LCID  localeId;	
     LPSTR pszEndA;
 
     WCHAR langCode[4];
-
-    /* convert hex-string to LCID */
+   
+    /* convert hex-string to LCID */	
     localeId = strtol( lpLocaleStringA, &pszEndA, 16 );
 
     /* check params received via TLS */
@@ -77,13 +77,13 @@ BOOL CALLBACK EnumLocalesProcA( LPSTR lpLocaleStringA )
     if( NULL == params || '\0' == params->Language[0] )
         return FALSE;
 
-    /*
-        get the ISO language code for this locale
-
+    /* 
+        get the ISO language code for this locale 
+    
         remeber: we call the GetLocaleInfoW function
         because the ansi version of this function returns
-        an error under WinNT/2000 when called with an
-        unicode only lcid
+        an error under WinNT/2000 when called with an 
+        unicode only lcid 
     */
     if( GetLocaleInfo( localeId, LOCALE_SISO639LANGNAME , langCode, 4 ) )
     {
diff --git a/sal/osl/w32/path_helper.cxx b/sal/osl/w32/path_helper.cxx
index 3edf3d48aafb..c35e68c859a8 100644
--- a/sal/osl/w32/path_helper.cxx
+++ b/sal/osl/w32/path_helper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 /*******************************************************************
  Includes
  ******************************************************************/
-
+ 
 #include "path_helper.hxx"
 #include <osl/diagnose.h>
 #include <rtl/ustring.hxx>
@@ -43,28 +43,28 @@
 /*******************************************************************
  Constants
  ******************************************************************/
-
+ 
 const rtl::OUString BACKSLASH = rtl::OUString::createFromAscii("\\");
 const rtl::OUString SLASH     = rtl::OUString::createFromAscii("/");
 
 /*******************************************************************
  osl_systemPathEnsureSeparator
  ******************************************************************/
-
+ 
 void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath)
 {
     OSL_PRECOND(ppustrPath && (NULL != *ppustrPath), \
                 "osl_systemPathEnsureSeparator: Invalid parameter");
-
-     rtl::OUString path(*ppustrPath);
+    
+     rtl::OUString path(*ppustrPath);	
     sal_Int32     i = std::max<sal_Int32>(path.lastIndexOf(BACKSLASH), path.lastIndexOf(SLASH));
-
+    
     if (i < (path.getLength()-1))
     {
-        path += BACKSLASH;
-        rtl_uString_assign(ppustrPath, path.pData);
+        path += BACKSLASH; 
+        rtl_uString_assign(ppustrPath, path.pData);			
     }
-
+    
     OSL_POSTCOND(path.lastIndexOf(BACKSLASH) == (path.getLength() - 1), \
                  "osl_systemPathEnsureSeparator: Post condition failed");
 }
@@ -72,18 +72,18 @@ void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath)
 /*******************************************************************
  osl_systemPathRemoveSeparator
  ******************************************************************/
-
+ 
 void SAL_CALL osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath)
 {
     rtl::OUString path(*ppustrPath);
-
+    
     if (!osl::systemPathIsLogicalDrivePattern(path))
-    {
+    {        
         sal_Int32 i = std::max<sal_Int32>(path.lastIndexOf(BACKSLASH), path.lastIndexOf(SLASH));
-
-        if (i > -1 && (i == (path.getLength() - 1)))
+        
+        if (i > -1 && (i == (path.getLength() - 1)))        
         {
-            path = rtl::OUString(path.getStr(), path.getLength() - 1);
+            path = rtl::OUString(path.getStr(), path.getLength() - 1);                    
             rtl_uString_assign(ppustrPath, path.pData);
         }
     }
@@ -97,22 +97,22 @@ void SAL_CALL osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath)
 const sal_Char* LDP                    = ":";
 const sal_Char* LDP_WITH_BACKSLASH     = ":\\";
 const sal_Char* LDP_WITH_SLASH         = ":/";
-
-// degenerated case returned by the Windows FileOpen dialog
+   
+// degenerated case returned by the Windows FileOpen dialog 
 // when someone enters for instance "x:filename", the Win32
 // API accepts this case
 const sal_Char* LDP_WITH_DOT_BACKSLASH = ":.\\";
-
+     
 sal_Int32 osl_systemPathIsLogicalDrivePattern(/*in*/ const rtl_uString* pustrPath)
 {
     const sal_Unicode* p = rtl_uString_getStr(const_cast<rtl_uString*>(pustrPath));
     if (iswalpha(*p++))
-    {
-        return ((0 == rtl_ustr_ascii_compare(p, LDP)) ||
-                (0 == rtl_ustr_ascii_compare(p, LDP_WITH_BACKSLASH)) ||
+    {                           
+        return ((0 == rtl_ustr_ascii_compare(p, LDP)) || 
+                (0 == rtl_ustr_ascii_compare(p, LDP_WITH_BACKSLASH)) || 
                 (0 == rtl_ustr_ascii_compare(p, LDP_WITH_SLASH)) ||
                 (0 == rtl_ustr_ascii_compare(p, LDP_WITH_DOT_BACKSLASH)));
-    }
+    }   
     return 0;
 }
 
diff --git a/sal/osl/w32/path_helper.h b/sal/osl/w32/path_helper.h
index cb39c49e36d6..41a0f4330bb2 100644
--- a/sal/osl/w32/path_helper.h
+++ b/sal/osl/w32/path_helper.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,19 +40,19 @@ extern "C"
 
 /*******************************************************************
  osl_systemPathEnsureSeparator
- Adds a trailing path separator to the given system path if not
+ Adds a trailing path separator to the given system path if not 
  already there and if the path is not the root path or a logical
  drive alone
  ******************************************************************/
-
+ 
 void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath);
 
 /*******************************************************************
  osl_systemPathRemoveSeparator
- Removes the last separator from the given system path if any and
+ Removes the last separator from the given system path if any and 
  if the path is not the root path '\'
  ******************************************************************/
-
+ 
 void SAL_CALL osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath);
 
 /*******************************************************************
@@ -61,9 +61,9 @@ void SAL_CALL osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath);
  A logical drive pattern is something like "a:\", "c:\".
  No logical drive pattern is something like "c:\test"
  ******************************************************************/
-
+ 
 sal_Int32 osl_systemPathIsLogicalDrivePattern(/*in*/ const rtl_uString* pustrPath);
-
+          
 #ifdef __cplusplus
 }
 #endif
diff --git a/sal/osl/w32/path_helper.hxx b/sal/osl/w32/path_helper.hxx
index 05fc117d25d8..f7f464650249 100644
--- a/sal/osl/w32/path_helper.hxx
+++ b/sal/osl/w32/path_helper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,11 +42,11 @@ namespace osl
 
 /*******************************************************************
  osl_systemPathEnsureSeparator
- Adds a trailing path separator to the given system path if not
+ Adds a trailing path separator to the given system path if not 
  already there and if the path is not the root path or a logical
  drive alone
  ******************************************************************/
-
+ 
 inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
 {
     osl_systemPathEnsureSeparator(&Path.pData);
@@ -54,24 +54,24 @@ inline void systemPathEnsureSeparator(/*inout*/ rtl::OUString& Path)
 
 /*******************************************************************
  osl_systemPathRemoveSeparator
- Removes the last separator from the given system path if any and
+ Removes the last separator from the given system path if any and 
  if the path is not the root path '\'
  ******************************************************************/
-
+ 
 inline void systemPathRemoveSeparator(/*inout*/ rtl::OUString& Path)
 {
     osl_systemPathRemoveSeparator(&Path.pData);
 }
 
 /*******************************************************************
- osl_systemPathIsLogicalDrivePattern
+ osl_systemPathIsLogicalDrivePattern 
  ******************************************************************/
-
+ 
 inline bool systemPathIsLogicalDrivePattern(/*in*/ const rtl::OUString& path)
 {
     return osl_systemPathIsLogicalDrivePattern(path.pData);
 }
-
+ 
 /*******************************************************************
  LongPathBuffer
  ******************************************************************/
@@ -116,6 +116,6 @@ public:
 
 } // end namespace osl
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/pipe.c b/sal/osl/w32/pipe.c
index fb12be899286..0ed681fce823 100644
--- a/sal/osl/w32/pipe.c
+++ b/sal/osl/w32/pipe.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@
 #include <rtl/alloc.h>
 #include <rtl/memory.h>
 
-#define PIPESYSTEM      "\\\\.\\pipe\\"
+#define PIPESYSTEM    	"\\\\.\\pipe\\"
 #define PIPEPREFIX    "OSL_PIPE_"
 
 typedef struct
@@ -51,7 +51,7 @@ typedef struct
     sal_uInt32 m_ReadPos;
     sal_uInt32 m_WritePos;
     BYTE   m_Data[1];
-
+    
 } oslPipeBuffer;
 
 /*****************************************************************************/
@@ -60,14 +60,14 @@ typedef struct
 
 struct oslPipeImpl {
     oslInterlockedCount  m_Reference;
-    HANDLE               m_File;
-    HANDLE               m_NamedObject;
+    HANDLE		 		 m_File;
+    HANDLE				 m_NamedObject;
     PSECURITY_ATTRIBUTES m_Security;
-    HANDLE               m_ReadEvent;
-    HANDLE               m_WriteEvent;
-    HANDLE               m_AcceptEvent;
+    HANDLE				 m_ReadEvent;
+    HANDLE				 m_WriteEvent;
+    HANDLE				 m_AcceptEvent;
     rtl_uString*         m_Name;
-    oslPipeError         m_Error;
+    oslPipeError 		 m_Error;
     sal_Bool             m_bClosed;
 };
 
@@ -90,9 +90,9 @@ oslPipe __osl_createPipeImpl(void)
     pPipe->m_File = INVALID_HANDLE_VALUE;
     pPipe->m_NamedObject = INVALID_HANDLE_VALUE;
 
-    pPipe->m_ReadEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
-    pPipe->m_WriteEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
-    pPipe->m_AcceptEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+    pPipe->m_ReadEvent = CreateEvent(NULL, TRUE, FALSE, NULL); 
+    pPipe->m_WriteEvent = CreateEvent(NULL, TRUE, FALSE, NULL); 
+    pPipe->m_AcceptEvent = CreateEvent(NULL, TRUE, FALSE, NULL); 
 
     return pPipe;
 }
@@ -126,7 +126,7 @@ void __osl_destroyPipeImpl(oslPipe pPipe)
 /*****************************************************************************/
 /* osl_createPipe  */
 /*****************************************************************************/
-oslPipe SAL_CALL osl_createPipe(rtl_uString *strPipeName, oslPipeOptions Options,
+oslPipe SAL_CALL osl_createPipe(rtl_uString *strPipeName, oslPipeOptions Options, 
                        oslSecurity Security)
 {
     rtl_uString* name = NULL;
@@ -193,8 +193,8 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *strPipeName, oslPipeOptions Options
             pPipe->m_NamedObject = CreateMutexW( NULL, FALSE, name->buffer );
         else
         {
-            LPSTR   pszTempBuffer = NULL;
-            int     nCharsNeeded;
+            LPSTR	pszTempBuffer = NULL;
+            int		nCharsNeeded;
 
             nCharsNeeded = WideCharToMultiByte( CP_ACP, 0, name->buffer, name->length, NULL, 0, NULL, NULL );
             pszTempBuffer = alloca( nCharsNeeded * sizeof(CHAR) );
@@ -215,12 +215,12 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *strPipeName, oslPipeOptions Options
                 {
                     /* try to open system pipe */
                     pPipe->m_File = CreateNamedPipeW(
-                        path->buffer,
+                        path->buffer, 
                         PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
                         PIPE_WAIT | PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE,
                         PIPE_UNLIMITED_INSTANCES,
                         4096, 4096,
-                        NMPWAIT_WAIT_FOREVER,
+                        NMPWAIT_WAIT_FOREVER, 
                         pPipe->m_Security);
 
                     if (pPipe->m_File != INVALID_HANDLE_VALUE)
@@ -233,8 +233,8 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *strPipeName, oslPipeOptions Options
                 }
                 else /* Win 9x */
                 {
-                    LPSTR   pszTempBuffer = NULL;
-                    int     nCharsNeeded;
+                    LPSTR	pszTempBuffer = NULL;
+                    int		nCharsNeeded;
 
                     nCharsNeeded = WideCharToMultiByte( CP_ACP, 0, path->buffer, path->length, NULL, 0, NULL, NULL );
                     pszTempBuffer = alloca( nCharsNeeded * sizeof(CHAR) );
@@ -263,7 +263,7 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *strPipeName, oslPipeOptions Options
     {
         if (IS_NT)
         {
-            BOOL    fPipeAvailable;
+            BOOL	fPipeAvailable;
 
             do
             {
@@ -275,11 +275,11 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *strPipeName, oslPipeOptions Options
                 {
                     pPipe->m_File = CreateFileW(
                             path->buffer,
-                            GENERIC_READ|GENERIC_WRITE,
+                            GENERIC_READ|GENERIC_WRITE, 
                             FILE_SHARE_READ | FILE_SHARE_WRITE,
                             NULL,
-                            OPEN_EXISTING,
-                            FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED,
+                            OPEN_EXISTING, 
+                            FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, 
                             NULL);
 
                     if ( pPipe->m_File != INVALID_HANDLE_VALUE )
@@ -299,8 +299,8 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *strPipeName, oslPipeOptions Options
         }
         else /* Win 9x */
         {
-            LPSTR   pszTempBuffer = NULL;
-            int     nCharsNeeded;
+            LPSTR	pszTempBuffer = NULL;
+            int		nCharsNeeded;
 
             nCharsNeeded = WideCharToMultiByte( CP_ACP, 0, path->buffer, path->length, NULL, 0, NULL, NULL );
             pszTempBuffer = alloca( nCharsNeeded * sizeof(CHAR) );
@@ -333,16 +333,16 @@ void SAL_CALL osl_acquirePipe( oslPipe pPipe )
 
 void SAL_CALL osl_releasePipe( oslPipe pPipe )
 {
-//      OSL_ASSERT( pPipe );
-
+//  	OSL_ASSERT( pPipe );
+    
     if( 0 == pPipe )
         return;
-
+    
     if( 0 == osl_decrementInterlockedCount( &(pPipe->m_Reference) ) )
     {
         if( ! pPipe->m_bClosed )
             osl_closePipe( pPipe );
-
+        
         __osl_destroyPipeImpl( pPipe );
     }
 }
@@ -357,7 +357,7 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
             /* if we have a system pipe close it */
             if (pPipe->m_File != INVALID_HANDLE_VALUE)
             {
-                /*          FlushFileBuffers(pPipe->m_File); */
+                /*			FlushFileBuffers(pPipe->m_File); */
                 DisconnectNamedPipe(pPipe->m_File);
                 CloseHandle(pPipe->m_File);
             }
@@ -376,8 +376,8 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
 oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
 {
     oslPipe  pAcceptedPipe = NULL;
-
-    HANDLE       Event;
+    
+    HANDLE		 Event;
     OVERLAPPED   os;
 
     OSL_ASSERT(pPipe);
@@ -399,14 +399,14 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
         {
             switch ( GetLastError() )
             {
-            case ERROR_PIPE_CONNECTED:  // Client already connected to pipe
-            case ERROR_NO_DATA:         // Client was connected but has already closed pipe end
+            case ERROR_PIPE_CONNECTED:	// Client already connected to pipe
+            case ERROR_NO_DATA:			// Client was connected but has already closed pipe end
                                         // should only appear in nonblocking mode but in fact does
                                         // in blocking asynchronous mode.
                 break;
-            case ERROR_PIPE_LISTENING:  // Only for nonblocking mode but see ERROR_NO_DATA
-            case ERROR_IO_PENDING:      // This is normal if not client is connected yet
-            case ERROR_MORE_DATA:       // Should not happen
+            case ERROR_PIPE_LISTENING:	// Only for nonblocking mode but see ERROR_NO_DATA
+            case ERROR_IO_PENDING:		// This is normal if not client is connected yet
+            case ERROR_MORE_DATA:		// Should not happen
                 // blocking call to accept
                 if( !GetOverlappedResult( pPipe->m_File, &os, &nBytesTransfered, TRUE ) )
                 {
@@ -415,21 +415,21 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
 
                     switch ( GetLastError() )
                     {
-                    case ERROR_PIPE_CONNECTED:  // Pipe was already connected
-                    case ERROR_NO_DATA:         // Pipe was connected but client has already closed -> ver fast client ;-)
-                        break;                  // Everything's fine !!!
+                    case ERROR_PIPE_CONNECTED:	// Pipe was already connected
+                    case ERROR_NO_DATA:			// Pipe was connected but client has already closed -> ver fast client ;-)
+                        break;					// Everything's fine !!!
                     default:
                         // Something went wrong
                         return 0;
                     }
                 }
                 break;
-            default:                    // All other error say that somethings going wrong.
+            default:					// All other error say that somethings going wrong.
                 return 0;
             }
         }
 
-
+        
         pAcceptedPipe = __osl_createPipeImpl();
         OSL_ASSERT(pAcceptedPipe);
 
@@ -442,13 +442,13 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
         rtl_uString_release(temp);
 
         // prepare for next accept
-        pPipe->m_File =
-            CreateNamedPipeW(path->buffer,
+        pPipe->m_File = 
+            CreateNamedPipeW(path->buffer, 
                 PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
                 PIPE_WAIT | PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE,
                 PIPE_UNLIMITED_INSTANCES,
                 4096, 4096,
-                NMPWAIT_WAIT_FOREVER,
+                NMPWAIT_WAIT_FOREVER, 
                 pAcceptedPipe->m_Security);
         rtl_uString_release( path );
     }
@@ -486,7 +486,7 @@ sal_Int32 SAL_CALL osl_receivePipe(oslPipe pPipe,
         os.hEvent = pPipe->m_ReadEvent;
 
         ResetEvent(pPipe->m_ReadEvent);
-
+            
         if (! ReadFile(pPipe->m_File, pBuffer, BytesToRead, &nBytes, &os) &&
             ((GetLastError() != ERROR_IO_PENDING) ||
              ! GetOverlappedResult(pPipe->m_File, &os, &nBytes, TRUE)))
@@ -495,17 +495,17 @@ sal_Int32 SAL_CALL osl_receivePipe(oslPipe pPipe,
 
             if (lastError == ERROR_MORE_DATA)
                 nBytes = BytesToRead;
-              else
+              else 
               {
                   if (lastError == ERROR_PIPE_NOT_CONNECTED)
                     nBytes = 0;
-                else
+                else			
                     nBytes = (DWORD) -1;
 
                  pPipe->m_Error = osl_Pipe_E_ConnectionAbort;
             }
         }
-    }
+    }			
     else
     {
         BOOL fSuccess = ReadSimplePipe( pPipe->m_File, pBuffer, BytesToRead, &nBytes, TRUE );
@@ -518,7 +518,7 @@ sal_Int32 SAL_CALL osl_receivePipe(oslPipe pPipe,
 
     }
 
-    return (nBytes);
+    return (nBytes);    
 }
 
 /*****************************************************************************/
@@ -544,12 +544,12 @@ sal_Int32 SAL_CALL osl_sendPipe(oslPipe pPipe,
         {
               if (GetLastError() == ERROR_PIPE_NOT_CONNECTED)
                 nBytes = 0;
-            else
+            else			
                 nBytes = (DWORD) -1;
 
              pPipe->m_Error = osl_Pipe_E_ConnectionAbort;
         }
-    }
+    }			
     else
     {
         BOOL fSuccess = WriteSimplePipe( pPipe->m_File, pBuffer, BytesToSend, &nBytes, TRUE );
@@ -560,7 +560,7 @@ sal_Int32 SAL_CALL osl_sendPipe(oslPipe pPipe,
              pPipe->m_Error = osl_Pipe_E_ConnectionAbort;
         }
     }
-
+            
     return (nBytes);
 }
 
@@ -571,7 +571,7 @@ sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32
     sal_Int32 BytesToSend= n;
 
     OSL_ASSERT(pPipe);
-    while (BytesToSend > 0)
+    while (BytesToSend > 0) 
     {
         sal_Int32 RetVal;
 
@@ -588,7 +588,7 @@ sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32
         pBuffer= (sal_Char*)pBuffer + RetVal;
     }
 
-    return BytesSend;
+    return BytesSend;   
 }
 
 sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n )
@@ -598,7 +598,7 @@ sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n )
     sal_Int32 BytesToRead= n;
 
     OSL_ASSERT( pPipe );
-    while (BytesToRead > 0)
+    while (BytesToRead > 0) 
     {
         sal_Int32 RetVal;
         RetVal= osl_receivePipe(pPipe, pBuffer, BytesToRead);
diff --git a/sal/osl/w32/pipeimpl.cxx b/sal/osl/w32/pipeimpl.cxx
index ad661fb5744d..a7ee4bb081a8 100644
--- a/sal/osl/w32/pipeimpl.cxx
+++ b/sal/osl/w32/pipeimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,17 +29,17 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-#   include "pipeimpl.h"
+#	include "pipeimpl.h"
 
 #ifndef _INC_MALLOC
-#   include <malloc.h>
+#	include <malloc.h>
 #endif
 
 #ifndef _INC_TCHAR
-#   ifdef UNICODE
-#       define _UNICODE
-#   endif
-#   include <tchar.h>
+#	ifdef UNICODE
+#		define _UNICODE
+#	endif
+#	include <tchar.h>
 #endif
 
 const TCHAR PIPE_NAME_PREFIX_MAPPING[] = TEXT("PIPE_FILE_MAPPING_");
@@ -50,35 +50,35 @@ const DWORD PIPE_BUFFER_SIZE = 4096;
 
 
 //============================================================================
-//  PipeData
+//	PipeData
 //============================================================================
 
 struct PipeData
 {
-    DWORD   dwProcessId;
-    HANDLE  hReadPipe;
-    HANDLE  hWritePipe;
+    DWORD	dwProcessId;
+    HANDLE	hReadPipe;
+    HANDLE	hWritePipe;
 };
 
 //============================================================================
-//  Pipe
+//	Pipe
 //============================================================================
 
 #ifdef UNICODE
-#define Pipe        PipeW
-#define ClientPipe  ClientPipeW
-#define ServerPipe  ServerPipeW
+#define Pipe		PipeW
+#define ClientPipe	ClientPipeW
+#define ServerPipe	ServerPipeW
 #else
-#define Pipe        PipeA
-#define ClientPipe  ClientPipeA
-#define ServerPipe  ServerPipeA
+#define Pipe		PipeA
+#define ClientPipe	ClientPipeA
+#define ServerPipe	ServerPipeA
 #endif
 
 class Pipe
 {
 protected:
-    HANDLE  m_hReadPipe;    // Handle to use for reading
-    HANDLE  m_hWritePipe;   // Handle to use for writing
+    HANDLE	m_hReadPipe;	// Handle to use for reading
+    HANDLE	m_hWritePipe;	// Handle to use for writing
 
     Pipe( HANDLE hReadPipe, HANDLE hWritePipe );
 
@@ -120,7 +120,7 @@ public:
 };
 
 //============================================================================
-//  ClientPipe
+//	ClientPipe
 //============================================================================
 
 class ClientPipe : public Pipe
@@ -132,15 +132,15 @@ public:
 };
 
 //============================================================================
-//  ServerPipe
+//	ServerPipe
 //============================================================================
 
 class ServerPipe : public Pipe
 {
 protected:
-    HANDLE  m_hMapping;
-    HANDLE  m_hSynchronize;
-    LPTSTR  m_lpName;
+    HANDLE	m_hMapping;
+    HANDLE	m_hSynchronize;
+    LPTSTR	m_lpName;
 
     ServerPipe( LPCTSTR lpName, HANDLE hMapping, HANDLE hSynchronize, HANDLE hReadPipe, HANDLE hWritePipe );
 public:
@@ -152,24 +152,24 @@ public:
 };
 
 //----------------------------------------------------------------------------
-//
+//	
 //----------------------------------------------------------------------------
 
-HANDLE  Pipe::CreatePipeDataMapping( LPCTSTR lpName )
+HANDLE	Pipe::CreatePipeDataMapping( LPCTSTR lpName )
 {
-    HANDLE  hMapping = NULL;
-    LPTSTR  lpMappingName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_MAPPING) );
+    HANDLE	hMapping = NULL;
+    LPTSTR	lpMappingName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_MAPPING) );
 
     if ( lpMappingName )
     {
         _tcscpy( lpMappingName, PIPE_NAME_PREFIX_MAPPING );
         _tcscat( lpMappingName, lpName );
 
-        LPTSTR  lpMappingFileName = (LPTSTR)alloca( MAX_PATH * sizeof(TCHAR) );
+        LPTSTR	lpMappingFileName = (LPTSTR)alloca( MAX_PATH * sizeof(TCHAR) );
 
         if ( lpMappingFileName )
         {
-            DWORD   nChars = GetTempPath( MAX_PATH, lpMappingFileName );
+            DWORD	nChars = GetTempPath( MAX_PATH, lpMappingFileName );
 
             if ( MAX_PATH + _tcslen(lpName) < nChars + 1 )
             {
@@ -187,13 +187,13 @@ HANDLE  Pipe::CreatePipeDataMapping( LPCTSTR lpName )
             {
                 _tcscat( lpMappingFileName, lpMappingName );
 
-                HANDLE hFile = CreateFile(
-                    lpMappingFileName,
-                    GENERIC_READ | GENERIC_WRITE,
-                    FILE_SHARE_READ | FILE_SHARE_WRITE,
-                    NULL,
-                    OPEN_ALWAYS,
-                    FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_DELETE_ON_CLOSE,
+                HANDLE hFile = CreateFile( 
+                    lpMappingFileName, 
+                    GENERIC_READ | GENERIC_WRITE, 
+                    FILE_SHARE_READ | FILE_SHARE_WRITE, 
+                    NULL, 
+                    OPEN_ALWAYS, 
+                    FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_DELETE_ON_CLOSE, 
                     NULL );
 
                 if ( IsValidHandle(hFile) )
@@ -218,13 +218,13 @@ HANDLE  Pipe::CreatePipeDataMapping( LPCTSTR lpName )
 }
 
 //----------------------------------------------------------------------------
-//
+//	
 //----------------------------------------------------------------------------
 
-HANDLE  Pipe::OpenPipeDataMapping( LPCTSTR lpName )
+HANDLE	Pipe::OpenPipeDataMapping( LPCTSTR lpName )
 {
-    HANDLE  hMapping = NULL;
-    LPTSTR  lpMappingName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_MAPPING) );
+    HANDLE	hMapping = NULL;
+    LPTSTR	lpMappingName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_MAPPING) );
 
     if ( lpMappingName )
     {
@@ -238,13 +238,13 @@ HANDLE  Pipe::OpenPipeDataMapping( LPCTSTR lpName )
 }
 
 //----------------------------------------------------------------------------
-//
+//	
 //----------------------------------------------------------------------------
 
-HANDLE  Pipe::CreatePipeDataMutex( LPCTSTR lpName, BOOL bInitialOwner )
+HANDLE	Pipe::CreatePipeDataMutex( LPCTSTR lpName, BOOL bInitialOwner )
 {
-    HANDLE  hMutex = NULL;
-    LPTSTR  lpMutexName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_SYNCHRONIZE) );
+    HANDLE	hMutex = NULL;
+    LPTSTR	lpMutexName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_SYNCHRONIZE) );
 
     if ( lpMutexName )
     {
@@ -258,13 +258,13 @@ HANDLE  Pipe::CreatePipeDataMutex( LPCTSTR lpName, BOOL bInitialOwner )
 }
 
 //----------------------------------------------------------------------------
-//
+//	
 //----------------------------------------------------------------------------
 
 HANDLE Pipe::CreatePipeConnectionSemaphore( LPCTSTR lpName, LONG lInitialCount, LONG lMaximumCount )
 {
-    HANDLE  hSemaphore = NULL;
-    LPTSTR  lpSemaphoreName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_CONNECTION) );
+    HANDLE	hSemaphore = NULL;
+    LPTSTR	lpSemaphoreName = (LPTSTR)alloca( _tcslen(lpName) * sizeof(TCHAR) + sizeof(PIPE_NAME_PREFIX_CONNECTION) );
 
     if ( lpSemaphoreName )
     {
@@ -279,14 +279,14 @@ HANDLE Pipe::CreatePipeConnectionSemaphore( LPCTSTR lpName, LONG lInitialCount,
 
 
 //----------------------------------------------------------------------------
-//  Pipe copy ctor
+//	Pipe copy ctor
 //----------------------------------------------------------------------------
 
 Pipe::Pipe( const Pipe& rPipe ) :
 m_hReadPipe( INVALID_HANDLE_VALUE ),
 m_hWritePipe( INVALID_HANDLE_VALUE )
 {
-    DuplicateHandle(
+    DuplicateHandle( 
         GetCurrentProcess(),
         rPipe.m_hReadPipe,
         GetCurrentProcess(),
@@ -295,7 +295,7 @@ m_hWritePipe( INVALID_HANDLE_VALUE )
         FALSE,
         DUPLICATE_SAME_ACCESS );
 
-    DuplicateHandle(
+    DuplicateHandle( 
         GetCurrentProcess(),
         rPipe.m_hWritePipe,
         GetCurrentProcess(),
@@ -306,14 +306,14 @@ m_hWritePipe( INVALID_HANDLE_VALUE )
 }
 
 //----------------------------------------------------------------------------
-//  Pipe assignment operator
+//	Pipe assignment operator
 //----------------------------------------------------------------------------
 
 const Pipe& Pipe::operator = ( const Pipe& rPipe )
 {
     Close();
 
-    DuplicateHandle(
+    DuplicateHandle( 
         GetCurrentProcess(),
         rPipe.m_hReadPipe,
         GetCurrentProcess(),
@@ -322,7 +322,7 @@ const Pipe& Pipe::operator = ( const Pipe& rPipe )
         FALSE,
         DUPLICATE_SAME_ACCESS );
 
-    DuplicateHandle(
+    DuplicateHandle( 
         GetCurrentProcess(),
         rPipe.m_hWritePipe,
         GetCurrentProcess(),
@@ -330,19 +330,19 @@ const Pipe& Pipe::operator = ( const Pipe& rPipe )
         0,
         FALSE,
         DUPLICATE_SAME_ACCESS );
-
+    
     return *this;
 }
 
 //----------------------------------------------------------------------------
-//  Pipe ctor
+//	Pipe ctor
 //----------------------------------------------------------------------------
 
 Pipe::Pipe( HANDLE hReadPipe, HANDLE hWritePipe ) :
 m_hReadPipe( INVALID_HANDLE_VALUE ),
 m_hWritePipe( INVALID_HANDLE_VALUE )
 {
-    DuplicateHandle(
+    DuplicateHandle( 
         GetCurrentProcess(),
         hReadPipe,
         GetCurrentProcess(),
@@ -351,7 +351,7 @@ m_hWritePipe( INVALID_HANDLE_VALUE )
         FALSE,
         DUPLICATE_SAME_ACCESS );
 
-    DuplicateHandle(
+    DuplicateHandle( 
         GetCurrentProcess(),
         hWritePipe,
         GetCurrentProcess(),
@@ -362,7 +362,7 @@ m_hWritePipe( INVALID_HANDLE_VALUE )
 }
 
 //----------------------------------------------------------------------------
-//  Pipe dtor
+//	Pipe dtor
 //----------------------------------------------------------------------------
 
 Pipe::~Pipe()
@@ -371,12 +371,12 @@ Pipe::~Pipe()
 }
 
 //----------------------------------------------------------------------------
-//  Pipe Close
+//	Pipe Close
 //----------------------------------------------------------------------------
 
 bool Pipe::Close()
 {
-    bool    fSuccess = false;   // Assume failure
+    bool	fSuccess = false;	// Assume failure
 
     if ( IsValidHandle(m_hReadPipe) )
     {
@@ -394,13 +394,13 @@ bool Pipe::Close()
 }
 
 //----------------------------------------------------------------------------
-//  Pipe Write
+//	Pipe Write
 //----------------------------------------------------------------------------
 
 bool Pipe::Write( LPCVOID lpBuffer, DWORD dwBytesToWrite, LPDWORD lpBytesWritten, bool bWait )
 {
-    DWORD   dwBytesAvailable = 0;
-    BOOL    fSuccess = TRUE;
+    DWORD	dwBytesAvailable = 0;
+    BOOL	fSuccess = TRUE;
 
     if ( !bWait )
         fSuccess = PeekNamedPipe( m_hReadPipe, NULL, 0, NULL, &dwBytesAvailable, NULL );
@@ -417,13 +417,13 @@ bool Pipe::Write( LPCVOID lpBuffer, DWORD dwBytesToWrite, LPDWORD lpBytesWritten
 }
 
 //----------------------------------------------------------------------------
-//  Pipe Read
+//	Pipe Read
 //----------------------------------------------------------------------------
 
 bool Pipe::Read( LPVOID lpBuffer, DWORD dwBytesToRead, LPDWORD lpBytesRead, bool bWait )
 {
-    DWORD   dwBytesAvailable = 0;
-    BOOL    fSuccess = TRUE;
+    DWORD	dwBytesAvailable = 0;
+    BOOL	fSuccess = TRUE;
 
     if ( !bWait )
         fSuccess = PeekNamedPipe( m_hReadPipe, NULL, 0, NULL, &dwBytesAvailable, NULL );
@@ -445,7 +445,7 @@ bool Pipe::Read( LPVOID lpBuffer, DWORD dwBytesToRead, LPDWORD lpBytesRead, bool
 
 
 //----------------------------------------------------------------------------
-//  Client pipe dtor
+//	Client pipe dtor
 //----------------------------------------------------------------------------
 
 ClientPipe::ClientPipe( HANDLE hReadPipe, HANDLE hWritePipe ) : Pipe( hReadPipe, hWritePipe )
@@ -453,29 +453,29 @@ ClientPipe::ClientPipe( HANDLE hReadPipe, HANDLE hWritePipe ) : Pipe( hReadPipe,
 }
 
 //----------------------------------------------------------------------------
-//  Client pipe creation
+//	Client pipe creation
 //----------------------------------------------------------------------------
 
 ClientPipe *ClientPipe::Create( LPCTSTR lpName )
 {
-    ClientPipe  *pPipe = NULL;  // Assume failure
+    ClientPipe	*pPipe = NULL;	// Assume failure
 
-    HANDLE  hMapping = OpenPipeDataMapping( lpName );
+    HANDLE	hMapping = OpenPipeDataMapping( lpName );
 
     if ( IsValidHandle(hMapping) )
     {
-        PipeData    *pData = (PipeData*)MapViewOfFile( hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0 );
+        PipeData	*pData = (PipeData*)MapViewOfFile( hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0 );
 
         if ( pData )
         {
-            HANDLE  hSourceProcess = OpenProcess( PROCESS_DUP_HANDLE, FALSE, pData->dwProcessId );
+            HANDLE	hSourceProcess = OpenProcess( PROCESS_DUP_HANDLE, FALSE, pData->dwProcessId );
 
             if ( IsValidHandle(hSourceProcess) )
             {
                 BOOL fSuccess;
-                HANDLE  hReadPipe = INVALID_HANDLE_VALUE, hWritePipe = INVALID_HANDLE_VALUE;
-
-                fSuccess = DuplicateHandle(
+                HANDLE	hReadPipe = INVALID_HANDLE_VALUE, hWritePipe = INVALID_HANDLE_VALUE;
+                
+                fSuccess = DuplicateHandle( 
                     hSourceProcess,
                     pData->hReadPipe,
                     GetCurrentProcess(),
@@ -484,7 +484,7 @@ ClientPipe *ClientPipe::Create( LPCTSTR lpName )
                     FALSE,
                     DUPLICATE_SAME_ACCESS );
 
-                fSuccess = fSuccess && DuplicateHandle(
+                fSuccess = fSuccess && DuplicateHandle( 
                     hSourceProcess,
                     pData->hWritePipe,
                     GetCurrentProcess(),
@@ -502,12 +502,12 @@ ClientPipe *ClientPipe::Create( LPCTSTR lpName )
                 if ( IsValidHandle(hReadPipe) )
                     CloseHandle( hReadPipe );
 
-                HANDLE  hConnectionRequest = CreatePipeConnectionSemaphore( lpName, 0, 1 );
+                HANDLE	hConnectionRequest = CreatePipeConnectionSemaphore( lpName, 0, 1 );
 
                 ReleaseSemaphore( hConnectionRequest, 1, NULL );
 
                 CloseHandle( hConnectionRequest );
-
+                
                 CloseHandle( hSourceProcess );
             }
 
@@ -523,15 +523,15 @@ ClientPipe *ClientPipe::Create( LPCTSTR lpName )
 
 
 //----------------------------------------------------------------------------
-//  ServerPipe ctor
+//	ServerPipe ctor
 //----------------------------------------------------------------------------
 
-ServerPipe::ServerPipe( LPCTSTR lpName, HANDLE hMapping, HANDLE hSynchronize, HANDLE hReadPipe, HANDLE hWritePipe ) : Pipe( hReadPipe, hWritePipe ),
+ServerPipe::ServerPipe( LPCTSTR	lpName, HANDLE hMapping, HANDLE hSynchronize, HANDLE hReadPipe, HANDLE hWritePipe ) : Pipe( hReadPipe, hWritePipe ),
 m_hMapping( NULL ),
 m_hSynchronize( NULL ),
 m_lpName( NULL )
 {
-    DuplicateHandle(
+    DuplicateHandle( 
         GetCurrentProcess(),
         hMapping,
         GetCurrentProcess(),
@@ -555,7 +555,7 @@ m_lpName( NULL )
 }
 
 //----------------------------------------------------------------------------
-//  ServerPipe dtor
+//	ServerPipe dtor
 //----------------------------------------------------------------------------
 
 ServerPipe::~ServerPipe()
@@ -567,14 +567,14 @@ ServerPipe::~ServerPipe()
 }
 
 //----------------------------------------------------------------------------
-//  ServerPipe AcceptConnection
+//	ServerPipe AcceptConnection
 //----------------------------------------------------------------------------
 
 Pipe *ServerPipe::AcceptConnection()
 {
-    Pipe    *pPipe = NULL;  // Assume failure;
+    Pipe	*pPipe = NULL;	// Assume failure;
 
-    HANDLE  hConnectionRequest = CreatePipeConnectionSemaphore( m_lpName, 0, 1 );
+    HANDLE	hConnectionRequest = CreatePipeConnectionSemaphore( m_lpName, 0, 1 );
 
     if ( WAIT_OBJECT_0 == WaitForSingleObject( hConnectionRequest, INFINITE ) )
     {
@@ -583,25 +583,25 @@ Pipe *ServerPipe::AcceptConnection()
 
         // Create new inbound Pipe
 
-        HANDLE  hClientWritePipe = NULL, hServerReadPipe = NULL;
+        HANDLE	hClientWritePipe = NULL, hServerReadPipe = NULL;
 
-        BOOL    fSuccess = CreatePipe( &hServerReadPipe, &hClientWritePipe, NULL, PIPE_BUFFER_SIZE );
+        BOOL	fSuccess = CreatePipe( &hServerReadPipe, &hClientWritePipe, NULL, PIPE_BUFFER_SIZE );
 
 
         if ( fSuccess )
         {
             // Create outbound pipe
 
-            HANDLE  hClientReadPipe = NULL, hServerWritePipe = NULL;
+            HANDLE	hClientReadPipe = NULL, hServerWritePipe = NULL;
 
             if ( CreatePipe( &hClientReadPipe, &hServerWritePipe, NULL, PIPE_BUFFER_SIZE ) )
             {
                 m_hReadPipe = hServerReadPipe;
                 m_hWritePipe = hServerWritePipe;
 
-                PipeData    *pData = (PipeData *)MapViewOfFile( m_hMapping, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(PipeData) );
+                PipeData	*pData = (PipeData *)MapViewOfFile( m_hMapping, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(PipeData) );
 
-                HANDLE  hSynchronize = CreatePipeDataMutex( m_lpName, TRUE );
+                HANDLE	hSynchronize = CreatePipeDataMutex( m_lpName, TRUE );
 
                 CloseHandle( pData->hReadPipe );
                 CloseHandle( pData->hWritePipe );
@@ -617,7 +617,7 @@ Pipe *ServerPipe::AcceptConnection()
             else
             {
                 CloseHandle( hClientWritePipe );
-                CloseHandle( hServerWritePipe );
+                CloseHandle( hServerWritePipe );	
             }
         }
 
@@ -630,24 +630,24 @@ Pipe *ServerPipe::AcceptConnection()
 }
 
 //----------------------------------------------------------------------------
-//  Pipe creation
+//	Pipe creation
 //----------------------------------------------------------------------------
 
 ServerPipe *ServerPipe::Create( LPCTSTR lpName )
 {
-    ServerPipe  *pPipe = NULL;
+    ServerPipe	*pPipe = NULL;
 
-    HANDLE  hMapping = CreatePipeDataMapping( lpName );
+    HANDLE	hMapping = CreatePipeDataMapping( lpName );
 
     if ( IsValidHandle(hMapping) )
     {
         if ( ERROR_FILE_EXISTS != GetLastError() )
         {
-            HANDLE  hSynchronize = CreatePipeDataMutex( lpName, FALSE);
-
+            HANDLE	hSynchronize = CreatePipeDataMutex( lpName, FALSE);
+            
             WaitForSingleObject( hSynchronize, INFINITE );
 
-            PipeData    *pData = (PipeData*)MapViewOfFile( hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0 );
+            PipeData	*pData = (PipeData*)MapViewOfFile( hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0 );
 
             if ( pData )
             {
@@ -660,15 +660,15 @@ ServerPipe *ServerPipe::Create( LPCTSTR lpName )
 
                 // Create inbound pipe
 
-                HANDLE  hServerReadPipe = NULL, hClientWritePipe = NULL;
+                HANDLE	hServerReadPipe = NULL, hClientWritePipe = NULL;
 
-                BOOL    fSuccess = CreatePipe( &hServerReadPipe, &hClientWritePipe, NULL, PIPE_BUFFER_SIZE );
+                BOOL	fSuccess = CreatePipe( &hServerReadPipe, &hClientWritePipe, NULL, PIPE_BUFFER_SIZE );
 
                 if ( fSuccess )
                 {
                     // Create outbound pipe
 
-                    HANDLE  hServerWritePipe = NULL, hClientReadPipe = NULL;
+                    HANDLE	hServerWritePipe = NULL, hClientReadPipe = NULL;
 
                     fSuccess = CreatePipe( &hClientReadPipe, &hServerWritePipe, NULL, PIPE_BUFFER_SIZE );
 
@@ -704,14 +704,14 @@ ServerPipe *ServerPipe::Create( LPCTSTR lpName )
 
 
 //----------------------------------------------------------------------------
-//  C style API
+//	C style API
 //----------------------------------------------------------------------------
 
-const TCHAR LOCAL_PIPE_PREFIX[] = TEXT("\\\\.\\PIPE\\" );
+const TCHAR	LOCAL_PIPE_PREFIX[] = TEXT("\\\\.\\PIPE\\" );
 
 extern "C" HANDLE WINAPI CreateSimplePipe( LPCTSTR lpName )
 {
-    int nPrefixLen = _tcslen( LOCAL_PIPE_PREFIX );
+    int	nPrefixLen = _tcslen( LOCAL_PIPE_PREFIX );
     if ( 0 == _tcsnicmp( lpName, LOCAL_PIPE_PREFIX, nPrefixLen ) )
         lpName += nPrefixLen;
     return (HANDLE)ServerPipe::Create( lpName );
@@ -719,7 +719,7 @@ extern "C" HANDLE WINAPI CreateSimplePipe( LPCTSTR lpName )
 
 extern "C" HANDLE WINAPI OpenSimplePipe( LPCTSTR lpName )
 {
-    int nPrefixLen = _tcslen( LOCAL_PIPE_PREFIX );
+    int	nPrefixLen = _tcslen( LOCAL_PIPE_PREFIX );
     if ( 0 == _tcsnicmp( lpName, LOCAL_PIPE_PREFIX, nPrefixLen ) )
         lpName += nPrefixLen;
     return (HANDLE)ClientPipe::Create( lpName );
@@ -727,7 +727,7 @@ extern "C" HANDLE WINAPI OpenSimplePipe( LPCTSTR lpName )
 
 extern "C" HANDLE WINAPI AcceptSimplePipeConnection( HANDLE hPipe )
 {
-    Pipe    *pPipe = (Pipe *)hPipe;
+    Pipe	*pPipe = (Pipe *)hPipe;
 
     if ( pPipe->is() )
         return (HANDLE)pPipe->AcceptConnection();
@@ -745,7 +745,7 @@ extern "C" BOOL WINAPI WaitForSimplePipe( LPCTSTR /*lpName*/, DWORD /*dwTimeOut*
 
 extern "C" BOOL WINAPI WriteSimplePipe( HANDLE hPipe, LPCVOID lpBuffer, DWORD dwBytesToWrite, LPDWORD lpBytesWritten, BOOL bWait )
 {
-    Pipe    *pPipe = (Pipe *)hPipe;
+    Pipe	*pPipe = (Pipe *)hPipe;
 
     if ( pPipe->is() )
         return pPipe->Write( lpBuffer, dwBytesToWrite, lpBytesWritten, bWait );
@@ -758,7 +758,7 @@ extern "C" BOOL WINAPI WriteSimplePipe( HANDLE hPipe, LPCVOID lpBuffer, DWORD dw
 
 extern "C" BOOL WINAPI ReadSimplePipe( HANDLE hPipe, LPVOID lpBuffer, DWORD dwBytesToRead, LPDWORD lpBytesRead, BOOL bWait )
 {
-    Pipe    *pPipe = (Pipe *)hPipe;
+    Pipe	*pPipe = (Pipe *)hPipe;
 
     if ( pPipe->is() )
         return pPipe->Read( lpBuffer, dwBytesToRead, lpBytesRead, bWait );
@@ -771,7 +771,7 @@ extern "C" BOOL WINAPI ReadSimplePipe( HANDLE hPipe, LPVOID lpBuffer, DWORD dwBy
 
 extern "C" BOOL WINAPI CloseSimplePipe( HANDLE hPipe )
 {
-    Pipe    *pPipe = (Pipe *)hPipe;
+    Pipe	*pPipe = (Pipe *)hPipe;
 
     if ( pPipe->is() )
     {
diff --git a/sal/osl/w32/pipeimpl.h b/sal/osl/w32/pipeimpl.h
index be6665bd4b5a..2f705a901193 100644
--- a/sal/osl/w32/pipeimpl.h
+++ b/sal/osl/w32/pipeimpl.h
@@ -6,30 +6,30 @@
 # ifdef _MSC_VER
 #   pragma warning(push,1) /* disable warnings within system headers */
 # endif
-#   include <windows.h>
+#	include <windows.h>
 # ifdef _MSC_VER
 #   pragma warning(pop)
 # endif
 #endif
 
 #ifndef _INC_MALLOC
-#   include <malloc.h>
+#	include <malloc.h>
 #endif
 
 #ifndef _INC_TCHAR
-#   ifdef UNICODE
-#       define _UNICODE
-#   endif
-#   include <tchar.h>
+#	ifdef UNICODE
+#		define _UNICODE
+#	endif
+#	include <tchar.h>
 #endif
 
 #define EXPORT_PIPE_API
 
 //============================================================================
-//  Helper functions
+//	Helper functions
 //============================================================================
 
-// Because the value of an invalid HANDLE returned by API functions differs
+// Because the value of an invalid HANDLE returned by API functions differs 
 // between different functions and differs on different Windows platforms,
 // this function checks wether the handle has a meaningfull value.
 #ifndef __cplusplus
@@ -45,25 +45,25 @@ inline bool IsValidHandle( HANDLE handle )
 
 extern "C" {
 
-#endif  // __cplusplus
+#endif	// __cplusplus
 
 
 EXPORT_PIPE_API HANDLE WINAPI CreateSimplePipeA( LPCSTR lpName );
 EXPORT_PIPE_API HANDLE WINAPI CreateSimplePipeW( LPCWSTR lpName );
 
 #ifdef UNICODE
-#define CreateSimplePipe    CreateSimplePipeW
+#define CreateSimplePipe	CreateSimplePipeW
 #else
-#define CreateSimplePipe    CreateSimplePipeA
+#define CreateSimplePipe	CreateSimplePipeA
 #endif
 
 EXPORT_PIPE_API HANDLE WINAPI OpenSimplePipeA( LPCSTR lpName );
 EXPORT_PIPE_API HANDLE WINAPI OpenSimplePipeW( LPCWSTR lpName );
 
 #ifdef UNICODE
-#define OpenSimplePipe  OpenSimplePipeW
+#define OpenSimplePipe	OpenSimplePipeW
 #else
-#define OpenSimplePipe  OpenSimplePipeA
+#define OpenSimplePipe	OpenSimplePipeA
 #endif
 
 EXPORT_PIPE_API HANDLE WINAPI AcceptSimplePipeConnection( HANDLE hPipe );
@@ -72,9 +72,9 @@ EXPORT_PIPE_API BOOL WINAPI WaitForSimplePipeA( LPCSTR lpName, DWORD dwTimeOut )
 EXPORT_PIPE_API BOOL WINAPI WaitForSimplePipeW( LPCWSTR lpName, DWORD dwTimeOut );
 
 #ifdef UNICODE
-#define WaitForSimplePipe   WaitForSimplePipeW
+#define WaitForSimplePipe	WaitForSimplePipeW
 #else
-#define WaitForSimplePipe   WaitForSimplePipeA
+#define WaitForSimplePipe	WaitForSimplePipeA
 #endif
 
 
@@ -83,9 +83,9 @@ EXPORT_PIPE_API BOOL WINAPI ReadSimplePipe( HANDLE hPipe, LPVOID lpBuffer, DWORD
 EXPORT_PIPE_API BOOL WINAPI CloseSimplePipe( HANDLE hPipe );
 
 #ifdef __cplusplus
-}   // extern "C"
+}	// extern "C"
 #endif
 
-#endif  // _PIPEIMPL_H_
+#endif	// _PIPEIMPL_H_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 6506b62dbd61..796f4c454085 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -68,11 +68,11 @@ oslProcessError SAL_CALL osl_terminateProcess(oslProcess Process)
 /***************************************************************************/
 
 oslProcess SAL_CALL osl_getProcess(oslProcessIdentifier Ident)
-{
+{	
     oslProcessImpl* pProcImpl;
     HANDLE hProcess = OpenProcess(
         STANDARD_RIGHTS_REQUIRED | PROCESS_QUERY_INFORMATION | SYNCHRONIZE, FALSE, (DWORD)Ident);
-
+        
     if (hProcess)
     {
         pProcImpl = reinterpret_cast< oslProcessImpl*>( rtl_allocateMemory(sizeof(oslProcessImpl)) );
@@ -193,7 +193,7 @@ oslProcessError SAL_CALL osl_joinProcessWithTimeout(oslProcess Process, const Ti
     DWORD           timeout   = INFINITE;
     oslProcessError osl_error = osl_Process_E_None;
     DWORD           ret;
-
+    
     if (NULL == Process)
         return osl_Process_E_Unknown;
 
@@ -397,20 +397,20 @@ void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
    #109941# because of a bug in the M$ unicows library we have to
    allocate a buffer large enough to hold the requested environment
    variable instead of testing for the required size. This wastes
-   some stack space, maybe we should revoke this work around if
+   some stack space, maybe we should revoke this work around if 
    unicows library is fixed.
 */
 #define ENV_BUFFER_SIZE (32*1024-1)
 
 oslProcessError SAL_CALL osl_getEnvironment(rtl_uString *ustrVar, rtl_uString **ustrValue)
-{
-    WCHAR buff[ENV_BUFFER_SIZE];
-
+{        
+    WCHAR buff[ENV_BUFFER_SIZE];         
+                            
     if (GetEnvironmentVariableW(reinterpret_cast<LPCWSTR>(ustrVar->buffer), buff, ENV_BUFFER_SIZE) > 0)
-    {
-        rtl_uString_newFromStr(ustrValue, reinterpret_cast<const sal_Unicode*>(buff));
+    {        
+        rtl_uString_newFromStr(ustrValue, reinterpret_cast<const sal_Unicode*>(buff));        
         return osl_Process_E_None;
-    }
+    }        
     return osl_Process_E_Unknown;
 }
 
@@ -437,12 +437,12 @@ oslProcessError SAL_CALL osl_clearEnvironment(rtl_uString *ustrVar)
  * Current Working Directory.
  ***************************************************************************/
 
-extern "C" oslMutex g_CurrentDirectoryMutex;
+extern "C" oslMutex	g_CurrentDirectoryMutex;
 
 oslProcessError SAL_CALL osl_getProcessWorkingDir( rtl_uString **pustrWorkingDir )
 {
     ::osl::LongPathBuffer< sal_Unicode > aBuffer( MAX_LONG_PATH );
-    DWORD   dwLen = 0;
+    DWORD	dwLen = 0;
 
 
     osl_acquireMutex( g_CurrentDirectoryMutex );
@@ -451,8 +451,8 @@ oslProcessError SAL_CALL osl_getProcessWorkingDir( rtl_uString **pustrWorkingDir
 
     if ( dwLen && dwLen < aBuffer.getBufSizeInSymbols() )
     {
-        oslFileError    eError;
-        rtl_uString     *ustrTemp = NULL;;
+        oslFileError	eError;
+        rtl_uString		*ustrTemp = NULL;;
 
         rtl_uString_newFromStr_WithLength( &ustrTemp, aBuffer, dwLen );
         eError = osl_getFileURLFromSystemPath( ustrTemp, pustrWorkingDir );
@@ -541,28 +541,28 @@ sal_Bool SAL_CALL osl_sendResourcePipe(oslPipe hPipe, oslSocket pSocket)
     sal_Bool bRet = sal_False;
     sal_Int32 bytes = 0;
 
-    /*  duplicate handle on this other side ->
-        receive remote process
+    /* 	duplicate handle on this other side -> 
+        receive remote process 
         duplicate handle and send it */
     DWORD remoteProcessID = 0;
     HANDLE fd = (HANDLE)pSocket->m_Socket;
     oslDescriptorType code = osl_Process_TypeSocket;
-
+    
     OSL_TRACE("osl_sendResourcePipe: enter...");
-
+    
     if (ReadPipe(hPipe, &remoteProcessID, sizeof(remoteProcessID), &bytes))
     {
-        HANDLE hRemoteProc = OpenProcess(PROCESS_DUP_HANDLE,
-                                         FALSE,
+        HANDLE hRemoteProc = OpenProcess(PROCESS_DUP_HANDLE, 
+                                         FALSE, 
                                          remoteProcessID);
-
+        
         if (hRemoteProc != (HANDLE)NULL)
         {
             HANDLE newFd;
-
+            
             if (DuplicateHandle(GetCurrentProcess(),
-                                fd,
-                                hRemoteProc,
+                                fd, 
+                                hRemoteProc, 
                                 &newFd,
                                 0, FALSE, DUPLICATE_SAME_ACCESS))
             {
@@ -572,11 +572,11 @@ sal_Bool SAL_CALL osl_sendResourcePipe(oslPipe hPipe, oslSocket pSocket)
                     )
                     bRet = sal_True;
             }
-
+            
             CloseHandle(hRemoteProc);
         }
     }
-
+    
     if (bRet)
     {
         sal_Int32 commitCode;
@@ -588,12 +588,12 @@ sal_Bool SAL_CALL osl_sendResourcePipe(oslPipe hPipe, oslSocket pSocket)
             )
             bRet = sal_False;
     }
-
+    
     OSL_TRACE("osl_sendResourcePipe: exit... %d\n", bRet);
     return(bRet);
 }
 
-
+    
 oslSocket SAL_CALL osl_receiveResourcePipe(oslPipe hPipe)
 {
     sal_Bool bRet = sal_False;
@@ -601,14 +601,14 @@ oslSocket SAL_CALL osl_receiveResourcePipe(oslPipe hPipe)
     sal_Int32 commitCode;
     oslSocket pSocket = NULL;
 
-    /* duplicate handle on the other side ->
+    /* duplicate handle on the other side -> 
        send my process id receive duplicated handle */
     HANDLE fd = INVALID_HANDLE_VALUE;
     DWORD myProcessID = GetCurrentProcessId();
     oslDescriptorType code = osl_Process_TypeNone;
 
     OSL_TRACE("osl_receiveResourcePipe: enter...\n");
-
+    
     if (
         WritePipe(hPipe, &myProcessID, sizeof(myProcessID), &bytes) &&
         ReadPipe(hPipe, &code, sizeof(code), &bytes) &&
@@ -626,16 +626,16 @@ oslSocket SAL_CALL osl_receiveResourcePipe(oslPipe hPipe)
             bRet = sal_False;
         }
         }
-
+    
     if (bRet)
         commitCode = 1;
     else
         commitCode = 0;
-
+    
     WritePipe(hPipe, &commitCode, sizeof(commitCode), &bytes);
 
     OSL_TRACE("osl_receiveResourcePipe: exit... %d, %p\n", bRet, pSocket);
-
+    
     return pSocket;
 }
 
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index 3a266fd65e6e..242a3edad028 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,7 +62,7 @@ extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle( HANDLE hFile
 //#################################################
 const sal_Unicode NAME_VALUE_SEPARATOR = TEXT('=');
 const sal_Char* SPACE = " ";
-const rtl::OUString ENV_COMSPEC = rtl::OUString::createFromAscii("COMSPEC");
+const rtl::OUString ENV_COMSPEC = rtl::OUString::createFromAscii("COMSPEC");    
 const rtl::OUString QUOTE = rtl::OUString::createFromAscii("\"");
 
 namespace /* private */
@@ -78,55 +78,55 @@ namespace /* private */
     /* Function object that compares two strings that are
        expected to be environment variables in the form
        "name=value". Only the 'name' part will be compared.
-       The comparison is in upper case and returns true
-       if the first of both strings is less than the
+       The comparison is in upper case and returns true 
+       if the first of both strings is less than the 
        second one. */
-    struct less_environment_variable :
+    struct less_environment_variable : 
         public std::binary_function<rtl::OUString, rtl::OUString, bool>
     {
-        bool operator() (const rtl::OUString& lhs, const rtl::OUString& rhs) const
+        bool operator() (const rtl::OUString& lhs, const rtl::OUString& rhs) const    
         {
             OSL_ENSURE((lhs.indexOf(NAME_VALUE_SEPARATOR) > -1) && \
                         (rhs.indexOf(NAME_VALUE_SEPARATOR) > -1), \
                         "Malformed environment variable");
-
+            
             // Windows compares environment variables uppercase
             // so we do it, too
             return (rtl_ustr_compare_WithLength(
-                lhs.toAsciiUpperCase().pData->buffer,
-                lhs.indexOf(NAME_VALUE_SEPARATOR),
-                rhs.toAsciiUpperCase().pData->buffer,
-                rhs.indexOf(NAME_VALUE_SEPARATOR)) < 0);
+                lhs.toAsciiUpperCase().pData->buffer, 
+                lhs.indexOf(NAME_VALUE_SEPARATOR), 
+                rhs.toAsciiUpperCase().pData->buffer, 
+                rhs.indexOf(NAME_VALUE_SEPARATOR)) < 0);            
         }
     };
 
     //#################################################
-    /* Function object used by for_each algorithm to
+    /* Function object used by for_each algorithm to 
        calculate the sum of the length of all strings
        in a string container. */
     class sum_of_string_lengths
     {
     public:
         //--------------------------------
-        sum_of_string_lengths() : sum_(0) {}
-
+        sum_of_string_lengths() : sum_(0) {}    
+        
         //--------------------------------
         void operator() (const rtl::OUString& string)
-        {
+        {   
             OSL_ASSERT(string.getLength());
-
+            
             // always include the terminating '\0'
             if (string.getLength())
-                sum_ += string.getLength() + 1;
+                sum_ += string.getLength() + 1; 
         }
-
+            
         //--------------------------------
         operator size_t () const
         {
             return sum_;
         }
     private:
-        size_t sum_;
+        size_t sum_;    
     };
 
     //#################################################
@@ -135,7 +135,7 @@ namespace /* private */
         return std::for_each(
             string_cont.begin(), string_cont.end(), sum_of_string_lengths());
     }
-
+            
     //#################################################
     void read_environment(/*out*/ string_container_t* environment)
     {
@@ -143,12 +143,12 @@ namespace /* private */
         // sorts environment variables upper case
         LPTSTR env = reinterpret_cast<LPTSTR>(GetEnvironmentStrings());
         LPTSTR p   = env;
-
+                        
         while (size_t l = _tcslen(p))
-        {
-            environment->push_back(reinterpret_cast<const sal_Unicode*>(p));
-            p += l + 1;
-        }
+        {      
+            environment->push_back(reinterpret_cast<const sal_Unicode*>(p));        
+            p += l + 1;    
+        }        
         FreeEnvironmentStrings(env);
     }
 
@@ -158,27 +158,27 @@ namespace /* private */
     added to the list, environment variables will
     be handled case-insensitive */
     bool create_merged_environment(
-        rtl_uString* env_vars[],
-        sal_uInt32 env_vars_count,
+        rtl_uString* env_vars[], 
+        sal_uInt32 env_vars_count, 
         /*in|out*/ string_container_t* merged_env)
     {
         OSL_ASSERT(env_vars && env_vars_count > 0 && merged_env);
-
+        
         read_environment(merged_env);
-
+        
         for (sal_uInt32 i = 0; i < env_vars_count; i++)
-        {
+        {   
             rtl::OUString env_var = rtl::OUString(env_vars[i]);
-
+            
             if (env_var.getLength() == 0)
                 return false;
-
+                
             iterator_pair_t iter_pair = std::equal_range(
-                merged_env->begin(),
-                merged_env->end(),
-                env_var,
+                merged_env->begin(), 
+                merged_env->end(), 
+                env_var, 
                 less_environment_variable());
-
+           
             if (env_var.indexOf(NAME_VALUE_SEPARATOR) == -1)
             {
                 merged_env->erase(iter_pair.first, iter_pair.second);
@@ -193,70 +193,70 @@ namespace /* private */
         }
         return true;
     }
-
+            
     //#################################################
     /* Create a merged environment */
     bool setup_process_environment(
-        rtl_uString* environment_vars[],
-        sal_uInt32 n_environment_vars,
+        rtl_uString* environment_vars[], 
+        sal_uInt32 n_environment_vars, 
         /*in|out*/ environment_container_t& environment)
     {
         string_container_t merged_env;
         if (!create_merged_environment(environment_vars, n_environment_vars, &merged_env))
             return false;
-
+                
         // allocate enough space for the '\0'-separated environment strings and
-        // a final '\0'
+        // a final '\0'        
         environment.resize(calc_sum_of_string_lengths(merged_env) + 1);
-
+                                           
         string_container_const_iterator_t iter = merged_env.begin();
         string_container_const_iterator_t iter_end = merged_env.end();
-
+                        
         sal_uInt32 pos = 0;
         for (/**/; iter != iter_end; ++iter)
         {
             rtl::OUString envv = *iter;
-
+            
             OSL_ASSERT(envv.getLength());
-
+            
             sal_uInt32 n = envv.getLength() + 1; // copy the final '\0', too
             rtl_copyMemory(
                 reinterpret_cast<void*>(&environment[pos]),
-                reinterpret_cast<const void*>(envv.getStr()),
+                reinterpret_cast<const void*>(envv.getStr()),                  
                 n * sizeof(sal_Unicode));
             pos += n;
         }
-        environment[pos] = 0; // append a final '\0'
-
+        environment[pos] = 0; // append a final '\0'             
+        
         return true;
     }
-
+    
     //##########################################################
-    /*  In contrast to the Win32 API function CreatePipe with
+    /*  In contrast to the Win32 API function CreatePipe with 
         this function the caller is able to determine separately
         which handle of the pipe is inheritable. */
     bool create_pipe(
-        PHANDLE p_read_pipe,
+        PHANDLE p_read_pipe, 
         bool    b_read_pipe_inheritable,
-        PHANDLE p_write_pipe,
+        PHANDLE p_write_pipe, 
         bool    b_write_pipe_inheritable,
-        LPVOID  p_security_descriptor = NULL,
+        LPVOID  p_security_descriptor = NULL, 
         DWORD   pipe_size = 0)
     {
-        SECURITY_ATTRIBUTES sa;
+        SECURITY_ATTRIBUTES	sa;	
         sa.nLength              = sizeof(SECURITY_ATTRIBUTES);
         sa.lpSecurityDescriptor = p_security_descriptor;
         sa.bInheritHandle       = b_read_pipe_inheritable || b_write_pipe_inheritable;
-
+        
         BOOL   bRet  = FALSE;
         HANDLE hTemp = NULL;
-
+        
         if (!b_read_pipe_inheritable && b_write_pipe_inheritable)
-        {
+        {	    
             bRet = CreatePipe(&hTemp, p_write_pipe, &sa, pipe_size);
-
-            if (bRet && !DuplicateHandle(GetCurrentProcess(), hTemp,
-                            GetCurrentProcess(), p_read_pipe, 0, FALSE,
+            
+            if (bRet && !DuplicateHandle(GetCurrentProcess(), hTemp, 
+                            GetCurrentProcess(), p_read_pipe, 0, FALSE, 
                             DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS))
             {
                 CloseHandle(hTemp);
@@ -267,9 +267,9 @@ namespace /* private */
         else if (b_read_pipe_inheritable && !b_write_pipe_inheritable)
         {
             bRet = CreatePipe(p_read_pipe, &hTemp, &sa, pipe_size);
-
-            if (bRet && !DuplicateHandle(GetCurrentProcess(), hTemp,
-                            GetCurrentProcess(), p_write_pipe, 0, FALSE,
+            
+            if (bRet && !DuplicateHandle(GetCurrentProcess(), hTemp, 
+                            GetCurrentProcess(), p_write_pipe, 0, FALSE, 
                             DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS))
             {
                 CloseHandle(hTemp);
@@ -279,8 +279,8 @@ namespace /* private */
         }
         else
         {
-            bRet = CreatePipe(p_read_pipe, p_write_pipe, &sa, pipe_size);
-        }
+            bRet = CreatePipe(p_read_pipe, p_write_pipe, &sa, pipe_size);	    
+        }	
         return bRet;
     }
 
@@ -289,84 +289,84 @@ namespace /* private */
     // if not already present
     rtl::OUString quote_string(const rtl::OUString& string)
     {
-        rtl::OUStringBuffer quoted;
+        rtl::OUStringBuffer quoted;        
         if (string.indexOf(QUOTE) != 0)
             quoted.append(QUOTE);
-
+            
         quoted.append(string);
-
-        if (string.lastIndexOf(QUOTE) != (string.getLength() - 1))
+        
+        if (string.lastIndexOf(QUOTE) != (string.getLength() - 1))       
             quoted.append(QUOTE);
-
+            
         return quoted.makeStringAndClear();
     }
-
-    //##########################################################
+    
+    //##########################################################  
     // Returns the system path of the executable which can either
-    // be provided via the strImageName parameter or as first
-    // element of the strArguments list.
+    // be provided via the strImageName parameter or as first 
+    // element of the strArguments list.      
     // The returned path will be quoted if it contains spaces.
     rtl::OUString get_executable_path(
-        rtl_uString* image_name,
-        rtl_uString* cmdline_args[],
+        rtl_uString* image_name, 
+        rtl_uString* cmdline_args[], 
         sal_uInt32 n_cmdline_args,
         bool search_path)
     {
         rtl::OUString exe_name;
-
+        
         if (image_name)
-            exe_name = image_name;
-        else if (n_cmdline_args)
+            exe_name = image_name; 
+        else if (n_cmdline_args)        
             exe_name = rtl::OUString(cmdline_args[0]);
-
+       
         rtl::OUString exe_url = exe_name;
         if (search_path)
             osl_searchFileURL(exe_name.pData, NULL, &exe_url.pData);
-
+                            
         rtl::OUString exe_path;
         if (osl_File_E_None != osl::FileBase::getSystemPathFromFileURL(exe_url, exe_path))
             return rtl::OUString();
-
-        if (exe_path.indexOf(' ') != -1)
-            exe_path = quote_string(exe_path);
-
+        
+        if (exe_path.indexOf(' ') != -1)       
+            exe_path = quote_string(exe_path);            
+        
         return exe_path;
     }
-
+    
     //##########################################################
     rtl::OUString get_file_extension(const rtl::OUString& file_name)
     {
         sal_Int32 index = file_name.lastIndexOf('.');
         if ((index != -1) && ((index + 1) < file_name.getLength()))
             return file_name.copy(index + 1);
-
+       
         return rtl::OUString();
     }
-
-    //##########################################################
+    
+    //##########################################################    
     bool is_batch_file(const rtl::OUString& file_name)
     {
         rtl::OUString ext = get_file_extension(file_name);
         return (ext.equalsIgnoreAsciiCaseAscii("bat") ||
                 ext.equalsIgnoreAsciiCaseAscii("cmd") ||
-                ext.equalsIgnoreAsciiCaseAscii("btm"));
+                ext.equalsIgnoreAsciiCaseAscii("btm"));        
     }
-
-    //##########################################################
+    
+    //##########################################################        
     rtl::OUString get_batch_processor()
     {
-        rtl::OUString comspec;
-        osl_getEnvironment(ENV_COMSPEC.pData, &comspec.pData);
+        rtl::OUString comspec;           
+        osl_getEnvironment(ENV_COMSPEC.pData, &comspec.pData);        
 
         OSL_ASSERT(comspec.getLength());
-
-        /* check if comspec path contains blanks and quote it if any */
-        if (comspec.indexOf(' ') != -1)
-            comspec = quote_string(comspec);
-
+                                                   
+        /* check if comspec path contains blanks and quote it if any */        
+        if (comspec.indexOf(' ') != -1)        
+            comspec = quote_string(comspec);            
+                            
         return comspec;
     }
-
+    
 } // namespace private
 
 
@@ -410,72 +410,72 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
     oslFileHandle *pProcessInputWrite,
     oslFileHandle *pProcessOutputRead,
     oslFileHandle *pProcessErrorRead)
-{
+{                	            
     rtl::OUString exe_path = get_executable_path(
         ustrImageName, ustrArguments, nArguments, (Options & osl_Process_SEARCHPATH));
-
+                
     if (0 == exe_path.getLength())
         return osl_Process_E_NotFound;
 
-    if (pProcess == NULL)
+    if (pProcess == NULL)        
         return osl_Process_E_InvalidError;
-
+        
     DWORD flags = NORMAL_PRIORITY_CLASS;
     rtl::OUStringBuffer command_line;
-
-    if (is_batch_file(exe_path))
+                                       
+    if (is_batch_file(exe_path))            
     {
         rtl::OUString batch_processor = get_batch_processor();
-
+        
         if (batch_processor.getLength())
-        {
+        {            
             /* cmd.exe does not work without a console window */
             if (!(Options & osl_Process_WAIT) || (Options & osl_Process_DETACHED))
                 flags |= CREATE_NEW_CONSOLE;
 
             command_line.append(batch_processor);
-            command_line.appendAscii(" /c ");
+            command_line.appendAscii(" /c ");                        
         }
         else
             // should we return here in case of error?
-            return osl_Process_E_Unknown;
+            return osl_Process_E_Unknown; 
     }
-
+   
     command_line.append(exe_path);
-
+                    
     /* Add remaining arguments to command line. If ustrImageName is NULL
-       the first parameter is the name of the executable so we have to
+       the first parameter is the name of the executable so we have to 
        start at 1 instead of 0 */
     for (sal_uInt32 n = (NULL != ustrImageName) ? 0 : 1; n < nArguments; n++)
     {
         command_line.appendAscii(SPACE);
-
+        
         /* Quote arguments containing blanks */
-        if (rtl::OUString(ustrArguments[n]).indexOf(' ') != -1)
-            command_line.append(quote_string(ustrArguments[n]));
+        if (rtl::OUString(ustrArguments[n]).indexOf(' ') != -1)       
+            command_line.append(quote_string(ustrArguments[n]));                 
         else
-            command_line.append(ustrArguments[n]);
+            command_line.append(ustrArguments[n]);                    
     }
 
     environment_container_t environment;
     LPVOID p_environment = NULL;
-
+    
     if (nEnvironmentVars && ustrEnvironmentVars)
     {
         if (!setup_process_environment(
                 ustrEnvironmentVars, nEnvironmentVars, environment))
             return osl_Process_E_InvalidError;
-
+            
         flags |= CREATE_UNICODE_ENVIRONMENT;
         p_environment = &environment[0];
     }
-
-    rtl::OUString cwd;
+    
+    rtl::OUString cwd;     
     if (ustrDirectory && ustrDirectory->length && (osl_File_E_None != osl::FileBase::getSystemPathFromFileURL(ustrDirectory, cwd)))
            return osl_Process_E_InvalidError;
-
-    LPCWSTR p_cwd = (cwd.getLength()) ? reinterpret_cast<LPCWSTR>(cwd.getStr()) : NULL;
-
+                      
+    LPCWSTR	p_cwd = (cwd.getLength()) ? reinterpret_cast<LPCWSTR>(cwd.getStr()) : NULL;            
+        
     if ((Options & osl_Process_DETACHED) && !(flags & CREATE_NEW_CONSOLE))
         flags |= DETACHED_PROCESS;
 
@@ -486,29 +486,29 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
     startup_info.dwFlags   = STARTF_USESHOWWINDOW;
     startup_info.lpDesktop = L"";
 
-    /* Create pipes for redirected IO */
+    /* Create pipes for redirected IO */	
     HANDLE hInputRead  = NULL;
-    HANDLE hInputWrite = NULL;
+    HANDLE hInputWrite = NULL;            	                          
     if (pProcessInputWrite && create_pipe(&hInputRead, true, &hInputWrite, false))
-        startup_info.hStdInput = hInputRead;
-
-    HANDLE hOutputRead  = NULL;
-    HANDLE hOutputWrite = NULL;
-    if (pProcessOutputRead && create_pipe(&hOutputRead, false, &hOutputWrite, true))
-        startup_info.hStdOutput = hOutputWrite;
-
+        startup_info.hStdInput = hInputRead;		
+    
+    HANDLE hOutputRead  = NULL; 
+    HANDLE hOutputWrite = NULL;    
+    if (pProcessOutputRead && create_pipe(&hOutputRead, false, &hOutputWrite, true))	
+        startup_info.hStdOutput = hOutputWrite;		
+    
     HANDLE hErrorRead  = NULL;
     HANDLE hErrorWrite = NULL;
     if (pProcessErrorRead && create_pipe(&hErrorRead, false, &hErrorWrite, true))
-        startup_info.hStdError = hErrorWrite;
-
-    bool b_inherit_handles = false;
+        startup_info.hStdError = hErrorWrite;		
+    
+    bool b_inherit_handles = false;		
     if (pProcessInputWrite || pProcessOutputRead || pProcessErrorRead)
     {
         startup_info.dwFlags |= STARTF_USESTDHANDLES;
         b_inherit_handles      = true;
     }
-
+        
     switch(Options & (osl_Process_NORMAL | osl_Process_HIDDEN | osl_Process_MINIMIZED | osl_Process_MAXIMIZED | osl_Process_FULLSCREEN))
     {
         case osl_Process_HIDDEN:
@@ -530,11 +530,11 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
         default:
             startup_info.wShowWindow = SW_NORMAL;
     }
-
+        
     rtl::OUString cmdline = command_line.makeStringAndClear();
     PROCESS_INFORMATION process_info;
-    BOOL bRet = FALSE;
-
+    BOOL bRet = FALSE;	
+                                            
     if ((Security != NULL) && (((oslSecurityImpl*)Security)->m_hToken != NULL))
     {
         bRet = CreateProcessAsUser(
@@ -560,17 +560,17 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
         CloseHandle(hOutputWrite);
 
     if (hErrorWrite)
-        CloseHandle(hErrorWrite);
-
+        CloseHandle(hErrorWrite);    
+            
     if (bRet)
-    {
+    {		
         CloseHandle(process_info.hThread);
 
         oslProcessImpl* pProcImpl = reinterpret_cast<oslProcessImpl*>(
             rtl_allocateMemory(sizeof(oslProcessImpl)));
-
+        
         if (pProcImpl != NULL)
-        {
+        {		    
             pProcImpl->m_hProcess  = process_info.hProcess;
             pProcImpl->m_IdProcess = process_info.dwProcessId;
 
@@ -578,7 +578,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
 
             if (Options & osl_Process_WAIT)
                 WaitForSingleObject(pProcImpl->m_hProcess, INFINITE);
-
+        
             if (pProcessInputWrite)
                 *pProcessInputWrite = osl_createFileHandleFromOSHandle(hInputWrite, osl_File_OpenFlag_Write);
 
@@ -591,7 +591,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
             return osl_Process_E_None;
         }
     }
-
+    
     /* if an error occured we have to close the server side pipe ends too */
 
     if (hInputWrite)
diff --git a/sal/osl/w32/procimpl.h b/sal/osl/w32/procimpl.h
index c4092a6c71a1..86a2ed04d1b4 100644
--- a/sal/osl/w32/procimpl.h
+++ b/sal/osl/w32/procimpl.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index b2f10a330320..6887424134db 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -51,10 +51,10 @@ static inline void copy_ustr_n( void *dest, const void *source, size_t length )
 
 
 #define STR_INI_EXTENSION   L".ini"
-#define STR_INI_METAHOME    "?~"
-#define STR_INI_METASYS     "?$"
-#define STR_INI_METACFG     "?^"
-#define STR_INI_METAINS     "?#"
+#define STR_INI_METAHOME	"?~"
+#define STR_INI_METASYS		"?$"
+#define STR_INI_METACFG		"?^"
+#define STR_INI_METAINS		"?#"
 
 #define STR_INI_BOOLYES     "yes"
 #define STR_INI_BOOLON      "on"
@@ -69,18 +69,18 @@ static inline void copy_ustr_n( void *dest, const void *source, size_t length )
 
 #define SVERSION_LOCATION   STR_INI_METACFG
 #define SVERSION_FALLBACK   STR_INI_METASYS
-#define SVERSION_NAME       "sversion"
+#define SVERSION_NAME   	"sversion"
 #define SVERSION_SECTION    "Versions"
 #define SVERSION_SOFFICE    "StarOffice"
 #define SVERSION_PROFILE    "soffice.ini"
 #define SVERSION_OPTION     "userid:"
-#define SVERSION_DIRS       { "bin", "program" }
+#define SVERSION_DIRS		{ "bin", "program" }
 #define SVERSION_USER       "user"
 
 #define DEFAULT_PMODE   (_S_IREAD | _S_IWRITE)
 
-#define _BUILD_STR_(n)  # n
-#define BUILD_STR(n)    _BUILD_STR_(n)
+#define _BUILD_STR_(n)	# n
+#define BUILD_STR(n)	_BUILD_STR_(n)
 
 
 /*#define DEBUG_OSL_PROFILE 1*/
@@ -103,8 +103,8 @@ typedef struct _osl_TFile
     HANDLE  m_Handle;
     sal_Char*   m_pReadPtr;
     sal_Char    m_ReadBuf[512];
-/*      sal_Char*   m_pWritePtr; */
-/*      sal_Char    m_WriteBuf[512]; */
+/*  	sal_Char*   m_pWritePtr; */
+/*  	sal_Char    m_WriteBuf[512]; */
     sal_Char*   m_pWriteBuf;
     sal_uInt32  m_nWriteBufLen;
     sal_uInt32  m_nWriteBufFree;
@@ -112,8 +112,8 @@ typedef struct _osl_TFile
 
 typedef struct _osl_TProfileEntry
 {
-    sal_uInt32      m_Line;
-    sal_uInt32      m_Offset;
+    sal_uInt32   	m_Line;
+    sal_uInt32    	m_Offset;
     sal_uInt32      m_Len;
 } osl_TProfileEntry;
 
@@ -193,8 +193,8 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag
 {
     osl_TFile*        pFile = NULL;
     osl_TProfileImpl* pProfile;
-    rtl_uString       *FileName=NULL;
-
+    rtl_uString		  *FileName=NULL;
+    
 #ifdef TRACE_OSL_PROFILE
     OSL_TRACE("In  osl_openProfile\n");
 #endif
@@ -209,10 +209,10 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag
         rtl_uString_assign(&FileName, strProfileName);
     }
 
-
+    
     osl_getSystemPathFromFileURL(FileName, &FileName);
-
-
+    
+    
 #ifdef DEBUG_OSL_PROFILE
     Flags=osl_Profile_FLUSHWRITE;
 
@@ -257,10 +257,10 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag
 
     pProfile = (osl_TProfileImpl*)calloc(1, sizeof(osl_TProfileImpl));
 
-
+    
     pProfile->m_Flags = Flags & FLG_USER;
     osl_getSystemPathFromFileURL(strProfileName, &pProfile->m_strFileName);
-//  rtl_uString_assign(&pProfile->m_strFileName, strProfileName);
+//	rtl_uString_assign(&pProfile->m_strFileName, strProfileName);
 
     if (Flags & (osl_Profile_READLOCK | osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE ))
         pProfile->m_pFile = pFile;
@@ -305,8 +305,8 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
         {
             if ( !( pProfile->m_Flags & osl_Profile_READLOCK )  && ( pProfile->m_Flags & FLG_MODIFIED ) )
             {
-/*                  if (pProfile->m_pFile == NULL) */
-/*                      pProfile->m_pFile = openFileImpl(pProfile->m_Filename, sal_True); */
+/*  				if (pProfile->m_pFile == NULL) */
+/*  					pProfile->m_pFile = openFileImpl(pProfile->m_Filename, sal_True); */
 
                 storeProfile(pProfile, sal_False);
             }
@@ -1313,8 +1313,8 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption Profi
     }
 
     /* mfe: new WriteBuf obsolete */
-/*  pFile->m_pWritePtr = pFile->m_Buf;*/
-/*  pFile->m_pReadPtr  = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf);*/
+/*	pFile->m_pWritePtr = pFile->m_Buf;*/
+/*	pFile->m_pReadPtr  = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf);*/
 
     return (pFile);
 }
@@ -1340,14 +1340,14 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile)
     {
        /* mfe: new WriteBuf obsolete */
         /* we just closing the file here, DO NOT write, it has to be handled in higher levels */
-/*      if (pFile->m_pWritePtr > pFile->m_Buf)*/
-/*      {*/
-/*          DWORD Bytes;*/
+/*		if (pFile->m_pWritePtr > pFile->m_Buf)*/
+/*		{*/
+/*			DWORD Bytes;*/
 
-/*          WriteFile(pFile->m_Handle, pFile->m_WriteBuf,*/
-/*                    pFile->m_pWritePtr - pFile->m_WriteBuf,*/
-/*                    &Bytes, NULL);*/
-/*      }*/
+/*			WriteFile(pFile->m_Handle, pFile->m_WriteBuf,*/
+/*					  pFile->m_pWritePtr - pFile->m_WriteBuf,*/
+/*					  &Bytes, NULL);*/
+/*		}*/
 
         stamp = getFileStamp(pFile);
 
@@ -1380,16 +1380,16 @@ static sal_Bool rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
     {
         /* mfe: new WriteBuf obsolete */
         /* we just closing the file here, DO NOT write, it has to be handled in higher levels */
-/*      if (pFile->m_pWritePtr > pFile->m_WriteBuf)*/
-/*      {*/
-/*          DWORD Bytes;*/
+/*		if (pFile->m_pWritePtr > pFile->m_WriteBuf)*/
+/*		{*/
+/*			DWORD Bytes;*/
 
-/*          WriteFile(pFile->m_Handle, pFile->m_WriteBuf,*/
-/*                    pFile->m_pWritePtr - pFile->m_WriteBuf,*/
-/*                    &Bytes, NULL);*/
+/*			WriteFile(pFile->m_Handle, pFile->m_WriteBuf,*/
+/*					  pFile->m_pWritePtr - pFile->m_WriteBuf,*/
+/*					  &Bytes, NULL);*/
 
-/*          pFile->m_pWritePtr = pFile->m_WriteBuf;*/
-/*      }*/
+/*			pFile->m_pWritePtr = pFile->m_WriteBuf;*/
+/*		}*/
 
         pFile->m_pReadPtr = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf);
 
@@ -2034,9 +2034,9 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
             closeFileImpl(pTmpFile);
 
             osl_ProfileSwapProfileNames(pProfile);
-
-/*          free(pProfile->m_pFile);*/
-/*          free(pTmpFile);*/
+            
+/*			free(pProfile->m_pFile);*/
+/*			free(pTmpFile);*/
 
             pProfile->m_pFile = openFileImpl(pProfile->m_strFileName,pProfile->m_Flags);
 
@@ -2137,7 +2137,7 @@ static sal_Bool osl_ProfileSwapProfileNames(osl_TProfileImpl* pProfile)
 
     /* rename ini bak */
     MoveFileExW( reinterpret_cast<LPCWSTR>(rtl_uString_getStr( ustrIniFile )), reinterpret_cast<LPCWSTR>(rtl_uString_getStr( ustrBakFile )), MOVEFILE_COPY_ALLOWED | MOVEFILE_WRITE_THROUGH );
-
+    
     /* rename tmp ini */
     MoveFileExW( reinterpret_cast<LPCWSTR>(rtl_uString_getStr( ustrTmpFile )), reinterpret_cast<LPCWSTR>(rtl_uString_getStr( ustrIniFile )), MOVEFILE_COPY_ALLOWED | MOVEFILE_WRITE_THROUGH );
 
@@ -2153,7 +2153,7 @@ static rtl_uString* osl_ProfileGenerateExtension(rtl_uString* ustrFileName, rtl_
     sal_Unicode* pFileNameBuf  = 0;
     sal_Int32 nIndex = -1;
 
-    pFileNameBuf = rtl_uString_getStr(ustrFileName);
+    pFileNameBuf = rtl_uString_getStr(ustrFileName); 
 
     rtl_uString_newFromAscii(&ustrOldExtension,".");
 
diff --git a/sal/osl/w32/salinit.cxx b/sal/osl/w32/salinit.cxx
index ffe2c7e70132..60a71488fbd1 100644
--- a/sal/osl/w32/salinit.cxx
+++ b/sal/osl/w32/salinit.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -68,7 +68,7 @@ void SAL_CALL sal_detail_initialize(int argc, char ** argv)
     wVersionRequested = MAKEWORD(1, 1);
 
     error = WSAStartup(wVersionRequested, &wsaData);
-    if ( 0 == error )
+    if ( 0 == error ) 
     {
         WORD wMajorVersionRequired = 1;
         WORD wMinorVersionRequired = 1;
@@ -76,13 +76,13 @@ void SAL_CALL sal_detail_initialize(int argc, char ** argv)
         if ((LOBYTE(wsaData.wVersion) <  wMajorVersionRequired) ||
             (LOBYTE(wsaData.wVersion) == wMajorVersionRequired) &&
             ((HIBYTE(wsaData.wVersion) < wMinorVersionRequired)))
-            {
-                // How to handle a very unlikely error ???
+            {    
+                // How to handle a very unlikely error ??? 
             }
     }
     else
     {
-        // How to handle a very unlikely error ???
+        // How to handle a very unlikely error ??? 
     }
 
     osl_setCommandArgs(argc, argv);
@@ -99,7 +99,7 @@ void SAL_CALL sal_detail_deinitialize()
 
 
 #ifdef __cplusplus
-}   // extern "C"
+}	// extern "C"
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/secimpl.h b/sal/osl/w32/secimpl.h
index 1a3f5a6c834a..ccae39e96eac 100644
--- a/sal/osl/w32/secimpl.h
+++ b/sal/osl/w32/secimpl.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,13 +44,13 @@ typedef struct _oslSecurityImpl {
     HANDLE m_hToken;
     sal_Unicode   m_User[USER_BUFFER_SIZE];
 /* ts: Erweiterung um Fileserver-login */
-    NETRESOURCEW *m_pNetResource;
+    NETRESOURCEW *m_pNetResource;	
 } oslSecurityImpl;
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/security.c b/sal/osl/w32/security.c
index a406c4cdd7b2..7d339baf87ff 100644
--- a/sal/osl/w32/security.c
+++ b/sal/osl/w32/security.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -79,7 +79,7 @@ typedef BOOL (STDMETHODCALLTYPE FAR * LPFNGETUSERPROFILEDIR) (
    duplicate so every access token has to be created with duplicate
    access rights */
 
-#define TOKEN_DUP_QUERY (TOKEN_QUERY|TOKEN_DUPLICATE)
+#define TOKEN_DUP_QUERY	(TOKEN_QUERY|TOKEN_DUPLICATE)
 
 /*****************************************************************************/
 /* Static Module Function Declarations */
@@ -117,14 +117,14 @@ oslSecurityError SAL_CALL osl_loginUser( rtl_uString *strUserName, rtl_uString *
     }
     else
     {
-        sal_Unicode*    strUser;
-        sal_Unicode*    strDomain = _wcsdup(rtl_uString_getStr(strUserName));
-        HANDLE  hUserToken;
-
-        #if OSL_DEBUG_LEVEL > 0
+        sal_Unicode*	strUser;
+        sal_Unicode*	strDomain = _wcsdup(rtl_uString_getStr(strUserName));
+        HANDLE	hUserToken;		
+        
+        #if OSL_DEBUG_LEVEL > 0		    
             LUID luid;
         #endif
-
+        
         if (NULL != (strUser = wcschr(strDomain, L'/')))
             *strUser++ = L'\0';
         else
@@ -133,7 +133,7 @@ oslSecurityError SAL_CALL osl_loginUser( rtl_uString *strUserName, rtl_uString *
             strDomain = NULL;
         }
 
-        // this process must have the right: 'act as a part of operatingsystem'
+        // this process must have the right: 'act as a part of operatingsystem'				
         OSL_ASSERT(LookupPrivilegeValue(NULL, SE_TCB_NAME, &luid));
 
         if (LogonUserW(strUser, strDomain ? strDomain : L"", rtl_uString_getStr(strPasswd),
@@ -167,14 +167,14 @@ oslSecurityError SAL_CALL osl_loginUserOnFileServer(rtl_uString *strUserName,
                                                     rtl_uString *strFileServer,
                                                     oslSecurity *pSecurity)
 {
-    oslSecurityError    ret;
-    DWORD               err;
-    NETRESOURCEW        netResource;
-    sal_Unicode*                remoteName;
-    sal_Unicode*                userName;
+    oslSecurityError 	ret;
+    DWORD 				err;
+    NETRESOURCEW 		netResource;
+    sal_Unicode* 				remoteName;
+    sal_Unicode*				userName;
 
-    remoteName  = malloc(rtl_uString_getLength(strFileServer) + rtl_uString_getLength(strUserName) + 4);
-    userName    = malloc(rtl_uString_getLength(strFileServer) + rtl_uString_getLength(strUserName) + 2);
+    remoteName 	= malloc(rtl_uString_getLength(strFileServer) + rtl_uString_getLength(strUserName) + 4);
+    userName 	= malloc(rtl_uString_getLength(strFileServer) + rtl_uString_getLength(strUserName) + 2);
 
     wcscpy(remoteName, L"\\\\");
     wcscat(remoteName, rtl_uString_getStr(strFileServer));
@@ -185,14 +185,14 @@ oslSecurityError SAL_CALL osl_loginUserOnFileServer(rtl_uString *strUserName,
     wcscat(userName, L"\\");
     wcscat(userName, rtl_uString_getStr(strUserName));
 
-    netResource.dwScope         = RESOURCE_GLOBALNET;
-    netResource.dwType          = RESOURCETYPE_DISK;
-    netResource.dwDisplayType   = RESOURCEDISPLAYTYPE_SHARE;
-    netResource.dwUsage         = RESOURCEUSAGE_CONNECTABLE;
-    netResource.lpLocalName     = NULL;
-    netResource.lpRemoteName    = remoteName;
-    netResource.lpComment       = NULL;
-    netResource.lpProvider      = NULL;
+    netResource.dwScope 		= RESOURCE_GLOBALNET;
+    netResource.dwType			= RESOURCETYPE_DISK;
+    netResource.dwDisplayType 	= RESOURCEDISPLAYTYPE_SHARE;
+    netResource.dwUsage 		= RESOURCEUSAGE_CONNECTABLE;
+    netResource.lpLocalName 	= NULL;
+    netResource.lpRemoteName 	= remoteName;
+    netResource.lpComment 		= NULL;
+    netResource.lpProvider 		= NULL;
 
     err = WNetAddConnection2W(&netResource, rtl_uString_getStr(strPasswd), userName, 0);
 
@@ -221,13 +221,13 @@ oslSecurityError SAL_CALL osl_loginUserOnFileServer(rtl_uString *strUserName,
 }
 
 
-static BOOL WINAPI CheckTokenMembership_Stub( HANDLE TokenHandle, PSID SidToCheck, PBOOL IsMember )
+static BOOL	WINAPI CheckTokenMembership_Stub( HANDLE TokenHandle, PSID SidToCheck, PBOOL IsMember )
 {
     typedef BOOL (WINAPI *CheckTokenMembership_PROC)( HANDLE, PSID, PBOOL );
 
-    static HMODULE  hModule = NULL;
-    static CheckTokenMembership_PROC    pCheckTokenMembership = NULL;
-
+    static HMODULE	hModule = NULL;
+    static CheckTokenMembership_PROC	pCheckTokenMembership = NULL;
+    
     if ( !hModule )
     {
         /* SAL is always linked against ADVAPI32 so we can rely on that it is already mapped */
@@ -259,15 +259,15 @@ sal_Bool SAL_CALL osl_isAdministrator(oslSecurity Security)
         }
         else
         {
-            HANDLE                      hImpersonationToken = NULL;
-            PSID                        psidAdministrators;
-            SID_IDENTIFIER_AUTHORITY    siaNtAuthority = SECURITY_NT_AUTHORITY;
-            sal_Bool                    bSuccess = sal_False;
+            HANDLE						hImpersonationToken = NULL;
+            PSID 						psidAdministrators;
+            SID_IDENTIFIER_AUTHORITY 	siaNtAuthority = SECURITY_NT_AUTHORITY;
+            sal_Bool 					bSuccess = sal_False;
 
 
             /* If Security contains an access token we need to duplicate it to an impersonation
                access token. NULL works with CheckTokenMembership() as the current effective
-               impersonation token
+               impersonation token 
              */
 
             if ( ((oslSecurityImpl*)Security)->m_hToken )
@@ -289,12 +289,12 @@ sal_Bool SAL_CALL osl_isAdministrator(oslSecurity Security)
                                           0, 0, 0, 0, 0, 0,
                                           &psidAdministrators))
             {
-                BOOL    fSuccess = FALSE;
+                BOOL	fSuccess = FALSE;
 
-                if ( CheckTokenMembership_Stub( hImpersonationToken, psidAdministrators, &fSuccess ) && fSuccess )
+                if ( CheckTokenMembership_Stub( hImpersonationToken, psidAdministrators, &fSuccess ) && fSuccess ) 
                     bSuccess = sal_True;
 
-                FreeSid(psidAdministrators);
+                FreeSid(psidAdministrators); 
             }
 
             if ( hImpersonationToken )
@@ -346,7 +346,7 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **strIdent)
 
         if (hAccessToken)
         {
-            sal_Char        *Ident;
+            sal_Char		*Ident;
             DWORD  nInfoBuffer = 512;
             UCHAR* pInfoBuffer = malloc(nInfoBuffer);
 
@@ -438,7 +438,7 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **strIdent)
         else
         {
             DWORD needed=0;
-            sal_Unicode     *Ident;
+            sal_Unicode		*Ident;
 
             WNetGetUserA(NULL, NULL, &needed);
             needed = max( 16 , needed );
@@ -471,8 +471,8 @@ sal_Bool SAL_CALL osl_getUserName(oslSecurity Security, rtl_uString **strName)
 
 sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirectory)
 {
-    rtl_uString *ustrSysDir = NULL;
-    sal_Bool    bSuccess = sal_False;
+    rtl_uString	*ustrSysDir = NULL;
+    sal_Bool	bSuccess = sal_False;
 
     if (Security != NULL)
     {
@@ -517,7 +517,7 @@ sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirect
             else
 #endif
 
-                bSuccess = (sal_Bool)(GetSpecialFolder(&ustrSysDir, CSIDL_PERSONAL) &&
+                bSuccess = (sal_Bool)(GetSpecialFolder(&ustrSysDir, CSIDL_PERSONAL) && 
                                      (osl_File_E_None == osl_getFileURLFromSystemPath(ustrSysDir, pustrDirectory)));
         }
     }
@@ -530,7 +530,7 @@ sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirect
 
 sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDirectory)
 {
-    sal_Bool    bSuccess = sal_False;
+    sal_Bool	bSuccess = sal_False;
 
     if (Security != NULL)
     {
@@ -556,7 +556,7 @@ sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDire
             else
             {
                 rtl_uString *ustrFile = NULL;
-                sal_Unicode sFile[_MAX_PATH];
+                sal_Unicode	sFile[_MAX_PATH];
 
                 if ( !GetSpecialFolder( &ustrFile, CSIDL_APPDATA) )
                 {
@@ -579,7 +579,7 @@ sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDire
 
 sal_Bool SAL_CALL osl_loadUserProfile(oslSecurity Security)
 {
-    /*  CreateProcessAsUser does not load the specified user's profile
+    /* 	CreateProcessAsUser does not load the specified user's profile
         into the HKEY_USERS registry key. This means that access to information
         in the HKEY_CURRENT_USER registry key may not produce results consistent
         with a normal interactive logon.
@@ -592,11 +592,11 @@ sal_Bool SAL_CALL osl_loadUserProfile(oslSecurity Security)
 
     if (Privilege(SE_RESTORE_NAME, TRUE))
     {
-        HMODULE                 hUserEnvLib         = NULL;
-        LPFNLOADUSERPROFILE     fLoadUserProfile    = NULL;
-        LPFNUNLOADUSERPROFILE   fUnloadUserProfile  = NULL;
-        HANDLE                  hAccessToken        = ((oslSecurityImpl*)Security)->m_hToken;
-        DWORD                   nError              = 0;
+        HMODULE                 hUserEnvLib			= NULL;
+        LPFNLOADUSERPROFILE     fLoadUserProfile	= NULL;
+        LPFNUNLOADUSERPROFILE   fUnloadUserProfile	= NULL;
+        HANDLE 					hAccessToken 		= ((oslSecurityImpl*)Security)->m_hToken;
+        DWORD					nError				= 0;
 
         /* try to create user profile */
         if ( !hAccessToken )
@@ -621,8 +621,8 @@ sal_Bool SAL_CALL osl_loadUserProfile(oslSecurity Security)
 
             if (fLoadUserProfile && fUnloadUserProfile)
             {
-                rtl_uString     *buffer = 0;
-                PROFILEINFOW    pi;
+                rtl_uString  	*buffer = 0;
+                PROFILEINFOW	pi;
 
                 getUserNameImpl(Security, &buffer, sal_False);
 
@@ -658,11 +658,11 @@ void SAL_CALL osl_unloadUserProfile(oslSecurity Security)
 {
     if ( ((oslSecurityImpl*)Security)->m_hProfile != NULL )
     {
-        HMODULE                 hUserEnvLib         = NULL;
-        LPFNLOADUSERPROFILE     fLoadUserProfile    = NULL;
-        LPFNUNLOADUSERPROFILE   fUnloadUserProfile  = NULL;
-        BOOL                    bOk                 = FALSE;
-        HANDLE                  hAccessToken        = ((oslSecurityImpl*)Security)->m_hToken;
+        HMODULE                 hUserEnvLib			= NULL;
+        LPFNLOADUSERPROFILE     fLoadUserProfile	= NULL;
+        LPFNUNLOADUSERPROFILE   fUnloadUserProfile	= NULL;
+        BOOL 					bOk 				= FALSE;
+        HANDLE 					hAccessToken 		= ((oslSecurityImpl*)Security)->m_hToken;
 
         if ( !hAccessToken )
         {
@@ -714,16 +714,16 @@ static sal_Bool GetSpecialFolder(rtl_uString **strPath, int nFolder)
     sal_Bool bRet = sal_False;
     HINSTANCE hLibrary;
     sal_Char PathA[_MAX_PATH];
-    sal_Unicode PathW[_MAX_PATH];
+    sal_Unicode	PathW[_MAX_PATH];
 
     if ((hLibrary = LoadLibrary("shell32.dll")) != NULL)
     {
         BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL);
         BOOL (WINAPI *pSHGetSpecialFolderPathW)(HWND, LPWSTR, int, BOOL);
-
-        pSHGetSpecialFolderPathA = (BOOL (WINAPI *)(HWND, LPSTR, int, BOOL))GetProcAddress(hLibrary, "SHGetSpecialFolderPathA");
+        
+        pSHGetSpecialFolderPathA = (BOOL (WINAPI *)(HWND, LPSTR, int, BOOL))GetProcAddress(hLibrary, "SHGetSpecialFolderPathA");        
         pSHGetSpecialFolderPathW = (BOOL (WINAPI *)(HWND, LPWSTR, int, BOOL))GetProcAddress(hLibrary, "SHGetSpecialFolderPathW");
-
+        
         if (pSHGetSpecialFolderPathA)
         {
             if (pSHGetSpecialFolderPathA(GetActiveWindow(), PathA, nFolder, TRUE))
@@ -949,7 +949,7 @@ static sal_Bool SAL_CALL getUserNameImpl(oslSecurity Security, rtl_uString **str
             {
                 sal_Unicode  UserName[128];
                 sal_Unicode  DomainName[128];
-                sal_Unicode  Name[257];
+                sal_Unicode	 Name[257];
                 DWORD nUserName   = sizeof(UserName);
                 DWORD nDomainName = sizeof(DomainName);
                 SID_NAME_USE sUse;
@@ -979,7 +979,7 @@ static sal_Bool SAL_CALL getUserNameImpl(oslSecurity Security, rtl_uString **str
         else
         {
             DWORD needed=0;
-            sal_Unicode         *pNameW=NULL;
+            sal_Unicode			*pNameW=NULL;
 
             WNetGetUserW(NULL, NULL, &needed);
             pNameW = malloc (needed*sizeof(sal_Unicode));
@@ -996,7 +996,7 @@ static sal_Bool SAL_CALL getUserNameImpl(oslSecurity Security, rtl_uString **str
                 if (wcslen(pSecImpl->m_User) > 0)
                 {
                     rtl_uString_newFromStr( strName, pSecImpl->m_pNetResource->lpRemoteName);
-
+                
                     if (pNameW)
                         free(pNameW);
 
diff --git a/sal/osl/w32/semaphor.c b/sal/osl/w32/semaphor.c
index 41df50f478fa..e4a72268a823 100644
--- a/sal/osl/w32/semaphor.c
+++ b/sal/osl/w32/semaphor.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@
 /*****************************************************************************/
 /* osl_createSemaphore */
 /*****************************************************************************/
-oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount)
+oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount) 
 {
     oslSemaphore Semaphore;
 
@@ -53,27 +53,27 @@ oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount)
         Semaphore= 0;
     }
 
-    return Semaphore;
+    return Semaphore;  
 }
 
 /*****************************************************************************/
 /* osl_destroySemaphore */
 /*****************************************************************************/
-void SAL_CALL osl_destroySemaphore(oslSemaphore Semaphore)
+void SAL_CALL osl_destroySemaphore(oslSemaphore Semaphore) 
 {
 
-
-    if(Semaphore != 0)
+    
+    if(Semaphore != 0) 
     {
         CloseHandle((HANDLE)Semaphore);
     }
 
 }
-
+             
 /*****************************************************************************/
 /* osl_acquireSemaphore */
 /*****************************************************************************/
-sal_Bool SAL_CALL osl_acquireSemaphore(oslSemaphore Semaphore)
+sal_Bool SAL_CALL osl_acquireSemaphore(oslSemaphore Semaphore) 
 {
     OSL_ASSERT(Semaphore != 0);
 
@@ -83,7 +83,7 @@ sal_Bool SAL_CALL osl_acquireSemaphore(oslSemaphore Semaphore)
             return sal_True;
 
         default:
-            return (sal_False);
+            return (sal_False);			
     }
 }
 
@@ -100,12 +100,12 @@ sal_Bool SAL_CALL osl_tryToAcquireSemaphore(oslSemaphore Semaphore)
 /*****************************************************************************/
 /* osl_releaseSemaphore */
 /*****************************************************************************/
-sal_Bool SAL_CALL osl_releaseSemaphore(oslSemaphore Semaphore)
+sal_Bool SAL_CALL osl_releaseSemaphore(oslSemaphore Semaphore) 
 {
     OSL_ASSERT(Semaphore != 0);
 
     /* increase count by one, not interested in previous count */
-    return (sal_Bool)(ReleaseSemaphore((HANDLE)Semaphore, 1, NULL) != FALSE);
+    return (sal_Bool)(ReleaseSemaphore((HANDLE)Semaphore, 1, NULL) != FALSE);			
 }
 
 
diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx
index de2201f8d8a6..5f97f723b1d6 100644
--- a/sal/osl/w32/signal.cxx
+++ b/sal/osl/w32/signal.cxx
@@ -46,20 +46,20 @@
 typedef struct _oslSignalHandlerImpl
 {
     oslSignalHandlerFunction      Handler;
-    void*                         pData;
-    struct _oslSignalHandlerImpl* pNext;
+    void*			        	  pData;
+    struct _oslSignalHandlerImpl* pNext;	
 } oslSignalHandlerImpl;
 
-static sal_Bool               bErrorReportingEnabled = sal_True;
-static sal_Bool               bInitSignal = sal_False;
-static oslMutex               SignalListMutex;
+static sal_Bool				  bErrorReportingEnabled = sal_True;
+static sal_Bool  			  bInitSignal = sal_False;
+static oslMutex 			  SignalListMutex;
 static oslSignalHandlerImpl*  SignalList;
 
 static long WINAPI SignalHandlerFunction(LPEXCEPTION_POINTERS lpEP);
 
 static sal_Bool InitSignal(void)
 {
-    HMODULE hFaultRep;
+    HMODULE	hFaultRep;
 
     SignalListMutex = osl_createMutex();
 
@@ -71,7 +71,7 @@ static sal_Bool InitSignal(void)
 #ifdef __MINGW32__
 typedef BOOL (WINAPI *pfn_ADDEREXCLUDEDAPPLICATIONW)(LPCWSTR);
 #endif
-        pfn_ADDEREXCLUDEDAPPLICATIONW       pfn = (pfn_ADDEREXCLUDEDAPPLICATIONW)GetProcAddress( hFaultRep, "AddERExcludedApplicationW" );
+        pfn_ADDEREXCLUDEDAPPLICATIONW		pfn = (pfn_ADDEREXCLUDEDAPPLICATIONW)GetProcAddress( hFaultRep, "AddERExcludedApplicationW" );
         if ( pfn )
             pfn( L"SOFFICE.EXE" );
         FreeLibrary( hFaultRep );
@@ -106,22 +106,22 @@ static oslSignalAction CallSignalHandler(oslSignalInfo *pInfo)
 }
 
 /*****************************************************************************/
-/* SignalHandlerFunction    */
+/* SignalHandlerFunction	*/
 /*****************************************************************************/
 
-#define REPORTENV_PARAM     "-crashreportenv:"
-#define REPORTENV_PARAM2    "/crashreportenv:"
+#define REPORTENV_PARAM		"-crashreportenv:"
+#define REPORTENV_PARAM2	"/crashreportenv:"
 
 static BOOL ReportCrash( LPEXCEPTION_POINTERS lpEP )
 {
-    BOOL    fSuccess = FALSE;
-    BOOL    fAutoReport = FALSE;
-    TCHAR   szBuffer[1024];
+    BOOL	fSuccess = FALSE;
+    BOOL	fAutoReport = FALSE;
+    TCHAR	szBuffer[1024];
     ::osl::LongPathBuffer< sal_Char > aPath( MAX_LONG_PATH );
-    LPTSTR  lpFilePart;
-    PROCESS_INFORMATION ProcessInfo;
-    STARTUPINFO StartupInfo;
-    int     argi;
+    LPTSTR	lpFilePart;
+    PROCESS_INFORMATION	ProcessInfo;
+    STARTUPINFO	StartupInfo;
+    int		argi;
 
     if ( !bErrorReportingEnabled )
         return FALSE;
@@ -130,18 +130,18 @@ static BOOL ReportCrash( LPEXCEPTION_POINTERS lpEP )
 
     for ( argi = 1; argi < __argc; argi++ )
     {
-        if (
-            0 == stricmp( __argv[argi], "-nocrashreport" ) ||
+        if ( 
+            0 == stricmp( __argv[argi], "-nocrashreport" ) || 
             0 == stricmp( __argv[argi], "/nocrashreport" )
             )
             return FALSE;
         else if (
-            0 == stricmp( __argv[argi], "-autocrashreport" ) ||
+            0 == stricmp( __argv[argi], "-autocrashreport" ) || 
             0 == stricmp( __argv[argi], "/autocrashreport" )
             )
             fAutoReport = TRUE;
         else if (
-            0 == strnicmp( __argv[argi], REPORTENV_PARAM, strlen(REPORTENV_PARAM) ) ||
+            0 == strnicmp( __argv[argi], REPORTENV_PARAM, strlen(REPORTENV_PARAM) ) || 
             0 == strnicmp( __argv[argi], REPORTENV_PARAM2, strlen(REPORTENV_PARAM2) )
             )
         {
@@ -150,13 +150,13 @@ static BOOL ReportCrash( LPEXCEPTION_POINTERS lpEP )
 
             if ( delim )
             {
-                CHAR    *lpVariable;
-                CHAR    *lpValue;
+                CHAR	*lpVariable;
+                CHAR	*lpValue;
                 const char *variable = envparam;
                 size_t variable_len = delim - envparam;
                 const char *value = delim + 1;
                 size_t value_len = strlen(envparam) - variable_len - 1;
-
+                
                 if ( '\"' == *value )
                 {
                     const char *quote;
@@ -177,7 +177,7 @@ static BOOL ReportCrash( LPEXCEPTION_POINTERS lpEP )
                 memcpy( lpValue, value, value_len );
                 lpValue[value_len] = 0;
 
-                SetEnvironmentVariable( lpVariable, lpValue );
+                SetEnvironmentVariable( lpVariable, lpValue ); 
             }
         }
     }
@@ -189,33 +189,33 @@ static BOOL ReportCrash( LPEXCEPTION_POINTERS lpEP )
 
 
         sntprintf( szBuffer, SAL_N_ELEMENTS(szBuffer),
-            _T("%s -p %u -excp 0x%p -t %u%s"),
-            static_cast<sal_Char*>( aPath ),
-            GetCurrentProcessId(),
-            lpEP,
+            _T("%s -p %u -excp 0x%p -t %u%s"), 
+            static_cast<sal_Char*>( aPath ), 
+            GetCurrentProcessId(), 
+            lpEP, 
             GetCurrentThreadId(),
             fAutoReport ? _T(" -noui -send") : _T(" -noui") );
 
-        if (
-            CreateProcess(
-                NULL,
-                szBuffer,
-                NULL,
-                NULL,
-                FALSE,
+        if ( 
+            CreateProcess( 
+                NULL, 
+                szBuffer, 
+                NULL, 
+                NULL, 
+                FALSE, 
 #ifdef UNICODE
-                CREATE_UNICODE_ENVIRONMENT,
+                CREATE_UNICODE_ENVIRONMENT, 
 #else
                 0,
 #endif
-                NULL, NULL, &StartupInfo, &ProcessInfo )
+                NULL, NULL, &StartupInfo, &ProcessInfo ) 
             )
         {
-            DWORD   dwExitCode;
+            DWORD	dwExitCode;
 
             WaitForSingleObject( ProcessInfo.hProcess, INFINITE );
             if ( GetExitCodeProcess( ProcessInfo.hProcess, &dwExitCode ) && 0 == dwExitCode )
-
+            
             fSuccess = TRUE;
 
         }
@@ -225,21 +225,21 @@ static BOOL ReportCrash( LPEXCEPTION_POINTERS lpEP )
 }
 
 /*****************************************************************************/
-/* SignalHandlerFunction    */
+/* SignalHandlerFunction	*/
 /*****************************************************************************/
 
 static BOOL WINAPI IsWin95A(void)
 {
-    OSVERSIONINFO   ovi;
+    OSVERSIONINFO	ovi;
 
     ZeroMemory( &ovi, sizeof(ovi) );
     ovi.dwOSVersionInfoSize = sizeof(ovi);
 
     if ( GetVersionEx( &ovi ) )
         /* See MSDN January 2000 documentation of GetVersionEx */
-        return  (ovi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) &&
-                (ovi.dwMajorVersion <= 4) &&
-                (ovi.dwMinorVersion == 0) &&
+        return	(ovi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) && 
+                (ovi.dwMajorVersion <= 4) && 
+                (ovi.dwMinorVersion == 0) && 
                 (ovi.dwBuildNumber == 0x040003B6);
 
     /* Something wrent wrong. So assume we have an older operating prior Win95 */
@@ -252,10 +252,10 @@ static BOOL WINAPI IsWin95A(void)
 
 static long WINAPI SignalHandlerFunction(LPEXCEPTION_POINTERS lpEP)
 {
-    static sal_Bool     bNested = sal_False;
-    sal_Bool        bRaiseCrashReporter = sal_False;
-    oslSignalInfo   Info;
-    oslSignalAction Action;
+    static sal_Bool		bNested = sal_False;
+    sal_Bool		bRaiseCrashReporter = sal_False;
+    oslSignalInfo	Info;
+    oslSignalAction	Action;
 
     Info.UserSignal = lpEP->ExceptionRecord->ExceptionCode;
     Info.UserData   = NULL;
@@ -266,29 +266,29 @@ static long WINAPI SignalHandlerFunction(LPEXCEPTION_POINTERS lpEP)
            Microsoft C++ compiler (add more for other compilers if necessary).
          */
         case EXCEPTION_MSC_CPP_EXCEPTION:
-        case EXCEPTION_ACCESS_VIOLATION:
+        case EXCEPTION_ACCESS_VIOLATION: 
             Info.Signal = osl_Signal_AccessViolation;
             bRaiseCrashReporter = sal_True;
-            break;
+            break; 
 
-        case EXCEPTION_INT_DIVIDE_BY_ZERO:
+        case EXCEPTION_INT_DIVIDE_BY_ZERO: 
             Info.Signal = osl_Signal_IntegerDivideByZero;
             bRaiseCrashReporter = sal_True;
-            break;
+            break; 
 
-        case EXCEPTION_FLT_DIVIDE_BY_ZERO:
+        case EXCEPTION_FLT_DIVIDE_BY_ZERO: 
             Info.Signal = osl_Signal_FloatDivideByZero;
             bRaiseCrashReporter = sal_True;
-            break;
+            break; 
 
-        case EXCEPTION_BREAKPOINT:
+        case EXCEPTION_BREAKPOINT: 
             Info.Signal = osl_Signal_DebugBreak;
-            break;
-
+            break; 
+            
         default:
             Info.Signal = osl_Signal_System;
             bRaiseCrashReporter = sal_True;
-            break;
+            break; 
     }
 
     if ( !bNested )
@@ -341,12 +341,12 @@ oslSignalHandler SAL_CALL osl_addSignalHandler(oslSignalHandlerFunction Handler,
     pHandler = reinterpret_cast< oslSignalHandlerImpl* >( calloc( 1, sizeof(oslSignalHandlerImpl) ) );
 
     if (pHandler != NULL)
-    {
+    {	
         pHandler->Handler = Handler;
         pHandler->pData   = pData;
 
         osl_acquireMutex(SignalListMutex);
-
+    
         pHandler->pNext = SignalList;
         SignalList      = pHandler;
 
@@ -396,7 +396,7 @@ sal_Bool SAL_CALL osl_removeSignalHandler(oslSignalHandler Handler)
         pPrevious = pHandler;
         pHandler  = pHandler->pNext;
     }
-
+            
     osl_releaseMutex(SignalListMutex);
 
     return (sal_False);
@@ -420,7 +420,7 @@ oslSignalAction SAL_CALL osl_raiseSignal(sal_Int32 UserSignal, void* UserData)
     Info.UserData   = UserData;
 
     Action = CallSignalHandler(&Info);
-
+            
     osl_releaseMutex(SignalListMutex);
 
     return (Action);
diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index 6e0027e3e06f..86fa5c0aef93 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,9 +41,9 @@ extern "C" {
 
 /* defines for shutdown */
 #ifdef GCC
-#   define SD_RECEIVE 0
-#   define SD_SEND 1
-#   define SD_BOTH 2
+#	define SD_RECEIVE 0
+#	define SD_SEND 1
+#	define SD_BOTH 2
 #endif
 
 /*
@@ -72,8 +72,8 @@ extern "C" {
   conceal the struct sockaddr from the eyes of the user.
 */
 
-#define OSL_INVALID_SOCKET      INVALID_SOCKET          /* WIN32 */
-#define OSL_SOCKET_ERROR        SOCKET_ERROR            /* WIN32 */
+#define OSL_INVALID_SOCKET		INVALID_SOCKET			/* WIN32 */
+#define OSL_SOCKET_ERROR		SOCKET_ERROR			/* WIN32 */
 
 /*****************************************************************************/
 /* enum oslAddrFamily */
@@ -81,9 +81,9 @@ extern "C" {
 
 /* map */
 static DWORD FamilyMap[]= {
-    AF_INET,                    /* osl_Socket_FamilyInet */
-    AF_IPX,                     /* osl_Socket_FamilyIpx */
-    0                           /* osl_Socket_FamilyInvalid */
+    AF_INET,					/* osl_Socket_FamilyInet */
+    AF_IPX,						/* osl_Socket_FamilyIpx */
+    0							/* osl_Socket_FamilyInvalid */
 };
 
 /* reverse map */
@@ -101,7 +101,7 @@ static oslAddrFamily osl_AddrFamilyFromNative(DWORD nativeType)
 
 /* macros */
 #define FAMILY_FROM_NATIVE(y) osl_AddrFamilyFromNative(y)
-#define FAMILY_TO_NATIVE(x) (short)FamilyMap[x]
+#define FAMILY_TO_NATIVE(x)	(short)FamilyMap[x]
 
 /*****************************************************************************/
 /* enum oslProtocol */
@@ -109,16 +109,16 @@ static oslAddrFamily osl_AddrFamilyFromNative(DWORD nativeType)
 
 /* map */
 static DWORD ProtocolMap[]= {
-    0,                          /* osl_Socket_FamilyInet */
-    NSPROTO_IPX,                /* osl_Socket_FamilyIpx */
-    NSPROTO_SPX,                /* osl_Socket_ProtocolSpx */
-    NSPROTO_SPXII,              /* osl_Socket_ProtocolSpx_ii */
-    0                           /* osl_Socket_ProtocolInvalid */
+    0,							/* osl_Socket_FamilyInet */
+    NSPROTO_IPX,				/* osl_Socket_FamilyIpx */
+    NSPROTO_SPX,				/* osl_Socket_ProtocolSpx */
+    NSPROTO_SPXII,				/* osl_Socket_ProtocolSpx_ii */
+    0							/* osl_Socket_ProtocolInvalid */
 };
 
 /* macros */
 #define PROTOCOL_FROM_NATIVE(y) osl_ProtocolFromNative(y)
-#define PROTOCOL_TO_NATIVE(x)   ProtocolMap[x]
+#define PROTOCOL_TO_NATIVE(x)	ProtocolMap[x]
 
 /*****************************************************************************/
 /* enum oslSocketType */
@@ -126,12 +126,12 @@ static DWORD ProtocolMap[]= {
 
 /* map */
 static DWORD TypeMap[]= {
-    SOCK_STREAM,                /* osl_Socket_TypeStream */
-    SOCK_DGRAM,                 /* osl_Socket_TypeDgram  */
-    SOCK_RAW,                   /* osl_Socket_TypeRaw */
-    SOCK_RDM,                   /* osl_Socket_TypeRdm */
-    SOCK_SEQPACKET,             /* osl_Socket_TypeSeqPacket */
-    0                           /* osl_Socket_TypeInvalid */
+    SOCK_STREAM,				/* osl_Socket_TypeStream */
+    SOCK_DGRAM,					/* osl_Socket_TypeDgram  */
+    SOCK_RAW,					/* osl_Socket_TypeRaw */
+    SOCK_RDM,					/* osl_Socket_TypeRdm */
+    SOCK_SEQPACKET,				/* osl_Socket_TypeSeqPacket */
+    0							/* osl_Socket_TypeInvalid */
 };
 
 /* reverse map */
@@ -148,8 +148,8 @@ static oslSocketType osl_SocketTypeFromNative(DWORD nativeType)
 }
 
 /* macros */
-#define TYPE_TO_NATIVE(x)       TypeMap[x]
-#define TYPE_FROM_NATIVE(y)     osl_SocketTypeFromNative(y)
+#define TYPE_TO_NATIVE(x)		TypeMap[x]
+#define TYPE_FROM_NATIVE(y)		osl_SocketTypeFromNative(y)
 
 /*****************************************************************************/
 /* enum oslSocketOption */
@@ -157,74 +157,74 @@ static oslSocketType osl_SocketTypeFromNative(DWORD nativeType)
 
 /* map */
 static DWORD OptionMap[]= {
-    SO_DEBUG,                   /* osl_Socket_OptionDebug */
-    SO_ACCEPTCONN,              /* osl_Socket_OptionAcceptConn */
-    SO_REUSEADDR,               /* osl_Socket_OptionReuseAddr */
-    SO_KEEPALIVE,               /* osl_Socket_OptionKeepAlive */
-    SO_DONTROUTE,               /* osl_Socket_OptionDontRoute */
-    SO_BROADCAST,               /* osl_Socket_OptionBroadcast */
-    SO_USELOOPBACK,             /* osl_Socket_OptionUseLoopback */
-    SO_LINGER,                  /* osl_Socket_OptionLinger */
-    SO_OOBINLINE,               /* osl_Socket_OptionOOBinLine */
-    SO_SNDBUF,                  /* osl_Socket_OptionSndBuf */
-    SO_RCVBUF,                  /* osl_Socket_OptionRcvBuf */
-    SO_SNDLOWAT,                /* osl_Socket_OptionSndLowat */
-    SO_RCVLOWAT,                /* osl_Socket_OptionRcvLowat */
-    SO_SNDTIMEO,                /* osl_Socket_OptionSndTimeo */
-    SO_RCVTIMEO,                /* osl_Socket_OptionRcvTimeo */
-    SO_ERROR,                   /* osl_Socket_OptionError */
-    SO_TYPE,                    /* osl_Socket_OptionType */
-    TCP_NODELAY,                /* osl_Socket_OptionTcpNoDelay */
-    0                           /* osl_Socket_OptionInvalid */
+    SO_DEBUG,					/* osl_Socket_OptionDebug */
+    SO_ACCEPTCONN,				/* osl_Socket_OptionAcceptConn */
+    SO_REUSEADDR,				/* osl_Socket_OptionReuseAddr */
+    SO_KEEPALIVE,				/* osl_Socket_OptionKeepAlive */
+    SO_DONTROUTE,				/* osl_Socket_OptionDontRoute */
+    SO_BROADCAST,				/* osl_Socket_OptionBroadcast */
+    SO_USELOOPBACK,				/* osl_Socket_OptionUseLoopback */
+    SO_LINGER,					/* osl_Socket_OptionLinger */
+    SO_OOBINLINE,				/* osl_Socket_OptionOOBinLine */
+    SO_SNDBUF,					/* osl_Socket_OptionSndBuf */
+    SO_RCVBUF,					/* osl_Socket_OptionRcvBuf */
+    SO_SNDLOWAT,				/* osl_Socket_OptionSndLowat */
+    SO_RCVLOWAT,				/* osl_Socket_OptionRcvLowat */
+    SO_SNDTIMEO,				/* osl_Socket_OptionSndTimeo */
+    SO_RCVTIMEO,				/* osl_Socket_OptionRcvTimeo */
+    SO_ERROR,					/* osl_Socket_OptionError */
+    SO_TYPE,					/* osl_Socket_OptionType */
+    TCP_NODELAY,				/* osl_Socket_OptionTcpNoDelay */
+    0							/* osl_Socket_OptionInvalid */
 };
 
 /* macros */
-#define OPTION_TO_NATIVE(x)     OptionMap[x]
-#define OPTION_FROM_NATIVE(y)   osl_SocketOptionFromNative(y)
+#define OPTION_TO_NATIVE(x)		OptionMap[x]
+#define OPTION_FROM_NATIVE(y)	osl_SocketOptionFromNative(y)
 
 /*****************************************************************************/
 /* enum oslSocketOptionLevel */
 /*****************************************************************************/
 
 static DWORD OptionLevelMap[]= {
-    SOL_SOCKET,                 /* osl_Socket_LevelSocket */
-    IPPROTO_TCP,                /* osl_Socket_LevelTcp */
-    0                           /* osl_invalid_SocketLevel */
+    SOL_SOCKET,					/* osl_Socket_LevelSocket */
+    IPPROTO_TCP,				/* osl_Socket_LevelTcp */
+    0							/* osl_invalid_SocketLevel */
 };
 
 /* macros */
-#define OPTION_LEVEL_TO_NATIVE(x)       OptionLevelMap[x]
-#define OPTION_LEVEL_FROM_NATIVE(y)     osl_SocketOptionLevelFromNative(y)
+#define OPTION_LEVEL_TO_NATIVE(x)		OptionLevelMap[x]
+#define OPTION_LEVEL_FROM_NATIVE(y)		osl_SocketOptionLevelFromNative(y)
 
 /*****************************************************************************/
 /* enum oslSocketMsgFlag */
 /*****************************************************************************/
 
 static DWORD SocketMsgFlagMap[]= {
-    0,                          /* osl_Socket_MsgNormal */
-    MSG_OOB,                    /* osl_Socket_MsgOOB */
-    MSG_PEEK,                   /* osl_Socket_MsgPeek */
-    MSG_DONTROUTE,              /* osl_Socket_MsgDontRoute */
-    MSG_MAXIOVLEN               /* osl_Socket_MsgMaxIOVLen */
+    0,							/* osl_Socket_MsgNormal */
+    MSG_OOB,					/* osl_Socket_MsgOOB */
+    MSG_PEEK,					/* osl_Socket_MsgPeek */
+    MSG_DONTROUTE,				/* osl_Socket_MsgDontRoute */
+    MSG_MAXIOVLEN				/* osl_Socket_MsgMaxIOVLen */
 };
 
 /* macros */
-#define MSG_FLAG_TO_NATIVE(x)       SocketMsgFlagMap[x]
-#define MSG_FLAG_FROM_NATIVE(y)     osl_SocketMsgFlagFromNative(y)
+#define MSG_FLAG_TO_NATIVE(x)		SocketMsgFlagMap[x]
+#define MSG_FLAG_FROM_NATIVE(y)		osl_SocketMsgFlagFromNative(y)
 
 /*****************************************************************************/
 /* enum oslSocketDirection */
 /*****************************************************************************/
 
 static DWORD SocketDirection[]= {
-    SD_RECEIVE,                 /* osl_Socket_DirRead */
-    SD_SEND,                    /* osl_Socket_DirWrite */
-    SD_BOTH                     /* osl_Socket_DirReadwrite */
+    SD_RECEIVE,					/* osl_Socket_DirRead */
+    SD_SEND,					/* osl_Socket_DirWrite */
+    SD_BOTH						/* osl_Socket_DirReadwrite */
 };
 
 /* macros */
-#define DIRECTION_TO_NATIVE(x)      SocketDirection[x]
-#define DIRECTION_FROM_NATIVE(y)    osl_SocketDirectionFromNative(y)
+#define DIRECTION_TO_NATIVE(x)		SocketDirection[x]
+#define DIRECTION_FROM_NATIVE(y)	osl_SocketDirectionFromNative(y)
 
 /*****************************************************************************/
 /* enum oslSocketError */
@@ -232,38 +232,38 @@ static DWORD SocketDirection[]= {
 
 static int SocketError[]= {
 
-    0,                  /* no error */
-    WSAENOTSOCK,            /* Socket operation on non-socket */
-    WSAEDESTADDRREQ,        /* Destination address required */
-    WSAEMSGSIZE,            /* Message too long */
-    WSAEPROTOTYPE,          /* Protocol wrong type for socket */
-    WSAENOPROTOOPT,     /* Protocol not available */
-    WSAEPROTONOSUPPORT, /* Protocol not supported */
-    WSAESOCKTNOSUPPORT, /* Socket type not supported */
-    WSAEOPNOTSUPP,          /* Operation not supported on socket */
-    WSAEPFNOSUPPORT,        /* Protocol family not supported */
-    WSAEAFNOSUPPORT,        /* Address family not supported by */
+    0,					/* no error */
+    WSAENOTSOCK,			/* Socket operation on non-socket */
+    WSAEDESTADDRREQ,		/* Destination address required */
+    WSAEMSGSIZE,			/* Message too long */
+    WSAEPROTOTYPE,			/* Protocol wrong type for socket */
+    WSAENOPROTOOPT,		/* Protocol not available */
+    WSAEPROTONOSUPPORT,	/* Protocol not supported */
+    WSAESOCKTNOSUPPORT,	/* Socket type not supported */
+    WSAEOPNOTSUPP,			/* Operation not supported on socket */
+    WSAEPFNOSUPPORT,		/* Protocol family not supported */
+    WSAEAFNOSUPPORT,		/* Address family not supported by */
                             /* protocol family */
-    WSAEADDRINUSE,          /* Address already in use */
-    WSAEADDRNOTAVAIL,       /* Can't assign requested address */
-    WSAENETDOWN,            /* Network is down */
-    WSAENETUNREACH,     /* Network is unreachable */
-    WSAENETRESET,           /* Network dropped connection because */
+    WSAEADDRINUSE,			/* Address already in use */
+    WSAEADDRNOTAVAIL,		/* Can't assign requested address */
+    WSAENETDOWN,			/* Network is down */
+    WSAENETUNREACH,		/* Network is unreachable */
+    WSAENETRESET,			/* Network dropped connection because */
                             /* of reset */
-    WSAECONNABORTED,        /* Software caused connection abort */
-    WSAECONNRESET,          /* Connection reset by peer */
-    WSAENOBUFS,         /* No buffer space available */
-    WSAEISCONN,         /* Socket is already connected */
-    WSAENOTCONN,            /* Socket is not connected */
-    WSAESHUTDOWN,           /* Can't send after socket shutdown */
-    WSAETOOMANYREFS,        /* Too many references: can't splice */
-    WSAETIMEDOUT,           /* Connection timed out */
-    WSAECONNREFUSED,        /* Connection refused */
-    WSAEHOSTDOWN,           /* Host is down */
-    WSAEHOSTUNREACH,        /* No route to host */
-    WSAEWOULDBLOCK,     /* call would block on non-blocking socket */
-    WSAEALREADY,            /* operation already in progress */
-    WSAEINPROGRESS      /* operation now in progress */
+    WSAECONNABORTED,		/* Software caused connection abort */
+    WSAECONNRESET,			/* Connection reset by peer */
+    WSAENOBUFS,			/* No buffer space available */
+    WSAEISCONN,			/* Socket is already connected */
+    WSAENOTCONN,			/* Socket is not connected */
+    WSAESHUTDOWN,			/* Can't send after socket shutdown */
+    WSAETOOMANYREFS,		/* Too many references: can't splice */
+    WSAETIMEDOUT,			/* Connection timed out */
+    WSAECONNREFUSED,		/* Connection refused */
+    WSAEHOSTDOWN,			/* Host is down */
+    WSAEHOSTUNREACH,		/* No route to host */
+    WSAEWOULDBLOCK,		/* call would block on non-blocking socket */
+    WSAEALREADY,			/* operation already in progress */
+    WSAEINPROGRESS		/* operation now in progress */
 };
 
 /* reverse map */
@@ -282,8 +282,8 @@ static oslSocketError osl_SocketErrorFromNative(int nativeType)
 }
 
 /* macros */
-#define ERROR_TO_NATIVE(x)      SocketError[x]
-#define ERROR_FROM_NATIVE(y)    osl_SocketErrorFromNative(y)
+#define ERROR_TO_NATIVE(x)		SocketError[x]
+#define ERROR_FROM_NATIVE(y)	osl_SocketErrorFromNative(y)
 
 /*****************************************************************************/
 /* oslSocketDialupImpl */
@@ -501,7 +501,7 @@ static oslSocketAddr __osl_createSocketAddrWithFamily(
         pInetAddr->sin_addr.s_addr = nAddr;
         pInetAddr->sin_port = (sal_uInt16)(port&0xffff);
         break;
-       }
+       }   	
     default:
         pAddr->m_sockaddr.sa_family = FAMILY_TO_NATIVE(family);
     }
@@ -657,7 +657,7 @@ oslSocketAddr SAL_CALL osl_createInetSocketAddr (
     sal_Int32    Port)
 {
     DWORD Addr;
-    rtl_String  *pDottedAddr=NULL;
+    rtl_String	*pDottedAddr=NULL;
 
     rtl_uString2String(
         &pDottedAddr, strDottedAddr->buffer, strDottedAddr->length,
@@ -1092,7 +1092,7 @@ oslSocketResult SAL_CALL osl_getHostnameOfSocketAddr (
 /*****************************************************************************/
 /* osl_getDottedInetAddrOfSocketAddr */
 /*****************************************************************************/
-oslSocketResult SAL_CALL osl_getDottedInetAddrOfSocketAddr (
+oslSocketResult	SAL_CALL osl_getDottedInetAddrOfSocketAddr (
     oslSocketAddr   pAddr,
     rtl_uString   **strDottedInetAddr)
 {
@@ -1141,9 +1141,9 @@ oslSocket SAL_CALL osl_createSocket (
     }
     else
     {
-        pSocket->m_Flags            = 0;
-        pSocket->m_CloseCallback    = NULL;
-        pSocket->m_CallbackArg  = NULL;
+        pSocket->m_Flags			= 0;
+        pSocket->m_CloseCallback	= NULL;
+        pSocket->m_CallbackArg	= NULL;
     }
 
     return pSocket;
@@ -1272,7 +1272,7 @@ oslSocketResult SAL_CALL osl_connectSocketTo (
     else
     {
         fd_set          fds;
-        int             error;
+        int	            error;
         struct timeval  tv;
         unsigned long   Param;
         oslSocketResult Result= osl_Socket_Ok;
@@ -1333,8 +1333,8 @@ oslSocketResult SAL_CALL osl_connectSocketTo (
         FD_SET(pSocket->m_Socket, &fds);
 
         /* divide milliseconds into seconds and microseconds */
-        tv.tv_sec=  pTimeout->Seconds;
-        tv.tv_usec= pTimeout->Nanosec / 1000L;
+        tv.tv_sec=	pTimeout->Seconds;
+        tv.tv_usec=	pTimeout->Nanosec / 1000L;
 
         /* select */
         error= select(pSocket->m_Socket+1,
@@ -1416,7 +1416,7 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket (
         /* user wants to know peer Addr */
         struct sockaddr Addr;
 
-        Connection= accept(pSocket->m_Socket, &Addr, &AddrLen);
+        Connection=	accept(pSocket->m_Socket, &Addr, &AddrLen);
         OSL_ASSERT(AddrLen == sizeof(struct sockaddr));
 
         if(Connection != OSL_SOCKET_ERROR)
@@ -1427,7 +1427,7 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket (
     else
     {
         /* user is not interested in peer-addr */
-        Connection= accept(pSocket->m_Socket, 0, 0);
+        Connection=	accept(pSocket->m_Socket, 0, 0);
     }
 
     /* accept failed? */
@@ -1438,9 +1438,9 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket (
     oslSocket  pConnectionSocket;
     pConnectionSocket= __osl_createSocketImpl(Connection);
 
-    pConnectionSocket->m_Flags          = 0;
-    pConnectionSocket->m_CloseCallback  = NULL;
-    pConnectionSocket->m_CallbackArg    = NULL;
+    pConnectionSocket->m_Flags			= 0;
+    pConnectionSocket->m_CloseCallback	= NULL;
+    pConnectionSocket->m_CallbackArg	= NULL;
 
     return pConnectionSocket;
 }
@@ -1626,11 +1626,11 @@ sal_Bool SAL_CALL osl_isReceiveReady (
         tv.tv_usec = pTimeout->Nanosec / 1000L;
     }
 
-    return (select(pSocket->m_Socket + 1,       /* no of sockets to monitor */
-                   &fds,                        /* check read operations */
-                   0,                           /* check write ops */
-                   0,                           /* ckeck for OOB */
-                   (pTimeout) ? &tv : 0)==1);   /* use timeout? */
+    return (select(pSocket->m_Socket + 1,		/* no of sockets to monitor */
+                   &fds,						/* check read operations */
+                   0,							/* check write ops */
+                   0,							/* ckeck for OOB */
+                   (pTimeout) ? &tv : 0)==1);	/* use timeout? */
 }
 
 /*****************************************************************************/
@@ -1655,11 +1655,11 @@ sal_Bool SAL_CALL osl_isSendReady (
         tv.tv_usec = pTimeout->Nanosec / 1000L;
     }
 
-    return (select(pSocket->m_Socket + 1,       /* no of sockets to monitor */
-                   0,                           /* check read operations */
-                   &fds,                        /* check write ops */
-                   0,                           /* ckeck for OOB */
-                   (pTimeout) ? &tv : 0)==1);   /* use timeout? */
+    return (select(pSocket->m_Socket + 1,		/* no of sockets to monitor */
+                   0,							/* check read operations */
+                   &fds,						/* check write ops */
+                   0,							/* ckeck for OOB */
+                   (pTimeout) ? &tv : 0)==1);	/* use timeout? */
 }
 
 /*****************************************************************************/
@@ -1684,11 +1684,11 @@ sal_Bool SAL_CALL osl_isExceptionPending (
         tv.tv_usec = pTimeout->Nanosec / 1000L;
     }
 
-    return (select(pSocket->m_Socket + 1,       /* no of sockets to monitor */
-                   0,                           /* check read operations */
-                   0,                           /* check write ops */
-                   &fds,                        /* ckeck for OOB */
-                   (pTimeout) ? &tv : 0)==1);   /* use timeout? */
+    return (select(pSocket->m_Socket + 1,	    /* no of sockets to monitor */
+                   0,							/* check read operations */
+                   0,							/* check write ops */
+                   &fds,						/* ckeck for OOB */
+                   (pTimeout) ? &tv : 0)==1);	/* use timeout? */
 }
 
 /*****************************************************************************/
@@ -1807,7 +1807,7 @@ oslSocketType SAL_CALL osl_getSocketType(oslSocket pSocket)
 /*****************************************************************************/
 void SAL_CALL osl_getLastSocketErrorDescription (
     oslSocket  /*Socket*/,
-    rtl_uString **strError)
+    rtl_uString	**strError)
 {
     int error;
 
@@ -2039,7 +2039,7 @@ oslSocketError SAL_CALL osl_getLastSocketError(oslSocket /*Socket*/)
 /*****************************************************************************/
 typedef struct _TSocketSetImpl
 {
-    fd_set  m_Set;          /* the set of descriptors */
+    fd_set	m_Set;			/* the set of descriptors */
 
 } TSocketSetImpl;
 
@@ -2162,7 +2162,7 @@ sal_Int32 SAL_CALL osl_demultiplexSocketEvents (
     pOutSet= (TSocketSetImpl*)OutgoingSet;
     pOOBSet= (TSocketSetImpl*)OutOfBandSet;
 
-    return select(MaxHandle,                /* redundant in WIN32 */
+    return select(MaxHandle,				/* redundant in WIN32 */
                   pInSet ? &pInSet->m_Set : 0,
                   pOutSet ? &pOutSet->m_Set : 0,
                   pOOBSet ? &pOOBSet->m_Set : 0,
diff --git a/sal/osl/w32/sockimpl.h b/sal/osl/w32/sockimpl.h
index 5887df981c4a..6bffb9f4aeae 100644
--- a/sal/osl/w32/sockimpl.h
+++ b/sal/osl/w32/sockimpl.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,16 +39,16 @@ extern "C" {
 /*****************************************************************************/
 /* oslSocketImpl */
 /*****************************************************************************/
-#define OSL_SOCKET_FLAGS_NONBLOCKING    0x0001
+#define OSL_SOCKET_FLAGS_NONBLOCKING	0x0001
 
 typedef void* (SAL_CALL * oslCloseCallback) (void*);
 
 struct oslSocketImpl {
     oslInterlockedCount m_nRefCount;
-    SOCKET              m_Socket;
-    int                 m_Flags;
-    oslCloseCallback    m_CloseCallback;
-    void*               m_CallbackArg;
+    SOCKET				m_Socket;
+    int					m_Flags;
+    oslCloseCallback	m_CloseCallback;
+    void*				m_CallbackArg;
 };
 
 struct oslSocketAddrImpl
@@ -56,7 +56,7 @@ struct oslSocketAddrImpl
     struct sockaddr m_sockaddr;
     oslInterlockedCount m_nRefCount;
 };
-
+    
 oslSocket __osl_createSocketImpl(SOCKET Socket);
 void __osl_destroySocketImpl(oslSocket pImpl);
 
@@ -104,7 +104,7 @@ static sal_Bool __osl_attemptSocketDialupImpl (void);
 }
 #endif
 
-#endif
+#endif 
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/system.h b/sal/osl/w32/system.h
index 491c2daa7bbe..76dc9281c282 100644
--- a/sal/osl/w32/system.h
+++ b/sal/osl/w32/system.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,8 +31,8 @@
 #endif
 
 #ifndef _WIN32_WINNT
-#   define _WIN32_WINNT 0x0400
-#   define _CTYPE_DISABLE_MACROS /* wg. dynamischer C-Runtime MH */
+#	define _WIN32_WINNT 0x0400
+#	define _CTYPE_DISABLE_MACROS /* wg. dynamischer C-Runtime MH */
 #endif
 
 #include <stdio.h>
@@ -85,13 +85,13 @@
     #pragma warning(pop)
 #endif
 
-#define _MAX_CMD    4096    /* maximum length of commandline     */
-/* #define _MAX_ENV 4096     maximum length of environment var (isn't used anywhere) */
+#define _MAX_CMD	4096	/* maximum length of commandline     */
+/* #define _MAX_ENV	4096	 maximum length of environment var (isn't used anywhere) */
 
 #ifdef GCC
-    #   ifndef SA_FAMILY_DECL
-    #       define SA_FAMILY_DECL short sa_family
-    #   endif
+    #	ifndef SA_FAMILY_DECL
+    #		define SA_FAMILY_DECL short sa_family
+    #	endif
 
     typedef struct sockaddr_ipx {
         SA_FAMILY_DECL;
@@ -100,9 +100,9 @@
         unsigned short sa_socket;
     } SOCKADDR_IPX;
 
-    #   define NSPROTO_IPX      1000
-    #   define NSPROTO_SPX      1256
-    #   define NSPROTO_SPXII    1257
+    #	define NSPROTO_IPX		1000
+    #	define NSPROTO_SPX		1256
+    #	define NSPROTO_SPXII	1257
 #endif // #ifdef GCC
 
 #ifdef _DLL_
diff --git a/sal/osl/w32/tempfile.cxx b/sal/osl/w32/tempfile.cxx
index 9922b699a932..2b43af005558 100644
--- a/sal/osl/w32/tempfile.cxx
+++ b/sal/osl/w32/tempfile.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@
 #include <tchar.h>
 
 //#####################################################
-// Allocate n number of t's on the stack return a pointer to it in p
+// Allocate n number of t's on the stack return a pointer to it in p 
 #ifdef __MINGW32__
 #define STACK_ALLOC(p, t, n) (p) = reinterpret_cast<t*>(_alloca((n)*sizeof(t)));
 #else
@@ -56,33 +56,33 @@ extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle(HANDLE hFile,
 //#####################################################
 // Temp file functions
 //#####################################################
-
+        
 static oslFileError osl_setup_base_directory_impl_(
     rtl_uString*  pustrDirectoryURL,
     rtl_uString** ppustr_base_dir)
-{
+{    
     rtl_uString* dir_url = 0;
-    rtl_uString* dir     = 0;
+    rtl_uString* dir     = 0;        
     oslFileError error   = osl_File_E_None;
-
+        
     if (pustrDirectoryURL)
-        rtl_uString_assign(&dir_url, pustrDirectoryURL);
-    else
-        error = osl_getTempDirURL(&dir_url);
+        rtl_uString_assign(&dir_url, pustrDirectoryURL);         
+    else 
+        error = osl_getTempDirURL(&dir_url);                     	    	           				
 
-    if (osl_File_E_None == error)
+    if (osl_File_E_None == error)        
     {
-        error = _osl_getSystemPathFromFileURL(dir_url, &dir, sal_False);
+        error = _osl_getSystemPathFromFileURL(dir_url, &dir, sal_False);                           
         rtl_uString_release(dir_url);
     }
-
+              
     if (osl_File_E_None == error )
     {
-        rtl_uString_assign(ppustr_base_dir, dir);
+        rtl_uString_assign(ppustr_base_dir, dir);        
         rtl_uString_release(dir);
     }
-
-    return error;
+        
+    return error;	
 }
 
 //#####################################################
@@ -94,21 +94,21 @@ static oslFileError osl_setup_createTempFile_impl_(
     sal_Bool*      b_delete_on_close)
 {
     oslFileError osl_error;
-
+        
     OSL_PRECOND(((0 != pHandle) || (0 != ppustrTempFileURL)), "Invalid parameter!");
-
-    if ((0 == pHandle) && (0 == ppustrTempFileURL))
+            
+    if ((0 == pHandle) && (0 == ppustrTempFileURL))    
     {
         osl_error = osl_File_E_INVAL;
     }
     else
-    {
+    {        
         osl_error = osl_setup_base_directory_impl_(
             pustrDirectoryURL, ppustr_base_dir);
-
+                
         *b_delete_on_close = (sal_Bool)(0 == ppustrTempFileURL);
     }
-
+           
     return osl_error;
 }
 
@@ -117,16 +117,16 @@ static oslFileError osl_win32_GetTempFileName_impl_(
     rtl_uString* base_directory, LPWSTR temp_file_name)
 {
     oslFileError osl_error = osl_File_E_None;
-
+           
     if (0 == GetTempFileNameW(
             reinterpret_cast<LPCWSTR>(rtl_uString_getStr(base_directory)),
             L"",
             0,
             temp_file_name))
-    {
+    {    
         osl_error = oslTranslateFileError(GetLastError());
     }
-
+           
     return osl_error;
 }
 
@@ -136,89 +136,89 @@ static sal_Bool osl_win32_CreateFile_impl_(
 {
     DWORD  flags = FILE_ATTRIBUTE_NORMAL;
     HANDLE hFile;
-
+        
     OSL_ASSERT(p_handle);
-
+        
     if (b_delete_on_close)
         flags |= FILE_FLAG_DELETE_ON_CLOSE;
-
+            
     hFile = CreateFileW(
         file_name,
         GENERIC_READ | GENERIC_WRITE,
-        0,
-        NULL,
-        TRUNCATE_EXISTING,
+        0,  
+        NULL, 
+        TRUNCATE_EXISTING, 
         flags,
         NULL);
-
+                
     // @@@ ERROR HANDLING @@@
-    if (IsValidHandle(hFile))
+    if (IsValidHandle(hFile))        
         *p_handle = osl_createFileHandleFromOSHandle(hFile, osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
-
+        
     return (sal_Bool)IsValidHandle(hFile);
 }
 
-//#############################################
+//############################################# 
 static oslFileError osl_createTempFile_impl_(
-    rtl_uString*   base_directory,
+    rtl_uString*   base_directory, 
     LPWSTR         tmp_name,
     sal_Bool       b_delete_on_close,
     oslFileHandle* pHandle,
     rtl_uString**  ppustrTempFileURL)
 {
     oslFileError osl_error;
-
+        
     do
-    {
+    {       
         osl_error = osl_win32_GetTempFileName_impl_(base_directory, tmp_name);
-
-        /*  if file could not be opened try again */
-
-        if ((osl_File_E_None != osl_error) || (0 == pHandle) ||
-            osl_win32_CreateFile_impl_(tmp_name, b_delete_on_close, pHandle))
+            
+        /*  if file could not be opened try again */                                                     
+                
+        if ((osl_File_E_None != osl_error) || (0 == pHandle) || 
+            osl_win32_CreateFile_impl_(tmp_name, b_delete_on_close, pHandle)) 
             break;
-
+                                                                        
     } while(1); // try until success
-
-    if ((osl_File_E_None == osl_error) && !b_delete_on_close)
+            
+    if ((osl_File_E_None == osl_error) && !b_delete_on_close)        
     {
-        rtl_uString* pustr = 0;
-        rtl_uString_newFromStr(&pustr, reinterpret_cast<const sal_Unicode*>(tmp_name));
+        rtl_uString* pustr = 0;                
+        rtl_uString_newFromStr(&pustr, reinterpret_cast<const sal_Unicode*>(tmp_name));        
         osl_getFileURLFromSystemPath(pustr, ppustrTempFileURL);
         rtl_uString_release(pustr);
     }
-
+        
     return osl_error;
 }
-
+    
 //#############################################
-oslFileError SAL_CALL osl_createTempFile(
+oslFileError SAL_CALL osl_createTempFile(    
     rtl_uString*   pustrDirectoryURL,
-    oslFileHandle* pHandle,
+    oslFileHandle* pHandle, 
     rtl_uString**  ppustrTempFileURL)
 {
-    rtl_uString*    base_directory = 0;
-    LPWSTR          tmp_name;
+    rtl_uString*    base_directory = 0;            
+    LPWSTR          tmp_name;        
     sal_Bool        b_delete_on_close;
-    oslFileError    osl_error;
-
+    oslFileError    osl_error;        
+    
     osl_error = osl_setup_createTempFile_impl_(
         pustrDirectoryURL,
         pHandle,
         ppustrTempFileURL,
         &base_directory,
         &b_delete_on_close);
-
+        
     if (osl_File_E_None != osl_error)
         return osl_error;
-
+   
     /* allocate enough space on the stack, the file name can not be longer than MAX_PATH */
     STACK_ALLOC(tmp_name, WCHAR, (rtl_uString_getLength(base_directory) + MAX_PATH));
-
+    
     if (tmp_name)
     {
         osl_createTempFile_impl_(
-            base_directory,
+            base_directory, 
             tmp_name,
             b_delete_on_close,
             pHandle,
@@ -228,10 +228,10 @@ oslFileError SAL_CALL osl_createTempFile(
     {
         osl_error = osl_File_E_NOMEM;
     }
-
+            
     if (base_directory)
         rtl_uString_release(base_directory);
-
+                
     return osl_error;
 }
 
@@ -239,11 +239,11 @@ oslFileError SAL_CALL osl_createTempFile(
 oslFileError SAL_CALL osl_getTempDirURL(rtl_uString** pustrTempDir)
 {
     ::osl::LongPathBuffer< sal_Unicode > aBuffer( MAX_LONG_PATH );
-    LPWSTR  lpBuffer = ::osl::mingw_reinterpret_cast<LPWSTR>(aBuffer);
-    DWORD   nBufferLength = aBuffer.getBufSizeInSymbols() - 1;
+    LPWSTR	lpBuffer = ::osl::mingw_reinterpret_cast<LPWSTR>(aBuffer);
+    DWORD	nBufferLength = aBuffer.getBufSizeInSymbols() - 1;
 
-    DWORD           nLength;
-    oslFileError    error;
+    DWORD			nLength;
+    oslFileError	error;
 
     nLength = GetTempPathW( aBuffer.getBufSizeInSymbols(), lpBuffer );
 
@@ -254,7 +254,7 @@ oslFileError SAL_CALL osl_getTempDirURL(rtl_uString** pustrTempDir)
     }
     else if ( nLength )
     {
-        rtl_uString *ustrTempPath = NULL;
+        rtl_uString	*ustrTempPath = NULL;
 
         if ( '\\' == lpBuffer[nLength-1] )
             lpBuffer[nLength-1] = 0;
diff --git a/sal/osl/w32/thread.c b/sal/osl/w32/thread.c
index 92ac312d5a4e..67b8313832c9 100644
--- a/sal/osl/w32/thread.c
+++ b/sal/osl/w32/thread.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,19 +36,19 @@
 #include <rtl/tencinfo.h>
 
 /*
-    Thread-data structure hidden behind oslThread:
+    Thread-data structure hidden behind oslThread:	
 */
-typedef struct _osl_TThreadImpl
+typedef struct _osl_TThreadImpl 
 {
-    HANDLE              m_hThread;      /* OS-handle used for all thread-functions */
-    unsigned            m_ThreadId;     /* identifier for this thread */
-    sal_Int32           m_nTerminationRequested;
-    oslWorkerFunction   m_WorkerFunction;
-    void*               m_pData;
+    HANDLE				m_hThread;		/* OS-handle used for all thread-functions */
+    unsigned			m_ThreadId;		/* identifier for this thread */
+    sal_Int32			m_nTerminationRequested;
+    oslWorkerFunction	m_WorkerFunction;
+    void*				m_pData;
 
 } osl_TThreadImpl;
 
-#define THREADIMPL_FLAGS_TERMINATE  0x0001
+#define THREADIMPL_FLAGS_TERMINATE	0x0001
 
 static unsigned __stdcall oslWorkerWrapperFunction(void* pData);
 static oslThread oslCreateThread(oslWorkerFunction pWorker, void* pThreadData, sal_uInt32 nFlags);
@@ -69,7 +69,7 @@ static unsigned __stdcall oslWorkerWrapperFunction(void* pData)
     pThreadImpl->m_WorkerFunction(pThreadImpl->m_pData);
 
     CoUninitialize();
-
+    
     return (0);
 }
 
@@ -91,20 +91,20 @@ static oslThread oslCreateThread(oslWorkerFunction pWorker,
     {
         return 0;
     }
-
+    
     pThreadImpl->m_WorkerFunction= pWorker;
     pThreadImpl->m_pData= pThreadData;
     pThreadImpl->m_nTerminationRequested= 0;
 
-    pThreadImpl->m_hThread=
-        (HANDLE)_beginthreadex(NULL,                        /* no security */
-                               0,                           /* default stack-size */
-                               oslWorkerWrapperFunction,    /* worker-function */
-                               pThreadImpl,                 /* provide worker-function with data */
-                               nFlags,                      /* start thread immediately or suspended */
+    pThreadImpl->m_hThread= 
+        (HANDLE)_beginthreadex(NULL,						/* no security */
+                               0,							/* default stack-size */
+                               oslWorkerWrapperFunction,	/* worker-function */
+                               pThreadImpl,					/* provide worker-function with data */
+                               nFlags,						/* start thread immediately or suspended */
                                &pThreadImpl->m_ThreadId);
 
-    if(pThreadImpl->m_hThread == 0)
+    if(pThreadImpl->m_hThread == 0) 
     {
         /* create failed */
         free(pThreadImpl);
@@ -127,7 +127,7 @@ oslThread SAL_CALL osl_createThread(oslWorkerFunction pWorker,
 /* osl_createSuspendedThread */
 /*****************************************************************************/
 oslThread SAL_CALL osl_createSuspendedThread(oslWorkerFunction pWorker,
-                                             void* pThreadData)
+                                             void* pThreadData) 
 {
     return oslCreateThread(pWorker, pThreadData, CREATE_SUSPENDED);
 }
@@ -148,7 +148,7 @@ oslThreadIdentifier SAL_CALL osl_getThreadIdentifier(oslThread Thread)
 /*****************************************************************************/
 /* osl_destroyThread */
 /*****************************************************************************/
-void SAL_CALL osl_destroyThread(oslThread Thread)
+void SAL_CALL osl_destroyThread(oslThread Thread) 
 {
     osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
 
@@ -172,21 +172,21 @@ void SAL_CALL osl_resumeThread(oslThread Thread)
 {
     osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
 
-    OSL_ASSERT(pThreadImpl);        /* valid ptr? */
+    OSL_ASSERT(pThreadImpl);		/* valid ptr? */
 
-    ResumeThread(pThreadImpl->m_hThread);
+    ResumeThread(pThreadImpl->m_hThread);	
 }
 
 /*****************************************************************************/
 /* osl_suspendThread */
 /*****************************************************************************/
-void SAL_CALL osl_suspendThread(oslThread Thread)
+void SAL_CALL osl_suspendThread(oslThread Thread) 
 {
     osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
 
-    OSL_ASSERT(pThreadImpl);        /* valid ptr? */
+    OSL_ASSERT(pThreadImpl);		/* valid ptr? */
 
-    SuspendThread(pThreadImpl->m_hThread);
+    SuspendThread(pThreadImpl->m_hThread);	
 }
 
 /*****************************************************************************/
@@ -197,11 +197,11 @@ void SAL_CALL osl_setThreadPriority(oslThread Thread,
 {
     int winPriority;
     osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
-
-    OSL_ASSERT(pThreadImpl);        /* valid ptr? */
+    
+    OSL_ASSERT(pThreadImpl);		/* valid ptr? */
 
 
-    /*  map enum to WIN32 levels
+    /*	map enum to WIN32 levels 
         it would be faster and more elegant to preset
         the enums, but that would require an #ifdef in
         the exported header, which is not desired.
@@ -229,14 +229,14 @@ void SAL_CALL osl_setThreadPriority(oslThread Thread,
         break;
 
     case osl_Thread_PriorityUnknown:
-        OSL_ASSERT(FALSE);      /* only fools try this...*/
+        OSL_ASSERT(FALSE);		/* only fools try this...*/
 
         /* let release-version behave friendly */
         return;
 
     default:
-        OSL_ASSERT(FALSE);      /* enum expanded, but forgotten here...*/
-
+        OSL_ASSERT(FALSE);		/* enum expanded, but forgotten here...*/
+        
         /* let release-version behave friendly */
         return;
     }
@@ -255,7 +255,7 @@ oslThreadPriority SAL_CALL osl_getThreadPriority(const oslThread Thread)
     osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
 
     /* invalid arguments ?*/
-    if(pThreadImpl==0 || pThreadImpl->m_hThread==0)
+    if(pThreadImpl==0 || pThreadImpl->m_hThread==0) 
     {
         return osl_Thread_PriorityUnknown;
     }
@@ -264,13 +264,13 @@ oslThreadPriority SAL_CALL osl_getThreadPriority(const oslThread Thread)
         GetThreadPriority(pThreadImpl->m_hThread);
 
 
-    if(winPriority == THREAD_PRIORITY_ERROR_RETURN)
+    if(winPriority == THREAD_PRIORITY_ERROR_RETURN) 
     {
         return osl_Thread_PriorityUnknown;
     }
 
     /* map WIN32 priority to enum */
-    switch(winPriority)
+    switch(winPriority) 
     {
     case THREAD_PRIORITY_TIME_CRITICAL:
     case THREAD_PRIORITY_HIGHEST:
@@ -295,7 +295,7 @@ oslThreadPriority SAL_CALL osl_getThreadPriority(const oslThread Thread)
         break;
 
     default:
-        OSL_ASSERT(FALSE);      /* WIN32 API changed, incorporate new prio-level! */
+        OSL_ASSERT(FALSE);		/* WIN32 API changed, incorporate new prio-level! */
 
         /* release-version behaves friendly */
         Priority= osl_Thread_PriorityUnknown;
@@ -307,12 +307,12 @@ oslThreadPriority SAL_CALL osl_getThreadPriority(const oslThread Thread)
 /*****************************************************************************/
 /* osl_isThreadRunning */
 /*****************************************************************************/
-sal_Bool SAL_CALL osl_isThreadRunning(const oslThread Thread)
+sal_Bool SAL_CALL osl_isThreadRunning(const oslThread Thread) 
 {
     osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
 
     /* invalid arguments ?*/
-    if(pThreadImpl==0 || pThreadImpl->m_hThread==0)
+    if(pThreadImpl==0 || pThreadImpl->m_hThread==0) 
     {
         return sal_False;
     }
@@ -328,7 +328,7 @@ void SAL_CALL osl_joinWithThread(oslThread Thread)
     osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
 
     /* invalid arguments?*/
-    if(pThreadImpl==0 || pThreadImpl->m_hThread==0)
+    if(pThreadImpl==0 || pThreadImpl->m_hThread==0) 
     {
         /* assume thread is not running */
         return;
@@ -358,7 +358,7 @@ void SAL_CALL osl_terminateThread(oslThread Thread)
     osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)Thread;
 
     /* invalid arguments?*/
-    if (pThreadImpl==0 || pThreadImpl->m_hThread==0)
+    if (pThreadImpl==0 || pThreadImpl->m_hThread==0) 
     {
         /* assume thread is not running */
         return;
@@ -378,7 +378,7 @@ sal_Bool SAL_CALL osl_scheduleThread(oslThread Thread)
     osl_yieldThread();
 
     /* invalid arguments?*/
-    if (pThreadImpl==0 || pThreadImpl->m_hThread==0)
+    if (pThreadImpl==0 || pThreadImpl->m_hThread==0) 
     {
         /* assume thread is not running */
         return sal_False;
@@ -397,13 +397,13 @@ void SAL_CALL osl_yieldThread(void)
 
 typedef struct _TLS
 {
-    DWORD                           dwIndex;
-    oslThreadKeyCallbackFunction    pfnCallback;
-    struct _TLS                     *pNext, *pPrev;
+    DWORD							dwIndex;
+    oslThreadKeyCallbackFunction	pfnCallback;
+    struct _TLS						*pNext, *pPrev;
 } TLS, *PTLS;
 
-static  PTLS        g_pThreadKeyList = NULL;
-CRITICAL_SECTION    g_ThreadKeyListCS;
+static	PTLS		g_pThreadKeyList = NULL;
+CRITICAL_SECTION	g_ThreadKeyListCS;
 
 static void AddKeyToList( PTLS pTls )
 {
@@ -413,7 +413,7 @@ static void AddKeyToList( PTLS pTls )
 
         pTls->pNext = g_pThreadKeyList;
         pTls->pPrev = 0;
-
+        
         if ( g_pThreadKeyList )
             g_pThreadKeyList->pPrev = pTls;
 
@@ -444,8 +444,8 @@ static void RemoveKeyFromList( PTLS pTls )
 
 void SAL_CALL _osl_callThreadKeyCallbackOnThreadDetach(void)
 {
-    PTLS    pTls;
-
+    PTLS	pTls;
+    
 
     EnterCriticalSection( &g_ThreadKeyListCS );
     pTls = g_pThreadKeyList;
@@ -453,7 +453,7 @@ void SAL_CALL _osl_callThreadKeyCallbackOnThreadDetach(void)
     {
         if ( pTls->pfnCallback )
         {
-            void    *pValue = TlsGetValue( pTls->dwIndex );
+            void	*pValue	= TlsGetValue( pTls->dwIndex );
 
             if ( pValue )
                 pTls->pfnCallback( pValue );
@@ -469,7 +469,7 @@ void SAL_CALL _osl_callThreadKeyCallbackOnThreadDetach(void)
 /*****************************************************************************/
 oslThreadKey SAL_CALL osl_createThreadKey(oslThreadKeyCallbackFunction pCallback)
 {
-    PTLS    pTls = rtl_allocateMemory( sizeof(TLS) );
+    PTLS	pTls = rtl_allocateMemory( sizeof(TLS) );
 
     if ( pTls )
     {
@@ -493,7 +493,7 @@ void SAL_CALL osl_destroyThreadKey(oslThreadKey Key)
 {
     if (Key != 0)
     {
-        PTLS    pTls = (PTLS)Key;
+        PTLS	pTls = (PTLS)Key;
 
         RemoveKeyFromList( pTls );
         TlsFree( pTls->dwIndex );
@@ -508,7 +508,7 @@ void* SAL_CALL osl_getThreadKeyData(oslThreadKey Key)
 {
     if (Key != 0)
     {
-        PTLS    pTls = (PTLS)Key;
+        PTLS	pTls = (PTLS)Key;
 
         return (TlsGetValue( pTls->dwIndex ));
     }
@@ -523,9 +523,9 @@ sal_Bool SAL_CALL osl_setThreadKeyData(oslThreadKey Key, void *pData)
 {
     if (Key != 0)
     {
-        PTLS    pTls = (PTLS)Key;
-        void*   pOldData = NULL;
-        BOOL    fSuccess;
+        PTLS	pTls = (PTLS)Key;
+        void*	pOldData = NULL;
+        BOOL	fSuccess;
 
         if ( pTls->pfnCallback )
             pOldData = TlsGetValue( pTls->dwIndex );
@@ -546,14 +546,14 @@ sal_Bool SAL_CALL osl_setThreadKeyData(oslThreadKey Key, void *pData)
 /* osl_getThreadTextEncoding */
 /*****************************************************************************/
 
-DWORD   g_dwTLSTextEncodingIndex = (DWORD)-1;
+DWORD	g_dwTLSTextEncodingIndex = (DWORD)-1;
 
 
 rtl_TextEncoding SAL_CALL osl_getThreadTextEncoding(void)
 {
-    DWORD               dwEncoding;
-    rtl_TextEncoding    _encoding;
-    BOOL                gotACP;
+    DWORD				dwEncoding;
+    rtl_TextEncoding	_encoding;
+    BOOL				gotACP;
 
     if ( (DWORD)-1 == g_dwTLSTextEncodingIndex )
         g_dwTLSTextEncodingIndex = TlsAlloc();
@@ -565,7 +565,7 @@ rtl_TextEncoding SAL_CALL osl_getThreadTextEncoding(void)
 
     if ( !gotACP )
     {
-        char    *pszEncoding;
+        char	*pszEncoding;
 
         if ( NULL != (pszEncoding = getenv( "SOLAR_USER_RTL_TEXTENCODING" )) )
             _encoding = (rtl_TextEncoding)atoi(pszEncoding);
diff --git a/sal/osl/w32/time.c b/sal/osl/w32/time.c
index a60028b18e92..6ce388d32b64 100644
--- a/sal/osl/w32/time.c
+++ b/sal/osl/w32/time.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 
 #include "system.h"
 
-#include <osl/diagnose.h>
+#include <osl/diagnose.h> 
 #include <osl/time.h>
 #include <sys/timeb.h>
 
@@ -42,9 +42,9 @@ extern BOOL FileTimeToTimeValue( const FILETIME *cpFTime, TimeValue *pTimeVal );
 
 sal_Bool SAL_CALL osl_getSystemTime(TimeValue* pTimeVal)
 {
-    SYSTEMTIME SystemTime;
+    SYSTEMTIME SystemTime; 
     FILETIME   CurTime, OffTime;
-    __int64    Value;
+    __int64	   Value;
 
     OSL_ASSERT(pTimeVal != 0);
 
@@ -76,26 +76,26 @@ sal_Bool SAL_CALL osl_getSystemTime(TimeValue* pTimeVal)
 
 sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( TimeValue* pTimeVal, oslDateTime* pDateTime )
 {
-    FILETIME    aFileTime;
-    SYSTEMTIME  aSystemTime;
+    FILETIME	aFileTime;
+    SYSTEMTIME	aSystemTime;
 
     if ( TimeValueToFileTime(pTimeVal, &aFileTime) )
     {
         if ( FileTimeToSystemTime( &aFileTime, &aSystemTime ) )
         {
-            pDateTime->NanoSeconds  =   pTimeVal->Nanosec;
+            pDateTime->NanoSeconds	=	pTimeVal->Nanosec;
 
-            pDateTime->Seconds      =   aSystemTime.wSecond;
-            pDateTime->Minutes      =   aSystemTime.wMinute;
-            pDateTime->Hours        =   aSystemTime.wHour;
-            pDateTime->Day          =   aSystemTime.wDay;
-            pDateTime->DayOfWeek    =   aSystemTime.wDayOfWeek;
-            pDateTime->Month        =   aSystemTime.wMonth;
-            pDateTime->Year         =   aSystemTime.wYear;
+            pDateTime->Seconds		=	aSystemTime.wSecond;
+            pDateTime->Minutes		=	aSystemTime.wMinute;
+            pDateTime->Hours		=	aSystemTime.wHour;
+            pDateTime->Day			=	aSystemTime.wDay;
+            pDateTime->DayOfWeek	=	aSystemTime.wDayOfWeek;
+            pDateTime->Month		=	aSystemTime.wMonth;
+            pDateTime->Year			=	aSystemTime.wYear;
 
             return sal_True;
         }
-    }
+    } 
 
     return sal_False;
 }
@@ -106,17 +106,17 @@ sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( TimeValue* pTimeVal, oslDateTime
 
 sal_Bool SAL_CALL osl_getTimeValueFromDateTime( oslDateTime* pDateTime, TimeValue* pTimeVal )
 {
-    FILETIME    aFileTime;
-    SYSTEMTIME  aSystemTime;
-
-    aSystemTime.wMilliseconds   =   0;
-    aSystemTime.wSecond         =   pDateTime->Seconds;
-    aSystemTime.wMinute         =   pDateTime->Minutes;
-    aSystemTime.wHour           =   pDateTime->Hours;
-    aSystemTime.wDay            =   pDateTime->Day;
-    aSystemTime.wDayOfWeek      =   pDateTime->DayOfWeek;
-    aSystemTime.wMonth          =   pDateTime->Month;
-    aSystemTime.wYear           =   pDateTime->Year;
+    FILETIME	aFileTime;
+    SYSTEMTIME	aSystemTime;
+
+    aSystemTime.wMilliseconds	=	0;
+    aSystemTime.wSecond			=	pDateTime->Seconds;
+    aSystemTime.wMinute			=	pDateTime->Minutes; 
+    aSystemTime.wHour			=	pDateTime->Hours;
+    aSystemTime.wDay			=	pDateTime->Day;
+    aSystemTime.wDayOfWeek		=	pDateTime->DayOfWeek;
+    aSystemTime.wMonth			=	pDateTime->Month;
+    aSystemTime.wYear			=	pDateTime->Year;
 
     if ( SystemTimeToFileTime( &aSystemTime, &aFileTime ) )
     {
@@ -136,10 +136,10 @@ sal_Bool SAL_CALL osl_getTimeValueFromDateTime( oslDateTime* pDateTime, TimeValu
 //--------------------------------------------------
 
 sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( TimeValue* pSystemTimeVal, TimeValue* pLocalTimeVal )
-{
+{ 
     TIME_ZONE_INFORMATION aTimeZoneInformation;
     DWORD Success;
-    sal_Int64   bias;
+    sal_Int64	bias;
 
     // get timezone information
     if ( ( Success=GetTimeZoneInformation( &aTimeZoneInformation ) ) != TIME_ZONE_ID_INVALID)
@@ -159,7 +159,7 @@ sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( TimeValue* pSystemTimeVal, Tim
         }
     }
 
-    return sal_False;
+    return sal_False; 
 }
 
 //--------------------------------------------------
@@ -170,7 +170,7 @@ sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( TimeValue* pLocalTimeVal, Time
 {
     TIME_ZONE_INFORMATION aTimeZoneInformation;
     DWORD Success;
-    sal_Int64   bias;
+    sal_Int64	bias;
 
     // get timezone information
     if ( ( Success=GetTimeZoneInformation( &aTimeZoneInformation ) ) != TIME_ZONE_ID_INVALID)
@@ -179,7 +179,7 @@ sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( TimeValue* pLocalTimeVal, Time
 
         // add bias for daylight saving time
         if ( Success== TIME_ZONE_ID_DAYLIGHT )
-            bias+=aTimeZoneInformation.DaylightBias;
+            bias+=aTimeZoneInformation.DaylightBias; 
 
         if ( (sal_Int64) pLocalTimeVal->Seconds + ( bias * 60 ) > 0 )
         {
@@ -190,7 +190,7 @@ sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( TimeValue* pLocalTimeVal, Time
         }
     }
 
-    return sal_False;
+    return sal_False; 
 }
 
 
@@ -207,9 +207,9 @@ sal_uInt32 SAL_CALL osl_getGlobalTimer(void)
       _ftime( &startTime );
       bGlobalTimer=sal_True;
   }
-
+  
   _ftime( &currentTime );
-
+  
   nSeconds = (sal_uInt32)( currentTime.time - startTime.time );
 
   return ( nSeconds * 1000 ) + (long)( currentTime.millitm - startTime.millitm );
diff --git a/sal/osl/w32/util.c b/sal/osl/w32/util.c
index 1b5b8ca4c006..2687683f21b1 100644
--- a/sal/osl/w32/util.c
+++ b/sal/osl/w32/util.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 extern sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 *pAddr )
 {
     pAddr = pAddr; /* avoid warnings */
-    return sal_False;
+    return sal_False;   
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index 68d07d3433ff..848f7070c70e 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -688,7 +688,7 @@ namespace rtl_OStringBuffer
     {
         void ensureCapacity_001()
         {
-            sal_Int32          expVal = 16;
+            sal_Int32 		   expVal = 16;
             ::rtl::OStringBuffer   aStrBuf;
             sal_Int32              input = 5;
 
@@ -704,7 +704,7 @@ namespace rtl_OStringBuffer
 
         void ensureCapacity_002()
         {
-            sal_Int32          expVal = 16;
+            sal_Int32 		   expVal = 16;
             ::rtl::OStringBuffer   aStrBuf;
             sal_Int32              input = -5;
 
@@ -720,7 +720,7 @@ namespace rtl_OStringBuffer
 
         void ensureCapacity_003()
         {
-            sal_Int32          expVal = 16;
+            sal_Int32 		   expVal = 16;
             ::rtl::OStringBuffer   aStrBuf;
             sal_Int32              input = 0;
 
@@ -736,7 +736,7 @@ namespace rtl_OStringBuffer
 
         void ensureCapacity_004()           //the testcase is based on comments
         {
-            sal_Int32          expVal = 20;
+            sal_Int32 		   expVal = 20;
             ::rtl::OStringBuffer   aStrBuf;
             sal_Int32              input = 20;
 
@@ -752,7 +752,7 @@ namespace rtl_OStringBuffer
 
         void ensureCapacity_005()
         {
-            sal_Int32          expVal = 50;
+            sal_Int32 		   expVal = 50;
             ::rtl::OStringBuffer   aStrBuf;
             sal_Int32              input = 50;
 
@@ -768,7 +768,7 @@ namespace rtl_OStringBuffer
 
         void ensureCapacity_006()
         {
-            sal_Int32          expVal = 20;
+            sal_Int32 		   expVal = 20;
             ::rtl::OStringBuffer   aStrBuf( 6 );
             sal_Int32              input = 20;
 
@@ -784,7 +784,7 @@ namespace rtl_OStringBuffer
 
         void ensureCapacity_007()
         {
-            sal_Int32          expVal = 6;
+            sal_Int32 		   expVal = 6;
             ::rtl::OStringBuffer   aStrBuf( 6 );
             sal_Int32              input = 2;
 
@@ -800,7 +800,7 @@ namespace rtl_OStringBuffer
 
         void ensureCapacity_008()
         {
-            sal_Int32          expVal = 6;
+            sal_Int32 		   expVal = 6;
             ::rtl::OStringBuffer   aStrBuf( 6 );
             sal_Int32              input = -6;
 
@@ -816,7 +816,7 @@ namespace rtl_OStringBuffer
 
         void ensureCapacity_009()      //the testcase is based on comments
         {
-            sal_Int32          expVal = 10;
+            sal_Int32 		   expVal = 10;
             ::rtl::OStringBuffer   aStrBuf( 6 );
             sal_Int32              input = 10;
 
@@ -832,7 +832,7 @@ namespace rtl_OStringBuffer
 
         void ensureCapacity_010()
         {
-            sal_Int32          expVal = 6;
+            sal_Int32 		   expVal = 6;
             ::rtl::OStringBuffer   aStrBuf( 0 );
             sal_Int32              input = 6;
 
@@ -848,7 +848,7 @@ namespace rtl_OStringBuffer
 
         void ensureCapacity_011()       //the testcase is based on comments
         {
-            sal_Int32          expVal = 2;  // capacity is x = (str->length + 1) * 2; minimum < x ? x : minimum
+            sal_Int32 		   expVal = 2;  // capacity is x = (str->length + 1) * 2; minimum < x ? x : minimum
             ::rtl::OStringBuffer   aStrBuf( 0 );
             sal_Int32              input = 1;
 
@@ -864,7 +864,7 @@ namespace rtl_OStringBuffer
 
         void ensureCapacity_012()
         {
-            sal_Int32          expVal = 0;
+            sal_Int32 		   expVal = 0;
             ::rtl::OStringBuffer   aStrBuf( 0 );
             sal_Int32              input = -1;
 
@@ -880,7 +880,7 @@ namespace rtl_OStringBuffer
 #ifdef WITH_CORE
         void ensureCapacity_013()             //will core dump
         {
-            sal_Int32          expVal = kSInt32Max;
+            sal_Int32 		   expVal = kSInt32Max;
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
             sal_Int32              input = 65535;
 
@@ -896,7 +896,7 @@ namespace rtl_OStringBuffer
 
         void ensureCapacity_014()             //will core dump
         {
-            sal_Int32          expVal = kSInt32Max;
+            sal_Int32 		   expVal = kSInt32Max;
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
             sal_Int32              input = kSInt32Max;
 
@@ -912,7 +912,7 @@ namespace rtl_OStringBuffer
 
         void ensureCapacity_015()             //will core dump
         {
-            sal_Int32          expVal = kSInt32Max;
+            sal_Int32 		   expVal = kSInt32Max;
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
             sal_Int32              input = -1;
 
@@ -928,7 +928,7 @@ namespace rtl_OStringBuffer
 
         void ensureCapacity_016()             //will core dump
         {
-            sal_Int32          expVal = kSInt32Max;
+            sal_Int32 		   expVal = kSInt32Max;
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
             sal_Int32              input = 0;
 
@@ -944,7 +944,7 @@ namespace rtl_OStringBuffer
 
         void ensureCapacity_017()             //will core dump
         {
-            sal_Int32          expVal = kSInt32Max;
+            sal_Int32 		   expVal = kSInt32Max;
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
             sal_Int32              input = kNonSInt32Max;
 
@@ -960,7 +960,7 @@ namespace rtl_OStringBuffer
 #endif
         void ensureCapacity_018()
         {
-            sal_Int32          expVal = 65535;
+            sal_Int32 		   expVal = 65535;
             ::rtl::OStringBuffer   aStrBuf( kNonSInt32Max );
             sal_Int32              input = 65535;
 
@@ -976,7 +976,7 @@ namespace rtl_OStringBuffer
 #ifdef WITH_CORE
         void ensureCapacity_019()               //will core dump
         {
-            sal_Int32          expVal = 2147483647;
+            sal_Int32 		   expVal = 2147483647;
             ::rtl::OStringBuffer   aStrBuf( kNonSInt32Max );
             sal_Int32              input = 2147483647;
 
@@ -992,7 +992,7 @@ namespace rtl_OStringBuffer
 #endif
         void ensureCapacity_020()
         {
-            sal_Int32          expVal = 2;
+            sal_Int32 		   expVal = 2;
             ::rtl::OStringBuffer   aStrBuf( kNonSInt32Max );
             sal_Int32              input = -1;
 
@@ -1008,7 +1008,7 @@ namespace rtl_OStringBuffer
 
         void ensureCapacity_021()
         {
-            sal_Int32          expVal = 2;
+            sal_Int32 		   expVal = 2;
             ::rtl::OStringBuffer   aStrBuf( kNonSInt32Max );
             sal_Int32              input = 0;
 
@@ -1024,7 +1024,7 @@ namespace rtl_OStringBuffer
 
         void ensureCapacity_022()
         {
-            sal_Int32          expVal = kNonSInt32Max;
+            sal_Int32 		   expVal = kNonSInt32Max;
             ::rtl::OStringBuffer   aStrBuf( kNonSInt32Max );
             sal_Int32              input = kNonSInt32Max;
 
diff --git a/sal/qa/OStringBuffer/rtl_String_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h
index 2a93e754af3b..3549d3bb902c 100644
--- a/sal/qa/OStringBuffer/rtl_String_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Const.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -324,7 +324,7 @@ static const sal_Int32 uTestStr4Len  = 16;
 static const sal_Int32 uTestStr5Len  = 16;
 static const sal_Int32 uTestStr9Len  = 32;
 static const sal_Int32 uTestStr22Len = 32;
-
+ 
 
 
 //------------------------------------------------------------------------
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.cxx b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
index b87d8c7e91a2..d0b1e675b9a4 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils.cxx
+++ b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
 #
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -135,7 +135,7 @@ sal_Bool cmpstr( const sal_Char* str1, const sal_Char* str2 )
     const sal_Char* pBuf1 = str1;
     const sal_Char* pBuf2 = str2;
     sal_Bool res = sal_True;
-
+   
     while ( (*pBuf1 == *pBuf2) && *pBuf1 !='\0' && *pBuf2 != '\0')
     {
         (pBuf1)++;
@@ -169,7 +169,7 @@ sal_Bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2 )
     const sal_Unicode* pBuf1 = str1;
     const sal_Unicode* pBuf2 = str2;
     sal_Bool res = sal_True;
-
+   
     while ( (*pBuf1 == *pBuf2) && *pBuf1 !='\0' && *pBuf2 != '\0')
     {
         (pBuf1)++;
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.hxx b/sal/qa/OStringBuffer/rtl_String_Utils.hxx
index ad671417c63a..25261c9f932a 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils.hxx
+++ b/sal/qa/OStringBuffer/rtl_String_Utils.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
 #
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
index 36a35593deab..af12c918c4ed 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/buildall.pl b/sal/qa/buildall.pl
index 03eadb1b7fc0..1346b5514432 100644
--- a/sal/qa/buildall.pl
+++ b/sal/qa/buildall.pl
@@ -1,9 +1,9 @@
 eval 'exec perl -wS $0 ${1+"$@"}'
     if 0;
 #*************************************************************************
-#
+# 
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -85,12 +85,12 @@ else
     {
         # always run test, but envelope the other in 'TESTOPT="..."'
         $params = "test TESTOPT=\"";
-
+        
         foreach $param (@ARGV)
         {
             $params = $params . " " . $param;
         }
-        $params = $params . "\"";
+        $params = $params . "\"";    
     }
     print "User defined ";
 }
@@ -144,12 +144,12 @@ sub initEnvironment()
           $FS             = "\\";
           $g_sTempDir         = $ENV{TMP}  ? "$ENV{TMP}${FS}" : "c:${FS}tmp${FS}";
           last SWITCH;
-      }
+      } 
       if ( $gui eq "WIN" ) {
           $FS             = "\\";
           $g_sTempDir         = $ENV{TMP}  ? "$ENV{TMP}${FS}" : "c:${FS}tmp${FS}";
           last SWITCH;
-      }
+      }    
       if ( $gui eq "OS2" ) {
           $FS             = "\\";
           $g_sTempDir         = $ENV{TMP}  ? "$ENV{TMP}${FS}" : "c:${FS}tmp${FS}";
@@ -247,7 +247,7 @@ sub giveOutFailures($$)
         while ($line = <IN>)
         {
             chomp($line);
-
+            
             # handling of the states
             if ( $line =~ /^\# -- BEGIN:/)
             {
@@ -268,14 +268,14 @@ sub giveOutFailures($$)
         }
         close(IN);
     }
-
+        
     if ($nFailures > 0)
     {
         # extra return for a better output
         print "\nFailures occured: $nFailures\n";
         print "The whole output can be found in $sFailureFile\n";
         print "\n";
-
+        
         # Statistics
         $nGlobalFailures += $nFailures;
     }
@@ -339,7 +339,7 @@ sub runASingleTest($$)
         print "ERROR: can't open logfile: $sLogFile\n";
         return;
     }
-
+    
     my $line;
     local *DMAKEOUTPUT;
     if (! open( DMAKEOUTPUT, "$dmake 2>&1 |"))
@@ -403,7 +403,7 @@ sub runTestsOnPath($$$)
         # DBG: print "empty file '$file'\n";
         return;
     }
-
+    
 #   print "File: '$file', Path: '$path'\n";
     print "Work in directory: $path\n";
     my $newpath = $cwd . $FS . $path;
@@ -428,17 +428,17 @@ sub runTestsOnPath($$$)
     while($line = <MAKEFILE_MK>)
     {
         chomp($line);
-
+        
         if ($line =~ /SHL(\d)TARGET=(.*)/)
         {
             $nNumber = $1;
             $sTarget = trim($2);
-
+            
             # DBG: print "test$number is lib: $target\n";
             $sLocalParams = $params . " ";                  # append a whitespace, so we can check if 'test' exist without additional digits
             $sLocalParams =~ s/test\s/test$nNumber/;
             # DBG: print "$sLocalParams\n";
-            if ($bBuildAll == 1 ||
+            if ($bBuildAll == 1 || 
                 $file eq $sTarget)
             {
                 # print "runASingleTest on Target: $sTarget 'dmake $sLocalParams'\n";
@@ -475,7 +475,7 @@ $/)
         {
             $line = substr($line, 0, -1);
         }
-
+        
         # print "$line\n";
         my $path;
         my $file;
@@ -483,7 +483,7 @@ $/)
         runTestsOnPath($path, $file, $params);
     }
     close(LIBS2TEST);
-
+    
     print "\nComplete logging information will be found in dir: ".$g_sTempDir."dmake_out_$$/\n";
 
     if ($nGlobalFailures > 0)
diff --git a/sal/qa/export.map b/sal/qa/export.map
index 3308588ef6f8..0dbbcc5a7372 100755
--- a/sal/qa/export.map
+++ b/sal/qa/export.map
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/helper/gcov/gcov_filter.pl b/sal/qa/helper/gcov/gcov_filter.pl
index 5074c0251ce5..fc3348849f0e 100755
--- a/sal/qa/helper/gcov/gcov_filter.pl
+++ b/sal/qa/helper/gcov/gcov_filter.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-#
+# 
 # $Id: gcov_filter.pl,v 1.4 2005-11-02 17:23:57 kz Exp $
 #
 
@@ -7,7 +7,7 @@
 #
 # Helper to filter the gcov output.
 # Handle a compare between the hole gcov output and a given select list of exported functions.
-#
+# 
 # Q: Why perl?
 # A: regexp ;-)
 #
@@ -147,7 +147,7 @@ if ($showallfunc)
 }
 
 # back to current directory
-# this chdir was for a before chdir (in $startdir creation) but due to the fact,
+# this chdir was for a before chdir (in $startdir creation) but due to the fact, 
 # that the get_PRJ_from_makefile_mk works but the after concat of strings not, this
 # chdir is also remarked.
 # chdir $cwd;
@@ -288,7 +288,7 @@ sub read_gcov_function_file($)
     my $line = "";
     open(INPUT_HANDLE, $file)
         or die("ERROR: cannot open $file!\n");
-
+    
     while ($line = <INPUT_HANDLE>)
     {
         chomp($line);
@@ -340,7 +340,7 @@ sub read_gcov_function_file_old_gcc_3($)
     my $line = "";
     open(INPUT_HANDLE, $file)
         or die("ERROR: cannot open $file!\n");
-
+    
     while ($line = <INPUT_HANDLE>)
     {
         chomp($line);
diff --git a/sal/qa/helper/gcov/gcov_result.pl b/sal/qa/helper/gcov/gcov_result.pl
index 414eac2c828b..1731a965e6ee 100644
--- a/sal/qa/helper/gcov/gcov_result.pl
+++ b/sal/qa/helper/gcov/gcov_result.pl
@@ -1,10 +1,10 @@
 #!/usr/bin/perl -w
-#
+# 
 # $Id: gcov_result.pl,v 1.2 2003-06-11 16:36:30 vg Exp $
 #
 
 # GCOV_RESULT
-#
+# 
 # Helper, to interpret the result and put the result via html in a database.
 # Put into DB works via php.
 #
@@ -33,7 +33,7 @@ our $major;
 our $minor;
 our $cwsname;
 our $outputDir;
-
+ 
 # Prototypes
 sub print_usage(*);
 sub read_gcov_function_file($);
diff --git a/sal/qa/helper/gcov/gcov_resultcompare.pl b/sal/qa/helper/gcov/gcov_resultcompare.pl
index d52316fac0e7..bb0f86c0a032 100644
--- a/sal/qa/helper/gcov/gcov_resultcompare.pl
+++ b/sal/qa/helper/gcov/gcov_resultcompare.pl
@@ -1,10 +1,10 @@
 #!/usr/bin/perl -w
-#
+# 
 # $Id: gcov_resultcompare.pl,v 1.2 2004-03-19 14:46:51 obo Exp $
 #
 
 # GCOV_RESULTCOMPARE
-#
+# 
 # Helper, to compare two different results
 #
 # Q: Why perl?
@@ -108,7 +108,7 @@ sub read_gcov_function_file($)
     my $file = shift;
     my %list;
     my $line = "";
-
+    
     open(INPUT_HANDLE, $file)
         or die("ERROR: cannot open $file!\n");
 
diff --git a/sal/qa/helper/gcov/gcov_resultinterpreter.pl b/sal/qa/helper/gcov/gcov_resultinterpreter.pl
index b01506b20634..56ce13a594ac 100644
--- a/sal/qa/helper/gcov/gcov_resultinterpreter.pl
+++ b/sal/qa/helper/gcov/gcov_resultinterpreter.pl
@@ -1,10 +1,10 @@
 #!/usr/bin/perl -w
-#
+# 
 # $Id: gcov_resultinterpreter.pl,v 1.3 2005-11-02 17:24:12 kz Exp $
 #
 
 # GCOV_RESULTINTERPRETER
-#
+# 
 # Helper, to interpret the result
 #
 # Q: Why perl?
@@ -127,10 +127,10 @@ sub read_gcov_function_file($)
     my $file = $_[0];
     my %list;
     my $line = "";
-
+    
     open(INPUT_HANDLE, $file)
         or die("ERROR: cannot open $file!\n");
-
+    
     while ($line = <INPUT_HANDLE>)
     {
         chomp($line);
@@ -140,7 +140,7 @@ sub read_gcov_function_file($)
         {
             my $percent = $1;
             my $value = $2;
-
+            
             $list{$value} = $percent;
         }
     }
@@ -163,7 +163,7 @@ Usage: $tool_name [OPTIONS] INPUTFILE
     -p, --percent           show all functions, which have a value > percent
     -c, --complete          show all functions, which have a value == 100
     -i, --incomplete        show all functions, which have a value > 0 && < 100
-
+                            
     -h, --help              Print this help, then exit
     -v, --version           Print version number, then exit
 
diff --git a/sal/qa/inc/valueequal.hxx b/sal/qa/inc/valueequal.hxx
index 9dd390158698..b043d66beec1 100644
--- a/sal/qa/inc/valueequal.hxx
+++ b/sal/qa/inc/valueequal.hxx
@@ -10,9 +10,9 @@ bool is_equal(T x, T y, sal_Int16 _nPrec)
 {
     // due to the fact that this check looks only if both values are equal
     // we only need to look on one value
-
+    
     // 14 digits will announce the checkPrecisionSize
-
+    
     sal_Int32 nPRECISION;
     switch(_nPrec)
     {
@@ -28,7 +28,7 @@ bool is_equal(T x, T y, sal_Int16 _nPrec)
     default:
         nPRECISION = 2;
     }
-
+    
     if (x < 0)
     {
         x = -x;
@@ -37,7 +37,7 @@ bool is_equal(T x, T y, sal_Int16 _nPrec)
     {
         y = -y;
     }
-
+    
     // LLA: due to a bug in printf with '%f' and long double within linux environment
     //      we have to use %lf instead.
 
@@ -54,24 +54,24 @@ bool is_equal(T x, T y, sal_Int16 _nPrec)
     }
     //t_print(T_VERBOSE, "nPRECISION is  %d\n", nPRECISION);
     sal_Int32 nPrecOfN = -nPRECISION + nBeforeDot;
-
+    
     if (_nPrec != PREC_long_double)
         t_print(T_VERBOSE, "nPrecOfN is  %d\n", nPrecOfN);
 
     long double nPrec = pow(0.1, -nPrecOfN);
-
+    
     if (_nPrec != PREC_long_double)
         t_print(T_VERBOSE, "        prec: %.20f\n", nPrec);
-
+    
     long double nDelta = fabs( x - y ) ;
 
     if (_nPrec != PREC_long_double)
     {
-        t_print(T_VERBOSE, "       delta: %.20f\n", nDelta);
-        t_print(T_VERBOSE, "       nPrec: %.20f\n", nPrec);
+        t_print(T_VERBOSE, "       delta: %.20f\n", nDelta); 
+        t_print(T_VERBOSE, "       nPrec: %.20f\n", nPrec); 
         t_print(T_VERBOSE, "delta must be less or equal to prec!\n\n");
     }
-
+    
     if (nDelta > nPrec)
     {
         // t_print(T_VERBOSE, "values are not equal! ndelta:%.20f\n", nDelta);
@@ -88,9 +88,9 @@ bool is_equal(T x, T y, sal_Int16 _nPrec)
 // LLA: {
 // LLA:     // due to the fact that this check looks only if both values are equal
 // LLA:     // we only need to look on one value
-// LLA:
+// LLA:     
 // LLA:     // 6 digits will announce the checkPrecisionSize
-// LLA:
+// LLA:     
 // LLA:     const sal_Int32 nPRECISION = 6;
 // LLA:     if (x < 0)
 // LLA:     {
@@ -100,18 +100,18 @@ bool is_equal(T x, T y, sal_Int16 _nPrec)
 // LLA:     {
 // LLA:         y = -y;
 // LLA:     }
-// LLA:
+// LLA:     
 // LLA:     t_print(T_VERBOSE, "double equal: %.20f\n#               %.20f\n", x, y);
 // LLA:     sal_Int32 nPrecOfN = -nPRECISION + sal_Int32( log10(x) );
-// LLA:
+// LLA:     
 // LLA:     t_print(T_VERBOSE, "prec: %d\n", nPrecOfN);
 // LLA:     double nPrec = pow(10, nPrecOfN) * 1;
-// LLA:
+// LLA:     
 // LLA:     t_print(T_VERBOSE, "        prec: %.20f\n", nPrec);
-// LLA:
+// LLA:     
 // LLA:     double nDelta = fabs( x - y );
 // LLA:     t_print(T_VERBOSE, "       delta: %.20f\n\n", nDelta);
-// LLA:
+// LLA:     
 // LLA:     if (nDelta > nPrec)
 // LLA:     {
 // LLA:         // t_print(T_VERBOSE, "values are not equal! ndelta:%.20f\n", nDelta);
diff --git a/sal/qa/osl/condition/osl_Condition.cxx b/sal/qa/osl/condition/osl_Condition.cxx
index 89904b4e8879..f85a95bdd656 100644
--- a/sal/qa/osl/condition/osl_Condition.cxx
+++ b/sal/qa/osl/condition/osl_Condition.cxx
@@ -2,7 +2,7 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,14 +28,14 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-
+ 
 //------------------------------------------------------------------------
 // include files
 //------------------------------------------------------------------------
-#include <osl_Condition_Const.h>
+#include <osl_Condition_Const.h> 
 
-using namespace osl;
-using namespace rtl;
+using namespace	osl;
+using namespace	rtl;
 
 
 //------------------------------------------------------------------------
@@ -47,14 +47,14 @@ using namespace rtl;
 inline void printBool( sal_Bool bOk )
 {
     t_print("#printBool# " );
-    ( sal_True == bOk ) ? t_print("TRUE!\n" ): t_print("FALSE!\n" );
+    ( sal_True == bOk ) ? t_print("TRUE!\n" ): t_print("FALSE!\n" );		
 }
 
 /** print a UNI_CODE String.
 */
 inline void printUString( const ::rtl::OUString & str )
 {
-    rtl::OString aString;
+    rtl::OString aString; 
 
     t_print("#printUString_u# " );
     aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
@@ -68,14 +68,14 @@ void thread_sleep( sal_Int32 _nSec )
     /// print statement in thread process must use fflush() to force display.
     t_print("# wait %d seconds. ", _nSec );
     fflush( stdout );
-
+    
 #ifdef WNT                               //Windows
     Sleep( _nSec * 1000 );
 #endif
 #if ( defined UNX ) || ( defined OS2 )   //Unix
     sleep( _nSec );
 #endif
-    t_print("# done\n" );
+    t_print("# done\n" ); 
 }
 
 enum ConditionType
@@ -86,14 +86,14 @@ enum ConditionType
     thread_type_check
 };
 
-/** thread for testing Condition.
+/** thread for testing Condition. 
  */
 class ConditionThread : public Thread
 {
 public:
-    //get the Condition to operate
+    //get the Condition to operate 
     ConditionThread( ::osl::Condition& Con, ConditionType tType): m_MyCon( Con ), m_MyType( tType ) { }
-
+    
     ~ConditionThread( )
     {
         // LLA: do not throw in DTors!
@@ -113,12 +113,12 @@ protected:
                 m_MyCon.set(); break;
             case thread_type_reset:
                 m_MyCon.reset(); break;
-            default:
+            default: 
                 break;
         }
     }
 };
-
+    
 
 //------------------------------------------------------------------------
 // test code start here
@@ -134,30 +134,30 @@ namespace osl_Condition
     {
     public:
         sal_Bool bRes, bRes1;
-
+    
         void ctors_001( )
         {
             ::osl::Condition aCond;
             bRes = aCond.check( );
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: create a condition its initial check state should be sal_False.",
+            
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: create a condition its initial check state should be sal_False.", 
                                     sal_False == bRes );
         }
-
+    
         void ctors_002( )
         {
             ::osl::Condition aCond;
             aCond.set( );
             bRes = aCond.check( );
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: create a condition and set it.",
+            
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: create a condition and set it.", 
                                     sal_True == bRes );
         }
 
         CPPUNIT_TEST_SUITE( ctors );
         CPPUNIT_TEST( ctors_001 );
         CPPUNIT_TEST( ctors_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class ctors
 
 
@@ -168,45 +168,45 @@ namespace osl_Condition
     {
     public:
         sal_Bool bRes, bRes1, bRes2;
-
+    
         void set_001( )
         {
             ::osl::Condition aCond;
             aCond.set( );
             bRes = aCond.check( );
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: check state should be sal_True after set.",
+            
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: check state should be sal_True after set.", 
                                     sal_True == bRes );
         }
-
+    
         void set_002( )
         {
             ::osl::Condition aCond;
             ConditionThread myThread1( aCond, thread_type_wait );
             myThread1.create();
             bRes = myThread1.isRunning( );
-
+            
             ConditionThread myThread2( aCond, thread_type_set );
             myThread2.create();
             thread_sleep(1);
             bRes1 = myThread1.isRunning( );
             bRes2 = aCond.check( );
-
+            
             myThread1.join( );
             myThread2.join( );
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: use one thread to set the condition in order to release another thread.",
+        
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: use one thread to set the condition in order to release another thread.", 
                                     sal_True == bRes && sal_False == bRes1 && sal_True == bRes2 );
         }
-
-
+        
+        
         CPPUNIT_TEST_SUITE( set );
         CPPUNIT_TEST( set_001 );
         CPPUNIT_TEST( set_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class set
-
-
+    
+    
     /** testing the method:
         void reset()
     */
@@ -214,25 +214,25 @@ namespace osl_Condition
     {
     public:
         sal_Bool bRes, bRes1, bRes2;
-
+    
         void reset_001( )
         {
             ::osl::Condition aCond;
             aCond.reset( );
-
+            
             ConditionThread myThread( aCond, thread_type_wait );
             myThread.create();
             bRes = myThread.isRunning( );
             bRes2 = aCond.check( );
-
+            
             aCond.set( );
             myThread.join( );
             bRes1 = myThread.isRunning( );
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: wait will cause a reset thread block, use set to release it.",
+            
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: wait will cause a reset thread block, use set to release it.", 
                                     sal_True == bRes && sal_False == bRes1 && sal_False == bRes2 );
         }
-
+    
         void reset_002( )
         {
             ::osl::Condition aCond;
@@ -241,17 +241,17 @@ namespace osl_Condition
             aCond.set( );
             bRes1 = aCond.check( );
 
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: create a condition and reset/set it.",
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: create a condition and reset/set it.", 
                                     ( sal_False == bRes && sal_True == bRes1 ) );
         }
 
         CPPUNIT_TEST_SUITE( reset );
         CPPUNIT_TEST( reset_001 );
         CPPUNIT_TEST( reset_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class reset
-
-
+    
+    
     /** testing the method:
         Result wait(const TimeValue *pTimeout = 0)
     */
@@ -260,63 +260,63 @@ namespace osl_Condition
     public:
         sal_Bool bRes, bRes1, bRes2;
         TimeValue *tv1;
-
+    
         void setUp( )
         {
             tv1 = (TimeValue*)malloc(sizeof(TimeValue));
             tv1->Seconds = 1;
 
         }
-
+    
         void tearDown( )
         {
             free( tv1 );
         }
 
-
+    
         void wait_001( )
         {
             ::osl::Condition cond1;
             ::osl::Condition cond2;
             ::osl::Condition cond3;
-
+        
             cond1.set();
             cond2.set();
-
+        
 osl::Condition::Result r1=cond1.wait(tv1);
 osl::Condition::Result r2=cond2.wait();
 osl::Condition::Result r3=cond3.wait(tv1);
 fprintf(stderr,"%d %d %d\n",r1,r2,r3);
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: test three types of wait.",
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: test three types of wait.", 
                                     (cond1.wait(tv1) == ::osl::Condition::result_ok) &&
                                     (cond2.wait() == ::osl::Condition::result_ok) &&
                                     (cond3.wait(tv1) == ::osl::Condition::result_timeout) );
-
+            
         }
-
+    
         void wait_002( )
         {
             ::osl::Condition aCond;
             ::osl::Condition::Result wRes, wRes1;
-
+            
             aCond.reset( );
             bRes = aCond.check( );
             wRes = aCond.wait( tv1 );
-
+            
             aCond.set( );
             wRes1 = aCond.wait( tv1 );
             bRes1 = aCond.check( );
 
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: wait a condition after set/reset.",
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: wait a condition after set/reset.", 
                                     ( sal_False == bRes ) && ( sal_True == bRes1 ) &&
-                                    ( ::osl::Condition::result_timeout == wRes ) &&
+                                    ( ::osl::Condition::result_timeout == wRes ) && 
                                     ( ::osl::Condition::result_ok == wRes1 ) );
         }
 
         CPPUNIT_TEST_SUITE( wait );
         CPPUNIT_TEST( wait_001 );
         CPPUNIT_TEST( wait_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class wait
 
 
@@ -327,46 +327,46 @@ fprintf(stderr,"%d %d %d\n",r1,r2,r3);
     {
     public:
         sal_Bool bRes, bRes1, bRes2;
-
+    
         void check_001( )
         {
             ::osl::Condition aCond;
-
+            
             aCond.reset( );
             bRes = aCond.check( );
             aCond.set( );
             bRes1 = aCond.check( );
 
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: check the condition states.",
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: check the condition states.", 
                                     ( sal_False == bRes && sal_True == bRes1 ) );
         }
-
+    
         void check_002( )
         {
             ::osl::Condition aCond;
             aCond.reset( );
-
+            
             ConditionThread myThread( aCond, thread_type_set );
             myThread.create( );
             myThread.join( );
             bRes = aCond.check( );
-
+            
             ConditionThread myThread1( aCond, thread_type_reset );
             myThread1.create( );
             myThread1.join( );
             bRes1 = aCond.check( );
 
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: use threads to set/reset Condition and check it in main routine.",
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: use threads to set/reset Condition and check it in main routine.", 
                                     ( sal_True == bRes && sal_False == bRes1 ) );
         }
 
         CPPUNIT_TEST_SUITE( check );
         CPPUNIT_TEST( check_001 );
         CPPUNIT_TEST( check_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class check
-
-
+    
+        
 // -----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Condition::ctors, "osl_Condition");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Condition::set, "osl_Condition");
@@ -374,7 +374,7 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Condition::reset, "osl_Condition");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Condition::wait, "osl_Condition");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Condition::check, "osl_Condition");
 // -----------------------------------------------------------------------------
-
+    
 } // namespace osl_Condition
 
 
diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h
index 1f018be86223..e7c5a3073585 100644
--- a/sal/qa/osl/condition/osl_Condition_Const.h
+++ b/sal/qa/osl/condition/osl_Condition_Const.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,17 +38,17 @@
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
-#ifndef _OSL_THREAD_HXX_
+#ifndef	_OSL_THREAD_HXX_
 #include <osl/thread.hxx>
 #endif
 #include <osl/mutex.hxx>
 #include <osl/pipe.hxx>
 
-#ifndef _OSL_SEMAPHOR_HXX_
+#ifndef	_OSL_SEMAPHOR_HXX_
 #include <osl/semaphor.hxx>
 #endif
 
-#ifndef _OSL_CONDITION_HXX_
+#ifndef	_OSL_CONDITION_HXX_
 #include <osl/conditn.hxx>
 #endif
 #include <osl/time.h>
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 276ee03626c6..902fd542a713 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,8 +46,8 @@
 
 // #ifdef WNT
 // #   define UNICODE
-// #    define WIN32_LEAN_AND_MEAN
-// #    include <windows.h>
+// #	define WIN32_LEAN_AND_MEAN
+// #	include <windows.h>
 // #   include <tchar.h>
 // #endif
 
@@ -261,9 +261,9 @@ inline void printTime( TimeValue *tv )
 */
 
 #if ( defined UNX ) || ( defined OS2 )                 //precision of time in Windows is better than UNX
-#   define delta 2000                    //time precision, 2000ms
+#	define delta 2000                    //time precision, 2000ms
 #else
-#   define delta 1800                    //time precision, 1.8s
+#	define delta 1800                    //time precision, 1.8s
 #endif
 
 inline sal_Int64 t_abs64(sal_Int64 _nValue)
@@ -377,7 +377,7 @@ inline void concatURL( ::rtl::OUString & pathname1, const ::rtl::OUString & path
 inline void createTestFile( const ::rtl::OUString filename )
 {
     ::rtl::OUString     aPathURL   = filename.copy( 0 );
-    ::osl::FileBase::RC nError;
+    ::osl::FileBase::RC	nError;
 
     if ( !isURL( filename ) )
         ::osl::FileBase::getFileURLFromSystemPath( filename, aPathURL ); //convert if not full qualified URL
@@ -411,7 +411,7 @@ inline void deleteTestFile( const ::rtl::OUString filename )
 {
     // LLA: t_print("deleteTestFile\n");
     ::rtl::OUString     aPathURL   = filename.copy( 0 );
-    ::osl::FileBase::RC nError;
+    ::osl::FileBase::RC	nError;
 
     if ( !isURL( filename ) )
         ::osl::FileBase::getFileURLFromSystemPath( filename, aPathURL ); //convert if not full qualified URL
@@ -438,7 +438,7 @@ inline void deleteTestFile( const ::rtl::OUString basename, const ::rtl::OUStrin
 inline void createTestDirectory( const ::rtl::OUString dirname )
 {
     ::rtl::OUString     aPathURL   = dirname.copy( 0 );
-    ::osl::FileBase::RC nError;
+    ::osl::FileBase::RC	nError;
 
     if ( !isURL( dirname ) )
         ::osl::FileBase::getFileURLFromSystemPath( dirname, aPathURL ); //convert if not full qualified URL
@@ -465,7 +465,7 @@ inline void deleteTestDirectory( const ::rtl::OUString dirname )
 {
     // LLA: t_print("deleteTestDirectory\n");
     ::rtl::OUString     aPathURL   = dirname.copy( 0 );
-    ::osl::FileBase::RC nError;
+    ::osl::FileBase::RC	nError;
     // LLA: printFileName(aPathURL);
     if ( !isURL( dirname ) )
         ::osl::FileBase::getFileURLFromSystemPath( dirname, aPathURL ); //convert if not full qualified URL
@@ -525,7 +525,7 @@ inline sal_Bool checkFile( const ::rtl::OUString & str, oslCheckMode nCheckMode
 {
     ::osl::FileBase::RC   nError1, nError2;
     ::osl::File       testFile( str );
-    sal_Bool        bCheckResult;
+    sal_Bool		bCheckResult;
 
     bCheckResult = sal_False;
     nError1 = testFile.open ( OpenFlag_Read );
@@ -568,10 +568,10 @@ inline sal_Bool checkFile( const ::rtl::OUString & str, oslCheckMode nCheckMode
 //check if the file exist
 inline sal_Bool ifFileExist( const ::rtl::OUString & str )
 {
-    sal_Bool        bCheckResult = sal_False;
+    sal_Bool		bCheckResult = sal_False;
 
 /*#ifdef WNT
-    ::rtl::OUString     aUStr  = str.copy( 0 );
+    ::rtl::OUString 	aUStr  = str.copy( 0 );
     if ( isURL( str ) )
         ::osl::FileBase::getSystemPathFromFileURL( str, aUStr );
 
@@ -582,7 +582,7 @@ inline sal_Bool ifFileExist( const ::rtl::OUString & str )
 #else*/
     ::rtl::OString aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
     // const char *path = aString.getStr( );
-    ::osl::File testFile( str );
+    ::osl::File	testFile( str );
     bCheckResult = ( osl::FileBase::E_None == testFile.open( OpenFlag_Read ) );
     //if (bCheckResult)
     //t_print("%s exist!\n", path);
@@ -596,10 +596,10 @@ inline sal_Bool ifFileExist( const ::rtl::OUString & str )
 //check if the file can be writen
 inline sal_Bool ifFileCanWrite( const ::rtl::OUString & str )
 {
-    sal_Bool        bCheckResult = sal_False;
+    sal_Bool		bCheckResult = sal_False;
     //on Windows, the file has no write right, but can be written
 #ifdef WNT
-    ::rtl::OUString     aUStr  = str.copy( 0 );
+    ::rtl::OUString 	aUStr  = str.copy( 0 );
     if ( isURL( str ) )
         ::osl::FileBase::getSystemPathFromFileURL( str, aUStr );
 
@@ -609,7 +609,7 @@ inline sal_Bool ifFileCanWrite( const ::rtl::OUString & str )
          bCheckResult = sal_True;
      //on UNX, just test if open success with OpenFlag_Write
 #else
-    ::osl::File testFile( str );
+    ::osl::File	testFile( str );
     bCheckResult = (osl::FileBase::E_None == testFile.open( OpenFlag_Write ));
 #endif
     return bCheckResult;
@@ -617,10 +617,10 @@ inline sal_Bool ifFileCanWrite( const ::rtl::OUString & str )
 
 inline sal_Bool checkDirectory( const ::rtl::OUString & str, oslCheckMode nCheckMode )
 {
-    rtl::OUString   aUString;
-    DirectoryItem   rItem;
-    FileBase::RC    rc;
-    sal_Bool        bCheckResult= sal_False;
+    rtl::OUString 	aUString;
+    DirectoryItem	rItem;
+    FileBase::RC	rc;
+    sal_Bool		bCheckResult= sal_False;
 
     //::std::auto_ptr<Directory> pDir( new Directory( str ) );
     Directory aDir( str );
@@ -689,11 +689,11 @@ inline ::rtl::OUString outputError( const ::rtl::OUString & returnVal, const ::r
 
 /** Change file mode, two version in UNIX and Windows;.
 */
-#if ( defined UNX ) || ( defined OS2 )         //chmod() method is differ in Windows
+#if ( defined UNX ) || ( defined OS2 )	       //chmod() method is differ in Windows
 inline void changeFileMode( ::rtl::OUString & filepath, sal_Int32 mode )
 {
-    rtl::OString    aString;
-    rtl::OUString   aUStr  = filepath.copy( 0 );
+    rtl::OString 	aString;
+    rtl::OUString 	aUStr  = filepath.copy( 0 );
 
     if ( isURL( filepath ) )
         ::osl::FileBase::getSystemPathFromFileURL( filepath, aUStr );
@@ -722,16 +722,16 @@ namespace osl_FileBase
     //---------------------------------------------------------------------
     // testing the method
     // static inline RC getAbsoluteFileURL( const ::rtl::OUString& ustrBaseDirectoryURL,
-    //                                      const ::rtl::OUString& ustrRelativeFileURL,
-    //                                            ::rtl::OUString& ustrAbsoluteFileURL )
+    //										const ::rtl::OUString& ustrRelativeFileURL,
+    //											  ::rtl::OUString& ustrAbsoluteFileURL )
     //---------------------------------------------------------------------
 
     class getAbsoluteFileURL:public CppUnit::TestFixture
     {
-        //::osl::FileBase       aFileBase;
-            ::rtl::OUString     aResultURL1, aResultURL2, aResultURL3, aResultURL4, aResultURL5, aResultURL6;
-            // ::osl::FileBase::RC  nError;
-        sal_Bool        bOk;
+        //::osl::FileBase		aFileBase;
+            ::rtl::OUString		aResultURL1, aResultURL2, aResultURL3, aResultURL4, aResultURL5, aResultURL6;
+            // ::osl::FileBase::RC	nError;
+        sal_Bool		bOk;
 
         public:
 
@@ -838,7 +838,7 @@ namespace osl_FileBase
   }
   void getAbsoluteFileURL::getAbsoluteFileURL_002()
   {
-#if ( defined UNX ) || ( defined OS2 )      //Link is not defined in Windows
+#if ( defined UNX ) || ( defined OS2 )		//Link is not defined in Windows
         ::rtl::OUString aUStr_AbsURL, aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
         ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/link.file");
         ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/canonical.name");
@@ -865,9 +865,9 @@ namespace osl_FileBase
     void getAbsoluteFileURL::getAbsoluteFileURL_004()
     {
         //create two level directories under $Temp/PID/
-        ::rtl::OUString aUStrUpBase = aUserDirectoryURL + ::rtl::OUString::createFromAscii("/test1");
+        ::rtl::OUString	aUStrUpBase = aUserDirectoryURL + ::rtl::OUString::createFromAscii("/test1");
         createTestDirectory( aUStrUpBase );
-        ::rtl::OUString aUStrBase = aUserDirectoryURL + ::rtl::OUString::createFromAscii("/test1/dir1");
+        ::rtl::OUString	aUStrBase = aUserDirectoryURL + ::rtl::OUString::createFromAscii("/test1/dir1");
         createTestDirectory( aUStrBase );
 
         ::rtl::OUString suAssume = aUserDirectoryURL.concat( ::rtl::OUString::createFromAscii("/mytestfile") );
@@ -878,7 +878,7 @@ namespace osl_FileBase
     //---------------------------------------------------------------------
     // testing two methods:
     // static inline RC getSystemPathFromFileURL( const ::rtl::OUString& ustrFileURL,
-    //                ::rtl::OUString& ustrSystemPath )
+    //				  ::rtl::OUString& ustrSystemPath )
         // static RC getFileURLFromSystemPath( const ::rtl::OUString & ustrSystemPath,
         //                                ::rtl::OUString & ustrFileURL );
     //---------------------------------------------------------------------
@@ -1197,7 +1197,7 @@ namespace osl_FileBase
     rtl::OString expResult(home_path);
     expResult += "/tmp";
     checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, expResult );
-    //  checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "\\tmp");
+    //	checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "\\tmp");
     }
     void SystemPath_FileURL::getSystemPathFromFileURL_001_9()
     {
@@ -1301,8 +1301,8 @@ namespace osl_FileBase
     //---------------------------------------------------------------------
     // testing the method
     // static inline RC searchFileURL(  const ::rtl::OUString& ustrFileName,
-    //                                  const ::rtl::OUString& ustrSearchPath,
-    //                                  ::rtl::OUString& ustrFileURL )
+    // 									const ::rtl::OUString& ustrSearchPath,
+    //									::rtl::OUString& ustrFileURL )
     //---------------------------------------------------------------------
     class searchFileURL:public CppUnit::TestFixture
     {
@@ -1441,10 +1441,10 @@ namespace osl_FileBase
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  static inline RC createTempFile( ::rtl::OUString* pustrDirectoryURL,
-    //                                   oslFileHandle* pHandle,
-    //                                   ::rtl::OUString* pustrTempFileURL)
+    // 	testing the method
+    // 	static inline RC createTempFile( ::rtl::OUString* pustrDirectoryURL,
+    //									 oslFileHandle* pHandle,
+    //									 ::rtl::OUString* pustrTempFileURL)
     //---------------------------------------------------------------------
     class createTempFile:public CppUnit::TestFixture
     {
@@ -1452,9 +1452,9 @@ namespace osl_FileBase
         ::osl::FileBase::RC nError1, nError2;
         sal_Bool bOK;
 
-        oslFileHandle   *pHandle;
-        ::rtl::OUString *pUStr_DirURL;
-        ::rtl::OUString *pUStr_FileURL;
+        oslFileHandle	*pHandle;
+        ::rtl::OUString	*pUStr_DirURL;
+        ::rtl::OUString	*pUStr_FileURL;
 
         public:
 
@@ -1560,8 +1560,8 @@ namespace osl_VolumeInfo
 {
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  VolumeInfo( sal_uInt32 nMask ): _nMask( nMask )
+    // 	testing the method
+    // 	VolumeInfo( sal_uInt32 nMask ): _nMask( nMask )
     //---------------------------------------------------------------------
     class  ctors : public CppUnit::TestFixture
     {
@@ -1656,8 +1656,8 @@ namespace osl_VolumeInfo
 
 
      //---------------------------------------------------------------------
-    //  testing the method
-    //  inline sal_Bool isValid( sal_uInt32 nMask ) const
+    // 	testing the method
+    // 	inline sal_Bool isValid( sal_uInt32 nMask ) const
     //---------------------------------------------------------------------
     class  isValid : public CppUnit::TestFixture
     {
@@ -1734,8 +1734,8 @@ namespace osl_VolumeInfo
     };// class isValid
 
      //---------------------------------------------------------------------
-    //  testing the method
-    //  inline sal_Bool getRemoteFlag() const
+    // 	testing the method
+    // 	inline sal_Bool getRemoteFlag() const
     //---------------------------------------------------------------------
     class  getRemoteFlag : public CppUnit::TestFixture
     {
@@ -1757,7 +1757,7 @@ namespace osl_VolumeInfo
                                      ( sal_False == bOk ) );
         }
 
- #if ( defined UNX ) || ( defined OS2 ) //remote Volume is different in Solaris and Windows
+ #if ( defined UNX ) || ( defined OS2 )	//remote Volume is different in Solaris and Windows
         void getRemoteFlag_002( )
         {
             sal_Int32 mask = VolumeInfoMask_Attributes;
@@ -1784,8 +1784,8 @@ namespace osl_VolumeInfo
     };// class getRemoteFlag
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline sal_Bool getRemoveableFlag() const
+    // 	testing the method
+    // 	inline sal_Bool getRemoveableFlag() const
     //---------------------------------------------------------------------
     class  getRemoveableFlag : public CppUnit::TestFixture
     {
@@ -1824,8 +1824,8 @@ namespace osl_VolumeInfo
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline sal_Bool getCompactDiscFlag() const
+    // 	testing the method
+    // 	inline sal_Bool getCompactDiscFlag() const
     //---------------------------------------------------------------------
     class  getCompactDiscFlag : public CppUnit::TestFixture
     {
@@ -1864,8 +1864,8 @@ namespace osl_VolumeInfo
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline sal_Bool getFloppyDiskFlag() const
+    // 	testing the method
+    // 	inline sal_Bool getFloppyDiskFlag() const
     //---------------------------------------------------------------------
     class  getFloppyDiskFlag : public CppUnit::TestFixture
     {
@@ -1904,8 +1904,8 @@ namespace osl_VolumeInfo
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline sal_Bool getFixedDiskFlag() const
+    // 	testing the method
+    // 	inline sal_Bool getFixedDiskFlag() const
     //---------------------------------------------------------------------
     class  getFixedDiskFlag : public CppUnit::TestFixture
     {
@@ -1943,8 +1943,8 @@ namespace osl_VolumeInfo
     };// class getFixedDiskFlag
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline sal_Bool getRAMDiskFlag() const
+    // 	testing the method
+    // 	inline sal_Bool getRAMDiskFlag() const
     //---------------------------------------------------------------------
     class  getRAMDiskFlag : public CppUnit::TestFixture
     {
@@ -1983,8 +1983,8 @@ namespace osl_VolumeInfo
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline sal_uInt64 getTotalSpace() const
+    // 	testing the method
+    // 	inline sal_uInt64 getTotalSpace() const
     //---------------------------------------------------------------------
     class  getTotalSpace : public CppUnit::TestFixture
     {
@@ -2064,8 +2064,8 @@ namespace osl_VolumeInfo
     };// class getTotalSpace
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline sal_uInt64 getFreeSpace() const
+    // 	testing the method
+    // 	inline sal_uInt64 getFreeSpace() const
     //---------------------------------------------------------------------
     class  getFreeSpace : public CppUnit::TestFixture
     {
@@ -2145,8 +2145,8 @@ namespace osl_VolumeInfo
     };// class getFreeSpace
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline sal_uInt64 getUsedSpace() const
+    // 	testing the method
+    // 	inline sal_uInt64 getUsedSpace() const
     //---------------------------------------------------------------------
     class  getUsedSpace : public CppUnit::TestFixture
     {
@@ -2228,8 +2228,8 @@ namespace osl_VolumeInfo
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline sal_uInt32 getMaxNameLength() const
+    // 	testing the method
+    // 	inline sal_uInt32 getMaxNameLength() const
     //---------------------------------------------------------------------
     class  getMaxNameLength : public CppUnit::TestFixture
     {
@@ -2287,8 +2287,8 @@ namespace osl_VolumeInfo
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline sal_uInt32 getMaxPathLength() const
+    // 	testing the method
+    // 	inline sal_uInt32 getMaxPathLength() const
     //---------------------------------------------------------------------
     class  getMaxPathLength : public CppUnit::TestFixture
     {
@@ -2340,8 +2340,8 @@ namespace osl_VolumeInfo
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline ::rtl::OUString getFileSystemName() const
+    // 	testing the method
+    // 	inline ::rtl::OUString getFileSystemName() const
     //---------------------------------------------------------------------
     class  getFileSystemName : public CppUnit::TestFixture
     {
@@ -2400,8 +2400,8 @@ namespace osl_VolumeInfo
     };// class getFileSystemName
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline VolumeDevice getDeviceHandle() const
+    // 	testing the method
+    // 	inline VolumeDevice getDeviceHandle() const
     //---------------------------------------------------------------------
     class  getDeviceHandle : public CppUnit::TestFixture
     {
@@ -2456,8 +2456,8 @@ namespace osl_FileStatus
 {
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  FileStatus( sal_uInt32 nMask ): _nMask( nMask )
+    // 	testing the method
+    // 	FileStatus( sal_uInt32 nMask ): _nMask( nMask )
     //---------------------------------------------------------------------
     class  ctors : public CppUnit::TestFixture
     {
@@ -2527,8 +2527,8 @@ namespace osl_FileStatus
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline sal_Bool isValid( sal_uInt32 nMask ) const
+    // 	testing the method
+    // 	inline sal_Bool isValid( sal_uInt32 nMask ) const
     //---------------------------------------------------------------------
     class  isValid : public CppUnit::TestFixture
     {
@@ -2631,13 +2631,13 @@ namespace osl_FileStatus
 //      only on one.
 //      Second, it's not a bug, if a value is not valid, it's an unhandled feature.
 
-//          sal_Bool bOk = rFileStatus.isValid( mask_file );
+// 			sal_Bool bOk = rFileStatus.isValid( mask_file );
 
                 check_FileStatus(rFileStatus);
             deleteTestFile( aTmpName6 );
 
                 // CPPUNIT_ASSERT_MESSAGE( "test for isValid function: regular file mask fields test, #FileStatusMask_CreationTime# should be valid field for regular file, but feedback is invalid",
-                //                      ( sal_True == bOk ) );
+                // 	 					( sal_True == bOk ) );
         }
 
         //Link is not defined in Windows, and on Linux, we can not get the directory item of the link file
@@ -2707,7 +2707,7 @@ namespace osl_FileStatus
 
                 check_FileStatus(rFileStatus_all);
 // LLA: this is wrong
-//          sal_Bool bOk1 = rFileStatus_all.isValid( mask_file_all );
+//			sal_Bool bOk1 = rFileStatus_all.isValid( mask_file_all );
 
             sal_uInt32 mask_file_val = FileStatusMask_Validate;
              ::osl::FileStatus   rFileStatus_val( mask_file_val );
@@ -2717,7 +2717,7 @@ namespace osl_FileStatus
 
                 check_FileStatus(rFileStatus_val);
                 // CPPUNIT_ASSERT_MESSAGE( "test for isValid function: check for Mask_All and Validate, really not sure what validate used for and how to use it, help me.  did not pass (W32)(UNX).",
-                //                      ( sal_False == bOk1 ) && ( sal_True == bOk2 )  );
+                // 	 					( sal_False == bOk1 ) && ( sal_True == bOk2 )  );
         }
 
 
@@ -2731,8 +2731,8 @@ namespace osl_FileStatus
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline Type getFileType() const
+    // 	testing the method
+    // 	inline Type getFileType() const
     //---------------------------------------------------------------------
     class  getFileType : public CppUnit::TestFixture
     {
@@ -2835,19 +2835,19 @@ namespace osl_FileStatus
  * LLA: removed, m_aSocketItem is wrong initialised.
  */
 
-// LLA:         void getFileType_005( )
-// LLA:         {
-// LLA: #if defined ( SOLARIS ) //Socket file may differ in Windows
+// LLA: 		void getFileType_005( )
+// LLA: 		{
+// LLA: #if defined ( SOLARIS )	//Socket file may differ in Windows
 // LLA:             // nError1 = ::osl::DirectoryItem::get( aTypeURL1, m_aSocketItem );
 // LLA:             nError1 = ::osl::DirectoryItem::get( rtl::OUString::createFromAscii("/dev/null"), m_aSocketItem );
 // LLA:             printError(nError1);
-// LLA:             CPPUNIT_ASSERT_MESSAGE("get Socket type file failed", ::osl::FileBase::E_None == nError1 );
+// LLA: 			CPPUNIT_ASSERT_MESSAGE("get Socket type file failed", ::osl::FileBase::E_None == nError1 );
 // LLA:
-// LLA:             //check for File type
-// LLA:             ::osl::FileStatus   rFileStatus( FileStatusMask_Type );
+// LLA: 			//check for File type
+// LLA:  			::osl::FileStatus   rFileStatus( FileStatusMask_Type );
 // LLA:
 // LLA:             nError1 = m_aSocketItem.getFileStatus( rFileStatus );
-// LLA:             CPPUNIT_ASSERT_MESSAGE("getFileStatus failed", ::osl::FileBase::E_None == nError1 );
+// LLA: 			CPPUNIT_ASSERT_MESSAGE("getFileStatus failed", ::osl::FileBase::E_None == nError1 );
 // LLA:
 // LLA:             if (rFileStatus.isValid( FileStatusMask_Type ))
 // LLA:             {
@@ -2857,11 +2857,11 @@ namespace osl_FileStatus
 // LLA:                                         ( eType == ::osl::FileStatus::Socket ) );
 // LLA:             }
 // LLA: #endif
-// LLA:         }
+// LLA: 		}
 
 
 // deprecated since there is a same case Directory::getNextItem_004
-/*#if defined 0 //( UNX ) //( SOLARIS ) //Link file is not defined in Windows
+/*#if defined 0 //( UNX ) //( SOLARIS )	//Link file is not defined in Windows
         void getFileType_006( )
         {
   nError1 = ::osl::DirectoryItem::get( aTypeURL3, m_aLinkItem );
@@ -2875,11 +2875,11 @@ namespace osl_FileStatus
             CPPUNIT_ASSERT_MESSAGE( "test for getFileType function: Link, UNX version ",
                                      ( ::osl::FileStatus::Link == rFileStatus.getFileType( ) ) );
         }
-#endif  */
+#endif	*/
 
         void getFileType_007( )
         {
-#if defined ( SOLARIS ) //Special file is differ in Windows
+#if defined ( SOLARIS )	//Special file is differ in Windows
                 nError1 = ::osl::DirectoryItem::get( aTypeURL2, m_aSpecialItem );
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
 
@@ -2911,8 +2911,8 @@ namespace osl_FileStatus
     };// class getFileType
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline sal_uInt64 getAttributes() const
+    // 	testing the method
+    // 	inline sal_uInt64 getAttributes() const
     //---------------------------------------------------------------------
     class  getAttributes : public CppUnit::TestFixture
     {
@@ -3004,7 +3004,7 @@ namespace osl_FileStatus
         }
 #endif
 
-#if ( defined UNX ) || ( defined OS2 )  //hidden file definition may different in Windows
+#if ( defined UNX ) || ( defined OS2 )	//hidden file definition may different in Windows
         void getAttributes_004( )
         {
             sal_Int32 test_Attributes = Attribute_Hidden;
@@ -3041,8 +3041,8 @@ namespace osl_FileStatus
     };// class getAttributes
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline TimeValue getAccessTime() const
+    // 	testing the method
+    // 	inline TimeValue getAccessTime() const
     //---------------------------------------------------------------------
     class  getAccessTime : public CppUnit::TestFixture
     {
@@ -3096,8 +3096,8 @@ namespace osl_FileStatus
     };// class getAccessTime
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline TimeValue getModifyTime() const
+    // 	testing the method
+    // 	inline TimeValue getModifyTime() const
     //---------------------------------------------------------------------
     class  getModifyTime : public CppUnit::TestFixture
     {
@@ -3150,8 +3150,8 @@ namespace osl_FileStatus
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline sal_uInt64 getFileSize() const
+    // 	testing the method
+    // 	inline sal_uInt64 getFileSize() const
     //---------------------------------------------------------------------
     class  getFileSize : public CppUnit::TestFixture
     {
@@ -3213,8 +3213,8 @@ namespace osl_FileStatus
     };// class getFileSize
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline ::rtl::OUString getFileName() const
+    // 	testing the method
+    // 	inline ::rtl::OUString getFileName() const
     //---------------------------------------------------------------------
     class  getFileName : public CppUnit::TestFixture
     {
@@ -3257,8 +3257,8 @@ namespace osl_FileStatus
     };// class getFileName
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline ::rtl::OUString getFileURL() const
+    // 	testing the method
+    // 	inline ::rtl::OUString getFileURL() const
     //---------------------------------------------------------------------
     class  getFileURL : public CppUnit::TestFixture
     {
@@ -3299,8 +3299,8 @@ namespace osl_FileStatus
     };// class getFileURL
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline ::rtl::OUString getLinkTargetURL() const
+    // 	testing the method
+    // 	inline ::rtl::OUString getLinkTargetURL() const
     //---------------------------------------------------------------------
     class  getLinkTargetURL : public CppUnit::TestFixture
     {
@@ -3323,7 +3323,7 @@ namespace osl_FileStatus
             deleteTestFile( aTypeURL );
         }
 
-#if ( defined UNX ) || ( defined OS2 )         //Link file is not define in Windows
+#if ( defined UNX ) || ( defined OS2 )	       //Link file is not define in Windows
         void getLinkTargetURL_001( )
         {
             //create a link file;
@@ -3389,8 +3389,8 @@ namespace osl_FileStatus
 namespace osl_File
 {
     //---------------------------------------------------------------------
-    //  testing the method
-    //  File( const ::rtl::OUString& ustrFileURL )
+    // 	testing the method
+    // 	File( const ::rtl::OUString& ustrFileURL )
     //---------------------------------------------------------------------
     class  ctors : public CppUnit::TestFixture
     {
@@ -3444,8 +3444,8 @@ namespace osl_File
     };// class ctors
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline RC open( sal_uInt32 uFlags )
+    // 	testing the method
+    // 	inline RC open( sal_uInt32 uFlags )
     //---------------------------------------------------------------------
     class  open : public CppUnit::TestFixture
     {
@@ -3565,8 +3565,8 @@ namespace osl_File
     };// class open
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline RC close()
+    // 	testing the method
+    // 	inline RC close()
     //---------------------------------------------------------------------
     class  close : public CppUnit::TestFixture
     {
@@ -3626,8 +3626,8 @@ namespace osl_File
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline RC setPos( sal_uInt32 uHow, sal_Int64 uPos )
+    // 	testing the method
+    // 	inline RC setPos( sal_uInt32 uHow, sal_Int64 uPos )
     //---------------------------------------------------------------------
     class  setPos : public CppUnit::TestFixture
     {
@@ -3729,8 +3729,8 @@ namespace osl_File
     };// class setPos
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline RC getPos( sal_uInt64& uPos )
+    // 	testing the method
+    // 	inline RC getPos( sal_uInt64& uPos )
     //---------------------------------------------------------------------
     class  getPos : public CppUnit::TestFixture
     {
@@ -3794,8 +3794,8 @@ namespace osl_File
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline RC isEndOfFile( sal_Bool *pIsEOF )
+    // 	testing the method
+    // 	inline RC isEndOfFile( sal_Bool *pIsEOF )
     //---------------------------------------------------------------------
     class  isEndOfFile : public CppUnit::TestFixture
     {
@@ -3888,8 +3888,8 @@ namespace osl_File
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline RC setSize( sal_uInt64 uSize )
+    // 	testing the method
+    // 	inline RC setSize( sal_uInt64 uSize )
     //---------------------------------------------------------------------
     class  setSize : public CppUnit::TestFixture
     {
@@ -3978,7 +3978,7 @@ namespace osl_File
             CPPUNIT_ASSERT_MESSAGE( "test for setSize function: truncate the file ",
                                      10 == nFilePointer );
         }
-      /*            void setSize_003( )
+      /*	        void setSize_003( )
         {
             ::osl::File   testFile( aTmpName4 );
             // sal_Bool      bEOF  = sal_False;
@@ -4015,8 +4015,8 @@ namespace osl_File
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline RC read( void *pBuffer, sal_uInt64 uBytesRequested, sal_uInt64& rBytesRead )
+    // 	testing the method
+    // 	inline RC read( void *pBuffer, sal_uInt64 uBytesRequested, sal_uInt64& rBytesRead )
     //---------------------------------------------------------------------
     class  read : public CppUnit::TestFixture
     {
@@ -4103,8 +4103,8 @@ namespace osl_File
     };// class read
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline RC write(const void *pBuffer, sal_uInt64 uBytesToWrite, sal_uInt64& rBytesWritten)
+    // 	testing the method
+    // 	inline RC write(const void *pBuffer, sal_uInt64 uBytesToWrite, sal_uInt64& rBytesWritten)
     //---------------------------------------------------------------------
     class  write : public CppUnit::TestFixture
     {
@@ -4162,8 +4162,8 @@ namespace osl_File
     };// class write
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline RC readLine( ::rtl::ByteSequence& aSeq )
+    // 	testing the method
+    // 	inline RC readLine( ::rtl::ByteSequence& aSeq )
     //---------------------------------------------------------------------
     class  readLine : public CppUnit::TestFixture
     {
@@ -4246,8 +4246,8 @@ namespace osl_File
     };// class readLine
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline static RC copy( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL )
+    // 	testing the method
+    // 	inline static RC copy( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL )
     //---------------------------------------------------------------------
     class  copy : public CppUnit::TestFixture
     {
@@ -4350,7 +4350,7 @@ namespace osl_File
         File newFile( aTmpName4 );
         newFile.open( OpenFlag_Write | OpenFlag_Read );
         newFile.setPos( Pos_End, 0 );
-        //      CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
+        //		CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
         sal_uInt64     nFilePointer;
         nError1 = newFile.getPos( nFilePointer );
         CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
@@ -4380,8 +4380,8 @@ namespace osl_File
     };// class copy
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline static RC move( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL )
+    // 	testing the method
+    // 	inline static RC move( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL )
     //---------------------------------------------------------------------
     class  move : public CppUnit::TestFixture
     {
@@ -4535,15 +4535,15 @@ namespace osl_File
         CPPUNIT_TEST( move_005 );
         CPPUNIT_TEST( move_006 );
         CPPUNIT_TEST( move_007 );
-      //      CPPUNIT_TEST( move_008 );
+      //	  CPPUNIT_TEST( move_008 );
       //CPPUNIT_TEST( move_009 );
         CPPUNIT_TEST_SUITE_END( );
     };// class move
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline static RC remove( const ::rtl::OUString& ustrFileURL )
+    // 	testing the method
+    // 	inline static RC remove( const ::rtl::OUString& ustrFileURL )
     //---------------------------------------------------------------------
     class  remove : public CppUnit::TestFixture
     {
@@ -4627,8 +4627,8 @@ namespace osl_File
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline static RC setAttributes( const ::rtl::OUString& ustrFileURL, sal_uInt64 uAttributes )
+    // 	testing the method
+    // 	inline static RC setAttributes( const ::rtl::OUString& ustrFileURL, sal_uInt64 uAttributes )
     //---------------------------------------------------------------------
     class  setAttributes : public CppUnit::TestFixture
     {
@@ -4718,12 +4718,12 @@ namespace osl_File
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline static RC setTime(
-    //         const ::rtl::OUString& ustrFileURL,
-    //         const TimeValue& rCreationTime,
-    //         const TimeValue& rLastAccessTime,
-    //         const TimeValue& rLastWriteTime )
+    // 	testing the method
+    // 	inline static RC setTime(
+    // 	       const ::rtl::OUString& ustrFileURL,
+    // 	       const TimeValue& rCreationTime,
+    // 	       const TimeValue& rLastAccessTime,
+    // 	       const TimeValue& rLastWriteTime )
     //---------------------------------------------------------------------
     class  setTime : public CppUnit::TestFixture
     {
@@ -4805,8 +4805,8 @@ namespace osl_File
     };// class setTime
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline static RC sync()
+    // 	testing the method
+    // 	inline static RC sync()
     //---------------------------------------------------------------------
         class  sync : public CppUnit::TestFixture
     {
@@ -4892,8 +4892,8 @@ namespace osl_File
 namespace osl_DirectoryItem
 {
     //---------------------------------------------------------------------
-    //  testing the method
-    //  DirectoryItem(): _pData( NULL )
+    // 	testing the method
+    // 	DirectoryItem(): _pData( NULL )
     //---------------------------------------------------------------------
     class  ctors : public CppUnit::TestFixture
     {
@@ -4933,8 +4933,8 @@ namespace osl_DirectoryItem
     };// class ctors
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  DirectoryItem( const DirectoryItem& rItem ): _pData( rItem._pData)
+    // 	testing the method
+    // 	DirectoryItem( const DirectoryItem& rItem ): _pData( rItem._pData)
     //---------------------------------------------------------------------
     class  copy_assin_Ctors : public CppUnit::TestFixture
     {
@@ -4995,8 +4995,8 @@ namespace osl_DirectoryItem
     };// class copy_assin_Ctors
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline sal_Bool is()
+    // 	testing the method
+    // 	inline sal_Bool is()
     //---------------------------------------------------------------------
     class  is : public CppUnit::TestFixture
     {
@@ -5043,8 +5043,8 @@ namespace osl_DirectoryItem
     };// class is
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  static inline RC get( const ::rtl::OUString& ustrFileURL, DirectoryItem& rItem )
+    // 	testing the method
+    // 	static inline RC get( const ::rtl::OUString& ustrFileURL, DirectoryItem& rItem )
     //---------------------------------------------------------------------
     class  get : public CppUnit::TestFixture
     {
@@ -5109,8 +5109,8 @@ namespace osl_DirectoryItem
     };// class get
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline RC getFileStatus( FileStatus& rStatus )
+    // 	testing the method
+    // 	inline RC getFileStatus( FileStatus& rStatus )
     //---------------------------------------------------------------------
     class  getFileStatus : public CppUnit::TestFixture
     {
@@ -5203,8 +5203,8 @@ namespace osl_DirectoryItem
 namespace osl_Directory
 {
     //---------------------------------------------------------------------
-    //  testing the method
-    //  Directory( const ::rtl::OUString& strPath ): _pData( 0 ), _aPath( strPath )
+    // 	testing the method
+    // 	Directory( const ::rtl::OUString& strPath ): _pData( 0 ), _aPath( strPath )
     //---------------------------------------------------------------------
     class  ctors : public CppUnit::TestFixture
     {
@@ -5267,8 +5267,8 @@ namespace osl_Directory
     };// class ctors
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline RC open()
+    // 	testing the method
+    // 	inline RC open()
     //---------------------------------------------------------------------
     class  open : public CppUnit::TestFixture
     {
@@ -5365,8 +5365,8 @@ namespace osl_Directory
     };// class open
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline sal_Bool isOpen() { return _pData != NULL; };
+    // 	testing the method
+    // 	inline sal_Bool isOpen() { return _pData != NULL; };
     //---------------------------------------------------------------------
     class  isOpen : public CppUnit::TestFixture
     {
@@ -5422,8 +5422,8 @@ namespace osl_Directory
     };// class isOpen
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline RC close()
+    // 	testing the method
+    // 	inline RC close()
     //---------------------------------------------------------------------
     class  close : public CppUnit::TestFixture
     {
@@ -5478,8 +5478,8 @@ namespace osl_Directory
     };// class close
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline RC reset()
+    // 	testing the method
+    // 	inline RC reset()
     //---------------------------------------------------------------------
     class  reset : public CppUnit::TestFixture
     {
@@ -5588,8 +5588,8 @@ namespace osl_Directory
     };// class reset
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline RC getNextItem( DirectoryItem& rItem, sal_uInt32 nHint = 0 )
+    // 	testing the method
+    // 	inline RC getNextItem( DirectoryItem& rItem, sal_uInt32 nHint = 0 )
     //---------------------------------------------------------------------
     class  getNextItem : public CppUnit::TestFixture
     {
@@ -5743,8 +5743,8 @@ namespace osl_Directory
     };// class getNextItem
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline static RC getVolumeInfo( const ::rtl::OUString& ustrDirectoryURL, VolumeInfo& rInfo )
+    // 	testing the method
+    // 	inline static RC getVolumeInfo( const ::rtl::OUString& ustrDirectoryURL, VolumeInfo& rInfo )
     //---------------------------------------------------------------------
     class  getVolumeInfo : public CppUnit::TestFixture
     {
@@ -5921,8 +5921,8 @@ namespace osl_Directory
 
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline static RC create( const ::rtl::OUString& ustrDirectoryURL )
+    // 	testing the method
+    // 	inline static RC create( const ::rtl::OUString& ustrDirectoryURL )
     //---------------------------------------------------------------------
     class  create : public CppUnit::TestFixture
     {
@@ -5975,8 +5975,8 @@ namespace osl_Directory
     };// class create
 
     //---------------------------------------------------------------------
-    //  testing the method
-    //  inline static RC remove( const ::rtl::OUString& ustrDirectoryURL )
+    // 	testing the method
+    // 	inline static RC remove( const ::rtl::OUString& ustrDirectoryURL )
     //---------------------------------------------------------------------
     class  remove : public CppUnit::TestFixture
     {
diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h
index 150dd6071c42..6e9542eef68d 100644
--- a/sal/qa/osl/file/osl_File_Const.h
+++ b/sal/qa/osl/file/osl_File_Const.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,81 +55,81 @@ extern "C"
 #endif
 
 
-
+    
 //------------------------------------------------------------------------
 // common used string resource
 // these common used string will be used as assist resource in test
 // they are mostly OS independent, some of the resource can be reused
-// so, acommon test data repository will be better since it can be
-// shared among all test code
+// so, acommon test data repository will be better since it can be 
+// shared among all test code 
 //------------------------------------------------------------------------
-
+    
 const sal_Char pBuffer_Char[]   = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
 const sal_Char pBuffer_Number[] = "1234567890";
 const sal_Char pBuffer_Blank[]  = "";
-
+    
 #define TRUNC_LEN               10;
 #define ENLARG_LEN              100;
 
 
-
+    
 //------------------------------------------------------------------------
-// OS dependent/independent definitions/includes
-// we use FILE_PREFIX for URL prefix,
-//        TEST_PLATFORM for test platform initial,
-//        TEST_PLATFORM_ROOT for root dir in comrresponding platform,
-//        TEST_PLATFORM_TEMP for temp dir in comrresponding platform,
+// OS dependent/independent definitions/includes  
+// we use FILE_PREFIX for URL prefix, 
+//        TEST_PLATFORM for test platform initial, 
+//        TEST_PLATFORM_ROOT for root dir in comrresponding platform, 
+//        TEST_PLATFORM_TEMP for temp dir in comrresponding platform, 
 //        PATH_LIST_DELIMITER for seperator of path list in comrresponding platform,
 //        PATH_SEPERATOR for seperator in URL or system path in comrresponding platform,
 //        PATH_MAX/MAX_PATH for max path length in comrresponding platform,
 //------------------------------------------------------------------------
-
+    
 //------------------------------------------------------------------------
 // OS independent const definition
 //------------------------------------------------------------------------
-#   define FILE_PREFIX          "file:///"
-#   define TEST_FILE_SIZE       1024
+#	define FILE_PREFIX          "file:///"
+#	define TEST_FILE_SIZE       1024
 
 //------------------------------------------------------------------------
 // OS dependent declaration and includes
 //------------------------------------------------------------------------
 #if ( defined UNX ) || ( defined OS2 )  //Unix
-#   include <unistd.h>
-#   include <limits.h>
-#   include <math.h>
-#   include <errno.h>
-#   include <fcntl.h>
-#   include <sys/stat.h>
-#   include <sys/statfs.h>
-#   include <sys/statvfs.h>
-#   include <sys/types.h>
-#   define TEST_PLATFORM        ""
-#   define TEST_PLATFORM_ROOT   "/"
-#   define TEST_PLATFORM_TEMP   "tmp"
-#   define PATH_LIST_DELIMITER  ":"
-#   define PATH_SEPERATOR       "/"
+#	include <unistd.h>
+#	include <limits.h>
+#	include <math.h>
+#	include <errno.h>
+#	include <fcntl.h>
+#	include <sys/stat.h>
+#	include <sys/statfs.h>
+#	include <sys/statvfs.h>
+#	include <sys/types.h>
+#	define TEST_PLATFORM        ""
+#	define TEST_PLATFORM_ROOT   "/"
+#	define TEST_PLATFORM_TEMP   "tmp"
+#	define PATH_LIST_DELIMITER  ":"
+#	define PATH_SEPERATOR       "/"
 #endif
 #if (defined WNT )                      // Windows
 #include <tools/prewin.h>
-// #    include <windows.h>
+// #	include <windows.h>
 #   include <tchar.h>
-#   include <io.h>
-#   include <stdio.h>
-#   include <stdlib.h>
+#	include <io.h>
+#	include <stdio.h>
+#	include <stdlib.h>
 #include <tools/postwin.h>
-#   define PATH_MAX             MAX_PATH
-#   define TEST_PLATFORM        "c:/"
-#   define TEST_PLATFORM_ROOT   "c:/"
-#   define TEST_PLATFORM_TEMP   "temp"
-#   define PATH_LIST_DELIMITER  ";"
-#   define PATH_SEPERATOR       "/"
+#	define PATH_MAX             MAX_PATH
+#	define TEST_PLATFORM        "c:/"
+#	define TEST_PLATFORM_ROOT   "c:/"
+#	define TEST_PLATFORM_TEMP   "temp"
+#	define PATH_LIST_DELIMITER  ";"
+#	define PATH_SEPERATOR		"/"
 #endif
 
 
 //------------------------------------------------------------------------
-// macro definition for the ASCII array/OUString declarations,
-// we use p### for the ASCII array,
-//        a### for the OUString,
+// macro definition for the ASCII array/OUString declarations, 
+// we use p### for the ASCII array, 
+//        a### for the OUString, 
 //        n###Len for its length
 //------------------------------------------------------------------------
 
@@ -145,46 +145,46 @@ const sal_Char pBuffer_Blank[]  = "";
 OSLTEST_DECLARE( NullURL,  "" );
 OSLTEST_DECLARE( SlashURL, PATH_SEPERATOR );
 OSLTEST_DECLARE( PreURL, FILE_PREFIX );
-OSLTEST_DECLARE( RootURL,  FILE_PREFIX TEST_PLATFORM );
+OSLTEST_DECLARE( RootURL,  FILE_PREFIX TEST_PLATFORM ); 
 
-OSLTEST_DECLARE( TempDirectoryURL,  FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP );
-OSLTEST_DECLARE( TempDirectorySys,  TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP );
-OSLTEST_DECLARE( UserDirectoryURL,  FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "" );
+OSLTEST_DECLARE( TempDirectoryURL,  FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP ); 
+OSLTEST_DECLARE( TempDirectorySys,  TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP ); 
+OSLTEST_DECLARE( UserDirectoryURL,  FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "" ); 
 OSLTEST_DECLARE( UserDirectorySys,  TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "" );
 
 //------------------------------------------------------------------------
 // common used URL:temp, canonical, root, relative, link,etc
 //------------------------------------------------------------------------
-OSLTEST_DECLARE( CanURL1,  FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/canonical.name" );
-OSLTEST_DECLARE( CanURL2,  "ca@#;+.,$///78no\0ni..name" );
-OSLTEST_DECLARE( CanURL3,  "ca@#;+.,$//tmp/678nonical//name" );
-OSLTEST_DECLARE( CanURL4,  "canonical.name" );
+OSLTEST_DECLARE( CanURL1,  FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/canonical.name" ); 
+OSLTEST_DECLARE( CanURL2,  "ca@#;+.,$///78no\0ni..name" ); 
+OSLTEST_DECLARE( CanURL3,  "ca@#;+.,$//tmp/678nonical//name" ); 
+OSLTEST_DECLARE( CanURL4,  "canonical.name" ); 
 OSLTEST_DECLARE( TmpName1, "tmpdir" );
-OSLTEST_DECLARE( TmpName2, "tmpname" );
-OSLTEST_DECLARE( TmpName3, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/tmpdir" );
-OSLTEST_DECLARE( TmpName4, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/tmpdir/tmpname" );
-OSLTEST_DECLARE( TmpName5, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/tmpdir/../tmpdir/./tmpname" );
-OSLTEST_DECLARE( TmpName6, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/tmpname" );
-OSLTEST_DECLARE( TmpName7, FILE_PREFIX TEST_PLATFORM "tmpname" );
-OSLTEST_DECLARE( TmpName8, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/tmpname/tmpdir" );
-OSLTEST_DECLARE( TmpName9, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/tmpdir/../tmpdir/./" );
+OSLTEST_DECLARE( TmpName2, "tmpname" ); 
+OSLTEST_DECLARE( TmpName3, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/tmpdir" ); 
+OSLTEST_DECLARE( TmpName4, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/tmpdir/tmpname" ); 
+OSLTEST_DECLARE( TmpName5, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/tmpdir/../tmpdir/./tmpname" ); 
+OSLTEST_DECLARE( TmpName6, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/tmpname" ); 
+OSLTEST_DECLARE( TmpName7, FILE_PREFIX TEST_PLATFORM "tmpname" ); 
+OSLTEST_DECLARE( TmpName8, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/tmpname/tmpdir" ); 
+OSLTEST_DECLARE( TmpName9, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/tmpdir/../tmpdir/./" ); 
 OSLTEST_DECLARE_UTF8( TmpName10, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/%E6%9C%AA%E5%91%BD%E5%90%8Dzhgb18030" );
 
-OSLTEST_DECLARE( RelURL1,  "relative/file1" );
-OSLTEST_DECLARE( RelURL2,  "relative/./file2" );
+OSLTEST_DECLARE( RelURL1,  "relative/file1" ); 
+OSLTEST_DECLARE( RelURL2,  "relative/./file2" ); 
 OSLTEST_DECLARE( RelURL3,  "relative/../file3" );
-OSLTEST_DECLARE( RelURL4,  "././relative/../file4" );
-OSLTEST_DECLARE( RelURL5,  TEST_PLATFORM_TEMP "/./../" TEST_PLATFORM_TEMP );
+OSLTEST_DECLARE( RelURL4,  "././relative/../file4" ); 
+OSLTEST_DECLARE( RelURL5,  TEST_PLATFORM_TEMP "/./../" TEST_PLATFORM_TEMP ); 
 OSLTEST_DECLARE( LnkURL1,  FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/link.file" );
 OSLTEST_DECLARE( HidURL1,  ".hiddenfile" );
 
 //------------------------------------------------------------------------
 // common used System Path:temp, root,etc
 //------------------------------------------------------------------------
-OSLTEST_DECLARE( RootSys,  TEST_PLATFORM_ROOT );
-OSLTEST_DECLARE( SysPath1, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/system.path" );
-OSLTEST_DECLARE( SysPath2, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/system/path" );
-OSLTEST_DECLARE( SysPath3, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/tmpdir" );
+OSLTEST_DECLARE( RootSys,  TEST_PLATFORM_ROOT ); 
+OSLTEST_DECLARE( SysPath1, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/system.path" ); 
+OSLTEST_DECLARE( SysPath2, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/system/path" ); 
+OSLTEST_DECLARE( SysPath3, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/tmpdir" ); 
 OSLTEST_DECLARE( SysPath4, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/tmpname" );
 OSLTEST_DECLARE_UTF8( SysPath5, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/%E6%9C%AA%E5%91%BD%E5%90%8Dzhgb18030" );
 OSLTEST_DECLARE( FifoSys,  TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/tmpdir/fifo" );
@@ -197,7 +197,7 @@ OSLTEST_DECLARE( FifoSys,  TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/tmpdir/fifo"
 #if ( defined UNX ) || ( defined OS2 )                                 //          Unix
 OSLTEST_DECLARE( TypeURL1,  FILE_PREFIX "dev/ccv");                    //socket    Solaris/Linux
 OSLTEST_DECLARE( TypeURL2,  FILE_PREFIX "devices/pseudo/tcp@0:tcp");   //special   Solaris/Linux
-OSLTEST_DECLARE( TypeURL3,  FILE_PREFIX "lib" );                       //link      Solaris
+OSLTEST_DECLARE( TypeURL3,  FILE_PREFIX "lib" );                       //link      Solaris 
 #else                                                                  //          Windows
 OSLTEST_DECLARE( TypeURL1,  FILE_PREFIX "" );
 OSLTEST_DECLARE( TypeURL2,  FILE_PREFIX "" );
@@ -208,18 +208,18 @@ OSLTEST_DECLARE( TypeURL3,  FILE_PREFIX "" );
 // Volume device URL, we pick some canonical volume device for test:
 // UNIX file system, Floppy Disk, Proc file system, Temp file system, Compact Disk.
 //------------------------------------------------------------------------
-#if ( defined UNX ) || ( defined OS2 )                  //          Unix
-OSLTEST_DECLARE( VolURL1,  FILE_PREFIX  "");            //ufs       Solaris/Linux
+#if ( defined UNX ) || ( defined OS2 )					//			Unix
+OSLTEST_DECLARE( VolURL1,  FILE_PREFIX  "");			//ufs		Solaris/Linux
 #ifdef SOLARIS
-OSLTEST_DECLARE( VolURL2,  FILE_PREFIX  "dev/fd" );     //fd        Solaris
+OSLTEST_DECLARE( VolURL2,  FILE_PREFIX  "dev/fd" );		//fd		Solaris 
 #else
-OSLTEST_DECLARE( VolURL2,  FILE_PREFIX  "dev/floppy/0u1440" );  //fd0       Linux
+OSLTEST_DECLARE( VolURL2,  FILE_PREFIX  "dev/floppy/0u1440" );	//fd0		Linux
 #endif
-OSLTEST_DECLARE( VolURL3,  FILE_PREFIX  "proc" );       //proc      Solaris/Linux
-OSLTEST_DECLARE( VolURL4,  FILE_PREFIX  "staroffice" ); //nfs       Solaris/Linux
-OSLTEST_DECLARE( VolURL5,  FILE_PREFIX  "tmp" );        //tmpfs     Solaris
-OSLTEST_DECLARE( VolURL6,  FILE_PREFIX  "cdrom" );      //cd        Solaris
-#else                                                   //          Windows
+OSLTEST_DECLARE( VolURL3,  FILE_PREFIX  "proc" );		//proc		Solaris/Linux
+OSLTEST_DECLARE( VolURL4,  FILE_PREFIX  "staroffice" );	//nfs		Solaris/Linux
+OSLTEST_DECLARE( VolURL5,  FILE_PREFIX  "tmp" );		//tmpfs		Solaris
+OSLTEST_DECLARE( VolURL6,  FILE_PREFIX  "cdrom" );		//cd		Solaris
+#else													//			Windows
 OSLTEST_DECLARE( VolURL1,  FILE_PREFIX  "c:/" );
 OSLTEST_DECLARE( VolURL2,  FILE_PREFIX  "a:/" );
 OSLTEST_DECLARE( VolURL3,  FILE_PREFIX  "" );
diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx
index 87908c8b70a2..725347884843 100644
--- a/sal/qa/osl/file/osl_old_test_file.cxx
+++ b/sal/qa/osl/file/osl_old_test_file.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -157,7 +157,7 @@ void oldtestfile::test_file_002()
         }
         OString o = OUStringToOString( target , RTL_TEXTENCODING_ASCII_US );
         OString obase = OUStringToOString( base2 , RTL_TEXTENCODING_ASCII_US );
-//      fprintf( stderr, "%d %s + %s = %s\n" ,e, obase.getStr(), aSource2[i], o.pData->buffer );
+//		fprintf( stderr, "%d %s + %s = %s\n" ,e, obase.getStr(), aSource2[i], o.pData->buffer );
     }
 }
 
@@ -203,7 +203,7 @@ void oldtestfile::test_file_003()
                                                             int j;
                                                             for( j = dir.getLength() ;
                                      j < target.getLength() &&
-                                         aSource3[i+1][j-dir.getLength()] == target[j]   ; j++ );
+                                         aSource3[i+1][j-dir.getLength()] == target[j]	 ; j++ );
                                 CPPUNIT_ASSERT_MESSAGE("failure #5",  j == target.getLength() );
                             }
                         }
@@ -261,7 +261,7 @@ void oldtestfile::test_file_004()
     }
 
 
-//  fprintf( stderr, "test_file done\n" );
+//	fprintf( stderr, "test_file done\n" );
 }
 
 } // namespace osl_test_file
diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx
index 291a8022036c..7f3e85ad4a92 100644
--- a/sal/qa/osl/file/test_cpy_wrt_file.cxx
+++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/osl/module/export_dll.map b/sal/qa/osl/module/export_dll.map
index 87c701f21d91..17e219e9cd59 100644
--- a/sal/qa/osl/module/export_dll.map
+++ b/sal/qa/osl/module/export_dll.map
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx
index 7ee367d95ae9..ff484d96193b 100644
--- a/sal/qa/osl/module/osl_Module.cxx
+++ b/sal/qa/osl/module/osl_Module.cxx
@@ -2,7 +2,7 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,14 +28,14 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-
+ 
 //------------------------------------------------------------------------
 // include files
 //------------------------------------------------------------------------
-#include <osl_Module_Const.h>
+#include <osl_Module_Const.h> 
 
-using namespace osl;
-using namespace rtl;
+using namespace	osl;
+using namespace	rtl;
 
 
 //------------------------------------------------------------------------
@@ -47,14 +47,14 @@ using namespace rtl;
 inline void printBool( sal_Bool bOk )
 {
     t_print("#printBool# " );
-    ( sal_True == bOk ) ? t_print("TRUE!\n" ): t_print("FALSE!\n" );
+    ( sal_True == bOk ) ? t_print("TRUE!\n" ): t_print("FALSE!\n" );		
 }
 
 /** print a UNI_CODE String.
 */
 inline void printUString( const ::rtl::OUString & str )
 {
-    rtl::OString aString;
+    rtl::OString aString; 
 
     t_print("#printUString_u# " );
     aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
@@ -65,12 +65,12 @@ inline void printUString( const ::rtl::OUString & str )
 */
 inline ::rtl::OUString getDllURL( void )
 {
-#if ( defined WNT )        // lib in Unix and lib in Windows are not same in file name.
+#if ( defined WNT )	       // lib in Unix and lib in Windows are not same in file name.
     ::rtl::OUString libPath( rtl::OUString::createFromAscii( "Module_DLL.dll" ) );
 #else
     ::rtl::OUString libPath( rtl::OUString::createFromAscii( "libModule_DLL.so" ) );
 #endif
-
+    
     ::rtl::OUString dirPath, dllPath;
     osl::Module::getUrlFromAddress( ( void* ) &getDllURL, dirPath );
     dirPath = dirPath.copy( 0, dirPath.lastIndexOf('/') + 1);
@@ -101,12 +101,12 @@ inline sal_Bool isURL( const ::rtl::OUString pathname )
 inline void createTestDirectory( const ::rtl::OUString dirname )
 {
     ::rtl::OUString     aPathURL   = dirname.copy( 0 );
-    ::osl::FileBase::RC nError;
-
+    ::osl::FileBase::RC	nError;
+    
     if ( !isURL( dirname ) )
-        ::osl::FileBase::getFileURLFromSystemPath( dirname, aPathURL ); //convert if not full qualified URL
+        ::osl::FileBase::getFileURLFromSystemPath( dirname, aPathURL ); //convert if not full qualified URL	
     nError = ::osl::Directory::create( aPathURL );
-    CPPUNIT_ASSERT_MESSAGE( "In createTestDirectory Function: creation: ", ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_EXIST ) );
+    CPPUNIT_ASSERT_MESSAGE( "In createTestDirectory Function: creation: ", ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_EXIST ) );	
 }
 
 /** delete a temp test directory using OUString name of full qualified URL or system path.
@@ -114,32 +114,32 @@ inline void createTestDirectory( const ::rtl::OUString dirname )
 inline void deleteTestDirectory( const ::rtl::OUString dirname )
 {
     ::rtl::OUString     aPathURL   = dirname.copy( 0 );
-    ::osl::FileBase::RC nError;
+    ::osl::FileBase::RC	nError;
     if ( !isURL( dirname ) )
-        ::osl::FileBase::getFileURLFromSystemPath( dirname, aPathURL ); //convert if not full qualified URL
+        ::osl::FileBase::getFileURLFromSystemPath( dirname, aPathURL ); //convert if not full qualified URL	
 
     ::osl::Directory testDir( aPathURL );
     if ( testDir.isOpen( ) == sal_True )
     {
             testDir.close( );  //close if still open.
         }
-
+    
     nError = ::osl::Directory::remove( aPathURL );
-     CPPUNIT_ASSERT_MESSAGE( "In deleteTestDirectory function: remove ", ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_NOENT ) );
+     CPPUNIT_ASSERT_MESSAGE( "In deleteTestDirectory function: remove ", ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_NOENT ) );	
 }
 
 //check if the file exist
 inline sal_Bool ifFileExist( const ::rtl::OUString & str )
 {
-    ::rtl::OUString     aUStr;
+    ::rtl::OUString 	aUStr;	
     if ( isURL( str ) )
-        ::osl::FileBase::getSystemPathFromFileURL( str, aUStr );
-    else
+        ::osl::FileBase::getSystemPathFromFileURL( str, aUStr ); 
+    else 
         return sal_False;
-
+    
     ::osl::File strFile( aUStr );
-    ::osl::FileBase::RC nError = strFile.open( OpenFlag_Read );
-    if ( ::File::E_NOENT == nError )
+    ::osl::FileBase::RC	nError = strFile.open( OpenFlag_Read );
+    if ( ::File::E_NOENT == nError ) 
         return sal_False;
     else{
         strFile.close( );
@@ -151,17 +151,17 @@ inline sal_Bool ifFileExist( const ::rtl::OUString & str )
 */
 inline void deleteTestFile( const ::rtl::OUString filename )
 {
-    ::rtl::OUString aPathURL   = filename.copy( 0 );
-    ::osl::FileBase::RC nError;
-
+    ::rtl::OUString	aPathURL   = filename.copy( 0 );
+    ::osl::FileBase::RC	nError;
+    
     if ( !isURL( filename ) )
         ::osl::FileBase::getFileURLFromSystemPath( filename, aPathURL ); //convert if not full qualified URL
-
-    nError = ::osl::File::setAttributes( aPathURL, Attribute_GrpWrite| Attribute_OwnWrite| Attribute_OthWrite ); // if readonly, make writtenable.
-    CPPUNIT_ASSERT_MESSAGE( "In deleteTestFile Function: set writtenable ", ( ::osl::FileBase::E_None == nError ) || ( ::osl::FileBase::E_NOENT == nError ) );
-
+        
+    nError = ::osl::File::setAttributes( aPathURL, Attribute_GrpWrite| Attribute_OwnWrite| Attribute_OthWrite ); // if readonly, make writtenable. 
+    CPPUNIT_ASSERT_MESSAGE( "In deleteTestFile Function: set writtenable ", ( ::osl::FileBase::E_None == nError ) || ( ::osl::FileBase::E_NOENT == nError ) );	
+    
     nError = ::osl::File::remove( aPathURL );
-    CPPUNIT_ASSERT_MESSAGE( "In deleteTestFile Function: remove ", ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_NOENT ) );
+    CPPUNIT_ASSERT_MESSAGE( "In deleteTestFile Function: remove ", ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_NOENT ) );	
 }
 
 
@@ -184,7 +184,7 @@ namespace osl_Module
         };
     };
 
-
+    
     /** testing the methods:
         Module();
         Module( const ::rtl::OUString& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT);
@@ -193,16 +193,16 @@ namespace osl_Module
     {
     public:
         sal_Bool bRes, bRes1;
-
+    
         void ctors_none( )
         {
             ::osl::Module aMod;
             bRes = aMod.is();
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: test constructor without parameter.",
+            
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: test constructor without parameter.", 
                                     sal_False == bRes  );
         }
-
+    
         void ctors_name_mode( )
         {
             OUString aFileURL;
@@ -212,22 +212,22 @@ namespace osl_Module
             {
                 CPPUNIT_ASSERT_MESSAGE("Cannot locate current module.",  sal_False  );
             }
-
+            
             ::osl::Module aMod( aFileURL );
             bRes = aMod.is( );
             aMod.unload( );
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: test constructor with load action.",
+            
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: test constructor with load action.", 
                                     sal_True == bRes  );
         }
 
         CPPUNIT_TEST_SUITE( ctors );
         CPPUNIT_TEST( ctors_none );
         CPPUNIT_TEST( ctors_name_mode );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class ctors
 
-
+    
     /** testing the methods:
         static sal_Bool getUrlFromAddress(void * addr, ::rtl::OUString & libraryUrl)
     */
@@ -245,15 +245,15 @@ namespace osl_Module
                 CPPUNIT_ASSERT_MESSAGE("Cannot locate current module.",  sal_False  );
             }
 
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: test get Module URL from address.",
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: test get Module URL from address.", 
                                     sal_True == bRes && 0 < aFileURL.lastIndexOf('/')  );
         }
-
+        
         void getUrlFromAddress_002( )
         {
             ::osl::Module aMod( getDllURL( ) );
-            FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString::createFromAscii( "firstfunc" ) );
-
+            FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString::createFromAscii( "firstfunc" ) ); 
+            
             OUString aFileURL;
             bRes = osl::Module::getUrlFromAddress( ( void* )pFunc, aFileURL );
             if ( !( bRes  ) )
@@ -262,21 +262,21 @@ namespace osl_Module
             }
             aMod.unload( );
 
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: load an external library, get its function address and get its URL.",
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: load an external library, get its function address and get its URL.", 
                                     sal_True == bRes && 0 < aFileURL.lastIndexOf('/') && aFileURL.equalsIgnoreAsciiCase( getDllURL( ) ) );
         }
-
+        
         /* tester comments: another case is getFunctionSymbol_001*/
-
+        
         CPPUNIT_TEST_SUITE( getUrlFromAddress );
         CPPUNIT_TEST( getUrlFromAddress_001 );
         CPPUNIT_TEST( getUrlFromAddress_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class getUrlFromAddress
-
+    
 
     /** testing the method:
-        sal_Bool SAL_CALL load( const ::rtl::OUString& strModuleName,
+        sal_Bool SAL_CALL load( const ::rtl::OUString& strModuleName, 
                                                  sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT)
     */
     class load : public CppUnit::TestFixture
@@ -294,36 +294,36 @@ namespace osl_Module
             aMod.unload( );
             aMod1.unload( );
 
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: load function should do the same thing as constructor with library name.",
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: load function should do the same thing as constructor with library name.", 
                                     sal_True == bRes  );
         }
         // load lib which is under a CJK directory
         void load_002( )
         {
-#ifdef UNX
+#ifdef UNX	
             //Can not get a CJK directory already exist, so here create one. Perhaps reason is encoding problem.
             ::rtl::OUString aPidDirURL = rtl::OUString::createFromAscii( "file:///tmp/" ) + ::rtl::OUString::valueOf( ( long )getpid( ) );
             ::rtl::OUString aMyDirURL = aPidDirURL + aKname;
             createTestDirectory( aPidDirURL );
             createTestDirectory( aMyDirURL );
-
+            
             ::rtl::OUString aDLLURL = aMyDirURL + rtl::OUString::createFromAscii( "/libModule_DLL.so" );
-            //check if the lib exist.
+            //check if the lib exist. 
             //FIXME: if assert condition is false, the case will return, so the directory will not be clean-up
             CPPUNIT_ASSERT_MESSAGE( "#Source file is not exist. please manually clean-up directory and file under /tmp", ifFileExist( getDllURL( ) ) == sal_True );
             ::osl::FileBase::RC nError = ::osl::File::copy( getDllURL( ), aDLLURL );
             CPPUNIT_ASSERT_MESSAGE( "#copy failed. please manually clean-up directory and file under /tmp", nError == ::osl::FileBase::E_None );
             //ifFileExist returned false but the file exist
             CPPUNIT_ASSERT_MESSAGE( "#This file is not exist, copy failed. please manually clean-up directory and file under /tmp", ifFileExist( aDLLURL ) == sal_True );
-
+        
             //test if can create a normal file
             ::rtl::OUString aFileURL = aMyDirURL + rtl::OUString::createFromAscii( "/test_file" );
-            ::osl::File testFile( aFileURL );
+            ::osl::File testFile( aFileURL );			
             nError = testFile.open( OpenFlag_Create );
-            CPPUNIT_ASSERT_MESSAGE( "#create failed. please manually clean-up directory and file under /tmp", nError == ::osl::FileBase::E_None );
+            CPPUNIT_ASSERT_MESSAGE( "#create failed. please manually clean-up directory and file under /tmp", nError == ::osl::FileBase::E_None );			
             CPPUNIT_ASSERT_MESSAGE( "#This file is not exist, create failed. please manually clean-up directory and file under /tmp", ifFileExist( aFileURL ) == sal_True );
-
-            //load the copied dll
+            
+            //load the copied dll			
             ::osl::Module aMod( aDLLURL );
             ::osl::Module aMod1;
 
@@ -332,19 +332,19 @@ namespace osl_Module
             aMod.unload( );
             aMod1.unload( );
             deleteTestFile( aFileURL );
-            deleteTestFile( aDLLURL );
-            deleteTestDirectory( aMyDirURL );
-            deleteTestDirectory( aPidDirURL );
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: load lib which is under a CJK directory.",
+            deleteTestFile( aDLLURL );	
+            deleteTestDirectory( aMyDirURL );		
+            deleteTestDirectory( aPidDirURL );			
+            
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: load lib which is under a CJK directory.", 
                                     sal_True == bRes && bOK == sal_True );
 #endif
         }
-
+        
         CPPUNIT_TEST_SUITE( load );
         CPPUNIT_TEST( load_001 );
         CPPUNIT_TEST( load_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class load
 
 
@@ -363,16 +363,16 @@ namespace osl_Module
             aMod.unload( );
             bRes = oslModule(aMod) ==NULL;
 
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: unload function should do the same thing as destructor.",
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: unload function should do the same thing as destructor.", 
                                     sal_True == bRes  );
         }
-
+        
         CPPUNIT_TEST_SUITE( unload );
         CPPUNIT_TEST( unload_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class unload
 
-
+    
     /** testing the methods:
         sal_Bool SAL_CALL is() const
     */
@@ -389,19 +389,19 @@ namespace osl_Module
             {
                 CPPUNIT_ASSERT_MESSAGE("Cannot locate current module - using executable instead",  sal_False  );
             }
-
+            
             ::osl::Module aMod;
             bRes = aMod.is( );
             aMod.load( aFileURL );
             bRes1 = aMod.is( );
             aMod.unload( );
 
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: test if a module is a loaded module.",
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: test if a module is a loaded module.", 
                                      sal_False == bRes && sal_True == bRes1);
         }
         CPPUNIT_TEST_SUITE( is );
         CPPUNIT_TEST( is_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class is
 
 
@@ -416,21 +416,21 @@ namespace osl_Module
         void getSymbol_001( )
         {
             ::osl::Module aMod( getDllURL( ) );
-            FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString::createFromAscii( "firstfunc" ) );
+            FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString::createFromAscii( "firstfunc" ) ); 
             bRes = sal_False;
             if ( pFunc )
                 bRes = pFunc( bRes );
             aMod.unload();
 
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: load a dll and call one function in it.",
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: load a dll and call one function in it.", 
                                      sal_True == bRes );
         }
-
+        
         CPPUNIT_TEST_SUITE( getSymbol );
         CPPUNIT_TEST( getSymbol_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( );   
     }; // class getSymbol
-
+    
 
     /** testing the methods:
         operator oslModule() const
@@ -444,38 +444,38 @@ namespace osl_Module
         {
             ::osl::Module aMod;
             bRes = ( (oslModule)aMod == NULL );
-
+                
             aMod.load( getDllURL( ) );
             bRes1 = (oslModule)aMod != NULL;
 
             aMod.unload( );
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: the m_Module of a Module instance will be NULL when is not loaded, it will not be NULL after loaded.",
+            
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: the m_Module of a Module instance will be NULL when is not loaded, it will not be NULL after loaded.", 
                                      sal_True == bRes && sal_True == bRes1);
         }
-
+        
         void optr_oslModule_002( )
         {
             ::osl::Module aMod( getDllURL( ) );
             ::rtl::OUString funcName(::rtl::OUString::createFromAscii( "firstfunc" ) );
-
+            
             FuncPtr pFunc = ( FuncPtr ) osl_getSymbol( (oslModule)aMod, funcName.pData );
             bRes = sal_False;
             if ( pFunc )
                 bRes = pFunc( bRes );
-
+            
             aMod.unload();
 
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: use m_Module to call osl_getSymbol() function.",
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: use m_Module to call osl_getSymbol() function.", 
                                      sal_True == bRes  );
         }
-
+        
         CPPUNIT_TEST_SUITE( optr_oslModule );
         CPPUNIT_TEST( optr_oslModule_001 );
         CPPUNIT_TEST( optr_oslModule_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( );   
     }; // class optr_oslModule
-
+    
     /** testing the methods:
         oslGenericFunction SAL_CALL getFunctionSymbol( const ::rtl::OUString& ustrFunctionSymbolName )
     */
@@ -487,22 +487,22 @@ namespace osl_Module
         void getFunctionSymbol_001( )
         {
             ::osl::Module aMod( getDllURL( ) );
-            oslGenericFunction oslFunc = aMod.getFunctionSymbol( rtl::OUString::createFromAscii( "firstfunc" ) );
+            oslGenericFunction oslFunc = aMod.getFunctionSymbol( rtl::OUString::createFromAscii( "firstfunc" ) ); 
             ::rtl::OUString aLibraryURL;
             bRes = ::osl::Module::getUrlFromAddress( oslFunc, aLibraryURL);
             aMod.unload();
             printFileName( aLibraryURL );
 
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: load a dll and get its function addr and get its URL.",
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: load a dll and get its function addr and get its URL.", 
                  sal_True == bRes && aLibraryURL.equalsIgnoreAsciiCase( getDllURL() ) );
         }
-
+        
         CPPUNIT_TEST_SUITE( getFunctionSymbol );
         CPPUNIT_TEST( getFunctionSymbol_001 );
         //CPPUNIT_TEST( getFunctionSymbol_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( );   
     }; // class getFunctionSymbol
-
+    
 // -----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Module::ctors, "osl_Module");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Module::getUrlFromAddress, "osl_Module");
@@ -513,7 +513,7 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Module::getSymbol, "osl_Module");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Module::optr_oslModule, "osl_Module");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Module::getFunctionSymbol, "osl_Module");
 // -----------------------------------------------------------------------------
-
+    
 } // namespace osl_Module
 
 // -----------------------------------------------------------------------------
diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h
index 022a27b5a2a9..38336b053ed0 100644
--- a/sal/qa/osl/module/osl_Module_Const.h
+++ b/sal/qa/osl/module/osl_Module_Const.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,16 +38,16 @@
 #include <testshl/simpleheader.hxx>
 
 #if ( defined UNX ) || ( defined OS2 )  //Unix
-#   include <unistd.h>
+#	include <unistd.h>
 #endif
 #if ( defined WNT )                     // Windows
 #include <tools/prewin.h>
-// #    include <windows.h>
-#   include <io.h>
+// #	include <windows.h>
+#	include <io.h>
 #include <tools/postwin.h>
 #endif
 
-#   define FILE_PREFIX          "file:///"
+#	define FILE_PREFIX          "file:///"
 
 //Korea charactors
 ::rtl::OUString aKname(
diff --git a/sal/qa/osl/module/osl_Module_DLL.cxx b/sal/qa/osl/module/osl_Module_DLL.cxx
index f20ff9af56fd..cfeacd835105 100644
--- a/sal/qa/osl/module/osl_Module_DLL.cxx
+++ b/sal/qa/osl/module/osl_Module_DLL.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index d4c802401450..c7aedcee6c78 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-
+ 
 //------------------------------------------------------------------------
 // include files
 //------------------------------------------------------------------------
@@ -36,10 +36,10 @@
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
 #include "cppunit/plugin/TestPlugIn.h"
-#include <osl_Mutex_Const.h>
+#include <osl_Mutex_Const.h> 
 
-using namespace osl;
-using namespace rtl;
+using namespace	osl;
+using namespace	rtl;
 
 //------------------------------------------------------------------------
 // helper functions
@@ -61,7 +61,7 @@ inline void printUString( const ::rtl::OUString & str )
 inline void printBool( sal_Bool bOk )
 {
     printf("#printBool# " );
-    ( sal_True == bOk ) ? printf("YES!\n" ): printf("NO!\n" );
+    ( sal_True == bOk ) ? printf("YES!\n" ): printf("NO!\n" );		
 }
 
 /** pause nSec seconds helper function.
@@ -73,17 +73,17 @@ namespace ThreadHelper
         /// print statement in thread process must use fflush() to force display.
         // t_print("# wait %d seconds. ", _nSec );
         fflush(stdout);
-
+        
 #ifdef WNT                               //Windows
         Sleep( _nSec * 1000 );
 #endif
 #if ( defined UNX ) || ( defined OS2 )   //Unix
         sleep( _nSec );
 #endif
-        // printf("# done\n" );
+        // printf("# done\n" ); 
     }
     void thread_sleep_tenth_sec(sal_Int32 _nTenthSec)
-     {
+     {     
 #ifdef WNT      //Windows
             Sleep(_nTenthSec * 100 );
 #endif
@@ -102,21 +102,21 @@ namespace ThreadHelper
 //------------------------------------------------------------------------
 
 
-/** mutually exclusive data
+/** mutually exclusive data  
 */
 struct resource {
-    sal_Int32   data1;
-    sal_Int32   data2;
-    Mutex       lock;
+    sal_Int32	data1; 
+    sal_Int32	data2; 
+    Mutex		lock;
 };
 
-/** IncreaseThread provide data.
+/** IncreaseThread provide data. 
 */
 class IncreaseThread : public Thread
 {
 public:
     IncreaseThread( struct resource *pData ): pResource( pData ) { }
-
+    
     ~IncreaseThread( )
     {
         CPPUNIT_ASSERT_MESSAGE( "#IncreaseThread does not shutdown properly.\n", sal_False == this -> isRunning( ) );
@@ -129,7 +129,7 @@ protected:
         pResource->lock.acquire( );
         for( sal_Int8 i = 0; i < 3; i++ )
         {
-            pResource->data1++;
+            pResource->data1++;	
             yield( );  //yield() give CPU time to other thread, other thread if not block, they will change the data;
         }
         if ( pResource->data2 == 0 )
@@ -138,13 +138,13 @@ protected:
     }
 };
 
-/** DecreaseThread consume data.
+/** DecreaseThread consume data. 
 */
 class DecreaseThread : public Thread
 {
 public:
     DecreaseThread( struct resource *pData ): pResource( pData ) { }
-
+    
     ~DecreaseThread( )
     {
         CPPUNIT_ASSERT_MESSAGE( "#DecreaseThread does not shutdown properly.\n", sal_False == this -> isRunning( ) );
@@ -157,7 +157,7 @@ protected:
         pResource->lock.acquire( );
         for( sal_Int8 i = 0; i < 3; i++ )
         {
-            pResource->data1--;
+            pResource->data1--;	
             yield( );  //yield() give CPU time to other thread, other thread if not block, they will change the data;
         }
         if ( pResource->data2 == 0 )
@@ -167,22 +167,22 @@ protected:
 };
 
 
-/** chain structure used in Threads as critical resource
+/** chain structure used in Threads as critical resource 
 */
 struct chain {
-    sal_Int32   buffer[ BUFFER_SIZE ];
-    Mutex       lock;
-    sal_Int8    pos;
+    sal_Int32	buffer[ BUFFER_SIZE ]; 
+    Mutex		lock;
+    sal_Int8	pos;
 };
 
-/** PutThread write to the chain structure in a mutex manner.
+/** PutThread write to the chain structure in a mutex manner. 
 */
 class PutThread : public Thread
 {
 public:
-    //get the struct pointer to write data to buffer
+    //get the struct pointer to write data to buffer 
     PutThread( struct chain* pData ): pChain( pData ) { }
-
+    
     ~PutThread( )
     {
         CPPUNIT_ASSERT_MESSAGE( "#PutThread does not shutdown properly.\n", sal_False == this -> isRunning( ) );
@@ -194,10 +194,10 @@ protected:
     {
         //block here if the mutex has been acquired
         pChain->lock.acquire( );
-
-        //current position in buffer to write
+        
+        //current position in buffer to write 
         sal_Int8 nPos = pChain->pos;
-        oslThreadIdentifier oId = getIdentifier( );
+        oslThreadIdentifier oId = getIdentifier( );	
         //write data
                 sal_Int8 i;
         for ( i = 0; i < 5; i++ )
@@ -207,20 +207,20 @@ protected:
         }
         //revise the position
         pChain->pos = nPos + i;
-
+        
         //finish writing, release the mutex
-        pChain->lock.release();
+        pChain->lock.release();	
     }
 };
 
-/** thread for testing Mutex acquire.
+/** thread for testing Mutex acquire. 
  */
 class HoldThread : public Thread
 {
 public:
-    //get the Mutex pointer to operate
+    //get the Mutex pointer to operate 
     HoldThread( Mutex* pMutex ): pMyMutex( pMutex ) { }
-
+    
     ~HoldThread( )
     {
         CPPUNIT_ASSERT_MESSAGE( "#HoldThread does not shutdown properly.\n", sal_False == this -> isRunning( ) );
@@ -242,11 +242,11 @@ class WaitThread : public Thread
 public:
     //get the Mutex pointer to operate
     WaitThread( Mutex* pMutex ): pMyMutex( pMutex ) { }
-
+    
     ~WaitThread( )
     {
         CPPUNIT_ASSERT_MESSAGE( "#WaitThread does not shutdown properly.\n", sal_False == this -> isRunning( ) );
-    }
+    }    
 protected:
     Mutex* pMyMutex;
 
@@ -259,18 +259,18 @@ protected:
     }
 };
 
-/** thread for testing getGlobalMutex.
+/** thread for testing getGlobalMutex. 
  */
 class GlobalMutexThread : public Thread
 {
 public:
-    //get the Mutex pointer to operate
+    //get the Mutex pointer to operate 
     GlobalMutexThread( ){ }
-
+    
     ~GlobalMutexThread( )
     {
         CPPUNIT_ASSERT_MESSAGE( "#GlobalMutexThread does not shutdown properly.\n", sal_False == this -> isRunning( ) );
-    }
+    }    
 protected:
     void SAL_CALL run( )
     {
@@ -287,8 +287,8 @@ protected:
 //--------------------------------------------------------------
 namespace osl_Mutex
 {
-
-    /** Test of the osl::Mutex::constructor
+    
+    /** Test of the	osl::Mutex::constructor
      */
     class ctor : public CppUnit::TestFixture
     {
@@ -296,61 +296,61 @@ namespace osl_Mutex
         // initialise your test code values here.
         struct chain m_Data;
         struct resource m_Res;
-
+    
         void setUp( )
         {
             for ( sal_Int8 i=0; i < BUFFER_SIZE; i++ )
                 m_Data.buffer[i] = 0;
             m_Data.pos = 0;
-
+            
             m_Res.data1 = 0;
             m_Res.data2 = 0;
         }
-
+    
         void tearDown()
         {
         }
-
-        /** Create two threads to write data to the same buffer, use Mutex to assure
+    
+        /** Create two threads to write data to the same buffer, use Mutex to assure 
             during one thread write data five times, the other thread should not begin writing.
-            the two threads wrote two different datas: their thread ID, so we can check the datas
-            in buffer to know the order of the two threads writing
+            the two threads wrote two different datas: their thread ID, so we can check the datas 
+            in buffer to know the order of the two threads writing 
         */
         void ctor_001()
         {
             PutThread myThread1( &m_Data );
             PutThread myThread2( &m_Data );
-
+    
             myThread1.create( );
             myThread2.create( );
-
+    
             //wait until the two threads terminate
             myThread1.join( );
             myThread2.join( );
-
+    
             sal_Bool bRes = sal_False;
-
-            // every 5 datas should the same
+            
+            // every 5 datas should the same 
             // LLA: this is not a good check, it's too fix
             if (m_Data.buffer[0] == m_Data.buffer[1] &&
                 m_Data.buffer[1] == m_Data.buffer[2] &&
                 m_Data.buffer[2] == m_Data.buffer[3] &&
-                m_Data.buffer[3] == m_Data.buffer[4] &&
+                m_Data.buffer[3] == m_Data.buffer[4] && 
                 m_Data.buffer[5] == m_Data.buffer[6] &&
                 m_Data.buffer[6] == m_Data.buffer[7] &&
                 m_Data.buffer[7] == m_Data.buffer[8] &&
                 m_Data.buffer[8] == m_Data.buffer[9])
                 bRes = sal_True;
-
+    
             /*for (sal_Int8 i=0; i<BUFFER_SIZE; i++)
                 printf("#data in buffer is %d\n", m_Data.buffer[i]);
             */
-
+                    
             CPPUNIT_ASSERT_MESSAGE("Mutex ctor", bRes == sal_True);
-
+    
         }
-
-        /** Create two threads to write data to operate on the same number , use Mutex to assure,
+    
+        /** Create two threads to write data to operate on the same number , use Mutex to assure, 
             one thread increase data 3 times, the other thread decrease 3 times, store the operate
             result when the first thread complete, if it is interrupt by the other thread, the stored
             number will not be 3.
@@ -359,93 +359,93 @@ namespace osl_Mutex
         {
             IncreaseThread myThread1( &m_Res );
             DecreaseThread myThread2( &m_Res );
-
+    
             myThread1.create( );
             myThread2.create( );
-
+    
             //wait until the two threads terminate
             myThread1.join( );
             myThread2.join( );
-
+    
             sal_Bool bRes = sal_False;
-
-            // every 5 datas should the same
+            
+            // every 5 datas should the same 
             if ( ( m_Res.data1 == 0 ) && ( m_Res.data2 == 3 ) )
                 bRes = sal_True;
-
+    
             CPPUNIT_ASSERT_MESSAGE( "test Mutex ctor function: increase and decrease a number 3 times without interrupt.", bRes == sal_True );
         }
-
+        
         CPPUNIT_TEST_SUITE( ctor );
         CPPUNIT_TEST( ctor_001 );
         CPPUNIT_TEST( ctor_002 );
         CPPUNIT_TEST_SUITE_END( );
     }; // class ctor
-
-
-    /** Test of the osl::Mutex::acquire method
+    
+    
+    /** Test of the	osl::Mutex::acquire method
      */
     class acquire : public CppUnit::TestFixture
     {
     public:
-        // acquire mutex in main thread, and then call acquire again in myThread,
-        // the child thread should block, wait 2 secs, it still block.
+        // acquire mutex in main thread, and then call acquire again in myThread, 
+        // the child thread should block, wait 2 secs, it still block. 
         // Then release mutex in main thread, the child thread could return from acquire,
-        // and go to exec next statement, so could terminate quickly.
+        // and go to exec next statement, so could terminate quickly.	
         void acquire_001( )
         {
             Mutex aMutex;
-            //acquire here
+            //acquire here 
             sal_Bool bRes = aMutex.acquire( );
             // pass the pointer of mutex to child thread
             HoldThread myThread( &aMutex );
             myThread.create( );
-
+    
             ThreadHelper::thread_sleep_tenth_sec( 2 );
-            // if acquire in myThread does not work, 2 secs is long enough,
+            // if acquire in myThread does not work, 2 secs is long enough, 
             // myThread should terminate now, and bRes1 should be sal_False
             sal_Bool bRes1 = myThread.isRunning( );
-
+            
             aMutex.release( );
             ThreadHelper::thread_sleep_tenth_sec( 1 );
             // after release mutex, myThread stops blocking and will terminate immediately
             sal_Bool bRes2 = myThread.isRunning( );
             myThread.join( );
-
-            CPPUNIT_ASSERT_MESSAGE( "Mutex acquire",
+    
+            CPPUNIT_ASSERT_MESSAGE( "Mutex acquire", 
                 bRes == sal_True && bRes1 == sal_True && bRes2 == sal_False );
         }
-
+    
         //in the same thread, acquire twice should success
         void acquire_002()
         {
             Mutex aMutex;
-            //acquire here
+            //acquire here 
             sal_Bool bRes = aMutex.acquire();
             sal_Bool bRes1 = aMutex.acquire();
-
+    
             sal_Bool bRes2 = aMutex.tryToAcquire();
-
+            
             aMutex.release();
-
-            CPPUNIT_ASSERT_MESSAGE("Mutex acquire",
+    
+            CPPUNIT_ASSERT_MESSAGE("Mutex acquire", 
                 bRes == sal_True && bRes1 == sal_True && bRes2 == sal_True);
-
+        
         }
-
+    
         CPPUNIT_TEST_SUITE( acquire );
         CPPUNIT_TEST( acquire_001 );
         CPPUNIT_TEST( acquire_002 );
         CPPUNIT_TEST_SUITE_END( );
     }; // class acquire
-
-
-    /** Test of the osl::Mutex::tryToAcquire method
+    
+    
+    /** Test of the	osl::Mutex::tryToAcquire method
      */
     class tryToAcquire : public CppUnit::TestFixture
     {
     public:
-        // First let child thread acquire the mutex, and wait 2 secs, during the 2 secs,
+        // First let child thread acquire the mutex, and wait 2 secs, during the 2 secs, 
         // in main thread, tryToAcquire mutex should return False
         // then after the child thread terminated, tryToAcquire should return True
         void tryToAcquire_001()
@@ -453,37 +453,37 @@ namespace osl_Mutex
             Mutex aMutex;
             WaitThread myThread(&aMutex);
             myThread.create();
-
+    
             // ensure the child thread acquire the mutex
             ThreadHelper::thread_sleep_tenth_sec(1);
-
+    
             sal_Bool bRes1 = aMutex.tryToAcquire();
-
+    
             if (bRes1 == sal_True)
                 aMutex.release();
             // wait the child thread terminate
             myThread.join();
-
+            
             sal_Bool bRes2 = aMutex.tryToAcquire();
-
+            
             if (bRes2 == sal_True)
                 aMutex.release();
-
-        CPPUNIT_ASSERT_MESSAGE("Try to acquire Mutex",
+    
+        CPPUNIT_ASSERT_MESSAGE("Try to acquire Mutex", 
                 bRes1 == sal_False && bRes2 == sal_True);
         }
-
+    
         CPPUNIT_TEST_SUITE(tryToAcquire);
         CPPUNIT_TEST(tryToAcquire_001);
         CPPUNIT_TEST_SUITE_END();
     }; // class tryToAcquire
-
-    /** Test of the osl::Mutex::release method
+    
+    /** Test of the	osl::Mutex::release method
      */
     class release : public CppUnit::TestFixture
     {
     public:
-        /** acquire/release are not used in pairs: after child thread acquired mutex,
+        /** acquire/release are not used in pairs: after child thread acquired mutex, 
             the main thread release it, then any thread could acquire it.
         */
         void release_001()
@@ -491,39 +491,39 @@ namespace osl_Mutex
             Mutex aMutex;
             WaitThread myThread( &aMutex );
             myThread.create( );
-
+    
             // ensure the child thread acquire the mutex
             ThreadHelper::thread_sleep_tenth_sec( 1 );
-
+            
             sal_Bool bRunning = myThread.isRunning( );
             sal_Bool bRes1 = aMutex.tryToAcquire( );
             // wait the child thread terminate
             myThread.join( );
-
+            
             sal_Bool bRes2 = aMutex.tryToAcquire( );
-
+            
             if ( bRes2 == sal_True )
                 aMutex.release( );
-
-            CPPUNIT_ASSERT_MESSAGE( "release Mutex: try to aquire before and after the mutex has been released",
+    
+            CPPUNIT_ASSERT_MESSAGE( "release Mutex: try to aquire before and after the mutex has been released", 
                 bRes1 == sal_False && bRes2 == sal_True && bRunning == sal_True );
-
+    
         }
-
+    
         // how about release twice?
         void release_002()
         {
         }
-
+    
         CPPUNIT_TEST_SUITE( release );
         CPPUNIT_TEST( release_001 );
         CPPUNIT_TEST( release_002 );
         CPPUNIT_TEST_SUITE_END( );
     }; // class release
-
-
-
-    /** Test of the osl::Mutex::getGlobalMutex method
+    
+    
+    
+    /** Test of the	osl::Mutex::getGlobalMutex method
      */
     class getGlobalMutex : public CppUnit::TestFixture
     {
@@ -534,26 +534,26 @@ namespace osl_Mutex
             Mutex* pGlobalMutex;
             pGlobalMutex = pGlobalMutex->getGlobalMutex();
             pGlobalMutex->acquire();
-
+            
             GlobalMutexThread myThread;
             myThread.create();
-
+    
             ThreadHelper::thread_sleep_tenth_sec(1);
             sal_Bool bRes1 = myThread.isRunning();
-
+            
             pGlobalMutex->release();
             ThreadHelper::thread_sleep_tenth_sec(1);
             // after release mutex, myThread stops blocking and will terminate immediately
             sal_Bool bRes2 = myThread.isRunning();
-
-            CPPUNIT_ASSERT_MESSAGE("Global Mutex works",
+    
+            CPPUNIT_ASSERT_MESSAGE("Global Mutex works", 
                 bRes1 == sal_True && bRes2 == sal_False);
         }
-
+    
         void getGlobalMutex_002( )
         {
             sal_Bool bRes;
-
+            
             Mutex *pGlobalMutex;
             pGlobalMutex = pGlobalMutex->getGlobalMutex( );
             pGlobalMutex->acquire( );
@@ -562,36 +562,36 @@ namespace osl_Mutex
                 pGlobalMutex1 = pGlobalMutex1->getGlobalMutex( );
                 bRes = pGlobalMutex1->release( );
             }
-
-            CPPUNIT_ASSERT_MESSAGE( "Global Mutex works: if the code between {} get the different mutex as the former one, it will return false when release.",
+            
+            CPPUNIT_ASSERT_MESSAGE( "Global Mutex works: if the code between {} get the different mutex as the former one, it will return false when release.", 
                 bRes == sal_True );
         }
-
+    
         CPPUNIT_TEST_SUITE(getGlobalMutex);
         CPPUNIT_TEST(getGlobalMutex_001);
         CPPUNIT_TEST(getGlobalMutex_002);
         CPPUNIT_TEST_SUITE_END();
     }; // class getGlobalMutex
-
+    
 // -----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::ctor, "osl_Mutex");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::acquire, "osl_Mutex");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::tryToAcquire, "osl_Mutex");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::release, "osl_Mutex");
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::release, "osl_Mutex"); 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::getGlobalMutex, "osl_Mutex");
 } // namespace osl_Mutex
-
-
+    
+    
 //------------------------------------------------------------------------
 // Beginning of the test cases for osl_Guard class
 //------------------------------------------------------------------------
-
+    
 class GuardThread : public Thread
 {
 public:
     //get the Mutex pointer to operate
     GuardThread( Mutex* pMutex ): pMyMutex( pMutex ) { }
-
+    
     ~GuardThread( )
     {
         CPPUNIT_ASSERT_MESSAGE( "#GuardThread does not shutdown properly.\n", sal_False == this -> isRunning( ) );
@@ -619,48 +619,48 @@ namespace osl_Guard
             Mutex aMutex;
             GuardThread myThread(&aMutex);
             myThread.create();
-
+    
             ThreadHelper::thread_sleep_tenth_sec(1);
             sal_Bool bRes = aMutex.tryToAcquire();
             // after 1 second, the mutex has been guarded, and the child thread should be running
             sal_Bool bRes1 = myThread.isRunning();
-
+            
             myThread.join();
             sal_Bool bRes2 = aMutex.tryToAcquire();
-
-            CPPUNIT_ASSERT_MESSAGE("GuardThread constructor",
+    
+            CPPUNIT_ASSERT_MESSAGE("GuardThread constructor", 
                 bRes == sal_False && bRes1 == sal_True && bRes2 == sal_True);
         }
-
+    
         void ctor_002( )
         {
             Mutex aMutex;
-
+            
             /// use reference constructor here
             MutexGuard myGuard( aMutex );
-
+            
             /// the GuardThread will block here when it is initialised.
             GuardThread myThread( &aMutex );
             myThread.create( );
-
+    
             /// is it still blocking?
             ThreadHelper::thread_sleep_tenth_sec( 2 );
             sal_Bool bRes = myThread.isRunning( );
-
+            
             /// oh, release him.
             aMutex.release( );
             myThread.join( );
-
-            CPPUNIT_ASSERT_MESSAGE("GuardThread constructor: reference initialization, aquire the mutex before running the thread, then check if it is blocking.",
+    
+            CPPUNIT_ASSERT_MESSAGE("GuardThread constructor: reference initialization, aquire the mutex before running the thread, then check if it is blocking.", 
                 bRes == sal_True);
         }
-
+        
         CPPUNIT_TEST_SUITE(ctor);
         CPPUNIT_TEST(ctor_001);
         CPPUNIT_TEST(ctor_002);
         CPPUNIT_TEST_SUITE_END();
     }; // class ctor
-
+    
 // -----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Guard::ctor, "osl_Guard");
 } // namespace osl_Guard
@@ -677,7 +677,7 @@ class ClearGuardThread : public Thread
 public:
     //get the Mutex pointer to operate
     ClearGuardThread( Mutex* pMutex ): pMyMutex( pMutex ) {}
-
+    
     ~ClearGuardThread( )
     {
         CPPUNIT_ASSERT_MESSAGE( "#ClearGuardThread does not shutdown properly.\n", sal_False == this -> isRunning( ) );
@@ -701,44 +701,44 @@ protected:
 // -----------------------------------------------------------------------------
 namespace osl_ClearableGuard
 {
-
+        
     class ctor : public CppUnit::TestFixture
     {
     public:
         void ctor_001()
         {
             Mutex aMutex;
-
+            
             /// now, the aMutex has been guarded.
             ClearableMutexGuard myMutexGuard( &aMutex );
-
+    
             /// it will return sal_False if the aMutex has not been Guarded.
             sal_Bool bRes = aMutex.release( );
-
-            CPPUNIT_ASSERT_MESSAGE("ClearableMutexGuard constructor, test the aquire operation when initilized.",
+    
+            CPPUNIT_ASSERT_MESSAGE("ClearableMutexGuard constructor, test the aquire operation when initilized.", 
                 bRes == sal_True );
         }
-
+    
         void ctor_002( )
         {
             Mutex aMutex;
-
+            
             /// now, the aMutex has been guarded, this time, we use reference constructor.
             ClearableMutexGuard myMutexGuard( aMutex );
-
+    
             /// it will return sal_False if the aMutex has not been Guarded.
             sal_Bool bRes = aMutex.release( );
-
-            CPPUNIT_ASSERT_MESSAGE("ClearableMutexGuard constructor, test the aquire operation when initilized, we use reference constructor this time.",
+    
+            CPPUNIT_ASSERT_MESSAGE("ClearableMutexGuard constructor, test the aquire operation when initilized, we use reference constructor this time.", 
                 bRes == sal_True );
         }
-
+        
         CPPUNIT_TEST_SUITE(ctor);
         CPPUNIT_TEST(ctor_001);
         CPPUNIT_TEST(ctor_002);
         CPPUNIT_TEST_SUITE_END();
     }; // class ctor
-
+    
     class clear : public CppUnit::TestFixture
     {
     public:
@@ -747,12 +747,12 @@ namespace osl_ClearableGuard
             Mutex aMutex;
             ClearGuardThread myThread(&aMutex);
             myThread.create();
-
-            TimeValue aTimeVal_befor;
+    
+            TimeValue aTimeVal_befor; 
             osl_getSystemTime( &aTimeVal_befor );
             // wait 1 second to assure the child thread has begun
             ThreadHelper::thread_sleep(1);
-
+    
             while (1)
             {
                 if (aMutex.tryToAcquire() == sal_True)
@@ -761,52 +761,52 @@ namespace osl_ClearableGuard
                 }
                 ThreadHelper::thread_sleep(1);
             }
-            TimeValue aTimeVal_after;
+            TimeValue aTimeVal_after; 
             osl_getSystemTime( &aTimeVal_after );
             sal_Int32 nSec = aTimeVal_after.Seconds - aTimeVal_befor.Seconds;
             printf("nSec is %"SAL_PRIdINT32"\n", nSec);
-
+    
             myThread.join();
-
-            CPPUNIT_ASSERT_MESSAGE("ClearableGuard method: clear",
+            
+            CPPUNIT_ASSERT_MESSAGE("ClearableGuard method: clear", 
                 nSec < 7 && nSec > 1);
         }
-
+        
         void clear_002( )
         {
             Mutex aMutex;
-
+            
             /// now, the aMutex has been guarded.
             ClearableMutexGuard myMutexGuard( &aMutex );
 
             /// launch the HoldThread, it will be blocked here.
             HoldThread myThread( &aMutex );
             myThread.create( );
-
+            
             /// is it blocking?
             ThreadHelper::thread_sleep_tenth_sec( 4 );
             sal_Bool bRes = myThread.isRunning( );
-
+            
             /// use clear to release.
             myMutexGuard.clear( );
             myThread.join( );
             sal_Bool bRes1 = myThread.isRunning( );
-
-            CPPUNIT_ASSERT_MESSAGE( "ClearableGuard method: clear, control the HoldThread's running status!",
+            
+            CPPUNIT_ASSERT_MESSAGE( "ClearableGuard method: clear, control the HoldThread's running status!", 
                 ( sal_True == bRes ) && ( sal_False == bRes1 ) );
         }
-
+        
         CPPUNIT_TEST_SUITE( clear );
         CPPUNIT_TEST( clear_001 );
         CPPUNIT_TEST( clear_002 );
         CPPUNIT_TEST_SUITE_END( );
     }; // class clear
-
+    
 // -----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_ClearableGuard::ctor, "osl_ClearableGuard" );
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_ClearableGuard::clear, "osl_ClearableGuard" );
 } // namespace osl_ClearableGuard
-
+    
 
 //------------------------------------------------------------------------
 // Beginning of the test cases for osl_ResettableGuard class
@@ -819,7 +819,7 @@ class ResetGuardThread : public Thread
 public:
     //get the Mutex pointer to operate
     ResetGuardThread( Mutex* pMutex ): pMyMutex( pMutex ) {}
-
+    
     ~ResetGuardThread( )
     {
         CPPUNIT_ASSERT_MESSAGE( "#ResetGuardThread does not shutdown properly.\n", sal_False == this -> isRunning( ) );
@@ -847,38 +847,38 @@ namespace osl_ResettableGuard
         void ctor_001()
         {
             Mutex aMutex;
-
+            
             /// now, the aMutex has been guarded.
             ResettableMutexGuard myMutexGuard( &aMutex );
-
+    
             /// it will return sal_False if the aMutex has not been Guarded.
             sal_Bool bRes = aMutex.release( );
-
-            CPPUNIT_ASSERT_MESSAGE("ResettableMutexGuard constructor, test the aquire operation when initilized.",
+    
+            CPPUNIT_ASSERT_MESSAGE("ResettableMutexGuard constructor, test the aquire operation when initilized.", 
                 bRes == sal_True );
         }
-
+    
         void ctor_002( )
         {
             Mutex aMutex;
-
+            
             /// now, the aMutex has been guarded, this time, we use reference constructor.
             ResettableMutexGuard myMutexGuard( aMutex );
-
+    
             /// it will return sal_False if the aMutex has not been Guarded.
             sal_Bool bRes = aMutex.release( );
-
-            CPPUNIT_ASSERT_MESSAGE( "ResettableMutexGuard constructor, test the aquire operation when initilized, we use reference constructor this time.",
+    
+            CPPUNIT_ASSERT_MESSAGE( "ResettableMutexGuard constructor, test the aquire operation when initilized, we use reference constructor this time.", 
                 bRes == sal_True );
         }
-
-
+    
+    
         CPPUNIT_TEST_SUITE(ctor);
         CPPUNIT_TEST(ctor_001);
         CPPUNIT_TEST(ctor_002);
         CPPUNIT_TEST_SUITE_END();
     }; // class ctor
-
+    
     class reset : public CppUnit::TestFixture
     {
     public:
@@ -888,46 +888,46 @@ namespace osl_ResettableGuard
             ResetGuardThread myThread( &aMutex );
             ResettableMutexGuard myMutexGuard( aMutex );
             myThread.create( );
-
+            
             /// is it running? and clear done?
             sal_Bool bRes = myThread.isRunning( );
             myMutexGuard.clear( );
             ThreadHelper::thread_sleep_tenth_sec( 1 );
-
+            
             /// if reset is not success, the release will return sal_False
             myMutexGuard.reset( );
             sal_Bool bRes1 = aMutex.release( );
             myThread.join( );
-
-            CPPUNIT_ASSERT_MESSAGE( "ResettableMutexGuard method: reset",
+            
+            CPPUNIT_ASSERT_MESSAGE( "ResettableMutexGuard method: reset", 
                 ( sal_True == bRes ) && ( sal_True == bRes1 ) );
         }
-
+        
         void reset_002( )
         {
             Mutex aMutex;
             ResettableMutexGuard myMutexGuard( &aMutex );
-
+            
             /// shouldn't release after clear;
             myMutexGuard.clear( );
             sal_Bool bRes = aMutex.release( );
-
+            
             /// can release after reset.
             myMutexGuard.reset( );
             sal_Bool bRes1 = aMutex.release( );
-
-            CPPUNIT_ASSERT_MESSAGE( "ResettableMutexGuard method: reset, release after clear and reset, on Solaris, the mutex can be release without aquire, so it can not passed on (SOLARIS), but not the reason for reset_002",
+            
+            CPPUNIT_ASSERT_MESSAGE( "ResettableMutexGuard method: reset, release after clear and reset, on Solaris, the mutex can be release without aquire, so it can not passed on (SOLARIS), but not the reason for reset_002", 
                 ( sal_False == bRes ) && ( sal_True == bRes1 ) );
         }
-
+        
         CPPUNIT_TEST_SUITE(reset);
         CPPUNIT_TEST(reset_001);
 #ifdef LINUX
         CPPUNIT_TEST(reset_002);
 #endif
-        CPPUNIT_TEST_SUITE_END();
+        CPPUNIT_TEST_SUITE_END(); 
     }; // class reset
-
+    
 // -----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_ResettableGuard::ctor);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_ResettableGuard::reset);
diff --git a/sal/qa/osl/mutex/osl_Mutex_Const.h b/sal/qa/osl/mutex/osl_Mutex_Const.h
index e11685b163c2..a95619acb730 100644
--- a/sal/qa/osl/mutex/osl_Mutex_Const.h
+++ b/sal/qa/osl/mutex/osl_Mutex_Const.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,11 +38,11 @@
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
-#ifndef _OSL_THREAD_HXX
+#ifndef	_OSL_THREAD_HXX
 #include <osl/thread.hxx>
 #endif
 
-#ifndef _OSL_MUTEX_HXX
+#ifndef	_OSL_MUTEX_HXX
 #include <osl/mutex.hxx>
 #endif
 #include <osl/time.h>
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index 27c0c8dcff97..b2d2c6ae6959 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index d65d2e589398..a9abd0f09213 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index eaee6bdc72af..6567230154fe 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,8 +44,8 @@
 
 #if ( defined WNT )                     // Windows
 #include <tools/prewin.h>
-#   define WIN32_LEAN_AND_MEAN
-// #    include <windows.h>
+#	define WIN32_LEAN_AND_MEAN
+// #	include <windows.h>
 #   include <tchar.h>
 #include <tools/postwin.h>
 #endif
@@ -378,8 +378,8 @@ class Test_osl_executeProcess : public CppUnit::TestFixture
     OUString     temp_file_path_;
     rtl_uString* parameters_[2];
     int          parameters_count_;
-    OUString    suCWD;
-    OUString    suExecutableFileURL;
+    OUString	suCWD;
+    OUString	suExecutableFileURL;
 
 public:
 
diff --git a/sal/qa/osl/process/osl_process_child.cxx b/sal/qa/osl/process/osl_process_child.cxx
index f24c1dc708ae..1eb415275e8c 100644
--- a/sal/qa/osl/process/osl_process_child.cxx
+++ b/sal/qa/osl/process/osl_process_child.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,12 +36,12 @@
 #include <tools/prewin.h>
 #   define UNICODE
 #   define _UNICODE
-#   define WIN32_LEAN_AND_MEAN
-// #    include <windows.h>
+#	define WIN32_LEAN_AND_MEAN
+// #	include <windows.h>
 #   include <tchar.h>
 #include <tools/postwin.h>
 #else
-#   include <unistd.h>
+#	include <unistd.h>
 #endif
 
 #include <stdio.h>
@@ -62,7 +62,7 @@
 
 //########################################
 void wait_for_seconds(char* time)
-{
+{    
     SLEEP(atoi(time));
 }
 
@@ -77,36 +77,36 @@ void w_to_a(LPCTSTR _strW, LPSTR strA, DWORD size)
 }
 //########################################
     void dump_env(char* file_path)
-    {
+    {        
         LPTSTR env = reinterpret_cast<LPTSTR>(
             GetEnvironmentStrings());
         LPTSTR p   = env;
 
         std::ofstream file(file_path);
-
-        char buffer[32767];
+            
+        char buffer[32767];        
         while (size_t l = _tcslen(reinterpret_cast<wchar_t*>(p)))
-        {
-            w_to_a(p, buffer, sizeof(buffer));
-            file << buffer << std::endl;
-            p += l + 1;
-        }
-        FreeEnvironmentStrings(env);
-    }
+        {      
+            w_to_a(p, buffer, sizeof(buffer));            
+            file << buffer << std::endl;                
+            p += l + 1;    
+        }        
+        FreeEnvironmentStrings(env);                 
+    }    
 #else
     extern char** environ;
-
+    
     void dump_env(char* file_path)
-    {
-        std::ofstream file(file_path);
-        for (int i = 0; NULL != environ[i]; i++)
-            file << environ[i] << std::endl;
-    }
+    {                
+        std::ofstream file(file_path);             
+        for (int i = 0; NULL != environ[i]; i++)        
+            file << environ[i] << std::endl;        
+    }    
 #endif
 
 //########################################
 int main(int argc, char* argv[])
-{
+{   
     rtl::OUString s;
 
     //t_print("Parameter: ");
@@ -114,7 +114,7 @@ int main(int argc, char* argv[])
     for (int i = 1; i < argc; i++)
         printf("%s ", argv[i]);
     printf("\n");
-
+                        
     if (argc > 2)
     {
         if (0 == strcmp("-join", argv[1]))
@@ -124,7 +124,7 @@ int main(int argc, char* argv[])
         else if (0 == strcmp("-env", argv[1]))
         {
             dump_env(argv[2]);
-        }
+        }        
     }
 
     return (0);
diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx
index 706ee4a8e5ac..c85f4816b782 100644
--- a/sal/qa/osl/profile/osl_old_testprofile.cxx
+++ b/sal/qa/osl/profile/osl_old_testprofile.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 0d35e4c24e83..28de6f1a8c50 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -2,7 +2,7 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,14 +28,14 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-
+ 
 //------------------------------------------------------------------------
 // header file
 //------------------------------------------------------------------------
-#include <osl_Security_Const.h>
+#include <osl_Security_Const.h> 
 
-using namespace osl;
-using namespace rtl;
+using namespace	osl;
+using namespace	rtl;
 
 
 //------------------------------------------------------------------------
@@ -47,14 +47,14 @@ using namespace rtl;
 inline void printBool( sal_Bool bOk )
 {
     //t_print("#printBool# " );
-    ( sal_True == bOk ) ? t_print("TRUE!\n" ): t_print("FALSE!\n" );
+    ( sal_True == bOk ) ? t_print("TRUE!\n" ): t_print("FALSE!\n" );		
 }
 
 /** print a UNI_CODE String.
 */
 inline void printUString( const ::rtl::OUString & str )
 {
-    rtl::OString aString;
+    rtl::OString aString; 
 
     //t_print("#printUString_u# " );
     aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
@@ -76,21 +76,21 @@ namespace osl_Security
     {
     public:
         sal_Bool bRes, bRes1;
-
+    
         void ctors_001( )
         {
             ::osl::Security aSec;
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: create a security  its handle should not be NULL.",
+            
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: create a security  its handle should not be NULL.", 
                                     aSec.getHandle( ) != NULL );
         }
-
+    
         CPPUNIT_TEST_SUITE( ctors );
         CPPUNIT_TEST( ctors_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class ctors
-
-
+    
+    
     /** testing the methods:
         inline sal_Bool SAL_CALL logonUser(const ::rtl::OUString& strName,
                                        const ::rtl::OUString& strPasswd);
@@ -102,38 +102,38 @@ namespace osl_Security
     {
     public:
         sal_Bool bRes;
-
+    
         void logonUser_user_pwd( )
         {
-            ::osl::Security aSec;
+            ::osl::Security aSec; 
             bRes = aSec.logonUser( aLogonUser, aLogonPasswd );
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: check logon user through forwarded user name, pwd, passed in (UNX), failed in (W32).",
-                                    ( sal_True == bRes )  );
+            
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: check logon user through forwarded user name, pwd, passed in (UNX), failed in (W32).", 
+                                    ( sal_True == bRes )  ); 
         }
-
+    
         void logonUser_user_pwd_server( )
         {
-            ::osl::Security aSec;
+            ::osl::Security aSec; 
             bRes = aSec.logonUser( aLogonUser, aLogonPasswd, aFileServer );
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: check logon user through forwarded user name, pwd and server name, failed in (UNX)(W32).",
-                                    ( sal_True == bRes )  );
+            
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: check logon user through forwarded user name, pwd and server name, failed in (UNX)(W32).", 
+                                    ( sal_True == bRes )  ); 
         }
 
 
         CPPUNIT_TEST_SUITE( logonUser );
         if  ( !aStringForward.equals( aNullURL )  && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) ==  aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) )
-        /// if user name and passwd are forwarded
+        /// if user name and passwd are forwarded	
         {
-            CPPUNIT_TEST( logonUser_user_pwd );
+            CPPUNIT_TEST( logonUser_user_pwd ); 
         }
         if  ( !aStringForward.equals( aNullURL )  && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) !=  aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) )
-        /// if user name and passwd and file server are forwarded
+        /// if user name and passwd and file server are forwarded	
         {
-            CPPUNIT_TEST( logonUser_user_pwd_server );
+            CPPUNIT_TEST( logonUser_user_pwd_server ); 
         }
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class logonUser
 
 
@@ -144,23 +144,23 @@ namespace osl_Security
     {
     public:
         sal_Bool bRes, bRes1;
-
+    
         void getUserIdent_001( )
         {
             ::osl::Security aSec;
             ::rtl::OUString strID;
             bRes = aSec.getUserIdent( strID );
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: get UserID and compare it with names got at the beginning of the test.",
+            
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: get UserID and compare it with names got at the beginning of the test.", 
                                      ( sal_True == strUserID.equals( strID ) ) && ( sal_True == bRes ));
         }
-
+    
         CPPUNIT_TEST_SUITE( getUserIdent );
         CPPUNIT_TEST( getUserIdent_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class getUserIdent
 
-
+    
     /** testing the method:
         inline sal_Bool SAL_CALL getUserName( ::rtl::OUString& strName) const;
     */
@@ -168,33 +168,33 @@ namespace osl_Security
     {
     public:
         sal_Bool bRes, bRes1;
-
+    
         void getUserName_001( )
         {
             ::osl::Security aSec;
 #ifdef WNT
             ::rtl::OUString strName( strUserName ), strGetName;
-#else
+#else			
             ::rtl::OUString strName( strUserName ), strGetName;
-#endif
+#endif			
             bRes = aSec.getUserName( strGetName );
-
+            
             sal_Int32 nPos = -1;
             if (strName.getLength() > 0)
             {
                 nPos = strGetName.indexOf(strName);
             }
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: get UserName and compare it with names got at the beginning of the test.",
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: get UserName and compare it with names got at the beginning of the test.", 
                                     ( nPos >= 0 ) && ( sal_True == bRes ) );
         }
-
+    
         CPPUNIT_TEST_SUITE( getUserName );
         CPPUNIT_TEST( getUserName_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class getUserName
+    
 
-
-
+    
     /** testing the method:
         inline sal_Bool SAL_CALL getHomeDir( ::rtl::OUString& strDirectory) const;
     */
@@ -202,20 +202,20 @@ namespace osl_Security
     {
     public:
         sal_Bool bRes, bRes1;
-
+    
         void getHomeDir_001( )
         {
             ::osl::Security aSec;
             ::rtl::OUString strHome;
             bRes = aSec.getHomeDir( strHome );
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: getHomeDir and compare it with the info we get at the beginning.",
+            
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: getHomeDir and compare it with the info we get at the beginning.", 
                                      ( sal_True == strHomeDirectory.equals( strHome ) ) && ( sal_True == bRes ) );
         }
-
+    
         CPPUNIT_TEST_SUITE( getHomeDir );
         CPPUNIT_TEST( getHomeDir_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class getHomeDir
 
     /** testing the method:
@@ -225,20 +225,20 @@ namespace osl_Security
     {
     public:
         sal_Bool bRes, bRes1;
-
+    
         void getConfigDir_001( )
         {
             ::osl::Security aSec;
             ::rtl::OUString strConfig;
             bRes = aSec.getConfigDir( strConfig );
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: getHomeDir and compare it with the info we get at the beginning.",
+            
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: getHomeDir and compare it with the info we get at the beginning.", 
                                      ( sal_True == strConfigDirectory.equals( strConfig ) ) && ( sal_True == bRes ) );
         }
-
+    
         CPPUNIT_TEST_SUITE( getConfigDir );
         CPPUNIT_TEST( getConfigDir_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class getConfigDir
 
     /** testing the method:
@@ -248,19 +248,19 @@ namespace osl_Security
     {
     public:
         sal_Bool bRes;
-
+    
         void isAdministrator_001( )
         {
             ::osl::Security aSec;
             bRes = aSec.isAdministrator(  );
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: check if the user is administrator at beginning, compare here.",
+            
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: check if the user is administrator at beginning, compare here.", 
                                      bRes == isAdmin );
         }
-
+    
         CPPUNIT_TEST_SUITE( isAdministrator );
         CPPUNIT_TEST( isAdministrator_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class isAdministrator
 
     /** testing the method:
@@ -270,34 +270,34 @@ namespace osl_Security
     {
     public:
         sal_Bool bRes;
-
+    
         void getHandle_001( )
         {
             ::osl::Security aSec;
             bRes = aSec.isAdministrator( ) == osl_isAdministrator( aSec.getHandle( ) );
-
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: use getHandle function to call C API.",
+            
+            CPPUNIT_ASSERT_MESSAGE( "#test comment#: use getHandle function to call C API.", 
                                      bRes == sal_True );
         }
-
+    
         CPPUNIT_TEST_SUITE( getHandle );
         CPPUNIT_TEST( getHandle_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class getHandle
 
 
     class UserProfile : public CppUnit::TestFixture
     {
     public:
-
+    
         void loadUserProfile( )
             {
                 ::osl::Security aSec;
                 sal_Bool bValue = osl_loadUserProfile(aSec.getHandle());
-
+                
                 CPPUNIT_ASSERT_MESSAGE( "empty function.", bValue == sal_False );
             }
-
+    
         void unloadUserProfile( )
             {
                 ::osl::Security aSec;
@@ -308,13 +308,13 @@ namespace osl_Security
         CPPUNIT_TEST_SUITE( UserProfile );
         CPPUNIT_TEST( loadUserProfile );
         CPPUNIT_TEST( unloadUserProfile );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class UserProfile
 
     class loginUserOnFileServer : public CppUnit::TestFixture
     {
     public:
-
+    
         void loginUserOnFileServer_001( )
             {
                 rtl::OUString suUserName;
@@ -324,15 +324,15 @@ namespace osl_Security
                 oslSecurity pSec = aSec.getHandle();
 
                 oslSecurityError erg = osl_loginUserOnFileServer(suUserName.pData, suPassword.pData, suFileServer.pData, &pSec);
-
+                
                 CPPUNIT_ASSERT_MESSAGE( "empty function.", erg == osl_Security_E_UserUnknown );
             }
 
         CPPUNIT_TEST_SUITE( loginUserOnFileServer );
         CPPUNIT_TEST( loginUserOnFileServer_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        CPPUNIT_TEST_SUITE_END( ); 
     }; // class loginUserOnFileServer
-
+    
 // -----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Security::ctors, "osl_Security");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Security::logonUser, "osl_Security");
@@ -347,7 +347,7 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Security::UserProfile, "osl_Security")
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Security::loginUserOnFileServer, "osl_Security");
 
 // -----------------------------------------------------------------------------
-
+    
 } // namespace osl_Security
 
 
@@ -357,7 +357,7 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Security::loginUserOnFileServer, "osl_
 // to let the user the possibility to also register some functions by hand.
 
 /** to do some initialized work, we replace the NOADDITIONAL macro with the initialize work which
-      get current user name, .
+      get current user name, . 
 */
 
 void RegisterAdditionalFunctions(FktRegFuncPtr)
@@ -369,12 +369,12 @@ void RegisterAdditionalFunctions(FktRegFuncPtr)
     t_print("#testshl2 -forward \"username password\" ../../../wntmsci9/bin/Security.dll\n" );
     t_print("#      where username and password are forwarded account info.\n" );
     t_print("#if no text forwarded, this function will be skipped.\n" );
-
+    
     /// get system information
-#if ( defined UNX ) || ( defined OS2 )
+#if ( defined UNX ) || ( defined OS2 )	
     /// some initialization work for UNIX OS
-
-
+    
+    
     struct passwd* pw;
     CPPUNIT_ASSERT_MESSAGE( "getpwuid: no password entry\n",( pw = getpwuid( getuid() ) ) != NULL );
 
@@ -383,37 +383,37 @@ void RegisterAdditionalFunctions(FktRegFuncPtr)
 
     /// get user Name;
     strUserName = ::rtl::OUString::createFromAscii( pw->pw_name );
-
+    
     /// get home directory;
-    CPPUNIT_ASSERT_MESSAGE( "#Convert from system path to URL failed.",
+    CPPUNIT_ASSERT_MESSAGE( "#Convert from system path to URL failed.",  
                             ::osl::File::E_None == ::osl::File::getFileURLFromSystemPath( ::rtl::OUString::createFromAscii( pw->pw_dir ), strHomeDirectory ) );
-
+    
     /// get config directory;
     strConfigDirectory = strHomeDirectory.copy(0);
-
+    
     /// is administrator;
     if( !getuid( ) )
         isAdmin = sal_True;
-
+    
 #endif
-#if defined ( WNT )
+#if defined ( WNT )                                     
     /// some initialization work for Windows OS
 
 
-    /// Get the user name, computer name, user home directory.
-    LPTSTR lpszSystemInfo;      // pointer to system information string
-    DWORD cchBuff = BUFSIZE;    // size of computer or user name
+    /// Get the user name, computer name, user home directory. 
+    LPTSTR lpszSystemInfo;      // pointer to system information string 
+    DWORD cchBuff = BUFSIZE;    // size of computer or user name 
     TCHAR tchBuffer[BUFSIZE];   // buffer for string
-
-    lpszSystemInfo = tchBuffer;
-    cchBuff = BUFSIZE;
+  
+    lpszSystemInfo = tchBuffer; 
+    cchBuff = BUFSIZE; 
     if( GetUserNameA(lpszSystemInfo, &cchBuff) )
         strUserName = ::rtl::OUString::createFromAscii( lpszSystemInfo );
-
+    
     if( GetComputerName(lpszSystemInfo, &cchBuff) )
         strComputerName = ::rtl::OUString::createFromAscii( lpszSystemInfo );
 
-    /// Get user home directory.
+    /// Get user home directory. 
     HKEY hRegKey;
     sal_Char PathA[_MAX_PATH];
     ::rtl::OUString strHome;
@@ -421,27 +421,27 @@ void RegisterAdditionalFunctions(FktRegFuncPtr)
     {
         LONG lRet, lSize = sizeof(PathA);
         DWORD Type;
-
+        
         lRet = RegQueryValueEx(hRegKey, "AppData", NULL, &Type, ( unsigned char * )PathA, ( unsigned long * )&lSize);
         if ( ( lRet == ERROR_SUCCESS ) && ( Type == REG_SZ ) &&  ( _access( PathA, 0 ) == 0 ) )
         {
-            CPPUNIT_ASSERT_MESSAGE( "#Convert from system path to URL failed.",
+            CPPUNIT_ASSERT_MESSAGE( "#Convert from system path to URL failed.",  
                                     ::osl::File::E_None == ::osl::File::getFileURLFromSystemPath( ::rtl::OUString::createFromAscii( PathA ), strConfigDirectory ) );
         }
-
+        
         lRet = RegQueryValueEx(hRegKey, "Personal", NULL, &Type, ( unsigned char * )PathA, ( unsigned long * )&lSize);
         if ( ( lRet == ERROR_SUCCESS ) && ( Type == REG_SZ ) &&  ( _access( PathA, 0 ) == 0 ) )
         {
-            CPPUNIT_ASSERT_MESSAGE( "#Convert from system path to URL failed.",
+            CPPUNIT_ASSERT_MESSAGE( "#Convert from system path to URL failed.",  
                                     ::osl::File::E_None == ::osl::File::getFileURLFromSystemPath( ::rtl::OUString::createFromAscii( PathA ), strHomeDirectory ) );
         }
-
+        
         RegCloseKey(hRegKey);
     }
 
 
     /// Get user Security ID:
-
+    
     // Create buffers that may be large enough. If a buffer is too small, the count parameter will be set to the size needed.
      const DWORD INITIAL_SIZE = 32;
     DWORD cbSid = 0;
@@ -451,18 +451,18 @@ void RegisterAdditionalFunctions(FktRegFuncPtr)
     WCHAR * wszDomainName = NULL;
     SID_NAME_USE eSidType;
     DWORD dwErrorCode = 0;
-
+    
     LPCWSTR wszAccName = ( LPWSTR ) strUserName.getStr( );
-
+    
     // Create buffers for the SID and the domain name.
     PSID pSid = (PSID) new WIN_BYTE[dwSidBufferSize];
     CPPUNIT_ASSERT_MESSAGE("# creating SID buffer failed.\n", pSid!= NULL );
     memset( pSid, 0, dwSidBufferSize);
-
+    
     wszDomainName = new WCHAR[dwDomainBufferSize];
     CPPUNIT_ASSERT_MESSAGE("# creating Domain name buffer failed.\n", wszDomainName != NULL );
     memset(wszDomainName, 0, dwDomainBufferSize*sizeof(WCHAR));
-
+    
     // Obtain the SID for the account name passed.
     for ( ; ; )
     {
@@ -522,7 +522,7 @@ void RegisterAdditionalFunctions(FktRegFuncPtr)
     DWORD dwSidRev=SID_REVISION;
     DWORD dwCounter;
     DWORD dwSidSize;
-    sal_Char    *Ident;
+    sal_Char	*Ident;
 
     /* obtain SidIdentifierAuthority */
     psia=GetSidIdentifierAuthority(pSid);
@@ -566,92 +566,92 @@ void RegisterAdditionalFunctions(FktRegFuncPtr)
     }
 
     strUserID = ::rtl::OUString::createFromAscii( Ident );
-
+ 
     free(Ident);
      delete pSid;
     delete [] wszDomainName;
 
 
     /// check if logged in user is administrator:
-
+    
     WIN_BOOL b;
     SID_IDENTIFIER_AUTHORITY NtAuthority = SECURITY_NT_AUTHORITY;
-    PSID AdministratorsGroup;
+    PSID AdministratorsGroup; 
     b = AllocateAndInitializeSid(
         &NtAuthority,
         2,
         SECURITY_BUILTIN_DOMAIN_RID,
         DOMAIN_ALIAS_RID_ADMINS,
         0, 0, 0, 0, 0, 0,
-        &AdministratorsGroup);
-    if(b)
+        &AdministratorsGroup); 
+    if(b) 
     {
-        if (!CheckTokenMembership( NULL, AdministratorsGroup, &b))
+        if (!CheckTokenMembership( NULL, AdministratorsGroup, &b)) 
         {
              b = FALSE;
-        }
-        FreeSid(AdministratorsGroup);
-    }
+        } 
+        FreeSid(AdministratorsGroup); 
+    }	
 
     isAdmin = ( sal_Bool )b;
 
 #endif
 
-    /// print the information.
+    /// print the information. 
     t_print("#\n#Retrived system information is below:\n");
-
+    
     t_print("Computer Name:              ");
-    if ( strComputerName == aNullURL )
+    if ( strComputerName == aNullURL ) 
         t_print(" Not retrived\n" );
     else
         printUString( strComputerName );
-
+    
     t_print("Current User Name:          ");
-    if ( strUserName == aNullURL )
+    if ( strUserName == aNullURL ) 
         t_print(" Not retrived\n" );
     else
         printUString( strUserName );
-
+    
     t_print("Current User Home Directory:");
-    if ( strHomeDirectory == aNullURL )
+    if ( strHomeDirectory == aNullURL ) 
         t_print(" Not retrived\n" );
     else
         printUString( strHomeDirectory );
 
     t_print("Current Config Directory:   ");
-    if ( strConfigDirectory == aNullURL )
+    if ( strConfigDirectory == aNullURL ) 
         t_print(" Not retrived\n" );
     else
         printUString( strConfigDirectory );
 
-    t_print("Current UserID:             ");
-    if ( strUserID == aNullURL )
+    t_print("Current UserID:             "); 
+    if ( strUserID == aNullURL ) 
         t_print(" Not retrived\n" );
     else
         printUString( strUserID );
 
     t_print("Current User is");
-    if ( isAdmin == sal_False )
-        t_print(" NOT Administrator.\n" );
+    if ( isAdmin == sal_False ) 
+        t_print(" NOT Administrator.\n" ); 
     else
         t_print(" Administrator.\n" );
+    
 
-
-    /// get and display forwarded text if available.
+    /// get and display forwarded text if available. 
     aStringForward = ::rtl::OUString::createFromAscii( getForwardString() );
     if ( !aStringForward.equals( aNullURL ) && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 )
     {
         sal_Int32 nFirstSpacePoint = aStringForward.indexOf( (sal_Unicode)' ' );;
         sal_Int32 nLastSpacePoint = aStringForward.lastIndexOf( (sal_Unicode)' ' );;
-        if ( nFirstSpacePoint == nLastSpacePoint )
+        if ( nFirstSpacePoint == nLastSpacePoint )  
         /// only forwarded two parameters, username and password.
         {
             aLogonUser = aStringForward.copy( 0, nFirstSpacePoint );
-            t_print("\n#Forwarded username: ");
+            t_print("\n#Forwarded username: "); 
             printUString( aLogonUser);
-
+            
             aLogonPasswd = aStringForward.copy( nFirstSpacePoint +1, aStringForward.getLength( ) - 1 );
-            t_print("#Forwarded password: ");
+            t_print("#Forwarded password: "); 
             for ( int i = nFirstSpacePoint +1; i <= aStringForward.getLength( ) - 1; i++, t_print("*") );
             t_print("\n" );
         }
@@ -659,22 +659,22 @@ void RegisterAdditionalFunctions(FktRegFuncPtr)
         /// forwarded three parameters, username, password and fileserver.
         {
             aLogonUser = aStringForward.copy( 0, nFirstSpacePoint );
-            t_print("#Forwarded username: ");
+            t_print("#Forwarded username: "); 
             printUString( aLogonUser);
-
+            
             aLogonPasswd = aStringForward.copy( nFirstSpacePoint +1, nLastSpacePoint );
-            t_print("#Forwarded password: ");
+            t_print("#Forwarded password: "); 
             for ( int i = nFirstSpacePoint +1; i <= nLastSpacePoint; i++, t_print("*") );
             t_print("\n" );
-
+            
             aFileServer = aStringForward.copy( nLastSpacePoint +1, aStringForward.getLength( ) - 1 );
-            t_print("#Forwarded FileServer: ");
+            t_print("#Forwarded FileServer: "); 
             printUString( aFileServer );
-
+        
         }
     }
 
-    t_print("#\n#Initialization Done.\n" );
+    t_print("#\n#Initialization Done.\n" ); 
 
 }
 
diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h
index 476d9e5bdc61..a86e8583dafb 100644
--- a/sal/qa/osl/security/osl_Security_Const.h
+++ b/sal/qa/osl/security/osl_Security_Const.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
index dd2b3789bf1c..0a1e58144a1c 100644
--- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx
+++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
     if you are not including ws2_32.lib in makefile.mk,  the including format will be like this:
 
     .IF "$(GUI)" == "WNT"
-    SHL1STDLIBS +=  $(SOLARLIBDIR)$/cppunit.lib
+    SHL1STDLIBS +=	$(SOLARLIBDIR)$/cppunit.lib
     SHL1STDLIBS +=  ws2_32.lib
     .ENDIF
 
@@ -135,8 +135,8 @@ namespace osl_AcceptorSocket
 
     /** testing the methods:
         inline AcceptorSocket(oslAddrFamily Family = osl_Socket_FamilyInet,
-                              oslProtocol   Protocol = osl_Socket_ProtocolIp,
-                              oslSocketType Type = osl_Socket_TypeStream);
+                              oslProtocol	Protocol = osl_Socket_ProtocolIp,
+                              oslSocketType	Type = osl_Socket_TypeStream);
     */
 
     class ctors : public CppUnit::TestFixture
@@ -161,7 +161,7 @@ namespace osl_AcceptorSocket
     /** testing the method:
         inline sal_Bool SAL_CALL listen(sal_Int32 MaxPendingConnections= -1);
         inline oslSocketResult SAL_CALL acceptConnection( StreamSocket& Connection);
-        inline oslSocketResult SAL_CALL acceptConnection( StreamSocket& Connection, SocketAddr & PeerAddr);
+        inline oslSocketResult SAL_CALL acceptConnection( StreamSocket&	Connection, SocketAddr & PeerAddr);
     */
 
     class listen_accept : public CppUnit::TestFixture
@@ -179,13 +179,13 @@ namespace osl_AcceptorSocket
             pTimeout->Seconds = 3;
             pTimeout->Nanosec = 0;
             asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1);
-        //  sHandle = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeStream, osl_Socket_ProtocolIp );
+        //	sHandle = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeStream, osl_Socket_ProtocolIp );
         }
 
         void tearDown( )
         {
             free( pTimeout );
-        //  sHandle = NULL;
+        //	sHandle = NULL;
             asAcceptorSocket.close( );
             csConnectorSocket.close( );
         }
diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
index e1dbf2be8764..79fb6eb6f06e 100644
--- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx
+++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
     if you are not including ws2_32.lib in makefile.mk,  the including format will be like this:
 
     .IF "$(GUI)" == "WNT"
-    SHL1STDLIBS +=  $(SOLARLIBDIR)$/cppunit.lib
+    SHL1STDLIBS +=	$(SOLARLIBDIR)$/cppunit.lib
     SHL1STDLIBS +=  ws2_32.lib
     .ENDIF
 
@@ -104,8 +104,8 @@ namespace osl_ConnectorSocket
 
     /** testing the method:
         ConnectorSocket(oslAddrFamily Family = osl_Socket_FamilyInet,
-                        oslProtocol Protocol = osl_Socket_ProtocolIp,
-                        oslSocketType   Type = osl_Socket_TypeStream);
+                        oslProtocol	Protocol = osl_Socket_ProtocolIp,
+                        oslSocketType	Type = osl_Socket_TypeStream);
     */
 
     class ctors : public CppUnit::TestFixture
@@ -144,13 +144,13 @@ namespace osl_ConnectorSocket
             pTimeout  = ( TimeValue* )malloc( sizeof( TimeValue ) );
             pTimeout->Seconds = 3;
             pTimeout->Nanosec = 0;
-        //  sHandle = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeStream, osl_Socket_ProtocolIp );
+        //	sHandle = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeStream, osl_Socket_ProtocolIp );
         }
 
         void tearDown( )
         {
             free( pTimeout );
-        //  sHandle = NULL;
+        //	sHandle = NULL;
             asAcceptorSocket.close( );
             csConnectorSocket.close( );
         }
diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx
index 5a1acff9ef7b..db07bc72d774 100644
--- a/sal/qa/osl/socket/osl_DatagramSocket.cxx
+++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
     if you are not including ws2_32.lib in makefile.mk,  the including format will be like this:
 
     .IF "$(GUI)" == "WNT"
-    SHL1STDLIBS +=  $(SOLARLIBDIR)$/cppunit.lib
+    SHL1STDLIBS +=	$(SOLARLIBDIR)$/cppunit.lib
     SHL1STDLIBS +=  ws2_32.lib
     .ENDIF
 
@@ -105,8 +105,8 @@ namespace osl_DatagramSocket
 
     /** testing the methods:
         inline DatagramSocket(oslAddrFamily Family= osl_Socket_FamilyInet,
-                              oslProtocol   Protocol= osl_Socket_ProtocolIp,
-                              oslSocketType Type= osl_Socket_TypeDgram);
+                              oslProtocol	Protocol= osl_Socket_ProtocolIp,
+                              oslSocketType	Type= osl_Socket_TypeDgram);
     */
 
     class ctors : public CppUnit::TestFixture
diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx
index 57d6e0c3f297..23a511460af9 100644
--- a/sal/qa/osl/socket/osl_Socket.cxx
+++ b/sal/qa/osl/socket/osl_Socket.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
     if you are not including ws2_32.lib in makefile.mk,  the including format will be like this:
 
     .IF "$(GUI)" == "WNT"
-    SHL1STDLIBS +=  $(SOLARLIBDIR)$/cppunit.lib
+    SHL1STDLIBS +=	$(SOLARLIBDIR)$/cppunit.lib
     SHL1STDLIBS +=  ws2_32.lib
     .ENDIF
 
@@ -325,7 +325,7 @@ protected:
               }
               else
                   t_print("# ClientSocketThread: connect failed! \n");
-         //     terminate();
+         // 	terminate();
         //}
         csConnectorSocket.close();
         free( pTimeout );
@@ -511,7 +511,7 @@ protected:
             {
             t_print("# ReadSocketThread: connect failed! \n");
             }
-        //      terminate();
+        //  	terminate();
         //}
         //remove this line for deadlock on solaris( margritte.germany )
         csConnectorSocket.close();
@@ -563,7 +563,7 @@ protected:
         ::osl::StreamSocket ssStreamConnection;
 
         //if has not set this option, socket addr can not be binded in some time(maybe 2 minutes) by another socket
-        asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 );    //sal_True);
+        asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 );	//sal_True);
 
         /// if the thread should terminate, schedule return false
         while ( schedule( ) == sal_True )
@@ -1541,7 +1541,7 @@ namespace osl_Socket
         {
 #ifdef WNT
             oslSocket sHandleRaw = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeRaw, osl_Socket_ProtocolIp );
-// LLA: ?           ::osl::Socket sSocket( sHandleRaw );
+// LLA: ?			::osl::Socket sSocket( sHandleRaw );
             CPPUNIT_ASSERT_MESSAGE( " type osl_Socket_TypeRaw socket create failed on UNX ", sHandleRaw != NULL);
 #else
             oslSocket sHandleRaw = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeRaw, osl_Socket_ProtocolIp );
@@ -1553,7 +1553,7 @@ namespace osl_Socket
         {
             oslSocket sHandleIpx = osl_createSocket( osl_Socket_FamilyIpx, osl_Socket_TypeStream, osl_Socket_ProtocolIp );
             CPPUNIT_ASSERT_MESSAGE( " family osl_Socket_FamilyIpx socket create failed! ", sHandleIpx != NULL);
-            ::osl::Socket sSocket( sHandleIpx );        //, SAL_NO_ACQUIRE );
+            ::osl::Socket sSocket( sHandleIpx );		//, SAL_NO_ACQUIRE );
             t_print("#Type is %d \n", sSocket.getType( ) );
 
             CPPUNIT_ASSERT_MESSAGE(" test for create new Socket instance that family is osl_Socket_FamilyIpx",
@@ -1716,7 +1716,7 @@ namespace osl_Socket
             myAcceptorThread.join();
 
             CPPUNIT_ASSERT_MESSAGE( "test for close when is accepting: the socket will quit accepting status.",
-                                myAcceptorThread.isOK() == sal_True );
+                                myAcceptorThread.isOK()	== sal_True );
 //#endif
         }
 
@@ -1732,7 +1732,7 @@ namespace osl_Socket
             myAcceptorThread.join();
 
             CPPUNIT_ASSERT_MESSAGE( "test for close when is accepting: the socket will quit accepting status.",
-                                myAcceptorThread.isOK() == sal_True );
+                                myAcceptorThread.isOK()	== sal_True );
         }
 
         CPPUNIT_TEST_SUITE( close );
@@ -1792,7 +1792,7 @@ namespace osl_Socket
 
 
     /** testing the method:
-        inline sal_Int32    SAL_CALL getLocalPort() const;
+        inline sal_Int32	SAL_CALL getLocalPort() const;
     */
 
     class getLocalPort : public CppUnit::TestFixture
@@ -1877,7 +1877,7 @@ namespace osl_Socket
 
         CPPUNIT_TEST_SUITE( getLocalPort );
         CPPUNIT_TEST( getLocalPort_001 );
-// LLA:     CPPUNIT_TEST( getLocalPort_002 );
+// LLA:		CPPUNIT_TEST( getLocalPort_002 );
         CPPUNIT_TEST( getLocalPort_003 );
         CPPUNIT_TEST_SUITE_END();
 
@@ -1961,7 +1961,7 @@ namespace osl_Socket
 
     /** testing the methods:
         inline void SAL_CALL getPeerAddr( SocketAddr & Addr) const;
-        inline sal_Int32    SAL_CALL getPeerPort() const;
+        inline sal_Int32	SAL_CALL getPeerPort() const;
         inline ::rtl::OUString SAL_CALL getPeerHost() const;
     */
     class getPeer : public CppUnit::TestFixture
@@ -2089,7 +2089,7 @@ namespace osl_Socket
 
 
     /** testing the methods:
-        inline sal_Bool SAL_CALL isRecvReady(const TimeValue *pTimeout = 0) const;
+        inline sal_Bool	SAL_CALL isRecvReady(const TimeValue *pTimeout = 0) const;
 
     */
     class isRecvReady : public CppUnit::TestFixture
@@ -2153,7 +2153,7 @@ namespace osl_Socket
 
 
     /** testing the methods:
-        inline sal_Bool SAL_CALL isSendReady(const TimeValue *pTimeout = 0) const;
+        inline sal_Bool	SAL_CALL isSendReady(const TimeValue *pTimeout = 0) const;
     */
     class isSendReady : public CppUnit::TestFixture
     {
@@ -2217,7 +2217,7 @@ namespace osl_Socket
 
 
     /** testing the methods:
-        inline oslSocketType    SAL_CALL getType() const;
+        inline oslSocketType	SAL_CALL getType() const;
 
     */
 
@@ -2447,26 +2447,26 @@ namespace osl_Socket
 
             t_print("#setOption_001: getOption is %d \n", *pGetBuffer);
 
-// LLA:             sal_Bool * pbDontTouteSet = ( sal_Bool * )malloc( sizeof ( sal_Bool ) );
-// LLA:             *pbDontTouteSet = sal_True;
-// LLA:             sal_Bool * pbDontTouteGet = ( sal_Bool * )malloc( sizeof ( sal_Bool ) );
-// LLA:             *pbDontTouteGet = sal_False;
-// LLA:             asAcceptorSocket.setOption( osl_Socket_OptionDontRoute,  pbDontTouteSet, sizeof ( sal_Bool ) );
-// LLA:             asAcceptorSocket.getOption( osl_Socket_OptionDontRoute,  pbDontTouteGet, sizeof ( sal_Bool ) );
-// LLA:             ::rtl::OUString suError = outputError(::rtl::OUString::valueOf((sal_Int32)*pbDontTouteGet),
-// LLA:                 ::rtl::OUString::valueOf((sal_Int32)*pbDontTouteSet),
-// LLA:                 "test for setOption function: set osl_Socket_OptionDontRoute and then check");
+// LLA: 			sal_Bool * pbDontTouteSet = ( sal_Bool * )malloc( sizeof ( sal_Bool ) );
+// LLA: 			*pbDontTouteSet = sal_True;
+// LLA: 			sal_Bool * pbDontTouteGet = ( sal_Bool * )malloc( sizeof ( sal_Bool ) );
+// LLA: 			*pbDontTouteGet = sal_False;
+// LLA: 			asAcceptorSocket.setOption( osl_Socket_OptionDontRoute,  pbDontTouteSet, sizeof ( sal_Bool ) );
+// LLA: 			asAcceptorSocket.getOption( osl_Socket_OptionDontRoute,  pbDontTouteGet, sizeof ( sal_Bool ) );
+// LLA: 			::rtl::OUString suError = outputError(::rtl::OUString::valueOf((sal_Int32)*pbDontTouteGet),
+// LLA: 				::rtl::OUString::valueOf((sal_Int32)*pbDontTouteSet),
+// LLA: 				"test for setOption function: set osl_Socket_OptionDontRoute and then check");
 // LLA:
-// LLA:             sal_Bool bOK = ( sal_True  ==  *pbDontTouteGet );
-// LLA:             free( pbDontTouteSet );
-// LLA:             free( pbDontTouteGet );
+// LLA: 			sal_Bool bOK = ( sal_True  ==  *pbDontTouteGet );
+// LLA: 			free( pbDontTouteSet );
+// LLA: 			free( pbDontTouteGet );
 
             CPPUNIT_ASSERT_MESSAGE( "test for setOption function: set option of a socket and then check.",
                                       ( sal_True == bOK ) && (sal_True == bOK2) );
 
             free( pbDontRouteSet );
             free( pGetBuffer );
-// LLA:             CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK );
+// LLA: 			CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK );
         }
 
         void setOption_002()
@@ -2522,11 +2522,11 @@ namespace osl_Socket
         {
             /// set and get option.
             // LLA: this does not work, due to the fact that SO_LINGER is a structure
-// LLA:         asAcceptorSocket.setOption( osl_Socket_OptionLinger,  7 );
-// LLA:         sal_Bool bOK = ( 7  ==  asAcceptorSocket.getOption( osl_Socket_OptionLinger ) );
+// LLA:			asAcceptorSocket.setOption( osl_Socket_OptionLinger,  7 );
+// LLA:			sal_Bool bOK = ( 7  ==  asAcceptorSocket.getOption( osl_Socket_OptionLinger ) );
 
-// LLA:         CPPUNIT_ASSERT_MESSAGE( "test for setOption function: set option of a socket and then check.",
-// LLA:                                     ( sal_True == bOK ) );
+// LLA:			CPPUNIT_ASSERT_MESSAGE( "test for setOption function: set option of a socket and then check.",
+// LLA: 									( sal_True == bOK ) );
         }
 
         CPPUNIT_TEST_SUITE( setOption );
@@ -2534,7 +2534,7 @@ namespace osl_Socket
         CPPUNIT_TEST( setOption_002 );
         CPPUNIT_TEST( setOption_003 );
         CPPUNIT_TEST( setOption_simple_001 );
-// LLA:     CPPUNIT_TEST( setOption_simple_002 );
+// LLA:		CPPUNIT_TEST( setOption_simple_002 );
         CPPUNIT_TEST_SUITE_END();
 
     }; // class setOption
@@ -2619,7 +2619,7 @@ namespace osl_Socket
     }; // class isNonBlockingMode
 
     /** testing the method:
-        inline void SAL_CALL clearError() const;
+        inline void	SAL_CALL clearError() const;
     */
     class clearError : public CppUnit::TestFixture
     {
@@ -2793,8 +2793,8 @@ namespace osl_StreamSocket
 
     /** testing the methods:
         inline StreamSocket(oslAddrFamily Family = osl_Socket_FamilyInet,
-                            oslProtocol Protocol = osl_Socket_ProtocolIp,
-                            oslSocketType   Type = osl_Socket_TypeStream);
+                            oslProtocol	Protocol = osl_Socket_ProtocolIp,
+                            oslSocketType	Type = osl_Socket_TypeStream);
 
         inline StreamSocket( const StreamSocket & );
 
@@ -2929,7 +2929,7 @@ namespace osl_StreamSocket
             WriteSocketThread myServerThread(_nBufferSize, _nValue);
             ReadSocketThread myClientThread(_nBufferSize, _nValue);
             myServerThread.create( );
-//          thread_sleep( 1 );
+//			thread_sleep( 1 );
             myClientThread.create( );
 
             //wait until the thread terminate
@@ -2972,7 +2972,7 @@ namespace osl_StreamSocket
         CPPUNIT_TEST( write_read_004 );
         CPPUNIT_TEST( send_recv1 );
         CPPUNIT_TEST( send_recv2 );
-//      CPPUNIT_TEST( write_read );
+//		CPPUNIT_TEST( write_read );
         CPPUNIT_TEST_SUITE_END();
     }; // class send_recv
 
@@ -3122,7 +3122,7 @@ protected:
             asSocket.close();
 
             CPPUNIT_ASSERT_MESSAGE( "test for shutdown read direction: the socket can not send(write).",
-                                nRead1  > 0  && nWrite == 0 && nRead3 > 0);
+                                nRead1	> 0  && nWrite == 0 && nRead3 > 0);
 
         }
 
@@ -3173,8 +3173,8 @@ namespace osl_ConnectorSocket
 
     /** testing the method:
         ConnectorSocket(oslAddrFamily Family = osl_Socket_FamilyInet,
-                        oslProtocol Protocol = osl_Socket_ProtocolIp,
-                        oslSocketType   Type = osl_Socket_TypeStream);
+                        oslProtocol	Protocol = osl_Socket_ProtocolIp,
+                        oslSocketType	Type = osl_Socket_TypeStream);
     */
 
     class ctors : public CppUnit::TestFixture
@@ -3213,13 +3213,13 @@ namespace osl_ConnectorSocket
             pTimeout  = ( TimeValue* )malloc( sizeof( TimeValue ) );
             pTimeout->Seconds = 3;
             pTimeout->Nanosec = 0;
-        //  sHandle = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeStream, osl_Socket_ProtocolIp );
+        //	sHandle = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeStream, osl_Socket_ProtocolIp );
         }
 
         void tearDown( )
         {
             free( pTimeout );
-        //  sHandle = NULL;
+        //	sHandle = NULL;
             asAcceptorSocket.close( );
             csConnectorSocket.close( );
         }
@@ -3334,8 +3334,8 @@ namespace osl_AcceptorSocket
 
     /** testing the methods:
         inline AcceptorSocket(oslAddrFamily Family = osl_Socket_FamilyInet,
-                              oslProtocol   Protocol = osl_Socket_ProtocolIp,
-                              oslSocketType Type = osl_Socket_TypeStream);
+                              oslProtocol	Protocol = osl_Socket_ProtocolIp,
+                              oslSocketType	Type = osl_Socket_TypeStream);
     */
 
     class ctors : public CppUnit::TestFixture
@@ -3360,7 +3360,7 @@ namespace osl_AcceptorSocket
     /** testing the method:
         inline sal_Bool SAL_CALL listen(sal_Int32 MaxPendingConnections= -1);
         inline oslSocketResult SAL_CALL acceptConnection( StreamSocket& Connection);
-        inline oslSocketResult SAL_CALL acceptConnection( StreamSocket& Connection, SocketAddr & PeerAddr);
+        inline oslSocketResult SAL_CALL acceptConnection( StreamSocket&	Connection, SocketAddr & PeerAddr);
     */
 
     class listen_accept : public CppUnit::TestFixture
@@ -3378,13 +3378,13 @@ namespace osl_AcceptorSocket
             pTimeout->Seconds = 3;
             pTimeout->Nanosec = 0;
             asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1);
-        //  sHandle = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeStream, osl_Socket_ProtocolIp );
+        //	sHandle = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeStream, osl_Socket_ProtocolIp );
         }
 
         void tearDown( )
         {
             free( pTimeout );
-        //  sHandle = NULL;
+        //	sHandle = NULL;
             asAcceptorSocket.close( );
             csConnectorSocket.close( );
         }
@@ -3464,8 +3464,8 @@ namespace osl_DatagramSocket
 
     /** testing the methods:
         inline DatagramSocket(oslAddrFamily Family= osl_Socket_FamilyInet,
-                              oslProtocol   Protocol= osl_Socket_ProtocolIp,
-                              oslSocketType Type= osl_Socket_TypeDgram);
+                              oslProtocol	Protocol= osl_Socket_ProtocolIp,
+                              oslSocketType	Type= osl_Socket_TypeDgram);
     */
 
     class ctors : public CppUnit::TestFixture
diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx
index 04d36f70ffbf..bb97fdc10ba2 100644
--- a/sal/qa/osl/socket/osl_Socket2.cxx
+++ b/sal/qa/osl/socket/osl_Socket2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
     if you are not including ws2_32.lib in makefile.mk,  the including format will be like this:
 
     .IF "$(GUI)" == "WNT"
-    SHL1STDLIBS +=  $(SOLARLIBDIR)$/cppunit.lib
+    SHL1STDLIBS +=	$(SOLARLIBDIR)$/cppunit.lib
     SHL1STDLIBS +=  ws2_32.lib
     .ENDIF
 
@@ -212,7 +212,7 @@ namespace osl_Socket
         {
 #ifdef WNT
             oslSocket sHandleRaw = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeRaw, osl_Socket_ProtocolIp );
-// LLA: ?           ::osl::Socket sSocket( sHandleRaw );
+// LLA: ?			::osl::Socket sSocket( sHandleRaw );
             CPPUNIT_ASSERT_MESSAGE( " type osl_Socket_TypeRaw socket create failed on UNX ", sHandleRaw != NULL);
 #else
             oslSocket sHandleRaw = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeRaw, osl_Socket_ProtocolIp );
@@ -224,7 +224,7 @@ namespace osl_Socket
         {
             oslSocket sHandleIpx = osl_createSocket( osl_Socket_FamilyIpx, osl_Socket_TypeStream, osl_Socket_ProtocolIp );
             CPPUNIT_ASSERT_MESSAGE( " family osl_Socket_FamilyIpx socket create failed! ", sHandleIpx != NULL);
-            ::osl::Socket sSocket( sHandleIpx );        //, SAL_NO_ACQUIRE );
+            ::osl::Socket sSocket( sHandleIpx );		//, SAL_NO_ACQUIRE );
             t_print("#Type is %d \n", sSocket.getType( ) );
 
             CPPUNIT_ASSERT_MESSAGE(" test for create new Socket instance that family is osl_Socket_FamilyIpx",
@@ -387,7 +387,7 @@ namespace osl_Socket
             myAcceptorThread.join();
 
             CPPUNIT_ASSERT_MESSAGE( "test for close when is accepting: the socket will quit accepting status.",
-                                myAcceptorThread.isOK() == sal_True );
+                                myAcceptorThread.isOK()	== sal_True );
 //#endif
         }
 
@@ -403,7 +403,7 @@ namespace osl_Socket
             myAcceptorThread.join();
 
             CPPUNIT_ASSERT_MESSAGE( "test for close when is accepting: the socket will quit accepting status.",
-                                myAcceptorThread.isOK() == sal_True );
+                                myAcceptorThread.isOK()	== sal_True );
         }
 
         CPPUNIT_TEST_SUITE( close );
@@ -463,7 +463,7 @@ namespace osl_Socket
 
 
     /** testing the method:
-        inline sal_Int32    SAL_CALL getLocalPort() const;
+        inline sal_Int32	SAL_CALL getLocalPort() const;
     */
 
     class getLocalPort : public CppUnit::TestFixture
@@ -548,7 +548,7 @@ namespace osl_Socket
 
         CPPUNIT_TEST_SUITE( getLocalPort );
         CPPUNIT_TEST( getLocalPort_001 );
-// LLA:     CPPUNIT_TEST( getLocalPort_002 );
+// LLA:		CPPUNIT_TEST( getLocalPort_002 );
         CPPUNIT_TEST( getLocalPort_003 );
         CPPUNIT_TEST_SUITE_END();
 
@@ -632,7 +632,7 @@ namespace osl_Socket
 
     /** testing the methods:
         inline void SAL_CALL getPeerAddr( SocketAddr & Addr) const;
-        inline sal_Int32    SAL_CALL getPeerPort() const;
+        inline sal_Int32	SAL_CALL getPeerPort() const;
         inline ::rtl::OUString SAL_CALL getPeerHost() const;
     */
     class getPeer : public CppUnit::TestFixture
@@ -760,7 +760,7 @@ namespace osl_Socket
 
 
     /** testing the methods:
-        inline sal_Bool SAL_CALL isRecvReady(const TimeValue *pTimeout = 0) const;
+        inline sal_Bool	SAL_CALL isRecvReady(const TimeValue *pTimeout = 0) const;
 
     */
     class isRecvReady : public CppUnit::TestFixture
@@ -824,7 +824,7 @@ namespace osl_Socket
 
 
     /** testing the methods:
-        inline sal_Bool SAL_CALL isSendReady(const TimeValue *pTimeout = 0) const;
+        inline sal_Bool	SAL_CALL isSendReady(const TimeValue *pTimeout = 0) const;
     */
     class isSendReady : public CppUnit::TestFixture
     {
@@ -888,7 +888,7 @@ namespace osl_Socket
 
 
     /** testing the methods:
-        inline oslSocketType    SAL_CALL getType() const;
+        inline oslSocketType	SAL_CALL getType() const;
 
     */
 
@@ -1118,26 +1118,26 @@ namespace osl_Socket
 
             t_print("#setOption_001: getOption is %d \n", *pGetBuffer);
 
-// LLA:             sal_Bool * pbDontTouteSet = ( sal_Bool * )malloc( sizeof ( sal_Bool ) );
-// LLA:             *pbDontTouteSet = sal_True;
-// LLA:             sal_Bool * pbDontTouteGet = ( sal_Bool * )malloc( sizeof ( sal_Bool ) );
-// LLA:             *pbDontTouteGet = sal_False;
-// LLA:             asAcceptorSocket.setOption( osl_Socket_OptionDontRoute,  pbDontTouteSet, sizeof ( sal_Bool ) );
-// LLA:             asAcceptorSocket.getOption( osl_Socket_OptionDontRoute,  pbDontTouteGet, sizeof ( sal_Bool ) );
-// LLA:             ::rtl::OUString suError = outputError(::rtl::OUString::valueOf((sal_Int32)*pbDontTouteGet),
-// LLA:                 ::rtl::OUString::valueOf((sal_Int32)*pbDontTouteSet),
-// LLA:                 "test for setOption function: set osl_Socket_OptionDontRoute and then check");
+// LLA: 			sal_Bool * pbDontTouteSet = ( sal_Bool * )malloc( sizeof ( sal_Bool ) );
+// LLA: 			*pbDontTouteSet = sal_True;
+// LLA: 			sal_Bool * pbDontTouteGet = ( sal_Bool * )malloc( sizeof ( sal_Bool ) );
+// LLA: 			*pbDontTouteGet = sal_False;
+// LLA: 			asAcceptorSocket.setOption( osl_Socket_OptionDontRoute,  pbDontTouteSet, sizeof ( sal_Bool ) );
+// LLA: 			asAcceptorSocket.getOption( osl_Socket_OptionDontRoute,  pbDontTouteGet, sizeof ( sal_Bool ) );
+// LLA: 			::rtl::OUString suError = outputError(::rtl::OUString::valueOf((sal_Int32)*pbDontTouteGet),
+// LLA: 				::rtl::OUString::valueOf((sal_Int32)*pbDontTouteSet),
+// LLA: 				"test for setOption function: set osl_Socket_OptionDontRoute and then check");
 // LLA:
-// LLA:             sal_Bool bOK = ( sal_True  ==  *pbDontTouteGet );
-// LLA:             free( pbDontTouteSet );
-// LLA:             free( pbDontTouteGet );
+// LLA: 			sal_Bool bOK = ( sal_True  ==  *pbDontTouteGet );
+// LLA: 			free( pbDontTouteSet );
+// LLA: 			free( pbDontTouteGet );
 
             CPPUNIT_ASSERT_MESSAGE( "test for setOption function: set option of a socket and then check.",
                                       ( sal_True == bOK ) && (sal_True == bOK2) );
 
             free( pbDontRouteSet );
             free( pGetBuffer );
-// LLA:             CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK );
+// LLA: 			CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK );
         }
 
         void setOption_002()
@@ -1193,11 +1193,11 @@ namespace osl_Socket
         {
             /// set and get option.
             // LLA: this does not work, due to the fact that SO_LINGER is a structure
-// LLA:         asAcceptorSocket.setOption( osl_Socket_OptionLinger,  7 );
-// LLA:         sal_Bool bOK = ( 7  ==  asAcceptorSocket.getOption( osl_Socket_OptionLinger ) );
+// LLA:			asAcceptorSocket.setOption( osl_Socket_OptionLinger,  7 );
+// LLA:			sal_Bool bOK = ( 7  ==  asAcceptorSocket.getOption( osl_Socket_OptionLinger ) );
 
-// LLA:         CPPUNIT_ASSERT_MESSAGE( "test for setOption function: set option of a socket and then check.",
-// LLA:                                     ( sal_True == bOK ) );
+// LLA:			CPPUNIT_ASSERT_MESSAGE( "test for setOption function: set option of a socket and then check.",
+// LLA: 									( sal_True == bOK ) );
         }
 
         CPPUNIT_TEST_SUITE( setOption );
@@ -1205,7 +1205,7 @@ namespace osl_Socket
         CPPUNIT_TEST( setOption_002 );
         CPPUNIT_TEST( setOption_003 );
         CPPUNIT_TEST( setOption_simple_001 );
-// LLA:     CPPUNIT_TEST( setOption_simple_002 );
+// LLA:		CPPUNIT_TEST( setOption_simple_002 );
         CPPUNIT_TEST_SUITE_END();
 
     }; // class setOption
@@ -1290,7 +1290,7 @@ namespace osl_Socket
     }; // class isNonBlockingMode
 
     /** testing the method:
-        inline void SAL_CALL clearError() const;
+        inline void	SAL_CALL clearError() const;
     */
     class clearError : public CppUnit::TestFixture
     {
diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx
index 953d43548e6c..8d8f5d7c2039 100644
--- a/sal/qa/osl/socket/osl_SocketAddr.cxx
+++ b/sal/qa/osl/socket/osl_SocketAddr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
     if you are not including ws2_32.lib in makefile.mk,  the including format will be like this:
 
     .IF "$(GUI)" == "WNT"
-    SHL1STDLIBS +=  $(SOLARLIBDIR)$/cppunit.lib
+    SHL1STDLIBS +=	$(SOLARLIBDIR)$/cppunit.lib
     SHL1STDLIBS +=  ws2_32.lib
     .ENDIF
 
@@ -68,11 +68,11 @@ using namespace rtl;
 #define IP_PORT_HTTP1  80
 #define IP_PORT_HTTP2  8080
 
-#define IP_PORT_MYPORT  8881    //8888
-#define IP_PORT_MYPORT2  8883   //8890
-#define IP_PORT_MYPORT3  8884   //8891
+#define IP_PORT_MYPORT  8881 	//8888
+#define IP_PORT_MYPORT2  8883	//8890
+#define IP_PORT_MYPORT3  8884	//8891
 #define IP_PORT_INVAL  99999
-#define IP_PORT_MYPORT4  8885   //8892
+#define IP_PORT_MYPORT4  8885	//8892
 #define IP_PORT_NETBIOS_DGM  138
 
 
@@ -492,7 +492,7 @@ namespace osl_SocketAddr
             sal_Bool bOK = sal_False;
 
             // if ( ( bsSocketAddr[0] == 127 ) && ( bsSocketAddr[1] == 0 ) && ( bsSocketAddr[2] == 0 ) && ( bsSocketAddr[3] == 1 ) )
-            //  bOK = sal_True;
+            // 	bOK = sal_True;
             bOK = ifIpv4is( bsSocketAddr, 127, 0, 0, 1 );
 
             CPPUNIT_ASSERT_MESSAGE( "test for setAddr() function: construct Addr with  \"129.158.217.202\", set it to \"127.0.0.1\",  and check the correctness ",
@@ -523,7 +523,7 @@ namespace osl_SocketAddr
             sal_Bool bOK = sal_False;
 
             //if ( ( osl_Socket_Ok == SocketResult ) &&( bsSocketAddr[0] == 127 ) && ( bsSocketAddr[1] == 0 ) &&( bsSocketAddr[2] == 0 ) && ( bsSocketAddr[3] == 1 ) )
-            //  bOK = sal_True;
+            // 	bOK = sal_True;
             bOK = ifIpv4is( bsSocketAddr, 127, 0, 0, 1 );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getAddr() function: construct a socketaddr with IP assigned, get the address to check correctness.Caught unknown exception on (Win32)",
diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h
index 6d22bf03904b..60226c61a7ad 100644
--- a/sal/qa/osl/socket/osl_Socket_Const.h
+++ b/sal/qa/osl/socket/osl_Socket_Const.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,7 +59,7 @@
 
 const char * pTestString1 = "test socket";
 const char * pTestString2 = " Passed#OK";
-//define read count
+//define read count 
 //------------------------------------------------------------------------
 //------------------------------------------------------------------------
 
@@ -68,39 +68,39 @@ extern "C"
 {
 #endif
 
-#   include <stdio.h>
+#	include <stdio.h> 
 //------------------------------------------------------------------------
 // OS dependent declaration and includes
 //------------------------------------------------------------------------
 #if ( defined UNX ) || ( defined OS2 )  //Unix
-#   include <unistd.h>
-#   include <limits.h>
-#   include <string.h>
-#   include <math.h>
-#   include <errno.h>
-#   include <fcntl.h>
-#   include <sys/stat.h>
-#   include <sys/statfs.h>
-#   include <sys/statvfs.h>
-#   include <sys/types.h>
-#   include <sys/socket.h>
-#   include <netdb.h>
-#   include <netinet/in.h>
+#	include <unistd.h>
+#	include <limits.h>
+#	include <string.h>
+#	include <math.h>
+#	include <errno.h>
+#	include <fcntl.h>
+#	include <sys/stat.h>
+#	include <sys/statfs.h>
+#	include <sys/statvfs.h>
+#	include <sys/types.h>
+#	include <sys/socket.h>
+#	include <netdb.h>
+#	include <netinet/in.h>           
 #       include <arpa/inet.h>
 #endif
 #if ( defined WNT )                     // Windows
 #include <tools/prewin.h>
-// #    include <windows.h>
-#   include <winsock.h>
-#   include <string.h>
+// #	include <windows.h> 
+#	include <winsock.h> 
+#	include <string.h>
 #include <tools/postwin.h>
 #endif
 
 
 //------------------------------------------------------------------------
-// macro definition for the ASCII array/OUString declarations,
-// we use p### for the ASCII array,
-//        a### for the OUString,
+// macro definition for the ASCII array/OUString declarations, 
+// we use p### for the ASCII array, 
+//        a### for the OUString, 
 //        n###Len for its length
 //------------------------------------------------------------------------
 
@@ -128,17 +128,17 @@ extern "C"
 // #define IP_PORT_IMAP  143
 // #define IP_PORT_HTTPS  443
 // /**reference: http://www.iana.org/assignments/port-numbers */
-// #define IP_PORT_MYPORT  8881     //8888
-// #define IP_PORT_MYPORT1  8882    //8889
-// #define IP_PORT_MYPORT3  8884    //8891
-// #define IP_PORT_MYPORT4  8885    //8892
-// #define IP_PORT_MYPORT5  8886    //8893
-// #define IP_PORT_MYPORT6  8887    //8894
+// #define IP_PORT_MYPORT  8881 	//8888
+// #define IP_PORT_MYPORT1  8882	//8889
+// #define IP_PORT_MYPORT3  8884	//8891
+// #define IP_PORT_MYPORT4  8885	//8892
+// #define IP_PORT_MYPORT5  8886	//8893
+// #define IP_PORT_MYPORT6  8887	//8894
 // #define IP_PORT_MYPORT7  8895
 // #define IP_PORT_MYPORT8  8896
 // #define IP_PORT_MYPORT9  8897
 // #define IP_PORT_MYPORT10  8898
-//
+// 
 // #define IP_PORT_TMP    9999
 // #define IP_PORT_INVAL  99999
 
@@ -173,8 +173,8 @@ OSLTEST_DECLARE( HostName5,  "koori.SFBay.Sun.COM" );  //"grande.Germany.Sun.COM
 OSLTEST_DECLARE( HostIp5,  "10.5.32.20" );
 OSLTEST_DECLARE( HostName6,  "crumple.SFBay.Sun.COM" );  //sfbay
 OSLTEST_DECLARE( HostIp6,  "10.6.103.83" );
-OSLTEST_DECLARE( HostIpInval,  "123.45.67.89" );    //this is valid ip number,but can not arrive --mindy
-// OSLTEST_DECLARE( HostIpInval1,  "123.345.67.89" );   //this is real invalid ip number --mindy
+OSLTEST_DECLARE( HostIpInval,  "123.45.67.89" );	//this is valid ip number,but can not arrive --mindy
+// OSLTEST_DECLARE( HostIpInval1,  "123.345.67.89" );	//this is real invalid ip number --mindy
 OSLTEST_DECLARE( HostNameInval,  "www.the_hostname_that_can_not_resolvable_to_an_IP_Address.com" );
 OSLTEST_DECLARE( HostIpZero,  "0.0.0.0" );
 
diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h
index a0dce812e583..4eefb704a21c 100644
--- a/sal/qa/osl/socket/osl_Socket_Const_orig.h
+++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,7 +59,7 @@
 
 const char * pTestString1 = "test socket";
 const char * pTestString2 = " Passed#OK";
-//define read count
+//define read count 
 //------------------------------------------------------------------------
 //------------------------------------------------------------------------
 
@@ -68,39 +68,39 @@ extern "C"
 {
 #endif
 
-#   include <stdio.h>
+#	include <stdio.h> 
 //------------------------------------------------------------------------
 // OS dependent declaration and includes
 //------------------------------------------------------------------------
 #if ( defined UNX ) || ( defined OS2 )  //Unix
-#   include <unistd.h>
-#   include <limits.h>
-#   include <string.h>
-#   include <math.h>
-#   include <errno.h>
-#   include <fcntl.h>
-#   include <sys/stat.h>
-#   include <sys/statfs.h>
-#   include <sys/statvfs.h>
-#   include <sys/types.h>
-#   include <sys/socket.h>
-#   include <netdb.h>
-#   include <netinet/in.h>
+#	include <unistd.h>
+#	include <limits.h>
+#	include <string.h>
+#	include <math.h>
+#	include <errno.h>
+#	include <fcntl.h>
+#	include <sys/stat.h>
+#	include <sys/statfs.h>
+#	include <sys/statvfs.h>
+#	include <sys/types.h>
+#	include <sys/socket.h>
+#	include <netdb.h>
+#	include <netinet/in.h>           
 #       include <arpa/inet.h>
 #endif
 #if ( defined WNT )                     // Windows
 #include <tools/prewin.h>
-// #    include <windows.h>
-#   include <winsock.h>
-#   include <string.h>
+// #	include <windows.h> 
+#	include <winsock.h> 
+#	include <string.h>
 #include <tools/postwin.h>
 #endif
 
 
 //------------------------------------------------------------------------
-// macro definition for the ASCII array/OUString declarations,
-// we use p### for the ASCII array,
-//        a### for the OUString,
+// macro definition for the ASCII array/OUString declarations, 
+// we use p### for the ASCII array, 
+//        a### for the OUString, 
 //        n###Len for its length
 //------------------------------------------------------------------------
 
@@ -131,13 +131,13 @@ extern "C"
 #define IP_PORT_HTTPS  443
 #define IP_PORT_HTTP2  8080
 /**reference: http://www.iana.org/assignments/port-numbers */
-#define IP_PORT_MYPORT  8881    //8888
-#define IP_PORT_MYPORT1  8882   //8889
-#define IP_PORT_MYPORT2  8883   //8890
-#define IP_PORT_MYPORT3  8884   //8891
-#define IP_PORT_MYPORT4  8885   //8892
-#define IP_PORT_MYPORT5  8886   //8893
-#define IP_PORT_MYPORT6  8887   //8894
+#define IP_PORT_MYPORT  8881 	//8888
+#define IP_PORT_MYPORT1  8882	//8889
+#define IP_PORT_MYPORT2  8883	//8890
+#define IP_PORT_MYPORT3  8884	//8891
+#define IP_PORT_MYPORT4  8885	//8892
+#define IP_PORT_MYPORT5  8886	//8893
+#define IP_PORT_MYPORT6  8887	//8894
 #define IP_PORT_MYPORT7  8895
 #define IP_PORT_MYPORT8  8896
 #define IP_PORT_MYPORT9  8897
@@ -177,8 +177,8 @@ OSLTEST_DECLARE( HostName5,  "koori.SFBay.Sun.COM" );  //"grande.Germany.Sun.COM
 OSLTEST_DECLARE( HostIp5,  "10.5.32.20" );
 OSLTEST_DECLARE( HostName6,  "crumple.SFBay.Sun.COM" );  //sfbay
 OSLTEST_DECLARE( HostIp6,  "10.6.103.83" );
-OSLTEST_DECLARE( HostIpInval,  "123.45.67.89" );    //this is valid ip number,but can not arrive --mindy
-OSLTEST_DECLARE( HostIpInval1,  "123.345.67.89" );  //this is real invalid ip number --mindy
+OSLTEST_DECLARE( HostIpInval,  "123.45.67.89" );	//this is valid ip number,but can not arrive --mindy
+OSLTEST_DECLARE( HostIpInval1,  "123.345.67.89" );	//this is real invalid ip number --mindy
 OSLTEST_DECLARE( HostNameInval,  "www.the_hostname_that_can_not_resolvable_to_an_IP_Address.com" );
 OSLTEST_DECLARE( HostIpZero,  "0.0.0.0" );
 
diff --git a/sal/qa/osl/socket/osl_Socket_tests.cxx b/sal/qa/osl/socket/osl_Socket_tests.cxx
index f12dacf38aba..154bd496fe70 100644
--- a/sal/qa/osl/socket/osl_Socket_tests.cxx
+++ b/sal/qa/osl/socket/osl_Socket_tests.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx
index e9a785692e44..a3f0b5d8be4c 100644
--- a/sal/qa/osl/socket/osl_StreamSocket.cxx
+++ b/sal/qa/osl/socket/osl_StreamSocket.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx
index 242b8b792fac..129e483c4855 100644
--- a/sal/qa/osl/socket/sockethelper.cxx
+++ b/sal/qa/osl/socket/sockethelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,15 +35,15 @@
 //------------------------------------------------------------------------
 // Ip version definition
 //------------------------------------------------------------------------
-#define IP_VER     4               /// currently only IPv4 is considered.
+#define	IP_VER	   4		       /// currently only IPv4 is considered.
 
 //------------------------------------------------------------------------
 // helper functions
 //------------------------------------------------------------------------
 
-/** compare two OUString.
+/** compare two	OUString.
 */
-sal_Bool compareUString( const ::rtl::OUString & ustr1, const ::rtl::OUString & ustr2 )
+sal_Bool compareUString( const ::rtl::OUString & ustr1,	const ::rtl::OUString &	ustr2 )
 {
     sal_Bool bOk = ustr1.equalsIgnoreAsciiCase( ustr2 );
 
@@ -54,59 +54,59 @@ sal_Bool compareUString( const ::rtl::OUString & ustr1, const ::rtl::OUString &
 */
 sal_Bool compareUString( const ::rtl::OUString & ustr, const sal_Char *astr )
 {
-    ::rtl::OUString ustr2 = rtl::OUString::createFromAscii( astr );
+    ::rtl::OUString	ustr2 =	rtl::OUString::createFromAscii(	astr );
     sal_Bool bOk = ustr.equalsIgnoreAsciiCase( ustr2 );
 
     return bOk;
 }
 
-/** compare two socket address.
+/** compare two	socket address.
 */
-sal_Bool compareSocketAddr( const ::osl::SocketAddr & addr1 , const ::osl::SocketAddr & addr2  )
+sal_Bool compareSocketAddr( const ::osl::SocketAddr & addr1 , const ::osl::SocketAddr &	addr2  )
 {
-    return ( ( sal_True == compareUString( addr1.getHostname( 0 ), addr2.getHostname( 0 ) ) ) && ( addr2.getPort( ) == addr2.getPort( ) ) );
+    return ( ( sal_True == compareUString( addr1.getHostname( 0 ), addr2.getHostname( 0 ) )	) && ( addr2.getPort( )	== addr2.getPort( ) ) );
 }
 
-/*char * oustring2char( const ::rtl::OUString & str )
+/*char * oustring2char(	const ::rtl::OUString &	str )
 {
     rtl::OString aString;
-    aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
-    t_print("oustring2char %s\n", aString.getStr( ) );
-    sal_Char * sStr = aString.getStr( );
+    aString	= ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
+    t_print("oustring2char %s\n", aString.getStr( )	);
+    sal_Char * sStr	= aString.getStr( );
     return (char *)sStr;
 }*/
 
 /** print a UNI_CODE String. And also print some comments of the string.
 */
-void printUString( const ::rtl::OUString & str, const char* msg)
+void printUString( const ::rtl::OUString & str,	const char* msg)
 {
     t_print("#%s #printUString_u# ", msg );
     rtl::OString aString;
-    aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
-    //char * sStr = aString.getStr( );
-    t_print("%s\n", aString.getStr( ) );
+    aString	= ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
+    //char * sStr =	aString.getStr(	);
+    t_print("%s\n",	aString.getStr(	) );
 }
 
-/** get the local host name.
+/** get	the local host name.
     mindy: gethostbyname( "localhost" ), on Linux, it returns the hostname in /etc/hosts + domain name,
-    if no entry in /etc/hosts, it returns "localhost" + domain name
+    if no entry	in /etc/hosts, it returns "localhost" +	domain name
 */
-::rtl::OUString getHost( void )
+::rtl::OUString	getHost( void )
 {
     struct hostent *hptr;
 
     hptr = gethostbyname( "localhost" );
     OSL_ENSURE( hptr != NULL, "#In getHostname function, error on gethostbyname()" );
-    ::rtl::OUString aUString = ::rtl::OUString::createFromAscii( (const sal_Char *) hptr->h_name );
+    ::rtl::OUString	aUString = ::rtl::OUString::createFromAscii( (const sal_Char *)	hptr->h_name );
 
     return aUString;
 }
 
-/** get the full host name of the current processor, such as "aegean.prc.sun.com" --mindyliu
+/** get	the full host name of the current processor, such as "aegean.prc.sun.com" --mindyliu
 */
-::rtl::OUString getThisHostname( void )
+::rtl::OUString	getThisHostname( void )
 {
-    ::rtl::OUString aUString;
+    ::rtl::OUString	aUString;
 #ifdef WNT
     struct hostent *hptr;
     hptr = gethostbyname( "localhost" );
@@ -120,11 +120,11 @@ void printUString( const ::rtl::OUString & str, const char* msg)
     }
 
     struct hostent *hptr;
-    //first search /ets/hosts, then search from dns
+    //first	search /ets/hosts, then	search from dns
     hptr = gethostbyname( hostname);
     if ( hptr != NULL )
     {
-    strcpy( hostname, hptr->h_name );
+    strcpy(	hostname, hptr->h_name );
     }
 
     t_print("hostname is %s \n", hostname );
@@ -135,19 +135,19 @@ void printUString( const ::rtl::OUString & str, const char* msg)
     return aUString;
 }
 
-/** get IP by name, search /etc/hosts first, then search from dns, fail return OUString("")
+/** get	IP by name, search /etc/hosts first, then search from dns, fail	return OUString("")
 */
-::rtl::OUString getIPbyName( rtl::OString const& str_name )
+::rtl::OUString	getIPbyName( rtl::OString const& str_name )
 {
-    ::rtl::OUString aUString;
+    ::rtl::OUString	aUString;
     struct hostent *hptr;
-    //first search /ets/hosts, then search from dns
+    //first	search /ets/hosts, then	search from dns
     hptr = gethostbyname( str_name.getStr());
     if ( hptr != NULL )
     {
         struct in_addr ** addrptr;
-        addrptr = (struct in_addr **) hptr->h_addr_list ;
-        //if there are more than one IPs on the same machine, we select one
+        addrptr	= (struct in_addr **) hptr->h_addr_list	;
+        //if there are more than one IPs on the	same machine, we select	one
         for (; *addrptr; addrptr++)
         {
             t_print("#Local IP Address: %s\n", inet_ntoa(**addrptr));
@@ -157,9 +157,9 @@ void printUString( const ::rtl::OUString & str, const char* msg)
     return aUString;
 }
 
-/** get local ethernet IP
+/** get	local ethernet IP
 */
-::rtl::OUString getLocalIP( )
+::rtl::OUString	getLocalIP( )
 {
     char hostname[255];
     gethostname(hostname, 255);
@@ -169,13 +169,13 @@ void printUString( const ::rtl::OUString & str, const char* msg)
 
 /** construct error message
 */
-::rtl::OUString outputError( const ::rtl::OUString & returnVal, const ::rtl::OUString & rightVal, const sal_Char * msg )
+::rtl::OUString	outputError( const ::rtl::OUString & returnVal,	const ::rtl::OUString &	rightVal, const	sal_Char * msg )
 {
-    ::rtl::OUString aUString;
-    if ( returnVal.equals( rightVal ) )
+    ::rtl::OUString	aUString;
+    if ( returnVal.equals( rightVal	) )
         return aUString;
     aUString += ::rtl::OUString::createFromAscii(msg);
-    aUString += ::rtl::OUString::createFromAscii(": the returned value is '");
+    aUString += ::rtl::OUString::createFromAscii(":	the returned value is '");
     aUString += returnVal;
     aUString += ::rtl::OUString::createFromAscii("', but the value should be '");
     aUString += rightVal;
@@ -187,14 +187,14 @@ void printUString( const ::rtl::OUString & str, const char* msg)
 */
 void thread_sleep( sal_Int32 _nSec )
 {
-    /// print statement in thread process must use fflush() to force display.
+    /// print statement in thread process must use fflush()	to force display.
     // printf("wait %d seconds. ", _nSec );
     // fflush(stdout);
 
-#ifdef WNT               //Windows
+#ifdef WNT				 //Windows
     Sleep( _nSec * 100 );
 #endif
-#if ( defined UNX ) || ( defined OS2 )   //Unix
+#if ( defined UNX ) || ( defined OS2 )	 //Unix
     usleep(_nSec * 100000);
 #endif
     // t_print("# done\n" );
@@ -202,7 +202,7 @@ void thread_sleep( sal_Int32 _nSec )
 
 /** print Boolean value.
 */
-void printBool( sal_Bool bOk )
+void printBool(	sal_Bool bOk )
 {
     t_print("printBool " );
     ( sal_True == bOk ) ? t_print("YES!" ): t_print("NO!");
@@ -223,25 +223,25 @@ void printByteSequence_IP( const ::rtl::ByteSequence & bsByteSeq, sal_Int32 nLen
     t_print(" .\n" );
 }
 
-/** convert an IP which is stored as a UString format to a ByteSequence array for later use.
+/** convert an IP which	is stored as a UString format to a ByteSequence	array for later	use.
 */
 ::rtl::ByteSequence UStringIPToByteSequence( ::rtl::OUString aUStr )
 {
 
-    rtl::OString aString = ::rtl::OUStringToOString( aUStr, RTL_TEXTENCODING_ASCII_US );
-    const sal_Char *pChar = aString.getStr( ) ;
+    rtl::OString aString = ::rtl::OUStringToOString( aUStr,	RTL_TEXTENCODING_ASCII_US );
+    const sal_Char *pChar =	aString.getStr(	) ;
     sal_Char tmpBuffer[4];
     sal_Int32 nCharCounter = 0;
     ::rtl::ByteSequence bsByteSequence( IP_VER );
     sal_Int32 nByteSeqCounter = 0;
 
-    for ( int i = 0; i < aString.getLength( ) + 1 ; i++ )
+    for ( int i = 0; i < aString.getLength(	) + 1 ;	i++ )
     {
         if ( ( *pChar != '.' ) && ( i !=aString.getLength( ) ) )
             tmpBuffer[nCharCounter++] = *pChar;
         else
         {
-            tmpBuffer[nCharCounter] = '\0';
+            tmpBuffer[nCharCounter]	= '\0';
             nCharCounter = 0;
             bsByteSequence[nByteSeqCounter++] = static_cast<sal_Int8>(atoi( tmpBuffer ));
         }
@@ -252,14 +252,14 @@ void printByteSequence_IP( const ::rtl::ByteSequence & bsByteSeq, sal_Int32 nLen
 
 /** print a socket result name.
 */
-void printSocketResult( oslSocketResult eResult )
+void printSocketResult(	oslSocketResult	eResult	)
 {
     t_print("printSocketResult: " );
     if (!eResult)
     switch (eResult)
     {
         case osl_Socket_Ok:
-            t_print("client connected\n");
+            t_print("client	connected\n");
             break;
         case osl_Socket_Error:
             t_print("got an error ... exiting\r\n\r\n" );
@@ -279,11 +279,11 @@ void printSocketResult( oslSocketResult eResult )
     }
 }
 
-/** if 4 parts of an IP addr are equal to specified values
+/** if 4 parts of an IP	addr are equal to specified values
 */
-sal_Bool ifIpv4is( const ::rtl::ByteSequence Ipaddr, sal_Int8 seq1, sal_Int8 seq2, sal_Int8 seq3, sal_Int8 seq4 )
+sal_Bool ifIpv4is( const ::rtl::ByteSequence Ipaddr, sal_Int8 seq1, sal_Int8 seq2, sal_Int8 seq3, sal_Int8 seq4	)
 {
-    if ( ( Ipaddr[0]  == seq1 ) && ( Ipaddr[1] == seq2 ) && ( Ipaddr[2] == seq3 ) && ( Ipaddr[3] == seq4 ) )
+    if ( ( Ipaddr[0]  == seq1 ) && ( Ipaddr[1] == seq2 ) &&	( Ipaddr[2] == seq3 ) && ( Ipaddr[3] ==	seq4 ) )
         return sal_True;
     return sal_False;
 }
@@ -293,18 +293,18 @@ sal_Bool ifIpv4is( const ::rtl::ByteSequence Ipaddr, sal_Int8 seq1, sal_Int8 seq
 /*sal_Bool ifAvailable( const char *  stringAddrOrHostName )
 {
     sal_Bool result;
-    int  p[2];
+    int	 p[2];
     sal_Char buffer[2000];
     char stringhost[20];
-    strcpy(stringhost, stringAddrOrHostName );
+    strcpy(stringhost, stringAddrOrHostName	);
 
     result = sal_False;
-    if (pipe (p) == 0)
+    if (pipe (p) ==	0)
     {
     pid_t pid;
     int nStatus;
     pid = fork();
-    if (pid == 0)
+    if (pid	== 0)
     {
 #if ( defined LINUX )
         char *argv[] =
@@ -337,7 +337,7 @@ sal_Bool ifIpv4is( const ::rtl::ByteSequence Ipaddr, sal_Int8 seq1, sal_Int8 seq
         // arriving here means exec failed
         _exit(-1);
     }
-    else if (pid > 0)
+    else if	(pid > 0)
     {
         sal_Int32 k = 0, n = 2000;
         close (p[1]);
@@ -345,7 +345,7 @@ sal_Bool ifIpv4is( const ::rtl::ByteSequence Ipaddr, sal_Int8 seq1, sal_Int8 seq
         {
             buffer[k] = 0;
             if (buffer[k - 1] == '\n')
-            buffer[k - 1] = 0;
+            buffer[k - 1] =	0;
 #if ( defined LINUX )
             char strOK[] = "bytes from";
 #endif
@@ -354,10 +354,10 @@ sal_Bool ifIpv4is( const ::rtl::ByteSequence Ipaddr, sal_Int8 seq1, sal_Int8 seq
 #endif
             if (strstr( buffer, strOK ) != NULL )
                 result = sal_True;
-            t_print("buffer is %s\n", buffer );
+            t_print("buffer	is %s\n", buffer );
         }
         close (p[0]);
-        waitpid (pid, &nStatus, 0);
+        waitpid	(pid, &nStatus,	0);
     }
     else
     {
@@ -371,7 +371,7 @@ sal_Bool ifIpv4is( const ::rtl::ByteSequence Ipaddr, sal_Int8 seq1, sal_Int8 seq
 
 sal_Bool ifAvailable( rtl::OUString const&  strAddrOrHostName )
 {
-    ::osl::ConnectorSocket aSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
+    ::osl::ConnectorSocket aSocket(	osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
     ::osl::SocketAddr aSocketAddr( strAddrOrHostName, 7 );
 
     if (! aSocketAddr.is())
@@ -380,14 +380,14 @@ sal_Bool ifAvailable( rtl::OUString const&  strAddrOrHostName )
         return sal_False;
     }
 
-    aSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True;
+    aSocket.setOption( osl_Socket_OptionReuseAddr, 1 );	//sal_True;
 
     TimeValue *pTimeout;
     pTimeout  = ( TimeValue* )malloc( sizeof( TimeValue ) );
     pTimeout->Seconds = 3;
     pTimeout->Nanosec = 0;
 
-    oslSocketResult aResult = aSocket.connect( aSocketAddr, pTimeout );
+    oslSocketResult	aResult	= aSocket.connect( aSocketAddr, pTimeout );
     free( pTimeout );
     aSocket.close();
     if  ( aResult != osl_Socket_Ok )
diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx
index 077a0319d8e8..03206b0060bf 100644
--- a/sal/qa/osl/socket/sockethelper.hxx
+++ b/sal/qa/osl/socket/sockethelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -75,7 +75,7 @@ extern "C"
 
 #if ( defined WNT )                     // Windows
 #include <tools/prewin.h>
-#include <winsock.h>
+#include <winsock.h> 
 #include <string.h>
 #include <tools/postwin.h>
 #endif
@@ -96,10 +96,10 @@ sal_Bool compareUString( const ::rtl::OUString & ustr, const sal_Char *astr );
 */
 sal_Bool compareSocketAddr( const ::osl::SocketAddr & addr1 , const ::osl::SocketAddr & addr2  );
 //char * oustring2char( const ::rtl::OUString & str );
-/** print a UNI_CODE String. And also print some comments of the string.
+/** print a UNI_CODE String. And also print some comments of the string. 
 */
 void printUString( const ::rtl::OUString & str, const char * msg = "" );
-/** get the local host name.
+/** get the local host name. 
     mindy: gethostbyname( "localhost" ), on Linux, it returns the hostname in /etc/hosts + domain name,
     if no entry in /etc/hosts, it returns "localhost" + domain name
 */
diff --git a/sal/qa/osl/thread/test_thread.cxx b/sal/qa/osl/thread/test_thread.cxx
index e13377613893..d3df66e16d7d 100644
--- a/sal/qa/osl/thread/test_thread.cxx
+++ b/sal/qa/osl/thread/test_thread.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/osl/thread/version.map b/sal/qa/osl/thread/version.map
index 7321bbca16ad..f313c44bd7ad 100644
--- a/sal/qa/osl/thread/version.map
+++ b/sal/qa/osl/thread/version.map
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
index d0e71c65f129..cc445284ebb1 100644
--- a/sal/qa/rtl/alloc/rtl_alloc.cxx
+++ b/sal/qa/rtl/alloc/rtl_alloc.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/bootstrap/bootstrap_process.cxx b/sal/qa/rtl/bootstrap/bootstrap_process.cxx
index 7c6880822ca4..8172e36cda67 100644
--- a/sal/qa/rtl/bootstrap/bootstrap_process.cxx
+++ b/sal/qa/rtl/bootstrap/bootstrap_process.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ using namespace ::rtl;
 
 // ----------------------------------- Main -----------------------------------
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
-{
+{   
     (void)argc;
     Bootstrap aBootstrap;
     //custom .ini/rc file
@@ -47,74 +47,74 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     OUString suValue;
     OUString suDefault( OUString::createFromAscii("mydefault") );
     int flag = atoi( argv[1] );
-
+    
     switch( flag ) {
     case 1:
         // parameters may be passed by command line arguments
-        aBootstrap.getFrom(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("UNO_SERVICES")),
+        aBootstrap.getFrom( 
+            OUString(RTL_CONSTASCII_USTRINGPARAM("UNO_SERVICES")), 
             suValue );
         if (suValue.equalsAscii("service.rdb") )
         {
             return 10;
         }
         else
-            return 11;
+            return 11; 
     case 2:
         // parameters may be passed by ini file
-        aBootstrap.getFrom(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTABLE_RC")),
+        aBootstrap.getFrom( 
+            OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTABLE_RC")), 
             suValue );
         if (suValue.equalsAscii("true") )
         {
             return 20;
         }
         else
-            return 21;
+            return 21; 
     case 3:
         // parameters may be passed by command line arguments
-        aBootstrap.getFrom(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("QADEV_BOOTSTRAP")),
+        aBootstrap.getFrom( 
+            OUString(RTL_CONSTASCII_USTRINGPARAM("QADEV_BOOTSTRAP")), 
             suValue );
         if (suValue.equalsAscii("sun&ms") )
         {
             return 30;
         }
         else
-            return 31;
+            return 31; 
     case 4:
         // parameters may be passed by custom .ini/rc file
-        aBs_custom.getFrom(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("RTLVALUE")),
+        aBs_custom.getFrom( 
+            OUString(RTL_CONSTASCII_USTRINGPARAM("RTLVALUE")), 
             suValue );
         if (suValue.equalsAscii("qadev17") )
         {
             return 40;
         }
         else
-            return 41;
+            return 41; 
     case 5:
         // parameters may be passed by inheritance
-        aBs_custom.getFrom(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTABLE_RC")),
+        aBs_custom.getFrom( 
+            OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTABLE_RC")), 
             suValue );
         if (suValue.equalsAscii("true") )
         {
             return 50;
         }
         else
-            return 51;
+            return 51; 
     default:
         // parameters may be passed by inheritance
-        aBs_custom.getFrom(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("ABCDE")),
+        aBs_custom.getFrom( 
+            OUString(RTL_CONSTASCII_USTRINGPARAM("ABCDE")), 
             suValue, suDefault );
         if (suValue.equalsAscii("mydefault") )
         {
             return 60;
         }
         else
-            return 61;
+            return 61; 
     }
 }
 
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
index 63be30513c38..30a9824cfb71 100644
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -702,7 +702,7 @@ namespace rtl_Bootstrap
 //
 //                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
 //                 t_print("inifile is:");
-//              printUString( suIniname );
+//     	        printUString( suIniname );
 //                 Bootstrap aBootstrap( suIniname);
 //
 //                 rtl::OUString suMacro;
diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx
index 1fecdb34c4b6..cc304a45d352 100644
--- a/sal/qa/rtl/cipher/rtl_cipher.cxx
+++ b/sal/qa/rtl/cipher/rtl_cipher.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/crc32/rtl_crc32.cxx b/sal/qa/rtl/crc32/rtl_crc32.cxx
index 267194e849aa..8334f9714d5d 100644
--- a/sal/qa/rtl/crc32/rtl_crc32.cxx
+++ b/sal/qa/rtl/crc32/rtl_crc32.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx
index 8a5c0a5e8465..284baae86a26 100644
--- a/sal/qa/rtl/digest/rtl_digest.cxx
+++ b/sal/qa/rtl/digest/rtl_digest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,9 +47,9 @@ rtl::OUString CreateMD5FromString( const rtl::OUString& aMsg )
     if ( handle > 0 )
     {
         const sal_uInt8* pData = (const sal_uInt8*)aMsg.getStr();
-        sal_uInt32       nSize = ( aMsg.getLength() * sizeof( sal_Unicode ));
-        sal_uInt32       nMD5KeyLen = rtl_digest_queryLength( handle );
-        sal_uInt8*       pMD5KeyBuffer = new sal_uInt8[ nMD5KeyLen ];
+        sal_uInt32		 nSize = ( aMsg.getLength() * sizeof( sal_Unicode ));
+        sal_uInt32		 nMD5KeyLen = rtl_digest_queryLength( handle );
+        sal_uInt8*		 pMD5KeyBuffer = new sal_uInt8[ nMD5KeyLen ];
 
         rtl_digest_init( handle, pData, nSize );
         rtl_digest_update( handle, pData, nSize );
@@ -579,7 +579,7 @@ public:
 
             rtl::OString aMsg = sSampleString;
             const sal_uInt8 *pData = (const sal_uInt8*)aMsg.getStr();
-            sal_uInt32       nSize = ( aMsg.getLength() );
+            sal_uInt32	     nSize = ( aMsg.getLength() );
 
             rtlDigestError aError = rtl_digest_init(handle, pData, nSize);
 
@@ -607,7 +607,7 @@ public:
 
             rtl::OString aMsg = sSampleString;
             const sal_uInt8 *pData = (const sal_uInt8*)aMsg.getStr();
-            sal_uInt32       nSize = ( aMsg.getLength() );
+            sal_uInt32	     nSize = ( aMsg.getLength() );
 
             rtlDigestError aError = rtl_digest_init(handle, pData, nSize);
 
@@ -635,7 +635,7 @@ public:
 
             rtl::OString aMsg = sSampleString;
             const sal_uInt8 *pData = (const sal_uInt8*)aMsg.getStr();
-            sal_uInt32       nSize = ( aMsg.getLength() );
+            sal_uInt32	     nSize = ( aMsg.getLength() );
 
             rtlDigestError aError = rtl_digest_init(handle, pData, nSize);
 
@@ -662,7 +662,7 @@ public:
 
             rtl::OString aMsg = sSampleString;
             const sal_uInt8 *pData = (const sal_uInt8*)aMsg.getStr();
-            sal_uInt32       nSize = ( aMsg.getLength() );
+            sal_uInt32	     nSize = ( aMsg.getLength() );
 
             rtlDigestError aError = rtl_digest_init(handle, pData, nSize);
 
@@ -689,7 +689,7 @@ public:
 
             rtl::OString aMsg = sSampleString;
             const sal_uInt8 *pData = (const sal_uInt8*)aMsg.getStr();
-            sal_uInt32       nSize = ( aMsg.getLength() );
+            sal_uInt32	     nSize = ( aMsg.getLength() );
 
             sal_uInt32     nKeyLen = rtl_digest_queryLength( handle );
             CPPUNIT_ASSERT_MESSAGE( "Keylen must be greater 0", nKeyLen );
@@ -720,7 +720,7 @@ public:
 
             rtl::OString aMsg = sSampleString;
             const sal_uInt8 *pData = (const sal_uInt8*)aMsg.getStr();
-            sal_uInt32       nSize = ( aMsg.getLength() );
+            sal_uInt32	     nSize = ( aMsg.getLength() );
 
             sal_uInt32     nKeyLen = rtl_digest_queryLength( handle );
             CPPUNIT_ASSERT_MESSAGE( "Keylen must be greater 0", nKeyLen );
@@ -770,7 +770,7 @@ rtl::OString getMD5Sum(rtl::OString const& _aMsg )
     rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
 
     const sal_uInt8 *pData = (const sal_uInt8*)_aMsg.getStr();
-    sal_uInt32       nSize = ( _aMsg.getLength() );
+    sal_uInt32	     nSize = ( _aMsg.getLength() );
 
     rtl_digest_init(handle, pData, nSize);
     rtl_digest_update( handle, pData, nSize );
@@ -1240,7 +1240,7 @@ public:
 
             rtl::OString aMsg = sSampleString;
             const sal_uInt8* pData = (const sal_uInt8*)aMsg.getStr();
-            sal_uInt32       nSize = ( aMsg.getLength() );
+            sal_uInt32	     nSize = ( aMsg.getLength() );
 
             rtlDigestError aError = rtl_digest_updateMD5(aHandle, pData, nSize);
             CPPUNIT_ASSERT_MESSAGE("handle parameter 'handle' wrong", aError == rtl_Digest_E_Algorithm );
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index 7cfdd3695f07..dc6560d7a0c7 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx
index 2c140c36a306..7f7b7f4f806f 100644
--- a/sal/qa/rtl/locale/rtl_locale.cxx
+++ b/sal/qa/rtl/locale/rtl_locale.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx
index 34f1d0624dc8..751423463af6 100644
--- a/sal/qa/rtl/logfile/rtl_logfile.cxx
+++ b/sal/qa/rtl/logfile/rtl_logfile.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/math/rtl_math.cxx b/sal/qa/rtl/math/rtl_math.cxx
index 3391dbe2784e..25d77f6b66d0 100644
--- a/sal/qa/rtl/math/rtl_math.cxx
+++ b/sal/qa/rtl/math/rtl_math.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/math/rtl_old_testint64.cxx b/sal/qa/rtl/math/rtl_old_testint64.cxx
index 2e17c241a4de..58899a2576ac 100644
--- a/sal/qa/rtl/math/rtl_old_testint64.cxx
+++ b/sal/qa/rtl/math/rtl_old_testint64.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 // this file is converted to use with testshl2
 // original was placed in sal/test/textenc.cxx
 
-// fndef    _OSL_DIAGNOSE_H_
+// fndef	_OSL_DIAGNOSE_H_
 // nclude <osl/diagnose.h>
 // #endif
 
diff --git a/sal/qa/rtl/math/test_rtl_math.cxx b/sal/qa/rtl/math/test_rtl_math.cxx
index e81e4a12fcb4..2dc2ffd8f353 100644
--- a/sal/qa/rtl/math/test_rtl_math.cxx
+++ b/sal/qa/rtl/math/test_rtl_math.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -137,11 +137,11 @@ bool testNumberToString(hTestResult pTestResult,
     // LLA: rtl::OStringBuffer aBuf;
     // LLA: StringT::appendBuffer(aBuf, aResult1);
     // LLA: t_print("aResult1: %s  ", aBuf.getStr());
-    // LLA:
+    // LLA: 
     // LLA: rtl::OStringBuffer aBuf2;
-    // LLA: StringT::appendBuffer(aBuf2, aResult2);
+    // LLA: StringT::appendBuffer(aBuf2, aResult2);  
     // LLA: t_print("aResult2: %s\n", aBuf2.getStr());
-
+    
     bool bSuccess = aResult1 == aResult2;
 
     rtl::OStringBuffer aBuffer;
@@ -252,7 +252,7 @@ bool testStringToNumberToString(hTestResult pTestResult,
 extern "C" sal_Bool SAL_CALL test_rtl_math(hTestResult pTestResult)
 {
     bool bReturn = true;
-
+    
     {
         static TestNumberToString const aTest[]
             = { // 1, 1+2^-1, ..., 1+2^-52
diff --git a/sal/qa/rtl/ostring/rtl_OString2.cxx b/sal/qa/rtl/ostring/rtl_OString2.cxx
index 1c28b36be5ab..27158a1d85e1 100644
--- a/sal/qa/rtl/ostring/rtl_OString2.cxx
+++ b/sal/qa/rtl/ostring/rtl_OString2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx
index c3408d5b8eb5..5dfb33689858 100644
--- a/sal/qa/rtl/ostring/rtl_str.cxx
+++ b/sal/qa/rtl/ostring/rtl_str.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/ostring/rtl_string.cxx b/sal/qa/rtl/ostring/rtl_string.cxx
index 55b1f62cd9a4..42f756edf6c1 100644
--- a/sal/qa/rtl/ostring/rtl_string.cxx
+++ b/sal/qa/rtl/ostring/rtl_string.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index 4b05a027b57e..e3877a1b0e73 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx
index ccc161ec9b01..df5708462c2b 100644
--- a/sal/qa/rtl/oustring/rtl_ustr.cxx
+++ b/sal/qa/rtl/oustring/rtl_ustr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx b/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx
index 942bf212eed2..119985aec06c 100644
--- a/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx
+++ b/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/process/child_process.cxx b/sal/qa/rtl/process/child_process.cxx
index a2f5838e3124..186860acf725 100644
--- a/sal/qa/rtl/process/child_process.cxx
+++ b/sal/qa/rtl/process/child_process.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,7 +49,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(, argv)
             sal::static_int_cast< long >(nCount));
         return 0;
     }
-
+    
     OUString suArg[4];
     for( sal_Int32 i = 0 ; i < nCount ; i ++ )
     {
@@ -61,7 +61,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(, argv)
             aString.getStr());
     }
 
-    if ( suArg[0].compareTo( suParam0) != 0 ||
+    if ( suArg[0].compareTo( suParam0) != 0 || 
          suArg[1].compareTo( suParam1) != 0 ||
          suArg[2].compareTo( suParam2) != 0 ||
          suArg[3].compareTo( suParam3) != 0 )
diff --git a/sal/qa/rtl/process/child_process_id.cxx b/sal/qa/rtl/process/child_process_id.cxx
index 1c59b5e66d8a..8431e867e64f 100644
--- a/sal/qa/rtl/process/child_process_id.cxx
+++ b/sal/qa/rtl/process/child_process_id.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,7 +59,7 @@ SAL_IMPLEMENT_MAIN()
 {
     sal_uInt8 pTargetUUID[16];
     rtl_getGlobalProcessId( pTargetUUID );
-    printUuid( pTargetUUID );
+    printUuid( pTargetUUID );   
     return 1;
 }
 
diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx
index 0372551d3225..545b633773d0 100644
--- a/sal/qa/rtl/process/rtl_Process.cxx
+++ b/sal/qa/rtl/process/rtl_Process.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -216,7 +216,7 @@ public:
     void tearDown()
     {
     }
-    //gets a 16-byte fixed size identifier which is guaranteed not to change    during the current process.
+    //gets a 16-byte fixed size identifier which is guaranteed not to change	during the current process.
     void getGlobalProcessId_001()
     {
         sal_uInt8 pTargetUUID1[16];
diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx
index 3b9442bea115..1e6e2d923070 100644
--- a/sal/qa/rtl/random/rtl_random.cxx
+++ b/sal/qa/rtl/random/rtl_random.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/strings/test_oustring_compare.cxx b/sal/qa/rtl/strings/test_oustring_compare.cxx
index b2e56ecd70bf..a27451422440 100644
--- a/sal/qa/rtl/strings/test_oustring_compare.cxx
+++ b/sal/qa/rtl/strings/test_oustring_compare.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/strings/test_oustring_convert.cxx b/sal/qa/rtl/strings/test_oustring_convert.cxx
index e045812c810e..c0705e2559bd 100644
--- a/sal/qa/rtl/strings/test_oustring_convert.cxx
+++ b/sal/qa/rtl/strings/test_oustring_convert.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/strings/test_oustring_endswith.cxx b/sal/qa/rtl/strings/test_oustring_endswith.cxx
index a17f9a1630a1..4f2ae1fa882b 100644
--- a/sal/qa/rtl/strings/test_oustring_endswith.cxx
+++ b/sal/qa/rtl/strings/test_oustring_endswith.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/strings/test_oustring_noadditional.cxx b/sal/qa/rtl/strings/test_oustring_noadditional.cxx
index 56b0052a2648..679b581e5519 100644
--- a/sal/qa/rtl/strings/test_oustring_noadditional.cxx
+++ b/sal/qa/rtl/strings/test_oustring_noadditional.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/strings/test_oustringbuffer_utf32.cxx b/sal/qa/rtl/strings/test_oustringbuffer_utf32.cxx
index 6664507ba297..172dda49d9b4 100644
--- a/sal/qa/rtl/strings/test_oustringbuffer_utf32.cxx
+++ b/sal/qa/rtl/strings/test_oustringbuffer_utf32.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/textenc/rtl_tencinfo.cxx b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
index 0f891478528f..89c1e4b1d167 100644
--- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx
+++ b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx
index 4ed39fb65d21..5adafc5eee4b 100644
--- a/sal/qa/rtl/textenc/rtl_textcvt.cxx
+++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx
index 919aa04a24b4..00deb909596a 100644
--- a/sal/qa/rtl/uri/rtl_Uri.cxx
+++ b/sal/qa/rtl/uri/rtl_Uri.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx
index ceb573f70b15..dd6064a8d83f 100644
--- a/sal/qa/rtl/uri/rtl_testuri.cxx
+++ b/sal/qa/rtl/uri/rtl_testuri.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx
index 2b85e5d6fe06..201dfb5a26aa 100644
--- a/sal/qa/rtl/uuid/rtl_Uuid.cxx
+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx
@@ -2,7 +2,7 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -203,7 +203,7 @@ public:
 
         //test compareUuid
         if ( rtl_compareUuid( pNamedUUID , pNamedUUID2 ) > 0 )
-        {   CPPUNIT_ASSERT_MESSAGE( " compare uuids", rtl_compareUuid( pNamedUUID2 , pNamedUUID ) < 0);
+        {	CPPUNIT_ASSERT_MESSAGE( " compare uuids", rtl_compareUuid( pNamedUUID2 , pNamedUUID ) < 0);
         }
         else
             CPPUNIT_ASSERT_MESSAGE( " compare uuids", rtl_compareUuid( pNamedUUID2 , pNamedUUID ) > 0);
diff --git a/sal/qa/rtl_strings/rtl_OString.cxx b/sal/qa/rtl_strings/rtl_OString.cxx
index 88bc7162b4bb..fa01e2dce1cc 100644
--- a/sal/qa/rtl_strings/rtl_OString.cxx
+++ b/sal/qa/rtl_strings/rtl_OString.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -255,7 +255,7 @@ static sal_Bool test_rtl_OString_ctor_006( hTestResult hRtlTestResult )
         )
     );
 }
-extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_ctors(
+extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_ctors( 
                     hTestResult hRtlTestResult )
 {
 
@@ -359,13 +359,13 @@ TestCase arrTestCase[]={
         new OString()},
     {"empty(def.constructor) and non empty", sal_False, new OString(),
         new OString(kTestStr2)},
-    {"non empty and empty(def. constructor)", sal_False,
+    {"non empty and empty(def. constructor)", sal_False, 
         new OString(kTestStr1),new OString()},
-    {"two empty strings(string arg = '\\0')", sal_True,
+    {"two empty strings(string arg = '\\0')", sal_True, 
         new OString(""),new OString("")},
-    {"empty(string arg = '\\0') and non empty", sal_False,
+    {"empty(string arg = '\\0') and non empty", sal_False, 
         new OString(""),new OString(kTestStr2)},
-    {"non empty and empty(string arg = '\\0')", sal_False,
+    {"non empty and empty(string arg = '\\0')", sal_False, 
         new OString(kTestStr1),new OString("")}
     };
 
@@ -375,7 +375,7 @@ TestCase arrTestCase[]={
     for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
     {
         sal_Bool lastRes =
-                 ( arrTestCase[i].input1->equals(*(arrTestCase[i].input2)) ==
+                 ( arrTestCase[i].input1->equals(*(arrTestCase[i].input2)) ==  
                     arrTestCase[i].expVal );
 
           c_rtl_tres_state
@@ -413,17 +413,17 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_equalsIgnoreAsciiCase(
 } TestCase;
 
 TestCase arrTestCase[]={
-        {"same strings but different cases",sal_True,new OString(kTestStr4),
+        {"same strings but different cases",sal_True,new OString(kTestStr4), 
             new OString(kTestStr5)},
-        {"same strings",sal_True,new OString(kTestStr4),
+        {"same strings",sal_True,new OString(kTestStr4), 
             new OString(kTestStr4)},
-        {"with equal beginning",sal_False,new OString(kTestStr2),
+        {"with equal beginning",sal_False,new OString(kTestStr2), 
             new OString(kTestStr4)},
-        {"empty(def.constructor) and non empty",sal_False,new OString(),
+        {"empty(def.constructor) and non empty",sal_False,new OString(), 
             new OString(kTestStr5)},
         {"non empty and empty(def.constructor)",sal_False,
             new OString(kTestStr4), new OString()},
-        {"two empty strings(def.constructor)",sal_True,new OString(),
+        {"two empty strings(def.constructor)",sal_True,new OString(), 
             new OString()},
         {"different strings with equal length",sal_False,
             new OString(kTestStr10), new OString(kTestStr11)}
@@ -435,7 +435,7 @@ TestCase arrTestCase[]={
     for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
     {
         sal_Bool lastRes =
-        (arrTestCase[i].input1->equalsIgnoreAsciiCase(*arrTestCase[i].input2)
+        (arrTestCase[i].input1->equalsIgnoreAsciiCase(*arrTestCase[i].input2) 
             == arrTestCase[i].expVal);
 
          c_rtl_tres_state
@@ -470,33 +470,33 @@ static sal_Bool SAL_CALL test_rtl_OString_compareTo_001(
 
 TestCase arrTestCase[]={
 
-        {"simple compare, str1 to str5",-1,new OString(kTestStr1),
+        {"simple compare, str1 to str5",-1,new OString(kTestStr1), 
             new OString(kTestStr5)},
-        {"simple compare, str2 to str5",-1,new OString(kTestStr2),
+        {"simple compare, str2 to str5",-1,new OString(kTestStr2), 
             new OString(kTestStr5)},
-        {"simple compare, str1 to str9",-1,new OString(kTestStr1),
+        {"simple compare, str1 to str9",-1,new OString(kTestStr1), 
             new OString(kTestStr9)},
-        {"simple compare, str1 to str2",-1,new OString(kTestStr1),
+        {"simple compare, str1 to str2",-1,new OString(kTestStr1), 
             new OString(kTestStr2)},
-        {"simple compare, str4 to str5",-1,new OString(kTestStr4),
+        {"simple compare, str4 to str5",-1,new OString(kTestStr4), 
             new OString(kTestStr5)},
-        {"simple compare, str1 to str3",-1,new OString(kTestStr1),
+        {"simple compare, str1 to str3",-1,new OString(kTestStr1), 
             new OString(kTestStr3)},
-        {"simple compare, str5 to str1",+1,new OString(kTestStr5),
+        {"simple compare, str5 to str1",+1,new OString(kTestStr5), 
             new OString(kTestStr1)},
-        {"simple compare, str2 to str1",+1,new OString(kTestStr2),
+        {"simple compare, str2 to str1",+1,new OString(kTestStr2), 
             new OString(kTestStr1)},
-        {"simple compare, str9 to str5",+1,new OString(kTestStr9),
+        {"simple compare, str9 to str5",+1,new OString(kTestStr9), 
             new OString(kTestStr5)},
-        {"simple compare, str5 to str4",+1,new OString(kTestStr5),
+        {"simple compare, str5 to str4",+1,new OString(kTestStr5), 
             new OString(kTestStr4)},
-        {"simple compare, str1 to str1",0,new OString(kTestStr1),
+        {"simple compare, str1 to str1",0,new OString(kTestStr1), 
             new OString(kTestStr1)},
-        {"simple compare, nullString to nullString",0,new OString(),
+        {"simple compare, nullString to nullString",0,new OString(), 
             new OString()},
-        {"simple compare, nullString to str2",-1,new OString(),
+        {"simple compare, nullString to str2",-1,new OString(), 
             new OString(kTestStr2)},
-        {"simple compare, str1 to nullString",+1,new OString(kTestStr1),
+        {"simple compare, str1 to nullString",+1,new OString(kTestStr1), 
             new OString()}
     };
 
@@ -505,7 +505,7 @@ TestCase arrTestCase[]={
 
     for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
     {
-        sal_Int32 cmpRes =
+        sal_Int32 cmpRes = 
             arrTestCase[i].input1->compareTo(*arrTestCase[i].input2);
         cmpRes = ( cmpRes == 0 ) ? 0 : ( cmpRes > 0 ) ? +1 : -1 ;
         sal_Bool lastRes = ( cmpRes == arrTestCase[i].expVal);
@@ -570,7 +570,7 @@ static sal_Bool SAL_CALL test_rtl_OString_compareTo_002(
     for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
     {
         sal_Int32 cmpRes =
-                    arrTestCase[i].input1->compareTo(*arrTestCase[i].input2,
+                    arrTestCase[i].input1->compareTo(*arrTestCase[i].input2, 
                             arrTestCase[i].maxLength);
         cmpRes = (cmpRes == 0) ? 0 : (cmpRes > 0) ? +1 : -1 ;
         sal_Bool lastRes = (cmpRes == arrTestCase[i].expVal);
@@ -796,7 +796,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_op_g(
 {
     sal_Char methName[MAXBUFLENGTH];
     sal_Char* pMeth = methName;
-
+    
     c_rtl_tres_state_start(hRtlTestResult, "op_g");
     typedef struct TestCase
     {
@@ -819,9 +819,9 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_op_g(
             new OString(kTestStr1), new OString(kTestStr2)},
         {"!('Sun Microsystems'>'Sun Microsystems'",sal_False,
             new OString(kTestStr1), new OString(kTestStr1)},
-        {"'Sun Microsystems'>''",sal_True,new OString(kTestStr1),
+        {"'Sun Microsystems'>''",sal_True,new OString(kTestStr1), 
             new OString()},
-        {"!(''>'Sun Microsystems')",sal_False,new OString(),
+        {"!(''>'Sun Microsystems')",sal_False,new OString(), 
             new OString(kTestStr1)},
         {"!(''>'')",sal_False,new OString(), new OString()}
 };
@@ -882,9 +882,9 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_op_l(
             new OString(kTestStr2), new OString(kTestStr1)},
         {"!('Sun Microsystems'<'Sun Microsystems'", sal_False,
             new OString(kTestStr1), new OString(kTestStr1)},
-        {"'Sun Microsystems'<''",sal_False,new OString(kTestStr1),
+        {"'Sun Microsystems'<''",sal_False,new OString(kTestStr1), 
             new OString()},
-        {"''<'Sun Microsystems Java Technology'",sal_True,new OString(),
+        {"''<'Sun Microsystems Java Technology'",sal_True,new OString(), 
             new OString(kTestStr2)},
         {"!(''<'')",sal_False,new OString(), new OString()}
     };
@@ -944,9 +944,9 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_op_ge(
             new OString(kTestStr2), new OString(kTestStr1)},
         {"'Sun Microsystems'>='Sun Microsystems'", sal_True,
             new OString(kTestStr1), new OString(kTestStr1)},
-        {"'Sun Microsystems'>=''",sal_True,new OString(kTestStr1),
+        {"'Sun Microsystems'>=''",sal_True,new OString(kTestStr1), 
             new OString()},
-        { "''>='Sun microsystems'",sal_False,new OString(),
+        { "''>='Sun microsystems'",sal_False,new OString(), 
             new OString(kTestStr3)},
         {"''>=''",sal_True,new OString(), new OString()}
     };
@@ -1001,16 +1001,16 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_op_le(
         {"'Sun Microsystems'<='Sun microsystems'",sal_True,
             new OString(kTestStr1), new OString(kTestStr3)},
         {"'Sun Microsystems'<='Sun Microsystems Java Technology'",sal_True,
-            new OString(kTestStr1),
+            new OString(kTestStr1), 
             new OString(kTestStr2)},
         {"!('Sun Microsystems Java Technology'<='Sun Microsystems')",sal_False,
-            new OString(kTestStr2),
+            new OString(kTestStr2), 
             new OString(kTestStr1)},
         {"!('Sun Microsystems'<='Sun Microsystems'", sal_True,
             new OString(kTestStr1), new OString(kTestStr1)},
-        {"'Sun Microsystems'<=''",sal_False,new OString(kTestStr1),
+        {"'Sun Microsystems'<=''",sal_False,new OString(kTestStr1), 
             new OString()},
-        {"''<='Sun Microsystems Java Technology'",sal_True,new OString(),
+        {"''<='Sun Microsystems Java Technology'",sal_True,new OString(), 
             new OString(kTestStr2)},
         {"!(''<='')",sal_True,new OString(), new OString()}
     };
@@ -1059,13 +1059,13 @@ static sal_Bool test_rtl_OString_op_eq_001( hTestResult hRtlTestResult )
 
     TestCase arrTestCase[] =
     {
-        {"'' = str1, str1 == str2",sal_True,new OString(kTestStr1),
+        {"'' = str1, str1 == str2",sal_True,new OString(kTestStr1), 
             new OString()},
-        {"str1 = str2, str1 == str2",sal_True,new OString(kTestStr1),
+        {"str1 = str2, str1 == str2",sal_True,new OString(kTestStr1), 
             new OString(kTestStr6)},
-        {"str2 = '', str1 == str2",sal_True,new OString(),
+        {"str2 = '', str1 == str2",sal_True,new OString(), 
             new OString(kTestStr2)},
-        {"'' = '', str1 == str2",sal_True,new OString(),
+        {"'' = '', str1 == str2",sal_True,new OString(), 
             new OString()}
     };
 
@@ -1076,7 +1076,7 @@ static sal_Bool test_rtl_OString_op_eq_001( hTestResult hRtlTestResult )
     {
        *(arrTestCase[i].input1) = *(arrTestCase[i].input2);
 
-        sal_Bool cmpRes =
+        sal_Bool cmpRes = 
             (*(arrTestCase[i].input1) == *(arrTestCase[i].input2));
         sal_Bool lastRes = (cmpRes == arrTestCase[i].expVal);
 
@@ -1094,7 +1094,7 @@ static sal_Bool test_rtl_OString_op_eq_001( hTestResult hRtlTestResult )
     return ( res );
 }
 
-static sal_Bool test_rtl_OString_op_eq_002(
+static sal_Bool test_rtl_OString_op_eq_002( 
                     hTestResult hRtlTestResult )
 {
     ::rtl::OString aStr;
@@ -1112,7 +1112,7 @@ static sal_Bool test_rtl_OString_op_eq_002(
     );
 }
 
-static sal_Bool test_rtl_OString_op_eq_003(
+static sal_Bool test_rtl_OString_op_eq_003( 
                     hTestResult hRtlTestResult )
 {
     sal_Bool bTCState = false;
@@ -1177,7 +1177,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_op_plus(
             new OString(kTestStr1), new OString("")},
         {"str1 = '' + str1", new OString(kTestStr1),
             new OString(""), new OString(kTestStr1)},
-        {" '' = '' + '' ", new OString(""),new OString(""),
+        {" '' = '' + '' ", new OString(""),new OString(""), 
             new OString("")},
         {"str1 = str1 + def.constr", new OString(kTestStr1),
             new OString(kTestStr1), new OString()},
@@ -1243,7 +1243,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_op_peq(
             new OString(kTestStr1), new OString()},
         {" str1 == (def.constr += str1)",new OString(kTestStr1),
             new OString(), new OString(kTestStr1)},
-        {" def.constr== (def.constr += def.constr)",
+        {" def.constr== (def.constr += def.constr)", 
             new OString(),new OString(), new OString()}
     };
 
@@ -1375,20 +1375,20 @@ static sal_Bool SAL_CALL test_rtl_OString_copy_001(
     {
     sal_Char*                    comments;
     const sal_Char*              srcStr;
-    const sal_Char*              arrExpStr;
+    const sal_Char*              arrExpStr;   
                     // string for comparing with result
-    sal_Int32                    beginIndex;
+    sal_Int32                    beginIndex;  
                     // beginIndex for the method copy
     sal_Int32                    lengthForCmp;
                     // number of symbols for comparing
     // (if value is equal to 0 then pointers to buffers must be equal)
-    sal_Int32                    expLength;
+    sal_Int32                    expLength;   
                     //expected length of the result string
     } TestCase;
 
     TestCase arrTestCase[] =
     {
-        {"beginIndex == 0 ( whole string )", kTestStr2,kTestStr2,
+        {"beginIndex == 0 ( whole string )", kTestStr2,kTestStr2, 
          0, kTestStr2Len, kTestStr2Len},
         {"beginIndex == strlen-2 ( last two char )",  kTestStr2,"gy",
                     kTestStr2Len-2, 2, 2},
@@ -1410,21 +1410,21 @@ static sal_Bool SAL_CALL test_rtl_OString_copy_001(
         // rtl_String* pDataDst = dst.pData;
 
         sal_Bool lastRes;
-
+     
         lastRes= (dst== arrTestCase[i].arrExpStr);
-
+          
 
         c_rtl_tres_state
         (
             hRtlTestResult,
             lastRes,
             arrTestCase[i].comments,
-            createName( pMeth,
+            createName( pMeth, 
                 "copy_001(beginIndex)(check buffer and length)", i )
         );
 
         res &= lastRes;
-
+               
     }
 
     return (res);
@@ -1443,11 +1443,11 @@ static sal_Bool SAL_CALL test_rtl_OString_copy_002(
     typedef struct TestCase
     {
     sal_Char*               comments;
-    const sal_Char*          arrExpStr;
-    sal_Int32                beginIndex;
-    sal_Int32                count;
+    const sal_Char*          arrExpStr;   
+    sal_Int32                beginIndex; 
+    sal_Int32                count;       
     sal_Int32                expLen;
-
+               
     } TestCase;
 
     TestCase arrTestCase[] ={
@@ -1481,20 +1481,20 @@ static sal_Bool SAL_CALL test_rtl_OString_copy_002(
         //t_print("dst length =%d\n", pDataDst->length);
         //t_print("count =%d\n", arrTestCase[i].count);
         //t_print("expLen =%d\n", arrTestCase[i].expLen);
-
+        
         lastRes = (dst.equals(arrTestCase[i].arrExpStr)) ? sal_True : sal_False;
-
+                
         c_rtl_tres_state
         (
             hRtlTestResult,
             lastRes,
             arrTestCase[i].comments,
-            createName( pMeth,
+            createName( pMeth, 
                 "copy_002(beginIndex,count)(check buffer and length)", i)
         );
         res &= lastRes;
-
-
+        
+        
     }
 
     return (res);
@@ -1563,7 +1563,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_copy(
     res &= test_rtl_OString_copy_003(hRtlTestResult);
     res &= test_rtl_OString_copy_004(hRtlTestResult);
     c_rtl_tres_state_end(hRtlTestResult, "copy");
-
+ 
 //    return ( res );
 }
 
@@ -1589,13 +1589,13 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_concat(
     TestCase arrTestCase[] =
     {
         {"concatenates two strings",new OString(kTestStr1),
-            new OString(kTestStr7),
+            new OString(kTestStr7), 
             new OString(kTestStr8)},
         {"concatenates empty string",new OString(kTestStr1),
-            new OString(kTestStr1),
+            new OString(kTestStr1), 
             new OString("")},
         {"concatenates to empty string",new OString(kTestStr1),
-            new OString(""),
+            new OString(""), 
             new OString(kTestStr1)},
         {"concatenates two empty strings",new OString(""),new OString(""),
              new OString("")},
@@ -1614,7 +1614,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_concat(
     sal_uInt32 i;
     for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
     {
-        OString str =
+        OString str = 
             arrTestCase[i].input1->concat(*arrTestCase[i].input2);
         sal_Bool lastRes = (str == *arrTestCase[i].expVal);
 
@@ -1858,7 +1858,7 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_sal_Bool(
     return ( res );
 }
 
-sal_Bool SAL_CALL test_rtl_OString_valueOf_sal_Char(
+sal_Bool SAL_CALL test_rtl_OString_valueOf_sal_Char( 
                     hTestResult hRtlTestResult )
 {
     sal_Char methName[MAXBUFLENGTH];
@@ -1885,7 +1885,7 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_sal_Char(
         {"\n",'\n', new OString("\n")},
         {"\'",'\'', new OString("\'")},
         {"\"",'\"', new OString("\"")}
-
+        
     };
 
     sal_Bool res = sal_True;
@@ -2054,7 +2054,7 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_Int32_Bounderies(
             (
                 hRtlTestResult,
                 test_valueOf_Int32((const char**)kBinaryMaxNumsStr,
-                kInt32MaxNumsCount, kRadixBinary, hRtlTestResult,
+                kInt32MaxNumsCount, kRadixBinary, hRtlTestResult, 
                     kInt32MaxNums),
                 "kRadixBinary",
                 "valueOf(salInt32, radix 2) Bounderies"
@@ -2064,7 +2064,7 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_Int32_Bounderies(
             (
                 hRtlTestResult,
                 test_valueOf_Int32((const char**)kOctolMaxNumsStr,
-                 kInt32MaxNumsCount, kRadixOctol, hRtlTestResult,
+                 kInt32MaxNumsCount, kRadixOctol, hRtlTestResult, 
                     kInt32MaxNums),
                 "kRadixOctol",
                 "valueOf(salInt32, radix 8) Bounderies"
@@ -2476,16 +2476,16 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_Int64_SmallestNegativeValue(
 // LLA: {
 // LLA:     sal_Char methName[MAXBUFLENGTH];
 // LLA:     sal_Char* pMeth =methName;
-// LLA:
+// LLA: 
 // LLA:     typedef struct TestCase
 // LLA:     {
 // LLA:     sal_Char*                    comments;
 // LLA:     float                         input1;
 // LLA:     OString*                     expVal;
-// LLA:
+// LLA: 
 // LLA:     ~TestCase() {delete expVal;}
 // LLA:     } TestCase;
-// LLA:
+// LLA: 
 // LLA:     TestCase arrTestCase[] =
 // LLA:     {
 // LLA:         { "3.0", 3.0, new OString("3.0") },
@@ -2496,16 +2496,16 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_Int64_SmallestNegativeValue(
 // LLA:         { "3.5025255", 3.5025255f, new OString("3.5025255") },
 // LLA:         { "3.0039062", 3.00390625f, new OString("3.0039062") }
 // LLA:     };
-// LLA:
+// LLA: 
 // LLA:     sal_Bool res = sal_True;
 // LLA:     sal_Int32 i;
-// LLA:
+// LLA: 
 // LLA:     for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
 // LLA:     {
 // LLA:         ::rtl::OString aStr1;
 // LLA:         aStr1 = aStr1.valueOf( arrTestCase[i].input1 );
 // LLA:         sal_Bool lastRes = (arrTestCase[i].expVal->compareTo(aStr1) == 0);
-// LLA:
+// LLA: 
 // LLA:         c_rtl_tres_state
 // LLA:         (
 // LLA:             hRtlTestResult,
@@ -2513,11 +2513,11 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_Int64_SmallestNegativeValue(
 // LLA:             arrTestCase[i].comments,
 // LLA:             createName( pMeth, "valueof_float", i)
 // LLA:         );
-// LLA:
+// LLA: 
 // LLA:         res &= lastRes;
-// LLA:
+// LLA: 
 // LLA:     }
-// LLA:
+// LLA: 
 // LLA:     return ( res );
 // LLA: }
 
@@ -2532,16 +2532,16 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_Int64_SmallestNegativeValue(
 // LLA: {
 // LLA:     sal_Char methName[MAXBUFLENGTH];
 // LLA:     sal_Char* pMeth =methName;
-// LLA:
+// LLA: 
 // LLA:     typedef struct TestCase
 // LLA:     {
 // LLA:     sal_Char*                    comments;
 // LLA:     float                         input1;
 // LLA:     OString*                     expVal;
-// LLA:
+// LLA: 
 // LLA:     ~TestCase() {delete expVal;}
 // LLA:     } TestCase;
-// LLA:
+// LLA: 
 // LLA:     TestCase arrTestCase[] =
 // LLA:     {
 // LLA:         { "-3.0", -3.0, new OString("-3.0") },
@@ -2552,16 +2552,16 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_Int64_SmallestNegativeValue(
 // LLA:         { "-3.5025255", -3.5025255f, new OString("-3.5025255") },
 // LLA:         { "-3.0039062", -3.00390625f, new OString("-3.0039062") }
 // LLA:     };
-// LLA:
+// LLA: 
 // LLA:     sal_Bool res = sal_True;
 // LLA:     sal_Int32 i;
-// LLA:
+// LLA: 
 // LLA:     for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
 // LLA:     {
 // LLA:         ::rtl::OString aStr1;
 // LLA:         aStr1 = aStr1.valueOf( arrTestCase[i].input1 );
 // LLA:         sal_Bool lastRes = (arrTestCase[i].expVal->compareTo(aStr1) == 0);
-// LLA:
+// LLA: 
 // LLA:         c_rtl_tres_state
 // LLA:         (
 // LLA:             hRtlTestResult,
@@ -2569,11 +2569,11 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_Int64_SmallestNegativeValue(
 // LLA:             arrTestCase[i].comments,
 // LLA:             createName( pMeth, "valueof_negative float", i)
 // LLA:         );
-// LLA:
+// LLA: 
 // LLA:         res &= lastRes;
-// LLA:
+// LLA: 
 // LLA:     }
-// LLA:
+// LLA: 
 // LLA:     return ( res );
 // LLA: }
 
@@ -2585,41 +2585,41 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_Int64_SmallestNegativeValue(
 // LLA: {
 // LLA:     sal_Char methName[MAXBUFLENGTH];
 // LLA:     sal_Char* pMeth =methName;
-// LLA:
+// LLA: 
 // LLA:     typedef struct TestCase
 // LLA:     {
 // LLA:     sal_Char*                    comments;
 // LLA:     double                         input1;
 // LLA:     OString*                     expVal;
-// LLA:
+// LLA: 
 // LLA:     ~TestCase() {delete expVal;}
 // LLA:     } TestCase;
-// LLA:
+// LLA: 
 // LLA:     TestCase arrTestCase[] =
 // LLA:     {
 // LLA:         {"3.0", 3.0, new OString("3.0")},
 // LLA:         {"3.5", 3.5, new OString("3.5")},
 // LLA:         {"3.0625", 3.0625, new OString("3.0625")},
 // LLA:         {"3.1415926535", 3.1415926535, new OString("3.1415926535")},
-// LLA:         {"3.1415926535897931", 3.141592653589793,
+// LLA:         {"3.1415926535897931", 3.141592653589793, 
 // LLA:             new OString("3.1415926535897931")},
-// LLA:         {"3.1415926535897931", 3.1415926535897932,
+// LLA:         {"3.1415926535897931", 3.1415926535897932, 
 // LLA:             new OString("3.1415926535897931")},
-// LLA:         {"3.1415926535897931", 3.14159265358979323,
+// LLA:         {"3.1415926535897931", 3.14159265358979323, 
 // LLA:             new OString("3.1415926535897931")},
-// LLA:         {"3.1415926535897931", 3.141592653589793238462643,
+// LLA:         {"3.1415926535897931", 3.141592653589793238462643, 
 // LLA:             new OString("3.1415926535897931")}
 // LLA:     };
-// LLA:
+// LLA: 
 // LLA:     sal_Bool res = sal_True;
 // LLA:     sal_Int32 i;
-// LLA:
+// LLA: 
 // LLA:     for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
 // LLA:     {
 // LLA:         ::rtl::OString aStr1;
 // LLA:         aStr1 = aStr1.valueOf( arrTestCase[i].input1 );
 // LLA:         sal_Bool lastRes = (arrTestCase[i].expVal->compareTo(aStr1) == 0);
-// LLA:
+// LLA: 
 // LLA:         c_rtl_tres_state
 // LLA:         (
 // LLA:             hRtlTestResult,
@@ -2627,11 +2627,11 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_Int64_SmallestNegativeValue(
 // LLA:             arrTestCase[i].comments,
 // LLA:             createName( pMeth, "valueof_double", i)
 // LLA:         );
-// LLA:
+// LLA: 
 // LLA:         res &= lastRes;
-// LLA:
+// LLA: 
 // LLA:     }
-// LLA:
+// LLA: 
 // LLA:     return ( res );
 // LLA: }
 
@@ -2644,41 +2644,41 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_Int64_SmallestNegativeValue(
 // LLA: {
 // LLA:     sal_Char methName[MAXBUFLENGTH];
 // LLA:     sal_Char* pMeth =methName;
-// LLA:
+// LLA: 
 // LLA:     typedef struct TestCase
 // LLA:     {
 // LLA:     sal_Char*                    comments;
 // LLA:     double                         input1;
 // LLA:     OString*                     expVal;
-// LLA:
+// LLA: 
 // LLA:     ~TestCase() {delete expVal;}
 // LLA:     } TestCase;
-// LLA:
+// LLA: 
 // LLA:     TestCase arrTestCase[] =
 // LLA:     {
 // LLA:         {"-3.0", -3.0, new OString("-3.0")},
 // LLA:         {"-3.5", -3.5, new OString("-3.5")},
 // LLA:         {"-3.0625", -3.0625, new OString("-3.0625")},
 // LLA:         {"-3.1415926535", -3.1415926535, new OString("-3.1415926535")},
-// LLA:         {"-3.1415926535897931", -3.141592653589793,
+// LLA:         {"-3.1415926535897931", -3.141592653589793, 
 // LLA:             new OString("-3.1415926535897931")},
-// LLA:         {"-3.1415926535897931", -3.1415926535897932,
+// LLA:         {"-3.1415926535897931", -3.1415926535897932, 
 // LLA:             new OString("-3.1415926535897931")},
-// LLA:         {"-3.1415926535897931", -3.14159265358979323,
+// LLA:         {"-3.1415926535897931", -3.14159265358979323, 
 // LLA:             new OString("-3.1415926535897931")},
-// LLA:         {"-3.1415926535897931", -3.141592653589793238462643,
+// LLA:         {"-3.1415926535897931", -3.141592653589793238462643, 
 // LLA:             new OString("-3.1415926535897931")}
 // LLA:     };
-// LLA:
+// LLA: 
 // LLA:     sal_Bool res = sal_True;
 // LLA:     sal_Int32 i;
-// LLA:
+// LLA: 
 // LLA:     for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
 // LLA:     {
 // LLA:         ::rtl::OString aStr1;
 // LLA:         aStr1 = aStr1.valueOf( arrTestCase[i].input1 );
 // LLA:         sal_Bool lastRes = (arrTestCase[i].expVal->compareTo(aStr1) == 0);
-// LLA:
+// LLA: 
 // LLA:         c_rtl_tres_state
 // LLA:         (
 // LLA:             hRtlTestResult,
@@ -2686,11 +2686,11 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_Int64_SmallestNegativeValue(
 // LLA:             arrTestCase[i].comments,
 // LLA:             createName( pMeth, "valueof_nagative double", i)
 // LLA:         );
-// LLA:
+// LLA: 
 // LLA:         res &= lastRes;
-// LLA:
+// LLA: 
 // LLA:     }
-// LLA:
+// LLA: 
 // LLA:     return ( res );
 // LLA: }
 
@@ -2760,7 +2760,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_toChar(
         {"-", '-',new OString("-")},
         {"_", '_',new OString("_")},
 
-//  TODO: may be UTF-8 values
+//  TODO: may be UTF-8 values 
 //        {"�0„6", '�0„6',new OString("�0„6")},
 //        { "�0„7", '�0„7',new OString("�0„7")},
 //        {"�0‹0", '�0‹0',new OString("�0‹0")},
@@ -2832,7 +2832,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_toFloat(
         {3.141592f, new OString("3.141592"), 3e-7f},
         {3.1415926f, new OString("3.1415926"), 3e-7f},
         {3.14159265f, new OString("3.14159265"), 3e-7f},
-        {3.141592653589793238462643f,
+        {3.141592653589793238462643f, 
             new OString("3.141592653589793238462643"), 3e-7f},
         {6.5822e-16f, new OString("6.5822e-16"), 6e-16f * 1e-7f},
         {9.1096e-31f, new OString("9.1096e-31"), 9e-31f * 1e-7f},
@@ -2891,7 +2891,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_toFloat(
 // LLA: {
 // LLA:     sal_Char methName[MAXBUFLENGTH];
 // LLA:     sal_Char* pMeth = methName;
-// LLA:
+// LLA: 
 // LLA:     c_rtl_tres_state_start(hRtlTestResult, "toDouble");
 // LLA:     typedef struct TestCase
 // LLA:     {
@@ -2900,21 +2900,21 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_toFloat(
 // LLA:     OString*                     input1;
 // LLA:     ~TestCase() {delete input1;}
 // LLA:     } TestCase;
-// LLA:
-// LLA:
+// LLA: 
+// LLA: 
 // LLA:     TestCase arrTestCase[] =
 // LLA:     {
 // LLA:         {3.0, 1e-35, new OString("3")},
 // LLA:         {3.1, 1e-2, new OString("3.1")},
 // LLA:         {3.1415, 1e-5, new OString("3.1415")},
 // LLA:         {3.1415926535, 1e-11, new OString("3.1415926535")},
-// LLA:         {3.141592653589793, 1e-15,
+// LLA:         {3.141592653589793, 1e-15, 
 // LLA:             new OString("3.141592653589793")},
-// LLA:         {3.1415926535897932, 1e-16,
+// LLA:         {3.1415926535897932, 1e-16, 
 // LLA:             new OString("3.1415926535897932")},
-// LLA:         {3.14159265358979323, 1e-15,
+// LLA:         {3.14159265358979323, 1e-15, 
 // LLA:             new OString("3.14159265358979323")},
-// LLA:         {3.141592653589793238462643, 1e-15,
+// LLA:         {3.141592653589793238462643, 1e-15, 
 // LLA:             new OString("3.141592653589793238462643")},
 // LLA:         {6.5822e-16, 1e-20, new OString("6.5822e-16")},
 // LLA:         {9.1096e-31, 1e-35, new OString("9.1096e-31")},
@@ -2928,24 +2928,24 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_toFloat(
 // LLA:         {3.1, 1e-2, new OString("+3.1")},
 // LLA:         {0.0, 1e-2, new OString("-0.0")}
 // LLA:     };
-// LLA:
+// LLA: 
 // LLA:     sal_Bool res = sal_True;
 // LLA:     sal_Int32 i;
-// LLA:
+// LLA: 
 // LLA:     for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++ )
 // LLA:     {
 // LLA:         double dRes = arrTestCase[i].input1->toDouble();
 // LLA:         double dErg = dRes - arrTestCase[i].expVal ;
 // LLA:         double dComp = fabs( dErg );
 // LLA:         sal_Bool lastRes = ( dComp <= arrTestCase[i].expDiff );
-// LLA:
+// LLA: 
 // LLA:         char com[MAXBUFLENGTH];
 // LLA:         com[0] = '\'';
 // LLA:         cpynstr(com + 1, (*arrTestCase[i].input1), MAXBUFLENGTH);
 // LLA:         int length = AStringLen( (*arrTestCase[i].input1) );
 // LLA:         com[length + 1] = '\'';
 // LLA:         com[length + 2] = 0;
-// LLA:
+// LLA: 
 // LLA:         c_rtl_tres_state
 // LLA:         (
 // LLA:             hRtlTestResult,
@@ -2953,9 +2953,9 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_toFloat(
 // LLA:             com,
 // LLA:             createName( pMeth, "toDouble", i )
 // LLA:         );
-// LLA:
+// LLA: 
 // LLA:     }
-// LLA:
+// LLA: 
 // LLA:     c_rtl_tres_state_end(hRtlTestResult, "toDouble");
 // LLA: //    return (res);
 // LLA: }
@@ -3013,7 +3013,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_toBoolean(
 //------------------------------------------------------------------------
 // testing the method toInt32( sal_Int16 radix = 2,8,10,16,36 )
 //------------------------------------------------------------------------
-sal_Bool test_toInt32(  int num, const sal_Char** in,
+sal_Bool test_toInt32(  int num, const sal_Char** in, 
 const sal_Int32 *expVal,sal_Int16 radix, hTestResult hRtlTestResult )
 {
     sal_Bool res = sal_True;
@@ -3203,7 +3203,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_toInt32(
 //------------------------------------------------------------------------
 // testing the method toInt64( sal_Int16 radix = 2,8,10,16,36 )
 //------------------------------------------------------------------------
-sal_Bool test_toInt64( int num, const sal_Char** in,
+sal_Bool test_toInt64( int num, const sal_Char** in, 
 const sal_Int64 *expVal,sal_Int16 radix, hTestResult hRtlTestResult )
 {
     sal_Bool res = sal_True;
@@ -3415,9 +3415,9 @@ TestCase arrTestCase[]={
 
     {"string differs", new OString(kTestStr18),
         new OString(kTestStr4),'S','s'},
-    {"string differs", new OString(kTestStr19),
+    {"string differs", new OString(kTestStr19), 
         new OString(kTestStr17),(sal_Char)' ',(sal_Char)'-'},
-    {"same string, no replace ", new OString(kTestStr22),
+    {"same string, no replace ", new OString(kTestStr22), 
         new OString(kTestStr22),'*','8'}
     };
 
@@ -3594,9 +3594,9 @@ void RegisterAdditionalFunctions(FktRegFuncPtr _pFunc)
 }
 
 /*
-D:\local\644\SRX644\sal\qa\rtl_OString.cxx(3559) : error C2664:
+D:\local\644\SRX644\sal\qa\rtl_OString.cxx(3559) : error C2664: 
 'unsigned char (void (__cdecl *)(void *),const char *)'
- : cannot convert parameter 1 from
+ : cannot convert parameter 1 from 
 'unsigned char (__cdecl *)(void *)' to 'void (__cdecl *)(void *)'
 
         This conversion requires a reinterpret_cast, a C-style cast or function-
diff --git a/sal/qa/rtl_strings/rtl_OUString.cxx b/sal/qa/rtl_strings/rtl_OUString.cxx
index 47930f2412d1..218db1b5e0ab 100644
--- a/sal/qa/rtl_strings/rtl_OUString.cxx
+++ b/sal/qa/rtl_strings/rtl_OUString.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -94,7 +94,7 @@ static sal_Bool SAL_CALL test_rtl_OUString_ctor_002(
                            kEncodingRTLTextUSASCII,
                            kConvertFlagsOStringToOUString
                            );
-
+      
     return
         (
             c_rtl_tres_state
@@ -114,7 +114,7 @@ static sal_Bool SAL_CALL test_rtl_OUString_ctor_003(
     rtl_uString  *rtlUStr =NULL ;
     rtl_uString_newFromAscii( &rtlUStr, kTestStr1 );
     ::rtl::OUString aUStr( rtlUStr );
-
+    
     return
         (
             c_rtl_tres_state
@@ -161,9 +161,9 @@ static sal_Bool test_rtl_OUString_ctor_005( hTestResult hRtlTestResult )
                 "ctor_004"
                 )
             );
-
+    
 }
-
+    
 
 //------------------------------------------------------------------------
 
@@ -184,11 +184,11 @@ static sal_Bool test_rtl_OUString_ctor_006( hTestResult hRtlTestResult )
             );
 }
 
-extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_ctors(
+extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_ctors( 
     hTestResult hRtlTestResult )
 {
     c_rtl_tres_state_start( hRtlTestResult, "ctors");
-    sal_Bool DCState = test_ini_uString();
+    sal_Bool DCState = test_ini_uString();      
     (void)DCState;
     sal_Bool bTSState = test_rtl_OUString_ctor_001( hRtlTestResult );
     bTSState &= test_rtl_OUString_ctor_002( hRtlTestResult);
@@ -196,7 +196,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_ctors(
     bTSState &= test_rtl_OUString_ctor_004( hRtlTestResult);
     bTSState &= test_rtl_OUString_ctor_005( hRtlTestResult);
     bTSState &= test_rtl_OUString_ctor_006( hRtlTestResult);
-    c_rtl_tres_state_end( hRtlTestResult, "ctors");
+    c_rtl_tres_state_end( hRtlTestResult, "ctors");     
 //    return( bTSState );
 }
 
@@ -215,31 +215,31 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_getLength(
 
     typedef struct TestCase
     {
-        sal_Char*       comments;
-        sal_Int32       expVal;
+        sal_Char*		comments;
+        sal_Int32 		expVal;
         OUString*        input;
-        ~TestCase()     { delete input;}
+        ~TestCase() 	{ delete input;}
     } TestCase;
 
     TestCase arrTestCase[]={
 
-        {"length of ascii string", kTestStr1Len,
+        {"length of ascii string", kTestStr1Len, 
          new OUString( kTestStr1,
                        kTestStr1Len,
                        kEncodingRTLTextUSASCII,
                        kConvertFlagsOStringToOUString)},
-        {"length of ascci string of size 1", 1,
+        {"length of ascci string of size 1", 1, 
          new OUString( "1",
                        1,
                        kEncodingRTLTextUSASCII,
                        kConvertFlagsOStringToOUString)},
         {"length of empty string (default constructor)", 0, new OUString()},
-        {"length of empty string (empty ascii string arg)",0,
+        {"length of empty string (empty ascii string arg)",0, 
          new OUString( "",
                        0,
                        kEncodingRTLTextUSASCII,
                        kConvertFlagsOStringToOUString)},
-        {"length of empty string (string arg = '\\0')", 0,
+        {"length of empty string (string arg = '\\0')", 0, 
          new OUString( "\0",
                        0,
                        kEncodingRTLTextUSASCII,
@@ -280,11 +280,11 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_equals(
 
     typedef struct TestCase
     {
-        sal_Char*       comments;
+        sal_Char*		comments;
         sal_Bool         expVal;
         OUString*        input1;
         OUString*        input2;
-        ~TestCase()     { delete input1;delete input2;}
+        ~TestCase()		{ delete input1;delete input2;}
     } TestCase;
 
     TestCase arrTestCase[]={
@@ -302,28 +302,28 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_equals(
         {"empty(def.constructor) and non empty", sal_False, new OUString(),
          new OUString(aUStr2)
         },
-        {"non empty and empty(def. constructor)", sal_False,
+        {"non empty and empty(def. constructor)", sal_False, 
          new OUString(aUStr1),
          new OUString()
         },
-        {"two empty strings(string arg = '\\0')", sal_True,
+        {"two empty strings(string arg = '\\0')", sal_True, 
          new OUString( "",
                        0,
                        kEncodingRTLTextUSASCII,
-                       kConvertFlagsOStringToOUString),
+                       kConvertFlagsOStringToOUString), 
          new OUString( "",
                        0,
                        kEncodingRTLTextUSASCII,
                        kConvertFlagsOStringToOUString)
         },
-        {"empty(string arg = '\\0') and non empty", sal_False,
+        {"empty(string arg = '\\0') and non empty", sal_False, 
          new OUString( "",
                        0,
                        kEncodingRTLTextUSASCII,
                        kConvertFlagsOStringToOUString),
          new OUString(aUStr2)
         },
-        {"non empty and empty(string arg = '\\0')", sal_False,
+        {"non empty and empty(string arg = '\\0')", sal_False, 
          new OUString(aUStr1),
          new OUString( "",
                        0,
@@ -338,7 +338,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_equals(
     for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
     {
         sal_Bool lastRes =
-            ( arrTestCase[i].input1->equals(*(arrTestCase[i].input2)) ==
+            ( arrTestCase[i].input1->equals(*(arrTestCase[i].input2)) ==  
               arrTestCase[i].expVal );
 
         c_rtl_tres_state
@@ -351,7 +351,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_equals(
 
         res &= lastRes;
     }
-    c_rtl_tres_state_end( hRtlTestResult, "equals");
+    c_rtl_tres_state_end( hRtlTestResult, "equals"); 
 //    return (res);
 }
 
@@ -368,34 +368,34 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_equalsIgnoreAsciiCase(
 
     typedef struct TestCase
     {
-        sal_Char*       comments;
+        sal_Char*		comments;
         sal_Bool         expVal;
         OUString*        input1;
         OUString*        input2;
-        ~TestCase()     { delete input1;delete input2;}
+        ~TestCase()		{ delete input1;delete input2;}
     } TestCase;
 
     TestCase arrTestCase[]={
-        {"same strings but different cases",sal_True,new OUString(aUStr4),
+        {"same strings but different cases",sal_True,new OUString(aUStr4), 
          new OUString(aUStr5)
         },
-        {"same strings",sal_True,new OUString(aUStr4),
+        {"same strings",sal_True,new OUString(aUStr4), 
          new OUString(aUStr4)},
-        {"with equal beginning",sal_False,new OUString(aUStr2),
+        {"with equal beginning",sal_False,new OUString(aUStr2), 
          new OUString(aUStr4)
         },
-        {"empty(def.constructor) and non empty",sal_False,new OUString(),
+        {"empty(def.constructor) and non empty",sal_False,new OUString(), 
          new OUString(aUStr5)
         },
         {"non empty and empty(def.constructor)",sal_False,
-         new OUString(aUStr4),
+         new OUString(aUStr4), 
          new OUString()
         },
-        {"two empty strings(def.constructor)",sal_True,new OUString(),
+        {"two empty strings(def.constructor)",sal_True,new OUString(), 
          new OUString()
         },
         {"different strings with equal length",sal_False,
-         new OUString(aUStr10),
+         new OUString(aUStr10), 
          new OUString(aUStr11)
         }
     };
@@ -406,7 +406,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_equalsIgnoreAsciiCase(
     for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
     {
         sal_Bool lastRes =
-            (arrTestCase[i].input1->equalsIgnoreAsciiCase(*arrTestCase[i].input2) ==
+            (arrTestCase[i].input1->equalsIgnoreAsciiCase(*arrTestCase[i].input2) == 
              arrTestCase[i].expVal);
 
         c_rtl_tres_state
@@ -432,55 +432,55 @@ static sal_Bool SAL_CALL test_rtl_OUString_compareTo_001(
 
     typedef struct TestCase
     {
-        sal_Char*       comments;
+        sal_Char*		comments;
         sal_Int32         expVal;
         OUString*        input1;
         OUString*        input2;
-        ~TestCase()     { delete input1;delete input2;}
+        ~TestCase()		{ delete input1;delete input2;}
     } TestCase;
 
     TestCase arrTestCase[]={
 
-        {"simple compare, str1 to str5",-1,new OUString(aUStr1),
+        {"simple compare, str1 to str5",-1,new OUString(aUStr1), 
          new OUString(aUStr5)
         },
-        {"simple compare, str2 to str5",-1,new OUString(aUStr2),
+        {"simple compare, str2 to str5",-1,new OUString(aUStr2), 
          new OUString(aUStr5)
         },
-        {"simple compare, str1 to str9",-1,new OUString(aUStr1),
+        {"simple compare, str1 to str9",-1,new OUString(aUStr1), 
          new OUString(aUStr9)
         },
-        {"simple compare, str1 to str2",-1,new OUString(aUStr1),
+        {"simple compare, str1 to str2",-1,new OUString(aUStr1), 
          new OUString(aUStr2)
         },
-        {"simple compare, str4 to str5",-1,new OUString(aUStr4),
+        {"simple compare, str4 to str5",-1,new OUString(aUStr4), 
          new OUString(aUStr5)
         },
-        {"simple compare, str1 to str3",-1,new OUString(aUStr1),
+        {"simple compare, str1 to str3",-1,new OUString(aUStr1), 
          new OUString(aUStr3)
         },
-        {"simple compare, str5 to str1",+1,new OUString(aUStr5),
+        {"simple compare, str5 to str1",+1,new OUString(aUStr5), 
          new OUString(aUStr1)
         },
-        {"simple compare, str2 to str1",+1,new OUString(aUStr2),
+        {"simple compare, str2 to str1",+1,new OUString(aUStr2), 
          new OUString(aUStr1)
         },
-        {"simple compare, str9 to str5",+1,new OUString(aUStr9),
+        {"simple compare, str9 to str5",+1,new OUString(aUStr9), 
          new OUString(aUStr5)
         },
-        {"simple compare, str5 to str4",+1,new OUString(aUStr5),
+        {"simple compare, str5 to str4",+1,new OUString(aUStr5), 
          new OUString(aUStr4)
         },
-        {"simple compare, str1 to str1",0,new OUString(aUStr1),
+        {"simple compare, str1 to str1",0,new OUString(aUStr1), 
          new OUString(aUStr1)
         },
-        {"simple compare, nullString to nullString",0,new OUString(),
+        {"simple compare, nullString to nullString",0,new OUString(), 
          new OUString()
         },
-        {"simple compare, nullString to str2",-1,new OUString(),
+        {"simple compare, nullString to str2",-1,new OUString(), 
          new OUString(aUStr2)
         },
-        {"simple compare, str1 to nullString",+1,new OUString(aUStr1),
+        {"simple compare, str1 to nullString",+1,new OUString(aUStr1), 
          new OUString()
         }
     };
@@ -495,7 +495,7 @@ static sal_Bool SAL_CALL test_rtl_OUString_compareTo_001(
         cmpRes = ( cmpRes == 0 ) ? 0 : ( cmpRes > 0 ) ? +1 : -1 ;
         sal_Bool lastRes = ( cmpRes == arrTestCase[i].expVal);
 
-
+    
         c_rtl_tres_state
             (
                 hRtlTestResult,
@@ -522,12 +522,12 @@ static sal_Bool SAL_CALL test_rtl_OUString_compareTo_002(
 
     typedef struct TestCase
     {
-        sal_Char*       comments;
-        sal_Int32       expVal;
-        sal_Int32       maxLength;
-           OUString*        input1;
-        OUString*       input2;
-        ~TestCase()     { delete input1;delete input2;}
+        sal_Char*		comments;
+        sal_Int32		expVal;
+        sal_Int32		maxLength;
+           OUString*		input1;
+        OUString*		input2;
+        ~TestCase()		{ delete input1;delete input2;}
     } TestCase;
 
     TestCase arrTestCase[] =
@@ -598,11 +598,11 @@ static sal_Bool SAL_CALL test_rtl_OUString_match_001(
 
     typedef struct TestCase
     {
-        sal_Char*       comments;
+        sal_Char*		comments;
         sal_Bool         expVal;
         OUString*        input1;
         OUString*        input2;
-        ~TestCase()     { delete input1;delete input2;}
+        ~TestCase() 	{ delete input1;delete input2;}
     } TestCase;
 
     TestCase arrTestCase[]={
@@ -616,9 +616,9 @@ static sal_Bool SAL_CALL test_rtl_OUString_match_001(
         {"null and aUStr1", sal_False, new OUString( "",
                                                      0,
                                                      kEncodingRTLTextUSASCII,
-                                                     kConvertFlagsOStringToOUString),
+                                                     kConvertFlagsOStringToOUString), 
          new OUString(aUStr1)}
-
+    
     };
 
     sal_Bool res = sal_True;
@@ -651,23 +651,23 @@ static sal_Bool SAL_CALL test_rtl_OUString_match_002(
 
     typedef struct TestCase
     {
-        sal_Char*       comments;
+        sal_Char*		comments;
         sal_Bool         expVal;
-        sal_Int32       fromIndex;
-        OUString*       input1;
-        OUString*       input2;
-        ~TestCase()     { delete input1;delete input2;}
+        sal_Int32		fromIndex;
+        OUString*		input1;
+        OUString*		input2;
+        ~TestCase()		{ delete input1;delete input2;}
     } TestCase;
 
     TestCase arrTestCase[]={
 
-        {"aUStr2 from 17 and aUStr6", sal_True, 17,
+        {"aUStr2 from 17 and aUStr6", sal_True, 17, 
          new OUString(aUStr2),new OUString(aUStr6)},
-        {"aUStr2 from 5 and aUStr6", sal_False, 5,
+        {"aUStr2 from 5 and aUStr6", sal_False, 5, 
          new OUString(aUStr2),new OUString(aUStr6)},
-        {"aUStr2 from 0 and aUStr1", sal_True, 0,
+        {"aUStr2 from 0 and aUStr1", sal_True, 0, 
          new OUString(aUStr2),new OUString(aUStr1)},
-        {"aUStr1 from 16 and null", sal_True, 16,
+        {"aUStr1 from 16 and null", sal_True, 16, 
          new OUString(aUStr1),
          new OUString( "",
                        0,
@@ -675,7 +675,7 @@ static sal_Bool SAL_CALL test_rtl_OUString_match_002(
                        kConvertFlagsOStringToOUString
                        )
         },
-        {"aUStr1 from 5 and null", sal_True, 5,
+        {"aUStr1 from 5 and null", sal_True, 5, 
          new OUString(aUStr1),
          new OUString( "",
                        0,
@@ -683,11 +683,11 @@ static sal_Bool SAL_CALL test_rtl_OUString_match_002(
                        kConvertFlagsOStringToOUString
                        )
         },
-        {"aUStr2 from -1 and aUStr1", sal_False, -1,
+        {"aUStr2 from -1 and aUStr1", sal_False, -1, 
          new OUString(aUStr2),new OUString(aUStr1)},
-        {"aUStr5 from 2 and aUStr4", sal_False, 2,
+        {"aUStr5 from 2 and aUStr4", sal_False, 2, 
          new OUString(aUStr5),new OUString(aUStr4)},
-        {"aUStr2 from 18 and aUStr1", sal_False, 18,
+        {"aUStr2 from 18 and aUStr1", sal_False, 18, 
          new OUString(aUStr2),new OUString(aUStr1)}
     };
 
@@ -697,7 +697,7 @@ static sal_Bool SAL_CALL test_rtl_OUString_match_002(
     for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
     {
         sal_Bool lastRes = ( arrTestCase[i].input1->match
-                             (*(arrTestCase[i].input2),arrTestCase[i].fromIndex) ==
+                             (*(arrTestCase[i].input2),arrTestCase[i].fromIndex) == 
                              arrTestCase[i].expVal );
 
         c_rtl_tres_state
@@ -705,9 +705,9 @@ static sal_Bool SAL_CALL test_rtl_OUString_match_002(
                 hRtlTestResult,
                 lastRes,
                 arrTestCase[i].comments,
-                createName( pMeth,
-                            "match(const OUString & str,sal_Int32 fromIndex = 0)", i  )
-
+                createName( pMeth, 
+                            "match(const OUString & str,sal_Int32 fromIndex = 0)", i  )  
+                                
                 );
 
         res &= lastRes;
@@ -723,7 +723,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_match(
     res &= test_rtl_OUString_match_002(hRtlTestResult);
     c_rtl_tres_state_end( hRtlTestResult, "match");
 //    return (res);
-}
+}                    
 
 //------------------------------------------------------------------------
 // testing the operator +=
@@ -737,26 +737,26 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_op_eq(
 
     typedef struct TestCase
     {
-        sal_Char*       comments;
+        sal_Char*		comments;
            OUString*        input1;
         OUString*        input2;
-        ~TestCase()     { delete input1; delete input2;}
+        ~TestCase() 	{ delete input1; delete input2;}
     } TestCase;
 
     TestCase arrTestCase[]={
         {"null and Ustr1", new OUString, new OUString(aUStr1)},
-        {"Ustr2 and Ustr1", new OUString(aUStr2),
+        {"Ustr2 and Ustr1", new OUString(aUStr2), 
          new OUString(aUStr1)},
-        {""" and Ustr1 from bit charactor buffer",
+        {""" and Ustr1 from bit charactor buffer",  
          new OUString(aUStr1),
          new OUString( "",
                        0,
                        kEncodingRTLTextUSASCII,
                        kConvertFlagsOStringToOUString
                        )},
-        {"Ustr1 and Ustr2 from value and length",
-         new OUString( aUStr2, kTestStr2Len ),
-         new OUString(aUStr1)}
+        {"Ustr1 and Ustr2 from value and length",   
+         new OUString( aUStr2, kTestStr2Len ), 
+         new OUString(aUStr1)} 
     };
 
 
@@ -794,11 +794,11 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_op_peq(
 
     typedef struct TestCase
     {
-        sal_Char*       comments;
-        OUString*       expVal;
+        sal_Char*		comments;
+        OUString*		expVal;
            OUString*        input1;
         OUString*        input2;
-        ~TestCase()     { delete input1; delete input2;}
+        ~TestCase() 	{ delete input1; delete input2;}
     } TestCase;
 
     TestCase arrTestCase[]={
@@ -827,7 +827,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_op_peq(
            )*/
          new OUString(),
          new OUString(aUStr1)},
-        {"Ustr1PlusUStr6 = Ustr1 += Ustr6",
+        {"Ustr1PlusUStr6 = Ustr1 += Ustr6",  
          new OUString(aUStr1PlusUStr6), new OUString(aUStr1),
          new OUString(aUStr6)},
     };
@@ -837,9 +837,9 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_op_peq(
     sal_uInt32 i;
 
     for (i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
-    {
+    {   
         *(arrTestCase[i].input1) += *(arrTestCase[i].input2);
-        sal_Bool lastRes = (*(arrTestCase[i].expVal) ==
+        sal_Bool lastRes = (*(arrTestCase[i].expVal) == 
                             *(arrTestCase[i].input1));
         c_rtl_tres_state
             (
@@ -871,23 +871,23 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_csuc(
     sal_Int32 tmpLen=(sal_Int32) kTestStr1Len;
     // sal_Int32 cmpLen = 0;
 
-    rtl_string2UString( &tmpUstring, tmpStr,  tmpLen,
+    rtl_string2UString( &tmpUstring, tmpStr,  tmpLen,                                
                         osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
     OSL_ASSERT(tmpUstring != NULL);
 
 
     typedef struct TestCase
     {
-        sal_Char*               comments;
-        const sal_Unicode*      expVal;
-        sal_Int32               cmpLen;
+        sal_Char*				comments;
+        const sal_Unicode*		expVal;
+        sal_Int32				cmpLen;
         OUString*                input1;
         ~TestCase() {  delete input1;}
      } TestCase;
 
     TestCase arrTestCase[] =
     {
-          {"test normal ustring",(*tmpUstring).buffer,kTestStr1Len,
+          {"test normal ustring",(*tmpUstring).buffer,kTestStr1Len, 
          new OUString(aUStr1)},
         {"test empty ustring",&tmpUC, 1, new OUString()}
     };
@@ -928,23 +928,23 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_getStr(
     sal_Int32 tmpLen=(sal_Int32) kTestStr1Len;
     // sal_Int32 cmpLen = 0;
 
-    rtl_string2UString( &tmpUstring, tmpStr,  tmpLen,
+    rtl_string2UString( &tmpUstring, tmpStr,  tmpLen,                                
                         osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
     OSL_ASSERT(tmpUstring != NULL);
 
 
     typedef struct TestCase
     {
-        sal_Char*               comments;
-        const sal_Unicode*      expVal;
-        sal_Int32               cmpLen;
+        sal_Char*				comments;
+        const sal_Unicode*		expVal;
+        sal_Int32				cmpLen;
         OUString*                input1;
         ~TestCase() {  delete input1;}
      } TestCase;
 
     TestCase arrTestCase[] =
     {
-          {"test normal ustring",(*tmpUstring).buffer,kTestStr1Len,
+          {"test normal ustring",(*tmpUstring).buffer,kTestStr1Len, 
          new OUString(aUStr1)},
         {"test empty ustring",&tmpUC, 1, new OUString()}
     };
@@ -982,43 +982,43 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_reverseCompareTo(
 
     typedef struct TestCase
     {
-        sal_Char*       comments;
+        sal_Char*		comments;
         sal_Int32         expVal;
         OUString*        input1;
         OUString*        input2;
-        ~TestCase()     { delete input1;delete input2;}
+        ~TestCase()		{ delete input1;delete input2;}
     } TestCase;
 
     TestCase arrTestCase[]={
 
-        {"simple compare, str1 to str5",-1,new OUString(aUStr1),
+        {"simple compare, str1 to str5",-1,new OUString(aUStr1), 
          new OUString(aUStr5)
         },
-        {"simple compare, str2 to str5",1,new OUString(aUStr2),
+        {"simple compare, str2 to str5",1,new OUString(aUStr2), 
          new OUString(aUStr5)
         },
-        {"simple compare, str1 to str9",-1,new OUString(aUStr1),
+        {"simple compare, str1 to str9",-1,new OUString(aUStr1), 
          new OUString(aUStr9)
         },
-        {"simple compare, str4 to str5",-1,new OUString(aUStr4),
+        {"simple compare, str4 to str5",-1,new OUString(aUStr4), 
          new OUString(aUStr5)
         },
-        {"simple compare, str5 to str1",+1,new OUString(aUStr5),
+        {"simple compare, str5 to str1",+1,new OUString(aUStr5), 
          new OUString(aUStr1)
         },
-        {"simple compare, str2 to str1",+1,new OUString(aUStr2),
+        {"simple compare, str2 to str1",+1,new OUString(aUStr2), 
          new OUString(aUStr1)
         },
-        {"simple compare, str1 to str1",0,new OUString(aUStr1),
+        {"simple compare, str1 to str1",0,new OUString(aUStr1), 
          new OUString(aUStr1)
         },
-        {"simple compare, nullString to nullString",0,new OUString(),
+        {"simple compare, nullString to nullString",0,new OUString(), 
          new OUString()
         },
-        {"simple compare, nullString to str2",-1,new OUString(),
+        {"simple compare, nullString to str2",-1,new OUString(), 
          new OUString(aUStr2)
         },
-        {"simple compare, str1 to nullString",+1,new OUString(aUStr1),
+        {"simple compare, str1 to nullString",+1,new OUString(aUStr1), 
          new OUString()
         }
     };
@@ -1033,7 +1033,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_reverseCompareTo(
         cmpRes = ( cmpRes == 0 ) ? 0 : ( cmpRes > 0 ) ? +1 : -1 ;
         sal_Bool lastRes = ( cmpRes == arrTestCase[i].expVal);
 
-
+    
         c_rtl_tres_state
             (
                 hRtlTestResult,
@@ -1060,16 +1060,16 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_equalsAscii(
 
     const sal_Char *tmpAstr1="Sun Microsystems\0";
     const sal_Char *tmpAstr2="\0";
-
-
+   
+    
 
     typedef struct TestCase
     {
-        sal_Char*        comments;
-        sal_Bool         expVal;
+        sal_Char*		 comments;
+        sal_Bool		 expVal;
            OUString*         input1;
         const sal_Char*    input2;
-        ~TestCase()     { delete input1;}
+        ~TestCase() 	{ delete input1;}
     } TestCase;
 
     TestCase arrTestCase[]={
@@ -1082,7 +1082,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_equalsAscii(
                                                     kTestStr2Len,
                                                     kEncodingRTLTextUSASCII,
                                                     kConvertFlagsOStringToOUString
-                                                    ), tmpAstr1},
+                                                    ), tmpAstr1},	
         {"null with str1  ", sal_False, new OUString(), tmpAstr1},
         {"null with '' ", sal_True, new OUString(), tmpAstr2},
         {"'' with ''", sal_True, new OUString( "",
@@ -1091,7 +1091,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_equalsAscii(
                                                kConvertFlagsOStringToOUString
                                                ),
          tmpAstr2}
-
+           
     };
 
 
@@ -1099,9 +1099,9 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_equalsAscii(
     sal_uInt32 i;
 
     for (i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
-    {
-
-        sal_Bool lastRes = (arrTestCase[i].expVal ==
+    {   
+    
+        sal_Bool lastRes = (arrTestCase[i].expVal == 
                             arrTestCase[i].input1->equalsAscii(arrTestCase[i].input2));
         c_rtl_tres_state
             (
@@ -1120,8 +1120,8 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_equalsAscii(
 
 
 //------------------------------------------------------------------------
-//       testing the method sal_Bool equalsAsciiL(
-//                          const sal_Char* asciiStr, sal_Int32 asciiStrLength )
+//       testing the method sal_Bool equalsAsciiL( 
+//							const sal_Char* asciiStr, sal_Int32 asciiStrLength )
 //------------------------------------------------------------------------
 extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_equalsAsciiL(
     hTestResult hRtlTestResult)
@@ -1133,17 +1133,17 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_equalsAsciiL(
     const sal_Char *tmpAstr1="Sun Microsystems\0";
     const sal_Char *tmpAstr2="\0";
     const sal_Char *tmpAstr3="Sun Microsystems Java Technology\0";
-
-
+   
+    
 
     typedef struct TestCase
     {
-        sal_Char*        comments;
-        sal_Bool         expVal;
+        sal_Char*		 comments;
+        sal_Bool		 expVal;
            OUString*         input1;
         const sal_Char*    input2;
         sal_Int32          cmpLen;
-        ~TestCase()     { delete input1;}
+        ~TestCase() 	{ delete input1;}
     } TestCase;
 
     TestCase arrTestCase[]={
@@ -1156,12 +1156,12 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_equalsAsciiL(
                                                            kTestStr2Len,
                                                            kEncodingRTLTextUSASCII,
                                                            kConvertFlagsOStringToOUString
-                                                           ), tmpAstr1, kTestStr1Len},
+                                                           ), tmpAstr1, kTestStr1Len},	
         {"str1 with str2,str1Len", sal_True,new OUString( kTestStr1,
                                                           kTestStr1Len,
                                                           kEncodingRTLTextUSASCII,
                                                           kConvertFlagsOStringToOUString
-                                                          ), tmpAstr3, kTestStr1Len},
+                                                          ), tmpAstr3, kTestStr1Len},                    
         {"null with str1,1  ", sal_False, new OUString(), tmpAstr1, 1},
         {"null with '',1 ", sal_False, new OUString(), tmpAstr2, 1},
         {"'' with '', 1", sal_False, new OUString( "",
@@ -1170,7 +1170,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_equalsAsciiL(
                                                    kConvertFlagsOStringToOUString
                                                    ),
          tmpAstr2, 1}
-
+           
     };
 
 
@@ -1178,9 +1178,9 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_equalsAsciiL(
     sal_uInt32 i;
 
     for (i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
-    {
-
-        sal_Bool lastRes = (arrTestCase[i].expVal ==
+    {   
+        
+        sal_Bool lastRes = (arrTestCase[i].expVal == 
                             arrTestCase[i].input1->equalsAsciiL(arrTestCase[i].input2,
                                                                 arrTestCase[i].cmpLen)
                             );
@@ -1212,15 +1212,15 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_compareToAscii(
     const sal_Char *tmpAstr2="\0";
     const sal_Char *tmpAstr3="sun microsystems java technology\0";
     const sal_Char *tmpAstr4="Sun Microsystems Java Technology\0";
-
+    
 
     typedef struct TestCase
     {
-        sal_Char*        comments;
-        sal_Int32        expVal;
+        sal_Char*		 comments;
+        sal_Int32		 expVal;
            OUString*         input1;
         const sal_Char*    input2;
-        ~TestCase()     { delete input1;}
+        ~TestCase() 	{ delete input1;}
     } TestCase;
 
     TestCase arrTestCase[]={
@@ -1233,7 +1233,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_compareToAscii(
                                             kTestStr1Len,
                                             kEncodingRTLTextUSASCII,
                                             kConvertFlagsOStringToOUString
-                                            ), tmpAstr2},
+                                            ), tmpAstr2},	
         {"null with str1  ", -83 , new OUString(), tmpAstr1},
         {"null with '' ", 0, new OUString(), tmpAstr2},
         {"str1 with str9", -32, new OUString( kTestStr1,
@@ -1248,7 +1248,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_compareToAscii(
                                               kConvertFlagsOStringToOUString
                                               ),
          tmpAstr4}
-
+           
     };
 
 
@@ -1256,10 +1256,10 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_compareToAscii(
     sal_uInt32 i;
 
     for (i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
-    {
-        sal_Bool lastRes = (arrTestCase[i].expVal ==
+    {   
+        sal_Bool lastRes = (arrTestCase[i].expVal == 
                             arrTestCase[i].input1->compareToAscii(arrTestCase[i].input2));
-
+        
         c_rtl_tres_state
             (
                 hRtlTestResult,
@@ -1290,7 +1290,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_valueOf_sal_Bool(
         sal_Char*       comments;
         OUString*       expVal;
         sal_Bool        input1;
-
+        
         ~TestCase()     {delete expVal;}
     }TestCase;
 
@@ -1326,7 +1326,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_valueOf_sal_Bool(
 
         res &= lastRes;
     }
-    c_rtl_tres_state_end( hRtlTestResult, "Bool");
+    c_rtl_tres_state_end( hRtlTestResult, "Bool");   
 //    return(res);
 }
 
@@ -1349,7 +1349,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_valueOf_sal_Unicode(
         sal_Char*       comments;
         OUString*       expVal;
         sal_Unicode     input1;
-
+        
         ~TestCase()     {delete expVal;}
     }TestCase;
 
@@ -1371,7 +1371,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_valueOf_sal_Unicode(
          new OUString(&tmpchar5,1),tmpchar5
         }
     };
-
+    
     sal_Bool    res=sal_True;
     sal_uInt32   i;
 
@@ -1379,7 +1379,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_valueOf_sal_Unicode(
     {
         sal_Bool lastRes=(*(arrTestCase[i].expVal)==
                           OUString::valueOf(arrTestCase[i].input1));
-
+       
         c_rtl_tres_state(hRtlTestResult,
                          lastRes,
                          arrTestCase[i].comments,
@@ -1388,7 +1388,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_valueOf_sal_Unicode(
 
         res &= lastRes;
     }
-    c_rtl_tres_state_end( hRtlTestResult, "Unicode");
+    c_rtl_tres_state_end( hRtlTestResult, "Unicode");   
 //    return(res);
 }
 
@@ -1421,7 +1421,7 @@ sal_Bool test_valueOf( const char** resArray, int n, sal_Int16 radix,
     for (i = 0; i < n; i++)
     {
         ::rtl::OUString aStr1;
-
+        
         OSL_ENSURE( i < 50, "ERROR: leave aUchar bound");
 
 //        AStringToUStringCopy(aUchar,resArray[i]);
@@ -1448,7 +1448,7 @@ sal_Bool test_valueOf( const char** resArray, int n, sal_Int16 radix,
                     aStr2 = aStr3;
                     aStr2 += aStr4;
                 }
-
+                                 
             }
             aStr1 = ::rtl::OUString::valueOf((T)inArray[i], radix);
         }
@@ -1554,7 +1554,7 @@ sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int32_Bounderies(
         (
             hRtlTestResult,
             test_valueOf_Int32((const char**)kBinaryMaxNumsStr,
-                               kInt32MaxNumsCount, kRadixBinary,
+                               kInt32MaxNumsCount, kRadixBinary, 
                                hRtlTestResult, kInt32MaxNums),
             "kRadixBinary",
             "valueOf(salInt32, radix 2) Bounderies"
@@ -1564,7 +1564,7 @@ sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int32_Bounderies(
         (
             hRtlTestResult,
             test_valueOf_Int32((const char**)kOctolMaxNumsStr,
-                               kInt32MaxNumsCount, kRadixOctol,
+                               kInt32MaxNumsCount, kRadixOctol, 
                                hRtlTestResult, kInt32MaxNums),
             "kRadixOctol",
             "valueOf(salInt32, radix 8) Bounderies"
@@ -1705,7 +1705,7 @@ sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int32_WrongRadix(
 //------------------------------------------------------------------------
 static sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int32_defaultParam(
     hTestResult hRtlTestResult )
-{
+{    
     sal_Char     methName[MAXBUFLENGTH];
     sal_Char*    pMeth = methName;
 
@@ -1741,7 +1741,7 @@ static sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int32_defaultParam(
          new OUString(newUChar4,10,kEncodingRTLTextUSASCII,
                       kConvertFlagsOStringToOUString)
         },
-        {"input Int32 -2147483648 and return OUString -2147483648",
+        {"input Int32 -2147483648 and return OUString -2147483648", 
          SAL_MIN_INT32 /* 2-2147483648 */,
          new OUString(newUChar5,11,kEncodingRTLTextUSASCII,
                       kConvertFlagsOStringToOUString)
@@ -1759,13 +1759,13 @@ static sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int32_defaultParam(
         c_rtl_tres_state(hRtlTestResult,
                          lastRes,
                          arrTestCase[i].comments,
-                         createName( pMeth,
+                         createName( pMeth, 
                                      "valueOf( sal_Int32 i, sal_Int16 radix = 10 )", i )
                          );
 
         res &= lastRes;
     }
-
+    
     return(res);
 
 }
@@ -2001,10 +2001,10 @@ sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int64_WrongRadix(
 //------------------------------------------------------------------------
 static sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int64_defaultParam(
     hTestResult hRtlTestResult )
-{
+{    
     sal_Char     methName[MAXBUFLENGTH];
     sal_Char*    pMeth = methName;
-
+    
     sal_Char*    newUChar1="15";
     sal_Char*    newUChar2="0";
     sal_Char*    newUChar3="-15";
@@ -2056,13 +2056,13 @@ static sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int64_defaultParam(
         c_rtl_tres_state(hRtlTestResult,
                          lastRes,
                          arrTestCase[i].comments,
-                         createName( pMeth,
+                         createName( pMeth, 
                                      "valueOf( sal_Int64 i, sal_Int16 radix = 10 )", i )
                          );
 
         res &= lastRes;
     }
-
+    
     return(res);
 
 }
@@ -2074,17 +2074,17 @@ static sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int64_defaultParam(
 // LLA: {
 // LLA:     sal_Char methName[MAXBUFLENGTH];
 // LLA:     sal_Char* pMeth =methName;
-// LLA:
+// LLA: 
 // LLA:     typedef struct TestCase
-// LLA:     {
+// LLA: 	{
 // LLA:         sal_Char*                    comments;
 // LLA:         float                         input1;
 // LLA:         OUString*                     expVal;
-// LLA:
+// LLA: 
 // LLA:         ~TestCase() {delete expVal;}
-// LLA:     } TestCase;
-// LLA:
-// LLA:     TestCase arrTestCase[] =
+// LLA: 	} TestCase;
+// LLA: 
+// LLA: 	TestCase arrTestCase[] =
 // LLA:     {
 // LLA:         { "3.0", 3.0, new OUString("3.0",3,kEncodingRTLTextUSASCII,
 // LLA:                                    kConvertFlagsOStringToOUString) },
@@ -2101,16 +2101,16 @@ static sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int64_defaultParam(
 // LLA:         { "3.0039062", 3.00390625f, new OUString("3.0039062",9,
 // LLA:                                                  kEncodingRTLTextUSASCII,kConvertFlagsOStringToOUString) }
 // LLA:     };
-// LLA:
+// LLA: 
 // LLA:     sal_Bool res = sal_True;
 // LLA:     sal_Int32 i;
-// LLA:
+// LLA: 
 // LLA:     for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
 // LLA:     {
 // LLA:         ::rtl::OUString aStr1;
 // LLA:         aStr1 = aStr1.valueOf( arrTestCase[i].input1 );
 // LLA:         sal_Bool lastRes = (arrTestCase[i].expVal->compareTo(aStr1) == 0);
-// LLA:
+// LLA: 
 // LLA:         c_rtl_tres_state
 // LLA:             (
 // LLA:                 hRtlTestResult,
@@ -2118,11 +2118,11 @@ static sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int64_defaultParam(
 // LLA:                 arrTestCase[i].comments,
 // LLA:                 createName( pMeth, "valueof_float", i)
 // LLA:                 );
-// LLA:
+// LLA: 
 // LLA:         res &= lastRes;
-// LLA:
+// LLA: 
 // LLA:     }
-// LLA:
+// LLA: 
 // LLA:     return ( res );
 // LLA: }
 
@@ -2134,17 +2134,17 @@ static sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int64_defaultParam(
 // LLA: {
 // LLA:     sal_Char methName[MAXBUFLENGTH];
 // LLA:     sal_Char* pMeth =methName;
-// LLA:
+// LLA: 
 // LLA:     typedef struct TestCase
-// LLA:     {
+// LLA: 	{
 // LLA:         sal_Char*                    comments;
 // LLA:         float                         input1;
 // LLA:         OUString*                     expVal;
-// LLA:
+// LLA: 
 // LLA:         ~TestCase() {delete expVal;}
-// LLA:     } TestCase;
-// LLA:
-// LLA:     TestCase arrTestCase[] =
+// LLA: 	} TestCase;
+// LLA: 
+// LLA: 	TestCase arrTestCase[] =
 // LLA:     {
 // LLA:         { "-3.0", -3.0, new OUString("-3.0",4,kEncodingRTLTextUSASCII,
 // LLA:                                      kConvertFlagsOStringToOUString) },
@@ -2161,16 +2161,16 @@ static sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int64_defaultParam(
 // LLA:         { "-3.0039062", -3.00390625f, new OUString("-3.0039062",10,
 // LLA:                                                    kEncodingRTLTextUSASCII,kConvertFlagsOStringToOUString) }
 // LLA:     };
-// LLA:
+// LLA: 
 // LLA:     sal_Bool res = sal_True;
 // LLA:     sal_Int32 i;
-// LLA:
+// LLA: 
 // LLA:     for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
 // LLA:     {
 // LLA:         ::rtl::OUString aStr1;
 // LLA:         aStr1 = aStr1.valueOf( arrTestCase[i].input1 );
 // LLA:         sal_Bool lastRes = (arrTestCase[i].expVal->compareTo(aStr1) == 0);
-// LLA:
+// LLA: 
 // LLA:         c_rtl_tres_state
 // LLA:             (
 // LLA:                 hRtlTestResult,
@@ -2178,11 +2178,11 @@ static sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int64_defaultParam(
 // LLA:                 arrTestCase[i].comments,
 // LLA:                 createName( pMeth, "valueof_negative float", i)
 // LLA:                 );
-// LLA:
+// LLA: 
 // LLA:         res &= lastRes;
-// LLA:
+// LLA: 
 // LLA:     }
-// LLA:
+// LLA: 
 // LLA:     return ( res );
 // LLA: }
 
@@ -2194,17 +2194,17 @@ static sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int64_defaultParam(
 // LLA: {
 // LLA:     sal_Char methName[MAXBUFLENGTH];
 // LLA:     sal_Char* pMeth =methName;
-// LLA:
+// LLA: 
 // LLA:     typedef struct TestCase
 // LLA:     {
 // LLA:         sal_Char*       comments;
 // LLA:         double          input1;
 // LLA:         OUString*       expVal;
-// LLA:
+// LLA: 
 // LLA:         ~TestCase() {delete expVal;}
 // LLA:     } TestCase;
-// LLA:
-// LLA:     TestCase arrTestCase[] =
+// LLA: 
+// LLA: 	TestCase arrTestCase[] =
 // LLA:     {
 // LLA:         {"3.0", 3.0, new OUString("3.0",3,kEncodingRTLTextUSASCII,
 // LLA:                                   kConvertFlagsOStringToOUString)},
@@ -2214,29 +2214,29 @@ static sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int64_defaultParam(
 // LLA:                                         kConvertFlagsOStringToOUString)},
 // LLA:         {"3.1415926535", 3.1415926535, new OUString("3.1415926535",12,
 // LLA:                                                     kEncodingRTLTextUSASCII,kConvertFlagsOStringToOUString)},
-// LLA:         {"3.1415926535897931", 3.141592653589793,
+// LLA:         {"3.1415926535897931", 3.141592653589793, 
 // LLA:          new OUString("3.1415926535897931",18,kEncodingRTLTextUSASCII,
 // LLA:                       kConvertFlagsOStringToOUString)},
-// LLA:         {"3.1415926535897931", 3.1415926535897932,
+// LLA:         {"3.1415926535897931", 3.1415926535897932, 
 // LLA:          new OUString("3.1415926535897931",18,kEncodingRTLTextUSASCII,
 // LLA:                       kConvertFlagsOStringToOUString)},
-// LLA:         {"3.1415926535897931", 3.14159265358979323,
+// LLA:         {"3.1415926535897931", 3.14159265358979323, 
 // LLA:          new OUString("3.1415926535897931",18,kEncodingRTLTextUSASCII,
 // LLA:                       kConvertFlagsOStringToOUString)},
 // LLA:         {"3.1415926535897931", 3.141592653589793238462643,
 // LLA:          new OUString("3.1415926535897931",18,kEncodingRTLTextUSASCII,
 // LLA:                       kConvertFlagsOStringToOUString)}
 // LLA:     };
-// LLA:
+// LLA: 
 // LLA:     sal_Bool res = sal_True;
 // LLA:     sal_Int32 i;
-// LLA:
+// LLA: 
 // LLA:     for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
 // LLA:     {
 // LLA:         ::rtl::OUString aStr1;
 // LLA:         aStr1 = aStr1.valueOf( arrTestCase[i].input1 );
 // LLA:         sal_Bool lastRes = (arrTestCase[i].expVal->compareTo(aStr1) == 0);
-// LLA:
+// LLA: 
 // LLA:         c_rtl_tres_state
 // LLA:             (
 // LLA:                 hRtlTestResult,
@@ -2244,11 +2244,11 @@ static sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int64_defaultParam(
 // LLA:                 arrTestCase[i].comments,
 // LLA:                 createName( pMeth, "valueof_double", i)
 // LLA:                 );
-// LLA:
+// LLA: 
 // LLA:         res &= lastRes;
-// LLA:
+// LLA: 
 // LLA:     }
-// LLA:
+// LLA: 
 // LLA:     return ( res );
 // LLA: }
 
@@ -2261,17 +2261,17 @@ static sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int64_defaultParam(
 // LLA: {
 // LLA:     sal_Char methName[MAXBUFLENGTH];
 // LLA:     sal_Char* pMeth =methName;
-// LLA:
+// LLA: 
 // LLA:     typedef struct TestCase
-// LLA:     {
+// LLA: 	{
 // LLA:         sal_Char*        comments;
 // LLA:         double           input1;
 // LLA:         OUString*        expVal;
-// LLA:
+// LLA: 
 // LLA:         ~TestCase() {delete expVal;}
-// LLA:     } TestCase;
-// LLA:
-// LLA:     TestCase arrTestCase[] =
+// LLA: 	} TestCase;
+// LLA: 
+// LLA: 	TestCase arrTestCase[] =
 // LLA:     {
 // LLA:         {"-3.0", -3.0, new OUString("-3.0",4,kEncodingRTLTextUSASCII,
 // LLA:                                     kConvertFlagsOStringToOUString)},
@@ -2279,32 +2279,32 @@ static sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int64_defaultParam(
 // LLA:                                     kConvertFlagsOStringToOUString)},
 // LLA:         {"-3.0625", -3.0625, new OUString("-3.0625",7,kEncodingRTLTextUSASCII,
 // LLA:                                           kConvertFlagsOStringToOUString)},
-// LLA:         {"-3.1415926535", -3.1415926535,
+// LLA:         {"-3.1415926535", -3.1415926535, 
 // LLA:          new OUString("-3.1415926535",13,kEncodingRTLTextUSASCII,
 // LLA:                       kConvertFlagsOStringToOUString)},
-// LLA:         {"-3.1415926535897931", -3.141592653589793,
+// LLA:         {"-3.1415926535897931", -3.141592653589793, 
 // LLA:          new OUString("-3.1415926535897931",19,kEncodingRTLTextUSASCII,
 // LLA:                       kConvertFlagsOStringToOUString)},
-// LLA:         {"-3.1415926535897931", -3.1415926535897932,
+// LLA:         {"-3.1415926535897931", -3.1415926535897932, 
 // LLA:          new OUString("-3.1415926535897931",19,kEncodingRTLTextUSASCII,
 // LLA:                       kConvertFlagsOStringToOUString)},
-// LLA:         {"-3.1415926535897931", -3.14159265358979323,
+// LLA:         {"-3.1415926535897931", -3.14159265358979323, 
 // LLA:          new OUString("-3.1415926535897931",19,kEncodingRTLTextUSASCII,
 // LLA:                       kConvertFlagsOStringToOUString)},
-// LLA:         {"-3.1415926535897931", -3.141592653589793238462643,
+// LLA:         {"-3.1415926535897931", -3.141592653589793238462643, 
 // LLA:          new OUString("-3.1415926535897931",19,kEncodingRTLTextUSASCII,
 // LLA:                       kConvertFlagsOStringToOUString)}
 // LLA:     };
-// LLA:
+// LLA: 
 // LLA:     sal_Bool res = sal_True;
 // LLA:     sal_Int32 i;
-// LLA:
+// LLA: 
 // LLA:     for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
 // LLA:     {
 // LLA:         ::rtl::OUString aStr1;
 // LLA:         aStr1 = aStr1.valueOf( arrTestCase[i].input1 );
 // LLA:         sal_Bool lastRes = (arrTestCase[i].expVal->compareTo(aStr1) == 0);
-// LLA:
+// LLA: 
 // LLA:         c_rtl_tres_state
 // LLA:             (
 // LLA:                 hRtlTestResult,
@@ -2312,11 +2312,11 @@ static sal_Bool SAL_CALL test_rtl_OUString_valueOf_Int64_defaultParam(
 // LLA:                 arrTestCase[i].comments,
 // LLA:                 createName( pMeth, "valueof_nagative double", i)
 // LLA:                 );
-// LLA:
+// LLA: 
 // LLA:         res &= lastRes;
-// LLA:
+// LLA: 
 // LLA:     }
-// LLA:
+// LLA: 
 // LLA:     return ( res );
 // LLA: }
 
@@ -2348,7 +2348,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_valueOf(
 //    return ( bTState );
 }
 //------------------------------------------------------------------------
-//    this is my testing code
+//    this is my testing code 
 //    testing the method createFromAscii( const sal_Char * value )
 //------------------------------------------------------------------------
 
@@ -2358,8 +2358,8 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_createFromAscii(
     c_rtl_tres_state_start( hRtlTestResult, "createFromAscii");
     sal_Char     methName[MAXBUFLENGTH];
     sal_Char*    pMeth = methName;
-
-
+    
+    
     typedef struct TestCase
     {
         sal_Char*       comments;
@@ -2371,7 +2371,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_createFromAscii(
 
     TestCase arrTestCase[]=
     {
-
+                            
         {   "create OUString from sal_Char" ,kTestStr1,
             new OUString(kTestStr1,kTestStr1Len,kEncodingRTLTextUSASCII,
                          kConvertFlagsOStringToOUString)
@@ -2385,18 +2385,18 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_createFromAscii(
             new OUString("",0,kEncodingRTLTextUSASCII,
                          kConvertFlagsOStringToOUString)
         }
-
+       
     };
-
+    
     sal_Bool    res;
     sal_uInt32   i;
-
+ 
     for(i=0;i<(sizeof(arrTestCase))/(sizeof(TestCase));i++)
     {
         sal_Bool lastRes=(*(arrTestCase[i].expVal)==
                           OUString::createFromAscii(arrTestCase[i].input1));
-
-
+        
+        
     {
         c_rtl_tres_state(hRtlTestResult,
                          lastRes,
@@ -2404,11 +2404,11 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_createFromAscii(
                          createName( pMeth, "createFromAscii", i )
                          );
     }
-
+        
     res&=lastRes;
 
     }
-
+    
     c_rtl_tres_state_end( hRtlTestResult, "createFromAscii");
 //    return(res);
 }
@@ -2425,28 +2425,28 @@ sal_Bool test_index( const T* input1, int num,const sal_Int32* input2,
     sal_Char*   pMeth=methName;
     sal_Int32   i;
     sal_Bool    lastRes=sal_False;
-
+    
     for(i=0;i<num;i++)
     {
         OUString str(aUStr2);
-
+        
         if(base==0)
         {
             lastRes=(str.indexOf(input1[i])==expVal[i]);
             meth="indexOf_001";
         }
         if(base==1)
-        {
+        {	
             lastRes=(str.indexOf(input1[i],input2[i])==expVal[i]);
             meth="indexOf_002";
         }
-// LLA:         if(base==2)
-// LLA:         {
+// LLA: 		if(base==2)
+// LLA: 		{
 // LLA:             lastRes=(str.lastIndexOf(input1[i])==expVal[i]);
 // LLA:             meth="lastIndexOf_001(sal_Unicode)";
 // LLA:         }
-// LLA:         if(base==3)
-// LLA:         {
+// LLA: 		if(base==3)
+// LLA: 		{
 // LLA: /*
 // LLA:             OUString s4(&input1[i]);
 // LLA:             rtl::OString sStr;
@@ -2455,11 +2455,11 @@ sal_Bool test_index( const T* input1, int num,const sal_Int32* input2,
 // LLA:             rtl::OString sInput1;
 // LLA:             sInput1 <<= s4; // rtl::OUString((sal_Unicode*)input1[i]);
 // LLA:             t_print("%d = lastIndexOf(\"%s\", %d) =? %d\n", str.lastIndexOf(input1[i], input2[i]), sInput1.getStr(), input2[i], expVal[i]);
-// LLA: */
+// LLA: */            
 // LLA:             lastRes=(str.lastIndexOf(input1[i],input2[i])==expVal[i]);
 // LLA:             meth="lastIndexOf_002(sal_Unicode , sal_Int32 )";
-// LLA:         }
-
+// LLA:         }	
+            
         c_rtl_tres_state
             (
                 hRtlTestResult,
@@ -2483,11 +2483,11 @@ sal_Bool test_indexStr( const T** input1, int num,const sal_Int32* input2,
     sal_Char*   pMeth=methName;
     sal_Int32   i;
     sal_Bool    lastRes=sal_False;
-
+    
     for(i=0;i<num;i++)
     {
         OUString str(aUStr2);
-
+        
 
         if(base==0)
         {
@@ -2496,32 +2496,32 @@ sal_Bool test_indexStr( const T** input1, int num,const sal_Int32* input2,
             meth="indexOf_003";
         }
         if(base==1)
-        {
+        {	
             OUString s2(input1[i]);
             lastRes=(str.indexOf(s2,input2[i])==expVal[i]);
             meth="indexOf_004";
         }
-// LLA:         if(base==2)
-// LLA:         {
+// LLA: 		if(base==2)
+// LLA: 		{
 // LLA:             OUString s3(input1[i]);
 // LLA:             lastRes=(str.lastIndexOf(s3)==expVal[i]);
 // LLA:             meth="lastIndexOf_003(const OUString)";
 // LLA:         }
-// LLA:         if(base==3)
-// LLA:         {
+// LLA: 		if(base==3)
+// LLA: 		{
 // LLA:             OUString s4(input1[i]);
-// LLA:
+// LLA: 
 // LLA:             rtl::OString sStr;
 // LLA:             sStr <<= str;
 // LLA:             t_print("str = \"%s\"\n", sStr.getStr());
 // LLA:             rtl::OString sInput1;
 // LLA:             sInput1 <<= s4; // rtl::OUString((sal_Unicode*)input1[i]);
 // LLA:             t_print("%d = lastIndexOf(\"%s\", %d) =? %d\n", str.lastIndexOf(input1[i], input2[i]), sInput1.getStr(), input2[i], expVal[i]);
-// LLA:
+// LLA:             
 // LLA:             lastRes=(str.lastIndexOf(s4,input2[i])==expVal[i]);
 // LLA:             meth="lastIndexOf_004(const OUString,sal_Int32)";
-// LLA:         }
-
+// LLA:         }	
+            
         c_rtl_tres_state
             (
                 hRtlTestResult,
@@ -2542,7 +2542,7 @@ sal_Bool SAL_CALL test_rtl_OUString_indexOf_001(
     hTestResult hRtlTestResult )
 {
     sal_Bool bRes=sal_False;
-
+    
     bRes=c_rtl_tres_state
         (
               hRtlTestResult,
@@ -2552,7 +2552,7 @@ sal_Bool SAL_CALL test_rtl_OUString_indexOf_001(
               "index",
               "indexDefault(sal_Unicode ch, sal_Int32 fromIndex = 0)"
               );
-
+              
     return ( bRes );
 }
 //------------------------------------------------------------------------
@@ -2562,7 +2562,7 @@ sal_Bool SAL_CALL test_rtl_OUString_indexOf_002(
     hTestResult hRtlTestResult )
 {
     sal_Bool bRes=sal_False;
-
+    
     bRes=c_rtl_tres_state
         (
               hRtlTestResult,
@@ -2572,9 +2572,9 @@ sal_Bool SAL_CALL test_rtl_OUString_indexOf_002(
               "index",
               "indexNormal(sal_Unicode ch, sal_Int32 fromIndex)"
               );
-
+              
     return ( bRes );
-}
+}		
 //------------------------------------------------------------------------
 // testing the method indexOf(  OUString ch, sal_Int32 fromIndex = 0 )
 //------------------------------------------------------------------------
@@ -2582,7 +2582,7 @@ sal_Bool SAL_CALL test_rtl_OUString_indexOf_003(
     hTestResult hRtlTestResult )
 {
     sal_Bool bRes=sal_False;
-
+    
     bRes=c_rtl_tres_state
         (
               hRtlTestResult,
@@ -2592,7 +2592,7 @@ sal_Bool SAL_CALL test_rtl_OUString_indexOf_003(
               "index",
               "indexDefault(OUString ch, sal_Int32 fromIndex = 0)"
               );
-
+              
     return ( bRes );
 }
 //------------------------------------------------------------------------
@@ -2602,7 +2602,7 @@ sal_Bool SAL_CALL test_rtl_OUString_indexOf_004(
     hTestResult hRtlTestResult )
 {
     sal_Bool bRes=sal_False;
-
+    
     bRes=c_rtl_tres_state
         (
               hRtlTestResult,
@@ -2612,27 +2612,27 @@ sal_Bool SAL_CALL test_rtl_OUString_indexOf_004(
               "indexOf",
               "indexOf(OUString ch, sal_Int32 fromIndex)"
               );
-
+              
     return ( bRes );
-}
+}		
 // LLA: //------------------------------------------------------------------------
 // LLA: // testing the method lastIndexOf( sal_Unicode ch )
 // LLA: //------------------------------------------------------------------------
 // LLA: sal_Bool SAL_CALL test_rtl_OUString_lastIndexOf_001(
 // LLA:     hTestResult hRtlTestResult )
 // LLA: {
-// LLA:     sal_Bool bRes=sal_False;
-// LLA:
-// LLA:     bRes=c_rtl_tres_state
+// LLA: 	sal_Bool bRes=sal_False;
+// LLA: 	
+// LLA: 	bRes=c_rtl_tres_state
 // LLA:         (
-// LLA:             hRtlTestResult,
-// LLA:             test_index<sal_Unicode>((const sal_Unicode*)input1lastDefault,
+// LLA: 	      	hRtlTestResult,
+// LLA: 	      	test_index<sal_Unicode>((const sal_Unicode*)input1lastDefault,
 // LLA:                                     nlastDefaultCount,input2lastDefault,
 // LLA:                                     expVallastDefault,2,hRtlTestResult),
-// LLA:             "lastIndex",
-// LLA:             "lastIndexDefault(sal_Unicode ch)"
-// LLA:             );
-// LLA:
+// LLA: 	      	"lastIndex",
+// LLA: 	      	"lastIndexDefault(sal_Unicode ch)"
+// LLA: 	      	);
+// LLA: 	      	
 // LLA:     return ( bRes );
 // LLA: }
 // LLA: //------------------------------------------------------------------------
@@ -2641,18 +2641,18 @@ sal_Bool SAL_CALL test_rtl_OUString_indexOf_004(
 // LLA: sal_Bool SAL_CALL test_rtl_OUString_lastIndexOf_002(
 // LLA:     hTestResult hRtlTestResult )
 // LLA: {
-// LLA:     sal_Bool bRes=sal_False;
-// LLA:
-// LLA:     bRes=c_rtl_tres_state
+// LLA: 	sal_Bool bRes=sal_False;
+// LLA: 	
+// LLA: 	bRes=c_rtl_tres_state
 // LLA:         (
-// LLA:             hRtlTestResult,
-// LLA:             test_index<sal_Unicode>((const sal_Unicode*)input1lastNormal,
+// LLA: 	      	hRtlTestResult,
+// LLA: 	      	test_index<sal_Unicode>((const sal_Unicode*)input1lastNormal,
 // LLA:                                     nlastNormalCount,input2lastNormal,
 // LLA:                                     expVallastNormal,3,hRtlTestResult),
-// LLA:             "lastIndex",
-// LLA:             "lastIndexNormal(sal_Unicode ch, sal_Int32 fromIndex)"
-// LLA:             );
-// LLA:
+// LLA: 	      	"lastIndex",
+// LLA: 	      	"lastIndexNormal(sal_Unicode ch, sal_Int32 fromIndex)"
+// LLA: 	      	);
+// LLA: 	      	
 // LLA:     return ( bRes );
 // LLA: }
 // LLA: //------------------------------------------------------------------------
@@ -2661,18 +2661,18 @@ sal_Bool SAL_CALL test_rtl_OUString_indexOf_004(
 // LLA: sal_Bool SAL_CALL test_rtl_OUString_lastIndexOf_003(
 // LLA:     hTestResult hRtlTestResult )
 // LLA: {
-// LLA:     sal_Bool bRes=sal_False;
-// LLA:
-// LLA:     bRes=c_rtl_tres_state
+// LLA: 	sal_Bool bRes=sal_False;
+// LLA: 	
+// LLA: 	bRes=c_rtl_tres_state
 // LLA:         (
-// LLA:             hRtlTestResult,
-// LLA:             test_indexStr<sal_Unicode>((const sal_Unicode**)input1StrLastDefault,
+// LLA: 	      	hRtlTestResult,
+// LLA: 	      	test_indexStr<sal_Unicode>((const sal_Unicode**)input1StrLastDefault,
 // LLA:                                        nStrLastDefaultCount,input2StrLastDefault,
 // LLA:                                        expValStrLastDefault,2,hRtlTestResult),
-// LLA:             "lastIndexOf",
-// LLA:             "lastIndexOf(OUString ch)"
-// LLA:             );
-// LLA:
+// LLA: 	      	"lastIndexOf",
+// LLA: 	      	"lastIndexOf(OUString ch)"
+// LLA: 	      	);
+// LLA: 	      	
 // LLA:     return ( bRes );
 // LLA: }
 // LLA: //------------------------------------------------------------------------
@@ -2681,24 +2681,24 @@ sal_Bool SAL_CALL test_rtl_OUString_indexOf_004(
 // LLA: sal_Bool SAL_CALL test_rtl_OUString_lastIndexOf_004(
 // LLA:     hTestResult hRtlTestResult )
 // LLA: {
-// LLA:     sal_Bool bRes=sal_False;
-// LLA:
+// LLA: 	sal_Bool bRes=sal_False;
+// LLA: 	
 // LLA:     for (int i=0;i<nStrLastNormalCount;i++)
 // LLA:     {
 // LLA:         rtl::OUString aStr = rtl::OUString(input1StrLastNormal[i]);
 // LLA:         volatile int dummy = 0;
 // LLA:     }
-// LLA:
-// LLA:     bRes=c_rtl_tres_state
+// LLA:     
+// LLA: 	bRes=c_rtl_tres_state
 // LLA:         (
-// LLA:             hRtlTestResult,
-// LLA:             test_indexStr<sal_Unicode>((const sal_Unicode**)input1StrLastNormal,
+// LLA: 	      	hRtlTestResult,
+// LLA: 	      	test_indexStr<sal_Unicode>((const sal_Unicode**)input1StrLastNormal,
 // LLA:                                        nStrLastNormalCount,input2StrLastNormal,
 // LLA:                                        expValStrLastNormal,3,hRtlTestResult),
-// LLA:             "lastIndexOf",
-// LLA:             "lastIndexOf(OUString ch, sal_Int32 fromIndex)"
-// LLA:             );
-// LLA:
+// LLA: 	      	"lastIndexOf",
+// LLA: 	      	"lastIndexOf(OUString ch, sal_Int32 fromIndex)"
+// LLA: 	      	);
+// LLA: 	      	
 // LLA:     return ( bRes );
 // LLA: }
 //------------------------------------------------------------------------
@@ -2707,10 +2707,10 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_indexOf(
 {
     c_rtl_tres_state_start( hRtlTestResult, "indexOf");
     sal_Bool res = test_rtl_OUString_indexOf_001(hRtlTestResult);
-    res &= test_rtl_OUString_indexOf_002(hRtlTestResult);
+    res &= test_rtl_OUString_indexOf_002(hRtlTestResult);    
     res &= test_rtl_OUString_indexOf_003(hRtlTestResult);
     res &= test_rtl_OUString_indexOf_004(hRtlTestResult);
-    c_rtl_tres_state_end( hRtlTestResult, "indexOf");
+    c_rtl_tres_state_end( hRtlTestResult, "indexOf");   
 //    return ( res );
 }
 //------------------------------------------------------------------------
@@ -2757,7 +2757,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_concat(
         {"concatenates two empty ustrings",new OUString("",0,
                                                         kEncodingRTLTextUSASCII,kConvertFlagsOStringToOUString),
          new OUString("",0,
-                      kEncodingRTLTextUSASCII,kConvertFlagsOStringToOUString),
+                      kEncodingRTLTextUSASCII,kConvertFlagsOStringToOUString), 
          new OUString("",0,
                       kEncodingRTLTextUSASCII,kConvertFlagsOStringToOUString)},
         {"concatenates ustring constructed by default constructor",
@@ -2827,12 +2827,12 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_replaceAt(
         { "navigate index", new OUString(aUStr2), new OUString(aUStr22),
           new OUString(aUStr2), -64, 64 },
 
-        { "null ustring",
+        { "null ustring", 
           new OUString("",0,
                        kEncodingRTLTextUSASCII,kConvertFlagsOStringToOUString),
           new OUString(aUStr14),
           new OUString("",0,
-                       kEncodingRTLTextUSASCII,kConvertFlagsOStringToOUString),
+                       kEncodingRTLTextUSASCII,kConvertFlagsOStringToOUString), 
           0, kTestStr14Len }
     };
 
@@ -2894,7 +2894,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_replace(
         {"ustring must be empty", new OUString(),
          new OUString("",0,
                       kEncodingRTLTextUSASCII,kConvertFlagsOStringToOUString),83,23},
-        {"same ustring, no replace ", new OUString(aUStr22),
+        {"same ustring, no replace ", new OUString(aUStr22), 
          new OUString(aUStr22),42,56}
     };
 
@@ -2988,7 +2988,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_toAsciiLowerCase(
     }
     c_rtl_tres_state_end( hRtlTestResult, "toAsciiLowerCase");
 //    return ( res );
-}
+} 
 //------------------------------------------------------------------------
 // testing the method toAsciiUpperCase()
 //------------------------------------------------------------------------
@@ -3033,7 +3033,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_toAsciiUpperCase(
     {
         OUString str = arrTestCase[i].input1->toAsciiUpperCase();
         if(i<=5)
-        {
+        { 
             lastRes = (str == *arrTestCase[i].expVal);
 
             c_rtl_tres_state
@@ -3060,8 +3060,8 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_toAsciiUpperCase(
     c_rtl_tres_state_end( hRtlTestResult, "toAsciiUpperCase");
 //    return ( res );
 }
-
-//------------------------------------------------------------------------
+ 
+//------------------------------------------------------------------------ 
 // testing the method trim()
 //------------------------------------------------------------------------
 extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_trim(
@@ -3099,7 +3099,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_trim(
          new OUString(aUStr16)},
         {"removes several spaces from the front and end",
          new OUString(aUStr1),
-         new OUString(aUStr17)},
+         new OUString(aUStr17)}, 
         {"removes characters that have codes <= 32",new OUString(aUStr30),
          new OUString("\1\3\5\7\11\13\15\17sun\21\23\25\27\31\33\50",
                       18,kEncodingRTLTextUSASCII,
@@ -3142,10 +3142,10 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_trim(
     c_rtl_tres_state_end( hRtlTestResult, "trim");
 //    return ( res );
 }
-//------------------------------------------------------------------------
+//------------------------------------------------------------------------ 
 //    testing the method toData()
 //------------------------------------------------------------------------
-
+                                              
 template <class T>
 sal_Bool test_toData( const char** input, int num, sal_Int16 radix,
                       const T* expVal,int base,
@@ -3158,18 +3158,18 @@ sal_Bool test_toData( const char** input, int num, sal_Int16 radix,
     sal_Char    *meth = '\0';
     sal_Char*   pMeth=methName;
     sal_Int32   i;
-//  static      sal_Unicode aUchar[60]={0x00};
+// 	static      sal_Unicode aUchar[60]={0x00};
     T           intRes;
     sal_Bool    lastRes=sal_False;
-
+    
     for(i=0;i<num;i++)
     {
         OSL_ENSURE( i < 60, "ERROR: leave aUchar bound");
 
 // LLA: stored for the posterity
 //      AStringToUStringCopy(aUchar,input[i]);
-//      OUString str(aUchar);
-
+// 		OUString str(aUchar);
+        
         OUString str;
         str = OUString::createFromAscii(input[i]);
 
@@ -3181,7 +3181,7 @@ sal_Bool test_toData( const char** input, int num, sal_Int16 radix,
             meth="toInt32default";
         }
         if(base==1)
-        {
+        {	
             intRes=static_cast<T>(str.toInt32(radix));
             lastRes=(intRes==expVal[i]);
             meth="toInt32normal";
@@ -3199,16 +3199,16 @@ sal_Bool test_toData( const char** input, int num, sal_Int16 radix,
             meth="toInt64normal";
         }
 // LLA: does no longer exist, moved to rtl/oustring
-// LLA:         if(base==4)
-// LLA:         {
+// LLA: 		if(base==4)
+// LLA: 		{
 // LLA:             intRes=str.toDouble();
 // LLA:             lastRes=(fabs(intRes-expVal[i])<=1e-35);
 // LLA:             meth="toDouble";
 // LLA:         }
 
 // LLA: dt:20040802 create compile problems within wntmsci10
-//      if(base==5)
-//      {
+//		if(base==5) 
+//		{	
 //            intRes=str.toFloat();
 //            T nPrec = _fPrecision[i];
 //            lastRes=(fabs((T)(intRes-expVal[i])) <= nPrec /* 1e-35 */ );
@@ -3219,15 +3219,15 @@ sal_Bool test_toData( const char** input, int num, sal_Int16 radix,
             intRes=str.toChar();
             lastRes=(intRes==expVal[i]);
             meth="toChar";
-        }
-
+        }		
+            
         char buf[MAXBUFLENGTH];
         buf[0] = '\'';
         cpynstr( buf + 1, input[i], MAXBUFLENGTH );
         int length = AStringLen( input[i] );
         buf[length + 1] = '\'';
         buf[length + 2] = 0;
-
+            
         c_rtl_tres_state
             (
                 hRtlTestResult,
@@ -3249,19 +3249,19 @@ sal_Bool test_toData( const char** input, int num, sal_Int16 radix,
 // LLA:     hTestResult hRtlTestResult )
 // LLA: {
 // LLA:     c_rtl_tres_state_start( hRtlTestResult, "toDouble");
-// LLA:     sal_Bool bRes=sal_False;
-// LLA:
-// LLA:     bRes=c_rtl_tres_state
+// LLA: 	sal_Bool bRes=sal_False;
+// LLA: 	
+// LLA: 	bRes=c_rtl_tres_state
 // LLA:         (
-// LLA:             hRtlTestResult,
-// LLA:             test_toData<double>((const char**)inputDouble,nDoubleCount,10,
+// LLA: 	      	hRtlTestResult,
+// LLA: 	      	test_toData<double>((const char**)inputDouble,nDoubleCount,10,
 // LLA:                                 expValDouble,4,hRtlTestResult),
-// LLA:             "toDouble",
-// LLA:             "toDouble()"
-// LLA:             );
-// LLA:     c_rtl_tres_state_end( hRtlTestResult, "toDouble");
-// LLA: //   return ( bRes );
-// LLA: }
+// LLA: 	      	"toDouble",
+// LLA: 	      	"toDouble()"
+// LLA: 	      	);
+// LLA: 	c_rtl_tres_state_end( hRtlTestResult, "toDouble");      	
+// LLA: //	 return ( bRes );
+// LLA: }		
 
 //------------------------------------------------------------------------
 //    testing the method toFloat()
@@ -3271,26 +3271,26 @@ sal_Bool test_toData( const char** input, int num, sal_Int16 radix,
 // LLA:     hTestResult hRtlTestResult )
 // LLA: {
 // LLA:     c_rtl_tres_state_start( hRtlTestResult, "toFloat");
-// LLA:     sal_Bool bRes=sal_False;
-// LLA:
-// LLA:     bRes=c_rtl_tres_state
+// LLA: 	sal_Bool bRes=sal_False;
+// LLA: 	
+// LLA: 	bRes=c_rtl_tres_state
 // LLA:         (
-// LLA:             hRtlTestResult,
-// LLA:             test_toData<float>((const char**)inputFloat,
+// LLA: 	      	hRtlTestResult,
+// LLA: 	      	test_toData<float>((const char**)inputFloat,
 // LLA:                                nFloatCount,
 // LLA:                                10, /* radix */
 // LLA:                                expValFloat,
 // LLA:                                5,  /* float */
 // LLA:                                fPrecision,
 // LLA:                                hRtlTestResult),
-// LLA:             "toFloat",
-// LLA:             "toFloat()"
-// LLA:             );
-// LLA:
+// LLA: 	      	"toFloat",
+// LLA: 	      	"toFloat()"
+// LLA: 	      	);
+// LLA: 	      	
 // LLA:     c_rtl_tres_state_end( hRtlTestResult, "toFloat");
-// LLA: //   return ( bRes );
-// LLA:
-// LLA: }
+// LLA: //	 return ( bRes ); 
+// LLA: 		
+// LLA: } 
 //------------------------------------------------------------------------
 //    testing the method toChar()
 //------------------------------------------------------------------------
@@ -3299,7 +3299,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_toChar(
 {
     c_rtl_tres_state_start( hRtlTestResult, "toChar");
     sal_Bool bRes=sal_False;
-
+    
     bRes=c_rtl_tres_state
         (
               hRtlTestResult,
@@ -3308,11 +3308,11 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_toChar(
               "toChar",
               "toChar()"
               );
-
+              
     c_rtl_tres_state_end( hRtlTestResult, "toChar");
-//   return ( bRes );
-
-}
+//	 return ( bRes ); 
+        
+} 
 //------------------------------------------------------------------------
 //    testing the method toBoolean()
 //------------------------------------------------------------------------
@@ -3379,7 +3379,7 @@ sal_Bool SAL_CALL test_rtl_OUString_toInt32_normal(
     sal_Bool res = c_rtl_tres_state
         (
             hRtlTestResult,
-            test_toData<sal_Int32>( kBinaryNumsStr,kBinaryNumsCount,
+            test_toData<sal_Int32>( kBinaryNumsStr,kBinaryNumsCount, 
                                     kRadixBinary,expValues,1,NULL,hRtlTestResult ),
             "kBinaryNumsStr",
             "toInt32( radix 2 )"
@@ -3387,7 +3387,7 @@ sal_Bool SAL_CALL test_rtl_OUString_toInt32_normal(
     res &= c_rtl_tres_state
         (
             hRtlTestResult,
-            test_toData<sal_Int32>( kBinaryMaxNumsStr,kInt32MaxNumsCount,
+            test_toData<sal_Int32>( kBinaryMaxNumsStr,kInt32MaxNumsCount, 
                                     kRadixBinary,kInt32MaxNums,1,NULL,hRtlTestResult ),
             "kBinaryMaxNumsStr",
             "toInt32_Boundaries( radix 2 )"
@@ -3396,7 +3396,7 @@ sal_Bool SAL_CALL test_rtl_OUString_toInt32_normal(
     res &= c_rtl_tres_state
         (
             hRtlTestResult,
-            test_toData<sal_Int32>( kOctolNumsStr,kOctolNumsCount,
+            test_toData<sal_Int32>( kOctolNumsStr,kOctolNumsCount, 
                                     kRadixOctol,expValues,1,NULL,hRtlTestResult ),
             "kOctolNumsStr",
             "toInt32( radix 8 )"
@@ -3405,7 +3405,7 @@ sal_Bool SAL_CALL test_rtl_OUString_toInt32_normal(
     res &= c_rtl_tres_state
         (
             hRtlTestResult,
-            test_toData<sal_Int32>( kOctolMaxNumsStr,kInt32MaxNumsCount,
+            test_toData<sal_Int32>( kOctolMaxNumsStr,kInt32MaxNumsCount, 
                                     kRadixOctol,(sal_Int32*)kInt32MaxNums,1,NULL,hRtlTestResult ),
             "kOctolMaxNumsStr",
             "toInt32_Boundaries( radix 8 )"
@@ -3423,7 +3423,7 @@ sal_Bool SAL_CALL test_rtl_OUString_toInt32_normal(
     res &= c_rtl_tres_state
         (
             hRtlTestResult,
-            test_toData<sal_Int32>( kDecimalMaxNumsStr,kInt32MaxNumsCount,
+            test_toData<sal_Int32>( kDecimalMaxNumsStr,kInt32MaxNumsCount, 
                                     kRadixDecimal,(sal_Int32*)kInt32MaxNums,1,NULL,hRtlTestResult ),
             "kDecimalMaxNumsStr",
             "toInt32_Boundaries( radix 10 )"
@@ -3534,7 +3534,7 @@ sal_Bool SAL_CALL test_rtl_OUString_toInt32_defaultParam(
     res &= c_rtl_tres_state
         (
             hRtlTestResult,
-            test_toData<sal_Int32>( kDecimalMaxNumsStr,kInt32MaxNumsCount,
+            test_toData<sal_Int32>( kDecimalMaxNumsStr,kInt32MaxNumsCount, 
                                     kRadixDecimal,(sal_Int32*)kInt32MaxNums,0,NULL,hRtlTestResult ),
             "kDecimalMaxNumsStr",
             "toInt32_Boundaries( radix 10 )"
@@ -3598,17 +3598,17 @@ sal_Bool SAL_CALL test_rtl_OUString_toInt64_normal(
     sal_Bool res = c_rtl_tres_state
         (
             hRtlTestResult,
-            test_toData<sal_Int64>( kBinaryNumsStr,kBinaryNumsCount,
+            test_toData<sal_Int64>( kBinaryNumsStr,kBinaryNumsCount, 
                                     kRadixBinary,expValues,3,NULL,hRtlTestResult ),
             "kBinaryNumsStr",
             "toInt64( radix 2 )"
             );
-
+    
 /* LLA: does not work within wntmsci8.pro
    res &= c_rtl_tres_state
    (
    hRtlTestResult,
-   test_toData<sal_Int64>( kBinaryMaxNumsStr,kInt64MaxNumsCount,
+   test_toData<sal_Int64>( kBinaryMaxNumsStr,kInt64MaxNumsCount, 
    kRadixBinary,kInt64MaxNums,3,hRtlTestResult ),
    "kBinaryMaxNumsStr",
    "toInt64_Boundaries( radix 2 )"
@@ -3618,7 +3618,7 @@ sal_Bool SAL_CALL test_rtl_OUString_toInt64_normal(
     res &= c_rtl_tres_state
         (
             hRtlTestResult,
-            test_toData<sal_Int64>( kOctolNumsStr,kOctolNumsCount,
+            test_toData<sal_Int64>( kOctolNumsStr,kOctolNumsCount, 
                                     kRadixOctol,expValues,3,NULL,hRtlTestResult ),
             "kOctolNumsStr",
             "toInt64( radix 8 )"
@@ -3627,7 +3627,7 @@ sal_Bool SAL_CALL test_rtl_OUString_toInt64_normal(
     res &= c_rtl_tres_state
         (
             hRtlTestResult,
-            test_toData<sal_Int64>( kOctolMaxNumsStr,kInt64MaxNumsCount,
+            test_toData<sal_Int64>( kOctolMaxNumsStr,kInt64MaxNumsCount, 
                                     kRadixOctol,(sal_Int64*)kInt64MaxNums,3,NULL,hRtlTestResult ),
             "kOctolMaxNumsStr",
             "toInt64_Boundaries( radix 8 )"
@@ -3645,7 +3645,7 @@ sal_Bool SAL_CALL test_rtl_OUString_toInt64_normal(
     res &= c_rtl_tres_state
         (
             hRtlTestResult,
-            test_toData<sal_Int64>( kDecimalMaxNumsStr,kInt64MaxNumsCount,
+            test_toData<sal_Int64>( kDecimalMaxNumsStr,kInt64MaxNumsCount, 
                                     kRadixDecimal,(sal_Int64*)kInt64MaxNums,3,NULL,hRtlTestResult ),
             "kDecimalMaxNumsStr",
             "toInt64_Boundaries( radix 10 )"
@@ -3730,7 +3730,7 @@ sal_Bool SAL_CALL test_rtl_OUString_toInt64_wrongRadix(
 
     return (
         c_rtl_tres_state
-        (
+        ( 
             hRtlTestResult,
             iRes == 0,
             "wrong radix -1",
@@ -3758,7 +3758,7 @@ sal_Bool SAL_CALL test_rtl_OUString_toInt64_defaultParam(
     res &= c_rtl_tres_state
         (
             hRtlTestResult,
-            test_toData<sal_Int64>( kDecimalMaxNumsStr,kInt64MaxNumsCount,
+            test_toData<sal_Int64>( kDecimalMaxNumsStr,kInt64MaxNumsCount, 
                                     kRadixDecimal,(sal_Int64*)kInt64MaxNums,2,NULL,hRtlTestResult ),
             "kDecimalMaxNumsStr",
             "toInt64_Boundaries( radix 10 )"
diff --git a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
index 147604bb7cf7..14a9e73c89bb 100644
--- a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
+++ b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -102,13 +102,13 @@ static sal_Bool test_rtl_OUStringBuffer_ctor_001( hTestResult hRtlTestResult )
 
     ::rtl::OUStringBuffer aUStrBuf;
 
-    bool b1 =
+    bool b1 = 
         aUStrBuf.getLength() == 0 &&
         ! *(aUStrBuf.getStr()) && aUStrBuf.getCapacity() == 16;
 
-    ::rtl::OUStringBuffer aUStrBuf2(0);
+    ::rtl::OUStringBuffer aUStrBuf2(0); 
 
-    bool b2 =
+    bool b2 = 
         aUStrBuf2.getLength() == 0 &&
         ! *(aUStrBuf2.getStr()) && aUStrBuf2.getCapacity() == /* LLA: !!! */ 0;
 
@@ -151,30 +151,30 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_ctor_003(
                                                hTestResult hRtlTestResult )
 {
     ::rtl::OUStringBuffer aUStrBuf1(kTestStr2Len);
-#ifdef WITH_CORE
+#ifdef WITH_CORE 
     ::rtl::OUStringBuffer aUStrBuf2(kSInt32Max);     //will core dump
 #else
-    ::rtl::OUStringBuffer aUStrBuf2(0);
-#endif
+    ::rtl::OUStringBuffer aUStrBuf2(0); 
+#endif 
     ::rtl::OUStringBuffer aUStrBuf3(kNonSInt32Max);
 
-
-    bool b1 =
+      
+    bool b1 = 
         aUStrBuf1.getLength() == 0 &&
         ! *(aUStrBuf1.getStr()) && aUStrBuf1.getCapacity() == kTestStr2Len ;
-
-    bool b2 =
-#ifdef WITH_CORE
+    
+    bool b2 = 
+#ifdef WITH_CORE          
         aUStrBuf2.getLength() == 0 &&
         ! *(aUStrBuf2.getStr()) && aUStrBuf2.getCapacity() == kSInt32Max ;
-#else
+#else 
         aUStrBuf2.getLength() == 0 &&
             ! *(aUStrBuf2.getStr()) && aUStrBuf2.getCapacity() == /* LLA: ??? 16 */ 0;
 #endif
-    bool b3 =
+    bool b3 = 
         aUStrBuf3.getLength() == 0 &&
         ! *(aUStrBuf3.getStr()) && aUStrBuf3.getCapacity() == kNonSInt32Max;
-
+    
     return
         (
             c_rtl_tres_state
@@ -185,7 +185,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_ctor_003(
                 "ctor_003( will core dump,because the kSInt32Max )"
                 )
             );
-
+    
 }
 
 //------------------------------------------------------------------------
@@ -232,18 +232,18 @@ static sal_Bool SAL_CALL test_rtl_OUStringBuffer_ctor_005(
     );
 }
 
-extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_ctors(
+extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_ctors( 
                                               hTestResult hRtlTestResult )
 {
     c_rtl_tres_state_start( hRtlTestResult, "ctors");
-    sal_Bool DCState = test_ini_uString();
+    sal_Bool DCState = test_ini_uString();      
     (void)DCState;
     sal_Bool bTSState = test_rtl_OUStringBuffer_ctor_001( hRtlTestResult );
     bTSState &= test_rtl_OUStringBuffer_ctor_002( hRtlTestResult);
     bTSState &= test_rtl_OUStringBuffer_ctor_003( hRtlTestResult);
     bTSState &= test_rtl_OUStringBuffer_ctor_004( hRtlTestResult);
     bTSState &= test_rtl_OUStringBuffer_ctor_005( hRtlTestResult);
-
+      
     c_rtl_tres_state_end( hRtlTestResult, "ctors");
 //    return( bTSState );
 }
@@ -260,13 +260,13 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_makeStringAndCle
 
     typedef struct TestCase
     {
-    sal_Char*       comments;
+    sal_Char*		comments;
     OUString*               expVal;
         OUStringBuffer*         input1;
 
-    ~TestCase()     { delete input1;}
+    ~TestCase()		{ delete input1;}
     } TestCase;
-
+        
     OUString arrOUS[6]={
         OUString( aUStr1 ),
         OUString( aUStr14 ),
@@ -280,7 +280,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_makeStringAndCle
 
     TestCase arrTestCase[]={
 
-    {"two empty strings(def. constructor)", new OUString(),
+    {"two empty strings(def. constructor)", new OUString(), 
                 new OUStringBuffer()},
     {"two empty strings(with a argu)", new OUString(),
         new OUStringBuffer(26)},
@@ -292,7 +292,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_makeStringAndCle
             new OUStringBuffer(arrOUS[2])},
     {"string with a character", new OUString(arrOUS[3]),
             new OUStringBuffer(arrOUS[3])},
-    {"string with special characters", new OUString(arrOUS[4]),
+    {"string with special characters", new OUString(arrOUS[4]), 
                 new OUStringBuffer(arrOUS[4])},
     {"string only with (\0)", new OUString(arrOUS[5]),
                 new OUStringBuffer(arrOUS[5])}
@@ -304,7 +304,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_makeStringAndCle
     for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
     {
         sal_Bool lastRes =
-                ( arrTestCase[i].input1->makeStringAndClear() ==
+                ( arrTestCase[i].input1->makeStringAndClear() ==  
                                               *( arrTestCase[i].expVal ));
         lastRes = lastRes && ( arrTestCase[i].input1->getCapacity() == 0 );
         lastRes = lastRes && ( *(arrTestCase[i].input1->getStr()) == '\0' );
@@ -348,25 +348,25 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_getLength(
 
     typedef struct TestCase
     {
-    sal_Char*       comments;
-    sal_Int32       expVal;
+    sal_Char*		comments;
+    sal_Int32 		expVal;
         OUStringBuffer*         input;
         ~TestCase()             { delete input;}
     } TestCase;
 
     TestCase arrTestCase[]={
 
-    {"length of ascii string", kTestStr1Len,
+    {"length of ascii string", kTestStr1Len, 
             new OUStringBuffer(arrOUS[0]) },
-        {"length of ascci string of size 1", 1,
+        {"length of ascci string of size 1", 1, 
                 new OUStringBuffer(arrOUS[1])},
         {"length of empty string", 0,
                         new OUStringBuffer(arrOUS[2])},
-    {"length of empty string (empty ascii string arg)",0,
+    {"length of empty string (empty ascii string arg)",0, 
             new OUStringBuffer(arrOUS[3])},
-    {"length of empty string (string arg = '\\0')", 0,
+    {"length of empty string (string arg = '\\0')", 0, 
             new OUStringBuffer(arrOUS[4])},
-        {"length(>16) of ascii string", kTestStr2Len,
+        {"length(>16) of ascii string", kTestStr2Len, 
             new OUStringBuffer(arrOUS[5]) },
         {"length of empty string (default constructor)", 0,
                         new OUStringBuffer()},
@@ -421,31 +421,31 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_getCapacity(
 
     typedef struct TestCase
     {
-    sal_Char*       comments;
-    sal_Int32       expVal;
+    sal_Char*		comments;
+    sal_Int32 		expVal;
         OUStringBuffer*         input;
         ~TestCase()             { delete input;}
     } TestCase;
 
     TestCase arrTestCase[]={
 
-    {"capacity of ascii string", kTestStr1Len+16,
+    {"capacity of ascii string", kTestStr1Len+16, 
             new OUStringBuffer(arrOUS[0]) },
-        {"capacity of ascci string of size 1", 1+16,
+        {"capacity of ascci string of size 1", 1+16, 
                 new OUStringBuffer(arrOUS[1]) },
         {"capacity of empty string", 0+16,
                         new OUStringBuffer(arrOUS[2]) },
-    {"capacity of empty string (empty ascii string arg)",0+16,
+    {"capacity of empty string (empty ascii string arg)",0+16, 
             new OUStringBuffer(arrOUS[3]) },
-    {"capacity of empty string (string arg = '\\0')", 0+16,
+    {"capacity of empty string (string arg = '\\0')", 0+16, 
             new OUStringBuffer(arrOUS[4]) },
-        {"capacity(>16) of ascii string", kTestStr2Len+16,
+        {"capacity(>16) of ascii string", kTestStr2Len+16, 
             new OUStringBuffer(arrOUS[5]) },
         {"capacity of empty string (default constructor)", 16,
                         new OUStringBuffer() },
 #ifdef WITH_CORE
         {"capacity of empty string (with capacity 2147483647)(code will core dump)", kSInt32Max,
-                        new OUStringBuffer(kSInt32Max) },// will core dump
+                        new OUStringBuffer(kSInt32Max) },// will core dump 
 #endif
         {"capacity of empty string (with capacity -2147483648)", kNonSInt32Max,
                         new OUStringBuffer(kNonSInt32Max) },
@@ -493,8 +493,8 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_ensureCapacity(
 
     typedef struct TestCase
     {
-    sal_Char*       comments;
-    sal_Int32       expVal;
+    sal_Char*		comments;
+    sal_Int32 		expVal;
         OUStringBuffer*         input1;
         sal_Int32               input2;
         ~TestCase()             { delete input1;}
@@ -502,15 +502,15 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_ensureCapacity(
 
     TestCase arrTestCase[]={
 
-    {"capacity equal to 16, minimum is 5 ", 16,
+    {"capacity equal to 16, minimum is 5 ", 16, 
             new OUStringBuffer(), 5 },
-        {"capacity equal to 16, minimum is -5", 16,
+        {"capacity equal to 16, minimum is -5", 16, 
                 new OUStringBuffer(), -5},
         {"capacity equal to 16, minimum is 0", 16,
                         new OUStringBuffer(), 0},
-    {"capacity equal to 16, minimum is 20", 20, //the testcase is based on comments
+    {"capacity equal to 16, minimum is 20", 20, //the testcase is based on comments 
             new OUStringBuffer(), 20},
-    {"capacity equal to 16, minimum is 50", 50,
+    {"capacity equal to 16, minimum is 50", 50, 
             new OUStringBuffer(), 50},
         {"capacity equal to 6, minimum is 20", 20,
             new OUStringBuffer(6), 20 },
@@ -518,11 +518,11 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_ensureCapacity(
                         new OUStringBuffer(6), 2},
         {"capacity equal to 6, minimum is -6", 6,
                         new OUStringBuffer(6), -6},
-        {"capacity equal to 6, minimum is -6", 10, //the testcase is based on comments
+        {"capacity equal to 6, minimum is -6", 10, //the testcase is based on comments 
                         new OUStringBuffer(6), 10},
         {"capacity equal to 0, minimum is 6", 6,
                         new OUStringBuffer(0), 6},
-        {"capacity equal to 0, minimum is 1", 2, //the testcase is based on comments
+        {"capacity equal to 0, minimum is 1", 2, //the testcase is based on comments 
                         new OUStringBuffer(0), 1},
     /*
       {"capacity equal to 0, minimum is -1", 0,
@@ -601,10 +601,10 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_setLength(
 
     typedef struct TestCase
     {
-    sal_Char*       comments;
-    sal_Int32       expVal1;
+    sal_Char*		comments;
+    sal_Int32 		expVal1;
         OUString*               expVal2;
-    sal_Int32       expVal3;
+    sal_Int32 		expVal3;
         OUStringBuffer*         input1;
         sal_Int32               input2;
         ~TestCase()             { delete input1; delete expVal2;}
@@ -681,7 +681,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_setLength(
         {"newLength equal to 0",
                 0, new OUString(), 48,
                 new OUStringBuffer(arrOUS[5]), 0}
-
+        
     };
 
 
@@ -691,7 +691,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_setLength(
     for (i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
     {
     arrTestCase[i].input1->setLength(arrTestCase[i].input2);
-        sal_Bool lastRes =
+        sal_Bool lastRes = 
             ( arrTestCase[i].input1->getStr() == *(arrTestCase[i].expVal2) &&
               arrTestCase[i].input1->getLength() == arrTestCase[i].expVal1 &&
               arrTestCase[i].input1->getCapacity() == arrTestCase[i].expVal3 );
@@ -727,8 +727,8 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_charAt(
 
     typedef struct TestCase
     {
-        sal_Char*       comments;
-        sal_Unicode         expVal;
+        sal_Char*		comments;
+        sal_Unicode 		expVal;
         OUStringBuffer*         input1;
         sal_Int32               input2;
         ~TestCase()             { delete input1;}
@@ -758,7 +758,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_charAt(
         {"invalid character of OUStringBuffer()",
                 0, new OUStringBuffer(arrOUS[3]), -2}
 */
-
+        
     };
 
 
@@ -767,8 +767,8 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_charAt(
 
     for (i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
     {
-        sal_Bool lastRes =
-            ( arrTestCase[i].input1->charAt(arrTestCase[i].input2) ==
+        sal_Bool lastRes = 
+            ( arrTestCase[i].input1->charAt(arrTestCase[i].input2) == 
               arrTestCase[i].expVal );
         // LLA: last case removed, due to the fact of complexity of the test code :-(
         // LLA: if(i<=7)
@@ -779,7 +779,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_charAt(
                 lastRes,
                 arrTestCase[i].comments,
                 createName( pMeth, "charAt", i )
-
+                
                 );
         // LLA: }
         // LLA: else
@@ -790,7 +790,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_charAt(
         // LLA:         sal_True,
         // LLA:         arrTestCase[i].comments,
         // LLA:         createName( pMeth, "charAt", i )
-        // LLA:
+        // LLA: 
         // LLA:     );
         // LLA: }
     res &= lastRes;
@@ -815,14 +815,14 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_csuc(
     //sal_Int32 cmpLen = 0;
         OUString tempString(aUStr1);
 
-    rtl_string2UString( &tmpUstring, tmpStr,  tmpLen,
+    rtl_string2UString( &tmpUstring, tmpStr,  tmpLen,                                
         osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
     OSL_ASSERT(tmpUstring != NULL);
 
 
     typedef struct TestCase
         {
-            sal_Char*                  comments;
+            sal_Char*		           comments;
             const sal_Unicode*             expVal;
             sal_Int32                      cmpLen;
             OUStringBuffer*                input1;
@@ -831,7 +831,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_csuc(
 
     TestCase arrTestCase[] =
     {
-          {"test normal ustring",(*tmpUstring).buffer,kTestStr1Len,
+          {"test normal ustring",(*tmpUstring).buffer,kTestStr1Len, 
                       new OUStringBuffer(tempString)},
         {"test empty ustring",&tmpUC, 1, new OUStringBuffer()}
     };
@@ -870,23 +870,23 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_getStr(
     //sal_Int32 cmpLen = 0;
         OUString tempString(aUStr1);
 
-    rtl_string2UString( &tmpUstring, tmpStr,  tmpLen,
+    rtl_string2UString( &tmpUstring, tmpStr,  tmpLen,                                
         osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
     OSL_ASSERT(tmpUstring != NULL);
 
 
     typedef struct TestCase
     {
-        sal_Char*           comments;
-        const sal_Unicode*      expVal;
-        sal_Int32           cmpLen;
+        sal_Char*			comments;
+        const sal_Unicode*		expVal;
+        sal_Int32			cmpLen;
         OUStringBuffer*                 input1;
         ~TestCase()                     {  delete input1;}
     } TestCase;
 
     TestCase arrTestCase[] =
     {
-          {"test normal ustring",(*tmpUstring).buffer,kTestStr1Len,
+          {"test normal ustring",(*tmpUstring).buffer,kTestStr1Len, 
                       new OUStringBuffer(tempString)},
         {"test empty ustring",&tmpUC, 1, new OUStringBuffer()}
     };
@@ -923,10 +923,10 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_setCharAt(
                         OUString( aUStr27),
                         OUString( aUStr28),
                         OUString( )};
-
+    
     typedef struct TestCase
     {
-    sal_Char*       comments;
+    sal_Char*		comments;
     OUString*               expVal;
         OUStringBuffer*         input1;
         sal_Int32               input2;
@@ -937,13 +937,13 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_setCharAt(
     TestCase arrTestCase[]={
 
     {"set the first character of OUStringBuffer(aUStr1) with s",
-                new OUString(aUStr31),
+                new OUString(aUStr31), 
                 new OUStringBuffer(arrOUS[0]), 0, 115 },
     {"set the middle character of OUStringBuffer(aUStr1) with m",
                 new OUString(aUStr3),
                 new OUStringBuffer(arrOUS[0]), 4, 109 },
         {"set the last character of OUStringBuffer(aUStr1) with ' '",
-                new OUString(aUStr32),
+                new OUString(aUStr32), 
                 new OUStringBuffer(arrOUS[0]), 15, 32 },
     {"set the only character of OUStringBuffer(aUStr27) with ' '",
                 new OUString(aUStr33),
@@ -966,7 +966,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_setCharAt(
         {"invalid character of OUStringBuffer()",
                 0,
                 new OUStringBuffer(arrOUS[3]), 3, 5}
-#endif
+#endif        
 
     };
 
@@ -976,8 +976,8 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_setCharAt(
 
     for (i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
     {
-        sal_Bool lastRes =
-            ( (arrTestCase[i].input1->setCharAt(arrTestCase[i].input2,
+        sal_Bool lastRes = 
+            ( (arrTestCase[i].input1->setCharAt(arrTestCase[i].input2, 
                 arrTestCase[i].input3)).getStr() == *(arrTestCase[i].expVal) );
         if(i<=4)
         {
@@ -1026,7 +1026,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_001(
 
     typedef struct TestCase
     {
-    sal_Char*       comments;
+    sal_Char*		comments;
     OUString*               expVal;
         OUStringBuffer*         input1;
         OUString*               input2;
@@ -1037,13 +1037,13 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_001(
     TestCase arrTestCase[]={
 
     {"Appends the string(length less than 16) to the string buffer arrOUS[0]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[0]), new OUString(aUStr8) },
     {"Appends the string(length more than 16) to the string buffer arrOUS[0]",
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[0]), new OUString(aUStr36) },
         {"Appends the string(length equal to 16) to the string buffer arrOUS[0]",
-                new OUString(aUStr37),
+                new OUString(aUStr37), 
                 new OUStringBuffer(arrOUS[0]), new OUString(aUStr23) },
     {"Appends the string(length equal to 0) to the string buffer arrOUS[0]",
                 new OUString(aUStr7),
@@ -1055,7 +1055,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_001(
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[1]), new OUString(aUStr2)},
     {"Appends the string(length equal to 16) to the string buffer arrOUS[1]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[1]), new OUString(aUStr1) },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[1]",
                 new OUString(),
@@ -1067,7 +1067,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_001(
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[2]), new OUString(aUStr2)},
     {"Appends the string(length equal to 16) to the string buffer arrOUS[2]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[2]), new OUString(aUStr1) },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[2]",
                 new OUString(),
@@ -1079,7 +1079,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_001(
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[3]), new OUString(aUStr2)},
     {"Appends the string(length equal to 16) to the string buffer arrOUS[3]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[3]), new OUString(aUStr1) },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[3]",
                 new OUString(),
@@ -1091,7 +1091,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_001(
                 new OUString(aUStr39),
                 new OUStringBuffer(arrOUS[4]), new OUString(aUStr17)},
     {"Appends the string(length equal to 16) to the string buffer arrOUS[4]",
-                new OUString(aUStr40),
+                new OUString(aUStr40), 
                 new OUStringBuffer(arrOUS[4]), new OUString(aUStr31) },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[4]",
                 new OUString(aUStr28),
@@ -1110,8 +1110,8 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_001(
     for (i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
     {
         arrTestCase[i].input1->append( *(arrTestCase[i].input2) );
-        sal_Bool lastRes =
-            ( arrTestCase[i].input1->getStr()== *(arrTestCase[i].expVal) &&
+        sal_Bool lastRes = 
+            ( arrTestCase[i].input1->getStr()== *(arrTestCase[i].expVal) && 
               arrTestCase[i].input1->getLength() == arrTestCase[i].expVal->getLength()  );
 
         c_rtl_tres_state
@@ -1148,7 +1148,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_002(
 
     typedef struct TestCase
     {
-    sal_Char*       comments;
+    sal_Char*		comments;
     OUString*               expVal;
         OUStringBuffer*         input1;
         sal_Unicode*            input2;
@@ -1159,13 +1159,13 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_002(
     TestCase arrTestCase[]={
 
     {"Appends the string(length less than 16) to the string buffer arrOUS[0]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[0]), aUStr8 },
     {"Appends the string(length more than 16) to the string buffer arrOUS[0]",
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[0]), aUStr36 },
         {"Appends the string(length equal to 16) to the string buffer arrOUS[0]",
-                new OUString(aUStr37),
+                new OUString(aUStr37), 
                 new OUStringBuffer(arrOUS[0]), aUStr23 },
     {"Appends the string(length equal to 0) to the string buffer arrOUS[0]",
                 new OUString(aUStr7),
@@ -1177,7 +1177,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_002(
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[1]), aUStr2 },
     {"Appends the string(length equal to 16) to the string buffer arrOUS[1]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[1]), aUStr1 },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[1]",
                 new OUString(),
@@ -1189,7 +1189,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_002(
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[2]), aUStr2 },
     {"Appends the string(length equal to 16) to the string buffer arrOUS[2]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[2]), aUStr1 },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[2]",
                 new OUString(),
@@ -1201,7 +1201,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_002(
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[3]), aUStr2 },
     {"Appends the string(length equal to 16) to the string buffer arrOUS[3]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[3]), aUStr1 },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[3]",
                 new OUString(),
@@ -1213,7 +1213,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_002(
                 new OUString(aUStr39),
                 new OUStringBuffer(arrOUS[4]), aUStr17 },
     {"Appends the string(length equal to 16) to the string buffer arrOUS[4]",
-                new OUString(aUStr40),
+                new OUString(aUStr40), 
                 new OUStringBuffer(arrOUS[4]), aUStr31 },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[4]",
                 new OUString(aUStr28),
@@ -1232,8 +1232,8 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_002(
     for (i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
     {
         arrTestCase[i].input1->append( arrTestCase[i].input2 );
-        sal_Bool lastRes =
-            ( arrTestCase[i].input1->getStr()== *(arrTestCase[i].expVal) &&
+        sal_Bool lastRes = 
+            ( arrTestCase[i].input1->getStr()== *(arrTestCase[i].expVal) && 
               arrTestCase[i].input1->getLength() == arrTestCase[i].expVal->getLength()  );
 
         c_rtl_tres_state
@@ -1270,7 +1270,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_003(
 
     typedef struct TestCase
     {
-    sal_Char*       comments;
+    sal_Char*		comments;
     OUString*               expVal;
         OUStringBuffer*         input1;
         sal_Unicode*            input2;
@@ -1282,13 +1282,13 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_003(
     TestCase arrTestCase[]={
 
     {"Appends the string(length less than 16) to the string buffer arrOUS[0]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[0]), aUStr36, 12 },
     {"Appends the string(length more than 16) to the string buffer arrOUS[0]",
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[0]), aUStr36, 28 },
         {"Appends the string(length equal to 16) to the string buffer arrOUS[0]",
-                new OUString(aUStr37),
+                new OUString(aUStr37), 
                 new OUStringBuffer(arrOUS[0]), aUStr23, 16 },
     {"Appends the string(length equal to 0) to the string buffer arrOUS[0]",
                 new OUString(aUStr7),
@@ -1305,7 +1305,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_003(
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[1]), aUStr2, 32 },
     {"Appends the string(length equal to 16) to the string buffer arrOUS[1]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[1]), aUStr2, 16 },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[1]",
                 new OUString(),
@@ -1322,7 +1322,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_003(
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[2]), aUStr2, 32 },
     {"Appends the string(length equal to 16) to the string buffer arrOUS[2]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[2]), aUStr2, 16 },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[2]",
                 new OUString(),
@@ -1339,7 +1339,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_003(
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[3]), aUStr2, 32 },
     {"Appends the string(length equal to 16) to the string buffer arrOUS[3]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[3]), aUStr2, 16 },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[3]",
                 new OUString(),
@@ -1356,7 +1356,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_003(
                 new OUString(aUStr39),
                 new OUStringBuffer(arrOUS[4]), aUStr17, 22 },
     {"Appends the string(length equal to 16) to the string buffer arrOUS[4]",
-                new OUString(aUStr40),
+                new OUString(aUStr40), 
                 new OUStringBuffer(arrOUS[4]), aUStr31, 16 },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[4]",
                 new OUString(aUStr28),
@@ -1379,10 +1379,10 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_003(
 
     for (i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
     {
-        arrTestCase[i].input1->append(
+        arrTestCase[i].input1->append( 
                     arrTestCase[i].input2, arrTestCase[i].input3);
-        sal_Bool lastRes =
-            ( arrTestCase[i].input1->getStr()== *(arrTestCase[i].expVal) &&
+        sal_Bool lastRes = 
+            ( arrTestCase[i].input1->getStr()== *(arrTestCase[i].expVal) && 
               arrTestCase[i].input1->getLength() == arrTestCase[i].expVal->getLength()  );
 
         c_rtl_tres_state
@@ -1419,7 +1419,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_004(
 
     typedef struct TestCase
     {
-    sal_Char*       comments;
+    sal_Char*		comments;
     OUString*               expVal;
         OUStringBuffer*         input1;
         sal_Bool                input2;
@@ -1430,7 +1430,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_004(
     TestCase arrTestCase[]={
 
     {"Appends the sal_Bool(sal_True) to the string buffer arrOUS[0]",
-                new OUString(aUStr45),
+                new OUString(aUStr45), 
                 new OUStringBuffer(arrOUS[0]), sal_True },
     {"Appends the sal_Bool(sal_False) to the string buffer arrOUS[0]",
                 new OUString(aUStr46),
@@ -1475,10 +1475,10 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_004(
 
     for (i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
     {
-        arrTestCase[i].input1->append(
+        arrTestCase[i].input1->append( 
                     arrTestCase[i].input2 );
-        sal_Bool lastRes =
-            ( arrTestCase[i].input1->getStr()== *(arrTestCase[i].expVal) &&
+        sal_Bool lastRes = 
+            ( arrTestCase[i].input1->getStr()== *(arrTestCase[i].expVal) && 
               arrTestCase[i].input1->getLength() == arrTestCase[i].expVal->getLength()  );
 
         c_rtl_tres_state
@@ -1496,7 +1496,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_004(
     return ( res );
 }
 
-extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_appends(
+extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_appends( 
                                               hTestResult hRtlTestResult )
 {
     c_rtl_tres_state_start( hRtlTestResult, "appends");
@@ -1504,7 +1504,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_appends(
     bTSState &= test_rtl_OUStringBuffer_append_002( hRtlTestResult);
     bTSState &= test_rtl_OUStringBuffer_append_003( hRtlTestResult);
     bTSState &= test_rtl_OUStringBuffer_append_004( hRtlTestResult);
-
+      
     c_rtl_tres_state_end( hRtlTestResult, "appends");
 //    return( bTSState );
 }
@@ -1528,7 +1528,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_001(
 
     typedef struct TestCase
     {
-    sal_Char*       comments;
+    sal_Char*		comments;
     OUString*               expVal;
         OUStringBuffer*         input1;
         const sal_Char*         input2;
@@ -1539,13 +1539,13 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_001(
     TestCase arrTestCase[]={
 
         {"Appends the string(length less than 16) to the string buffer arrOUS[0]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[0]), kTestStr8 },
     {"Appends the string(length more than 16) to the string buffer arrOUS[0]",
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[0]), kTestStr36 },
         {"Appends the string(length equal to 16) to the string buffer arrOUS[0]",
-                new OUString(aUStr37),
+                new OUString(aUStr37), 
                 new OUStringBuffer(arrOUS[0]), kTestStr23 },
     {"Appends the string(length equal to 0) to the string buffer arrOUS[0]",
                 new OUString(aUStr7),
@@ -1557,7 +1557,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_001(
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[1]), kTestStr2 },
     {"Appends the string(length equal to 16) to the string buffer arrOUS[1]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[1]), kTestStr1 },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[1]",
                 new OUString(),
@@ -1569,7 +1569,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_001(
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[2]), kTestStr2 },
     {"Appends the string(length equal to 16) to the string buffer arrOUS[2]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[2]), kTestStr1 },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[2]",
                 new OUString(),
@@ -1581,7 +1581,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_001(
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[3]), kTestStr2 },
     {"Appends the string(length equal to 16) to the string buffer arrOUS[3]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[3]), kTestStr1 },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[3]",
                 new OUString(),
@@ -1593,7 +1593,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_001(
                 new OUString(aUStr39),
                 new OUStringBuffer(arrOUS[4]), kTestStr17 },
     {"Appends the string(length equal to 16) to the string buffer arrOUS[4]",
-                new OUString(aUStr40),
+                new OUString(aUStr40), 
                 new OUStringBuffer(arrOUS[4]), kTestStr31 },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[4]",
                 new OUString(aUStr28),
@@ -1606,7 +1606,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_001(
                 new OUString(),
                 new OUStringBuffer(kSInt32Max), kTestStr25 }
 #endif
-
+       
     };
 
 
@@ -1616,8 +1616,8 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_001(
     for (i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
     {
         arrTestCase[i].input1->appendAscii( arrTestCase[i].input2 );
-        sal_Bool lastRes =
-            ( arrTestCase[i].input1->getStr()== *(arrTestCase[i].expVal) &&
+        sal_Bool lastRes = 
+            ( arrTestCase[i].input1->getStr()== *(arrTestCase[i].expVal) && 
               arrTestCase[i].input1->getLength() == arrTestCase[i].expVal->getLength()  );
 
             c_rtl_tres_state
@@ -1627,7 +1627,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_001(
                 arrTestCase[i].comments,
                 createName( pMeth, "appendAscii_001", i )
             );
-
+        
         res &= lastRes;
     }
     return ( res );
@@ -1652,7 +1652,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_002(
 
     typedef struct TestCase
     {
-    sal_Char*       comments;
+    sal_Char*		comments;
     OUString*               expVal;
         OUStringBuffer*         input1;
         const sal_Char*         input2;
@@ -1664,13 +1664,13 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_002(
     TestCase arrTestCase[]={
 
     {"Appends the string(length less than 16) to the string buffer arrOUS[0]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[0]), kTestStr36, 12 },
     {"Appends the string(length more than 16) to the string buffer arrOUS[0]",
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[0]), kTestStr36, 28 },
         {"Appends the string(length equal to 16) to the string buffer arrOUS[0]",
-                new OUString(aUStr37),
+                new OUString(aUStr37), 
                 new OUStringBuffer(arrOUS[0]), kTestStr23, 16 },
     {"Appends the string(length equal to 0) to the string buffer arrOUS[0]",
                 new OUString(aUStr7),
@@ -1687,7 +1687,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_002(
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[1]), kTestStr2, 32 },
     {"Appends the string(length equal to 16) to the string buffer arrOUS[1]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[1]), kTestStr2, 16 },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[1]",
                 new OUString(),
@@ -1704,7 +1704,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_002(
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[2]), kTestStr2, 32 },
     {"Appends the string(length equal to 16) to the string buffer arrOUS[2]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[2]), kTestStr2, 16 },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[2]",
                 new OUString(),
@@ -1721,7 +1721,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_002(
                 new OUString(aUStr2),
                 new OUStringBuffer(arrOUS[3]), kTestStr2, 32 },
     {"Appends the string(length equal to 16) to the string buffer arrOUS[3]",
-                new OUString(aUStr1),
+                new OUString(aUStr1), 
                 new OUStringBuffer(arrOUS[3]), kTestStr2, 16 },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[3]",
                 new OUString(),
@@ -1738,7 +1738,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_002(
                 new OUString(aUStr39),
                 new OUStringBuffer(arrOUS[4]), kTestStr17, 22 },
     {"Appends the string(length equal to 16) to the string buffer arrOUS[4]",
-                new OUString(aUStr40),
+                new OUString(aUStr40), 
                 new OUStringBuffer(arrOUS[4]), kTestStr31, 16 },
         {"Appends the string(length equal to 0) to the string buffer arrOUS[4]",
                 new OUString(aUStr28),
@@ -1761,10 +1761,10 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_002(
 
     for (i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
     {
-        arrTestCase[i].input1->appendAscii(
+        arrTestCase[i].input1->appendAscii( 
                     arrTestCase[i].input2, arrTestCase[i].input3);
-        sal_Bool lastRes =
-            ( arrTestCase[i].input1->getStr()== *(arrTestCase[i].expVal) &&
+        sal_Bool lastRes = 
+            ( arrTestCase[i].input1->getStr()== *(arrTestCase[i].expVal) && 
               arrTestCase[i].input1->getLength() == arrTestCase[i].expVal->getLength()  );
 
         c_rtl_tres_state
@@ -1780,13 +1780,13 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_002(
     }
     return ( res );
 }
-extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_appendAsciis(
+extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_appendAsciis( 
                                               hTestResult hRtlTestResult )
 {
     c_rtl_tres_state_start( hRtlTestResult, "appendAsciis");
     sal_Bool bTSState = test_rtl_OUStringBuffer_appendAscii_001( hRtlTestResult );
     bTSState &= test_rtl_OUStringBuffer_appendAscii_002( hRtlTestResult);
-
+      
     c_rtl_tres_state_end( hRtlTestResult, "appendAsciis");
 //    return( bTSState );
 }
diff --git a/sal/qa/rtl_strings/rtl_String_Const.h b/sal/qa/rtl_strings/rtl_String_Const.h
index 1a65f8c9fe6a..c59e0ff78a8d 100644
--- a/sal/qa/rtl_strings/rtl_String_Const.h
+++ b/sal/qa/rtl_strings/rtl_String_Const.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -208,11 +208,11 @@ static const sal_Int32 kTestStr1PlusStr6Len = kTestStr1Len + kTestStr6Len;
  static sal_Unicode aUStr4[kTestStr4Len+1];
  static sal_Unicode aUStr5[kTestStr5Len+1];
  static sal_Unicode aUStr6[kTestStr6Len+1];
- static sal_Unicode aUStr7[kTestStr7Len+1];
+ static sal_Unicode aUStr7[kTestStr7Len+1]; 
  static sal_Unicode aUStr8[kTestStr8Len+1];
  static sal_Unicode aUStr9[kTestStr9Len+1];
  static sal_Unicode aUStr10[kTestStr10Len+1];
- static sal_Unicode aUStr11[kTestStr11Len+1];
+ static sal_Unicode aUStr11[kTestStr11Len+1]; 
  static sal_Unicode aUStr12[kTestStr12Len+1];
  static sal_Unicode aUStr13[kTestStr13Len+1];
  static sal_Unicode aUStr14[kTestStr14Len+1];
@@ -230,7 +230,7 @@ static const sal_Int32 kTestStr1PlusStr6Len = kTestStr1Len + kTestStr6Len;
  static sal_Unicode aUStr26[kTestStr26Len+1];
  static sal_Unicode aUStr27[kTestStr27Len+1];
  static sal_Unicode aUStr28[kTestStr28Len+1];
- static sal_Unicode aUStr29[kTestStr29Len+1];
+ static sal_Unicode aUStr29[kTestStr29Len+1]; 
  static sal_Unicode aUStr30[kTestStr30Len+1];
  static sal_Unicode aUStr31[kTestStr31Len+1];
  static sal_Unicode aUStr32[kTestStr32Len+1];
@@ -262,33 +262,33 @@ static const sal_Int32 kTestStr1PlusStr6Len = kTestStr1Len + kTestStr6Len;
 // static sal_Unicode aUStr58[kTestStr58Len+1]={40,3,5,7,9,11,13,15,115,117,110,SAL_MIN_INT16 /*-32768*/};
  static sal_Unicode aUStr1PlusUStr6[kTestStr1Len + kTestStr6Len + 1];
 
-// we are already in "C"
+// we are already in "C" 
 
 static sal_Bool SAL_CALL test_ini_uString()
 {
 
     sal_Bool iniResult= sal_True;
-
+    
     iniResult &=AStringToUStringNCopy( aUStr1, kTestStr1, kTestStr1Len );
-
+    
     iniResult &=AStringToUStringNCopy( aUStr2, kTestStr2, kTestStr2Len );
-
+    
     iniResult &=AStringToUStringNCopy( aUStr3, kTestStr3, kTestStr3Len );
-
+    
     iniResult &=AStringToUStringNCopy( aUStr4, kTestStr4, kTestStr4Len );
-
+    
     iniResult &=AStringToUStringNCopy( aUStr5, kTestStr5, kTestStr5Len );
-
+    
     iniResult &=AStringToUStringNCopy( aUStr6, kTestStr6, kTestStr6Len );
-
+    
         iniResult &=AStringToUStringNCopy( aUStr7, kTestStr7, kTestStr7Len );
 
         iniResult &=AStringToUStringNCopy( aUStr8, kTestStr8, kTestStr8Len );
 
     iniResult &=AStringToUStringNCopy( aUStr9, kTestStr9, kTestStr9Len );
-
+    
     iniResult &=AStringToUStringNCopy( aUStr10, kTestStr10, kTestStr10Len );
-
+    
     iniResult &=AStringToUStringNCopy( aUStr11, kTestStr11, kTestStr11Len );
 
         iniResult &=AStringToUStringNCopy( aUStr12, kTestStr12, kTestStr12Len );
@@ -310,13 +310,13 @@ static sal_Bool SAL_CALL test_ini_uString()
         iniResult &=AStringToUStringNCopy( aUStr20, kTestStr20, kTestStr20Len );
 
         iniResult &=AStringToUStringNCopy( aUStr21, kTestStr21, kTestStr21Len );
-
+     
     iniResult &=AStringToUStringNCopy( aUStr22, kTestStr22, kTestStr22Len );
 
     iniResult &=AStringToUStringNCopy( aUStr23, kTestStr23, kTestStr23Len );
 
     iniResult &=AStringToUStringNCopy( aUStr1PlusUStr6, kTestStr1PlusStr6, kTestStr1PlusStr6Len );
-
+    
         iniResult &=AStringToUStringNCopy( aUStr24, kTestStr24, kTestStr24Len );
 
         iniResult &=AStringToUStringNCopy( aUStr25, kTestStr25, kTestStr25Len );
@@ -387,9 +387,9 @@ static sal_Bool SAL_CALL test_ini_uString()
 
         //iniResult &=AStringToUStringNCopy( aUStr58, kTestStr58, kTestStr58Len );
     return iniResult;
-
+    
 }
-
+ 
 
 
 
@@ -400,7 +400,7 @@ static const sal_Int32 uTestStr4Len  = 16;
 static const sal_Int32 uTestStr5Len  = 16;
 static const sal_Int32 uTestStr9Len  = 32;
 static const sal_Int32 uTestStr22Len = 32;
-
+ 
 
 
 //------------------------------------------------------------------------
@@ -649,13 +649,13 @@ static const sal_Char *kBase36MaxNumsStr[kBase36MaxNumsCount] =
 //------------------------------------------------------------------------
 static const sal_Int32 nDoubleCount=24;
 // static const sal_Char *inputDouble[nDoubleCount] =
-//  {
+// 	{
 //             "3","3.1","3.1415","3.1415926535","3.141592653589793",
 //             "3.1415926535897932","3.14159265358979323","+3.1",
 //             "3.141592653589793238462643","9.1096e-31","2.997925e8","6.241e18","5.381e+18",
 //             "1.7e-309","6.5822e-16","1.7e+307","2.2e30","03.1"," 3.1","-3.1",
 //             "-0.0","0.0","","1.00e308"
-//  };
+// 	};
 static const double   expValDouble[nDoubleCount]=
     {
             3.0,3.1,3.1415,3.1415926535,3.141592653589793,
diff --git a/sal/qa/rtl_strings/rtl_String_Utils.cxx b/sal/qa/rtl_strings/rtl_String_Utils.cxx
index 7eef86564159..16a49f6bd952 100644
--- a/sal/qa/rtl_strings/rtl_String_Utils.cxx
+++ b/sal/qa/rtl_strings/rtl_String_Utils.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
 #
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -147,7 +147,7 @@ sal_Bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2 )
     const sal_Unicode* pBuf1 = str1;
     const sal_Unicode* pBuf2 = str2;
     sal_Bool res = sal_True;
-
+   
     while ( (*pBuf1 == *pBuf2) && *pBuf1 !='\0' && *pBuf2 != '\0')
     {
         (pBuf1)++;
diff --git a/sal/qa/rtl_strings/rtl_String_Utils.hxx b/sal/qa/rtl_strings/rtl_String_Utils.hxx
index cf6817a7fb8b..52b6a370ba80 100644
--- a/sal/qa/rtl_strings/rtl_String_Utils.hxx
+++ b/sal/qa/rtl_strings/rtl_String_Utils.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
 #
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl_strings/rtl_String_Utils_Const.h b/sal/qa/rtl_strings/rtl_String_Utils_Const.h
index 36a35593deab..af12c918c4ed 100644
--- a/sal/qa/rtl_strings/rtl_String_Utils_Const.h
+++ b/sal/qa/rtl_strings/rtl_String_Utils_Const.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl_strings/rtl_old_testostring.cxx b/sal/qa/rtl_strings/rtl_old_testostring.cxx
index 53668061173b..8b04de23711d 100644
--- a/sal/qa/rtl_strings/rtl_old_testostring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testostring.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/rtl_strings/rtl_old_testowstring.cxx b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
index 880e326ee562..7a3456c33113 100644
--- a/sal/qa/rtl_strings/rtl_old_testowstring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -74,8 +74,8 @@ namespace rtl_OUString
 void oldtests::test_OUString()
 {
     //          "Mein erster RTL OUString\n"
-    //           |    |    |    |    |
-    //  Index    0    5    10   15   20
+    //	         |	  |    |    |	 |
+    //	Index    0	  5	   10   15	 20
     OUString s1(OUString::createFromAscii("Mein erster RTL OUString\n"));
     TEST_ENSURE( s1 == OUString::createFromAscii("Mein erster RTL OUString\n"), "test_OWString error 1");
     TEST_ENSURE( s1.getLength() == 25, "test_OWString error 2");
@@ -95,8 +95,8 @@ void oldtests::test_OUString()
 
 
     //          "Mein erster RTL OUString ist ein String aus der RTL Library\n"
-    //           |    |    |    |    |    |    |    |    |    |    |    |
-    //  Index    0    5    10   15   20   25   30   35   40   45   50   55
+    //           |    |    |    |	 |	  |	   |	| 	 |	  |	   |	|
+    //  Index    0    5	   10   15	 20   25   30	35	 40   45   50	55
     OUString s3 = s2.copy(0, s2.getLength() - 1);
     OUString s4 = s3.concat( OUString::createFromAscii(" ist ein String aus der RTL Library\n") );
     TEST_ENSURE( s4.getLength() == 60, "test_OWString error 11");
@@ -110,7 +110,7 @@ void oldtests::test_OUString()
 
     sal_Bool b = sal_False;
     OUString s6 = s5.valueOf(b);
-//  TEST_ENSURE( s6.compareTo(OUString::createFromAscii("False")) == 0, "test_OWString error 14");
+//	TEST_ENSURE( s6.compareTo(OUString::createFromAscii("False")) == 0, "test_OWString error 14");
     s6 = s5.valueOf((sal_Unicode)'H');
     TEST_ENSURE( s6.compareTo(OUString::createFromAscii("H")) == 0, "test_OWString error 15");
     sal_Int32 n = 123456789L;
@@ -130,37 +130,37 @@ void oldtests::test_OUString()
     TEST_ENSURE( s6.compareTo( OUString::createFromAscii( "-3223372036854775807" ) ) == 0, "test_OWString error 17");
 #endif
 
-// LLA: locale tests removed        ::rtl::OLocale locale = ::rtl::OLocale::getDefault();
+// LLA: locale tests removed    	::rtl::OLocale locale = ::rtl::OLocale::getDefault();
 // LLA: locale tests removed
-// LLA: locale tests removed    OUString s61(OUString::createFromAscii("HaLLo"));
-// LLA: locale tests removed    s61 = s61.toLowerCase(locale);
-// LLA: locale tests removed    TEST_ENSURE( s61 == OUString::createFromAscii("hallo"), "test_OWString error 17a");
-// LLA: locale tests removed    s61 = s61.toUpperCase();
-// LLA: locale tests removed    TEST_ENSURE( s61 == OUString::createFromAscii("HALLO"), "test_OWString error 17b");
-// LLA: locale tests removed    s61 = s61.toLowerCase();
-// LLA: locale tests removed    TEST_ENSURE( s61 == OUString::createFromAscii("hallo"), "test_OWString error 17c");
+// LLA: locale tests removed 	OUString s61(OUString::createFromAscii("HaLLo"));
+// LLA: locale tests removed 	s61 = s61.toLowerCase(locale);
+// LLA: locale tests removed 	TEST_ENSURE( s61 == OUString::createFromAscii("hallo"), "test_OWString error 17a");
+// LLA: locale tests removed 	s61 = s61.toUpperCase();
+// LLA: locale tests removed 	TEST_ENSURE( s61 == OUString::createFromAscii("HALLO"), "test_OWString error 17b");
+// LLA: locale tests removed 	s61 = s61.toLowerCase();
+// LLA: locale tests removed 	TEST_ENSURE( s61 == OUString::createFromAscii("hallo"), "test_OWString error 17c");
 // LLA: locale tests removed
-// LLA: locale tests removed    ::rtl::OLocale::setDefault( OUString::createFromAscii( "de" ), OUString::createFromAscii( "DE" ), OUString() );
-// LLA: locale tests removed    locale = OLocale::getDefault();
+// LLA: locale tests removed 	::rtl::OLocale::setDefault( OUString::createFromAscii( "de" ), OUString::createFromAscii( "DE" ), OUString() );
+// LLA: locale tests removed 	locale = OLocale::getDefault();
 // LLA: locale tests removed
-// LLA: locale tests removed    // AB, 24.3.2000, removed NAMESPACE_RTL(OLocale)::getENGLISH() and error 18
+// LLA: locale tests removed 	// AB, 24.3.2000, removed NAMESPACE_RTL(OLocale)::getENGLISH() and error 18
 // LLA: locale tests removed
-// LLA: locale tests removed    OUString s7(OUString::createFromAscii("HaLLo"));
-// LLA: locale tests removed    s7 = s7.toLowerCase(locale);
-// LLA: locale tests removed    TEST_ENSURE( s7 == OUString::createFromAscii("hallo"), "test_OWString error 19");
-// LLA: locale tests removed    s7 = s7.toUpperCase(locale);
-// LLA: locale tests removed    TEST_ENSURE( s7 == OUString::createFromAscii("HALLO"), "test_OWString error 20");
+// LLA: locale tests removed  	OUString s7(OUString::createFromAscii("HaLLo"));
+// LLA: locale tests removed 	s7 = s7.toLowerCase(locale);
+// LLA: locale tests removed 	TEST_ENSURE( s7 == OUString::createFromAscii("hallo"), "test_OWString error 19");
+// LLA: locale tests removed 	s7 = s7.toUpperCase(locale);
+// LLA: locale tests removed 	TEST_ENSURE( s7 == OUString::createFromAscii("HALLO"), "test_OWString error 20");
 // LLA: locale tests removed
-// LLA: locale tests removed    OUString s8(OUString::createFromAscii("HaLLo ICH BIn eIn "));
-// LLA: locale tests removed    s8 += OUString::valueOf( (sal_Unicode)0xDF );
-// LLA: locale tests removed    locale = OLocale::registerLocale( OUString::createFromAscii("tr"), OUString::createFromAscii("TR"), OUString());
-// LLA: locale tests removed    s8 = s8.toLowerCase(locale);
-// LLA: locale tests removed    s8 = s8.toUpperCase(locale);
-// LLA: locale tests removed    TEST_ENSURE( s8 == OUString::createFromAscii("HALLO ICH BIN EIN SS"), "test_OWString error 21");
+// LLA: locale tests removed 	OUString s8(OUString::createFromAscii("HaLLo ICH BIn eIn "));
+// LLA: locale tests removed 	s8 += OUString::valueOf( (sal_Unicode)0xDF );
+// LLA: locale tests removed 	locale = OLocale::registerLocale( OUString::createFromAscii("tr"), OUString::createFromAscii("TR"), OUString());
+// LLA: locale tests removed 	s8 = s8.toLowerCase(locale);
+// LLA: locale tests removed 	s8 = s8.toUpperCase(locale);
+// LLA: locale tests removed 	TEST_ENSURE( s8 == OUString::createFromAscii("HALLO ICH BIN EIN SS"), "test_OWString error 21");
 // LLA: locale tests removed
-// LLA: locale tests removed    s7 = OUString::createFromAscii("Hallo ich bIn ein I");
-// LLA: locale tests removed    s7 = s8.toUpperCase(locale);
-// LLA: locale tests removed    TEST_ENSURE( s7 != OUString::createFromAscii("HALLO ICH BIN EIN I"), "test_OWString error 21.b");
+// LLA: locale tests removed 	s7 = OUString::createFromAscii("Hallo ich bIn ein I");
+// LLA: locale tests removed 	s7 = s8.toUpperCase(locale);
+// LLA: locale tests removed 	TEST_ENSURE( s7 != OUString::createFromAscii("HALLO ICH BIN EIN I"), "test_OWString error 21.b");
 
      OUString s7;
     OUString s8(OUString::createFromAscii("HALLO ICH BIN EIN SS"));
@@ -171,7 +171,7 @@ void oldtests::test_OUString()
 
     s7 = s8.trim();
     TEST_ENSURE( s7 == OUString::createFromAscii("HALLO ICH BIN EIN SS"), "test_OWString error 23");
-//  TEST_ENSURE( wcscmp(s7.getStr(), L"HALLO ICH BIN EIN SS") == 0, "test_OWString error 24");
+//	TEST_ENSURE( wcscmp(s7.getStr(), L"HALLO ICH BIN EIN SS") == 0, "test_OWString error 24");
 
     s7 = OUString::createFromAscii("Hallo");
     s8 = OUString::createFromAscii("aber Hallo");
@@ -188,54 +188,54 @@ void oldtests::test_OUString()
 
     s8 = s8.replace((sal_Unicode)'l', (sal_Unicode)'r');
     TEST_ENSURE( s8 == OUString::createFromAscii("Harro"), "test_OWString error 32");
-// LLA: len() unknown   TEST_ENSURE( s8.len() == 5, "test_OWString error 33");
+// LLA: len() unknown	TEST_ENSURE( s8.len() == 5, "test_OWString error 33");
 
     //       "Ich bin ein String mit einem A und C und vielen m, m, m, m"
-    //        |    |    |    |    |    |    |    |    |    |    |    |
-    //index   0    5    10   15   20   25   30   35   40   45   50   55
+    //		  |	   |	|	 |	  |	   |	|	 |	  |	   |	|	 |
+    //index	  0	   5	10	 15	  20   25	30	 35	  40   45	50	 55
     s8 = OUString::createFromAscii("Ich bin ein String mit einem A und C und vielen m, m, m, m");
-// LLA: no matching     TEST_ENSURE( s8.search((sal_Unicode)'I') == 0, "test_OWString error 34");
-// LLA: no matching     TEST_ENSURE( s8.search((sal_Unicode)'A') == 29, "test_OWString error 35");
-// LLA: no matching     s7 = OUString::createFromAscii("A und C");
-// LLA: no matching     TEST_ENSURE( s8.search(s7) == 29, "test_OWString error 36");
-// LLA: no matching     TEST_ENSURE( s8.search(OUString::createFromAscii("mit einem A")) == 19, "test_OWString error 37");
+// LLA: no matching 	TEST_ENSURE( s8.search((sal_Unicode)'I') == 0, "test_OWString error 34");
+// LLA: no matching 	TEST_ENSURE( s8.search((sal_Unicode)'A') == 29, "test_OWString error 35");
+// LLA: no matching 	s7 = OUString::createFromAscii("A und C");
+// LLA: no matching 	TEST_ENSURE( s8.search(s7) == 29, "test_OWString error 36");
+// LLA: no matching 	TEST_ENSURE( s8.search(OUString::createFromAscii("mit einem A")) == 19, "test_OWString error 37");
 // LLA: no matching
-// LLA: no matching     s8 = OUString::createFromAscii("||token1|token2|token3||token4|token5||" );
-// LLA: no matching     TEST_ENSURE( s8.getTokenCount('|') == 10, "test_OWString error 38a");
-// LLA: no matching     TEST_ENSURE( s8.getToken(10,'|') == OUString(), "test_OWString error 39a");
+// LLA: no matching 	s8 = OUString::createFromAscii("||token1|token2|token3||token4|token5||" );
+// LLA: no matching 	TEST_ENSURE( s8.getTokenCount('|') == 10, "test_OWString error 38a");
+// LLA: no matching 	TEST_ENSURE( s8.getToken(10,'|') == OUString(), "test_OWString error 39a");
 // LLA: no matching
-// LLA: no matching     s8 = OUString::createFromAscii("token1");
-// LLA: no matching     TEST_ENSURE( s8.getTokenCount('|') == 1, "test_OWString error 38b");
-// LLA: no matching     TEST_ENSURE( s8.getToken(0,'|') == OUString::createFromAscii("token1"), "test_OWString error 39b");
-// LLA: no matching     TEST_ENSURE( s8.getToken(-1,'|') == OUString(), "test_OWString error 39c");
-// LLA: no matching     TEST_ENSURE( s8.getToken(1,'|') == OUString(), "test_OWString error 39d");
+// LLA: no matching 	s8 = OUString::createFromAscii("token1");
+// LLA: no matching 	TEST_ENSURE( s8.getTokenCount('|') == 1, "test_OWString error 38b");
+// LLA: no matching 	TEST_ENSURE( s8.getToken(0,'|') == OUString::createFromAscii("token1"), "test_OWString error 39b");
+// LLA: no matching 	TEST_ENSURE( s8.getToken(-1,'|') == OUString(), "test_OWString error 39c");
+// LLA: no matching 	TEST_ENSURE( s8.getToken(1,'|') == OUString(), "test_OWString error 39d");
 // LLA: no matching
-// LLA: no matching     s8 = OUString::createFromAscii("|hallo1|hallo2|hallo3|hallo4|hallo5|hallo6|hallo7|hallo8|");
-// LLA: no matching     TEST_ENSURE( s8.getTokenCount((sal_Unicode)'|') == 10, "test_OWString error 38");
-// LLA: no matching     TEST_ENSURE( s8.getToken(3, (sal_Unicode)'|') == OUString::createFromAscii("hallo3"), "test_OWString error 39");
+// LLA: no matching 	s8 = OUString::createFromAscii("|hallo1|hallo2|hallo3|hallo4|hallo5|hallo6|hallo7|hallo8|");
+// LLA: no matching 	TEST_ENSURE( s8.getTokenCount((sal_Unicode)'|') == 10, "test_OWString error 38");
+// LLA: no matching 	TEST_ENSURE( s8.getToken(3, (sal_Unicode)'|') == OUString::createFromAscii("hallo3"), "test_OWString error 39");
 
 // LLA: removed due to the fact, this is not a clean test!
 
-// LLA:     s7 = OUString();
-// LLA:     s7 += s8;
-// LLA:     TEST_ENSURE( s7 == s8, "test_OWString error 40");
+// LLA: 	s7 = OUString();
+// LLA: 	s7 += s8;
+// LLA: 	TEST_ENSURE( s7 == s8, "test_OWString error 40");
 // LLA:
-// LLA:     s7 = s8.replaceAt(8, 6, OUString::createFromAscii("mmmmmmmmmm"));
-// LLA:     TEST_ENSURE( s7.getLength() == 61, "test_OWString error 41");
+// LLA: 	s7 = s8.replaceAt(8, 6, OUString::createFromAscii("mmmmmmmmmm"));
+// LLA: 	TEST_ENSURE( s7.getLength() == 61, "test_OWString error 41");
 // LLA:
-// LLA:     s8 = s7.replaceAt(8, 11, OUString());
-// LLA:     TEST_ENSURE( s8.getLength() == 50, "test_OWString error 42");
+// LLA: 	s8 = s7.replaceAt(8, 11, OUString());
+// LLA: 	TEST_ENSURE( s8.getLength() == 50, "test_OWString error 42");
 // LLA:
-// LLA:     s7 = s8.replaceAt(8, 0, OUString::createFromAscii("hallo2|"));
-// LLA:     TEST_ENSURE( s7.getLength() == 57, "test_OWString error 43");
+// LLA: 	s7 = s8.replaceAt(8, 0, OUString::createFromAscii("hallo2|"));
+// LLA: 	TEST_ENSURE( s7.getLength() == 57, "test_OWString error 43");
 // LLA:
-// LLA:     sal_Int32 pos = 0;
-// LLA:     while ((pos = s7.indexOf(OUString::createFromAscii("|"))) >= 0)
-// LLA:     {
-// LLA:         s8 = s7.replaceAt(pos, 1, OUString::createFromAscii("**"));
-// LLA:         s7 = s8;
-// LLA:     }
-// LLA:     TEST_ENSURE( s7.getLength() == 66, "test_OWString error 44");
+// LLA: 	sal_Int32 pos = 0;
+// LLA: 	while ((pos = s7.indexOf(OUString::createFromAscii("|"))) >= 0)
+// LLA: 	{
+// LLA: 		s8 = s7.replaceAt(pos, 1, OUString::createFromAscii("**"));
+// LLA: 		s7 = s8;
+// LLA: 	}
+// LLA: 	TEST_ENSURE( s7.getLength() == 66, "test_OWString error 44");
 
     TEST_ENSURE( OUString::createFromAscii("aaa" ).compareTo( OUString::createFromAscii("bbb" ) ) < 0, "test_OWString error 46" );
     TEST_ENSURE( OUString::createFromAscii("aaa" ).compareTo( OUString::createFromAscii("aaa" ) ) == 0, "test_OWString error 46" );
@@ -270,12 +270,12 @@ void oldtests::test_OUString()
     // ASCII-Schnittstellen, AB 15.10.1999
 
     //       "Ich bin ein reiner ASCII-String mit ein paar Zahlen 0123456789 und Zeichen"
-    //        |    |    |    |    |    |    |    |    |    |    |    |    |    |    |
-    //index   0    5    10   15   20   25   30   35   40   45   50   55   60   65   70
+    //		  |	   |	|	 |	  |	   |	|	 |	  |	   |	|    |    |    |    |
+    //index	  0	   5	10	 15	  20   25	30	 35	  40   45	50	 55   60   65   70
     //
     //       "Ich bin ein weiterer ASCII-String"
-    //        |    |    |    |    |    |    |
-    //index   0    5    10   15   20   25   30
+    //		  |	   |	|	 |	  |	   |	|
+    //index	  0	   5	10	 15	  20   25	30
     sal_Char ascii_str1[] = "Ich bin ein reiner ASCII-String mit ein paar Zahlen 0123456789 und Zeichen";
     sal_Char ascii_str2[] = "Ich bin ein weiterer ASCII-String";
     OUString OWAsciiStr1 = OUString::createFromAscii( ascii_str1 );
@@ -358,13 +358,13 @@ void oldtests::test_OUString()
     TEST_ENSURE( n3 == 0x4423A61, "test_OWString error 73" );
 
 // LLA: Value tests fails most the time, this is not a good test
-// LLA:     double d = 1.23456781;
-// LLA:     OUString sDouble = OUString::valueOf( d );
-// LLA:     char str[] = "1.2345678099999999";
-// LLA:     sal_Int32 nLength = sDouble.getLength();
-// LLA:     TEST_ENSURE( nLength == strlen( str ), "test_OWString error 74" );
-// LLA:     sal_Int32 nCompare = sDouble.compareToAscii( str );
-// LLA:     TEST_ENSURE( nCompare == 0, "test_OWString error 75" );
+// LLA: 	double d = 1.23456781;
+// LLA: 	OUString sDouble = OUString::valueOf( d );
+// LLA: 	char str[] = "1.2345678099999999";
+// LLA: 	sal_Int32 nLength = sDouble.getLength();
+// LLA: 	TEST_ENSURE( nLength == strlen( str ), "test_OWString error 74" );
+// LLA: 	sal_Int32 nCompare = sDouble.compareToAscii( str );
+// LLA: 	TEST_ENSURE( nCompare == 0, "test_OWString error 75" );
 
     printf("test_OWString OK !!!\n");
     return;
diff --git a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
index fa03107e2a28..11a7b9af11cb 100644
--- a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
+++ b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/sal/test_types.cxx b/sal/qa/sal/test_types.cxx
index 0d1a8757f006..3b6c85cda068 100644
--- a/sal/qa/sal/test_types.cxx
+++ b/sal/qa/sal/test_types.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/sal/version.map b/sal/qa/sal/version.map
index 7321bbca16ad..f313c44bd7ad 100644
--- a/sal/qa/sal/version.map
+++ b/sal/qa/sal/version.map
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/systools/test_comtools.cxx b/sal/qa/systools/test_comtools.cxx
index 9f39b854c06d..4ec7004eb706 100644
--- a/sal/qa/systools/test_comtools.cxx
+++ b/sal/qa/systools/test_comtools.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/testHelperFunctions/testHelperFunctions.cxx b/sal/qa/testHelperFunctions/testHelperFunctions.cxx
index be58ac4effa6..b9504f7c73ef 100644
--- a/sal/qa/testHelperFunctions/testHelperFunctions.cxx
+++ b/sal/qa/testHelperFunctions/testHelperFunctions.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx
index 465b05229555..aceca9ce0730 100644
--- a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx
+++ b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/rtl/source/alloc.c b/sal/rtl/source/alloc.c
index fb4f8767106f..b4c513ae1840 100644
--- a/sal/rtl/source/alloc.c
+++ b/sal/rtl/source/alloc.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -71,7 +71,7 @@ typedef pthread_mutex_t mutex_type;
 #define RTL_MUTEX_RELEASE(a)  pthread_mutex_unlock((a))
 
 #if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX) || \
-    defined(OPENBSD)
+	defined(OPENBSD)
 static sal_Size __rtl_memory_vmpagesize (void)
 {
     /* xBSD */
@@ -214,7 +214,7 @@ typedef HMTX mutex_type;
  */
 static void __rtl_mutex_init (mutex_type* mutex)
 {
-    APIRET      rc = 0;
+    APIRET		rc = 0;
 
     rc = DosCreateMutexSem(NULL,mutex,0,0);
 
@@ -222,7 +222,7 @@ static void __rtl_mutex_init (mutex_type* mutex)
 
 static int __rtl_mutex_destroy (mutex_type* mutex)
 {
-    APIRET      rc = 0;
+    APIRET		rc = 0;
 
 
     do {
@@ -239,9 +239,9 @@ static int __rtl_mutex_destroy (mutex_type* mutex)
 
 static int __rtl_mutex_acquire(mutex_type* mutex)
 {
-    int     ret = 0;
-    int     status = 0;
-    APIRET      rc = 0;
+    int		ret = 0;
+    int		status = 0;
+    APIRET		rc = 0;
 
     // initialize static semaphores created with PTHREAD_MUTEX_INITIALIZER state.
     if (*mutex == -1)
@@ -257,9 +257,9 @@ static int __rtl_mutex_acquire(mutex_type* mutex)
 
 static int __rtl_mutex_release(mutex_type* mutex)
 {
-    int     ret = 0;
-    APIRET      rc = 0;
-    int     status;
+    int		ret = 0;
+    APIRET		rc = 0;
+    int		status;
 
 
     // initialize static semaphores created with PTHREAD_MUTEX_INITIALIZER state.
diff --git a/sal/rtl/source/alloc_arena.c b/sal/rtl/source/alloc_arena.c
index c782ccf43b63..ce4faa2ae86d 100644
--- a/sal/rtl/source/alloc_arena.c
+++ b/sal/rtl/source/alloc_arena.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -309,10 +309,10 @@ rtl_arena_freelist_remove (
 
 /** RTL_ARENA_HASH_INDEX()
  */
-#define RTL_ARENA_HASH_INDEX_IMPL(a, s, q, m) \
+#define	RTL_ARENA_HASH_INDEX_IMPL(a, s, q, m) \
      ((((a) + ((a) >> (s)) + ((a) >> ((s) << 1))) >> (q)) & (m))
-
-#define RTL_ARENA_HASH_INDEX(arena, addr) \
+ 
+#define	RTL_ARENA_HASH_INDEX(arena, addr) \
     RTL_ARENA_HASH_INDEX_IMPL((addr), (arena)->m_hash_shift, (arena)->m_quantum_shift, ((arena)->m_hash_size - 1))
 
 /** rtl_arena_hash_rescale()
@@ -871,7 +871,7 @@ rtl_arena_deactivate (
     {
         rtl_arena_free (
             gp_arena_arena,
-            arena->m_hash_table,
+            arena->m_hash_table, 
             arena->m_hash_size * sizeof(rtl_arena_segment_type*));
 
         arena->m_hash_table = arena->m_hash_table_0;
@@ -994,7 +994,7 @@ try_alloc:
 void
 SAL_CALL rtl_arena_destroy (
     rtl_arena_type * arena
-)
+) 
 {
     if (arena != 0)
     {
diff --git a/sal/rtl/source/alloc_arena.h b/sal/rtl/source/alloc_arena.h
index 8c0f08c0fd4f..f06e8b5df949 100644
--- a/sal/rtl/source/alloc_arena.h
+++ b/sal/rtl/source/alloc_arena.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/rtl/source/alloc_cache.c b/sal/rtl/source/alloc_cache.c
index 51e675c39316..916461e042aa 100644
--- a/sal/rtl/source/alloc_cache.c
+++ b/sal/rtl/source/alloc_cache.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -110,10 +110,10 @@ rtl_cache_init (void);
 
 /** RTL_CACHE_HASH_INDEX()
  */
-#define RTL_CACHE_HASH_INDEX_IMPL(a, s, q, m) \
+#define	RTL_CACHE_HASH_INDEX_IMPL(a, s, q, m) \
      ((((a) + ((a) >> (s)) + ((a) >> ((s) << 1))) >> (q)) & (m))
-
-#define RTL_CACHE_HASH_INDEX(cache, addr) \
+ 
+#define	RTL_CACHE_HASH_INDEX(cache, addr) \
     RTL_CACHE_HASH_INDEX_IMPL((addr), (cache)->m_hash_shift, (cache)->m_type_shift, ((cache)->m_hash_size - 1))
 
 
diff --git a/sal/rtl/source/alloc_cache.h b/sal/rtl/source/alloc_cache.h
index 05efceb980c8..29d4fa7be103 100644
--- a/sal/rtl/source/alloc_cache.h
+++ b/sal/rtl/source/alloc_cache.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/rtl/source/alloc_global.c b/sal/rtl/source/alloc_global.c
index 4daa655a4b70..abb607234c95 100644
--- a/sal/rtl/source/alloc_global.c
+++ b/sal/rtl/source/alloc_global.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -153,7 +153,7 @@ rtl_memory_init (void)
 
   Mac OS X does not seem to support "__cxa__atexit", thus leading
   to the situation that "__attribute__((destructor))__" functions
-  (in particular "rtl_memory_fini") become called _before_ global
+  (in particular "rtl_memory_fini") become called _before_ global 
   C++ object d'tors.
 
   Delegated the call to "rtl_memory_fini" into a dummy C++ object,
@@ -198,7 +198,7 @@ rtl_memory_fini (void)
  *
  * ================================================================= */
 
-void *
+void * 
 SAL_CALL rtl_allocateMemory (sal_Size n) SAL_THROW_EXTERN_C()
 {
     void * p = 0;
diff --git a/sal/rtl/source/alloc_impl.h b/sal/rtl/source/alloc_impl.h
index 4a89e62af135..537d6ec8c4c7 100644
--- a/sal/rtl/source/alloc_impl.h
+++ b/sal/rtl/source/alloc_impl.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx
index f303a81dd8d9..7f22ac2e195c 100644
--- a/sal/rtl/source/bootstrap.cxx
+++ b/sal/rtl/source/bootstrap.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -319,18 +319,18 @@ struct Bootstrap_Impl
 {
     sal_Int32 _nRefCount;
     Bootstrap_Impl * _base_ini;
-
+    
     NameValueList _nameValueList;
     OUString      _iniName;
-
+    
     explicit Bootstrap_Impl (OUString const & rIniName);
     ~Bootstrap_Impl();
-
+    
     static void * operator new (std::size_t n) SAL_THROW(())
         { return rtl_allocateMemory (sal_uInt32(n)); }
     static void operator delete (void * p , std::size_t) SAL_THROW(())
         { rtl_freeMemory (p); }
-
+    
     bool getValue(
         rtl::OUString const & key, rtl_uString ** value,
         rtl_uString * defaultValue, LookupMode mode, bool override,
@@ -368,8 +368,8 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
                 rtl_bootstrap_args_open( base_ini.pData ) );
         }
     }
-
-#if OSL_DEBUG_LEVEL > 1
+    
+#if OSL_DEBUG_LEVEL > 1    
     OString sFile = OUStringToOString(_iniName, RTL_TEXTENCODING_ASCII_US);
     OSL_TRACE(__FILE__" -- Bootstrap_Impl() - %s\n", sFile.getStr());
 #endif /* OSL_DEBUG_LEVEL > 1 */
@@ -661,7 +661,7 @@ rtlBootstrapHandle SAL_CALL rtl_bootstrap_args_open (
         return 0;
     }
     iniName = status.getFileURL();
-
+    
     Bootstrap_Impl * that;
     osl::ResettableMutexGuard guard( osl::Mutex::getGlobalMutex() );
     bootstrap_map::t* p_bootstrap_map = bootstrap_map::get();
@@ -708,7 +708,7 @@ void SAL_CALL rtl_bootstrap_args_close (
     if (handle == 0)
         return;
     Bootstrap_Impl * that = static_cast< Bootstrap_Impl * >( handle );
-
+    
     osl::MutexGuard guard( osl::Mutex::getGlobalMutex() );
     bootstrap_map::t* p_bootstrap_map = bootstrap_map::get();
     OSL_ASSERT(
@@ -775,7 +775,7 @@ void SAL_CALL rtl_bootstrap_get_iniName_from_handle (
         }
         else
         {
-            const OUString & iniName = getIniFileName_Impl();
+            const OUString & iniName = getIniFileName_Impl();       
             rtl_uString_assign(ppIniName, iniName.pData);
         }
     }
@@ -882,7 +882,7 @@ namespace {
 
 int hex(sal_Unicode c) {
     return
-        c >= '0' && c <= '9' ? c - '0' :
+        c >= '0' && c <= '9' ? c - '0' : 
         c >= 'A' && c <= 'F' ? c - 'A' + 10 :
         c >= 'a' && c <= 'f' ? c - 'a' + 10 : -1;
 }
diff --git a/sal/rtl/source/byteseq.c b/sal/rtl/source/byteseq.c
index 52c81d8df375..5d72497ec7f9 100644
--- a/sal/rtl/source/byteseq.c
+++ b/sal/rtl/source/byteseq.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -178,7 +178,7 @@ void SAL_CALL rtl_byte_sequence_construct( sal_Sequence **ppSequence , sal_Int32
 }
 
 //==================================================================================================
-void SAL_CALL rtl_byte_sequence_constructNoDefault( sal_Sequence **ppSequence , sal_Int32 nLength )
+void SAL_CALL rtl_byte_sequence_constructNoDefault(	sal_Sequence **ppSequence , sal_Int32 nLength )
 {
     OSL_ASSERT( ppSequence );
     if( *ppSequence )
@@ -217,7 +217,7 @@ void SAL_CALL rtl_byte_sequence_assign( sal_Sequence **ppSequence , sal_Sequence
         *ppSequence = pSequence;
         rtl_byte_sequence_acquire( *ppSequence );
     }
-//  else
+//	else
 //      nothing to do
 
 }
diff --git a/sal/rtl/source/cipher.c b/sal/rtl/source/cipher.c
index 397fca90923c..4c1e60d5d9d3 100644
--- a/sal/rtl/source/cipher.c
+++ b/sal/rtl/source/cipher.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -937,7 +937,7 @@ static void __rtl_cipherBF_encode (
     t  = XL;
     XL = XR;
     XR = t;
-
+    
     XR ^= key->m_P[CIPHER_ROUNDS_BF    ];
     XL ^= key->m_P[CIPHER_ROUNDS_BF + 1];
 
@@ -1237,7 +1237,7 @@ static rtlCipherError rtl_cipherARCFOUR_update_Impl (
         t = (S[x] + S[y]) % CIPHER_CBLOCK_ARCFOUR;
         pBuffer[k] = pData[k] ^ ((sal_uInt8)(S[t] & 0xff));
     }
-
+    
     return rtl_Cipher_E_None;
 }
 
diff --git a/sal/rtl/source/cmdargs.cxx b/sal/rtl/source/cmdargs.cxx
index ed44843b11cc..108a0316f0fb 100644
--- a/sal/rtl/source/cmdargs.cxx
+++ b/sal/rtl/source/cmdargs.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/rtl/source/crc.c b/sal/rtl/source/crc.c
index 39e2c5b08ef4..d8a8db028a3a 100644
--- a/sal/rtl/source/crc.c
+++ b/sal/rtl/source/crc.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,99 +39,99 @@
 static const sal_uInt32 rtl_crc32Table[256] =
 {
     /* 0 */
-    0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
-    0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-    0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
-    0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
+    0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 
+    0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, 
+    0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 
+    0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 
 
     /* 1 */
-    0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
-    0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-    0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
-    0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
+    0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 
+    0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 
+    0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 
+    0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, 
 
     /* 2 */
-    0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
-    0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-    0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
-    0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+    0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 
+    0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 
+    0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 
+    0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 
 
     /* 3 */
-    0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
-    0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-    0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
-    0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
+    0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 
+    0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, 
+    0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 
+    0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 
 
     /* 4 */
-    0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
-    0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-    0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
-    0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
+    0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 
+    0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, 
+    0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 
+    0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, 
 
     /* 5 */
-    0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
-    0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-    0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
-    0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+    0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 
+    0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 
+    0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 
+    0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, 
 
     /* 6 */
-    0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
-    0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-    0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
-    0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
+    0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 
+    0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 
+    0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 
+    0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 
 
     /* 7 */
-    0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
-    0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-    0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
-    0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
+    0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 
+    0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, 
+    0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 
+    0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, 
 
     /* 8 */
-    0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
-    0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-    0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
-    0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+    0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 
+    0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 
+    0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 
+    0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 
 
     /* 9 */
-    0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
-    0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-    0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
-    0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
+    0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 
+    0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, 
+    0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 
+    0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 
 
     /* A */
-    0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
-    0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-    0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
-    0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
+    0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 
+    0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, 
+    0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 
+    0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, 
 
     /* B */
-    0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
-    0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-    0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
-    0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+    0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 
+    0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 
+    0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 
+    0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, 
 
     /* C */
-    0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
-    0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-    0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
-    0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
+    0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 
+    0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, 
+    0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 
+    0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 
 
     /* D */
-    0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
-    0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-    0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
-    0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
+    0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 
+    0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, 
+    0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 
+    0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 
 
     /* E */
-    0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
-    0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-    0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
-    0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+    0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 
+    0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 
+    0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 
+    0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, 
 
     /* F */
-    0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
-    0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-    0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+    0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 
+    0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, 
+    0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 
     0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
 };
 
diff --git a/sal/rtl/source/debugprint.cxx b/sal/rtl/source/debugprint.cxx
index 079643b07fd4..38d4cb58702c 100644
--- a/sal/rtl/source/debugprint.cxx
+++ b/sal/rtl/source/debugprint.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/rtl/source/digest.c b/sal/rtl/source/digest.c
index 99ee52cadcef..5ee0210226c1 100644
--- a/sal/rtl/source/digest.c
+++ b/sal/rtl/source/digest.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -684,7 +684,7 @@ static void __rtl_digest_endMD5 (DigestContextMD5 *ctx)
         0x80, 0x00, 0x00, 0x00
     };
     register const sal_uInt8 *p = end;
-
+    
     register sal_uInt32 *X;
     register int         i;
 
@@ -1132,7 +1132,7 @@ static void __rtl_digest_endSHA (DigestContextSHA *ctx)
         0x80, 0x00, 0x00, 0x00
     };
     register const sal_uInt8 *p = end;
-
+    
     register sal_uInt32 *X;
     register int         i;
 
diff --git a/sal/rtl/source/gen_makefile.cxx b/sal/rtl/source/gen_makefile.cxx
index 9bdbe5a1f39a..1d35d168bda7 100644
--- a/sal/rtl/source/gen_makefile.cxx
+++ b/sal/rtl/source/gen_makefile.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/rtl/source/hash.cxx b/sal/rtl/source/hash.cxx
index 6e8496875dd5..5ae56a6a06c3 100644
--- a/sal/rtl/source/hash.cxx
+++ b/sal/rtl/source/hash.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/rtl/source/locale.c b/sal/rtl/source/locale.c
index 3c3c98c80157..964be09966db 100644
--- a/sal/rtl/source/locale.c
+++ b/sal/rtl/source/locale.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/rtl/source/logfile.cxx b/sal/rtl/source/logfile.cxx
index ff7e6899f1ff..c00ba76b1def 100644
--- a/sal/rtl/source/logfile.cxx
+++ b/sal/rtl/source/logfile.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,9 +59,9 @@ namespace {
 static oslFileHandle g_aFile = 0;
 static sal_Bool g_bHasBeenCalled = sal_False;
 static const sal_Int32 g_BUFFERSIZE = 4096;
-static sal_Char *g_buffer = 0;
-
-class   LoggerGuard
+static sal_Char *g_buffer = 0;	
+    
+class	LoggerGuard
 {
 public:
     ~LoggerGuard();
@@ -77,7 +77,7 @@ LoggerGuard::~LoggerGuard()
             osl_writeFile( g_aFile, g_buffer, nConverted, (sal_uInt64 *)&nWritten );
         osl_closeFile( g_aFile );
         g_aFile = 0;
-
+        
         rtl_freeMemory( g_buffer );
         g_buffer = 0;
         g_bHasBeenCalled = sal_False;
@@ -129,17 +129,17 @@ void init() {
             OUString value;
             if( rtl_bootstrap_get( name.pData, &value.pData, 0 ) )
             {
-                //  Obtain process id.
+                //	Obtain process id.
                 oslProcessIdentifier aProcessId = 0;
                 oslProcessInfo info;
                 info.Size = sizeof (oslProcessInfo);
                 if (osl_getProcessInfo (0, osl_Process_IDENTIFIER, &info) == osl_Process_E_None)
                     aProcessId = info.Ident;
-
-                //  Construct name of log file and open the file.
+                
+                //	Construct name of log file and open the file.
                 OUStringBuffer buf( 128 );
                 buf.append( value );
-
+                
                 // if the filename ends with .nopid, the incoming filename is not modified
                 if( value.getLength() < 6 /* ".nopid" */ ||
                     rtl_ustr_ascii_compare_WithLength(
@@ -174,7 +174,7 @@ void init() {
                             osl_writeFile( g_aFile, g_buffer, nConverted , (sal_uInt64 *)&nWritten );
                         }
                     }
-
+                    
                     nConverted = sprintf (g_buffer, "Process id is %" SAL_PRIuUINT32 "\n", aProcessId);
                     if( nConverted )
                     {
@@ -194,7 +194,7 @@ void init() {
 
 }
 
-extern "C" void SAL_CALL rtl_logfile_trace  ( const char *pszFormat, ... )
+extern "C" void	SAL_CALL rtl_logfile_trace	( const char *pszFormat, ... )
 {
     init();
     if( g_buffer )
diff --git a/sal/rtl/source/macro.hxx b/sal/rtl/source/macro.hxx
index bb86b7d9ae39..70288408a636 100644
--- a/sal/rtl/source/macro.hxx
+++ b/sal/rtl/source/macro.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/rtl/source/memory.c b/sal/rtl/source/memory.c
index 070b7898d413..888dfde566ac 100644
--- a/sal/rtl/source/memory.c
+++ b/sal/rtl/source/memory.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/rtl/source/memory_fini.cxx b/sal/rtl/source/memory_fini.cxx
index a0fb012ff6a5..4efc3052ea93 100644
--- a/sal/rtl/source/memory_fini.cxx
+++ b/sal/rtl/source/memory_fini.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 
   Mac OS X does not seem to support "__cxa__atexit", thus leading
   to the situation that "__attribute__((destructor))__" functions
-  (in particular "rtl_memory_fini") become called _before_ global
+  (in particular "rtl_memory_fini") become called _before_ global 
   C++ object d'tors.
 
   Using a C++ dummy object instead.
diff --git a/sal/rtl/source/random.c b/sal/rtl/source/random.c
index ba9eae7c97f6..fda2e74ad88d 100644
--- a/sal/rtl/source/random.c
+++ b/sal/rtl/source/random.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -130,7 +130,7 @@ static sal_Bool __rtl_random_initPool (RandomPool_Impl *pImpl)
         double              seed;
 
         /* The use of uninitialized stack variables as a way to
-         * enhance the entropy of the random pool triggers
+         * enhance the entropy of the random pool triggers 
          * memory checkers like purify and valgrind.
          */
 
diff --git a/sal/rtl/source/rtl_process.c b/sal/rtl/source/rtl_process.c
index 0845f46f5723..0317cd1afa2d 100644
--- a/sal/rtl/source/rtl_process.c
+++ b/sal/rtl/source/rtl_process.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/rtl/source/strbuf.c b/sal/rtl/source/strbuf.c
index 47fd5c8b51ed..446b1cee23ce 100644
--- a/sal/rtl/source/strbuf.c
+++ b/sal/rtl/source/strbuf.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,10 +40,10 @@
 
 
 /*************************************************************************
- *  rtl_stringbuffer_newFromStr_WithLength
+ *	rtl_stringbuffer_newFromStr_WithLength
  */
 void SAL_CALL rtl_stringbuffer_newFromStr_WithLength( rtl_String ** newStr,
-                                                      const sal_Char * value,
+                                                      const sal_Char * value, 
                                                       sal_Int32 count )
 {
     if (!value)
@@ -55,11 +55,11 @@ void SAL_CALL rtl_stringbuffer_newFromStr_WithLength( rtl_String ** newStr,
     rtl_string_new_WithLength( newStr, count + 16 );
     (*newStr)->length = count;
     rtl_copyMemory( (*newStr)->buffer, value, count );
-    return;
-}
+    return;	
+}	
 
 /*************************************************************************
- *  rtl_stringbuffer_newFromStringBuffer
+ *	rtl_stringbuffer_newFromStringBuffer
  */
 sal_Int32 SAL_CALL rtl_stringbuffer_newFromStringBuffer( rtl_String ** newStr,
                                                          sal_Int32 capacity,
@@ -76,15 +76,15 @@ sal_Int32 SAL_CALL rtl_stringbuffer_newFromStringBuffer( rtl_String ** newStr,
         rtl_copyMemory( (*newStr)->buffer, oldStr->buffer, oldStr->length );
     }
     return newCapacity;
-}
+}	
 
 /*************************************************************************
- *  rtl_stringbuffer_ensureCapacity
+ *	rtl_stringbuffer_ensureCapacity
  */
 void SAL_CALL rtl_stringbuffer_ensureCapacity
     (rtl_String ** This, sal_Int32* capacity, sal_Int32 minimumCapacity)
 {
-    if (minimumCapacity > *capacity)
+    if (minimumCapacity > *capacity) 
     {
         rtl_String * pTmp = *This;
         rtl_String * pNew = NULL;
@@ -100,15 +100,15 @@ void SAL_CALL rtl_stringbuffer_ensureCapacity
         rtl_copyMemory( (*This)->buffer, pTmp->buffer, pTmp->length );
         rtl_string_release( pTmp );
     }
-}
+}	
 
 /*************************************************************************
- *  rtl_stringbuffer_insert
+ *	rtl_stringbuffer_insert
  */
-void SAL_CALL rtl_stringbuffer_insert( rtl_String ** This,
+void SAL_CALL rtl_stringbuffer_insert( rtl_String ** This, 
                                        sal_Int32 * capacity,
-                                       sal_Int32 offset,
-                                       const sal_Char * str,
+                                       sal_Int32 offset, 
+                                       const sal_Char * str, 
                                        sal_Int32 len )
 {
     sal_Int32 nOldLen;
@@ -118,7 +118,7 @@ void SAL_CALL rtl_stringbuffer_insert( rtl_String ** This,
     {
         if (*capacity < (*This)->length + len)
             rtl_stringbuffer_ensureCapacity( This, capacity, (*This)->length + len );
-
+        
         /*
         if( len == 1 )
             This->buffer
@@ -144,6 +144,6 @@ void SAL_CALL rtl_stringbuffer_insert( rtl_String ** This,
         (*This)->length = nOldLen + len;
         pBuf[ nOldLen + len ] = 0;
     }
-}
+}	
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/strimp.c b/sal/rtl/source/strimp.c
index ae75249fb4aa..3e66f0412e23 100644
--- a/sal/rtl/source/strimp.c
+++ b/sal/rtl/source/strimp.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,9 +50,9 @@ sal_Bool rtl_ImplIsWhitespace( sal_Unicode c )
     if ( (c < 0x2000) || (c > 0x206F) )
         return sal_False;
 
-    if ( ((c >= 0x2000) && (c <= 0x200B)) ||    /* All Spaces           */
-         (c == 0x2028) ||                       /* LINE SEPARATOR       */
-         (c == 0x2029) )                        /* PARAGRAPH SEPARATOR  */
+    if ( ((c >= 0x2000) && (c <= 0x200B)) ||	/* All Spaces			*/
+         (c == 0x2028) ||						/* LINE SEPARATOR		*/
+         (c == 0x2029) )						/* PARAGRAPH SEPARATOR	*/
         return sal_True;
 
     return sal_False;
diff --git a/sal/rtl/source/strimp.h b/sal/rtl/source/strimp.h
index 3db89cec8145..bbf3850c6821 100644
--- a/sal/rtl/source/strimp.h
+++ b/sal/rtl/source/strimp.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 #include "sal/types.h"
 
 /* ======================================================================= */
-/* Help functions for String and UString                                   */
+/* Help functions for String and UString								   */
 /* ======================================================================= */
 
 #if defined __cplusplus
diff --git a/sal/rtl/source/string.c b/sal/rtl/source/string.c
index 287f19aef6e5..e81123241e8e 100644
--- a/sal/rtl/source/string.c
+++ b/sal/rtl/source/string.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/rtl/source/strtmpl.c b/sal/rtl/source/strtmpl.c
index bf3f4fd44600..98c09f15a321 100644
--- a/sal/rtl/source/strtmpl.c
+++ b/sal/rtl/source/strtmpl.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/rtl/source/surrogates.h b/sal/rtl/source/surrogates.h
index c686e181047a..3defb843c5d9 100644
--- a/sal/rtl/source/surrogates.h
+++ b/sal/rtl/source/surrogates.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/rtl/source/tres.c b/sal/rtl/source/tres.c
index 2cf429c6a49c..2041a00efaae 100644
--- a/sal/rtl/source/tres.c
+++ b/sal/rtl/source/tres.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/rtl/source/unload.cxx b/sal/rtl/source/unload.cxx
index 18bedabc9bd9..304e36803749 100644
--- a/sal/rtl/source/unload.cxx
+++ b/sal/rtl/source/unload.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@ static void rtl_notifyUnloadingListeners();
 
 static sal_Bool isEqualTimeValue ( const TimeValue* time1,  const TimeValue* time2)
 {
-    if( time1->Seconds == time2->Seconds &&
+    if( time1->Seconds == time2->Seconds && 
         time1->Nanosec == time2->Nanosec)
         return sal_True;
     else
@@ -105,7 +105,7 @@ static sal_Bool hasEnoughTimePassed( const TimeValue* unusedSince, const TimeVal
         if( isGreaterEqualTimeValue( &currentTime, &addedTime))
             retval= sal_True;
     }
-
+    
     return retval;
 }
 
@@ -138,7 +138,7 @@ extern "C" void rtl_moduleCount_release( rtl_ModuleCount * that )
     if( pMod->counter == 0)
     {
         MutexGuard guard( getUnloadingMutex());
-
+        
         if( sal_False == osl_getSystemTime( &pMod->unusedSince) )
         {
             // set the time to 0 if we could not get the time
@@ -191,7 +191,7 @@ extern "C" sal_Bool rtl_moduleCount_canUnload( rtl_StandardModuleCount * that, T
         {
             rtl_copyMemory(libUnused, &that->unusedSince, sizeof(TimeValue));
         }
-    }
+    }	
     return (that->counter == 0);
 }
 
@@ -253,7 +253,7 @@ extern "C" void SAL_CALL rtl_unloadUnusedModules( TimeValue* libUnused)
 
     ModuleMap& moduleMap= getModuleMap();
     Mod_IT it_e= moduleMap.end();
-
+    
     // notify all listeners
     rtl_notifyUnloadingListeners();
 
@@ -283,7 +283,7 @@ extern "C" void SAL_CALL rtl_unloadUnusedModules( TimeValue* libUnused)
                 // mark the module for later removal
                 unloadedModulesList.push_front( it->first);
             }
-        }
+        }	
     }
 
     // remove all entries containing invalid (unloaded) modules
@@ -332,9 +332,9 @@ static ListenerMap& getListenerMap()
 }
 
 
-// This queue contains cookies which have been passed out by rtl_addUnloadingListener and
+// This queue contains cookies which have been passed out by rtl_addUnloadingListener and 
 // which have been regainded by rtl_removeUnloadingListener. When rtl_addUnloadingListener
-// is called then a cookie has to be returned. First we look into the set if there is one
+// is called then a cookie has to be returned. First we look into the set if there is one 
 // availabe. Otherwise a new cookie will be provided.
 // not a new value is returned.
 
@@ -381,9 +381,9 @@ static inline void recycleCookie( sal_Int32 i)
 
 
 // calling the function twice with the same arguments will return tow different cookies.
-// The listener will then notified twice.
+// The listener will then notified twice. 
 
-extern "C"
+extern "C" 
 sal_Int32 SAL_CALL rtl_addUnloadingListener( rtl_unloadingListenerFunc callback, void* _this)
 {
     MutexGuard guard( getUnloadingMutex());
@@ -395,7 +395,7 @@ sal_Int32 SAL_CALL rtl_addUnloadingListener( rtl_unloadingListenerFunc callback,
 }
 
 
-extern "C"
+extern "C" 
 void SAL_CALL rtl_removeUnloadingListener( sal_Int32 cookie )
 {
     MutexGuard guard( getUnloadingMutex());
@@ -411,7 +411,7 @@ static void rtl_notifyUnloadingListeners()
 {
     ListenerMap& listenerMap= getListenerMap();
     for( Lis_IT it= listenerMap.begin(); it != listenerMap.end(); ++it)
-    {
+    {	
         rtl_unloadingListenerFunc callbackFunc= it->second.first;
         callbackFunc( it->second.second);
     }
diff --git a/sal/rtl/source/uri.cxx b/sal/rtl/source/uri.cxx
index 5044df311080..f06a7e5a55cc 100644
--- a/sal/rtl/source/uri.cxx
+++ b/sal/rtl/source/uri.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -205,7 +205,7 @@ sal_uInt32 readUcs4(sal_Unicode const ** pBegin, sal_Unicode const * pEnd,
                      | RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR),
                     &nInfo, &nConverted);
                 if (nInfo == 0)
-                {
+                {                    
                     OSL_ASSERT(
                         nConverted
                         == sal::static_int_cast< sal_uInt32 >(
diff --git a/sal/rtl/source/ustrbuf.c b/sal/rtl/source/ustrbuf.c
index 3b05eb258c90..33317b6f3405 100644
--- a/sal/rtl/source/ustrbuf.c
+++ b/sal/rtl/source/ustrbuf.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -71,9 +71,9 @@ sal_Int32 SAL_CALL rtl_uStringbuffer_newFromStringBuffer( rtl_uString ** newStr,
         newCapacity = oldStr->length;
 
     rtl_uString_new_WithLength( newStr, newCapacity );
-
+    
     if (oldStr->length > 0) {
-        (*newStr)->length = oldStr->length;
+        (*newStr)->length = oldStr->length;    
         rtl_copyMemory( (*newStr)->buffer, oldStr->buffer, oldStr->length * sizeof(sal_Unicode));
     }
     return newCapacity;
diff --git a/sal/rtl/source/ustring.c b/sal/rtl/source/ustring.c
index 317d24d88d90..f901e1a7626f 100644
--- a/sal/rtl/source/ustring.c
+++ b/sal/rtl/source/ustring.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/rtl/source/uuid.cxx b/sal/rtl/source/uuid.cxx
index 7be3847e6902..d824cea881cf 100644
--- a/sal/rtl/source/uuid.cxx
+++ b/sal/rtl/source/uuid.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -86,7 +86,7 @@ static  void write_v3( sal_uInt8 *pUuid  )
     SWAP_NETWORK_TO_INT32( uuid.time_low );
     SWAP_NETWORK_TO_INT16( uuid.time_mid );
     SWAP_NETWORK_TO_INT16( uuid.time_hi_and_version );
-
+    
     /* put in the variant and version bits */
     uuid.time_hi_and_version       &= 0x0FFF;
     uuid.time_hi_and_version       |= (3 << 12);
@@ -140,8 +140,8 @@ extern "C" void SAL_CALL rtl_createNamedUuid( sal_uInt8  *pTargetUUID,
 
     rtl_digest_getMD5( digest, pTargetUUID , 16 );
     rtl_digest_destroyMD5 (digest);
-
-    write_v3(pTargetUUID);
+    
+    write_v3(pTargetUUID);	
 }
 
 
@@ -177,6 +177,6 @@ extern "C" sal_Int32 SAL_CALL rtl_compareUuid( const sal_uInt8 *pUUID1 , const s
     }
     return 0;
 
-}
+}	
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/kill/kill.cxx b/sal/systools/win32/kill/kill.cxx
index 7c2122d3a32b..4a6fa5290e1f 100644
--- a/sal/systools/win32/kill/kill.cxx
+++ b/sal/systools/win32/kill/kill.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,16 +49,16 @@
 #include <sal/macros.h>
 
 #ifndef SIGNULL
-#define SIGNULL 0
+#define SIGNULL	0
 #endif
 
 #ifndef SIGKILL
-#define SIGKILL 9
+#define SIGKILL	9
 #endif
 
 #include <signal.h>
 
-#define MAX_MODULES 1024
+#define MAX_MODULES	1024
 
 /////////////////////////////////////////////////////////////////////////////
 // Determines if a returned handle value is valid
@@ -78,29 +78,29 @@ static inline bool IsValidHandle( HANDLE handle )
 #else
 FARPROC WINAPI GetProcAddressEx( HANDLE hProcess, HMODULE hModule, LPCSTR lpProcName )
 {
-    FARPROC lpfnProcAddress = GetProcAddress( hModule, lpProcName );
+    FARPROC	lpfnProcAddress = GetProcAddress( hModule, lpProcName );
 
     if ( lpfnProcAddress )
     {
-        DWORD   dwProcessId = GetProcessId( hProcess );
+        DWORD	dwProcessId = GetProcessId( hProcess );
 
         if ( GetCurrentProcessId() != dwProcessId )
         {
-            FARPROC lpfnRemoteProcAddress = NULL;
-            TCHAR   szBaseName[MAX_PATH];
+            FARPROC	lpfnRemoteProcAddress = NULL;
+            TCHAR	szBaseName[MAX_PATH];
 
             if ( GetModuleBaseName( GetCurrentProcess(), hModule, szBaseName, SAL_N_ELEMENTS(szBaseName) ) )
             {
-                HMODULE ahModules[MAX_MODULES];
-                DWORD   cbNeeded = 0;
+                HMODULE	ahModules[MAX_MODULES];
+                DWORD	cbNeeded = 0;
 
                 if ( EnumProcessModules( hProcess, ahModules, sizeof(ahModules), &cbNeeded ) )
                 {
-                    ULONG   nModules = cbNeeded / sizeof(ahModules[0]);
+                    ULONG	nModules = cbNeeded / sizeof(ahModules[0]);
 
                     for ( ULONG n = 0; n < nModules; n++ )
                     {
-                        TCHAR   szRemoteBaseName[MAX_PATH];
+                        TCHAR	szRemoteBaseName[MAX_PATH];
 
                         if ( GetModuleBaseName(
                             hProcess, ahModules[n], szRemoteBaseName, SAL_N_ELEMENTS(szRemoteBaseName) ) &&
@@ -150,15 +150,15 @@ static DWORD SignalToExceptionCode( int signal )
 
 static BOOL RaiseSignalEx( HANDLE hProcess, int sig )
 {
-    DWORD   dwProcessId = GetProcessId( hProcess );
+    DWORD	dwProcessId = GetProcessId( hProcess );
 
-    HANDLE  hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPTHREAD, 0 );
-    HANDLE  hThread = 0;
+    HANDLE	hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPTHREAD, 0 );
+    HANDLE	hThread = 0;
     BOOL fSuccess = FALSE;
 
     if ( IsValidHandle(hSnapshot) )
     {
-        THREADENTRY32   te;
+        THREADENTRY32	te;
 
         te.dwSize = sizeof(te);
         fSuccess = Thread32First( hSnapshot, &te );
@@ -166,7 +166,7 @@ static BOOL RaiseSignalEx( HANDLE hProcess, int sig )
         {
             if ( te.th32OwnerProcessID == dwProcessId )
             {
-                hThread = OpenThread(
+                hThread = OpenThread( 
                     THREAD_SUSPEND_RESUME | THREAD_QUERY_INFORMATION |
                     THREAD_GET_CONTEXT | THREAD_SET_CONTEXT,
                     FALSE, te.th32ThreadID );
@@ -182,20 +182,20 @@ static BOOL RaiseSignalEx( HANDLE hProcess, int sig )
 
     if ( fSuccess )
     {
-        CONTEXT aContext;
+        CONTEXT	aContext;
 
         if ( SuspendThread( hThread ) != (DWORD)-1 )
         {
             ZeroMemory( &aContext, sizeof(aContext) );
             aContext.ContextFlags = CONTEXT_FULL;
-
+            
             fSuccess = GetThreadContext( hThread, &aContext );
 
             if ( fSuccess )
             {
                 if ( sig )
                 {
-                    DWORD   dwStackBuffer[] =
+                    DWORD	dwStackBuffer[] =
                     {
                         aContext.Eip,
                         SignalToExceptionCode( sig ),
@@ -218,7 +218,7 @@ static BOOL RaiseSignalEx( HANDLE hProcess, int sig )
 
             fSuccess = ResumeThread( hThread ) && fSuccess;
 
-            DWORD   dwLastError = GetLastError();
+            DWORD	dwLastError = GetLastError();
             CloseHandle( hThread );
             SetLastError( dwLastError );
 
@@ -257,9 +257,9 @@ static void ParseCommandArgs( LPDWORD lpProcesses, LPDWORD lpdwNumProcesses, int
 
     const int NumSupportedSignals = SAL_N_ELEMENTS(SupportedSignals);
 
-    DWORD   dwMaxProcesses = *lpdwNumProcesses;
-    int     argc = __argc;
-    TCHAR   **argv = __targv;
+    DWORD	dwMaxProcesses = *lpdwNumProcesses;
+    int		argc = __argc;
+    TCHAR	**argv = __targv;
 
     *lpdwNumProcesses = 0;
 
@@ -282,7 +282,7 @@ static void ParseCommandArgs( LPDWORD lpProcesses, LPDWORD lpdwNumProcesses, int
                   0 == lstrcmpi( argv[argn], TEXT("/h") ) ||
                   0 == lstrcmpi( argv[argn], TEXT("--help") ) )
         {
-            _tprintf(
+            _tprintf(  
                 _T("Terminates a process by sending a signal.\n\n")
                 _T("Usage: kill [ -l ] [ -signal ] pid ...\n\n")
                 _T("-l        Lists supported signals\n")
@@ -297,14 +297,14 @@ static void ParseCommandArgs( LPDWORD lpProcesses, LPDWORD lpdwNumProcesses, int
         }
         else if ( argv[argn] && ( *argv[argn] == '-' || *argv[argn] == '/' ) )
         {
-            LPCTSTR argsig = CharNext( argv[argn] );
+            LPCTSTR	argsig = CharNext( argv[argn] );
 
-            int n;
+            int	n;
             for ( n = 0; n < NumSupportedSignals; n++ )
             {
                 _TCHAR *endptr = NULL;
 
-                if ( 0 == lstrcmpi( SupportedSignals[n].lpSignalName, argsig ) ||
+                if ( 0 == lstrcmpi( SupportedSignals[n].lpSignalName, argsig ) || 
                      _tcstoul( argsig, &endptr, 0 ) == static_cast< unsigned >(SupportedSignals[n].iSignalValue) && (!endptr || !*endptr) )
                 {
                     *pSig = SupportedSignals[n].iSignalValue;
@@ -314,10 +314,10 @@ static void ParseCommandArgs( LPDWORD lpProcesses, LPDWORD lpdwNumProcesses, int
 
             if ( n >= NumSupportedSignals )
             {
-                _ftprintf( stderr,
+                _ftprintf( stderr,  
                     _T("kill: Illegal argument %s\n")
-                    _T("Type 'kill --help' to show allowed syntax.\n")
-                    _T("Type 'kill -l' to show supported signals.\n"),
+                    _T("Type 'kill --help' to show allowed syntax.\n") 
+                    _T("Type 'kill -l' to show supported signals.\n"), 
                     argv[argn] );
                 ExitProcess( 0 );
             }
@@ -325,11 +325,11 @@ static void ParseCommandArgs( LPDWORD lpProcesses, LPDWORD lpdwNumProcesses, int
         else
         {
             unsigned long value = 0;
-            _TCHAR  *endptr = NULL;
-
+            _TCHAR	*endptr = NULL;
+            
             value = _tcstoul( argv[argn], &endptr, 0 );
 
-            if ( !endptr || !*endptr )
+            if ( !endptr || !*endptr ) 
             {
                 if ( *lpdwNumProcesses < dwMaxProcesses )
                 {
@@ -339,11 +339,11 @@ static void ParseCommandArgs( LPDWORD lpProcesses, LPDWORD lpdwNumProcesses, int
             }
             else
             {
-                HANDLE  hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
+                HANDLE	hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
 
                 if ( IsValidHandle( hSnapshot ) )
                 {
-                    PROCESSENTRY32  pe;
+                    PROCESSENTRY32	pe;
 
                     pe.dwSize = sizeof(pe);
                     BOOL fSuccess = Process32First( hSnapshot, &pe );
@@ -369,9 +369,9 @@ static void ParseCommandArgs( LPDWORD lpProcesses, LPDWORD lpdwNumProcesses, int
 
     if ( !*lpdwNumProcesses )
     {
-        _ftprintf( stderr,
+        _ftprintf( stderr, 
             _T("kill: No process specified.\n")
-            _T("Use kill --help to show allowed syntax.\n")
+            _T("Use kill --help to show allowed syntax.\n") 
             );
         ExitProcess( 0 );
     }
@@ -399,16 +399,16 @@ void OutputSystemMessage( DWORD dwErrorCode )
 
 int _tmain()
 {
-    DWORD   dwProcessIds[1024];
-    DWORD   nProcesses = SAL_N_ELEMENTS(dwProcessIds);
-    int     sig = SIGTERM;
+    DWORD	dwProcessIds[1024];
+    DWORD	nProcesses = SAL_N_ELEMENTS(dwProcessIds);
+    int		sig = SIGTERM;
 
 
     ParseCommandArgs( dwProcessIds, &nProcesses, &sig );
 
     for ( ULONG n = 0; n < nProcesses; n++ )
     {
-        HANDLE  hProcess;
+        HANDLE	hProcess;
 
         _tprintf( _T("Sending signal to process id %d..."), dwProcessIds[n] );
         hProcess = OpenProcess( PROCESS_TERMINATE | PROCESS_CREATE_THREAD | SYNCHRONIZE |
diff --git a/sal/systools/win32/onlineupdate/onlinecheck.cxx b/sal/systools/win32/onlineupdate/onlinecheck.cxx
index b88cfcb361d2..67289ba8a87d 100644
--- a/sal/systools/win32/onlineupdate/onlinecheck.cxx
+++ b/sal/systools/win32/onlineupdate/onlinecheck.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,8 +50,8 @@
 // #i71984
 extern "C" sal_Bool SAL_CALL hasInternetConnection()
 {
-    DWORD   dwFlags;
-    TCHAR   szConnectionName[1024];
+    DWORD	dwFlags;
+    TCHAR	szConnectionName[1024];
 
 #ifdef __MINGW32__
         jmp_buf jmpbuf;
@@ -75,7 +75,7 @@ extern "C" sal_Bool SAL_CALL hasInternetConnection()
         else return sal_False;
         han.Reset();
 #else
-    } __except( EXCEPTION_EXECUTE_HANDLER ) {
+    } __except( EXCEPTION_EXECUTE_HANDLER )	{
         return sal_False;
     }
 #endif
diff --git a/sal/systools/win32/uwinapi/CheckTokenMembership.cpp b/sal/systools/win32/uwinapi/CheckTokenMembership.cpp
index 7c825cf60697..e94dfd5e4952 100644
--- a/sal/systools/win32/uwinapi/CheckTokenMembership.cpp
+++ b/sal/systools/win32/uwinapi/CheckTokenMembership.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp b/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp
index 1385c0bb6411..958206a0f5e2 100644
--- a/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp
+++ b/sal/systools/win32/uwinapi/CommandLineToArgvW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,8 +48,8 @@ local LPCWSTR SkipBlanks( LPCWSTR lpScan )
 
 local LPCWSTR SkipArgument( LPCWSTR lpScan )
 {
-    BOOL    fQuoted = FALSE;
-    LPCWSTR lpArgEnd = NULL;
+    BOOL	fQuoted = FALSE;
+    LPCWSTR	lpArgEnd = NULL;
 
     do
     {
@@ -81,13 +81,13 @@ local LPCWSTR SkipArgument( LPCWSTR lpScan )
 
 IMPLEMENT_THUNK( shell32, WINDOWS, LPWSTR *, WINAPI, CommandLineToArgvW, ( LPCWSTR lpCmdLineW, int *pNumArgs ) )
 {
-    LPWSTR  *lpArgvW = NULL;
+    LPWSTR	*lpArgvW = NULL;
 
     if ( !lpCmdLineW || !*lpCmdLineW )
     {
-        CHAR    szFileName[MAX_PATH];
+        CHAR	szFileName[MAX_PATH];
 
-        DWORD   dwResult = GetModuleFileNameA( NULL, szFileName, MAX_PATH );
+        DWORD	dwResult = GetModuleFileNameA( NULL, szFileName, MAX_PATH );
 
         if ( dwResult && dwResult < MAX_PATH )
         {
@@ -108,9 +108,9 @@ IMPLEMENT_THUNK( shell32, WINDOWS, LPWSTR *, WINAPI, CommandLineToArgvW, ( LPCWS
     }
     else
     {
-        LPCWSTR lpScan = lpCmdLineW;
-        int     nTokens = 0;
-        int     cchNeeded = 0;
+        LPCWSTR	lpScan = lpCmdLineW;
+        int		nTokens = 0;
+        int		cchNeeded = 0;
 
         // Count arguments and required size
 
@@ -119,7 +119,7 @@ IMPLEMENT_THUNK( shell32, WINDOWS, LPWSTR *, WINAPI, CommandLineToArgvW, ( LPCWS
             lpScan = SkipBlanks( lpScan );
             if ( *lpScan )
             {
-                LPCWSTR lpArgEnd = SkipArgument( lpScan );
+                LPCWSTR	lpArgEnd = SkipArgument( lpScan );
 
                 nTokens++;
                 cchNeeded += lpArgEnd - lpScan + 1;
@@ -135,7 +135,7 @@ IMPLEMENT_THUNK( shell32, WINDOWS, LPWSTR *, WINAPI, CommandLineToArgvW, ( LPCWS
         {
             // Collect arguments
 
-            LPWSTR  lpDestination = (LPWSTR)&lpArgvW[nTokens + 1];
+            LPWSTR	lpDestination = (LPWSTR)&lpArgvW[nTokens + 1];
 
             lpScan = lpCmdLineW;
             nTokens = 0;
@@ -145,7 +145,7 @@ IMPLEMENT_THUNK( shell32, WINDOWS, LPWSTR *, WINAPI, CommandLineToArgvW, ( LPCWS
                 lpScan = SkipBlanks( lpScan );
                 if ( *lpScan )
                 {
-                    LPCWSTR lpArgEnd = SkipArgument( lpScan );
+                    LPCWSTR	lpArgEnd = SkipArgument( lpScan );
 
                     lpArgvW[nTokens++] = lpDestination;
 
diff --git a/sal/systools/win32/uwinapi/CopyFileExA.cpp b/sal/systools/win32/uwinapi/CopyFileExA.cpp
index f694fb3420f6..fafc73a1654a 100644
--- a/sal/systools/win32/uwinapi/CopyFileExA.cpp
+++ b/sal/systools/win32/uwinapi/CopyFileExA.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,21 +32,21 @@
 #define _WIN32_WINNT 0x0400
 #include "macros.h"
 
-#define BUFSIZE 16384
+#define	BUFSIZE	16384
 
 static DWORD CALLBACK DefCopyProgressRoutine(
-    LARGE_INTEGER   TotalFileSize,  // total file size, in bytes
-    LARGE_INTEGER   TotalBytesTransferred,
+    LARGE_INTEGER	TotalFileSize,	// total file size, in bytes
+    LARGE_INTEGER	TotalBytesTransferred,
                                     // total number of bytes transferred
-    LARGE_INTEGER   StreamSize,     // total number of bytes for this stream
-    LARGE_INTEGER   StreamBytesTransferred,
+    LARGE_INTEGER	StreamSize,		// total number of bytes for this stream
+    LARGE_INTEGER	StreamBytesTransferred,
                                     // total number of bytes transferred for
                                     // this stream
-    DWORD       dwStreamNumber,     // the current stream
-    DWORD       dwCallbackReason,   // reason for callback
-    HANDLE  hSourceFile,            // handle to the source file
-    HANDLE  hDestinationFile,       // handle to the destination file
-    LPVOID  lpData                  // passed by CopyFileEx
+    DWORD		dwStreamNumber,		// the current stream
+    DWORD		dwCallbackReason,	// reason for callback
+    HANDLE	hSourceFile,			// handle to the source file
+    HANDLE	hDestinationFile,		// handle to the destination file
+    LPVOID	lpData					// passed by CopyFileEx
 )
 {
     return PROGRESS_CONTINUE;
@@ -55,9 +55,9 @@ static DWORD CALLBACK DefCopyProgressRoutine(
 
 IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, CopyFileExA, ( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, LPPROGRESS_ROUTINE  lpProgressRoutine, LPVOID lpData, LPBOOL pbCancel, DWORD dwCopyFlags ) )
 {
-    BOOL    fSuccess = FALSE; // Assume failure
+    BOOL	fSuccess = FALSE; // Assume failure
 
-    HANDLE  hSourceFile = CreateFileA(
+    HANDLE	hSourceFile = CreateFileA(
         lpExistingFileNameA,
         GENERIC_READ,
         FILE_SHARE_READ | FILE_SHARE_WRITE,
@@ -69,8 +69,8 @@ IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, CopyFileExA, ( LPCSTR lpExisti
 
     if ( IsValidHandle(hSourceFile) )
     {
-        LARGE_INTEGER   FileSize, BytesTransferred;
-        HANDLE  hTargetFile = NULL;
+        LARGE_INTEGER	FileSize, BytesTransferred;
+        HANDLE	hTargetFile = NULL;
 
         SetLastError( ERROR_SUCCESS );
         FileSize.LowPart = GetFileSize( hSourceFile, (LPDWORD)&FileSize.HighPart );
@@ -121,8 +121,8 @@ IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, CopyFileExA, ( LPCSTR lpExisti
 
             while ( fSuccess && PROGRESS_CONTINUE == dwProgressResult )
             {
-                BYTE    buffer[BUFSIZE];
-                DWORD   dwBytesRead, dwBytesWritten = 0;
+                BYTE	buffer[BUFSIZE];
+                DWORD	dwBytesRead, dwBytesWritten = 0;
 
                 fSuccess = ReadFile( hSourceFile, buffer, BUFSIZE, &dwBytesRead, NULL );
 
diff --git a/sal/systools/win32/uwinapi/CopyFileExW.cpp b/sal/systools/win32/uwinapi/CopyFileExW.cpp
index 08165707dc54..9ba56f6ba864 100644
--- a/sal/systools/win32/uwinapi/CopyFileExW.cpp
+++ b/sal/systools/win32/uwinapi/CopyFileExW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/DeleteVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/DeleteVolumeMountPointA.cpp
index 260a95b27157..ee81b38b040b 100644
--- a/sal/systools/win32/uwinapi/DeleteVolumeMountPointA.cpp
+++ b/sal/systools/win32/uwinapi/DeleteVolumeMountPointA.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/DeleteVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/DeleteVolumeMountPointW.cpp
index 60eae2a5e3b8..739c5f4676d0 100644
--- a/sal/systools/win32/uwinapi/DeleteVolumeMountPointW.cpp
+++ b/sal/systools/win32/uwinapi/DeleteVolumeMountPointW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/DllGetVersion.cpp b/sal/systools/win32/uwinapi/DllGetVersion.cpp
index f1eee397d24e..7f3e4f1d0777 100644
--- a/sal/systools/win32/uwinapi/DllGetVersion.cpp
+++ b/sal/systools/win32/uwinapi/DllGetVersion.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,26 +37,26 @@
 #endif
 #include <malloc.h>
 
-extern HMODULE      UWINAPI_BaseAddress;
+extern HMODULE		UWINAPI_BaseAddress;
 
 // This function should be exported by every DLL that wants to provide it's version number.
 // This code automaticly generates the information from the version resource
 
 extern "C" HRESULT CALLBACK DllGetVersion( DLLVERSIONINFO *pdvi )
 {
-    TCHAR   szModulePath[MAX_PATH];
-    BOOL    fSuccess = FALSE;
+    TCHAR	szModulePath[MAX_PATH];
+    BOOL	fSuccess = FALSE;
 
     if ( UWINAPI_BaseAddress && GetModuleFileName( UWINAPI_BaseAddress, szModulePath, MAX_PATH ) )
     {
-        DWORD   dwHandle = 0;
-        DWORD   dwSize = GetFileVersionInfoSize( szModulePath, &dwHandle );
-        LPVOID  lpData = _alloca( dwSize );
+        DWORD	dwHandle = 0;
+        DWORD	dwSize = GetFileVersionInfoSize( szModulePath, &dwHandle );
+        LPVOID	lpData = _alloca( dwSize );
 
         if ( GetFileVersionInfo( szModulePath, dwHandle, dwSize, lpData ) )
         {
-            VS_FIXEDFILEINFO    *lpBuffer = NULL;
-            UINT    uLen = 0;
+            VS_FIXEDFILEINFO	*lpBuffer = NULL;
+            UINT	uLen = 0;
 
             if ( VerQueryValue( lpData, TEXT("\\"), (LPVOID *)&lpBuffer, &uLen ) )
             {
diff --git a/sal/systools/win32/uwinapi/DllMain.cpp b/sal/systools/win32/uwinapi/DllMain.cpp
index d856dbd4b28d..25be14ec01c7 100644
--- a/sal/systools/win32/uwinapi/DllMain.cpp
+++ b/sal/systools/win32/uwinapi/DllMain.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,25 +39,25 @@
 #include <tchar.h>
 
 
-HMODULE     UWINAPI_BaseAddress = NULL;
-const CHAR  szUnicowsModuleName[] = "UNICOWS.DLL";
+HMODULE		UWINAPI_BaseAddress = NULL;
+const CHAR	szUnicowsModuleName[] = "UNICOWS.DLL";
 
 static HMODULE WINAPI _LoadUnicowsLibrary(VOID)
 {
-    CHAR        szModulePath[MAX_PATH];
-    HMODULE     hModuleUnicows = NULL;
+    CHAR		szModulePath[MAX_PATH];
+    HMODULE		hModuleUnicows = NULL;
 
     // First search in the same directory as UWINAPI.DLL was loaded from. This is because
     // UWINAPI.DLL not always resides in the same directory as the actual application.
 
     if ( UWINAPI_BaseAddress && GetModuleFileNameA( UWINAPI_BaseAddress, szModulePath, MAX_PATH ) )
     {
-        char    *lpLastBkSlash = _tcsrchr( szModulePath, '\\' );
+        char	*lpLastBkSlash = _tcsrchr( szModulePath, '\\' );
 
         if ( lpLastBkSlash )
         {
-            size_t  nParentDirSize = (size_t) (_tcsinc( lpLastBkSlash ) - szModulePath);
-            LPSTR   lpUnicowsModulePath = (LPTSTR)_alloca( nParentDirSize + sizeof(szUnicowsModuleName) );
+            size_t	nParentDirSize = (size_t) (_tcsinc( lpLastBkSlash ) - szModulePath);
+            LPSTR	lpUnicowsModulePath = (LPTSTR)_alloca( nParentDirSize + sizeof(szUnicowsModuleName) );
 
             if ( lpUnicowsModulePath )
             {
@@ -79,8 +79,8 @@ static HMODULE WINAPI _LoadUnicowsLibrary(VOID)
 
 static HMODULE WINAPI LoadUnicowsLibrary(VOID)
 {
-    HMODULE hModuleUnicows;
-    int     idMsg = IDOK;
+    HMODULE	hModuleUnicows;
+    int		idMsg = IDOK;
 
     do
     {
@@ -105,7 +105,7 @@ static HMODULE WINAPI LoadUnicowsLibrary(VOID)
             CHAR szModuleFileName[MAX_PATH];
 
             GetModuleFileNameA( NULL, szModuleFileName, sizeof(szModuleFileName) );
-            LPSTR   lpMessage = (LPSTR)_alloca( strlen( (LPCSTR)lpMsgBuf ) + sizeof(szUnicowsModuleName) + 1 );
+            LPSTR	lpMessage = (LPSTR)_alloca( strlen( (LPCSTR)lpMsgBuf ) + sizeof(szUnicowsModuleName) + 1 );
             strcpy( lpMessage, (LPCSTR)lpMsgBuf );
             strcat( lpMessage, "\n" );
             strcat( lpMessage, szUnicowsModuleName );
@@ -173,7 +173,7 @@ __do_global_ctors (void)
     ;
     }
 
-  /*
+  /* 
    * Go through the list backwards calling constructors.
    */
   for (i = nptrs; i >= 1; i--)
diff --git a/sal/systools/win32/uwinapi/DrawStateW.cpp b/sal/systools/win32/uwinapi/DrawStateW.cpp
index 99d14f22d43b..89003c437635 100644
--- a/sal/systools/win32/uwinapi/DrawStateW.cpp
+++ b/sal/systools/win32/uwinapi/DrawStateW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,16 +30,16 @@
 
 IMPLEMENT_THUNK( user32, WINDOWS, BOOL, WINAPI, DrawStateW,
 (
-    HDC             hdc,            // handle to device context
-    HBRUSH          hbr,            // handle to brush
-    DRAWSTATEPROC   lpOutputFunc,   // pointer to callback function
-    LPARAM          lData,          // image information
-    WPARAM          wData,          // more image information
-    int             x,              // horizontal location of image
-    int             y,              // vertical location of image
-    int             cx,             // width of image
-    int             cy,             // height of image
-    UINT            fuFlags         // image type and state
+    HDC				hdc,			// handle to device context
+    HBRUSH			hbr,			// handle to brush
+    DRAWSTATEPROC	lpOutputFunc,	// pointer to callback function
+    LPARAM			lData,			// image information
+    WPARAM			wData,			// more image information
+    int				x,				// horizontal location of image
+    int				y,				// vertical location of image
+    int				cx,				// width of image
+    int				cy,				// height of image
+    UINT			fuFlags			// image type and state
 
 ))
 {
@@ -48,12 +48,12 @@ IMPLEMENT_THUNK( user32, WINDOWS, BOOL, WINAPI, DrawStateW,
     case DST_TEXT:
     case DST_PREFIXTEXT:
         {
-            LPSTR   lpTextA = NULL;
+            LPSTR	lpTextA = NULL;
 
             if ( lData )
             {
-                int cchWideChar = (int) (wData ? wData : -1);
-                int cchNeeded = WideCharToMultiByte( CP_ACP, 0, (LPCWSTR)lData, cchWideChar, NULL, 0, NULL, NULL );
+                int	cchWideChar = (int) (wData ? wData : -1);
+                int	cchNeeded = WideCharToMultiByte( CP_ACP, 0, (LPCWSTR)lData, cchWideChar, NULL, 0, NULL, NULL );
 
                 lpTextA = (LPSTR)_alloca( cchNeeded * sizeof(CHAR) );
 
diff --git a/sal/systools/win32/uwinapi/EnumProcesses.cpp b/sal/systools/win32/uwinapi/EnumProcesses.cpp
index 228ecddf1cda..a8b5fabef45f 100644
--- a/sal/systools/win32/uwinapi/EnumProcesses.cpp
+++ b/sal/systools/win32/uwinapi/EnumProcesses.cpp
@@ -4,12 +4,12 @@
 
 IMPLEMENT_THUNK( psapi, WINDOWS, BOOL, WINAPI, EnumProcesses, ( LPDWORD lpProcesses, DWORD cbSize, LPDWORD lpcbCopied ) )
 {
-    BOOL    fSuccess = FALSE;
-    HANDLE  hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
+    BOOL	fSuccess = FALSE;
+    HANDLE	hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
 
     if ( IsValidHandle( hSnapshot ) )
     {
-        PROCESSENTRY32  pe;
+        PROCESSENTRY32	pe;
 
         if ( lpcbCopied )
             *lpcbCopied = 0;
@@ -35,7 +35,7 @@ IMPLEMENT_THUNK( psapi, WINDOWS, BOOL, WINAPI, EnumProcesses, ( LPDWORD lpProces
     }
     else
         SetLastError( ERROR_INVALID_HANDLE );
-
+    
     return fSuccess;
 }
 
diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeA.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeA.cpp
index 035c3c1e4007..ec4d868f60c9 100644
--- a/sal/systools/win32/uwinapi/FindFirstVolumeA.cpp
+++ b/sal/systools/win32/uwinapi/FindFirstVolumeA.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp
index ee54d434e5b1..f9dc3413146e 100644
--- a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp
+++ b/sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp
index 6bdb6b20360b..5ac996cc131c 100644
--- a/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp
+++ b/sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp b/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp
index 2bef40a6cc5e..627e15c3b485 100644
--- a/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp
+++ b/sal/systools/win32/uwinapi/FindFirstVolumeW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/FindNextVolumeA.cpp b/sal/systools/win32/uwinapi/FindNextVolumeA.cpp
index dfda390ea54b..22768460d78e 100644
--- a/sal/systools/win32/uwinapi/FindNextVolumeA.cpp
+++ b/sal/systools/win32/uwinapi/FindNextVolumeA.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/FindNextVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/FindNextVolumeMountPointA.cpp
index 67de06905bfe..dad9cc598df5 100644
--- a/sal/systools/win32/uwinapi/FindNextVolumeMountPointA.cpp
+++ b/sal/systools/win32/uwinapi/FindNextVolumeMountPointA.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp
index b9f52cd8ac61..5e15a9f2e0e1 100644
--- a/sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp
+++ b/sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/FindNextVolumeW.cpp b/sal/systools/win32/uwinapi/FindNextVolumeW.cpp
index e2cfc82d5491..e7b092f27f7b 100644
--- a/sal/systools/win32/uwinapi/FindNextVolumeW.cpp
+++ b/sal/systools/win32/uwinapi/FindNextVolumeW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/FindVolumeClose.cpp b/sal/systools/win32/uwinapi/FindVolumeClose.cpp
index 8b0ff3aa8517..fe028b30686e 100644
--- a/sal/systools/win32/uwinapi/FindVolumeClose.cpp
+++ b/sal/systools/win32/uwinapi/FindVolumeClose.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/FindVolumeMountPointClose.cpp b/sal/systools/win32/uwinapi/FindVolumeMountPointClose.cpp
index 6dcdfd217a46..59a4fb203e5f 100644
--- a/sal/systools/win32/uwinapi/FindVolumeMountPointClose.cpp
+++ b/sal/systools/win32/uwinapi/FindVolumeMountPointClose.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp b/sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp
index d33553d2df66..27dee507d49b 100644
--- a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp
+++ b/sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,13 +37,13 @@ IMPLEMENT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, GetDiskFreeSpaceExA,(
   PULARGE_INTEGER lpTotalNumberOfFreeBytes // free bytes on disk
 ))
 {
-    DWORD   dwSectorsPerCluster, dwBytesPerSector, dwNumberOfFreeClusters, dwTotalNumberOfClusters;
+    DWORD	dwSectorsPerCluster, dwBytesPerSector, dwNumberOfFreeClusters, dwTotalNumberOfClusters;
 
-    BOOL    fSuccess = GetDiskFreeSpaceA( lpRootPathName, &dwSectorsPerCluster, &dwBytesPerSector, &dwNumberOfFreeClusters, &dwTotalNumberOfClusters );
+    BOOL	fSuccess = GetDiskFreeSpaceA( lpRootPathName, &dwSectorsPerCluster, &dwBytesPerSector, &dwNumberOfFreeClusters, &dwTotalNumberOfClusters );
 
     if ( fSuccess )
     {
-        ULONGLONG   ulBytesPerCluster = (ULONGLONG)dwSectorsPerCluster * (ULONGLONG)dwBytesPerSector;
+        ULONGLONG	ulBytesPerCluster = (ULONGLONG)dwSectorsPerCluster * (ULONGLONG)dwBytesPerSector;
 
         if ( lpFreeBytesAvailable )
             lpFreeBytesAvailable->QuadPart = ulBytesPerCluster * (ULONGLONG)dwNumberOfFreeClusters;
diff --git a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp b/sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp
index 150d9e18ed84..fd30de27c681 100644
--- a/sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp
+++ b/sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/GetLogicalDriveStringsW.cpp b/sal/systools/win32/uwinapi/GetLogicalDriveStringsW.cpp
index 9fee78298ffc..0b14490c5800 100644
--- a/sal/systools/win32/uwinapi/GetLogicalDriveStringsW.cpp
+++ b/sal/systools/win32/uwinapi/GetLogicalDriveStringsW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@ IMPLEMENT_THUNK( kernel32, WINDOWS, DWORD, WINAPI, GetLogicalDriveStringsW, ( DW
 {
     AUTO_STR( lpBuffer, cchBuffer );
 
-    DWORD   dwResult = GetLogicalDriveStringsA( cchBuffer, lpBufferA );
+    DWORD	dwResult = GetLogicalDriveStringsA( cchBuffer, lpBufferA );
 
 
     if ( dwResult && dwResult < cchBuffer )
diff --git a/sal/systools/win32/uwinapi/GetLongPathName.cpp b/sal/systools/win32/uwinapi/GetLongPathName.cpp
index 52027646810a..77df88a55cdb 100644
--- a/sal/systools/win32/uwinapi/GetLongPathName.cpp
+++ b/sal/systools/win32/uwinapi/GetLongPathName.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
 
 
 {
-    DWORD   dwResult = 0;   // Assume failure
+    DWORD	dwResult = 0;	// Assume failure
 
     if ( IsBadStringPtr( lpShortPath, MAX_PATH ) )
     {
@@ -36,7 +36,7 @@
         return dwResult;
     }
 
-    // Assume a not existing buffer means a bufsize of zero
+    // Assume a not existing buffer means a bufsize of zero 
     if ( !lpLongPath )
         cchBuffer = 0;
 
@@ -47,12 +47,12 @@
     }
     else
     {
-        HANDLE          hFind;
-        WIN32_FIND_DATA aFindFileData;
+        HANDLE			hFind;
+        WIN32_FIND_DATA	aFindFileData;
 
         if ( lpShortPath[_tcslen(lpShortPath)-1] == '\\' )
         {
-            TCHAR   szFilePath[MAX_PATH];
+            TCHAR	szFilePath[MAX_PATH];
 
             _tcscpy( szFilePath, lpShortPath );
             _tcscat( szFilePath, TEXT("*.*") );
@@ -64,7 +64,7 @@
             hFind = FindFirstFile( lpShortPath, &aFindFileData );
             if ( !IsValidHandle( hFind ) )
             {
-                TCHAR   szFilePath[MAX_PATH];
+                TCHAR	szFilePath[MAX_PATH];
 
                 _tcscpy( szFilePath, lpShortPath );
                 _tcscat( szFilePath, TEXT("\\*.*") );
@@ -77,14 +77,14 @@
         {
             FindClose( hFind );
 
-            LPCTSTR lpLastSlash = _tcsrchr( lpShortPath, '\\' );
+            LPCTSTR	lpLastSlash = _tcsrchr( lpShortPath, '\\' );
 
             if ( lpLastSlash )
             {
-                int nParentLen = lpLastSlash - lpShortPath;
-                LPTSTR  lpParentPath = (LPTSTR)_alloca( (nParentLen + 1) * sizeof(TCHAR) );
+                int	nParentLen = lpLastSlash - lpShortPath;
+                LPTSTR	lpParentPath = (LPTSTR)_alloca( (nParentLen + 1) * sizeof(TCHAR) );
 
-                CopyMemory( lpParentPath, lpShortPath, nParentLen * sizeof(TCHAR) );
+                CopyMemory( lpParentPath, lpShortPath, nParentLen * sizeof(TCHAR) ); 
                 lpParentPath[nParentLen] = 0;
 
                 dwResult = GetLongPathName( lpParentPath, lpLongPath, cchBuffer );
diff --git a/sal/systools/win32/uwinapi/GetLongPathNameA.cpp b/sal/systools/win32/uwinapi/GetLongPathNameA.cpp
index eef6503d046e..259b33117d2e 100644
--- a/sal/systools/win32/uwinapi/GetLongPathNameA.cpp
+++ b/sal/systools/win32/uwinapi/GetLongPathNameA.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/GetLongPathNameW.cpp b/sal/systools/win32/uwinapi/GetLongPathNameW.cpp
index b7280db13bb0..9a473937af64 100644
--- a/sal/systools/win32/uwinapi/GetLongPathNameW.cpp
+++ b/sal/systools/win32/uwinapi/GetLongPathNameW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@ EXTERN_C DWORD WINAPI GetLongPathNameW_WINDOWS( LPCWSTR lpShortPathW, LPWSTR lpL
     AUTO_WSTR2STR( lpShortPath );
     AUTO_STR( lpLongPath, cchBuffer );
 
-    DWORD   dwResult = GetLongPathNameA( lpShortPathA, lpLongPathA, cchBuffer );
+    DWORD	dwResult = GetLongPathNameA( lpShortPathA, lpLongPathA, cchBuffer );
 
     if ( dwResult && dwResult < cchBuffer )
         STR2WSTR( lpLongPath, cchBuffer );
@@ -52,7 +52,7 @@ EXTERN_C void WINAPI ResolveThunk_GetLongPathNameW( FARPROC *lppfn, LPCSTR lpLib
         *lppfn = (FARPROC)GetLongPathNameW_WINDOWS;
     else
     {
-        FARPROC lpfnResult = GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName );
+        FARPROC	lpfnResult = GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName );
         if ( !lpfnResult )
             lpfnResult = (FARPROC)GetLongPathNameW_NT;
 
diff --git a/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp b/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp
index f5231b212490..b765be70e0a0 100644
--- a/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp
+++ b/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp
@@ -11,22 +11,22 @@
 
 IMPLEMENT_THUNK( psapi, WINDOWS, DWORD, WINAPI, GetModuleFileNameExA, (HANDLE hProcess, HMODULE hModule, LPSTR lpFileName, DWORD nSize ) )
 {
-    DWORD   dwProcessId = 0;
-    DWORD   dwResult = 0;
+    DWORD	dwProcessId = 0;
+    DWORD	dwResult = 0;
 
     if ( !hProcess || hProcess == GetCurrentProcess() || GetCurrentProcessId() == (dwProcessId = GetProcessId( hProcess )) )
         return GetModuleFileNameA( hModule, lpFileName, nSize );
 
-    HANDLE  hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPMODULE, dwProcessId );
+    HANDLE	hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPMODULE, dwProcessId );
 
     if ( IsValidHandle( hSnapshot ) )
     {
-        MODULEENTRY32   me;
+        MODULEENTRY32	me;
 
         me.dwSize = sizeof(me);
         if ( Module32First( hSnapshot, &me ) )
         {
-            BOOL    fFound = FALSE;
+            BOOL	fFound = FALSE;
 
             if ( NULL == hModule )
                 fFound = TRUE;
@@ -34,7 +34,7 @@ IMPLEMENT_THUNK( psapi, WINDOWS, DWORD, WINAPI, GetModuleFileNameExA, (HANDLE hP
             {
                 fFound = (me.hModule == hModule);
             } while ( !fFound && Module32Next( hSnapshot, &me ) );
-
+            
             if ( fFound )
             {
                 dwResult = _tcslen( me.szExePath );
@@ -48,7 +48,7 @@ IMPLEMENT_THUNK( psapi, WINDOWS, DWORD, WINAPI, GetModuleFileNameExA, (HANDLE hP
 
         CloseHandle( hSnapshot );
     }
-
+    
     return dwResult;
 }
 
diff --git a/sal/systools/win32/uwinapi/GetProcessId.cpp b/sal/systools/win32/uwinapi/GetProcessId.cpp
index 0e365a040008..c0fdd07c0246 100644
--- a/sal/systools/win32/uwinapi/GetProcessId.cpp
+++ b/sal/systools/win32/uwinapi/GetProcessId.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 #include <tlhelp32.h>
 static FARPROC WINAPI GetRealProcAddress( HMODULE hModule, LPCSTR lpProcName )
 {
-    FARPROC lpfn = GetProcAddress( hModule, lpProcName );
+    FARPROC	lpfn = GetProcAddress( hModule, lpProcName );
 
     if ( lpfn )
     {
@@ -62,7 +62,7 @@ static FARPROC WINAPI GetRealProcAddress( HMODULE hModule, LPCSTR lpProcName )
             BFF956C6 58                   pop         eax
             BFF956C7 9D                   popfd
             BFF956C8 C3                   ret
-            */
+            */		
         }
     }
 
@@ -83,15 +83,15 @@ static DWORD WINAPI Obfuscate( DWORD dwPTID )
 
         if ( lpCode )
         {
-            /*
+            /* 
             GetCurrentThreadId:
-            lpCode + 00 BFF84936 A1 DC 9C FC BF       mov         eax,[BFFC9CDC]    ; This is the real thread id
+            lpCode + 00 BFF84936 A1 DC 9C FC BF       mov         eax,[BFFC9CDC]	; This is the real thread id
             lpcode + 05 BFF8493B FF 30                push        dword ptr [eax]
-            lpCode + 07 BFF8493D E8 17 C5 FF FF       call        BFF80E59          ; call Obfuscate function
+            lpCode + 07 BFF8493D E8 17 C5 FF FF       call        BFF80E59			; call Obfuscate function
             lpcode + 0C BFF84942 C3                   ret
             */
 
-            DWORD   dwOffset = *(LPDWORD)(lpCode + 0x08);
+            DWORD	dwOffset = *(LPDWORD)(lpCode + 0x08);
 
             lpfnObfuscate = (LPOBFUSCATE)(lpCode + 0x0C + dwOffset);
             /*
@@ -105,7 +105,7 @@ static DWORD WINAPI Obfuscate( DWORD dwPTID )
             BFF80E6A C2 04 00             ret         4
             */
         }
-
+        
     }
 
     return lpfnObfuscate ? lpfnObfuscate( dwPTID ) : 0;
@@ -117,25 +117,25 @@ EXTERN_C DWORD WINAPI GetProcessId_WINDOWS( HANDLE hProcess )
     if ( GetCurrentProcess() == hProcess )
         return GetCurrentProcessId();
 
-    DWORD   dwProcessId = 0;
-    PPROCESS_DATABASE   pPDB = (PPROCESS_DATABASE)Obfuscate( GetCurrentProcessId() );
+    DWORD	dwProcessId = 0;
+    PPROCESS_DATABASE	pPDB = (PPROCESS_DATABASE)Obfuscate( GetCurrentProcessId() );
 
     if ( pPDB && K32OBJ_PROCESS == pPDB->Type )
     {
-        DWORD   dwHandleNumber = (DWORD)hProcess >> 2;
+        DWORD	dwHandleNumber = (DWORD)hProcess >> 2;
 
         if ( 0 == ((DWORD)hProcess & 0x03) && dwHandleNumber < pPDB->pHandleTable->cEntries )
         {
-            if (
-                pPDB->pHandleTable->array[dwHandleNumber].pObject &&
-                K32OBJ_PROCESS == pPDB->pHandleTable->array[dwHandleNumber].pObject->Type
+            if ( 
+                pPDB->pHandleTable->array[dwHandleNumber].pObject && 
+                K32OBJ_PROCESS == pPDB->pHandleTable->array[dwHandleNumber].pObject->Type 
                 )
             dwProcessId = Obfuscate( (DWORD)pPDB->pHandleTable->array[dwHandleNumber].pObject );
         }
 
         SetLastError( ERROR_INVALID_HANDLE );
     }
-
+    
     return dwProcessId;
 }
 
@@ -153,7 +153,7 @@ EXTERN_C void WINAPI ResolveThunk_GetProcessId( FARPROC *lppfn, LPCSTR lpLibFile
         *lppfn = (FARPROC)GetProcessId_WINDOWS;
     else
     {
-        FARPROC lpfnResult = GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName );
+        FARPROC	lpfnResult = GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName );
         if ( !lpfnResult )
             lpfnResult = (FARPROC)GetProcessId_NT;
 
diff --git a/sal/systools/win32/uwinapi/GetUserDefaultUILanguage.cpp b/sal/systools/win32/uwinapi/GetUserDefaultUILanguage.cpp
index 0947640464f6..cf94a77ea148 100644
--- a/sal/systools/win32/uwinapi/GetUserDefaultUILanguage.cpp
+++ b/sal/systools/win32/uwinapi/GetUserDefaultUILanguage.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/GetUserDomainA.cpp b/sal/systools/win32/uwinapi/GetUserDomainA.cpp
index 9b2d31c17260..92cd9ea96e3e 100644
--- a/sal/systools/win32/uwinapi/GetUserDomainA.cpp
+++ b/sal/systools/win32/uwinapi/GetUserDomainA.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/GetUserDomainW.cpp b/sal/systools/win32/uwinapi/GetUserDomainW.cpp
index efb1b7b04590..0a34fe35f1d8 100644
--- a/sal/systools/win32/uwinapi/GetUserDomainW.cpp
+++ b/sal/systools/win32/uwinapi/GetUserDomainW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/GetUserDomain_NT.cpp b/sal/systools/win32/uwinapi/GetUserDomain_NT.cpp
index b444dbd9bdbc..acbb450e33eb 100644
--- a/sal/systools/win32/uwinapi/GetUserDomain_NT.cpp
+++ b/sal/systools/win32/uwinapi/GetUserDomain_NT.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp b/sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp
index 67e7b7018f08..2ed058d3308b 100644
--- a/sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp
+++ b/sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,32 +27,32 @@
  ************************************************************************/
 
 {
-    HKEY    hkeyLogon;
-    HKEY    hkeyWorkgroup;
-    DWORD   dwResult = 0;
+    HKEY	hkeyLogon;
+    HKEY	hkeyWorkgroup;
+    DWORD	dwResult = 0;
 
 
-    if ( ERROR_SUCCESS  == RegOpenKeyEx(
-        HKEY_LOCAL_MACHINE,
-        TEXT("Network\\Logon"),
-        0, KEY_READ, &hkeyLogon ) )
+    if ( ERROR_SUCCESS  == RegOpenKeyEx( 
+        HKEY_LOCAL_MACHINE, 
+        TEXT("Network\\Logon"), 
+        0, KEY_READ, &hkeyLogon ) ) 
     {
-        DWORD   dwLogon = 0;
-        DWORD   dwLogonSize = sizeof(dwLogon);
+        DWORD	dwLogon = 0;
+        DWORD	dwLogonSize = sizeof(dwLogon);
         RegQueryValueEx( hkeyLogon, TEXT("LMLogon"), 0, NULL, (LPBYTE)&dwLogon, &dwLogonSize );
         RegCloseKey( hkeyLogon );
 
         if ( dwLogon )
         {
-            HKEY    hkeyNetworkProvider;
+            HKEY	hkeyNetworkProvider;
 
-            if ( ERROR_SUCCESS  == RegOpenKeyEx(
-                HKEY_LOCAL_MACHINE,
-                TEXT("SYSTEM\\CurrentControlSet\\Services\\MSNP32\\NetworkProvider"),
+            if ( ERROR_SUCCESS  == RegOpenKeyEx( 
+                HKEY_LOCAL_MACHINE, 
+                TEXT("SYSTEM\\CurrentControlSet\\Services\\MSNP32\\NetworkProvider"), 
                 0, KEY_READ, &hkeyNetworkProvider ) )
             {
-                DWORD   dwBufferSize = nSize;
-                LONG    lResult = RegQueryValueEx( hkeyNetworkProvider, TEXT("AuthenticatingAgent"), 0, NULL, (LPBYTE)lpBuffer, &dwBufferSize );
+                DWORD	dwBufferSize = nSize;
+                LONG	lResult = RegQueryValueEx( hkeyNetworkProvider, TEXT("AuthenticatingAgent"), 0, NULL, (LPBYTE)lpBuffer, &dwBufferSize );
 
                 if ( ERROR_SUCCESS == lResult || ERROR_MORE_DATA == lResult )
                     dwResult = dwBufferSize / sizeof(TCHAR);
@@ -66,8 +66,8 @@
         TEXT("SYSTEM\\CurrentControlSet\\Services\\VxD\\VNETSUP"),
         0, KEY_READ, &hkeyWorkgroup ) )
     {
-        DWORD   dwBufferSize = nSize;
-        LONG    lResult = RegQueryValueEx( hkeyWorkgroup, TEXT("Workgroup"), 0, NULL, (LPBYTE)lpBuffer, &dwBufferSize );
+        DWORD	dwBufferSize = nSize;
+        LONG	lResult = RegQueryValueEx( hkeyWorkgroup, TEXT("Workgroup"), 0, NULL, (LPBYTE)lpBuffer, &dwBufferSize );
 
         if ( ERROR_SUCCESS == lResult || ERROR_MORE_DATA == lResult )
             dwResult = dwBufferSize / sizeof(TCHAR);
diff --git a/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointA.cpp
index 500978c79ed3..895d37bfe70d 100644
--- a/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointA.cpp
+++ b/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointA.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointW.cpp
index de61fd2d93d4..12195a2db8b7 100644
--- a/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointW.cpp
+++ b/sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/GetVolumePathNameA.cpp b/sal/systools/win32/uwinapi/GetVolumePathNameA.cpp
index ac63033c1989..5b236a90b4d2 100644
--- a/sal/systools/win32/uwinapi/GetVolumePathNameA.cpp
+++ b/sal/systools/win32/uwinapi/GetVolumePathNameA.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/GetVolumePathNameW.cpp b/sal/systools/win32/uwinapi/GetVolumePathNameW.cpp
index 1bb585bf601d..d333b1dd3e5b 100644
--- a/sal/systools/win32/uwinapi/GetVolumePathNameW.cpp
+++ b/sal/systools/win32/uwinapi/GetVolumePathNameW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/MCIWndCreateW.cpp b/sal/systools/win32/uwinapi/MCIWndCreateW.cpp
index 73f58a406dcd..c4fede9b46af 100644
--- a/sal/systools/win32/uwinapi/MCIWndCreateW.cpp
+++ b/sal/systools/win32/uwinapi/MCIWndCreateW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,12 +29,12 @@
 #include "macros.h"
 #include <vfw.h>
 
-IMPLEMENT_THUNK( kernel32, WINDOWS, HWND, VFWAPIV, MCIWndCreateW,
+IMPLEMENT_THUNK( kernel32, WINDOWS, HWND, VFWAPIV, MCIWndCreateW, 
 (
-  HWND hwndParent,
-  HINSTANCE hInstance,
-  DWORD dwStyle,
-  LPCWSTR lpFileW
+  HWND hwndParent,      
+  HINSTANCE hInstance,  
+  DWORD dwStyle,        
+  LPCWSTR lpFileW          
 ))
 {
     AUTO_WSTR2STR( lpFile );
diff --git a/sal/systools/win32/uwinapi/MoveFileExA.cpp b/sal/systools/win32/uwinapi/MoveFileExA.cpp
index c1e6a3663576..6c47078a40f7 100644
--- a/sal/systools/win32/uwinapi/MoveFileExA.cpp
+++ b/sal/systools/win32/uwinapi/MoveFileExA.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,35 +29,35 @@
 #include "macros.h"
 #include <sal/macros.h>
 
-#define WININIT_FILENAME    "wininit.ini"
-#define RENAME_SECTION      "rename"
+#define	WININIT_FILENAME	"wininit.ini"
+#define RENAME_SECTION		"rename"
 
 IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, MoveFileExA, ( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, DWORD dwFlags ) )
 {
-    BOOL    fSuccess = FALSE;   // assume failure
+    BOOL	fSuccess = FALSE;	// assume failure
 
     // Windows 9x has a special mechanism to move files after reboot
 
     if ( dwFlags & MOVEFILE_DELAY_UNTIL_REBOOT )
     {
-        CHAR    szExistingFileNameA[MAX_PATH];
-        CHAR    szNewFileNameA[MAX_PATH] = "NUL";
+        CHAR	szExistingFileNameA[MAX_PATH];
+        CHAR	szNewFileNameA[MAX_PATH] = "NUL";
 
         // Path names in WININIT.INI must be in short path name form
 
-        if (
+        if ( 
             GetShortPathNameA( lpExistingFileNameA, szExistingFileNameA, MAX_PATH ) &&
             (!lpNewFileNameA || GetShortPathNameA( lpNewFileNameA, szNewFileNameA, MAX_PATH ))
             )
         {
-            CHAR    szBuffer[32767];    // The buffer size must not exceed 32K
-            DWORD   dwBufLen = GetPrivateProfileSectionA( RENAME_SECTION, szBuffer, SAL_N_ELEMENTS(szBuffer), WININIT_FILENAME );
+            CHAR	szBuffer[32767];	// The buffer size must not exceed 32K
+            DWORD	dwBufLen = GetPrivateProfileSectionA( RENAME_SECTION, szBuffer, SAL_N_ELEMENTS(szBuffer), WININIT_FILENAME );
 
-            CHAR    szRename[MAX_PATH]; // This is enough for at most to times 67 chracters
+            CHAR	szRename[MAX_PATH];	// This is enough for at most to times 67 chracters
             strcpy( szRename, szNewFileNameA );
             strcat( szRename, "=" );
             strcat( szRename, szExistingFileNameA );
-            size_t  lnRename = strlen(szRename);
+            size_t	lnRename = strlen(szRename);
 
             if ( dwBufLen + lnRename + 2 <= SAL_N_ELEMENTS(szBuffer) )
             {
@@ -78,7 +78,7 @@ IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, MoveFileExA, ( LPCSTR lpExisti
 
         if ( !fSuccess && 0 != (dwFlags & (MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING)) )
         {
-            BOOL    bFailIfExist = 0 == (dwFlags & MOVEFILE_REPLACE_EXISTING);
+            BOOL	bFailIfExist = 0 == (dwFlags & MOVEFILE_REPLACE_EXISTING);
 
             fSuccess = CopyFileA( lpExistingFileNameA, lpNewFileNameA, bFailIfExist );
 
diff --git a/sal/systools/win32/uwinapi/MoveFileExW.cpp b/sal/systools/win32/uwinapi/MoveFileExW.cpp
index 7613be22681f..edd3c773c8e8 100644
--- a/sal/systools/win32/uwinapi/MoveFileExW.cpp
+++ b/sal/systools/win32/uwinapi/MoveFileExW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/PathAddBackslashW.cpp b/sal/systools/win32/uwinapi/PathAddBackslashW.cpp
index 089fb332c330..3dac9f6b0b72 100644
--- a/sal/systools/win32/uwinapi/PathAddBackslashW.cpp
+++ b/sal/systools/win32/uwinapi/PathAddBackslashW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 #define _SHLWAPI_
 #include <shlwapi.h>
 
-IMPLEMENT_THUNK( shlwapi, WINDOWS, LPWSTR, WINAPI, PathAddBackslashW,
+IMPLEMENT_THUNK( shlwapi, WINDOWS, LPWSTR, WINAPI, PathAddBackslashW, 
 (
     LPWSTR lpPathW
 ))
@@ -39,7 +39,7 @@ IMPLEMENT_THUNK( shlwapi, WINDOWS, LPWSTR, WINAPI, PathAddBackslashW,
     AUTO_WSTR2STR(lpPath);
     PathAddBackslashA(lpPathA);
     STR2WSTR(lpPath, MAX_PATH);
-    return lpPathW + wcslen(lpPathW);
+    return lpPathW + wcslen(lpPathW);    
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathCompactPathExW.cpp b/sal/systools/win32/uwinapi/PathCompactPathExW.cpp
index 794a6fc2594d..ef3f70c36795 100644
--- a/sal/systools/win32/uwinapi/PathCompactPathExW.cpp
+++ b/sal/systools/win32/uwinapi/PathCompactPathExW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/PathFileExistsW.cpp b/sal/systools/win32/uwinapi/PathFileExistsW.cpp
index e66a3fc01ee4..b5a292d21a3e 100644
--- a/sal/systools/win32/uwinapi/PathFileExistsW.cpp
+++ b/sal/systools/win32/uwinapi/PathFileExistsW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,9 +31,9 @@
 #define _SHLWAPI_
 #include <shlwapi.h>
 
-IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathFileExistsW,
+IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathFileExistsW, 
 (
-    LPCWSTR lpPathW
+    LPCWSTR lpPathW    
 ))
 {
     AUTO_WSTR2STR(lpPath);
diff --git a/sal/systools/win32/uwinapi/PathFindExtensionW.cpp b/sal/systools/win32/uwinapi/PathFindExtensionW.cpp
index f218dd5b1292..5b40591b9235 100644
--- a/sal/systools/win32/uwinapi/PathFindExtensionW.cpp
+++ b/sal/systools/win32/uwinapi/PathFindExtensionW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,22 +34,22 @@
 #include <tchar.h>
 #include <mbstring.h>
 
-IMPLEMENT_THUNK( shlwapi, WINDOWS, LPWSTR, WINAPI, PathFindExtensionW,
+IMPLEMENT_THUNK( shlwapi, WINDOWS, LPWSTR, WINAPI, PathFindExtensionW, 
 (
     LPCWSTR lpPathW
 ))
 {
-    AUTO_WSTR2STR(lpPath);
+    AUTO_WSTR2STR(lpPath);        
     char* pExt = PathFindExtensionA(lpPathA);
-
-    if (*pExt)
-    {
-        *pExt = '\0';
+    
+    if (*pExt)        
+    { 
+        *pExt = '\0';                
         LPWSTR pOutW = const_cast<LPWSTR>(lpPathW);
-        return (pOutW + _mbslen(reinterpret_cast<unsigned char*>(lpPathA)));
-    }
-    else
-        return const_cast<LPWSTR>(lpPathW) + wcslen(lpPathW);
+        return (pOutW + _mbslen(reinterpret_cast<unsigned char*>(lpPathA)));      
+    }        
+    else            
+        return const_cast<LPWSTR>(lpPathW) + wcslen(lpPathW);        
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathFindFileNameW.cpp b/sal/systools/win32/uwinapi/PathFindFileNameW.cpp
index fdcf46b91d5e..975ae1dd3c84 100644
--- a/sal/systools/win32/uwinapi/PathFindFileNameW.cpp
+++ b/sal/systools/win32/uwinapi/PathFindFileNameW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,19 +33,19 @@
 
 #include <mbstring.h>
 
-IMPLEMENT_THUNK( shlwapi, WINDOWS, LPWSTR, WINAPI, PathFindFileNameW,
+IMPLEMENT_THUNK( shlwapi, WINDOWS, LPWSTR, WINAPI, PathFindFileNameW, 
 (
     LPCWSTR lpPathW
 ))
 {
-    AUTO_WSTR2STR(lpPath);
+    AUTO_WSTR2STR(lpPath);    
     char* pFname = PathFindFileNameA(lpPathA);
-
+    
     if (pFname > lpPathA)
-    {
+    {        
         *pFname = '\0';
         LPWSTR pOutW = const_cast<LPWSTR>(lpPathW);
-        return (pOutW + _mbslen(reinterpret_cast<unsigned char*>(lpPathA)));
+        return (pOutW + _mbslen(reinterpret_cast<unsigned char*>(lpPathA)));      
     }
     else
         return const_cast<LPWSTR>(lpPathW);
diff --git a/sal/systools/win32/uwinapi/PathIsFileSpecW.cpp b/sal/systools/win32/uwinapi/PathIsFileSpecW.cpp
index 22ac05f109e4..5ee3bf9e7e7b 100644
--- a/sal/systools/win32/uwinapi/PathIsFileSpecW.cpp
+++ b/sal/systools/win32/uwinapi/PathIsFileSpecW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 #define _SHLWAPI_
 #include <shlwapi.h>
 
-IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathIsFileSpecW,
+IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathIsFileSpecW, 
 (
     LPCWSTR lpPathW
 ))
diff --git a/sal/systools/win32/uwinapi/PathIsUNCW.cpp b/sal/systools/win32/uwinapi/PathIsUNCW.cpp
index 2aeb660c3ea3..289dbca69e66 100644
--- a/sal/systools/win32/uwinapi/PathIsUNCW.cpp
+++ b/sal/systools/win32/uwinapi/PathIsUNCW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 #define _SHLWAPI_
 #include <shlwapi.h>
 
-IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathIsUNCW,
+IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathIsUNCW, 
 (
     LPCWSTR lpPathW
 ))
diff --git a/sal/systools/win32/uwinapi/PathRemoveExtensionW.cpp b/sal/systools/win32/uwinapi/PathRemoveExtensionW.cpp
index 790ce1ce15d1..5222cc713842 100644
--- a/sal/systools/win32/uwinapi/PathRemoveExtensionW.cpp
+++ b/sal/systools/win32/uwinapi/PathRemoveExtensionW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,14 +31,14 @@
 #define _SHLWAPI_
 #include <shlwapi.h>
 
-IMPLEMENT_THUNK( shlwapi, WINDOWS, void, WINAPI, PathRemoveExtensionW,
+IMPLEMENT_THUNK( shlwapi, WINDOWS, void, WINAPI, PathRemoveExtensionW, 
 (
     LPWSTR lpPathW
 ))
 {
     AUTO_WSTR2STR(lpPath);
     PathRemoveExtensionA(lpPathA);
-    STR2WSTR(lpPath, wcslen(lpPathW) + 1);
+    STR2WSTR(lpPath, wcslen(lpPathW) + 1);        
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathRemoveFileSpecW.cpp b/sal/systools/win32/uwinapi/PathRemoveFileSpecW.cpp
index 21bec5bd5281..e10de898743c 100644
--- a/sal/systools/win32/uwinapi/PathRemoveFileSpecW.cpp
+++ b/sal/systools/win32/uwinapi/PathRemoveFileSpecW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,14 +31,14 @@
 #define _SHLWAPI_
 #include <shlwapi.h>
 
-IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathRemoveFileSpecW,
+IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathRemoveFileSpecW, 
 (
     LPWSTR lpPathW
 ))
 {
     AUTO_WSTR2STR(lpPath);
     BOOL bret = PathRemoveFileSpecA(lpPathA);
-    STR2WSTR(lpPath, wcslen(lpPathW) + 1);
+    STR2WSTR(lpPath, wcslen(lpPathW) + 1);        
     return bret;
 }
 
diff --git a/sal/systools/win32/uwinapi/PathSetDlgItemPathW.cpp b/sal/systools/win32/uwinapi/PathSetDlgItemPathW.cpp
index b79702c06ca0..c87aee3c9f00 100644
--- a/sal/systools/win32/uwinapi/PathSetDlgItemPathW.cpp
+++ b/sal/systools/win32/uwinapi/PathSetDlgItemPathW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 #define _SHLWAPI_
 #include <shlwapi.h>
 
-IMPLEMENT_THUNK( shlwapi, WINDOWS, void, WINAPI, PathSetDlgItemPathW,
+IMPLEMENT_THUNK( shlwapi, WINDOWS, void, WINAPI, PathSetDlgItemPathW, 
 (
     HWND hDlg,
     int id,
@@ -39,7 +39,7 @@ IMPLEMENT_THUNK( shlwapi, WINDOWS, void, WINAPI, PathSetDlgItemPathW,
 ))
 {
     AUTO_WSTR2STR(lpPath);
-    PathSetDlgItemPathA(hDlg, id, lpPathA);
+    PathSetDlgItemPathA(hDlg, id, lpPathA);    
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/PathStripToRootW.cpp b/sal/systools/win32/uwinapi/PathStripToRootW.cpp
index 05a3ce875f96..e439561ec140 100644
--- a/sal/systools/win32/uwinapi/PathStripToRootW.cpp
+++ b/sal/systools/win32/uwinapi/PathStripToRootW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 #define _SHLWAPI_
 #include <shlwapi.h>
 
-IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathStripToRootW,
+IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathStripToRootW, 
 (
     LPWSTR lpPathW
 ))
@@ -39,7 +39,7 @@ IMPLEMENT_THUNK( shlwapi, WINDOWS, BOOL, WINAPI, PathStripToRootW,
     AUTO_WSTR2STR(lpPath);
     BOOL bret = PathStripToRootA(lpPathA);
     STR2WSTR(lpPath, wcslen(lpPathW) + 1);
-    return bret;
+    return bret;        
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/ResolveThunk.cpp b/sal/systools/win32/uwinapi/ResolveThunk.cpp
index 0f4ed5e3bb7c..1c8da78e2f1d 100644
--- a/sal/systools/win32/uwinapi/ResolveThunk.cpp
+++ b/sal/systools/win32/uwinapi/ResolveThunk.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 
 EXTERN_C void WINAPI ResolveThunk_WINDOWS( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure )
 {
-    FARPROC lpfnResult = (LONG)GetVersion() < 0 ? lpfnEmulate : GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName );
+    FARPROC	lpfnResult = (LONG)GetVersion() < 0 ? lpfnEmulate : GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName );
 
     if ( !lpfnResult )
         lpfnResult = lpfnEmulate;
@@ -45,7 +45,7 @@ EXTERN_C void WINAPI ResolveThunk_WINDOWS( FARPROC *lppfn, LPCSTR lpLibFileName,
 
 EXTERN_C void WINAPI ResolveThunk_TRYLOAD( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnEmulate, FARPROC lpfnFailure )
 {
-    FARPROC lpfnResult = GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName );
+    FARPROC	lpfnResult = GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName );
 
     if ( !lpfnResult )
         lpfnResult = lpfnEmulate;
diff --git a/sal/systools/win32/uwinapi/ResolveUnicows.cpp b/sal/systools/win32/uwinapi/ResolveUnicows.cpp
index 5684cd5f8683..097d75b522c5 100644
--- a/sal/systools/win32/uwinapi/ResolveUnicows.cpp
+++ b/sal/systools/win32/uwinapi/ResolveUnicows.cpp
@@ -9,7 +9,7 @@ extern HMODULE hModuleUnicowsDLL;
 
 EXTERN_C void WINAPI ResolveThunk_UNICOWS( FARPROC *lppfn, LPCSTR lpLibFileName, LPCSTR lpFuncName, FARPROC lpfnFailure )
 {
-    FARPROC lpfnResult = (((LONG)GetVersion()&0x800000ff) == 0x80000004) ? GetProcAddress( hModuleUnicowsDLL, lpFuncName ) : GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName );
+    FARPROC	lpfnResult = (((LONG)GetVersion()&0x800000ff) == 0x80000004) ? GetProcAddress( hModuleUnicowsDLL, lpFuncName ) : GetProcAddress( LoadLibraryA( lpLibFileName ), lpFuncName );
 
     if ( !lpfnResult )
         lpfnResult = lpfnFailure;
@@ -23,14 +23,14 @@ static FARPROC WINAPI GetProcAddress_Failure (HINSTANCE,LPCSTR);
 static void GetProcAddress_Thunk()
 {
     ResolveThunk_UNICOWS( &kernel32_GetProcAddress_Ptr, "kernel32.dll", "GetProcAddress", (FARPROC)GetProcAddress_Failure );
-    asm("   movl    %ebp, %esp");
-    asm("   popl    %ebp");
-    asm("   jmp *(%0)"::"m"(kernel32_GetProcAddress_Ptr));
+    asm("	movl	%ebp, %esp");
+    asm("	popl	%ebp");
+    asm("	jmp	*(%0)"::"m"(kernel32_GetProcAddress_Ptr));
 }
 EXTERN_C FARPROC WINAPI Internal_GetProcAddress (HINSTANCE,LPCSTR)
 {
-    asm("   popl    %ebp");
-    asm("   jmp *(%0)"::"m"(kernel32_GetProcAddress_Ptr));
+    asm("	popl	%ebp");
+    asm("	jmp	*(%0)"::"m"(kernel32_GetProcAddress_Ptr));
 }
 static FARPROC WINAPI GetProcAddress_Failure (HINSTANCE,LPCSTR)
 {
@@ -45,14 +45,14 @@ static rettype calltype func##_##Failure params; \
 static void func##_Thunk() \
 { \
     ResolveThunk_UNICOWS( &module##_##func##_Ptr, #module ".dll", #func, (FARPROC)func##_##Failure ); \
-    asm("   movl    %ebp, %esp"); \
-    asm("   popl    %ebp"); \
-    asm("   jmp *(%0)"::"m"(module##_##func##_Ptr)); \
+    asm("	movl	%ebp, %esp"); \
+    asm("	popl	%ebp"); \
+    asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
 } \
 EXTERN_C rettype calltype func params \
 { \
-    asm("   popl    %ebp"); \
-    asm("   jmp *(%0)"::"m"(module##_##func##_Ptr)); \
+    asm("	popl	%ebp"); \
+    asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
 } \
 static rettype calltype func##_##Failure params \
 { \
diff --git a/sal/systools/win32/uwinapi/SHCreateItemFromParsingName.cpp b/sal/systools/win32/uwinapi/SHCreateItemFromParsingName.cpp
index c9d28c3443e8..1ca6733a6237 100644
--- a/sal/systools/win32/uwinapi/SHCreateItemFromParsingName.cpp
+++ b/sal/systools/win32/uwinapi/SHCreateItemFromParsingName.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/SHILCreateFromPathW.cpp b/sal/systools/win32/uwinapi/SHILCreateFromPathW.cpp
index e0ae9f35e551..5441eb3b874f 100644
--- a/sal/systools/win32/uwinapi/SHILCreateFromPathW.cpp
+++ b/sal/systools/win32/uwinapi/SHILCreateFromPathW.cpp
@@ -21,7 +21,7 @@ EXTERN_C void WINAPI ResolveThunk_SHSimpleIDListFromPathW( FARPROC *lppfn, LPCST
         *lppfn = (FARPROC)SHSimpleIDListFromPathW_WINDOWS;
     else
     {
-        FARPROC lpfnResult = GetProcAddress( LoadLibraryA( lpLibFileName ), MAKEINTRESOURCE(162) );
+        FARPROC	lpfnResult = GetProcAddress( LoadLibraryA( lpLibFileName ), MAKEINTRESOURCE(162) );
         if ( !lpfnResult )
             lpfnResult = (FARPROC)SHSimpleIDListFromPathW_Failure;
 
diff --git a/sal/systools/win32/uwinapi/SetVolumeMountPointA.cpp b/sal/systools/win32/uwinapi/SetVolumeMountPointA.cpp
index 423e8238185b..efe6408741f5 100644
--- a/sal/systools/win32/uwinapi/SetVolumeMountPointA.cpp
+++ b/sal/systools/win32/uwinapi/SetVolumeMountPointA.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/SetVolumeMountPointW.cpp b/sal/systools/win32/uwinapi/SetVolumeMountPointW.cpp
index e56d3df6fa9e..5d2ff95e81d5 100644
--- a/sal/systools/win32/uwinapi/SetVolumeMountPointW.cpp
+++ b/sal/systools/win32/uwinapi/SetVolumeMountPointW.cpp
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/systools/win32/uwinapi/Uwinapi.h b/sal/systools/win32/uwinapi/Uwinapi.h
index da3e336af1c7..5a1db0e87f9d 100644
--- a/sal/systools/win32/uwinapi/Uwinapi.h
+++ b/sal/systools/win32/uwinapi/Uwinapi.h
@@ -27,12 +27,12 @@ EXTERN_C WINBASEAPI DWORD SetVersion( DWORD dwVersion );
 #define MAKE_VER_WIN32_WINDOWS( major, minor, build ) \
     MAKE_VER_WIN32( major, minor, build, TRUE )
 
-#define VER_WIN32_WINDOWS_95    MAKE_VER_WIN32_WINDOWS( 4, 0, 0 )
-#define VER_WIN32_WINDOWS_98    MAKE_VER_WIN32_WINDOWS( 4, 10, 0 )
-#define VER_WIN32_WINDOWS_ME    MAKE_VER_WIN32_WINDOWS( 4, 90, 0 )
-#define VER_WIN32_NT_NT4        MAKE_VER_WIN32_NT( 4, 0, 0 )
-#define VER_WIN32_NT_2000       MAKE_VER_WIN32_NT( 5, 0, 0 )
-#define VER_WIN32_NT_XP         MAKE_VER_WIN32_NT( 5, 1, 0 )
+#define VER_WIN32_WINDOWS_95	MAKE_VER_WIN32_WINDOWS( 4, 0, 0 )
+#define VER_WIN32_WINDOWS_98	MAKE_VER_WIN32_WINDOWS( 4, 10, 0 )
+#define VER_WIN32_WINDOWS_ME	MAKE_VER_WIN32_WINDOWS( 4, 90, 0 )
+#define VER_WIN32_NT_NT4		MAKE_VER_WIN32_NT( 4, 0, 0 )
+#define VER_WIN32_NT_2000		MAKE_VER_WIN32_NT( 5, 0, 0 )
+#define VER_WIN32_NT_XP			MAKE_VER_WIN32_NT( 5, 1, 0 )
 
 
 EXTERN_C WINBASEAPI LPSTR WINAPI lstrchrA( LPCSTR lpString, CHAR c );
@@ -41,22 +41,22 @@ EXTERN_C WINBASEAPI LPSTR WINAPI lstrrchrA( LPCSTR lpString, CHAR c );
 EXTERN_C WINBASEAPI LPWSTR WINAPI lstrrchrW( LPCWSTR lpString, WCHAR c );
 
 #ifdef UNICODE
-#define lstrrchr    lstrrchrW
-#define lstrchr     lstrchrW
+#define lstrrchr	lstrrchrW
+#define lstrchr		lstrchrW
 #else
-#define lstrrchr    lstrrchrA
-#define lstrchr     lstrchrA
+#define lstrrchr	lstrrchrA
+#define lstrchr		lstrchrA
 #endif
 
-#define IsValidHandle(Handle)   ((DWORD)(Handle) + 1 > 1)
+#define IsValidHandle(Handle)	((DWORD)(Handle) + 1 > 1)
 
 #ifdef __cplusplus
 
 #define _AUTO_WSTR2STR( lpStrA, lpStrW ) \
-LPSTR   lpStrA; \
+LPSTR	lpStrA; \
 if ( lpStrW ) \
 { \
-    int cNeeded = WideCharToMultiByte( CP_ACP, 0, lpStrW, -1, NULL, 0, NULL, NULL ); \
+    int	cNeeded = WideCharToMultiByte( CP_ACP, 0, lpStrW, -1, NULL, 0, NULL, NULL ); \
     lpStrA = (LPSTR)_alloca( cNeeded * sizeof(CHAR) ); \
     WideCharToMultiByte( CP_ACP, 0, lpStrW, -1, lpStrA, cNeeded, NULL, NULL ); \
 } \
@@ -68,9 +68,9 @@ else \
     _AUTO_WSTR2STR( lpStr##A, lpStr##W )
 
 #define AUTO_STR( lpStr, cchBuffer ) \
-LPSTR   lpStr##A = lpStr##W ? (LPSTR)_alloca( (cchBuffer) * sizeof(CHAR) ) : NULL;
+LPSTR	lpStr##A = lpStr##W ? (LPSTR)_alloca( (cchBuffer) * sizeof(CHAR) ) : NULL;
 
-#endif  // __cplusplus
+#endif	// __cplusplus
 
 #define STRBUF2WSTR( lpStr, cchSrcBuffer, cchDestBuffer ) \
     MultiByteToWideChar( CP_ACP, 0, lpStr##A, cchSrcBuffer, lpStr##W, cchDestBuffer )
@@ -95,11 +95,11 @@ static rettype calltype func##_##Failure params; \
 static _declspec ( naked ) func##_Thunk() \
 { \
     ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, (FARPROC)func##_##resolve, (FARPROC)func##_##Failure ); \
-    _asm    jmp [module##_##func##_Ptr] \
+    _asm	jmp	[module##_##func##_Ptr] \
 } \
 EXTERN_C _declspec( naked ) rettype calltype func params \
 { \
-    _asm    jmp [module##_##func##_Ptr] \
+    _asm	jmp	[module##_##func##_Ptr] \
 } \
 EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
 static rettype calltype func##_##Failure params \
@@ -124,11 +124,11 @@ EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
 static _declspec ( naked ) func##_Thunk() \
 { \
     ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func ); \
-    _asm    jmp [module##_##func##_Ptr] \
+    _asm	jmp	[module##_##func##_Ptr] \
 } \
 EXTERN_C _declspec( naked ) rettype calltype func params \
 { \
-    _asm    jmp [module##_##func##_Ptr] \
+    _asm	jmp	[module##_##func##_Ptr] \
 } \
 EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk;
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/macros.h b/sal/systools/win32/uwinapi/macros.h
index 69b2d66609c1..2d253c413602 100644
--- a/sal/systools/win32/uwinapi/macros.h
+++ b/sal/systools/win32/uwinapi/macros.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 #include <systools/win32/uwinapi.h>
 
 #ifndef _INC_MALLOC
-#   include <malloc.h>
+#	include <malloc.h>
 #endif
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1400)
@@ -38,10 +38,10 @@
 #endif
 
 #ifndef _INC_TCHAR
-#   ifdef UNICODE
-#       define _UNICODE
-#   endif
-#   include <TCHAR.H>
+#	ifdef UNICODE
+#		define _UNICODE
+#	endif
+#	include <TCHAR.H>
 #endif
 
 // Globally disable "warning C4100: unreferenced formal parameter" caused by
@@ -61,21 +61,21 @@
 #define MAKE_VER_WIN32_WINDOWS( major, minor, build ) \
     MAKE_VER_WIN32( major, minor, build, TRUE )
 
-#define VER_WIN32_WINDOWS_95    MAKE_VER_WIN32_WINDOWS( 4, 0, 0 )
-#define VER_WIN32_WINDOWS_98    MAKE_VER_WIN32_WINDOWS( 4, 10, 0 )
-#define VER_WIN32_WINDOWS_ME    MAKE_VER_WIN32_WINDOWS( 4, 90, 0 )
-#define VER_WIN32_NT_NT4        MAKE_VER_WIN32_NT( 4, 0, 0 )
-#define VER_WIN32_NT_2000       MAKE_VER_WIN32_NT( 5, 0, 0 )
-#define VER_WIN32_NT_XP         MAKE_VER_WIN32_NT( 5, 1, 0 )
+#define VER_WIN32_WINDOWS_95	MAKE_VER_WIN32_WINDOWS( 4, 0, 0 )
+#define VER_WIN32_WINDOWS_98	MAKE_VER_WIN32_WINDOWS( 4, 10, 0 )
+#define VER_WIN32_WINDOWS_ME	MAKE_VER_WIN32_WINDOWS( 4, 90, 0 )
+#define VER_WIN32_NT_NT4		MAKE_VER_WIN32_NT( 4, 0, 0 )
+#define VER_WIN32_NT_2000		MAKE_VER_WIN32_NT( 5, 0, 0 )
+#define VER_WIN32_NT_XP			MAKE_VER_WIN32_NT( 5, 1, 0 )
 
 
 #ifdef __cplusplus
 
 #define _AUTO_WSTR2STR( lpStrA, lpStrW ) \
-LPSTR   lpStrA; \
+LPSTR	lpStrA; \
 if ( lpStrW ) \
 { \
-    int cNeeded = WideCharToMultiByte( CP_ACP, 0, lpStrW, -1, NULL, 0, NULL, NULL ); \
+    int	cNeeded = WideCharToMultiByte( CP_ACP, 0, lpStrW, -1, NULL, 0, NULL, NULL ); \
     lpStrA = (LPSTR)_alloca( cNeeded * sizeof(CHAR) ); \
     WideCharToMultiByte( CP_ACP, 0, lpStrW, -1, lpStrA, cNeeded, NULL, NULL ); \
 } \
@@ -87,9 +87,9 @@ else \
     _AUTO_WSTR2STR( lpStr##A, lpStr##W )
 
 #define AUTO_STR( lpStr, cchBuffer ) \
-LPSTR   lpStr##A = lpStr##W ? (LPSTR)_alloca( (cchBuffer) * sizeof(CHAR) ) : NULL;
+LPSTR	lpStr##A = lpStr##W ? (LPSTR)_alloca( (cchBuffer) * sizeof(CHAR) ) : NULL;
 
-#endif  /* __cplusplus */
+#endif	/* __cplusplus */
 
 
 #define STRBUF2WSTR( lpStr, cchSrcBuffer, cchDestBuffer ) \
@@ -114,17 +114,17 @@ static void func##_Thunk(); \
 EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
 EXTERN_C rettype calltype func params \
 { \
-    asm("   popl    %ebp"); \
-    asm("   jmp *(%0)"::"m"(module##_##func##_Ptr)); \
+    asm("	popl	%ebp"); \
+    asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
 } \
 EXTERN_C rettype calltype func##_##resolve params; \
 static rettype calltype func##_##Failure params; \
 static void func##_Thunk() \
 { \
     ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, (FARPROC)func##_##resolve, (FARPROC)func##_##Failure ); \
-    asm("   movl    %ebp, %esp"); \
-    asm("   popl    %ebp"); \
-    asm("   jmp *(%0)"::"m"(module##_##func##_Ptr)); \
+    asm("	movl	%ebp, %esp"); \
+    asm("	popl	%ebp"); \
+    asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
 } \
 static rettype calltype func##_##Failure params \
 { \
@@ -140,11 +140,11 @@ static rettype calltype func##_##Failure params; \
 static _declspec ( naked ) void func##_Thunk() \
 { \
     ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, (FARPROC)func##_##resolve, (FARPROC)func##_##Failure ); \
-    _asm    jmp [module##_##func##_Ptr] \
+    _asm	jmp	[module##_##func##_Ptr] \
 } \
 EXTERN_C _declspec( naked ) rettype calltype func params \
 { \
-    _asm    jmp [module##_##func##_Ptr] \
+    _asm	jmp	[module##_##func##_Ptr] \
 } \
 EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
 static rettype calltype func##_##Failure params \
@@ -164,14 +164,14 @@ EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_
 static void func##_Thunk() \
 { \
     ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func ); \
-    asm("   movl    %ebp, %esp"); \
-    asm("   popl    %ebp"); \
-    asm("   jmp *(%0)"::"m"(module##_##func##_Ptr)); \
+    asm("	movl	%ebp, %esp"); \
+    asm("	popl	%ebp"); \
+    asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
 } \
 EXTERN_C rettype calltype func params \
 { \
-    asm("   popl    %ebp"); \
-    asm("   jmp *(%0)"::"m"(module##_##func##_Ptr)); \
+    asm("	popl	%ebp"); \
+    asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
 }
 #else
 #define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \
@@ -179,11 +179,11 @@ EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \
 static _declspec ( naked ) void func##_Thunk() \
 { \
     ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func ); \
-    _asm    jmp [module##_##func##_Ptr] \
+    _asm	jmp	[module##_##func##_Ptr] \
 } \
 EXTERN_C _declspec( naked ) rettype calltype func params \
 { \
-    _asm    jmp [module##_##func##_Ptr] \
+    _asm	jmp	[module##_##func##_Ptr] \
 } \
 EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk;
 #endif
@@ -197,14 +197,14 @@ static rettype calltype func##_##Failure params; \
 static _declspec ( naked ) void func##_Thunk() \
 { \
     ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, NULL, (FARPROC)func##_##Failure ); \
-    asm("   movl    %ebp, %esp"); \
-    asm("   popl    %ebp"); \
-    asm("   jmp *(%0)"::"m"(module##_##func##_Ptr)); \
+    asm("	movl	%ebp, %esp"); \
+    asm("	popl	%ebp"); \
+    asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
 } \
 EXTERN_C _declspec( naked ) rettype calltype func params \
 { \
-    asm("   popl    %ebp"); \
-    asm("   jmp *(%0)"::"m"(module##_##func##_Ptr)); \
+    asm("	popl	%ebp"); \
+    asm("	jmp	*(%0)"::"m"(module##_##func##_Ptr)); \
 } \
 static rettype calltype func##_##Failure params \
 { \
@@ -218,11 +218,11 @@ static rettype calltype func##_##Failure params; \
 static _declspec ( naked ) void func##_Thunk() \
 { \
     ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, NULL, (FARPROC)func##_##Failure ); \
-    _asm    jmp [module##_##func##_Ptr] \
+    _asm	jmp	[module##_##func##_Ptr] \
 } \
 EXTERN_C _declspec( naked ) rettype calltype func params \
 { \
-    _asm    jmp [module##_##func##_Ptr] \
+    _asm	jmp	[module##_##func##_Ptr] \
 } \
 EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \
 static rettype calltype func##_##Failure params \
diff --git a/sal/systools/win32/uwinapi/sntprintf.c b/sal/systools/win32/uwinapi/sntprintf.c
index 144882bddc63..534f763365a2 100644
--- a/sal/systools/win32/uwinapi/sntprintf.c
+++ b/sal/systools/win32/uwinapi/sntprintf.c
@@ -8,12 +8,12 @@
 #include <systools/win32/snprintf.h>
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#pragma warning(disable:4273)       // inconsistent dll linkage
+#pragma warning(disable:4273)		// inconsistent dll linkage
 #endif
 
 #if (defined(_MSC_VER) && (_MSC_VER < 1300)) || (defined(__MINGW32_VERSION) && ((__MINGW32_MAJOR_VERSION < 3)||((__MINGW32_MAJOR_VERSION == 3)&&(__MINGW32_MINOR_VERSION < 18))))
 
-/*  The non-debug versions of _vscprintf/_scprintf are just calls
+/*	The non-debug versions of _vscprintf/_scprintf are just calls
     to _vsprintf/_sprintf with string buffer pointer set to NULL,
     requires MSVCRT version 7.0 */
 #ifdef __MINGW32__
@@ -22,11 +22,11 @@ static int __cdecl _vsctprintf( const TCHAR *format, va_list ap )
 static int __cdecl _vsctprintf( const _TXCHAR *format, va_list ap )
 #endif
 {
-    FILE    *fp = _tfopen( _T("NUL"), _T("wb") );
+    FILE	*fp = _tfopen( _T("NUL"), _T("wb") );
 
     if ( fp )
     {
-        int retval = _vftprintf( fp, format, ap );
+        int	retval = _vftprintf( fp, format, ap );
         fclose( fp );
 
         return retval;
@@ -36,22 +36,22 @@ static int __cdecl _vsctprintf( const _TXCHAR *format, va_list ap )
 }
 #endif
 
-/*  This function retrieves the pointer to the last character of a buffer.
+/*	This function retrieves the pointer to the last character of a buffer.
     That is the pointer to the last character of the buffer that fits
-    completly into that buffer or the position of the terminating zero.
+    completly into that	buffer or the position of the terminating zero.
 
-    buffer  Pointer to a _TXCHAR buffer to be examined
-    count   size of the buffer to be examined
+    buffer	Pointer to a _TXCHAR buffer to be examined
+    count	size of the buffer to be examined
 
-    return  The pointer to the last character that fits into the buffer or
+    return	The pointer to the last character that fits into the buffer or
             NULL if count is zero or count is one and the first byte was a
-            leading DBCS character
+            leading	DBCS character
 */
 
 static _TCHAR *GetLastBufferChar( _TCHAR *buffer, size_t count )
 {
-    _TCHAR  *last = NULL;
-    _TCHAR  *cur = buffer;
+    _TCHAR	*last = NULL;
+    _TCHAR	*cur = buffer;
 
     while ( (size_t)(cur - buffer) < count )
     {
@@ -70,33 +70,33 @@ static _TCHAR *GetLastBufferChar( _TCHAR *buffer, size_t count )
 
 _SNPRINTF_DLLIMPORT int __cdecl vsntprintf( _TCHAR *buffer, size_t count, const _TCHAR *format, va_list list )
 {
-    int     retval;
+    int		retval;
 
-    /*  First of all call the existing non POSIX standard function assuming
+    /*	First of all call the existing non POSIX standard function assuming
         the buffer size will be large enough */
 
     retval = _vsntprintf( buffer, count, format, list );
 
     if ( retval < 0 )
     {
-        /*  If the buffer wasn't large enough ensure that the buffer will be
+        /*	If the buffer wasn't large enough ensure that the buffer will be
             zero terminated */
 
-        _TCHAR  *last = GetLastBufferChar( buffer, count );
+        _TCHAR	*last = GetLastBufferChar( buffer, count );
         if (last )
             *last = 0;
 
-        /*  Retrieve the count of characters that would have been written
+        /*	Retrieve the count of characters that would have been written
             if the buffer were large enough */
 
         retval = _vsctprintf( format, list );
     }
     else if ( (size_t)retval == count && count )
     {
-        /*  If the buffer was large enough but not large enough for the trailing
+        /*	If the buffer was large enough but not large enough for the trailing
             zero make the buffer zero terminated */
 
-        _TCHAR  *last = GetLastBufferChar( buffer, count );
+        _TCHAR	*last = GetLastBufferChar( buffer, count );
         if (last )
             *last = 0;
     }
@@ -108,8 +108,8 @@ _SNPRINTF_DLLIMPORT int __cdecl vsntprintf( _TCHAR *buffer, size_t count, const
 
 _SNPRINTF_DLLIMPORT int __cdecl sntprintf( _TCHAR *buffer, size_t count, const _TCHAR *format, ... )
 {
-    va_list list;
-    int     retval;
+    va_list	list;
+    int		retval;
 
     va_start( list, format );
     retval = vsntprintf( buffer, count, format, list );
diff --git a/sal/systools/win32/uwinapi/win95sys.h b/sal/systools/win32/uwinapi/win95sys.h
index f5500fc7ea9c..a02789ecedad 100644
--- a/sal/systools/win32/uwinapi/win95sys.h
+++ b/sal/systools/win32/uwinapi/win95sys.h
@@ -3,52 +3,52 @@
 
 //Kernel32 objects
 
-#define K32OBJ_SEMAPHORE            0x1
-#define K32OBJ_EVENT                0x2
-#define K32OBJ_MUTEX                0x3
+#define K32OBJ_SEMAPHORE			0x1
+#define K32OBJ_EVENT				0x2
+#define K32OBJ_MUTEX				0x3
 #define K32OBJ_CRITICAL_SECTION     0x4
-#define K32OBJ_PROCESS              0x5
-#define K32OBJ_THREAD               0x6
-#define K32OBJ_FILE                 0x7
-#define K32OBJ_CHANGE               0x8
-#define K32OBJ_CONSOLE              0x9
-#define K32OBJ_SCREEN_BUFFER        0xA
-#define K32OBJ_MEM_MAPPED_FILE      0xB
-#define K32OBJ_SERIAL               0xC
-#define K32OBJ_DEVICE_IOCTL         0xD
-#define K32OBJ_PIPE                 0xE
-#define K32OBJ_MAILSLOT             0xF
+#define K32OBJ_PROCESS				0x5
+#define K32OBJ_THREAD				0x6
+#define K32OBJ_FILE					0x7
+#define K32OBJ_CHANGE				0x8
+#define K32OBJ_CONSOLE				0x9
+#define K32OBJ_SCREEN_BUFFER	    0xA
+#define K32OBJ_MEM_MAPPED_FILE	    0xB
+#define K32OBJ_SERIAL				0xC
+#define K32OBJ_DEVICE_IOCTL			0xD
+#define K32OBJ_PIPE					0xE
+#define K32OBJ_MAILSLOT 			0xF
 #define K32OBJ_TOOLHELP_SNAPSHOT    0x10
-#define K32OBJ_SOCKET               0x11
+#define K32OBJ_SOCKET				0x11
 
 
 //Process Database flags
 
-#define fDebugSingle        0x00000001
-#define fCreateProcessEvent 0x00000002
-#define fExitProcessEvent   0x00000004
-#define fWin16Process       0x00000008
-#define fDosProcess         0x00000010
-#define fConsoleProcess     0x00000020
-#define fFileApisAreOem     0x00000040
-#define fNukeProcess        0x00000080
-#define fServiceProcess     0x00000100
-#define fLoginScriptHack    0x00000800
+#define fDebugSingle		0x00000001
+#define fCreateProcessEvent	0x00000002
+#define fExitProcessEvent	0x00000004
+#define fWin16Process		0x00000008
+#define fDosProcess			0x00000010
+#define fConsoleProcess 	0x00000020
+#define fFileApisAreOem 	0x00000040
+#define fNukeProcess		0x00000080
+#define fServiceProcess 	0x00000100
+#define fLoginScriptHack	0x00000800
 
 
 //Thread Database flags
 
-#define fCreateThreadEvent      0x00000001
-#define fCancelExceptionAbort   0x00000002
-#define fOnTempStack            0x00000004
-#define fGrowableStack          0x00000008
-#define fDelaySingleStep        0x00000010
+#define fCreateThreadEvent		0x00000001
+#define fCancelExceptionAbort	0x00000002
+#define fOnTempStack			0x00000004
+#define fGrowableStack			0x00000008
+#define fDelaySingleStep		0x00000010
 #define fOpenExeAsImmovableFile 0x00000020
-#define fCreateSuspended        0x00000040
-#define fStackOverflow          0x00000080
-#define fNestedCleanAPCs        0x00000100
-#define fWasOemNowAnsi          0x00000200
-#define fOKToSetThreadOem       0x00000400
+#define fCreateSuspended		0x00000040
+#define fStackOverflow			0x00000080
+#define fNestedCleanAPCs		0x00000100
+#define fWasOemNowAnsi			0x00000200
+#define fOKToSetThreadOem		0x00000400
 
 #ifdef _MSC_VER
 #pragma warning(disable:4103)
@@ -60,86 +60,86 @@
 
 typedef struct _MODREF {
     struct _MODREF *pNextModRef;    // 00h
-    DWORD       un1;        // 04h
-    DWORD       un2;        // 08h
-    DWORD       un3;        // 0Ch
-    WORD        mteIndex;   // 10h
-    WORD        un4;        // 12h
-    DWORD       un5;        // 14h
-    PVOID       ppdb;       // 18h Pointer to process database
-    DWORD       un6;        // 1Ch
-    DWORD       un7;        // 20h
-    DWORD       un8;        // 24h
+    DWORD	    un1;	    // 04h
+    DWORD	    un2;	    // 08h
+    DWORD	    un3;	    // 0Ch
+    WORD	    mteIndex;	// 10h
+    WORD	    un4;	    // 12h
+    DWORD	    un5;	    // 14h
+    PVOID	    ppdb;	    // 18h Pointer to process database
+    DWORD	    un6;	    // 1Ch
+    DWORD	    un7;	    // 20h
+    DWORD	    un8;	    // 24h
 } MODREF, *PMODREF;
 
 typedef struct _IMTE {
-    DWORD       un1;            // 00h
-    PIMAGE_NT_HEADERS   pNTHdr; // 04h
-    DWORD       un2;            // 08h
-    PSTR        pszFileName;    // 0Ch
-    PSTR        pszModName;     // 10h
-    WORD        cbFileName;     // 14h
-    WORD        cbModName;      // 16h
-    DWORD       un3;            // 18h
-    DWORD       cSections;      // 1Ch
-    DWORD       un5;            // 20h
-    DWORD       baseAddress;    // 24h
-    WORD        hModule16;      // 28h
-    WORD        cUsage;         // 2Ah
-    DWORD       un7;            // 2Ch
-    PSTR        pszFileName2;   // 30h
-    WORD        cbFileName2;    // 34h
-    DWORD       pszModName2;    // 36h
-    WORD        cbModName2;     // 3Ah
+    DWORD	    un1;			// 00h
+    PIMAGE_NT_HEADERS	pNTHdr; // 04h
+    DWORD	    un2;			// 08h
+    PSTR	    pszFileName;    // 0Ch
+    PSTR	    pszModName;     // 10h
+    WORD	    cbFileName;     // 14h
+    WORD	    cbModName;	    // 16h
+    DWORD	    un3;			// 18h
+    DWORD	    cSections;	    // 1Ch
+    DWORD	    un5;			// 20h
+    DWORD	    baseAddress;    // 24h
+    WORD	    hModule16;	    // 28h
+    WORD	    cUsage;			// 2Ah
+    DWORD	    un7;			// 2Ch
+    PSTR	    pszFileName2;   // 30h
+    WORD	    cbFileName2;    // 34h
+    DWORD	    pszModName2;    // 36h
+    WORD	    cbModName2;     // 3Ah
 } IMTE, *PIMTE;
 
 
 //Process Database structure
 
 typedef struct _ENVIRONMENT_DATABASE {
-PSTR    pszEnvironment;     // 00h Pointer to Environment
-DWORD   un1;                // 04h
-PSTR    pszCmdLine;         // 08h Pointer to command line
-PSTR    pszCurrDirectory;   // 0Ch Pointer to current directory
+PSTR	pszEnvironment;     // 00h Pointer to Environment
+DWORD	un1;				// 04h
+PSTR	pszCmdLine;			// 08h Pointer to command line
+PSTR	pszCurrDirectory;   // 0Ch Pointer to current directory
 LPSTARTUPINFOA pStartupInfo;// 10h Pointer to STARTUPINFOA struct
-HANDLE  hStdIn;             // 14h Standard Input
-HANDLE  hStdOut;            // 18h Standard Output
-HANDLE  hStdErr;            // 1Ch Standard Error
-DWORD   un2;                // 20h
-DWORD   InheritConsole;     // 24h
-DWORD   BreakType;          // 28h
-DWORD   BreakSem;           // 2Ch
-DWORD   BreakEvent;         // 30h
-DWORD   BreakThreadID;      // 34h
-DWORD   BreakHandlers;      // 38h
+HANDLE	hStdIn; 			// 14h Standard Input
+HANDLE	hStdOut;			// 18h Standard Output
+HANDLE	hStdErr;			// 1Ch Standard Error
+DWORD	un2;				// 20h
+DWORD	InheritConsole;     // 24h
+DWORD	BreakType;			// 28h
+DWORD	BreakSem;			// 2Ch
+DWORD	BreakEvent;			// 30h
+DWORD	BreakThreadID;	    // 34h
+DWORD	BreakHandlers;	    // 38h
 } ENVIRONMENT_DATABASE, *PENVIRONMENT_DATABASE;
 
 typedef struct _KERNEL_OBJECT {
-DWORD   Type;           // 00h KERNEL32 object type (5)
-DWORD   cReference;     // 04h Number of references to process
+DWORD	Type;		    // 00h KERNEL32 object type (5)
+DWORD	cReference;	    // 04h Number of references to process
 } KERNEL_OBJECT, *PKERNEL_OBJECT;
 
 typedef struct _HANDLE_TABLE_ENTRY {
-    DWORD   flags;      // Valid flags depend on what type of object this is
-    PKERNEL_OBJECT   pObject;   // Pointer to the object that the handle refers to
+    DWORD   flags;		// Valid flags depend on what type of object this is
+    PKERNEL_OBJECT   pObject;	// Pointer to the object that the handle refers to
 } HANDLE_TABLE_ENTRY, *PHANDLE_TABLE_ENTRY;
 
 typedef struct _HANDLE_TABLE {
-    DWORD   cEntries;               // Max number of handles in table
+    DWORD   cEntries;				// Max number of handles in table
     HANDLE_TABLE_ENTRY array[1];    // An array (number is given by cEntries)
 } HANDLE_TABLE, *PHANDLE_TABLE;
 
 
 typedef struct _PROCESS_DATABASE {
-DWORD   Type;           // 00h KERNEL32 object type (5)
-DWORD   cReference;     // 04h Number of references to process
-DWORD   un1;            // 08h
-DWORD   someEvent;      // 0Ch An event object (What's it used for???)
-DWORD   TerminationStatus;  // 10h Returned by GetExitCodeProcess
-DWORD   un2;            // 14h
-DWORD   DefaultHeap;        // 18h Address of the process heap
-DWORD   MemoryContext;      // 1Ch pointer to the process's context
-DWORD   flags;          // 20h
+DWORD	Type;		    // 00h KERNEL32 object type (5)
+DWORD	cReference;	    // 04h Number of references to process
+DWORD	un1;		    // 08h
+DWORD	someEvent;	    // 0Ch An event object (What's it used for???)
+DWORD	TerminationStatus;  // 10h Returned by GetExitCodeProcess
+DWORD	un2;		    // 14h
+DWORD	DefaultHeap;	    // 18h Address of the process heap
+DWORD	MemoryContext;	    // 1Ch pointer to the process's context
+DWORD	flags;		    // 20h
                 // 0x00000001 - fDebugSingle
                 // 0x00000002 - fCreateProcessEvent
                 // 0x00000004 - fExitProcessEvent
@@ -150,44 +150,44 @@ DWORD   flags;          // 20h
                 // 0x00000080 - fNukeProcess
                 // 0x00000100 - fServiceProcess
                 // 0x00000800 - fLoginScriptHack
-DWORD   pPSP;           // 24h Linear address of PSP?
-WORD    PSPSelector;        // 28h
-WORD    MTEIndex;       // 2Ah
-WORD    cThreads;       // 2Ch
-WORD    cNotTermThreads;    // 2Eh
-WORD    un3;            // 30h
-WORD    cRing0Threads;      // 32h number of ring 0 threads
-HANDLE  HeapHandle;     // 34h Heap to allocate handle tables out of
-                //     This seems to always be the KERNEL32 heap
-HTASK   W16TDB;         // 38h Win16 Task Database selector
-DWORD   MemMapFiles;        // 3Ch memory mapped file list (?)
+DWORD	pPSP;		    // 24h Linear address of PSP?
+WORD	PSPSelector;	    // 28h
+WORD	MTEIndex;	    // 2Ah
+WORD	cThreads;	    // 2Ch
+WORD	cNotTermThreads;    // 2Eh
+WORD	un3;		    // 30h
+WORD	cRing0Threads;	    // 32h number of ring 0 threads
+HANDLE	HeapHandle;	    // 34h Heap to allocate handle tables out of
+                //	   This seems to always be the KERNEL32 heap
+HTASK	W16TDB; 	    // 38h Win16 Task Database selector
+DWORD	MemMapFiles;	    // 3Ch memory mapped file list (?)
 PENVIRONMENT_DATABASE pEDB; // 40h Pointer to Environment Database
 PHANDLE_TABLE pHandleTable; // 44h Pointer to process handle table
 struct _PROCESS_DATABASE *ParentPDB;   // 48h Parent process database
-PMODREF MODREFlist;     // 4Ch Module reference list
-DWORD   ThreadList;     // 50h Threads in this process
-DWORD   DebuggeeCB;     // 54h Debuggee Context block?
-DWORD   LocalHeapFreeHead;  // 58h Head of free list in process heap
-DWORD   InitialRing0ID;     // 5Ch
+PMODREF MODREFlist;	    // 4Ch Module reference list
+DWORD	ThreadList;	    // 50h Threads in this process
+DWORD	DebuggeeCB;	    // 54h Debuggee Context block?
+DWORD	LocalHeapFreeHead;  // 58h Head of free list in process heap
+DWORD	InitialRing0ID;     // 5Ch
 CRITICAL_SECTION    crst;   // 60h
-DWORD   un4[3];         // 78h
-DWORD   pConsole;       // 84h Pointer to console for process
-DWORD   tlsInUseBits1;      // 88h  // Represents TLS indices 0 - 31
-DWORD   tlsInUseBits2;      // 8Ch  // Represents TLS indices 32 - 63
-DWORD   ProcessDWORD;       // 90h
+DWORD	un4[3]; 	    // 78h
+DWORD	pConsole;	    // 84h Pointer to console for process
+DWORD	tlsInUseBits1;	    // 88h  // Represents TLS indices 0 - 31
+DWORD	tlsInUseBits2;	    // 8Ch  // Represents TLS indices 32 - 63
+DWORD	ProcessDWORD;	    // 90h
 struct _PROCESS_DATABASE *ProcessGroup;    // 94h
-DWORD   pExeMODREF;     // 98h pointer to EXE's MODREF
-DWORD   TopExcFilter;       // 9Ch Top Exception Filter?
-DWORD   BasePriority;       // A0h Base scheduling priority for process
-DWORD   HeapOwnList;        // A4h Head of the list of process heaps
-DWORD   HeapHandleBlockList;// A8h Pointer to head of heap handle block list
-DWORD   pSomeHeapPtr;       // ACh normally zero, but can a pointer to a
+DWORD	pExeMODREF;	    // 98h pointer to EXE's MODREF
+DWORD	TopExcFilter;	    // 9Ch Top Exception Filter?
+DWORD	BasePriority;	    // A0h Base scheduling priority for process
+DWORD	HeapOwnList;	    // A4h Head of the list of process heaps
+DWORD	HeapHandleBlockList;// A8h Pointer to head of heap handle block list
+DWORD	pSomeHeapPtr;	    // ACh normally zero, but can a pointer to a
                 // moveable handle block in the heap
-DWORD   pConsoleProvider;   // B0h Process that owns the console we're using?
-WORD    EnvironSelector;    // B4h Selector containing process environment
-WORD    ErrorMode;      // B6H SetErrorMode value (also thunks to Win16)
-DWORD   pevtLoadFinished;   // B8h Pointer to event LoadFinished?
-WORD    UTState;        // BCh
+DWORD	pConsoleProvider;   // B0h Process that owns the console we're using?
+WORD	EnvironSelector;    // B4h Selector containing process environment
+WORD	ErrorMode;	    // B6H SetErrorMode value (also thunks to Win16)
+DWORD	pevtLoadFinished;   // B8h Pointer to event LoadFinished?
+WORD	UTState;	    // BCh
 } PROCESS_DATABASE, *PPROCESS_DATABASE;
 
 
@@ -195,43 +195,43 @@ WORD    UTState;        // BCh
 
 typedef struct _SEH_record {
     struct _SEH_record *pNext;
-    FARPROC     pfnHandler;
+    FARPROC		pfnHandler;
 } SEH_record, *PSEH_record;
 
 // This is semi-documented in the NTDDK.H file from the NT DDK
 typedef struct _TIB {
-PSEH_record pvExcept;       // 00h Head of exception record list
-PVOID   pvStackUserTop;     // 04h Top of user stack
-PVOID   pvStackUserBase;    // 08h Base of user stack
-WORD    pvTDB;          // 0Ch TDB
-WORD    pvThunksSS;     // 0Eh SS selector used for thunking to 16 bits
-DWORD   SelmanList;     // 10h
-PVOID   pvArbitrary;        // 14h Available for application use
-struct _tib *ptibSelf;      // 18h Linear address of TIB structure
-WORD    TIBFlags;       // 1Ch
-WORD    Win16MutexCount;    // 1Eh
-DWORD   DebugContext;       // 20h
-DWORD   pCurrentPriority;   // 24h
-DWORD   pvQueue;        // 28h Message Queue selector
-PVOID  *pvTLSArray;     // 2Ch Thread Local Storage array
+PSEH_record pvExcept;	    // 00h Head of exception record list
+PVOID	pvStackUserTop;     // 04h Top of user stack
+PVOID	pvStackUserBase;    // 08h Base of user stack
+WORD	pvTDB;		    // 0Ch TDB
+WORD	pvThunksSS;	    // 0Eh SS selector used for thunking to 16 bits
+DWORD	SelmanList;	    // 10h
+PVOID	pvArbitrary;	    // 14h Available for application use
+struct _tib *ptibSelf;	    // 18h Linear address of TIB structure
+WORD	TIBFlags;	    // 1Ch
+WORD	Win16MutexCount;    // 1Eh
+DWORD	DebugContext;	    // 20h
+DWORD	pCurrentPriority;   // 24h
+DWORD	pvQueue;	    // 28h Message Queue selector
+PVOID  *pvTLSArray;	    // 2Ch Thread Local Storage array
 } TIB, *PTIB;
 
 
 //TDBX structure
 
 typedef struct _TDBX {
-    DWORD   ptdb;       // 00h  // PTHREAD_DATABASE
-    DWORD   ppdb;       // 04h  // PPROCESDS_DATABASE
-    DWORD   ContextHandle;  // 08h
-    DWORD   un1;        // 0Ch
-    DWORD   TimeOutHandle;  // 10h
-    DWORD   WakeParam;      // 14h
-    DWORD   BlockHandle;    // 18h
-    DWORD   BlockState;     // 1Ch
-    DWORD   SuspendCount;   // 20h
-    DWORD   SuspendHandle;  // 24h
-    DWORD   MustCompleteCount;  // 28h
-    DWORD   WaitExFlags;    // 2Ch
+    DWORD   ptdb;		// 00h	// PTHREAD_DATABASE
+    DWORD   ppdb;		// 04h	// PPROCESDS_DATABASE
+    DWORD   ContextHandle;	// 08h
+    DWORD   un1;		// 0Ch
+    DWORD   TimeOutHandle;	// 10h
+    DWORD   WakeParam;		// 14h
+    DWORD   BlockHandle;	// 18h
+    DWORD   BlockState; 	// 1Ch
+    DWORD   SuspendCount;	// 20h
+    DWORD   SuspendHandle;	// 24h
+    DWORD   MustCompleteCount;	// 28h
+    DWORD   WaitExFlags;	// 2Ch
                 // 0x00000001 - WAITEXBIT
                 // 0x00000002 - WAITACKBIT
                 // 0x00000004 - SUSPEND_APC_PENDING
@@ -248,48 +248,48 @@ typedef struct _TDBX {
                 // 0x00002000 - WAITING_FOR_CRST_SAFE
                 // 0x00004000 - CRST_SAFE
                 // 0x00040000 - BLOCK_TERMINATE_APC
-    DWORD   SyncWaitCount;  // 30h
-    DWORD   QueuedSyncFuncs;    // 34h
-    DWORD   UserAPCList;    // 38h
-    DWORD   KernAPCList;    // 3Ch
-    DWORD   pPMPSPSelector; // 40h
-    DWORD   BlockedOnID;    // 44h
-    DWORD   un2[7];     // 48h
-    DWORD   TraceRefData;   // 64h
-    DWORD   TraceCallBack;  // 68h
-    DWORD   TraceEventHandle;   // 6Ch
-    WORD    TraceOutLastCS; // 70h
-    WORD    K16TDB;     // 72h
-    WORD    K16PDB;     // 74h
-    WORD    DosPDBSeg;      // 76h
-    WORD    ExceptionCount; // 78h
+    DWORD   SyncWaitCount;	// 30h
+    DWORD   QueuedSyncFuncs;	// 34h
+    DWORD   UserAPCList;	// 38h
+    DWORD   KernAPCList;	// 3Ch
+    DWORD   pPMPSPSelector;	// 40h
+    DWORD   BlockedOnID;	// 44h
+    DWORD   un2[7];		// 48h
+    DWORD   TraceRefData;	// 64h
+    DWORD   TraceCallBack;	// 68h
+    DWORD   TraceEventHandle;	// 6Ch
+    WORD    TraceOutLastCS;	// 70h
+    WORD    K16TDB;		// 72h
+    WORD    K16PDB;		// 74h
+    WORD    DosPDBSeg;		// 76h
+    WORD    ExceptionCount;	// 78h
 } TDBX, *PTDBX;
 
 
 //Thread Database structure
 
 typedef struct _THREAD_DATABASE {
-DWORD   Type;           // 00h
-DWORD   cReference;     // 04h
+DWORD	Type;		    // 00h
+DWORD	cReference;	    // 04h
 PPROCESS_DATABASE pProcess; // 08h
-DWORD   someEvent;      // 0Ch An event object (What's it used for???)
-DWORD   pvExcept;       // 10h This field through field 3CH is a TIB
-                //      structure (see TIB.H)
-DWORD   TopOfStack;     // 14h
-DWORD   StackLow;       // 18h
-WORD    W16TDB;         // 1Ch
-WORD    StackSelector16;    // 1Eh Used when thunking down to 16 bits
-DWORD   SelmanList;     // 20h
-DWORD   UserPointer;        // 24h
-PTIB    pTIB;           // 28h
-WORD    TIBFlags;       // 2Ch  TIBF_WIN32 = 1, TIBF_TRAP = 2
-WORD    Win16MutexCount;    // 2Eh
-DWORD   DebugContext;       // 30h
-PDWORD  pCurrentPriority;   // 34h
-DWORD   MessageQueue;       // 38h
-DWORD   pTLSArray;      // 3Ch
+DWORD	someEvent;	    // 0Ch An event object (What's it used for???)
+DWORD	pvExcept;	    // 10h This field through field 3CH is a TIB
+                //	    structure (see TIB.H)
+DWORD	TopOfStack;	    // 14h
+DWORD	StackLow;	    // 18h
+WORD	W16TDB; 	    // 1Ch
+WORD	StackSelector16;    // 1Eh Used when thunking down to 16 bits
+DWORD	SelmanList;	    // 20h
+DWORD	UserPointer;	    // 24h
+PTIB	pTIB;		    // 28h
+WORD	TIBFlags;	    // 2Ch  TIBF_WIN32 = 1, TIBF_TRAP = 2
+WORD	Win16MutexCount;    // 2Eh
+DWORD	DebugContext;	    // 30h
+PDWORD	pCurrentPriority;   // 34h
+DWORD	MessageQueue;	    // 38h
+DWORD	pTLSArray;	    // 3Ch
 PPROCESS_DATABASE pProcess2;// 40h Another copy of the thread's process???
-DWORD   Flags;          // 44h
+DWORD	Flags;		    // 44h
                 // 0x00000001 - fCreateThreadEvent
                 // 0x00000002 - fCancelExceptionAbort
                 // 0x00000004 - fOnTempStack
@@ -301,50 +301,50 @@ DWORD   Flags;          // 44h
                 // 0x00000100 - fNestedCleanAPCs
                 // 0x00000200 - fWasOemNowAnsi
                 // 0x00000400 - fOKToSetThreadOem
-DWORD   TerminationStatus;  // 48h Returned by GetExitCodeThread
-WORD    TIBSelector;        // 4Ch
-WORD    EmulatorSelector;   // 4Eh
-DWORD   cHandles;       // 50h
-DWORD   WaitNodeList;       // 54h
-DWORD   un4;            // 58h
-DWORD   Ring0Thread;        // 5Ch
-PTDBX   pTDBX;          // 60
-DWORD   StackBase;      // 64h
-DWORD   TerminationStack;   // 68h
-DWORD   EmulatorData;       // 6Ch
-DWORD   GetLastErrorCode;   // 70h
-DWORD   DebuggerCB;     // 74h
-DWORD   DebuggerThread;     // 78h
+DWORD	TerminationStatus;  // 48h Returned by GetExitCodeThread
+WORD	TIBSelector;	    // 4Ch
+WORD	EmulatorSelector;   // 4Eh
+DWORD	cHandles;	    // 50h
+DWORD	WaitNodeList;	    // 54h
+DWORD	un4;		    // 58h
+DWORD	Ring0Thread;	    // 5Ch
+PTDBX	pTDBX;		    // 60
+DWORD	StackBase;	    // 64h
+DWORD	TerminationStack;   // 68h
+DWORD	EmulatorData;	    // 6Ch
+DWORD	GetLastErrorCode;   // 70h
+DWORD	DebuggerCB;	    // 74h
+DWORD	DebuggerThread;     // 78h
 PCONTEXT    ThreadContext;  // 7Ch  // register context defined in WINNT.H
-DWORD   Except16List;       // 80h
-DWORD   ThunkConnect;       // 84h
-DWORD   NegStackBase;       // 88h
-DWORD   CurrentSS;      // 8Ch
-DWORD   SSTable;        // 90h
-DWORD   ThunkSS16;      // 94h
-DWORD   TLSArray[64];       // 98h
-DWORD   DeltaPriority;      // 198h
+DWORD	Except16List;	    // 80h
+DWORD	ThunkConnect;	    // 84h
+DWORD	NegStackBase;	    // 88h
+DWORD	CurrentSS;	    // 8Ch
+DWORD	SSTable;	    // 90h
+DWORD	ThunkSS16;	    // 94h
+DWORD	TLSArray[64];	    // 98h
+DWORD	DeltaPriority;	    // 198h
 
 // The retail version breaks off somewhere around here.
 // All the remaining fields are most likely only in the debug version
 
-DWORD   un5[7];         // 19Ch
-DWORD   pCreateData16;      // 1B8h
-DWORD   APISuspendCount;    // 1BCh # of times SuspendThread has been called
-DWORD   un6;            // 1C0h
-DWORD   WOWChain;       // 1C4h
-WORD    wSSBig;         // 1C8h
-WORD    un7;            // 1CAh
-DWORD   lp16SwitchRec;      // 1CCh
-DWORD   un8[6];         // 1D0h
-DWORD   pSomeCritSect1;     // 1E8h
-DWORD   pWin16Mutex;        // 1ECh
-DWORD   pWin32Mutex;        // 1F0h
-DWORD   pSomeCritSect2;     // 1F4h
-DWORD   un9;            // 1F8h
-DWORD   ripString;      // 1FCh
-DWORD   LastTlsSetValueEIP[64]; // 200h (parallel to TlsArray, contains EIP
-                //  where TLS value was last set from)
+DWORD	un5[7]; 	    // 19Ch
+DWORD	pCreateData16;	    // 1B8h
+DWORD	APISuspendCount;    // 1BCh # of times SuspendThread has been called
+DWORD	un6;		    // 1C0h
+DWORD	WOWChain;	    // 1C4h
+WORD	wSSBig; 	    // 1C8h
+WORD	un7;		    // 1CAh
+DWORD	lp16SwitchRec;	    // 1CCh
+DWORD	un8[6]; 	    // 1D0h
+DWORD	pSomeCritSect1;     // 1E8h
+DWORD	pWin16Mutex;	    // 1ECh
+DWORD	pWin32Mutex;	    // 1F0h
+DWORD	pSomeCritSect2;     // 1F4h
+DWORD	un9;		    // 1F8h
+DWORD	ripString;	    // 1FCh
+DWORD	LastTlsSetValueEIP[64]; // 200h (parallel to TlsArray, contains EIP
+                //	where TLS value was last set from)
 } THREAD_DATABASE, *PTHREAD_DATABASE;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/test/bootstrap.pl b/sal/test/bootstrap.pl
index 5f697e8b02cf..eae46962fb9d 100755
--- a/sal/test/bootstrap.pl
+++ b/sal/test/bootstrap.pl
@@ -4,7 +4,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -158,8 +158,8 @@ if (!$rc) {
 }
 
 # simple macro expansion
-$rc = system "./testbootstrap",
-    "_first_second_third_",
+$rc = system "./testbootstrap", 
+    "_first_second_third_", 
     "-env:FIRST=first",
     "-env:SECOND=second",
     "-env:THIRD=third",
@@ -170,10 +170,10 @@ if (!$rc) {
 }
 
 # simple quoting
-$rc = system "./testbootstrap",
-    '_${FIRST}_${SECOND}_${THIRD}_',
-    "-env:FIRST=first",
-    "-env:SECOND=second",
+$rc = system "./testbootstrap",  
+    '_${FIRST}_${SECOND}_${THIRD}_',  
+    "-env:FIRST=first",  
+    "-env:SECOND=second",  
     "-env:THIRD=third",
     '-env:MYBOOTSTRAPTESTVALUE=_\$\{FIRST\}_\$\{SECOND\}_\$\{THIRD\}_';
 if (!$rc) {
@@ -182,8 +182,8 @@ if (!$rc) {
 }
 
 # simple ini access
-$rc = system "./testbootstrap",
-    "TheIniKeysValue",
+$rc = system "./testbootstrap", 
+    "TheIniKeysValue", 
     '-env:MYBOOTSTRAPTESTVALUE=${./bootstraptest.ini:TheIniKey}';
 if (!$rc) {
     $comment = $comment . "simple macro ini access test not passed\n";
@@ -191,8 +191,8 @@ if (!$rc) {
 }
 
 # simple profile access
-$rc = system "./testbootstrap",
-    "TheKeysValue",
+$rc = system "./testbootstrap", 
+    "TheKeysValue", 
     '-env:MYBOOTSTRAPTESTVALUE=${./bootstraptest.ini:TheSection:TheKey}';
 if (!$rc) {
     $comment = $comment . "simple macro profile access test not passed\n";
@@ -200,11 +200,11 @@ if (!$rc) {
 }
 
 # profile access with simple macro expansion
-$rc = system "./testbootstrap",
-    "TheKeysValue",
-    "-env:ININAME=./bootstraptest.ini",
-    "-env:SECTIONNAME=TheSection",
-    "-env:KEYNAME=TheKey",
+$rc = system "./testbootstrap", 
+    "TheKeysValue", 
+    "-env:ININAME=./bootstraptest.ini", 
+    "-env:SECTIONNAME=TheSection", 
+    "-env:KEYNAME=TheKey", 
     '-env:MYBOOTSTRAPTESTVALUE=${$ININAME:$SECTIONNAME:$KEYNAME}';
 if (!$rc) {
     $comment = $comment . "profile access with simple macro expansion test not passed\n";
@@ -212,8 +212,8 @@ if (!$rc) {
 }
 
 # profile access with complex macro expansion
-$rc = system "./testbootstrap",
-    "TheKeysValue",
+$rc = system "./testbootstrap", 
+    "TheKeysValue", 
     "-env:ININAME=./bootstraptest.ini",
     '-env:MYBOOTSTRAPTESTVALUE=${$ININAME:${$ININAME:SecondSection:IndirectSection}:${$ININAME:SecondSection:IndirectKey}}';
 if (!$rc) {
@@ -223,13 +223,13 @@ if (!$rc) {
 
 # test no infinit recursion
 if ($ENV{GUI} eq "WNT") {
-    $rc = system "./testbootstrap",
-    '"***RECURSION DETECTED***"',
+    $rc = system "./testbootstrap", 
+    '"***RECURSION DETECTED***"', 
     '-env:MYBOOTSTRAPTESTVALUE=$MYBOOTSTRAPTESTVALUE';
 }
 else {
-    $rc = system "./testbootstrap",
-    '***RECURSION DETECTED***',
+    $rc = system "./testbootstrap", 
+    '***RECURSION DETECTED***', 
     '-env:MYBOOTSTRAPTESTVALUE=$MYBOOTSTRAPTESTVALUE';
 }
 if (!$rc) {
diff --git a/sal/test/test_salmain.cxx b/sal/test/test_salmain.cxx
index 1b409b82a765..6980995dbd68 100644
--- a/sal/test/test_salmain.cxx
+++ b/sal/test/test_salmain.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/test/test_salmainwithargs.cxx b/sal/test/test_salmainwithargs.cxx
index 605945d4e7d1..c1f2a5b6d1b4 100644
--- a/sal/test/test_salmainwithargs.cxx
+++ b/sal/test/test_salmainwithargs.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/test/testbootstrap.cxx b/sal/test/testbootstrap.cxx
index 871f527a17c9..5eac60e58ac6 100644
--- a/sal/test/testbootstrap.cxx
+++ b/sal/test/testbootstrap.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/test/unloading/samplelib1.cxx b/sal/test/unloading/samplelib1.cxx
index 1988b7394174..68c09ca36790 100644
--- a/sal/test/unloading/samplelib1.cxx
+++ b/sal/test/unloading/samplelib1.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -80,12 +80,12 @@ public:
 
 TestService::TestService( OUString implName, OUString serviceName):
             m_implName(implName),m_serviceName(serviceName)
-{   // Library unloading support
+{	// Library unloading support
     globalModuleCount.modCnt.acquire( &globalModuleCount.modCnt);
 }
 
 TestService::~TestService()
-{   // Library unloading support
+{	// Library unloading support
     globalModuleCount.modCnt.release( &globalModuleCount.modCnt);
 }
 
@@ -152,18 +152,18 @@ extern "C" {
 
                 xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1)));
 
-                xNewKey=
+                xNewKey= 
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
                         OUString::createFromAscii( "/" IMPLNAME2 "/UNO/SERVICES" ) );
 
                 xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME2)));
-                xNewKey=
+                xNewKey= 
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
                         OUString::createFromAscii( "/" IMPLNAME3 "/UNO/SERVICES" )   );
 
                 xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME3)));
-
-                xNewKey=
+                
+                xNewKey= 
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
                         OUString::createFromAscii( "/" IMPLNAME4 "/UNO/SERVICES" )   );
 
@@ -178,10 +178,10 @@ extern "C" {
         return sal_False;
     }
 
-    void * SAL_CALL component_getFactory(const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey) throw()
+    void * SAL_CALL component_getFactory(const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey) throw() 
     {
         void * pRet = 0;
-
+    
 
         OUString implname1( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME1) );
         OUString serviceName1( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1) );
@@ -202,7 +202,7 @@ extern "C" {
                 Sequence<OUString>( &serviceName1, 1),
                 &globalModuleCount.modCnt
                 ));
-
+        
             if (xFactory.is())
             {
                 xFactory->acquire();
@@ -219,7 +219,7 @@ extern "C" {
                 Sequence<OUString>( &serviceName2, 1),
                 &globalModuleCount.modCnt
                 ));
-
+        
             if (xFactory.is())
             {
                 xFactory->acquire();
@@ -236,7 +236,7 @@ extern "C" {
                 Sequence<OUString>( &serviceName3, 1),
                 &globalModuleCount.modCnt
                 ));
-
+        
             if (xFactory.is())
             {
                 xFactory->acquire();
@@ -253,7 +253,7 @@ extern "C" {
                 Sequence<OUString>( &serviceName3, 1),
                 &globalModuleCount.modCnt
                 ));
-
+        
             if (xFactory.is())
             {
                 xFactory->acquire();
diff --git a/sal/test/unloading/samplelib1.xml b/sal/test/unloading/samplelib1.xml
index da1d0640a4bb..64ce8a8e6084 100644
--- a/sal/test/unloading/samplelib1.xml
+++ b/sal/test/unloading/samplelib1.xml
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   samplelib1  </module-name>
+    <module-name>	samplelib1	</module-name>
     <component-description>
         <author> Joachim Lingner </author>
-        <name>  com.sun.star.comp.stoc.JavaVirtualMachine   </name>
+        <name>	com.sun.star.comp.stoc.JavaVirtualMachine	</name>
         <description>
         </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.Unloading1 </supported-service>
+        <supported-service>	com.sun.star.Unloading1	</supported-service>
         <service-dependency> ... </service-dependency>
-        <type> com.sun.star.lang.XSingleComponentFactory        </type>
-        <type> com.sun.star.lang.XComponent                     </type>
-        <type>  com.sun.star.container.XNameAccess              </type>
-        <type>  com.sun.star.container.XContentEnumerationAccess    </type>
-        <type>  com.sun.star.container.XEnumeration             </type>
-     <type> com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
-        <type>  com.sun.star.registry.XSimpleRegistry           </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory       </type>
-        <type>  com.sun.star.uno.XComponentContext              </type>
-         <type> com.sun.star.uno.XUnloadingPreference           </type>
-       <type>   com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </type>
-        <type>  com.sun.star.beans.XPropertySet                 </type>
+        <type> com.sun.star.lang.XSingleComponentFactory		</type>
+        <type> com.sun.star.lang.XComponent						</type>
+        <type>	com.sun.star.container.XNameAccess	 			</type>
+        <type>	com.sun.star.container.XContentEnumerationAccess	</type>
+        <type>	com.sun.star.container.XEnumeration	 			</type>
+     <type>	com.sun.star.lang.XTypeProvider					</type>
+        <type>	com.sun.star.lang.XServiceInfo					</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory			</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory			</type>
+        <type>	com.sun.star.registry.XSimpleRegistry			</type>
+        <type>	com.sun.star.lang.XSingleComponentFactory		</type>
+        <type>	com.sun.star.uno.XComponentContext				</type>
+         <type>	com.sun.star.uno.XUnloadingPreference			</type>
+       <type>	com.sun.star.uno.XAggregation					</type>
+        <type>	com.sun.star.uno.XWeak							</type>
+        <type>	com.sun.star.uno.TypeClass						</type>
+        <type>	com.sun.star.beans.XPropertySet					</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  tools       </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper3$(COM)   </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> tl(COM)     </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	tools		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper3$(COM)	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu3		</runtime-module-dependency>
+    <runtime-module-dependency>	tl(COM)		</runtime-module-dependency>
+    <runtime-module-dependency>	sal3		</runtime-module-dependency>
 </module-description>
diff --git a/sal/test/unloading/samplelib2.cxx b/sal/test/unloading/samplelib2.cxx
index 616dc13503c8..257dce2664af 100644
--- a/sal/test/unloading/samplelib2.cxx
+++ b/sal/test/unloading/samplelib2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -77,12 +77,12 @@ public:
 
 TestService::TestService( OUString implName, OUString serviceName):
             m_implName(implName),m_serviceName(serviceName)
-{   // Library unloading support
+{	// Library unloading support
     globalModuleCount.modCnt.acquire( &globalModuleCount.modCnt);
 }
 
 TestService::~TestService()
-{   // Library unloading support
+{	// Library unloading support
     globalModuleCount.modCnt.release( &globalModuleCount.modCnt);
 }
 
@@ -142,17 +142,17 @@ extern "C" {
 
                 xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1)));
 
-                xNewKey=
+                xNewKey= 
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
                         OUString::createFromAscii( "/" IMPLNAME2 "/UNO/SERVICES" ) );
 
                 xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME2)));
-                xNewKey=
+                xNewKey= 
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
                         OUString::createFromAscii( "/" IMPLNAME3 "/UNO/SERVICES" )   );
 
                 xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME3)));
-
+                
                 return sal_True;
             }
             catch (InvalidRegistryException &)
@@ -163,10 +163,10 @@ extern "C" {
         return sal_False;
     }
 
-    void * SAL_CALL component_getFactory(const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey) throw()
+    void * SAL_CALL component_getFactory(const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey) throw() 
     {
         void * pRet = 0;
-
+    
 
         OUString implname1( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME1) );
         OUString serviceName1( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1) );
@@ -185,7 +185,7 @@ extern "C" {
                 Sequence<OUString>( &serviceName1, 1),
                 &globalModuleCount.modCnt
                 ));
-
+        
             if (xFactory.is())
             {
                 xFactory->acquire();
@@ -202,7 +202,7 @@ extern "C" {
                 Sequence<OUString>( &serviceName2, 1),
                 &globalModuleCount.modCnt
                 ));
-
+        
             if (xFactory.is())
             {
                 xFactory->acquire();
@@ -219,14 +219,14 @@ extern "C" {
                 Sequence<OUString>( &serviceName3, 1),
                 &globalModuleCount.modCnt
                 ));
-
+        
             if (xFactory.is())
             {
                 xFactory->acquire();
                 pRet = xFactory.get();
             }
         }
-
+    
         return pRet;
     }
 
diff --git a/sal/test/unloading/unloadTest.cxx b/sal/test/unloading/unloadTest.cxx
index 31c3a6e7e05e..54e077bba450 100644
--- a/sal/test/unloading/unloadTest.cxx
+++ b/sal/test/unloading/unloadTest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -106,52 +106,52 @@ int main(int argc, char* argv[])
 //    if( !serviceManager.is())
 //    {
 //      printf("\n ####################################################\n"
-//         "Error: could not create service manager. \n"
-//         "Is the executable in the office program directory?\n");
+//  	   "Error: could not create service manager. \n"
+//  	   "Is the executable in the office program directory?\n");
 //      return -1;
 //    }
-
-//    Reference<XInterface> xint1=  serviceManager->createInstance( OUString(
-//                  RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1)));
+  
+//    Reference<XInterface> xint1=	serviceManager->createInstance( OUString(
+//  				RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1)));
 
 //    if( !xint1.is())
 //    {
 //        printf("\n ###################################################\n"
-//           "Error: could not create service from samplelib1\n"
-//           "Is samplelib1 in the office program directory and is it "
-//           "registered?\n");
+//  	     "Error: could not create service from samplelib1\n"
+//  	     "Is samplelib1 in the office program directory and is it "
+//  	     "registered?\n");
 //        return -1;
 //    }
-//    Reference<XInterface> xint2=  serviceManager->createInstance( OUString(
-//                  RTL_CONSTASCII_USTRINGPARAM(SERVICENAME21)));
+//    Reference<XInterface> xint2=	serviceManager->createInstance( OUString(
+//  				RTL_CONSTASCII_USTRINGPARAM(SERVICENAME21)));
 //    if( !xint2.is())
 //      {
 //        printf("\n ###################################################"
-//           "Error: could not create service from samplelib2\n"
-//           "Is samplelib2 in the office program directory and is it "
-//           "registered?\n");
+//  	     "Error: could not create service from samplelib2\n"
+//  	     "Is samplelib2 in the office program directory and is it "
+//  	     "registered?\n");
 //        return -1;
 //      }
 //        //destroy servicemanager
 //        Reference<XPropertySet> xSet( serviceManager, UNO_QUERY);
-//        Any any_prop= xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
+//        Any any_prop=	xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
 //        Reference<XComponentContext> xContext;
 //        any_prop >>= xContext;
 //        Reference<XComponent> xComponent( xContext, UNO_QUERY);
 //        xComponent->dispose();
 
-//        //unload samplelib1 and samplelib2. We need the handles, therefore load
-//        // the libs
-//        OUString libname1( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1));
-//        OUString libname2( RTL_CONSTASCII_USTRINGPARAM(LIBRARY2));
-//        oslModule m1= osl_loadModule(libname1.pData, 0);
-//        oslModule m2= osl_loadModule(libname2.pData, 0);
-//        osl_unloadModule( m1);
-//        osl_unloadModule( m1);
-//        osl_unloadModule( m2);
-//        osl_unloadModule( m2);
-
-
+//  	  //unload samplelib1 and samplelib2. We need the handles, therefore load
+//  	  // the libs
+//  	  OUString libname1( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1));
+//    	  OUString libname2( RTL_CONSTASCII_USTRINGPARAM(LIBRARY2));
+//  	  oslModule m1= osl_loadModule(libname1.pData, 0);
+//  	  oslModule m2= osl_loadModule(libname2.pData, 0);
+//  	  osl_unloadModule( m1);
+//  	  osl_unloadModule( m1);
+//  	  osl_unloadModule( m2);
+//  	  osl_unloadModule( m2);
+      
+  
   sal_Bool ret1= test1();
   if( ret1) printf( "\n Test 1 successful \n");
     else printf("\n !!!!!! Test 1 failed\n");
@@ -183,8 +183,8 @@ int main(int argc, char* argv[])
 /* Create an instance of SERVICENAME1, call a function and unload module.
    This tests the loader and basic functionality.
    The library will be loaded once manually and the handle will be stored.
-   Then the library will be unloaded. After rtl_unloadUnusedLibraries we try to
-   get a symbol of the unloaded lib. If this fails then the test is successful.
+   Then the library will be unloaded. After rtl_unloadUnusedLibraries we try to 
+   get a symbol of the unloaded lib. If this fails then the test is successful. 
 */
 sal_Bool test1()
 {
@@ -194,16 +194,16 @@ sal_Bool test1()
     {
     Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
         OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")));
-    Reference<XInterface> xint= serviceManager->createInstance( OUString(
+    Reference<XInterface> xint=	serviceManager->createInstance( OUString(
                 RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1)));
 
-    // get the handle
-    handleMod=  osl_loadModule( lib1Name.pData, 0);
+    // get the handle 
+    handleMod=	osl_loadModule( lib1Name.pData, 0);
     osl_unloadModule( handleMod);
     xint=0;
 
     Reference<XPropertySet> xSet( serviceManager, UNO_QUERY);
-    Any any_prop=   xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
+    Any any_prop=	xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
     Reference<XComponentContext> xContext;
     any_prop >>= xContext;
     Reference<XComponent> xComponent( xContext, UNO_QUERY);
@@ -214,7 +214,7 @@ sal_Bool test1()
     // Try to get a symbol, must fail
     OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
     void* pSymbol= osl_getSymbol(  handleMod, sSymbol.pData);
-
+    
     if( !pSymbol)
         return sal_True;
     return sal_False;
@@ -232,10 +232,10 @@ sal_Bool test2()
     Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
          OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")));
 
-    Reference<XInterface> xint= serviceManager->createInstance( OUString(
+    Reference<XInterface> xint=	serviceManager->createInstance( OUString(
                 RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1)));
 
-    handleMod=  osl_loadModule( lib1Name.pData, 0);
+    handleMod=	osl_loadModule( lib1Name.pData, 0);
     osl_unloadModule( handleMod);
     //-----------------------------------------------------------
     oslModule mod1= osl_loadModule( lib1Name.pData, 0);
@@ -247,7 +247,7 @@ sal_Bool test2()
     rtl_registerModuleForUnloading(mod3);
     // ----------------------------------------------------------
     Reference<XPropertySet> xSet( serviceManager, UNO_QUERY);
-    Any any_prop=   xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
+    Any any_prop=	xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
     Reference<XComponentContext> xContext;
     any_prop >>= xContext;
     Reference<XComponent> xComponent( xContext, UNO_QUERY);
@@ -258,7 +258,7 @@ sal_Bool test2()
     // Try to get a symbol, must fail
     OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
     void* pSymbol= osl_getSymbol(  handleMod, sSymbol.pData);
-
+    
     if( !pSymbol)
         return sal_True;
     return sal_False;
@@ -277,10 +277,10 @@ sal_Bool test3()
     Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
          OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")));
 
-    Reference<XInterface> xint= serviceManager->createInstance( OUString(
+    Reference<XInterface> xint=	serviceManager->createInstance( OUString(
                 RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1)));
 
-    handleMod=  osl_loadModule( lib1Name.pData, 0);
+    handleMod=	osl_loadModule( lib1Name.pData, 0);
     osl_unloadModule( handleMod);
     //-----------------------------------------------------------
     oslModule mod1= osl_loadModule( lib1Name.pData, 0);
@@ -291,7 +291,7 @@ sal_Bool test3()
     rtl_registerModuleForUnloading(mod2);
     // ----------------------------------------------------------
     Reference<XPropertySet> xSet( serviceManager, UNO_QUERY);
-    Any any_prop=   xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
+    Any any_prop=	xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
     Reference<XComponentContext> xContext;
     any_prop >>= xContext;
     Reference<XComponent> xComponent( xContext, UNO_QUERY);
@@ -302,7 +302,7 @@ sal_Bool test3()
     // Try to get a symbol, must succeed
     OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
     void* pSymbol= osl_getSymbol(  handleMod, sSymbol.pData);
-
+    
     if( pSymbol)
     {
         retval= sal_True;
@@ -325,21 +325,21 @@ sal_Bool test4()
     Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
          OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")));
 
-    Reference<XInterface> xint= serviceManager->createInstance( OUString(
+    Reference<XInterface> xint=	serviceManager->createInstance( OUString(
                 RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1)));
 
-    handleMod1= osl_loadModule( lib1Name.pData, 0);
+    handleMod1=	osl_loadModule( lib1Name.pData, 0);
     osl_unloadModule( handleMod1);
-    Reference<XInterface> xint2=    serviceManager->createInstance( OUString(
+    Reference<XInterface> xint2=	serviceManager->createInstance( OUString(
                 RTL_CONSTASCII_USTRINGPARAM(SERVICENAME21)));
 
-    handleMod2= osl_loadModule( lib2Name.pData, 0);
+    handleMod2=	osl_loadModule( lib2Name.pData, 0);
     osl_unloadModule( handleMod2);
 
     //-----------------------------------------------------------
     // ----------------------------------------------------------
     Reference<XPropertySet> xSet( serviceManager, UNO_QUERY);
-    Any any_prop=   xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
+    Any any_prop=	xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
     Reference<XComponentContext> xContext;
     any_prop >>= xContext;
     Reference<XComponent> xComponent( xContext, UNO_QUERY);
@@ -350,7 +350,7 @@ sal_Bool test4()
     // Try to get a symbol, must fail
     OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
     void* pSymbol= osl_getSymbol(  handleMod1, sSymbol.pData);
-
+    
     void* pSymbol2= osl_getSymbol(  handleMod2, sSymbol.pData);
     if( ! pSymbol && !pSymbol2)
         return sal_True;
@@ -368,34 +368,34 @@ sal_Bool test5()
     sal_Bool btest1= sal_False;
     OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1));
     OUString lib2Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY2));
-    OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
+    OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));	
     {
     Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
          OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")));
 
     //-----------------------------------------------------------
-    Reference<XInterface> xint= serviceManager->createInstance( OUString(
+    Reference<XInterface> xint=	serviceManager->createInstance( OUString(
                 RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1)));
-    Reference<XInterface> xint2=    serviceManager->createInstance( OUString(
+    Reference<XInterface> xint2=	serviceManager->createInstance( OUString(
                 RTL_CONSTASCII_USTRINGPARAM(SERVICENAME2)));
-    Reference<XInterface> xint3=    serviceManager->createInstance( OUString(
+    Reference<XInterface> xint3=	serviceManager->createInstance( OUString(
                 RTL_CONSTASCII_USTRINGPARAM(SERVICENAME3)));
-    Reference<XInterface> xint4=    serviceManager->createInstance( OUString(
+    Reference<XInterface> xint4=	serviceManager->createInstance( OUString(
                 RTL_CONSTASCII_USTRINGPARAM(SERVICENAME21)));
-    Reference<XInterface> xint5=    serviceManager->createInstance( OUString(
+    Reference<XInterface> xint5=	serviceManager->createInstance( OUString(
                 RTL_CONSTASCII_USTRINGPARAM(SERVICENAME22)));
-    Reference<XInterface> xint6=    serviceManager->createInstance( OUString(
+    Reference<XInterface> xint6=	serviceManager->createInstance( OUString(
                 RTL_CONSTASCII_USTRINGPARAM(SERVICENAME23)));
 
     // ----------------------------------------------------------
-    handleMod1= osl_loadModule( lib1Name.pData, 0);
+    handleMod1=	osl_loadModule( lib1Name.pData, 0);
     osl_unloadModule( handleMod1);
-    handleMod2= osl_loadModule( lib2Name.pData, 0);
+    handleMod2=	osl_loadModule( lib2Name.pData, 0);
     osl_unloadModule( handleMod2);
 
     // get rid of the service manager
     Reference<XPropertySet> xSet( serviceManager, UNO_QUERY);
-    Any any_prop=   xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
+    Any any_prop=	xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
     Reference<XComponentContext> xContext;
     any_prop >>= xContext;
     Reference<XComponent> xComponent( xContext, UNO_QUERY);
@@ -404,7 +404,7 @@ sal_Bool test5()
     // try unloading, must fail
     rtl_unloadUnusedModules( NULL);
     void* pSymbol= osl_getSymbol(  handleMod1, sSymbol.pData);
-
+    
     void* pSymbol2= osl_getSymbol(  handleMod2, sSymbol.pData);
     if(  pSymbol && pSymbol2)
         btest1= sal_True;
@@ -421,7 +421,7 @@ sal_Bool test5()
     return sal_False;
 }
 
-/*
+/* 
 TimeValue Test
 rtl_unloadUnusedModules takes a TimeValue which determines a timespan
 a module must have been constantly unused in order to be unloaded.
@@ -437,20 +437,20 @@ sal_Bool test6()
     oslModule handleMod2=0;
     OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1));
     OUString lib2Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY2));
-    OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
+    OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));	
     {
     Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
          OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")));
-    Reference<XInterface> xint= serviceManager->createInstance( OUString(
+    Reference<XInterface> xint=	serviceManager->createInstance( OUString(
                 RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1)));
 
     // ----------------------------------------------------------
-    handleMod1= osl_loadModule( lib1Name.pData, 0);
+    handleMod1=	osl_loadModule( lib1Name.pData, 0);
     osl_unloadModule( handleMod1);
 
     // get rid of the service manager
     Reference<XPropertySet> xSet( serviceManager, UNO_QUERY);
-    Any any_prop=   xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
+    Any any_prop=	xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
     Reference<XComponentContext> xContext;
     any_prop >>= xContext;
     Reference<XComponent> xComponent( xContext, UNO_QUERY);
@@ -466,7 +466,7 @@ sal_Bool test6()
     osl_getSystemTime( &beforeTime);
     for(;;)
     {
-
+        
         rtl_unloadUnusedModules( &time);
         void* pSymbol= osl_getSymbol(  handleMod1, sSymbol.pData);
         if( ! pSymbol)
@@ -482,7 +482,7 @@ sal_Bool test6()
     return sal_True;
 }
 
-/*
+/* 
 */
 sal_Bool test7()
 {
@@ -494,7 +494,7 @@ sal_Bool test7()
     sal_Int32 cookie1= rtl_addUnloadingListener( listenerCallback, &id1);
     sal_Int32 cookie2= rtl_addUnloadingListener( listenerCallback, &id2);
     sal_Int32 cookie3= rtl_addUnloadingListener( listenerCallback, &id3);
-
+    
     printf("\nTest 7 \nThe listener should be called 3 times\n");
     rtl_unloadUnusedModules( NULL);
 
@@ -505,7 +505,7 @@ sal_Bool test7()
     sal_Int32 cookie4= rtl_addUnloadingListener( listenerCallback, &id1);
     sal_Int32 cookie5= rtl_addUnloadingListener( listenerCallback, &id2);
     sal_Int32 cookie6= rtl_addUnloadingListener( listenerCallback, &id3);
-
+    
     if( cookie1 == cookie4 &&
         cookie2 == cookie5 )
     {
@@ -534,7 +534,7 @@ sal_Bool test8()
     printf("Test 8 ####################################################\n");
     oslModule handleMod1=0;
     OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1));
-    OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
+    OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));	
 
     sal_Bool b_ifaceSupported=sal_False;
     sal_Bool b_instances_identical= sal_False;
@@ -546,9 +546,9 @@ sal_Bool test8()
     Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
          OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")));
     Reference<XContentEnumerationAccess> xContent( serviceManager, UNO_QUERY);
-    Reference<XEnumeration> xenum=  xContent->createContentEnumeration(
+    Reference<XEnumeration> xenum=	xContent->createContentEnumeration(
         OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME4)));
-
+    
     Any any_elem;
     if( xenum->hasMoreElements())
         any_elem= xenum->nextElement();
@@ -566,19 +566,19 @@ sal_Bool test8()
             b_ifaceSupported= sal_True;
     }
 
-    // XUnloadingPreference::releaseOnNotification should return true now because we haven't
+    // XUnloadingPreference::releaseOnNotification should return true now because we haven't 
     // created an instance yet
     Reference<XUnloadingPreference> xreject( xinterfaceFact, UNO_QUERY);
     b_releaseBeforeLoading= xreject->releaseOnNotification();
 
     // Create instance. Afterwards releaseOnNotification should return false.
-    Reference<XInterface> xint= serviceManager->createInstance( OUString(
+    Reference<XInterface> xint=	serviceManager->createInstance( OUString(
                 RTL_CONSTASCII_USTRINGPARAM(SERVICENAME4)));
     b_releaseAfterLoading= xreject->releaseOnNotification();
     b_releaseAfterLoading= b_releaseAfterLoading? sal_False : sal_True;
-
+    
     // safe the handle of the module
-    handleMod1= osl_loadModule( lib1Name.pData, 0);
+    handleMod1=	osl_loadModule( lib1Name.pData, 0);
     osl_unloadModule( handleMod1);
 
     // ----------------------------------------------------------
@@ -587,14 +587,14 @@ sal_Bool test8()
     OUString s= info->getImplementationName();
 
     // get another instance which must be the same
-    Reference<XInterface> xint2=    serviceManager->createInstance( OUString(
+    Reference<XInterface> xint2=	serviceManager->createInstance( OUString(
                 RTL_CONSTASCII_USTRINGPARAM(SERVICENAME4)));
 
     b_instances_identical= xint == xint2;
 
     // get rid of the service manager
     Reference<XPropertySet> xSet( serviceManager, UNO_QUERY);
-    Any any_prop=   xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
+    Any any_prop=	xSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
     Reference<XComponentContext> xContext;
     any_prop >>= xContext;
     Reference<XComponent> xComponent( xContext, UNO_QUERY);
@@ -608,7 +608,7 @@ sal_Bool test8()
     if( ! pSymbol )
         b_unloaded= sal_True;
 
-    if( b_ifaceSupported && b_instances_identical && b_releaseBeforeLoading &&
+    if( b_ifaceSupported && b_instances_identical && b_releaseBeforeLoading && 
         b_releaseAfterLoading && b_unloaded)
         return sal_True;
     return sal_False;
@@ -628,16 +628,16 @@ sal_Bool test9()
     oslModule handleMod=0;
     sal_Bool retval=sal_False;
     OUString lib1Name( RTL_CONSTASCII_USTRINGPARAM(LIBRARY1));
-
+    
     Reference<XMultiServiceFactory> serviceManager= createRegistryServiceFactory(
          OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")));
 
-    Reference<XInterface> xint= serviceManager->createInstance( OUString(
+    Reference<XInterface> xint=	serviceManager->createInstance( OUString(
                 RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1)));
     // Release the service. The library refcount should be 1
     xint=0;
 
-    handleMod=  osl_loadModule( lib1Name.pData, 0);
+    handleMod=	osl_loadModule( lib1Name.pData, 0);
     osl_unloadModule( handleMod);
     //-----------------------------------------------------------
 
@@ -646,7 +646,7 @@ sal_Bool test9()
     // Try to get a symbol, must fail
     OUString sSymbol( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
     void* pSymbol= osl_getSymbol(  handleMod, sSymbol.pData);
-
+    
     if( pSymbol)
     {
         retval= sal_False;
diff --git a/sal/textenc/context.c b/sal/textenc/context.c
index 26232cbd89c8..848dd954fd4f 100644
--- a/sal/textenc/context.c
+++ b/sal/textenc/context.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/context.h b/sal/textenc/context.h
index 6b7740ebadbb..0e4397d02819 100644
--- a/sal/textenc/context.h
+++ b/sal/textenc/context.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/convertadobe.tab b/sal/textenc/convertadobe.tab
index 4267aa100811..e63f33c4d114 100644
--- a/sal/textenc/convertadobe.tab
+++ b/sal/textenc/convertadobe.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -208,7 +208,7 @@ adobeSymbolEncodingConverterData = {
       0xF8E5, 0x03B1, 0x03B2, 0x03C7, 0x03B4, 0x03B5, 0x03C6, 0x03B3, // 0x60
       0x03B7, 0x03B9, 0x03D5, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BF,
       0x03C0, 0x03B8, 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03D6, 0x03C9, // 0x70
-      0x03BE, 0x03C8, 0x03B6, 0x007B, 0x007C, 0x007D, 0x223C, 0xffff,
+      0x03BE, 0x03C8, 0x03B6, 0x007B, 0x007C, 0x007D, 0x223C, 0xffff, 
       0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, // 0x80
       0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
       0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, // 0x90
@@ -236,7 +236,7 @@ adobeSymbolEncodingConverterData = {
 rtl::textenc::BmpUnicodeToSingleByteRange const unicodeToAdobeDingbatsEncoding[]
 = { { 0x0020, 0x0020 - 0x0020, 0x20 }, { 0x00A0, 0x00A0 - 0x00A0, 0x20 },
     { 0x2192, 0x2192 - 0x2192, 0xD5 }, { 0x2194, 0x2195 - 0x2194, 0xD6 },
-    { 0x2460, 0x2469 - 0x2460, 0xAB },
+    { 0x2460, 0x2469 - 0x2460, 0xAB }, 
     { 0x25A0, 0x25A0 - 0x25A0, 0x6E },
     { 0x25B2, 0x25B2 - 0x25B2, 0x73 }, { 0x25BC, 0x25BC - 0x25BC, 0x74 },
     { 0x25C6, 0x25C6 - 0x25C6, 0x75 }, { 0x25CF, 0x25CF - 0x25CF, 0x6C },
diff --git a/sal/textenc/convertbig5hkscs.c b/sal/textenc/convertbig5hkscs.c
index 2237a96475d9..71ef6488056c 100644
--- a/sal/textenc/convertbig5hkscs.c
+++ b/sal/textenc/convertbig5hkscs.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/convertbig5hkscs.h b/sal/textenc/convertbig5hkscs.h
index e7e66434b9c9..77e5638e332e 100644
--- a/sal/textenc/convertbig5hkscs.h
+++ b/sal/textenc/convertbig5hkscs.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/convertbig5hkscs.tab b/sal/textenc/convertbig5hkscs.tab
index 9fe2a47b5156..314ccc84e14f 100644
--- a/sal/textenc/convertbig5hkscs.tab
+++ b/sal/textenc/convertbig5hkscs.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/converter.c b/sal/textenc/converter.c
index 07c1e04c9ba3..c488c61fad91 100644
--- a/sal/textenc/converter.c
+++ b/sal/textenc/converter.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/converter.h b/sal/textenc/converter.h
index c74652704781..8284bde40795 100644
--- a/sal/textenc/converter.h
+++ b/sal/textenc/converter.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/converteuctw.c b/sal/textenc/converteuctw.c
index 062862abf76a..3425750124db 100644
--- a/sal/textenc/converteuctw.c
+++ b/sal/textenc/converteuctw.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/converteuctw.h b/sal/textenc/converteuctw.h
index 6d30fced354a..0edbe5735524 100644
--- a/sal/textenc/converteuctw.h
+++ b/sal/textenc/converteuctw.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/converteuctw.tab b/sal/textenc/converteuctw.tab
index c9bfeea697a9..dda030915dc1 100644
--- a/sal/textenc/converteuctw.tab
+++ b/sal/textenc/converteuctw.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/convertgb18030.c b/sal/textenc/convertgb18030.c
index c9cac4bf7693..356eb8c7d28f 100644
--- a/sal/textenc/convertgb18030.c
+++ b/sal/textenc/convertgb18030.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/convertgb18030.h b/sal/textenc/convertgb18030.h
index b80224d62d35..7279c80ac67f 100644
--- a/sal/textenc/convertgb18030.h
+++ b/sal/textenc/convertgb18030.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/convertgb18030.tab b/sal/textenc/convertgb18030.tab
index d904d4298389..fd860b231c75 100644
--- a/sal/textenc/convertgb18030.tab
+++ b/sal/textenc/convertgb18030.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/convertiscii.tab b/sal/textenc/convertiscii.tab
index 96f5dc8582c5..891ee8369426 100644
--- a/sal/textenc/convertiscii.tab
+++ b/sal/textenc/convertiscii.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/convertiso2022cn.c b/sal/textenc/convertiso2022cn.c
index 40a0039aa3f0..f18acbcd121d 100644
--- a/sal/textenc/convertiso2022cn.c
+++ b/sal/textenc/convertiso2022cn.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/convertiso2022cn.h b/sal/textenc/convertiso2022cn.h
index bf5186d66e1f..b46cf60c4056 100644
--- a/sal/textenc/convertiso2022cn.h
+++ b/sal/textenc/convertiso2022cn.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/convertiso2022cn.tab b/sal/textenc/convertiso2022cn.tab
index 937437693209..045af04a3835 100644
--- a/sal/textenc/convertiso2022cn.tab
+++ b/sal/textenc/convertiso2022cn.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/convertiso2022jp.c b/sal/textenc/convertiso2022jp.c
index e4792b573373..9955e418c602 100644
--- a/sal/textenc/convertiso2022jp.c
+++ b/sal/textenc/convertiso2022jp.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/convertiso2022jp.h b/sal/textenc/convertiso2022jp.h
index 257558387456..1bbc7d3c0419 100644
--- a/sal/textenc/convertiso2022jp.h
+++ b/sal/textenc/convertiso2022jp.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/convertiso2022jp.tab b/sal/textenc/convertiso2022jp.tab
index 5775491c87f5..02fa659595aa 100644
--- a/sal/textenc/convertiso2022jp.tab
+++ b/sal/textenc/convertiso2022jp.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/convertiso2022kr.c b/sal/textenc/convertiso2022kr.c
index 8354b312ab87..78b073d7f7d5 100644
--- a/sal/textenc/convertiso2022kr.c
+++ b/sal/textenc/convertiso2022kr.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/convertiso2022kr.h b/sal/textenc/convertiso2022kr.h
index 7208bcf63bb0..7b76fe561d5a 100644
--- a/sal/textenc/convertiso2022kr.h
+++ b/sal/textenc/convertiso2022kr.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/convertiso2022kr.tab b/sal/textenc/convertiso2022kr.tab
index 87010f55590f..72eda4e268e9 100644
--- a/sal/textenc/convertiso2022kr.tab
+++ b/sal/textenc/convertiso2022kr.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/convertsinglebytetobmpunicode.cxx b/sal/textenc/convertsinglebytetobmpunicode.cxx
index 75f94d3cc60a..3fef475b9225 100644
--- a/sal/textenc/convertsinglebytetobmpunicode.cxx
+++ b/sal/textenc/convertsinglebytetobmpunicode.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/convertsinglebytetobmpunicode.hxx b/sal/textenc/convertsinglebytetobmpunicode.hxx
index 39ebed9eabca..c690cfa0a6d3 100644
--- a/sal/textenc/convertsinglebytetobmpunicode.hxx
+++ b/sal/textenc/convertsinglebytetobmpunicode.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/generate/big5hkscs2001.pl b/sal/textenc/generate/big5hkscs2001.pl
index a363e99f7e87..26755653a5c9 100644
--- a/sal/textenc/generate/big5hkscs2001.pl
+++ b/sal/textenc/generate/big5hkscs2001.pl
@@ -2,7 +2,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/generate/big5hkscs2001.tab b/sal/textenc/generate/big5hkscs2001.tab
index 5a3fb18f8471..6a2fbcdc272f 100644
--- a/sal/textenc/generate/big5hkscs2001.tab
+++ b/sal/textenc/generate/big5hkscs2001.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/generate/cns116431992.pl b/sal/textenc/generate/cns116431992.pl
index 0cfd2f03a209..dd244985600d 100644
--- a/sal/textenc/generate/cns116431992.pl
+++ b/sal/textenc/generate/cns116431992.pl
@@ -2,7 +2,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/generate/cns116431992.tab b/sal/textenc/generate/cns116431992.tab
index 47c1c71a477f..2b00b039654f 100644
--- a/sal/textenc/generate/cns116431992.tab
+++ b/sal/textenc/generate/cns116431992.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/generate/gb180302000.pl b/sal/textenc/generate/gb180302000.pl
index 8ae2b6024592..5d9f6c659661 100644
--- a/sal/textenc/generate/gb180302000.pl
+++ b/sal/textenc/generate/gb180302000.pl
@@ -2,7 +2,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/generate/gb180302000.tab b/sal/textenc/generate/gb180302000.tab
index 00b58b3cff88..364f7c4b9630 100644
--- a/sal/textenc/generate/gb180302000.tab
+++ b/sal/textenc/generate/gb180302000.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/gettextencodingdata.h b/sal/textenc/gettextencodingdata.h
index f2d31be82902..3bd006b65844 100644
--- a/sal/textenc/gettextencodingdata.h
+++ b/sal/textenc/gettextencodingdata.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/tcvtarb1.tab b/sal/textenc/tcvtarb1.tab
index 9d748371a108..6932ba565274 100644
--- a/sal/textenc/tcvtarb1.tab
+++ b/sal/textenc/tcvtarb1.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/tcvtbyte.c b/sal/textenc/tcvtbyte.c
index b8e3ed222f7c..b02e0d1f4d75 100644
--- a/sal/textenc/tcvtbyte.c
+++ b/sal/textenc/tcvtbyte.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/tcvteas1.tab b/sal/textenc/tcvteas1.tab
index 252411b74c08..033e43c14f6b 100644
--- a/sal/textenc/tcvteas1.tab
+++ b/sal/textenc/tcvteas1.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/tcvtest1.tab b/sal/textenc/tcvtest1.tab
index b8424da74c44..d4ffece873b4 100644
--- a/sal/textenc/tcvtest1.tab
+++ b/sal/textenc/tcvtest1.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/tcvtjp1.tab b/sal/textenc/tcvtjp1.tab
index 592b070b79db..4c76deb1fd4c 100644
--- a/sal/textenc/tcvtjp1.tab
+++ b/sal/textenc/tcvtjp1.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,8 +46,8 @@
 
 static sal_uInt16 const aImplDBCSToUniTab_MS932_81[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x3000, 0x3001, 0x3002, 0xFF0C, 0xFF0E, 0x30FB, 0xFF1A, 0xFF1B, /* 0x40 */
     0xFF1F, 0xFF01, 0x309B, 0x309C, 0x00B4, 0xFF40, 0x00A8, 0xFF3E, /* 0x40 */
     0xFFE3, 0xFF3F, 0x30FD, 0x30FE, 0x309D, 0x309E, 0x3003, 0x4EDD, /* 0x50 */
@@ -55,43 +55,43 @@ static sal_uInt16 const aImplDBCSToUniTab_MS932_81[] =
     0xFF5E, 0x2225, 0xFF5C, 0x2026, 0x2025, 0x2018, 0x2019, 0x201C, /* 0x60 */
     0x201D, 0xFF08, 0xFF09, 0x3014, 0x3015, 0xFF3B, 0xFF3D, 0xFF5B, /* 0x60 */
     0xFF5D, 0x3008, 0x3009, 0x300A, 0x300B, 0x300C, 0x300D, 0x300E, /* 0x70 */
-    0x300F, 0x3010, 0x3011, 0xFF0B, 0xFF0D, 0x00B1, 0x00D7,      0, /* 0x70 */
+    0x300F, 0x3010, 0x3011, 0xFF0B, 0xFF0D, 0x00B1, 0x00D7, 	 0, /* 0x70 */
     0x00F7, 0xFF1D, 0x2260, 0xFF1C, 0xFF1E, 0x2266, 0x2267, 0x221E, /* 0x80 */
     0x2234, 0x2642, 0x2640, 0x00B0, 0x2032, 0x2033, 0x2103, 0xFFE5, /* 0x80 */
     0xFF04, 0xFFE0, 0xFFE1, 0xFF05, 0xFF03, 0xFF06, 0xFF0A, 0xFF20, /* 0x90 */
     0x00A7, 0x2606, 0x2605, 0x25CB, 0x25CF, 0x25CE, 0x25C7, 0x25C6, /* 0x90 */
     0x25A1, 0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC, 0x203B, 0x3012, /* 0xA0 */
-    0x2192, 0x2190, 0x2191, 0x2193, 0x3013,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
+    0x2192, 0x2190, 0x2191, 0x2193, 0x3013, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
     0x2208, 0x220B, 0x2286, 0x2287, 0x2282, 0x2283, 0x222A, 0x2229, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0x2227, 0x2228, 0xFFE2, 0x21D2, 0x21D4, 0x2200, 0x2203,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x2220, 0x22A5, 0x2312, 0x2202, 0x2207, 0x2261, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x2227, 0x2228, 0xFFE2, 0x21D2, 0x21D4, 0x2200, 0x2203, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x2220, 0x22A5, 0x2312, 0x2202, 0x2207, 0x2261, /* 0xD0 */
     0x2252, 0x226A, 0x226B, 0x221A, 0x223D, 0x221D, 0x2235, 0x222B, /* 0xE0 */
-    0x222C,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
+    0x222C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
     0x212B, 0x2030, 0x266F, 0x266D, 0x266A, 0x2020, 0x2021, 0x00B6, /* 0xF0 */
-         0,      0,      0,      0, 0x25EF                          /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0x25EF							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_82[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x40 */
                                                             0xFF10, /* 0x40 */
     0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17, 0xFF18, /* 0x50 */
-    0xFF19,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+    0xFF19, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
     0xFF21, 0xFF22, 0xFF23, 0xFF24, 0xFF25, 0xFF26, 0xFF27, 0xFF28, /* 0x60 */
     0xFF29, 0xFF2A, 0xFF2B, 0xFF2C, 0xFF2D, 0xFF2E, 0xFF2F, 0xFF30, /* 0x60 */
     0xFF31, 0xFF32, 0xFF33, 0xFF34, 0xFF35, 0xFF36, 0xFF37, 0xFF38, /* 0x70 */
-    0xFF39, 0xFF3A,      0,      0,      0,      0,      0,      0, /* 0x70 */
+    0xFF39, 0xFF3A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47, /* 0x80 */
     0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F, /* 0x80 */
     0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57, /* 0x90 */
-    0xFF58, 0xFF59, 0xFF5A,      0,      0,      0,      0, 0x3041, /* 0x90 */
+    0xFF58, 0xFF59, 0xFF5A, 	 0, 	 0, 	 0, 	 0, 0x3041, /* 0x90 */
     0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047, 0x3048, 0x3049, /* 0xA0 */
     0x304A, 0x304B, 0x304C, 0x304D, 0x304E, 0x304F, 0x3050, 0x3051, /* 0xA0 */
     0x3052, 0x3053, 0x3054, 0x3055, 0x3056, 0x3057, 0x3058, 0x3059, /* 0xB0 */
@@ -102,7 +102,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_82[] =
     0x307A, 0x307B, 0x307C, 0x307D, 0x307E, 0x307F, 0x3080, 0x3081, /* 0xD0 */
     0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087, 0x3088, 0x3089, /* 0xE0 */
     0x308A, 0x308B, 0x308C, 0x308D, 0x308E, 0x308F, 0x3090, 0x3091, /* 0xE0 */
-    0x3092, 0x3093                                                  /* 0xF0 */
+    0x3092, 0x3093													/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -110,8 +110,8 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_82[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_83[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7, 0x30A8, /* 0x40 */
     0x30A9, 0x30AA, 0x30AB, 0x30AC, 0x30AD, 0x30AE, 0x30AF, 0x30B0, /* 0x40 */
     0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, 0x30B7, 0x30B8, /* 0x50 */
@@ -119,18 +119,18 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_83[] =
     0x30C1, 0x30C2, 0x30C3, 0x30C4, 0x30C5, 0x30C6, 0x30C7, 0x30C8, /* 0x60 */
     0x30C9, 0x30CA, 0x30CB, 0x30CC, 0x30CD, 0x30CE, 0x30CF, 0x30D0, /* 0x60 */
     0x30D1, 0x30D2, 0x30D3, 0x30D4, 0x30D5, 0x30D6, 0x30D7, 0x30D8, /* 0x70 */
-    0x30D9, 0x30DA, 0x30DB, 0x30DC, 0x30DD, 0x30DE, 0x30DF,      0, /* 0x70 */
+    0x30D9, 0x30DA, 0x30DB, 0x30DC, 0x30DD, 0x30DE, 0x30DF, 	 0, /* 0x70 */
     0x30E0, 0x30E1, 0x30E2, 0x30E3, 0x30E4, 0x30E5, 0x30E6, 0x30E7, /* 0x80 */
     0x30E8, 0x30E9, 0x30EA, 0x30EB, 0x30EC, 0x30ED, 0x30EE, 0x30EF, /* 0x80 */
-    0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0x0391, /* 0x90 */
+    0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x0391, /* 0x90 */
     0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398, 0x0399, /* 0xA0 */
     0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 0x03A0, 0x03A1, /* 0xA0 */
-    0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0x03B1, /* 0xB0 */
+    0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x03B1, /* 0xB0 */
     0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8, 0x03B9, /* 0xC0 */
     0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, 0x03C0, 0x03C1, /* 0xC0 */
-    0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, 0x03C9          /* 0xD0 */
+    0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, 0x03C9			/* 0xD0 */
                                                                     /* 0xD0 */
 };
 
@@ -138,55 +138,55 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_83[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_84[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401, 0x0416, /* 0x40 */
     0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, /* 0x40 */
     0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, /* 0x50 */
     0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, /* 0x50 */
-    0x042F,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
+    0x042F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
     0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451, 0x0436, /* 0x70 */
-    0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D,      0, /* 0x70 */
+    0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 	 0, /* 0x70 */
     0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, /* 0x80 */
     0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, /* 0x80 */
-    0x044E, 0x044F,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0x2500, /* 0x90 */
+    0x044E, 0x044F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x2500, /* 0x90 */
     0x2502, 0x250C, 0x2510, 0x2518, 0x2514, 0x251C, 0x252C, 0x2524, /* 0xA0 */
     0x2534, 0x253C, 0x2501, 0x2503, 0x250F, 0x2513, 0x251B, 0x2517, /* 0xA0 */
     0x2523, 0x2533, 0x252B, 0x253B, 0x254B, 0x2520, 0x252F, 0x2528, /* 0xB0 */
-    0x2537, 0x253F, 0x251D, 0x2530, 0x2525, 0x2538, 0x2542          /* 0xB0 */
+    0x2537, 0x253F, 0x251D, 0x2530, 0x2525, 0x2538, 0x2542			/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_APPLEJAPANESE_85[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467, /* 0x40 */
     0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x246F, /* 0x40 */
-    0x2470, 0x2471, 0x2472, 0x2473,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0x2474, 0x2475, /* 0x50 */
+    0x2470, 0x2471, 0x2472, 0x2473, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x2474, 0x2475, /* 0x50 */
     0x2476, 0x2477, 0x2478, 0x2479, 0x247A, 0x247B, 0x247C, 0x247D, /* 0x60 */
     0x247E, 0x247F, 0x2480, 0x2481, 0x2482, 0x2483, 0x2484, 0x2485, /* 0x60 */
-    0x2486, 0x2487,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0x2776, 0x2777, 0x2778,      0, /* 0x70 */
-    0x2779, 0x277A, 0x277B, 0x277C, 0x277D, 0x277E,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0x2488, 0x2489, 0x248A, 0x248B, 0x248C, 0x248D, /* 0x90 */
-    0x248E, 0x248F, 0x2490,      0,      0,      0,      0, 0x2160, /* 0x90 */
+    0x2486, 0x2487, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0x2776, 0x2777, 0x2778, 	 0, /* 0x70 */
+    0x2779, 0x277A, 0x277B, 0x277C, 0x277D, 0x277E, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x2488, 0x2489, 0x248A, 0x248B, 0x248C, 0x248D, /* 0x90 */
+    0x248E, 0x248F, 0x2490, 	 0, 	 0, 	 0, 	 0, 0x2160, /* 0x90 */
     0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168, /* 0xA0 */
-    0x2169, 0x216A, 0x216B,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, /* 0xB0 */
-    0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x217A, 0x217B,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0x249C, 0x249D, 0x249E, 0x249F, 0x24A0, /* 0xD0 */
+    0x2169, 0x216A, 0x216B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, /* 0xB0 */
+    0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x217A, 0x217B, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x249C, 0x249D, 0x249E, 0x249F, 0x24A0, /* 0xD0 */
     0x24A1, 0x24A2, 0x24A3, 0x24A4, 0x24A5, 0x24A6, 0x24A7, 0x24A8, /* 0xE0 */
     0x24A9, 0x24AA, 0x24AB, 0x24AC, 0x24AD, 0x24AE, 0x24AF, 0x24B0, /* 0xE0 */
-    0x24B1, 0x24B2, 0x24B3, 0x24B4, 0x24B5                          /* 0xF0 */
+    0x24B1, 0x24B2, 0x24B3, 0x24B4, 0x24B5							/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -194,27 +194,27 @@ static sal_uInt16 const aImplDBCSToUniTab_APPLEJAPANESE_85[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_APPLEJAPANESE_86[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x339C, 0x339F, 0x339D, 0x33A0, 0x33A4,      0, 0x33A1, 0x33A5, /* 0x40 */
-    0x339E, 0x33A2, 0x338E,      0, 0x338F, 0x33C4, 0x3396, 0x3397, /* 0x40 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x339C, 0x339F, 0x339D, 0x33A0, 0x33A4, 	 0, 0x33A1, 0x33A5, /* 0x40 */
+    0x339E, 0x33A2, 0x338E, 	 0, 0x338F, 0x33C4, 0x3396, 0x3397, /* 0x40 */
     0x2113, 0x3398, 0x33B3, 0x33B2, 0x33B1, 0x33B0, 0x2109, 0x33D4, /* 0x50 */
-    0x33CB, 0x3390, 0x3385, 0x3386, 0x3387,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0x2116, 0x33CD, 0x2121,      0, 0x2664, /* 0x90 */
-    0x2667, 0x2661, 0x2662, 0x2660, 0x2663, 0x2665, 0x2666,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x3020, 0x260E, 0x3004,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0x261E, /* 0xC0 */
-    0x261C, 0x261D, 0x261F, 0x21C6, 0x21C4, 0x21C5,      0, 0x21E8, /* 0xC0 */
-    0x21E6, 0x21E7, 0x21E9                                          /* 0xD0 */
+    0x33CB, 0x3390, 0x3385, 0x3386, 0x3387, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x2116, 0x33CD, 0x2121, 	 0, 0x2664, /* 0x90 */
+    0x2667, 0x2661, 0x2662, 0x2660, 0x2663, 0x2665, 0x2666, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x3020, 0x260E, 0x3004, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x261E, /* 0xC0 */
+    0x261C, 0x261D, 0x261F, 0x21C6, 0x21C4, 0x21C5, 	 0, 0x21E8, /* 0xC0 */
+    0x21E6, 0x21E7, 0x21E9											/* 0xD0 */
                                                                     /* 0xD0 */
 };
 
@@ -222,60 +222,60 @@ static sal_uInt16 const aImplDBCSToUniTab_APPLEJAPANESE_86[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_MS932_87[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467, /* 0x40 */
     0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x246F, /* 0x40 */
     0x2470, 0x2471, 0x2472, 0x2473, 0x2160, 0x2161, 0x2162, 0x2163, /* 0x50 */
-    0x2164, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169,      0, 0x3349, /* 0x50 */
+    0x2164, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169, 	 0, 0x3349, /* 0x50 */
     0x3314, 0x3322, 0x334D, 0x3318, 0x3327, 0x3303, 0x3336, 0x3351, /* 0x60 */
     0x3357, 0x330D, 0x3326, 0x3323, 0x332B, 0x334A, 0x333B, 0x339C, /* 0x60 */
-    0x339D, 0x339E, 0x338E, 0x338F, 0x33C4, 0x33A1,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x337B,      0, /* 0x70 */
+    0x339D, 0x339E, 0x338E, 0x338F, 0x33C4, 0x33A1, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x337B, 	 0, /* 0x70 */
     0x301D, 0x301F, 0x2116, 0x33CD, 0x2121, 0x32A4, 0x32A5, 0x32A6, /* 0x80 */
     0x32A7, 0x32A8, 0x3231, 0x3232, 0x3239, 0x337E, 0x337D, 0x337C, /* 0x80 */
     0x2252, 0x2261, 0x222B, 0x222E, 0x2211, 0x221A, 0x22A5, 0x2220, /* 0x90 */
-    0x221F, 0x22BF, 0x2235, 0x2229, 0x222A                          /* 0x90 */
+    0x221F, 0x22BF, 0x2235, 0x2229, 0x222A							/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_APPLEJAPANESE_87[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x3230, 0x322A, 0x322B, 0x322C, 0x322D, 0x322E, 0x322F, 0x3240, /* 0x40 */
     0x3237, 0x3242, 0x3243, 0x3239, 0x323A, 0x3231, 0x323E, 0x3234, /* 0x40 */
     0x3232, 0x323B, 0x3236, 0x3233, 0x3235, 0x323C, 0x323D, 0x323F, /* 0x50 */
-    0x3238,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x32A4, 0x32A5, 0x32A6, 0x32A7, 0x32A8, /* 0x90 */
-    0x32A9, 0x3296, 0x329D, 0x3298, 0x329E,      0, 0x3299, 0x3349, /* 0x90 */
+    0x3238, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x32A4, 0x32A5, 0x32A6, 0x32A7, 0x32A8, /* 0x90 */
+    0x32A9, 0x3296, 0x329D, 0x3298, 0x329E, 	 0, 0x3299, 0x3349, /* 0x90 */
     0x3322, 0x334D, 0x3314, 0x3316, 0x3305, 0x3333, 0x334E, 0x3303, /* 0xA0 */
     0x3336, 0x3318, 0x3315, 0x3327, 0x3351, 0x334A, 0x3339, 0x3357, /* 0xA0 */
-    0x330D, 0x3342, 0x3323, 0x3326, 0x333B, 0x332B,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x3300, 0x331E, 0x332A, /* 0xB0 */
-    0x3331, 0x3347,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x337E, 0x337D, 0x337C, /* 0xE0 */
-    0x337B,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x337F                                          /* 0xF0 */
+    0x330D, 0x3342, 0x3323, 0x3326, 0x333B, 0x332B, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3300, 0x331E, 0x332A, /* 0xB0 */
+    0x3331, 0x3347, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x337E, 0x337D, 0x337C, /* 0xE0 */
+    0x337B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x337F											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_88[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x90 */
                                                             0x4E9C, /* 0x90 */
     0x5516, 0x5A03, 0x963F, 0x54C0, 0x611B, 0x6328, 0x59F6, 0x9022, /* 0xA0 */
@@ -289,27 +289,27 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_88[] =
     0x8B02, 0x9055, 0x907A, 0x533B, 0x4E95, 0x4EA5, 0x57DF, 0x80B2, /* 0xE0 */
     0x90C1, 0x78EF, 0x4E00, 0x58F1, 0x6EA2, 0x9038, 0x7A32, 0x8328, /* 0xE0 */
     0x828B, 0x9C2F, 0x5141, 0x5370, 0x54BD, 0x54E1, 0x56E0, 0x59FB, /* 0xF0 */
-    0x5F15, 0x98F2, 0x6DEB, 0x80E4, 0x852D                          /* 0xF0 */
+    0x5F15, 0x98F2, 0x6DEB, 0x80E4, 0x852D							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_APPLEJAPANESE_88[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x222E, 0x221F, 0x22BF,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0x301D, 0x301F,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0x3094,      0, 0x30F7, 0x30F8, 0x30F9, 0x30FA,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0x4E9C, /* 0x90 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x222E, 0x221F, 0x22BF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x301D, 0x301F, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x3094, 	 0, 0x30F7, 0x30F8, 0x30F9, 0x30FA, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4E9C, /* 0x90 */
     0x5516, 0x5A03, 0x963F, 0x54C0, 0x611B, 0x6328, 0x59F6, 0x9022, /* 0xA0 */
     0x8475, 0x831C, 0x7A50, 0x60AA, 0x63E1, 0x6E25, 0x65ED, 0x8466, /* 0xA0 */
     0x82A6, 0x9BF5, 0x6893, 0x5727, 0x65A1, 0x6271, 0x5B9B, 0x59D0, /* 0xB0 */
@@ -321,15 +321,15 @@ static sal_uInt16 const aImplDBCSToUniTab_APPLEJAPANESE_88[] =
     0x8B02, 0x9055, 0x907A, 0x533B, 0x4E95, 0x4EA5, 0x57DF, 0x80B2, /* 0xE0 */
     0x90C1, 0x78EF, 0x4E00, 0x58F1, 0x6EA2, 0x9038, 0x7A32, 0x8328, /* 0xE0 */
     0x828B, 0x9C2F, 0x5141, 0x5370, 0x54BD, 0x54E1, 0x56E0, 0x59FB, /* 0xF0 */
-    0x5F15, 0x98F2, 0x6DEB, 0x80E4, 0x852D                          /* 0xF0 */
+    0x5F15, 0x98F2, 0x6DEB, 0x80E4, 0x852D							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_89[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9662, 0x9670, 0x96A0, 0x97FB, 0x540B, 0x53F3, 0x5B87, 0x70CF, /* 0x40 */
     0x7FBD, 0x8FC2, 0x96E8, 0x536F, 0x9D5C, 0x7ABA, 0x4E11, 0x7893, /* 0x40 */
     0x81FC, 0x6E26, 0x5618, 0x5504, 0x6B1D, 0x851A, 0x9C3B, 0x59E5, /* 0x50 */
@@ -337,7 +337,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_89[] =
     0x834F, 0x990C, 0x53E1, 0x55B6, 0x5B30, 0x5F71, 0x6620, 0x66F3, /* 0x60 */
     0x6804, 0x6C38, 0x6CF3, 0x6D29, 0x745B, 0x76C8, 0x7A4E, 0x9834, /* 0x60 */
     0x82F1, 0x885B, 0x8A60, 0x92ED, 0x6DB2, 0x75AB, 0x76CA, 0x99C5, /* 0x70 */
-    0x60A6, 0x8B01, 0x8D8A, 0x95B2, 0x698E, 0x53AD, 0x5186,      0, /* 0x70 */
+    0x60A6, 0x8B01, 0x8D8A, 0x95B2, 0x698E, 0x53AD, 0x5186, 	 0, /* 0x70 */
     0x5712, 0x5830, 0x5944, 0x5BB4, 0x5EF6, 0x6028, 0x63A9, 0x63F4, /* 0x80 */
     0x6CBF, 0x6F14, 0x708E, 0x7114, 0x7159, 0x71D5, 0x733F, 0x7E01, /* 0x80 */
     0x8276, 0x82D1, 0x8597, 0x9060, 0x925B, 0x9D1B, 0x5869, 0x65BC, /* 0x90 */
@@ -353,15 +353,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_89[] =
     0x971E, 0x868A, 0x4FC4, 0x5CE8, 0x6211, 0x7259, 0x753B, 0x81E5, /* 0xE0 */
     0x82BD, 0x86FE, 0x8CC0, 0x96C5, 0x9913, 0x99D5, 0x4ECB, 0x4F1A, /* 0xE0 */
     0x89E3, 0x56DE, 0x584A, 0x58CA, 0x5EFB, 0x5FEB, 0x602A, 0x6094, /* 0xF0 */
-    0x6062, 0x61D0, 0x6212, 0x62D0, 0x6539                          /* 0xF0 */
+    0x6062, 0x61D0, 0x6212, 0x62D0, 0x6539							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_8A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9B41, 0x6666, 0x68B0, 0x6D77, 0x7070, 0x754C, 0x7686, 0x7D75, /* 0x40 */
     0x82A5, 0x87F9, 0x958B, 0x968E, 0x8C9D, 0x51F1, 0x52BE, 0x5916, /* 0x40 */
     0x54B3, 0x5BB3, 0x5D16, 0x6168, 0x6982, 0x6DAF, 0x788D, 0x84CB, /* 0x50 */
@@ -369,7 +369,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_8A[] =
     0x67FF, 0x86CE, 0x920E, 0x5283, 0x5687, 0x5404, 0x5ED3, 0x62E1, /* 0x60 */
     0x64B9, 0x683C, 0x6838, 0x6BBB, 0x7372, 0x78BA, 0x7A6B, 0x899A, /* 0x60 */
     0x89D2, 0x8D6B, 0x8F03, 0x90ED, 0x95A3, 0x9694, 0x9769, 0x5B66, /* 0x70 */
-    0x5CB3, 0x697D, 0x984D, 0x984E, 0x639B, 0x7B20, 0x6A2B,      0, /* 0x70 */
+    0x5CB3, 0x697D, 0x984D, 0x984E, 0x639B, 0x7B20, 0x6A2B, 	 0, /* 0x70 */
     0x6A7F, 0x68B6, 0x9C0D, 0x6F5F, 0x5272, 0x559D, 0x6070, 0x62EC, /* 0x80 */
     0x6D3B, 0x6E07, 0x6ED1, 0x845B, 0x8910, 0x8F44, 0x4E14, 0x9C39, /* 0x80 */
     0x53F6, 0x691B, 0x6A3A, 0x9784, 0x682A, 0x515C, 0x7AC3, 0x84B2, /* 0x90 */
@@ -385,15 +385,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_8A[] =
     0x764C, 0x773C, 0x5CA9, 0x7FEB, 0x8D0B, 0x96C1, 0x9811, 0x9854, /* 0xE0 */
     0x9858, 0x4F01, 0x4F0E, 0x5371, 0x559C, 0x5668, 0x57FA, 0x5947, /* 0xE0 */
     0x5B09, 0x5BC4, 0x5C90, 0x5E0C, 0x5E7E, 0x5FCC, 0x63EE, 0x673A, /* 0xF0 */
-    0x65D7, 0x65E2, 0x671F, 0x68CB, 0x68C4                          /* 0xF0 */
+    0x65D7, 0x65E2, 0x671F, 0x68CB, 0x68C4							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_8B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6A5F, 0x5E30, 0x6BC5, 0x6C17, 0x6C7D, 0x757F, 0x7948, 0x5B63, /* 0x40 */
     0x7A00, 0x7D00, 0x5FBD, 0x898F, 0x8A18, 0x8CB4, 0x8D77, 0x8ECC, /* 0x40 */
     0x8F1D, 0x98E2, 0x9A0E, 0x9B3C, 0x4E80, 0x507D, 0x5100, 0x5993, /* 0x50 */
@@ -401,7 +401,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_8B[] =
     0x7FA9, 0x87FB, 0x8ABC, 0x8B70, 0x63AC, 0x83CA, 0x97A0, 0x5409, /* 0x60 */
     0x5403, 0x55AB, 0x6854, 0x6A58, 0x8A70, 0x7827, 0x6775, 0x9ECD, /* 0x60 */
     0x5374, 0x5BA2, 0x811A, 0x8650, 0x9006, 0x4E18, 0x4E45, 0x4EC7, /* 0x70 */
-    0x4F11, 0x53CA, 0x5438, 0x5BAE, 0x5F13, 0x6025, 0x6551,      0, /* 0x70 */
+    0x4F11, 0x53CA, 0x5438, 0x5BAE, 0x5F13, 0x6025, 0x6551, 	 0, /* 0x70 */
     0x673D, 0x6C42, 0x6C72, 0x6CE3, 0x7078, 0x7403, 0x7A76, 0x7AAE, /* 0x80 */
     0x7B08, 0x7D1A, 0x7CFE, 0x7D66, 0x65E7, 0x725B, 0x53BB, 0x5C45, /* 0x80 */
     0x5DE8, 0x62D2, 0x62E0, 0x6319, 0x6E20, 0x865A, 0x8A31, 0x8DDD, /* 0x90 */
@@ -417,15 +417,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_8B[] =
     0x91D1, 0x541F, 0x9280, 0x4E5D, 0x5036, 0x53E5, 0x533A, 0x72D7, /* 0xE0 */
     0x7396, 0x77E9, 0x82E6, 0x8EAF, 0x99C6, 0x99C8, 0x99D2, 0x5177, /* 0xE0 */
     0x611A, 0x865E, 0x55B0, 0x7A7A, 0x5076, 0x5BD3, 0x9047, 0x9685, /* 0xF0 */
-    0x4E32, 0x6ADB, 0x91E7, 0x5C51, 0x5C48                          /* 0xF0 */
+    0x4E32, 0x6ADB, 0x91E7, 0x5C51, 0x5C48							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_8C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6398, 0x7A9F, 0x6C93, 0x9774, 0x8F61, 0x7AAA, 0x718A, 0x9688, /* 0x40 */
     0x7C82, 0x6817, 0x7E70, 0x6851, 0x936C, 0x52F2, 0x541B, 0x85AB, /* 0x40 */
     0x8A13, 0x7FA4, 0x8ECD, 0x90E1, 0x5366, 0x8888, 0x7941, 0x4FC2, /* 0x50 */
@@ -433,7 +433,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_8C[] =
     0x5F62, 0x5F84, 0x6075, 0x6176, 0x6167, 0x61A9, 0x63B2, 0x643A, /* 0x60 */
     0x656C, 0x666F, 0x6842, 0x6E13, 0x7566, 0x7A3D, 0x7CFB, 0x7D4C, /* 0x60 */
     0x7D99, 0x7E4B, 0x7F6B, 0x830E, 0x834A, 0x86CD, 0x8A08, 0x8A63, /* 0x70 */
-    0x8B66, 0x8EFD, 0x981A, 0x9D8F, 0x82B8, 0x8FCE, 0x9BE8,      0, /* 0x70 */
+    0x8B66, 0x8EFD, 0x981A, 0x9D8F, 0x82B8, 0x8FCE, 0x9BE8, 	 0, /* 0x70 */
     0x5287, 0x621F, 0x6483, 0x6FC0, 0x9699, 0x6841, 0x5091, 0x6B20, /* 0x80 */
     0x6C7A, 0x6F54, 0x7A74, 0x7D50, 0x8840, 0x8A23, 0x6708, 0x4EF6, /* 0x80 */
     0x5039, 0x5026, 0x5065, 0x517C, 0x5238, 0x5263, 0x55A7, 0x570F, /* 0x90 */
@@ -449,15 +449,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_8C[] =
     0x5449, 0x543E, 0x5A2F, 0x5F8C, 0x5FA1, 0x609F, 0x68A7, 0x6A8E, /* 0xE0 */
     0x745A, 0x7881, 0x8A9E, 0x8AA4, 0x8B77, 0x9190, 0x4E5E, 0x9BC9, /* 0xE0 */
     0x4EA4, 0x4F7C, 0x4FAF, 0x5019, 0x5016, 0x5149, 0x516C, 0x529F, /* 0xF0 */
-    0x52B9, 0x52FE, 0x539A, 0x53E3, 0x5411                          /* 0xF0 */
+    0x52B9, 0x52FE, 0x539A, 0x53E3, 0x5411							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_8D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x540E, 0x5589, 0x5751, 0x57A2, 0x597D, 0x5B54, 0x5B5D, 0x5B8F, /* 0x40 */
     0x5DE5, 0x5DE7, 0x5DF7, 0x5E78, 0x5E83, 0x5E9A, 0x5EB7, 0x5F18, /* 0x40 */
     0x6052, 0x614C, 0x6297, 0x62D8, 0x63A7, 0x653B, 0x6602, 0x6643, /* 0x50 */
@@ -465,7 +465,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_8D[] =
     0x6E2F, 0x6E9D, 0x7532, 0x7687, 0x786C, 0x7A3F, 0x7CE0, 0x7D05, /* 0x60 */
     0x7D18, 0x7D5E, 0x7DB1, 0x8015, 0x8003, 0x80AF, 0x80B1, 0x8154, /* 0x60 */
     0x818F, 0x822A, 0x8352, 0x884C, 0x8861, 0x8B1B, 0x8CA2, 0x8CFC, /* 0x70 */
-    0x90CA, 0x9175, 0x9271, 0x783F, 0x92FC, 0x95A4, 0x964D,      0, /* 0x70 */
+    0x90CA, 0x9175, 0x9271, 0x783F, 0x92FC, 0x95A4, 0x964D, 	 0, /* 0x70 */
     0x9805, 0x9999, 0x9AD8, 0x9D3B, 0x525B, 0x52AB, 0x53F7, 0x5408, /* 0x80 */
     0x58D5, 0x62F7, 0x6FE0, 0x8C6A, 0x8F5F, 0x9EB9, 0x514B, 0x523B, /* 0x80 */
     0x544A, 0x56FD, 0x7A40, 0x9177, 0x9D60, 0x9ED2, 0x7344, 0x6F09, /* 0x90 */
@@ -481,15 +481,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_8D[] =
     0x8CA1, 0x51B4, 0x5742, 0x962A, 0x583A, 0x698A, 0x80B4, 0x54B2, /* 0xE0 */
     0x5D0E, 0x57FC, 0x7895, 0x9DFA, 0x4F5C, 0x524A, 0x548B, 0x643E, /* 0xE0 */
     0x6628, 0x6714, 0x67F5, 0x7A84, 0x7B56, 0x7D22, 0x932F, 0x685C, /* 0xF0 */
-    0x9BAD, 0x7B39, 0x5319, 0x518A, 0x5237                          /* 0xF0 */
+    0x9BAD, 0x7B39, 0x5319, 0x518A, 0x5237							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_8E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5BDF, 0x62F6, 0x64AE, 0x64E6, 0x672D, 0x6BBA, 0x85A9, 0x96D1, /* 0x40 */
     0x7690, 0x9BD6, 0x634C, 0x9306, 0x9BAB, 0x76BF, 0x6652, 0x4E09, /* 0x40 */
     0x5098, 0x53C2, 0x5C71, 0x60E8, 0x6492, 0x6563, 0x685F, 0x71E6, /* 0x50 */
@@ -497,7 +497,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_8E[] =
     0x9910, 0x65AC, 0x66AB, 0x6B8B, 0x4ED5, 0x4ED4, 0x4F3A, 0x4F7F, /* 0x60 */
     0x523A, 0x53F8, 0x53F2, 0x55E3, 0x56DB, 0x58EB, 0x59CB, 0x59C9, /* 0x60 */
     0x59FF, 0x5B50, 0x5C4D, 0x5E02, 0x5E2B, 0x5FD7, 0x601D, 0x6307, /* 0x70 */
-    0x652F, 0x5B5C, 0x65AF, 0x65BD, 0x65E8, 0x679D, 0x6B62,      0, /* 0x70 */
+    0x652F, 0x5B5C, 0x65AF, 0x65BD, 0x65E8, 0x679D, 0x6B62, 	 0, /* 0x70 */
     0x6B7B, 0x6C0F, 0x7345, 0x7949, 0x79C1, 0x7CF8, 0x7D19, 0x7D2B, /* 0x80 */
     0x80A2, 0x8102, 0x81F3, 0x8996, 0x8A5E, 0x8A69, 0x8A66, 0x8A8C, /* 0x80 */
     0x8AEE, 0x8CC7, 0x8CDC, 0x96CC, 0x98FC, 0x6B6F, 0x4E8B, 0x4F3C, /* 0x90 */
@@ -513,15 +513,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_8E[] =
     0x932B, 0x82E5, 0x5BC2, 0x5F31, 0x60F9, 0x4E3B, 0x53D6, 0x5B88, /* 0xE0 */
     0x624B, 0x6731, 0x6B8A, 0x72E9, 0x73E0, 0x7A2E, 0x816B, 0x8DA3, /* 0xE0 */
     0x9152, 0x9996, 0x5112, 0x53D7, 0x546A, 0x5BFF, 0x6388, 0x6A39, /* 0xF0 */
-    0x7DAC, 0x9700, 0x56DA, 0x53CE, 0x5468                          /* 0xF0 */
+    0x7DAC, 0x9700, 0x56DA, 0x53CE, 0x5468							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_8F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5B97, 0x5C31, 0x5DDE, 0x4FEE, 0x6101, 0x62FE, 0x6D32, 0x79C0, /* 0x40 */
     0x79CB, 0x7D42, 0x7E4D, 0x7FD2, 0x81ED, 0x821F, 0x8490, 0x8846, /* 0x40 */
     0x8972, 0x8B90, 0x8E74, 0x8F2F, 0x9031, 0x914B, 0x916C, 0x96C6, /* 0x50 */
@@ -529,7 +529,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_8F[] =
     0x6C41, 0x6E0B, 0x7363, 0x7E26, 0x91CD, 0x9283, 0x53D4, 0x5919, /* 0x60 */
     0x5BBF, 0x6DD1, 0x795D, 0x7E2E, 0x7C9B, 0x587E, 0x719F, 0x51FA, /* 0x60 */
     0x8853, 0x8FF0, 0x4FCA, 0x5CFB, 0x6625, 0x77AC, 0x7AE3, 0x821C, /* 0x70 */
-    0x99FF, 0x51C6, 0x5FAA, 0x65EC, 0x696F, 0x6B89, 0x6DF3,      0, /* 0x70 */
+    0x99FF, 0x51C6, 0x5FAA, 0x65EC, 0x696F, 0x6B89, 0x6DF3, 	 0, /* 0x70 */
     0x6E96, 0x6F64, 0x76FE, 0x7D14, 0x5DE1, 0x9075, 0x9187, 0x9806, /* 0x80 */
     0x51E6, 0x521D, 0x6240, 0x6691, 0x66D9, 0x6E1A, 0x5EB6, 0x7DD2, /* 0x80 */
     0x7F72, 0x66F8, 0x85AF, 0x85F7, 0x8AF8, 0x52A9, 0x53D9, 0x5973, /* 0x90 */
@@ -545,15 +545,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_8F[] =
     0x9418, 0x969C, 0x9798, 0x4E0A, 0x4E08, 0x4E1E, 0x4E57, 0x5197, /* 0xE0 */
     0x5270, 0x57CE, 0x5834, 0x58CC, 0x5B22, 0x5E38, 0x60C5, 0x64FE, /* 0xE0 */
     0x6761, 0x6756, 0x6D44, 0x72B6, 0x7573, 0x7A63, 0x84B8, 0x8B72, /* 0xF0 */
-    0x91B8, 0x9320, 0x5631, 0x57F4, 0x98FE                          /* 0xF0 */
+    0x91B8, 0x9320, 0x5631, 0x57F4, 0x98FE							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_90[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x62ED, 0x690D, 0x6B96, 0x71ED, 0x7E54, 0x8077, 0x8272, 0x89E6, /* 0x40 */
     0x98DF, 0x8755, 0x8FB1, 0x5C3B, 0x4F38, 0x4FE1, 0x4FB5, 0x5507, /* 0x40 */
     0x5A20, 0x5BDD, 0x5BE9, 0x5FC3, 0x614E, 0x632F, 0x65B0, 0x664B, /* 0x50 */
@@ -561,7 +561,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_90[] =
     0x79E6, 0x7D33, 0x81E3, 0x82AF, 0x85AA, 0x89AA, 0x8A3A, 0x8EAB, /* 0x60 */
     0x8F9B, 0x9032, 0x91DD, 0x9707, 0x4EBA, 0x4EC1, 0x5203, 0x5875, /* 0x60 */
     0x58EC, 0x5C0B, 0x751A, 0x5C3D, 0x814E, 0x8A0A, 0x8FC5, 0x9663, /* 0x70 */
-    0x976D, 0x7B25, 0x8ACF, 0x9808, 0x9162, 0x56F3, 0x53A8,      0, /* 0x70 */
+    0x976D, 0x7B25, 0x8ACF, 0x9808, 0x9162, 0x56F3, 0x53A8, 	 0, /* 0x70 */
     0x9017, 0x5439, 0x5782, 0x5E25, 0x63A8, 0x6C34, 0x708A, 0x7761, /* 0x80 */
     0x7C8B, 0x7FE0, 0x8870, 0x9042, 0x9154, 0x9310, 0x9318, 0x968F, /* 0x80 */
     0x745E, 0x9AC4, 0x5D07, 0x5D69, 0x6570, 0x67A2, 0x8DA8, 0x96DB, /* 0x90 */
@@ -577,15 +577,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_90[] =
     0x8AAC, 0x96EA, 0x7D76, 0x820C, 0x8749, 0x4ED9, 0x5148, 0x5343, /* 0xE0 */
     0x5360, 0x5BA3, 0x5C02, 0x5C16, 0x5DDD, 0x6226, 0x6247, 0x64B0, /* 0xE0 */
     0x6813, 0x6834, 0x6CC9, 0x6D45, 0x6D17, 0x67D3, 0x6F5C, 0x714E, /* 0xF0 */
-    0x717D, 0x65CB, 0x7A7F, 0x7BAD, 0x7DDA                          /* 0xF0 */
+    0x717D, 0x65CB, 0x7A7F, 0x7BAD, 0x7DDA							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_91[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7E4A, 0x7FA8, 0x817A, 0x821B, 0x8239, 0x85A6, 0x8A6E, 0x8CCE, /* 0x40 */
     0x8DF5, 0x9078, 0x9077, 0x92AD, 0x9291, 0x9583, 0x9BAE, 0x524D, /* 0x40 */
     0x5584, 0x6F38, 0x7136, 0x5168, 0x7985, 0x7E55, 0x81B3, 0x7CCE, /* 0x50 */
@@ -593,7 +593,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_91[] =
     0x758F, 0x758E, 0x790E, 0x7956, 0x79DF, 0x7C97, 0x7D20, 0x7D44, /* 0x60 */
     0x8607, 0x8A34, 0x963B, 0x9061, 0x9F20, 0x50E7, 0x5275, 0x53CC, /* 0x60 */
     0x53E2, 0x5009, 0x55AA, 0x58EE, 0x594F, 0x723D, 0x5B8B, 0x5C64, /* 0x70 */
-    0x531D, 0x60E3, 0x60F3, 0x635C, 0x6383, 0x633F, 0x63BB,      0, /* 0x70 */
+    0x531D, 0x60E3, 0x60F3, 0x635C, 0x6383, 0x633F, 0x63BB, 	 0, /* 0x70 */
     0x64CD, 0x65E9, 0x66F9, 0x5DE3, 0x69CD, 0x69FD, 0x6F15, 0x71E5, /* 0x80 */
     0x4E89, 0x75E9, 0x76F8, 0x7A93, 0x7CDF, 0x7DCF, 0x7D9C, 0x8061, /* 0x80 */
     0x8349, 0x8358, 0x846C, 0x84BC, 0x85FB, 0x88C5, 0x8D70, 0x9001, /* 0x90 */
@@ -609,15 +609,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_91[] =
     0x968A, 0x9EDB, 0x9BDB, 0x4EE3, 0x53F0, 0x5927, 0x7B2C, 0x918D, /* 0xE0 */
     0x984C, 0x9DF9, 0x6EDD, 0x7027, 0x5353, 0x5544, 0x5B85, 0x6258, /* 0xE0 */
     0x629E, 0x62D3, 0x6CA2, 0x6FEF, 0x7422, 0x8A17, 0x9438, 0x6FC1, /* 0xF0 */
-    0x8AFE, 0x8338, 0x51E7, 0x86F8, 0x53EA                          /* 0xF0 */
+    0x8AFE, 0x8338, 0x51E7, 0x86F8, 0x53EA							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_92[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x53E9, 0x4F46, 0x9054, 0x8FB0, 0x596A, 0x8131, 0x5DFD, 0x7AEA, /* 0x40 */
     0x8FBF, 0x68DA, 0x8C37, 0x72F8, 0x9C48, 0x6A3D, 0x8AB0, 0x4E39, /* 0x40 */
     0x5358, 0x5606, 0x5766, 0x62C5, 0x63A2, 0x65E6, 0x6B4E, 0x6DE1, /* 0x50 */
@@ -625,7 +625,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_92[] =
     0x86CB, 0x8A95, 0x935B, 0x56E3, 0x58C7, 0x5F3E, 0x65AD, 0x6696, /* 0x60 */
     0x6A80, 0x6BB5, 0x7537, 0x8AC7, 0x5024, 0x77E5, 0x5730, 0x5F1B, /* 0x60 */
     0x6065, 0x667A, 0x6C60, 0x75F4, 0x7A1A, 0x7F6E, 0x81F4, 0x8718, /* 0x70 */
-    0x9045, 0x99B3, 0x7BC9, 0x755C, 0x7AF9, 0x7B51, 0x84C4,      0, /* 0x70 */
+    0x9045, 0x99B3, 0x7BC9, 0x755C, 0x7AF9, 0x7B51, 0x84C4, 	 0, /* 0x70 */
     0x9010, 0x79E9, 0x7A92, 0x8336, 0x5AE1, 0x7740, 0x4E2D, 0x4EF2, /* 0x80 */
     0x5B99, 0x5FE0, 0x62BD, 0x663C, 0x67F1, 0x6CE8, 0x866B, 0x8877, /* 0x80 */
     0x8A3B, 0x914E, 0x92F3, 0x99D0, 0x6A17, 0x7026, 0x732A, 0x82E7, /* 0x90 */
@@ -641,15 +641,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_92[] =
     0x4EAD, 0x4F4E, 0x505C, 0x5075, 0x5243, 0x8C9E, 0x5448, 0x5824, /* 0xE0 */
     0x5B9A, 0x5E1D, 0x5E95, 0x5EAD, 0x5EF7, 0x5F1F, 0x608C, 0x62B5, /* 0xE0 */
     0x633A, 0x63D0, 0x68AF, 0x6C40, 0x7887, 0x798E, 0x7A0B, 0x7DE0, /* 0xF0 */
-    0x8247, 0x8A02, 0x8AE6, 0x8E44, 0x9013                          /* 0xF0 */
+    0x8247, 0x8A02, 0x8AE6, 0x8E44, 0x9013							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_93[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x90B8, 0x912D, 0x91D8, 0x9F0E, 0x6CE5, 0x6458, 0x64E2, 0x6575, /* 0x40 */
     0x6EF4, 0x7684, 0x7B1B, 0x9069, 0x93D1, 0x6EBA, 0x54F2, 0x5FB9, /* 0x40 */
     0x64A4, 0x8F4D, 0x8FED, 0x9244, 0x5178, 0x586B, 0x5929, 0x5C55, /* 0x50 */
@@ -657,7 +657,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_93[] =
     0x4F1D, 0x6BBF, 0x6FB1, 0x7530, 0x96FB, 0x514E, 0x5410, 0x5835, /* 0x60 */
     0x5857, 0x59AC, 0x5C60, 0x5F92, 0x6597, 0x675C, 0x6E21, 0x767B, /* 0x60 */
     0x83DF, 0x8CED, 0x9014, 0x90FD, 0x934D, 0x7825, 0x783A, 0x52AA, /* 0x70 */
-    0x5EA6, 0x571F, 0x5974, 0x6012, 0x5012, 0x515A, 0x51AC,      0, /* 0x70 */
+    0x5EA6, 0x571F, 0x5974, 0x6012, 0x5012, 0x515A, 0x51AC, 	 0, /* 0x70 */
     0x51CD, 0x5200, 0x5510, 0x5854, 0x5858, 0x5957, 0x5B95, 0x5CF6, /* 0x80 */
     0x5D8B, 0x60BC, 0x6295, 0x642D, 0x6771, 0x6843, 0x68BC, 0x68DF, /* 0x80 */
     0x76D7, 0x6DD8, 0x6E6F, 0x6D9B, 0x706F, 0x71C8, 0x5F53, 0x75D8, /* 0x90 */
@@ -673,15 +673,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_93[] =
     0x5185, 0x4E4D, 0x51EA, 0x8599, 0x8B0E, 0x7058, 0x637A, 0x934B, /* 0xE0 */
     0x6962, 0x99B4, 0x7E04, 0x7577, 0x5357, 0x6960, 0x8EDF, 0x96E3, /* 0xE0 */
     0x6C5D, 0x4E8C, 0x5C3C, 0x5F10, 0x8FE9, 0x5302, 0x8CD1, 0x8089, /* 0xF0 */
-    0x8679, 0x5EFF, 0x65E5, 0x4E73, 0x5165                          /* 0xF0 */
+    0x8679, 0x5EFF, 0x65E5, 0x4E73, 0x5165							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_94[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5982, 0x5C3F, 0x97EE, 0x4EFB, 0x598A, 0x5FCD, 0x8A8D, 0x6FE1, /* 0x40 */
     0x79B0, 0x7962, 0x5BE7, 0x8471, 0x732B, 0x71B1, 0x5E74, 0x5FF5, /* 0x40 */
     0x637B, 0x649A, 0x71C3, 0x7C98, 0x4E43, 0x5EFC, 0x4E4B, 0x57DC, /* 0x50 */
@@ -689,7 +689,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_94[] =
     0x8997, 0x86A4, 0x5DF4, 0x628A, 0x64AD, 0x8987, 0x6777, 0x6CE2, /* 0x60 */
     0x6D3E, 0x7436, 0x7834, 0x5A46, 0x7F75, 0x82AD, 0x99AC, 0x4FF3, /* 0x60 */
     0x5EC3, 0x62DD, 0x6392, 0x6557, 0x676F, 0x76C3, 0x724C, 0x80CC, /* 0x70 */
-    0x80BA, 0x8F29, 0x914D, 0x500D, 0x57F9, 0x5A92, 0x6885,      0, /* 0x70 */
+    0x80BA, 0x8F29, 0x914D, 0x500D, 0x57F9, 0x5A92, 0x6885, 	 0, /* 0x70 */
     0x6973, 0x7164, 0x72FD, 0x8CB7, 0x58F2, 0x8CE0, 0x966A, 0x9019, /* 0x80 */
     0x877F, 0x79E4, 0x77E7, 0x8429, 0x4F2F, 0x5265, 0x535A, 0x62CD, /* 0x80 */
     0x67CF, 0x6CCA, 0x767D, 0x7B94, 0x7C95, 0x8236, 0x8584, 0x8FEB, /* 0x90 */
@@ -705,15 +705,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_94[] =
     0x6249, 0x6279, 0x62AB, 0x6590, 0x6BD4, 0x6CCC, 0x75B2, 0x76AE, /* 0xE0 */
     0x7891, 0x79D8, 0x7DCB, 0x7F77, 0x80A5, 0x88AB, 0x8AB9, 0x8CBB, /* 0xE0 */
     0x907F, 0x975E, 0x98DB, 0x6A0B, 0x7C38, 0x5099, 0x5C3E, 0x5FAE, /* 0xF0 */
-    0x6787, 0x6BD8, 0x7435, 0x7709, 0x7F8E                          /* 0xF0 */
+    0x6787, 0x6BD8, 0x7435, 0x7709, 0x7F8E							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_95[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9F3B, 0x67CA, 0x7A17, 0x5339, 0x758B, 0x9AED, 0x5F66, 0x819D, /* 0x40 */
     0x83F1, 0x8098, 0x5F3C, 0x5FC5, 0x7562, 0x7B46, 0x903C, 0x6867, /* 0x40 */
     0x59EB, 0x5A9B, 0x7D10, 0x767E, 0x8B2C, 0x4FF5, 0x5F6A, 0x6A19, /* 0x50 */
@@ -721,7 +721,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_95[] =
     0x63CF, 0x75C5, 0x79D2, 0x82D7, 0x9328, 0x92F2, 0x849C, 0x86ED, /* 0x60 */
     0x9C2D, 0x54C1, 0x5F6C, 0x658C, 0x6D5C, 0x7015, 0x8CA7, 0x8CD3, /* 0x60 */
     0x983B, 0x654F, 0x74F6, 0x4E0D, 0x4ED8, 0x57E0, 0x592B, 0x5A66, /* 0x70 */
-    0x5BCC, 0x51A8, 0x5E03, 0x5E9C, 0x6016, 0x6276, 0x6577,      0, /* 0x70 */
+    0x5BCC, 0x51A8, 0x5E03, 0x5E9C, 0x6016, 0x6276, 0x6577, 	 0, /* 0x70 */
     0x65A7, 0x666E, 0x6D6E, 0x7236, 0x7B26, 0x8150, 0x819A, 0x8299, /* 0x80 */
     0x8B5C, 0x8CA0, 0x8CE6, 0x8D74, 0x961C, 0x9644, 0x4FAE, 0x64AB, /* 0x80 */
     0x6B66, 0x821E, 0x8461, 0x856A, 0x90E8, 0x5C01, 0x6953, 0x98A8, /* 0x90 */
@@ -737,15 +737,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_95[] =
     0x6B69, 0x752B, 0x88DC, 0x8F14, 0x7A42, 0x52DF, 0x5893, 0x6155, /* 0xE0 */
     0x620A, 0x66AE, 0x6BCD, 0x7C3F, 0x83E9, 0x5023, 0x4FF8, 0x5305, /* 0xE0 */
     0x5446, 0x5831, 0x5949, 0x5B9D, 0x5CF0, 0x5CEF, 0x5D29, 0x5E96, /* 0xF0 */
-    0x62B1, 0x6367, 0x653E, 0x65B9, 0x670B                          /* 0xF0 */
+    0x62B1, 0x6367, 0x653E, 0x65B9, 0x670B							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_96[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6CD5, 0x6CE1, 0x70F9, 0x7832, 0x7E2B, 0x80DE, 0x82B3, 0x840C, /* 0x40 */
     0x84EC, 0x8702, 0x8912, 0x8A2A, 0x8C4A, 0x90A6, 0x92D2, 0x98FD, /* 0x40 */
     0x9CF3, 0x9D6C, 0x4E4F, 0x4EA1, 0x508D, 0x5256, 0x574A, 0x59A8, /* 0x50 */
@@ -753,7 +753,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_96[] =
     0x5192, 0x7D21, 0x80AA, 0x81A8, 0x8B00, 0x8C8C, 0x8CBF, 0x927E, /* 0x60 */
     0x9632, 0x5420, 0x982C, 0x5317, 0x50D5, 0x535C, 0x58A8, 0x64B2, /* 0x60 */
     0x6734, 0x7267, 0x7766, 0x7A46, 0x91E6, 0x52C3, 0x6CA1, 0x6B86, /* 0x70 */
-    0x5800, 0x5E4C, 0x5954, 0x672C, 0x7FFB, 0x51E1, 0x76C6,      0, /* 0x70 */
+    0x5800, 0x5E4C, 0x5954, 0x672C, 0x7FFB, 0x51E1, 0x76C6, 	 0, /* 0x70 */
     0x6469, 0x78E8, 0x9B54, 0x9EBB, 0x57CB, 0x59B9, 0x6627, 0x679A, /* 0x80 */
     0x6BCE, 0x54E9, 0x69D9, 0x5E55, 0x819C, 0x6795, 0x9BAA, 0x67FE, /* 0x80 */
     0x9C52, 0x685D, 0x4EA6, 0x4FE3, 0x53C8, 0x62B9, 0x672B, 0x6CAB, /* 0x90 */
@@ -769,15 +769,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_96[] =
     0x7C7E, 0x8CB0, 0x554F, 0x60B6, 0x7D0B, 0x9580, 0x5301, 0x4E5F, /* 0xE0 */
     0x51B6, 0x591C, 0x723A, 0x8036, 0x91CE, 0x5F25, 0x77E2, 0x5384, /* 0xE0 */
     0x5F79, 0x7D04, 0x85AC, 0x8A33, 0x8E8D, 0x9756, 0x67F3, 0x85AE, /* 0xF0 */
-    0x9453, 0x6109, 0x6108, 0x6CB9, 0x7652                          /* 0xF0 */
+    0x9453, 0x6109, 0x6108, 0x6CB9, 0x7652							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_97[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8AED, 0x8F38, 0x552F, 0x4F51, 0x512A, 0x52C7, 0x53CB, 0x5BA5, /* 0x40 */
     0x5E7D, 0x60A0, 0x6182, 0x63D6, 0x6709, 0x67DA, 0x6E67, 0x6D8C, /* 0x40 */
     0x7336, 0x7337, 0x7531, 0x7950, 0x88D5, 0x8A98, 0x904A, 0x9091, /* 0x50 */
@@ -785,7 +785,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_97[] =
     0x8F3F, 0x9810, 0x50AD, 0x5E7C, 0x5996, 0x5BB9, 0x5EB8, 0x63DA, /* 0x60 */
     0x63FA, 0x64C1, 0x66DC, 0x694A, 0x69D8, 0x6D0B, 0x6EB6, 0x7194, /* 0x60 */
     0x7528, 0x7AAF, 0x7F8A, 0x8000, 0x8449, 0x84C9, 0x8981, 0x8B21, /* 0x70 */
-    0x8E0A, 0x9065, 0x967D, 0x990A, 0x617E, 0x6291, 0x6B32,      0, /* 0x70 */
+    0x8E0A, 0x9065, 0x967D, 0x990A, 0x617E, 0x6291, 0x6B32, 	 0, /* 0x70 */
     0x6C83, 0x6D74, 0x7FCC, 0x7FFC, 0x6DC0, 0x7F85, 0x87BA, 0x88F8, /* 0x80 */
     0x6765, 0x83B1, 0x983C, 0x96F7, 0x6D1B, 0x7D61, 0x843D, 0x916A, /* 0x80 */
     0x4E71, 0x5375, 0x5D50, 0x6B04, 0x6FEB, 0x85CD, 0x862D, 0x89A7, /* 0x90 */
@@ -801,27 +801,27 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_97[] =
     0x4F36, 0x4F8B, 0x51B7, 0x52B1, 0x5DBA, 0x601C, 0x73B2, 0x793C, /* 0xE0 */
     0x82D3, 0x9234, 0x96B7, 0x96F6, 0x970A, 0x9E97, 0x9F62, 0x66A6, /* 0xE0 */
     0x6B74, 0x5217, 0x52A3, 0x70C8, 0x88C2, 0x5EC9, 0x604B, 0x6190, /* 0xF0 */
-    0x6F23, 0x7149, 0x7C3E, 0x7DF4, 0x806F                          /* 0xF0 */
+    0x6F23, 0x7149, 0x7C3E, 0x7DF4, 0x806F							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_98[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x84EE, 0x9023, 0x932C, 0x5442, 0x9B6F, 0x6AD3, 0x7089, 0x8CC2, /* 0x40 */
     0x8DEF, 0x9732, 0x52B4, 0x5A41, 0x5ECA, 0x5F04, 0x6717, 0x697C, /* 0x40 */
     0x6994, 0x6D6A, 0x6F0F, 0x7262, 0x72FC, 0x7BED, 0x8001, 0x807E, /* 0x50 */
     0x874B, 0x90CE, 0x516D, 0x9E93, 0x7984, 0x808B, 0x9332, 0x8AD6, /* 0x50 */
     0x502D, 0x548C, 0x8A71, 0x6B6A, 0x8CC4, 0x8107, 0x60D1, 0x67A0, /* 0x60 */
     0x9DF2, 0x4E99, 0x4E98, 0x9C10, 0x8A6B, 0x85C1, 0x8568, 0x6900, /* 0x60 */
-    0x6E7E, 0x7897, 0x8155,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0x5F0C, /* 0x90 */
+    0x6E7E, 0x7897, 0x8155, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5F0C, /* 0x90 */
     0x4E10, 0x4E15, 0x4E2A, 0x4E31, 0x4E36, 0x4E3C, 0x4E3F, 0x4E42, /* 0xA0 */
     0x4E56, 0x4E58, 0x4E82, 0x4E85, 0x8C6B, 0x4E8A, 0x8212, 0x5F0D, /* 0xA0 */
     0x4E8E, 0x4E9E, 0x4E9F, 0x4EA0, 0x4EA2, 0x4EB0, 0x4EB3, 0x4EB6, /* 0xB0 */
@@ -833,15 +833,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_98[] =
     0x5028, 0x5014, 0x502A, 0x5025, 0x5005, 0x4F1C, 0x4FF6, 0x5021, /* 0xE0 */
     0x5029, 0x502C, 0x4FFE, 0x4FEF, 0x5011, 0x5006, 0x5043, 0x5047, /* 0xE0 */
     0x6703, 0x5055, 0x5050, 0x5048, 0x505A, 0x5056, 0x506C, 0x5078, /* 0xF0 */
-    0x5080, 0x509A, 0x5085, 0x50B4, 0x50B2                          /* 0xF0 */
+    0x5080, 0x509A, 0x5085, 0x50B4, 0x50B2							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_99[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x50C9, 0x50CA, 0x50B3, 0x50C2, 0x50D6, 0x50DE, 0x50E5, 0x50ED, /* 0x40 */
     0x50E3, 0x50EE, 0x50F9, 0x50F5, 0x5109, 0x5101, 0x5102, 0x5116, /* 0x40 */
     0x5115, 0x5114, 0x511A, 0x5121, 0x513A, 0x5137, 0x513C, 0x513B, /* 0x50 */
@@ -849,7 +849,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_99[] =
     0x516A, 0x516E, 0x5180, 0x5182, 0x56D8, 0x518C, 0x5189, 0x518F, /* 0x60 */
     0x5191, 0x5193, 0x5195, 0x5196, 0x51A4, 0x51A6, 0x51A2, 0x51A9, /* 0x60 */
     0x51AA, 0x51AB, 0x51B3, 0x51B1, 0x51B2, 0x51B0, 0x51B5, 0x51BD, /* 0x70 */
-    0x51C5, 0x51C9, 0x51DB, 0x51E0, 0x8655, 0x51E9, 0x51ED,      0, /* 0x70 */
+    0x51C5, 0x51C9, 0x51DB, 0x51E0, 0x8655, 0x51E9, 0x51ED, 	 0, /* 0x70 */
     0x51F0, 0x51F5, 0x51FE, 0x5204, 0x520B, 0x5214, 0x520E, 0x5227, /* 0x80 */
     0x522A, 0x522E, 0x5233, 0x5239, 0x524F, 0x5244, 0x524B, 0x524C, /* 0x80 */
     0x525E, 0x5254, 0x526A, 0x5274, 0x5269, 0x5273, 0x527F, 0x527D, /* 0x90 */
@@ -865,15 +865,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_99[] =
     0x542D, 0x543C, 0x542E, 0x5436, 0x5429, 0x541D, 0x544E, 0x548F, /* 0xE0 */
     0x5475, 0x548E, 0x545F, 0x5471, 0x5477, 0x5470, 0x5492, 0x547B, /* 0xE0 */
     0x5480, 0x5476, 0x5484, 0x5490, 0x5486, 0x54C7, 0x54A2, 0x54B8, /* 0xF0 */
-    0x54A5, 0x54AC, 0x54C4, 0x54C8, 0x54A8                          /* 0xF0 */
+    0x54A5, 0x54AC, 0x54C4, 0x54C8, 0x54A8							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_9A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x54AB, 0x54C2, 0x54A4, 0x54BE, 0x54BC, 0x54D8, 0x54E5, 0x54E6, /* 0x40 */
     0x550F, 0x5514, 0x54FD, 0x54EE, 0x54ED, 0x54FA, 0x54E2, 0x5539, /* 0x40 */
     0x5540, 0x5563, 0x554C, 0x552E, 0x555C, 0x5545, 0x5556, 0x5557, /* 0x50 */
@@ -881,7 +881,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_9A[] =
     0x557B, 0x557E, 0x5598, 0x559E, 0x55AE, 0x557C, 0x5583, 0x55A9, /* 0x60 */
     0x5587, 0x55A8, 0x55DA, 0x55C5, 0x55DF, 0x55C4, 0x55DC, 0x55E4, /* 0x60 */
     0x55D4, 0x5614, 0x55F7, 0x5616, 0x55FE, 0x55FD, 0x561B, 0x55F9, /* 0x70 */
-    0x564E, 0x5650, 0x71DF, 0x5634, 0x5636, 0x5632, 0x5638,      0, /* 0x70 */
+    0x564E, 0x5650, 0x71DF, 0x5634, 0x5636, 0x5632, 0x5638, 	 0, /* 0x70 */
     0x566B, 0x5664, 0x562F, 0x566C, 0x566A, 0x5686, 0x5680, 0x568A, /* 0x80 */
     0x56A0, 0x5694, 0x568F, 0x56A5, 0x56AE, 0x56B6, 0x56B4, 0x56C2, /* 0x80 */
     0x56BC, 0x56C1, 0x56C3, 0x56C0, 0x56C8, 0x56CE, 0x56D1, 0x56D3, /* 0x90 */
@@ -897,15 +897,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_9A[] =
     0x58DF, 0x58EF, 0x58FA, 0x58F9, 0x58FB, 0x58FC, 0x58FD, 0x5902, /* 0xE0 */
     0x590A, 0x5910, 0x591B, 0x68A6, 0x5925, 0x592C, 0x592D, 0x5932, /* 0xE0 */
     0x5938, 0x593E, 0x7AD2, 0x5955, 0x5950, 0x594E, 0x595A, 0x5958, /* 0xF0 */
-    0x5962, 0x5960, 0x5967, 0x596C, 0x5969                          /* 0xF0 */
+    0x5962, 0x5960, 0x5967, 0x596C, 0x5969							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_9B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5978, 0x5981, 0x599D, 0x4F5E, 0x4FAB, 0x59A3, 0x59B2, 0x59C6, /* 0x40 */
     0x59E8, 0x59DC, 0x598D, 0x59D9, 0x59DA, 0x5A25, 0x5A1F, 0x5A11, /* 0x40 */
     0x5A1C, 0x5A09, 0x5A1A, 0x5A40, 0x5A6C, 0x5A49, 0x5A35, 0x5A36, /* 0x50 */
@@ -913,7 +913,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_9B[] =
     0x5AE3, 0x5AD7, 0x5AE6, 0x5AE9, 0x5AD6, 0x5AFA, 0x5AFB, 0x5B0C, /* 0x60 */
     0x5B0B, 0x5B16, 0x5B32, 0x5AD0, 0x5B2A, 0x5B36, 0x5B3E, 0x5B43, /* 0x60 */
     0x5B45, 0x5B40, 0x5B51, 0x5B55, 0x5B5A, 0x5B5B, 0x5B65, 0x5B69, /* 0x70 */
-    0x5B70, 0x5B73, 0x5B75, 0x5B78, 0x6588, 0x5B7A, 0x5B80,      0, /* 0x70 */
+    0x5B70, 0x5B73, 0x5B75, 0x5B78, 0x6588, 0x5B7A, 0x5B80, 	 0, /* 0x70 */
     0x5B83, 0x5BA6, 0x5BB8, 0x5BC3, 0x5BC7, 0x5BC9, 0x5BD4, 0x5BD0, /* 0x80 */
     0x5BE4, 0x5BE6, 0x5BE2, 0x5BDE, 0x5BE5, 0x5BEB, 0x5BF0, 0x5BF6, /* 0x80 */
     0x5BF3, 0x5C05, 0x5C07, 0x5C08, 0x5C0D, 0x5C13, 0x5C20, 0x5C22, /* 0x90 */
@@ -929,15 +929,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_9B[] =
     0x5DF5, 0x5E0B, 0x5E1A, 0x5E19, 0x5E11, 0x5E1B, 0x5E36, 0x5E37, /* 0xE0 */
     0x5E44, 0x5E43, 0x5E40, 0x5E4E, 0x5E57, 0x5E54, 0x5E5F, 0x5E62, /* 0xE0 */
     0x5E64, 0x5E47, 0x5E75, 0x5E76, 0x5E7A, 0x9EBC, 0x5E7F, 0x5EA0, /* 0xF0 */
-    0x5EC1, 0x5EC2, 0x5EC8, 0x5ED0, 0x5ECF                          /* 0xF0 */
+    0x5EC1, 0x5EC2, 0x5EC8, 0x5ED0, 0x5ECF							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_9C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5ED6, 0x5EE3, 0x5EDD, 0x5EDA, 0x5EDB, 0x5EE2, 0x5EE1, 0x5EE8, /* 0x40 */
     0x5EE9, 0x5EEC, 0x5EF1, 0x5EF3, 0x5EF0, 0x5EF4, 0x5EF8, 0x5EFE, /* 0x40 */
     0x5F03, 0x5F09, 0x5F5D, 0x5F5C, 0x5F0B, 0x5F11, 0x5F16, 0x5F29, /* 0x50 */
@@ -945,7 +945,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_9C[] =
     0x5F56, 0x5F57, 0x5F59, 0x5F61, 0x5F6D, 0x5F73, 0x5F77, 0x5F83, /* 0x60 */
     0x5F82, 0x5F7F, 0x5F8A, 0x5F88, 0x5F91, 0x5F87, 0x5F9E, 0x5F99, /* 0x60 */
     0x5F98, 0x5FA0, 0x5FA8, 0x5FAD, 0x5FBC, 0x5FD6, 0x5FFB, 0x5FE4, /* 0x70 */
-    0x5FF8, 0x5FF1, 0x5FDD, 0x60B3, 0x5FFF, 0x6021, 0x6060,      0, /* 0x70 */
+    0x5FF8, 0x5FF1, 0x5FDD, 0x60B3, 0x5FFF, 0x6021, 0x6060, 	 0, /* 0x70 */
     0x6019, 0x6010, 0x6029, 0x600E, 0x6031, 0x601B, 0x6015, 0x602B, /* 0x80 */
     0x6026, 0x600F, 0x603A, 0x605A, 0x6041, 0x606A, 0x6077, 0x605F, /* 0x80 */
     0x604A, 0x6046, 0x604D, 0x6063, 0x6043, 0x6064, 0x6042, 0x606C, /* 0x90 */
@@ -961,15 +961,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_9C[] =
     0x61AB, 0x61AE, 0x61CC, 0x61CA, 0x61C9, 0x61F7, 0x61C8, 0x61C3, /* 0xE0 */
     0x61C6, 0x61BA, 0x61CB, 0x7F79, 0x61CD, 0x61E6, 0x61E3, 0x61F6, /* 0xE0 */
     0x61FA, 0x61F4, 0x61FF, 0x61FD, 0x61FC, 0x61FE, 0x6200, 0x6208, /* 0xF0 */
-    0x6209, 0x620D, 0x620C, 0x6214, 0x621B                          /* 0xF0 */
+    0x6209, 0x620D, 0x620C, 0x6214, 0x621B							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_9D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x621E, 0x6221, 0x622A, 0x622E, 0x6230, 0x6232, 0x6233, 0x6241, /* 0x40 */
     0x624E, 0x625E, 0x6263, 0x625B, 0x6260, 0x6268, 0x627C, 0x6282, /* 0x40 */
     0x6289, 0x627E, 0x6292, 0x6293, 0x6296, 0x62D4, 0x6283, 0x6294, /* 0x50 */
@@ -977,7 +977,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_9D[] =
     0x62DC, 0x62CC, 0x62CA, 0x62C2, 0x62C7, 0x629B, 0x62C9, 0x630C, /* 0x60 */
     0x62EE, 0x62F1, 0x6327, 0x6302, 0x6308, 0x62EF, 0x62F5, 0x6350, /* 0x60 */
     0x633E, 0x634D, 0x641C, 0x634F, 0x6396, 0x638E, 0x6380, 0x63AB, /* 0x70 */
-    0x6376, 0x63A3, 0x638F, 0x6389, 0x639F, 0x63B5, 0x636B,      0, /* 0x70 */
+    0x6376, 0x63A3, 0x638F, 0x6389, 0x639F, 0x63B5, 0x636B, 	 0, /* 0x70 */
     0x6369, 0x63BE, 0x63E9, 0x63C0, 0x63C6, 0x63E3, 0x63C9, 0x63D2, /* 0x80 */
     0x63F6, 0x63C4, 0x6416, 0x6434, 0x6406, 0x6413, 0x6426, 0x6436, /* 0x80 */
     0x651D, 0x6417, 0x6428, 0x640F, 0x6467, 0x646F, 0x6476, 0x644E, /* 0x90 */
@@ -993,15 +993,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_9D[] =
     0x6773, 0x6635, 0x6636, 0x6634, 0x661C, 0x664F, 0x6644, 0x6649, /* 0xE0 */
     0x6641, 0x665E, 0x665D, 0x6664, 0x6667, 0x6668, 0x665F, 0x6662, /* 0xE0 */
     0x6670, 0x6683, 0x6688, 0x668E, 0x6689, 0x6684, 0x6698, 0x669D, /* 0xF0 */
-    0x66C1, 0x66B9, 0x66C9, 0x66BE, 0x66BC                          /* 0xF0 */
+    0x66C1, 0x66B9, 0x66C9, 0x66BE, 0x66BC							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_9E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x66C4, 0x66B8, 0x66D6, 0x66DA, 0x66E0, 0x663F, 0x66E6, 0x66E9, /* 0x40 */
     0x66F0, 0x66F5, 0x66F7, 0x670F, 0x6716, 0x671E, 0x6726, 0x6727, /* 0x40 */
     0x9738, 0x672E, 0x673F, 0x6736, 0x6741, 0x6738, 0x6737, 0x6746, /* 0x50 */
@@ -1009,7 +1009,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_9E[] =
     0x677C, 0x676A, 0x678C, 0x678B, 0x67A6, 0x67A1, 0x6785, 0x67B7, /* 0x60 */
     0x67EF, 0x67B4, 0x67EC, 0x67B3, 0x67E9, 0x67B8, 0x67E4, 0x67DE, /* 0x60 */
     0x67DD, 0x67E2, 0x67EE, 0x67B9, 0x67CE, 0x67C6, 0x67E7, 0x6A9C, /* 0x70 */
-    0x681E, 0x6846, 0x6829, 0x6840, 0x684D, 0x6832, 0x684E,      0, /* 0x70 */
+    0x681E, 0x6846, 0x6829, 0x6840, 0x684D, 0x6832, 0x684E, 	 0, /* 0x70 */
     0x68B3, 0x682B, 0x6859, 0x6863, 0x6877, 0x687F, 0x689F, 0x688F, /* 0x80 */
     0x68AD, 0x6894, 0x689D, 0x689B, 0x6883, 0x6AAE, 0x68B9, 0x6874, /* 0x80 */
     0x68B5, 0x68A0, 0x68BA, 0x690F, 0x688D, 0x687E, 0x6901, 0x68CA, /* 0x90 */
@@ -1025,15 +1025,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_9E[] =
     0x6A05, 0x69B1, 0x6A1E, 0x69ED, 0x6A14, 0x69EB, 0x6A0A, 0x6A12, /* 0xE0 */
     0x6AC1, 0x6A23, 0x6A13, 0x6A44, 0x6A0C, 0x6A72, 0x6A36, 0x6A78, /* 0xE0 */
     0x6A47, 0x6A62, 0x6A59, 0x6A66, 0x6A48, 0x6A38, 0x6A22, 0x6A90, /* 0xF0 */
-    0x6A8D, 0x6AA0, 0x6A84, 0x6AA2, 0x6AA3                          /* 0xF0 */
+    0x6A8D, 0x6AA0, 0x6A84, 0x6AA2, 0x6AA3							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_9F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6A97, 0x8617, 0x6ABB, 0x6AC3, 0x6AC2, 0x6AB8, 0x6AB3, 0x6AAC, /* 0x40 */
     0x6ADE, 0x6AD1, 0x6ADF, 0x6AAA, 0x6ADA, 0x6AEA, 0x6AFB, 0x6B05, /* 0x40 */
     0x8616, 0x6AFA, 0x6B12, 0x6B16, 0x9B31, 0x6B1F, 0x6B38, 0x6B37, /* 0x50 */
@@ -1041,7 +1041,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_9F[] =
     0x6B54, 0x6B5B, 0x6B5F, 0x6B61, 0x6B78, 0x6B79, 0x6B7F, 0x6B80, /* 0x60 */
     0x6B84, 0x6B83, 0x6B8D, 0x6B98, 0x6B95, 0x6B9E, 0x6BA4, 0x6BAA, /* 0x60 */
     0x6BAB, 0x6BAF, 0x6BB2, 0x6BB1, 0x6BB3, 0x6BB7, 0x6BBC, 0x6BC6, /* 0x70 */
-    0x6BCB, 0x6BD3, 0x6BDF, 0x6BEC, 0x6BEB, 0x6BF3, 0x6BEF,      0, /* 0x70 */
+    0x6BCB, 0x6BD3, 0x6BDF, 0x6BEC, 0x6BEB, 0x6BF3, 0x6BEF, 	 0, /* 0x70 */
     0x9EBE, 0x6C08, 0x6C13, 0x6C14, 0x6C1B, 0x6C24, 0x6C23, 0x6C5E, /* 0x80 */
     0x6C55, 0x6C62, 0x6C6A, 0x6C82, 0x6C8D, 0x6C9A, 0x6C81, 0x6C9B, /* 0x80 */
     0x6C7E, 0x6C68, 0x6C73, 0x6C92, 0x6C90, 0x6CC4, 0x6CF1, 0x6CD3, /* 0x90 */
@@ -1057,15 +1057,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_9F[] =
     0x6E38, 0x6E82, 0x6EAA, 0x6E98, 0x6EC9, 0x6EB7, 0x6ED3, 0x6EBD, /* 0xE0 */
     0x6EAF, 0x6EC4, 0x6EB2, 0x6ED4, 0x6ED5, 0x6E8F, 0x6EA5, 0x6EC2, /* 0xE0 */
     0x6E9F, 0x6F41, 0x6F11, 0x704C, 0x6EEC, 0x6EF8, 0x6EFE, 0x6F3F, /* 0xF0 */
-    0x6EF2, 0x6F31, 0x6EEF, 0x6F32, 0x6ECC                          /* 0xF0 */
+    0x6EF2, 0x6F31, 0x6EEF, 0x6F32, 0x6ECC							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_E0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6F3E, 0x6F13, 0x6EF7, 0x6F86, 0x6F7A, 0x6F78, 0x6F81, 0x6F80, /* 0x40 */
     0x6F6F, 0x6F5B, 0x6FF3, 0x6F6D, 0x6F82, 0x6F7C, 0x6F58, 0x6F8E, /* 0x40 */
     0x6F91, 0x6FC2, 0x6F66, 0x6FB3, 0x6FA3, 0x6FA1, 0x6FA4, 0x6FB9, /* 0x50 */
@@ -1073,7 +1073,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E0[] =
     0x6FEE, 0x6FDB, 0x7009, 0x700B, 0x6FFA, 0x7011, 0x7001, 0x700F, /* 0x60 */
     0x6FFE, 0x701B, 0x701A, 0x6F74, 0x701D, 0x7018, 0x701F, 0x7030, /* 0x60 */
     0x703E, 0x7032, 0x7051, 0x7063, 0x7099, 0x7092, 0x70AF, 0x70F1, /* 0x70 */
-    0x70AC, 0x70B8, 0x70B3, 0x70AE, 0x70DF, 0x70CB, 0x70DD,      0, /* 0x70 */
+    0x70AC, 0x70B8, 0x70B3, 0x70AE, 0x70DF, 0x70CB, 0x70DD, 	 0, /* 0x70 */
     0x70D9, 0x7109, 0x70FD, 0x711C, 0x7119, 0x7165, 0x7155, 0x7188, /* 0x80 */
     0x7166, 0x7162, 0x714C, 0x7156, 0x716C, 0x718F, 0x71FB, 0x7184, /* 0x80 */
     0x7195, 0x71A8, 0x71AC, 0x71D7, 0x71B9, 0x71BE, 0x71D2, 0x71C9, /* 0x90 */
@@ -1089,15 +1089,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E0[] =
     0x73E5, 0x73EE, 0x73DE, 0x74A2, 0x7405, 0x746F, 0x7425, 0x73F8, /* 0xE0 */
     0x7432, 0x743A, 0x7455, 0x743F, 0x745F, 0x7459, 0x7441, 0x745C, /* 0xE0 */
     0x7469, 0x7470, 0x7463, 0x746A, 0x7476, 0x747E, 0x748B, 0x749E, /* 0xF0 */
-    0x74A7, 0x74CA, 0x74CF, 0x74D4, 0x73F1                          /* 0xF0 */
+    0x74A7, 0x74CA, 0x74CF, 0x74D4, 0x73F1							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_E1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x74E0, 0x74E3, 0x74E7, 0x74E9, 0x74EE, 0x74F2, 0x74F0, 0x74F1, /* 0x40 */
     0x74F8, 0x74F7, 0x7504, 0x7503, 0x7505, 0x750C, 0x750E, 0x750D, /* 0x40 */
     0x7515, 0x7513, 0x751E, 0x7526, 0x752C, 0x753C, 0x7544, 0x754D, /* 0x50 */
@@ -1105,7 +1105,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E1[] =
     0x756B, 0x756D, 0x7578, 0x7576, 0x7586, 0x7587, 0x7574, 0x758A, /* 0x60 */
     0x7589, 0x7582, 0x7594, 0x759A, 0x759D, 0x75A5, 0x75A3, 0x75C2, /* 0x60 */
     0x75B3, 0x75C3, 0x75B5, 0x75BD, 0x75B8, 0x75BC, 0x75B1, 0x75CD, /* 0x70 */
-    0x75CA, 0x75D2, 0x75D9, 0x75E3, 0x75DE, 0x75FE, 0x75FF,      0, /* 0x70 */
+    0x75CA, 0x75D2, 0x75D9, 0x75E3, 0x75DE, 0x75FE, 0x75FF, 	 0, /* 0x70 */
     0x75FC, 0x7601, 0x75F0, 0x75FA, 0x75F2, 0x75F3, 0x760B, 0x760D, /* 0x80 */
     0x7609, 0x761F, 0x7627, 0x7620, 0x7621, 0x7622, 0x7624, 0x7634, /* 0x80 */
     0x7630, 0x763B, 0x7647, 0x7648, 0x7646, 0x765C, 0x7658, 0x7661, /* 0x90 */
@@ -1121,15 +1121,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E1[] =
     0x77DC, 0x77E3, 0x77EE, 0x77FC, 0x780C, 0x7812, 0x7926, 0x7820, /* 0xE0 */
     0x792A, 0x7845, 0x788E, 0x7874, 0x7886, 0x787C, 0x789A, 0x788C, /* 0xE0 */
     0x78A3, 0x78B5, 0x78AA, 0x78AF, 0x78D1, 0x78C6, 0x78CB, 0x78D4, /* 0xF0 */
-    0x78BE, 0x78BC, 0x78C5, 0x78CA, 0x78EC                          /* 0xF0 */
+    0x78BE, 0x78BC, 0x78C5, 0x78CA, 0x78EC							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_E2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x78E7, 0x78DA, 0x78FD, 0x78F4, 0x7907, 0x7912, 0x7911, 0x7919, /* 0x40 */
     0x792C, 0x792B, 0x7940, 0x7960, 0x7957, 0x795F, 0x795A, 0x7955, /* 0x40 */
     0x7953, 0x797A, 0x797F, 0x798A, 0x799D, 0x79A7, 0x9F4B, 0x79AA, /* 0x50 */
@@ -1137,7 +1137,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E2[] =
     0x79E1, 0x79E3, 0x7A08, 0x7A0D, 0x7A18, 0x7A19, 0x7A20, 0x7A1F, /* 0x60 */
     0x7980, 0x7A31, 0x7A3B, 0x7A3E, 0x7A37, 0x7A43, 0x7A57, 0x7A49, /* 0x60 */
     0x7A61, 0x7A62, 0x7A69, 0x9F9D, 0x7A70, 0x7A79, 0x7A7D, 0x7A88, /* 0x70 */
-    0x7A97, 0x7A95, 0x7A98, 0x7A96, 0x7AA9, 0x7AC8, 0x7AB0,      0, /* 0x70 */
+    0x7A97, 0x7A95, 0x7A98, 0x7A96, 0x7AA9, 0x7AC8, 0x7AB0, 	 0, /* 0x70 */
     0x7AB6, 0x7AC5, 0x7AC4, 0x7ABF, 0x9083, 0x7AC7, 0x7ACA, 0x7ACD, /* 0x80 */
     0x7ACF, 0x7AD5, 0x7AD3, 0x7AD9, 0x7ADA, 0x7ADD, 0x7AE1, 0x7AE2, /* 0x80 */
     0x7AE6, 0x7AED, 0x7AF0, 0x7B02, 0x7B0F, 0x7B0A, 0x7B06, 0x7B33, /* 0x90 */
@@ -1153,15 +1153,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E2[] =
     0x7C75, 0x7C83, 0x7C90, 0x7CA4, 0x7CAD, 0x7CA2, 0x7CAB, 0x7CA1, /* 0xE0 */
     0x7CA8, 0x7CB3, 0x7CB2, 0x7CB1, 0x7CAE, 0x7CB9, 0x7CBD, 0x7CC0, /* 0xE0 */
     0x7CC5, 0x7CC2, 0x7CD8, 0x7CD2, 0x7CDC, 0x7CE2, 0x9B3B, 0x7CEF, /* 0xF0 */
-    0x7CF2, 0x7CF4, 0x7CF6, 0x7CFA, 0x7D06                          /* 0xF0 */
+    0x7CF2, 0x7CF4, 0x7CF6, 0x7CFA, 0x7D06							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_E3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7D02, 0x7D1C, 0x7D15, 0x7D0A, 0x7D45, 0x7D4B, 0x7D2E, 0x7D32, /* 0x40 */
     0x7D3F, 0x7D35, 0x7D46, 0x7D73, 0x7D56, 0x7D4E, 0x7D72, 0x7D68, /* 0x40 */
     0x7D6E, 0x7D4F, 0x7D63, 0x7D93, 0x7D89, 0x7D5B, 0x7D8F, 0x7D7D, /* 0x50 */
@@ -1169,7 +1169,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E3[] =
     0x7E3D, 0x7DA2, 0x7DAF, 0x7DDC, 0x7DB8, 0x7D9F, 0x7DB0, 0x7DD8, /* 0x60 */
     0x7DDD, 0x7DE4, 0x7DDE, 0x7DFB, 0x7DF2, 0x7DE1, 0x7E05, 0x7E0A, /* 0x60 */
     0x7E23, 0x7E21, 0x7E12, 0x7E31, 0x7E1F, 0x7E09, 0x7E0B, 0x7E22, /* 0x70 */
-    0x7E46, 0x7E66, 0x7E3B, 0x7E35, 0x7E39, 0x7E43, 0x7E37,      0, /* 0x70 */
+    0x7E46, 0x7E66, 0x7E3B, 0x7E35, 0x7E39, 0x7E43, 0x7E37, 	 0, /* 0x70 */
     0x7E32, 0x7E3A, 0x7E67, 0x7E5D, 0x7E56, 0x7E5E, 0x7E59, 0x7E5A, /* 0x80 */
     0x7E79, 0x7E6A, 0x7E69, 0x7E7C, 0x7E7B, 0x7E83, 0x7DD5, 0x7E7D, /* 0x80 */
     0x8FAE, 0x7E7F, 0x7E88, 0x7E89, 0x7E8C, 0x7E92, 0x7E90, 0x7E93, /* 0x90 */
@@ -1185,15 +1185,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E3[] =
     0x8070, 0x8076, 0x8079, 0x807D, 0x807F, 0x8084, 0x8086, 0x8085, /* 0xE0 */
     0x809B, 0x8093, 0x809A, 0x80AD, 0x5190, 0x80AC, 0x80DB, 0x80E5, /* 0xE0 */
     0x80D9, 0x80DD, 0x80C4, 0x80DA, 0x80D6, 0x8109, 0x80EF, 0x80F1, /* 0xF0 */
-    0x811B, 0x8129, 0x8123, 0x812F, 0x814B                          /* 0xF0 */
+    0x811B, 0x8129, 0x8123, 0x812F, 0x814B							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_E4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x968B, 0x8146, 0x813E, 0x8153, 0x8151, 0x80FC, 0x8171, 0x816E, /* 0x40 */
     0x8165, 0x8166, 0x8174, 0x8183, 0x8188, 0x818A, 0x8180, 0x8182, /* 0x40 */
     0x81A0, 0x8195, 0x81A4, 0x81A3, 0x815F, 0x8193, 0x81A9, 0x81B0, /* 0x50 */
@@ -1201,7 +1201,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E4[] =
     0x81CD, 0x81D1, 0x81D9, 0x81D8, 0x81C8, 0x81DA, 0x81DF, 0x81E0, /* 0x60 */
     0x81E7, 0x81FA, 0x81FB, 0x81FE, 0x8201, 0x8202, 0x8205, 0x8207, /* 0x60 */
     0x820A, 0x820D, 0x8210, 0x8216, 0x8229, 0x822B, 0x8238, 0x8233, /* 0x70 */
-    0x8240, 0x8259, 0x8258, 0x825D, 0x825A, 0x825F, 0x8264,      0, /* 0x70 */
+    0x8240, 0x8259, 0x8258, 0x825D, 0x825A, 0x825F, 0x8264, 	 0, /* 0x70 */
     0x8262, 0x8268, 0x826A, 0x826B, 0x822E, 0x8271, 0x8277, 0x8278, /* 0x80 */
     0x827E, 0x828D, 0x8292, 0x82AB, 0x829F, 0x82BB, 0x82AC, 0x82E1, /* 0x80 */
     0x82E3, 0x82DF, 0x82D2, 0x82F4, 0x82F3, 0x82FA, 0x8393, 0x8303, /* 0x90 */
@@ -1217,15 +1217,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E4[] =
     0x8435, 0x84CA, 0x8462, 0x84B9, 0x84BF, 0x849F, 0x84D9, 0x84CD, /* 0xE0 */
     0x84BB, 0x84DA, 0x84D0, 0x84C1, 0x84C6, 0x84D6, 0x84A1, 0x8521, /* 0xE0 */
     0x84FF, 0x84F4, 0x8517, 0x8518, 0x852C, 0x851F, 0x8515, 0x8514, /* 0xF0 */
-    0x84FC, 0x8540, 0x8563, 0x8558, 0x8548                          /* 0xF0 */
+    0x84FC, 0x8540, 0x8563, 0x8558, 0x8548							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_E5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8541, 0x8602, 0x854B, 0x8555, 0x8580, 0x85A4, 0x8588, 0x8591, /* 0x40 */
     0x858A, 0x85A8, 0x856D, 0x8594, 0x859B, 0x85EA, 0x8587, 0x859C, /* 0x40 */
     0x8577, 0x857E, 0x8590, 0x85C9, 0x85BA, 0x85CF, 0x85B9, 0x85D0, /* 0x50 */
@@ -1233,7 +1233,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E5[] =
     0x85FE, 0x85FA, 0x8606, 0x8622, 0x861A, 0x8630, 0x863F, 0x864D, /* 0x60 */
     0x4E55, 0x8654, 0x865F, 0x8667, 0x8671, 0x8693, 0x86A3, 0x86A9, /* 0x60 */
     0x86AA, 0x868B, 0x868C, 0x86B6, 0x86AF, 0x86C4, 0x86C6, 0x86B0, /* 0x70 */
-    0x86C9, 0x8823, 0x86AB, 0x86D4, 0x86DE, 0x86E9, 0x86EC,      0, /* 0x70 */
+    0x86C9, 0x8823, 0x86AB, 0x86D4, 0x86DE, 0x86E9, 0x86EC, 	 0, /* 0x70 */
     0x86DF, 0x86DB, 0x86EF, 0x8712, 0x8706, 0x8708, 0x8700, 0x8703, /* 0x80 */
     0x86FB, 0x8711, 0x8709, 0x870D, 0x86F9, 0x870A, 0x8734, 0x873F, /* 0x80 */
     0x8737, 0x873B, 0x8725, 0x8729, 0x871A, 0x8760, 0x875F, 0x8778, /* 0x90 */
@@ -1249,15 +1249,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E5[] =
     0x88C4, 0x88D4, 0x88D8, 0x88D9, 0x88DD, 0x88F9, 0x8902, 0x88FC, /* 0xE0 */
     0x88F4, 0x88E8, 0x88F2, 0x8904, 0x890C, 0x890A, 0x8913, 0x8943, /* 0xE0 */
     0x891E, 0x8925, 0x892A, 0x892B, 0x8941, 0x8944, 0x893B, 0x8936, /* 0xF0 */
-    0x8938, 0x894C, 0x891D, 0x8960, 0x895E                          /* 0xF0 */
+    0x8938, 0x894C, 0x891D, 0x8960, 0x895E							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_E6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8966, 0x8964, 0x896D, 0x896A, 0x896F, 0x8974, 0x8977, 0x897E, /* 0x40 */
     0x8983, 0x8988, 0x898A, 0x8993, 0x8998, 0x89A1, 0x89A9, 0x89A6, /* 0x40 */
     0x89AC, 0x89AF, 0x89B2, 0x89BA, 0x89BD, 0x89BF, 0x89C0, 0x89DA, /* 0x50 */
@@ -1265,7 +1265,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E6[] =
     0x8A0C, 0x8A1B, 0x8A1D, 0x8A25, 0x8A36, 0x8A41, 0x8A5B, 0x8A52, /* 0x60 */
     0x8A46, 0x8A48, 0x8A7C, 0x8A6D, 0x8A6C, 0x8A62, 0x8A85, 0x8A82, /* 0x60 */
     0x8A84, 0x8AA8, 0x8AA1, 0x8A91, 0x8AA5, 0x8AA6, 0x8A9A, 0x8AA3, /* 0x70 */
-    0x8AC4, 0x8ACD, 0x8AC2, 0x8ADA, 0x8AEB, 0x8AF3, 0x8AE7,      0, /* 0x70 */
+    0x8AC4, 0x8ACD, 0x8AC2, 0x8ADA, 0x8AEB, 0x8AF3, 0x8AE7, 	 0, /* 0x70 */
     0x8AE4, 0x8AF1, 0x8B14, 0x8AE0, 0x8AE2, 0x8AF7, 0x8ADE, 0x8ADB, /* 0x80 */
     0x8B0C, 0x8B07, 0x8B1A, 0x8AE1, 0x8B16, 0x8B10, 0x8B17, 0x8B20, /* 0x80 */
     0x8B33, 0x97AB, 0x8B26, 0x8B2B, 0x8B3E, 0x8B28, 0x8B41, 0x8B4C, /* 0x90 */
@@ -1281,15 +1281,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E6[] =
     0x8D73, 0x8D81, 0x8D99, 0x8DC2, 0x8DBE, 0x8DBA, 0x8DCF, 0x8DDA, /* 0xE0 */
     0x8DD6, 0x8DCC, 0x8DDB, 0x8DCB, 0x8DEA, 0x8DEB, 0x8DDF, 0x8DE3, /* 0xE0 */
     0x8DFC, 0x8E08, 0x8E09, 0x8DFF, 0x8E1D, 0x8E1E, 0x8E10, 0x8E1F, /* 0xF0 */
-    0x8E42, 0x8E35, 0x8E30, 0x8E34, 0x8E4A                          /* 0xF0 */
+    0x8E42, 0x8E35, 0x8E30, 0x8E34, 0x8E4A							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_E7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8E47, 0x8E49, 0x8E4C, 0x8E50, 0x8E48, 0x8E59, 0x8E64, 0x8E60, /* 0x40 */
     0x8E2A, 0x8E63, 0x8E55, 0x8E76, 0x8E72, 0x8E7C, 0x8E81, 0x8E87, /* 0x40 */
     0x8E85, 0x8E84, 0x8E8B, 0x8E8A, 0x8E93, 0x8E91, 0x8E94, 0x8E99, /* 0x50 */
@@ -1297,7 +1297,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E7[] =
     0x8EC8, 0x8ECB, 0x8EDB, 0x8EE3, 0x8EFC, 0x8EFB, 0x8EEB, 0x8EFE, /* 0x60 */
     0x8F0A, 0x8F05, 0x8F15, 0x8F12, 0x8F19, 0x8F13, 0x8F1C, 0x8F1F, /* 0x60 */
     0x8F1B, 0x8F0C, 0x8F26, 0x8F33, 0x8F3B, 0x8F39, 0x8F45, 0x8F42, /* 0x70 */
-    0x8F3E, 0x8F4C, 0x8F49, 0x8F46, 0x8F4E, 0x8F57, 0x8F5C,      0, /* 0x70 */
+    0x8F3E, 0x8F4C, 0x8F49, 0x8F46, 0x8F4E, 0x8F57, 0x8F5C, 	 0, /* 0x70 */
     0x8F62, 0x8F63, 0x8F64, 0x8F9C, 0x8F9F, 0x8FA3, 0x8FAD, 0x8FAF, /* 0x80 */
     0x8FB7, 0x8FDA, 0x8FE5, 0x8FE2, 0x8FEA, 0x8FEF, 0x9087, 0x8FF4, /* 0x80 */
     0x9005, 0x8FF9, 0x8FFA, 0x9011, 0x9015, 0x9021, 0x900D, 0x901E, /* 0x90 */
@@ -1313,15 +1313,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E7[] =
     0x921E, 0x91FF, 0x9214, 0x922C, 0x9215, 0x9211, 0x925E, 0x9257, /* 0xE0 */
     0x9245, 0x9249, 0x9264, 0x9248, 0x9295, 0x923F, 0x924B, 0x9250, /* 0xE0 */
     0x929C, 0x9296, 0x9293, 0x929B, 0x925A, 0x92CF, 0x92B9, 0x92B7, /* 0xF0 */
-    0x92E9, 0x930F, 0x92FA, 0x9344, 0x932E                          /* 0xF0 */
+    0x92E9, 0x930F, 0x92FA, 0x9344, 0x932E							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_E8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9319, 0x9322, 0x931A, 0x9323, 0x933A, 0x9335, 0x933B, 0x935C, /* 0x40 */
     0x9360, 0x937C, 0x936E, 0x9356, 0x93B0, 0x93AC, 0x93AD, 0x9394, /* 0x40 */
     0x93B9, 0x93D6, 0x93D7, 0x93E8, 0x93E5, 0x93D8, 0x93C3, 0x93DD, /* 0x50 */
@@ -1329,7 +1329,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E8[] =
     0x9410, 0x9436, 0x942B, 0x9435, 0x9421, 0x943A, 0x9441, 0x9452, /* 0x60 */
     0x9444, 0x945B, 0x9460, 0x9462, 0x945E, 0x946A, 0x9229, 0x9470, /* 0x60 */
     0x9475, 0x9477, 0x947D, 0x945A, 0x947C, 0x947E, 0x9481, 0x947F, /* 0x70 */
-    0x9582, 0x9587, 0x958A, 0x9594, 0x9596, 0x9598, 0x9599,      0, /* 0x70 */
+    0x9582, 0x9587, 0x958A, 0x9594, 0x9596, 0x9598, 0x9599, 	 0, /* 0x70 */
     0x95A0, 0x95A8, 0x95A7, 0x95AD, 0x95BC, 0x95BB, 0x95B9, 0x95BE, /* 0x80 */
     0x95CA, 0x6FF6, 0x95C3, 0x95CD, 0x95CC, 0x95D5, 0x95D4, 0x95D6, /* 0x80 */
     0x95DC, 0x95E1, 0x95E5, 0x95E2, 0x9621, 0x9628, 0x962E, 0x962F, /* 0x90 */
@@ -1345,15 +1345,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E8[] =
     0x97A8, 0x97A6, 0x97A3, 0x97B3, 0x97B4, 0x97C3, 0x97C6, 0x97C8, /* 0xE0 */
     0x97CB, 0x97DC, 0x97ED, 0x9F4F, 0x97F2, 0x7ADF, 0x97F6, 0x97F5, /* 0xE0 */
     0x980F, 0x980C, 0x9838, 0x9824, 0x9821, 0x9837, 0x983D, 0x9846, /* 0xF0 */
-    0x984F, 0x984B, 0x986B, 0x986F, 0x9870                          /* 0xF0 */
+    0x984F, 0x984B, 0x986B, 0x986F, 0x9870							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_E9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9871, 0x9874, 0x9873, 0x98AA, 0x98AF, 0x98B1, 0x98B6, 0x98C4, /* 0x40 */
     0x98C3, 0x98C6, 0x98E9, 0x98EB, 0x9903, 0x9909, 0x9912, 0x9914, /* 0x40 */
     0x9918, 0x9921, 0x991D, 0x991E, 0x9924, 0x9920, 0x992C, 0x992E, /* 0x50 */
@@ -1361,7 +1361,7 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E9[] =
     0x9952, 0x994C, 0x9955, 0x9997, 0x9998, 0x99A5, 0x99AD, 0x99AE, /* 0x60 */
     0x99BC, 0x99DF, 0x99DB, 0x99DD, 0x99D8, 0x99D1, 0x99ED, 0x99EE, /* 0x60 */
     0x99F1, 0x99F2, 0x99FB, 0x99F8, 0x9A01, 0x9A0F, 0x9A05, 0x99E2, /* 0x70 */
-    0x9A19, 0x9A2B, 0x9A37, 0x9A45, 0x9A42, 0x9A40, 0x9A43,      0, /* 0x70 */
+    0x9A19, 0x9A2B, 0x9A37, 0x9A45, 0x9A42, 0x9A40, 0x9A43, 	 0, /* 0x70 */
     0x9A3E, 0x9A55, 0x9A4D, 0x9A5B, 0x9A57, 0x9A5F, 0x9A62, 0x9A65, /* 0x80 */
     0x9A64, 0x9A69, 0x9A6B, 0x9A6A, 0x9AAD, 0x9AB0, 0x9ABC, 0x9AC0, /* 0x80 */
     0x9ACF, 0x9AD1, 0x9AD3, 0x9AD4, 0x9ADE, 0x9ADF, 0x9AE2, 0x9AE3, /* 0x90 */
@@ -1377,15 +1377,15 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_E9[] =
     0x9C32, 0x9C46, 0x9C3E, 0x9C5A, 0x9C60, 0x9C67, 0x9C76, 0x9C78, /* 0xE0 */
     0x9CE7, 0x9CEC, 0x9CF0, 0x9D09, 0x9D08, 0x9CEB, 0x9D03, 0x9D06, /* 0xE0 */
     0x9D2A, 0x9D26, 0x9DAF, 0x9D23, 0x9D1F, 0x9D44, 0x9D15, 0x9D12, /* 0xF0 */
-    0x9D41, 0x9D3F, 0x9D3E, 0x9D46, 0x9D48                          /* 0xF0 */
+    0x9D41, 0x9D3F, 0x9D3E, 0x9D46, 0x9D48							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_SJIS_EA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9D5D, 0x9D5E, 0x9D64, 0x9D51, 0x9D50, 0x9D59, 0x9D72, 0x9D89, /* 0x40 */
     0x9D87, 0x9DAB, 0x9D6F, 0x9D7A, 0x9D9A, 0x9DA4, 0x9DA9, 0x9DB2, /* 0x40 */
     0x9DC4, 0x9DC1, 0x9DBB, 0x9DB8, 0x9DBA, 0x9DC6, 0x9DCF, 0x9DC2, /* 0x50 */
@@ -1393,12 +1393,12 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_EA[] =
     0x9E1B, 0x9E1E, 0x9E75, 0x9E79, 0x9E7D, 0x9E81, 0x9E88, 0x9E8B, /* 0x60 */
     0x9E8C, 0x9E92, 0x9E95, 0x9E91, 0x9E9D, 0x9EA5, 0x9EA9, 0x9EB8, /* 0x60 */
     0x9EAA, 0x9EAD, 0x9761, 0x9ECC, 0x9ECE, 0x9ECF, 0x9ED0, 0x9ED4, /* 0x70 */
-    0x9EDC, 0x9EDE, 0x9EDD, 0x9EE0, 0x9EE5, 0x9EE8, 0x9EEF,      0, /* 0x70 */
+    0x9EDC, 0x9EDE, 0x9EDD, 0x9EE0, 0x9EE5, 0x9EE8, 0x9EEF, 	 0, /* 0x70 */
     0x9EF4, 0x9EF6, 0x9EF7, 0x9EF9, 0x9EFB, 0x9EFC, 0x9EFD, 0x9F07, /* 0x80 */
     0x9F08, 0x76B7, 0x9F15, 0x9F21, 0x9F2C, 0x9F3E, 0x9F4A, 0x9F52, /* 0x80 */
     0x9F54, 0x9F63, 0x9F5F, 0x9F60, 0x9F61, 0x9F66, 0x9F67, 0x9F6C, /* 0x90 */
     0x9F6A, 0x9F77, 0x9F72, 0x9F76, 0x9F95, 0x9F9C, 0x9FA0, 0x582F, /* 0x90 */
-    0x69C7, 0x9059, 0x7464, 0x51DC, 0x7199                          /* 0xA0 */
+    0x69C7, 0x9059, 0x7464, 0x51DC, 0x7199							/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -1406,22 +1406,22 @@ static sal_uInt16 const aImplDBCSToUniTab_SJIS_EA[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_APPLEJAPANESE_EB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xFE33,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xFE31,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xFE30,      0,      0,      0, /* 0x60 */
-         0, 0xFE35, 0xFE36, 0xFE39, 0xFE3A,      0,      0, 0xFE37, /* 0x60 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xFE33, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xFE31, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xFE30, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xFE35, 0xFE36, 0xFE39, 0xFE3A, 	 0, 	 0, 0xFE37, /* 0x60 */
     0xFE38, 0xFE3F, 0xFE40, 0xFE3D, 0xFE3E, 0xFE41, 0xFE42, 0xFE43, /* 0x70 */
-    0xFE44, 0xFE3B, 0xFE3C                                          /* 0x70 */
+    0xFE44, 0xFE3B, 0xFE3C											/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_MS932_ED[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7E8A, 0x891C, 0x9348, 0x9288, 0x84DC, 0x4FC9, 0x70BB, 0x6631, /* 0x40 */
     0x68C8, 0x92F9, 0x66FB, 0x5F45, 0x4E28, 0x4EE1, 0x4EFC, 0x4F00, /* 0x40 */
     0x4F03, 0x4F39, 0x4F56, 0x4F92, 0x4F8A, 0x4F9A, 0x4F94, 0x4FCD, /* 0x50 */
@@ -1429,7 +1429,7 @@ static sal_uInt16 const aImplDBCSToUniTab_MS932_ED[] =
     0x50F4, 0x50D8, 0x514A, 0x5164, 0x519D, 0x51BE, 0x51EC, 0x5215, /* 0x60 */
     0x529C, 0x52A6, 0x52C0, 0x52DB, 0x5300, 0x5307, 0x5324, 0x5372, /* 0x60 */
     0x5393, 0x53B2, 0x53DD, 0xFA0E, 0x549C, 0x548A, 0x54A9, 0x54FF, /* 0x70 */
-    0x5586, 0x5759, 0x5765, 0x57AC, 0x57C8, 0x57C7, 0xFA0F,      0, /* 0x70 */
+    0x5586, 0x5759, 0x5765, 0x57AC, 0x57C8, 0x57C7, 0xFA0F, 	 0, /* 0x70 */
     0xFA10, 0x589E, 0x58B2, 0x590B, 0x5953, 0x595B, 0x595D, 0x5963, /* 0x80 */
     0x59A4, 0x59BA, 0x5B56, 0x5BC0, 0x752F, 0x5BD8, 0x5BEC, 0x5C1E, /* 0x80 */
     0x5CA6, 0x5CBA, 0x5CF5, 0x5D27, 0x5D53, 0xFA11, 0x5D42, 0x5D6D, /* 0x90 */
@@ -1445,15 +1445,15 @@ static sal_uInt16 const aImplDBCSToUniTab_MS932_ED[] =
     0x6D6F, 0x6D96, 0x6DAC, 0x6DCF, 0x6DF8, 0x6DF2, 0x6DFC, 0x6E39, /* 0xE0 */
     0x6E5C, 0x6E27, 0x6E3C, 0x6EBF, 0x6F88, 0x6FB5, 0x6FF5, 0x7005, /* 0xE0 */
     0x7007, 0x7028, 0x7085, 0x70AB, 0x710F, 0x7104, 0x715C, 0x7146, /* 0xF0 */
-    0x7147, 0xFA15, 0x71C1, 0x71FE, 0x72B1                          /* 0xF0 */
+    0x7147, 0xFA15, 0x71C1, 0x71FE, 0x72B1							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_MS932_EE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x72BE, 0x7324, 0xFA16, 0x7377, 0x73BD, 0x73C9, 0x73D6, 0x73E3, /* 0x40 */
     0x73D2, 0x7407, 0x73F5, 0x7426, 0x742A, 0x7429, 0x742E, 0x7462, /* 0x40 */
     0x7489, 0x749F, 0x7501, 0x756F, 0x7682, 0x769C, 0x769E, 0x769B, /* 0x50 */
@@ -1461,7 +1461,7 @@ static sal_uInt16 const aImplDBCSToUniTab_MS932_EE[] =
     0x7930, 0xFA18, 0xFA19, 0xFA1A, 0x7994, 0xFA1B, 0x799B, 0x7AD1, /* 0x60 */
     0x7AE7, 0xFA1C, 0x7AEB, 0x7B9E, 0xFA1D, 0x7D48, 0x7D5C, 0x7DB7, /* 0x60 */
     0x7DA0, 0x7DD6, 0x7E52, 0x7F47, 0x7FA1, 0xFA1E, 0x8301, 0x8362, /* 0x70 */
-    0x837F, 0x83C7, 0x83F6, 0x8448, 0x84B4, 0x8553, 0x8559,      0, /* 0x70 */
+    0x837F, 0x83C7, 0x83F6, 0x8448, 0x84B4, 0x8553, 0x8559, 	 0, /* 0x70 */
     0x856B, 0xFA1F, 0x85B0, 0xFA20, 0xFA21, 0x8807, 0x88F5, 0x8A12, /* 0x80 */
     0x8A37, 0x8A79, 0x8AA7, 0x8ABE, 0x8ADF, 0xFA22, 0x8AF6, 0x8B53, /* 0x80 */
     0x8B7F, 0x8CF0, 0x8CF4, 0x8D12, 0x8D76, 0xFA23, 0x8ECF, 0xFA24, /* 0x90 */
@@ -1475,17 +1475,17 @@ static sal_uInt16 const aImplDBCSToUniTab_MS932_EE[] =
     0x96AF, 0x9733, 0x973B, 0x9743, 0x974D, 0x974F, 0x9751, 0x9755, /* 0xD0 */
     0x9857, 0x9865, 0xFA2A, 0xFA2B, 0x9927, 0xFA2C, 0x999E, 0x9A4E, /* 0xD0 */
     0x9AD9, 0x9ADC, 0x9B75, 0x9B72, 0x9B8F, 0x9BB1, 0x9BBB, 0x9C00, /* 0xE0 */
-    0x9D70, 0x9D6B, 0xFA2D, 0x9E19, 0x9ED1,      0,      0, 0x2170, /* 0xE0 */
+    0x9D70, 0x9D6B, 0xFA2D, 0x9E19, 0x9ED1, 	 0, 	 0, 0x2170, /* 0xE0 */
     0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176, 0x2177, 0x2178, /* 0xF0 */
-    0x2179, 0xFFE2, 0xFFE4, 0xFF07, 0xFF02                          /* 0xF0 */
+    0x2179, 0xFFE2, 0xFFE4, 0xFF07, 0xFF02							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_MS932_FA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176, 0x2177, /* 0x40 */
     0x2178, 0x2179, 0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, /* 0x40 */
     0x2166, 0x2167, 0x2168, 0x2169, 0xFFE2, 0xFFE4, 0xFF07, 0xFF02, /* 0x50 */
@@ -1493,7 +1493,7 @@ static sal_uInt16 const aImplDBCSToUniTab_MS932_FA[] =
     0x84DC, 0x4FC9, 0x70BB, 0x6631, 0x68C8, 0x92F9, 0x66FB, 0x5F45, /* 0x60 */
     0x4E28, 0x4EE1, 0x4EFC, 0x4F00, 0x4F03, 0x4F39, 0x4F56, 0x4F92, /* 0x60 */
     0x4F8A, 0x4F9A, 0x4F94, 0x4FCD, 0x5040, 0x5022, 0x4FFF, 0x501E, /* 0x70 */
-    0x5046, 0x5070, 0x5042, 0x5094, 0x50F4, 0x50D8, 0x514A,      0, /* 0x70 */
+    0x5046, 0x5070, 0x5042, 0x5094, 0x50F4, 0x50D8, 0x514A, 	 0, /* 0x70 */
     0x5164, 0x519D, 0x51BE, 0x51EC, 0x5215, 0x529C, 0x52A6, 0x52C0, /* 0x80 */
     0x52DB, 0x5300, 0x5307, 0x5324, 0x5372, 0x5393, 0x53B2, 0x53DD, /* 0x80 */
     0xFA0E, 0x549C, 0x548A, 0x54A9, 0x54FF, 0x5586, 0x5759, 0x5765, /* 0x90 */
@@ -1509,15 +1509,15 @@ static sal_uInt16 const aImplDBCSToUniTab_MS932_FA[] =
     0xF929, 0x6766, 0x67BB, 0x6852, 0x67C0, 0x6801, 0x6844, 0x68CF, /* 0xE0 */
     0xFA13, 0x6968, 0xFA14, 0x6998, 0x69E2, 0x6A30, 0x6A6B, 0x6A46, /* 0xE0 */
     0x6A73, 0x6A7E, 0x6AE2, 0x6AE4, 0x6BD6, 0x6C3F, 0x6C5C, 0x6C86, /* 0xF0 */
-    0x6C6F, 0x6CDA, 0x6D04, 0x6D87, 0x6D6F                          /* 0xF0 */
+    0x6C6F, 0x6CDA, 0x6D04, 0x6D87, 0x6D6F							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_MS932_FB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6D96, 0x6DAC, 0x6DCF, 0x6DF8, 0x6DF2, 0x6DFC, 0x6E39, 0x6E5C, /* 0x40 */
     0x6E27, 0x6E3C, 0x6EBF, 0x6F88, 0x6FB5, 0x6FF5, 0x7005, 0x7007, /* 0x40 */
     0x7028, 0x7085, 0x70AB, 0x710F, 0x7104, 0x715C, 0x7146, 0x7147, /* 0x50 */
@@ -1525,7 +1525,7 @@ static sal_uInt16 const aImplDBCSToUniTab_MS932_FB[] =
     0x73BD, 0x73C9, 0x73D6, 0x73E3, 0x73D2, 0x7407, 0x73F5, 0x7426, /* 0x60 */
     0x742A, 0x7429, 0x742E, 0x7462, 0x7489, 0x749F, 0x7501, 0x756F, /* 0x60 */
     0x7682, 0x769C, 0x769E, 0x769B, 0x76A6, 0xFA17, 0x7746, 0x52AF, /* 0x70 */
-    0x7821, 0x784E, 0x7864, 0x787A, 0x7930, 0xFA18, 0xFA19,      0, /* 0x70 */
+    0x7821, 0x784E, 0x7864, 0x787A, 0x7930, 0xFA18, 0xFA19, 	 0, /* 0x70 */
     0xFA1A, 0x7994, 0xFA1B, 0x799B, 0x7AD1, 0x7AE7, 0xFA1C, 0x7AEB, /* 0x80 */
     0x7B9E, 0xFA1D, 0x7D48, 0x7D5C, 0x7DB7, 0x7DA0, 0x7DD6, 0x7E52, /* 0x80 */
     0x7F47, 0x7FA1, 0xFA1E, 0x8301, 0x8362, 0x837F, 0x83C7, 0x83F6, /* 0x90 */
@@ -1541,16 +1541,16 @@ static sal_uInt16 const aImplDBCSToUniTab_MS932_FB[] =
     0x9357, 0x93A4, 0x93C6, 0x93DE, 0x93F8, 0x9431, 0x9445, 0x9448, /* 0xE0 */
     0x9592, 0xF9DC, 0xFA29, 0x969D, 0x96AF, 0x9733, 0x973B, 0x9743, /* 0xE0 */
     0x974D, 0x974F, 0x9751, 0x9755, 0x9857, 0x9865, 0xFA2A, 0xFA2B, /* 0xF0 */
-    0x9927, 0xFA2C, 0x999E, 0x9A4E, 0x9AD9                          /* 0xF0 */
+    0x9927, 0xFA2C, 0x999E, 0x9A4E, 0x9AD9							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_MS932_FC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9ADC, 0x9B75, 0x9B72, 0x9B8F, 0x9BB1, 0x9BBB, 0x9C00, 0x9D70, /* 0x40 */
-    0x9D6B, 0xFA2D, 0x9E19, 0x9ED1                                  /* 0x40 */
+    0x9D6B, 0xFA2D, 0x9E19, 0x9ED1									/* 0x40 */
 };
 
diff --git a/sal/textenc/tcvtjp2.tab b/sal/textenc/tcvtjp2.tab
index 7b1fe10947bb..733bfc041de6 100644
--- a/sal/textenc/tcvtjp2.tab
+++ b/sal/textenc/tcvtjp2.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,8 +39,8 @@
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_00[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, /* 0x00 */
     0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, /* 0x00 */
     0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, /* 0x10 */
@@ -57,29 +57,29 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_00[] =
     0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, /* 0x60 */
     0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, /* 0x70 */
     0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0x8191, 0x8192,      0, 0x005C,      0, 0x8198, /* 0xA0 */
-    0x814E,      0,      0,      0, 0x81CA,      0,      0,      0, /* 0xA0 */
-    0x818B, 0x817D,      0,      0, 0x814C,      0, 0x81F7,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0x817E, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0x8180  /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x8191, 0x8192, 	 0, 0x005C, 	 0, 0x8198, /* 0xA0 */
+    0x814E,      0, 	 0, 	 0, 0x81CA, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x818B, 0x817D, 	 0, 	 0, 0x814C, 	 0, 0x81F7, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x817E, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8180	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_APPLEJAPANESE_00[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, /* 0x00 */
     0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, /* 0x00 */
     0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, /* 0x10 */
@@ -96,47 +96,47 @@ static sal_uInt16 const aImplUniToDBCSTab_APPLEJAPANESE_00[] =
     0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, /* 0x60 */
     0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, /* 0x70 */
     0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x00A0,      0, 0x8191, 0x8192,      0, 0x005C,      0, 0x8198, /* 0xA0 */
-    0x814E, 0x00FD,      0,      0, 0x81CA,      0,      0,      0, /* 0xA0 */
-    0x818B, 0x817D,      0,      0, 0x814C,      0, 0x81F7,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0x817E, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0x8180  /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x00A0, 	 0, 0x8191, 0x8192, 	 0, 0x005C, 	 0, 0x8198, /* 0xA0 */
+    0x814E, 0x00FD, 	 0, 	 0, 0x81CA, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x818B, 0x817D, 	 0, 	 0, 0x814C, 	 0, 0x81F7, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x817E, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8180	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_03[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x839F, 0x83A0, 0x83A1, 0x83A2, 0x83A3, 0x83A4, 0x83A5, /* 0x90 */
     0x83A6, 0x83A7, 0x83A8, 0x83A9, 0x83AA, 0x83AB, 0x83AC, 0x83AD, /* 0x90 */
-    0x83AE, 0x83AF,      0, 0x83B0, 0x83B1, 0x83B2, 0x83B3, 0x83B4, /* 0xA0 */
-    0x83B5, 0x83B6,      0,      0,      0,      0,      0,      0, /* 0xA0 */
+    0x83AE, 0x83AF, 	 0, 0x83B0, 0x83B1, 0x83B2, 0x83B3, 0x83B4, /* 0xA0 */
+    0x83B5, 0x83B6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
          0, 0x83BF, 0x83C0, 0x83C1, 0x83C2, 0x83C3, 0x83C4, 0x83C5, /* 0xB0 */
     0x83C6, 0x83C7, 0x83C8, 0x83C9, 0x83CA, 0x83CB, 0x83CC, 0x83CD, /* 0xB0 */
-    0x83CE, 0x83CF,      0, 0x83D0, 0x83D1, 0x83D2, 0x83D3, 0x83D4, /* 0xC0 */
-    0x83D5, 0x83D6                                                  /* 0xC0 */
+    0x83CE, 0x83CF, 	 0, 0x83D0, 0x83D1, 0x83D2, 0x83D3, 0x83D4, /* 0xC0 */
+    0x83D5, 0x83D6													/* 0xC0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_04[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x8446,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x8446, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
     0x8440, 0x8441, 0x8442, 0x8443, 0x8444, 0x8445, 0x8447, 0x8448, /* 0x10 */
     0x8449, 0x844A, 0x844B, 0x844C, 0x844D, 0x844E, 0x844F, 0x8450, /* 0x10 */
     0x8451, 0x8452, 0x8453, 0x8454, 0x8455, 0x8456, 0x8457, 0x8458, /* 0x20 */
@@ -145,7 +145,7 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_04[] =
     0x8479, 0x847A, 0x847B, 0x847C, 0x847D, 0x847E, 0x8480, 0x8481, /* 0x30 */
     0x8482, 0x8483, 0x8484, 0x8485, 0x8486, 0x8487, 0x8488, 0x8489, /* 0x40 */
     0x848A, 0x848B, 0x848C, 0x848D, 0x848E, 0x848F, 0x8490, 0x8491, /* 0x40 */
-         0, 0x8476                                                  /* 0x50 */
+         0, 0x8476													/* 0x50 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -154,20 +154,20 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_04[] =
 /* 0x2015 --> 0x815C - MS932, but I think, this extension is better than the replacment char */
 /* 0x2016 --> 0x8161 - APPLE_JAPANESE/SJIS, but I think, this extension is better than the replacment char */
 /* 0x2026 --> 0x8163 - APPLE_JAPANESE is normaly 0x00FF (HORIZONTAL ELLIPSIS), because in the APPLE import table 0x8183 is this 0x22EF (MIDLINE HORIZONTAL ELLIPSIS) */
-/*                     but we import this code as 0x2026 */
+/*					   but we import this code as 0x2026 */
 /* 0x203E --> 0x8150 - APPLE_JAPANESE, but I think, this extension is better than the replacment char */
-/*                     in SJIS this is 0x7E, but we import 0x7E as 0x7E, so this would be the better way */
+/*					   in SJIS this is 0x7E, but we import 0x7E as 0x7E, so this would be the better way */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_20[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x815D,      0,      0,      0, 0x815C, 0x815C, 0x8161,      0, /* 0x10 */
-    0x8165, 0x8166,      0,      0, 0x8167, 0x8168,      0,      0, /* 0x10 */
-    0x81F5, 0x81F6,      0,      0,      0, 0x8164, 0x8163,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0x81F1,      0, 0x818C, 0x818D,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x81A6,      0,      0, 0x8150          /* 0x30 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x815D, 	 0, 	 0, 	 0, 0x815C, 0x815C, 0x8161, 	 0, /* 0x10 */
+    0x8165, 0x8166, 	 0, 	 0, 0x8167, 0x8168, 	 0, 	 0, /* 0x10 */
+    0x81F5, 0x81F6, 	 0, 	 0, 	 0, 0x8164, 0x8163, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x81F1, 	 0, 0x818C, 0x818D, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x81A6, 	 0, 	 0, 0x8150			/* 0x30 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -176,73 +176,73 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_20[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_MS932_21[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0x818E,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0x8782,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0x8784,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0x81F0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0x818E, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8782, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x8784, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x81F0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
     0x8754, 0x8755, 0x8756, 0x8757, 0x8758, 0x8759, 0x875A, 0x875B, /* 0x60 */
-    0x875C, 0x875D,      0,      0,      0,      0,      0,      0, /* 0x60 */
+    0x875C, 0x875D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
     0xFA40, 0xFA41, 0xFA42, 0xFa43, 0xFA44, 0xFA45, 0xFA46, 0xFA47, /* 0x70 */
-    0xFA48, 0xFA49,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0x81A9, 0x81AA, 0x81A8, 0x81AB,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x81CB,      0, 0x81CC                          /* 0xD0 */
+    0xFA48, 0xFA49, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x81A9, 0x81AA, 0x81A8, 0x81AB, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x81CB, 	 0, 0x81CC							/* 0xD0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_APPLEJAPANESE_21[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0x818E,      0,      0,      0,      0, /* 0x00 */
-         0, 0x8656,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0x8650,      0,      0, 0x869B,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0x869D, 0x00FE,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0x81F0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0x818E, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x8656, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x8650, 	 0, 	 0, 0x869B, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x869D, 0x00FE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x81F0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
     0x859F, 0x85A0, 0x85A1, 0x85A2, 0x85A3, 0x85A4, 0x85A5, 0x85A6, /* 0x60 */
-    0x85A7, 0x85A8, 0x85A9, 0x85AA,      0,      0,      0,      0, /* 0x60 */
+    0x85A7, 0x85A8, 0x85A9, 0x85AA, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
     0x85B3, 0x85B4, 0x85B5, 0x85B6, 0x85B7, 0x85B8, 0x85B9, 0x85BA, /* 0x70 */
-    0x85BB, 0x85BC, 0x85BD, 0x85BE,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0x81A9, 0x81AA, 0x81A8, 0x81AB,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x86CC, 0x86CD, 0x86CB,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x81CB,      0, 0x81CC,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0x86D0, 0x86D1, /* 0xE0 */
-    0x86CF, 0x86D2                                                  /* 0xE0 */
+    0x85BB, 0x85BC, 0x85BD, 0x85BE, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x81A9, 0x81AA, 0x81A8, 0x81AB, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x86CC, 0x86CD, 0x86CB, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x81CB, 	 0, 0x81CC, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x86D0, 0x86D1, /* 0xE0 */
+    0x86CF, 0x86D2													/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -252,79 +252,79 @@ static sal_uInt16 const aImplUniToDBCSTab_APPLEJAPANESE_21[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_MS932_22[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x81CD,      0, 0x81DD, 0x81CE,      0,      0,      0, 0x81DE, /* 0x00 */
-    0x81B8,      0,      0, 0x81B9,      0,      0,      0,      0, /* 0x00 */
-         0, 0x8794, 0x817C,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x81E3,      0,      0, 0x81E5, 0x8187, 0x8798, /* 0x10 */
-    0x81DA,      0,      0,      0,      0, 0x8161,      0, 0x81C8, /* 0x20 */
-    0x81C9, 0x81BF, 0x81BE, 0x81E7, 0x81E8,      0, 0x8793,      0, /* 0x20 */
-         0,      0,      0,      0, 0x8188, 0x81E6,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0x81E4,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x81E0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0x8182, 0x81DF,      0,      0,      0,      0, 0x8185, 0x8186, /* 0x60 */
-         0,      0, 0x81E1, 0x81E2,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x81BC, 0x81BD,      0,      0, 0x81BA, 0x81BB, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0x81DB,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0x8799  /* 0xB0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x81CD, 	 0, 0x81DD, 0x81CE, 	 0, 	 0, 	 0, 0x81DE, /* 0x00 */
+    0x81B8, 	 0, 	 0, 0x81B9, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x8794, 0x817C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x81E3, 	 0, 	 0, 0x81E5, 0x8187, 0x8798, /* 0x10 */
+    0x81DA, 	 0, 	 0, 	 0, 	 0, 0x8161, 	 0, 0x81C8, /* 0x20 */
+    0x81C9, 0x81BF, 0x81BE, 0x81E7, 0x81E8, 	 0, 0x8793, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x8188, 0x81E6, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x81E4, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x81E0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x8182, 0x81DF, 	 0, 	 0, 	 0, 	 0, 0x8185, 0x8186, /* 0x60 */
+         0, 	 0, 0x81E1, 0x81E2, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x81BC, 0x81BD, 	 0, 	 0, 0x81BA, 0x81BB, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x81DB, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8799	/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_APPLEJAPANESE_22[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x81CD,      0, 0x81DD, 0x81CE,      0,      0,      0, 0x81DE, /* 0x00 */
-    0x81B8,      0,      0, 0x81B9,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0x817C,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x81E3,      0,      0, 0x81E5, 0x8187, 0x8841, /* 0x10 */
-    0x81DA,      0,      0,      0,      0,      0,      0, 0x81C8, /* 0x20 */
-    0x81C9, 0x81BF, 0x81BE, 0x81E7, 0x81E8,      0, 0x8840,      0, /* 0x20 */
-         0,      0,      0,      0, 0x8188, 0x81E6,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0x81E4,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x81E0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0x8182, 0x81DF,      0,      0,      0,      0, 0x8185, 0x8186, /* 0x60 */
-         0,      0, 0x81E1, 0x81E2,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x81BC, 0x81BD,      0,      0, 0x81BA, 0x81BB, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0x81DB,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0x8842, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0x8163  /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x81CD, 	 0, 0x81DD, 0x81CE, 	 0, 	 0, 	 0, 0x81DE, /* 0x00 */
+    0x81B8, 	 0, 	 0, 0x81B9, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x817C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x81E3, 	 0, 	 0, 0x81E5, 0x8187, 0x8841, /* 0x10 */
+    0x81DA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x81C8, /* 0x20 */
+    0x81C9, 0x81BF, 0x81BE, 0x81E7, 0x81E8, 	 0, 0x8840, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x8188, 0x81E6, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x81E4, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x81E0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x8182, 0x81DF, 	 0, 	 0, 	 0, 	 0, 0x8185, 0x8186, /* 0x60 */
+         0, 	 0, 0x81E1, 0x81E2, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x81BC, 0x81BD, 	 0, 	 0, 0x81BA, 0x81BB, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x81DB, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8842, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8163	/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_23[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x81DC                                          /* 0x10 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x81DC											/* 0x10 */
                                                                     /* 0x10 */
 };
 
@@ -332,11 +332,11 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_23[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_MS932_24[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8740, 0x8741, 0x8742, 0x8743, 0x8744, 0x8745, 0x8746, 0x8747, /* 0x60 */
     0x8748, 0x8749, 0x874A, 0x874B, 0x874C, 0x874D, 0x874E, 0x874F, /* 0x60 */
-    0x8750, 0x8751, 0x8752, 0x8753                                  /* 0x70 */
+    0x8750, 0x8751, 0x8752, 0x8753									/* 0x70 */
                                                                     /* 0x70 */
 };
 
@@ -344,19 +344,19 @@ static sal_uInt16 const aImplUniToDBCSTab_MS932_24[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_APPLEJAPANESE_24[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8540, 0x8541, 0x8542, 0x8543, 0x8544, 0x8545, 0x8546, 0x8547, /* 0x60 */
     0x8548, 0x8549, 0x854A, 0x854B, 0x854C, 0x854D, 0x854E, 0x854F, /* 0x60 */
     0x8550, 0x8551, 0x8552, 0x8553, 0x855E, 0x855F, 0x8560, 0x8561, /* 0x70 */
     0x8562, 0x8563, 0x8564, 0x8565, 0x8566, 0x8567, 0x8568, 0x8569, /* 0x70 */
     0x856A, 0x856B, 0x856C, 0x856D, 0x856E, 0x856F, 0x8570, 0x8571, /* 0x80 */
     0x8592, 0x8593, 0x8594, 0x8595, 0x8596, 0x8597, 0x8598, 0x8599, /* 0x80 */
-    0x859A,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0x85DB, 0x85DC, 0x85DD, 0x85DE, /* 0x90 */
+    0x859A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x85DB, 0x85DC, 0x85DD, 0x85DE, /* 0x90 */
     0x85DF, 0x85E0, 0x85E1, 0x85E2, 0x85E3, 0x85E4, 0x85E5, 0x85E6, /* 0xA0 */
     0x85E7, 0x85E8, 0x85E9, 0x85EA, 0x85EB, 0x85EC, 0x85ED, 0x85EE, /* 0xA0 */
-    0x85EF, 0x85F0, 0x85F1, 0x85F2, 0x85F3, 0x85F4                  /* 0xB0 */
+    0x85EF, 0x85F0, 0x85F1, 0x85F2, 0x85F3, 0x85F4					/* 0xB0 */
                                                                     /* 0xB0 */
 };
 
@@ -364,92 +364,92 @@ static sal_uInt16 const aImplUniToDBCSTab_APPLEJAPANESE_24[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_25[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x849F, 0x84AA, 0x84A0, 0x84AB,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0x84A1,      0,      0, 0x84AC, /* 0x00 */
-    0x84A2,      0,      0, 0x84AD, 0x84A4,      0,      0, 0x84AF, /* 0x10 */
-    0x84A3,      0,      0, 0x84AE, 0x84A5, 0x84BA,      0,      0, /* 0x10 */
-    0x84B5,      0,      0, 0x84B0, 0x84A7, 0x84BC,      0,      0, /* 0x20 */
-    0x84B7,      0,      0, 0x84B2, 0x84A6,      0,      0, 0x84B6, /* 0x20 */
-    0x84BB,      0,      0, 0x84B1, 0x84A8,      0,      0, 0x84B8, /* 0x30 */
-    0x84BD,      0,      0, 0x84B3, 0x84A9,      0,      0, 0x84B9, /* 0x30 */
-         0,      0, 0x84BE,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0x84B4,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x81A1, 0x81A0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x81A3, 0x81A2,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x81A5, 0x81A4,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x819F, 0x819E, /* 0xC0 */
-         0,      0,      0, 0x819B,      0,      0, 0x819D, 0x819C, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0x81FC  /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x849F, 0x84AA, 0x84A0, 0x84AB, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x84A1, 	 0, 	 0, 0x84AC, /* 0x00 */
+    0x84A2, 	 0, 	 0, 0x84AD, 0x84A4, 	 0, 	 0, 0x84AF, /* 0x10 */
+    0x84A3, 	 0, 	 0, 0x84AE, 0x84A5, 0x84BA, 	 0, 	 0, /* 0x10 */
+    0x84B5, 	 0, 	 0, 0x84B0, 0x84A7, 0x84BC, 	 0, 	 0, /* 0x20 */
+    0x84B7, 	 0, 	 0, 0x84B2, 0x84A6, 	 0, 	 0, 0x84B6, /* 0x20 */
+    0x84BB, 	 0, 	 0, 0x84B1, 0x84A8, 	 0, 	 0, 0x84B8, /* 0x30 */
+    0x84BD, 	 0, 	 0, 0x84B3, 0x84A9, 	 0, 	 0, 0x84B9, /* 0x30 */
+         0, 	 0, 0x84BE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x84B4, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x81A1, 0x81A0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x81A3, 0x81A2, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x81A5, 0x81A4, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x819F, 0x819E, /* 0xC0 */
+         0, 	 0, 	 0, 0x819B, 	 0, 	 0, 0x819D, 0x819C, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x81FC	/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_26[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0x819A, 0x8199,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0x818A,      0, 0x8189,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0x81F4,      0,      0, 0x81F3,      0, 0x81F2  /* 0x60 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0x819A, 0x8199, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x818A, 	 0, 0x8189, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x81F4, 	 0, 	 0, 0x81F3, 	 0, 0x81F2	/* 0x60 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_APPLEJAPANESE_26[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0x819A, 0x8199,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0x86B4,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0x86C8, 0x86C9, 0x86C7, 0x86CA, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0x818A,      0, 0x8189,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0x819A, 0x8199, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x86B4, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x86C8, 0x86C9, 0x86C7, 0x86CA, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x818A, 	 0, 0x8189, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
     0x86A3, 0x86A1, 0x86A2, 0x86A4, 0x869F, 0x86A5, 0x86A6, 0x86A0, /* 0x60 */
-         0,      0, 0x81F4,      0,      0, 0x81F3,      0, 0x81F2  /* 0x60 */
+         0, 	 0, 0x81F4, 	 0, 	 0, 0x81F3, 	 0, 0x81F2	/* 0x60 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_APPLEJAPANESE_27[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                     0x857C, 0x857D, /* 0x70 */
-    0x857E, 0x8580, 0x8581, 0x8582, 0x8583, 0x8584, 0x8585          /* 0x70 */
+    0x857E, 0x8580, 0x8581, 0x8582, 0x8583, 0x8584, 0x8585			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -460,16 +460,16 @@ static sal_uInt16 const aImplUniToDBCSTab_APPLEJAPANESE_27[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_30[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x8140, 0x8141, 0x8142, 0x8156,      0, 0x8158, 0x8159, 0x815A, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x8140, 0x8141, 0x8142, 0x8156, 	 0, 0x8158, 0x8159, 0x815A, /* 0x00 */
     0x8171, 0x8172, 0x8173, 0x8174, 0x8175, 0x8176, 0x8177, 0x8178, /* 0x00 */
-    0x8179, 0x817A, 0x81A7, 0x81AC, 0x816B, 0x816C,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0x8160, 0x8780,      0, 0x8781, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
+    0x8179, 0x817A, 0x81A7, 0x81AC, 0x816B, 0x816C, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x8160, 0x8780, 	 0, 0x8781, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
          0, 0x829F, 0x82A0, 0x82A1, 0x82A2, 0x82A3, 0x82A4, 0x82A5, /* 0x40 */
     0x82A6, 0x82A7, 0x82A8, 0x82A9, 0x82AA, 0x82AB, 0x82AC, 0x82AD, /* 0x40 */
     0x82AE, 0x82AF, 0x82B0, 0x82B1, 0x82B2, 0x82B3, 0x82B4, 0x82B5, /* 0x50 */
@@ -480,8 +480,8 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_30[] =
     0x82D6, 0x82D7, 0x82D8, 0x82D9, 0x82DA, 0x82DB, 0x82DC, 0x82DD, /* 0x70 */
     0x82DE, 0x82DF, 0x82E0, 0x82E1, 0x82E2, 0x82E3, 0x82E4, 0x82E5, /* 0x80 */
     0x82E6, 0x82E7, 0x82E8, 0x82E9, 0x82EA, 0x82EB, 0x82EC, 0x82ED, /* 0x80 */
-    0x82EE, 0x82EF, 0x82F0, 0x82F1,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0x814A, 0x814B, 0x8154, 0x8155,      0, /* 0x90 */
+    0x82EE, 0x82EF, 0x82F0, 0x82F1, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x814A, 0x814B, 0x8154, 0x8155, 	 0, /* 0x90 */
          0, 0x8340, 0x8341, 0x8342, 0x8343, 0x8344, 0x8345, 0x8346, /* 0xA0 */
     0x8347, 0x8348, 0x8349, 0x834A, 0x834B, 0x834C, 0x834D, 0x834E, /* 0xA0 */
     0x834F, 0x8350, 0x8351, 0x8352, 0x8353, 0x8354, 0x8355, 0x8356, /* 0xB0 */
@@ -492,24 +492,24 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_30[] =
     0x8377, 0x8378, 0x8379, 0x837A, 0x837B, 0x837C, 0x837D, 0x837E, /* 0xD0 */
     0x8380, 0x8381, 0x8382, 0x8383, 0x8384, 0x8385, 0x8386, 0x8387, /* 0xE0 */
     0x8388, 0x8389, 0x838A, 0x838B, 0x838C, 0x838D, 0x838E, 0x838F, /* 0xE0 */
-    0x8390, 0x8391, 0x8392, 0x8393, 0x8394, 0x8395, 0x8396,      0, /* 0xF0 */
-         0,      0,      0, 0x8145, 0x815B, 0x8152, 0x8153          /* 0xF0 */
+    0x8390, 0x8391, 0x8392, 0x8393, 0x8394, 0x8395, 0x8396, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0x8145, 0x815B, 0x8152, 0x8153			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_APPLEJAPANESE_30[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8140, 0x8141, 0x8142, 0x8156, 0x86B5, 0x8158, 0x8159, 0x815A, /* 0x00 */
     0x8171, 0x8172, 0x8173, 0x8174, 0x8175, 0x8176, 0x8177, 0x8178, /* 0x00 */
-    0x8179, 0x817A, 0x81A7, 0x81AC, 0x816B, 0x816C,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0x8160, 0x8854,      0, 0x8855, /* 0x10 */
-    0x86B3,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
+    0x8179, 0x817A, 0x81A7, 0x81AC, 0x816B, 0x816C, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x8160, 0x8854, 	 0, 0x8855, /* 0x10 */
+    0x86B3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
          0, 0x829F, 0x82A0, 0x82A1, 0x82A2, 0x82A3, 0x82A4, 0x82A5, /* 0x40 */
     0x82A6, 0x82A7, 0x82A8, 0x82A9, 0x82AA, 0x82AB, 0x82AC, 0x82AD, /* 0x40 */
     0x82AE, 0x82AF, 0x82B0, 0x82B1, 0x82B2, 0x82B3, 0x82B4, 0x82B5, /* 0x50 */
@@ -520,8 +520,8 @@ static sal_uInt16 const aImplUniToDBCSTab_APPLEJAPANESE_30[] =
     0x82D6, 0x82D7, 0x82D8, 0x82D9, 0x82DA, 0x82DB, 0x82DC, 0x82DD, /* 0x70 */
     0x82DE, 0x82DF, 0x82E0, 0x82E1, 0x82E2, 0x82E3, 0x82E4, 0x82E5, /* 0x80 */
     0x82E6, 0x82E7, 0x82E8, 0x82E9, 0x82EA, 0x82EB, 0x82EC, 0x82ED, /* 0x80 */
-    0x82EE, 0x82EF, 0x82F0, 0x82F1, 0x8868,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0x814A, 0x814B, 0x8154, 0x8155,      0, /* 0x90 */
+    0x82EE, 0x82EF, 0x82F0, 0x82F1, 0x8868, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x814A, 0x814B, 0x8154, 0x8155, 	 0, /* 0x90 */
          0, 0x8340, 0x8341, 0x8342, 0x8343, 0x8344, 0x8345, 0x8346, /* 0xA0 */
     0x8347, 0x8348, 0x8349, 0x834A, 0x834B, 0x834C, 0x834D, 0x834E, /* 0xA0 */
     0x834F, 0x8350, 0x8351, 0x8352, 0x8353, 0x8354, 0x8355, 0x8356, /* 0xB0 */
@@ -533,126 +533,126 @@ static sal_uInt16 const aImplUniToDBCSTab_APPLEJAPANESE_30[] =
     0x8380, 0x8381, 0x8382, 0x8383, 0x8384, 0x8385, 0x8386, 0x8387, /* 0xE0 */
     0x8388, 0x8389, 0x838A, 0x838B, 0x838C, 0x838D, 0x838E, 0x838F, /* 0xE0 */
     0x8390, 0x8391, 0x8392, 0x8393, 0x8394, 0x8395, 0x8396, 0x886A, /* 0xF0 */
-    0x886B, 0x886C, 0x886D, 0x8145, 0x815B, 0x8152, 0x8153          /* 0xF0 */
+    0x886B, 0x886C, 0x886D, 0x8145, 0x815B, 0x8152, 0x8153			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_MS932_32[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x878A, 0x878B,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0x878C,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0x8785, 0x8786, 0x8787, 0x8788, /* 0xA0 */
-    0x8789                                                          /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x878A, 0x878B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x878C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x8785, 0x8786, 0x8787, 0x8788, /* 0xA0 */
+    0x8789															/* 0xA0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_APPLEJAPANESE_32[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x20 */
                     0x8741, 0x8742, 0x8743, 0x8744, 0x8745, 0x8746, /* 0x20 */
     0x8740, 0x874D, 0x8750, 0x8753, 0x874F, 0x8754, 0x8752, 0x8748, /* 0x30 */
     0x8758, 0x874B, 0x874C, 0x8751, 0x8755, 0x8756, 0x874E, 0x8757, /* 0x30 */
-    0x8747,      0, 0x8749, 0x874A,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x8799,      0, /* 0x90 */
-    0x879B, 0x879E,      0,      0,      0, 0x879A, 0x879C,      0, /* 0x90 */
-         0,      0,      0,      0, 0x8793, 0x8794, 0x8795, 0x8796, /* 0xA0 */
-    0x8797, 0x8798                                                  /* 0xA0 */
+    0x8747, 	 0, 0x8749, 0x874A, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8799, 	 0, /* 0x90 */
+    0x879B, 0x879E, 	 0, 	 0, 	 0, 0x879A, 0x879C, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x8793, 0x8794, 0x8795, 0x8796, /* 0xA0 */
+    0x8797, 0x8798													/* 0xA0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_MS932_33[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0x8765,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0x8769,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0x8760,      0,      0,      0, /* 0x10 */
-    0x8763,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x8761, 0x876B,      0,      0, 0x876A, 0x8764, /* 0x20 */
-         0,      0,      0, 0x876C,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x8766,      0, /* 0x30 */
-         0,      0,      0, 0x876E,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0x875F, 0x876D,      0,      0, 0x8762,      0,      0, /* 0x40 */
-         0, 0x8767,      0,      0,      0,      0,      0, 0x8768, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0x877E, 0x878F, 0x878E, 0x878D,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x8772, 0x8773, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0x876F, 0x8770, 0x8771,      0, /* 0x90 */
-         0, 0x8775,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x8774,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0x8783                  /* 0xC0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0x8765, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x8769, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x8760, 	 0, 	 0, 	 0, /* 0x10 */
+    0x8763, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x8761, 0x876B, 	 0, 	 0, 0x876A, 0x8764, /* 0x20 */
+         0, 	 0, 	 0, 0x876C, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8766, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x876E, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x875F, 0x876D, 	 0, 	 0, 0x8762, 	 0, 	 0, /* 0x40 */
+         0, 0x8767, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8768, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x877E, 0x878F, 0x878E, 0x878D, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8772, 0x8773, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x876F, 0x8770, 0x8771, 	 0, /* 0x90 */
+         0, 0x8775, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x8774, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x8783					/* 0xC0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_APPLEJAPANESE_33[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x87BD,      0,      0, 0x87A7,      0, 0x87A4,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0x87B0,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0x87A2, 0x87AA, 0x87A3,      0, /* 0x10 */
-    0x87A9,      0,      0,      0,      0,      0, 0x87BE,      0, /* 0x10 */
-         0,      0, 0x87A0, 0x87B2,      0,      0, 0x87B3, 0x87AB, /* 0x20 */
-         0,      0, 0x87BF, 0x87B5,      0,      0,      0,      0, /* 0x20 */
-         0, 0x87C0,      0, 0x87A5,      0,      0, 0x87A8,      0, /* 0x30 */
-         0, 0x87AE,      0, 0x87B4,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0x87B1,      0,      0,      0,      0, 0x87C1, /* 0x40 */
-         0, 0x879F, 0x87AD,      0,      0, 0x87A1, 0x87A6,      0, /* 0x40 */
-         0, 0x87AC,      0,      0,      0,      0,      0, 0x87AF, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0x87E8, 0x87E7, 0x87E6, 0x87E5, 0x87FA, /* 0x70 */
-         0,      0,      0,      0,      0, 0x865A, 0x865B, 0x865C, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x864A, 0x864C, /* 0x80 */
-    0x8659,      0,      0,      0,      0,      0, 0x864E, 0x864F, /* 0x90 */
-    0x8651,      0,      0,      0, 0x8640, 0x8642, 0x8648, 0x8641, /* 0x90 */
-    0x8643, 0x8646, 0x8649,      0, 0x8644, 0x8647,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x8655, 0x8654, 0x8653, 0x8652,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x864D,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0x8658,      0, 0x869C,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x8657                          /* 0xD0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x87BD, 	 0, 	 0, 0x87A7, 	 0, 0x87A4, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x87B0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x87A2, 0x87AA, 0x87A3, 	 0, /* 0x10 */
+    0x87A9, 	 0, 	 0, 	 0, 	 0, 	 0, 0x87BE, 	 0, /* 0x10 */
+         0, 	 0, 0x87A0, 0x87B2, 	 0, 	 0, 0x87B3, 0x87AB, /* 0x20 */
+         0, 	 0, 0x87BF, 0x87B5, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x87C0, 	 0, 0x87A5, 	 0, 	 0, 0x87A8, 	 0, /* 0x30 */
+         0, 0x87AE, 	 0, 0x87B4, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x87B1, 	 0, 	 0, 	 0, 	 0, 0x87C1, /* 0x40 */
+         0, 0x879F, 0x87AD, 	 0, 	 0, 0x87A1, 0x87A6, 	 0, /* 0x40 */
+         0, 0x87AC, 	 0, 	 0, 	 0, 	 0, 	 0, 0x87AF, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x87E8, 0x87E7, 0x87E6, 0x87E5, 0x87FA, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x865A, 0x865B, 0x865C, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x864A, 0x864C, /* 0x80 */
+    0x8659, 	 0, 	 0, 	 0, 	 0, 	 0, 0x864E, 0x864F, /* 0x90 */
+    0x8651, 	 0, 	 0, 	 0, 0x8640, 0x8642, 0x8648, 0x8641, /* 0x90 */
+    0x8643, 0x8646, 0x8649, 	 0, 0x8644, 0x8647, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x8655, 0x8654, 0x8653, 0x8652, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x864D, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x8658, 	 0, 0x869C, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x8657							/* 0xD0 */
                                                                     /* 0xD0 */
 };
 
@@ -666,1199 +666,1199 @@ static sal_uInt16 const aImplUniToDBCSTab_APPLEJAPANESE_33[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_4E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x88EA, 0x929A,      0, 0x8EB5,      0,      0,      0, 0x969C, /* 0x00 */
-    0x8FE4, 0x8E4F, 0x8FE3, 0x89BA,      0, 0x9573, 0x975E,      0, /* 0x00 */
-    0x98A0, 0x894E,      0,      0, 0x8A8E, 0x98A1, 0x90A2, 0x99C0, /* 0x10 */
-    0x8B75, 0x95B8,      0,      0,      0,      0, 0x8FE5,      0, /* 0x10 */
-         0, 0x97BC,      0,      0,      0,      0, 0x95C0,      0, /* 0x20 */
-    0xFA68,      0, 0x98A2,      0,      0, 0x9286,      0,      0, /* 0x20 */
-         0, 0x98A3, 0x8BF8,      0,      0,      0, 0x98A4,      0, /* 0x30 */
-    0x8ADB, 0x924F,      0, 0x8EE5, 0x98A5,      0,      0, 0x98A6, /* 0x30 */
-         0,      0, 0x98A7, 0x9454,      0, 0x8B76,      0,      0, /* 0x40 */
-         0,      0,      0, 0x9456,      0, 0x93E1, 0x8CC1, 0x9652, /* 0x40 */
-         0,      0,      0,      0,      0, 0xE568, 0x98A8, 0x8FE6, /* 0x50 */
-    0x98A9, 0x89B3,      0,      0,      0, 0x8BE3, 0x8CEE, 0x96E7, /* 0x50 */
-         0,      0, 0x9BA4,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0x9790,      0, 0x93FB,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x8AA3,      0, /* 0x70 */
-    0x8B54,      0, 0x98AA,      0,      0, 0x98AB, 0x97B9,      0, /* 0x80 */
-    0x975C, 0x9188, 0x98AD, 0x8E96, 0x93F1,      0, 0x98B0,      0, /* 0x80 */
-         0, 0x895D, 0x8CDD,      0, 0x8CDC, 0x88E4,      0,      0, /* 0x90 */
-    0x986A, 0x9869,      0, 0x8DB1, 0x889F,      0, 0x98B1, 0x98B2, /* 0x90 */
-    0x98B3, 0x9653, 0x98B4,      0, 0x8CF0, 0x88E5, 0x9692,      0, /* 0xA0 */
-    0x8B9C,      0,      0, 0x8B9D, 0x8B9E, 0x92E0, 0x97BA,      0, /* 0xA0 */
-    0x98B5,      0,      0, 0x98B6,      0,      0, 0x98B7,      0, /* 0xB0 */
-         0,      0, 0x906C,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x8F59, 0x906D, 0x98BC,      0, 0x98BA,      0, 0x98BB, 0x8B77, /* 0xC0 */
-         0,      0, 0x8DA1, 0x89EE,      0, 0x98B9, 0x98B8, 0x95A7, /* 0xC0 */
-         0,      0,      0,      0, 0x8E65, 0x8E64, 0x91BC, 0x98BD, /* 0xD0 */
-    0x9574, 0x90E5,      0,      0,      0, 0x8157, 0x98BE, 0x98C0, /* 0xD0 */
-         0, 0xFA69,      0, 0x91E3, 0x97DF, 0x88C8,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0x98BF, 0x89BC,      0, /* 0xE0 */
-    0x8BC2,      0, 0x9287,      0,      0,      0, 0x8C8F, 0x98C1, /* 0xF0 */
-         0,      0,      0, 0x9443, 0xFA6A                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x88EA, 0x929A, 	 0, 0x8EB5, 	 0, 	 0, 	 0, 0x969C, /* 0x00 */
+    0x8FE4, 0x8E4F, 0x8FE3, 0x89BA, 	 0, 0x9573, 0x975E, 	 0, /* 0x00 */
+    0x98A0, 0x894E, 	 0, 	 0, 0x8A8E, 0x98A1, 0x90A2, 0x99C0, /* 0x10 */
+    0x8B75, 0x95B8, 	 0, 	 0, 	 0, 	 0, 0x8FE5, 	 0, /* 0x10 */
+         0, 0x97BC, 	 0, 	 0, 	 0, 	 0, 0x95C0, 	 0, /* 0x20 */
+    0xFA68, 	 0, 0x98A2, 	 0, 	 0, 0x9286, 	 0, 	 0, /* 0x20 */
+         0, 0x98A3, 0x8BF8, 	 0, 	 0, 	 0, 0x98A4, 	 0, /* 0x30 */
+    0x8ADB, 0x924F, 	 0, 0x8EE5, 0x98A5, 	 0, 	 0, 0x98A6, /* 0x30 */
+         0, 	 0, 0x98A7, 0x9454, 	 0, 0x8B76, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x9456, 	 0, 0x93E1, 0x8CC1, 0x9652, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE568, 0x98A8, 0x8FE6, /* 0x50 */
+    0x98A9, 0x89B3, 	 0, 	 0, 	 0, 0x8BE3, 0x8CEE, 0x96E7, /* 0x50 */
+         0, 	 0, 0x9BA4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x9790, 	 0, 0x93FB, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8AA3, 	 0, /* 0x70 */
+    0x8B54, 	 0, 0x98AA, 	 0, 	 0, 0x98AB, 0x97B9, 	 0, /* 0x80 */
+    0x975C, 0x9188, 0x98AD, 0x8E96, 0x93F1, 	 0, 0x98B0, 	 0, /* 0x80 */
+         0, 0x895D, 0x8CDD, 	 0, 0x8CDC, 0x88E4, 	 0, 	 0, /* 0x90 */
+    0x986A, 0x9869, 	 0, 0x8DB1, 0x889F, 	 0, 0x98B1, 0x98B2, /* 0x90 */
+    0x98B3, 0x9653, 0x98B4, 	 0, 0x8CF0, 0x88E5, 0x9692, 	 0, /* 0xA0 */
+    0x8B9C, 	 0, 	 0, 0x8B9D, 0x8B9E, 0x92E0, 0x97BA, 	 0, /* 0xA0 */
+    0x98B5, 	 0, 	 0, 0x98B6, 	 0, 	 0, 0x98B7, 	 0, /* 0xB0 */
+         0, 	 0, 0x906C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x8F59, 0x906D, 0x98BC, 	 0, 0x98BA, 	 0, 0x98BB, 0x8B77, /* 0xC0 */
+         0, 	 0, 0x8DA1, 0x89EE, 	 0, 0x98B9, 0x98B8, 0x95A7, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x8E65, 0x8E64, 0x91BC, 0x98BD, /* 0xD0 */
+    0x9574, 0x90E5, 	 0, 	 0, 	 0, 0x8157, 0x98BE, 0x98C0, /* 0xD0 */
+         0, 0xFA69, 	 0, 0x91E3, 0x97DF, 0x88C8, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x98BF, 0x89BC, 	 0, /* 0xE0 */
+    0x8BC2, 	 0, 0x9287, 	 0, 	 0, 	 0, 0x8C8F, 0x98C1, /* 0xF0 */
+         0, 	 0, 	 0, 0x9443, 0xFA6A							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_4F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xFA6B, 0x8AE9,      0, 0xFA6C,      0,      0,      0,      0, /* 0x00 */
-         0, 0x98C2, 0x88C9,      0,      0, 0x8CDE, 0x8AEA, 0x959A, /* 0x00 */
-    0x94B0, 0x8B78,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x89EF,      0, 0x98E5, 0x9360,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0x948C, /* 0x20 */
-    0x98C4,      0,      0,      0, 0x94BA,      0, 0x97E0,      0, /* 0x30 */
-    0x904C, 0xFA6D, 0x8E66,      0, 0x8E97, 0x89BE,      0,      0, /* 0x30 */
-         0,      0,      0, 0x92CF,      0,      0, 0x9241, 0x98C8, /* 0x40 */
-         0,      0,      0,      0,      0, 0x88CA, 0x92E1, 0x8F5A, /* 0x40 */
-    0x8DB2, 0x9743,      0, 0x91CC,      0, 0x89BD, 0xFA6E, 0x98C7, /* 0x50 */
-         0, 0x975D, 0x98C3, 0x98C5, 0x8DEC, 0x98C6, 0x9B43,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0x98CE,      0,      0,      0,      0,      0, 0x98D1, /* 0x60 */
-    0x98CF,      0,      0, 0x89C0,      0, 0x95B9, 0x98C9,      0, /* 0x70 */
-         0,      0,      0, 0x98CD, 0x8CF1,      0,      0, 0x8E67, /* 0x70 */
-         0,      0,      0, 0x8AA4,      0,      0, 0x98D2,      0, /* 0x80 */
-    0x98CA,      0, 0xFA70, 0x97E1,      0, 0x8E98,      0, 0x98CB, /* 0x80 */
-         0, 0x98D0, 0xFA71,      0, 0xFA72,      0, 0x98D3,      0, /* 0x90 */
-    0x98CC,      0, 0xFA6F, 0x8B9F,      0, 0x88CB,      0,      0, /* 0x90 */
-    0x8BA0, 0x89BF,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x9B44,      0, 0x9699, 0x958E, 0x8CF2, /* 0xA0 */
-         0,      0,      0,      0,      0, 0x904E, 0x97B5,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0x95D6, /* 0xB0 */
-         0,      0, 0x8C57, 0x91A3, 0x89E2,      0,      0,      0, /* 0xC0 */
-         0, 0xFA61, 0x8F72,      0,      0, 0xFA73, 0x98D7,      0, /* 0xC0 */
-    0x98DC, 0x98DA,      0,      0, 0x98D5,      0,      0, 0x91AD, /* 0xD0 */
-    0x98D8,      0, 0x98DB, 0x98D9,      0, 0x95DB,      0, 0x98D6, /* 0xD0 */
-         0, 0x904D,      0, 0x9693, 0x98DD, 0x98DE,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0x8F43, 0x98EB, /* 0xE0 */
-         0,      0,      0, 0x946F,      0, 0x9555, 0x98E6,      0, /* 0xF0 */
-    0x95EE,      0, 0x89B4,      0,      0,      0, 0x98EA, 0xFA76  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xFA6B, 0x8AE9, 	 0, 0xFA6C, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x98C2, 0x88C9, 	 0, 	 0, 0x8CDE, 0x8AEA, 0x959A, /* 0x00 */
+    0x94B0, 0x8B78, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x89EF, 	 0, 0x98E5, 0x9360, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x948C, /* 0x20 */
+    0x98C4, 	 0, 	 0, 	 0, 0x94BA, 	 0, 0x97E0, 	 0, /* 0x30 */
+    0x904C, 0xFA6D, 0x8E66, 	 0, 0x8E97, 0x89BE, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x92CF, 	 0, 	 0, 0x9241, 0x98C8, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x88CA, 0x92E1, 0x8F5A, /* 0x40 */
+    0x8DB2, 0x9743, 	 0, 0x91CC, 	 0, 0x89BD, 0xFA6E, 0x98C7, /* 0x50 */
+         0, 0x975D, 0x98C3, 0x98C5, 0x8DEC, 0x98C6, 0x9B43, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x98CE, 	 0, 	 0, 	 0, 	 0, 	 0, 0x98D1, /* 0x60 */
+    0x98CF, 	 0, 	 0, 0x89C0, 	 0, 0x95B9, 0x98C9, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x98CD, 0x8CF1, 	 0, 	 0, 0x8E67, /* 0x70 */
+         0, 	 0, 	 0, 0x8AA4, 	 0, 	 0, 0x98D2, 	 0, /* 0x80 */
+    0x98CA, 	 0, 0xFA70, 0x97E1, 	 0, 0x8E98, 	 0, 0x98CB, /* 0x80 */
+         0, 0x98D0, 0xFA71, 	 0, 0xFA72, 	 0, 0x98D3, 	 0, /* 0x90 */
+    0x98CC, 	 0, 0xFA6F, 0x8B9F, 	 0, 0x88CB, 	 0, 	 0, /* 0x90 */
+    0x8BA0, 0x89BF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x9B44, 	 0, 0x9699, 0x958E, 0x8CF2, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x904E, 0x97B5, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x95D6, /* 0xB0 */
+         0, 	 0, 0x8C57, 0x91A3, 0x89E2, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xFA61, 0x8F72, 	 0, 	 0, 0xFA73, 0x98D7, 	 0, /* 0xC0 */
+    0x98DC, 0x98DA, 	 0, 	 0, 0x98D5, 	 0, 	 0, 0x91AD, /* 0xD0 */
+    0x98D8, 	 0, 0x98DB, 0x98D9, 	 0, 0x95DB, 	 0, 0x98D6, /* 0xD0 */
+         0, 0x904D, 	 0, 0x9693, 0x98DD, 0x98DE, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8F43, 0x98EB, /* 0xE0 */
+         0, 	 0, 	 0, 0x946F, 	 0, 0x9555, 0x98E6, 	 0, /* 0xF0 */
+    0x95EE, 	 0, 0x89B4, 	 0, 	 0, 	 0, 0x98EA, 0xFA76	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_50[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0x98E4, 0x98ED,      0, /* 0x00 */
-         0, 0x9171,      0, 0x8CC2,      0, 0x947B,      0, 0xE0C5, /* 0x00 */
-         0, 0x98EC, 0x937C,      0, 0x98E1,      0, 0x8CF4,      0, /* 0x10 */
-         0, 0x8CF3, 0x98DF,      0,      0,      0, 0xFA77, 0x8ED8, /* 0x10 */
-         0, 0x98E7, 0xFA75, 0x95ED, 0x926C, 0x98E3, 0x8C91,      0, /* 0x20 */
-    0x98E0, 0x98E8, 0x98E2, 0x97CF, 0x98E9, 0x9860,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x8BE4,      0, /* 0x30 */
-         0, 0x8C90,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xFA74,      0, 0xFA7A, 0x98EE,      0,      0, 0xFA78, 0x98EF, /* 0x40 */
-    0x98F3, 0x88CC,      0,      0,      0,      0,      0, 0x95CE, /* 0x40 */
-    0x98F2,      0,      0,      0,      0, 0x98F1, 0x98F5,      0, /* 0x50 */
-         0,      0, 0x98F4,      0, 0x92E2,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0x8C92,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0x98F6,      0,      0,      0, /* 0x60 */
-    0xFA79,      0, 0x8EC3,      0, 0x91A4, 0x92E3, 0x8BF4,      0, /* 0x70 */
-    0x98F7,      0,      0,      0,      0, 0x8B55,      0,      0, /* 0x70 */
-    0x98F8,      0,      0,      0,      0, 0x98FA,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x9654,      0,      0, /* 0x80 */
-         0, 0x8C86,      0,      0, 0xFA7B,      0,      0,      0, /* 0x90 */
-    0x8E50, 0x94F5, 0x98F9,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x8DC3, 0x9762,      0,      0, /* 0xA0 */
-         0,      0, 0x98FC, 0x9942, 0x98FB, 0x8DC2,      0, 0x8F9D, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x8C58,      0, /* 0xB0 */
-         0,      0, 0x9943,      0,      0, 0x8BCD,      0,      0, /* 0xC0 */
-         0, 0x9940, 0x9941,      0,      0, 0x93AD,      0, 0x919C, /* 0xC0 */
-         0, 0x8BA1,      0,      0,      0, 0x966C, 0x9944,      0, /* 0xD0 */
-    0xFA7D,      0, 0x97BB,      0,      0,      0, 0x9945,      0, /* 0xD0 */
-         0,      0,      0, 0x9948,      0, 0x9946,      0, 0x916D, /* 0xE0 */
-         0,      0,      0,      0,      0, 0x9947, 0x9949,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xFA7C, 0x994B,      0,      0, /* 0xF0 */
-         0, 0x994A,      0, 0x95C6                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0x98E4, 0x98ED, 	 0, /* 0x00 */
+         0, 0x9171, 	 0, 0x8CC2, 	 0, 0x947B, 	 0, 0xE0C5, /* 0x00 */
+         0, 0x98EC, 0x937C, 	 0, 0x98E1, 	 0, 0x8CF4, 	 0, /* 0x10 */
+         0, 0x8CF3, 0x98DF, 	 0, 	 0, 	 0, 0xFA77, 0x8ED8, /* 0x10 */
+         0, 0x98E7, 0xFA75, 0x95ED, 0x926C, 0x98E3, 0x8C91, 	 0, /* 0x20 */
+    0x98E0, 0x98E8, 0x98E2, 0x97CF, 0x98E9, 0x9860, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8BE4, 	 0, /* 0x30 */
+         0, 0x8C90, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xFA74, 	 0, 0xFA7A, 0x98EE, 	 0, 	 0, 0xFA78, 0x98EF, /* 0x40 */
+    0x98F3, 0x88CC, 	 0, 	 0, 	 0, 	 0, 	 0, 0x95CE, /* 0x40 */
+    0x98F2, 	 0, 	 0, 	 0, 	 0, 0x98F1, 0x98F5, 	 0, /* 0x50 */
+         0, 	 0, 0x98F4, 	 0, 0x92E2, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x8C92, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x98F6, 	 0, 	 0, 	 0, /* 0x60 */
+    0xFA79, 	 0, 0x8EC3, 	 0, 0x91A4, 0x92E3, 0x8BF4, 	 0, /* 0x70 */
+    0x98F7, 	 0, 	 0, 	 0, 	 0, 0x8B55, 	 0, 	 0, /* 0x70 */
+    0x98F8, 	 0, 	 0, 	 0, 	 0, 0x98FA, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9654, 	 0, 	 0, /* 0x80 */
+         0, 0x8C86, 	 0, 	 0, 0xFA7B, 	 0, 	 0, 	 0, /* 0x90 */
+    0x8E50, 0x94F5, 0x98F9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x8DC3, 0x9762, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x98FC, 0x9942, 0x98FB, 0x8DC2, 	 0, 0x8F9D, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8C58, 	 0, /* 0xB0 */
+         0, 	 0, 0x9943, 	 0, 	 0, 0x8BCD, 	 0, 	 0, /* 0xC0 */
+         0, 0x9940, 0x9941, 	 0, 	 0, 0x93AD, 	 0, 0x919C, /* 0xC0 */
+         0, 0x8BA1, 	 0, 	 0, 	 0, 0x966C, 0x9944, 	 0, /* 0xD0 */
+    0xFA7D, 	 0, 0x97BB, 	 0, 	 0, 	 0, 0x9945, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x9948, 	 0, 0x9946, 	 0, 0x916D, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9947, 0x9949, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xFA7C, 0x994B, 	 0, 	 0, /* 0xF0 */
+         0, 0x994A, 	 0, 0x95C6									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_51[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x8B56, 0x994D, 0x994E,      0, 0x89AD,      0,      0,      0, /* 0x00 */
-         0, 0x994C,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0x8EF2,      0, 0x9951, 0x9950, 0x994F,      0, /* 0x10 */
-    0x98D4,      0, 0x9952,      0,      0,      0,      0, 0x8F9E, /* 0x10 */
-         0, 0x9953,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x9744,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x96D7,      0,      0,      0,      0, 0x9955, /* 0x30 */
-         0,      0, 0x9954, 0x9957, 0x9956,      0,      0, 0x9958, /* 0x30 */
-    0x9959, 0x88F2,      0, 0x8CB3, 0x8C5A, 0x8F5B, 0x929B, 0x8BA2, /* 0x40 */
-    0x90E6, 0x8CF5, 0xFA7E, 0x8D8E, 0x995B, 0x96C6, 0x9365,      0, /* 0x40 */
-    0x8E99,      0, 0x995A,      0, 0x995C,      0,      0,      0, /* 0x50 */
-         0,      0, 0x937D,      0, 0x8A95,      0,      0,      0, /* 0x50 */
-         0,      0, 0x995D,      0, 0xFA80, 0x93FC,      0,      0, /* 0x60 */
-    0x9153, 0x995F, 0x9960, 0x94AA, 0x8CF6, 0x985A, 0x9961,      0, /* 0x60 */
-         0, 0x8BA4,      0,      0,      0, 0x95BA, 0x91B4, 0x8BEF, /* 0x70 */
-    0x9354,      0,      0,      0, 0x8C93,      0,      0,      0, /* 0x70 */
-    0x9962,      0, 0x9963,      0,      0, 0x93E0, 0x897E,      0, /* 0x80 */
-         0, 0x9966, 0x8DFB,      0, 0x9965, 0x8DC4,      0, 0x9967, /* 0x80 */
-    0xE3EC, 0x9968, 0x9660, 0x9969,      0, 0x996A, 0x996B, 0x8FE7, /* 0x90 */
-         0, 0x8ECA,      0,      0,      0, 0xFA81,      0,      0, /* 0x90 */
-    0x8AA5,      0, 0x996E,      0, 0x996C, 0x96BB, 0x996D,      0, /* 0xA0 */
-    0x9579, 0x996F, 0x9970, 0x9971, 0x937E,      0,      0,      0, /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x8B56, 0x994D, 0x994E, 	 0, 0x89AD, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x994C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x8EF2, 	 0, 0x9951, 0x9950, 0x994F, 	 0, /* 0x10 */
+    0x98D4, 	 0, 0x9952, 	 0, 	 0, 	 0, 	 0, 0x8F9E, /* 0x10 */
+         0, 0x9953, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x9744, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x96D7, 	 0, 	 0, 	 0, 	 0, 0x9955, /* 0x30 */
+         0, 	 0, 0x9954, 0x9957, 0x9956, 	 0, 	 0, 0x9958, /* 0x30 */
+    0x9959, 0x88F2, 	 0, 0x8CB3, 0x8C5A, 0x8F5B, 0x929B, 0x8BA2, /* 0x40 */
+    0x90E6, 0x8CF5, 0xFA7E, 0x8D8E, 0x995B, 0x96C6, 0x9365, 	 0, /* 0x40 */
+    0x8E99, 	 0, 0x995A, 	 0, 0x995C, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x937D, 	 0, 0x8A95, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x995D, 	 0, 0xFA80, 0x93FC, 	 0, 	 0, /* 0x60 */
+    0x9153, 0x995F, 0x9960, 0x94AA, 0x8CF6, 0x985A, 0x9961, 	 0, /* 0x60 */
+         0, 0x8BA4, 	 0, 	 0, 	 0, 0x95BA, 0x91B4, 0x8BEF, /* 0x70 */
+    0x9354, 	 0, 	 0, 	 0, 0x8C93, 	 0, 	 0, 	 0, /* 0x70 */
+    0x9962, 	 0, 0x9963, 	 0, 	 0, 0x93E0, 0x897E, 	 0, /* 0x80 */
+         0, 0x9966, 0x8DFB, 	 0, 0x9965, 0x8DC4, 	 0, 0x9967, /* 0x80 */
+    0xE3EC, 0x9968, 0x9660, 0x9969, 	 0, 0x996A, 0x996B, 0x8FE7, /* 0x90 */
+         0, 0x8ECA, 	 0, 	 0, 	 0, 0xFA81, 	 0, 	 0, /* 0x90 */
+    0x8AA5, 	 0, 0x996E, 	 0, 0x996C, 0x96BB, 0x996D, 	 0, /* 0xA0 */
+    0x9579, 0x996F, 0x9970, 0x9971, 0x937E, 	 0, 	 0, 	 0, /* 0xA0 */
     0x9975, 0x9973, 0x9974, 0x9972, 0x8DE1, 0x9976, 0x96E8, 0x97E2, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x9977, 0xFA82,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x90A6, 0x9978, 0x8F79,      0, /* 0xC0 */
-         0, 0x9979,      0, 0x929C, 0x97BD, 0x9380,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0x99C3,      0, /* 0xD0 */
-         0,      0,      0, 0x997A, 0xEAA3, 0x8BC3,      0,      0, /* 0xD0 */
-    0x997B, 0x967D,      0,      0,      0,      0, 0x8F88, 0x91FA, /* 0xE0 */
-         0, 0x997D, 0x93E2,      0, 0xFA83, 0x997E,      0,      0, /* 0xE0 */
-    0x9980, 0x8A4D,      0,      0,      0, 0x9981, 0x8BA5,      0, /* 0xF0 */
-    0x93CA, 0x899A, 0x8F6F,      0,      0, 0x949F, 0x9982          /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9977, 0xFA82, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x90A6, 0x9978, 0x8F79, 	 0, /* 0xC0 */
+         0, 0x9979, 	 0, 0x929C, 0x97BD, 0x9380, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x99C3, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x997A, 0xEAA3, 0x8BC3, 	 0, 	 0, /* 0xD0 */
+    0x997B, 0x967D, 	 0, 	 0, 	 0, 	 0, 0x8F88, 0x91FA, /* 0xE0 */
+         0, 0x997D, 0x93E2, 	 0, 0xFA83, 0x997E, 	 0, 	 0, /* 0xE0 */
+    0x9980, 0x8A4D, 	 0, 	 0, 	 0, 0x9981, 0x8BA5, 	 0, /* 0xF0 */
+    0x93CA, 0x899A, 0x8F6F, 	 0, 	 0, 0x949F, 0x9982			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_52[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x9381,      0,      0, 0x906E, 0x9983,      0, 0x95AA, 0x90D8, /* 0x00 */
-    0x8AA0,      0, 0x8AA7, 0x9984,      0,      0, 0x9986,      0, /* 0x00 */
-         0, 0x8C59,      0,      0, 0x9985, 0xFA84,      0, 0x97F1, /* 0x10 */
-         0,      0,      0,      0,      0, 0x8F89,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0x94BB, 0x95CA,      0, 0x9987, /* 0x20 */
-         0, 0x9798, 0x9988,      0,      0,      0, 0x9989,      0, /* 0x20 */
-    0x939E,      0,      0, 0x998A,      0,      0, 0x90A7, 0x8DFC, /* 0x30 */
-    0x8C94, 0x998B, 0x8E68, 0x8D8F,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x92E4, 0x998D,      0,      0, 0x91A5, /* 0x40 */
-         0,      0, 0x8DED, 0x998E, 0x998F, 0x914F,      0, 0x998C, /* 0x40 */
-         0,      0,      0,      0, 0x9991,      0, 0x9655,      0, /* 0x50 */
-         0,      0,      0, 0x8D84,      0,      0, 0x9990,      0, /* 0x50 */
-         0,      0,      0, 0x8C95, 0x8DDC, 0x948D,      0,      0, /* 0x60 */
-         0, 0x9994, 0x9992,      0,      0,      0,      0, 0x959B, /* 0x60 */
-    0x8FE8, 0x999B, 0x8A84, 0x9995, 0x9993, 0x916E,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0x9997,      0, 0x9996, /* 0x70 */
-         0,      0,      0, 0x8A63,      0,      0,      0, 0x8C80, /* 0x80 */
-    0x999C, 0x97AB,      0,      0,      0, 0x9998,      0,      0, /* 0x80 */
-         0, 0x999D, 0x999A,      0, 0x9999,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0x97CD, 0xFA85,      0,      0, 0x8CF7, /* 0x90 */
-    0x89C1,      0,      0, 0x97F2,      0,      0, 0xFA86,      0, /* 0xA0 */
-         0, 0x8F95, 0x9377, 0x8D85, 0x99A0, 0x99A1,      0, 0xFB77, /* 0xA0 */
-         0, 0x97E3,      0,      0, 0x984A, 0x99A3,      0,      0, /* 0xB0 */
-         0, 0x8CF8,      0,      0, 0x99A2,      0, 0x8A4E,      0, /* 0xB0 */
-    0xFA87, 0x99A4,      0, 0x9675,      0, 0x92BA,      0, 0x9745, /* 0xC0 */
-         0, 0x95D7,      0,      0,      0, 0x99A5,      0,      0, /* 0xC0 */
-         0,      0, 0xE8D3,      0,      0, 0x93AE,      0, 0x99A6, /* 0xD0 */
-    0x8AA8, 0x96B1,      0, 0xFA88,      0, 0x8F9F, 0x99A7, 0x95E5, /* 0xD0 */
-    0x99AB,      0, 0x90A8, 0x99A8, 0x8BCE,      0, 0x99A9, 0x8AA9, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0x8C4D, 0x99AC,      0, 0x99AD,      0,      0, /* 0xF0 */
-    0x99AE, 0x99AF, 0x8ED9,      0,      0,      0, 0x8CF9, 0x96DC  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x9381, 	 0, 	 0, 0x906E, 0x9983, 	 0, 0x95AA, 0x90D8, /* 0x00 */
+    0x8AA0, 	 0, 0x8AA7, 0x9984, 	 0, 	 0, 0x9986, 	 0, /* 0x00 */
+         0, 0x8C59, 	 0, 	 0, 0x9985, 0xFA84, 	 0, 0x97F1, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x8F89, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x94BB, 0x95CA, 	 0, 0x9987, /* 0x20 */
+         0, 0x9798, 0x9988, 	 0, 	 0, 	 0, 0x9989, 	 0, /* 0x20 */
+    0x939E, 	 0, 	 0, 0x998A, 	 0, 	 0, 0x90A7, 0x8DFC, /* 0x30 */
+    0x8C94, 0x998B, 0x8E68, 0x8D8F, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x92E4, 0x998D, 	 0, 	 0, 0x91A5, /* 0x40 */
+         0, 	 0, 0x8DED, 0x998E, 0x998F, 0x914F, 	 0, 0x998C, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x9991, 	 0, 0x9655, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x8D84, 	 0, 	 0, 0x9990, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x8C95, 0x8DDC, 0x948D, 	 0, 	 0, /* 0x60 */
+         0, 0x9994, 0x9992, 	 0, 	 0, 	 0, 	 0, 0x959B, /* 0x60 */
+    0x8FE8, 0x999B, 0x8A84, 0x9995, 0x9993, 0x916E, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9997, 	 0, 0x9996, /* 0x70 */
+         0, 	 0, 	 0, 0x8A63, 	 0, 	 0, 	 0, 0x8C80, /* 0x80 */
+    0x999C, 0x97AB, 	 0, 	 0, 	 0, 0x9998, 	 0, 	 0, /* 0x80 */
+         0, 0x999D, 0x999A, 	 0, 0x9999, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x97CD, 0xFA85, 	 0, 	 0, 0x8CF7, /* 0x90 */
+    0x89C1, 	 0, 	 0, 0x97F2, 	 0, 	 0, 0xFA86, 	 0, /* 0xA0 */
+         0, 0x8F95, 0x9377, 0x8D85, 0x99A0, 0x99A1, 	 0, 0xFB77, /* 0xA0 */
+         0, 0x97E3, 	 0, 	 0, 0x984A, 0x99A3, 	 0, 	 0, /* 0xB0 */
+         0, 0x8CF8, 	 0, 	 0, 0x99A2, 	 0, 0x8A4E, 	 0, /* 0xB0 */
+    0xFA87, 0x99A4, 	 0, 0x9675, 	 0, 0x92BA, 	 0, 0x9745, /* 0xC0 */
+         0, 0x95D7, 	 0, 	 0, 	 0, 0x99A5, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE8D3, 	 0, 	 0, 0x93AE, 	 0, 0x99A6, /* 0xD0 */
+    0x8AA8, 0x96B1, 	 0, 0xFA88, 	 0, 0x8F9F, 0x99A7, 0x95E5, /* 0xD0 */
+    0x99AB, 	 0, 0x90A8, 0x99A8, 0x8BCE, 	 0, 0x99A9, 0x8AA9, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x8C4D, 0x99AC, 	 0, 0x99AD, 	 0, 	 0, /* 0xF0 */
+    0x99AE, 0x99AF, 0x8ED9, 	 0, 	 0, 	 0, 0x8CF9, 0x96DC	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_53[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xFA89, 0x96E6, 0x93F5,      0,      0, 0x95EF, 0x99B0, 0xFA8A, /* 0x00 */
-    0x99B1,      0,      0,      0,      0, 0x99B3,      0, 0x99B5, /* 0x00 */
-    0x99B4,      0,      0,      0,      0, 0x99B6, 0x89BB, 0x966B, /* 0x10 */
-         0, 0x8DFA, 0x99B7,      0,      0, 0x9178,      0,      0, /* 0x10 */
-    0x8FA0, 0x8BA7,      0, 0x99B8, 0xFA8B,      0,      0,      0, /* 0x20 */
-         0,      0, 0x94D9,      0,      0,      0,      0, 0x99B9, /* 0x20 */
-         0, 0x99BA,      0, 0x99BB,      0,      0,      0,      0, /* 0x30 */
-    0x99BC, 0x9543, 0x8BE6, 0x88E3,      0,      0,      0, 0x93BD, /* 0x30 */
-    0x99BD, 0x8F5C,      0, 0x90E7,      0, 0x99BF, 0x99BE, 0x8FA1, /* 0x40 */
-    0x8CDF, 0x99C1, 0x94BC,      0,      0, 0x99C2,      0,      0, /* 0x40 */
-         0, 0x94DA, 0x91B2, 0x91EC, 0x8BA6,      0,      0, 0x93EC, /* 0x50 */
-    0x9250,      0, 0x948E,      0, 0x966D,      0, 0x99C4,      0, /* 0x50 */
-    0x90E8,      0,      0,      0,      0,      0, 0x8C54,      0, /* 0x60 */
-         0, 0x99C5,      0,      0,      0,      0, 0x99C6, 0x894B, /* 0x60 */
-    0x88F3, 0x8AEB, 0xFA8C, 0x91A6, 0x8B70, 0x9791,      0, 0x99C9, /* 0x70 */
-    0x89B5,      0,      0, 0x99C8,      0,      0,      0, 0x8BA8, /* 0x70 */
-         0,      0, 0x99CA,      0, 0x96EF,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xFA8D,      0,      0, 0x99CB,      0, /* 0x90 */
-    0x97D0,      0, 0x8CFA,      0,      0,      0,      0, 0x8CB4, /* 0x90 */
-    0x99CC,      0,      0,      0,      0, 0x99CE, 0x99CD,      0, /* 0xA0 */
-    0x907E, 0x8958,      0,      0,      0, 0x897D, 0x99CF,      0, /* 0xA0 */
-    0x99D0,      0, 0xFA8E, 0x8CB5,      0,      0, 0x99D1,      0, /* 0xB0 */
-         0,      0,      0, 0x8B8E,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x8E51, 0x99D2,      0,      0,      0,      0, /* 0xC0 */
-    0x9694, 0x8DB3, 0x8B79, 0x9746, 0x916F, 0x94BD, 0x8EFB,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x8F66,      0, 0x8EE6, 0x8EF3, /* 0xD0 */
-         0, 0x8F96,      0, 0x94BE,      0, 0xFA8F,      0, 0x99D5, /* 0xD0 */
-         0, 0x8962, 0x9170, 0x8CFB, 0x8CC3, 0x8BE5,      0,      0, /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xFA89, 0x96E6, 0x93F5, 	 0, 	 0, 0x95EF, 0x99B0, 0xFA8A, /* 0x00 */
+    0x99B1, 	 0, 	 0, 	 0, 	 0, 0x99B3, 	 0, 0x99B5, /* 0x00 */
+    0x99B4, 	 0, 	 0, 	 0, 	 0, 0x99B6, 0x89BB, 0x966B, /* 0x10 */
+         0, 0x8DFA, 0x99B7, 	 0, 	 0, 0x9178, 	 0, 	 0, /* 0x10 */
+    0x8FA0, 0x8BA7, 	 0, 0x99B8, 0xFA8B, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x94D9, 	 0, 	 0, 	 0, 	 0, 0x99B9, /* 0x20 */
+         0, 0x99BA, 	 0, 0x99BB, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x99BC, 0x9543, 0x8BE6, 0x88E3, 	 0, 	 0, 	 0, 0x93BD, /* 0x30 */
+    0x99BD, 0x8F5C, 	 0, 0x90E7, 	 0, 0x99BF, 0x99BE, 0x8FA1, /* 0x40 */
+    0x8CDF, 0x99C1, 0x94BC, 	 0, 	 0, 0x99C2, 	 0, 	 0, /* 0x40 */
+         0, 0x94DA, 0x91B2, 0x91EC, 0x8BA6, 	 0, 	 0, 0x93EC, /* 0x50 */
+    0x9250, 	 0, 0x948E, 	 0, 0x966D, 	 0, 0x99C4, 	 0, /* 0x50 */
+    0x90E8, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8C54, 	 0, /* 0x60 */
+         0, 0x99C5, 	 0, 	 0, 	 0, 	 0, 0x99C6, 0x894B, /* 0x60 */
+    0x88F3, 0x8AEB, 0xFA8C, 0x91A6, 0x8B70, 0x9791, 	 0, 0x99C9, /* 0x70 */
+    0x89B5, 	 0, 	 0, 0x99C8, 	 0, 	 0, 	 0, 0x8BA8, /* 0x70 */
+         0, 	 0, 0x99CA, 	 0, 0x96EF, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xFA8D, 	 0, 	 0, 0x99CB, 	 0, /* 0x90 */
+    0x97D0, 	 0, 0x8CFA, 	 0, 	 0, 	 0, 	 0, 0x8CB4, /* 0x90 */
+    0x99CC, 	 0, 	 0, 	 0, 	 0, 0x99CE, 0x99CD, 	 0, /* 0xA0 */
+    0x907E, 0x8958, 	 0, 	 0, 	 0, 0x897D, 0x99CF, 	 0, /* 0xA0 */
+    0x99D0, 	 0, 0xFA8E, 0x8CB5, 	 0, 	 0, 0x99D1, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x8B8E, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x8E51, 0x99D2, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x9694, 0x8DB3, 0x8B79, 0x9746, 0x916F, 0x94BD, 0x8EFB, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x8F66, 	 0, 0x8EE6, 0x8EF3, /* 0xD0 */
+         0, 0x8F96, 	 0, 0x94BE, 	 0, 0xFA8F, 	 0, 0x99D5, /* 0xD0 */
+         0, 0x8962, 0x9170, 0x8CFB, 0x8CC3, 0x8BE5, 	 0, 	 0, /* 0xE0 */
     0x99D9, 0x9240, 0x91FC, 0x8BA9, 0x8FA2, 0x99DA, 0x99D8, 0x89C2, /* 0xE0 */
-    0x91E4, 0x8EB6, 0x8E6A, 0x8945,      0,      0, 0x8A90, 0x8D86, /* 0xF0 */
-    0x8E69,      0, 0x99DB                                          /* 0xF0 */
+    0x91E4, 0x8EB6, 0x8E6A, 0x8945, 	 0, 	 0, 0x8A90, 0x8D86, /* 0xF0 */
+    0x8E69, 	 0, 0x99DB											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_54[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x99DC,      0, 0x8B68, 0x8A65,      0,      0,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x99DC, 	 0, 0x8B68, 0x8A65, 	 0, 	 0, 	 0, /* 0x00 */
     0x8D87, 0x8B67, 0x92DD, 0x8944, 0x93AF, 0x96BC, 0x8D40, 0x9799, /* 0x00 */
-    0x9366, 0x8CFC,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0x8C4E,      0, 0x99E5,      0, 0x8BE1, /* 0x10 */
-    0x9669,      0,      0,      0,      0,      0, 0x94DB,      0, /* 0x20 */
-         0, 0x99E4,      0, 0x8ADC, 0x99DF, 0x99E0, 0x99E2,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x99E3,      0, /* 0x30 */
-    0x8B7A, 0x9081,      0, 0x95AB, 0x99E1, 0x99DD, 0x8CE1,      0, /* 0x30 */
-    0x99DE,      0, 0x9843,      0,      0,      0, 0x95F0,      0, /* 0x40 */
-    0x92E6, 0x8CE0, 0x8D90,      0,      0,      0, 0x99E6,      0, /* 0x40 */
-         0, 0x93DB,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0x99EA, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0x8EFC,      0, 0x8EF4,      0,      0,      0,      0,      0, /* 0x60 */
-    0x99ED, 0x99EB,      0, 0x96A1,      0, 0x99E8, 0x99F1, 0x99EC, /* 0x70 */
-         0,      0,      0, 0x99EF, 0x8CC4, 0x96BD,      0,      0, /* 0x70 */
-    0x99F0,      0,      0,      0, 0x99F2,      0, 0x99F4,      0, /* 0x80 */
-         0,      0, 0xFA92, 0x8DEE, 0x9861,      0, 0x99E9, 0x99E7, /* 0x80 */
-    0x99F3,      0, 0x99EE,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xFA91,      0,      0,      0, /* 0x90 */
-         0,      0, 0x99F6,      0, 0x9A42, 0x99F8,      0,      0, /* 0xA0 */
-    0x99FC, 0xFA93,      0, 0x9A40, 0x99F9,      0,      0, 0x9A5D, /* 0xA0 */
-         0,      0, 0x8DE7, 0x8A50,      0,      0,      0,      0, /* 0xB0 */
-    0x99F7,      0,      0,      0, 0x9A44, 0x88F4, 0x9A43,      0, /* 0xB0 */
-    0x88A3, 0x9569, 0x9A41,      0, 0x99FA,      0,      0, 0x99F5, /* 0xC0 */
-    0x99FB, 0x8DC6,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x9A45,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x88F5, 0x9A4E,      0,      0, 0x9A46, 0x9A47,      0, /* 0xE0 */
-    0x8FA3, 0x9689,      0,      0,      0, 0x9A4C, 0x9A4B,      0, /* 0xE0 */
-         0,      0, 0x934E,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x9A4D,      0,      0, 0x9A4A,      0, 0xFA94  /* 0xF0 */
+    0x9366, 0x8CFC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x8C4E, 	 0, 0x99E5, 	 0, 0x8BE1, /* 0x10 */
+    0x9669, 	 0, 	 0, 	 0, 	 0, 	 0, 0x94DB, 	 0, /* 0x20 */
+         0, 0x99E4, 	 0, 0x8ADC, 0x99DF, 0x99E0, 0x99E2, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x99E3, 	 0, /* 0x30 */
+    0x8B7A, 0x9081, 	 0, 0x95AB, 0x99E1, 0x99DD, 0x8CE1, 	 0, /* 0x30 */
+    0x99DE, 	 0, 0x9843, 	 0, 	 0, 	 0, 0x95F0, 	 0, /* 0x40 */
+    0x92E6, 0x8CE0, 0x8D90, 	 0, 	 0, 	 0, 0x99E6, 	 0, /* 0x40 */
+         0, 0x93DB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x99EA, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x8EFC, 	 0, 0x8EF4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x99ED, 0x99EB, 	 0, 0x96A1, 	 0, 0x99E8, 0x99F1, 0x99EC, /* 0x70 */
+         0, 	 0, 	 0, 0x99EF, 0x8CC4, 0x96BD, 	 0, 	 0, /* 0x70 */
+    0x99F0, 	 0, 	 0, 	 0, 0x99F2, 	 0, 0x99F4, 	 0, /* 0x80 */
+         0, 	 0, 0xFA92, 0x8DEE, 0x9861, 	 0, 0x99E9, 0x99E7, /* 0x80 */
+    0x99F3, 	 0, 0x99EE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xFA91, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x99F6, 	 0, 0x9A42, 0x99F8, 	 0, 	 0, /* 0xA0 */
+    0x99FC, 0xFA93, 	 0, 0x9A40, 0x99F9, 	 0, 	 0, 0x9A5D, /* 0xA0 */
+         0, 	 0, 0x8DE7, 0x8A50, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x99F7, 	 0, 	 0, 	 0, 0x9A44, 0x88F4, 0x9A43, 	 0, /* 0xB0 */
+    0x88A3, 0x9569, 0x9A41, 	 0, 0x99FA, 	 0, 	 0, 0x99F5, /* 0xC0 */
+    0x99FB, 0x8DC6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x9A45, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x88F5, 0x9A4E, 	 0, 	 0, 0x9A46, 0x9A47, 	 0, /* 0xE0 */
+    0x8FA3, 0x9689, 	 0, 	 0, 	 0, 0x9A4C, 0x9A4B, 	 0, /* 0xE0 */
+         0, 	 0, 0x934E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x9A4D, 	 0, 	 0, 0x9A4A, 	 0, 0xFA94	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_55[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0x8953,      0, 0x8DB4, 0x904F, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0, 0x9A48, /* 0x00 */
-    0x9382,      0,      0,      0, 0x9A49,      0, 0x88A0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x9A53, 0x9742, /* 0x20 */
-         0, 0x8FA5,      0, 0x9A59,      0,      0,      0,      0, /* 0x30 */
-    0x9A58, 0x9A4F,      0,      0,      0,      0, 0x91C1,      0, /* 0x30 */
-    0x9A50,      0,      0,      0, 0x91ED, 0x9A55, 0x8FA4,      0, /* 0x40 */
-         0,      0,      0,      0, 0x9A52,      0,      0, 0x96E2, /* 0x40 */
-         0,      0,      0, 0x8C5B,      0,      0, 0x9A56, 0x9A57, /* 0x50 */
-         0,      0,      0,      0, 0x9A54, 0x9A5A,      0,      0, /* 0x50 */
-         0,      0,      0, 0x9A51,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0x9A60, 0x9A65,      0, 0x9A61,      0, /* 0x70 */
-    0x9A5C,      0,      0, 0x9A66, 0x9150,      0, 0xFA95, 0x9A68, /* 0x80 */
-         0, 0x8D41, 0x9A5E, 0x929D,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x9A62, 0x9A5B, 0x8AAB,      0, 0x8AEC, 0x8A85, 0x9A63, 0x9A5F, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0x8C96, /* 0xA0 */
-    0x9A69, 0x9A67, 0x9172, 0x8B69, 0x8BAA,      0, 0x9A64,      0, /* 0xA0 */
-    0x8BF2,      0,      0,      0,      0,      0, 0x8963,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x9A6D, 0x9A6B,      0, 0x9AA5, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x9A70,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x9A6A,      0, 0x9A6E,      0,      0, 0x9A6C, /* 0xD0 */
-         0,      0,      0, 0x8E6B, 0x9A6F,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0x9A72, /* 0xF0 */
-         0, 0x9A77,      0,      0,      0, 0x9A75, 0x9A74          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0x8953, 	 0, 0x8DB4, 0x904F, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9A48, /* 0x00 */
+    0x9382, 	 0, 	 0, 	 0, 0x9A49, 	 0, 0x88A0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9A53, 0x9742, /* 0x20 */
+         0, 0x8FA5, 	 0, 0x9A59, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x9A58, 0x9A4F, 	 0, 	 0, 	 0, 	 0, 0x91C1, 	 0, /* 0x30 */
+    0x9A50, 	 0, 	 0, 	 0, 0x91ED, 0x9A55, 0x8FA4, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x9A52, 	 0, 	 0, 0x96E2, /* 0x40 */
+         0, 	 0, 	 0, 0x8C5B, 	 0, 	 0, 0x9A56, 0x9A57, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x9A54, 0x9A5A, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x9A51, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x9A60, 0x9A65, 	 0, 0x9A61, 	 0, /* 0x70 */
+    0x9A5C, 	 0, 	 0, 0x9A66, 0x9150, 	 0, 0xFA95, 0x9A68, /* 0x80 */
+         0, 0x8D41, 0x9A5E, 0x929D, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x9A62, 0x9A5B, 0x8AAB, 	 0, 0x8AEC, 0x8A85, 0x9A63, 0x9A5F, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8C96, /* 0xA0 */
+    0x9A69, 0x9A67, 0x9172, 0x8B69, 0x8BAA, 	 0, 0x9A64, 	 0, /* 0xA0 */
+    0x8BF2, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8963, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x9A6D, 0x9A6B, 	 0, 0x9AA5, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x9A70, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x9A6A, 	 0, 0x9A6E, 	 0, 	 0, 0x9A6C, /* 0xD0 */
+         0, 	 0, 	 0, 0x8E6B, 0x9A6F, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9A72, /* 0xF0 */
+         0, 0x9A77, 	 0, 	 0, 	 0, 0x9A75, 0x9A74			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_56[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0x9251,      0, /* 0x00 */
-         0, 0x89C3,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0x9A71,      0, 0x9A73, 0x8FA6, /* 0x10 */
-    0x8952,      0,      0, 0x9A76,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0x89DC,      0,      0,      0,      0,      0, 0x9A82, /* 0x20 */
-         0, 0x8FFA, 0x9A7D,      0, 0x9A7B,      0, 0x9A7C,      0, /* 0x30 */
-    0x9A7E,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0x895C,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0x9158,      0, 0x9A78,      0, /* 0x40 */
-    0x9A79,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0x8A9A,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0x9A81,      0,      0,      0, /* 0x60 */
-    0x8AED,      0, 0x9A84, 0x9A80, 0x9A83,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0x95AC,      0,      0,      0, /* 0x70 */
-    0x93D3,      0, 0x94B6,      0,      0,      0,      0,      0, /* 0x70 */
-    0x9A86,      0,      0,      0,      0,      0, 0x9A85, 0x8A64, /* 0x80 */
-         0,      0, 0x9A87,      0,      0,      0,      0, 0x9A8A, /* 0x80 */
-         0,      0,      0,      0, 0x9A89,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x9A88,      0, 0x9458,      0,      0, 0x9A8B,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0x9A8C,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x9A8E,      0, 0x9A8D,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x9A90,      0,      0,      0, /* 0xB0 */
-    0x9A93, 0x9A91, 0x9A8F, 0x9A92,      0,      0,      0,      0, /* 0xC0 */
-    0x9A94,      0,      0,      0,      0,      0, 0x9A95,      0, /* 0xC0 */
-         0, 0x9A96,      0, 0x9A97,      0,      0,      0, 0x9A98, /* 0xD0 */
-    0x9964,      0, 0x8EFA, 0x8E6C,      0,      0, 0x89F1,      0, /* 0xD0 */
-    0x88F6,      0,      0, 0x9263,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0x9A99,      0, /* 0xE0 */
-    0x8DA2,      0, 0x88CD, 0x907D,      0,      0,      0,      0, /* 0xF0 */
-         0, 0x9A9A, 0x8CC5,      0,      0, 0x8D91,      0, 0x9A9C  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0x9251, 	 0, /* 0x00 */
+         0, 0x89C3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x9A71, 	 0, 0x9A73, 0x8FA6, /* 0x10 */
+    0x8952, 	 0, 	 0, 0x9A76, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x89DC, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9A82, /* 0x20 */
+         0, 0x8FFA, 0x9A7D, 	 0, 0x9A7B, 	 0, 0x9A7C, 	 0, /* 0x30 */
+    0x9A7E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x895C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x9158, 	 0, 0x9A78, 	 0, /* 0x40 */
+    0x9A79, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x8A9A, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x9A81, 	 0, 	 0, 	 0, /* 0x60 */
+    0x8AED, 	 0, 0x9A84, 0x9A80, 0x9A83, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x95AC, 	 0, 	 0, 	 0, /* 0x70 */
+    0x93D3, 	 0, 0x94B6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x9A86, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9A85, 0x8A64, /* 0x80 */
+         0, 	 0, 0x9A87, 	 0, 	 0, 	 0, 	 0, 0x9A8A, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x9A89, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x9A88, 	 0, 0x9458, 	 0, 	 0, 0x9A8B, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9A8C, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x9A8E, 	 0, 0x9A8D, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x9A90, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x9A93, 0x9A91, 0x9A8F, 0x9A92, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x9A94, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9A95, 	 0, /* 0xC0 */
+         0, 0x9A96, 	 0, 0x9A97, 	 0, 	 0, 	 0, 0x9A98, /* 0xD0 */
+    0x9964, 	 0, 0x8EFA, 0x8E6C, 	 0, 	 0, 0x89F1, 	 0, /* 0xD0 */
+    0x88F6, 	 0, 	 0, 0x9263, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9A99, 	 0, /* 0xE0 */
+    0x8DA2, 	 0, 0x88CD, 0x907D, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0x9A9A, 0x8CC5, 	 0, 	 0, 0x8D91, 	 0, 0x9A9C	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_57[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x9A9B,      0,      0, 0x95DE, 0x9A9D,      0,      0,      0, /* 0x00 */
-    0x9A9F, 0x9A9E,      0, 0x9AA0,      0, 0x9AA1,      0, 0x8C97, /* 0x00 */
-         0,      0, 0x8980, 0x9AA2,      0,      0, 0x9AA4,      0, /* 0x10 */
-    0x9AA3,      0,      0,      0, 0x9AA6,      0,      0, 0x9379, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x9AA7, 0x88B3, /* 0x20 */
-    0x8DDD,      0,      0,      0,      0, 0x8C5C,      0,      0, /* 0x20 */
-    0x926E,      0,      0,      0,      0,      0,      0, 0x9AA8, /* 0x30 */
-    0x9AA9,      0,      0, 0x9AAB,      0,      0,      0,      0, /* 0x30 */
-    0x9AAC,      0, 0x8DE2,      0,      0,      0,      0, 0x8BCF, /* 0x40 */
-         0,      0, 0x9656,      0,      0,      0, 0x9AAA, 0x9AAD, /* 0x40 */
-    0x8DBF, 0x8D42,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xFA96,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0x9AB1,      0,      0, 0x8DA3, 0xFA97, 0x9252,      0, /* 0x60 */
-         0, 0x9AAE, 0x92D8,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0x9AB2, /* 0x70 */
-         0,      0, 0x9082,      0,      0,      0,      0,      0, /* 0x80 */
-    0x9AB0, 0x9AB3,      0, 0x8C5E,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x9AB4,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x9AB5,      0, 0x8D43, 0x8A5F, 0x9AB7,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x9AB8,      0, 0xFA98,      0,      0,      0, /* 0xA0 */
-    0x9AB9,      0,      0, 0x9AB6,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x9AAF,      0,      0, 0x9ABA,      0,      0, 0x9ABB, 0xFA9A, /* 0xC0 */
-    0xFA99,      0,      0, 0x9684,      0,      0, 0x8FE9,      0, /* 0xC0 */
-         0,      0, 0x9ABD, 0x9ABE, 0x9ABC,      0, 0x9AC0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x9457,      0,      0, 0x88E6, /* 0xD0 */
-    0x9575,      0,      0, 0x9AC1,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0x8FFB,      0,      0, 0x8EB7, /* 0xF0 */
-         0, 0x947C, 0x8AEE,      0, 0x8DE9                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x9A9B, 	 0, 	 0, 0x95DE, 0x9A9D, 	 0, 	 0, 	 0, /* 0x00 */
+    0x9A9F, 0x9A9E, 	 0, 0x9AA0, 	 0, 0x9AA1, 	 0, 0x8C97, /* 0x00 */
+         0, 	 0, 0x8980, 0x9AA2, 	 0, 	 0, 0x9AA4, 	 0, /* 0x10 */
+    0x9AA3, 	 0, 	 0, 	 0, 0x9AA6, 	 0, 	 0, 0x9379, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9AA7, 0x88B3, /* 0x20 */
+    0x8DDD, 	 0, 	 0, 	 0, 	 0, 0x8C5C, 	 0, 	 0, /* 0x20 */
+    0x926E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9AA8, /* 0x30 */
+    0x9AA9, 	 0, 	 0, 0x9AAB, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x9AAC, 	 0, 0x8DE2, 	 0, 	 0, 	 0, 	 0, 0x8BCF, /* 0x40 */
+         0, 	 0, 0x9656, 	 0, 	 0, 	 0, 0x9AAA, 0x9AAD, /* 0x40 */
+    0x8DBF, 0x8D42, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xFA96, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x9AB1, 	 0, 	 0, 0x8DA3, 0xFA97, 0x9252, 	 0, /* 0x60 */
+         0, 0x9AAE, 0x92D8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9AB2, /* 0x70 */
+         0, 	 0, 0x9082, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x9AB0, 0x9AB3, 	 0, 0x8C5E, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x9AB4, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x9AB5, 	 0, 0x8D43, 0x8A5F, 0x9AB7, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x9AB8, 	 0, 0xFA98, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x9AB9, 	 0, 	 0, 0x9AB6, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x9AAF, 	 0, 	 0, 0x9ABA, 	 0, 	 0, 0x9ABB, 0xFA9A, /* 0xC0 */
+    0xFA99, 	 0, 	 0, 0x9684, 	 0, 	 0, 0x8FE9, 	 0, /* 0xC0 */
+         0, 	 0, 0x9ABD, 0x9ABE, 0x9ABC, 	 0, 0x9AC0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x9457, 	 0, 	 0, 0x88E6, /* 0xD0 */
+    0x9575, 	 0, 	 0, 0x9AC1, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x8FFB, 	 0, 	 0, 0x8EB7, /* 0xF0 */
+         0, 0x947C, 0x8AEE, 	 0, 0x8DE9							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_58[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x9678,      0, 0x93B0,      0,      0, 0x8C98, 0x91CD,      0, /* 0x00 */
-         0,      0, 0x9ABF, 0x9AC2,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0x91C2,      0,      0, /* 0x10 */
-         0, 0x9AC3,      0,      0,      0, 0x9AC4,      0,      0, /* 0x10 */
-         0, 0x9AC6,      0,      0, 0x92E7,      0,      0,      0, /* 0x20 */
-         0,      0, 0x8AAC,      0,      0,      0,      0, 0xEA9F, /* 0x20 */
-    0x8981, 0x95F1,      0,      0, 0x8FEA, 0x9367,      0,      0, /* 0x30 */
-         0,      0, 0x8DE4,      0,      0, 0x9ACC,      0,      0, /* 0x30 */
-    0x95BB, 0x97DB,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x89F2, 0x9AC8,      0,      0,      0,      0, /* 0x40 */
-         0, 0x9159, 0x9ACB,      0, 0x9383,      0,      0, 0x9368, /* 0x50 */
-    0x9384, 0x94B7, 0x92CB,      0,      0,      0, 0x8DC7,      0, /* 0x50 */
-         0,      0, 0x9AC7,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0x8996,      0, 0x9355,      0,      0,      0,      0, /* 0x60 */
-    0x9AC9,      0, 0x9AC5,      0,      0, 0x906F,      0,      0, /* 0x70 */
-         0, 0x9ACD,      0,      0,      0,      0, 0x8F6D,      0, /* 0x70 */
-         0,      0,      0, 0x8BAB,      0, 0x9ACE,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x95E6,      0,      0,      0, 0x919D, /* 0x90 */
-         0,      0,      0,      0, 0x92C4,      0, 0xFA9D, 0x9AD0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x966E,      0,      0, 0x9AD1,      0,      0, 0x9AD6,      0, /* 0xA0 */
-         0,      0, 0xFA9E, 0x95AD,      0,      0,      0,      0, /* 0xB0 */
-    0x9AD5, 0x9ACF, 0x9AD2, 0x9AD4,      0,      0, 0x8DA4,      0, /* 0xB0 */
-         0, 0x95C7,      0,      0,      0, 0x9AD7,      0, 0x9264, /* 0xC0 */
-         0,      0, 0x89F3,      0, 0x8FEB,      0,      0,      0, /* 0xC0 */
-         0, 0x9AD9,      0, 0x9AD8,      0, 0x8D88,      0, 0x9ADA, /* 0xD0 */
-    0x9ADC, 0x9ADB,      0,      0, 0x9ADE,      0, 0x9AD3, 0x9AE0, /* 0xD0 */
-         0,      0,      0,      0, 0x9ADF, 0x9ADD,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x8E6D, 0x9070,      0, 0x9173, 0x9AE1, /* 0xE0 */
-    0x90BA, 0x88EB, 0x9484,      0,      0,      0,      0, 0x92D9, /* 0xF0 */
-         0, 0x9AE3, 0x9AE2, 0x9AE4, 0x9AE5, 0x9AE6                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x9678, 	 0, 0x93B0, 	 0, 	 0, 0x8C98, 0x91CD, 	 0, /* 0x00 */
+         0, 	 0, 0x9ABF, 0x9AC2, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x91C2, 	 0, 	 0, /* 0x10 */
+         0, 0x9AC3, 	 0, 	 0, 	 0, 0x9AC4, 	 0, 	 0, /* 0x10 */
+         0, 0x9AC6, 	 0, 	 0, 0x92E7, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x8AAC, 	 0, 	 0, 	 0, 	 0, 0xEA9F, /* 0x20 */
+    0x8981, 0x95F1, 	 0, 	 0, 0x8FEA, 0x9367, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x8DE4, 	 0, 	 0, 0x9ACC, 	 0, 	 0, /* 0x30 */
+    0x95BB, 0x97DB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x89F2, 0x9AC8, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x9159, 0x9ACB, 	 0, 0x9383, 	 0, 	 0, 0x9368, /* 0x50 */
+    0x9384, 0x94B7, 0x92CB, 	 0, 	 0, 	 0, 0x8DC7, 	 0, /* 0x50 */
+         0, 	 0, 0x9AC7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x8996, 	 0, 0x9355, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x9AC9, 	 0, 0x9AC5, 	 0, 	 0, 0x906F, 	 0, 	 0, /* 0x70 */
+         0, 0x9ACD, 	 0, 	 0, 	 0, 	 0, 0x8F6D, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x8BAB, 	 0, 0x9ACE, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x95E6, 	 0, 	 0, 	 0, 0x919D, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x92C4, 	 0, 0xFA9D, 0x9AD0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x966E, 	 0, 	 0, 0x9AD1, 	 0, 	 0, 0x9AD6, 	 0, /* 0xA0 */
+         0, 	 0, 0xFA9E, 0x95AD, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x9AD5, 0x9ACF, 0x9AD2, 0x9AD4, 	 0, 	 0, 0x8DA4, 	 0, /* 0xB0 */
+         0, 0x95C7, 	 0, 	 0, 	 0, 0x9AD7, 	 0, 0x9264, /* 0xC0 */
+         0, 	 0, 0x89F3, 	 0, 0x8FEB, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x9AD9, 	 0, 0x9AD8, 	 0, 0x8D88, 	 0, 0x9ADA, /* 0xD0 */
+    0x9ADC, 0x9ADB, 	 0, 	 0, 0x9ADE, 	 0, 0x9AD3, 0x9AE0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x9ADF, 0x9ADD, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x8E6D, 0x9070, 	 0, 0x9173, 0x9AE1, /* 0xE0 */
+    0x90BA, 0x88EB, 0x9484, 	 0, 	 0, 	 0, 	 0, 0x92D9, /* 0xF0 */
+         0, 0x9AE3, 0x9AE2, 0x9AE4, 0x9AE5, 0x9AE6					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_59[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x9AE7,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0x95CF, 0x9AE8, 0xFA9F,      0,      0,      0, 0x89C4, /* 0x00 */
-    0x9AE9,      0,      0,      0,      0, 0x975B, 0x8A4F,      0, /* 0x10 */
-    0x99C7, 0x8F67, 0x91BD, 0x9AEA, 0x96E9,      0,      0,      0, /* 0x10 */
-         0,      0, 0x96B2,      0,      0, 0x9AEC,      0, 0x91E5, /* 0x20 */
-         0, 0x9356, 0x91BE, 0x9576, 0x9AED, 0x9AEE, 0x899B,      0, /* 0x20 */
-         0, 0x8EB8, 0x9AEF,      0,      0,      0,      0, 0x88CE, /* 0x30 */
-    0x9AF0,      0,      0,      0,      0,      0, 0x9AF1,      0, /* 0x30 */
-         0,      0,      0,      0, 0x8982,      0,      0, 0x8AEF, /* 0x40 */
-    0x93DE, 0x95F2,      0,      0,      0,      0, 0x9AF5, 0x9174, /* 0x40 */
-    0x9AF4, 0x8C5F,      0, 0xFAA0, 0x967A, 0x9AF3,      0, 0x9385, /* 0x50 */
-    0x9AF7,      0, 0x9AF6, 0xFAA1,      0, 0xFAA2,      0,      0, /* 0x50 */
-    0x9AF9,      0, 0x9AF8, 0xFAA3,      0, 0x899C,      0, 0x9AFA, /* 0x60 */
-    0x8FA7, 0x9AFC, 0x9244,      0, 0x9AFB,      0, 0x95B1,      0, /* 0x60 */
-         0,      0,      0, 0x8F97, 0x937A,      0,      0,      0, /* 0x70 */
-    0x9B40,      0,      0,      0,      0, 0x8D44,      0,      0, /* 0x70 */
-         0, 0x9B41, 0x9440, 0x94DC, 0x96CF,      0,      0,      0, /* 0x80 */
-         0,      0, 0x9444,      0,      0, 0x9B4A,      0,      0, /* 0x80 */
-         0,      0,      0, 0x8B57,      0,      0, 0x9764,      0, /* 0x90 */
-         0, 0x96AD,      0, 0x9BAA,      0, 0x9B42,      0,      0, /* 0x90 */
-         0,      0,      0, 0x9B45, 0xFAA4, 0x91C3,      0,      0, /* 0xA0 */
-    0x9657,      0,      0,      0, 0x9369,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x9B46,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x9685, 0xFAA5, 0x8DC8,      0,      0, 0x8FA8,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x9B47,      0, /* 0xC0 */
-         0, 0x8E6F,      0, 0x8E6E,      0,      0,      0,      0, /* 0xC0 */
-    0x88B7, 0x8CC6,      0, 0x90A9, 0x88CF,      0,      0,      0, /* 0xD0 */
-         0, 0x9B4B, 0x9B4C,      0, 0x9B49,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x8957, 0x8AAD,      0, /* 0xE0 */
-    0x9B48,      0, 0x96C3, 0x9550,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0x88A6,      0, /* 0xF0 */
-         0,      0,      0, 0x88F7,      0,      0,      0, 0x8E70  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x9AE7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x95CF, 0x9AE8, 0xFA9F, 	 0, 	 0, 	 0, 0x89C4, /* 0x00 */
+    0x9AE9, 	 0, 	 0, 	 0, 	 0, 0x975B, 0x8A4F, 	 0, /* 0x10 */
+    0x99C7, 0x8F67, 0x91BD, 0x9AEA, 0x96E9, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x96B2, 	 0, 	 0, 0x9AEC, 	 0, 0x91E5, /* 0x20 */
+         0, 0x9356, 0x91BE, 0x9576, 0x9AED, 0x9AEE, 0x899B, 	 0, /* 0x20 */
+         0, 0x8EB8, 0x9AEF, 	 0, 	 0, 	 0, 	 0, 0x88CE, /* 0x30 */
+    0x9AF0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9AF1, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x8982, 	 0, 	 0, 0x8AEF, /* 0x40 */
+    0x93DE, 0x95F2, 	 0, 	 0, 	 0, 	 0, 0x9AF5, 0x9174, /* 0x40 */
+    0x9AF4, 0x8C5F, 	 0, 0xFAA0, 0x967A, 0x9AF3, 	 0, 0x9385, /* 0x50 */
+    0x9AF7, 	 0, 0x9AF6, 0xFAA1, 	 0, 0xFAA2, 	 0, 	 0, /* 0x50 */
+    0x9AF9, 	 0, 0x9AF8, 0xFAA3, 	 0, 0x899C, 	 0, 0x9AFA, /* 0x60 */
+    0x8FA7, 0x9AFC, 0x9244, 	 0, 0x9AFB, 	 0, 0x95B1, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x8F97, 0x937A, 	 0, 	 0, 	 0, /* 0x70 */
+    0x9B40, 	 0, 	 0, 	 0, 	 0, 0x8D44, 	 0, 	 0, /* 0x70 */
+         0, 0x9B41, 0x9440, 0x94DC, 0x96CF, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x9444, 	 0, 	 0, 0x9B4A, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x8B57, 	 0, 	 0, 0x9764, 	 0, /* 0x90 */
+         0, 0x96AD, 	 0, 0x9BAA, 	 0, 0x9B42, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x9B45, 0xFAA4, 0x91C3, 	 0, 	 0, /* 0xA0 */
+    0x9657, 	 0, 	 0, 	 0, 0x9369, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x9B46, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x9685, 0xFAA5, 0x8DC8, 	 0, 	 0, 0x8FA8, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9B47, 	 0, /* 0xC0 */
+         0, 0x8E6F, 	 0, 0x8E6E, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x88B7, 0x8CC6, 	 0, 0x90A9, 0x88CF, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x9B4B, 0x9B4C, 	 0, 0x9B49, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x8957, 0x8AAD, 	 0, /* 0xE0 */
+    0x9B48, 	 0, 0x96C3, 0x9550, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x88A6, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0x88F7, 	 0, 	 0, 	 0, 0x8E70	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_5A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x88D0,      0, 0x88A1,      0,      0,      0,      0, /* 0x00 */
-         0, 0x9B51,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0x9B4F,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0x96BA,      0, 0x9B52,      0, 0x9B50,      0,      0, 0x9B4E, /* 0x10 */
-    0x9050,      0,      0,      0,      0, 0x9B4D,      0,      0, /* 0x20 */
-         0, 0x95D8,      0,      0,      0,      0,      0, 0x8CE2, /* 0x20 */
-         0,      0,      0,      0,      0, 0x9B56, 0x9B57,      0, /* 0x30 */
-         0,      0,      0,      0, 0x8FA9,      0,      0,      0, /* 0x30 */
-    0x9B53, 0x984B,      0,      0,      0,      0, 0x946B,      0, /* 0x40 */
-         0, 0x9B55,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0x8DA5,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0x9B58,      0,      0,      0, 0x9577,      0, /* 0x60 */
-         0,      0, 0x9B59,      0, 0x9B54,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0x96B9, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0x947D,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0x9B5A, 0x9551,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x9B5B, 0x9B5F, 0x9B5C,      0, /* 0xB0 */
-         0, 0x89C5, 0x9B5E,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x8EB9,      0, 0x9B5D, 0x8C99,      0,      0,      0, /* 0xC0 */
-    0x9B6B,      0,      0,      0,      0,      0, 0x9B64, 0x9B61, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x9284,      0, 0x9B60,      0,      0, 0x9B62,      0, /* 0xE0 */
-         0, 0x9B63,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x9B65, 0x9B66                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x88D0, 	 0, 0x88A1, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x9B51, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x9B4F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x96BA, 	 0, 0x9B52, 	 0, 0x9B50, 	 0, 	 0, 0x9B4E, /* 0x10 */
+    0x9050, 	 0, 	 0, 	 0, 	 0, 0x9B4D, 	 0, 	 0, /* 0x20 */
+         0, 0x95D8, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8CE2, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9B56, 0x9B57, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x8FA9, 	 0, 	 0, 	 0, /* 0x30 */
+    0x9B53, 0x984B, 	 0, 	 0, 	 0, 	 0, 0x946B, 	 0, /* 0x40 */
+         0, 0x9B55, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x8DA5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x9B58, 	 0, 	 0, 	 0, 0x9577, 	 0, /* 0x60 */
+         0, 	 0, 0x9B59, 	 0, 0x9B54, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x96B9, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x947D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x9B5A, 0x9551, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x9B5B, 0x9B5F, 0x9B5C, 	 0, /* 0xB0 */
+         0, 0x89C5, 0x9B5E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x8EB9, 	 0, 0x9B5D, 0x8C99, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x9B6B, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9B64, 0x9B61, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x9284, 	 0, 0x9B60, 	 0, 	 0, 0x9B62, 	 0, /* 0xE0 */
+         0, 0x9B63, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x9B65, 0x9B66									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_5B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-            0x8AF0,      0, 0x9B68, 0x9B67,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0x9B69,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x8FEC,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x9B6C,      0, 0x92DA,      0,      0,      0, /* 0x20 */
-    0x8964,      0, 0x9B6A,      0,      0,      0, 0x9B6D,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0x9B6E,      0, /* 0x30 */
-    0x9B71,      0,      0, 0x9B6F,      0, 0x9B70,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0x8E71, 0x9B72,      0,      0, 0x8D45, 0x9B73, 0xFAA6, 0x8E9A, /* 0x50 */
-    0x91B6,      0, 0x9B74, 0x9B75, 0x8E79, 0x8D46,      0, 0x96D0, /* 0x50 */
-         0,      0,      0, 0x8B47, 0x8CC7, 0x9B76, 0x8A77,      0, /* 0x60 */
-         0, 0x9B77,      0, 0x91B7,      0,      0,      0,      0, /* 0x60 */
-    0x9B78, 0x9BA1,      0, 0x9B79,      0, 0x9B7A,      0,      0, /* 0x70 */
-    0x9B7B,      0, 0x9B7D,      0,      0,      0,      0,      0, /* 0x70 */
-    0x9B7E,      0,      0, 0x9B80,      0, 0x91EE,      0, 0x8946, /* 0x80 */
-    0x8EE7, 0x88C0,      0, 0x9176, 0x8AAE, 0x8EB3,      0, 0x8D47, /* 0x80 */
-         0,      0,      0,      0,      0, 0x9386,      0, 0x8F40, /* 0x90 */
-    0x8AAF, 0x9288, 0x92E8, 0x88B6, 0x8B58, 0x95F3,      0, 0x8EC0, /* 0x90 */
-         0,      0, 0x8B71, 0x90E9, 0x8EBA, 0x9747, 0x9B81,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0x8B7B,      0, /* 0xA0 */
-    0x8DC9,      0,      0, 0x8A51, 0x8983, 0x8FAA, 0x89C6,      0, /* 0xB0 */
-    0x9B82, 0x9765,      0,      0,      0,      0,      0, 0x8F68, /* 0xB0 */
-    0xFAA7,      0, 0x8EE2, 0x9B83, 0x8AF1, 0x93D0, 0x96A7, 0x9B84, /* 0xC0 */
-         0, 0x9B85,      0,      0, 0x9578,      0,      0,      0, /* 0xC0 */
-    0x9B87,      0, 0x8AA6, 0x8BF5, 0x9B86,      0,      0,      0, /* 0xD0 */
-    0xFAA9,      0,      0, 0x8AB0,      0, 0x9051, 0x9B8B, 0x8E40, /* 0xD0 */
-         0, 0x89C7, 0x9B8A,      0, 0x9B88, 0x9B8C, 0x9B89, 0x944A, /* 0xE0 */
-    0x9ECB, 0x9052,      0, 0x9B8D, 0xFAAA,      0, 0x97BE,      0, /* 0xE0 */
-    0x9B8E,      0,      0, 0x9B90,      0, 0x929E, 0x9B8F,      0, /* 0xF0 */
-    0x90A1,      0, 0x8E9B,      0,      0,      0, 0x91CE, 0x8EF5  /* 0xF0 */
+            0x8AF0, 	 0, 0x9B68, 0x9B67, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9B69, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x8FEC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x9B6C, 	 0, 0x92DA, 	 0, 	 0, 	 0, /* 0x20 */
+    0x8964, 	 0, 0x9B6A, 	 0, 	 0, 	 0, 0x9B6D, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9B6E, 	 0, /* 0x30 */
+    0x9B71, 	 0, 	 0, 0x9B6F, 	 0, 0x9B70, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0x8E71, 0x9B72, 	 0, 	 0, 0x8D45, 0x9B73, 0xFAA6, 0x8E9A, /* 0x50 */
+    0x91B6, 	 0, 0x9B74, 0x9B75, 0x8E79, 0x8D46, 	 0, 0x96D0, /* 0x50 */
+         0, 	 0, 	 0, 0x8B47, 0x8CC7, 0x9B76, 0x8A77, 	 0, /* 0x60 */
+         0, 0x9B77, 	 0, 0x91B7, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x9B78, 0x9BA1, 	 0, 0x9B79, 	 0, 0x9B7A, 	 0, 	 0, /* 0x70 */
+    0x9B7B, 	 0, 0x9B7D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x9B7E, 	 0, 	 0, 0x9B80, 	 0, 0x91EE, 	 0, 0x8946, /* 0x80 */
+    0x8EE7, 0x88C0, 	 0, 0x9176, 0x8AAE, 0x8EB3, 	 0, 0x8D47, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9386, 	 0, 0x8F40, /* 0x90 */
+    0x8AAF, 0x9288, 0x92E8, 0x88B6, 0x8B58, 0x95F3, 	 0, 0x8EC0, /* 0x90 */
+         0, 	 0, 0x8B71, 0x90E9, 0x8EBA, 0x9747, 0x9B81, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8B7B, 	 0, /* 0xA0 */
+    0x8DC9, 	 0, 	 0, 0x8A51, 0x8983, 0x8FAA, 0x89C6, 	 0, /* 0xB0 */
+    0x9B82, 0x9765, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8F68, /* 0xB0 */
+    0xFAA7, 	 0, 0x8EE2, 0x9B83, 0x8AF1, 0x93D0, 0x96A7, 0x9B84, /* 0xC0 */
+         0, 0x9B85, 	 0, 	 0, 0x9578, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x9B87, 	 0, 0x8AA6, 0x8BF5, 0x9B86, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xFAA9, 	 0, 	 0, 0x8AB0, 	 0, 0x9051, 0x9B8B, 0x8E40, /* 0xD0 */
+         0, 0x89C7, 0x9B8A, 	 0, 0x9B88, 0x9B8C, 0x9B89, 0x944A, /* 0xE0 */
+    0x9ECB, 0x9052, 	 0, 0x9B8D, 0xFAAA, 	 0, 0x97BE, 	 0, /* 0xE0 */
+    0x9B8E, 	 0, 	 0, 0x9B90, 	 0, 0x929E, 0x9B8F, 	 0, /* 0xF0 */
+    0x90A1, 	 0, 0x8E9B, 	 0, 	 0, 	 0, 0x91CE, 0x8EF5	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_5C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x9595, 0x90EA,      0, 0x8ECB, 0x9B91, 0x8FAB, 0x9B92, /* 0x00 */
-    0x9B93, 0x88D1, 0x91B8, 0x9071,      0, 0x9B94, 0x93B1, 0x8FAC, /* 0x00 */
-         0, 0x8FAD,      0, 0x9B95,      0,      0, 0x90EB,      0, /* 0x10 */
-         0,      0, 0x8FAE,      0,      0,      0, 0xFAAB,      0, /* 0x10 */
-    0x9B96,      0, 0x9B97,      0, 0x96DE,      0,      0,      0, /* 0x20 */
-    0x9B98,      0,      0,      0,      0, 0x8BC4,      0,      0, /* 0x20 */
-         0, 0x8F41,      0,      0,      0,      0,      0,      0, /* 0x30 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x9595, 0x90EA, 	 0, 0x8ECB, 0x9B91, 0x8FAB, 0x9B92, /* 0x00 */
+    0x9B93, 0x88D1, 0x91B8, 0x9071, 	 0, 0x9B94, 0x93B1, 0x8FAC, /* 0x00 */
+         0, 0x8FAD, 	 0, 0x9B95, 	 0, 	 0, 0x90EB, 	 0, /* 0x10 */
+         0, 	 0, 0x8FAE, 	 0, 	 0, 	 0, 0xFAAB, 	 0, /* 0x10 */
+    0x9B96, 	 0, 0x9B97, 	 0, 0x96DE, 	 0, 	 0, 	 0, /* 0x20 */
+    0x9B98, 	 0, 	 0, 	 0, 	 0, 0x8BC4, 	 0, 	 0, /* 0x20 */
+         0, 0x8F41, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
     0x9B99, 0x9B9A, 0x8EDA, 0x904B, 0x93F2, 0x9073, 0x94F6, 0x9441, /* 0x30 */
-    0x8BC7, 0x9B9B,      0,      0,      0, 0x8B8F, 0x9B9C,      0, /* 0x40 */
-    0x8BFC,      0, 0x93CD, 0x89AE,      0, 0x8E72, 0x9B9D, 0x9BA0, /* 0x40 */
-    0x9B9F, 0x8BFB,      0, 0x9B9E,      0, 0x9357,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0x91AE,      0, /* 0x50 */
-    0x936A, 0x8EC6,      0,      0, 0x9177, 0x979A,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0x9BA2,      0, 0x9BA3, 0x93D4, /* 0x60 */
-         0, 0x8E52,      0,      0,      0,      0, 0x9BA5,      0, /* 0x70 */
-         0, 0x9BA6,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0x9BA7,      0,      0,      0, /* 0x80 */
-    0x8AF2, 0x9BA8,      0,      0, 0x9BA9,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0x89AA,      0,      0,      0,      0, 0xFAAC,      0, /* 0xA0 */
-    0x915A, 0x8AE2,      0, 0x9BAB, 0x96A6,      0,      0,      0, /* 0xA0 */
-         0, 0x91D0,      0, 0x8A78,      0,      0, 0x9BAD, 0x9BAF, /* 0xB0 */
-    0x8ADD,      0, 0xFAAD, 0x9BAC, 0x9BAE,      0, 0x9BB1,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x9BB0,      0, 0x9BB2, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x9BB3,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x93BB, 0x8BAC,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x89E3, 0x9BB4, 0x9BB9,      0,      0, 0x9BB7,      0, 0x95F5, /* 0xE0 */
-    0x95F4,      0,      0,      0,      0, 0xFAAE, 0x9387,      0, /* 0xF0 */
-         0,      0, 0x9BB6, 0x8F73,      0, 0x9BB5                  /* 0xF0 */
+    0x8BC7, 0x9B9B, 	 0, 	 0, 	 0, 0x8B8F, 0x9B9C, 	 0, /* 0x40 */
+    0x8BFC, 	 0, 0x93CD, 0x89AE, 	 0, 0x8E72, 0x9B9D, 0x9BA0, /* 0x40 */
+    0x9B9F, 0x8BFB, 	 0, 0x9B9E, 	 0, 0x9357, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x91AE, 	 0, /* 0x50 */
+    0x936A, 0x8EC6, 	 0, 	 0, 0x9177, 0x979A, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x9BA2, 	 0, 0x9BA3, 0x93D4, /* 0x60 */
+         0, 0x8E52, 	 0, 	 0, 	 0, 	 0, 0x9BA5, 	 0, /* 0x70 */
+         0, 0x9BA6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x9BA7, 	 0, 	 0, 	 0, /* 0x80 */
+    0x8AF2, 0x9BA8, 	 0, 	 0, 0x9BA9, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x89AA, 	 0, 	 0, 	 0, 	 0, 0xFAAC, 	 0, /* 0xA0 */
+    0x915A, 0x8AE2, 	 0, 0x9BAB, 0x96A6, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x91D0, 	 0, 0x8A78, 	 0, 	 0, 0x9BAD, 0x9BAF, /* 0xB0 */
+    0x8ADD, 	 0, 0xFAAD, 0x9BAC, 0x9BAE, 	 0, 0x9BB1, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9BB0, 	 0, 0x9BB2, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x9BB3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x93BB, 0x8BAC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x89E3, 0x9BB4, 0x9BB9, 	 0, 	 0, 0x9BB7, 	 0, 0x95F5, /* 0xE0 */
+    0x95F4, 	 0, 	 0, 	 0, 	 0, 0xFAAE, 0x9387, 	 0, /* 0xF0 */
+         0, 	 0, 0x9BB6, 0x8F73, 	 0, 0x9BB5					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_5D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0x9092, /* 0x00 */
-         0,      0,      0, 0x9BBA,      0,      0, 0x8DE8,      0, /* 0x00 */
-         0, 0x9BC0,      0,      0, 0x9BC1, 0x9BBB, 0x8A52, 0x9BBC, /* 0x10 */
-    0x9BC5, 0x9BC4, 0x9BC3, 0x9BBF,      0,      0,      0, 0x9BBE, /* 0x10 */
-         0,      0, 0x9BC2,      0,      0,      0,      0, 0xFAAF, /* 0x20 */
-         0, 0x95F6,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xFAB2,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0x9BC9, 0x9BC6,      0, 0x9BC8,      0, /* 0x40 */
-    0x9792,      0, 0x9BC7, 0xFAB0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0x9BBD,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0x9093,      0,      0, 0x9BCA, 0xFAB3,      0, 0x8DB5, /* 0x60 */
-         0,      0,      0, 0x9BCB,      0,      0, 0x9BCC,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x9BCF,      0, 0x9BCE,      0,      0, 0x9BCD, /* 0x80 */
-         0,      0,      0, 0x9388, 0x9BB8,      0,      0,      0, /* 0x80 */
-    0x9BD5,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0x9BD1,      0,      0, /* 0x90 */
-         0,      0, 0x9BD0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x9BD2,      0, 0x9BD3,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0x9BD6, /* 0xB0 */
-    0xFAB4, 0xFAB5, 0x97E4,      0, 0x9BD7, 0x9BD4,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x9BD8,      0,      0, 0x8ADE, 0x9BD9,      0,      0, /* 0xC0 */
-    0xFAB6,      0, 0x9BDB, 0x9BDA,      0,      0, 0x9BDC,      0, /* 0xD0 */
-         0,      0,      0, 0x9BDD,      0, 0x90EC, 0x8F42,      0, /* 0xD0 */
-         0, 0x8F84,      0, 0x9183,      0, 0x8D48, 0x8DB6, 0x8D49, /* 0xE0 */
-    0x8B90,      0,      0, 0x9BDE,      0,      0, 0x8DB7,      0, /* 0xE0 */
-         0, 0x8CC8, 0x9BDF, 0x96A4, 0x9462, 0x9BE0,      0, 0x8D4A, /* 0xF0 */
-         0,      0,      0, 0x8AAA,      0, 0x9246, 0x8BD0          /* 0xF0 */
+         0, 	 0, 	 0, 0x9BBA, 	 0, 	 0, 0x8DE8, 	 0, /* 0x00 */
+         0, 0x9BC0, 	 0, 	 0, 0x9BC1, 0x9BBB, 0x8A52, 0x9BBC, /* 0x10 */
+    0x9BC5, 0x9BC4, 0x9BC3, 0x9BBF, 	 0, 	 0, 	 0, 0x9BBE, /* 0x10 */
+         0, 	 0, 0x9BC2, 	 0, 	 0, 	 0, 	 0, 0xFAAF, /* 0x20 */
+         0, 0x95F6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xFAB2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x9BC9, 0x9BC6, 	 0, 0x9BC8, 	 0, /* 0x40 */
+    0x9792, 	 0, 0x9BC7, 0xFAB0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x9BBD, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x9093, 	 0, 	 0, 0x9BCA, 0xFAB3, 	 0, 0x8DB5, /* 0x60 */
+         0, 	 0, 	 0, 0x9BCB, 	 0, 	 0, 0x9BCC, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x9BCF, 	 0, 0x9BCE, 	 0, 	 0, 0x9BCD, /* 0x80 */
+         0, 	 0, 	 0, 0x9388, 0x9BB8, 	 0, 	 0, 	 0, /* 0x80 */
+    0x9BD5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9BD1, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x9BD0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x9BD2, 	 0, 0x9BD3, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9BD6, /* 0xB0 */
+    0xFAB4, 0xFAB5, 0x97E4, 	 0, 0x9BD7, 0x9BD4, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x9BD8, 	 0, 	 0, 0x8ADE, 0x9BD9, 	 0, 	 0, /* 0xC0 */
+    0xFAB6, 	 0, 0x9BDB, 0x9BDA, 	 0, 	 0, 0x9BDC, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x9BDD, 	 0, 0x90EC, 0x8F42, 	 0, /* 0xD0 */
+         0, 0x8F84, 	 0, 0x9183, 	 0, 0x8D48, 0x8DB6, 0x8D49, /* 0xE0 */
+    0x8B90, 	 0, 	 0, 0x9BDE, 	 0, 	 0, 0x8DB7, 	 0, /* 0xE0 */
+         0, 0x8CC8, 0x9BDF, 0x96A4, 0x9462, 0x9BE0, 	 0, 0x8D4A, /* 0xF0 */
+         0, 	 0, 	 0, 0x8AAA, 	 0, 0x9246, 0x8BD0			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_5E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x8E73, 0x957A,      0,      0, 0x94BF,      0, /* 0x00 */
-         0,      0,      0, 0x9BE1, 0x8AF3,      0,      0,      0, /* 0x00 */
-         0, 0x9BE4,      0,      0,      0,      0, 0x929F,      0, /* 0x10 */
-         0, 0x9BE3, 0x9BE2, 0x9BE5,      0, 0x92E9,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0x9083,      0,      0, /* 0x20 */
-         0,      0,      0, 0x8E74,      0, 0x90C8,      0, 0x91D1, /* 0x20 */
-    0x8B41,      0,      0, 0x92A0,      0,      0, 0x9BE6, 0x9BE7, /* 0x30 */
-    0x8FED,      0,      0,      0,      0, 0x9658,      0,      0, /* 0x30 */
-    0x9BEA,      0,      0, 0x9BE9, 0x9BE8, 0x959D,      0, 0x9BF1, /* 0x40 */
-         0,      0,      0,      0, 0x9679,      0, 0x9BEB,      0, /* 0x40 */
-         0,      0,      0,      0, 0x9BED, 0x968B,      0, 0x9BEC, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0x9BEE, /* 0x50 */
-         0, 0x94A6, 0x9BEF, 0x95BC, 0x9BF0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0x8AB1, 0x95BD, 0x944E, 0x9BF2, 0x9BF3,      0, /* 0x70 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x8E73, 0x957A, 	 0, 	 0, 0x94BF, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x9BE1, 0x8AF3, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x9BE4, 	 0, 	 0, 	 0, 	 0, 0x929F, 	 0, /* 0x10 */
+         0, 0x9BE3, 0x9BE2, 0x9BE5, 	 0, 0x92E9, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9083, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x8E74, 	 0, 0x90C8, 	 0, 0x91D1, /* 0x20 */
+    0x8B41, 	 0, 	 0, 0x92A0, 	 0, 	 0, 0x9BE6, 0x9BE7, /* 0x30 */
+    0x8FED, 	 0, 	 0, 	 0, 	 0, 0x9658, 	 0, 	 0, /* 0x30 */
+    0x9BEA, 	 0, 	 0, 0x9BE9, 0x9BE8, 0x959D, 	 0, 0x9BF1, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x9679, 	 0, 0x9BEB, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x9BED, 0x968B, 	 0, 0x9BEC, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9BEE, /* 0x50 */
+         0, 0x94A6, 0x9BEF, 0x95BC, 0x9BF0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x8AB1, 0x95BD, 0x944E, 0x9BF2, 0x9BF3, 	 0, /* 0x70 */
     0x8D4B, 0x8AB2, 0x9BF4, 0x8CB6, 0x9763, 0x9748, 0x8AF4, 0x9BF6, /* 0x70 */
-         0, 0x92A1,      0, 0x8D4C, 0x8FAF,      0,      0, 0x94DD, /* 0x80 */
-         0,      0, 0x8FB0,      0,      0,      0,      0, 0x8F98, /* 0x80 */
-         0,      0,      0,      0,      0, 0x92EA, 0x95F7, 0x9358, /* 0x90 */
-         0,      0, 0x8D4D,      0, 0x957B,      0,      0,      0, /* 0x90 */
-    0x9BF7,      0,      0,      0,      0,      0, 0x9378, 0x8DC0, /* 0xA0 */
-         0,      0,      0, 0x8CC9,      0, 0x92EB,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0x88C1, 0x8F8E, 0x8D4E, /* 0xB0 */
-    0x9766,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x9BF8, 0x9BF9, 0x9470,      0,      0,      0,      0, /* 0xC0 */
-    0x9BFA, 0x97F5, 0x984C,      0,      0,      0,      0, 0x9BFC, /* 0xC0 */
-    0x9BFB,      0,      0, 0x8A66,      0,      0, 0x9C40,      0, /* 0xD0 */
-         0,      0, 0x9C43, 0x9C44,      0, 0x9C42,      0, 0x955F, /* 0xD0 */
-    0x8FB1, 0x9C46, 0x9C45, 0x9C41,      0,      0,      0,      0, /* 0xE0 */
-    0x9C47, 0x9C48,      0,      0, 0x9C49,      0,      0,      0, /* 0xE0 */
-    0x9C4C, 0x9C4A,      0, 0x9C4B, 0x9C4D,      0, 0x8984, 0x92EC, /* 0xF0 */
-    0x9C4E,      0, 0x8C9A, 0x89F4, 0x9455,      0, 0x9C4F, 0x93F9  /* 0xF0 */
+         0, 0x92A1, 	 0, 0x8D4C, 0x8FAF, 	 0, 	 0, 0x94DD, /* 0x80 */
+         0, 	 0, 0x8FB0, 	 0, 	 0, 	 0, 	 0, 0x8F98, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x92EA, 0x95F7, 0x9358, /* 0x90 */
+         0, 	 0, 0x8D4D, 	 0, 0x957B, 	 0, 	 0, 	 0, /* 0x90 */
+    0x9BF7, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9378, 0x8DC0, /* 0xA0 */
+         0, 	 0, 	 0, 0x8CC9, 	 0, 0x92EB, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x88C1, 0x8F8E, 0x8D4E, /* 0xB0 */
+    0x9766, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x9BF8, 0x9BF9, 0x9470, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x9BFA, 0x97F5, 0x984C, 	 0, 	 0, 	 0, 	 0, 0x9BFC, /* 0xC0 */
+    0x9BFB, 	 0, 	 0, 0x8A66, 	 0, 	 0, 0x9C40, 	 0, /* 0xD0 */
+         0, 	 0, 0x9C43, 0x9C44, 	 0, 0x9C42, 	 0, 0x955F, /* 0xD0 */
+    0x8FB1, 0x9C46, 0x9C45, 0x9C41, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x9C47, 0x9C48, 	 0, 	 0, 0x9C49, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x9C4C, 0x9C4A, 	 0, 0x9C4B, 0x9C4D, 	 0, 0x8984, 0x92EC, /* 0xF0 */
+    0x9C4E, 	 0, 0x8C9A, 0x89F4, 0x9455, 	 0, 0x9C4F, 0x93F9	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_5F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x95D9,      0, 0x9C50, 0x984D,      0,      0,      0, /* 0x00 */
-         0, 0x9C51, 0x95BE, 0x9C54, 0x989F, 0x98AF,      0, 0x8EAE, /* 0x00 */
-    0x93F3, 0x9C55,      0, 0x8B7C, 0x92A2, 0x88F8, 0x9C56, 0x95A4, /* 0x10 */
-    0x8D4F,      0,      0, 0x926F,      0,      0,      0, 0x92ED, /* 0x10 */
-         0, 0xFAB7,      0,      0,      0, 0x96ED, 0x8CB7, 0x8CCA, /* 0x20 */
-         0, 0x9C57,      0,      0,      0, 0x9C58,      0, 0x9C5E, /* 0x20 */
-         0, 0x8EE3,      0,      0, 0xFAB8, 0x92A3,      0, 0x8BAD, /* 0x30 */
-    0x9C59,      0,      0,      0, 0x954A,      0, 0x9265,      0, /* 0x30 */
-         0, 0x9C5A,      0,      0,      0, 0xFA67,      0,      0, /* 0x40 */
-    0x9C5B,      0, 0x8BAE,      0, 0x9C5C,      0, 0x9C5D,      0, /* 0x40 */
-         0, 0x9C5F,      0, 0x9396,      0,      0, 0x9C60, 0x9C61, /* 0x50 */
-         0, 0x9C62,      0,      0, 0x9C53, 0x9C52,      0,      0, /* 0x50 */
-         0, 0x9C63, 0x8C60,      0,      0,      0, 0x9546, 0xFAB9, /* 0x60 */
-         0, 0x8DCA, 0x9556, 0x92A4, 0x956A, 0x9C64,      0,      0, /* 0x60 */
-    0x8FB2, 0x8965,      0, 0x9C65,      0,      0,      0, 0x9C66, /* 0x70 */
-         0, 0x96F0,      0,      0, 0x94DE,      0,      0, 0x9C69, /* 0x70 */
-    0x899D, 0x90AA, 0x9C68, 0x9C67, 0x8C61, 0x91D2,      0, 0x9C6D, /* 0x80 */
-    0x9C6B,      0, 0x9C6A, 0x97A5, 0x8CE3,      0,      0,      0, /* 0x80 */
-    0x8F99, 0x9C6C, 0x936B, 0x8F5D,      0,      0,      0, 0x93BE, /* 0x90 */
-    0x9C70, 0x9C6F,      0,      0,      0,      0, 0x9C6E,      0, /* 0x90 */
-    0x9C71, 0x8CE4,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x9C72, 0x959C, 0x8F7A,      0,      0, 0x9C73, 0x94F7,      0, /* 0xA0 */
-         0,      0,      0, 0x93BF, 0x92A5,      0,      0, 0xFABA, /* 0xB0 */
-         0, 0x934F,      0,      0, 0x9C74, 0x8B4A,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x9053,      0, 0x954B,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x8AF5, 0x9445,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0x9C75, 0x8E75, /* 0xD0 */
-    0x9659, 0x965A,      0,      0, 0x899E, 0x9C7A, 0xFABB,      0, /* 0xD0 */
-    0x9289,      0,      0,      0, 0x9C77,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x89F5,      0,      0,      0,      0, /* 0xE0 */
-    0x9CAB, 0x9C79,      0,      0,      0, 0x944F,      0,      0, /* 0xF0 */
-    0x9C78,      0,      0, 0x9C76,      0, 0x8D9A,      0, 0x9C7C  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x95D9, 	 0, 0x9C50, 0x984D, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x9C51, 0x95BE, 0x9C54, 0x989F, 0x98AF, 	 0, 0x8EAE, /* 0x00 */
+    0x93F3, 0x9C55, 	 0, 0x8B7C, 0x92A2, 0x88F8, 0x9C56, 0x95A4, /* 0x10 */
+    0x8D4F, 	 0, 	 0, 0x926F, 	 0, 	 0, 	 0, 0x92ED, /* 0x10 */
+         0, 0xFAB7, 	 0, 	 0, 	 0, 0x96ED, 0x8CB7, 0x8CCA, /* 0x20 */
+         0, 0x9C57, 	 0, 	 0, 	 0, 0x9C58, 	 0, 0x9C5E, /* 0x20 */
+         0, 0x8EE3, 	 0, 	 0, 0xFAB8, 0x92A3, 	 0, 0x8BAD, /* 0x30 */
+    0x9C59, 	 0, 	 0, 	 0, 0x954A, 	 0, 0x9265, 	 0, /* 0x30 */
+         0, 0x9C5A, 	 0, 	 0, 	 0, 0xFA67, 	 0, 	 0, /* 0x40 */
+    0x9C5B, 	 0, 0x8BAE, 	 0, 0x9C5C, 	 0, 0x9C5D, 	 0, /* 0x40 */
+         0, 0x9C5F, 	 0, 0x9396, 	 0, 	 0, 0x9C60, 0x9C61, /* 0x50 */
+         0, 0x9C62, 	 0, 	 0, 0x9C53, 0x9C52, 	 0, 	 0, /* 0x50 */
+         0, 0x9C63, 0x8C60, 	 0, 	 0, 	 0, 0x9546, 0xFAB9, /* 0x60 */
+         0, 0x8DCA, 0x9556, 0x92A4, 0x956A, 0x9C64, 	 0, 	 0, /* 0x60 */
+    0x8FB2, 0x8965, 	 0, 0x9C65, 	 0, 	 0, 	 0, 0x9C66, /* 0x70 */
+         0, 0x96F0, 	 0, 	 0, 0x94DE, 	 0, 	 0, 0x9C69, /* 0x70 */
+    0x899D, 0x90AA, 0x9C68, 0x9C67, 0x8C61, 0x91D2, 	 0, 0x9C6D, /* 0x80 */
+    0x9C6B, 	 0, 0x9C6A, 0x97A5, 0x8CE3, 	 0, 	 0, 	 0, /* 0x80 */
+    0x8F99, 0x9C6C, 0x936B, 0x8F5D, 	 0, 	 0, 	 0, 0x93BE, /* 0x90 */
+    0x9C70, 0x9C6F, 	 0, 	 0, 	 0, 	 0, 0x9C6E, 	 0, /* 0x90 */
+    0x9C71, 0x8CE4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x9C72, 0x959C, 0x8F7A, 	 0, 	 0, 0x9C73, 0x94F7, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x93BF, 0x92A5, 	 0, 	 0, 0xFABA, /* 0xB0 */
+         0, 0x934F, 	 0, 	 0, 0x9C74, 0x8B4A, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x9053, 	 0, 0x954B, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x8AF5, 0x9445, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9C75, 0x8E75, /* 0xD0 */
+    0x9659, 0x965A, 	 0, 	 0, 0x899E, 0x9C7A, 0xFABB, 	 0, /* 0xD0 */
+    0x9289, 	 0, 	 0, 	 0, 0x9C77, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x89F5, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x9CAB, 0x9C79, 	 0, 	 0, 	 0, 0x944F, 	 0, 	 0, /* 0xF0 */
+    0x9C78, 	 0, 	 0, 0x9C76, 	 0, 0x8D9A, 	 0, 0x9C7C	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_60[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
                                                     0x9C83, 0x9C89, /* 0x00 */
-    0x9C81,      0, 0x937B,      0,      0, 0x9C86, 0x957C,      0, /* 0x10 */
-         0, 0x9C80,      0, 0x9C85, 0x97E5, 0x8E76,      0,      0, /* 0x10 */
-    0x91D3, 0x9C7D,      0,      0,      0, 0x8B7D, 0x9C88, 0x90AB, /* 0x20 */
-    0x8985, 0x9C82, 0x89F6, 0x9C87,      0,      0,      0, 0x8BAF, /* 0x20 */
-         0, 0x9C84,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0x9C8A,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0x9C8C, 0x9C96, 0x9C94,      0,      0, 0x9C91,      0, /* 0x40 */
-         0,      0, 0x9C90, 0x97F6,      0, 0x9C92,      0,      0, /* 0x40 */
-    0x8BB0,      0, 0x8D50,      0,      0, 0x8F9A,      0,      0, /* 0x50 */
-         0, 0x9C99, 0x9C8B,      0,      0, 0xFABC,      0, 0x9C8F, /* 0x50 */
-    0x9C7E,      0, 0x89F8, 0x9C93, 0x9C95, 0x9270,      0,      0, /* 0x60 */
-    0x8DA6, 0x89B6, 0x9C8D, 0x9C98, 0x9C97, 0x8BB1,      0, 0x91A7, /* 0x60 */
-    0x8A86,      0,      0,      0,      0, 0x8C62,      0, 0x9C8E, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x9C9A,      0, 0x9C9D, 0x9C9F, 0xFABD,      0,      0, /* 0x80 */
-         0, 0x8EBB, 0xFABE, 0x9CA5, 0x92EE, 0x9C9B,      0,      0, /* 0x80 */
-         0,      0, 0x9CA3,      0, 0x89F7,      0, 0x9CA1, 0x9CA2, /* 0x90 */
-         0,      0, 0x9C9E, 0x9CA0,      0,      0,      0, 0x8CE5, /* 0x90 */
-    0x9749,      0,      0, 0x8AB3,      0,      0, 0x8978, 0x9CA4, /* 0xA0 */
-         0, 0x9459, 0x88AB,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x94DF, 0x9C7B, 0x9CAA, 0x9CAE, 0x96E3,      0, /* 0xB0 */
-    0x9CA7,      0,      0,      0, 0x9389, 0x9CAC,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x8FEE, 0x9CAD, 0x93D5, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x9866,      0, 0x9CA9,      0, 0xFAC0,      0,      0, /* 0xD0 */
-    0x9CAF,      0, 0x8D9B,      0, 0x90C9,      0, 0xFABF, 0x88D2, /* 0xD0 */
-    0x9CA8, 0x9CA6,      0, 0x9179,      0,      0,      0, 0x9C9C, /* 0xE0 */
-    0x8E53,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x91C4, 0x9CBB, 0xFAC2, 0x917A, 0x9CB6,      0, 0x9CB3, 0x9CB4, /* 0xF0 */
-         0, 0x8EE4, 0x9CB7, 0x9CBA                                  /* 0xF0 */
+    0x9C81, 	 0, 0x937B, 	 0, 	 0, 0x9C86, 0x957C, 	 0, /* 0x10 */
+         0, 0x9C80, 	 0, 0x9C85, 0x97E5, 0x8E76, 	 0, 	 0, /* 0x10 */
+    0x91D3, 0x9C7D, 	 0, 	 0, 	 0, 0x8B7D, 0x9C88, 0x90AB, /* 0x20 */
+    0x8985, 0x9C82, 0x89F6, 0x9C87, 	 0, 	 0, 	 0, 0x8BAF, /* 0x20 */
+         0, 0x9C84, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x9C8A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x9C8C, 0x9C96, 0x9C94, 	 0, 	 0, 0x9C91, 	 0, /* 0x40 */
+         0, 	 0, 0x9C90, 0x97F6, 	 0, 0x9C92, 	 0, 	 0, /* 0x40 */
+    0x8BB0, 	 0, 0x8D50, 	 0, 	 0, 0x8F9A, 	 0, 	 0, /* 0x50 */
+         0, 0x9C99, 0x9C8B, 	 0, 	 0, 0xFABC, 	 0, 0x9C8F, /* 0x50 */
+    0x9C7E, 	 0, 0x89F8, 0x9C93, 0x9C95, 0x9270, 	 0, 	 0, /* 0x60 */
+    0x8DA6, 0x89B6, 0x9C8D, 0x9C98, 0x9C97, 0x8BB1, 	 0, 0x91A7, /* 0x60 */
+    0x8A86, 	 0, 	 0, 	 0, 	 0, 0x8C62, 	 0, 0x9C8E, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x9C9A, 	 0, 0x9C9D, 0x9C9F, 0xFABD, 	 0, 	 0, /* 0x80 */
+         0, 0x8EBB, 0xFABE, 0x9CA5, 0x92EE, 0x9C9B, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x9CA3, 	 0, 0x89F7, 	 0, 0x9CA1, 0x9CA2, /* 0x90 */
+         0, 	 0, 0x9C9E, 0x9CA0, 	 0, 	 0, 	 0, 0x8CE5, /* 0x90 */
+    0x9749, 	 0, 	 0, 0x8AB3, 	 0, 	 0, 0x8978, 0x9CA4, /* 0xA0 */
+         0, 0x9459, 0x88AB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x94DF, 0x9C7B, 0x9CAA, 0x9CAE, 0x96E3, 	 0, /* 0xB0 */
+    0x9CA7, 	 0, 	 0, 	 0, 0x9389, 0x9CAC, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x8FEE, 0x9CAD, 0x93D5, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x9866, 	 0, 0x9CA9, 	 0, 0xFAC0, 	 0, 	 0, /* 0xD0 */
+    0x9CAF, 	 0, 0x8D9B, 	 0, 0x90C9, 	 0, 0xFABF, 0x88D2, /* 0xD0 */
+    0x9CA8, 0x9CA6, 	 0, 0x9179, 	 0, 	 0, 	 0, 0x9C9C, /* 0xE0 */
+    0x8E53, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x91C4, 0x9CBB, 0xFAC2, 0x917A, 0x9CB6, 	 0, 0x9CB3, 0x9CB4, /* 0xF0 */
+         0, 0x8EE4, 0x9CB7, 0x9CBA									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_61[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x9CB5, 0x8F44,      0, 0x9CB8,      0,      0, 0x9CB2,      0, /* 0x00 */
-    0x96FA, 0x96F9,      0,      0,      0, 0x9CBC, 0x9CBD, 0x88D3, /* 0x00 */
-         0, 0xFAC3,      0,      0,      0, 0x9CB1,      0,      0, /* 0x10 */
-         0,      0, 0x8BF0, 0x88A4,      0,      0,      0, 0x8AB4, /* 0x10 */
-    0xFAC1, 0x9CB9,      0,      0,      0,      0,      0, 0x9CC1, /* 0x20 */
-    0x9CC0,      0,      0,      0, 0x9CC5,      0,      0,      0, /* 0x20 */
-    0xFAC5,      0,      0,      0, 0x9CC6,      0,      0, 0xFAC4, /* 0x30 */
-         0,      0,      0,      0, 0x9CC4, 0x9CC7, 0x9CBF, 0x9CC3, /* 0x30 */
-         0,      0, 0x9CC8,      0, 0x9CC9,      0,      0, 0x9CBE, /* 0x40 */
-    0x8E9C,      0, 0x9CC2, 0x91D4, 0x8D51, 0x9CB0, 0x9054,      0, /* 0x40 */
-         0,      0,      0, 0x9CD6,      0, 0x95E7,      0,      0, /* 0x50 */
-    0x9CCC, 0x9CCD, 0x9CCE,      0,      0, 0x9CD5,      0, 0x9CD4, /* 0x50 */
-         0,      0, 0x969D, 0x8AB5,      0, 0x9CD2,      0, 0x8C64, /* 0x60 */
-    0x8A53,      0,      0, 0x9CCF,      0,      0, 0x97B6, 0x9CD1, /* 0x60 */
-    0x88D4, 0x9CD3,      0, 0x9CCA, 0x9CD0, 0x9CD7, 0x8C63, 0x9CCB, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x977C,      0, /* 0x70 */
-         0,      0, 0x974A,      0,      0,      0,      0, 0x9CDA, /* 0x80 */
-         0,      0, 0x9CDE,      0,      0,      0, 0x919E,      0, /* 0x80 */
-    0x97F7, 0x9CDF,      0,      0, 0x9CDC,      0, 0x9CD9,      0, /* 0x90 */
-    0xFAC6, 0x9CD8, 0x9CDD,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0x95AE,      0,      0, 0x93B2, /* 0xA0 */
-         0, 0x8C65,      0, 0x9CE0, 0x9CDB,      0, 0x9CE1,      0, /* 0xA0 */
-         0,      0, 0x8C9B,      0,      0,      0, 0x89AF,      0, /* 0xB0 */
-         0,      0, 0x9CE9,      0,      0,      0, 0x8AB6,      0, /* 0xB0 */
-         0,      0,      0, 0x9CE7,      0,      0, 0x9CE8, 0x8DA7, /* 0xC0 */
-    0x9CE6, 0x9CE4, 0x9CE3, 0x9CEA, 0x9CE2, 0x9CEC,      0,      0, /* 0xC0 */
-    0x89F9,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0x9CEE,      0,      0, 0x9CED,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0x92A6,      0, 0x9CF1,      0, 0x9CEF, 0x9CE5, /* 0xF0 */
-    0x8C9C,      0, 0x9CF0,      0, 0x9CF4, 0x9CF3, 0x9CF5, 0x9CF2  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x9CB5, 0x8F44, 	 0, 0x9CB8, 	 0, 	 0, 0x9CB2, 	 0, /* 0x00 */
+    0x96FA, 0x96F9, 	 0, 	 0, 	 0, 0x9CBC, 0x9CBD, 0x88D3, /* 0x00 */
+         0, 0xFAC3, 	 0, 	 0, 	 0, 0x9CB1, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x8BF0, 0x88A4, 	 0, 	 0, 	 0, 0x8AB4, /* 0x10 */
+    0xFAC1, 0x9CB9, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9CC1, /* 0x20 */
+    0x9CC0, 	 0, 	 0, 	 0, 0x9CC5, 	 0, 	 0, 	 0, /* 0x20 */
+    0xFAC5, 	 0, 	 0, 	 0, 0x9CC6, 	 0, 	 0, 0xFAC4, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x9CC4, 0x9CC7, 0x9CBF, 0x9CC3, /* 0x30 */
+         0, 	 0, 0x9CC8, 	 0, 0x9CC9, 	 0, 	 0, 0x9CBE, /* 0x40 */
+    0x8E9C, 	 0, 0x9CC2, 0x91D4, 0x8D51, 0x9CB0, 0x9054, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x9CD6, 	 0, 0x95E7, 	 0, 	 0, /* 0x50 */
+    0x9CCC, 0x9CCD, 0x9CCE, 	 0, 	 0, 0x9CD5, 	 0, 0x9CD4, /* 0x50 */
+         0, 	 0, 0x969D, 0x8AB5, 	 0, 0x9CD2, 	 0, 0x8C64, /* 0x60 */
+    0x8A53, 	 0, 	 0, 0x9CCF, 	 0, 	 0, 0x97B6, 0x9CD1, /* 0x60 */
+    0x88D4, 0x9CD3, 	 0, 0x9CCA, 0x9CD0, 0x9CD7, 0x8C63, 0x9CCB, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x977C, 	 0, /* 0x70 */
+         0, 	 0, 0x974A, 	 0, 	 0, 	 0, 	 0, 0x9CDA, /* 0x80 */
+         0, 	 0, 0x9CDE, 	 0, 	 0, 	 0, 0x919E, 	 0, /* 0x80 */
+    0x97F7, 0x9CDF, 	 0, 	 0, 0x9CDC, 	 0, 0x9CD9, 	 0, /* 0x90 */
+    0xFAC6, 0x9CD8, 0x9CDD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x95AE, 	 0, 	 0, 0x93B2, /* 0xA0 */
+         0, 0x8C65, 	 0, 0x9CE0, 0x9CDB, 	 0, 0x9CE1, 	 0, /* 0xA0 */
+         0, 	 0, 0x8C9B, 	 0, 	 0, 	 0, 0x89AF, 	 0, /* 0xB0 */
+         0, 	 0, 0x9CE9, 	 0, 	 0, 	 0, 0x8AB6, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x9CE7, 	 0, 	 0, 0x9CE8, 0x8DA7, /* 0xC0 */
+    0x9CE6, 0x9CE4, 0x9CE3, 0x9CEA, 0x9CE2, 0x9CEC, 	 0, 	 0, /* 0xC0 */
+    0x89F9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x9CEE, 	 0, 	 0, 0x9CED, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x92A6, 	 0, 0x9CF1, 	 0, 0x9CEF, 0x9CE5, /* 0xF0 */
+    0x8C9C, 	 0, 0x9CF0, 	 0, 0x9CF4, 0x9CF3, 0x9CF5, 0x9CF2	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_62[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x9CF6,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0x9CF7, 0x9CF8, 0x95E8,      0, 0x9CFA, 0x9CF9, 0x8F5E,      0, /* 0x00 */
-    0x90AC, 0x89E4, 0x89FA, 0xFAC7, 0x9CFB,      0, 0x88BD,      0, /* 0x10 */
-         0,      0, 0x90CA, 0x9CFC,      0, 0xE6C1, 0x9D40, 0x8C81, /* 0x10 */
-         0, 0x9D41,      0,      0,      0,      0, 0x90ED,      0, /* 0x20 */
-         0,      0, 0x9D42,      0,      0,      0, 0x9D43, 0x8B59, /* 0x20 */
-    0x9D44,      0, 0x9D45, 0x9D46, 0x91D5,      0,      0,      0, /* 0x30 */
-    0x8CCB,      0,      0, 0x96DF,      0,      0,      0, 0x965B, /* 0x30 */
-    0x8F8A, 0x9D47,      0,      0,      0,      0,      0, 0x90EE, /* 0x40 */
-    0xE7BB, 0x94E0,      0, 0x8EE8,      0, 0x8DCB, 0x9D48,      0, /* 0x40 */
-         0,      0,      0, 0x91C5,      0, 0x95A5,      0,      0, /* 0x50 */
-    0x91EF,      0,      0, 0x9D4B,      0,      0, 0x9D49,      0, /* 0x50 */
-    0x9D4C,      0,      0, 0x9D4A,      0,      0,      0,      0, /* 0x60 */
-    0x9D4D,      0,      0,      0,      0,      0, 0x95AF,      0, /* 0x60 */
-         0, 0x88B5,      0,      0,      0,      0, 0x957D,      0, /* 0x70 */
-         0, 0x94E1,      0,      0, 0x9D4E,      0, 0x9D51, 0x8FB3, /* 0x70 */
-    0x8B5A,      0, 0x9D4F, 0x9D56, 0x8FB4,      0,      0,      0, /* 0x80 */
-         0, 0x9D50, 0x9463,      0,      0,      0,      0,      0, /* 0x80 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x9CF6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0x9CF7, 0x9CF8, 0x95E8, 	 0, 0x9CFA, 0x9CF9, 0x8F5E, 	 0, /* 0x00 */
+    0x90AC, 0x89E4, 0x89FA, 0xFAC7, 0x9CFB, 	 0, 0x88BD, 	 0, /* 0x10 */
+         0, 	 0, 0x90CA, 0x9CFC, 	 0, 0xE6C1, 0x9D40, 0x8C81, /* 0x10 */
+         0, 0x9D41, 	 0, 	 0, 	 0, 	 0, 0x90ED, 	 0, /* 0x20 */
+         0, 	 0, 0x9D42, 	 0, 	 0, 	 0, 0x9D43, 0x8B59, /* 0x20 */
+    0x9D44, 	 0, 0x9D45, 0x9D46, 0x91D5, 	 0, 	 0, 	 0, /* 0x30 */
+    0x8CCB, 	 0, 	 0, 0x96DF, 	 0, 	 0, 	 0, 0x965B, /* 0x30 */
+    0x8F8A, 0x9D47, 	 0, 	 0, 	 0, 	 0, 	 0, 0x90EE, /* 0x40 */
+    0xE7BB, 0x94E0, 	 0, 0x8EE8, 	 0, 0x8DCB, 0x9D48, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x91C5, 	 0, 0x95A5, 	 0, 	 0, /* 0x50 */
+    0x91EF, 	 0, 	 0, 0x9D4B, 	 0, 	 0, 0x9D49, 	 0, /* 0x50 */
+    0x9D4C, 	 0, 	 0, 0x9D4A, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x9D4D, 	 0, 	 0, 	 0, 	 0, 	 0, 0x95AF, 	 0, /* 0x60 */
+         0, 0x88B5, 	 0, 	 0, 	 0, 	 0, 0x957D, 	 0, /* 0x70 */
+         0, 0x94E1, 	 0, 	 0, 0x9D4E, 	 0, 0x9D51, 0x8FB3, /* 0x70 */
+    0x8B5A, 	 0, 0x9D4F, 0x9D56, 0x8FB4, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x9D50, 0x9463, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x977D, 0x9D52, 0x9D53, 0x9D57, 0x938A, 0x9D54, 0x8D52, /* 0x90 */
-    0x90DC,      0,      0, 0x9D65, 0x94B2,      0, 0x91F0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0xFAC8,      0, /* 0xA0 */
-         0,      0,      0, 0x94E2, 0x9DAB,      0,      0,      0, /* 0xA0 */
-         0, 0x95F8,      0,      0,      0, 0x92EF,      0,      0, /* 0xB0 */
-         0, 0x9695,      0, 0x9D5A, 0x899F, 0x928A,      0,      0, /* 0xB0 */
-         0,      0, 0x9D63,      0,      0, 0x9253, 0x9D5D, 0x9D64, /* 0xC0 */
-    0x9D5F, 0x9D66, 0x9D62,      0, 0x9D61, 0x948F,      0, 0x9D5B, /* 0xC0 */
-    0x89FB, 0x9D59, 0x8B91, 0x91F1, 0x9D55,      0,      0, 0x9D58, /* 0xD0 */
-    0x8D53, 0x90D9,      0, 0x8FB5, 0x9D60, 0x9471,      0,      0, /* 0xD0 */
-    0x8B92, 0x8A67,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0x8A87, 0x9040, 0x9D68, 0x9D6D, /* 0xE0 */
-         0, 0x9D69,      0, 0x8C9D,      0, 0x9D6E, 0x8E41, 0x8D89, /* 0xF0 */
-         0,      0,      0,      0,      0,      0, 0x8F45, 0x9D5C  /* 0xF0 */
+    0x90DC, 	 0, 	 0, 0x9D65, 0x94B2, 	 0, 0x91F0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFAC8, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x94E2, 0x9DAB, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x95F8, 	 0, 	 0, 	 0, 0x92EF, 	 0, 	 0, /* 0xB0 */
+         0, 0x9695, 	 0, 0x9D5A, 0x899F, 0x928A, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x9D63, 	 0, 	 0, 0x9253, 0x9D5D, 0x9D64, /* 0xC0 */
+    0x9D5F, 0x9D66, 0x9D62, 	 0, 0x9D61, 0x948F, 	 0, 0x9D5B, /* 0xC0 */
+    0x89FB, 0x9D59, 0x8B91, 0x91F1, 0x9D55, 	 0, 	 0, 0x9D58, /* 0xD0 */
+    0x8D53, 0x90D9, 	 0, 0x8FB5, 0x9D60, 0x9471, 	 0, 	 0, /* 0xD0 */
+    0x8B92, 0x8A67, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x8A87, 0x9040, 0x9D68, 0x9D6D, /* 0xE0 */
+         0, 0x9D69, 	 0, 0x8C9D, 	 0, 0x9D6E, 0x8E41, 0x8D89, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8F45, 0x9D5C	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_63[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x8E9D, 0x9D6B,      0,      0,      0,      0, 0x8E77, /* 0x00 */
-    0x9D6C, 0x88C2,      0,      0, 0x9D67,      0,      0,      0, /* 0x00 */
-         0, 0x92A7,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0x8B93,      0,      0,      0,      0,      0, 0x8BB2, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0x9D6A, /* 0x20 */
-    0x88A5,      0,      0, 0x8DC1,      0,      0,      0, 0x9055, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0x92F0,      0,      0, 0x94D2, 0x9D70, 0x917D, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0x91A8,      0,      0, 0x8E4A, 0x9D71,      0, 0x9D73, /* 0x40 */
-    0x9D6F,      0,      0,      0,      0, 0x95DF,      0, 0x92BB, /* 0x50 */
-         0,      0,      0,      0, 0x917B,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0x95F9, /* 0x60 */
-    0x8ECC, 0x9D80,      0, 0x9D7E,      0,      0, 0x9098,      0, /* 0x60 */
-         0,      0, 0x8C9E,      0,      0,      0, 0x9D78, 0x8FB7, /* 0x70 */
-         0,      0, 0x93E6, 0x9450,      0,      0,      0,      0, /* 0x70 */
-    0x9D76,      0,      0, 0x917C,      0,      0,      0,      0, /* 0x80 */
-    0x8EF6, 0x9D7B,      0,      0, 0x8FB6,      0, 0x9D75, 0x9D7A, /* 0x80 */
-         0,      0, 0x9472,      0,      0,      0, 0x9D74,      0, /* 0x90 */
-    0x8C40,      0,      0, 0x8A7C,      0,      0,      0, 0x9D7C, /* 0x90 */
-    0x97A9, 0x8DCC, 0x9254, 0x9D79,      0, 0x90DA,      0, 0x8D54, /* 0xA0 */
-    0x9084, 0x8986, 0x915B, 0x9D77, 0x8B64,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x8C66,      0, 0x92CD, 0x9D7D,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x917E,      0,      0, 0x9D81,      0, /* 0xB0 */
-    0x9D83,      0,      0, 0x91B5, 0x9D89,      0, 0x9D84,      0, /* 0xC0 */
-         0, 0x9D86,      0,      0,      0,      0,      0, 0x9560, /* 0xC0 */
-    0x92F1,      0, 0x9D87,      0,      0,      0, 0x974B,      0, /* 0xD0 */
-         0,      0, 0x9767, 0x8AB7,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x88AC,      0, 0x9D85,      0,      0,      0,      0, /* 0xE0 */
-         0, 0x9D82,      0,      0,      0,      0, 0x8AF6,      0, /* 0xE0 */
-         0,      0,      0,      0, 0x8987, 0xFAC9, 0x9D88,      0, /* 0xF0 */
-         0,      0, 0x9768                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x8E9D, 0x9D6B, 	 0, 	 0, 	 0, 	 0, 0x8E77, /* 0x00 */
+    0x9D6C, 0x88C2, 	 0, 	 0, 0x9D67, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x92A7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x8B93, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8BB2, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9D6A, /* 0x20 */
+    0x88A5, 	 0, 	 0, 0x8DC1, 	 0, 	 0, 	 0, 0x9055, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x92F0, 	 0, 	 0, 0x94D2, 0x9D70, 0x917D, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x91A8, 	 0, 	 0, 0x8E4A, 0x9D71, 	 0, 0x9D73, /* 0x40 */
+    0x9D6F, 	 0, 	 0, 	 0, 	 0, 0x95DF, 	 0, 0x92BB, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x917B, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x95F9, /* 0x60 */
+    0x8ECC, 0x9D80, 	 0, 0x9D7E, 	 0, 	 0, 0x9098, 	 0, /* 0x60 */
+         0, 	 0, 0x8C9E, 	 0, 	 0, 	 0, 0x9D78, 0x8FB7, /* 0x70 */
+         0, 	 0, 0x93E6, 0x9450, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x9D76, 	 0, 	 0, 0x917C, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x8EF6, 0x9D7B, 	 0, 	 0, 0x8FB6, 	 0, 0x9D75, 0x9D7A, /* 0x80 */
+         0, 	 0, 0x9472, 	 0, 	 0, 	 0, 0x9D74, 	 0, /* 0x90 */
+    0x8C40, 	 0, 	 0, 0x8A7C, 	 0, 	 0, 	 0, 0x9D7C, /* 0x90 */
+    0x97A9, 0x8DCC, 0x9254, 0x9D79, 	 0, 0x90DA, 	 0, 0x8D54, /* 0xA0 */
+    0x9084, 0x8986, 0x915B, 0x9D77, 0x8B64, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x8C66, 	 0, 0x92CD, 0x9D7D, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x917E, 	 0, 	 0, 0x9D81, 	 0, /* 0xB0 */
+    0x9D83, 	 0, 	 0, 0x91B5, 0x9D89, 	 0, 0x9D84, 	 0, /* 0xC0 */
+         0, 0x9D86, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9560, /* 0xC0 */
+    0x92F1, 	 0, 0x9D87, 	 0, 	 0, 	 0, 0x974B, 	 0, /* 0xD0 */
+         0, 	 0, 0x9767, 0x8AB7, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x88AC, 	 0, 0x9D85, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x9D82, 	 0, 	 0, 	 0, 	 0, 0x8AF6, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x8987, 0xFAC9, 0x9D88, 	 0, /* 0xF0 */
+         0, 	 0, 0x9768											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_64[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0x9D8C,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0x91B9,      0, 0x9D93, /* 0x00 */
-         0,      0,      0, 0x9D8D,      0,      0, 0x9D8A, 0x9D91, /* 0x10 */
-         0,      0,      0,      0, 0x9D72,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x9D8E,      0, /* 0x20 */
-    0x9D92,      0,      0,      0, 0x94C0, 0x938B,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0x9D8B,      0, 0x9D8F,      0, /* 0x30 */
-         0,      0, 0x8C67,      0,      0,      0, 0x8DEF,      0, /* 0x30 */
-         0,      0, 0x90DB,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0x9D97,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0x9345,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xFACA,      0,      0,      0,      0,      0,      0, 0x9D94, /* 0x60 */
-         0, 0x9680,      0,      0,      0,      0,      0, 0x9D95, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0x9D96,      0, /* 0x70 */
-    0x96CC,      0, 0x90A0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0x8C82,      0,      0,      0,      0, /* 0x80 */
-    0x9D9D,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0x8E54, 0x9D9A,      0, 0x9D99,      0,      0, /* 0x90 */
-         0,      0, 0x9451,      0,      0, 0xFACB, 0x93B3,      0, /* 0x90 */
-         0,      0,      0,      0, 0x9350, 0x9D9B,      0,      0, /* 0xA0 */
-         0, 0x9D9C,      0, 0x958F,      0, 0x9464, 0x8E42,      0, /* 0xA0 */
-    0x90EF,      0, 0x966F,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x8A68,      0, 0x9DA3, 0x9D9E,      0,      0,      0, /* 0xB0 */
-         0, 0x9769, 0x9DA5,      0,      0, 0x9DA1,      0, 0x9DA2, /* 0xC0 */
-         0,      0,      0,      0,      0, 0x9180, 0xFACC,      0, /* 0xC0 */
-         0,      0, 0x9DA0,      0, 0x9D5E,      0,      0,      0, /* 0xD0 */
-    0x9DA4,      0, 0x9D9F,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x9DA9, 0x9DAA, 0x9346, 0x9DAC,      0,      0, 0x8E43, 0x9DA7, /* 0xE0 */
-         0,      0,      0,      0, 0x8B5B,      0,      0, 0x9DAD, /* 0xE0 */
-         0, 0x9DA6, 0x9DB1,      0, 0x9DB0,      0, 0x9DAF,      0, /* 0xF0 */
-         0,      0, 0x9DB2,      0,      0, 0x9DB4, 0x8FEF          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0x9D8C, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x91B9, 	 0, 0x9D93, /* 0x00 */
+         0, 	 0, 	 0, 0x9D8D, 	 0, 	 0, 0x9D8A, 0x9D91, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x9D72, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9D8E, 	 0, /* 0x20 */
+    0x9D92, 	 0, 	 0, 	 0, 0x94C0, 0x938B, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x9D8B, 	 0, 0x9D8F, 	 0, /* 0x30 */
+         0, 	 0, 0x8C67, 	 0, 	 0, 	 0, 0x8DEF, 	 0, /* 0x30 */
+         0, 	 0, 0x90DB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9D97, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x9345, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xFACA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9D94, /* 0x60 */
+         0, 0x9680, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9D95, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9D96, 	 0, /* 0x70 */
+    0x96CC, 	 0, 0x90A0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x8C82, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x9D9D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x8E54, 0x9D9A, 	 0, 0x9D99, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x9451, 	 0, 	 0, 0xFACB, 0x93B3, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x9350, 0x9D9B, 	 0, 	 0, /* 0xA0 */
+         0, 0x9D9C, 	 0, 0x958F, 	 0, 0x9464, 0x8E42, 	 0, /* 0xA0 */
+    0x90EF, 	 0, 0x966F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x8A68, 	 0, 0x9DA3, 0x9D9E, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x9769, 0x9DA5, 	 0, 	 0, 0x9DA1, 	 0, 0x9DA2, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9180, 0xFACC, 	 0, /* 0xC0 */
+         0, 	 0, 0x9DA0, 	 0, 0x9D5E, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x9DA4, 	 0, 0x9D9F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x9DA9, 0x9DAA, 0x9346, 0x9DAC, 	 0, 	 0, 0x8E43, 0x9DA7, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x8B5B, 	 0, 	 0, 0x9DAD, /* 0xE0 */
+         0, 0x9DA6, 0x9DB1, 	 0, 0x9DB0, 	 0, 0x9DAF, 	 0, /* 0xF0 */
+         0, 	 0, 0x9DB2, 	 0, 	 0, 0x9DB4, 0x8FEF			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_65[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x9DB3,      0,      0,      0,      0, 0x9DB7,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0x9DB5,      0,      0,      0, 0x9DB6, 0x9D90,      0,      0, /* 0x10 */
-         0,      0,      0, 0x9DB9, 0x9DB8,      0,      0,      0, /* 0x20 */
-         0,      0, 0x9D98, 0x9DBA, 0x9DAE,      0,      0, 0x8E78, /* 0x20 */
-         0,      0,      0,      0, 0x9DBB, 0x9DBC, 0x9DBE, 0x9DBD, /* 0x30 */
-    0x9DBF, 0x89FC,      0, 0x8D55,      0,      0, 0x95FA, 0x90AD, /* 0x30 */
-         0,      0,      0,      0,      0, 0x8CCC,      0,      0, /* 0x40 */
-    0x9DC1,      0,      0,      0,      0, 0x9DC4, 0xFACD, 0x9571, /* 0x40 */
-         0, 0x8B7E,      0,      0,      0, 0x9DC3, 0x9DC2, 0x9473, /* 0x50 */
-    0x9DC5, 0x8BB3,      0,      0,      0, 0x9DC7, 0x9DC6,      0, /* 0x50 */
-         0,      0, 0x8AB8, 0x8E55,      0,      0, 0x93D6,      0, /* 0x60 */
-         0,      0,      0,      0, 0x8C68,      0,      0,      0, /* 0x60 */
-    0x9094,      0, 0x9DC8,      0, 0x90AE, 0x9347,      0, 0x957E, /* 0x70 */
-    0x9DC9,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x9DCA, 0x9DCB,      0,      0,      0, 0x95B6, /* 0x80 */
-    0x9B7C, 0x90C4,      0,      0, 0x956B,      0, 0x8DD6,      0, /* 0x80 */
-    0x94E3, 0x94C1,      0,      0,      0,      0,      0, 0x936C, /* 0x90 */
-         0, 0x97BF,      0, 0x9DCD, 0x8ECE,      0,      0, 0x9DCE, /* 0x90 */
-         0, 0x88B4,      0,      0, 0x8BD2, 0x90CB,      0, 0x9580, /* 0xA0 */
-         0,      0,      0, 0x9DCF, 0x8E61, 0x9266,      0, 0x8E7A, /* 0xA0 */
-    0x9056,      0,      0,      0,      0,      0,      0, 0x9DD0, /* 0xB0 */
-         0, 0x95FB,      0,      0, 0x8997, 0x8E7B,      0,      0, /* 0xB0 */
-         0, 0x9DD3,      0, 0x9DD1, 0x9DD4, 0x97B7, 0x9DD2,      0, /* 0xC0 */
-         0,      0,      0, 0x90F9, 0x9DD5,      0,      0, 0x91B0, /* 0xC0 */
-         0,      0, 0x9DD6,      0,      0,      0,      0, 0x8AF8, /* 0xD0 */
-         0, 0x9DD8,      0, 0x9DD7,      0,      0,      0,      0, /* 0xD0 */
-    0x9DD9, 0x9DDA, 0x8AF9,      0,      0, 0x93FA, 0x9255, 0x8B8C, /* 0xE0 */
-    0x8E7C, 0x9181,      0,      0, 0x8F7B, 0x88AE,      0,      0, /* 0xE0 */
-         0, 0x9DDB,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x89A0, 0x9DDF                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x9DB3, 	 0, 	 0, 	 0, 	 0, 0x9DB7, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x9DB5, 	 0, 	 0, 	 0, 0x9DB6, 0x9D90, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x9DB9, 0x9DB8, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x9D98, 0x9DBA, 0x9DAE, 	 0, 	 0, 0x8E78, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x9DBB, 0x9DBC, 0x9DBE, 0x9DBD, /* 0x30 */
+    0x9DBF, 0x89FC, 	 0, 0x8D55, 	 0, 	 0, 0x95FA, 0x90AD, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x8CCC, 	 0, 	 0, /* 0x40 */
+    0x9DC1, 	 0, 	 0, 	 0, 	 0, 0x9DC4, 0xFACD, 0x9571, /* 0x40 */
+         0, 0x8B7E, 	 0, 	 0, 	 0, 0x9DC3, 0x9DC2, 0x9473, /* 0x50 */
+    0x9DC5, 0x8BB3, 	 0, 	 0, 	 0, 0x9DC7, 0x9DC6, 	 0, /* 0x50 */
+         0, 	 0, 0x8AB8, 0x8E55, 	 0, 	 0, 0x93D6, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x8C68, 	 0, 	 0, 	 0, /* 0x60 */
+    0x9094, 	 0, 0x9DC8, 	 0, 0x90AE, 0x9347, 	 0, 0x957E, /* 0x70 */
+    0x9DC9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x9DCA, 0x9DCB, 	 0, 	 0, 	 0, 0x95B6, /* 0x80 */
+    0x9B7C, 0x90C4, 	 0, 	 0, 0x956B, 	 0, 0x8DD6, 	 0, /* 0x80 */
+    0x94E3, 0x94C1, 	 0, 	 0, 	 0, 	 0, 	 0, 0x936C, /* 0x90 */
+         0, 0x97BF, 	 0, 0x9DCD, 0x8ECE, 	 0, 	 0, 0x9DCE, /* 0x90 */
+         0, 0x88B4, 	 0, 	 0, 0x8BD2, 0x90CB, 	 0, 0x9580, /* 0xA0 */
+         0, 	 0, 	 0, 0x9DCF, 0x8E61, 0x9266, 	 0, 0x8E7A, /* 0xA0 */
+    0x9056, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9DD0, /* 0xB0 */
+         0, 0x95FB, 	 0, 	 0, 0x8997, 0x8E7B, 	 0, 	 0, /* 0xB0 */
+         0, 0x9DD3, 	 0, 0x9DD1, 0x9DD4, 0x97B7, 0x9DD2, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x90F9, 0x9DD5, 	 0, 	 0, 0x91B0, /* 0xC0 */
+         0, 	 0, 0x9DD6, 	 0, 	 0, 	 0, 	 0, 0x8AF8, /* 0xD0 */
+         0, 0x9DD8, 	 0, 0x9DD7, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x9DD9, 0x9DDA, 0x8AF9, 	 0, 	 0, 0x93FA, 0x9255, 0x8B8C, /* 0xE0 */
+    0x8E7C, 0x9181, 	 0, 	 0, 0x8F7B, 0x88AE, 	 0, 	 0, /* 0xE0 */
+         0, 0x9DDB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x89A0, 0x9DDF									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_66[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xFACE,      0, 0x8D56, 0x9DDE,      0,      0, 0x8DA9, 0x8FB8, /* 0x00 */
-         0, 0xFAD1, 0x9DDD,      0, 0x8FB9,      0, 0x96BE, 0x8DA8, /* 0x00 */
-         0,      0,      0, 0x88D5, 0x90CC, 0xFACF,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0x9DE4,      0, 0xFAD3, 0x90AF, /* 0x10 */
-    0x8966,      0,      0,      0, 0xFAD4, 0x8F74,      0, 0x9686, /* 0x20 */
-    0x8DF0,      0,      0,      0,      0, 0x8FBA, 0xFAD2, 0x90A5, /* 0x20 */
-         0, 0xFA63,      0,      0, 0x9DE3, 0x9DE1, 0x9DE2,      0, /* 0x30 */
-         0,      0,      0, 0xFAD0, 0x928B,      0,      0, 0x9E45, /* 0x30 */
-         0, 0x9DE8, 0x8E9E, 0x8D57, 0x9DE6,      0,      0,      0, /* 0x40 */
-         0, 0x9DE7,      0, 0x9057,      0,      0,      0, 0x9DE5, /* 0x40 */
-         0,      0, 0x8E4E,      0,      0,      0,      0, 0xFAD6, /* 0x50 */
-         0, 0xFAD7,      0,      0,      0, 0x9DEA, 0x9DE9, 0x9DEE, /* 0x50 */
-         0,      0, 0x9DEF,      0, 0x9DEB, 0xFAD5, 0x8A41, 0x9DEC, /* 0x60 */
-    0x9DED, 0x94D3,      0,      0,      0,      0, 0x9581, 0x8C69, /* 0x60 */
-    0x9DF0,      0,      0, 0xFAD9, 0x90B0,      0, 0x8FBB,      0, /* 0x70 */
-         0,      0, 0x9271,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x8BC5,      0, 0x9DF1, 0x9DF5,      0,      0, 0x89C9, /* 0x80 */
-    0x9DF2, 0x9DF4,      0,      0,      0,      0, 0x9DF3,      0, /* 0x80 */
-         0, 0x8F8B,      0,      0,      0,      0, 0x9267, 0x88C3, /* 0x90 */
-    0x9DF6, 0xFADA,      0,      0,      0, 0x9DF7,      0,      0, /* 0x90 */
-    0xFADB,      0, 0x92A8,      0,      0,      0, 0x97EF,      0, /* 0xA0 */
-         0,      0,      0, 0x8E62,      0,      0, 0x95E9,      0, /* 0xA0 */
-         0,      0, 0xFADC,      0, 0x965C,      0,      0,      0, /* 0xB0 */
-    0x9E41, 0x9DF9,      0,      0, 0x9DFC,      0, 0x9DFB, 0xFADD, /* 0xB0 */
-         0, 0x9DF8,      0,      0, 0x9E40,      0,      0, 0x93DC, /* 0xC0 */
-         0, 0x9DFA,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0x9E42,      0, /* 0xD0 */
-         0, 0x8F8C, 0x9E43,      0, 0x976A, 0x9498,      0,      0, /* 0xD0 */
-    0x9E44,      0,      0,      0,      0,      0, 0x9E46,      0, /* 0xE0 */
-         0, 0x9E47,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x9E48,      0, 0x8BC8, 0x8967, 0x8D58, 0x9E49,      0, 0x9E4A, /* 0xF0 */
-    0x8F91, 0x9182, 0xFADE, 0xFA66, 0x99D6, 0x915D, 0x915C, 0x91D6  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xFACE, 	 0, 0x8D56, 0x9DDE, 	 0, 	 0, 0x8DA9, 0x8FB8, /* 0x00 */
+         0, 0xFAD1, 0x9DDD, 	 0, 0x8FB9, 	 0, 0x96BE, 0x8DA8, /* 0x00 */
+         0, 	 0, 	 0, 0x88D5, 0x90CC, 0xFACF, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x9DE4, 	 0, 0xFAD3, 0x90AF, /* 0x10 */
+    0x8966, 	 0, 	 0, 	 0, 0xFAD4, 0x8F74, 	 0, 0x9686, /* 0x20 */
+    0x8DF0, 	 0, 	 0, 	 0, 	 0, 0x8FBA, 0xFAD2, 0x90A5, /* 0x20 */
+         0, 0xFA63, 	 0, 	 0, 0x9DE3, 0x9DE1, 0x9DE2, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xFAD0, 0x928B, 	 0, 	 0, 0x9E45, /* 0x30 */
+         0, 0x9DE8, 0x8E9E, 0x8D57, 0x9DE6, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x9DE7, 	 0, 0x9057, 	 0, 	 0, 	 0, 0x9DE5, /* 0x40 */
+         0, 	 0, 0x8E4E, 	 0, 	 0, 	 0, 	 0, 0xFAD6, /* 0x50 */
+         0, 0xFAD7, 	 0, 	 0, 	 0, 0x9DEA, 0x9DE9, 0x9DEE, /* 0x50 */
+         0, 	 0, 0x9DEF, 	 0, 0x9DEB, 0xFAD5, 0x8A41, 0x9DEC, /* 0x60 */
+    0x9DED, 0x94D3, 	 0, 	 0, 	 0, 	 0, 0x9581, 0x8C69, /* 0x60 */
+    0x9DF0, 	 0, 	 0, 0xFAD9, 0x90B0, 	 0, 0x8FBB, 	 0, /* 0x70 */
+         0, 	 0, 0x9271, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x8BC5, 	 0, 0x9DF1, 0x9DF5, 	 0, 	 0, 0x89C9, /* 0x80 */
+    0x9DF2, 0x9DF4, 	 0, 	 0, 	 0, 	 0, 0x9DF3, 	 0, /* 0x80 */
+         0, 0x8F8B, 	 0, 	 0, 	 0, 	 0, 0x9267, 0x88C3, /* 0x90 */
+    0x9DF6, 0xFADA, 	 0, 	 0, 	 0, 0x9DF7, 	 0, 	 0, /* 0x90 */
+    0xFADB, 	 0, 0x92A8, 	 0, 	 0, 	 0, 0x97EF, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x8E62, 	 0, 	 0, 0x95E9, 	 0, /* 0xA0 */
+         0, 	 0, 0xFADC, 	 0, 0x965C, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x9E41, 0x9DF9, 	 0, 	 0, 0x9DFC, 	 0, 0x9DFB, 0xFADD, /* 0xB0 */
+         0, 0x9DF8, 	 0, 	 0, 0x9E40, 	 0, 	 0, 0x93DC, /* 0xC0 */
+         0, 0x9DFA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9E42, 	 0, /* 0xD0 */
+         0, 0x8F8C, 0x9E43, 	 0, 0x976A, 0x9498, 	 0, 	 0, /* 0xD0 */
+    0x9E44, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9E46, 	 0, /* 0xE0 */
+         0, 0x9E47, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x9E48, 	 0, 0x8BC8, 0x8967, 0x8D58, 0x9E49, 	 0, 0x9E4A, /* 0xF0 */
+    0x8F91, 0x9182, 0xFADE, 0xFA66, 0x99D6, 0x915D, 0x915C, 0x91D6	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_67[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x8DC5,      0,      0, 0x98F0,      0,      0,      0,      0, /* 0x00 */
-    0x8C8E, 0x974C,      0, 0x95FC,      0, 0x959E, 0xFADF, 0x9E4B, /* 0x00 */
-         0,      0,      0,      0, 0x8DF1, 0x92BD, 0x9E4C, 0x984E, /* 0x10 */
-         0,      0,      0, 0x965D,      0, 0x92A9, 0x9E4D, 0x8AFA, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x9E4E, 0x9E4F, /* 0x20 */
-    0x96D8,      0, 0x96A2, 0x9696, 0x967B, 0x8E44, 0x9E51,      0, /* 0x20 */
-         0, 0x8EE9,      0,      0, 0x9670,      0, 0x9E53, 0x9E56, /* 0x30 */
-    0x9E55,      0, 0x8AF7,      0,      0, 0x8B80,      0, 0x9E52, /* 0x30 */
-         0, 0x9E54,      0,      0,      0,      0, 0x9E57,      0, /* 0x40 */
-         0, 0x9099,      0,      0,      0,      0, 0x979B, 0x88C7, /* 0x40 */
-    0x8DDE, 0x91BA,      0, 0x8EDB,      0,      0, 0x8FF1,      0, /* 0x50 */
-         0, 0x9E5A,      0,      0, 0x936D,      0, 0x9E58, 0x91A9, /* 0x50 */
-    0x9E59, 0x8FF0, 0x96DB, 0x9E5B, 0x9E5C, 0x9788, 0xFAE1,      0, /* 0x60 */
-         0,      0, 0x9E61,      0,      0, 0x8D59,      0, 0x9474, /* 0x60 */
-    0x9E5E, 0x938C, 0x9DDC, 0x9DE0,      0, 0x8B6E,      0, 0x9466, /* 0x70 */
-         0,      0,      0,      0, 0x9E60,      0, 0x8FBC, 0x94C2, /* 0x70 */
-         0,      0,      0,      0,      0, 0x9E66,      0, 0x94F8, /* 0x80 */
-         0, 0x9E5D,      0, 0x9E63, 0x9E62,      0,      0,      0, /* 0x80 */
-    0x90CD,      0,      0,      0,      0, 0x968D,      0, 0x97D1, /* 0x90 */
-         0,      0, 0x9687,      0, 0x89CA, 0x8E7D,      0,      0, /* 0x90 */
-    0x9867, 0x9E65, 0x9095,      0,      0,      0, 0x9E64,      0, /* 0xA0 */
-         0, 0x9E5F,      0,      0,      0,      0,      0, 0x8CCD, /* 0xA0 */
-         0,      0,      0, 0x9E6B, 0x9E69,      0, 0x89CB, 0x9E67, /* 0xB0 */
-    0x9E6D, 0x9E73,      0, 0xFAE2,      0,      0,      0,      0, /* 0xB0 */
-    0xFAE4, 0x91C6,      0,      0, 0x95BF,      0, 0x9E75,      0, /* 0xC0 */
-         0,      0, 0x9541,      0,      0,      0, 0x9E74, 0x9490, /* 0xC0 */
-    0x965E, 0x8AB9,      0, 0x90F5, 0x8F5F,      0,      0,      0, /* 0xD0 */
-    0x92D1,      0, 0x974D,      0,      0, 0x9E70, 0x9E6F,      0, /* 0xD0 */
-         0,      0, 0x9E71,      0, 0x9E6E,      0,      0, 0x9E76, /* 0xE0 */
-         0, 0x9E6C,      0,      0, 0x9E6A,      0, 0x9E72, 0x9E68, /* 0xE0 */
-         0, 0x928C,      0, 0x96F6, 0x8EC4, 0x8DF2,      0,      0, /* 0xF0 */
-         0,      0,      0, 0x8DB8,      0,      0, 0x968F, 0x8A60  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x8DC5, 	 0, 	 0, 0x98F0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0x8C8E, 0x974C, 	 0, 0x95FC, 	 0, 0x959E, 0xFADF, 0x9E4B, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x8DF1, 0x92BD, 0x9E4C, 0x984E, /* 0x10 */
+         0, 	 0, 	 0, 0x965D, 	 0, 0x92A9, 0x9E4D, 0x8AFA, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9E4E, 0x9E4F, /* 0x20 */
+    0x96D8, 	 0, 0x96A2, 0x9696, 0x967B, 0x8E44, 0x9E51, 	 0, /* 0x20 */
+         0, 0x8EE9, 	 0, 	 0, 0x9670, 	 0, 0x9E53, 0x9E56, /* 0x30 */
+    0x9E55, 	 0, 0x8AF7, 	 0, 	 0, 0x8B80, 	 0, 0x9E52, /* 0x30 */
+         0, 0x9E54, 	 0, 	 0, 	 0, 	 0, 0x9E57, 	 0, /* 0x40 */
+         0, 0x9099, 	 0, 	 0, 	 0, 	 0, 0x979B, 0x88C7, /* 0x40 */
+    0x8DDE, 0x91BA, 	 0, 0x8EDB, 	 0, 	 0, 0x8FF1, 	 0, /* 0x50 */
+         0, 0x9E5A, 	 0, 	 0, 0x936D, 	 0, 0x9E58, 0x91A9, /* 0x50 */
+    0x9E59, 0x8FF0, 0x96DB, 0x9E5B, 0x9E5C, 0x9788, 0xFAE1, 	 0, /* 0x60 */
+         0, 	 0, 0x9E61, 	 0, 	 0, 0x8D59, 	 0, 0x9474, /* 0x60 */
+    0x9E5E, 0x938C, 0x9DDC, 0x9DE0, 	 0, 0x8B6E, 	 0, 0x9466, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0x9E60, 	 0, 0x8FBC, 0x94C2, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9E66, 	 0, 0x94F8, /* 0x80 */
+         0, 0x9E5D, 	 0, 0x9E63, 0x9E62, 	 0, 	 0, 	 0, /* 0x80 */
+    0x90CD, 	 0, 	 0, 	 0, 	 0, 0x968D, 	 0, 0x97D1, /* 0x90 */
+         0, 	 0, 0x9687, 	 0, 0x89CA, 0x8E7D, 	 0, 	 0, /* 0x90 */
+    0x9867, 0x9E65, 0x9095, 	 0, 	 0, 	 0, 0x9E64, 	 0, /* 0xA0 */
+         0, 0x9E5F, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8CCD, /* 0xA0 */
+         0, 	 0, 	 0, 0x9E6B, 0x9E69, 	 0, 0x89CB, 0x9E67, /* 0xB0 */
+    0x9E6D, 0x9E73, 	 0, 0xFAE2, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xFAE4, 0x91C6, 	 0, 	 0, 0x95BF, 	 0, 0x9E75, 	 0, /* 0xC0 */
+         0, 	 0, 0x9541, 	 0, 	 0, 	 0, 0x9E74, 0x9490, /* 0xC0 */
+    0x965E, 0x8AB9, 	 0, 0x90F5, 0x8F5F, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x92D1, 	 0, 0x974D, 	 0, 	 0, 0x9E70, 0x9E6F, 	 0, /* 0xD0 */
+         0, 	 0, 0x9E71, 	 0, 0x9E6E, 	 0, 	 0, 0x9E76, /* 0xE0 */
+         0, 0x9E6C, 	 0, 	 0, 0x9E6A, 	 0, 0x9E72, 0x9E68, /* 0xE0 */
+         0, 0x928C, 	 0, 0x96F6, 0x8EC4, 0x8DF2, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0x8DB8, 	 0, 	 0, 0x968F, 0x8A60	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_68[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xFAE5, 0x92CC, 0x93C8, 0x8968,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0x90F0,      0,      0, 0x90B2, 0x8C49, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x9E78,      0, /* 0x10 */
-         0, 0x8D5A, 0x8A9C,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0x9E7A, 0x8A94, 0x9E81,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x9E7D,      0, 0x90F1,      0,      0,      0, /* 0x30 */
-    0x8A6A, 0x8DAA,      0,      0, 0x8A69, 0x8DCD,      0,      0, /* 0x30 */
-    0x9E7B, 0x8C85, 0x8C6A, 0x938D, 0xFAE6,      0, 0x9E79,      0, /* 0x40 */
-    0x88C4,      0,      0,      0,      0, 0x9E7C, 0x9E7E,      0, /* 0x40 */
-    0x8BCB, 0x8C4B, 0xFAE3, 0x8ABA, 0x8B6A,      0,      0,      0, /* 0x50 */
-         0, 0x9E82,      0,      0, 0x8DF7, 0x9691,      0, 0x8E56, /* 0x50 */
-         0,      0,      0, 0x9E83,      0,      0,      0, 0x954F, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0x9E8F,      0, 0x89B1, 0x9E84, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x9E95, 0x9E85, /* 0x70 */
-         0, 0x97C0,      0, 0x9E8C,      0, 0x947E,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x9E94,      0, 0x9E87, /* 0x80 */
-         0,      0,      0, 0x88B2, 0x9E89,      0,      0, 0x8D5B, /* 0x90 */
-         0,      0,      0, 0x9E8B,      0, 0x9E8A,      0, 0x9E86, /* 0x90 */
-    0x9E91,      0, 0x8FBD,      0,      0,      0, 0x9AEB, 0x8CE6, /* 0xA0 */
-    0x979C,      0,      0,      0,      0, 0x9E88,      0, 0x92F2, /* 0xA0 */
-    0x8A42, 0x8DAB,      0, 0x9E80,      0, 0x9E90, 0x8A81,      0, /* 0xB0 */
-         0, 0x9E8E, 0x9E92,      0, 0x938E,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x8AFC,      0, 0x9EB0,      0, /* 0xC0 */
-    0xFA64, 0x96C7, 0x9E97, 0x8AFB,      0, 0x9E9E,      0, 0xFAE7, /* 0xC0 */
-         0,      0, 0x965F,      0, 0x9E9F, 0x9EA1,      0, 0x9EA5, /* 0xD0 */
-    0x9E99,      0, 0x9249,      0,      0,      0,      0, 0x938F, /* 0xD0 */
-    0x9EA9, 0x9E9C,      0, 0x9EA6,      0,      0,      0, 0x9EA0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0x9058, 0x9EAA, /* 0xE0 */
-         0,      0, 0x90B1,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0x9EA8, 0x8ABB                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xFAE5, 0x92CC, 0x93C8, 0x8968, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x90F0, 	 0, 	 0, 0x90B2, 0x8C49, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9E78, 	 0, /* 0x10 */
+         0, 0x8D5A, 0x8A9C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x9E7A, 0x8A94, 0x9E81, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x9E7D, 	 0, 0x90F1, 	 0, 	 0, 	 0, /* 0x30 */
+    0x8A6A, 0x8DAA, 	 0, 	 0, 0x8A69, 0x8DCD, 	 0, 	 0, /* 0x30 */
+    0x9E7B, 0x8C85, 0x8C6A, 0x938D, 0xFAE6, 	 0, 0x9E79, 	 0, /* 0x40 */
+    0x88C4, 	 0, 	 0, 	 0, 	 0, 0x9E7C, 0x9E7E, 	 0, /* 0x40 */
+    0x8BCB, 0x8C4B, 0xFAE3, 0x8ABA, 0x8B6A, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x9E82, 	 0, 	 0, 0x8DF7, 0x9691, 	 0, 0x8E56, /* 0x50 */
+         0, 	 0, 	 0, 0x9E83, 	 0, 	 0, 	 0, 0x954F, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x9E8F, 	 0, 0x89B1, 0x9E84, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9E95, 0x9E85, /* 0x70 */
+         0, 0x97C0, 	 0, 0x9E8C, 	 0, 0x947E, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9E94, 	 0, 0x9E87, /* 0x80 */
+         0, 	 0, 	 0, 0x88B2, 0x9E89, 	 0, 	 0, 0x8D5B, /* 0x90 */
+         0, 	 0, 	 0, 0x9E8B, 	 0, 0x9E8A, 	 0, 0x9E86, /* 0x90 */
+    0x9E91, 	 0, 0x8FBD, 	 0, 	 0, 	 0, 0x9AEB, 0x8CE6, /* 0xA0 */
+    0x979C, 	 0, 	 0, 	 0, 	 0, 0x9E88, 	 0, 0x92F2, /* 0xA0 */
+    0x8A42, 0x8DAB, 	 0, 0x9E80, 	 0, 0x9E90, 0x8A81, 	 0, /* 0xB0 */
+         0, 0x9E8E, 0x9E92, 	 0, 0x938E, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x8AFC, 	 0, 0x9EB0, 	 0, /* 0xC0 */
+    0xFA64, 0x96C7, 0x9E97, 0x8AFB, 	 0, 0x9E9E, 	 0, 0xFAE7, /* 0xC0 */
+         0, 	 0, 0x965F, 	 0, 0x9E9F, 0x9EA1, 	 0, 0x9EA5, /* 0xD0 */
+    0x9E99, 	 0, 0x9249, 	 0, 	 0, 	 0, 	 0, 0x938F, /* 0xD0 */
+    0x9EA9, 0x9E9C, 	 0, 0x9EA6, 	 0, 	 0, 	 0, 0x9EA0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9058, 0x9EAA, /* 0xE0 */
+         0, 	 0, 0x90B1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0x9EA8, 0x8ABB											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_69[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x986F, 0x9E96,      0,      0, 0x9EA4, 0x88D6,      0,      0, /* 0x00 */
-    0x9E98,      0,      0, 0x96B8, 0x9E9D, 0x9041, 0x92C5, 0x9E93, /* 0x00 */
-         0,      0, 0x9EA3,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0x909A, 0x9EAD, 0x8A91, 0x8C9F,      0,      0,      0, /* 0x10 */
-         0, 0x9EAF, 0x9E9A, 0x9EAE,      0, 0x9EA7, 0x9E9B,      0, /* 0x20 */
-    0x9EAB,      0, 0x9EAC,      0,      0,      0,      0,      0, /* 0x20 */
-    0x9EBD,      0,      0,      0, 0x93CC,      0, 0x9EA2,      0, /* 0x30 */
-         0, 0x9EB9,      0,      0,      0, 0x9EBB,      0, 0x92D6, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x976B,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0x9596, 0x9EB6, 0x91C8,      0,      0, /* 0x50 */
-         0, 0x9EBC, 0x915E,      0, 0x9EB3, 0x9EC0, 0x9EBF,      0, /* 0x50 */
-    0x93ED, 0x9EBE, 0x93E8,      0,      0,      0,      0,      0, /* 0x60 */
-    0xFAE9,      0, 0x9EC2, 0x9EB5,      0, 0x8BC6, 0x9EB8, 0x8F7C, /* 0x60 */
-         0,      0,      0, 0x9480, 0x9EBA, 0x8BC9,      0, 0x9EB2, /* 0x70 */
-    0x9EB4, 0x9EB1,      0,      0, 0x984F, 0x8A79, 0x9EB7,      0, /* 0x70 */
-         0, 0x9EC1, 0x8A54,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0x8DE5,      0,      0,      0, 0x897C,      0, /* 0x80 */
-         0, 0x9ED2,      0,      0, 0x9850, 0x9ED5,      0,      0, /* 0x90 */
-    0xFAEB,      0,      0, 0x9059, 0x9ED4,      0,      0,      0, /* 0x90 */
-    0x9ED3,      0,      0,      0,      0,      0,      0, 0x9ED0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0x9EC4,      0, /* 0xA0 */
-         0, 0x9EE1, 0x9EC3,      0, 0x9ED6,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x9ECE,      0,      0, 0x9EC9, 0x9EC6, /* 0xB0 */
-         0, 0x9EC7,      0, 0x9ECF,      0,      0,      0, 0xEAA0, /* 0xC0 */
-         0,      0, 0x9ECC, 0x8D5C, 0x92C6, 0x9184, 0x9ECA,      0, /* 0xC0 */
-    0x9EC5,      0,      0, 0x9EC8,      0,      0,      0,      0, /* 0xD0 */
-    0x976C, 0x968A,      0,      0,      0, 0x9ECD, 0x9ED7,      0, /* 0xD0 */
-         0,      0, 0xFAEC,      0,      0,      0,      0, 0x9EDF, /* 0xE0 */
-    0x9ED8,      0,      0, 0x9EE5,      0, 0x9EE3,      0,      0, /* 0xE0 */
-         0,      0, 0x9EDE,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0x9EDD,      0, 0x92CE,      0, 0x9185,      0, 0x9EDB  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x986F, 0x9E96, 	 0, 	 0, 0x9EA4, 0x88D6, 	 0, 	 0, /* 0x00 */
+    0x9E98, 	 0, 	 0, 0x96B8, 0x9E9D, 0x9041, 0x92C5, 0x9E93, /* 0x00 */
+         0, 	 0, 0x9EA3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x909A, 0x9EAD, 0x8A91, 0x8C9F, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x9EAF, 0x9E9A, 0x9EAE, 	 0, 0x9EA7, 0x9E9B, 	 0, /* 0x20 */
+    0x9EAB, 	 0, 0x9EAC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x9EBD, 	 0, 	 0, 	 0, 0x93CC, 	 0, 0x9EA2, 	 0, /* 0x30 */
+         0, 0x9EB9, 	 0, 	 0, 	 0, 0x9EBB, 	 0, 0x92D6, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x976B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x9596, 0x9EB6, 0x91C8, 	 0, 	 0, /* 0x50 */
+         0, 0x9EBC, 0x915E, 	 0, 0x9EB3, 0x9EC0, 0x9EBF, 	 0, /* 0x50 */
+    0x93ED, 0x9EBE, 0x93E8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xFAE9, 	 0, 0x9EC2, 0x9EB5, 	 0, 0x8BC6, 0x9EB8, 0x8F7C, /* 0x60 */
+         0, 	 0, 	 0, 0x9480, 0x9EBA, 0x8BC9, 	 0, 0x9EB2, /* 0x70 */
+    0x9EB4, 0x9EB1, 	 0, 	 0, 0x984F, 0x8A79, 0x9EB7, 	 0, /* 0x70 */
+         0, 0x9EC1, 0x8A54, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x8DE5, 	 0, 	 0, 	 0, 0x897C, 	 0, /* 0x80 */
+         0, 0x9ED2, 	 0, 	 0, 0x9850, 0x9ED5, 	 0, 	 0, /* 0x90 */
+    0xFAEB, 	 0, 	 0, 0x9059, 0x9ED4, 	 0, 	 0, 	 0, /* 0x90 */
+    0x9ED3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9ED0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9EC4, 	 0, /* 0xA0 */
+         0, 0x9EE1, 0x9EC3, 	 0, 0x9ED6, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x9ECE, 	 0, 	 0, 0x9EC9, 0x9EC6, /* 0xB0 */
+         0, 0x9EC7, 	 0, 0x9ECF, 	 0, 	 0, 	 0, 0xEAA0, /* 0xC0 */
+         0, 	 0, 0x9ECC, 0x8D5C, 0x92C6, 0x9184, 0x9ECA, 	 0, /* 0xC0 */
+    0x9EC5, 	 0, 	 0, 0x9EC8, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x976C, 0x968A, 	 0, 	 0, 	 0, 0x9ECD, 0x9ED7, 	 0, /* 0xD0 */
+         0, 	 0, 0xFAEC, 	 0, 	 0, 	 0, 	 0, 0x9EDF, /* 0xE0 */
+    0x9ED8, 	 0, 	 0, 0x9EE5, 	 0, 0x9EE3, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x9EDE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0x9EDD, 	 0, 0x92CE, 	 0, 0x9185, 	 0, 0x9EDB	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_6A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x9ED9,      0,      0, 0x9EE0,      0,      0, /* 0x00 */
-         0,      0, 0x9EE6, 0x94F3, 0x9EEC,      0,      0,      0, /* 0x00 */
-         0,      0, 0x9EE7, 0x9EEA, 0x9EE4,      0,      0, 0x9294, /* 0x10 */
-         0, 0x9557,      0, 0x9EDA,      0,      0, 0x9EE2, 0x8FBE, /* 0x10 */
-         0, 0x96CD, 0x9EF6, 0x9EE9,      0,      0,      0,      0, /* 0x20 */
-         0, 0x8CA0, 0x89A1, 0x8A7E,      0,      0, 0x9ED1,      0, /* 0x20 */
-    0xFAED,      0,      0,      0,      0, 0x8FBF, 0x9EEE,      0, /* 0x30 */
-    0x9EF5, 0x8EF7, 0x8A92,      0,      0, 0x924D,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0x9EEB,      0, 0xFAEF, 0x9EF0, /* 0x40 */
-    0x9EF4,      0,      0, 0x8BB4,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0x8B6B, 0x9EF2,      0,      0,      0,      0,      0, 0x8B40, /* 0x50 */
-         0, 0x93C9, 0x9EF1,      0,      0,      0, 0x9EF3,      0, /* 0x60 */
-         0,      0,      0, 0xFAEE,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0x9EED, 0xFAF0,      0,      0,      0,      0, /* 0x70 */
-    0x9EEF,      0,      0,      0,      0,      0, 0xFAF1, 0x8A80, /* 0x70 */
-    0x9268,      0,      0,      0, 0x9EFA,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x9EF8, 0x8CE7,      0, /* 0x80 */
-    0x9EF7,      0,      0,      0,      0,      0,      0, 0x9F40, /* 0x90 */
-         0,      0,      0,      0, 0x9E77,      0,      0,      0, /* 0x90 */
-    0x9EF9,      0, 0x9EFB, 0x9EFC,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x9F4B,      0, 0x9F47,      0, 0x9E8D,      0, /* 0xA0 */
-         0,      0,      0, 0x9F46,      0,      0,      0,      0, /* 0xB0 */
-    0x9F45,      0,      0, 0x9F42,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x9EE8, 0x9F44, 0x9F43,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x9F49,      0, 0x9845,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x9F4C, 0x8BF9,      0,      0, 0x9F48, 0x9F4A, /* 0xD0 */
-         0,      0, 0xFAF2,      0, 0xFAF3,      0,      0,      0, /* 0xE0 */
-    0x94A5,      0, 0x9F4D,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x9F51, 0x9F4E                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x9ED9, 	 0, 	 0, 0x9EE0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x9EE6, 0x94F3, 0x9EEC, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x9EE7, 0x9EEA, 0x9EE4, 	 0, 	 0, 0x9294, /* 0x10 */
+         0, 0x9557, 	 0, 0x9EDA, 	 0, 	 0, 0x9EE2, 0x8FBE, /* 0x10 */
+         0, 0x96CD, 0x9EF6, 0x9EE9, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x8CA0, 0x89A1, 0x8A7E, 	 0, 	 0, 0x9ED1, 	 0, /* 0x20 */
+    0xFAED, 	 0, 	 0, 	 0, 	 0, 0x8FBF, 0x9EEE, 	 0, /* 0x30 */
+    0x9EF5, 0x8EF7, 0x8A92, 	 0, 	 0, 0x924D, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x9EEB, 	 0, 0xFAEF, 0x9EF0, /* 0x40 */
+    0x9EF4, 	 0, 	 0, 0x8BB4, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x8B6B, 0x9EF2, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8B40, /* 0x50 */
+         0, 0x93C9, 0x9EF1, 	 0, 	 0, 	 0, 0x9EF3, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xFAEE, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x9EED, 0xFAF0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x9EEF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFAF1, 0x8A80, /* 0x70 */
+    0x9268, 	 0, 	 0, 	 0, 0x9EFA, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9EF8, 0x8CE7, 	 0, /* 0x80 */
+    0x9EF7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9F40, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x9E77, 	 0, 	 0, 	 0, /* 0x90 */
+    0x9EF9, 	 0, 0x9EFB, 0x9EFC, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x9F4B, 	 0, 0x9F47, 	 0, 0x9E8D, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x9F46, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x9F45, 	 0, 	 0, 0x9F42, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x9EE8, 0x9F44, 0x9F43, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x9F49, 	 0, 0x9845, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x9F4C, 0x8BF9, 	 0, 	 0, 0x9F48, 0x9F4A, /* 0xD0 */
+         0, 	 0, 0xFAF2, 	 0, 0xFAF3, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x94A5, 	 0, 0x9F4D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x9F51, 0x9F4E									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_6B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0x9793, 0x9F4F,      0,      0, /* 0x00 */
-         0,      0, 0x9EDC,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0x9F52,      0,      0,      0, 0x9F53,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0x8954,      0, 0x9F55, /* 0x10 */
-    0x8C87, 0x8E9F,      0, 0x8BD3,      0,      0,      0, 0x89A2, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x977E,      0,      0,      0,      0, 0x9F57, /* 0x30 */
-    0x9F56, 0x9F59, 0x8B5C,      0,      0, 0x8BD4, 0x8ABC,      0, /* 0x30 */
-         0,      0,      0, 0x9F5C,      0,      0,      0, 0x9F5B, /* 0x40 */
-         0, 0x9F5D,      0,      0, 0x89CC,      0, 0x9256,      0, /* 0x40 */
-    0x9F5E,      0,      0, 0x8ABD, 0x9F60,      0,      0,      0, /* 0x50 */
-         0, 0x9F5F,      0, 0x9F61,      0,      0,      0, 0x9F62, /* 0x50 */
-         0, 0x9F63, 0x8E7E, 0x90B3, 0x8D9F,      0, 0x9590,      0, /* 0x60 */
-         0, 0x95E0, 0x9863,      0,      0,      0,      0, 0x8E95, /* 0x60 */
-         0,      0,      0, 0x8DCE, 0x97F0,      0,      0,      0, /* 0x70 */
-    0x9F64, 0x9F65,      0, 0x8E80,      0,      0,      0, 0x9F66, /* 0x70 */
-    0x9F67,      0,      0, 0x9F69, 0x9F68,      0, 0x9677,      0, /* 0x80 */
-         0, 0x8F7D, 0x8EEA, 0x8E63,      0, 0x9F6A,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x9F6C, 0x9042,      0, /* 0x90 */
-    0x9F6B,      0,      0,      0,      0,      0, 0x9F6D,      0, /* 0x90 */
-         0,      0,      0,      0, 0x9F6E,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x9F6F, 0x9F70,      0,      0,      0, 0x9F71, /* 0xA0 */
-         0, 0x9F73, 0x9F72, 0x9F74, 0x89A3, 0x9269,      0, 0x9F75, /* 0xB0 */
-         0,      0, 0x8E45, 0x8A6B, 0x9F76,      0,      0, 0x9361, /* 0xB0 */
-    0x9ACA,      0,      0,      0,      0, 0x8B42, 0x9F77,      0, /* 0xC0 */
-         0,      0,      0, 0x9F78,      0, 0x95EA, 0x9688,      0, /* 0xC0 */
-         0,      0, 0x93C5, 0x9F79, 0x94E4,      0, 0xFAF4,      0, /* 0xD0 */
-    0x94F9,      0,      0, 0x96D1,      0,      0,      0, 0x9F7A, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x9F7C, 0x9F7B,      0,      0, 0x9F7E, /* 0xE0 */
-         0,      0,      0, 0x9F7D                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0x9793, 0x9F4F, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x9EDC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x9F52, 	 0, 	 0, 	 0, 0x9F53, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x8954, 	 0, 0x9F55, /* 0x10 */
+    0x8C87, 0x8E9F, 	 0, 0x8BD3, 	 0, 	 0, 	 0, 0x89A2, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x977E, 	 0, 	 0, 	 0, 	 0, 0x9F57, /* 0x30 */
+    0x9F56, 0x9F59, 0x8B5C, 	 0, 	 0, 0x8BD4, 0x8ABC, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x9F5C, 	 0, 	 0, 	 0, 0x9F5B, /* 0x40 */
+         0, 0x9F5D, 	 0, 	 0, 0x89CC, 	 0, 0x9256, 	 0, /* 0x40 */
+    0x9F5E, 	 0, 	 0, 0x8ABD, 0x9F60, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x9F5F, 	 0, 0x9F61, 	 0, 	 0, 	 0, 0x9F62, /* 0x50 */
+         0, 0x9F63, 0x8E7E, 0x90B3, 0x8D9F, 	 0, 0x9590, 	 0, /* 0x60 */
+         0, 0x95E0, 0x9863, 	 0, 	 0, 	 0, 	 0, 0x8E95, /* 0x60 */
+         0, 	 0, 	 0, 0x8DCE, 0x97F0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x9F64, 0x9F65, 	 0, 0x8E80, 	 0, 	 0, 	 0, 0x9F66, /* 0x70 */
+    0x9F67, 	 0, 	 0, 0x9F69, 0x9F68, 	 0, 0x9677, 	 0, /* 0x80 */
+         0, 0x8F7D, 0x8EEA, 0x8E63, 	 0, 0x9F6A, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9F6C, 0x9042, 	 0, /* 0x90 */
+    0x9F6B, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9F6D, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x9F6E, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x9F6F, 0x9F70, 	 0, 	 0, 	 0, 0x9F71, /* 0xA0 */
+         0, 0x9F73, 0x9F72, 0x9F74, 0x89A3, 0x9269, 	 0, 0x9F75, /* 0xB0 */
+         0, 	 0, 0x8E45, 0x8A6B, 0x9F76, 	 0, 	 0, 0x9361, /* 0xB0 */
+    0x9ACA, 	 0, 	 0, 	 0, 	 0, 0x8B42, 0x9F77, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x9F78, 	 0, 0x95EA, 0x9688, 	 0, /* 0xC0 */
+         0, 	 0, 0x93C5, 0x9F79, 0x94E4, 	 0, 0xFAF4, 	 0, /* 0xD0 */
+    0x94F9, 	 0, 	 0, 0x96D1, 	 0, 	 0, 	 0, 0x9F7A, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x9F7C, 0x9F7B, 	 0, 	 0, 0x9F7E, /* 0xE0 */
+         0, 	 0, 	 0, 0x9F7D									/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -1866,39 +1866,39 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_6B[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_6C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-    0x9F81,      0,      0,      0,      0,      0,      0, 0x8E81, /* 0x00 */
-         0, 0x96AF,      0, 0x9F82, 0x9F83,      0,      0, 0x8B43, /* 0x10 */
-         0,      0,      0, 0x9F84,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0x9F86, 0x9F85,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0x9085,      0,      0, 0x9558, /* 0x30 */
-    0x8969,      0,      0,      0,      0,      0, 0x94C3, 0xFAF5, /* 0x30 */
-    0x92F3, 0x8F60, 0x8B81,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0x94C4,      0, /* 0x40 */
-    0x8EAC,      0,      0,      0,      0, 0x9F88,      0, 0x8ABE, /* 0x50 */
-         0,      0, 0x8998,      0, 0xFAF6, 0x93F0, 0x9F87, 0x8D5D, /* 0x50 */
-    0x9272,      0, 0x9F89,      0,      0,      0,      0,      0, /* 0x60 */
-    0x9F91,      0, 0x9F8A,      0,      0,      0,      0, 0xFAF8, /* 0x60 */
-    0x91BF,      0, 0x8B82, 0x9F92,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x8C88,      0,      0, 0x8B44, 0x9F90,      0, /* 0x70 */
-         0, 0x9F8E, 0x9F8B, 0x9780,      0,      0, 0xFAF7,      0, /* 0x80 */
-    0x92BE,      0,      0,      0, 0x93D7, 0x9F8C,      0,      0, /* 0x80 */
-    0x9F94,      0, 0x9F93, 0x8C42,      0,      0, 0x89AB,      0, /* 0x90 */
-         0, 0x8DB9, 0x9F8D, 0x9F8F,      0,      0,      0,      0, /* 0x90 */
-         0, 0x9676, 0x91F2,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x9697,      0,      0, 0x9F9C,      0, /* 0xA0 */
-         0, 0x9F9D,      0, 0x89CD,      0,      0,      0,      0, /* 0xB0 */
+    0x9F81, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8E81, /* 0x00 */
+         0, 0x96AF, 	 0, 0x9F82, 0x9F83, 	 0, 	 0, 0x8B43, /* 0x10 */
+         0, 	 0, 	 0, 0x9F84, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x9F86, 0x9F85, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x9085, 	 0, 	 0, 0x9558, /* 0x30 */
+    0x8969, 	 0, 	 0, 	 0, 	 0, 	 0, 0x94C3, 0xFAF5, /* 0x30 */
+    0x92F3, 0x8F60, 0x8B81, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x94C4, 	 0, /* 0x40 */
+    0x8EAC, 	 0, 	 0, 	 0, 	 0, 0x9F88, 	 0, 0x8ABE, /* 0x50 */
+         0, 	 0, 0x8998, 	 0, 0xFAF6, 0x93F0, 0x9F87, 0x8D5D, /* 0x50 */
+    0x9272, 	 0, 0x9F89, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x9F91, 	 0, 0x9F8A, 	 0, 	 0, 	 0, 	 0, 0xFAF8, /* 0x60 */
+    0x91BF, 	 0, 0x8B82, 0x9F92, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x8C88, 	 0, 	 0, 0x8B44, 0x9F90, 	 0, /* 0x70 */
+         0, 0x9F8E, 0x9F8B, 0x9780, 	 0, 	 0, 0xFAF7, 	 0, /* 0x80 */
+    0x92BE, 	 0, 	 0, 	 0, 0x93D7, 0x9F8C, 	 0, 	 0, /* 0x80 */
+    0x9F94, 	 0, 0x9F93, 0x8C42, 	 0, 	 0, 0x89AB, 	 0, /* 0x90 */
+         0, 0x8DB9, 0x9F8D, 0x9F8F, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x9676, 0x91F2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x9697, 	 0, 	 0, 0x9F9C, 	 0, /* 0xA0 */
+         0, 0x9F9D, 	 0, 0x89CD, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
     0x95A6, 0x96FB, 0x9F9F, 0x8EA1, 0x8FC0, 0x9F98, 0x9F9E, 0x8988, /* 0xB0 */
-         0, 0x8BB5,      0,      0, 0x9F95, 0x9F9A,      0,      0, /* 0xC0 */
-         0, 0x90F2, 0x9491,      0, 0x94E5,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0x9F97,      0, 0x9640,      0, 0x9F99, /* 0xD0 */
-         0, 0x9FA2, 0xFAF9, 0x9FA0,      0, 0x9F9B,      0,      0, /* 0xD0 */
-         0, 0x9641, 0x9467, 0x8B83,      0, 0x9344,      0,      0, /* 0xE0 */
-    0x928D,      0, 0x9FA3,      0,      0,      0,      0, 0x9FA1, /* 0xE0 */
-    0x91D7, 0x9F96,      0, 0x896A                                  /* 0xF0 */
+         0, 0x8BB5, 	 0, 	 0, 0x9F95, 0x9F9A, 	 0, 	 0, /* 0xC0 */
+         0, 0x90F2, 0x9491, 	 0, 0x94E5, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x9F97, 	 0, 0x9640, 	 0, 0x9F99, /* 0xD0 */
+         0, 0x9FA2, 0xFAF9, 0x9FA0, 	 0, 0x9F9B, 	 0, 	 0, /* 0xD0 */
+         0, 0x9641, 0x9467, 0x8B83, 	 0, 0x9344, 	 0, 	 0, /* 0xE0 */
+    0x928D, 	 0, 0x9FA3, 	 0, 	 0, 	 0, 	 0, 0x9FA1, /* 0xE0 */
+    0x91D7, 0x9F96, 	 0, 0x896A									/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -1906,599 +1906,599 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_6C[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_6D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xFAFA,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0x976D, 0x9FAE,      0,      0,      0, /* 0x00 */
-         0,      0, 0x9FAD,      0,      0,      0,      0, 0x90F4, /* 0x10 */
-         0, 0x9FAA,      0, 0x978C,      0,      0, 0x93B4, 0x9FA4, /* 0x10 */
-         0,      0,      0,      0,      0, 0x92C3,      0,      0, /* 0x20 */
-         0, 0x896B, 0x8D5E, 0x9FA7,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x8F46, 0x9FAC,      0, 0x9FAB, 0x9FA6,      0, /* 0x30 */
-    0x9FA9,      0,      0, 0x8A88,      0, 0x9FA8, 0x9468,      0, /* 0x30 */
-         0, 0x97AC,      0,      0, 0x8FF2, 0x90F3,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0x9FB4, 0x9FB2,      0, 0x956C,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0x9FAF, 0x9FB1,      0, 0x8959,      0, /* 0x60 */
-         0, 0x8D5F, 0x9851,      0, 0x8A5C,      0, 0x9582, 0xFAFC, /* 0x60 */
-         0,      0,      0,      0, 0x9781,      0,      0, 0x8A43, /* 0x70 */
-    0x905A, 0x9FB3,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0x9FB8,      0, 0xFAFB, /* 0x80 */
-    0x8FC1,      0,      0,      0, 0x974F,      0, 0x9FB5,      0, /* 0x80 */
-         0,      0,      0, 0x9FB0,      0, 0x9FB6, 0xFB40,      0, /* 0x90 */
-         0, 0x97DC,      0, 0x9393, 0x93C0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xFB41,      0,      0, 0x8A55, /* 0xA0 */
-         0,      0, 0x8974,      0,      0, 0x9FBC,      0,      0, /* 0xB0 */
-    0x9FBF,      0,      0,      0, 0x97C1,      0,      0,      0, /* 0xB0 */
-    0x9784,      0,      0,      0,      0, 0x9FC6, 0x9FC0, 0x9FBD, /* 0xC0 */
-         0,      0,      0, 0x97D2, 0x9FC3,      0,      0, 0xFB42, /* 0xC0 */
-         0, 0x8F69, 0x9FC5,      0,      0, 0x9FCA,      0,      0, /* 0xD0 */
-    0x9391, 0x9FC8,      0,      0,      0,      0, 0x9FC2,      0, /* 0xD0 */
-         0, 0x9257,      0,      0, 0x9FC9,      0, 0x9FBE,      0, /* 0xE0 */
-    0x9FC4,      0, 0x9FCB, 0x88FA, 0x9FC1,      0, 0x9FCC,      0, /* 0xE0 */
-         0, 0x905B, 0xFB44, 0x8F7E,      0, 0x95A3,      0, 0x8DAC, /* 0xF0 */
-    0xFB43, 0x9FB9, 0x9FC7, 0x9359, 0xFB45                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xFAFA, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x976D, 0x9FAE, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x9FAD, 	 0, 	 0, 	 0, 	 0, 0x90F4, /* 0x10 */
+         0, 0x9FAA, 	 0, 0x978C, 	 0, 	 0, 0x93B4, 0x9FA4, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x92C3, 	 0, 	 0, /* 0x20 */
+         0, 0x896B, 0x8D5E, 0x9FA7, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x8F46, 0x9FAC, 	 0, 0x9FAB, 0x9FA6, 	 0, /* 0x30 */
+    0x9FA9, 	 0, 	 0, 0x8A88, 	 0, 0x9FA8, 0x9468, 	 0, /* 0x30 */
+         0, 0x97AC, 	 0, 	 0, 0x8FF2, 0x90F3, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x9FB4, 0x9FB2, 	 0, 0x956C, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x9FAF, 0x9FB1, 	 0, 0x8959, 	 0, /* 0x60 */
+         0, 0x8D5F, 0x9851, 	 0, 0x8A5C, 	 0, 0x9582, 0xFAFC, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x9781, 	 0, 	 0, 0x8A43, /* 0x70 */
+    0x905A, 0x9FB3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9FB8, 	 0, 0xFAFB, /* 0x80 */
+    0x8FC1, 	 0, 	 0, 	 0, 0x974F, 	 0, 0x9FB5, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x9FB0, 	 0, 0x9FB6, 0xFB40, 	 0, /* 0x90 */
+         0, 0x97DC, 	 0, 0x9393, 0x93C0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xFB41, 	 0, 	 0, 0x8A55, /* 0xA0 */
+         0, 	 0, 0x8974, 	 0, 	 0, 0x9FBC, 	 0, 	 0, /* 0xB0 */
+    0x9FBF, 	 0, 	 0, 	 0, 0x97C1, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x9784, 	 0, 	 0, 	 0, 	 0, 0x9FC6, 0x9FC0, 0x9FBD, /* 0xC0 */
+         0, 	 0, 	 0, 0x97D2, 0x9FC3, 	 0, 	 0, 0xFB42, /* 0xC0 */
+         0, 0x8F69, 0x9FC5, 	 0, 	 0, 0x9FCA, 	 0, 	 0, /* 0xD0 */
+    0x9391, 0x9FC8, 	 0, 	 0, 	 0, 	 0, 0x9FC2, 	 0, /* 0xD0 */
+         0, 0x9257, 	 0, 	 0, 0x9FC9, 	 0, 0x9FBE, 	 0, /* 0xE0 */
+    0x9FC4, 	 0, 0x9FCB, 0x88FA, 0x9FC1, 	 0, 0x9FCC, 	 0, /* 0xE0 */
+         0, 0x905B, 0xFB44, 0x8F7E, 	 0, 0x95A3, 	 0, 0x8DAC, /* 0xF0 */
+    0xFB43, 0x9FB9, 0x9FC7, 0x9359, 0xFB45							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_6E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0x90B4,      0, 0x8A89, /* 0x00 */
-    0x8DCF, 0x8FC2, 0x9FBB, 0x8F61,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0x8C6B,      0, 0x9FBA,      0,      0, /* 0x10 */
-         0, 0x9FD0, 0x8F8D, 0x8CB8,      0, 0x9FDF,      0, 0x9FD9, /* 0x10 */
-    0x8B94, 0x936E,      0, 0x9FD4, 0x9FDD, 0x88AD, 0x8951, 0xFB48, /* 0x20 */
-         0, 0x89B7,      0, 0x9FD6, 0x91AA, 0x9FCD, 0x9FCF, 0x8D60, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0x9FE0, 0xFB46, 0x9FDB,      0, 0xFB49,      0, 0x9FD3,      0, /* 0x30 */
-         0,      0,      0, 0x9FDA,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x96A9,      0,      0, 0x9FD8, 0x9FDC,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0x8CCE,      0, /* 0x50 */
-    0x8FC3,      0,      0, 0x9258, 0xFB47,      0,      0, 0x9FD2, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0x974E, /* 0x60 */
-         0,      0,      0, 0x9FD5,      0,      0, 0x9FCE, 0x9392, /* 0x60 */
-         0,      0, 0x9FD1,      0,      0,      0, 0x9FD7,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x9870, 0x8EBC, /* 0x70 */
-    0x969E,      0, 0x9FE1,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0x94AC,      0,      0, 0x9FED, /* 0x80 */
-    0x8CB9,      0,      0,      0,      0,      0, 0x8F80,      0, /* 0x90 */
-    0x9FE3,      0,      0,      0, 0x97AD, 0x8D61,      0, 0x9FF0, /* 0x90 */
-         0,      0, 0x88EC,      0,      0, 0x9FEE,      0,      0, /* 0xA0 */
-         0,      0, 0x9FE2,      0,      0,      0,      0, 0x9FE8, /* 0xA0 */
-         0,      0, 0x9FEA,      0,      0,      0, 0x976E, 0x9FE5, /* 0xB0 */
-         0,      0, 0x934D,      0,      0, 0x9FE7,      0, 0xFB4A, /* 0xB0 */
-         0,      0, 0x9FEF,      0, 0x9FE9, 0x96C5,      0,      0, /* 0xC0 */
-         0, 0x9FE4,      0, 0x8EA0, 0x9FFC,      0,      0,      0, /* 0xC0 */
-         0, 0x8A8A,      0, 0x9FE6, 0x9FEB, 0x9FEC,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x91EA, 0x91D8,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0x9FF4,      0,      0, 0x9FFA, /* 0xE0 */
-         0,      0, 0x9FF8,      0, 0x9348,      0,      0, 0xE042, /* 0xF0 */
-    0x9FF5,      0,      0,      0,      0,      0, 0x9FF6, 0x9FDE  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0x90B4, 	 0, 0x8A89, /* 0x00 */
+    0x8DCF, 0x8FC2, 0x9FBB, 0x8F61, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x8C6B, 	 0, 0x9FBA, 	 0, 	 0, /* 0x10 */
+         0, 0x9FD0, 0x8F8D, 0x8CB8, 	 0, 0x9FDF, 	 0, 0x9FD9, /* 0x10 */
+    0x8B94, 0x936E, 	 0, 0x9FD4, 0x9FDD, 0x88AD, 0x8951, 0xFB48, /* 0x20 */
+         0, 0x89B7, 	 0, 0x9FD6, 0x91AA, 0x9FCD, 0x9FCF, 0x8D60, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x9FE0, 0xFB46, 0x9FDB, 	 0, 0xFB49, 	 0, 0x9FD3, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x9FDA, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x96A9, 	 0, 	 0, 0x9FD8, 0x9FDC, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8CCE, 	 0, /* 0x50 */
+    0x8FC3, 	 0, 	 0, 0x9258, 0xFB47, 	 0, 	 0, 0x9FD2, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x974E, /* 0x60 */
+         0, 	 0, 	 0, 0x9FD5, 	 0, 	 0, 0x9FCE, 0x9392, /* 0x60 */
+         0, 	 0, 0x9FD1, 	 0, 	 0, 	 0, 0x9FD7, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9870, 0x8EBC, /* 0x70 */
+    0x969E, 	 0, 0x9FE1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x94AC, 	 0, 	 0, 0x9FED, /* 0x80 */
+    0x8CB9, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8F80, 	 0, /* 0x90 */
+    0x9FE3, 	 0, 	 0, 	 0, 0x97AD, 0x8D61, 	 0, 0x9FF0, /* 0x90 */
+         0, 	 0, 0x88EC, 	 0, 	 0, 0x9FEE, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x9FE2, 	 0, 	 0, 	 0, 	 0, 0x9FE8, /* 0xA0 */
+         0, 	 0, 0x9FEA, 	 0, 	 0, 	 0, 0x976E, 0x9FE5, /* 0xB0 */
+         0, 	 0, 0x934D, 	 0, 	 0, 0x9FE7, 	 0, 0xFB4A, /* 0xB0 */
+         0, 	 0, 0x9FEF, 	 0, 0x9FE9, 0x96C5, 	 0, 	 0, /* 0xC0 */
+         0, 0x9FE4, 	 0, 0x8EA0, 0x9FFC, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x8A8A, 	 0, 0x9FE6, 0x9FEB, 0x9FEC, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x91EA, 0x91D8, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x9FF4, 	 0, 	 0, 0x9FFA, /* 0xE0 */
+         0, 	 0, 0x9FF8, 	 0, 0x9348, 	 0, 	 0, 0xE042, /* 0xF0 */
+    0x9FF5, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9FF6, 0x9FDE	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_6F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x8B99, 0x9559,      0,      0,      0, 0x8EBD,      0, /* 0x00 */
-         0, 0x8D97,      0,      0,      0,      0,      0, 0x9852, /* 0x00 */
-         0, 0x9FF2,      0, 0xE041, 0x8989, 0x9186,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0x9499,      0, 0x8ABF, 0x97F8,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0x969F, 0x92D0,      0,      0,      0, /* 0x20 */
-         0, 0x9FF9, 0x9FFB,      0,      0,      0,      0,      0, /* 0x30 */
-    0x9151,      0,      0,      0,      0,      0, 0xE040, 0x9FF7, /* 0x30 */
-         0, 0x9FF1,      0,      0,      0, 0x8AC1,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0x8C89,      0,      0,      0, /* 0x50 */
-    0xE04E,      0,      0, 0xE049, 0x90F6,      0,      0, 0x8A83, /* 0x50 */
-         0,      0,      0,      0, 0x8F81,      0, 0xE052,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xE04B, 0x92AA, 0xE048, /* 0x60 */
-    0x92D7,      0,      0,      0, 0xE06B,      0,      0,      0, /* 0x70 */
-    0xE045,      0, 0xE044,      0, 0xE04D,      0,      0,      0, /* 0x70 */
-    0xE047, 0xE046, 0xE04C,      0, 0x909F,      0, 0xE043,      0, /* 0x80 */
-    0xFB4B,      0,      0,      0,      0,      0, 0xE04F,      0, /* 0x80 */
-         0, 0xE050,      0,      0,      0,      0,      0, 0x8AC0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xE055,      0, 0xE054, 0xE056,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xE059,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0x9362,      0, 0xE053,      0, 0xFB4C,      0,      0, /* 0xB0 */
-         0, 0xE057,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x8C83, 0x91F7, 0xE051, 0x945A,      0,      0, 0xE058,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xE05D, 0xE05B,      0,      0, /* 0xD0 */
-    0xE05E,      0,      0, 0xE061,      0,      0,      0, 0xE05A, /* 0xD0 */
-    0x8D8A, 0x9447,      0,      0, 0x9FB7,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x9794, 0xE05C,      0, 0xE060, 0x91F3, /* 0xE0 */
-         0, 0xE05F,      0, 0xE04A,      0, 0xFB4D, 0xE889,      0, /* 0xF0 */
-         0,      0, 0xE064,      0,      0,      0, 0xE068          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x8B99, 0x9559, 	 0, 	 0, 	 0, 0x8EBD, 	 0, /* 0x00 */
+         0, 0x8D97, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9852, /* 0x00 */
+         0, 0x9FF2, 	 0, 0xE041, 0x8989, 0x9186, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x9499, 	 0, 0x8ABF, 0x97F8, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x969F, 0x92D0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x9FF9, 0x9FFB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x9151, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE040, 0x9FF7, /* 0x30 */
+         0, 0x9FF1, 	 0, 	 0, 	 0, 0x8AC1, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x8C89, 	 0, 	 0, 	 0, /* 0x50 */
+    0xE04E, 	 0, 	 0, 0xE049, 0x90F6, 	 0, 	 0, 0x8A83, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x8F81, 	 0, 0xE052, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE04B, 0x92AA, 0xE048, /* 0x60 */
+    0x92D7, 	 0, 	 0, 	 0, 0xE06B, 	 0, 	 0, 	 0, /* 0x70 */
+    0xE045, 	 0, 0xE044, 	 0, 0xE04D, 	 0, 	 0, 	 0, /* 0x70 */
+    0xE047, 0xE046, 0xE04C, 	 0, 0x909F, 	 0, 0xE043, 	 0, /* 0x80 */
+    0xFB4B, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE04F, 	 0, /* 0x80 */
+         0, 0xE050, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8AC0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xE055, 	 0, 0xE054, 0xE056, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xE059, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x9362, 	 0, 0xE053, 	 0, 0xFB4C, 	 0, 	 0, /* 0xB0 */
+         0, 0xE057, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x8C83, 0x91F7, 0xE051, 0x945A, 	 0, 	 0, 0xE058, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xE05D, 0xE05B, 	 0, 	 0, /* 0xD0 */
+    0xE05E, 	 0, 	 0, 0xE061, 	 0, 	 0, 	 0, 0xE05A, /* 0xD0 */
+    0x8D8A, 0x9447, 	 0, 	 0, 0x9FB7, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x9794, 0xE05C, 	 0, 0xE060, 0x91F3, /* 0xE0 */
+         0, 0xE05F, 	 0, 0xE04A, 	 0, 0xFB4D, 0xE889, 	 0, /* 0xF0 */
+         0, 	 0, 0xE064, 	 0, 	 0, 	 0, 0xE068			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_70[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE066,      0,      0,      0, 0xFB4E,      0, 0xFB4F, /* 0x00 */
-         0, 0xE062,      0, 0xE063,      0,      0,      0, 0xE067, /* 0x00 */
-         0, 0xE065,      0,      0,      0, 0x956D,      0,      0, /* 0x10 */
-    0xE06D,      0, 0xE06A, 0xE069,      0, 0xE06C, 0x93D2, 0xE06E, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x9295, 0x91EB, /* 0x20 */
-    0xFB50,      0,      0,      0, 0x90A3,      0,      0,      0, /* 0x20 */
-    0xE06F,      0, 0xE071,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xE070,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0x9FF3,      0,      0,      0, /* 0x40 */
-         0, 0xE072,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0x93E5,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xE073,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0x89CE,      0,      0,      0, 0x9394, /* 0x60 */
-    0x8A44,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0x8B84,      0,      0,      0, 0x8EDC, 0x8DD0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xFB51,      0,      0, /* 0x80 */
-         0, 0x9846, 0x9086,      0,      0,      0, 0x898A,      0, /* 0x80 */
-         0,      0, 0xE075,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xE074,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xFB52, 0xE078, 0x9259, 0xE07B, 0xE076, /* 0xA0 */
-         0,      0,      0, 0xE07A,      0,      0,      0,      0, /* 0xB0 */
-    0xE079, 0x935F, 0x88D7, 0xFA62,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0x97F3,      0,      0, 0xE07D,      0,      0,      0, 0x8947, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xE080,      0,      0,      0, 0xE07E,      0, 0xE07C, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xE077,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0x9642,      0,      0,      0, 0xE082                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE066, 	 0, 	 0, 	 0, 0xFB4E, 	 0, 0xFB4F, /* 0x00 */
+         0, 0xE062, 	 0, 0xE063, 	 0, 	 0, 	 0, 0xE067, /* 0x00 */
+         0, 0xE065, 	 0, 	 0, 	 0, 0x956D, 	 0, 	 0, /* 0x10 */
+    0xE06D, 	 0, 0xE06A, 0xE069, 	 0, 0xE06C, 0x93D2, 0xE06E, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9295, 0x91EB, /* 0x20 */
+    0xFB50, 	 0, 	 0, 	 0, 0x90A3, 	 0, 	 0, 	 0, /* 0x20 */
+    0xE06F, 	 0, 0xE071, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE070, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x9FF3, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xE072, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x93E5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xE073, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x89CE, 	 0, 	 0, 	 0, 0x9394, /* 0x60 */
+    0x8A44, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x8B84, 	 0, 	 0, 	 0, 0x8EDC, 0x8DD0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xFB51, 	 0, 	 0, /* 0x80 */
+         0, 0x9846, 0x9086, 	 0, 	 0, 	 0, 0x898A, 	 0, /* 0x80 */
+         0, 	 0, 0xE075, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xE074, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xFB52, 0xE078, 0x9259, 0xE07B, 0xE076, /* 0xA0 */
+         0, 	 0, 	 0, 0xE07A, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xE079, 0x935F, 0x88D7, 0xFA62, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x97F3, 	 0, 	 0, 0xE07D, 	 0, 	 0, 	 0, 0x8947, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xE080, 	 0, 	 0, 	 0, 0xE07E, 	 0, 0xE07C, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xE077, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0x9642, 	 0, 	 0, 	 0, 0xE082					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_71[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xFB54,      0,      0,      0, /* 0x00 */
-         0, 0xE081,      0,      0,      0,      0,      0, 0xFB53, /* 0x00 */
-         0,      0,      0,      0, 0x898B,      0,      0,      0, /* 0x10 */
-         0, 0xE084, 0x95B0,      0, 0xE083,      0,      0,      0, /* 0x10 */
-         0, 0x96B3,      0,      0,      0,      0, 0x8FC5,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x9152,      0, /* 0x30 */
-         0,      0,      0,      0, 0x8FC4,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xFB56, 0xFB57, /* 0x40 */
-         0, 0x97F9,      0,      0, 0xE08A,      0, 0x90F7,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xE086, 0xE08B,      0, /* 0x50 */
-         0, 0x898C,      0,      0, 0xFB55,      0,      0,      0, /* 0x50 */
-         0,      0, 0xE089,      0, 0x9481, 0xE085, 0xE088, 0x8FC6, /* 0x60 */
-         0, 0x94CF,      0,      0, 0xE08C,      0, 0x8ECF,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0x90F8,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xE08F,      0,      0,      0, /* 0x80 */
-    0xE087,      0, 0x8C46,      0,      0,      0,      0, 0xE08D, /* 0x80 */
-         0,      0,      0,      0, 0x976F, 0xE090,      0,      0, /* 0x90 */
-         0, 0xEAA4,      0,      0,      0,      0,      0, 0x8F6E, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xE091,      0,      0,      0, 0xE092,      0,      0,      0, /* 0xA0 */
-         0, 0x944D,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE094,      0,      0,      0,      0, 0xE095,      0, /* 0xB0 */
-         0, 0xFB59,      0, 0x9452,      0,      0,      0,      0, /* 0xC0 */
-    0x9395, 0xE097,      0,      0,      0,      0, 0xE099,      0, /* 0xC0 */
-    0x97D3,      0, 0xE096,      0, 0xE098, 0x898D,      0, 0xE093, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0x9A7A, /* 0xD0 */
-    0xE09A,      0,      0,      0,      0, 0x9187, 0x8E57, 0xE09C, /* 0xE0 */
-         0,      0,      0,      0, 0xE09B, 0x9043, 0x99D7,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xE09D,      0,      0, /* 0xF0 */
-         0, 0xE09F,      0, 0xE08E, 0xE09E,      0, 0xFB5A, 0xE0A0  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xFB54, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xE081, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFB53, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x898B, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xE084, 0x95B0, 	 0, 0xE083, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x96B3, 	 0, 	 0, 	 0, 	 0, 0x8FC5, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9152, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x8FC4, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFB56, 0xFB57, /* 0x40 */
+         0, 0x97F9, 	 0, 	 0, 0xE08A, 	 0, 0x90F7, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE086, 0xE08B, 	 0, /* 0x50 */
+         0, 0x898C, 	 0, 	 0, 0xFB55, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xE089, 	 0, 0x9481, 0xE085, 0xE088, 0x8FC6, /* 0x60 */
+         0, 0x94CF, 	 0, 	 0, 0xE08C, 	 0, 0x8ECF, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x90F8, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xE08F, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE087, 	 0, 0x8C46, 	 0, 	 0, 	 0, 	 0, 0xE08D, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x976F, 0xE090, 	 0, 	 0, /* 0x90 */
+         0, 0xEAA4, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8F6E, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xE091, 	 0, 	 0, 	 0, 0xE092, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x944D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE094, 	 0, 	 0, 	 0, 	 0, 0xE095, 	 0, /* 0xB0 */
+         0, 0xFB59, 	 0, 0x9452, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x9395, 0xE097, 	 0, 	 0, 	 0, 	 0, 0xE099, 	 0, /* 0xC0 */
+    0x97D3, 	 0, 0xE096, 	 0, 0xE098, 0x898D, 	 0, 0xE093, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9A7A, /* 0xD0 */
+    0xE09A, 	 0, 	 0, 	 0, 	 0, 0x9187, 0x8E57, 0xE09C, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xE09B, 0x9043, 0x99D7, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE09D, 	 0, 	 0, /* 0xF0 */
+         0, 0xE09F, 	 0, 0xE08E, 0xE09E, 	 0, 0xFB5A, 0xE0A0	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_72[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0x949A,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0xE0A1,      0,      0, /* 0x00 */
-    0xE0A2,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xE0A3,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xE0A4,      0, 0x92DC,      0, 0xE0A6, 0xE0A5,      0,      0, /* 0x20 */
-    0xE0A7,      0, 0xE0A8,      0,      0, 0x8EDD, 0x9583,      0, /* 0x30 */
-         0,      0, 0x96EA, 0xE0A9, 0xE0AA, 0x9175, 0x8EA2, 0xE0AB, /* 0x30 */
-    0xE0AC,      0,      0,      0,      0,      0, 0xE0AD, 0x95D0, /* 0x40 */
-    0x94C5,      0,      0, 0xE0AE, 0x9476,      0,      0,      0, /* 0x40 */
-         0,      0, 0x92AB,      0,      0,      0,      0,      0, /* 0x50 */
-    0xE0AF, 0x89E5,      0, 0x8B8D,      0, 0x96C4,      0, 0x96B4, /* 0x50 */
-         0, 0x89B2, 0x9853,      0,      0,      0,      0, 0x9671, /* 0x60 */
-         0, 0x95A8,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0x90B5,      0, 0xE0B0,      0,      0,      0, /* 0x70 */
-         0, 0x93C1,      0,      0,      0, 0x8CA1, 0xE0B1,      0, /* 0x70 */
-    0x8DD2, 0xE0B3, 0xE0B2,      0,      0,      0,      0, 0xE0B4, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xE0B5,      0,      0,      0, 0xE0B6,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x8B5D,      0, 0xE0B7,      0,      0,      0,      0, 0xE0B8, /* 0xA0 */
-         0,      0,      0,      0, 0x8CA2,      0,      0, 0x94C6, /* 0xA0 */
-         0, 0xFB5B, 0xE0BA,      0,      0,      0, 0x8FF3,      0, /* 0xB0 */
-         0, 0xE0B9,      0,      0,      0,      0, 0xFB5C,      0, /* 0xB0 */
-         0,      0, 0x8BB6, 0xE0BB, 0xE0BD,      0, 0xE0BC,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xE0BE,      0, /* 0xC0 */
-    0x8CCF,      0, 0xE0BF,      0,      0,      0,      0, 0x8BE7, /* 0xD0 */
-         0, 0x915F,      0, 0x8D9D,      0,      0,      0,      0, /* 0xD0 */
-    0xE0C1, 0xE0C2, 0xE0C0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0x8EEB,      0,      0, 0x93C6, 0x8BB7,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE0C4, /* 0xF0 */
-    0x924B, 0xE0C3,      0,      0, 0x9854, 0x9482                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0x949A, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE0A1, 	 0, 	 0, /* 0x00 */
+    0xE0A2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xE0A3, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xE0A4, 	 0, 0x92DC, 	 0, 0xE0A6, 0xE0A5, 	 0, 	 0, /* 0x20 */
+    0xE0A7, 	 0, 0xE0A8, 	 0, 	 0, 0x8EDD, 0x9583, 	 0, /* 0x30 */
+         0, 	 0, 0x96EA, 0xE0A9, 0xE0AA, 0x9175, 0x8EA2, 0xE0AB, /* 0x30 */
+    0xE0AC, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0AD, 0x95D0, /* 0x40 */
+    0x94C5, 	 0, 	 0, 0xE0AE, 0x9476, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x92AB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xE0AF, 0x89E5, 	 0, 0x8B8D, 	 0, 0x96C4, 	 0, 0x96B4, /* 0x50 */
+         0, 0x89B2, 0x9853, 	 0, 	 0, 	 0, 	 0, 0x9671, /* 0x60 */
+         0, 0x95A8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x90B5, 	 0, 0xE0B0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x93C1, 	 0, 	 0, 	 0, 0x8CA1, 0xE0B1, 	 0, /* 0x70 */
+    0x8DD2, 0xE0B3, 0xE0B2, 	 0, 	 0, 	 0, 	 0, 0xE0B4, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE0B5, 	 0, 	 0, 	 0, 0xE0B6, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x8B5D, 	 0, 0xE0B7, 	 0, 	 0, 	 0, 	 0, 0xE0B8, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x8CA2, 	 0, 	 0, 0x94C6, /* 0xA0 */
+         0, 0xFB5B, 0xE0BA, 	 0, 	 0, 	 0, 0x8FF3, 	 0, /* 0xB0 */
+         0, 0xE0B9, 	 0, 	 0, 	 0, 	 0, 0xFB5C, 	 0, /* 0xB0 */
+         0, 	 0, 0x8BB6, 0xE0BB, 0xE0BD, 	 0, 0xE0BC, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0BE, 	 0, /* 0xC0 */
+    0x8CCF, 	 0, 0xE0BF, 	 0, 	 0, 	 0, 	 0, 0x8BE7, /* 0xD0 */
+         0, 0x915F, 	 0, 0x8D9D, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE0C1, 0xE0C2, 0xE0C0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x8EEB, 	 0, 	 0, 0x93C6, 0x8BB7, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0C4, /* 0xF0 */
+    0x924B, 0xE0C3, 	 0, 	 0, 0x9854, 0x9482					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_73[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-                    0xE0C7,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xE0C9, 0xE0C6, /* 0x10 */
-         0,      0,      0, 0x96D2, 0xE0C8, 0xE0CA,      0, 0x97C2, /* 0x10 */
-         0,      0,      0,      0, 0xFB5D, 0xE0CE,      0,      0, /* 0x20 */
-         0, 0xE0CD, 0x9296, 0x944C,      0,      0, 0x8CA3, 0xE0CC, /* 0x20 */
-         0,      0,      0,      0, 0xE0CB,      0, 0x9750, 0x9751, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xE0CF, 0x898E, /* 0x30 */
-         0,      0,      0,      0, 0x8D96, 0x8E82,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xE0D0, 0xE0D1, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xE0D3, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0x8F62,      0,      0,      0,      0, /* 0x60 */
-    0xE0D5,      0, 0xE0D4,      0,      0,      0,      0,      0, /* 0x60 */
-    0xE0D6,      0, 0x8A6C,      0,      0, 0xE0D8,      0, 0xFB5F, /* 0x70 */
-    0xE0D7,      0, 0xE0DA, 0xE0D9,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0x8CBA,      0,      0, 0x97A6, /* 0x80 */
-         0, 0x8BCA,      0, 0x89A4,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x8BE8,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0x8ADF,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x97E6, 0xE0DC,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xE0DE,      0, 0xFB60,      0,      0, /* 0xB0 */
-    0xE0DF,      0, 0x89CF,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xE0DB, 0xFB61, 0x8E58,      0,      0, 0x92BF, 0xE0DD,      0, /* 0xC0 */
-         0,      0, 0xFB64,      0,      0,      0, 0xFB62,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xE0E2,      0, /* 0xD0 */
-    0x8EEC,      0,      0, 0xFB63,      0, 0xE0E0,      0,      0, /* 0xE0 */
-         0,      0, 0x8C5D,      0,      0, 0x94C7, 0xE0E1,      0, /* 0xE0 */
-         0, 0xE0FC,      0,      0,      0, 0xFB66,      0,      0, /* 0xF0 */
-    0xE0E7,      0,      0,      0,      0,      0, 0x8CBB          /* 0xF0 */
+                    0xE0C7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0C9, 0xE0C6, /* 0x10 */
+         0, 	 0, 	 0, 0x96D2, 0xE0C8, 0xE0CA, 	 0, 0x97C2, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xFB5D, 0xE0CE, 	 0, 	 0, /* 0x20 */
+         0, 0xE0CD, 0x9296, 0x944C, 	 0, 	 0, 0x8CA3, 0xE0CC, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xE0CB, 	 0, 0x9750, 0x9751, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0CF, 0x898E, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x8D96, 0x8E82, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0D0, 0xE0D1, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0D3, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x8F62, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xE0D5, 	 0, 0xE0D4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xE0D6, 	 0, 0x8A6C, 	 0, 	 0, 0xE0D8, 	 0, 0xFB5F, /* 0x70 */
+    0xE0D7, 	 0, 0xE0DA, 0xE0D9, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0x8CBA, 	 0, 	 0, 0x97A6, /* 0x80 */
+         0, 0x8BCA, 	 0, 0x89A4, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8BE8, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x8ADF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x97E6, 0xE0DC, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xE0DE, 	 0, 0xFB60, 	 0, 	 0, /* 0xB0 */
+    0xE0DF, 	 0, 0x89CF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xE0DB, 0xFB61, 0x8E58, 	 0, 	 0, 0x92BF, 0xE0DD, 	 0, /* 0xC0 */
+         0, 	 0, 0xFB64, 	 0, 	 0, 	 0, 0xFB62, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0E2, 	 0, /* 0xD0 */
+    0x8EEC, 	 0, 	 0, 0xFB63, 	 0, 0xE0E0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x8C5D, 	 0, 	 0, 0x94C7, 0xE0E1, 	 0, /* 0xE0 */
+         0, 0xE0FC, 	 0, 	 0, 	 0, 0xFB66, 	 0, 	 0, /* 0xF0 */
+    0xE0E7, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8CBB			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_74[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0x8B85,      0, 0xE0E4, 0x979D, 0xFB65, /* 0x00 */
-         0, 0x97AE,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x91F4,      0,      0, 0xE0E6, 0xFB67,      0, /* 0x20 */
-         0, 0xFB69, 0xFB68,      0,      0,      0, 0xFB6A,      0, /* 0x20 */
-         0,      0, 0xE0E8, 0x97D4, 0x8BD5, 0x94FA, 0x9469,      0, /* 0x30 */
-         0,      0, 0xE0E9,      0,      0,      0,      0, 0xE0EB, /* 0x30 */
-         0, 0xE0EE,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xE0EA,      0,      0, /* 0x50 */
-         0, 0xE0ED, 0x8CE8, 0x896C, 0xE0EF,      0, 0x9090, 0xE0EC, /* 0x50 */
-    0x97DA,      0, 0xFB6B, 0xE0F2, 0xEAA2,      0,      0,      0, /* 0x60 */
-         0, 0xE0F0, 0xE0F3,      0,      0,      0,      0, 0xE0E5, /* 0x60 */
-    0xE0F1,      0,      0, 0x8DBA,      0,      0, 0xE0F4,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xE0F5,      0, /* 0x70 */
-         0,      0,      0, 0x979E,      0,      0,      0,      0, /* 0x80 */
-         0, 0xFB6C,      0, 0xE0F6,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0xE0F7, 0xFB6D, /* 0x90 */
-         0,      0, 0xE0E3,      0,      0,      0,      0, 0xE0F8, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x8AC2,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x8EA3,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xE0F9,      0,      0,      0,      0, 0xE0FA, /* 0xC0 */
-         0,      0,      0,      0, 0xE0FB,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x895A,      0,      0,      0, /* 0xD0 */
-    0xE140,      0, 0x955A, 0xE141,      0,      0, 0x8AA2, 0xE142, /* 0xE0 */
-         0, 0xE143,      0,      0,      0,      0, 0xE144,      0, /* 0xE0 */
-    0xE146, 0xE147, 0xE145,      0,      0,      0, 0x9572, 0xE149, /* 0xF0 */
-    0xE148                                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0x8B85, 	 0, 0xE0E4, 0x979D, 0xFB65, /* 0x00 */
+         0, 0x97AE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x91F4, 	 0, 	 0, 0xE0E6, 0xFB67, 	 0, /* 0x20 */
+         0, 0xFB69, 0xFB68, 	 0, 	 0, 	 0, 0xFB6A, 	 0, /* 0x20 */
+         0, 	 0, 0xE0E8, 0x97D4, 0x8BD5, 0x94FA, 0x9469, 	 0, /* 0x30 */
+         0, 	 0, 0xE0E9, 	 0, 	 0, 	 0, 	 0, 0xE0EB, /* 0x30 */
+         0, 0xE0EE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE0EA, 	 0, 	 0, /* 0x50 */
+         0, 0xE0ED, 0x8CE8, 0x896C, 0xE0EF, 	 0, 0x9090, 0xE0EC, /* 0x50 */
+    0x97DA, 	 0, 0xFB6B, 0xE0F2, 0xEAA2, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xE0F0, 0xE0F3, 	 0, 	 0, 	 0, 	 0, 0xE0E5, /* 0x60 */
+    0xE0F1, 	 0, 	 0, 0x8DBA, 	 0, 	 0, 0xE0F4, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0F5, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x979E, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xFB6C, 	 0, 0xE0F6, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0F7, 0xFB6D, /* 0x90 */
+         0, 	 0, 0xE0E3, 	 0, 	 0, 	 0, 	 0, 0xE0F8, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x8AC2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x8EA3, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE0F9, 	 0, 	 0, 	 0, 	 0, 0xE0FA, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xE0FB, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x895A, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE140, 	 0, 0x955A, 0xE141, 	 0, 	 0, 0x8AA2, 0xE142, /* 0xE0 */
+         0, 0xE143, 	 0, 	 0, 	 0, 	 0, 0xE144, 	 0, /* 0xE0 */
+    0xE146, 0xE147, 0xE145, 	 0, 	 0, 	 0, 0x9572, 0xE149, /* 0xF0 */
+    0xE148															/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_75[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xFB6E,      0, 0xE14B, 0xE14A, 0xE14C,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0xE14D, 0xE14F, 0xE14E,      0, /* 0x00 */
-         0, 0x8D99,      0, 0xE151,      0, 0xE150,      0,      0, /* 0x10 */
-    0x8AC3,      0, 0x9072,      0, 0x935B,      0, 0xE152, 0x90B6, /* 0x10 */
-         0,      0,      0, 0x8E59,      0, 0x8999, 0xE153,      0, /* 0x20 */
-    0x9770,      0,      0, 0x95E1, 0xE154,      0,      0, 0xFAA8, /* 0x20 */
-    0x9363, 0x9752, 0x8D62, 0x905C,      0,      0,      0, 0x926A, /* 0x30 */
-    0x99B2,      0, 0x92AC, 0x89E6, 0xE155,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xE156,      0, 0xE15B,      0, /* 0x40 */
-         0, 0xE159, 0xE158, 0x9DC0, 0x8A45, 0xE157,      0, 0x88D8, /* 0x40 */
-         0, 0x94A8,      0,      0, 0x94C8,      0,      0,      0, /* 0x50 */
-         0, 0x97AF, 0xE15C, 0xE15A, 0x927B, 0x90A4,      0,      0, /* 0x50 */
-    0x94A9,      0, 0x954C,      0, 0xE15E, 0x97AA, 0x8C6C, 0xE15F, /* 0x60 */
-         0, 0xE15D, 0x94D4, 0xE160,      0, 0xE161,      0, 0xFB6F, /* 0x60 */
-    0x88D9,      0,      0, 0x8FF4, 0xE166,      0, 0xE163, 0x93EB, /* 0x70 */
-    0xE162,      0,      0,      0,      0,      0,      0, 0x8B45, /* 0x70 */
-         0,      0, 0xE169,      0,      0,      0, 0xE164, 0xE165, /* 0x80 */
-         0, 0xE168, 0xE167, 0x9544,      0,      0, 0x9161, 0x9160, /* 0x80 */
-         0, 0x8B5E,      0,      0, 0xE16A,      0,      0,      0, /* 0x90 */
-         0,      0, 0xE16B,      0,      0, 0xE16C,      0,      0, /* 0x90 */
-         0,      0,      0, 0xE16E,      0, 0xE16D,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x8975,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xE176, 0x94E6, 0xE170,      0, 0xE172,      0,      0, /* 0xB0 */
-    0xE174, 0x905D,      0,      0, 0xE175, 0xE173, 0x8EBE,      0, /* 0xB0 */
-         0,      0, 0xE16F, 0xE171,      0, 0x9561,      0, 0x8FC7, /* 0xC0 */
-         0,      0, 0xE178,      0,      0, 0xE177,      0,      0, /* 0xC0 */
-         0,      0, 0xE179,      0, 0x8EA4, 0x8DAD,      0,      0, /* 0xD0 */
-    0x9397, 0xE17A,      0, 0x92C9,      0,      0, 0xE17C,      0, /* 0xD0 */
-         0,      0, 0x979F, 0xE17B,      0,      0,      0,      0, /* 0xE0 */
-         0, 0x9189,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xE182,      0, 0xE184, 0xE185, 0x9273,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xE183,      0, 0xE180,      0, 0xE17D, 0xE17E  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xFB6E, 	 0, 0xE14B, 0xE14A, 0xE14C, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xE14D, 0xE14F, 0xE14E, 	 0, /* 0x00 */
+         0, 0x8D99, 	 0, 0xE151, 	 0, 0xE150, 	 0, 	 0, /* 0x10 */
+    0x8AC3, 	 0, 0x9072, 	 0, 0x935B, 	 0, 0xE152, 0x90B6, /* 0x10 */
+         0, 	 0, 	 0, 0x8E59, 	 0, 0x8999, 0xE153, 	 0, /* 0x20 */
+    0x9770, 	 0, 	 0, 0x95E1, 0xE154, 	 0, 	 0, 0xFAA8, /* 0x20 */
+    0x9363, 0x9752, 0x8D62, 0x905C, 	 0, 	 0, 	 0, 0x926A, /* 0x30 */
+    0x99B2, 	 0, 0x92AC, 0x89E6, 0xE155, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xE156, 	 0, 0xE15B, 	 0, /* 0x40 */
+         0, 0xE159, 0xE158, 0x9DC0, 0x8A45, 0xE157, 	 0, 0x88D8, /* 0x40 */
+         0, 0x94A8, 	 0, 	 0, 0x94C8, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x97AF, 0xE15C, 0xE15A, 0x927B, 0x90A4, 	 0, 	 0, /* 0x50 */
+    0x94A9, 	 0, 0x954C, 	 0, 0xE15E, 0x97AA, 0x8C6C, 0xE15F, /* 0x60 */
+         0, 0xE15D, 0x94D4, 0xE160, 	 0, 0xE161, 	 0, 0xFB6F, /* 0x60 */
+    0x88D9, 	 0, 	 0, 0x8FF4, 0xE166, 	 0, 0xE163, 0x93EB, /* 0x70 */
+    0xE162, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8B45, /* 0x70 */
+         0, 	 0, 0xE169, 	 0, 	 0, 	 0, 0xE164, 0xE165, /* 0x80 */
+         0, 0xE168, 0xE167, 0x9544, 	 0, 	 0, 0x9161, 0x9160, /* 0x80 */
+         0, 0x8B5E, 	 0, 	 0, 0xE16A, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xE16B, 	 0, 	 0, 0xE16C, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xE16E, 	 0, 0xE16D, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x8975, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xE176, 0x94E6, 0xE170, 	 0, 0xE172, 	 0, 	 0, /* 0xB0 */
+    0xE174, 0x905D, 	 0, 	 0, 0xE175, 0xE173, 0x8EBE, 	 0, /* 0xB0 */
+         0, 	 0, 0xE16F, 0xE171, 	 0, 0x9561, 	 0, 0x8FC7, /* 0xC0 */
+         0, 	 0, 0xE178, 	 0, 	 0, 0xE177, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE179, 	 0, 0x8EA4, 0x8DAD, 	 0, 	 0, /* 0xD0 */
+    0x9397, 0xE17A, 	 0, 0x92C9, 	 0, 	 0, 0xE17C, 	 0, /* 0xD0 */
+         0, 	 0, 0x979F, 0xE17B, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x9189, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE182, 	 0, 0xE184, 0xE185, 0x9273, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xE183, 	 0, 0xE180, 	 0, 0xE17D, 0xE17E	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_76[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE181,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xE188,      0, 0xE186,      0, 0xE187,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xE189, /* 0x10 */
-    0xE18B, 0xE18C, 0xE18D,      0, 0xE18E,      0,      0, 0xE18A, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xE190,      0,      0,      0, 0xE18F,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xE191,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0x97C3,      0,      0,      0, 0xE194, 0xE192, /* 0x40 */
-    0xE193,      0,      0,      0, 0x8AE0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x96FC,      0,      0,      0, 0x95C8,      0, /* 0x50 */
-    0xE196,      0,      0,      0, 0xE195,      0,      0,      0, /* 0x50 */
-         0, 0xE197, 0xE198,      0,      0,      0,      0, 0xE19C, /* 0x60 */
-    0xE199, 0xE19A, 0xE19B,      0, 0xE19D,      0,      0,      0, /* 0x60 */
-    0xE19E,      0, 0xE19F,      0,      0,      0, 0xE1A0,      0, /* 0x70 */
-    0xE1A1,      0, 0x94AD, 0x936F, 0xE1A2, 0x9492, 0x9553,      0, /* 0x70 */
-    0xE1A3,      0, 0xFB70, 0xE1A4, 0x9349,      0, 0x8A46, 0x8D63, /* 0x80 */
-    0xE1A5,      0,      0, 0xE1A6,      0,      0, 0xE1A7,      0, /* 0x80 */
-    0x8E48,      0,      0, 0xE1A9,      0,      0, 0xE1A8,      0, /* 0x90 */
-         0, 0xE1AA, 0xE1AB, 0xFB73, 0xFB71,      0, 0xFB72,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0xFB74,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0x94E7,      0, /* 0xA0 */
-    0xE1AC,      0,      0,      0, 0xE1AD,      0,      0, 0xEA89, /* 0xB0 */
-    0xE1AE, 0xE1AF, 0xE1B0,      0,      0,      0,      0, 0x8E4D, /* 0xB0 */
-         0,      0, 0xE1B1, 0x9475,      0,      0, 0x967E,      0, /* 0xC0 */
-    0x896D,      0, 0x8976,      0,      0, 0xE1B2,      0,      0, /* 0xC0 */
-         0,      0, 0xE1B4,      0,      0,      0, 0xE1B3, 0x9390, /* 0xD0 */
-         0,      0,      0, 0x90B7, 0x9F58,      0, 0xE1B5, 0x96BF, /* 0xD0 */
-         0, 0xE1B6,      0, 0x8AC4, 0x94D5, 0xE1B7,      0, 0xE1B8, /* 0xE0 */
-         0,      0, 0xE1B9,      0,      0,      0, 0x96DA,      0, /* 0xE0 */
-         0,      0, 0x96D3,      0, 0x92BC,      0,      0,      0, /* 0xF0 */
-    0x918A,      0,      0, 0xE1BB,      0,      0, 0x8F82          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE181, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xE188, 	 0, 0xE186, 	 0, 0xE187, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE189, /* 0x10 */
+    0xE18B, 0xE18C, 0xE18D, 	 0, 0xE18E, 	 0, 	 0, 0xE18A, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xE190, 	 0, 	 0, 	 0, 0xE18F, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xE191, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x97C3, 	 0, 	 0, 	 0, 0xE194, 0xE192, /* 0x40 */
+    0xE193, 	 0, 	 0, 	 0, 0x8AE0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x96FC, 	 0, 	 0, 	 0, 0x95C8, 	 0, /* 0x50 */
+    0xE196, 	 0, 	 0, 	 0, 0xE195, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xE197, 0xE198, 	 0, 	 0, 	 0, 	 0, 0xE19C, /* 0x60 */
+    0xE199, 0xE19A, 0xE19B, 	 0, 0xE19D, 	 0, 	 0, 	 0, /* 0x60 */
+    0xE19E, 	 0, 0xE19F, 	 0, 	 0, 	 0, 0xE1A0, 	 0, /* 0x70 */
+    0xE1A1, 	 0, 0x94AD, 0x936F, 0xE1A2, 0x9492, 0x9553, 	 0, /* 0x70 */
+    0xE1A3, 	 0, 0xFB70, 0xE1A4, 0x9349, 	 0, 0x8A46, 0x8D63, /* 0x80 */
+    0xE1A5, 	 0, 	 0, 0xE1A6, 	 0, 	 0, 0xE1A7, 	 0, /* 0x80 */
+    0x8E48, 	 0, 	 0, 0xE1A9, 	 0, 	 0, 0xE1A8, 	 0, /* 0x90 */
+         0, 0xE1AA, 0xE1AB, 0xFB73, 0xFB71, 	 0, 0xFB72, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFB74, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x94E7, 	 0, /* 0xA0 */
+    0xE1AC, 	 0, 	 0, 	 0, 0xE1AD, 	 0, 	 0, 0xEA89, /* 0xB0 */
+    0xE1AE, 0xE1AF, 0xE1B0, 	 0, 	 0, 	 0, 	 0, 0x8E4D, /* 0xB0 */
+         0, 	 0, 0xE1B1, 0x9475, 	 0, 	 0, 0x967E, 	 0, /* 0xC0 */
+    0x896D, 	 0, 0x8976, 	 0, 	 0, 0xE1B2, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE1B4, 	 0, 	 0, 	 0, 0xE1B3, 0x9390, /* 0xD0 */
+         0, 	 0, 	 0, 0x90B7, 0x9F58, 	 0, 0xE1B5, 0x96BF, /* 0xD0 */
+         0, 0xE1B6, 	 0, 0x8AC4, 0x94D5, 0xE1B7, 	 0, 0xE1B8, /* 0xE0 */
+         0, 	 0, 0xE1B9, 	 0, 	 0, 	 0, 0x96DA, 	 0, /* 0xE0 */
+         0, 	 0, 0x96D3, 	 0, 0x92BC, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x918A, 	 0, 	 0, 0xE1BB, 	 0, 	 0, 0x8F82			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_77[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x8FC8,      0,      0, 0xE1BE,      0,      0, 0xE1BD, /* 0x00 */
-    0xE1BC, 0x94FB,      0, 0x8AC5, 0x8CA7,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xE1C4,      0,      0, 0xE1C1, 0x905E, /* 0x10 */
-    0x96B0,      0,      0,      0, 0xE1C0, 0xE1C2, 0xE1C3,      0, /* 0x20 */
-         0, 0xE1BF,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xE1C5, /* 0x30 */
-    0xE1C6,      0, 0x92AD,      0, 0x8AE1,      0,      0,      0, /* 0x30 */
-    0x9285,      0,      0,      0,      0,      0, 0xFB76, 0xE1C7, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xE1C8, 0xE1CB,      0,      0,      0,      0, /* 0x50 */
-         0, 0x9087,      0, 0x93C2,      0, 0xE1CC, 0x9672,      0, /* 0x60 */
-    0xE1C9,      0,      0, 0xE1CA,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xE1CF,      0,      0,      0,      0, 0xE1CE, 0xE1CD, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xE1D1,      0,      0, 0xE1D0,      0, /* 0x80 */
-         0, 0xE1D2,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0xE1D4,      0, /* 0x90 */
-    0xE1D3,      0,      0,      0,      0, 0x95CB,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x8F75, 0x97C4,      0,      0, /* 0xA0 */
-    0xE1D5,      0,      0, 0x93B5,      0,      0, 0xE1D6,      0, /* 0xB0 */
-         0, 0xE1D7,      0, 0xE1DB, 0xE1D9, 0xE1DA,      0, 0xE1D8, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE1DC, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xE1DD,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE1DE, /* 0xD0 */
-         0,      0, 0xE1DF, 0x96B5, 0xE1E0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x96EE, 0xE1E1,      0, 0x926D,      0, 0x948A, /* 0xE0 */
-         0, 0x8BE9,      0,      0,      0, 0x925A, 0xE1E2, 0x8BB8, /* 0xE0 */
-         0,      0,      0, 0x90CE,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0, 0xE1E3                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x8FC8, 	 0, 	 0, 0xE1BE, 	 0, 	 0, 0xE1BD, /* 0x00 */
+    0xE1BC, 0x94FB, 	 0, 0x8AC5, 0x8CA7, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xE1C4, 	 0, 	 0, 0xE1C1, 0x905E, /* 0x10 */
+    0x96B0, 	 0, 	 0, 	 0, 0xE1C0, 0xE1C2, 0xE1C3, 	 0, /* 0x20 */
+         0, 0xE1BF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1C5, /* 0x30 */
+    0xE1C6, 	 0, 0x92AD, 	 0, 0x8AE1, 	 0, 	 0, 	 0, /* 0x30 */
+    0x9285, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFB76, 0xE1C7, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xE1C8, 0xE1CB, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x9087, 	 0, 0x93C2, 	 0, 0xE1CC, 0x9672, 	 0, /* 0x60 */
+    0xE1C9, 	 0, 	 0, 0xE1CA, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xE1CF, 	 0, 	 0, 	 0, 	 0, 0xE1CE, 0xE1CD, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xE1D1, 	 0, 	 0, 0xE1D0, 	 0, /* 0x80 */
+         0, 0xE1D2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1D4, 	 0, /* 0x90 */
+    0xE1D3, 	 0, 	 0, 	 0, 	 0, 0x95CB, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x8F75, 0x97C4, 	 0, 	 0, /* 0xA0 */
+    0xE1D5, 	 0, 	 0, 0x93B5, 	 0, 	 0, 0xE1D6, 	 0, /* 0xB0 */
+         0, 0xE1D7, 	 0, 0xE1DB, 0xE1D9, 0xE1DA, 	 0, 0xE1D8, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1DC, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE1DD, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1DE, /* 0xD0 */
+         0, 	 0, 0xE1DF, 0x96B5, 0xE1E0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x96EE, 0xE1E1, 	 0, 0x926D, 	 0, 0x948A, /* 0xE0 */
+         0, 0x8BE9, 	 0, 	 0, 	 0, 0x925A, 0xE1E2, 0x8BB8, /* 0xE0 */
+         0, 	 0, 	 0, 0x90CE, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xE1E3							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_78[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x8DBB,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0xE1E4,      0,      0,      0, /* 0x00 */
-         0,      0, 0xE1E5,      0, 0x8CA4, 0x8DD3,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xE1E7, 0xFB78,      0,      0,      0, 0x9375, 0x8DD4, 0x8B6D, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x9643,      0, 0x946A,      0,      0,      0, /* 0x30 */
-         0,      0, 0x9376,      0,      0,      0,      0, 0x8D7B, /* 0x30 */
-         0,      0,      0,      0,      0, 0xE1E9,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xFB79,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0x8FC9,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xFB7A,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0x97B0, 0x8D64,      0,      0, 0x8CA5, /* 0x60 */
-         0,      0, 0x94A1,      0, 0xE1EB,      0,      0,      0, /* 0x70 */
-         0,      0, 0xFB7B,      0, 0xE1ED,      0,      0,      0, /* 0x70 */
-         0, 0x8CE9,      0,      0,      0,      0, 0xE1EC, 0x92F4, /* 0x80 */
-         0,      0,      0,      0, 0xE1EF, 0x8A56, 0xE1EA,      0, /* 0x80 */
-         0, 0x94E8,      0, 0x894F,      0, 0x8DEA,      0, 0x9871, /* 0x90 */
-         0,      0, 0xE1EE,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xE1F0,      0,      0,      0, 0x95C9, /* 0xA0 */
-         0, 0x90D7, 0xE1F2,      0,      0,      0,      0, 0xE1F3, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xE1F1,      0,      0, /* 0xB0 */
-         0,      0, 0x8A6D,      0, 0xE1F9,      0, 0xE1F8,      0, /* 0xB0 */
-         0, 0x8EA5,      0,      0,      0, 0xE1FA, 0xE1F5,      0, /* 0xC0 */
-         0,      0, 0xE1FB, 0xE1F6,      0,      0,      0,      0, /* 0xC0 */
-    0x94D6, 0xE1F4,      0,      0, 0xE1F7,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xE241,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE240, /* 0xE0 */
-    0x9681,      0,      0,      0, 0xE1FC,      0,      0, 0x88E9, /* 0xE0 */
-         0,      0,      0,      0, 0xE243,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xE242                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x8DBB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xE1E4, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xE1E5, 	 0, 0x8CA4, 0x8DD3, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xE1E7, 0xFB78, 	 0, 	 0, 	 0, 0x9375, 0x8DD4, 0x8B6D, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x9643, 	 0, 0x946A, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x9376, 	 0, 	 0, 	 0, 	 0, 0x8D7B, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE1E9, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFB79, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x8FC9, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xFB7A, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x97B0, 0x8D64, 	 0, 	 0, 0x8CA5, /* 0x60 */
+         0, 	 0, 0x94A1, 	 0, 0xE1EB, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xFB7B, 	 0, 0xE1ED, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x8CE9, 	 0, 	 0, 	 0, 	 0, 0xE1EC, 0x92F4, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xE1EF, 0x8A56, 0xE1EA, 	 0, /* 0x80 */
+         0, 0x94E8, 	 0, 0x894F, 	 0, 0x8DEA, 	 0, 0x9871, /* 0x90 */
+         0, 	 0, 0xE1EE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xE1F0, 	 0, 	 0, 	 0, 0x95C9, /* 0xA0 */
+         0, 0x90D7, 0xE1F2, 	 0, 	 0, 	 0, 	 0, 0xE1F3, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE1F1, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x8A6D, 	 0, 0xE1F9, 	 0, 0xE1F8, 	 0, /* 0xB0 */
+         0, 0x8EA5, 	 0, 	 0, 	 0, 0xE1FA, 0xE1F5, 	 0, /* 0xC0 */
+         0, 	 0, 0xE1FB, 0xE1F6, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x94D6, 0xE1F4, 	 0, 	 0, 0xE1F7, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xE241, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE240, /* 0xE0 */
+    0x9681, 	 0, 	 0, 	 0, 0xE1FC, 	 0, 	 0, 0x88E9, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xE243, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE242					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_79[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x8FCA,      0,      0,      0,      0,      0, 0xE244, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0x9162,      0, /* 0x00 */
-         0, 0xE246, 0xE245,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xE247,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xE1E6,      0, /* 0x20 */
-         0,      0, 0xE1E8, 0xE249, 0xE248,      0,      0,      0, /* 0x20 */
-    0xFB7C,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0x8EA6,      0, 0x97E7,      0, 0x8ED0,      0, /* 0x30 */
-    0xE24A, 0x8C56,      0,      0,      0,      0,      0, 0x8B5F, /* 0x40 */
-    0x8B46, 0x8E83,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0x9753,      0,      0, 0xE250,      0, 0xE24F, 0x9163, 0xE24C, /* 0x50 */
-         0,      0, 0xE24E,      0,      0, 0x8F6A, 0x905F, 0xE24D, /* 0x50 */
-    0xE24B,      0, 0x9449,      0,      0, 0x8FCB,      0,      0, /* 0x60 */
-    0x955B,      0,      0,      0,      0, 0x8DD5,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0x9398, /* 0x70 */
-         0,      0, 0xE251,      0,      0,      0,      0, 0xE252, /* 0x70 */
-    0xE268, 0x8BD6,      0,      0, 0x985C, 0x9154,      0,      0, /* 0x80 */
-         0,      0, 0xE253,      0,      0, 0x89D0, 0x92F5, 0x959F, /* 0x80 */
-         0,      0,      0,      0, 0xFB81,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xFB83,      0, 0xE254,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0x8B9A, 0xE255, /* 0xA0 */
-         0,      0, 0xE257,      0,      0,      0, 0xE258,      0, /* 0xA0 */
-    0x9448,      0,      0, 0xE259,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE25A, 0xE25B,      0,      0, 0x8BD7, 0x89D1, 0x93C3, /* 0xB0 */
-    0x8F47, 0x8E84,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xE25C,      0, 0x8F48,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x89C8, 0x9562,      0,      0, 0xE25D,      0,      0, /* 0xD0 */
-    0x94E9,      0,      0,      0,      0,      0,      0, 0x9164, /* 0xD0 */
-         0, 0xE260,      0, 0xE261, 0x9489,      0, 0x9060, 0xE25E, /* 0xE0 */
-         0, 0x9281,      0,      0, 0xE25F,      0,      0,      0, /* 0xE0 */
-    0x8FCC,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0x88DA                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x8FCA, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE244, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9162, 	 0, /* 0x00 */
+         0, 0xE246, 0xE245, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xE247, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1E6, 	 0, /* 0x20 */
+         0, 	 0, 0xE1E8, 0xE249, 0xE248, 	 0, 	 0, 	 0, /* 0x20 */
+    0xFB7C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x8EA6, 	 0, 0x97E7, 	 0, 0x8ED0, 	 0, /* 0x30 */
+    0xE24A, 0x8C56, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8B5F, /* 0x40 */
+    0x8B46, 0x8E83, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0x9753, 	 0, 	 0, 0xE250, 	 0, 0xE24F, 0x9163, 0xE24C, /* 0x50 */
+         0, 	 0, 0xE24E, 	 0, 	 0, 0x8F6A, 0x905F, 0xE24D, /* 0x50 */
+    0xE24B, 	 0, 0x9449, 	 0, 	 0, 0x8FCB, 	 0, 	 0, /* 0x60 */
+    0x955B, 	 0, 	 0, 	 0, 	 0, 0x8DD5, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9398, /* 0x70 */
+         0, 	 0, 0xE251, 	 0, 	 0, 	 0, 	 0, 0xE252, /* 0x70 */
+    0xE268, 0x8BD6, 	 0, 	 0, 0x985C, 0x9154, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE253, 	 0, 	 0, 0x89D0, 0x92F5, 0x959F, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xFB81, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xFB83, 	 0, 0xE254, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8B9A, 0xE255, /* 0xA0 */
+         0, 	 0, 0xE257, 	 0, 	 0, 	 0, 0xE258, 	 0, /* 0xA0 */
+    0x9448, 	 0, 	 0, 0xE259, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE25A, 0xE25B, 	 0, 	 0, 0x8BD7, 0x89D1, 0x93C3, /* 0xB0 */
+    0x8F47, 0x8E84, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xE25C, 	 0, 0x8F48, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x89C8, 0x9562, 	 0, 	 0, 0xE25D, 	 0, 	 0, /* 0xD0 */
+    0x94E9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9164, /* 0xD0 */
+         0, 0xE260, 	 0, 0xE261, 0x9489, 	 0, 0x9060, 0xE25E, /* 0xE0 */
+         0, 0x9281, 	 0, 	 0, 0xE25F, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x8FCC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0x88DA									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_7A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x8B48,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0xE262,      0,      0, 0x92F6,      0, 0xE263, 0x90C5,      0, /* 0x00 */
-         0,      0,      0,      0, 0x96AB,      0,      0, 0x9542, /* 0x10 */
-    0xE264, 0xE265, 0x9274,      0, 0x97C5,      0,      0, 0xE267, /* 0x10 */
-    0xE266,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x8EED,      0, /* 0x20 */
-         0, 0xE269, 0x88EE,      0,      0,      0,      0, 0xE26C, /* 0x30 */
-         0,      0,      0, 0xE26A, 0x89D2, 0x8C6D, 0xE26B, 0x8D65, /* 0x30 */
-    0x8D92,      0, 0x95E4, 0xE26D,      0,      0, 0x9673,      0, /* 0x40 */
-         0, 0xE26F,      0,      0,      0, 0x90CF, 0x896E, 0x89B8, /* 0x40 */
-    0x88AA,      0,      0,      0,      0,      0,      0, 0xE26E, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xE270, 0xE271, 0x8FF5,      0,      0,      0,      0, /* 0x60 */
-         0, 0xE272,      0, 0x8A6E,      0,      0,      0,      0, /* 0x60 */
-    0xE274,      0,      0,      0, 0x8C8A,      0, 0x8B86,      0, /* 0x70 */
-         0, 0xE275, 0x8BF3,      0,      0, 0xE276,      0, 0x90FA, /* 0x70 */
-         0, 0x93CB,      0, 0x90DE, 0x8DF3,      0,      0,      0, /* 0x80 */
-    0xE277,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0x9282, 0x918B,      0, 0xE279, 0xE27B, 0xE278, /* 0x90 */
-    0xE27A,      0,      0,      0,      0,      0,      0, 0x8C41, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xE27C, 0x8C45,      0,      0,      0, 0x8B87, 0x9771, /* 0xA0 */
-    0xE27E,      0,      0,      0,      0,      0, 0xE280,      0, /* 0xB0 */
-         0,      0, 0x894D,      0,      0,      0,      0, 0xE283, /* 0xB0 */
-         0,      0,      0, 0x8A96, 0xE282, 0xE281,      0, 0xE285, /* 0xC0 */
-    0xE27D,      0, 0xE286, 0x97A7,      0, 0xE287,      0, 0xE288, /* 0xC0 */
-         0, 0xFB84, 0x9AF2, 0xE28A,      0, 0xE289,      0,      0, /* 0xD0 */
-         0, 0xE28B, 0xE28C,      0, 0x97B3, 0xE28D,      0, 0xE8ED, /* 0xD0 */
-    0x8FCD, 0xE28E, 0xE28F, 0x8F76,      0, 0x93B6, 0xE290, 0xFB85, /* 0xE0 */
-         0,      0, 0x9247, 0xFB87,      0, 0xE291,      0, 0x925B, /* 0xE0 */
-    0xE292,      0,      0,      0,      0,      0, 0x8BA3,      0, /* 0xF0 */
-    0x995E, 0x927C, 0x8EB1,      0,      0,      0,      0, 0x8AC6  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x8B48, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xE262, 	 0, 	 0, 0x92F6, 	 0, 0xE263, 0x90C5, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x96AB, 	 0, 	 0, 0x9542, /* 0x10 */
+    0xE264, 0xE265, 0x9274, 	 0, 0x97C5, 	 0, 	 0, 0xE267, /* 0x10 */
+    0xE266, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8EED, 	 0, /* 0x20 */
+         0, 0xE269, 0x88EE, 	 0, 	 0, 	 0, 	 0, 0xE26C, /* 0x30 */
+         0, 	 0, 	 0, 0xE26A, 0x89D2, 0x8C6D, 0xE26B, 0x8D65, /* 0x30 */
+    0x8D92, 	 0, 0x95E4, 0xE26D, 	 0, 	 0, 0x9673, 	 0, /* 0x40 */
+         0, 0xE26F, 	 0, 	 0, 	 0, 0x90CF, 0x896E, 0x89B8, /* 0x40 */
+    0x88AA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE26E, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xE270, 0xE271, 0x8FF5, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xE272, 	 0, 0x8A6E, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xE274, 	 0, 	 0, 	 0, 0x8C8A, 	 0, 0x8B86, 	 0, /* 0x70 */
+         0, 0xE275, 0x8BF3, 	 0, 	 0, 0xE276, 	 0, 0x90FA, /* 0x70 */
+         0, 0x93CB, 	 0, 0x90DE, 0x8DF3, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE277, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x9282, 0x918B, 	 0, 0xE279, 0xE27B, 0xE278, /* 0x90 */
+    0xE27A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8C41, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xE27C, 0x8C45, 	 0, 	 0, 	 0, 0x8B87, 0x9771, /* 0xA0 */
+    0xE27E, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE280, 	 0, /* 0xB0 */
+         0, 	 0, 0x894D, 	 0, 	 0, 	 0, 	 0, 0xE283, /* 0xB0 */
+         0, 	 0, 	 0, 0x8A96, 0xE282, 0xE281, 	 0, 0xE285, /* 0xC0 */
+    0xE27D, 	 0, 0xE286, 0x97A7, 	 0, 0xE287, 	 0, 0xE288, /* 0xC0 */
+         0, 0xFB84, 0x9AF2, 0xE28A, 	 0, 0xE289, 	 0, 	 0, /* 0xD0 */
+         0, 0xE28B, 0xE28C, 	 0, 0x97B3, 0xE28D, 	 0, 0xE8ED, /* 0xD0 */
+    0x8FCD, 0xE28E, 0xE28F, 0x8F76, 	 0, 0x93B6, 0xE290, 0xFB85, /* 0xE0 */
+         0, 	 0, 0x9247, 0xFB87, 	 0, 0xE291, 	 0, 0x925B, /* 0xE0 */
+    0xE292, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8BA3, 	 0, /* 0xF0 */
+    0x995E, 0x927C, 0x8EB1, 	 0, 	 0, 	 0, 	 0, 0x8AC6	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_7B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xE293,      0, 0xE2A0,      0, 0xE296,      0, /* 0x00 */
-    0x8B88,      0, 0xE295, 0xE2A2,      0,      0,      0, 0xE294, /* 0x00 */
-         0, 0x8FCE,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xE298, 0xE299,      0, 0x934A,      0,      0, 0xE29A,      0, /* 0x10 */
-    0x8A7D,      0,      0,      0,      0, 0x9079, 0x9584,      0, /* 0x20 */
-    0xE29C,      0,      0,      0, 0x91E6,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xE297,      0, 0xE29B, 0xE29D,      0, /* 0x30 */
-         0, 0x8DF9,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xE2A4, 0x954D,      0, /* 0x40 */
-    0x94A4, 0x9399,      0, 0x8BD8, 0xE2A3, 0xE2A1,      0, 0x94B3, /* 0x40 */
-    0xE29E, 0x927D, 0x939B,      0, 0x939A,      0, 0x8DF4,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xE2B6,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xE2A6,      0, 0xE2A8, /* 0x60 */
-         0,      0,      0,      0, 0xE2AB,      0, 0xE2AC,      0, /* 0x60 */
-    0xE2A9, 0xE2AA,      0,      0, 0xE2A7, 0xE2A5,      0,      0, /* 0x70 */
-         0,      0, 0xE29F,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x95CD, 0x89D3, /* 0x80 */
-         0,      0,      0, 0xE2B3,      0, 0xE2B0,      0, 0xE2B5, /* 0x80 */
-         0,      0, 0xE2B4,      0, 0x9493, 0x96A5,      0, 0x8E5A, /* 0x90 */
-    0xE2AE, 0xE2B7, 0xE2B2,      0, 0xE2B1, 0xE2AD, 0xFB88, 0xE2AF, /* 0x90 */
-         0, 0x8AC7,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x925C,      0,      0, 0x90FB,      0,      0, /* 0xA0 */
-         0, 0x94A0,      0,      0, 0xE2BC,      0,      0,      0, /* 0xB0 */
-    0x94A2,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x90DF, 0xE2B9,      0,      0, 0x94CD,      0, 0xE2BD, 0x95D1, /* 0xC0 */
-         0, 0x927A,      0, 0xE2B8, 0xE2BA,      0,      0, 0xE2BB, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xE2BE,      0,      0, /* 0xD0 */
-    0x8EC2,      0,      0,      0, 0x93C4, 0xE2C3, 0xE2C2,      0, /* 0xE0 */
-         0, 0xE2BF,      0,      0,      0, 0x9855,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xE2C8,      0,      0, 0xE2CC, 0xE2C9, /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xE293, 	 0, 0xE2A0, 	 0, 0xE296, 	 0, /* 0x00 */
+    0x8B88, 	 0, 0xE295, 0xE2A2, 	 0, 	 0, 	 0, 0xE294, /* 0x00 */
+         0, 0x8FCE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xE298, 0xE299, 	 0, 0x934A, 	 0, 	 0, 0xE29A, 	 0, /* 0x10 */
+    0x8A7D, 	 0, 	 0, 	 0, 	 0, 0x9079, 0x9584, 	 0, /* 0x20 */
+    0xE29C, 	 0, 	 0, 	 0, 0x91E6, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xE297, 	 0, 0xE29B, 0xE29D, 	 0, /* 0x30 */
+         0, 0x8DF9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE2A4, 0x954D, 	 0, /* 0x40 */
+    0x94A4, 0x9399, 	 0, 0x8BD8, 0xE2A3, 0xE2A1, 	 0, 0x94B3, /* 0x40 */
+    0xE29E, 0x927D, 0x939B, 	 0, 0x939A, 	 0, 0x8DF4, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE2B6, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE2A6, 	 0, 0xE2A8, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xE2AB, 	 0, 0xE2AC, 	 0, /* 0x60 */
+    0xE2A9, 0xE2AA, 	 0, 	 0, 0xE2A7, 0xE2A5, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xE29F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x95CD, 0x89D3, /* 0x80 */
+         0, 	 0, 	 0, 0xE2B3, 	 0, 0xE2B0, 	 0, 0xE2B5, /* 0x80 */
+         0, 	 0, 0xE2B4, 	 0, 0x9493, 0x96A5, 	 0, 0x8E5A, /* 0x90 */
+    0xE2AE, 0xE2B7, 0xE2B2, 	 0, 0xE2B1, 0xE2AD, 0xFB88, 0xE2AF, /* 0x90 */
+         0, 0x8AC7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x925C, 	 0, 	 0, 0x90FB, 	 0, 	 0, /* 0xA0 */
+         0, 0x94A0, 	 0, 	 0, 0xE2BC, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x94A2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x90DF, 0xE2B9, 	 0, 	 0, 0x94CD, 	 0, 0xE2BD, 0x95D1, /* 0xC0 */
+         0, 0x927A, 	 0, 0xE2B8, 0xE2BA, 	 0, 	 0, 0xE2BB, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE2BE, 	 0, 	 0, /* 0xD0 */
+    0x8EC2, 	 0, 	 0, 	 0, 0x93C4, 0xE2C3, 0xE2C2, 	 0, /* 0xE0 */
+         0, 0xE2BF, 	 0, 	 0, 	 0, 0x9855, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xE2C8, 	 0, 	 0, 0xE2CC, 0xE2C9, /* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -2506,949 +2506,949 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_7B[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_7C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE2C5,      0,      0,      0,      0,      0,      0, 0xE2C6, /* 0x00 */
-         0,      0,      0,      0,      0, 0xE2CB,      0,      0, /* 0x00 */
-         0, 0xE2C0, 0x99D3, 0xE2C7, 0xE2C1,      0,      0, 0xE2CA, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xE2D0, /* 0x10 */
-         0, 0x8AC8,      0, 0xE2CD,      0,      0,      0, 0xE2CE, /* 0x20 */
-         0,      0, 0xE2CF, 0xE2D2,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xE2D1, /* 0x30 */
-    0x94F4,      0,      0,      0,      0, 0xE2D3, 0x97FA, 0x95EB, /* 0x30 */
-    0xE2D8,      0,      0, 0xE2D5,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xE2D4, 0x90D0,      0, 0xE2D7, /* 0x40 */
-    0xE2D9,      0,      0,      0, 0xE2D6,      0, 0xE2DD,      0, /* 0x50 */
-    0xE2DA,      0,      0,      0,      0,      0,      0, 0xE2DB, /* 0x50 */
-    0xE2C4,      0,      0,      0, 0xE2DC, 0xE2DE,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xE2DF,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0x95C4,      0, 0xE2E0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x96E0,      0, /* 0x70 */
-         0, 0x8BCC, 0x8C48, 0xE2E1,      0,      0,      0,      0, /* 0x80 */
-         0, 0x95B2,      0, 0x9088,      0, 0x96AE,      0,      0, /* 0x80 */
-    0xE2E2,      0, 0x97B1,      0,      0, 0x9494,      0, 0x9165, /* 0x90 */
-    0x9453,      0,      0, 0x8F6C,      0,      0,      0, 0x88BE, /* 0x90 */
-         0, 0xE2E7, 0xE2E5,      0, 0xE2E3, 0x8A9F,      0, 0x8FCF, /* 0xA0 */
-    0xE2E8,      0,      0, 0xE2E6,      0, 0xE2E4, 0xE2EC,      0, /* 0xA0 */
-         0, 0xE2EB, 0xE2EA, 0xE2E9,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE2ED,      0,      0,      0, 0xE2EE, 0x90B8,      0, /* 0xB0 */
-    0xE2EF,      0, 0xE2F1,      0,      0, 0xE2F0,      0,      0, /* 0xC0 */
-         0,      0, 0x8CD0,      0,      0,      0, 0x9157,      0, /* 0xC0 */
-         0,      0, 0xE2F3,      0,      0,      0, 0x939C,      0, /* 0xD0 */
-    0xE2F2,      0,      0,      0, 0xE2F4,      0, 0x95B3, 0x918C, /* 0xD0 */
-    0x8D66,      0, 0xE2F5,      0,      0,      0,      0, 0x97C6, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE2F7, /* 0xE0 */
-         0,      0, 0xE2F8,      0, 0xE2F9,      0, 0xE2FA,      0, /* 0xF0 */
-    0x8E85,      0, 0xE2FB, 0x8C6E,      0,      0, 0x8B8A          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE2C5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2C6, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE2CB, 	 0, 	 0, /* 0x00 */
+         0, 0xE2C0, 0x99D3, 0xE2C7, 0xE2C1, 	 0, 	 0, 0xE2CA, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2D0, /* 0x10 */
+         0, 0x8AC8, 	 0, 0xE2CD, 	 0, 	 0, 	 0, 0xE2CE, /* 0x20 */
+         0, 	 0, 0xE2CF, 0xE2D2, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2D1, /* 0x30 */
+    0x94F4, 	 0, 	 0, 	 0, 	 0, 0xE2D3, 0x97FA, 0x95EB, /* 0x30 */
+    0xE2D8, 	 0, 	 0, 0xE2D5, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xE2D4, 0x90D0, 	 0, 0xE2D7, /* 0x40 */
+    0xE2D9, 	 0, 	 0, 	 0, 0xE2D6, 	 0, 0xE2DD, 	 0, /* 0x50 */
+    0xE2DA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2DB, /* 0x50 */
+    0xE2C4, 	 0, 	 0, 	 0, 0xE2DC, 0xE2DE, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xE2DF, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x95C4, 	 0, 0xE2E0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x96E0, 	 0, /* 0x70 */
+         0, 0x8BCC, 0x8C48, 0xE2E1, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x95B2, 	 0, 0x9088, 	 0, 0x96AE, 	 0, 	 0, /* 0x80 */
+    0xE2E2, 	 0, 0x97B1, 	 0, 	 0, 0x9494, 	 0, 0x9165, /* 0x90 */
+    0x9453, 	 0, 	 0, 0x8F6C, 	 0, 	 0, 	 0, 0x88BE, /* 0x90 */
+         0, 0xE2E7, 0xE2E5, 	 0, 0xE2E3, 0x8A9F, 	 0, 0x8FCF, /* 0xA0 */
+    0xE2E8, 	 0, 	 0, 0xE2E6, 	 0, 0xE2E4, 0xE2EC, 	 0, /* 0xA0 */
+         0, 0xE2EB, 0xE2EA, 0xE2E9, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE2ED, 	 0, 	 0, 	 0, 0xE2EE, 0x90B8, 	 0, /* 0xB0 */
+    0xE2EF, 	 0, 0xE2F1, 	 0, 	 0, 0xE2F0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x8CD0, 	 0, 	 0, 	 0, 0x9157, 	 0, /* 0xC0 */
+         0, 	 0, 0xE2F3, 	 0, 	 0, 	 0, 0x939C, 	 0, /* 0xD0 */
+    0xE2F2, 	 0, 	 0, 	 0, 0xE2F4, 	 0, 0x95B3, 0x918C, /* 0xD0 */
+    0x8D66, 	 0, 0xE2F5, 	 0, 	 0, 	 0, 	 0, 0x97C6, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2F7, /* 0xE0 */
+         0, 	 0, 0xE2F8, 	 0, 0xE2F9, 	 0, 0xE2FA, 	 0, /* 0xF0 */
+    0x8E85, 	 0, 0xE2FB, 0x8C6E, 	 0, 	 0, 0x8B8A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_7D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x8B49,      0, 0xE340,      0, 0x96F1, 0x8D67, 0xE2FC,      0, /* 0x00 */
-         0,      0, 0xE343, 0x96E4,      0, 0x945B,      0,      0, /* 0x00 */
-    0x9552,      0,      0,      0, 0x8F83, 0xE342,      0, 0x8ED1, /* 0x10 */
-    0x8D68, 0x8E86, 0x8B89, 0x95B4, 0xE341,      0,      0,      0, /* 0x10 */
-    0x9166, 0x9661, 0x8DF5,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0x8E87, 0x92DB,      0, 0xE346, 0x97DD, /* 0x20 */
-    0x8DD7,      0, 0xE347, 0x9061,      0, 0xE349,      0,      0, /* 0x30 */
-         0, 0x8FD0, 0x8DAE,      0,      0,      0,      0, 0xE348, /* 0x30 */
-         0,      0, 0x8F49, 0x8CBC, 0x9167, 0xE344, 0xE34A,      0, /* 0x40 */
-    0xFB8A,      0,      0, 0xE345, 0x8C6F,      0, 0xE34D, 0xE351, /* 0x40 */
-    0x8C8B,      0,      0,      0,      0,      0, 0xE34C,      0, /* 0x50 */
-         0,      0,      0, 0xE355, 0xFB8B,      0, 0x8D69,      0, /* 0x50 */
-         0, 0x978D, 0x88BA, 0xE352,      0,      0, 0x8B8B,      0, /* 0x60 */
-    0xE34F,      0,      0,      0,      0,      0, 0xE350,      0, /* 0x60 */
-         0, 0x939D, 0xE34E, 0xE34B,      0, 0x8A47, 0x90E2,      0, /* 0x70 */
-         0, 0x8CA6,      0,      0,      0, 0xE357,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xE354,      0,      0,      0,      0,      0, 0xE356, /* 0x80 */
-         0,      0,      0, 0xE353,      0,      0,      0,      0, /* 0x90 */
-         0, 0x8C70, 0x91B1, 0xE358, 0x918E,      0,      0, 0xE365, /* 0x90 */
-    0xFB8D,      0, 0xE361, 0xE35B,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xE35F, 0x8EF8, 0x88DB, 0xE35A, 0xE362, /* 0xA0 */
-    0xE366, 0x8D6A, 0x96D4,      0, 0x92D4, 0xE35C,      0, 0xFB8C, /* 0xB0 */
-    0xE364,      0, 0xE359, 0x925D,      0, 0xE35E, 0x88BB, 0x96C8, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE35D, /* 0xC0 */
-         0,      0, 0x8BD9, 0x94EA,      0,      0,      0, 0x918D, /* 0xC0 */
-         0, 0x97CE, 0x8F8F,      0,      0, 0xE38E, 0xFB8E,      0, /* 0xD0 */
-    0xE367,      0, 0x90FC,      0, 0xE363, 0xE368, 0xE36A,      0, /* 0xD0 */
-    0x92F7, 0xE36D,      0,      0, 0xE369,      0,      0,      0, /* 0xE0 */
-    0x95D2, 0x8AC9,      0,      0, 0x96C9,      0,      0, 0x88DC, /* 0xE0 */
-         0,      0, 0xE36C,      0, 0x97FB,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xE36B                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x8B49, 	 0, 0xE340, 	 0, 0x96F1, 0x8D67, 0xE2FC, 	 0, /* 0x00 */
+         0, 	 0, 0xE343, 0x96E4, 	 0, 0x945B, 	 0, 	 0, /* 0x00 */
+    0x9552, 	 0, 	 0, 	 0, 0x8F83, 0xE342, 	 0, 0x8ED1, /* 0x10 */
+    0x8D68, 0x8E86, 0x8B89, 0x95B4, 0xE341, 	 0, 	 0, 	 0, /* 0x10 */
+    0x9166, 0x9661, 0x8DF5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x8E87, 0x92DB, 	 0, 0xE346, 0x97DD, /* 0x20 */
+    0x8DD7, 	 0, 0xE347, 0x9061, 	 0, 0xE349, 	 0, 	 0, /* 0x30 */
+         0, 0x8FD0, 0x8DAE, 	 0, 	 0, 	 0, 	 0, 0xE348, /* 0x30 */
+         0, 	 0, 0x8F49, 0x8CBC, 0x9167, 0xE344, 0xE34A, 	 0, /* 0x40 */
+    0xFB8A, 	 0, 	 0, 0xE345, 0x8C6F, 	 0, 0xE34D, 0xE351, /* 0x40 */
+    0x8C8B, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE34C, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xE355, 0xFB8B, 	 0, 0x8D69, 	 0, /* 0x50 */
+         0, 0x978D, 0x88BA, 0xE352, 	 0, 	 0, 0x8B8B, 	 0, /* 0x60 */
+    0xE34F, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE350, 	 0, /* 0x60 */
+         0, 0x939D, 0xE34E, 0xE34B, 	 0, 0x8A47, 0x90E2, 	 0, /* 0x70 */
+         0, 0x8CA6, 	 0, 	 0, 	 0, 0xE357, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xE354, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE356, /* 0x80 */
+         0, 	 0, 	 0, 0xE353, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x8C70, 0x91B1, 0xE358, 0x918E, 	 0, 	 0, 0xE365, /* 0x90 */
+    0xFB8D, 	 0, 0xE361, 0xE35B, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xE35F, 0x8EF8, 0x88DB, 0xE35A, 0xE362, /* 0xA0 */
+    0xE366, 0x8D6A, 0x96D4, 	 0, 0x92D4, 0xE35C, 	 0, 0xFB8C, /* 0xB0 */
+    0xE364, 	 0, 0xE359, 0x925D, 	 0, 0xE35E, 0x88BB, 0x96C8, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE35D, /* 0xC0 */
+         0, 	 0, 0x8BD9, 0x94EA, 	 0, 	 0, 	 0, 0x918D, /* 0xC0 */
+         0, 0x97CE, 0x8F8F, 	 0, 	 0, 0xE38E, 0xFB8E, 	 0, /* 0xD0 */
+    0xE367, 	 0, 0x90FC, 	 0, 0xE363, 0xE368, 0xE36A, 	 0, /* 0xD0 */
+    0x92F7, 0xE36D, 	 0, 	 0, 0xE369, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x95D2, 0x8AC9, 	 0, 	 0, 0x96C9, 	 0, 	 0, 0x88DC, /* 0xE0 */
+         0, 	 0, 0xE36C, 	 0, 0x97FB, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xE36B									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_7E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x898F,      0,      0, 0x93EA, 0xE36E,      0,      0, /* 0x00 */
-         0, 0xE375, 0xE36F, 0xE376,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xE372,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0x949B,      0,      0, 0x8EC8, 0xE374, /* 0x10 */
-         0, 0xE371, 0xE377, 0xE370,      0,      0, 0x8F63,      0, /* 0x20 */
-         0,      0,      0, 0x9644,      0,      0, 0x8F6B,      0, /* 0x20 */
-         0, 0xE373, 0xE380,      0,      0, 0xE37B,      0, 0xE37E, /* 0x30 */
-         0, 0xE37C, 0xE381, 0xE37A,      0, 0xE360, 0x90D1,      0, /* 0x30 */
-         0, 0x94C9,      0, 0xE37D,      0,      0, 0xE378,      0, /* 0x40 */
-         0,      0, 0x9140, 0x8C71,      0, 0x8F4A,      0,      0, /* 0x40 */
-         0,      0, 0xFB8F,      0, 0x9044, 0x9155, 0xE384,      0, /* 0x50 */
-         0, 0xE386, 0xE387,      0,      0, 0xE383, 0xE385,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xE379, 0xE382, /* 0x60 */
-         0, 0xE38A, 0xE389,      0,      0, 0x969A,      0,      0, /* 0x60 */
-    0x8C4A,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xE388,      0, 0xE38C, 0xE38B, 0xE38F,      0, 0xE391, /* 0x70 */
-         0,      0, 0x8E5B, 0xE38D,      0,      0,      0,      0, /* 0x80 */
-    0xE392, 0xE393, 0xFA5C,      0, 0xE394,      0, 0xE39A, 0x935A, /* 0x80 */
-    0xE396,      0, 0xE395, 0xE397, 0xE398,      0, 0xE399,      0, /* 0x90 */
-         0,      0,      0, 0xE39B, 0xE39C                          /* 0x90 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x898F, 	 0, 	 0, 0x93EA, 0xE36E, 	 0, 	 0, /* 0x00 */
+         0, 0xE375, 0xE36F, 0xE376, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xE372, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x949B, 	 0, 	 0, 0x8EC8, 0xE374, /* 0x10 */
+         0, 0xE371, 0xE377, 0xE370, 	 0, 	 0, 0x8F63, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x9644, 	 0, 	 0, 0x8F6B, 	 0, /* 0x20 */
+         0, 0xE373, 0xE380, 	 0, 	 0, 0xE37B, 	 0, 0xE37E, /* 0x30 */
+         0, 0xE37C, 0xE381, 0xE37A, 	 0, 0xE360, 0x90D1, 	 0, /* 0x30 */
+         0, 0x94C9, 	 0, 0xE37D, 	 0, 	 0, 0xE378, 	 0, /* 0x40 */
+         0, 	 0, 0x9140, 0x8C71, 	 0, 0x8F4A, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xFB8F, 	 0, 0x9044, 0x9155, 0xE384, 	 0, /* 0x50 */
+         0, 0xE386, 0xE387, 	 0, 	 0, 0xE383, 0xE385, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE379, 0xE382, /* 0x60 */
+         0, 0xE38A, 0xE389, 	 0, 	 0, 0x969A, 	 0, 	 0, /* 0x60 */
+    0x8C4A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xE388, 	 0, 0xE38C, 0xE38B, 0xE38F, 	 0, 0xE391, /* 0x70 */
+         0, 	 0, 0x8E5B, 0xE38D, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE392, 0xE393, 0xFA5C, 	 0, 0xE394, 	 0, 0xE39A, 0x935A, /* 0x80 */
+    0xE396, 	 0, 0xE395, 0xE397, 0xE398, 	 0, 0xE399, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xE39B, 0xE39C							/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_7F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0x8ACA,      0, /* 0x30 */
-    0xE39D,      0, 0xE39E,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xE39F,      0, 0xFB90, /* 0x40 */
-         0,      0,      0,      0, 0xE3A0, 0xE3A1, 0xE3A2,      0, /* 0x40 */
-    0xE3A3, 0xE3A4,      0,      0, 0xE3A6, 0xE3A5,      0,      0, /* 0x50 */
-    0xE3A7,      0,      0,      0,      0,      0,      0, 0xE3A8, /* 0x50 */
-    0xE3A9,      0,      0,      0,      0,      0,      0, 0xE3AC, /* 0x60 */
-    0xE3AA, 0xE3AB, 0x8DDF, 0x8C72,      0,      0, 0x9275,      0, /* 0x60 */
-    0x94B1,      0, 0x8F90,      0,      0, 0x946C,      0, 0x94EB, /* 0x70 */
-    0xE3AD, 0x9CEB,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xE3AE, 0xE3B0,      0, 0x9785, 0xE3AF, 0xE3B2, /* 0x80 */
-    0xE3B1,      0, 0x9772,      0, 0xE3B3,      0, 0x94FC,      0, /* 0x80 */
-         0,      0,      0,      0, 0xE3B4,      0,      0,      0, /* 0x90 */
-         0,      0, 0xE3B7,      0,      0, 0xE3B6, 0xE3B5,      0, /* 0x90 */
-         0, 0xFB91,      0, 0xE3B8, 0x8C51,      0,      0,      0, /* 0xA0 */
-    0x9141, 0x8B60,      0,      0,      0,      0, 0xE3BC, 0xE3B9, /* 0xA0 */
-         0,      0, 0xE3BA,      0,      0,      0, 0xE3BD,      0, /* 0xB0 */
-    0xE3BE, 0xE3BB,      0,      0,      0, 0x8948,      0,      0, /* 0xB0 */
-         0, 0x89A5,      0,      0,      0, 0xE3C0, 0xE3C1,      0, /* 0xC0 */
-         0,      0, 0xE3C2,      0, 0x9782,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x8F4B,      0, 0xE3C4, 0xE3C3,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x9089, 0xE3C5,      0,      0,      0,      0, 0xE3C6,      0, /* 0xE0 */
-         0, 0xE3C7,      0, 0x8AE3,      0,      0,      0,      0, /* 0xE0 */
-    0x8ACB,      0,      0, 0xE3C8,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xE3C9,      0, 0x967C, 0x9783                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0x8ACA, 	 0, /* 0x30 */
+    0xE39D, 	 0, 0xE39E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE39F, 	 0, 0xFB90, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xE3A0, 0xE3A1, 0xE3A2, 	 0, /* 0x40 */
+    0xE3A3, 0xE3A4, 	 0, 	 0, 0xE3A6, 0xE3A5, 	 0, 	 0, /* 0x50 */
+    0xE3A7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE3A8, /* 0x50 */
+    0xE3A9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE3AC, /* 0x60 */
+    0xE3AA, 0xE3AB, 0x8DDF, 0x8C72, 	 0, 	 0, 0x9275, 	 0, /* 0x60 */
+    0x94B1, 	 0, 0x8F90, 	 0, 	 0, 0x946C, 	 0, 0x94EB, /* 0x70 */
+    0xE3AD, 0x9CEB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xE3AE, 0xE3B0, 	 0, 0x9785, 0xE3AF, 0xE3B2, /* 0x80 */
+    0xE3B1, 	 0, 0x9772, 	 0, 0xE3B3, 	 0, 0x94FC, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xE3B4, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xE3B7, 	 0, 	 0, 0xE3B6, 0xE3B5, 	 0, /* 0x90 */
+         0, 0xFB91, 	 0, 0xE3B8, 0x8C51, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x9141, 0x8B60, 	 0, 	 0, 	 0, 	 0, 0xE3BC, 0xE3B9, /* 0xA0 */
+         0, 	 0, 0xE3BA, 	 0, 	 0, 	 0, 0xE3BD, 	 0, /* 0xB0 */
+    0xE3BE, 0xE3BB, 	 0, 	 0, 	 0, 0x8948, 	 0, 	 0, /* 0xB0 */
+         0, 0x89A5, 	 0, 	 0, 	 0, 0xE3C0, 0xE3C1, 	 0, /* 0xC0 */
+         0, 	 0, 0xE3C2, 	 0, 0x9782, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x8F4B, 	 0, 0xE3C4, 0xE3C3, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x9089, 0xE3C5, 	 0, 	 0, 	 0, 	 0, 0xE3C6, 	 0, /* 0xE0 */
+         0, 0xE3C7, 	 0, 0x8AE3, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x8ACB, 	 0, 	 0, 0xE3C8, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xE3C9, 	 0, 0x967C, 0x9783							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_80[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x9773, 0x9856,      0, 0x8D6C, 0xE3CC, 0x8ED2, 0xE3CB,      0, /* 0x00 */
-         0,      0,      0, 0xE3CD, 0x8EA7,      0,      0,      0, /* 0x00 */
-    0x91CF,      0, 0xE3CE,      0,      0, 0x8D6B,      0, 0x96D5, /* 0x10 */
-    0xE3CF, 0xE3D0,      0,      0, 0xE3D1,      0,      0,      0, /* 0x10 */
-         0, 0xE3D2,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xE3D3,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0x8EA8,      0,      0, 0x96EB,      0, /* 0x30 */
-         0,      0,      0, 0xE3D5,      0, 0x925E,      0, 0xE3D4, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xE3D7,      0, /* 0x40 */
-         0,      0, 0xE3D6,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xE3D8,      0,      0,      0, 0x90B9,      0, /* 0x50 */
-    0xE3D9,      0, 0xE3DA,      0,      0,      0, 0x95B7, 0xE3DB, /* 0x50 */
-         0, 0x918F, 0xE3DC,      0,      0,      0,      0,      0, /* 0x60 */
-    0xE3DD,      0,      0,      0,      0,      0,      0, 0x97FC, /* 0x60 */
-    0xE3E0,      0, 0xE3DF, 0xE3DE, 0x92AE,      0, 0xE3E1, 0x9045, /* 0x70 */
-         0, 0xE3E2,      0,      0,      0, 0xE3E3, 0x9857, 0xE3E4, /* 0x70 */
-         0,      0,      0,      0, 0xE3E5, 0xE3E7, 0xE3E6, 0x94A3, /* 0x80 */
-         0, 0x93F7,      0, 0x985D, 0x94A7,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xE3E9,      0,      0, 0x8FD1,      0, /* 0x90 */
-    0x9549,      0, 0xE3EA, 0xE3E8,      0, 0x8ACC,      0,      0, /* 0x90 */
-         0, 0x8CD2, 0x8E88,      0,      0, 0x94EC,      0,      0, /* 0xA0 */
-         0, 0x8CA8, 0x9662,      0, 0xE3ED, 0xE3EB,      0, 0x8D6D, /* 0xA0 */
-         0, 0x8D6E, 0x88E7,      0, 0x8DE6,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x9478,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x88DD, 0xE3F2,      0, 0x925F,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x9477,      0, 0x91D9,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xE3F4,      0, /* 0xD0 */
-         0, 0xE3F0, 0xE3F3, 0xE3EE,      0, 0xE3F1, 0x9645,      0, /* 0xD0 */
-         0, 0x8CD3,      0,      0, 0x88FB, 0xE3EF,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE3F6, /* 0xE0 */
-         0, 0xE3F7,      0,      0, 0x93B7,      0,      0,      0, /* 0xF0 */
-    0x8BB9,      0,      0,      0, 0xE445, 0x945C                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x9773, 0x9856, 	 0, 0x8D6C, 0xE3CC, 0x8ED2, 0xE3CB, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xE3CD, 0x8EA7, 	 0, 	 0, 	 0, /* 0x00 */
+    0x91CF, 	 0, 0xE3CE, 	 0, 	 0, 0x8D6B, 	 0, 0x96D5, /* 0x10 */
+    0xE3CF, 0xE3D0, 	 0, 	 0, 0xE3D1, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xE3D2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xE3D3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x8EA8, 	 0, 	 0, 0x96EB, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xE3D5, 	 0, 0x925E, 	 0, 0xE3D4, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE3D7, 	 0, /* 0x40 */
+         0, 	 0, 0xE3D6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xE3D8, 	 0, 	 0, 	 0, 0x90B9, 	 0, /* 0x50 */
+    0xE3D9, 	 0, 0xE3DA, 	 0, 	 0, 	 0, 0x95B7, 0xE3DB, /* 0x50 */
+         0, 0x918F, 0xE3DC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xE3DD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x97FC, /* 0x60 */
+    0xE3E0, 	 0, 0xE3DF, 0xE3DE, 0x92AE, 	 0, 0xE3E1, 0x9045, /* 0x70 */
+         0, 0xE3E2, 	 0, 	 0, 	 0, 0xE3E3, 0x9857, 0xE3E4, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xE3E5, 0xE3E7, 0xE3E6, 0x94A3, /* 0x80 */
+         0, 0x93F7, 	 0, 0x985D, 0x94A7, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xE3E9, 	 0, 	 0, 0x8FD1, 	 0, /* 0x90 */
+    0x9549, 	 0, 0xE3EA, 0xE3E8, 	 0, 0x8ACC, 	 0, 	 0, /* 0x90 */
+         0, 0x8CD2, 0x8E88, 	 0, 	 0, 0x94EC, 	 0, 	 0, /* 0xA0 */
+         0, 0x8CA8, 0x9662, 	 0, 0xE3ED, 0xE3EB, 	 0, 0x8D6D, /* 0xA0 */
+         0, 0x8D6E, 0x88E7, 	 0, 0x8DE6, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x9478, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x88DD, 0xE3F2, 	 0, 0x925F, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x9477, 	 0, 0x91D9, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE3F4, 	 0, /* 0xD0 */
+         0, 0xE3F0, 0xE3F3, 0xE3EE, 	 0, 0xE3F1, 0x9645, 	 0, /* 0xD0 */
+         0, 0x8CD3, 	 0, 	 0, 0x88FB, 0xE3EF, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE3F6, /* 0xE0 */
+         0, 0xE3F7, 	 0, 	 0, 0x93B7, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x8BB9, 	 0, 	 0, 	 0, 0xE445, 0x945C					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_81[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x8E89,      0,      0, 0x8BBA, 0x90C6, 0x9865, /* 0x00 */
-    0x96AC, 0xE3F5, 0x90D2,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x8B72, 0xE3F8,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xE3FA,      0,      0,      0,      0, /* 0x20 */
-         0, 0xE3F9,      0,      0,      0,      0,      0, 0xE3FB, /* 0x20 */
-         0, 0x9245,      0, 0x945D,      0,      0,      0,      0, /* 0x30 */
-         0, 0x92AF,      0,      0,      0,      0, 0xE442,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xE441,      0, /* 0x40 */
-         0,      0,      0, 0xE3FC,      0,      0, 0x9074,      0, /* 0x40 */
-    0x9585, 0xE444,      0, 0xE443, 0x8D6F, 0x9872,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xE454, /* 0x50 */
-         0,      0,      0,      0,      0, 0xE448, 0xE449,      0, /* 0x60 */
-         0,      0,      0, 0x8EEE,      0,      0, 0xE447,      0, /* 0x60 */
-    0x8D98, 0xE446,      0,      0, 0xE44A,      0,      0,      0, /* 0x70 */
-    0x92B0, 0x95A0, 0x9142,      0,      0,      0,      0, 0x91DA, /* 0x70 */
-    0xE44E,      0, 0xE44F, 0xE44B,      0,      0,      0,      0, /* 0x80 */
-    0xE44C,      0, 0xE44D,      0,      0,      0,      0, 0x8D70, /* 0x80 */
-         0,      0,      0, 0xE455,      0, 0xE451,      0,      0, /* 0x90 */
-         0,      0, 0x9586,      0, 0x968C, 0x9547,      0,      0, /* 0x90 */
-    0xE450,      0,      0, 0xE453, 0xE452,      0,      0,      0, /* 0xA0 */
-    0x9663, 0xE456,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xE457,      0,      0, 0x9156,      0, 0xE458,      0,      0, /* 0xB0 */
-    0xE45A,      0, 0xE45E,      0,      0, 0xE45B, 0xE459, 0x945E, /* 0xB0 */
-    0xE45C,      0, 0xE45D,      0,      0,      0, 0x89B0,      0, /* 0xC0 */
-    0xE464, 0xE45F,      0,      0,      0, 0xE460,      0,      0, /* 0xC0 */
-         0, 0xE461,      0, 0x919F,      0,      0,      0,      0, /* 0xD0 */
-    0xE463, 0xE462, 0xE465,      0,      0,      0,      0, 0xE466, /* 0xD0 */
-    0xE467,      0,      0, 0x9062,      0, 0x89E7,      0, 0xE468, /* 0xE0 */
-    0x97D5,      0, 0x8EA9,      0,      0, 0x8F4C,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x8E8A, 0x9276,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xE469, 0xE46A, 0x8950,      0, 0xE46B          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x8E89, 	 0, 	 0, 0x8BBA, 0x90C6, 0x9865, /* 0x00 */
+    0x96AC, 0xE3F5, 0x90D2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x8B72, 0xE3F8, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xE3FA, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xE3F9, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE3FB, /* 0x20 */
+         0, 0x9245, 	 0, 0x945D, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x92AF, 	 0, 	 0, 	 0, 	 0, 0xE442, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE441, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xE3FC, 	 0, 	 0, 0x9074, 	 0, /* 0x40 */
+    0x9585, 0xE444, 	 0, 0xE443, 0x8D6F, 0x9872, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE454, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE448, 0xE449, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x8EEE, 	 0, 	 0, 0xE447, 	 0, /* 0x60 */
+    0x8D98, 0xE446, 	 0, 	 0, 0xE44A, 	 0, 	 0, 	 0, /* 0x70 */
+    0x92B0, 0x95A0, 0x9142, 	 0, 	 0, 	 0, 	 0, 0x91DA, /* 0x70 */
+    0xE44E, 	 0, 0xE44F, 0xE44B, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE44C, 	 0, 0xE44D, 	 0, 	 0, 	 0, 	 0, 0x8D70, /* 0x80 */
+         0, 	 0, 	 0, 0xE455, 	 0, 0xE451, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x9586, 	 0, 0x968C, 0x9547, 	 0, 	 0, /* 0x90 */
+    0xE450, 	 0, 	 0, 0xE453, 0xE452, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x9663, 0xE456, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xE457, 	 0, 	 0, 0x9156, 	 0, 0xE458, 	 0, 	 0, /* 0xB0 */
+    0xE45A, 	 0, 0xE45E, 	 0, 	 0, 0xE45B, 0xE459, 0x945E, /* 0xB0 */
+    0xE45C, 	 0, 0xE45D, 	 0, 	 0, 	 0, 0x89B0, 	 0, /* 0xC0 */
+    0xE464, 0xE45F, 	 0, 	 0, 	 0, 0xE460, 	 0, 	 0, /* 0xC0 */
+         0, 0xE461, 	 0, 0x919F, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE463, 0xE462, 0xE465, 	 0, 	 0, 	 0, 	 0, 0xE466, /* 0xD0 */
+    0xE467, 	 0, 	 0, 0x9062, 	 0, 0x89E7, 	 0, 0xE468, /* 0xE0 */
+    0x97D5, 	 0, 0x8EA9, 	 0, 	 0, 0x8F4C, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x8E8A, 0x9276, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xE469, 0xE46A, 0x8950, 	 0, 0xE46B			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_82[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE46C, 0xE46D,      0,      0, 0xE46E,      0, 0xE46F, /* 0x00 */
-    0x8BBB, 0x9DA8, 0xE470,      0, 0x90E3, 0xE471, 0x8EC9,      0, /* 0x00 */
-    0xE472,      0, 0x98AE,      0,      0,      0, 0xE473, 0x95DC, /* 0x10 */
-    0x8ADA,      0,      0, 0x9143, 0x8F77,      0, 0x9591, 0x8F4D, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xE474, 0x8D71, 0xE475, 0x94CA,      0, 0xE484,      0, /* 0x20 */
-         0,      0,      0, 0xE477,      0, 0x91C7, 0x9495, 0x8CBD, /* 0x30 */
-    0xE476, 0x9144,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xE478,      0,      0,      0,      0,      0,      0, 0x92F8, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xE47A, 0xE479, 0xE47C,      0,      0, 0xE47B,      0, 0xE47D, /* 0x50 */
-         0,      0, 0xE480,      0, 0xE47E,      0, 0x8ACD,      0, /* 0x60 */
-    0xE481,      0, 0xE482, 0xE483,      0,      0, 0x8DAF, 0x97C7, /* 0x60 */
-         0, 0xE485, 0x9046,      0,      0,      0, 0x8990, 0xE486, /* 0x70 */
-    0xE487,      0,      0,      0,      0,      0, 0xE488,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x88F0,      0, 0xE489,      0,      0, /* 0x80 */
-         0,      0, 0xE48A,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0x9587,      0,      0,      0, 0x8EC5,      0, 0xE48C, /* 0x90 */
-         0,      0,      0,      0,      0, 0x8A48, 0x88B0,      0, /* 0xA0 */
-         0,      0,      0, 0xE48B, 0xE48E, 0x946D,      0, 0x9063, /* 0xA0 */
-         0, 0x89D4,      0, 0x9646,      0,      0,      0,      0, /* 0xB0 */
-    0x8C7C, 0x8BDA,      0, 0xE48D,      0, 0x89E8,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x8AA1,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x8991, 0xE492, 0x97E8, 0x91DB,      0,      0, 0x9563, /* 0xD0 */
-         0, 0xE49E,      0, 0x89D5, 0xE49C,      0, 0xE49A, 0xE491, /* 0xD0 */
-         0, 0xE48F,      0, 0xE490,      0, 0x8EE1, 0x8BEA, 0x9297, /* 0xE0 */
-         0,      0,      0, 0x93CF,      0,      0,      0,      0, /* 0xE0 */
-         0, 0x8970,      0, 0xE494, 0xE493,      0,      0,      0, /* 0xF0 */
-         0, 0xE499, 0xE495, 0xE498                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE46C, 0xE46D, 	 0, 	 0, 0xE46E, 	 0, 0xE46F, /* 0x00 */
+    0x8BBB, 0x9DA8, 0xE470, 	 0, 0x90E3, 0xE471, 0x8EC9, 	 0, /* 0x00 */
+    0xE472, 	 0, 0x98AE, 	 0, 	 0, 	 0, 0xE473, 0x95DC, /* 0x10 */
+    0x8ADA, 	 0, 	 0, 0x9143, 0x8F77, 	 0, 0x9591, 0x8F4D, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xE474, 0x8D71, 0xE475, 0x94CA, 	 0, 0xE484, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xE477, 	 0, 0x91C7, 0x9495, 0x8CBD, /* 0x30 */
+    0xE476, 0x9144, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xE478, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x92F8, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xE47A, 0xE479, 0xE47C, 	 0, 	 0, 0xE47B, 	 0, 0xE47D, /* 0x50 */
+         0, 	 0, 0xE480, 	 0, 0xE47E, 	 0, 0x8ACD, 	 0, /* 0x60 */
+    0xE481, 	 0, 0xE482, 0xE483, 	 0, 	 0, 0x8DAF, 0x97C7, /* 0x60 */
+         0, 0xE485, 0x9046, 	 0, 	 0, 	 0, 0x8990, 0xE486, /* 0x70 */
+    0xE487, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE488, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x88F0, 	 0, 0xE489, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE48A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x9587, 	 0, 	 0, 	 0, 0x8EC5, 	 0, 0xE48C, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x8A48, 0x88B0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xE48B, 0xE48E, 0x946D, 	 0, 0x9063, /* 0xA0 */
+         0, 0x89D4, 	 0, 0x9646, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x8C7C, 0x8BDA, 	 0, 0xE48D, 	 0, 0x89E8, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x8AA1, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x8991, 0xE492, 0x97E8, 0x91DB, 	 0, 	 0, 0x9563, /* 0xD0 */
+         0, 0xE49E, 	 0, 0x89D5, 0xE49C, 	 0, 0xE49A, 0xE491, /* 0xD0 */
+         0, 0xE48F, 	 0, 0xE490, 	 0, 0x8EE1, 0x8BEA, 0x9297, /* 0xE0 */
+         0, 	 0, 	 0, 0x93CF, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x8970, 	 0, 0xE494, 0xE493, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xE499, 0xE495, 0xE498									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_83[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xFB93, 0x96CE, 0xE497, 0x89D6, 0x8A9D, 0xE49B,      0, /* 0x00 */
-         0, 0xE49D,      0,      0,      0,      0, 0x8C73,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xE4A1, 0xE4AA, /* 0x10 */
-    0xE4AB,      0,      0,      0, 0x88A9,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xE4B2,      0,      0,      0,      0, /* 0x20 */
-    0x88EF,      0,      0, 0xE4A9,      0,      0,      0, 0xE4A8, /* 0x20 */
-         0, 0xE4A3, 0xE4A2,      0, 0xE4A0, 0xE49F, 0x9283,      0, /* 0x30 */
-    0x91F9, 0xE4A5,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xE4A4,      0,      0,      0,      0, 0xE4A7,      0,      0, /* 0x40 */
-         0, 0x9190, 0x8C74,      0,      0,      0,      0, 0x8960, /* 0x40 */
-    0xE4A6,      0, 0x8D72,      0,      0,      0,      0,      0, /* 0x50 */
-    0x9191,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xFB94,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xE4B8,      0, 0xE4B9,      0, 0x89D7, /* 0x70 */
-         0,      0,      0, 0x89AC, 0xE4B6,      0,      0, 0xFB95, /* 0x70 */
-         0,      0,      0,      0,      0, 0xE4AC,      0, 0xE4B4, /* 0x80 */
-         0, 0xE4BB, 0xE4B5,      0,      0,      0, 0xE4B3,      0, /* 0x80 */
-         0,      0,      0, 0xE496,      0,      0, 0xE4B1,      0, /* 0x90 */
-         0,      0, 0xE4AD,      0,      0,      0, 0x8ACE, 0xE4AF, /* 0x90 */
-    0xE4BA,      0, 0xE4B0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xE4BC,      0, 0xE4AE, 0x949C,      0,      0,      0,      0, /* 0xA0 */
-         0, 0x9789,      0,      0,      0, 0xE4B7,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xE4CD,      0,      0, /* 0xB0 */
-         0, 0xE4C5,      0,      0,      0, 0x909B,      0, 0xFB96, /* 0xC0 */
-         0,      0, 0x8B65,      0, 0x8BDB,      0, 0xE4C0,      0, /* 0xC0 */
-         0,      0,      0, 0x89D9,      0,      0, 0x8FD2,      0, /* 0xD0 */
-    0xE4C3,      0,      0,      0, 0x8DD8,      0,      0, 0x9370, /* 0xD0 */
-    0xE4C8,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0x95EC,      0, 0xE4BF,      0,      0,      0, 0x89D8, /* 0xE0 */
-    0x8CD4, 0x9548, 0xE4C9,      0, 0xE4BD,      0, 0xFB97, 0xE4C6, /* 0xF0 */
-         0,      0,      0, 0xE4D0,      0, 0xE4C1                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xFB93, 0x96CE, 0xE497, 0x89D6, 0x8A9D, 0xE49B, 	 0, /* 0x00 */
+         0, 0xE49D, 	 0, 	 0, 	 0, 	 0, 0x8C73, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4A1, 0xE4AA, /* 0x10 */
+    0xE4AB, 	 0, 	 0, 	 0, 0x88A9, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xE4B2, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x88EF, 	 0, 	 0, 0xE4A9, 	 0, 	 0, 	 0, 0xE4A8, /* 0x20 */
+         0, 0xE4A3, 0xE4A2, 	 0, 0xE4A0, 0xE49F, 0x9283, 	 0, /* 0x30 */
+    0x91F9, 0xE4A5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xE4A4, 	 0, 	 0, 	 0, 	 0, 0xE4A7, 	 0, 	 0, /* 0x40 */
+         0, 0x9190, 0x8C74, 	 0, 	 0, 	 0, 	 0, 0x8960, /* 0x40 */
+    0xE4A6, 	 0, 0x8D72, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x9191, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xFB94, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xE4B8, 	 0, 0xE4B9, 	 0, 0x89D7, /* 0x70 */
+         0, 	 0, 	 0, 0x89AC, 0xE4B6, 	 0, 	 0, 0xFB95, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE4AC, 	 0, 0xE4B4, /* 0x80 */
+         0, 0xE4BB, 0xE4B5, 	 0, 	 0, 	 0, 0xE4B3, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xE496, 	 0, 	 0, 0xE4B1, 	 0, /* 0x90 */
+         0, 	 0, 0xE4AD, 	 0, 	 0, 	 0, 0x8ACE, 0xE4AF, /* 0x90 */
+    0xE4BA, 	 0, 0xE4B0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xE4BC, 	 0, 0xE4AE, 0x949C, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x9789, 	 0, 	 0, 	 0, 0xE4B7, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE4CD, 	 0, 	 0, /* 0xB0 */
+         0, 0xE4C5, 	 0, 	 0, 	 0, 0x909B, 	 0, 0xFB96, /* 0xC0 */
+         0, 	 0, 0x8B65, 	 0, 0x8BDB, 	 0, 0xE4C0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x89D9, 	 0, 	 0, 0x8FD2, 	 0, /* 0xD0 */
+    0xE4C3, 	 0, 	 0, 	 0, 0x8DD8, 	 0, 	 0, 0x9370, /* 0xD0 */
+    0xE4C8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x95EC, 	 0, 0xE4BF, 	 0, 	 0, 	 0, 0x89D8, /* 0xE0 */
+    0x8CD4, 0x9548, 0xE4C9, 	 0, 0xE4BD, 	 0, 0xFB97, 0xE4C6, /* 0xF0 */
+         0, 	 0, 	 0, 0xE4D0, 	 0, 0xE4C1					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_84[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xE4C2, 0x93B8,      0,      0, 0xE4C7, /* 0x00 */
-         0,      0,      0, 0xE4C4, 0x9647, 0xE4CA, 0x88DE,      0, /* 0x00 */
-         0,      0,      0, 0xE4BE,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xE4CC,      0, 0xE4CB,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0x948B, 0xE4D2,      0, 0xE4DD,      0,      0,      0, /* 0x20 */
-         0, 0x8A9E,      0,      0,      0, 0xE4E0,      0,      0, /* 0x30 */
-    0xE4CE,      0,      0,      0, 0xE4D3, 0x978E,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xE4DC,      0, /* 0x40 */
-    0xFB98, 0x9774,      0,      0,      0,      0, 0x97A8,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0x9298, /* 0x50 */
-         0,      0,      0, 0x8A8B,      0,      0,      0,      0, /* 0x50 */
-         0, 0x9592, 0xE4E2, 0x939F,      0,      0, 0x88AF,      0, /* 0x60 */
-         0, 0xE4DB,      0, 0xE4D7, 0x9192, 0xE4D1, 0xE4D9, 0xE4DE, /* 0x60 */
-         0, 0x944B,      0,      0,      0, 0x88A8,      0, 0xE4D6, /* 0x70 */
-         0, 0xE4DF, 0x9598,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xE4DA,      0, 0xE4D5,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x8FD3,      0,      0,      0,      0, /* 0x80 */
-    0x8F4E,      0,      0,      0, 0x8EAA,      0,      0,      0, /* 0x90 */
-         0, 0x96D6,      0,      0, 0x9566,      0,      0, 0xE4E5, /* 0x90 */
-         0, 0xE4EE,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xE4D8,      0,      0, /* 0xA0 */
-         0,      0, 0x8A97,      0, 0xFB99,      0,      0,      0, /* 0xB0 */
-    0x8FF6, 0xE4E3,      0, 0xE4E8, 0x9193,      0,      0, 0xE4E4, /* 0xB0 */
-         0, 0xE4EB,      0,      0, 0x927E,      0, 0xE4EC,      0, /* 0xC0 */
-         0, 0x9775, 0xE4E1, 0x8A57,      0, 0xE4E7,      0,      0, /* 0xC0 */
-    0xE4EA, 0x96AA,      0,      0,      0,      0, 0xE4ED,      0, /* 0xD0 */
-         0, 0xE4E6, 0xE4E9,      0, 0xFA60,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0x9648,      0, 0x9840,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xE4F1,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0, 0xE4F8,      0,      0, 0xE4F0  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xE4C2, 0x93B8, 	 0, 	 0, 0xE4C7, /* 0x00 */
+         0, 	 0, 	 0, 0xE4C4, 0x9647, 0xE4CA, 0x88DE, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xE4BE, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xE4CC, 	 0, 0xE4CB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x948B, 0xE4D2, 	 0, 0xE4DD, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x8A9E, 	 0, 	 0, 	 0, 0xE4E0, 	 0, 	 0, /* 0x30 */
+    0xE4CE, 	 0, 	 0, 	 0, 0xE4D3, 0x978E, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4DC, 	 0, /* 0x40 */
+    0xFB98, 0x9774, 	 0, 	 0, 	 0, 	 0, 0x97A8, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9298, /* 0x50 */
+         0, 	 0, 	 0, 0x8A8B, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x9592, 0xE4E2, 0x939F, 	 0, 	 0, 0x88AF, 	 0, /* 0x60 */
+         0, 0xE4DB, 	 0, 0xE4D7, 0x9192, 0xE4D1, 0xE4D9, 0xE4DE, /* 0x60 */
+         0, 0x944B, 	 0, 	 0, 	 0, 0x88A8, 	 0, 0xE4D6, /* 0x70 */
+         0, 0xE4DF, 0x9598, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xE4DA, 	 0, 0xE4D5, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x8FD3, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x8F4E, 	 0, 	 0, 	 0, 0x8EAA, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x96D6, 	 0, 	 0, 0x9566, 	 0, 	 0, 0xE4E5, /* 0x90 */
+         0, 0xE4EE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE4D8, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x8A97, 	 0, 0xFB99, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x8FF6, 0xE4E3, 	 0, 0xE4E8, 0x9193, 	 0, 	 0, 0xE4E4, /* 0xB0 */
+         0, 0xE4EB, 	 0, 	 0, 0x927E, 	 0, 0xE4EC, 	 0, /* 0xC0 */
+         0, 0x9775, 0xE4E1, 0x8A57, 	 0, 0xE4E7, 	 0, 	 0, /* 0xC0 */
+    0xE4EA, 0x96AA, 	 0, 	 0, 	 0, 	 0, 0xE4ED, 	 0, /* 0xD0 */
+         0, 0xE4E6, 0xE4E9, 	 0, 0xFA60, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x9648, 	 0, 0x9840, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xE4F1, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xE4F8, 	 0, 	 0, 0xE4F0	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_85[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x8EC1,      0,      0,      0,      0,      0, 0xE4CF,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0x95CC,      0, 0x96A0, 0xE4F7, 0xE4F6,      0, 0xE4F2, /* 0x10 */
-    0xE4F3,      0, 0x8955,      0,      0,      0,      0, 0xE4F5, /* 0x10 */
-         0, 0xE4EF,      0,      0,      0,      0, 0x92D3,      0, /* 0x20 */
-         0,      0,      0,      0, 0xE4F4, 0x88FC,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0x91A0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0x95C1,      0,      0, /* 0x30 */
-    0xE4F9, 0xE540,      0, 0x94D7,      0,      0,      0,      0, /* 0x40 */
-    0xE4FC, 0x8FD4, 0x8EC7, 0xE542,      0,      0, 0x8BBC,      0, /* 0x40 */
-         0,      0,      0, 0xFB9A,      0, 0xE543,      0, 0x9599, /* 0x50 */
-    0xE4FB, 0xFB9B, 0xE4D4,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xE4FA,      0,      0,      0,      0, /* 0x60 */
-    0x986E, 0x93A0, 0x9593, 0xFB9C,      0, 0xE54A,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0xE550, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xE551,      0, /* 0x70 */
-    0xE544,      0,      0,      0, 0x9496,      0,      0, 0xE54E, /* 0x80 */
-    0xE546,      0, 0xE548,      0,      0,      0,      0,      0, /* 0x80 */
-    0xE552, 0xE547,      0,      0, 0xE54B,      0,      0, 0x8992, /* 0x90 */
-         0, 0x93E3,      0, 0xE54C, 0xE54F,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xE545,      0, 0x9145,      0, /* 0xA0 */
-    0xE549, 0x8E46, 0x9064, 0x8C4F, 0x96F2,      0, 0x96F7, 0x8F92, /* 0xA0 */
-    0xFB9E,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE556, 0xE554,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x986D,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xE553,      0,      0,      0, 0x9795,      0, 0xE555, /* 0xC0 */
-    0xE557,      0,      0,      0,      0, 0xE558,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xE55B, 0xE559,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x93A1, 0xE55A,      0,      0, /* 0xE0 */
-         0, 0x94CB, 0xE54D,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0x8F93, /* 0xF0 */
-         0, 0xE55C, 0xE561, 0x9194,      0,      0, 0xE560          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x8EC1, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4CF, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x95CC, 	 0, 0x96A0, 0xE4F7, 0xE4F6, 	 0, 0xE4F2, /* 0x10 */
+    0xE4F3, 	 0, 0x8955, 	 0, 	 0, 	 0, 	 0, 0xE4F5, /* 0x10 */
+         0, 0xE4EF, 	 0, 	 0, 	 0, 	 0, 0x92D3, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xE4F4, 0x88FC, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x91A0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x95C1, 	 0, 	 0, /* 0x30 */
+    0xE4F9, 0xE540, 	 0, 0x94D7, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xE4FC, 0x8FD4, 0x8EC7, 0xE542, 	 0, 	 0, 0x8BBC, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xFB9A, 	 0, 0xE543, 	 0, 0x9599, /* 0x50 */
+    0xE4FB, 0xFB9B, 0xE4D4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xE4FA, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x986E, 0x93A0, 0x9593, 0xFB9C, 	 0, 0xE54A, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE550, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE551, 	 0, /* 0x70 */
+    0xE544, 	 0, 	 0, 	 0, 0x9496, 	 0, 	 0, 0xE54E, /* 0x80 */
+    0xE546, 	 0, 0xE548, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE552, 0xE547, 	 0, 	 0, 0xE54B, 	 0, 	 0, 0x8992, /* 0x90 */
+         0, 0x93E3, 	 0, 0xE54C, 0xE54F, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xE545, 	 0, 0x9145, 	 0, /* 0xA0 */
+    0xE549, 0x8E46, 0x9064, 0x8C4F, 0x96F2, 	 0, 0x96F7, 0x8F92, /* 0xA0 */
+    0xFB9E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE556, 0xE554, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x986D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xE553, 	 0, 	 0, 	 0, 0x9795, 	 0, 0xE555, /* 0xC0 */
+    0xE557, 	 0, 	 0, 	 0, 	 0, 0xE558, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xE55B, 0xE559, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x93A1, 0xE55A, 	 0, 	 0, /* 0xE0 */
+         0, 0x94CB, 0xE54D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8F93, /* 0xF0 */
+         0, 0xE55C, 0xE561, 0x9194, 	 0, 	 0, 0xE560			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_86[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xE541,      0,      0,      0, 0xE562, 0x9168, /* 0x00 */
-         0,      0, 0xE55D, 0xE55F,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0xE55E,      0,      0, 0x9F50, 0x9F41, /* 0x10 */
-         0,      0, 0xE564,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0xE563,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0x9796,      0, 0xE1BA, /* 0x20 */
-    0xE565,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xE566, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xE567, 0x8CD5,      0, /* 0x40 */
-    0x8B73,      0,      0,      0, 0xE569, 0x997C,      0,      0, /* 0x50 */
-         0,      0, 0x8B95,      0, 0x97B8,      0, 0x8BF1, 0xE56A, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xE56B, /* 0x60 */
-         0,      0,      0, 0x928E,      0,      0,      0,      0, /* 0x60 */
-         0, 0xE56C,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x93F8,      0, 0x88B8,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0x89E1, 0xE571, 0xE572,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xE56D,      0, 0x8E5C,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xE56E, 0x9461,      0,      0,      0, /* 0xA0 */
-         0, 0xE56F, 0xE570, 0xE57A,      0,      0,      0, 0xE574, /* 0xA0 */
-    0xE577,      0,      0,      0,      0,      0, 0xE573,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xE575,      0, 0xE576, 0x8ED6, /* 0xC0 */
-         0, 0xE578,      0, 0x9260,      0, 0x8C75, 0x8A61,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xE57B,      0,      0,      0, /* 0xD0 */
-         0, 0x8A5E,      0, 0xE581,      0,      0, 0xE57C, 0xE580, /* 0xD0 */
-         0,      0,      0,      0, 0x94B8,      0,      0,      0, /* 0xE0 */
-         0, 0xE57D,      0,      0, 0xE57E, 0x9567, 0x94D8, 0xE582, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0x91FB, 0xE58C,      0, 0xE588,      0,      0, 0x89E9          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xE541, 	 0, 	 0, 	 0, 0xE562, 0x9168, /* 0x00 */
+         0, 	 0, 0xE55D, 0xE55F, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xE55E, 	 0, 	 0, 0x9F50, 0x9F41, /* 0x10 */
+         0, 	 0, 0xE564, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xE563, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9796, 	 0, 0xE1BA, /* 0x20 */
+    0xE565, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE566, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE567, 0x8CD5, 	 0, /* 0x40 */
+    0x8B73, 	 0, 	 0, 	 0, 0xE569, 0x997C, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x8B95, 	 0, 0x97B8, 	 0, 0x8BF1, 0xE56A, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE56B, /* 0x60 */
+         0, 	 0, 	 0, 0x928E, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xE56C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x93F8, 	 0, 0x88B8, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x89E1, 0xE571, 0xE572, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xE56D, 	 0, 0x8E5C, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xE56E, 0x9461, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xE56F, 0xE570, 0xE57A, 	 0, 	 0, 	 0, 0xE574, /* 0xA0 */
+    0xE577, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE573, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xE575, 	 0, 0xE576, 0x8ED6, /* 0xC0 */
+         0, 0xE578, 	 0, 0x9260, 	 0, 0x8C75, 0x8A61, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xE57B, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x8A5E, 	 0, 0xE581, 	 0, 	 0, 0xE57C, 0xE580, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x94B8, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xE57D, 	 0, 	 0, 0xE57E, 0x9567, 0x94D8, 0xE582, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x91FB, 0xE58C, 	 0, 0xE588, 	 0, 	 0, 0x89E9			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_87[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE586,      0, 0x9649, 0xE587,      0,      0, 0xE584,      0, /* 0x00 */
-    0xE585, 0xE58A, 0xE58D,      0,      0, 0xE58B,      0,      0, /* 0x00 */
-         0, 0xE589, 0xE583,      0,      0,      0,      0,      0, /* 0x10 */
-    0x9277,      0, 0xE594,      0, 0x96A8,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xE592,      0,      0, /* 0x20 */
-         0, 0xE593,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xE58E,      0,      0, 0xE590, /* 0x30 */
-         0,      0,      0, 0xE591,      0,      0,      0, 0xE58F, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0x90E4,      0, 0x9858, 0xE598,      0, 0xE599,      0, /* 0x40 */
-         0,      0,      0, 0xE59F,      0, 0x9049,      0, 0xE59B, /* 0x50 */
-         0, 0xE59E,      0,      0,      0,      0,      0, 0xE596, /* 0x50 */
-    0xE595,      0,      0, 0xE5A0,      0,      0, 0x89DA,      0, /* 0x60 */
-    0xE59C,      0, 0xE5A1,      0,      0,      0, 0xE59D,      0, /* 0x60 */
-         0,      0,      0,      0, 0xE59A,      0, 0x92B1,      0, /* 0x70 */
-    0xE597,      0,      0,      0,      0,      0,      0, 0x9488, /* 0x70 */
-         0,      0, 0xE5A5,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x975A,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xE5A4, /* 0x90 */
-         0,      0, 0xE5A3,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xE5AC,      0,      0,      0, 0xE5A6, /* 0xA0 */
-         0,      0,      0, 0xE5AE,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x9786, 0xE5B1,      0, 0xE5A8,      0,      0, /* 0xB0 */
-    0xE5A9,      0,      0,      0, 0xE5AD,      0, 0xE5B0, 0xE5AF, /* 0xC0 */
-         0,      0,      0, 0xE5A7,      0,      0,      0,      0, /* 0xC0 */
-    0xE5AA,      0, 0xE5BB,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xE5B4,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE5B2, /* 0xE0 */
-         0,      0, 0xE5B3,      0,      0,      0, 0xE5B8, 0xE5B9, /* 0xF0 */
-         0, 0x8A49,      0, 0x8B61,      0,      0, 0xE5B7          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE586, 	 0, 0x9649, 0xE587, 	 0, 	 0, 0xE584, 	 0, /* 0x00 */
+    0xE585, 0xE58A, 0xE58D, 	 0, 	 0, 0xE58B, 	 0, 	 0, /* 0x00 */
+         0, 0xE589, 0xE583, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x9277, 	 0, 0xE594, 	 0, 0x96A8, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE592, 	 0, 	 0, /* 0x20 */
+         0, 0xE593, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xE58E, 	 0, 	 0, 0xE590, /* 0x30 */
+         0, 	 0, 	 0, 0xE591, 	 0, 	 0, 	 0, 0xE58F, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x90E4, 	 0, 0x9858, 0xE598, 	 0, 0xE599, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xE59F, 	 0, 0x9049, 	 0, 0xE59B, /* 0x50 */
+         0, 0xE59E, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE596, /* 0x50 */
+    0xE595, 	 0, 	 0, 0xE5A0, 	 0, 	 0, 0x89DA, 	 0, /* 0x60 */
+    0xE59C, 	 0, 0xE5A1, 	 0, 	 0, 	 0, 0xE59D, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xE59A, 	 0, 0x92B1, 	 0, /* 0x70 */
+    0xE597, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9488, /* 0x70 */
+         0, 	 0, 0xE5A5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x975A, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5A4, /* 0x90 */
+         0, 	 0, 0xE5A3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xE5AC, 	 0, 	 0, 	 0, 0xE5A6, /* 0xA0 */
+         0, 	 0, 	 0, 0xE5AE, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x9786, 0xE5B1, 	 0, 0xE5A8, 	 0, 	 0, /* 0xB0 */
+    0xE5A9, 	 0, 	 0, 	 0, 0xE5AD, 	 0, 0xE5B0, 0xE5AF, /* 0xC0 */
+         0, 	 0, 	 0, 0xE5A7, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xE5AA, 	 0, 0xE5BB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE5B4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5B2, /* 0xE0 */
+         0, 	 0, 0xE5B3, 	 0, 	 0, 	 0, 0xE5B8, 0xE5B9, /* 0xF0 */
+         0, 0x8A49, 	 0, 0x8B61, 	 0, 	 0, 0xE5B7			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_88[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xE5A2,      0, 0xFBA1, /* 0x00 */
-         0,      0,      0,      0,      0, 0xE5B6, 0xE5BA, 0xE5B5, /* 0x00 */
-         0, 0xE5BC,      0,      0,      0, 0xE5BE, 0xE5BD,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xE5C0, 0xE5BF, 0xE579,      0,      0,      0, 0xE5C4, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xE5C1,      0,      0,      0,      0, 0xE5C2,      0, /* 0x30 */
-         0, 0xE5C3,      0, 0xE5C5,      0,      0,      0,      0, /* 0x30 */
-    0x8C8C,      0, 0xE5C7,      0, 0xE5C6,      0, 0x8F4F,      0, /* 0x40 */
-         0,      0,      0,      0, 0x8D73, 0x9FA5,      0,      0, /* 0x40 */
-         0,      0, 0xE5C8, 0x8F70,      0,      0,      0, 0x8A58, /* 0x50 */
-         0, 0xE5C9,      0, 0x8971,      0, 0x8FD5, 0xE5CA,      0, /* 0x50 */
-         0, 0x8D74, 0xE5CB, 0x88DF,      0,      0,      0,      0, /* 0x60 */
-    0x955C,      0,      0, 0xE5CC,      0,      0,      0,      0, /* 0x60 */
-    0x908A,      0, 0xE5D3,      0,      0, 0xE5D0,      0, 0x928F, /* 0x70 */
-         0,      0,      0,      0,      0, 0xE5D1, 0xE5CE, 0x8BDC, /* 0x70 */
-         0, 0xE5CD, 0xE5D4,      0,      0,      0,      0,      0, /* 0x80 */
-    0x8C55,      0,      0, 0x91DC,      0, 0xE5DA,      0,      0, /* 0x80 */
-         0,      0, 0xE5D6,      0,      0,      0, 0x91B3, 0xE5D5, /* 0x90 */
-         0, 0xE5D8,      0,      0,      0,      0, 0xE5CF,      0, /* 0x90 */
-         0,      0, 0xE5D9,      0, 0xE5DB,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x94ED,      0,      0, 0xE5D7,      0, /* 0xA0 */
-    0xE5DC, 0xE5DE,      0,      0, 0x8CD1, 0xE5D2,      0, 0x88BF, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE5DD, /* 0xB0 */
-         0, 0x8DD9, 0x97F4, 0xE5DF, 0xE5E0, 0x9195,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0x97A0, /* 0xC0 */
-         0,      0,      0,      0, 0xE5E1, 0x9754,      0,      0, /* 0xD0 */
-    0xE5E2, 0xE5E3,      0,      0, 0x95E2, 0xE5E4,      0, 0x8DBE, /* 0xD0 */
-         0, 0x97A1,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xE5E9,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0xE5EA, 0x8FD6, 0xE5E8, 0xFBA2,      0,      0, /* 0xF0 */
-    0x9787, 0xE5E5,      0,      0, 0xE5E7, 0x90BB, 0x909E          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xE5A2, 	 0, 0xFBA1, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE5B6, 0xE5BA, 0xE5B5, /* 0x00 */
+         0, 0xE5BC, 	 0, 	 0, 	 0, 0xE5BE, 0xE5BD, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xE5C0, 0xE5BF, 0xE579, 	 0, 	 0, 	 0, 0xE5C4, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xE5C1, 	 0, 	 0, 	 0, 	 0, 0xE5C2, 	 0, /* 0x30 */
+         0, 0xE5C3, 	 0, 0xE5C5, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x8C8C, 	 0, 0xE5C7, 	 0, 0xE5C6, 	 0, 0x8F4F, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x8D73, 0x9FA5, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xE5C8, 0x8F70, 	 0, 	 0, 	 0, 0x8A58, /* 0x50 */
+         0, 0xE5C9, 	 0, 0x8971, 	 0, 0x8FD5, 0xE5CA, 	 0, /* 0x50 */
+         0, 0x8D74, 0xE5CB, 0x88DF, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x955C, 	 0, 	 0, 0xE5CC, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x908A, 	 0, 0xE5D3, 	 0, 	 0, 0xE5D0, 	 0, 0x928F, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE5D1, 0xE5CE, 0x8BDC, /* 0x70 */
+         0, 0xE5CD, 0xE5D4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x8C55, 	 0, 	 0, 0x91DC, 	 0, 0xE5DA, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE5D6, 	 0, 	 0, 	 0, 0x91B3, 0xE5D5, /* 0x90 */
+         0, 0xE5D8, 	 0, 	 0, 	 0, 	 0, 0xE5CF, 	 0, /* 0x90 */
+         0, 	 0, 0xE5D9, 	 0, 0xE5DB, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x94ED, 	 0, 	 0, 0xE5D7, 	 0, /* 0xA0 */
+    0xE5DC, 0xE5DE, 	 0, 	 0, 0x8CD1, 0xE5D2, 	 0, 0x88BF, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5DD, /* 0xB0 */
+         0, 0x8DD9, 0x97F4, 0xE5DF, 0xE5E0, 0x9195, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x97A0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xE5E1, 0x9754, 	 0, 	 0, /* 0xD0 */
+    0xE5E2, 0xE5E3, 	 0, 	 0, 0x95E2, 0xE5E4, 	 0, 0x8DBE, /* 0xD0 */
+         0, 0x97A1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE5E9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xE5EA, 0x8FD6, 0xE5E8, 0xFBA2, 	 0, 	 0, /* 0xF0 */
+    0x9787, 0xE5E5, 	 0, 	 0, 0xE5E7, 0x90BB, 0x909E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_89[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xE5E6,      0, 0xE5EB,      0,      0, 0x95A1, /* 0x00 */
-         0,      0, 0xE5ED,      0, 0xE5EC,      0,      0,      0, /* 0x00 */
-    0x8A8C,      0, 0x964A, 0xE5EE,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0xFA5D, 0xE5FA, 0xE5F0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xE5F1,      0,      0, /* 0x20 */
-         0,      0, 0xE5F2, 0xE5F3,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0xE5F7,      0, /* 0x30 */
-    0xE5F8,      0,      0, 0xE5F6,      0,      0,      0,      0, /* 0x30 */
-         0, 0xE5F4,      0, 0xE5EF, 0xE5F5,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xE5F9, 0xE8B5,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0x89A6,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xE5FC, 0x8BDD, /* 0x50 */
-    0xE5FB,      0,      0,      0, 0xE641,      0, 0xE640,      0, /* 0x60 */
-         0,      0, 0xE643,      0,      0, 0xE642,      0, 0xE644, /* 0x60 */
-         0,      0, 0x8F50,      0, 0xE645,      0,      0, 0xE646, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xE647, 0x90BC, /* 0x70 */
-         0, 0x9776,      0, 0xE648,      0,      0, 0x95A2, 0x9465, /* 0x80 */
-    0xE649,      0, 0xE64A, 0x8CA9,      0,      0,      0, 0x8B4B, /* 0x80 */
-         0,      0,      0, 0xE64B,      0,      0, 0x8E8B, 0x9460, /* 0x90 */
-    0xE64C,      0, 0x8A6F,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xE64D,      0,      0,      0,      0, 0xE64F, 0x9797, /* 0xA0 */
-         0, 0xE64E, 0x9065,      0, 0xE650,      0,      0, 0xE651, /* 0xA0 */
-         0,      0, 0xE652, 0x8ACF,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xE653,      0,      0, 0xE654,      0, 0xE655, /* 0xB0 */
-    0xE656,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x8A70,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xE657,      0, 0xE658, 0xE659,      0,      0, /* 0xD0 */
-         0,      0,      0, 0x89F0,      0,      0, 0x9047, 0xE65A, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xE65B,      0,      0,      0, /* 0xF0 */
-    0xE65C                                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xE5E6, 	 0, 0xE5EB, 	 0, 	 0, 0x95A1, /* 0x00 */
+         0, 	 0, 0xE5ED, 	 0, 0xE5EC, 	 0, 	 0, 	 0, /* 0x00 */
+    0x8A8C, 	 0, 0x964A, 0xE5EE, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xFA5D, 0xE5FA, 0xE5F0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE5F1, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xE5F2, 0xE5F3, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5F7, 	 0, /* 0x30 */
+    0xE5F8, 	 0, 	 0, 0xE5F6, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xE5F4, 	 0, 0xE5EF, 0xE5F5, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xE5F9, 0xE8B5, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x89A6, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5FC, 0x8BDD, /* 0x50 */
+    0xE5FB, 	 0, 	 0, 	 0, 0xE641, 	 0, 0xE640, 	 0, /* 0x60 */
+         0, 	 0, 0xE643, 	 0, 	 0, 0xE642, 	 0, 0xE644, /* 0x60 */
+         0, 	 0, 0x8F50, 	 0, 0xE645, 	 0, 	 0, 0xE646, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE647, 0x90BC, /* 0x70 */
+         0, 0x9776, 	 0, 0xE648, 	 0, 	 0, 0x95A2, 0x9465, /* 0x80 */
+    0xE649, 	 0, 0xE64A, 0x8CA9, 	 0, 	 0, 	 0, 0x8B4B, /* 0x80 */
+         0, 	 0, 	 0, 0xE64B, 	 0, 	 0, 0x8E8B, 0x9460, /* 0x90 */
+    0xE64C, 	 0, 0x8A6F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xE64D, 	 0, 	 0, 	 0, 	 0, 0xE64F, 0x9797, /* 0xA0 */
+         0, 0xE64E, 0x9065, 	 0, 0xE650, 	 0, 	 0, 0xE651, /* 0xA0 */
+         0, 	 0, 0xE652, 0x8ACF, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xE653, 	 0, 	 0, 0xE654, 	 0, 0xE655, /* 0xB0 */
+    0xE656, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x8A70, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xE657, 	 0, 0xE658, 0xE659, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x89F0, 	 0, 	 0, 0x9047, 0xE65A, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xE65B, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xE65C															/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_8A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x8CBE,      0, 0x92F9, 0xE65D,      0,      0,      0,      0, /* 0x00 */
-    0x8C76,      0, 0x9075,      0, 0xE660,      0, 0x93A2,      0, /* 0x00 */
-    0xE65F,      0, 0xFBA3, 0x8C50,      0,      0, 0xE65E, 0x91F5, /* 0x10 */
-    0x8B4C,      0,      0, 0xE661,      0, 0xE662,      0, 0x8FD7, /* 0x10 */
-         0,      0,      0, 0x8C8D,      0, 0xE663,      0,      0, /* 0x20 */
-         0,      0, 0x964B,      0,      0, 0x90DD,      0,      0, /* 0x20 */
-         0, 0x8B96,      0, 0x96F3, 0x9169,      0, 0xE664, 0xFBA4, /* 0x30 */
-         0,      0, 0x9066, 0x9290, 0x8FD8,      0,      0,      0, /* 0x30 */
-         0, 0xE665,      0,      0,      0,      0, 0xE668,      0, /* 0x40 */
-    0xE669,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0x8DBC, 0x91C0, 0xE667,      0, 0x8FD9, 0x955D,      0,      0, /* 0x50 */
-         0,      0,      0, 0xE666,      0,      0, 0x8E8C,      0, /* 0x50 */
-    0x8972,      0, 0xE66D, 0x8C77,      0,      0, 0x8E8E,      0, /* 0x60 */
-         0, 0x8E8D,      0, 0x986C, 0xE66C, 0xE66B, 0x9146,      0, /* 0x60 */
-    0x8B6C, 0x9862, 0x8A59, 0x8FDA,      0,      0,      0,      0, /* 0x70 */
-         0, 0xFBA5,      0,      0, 0xE66A,      0,      0,      0, /* 0x70 */
-         0,      0, 0xE66F,      0, 0xE670, 0xE66E,      0, 0x8CD6, /* 0x80 */
-         0, 0x975F,      0,      0, 0x8E8F, 0x9446,      0,      0, /* 0x80 */
-         0, 0xE673,      0, 0x90BE,      0, 0x9261,      0,      0, /* 0x90 */
-    0x9755,      0, 0xE676,      0,      0,      0, 0x8CEA,      0, /* 0x90 */
-    0x90BD, 0xE672,      0, 0xE677, 0x8CEB, 0xE674, 0xE675, 0xFBA6, /* 0xA0 */
-    0xE671,      0,      0,      0, 0x90E0, 0x93C7,      0,      0, /* 0xA0 */
-    0x924E,      0, 0x89DB,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x94EE,      0,      0, 0x8B62,      0, 0xFBA7, 0x92B2, /* 0xB0 */
-         0,      0, 0xE67A,      0, 0xE678,      0,      0, 0x926B, /* 0xC0 */
-         0,      0,      0, 0x90BF, 0x8AD0, 0xE679,      0, 0x907A, /* 0xC0 */
-         0,      0, 0x97C8,      0,      0,      0, 0x985F,      0, /* 0xD0 */
-         0,      0, 0xE67B, 0xE687, 0x92B3,      0, 0xE686, 0xFBA8, /* 0xD0 */
-    0xE683, 0xE68B, 0xE684,      0, 0xE680,      0, 0x92FA, 0xE67E, /* 0xE0 */
-         0,      0,      0, 0xE67C,      0, 0x9740, 0x8E90,      0, /* 0xE0 */
-         0, 0xE681,      0, 0xE67D,      0,      0, 0xFBAA, 0xE685, /* 0xF0 */
-    0x8F94,      0, 0x8CBF,      0,      0,      0, 0x91F8          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x8CBE, 	 0, 0x92F9, 0xE65D, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0x8C76, 	 0, 0x9075, 	 0, 0xE660, 	 0, 0x93A2, 	 0, /* 0x00 */
+    0xE65F, 	 0, 0xFBA3, 0x8C50, 	 0, 	 0, 0xE65E, 0x91F5, /* 0x10 */
+    0x8B4C, 	 0, 	 0, 0xE661, 	 0, 0xE662, 	 0, 0x8FD7, /* 0x10 */
+         0, 	 0, 	 0, 0x8C8D, 	 0, 0xE663, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x964B, 	 0, 	 0, 0x90DD, 	 0, 	 0, /* 0x20 */
+         0, 0x8B96, 	 0, 0x96F3, 0x9169, 	 0, 0xE664, 0xFBA4, /* 0x30 */
+         0, 	 0, 0x9066, 0x9290, 0x8FD8, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xE665, 	 0, 	 0, 	 0, 	 0, 0xE668, 	 0, /* 0x40 */
+    0xE669, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0x8DBC, 0x91C0, 0xE667, 	 0, 0x8FD9, 0x955D, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xE666, 	 0, 	 0, 0x8E8C, 	 0, /* 0x50 */
+    0x8972, 	 0, 0xE66D, 0x8C77, 	 0, 	 0, 0x8E8E, 	 0, /* 0x60 */
+         0, 0x8E8D, 	 0, 0x986C, 0xE66C, 0xE66B, 0x9146, 	 0, /* 0x60 */
+    0x8B6C, 0x9862, 0x8A59, 0x8FDA, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xFBA5, 	 0, 	 0, 0xE66A, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xE66F, 	 0, 0xE670, 0xE66E, 	 0, 0x8CD6, /* 0x80 */
+         0, 0x975F, 	 0, 	 0, 0x8E8F, 0x9446, 	 0, 	 0, /* 0x80 */
+         0, 0xE673, 	 0, 0x90BE, 	 0, 0x9261, 	 0, 	 0, /* 0x90 */
+    0x9755, 	 0, 0xE676, 	 0, 	 0, 	 0, 0x8CEA, 	 0, /* 0x90 */
+    0x90BD, 0xE672, 	 0, 0xE677, 0x8CEB, 0xE674, 0xE675, 0xFBA6, /* 0xA0 */
+    0xE671, 	 0, 	 0, 	 0, 0x90E0, 0x93C7, 	 0, 	 0, /* 0xA0 */
+    0x924E, 	 0, 0x89DB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x94EE, 	 0, 	 0, 0x8B62, 	 0, 0xFBA7, 0x92B2, /* 0xB0 */
+         0, 	 0, 0xE67A, 	 0, 0xE678, 	 0, 	 0, 0x926B, /* 0xC0 */
+         0, 	 0, 	 0, 0x90BF, 0x8AD0, 0xE679, 	 0, 0x907A, /* 0xC0 */
+         0, 	 0, 0x97C8, 	 0, 	 0, 	 0, 0x985F, 	 0, /* 0xD0 */
+         0, 	 0, 0xE67B, 0xE687, 0x92B3, 	 0, 0xE686, 0xFBA8, /* 0xD0 */
+    0xE683, 0xE68B, 0xE684, 	 0, 0xE680, 	 0, 0x92FA, 0xE67E, /* 0xE0 */
+         0, 	 0, 	 0, 0xE67C, 	 0, 0x9740, 0x8E90, 	 0, /* 0xE0 */
+         0, 0xE681, 	 0, 0xE67D, 	 0, 	 0, 0xFBAA, 0xE685, /* 0xF0 */
+    0x8F94, 	 0, 0x8CBF, 	 0, 	 0, 	 0, 0x91F8			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_8B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x9664, 0x8979, 0x88E0,      0, 0x93A3,      0,      0, 0xE689, /* 0x00 */
-         0,      0,      0,      0, 0xE688,      0, 0x93E4,      0, /* 0x00 */
-    0xE68D,      0,      0,      0, 0xE682,      0, 0xE68C, 0xE68E, /* 0x10 */
-         0, 0x8CAA, 0xE68A, 0x8D75,      0, 0x8ED3,      0,      0, /* 0x10 */
-    0xE68F, 0x9777,      0,      0,      0,      0, 0xE692,      0, /* 0x20 */
-    0xE695,      0,      0, 0xE693, 0x9554,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xE690,      0,      0,      0,      0, /* 0x30 */
-         0, 0x8BDE,      0,      0,      0,      0, 0xE694,      0, /* 0x30 */
-         0, 0xE696,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xE69A,      0,      0, 0xE697,      0, 0xE699, 0xE698, /* 0x40 */
-         0,      0,      0, 0xFBAB,      0,      0, 0xE69B,      0, /* 0x50 */
-    0x8EAF,      0, 0xE69D, 0xE69C, 0x9588,      0,      0, 0xE69F, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0x8C78,      0, /* 0x60 */
-         0,      0,      0, 0xE69E, 0xE6A0,      0,      0, 0xE6A1, /* 0x60 */
-    0x8B63, 0xE3BF, 0x8FF7,      0, 0xE6A2,      0,      0, 0x8CEC, /* 0x70 */
-         0,      0,      0,      0,      0, 0xE6A3,      0, 0xFBAC, /* 0x70 */
-    0xE6A4,      0,      0, 0x8E5D,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0x9DCC,      0, 0xE6A5,      0, 0xE6A6,      0, /* 0x80 */
-    0x8F51,      0, 0xE6A7, 0xE6A8,      0,      0, 0xE6A9,      0, /* 0x90 */
-         0, 0xE6AA, 0xE6AB                                          /* 0x90 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x9664, 0x8979, 0x88E0, 	 0, 0x93A3, 	 0, 	 0, 0xE689, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xE688, 	 0, 0x93E4, 	 0, /* 0x00 */
+    0xE68D, 	 0, 	 0, 	 0, 0xE682, 	 0, 0xE68C, 0xE68E, /* 0x10 */
+         0, 0x8CAA, 0xE68A, 0x8D75, 	 0, 0x8ED3, 	 0, 	 0, /* 0x10 */
+    0xE68F, 0x9777, 	 0, 	 0, 	 0, 	 0, 0xE692, 	 0, /* 0x20 */
+    0xE695, 	 0, 	 0, 0xE693, 0x9554, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xE690, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x8BDE, 	 0, 	 0, 	 0, 	 0, 0xE694, 	 0, /* 0x30 */
+         0, 0xE696, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xE69A, 	 0, 	 0, 0xE697, 	 0, 0xE699, 0xE698, /* 0x40 */
+         0, 	 0, 	 0, 0xFBAB, 	 0, 	 0, 0xE69B, 	 0, /* 0x50 */
+    0x8EAF, 	 0, 0xE69D, 0xE69C, 0x9588, 	 0, 	 0, 0xE69F, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8C78, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xE69E, 0xE6A0, 	 0, 	 0, 0xE6A1, /* 0x60 */
+    0x8B63, 0xE3BF, 0x8FF7, 	 0, 0xE6A2, 	 0, 	 0, 0x8CEC, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE6A3, 	 0, 0xFBAC, /* 0x70 */
+    0xE6A4, 	 0, 	 0, 0x8E5D, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x9DCC, 	 0, 0xE6A5, 	 0, 0xE6A6, 	 0, /* 0x80 */
+    0x8F51, 	 0, 0xE6A7, 0xE6A8, 	 0, 	 0, 0xE6A9, 	 0, /* 0x90 */
+         0, 0xE6AA, 0xE6AB											/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_8C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0x924A, /* 0x30 */
-         0,      0, 0xE6AC,      0,      0,      0,      0, 0xE6AE, /* 0x30 */
-         0, 0xE6AD,      0,      0,      0,      0, 0x93A4,      0, /* 0x40 */
-    0xE6AF,      0, 0x964C,      0, 0xE6B0,      0, 0xE6B1,      0, /* 0x40 */
-    0xE6B2,      0,      0,      0,      0, 0xE6B3,      0,      0, /* 0x50 */
-         0,      0, 0x93D8,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0x8FDB, 0xE6B4,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0x8D8B, 0x98AC, 0xE6B5,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xE6B6, 0x955E, 0xE6B7,      0, 0xE6BF,      0,      0,      0, /* 0x70 */
-         0,      0, 0xE6B8,      0,      0, 0xE6BA,      0,      0, /* 0x80 */
-         0, 0xE6B9, 0xE6BB,      0, 0x9665, 0xE6BC, 0xE6BD,      0, /* 0x80 */
-         0,      0,      0,      0, 0xE6BE,      0,      0,      0, /* 0x90 */
-    0xE6C0,      0,      0,      0,      0, 0x8A4C, 0x92E5,      0, /* 0x90 */
-    0x9589, 0x8DE0, 0x8D76,      0,      0,      0,      0, 0x956E, /* 0xA0 */
+         0, 	 0, 0xE6AC, 	 0, 	 0, 	 0, 	 0, 0xE6AE, /* 0x30 */
+         0, 0xE6AD, 	 0, 	 0, 	 0, 	 0, 0x93A4, 	 0, /* 0x40 */
+    0xE6AF, 	 0, 0x964C, 	 0, 0xE6B0, 	 0, 0xE6B1, 	 0, /* 0x40 */
+    0xE6B2, 	 0, 	 0, 	 0, 	 0, 0xE6B3, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x93D8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x8FDB, 0xE6B4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x8D8B, 0x98AC, 0xE6B5, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xE6B6, 0x955E, 0xE6B7, 	 0, 0xE6BF, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xE6B8, 	 0, 	 0, 0xE6BA, 	 0, 	 0, /* 0x80 */
+         0, 0xE6B9, 0xE6BB, 	 0, 0x9665, 0xE6BC, 0xE6BD, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xE6BE, 	 0, 	 0, 	 0, /* 0x90 */
+    0xE6C0, 	 0, 	 0, 	 0, 	 0, 0x8A4C, 0x92E5, 	 0, /* 0x90 */
+    0x9589, 0x8DE0, 0x8D76, 	 0, 	 0, 	 0, 	 0, 0x956E, /* 0xA0 */
     0x89DD, 0x94CC, 0xE6C3, 0x8AD1, 0x90D3, 0xE6C2, 0xE6C7, 0x9299, /* 0xA0 */
-    0x96E1,      0, 0xE6C5, 0xE6C6, 0x8B4D,      0, 0xE6C8, 0x9483, /* 0xB0 */
-    0x91DD,      0,      0, 0x94EF, 0x935C, 0xE6C4,      0, 0x9666, /* 0xB0 */
-    0x89EA, 0xE6CA, 0x9847, 0x92C0, 0x9864,      0,      0, 0x8E91, /* 0xC0 */
-    0xE6C9,      0, 0x91AF,      0,      0, 0xE6DA, 0x9147,      0, /* 0xC0 */
-         0, 0x93F6,      0, 0x956F,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xE6CD, 0x8E5E, 0x8E92,      0, 0x8FDC,      0, /* 0xD0 */
-    0x9485,      0, 0x8CAB, 0xE6CC, 0xE6CB,      0, 0x958A,      0, /* 0xE0 */
-         0,      0, 0x8EBF,      0,      0, 0x9371,      0,      0, /* 0xE0 */
-    0xFBAD,      0,      0,      0, 0xFBAE,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xE6CF, 0xE6D0, 0x8D77, 0xE6CE                  /* 0xF0 */
+    0x96E1, 	 0, 0xE6C5, 0xE6C6, 0x8B4D, 	 0, 0xE6C8, 0x9483, /* 0xB0 */
+    0x91DD, 	 0, 	 0, 0x94EF, 0x935C, 0xE6C4, 	 0, 0x9666, /* 0xB0 */
+    0x89EA, 0xE6CA, 0x9847, 0x92C0, 0x9864, 	 0, 	 0, 0x8E91, /* 0xC0 */
+    0xE6C9, 	 0, 0x91AF, 	 0, 	 0, 0xE6DA, 0x9147, 	 0, /* 0xC0 */
+         0, 0x93F6, 	 0, 0x956F, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xE6CD, 0x8E5E, 0x8E92, 	 0, 0x8FDC, 	 0, /* 0xD0 */
+    0x9485, 	 0, 0x8CAB, 0xE6CC, 0xE6CB, 	 0, 0x958A, 	 0, /* 0xE0 */
+         0, 	 0, 0x8EBF, 	 0, 	 0, 0x9371, 	 0, 	 0, /* 0xE0 */
+    0xFBAD, 	 0, 	 0, 	 0, 0xFBAE, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xE6CF, 0xE6D0, 0x8D77, 0xE6CE					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_8D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xE6D1, 0xE6D2,      0, 0xE6D4, /* 0x00 */
-    0x91A1,      0, 0xE6D3, 0x8AE4,      0, 0xE6D6,      0, 0xE6D5, /* 0x00 */
-    0xE6D7,      0, 0xFBAF, 0xE6D9, 0xE6DB,      0, 0xE6DC,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0x90D4,      0, 0x8ECD, 0xE6DD, /* 0x60 */
-         0,      0,      0, 0x8A71,      0, 0xE6DE,      0,      0, /* 0x60 */
-    0x9196, 0xE6DF,      0, 0xE6E0, 0x958B,      0, 0xFBB0, 0x8B4E, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xE6E1,      0,      0,      0, 0x92B4,      0,      0, /* 0x80 */
-         0,      0, 0x897A,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xE6E2,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0x8EEF,      0,      0,      0,      0, /* 0xA0 */
-    0x9096,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x91AB,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xE6E5,      0,      0,      0, 0xE6E4,      0, /* 0xB0 */
-         0,      0, 0xE6E3,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xE6EB, 0xE6E9,      0,      0, 0xE6E6, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xE6E8,      0, /* 0xD0 */
-         0,      0, 0xE6E7, 0xE6EA,      0, 0x8B97,      0, 0xE6EE, /* 0xD0 */
-         0, 0x90D5,      0, 0xE6EF,      0,      0,      0,      0, /* 0xE0 */
-    0x8CD7,      0, 0xE6EC, 0xE6ED,      0,      0,      0, 0x9848, /* 0xE0 */
-         0,      0,      0, 0x92B5,      0, 0x9148,      0,      0, /* 0xF0 */
-         0,      0,      0,      0, 0xE6F0,      0,      0, 0xE6F3  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xE6D1, 0xE6D2, 	 0, 0xE6D4, /* 0x00 */
+    0x91A1, 	 0, 0xE6D3, 0x8AE4, 	 0, 0xE6D6, 	 0, 0xE6D5, /* 0x00 */
+    0xE6D7, 	 0, 0xFBAF, 0xE6D9, 0xE6DB, 	 0, 0xE6DC, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x90D4, 	 0, 0x8ECD, 0xE6DD, /* 0x60 */
+         0, 	 0, 	 0, 0x8A71, 	 0, 0xE6DE, 	 0, 	 0, /* 0x60 */
+    0x9196, 0xE6DF, 	 0, 0xE6E0, 0x958B, 	 0, 0xFBB0, 0x8B4E, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xE6E1, 	 0, 	 0, 	 0, 0x92B4, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x897A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xE6E2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x8EEF, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x9096, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x91AB, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xE6E5, 	 0, 	 0, 	 0, 0xE6E4, 	 0, /* 0xB0 */
+         0, 	 0, 0xE6E3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xE6EB, 0xE6E9, 	 0, 	 0, 0xE6E6, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6E8, 	 0, /* 0xD0 */
+         0, 	 0, 0xE6E7, 0xE6EA, 	 0, 0x8B97, 	 0, 0xE6EE, /* 0xD0 */
+         0, 0x90D5, 	 0, 0xE6EF, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x8CD7, 	 0, 0xE6EC, 0xE6ED, 	 0, 	 0, 	 0, 0x9848, /* 0xE0 */
+         0, 	 0, 	 0, 0x92B5, 	 0, 0x9148, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xE6F0, 	 0, 	 0, 0xE6F3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_8E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-    0xE6F1, 0xE6F2, 0x9778,      0,      0,      0,      0, 0x93A5, /* 0x00 */
-    0xE6F6,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xE6F4, 0xE6F5, 0xE6F7, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xE748,      0,      0,      0,      0,      0, /* 0x20 */
-    0xE6FA,      0,      0,      0, 0xE6FB, 0xE6F9,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xE6F8,      0, 0x92FB,      0,      0, 0xE740, /* 0x40 */
-    0xE744, 0xE741, 0xE6FC,      0, 0xE742,      0,      0,      0, /* 0x40 */
-    0xE743,      0,      0,      0,      0, 0xE74A,      0,      0, /* 0x50 */
-         0, 0xE745,      0,      0,      0,      0,      0, 0x90D6, /* 0x50 */
-    0xE747,      0,      0, 0xE749, 0xE746,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xE74C,      0, 0x8F52,      0, 0xE74B,      0, /* 0x70 */
-         0,      0,      0,      0, 0xE74D,      0,      0,      0, /* 0x70 */
-         0, 0xE74E,      0,      0, 0xE751, 0xE750,      0, 0xE74F, /* 0x80 */
-         0,      0, 0xE753, 0xE752,      0, 0x96F4,      0,      0, /* 0x80 */
-         0, 0xE755,      0, 0xE754, 0xE756,      0,      0,      0, /* 0x90 */
-         0, 0xE757,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xE759,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xE758, 0x9067, 0xE75A,      0,      0, 0x8BEB, /* 0xA0 */
-    0xE75B, 0xE75D,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xE75E,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xE75F, 0xE75C,      0, /* 0xC0 */
-    0xE760,      0, 0x8ED4, 0xE761, 0x8B4F, 0x8C52,      0, 0xFBB2, /* 0xC0 */
-         0,      0, 0x8CAC,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xE762,      0,      0,      0, 0x93EE, /* 0xD0 */
-         0,      0, 0x935D, 0xE763,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xE766,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0x8EB2,      0,      0, 0xE765, 0xE764, 0x8C79, 0xE767          /* 0xF0 */
+    0xE6F1, 0xE6F2, 0x9778, 	 0, 	 0, 	 0, 	 0, 0x93A5, /* 0x00 */
+    0xE6F6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE6F4, 0xE6F5, 0xE6F7, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xE748, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xE6FA, 	 0, 	 0, 	 0, 0xE6FB, 0xE6F9, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xE6F8, 	 0, 0x92FB, 	 0, 	 0, 0xE740, /* 0x40 */
+    0xE744, 0xE741, 0xE6FC, 	 0, 0xE742, 	 0, 	 0, 	 0, /* 0x40 */
+    0xE743, 	 0, 	 0, 	 0, 	 0, 0xE74A, 	 0, 	 0, /* 0x50 */
+         0, 0xE745, 	 0, 	 0, 	 0, 	 0, 	 0, 0x90D6, /* 0x50 */
+    0xE747, 	 0, 	 0, 0xE749, 0xE746, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xE74C, 	 0, 0x8F52, 	 0, 0xE74B, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xE74D, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xE74E, 	 0, 	 0, 0xE751, 0xE750, 	 0, 0xE74F, /* 0x80 */
+         0, 	 0, 0xE753, 0xE752, 	 0, 0x96F4, 	 0, 	 0, /* 0x80 */
+         0, 0xE755, 	 0, 0xE754, 0xE756, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xE757, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xE759, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xE758, 0x9067, 0xE75A, 	 0, 	 0, 0x8BEB, /* 0xA0 */
+    0xE75B, 0xE75D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE75E, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE75F, 0xE75C, 	 0, /* 0xC0 */
+    0xE760, 	 0, 0x8ED4, 0xE761, 0x8B4F, 0x8C52, 	 0, 0xFBB2, /* 0xC0 */
+         0, 	 0, 0x8CAC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xE762, 	 0, 	 0, 	 0, 0x93EE, /* 0xD0 */
+         0, 	 0, 0x935D, 0xE763, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xE766, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x8EB2, 	 0, 	 0, 0xE765, 0xE764, 0x8C79, 0xE767			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_8F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0x8A72,      0, 0xE769,      0,      0, /* 0x00 */
-         0, 0x8DDA, 0xE768,      0, 0xE771,      0,      0,      0, /* 0x00 */
-         0,      0, 0xE76B, 0xE76D, 0x95E3, 0xE76A,      0,      0, /* 0x10 */
-         0, 0xE76C,      0, 0xE770, 0xE76E, 0x8B50,      0, 0xE76F, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xE772,      0, /* 0x20 */
-         0, 0x9479, 0x97D6,      0,      0,      0,      0, 0x8F53, /* 0x20 */
-         0,      0,      0, 0xE773,      0,      0,      0,      0, /* 0x30 */
-    0x9741, 0xE775,      0, 0xE774,      0,      0, 0xE778, 0x9760, /* 0x30 */
-         0,      0, 0xE777,      0, 0x8A8D, 0xE776, 0xE77B,      0, /* 0x40 */
-         0, 0xE77A,      0,      0, 0xE779, 0x9351, 0xE77C,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xE77D, /* 0x50 */
-         0,      0,      0,      0, 0xE77E,      0,      0, 0x8D8C, /* 0x50 */
-         0, 0x8C44, 0xE780, 0xE781, 0xE782,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0x9068, 0xE783,      0, 0x8EAB, 0xE784, /* 0x90 */
-         0,      0,      0, 0xE785,      0,      0,      0, 0x999F, /* 0xA0 */
-    0x999E,      0,      0,      0,      0, 0xE786, 0xE390, 0xE787, /* 0xA0 */
-    0x9243, 0x904A, 0x945F,      0,      0,      0,      0, 0xE788, /* 0xB0 */
-         0,      0, 0x95D3, 0x92D2, 0x8D9E,      0,      0, 0x9248, /* 0xB0 */
-         0,      0, 0x8949,      0, 0x9698, 0x9076,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0x8C7D,      0, /* 0xC0 */
-         0, 0x8BDF,      0,      0, 0x95D4,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xE789,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xE78B,      0,      0, 0xE78A, 0x89DE,      0, /* 0xE0 */
-         0, 0x93F4, 0xE78C, 0x9497,      0, 0x9352,      0, 0xE78D, /* 0xE0 */
-    0x8F71,      0,      0,      0, 0xE78F,      0,      0, 0x96C0, /* 0xF0 */
-    0xE79E, 0xE791, 0xE792,      0,      0, 0x92C7                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0x8A72, 	 0, 0xE769, 	 0, 	 0, /* 0x00 */
+         0, 0x8DDA, 0xE768, 	 0, 0xE771, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xE76B, 0xE76D, 0x95E3, 0xE76A, 	 0, 	 0, /* 0x10 */
+         0, 0xE76C, 	 0, 0xE770, 0xE76E, 0x8B50, 	 0, 0xE76F, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE772, 	 0, /* 0x20 */
+         0, 0x9479, 0x97D6, 	 0, 	 0, 	 0, 	 0, 0x8F53, /* 0x20 */
+         0, 	 0, 	 0, 0xE773, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x9741, 0xE775, 	 0, 0xE774, 	 0, 	 0, 0xE778, 0x9760, /* 0x30 */
+         0, 	 0, 0xE777, 	 0, 0x8A8D, 0xE776, 0xE77B, 	 0, /* 0x40 */
+         0, 0xE77A, 	 0, 	 0, 0xE779, 0x9351, 0xE77C, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE77D, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xE77E, 	 0, 	 0, 0x8D8C, /* 0x50 */
+         0, 0x8C44, 0xE780, 0xE781, 0xE782, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x9068, 0xE783, 	 0, 0x8EAB, 0xE784, /* 0x90 */
+         0, 	 0, 	 0, 0xE785, 	 0, 	 0, 	 0, 0x999F, /* 0xA0 */
+    0x999E, 	 0, 	 0, 	 0, 	 0, 0xE786, 0xE390, 0xE787, /* 0xA0 */
+    0x9243, 0x904A, 0x945F, 	 0, 	 0, 	 0, 	 0, 0xE788, /* 0xB0 */
+         0, 	 0, 0x95D3, 0x92D2, 0x8D9E, 	 0, 	 0, 0x9248, /* 0xB0 */
+         0, 	 0, 0x8949, 	 0, 0x9698, 0x9076, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8C7D, 	 0, /* 0xC0 */
+         0, 0x8BDF, 	 0, 	 0, 0x95D4, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xE789, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xE78B, 	 0, 	 0, 0xE78A, 0x89DE, 	 0, /* 0xE0 */
+         0, 0x93F4, 0xE78C, 0x9497, 	 0, 0x9352, 	 0, 0xE78D, /* 0xE0 */
+    0x8F71, 	 0, 	 0, 	 0, 0xE78F, 	 0, 	 0, 0x96C0, /* 0xF0 */
+    0xE79E, 0xE791, 0xE792, 	 0, 	 0, 0x92C7					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_90[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x91DE, 0x9197,      0, 0x93A6,      0, 0xE790, 0x8B74,      0, /* 0x00 */
-         0,      0,      0, 0xE799,      0, 0xE796, 0xE7A3, 0x93A7, /* 0x00 */
-    0x9280, 0xE793,      0, 0x92FC, 0x9372, 0xE794, 0xE798, 0x9080, /* 0x10 */
-         0, 0x9487, 0x92CA,      0,      0, 0x90C0, 0xE797, 0x91AC, /* 0x10 */
-    0x91A2, 0xE795, 0x88A7, 0x9841,      0,      0,      0, 0xE79A, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x91DF,      0, /* 0x20 */
-         0, 0x8F54, 0x9069,      0,      0, 0xE79C, 0xE79B,      0, /* 0x30 */
-    0x88ED, 0xE79D,      0,      0, 0x954E,      0, 0xE7A5,      0, /* 0x30 */
-         0, 0x93D9, 0x908B,      0,      0, 0x9278,      0, 0x8BF6, /* 0x40 */
-         0, 0xE7A4, 0x9756, 0x895E,      0, 0x95D5, 0x89DF, 0xE79F, /* 0x40 */
-    0xE7A0, 0xE7A1, 0xE7A2, 0x93B9, 0x9242, 0x88E1, 0xE7A6,      0, /* 0x50 */
-    0xE7A7, 0xEAA1,      0,      0, 0x91BB,      0, 0xE7A8,      0, /* 0x50 */
-    0x8993, 0x916B,      0, 0x8CAD,      0, 0x9779,      0, 0xFBB5, /* 0x60 */
-    0xE7A9, 0x934B,      0,      0,      0, 0x9198, 0x8ED5, 0xE7AA, /* 0x60 */
-         0,      0, 0xE7AD,      0,      0, 0x8F85, 0xE7AB, 0x914A, /* 0x70 */
-    0x9149,      0, 0x88E2,      0, 0x97C9, 0xE7AF,      0, 0x94F0, /* 0x70 */
-    0xE7B1, 0xE7B0, 0xE7AE, 0xE284, 0x8AD2,      0,      0, 0xE78E, /* 0x80 */
-         0, 0xE7B3, 0xE7B2,      0,      0,      0,      0, 0xE7B4, /* 0x80 */
-         0, 0x9757,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0x93DF,      0,      0, 0x964D,      0, /* 0xA0 */
-    0xE7B5,      0, 0x8ED7,      0,      0,      0,      0, 0xE7B6, /* 0xA0 */
-         0, 0xE7B7,      0,      0,      0, 0xE7B8,      0,      0, /* 0xB0 */
-    0x9340,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x88E8,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x8D78,      0,      0,      0, 0x9859,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xE7BC,      0,      0, 0xFBB6,      0, /* 0xD0 */
-         0, 0x8C53, 0xE7B9,      0, 0xE7BA,      0,      0,      0, /* 0xE0 */
-    0x9594,      0,      0,      0,      0, 0x8A73,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0x9758,      0, 0x8BBD, /* 0xF0 */
-         0,      0,      0,      0,      0, 0x9373                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x91DE, 0x9197, 	 0, 0x93A6, 	 0, 0xE790, 0x8B74, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xE799, 	 0, 0xE796, 0xE7A3, 0x93A7, /* 0x00 */
+    0x9280, 0xE793, 	 0, 0x92FC, 0x9372, 0xE794, 0xE798, 0x9080, /* 0x10 */
+         0, 0x9487, 0x92CA, 	 0, 	 0, 0x90C0, 0xE797, 0x91AC, /* 0x10 */
+    0x91A2, 0xE795, 0x88A7, 0x9841, 	 0, 	 0, 	 0, 0xE79A, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x91DF, 	 0, /* 0x20 */
+         0, 0x8F54, 0x9069, 	 0, 	 0, 0xE79C, 0xE79B, 	 0, /* 0x30 */
+    0x88ED, 0xE79D, 	 0, 	 0, 0x954E, 	 0, 0xE7A5, 	 0, /* 0x30 */
+         0, 0x93D9, 0x908B, 	 0, 	 0, 0x9278, 	 0, 0x8BF6, /* 0x40 */
+         0, 0xE7A4, 0x9756, 0x895E, 	 0, 0x95D5, 0x89DF, 0xE79F, /* 0x40 */
+    0xE7A0, 0xE7A1, 0xE7A2, 0x93B9, 0x9242, 0x88E1, 0xE7A6, 	 0, /* 0x50 */
+    0xE7A7, 0xEAA1, 	 0, 	 0, 0x91BB, 	 0, 0xE7A8, 	 0, /* 0x50 */
+    0x8993, 0x916B, 	 0, 0x8CAD, 	 0, 0x9779, 	 0, 0xFBB5, /* 0x60 */
+    0xE7A9, 0x934B, 	 0, 	 0, 	 0, 0x9198, 0x8ED5, 0xE7AA, /* 0x60 */
+         0, 	 0, 0xE7AD, 	 0, 	 0, 0x8F85, 0xE7AB, 0x914A, /* 0x70 */
+    0x9149, 	 0, 0x88E2, 	 0, 0x97C9, 0xE7AF, 	 0, 0x94F0, /* 0x70 */
+    0xE7B1, 0xE7B0, 0xE7AE, 0xE284, 0x8AD2, 	 0, 	 0, 0xE78E, /* 0x80 */
+         0, 0xE7B3, 0xE7B2, 	 0, 	 0, 	 0, 	 0, 0xE7B4, /* 0x80 */
+         0, 0x9757, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x93DF, 	 0, 	 0, 0x964D, 	 0, /* 0xA0 */
+    0xE7B5, 	 0, 0x8ED7, 	 0, 	 0, 	 0, 	 0, 0xE7B6, /* 0xA0 */
+         0, 0xE7B7, 	 0, 	 0, 	 0, 0xE7B8, 	 0, 	 0, /* 0xB0 */
+    0x9340, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x88E8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x8D78, 	 0, 	 0, 	 0, 0x9859, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xE7BC, 	 0, 	 0, 0xFBB6, 	 0, /* 0xD0 */
+         0, 0x8C53, 0xE7B9, 	 0, 0xE7BA, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x9594, 	 0, 	 0, 	 0, 	 0, 0x8A73, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9758, 	 0, 0x8BBD, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9373					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_91[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xE7BD,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xE7BE,      0,      0, 0xFBB8,      0,      0, /* 0x10 */
-         0, 0xE7BF,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xFBB9, /* 0x20 */
-         0,      0,      0,      0,      0, 0x9341,      0,      0, /* 0x20 */
-    0xE7C1,      0, 0xE7C0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0x93D1, 0xE7C2, 0x8F55, 0x8EDE, 0x947A, 0x9291,      0, /* 0x40 */
-         0,      0, 0x8EF0,      0, 0x908C,      0, 0xE7C3,      0, /* 0x50 */
-    0xE7C4,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0x907C, 0xE7C5,      0, 0xE7C6,      0,      0, /* 0x60 */
-         0, 0xE7C7, 0x978F,      0, 0x8F56,      0,      0,      0, /* 0x60 */
-         0,      0, 0xE7C9, 0xE7C8,      0, 0x8D79,      0, 0x8D93, /* 0x70 */
-    0x8E5F,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xE7CC,      0,      0,      0,      0, 0x8F86, /* 0x80 */
-         0, 0xE7CB,      0, 0xE7CA,      0, 0x91E7,      0,      0, /* 0x80 */
-    0x8CED,      0, 0x90C1,      0,      0,      0,      0, 0x94AE, /* 0x90 */
-         0,      0,      0,      0, 0x8F58,      0,      0,      0, /* 0x90 */
-         0,      0, 0xE7CD,      0, 0x8FDD,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xE7D0, 0xE7CE,      0,      0,      0, 0xE7CF, /* 0xA0 */
-         0,      0,      0,      0, 0xE7D2, 0xE7D1,      0,      0, /* 0xB0 */
-    0x8FF8,      0, 0xE7D3,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xE7D4, 0xE7D5,      0,      0,      0,      0, 0x94CE, 0x8DD1, /* 0xC0 */
-    0x8EDF, 0xE7D6,      0, 0xE7D7, 0x97A2, 0x8F64, 0x96EC, 0x97CA, /* 0xC0 */
-    0xE7D8, 0x8BE0,      0,      0,      0,      0, 0xE7D9, 0xFBBB, /* 0xD0 */
-    0x9342,      0, 0xFBBA, 0xE7DC, 0x8A98, 0x906A, 0xFBBC, 0xE7DA, /* 0xD0 */
-         0, 0xE7DB,      0, 0x92DE, 0xFBBF, 0xFBC0, 0x9674, 0x8BFA, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xFBBD, 0xFBBE,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xE7DE, 0xE7DF,      0, /* 0xF0 */
-         0,      0,      0,      0, 0xE7DD,      0,      0, 0xE7E1  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xE7BD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xE7BE, 	 0, 	 0, 0xFBB8, 	 0, 	 0, /* 0x10 */
+         0, 0xE7BF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFBB9, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9341, 	 0, 	 0, /* 0x20 */
+    0xE7C1, 	 0, 0xE7C0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x93D1, 0xE7C2, 0x8F55, 0x8EDE, 0x947A, 0x9291, 	 0, /* 0x40 */
+         0, 	 0, 0x8EF0, 	 0, 0x908C, 	 0, 0xE7C3, 	 0, /* 0x50 */
+    0xE7C4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x907C, 0xE7C5, 	 0, 0xE7C6, 	 0, 	 0, /* 0x60 */
+         0, 0xE7C7, 0x978F, 	 0, 0x8F56, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xE7C9, 0xE7C8, 	 0, 0x8D79, 	 0, 0x8D93, /* 0x70 */
+    0x8E5F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xE7CC, 	 0, 	 0, 	 0, 	 0, 0x8F86, /* 0x80 */
+         0, 0xE7CB, 	 0, 0xE7CA, 	 0, 0x91E7, 	 0, 	 0, /* 0x80 */
+    0x8CED, 	 0, 0x90C1, 	 0, 	 0, 	 0, 	 0, 0x94AE, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x8F58, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xE7CD, 	 0, 0x8FDD, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xE7D0, 0xE7CE, 	 0, 	 0, 	 0, 0xE7CF, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xE7D2, 0xE7D1, 	 0, 	 0, /* 0xB0 */
+    0x8FF8, 	 0, 0xE7D3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xE7D4, 0xE7D5, 	 0, 	 0, 	 0, 	 0, 0x94CE, 0x8DD1, /* 0xC0 */
+    0x8EDF, 0xE7D6, 	 0, 0xE7D7, 0x97A2, 0x8F64, 0x96EC, 0x97CA, /* 0xC0 */
+    0xE7D8, 0x8BE0, 	 0, 	 0, 	 0, 	 0, 0xE7D9, 0xFBBB, /* 0xD0 */
+    0x9342, 	 0, 0xFBBA, 0xE7DC, 0x8A98, 0x906A, 0xFBBC, 0xE7DA, /* 0xD0 */
+         0, 0xE7DB, 	 0, 0x92DE, 0xFBBF, 0xFBC0, 0x9674, 0x8BFA, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xFBBD, 0xFBBE, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE7DE, 0xE7DF, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xE7DD, 	 0, 	 0, 0xE7E1	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_92[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0xFBC1,      0, /* 0x00 */
-         0,      0, 0xFBC3,      0,      0, 0x93DD, 0x8A62,      0, /* 0x00 */
-    0xFBC2, 0xE7E5,      0,      0, 0xE7E2, 0xE7E4,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xE7E0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xE86E,      0,      0, 0xE7E3,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0x97E9,      0,      0, 0x8CD8, /* 0x30 */
-         0, 0xFBCA, 0xFBC4,      0, 0xFBC6,      0,      0, 0xE7ED, /* 0x30 */
-    0xFBC5,      0,      0,      0, 0x9353, 0xE7E8,      0,      0, /* 0x40 */
-    0xE7EB, 0xE7E9,      0, 0xE7EE,      0,      0, 0xFBC7,      0, /* 0x40 */
-    0xE7EF, 0xFBC9,      0,      0,      0,      0,      0, 0xE7E7, /* 0x50 */
-         0, 0xFBC8, 0xE7F4, 0x8994,      0,      0, 0xE7E6,      0, /* 0x50 */
-         0,      0, 0x94AB,      0, 0xE7EA,      0, 0x8FDE, 0xFBCB, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0x8D7A,      0,      0,      0,      0,      0, 0xFBCD, /* 0x70 */
-    0xFBCE,      0,      0,      0,      0,      0, 0x9667,      0, /* 0x70 */
-    0x8BE2,      0,      0, 0x8F65,      0, 0x93BA,      0,      0, /* 0x80 */
-    0xFA5F,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0x914C,      0, 0xE7F2,      0, 0xE7EC, 0xE7F1,      0, /* 0x90 */
-    0x96C1,      0, 0x92B6, 0xE7F3, 0xE7F0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xFBCC, /* 0xA0 */
-         0,      0,      0,      0,      0, 0x914B,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE7F7, /* 0xB0 */
-         0, 0xE7F6,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE7F5, /* 0xC0 */
-    0xFBD2,      0, 0x964E, 0xFBD6,      0, 0xFBD4,      0, 0xFBD0, /* 0xD0 */
-         0, 0xFBD1,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xFBD5,      0,      0,      0, 0x8F9B,      0,      0, 0xFBCF, /* 0xE0 */
-         0, 0xE7F8, 0x95DD,      0,      0, 0x8973,      0,      0, /* 0xE0 */
-         0,      0, 0x9565, 0x9292,      0,      0,      0,      0, /* 0xF0 */
-    0x8B98, 0xFA65, 0xE7FA, 0xFBD9, 0x8D7C,      0,      0, 0xFBDC  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0xFBC1, 	 0, /* 0x00 */
+         0, 	 0, 0xFBC3, 	 0, 	 0, 0x93DD, 0x8A62, 	 0, /* 0x00 */
+    0xFBC2, 0xE7E5, 	 0, 	 0, 0xE7E2, 0xE7E4, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7E0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xE86E, 	 0, 	 0, 0xE7E3, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x97E9, 	 0, 	 0, 0x8CD8, /* 0x30 */
+         0, 0xFBCA, 0xFBC4, 	 0, 0xFBC6, 	 0, 	 0, 0xE7ED, /* 0x30 */
+    0xFBC5, 	 0, 	 0, 	 0, 0x9353, 0xE7E8, 	 0, 	 0, /* 0x40 */
+    0xE7EB, 0xE7E9, 	 0, 0xE7EE, 	 0, 	 0, 0xFBC7, 	 0, /* 0x40 */
+    0xE7EF, 0xFBC9, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7E7, /* 0x50 */
+         0, 0xFBC8, 0xE7F4, 0x8994, 	 0, 	 0, 0xE7E6, 	 0, /* 0x50 */
+         0, 	 0, 0x94AB, 	 0, 0xE7EA, 	 0, 0x8FDE, 0xFBCB, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x8D7A, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFBCD, /* 0x70 */
+    0xFBCE, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9667, 	 0, /* 0x70 */
+    0x8BE2, 	 0, 	 0, 0x8F65, 	 0, 0x93BA, 	 0, 	 0, /* 0x80 */
+    0xFA5F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x914C, 	 0, 0xE7F2, 	 0, 0xE7EC, 0xE7F1, 	 0, /* 0x90 */
+    0x96C1, 	 0, 0x92B6, 0xE7F3, 0xE7F0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFBCC, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x914B, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7F7, /* 0xB0 */
+         0, 0xE7F6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7F5, /* 0xC0 */
+    0xFBD2, 	 0, 0x964E, 0xFBD6, 	 0, 0xFBD4, 	 0, 0xFBD0, /* 0xD0 */
+         0, 0xFBD1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xFBD5, 	 0, 	 0, 	 0, 0x8F9B, 	 0, 	 0, 0xFBCF, /* 0xE0 */
+         0, 0xE7F8, 0x95DD, 	 0, 	 0, 0x8973, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x9565, 0x9292, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x8B98, 0xFA65, 0xE7FA, 0xFBD9, 0x8D7C, 	 0, 	 0, 0xFBDC	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_93[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xFBDE,      0,      0,      0, 0x8E4B,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0, 0xE7F9, /* 0x00 */
-    0x908D,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0x908E, 0xE840, 0xE842,      0,      0, 0xFBDD, 0xFBDB,      0, /* 0x10 */
-    0x8FF9, 0xFBD8, 0xE841, 0xE843,      0, 0xFBD7, 0x8BD1,      0, /* 0x20 */
-    0x9564,      0,      0, 0x8EE0, 0x9842,      0, 0xE7FC, 0x8DF6, /* 0x20 */
-         0,      0, 0x985E,      0,      0, 0xE845,      0,      0, /* 0x30 */
-         0,      0, 0xE844, 0xE846,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xE7FB,      0,      0,      0, /* 0x40 */
-    0xFA5E,      0,      0, 0x93E7,      0, 0x9374,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0x92D5,      0, 0xE84B, 0xFBE0, /* 0x50 */
-         0,      0,      0, 0x9262, 0xE847,      0,      0,      0, /* 0x50 */
-    0xE848,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0x8C4C,      0, 0xE84A,      0, /* 0x60 */
-    0xFBDF,      0,      0,      0,      0, 0x8CAE,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xE849,      0, 0x8FDF,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0x8A99,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0xE84F,      0, 0x8DBD, 0x9199, /* 0x90 */
-         0,      0, 0x92C8,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xFBE1,      0,      0, 0x8A5A, /* 0xA0 */
-         0,      0,      0,      0, 0xE84D, 0xE84E, 0x92C1,      0, /* 0xA0 */
-    0xE84C,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE850,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xE856,      0,      0, 0xFBE2,      0, /* 0xC0 */
-    0xE859,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xE858, 0x934C,      0,      0,      0,      0, 0xE851, 0xE852, /* 0xD0 */
-    0xE855,      0,      0,      0,      0, 0xE857, 0xFBE3,      0, /* 0xD0 */
-         0, 0x8BBE,      0,      0, 0xE85A, 0xE854,      0,      0, /* 0xE0 */
-    0xE853,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xFBE4                                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xFBDE, 	 0, 	 0, 	 0, 0x8E4B, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7F9, /* 0x00 */
+    0x908D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x908E, 0xE840, 0xE842, 	 0, 	 0, 0xFBDD, 0xFBDB, 	 0, /* 0x10 */
+    0x8FF9, 0xFBD8, 0xE841, 0xE843, 	 0, 0xFBD7, 0x8BD1, 	 0, /* 0x20 */
+    0x9564, 	 0, 	 0, 0x8EE0, 0x9842, 	 0, 0xE7FC, 0x8DF6, /* 0x20 */
+         0, 	 0, 0x985E, 	 0, 	 0, 0xE845, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xE844, 0xE846, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xE7FB, 	 0, 	 0, 	 0, /* 0x40 */
+    0xFA5E, 	 0, 	 0, 0x93E7, 	 0, 0x9374, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x92D5, 	 0, 0xE84B, 0xFBE0, /* 0x50 */
+         0, 	 0, 	 0, 0x9262, 0xE847, 	 0, 	 0, 	 0, /* 0x50 */
+    0xE848, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x8C4C, 	 0, 0xE84A, 	 0, /* 0x60 */
+    0xFBDF, 	 0, 	 0, 	 0, 	 0, 0x8CAE, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xE849, 	 0, 0x8FDF, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x8A99, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xE84F, 	 0, 0x8DBD, 0x9199, /* 0x90 */
+         0, 	 0, 0x92C8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xFBE1, 	 0, 	 0, 0x8A5A, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xE84D, 0xE84E, 0x92C1, 	 0, /* 0xA0 */
+    0xE84C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE850, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xE856, 	 0, 	 0, 0xFBE2, 	 0, /* 0xC0 */
+    0xE859, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xE858, 0x934C, 	 0, 	 0, 	 0, 	 0, 0xE851, 0xE852, /* 0xD0 */
+    0xE855, 	 0, 	 0, 	 0, 	 0, 0xE857, 0xFBE3, 	 0, /* 0xD0 */
+         0, 0x8BBE, 	 0, 	 0, 0xE85A, 0xE854, 	 0, 	 0, /* 0xE0 */
+    0xE853, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xFBE4															/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_94[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xE85E,      0,      0,      0, 0xE85F, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0xE860,      0,      0, 0xE85D, 0xE85C,      0,      0,      0, /* 0x10 */
-    0x8FE0, 0x93A8, 0xE85B,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xE864,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xE862,      0,      0,      0,      0, /* 0x20 */
-         0, 0xFBE5,      0,      0,      0, 0xE863, 0xE861,      0, /* 0x30 */
-    0x91F6,      0, 0xE865,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xE866,      0,      0, 0xE868, 0xFBE6,      0,      0, /* 0x40 */
-    0xFBE7,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0x8AD3, 0xE867, 0x96F8,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xE873, 0xE869,      0,      0, 0xE86C,      0, /* 0x50 */
-    0xE86A,      0, 0xE86B,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xE86D,      0,      0,      0,      0,      0, /* 0x60 */
-    0xE86F,      0,      0,      0,      0, 0xE870,      0, 0xE871, /* 0x70 */
-         0,      0,      0,      0, 0xE874, 0xE872, 0xE875, 0xE877, /* 0x70 */
-         0, 0xE876                                                  /* 0x80 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xE85E, 	 0, 	 0, 	 0, 0xE85F, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xE860, 	 0, 	 0, 0xE85D, 0xE85C, 	 0, 	 0, 	 0, /* 0x10 */
+    0x8FE0, 0x93A8, 0xE85B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xE864, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xE862, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xFBE5, 	 0, 	 0, 	 0, 0xE863, 0xE861, 	 0, /* 0x30 */
+    0x91F6, 	 0, 0xE865, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xE866, 	 0, 	 0, 0xE868, 0xFBE6, 	 0, 	 0, /* 0x40 */
+    0xFBE7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x8AD3, 0xE867, 0x96F8, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xE873, 0xE869, 	 0, 	 0, 0xE86C, 	 0, /* 0x50 */
+    0xE86A, 	 0, 0xE86B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xE86D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xE86F, 	 0, 	 0, 	 0, 	 0, 0xE870, 	 0, 0xE871, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xE874, 0xE872, 0xE875, 0xE877, /* 0x70 */
+         0, 0xE876													/* 0x80 */
                                                                     /* 0x80 */
 };
 
@@ -3456,23 +3456,23 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_94[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_95[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0x92B7, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0x96E5,      0, 0xE878, 0x914D,      0,      0,      0, 0xE879, /* 0x80 */
-         0, 0x95C2, 0xE87A, 0x8A4A,      0,      0,      0, 0x895B, /* 0x80 */
-         0, 0x8AD5, 0xFBE8, 0x8AD4, 0xE87B,      0, 0xE87C,      0, /* 0x90 */
-    0xE87D, 0xE87E,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xE880,      0, 0x8AD6, 0x8A74, 0x8D7D, 0x94B4,      0, 0xE882, /* 0xA0 */
-    0xE881,      0,      0,      0,      0, 0xE883,      0,      0, /* 0xA0 */
-         0,      0, 0x897B,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE886,      0, 0xE885, 0xE884,      0, 0xE887,      0, /* 0xB0 */
-         0,      0,      0, 0xE88A,      0,      0,      0, 0x88C5, /* 0xC0 */
-         0,      0, 0xE888,      0, 0xE88C, 0xE88B,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xE88E, 0xE88D, 0xE88F,      0, /* 0xD0 */
-    0x93AC,      0,      0,      0, 0xE890,      0,      0,      0, /* 0xD0 */
-         0, 0xE891, 0xE893,      0,      0, 0xE892                  /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x96E5, 	 0, 0xE878, 0x914D, 	 0, 	 0, 	 0, 0xE879, /* 0x80 */
+         0, 0x95C2, 0xE87A, 0x8A4A, 	 0, 	 0, 	 0, 0x895B, /* 0x80 */
+         0, 0x8AD5, 0xFBE8, 0x8AD4, 0xE87B, 	 0, 0xE87C, 	 0, /* 0x90 */
+    0xE87D, 0xE87E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xE880, 	 0, 0x8AD6, 0x8A74, 0x8D7D, 0x94B4, 	 0, 0xE882, /* 0xA0 */
+    0xE881, 	 0, 	 0, 	 0, 	 0, 0xE883, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x897B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE886, 	 0, 0xE885, 0xE884, 	 0, 0xE887, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xE88A, 	 0, 	 0, 	 0, 0x88C5, /* 0xC0 */
+         0, 	 0, 0xE888, 	 0, 0xE88C, 0xE88B, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xE88E, 0xE88D, 0xE88F, 	 0, /* 0xD0 */
+    0x93AC, 	 0, 	 0, 	 0, 0xE890, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xE891, 0xE893, 	 0, 	 0, 0xE892					/* 0xE0 */
                                                                     /* 0xE0 */
 };
 
@@ -3480,237 +3480,237 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_95[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_96[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x10 */
-                                    0x958C,      0,      0,      0, /* 0x10 */
-         0, 0xE894,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xE895,      0, 0x8DE3,      0,      0,      0, 0xE896, 0xE897, /* 0x20 */
-         0,      0, 0x9668,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x916A,      0,      0,      0, 0x88A2, /* 0x30 */
-    0x91C9,      0, 0xE898,      0, 0x958D,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xE89B, 0xE899, 0x8D7E,      0, 0xE89A, /* 0x40 */
-    0x8CC0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0x95C3, 0xE89D, 0xE89F, 0xE89E, 0xE8A0, /* 0x50 */
-         0,      0, 0x8940, 0x9077, 0x8F9C, 0x8AD7, 0xE8A1,      0, /* 0x60 */
-         0,      0, 0x9486,      0, 0xE8A3,      0,      0,      0, /* 0x60 */
-    0x8941,      0, 0xE8A2, 0x92C2,      0, 0x97CB, 0x93A9, 0xE89C, /* 0x70 */
-    0x97A4,      0, 0x8CAF,      0,      0, 0x977A,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0x8BF7, 0x97B2,      0, /* 0x80 */
-    0x8C47,      0, 0x91E0, 0xE440,      0, 0xE8A4, 0x8A4B, 0x908F, /* 0x80 */
-         0,      0,      0,      0, 0x8A75, 0xE8A6,      0, 0xE8A7, /* 0x90 */
-    0xE8A5, 0x8C84,      0, 0x8DDB, 0x8FE1, 0xFBEB,      0,      0, /* 0x90 */
-    0x8942,      0,      0, 0x97D7,      0,      0,      0, 0xE8A9, /* 0xA0 */
-    0xE7AC,      0, 0xE8A8,      0,      0,      0,      0, 0xFBEC, /* 0xA0 */
-    0xE8AC, 0xE8AA, 0xE8AB,      0, 0xE8AD,      0, 0xE8AE, 0x97EA, /* 0xB0 */
-    0xE8AF, 0xE8B0,      0, 0x90C7, 0x94B9,      0,      0,      0, /* 0xB0 */
-    0x909D, 0x8AE5,      0,      0, 0x9759, 0x89EB, 0x8F57, 0x8CD9, /* 0xC0 */
-         0, 0xE8B3,      0, 0xE8B2, 0x8E93, 0xE8B4, 0xE8B1,      0, /* 0xC0 */
-         0, 0x8E47,      0,      0,      0, 0xE8B8, 0xE5AB,      0, /* 0xD0 */
-         0, 0x99D4,      0, 0x9097, 0xE8B6,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x97A3, 0x93EF,      0,      0,      0,      0, /* 0xE0 */
-    0x894A,      0, 0x90E1, 0x8EB4,      0,      0,      0,      0, /* 0xE0 */
-    0x95B5,      0, 0x895F,      0,      0,      0, 0x97EB, 0x978B, /* 0xF0 */
-         0, 0xE8B9,      0, 0x9364                                  /* 0xF0 */
+                                    0x958C, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xE894, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xE895, 	 0, 0x8DE3, 	 0, 	 0, 	 0, 0xE896, 0xE897, /* 0x20 */
+         0, 	 0, 0x9668, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x916A, 	 0, 	 0, 	 0, 0x88A2, /* 0x30 */
+    0x91C9, 	 0, 0xE898, 	 0, 0x958D, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xE89B, 0xE899, 0x8D7E, 	 0, 0xE89A, /* 0x40 */
+    0x8CC0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x95C3, 0xE89D, 0xE89F, 0xE89E, 0xE8A0, /* 0x50 */
+         0, 	 0, 0x8940, 0x9077, 0x8F9C, 0x8AD7, 0xE8A1, 	 0, /* 0x60 */
+         0, 	 0, 0x9486, 	 0, 0xE8A3, 	 0, 	 0, 	 0, /* 0x60 */
+    0x8941, 	 0, 0xE8A2, 0x92C2, 	 0, 0x97CB, 0x93A9, 0xE89C, /* 0x70 */
+    0x97A4, 	 0, 0x8CAF, 	 0, 	 0, 0x977A, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x8BF7, 0x97B2, 	 0, /* 0x80 */
+    0x8C47, 	 0, 0x91E0, 0xE440, 	 0, 0xE8A4, 0x8A4B, 0x908F, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x8A75, 0xE8A6, 	 0, 0xE8A7, /* 0x90 */
+    0xE8A5, 0x8C84, 	 0, 0x8DDB, 0x8FE1, 0xFBEB, 	 0, 	 0, /* 0x90 */
+    0x8942, 	 0, 	 0, 0x97D7, 	 0, 	 0, 	 0, 0xE8A9, /* 0xA0 */
+    0xE7AC, 	 0, 0xE8A8, 	 0, 	 0, 	 0, 	 0, 0xFBEC, /* 0xA0 */
+    0xE8AC, 0xE8AA, 0xE8AB, 	 0, 0xE8AD, 	 0, 0xE8AE, 0x97EA, /* 0xB0 */
+    0xE8AF, 0xE8B0, 	 0, 0x90C7, 0x94B9, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x909D, 0x8AE5, 	 0, 	 0, 0x9759, 0x89EB, 0x8F57, 0x8CD9, /* 0xC0 */
+         0, 0xE8B3, 	 0, 0xE8B2, 0x8E93, 0xE8B4, 0xE8B1, 	 0, /* 0xC0 */
+         0, 0x8E47, 	 0, 	 0, 	 0, 0xE8B8, 0xE5AB, 	 0, /* 0xD0 */
+         0, 0x99D4, 	 0, 0x9097, 0xE8B6, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x97A3, 0x93EF, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x894A, 	 0, 0x90E1, 0x8EB4, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x95B5, 	 0, 0x895F, 	 0, 	 0, 	 0, 0x97EB, 0x978B, /* 0xF0 */
+         0, 0xE8B9, 	 0, 0x9364									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_97[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x8EF9,      0,      0,      0, 0xE8BA,      0, 0xE8BB, 0x906B, /* 0x00 */
-    0xE8BC,      0, 0x97EC,      0,      0, 0xE8B7, 0xE8BE, 0xE8C0, /* 0x00 */
-         0, 0xE8BF,      0, 0xE8BD,      0,      0, 0xE8C1,      0, /* 0x10 */
-         0, 0xE8C2,      0,      0, 0x919A,      0, 0x89E0,      0, /* 0x10 */
-         0,      0,      0,      0, 0xE8C3,      0,      0, 0x96B6, /* 0x20 */
-         0,      0, 0xE8C4,      0,      0,      0,      0,      0, /* 0x20 */
-    0xE8C5,      0, 0x9849, 0xFBED,      0,      0,      0,      0, /* 0x30 */
-    0x9E50, 0xE8C6,      0, 0xFBEE,      0, 0xE8C7, 0xE8C8,      0, /* 0x30 */
-         0,      0, 0xE8CC, 0xFBEF, 0xE8C9,      0, 0xE8CA,      0, /* 0x40 */
-    0xE8CB, 0xE8CD,      0,      0,      0, 0xFBF0,      0, 0xFBF1, /* 0x40 */
-         0, 0xFBF2, 0x90C2,      0,      0, 0xFBF3, 0x96F5,      0, /* 0x50 */
-         0, 0x90C3,      0,      0, 0xE8CE,      0, 0x94F1,      0, /* 0x50 */
-    0xE8CF, 0xEA72, 0x96CA,      0, 0xE8D0,      0, 0xE8D1,      0, /* 0x60 */
-    0xE8D2, 0x8A76,      0, 0xE8D4,      0, 0x9078,      0,      0, /* 0x60 */
-         0, 0xE8D5,      0,      0, 0x8C43,      0,      0,      0, /* 0x70 */
-         0, 0xE8D6, 0xE8DA,      0, 0xE8D8,      0,      0,      0, /* 0x70 */
-         0, 0xE8D9,      0,      0, 0x8A93, 0xE8D7, 0xE8DB,      0, /* 0x80 */
-         0,      0,      0, 0xE8DC,      0, 0x88C6,      0, 0xE8DD, /* 0x80 */
-    0xE8DE,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x8FE2,      0,      0,      0, 0xE8DF,      0,      0,      0, /* 0x90 */
-    0x8B66,      0,      0, 0xE8E2,      0,      0, 0xE8E1,      0, /* 0xA0 */
-    0xE8E0,      0,      0, 0xE691,      0, 0x95DA,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xE8E3, 0xE8E4,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xE8E5,      0,      0, 0xE8E6,      0, /* 0xC0 */
-    0xE8E7,      0,      0, 0xE8E8,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0x8AD8,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xE8E9,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xE8EA, 0x9442,      0, /* 0xE0 */
-         0,      0, 0xE8EC, 0x89B9,      0, 0xE8EF, 0xE8EE,      0, /* 0xF0 */
-         0,      0,      0, 0x8943,      0,      0,      0, 0x8BBF  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x8EF9, 	 0, 	 0, 	 0, 0xE8BA, 	 0, 0xE8BB, 0x906B, /* 0x00 */
+    0xE8BC, 	 0, 0x97EC, 	 0, 	 0, 0xE8B7, 0xE8BE, 0xE8C0, /* 0x00 */
+         0, 0xE8BF, 	 0, 0xE8BD, 	 0, 	 0, 0xE8C1, 	 0, /* 0x10 */
+         0, 0xE8C2, 	 0, 	 0, 0x919A, 	 0, 0x89E0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xE8C3, 	 0, 	 0, 0x96B6, /* 0x20 */
+         0, 	 0, 0xE8C4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xE8C5, 	 0, 0x9849, 0xFBED, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x9E50, 0xE8C6, 	 0, 0xFBEE, 	 0, 0xE8C7, 0xE8C8, 	 0, /* 0x30 */
+         0, 	 0, 0xE8CC, 0xFBEF, 0xE8C9, 	 0, 0xE8CA, 	 0, /* 0x40 */
+    0xE8CB, 0xE8CD, 	 0, 	 0, 	 0, 0xFBF0, 	 0, 0xFBF1, /* 0x40 */
+         0, 0xFBF2, 0x90C2, 	 0, 	 0, 0xFBF3, 0x96F5, 	 0, /* 0x50 */
+         0, 0x90C3, 	 0, 	 0, 0xE8CE, 	 0, 0x94F1, 	 0, /* 0x50 */
+    0xE8CF, 0xEA72, 0x96CA, 	 0, 0xE8D0, 	 0, 0xE8D1, 	 0, /* 0x60 */
+    0xE8D2, 0x8A76, 	 0, 0xE8D4, 	 0, 0x9078, 	 0, 	 0, /* 0x60 */
+         0, 0xE8D5, 	 0, 	 0, 0x8C43, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xE8D6, 0xE8DA, 	 0, 0xE8D8, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xE8D9, 	 0, 	 0, 0x8A93, 0xE8D7, 0xE8DB, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xE8DC, 	 0, 0x88C6, 	 0, 0xE8DD, /* 0x80 */
+    0xE8DE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x8FE2, 	 0, 	 0, 	 0, 0xE8DF, 	 0, 	 0, 	 0, /* 0x90 */
+    0x8B66, 	 0, 	 0, 0xE8E2, 	 0, 	 0, 0xE8E1, 	 0, /* 0xA0 */
+    0xE8E0, 	 0, 	 0, 0xE691, 	 0, 0x95DA, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xE8E3, 0xE8E4, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xE8E5, 	 0, 	 0, 0xE8E6, 	 0, /* 0xC0 */
+    0xE8E7, 	 0, 	 0, 0xE8E8, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x8AD8, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xE8E9, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE8EA, 0x9442, 	 0, /* 0xE0 */
+         0, 	 0, 0xE8EC, 0x89B9, 	 0, 0xE8EF, 0xE8EE, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0x8943, 	 0, 	 0, 	 0, 0x8BBF	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_98[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x95C5, 0x92B8, 0x8DA0,      0, 0x8D80, 0x8F87,      0, /* 0x00 */
-    0x907B,      0,      0,      0, 0xE8F1,      0,      0, 0xE8F0, /* 0x00 */
-    0x9761, 0x8AE6, 0x94D0, 0x93DA,      0,      0,      0, 0x909C, /* 0x10 */
-    0x97CC,      0, 0x8C7A,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xE8F4,      0,      0, 0xE8F3,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0x966A, 0x93AA,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0x896F,      0,      0, 0xE8F5, /* 0x30 */
-    0xE8F2,      0,      0, 0x9570, 0x978A, 0xE8F6,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xE8F7,      0, /* 0x40 */
-         0,      0,      0, 0xE8F9, 0x91E8, 0x8A7A, 0x8A7B, 0xE8F8, /* 0x40 */
-         0,      0,      0,      0, 0x8AE7, 0x8CB0,      0, 0xFBF4, /* 0x50 */
-    0x8AE8,      0,      0, 0x935E,      0,      0, 0x97DE,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xFBF5,      0, 0x8CDA, /* 0x60 */
-         0,      0,      0, 0xE8FA,      0,      0,      0, 0xE8FB, /* 0x60 */
-    0xE8FC, 0xE940,      0, 0xE942, 0xE941,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x9597,      0, 0xE943,      0,      0,      0,      0, 0xE944, /* 0xA0 */
-         0, 0xE945,      0,      0,      0,      0, 0xE946,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xE948, 0xE947,      0, 0xE949,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0x94F2, 0xE3CA,      0,      0, 0x9048, /* 0xD0 */
-         0,      0, 0x8B51,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xE94A,      0, 0xE94B,      0, 0x99AA, 0x9F5A, 0x94D1, /* 0xE0 */
-         0,      0, 0x88F9,      0, 0x88B9,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0, 0x8E94, 0x964F, 0x8FFC          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x95C5, 0x92B8, 0x8DA0, 	 0, 0x8D80, 0x8F87, 	 0, /* 0x00 */
+    0x907B, 	 0, 	 0, 	 0, 0xE8F1, 	 0, 	 0, 0xE8F0, /* 0x00 */
+    0x9761, 0x8AE6, 0x94D0, 0x93DA, 	 0, 	 0, 	 0, 0x909C, /* 0x10 */
+    0x97CC, 	 0, 0x8C7A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xE8F4, 	 0, 	 0, 0xE8F3, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x966A, 0x93AA, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x896F, 	 0, 	 0, 0xE8F5, /* 0x30 */
+    0xE8F2, 	 0, 	 0, 0x9570, 0x978A, 0xE8F6, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8F7, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xE8F9, 0x91E8, 0x8A7A, 0x8A7B, 0xE8F8, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x8AE7, 0x8CB0, 	 0, 0xFBF4, /* 0x50 */
+    0x8AE8, 	 0, 	 0, 0x935E, 	 0, 	 0, 0x97DE, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xFBF5, 	 0, 0x8CDA, /* 0x60 */
+         0, 	 0, 	 0, 0xE8FA, 	 0, 	 0, 	 0, 0xE8FB, /* 0x60 */
+    0xE8FC, 0xE940, 	 0, 0xE942, 0xE941, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x9597, 	 0, 0xE943, 	 0, 	 0, 	 0, 	 0, 0xE944, /* 0xA0 */
+         0, 0xE945, 	 0, 	 0, 	 0, 	 0, 0xE946, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xE948, 0xE947, 	 0, 0xE949, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x94F2, 0xE3CA, 	 0, 	 0, 0x9048, /* 0xD0 */
+         0, 	 0, 0x8B51, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xE94A, 	 0, 0xE94B, 	 0, 0x99AA, 0x9F5A, 0x94D1, /* 0xE0 */
+         0, 	 0, 0x88F9, 	 0, 0x88B9, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0x8E94, 0x964F, 0x8FFC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_99[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xE94C,      0, 0x96DD,      0,      0, /* 0x00 */
-         0, 0xE94D, 0x977B,      0, 0x8961,      0,      0,      0, /* 0x00 */
-    0x8E60,      0, 0xE94E, 0x89EC, 0xE94F,      0,      0,      0, /* 0x10 */
-    0xE950,      0,      0,      0,      0, 0xE952, 0xE953,      0, /* 0x10 */
-    0xE955, 0xE951,      0,      0, 0xE954,      0,      0, 0xFBF8, /* 0x20 */
-    0x8AD9,      0,      0,      0, 0xE956,      0, 0xE957,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xE958, 0xE959,      0, /* 0x30 */
-         0,      0, 0xE95A,      0,      0, 0xE95C,      0,      0, /* 0x40 */
-         0, 0xE95B,      0, 0xE95E, 0xE961,      0,      0,      0, /* 0x40 */
-    0xE95D, 0xE95F, 0xE960,      0,      0, 0xE962,      0, 0x8BC0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x8EF1, 0xE963, /* 0x90 */
-    0xE964, 0x8D81,      0,      0,      0,      0, 0xFBFA,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xE965,      0,      0, /* 0xA0 */
-    0x8A5D,      0,      0,      0, 0x946E, 0xE966, 0xE967,      0, /* 0xA0 */
-         0,      0,      0, 0x9279, 0x93E9,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xE968,      0,      0,      0, /* 0xB0 */
-         0, 0x949D,      0,      0, 0x91CA, 0x8977, 0x8BEC,      0, /* 0xC0 */
-    0x8BED,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0x9293, 0xE96D, 0x8BEE,      0,      0, 0x89ED,      0,      0, /* 0xD0 */
-    0xE96C,      0,      0, 0xE96A,      0, 0xE96B,      0, 0xE969, /* 0xD0 */
-         0,      0, 0xE977,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xE96E, 0xE96F,      0, /* 0xE0 */
-         0, 0xE970, 0xE971,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xE973,      0,      0, 0xE972,      0,      0,      0, 0x8F78  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xE94C, 	 0, 0x96DD, 	 0, 	 0, /* 0x00 */
+         0, 0xE94D, 0x977B, 	 0, 0x8961, 	 0, 	 0, 	 0, /* 0x00 */
+    0x8E60, 	 0, 0xE94E, 0x89EC, 0xE94F, 	 0, 	 0, 	 0, /* 0x10 */
+    0xE950, 	 0, 	 0, 	 0, 	 0, 0xE952, 0xE953, 	 0, /* 0x10 */
+    0xE955, 0xE951, 	 0, 	 0, 0xE954, 	 0, 	 0, 0xFBF8, /* 0x20 */
+    0x8AD9, 	 0, 	 0, 	 0, 0xE956, 	 0, 0xE957, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE958, 0xE959, 	 0, /* 0x30 */
+         0, 	 0, 0xE95A, 	 0, 	 0, 0xE95C, 	 0, 	 0, /* 0x40 */
+         0, 0xE95B, 	 0, 0xE95E, 0xE961, 	 0, 	 0, 	 0, /* 0x40 */
+    0xE95D, 0xE95F, 0xE960, 	 0, 	 0, 0xE962, 	 0, 0x8BC0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8EF1, 0xE963, /* 0x90 */
+    0xE964, 0x8D81, 	 0, 	 0, 	 0, 	 0, 0xFBFA, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE965, 	 0, 	 0, /* 0xA0 */
+    0x8A5D, 	 0, 	 0, 	 0, 0x946E, 0xE966, 0xE967, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x9279, 0x93E9, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xE968, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x949D, 	 0, 	 0, 0x91CA, 0x8977, 0x8BEC, 	 0, /* 0xC0 */
+    0x8BED, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x9293, 0xE96D, 0x8BEE, 	 0, 	 0, 0x89ED, 	 0, 	 0, /* 0xD0 */
+    0xE96C, 	 0, 	 0, 0xE96A, 	 0, 0xE96B, 	 0, 0xE969, /* 0xD0 */
+         0, 	 0, 0xE977, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE96E, 0xE96F, 	 0, /* 0xE0 */
+         0, 0xE970, 0xE971, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xE973, 	 0, 	 0, 0xE972, 	 0, 	 0, 	 0, 0x8F78	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_9A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE974,      0,      0,      0, 0xE976,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0x8B52, 0xE975, /* 0x00 */
-         0,      0, 0x919B, 0x8CB1,      0,      0,      0,      0, /* 0x10 */
-         0, 0xE978,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0x91CB,      0,      0, 0xE979,      0,      0,      0,      0, /* 0x20 */
-    0x93AB,      0,      0,      0,      0,      0,      0, 0xE97A, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xE980,      0, /* 0x30 */
-    0xE97D,      0, 0xE97C, 0xE97E,      0, 0xE97B,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xE982, 0xFBFB,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xE981,      0, 0xE984, /* 0x50 */
-         0,      0, 0x8BC1, 0xE983,      0,      0,      0, 0xE985, /* 0x50 */
-         0,      0, 0xE986,      0, 0xE988, 0xE987,      0,      0, /* 0x60 */
-         0, 0xE989, 0xE98B, 0xE98A,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x8D9C,      0,      0,      0,      0, 0xE98C,      0,      0, /* 0xA0 */
-    0xE98D,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x8A5B,      0,      0,      0, 0xE98E,      0,      0,      0, /* 0xB0 */
-    0xE98F,      0,      0,      0, 0x9091,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE990, /* 0xC0 */
-         0, 0xE991,      0, 0xE992, 0xE993,      0,      0,      0, /* 0xD0 */
-    0x8D82, 0xFBFC,      0,      0, 0xFC40,      0, 0xE994, 0xE995, /* 0xD0 */
-         0,      0, 0xE996, 0xE997,      0,      0, 0xE998,      0, /* 0xE0 */
-         0,      0, 0x94AF, 0xE99A,      0, 0x9545, 0xE99B, 0xE999, /* 0xE0 */
-         0, 0xE99D,      0,      0, 0xE99C,      0,      0, 0xE99E, /* 0xF0 */
-         0,      0,      0, 0xE99F                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE974, 	 0, 	 0, 	 0, 0xE976, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8B52, 0xE975, /* 0x00 */
+         0, 	 0, 0x919B, 0x8CB1, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xE978, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x91CB, 	 0, 	 0, 0xE979, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x93AB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE97A, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE980, 	 0, /* 0x30 */
+    0xE97D, 	 0, 0xE97C, 0xE97E, 	 0, 0xE97B, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE982, 0xFBFB, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE981, 	 0, 0xE984, /* 0x50 */
+         0, 	 0, 0x8BC1, 0xE983, 	 0, 	 0, 	 0, 0xE985, /* 0x50 */
+         0, 	 0, 0xE986, 	 0, 0xE988, 0xE987, 	 0, 	 0, /* 0x60 */
+         0, 0xE989, 0xE98B, 0xE98A, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x8D9C, 	 0, 	 0, 	 0, 	 0, 0xE98C, 	 0, 	 0, /* 0xA0 */
+    0xE98D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x8A5B, 	 0, 	 0, 	 0, 0xE98E, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xE98F, 	 0, 	 0, 	 0, 0x9091, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE990, /* 0xC0 */
+         0, 0xE991, 	 0, 0xE992, 0xE993, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x8D82, 0xFBFC, 	 0, 	 0, 0xFC40, 	 0, 0xE994, 0xE995, /* 0xD0 */
+         0, 	 0, 0xE996, 0xE997, 	 0, 	 0, 0xE998, 	 0, /* 0xE0 */
+         0, 	 0, 0x94AF, 0xE99A, 	 0, 0x9545, 0xE99B, 0xE999, /* 0xE0 */
+         0, 0xE99D, 	 0, 	 0, 0xE99C, 	 0, 	 0, 0xE99E, /* 0xF0 */
+         0, 	 0, 	 0, 0xE99F									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_9B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0xE9A0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xE9A1,      0, 0xE9A2,      0,      0,      0,      0, 0xE9A3, /* 0x10 */
-         0,      0, 0xE9A4, 0xE9A5,      0, 0xE9A6,      0, 0xE9A7, /* 0x20 */
-    0xE9A8, 0xE9A9, 0xE9AA,      0,      0,      0, 0xE9AB, 0xE9AC, /* 0x20 */
-         0, 0x9F54, 0xE9AD,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xE2F6, 0x8B53,      0,      0,      0, /* 0x30 */
-         0, 0x8A40, 0x8DB0, 0xE9AF, 0xE9AE, 0x96A3,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xE9B1, 0xE9B2, 0xE9B0, /* 0x40 */
-         0, 0xE9B3,      0,      0, 0x9682,      0,      0,      0, /* 0x50 */
-    0xE9B4,      0, 0x8B9B,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0x9844, /* 0x60 */
-         0,      0, 0xFC42,      0, 0xE9B5, 0xFC41,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0xE9B7,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x88BC, 0xFC43, /* 0x80 */
-         0, 0xE9B8, 0x95A9, 0xE9B6,      0,      0, 0xE9B9, 0xE9BA, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xE9BB, /* 0x90 */
-    0xE9BC,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xE9BD,      0, 0x968E, 0x8E4C,      0, 0x8DF8, 0x914E,      0, /* 0xA0 */
-         0, 0xFC44,      0,      0, 0xE9BE,      0,      0,      0, /* 0xB0 */
-         0, 0xE9C1,      0, 0xFC45,      0,      0,      0,      0, /* 0xB0 */
-    0xE9BF,      0,      0,      0,      0,      0, 0xE9C2,      0, /* 0xC0 */
-         0, 0x8CEF, 0xE9C0,      0,      0,      0,      0, 0xE9C3, /* 0xC0 */
-         0, 0xE9C4, 0xE9C5,      0, 0xE9C9,      0, 0x8E49,      0, /* 0xD0 */
-         0,      0,      0, 0x91E2,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xE9CA, 0xE9C7, 0xE9C6, 0xE9C8,      0,      0,      0, /* 0xE0 */
-    0x8C7E,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xE9CE, 0xE9CD, 0xE9CC,      0,      0, 0x88B1                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0xE9A0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xE9A1, 	 0, 0xE9A2, 	 0, 	 0, 	 0, 	 0, 0xE9A3, /* 0x10 */
+         0, 	 0, 0xE9A4, 0xE9A5, 	 0, 0xE9A6, 	 0, 0xE9A7, /* 0x20 */
+    0xE9A8, 0xE9A9, 0xE9AA, 	 0, 	 0, 	 0, 0xE9AB, 0xE9AC, /* 0x20 */
+         0, 0x9F54, 0xE9AD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xE2F6, 0x8B53, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x8A40, 0x8DB0, 0xE9AF, 0xE9AE, 0x96A3, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE9B1, 0xE9B2, 0xE9B0, /* 0x40 */
+         0, 0xE9B3, 	 0, 	 0, 0x9682, 	 0, 	 0, 	 0, /* 0x50 */
+    0xE9B4, 	 0, 0x8B9B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9844, /* 0x60 */
+         0, 	 0, 0xFC42, 	 0, 0xE9B5, 0xFC41, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0xE9B7, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x88BC, 0xFC43, /* 0x80 */
+         0, 0xE9B8, 0x95A9, 0xE9B6, 	 0, 	 0, 0xE9B9, 0xE9BA, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9BB, /* 0x90 */
+    0xE9BC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xE9BD, 	 0, 0x968E, 0x8E4C, 	 0, 0x8DF8, 0x914E, 	 0, /* 0xA0 */
+         0, 0xFC44, 	 0, 	 0, 0xE9BE, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE9C1, 	 0, 0xFC45, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xE9BF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9C2, 	 0, /* 0xC0 */
+         0, 0x8CEF, 0xE9C0, 	 0, 	 0, 	 0, 	 0, 0xE9C3, /* 0xC0 */
+         0, 0xE9C4, 0xE9C5, 	 0, 0xE9C9, 	 0, 0x8E49, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x91E2, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xE9CA, 0xE9C7, 0xE9C6, 0xE9C8, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x8C7E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE9CE, 0xE9CD, 0xE9CC, 	 0, 	 0, 0x88B1					/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -3718,39 +3718,39 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_9B[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_9C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xFC46,      0,      0,      0, 0xE9D8,      0, 0xE9D4,      0, /* 0x00 */
-    0xE9D5, 0xE9D1, 0xE9D7,      0, 0xE9D3, 0x8A82,      0,      0, /* 0x00 */
-    0x986B,      0, 0xE9D6, 0xE9D2, 0xE9D0, 0xE9CF,      0,      0, /* 0x10 */
-         0,      0,      0, 0xE9DA,      0,      0,      0,      0, /* 0x10 */
-         0, 0xE9DD,      0,      0, 0xE9DC, 0xE9DB,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0x9568, 0xE9D9, 0x88F1, /* 0x20 */
-    0xE9DE,      0, 0xE9E0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0x8A8F, 0xE9CB, 0x8956,      0,      0, 0xE9E2,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xE9E1, 0xE9DF, /* 0x40 */
-    0x924C,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x9690,      0,      0,      0,      0, 0x97D8, /* 0x50 */
-         0,      0, 0xE9E3,      0,      0,      0,      0,      0, /* 0x50 */
-    0xE9E4,      0,      0,      0,      0,      0,      0, 0xE9E5, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xE9E6,      0, /* 0x70 */
-    0xE9E7,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x92B9,      0, 0xE9E8, /* 0xE0 */
-         0, 0x94B5,      0, 0xE9ED, 0xE9E9,      0,      0,      0, /* 0xE0 */
-    0xE9EA,      0,      0, 0x9650, 0x96C2,      0, 0x93CE          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xFC46, 	 0, 	 0, 	 0, 0xE9D8, 	 0, 0xE9D4, 	 0, /* 0x00 */
+    0xE9D5, 0xE9D1, 0xE9D7, 	 0, 0xE9D3, 0x8A82, 	 0, 	 0, /* 0x00 */
+    0x986B, 	 0, 0xE9D6, 0xE9D2, 0xE9D0, 0xE9CF, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xE9DA, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xE9DD, 	 0, 	 0, 0xE9DC, 0xE9DB, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x9568, 0xE9D9, 0x88F1, /* 0x20 */
+    0xE9DE, 	 0, 0xE9E0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x8A8F, 0xE9CB, 0x8956, 	 0, 	 0, 0xE9E2, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9E1, 0xE9DF, /* 0x40 */
+    0x924C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x9690, 	 0, 	 0, 	 0, 	 0, 0x97D8, /* 0x50 */
+         0, 	 0, 0xE9E3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xE9E4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9E5, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9E6, 	 0, /* 0x70 */
+    0xE9E7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x92B9, 	 0, 0xE9E8, /* 0xE0 */
+         0, 0x94B5, 	 0, 0xE9ED, 0xE9E9, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE9EA, 	 0, 	 0, 0x9650, 0x96C2, 	 0, 0x93CE			/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -3758,107 +3758,107 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_9C[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_9D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xE9EE,      0,      0, 0xE9EF, 0x93BC, /* 0x00 */
-    0xE9EC, 0xE9EB,      0,      0,      0,      0, 0x89A8,      0, /* 0x00 */
-         0,      0, 0xE9F7,      0,      0, 0xE9F6,      0,      0, /* 0x10 */
-         0,      0,      0, 0x8995,      0,      0,      0, 0xE9F4, /* 0x10 */
-         0,      0,      0, 0xE9F3,      0,      0, 0xE9F1,      0, /* 0x20 */
-    0x8A9B,      0, 0xE9F0, 0x8EB0, 0x89A7,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x8D83,      0,      0, 0xE9FA, 0xE9F9, /* 0x30 */
-         0, 0xE9F8,      0,      0, 0xE9F5,      0, 0xE9FB,      0, /* 0x40 */
-    0xE9FC,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xEA44, 0xEA43,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xEA45,      0,      0, 0x894C, 0xEA40, 0xEA41,      0, /* 0x50 */
-    0x8D94, 0x96B7,      0,      0, 0xEA42,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xFC48, 0x9651,      0,      0, 0xEA4A, /* 0x60 */
-    0xFC47,      0, 0xEA46,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xEA4B,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xEA48, /* 0x80 */
-         0, 0xEA47,      0,      0,      0,      0,      0, 0x8C7B, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xEA4C,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xEA4D,      0,      0,      0, /* 0xA0 */
-         0, 0xEA4E,      0, 0xEA49,      0,      0,      0, 0xE9F2, /* 0xA0 */
-         0,      0, 0xEA4F,      0, 0x92DF,      0,      0,      0, /* 0xB0 */
-    0xEA53,      0, 0xEA54, 0xEA52,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xEA51, 0xEA57,      0, 0xEA50,      0, 0xEA55,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xEA56, /* 0xC0 */
-         0,      0,      0, 0xEA59,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xEA58,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xEA5B,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xEA5C,      0, 0xEA5D, /* 0xE0 */
-         0,      0, 0x9868,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xEA5A, 0x91E9, 0x8DEB,      0,      0, 0xEA5E                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xE9EE, 	 0, 	 0, 0xE9EF, 0x93BC, /* 0x00 */
+    0xE9EC, 0xE9EB, 	 0, 	 0, 	 0, 	 0, 0x89A8, 	 0, /* 0x00 */
+         0, 	 0, 0xE9F7, 	 0, 	 0, 0xE9F6, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x8995, 	 0, 	 0, 	 0, 0xE9F4, /* 0x10 */
+         0, 	 0, 	 0, 0xE9F3, 	 0, 	 0, 0xE9F1, 	 0, /* 0x20 */
+    0x8A9B, 	 0, 0xE9F0, 0x8EB0, 0x89A7, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x8D83, 	 0, 	 0, 0xE9FA, 0xE9F9, /* 0x30 */
+         0, 0xE9F8, 	 0, 	 0, 0xE9F5, 	 0, 0xE9FB, 	 0, /* 0x40 */
+    0xE9FC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xEA44, 0xEA43, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xEA45, 	 0, 	 0, 0x894C, 0xEA40, 0xEA41, 	 0, /* 0x50 */
+    0x8D94, 0x96B7, 	 0, 	 0, 0xEA42, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xFC48, 0x9651, 	 0, 	 0, 0xEA4A, /* 0x60 */
+    0xFC47, 	 0, 0xEA46, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xEA4B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEA48, /* 0x80 */
+         0, 0xEA47, 	 0, 	 0, 	 0, 	 0, 	 0, 0x8C7B, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xEA4C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xEA4D, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xEA4E, 	 0, 0xEA49, 	 0, 	 0, 	 0, 0xE9F2, /* 0xA0 */
+         0, 	 0, 0xEA4F, 	 0, 0x92DF, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xEA53, 	 0, 0xEA54, 0xEA52, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xEA51, 0xEA57, 	 0, 0xEA50, 	 0, 0xEA55, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEA56, /* 0xC0 */
+         0, 	 0, 	 0, 0xEA59, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xEA58, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEA5B, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEA5C, 	 0, 0xEA5D, /* 0xE0 */
+         0, 	 0, 0x9868, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xEA5A, 0x91E9, 0x8DEB, 	 0, 	 0, 0xEA5E					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_9E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x10 */
-            0xFC4A, 0xEA5F, 0xEA60,      0,      0, 0xEA61,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xEA62,      0,      0, /* 0x70 */
-    0x8CB2, 0xEA63,      0,      0,      0, 0xEA64,      0, 0x8EAD, /* 0x70 */
-         0, 0xEA65,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xEA66,      0,      0, 0xEA67, 0xEA68,      0,      0,      0, /* 0x80 */
-         0, 0xEA6B, 0xEA69, 0x985B,      0, 0xEA6A,      0, 0x97ED, /* 0x90 */
-         0,      0,      0,      0,      0, 0xEA6C,      0, 0x97D9, /* 0x90 */
-         0,      0,      0,      0,      0, 0xEA6D, 0x949E,      0, /* 0xA0 */
-         0, 0xEA6E, 0xEA70,      0,      0, 0xEA71,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xEA6F, 0x8D8D, 0x96CB, 0x9683, 0x9BF5,      0, 0x9F80, 0x969B, /* 0xB0 */
-         0,      0,      0,      0, 0x89A9,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xEA73, 0x8B6F, 0xEA74, 0xEA75, /* 0xC0 */
-    0xEA76, 0xFC4B, 0x8D95,      0, 0xEA77,      0,      0,      0, /* 0xD0 */
-    0xE0D2, 0x96D9,      0, 0x91E1, 0xEA78, 0xEA7A, 0xEA79,      0, /* 0xD0 */
-    0xEA7B,      0,      0,      0,      0, 0xEA7C,      0,      0, /* 0xE0 */
-    0xEA7D,      0,      0,      0,      0,      0,      0, 0xEA7E, /* 0xE0 */
-         0,      0,      0,      0, 0xEA80,      0, 0xEA81, 0xEA82, /* 0xF0 */
-         0, 0xEA83,      0, 0xEA84, 0xEA85, 0xEA86                  /* 0xF0 */
+            0xFC4A, 0xEA5F, 0xEA60, 	 0, 	 0, 0xEA61, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEA62, 	 0, 	 0, /* 0x70 */
+    0x8CB2, 0xEA63, 	 0, 	 0, 	 0, 0xEA64, 	 0, 0x8EAD, /* 0x70 */
+         0, 0xEA65, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xEA66, 	 0, 	 0, 0xEA67, 0xEA68, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xEA6B, 0xEA69, 0x985B, 	 0, 0xEA6A, 	 0, 0x97ED, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEA6C, 	 0, 0x97D9, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEA6D, 0x949E, 	 0, /* 0xA0 */
+         0, 0xEA6E, 0xEA70, 	 0, 	 0, 0xEA71, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xEA6F, 0x8D8D, 0x96CB, 0x9683, 0x9BF5, 	 0, 0x9F80, 0x969B, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x89A9, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xEA73, 0x8B6F, 0xEA74, 0xEA75, /* 0xC0 */
+    0xEA76, 0xFC4B, 0x8D95, 	 0, 0xEA77, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE0D2, 0x96D9, 	 0, 0x91E1, 0xEA78, 0xEA7A, 0xEA79, 	 0, /* 0xD0 */
+    0xEA7B, 	 0, 	 0, 	 0, 	 0, 0xEA7C, 	 0, 	 0, /* 0xE0 */
+    0xEA7D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEA7E, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xEA80, 	 0, 0xEA81, 0xEA82, /* 0xF0 */
+         0, 0xEA83, 	 0, 0xEA84, 0xEA85, 0xEA86					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_9F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xEA87, /* 0x00 */
-    0xEA88,      0,      0,      0,      0,      0, 0x9343,      0, /* 0x00 */
-         0,      0,      0, 0x8CDB,      0, 0xEA8A,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0x916C, 0xEA8B,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xEA8C,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x9540,      0,      0, 0xEA8D,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xEA8E, 0xE256,      0,      0, 0xE6D8, 0xE8EB, /* 0x40 */
-         0,      0, 0xEA8F,      0, 0xEA90,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xEA92, /* 0x50 */
-    0xEA93, 0xEA94, 0x97EE, 0xEA91,      0,      0, 0xEA95, 0xEA96, /* 0x60 */
-         0,      0, 0xEA98,      0, 0xEA97,      0,      0,      0, /* 0x60 */
-         0,      0, 0xEA9A,      0,      0,      0, 0xEA9B, 0xEA99, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x97B4,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xEA9C,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xEA9D, 0xE273,      0,      0, /* 0x90 */
-    0xEA9E                                                          /* 0xA0 */
+    0xEA88, 	 0, 	 0, 	 0, 	 0, 	 0, 0x9343, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x8CDB, 	 0, 0xEA8A, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x916C, 0xEA8B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xEA8C, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x9540, 	 0, 	 0, 0xEA8D, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xEA8E, 0xE256, 	 0, 	 0, 0xE6D8, 0xE8EB, /* 0x40 */
+         0, 	 0, 0xEA8F, 	 0, 0xEA90, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEA92, /* 0x50 */
+    0xEA93, 0xEA94, 0x97EE, 0xEA91, 	 0, 	 0, 0xEA95, 0xEA96, /* 0x60 */
+         0, 	 0, 0xEA98, 	 0, 0xEA97, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xEA9A, 	 0, 	 0, 	 0, 0xEA9B, 0xEA99, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x97B4, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEA9C, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xEA9D, 0xE273, 	 0, 	 0, /* 0x90 */
+    0xEA9E															/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -3868,32 +3868,32 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_9F[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_MS932_F9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x20 */
-            0xFAE0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xFBE9                          /* 0xD0 */
+            0xFAE0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xFBE9							/* 0xD0 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -3902,25 +3902,25 @@ static sal_uInt16 const aImplUniToDBCSTab_MS932_F9[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_MS932_FA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
                                                     0xFA90, 0xFA9B, /* 0x00 */
     0xFA9C, 0xFAB1, 0xFAD8, 0xFAE8, 0xFAEA, 0xFB58, 0xFB5E, 0xFB75, /* 0x10 */
     0xFB7D, 0xFB7E, 0xFB80, 0xFB82, 0xFB86, 0xFB89, 0xFB92, 0xFB9D, /* 0x10 */
     0xFB9F, 0xFBA0, 0xFBA9, 0xFBB1, 0xFBB3, 0xFBB4, 0xFBB7, 0xFBD3, /* 0x20 */
-    0xFBDA, 0xFBEA, 0xFBF6, 0xFBF7, 0xFBF9, 0xFC49                  /* 0x20 */
+    0xFBDA, 0xFBEA, 0xFBF6, 0xFBF7, 0xFBF9, 0xFC49					/* 0x20 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_APPLEJAPANESE_FE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xEB64, 0xEB5C,      0, 0xEB51,      0, 0xEB69, 0xEB6A, 0xEB6F, /* 0x30 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xEB64, 0xEB5C, 	 0, 0xEB51, 	 0, 0xEB69, 0xEB6A, 0xEB6F, /* 0x30 */
     0xEB70, 0xEB6B, 0xEB6C, 0xEB79, 0xEB7A, 0xEB73, 0xEB74, 0xEB71, /* 0x30 */
-    0xEB72, 0xEB75, 0xEB76, 0xEB77, 0xEB78                          /* 0x40 */
+    0xEB72, 0xEB75, 0xEB76, 0xEB77, 0xEB78							/* 0x40 */
                                                                     /* 0x40 */
 };
 
@@ -3928,8 +3928,8 @@ static sal_uInt16 const aImplUniToDBCSTab_APPLEJAPANESE_FE[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_SJIS_FF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8149, 0xFA57, 0x8194, 0x8190, 0x8193, 0x8195, 0xFA56, /* 0x00 */
     0x8169, 0x816A, 0x8196, 0x817B, 0x8143, 0x817C, 0x8144, 0x815E, /* 0x00 */
     0x824F, 0x8250, 0x8251, 0x8252, 0x8253, 0x8254, 0x8255, 0x8256, /* 0x10 */
@@ -3941,7 +3941,7 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_FF[] =
     0x814D, 0x8281, 0x8282, 0x8283, 0x8284, 0x8285, 0x8286, 0x8287, /* 0x40 */
     0x8288, 0x8289, 0x828A, 0x828B, 0x828C, 0x828D, 0x828E, 0x828F, /* 0x40 */
     0x8290, 0x8291, 0x8292, 0x8293, 0x8294, 0x8295, 0x8296, 0x8297, /* 0x50 */
-    0x8298, 0x8299, 0x829A, 0x816F, 0x8162, 0x8170, 0x8160,      0, /* 0x50 */
+    0x8298, 0x8299, 0x829A, 0x816F, 0x8162, 0x8170, 0x8160, 	 0, /* 0x50 */
          0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, /* 0x60 */
     0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, /* 0x60 */
     0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, /* 0x70 */
@@ -3950,15 +3950,15 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_FF[] =
     0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, /* 0x80 */
     0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, /* 0x90 */
     0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x8191, 0x8192, 0x81CA, 0x8150, 0xFA55, 0x818F                  /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x8191, 0x8192, 0x81CA, 0x8150, 0xFA55, 0x818F					/* 0xE0 */
                                                                     /* 0xE0 */
 };
 
diff --git a/sal/textenc/tcvtjp3.tab b/sal/textenc/tcvtjp3.tab
index 1dde04e1aafb..cca81dee6410 100644
--- a/sal/textenc/tcvtjp3.tab
+++ b/sal/textenc/tcvtjp3.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,8 +41,8 @@
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_21[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x3000, 0x3001, 0x3002, 0xFF0C, 0xFF0E, 0x30FB, 0xFF1A, /* 0x20 */
     0xFF1B, 0xFF1F, 0xFF01, 0x309B, 0x309C, 0x00B4, 0xFF40, 0x00A8, /* 0x20 */
     0xFF3E, 0xFFE3, 0xFF3F, 0x30FD, 0x30FE, 0x309D, 0x309E, 0x3003, /* 0x30 */
@@ -54,53 +54,53 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_21[] =
     0x00F7, 0xFF1D, 0x2260, 0xFF1C, 0xFF1E, 0x2266, 0x2267, 0x221E, /* 0x60 */
     0x2234, 0x2642, 0x2640, 0x00B0, 0x2032, 0x2033, 0x2103, 0xFFE5, /* 0x60 */
     0xFF04, 0x00A2, 0x00A3, 0xFF05, 0xFF03, 0xFF06, 0xFF0A, 0xFF20, /* 0x70 */
-    0x00A7, 0x2606, 0x2605, 0x25CB, 0x25CF, 0x25CE, 0x25C7          /* 0x70 */
+    0x00A7, 0x2606, 0x2605, 0x25CB, 0x25CF, 0x25CE, 0x25C7			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_22[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x25C6, 0x25A1, 0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC, /* 0x20 */
-    0x203B, 0x3012, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0x2208, 0x220B, 0x2286, 0x2287, 0x2282, 0x2283, /* 0x30 */
-    0x222A, 0x2229,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x2227, 0x2228, 0x00AC, 0x21D2, 0x21D4, 0x2200, /* 0x40 */
-    0x2203,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0x2220, 0x22A5, 0x2312, 0x2202, /* 0x50 */
+    0x203B, 0x3012, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x2208, 0x220B, 0x2286, 0x2287, 0x2282, 0x2283, /* 0x30 */
+    0x222A, 0x2229, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x2227, 0x2228, 0x00AC, 0x21D2, 0x21D4, 0x2200, /* 0x40 */
+    0x2203, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x2220, 0x22A5, 0x2312, 0x2202, /* 0x50 */
     0x2207, 0x2261, 0x2252, 0x226A, 0x226B, 0x221A, 0x223D, 0x221D, /* 0x60 */
-    0x2235, 0x222B, 0x222C,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0x212B, 0x2030, 0x266F, 0x266D, 0x266A, 0x2020, /* 0x70 */
-    0x2021, 0x00B6,      0,      0,      0,      0, 0x25EF          /* 0x70 */
+    0x2235, 0x222B, 0x222C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x212B, 0x2030, 0x266F, 0x266D, 0x266A, 0x2020, /* 0x70 */
+    0x2021, 0x00B6, 	 0, 	 0, 	 0, 	 0, 0x25EF			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_23[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17, /* 0x30 */
-    0xFF18, 0xFF19,      0,      0,      0,      0,      0,      0, /* 0x30 */
+    0xFF18, 0xFF19, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
          0, 0xFF21, 0xFF22, 0xFF23, 0xFF24, 0xFF25, 0xFF26, 0xFF27, /* 0x40 */
     0xFF28, 0xFF29, 0xFF2A, 0xFF2B, 0xFF2C, 0xFF2D, 0xFF2E, 0xFF2F, /* 0x40 */
     0xFF30, 0xFF31, 0xFF32, 0xFF33, 0xFF34, 0xFF35, 0xFF36, 0xFF37, /* 0x50 */
-    0xFF38, 0xFF39, 0xFF3A,      0,      0,      0,      0,      0, /* 0x50 */
+    0xFF38, 0xFF39, 0xFF3A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47, /* 0x60 */
     0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F, /* 0x60 */
     0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57, /* 0x70 */
-    0xFF58, 0xFF59, 0xFF5A                                          /* 0x70 */
+    0xFF58, 0xFF59, 0xFF5A											/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_24[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047, /* 0x20 */
     0x3048, 0x3049, 0x304A, 0x304B, 0x304C, 0x304D, 0x304E, 0x304F, /* 0x20 */
     0x3050, 0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056, 0x3057, /* 0x30 */
@@ -111,7 +111,7 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_24[] =
     0x3078, 0x3079, 0x307A, 0x307B, 0x307C, 0x307D, 0x307E, 0x307F, /* 0x50 */
     0x3080, 0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087, /* 0x60 */
     0x3088, 0x3089, 0x308A, 0x308B, 0x308C, 0x308D, 0x308E, 0x308F, /* 0x60 */
-    0x3090, 0x3091, 0x3092, 0x3093                                  /* 0x70 */
+    0x3090, 0x3091, 0x3092, 0x3093									/* 0x70 */
                                                                     /* 0x70 */
 };
 
@@ -119,8 +119,8 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_24[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_25[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7, /* 0x20 */
     0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC, 0x30AD, 0x30AE, 0x30AF, /* 0x20 */
     0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, 0x30B7, /* 0x30 */
@@ -131,7 +131,7 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_25[] =
     0x30D8, 0x30D9, 0x30DA, 0x30DB, 0x30DC, 0x30DD, 0x30DE, 0x30DF, /* 0x50 */
     0x30E0, 0x30E1, 0x30E2, 0x30E3, 0x30E4, 0x30E5, 0x30E6, 0x30E7, /* 0x60 */
     0x30E8, 0x30E9, 0x30EA, 0x30EB, 0x30EC, 0x30ED, 0x30EE, 0x30EF, /* 0x60 */
-    0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6          /* 0x70 */
+    0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6			/* 0x70 */
                                                                     /* 0x70 */
 };
 
@@ -139,35 +139,35 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_25[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_26[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, /* 0x20 */
     0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, /* 0x20 */
     0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, /* 0x30 */
-    0x03A9,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
+    0x03A9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
          0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, /* 0x40 */
     0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, /* 0x40 */
     0x03C0, 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, /* 0x50 */
-    0x03C9                                                          /* 0x50 */
+    0x03C9															/* 0x50 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_27[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401, /* 0x20 */
     0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, /* 0x20 */
     0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, /* 0x30 */
     0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, /* 0x30 */
-    0x042E, 0x042F,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
+    0x042E, 0x042F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
          0, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451, /* 0x50 */
     0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, /* 0x50 */
     0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, /* 0x60 */
     0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, /* 0x60 */
-    0x044E, 0x044F                                                  /* 0x70 */
+    0x044E, 0x044F													/* 0x70 */
                                                                     /* 0x70 */
 };
 
@@ -175,13 +175,13 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_27[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_28[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x2500, 0x2502, 0x250C, 0x2510, 0x2518, 0x2514, 0x251C, /* 0x20 */
     0x252C, 0x2524, 0x2534, 0x253C, 0x2501, 0x2503, 0x250F, 0x2513, /* 0x20 */
     0x251B, 0x2517, 0x2523, 0x2533, 0x252B, 0x253B, 0x254B, 0x2520, /* 0x30 */
     0x252F, 0x2528, 0x2537, 0x253F, 0x251D, 0x2530, 0x2525, 0x2538, /* 0x30 */
-    0x2542                                                          /* 0x40 */
+    0x2542															/* 0x40 */
                                                                     /* 0x40 */
 };
 
@@ -209,8 +209,8 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_2D[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_30[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x4E9C, 0x5516, 0x5A03, 0x963F, 0x54C0, 0x611B, 0x6328, /* 0x20 */
     0x59F6, 0x9022, 0x8475, 0x831C, 0x7A50, 0x60AA, 0x63E1, 0x6E25, /* 0x20 */
     0x65ED, 0x8466, 0x82A6, 0x9BF5, 0x6893, 0x5727, 0x65A1, 0x6271, /* 0x30 */
@@ -222,15 +222,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_30[] =
     0x840E, 0x8863, 0x8B02, 0x9055, 0x907A, 0x533B, 0x4E95, 0x4EA5, /* 0x60 */
     0x57DF, 0x80B2, 0x90C1, 0x78EF, 0x4E00, 0x58F1, 0x6EA2, 0x9038, /* 0x60 */
     0x7A32, 0x8328, 0x828B, 0x9C2F, 0x5141, 0x5370, 0x54BD, 0x54E1, /* 0x70 */
-    0x56E0, 0x59FB, 0x5F15, 0x98F2, 0x6DEB, 0x80E4, 0x852D          /* 0x70 */
+    0x56E0, 0x59FB, 0x5F15, 0x98F2, 0x6DEB, 0x80E4, 0x852D			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_31[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9662, 0x9670, 0x96A0, 0x97FB, 0x540B, 0x53F3, 0x5B87, /* 0x20 */
     0x70CF, 0x7FBD, 0x8FC2, 0x96E8, 0x536F, 0x9D5C, 0x7ABA, 0x4E11, /* 0x20 */
     0x7893, 0x81FC, 0x6E26, 0x5618, 0x5504, 0x6B1D, 0x851A, 0x9C3B, /* 0x30 */
@@ -242,15 +242,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_31[] =
     0x5712, 0x5830, 0x5944, 0x5BB4, 0x5EF6, 0x6028, 0x63A9, 0x63F4, /* 0x60 */
     0x6CBF, 0x6F14, 0x708E, 0x7114, 0x7159, 0x71D5, 0x733F, 0x7E01, /* 0x60 */
     0x8276, 0x82D1, 0x8597, 0x9060, 0x925B, 0x9D1B, 0x5869, 0x65BC, /* 0x70 */
-    0x6C5A, 0x7525, 0x51F9, 0x592E, 0x5965, 0x5F80, 0x5FDC          /* 0x70 */
+    0x6C5A, 0x7525, 0x51F9, 0x592E, 0x5965, 0x5F80, 0x5FDC			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_32[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x62BC, 0x65FA, 0x6A2A, 0x6B27, 0x6BB4, 0x738B, 0x7FC1, /* 0x20 */
     0x8956, 0x9D2C, 0x9D0E, 0x9EC4, 0x5CA1, 0x6C96, 0x837B, 0x5104, /* 0x20 */
     0x5C4B, 0x61B6, 0x81C6, 0x6876, 0x7261, 0x4E59, 0x4FFA, 0x5378, /* 0x30 */
@@ -262,15 +262,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_32[] =
     0x8FE6, 0x904E, 0x971E, 0x868A, 0x4FC4, 0x5CE8, 0x6211, 0x7259, /* 0x60 */
     0x753B, 0x81E5, 0x82BD, 0x86FE, 0x8CC0, 0x96C5, 0x9913, 0x99D5, /* 0x60 */
     0x4ECB, 0x4F1A, 0x89E3, 0x56DE, 0x584A, 0x58CA, 0x5EFB, 0x5FEB, /* 0x70 */
-    0x602A, 0x6094, 0x6062, 0x61D0, 0x6212, 0x62D0, 0x6539          /* 0x70 */
+    0x602A, 0x6094, 0x6062, 0x61D0, 0x6212, 0x62D0, 0x6539			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_33[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9B41, 0x6666, 0x68B0, 0x6D77, 0x7070, 0x754C, 0x7686, /* 0x20 */
     0x7D75, 0x82A5, 0x87F9, 0x958B, 0x968E, 0x8C9D, 0x51F1, 0x52BE, /* 0x20 */
     0x5916, 0x54B3, 0x5BB3, 0x5D16, 0x6168, 0x6982, 0x6DAF, 0x788D, /* 0x30 */
@@ -282,15 +282,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_33[] =
     0x6A7F, 0x68B6, 0x9C0D, 0x6F5F, 0x5272, 0x559D, 0x6070, 0x62EC, /* 0x60 */
     0x6D3B, 0x6E07, 0x6ED1, 0x845B, 0x8910, 0x8F44, 0x4E14, 0x9C39, /* 0x60 */
     0x53F6, 0x691B, 0x6A3A, 0x9784, 0x682A, 0x515C, 0x7AC3, 0x84B2, /* 0x70 */
-    0x91DC, 0x938C, 0x565B, 0x9D28, 0x6822, 0x8305, 0x8431          /* 0x70 */
+    0x91DC, 0x938C, 0x565B, 0x9D28, 0x6822, 0x8305, 0x8431			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_34[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7CA5, 0x5208, 0x82C5, 0x74E6, 0x4E7E, 0x4F83, 0x51A0, /* 0x20 */
     0x5BD2, 0x520A, 0x52D8, 0x52E7, 0x5DFB, 0x559A, 0x582A, 0x59E6, /* 0x20 */
     0x5B8C, 0x5B98, 0x5BDB, 0x5E72, 0x5E79, 0x60A3, 0x611F, 0x6163, /* 0x30 */
@@ -302,15 +302,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_34[] =
     0x5DCC, 0x73A9, 0x764C, 0x773C, 0x5CA9, 0x7FEB, 0x8D0B, 0x96C1, /* 0x60 */
     0x9811, 0x9854, 0x9858, 0x4F01, 0x4F0E, 0x5371, 0x559C, 0x5668, /* 0x60 */
     0x57FA, 0x5947, 0x5B09, 0x5BC4, 0x5C90, 0x5E0C, 0x5E7E, 0x5FCC, /* 0x70 */
-    0x63EE, 0x673A, 0x65D7, 0x65E2, 0x671F, 0x68CB, 0x68C4          /* 0x70 */
+    0x63EE, 0x673A, 0x65D7, 0x65E2, 0x671F, 0x68CB, 0x68C4			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_35[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6A5F, 0x5E30, 0x6BC5, 0x6C17, 0x6C7D, 0x757F, 0x7948, /* 0x20 */
     0x5B63, 0x7A00, 0x7D00, 0x5FBD, 0x898F, 0x8A18, 0x8CB4, 0x8D77, /* 0x20 */
     0x8ECC, 0x8F1D, 0x98E2, 0x9A0E, 0x9B3C, 0x4E80, 0x507D, 0x5100, /* 0x30 */
@@ -322,15 +322,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_35[] =
     0x673D, 0x6C42, 0x6C72, 0x6CE3, 0x7078, 0x7403, 0x7A76, 0x7AAE, /* 0x60 */
     0x7B08, 0x7D1A, 0x7CFE, 0x7D66, 0x65E7, 0x725B, 0x53BB, 0x5C45, /* 0x60 */
     0x5DE8, 0x62D2, 0x62E0, 0x6319, 0x6E20, 0x865A, 0x8A31, 0x8DDD, /* 0x70 */
-    0x92F8, 0x6F01, 0x79A6, 0x9B5A, 0x4EA8, 0x4EAB, 0x4EAC          /* 0x70 */
+    0x92F8, 0x6F01, 0x79A6, 0x9B5A, 0x4EA8, 0x4EAB, 0x4EAC			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_36[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x4F9B, 0x4FA0, 0x50D1, 0x5147, 0x7AF6, 0x5171, 0x51F6, /* 0x20 */
     0x5354, 0x5321, 0x537F, 0x53EB, 0x55AC, 0x5883, 0x5CE1, 0x5F37, /* 0x20 */
     0x5F4A, 0x602F, 0x6050, 0x606D, 0x631F, 0x6559, 0x6A4B, 0x6CC1, /* 0x30 */
@@ -342,15 +342,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_36[] =
     0x8B39, 0x8FD1, 0x91D1, 0x541F, 0x9280, 0x4E5D, 0x5036, 0x53E5, /* 0x60 */
     0x533A, 0x72D7, 0x7396, 0x77E9, 0x82E6, 0x8EAF, 0x99C6, 0x99C8, /* 0x60 */
     0x99D2, 0x5177, 0x611A, 0x865E, 0x55B0, 0x7A7A, 0x5076, 0x5BD3, /* 0x70 */
-    0x9047, 0x9685, 0x4E32, 0x6ADB, 0x91E7, 0x5C51, 0x5C48          /* 0x70 */
+    0x9047, 0x9685, 0x4E32, 0x6ADB, 0x91E7, 0x5C51, 0x5C48			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_37[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6398, 0x7A9F, 0x6C93, 0x9774, 0x8F61, 0x7AAA, 0x718A, /* 0x20 */
     0x9688, 0x7C82, 0x6817, 0x7E70, 0x6851, 0x936C, 0x52F2, 0x541B, /* 0x20 */
     0x85AB, 0x8A13, 0x7FA4, 0x8ECD, 0x90E1, 0x5366, 0x8888, 0x7941, /* 0x30 */
@@ -362,15 +362,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_37[] =
     0x5287, 0x621F, 0x6483, 0x6FC0, 0x9699, 0x6841, 0x5091, 0x6B20, /* 0x60 */
     0x6C7A, 0x6F54, 0x7A74, 0x7D50, 0x8840, 0x8A23, 0x6708, 0x4EF6, /* 0x60 */
     0x5039, 0x5026, 0x5065, 0x517C, 0x5238, 0x5263, 0x55A7, 0x570F, /* 0x70 */
-    0x5805, 0x5ACC, 0x5EFA, 0x61B2, 0x61F8, 0x62F3, 0x6372          /* 0x70 */
+    0x5805, 0x5ACC, 0x5EFA, 0x61B2, 0x61F8, 0x62F3, 0x6372			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_38[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x691C, 0x6A29, 0x727D, 0x72AC, 0x732E, 0x7814, 0x786F, /* 0x20 */
     0x7D79, 0x770C, 0x80A9, 0x898B, 0x8B19, 0x8CE2, 0x8ED2, 0x9063, /* 0x20 */
     0x9375, 0x967A, 0x9855, 0x9A13, 0x9E78, 0x5143, 0x539F, 0x53B3, /* 0x30 */
@@ -382,15 +382,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_38[] =
     0x4F0D, 0x5348, 0x5449, 0x543E, 0x5A2F, 0x5F8C, 0x5FA1, 0x609F, /* 0x60 */
     0x68A7, 0x6A8E, 0x745A, 0x7881, 0x8A9E, 0x8AA4, 0x8B77, 0x9190, /* 0x60 */
     0x4E5E, 0x9BC9, 0x4EA4, 0x4F7C, 0x4FAF, 0x5019, 0x5016, 0x5149, /* 0x70 */
-    0x516C, 0x529F, 0x52B9, 0x52FE, 0x539A, 0x53E3, 0x5411          /* 0x70 */
+    0x516C, 0x529F, 0x52B9, 0x52FE, 0x539A, 0x53E3, 0x5411			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_39[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x540E, 0x5589, 0x5751, 0x57A2, 0x597D, 0x5B54, 0x5B5D, /* 0x20 */
     0x5B8F, 0x5DE5, 0x5DE7, 0x5DF7, 0x5E78, 0x5E83, 0x5E9A, 0x5EB7, /* 0x20 */
     0x5F18, 0x6052, 0x614C, 0x6297, 0x62D8, 0x63A7, 0x653B, 0x6602, /* 0x30 */
@@ -402,15 +402,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_39[] =
     0x9805, 0x9999, 0x9AD8, 0x9D3B, 0x525B, 0x52AB, 0x53F7, 0x5408, /* 0x60 */
     0x58D5, 0x62F7, 0x6FE0, 0x8C6A, 0x8F5F, 0x9EB9, 0x514B, 0x523B, /* 0x60 */
     0x544A, 0x56FD, 0x7A40, 0x9177, 0x9D60, 0x9ED2, 0x7344, 0x6F09, /* 0x70 */
-    0x8170, 0x7511, 0x5FFD, 0x60DA, 0x9AA8, 0x72DB, 0x8FBC          /* 0x70 */
+    0x8170, 0x7511, 0x5FFD, 0x60DA, 0x9AA8, 0x72DB, 0x8FBC			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_3A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6B64, 0x9803, 0x4ECA, 0x56F0, 0x5764, 0x58BE, 0x5A5A, /* 0x20 */
     0x6068, 0x61C7, 0x660F, 0x6606, 0x6839, 0x68B1, 0x6DF7, 0x75D5, /* 0x20 */
     0x7D3A, 0x826E, 0x9B42, 0x4E9B, 0x4F50, 0x53C9, 0x5506, 0x5D6F, /* 0x30 */
@@ -422,15 +422,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_3A[] =
     0x6750, 0x7F6A, 0x8CA1, 0x51B4, 0x5742, 0x962A, 0x583A, 0x698A, /* 0x60 */
     0x80B4, 0x54B2, 0x5D0E, 0x57FC, 0x7895, 0x9DFA, 0x4F5C, 0x524A, /* 0x60 */
     0x548B, 0x643E, 0x6628, 0x6714, 0x67F5, 0x7A84, 0x7B56, 0x7D22, /* 0x70 */
-    0x932F, 0x685C, 0x9BAD, 0x7B39, 0x5319, 0x518A, 0x5237          /* 0x70 */
+    0x932F, 0x685C, 0x9BAD, 0x7B39, 0x5319, 0x518A, 0x5237			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_3B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5BDF, 0x62F6, 0x64AE, 0x64E6, 0x672D, 0x6BBA, 0x85A9, /* 0x20 */
     0x96D1, 0x7690, 0x9BD6, 0x634C, 0x9306, 0x9BAB, 0x76BF, 0x6652, /* 0x20 */
     0x4E09, 0x5098, 0x53C2, 0x5C71, 0x60E8, 0x6492, 0x6563, 0x685F, /* 0x30 */
@@ -442,15 +442,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_3B[] =
     0x6B7B, 0x6C0F, 0x7345, 0x7949, 0x79C1, 0x7CF8, 0x7D19, 0x7D2B, /* 0x60 */
     0x80A2, 0x8102, 0x81F3, 0x8996, 0x8A5E, 0x8A69, 0x8A66, 0x8A8C, /* 0x60 */
     0x8AEE, 0x8CC7, 0x8CDC, 0x96CC, 0x98FC, 0x6B6F, 0x4E8B, 0x4F3C, /* 0x70 */
-    0x4F8D, 0x5150, 0x5B57, 0x5BFA, 0x6148, 0x6301, 0x6642          /* 0x70 */
+    0x4F8D, 0x5150, 0x5B57, 0x5BFA, 0x6148, 0x6301, 0x6642			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_3C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6B21, 0x6ECB, 0x6CBB, 0x723E, 0x74BD, 0x75D4, 0x78C1, /* 0x20 */
     0x793A, 0x800C, 0x8033, 0x81EA, 0x8494, 0x8F9E, 0x6C50, 0x9E7F, /* 0x20 */
     0x5F0F, 0x8B58, 0x9D2B, 0x7AFA, 0x8EF8, 0x5B8D, 0x96EB, 0x4E03, /* 0x30 */
@@ -462,15 +462,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_3C[] =
     0x914C, 0x91C8, 0x932B, 0x82E5, 0x5BC2, 0x5F31, 0x60F9, 0x4E3B, /* 0x60 */
     0x53D6, 0x5B88, 0x624B, 0x6731, 0x6B8A, 0x72E9, 0x73E0, 0x7A2E, /* 0x60 */
     0x816B, 0x8DA3, 0x9152, 0x9996, 0x5112, 0x53D7, 0x546A, 0x5BFF, /* 0x70 */
-    0x6388, 0x6A39, 0x7DAC, 0x9700, 0x56DA, 0x53CE, 0x5468          /* 0x70 */
+    0x6388, 0x6A39, 0x7DAC, 0x9700, 0x56DA, 0x53CE, 0x5468			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_3D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5B97, 0x5C31, 0x5DDE, 0x4FEE, 0x6101, 0x62FE, 0x6D32, /* 0x20 */
     0x79C0, 0x79CB, 0x7D42, 0x7E4D, 0x7FD2, 0x81ED, 0x821F, 0x8490, /* 0x20 */
     0x8846, 0x8972, 0x8B90, 0x8E74, 0x8F2F, 0x9031, 0x914B, 0x916C, /* 0x30 */
@@ -482,15 +482,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_3D[] =
     0x6E96, 0x6F64, 0x76FE, 0x7D14, 0x5DE1, 0x9075, 0x9187, 0x9806, /* 0x60 */
     0x51E6, 0x521D, 0x6240, 0x6691, 0x66D9, 0x6E1A, 0x5EB6, 0x7DD2, /* 0x60 */
     0x7F72, 0x66F8, 0x85AF, 0x85F7, 0x8AF8, 0x52A9, 0x53D9, 0x5973, /* 0x70 */
-    0x5E8F, 0x5F90, 0x6055, 0x92E4, 0x9664, 0x50B7, 0x511F          /* 0x70 */
+    0x5E8F, 0x5F90, 0x6055, 0x92E4, 0x9664, 0x50B7, 0x511F			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_3E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x52DD, 0x5320, 0x5347, 0x53EC, 0x54E8, 0x5546, 0x5531, /* 0x20 */
     0x5617, 0x5968, 0x59BE, 0x5A3C, 0x5BB5, 0x5C06, 0x5C0F, 0x5C11, /* 0x20 */
     0x5C1A, 0x5E84, 0x5E8A, 0x5EE0, 0x5F70, 0x627F, 0x6284, 0x62DB, /* 0x30 */
@@ -502,15 +502,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_3E[] =
     0x9266, 0x937E, 0x9418, 0x969C, 0x9798, 0x4E0A, 0x4E08, 0x4E1E, /* 0x60 */
     0x4E57, 0x5197, 0x5270, 0x57CE, 0x5834, 0x58CC, 0x5B22, 0x5E38, /* 0x60 */
     0x60C5, 0x64FE, 0x6761, 0x6756, 0x6D44, 0x72B6, 0x7573, 0x7A63, /* 0x70 */
-    0x84B8, 0x8B72, 0x91B8, 0x9320, 0x5631, 0x57F4, 0x98FE          /* 0x70 */
+    0x84B8, 0x8B72, 0x91B8, 0x9320, 0x5631, 0x57F4, 0x98FE			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_3F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x62ED, 0x690D, 0x6B96, 0x71ED, 0x7E54, 0x8077, 0x8272, /* 0x20 */
     0x89E6, 0x98DF, 0x8755, 0x8FB1, 0x5C3B, 0x4F38, 0x4FE1, 0x4FB5, /* 0x20 */
     0x5507, 0x5A20, 0x5BDD, 0x5BE9, 0x5FC3, 0x614E, 0x632F, 0x65B0, /* 0x30 */
@@ -522,15 +522,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_3F[] =
     0x9017, 0x5439, 0x5782, 0x5E25, 0x63A8, 0x6C34, 0x708A, 0x7761, /* 0x60 */
     0x7C8B, 0x7FE0, 0x8870, 0x9042, 0x9154, 0x9310, 0x9318, 0x968F, /* 0x60 */
     0x745E, 0x9AC4, 0x5D07, 0x5D69, 0x6570, 0x67A2, 0x8DA8, 0x96DB, /* 0x70 */
-    0x636E, 0x6749, 0x6919, 0x83C5, 0x9817, 0x96C0, 0x88FE          /* 0x70 */
+    0x636E, 0x6749, 0x6919, 0x83C5, 0x9817, 0x96C0, 0x88FE			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_40[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6F84, 0x647A, 0x5BF8, 0x4E16, 0x702C, 0x755D, 0x662F, /* 0x20 */
     0x51C4, 0x5236, 0x52E2, 0x59D3, 0x5F81, 0x6027, 0x6210, 0x653F, /* 0x20 */
     0x6574, 0x661F, 0x6674, 0x68F2, 0x6816, 0x6B63, 0x6E05, 0x7272, /* 0x30 */
@@ -542,15 +542,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_40[] =
     0x7A83, 0x7BC0, 0x8AAC, 0x96EA, 0x7D76, 0x820C, 0x8749, 0x4ED9, /* 0x60 */
     0x5148, 0x5343, 0x5360, 0x5BA3, 0x5C02, 0x5C16, 0x5DDD, 0x6226, /* 0x60 */
     0x6247, 0x64B0, 0x6813, 0x6834, 0x6CC9, 0x6D45, 0x6D17, 0x67D3, /* 0x70 */
-    0x6F5C, 0x714E, 0x717D, 0x65CB, 0x7A7F, 0x7BAD, 0x7DDA          /* 0x70 */
+    0x6F5C, 0x714E, 0x717D, 0x65CB, 0x7A7F, 0x7BAD, 0x7DDA			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_41[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7E4A, 0x7FA8, 0x817A, 0x821B, 0x8239, 0x85A6, 0x8A6E, /* 0x20 */
     0x8CCE, 0x8DF5, 0x9078, 0x9077, 0x92AD, 0x9291, 0x9583, 0x9BAE, /* 0x20 */
     0x524D, 0x5584, 0x6F38, 0x7136, 0x5168, 0x7985, 0x7E55, 0x81B3, /* 0x30 */
@@ -562,15 +562,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_41[] =
     0x64CD, 0x65E9, 0x66F9, 0x5DE3, 0x69CD, 0x69FD, 0x6F15, 0x71E5, /* 0x60 */
     0x4E89, 0x75E9, 0x76F8, 0x7A93, 0x7CDF, 0x7DCF, 0x7D9C, 0x8061, /* 0x60 */
     0x8349, 0x8358, 0x846C, 0x84BC, 0x85FB, 0x88C5, 0x8D70, 0x9001, /* 0x70 */
-    0x906D, 0x9397, 0x971C, 0x9A12, 0x50CF, 0x5897, 0x618E          /* 0x70 */
+    0x906D, 0x9397, 0x971C, 0x9A12, 0x50CF, 0x5897, 0x618E			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_42[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x81D3, 0x8535, 0x8D08, 0x9020, 0x4FC3, 0x5074, 0x5247, /* 0x20 */
     0x5373, 0x606F, 0x6349, 0x675F, 0x6E2C, 0x8DB3, 0x901F, 0x4FD7, /* 0x20 */
     0x5C5E, 0x8CCA, 0x65CF, 0x7D9A, 0x5352, 0x8896, 0x5176, 0x63C3, /* 0x30 */
@@ -582,15 +582,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_42[] =
     0x9000, 0x902E, 0x968A, 0x9EDB, 0x9BDB, 0x4EE3, 0x53F0, 0x5927, /* 0x60 */
     0x7B2C, 0x918D, 0x984C, 0x9DF9, 0x6EDD, 0x7027, 0x5353, 0x5544, /* 0x60 */
     0x5B85, 0x6258, 0x629E, 0x62D3, 0x6CA2, 0x6FEF, 0x7422, 0x8A17, /* 0x70 */
-    0x9438, 0x6FC1, 0x8AFE, 0x8338, 0x51E7, 0x86F8, 0x53EA          /* 0x70 */
+    0x9438, 0x6FC1, 0x8AFE, 0x8338, 0x51E7, 0x86F8, 0x53EA			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_43[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x53E9, 0x4F46, 0x9054, 0x8FB0, 0x596A, 0x8131, 0x5DFD, /* 0x20 */
     0x7AEA, 0x8FBF, 0x68DA, 0x8C37, 0x72F8, 0x9C48, 0x6A3D, 0x8AB0, /* 0x20 */
     0x4E39, 0x5358, 0x5606, 0x5766, 0x62C5, 0x63A2, 0x65E6, 0x6B4E, /* 0x30 */
@@ -602,15 +602,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_43[] =
     0x9010, 0x79E9, 0x7A92, 0x8336, 0x5AE1, 0x7740, 0x4E2D, 0x4EF2, /* 0x60 */
     0x5B99, 0x5FE0, 0x62BD, 0x663C, 0x67F1, 0x6CE8, 0x866B, 0x8877, /* 0x60 */
     0x8A3B, 0x914E, 0x92F3, 0x99D0, 0x6A17, 0x7026, 0x732A, 0x82E7, /* 0x70 */
-    0x8457, 0x8CAF, 0x4E01, 0x5146, 0x51CB, 0x558B, 0x5BF5          /* 0x70 */
+    0x8457, 0x8CAF, 0x4E01, 0x5146, 0x51CB, 0x558B, 0x5BF5			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_44[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5E16, 0x5E33, 0x5E81, 0x5F14, 0x5F35, 0x5F6B, 0x5FB4, /* 0x20 */
     0x61F2, 0x6311, 0x66A2, 0x671D, 0x6F6E, 0x7252, 0x753A, 0x773A, /* 0x20 */
     0x8074, 0x8139, 0x8178, 0x8776, 0x8ABF, 0x8ADC, 0x8D85, 0x8DF3, /* 0x30 */
@@ -622,15 +622,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_44[] =
     0x91E3, 0x9DB4, 0x4EAD, 0x4F4E, 0x505C, 0x5075, 0x5243, 0x8C9E, /* 0x60 */
     0x5448, 0x5824, 0x5B9A, 0x5E1D, 0x5E95, 0x5EAD, 0x5EF7, 0x5F1F, /* 0x60 */
     0x608C, 0x62B5, 0x633A, 0x63D0, 0x68AF, 0x6C40, 0x7887, 0x798E, /* 0x70 */
-    0x7A0B, 0x7DE0, 0x8247, 0x8A02, 0x8AE6, 0x8E44, 0x9013          /* 0x70 */
+    0x7A0B, 0x7DE0, 0x8247, 0x8A02, 0x8AE6, 0x8E44, 0x9013			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_45[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x90B8, 0x912D, 0x91D8, 0x9F0E, 0x6CE5, 0x6458, 0x64E2, /* 0x20 */
     0x6575, 0x6EF4, 0x7684, 0x7B1B, 0x9069, 0x93D1, 0x6EBA, 0x54F2, /* 0x20 */
     0x5FB9, 0x64A4, 0x8F4D, 0x8FED, 0x9244, 0x5178, 0x586B, 0x5929, /* 0x30 */
@@ -642,15 +642,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_45[] =
     0x51CD, 0x5200, 0x5510, 0x5854, 0x5858, 0x5957, 0x5B95, 0x5CF6, /* 0x60 */
     0x5D8B, 0x60BC, 0x6295, 0x642D, 0x6771, 0x6843, 0x68BC, 0x68DF, /* 0x60 */
     0x76D7, 0x6DD8, 0x6E6F, 0x6D9B, 0x706F, 0x71C8, 0x5F53, 0x75D8, /* 0x70 */
-    0x7977, 0x7B49, 0x7B54, 0x7B52, 0x7CD6, 0x7D71, 0x5230          /* 0x70 */
+    0x7977, 0x7B49, 0x7B54, 0x7B52, 0x7CD6, 0x7D71, 0x5230			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_46[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8463, 0x8569, 0x85E4, 0x8A0E, 0x8B04, 0x8C46, 0x8E0F, /* 0x20 */
     0x9003, 0x900F, 0x9419, 0x9676, 0x982D, 0x9A30, 0x95D8, 0x50CD, /* 0x20 */
     0x52D5, 0x540C, 0x5802, 0x5C0E, 0x61A7, 0x649E, 0x6D1E, 0x77B3, /* 0x30 */
@@ -662,15 +662,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_46[] =
     0x5948, 0x90A3, 0x5185, 0x4E4D, 0x51EA, 0x8599, 0x8B0E, 0x7058, /* 0x60 */
     0x637A, 0x934B, 0x6962, 0x99B4, 0x7E04, 0x7577, 0x5357, 0x6960, /* 0x60 */
     0x8EDF, 0x96E3, 0x6C5D, 0x4E8C, 0x5C3C, 0x5F10, 0x8FE9, 0x5302, /* 0x70 */
-    0x8CD1, 0x8089, 0x8679, 0x5EFF, 0x65E5, 0x4E73, 0x5165          /* 0x70 */
+    0x8CD1, 0x8089, 0x8679, 0x5EFF, 0x65E5, 0x4E73, 0x5165			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_47[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5982, 0x5C3F, 0x97EE, 0x4EFB, 0x598A, 0x5FCD, 0x8A8D, /* 0x20 */
     0x6FE1, 0x79B0, 0x7962, 0x5BE7, 0x8471, 0x732B, 0x71B1, 0x5E74, /* 0x20 */
     0x5FF5, 0x637B, 0x649A, 0x71C3, 0x7C98, 0x4E43, 0x5EFC, 0x4E4B, /* 0x30 */
@@ -682,15 +682,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_47[] =
     0x6973, 0x7164, 0x72FD, 0x8CB7, 0x58F2, 0x8CE0, 0x966A, 0x9019, /* 0x60 */
     0x877F, 0x79E4, 0x77E7, 0x8429, 0x4F2F, 0x5265, 0x535A, 0x62CD, /* 0x60 */
     0x67CF, 0x6CCA, 0x767D, 0x7B94, 0x7C95, 0x8236, 0x8584, 0x8FEB, /* 0x70 */
-    0x66DD, 0x6F20, 0x7206, 0x7E1B, 0x83AB, 0x99C1, 0x9EA6          /* 0x70 */
+    0x66DD, 0x6F20, 0x7206, 0x7E1B, 0x83AB, 0x99C1, 0x9EA6			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_48[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x51FD, 0x7BB1, 0x7872, 0x7BB8, 0x8087, 0x7B48, 0x6AE8, /* 0x20 */
     0x5E61, 0x808C, 0x7551, 0x7560, 0x516B, 0x9262, 0x6E8C, 0x767A, /* 0x20 */
     0x9197, 0x9AEA, 0x4F10, 0x7F70, 0x629C, 0x7B4F, 0x95A5, 0x9CE9, /* 0x30 */
@@ -702,15 +702,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_48[] =
     0x5F7C, 0x60B2, 0x6249, 0x6279, 0x62AB, 0x6590, 0x6BD4, 0x6CCC, /* 0x60 */
     0x75B2, 0x76AE, 0x7891, 0x79D8, 0x7DCB, 0x7F77, 0x80A5, 0x88AB, /* 0x60 */
     0x8AB9, 0x8CBB, 0x907F, 0x975E, 0x98DB, 0x6A0B, 0x7C38, 0x5099, /* 0x70 */
-    0x5C3E, 0x5FAE, 0x6787, 0x6BD8, 0x7435, 0x7709, 0x7F8E          /* 0x70 */
+    0x5C3E, 0x5FAE, 0x6787, 0x6BD8, 0x7435, 0x7709, 0x7F8E			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_49[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9F3B, 0x67CA, 0x7A17, 0x5339, 0x758B, 0x9AED, 0x5F66, /* 0x20 */
     0x819D, 0x83F1, 0x8098, 0x5F3C, 0x5FC5, 0x7562, 0x7B46, 0x903C, /* 0x20 */
     0x6867, 0x59EB, 0x5A9B, 0x7D10, 0x767E, 0x8B2C, 0x4FF5, 0x5F6A, /* 0x30 */
@@ -722,15 +722,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_49[] =
     0x65A7, 0x666E, 0x6D6E, 0x7236, 0x7B26, 0x8150, 0x819A, 0x8299, /* 0x60 */
     0x8B5C, 0x8CA0, 0x8CE6, 0x8D74, 0x961C, 0x9644, 0x4FAE, 0x64AB, /* 0x60 */
     0x6B66, 0x821E, 0x8461, 0x856A, 0x90E8, 0x5C01, 0x6953, 0x98A8, /* 0x70 */
-    0x847A, 0x8557, 0x4F0F, 0x526F, 0x5FA9, 0x5E45, 0x670D          /* 0x70 */
+    0x847A, 0x8557, 0x4F0F, 0x526F, 0x5FA9, 0x5E45, 0x670D			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_4A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x798F, 0x8179, 0x8907, 0x8986, 0x6DF5, 0x5F17, 0x6255, /* 0x20 */
     0x6CB8, 0x4ECF, 0x7269, 0x9B92, 0x5206, 0x543B, 0x5674, 0x58B3, /* 0x20 */
     0x61A4, 0x626E, 0x711A, 0x596E, 0x7C89, 0x7CDE, 0x7D1B, 0x96F0, /* 0x30 */
@@ -742,15 +742,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_4A[] =
     0x5703, 0x6355, 0x6B69, 0x752B, 0x88DC, 0x8F14, 0x7A42, 0x52DF, /* 0x60 */
     0x5893, 0x6155, 0x620A, 0x66AE, 0x6BCD, 0x7C3F, 0x83E9, 0x5023, /* 0x60 */
     0x4FF8, 0x5305, 0x5446, 0x5831, 0x5949, 0x5B9D, 0x5CF0, 0x5CEF, /* 0x70 */
-    0x5D29, 0x5E96, 0x62B1, 0x6367, 0x653E, 0x65B9, 0x670B          /* 0x70 */
+    0x5D29, 0x5E96, 0x62B1, 0x6367, 0x653E, 0x65B9, 0x670B			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_4B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6CD5, 0x6CE1, 0x70F9, 0x7832, 0x7E2B, 0x80DE, 0x82B3, /* 0x20 */
     0x840C, 0x84EC, 0x8702, 0x8912, 0x8A2A, 0x8C4A, 0x90A6, 0x92D2, /* 0x20 */
     0x98FD, 0x9CF3, 0x9D6C, 0x4E4F, 0x4EA1, 0x508D, 0x5256, 0x574A, /* 0x30 */
@@ -762,15 +762,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_4B[] =
     0x6469, 0x78E8, 0x9B54, 0x9EBB, 0x57CB, 0x59B9, 0x6627, 0x679A, /* 0x60 */
     0x6BCE, 0x54E9, 0x69D9, 0x5E55, 0x819C, 0x6795, 0x9BAA, 0x67FE, /* 0x60 */
     0x9C52, 0x685D, 0x4EA6, 0x4FE3, 0x53C8, 0x62B9, 0x672B, 0x6CAB, /* 0x70 */
-    0x8FC4, 0x4FAD, 0x7E6D, 0x9EBF, 0x4E07, 0x6162, 0x6E80          /* 0x70 */
+    0x8FC4, 0x4FAD, 0x7E6D, 0x9EBF, 0x4E07, 0x6162, 0x6E80			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_4C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6F2B, 0x8513, 0x5473, 0x672A, 0x9B45, 0x5DF3, 0x7B95, /* 0x20 */
     0x5CAC, 0x5BC6, 0x871C, 0x6E4A, 0x84D1, 0x7A14, 0x8108, 0x5999, /* 0x20 */
     0x7C8D, 0x6C11, 0x7720, 0x52D9, 0x5922, 0x7121, 0x725F, 0x77DB, /* 0x30 */
@@ -782,15 +782,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_4C[] =
     0x5C24, 0x623B, 0x7C7E, 0x8CB0, 0x554F, 0x60B6, 0x7D0B, 0x9580, /* 0x60 */
     0x5301, 0x4E5F, 0x51B6, 0x591C, 0x723A, 0x8036, 0x91CE, 0x5F25, /* 0x60 */
     0x77E2, 0x5384, 0x5F79, 0x7D04, 0x85AC, 0x8A33, 0x8E8D, 0x9756, /* 0x70 */
-    0x67F3, 0x85AE, 0x9453, 0x6109, 0x6108, 0x6CB9, 0x7652          /* 0x70 */
+    0x67F3, 0x85AE, 0x9453, 0x6109, 0x6108, 0x6CB9, 0x7652			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_4D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8AED, 0x8F38, 0x552F, 0x4F51, 0x512A, 0x52C7, 0x53CB, /* 0x20 */
     0x5BA5, 0x5E7D, 0x60A0, 0x6182, 0x63D6, 0x6709, 0x67DA, 0x6E67, /* 0x20 */
     0x6D8C, 0x7336, 0x7337, 0x7531, 0x7950, 0x88D5, 0x8A98, 0x904A, /* 0x30 */
@@ -802,15 +802,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_4D[] =
     0x6C83, 0x6D74, 0x7FCC, 0x7FFC, 0x6DC0, 0x7F85, 0x87BA, 0x88F8, /* 0x60 */
     0x6765, 0x83B1, 0x983C, 0x96F7, 0x6D1B, 0x7D61, 0x843D, 0x916A, /* 0x60 */
     0x4E71, 0x5375, 0x5D50, 0x6B04, 0x6FEB, 0x85CD, 0x862D, 0x89A7, /* 0x70 */
-    0x5229, 0x540F, 0x5C65, 0x674E, 0x68A8, 0x7406, 0x7483          /* 0x70 */
+    0x5229, 0x540F, 0x5C65, 0x674E, 0x68A8, 0x7406, 0x7483			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_4E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x75E2, 0x88CF, 0x88E1, 0x91CC, 0x96E2, 0x9678, 0x5F8B, /* 0x20 */
     0x7387, 0x7ACB, 0x844E, 0x63A0, 0x7565, 0x5289, 0x6D41, 0x6E9C, /* 0x20 */
     0x7409, 0x7559, 0x786B, 0x7C92, 0x9686, 0x7ADC, 0x9F8D, 0x4FB6, /* 0x30 */
@@ -822,22 +822,22 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_4E[] =
     0x985E, 0x4EE4, 0x4F36, 0x4F8B, 0x51B7, 0x52B1, 0x5DBA, 0x601C, /* 0x60 */
     0x73B2, 0x793C, 0x82D3, 0x9234, 0x96B7, 0x96F6, 0x970A, 0x9E97, /* 0x60 */
     0x9F62, 0x66A6, 0x6B74, 0x5217, 0x52A3, 0x70C8, 0x88C2, 0x5EC9, /* 0x70 */
-    0x604B, 0x6190, 0x6F23, 0x7149, 0x7C3E, 0x7DF4, 0x806F          /* 0x70 */
+    0x604B, 0x6190, 0x6F23, 0x7149, 0x7C3E, 0x7DF4, 0x806F			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_4F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x84EE, 0x9023, 0x932C, 0x5442, 0x9B6F, 0x6AD3, 0x7089, /* 0x20 */
     0x8CC2, 0x8DEF, 0x9732, 0x52B4, 0x5A41, 0x5ECA, 0x5F04, 0x6717, /* 0x20 */
     0x697C, 0x6994, 0x6D6A, 0x6F0F, 0x7262, 0x72FC, 0x7BED, 0x8001, /* 0x30 */
     0x807E, 0x874B, 0x90CE, 0x516D, 0x9E93, 0x7984, 0x808B, 0x9332, /* 0x30 */
     0x8AD6, 0x502D, 0x548C, 0x8A71, 0x6B6A, 0x8CC4, 0x8107, 0x60D1, /* 0x40 */
     0x67A0, 0x9DF2, 0x4E99, 0x4E98, 0x9C10, 0x8A6B, 0x85C1, 0x8568, /* 0x40 */
-    0x6900, 0x6E7E, 0x7897, 0x8155                                  /* 0x50 */
+    0x6900, 0x6E7E, 0x7897, 0x8155									/* 0x50 */
                                                                     /* 0x50 */
 };
 
@@ -845,8 +845,8 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_4F[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_50[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5F0C, 0x4E10, 0x4E15, 0x4E2A, 0x4E31, 0x4E36, 0x4E3C, /* 0x20 */
     0x4E3F, 0x4E42, 0x4E56, 0x4E58, 0x4E82, 0x4E85, 0x8C6B, 0x4E8A, /* 0x20 */
     0x8212, 0x5F0D, 0x4E8E, 0x4E9E, 0x4E9F, 0x4EA0, 0x4EA2, 0x4EB0, /* 0x30 */
@@ -858,15 +858,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_50[] =
     0x4FE5, 0x501A, 0x5028, 0x5014, 0x502A, 0x5025, 0x5005, 0x4F1C, /* 0x60 */
     0x4FF6, 0x5021, 0x5029, 0x502C, 0x4FFE, 0x4FEF, 0x5011, 0x5006, /* 0x60 */
     0x5043, 0x5047, 0x6703, 0x5055, 0x5050, 0x5048, 0x505A, 0x5056, /* 0x70 */
-    0x506C, 0x5078, 0x5080, 0x509A, 0x5085, 0x50B4, 0x50B2          /* 0x70 */
+    0x506C, 0x5078, 0x5080, 0x509A, 0x5085, 0x50B4, 0x50B2			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_51[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x50C9, 0x50CA, 0x50B3, 0x50C2, 0x50D6, 0x50DE, 0x50E5, /* 0x20 */
     0x50ED, 0x50E3, 0x50EE, 0x50F9, 0x50F5, 0x5109, 0x5101, 0x5102, /* 0x20 */
     0x5116, 0x5115, 0x5114, 0x511A, 0x5121, 0x513A, 0x5137, 0x513C, /* 0x30 */
@@ -878,15 +878,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_51[] =
     0x51F0, 0x51F5, 0x51FE, 0x5204, 0x520B, 0x5214, 0x520E, 0x5227, /* 0x60 */
     0x522A, 0x522E, 0x5233, 0x5239, 0x524F, 0x5244, 0x524B, 0x524C, /* 0x60 */
     0x525E, 0x5254, 0x526A, 0x5274, 0x5269, 0x5273, 0x527F, 0x527D, /* 0x70 */
-    0x528D, 0x5294, 0x5292, 0x5271, 0x5288, 0x5291, 0x8FA8          /* 0x70 */
+    0x528D, 0x5294, 0x5292, 0x5271, 0x5288, 0x5291, 0x8FA8			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_52[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8FA7, 0x52AC, 0x52AD, 0x52BC, 0x52B5, 0x52C1, 0x52CD, /* 0x20 */
     0x52D7, 0x52DE, 0x52E3, 0x52E6, 0x98ED, 0x52E0, 0x52F3, 0x52F5, /* 0x20 */
     0x52F8, 0x52F9, 0x5306, 0x5308, 0x7538, 0x530D, 0x5310, 0x530F, /* 0x30 */
@@ -898,15 +898,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_52[] =
     0x5440, 0x542C, 0x542D, 0x543C, 0x542E, 0x5436, 0x5429, 0x541D, /* 0x60 */
     0x544E, 0x548F, 0x5475, 0x548E, 0x545F, 0x5471, 0x5477, 0x5470, /* 0x60 */
     0x5492, 0x547B, 0x5480, 0x5476, 0x5484, 0x5490, 0x5486, 0x54C7, /* 0x70 */
-    0x54A2, 0x54B8, 0x54A5, 0x54AC, 0x54C4, 0x54C8, 0x54A8          /* 0x70 */
+    0x54A2, 0x54B8, 0x54A5, 0x54AC, 0x54C4, 0x54C8, 0x54A8			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_53[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x54AB, 0x54C2, 0x54A4, 0x54BE, 0x54BC, 0x54D8, 0x54E5, /* 0x20 */
     0x54E6, 0x550F, 0x5514, 0x54FD, 0x54EE, 0x54ED, 0x54FA, 0x54E2, /* 0x20 */
     0x5539, 0x5540, 0x5563, 0x554C, 0x552E, 0x555C, 0x5545, 0x5556, /* 0x30 */
@@ -918,15 +918,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_53[] =
     0x566B, 0x5664, 0x562F, 0x566C, 0x566A, 0x5686, 0x5680, 0x568A, /* 0x60 */
     0x56A0, 0x5694, 0x568F, 0x56A5, 0x56AE, 0x56B6, 0x56B4, 0x56C2, /* 0x60 */
     0x56BC, 0x56C1, 0x56C3, 0x56C0, 0x56C8, 0x56CE, 0x56D1, 0x56D3, /* 0x70 */
-    0x56D7, 0x56EE, 0x56F9, 0x5700, 0x56FF, 0x5704, 0x5709          /* 0x70 */
+    0x56D7, 0x56EE, 0x56F9, 0x5700, 0x56FF, 0x5704, 0x5709			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_54[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5708, 0x570B, 0x570D, 0x5713, 0x5718, 0x5716, 0x55C7, /* 0x20 */
     0x571C, 0x5726, 0x5737, 0x5738, 0x574E, 0x573B, 0x5740, 0x574F, /* 0x20 */
     0x5769, 0x57C0, 0x5788, 0x5761, 0x577F, 0x5789, 0x5793, 0x57A0, /* 0x30 */
@@ -938,15 +938,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_54[] =
     0x58DC, 0x58E4, 0x58DF, 0x58EF, 0x58FA, 0x58F9, 0x58FB, 0x58FC, /* 0x60 */
     0x58FD, 0x5902, 0x590A, 0x5910, 0x591B, 0x68A6, 0x5925, 0x592C, /* 0x60 */
     0x592D, 0x5932, 0x5938, 0x593E, 0x7AD2, 0x5955, 0x5950, 0x594E, /* 0x70 */
-    0x595A, 0x5958, 0x5962, 0x5960, 0x5967, 0x596C, 0x5969          /* 0x70 */
+    0x595A, 0x5958, 0x5962, 0x5960, 0x5967, 0x596C, 0x5969			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_55[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5978, 0x5981, 0x599D, 0x4F5E, 0x4FAB, 0x59A3, 0x59B2, /* 0x20 */
     0x59C6, 0x59E8, 0x59DC, 0x598D, 0x59D9, 0x59DA, 0x5A25, 0x5A1F, /* 0x20 */
     0x5A11, 0x5A1C, 0x5A09, 0x5A1A, 0x5A40, 0x5A6C, 0x5A49, 0x5A35, /* 0x30 */
@@ -958,15 +958,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_55[] =
     0x5B83, 0x5BA6, 0x5BB8, 0x5BC3, 0x5BC7, 0x5BC9, 0x5BD4, 0x5BD0, /* 0x60 */
     0x5BE4, 0x5BE6, 0x5BE2, 0x5BDE, 0x5BE5, 0x5BEB, 0x5BF0, 0x5BF6, /* 0x60 */
     0x5BF3, 0x5C05, 0x5C07, 0x5C08, 0x5C0D, 0x5C13, 0x5C20, 0x5C22, /* 0x70 */
-    0x5C28, 0x5C38, 0x5C39, 0x5C41, 0x5C46, 0x5C4E, 0x5C53          /* 0x70 */
+    0x5C28, 0x5C38, 0x5C39, 0x5C41, 0x5C46, 0x5C4E, 0x5C53			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_56[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5C50, 0x5C4F, 0x5B71, 0x5C6C, 0x5C6E, 0x4E62, 0x5C76, /* 0x20 */
     0x5C79, 0x5C8C, 0x5C91, 0x5C94, 0x599B, 0x5CAB, 0x5CBB, 0x5CB6, /* 0x20 */
     0x5CBC, 0x5CB7, 0x5CC5, 0x5CBE, 0x5CC7, 0x5CD9, 0x5CE9, 0x5CFD, /* 0x30 */
@@ -978,15 +978,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_56[] =
     0x5DEB, 0x5DF2, 0x5DF5, 0x5E0B, 0x5E1A, 0x5E19, 0x5E11, 0x5E1B, /* 0x60 */
     0x5E36, 0x5E37, 0x5E44, 0x5E43, 0x5E40, 0x5E4E, 0x5E57, 0x5E54, /* 0x60 */
     0x5E5F, 0x5E62, 0x5E64, 0x5E47, 0x5E75, 0x5E76, 0x5E7A, 0x9EBC, /* 0x70 */
-    0x5E7F, 0x5EA0, 0x5EC1, 0x5EC2, 0x5EC8, 0x5ED0, 0x5ECF          /* 0x70 */
+    0x5E7F, 0x5EA0, 0x5EC1, 0x5EC2, 0x5EC8, 0x5ED0, 0x5ECF			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_57[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5ED6, 0x5EE3, 0x5EDD, 0x5EDA, 0x5EDB, 0x5EE2, 0x5EE1, /* 0x20 */
     0x5EE8, 0x5EE9, 0x5EEC, 0x5EF1, 0x5EF3, 0x5EF0, 0x5EF4, 0x5EF8, /* 0x20 */
     0x5EFE, 0x5F03, 0x5F09, 0x5F5D, 0x5F5C, 0x5F0B, 0x5F11, 0x5F16, /* 0x30 */
@@ -998,15 +998,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_57[] =
     0x6019, 0x6010, 0x6029, 0x600E, 0x6031, 0x601B, 0x6015, 0x602B, /* 0x60 */
     0x6026, 0x600F, 0x603A, 0x605A, 0x6041, 0x606A, 0x6077, 0x605F, /* 0x60 */
     0x604A, 0x6046, 0x604D, 0x6063, 0x6043, 0x6064, 0x6042, 0x606C, /* 0x70 */
-    0x606B, 0x6059, 0x6081, 0x608D, 0x60E7, 0x6083, 0x609A          /* 0x70 */
+    0x606B, 0x6059, 0x6081, 0x608D, 0x60E7, 0x6083, 0x609A			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_58[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6084, 0x609B, 0x6096, 0x6097, 0x6092, 0x60A7, 0x608B, /* 0x20 */
     0x60E1, 0x60B8, 0x60E0, 0x60D3, 0x60B4, 0x5FF0, 0x60BD, 0x60C6, /* 0x20 */
     0x60B5, 0x60D8, 0x614D, 0x6115, 0x6106, 0x60F6, 0x60F7, 0x6100, /* 0x30 */
@@ -1018,15 +1018,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_58[] =
     0x618A, 0x6191, 0x61AB, 0x61AE, 0x61CC, 0x61CA, 0x61C9, 0x61F7, /* 0x60 */
     0x61C8, 0x61C3, 0x61C6, 0x61BA, 0x61CB, 0x7F79, 0x61CD, 0x61E6, /* 0x60 */
     0x61E3, 0x61F6, 0x61FA, 0x61F4, 0x61FF, 0x61FD, 0x61FC, 0x61FE, /* 0x70 */
-    0x6200, 0x6208, 0x6209, 0x620D, 0x620C, 0x6214, 0x621B          /* 0x70 */
+    0x6200, 0x6208, 0x6209, 0x620D, 0x620C, 0x6214, 0x621B			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_59[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x621E, 0x6221, 0x622A, 0x622E, 0x6230, 0x6232, 0x6233, /* 0x20 */
     0x6241, 0x624E, 0x625E, 0x6263, 0x625B, 0x6260, 0x6268, 0x627C, /* 0x20 */
     0x6282, 0x6289, 0x627E, 0x6292, 0x6293, 0x6296, 0x62D4, 0x6283, /* 0x30 */
@@ -1038,15 +1038,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_59[] =
     0x6369, 0x63BE, 0x63E9, 0x63C0, 0x63C6, 0x63E3, 0x63C9, 0x63D2, /* 0x60 */
     0x63F6, 0x63C4, 0x6416, 0x6434, 0x6406, 0x6413, 0x6426, 0x6436, /* 0x60 */
     0x651D, 0x6417, 0x6428, 0x640F, 0x6467, 0x646F, 0x6476, 0x644E, /* 0x70 */
-    0x652A, 0x6495, 0x6493, 0x64A5, 0x64A9, 0x6488, 0x64BC          /* 0x70 */
+    0x652A, 0x6495, 0x6493, 0x64A5, 0x64A9, 0x6488, 0x64BC			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_5A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x64DA, 0x64D2, 0x64C5, 0x64C7, 0x64BB, 0x64D8, 0x64C2, /* 0x20 */
     0x64F1, 0x64E7, 0x8209, 0x64E0, 0x64E1, 0x62AC, 0x64E3, 0x64EF, /* 0x20 */
     0x652C, 0x64F6, 0x64F4, 0x64F2, 0x64FA, 0x6500, 0x64FD, 0x6518, /* 0x30 */
@@ -1058,15 +1058,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_5A[] =
     0x6603, 0x65FB, 0x6773, 0x6635, 0x6636, 0x6634, 0x661C, 0x664F, /* 0x60 */
     0x6644, 0x6649, 0x6641, 0x665E, 0x665D, 0x6664, 0x6667, 0x6668, /* 0x60 */
     0x665F, 0x6662, 0x6670, 0x6683, 0x6688, 0x668E, 0x6689, 0x6684, /* 0x70 */
-    0x6698, 0x669D, 0x66C1, 0x66B9, 0x66C9, 0x66BE, 0x66BC          /* 0x70 */
+    0x6698, 0x669D, 0x66C1, 0x66B9, 0x66C9, 0x66BE, 0x66BC			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_5B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x66C4, 0x66B8, 0x66D6, 0x66DA, 0x66E0, 0x663F, 0x66E6, /* 0x20 */
     0x66E9, 0x66F0, 0x66F5, 0x66F7, 0x670F, 0x6716, 0x671E, 0x6726, /* 0x20 */
     0x6727, 0x9738, 0x672E, 0x673F, 0x6736, 0x6741, 0x6738, 0x6737, /* 0x30 */
@@ -1078,15 +1078,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_5B[] =
     0x68B3, 0x682B, 0x6859, 0x6863, 0x6877, 0x687F, 0x689F, 0x688F, /* 0x60 */
     0x68AD, 0x6894, 0x689D, 0x689B, 0x6883, 0x6AAE, 0x68B9, 0x6874, /* 0x60 */
     0x68B5, 0x68A0, 0x68BA, 0x690F, 0x688D, 0x687E, 0x6901, 0x68CA, /* 0x70 */
-    0x6908, 0x68D8, 0x6922, 0x6926, 0x68E1, 0x690C, 0x68CD          /* 0x70 */
+    0x6908, 0x68D8, 0x6922, 0x6926, 0x68E1, 0x690C, 0x68CD			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_5C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x68D4, 0x68E7, 0x68D5, 0x6936, 0x6912, 0x6904, 0x68D7, /* 0x20 */
     0x68E3, 0x6925, 0x68F9, 0x68E0, 0x68EF, 0x6928, 0x692A, 0x691A, /* 0x20 */
     0x6923, 0x6921, 0x68C6, 0x6979, 0x6977, 0x695C, 0x6978, 0x696B, /* 0x30 */
@@ -1098,15 +1098,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_5C[] =
     0x69F2, 0x69E7, 0x6A05, 0x69B1, 0x6A1E, 0x69ED, 0x6A14, 0x69EB, /* 0x60 */
     0x6A0A, 0x6A12, 0x6AC1, 0x6A23, 0x6A13, 0x6A44, 0x6A0C, 0x6A72, /* 0x60 */
     0x6A36, 0x6A78, 0x6A47, 0x6A62, 0x6A59, 0x6A66, 0x6A48, 0x6A38, /* 0x70 */
-    0x6A22, 0x6A90, 0x6A8D, 0x6AA0, 0x6A84, 0x6AA2, 0x6AA3          /* 0x70 */
+    0x6A22, 0x6A90, 0x6A8D, 0x6AA0, 0x6A84, 0x6AA2, 0x6AA3			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_5D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6A97, 0x8617, 0x6ABB, 0x6AC3, 0x6AC2, 0x6AB8, 0x6AB3, /* 0x20 */
     0x6AAC, 0x6ADE, 0x6AD1, 0x6ADF, 0x6AAA, 0x6ADA, 0x6AEA, 0x6AFB, /* 0x20 */
     0x6B05, 0x8616, 0x6AFA, 0x6B12, 0x6B16, 0x9B31, 0x6B1F, 0x6B38, /* 0x30 */
@@ -1118,15 +1118,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_5D[] =
     0x9EBE, 0x6C08, 0x6C13, 0x6C14, 0x6C1B, 0x6C24, 0x6C23, 0x6C5E, /* 0x60 */
     0x6C55, 0x6C62, 0x6C6A, 0x6C82, 0x6C8D, 0x6C9A, 0x6C81, 0x6C9B, /* 0x60 */
     0x6C7E, 0x6C68, 0x6C73, 0x6C92, 0x6C90, 0x6CC4, 0x6CF1, 0x6CD3, /* 0x70 */
-    0x6CBD, 0x6CD7, 0x6CC5, 0x6CDD, 0x6CAE, 0x6CB1, 0x6CBE          /* 0x70 */
+    0x6CBD, 0x6CD7, 0x6CC5, 0x6CDD, 0x6CAE, 0x6CB1, 0x6CBE			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_5E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6CBA, 0x6CDB, 0x6CEF, 0x6CD9, 0x6CEA, 0x6D1F, 0x884D, /* 0x20 */
     0x6D36, 0x6D2B, 0x6D3D, 0x6D38, 0x6D19, 0x6D35, 0x6D33, 0x6D12, /* 0x20 */
     0x6D0C, 0x6D63, 0x6D93, 0x6D64, 0x6D5A, 0x6D79, 0x6D59, 0x6D8E, /* 0x30 */
@@ -1138,15 +1138,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_5E[] =
     0x6EFF, 0x6E1D, 0x6E38, 0x6E82, 0x6EAA, 0x6E98, 0x6EC9, 0x6EB7, /* 0x60 */
     0x6ED3, 0x6EBD, 0x6EAF, 0x6EC4, 0x6EB2, 0x6ED4, 0x6ED5, 0x6E8F, /* 0x60 */
     0x6EA5, 0x6EC2, 0x6E9F, 0x6F41, 0x6F11, 0x704C, 0x6EEC, 0x6EF8, /* 0x70 */
-    0x6EFE, 0x6F3F, 0x6EF2, 0x6F31, 0x6EEF, 0x6F32, 0x6ECC          /* 0x70 */
+    0x6EFE, 0x6F3F, 0x6EF2, 0x6F31, 0x6EEF, 0x6F32, 0x6ECC			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_5F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6F3E, 0x6F13, 0x6EF7, 0x6F86, 0x6F7A, 0x6F78, 0x6F81, /* 0x20 */
     0x6F80, 0x6F6F, 0x6F5B, 0x6FF3, 0x6F6D, 0x6F82, 0x6F7C, 0x6F58, /* 0x20 */
     0x6F8E, 0x6F91, 0x6FC2, 0x6F66, 0x6FB3, 0x6FA3, 0x6FA1, 0x6FA4, /* 0x30 */
@@ -1158,15 +1158,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_5F[] =
     0x70D9, 0x7109, 0x70FD, 0x711C, 0x7119, 0x7165, 0x7155, 0x7188, /* 0x60 */
     0x7166, 0x7162, 0x714C, 0x7156, 0x716C, 0x718F, 0x71FB, 0x7184, /* 0x60 */
     0x7195, 0x71A8, 0x71AC, 0x71D7, 0x71B9, 0x71BE, 0x71D2, 0x71C9, /* 0x70 */
-    0x71D4, 0x71CE, 0x71E0, 0x71EC, 0x71E7, 0x71F5, 0x71FC          /* 0x70 */
+    0x71D4, 0x71CE, 0x71E0, 0x71EC, 0x71E7, 0x71F5, 0x71FC			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_60[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x71F9, 0x71FF, 0x720D, 0x7210, 0x721B, 0x7228, 0x722D, /* 0x20 */
     0x722C, 0x7230, 0x7232, 0x723B, 0x723C, 0x723F, 0x7240, 0x7246, /* 0x20 */
     0x724B, 0x7258, 0x7274, 0x727E, 0x7282, 0x7281, 0x7287, 0x7292, /* 0x30 */
@@ -1178,15 +1178,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_60[] =
     0x73BB, 0x73C0, 0x73E5, 0x73EE, 0x73DE, 0x74A2, 0x7405, 0x746F, /* 0x60 */
     0x7425, 0x73F8, 0x7432, 0x743A, 0x7455, 0x743F, 0x745F, 0x7459, /* 0x60 */
     0x7441, 0x745C, 0x7469, 0x7470, 0x7463, 0x746A, 0x7476, 0x747E, /* 0x70 */
-    0x748B, 0x749E, 0x74A7, 0x74CA, 0x74CF, 0x74D4, 0x73F1          /* 0x70 */
+    0x748B, 0x749E, 0x74A7, 0x74CA, 0x74CF, 0x74D4, 0x73F1			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_61[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x74E0, 0x74E3, 0x74E7, 0x74E9, 0x74EE, 0x74F2, 0x74F0, /* 0x20 */
     0x74F1, 0x74F8, 0x74F7, 0x7504, 0x7503, 0x7505, 0x750C, 0x750E, /* 0x20 */
     0x750D, 0x7515, 0x7513, 0x751E, 0x7526, 0x752C, 0x753C, 0x7544, /* 0x30 */
@@ -1198,15 +1198,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_61[] =
     0x75FC, 0x7601, 0x75F0, 0x75FA, 0x75F2, 0x75F3, 0x760B, 0x760D, /* 0x60 */
     0x7609, 0x761F, 0x7627, 0x7620, 0x7621, 0x7622, 0x7624, 0x7634, /* 0x60 */
     0x7630, 0x763B, 0x7647, 0x7648, 0x7646, 0x765C, 0x7658, 0x7661, /* 0x70 */
-    0x7662, 0x7668, 0x7669, 0x766A, 0x7667, 0x766C, 0x7670          /* 0x70 */
+    0x7662, 0x7668, 0x7669, 0x766A, 0x7667, 0x766C, 0x7670			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_62[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7672, 0x7676, 0x7678, 0x767C, 0x7680, 0x7683, 0x7688, /* 0x20 */
     0x768B, 0x768E, 0x7696, 0x7693, 0x7699, 0x769A, 0x76B0, 0x76B4, /* 0x20 */
     0x76B8, 0x76B9, 0x76BA, 0x76C2, 0x76CD, 0x76D6, 0x76D2, 0x76DE, /* 0x30 */
@@ -1218,15 +1218,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_62[] =
     0x77D7, 0x77DA, 0x77DC, 0x77E3, 0x77EE, 0x77FC, 0x780C, 0x7812, /* 0x60 */
     0x7926, 0x7820, 0x792A, 0x7845, 0x788E, 0x7874, 0x7886, 0x787C, /* 0x60 */
     0x789A, 0x788C, 0x78A3, 0x78B5, 0x78AA, 0x78AF, 0x78D1, 0x78C6, /* 0x70 */
-    0x78CB, 0x78D4, 0x78BE, 0x78BC, 0x78C5, 0x78CA, 0x78EC          /* 0x70 */
+    0x78CB, 0x78D4, 0x78BE, 0x78BC, 0x78C5, 0x78CA, 0x78EC			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_63[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x78E7, 0x78DA, 0x78FD, 0x78F4, 0x7907, 0x7912, 0x7911, /* 0x20 */
     0x7919, 0x792C, 0x792B, 0x7940, 0x7960, 0x7957, 0x795F, 0x795A, /* 0x20 */
     0x7955, 0x7953, 0x797A, 0x797F, 0x798A, 0x799D, 0x79A7, 0x9F4B, /* 0x30 */
@@ -1238,15 +1238,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_63[] =
     0x7AB6, 0x7AC5, 0x7AC4, 0x7ABF, 0x9083, 0x7AC7, 0x7ACA, 0x7ACD, /* 0x60 */
     0x7ACF, 0x7AD5, 0x7AD3, 0x7AD9, 0x7ADA, 0x7ADD, 0x7AE1, 0x7AE2, /* 0x60 */
     0x7AE6, 0x7AED, 0x7AF0, 0x7B02, 0x7B0F, 0x7B0A, 0x7B06, 0x7B33, /* 0x70 */
-    0x7B18, 0x7B19, 0x7B1E, 0x7B35, 0x7B28, 0x7B36, 0x7B50          /* 0x70 */
+    0x7B18, 0x7B19, 0x7B1E, 0x7B35, 0x7B28, 0x7B36, 0x7B50			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_64[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7B7A, 0x7B04, 0x7B4D, 0x7B0B, 0x7B4C, 0x7B45, 0x7B75, /* 0x20 */
     0x7B65, 0x7B74, 0x7B67, 0x7B70, 0x7B71, 0x7B6C, 0x7B6E, 0x7B9D, /* 0x20 */
     0x7B98, 0x7B9F, 0x7B8D, 0x7B9C, 0x7B9A, 0x7B8B, 0x7B92, 0x7B8F, /* 0x30 */
@@ -1258,15 +1258,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_64[] =
     0x7C65, 0x7C6C, 0x7C75, 0x7C83, 0x7C90, 0x7CA4, 0x7CAD, 0x7CA2, /* 0x60 */
     0x7CAB, 0x7CA1, 0x7CA8, 0x7CB3, 0x7CB2, 0x7CB1, 0x7CAE, 0x7CB9, /* 0x60 */
     0x7CBD, 0x7CC0, 0x7CC5, 0x7CC2, 0x7CD8, 0x7CD2, 0x7CDC, 0x7CE2, /* 0x70 */
-    0x9B3B, 0x7CEF, 0x7CF2, 0x7CF4, 0x7CF6, 0x7CFA, 0x7D06          /* 0x70 */
+    0x9B3B, 0x7CEF, 0x7CF2, 0x7CF4, 0x7CF6, 0x7CFA, 0x7D06			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_65[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7D02, 0x7D1C, 0x7D15, 0x7D0A, 0x7D45, 0x7D4B, 0x7D2E, /* 0x20 */
     0x7D32, 0x7D3F, 0x7D35, 0x7D46, 0x7D73, 0x7D56, 0x7D4E, 0x7D72, /* 0x20 */
     0x7D68, 0x7D6E, 0x7D4F, 0x7D63, 0x7D93, 0x7D89, 0x7D5B, 0x7D8F, /* 0x30 */
@@ -1278,15 +1278,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_65[] =
     0x7E32, 0x7E3A, 0x7E67, 0x7E5D, 0x7E56, 0x7E5E, 0x7E59, 0x7E5A, /* 0x60 */
     0x7E79, 0x7E6A, 0x7E69, 0x7E7C, 0x7E7B, 0x7E83, 0x7DD5, 0x7E7D, /* 0x60 */
     0x8FAE, 0x7E7F, 0x7E88, 0x7E89, 0x7E8C, 0x7E92, 0x7E90, 0x7E93, /* 0x70 */
-    0x7E94, 0x7E96, 0x7E8E, 0x7E9B, 0x7E9C, 0x7F38, 0x7F3A          /* 0x70 */
+    0x7E94, 0x7E96, 0x7E8E, 0x7E9B, 0x7E9C, 0x7F38, 0x7F3A			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_66[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7F45, 0x7F4C, 0x7F4D, 0x7F4E, 0x7F50, 0x7F51, 0x7F55, /* 0x20 */
     0x7F54, 0x7F58, 0x7F5F, 0x7F60, 0x7F68, 0x7F69, 0x7F67, 0x7F78, /* 0x20 */
     0x7F82, 0x7F86, 0x7F83, 0x7F88, 0x7F87, 0x7F8C, 0x7F94, 0x7F9E, /* 0x30 */
@@ -1298,15 +1298,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_66[] =
     0x8073, 0x8072, 0x8070, 0x8076, 0x8079, 0x807D, 0x807F, 0x8084, /* 0x60 */
     0x8086, 0x8085, 0x809B, 0x8093, 0x809A, 0x80AD, 0x5190, 0x80AC, /* 0x60 */
     0x80DB, 0x80E5, 0x80D9, 0x80DD, 0x80C4, 0x80DA, 0x80D6, 0x8109, /* 0x70 */
-    0x80EF, 0x80F1, 0x811B, 0x8129, 0x8123, 0x812F, 0x814B          /* 0x70 */
+    0x80EF, 0x80F1, 0x811B, 0x8129, 0x8123, 0x812F, 0x814B			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_67[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x968B, 0x8146, 0x813E, 0x8153, 0x8151, 0x80FC, 0x8171, /* 0x20 */
     0x816E, 0x8165, 0x8166, 0x8174, 0x8183, 0x8188, 0x818A, 0x8180, /* 0x20 */
     0x8182, 0x81A0, 0x8195, 0x81A4, 0x81A3, 0x815F, 0x8193, 0x81A9, /* 0x30 */
@@ -1318,15 +1318,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_67[] =
     0x8262, 0x8268, 0x826A, 0x826B, 0x822E, 0x8271, 0x8277, 0x8278, /* 0x60 */
     0x827E, 0x828D, 0x8292, 0x82AB, 0x829F, 0x82BB, 0x82AC, 0x82E1, /* 0x60 */
     0x82E3, 0x82DF, 0x82D2, 0x82F4, 0x82F3, 0x82FA, 0x8393, 0x8303, /* 0x70 */
-    0x82FB, 0x82F9, 0x82DE, 0x8306, 0x82DC, 0x8309, 0x82D9          /* 0x70 */
+    0x82FB, 0x82F9, 0x82DE, 0x8306, 0x82DC, 0x8309, 0x82D9			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_68[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8335, 0x8334, 0x8316, 0x8332, 0x8331, 0x8340, 0x8339, /* 0x20 */
     0x8350, 0x8345, 0x832F, 0x832B, 0x8317, 0x8318, 0x8385, 0x839A, /* 0x20 */
     0x83AA, 0x839F, 0x83A2, 0x8396, 0x8323, 0x838E, 0x8387, 0x838A, /* 0x30 */
@@ -1338,15 +1338,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_68[] =
     0x846F, 0x8479, 0x8435, 0x84CA, 0x8462, 0x84B9, 0x84BF, 0x849F, /* 0x60 */
     0x84D9, 0x84CD, 0x84BB, 0x84DA, 0x84D0, 0x84C1, 0x84C6, 0x84D6, /* 0x60 */
     0x84A1, 0x8521, 0x84FF, 0x84F4, 0x8517, 0x8518, 0x852C, 0x851F, /* 0x70 */
-    0x8515, 0x8514, 0x84FC, 0x8540, 0x8563, 0x8558, 0x8548          /* 0x70 */
+    0x8515, 0x8514, 0x84FC, 0x8540, 0x8563, 0x8558, 0x8548			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_69[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8541, 0x8602, 0x854B, 0x8555, 0x8580, 0x85A4, 0x8588, /* 0x20 */
     0x8591, 0x858A, 0x85A8, 0x856D, 0x8594, 0x859B, 0x85EA, 0x8587, /* 0x20 */
     0x859C, 0x8577, 0x857E, 0x8590, 0x85C9, 0x85BA, 0x85CF, 0x85B9, /* 0x30 */
@@ -1358,15 +1358,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_69[] =
     0x86DF, 0x86DB, 0x86EF, 0x8712, 0x8706, 0x8708, 0x8700, 0x8703, /* 0x60 */
     0x86FB, 0x8711, 0x8709, 0x870D, 0x86F9, 0x870A, 0x8734, 0x873F, /* 0x60 */
     0x8737, 0x873B, 0x8725, 0x8729, 0x871A, 0x8760, 0x875F, 0x8778, /* 0x70 */
-    0x874C, 0x874E, 0x8774, 0x8757, 0x8768, 0x876E, 0x8759          /* 0x70 */
+    0x874C, 0x874E, 0x8774, 0x8757, 0x8768, 0x876E, 0x8759			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_6A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8753, 0x8763, 0x876A, 0x8805, 0x87A2, 0x879F, 0x8782, /* 0x20 */
     0x87AF, 0x87CB, 0x87BD, 0x87C0, 0x87D0, 0x96D6, 0x87AB, 0x87C4, /* 0x20 */
     0x87B3, 0x87C7, 0x87C6, 0x87BB, 0x87EF, 0x87F2, 0x87E0, 0x880F, /* 0x30 */
@@ -1378,15 +1378,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_6A[] =
     0x88B1, 0x88C3, 0x88C4, 0x88D4, 0x88D8, 0x88D9, 0x88DD, 0x88F9, /* 0x60 */
     0x8902, 0x88FC, 0x88F4, 0x88E8, 0x88F2, 0x8904, 0x890C, 0x890A, /* 0x60 */
     0x8913, 0x8943, 0x891E, 0x8925, 0x892A, 0x892B, 0x8941, 0x8944, /* 0x70 */
-    0x893B, 0x8936, 0x8938, 0x894C, 0x891D, 0x8960, 0x895E          /* 0x70 */
+    0x893B, 0x8936, 0x8938, 0x894C, 0x891D, 0x8960, 0x895E			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_6B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8966, 0x8964, 0x896D, 0x896A, 0x896F, 0x8974, 0x8977, /* 0x20 */
     0x897E, 0x8983, 0x8988, 0x898A, 0x8993, 0x8998, 0x89A1, 0x89A9, /* 0x20 */
     0x89A6, 0x89AC, 0x89AF, 0x89B2, 0x89BA, 0x89BD, 0x89BF, 0x89C0, /* 0x30 */
@@ -1398,15 +1398,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_6B[] =
     0x8AE4, 0x8AF1, 0x8B14, 0x8AE0, 0x8AE2, 0x8AF7, 0x8ADE, 0x8ADB, /* 0x60 */
     0x8B0C, 0x8B07, 0x8B1A, 0x8AE1, 0x8B16, 0x8B10, 0x8B17, 0x8B20, /* 0x60 */
     0x8B33, 0x97AB, 0x8B26, 0x8B2B, 0x8B3E, 0x8B28, 0x8B41, 0x8B4C, /* 0x70 */
-    0x8B4F, 0x8B4E, 0x8B49, 0x8B56, 0x8B5B, 0x8B5A, 0x8B6B          /* 0x70 */
+    0x8B4F, 0x8B4E, 0x8B49, 0x8B56, 0x8B5B, 0x8B5A, 0x8B6B			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_6C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8B5F, 0x8B6C, 0x8B6F, 0x8B74, 0x8B7D, 0x8B80, 0x8B8C, /* 0x20 */
     0x8B8E, 0x8B92, 0x8B93, 0x8B96, 0x8B99, 0x8B9A, 0x8C3A, 0x8C41, /* 0x20 */
     0x8C3F, 0x8C48, 0x8C4C, 0x8C4E, 0x8C50, 0x8C55, 0x8C62, 0x8C6C, /* 0x30 */
@@ -1418,15 +1418,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_6C[] =
     0x8D6D, 0x8D71, 0x8D73, 0x8D81, 0x8D99, 0x8DC2, 0x8DBE, 0x8DBA, /* 0x60 */
     0x8DCF, 0x8DDA, 0x8DD6, 0x8DCC, 0x8DDB, 0x8DCB, 0x8DEA, 0x8DEB, /* 0x60 */
     0x8DDF, 0x8DE3, 0x8DFC, 0x8E08, 0x8E09, 0x8DFF, 0x8E1D, 0x8E1E, /* 0x70 */
-    0x8E10, 0x8E1F, 0x8E42, 0x8E35, 0x8E30, 0x8E34, 0x8E4A          /* 0x70 */
+    0x8E10, 0x8E1F, 0x8E42, 0x8E35, 0x8E30, 0x8E34, 0x8E4A			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_6D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8E47, 0x8E49, 0x8E4C, 0x8E50, 0x8E48, 0x8E59, 0x8E64, /* 0x20 */
     0x8E60, 0x8E2A, 0x8E63, 0x8E55, 0x8E76, 0x8E72, 0x8E7C, 0x8E81, /* 0x20 */
     0x8E87, 0x8E85, 0x8E84, 0x8E8B, 0x8E8A, 0x8E93, 0x8E91, 0x8E94, /* 0x30 */
@@ -1438,15 +1438,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_6D[] =
     0x8F62, 0x8F63, 0x8F64, 0x8F9C, 0x8F9F, 0x8FA3, 0x8FAD, 0x8FAF, /* 0x60 */
     0x8FB7, 0x8FDA, 0x8FE5, 0x8FE2, 0x8FEA, 0x8FEF, 0x9087, 0x8FF4, /* 0x60 */
     0x9005, 0x8FF9, 0x8FFA, 0x9011, 0x9015, 0x9021, 0x900D, 0x901E, /* 0x70 */
-    0x9016, 0x900B, 0x9027, 0x9036, 0x9035, 0x9039, 0x8FF8          /* 0x70 */
+    0x9016, 0x900B, 0x9027, 0x9036, 0x9035, 0x9039, 0x8FF8			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_6E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x904F, 0x9050, 0x9051, 0x9052, 0x900E, 0x9049, 0x903E, /* 0x20 */
     0x9056, 0x9058, 0x905E, 0x9068, 0x906F, 0x9076, 0x96A8, 0x9072, /* 0x20 */
     0x9082, 0x907D, 0x9081, 0x9080, 0x908A, 0x9089, 0x908F, 0x90A8, /* 0x30 */
@@ -1458,15 +1458,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_6E[] =
     0x91F5, 0x91F6, 0x921E, 0x91FF, 0x9214, 0x922C, 0x9215, 0x9211, /* 0x60 */
     0x925E, 0x9257, 0x9245, 0x9249, 0x9264, 0x9248, 0x9295, 0x923F, /* 0x60 */
     0x924B, 0x9250, 0x929C, 0x9296, 0x9293, 0x929B, 0x925A, 0x92CF, /* 0x70 */
-    0x92B9, 0x92B7, 0x92E9, 0x930F, 0x92FA, 0x9344, 0x932E          /* 0x70 */
+    0x92B9, 0x92B7, 0x92E9, 0x930F, 0x92FA, 0x9344, 0x932E			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_6F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9319, 0x9322, 0x931A, 0x9323, 0x933A, 0x9335, 0x933B, /* 0x20 */
     0x935C, 0x9360, 0x937C, 0x936E, 0x9356, 0x93B0, 0x93AC, 0x93AD, /* 0x20 */
     0x9394, 0x93B9, 0x93D6, 0x93D7, 0x93E8, 0x93E5, 0x93D8, 0x93C3, /* 0x30 */
@@ -1478,15 +1478,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_6F[] =
     0x95A0, 0x95A8, 0x95A7, 0x95AD, 0x95BC, 0x95BB, 0x95B9, 0x95BE, /* 0x60 */
     0x95CA, 0x6FF6, 0x95C3, 0x95CD, 0x95CC, 0x95D5, 0x95D4, 0x95D6, /* 0x60 */
     0x95DC, 0x95E1, 0x95E5, 0x95E2, 0x9621, 0x9628, 0x962E, 0x962F, /* 0x70 */
-    0x9642, 0x964C, 0x964F, 0x964B, 0x9677, 0x965C, 0x965E          /* 0x70 */
+    0x9642, 0x964C, 0x964F, 0x964B, 0x9677, 0x965C, 0x965E			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_70[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x965D, 0x965F, 0x9666, 0x9672, 0x966C, 0x968D, 0x9698, /* 0x20 */
     0x9695, 0x9697, 0x96AA, 0x96A7, 0x96B1, 0x96B2, 0x96B0, 0x96B4, /* 0x20 */
     0x96B6, 0x96B8, 0x96B9, 0x96CE, 0x96CB, 0x96C9, 0x96CD, 0x894D, /* 0x30 */
@@ -1498,15 +1498,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_70[] =
     0x9790, 0x979C, 0x97A8, 0x97A6, 0x97A3, 0x97B3, 0x97B4, 0x97C3, /* 0x60 */
     0x97C6, 0x97C8, 0x97CB, 0x97DC, 0x97ED, 0x9F4F, 0x97F2, 0x7ADF, /* 0x60 */
     0x97F6, 0x97F5, 0x980F, 0x980C, 0x9838, 0x9824, 0x9821, 0x9837, /* 0x70 */
-    0x983D, 0x9846, 0x984F, 0x984B, 0x986B, 0x986F, 0x9870          /* 0x70 */
+    0x983D, 0x9846, 0x984F, 0x984B, 0x986B, 0x986F, 0x9870			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_71[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9871, 0x9874, 0x9873, 0x98AA, 0x98AF, 0x98B1, 0x98B6, /* 0x20 */
     0x98C4, 0x98C3, 0x98C6, 0x98E9, 0x98EB, 0x9903, 0x9909, 0x9912, /* 0x20 */
     0x9914, 0x9918, 0x9921, 0x991D, 0x991E, 0x9924, 0x9920, 0x992C, /* 0x30 */
@@ -1518,15 +1518,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_71[] =
     0x9A3E, 0x9A55, 0x9A4D, 0x9A5B, 0x9A57, 0x9A5F, 0x9A62, 0x9A65, /* 0x60 */
     0x9A64, 0x9A69, 0x9A6B, 0x9A6A, 0x9AAD, 0x9AB0, 0x9ABC, 0x9AC0, /* 0x60 */
     0x9ACF, 0x9AD1, 0x9AD3, 0x9AD4, 0x9ADE, 0x9ADF, 0x9AE2, 0x9AE3, /* 0x70 */
-    0x9AE6, 0x9AEF, 0x9AEB, 0x9AEE, 0x9AF4, 0x9AF1, 0x9AF7          /* 0x70 */
+    0x9AE6, 0x9AEF, 0x9AEB, 0x9AEE, 0x9AF4, 0x9AF1, 0x9AF7			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_72[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9AFB, 0x9B06, 0x9B18, 0x9B1A, 0x9B1F, 0x9B22, 0x9B23, /* 0x20 */
     0x9B25, 0x9B27, 0x9B28, 0x9B29, 0x9B2A, 0x9B2E, 0x9B2F, 0x9B32, /* 0x20 */
     0x9B44, 0x9B43, 0x9B4F, 0x9B4D, 0x9B4E, 0x9B51, 0x9B58, 0x9B74, /* 0x30 */
@@ -1538,15 +1538,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_72[] =
     0x9C30, 0x9C47, 0x9C32, 0x9C46, 0x9C3E, 0x9C5A, 0x9C60, 0x9C67, /* 0x60 */
     0x9C76, 0x9C78, 0x9CE7, 0x9CEC, 0x9CF0, 0x9D09, 0x9D08, 0x9CEB, /* 0x60 */
     0x9D03, 0x9D06, 0x9D2A, 0x9D26, 0x9DAF, 0x9D23, 0x9D1F, 0x9D44, /* 0x70 */
-    0x9D15, 0x9D12, 0x9D41, 0x9D3F, 0x9D3E, 0x9D46, 0x9D48          /* 0x70 */
+    0x9D15, 0x9D12, 0x9D41, 0x9D3F, 0x9D3E, 0x9D46, 0x9D48			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_73[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9D5D, 0x9D5E, 0x9D64, 0x9D51, 0x9D50, 0x9D59, 0x9D72, /* 0x20 */
     0x9D89, 0x9D87, 0x9DAB, 0x9D6F, 0x9D7A, 0x9D9A, 0x9DA4, 0x9DA9, /* 0x20 */
     0x9DB2, 0x9DC4, 0x9DC1, 0x9DBB, 0x9DB8, 0x9DBA, 0x9DC6, 0x9DCF, /* 0x30 */
@@ -1558,16 +1558,16 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_73[] =
     0x9EF4, 0x9EF6, 0x9EF7, 0x9EF9, 0x9EFB, 0x9EFC, 0x9EFD, 0x9F07, /* 0x60 */
     0x9F08, 0x76B7, 0x9F15, 0x9F21, 0x9F2C, 0x9F3E, 0x9F4A, 0x9F52, /* 0x60 */
     0x9F54, 0x9F63, 0x9F5F, 0x9F60, 0x9F61, 0x9F66, 0x9F67, 0x9F6C, /* 0x70 */
-    0x9F6A, 0x9F77, 0x9F72, 0x9F76, 0x9F95, 0x9F9C, 0x9FA0          /* 0x70 */
+    0x9F6A, 0x9F77, 0x9F72, 0x9F76, 0x9F95, 0x9F9C, 0x9FA0			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_74[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x582F, 0x69C7, 0x9059, 0x7464, 0x51DC, 0x7199          /* 0x20 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x582F, 0x69C7, 0x9059, 0x7464, 0x51DC, 0x7199			/* 0x20 */
                                                                     /* 0x20 */
 };
 
@@ -1575,19 +1575,19 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_74[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_22[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x20 */
                                                             0x02D8, /* 0x20 */
     0x02C7, 0x00B8, 0x02D9, 0x02DD, 0x00AF, 0x02DB, 0x02DA, 0x007E, /* 0x30 */
-    0x0384, 0x0385,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0x00A1, 0x00A6, 0x00BF,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0x00BA, 0x00AA, 0x00A9, 0x00AE, 0x2122, /* 0x60 */
-    0x00A4, 0x2116                                                  /* 0x70 */
+    0x0384, 0x0385, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x00A1, 0x00A6, 0x00BF, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x00BA, 0x00AA, 0x00A9, 0x00AE, 0x2122, /* 0x60 */
+    0x00A4, 0x2116													/* 0x70 */
                                                                     /* 0x70 */
 };
 
@@ -1595,43 +1595,43 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_22[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_26[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x0386, 0x0388, 0x0389, 0x038A, 0x03AA,      0, 0x038C, /* 0x60 */
-         0, 0x038E, 0x03AB,      0, 0x038F,      0,      0,      0, /* 0x60 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x0386, 0x0388, 0x0389, 0x038A, 0x03AA, 	 0, 0x038C, /* 0x60 */
+         0, 0x038E, 0x03AB, 	 0, 0x038F, 	 0, 	 0, 	 0, /* 0x60 */
          0, 0x03AC, 0x03AD, 0x03AE, 0x03AF, 0x03CA, 0x0390, 0x03CC, /* 0x70 */
-    0x03C2, 0x03CD, 0x03CB, 0x03B0, 0x03CE                          /* 0x70 */
+    0x03C2, 0x03CD, 0x03CB, 0x03B0, 0x03CE							/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_27[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                     0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407, /* 0x40 */
-    0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x040E, 0x040F,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457, /* 0x70 */
-    0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x045E, 0x045F          /* 0x70 */
+    0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x040E, 0x040F, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457, /* 0x70 */
+    0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x045E, 0x045F			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_29[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x00C6, 0x0110,      0, 0x0126,      0, 0x0132,      0, /* 0x20 */
-    0x0141, 0x013F,      0, 0x014A, 0x00D8, 0x0152,      0, 0x0166, /* 0x20 */
-    0x00DE,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x00C6, 0x0110, 	 0, 0x0126, 	 0, 0x0132, 	 0, /* 0x20 */
+    0x0141, 0x013F, 	 0, 0x014A, 0x00D8, 0x0152, 	 0, 0x0166, /* 0x20 */
+    0x00DE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
          0, 0x00E6, 0x0111, 0x00F0, 0x0127, 0x0131, 0x0133, 0x0138, /* 0x40 */
     0x0142, 0x0140, 0x0149, 0x014B, 0x00F8, 0x0153, 0x00DF, 0x0167, /* 0x40 */
-    0x00FE                                                          /* 0x50 */
+    0x00FE															/* 0x50 */
                                                                     /* 0x50 */
 };
 
@@ -1639,12 +1639,12 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_29[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_2A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x00C1, 0x00C0, 0x00C4, 0x00C2, 0x0102, 0x01CD, 0x0100, /* 0x20 */
     0x0104, 0x00C5, 0x00C3, 0x0106, 0x0108, 0x010C, 0x00C7, 0x010A, /* 0x20 */
     0x010E, 0x00C9, 0x00C8, 0x00CB, 0x00CA, 0x011A, 0x0116, 0x0112, /* 0x30 */
-    0x0118,      0, 0x011C, 0x011E, 0x0122, 0x0120, 0x0124, 0x00CD, /* 0x30 */
+    0x0118, 	 0, 0x011C, 0x011E, 0x0122, 0x0120, 0x0124, 0x00CD, /* 0x30 */
     0x00CC, 0x00CF, 0x00CE, 0x01CF, 0x0130, 0x012A, 0x012E, 0x0128, /* 0x40 */
     0x0134, 0x0136, 0x0139, 0x013D, 0x013B, 0x0143, 0x0147, 0x0145, /* 0x40 */
     0x00D1, 0x00D3, 0x00D2, 0x00D6, 0x00D4, 0x01D1, 0x0150, 0x014C, /* 0x50 */
@@ -1659,19 +1659,19 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_2A[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_2B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x00E1, 0x00E0, 0x00E4, 0x00E2, 0x0103, 0x01CE, 0x0101, /* 0x20 */
     0x0105, 0x00E5, 0x00E3, 0x0107, 0x0109, 0x010D, 0x00E7, 0x010B, /* 0x20 */
     0x010F, 0x00E9, 0x00E8, 0x00EB, 0x00EA, 0x011B, 0x0117, 0x0113, /* 0x30 */
-    0x0119, 0x01F5, 0x011D, 0x011F,      0, 0x0121, 0x0125, 0x00ED, /* 0x30 */
-    0x00EC, 0x00EF, 0x00EE, 0x01D0,      0, 0x012B, 0x012F, 0x0129, /* 0x40 */
+    0x0119, 0x01F5, 0x011D, 0x011F, 	 0, 0x0121, 0x0125, 0x00ED, /* 0x30 */
+    0x00EC, 0x00EF, 0x00EE, 0x01D0, 	 0, 0x012B, 0x012F, 0x0129, /* 0x40 */
     0x0135, 0x0137, 0x013A, 0x013E, 0x013C, 0x0144, 0x0148, 0x0146, /* 0x40 */
     0x00F1, 0x00F3, 0x00F2, 0x00F6, 0x00F4, 0x01D2, 0x0151, 0x014D, /* 0x50 */
     0x00F5, 0x0155, 0x0159, 0x0157, 0x015B, 0x015D, 0x0161, 0x015F, /* 0x50 */
     0x0165, 0x0163, 0x00FA, 0x00F9, 0x00FC, 0x00FB, 0x016D, 0x01D4, /* 0x60 */
     0x0171, 0x016B, 0x0173, 0x016F, 0x0169, 0x01D8, 0x01DC, 0x01DA, /* 0x60 */
-    0x01D6, 0x0175, 0x00FD, 0x00FF, 0x0177, 0x017A, 0x017E, 0x017C  /* 0x70 */
+    0x01D6, 0x0175, 0x00FD, 0x00FF, 0x0177, 0x017A, 0x017E, 0x017C	/* 0x70 */
                                                                     /* 0x70 */
 };
 
@@ -1679,8 +1679,8 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_2B[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_30[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x4E02, 0x4E04, 0x4E05, 0x4E0C, 0x4E12, 0x4E1F, 0x4E23, /* 0x20 */
     0x4E24, 0x4E28, 0x4E2B, 0x4E2E, 0x4E2F, 0x4E30, 0x4E35, 0x4E40, /* 0x20 */
     0x4E41, 0x4E44, 0x4E47, 0x4E51, 0x4E5A, 0x4E5C, 0x4E63, 0x4E68, /* 0x30 */
@@ -1692,15 +1692,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_30[] =
     0x4F33, 0x4F35, 0x4F37, 0x4F39, 0x4F3B, 0x4F3E, 0x4F40, 0x4F42, /* 0x60 */
     0x4F48, 0x4F49, 0x4F4B, 0x4F4C, 0x4F52, 0x4F54, 0x4F56, 0x4F58, /* 0x60 */
     0x4F5F, 0x4F63, 0x4F6A, 0x4F6C, 0x4F6E, 0x4F71, 0x4F77, 0x4F78, /* 0x70 */
-    0x4F79, 0x4F7A, 0x4F7D, 0x4F7E, 0x4F81, 0x4F82, 0x4F84          /* 0x70 */
+    0x4F79, 0x4F7A, 0x4F7D, 0x4F7E, 0x4F81, 0x4F82, 0x4F84			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_31[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x4F85, 0x4F89, 0x4F8A, 0x4F8C, 0x4F8E, 0x4F90, 0x4F92, /* 0x20 */
     0x4F93, 0x4F94, 0x4F97, 0x4F99, 0x4F9A, 0x4F9E, 0x4F9F, 0x4FB2, /* 0x20 */
     0x4FB7, 0x4FB9, 0x4FBB, 0x4FBC, 0x4FBD, 0x4FBE, 0x4FC0, 0x4FC1, /* 0x30 */
@@ -1712,15 +1712,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_31[] =
     0x5041, 0x5042, 0x5045, 0x5046, 0x504A, 0x504C, 0x504E, 0x5051, /* 0x60 */
     0x5052, 0x5053, 0x5057, 0x5059, 0x505F, 0x5060, 0x5062, 0x5063, /* 0x60 */
     0x5066, 0x5067, 0x506A, 0x506D, 0x5070, 0x5071, 0x503B, 0x5081, /* 0x70 */
-    0x5083, 0x5084, 0x5086, 0x508A, 0x508E, 0x508F, 0x5090          /* 0x70 */
+    0x5083, 0x5084, 0x5086, 0x508A, 0x508E, 0x508F, 0x5090			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_32[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5092, 0x5093, 0x5094, 0x5096, 0x509B, 0x509C, 0x509E, /* 0x20 */
     0x509F, 0x50A0, 0x50A1, 0x50A2, 0x50AA, 0x50AF, 0x50B0, 0x50B9, /* 0x20 */
     0x50BA, 0x50BD, 0x50C0, 0x50C3, 0x50C4, 0x50C7, 0x50CC, 0x50CE, /* 0x30 */
@@ -1732,15 +1732,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_32[] =
     0x5133, 0x5134, 0x5135, 0x5138, 0x5139, 0x5142, 0x514A, 0x514F, /* 0x60 */
     0x5153, 0x5155, 0x5157, 0x5158, 0x515F, 0x5164, 0x5166, 0x517E, /* 0x60 */
     0x5183, 0x5184, 0x518B, 0x518E, 0x5198, 0x519D, 0x51A1, 0x51A3, /* 0x70 */
-    0x51AD, 0x51B8, 0x51BA, 0x51BC, 0x51BE, 0x51BF, 0x51C2          /* 0x70 */
+    0x51AD, 0x51B8, 0x51BA, 0x51BC, 0x51BE, 0x51BF, 0x51C2			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_33[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x51C8, 0x51CF, 0x51D1, 0x51D2, 0x51D3, 0x51D5, 0x51D8, /* 0x20 */
     0x51DE, 0x51E2, 0x51E5, 0x51EE, 0x51F2, 0x51F3, 0x51F4, 0x51F7, /* 0x20 */
     0x5201, 0x5202, 0x5205, 0x5212, 0x5213, 0x5215, 0x5216, 0x5218, /* 0x30 */
@@ -1752,15 +1752,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_33[] =
     0x52B7, 0x52B8, 0x52BA, 0x52BB, 0x52BD, 0x52C0, 0x52C4, 0x52C6, /* 0x60 */
     0x52C8, 0x52CC, 0x52CF, 0x52D1, 0x52D4, 0x52D6, 0x52DB, 0x52DC, /* 0x60 */
     0x52E1, 0x52E5, 0x52E8, 0x52E9, 0x52EA, 0x52EC, 0x52F0, 0x52F1, /* 0x70 */
-    0x52F4, 0x52F6, 0x52F7, 0x5300, 0x5303, 0x530A, 0x530B          /* 0x70 */
+    0x52F4, 0x52F6, 0x52F7, 0x5300, 0x5303, 0x530A, 0x530B			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_34[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x530C, 0x5311, 0x5313, 0x5318, 0x531B, 0x531C, 0x531E, /* 0x20 */
     0x531F, 0x5325, 0x5327, 0x5328, 0x5329, 0x532B, 0x532C, 0x532D, /* 0x20 */
     0x5330, 0x5332, 0x5335, 0x533C, 0x533D, 0x533E, 0x5342, 0x534C, /* 0x30 */
@@ -1772,15 +1772,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_34[] =
     0x53E0, 0x53E6, 0x53E7, 0x53F5, 0x5402, 0x5413, 0x541A, 0x5421, /* 0x60 */
     0x5427, 0x5428, 0x542A, 0x542F, 0x5431, 0x5434, 0x5435, 0x5443, /* 0x60 */
     0x5444, 0x5447, 0x544D, 0x544F, 0x545E, 0x5462, 0x5464, 0x5466, /* 0x70 */
-    0x5467, 0x5469, 0x546B, 0x546D, 0x546E, 0x5474, 0x547F          /* 0x70 */
+    0x5467, 0x5469, 0x546B, 0x546D, 0x546E, 0x5474, 0x547F			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_35[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5481, 0x5483, 0x5485, 0x5488, 0x5489, 0x548D, 0x5491, /* 0x20 */
     0x5495, 0x5496, 0x549C, 0x549F, 0x54A1, 0x54A6, 0x54A7, 0x54A9, /* 0x20 */
     0x54AA, 0x54AD, 0x54AE, 0x54B1, 0x54B7, 0x54B9, 0x54BA, 0x54BB, /* 0x30 */
@@ -1792,15 +1792,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_35[] =
     0x555E, 0x5560, 0x5561, 0x5564, 0x5566, 0x557F, 0x5581, 0x5582, /* 0x60 */
     0x5586, 0x5588, 0x558E, 0x558F, 0x5591, 0x5592, 0x5593, 0x5594, /* 0x60 */
     0x5597, 0x55A3, 0x55A4, 0x55AD, 0x55B2, 0x55BF, 0x55C1, 0x55C3, /* 0x70 */
-    0x55C6, 0x55C9, 0x55CB, 0x55CC, 0x55CE, 0x55D1, 0x55D2          /* 0x70 */
+    0x55C6, 0x55C9, 0x55CB, 0x55CC, 0x55CE, 0x55D1, 0x55D2			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_36[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x55D3, 0x55D7, 0x55D8, 0x55DB, 0x55DE, 0x55E2, 0x55E9, /* 0x20 */
     0x55F6, 0x55FF, 0x5605, 0x5608, 0x560A, 0x560D, 0x560E, 0x560F, /* 0x20 */
     0x5610, 0x5611, 0x5612, 0x5619, 0x562C, 0x5630, 0x5633, 0x5635, /* 0x30 */
@@ -1812,15 +1812,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_36[] =
     0x56A7, 0x56A8, 0x56A9, 0x56AB, 0x56AC, 0x56AD, 0x56B1, 0x56B3, /* 0x60 */
     0x56B7, 0x56BE, 0x56C5, 0x56C9, 0x56CA, 0x56CB, 0x56CF, 0x56D0, /* 0x60 */
     0x56CC, 0x56CD, 0x56D9, 0x56DC, 0x56DD, 0x56DF, 0x56E1, 0x56E4, /* 0x70 */
-    0x56E5, 0x56E6, 0x56E7, 0x56E8, 0x56F1, 0x56EB, 0x56ED          /* 0x70 */
+    0x56E5, 0x56E6, 0x56E7, 0x56E8, 0x56F1, 0x56EB, 0x56ED			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_37[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x56F6, 0x56F7, 0x5701, 0x5702, 0x5707, 0x570A, 0x570C, /* 0x20 */
     0x5711, 0x5715, 0x571A, 0x571B, 0x571D, 0x5720, 0x5722, 0x5723, /* 0x20 */
     0x5724, 0x5725, 0x5729, 0x572A, 0x572C, 0x572E, 0x572F, 0x5733, /* 0x30 */
@@ -1832,15 +1832,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_37[] =
     0x5795, 0x57A7, 0x57A8, 0x57A9, 0x57AC, 0x57B8, 0x57BD, 0x57C7, /* 0x60 */
     0x57C8, 0x57CC, 0x57CF, 0x57D5, 0x57DD, 0x57DE, 0x57E4, 0x57E6, /* 0x60 */
     0x57E7, 0x57E9, 0x57ED, 0x57F0, 0x57F5, 0x57F6, 0x57F8, 0x57FD, /* 0x70 */
-    0x57FE, 0x57FF, 0x5803, 0x5804, 0x5808, 0x5809, 0x57E1          /* 0x70 */
+    0x57FE, 0x57FF, 0x5803, 0x5804, 0x5808, 0x5809, 0x57E1			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_38[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x580C, 0x580D, 0x581B, 0x581E, 0x581F, 0x5820, 0x5826, /* 0x20 */
     0x5827, 0x582D, 0x5832, 0x5839, 0x583F, 0x5849, 0x584C, 0x584D, /* 0x20 */
     0x584F, 0x5850, 0x5855, 0x585F, 0x5861, 0x5864, 0x5867, 0x5868, /* 0x30 */
@@ -1852,15 +1852,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_38[] =
     0x5906, 0x590B, 0x590C, 0x5912, 0x5913, 0x5914, 0x8641, 0x591D, /* 0x60 */
     0x5921, 0x5923, 0x5924, 0x5928, 0x592F, 0x5930, 0x5933, 0x5935, /* 0x60 */
     0x5936, 0x593F, 0x5943, 0x5946, 0x5952, 0x5953, 0x5959, 0x595B, /* 0x70 */
-    0x595D, 0x595E, 0x595F, 0x5961, 0x5963, 0x596B, 0x596D          /* 0x70 */
+    0x595D, 0x595E, 0x595F, 0x5961, 0x5963, 0x596B, 0x596D			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_39[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x596F, 0x5972, 0x5975, 0x5976, 0x5979, 0x597B, 0x597C, /* 0x20 */
     0x598B, 0x598C, 0x598E, 0x5992, 0x5995, 0x5997, 0x599F, 0x59A4, /* 0x20 */
     0x59A7, 0x59AD, 0x59AE, 0x59AF, 0x59B0, 0x59B3, 0x59B7, 0x59BA, /* 0x30 */
@@ -1872,15 +1872,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_39[] =
     0x5A50, 0x5A55, 0x5A5E, 0x5A63, 0x5A65, 0x5A67, 0x5A6D, 0x5A77, /* 0x60 */
     0x5A7A, 0x5A7B, 0x5A7E, 0x5A8B, 0x5A90, 0x5A93, 0x5A96, 0x5A99, /* 0x60 */
     0x5A9C, 0x5A9E, 0x5A9F, 0x5AA0, 0x5AA2, 0x5AA7, 0x5AAC, 0x5AB1, /* 0x70 */
-    0x5AB2, 0x5AB3, 0x5AB5, 0x5AB8, 0x5ABA, 0x5ABB, 0x5ABF          /* 0x70 */
+    0x5AB2, 0x5AB3, 0x5AB5, 0x5AB8, 0x5ABA, 0x5ABB, 0x5ABF			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_3A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5AC4, 0x5AC6, 0x5AC8, 0x5ACF, 0x5ADA, 0x5ADC, 0x5AE0, /* 0x20 */
     0x5AE5, 0x5AEA, 0x5AEE, 0x5AF5, 0x5AF6, 0x5AFD, 0x5B00, 0x5B01, /* 0x20 */
     0x5B08, 0x5B17, 0x5B34, 0x5B19, 0x5B1B, 0x5B1D, 0x5B21, 0x5B25, /* 0x30 */
@@ -1892,15 +1892,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_3A[] =
     0x5BD7, 0x5BD8, 0x5BD9, 0x5BDA, 0x5BE0, 0x5BEF, 0x5BF1, 0x5BF4, /* 0x60 */
     0x5BFD, 0x5C0C, 0x5C17, 0x5C1E, 0x5C1F, 0x5C23, 0x5C26, 0x5C29, /* 0x60 */
     0x5C2B, 0x5C2C, 0x5C2E, 0x5C30, 0x5C32, 0x5C35, 0x5C36, 0x5C59, /* 0x70 */
-    0x5C5A, 0x5C5C, 0x5C62, 0x5C63, 0x5C67, 0x5C68, 0x5C69          /* 0x70 */
+    0x5C5A, 0x5C5C, 0x5C62, 0x5C63, 0x5C67, 0x5C68, 0x5C69			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_3B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5C6D, 0x5C70, 0x5C74, 0x5C75, 0x5C7A, 0x5C7B, 0x5C7C, /* 0x20 */
     0x5C7D, 0x5C87, 0x5C88, 0x5C8A, 0x5C8F, 0x5C92, 0x5C9D, 0x5C9F, /* 0x20 */
     0x5CA0, 0x5CA2, 0x5CA3, 0x5CA6, 0x5CAA, 0x5CB2, 0x5CB4, 0x5CB5, /* 0x30 */
@@ -1912,15 +1912,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_3B[] =
     0x5D79, 0x5D7A, 0x5D7E, 0x5D7F, 0x5D81, 0x5D83, 0x5D88, 0x5D8A, /* 0x60 */
     0x5D92, 0x5D93, 0x5D94, 0x5D95, 0x5D99, 0x5D9B, 0x5D9F, 0x5DA0, /* 0x60 */
     0x5DA7, 0x5DAB, 0x5DB0, 0x5DB4, 0x5DB8, 0x5DB9, 0x5DC3, 0x5DC7, /* 0x70 */
-    0x5DCB, 0x5DD0, 0x5DCE, 0x5DD8, 0x5DD9, 0x5DE0, 0x5DE4          /* 0x70 */
+    0x5DCB, 0x5DD0, 0x5DCE, 0x5DD8, 0x5DD9, 0x5DE0, 0x5DE4			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_3C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5DE9, 0x5DF8, 0x5DF9, 0x5E00, 0x5E07, 0x5E0D, 0x5E12, /* 0x20 */
     0x5E14, 0x5E15, 0x5E18, 0x5E1F, 0x5E20, 0x5E2E, 0x5E28, 0x5E32, /* 0x20 */
     0x5E35, 0x5E3E, 0x5E4B, 0x5E50, 0x5E49, 0x5E51, 0x5E56, 0x5E58, /* 0x30 */
@@ -1932,15 +1932,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_3C[] =
     0x5F0E, 0x5F19, 0x5F1C, 0x5F1D, 0x5F21, 0x5F22, 0x5F23, 0x5F24, /* 0x60 */
     0x5F28, 0x5F2B, 0x5F2C, 0x5F2E, 0x5F30, 0x5F34, 0x5F36, 0x5F3B, /* 0x60 */
     0x5F3D, 0x5F3F, 0x5F40, 0x5F44, 0x5F45, 0x5F47, 0x5F4D, 0x5F50, /* 0x70 */
-    0x5F54, 0x5F58, 0x5F5B, 0x5F60, 0x5F63, 0x5F64, 0x5F67          /* 0x70 */
+    0x5F54, 0x5F58, 0x5F5B, 0x5F60, 0x5F63, 0x5F64, 0x5F67			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_3D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5F6F, 0x5F72, 0x5F74, 0x5F75, 0x5F78, 0x5F7A, 0x5F7D, /* 0x20 */
     0x5F7E, 0x5F89, 0x5F8D, 0x5F8F, 0x5F96, 0x5F9C, 0x5F9D, 0x5FA2, /* 0x20 */
     0x5FA7, 0x5FAB, 0x5FA4, 0x5FAC, 0x5FAF, 0x5FB0, 0x5FB1, 0x5FB8, /* 0x30 */
@@ -1952,15 +1952,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_3D[] =
     0x6048, 0x6049, 0x604C, 0x6051, 0x6054, 0x6056, 0x6057, 0x605D, /* 0x60 */
     0x6061, 0x6067, 0x6071, 0x607E, 0x607F, 0x6082, 0x6086, 0x6088, /* 0x60 */
     0x608A, 0x608E, 0x6091, 0x6093, 0x6095, 0x6098, 0x609D, 0x609E, /* 0x70 */
-    0x60A2, 0x60A4, 0x60A5, 0x60A8, 0x60B0, 0x60B1, 0x60B7          /* 0x70 */
+    0x60A2, 0x60A4, 0x60A5, 0x60A8, 0x60B0, 0x60B1, 0x60B7			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_3E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x60BB, 0x60BE, 0x60C2, 0x60C4, 0x60C8, 0x60C9, 0x60CA, /* 0x20 */
     0x60CB, 0x60CE, 0x60CF, 0x60D4, 0x60D5, 0x60D9, 0x60DB, 0x60DD, /* 0x20 */
     0x60DE, 0x60E2, 0x60E5, 0x60F2, 0x60F5, 0x60F8, 0x60FC, 0x60FD, /* 0x30 */
@@ -1972,15 +1972,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_3E[] =
     0x618D, 0x6192, 0x6193, 0x6197, 0x6198, 0x619C, 0x619D, 0x619F, /* 0x60 */
     0x61A0, 0x61A5, 0x61A8, 0x61AA, 0x61AD, 0x61B8, 0x61B9, 0x61BC, /* 0x60 */
     0x61C0, 0x61C1, 0x61C2, 0x61CE, 0x61CF, 0x61D5, 0x61DC, 0x61DD, /* 0x70 */
-    0x61DE, 0x61DF, 0x61E1, 0x61E2, 0x61E7, 0x61E9, 0x61E5          /* 0x70 */
+    0x61DE, 0x61DF, 0x61E1, 0x61E2, 0x61E7, 0x61E9, 0x61E5			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_3F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x61EC, 0x61ED, 0x61EF, 0x6201, 0x6203, 0x6204, 0x6207, /* 0x20 */
     0x6213, 0x6215, 0x621C, 0x6220, 0x6222, 0x6223, 0x6227, 0x6229, /* 0x20 */
     0x622B, 0x6239, 0x623D, 0x6242, 0x6243, 0x6244, 0x6246, 0x624C, /* 0x30 */
@@ -1992,15 +1992,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_3F[] =
     0x6310, 0x6313, 0x6316, 0x6318, 0x6329, 0x632A, 0x632D, 0x6335, /* 0x60 */
     0x6336, 0x6339, 0x633C, 0x6341, 0x6342, 0x6343, 0x6344, 0x6346, /* 0x60 */
     0x634A, 0x634B, 0x634E, 0x6352, 0x6353, 0x6354, 0x6358, 0x635B, /* 0x70 */
-    0x6365, 0x6366, 0x636C, 0x636D, 0x6371, 0x6374, 0x6375          /* 0x70 */
+    0x6365, 0x6366, 0x636C, 0x636D, 0x6371, 0x6374, 0x6375			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_40[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6378, 0x637C, 0x637D, 0x637F, 0x6382, 0x6384, 0x6387, /* 0x20 */
     0x638A, 0x6390, 0x6394, 0x6395, 0x6399, 0x639A, 0x639E, 0x63A4, /* 0x20 */
     0x63A6, 0x63AD, 0x63AE, 0x63AF, 0x63BD, 0x63C1, 0x63C5, 0x63C8, /* 0x30 */
@@ -2012,15 +2012,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_40[] =
     0x645B, 0x645C, 0x645D, 0x645F, 0x6460, 0x6461, 0x6463, 0x646D, /* 0x60 */
     0x6473, 0x6474, 0x647B, 0x647D, 0x6485, 0x6487, 0x648F, 0x6490, /* 0x60 */
     0x6491, 0x6498, 0x6499, 0x649B, 0x649D, 0x649F, 0x64A1, 0x64A3, /* 0x70 */
-    0x64A6, 0x64A8, 0x64AC, 0x64B3, 0x64BD, 0x64BE, 0x64BF          /* 0x70 */
+    0x64A6, 0x64A8, 0x64AC, 0x64B3, 0x64BD, 0x64BE, 0x64BF			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_41[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x64C4, 0x64C9, 0x64CA, 0x64CB, 0x64CC, 0x64CE, 0x64D0, /* 0x20 */
     0x64D1, 0x64D5, 0x64D7, 0x64E4, 0x64E5, 0x64E9, 0x64EA, 0x64ED, /* 0x20 */
     0x64F0, 0x64F5, 0x64F7, 0x64FB, 0x64FF, 0x6501, 0x6504, 0x6508, /* 0x30 */
@@ -2032,15 +2032,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_41[] =
     0x65AE, 0x65B2, 0x65B3, 0x65B4, 0x65BF, 0x65C2, 0x65C8, 0x65C9, /* 0x60 */
     0x65CE, 0x65D0, 0x65D4, 0x65D6, 0x65D8, 0x65DF, 0x65F0, 0x65F2, /* 0x60 */
     0x65F4, 0x65F5, 0x65F9, 0x65FE, 0x65FF, 0x6600, 0x6604, 0x6608, /* 0x70 */
-    0x6609, 0x660D, 0x6611, 0x6612, 0x6615, 0x6616, 0x661D          /* 0x70 */
+    0x6609, 0x660D, 0x6611, 0x6612, 0x6615, 0x6616, 0x661D			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_42[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x661E, 0x6621, 0x6622, 0x6623, 0x6624, 0x6626, 0x6629, /* 0x20 */
     0x662A, 0x662B, 0x662C, 0x662E, 0x6630, 0x6631, 0x6633, 0x6639, /* 0x20 */
     0x6637, 0x6640, 0x6645, 0x6646, 0x664A, 0x664C, 0x6651, 0x664E, /* 0x30 */
@@ -2052,15 +2052,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_42[] =
     0x66C2, 0x66C3, 0x66C8, 0x66CC, 0x66CE, 0x66CF, 0x66D4, 0x66DB, /* 0x60 */
     0x66DF, 0x66E8, 0x66EB, 0x66EC, 0x66EE, 0x66FA, 0x6705, 0x6707, /* 0x60 */
     0x670E, 0x6713, 0x6719, 0x671C, 0x6720, 0x6722, 0x6733, 0x673E, /* 0x70 */
-    0x6745, 0x6747, 0x6748, 0x674C, 0x6754, 0x6755, 0x675D          /* 0x70 */
+    0x6745, 0x6747, 0x6748, 0x674C, 0x6754, 0x6755, 0x675D			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_43[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6766, 0x676C, 0x676E, 0x6774, 0x6776, 0x677B, 0x6781, /* 0x20 */
     0x6784, 0x678E, 0x678F, 0x6791, 0x6793, 0x6796, 0x6798, 0x6799, /* 0x20 */
     0x679B, 0x67B0, 0x67B1, 0x67B2, 0x67B5, 0x67BB, 0x67BC, 0x67BD, /* 0x30 */
@@ -2072,15 +2072,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_43[] =
     0x686B, 0x686E, 0x686F, 0x6870, 0x6871, 0x6872, 0x6875, 0x6879, /* 0x60 */
     0x687A, 0x687B, 0x687C, 0x6882, 0x6884, 0x6886, 0x6888, 0x6896, /* 0x60 */
     0x6898, 0x689A, 0x689C, 0x68A1, 0x68A3, 0x68A5, 0x68A9, 0x68AA, /* 0x70 */
-    0x68AE, 0x68B2, 0x68BB, 0x68C5, 0x68C8, 0x68CC, 0x68CF          /* 0x70 */
+    0x68AE, 0x68B2, 0x68BB, 0x68C5, 0x68C8, 0x68CC, 0x68CF			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_44[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x68D0, 0x68D1, 0x68D3, 0x68D6, 0x68D9, 0x68DC, 0x68DD, /* 0x20 */
     0x68E5, 0x68E8, 0x68EA, 0x68EB, 0x68EC, 0x68ED, 0x68F0, 0x68F1, /* 0x20 */
     0x68F5, 0x68F6, 0x68FB, 0x68FC, 0x68FD, 0x6906, 0x6909, 0x690A, /* 0x30 */
@@ -2092,15 +2092,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_44[] =
     0x69AF, 0x69B7, 0x69B8, 0x69BA, 0x69BC, 0x69C5, 0x69C8, 0x69D1, /* 0x60 */
     0x69D6, 0x69D7, 0x69E2, 0x69E5, 0x69EE, 0x69EF, 0x69F1, 0x69F3, /* 0x60 */
     0x69F5, 0x69FE, 0x6A00, 0x6A01, 0x6A03, 0x6A0F, 0x6A11, 0x6A15, /* 0x70 */
-    0x6A1A, 0x6A1D, 0x6A20, 0x6A24, 0x6A28, 0x6A30, 0x6A32          /* 0x70 */
+    0x6A1A, 0x6A1D, 0x6A20, 0x6A24, 0x6A28, 0x6A30, 0x6A32			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_45[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6A34, 0x6A37, 0x6A3B, 0x6A3E, 0x6A3F, 0x6A45, 0x6A46, /* 0x20 */
     0x6A49, 0x6A4A, 0x6A4E, 0x6A50, 0x6A51, 0x6A52, 0x6A55, 0x6A56, /* 0x20 */
     0x6A5B, 0x6A64, 0x6A67, 0x6A6A, 0x6A71, 0x6A73, 0x6A7E, 0x6A81, /* 0x30 */
@@ -2112,15 +2112,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_45[] =
     0x6B07, 0x6B09, 0x6B0F, 0x6B10, 0x6B11, 0x6B17, 0x6B1B, 0x6B1E, /* 0x60 */
     0x6B24, 0x6B28, 0x6B2B, 0x6B2C, 0x6B2F, 0x6B35, 0x6B36, 0x6B3B, /* 0x60 */
     0x6B3F, 0x6B46, 0x6B4A, 0x6B4D, 0x6B52, 0x6B56, 0x6B58, 0x6B5D, /* 0x70 */
-    0x6B60, 0x6B67, 0x6B6B, 0x6B6E, 0x6B70, 0x6B75, 0x6B7D          /* 0x70 */
+    0x6B60, 0x6B67, 0x6B6B, 0x6B6E, 0x6B70, 0x6B75, 0x6B7D			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_46[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6B7E, 0x6B82, 0x6B85, 0x6B97, 0x6B9B, 0x6B9F, 0x6BA0, /* 0x20 */
     0x6BA2, 0x6BA3, 0x6BA8, 0x6BA9, 0x6BAC, 0x6BAD, 0x6BAE, 0x6BB0, /* 0x20 */
     0x6BB8, 0x6BB9, 0x6BBD, 0x6BBE, 0x6BC3, 0x6BC4, 0x6BC9, 0x6BCC, /* 0x30 */
@@ -2132,15 +2132,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_46[] =
     0x6C5C, 0x6C6B, 0x6C6D, 0x6C6F, 0x6C74, 0x6C76, 0x6C78, 0x6C79, /* 0x60 */
     0x6C7B, 0x6C85, 0x6C86, 0x6C87, 0x6C89, 0x6C94, 0x6C95, 0x6C97, /* 0x60 */
     0x6C98, 0x6C9C, 0x6C9F, 0x6CB0, 0x6CB2, 0x6CB4, 0x6CC2, 0x6CC6, /* 0x70 */
-    0x6CCD, 0x6CCF, 0x6CD0, 0x6CD1, 0x6CD2, 0x6CD4, 0x6CD6          /* 0x70 */
+    0x6CCD, 0x6CCF, 0x6CD0, 0x6CD1, 0x6CD2, 0x6CD4, 0x6CD6			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_47[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6CDA, 0x6CDC, 0x6CE0, 0x6CE7, 0x6CE9, 0x6CEB, 0x6CEC, /* 0x20 */
     0x6CEE, 0x6CF2, 0x6CF4, 0x6D04, 0x6D07, 0x6D0A, 0x6D0E, 0x6D0F, /* 0x20 */
     0x6D11, 0x6D13, 0x6D1A, 0x6D26, 0x6D27, 0x6D28, 0x6C67, 0x6D2E, /* 0x30 */
@@ -2152,15 +2152,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_47[] =
     0x6DE5, 0x6DE9, 0x6DEF, 0x6DF0, 0x6DF4, 0x6DF6, 0x6DFC, 0x6E00, /* 0x60 */
     0x6E04, 0x6E1E, 0x6E22, 0x6E27, 0x6E32, 0x6E36, 0x6E39, 0x6E3B, /* 0x60 */
     0x6E3C, 0x6E44, 0x6E45, 0x6E48, 0x6E49, 0x6E4B, 0x6E4F, 0x6E51, /* 0x70 */
-    0x6E52, 0x6E53, 0x6E54, 0x6E57, 0x6E5C, 0x6E5D, 0x6E5E          /* 0x70 */
+    0x6E52, 0x6E53, 0x6E54, 0x6E57, 0x6E5C, 0x6E5D, 0x6E5E			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_48[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6E62, 0x6E63, 0x6E68, 0x6E73, 0x6E7B, 0x6E7D, 0x6E8D, /* 0x20 */
     0x6E93, 0x6E99, 0x6EA0, 0x6EA7, 0x6EAD, 0x6EAE, 0x6EB1, 0x6EB3, /* 0x20 */
     0x6EBB, 0x6EBF, 0x6EC0, 0x6EC1, 0x6EC3, 0x6EC7, 0x6EC8, 0x6ECA, /* 0x30 */
@@ -2172,15 +2172,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_48[] =
     0x6F6C, 0x6F7D, 0x6F7E, 0x6F83, 0x6F87, 0x6F88, 0x6F8B, 0x6F8C, /* 0x60 */
     0x6F8D, 0x6F90, 0x6F92, 0x6F93, 0x6F94, 0x6F96, 0x6F9A, 0x6F9F, /* 0x60 */
     0x6FA0, 0x6FA5, 0x6FA6, 0x6FA7, 0x6FA8, 0x6FAE, 0x6FAF, 0x6FB0, /* 0x70 */
-    0x6FB5, 0x6FB6, 0x6FBC, 0x6FC5, 0x6FC7, 0x6FC8, 0x6FCA          /* 0x70 */
+    0x6FB5, 0x6FB6, 0x6FBC, 0x6FC5, 0x6FC7, 0x6FC8, 0x6FCA			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_49[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6FDA, 0x6FDE, 0x6FE8, 0x6FE9, 0x6FF0, 0x6FF5, 0x6FF9, /* 0x20 */
     0x6FFC, 0x6FFD, 0x7000, 0x7005, 0x7006, 0x7007, 0x700D, 0x7017, /* 0x20 */
     0x7020, 0x7023, 0x702F, 0x7034, 0x7037, 0x7039, 0x703C, 0x7043, /* 0x30 */
@@ -2192,15 +2192,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_49[] =
     0x70E4, 0x70FA, 0x7103, 0x7104, 0x7105, 0x7106, 0x7107, 0x710B, /* 0x60 */
     0x710C, 0x710F, 0x711E, 0x7120, 0x712B, 0x712D, 0x712F, 0x7130, /* 0x60 */
     0x7131, 0x7138, 0x7141, 0x7145, 0x7146, 0x7147, 0x714A, 0x714B, /* 0x70 */
-    0x7150, 0x7152, 0x7157, 0x715A, 0x715C, 0x715E, 0x7160          /* 0x70 */
+    0x7150, 0x7152, 0x7157, 0x715A, 0x715C, 0x715E, 0x7160			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_4A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7168, 0x7179, 0x7180, 0x7185, 0x7187, 0x718C, 0x7192, /* 0x20 */
     0x719A, 0x719B, 0x71A0, 0x71A2, 0x71AF, 0x71B0, 0x71B2, 0x71B3, /* 0x20 */
     0x71BA, 0x71BF, 0x71C0, 0x71C1, 0x71C4, 0x71CB, 0x71CC, 0x71D3, /* 0x30 */
@@ -2212,15 +2212,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_4A[] =
     0x7271, 0x7277, 0x7278, 0x727B, 0x727C, 0x727F, 0x7284, 0x7289, /* 0x60 */
     0x728D, 0x728E, 0x7293, 0x729B, 0x72A8, 0x72AD, 0x72AE, 0x72B1, /* 0x60 */
     0x72B4, 0x72BE, 0x72C1, 0x72C7, 0x72C9, 0x72CC, 0x72D5, 0x72D6, /* 0x70 */
-    0x72D8, 0x72DF, 0x72E5, 0x72F3, 0x72F4, 0x72FA, 0x72FB          /* 0x70 */
+    0x72D8, 0x72DF, 0x72E5, 0x72F3, 0x72F4, 0x72FA, 0x72FB			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_4B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x72FE, 0x7302, 0x7304, 0x7305, 0x7307, 0x730B, 0x730D, /* 0x20 */
     0x7312, 0x7313, 0x7318, 0x7319, 0x731E, 0x7322, 0x7324, 0x7327, /* 0x20 */
     0x7328, 0x732C, 0x7331, 0x7332, 0x7335, 0x733A, 0x733B, 0x733D, /* 0x30 */
@@ -2232,15 +2232,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_4B[] =
     0x73AB, 0x73AD, 0x73B5, 0x73B7, 0x73B9, 0x73BC, 0x73BD, 0x73BF, /* 0x60 */
     0x73C5, 0x73C6, 0x73C9, 0x73CB, 0x73CC, 0x73CF, 0x73D2, 0x73D3, /* 0x60 */
     0x73D6, 0x73D9, 0x73DD, 0x73E1, 0x73E3, 0x73E6, 0x73E7, 0x73E9, /* 0x70 */
-    0x73F4, 0x73F5, 0x73F7, 0x73F9, 0x73FA, 0x73FB, 0x73FD          /* 0x70 */
+    0x73F4, 0x73F5, 0x73F7, 0x73F9, 0x73FA, 0x73FB, 0x73FD			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_4C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x73FF, 0x7400, 0x7401, 0x7404, 0x7407, 0x740A, 0x7411, /* 0x20 */
     0x741A, 0x741B, 0x7424, 0x7426, 0x7428, 0x7429, 0x742A, 0x742B, /* 0x20 */
     0x742C, 0x742D, 0x742E, 0x742F, 0x7430, 0x7431, 0x7439, 0x7440, /* 0x30 */
@@ -2252,15 +2252,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_4C[] =
     0x74AA, 0x74AB, 0x74AE, 0x74AF, 0x74B1, 0x74B2, 0x74B5, 0x74B9, /* 0x60 */
     0x74BB, 0x74BF, 0x74C8, 0x74C9, 0x74CC, 0x74D0, 0x74D3, 0x74D8, /* 0x60 */
     0x74DA, 0x74DB, 0x74DE, 0x74DF, 0x74E4, 0x74E8, 0x74EA, 0x74EB, /* 0x70 */
-    0x74EF, 0x74F4, 0x74FA, 0x74FB, 0x74FC, 0x74FF, 0x7506          /* 0x70 */
+    0x74EF, 0x74F4, 0x74FA, 0x74FB, 0x74FC, 0x74FF, 0x7506			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_4D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7512, 0x7516, 0x7517, 0x7520, 0x7521, 0x7524, 0x7527, /* 0x20 */
     0x7529, 0x752A, 0x752F, 0x7536, 0x7539, 0x753D, 0x753E, 0x753F, /* 0x20 */
     0x7540, 0x7543, 0x7547, 0x7548, 0x754E, 0x7550, 0x7552, 0x7557, /* 0x30 */
@@ -2272,15 +2272,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_4D[] =
     0x75EF, 0x75F1, 0x75F9, 0x7600, 0x7602, 0x7603, 0x7604, 0x7607, /* 0x60 */
     0x7608, 0x760A, 0x760C, 0x760F, 0x7612, 0x7613, 0x7615, 0x7616, /* 0x60 */
     0x7619, 0x761B, 0x761C, 0x761D, 0x761E, 0x7623, 0x7625, 0x7626, /* 0x70 */
-    0x7629, 0x762D, 0x7632, 0x7633, 0x7635, 0x7638, 0x7639          /* 0x70 */
+    0x7629, 0x762D, 0x7632, 0x7633, 0x7635, 0x7638, 0x7639			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_4E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x763A, 0x763C, 0x764A, 0x7640, 0x7641, 0x7643, 0x7644, /* 0x20 */
     0x7645, 0x7649, 0x764B, 0x7655, 0x7659, 0x765F, 0x7664, 0x7665, /* 0x20 */
     0x766D, 0x766E, 0x766F, 0x7671, 0x7674, 0x7681, 0x7685, 0x768C, /* 0x30 */
@@ -2292,15 +2292,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_4E[] =
     0x7715, 0x7717, 0x7719, 0x771A, 0x771C, 0x7722, 0x7728, 0x772D, /* 0x60 */
     0x772E, 0x772F, 0x7734, 0x7735, 0x7736, 0x7739, 0x773D, 0x773E, /* 0x60 */
     0x7742, 0x7745, 0x7746, 0x774A, 0x774D, 0x774E, 0x774F, 0x7752, /* 0x70 */
-    0x7756, 0x7757, 0x775C, 0x775E, 0x775F, 0x7760, 0x7762          /* 0x70 */
+    0x7756, 0x7757, 0x775C, 0x775E, 0x775F, 0x7760, 0x7762			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_4F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7764, 0x7767, 0x776A, 0x776C, 0x7770, 0x7772, 0x7773, /* 0x20 */
     0x7774, 0x777A, 0x777D, 0x7780, 0x7784, 0x778C, 0x778D, 0x7794, /* 0x20 */
     0x7795, 0x7796, 0x779A, 0x779F, 0x77A2, 0x77A7, 0x77AA, 0x77AE, /* 0x30 */
@@ -2312,15 +2312,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_4F[] =
     0x7848, 0x784C, 0x784E, 0x7852, 0x785C, 0x785E, 0x7860, 0x7861, /* 0x60 */
     0x7863, 0x7864, 0x7868, 0x786A, 0x786E, 0x787A, 0x787E, 0x788A, /* 0x60 */
     0x788F, 0x7894, 0x7898, 0x78A1, 0x789D, 0x789E, 0x789F, 0x78A4, /* 0x70 */
-    0x78A8, 0x78AC, 0x78AD, 0x78B0, 0x78B1, 0x78B2, 0x78B3          /* 0x70 */
+    0x78A8, 0x78AC, 0x78AD, 0x78B0, 0x78B1, 0x78B2, 0x78B3			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_50[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x78BB, 0x78BD, 0x78BF, 0x78C7, 0x78C8, 0x78C9, 0x78CC, /* 0x20 */
     0x78CE, 0x78D2, 0x78D3, 0x78D5, 0x78D6, 0x78E4, 0x78DB, 0x78DF, /* 0x20 */
     0x78E0, 0x78E1, 0x78E6, 0x78EA, 0x78F2, 0x78F3, 0x7900, 0x78F6, /* 0x30 */
@@ -2332,15 +2332,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_50[] =
     0x797E, 0x798B, 0x798C, 0x7991, 0x7993, 0x7994, 0x7995, 0x7996, /* 0x60 */
     0x7998, 0x799B, 0x799C, 0x79A1, 0x79A8, 0x79A9, 0x79AB, 0x79AF, /* 0x60 */
     0x79B1, 0x79B4, 0x79B8, 0x79BB, 0x79C2, 0x79C4, 0x79C7, 0x79C8, /* 0x70 */
-    0x79CA, 0x79CF, 0x79D4, 0x79D6, 0x79DA, 0x79DD, 0x79DE          /* 0x70 */
+    0x79CA, 0x79CF, 0x79D4, 0x79D6, 0x79DA, 0x79DD, 0x79DE			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_51[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x79E0, 0x79E2, 0x79E5, 0x79EA, 0x79EB, 0x79ED, 0x79F1, /* 0x20 */
     0x79F8, 0x79FC, 0x7A02, 0x7A03, 0x7A07, 0x7A09, 0x7A0A, 0x7A0C, /* 0x20 */
     0x7A11, 0x7A15, 0x7A1B, 0x7A1E, 0x7A21, 0x7A27, 0x7A2B, 0x7A2D, /* 0x30 */
@@ -2352,15 +2352,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_51[] =
     0x7AB5, 0x7AB9, 0x7ABB, 0x7ABC, 0x7AC6, 0x7AC9, 0x7ACC, 0x7ACE, /* 0x60 */
     0x7AD1, 0x7ADB, 0x7AE8, 0x7AE9, 0x7AEB, 0x7AEC, 0x7AF1, 0x7AF4, /* 0x60 */
     0x7AFB, 0x7AFD, 0x7AFE, 0x7B07, 0x7B14, 0x7B1F, 0x7B23, 0x7B27, /* 0x70 */
-    0x7B29, 0x7B2A, 0x7B2B, 0x7B2D, 0x7B2E, 0x7B2F, 0x7B30          /* 0x70 */
+    0x7B29, 0x7B2A, 0x7B2B, 0x7B2D, 0x7B2E, 0x7B2F, 0x7B30			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_52[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7B31, 0x7B34, 0x7B3D, 0x7B3F, 0x7B40, 0x7B41, 0x7B47, /* 0x20 */
     0x7B4E, 0x7B55, 0x7B60, 0x7B64, 0x7B66, 0x7B69, 0x7B6A, 0x7B6D, /* 0x20 */
     0x7B6F, 0x7B72, 0x7B73, 0x7B77, 0x7B84, 0x7B89, 0x7B8E, 0x7B90, /* 0x30 */
@@ -2372,15 +2372,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_52[] =
     0x7C06, 0x7C09, 0x7C0B, 0x7C0C, 0x7C0E, 0x7C0F, 0x7C19, 0x7C1B, /* 0x60 */
     0x7C20, 0x7C25, 0x7C26, 0x7C28, 0x7C2C, 0x7C31, 0x7C33, 0x7C34, /* 0x60 */
     0x7C36, 0x7C39, 0x7C3A, 0x7C46, 0x7C4A, 0x7C55, 0x7C51, 0x7C52, /* 0x70 */
-    0x7C53, 0x7C59, 0x7C5A, 0x7C5B, 0x7C5C, 0x7C5D, 0x7C5E          /* 0x70 */
+    0x7C53, 0x7C59, 0x7C5A, 0x7C5B, 0x7C5C, 0x7C5D, 0x7C5E			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_53[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7C61, 0x7C63, 0x7C67, 0x7C69, 0x7C6D, 0x7C6E, 0x7C70, /* 0x20 */
     0x7C72, 0x7C79, 0x7C7C, 0x7C7D, 0x7C86, 0x7C87, 0x7C8F, 0x7C94, /* 0x20 */
     0x7C9E, 0x7CA0, 0x7CA6, 0x7CB0, 0x7CB6, 0x7CB7, 0x7CBA, 0x7CBB, /* 0x30 */
@@ -2392,15 +2392,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_53[] =
     0x7D47, 0x7D48, 0x7D4D, 0x7D51, 0x7D53, 0x7D57, 0x7D59, 0x7D5A, /* 0x60 */
     0x7D5C, 0x7D5D, 0x7D65, 0x7D67, 0x7D6A, 0x7D70, 0x7D78, 0x7D7A, /* 0x60 */
     0x7D7B, 0x7D7F, 0x7D81, 0x7D82, 0x7D83, 0x7D85, 0x7D86, 0x7D88, /* 0x70 */
-    0x7D8B, 0x7D8C, 0x7D8D, 0x7D91, 0x7D96, 0x7D97, 0x7D9D          /* 0x70 */
+    0x7D8B, 0x7D8C, 0x7D8D, 0x7D91, 0x7D96, 0x7D97, 0x7D9D			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_54[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7D9E, 0x7DA6, 0x7DA7, 0x7DAA, 0x7DB3, 0x7DB6, 0x7DB7, /* 0x20 */
     0x7DB9, 0x7DC2, 0x7DC3, 0x7DC4, 0x7DC5, 0x7DC6, 0x7DCC, 0x7DCD, /* 0x20 */
     0x7DCE, 0x7DD7, 0x7DD9, 0x7E00, 0x7DE2, 0x7DE5, 0x7DE6, 0x7DEA, /* 0x30 */
@@ -2412,15 +2412,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_54[] =
     0x7E81, 0x7E86, 0x7E87, 0x7E8A, 0x7E8D, 0x7E91, 0x7E95, 0x7E98, /* 0x60 */
     0x7E9A, 0x7E9D, 0x7E9E, 0x7F3C, 0x7F3B, 0x7F3D, 0x7F3E, 0x7F3F, /* 0x60 */
     0x7F43, 0x7F44, 0x7F47, 0x7F4F, 0x7F52, 0x7F53, 0x7F5B, 0x7F5C, /* 0x70 */
-    0x7F5D, 0x7F61, 0x7F63, 0x7F64, 0x7F65, 0x7F66, 0x7F6D          /* 0x70 */
+    0x7F5D, 0x7F61, 0x7F63, 0x7F64, 0x7F65, 0x7F66, 0x7F6D			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_55[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7F71, 0x7F7D, 0x7F7E, 0x7F7F, 0x7F80, 0x7F8B, 0x7F8D, /* 0x20 */
     0x7F8F, 0x7F90, 0x7F91, 0x7F96, 0x7F97, 0x7F9C, 0x7FA1, 0x7FA2, /* 0x20 */
     0x7FA6, 0x7FAA, 0x7FAD, 0x7FB4, 0x7FBC, 0x7FBF, 0x7FC0, 0x7FC3, /* 0x30 */
@@ -2432,15 +2432,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_55[] =
     0x803C, 0x803E, 0x8040, 0x8044, 0x8060, 0x8064, 0x8066, 0x806D, /* 0x60 */
     0x8071, 0x8075, 0x8081, 0x8088, 0x808E, 0x809C, 0x809E, 0x80A6, /* 0x60 */
     0x80A7, 0x80AB, 0x80B8, 0x80B9, 0x80C8, 0x80CD, 0x80CF, 0x80D2, /* 0x70 */
-    0x80D4, 0x80D5, 0x80D7, 0x80D8, 0x80E0, 0x80ED, 0x80EE          /* 0x70 */
+    0x80D4, 0x80D5, 0x80D7, 0x80D8, 0x80E0, 0x80ED, 0x80EE			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_56[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x80F0, 0x80F2, 0x80F3, 0x80F6, 0x80F9, 0x80FA, 0x80FE, /* 0x20 */
     0x8103, 0x810B, 0x8116, 0x8117, 0x8118, 0x811C, 0x811E, 0x8120, /* 0x20 */
     0x8124, 0x8127, 0x812C, 0x8130, 0x8135, 0x813A, 0x813C, 0x8145, /* 0x30 */
@@ -2452,15 +2452,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_56[] =
     0x81E1, 0x81E4, 0x81EB, 0x81EC, 0x81F0, 0x81F1, 0x81F2, 0x81F5, /* 0x60 */
     0x81F6, 0x81F8, 0x81F9, 0x81FD, 0x81FF, 0x8200, 0x8203, 0x820F, /* 0x60 */
     0x8213, 0x8214, 0x8219, 0x821A, 0x821D, 0x8221, 0x8222, 0x8228, /* 0x70 */
-    0x8232, 0x8234, 0x823A, 0x8243, 0x8244, 0x8245, 0x8246          /* 0x70 */
+    0x8232, 0x8234, 0x823A, 0x8243, 0x8244, 0x8245, 0x8246			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_57[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x824B, 0x824E, 0x824F, 0x8251, 0x8256, 0x825C, 0x8260, /* 0x20 */
     0x8263, 0x8267, 0x826D, 0x8274, 0x827B, 0x827D, 0x827F, 0x8280, /* 0x20 */
     0x8281, 0x8283, 0x8284, 0x8287, 0x8289, 0x828A, 0x828E, 0x8291, /* 0x30 */
@@ -2472,15 +2472,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_57[] =
     0x8308, 0x830A, 0x830B, 0x8354, 0x831B, 0x831D, 0x831E, 0x831F, /* 0x60 */
     0x8321, 0x8322, 0x832C, 0x832D, 0x832E, 0x8330, 0x8333, 0x8337, /* 0x60 */
     0x833A, 0x833C, 0x833D, 0x8342, 0x8343, 0x8344, 0x8347, 0x834D, /* 0x70 */
-    0x834E, 0x8351, 0x8355, 0x8356, 0x8357, 0x8370, 0x8378          /* 0x70 */
+    0x834E, 0x8351, 0x8355, 0x8356, 0x8357, 0x8370, 0x8378			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_58[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x837D, 0x837F, 0x8380, 0x8382, 0x8384, 0x8386, 0x838D, /* 0x20 */
     0x8392, 0x8394, 0x8395, 0x8398, 0x8399, 0x839B, 0x839C, 0x839D, /* 0x20 */
     0x83A6, 0x83A7, 0x83A9, 0x83AC, 0x83BE, 0x83BF, 0x83C0, 0x83C7, /* 0x30 */
@@ -2492,15 +2492,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_58[] =
     0x846A, 0x8470, 0x8473, 0x8474, 0x8476, 0x8478, 0x847C, 0x847D, /* 0x60 */
     0x8481, 0x8485, 0x8492, 0x8493, 0x8495, 0x849E, 0x84A6, 0x84A8, /* 0x60 */
     0x84A9, 0x84AA, 0x84AF, 0x84B1, 0x84B4, 0x84BA, 0x84BD, 0x84BE, /* 0x70 */
-    0x84C0, 0x84C2, 0x84C7, 0x84C8, 0x84CC, 0x84CF, 0x84D3          /* 0x70 */
+    0x84C0, 0x84C2, 0x84C7, 0x84C8, 0x84CC, 0x84CF, 0x84D3			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_59[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x84DC, 0x84E7, 0x84EA, 0x84EF, 0x84F0, 0x84F1, 0x84F2, /* 0x20 */
     0x84F7, 0x8532, 0x84FA, 0x84FB, 0x84FD, 0x8502, 0x8503, 0x8507, /* 0x20 */
     0x850C, 0x850E, 0x8510, 0x851C, 0x851E, 0x8522, 0x8523, 0x8524, /* 0x30 */
@@ -2512,15 +2512,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_59[] =
     0x8598, 0x859D, 0x859F, 0x85A0, 0x85A2, 0x85A5, 0x85A7, 0x85B4, /* 0x60 */
     0x85B6, 0x85B7, 0x85B8, 0x85BC, 0x85BD, 0x85BE, 0x85BF, 0x85C2, /* 0x60 */
     0x85C7, 0x85CA, 0x85CB, 0x85CE, 0x85AD, 0x85D8, 0x85DA, 0x85DF, /* 0x70 */
-    0x85E0, 0x85E6, 0x85E8, 0x85ED, 0x85F3, 0x85F6, 0x85FC          /* 0x70 */
+    0x85E0, 0x85E6, 0x85E8, 0x85ED, 0x85F3, 0x85F6, 0x85FC			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_5A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x85FF, 0x8600, 0x8604, 0x8605, 0x860D, 0x860E, 0x8610, /* 0x20 */
     0x8611, 0x8612, 0x8618, 0x8619, 0x861B, 0x861E, 0x8621, 0x8627, /* 0x20 */
     0x8629, 0x8636, 0x8638, 0x863A, 0x863C, 0x863D, 0x8640, 0x8642, /* 0x30 */
@@ -2532,15 +2532,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_5A[] =
     0x86C1, 0x86C3, 0x86C5, 0x86D1, 0x86D2, 0x86D5, 0x86D7, 0x86DA, /* 0x60 */
     0x86DC, 0x86E0, 0x86E3, 0x86E5, 0x86E7, 0x8688, 0x86FA, 0x86FC, /* 0x60 */
     0x86FD, 0x8704, 0x8705, 0x8707, 0x870B, 0x870E, 0x870F, 0x8710, /* 0x70 */
-    0x8713, 0x8714, 0x8719, 0x871E, 0x871F, 0x8721, 0x8723          /* 0x70 */
+    0x8713, 0x8714, 0x8719, 0x871E, 0x871F, 0x8721, 0x8723			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_5B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8728, 0x872E, 0x872F, 0x8731, 0x8732, 0x8739, 0x873A, /* 0x20 */
     0x873C, 0x873D, 0x873E, 0x8740, 0x8743, 0x8745, 0x874D, 0x8758, /* 0x20 */
     0x875D, 0x8761, 0x8764, 0x8765, 0x876F, 0x8771, 0x8772, 0x877B, /* 0x30 */
@@ -2552,15 +2552,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_5B[] =
     0x87EA, 0x87EB, 0x87ED, 0x87F1, 0x87F3, 0x87F8, 0x87FA, 0x87FF, /* 0x60 */
     0x8801, 0x8803, 0x8806, 0x8809, 0x880A, 0x880B, 0x8810, 0x8819, /* 0x60 */
     0x8812, 0x8813, 0x8814, 0x8818, 0x881A, 0x881B, 0x881C, 0x881E, /* 0x70 */
-    0x881F, 0x8828, 0x882D, 0x882E, 0x8830, 0x8832, 0x8835          /* 0x70 */
+    0x881F, 0x8828, 0x882D, 0x882E, 0x8830, 0x8832, 0x8835			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_5C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x883A, 0x883C, 0x8841, 0x8843, 0x8845, 0x8848, 0x8849, /* 0x20 */
     0x884A, 0x884B, 0x884E, 0x8851, 0x8855, 0x8856, 0x8858, 0x885A, /* 0x20 */
     0x885C, 0x885F, 0x8860, 0x8864, 0x8869, 0x8871, 0x8879, 0x887B, /* 0x30 */
@@ -2572,15 +2572,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_5C[] =
     0x8920, 0x8926, 0x8927, 0x8928, 0x8930, 0x8931, 0x8932, 0x8935, /* 0x60 */
     0x8939, 0x893A, 0x893E, 0x8940, 0x8942, 0x8945, 0x8946, 0x8949, /* 0x60 */
     0x894F, 0x8952, 0x8957, 0x895A, 0x895B, 0x895C, 0x8961, 0x8962, /* 0x70 */
-    0x8963, 0x896B, 0x896E, 0x8970, 0x8973, 0x8975, 0x897A          /* 0x70 */
+    0x8963, 0x896B, 0x896E, 0x8970, 0x8973, 0x8975, 0x897A			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_5D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x897B, 0x897C, 0x897D, 0x8989, 0x898D, 0x8990, 0x8994, /* 0x20 */
     0x8995, 0x899B, 0x899C, 0x899F, 0x89A0, 0x89A5, 0x89B0, 0x89B4, /* 0x20 */
     0x89B5, 0x89B6, 0x89B7, 0x89BC, 0x89D4, 0x89D5, 0x89D6, 0x89D7, /* 0x30 */
@@ -2592,15 +2592,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_5D[] =
     0x8A57, 0x8A58, 0x8A5C, 0x8A5D, 0x8A61, 0x8A65, 0x8A67, 0x8A75, /* 0x60 */
     0x8A76, 0x8A77, 0x8A79, 0x8A7A, 0x8A7B, 0x8A7E, 0x8A7F, 0x8A80, /* 0x60 */
     0x8A83, 0x8A86, 0x8A8B, 0x8A8F, 0x8A90, 0x8A92, 0x8A96, 0x8A97, /* 0x70 */
-    0x8A99, 0x8A9F, 0x8AA7, 0x8AA9, 0x8AAE, 0x8AAF, 0x8AB3          /* 0x70 */
+    0x8A99, 0x8A9F, 0x8AA7, 0x8AA9, 0x8AAE, 0x8AAF, 0x8AB3			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_5E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8AB6, 0x8AB7, 0x8ABB, 0x8ABE, 0x8AC3, 0x8AC6, 0x8AC8, /* 0x20 */
     0x8AC9, 0x8ACA, 0x8AD1, 0x8AD3, 0x8AD4, 0x8AD5, 0x8AD7, 0x8ADD, /* 0x20 */
     0x8ADF, 0x8AEC, 0x8AF0, 0x8AF4, 0x8AF5, 0x8AF6, 0x8AFC, 0x8AFF, /* 0x30 */
@@ -2612,15 +2612,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_5E[] =
     0x8B9E, 0x8B9F, 0x8C38, 0x8C39, 0x8C3D, 0x8C3E, 0x8C45, 0x8C47, /* 0x60 */
     0x8C49, 0x8C4B, 0x8C4F, 0x8C51, 0x8C53, 0x8C54, 0x8C57, 0x8C58, /* 0x60 */
     0x8C5B, 0x8C5D, 0x8C59, 0x8C63, 0x8C64, 0x8C66, 0x8C68, 0x8C69, /* 0x70 */
-    0x8C6D, 0x8C73, 0x8C75, 0x8C76, 0x8C7B, 0x8C7E, 0x8C86          /* 0x70 */
+    0x8C6D, 0x8C73, 0x8C75, 0x8C76, 0x8C7B, 0x8C7E, 0x8C86			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_5F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8C87, 0x8C8B, 0x8C90, 0x8C92, 0x8C93, 0x8C99, 0x8C9B, /* 0x20 */
     0x8C9C, 0x8CA4, 0x8CB9, 0x8CBA, 0x8CC5, 0x8CC6, 0x8CC9, 0x8CCB, /* 0x20 */
     0x8CCF, 0x8CD6, 0x8CD5, 0x8CD9, 0x8CDD, 0x8CE1, 0x8CE8, 0x8CEC, /* 0x30 */
@@ -2632,15 +2632,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_5F[] =
     0x8DC6, 0x8DC7, 0x8DC8, 0x8DCA, 0x8DCE, 0x8DD1, 0x8DD4, 0x8DD5, /* 0x60 */
     0x8DD7, 0x8DD9, 0x8DE4, 0x8DE5, 0x8DE7, 0x8DEC, 0x8DF0, 0x8DBC, /* 0x60 */
     0x8DF1, 0x8DF2, 0x8DF4, 0x8DFD, 0x8E01, 0x8E04, 0x8E05, 0x8E06, /* 0x70 */
-    0x8E0B, 0x8E11, 0x8E14, 0x8E16, 0x8E20, 0x8E21, 0x8E22          /* 0x70 */
+    0x8E0B, 0x8E11, 0x8E14, 0x8E16, 0x8E20, 0x8E21, 0x8E22			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_60[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8E23, 0x8E26, 0x8E27, 0x8E31, 0x8E33, 0x8E36, 0x8E37, /* 0x20 */
     0x8E38, 0x8E39, 0x8E3D, 0x8E40, 0x8E41, 0x8E4B, 0x8E4D, 0x8E4E, /* 0x20 */
     0x8E4F, 0x8E54, 0x8E5B, 0x8E5C, 0x8E5D, 0x8E5E, 0x8E61, 0x8E62, /* 0x30 */
@@ -2652,15 +2652,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_60[] =
     0x8EF1, 0x8EF7, 0x8EF9, 0x8EFA, 0x8EED, 0x8F00, 0x8F02, 0x8F07, /* 0x60 */
     0x8F08, 0x8F0F, 0x8F10, 0x8F16, 0x8F17, 0x8F18, 0x8F1E, 0x8F20, /* 0x60 */
     0x8F21, 0x8F23, 0x8F25, 0x8F27, 0x8F28, 0x8F2C, 0x8F2D, 0x8F2E, /* 0x70 */
-    0x8F34, 0x8F35, 0x8F36, 0x8F37, 0x8F3A, 0x8F40, 0x8F41          /* 0x70 */
+    0x8F34, 0x8F35, 0x8F36, 0x8F37, 0x8F3A, 0x8F40, 0x8F41			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_61[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8F43, 0x8F47, 0x8F4F, 0x8F51, 0x8F52, 0x8F53, 0x8F54, /* 0x20 */
     0x8F55, 0x8F58, 0x8F5D, 0x8F5E, 0x8F65, 0x8F9D, 0x8FA0, 0x8FA1, /* 0x20 */
     0x8FA4, 0x8FA5, 0x8FA6, 0x8FB5, 0x8FB6, 0x8FB8, 0x8FBE, 0x8FC0, /* 0x30 */
@@ -2672,15 +2672,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_61[] =
     0x9062, 0x9066, 0x9067, 0x906C, 0x9070, 0x9074, 0x9079, 0x9085, /* 0x60 */
     0x9088, 0x908B, 0x908C, 0x908E, 0x9090, 0x9095, 0x9097, 0x9098, /* 0x60 */
     0x9099, 0x909B, 0x90A0, 0x90A1, 0x90A2, 0x90A5, 0x90B0, 0x90B2, /* 0x70 */
-    0x90B3, 0x90B4, 0x90B6, 0x90BD, 0x90CC, 0x90BE, 0x90C3          /* 0x70 */
+    0x90B3, 0x90B4, 0x90B6, 0x90BD, 0x90CC, 0x90BE, 0x90C3			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_62[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x90C4, 0x90C5, 0x90C7, 0x90C8, 0x90D5, 0x90D7, 0x90D8, /* 0x20 */
     0x90D9, 0x90DC, 0x90DD, 0x90DF, 0x90E5, 0x90D2, 0x90F6, 0x90EB, /* 0x20 */
     0x90EF, 0x90F0, 0x90F4, 0x90FE, 0x90FF, 0x9100, 0x9104, 0x9105, /* 0x30 */
@@ -2692,15 +2692,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_62[] =
     0x9174, 0x9179, 0x917A, 0x917B, 0x9181, 0x9183, 0x9185, 0x9186, /* 0x60 */
     0x918A, 0x918E, 0x9191, 0x9193, 0x9194, 0x9195, 0x9198, 0x919E, /* 0x60 */
     0x91A1, 0x91A6, 0x91A8, 0x91AC, 0x91AD, 0x91AE, 0x91B0, 0x91B1, /* 0x70 */
-    0x91B2, 0x91B3, 0x91B6, 0x91BB, 0x91BC, 0x91BD, 0x91BF          /* 0x70 */
+    0x91B2, 0x91B3, 0x91B6, 0x91BB, 0x91BC, 0x91BD, 0x91BF			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_63[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x91C2, 0x91C3, 0x91C5, 0x91D3, 0x91D4, 0x91D7, 0x91D9, /* 0x20 */
     0x91DA, 0x91DE, 0x91E4, 0x91E5, 0x91E9, 0x91EA, 0x91EC, 0x91ED, /* 0x20 */
     0x91EE, 0x91EF, 0x91F0, 0x91F1, 0x91F7, 0x91F9, 0x91FB, 0x91FD, /* 0x30 */
@@ -2712,15 +2712,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_63[] =
     0x924F, 0x9251, 0x9258, 0x9259, 0x925C, 0x925D, 0x9260, 0x9261, /* 0x60 */
     0x9265, 0x9267, 0x9268, 0x9269, 0x926E, 0x926F, 0x9270, 0x9275, /* 0x60 */
     0x9276, 0x9277, 0x9278, 0x9279, 0x927B, 0x927C, 0x927D, 0x927F, /* 0x70 */
-    0x9288, 0x9289, 0x928A, 0x928D, 0x928E, 0x9292, 0x9297          /* 0x70 */
+    0x9288, 0x9289, 0x928A, 0x928D, 0x928E, 0x9292, 0x9297			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_64[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9299, 0x929F, 0x92A0, 0x92A4, 0x92A5, 0x92A7, 0x92A8, /* 0x20 */
     0x92AB, 0x92AF, 0x92B2, 0x92B6, 0x92B8, 0x92BA, 0x92BB, 0x92BC, /* 0x20 */
     0x92BD, 0x92BF, 0x92C0, 0x92C1, 0x92C2, 0x92C3, 0x92C5, 0x92C6, /* 0x30 */
@@ -2732,15 +2732,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_64[] =
     0x9325, 0x9327, 0x9329, 0x932A, 0x9333, 0x9334, 0x9336, 0x9337, /* 0x60 */
     0x9347, 0x9348, 0x9349, 0x9350, 0x9351, 0x9352, 0x9355, 0x9357, /* 0x60 */
     0x9358, 0x935A, 0x935E, 0x9364, 0x9365, 0x9367, 0x9369, 0x936A, /* 0x70 */
-    0x936D, 0x936F, 0x9370, 0x9371, 0x9373, 0x9374, 0x9376          /* 0x70 */
+    0x936D, 0x936F, 0x9370, 0x9371, 0x9373, 0x9374, 0x9376			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_65[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x937A, 0x937D, 0x937F, 0x9380, 0x9381, 0x9382, 0x9388, /* 0x20 */
     0x938A, 0x938B, 0x938D, 0x938F, 0x9392, 0x9395, 0x9398, 0x939B, /* 0x20 */
     0x939E, 0x93A1, 0x93A3, 0x93A4, 0x93A6, 0x93A8, 0x93AB, 0x93B4, /* 0x30 */
@@ -2752,15 +2752,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_65[] =
     0x942E, 0x942F, 0x9431, 0x9432, 0x9433, 0x9434, 0x943B, 0x943F, /* 0x60 */
     0x943D, 0x9443, 0x9445, 0x9448, 0x944A, 0x944C, 0x9455, 0x9459, /* 0x60 */
     0x945C, 0x945F, 0x9461, 0x9463, 0x9468, 0x946B, 0x946D, 0x946E, /* 0x70 */
-    0x946F, 0x9471, 0x9472, 0x9484, 0x9483, 0x9578, 0x9579          /* 0x70 */
+    0x946F, 0x9471, 0x9472, 0x9484, 0x9483, 0x9578, 0x9579			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_66[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x957E, 0x9584, 0x9588, 0x958C, 0x958D, 0x958E, 0x959D, /* 0x20 */
     0x959E, 0x959F, 0x95A1, 0x95A6, 0x95A9, 0x95AB, 0x95AC, 0x95B4, /* 0x20 */
     0x95B6, 0x95BA, 0x95BD, 0x95BF, 0x95C6, 0x95C8, 0x95C9, 0x95CB, /* 0x30 */
@@ -2772,15 +2772,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_66[] =
     0x9681, 0x9682, 0x9683, 0x9684, 0x9689, 0x9691, 0x9696, 0x969A, /* 0x60 */
     0x969D, 0x969F, 0x96A4, 0x96A5, 0x96A6, 0x96A9, 0x96AE, 0x96AF, /* 0x60 */
     0x96B3, 0x96BA, 0x96CA, 0x96D2, 0x5DB2, 0x96D8, 0x96DA, 0x96DD, /* 0x70 */
-    0x96DE, 0x96DF, 0x96E9, 0x96EF, 0x96F1, 0x96FA, 0x9702          /* 0x70 */
+    0x96DE, 0x96DF, 0x96E9, 0x96EF, 0x96F1, 0x96FA, 0x9702			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_67[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9703, 0x9705, 0x9709, 0x971A, 0x971B, 0x971D, 0x9721, /* 0x20 */
     0x9722, 0x9723, 0x9728, 0x9731, 0x9733, 0x9741, 0x9743, 0x974A, /* 0x20 */
     0x974E, 0x974F, 0x9755, 0x9757, 0x9758, 0x975A, 0x975B, 0x9763, /* 0x30 */
@@ -2792,15 +2792,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_67[] =
     0x97CE, 0x97D0, 0x97D1, 0x97D4, 0x97D7, 0x97D8, 0x97D9, 0x97DD, /* 0x60 */
     0x97DE, 0x97E0, 0x97DB, 0x97E1, 0x97E4, 0x97EF, 0x97F1, 0x97F4, /* 0x60 */
     0x97F7, 0x97F8, 0x97FA, 0x9807, 0x980A, 0x9819, 0x980D, 0x980E, /* 0x70 */
-    0x9814, 0x9816, 0x981C, 0x981E, 0x9820, 0x9823, 0x9826          /* 0x70 */
+    0x9814, 0x9816, 0x981C, 0x981E, 0x9820, 0x9823, 0x9826			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_68[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x982B, 0x982E, 0x982F, 0x9830, 0x9832, 0x9833, 0x9835, /* 0x20 */
     0x9825, 0x983E, 0x9844, 0x9847, 0x984A, 0x9851, 0x9852, 0x9853, /* 0x20 */
     0x9856, 0x9857, 0x9859, 0x985A, 0x9862, 0x9863, 0x9865, 0x9866, /* 0x30 */
@@ -2812,15 +2812,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_68[] =
     0x9932, 0x9933, 0x9934, 0x9935, 0x9939, 0x993A, 0x993B, 0x993C, /* 0x60 */
     0x9940, 0x9941, 0x9946, 0x9947, 0x9948, 0x994D, 0x994E, 0x9954, /* 0x60 */
     0x9958, 0x9959, 0x995B, 0x995C, 0x995E, 0x995F, 0x9960, 0x999B, /* 0x70 */
-    0x999D, 0x999F, 0x99A6, 0x99B0, 0x99B1, 0x99B2, 0x99B5          /* 0x70 */
+    0x999D, 0x999F, 0x99A6, 0x99B0, 0x99B1, 0x99B2, 0x99B5			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_69[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x99B9, 0x99BA, 0x99BD, 0x99BF, 0x99C3, 0x99C9, 0x99D3, /* 0x20 */
     0x99D4, 0x99D9, 0x99DA, 0x99DC, 0x99DE, 0x99E7, 0x99EA, 0x99EB, /* 0x20 */
     0x99EC, 0x99F0, 0x99F4, 0x99F5, 0x99F9, 0x99FD, 0x99FE, 0x9A02, /* 0x30 */
@@ -2832,15 +2832,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_69[] =
     0x9ABE, 0x9ABF, 0x9AC1, 0x9AC3, 0x9AC6, 0x9AC8, 0x9ACE, 0x9AD0, /* 0x60 */
     0x9AD2, 0x9AD5, 0x9AD6, 0x9AD7, 0x9ADB, 0x9ADC, 0x9AE0, 0x9AE4, /* 0x60 */
     0x9AE5, 0x9AE7, 0x9AE9, 0x9AEC, 0x9AF2, 0x9AF3, 0x9AF5, 0x9AF9, /* 0x70 */
-    0x9AFA, 0x9AFD, 0x9AFF, 0x9B00, 0x9B01, 0x9B02, 0x9B03          /* 0x70 */
+    0x9AFA, 0x9AFD, 0x9AFF, 0x9B00, 0x9B01, 0x9B02, 0x9B03			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_6A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9B04, 0x9B05, 0x9B08, 0x9B09, 0x9B0B, 0x9B0C, 0x9B0D, /* 0x20 */
     0x9B0E, 0x9B10, 0x9B12, 0x9B16, 0x9B19, 0x9B1B, 0x9B1C, 0x9B20, /* 0x20 */
     0x9B26, 0x9B2B, 0x9B2D, 0x9B33, 0x9B34, 0x9B35, 0x9B37, 0x9B39, /* 0x30 */
@@ -2852,15 +2852,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_6A[] =
     0x9B9E, 0x9BA6, 0x9BA7, 0x9BA9, 0x9BAC, 0x9BB0, 0x9BB1, 0x9BB2, /* 0x60 */
     0x9BB7, 0x9BB8, 0x9BBB, 0x9BBC, 0x9BBE, 0x9BBF, 0x9BC1, 0x9BC7, /* 0x60 */
     0x9BC8, 0x9BCE, 0x9BD0, 0x9BD7, 0x9BD8, 0x9BDD, 0x9BDF, 0x9BE5, /* 0x70 */
-    0x9BE7, 0x9BEA, 0x9BEB, 0x9BEF, 0x9BF3, 0x9BF7, 0x9BF8          /* 0x70 */
+    0x9BE7, 0x9BEA, 0x9BEB, 0x9BEF, 0x9BF3, 0x9BF7, 0x9BF8			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_6B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9BF9, 0x9BFA, 0x9BFD, 0x9BFF, 0x9C00, 0x9C02, 0x9C0B, /* 0x20 */
     0x9C0F, 0x9C11, 0x9C16, 0x9C18, 0x9C19, 0x9C1A, 0x9C1C, 0x9C1E, /* 0x20 */
     0x9C22, 0x9C23, 0x9C26, 0x9C27, 0x9C28, 0x9C29, 0x9C2A, 0x9C31, /* 0x30 */
@@ -2872,15 +2872,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_6B[] =
     0x9D17, 0x9D18, 0x9D1C, 0x9D1D, 0x9D1E, 0x9D2F, 0x9D30, 0x9D32, /* 0x60 */
     0x9D33, 0x9D34, 0x9D3A, 0x9D3C, 0x9D45, 0x9D3D, 0x9D42, 0x9D43, /* 0x60 */
     0x9D47, 0x9D4A, 0x9D53, 0x9D54, 0x9D5F, 0x9D63, 0x9D62, 0x9D65, /* 0x70 */
-    0x9D69, 0x9D6A, 0x9D6B, 0x9D70, 0x9D76, 0x9D77, 0x9D7B          /* 0x70 */
+    0x9D69, 0x9D6A, 0x9D6B, 0x9D70, 0x9D76, 0x9D77, 0x9D7B			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_6C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9D7C, 0x9D7E, 0x9D83, 0x9D84, 0x9D86, 0x9D8A, 0x9D8D, /* 0x20 */
     0x9D8E, 0x9D92, 0x9D93, 0x9D95, 0x9D96, 0x9D97, 0x9D98, 0x9DA1, /* 0x20 */
     0x9DAA, 0x9DAC, 0x9DAE, 0x9DB1, 0x9DB5, 0x9DB9, 0x9DBC, 0x9DBF, /* 0x30 */
@@ -2892,15 +2892,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_6C[] =
     0x9E85, 0x9E87, 0x9E8E, 0x9E8F, 0x9E96, 0x9E98, 0x9E9B, 0x9E9E, /* 0x60 */
     0x9EA4, 0x9EA8, 0x9EAC, 0x9EAE, 0x9EAF, 0x9EB0, 0x9EB3, 0x9EB4, /* 0x60 */
     0x9EB5, 0x9EC6, 0x9EC8, 0x9ECB, 0x9ED5, 0x9EDF, 0x9EE4, 0x9EE7, /* 0x70 */
-    0x9EEC, 0x9EED, 0x9EEE, 0x9EF0, 0x9EF1, 0x9EF2, 0x9EF5          /* 0x70 */
+    0x9EEC, 0x9EED, 0x9EEE, 0x9EF0, 0x9EF1, 0x9EF2, 0x9EF5			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0212_6D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9EF8, 0x9EFF, 0x9F02, 0x9F03, 0x9F09, 0x9F0F, 0x9F10, /* 0x20 */
     0x9F11, 0x9F12, 0x9F14, 0x9F16, 0x9F17, 0x9F19, 0x9F1A, 0x9F1B, /* 0x20 */
     0x9F1F, 0x9F22, 0x9F26, 0x9F2A, 0x9F2B, 0x9F2F, 0x9F31, 0x9F32, /* 0x30 */
@@ -2909,6 +2909,6 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0212_6D[] =
     0x9F57, 0x9F58, 0x9F5A, 0x9F5D, 0x9F5E, 0x9F68, 0x9F69, 0x9F6D, /* 0x40 */
     0x9F6E, 0x9F6F, 0x9F70, 0x9F71, 0x9F73, 0x9F75, 0x9F7A, 0x9F7D, /* 0x50 */
     0x9F8F, 0x9F90, 0x9F91, 0x9F92, 0x9F94, 0x9F96, 0x9F97, 0x9F9E, /* 0x50 */
-    0x9FA1, 0x9FA2, 0x9FA3, 0x9FA5                                  /* 0x60 */
+    0x9FA1, 0x9FA2, 0x9FA3, 0x9FA5									/* 0x60 */
                                                                     /* 0x60 */
 };
diff --git a/sal/textenc/tcvtjp4.tab b/sal/textenc/tcvtjp4.tab
index 93165e0c99d2..946b2376ac91 100644
--- a/sal/textenc/tcvtjp4.tab
+++ b/sal/textenc/tcvtjp4.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,19 +34,19 @@
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_00[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x2171, 0x2172,      0,      0,      0, 0x2178, /* 0xA0 */
-    0x212F,      0,      0,      0, 0x224C,      0,      0,      0, /* 0xA0 */
-    0x216B, 0x215E,      0,      0, 0x212D,      0, 0x2279,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0x215F, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0x2160, /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x2171, 0x2172, 	 0, 	 0, 	 0, 0x2178, /* 0xA0 */
+    0x212F, 	 0, 	 0, 	 0, 0x224C, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x216B, 0x215E, 	 0, 	 0, 0x212D, 	 0, 0x2279, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x215F, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x2160, /* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -54,26 +54,26 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_00[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_03[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x2621, 0x2622, 0x2623, 0x2624, 0x2625, 0x2626, 0x2627, /* 0x90 */
     0x2628, 0x2629, 0x262A, 0x262B, 0x262C, 0x262D, 0x262E, 0x262F, /* 0x90 */
-    0x2630, 0x2631,      0, 0x2632, 0x2633, 0x2634, 0x2635, 0x2636, /* 0xA0 */
-    0x2637, 0x2638,      0,      0,      0,      0,      0,      0, /* 0xA0 */
+    0x2630, 0x2631, 	 0, 0x2632, 0x2633, 0x2634, 0x2635, 0x2636, /* 0xA0 */
+    0x2637, 0x2638, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
          0, 0x2641, 0x2642, 0x2643, 0x2644, 0x2645, 0x2646, 0x2647, /* 0xB0 */
     0x2648, 0x2649, 0x264A, 0x264B, 0x264C, 0x264D, 0x264E, 0x264F, /* 0xB0 */
-    0x2650, 0x2651,      0, 0x2652, 0x2653, 0x2654, 0x2655, 0x2656, /* 0xC0 */
-    0x2657, 0x2658                                                  /* 0xC0 */
+    0x2650, 0x2651, 	 0, 0x2652, 0x2653, 0x2654, 0x2655, 0x2656, /* 0xC0 */
+    0x2657, 0x2658													/* 0xC0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_04[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x2727,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x2727, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
     0x2721, 0x2722, 0x2723, 0x2724, 0x2725, 0x2726, 0x2728, 0x2729, /* 0x10 */
     0x272A, 0x272B, 0x272C, 0x272D, 0x272E, 0x272F, 0x2730, 0x2731, /* 0x10 */
     0x2732, 0x2733, 0x2734, 0x2735, 0x2736, 0x2737, 0x2738, 0x2739, /* 0x20 */
@@ -82,7 +82,7 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_04[] =
     0x275A, 0x275B, 0x275C, 0x275D, 0x275E, 0x275F, 0x2760, 0x2761, /* 0x30 */
     0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, 0x2768, 0x2769, /* 0x40 */
     0x276A, 0x276B, 0x276C, 0x276D, 0x276E, 0x276F, 0x2770, 0x2771, /* 0x40 */
-         0, 0x2757                                                  /* 0x50 */
+         0, 0x2757													/* 0x50 */
                                                                     /* 0x50 */
 };
 
@@ -90,49 +90,49 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_04[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_20[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x213E,      0,      0,      0,      0, 0x213D, 0x2142,      0, /* 0x10 */
-    0x2146, 0x2147,      0,      0, 0x2148, 0x2149,      0,      0, /* 0x10 */
-    0x2277, 0x2278,      0,      0,      0, 0x2145, 0x2144,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x2228                                  /* 0x30 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x213E, 	 0, 	 0, 	 0, 	 0, 0x213D, 0x2142, 	 0, /* 0x10 */
+    0x2146, 0x2147, 	 0, 	 0, 0x2148, 0x2149, 	 0, 	 0, /* 0x10 */
+    0x2277, 0x2278, 	 0, 	 0, 	 0, 0x2145, 0x2144, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x2273, 	 0, 0x216C, 0x216D, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x2228									/* 0x30 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_21[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0x216E,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0x2D62,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0x2D64,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0x2272,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0x2D35, 0x2D36, 0x2D37, 0x2D38, 0x2D39, 0x2D3A, 0x2D3B, 0x2D3C, /* 0x60 */
-    0x2D3D, 0x2D3E,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0x222B, 0x222C, 0x222A, 0x222D,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x224D,      0, 0x224E                          /* 0xD0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0x216E, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x2D62, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x2D64, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x2272, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x2D35, 0x2D36, 0x2D37, 0x2D38, 0x2D39, 0x2D3A,	0x2D3B, 0x2D3C, /* 0x60 */
+    0x2D3D, 0x2D3E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x222B, 0x222C, 0x222A, 0x222D, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x224D, 	 0, 0x224E							/* 0xD0 */
                                                                     /* 0xD0 */
 };
 
@@ -140,29 +140,29 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_21[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_22[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x224F,      0, 0x225F, 0x2250,      0,      0,      0, 0x2260, /* 0x00 */
-    0x223A,      0,      0, 0x223B,      0,      0,      0,      0, /* 0x00 */
-         0, 0x2D74, 0x215D,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x2265,      0,      0, 0x2267, 0x2167, 0x2D78, /* 0x10 */
-    0x225C,      0,      0,      0,      0,      0,      0, 0x224A, /* 0x20 */
-    0x224B, 0x2241, 0x2240, 0x2269, 0x226A,      0, 0x2D73,      0, /* 0x20 */
-         0,      0,      0,      0, 0x2168, 0x2268,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0x2266,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x2262,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0x2162, 0x2261,      0,      0,      0,      0, 0x2165, 0x2166, /* 0x60 */
-         0,      0, 0x2263, 0x2264,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x223E, 0x223F,      0,      0, 0x223C, 0x223D, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0x225D,      0,      0, /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x224F, 	 0, 0x225F, 0x2250, 	 0, 	 0, 	 0, 0x2260, /* 0x00 */
+    0x223A, 	 0, 	 0, 0x223B, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x2D74, 0x215D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x2265, 	 0, 	 0, 0x2267, 0x2167, 0x2D78, /* 0x10 */
+    0x225C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x224A, /* 0x20 */
+    0x224B, 0x2241, 0x2240, 0x2269, 0x226A, 	 0, 0x2D73, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x2168, 0x2268, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x2266, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x2262, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x2162, 0x2261, 	 0, 	 0, 	 0, 	 0, 0x2165, 0x2166, /* 0x60 */
+         0, 	 0, 0x2263, 0x2264, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x223E, 0x223F, 	 0, 	 0, 0x223C, 0x223D, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x225D,      0,      0, /* 0xA0 */
          0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
          0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
          0,      0,      0,      0,      0,      0,      0, 0x2D79  /* 0xB0 */
@@ -172,9 +172,9 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_22[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_23[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x225E                                          /* 0x10 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x225E											/* 0x10 */
                                                                     /* 0x10 */
 };
 
@@ -193,76 +193,76 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_24[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_25[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x2821, 0x282C, 0x2822, 0x282D,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0x2823,      0,      0, 0x282E, /* 0x00 */
-    0x2824,      0,      0, 0x282F, 0x2826,      0,      0, 0x2831, /* 0x10 */
-    0x2825,      0,      0, 0x2830, 0x2827, 0x283C,      0,      0, /* 0x10 */
-    0x2837,      0,      0, 0x2832, 0x2829, 0x283E,      0,      0, /* 0x20 */
-    0x2839,      0,      0, 0x2834, 0x2828,      0,      0, 0x2838, /* 0x20 */
-    0x283D,      0,      0, 0x2833, 0x282A,      0,      0, 0x283A, /* 0x30 */
-    0x283F,      0,      0, 0x2835, 0x282B,      0,      0, 0x283B, /* 0x30 */
-         0,      0, 0x2840,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0x2836,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x2223, 0x2222,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x2225, 0x2224,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x2227, 0x2226,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x2221, 0x217E, /* 0xC0 */
-         0,      0,      0, 0x217B,      0,      0, 0x217D, 0x217C, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0x227E  /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x2821, 0x282C, 0x2822, 0x282D, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x2823, 	 0, 	 0, 0x282E, /* 0x00 */
+    0x2824, 	 0, 	 0, 0x282F, 0x2826, 	 0, 	 0, 0x2831, /* 0x10 */
+    0x2825, 	 0, 	 0, 0x2830, 0x2827, 0x283C, 	 0, 	 0, /* 0x10 */
+    0x2837, 	 0, 	 0, 0x2832, 0x2829, 0x283E, 	 0, 	 0, /* 0x20 */
+    0x2839, 	 0, 	 0, 0x2834, 0x2828, 	 0, 	 0, 0x2838, /* 0x20 */
+    0x283D, 	 0, 	 0, 0x2833, 0x282A, 	 0, 	 0, 0x283A, /* 0x30 */
+    0x283F, 	 0, 	 0, 0x2835, 0x282B, 	 0, 	 0, 0x283B, /* 0x30 */
+         0, 	 0, 0x2840, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x2836, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x2223, 0x2222, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x2225, 0x2224, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x2227, 0x2226, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x2221, 0x217E, /* 0xC0 */
+         0, 	 0, 	 0, 0x217B, 	 0, 	 0, 0x217D, 0x217C, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x227E	/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_26[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0x217A, 0x2179,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0x216A,      0, 0x2169,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0x2276,      0,      0, 0x2275,      0, 0x2274  /* 0x60 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0x217A, 0x2179, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x216A, 	 0, 0x2169, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x2276, 	 0, 	 0, 0x2275, 	 0, 0x2274	/* 0x60 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_30[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x2121, 0x2122, 0x2123, 0x2137,      0, 0x2139, 0x213A, 0x213B, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x2121, 0x2122, 0x2123, 0x2137, 	 0, 0x2139, 0x213A, 0x213B, /* 0x00 */
     0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159, /* 0x00 */
-    0x215A, 0x215B, 0x2229, 0x222E, 0x214C, 0x214D,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0x2141, 0x2D60,      0, 0x2D61, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
+    0x215A, 0x215B, 0x2229, 0x222E, 0x214C, 0x214D, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x2141, 0x2D60, 	 0, 0x2D61, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
          0, 0x2421, 0x2422, 0x2423, 0x2424, 0x2425, 0x2426, 0x2427, /* 0x40 */
     0x2428, 0x2429, 0x242A, 0x242B, 0x242C, 0x242D, 0x242E, 0x242F, /* 0x40 */
     0x2430, 0x2431, 0x2432, 0x2433, 0x2434, 0x2435, 0x2436, 0x2437, /* 0x50 */
@@ -273,8 +273,8 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_30[] =
     0x2458, 0x2459, 0x245A, 0x245B, 0x245C, 0x245D, 0x245E, 0x245F, /* 0x70 */
     0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467, /* 0x80 */
     0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x246F, /* 0x80 */
-    0x2470, 0x2471, 0x2472, 0x2473,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0x212B, 0x212C, 0x2135, 0x2136,      0, /* 0x90 */
+    0x2470, 0x2471, 0x2472, 0x2473, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x212B, 0x212C, 0x2135, 0x2136, 	 0, /* 0x90 */
          0, 0x2521, 0x2522, 0x2523, 0x2524, 0x2525, 0x2526, 0x2527, /* 0xA0 */
     0x2528, 0x2529, 0x252A, 0x252B, 0x252C, 0x252D, 0x252E, 0x252F, /* 0xA0 */
     0x2530, 0x2531, 0x2532, 0x2533, 0x2534, 0x2535, 0x2536, 0x2537, /* 0xB0 */
@@ -285,8 +285,8 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_30[] =
     0x2558, 0x2559, 0x255A, 0x255B, 0x255C, 0x255D, 0x255E, 0x255F, /* 0xD0 */
     0x2560, 0x2561, 0x2562, 0x2563, 0x2564, 0x2565, 0x2566, 0x2567, /* 0xE0 */
     0x2568, 0x2569, 0x256A, 0x256B, 0x256C, 0x256D, 0x256E, 0x256F, /* 0xE0 */
-    0x2570, 0x2571, 0x2572, 0x2573, 0x2574, 0x2575, 0x2576,      0, /* 0xF0 */
-         0,      0,      0, 0x2126, 0x213C, 0x2133, 0x2134          /* 0xF0 */
+    0x2570, 0x2571, 0x2572, 0x2573, 0x2574, 0x2575, 0x2576, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0x2126, 0x213C, 0x2133, 0x2134			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -351,1199 +351,1199 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_33[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_4E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x306C, 0x437A,      0, 0x3C37,      0,      0,      0, 0x4B7C, /* 0x00 */
-    0x3E66, 0x3B30, 0x3E65, 0x323C,      0, 0x4954, 0x4D3F,      0, /* 0x00 */
-    0x5022, 0x312F,      0,      0, 0x336E, 0x5023, 0x4024, 0x5242, /* 0x10 */
-    0x3556, 0x4A3A,      0,      0,      0,      0, 0x3E67,      0, /* 0x10 */
-         0, 0x4E3E,      0,      0,      0,      0, 0x4A42,      0, /* 0x20 */
-         0,      0, 0x5024,      0,      0, 0x4366,      0,      0, /* 0x20 */
-         0, 0x5025, 0x367A,      0,      0,      0, 0x5026,      0, /* 0x30 */
-    0x345D, 0x4330,      0, 0x3C67, 0x5027,      0,      0, 0x5028, /* 0x30 */
-         0,      0, 0x5029, 0x4735,      0, 0x3557,      0,      0, /* 0x40 */
-         0,      0,      0, 0x4737,      0, 0x4663, 0x3843, 0x4B33, /* 0x40 */
-         0,      0,      0,      0,      0, 0x6949, 0x502A, 0x3E68, /* 0x50 */
-    0x502B, 0x3235,      0,      0,      0, 0x3665, 0x3870, 0x4C69, /* 0x50 */
-         0,      0, 0x5626,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0x4D70,      0, 0x467D,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x3425,      0, /* 0x70 */
-    0x3535,      0, 0x502C,      0,      0, 0x502D, 0x4E3B,      0, /* 0x80 */
-    0x4D3D, 0x4168, 0x502F, 0x3B76, 0x4673,      0, 0x5032,      0, /* 0x80 */
-         0, 0x313E, 0x385F,      0, 0x385E, 0x3066,      0,      0, /* 0x90 */
-    0x4F4B, 0x4F4A,      0, 0x3A33, 0x3021,      0, 0x5033, 0x5034, /* 0x90 */
-    0x5035, 0x4B34, 0x5036,      0, 0x3872, 0x3067, 0x4B72,      0, /* 0xA0 */
-    0x357C,      0,      0, 0x357D, 0x357E, 0x4462, 0x4E3C,      0, /* 0xA0 */
-    0x5037,      0,      0, 0x5038,      0,      0, 0x5039,      0, /* 0xB0 */
-         0,      0, 0x3F4D,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x3D3A, 0x3F4E, 0x503E,      0, 0x503C,      0, 0x503D, 0x3558, /* 0xC0 */
-         0,      0, 0x3A23, 0x3270,      0, 0x503B, 0x503A, 0x4A29, /* 0xC0 */
-         0,      0,      0,      0, 0x3B46, 0x3B45, 0x423E, 0x503F, /* 0xD0 */
-    0x4955, 0x4067,      0,      0,      0, 0x2138, 0x5040, 0x5042, /* 0xD0 */
-         0,      0,      0, 0x4265, 0x4E61, 0x304A,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0x5041, 0x323E,      0, /* 0xE0 */
-    0x3644,      0, 0x4367,      0,      0,      0, 0x376F, 0x5043, /* 0xF0 */
-         0,      0,      0, 0x4724                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x306C, 0x437A, 	 0, 0x3C37, 	 0, 	 0, 	 0, 0x4B7C, /* 0x00 */
+    0x3E66, 0x3B30, 0x3E65, 0x323C, 	 0, 0x4954, 0x4D3F, 	 0, /* 0x00 */
+    0x5022, 0x312F, 	 0, 	 0, 0x336E, 0x5023, 0x4024, 0x5242, /* 0x10 */
+    0x3556, 0x4A3A, 	 0, 	 0, 	 0, 	 0, 0x3E67, 	 0, /* 0x10 */
+         0, 0x4E3E, 	 0, 	 0, 	 0, 	 0, 0x4A42, 	 0, /* 0x20 */
+         0, 	 0, 0x5024, 	 0, 	 0, 0x4366, 	 0, 	 0, /* 0x20 */
+         0, 0x5025, 0x367A, 	 0, 	 0, 	 0, 0x5026, 	 0, /* 0x30 */
+    0x345D, 0x4330, 	 0, 0x3C67, 0x5027, 	 0, 	 0, 0x5028, /* 0x30 */
+         0, 	 0, 0x5029, 0x4735, 	 0, 0x3557, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x4737, 	 0, 0x4663, 0x3843, 0x4B33, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6949, 0x502A, 0x3E68, /* 0x50 */
+    0x502B, 0x3235, 	 0, 	 0, 	 0, 0x3665, 0x3870, 0x4C69, /* 0x50 */
+         0, 	 0, 0x5626, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x4D70, 	 0, 0x467D, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3425, 	 0, /* 0x70 */
+    0x3535, 	 0, 0x502C, 	 0, 	 0, 0x502D, 0x4E3B, 	 0, /* 0x80 */
+    0x4D3D, 0x4168, 0x502F, 0x3B76, 0x4673, 	 0, 0x5032, 	 0, /* 0x80 */
+         0, 0x313E, 0x385F, 	 0, 0x385E, 0x3066, 	 0, 	 0, /* 0x90 */
+    0x4F4B, 0x4F4A, 	 0, 0x3A33, 0x3021, 	 0, 0x5033, 0x5034, /* 0x90 */
+    0x5035, 0x4B34, 0x5036, 	 0, 0x3872, 0x3067, 0x4B72, 	 0, /* 0xA0 */
+    0x357C, 	 0, 	 0, 0x357D, 0x357E, 0x4462, 0x4E3C, 	 0, /* 0xA0 */
+    0x5037, 	 0, 	 0, 0x5038, 	 0, 	 0, 0x5039, 	 0, /* 0xB0 */
+         0, 	 0, 0x3F4D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x3D3A, 0x3F4E, 0x503E, 	 0, 0x503C, 	 0, 0x503D, 0x3558, /* 0xC0 */
+         0, 	 0, 0x3A23, 0x3270, 	 0, 0x503B, 0x503A, 0x4A29, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x3B46, 0x3B45, 0x423E, 0x503F, /* 0xD0 */
+    0x4955, 0x4067, 	 0, 	 0, 	 0, 0x2138, 0x5040, 0x5042, /* 0xD0 */
+         0, 	 0, 	 0, 0x4265, 0x4E61, 0x304A, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5041, 0x323E, 	 0, /* 0xE0 */
+    0x3644, 	 0, 0x4367, 	 0, 	 0, 	 0, 0x376F, 0x5043, /* 0xF0 */
+         0, 	 0, 	 0, 0x4724									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_4F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x346B,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0x5044, 0x304B,      0,      0, 0x3860, 0x346C, 0x497A, /* 0x00 */
-    0x4832, 0x3559,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x3271,      0, 0x5067, 0x4541,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0x476C, /* 0x20 */
-    0x5046,      0,      0,      0, 0x483C,      0, 0x4E62,      0, /* 0x30 */
-    0x3F2D,      0, 0x3B47,      0, 0x3B77, 0x3240,      0,      0, /* 0x30 */
-         0,      0,      0, 0x4451,      0,      0, 0x4322, 0x504A, /* 0x40 */
-         0,      0,      0,      0,      0, 0x304C, 0x4463, 0x3D3B, /* 0x40 */
-    0x3A34, 0x4D24,      0, 0x424E,      0, 0x323F,      0, 0x5049, /* 0x50 */
-         0, 0x4D3E, 0x5045, 0x5047, 0x3A6E, 0x5048, 0x5524,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0x5050,      0,      0,      0,      0,      0, 0x5053, /* 0x60 */
-    0x5051,      0,      0, 0x3242,      0, 0x4A3B, 0x504B,      0, /* 0x70 */
-         0,      0,      0, 0x504F, 0x3873,      0,      0, 0x3B48, /* 0x70 */
-         0,      0,      0, 0x3426,      0,      0, 0x5054,      0, /* 0x80 */
-    0x504C,      0,      0, 0x4E63,      0, 0x3B78,      0, 0x504D, /* 0x80 */
-         0, 0x5052,      0,      0,      0,      0, 0x5055,      0, /* 0x90 */
-    0x504E,      0,      0, 0x3621,      0, 0x304D,      0,      0, /* 0x90 */
-    0x3622, 0x3241,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x5525,      0, 0x4B79, 0x496E, 0x3874, /* 0xA0 */
-         0,      0,      0,      0,      0, 0x3F2F, 0x4E37,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0x4A58, /* 0xB0 */
-         0,      0, 0x3738, 0x4225, 0x3264,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x3D53,      0,      0,      0, 0x5059,      0, /* 0xC0 */
-    0x505E, 0x505C,      0,      0, 0x5057,      0,      0, 0x422F, /* 0xD0 */
-    0x505A,      0, 0x505D, 0x505B,      0, 0x4A5D,      0, 0x5058, /* 0xD0 */
-         0, 0x3F2E,      0, 0x4B73, 0x505F, 0x5060,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0x3D24, 0x506D, /* 0xE0 */
-         0,      0,      0, 0x4750,      0, 0x4936, 0x5068,      0, /* 0xF0 */
-    0x4A70,      0, 0x3236,      0,      0,      0, 0x506C          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x346B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x5044, 0x304B, 	 0, 	 0, 0x3860, 0x346C, 0x497A, /* 0x00 */
+    0x4832, 0x3559, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x3271, 	 0, 0x5067, 0x4541, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x476C, /* 0x20 */
+    0x5046, 	 0, 	 0, 	 0, 0x483C, 	 0, 0x4E62, 	 0, /* 0x30 */
+    0x3F2D, 	 0, 0x3B47, 	 0, 0x3B77, 0x3240, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x4451, 	 0, 	 0, 0x4322, 0x504A, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x304C, 0x4463, 0x3D3B, /* 0x40 */
+    0x3A34, 0x4D24, 	 0, 0x424E, 	 0, 0x323F, 	 0, 0x5049, /* 0x50 */
+         0, 0x4D3E, 0x5045, 0x5047, 0x3A6E, 0x5048, 0x5524, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x5050, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5053, /* 0x60 */
+    0x5051, 	 0, 	 0, 0x3242, 	 0, 0x4A3B, 0x504B, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x504F, 0x3873, 	 0, 	 0, 0x3B48, /* 0x70 */
+         0, 	 0, 	 0, 0x3426, 	 0, 	 0, 0x5054, 	 0, /* 0x80 */
+    0x504C, 	 0, 	 0, 0x4E63, 	 0, 0x3B78, 	 0, 0x504D, /* 0x80 */
+         0, 0x5052, 	 0, 	 0, 	 0, 	 0, 0x5055, 	 0, /* 0x90 */
+    0x504E, 	 0, 	 0, 0x3621, 	 0, 0x304D, 	 0, 	 0, /* 0x90 */
+    0x3622, 0x3241, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x5525, 	 0, 0x4B79, 0x496E, 0x3874, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3F2F, 0x4E37, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4A58, /* 0xB0 */
+         0, 	 0, 0x3738, 0x4225, 0x3264, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x3D53, 	 0, 	 0, 	 0, 0x5059, 	 0, /* 0xC0 */
+    0x505E, 0x505C, 	 0, 	 0, 0x5057, 	 0, 	 0, 0x422F, /* 0xD0 */
+    0x505A, 	 0, 0x505D, 0x505B, 	 0, 0x4A5D, 	 0, 0x5058, /* 0xD0 */
+         0, 0x3F2E, 	 0, 0x4B73, 0x505F, 0x5060, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3D24, 0x506D, /* 0xE0 */
+         0, 	 0, 	 0, 0x4750, 	 0, 0x4936, 0x5068, 	 0, /* 0xF0 */
+    0x4A70, 	 0, 0x3236, 	 0, 	 0, 	 0, 0x506C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_50[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0x5066, 0x506F,      0, /* 0x00 */
-         0, 0x4152,      0, 0x3844,      0, 0x475C,      0, 0x6047, /* 0x00 */
-         0, 0x506E, 0x455D,      0, 0x5063,      0, 0x3876,      0, /* 0x10 */
-         0, 0x3875, 0x5061,      0,      0,      0,      0, 0x3C5A, /* 0x10 */
-         0, 0x5069,      0, 0x4A6F, 0x434D, 0x5065, 0x3771,      0, /* 0x20 */
-    0x5062, 0x506A, 0x5064, 0x4E51, 0x506B, 0x4F41,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x3666,      0, /* 0x30 */
-         0, 0x3770,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x5070,      0,      0,      0, 0x5071, /* 0x40 */
-    0x5075, 0x304E,      0,      0,      0,      0,      0, 0x4A50, /* 0x40 */
-    0x5074,      0,      0,      0,      0, 0x5073, 0x5077,      0, /* 0x50 */
-         0,      0, 0x5076,      0, 0x4464,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0x3772,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0x5078,      0,      0,      0, /* 0x60 */
-         0,      0, 0x3C45,      0, 0x4226, 0x4465, 0x3676,      0, /* 0x70 */
-    0x5079,      0,      0,      0,      0, 0x3536,      0,      0, /* 0x70 */
-    0x507A,      0,      0,      0,      0, 0x507C,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x4B35,      0,      0, /* 0x80 */
-         0, 0x3766,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x3B31, 0x4877, 0x507B,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x3A45, 0x4D43,      0,      0, /* 0xA0 */
-         0,      0, 0x507E, 0x5123, 0x507D, 0x3A44,      0, 0x3D7D, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x3739,      0, /* 0xB0 */
-         0,      0, 0x5124,      0,      0, 0x364F,      0,      0, /* 0xC0 */
-         0, 0x5121, 0x5122,      0,      0, 0x462F,      0, 0x417C, /* 0xC0 */
-         0, 0x3623,      0,      0,      0, 0x4B4D, 0x5125,      0, /* 0xD0 */
-         0,      0, 0x4E3D,      0,      0,      0, 0x5126,      0, /* 0xD0 */
-         0,      0,      0, 0x5129,      0, 0x5127,      0, 0x414E, /* 0xE0 */
-         0,      0,      0,      0,      0, 0x5128, 0x512A,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0x512C,      0,      0, /* 0xF0 */
-         0, 0x512B,      0, 0x4A48                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0x5066, 0x506F, 	 0, /* 0x00 */
+         0, 0x4152, 	 0, 0x3844, 	 0, 0x475C, 	 0, 0x6047, /* 0x00 */
+         0, 0x506E, 0x455D, 	 0, 0x5063, 	 0, 0x3876, 	 0, /* 0x10 */
+         0, 0x3875, 0x5061, 	 0, 	 0, 	 0, 	 0, 0x3C5A, /* 0x10 */
+         0, 0x5069, 	 0, 0x4A6F, 0x434D, 0x5065, 0x3771, 	 0, /* 0x20 */
+    0x5062, 0x506A, 0x5064, 0x4E51, 0x506B, 0x4F41, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3666, 	 0, /* 0x30 */
+         0, 0x3770, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x5070, 	 0, 	 0, 	 0, 0x5071, /* 0x40 */
+    0x5075, 0x304E, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4A50, /* 0x40 */
+    0x5074, 	 0, 	 0, 	 0, 	 0, 0x5073, 0x5077, 	 0, /* 0x50 */
+         0, 	 0, 0x5076, 	 0, 0x4464, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3772, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x5078, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x3C45, 	 0, 0x4226, 0x4465, 0x3676, 	 0, /* 0x70 */
+    0x5079, 	 0, 	 0, 	 0, 	 0, 0x3536, 	 0, 	 0, /* 0x70 */
+    0x507A, 	 0, 	 0, 	 0, 	 0, 0x507C, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4B35, 	 0, 	 0, /* 0x80 */
+         0, 0x3766, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x3B31, 0x4877, 0x507B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x3A45, 0x4D43, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x507E, 0x5123, 0x507D, 0x3A44, 	 0, 0x3D7D, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3739, 	 0, /* 0xB0 */
+         0, 	 0, 0x5124, 	 0, 	 0, 0x364F, 	 0, 	 0, /* 0xC0 */
+         0, 0x5121, 0x5122, 	 0, 	 0, 0x462F, 	 0, 0x417C, /* 0xC0 */
+         0, 0x3623, 	 0, 	 0, 	 0, 0x4B4D, 0x5125, 	 0, /* 0xD0 */
+         0, 	 0, 0x4E3D, 	 0, 	 0, 	 0, 0x5126, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x5129, 	 0, 0x5127, 	 0, 0x414E, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5128, 0x512A, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x512C, 	 0, 	 0, /* 0xF0 */
+         0, 0x512B, 	 0, 0x4A48									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_51[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x3537, 0x512E, 0x512F,      0, 0x322F,      0,      0,      0, /* 0x00 */
-         0, 0x512D,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0x3C74,      0, 0x5132, 0x5131, 0x5130,      0, /* 0x10 */
-    0x5056,      0, 0x5133,      0,      0,      0,      0, 0x3D7E, /* 0x10 */
-         0, 0x5134,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x4D25,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x4C59,      0,      0,      0,      0, 0x5136, /* 0x30 */
-         0,      0, 0x5135, 0x5138, 0x5137,      0,      0, 0x5139, /* 0x30 */
-    0x513A, 0x3074,      0, 0x3835, 0x373B, 0x3D3C, 0x437B, 0x3624, /* 0x40 */
-    0x4068, 0x3877,      0, 0x396E, 0x513C, 0x4C48, 0x4546,      0, /* 0x40 */
-    0x3B79,      0, 0x513B,      0, 0x513D,      0,      0,      0, /* 0x50 */
-         0,      0, 0x455E,      0, 0x3375,      0,      0,      0, /* 0x50 */
-         0,      0, 0x513E,      0,      0, 0x467E,      0,      0, /* 0x60 */
-    0x4134, 0x5140, 0x5141, 0x482C, 0x3878, 0x4F3B, 0x5142,      0, /* 0x60 */
-         0, 0x3626,      0,      0,      0, 0x4A3C, 0x4236, 0x3671, /* 0x70 */
-    0x4535,      0,      0,      0, 0x3773,      0,      0,      0, /* 0x70 */
-    0x5143,      0, 0x5144,      0,      0, 0x4662, 0x315F,      0, /* 0x80 */
-         0, 0x5147, 0x3A7D,      0, 0x5146, 0x3A46,      0, 0x5148, /* 0x80 */
-    0x666E, 0x5149, 0x4B41, 0x514A,      0, 0x514B, 0x514C, 0x3E69, /* 0x90 */
-         0, 0x3C4C,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x3427,      0, 0x514F,      0, 0x514D, 0x4C3D, 0x514E,      0, /* 0xA0 */
-    0x495A, 0x5150, 0x5151, 0x5152, 0x455F,      0,      0,      0, /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x3537, 0x512E, 0x512F, 	 0, 0x322F, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x512D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x3C74, 	 0, 0x5132, 0x5131, 0x5130, 	 0, /* 0x10 */
+    0x5056, 	 0, 0x5133, 	 0, 	 0, 	 0, 	 0, 0x3D7E, /* 0x10 */
+         0, 0x5134, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x4D25, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x4C59, 	 0, 	 0, 	 0, 	 0, 0x5136, /* 0x30 */
+         0, 	 0, 0x5135, 0x5138, 0x5137, 	 0, 	 0, 0x5139, /* 0x30 */
+    0x513A, 0x3074, 	 0, 0x3835, 0x373B, 0x3D3C, 0x437B, 0x3624, /* 0x40 */
+    0x4068, 0x3877, 	 0, 0x396E, 0x513C, 0x4C48, 0x4546, 	 0, /* 0x40 */
+    0x3B79, 	 0, 0x513B, 	 0, 0x513D, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x455E, 	 0, 0x3375, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x513E, 	 0, 	 0, 0x467E, 	 0, 	 0, /* 0x60 */
+    0x4134, 0x5140, 0x5141, 0x482C, 0x3878, 0x4F3B, 0x5142, 	 0, /* 0x60 */
+         0, 0x3626, 	 0, 	 0, 	 0, 0x4A3C, 0x4236, 0x3671, /* 0x70 */
+    0x4535, 	 0, 	 0, 	 0, 0x3773, 	 0, 	 0, 	 0, /* 0x70 */
+    0x5143, 	 0, 0x5144, 	 0, 	 0, 0x4662, 0x315F, 	 0, /* 0x80 */
+         0, 0x5147, 0x3A7D, 	 0, 0x5146, 0x3A46, 	 0, 0x5148, /* 0x80 */
+    0x666E, 0x5149, 0x4B41, 0x514A, 	 0, 0x514B, 0x514C, 0x3E69, /* 0x90 */
+         0, 0x3C4C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x3427, 	 0, 0x514F, 	 0, 0x514D, 0x4C3D, 0x514E, 	 0, /* 0xA0 */
+    0x495A, 0x5150, 0x5151, 0x5152, 0x455F, 	 0, 	 0, 	 0, /* 0xA0 */
     0x5156, 0x5154, 0x5155, 0x5153, 0x3A63, 0x5157, 0x4C6A, 0x4E64, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x5158,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x4028, 0x5159, 0x3D5A,      0, /* 0xC0 */
-         0, 0x515A,      0, 0x437C, 0x4E3F, 0x4560,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0x5245,      0, /* 0xD0 */
-         0,      0,      0, 0x515B, 0x7425, 0x3645,      0,      0, /* 0xD0 */
-    0x515C, 0x4B5E,      0,      0,      0,      0, 0x3D68, 0x427C, /* 0xE0 */
-         0, 0x515E, 0x4664,      0,      0, 0x515F,      0,      0, /* 0xE0 */
-    0x5160, 0x332E,      0,      0,      0, 0x5161, 0x3627,      0, /* 0xF0 */
-    0x464C, 0x317A, 0x3D50,      0,      0, 0x4821, 0x5162          /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5158, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x4028, 0x5159, 0x3D5A, 	 0, /* 0xC0 */
+         0, 0x515A, 	 0, 0x437C, 0x4E3F, 0x4560, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5245, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x515B, 0x7425, 0x3645, 	 0, 	 0, /* 0xD0 */
+    0x515C, 0x4B5E, 	 0, 	 0, 	 0, 	 0, 0x3D68, 0x427C, /* 0xE0 */
+         0, 0x515E, 0x4664, 	 0, 	 0, 0x515F, 	 0, 	 0, /* 0xE0 */
+    0x5160, 0x332E, 	 0, 	 0, 	 0, 0x5161, 0x3627, 	 0, /* 0xF0 */
+    0x464C, 0x317A, 0x3D50, 	 0, 	 0, 0x4821, 0x5162			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_52[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x4561,      0,      0, 0x3F4F, 0x5163,      0, 0x4A2C, 0x405A, /* 0x00 */
-    0x3422,      0, 0x3429, 0x5164,      0,      0, 0x5166,      0, /* 0x00 */
-         0, 0x373A,      0,      0, 0x5165,      0,      0, 0x4E73, /* 0x10 */
-         0,      0,      0,      0,      0, 0x3D69,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0x483D, 0x4A4C,      0, 0x5167, /* 0x20 */
-         0, 0x4D78, 0x5168,      0,      0,      0, 0x5169,      0, /* 0x20 */
-    0x457E,      0,      0, 0x516A,      0,      0, 0x4029, 0x3A7E, /* 0x30 */
-    0x3774, 0x516B, 0x3B49, 0x396F,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x4466, 0x516D,      0,      0, 0x4227, /* 0x40 */
-         0,      0, 0x3A6F, 0x516E, 0x516F, 0x4130,      0, 0x516C, /* 0x40 */
-         0,      0,      0,      0, 0x5171,      0, 0x4B36,      0, /* 0x50 */
-         0,      0,      0, 0x3964,      0,      0, 0x5170,      0, /* 0x50 */
-         0,      0,      0, 0x3775, 0x3A5E, 0x476D,      0,      0, /* 0x60 */
-         0, 0x5174, 0x5172,      0,      0,      0,      0, 0x497B, /* 0x60 */
-    0x3E6A, 0x517B, 0x3364, 0x5175, 0x5173, 0x414F,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0x5177,      0, 0x5176, /* 0x70 */
-         0,      0,      0, 0x3344,      0,      0,      0, 0x3760, /* 0x80 */
-    0x517C, 0x4E2D,      0,      0,      0, 0x5178,      0,      0, /* 0x80 */
-         0, 0x517D, 0x517A,      0, 0x5179,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0x4E4F,      0,      0,      0, 0x3879, /* 0x90 */
-    0x3243,      0,      0, 0x4E74,      0,      0,      0,      0, /* 0xA0 */
-         0, 0x3D75, 0x4558, 0x3965, 0x5222, 0x5223,      0,      0, /* 0xA0 */
-         0, 0x4E65,      0,      0, 0x4F2B, 0x5225,      0,      0, /* 0xB0 */
-         0, 0x387A,      0,      0, 0x5224,      0, 0x332F,      0, /* 0xB0 */
-         0, 0x5226,      0, 0x4B56,      0, 0x443C,      0, 0x4D26, /* 0xC0 */
-         0, 0x4A59,      0,      0,      0, 0x5227,      0,      0, /* 0xC0 */
-         0,      0, 0x7055,      0,      0, 0x4630,      0, 0x5228, /* 0xD0 */
-    0x342A, 0x4C33,      0,      0,      0, 0x3E21, 0x5229, 0x4A67, /* 0xD0 */
-    0x522D,      0, 0x402A, 0x522A, 0x3650,      0, 0x522B, 0x342B, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0x372E, 0x522E,      0, 0x522F,      0,      0, /* 0xF0 */
-    0x5230, 0x5231, 0x3C5B,      0,      0,      0, 0x387B, 0x4C5E  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x4561, 	 0, 	 0, 0x3F4F, 0x5163, 	 0, 0x4A2C, 0x405A, /* 0x00 */
+    0x3422, 	 0, 0x3429, 0x5164, 	 0, 	 0, 0x5166, 	 0, /* 0x00 */
+         0, 0x373A, 	 0, 	 0, 0x5165, 	 0, 	 0, 0x4E73, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3D69, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x483D, 0x4A4C, 	 0, 0x5167, /* 0x20 */
+         0, 0x4D78, 0x5168, 	 0, 	 0, 	 0, 0x5169, 	 0, /* 0x20 */
+    0x457E, 	 0, 	 0, 0x516A, 	 0, 	 0, 0x4029, 0x3A7E, /* 0x30 */
+    0x3774, 0x516B, 0x3B49, 0x396F, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x4466, 0x516D, 	 0, 	 0, 0x4227, /* 0x40 */
+         0, 	 0, 0x3A6F, 0x516E, 0x516F, 0x4130, 	 0, 0x516C, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x5171, 	 0, 0x4B36, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x3964, 	 0, 	 0, 0x5170, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x3775, 0x3A5E, 0x476D, 	 0, 	 0, /* 0x60 */
+         0, 0x5174, 0x5172, 	 0, 	 0, 	 0, 	 0, 0x497B, /* 0x60 */
+    0x3E6A, 0x517B, 0x3364, 0x5175, 0x5173, 0x414F, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5177, 	 0, 0x5176, /* 0x70 */
+         0, 	 0, 	 0, 0x3344, 	 0, 	 0, 	 0, 0x3760, /* 0x80 */
+    0x517C, 0x4E2D, 	 0, 	 0, 	 0, 0x5178, 	 0, 	 0, /* 0x80 */
+         0, 0x517D, 0x517A, 	 0, 0x5179, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x4E4F, 	 0, 	 0, 	 0, 0x3879, /* 0x90 */
+    0x3243, 	 0, 	 0, 0x4E74, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x3D75, 0x4558, 0x3965, 0x5222, 0x5223, 	 0, 	 0, /* 0xA0 */
+         0, 0x4E65, 	 0, 	 0, 0x4F2B, 0x5225, 	 0, 	 0, /* 0xB0 */
+         0, 0x387A, 	 0, 	 0, 0x5224, 	 0, 0x332F, 	 0, /* 0xB0 */
+         0, 0x5226, 	 0, 0x4B56, 	 0, 0x443C, 	 0, 0x4D26, /* 0xC0 */
+         0, 0x4A59, 	 0, 	 0, 	 0, 0x5227, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x7055, 	 0, 	 0, 0x4630, 	 0, 0x5228, /* 0xD0 */
+    0x342A, 0x4C33, 	 0, 	 0, 	 0, 0x3E21, 0x5229, 0x4A67, /* 0xD0 */
+    0x522D, 	 0, 0x402A, 0x522A, 0x3650, 	 0, 0x522B, 0x342B, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x372E, 0x522E, 	 0, 0x522F, 	 0, 	 0, /* 0xF0 */
+    0x5230, 0x5231, 0x3C5B, 	 0, 	 0, 	 0, 0x387B, 0x4C5E	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_53[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x4C68, 0x4677,      0,      0, 0x4A71, 0x5232,      0, /* 0x00 */
-    0x5233,      0,      0,      0,      0, 0x5235,      0, 0x5237, /* 0x00 */
-    0x5236,      0,      0,      0,      0, 0x5238, 0x323D, 0x4B4C, /* 0x10 */
-         0, 0x3A7C, 0x5239,      0,      0, 0x4159,      0,      0, /* 0x10 */
-    0x3E22, 0x3629,      0, 0x523A,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x485B,      0,      0,      0,      0, 0x523B, /* 0x20 */
-         0, 0x523C,      0, 0x523D,      0,      0,      0,      0, /* 0x30 */
-    0x523E, 0x4924, 0x3668, 0x3065,      0,      0,      0, 0x463F, /* 0x30 */
-    0x523F, 0x3D3D,      0, 0x4069,      0, 0x5241, 0x5240, 0x3E23, /* 0x40 */
-    0x3861, 0x5243, 0x483E,      0,      0, 0x5244,      0,      0, /* 0x40 */
-         0, 0x485C, 0x4234, 0x426E, 0x3628,      0,      0, 0x466E, /* 0x50 */
-    0x4331,      0, 0x476E,      0, 0x4B4E,      0, 0x5246,      0, /* 0x50 */
-    0x406A,      0,      0,      0,      0,      0, 0x3735,      0, /* 0x60 */
-         0, 0x5247,      0,      0,      0,      0, 0x5248, 0x312C, /* 0x60 */
-    0x3075, 0x346D,      0, 0x4228, 0x3551, 0x4D71,      0, 0x524B, /* 0x70 */
-    0x3237,      0,      0, 0x524A,      0,      0,      0, 0x362A, /* 0x70 */
-         0,      0, 0x524C,      0, 0x4C71,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x524D,      0, /* 0x90 */
-    0x4E52,      0, 0x387C,      0,      0,      0,      0, 0x3836, /* 0x90 */
-    0x524E,      0,      0,      0,      0, 0x5250, 0x524F,      0, /* 0xA0 */
-    0x3F5F, 0x3139,      0,      0,      0, 0x315E, 0x5251,      0, /* 0xA0 */
-    0x5252,      0,      0, 0x3837,      0,      0, 0x5253,      0, /* 0xB0 */
-         0,      0,      0, 0x356E,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x3B32, 0x5254,      0,      0,      0,      0, /* 0xC0 */
-    0x4B74, 0x3A35, 0x355A, 0x4D27, 0x4150, 0x483F, 0x3C7D,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x3D47,      0, 0x3C68, 0x3C75, /* 0xD0 */
-         0, 0x3D76,      0, 0x4840,      0,      0,      0, 0x5257, /* 0xD0 */
-         0, 0x3143, 0x4151, 0x387D, 0x3845, 0x3667,      0,      0, /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x4C68, 0x4677, 	 0, 	 0, 0x4A71, 0x5232, 	 0, /* 0x00 */
+    0x5233, 	 0, 	 0, 	 0, 	 0, 0x5235, 	 0, 0x5237, /* 0x00 */
+    0x5236, 	 0, 	 0, 	 0, 	 0, 0x5238, 0x323D, 0x4B4C, /* 0x10 */
+         0, 0x3A7C, 0x5239, 	 0, 	 0, 0x4159, 	 0, 	 0, /* 0x10 */
+    0x3E22, 0x3629, 	 0, 0x523A, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x485B, 	 0, 	 0, 	 0, 	 0, 0x523B, /* 0x20 */
+         0, 0x523C, 	 0, 0x523D, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x523E, 0x4924, 0x3668, 0x3065, 	 0, 	 0, 	 0, 0x463F, /* 0x30 */
+    0x523F, 0x3D3D, 	 0, 0x4069, 	 0, 0x5241, 0x5240, 0x3E23, /* 0x40 */
+    0x3861, 0x5243, 0x483E, 	 0, 	 0, 0x5244, 	 0, 	 0, /* 0x40 */
+         0, 0x485C, 0x4234, 0x426E, 0x3628, 	 0, 	 0, 0x466E, /* 0x50 */
+    0x4331, 	 0, 0x476E, 	 0, 0x4B4E, 	 0, 0x5246, 	 0, /* 0x50 */
+    0x406A, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3735, 	 0, /* 0x60 */
+         0, 0x5247, 	 0, 	 0, 	 0, 	 0, 0x5248, 0x312C, /* 0x60 */
+    0x3075, 0x346D, 	 0, 0x4228, 0x3551, 0x4D71, 	 0, 0x524B, /* 0x70 */
+    0x3237, 	 0, 	 0, 0x524A, 	 0, 	 0, 	 0, 0x362A, /* 0x70 */
+         0, 	 0, 0x524C, 	 0, 0x4C71, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x524D, 	 0, /* 0x90 */
+    0x4E52, 	 0, 0x387C, 	 0, 	 0, 	 0, 	 0, 0x3836, /* 0x90 */
+    0x524E, 	 0, 	 0, 	 0, 	 0, 0x5250, 0x524F, 	 0, /* 0xA0 */
+    0x3F5F, 0x3139, 	 0, 	 0, 	 0, 0x315E, 0x5251, 	 0, /* 0xA0 */
+    0x5252, 	 0, 	 0, 0x3837, 	 0, 	 0, 0x5253, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x356E, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x3B32, 0x5254, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x4B74, 0x3A35, 0x355A, 0x4D27, 0x4150, 0x483F, 0x3C7D, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x3D47, 	 0, 0x3C68, 0x3C75, /* 0xD0 */
+         0, 0x3D76, 	 0, 0x4840, 	 0, 	 0, 	 0, 0x5257, /* 0xD0 */
+         0, 0x3143, 0x4151, 0x387D, 0x3845, 0x3667, 	 0, 	 0, /* 0xE0 */
     0x525B, 0x4321, 0x427E, 0x362B, 0x3E24, 0x525C, 0x525A, 0x3244, /* 0xE0 */
-    0x4266, 0x3C38, 0x3B4B, 0x3126,      0,      0, 0x3370, 0x3966, /* 0xF0 */
-    0x3B4A,      0, 0x525D                                          /* 0xF0 */
+    0x4266, 0x3C38, 0x3B4B, 0x3126, 	 0, 	 0, 0x3370, 0x3966, /* 0xF0 */
+    0x3B4A, 	 0, 0x525D											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_54[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x525E,      0, 0x3549, 0x3346,      0,      0,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x525E, 	 0, 0x3549, 0x3346, 	 0, 	 0, 	 0, /* 0x00 */
     0x3967, 0x3548, 0x445F, 0x3125, 0x4631, 0x4C3E, 0x3921, 0x4D79, /* 0x00 */
-    0x4547, 0x387E,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0x372F,      0, 0x5267,      0, 0x3663, /* 0x10 */
-    0x4B4A,      0,      0,      0,      0,      0, 0x485D,      0, /* 0x20 */
-         0, 0x5266,      0, 0x345E, 0x5261, 0x5262, 0x5264,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x5265,      0, /* 0x30 */
-    0x355B, 0x3F61,      0, 0x4A2D, 0x5263, 0x525F, 0x3863,      0, /* 0x30 */
-    0x5260,      0, 0x4F24,      0,      0,      0, 0x4A72,      0, /* 0x40 */
-    0x4468, 0x3862, 0x3970,      0,      0,      0, 0x5268,      0, /* 0x40 */
-         0, 0x465D,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0x526C, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0x3C7E,      0, 0x3C76,      0,      0,      0,      0,      0, /* 0x60 */
-    0x526F, 0x526D,      0, 0x4C23,      0, 0x526A, 0x5273, 0x526E, /* 0x70 */
-         0,      0,      0, 0x5271, 0x3846, 0x4C3F,      0,      0, /* 0x70 */
-    0x5272,      0,      0,      0, 0x5274,      0, 0x5276,      0, /* 0x80 */
-         0,      0,      0, 0x3A70, 0x4F42,      0, 0x526B, 0x5269, /* 0x80 */
-    0x5275,      0, 0x5270,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0x5278,      0, 0x5323, 0x527A,      0,      0, /* 0xA0 */
-    0x527E,      0,      0, 0x5321, 0x527B,      0,      0, 0x533E, /* 0xA0 */
-         0,      0, 0x3A69, 0x3331,      0,      0,      0,      0, /* 0xB0 */
-    0x5279,      0,      0,      0, 0x5325, 0x3076, 0x5324,      0, /* 0xB0 */
-    0x3025, 0x494A, 0x5322,      0, 0x527C,      0,      0, 0x5277, /* 0xC0 */
-    0x527D, 0x3A48,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x5326,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x3077, 0x532F,      0,      0, 0x5327, 0x5328,      0, /* 0xE0 */
-    0x3E25, 0x4B69,      0,      0,      0, 0x532D, 0x532C,      0, /* 0xE0 */
-         0,      0, 0x452F,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x532E,      0,      0, 0x532B                  /* 0xF0 */
+    0x4547, 0x387E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x372F, 	 0, 0x5267, 	 0, 0x3663, /* 0x10 */
+    0x4B4A, 	 0, 	 0, 	 0, 	 0, 	 0, 0x485D, 	 0, /* 0x20 */
+         0, 0x5266, 	 0, 0x345E, 0x5261, 0x5262, 0x5264, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5265, 	 0, /* 0x30 */
+    0x355B, 0x3F61, 	 0, 0x4A2D, 0x5263, 0x525F, 0x3863, 	 0, /* 0x30 */
+    0x5260, 	 0, 0x4F24, 	 0, 	 0, 	 0, 0x4A72, 	 0, /* 0x40 */
+    0x4468, 0x3862, 0x3970, 	 0, 	 0, 	 0, 0x5268, 	 0, /* 0x40 */
+         0, 0x465D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x526C, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x3C7E, 	 0, 0x3C76, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x526F, 0x526D, 	 0, 0x4C23, 	 0, 0x526A, 0x5273, 0x526E, /* 0x70 */
+         0, 	 0, 	 0, 0x5271, 0x3846, 0x4C3F, 	 0, 	 0, /* 0x70 */
+    0x5272, 	 0, 	 0, 	 0, 0x5274, 	 0, 0x5276, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x3A70, 0x4F42, 	 0, 0x526B, 0x5269, /* 0x80 */
+    0x5275, 	 0, 0x5270, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x5278, 	 0, 0x5323, 0x527A, 	 0, 	 0, /* 0xA0 */
+    0x527E, 	 0, 	 0, 0x5321, 0x527B, 	 0, 	 0, 0x533E, /* 0xA0 */
+         0, 	 0, 0x3A69, 0x3331, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x5279, 	 0, 	 0, 	 0, 0x5325, 0x3076, 0x5324, 	 0, /* 0xB0 */
+    0x3025, 0x494A, 0x5322, 	 0, 0x527C, 	 0, 	 0, 0x5277, /* 0xC0 */
+    0x527D, 0x3A48, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x5326, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x3077, 0x532F, 	 0, 	 0, 0x5327, 0x5328, 	 0, /* 0xE0 */
+    0x3E25, 0x4B69, 	 0, 	 0, 	 0, 0x532D, 0x532C, 	 0, /* 0xE0 */
+         0, 	 0, 0x452F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x532E, 	 0, 	 0, 0x532B					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_55[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0x3134,      0, 0x3A36, 0x3F30, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0, 0x5329, /* 0x00 */
-    0x4562,      0,      0,      0, 0x532A,      0, 0x3022,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x5334, 0x4D23, /* 0x20 */
-         0, 0x3E27,      0, 0x533A,      0,      0,      0,      0, /* 0x30 */
-    0x5339, 0x5330,      0,      0,      0,      0, 0x4243,      0, /* 0x30 */
-    0x5331,      0,      0,      0, 0x426F, 0x5336, 0x3E26,      0, /* 0x40 */
-         0,      0,      0,      0, 0x5333,      0,      0, 0x4C64, /* 0x40 */
-         0,      0,      0, 0x373C,      0,      0, 0x5337, 0x5338, /* 0x50 */
-         0,      0,      0,      0, 0x5335, 0x533B,      0,      0, /* 0x50 */
-         0,      0,      0, 0x5332,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0x5341, 0x5346,      0, 0x5342,      0, /* 0x70 */
-    0x533D,      0,      0, 0x5347, 0x4131,      0,      0, 0x5349, /* 0x80 */
-         0, 0x3922, 0x533F, 0x437D,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x5343, 0x533C, 0x342D,      0, 0x346E, 0x3365, 0x5344, 0x5340, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0x3776, /* 0xA0 */
-    0x534A, 0x5348, 0x4153, 0x354A, 0x362C,      0, 0x5345,      0, /* 0xA0 */
-    0x3674,      0,      0,      0,      0,      0, 0x3144,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x534E, 0x534C,      0, 0x5427, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x5351,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x534B,      0, 0x534F,      0,      0, 0x534D, /* 0xD0 */
-         0,      0,      0, 0x3B4C, 0x5350,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0x5353, /* 0xF0 */
-         0, 0x5358,      0,      0,      0, 0x5356, 0x5355          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0x3134, 	 0, 0x3A36, 0x3F30, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5329, /* 0x00 */
+    0x4562, 	 0, 	 0, 	 0, 0x532A, 	 0, 0x3022, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5334, 0x4D23, /* 0x20 */
+         0, 0x3E27, 	 0, 0x533A, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x5339, 0x5330, 	 0, 	 0, 	 0, 	 0, 0x4243, 	 0, /* 0x30 */
+    0x5331, 	 0, 	 0, 	 0, 0x426F, 0x5336, 0x3E26, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x5333, 	 0, 	 0, 0x4C64, /* 0x40 */
+         0, 	 0, 	 0, 0x373C, 	 0, 	 0, 0x5337, 0x5338, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x5335, 0x533B, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x5332, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x5341, 0x5346, 	 0, 0x5342, 	 0, /* 0x70 */
+    0x533D, 	 0, 	 0, 0x5347, 0x4131, 	 0, 	 0, 0x5349, /* 0x80 */
+         0, 0x3922, 0x533F, 0x437D, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x5343, 0x533C, 0x342D, 	 0, 0x346E, 0x3365, 0x5344, 0x5340, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3776, /* 0xA0 */
+    0x534A, 0x5348, 0x4153, 0x354A, 0x362C, 	 0, 0x5345, 	 0, /* 0xA0 */
+    0x3674, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3144, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x534E, 0x534C, 	 0, 0x5427, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x5351, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x534B, 	 0, 0x534F, 	 0, 	 0, 0x534D, /* 0xD0 */
+         0, 	 0, 	 0, 0x3B4C, 0x5350, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5353, /* 0xF0 */
+         0, 0x5358, 	 0, 	 0, 	 0, 0x5356, 0x5355			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_56[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0x4332,      0, /* 0x00 */
-         0, 0x3245,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0x5352,      0, 0x5354, 0x3E28, /* 0x10 */
-    0x3133,      0,      0, 0x5357,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0x325E,      0,      0,      0,      0,      0, 0x5362, /* 0x20 */
-         0, 0x3E7C, 0x535E,      0, 0x535C,      0, 0x535D,      0, /* 0x30 */
-    0x535F,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0x313D,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0x4139,      0, 0x5359,      0, /* 0x40 */
-    0x535A,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0x337A,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0x5361,      0,      0,      0, /* 0x60 */
-    0x346F,      0, 0x5364, 0x5360, 0x5363,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0x4A2E,      0,      0,      0, /* 0x70 */
-    0x4655,      0, 0x4838,      0,      0,      0,      0,      0, /* 0x70 */
-    0x5366,      0,      0,      0,      0,      0, 0x5365, 0x3345, /* 0x80 */
-         0,      0, 0x5367,      0,      0,      0,      0, 0x536A, /* 0x80 */
-         0,      0,      0,      0, 0x5369,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x5368,      0, 0x4739,      0,      0, 0x536B,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0x536C,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x536E,      0, 0x536D,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x5370,      0,      0,      0, /* 0xB0 */
-    0x5373, 0x5371, 0x536F, 0x5372,      0,      0,      0,      0, /* 0xC0 */
-    0x5374,      0,      0,      0,      0,      0, 0x5375,      0, /* 0xC0 */
-         0, 0x5376,      0, 0x5377,      0,      0,      0, 0x5378, /* 0xD0 */
-    0x5145,      0, 0x3C7C, 0x3B4D,      0,      0, 0x3273,      0, /* 0xD0 */
-    0x3078,      0,      0, 0x4344,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0x5379,      0, /* 0xE0 */
-    0x3A24,      0, 0x304F, 0x3F5E,      0,      0,      0,      0, /* 0xF0 */
-         0, 0x537A, 0x3847,      0,      0, 0x3971,      0, 0x537C  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0x4332, 	 0, /* 0x00 */
+         0, 0x3245, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x5352, 	 0, 0x5354, 0x3E28, /* 0x10 */
+    0x3133, 	 0, 	 0, 0x5357, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x325E, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5362, /* 0x20 */
+         0, 0x3E7C, 0x535E, 	 0, 0x535C, 	 0, 0x535D, 	 0, /* 0x30 */
+    0x535F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x313D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x4139, 	 0, 0x5359, 	 0, /* 0x40 */
+    0x535A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x337A, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x5361, 	 0, 	 0, 	 0, /* 0x60 */
+    0x346F, 	 0, 0x5364, 0x5360, 0x5363, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x4A2E, 	 0, 	 0, 	 0, /* 0x70 */
+    0x4655, 	 0, 0x4838, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x5366, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5365, 0x3345, /* 0x80 */
+         0, 	 0, 0x5367, 	 0, 	 0, 	 0, 	 0, 0x536A, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x5369, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x5368, 	 0, 0x4739, 	 0, 	 0, 0x536B, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x536C, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x536E, 	 0, 0x536D, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x5370, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x5373, 0x5371, 0x536F, 0x5372, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x5374, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5375, 	 0, /* 0xC0 */
+         0, 0x5376, 	 0, 0x5377, 	 0, 	 0, 	 0, 0x5378, /* 0xD0 */
+    0x5145, 	 0, 0x3C7C, 0x3B4D, 	 0, 	 0, 0x3273, 	 0, /* 0xD0 */
+    0x3078, 	 0, 	 0, 0x4344, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5379, 	 0, /* 0xE0 */
+    0x3A24, 	 0, 0x304F, 0x3F5E, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0x537A, 0x3847, 	 0, 	 0, 0x3971, 	 0, 0x537C	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_57[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x537B,      0,      0, 0x4A60, 0x537D,      0,      0,      0, /* 0x00 */
-    0x5421, 0x537E,      0, 0x5422,      0, 0x5423,      0, 0x3777, /* 0x00 */
-         0,      0, 0x3160, 0x5424,      0,      0, 0x5426,      0, /* 0x10 */
-    0x5425,      0,      0,      0, 0x5428,      0,      0, 0x455A, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x5429, 0x3035, /* 0x20 */
-    0x3A5F,      0,      0,      0,      0, 0x373D,      0,      0, /* 0x20 */
-    0x434F,      0,      0,      0,      0,      0,      0, 0x542A, /* 0x30 */
-    0x542B,      0,      0, 0x542D,      0,      0,      0,      0, /* 0x30 */
-    0x542E,      0, 0x3A64,      0,      0,      0,      0, 0x3651, /* 0x40 */
-         0,      0, 0x4B37,      0,      0,      0, 0x542C, 0x542F, /* 0x40 */
-    0x3A41, 0x3923,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0x5433,      0,      0, 0x3A25,      0, 0x4333,      0, /* 0x60 */
-         0, 0x5430, 0x445A,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0x5434, /* 0x70 */
-         0,      0, 0x3F62,      0,      0,      0,      0,      0, /* 0x80 */
-    0x5432, 0x5435,      0, 0x373F,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x5436,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x5437,      0, 0x3924, 0x3340, 0x5439,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x543A,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x543B,      0,      0, 0x5438,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x5431,      0,      0, 0x543C,      0,      0, 0x543D,      0, /* 0xC0 */
-         0,      0,      0, 0x4B64,      0,      0, 0x3E6B,      0, /* 0xC0 */
-         0,      0, 0x543F, 0x5440, 0x543E,      0, 0x5442,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x4738,      0,      0, 0x3068, /* 0xD0 */
-    0x4956,      0,      0, 0x5443,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0x3E7D,      0,      0, 0x3C39, /* 0xF0 */
-         0, 0x475D, 0x3470,      0, 0x3A6B                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x537B, 	 0, 	 0, 0x4A60, 0x537D, 	 0, 	 0, 	 0, /* 0x00 */
+    0x5421, 0x537E, 	 0, 0x5422, 	 0, 0x5423, 	 0, 0x3777, /* 0x00 */
+         0, 	 0, 0x3160, 0x5424, 	 0, 	 0, 0x5426, 	 0, /* 0x10 */
+    0x5425, 	 0, 	 0, 	 0, 0x5428, 	 0, 	 0, 0x455A, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5429, 0x3035, /* 0x20 */
+    0x3A5F, 	 0, 	 0, 	 0, 	 0, 0x373D, 	 0, 	 0, /* 0x20 */
+    0x434F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x542A, /* 0x30 */
+    0x542B, 	 0, 	 0, 0x542D, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x542E, 	 0, 0x3A64, 	 0, 	 0, 	 0, 	 0, 0x3651, /* 0x40 */
+         0, 	 0, 0x4B37, 	 0, 	 0, 	 0, 0x542C, 0x542F, /* 0x40 */
+    0x3A41, 0x3923, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x5433, 	 0, 	 0, 0x3A25, 	 0, 0x4333, 	 0, /* 0x60 */
+         0, 0x5430, 0x445A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5434, /* 0x70 */
+         0, 	 0, 0x3F62, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x5432, 0x5435, 	 0, 0x373F, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x5436, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x5437, 	 0, 0x3924, 0x3340, 0x5439, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x543A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x543B, 	 0, 	 0, 0x5438, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x5431, 	 0, 	 0, 0x543C, 	 0, 	 0, 0x543D, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x4B64, 	 0, 	 0, 0x3E6B, 	 0, /* 0xC0 */
+         0, 	 0, 0x543F, 0x5440, 0x543E, 	 0, 0x5442, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x4738, 	 0, 	 0, 0x3068, /* 0xD0 */
+    0x4956, 	 0, 	 0, 0x5443, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x3E7D, 	 0, 	 0, 0x3C39, /* 0xF0 */
+         0, 0x475D, 0x3470, 	 0, 0x3A6B							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_58[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x4B59,      0, 0x4632,      0,      0, 0x3778, 0x424F,      0, /* 0x00 */
-         0,      0, 0x5441, 0x5444,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0x4244,      0,      0, /* 0x10 */
-         0, 0x5445,      0,      0,      0, 0x5446,      0,      0, /* 0x10 */
-         0, 0x5448,      0,      0, 0x4469,      0,      0,      0, /* 0x20 */
-         0,      0, 0x342E,      0,      0,      0,      0, 0x7421, /* 0x20 */
-    0x3161, 0x4A73,      0,      0, 0x3E6C, 0x4548,      0,      0, /* 0x30 */
-         0,      0, 0x3A66,      0,      0, 0x544E,      0,      0, /* 0x30 */
-    0x4A3D, 0x4E5D,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x3274, 0x544A,      0,      0,      0,      0, /* 0x40 */
-         0, 0x413A, 0x544D,      0, 0x4563,      0,      0, 0x4549, /* 0x50 */
-    0x4564, 0x4839, 0x444D,      0,      0,      0, 0x3A49,      0, /* 0x50 */
-         0,      0, 0x5449,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0x3176,      0, 0x4536,      0,      0,      0,      0, /* 0x60 */
-    0x544B,      0, 0x5447,      0,      0, 0x3F50,      0,      0, /* 0x70 */
-         0, 0x544F,      0,      0,      0,      0, 0x3D4E,      0, /* 0x70 */
-         0,      0,      0, 0x362D,      0, 0x5450,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x4A68,      0,      0,      0, 0x417D, /* 0x90 */
-         0,      0,      0,      0, 0x4446,      0,      0, 0x5452, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x4B4F,      0,      0, 0x5453,      0,      0, 0x5458,      0, /* 0xA0 */
-         0,      0,      0, 0x4A2F,      0,      0,      0,      0, /* 0xB0 */
-    0x5457, 0x5451, 0x5454, 0x5456,      0,      0, 0x3A26,      0, /* 0xB0 */
-         0, 0x4A49,      0,      0,      0, 0x5459,      0, 0x4345, /* 0xC0 */
-         0,      0, 0x3275,      0, 0x3E6D,      0,      0,      0, /* 0xC0 */
-         0, 0x545B,      0, 0x545A,      0, 0x3968,      0, 0x545C, /* 0xD0 */
-    0x545E, 0x545D,      0,      0, 0x5460,      0, 0x5455, 0x5462, /* 0xD0 */
-         0,      0,      0,      0, 0x5461, 0x545F,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x3B4E, 0x3F51,      0, 0x4154, 0x5463, /* 0xE0 */
-    0x403C, 0x306D, 0x4764,      0,      0,      0,      0, 0x445B, /* 0xF0 */
-         0, 0x5465, 0x5464, 0x5466, 0x5467, 0x5468                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x4B59, 	 0, 0x4632, 	 0, 	 0, 0x3778, 0x424F, 	 0, /* 0x00 */
+         0, 	 0, 0x5441, 0x5444, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4244, 	 0, 	 0, /* 0x10 */
+         0, 0x5445, 	 0, 	 0, 	 0, 0x5446, 	 0, 	 0, /* 0x10 */
+         0, 0x5448, 	 0, 	 0, 0x4469, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x342E, 	 0, 	 0, 	 0, 	 0, 0x7421, /* 0x20 */
+    0x3161, 0x4A73, 	 0, 	 0, 0x3E6C, 0x4548, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x3A66, 	 0, 	 0, 0x544E, 	 0, 	 0, /* 0x30 */
+    0x4A3D, 0x4E5D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x3274, 0x544A, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x413A, 0x544D, 	 0, 0x4563, 	 0, 	 0, 0x4549, /* 0x50 */
+    0x4564, 0x4839, 0x444D, 	 0, 	 0, 	 0, 0x3A49, 	 0, /* 0x50 */
+         0, 	 0, 0x5449, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x3176, 	 0, 0x4536, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x544B, 	 0, 0x5447, 	 0, 	 0, 0x3F50, 	 0, 	 0, /* 0x70 */
+         0, 0x544F, 	 0, 	 0, 	 0, 	 0, 0x3D4E, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x362D, 	 0, 0x5450, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x4A68, 	 0, 	 0, 	 0, 0x417D, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x4446, 	 0, 	 0, 0x5452, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x4B4F, 	 0, 	 0, 0x5453, 	 0, 	 0, 0x5458, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x4A2F, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x5457, 0x5451, 0x5454, 0x5456, 	 0, 	 0, 0x3A26, 	 0, /* 0xB0 */
+         0, 0x4A49, 	 0, 	 0, 	 0, 0x5459, 	 0, 0x4345, /* 0xC0 */
+         0, 	 0, 0x3275, 	 0, 0x3E6D, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x545B, 	 0, 0x545A, 	 0, 0x3968, 	 0, 0x545C, /* 0xD0 */
+    0x545E, 0x545D, 	 0, 	 0, 0x5460, 	 0, 0x5455, 0x5462, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x5461, 0x545F, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x3B4E, 0x3F51, 	 0, 0x4154, 0x5463, /* 0xE0 */
+    0x403C, 0x306D, 0x4764, 	 0, 	 0, 	 0, 	 0, 0x445B, /* 0xF0 */
+         0, 0x5465, 0x5464, 0x5466, 0x5467, 0x5468					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_59[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x5469,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0x4A51, 0x546A,      0,      0,      0,      0, 0x3246, /* 0x00 */
-    0x546B,      0,      0,      0,      0, 0x4D3C, 0x3330,      0, /* 0x10 */
-    0x5249, 0x3D48, 0x423F, 0x546C, 0x4C6B,      0,      0,      0, /* 0x10 */
-         0,      0, 0x4C34,      0,      0, 0x546E,      0, 0x4267, /* 0x20 */
-         0, 0x4537, 0x4240, 0x4957, 0x546F, 0x5470, 0x317B,      0, /* 0x20 */
-         0, 0x3C3A, 0x5471,      0,      0,      0,      0, 0x3050, /* 0x30 */
-    0x5472,      0,      0,      0,      0,      0, 0x5473,      0, /* 0x30 */
-         0,      0,      0,      0, 0x3162,      0,      0, 0x3471, /* 0x40 */
-    0x4660, 0x4A74,      0,      0,      0,      0, 0x5477, 0x4155, /* 0x40 */
-    0x5476, 0x3740,      0,      0, 0x4B5B, 0x5475,      0, 0x4565, /* 0x50 */
-    0x5479,      0, 0x5478,      0,      0,      0,      0,      0, /* 0x50 */
-    0x547B,      0, 0x547A,      0,      0, 0x317C,      0, 0x547C, /* 0x60 */
-    0x3E29, 0x547E, 0x4325,      0, 0x547D,      0, 0x4A33,      0, /* 0x60 */
-         0,      0,      0, 0x3D77, 0x455B,      0,      0,      0, /* 0x70 */
-    0x5521,      0,      0,      0,      0, 0x3925,      0,      0, /* 0x70 */
-         0, 0x5522, 0x4721, 0x485E, 0x4C51,      0,      0,      0, /* 0x80 */
-         0,      0, 0x4725,      0,      0, 0x552B,      0,      0, /* 0x80 */
-         0,      0,      0, 0x3538,      0,      0, 0x4D45,      0, /* 0x90 */
-         0, 0x4C2F,      0, 0x562C,      0, 0x5523,      0,      0, /* 0x90 */
-         0,      0,      0, 0x5526,      0, 0x4245,      0,      0, /* 0xA0 */
-    0x4B38,      0,      0,      0, 0x454A,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x5527,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x4B65,      0, 0x3A4A,      0,      0, 0x3E2A,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x5528,      0, /* 0xC0 */
-         0, 0x3B50,      0, 0x3B4F,      0,      0,      0,      0, /* 0xC0 */
-    0x3039, 0x3848,      0, 0x402B, 0x3051,      0,      0,      0, /* 0xD0 */
-         0, 0x552C, 0x552D,      0, 0x552A,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x3138, 0x342F,      0, /* 0xE0 */
-    0x5529,      0, 0x4C45, 0x4931,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0x3028,      0, /* 0xF0 */
-         0,      0,      0, 0x3079,      0,      0,      0, 0x3B51  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x5469, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x4A51, 0x546A, 	 0, 	 0, 	 0, 	 0, 0x3246, /* 0x00 */
+    0x546B, 	 0, 	 0, 	 0, 	 0, 0x4D3C, 0x3330, 	 0, /* 0x10 */
+    0x5249, 0x3D48, 0x423F, 0x546C, 0x4C6B, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x4C34, 	 0, 	 0, 0x546E, 	 0, 0x4267, /* 0x20 */
+         0, 0x4537, 0x4240, 0x4957, 0x546F, 0x5470, 0x317B, 	 0, /* 0x20 */
+         0, 0x3C3A, 0x5471, 	 0, 	 0, 	 0, 	 0, 0x3050, /* 0x30 */
+    0x5472, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5473, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x3162, 	 0, 	 0, 0x3471, /* 0x40 */
+    0x4660, 0x4A74, 	 0, 	 0, 	 0, 	 0, 0x5477, 0x4155, /* 0x40 */
+    0x5476, 0x3740, 	 0, 	 0, 0x4B5B, 0x5475, 	 0, 0x4565, /* 0x50 */
+    0x5479, 	 0, 0x5478, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x547B, 	 0, 0x547A, 	 0, 	 0, 0x317C, 	 0, 0x547C, /* 0x60 */
+    0x3E29, 0x547E, 0x4325, 	 0, 0x547D, 	 0, 0x4A33, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x3D77, 0x455B, 	 0, 	 0, 	 0, /* 0x70 */
+    0x5521, 	 0, 	 0, 	 0, 	 0, 0x3925, 	 0, 	 0, /* 0x70 */
+         0, 0x5522, 0x4721, 0x485E, 0x4C51, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x4725, 	 0, 	 0, 0x552B, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x3538, 	 0, 	 0, 0x4D45, 	 0, /* 0x90 */
+         0, 0x4C2F, 	 0, 0x562C, 	 0, 0x5523, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x5526, 	 0, 0x4245, 	 0, 	 0, /* 0xA0 */
+    0x4B38, 	 0, 	 0, 	 0, 0x454A, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x5527, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x4B65, 	 0, 0x3A4A, 	 0, 	 0, 0x3E2A, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5528, 	 0, /* 0xC0 */
+         0, 0x3B50, 	 0, 0x3B4F, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x3039, 0x3848, 	 0, 0x402B, 0x3051, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x552C, 0x552D, 	 0, 0x552A, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3138, 0x342F, 	 0, /* 0xE0 */
+    0x5529, 	 0, 0x4C45, 0x4931, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3028, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0x3079, 	 0, 	 0, 	 0, 0x3B51	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_5A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3052,      0, 0x3023,      0,      0,      0,      0, /* 0x00 */
-         0, 0x5532,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0x5530,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0x4C3C,      0, 0x5533,      0, 0x5531,      0,      0, 0x552F, /* 0x10 */
-    0x3F31,      0,      0,      0,      0, 0x552E,      0,      0, /* 0x20 */
-         0, 0x4A5A,      0,      0,      0,      0,      0, 0x3864, /* 0x20 */
-         0,      0,      0,      0,      0, 0x5537, 0x5538,      0, /* 0x30 */
-         0,      0,      0,      0, 0x3E2B,      0,      0,      0, /* 0x30 */
-    0x5534, 0x4F2C,      0,      0,      0,      0, 0x474C,      0, /* 0x40 */
-         0, 0x5536,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0x3A27,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0x5539,      0,      0,      0, 0x4958,      0, /* 0x60 */
-         0,      0, 0x553A,      0, 0x5535,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0x4C3B, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0x475E,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0x553B, 0x4932,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x553C, 0x5540, 0x553D,      0, /* 0xB0 */
-         0, 0x3247, 0x553F,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x3C3B,      0, 0x553E, 0x3779,      0,      0,      0, /* 0xC0 */
-    0x554C,      0,      0,      0,      0,      0, 0x5545, 0x5542, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x4364,      0, 0x5541,      0,      0, 0x5543,      0, /* 0xE0 */
-         0, 0x5544,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x5546, 0x5547                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3052, 	 0, 0x3023, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x5532, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x5530, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x4C3C, 	 0, 0x5533, 	 0, 0x5531, 	 0, 	 0, 0x552F, /* 0x10 */
+    0x3F31, 	 0, 	 0, 	 0, 	 0, 0x552E, 	 0, 	 0, /* 0x20 */
+         0, 0x4A5A, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3864, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5537, 0x5538, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x3E2B, 	 0, 	 0, 	 0, /* 0x30 */
+    0x5534, 0x4F2C, 	 0, 	 0, 	 0, 	 0, 0x474C, 	 0, /* 0x40 */
+         0, 0x5536, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x3A27, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x5539, 	 0, 	 0, 	 0, 0x4958, 	 0, /* 0x60 */
+         0, 	 0, 0x553A, 	 0, 0x5535, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4C3B, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x475E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x553B, 0x4932, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x553C, 0x5540, 0x553D, 	 0, /* 0xB0 */
+         0, 0x3247, 0x553F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x3C3B, 	 0, 0x553E, 0x3779, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x554C, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5545, 0x5542, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x4364, 	 0, 0x5541, 	 0, 	 0, 0x5543, 	 0, /* 0xE0 */
+         0, 0x5544, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x5546, 0x5547									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_5B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-            0x3472,      0, 0x5549, 0x5548,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0x554A,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x3E6E,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x554D,      0, 0x445C,      0,      0,      0, /* 0x20 */
-    0x3145,      0, 0x554B,      0,      0,      0, 0x554E,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0x554F,      0, /* 0x30 */
-    0x5552,      0,      0, 0x5550,      0, 0x5551,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0x3B52, 0x5553,      0,      0, 0x3926, 0x5554,      0, 0x3B7A, /* 0x50 */
-    0x4238,      0, 0x5555, 0x5556, 0x3B5A, 0x3927,      0, 0x4C52, /* 0x50 */
-         0,      0,      0, 0x3528, 0x3849, 0x5557, 0x3358,      0, /* 0x60 */
-         0, 0x5558,      0, 0x4239,      0,      0,      0,      0, /* 0x60 */
-    0x5559, 0x5623,      0, 0x555A,      0, 0x555B,      0,      0, /* 0x70 */
-    0x555C,      0, 0x555E,      0,      0,      0,      0,      0, /* 0x70 */
-    0x555F,      0,      0, 0x5560,      0, 0x4270,      0, 0x3127, /* 0x80 */
-    0x3C69, 0x3042,      0, 0x4157, 0x3430, 0x3C35,      0, 0x3928, /* 0x80 */
-         0,      0,      0,      0,      0, 0x4566,      0, 0x3D21, /* 0x90 */
-    0x3431, 0x4368, 0x446A, 0x3038, 0x3539, 0x4A75,      0, 0x3C42, /* 0x90 */
-         0,      0, 0x3552, 0x406B, 0x3C3C, 0x4D28, 0x5561,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0x355C,      0, /* 0xA0 */
-    0x3A4B,      0,      0, 0x3332, 0x3163, 0x3E2C, 0x3248,      0, /* 0xB0 */
-    0x5562, 0x4D46,      0,      0,      0,      0,      0, 0x3D49, /* 0xB0 */
-         0,      0, 0x3C64, 0x5563, 0x3473, 0x4652, 0x4C29, 0x5564, /* 0xC0 */
-         0, 0x5565,      0,      0, 0x4959,      0,      0,      0, /* 0xC0 */
-    0x5567,      0, 0x3428, 0x3677, 0x5566,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0x3432,      0, 0x3F32, 0x556B, 0x3B21, /* 0xD0 */
-         0, 0x3249, 0x556A,      0, 0x5568, 0x556C, 0x5569, 0x472B, /* 0xE0 */
-    0x5C4D, 0x3F33,      0, 0x556D,      0,      0, 0x4E40,      0, /* 0xE0 */
-    0x556E,      0,      0, 0x5570,      0, 0x437E, 0x556F,      0, /* 0xF0 */
-    0x4023,      0, 0x3B7B,      0,      0,      0, 0x4250, 0x3C77  /* 0xF0 */
+            0x3472, 	 0, 0x5549, 0x5548, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x554A, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x3E6E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x554D, 	 0, 0x445C, 	 0, 	 0, 	 0, /* 0x20 */
+    0x3145, 	 0, 0x554B, 	 0, 	 0, 	 0, 0x554E, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x554F, 	 0, /* 0x30 */
+    0x5552, 	 0, 	 0, 0x5550, 	 0, 0x5551, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0x3B52, 0x5553, 	 0, 	 0, 0x3926, 0x5554, 	 0, 0x3B7A, /* 0x50 */
+    0x4238, 	 0, 0x5555, 0x5556, 0x3B5A, 0x3927, 	 0, 0x4C52, /* 0x50 */
+         0, 	 0, 	 0, 0x3528, 0x3849, 0x5557, 0x3358, 	 0, /* 0x60 */
+         0, 0x5558, 	 0, 0x4239, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x5559, 0x5623, 	 0, 0x555A, 	 0, 0x555B, 	 0, 	 0, /* 0x70 */
+    0x555C, 	 0, 0x555E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x555F, 	 0, 	 0, 0x5560, 	 0, 0x4270, 	 0, 0x3127, /* 0x80 */
+    0x3C69, 0x3042, 	 0, 0x4157, 0x3430, 0x3C35, 	 0, 0x3928, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4566, 	 0, 0x3D21, /* 0x90 */
+    0x3431, 0x4368, 0x446A, 0x3038, 0x3539, 0x4A75, 	 0, 0x3C42, /* 0x90 */
+         0, 	 0, 0x3552, 0x406B, 0x3C3C, 0x4D28, 0x5561, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x355C, 	 0, /* 0xA0 */
+    0x3A4B, 	 0, 	 0, 0x3332, 0x3163, 0x3E2C, 0x3248, 	 0, /* 0xB0 */
+    0x5562, 0x4D46, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3D49, /* 0xB0 */
+         0, 	 0, 0x3C64, 0x5563, 0x3473, 0x4652, 0x4C29, 0x5564, /* 0xC0 */
+         0, 0x5565, 	 0, 	 0, 0x4959, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x5567, 	 0, 0x3428, 0x3677, 0x5566, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x3432, 	 0, 0x3F32, 0x556B, 0x3B21, /* 0xD0 */
+         0, 0x3249, 0x556A, 	 0, 0x5568, 0x556C, 0x5569, 0x472B, /* 0xE0 */
+    0x5C4D, 0x3F33, 	 0, 0x556D, 	 0, 	 0, 0x4E40, 	 0, /* 0xE0 */
+    0x556E, 	 0, 	 0, 0x5570, 	 0, 0x437E, 0x556F, 	 0, /* 0xF0 */
+    0x4023, 	 0, 0x3B7B, 	 0, 	 0, 	 0, 0x4250, 0x3C77	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_5C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x4975, 0x406C,      0, 0x3C4D, 0x5571, 0x3E2D, 0x5572, /* 0x00 */
-    0x5573, 0x3053, 0x423A, 0x3F52,      0, 0x5574, 0x4633, 0x3E2E, /* 0x00 */
-         0, 0x3E2F,      0, 0x5575,      0,      0, 0x406D,      0, /* 0x10 */
-         0,      0, 0x3E30,      0,      0,      0,      0,      0, /* 0x10 */
-    0x5576,      0, 0x5577,      0, 0x4C60,      0,      0,      0, /* 0x20 */
-    0x5578,      0,      0,      0,      0, 0x3646,      0,      0, /* 0x20 */
-         0, 0x3D22,      0,      0,      0,      0,      0,      0, /* 0x30 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x4975, 0x406C, 	 0, 0x3C4D, 0x5571, 0x3E2D, 0x5572, /* 0x00 */
+    0x5573, 0x3053, 0x423A, 0x3F52, 	 0, 0x5574, 0x4633, 0x3E2E, /* 0x00 */
+         0, 0x3E2F, 	 0, 0x5575, 	 0, 	 0, 0x406D, 	 0, /* 0x10 */
+         0, 	 0, 0x3E30, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x5576, 	 0, 0x5577, 	 0, 0x4C60, 	 0, 	 0, 	 0, /* 0x20 */
+    0x5578, 	 0, 	 0, 	 0, 	 0, 0x3646, 	 0, 	 0, /* 0x20 */
+         0, 0x3D22, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
     0x5579, 0x557A, 0x3C5C, 0x3F2C, 0x4674, 0x3F54, 0x4878, 0x4722, /* 0x30 */
-    0x3649, 0x557B,      0,      0,      0, 0x356F, 0x557C,      0, /* 0x40 */
-    0x367E,      0, 0x464F, 0x3230,      0, 0x3B53, 0x557D, 0x5622, /* 0x40 */
-    0x5621, 0x367D,      0, 0x557E,      0, 0x4538,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0x4230,      0, /* 0x50 */
-    0x454B, 0x3C48,      0,      0, 0x4158, 0x4D7A,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0x5624,      0, 0x5625, 0x4656, /* 0x60 */
-         0, 0x3B33,      0,      0,      0,      0, 0x5627,      0, /* 0x70 */
-         0, 0x5628,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0x5629,      0,      0,      0, /* 0x80 */
-    0x3474, 0x562A,      0,      0, 0x562B,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0x322C,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x413B, 0x3464,      0, 0x562D, 0x4C28,      0,      0,      0, /* 0xA0 */
-         0, 0x4252,      0, 0x3359,      0,      0, 0x562F, 0x5631, /* 0xB0 */
-    0x345F,      0,      0, 0x562E, 0x5630,      0, 0x5633,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x5632,      0, 0x5634, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x5635,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x463D, 0x362E,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x3265, 0x5636, 0x563B,      0,      0, 0x5639,      0, 0x4A77, /* 0xE0 */
-    0x4A76,      0,      0,      0,      0,      0, 0x4567,      0, /* 0xF0 */
-         0,      0, 0x5638, 0x3D54,      0, 0x5637                  /* 0xF0 */
+    0x3649, 0x557B, 	 0, 	 0, 	 0, 0x356F, 0x557C, 	 0, /* 0x40 */
+    0x367E, 	 0, 0x464F, 0x3230, 	 0, 0x3B53, 0x557D, 0x5622, /* 0x40 */
+    0x5621, 0x367D, 	 0, 0x557E, 	 0, 0x4538, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4230, 	 0, /* 0x50 */
+    0x454B, 0x3C48, 	 0, 	 0, 0x4158, 0x4D7A, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x5624, 	 0, 0x5625, 0x4656, /* 0x60 */
+         0, 0x3B33, 	 0, 	 0, 	 0, 	 0, 0x5627, 	 0, /* 0x70 */
+         0, 0x5628, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x5629, 	 0, 	 0, 	 0, /* 0x80 */
+    0x3474, 0x562A, 	 0, 	 0, 0x562B, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x322C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x413B, 0x3464, 	 0, 0x562D, 0x4C28, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x4252, 	 0, 0x3359, 	 0, 	 0, 0x562F, 0x5631, /* 0xB0 */
+    0x345F, 	 0, 	 0, 0x562E, 0x5630, 	 0, 0x5633, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5632, 	 0, 0x5634, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x5635, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x463D, 0x362E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x3265, 0x5636, 0x563B, 	 0, 	 0, 0x5639, 	 0, 0x4A77, /* 0xE0 */
+    0x4A76, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4567, 	 0, /* 0xF0 */
+         0, 	 0, 0x5638, 0x3D54, 	 0, 0x5637					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_5D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0x3F72, /* 0x00 */
-         0,      0,      0, 0x563C,      0,      0, 0x3A6A,      0, /* 0x00 */
-         0, 0x5642,      0,      0, 0x5643, 0x563D, 0x3333, 0x563E, /* 0x10 */
-    0x5647, 0x5646, 0x5645, 0x5641,      0,      0,      0, 0x5640, /* 0x10 */
-         0,      0, 0x5644,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0x4A78,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0x564B, 0x5648,      0, 0x564A,      0, /* 0x40 */
-    0x4D72,      0, 0x5649,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0x563F,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0x3F73,      0,      0, 0x564C,      0,      0, 0x3A37, /* 0x60 */
-         0,      0,      0, 0x564D,      0,      0, 0x564E,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x5651,      0, 0x5650,      0,      0, 0x564F, /* 0x80 */
-         0,      0,      0, 0x4568, 0x563A,      0,      0,      0, /* 0x80 */
-    0x5657,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0x5653,      0,      0, /* 0x90 */
-         0,      0, 0x5652,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x5654,      0, 0x5655,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0x5658, /* 0xB0 */
-         0,      0, 0x4E66,      0, 0x5659, 0x5656,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x565A,      0,      0, 0x3460, 0x565B,      0,      0, /* 0xC0 */
-         0,      0, 0x565D, 0x565C,      0,      0, 0x565E,      0, /* 0xD0 */
-         0,      0,      0, 0x565F,      0, 0x406E, 0x3D23,      0, /* 0xD0 */
-         0, 0x3D64,      0, 0x4163,      0, 0x3929, 0x3A38, 0x392A, /* 0xE0 */
-    0x3570,      0,      0, 0x5660,      0,      0, 0x3A39,      0, /* 0xE0 */
-         0, 0x384A, 0x5661, 0x4C26, 0x4743, 0x5662,      0, 0x392B, /* 0xF0 */
-         0,      0,      0, 0x342C,      0, 0x4327, 0x3652          /* 0xF0 */
+         0, 	 0, 	 0, 0x563C, 	 0, 	 0, 0x3A6A, 	 0, /* 0x00 */
+         0, 0x5642, 	 0, 	 0, 0x5643, 0x563D, 0x3333, 0x563E, /* 0x10 */
+    0x5647, 0x5646, 0x5645, 0x5641, 	 0, 	 0, 	 0, 0x5640, /* 0x10 */
+         0, 	 0, 0x5644, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x4A78, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x564B, 0x5648, 	 0, 0x564A, 	 0, /* 0x40 */
+    0x4D72, 	 0, 0x5649, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x563F, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x3F73, 	 0, 	 0, 0x564C, 	 0, 	 0, 0x3A37, /* 0x60 */
+         0, 	 0, 	 0, 0x564D, 	 0, 	 0, 0x564E, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x5651, 	 0, 0x5650, 	 0, 	 0, 0x564F, /* 0x80 */
+         0, 	 0, 	 0, 0x4568, 0x563A, 	 0, 	 0, 	 0, /* 0x80 */
+    0x5657, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5653, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x5652, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x5654, 	 0, 0x5655, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5658, /* 0xB0 */
+         0, 	 0, 0x4E66, 	 0, 0x5659, 0x5656, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x565A, 	 0, 	 0, 0x3460, 0x565B, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x565D, 0x565C, 	 0, 	 0, 0x565E, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x565F, 	 0, 0x406E, 0x3D23, 	 0, /* 0xD0 */
+         0, 0x3D64, 	 0, 0x4163, 	 0, 0x3929, 0x3A38, 0x392A, /* 0xE0 */
+    0x3570, 	 0, 	 0, 0x5660, 	 0, 	 0, 0x3A39, 	 0, /* 0xE0 */
+         0, 0x384A, 0x5661, 0x4C26, 0x4743, 0x5662, 	 0, 0x392B, /* 0xF0 */
+         0, 	 0, 	 0, 0x342C, 	 0, 0x4327, 0x3652			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_5E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x3B54, 0x495B,      0,      0, 0x4841,      0, /* 0x00 */
-         0,      0,      0, 0x5663, 0x3475,      0,      0,      0, /* 0x00 */
-         0, 0x5666,      0,      0,      0,      0, 0x4421,      0, /* 0x10 */
-         0, 0x5665, 0x5664, 0x5667,      0, 0x446B,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0x3F63,      0,      0, /* 0x20 */
-         0,      0,      0, 0x3B55,      0, 0x404A,      0, 0x4253, /* 0x20 */
-    0x3522,      0,      0, 0x4422,      0,      0, 0x5668, 0x5669, /* 0x30 */
-    0x3E6F,      0,      0,      0,      0, 0x4B39,      0,      0, /* 0x30 */
-    0x566C,      0,      0, 0x566B, 0x566A, 0x497D,      0, 0x5673, /* 0x40 */
-         0,      0,      0,      0, 0x4B5A,      0, 0x566D,      0, /* 0x40 */
-         0,      0,      0,      0, 0x566F, 0x4B6B,      0, 0x566E, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0x5670, /* 0x50 */
-         0, 0x4828, 0x5671, 0x4A3E, 0x5672,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0x3433, 0x4A3F, 0x472F, 0x5674, 0x5675,      0, /* 0x70 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x3B54, 0x495B, 	 0, 	 0, 0x4841, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x5663, 0x3475, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x5666, 	 0, 	 0, 	 0, 	 0, 0x4421, 	 0, /* 0x10 */
+         0, 0x5665, 0x5664, 0x5667, 	 0, 0x446B, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3F63, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x3B55, 	 0, 0x404A, 	 0, 0x4253, /* 0x20 */
+    0x3522, 	 0, 	 0, 0x4422, 	 0, 	 0, 0x5668, 0x5669, /* 0x30 */
+    0x3E6F, 	 0, 	 0, 	 0, 	 0, 0x4B39, 	 0, 	 0, /* 0x30 */
+    0x566C, 	 0, 	 0, 0x566B, 0x566A, 0x497D, 	 0, 0x5673, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x4B5A, 	 0, 0x566D, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x566F, 0x4B6B, 	 0, 0x566E, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5670, /* 0x50 */
+         0, 0x4828, 0x5671, 0x4A3E, 0x5672, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x3433, 0x4A3F, 0x472F, 0x5674, 0x5675, 	 0, /* 0x70 */
     0x392C, 0x3434, 0x5676, 0x3838, 0x4D44, 0x4D29, 0x3476, 0x5678, /* 0x70 */
-         0, 0x4423,      0, 0x392D, 0x3E31,      0,      0, 0x485F, /* 0x80 */
-         0,      0, 0x3E32,      0,      0,      0,      0, 0x3D78, /* 0x80 */
-         0,      0,      0,      0,      0, 0x446C, 0x4A79, 0x4539, /* 0x90 */
-         0,      0, 0x392E,      0, 0x495C,      0,      0,      0, /* 0x90 */
-    0x5679,      0,      0,      0,      0,      0, 0x4559, 0x3A42, /* 0xA0 */
-         0,      0,      0, 0x384B,      0, 0x446D,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0x3043, 0x3D6E, 0x392F, /* 0xB0 */
-    0x4D47,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x567A, 0x567B, 0x4751,      0,      0,      0,      0, /* 0xC0 */
-    0x567C, 0x4E77, 0x4F2D,      0,      0,      0,      0, 0x567E, /* 0xC0 */
-    0x567D,      0,      0, 0x3347,      0,      0, 0x5721,      0, /* 0xD0 */
-         0,      0, 0x5724, 0x5725,      0, 0x5723,      0, 0x4940, /* 0xD0 */
-    0x3E33, 0x5727, 0x5726, 0x5722,      0,      0,      0,      0, /* 0xE0 */
-    0x5728, 0x5729,      0,      0, 0x572A,      0,      0,      0, /* 0xE0 */
-    0x572D, 0x572B,      0, 0x572C, 0x572E,      0, 0x3164, 0x446E, /* 0xF0 */
-    0x572F,      0, 0x377A, 0x3276, 0x4736,      0, 0x5730, 0x467B  /* 0xF0 */
+         0, 0x4423, 	 0, 0x392D, 0x3E31, 	 0, 	 0, 0x485F, /* 0x80 */
+         0, 	 0, 0x3E32, 	 0, 	 0, 	 0, 	 0, 0x3D78, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x446C, 0x4A79, 0x4539, /* 0x90 */
+         0, 	 0, 0x392E, 	 0, 0x495C, 	 0, 	 0, 	 0, /* 0x90 */
+    0x5679, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4559, 0x3A42, /* 0xA0 */
+         0, 	 0, 	 0, 0x384B, 	 0, 0x446D, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3043, 0x3D6E, 0x392F, /* 0xB0 */
+    0x4D47, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x567A, 0x567B, 0x4751, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x567C, 0x4E77, 0x4F2D, 	 0, 	 0, 	 0, 	 0, 0x567E, /* 0xC0 */
+    0x567D, 	 0, 	 0, 0x3347, 	 0, 	 0, 0x5721, 	 0, /* 0xD0 */
+         0, 	 0, 0x5724, 0x5725, 	 0, 0x5723, 	 0, 0x4940, /* 0xD0 */
+    0x3E33, 0x5727, 0x5726, 0x5722, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x5728, 0x5729, 	 0, 	 0, 0x572A, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x572D, 0x572B, 	 0, 0x572C, 0x572E, 	 0, 0x3164, 0x446E, /* 0xF0 */
+    0x572F, 	 0, 0x377A, 0x3276, 0x4736, 	 0, 0x5730, 0x467B	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_5F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x4A5B,      0, 0x5731, 0x4F2E,      0,      0,      0, /* 0x00 */
-         0, 0x5732, 0x4A40, 0x5735, 0x5021, 0x5031,      0, 0x3C30, /* 0x00 */
-    0x4675, 0x5736,      0, 0x355D, 0x4424, 0x307A, 0x5737, 0x4A26, /* 0x10 */
-    0x3930,      0,      0, 0x4350,      0,      0,      0, 0x446F, /* 0x10 */
-         0,      0,      0,      0,      0, 0x4C6F, 0x3839, 0x384C, /* 0x20 */
-         0, 0x5738,      0,      0,      0, 0x5739,      0, 0x573F, /* 0x20 */
-         0, 0x3C65,      0,      0,      0, 0x4425,      0, 0x362F, /* 0x30 */
-    0x573A,      0,      0,      0, 0x492B,      0, 0x4346,      0, /* 0x30 */
-         0, 0x573B,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0x573C,      0, 0x3630,      0, 0x573D,      0, 0x573E,      0, /* 0x40 */
-         0, 0x5740,      0, 0x4576,      0,      0, 0x5741, 0x5742, /* 0x50 */
-         0, 0x5743,      0,      0, 0x5734, 0x5733,      0,      0, /* 0x50 */
-         0, 0x5744, 0x3741,      0,      0,      0, 0x4927,      0, /* 0x60 */
-         0, 0x3A4C, 0x4937, 0x4426, 0x494B, 0x5745,      0,      0, /* 0x60 */
-    0x3E34, 0x3146,      0, 0x5746,      0,      0,      0, 0x5747, /* 0x70 */
-         0, 0x4C72,      0,      0, 0x4860,      0,      0, 0x574A, /* 0x70 */
-    0x317D, 0x402C, 0x5749, 0x5748, 0x3742, 0x4254,      0, 0x574E, /* 0x80 */
-    0x574C,      0, 0x574B, 0x4E27, 0x3865,      0,      0,      0, /* 0x80 */
-    0x3D79, 0x574D, 0x454C, 0x3D3E,      0,      0,      0, 0x4640, /* 0x90 */
-    0x5751, 0x5750,      0,      0,      0,      0, 0x574F,      0, /* 0x90 */
-    0x5752, 0x3866,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x5753, 0x497C, 0x3D5B,      0,      0, 0x5754, 0x4879,      0, /* 0xA0 */
-         0,      0,      0, 0x4641, 0x4427,      0,      0,      0, /* 0xB0 */
-         0, 0x4530,      0,      0, 0x5755, 0x352B,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x3F34,      0, 0x492C,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x3477, 0x4726,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0x5756, 0x3B56, /* 0xD0 */
-    0x4B3A, 0x4B3B,      0,      0, 0x317E, 0x575B,      0,      0, /* 0xD0 */
-    0x4369,      0,      0,      0, 0x5758,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x3277,      0,      0,      0,      0, /* 0xE0 */
-    0x582D, 0x575A,      0,      0,      0, 0x4730,      0,      0, /* 0xF0 */
-    0x5759,      0,      0, 0x5757,      0, 0x397A,      0, 0x575D  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x4A5B, 	 0, 0x5731, 0x4F2E, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x5732, 0x4A40, 0x5735, 0x5021, 0x5031, 	 0, 0x3C30, /* 0x00 */
+    0x4675, 0x5736, 	 0, 0x355D, 0x4424, 0x307A, 0x5737, 0x4A26, /* 0x10 */
+    0x3930, 	 0, 	 0, 0x4350, 	 0, 	 0, 	 0, 0x446F, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4C6F, 0x3839, 0x384C, /* 0x20 */
+         0, 0x5738, 	 0, 	 0, 	 0, 0x5739, 	 0, 0x573F, /* 0x20 */
+         0, 0x3C65, 	 0, 	 0, 	 0, 0x4425, 	 0, 0x362F, /* 0x30 */
+    0x573A, 	 0, 	 0, 	 0, 0x492B, 	 0, 0x4346, 	 0, /* 0x30 */
+         0, 0x573B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0x573C, 	 0, 0x3630, 	 0, 0x573D, 	 0, 0x573E, 	 0, /* 0x40 */
+         0, 0x5740, 	 0, 0x4576, 	 0, 	 0, 0x5741, 0x5742, /* 0x50 */
+         0, 0x5743, 	 0, 	 0, 0x5734, 0x5733, 	 0, 	 0, /* 0x50 */
+         0, 0x5744, 0x3741, 	 0, 	 0, 	 0, 0x4927, 	 0, /* 0x60 */
+         0, 0x3A4C, 0x4937, 0x4426, 0x494B, 0x5745, 	 0, 	 0, /* 0x60 */
+    0x3E34, 0x3146, 	 0, 0x5746, 	 0, 	 0, 	 0, 0x5747, /* 0x70 */
+         0, 0x4C72, 	 0, 	 0, 0x4860, 	 0, 	 0, 0x574A, /* 0x70 */
+    0x317D, 0x402C, 0x5749, 0x5748, 0x3742, 0x4254, 	 0, 0x574E, /* 0x80 */
+    0x574C, 	 0, 0x574B, 0x4E27, 0x3865, 	 0, 	 0, 	 0, /* 0x80 */
+    0x3D79, 0x574D, 0x454C, 0x3D3E, 	 0, 	 0, 	 0, 0x4640, /* 0x90 */
+    0x5751, 0x5750, 	 0, 	 0, 	 0, 	 0, 0x574F, 	 0, /* 0x90 */
+    0x5752, 0x3866, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x5753, 0x497C, 0x3D5B, 	 0, 	 0, 0x5754, 0x4879, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x4641, 0x4427, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x4530, 	 0, 	 0, 0x5755, 0x352B, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x3F34, 	 0, 0x492C, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x3477, 0x4726, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5756, 0x3B56, /* 0xD0 */
+    0x4B3A, 0x4B3B, 	 0, 	 0, 0x317E, 0x575B, 	 0, 	 0, /* 0xD0 */
+    0x4369, 	 0, 	 0, 	 0, 0x5758, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x3277, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x582D, 0x575A, 	 0, 	 0, 	 0, 0x4730, 	 0, 	 0, /* 0xF0 */
+    0x5759, 	 0, 	 0, 0x5757, 	 0, 0x397A, 	 0, 0x575D	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_60[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
                                                     0x5763, 0x5769, /* 0x00 */
-    0x5761,      0, 0x455C,      0,      0, 0x5766, 0x495D,      0, /* 0x10 */
-         0, 0x5760,      0, 0x5765, 0x4E67, 0x3B57,      0,      0, /* 0x10 */
-    0x4255, 0x575E,      0,      0,      0, 0x355E, 0x5768, 0x402D, /* 0x20 */
-    0x3165, 0x5762, 0x3278, 0x5767,      0,      0,      0, 0x3631, /* 0x20 */
-         0, 0x5764,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0x576A,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0x576C, 0x5776, 0x5774,      0,      0, 0x5771,      0, /* 0x40 */
-         0,      0, 0x5770, 0x4E78,      0, 0x5772,      0,      0, /* 0x40 */
-    0x3632,      0, 0x3931,      0,      0, 0x3D7A,      0,      0, /* 0x50 */
-         0, 0x5779, 0x576B,      0,      0,      0,      0, 0x576F, /* 0x50 */
-    0x575F,      0, 0x327A, 0x5773, 0x5775, 0x4351,      0,      0, /* 0x60 */
-    0x3A28, 0x3238, 0x576D, 0x5778, 0x5777, 0x3633,      0, 0x4229, /* 0x60 */
-    0x3366,      0,      0,      0,      0, 0x3743,      0, 0x576E, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x577A,      0, 0x577D, 0x5821,      0,      0,      0, /* 0x80 */
-         0, 0x3C3D,      0, 0x5827, 0x4470, 0x577B,      0,      0, /* 0x80 */
-         0,      0, 0x5825,      0, 0x3279,      0, 0x5823, 0x5824, /* 0x90 */
-         0,      0, 0x577E, 0x5822,      0,      0,      0, 0x3867, /* 0x90 */
-    0x4D2A,      0,      0, 0x3435,      0,      0, 0x3159, 0x5826, /* 0xA0 */
-         0, 0x473A, 0x302D,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x4861, 0x575C, 0x582C, 0x5830, 0x4C65,      0, /* 0xB0 */
-    0x5829,      0,      0,      0, 0x4569, 0x582E,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x3E70, 0x582F, 0x4657, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x4F47,      0, 0x582B,      0,      0,      0,      0, /* 0xD0 */
-    0x5831,      0, 0x397B,      0, 0x404B,      0,      0, 0x3054, /* 0xD0 */
-    0x582A, 0x5828,      0, 0x415A,      0,      0,      0, 0x577C, /* 0xE0 */
-    0x3B34,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x4246, 0x583D,      0, 0x415B, 0x5838,      0, 0x5835, 0x5836, /* 0xF0 */
-         0, 0x3C66, 0x5839, 0x583C                                  /* 0xF0 */
+    0x5761, 	 0, 0x455C, 	 0, 	 0, 0x5766, 0x495D, 	 0, /* 0x10 */
+         0, 0x5760, 	 0, 0x5765, 0x4E67, 0x3B57, 	 0, 	 0, /* 0x10 */
+    0x4255, 0x575E, 	 0, 	 0, 	 0, 0x355E, 0x5768, 0x402D, /* 0x20 */
+    0x3165, 0x5762, 0x3278, 0x5767, 	 0, 	 0, 	 0, 0x3631, /* 0x20 */
+         0, 0x5764, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x576A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x576C, 0x5776, 0x5774, 	 0, 	 0, 0x5771, 	 0, /* 0x40 */
+         0, 	 0, 0x5770, 0x4E78, 	 0, 0x5772, 	 0, 	 0, /* 0x40 */
+    0x3632, 	 0, 0x3931, 	 0, 	 0, 0x3D7A, 	 0, 	 0, /* 0x50 */
+         0, 0x5779, 0x576B, 	 0, 	 0, 	 0, 	 0, 0x576F, /* 0x50 */
+    0x575F, 	 0, 0x327A, 0x5773, 0x5775, 0x4351, 	 0, 	 0, /* 0x60 */
+    0x3A28, 0x3238, 0x576D, 0x5778, 0x5777, 0x3633, 	 0, 0x4229, /* 0x60 */
+    0x3366, 	 0, 	 0, 	 0, 	 0, 0x3743, 	 0, 0x576E, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x577A, 	 0, 0x577D, 0x5821, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x3C3D, 	 0, 0x5827, 0x4470, 0x577B, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x5825, 	 0, 0x3279, 	 0, 0x5823, 0x5824, /* 0x90 */
+         0, 	 0, 0x577E, 0x5822, 	 0, 	 0, 	 0, 0x3867, /* 0x90 */
+    0x4D2A, 	 0, 	 0, 0x3435, 	 0, 	 0, 0x3159, 0x5826, /* 0xA0 */
+         0, 0x473A, 0x302D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x4861, 0x575C, 0x582C, 0x5830, 0x4C65, 	 0, /* 0xB0 */
+    0x5829, 	 0, 	 0, 	 0, 0x4569, 0x582E, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3E70, 0x582F, 0x4657, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x4F47, 	 0, 0x582B, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x5831, 	 0, 0x397B, 	 0, 0x404B, 	 0, 	 0, 0x3054, /* 0xD0 */
+    0x582A, 0x5828, 	 0, 0x415A, 	 0, 	 0, 	 0, 0x577C, /* 0xE0 */
+    0x3B34, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x4246, 0x583D, 	 0, 0x415B, 0x5838, 	 0, 0x5835, 0x5836, /* 0xF0 */
+         0, 0x3C66, 0x5839, 0x583C									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_61[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x5837, 0x3D25,      0, 0x583A,      0,      0, 0x5834,      0, /* 0x00 */
-    0x4C7C, 0x4C7B,      0,      0,      0, 0x583E, 0x583F, 0x3055, /* 0x00 */
-         0,      0,      0,      0,      0, 0x5833,      0,      0, /* 0x10 */
-         0,      0, 0x3672, 0x3026,      0,      0,      0, 0x3436, /* 0x10 */
-         0, 0x583B,      0,      0,      0,      0,      0, 0x5843, /* 0x20 */
-    0x5842,      0,      0,      0, 0x5847,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0x5848,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0x5846, 0x5849, 0x5841, 0x5845, /* 0x30 */
-         0,      0, 0x584A,      0, 0x584B,      0,      0, 0x5840, /* 0x40 */
-    0x3B7C,      0, 0x5844, 0x4256, 0x3932, 0x5832, 0x3F35,      0, /* 0x40 */
-         0,      0,      0, 0x5858,      0, 0x4A69,      0,      0, /* 0x50 */
-    0x584E, 0x584F, 0x5850,      0,      0, 0x5857,      0, 0x5856, /* 0x50 */
-         0,      0, 0x4B7D, 0x3437,      0, 0x5854,      0, 0x3745, /* 0x60 */
-    0x3334,      0,      0, 0x5851,      0,      0, 0x4E38, 0x5853, /* 0x60 */
-    0x3056, 0x5855,      0, 0x584C, 0x5852, 0x5859, 0x3744, 0x584D, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x4D5D,      0, /* 0x70 */
-         0,      0, 0x4D2B,      0,      0,      0,      0, 0x585C, /* 0x80 */
-         0,      0, 0x5860,      0,      0,      0, 0x417E,      0, /* 0x80 */
-    0x4E79, 0x5861,      0,      0, 0x585E,      0, 0x585B,      0, /* 0x90 */
-         0, 0x585A, 0x585F,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0x4A30,      0,      0, 0x4634, /* 0xA0 */
-         0, 0x3746,      0, 0x5862, 0x585D,      0, 0x5863,      0, /* 0xA0 */
-         0,      0, 0x377B,      0,      0,      0, 0x3231,      0, /* 0xB0 */
-         0,      0, 0x586B,      0,      0,      0, 0x3438,      0, /* 0xB0 */
-         0,      0,      0, 0x5869,      0,      0, 0x586A, 0x3A29, /* 0xC0 */
-    0x5868, 0x5866, 0x5865, 0x586C, 0x5864, 0x586E,      0,      0, /* 0xC0 */
-    0x327B,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0x5870,      0,      0, 0x586F,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0x4428,      0, 0x5873,      0, 0x5871, 0x5867, /* 0xF0 */
-    0x377C,      0, 0x5872,      0, 0x5876, 0x5875, 0x5877, 0x5874  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x5837, 0x3D25, 	 0, 0x583A, 	 0, 	 0, 0x5834, 	 0, /* 0x00 */
+    0x4C7C, 0x4C7B, 	 0, 	 0, 	 0, 0x583E, 0x583F, 0x3055, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5833, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x3672, 0x3026, 	 0, 	 0, 	 0, 0x3436, /* 0x10 */
+         0, 0x583B, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5843, /* 0x20 */
+    0x5842, 	 0, 	 0, 	 0, 0x5847, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x5848, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x5846, 0x5849, 0x5841, 0x5845, /* 0x30 */
+         0, 	 0, 0x584A, 	 0, 0x584B, 	 0, 	 0, 0x5840, /* 0x40 */
+    0x3B7C, 	 0, 0x5844, 0x4256, 0x3932, 0x5832, 0x3F35, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x5858, 	 0, 0x4A69, 	 0, 	 0, /* 0x50 */
+    0x584E, 0x584F, 0x5850, 	 0, 	 0, 0x5857, 	 0, 0x5856, /* 0x50 */
+         0, 	 0, 0x4B7D, 0x3437, 	 0, 0x5854, 	 0, 0x3745, /* 0x60 */
+    0x3334, 	 0, 	 0, 0x5851, 	 0, 	 0, 0x4E38, 0x5853, /* 0x60 */
+    0x3056, 0x5855, 	 0, 0x584C, 0x5852, 0x5859, 0x3744, 0x584D, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4D5D, 	 0, /* 0x70 */
+         0, 	 0, 0x4D2B, 	 0, 	 0, 	 0, 	 0, 0x585C, /* 0x80 */
+         0, 	 0, 0x5860, 	 0, 	 0, 	 0, 0x417E, 	 0, /* 0x80 */
+    0x4E79, 0x5861, 	 0, 	 0, 0x585E, 	 0, 0x585B, 	 0, /* 0x90 */
+         0, 0x585A, 0x585F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x4A30, 	 0, 	 0, 0x4634, /* 0xA0 */
+         0, 0x3746, 	 0, 0x5862, 0x585D, 	 0, 0x5863, 	 0, /* 0xA0 */
+         0, 	 0, 0x377B, 	 0, 	 0, 	 0, 0x3231, 	 0, /* 0xB0 */
+         0, 	 0, 0x586B, 	 0, 	 0, 	 0, 0x3438, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x5869, 	 0, 	 0, 0x586A, 0x3A29, /* 0xC0 */
+    0x5868, 0x5866, 0x5865, 0x586C, 0x5864, 0x586E, 	 0, 	 0, /* 0xC0 */
+    0x327B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x5870, 	 0, 	 0, 0x586F, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x4428, 	 0, 0x5873, 	 0, 0x5871, 0x5867, /* 0xF0 */
+    0x377C, 	 0, 0x5872, 	 0, 0x5876, 0x5875, 0x5877, 0x5874	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_62[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x5878,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0x5879, 0x587A, 0x4A6A,      0, 0x587C, 0x587B, 0x3D3F,      0, /* 0x00 */
-    0x402E, 0x3266, 0x327C,      0, 0x587D,      0, 0x303F,      0, /* 0x10 */
-         0,      0, 0x404C, 0x587E,      0, 0x6C43, 0x5921, 0x3761, /* 0x10 */
-         0, 0x5922,      0,      0,      0,      0, 0x406F,      0, /* 0x20 */
-         0,      0, 0x5923,      0,      0,      0, 0x5924, 0x353A, /* 0x20 */
-    0x5925,      0, 0x5926, 0x5927, 0x4257,      0,      0,      0, /* 0x30 */
-    0x384D,      0,      0, 0x4C61,      0,      0,      0, 0x4B3C, /* 0x30 */
-    0x3D6A, 0x5928,      0,      0,      0,      0,      0, 0x4070, /* 0x40 */
-    0x6E3D, 0x4862,      0, 0x3C6A,      0, 0x3A4D, 0x5929,      0, /* 0x40 */
-         0,      0,      0, 0x4247,      0, 0x4A27,      0,      0, /* 0x50 */
-    0x4271,      0,      0, 0x592C,      0,      0, 0x592A,      0, /* 0x50 */
-    0x592D,      0,      0, 0x592B,      0,      0,      0,      0, /* 0x60 */
-    0x592E,      0,      0,      0,      0,      0, 0x4A31,      0, /* 0x60 */
-         0, 0x3037,      0,      0,      0,      0, 0x495E,      0, /* 0x70 */
-         0, 0x4863,      0,      0, 0x592F,      0, 0x5932, 0x3E35, /* 0x70 */
-    0x353B,      0, 0x5930, 0x5937, 0x3E36,      0,      0,      0, /* 0x80 */
-         0, 0x5931, 0x4744,      0,      0,      0,      0,      0, /* 0x80 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x5878, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0x5879, 0x587A, 0x4A6A, 	 0, 0x587C, 0x587B, 0x3D3F, 	 0, /* 0x00 */
+    0x402E, 0x3266, 0x327C, 	 0, 0x587D, 	 0, 0x303F, 	 0, /* 0x10 */
+         0, 	 0, 0x404C, 0x587E, 	 0, 0x6C43, 0x5921, 0x3761, /* 0x10 */
+         0, 0x5922, 	 0, 	 0, 	 0, 	 0, 0x406F, 	 0, /* 0x20 */
+         0, 	 0, 0x5923, 	 0, 	 0, 	 0, 0x5924, 0x353A, /* 0x20 */
+    0x5925, 	 0, 0x5926, 0x5927, 0x4257, 	 0, 	 0, 	 0, /* 0x30 */
+    0x384D, 	 0, 	 0, 0x4C61, 	 0, 	 0, 	 0, 0x4B3C, /* 0x30 */
+    0x3D6A, 0x5928, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4070, /* 0x40 */
+    0x6E3D, 0x4862, 	 0, 0x3C6A, 	 0, 0x3A4D, 0x5929, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x4247, 	 0, 0x4A27, 	 0, 	 0, /* 0x50 */
+    0x4271, 	 0, 	 0, 0x592C, 	 0, 	 0, 0x592A, 	 0, /* 0x50 */
+    0x592D, 	 0, 	 0, 0x592B, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x592E, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4A31, 	 0, /* 0x60 */
+         0, 0x3037, 	 0, 	 0, 	 0, 	 0, 0x495E, 	 0, /* 0x70 */
+         0, 0x4863, 	 0, 	 0, 0x592F, 	 0, 0x5932, 0x3E35, /* 0x70 */
+    0x353B, 	 0, 0x5930, 0x5937, 0x3E36, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x5931, 0x4744, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x4D5E, 0x5933, 0x5934, 0x5938, 0x456A, 0x5935, 0x3933, /* 0x90 */
-    0x405E,      0,      0, 0x5946, 0x4834,      0, 0x4272,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x4864, 0x5A2D,      0,      0,      0, /* 0xA0 */
-         0, 0x4A7A,      0,      0,      0, 0x4471,      0,      0, /* 0xB0 */
-         0, 0x4B75,      0, 0x593B, 0x3221, 0x436A,      0,      0, /* 0xB0 */
-         0,      0, 0x5944,      0,      0, 0x4334, 0x593E, 0x5945, /* 0xC0 */
-    0x5940, 0x5947, 0x5943,      0, 0x5942, 0x476F,      0, 0x593C, /* 0xC0 */
-    0x327D, 0x593A, 0x3571, 0x4273, 0x5936,      0,      0, 0x5939, /* 0xD0 */
-    0x3934, 0x405B,      0, 0x3E37, 0x5941, 0x4752,      0,      0, /* 0xD0 */
-    0x3572, 0x3348,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0x3367, 0x3F21, 0x5949, 0x594E, /* 0xE0 */
-         0, 0x594A,      0, 0x377D,      0, 0x594F, 0x3B22, 0x3969, /* 0xF0 */
-         0,      0,      0,      0,      0,      0, 0x3D26, 0x593D  /* 0xF0 */
+    0x405E, 	 0, 	 0, 0x5946, 0x4834, 	 0, 0x4272, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x4864, 0x5A2D, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x4A7A, 	 0, 	 0, 	 0, 0x4471, 	 0, 	 0, /* 0xB0 */
+         0, 0x4B75, 	 0, 0x593B, 0x3221, 0x436A, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x5944, 	 0, 	 0, 0x4334, 0x593E, 0x5945, /* 0xC0 */
+    0x5940, 0x5947, 0x5943, 	 0, 0x5942, 0x476F, 	 0, 0x593C, /* 0xC0 */
+    0x327D, 0x593A, 0x3571, 0x4273, 0x5936, 	 0, 	 0, 0x5939, /* 0xD0 */
+    0x3934, 0x405B, 	 0, 0x3E37, 0x5941, 0x4752, 	 0, 	 0, /* 0xD0 */
+    0x3572, 0x3348, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x3367, 0x3F21, 0x5949, 0x594E, /* 0xE0 */
+         0, 0x594A, 	 0, 0x377D, 	 0, 0x594F, 0x3B22, 0x3969, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3D26, 0x593D	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_63[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3B7D, 0x594C,      0,      0,      0,      0, 0x3B58, /* 0x00 */
-    0x594D, 0x3044,      0,      0, 0x5948,      0,      0,      0, /* 0x00 */
-         0, 0x4429,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0x3573,      0,      0,      0,      0,      0, 0x3634, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0x594B, /* 0x20 */
-    0x3027,      0,      0, 0x3A43,      0,      0,      0, 0x3F36, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0x4472,      0,      0, 0x4854, 0x5951, 0x415E, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0x422A,      0,      0, 0x3B2B, 0x5952,      0, 0x5954, /* 0x40 */
-    0x5950,      0,      0,      0,      0, 0x4A61,      0, 0x443D, /* 0x50 */
-         0,      0,      0,      0, 0x415C,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0x4A7B, /* 0x60 */
-    0x3C4E, 0x5960,      0, 0x595F,      0,      0, 0x3F78,      0, /* 0x60 */
-         0,      0, 0x377E,      0,      0,      0, 0x5959, 0x3E39, /* 0x70 */
-         0,      0, 0x4668, 0x4731,      0,      0,      0,      0, /* 0x70 */
-    0x5957,      0,      0, 0x415D,      0,      0,      0,      0, /* 0x80 */
-    0x3C78, 0x595C,      0,      0, 0x3E38,      0, 0x5956, 0x595B, /* 0x80 */
-         0,      0, 0x4753,      0,      0,      0, 0x5955,      0, /* 0x90 */
-    0x3721,      0,      0, 0x335D,      0,      0,      0, 0x595D, /* 0x90 */
-    0x4E2B, 0x3A4E, 0x4335, 0x595A,      0, 0x405C,      0, 0x3935, /* 0xA0 */
-    0x3F64, 0x3166, 0x413C, 0x5958, 0x3545,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x3747,      0, 0x444F, 0x595E,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x415F,      0,      0, 0x5961,      0, /* 0xB0 */
-    0x5963,      0,      0, 0x4237, 0x5969,      0, 0x5964,      0, /* 0xC0 */
-         0, 0x5966,      0,      0,      0,      0,      0, 0x4941, /* 0xC0 */
-    0x4473,      0, 0x5967,      0,      0,      0, 0x4D2C,      0, /* 0xD0 */
-         0,      0, 0x4D48, 0x3439,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x302E,      0, 0x5965,      0,      0,      0,      0, /* 0xE0 */
-         0, 0x5962,      0,      0,      0,      0, 0x3478,      0, /* 0xE0 */
-         0,      0,      0,      0, 0x3167,      0, 0x5968,      0, /* 0xF0 */
-         0,      0, 0x4D49                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3B7D, 0x594C, 	 0, 	 0, 	 0, 	 0, 0x3B58, /* 0x00 */
+    0x594D, 0x3044, 	 0, 	 0, 0x5948, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x4429, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x3573, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3634, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x594B, /* 0x20 */
+    0x3027, 	 0, 	 0, 0x3A43, 	 0, 	 0, 	 0, 0x3F36, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x4472, 	 0, 	 0, 0x4854, 0x5951, 0x415E, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x422A, 	 0, 	 0, 0x3B2B, 0x5952, 	 0, 0x5954, /* 0x40 */
+    0x5950, 	 0, 	 0, 	 0, 	 0, 0x4A61, 	 0, 0x443D, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x415C, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4A7B, /* 0x60 */
+    0x3C4E, 0x5960, 	 0, 0x595F, 	 0, 	 0, 0x3F78, 	 0, /* 0x60 */
+         0, 	 0, 0x377E, 	 0, 	 0, 	 0, 0x5959, 0x3E39, /* 0x70 */
+         0, 	 0, 0x4668, 0x4731, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x5957, 	 0, 	 0, 0x415D, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x3C78, 0x595C, 	 0, 	 0, 0x3E38, 	 0, 0x5956, 0x595B, /* 0x80 */
+         0, 	 0, 0x4753, 	 0, 	 0, 	 0, 0x5955, 	 0, /* 0x90 */
+    0x3721, 	 0, 	 0, 0x335D, 	 0, 	 0, 	 0, 0x595D, /* 0x90 */
+    0x4E2B, 0x3A4E, 0x4335, 0x595A, 	 0, 0x405C, 	 0, 0x3935, /* 0xA0 */
+    0x3F64, 0x3166, 0x413C, 0x5958, 0x3545, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x3747, 	 0, 0x444F, 0x595E, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x415F, 	 0, 	 0, 0x5961, 	 0, /* 0xB0 */
+    0x5963, 	 0, 	 0, 0x4237, 0x5969, 	 0, 0x5964, 	 0, /* 0xC0 */
+         0, 0x5966, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4941, /* 0xC0 */
+    0x4473, 	 0, 0x5967, 	 0, 	 0, 	 0, 0x4D2C, 	 0, /* 0xD0 */
+         0, 	 0, 0x4D48, 0x3439, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x302E, 	 0, 0x5965, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x5962, 	 0, 	 0, 	 0, 	 0, 0x3478, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x3167, 	 0, 0x5968, 	 0, /* 0xF0 */
+         0, 	 0, 0x4D49											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_64[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0x596C,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0x423B,      0, 0x5973, /* 0x00 */
-         0,      0,      0, 0x596D,      0,      0, 0x596A, 0x5971, /* 0x10 */
-         0,      0,      0,      0, 0x5953,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x596E,      0, /* 0x20 */
-    0x5972,      0,      0,      0, 0x4842, 0x456B,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0x596B,      0, 0x596F,      0, /* 0x30 */
-         0,      0, 0x3748,      0,      0,      0, 0x3A71,      0, /* 0x30 */
-         0,      0, 0x405D,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0x5977,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0x4526,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0x5974, /* 0x60 */
-         0, 0x4B60,      0,      0,      0,      0,      0, 0x5975, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0x5976,      0, /* 0x70 */
-    0x4C4E,      0, 0x4022,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0x3762,      0,      0,      0,      0, /* 0x80 */
-    0x597D,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0x3B35, 0x597A,      0, 0x5979,      0,      0, /* 0x90 */
-         0,      0, 0x4732,      0,      0,      0, 0x4635,      0, /* 0x90 */
-         0,      0,      0,      0, 0x4531, 0x597B,      0,      0, /* 0xA0 */
-         0, 0x597C,      0, 0x496F,      0, 0x4745, 0x3B23,      0, /* 0xA0 */
-    0x4071,      0, 0x4B50,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x3349,      0, 0x5A25, 0x597E,      0,      0,      0, /* 0xB0 */
-         0, 0x4D4A, 0x5A27,      0,      0, 0x5A23,      0, 0x5A24, /* 0xC0 */
-         0,      0,      0,      0,      0, 0x4160,      0,      0, /* 0xC0 */
-         0,      0, 0x5A22,      0, 0x593F,      0,      0,      0, /* 0xD0 */
-    0x5A26,      0, 0x5A21,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x5A2B, 0x5A2C, 0x4527, 0x5A2E,      0,      0, 0x3B24, 0x5A29, /* 0xE0 */
-         0,      0,      0,      0, 0x353C,      0,      0, 0x5A2F, /* 0xE0 */
-         0, 0x5A28, 0x5A33,      0, 0x5A32,      0, 0x5A31,      0, /* 0xF0 */
-         0,      0, 0x5A34,      0,      0, 0x5A36, 0x3E71          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0x596C, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x423B, 	 0, 0x5973, /* 0x00 */
+         0, 	 0, 	 0, 0x596D, 	 0, 	 0, 0x596A, 0x5971, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x5953, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x596E, 	 0, /* 0x20 */
+    0x5972, 	 0, 	 0, 	 0, 0x4842, 0x456B, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x596B, 	 0, 0x596F, 	 0, /* 0x30 */
+         0, 	 0, 0x3748, 	 0, 	 0, 	 0, 0x3A71, 	 0, /* 0x30 */
+         0, 	 0, 0x405D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5977, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x4526, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5974, /* 0x60 */
+         0, 0x4B60, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5975, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5976, 	 0, /* 0x70 */
+    0x4C4E, 	 0, 0x4022, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x3762, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x597D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x3B35, 0x597A, 	 0, 0x5979, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x4732, 	 0, 	 0, 	 0, 0x4635, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x4531, 0x597B, 	 0, 	 0, /* 0xA0 */
+         0, 0x597C, 	 0, 0x496F, 	 0, 0x4745, 0x3B23, 	 0, /* 0xA0 */
+    0x4071, 	 0, 0x4B50, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x3349, 	 0, 0x5A25, 0x597E, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x4D4A, 0x5A27, 	 0, 	 0, 0x5A23, 	 0, 0x5A24, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4160, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x5A22, 	 0, 0x593F, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x5A26, 	 0, 0x5A21, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x5A2B, 0x5A2C, 0x4527, 0x5A2E, 	 0, 	 0, 0x3B24, 0x5A29, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x353C, 	 0, 	 0, 0x5A2F, /* 0xE0 */
+         0, 0x5A28, 0x5A33, 	 0, 0x5A32, 	 0, 0x5A31, 	 0, /* 0xF0 */
+         0, 	 0, 0x5A34, 	 0, 	 0, 0x5A36, 0x3E71			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_65[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x5A35,      0,      0,      0,      0, 0x5A39,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0x5A37,      0,      0,      0, 0x5A38, 0x5970,      0,      0, /* 0x10 */
-         0,      0,      0, 0x5A3B, 0x5A3A,      0,      0,      0, /* 0x20 */
-         0,      0, 0x5978, 0x5A3C, 0x5A30,      0,      0, 0x3B59, /* 0x20 */
-         0,      0,      0,      0, 0x5A3D, 0x5A3E, 0x5A40, 0x5A3F, /* 0x30 */
-    0x5A41, 0x327E,      0, 0x3936,      0,      0, 0x4A7C, 0x402F, /* 0x30 */
-         0,      0,      0,      0,      0, 0x384E,      0,      0, /* 0x40 */
-    0x5A43,      0,      0,      0,      0, 0x5A46,      0, 0x4952, /* 0x40 */
-         0, 0x355F,      0,      0,      0, 0x5A45, 0x5A44, 0x4754, /* 0x50 */
-    0x5A47, 0x3635,      0,      0,      0, 0x5A49, 0x5A48,      0, /* 0x50 */
-         0,      0, 0x343A, 0x3B36,      0,      0, 0x4658,      0, /* 0x60 */
-         0,      0,      0,      0, 0x3749,      0,      0,      0, /* 0x60 */
-    0x3F74,      0, 0x5A4A,      0, 0x4030, 0x4528,      0, 0x495F, /* 0x70 */
-    0x5A4B,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x5A4C, 0x5A4D,      0,      0,      0, 0x4A38, /* 0x80 */
-    0x555D, 0x4046,      0,      0, 0x494C,      0, 0x3A58,      0, /* 0x80 */
-    0x4865, 0x4843,      0,      0,      0,      0,      0, 0x454D, /* 0x90 */
-         0, 0x4E41,      0, 0x5A4F, 0x3C50,      0,      0, 0x5A50, /* 0x90 */
-         0, 0x3036,      0,      0, 0x3654, 0x404D,      0, 0x4960, /* 0xA0 */
-         0,      0,      0, 0x5A51, 0x3B42, 0x4347,      0, 0x3B5B, /* 0xA0 */
-    0x3F37,      0,      0,      0,      0,      0,      0, 0x5A52, /* 0xB0 */
-         0, 0x4A7D,      0,      0, 0x3177, 0x3B5C,      0,      0, /* 0xB0 */
-         0, 0x5A55,      0, 0x5A53, 0x5A56, 0x4E39, 0x5A54,      0, /* 0xC0 */
-         0,      0,      0, 0x407B, 0x5A57,      0,      0, 0x4232, /* 0xC0 */
-         0,      0, 0x5A58,      0,      0,      0,      0, 0x347A, /* 0xD0 */
-         0, 0x5A5A,      0, 0x5A59,      0,      0,      0,      0, /* 0xD0 */
-    0x5A5B, 0x5A5C, 0x347B,      0,      0, 0x467C, 0x4336, 0x356C, /* 0xE0 */
-    0x3B5D, 0x4161,      0,      0, 0x3D5C, 0x3030,      0,      0, /* 0xE0 */
-         0, 0x5A5D,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x3222, 0x5A61                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x5A35, 	 0, 	 0, 	 0, 	 0, 0x5A39, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x5A37, 	 0, 	 0, 	 0, 0x5A38, 0x5970, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x5A3B, 0x5A3A, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x5978, 0x5A3C, 0x5A30, 	 0, 	 0, 0x3B59, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x5A3D, 0x5A3E, 0x5A40, 0x5A3F, /* 0x30 */
+    0x5A41, 0x327E, 	 0, 0x3936, 	 0, 	 0, 0x4A7C, 0x402F, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x384E, 	 0, 	 0, /* 0x40 */
+    0x5A43, 	 0, 	 0, 	 0, 	 0, 0x5A46, 	 0, 0x4952, /* 0x40 */
+         0, 0x355F, 	 0, 	 0, 	 0, 0x5A45, 0x5A44, 0x4754, /* 0x50 */
+    0x5A47, 0x3635, 	 0, 	 0, 	 0, 0x5A49, 0x5A48, 	 0, /* 0x50 */
+         0, 	 0, 0x343A, 0x3B36, 	 0, 	 0, 0x4658, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x3749, 	 0, 	 0, 	 0, /* 0x60 */
+    0x3F74, 	 0, 0x5A4A, 	 0, 0x4030, 0x4528, 	 0, 0x495F, /* 0x70 */
+    0x5A4B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x5A4C, 0x5A4D, 	 0, 	 0, 	 0, 0x4A38, /* 0x80 */
+    0x555D, 0x4046, 	 0, 	 0, 0x494C, 	 0, 0x3A58, 	 0, /* 0x80 */
+    0x4865, 0x4843, 	 0, 	 0, 	 0, 	 0, 	 0, 0x454D, /* 0x90 */
+         0, 0x4E41, 	 0, 0x5A4F, 0x3C50, 	 0, 	 0, 0x5A50, /* 0x90 */
+         0, 0x3036, 	 0, 	 0, 0x3654, 0x404D, 	 0, 0x4960, /* 0xA0 */
+         0, 	 0, 	 0, 0x5A51, 0x3B42, 0x4347, 	 0, 0x3B5B, /* 0xA0 */
+    0x3F37, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5A52, /* 0xB0 */
+         0, 0x4A7D, 	 0, 	 0, 0x3177, 0x3B5C, 	 0, 	 0, /* 0xB0 */
+         0, 0x5A55, 	 0, 0x5A53, 0x5A56, 0x4E39, 0x5A54, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x407B, 0x5A57, 	 0, 	 0, 0x4232, /* 0xC0 */
+         0, 	 0, 0x5A58, 	 0, 	 0, 	 0, 	 0, 0x347A, /* 0xD0 */
+         0, 0x5A5A, 	 0, 0x5A59, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x5A5B, 0x5A5C, 0x347B, 	 0, 	 0, 0x467C, 0x4336, 0x356C, /* 0xE0 */
+    0x3B5D, 0x4161, 	 0, 	 0, 0x3D5C, 0x3030, 	 0, 	 0, /* 0xE0 */
+         0, 0x5A5D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x3222, 0x5A61									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_66[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x3937, 0x5A60,      0,      0, 0x3A2B, 0x3E3A, /* 0x00 */
-         0,      0, 0x5A5F,      0, 0x3E3B,      0, 0x4C40, 0x3A2A, /* 0x00 */
-         0,      0,      0, 0x3057, 0x404E,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0x5A66,      0,      0, 0x4031, /* 0x10 */
-    0x3147,      0,      0,      0,      0, 0x3D55,      0, 0x4B66, /* 0x20 */
-    0x3A72,      0,      0,      0,      0, 0x3E3C,      0, 0x4027, /* 0x20 */
-         0,      0,      0,      0, 0x5A65, 0x5A63, 0x5A64,      0, /* 0x30 */
-         0,      0,      0,      0, 0x436B,      0,      0, 0x5B26, /* 0x30 */
-         0, 0x5A6A, 0x3B7E, 0x3938, 0x5A68,      0,      0,      0, /* 0x40 */
-         0, 0x5A69,      0, 0x3F38,      0,      0,      0, 0x5A67, /* 0x40 */
-         0,      0, 0x3B2F,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0x5A6C, 0x5A6B, 0x5A70, /* 0x50 */
-         0,      0, 0x5A71,      0, 0x5A6D,      0, 0x3322, 0x5A6E, /* 0x60 */
-    0x5A6F, 0x4855,      0,      0,      0,      0, 0x4961, 0x374A, /* 0x60 */
-    0x5A72,      0,      0,      0, 0x4032,      0, 0x3E3D,      0, /* 0x70 */
-         0,      0, 0x4352,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x3647,      0, 0x5A73, 0x5A77,      0,      0, 0x324B, /* 0x80 */
-    0x5A74, 0x5A76,      0,      0,      0,      0, 0x5A75,      0, /* 0x80 */
-         0, 0x3D6B,      0,      0,      0,      0, 0x4348, 0x3045, /* 0x90 */
-    0x5A78,      0,      0,      0,      0, 0x5A79,      0,      0, /* 0x90 */
-         0,      0, 0x442A,      0,      0,      0, 0x4E71,      0, /* 0xA0 */
-         0,      0,      0, 0x3B43,      0,      0, 0x4A6B,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x4B3D,      0,      0,      0, /* 0xB0 */
-    0x5B22, 0x5A7B,      0,      0, 0x5A7E,      0, 0x5A7D,      0, /* 0xB0 */
-         0, 0x5A7A,      0,      0, 0x5B21,      0,      0, 0x465E, /* 0xC0 */
-         0, 0x5A7C,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0x5B23,      0, /* 0xD0 */
-         0, 0x3D6C, 0x5B24,      0, 0x4D4B, 0x4778,      0,      0, /* 0xD0 */
-    0x5B25,      0,      0,      0,      0,      0, 0x5B27,      0, /* 0xE0 */
-         0, 0x5B28,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x5B29,      0, 0x364A, 0x3148, 0x3939, 0x5B2A,      0, 0x5B2B, /* 0xF0 */
-    0x3D71, 0x4162,      0,      0, 0x5258, 0x413E, 0x413D, 0x4258  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x3937, 0x5A60, 	 0, 	 0, 0x3A2B, 0x3E3A, /* 0x00 */
+         0, 	 0, 0x5A5F, 	 0, 0x3E3B, 	 0, 0x4C40, 0x3A2A, /* 0x00 */
+         0, 	 0, 	 0, 0x3057, 0x404E, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x5A66, 	 0, 	 0, 0x4031, /* 0x10 */
+    0x3147, 	 0, 	 0, 	 0, 	 0, 0x3D55, 	 0, 0x4B66, /* 0x20 */
+    0x3A72, 	 0, 	 0, 	 0, 	 0, 0x3E3C, 	 0, 0x4027, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x5A65, 0x5A63, 0x5A64, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x436B, 	 0, 	 0, 0x5B26, /* 0x30 */
+         0, 0x5A6A, 0x3B7E, 0x3938, 0x5A68, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x5A69, 	 0, 0x3F38, 	 0, 	 0, 	 0, 0x5A67, /* 0x40 */
+         0, 	 0, 0x3B2F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5A6C, 0x5A6B, 0x5A70, /* 0x50 */
+         0, 	 0, 0x5A71, 	 0, 0x5A6D, 	 0, 0x3322, 0x5A6E, /* 0x60 */
+    0x5A6F, 0x4855, 	 0, 	 0, 	 0, 	 0, 0x4961, 0x374A, /* 0x60 */
+    0x5A72, 	 0, 	 0, 	 0, 0x4032, 	 0, 0x3E3D, 	 0, /* 0x70 */
+         0, 	 0, 0x4352, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x3647, 	 0, 0x5A73, 0x5A77, 	 0, 	 0, 0x324B, /* 0x80 */
+    0x5A74, 0x5A76, 	 0, 	 0, 	 0, 	 0, 0x5A75, 	 0, /* 0x80 */
+         0, 0x3D6B, 	 0, 	 0, 	 0, 	 0, 0x4348, 0x3045, /* 0x90 */
+    0x5A78, 	 0, 	 0, 	 0, 	 0, 0x5A79, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x442A, 	 0, 	 0, 	 0, 0x4E71, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x3B43, 	 0, 	 0, 0x4A6B, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x4B3D, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x5B22, 0x5A7B, 	 0, 	 0, 0x5A7E, 	 0, 0x5A7D, 	 0, /* 0xB0 */
+         0, 0x5A7A, 	 0, 	 0, 0x5B21, 	 0, 	 0, 0x465E, /* 0xC0 */
+         0, 0x5A7C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5B23, 	 0, /* 0xD0 */
+         0, 0x3D6C, 0x5B24, 	 0, 0x4D4B, 0x4778, 	 0, 	 0, /* 0xD0 */
+    0x5B25, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5B27, 	 0, /* 0xE0 */
+         0, 0x5B28, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x5B29, 	 0, 0x364A, 0x3148, 0x3939, 0x5B2A, 	 0, 0x5B2B, /* 0xF0 */
+    0x3D71, 0x4162, 	 0, 	 0, 0x5258, 0x413E, 0x413D, 0x4258	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_67[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x3A47,      0,      0, 0x5072,      0,      0,      0,      0, /* 0x00 */
-    0x376E, 0x4D2D,      0, 0x4A7E,      0, 0x497E,      0, 0x5B2C, /* 0x00 */
-         0,      0,      0,      0, 0x3A73, 0x443F, 0x5B2D, 0x4F2F, /* 0x10 */
-         0,      0,      0, 0x4B3E,      0, 0x442B, 0x5B2E, 0x347C, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x5B2F, 0x5B30, /* 0x20 */
-    0x4C5A,      0, 0x4C24, 0x4B76, 0x4B5C, 0x3B25, 0x5B32,      0, /* 0x20 */
-         0, 0x3C6B,      0,      0, 0x4B51,      0, 0x5B34, 0x5B37, /* 0x30 */
-    0x5B36,      0, 0x3479,      0,      0, 0x3560,      0, 0x5B33, /* 0x30 */
-         0, 0x5B35,      0,      0,      0,      0, 0x5B38,      0, /* 0x40 */
-         0, 0x3F79,      0,      0,      0,      0, 0x4D7B, 0x3049, /* 0x40 */
-    0x3A60, 0x423C,      0, 0x3C5D,      0,      0, 0x3E73,      0, /* 0x50 */
-         0, 0x5B3B,      0,      0, 0x454E,      0, 0x5B39, 0x422B, /* 0x50 */
-    0x5B3A, 0x3E72, 0x4C5D, 0x5B3C, 0x5B3D, 0x4D68,      0,      0, /* 0x60 */
-         0,      0, 0x5B42,      0,      0, 0x393A,      0, 0x4755, /* 0x60 */
-    0x5B3F, 0x456C, 0x5A5E, 0x5A62,      0, 0x354F,      0, 0x4747, /* 0x70 */
-         0,      0,      0,      0, 0x5B41,      0, 0x3E3E, 0x4844, /* 0x70 */
-         0,      0,      0,      0,      0, 0x5B47,      0, 0x487A, /* 0x80 */
-         0, 0x5B3E,      0, 0x5B44, 0x5B43,      0,      0,      0, /* 0x80 */
-    0x404F,      0,      0,      0,      0, 0x4B6D,      0, 0x4E53, /* 0x90 */
-         0,      0, 0x4B67,      0, 0x324C, 0x3B5E,      0,      0, /* 0x90 */
-    0x4F48, 0x5B46, 0x3F75,      0,      0,      0, 0x5B45,      0, /* 0xA0 */
-         0, 0x5B40,      0,      0,      0,      0,      0, 0x384F, /* 0xA0 */
-         0,      0,      0, 0x5B4C, 0x5B4A,      0, 0x324D, 0x5B48, /* 0xB0 */
-    0x5B4E, 0x5B54,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x4248,      0,      0, 0x4A41,      0, 0x5B56,      0, /* 0xC0 */
-         0,      0, 0x4922,      0,      0,      0, 0x5B55, 0x4770, /* 0xC0 */
-    0x4B3F, 0x343B,      0, 0x4077, 0x3D40,      0,      0,      0, /* 0xD0 */
-    0x4453,      0, 0x4D2E,      0,      0, 0x5B51, 0x5B50,      0, /* 0xD0 */
-         0,      0, 0x5B52,      0, 0x5B4F,      0,      0, 0x5B57, /* 0xE0 */
-         0, 0x5B4D,      0,      0, 0x5B4B,      0, 0x5B53, 0x5B49, /* 0xE0 */
-         0, 0x436C,      0, 0x4C78, 0x3C46, 0x3A74,      0,      0, /* 0xF0 */
-         0,      0,      0, 0x3A3A,      0,      0, 0x4B6F, 0x3341  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x3A47, 	 0, 	 0, 0x5072, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0x376E, 0x4D2D, 	 0, 0x4A7E, 	 0, 0x497E, 	 0, 0x5B2C, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x3A73, 0x443F, 0x5B2D, 0x4F2F, /* 0x10 */
+         0, 	 0, 	 0, 0x4B3E, 	 0, 0x442B, 0x5B2E, 0x347C, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5B2F, 0x5B30, /* 0x20 */
+    0x4C5A, 	 0, 0x4C24, 0x4B76, 0x4B5C, 0x3B25, 0x5B32, 	 0, /* 0x20 */
+         0, 0x3C6B, 	 0, 	 0, 0x4B51, 	 0, 0x5B34, 0x5B37, /* 0x30 */
+    0x5B36, 	 0, 0x3479, 	 0, 	 0, 0x3560, 	 0, 0x5B33, /* 0x30 */
+         0, 0x5B35, 	 0, 	 0, 	 0, 	 0, 0x5B38, 	 0, /* 0x40 */
+         0, 0x3F79, 	 0, 	 0, 	 0, 	 0, 0x4D7B, 0x3049, /* 0x40 */
+    0x3A60, 0x423C, 	 0, 0x3C5D, 	 0, 	 0, 0x3E73, 	 0, /* 0x50 */
+         0, 0x5B3B, 	 0, 	 0, 0x454E, 	 0, 0x5B39, 0x422B, /* 0x50 */
+    0x5B3A, 0x3E72, 0x4C5D, 0x5B3C, 0x5B3D, 0x4D68, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x5B42, 	 0, 	 0, 0x393A, 	 0, 0x4755, /* 0x60 */
+    0x5B3F, 0x456C, 0x5A5E, 0x5A62, 	 0, 0x354F, 	 0, 0x4747, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0x5B41, 	 0, 0x3E3E, 0x4844, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5B47, 	 0, 0x487A, /* 0x80 */
+         0, 0x5B3E, 	 0, 0x5B44, 0x5B43, 	 0, 	 0, 	 0, /* 0x80 */
+    0x404F, 	 0, 	 0, 	 0, 	 0, 0x4B6D, 	 0, 0x4E53, /* 0x90 */
+         0, 	 0, 0x4B67, 	 0, 0x324C, 0x3B5E, 	 0, 	 0, /* 0x90 */
+    0x4F48, 0x5B46, 0x3F75, 	 0, 	 0, 	 0, 0x5B45, 	 0, /* 0xA0 */
+         0, 0x5B40, 	 0, 	 0, 	 0, 	 0, 	 0, 0x384F, /* 0xA0 */
+         0, 	 0, 	 0, 0x5B4C, 0x5B4A, 	 0, 0x324D, 0x5B48, /* 0xB0 */
+    0x5B4E, 0x5B54, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x4248, 	 0, 	 0, 0x4A41, 	 0, 0x5B56, 	 0, /* 0xC0 */
+         0, 	 0, 0x4922, 	 0, 	 0, 	 0, 0x5B55, 0x4770, /* 0xC0 */
+    0x4B3F, 0x343B, 	 0, 0x4077, 0x3D40, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x4453, 	 0, 0x4D2E, 	 0, 	 0, 0x5B51, 0x5B50, 	 0, /* 0xD0 */
+         0, 	 0, 0x5B52, 	 0, 0x5B4F, 	 0, 	 0, 0x5B57, /* 0xE0 */
+         0, 0x5B4D, 	 0, 	 0, 0x5B4B, 	 0, 0x5B53, 0x5B49, /* 0xE0 */
+         0, 0x436C, 	 0, 0x4C78, 0x3C46, 0x3A74, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0x3A3A, 	 0, 	 0, 0x4B6F, 0x3341	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_68[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x444E, 0x464A, 0x3149,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0x4072,      0,      0, 0x4034, 0x372A, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x5B59,      0, /* 0x10 */
-         0, 0x393B, 0x337C,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0x5B5B, 0x3374, 0x5B61,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x5B5E,      0, 0x4073,      0,      0,      0, /* 0x30 */
-    0x334B, 0x3A2C,      0,      0, 0x334A, 0x3A4F,      0,      0, /* 0x30 */
-    0x5B5C, 0x3765, 0x374B, 0x456D,      0,      0, 0x5B5A,      0, /* 0x40 */
-    0x3046,      0,      0,      0,      0, 0x5B5D, 0x5B5F,      0, /* 0x40 */
-    0x364D, 0x372C,      0, 0x343C, 0x354B,      0,      0,      0, /* 0x50 */
-         0, 0x5B62,      0,      0, 0x3A79, 0x4B71,      0, 0x3B37, /* 0x50 */
-         0,      0,      0, 0x5B63,      0,      0,      0, 0x4930, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0x5B6F,      0, 0x3233, 0x5B64, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x5B75, 0x5B65, /* 0x70 */
-         0, 0x4E42,      0, 0x5B6C,      0, 0x475F,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x5B74,      0, 0x5B67, /* 0x80 */
-         0,      0,      0, 0x3034, 0x5B69,      0,      0, 0x393C, /* 0x90 */
-         0,      0,      0, 0x5B6B,      0, 0x5B6A,      0, 0x5B66, /* 0x90 */
-    0x5B71,      0, 0x3E3F,      0,      0,      0, 0x546D, 0x3868, /* 0xA0 */
-    0x4D7C,      0,      0,      0,      0, 0x5B68,      0, 0x4474, /* 0xA0 */
-    0x3323, 0x3A2D,      0, 0x5B60,      0, 0x5B70, 0x3361,      0, /* 0xB0 */
-         0, 0x5B6E, 0x5B72,      0, 0x456E,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x347E,      0, 0x5C32,      0, /* 0xC0 */
-         0, 0x4C49, 0x5B77, 0x347D,      0, 0x5B7E,      0,      0, /* 0xC0 */
-         0,      0, 0x4B40,      0, 0x5C21, 0x5C23,      0, 0x5C27, /* 0xD0 */
-    0x5B79,      0, 0x432A,      0,      0,      0,      0, 0x456F, /* 0xD0 */
-    0x5C2B, 0x5B7C,      0, 0x5C28,      0,      0,      0, 0x5C22, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0x3F39, 0x5C2C, /* 0xE0 */
-         0,      0, 0x4033,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0x5C2A, 0x343D                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x444E, 0x464A, 0x3149, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x4072, 	 0, 	 0, 0x4034, 0x372A, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5B59, 	 0, /* 0x10 */
+         0, 0x393B, 0x337C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x5B5B, 0x3374, 0x5B61, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x5B5E, 	 0, 0x4073, 	 0, 	 0, 	 0, /* 0x30 */
+    0x334B, 0x3A2C, 	 0, 	 0, 0x334A, 0x3A4F, 	 0, 	 0, /* 0x30 */
+    0x5B5C, 0x3765, 0x374B, 0x456D, 	 0, 	 0, 0x5B5A, 	 0, /* 0x40 */
+    0x3046, 	 0, 	 0, 	 0, 	 0, 0x5B5D, 0x5B5F, 	 0, /* 0x40 */
+    0x364D, 0x372C, 	 0, 0x343C, 0x354B, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x5B62, 	 0, 	 0, 0x3A79, 0x4B71, 	 0, 0x3B37, /* 0x50 */
+         0, 	 0, 	 0, 0x5B63, 	 0, 	 0, 	 0, 0x4930, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x5B6F, 	 0, 0x3233, 0x5B64, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5B75, 0x5B65, /* 0x70 */
+         0, 0x4E42, 	 0, 0x5B6C, 	 0, 0x475F, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5B74, 	 0, 0x5B67, /* 0x80 */
+         0, 	 0, 	 0, 0x3034, 0x5B69, 	 0, 	 0, 0x393C, /* 0x90 */
+         0, 	 0, 	 0, 0x5B6B, 	 0, 0x5B6A, 	 0, 0x5B66, /* 0x90 */
+    0x5B71, 	 0, 0x3E3F, 	 0, 	 0, 	 0, 0x546D, 0x3868, /* 0xA0 */
+    0x4D7C, 	 0, 	 0, 	 0, 	 0, 0x5B68, 	 0, 0x4474, /* 0xA0 */
+    0x3323, 0x3A2D, 	 0, 0x5B60, 	 0, 0x5B70, 0x3361, 	 0, /* 0xB0 */
+         0, 0x5B6E, 0x5B72, 	 0, 0x456E, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x347E, 	 0, 0x5C32, 	 0, /* 0xC0 */
+         0, 0x4C49, 0x5B77, 0x347D, 	 0, 0x5B7E, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x4B40, 	 0, 0x5C21, 0x5C23, 	 0, 0x5C27, /* 0xD0 */
+    0x5B79, 	 0, 0x432A, 	 0, 	 0, 	 0, 	 0, 0x456F, /* 0xD0 */
+    0x5C2B, 0x5B7C, 	 0, 0x5C28, 	 0, 	 0, 	 0, 0x5C22, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3F39, 0x5C2C, /* 0xE0 */
+         0, 	 0, 0x4033, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0x5C2A, 0x343D											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_69[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x4F50, 0x5B76,      0,      0, 0x5C26, 0x3058,      0,      0, /* 0x00 */
-    0x5B78,      0,      0, 0x4C3A, 0x5B7D, 0x3F22, 0x4447, 0x5B73, /* 0x00 */
-         0,      0, 0x5C25,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0x3F7A, 0x5C2F, 0x3371, 0x3821,      0,      0,      0, /* 0x10 */
-         0, 0x5C31, 0x5B7A, 0x5C30,      0, 0x5C29, 0x5B7B,      0, /* 0x20 */
-    0x5C2D,      0, 0x5C2E,      0,      0,      0,      0,      0, /* 0x20 */
-    0x5C3F,      0,      0,      0, 0x464E,      0, 0x5C24,      0, /* 0x30 */
-         0, 0x5C3B,      0,      0,      0, 0x5C3D,      0, 0x4458, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x4D4C,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0x4976, 0x5C38, 0x424A,      0,      0, /* 0x50 */
-         0, 0x5C3E, 0x413F,      0, 0x5C35, 0x5C42, 0x5C41,      0, /* 0x50 */
-    0x466F, 0x5C40, 0x466A,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0x5C44, 0x5C37,      0, 0x3648, 0x5C3A, 0x3D5D, /* 0x60 */
-         0,      0,      0, 0x4760, 0x5C3C, 0x364B,      0, 0x5C34, /* 0x70 */
-    0x5C36, 0x5C33,      0,      0, 0x4F30, 0x335A, 0x5C39,      0, /* 0x70 */
-         0, 0x5C43, 0x3335,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0x3A67,      0,      0,      0, 0x315D,      0, /* 0x80 */
-         0, 0x5C54,      0,      0, 0x4F31, 0x5C57,      0,      0, /* 0x90 */
-         0,      0,      0, 0x3F3A, 0x5C56,      0,      0,      0, /* 0x90 */
-    0x5C55,      0,      0,      0,      0,      0,      0, 0x5C52, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0x5C46,      0, /* 0xA0 */
-         0, 0x5C63, 0x5C45,      0, 0x5C58,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x5C50,      0,      0, 0x5C4B, 0x5C48, /* 0xB0 */
-         0, 0x5C49,      0, 0x5C51,      0,      0,      0, 0x7422, /* 0xC0 */
-         0,      0, 0x5C4E, 0x393D, 0x4448, 0x4164, 0x5C4C,      0, /* 0xC0 */
-    0x5C47,      0,      0, 0x5C4A,      0,      0,      0,      0, /* 0xD0 */
-    0x4D4D, 0x4B6A,      0,      0,      0, 0x5C4F, 0x5C59,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0x5C61, /* 0xE0 */
-    0x5C5A,      0,      0, 0x5C67,      0, 0x5C65,      0,      0, /* 0xE0 */
-         0,      0, 0x5C60,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0x5C5F,      0, 0x4450,      0, 0x4165,      0, 0x5C5D  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x4F50, 0x5B76, 	 0, 	 0, 0x5C26, 0x3058, 	 0, 	 0, /* 0x00 */
+    0x5B78, 	 0, 	 0, 0x4C3A, 0x5B7D, 0x3F22, 0x4447, 0x5B73, /* 0x00 */
+         0, 	 0, 0x5C25, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x3F7A, 0x5C2F, 0x3371, 0x3821, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x5C31, 0x5B7A, 0x5C30, 	 0, 0x5C29, 0x5B7B, 	 0, /* 0x20 */
+    0x5C2D, 	 0, 0x5C2E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x5C3F, 	 0, 	 0, 	 0, 0x464E, 	 0, 0x5C24, 	 0, /* 0x30 */
+         0, 0x5C3B, 	 0, 	 0, 	 0, 0x5C3D, 	 0, 0x4458, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x4D4C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x4976, 0x5C38, 0x424A, 	 0, 	 0, /* 0x50 */
+         0, 0x5C3E, 0x413F, 	 0, 0x5C35, 0x5C42, 0x5C41, 	 0, /* 0x50 */
+    0x466F, 0x5C40, 0x466A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x5C44, 0x5C37, 	 0, 0x3648, 0x5C3A, 0x3D5D, /* 0x60 */
+         0, 	 0, 	 0, 0x4760, 0x5C3C, 0x364B, 	 0, 0x5C34, /* 0x70 */
+    0x5C36, 0x5C33, 	 0, 	 0, 0x4F30, 0x335A, 0x5C39, 	 0, /* 0x70 */
+         0, 0x5C43, 0x3335, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x3A67, 	 0, 	 0, 	 0, 0x315D, 	 0, /* 0x80 */
+         0, 0x5C54, 	 0, 	 0, 0x4F31, 0x5C57, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x3F3A, 0x5C56, 	 0, 	 0, 	 0, /* 0x90 */
+    0x5C55, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5C52, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5C46, 	 0, /* 0xA0 */
+         0, 0x5C63, 0x5C45, 	 0, 0x5C58, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x5C50, 	 0, 	 0, 0x5C4B, 0x5C48, /* 0xB0 */
+         0, 0x5C49, 	 0, 0x5C51, 	 0, 	 0, 	 0, 0x7422, /* 0xC0 */
+         0, 	 0, 0x5C4E, 0x393D, 0x4448, 0x4164, 0x5C4C, 	 0, /* 0xC0 */
+    0x5C47, 	 0, 	 0, 0x5C4A, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x4D4D, 0x4B6A, 	 0, 	 0, 	 0, 0x5C4F, 0x5C59, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5C61, /* 0xE0 */
+    0x5C5A, 	 0, 	 0, 0x5C67, 	 0, 0x5C65, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x5C60, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0x5C5F, 	 0, 0x4450, 	 0, 0x4165, 	 0, 0x5C5D	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_6A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x5C5B,      0,      0, 0x5C62,      0,      0, /* 0x00 */
-         0,      0, 0x5C68, 0x4875, 0x5C6E,      0,      0,      0, /* 0x00 */
-         0,      0, 0x5C69, 0x5C6C, 0x5C66,      0,      0, 0x4374, /* 0x10 */
-         0, 0x4938,      0, 0x5C5C,      0,      0, 0x5C64, 0x3E40, /* 0x10 */
-         0, 0x4C4F, 0x5C78, 0x5C6B,      0,      0,      0,      0, /* 0x20 */
-         0, 0x3822, 0x3223, 0x335F,      0,      0, 0x5C53,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0x3E41, 0x5C70,      0, /* 0x30 */
-    0x5C77, 0x3C79, 0x3372,      0,      0, 0x432E,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0x5C6D,      0,      0, 0x5C72, /* 0x40 */
-    0x5C76,      0,      0, 0x3636,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0x354C, 0x5C74,      0,      0,      0,      0,      0, 0x3521, /* 0x50 */
-         0, 0x464B, 0x5C73,      0,      0,      0, 0x5C75,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0x5C6F,      0,      0,      0,      0,      0, /* 0x70 */
-    0x5C71,      0,      0,      0,      0,      0,      0, 0x3360, /* 0x70 */
-    0x4349,      0,      0,      0, 0x5C7C,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x5C7A, 0x3869,      0, /* 0x80 */
-    0x5C79,      0,      0,      0,      0,      0,      0, 0x5D21, /* 0x90 */
-         0,      0,      0,      0, 0x5B58,      0,      0,      0, /* 0x90 */
-    0x5C7B,      0, 0x5C7D, 0x5C7E,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x5D2C,      0, 0x5D28,      0, 0x5B6D,      0, /* 0xA0 */
-         0,      0,      0, 0x5D27,      0,      0,      0,      0, /* 0xB0 */
-    0x5D26,      0,      0, 0x5D23,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x5C6A, 0x5D25, 0x5D24,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x5D2A,      0, 0x4F26,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x5D2D, 0x367B,      0,      0, 0x5D29, 0x5D2B, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x4827,      0, 0x5D2E,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x5D32, 0x5D2F                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x5C5B, 	 0, 	 0, 0x5C62, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x5C68, 0x4875, 0x5C6E, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x5C69, 0x5C6C, 0x5C66, 	 0, 	 0, 0x4374, /* 0x10 */
+         0, 0x4938, 	 0, 0x5C5C, 	 0, 	 0, 0x5C64, 0x3E40, /* 0x10 */
+         0, 0x4C4F, 0x5C78, 0x5C6B, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x3822, 0x3223, 0x335F, 	 0, 	 0, 0x5C53, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3E41, 0x5C70, 	 0, /* 0x30 */
+    0x5C77, 0x3C79, 0x3372, 	 0, 	 0, 0x432E, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x5C6D, 	 0, 	 0, 0x5C72, /* 0x40 */
+    0x5C76, 	 0, 	 0, 0x3636, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x354C, 0x5C74, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3521, /* 0x50 */
+         0, 0x464B, 0x5C73, 	 0, 	 0, 	 0, 0x5C75, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x5C6F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x5C71, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3360, /* 0x70 */
+    0x4349, 	 0, 	 0, 	 0, 0x5C7C, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5C7A, 0x3869, 	 0, /* 0x80 */
+    0x5C79, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5D21, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x5B58, 	 0, 	 0, 	 0, /* 0x90 */
+    0x5C7B, 	 0, 0x5C7D, 0x5C7E, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x5D2C, 	 0, 0x5D28, 	 0, 0x5B6D, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x5D27, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x5D26, 	 0, 	 0, 0x5D23, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x5C6A, 0x5D25, 0x5D24, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x5D2A, 	 0, 0x4F26, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x5D2D, 0x367B, 	 0, 	 0, 0x5D29, 0x5D2B, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x4827, 	 0, 0x5D2E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x5D32, 0x5D2F									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_6B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0x4D73, 0x5D30,      0,      0, /* 0x00 */
-         0,      0, 0x5C5E,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0x5D33,      0,      0,      0, 0x5D34,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0x3135,      0, 0x5D36, /* 0x10 */
-    0x3767, 0x3C21,      0, 0x3655,      0,      0,      0, 0x3224, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x4D5F,      0,      0,      0,      0, 0x5D38, /* 0x30 */
-    0x5D37, 0x5D3A, 0x353D,      0,      0, 0x3656, 0x343E,      0, /* 0x30 */
-         0,      0,      0, 0x5D3D,      0,      0,      0, 0x5D3C, /* 0x40 */
-         0, 0x5D3E,      0,      0, 0x324E,      0, 0x4337,      0, /* 0x40 */
-    0x5D3F,      0,      0, 0x343F, 0x5D41,      0,      0,      0, /* 0x50 */
-         0, 0x5D40,      0, 0x5D42,      0,      0,      0, 0x5D43, /* 0x50 */
-         0, 0x5D44, 0x3B5F, 0x4035, 0x3A21,      0, 0x4970,      0, /* 0x60 */
-         0, 0x4A62, 0x4F44,      0,      0,      0,      0, 0x3B75, /* 0x60 */
-         0,      0,      0, 0x3A50, 0x4E72,      0,      0,      0, /* 0x70 */
-    0x5D45, 0x5D46,      0, 0x3B60,      0,      0,      0, 0x5D47, /* 0x70 */
-    0x5D48,      0,      0, 0x5D4A, 0x5D49,      0, 0x4B58,      0, /* 0x80 */
-         0, 0x3D5E, 0x3C6C, 0x3B44,      0, 0x5D4B,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x5D4D, 0x3F23,      0, /* 0x90 */
-    0x5D4C,      0,      0,      0,      0,      0, 0x5D4E,      0, /* 0x90 */
-         0,      0,      0,      0, 0x5D4F,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x5D50, 0x5D51,      0,      0,      0, 0x5D52, /* 0xA0 */
-         0, 0x5D54, 0x5D53, 0x5D55, 0x3225, 0x434A,      0, 0x5D56, /* 0xB0 */
-         0,      0, 0x3B26, 0x334C, 0x5D57,      0,      0, 0x4542, /* 0xB0 */
-    0x544C,      0,      0,      0,      0, 0x3523, 0x5D58,      0, /* 0xC0 */
-         0,      0,      0, 0x5D59,      0, 0x4A6C, 0x4B68,      0, /* 0xC0 */
-         0,      0, 0x4647, 0x5D5A, 0x4866,      0,      0,      0, /* 0xD0 */
-    0x487B,      0,      0, 0x4C53,      0,      0,      0, 0x5D5B, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x5D5D, 0x5D5C,      0,      0, 0x5D5F, /* 0xE0 */
-         0,      0,      0, 0x5D5E                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0x4D73, 0x5D30, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x5C5E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x5D33, 	 0, 	 0, 	 0, 0x5D34, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3135, 	 0, 0x5D36, /* 0x10 */
+    0x3767, 0x3C21, 	 0, 0x3655, 	 0, 	 0, 	 0, 0x3224, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x4D5F, 	 0, 	 0, 	 0, 	 0, 0x5D38, /* 0x30 */
+    0x5D37, 0x5D3A, 0x353D, 	 0, 	 0, 0x3656, 0x343E, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x5D3D, 	 0, 	 0, 	 0, 0x5D3C, /* 0x40 */
+         0, 0x5D3E, 	 0, 	 0, 0x324E, 	 0, 0x4337, 	 0, /* 0x40 */
+    0x5D3F, 	 0, 	 0, 0x343F, 0x5D41, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x5D40, 	 0, 0x5D42, 	 0, 	 0, 	 0, 0x5D43, /* 0x50 */
+         0, 0x5D44, 0x3B5F, 0x4035, 0x3A21, 	 0, 0x4970, 	 0, /* 0x60 */
+         0, 0x4A62, 0x4F44, 	 0, 	 0, 	 0, 	 0, 0x3B75, /* 0x60 */
+         0, 	 0, 	 0, 0x3A50, 0x4E72, 	 0, 	 0, 	 0, /* 0x70 */
+    0x5D45, 0x5D46, 	 0, 0x3B60, 	 0, 	 0, 	 0, 0x5D47, /* 0x70 */
+    0x5D48, 	 0, 	 0, 0x5D4A, 0x5D49, 	 0, 0x4B58, 	 0, /* 0x80 */
+         0, 0x3D5E, 0x3C6C, 0x3B44, 	 0, 0x5D4B, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5D4D, 0x3F23, 	 0, /* 0x90 */
+    0x5D4C, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5D4E, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x5D4F, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x5D50, 0x5D51, 	 0, 	 0, 	 0, 0x5D52, /* 0xA0 */
+         0, 0x5D54, 0x5D53, 0x5D55, 0x3225, 0x434A, 	 0, 0x5D56, /* 0xB0 */
+         0, 	 0, 0x3B26, 0x334C, 0x5D57, 	 0, 	 0, 0x4542, /* 0xB0 */
+    0x544C, 	 0, 	 0, 	 0, 	 0, 0x3523, 0x5D58, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x5D59, 	 0, 0x4A6C, 0x4B68, 	 0, /* 0xC0 */
+         0, 	 0, 0x4647, 0x5D5A, 0x4866, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x487B, 	 0, 	 0, 0x4C53, 	 0, 	 0, 	 0, 0x5D5B, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x5D5D, 0x5D5C, 	 0, 	 0, 0x5D5F, /* 0xE0 */
+         0, 	 0, 	 0, 0x5D5E									/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -1551,39 +1551,39 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_6B[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_6C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-    0x5D61,      0,      0,      0,      0,      0,      0, 0x3B61, /* 0x00 */
-         0, 0x4C31,      0, 0x5D62, 0x5D63,      0,      0, 0x3524, /* 0x10 */
-         0,      0,      0, 0x5D64,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0x5D66, 0x5D65,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0x3F65,      0,      0, 0x4939, /* 0x30 */
-    0x314A,      0,      0,      0,      0,      0, 0x4845,      0, /* 0x30 */
-    0x4475, 0x3D41, 0x3561,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0x4846,      0, /* 0x40 */
-    0x3C2E,      0,      0,      0,      0, 0x5D68,      0, 0x3440, /* 0x50 */
-         0,      0, 0x3178,      0,      0, 0x4672, 0x5D67, 0x393E, /* 0x50 */
-    0x4353,      0, 0x5D69,      0,      0,      0,      0,      0, /* 0x60 */
-    0x5D71,      0, 0x5D6A,      0,      0,      0,      0,      0, /* 0x60 */
-    0x4241,      0, 0x3562, 0x5D72,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x3768,      0,      0, 0x3525, 0x5D70,      0, /* 0x70 */
-         0, 0x5D6E, 0x5D6B, 0x4D60,      0,      0,      0,      0, /* 0x80 */
-    0x4440,      0,      0,      0, 0x4659, 0x5D6C,      0,      0, /* 0x80 */
-    0x5D74,      0, 0x5D73, 0x3723,      0,      0, 0x322D,      0, /* 0x90 */
-         0, 0x3A3B, 0x5D6D, 0x5D6F,      0,      0,      0,      0, /* 0x90 */
-         0, 0x4B57, 0x4274,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x4B77,      0,      0, 0x5D7C,      0, /* 0xA0 */
-         0, 0x5D7D,      0, 0x324F,      0,      0,      0,      0, /* 0xB0 */
+    0x5D61, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3B61, /* 0x00 */
+         0, 0x4C31, 	 0, 0x5D62, 0x5D63, 	 0, 	 0, 0x3524, /* 0x10 */
+         0, 	 0, 	 0, 0x5D64, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x5D66, 0x5D65, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x3F65, 	 0, 	 0, 0x4939, /* 0x30 */
+    0x314A, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4845, 	 0, /* 0x30 */
+    0x4475, 0x3D41, 0x3561, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4846, 	 0, /* 0x40 */
+    0x3C2E, 	 0, 	 0, 	 0, 	 0, 0x5D68, 	 0, 0x3440, /* 0x50 */
+         0, 	 0, 0x3178, 	 0, 	 0, 0x4672, 0x5D67, 0x393E, /* 0x50 */
+    0x4353, 	 0, 0x5D69, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x5D71, 	 0, 0x5D6A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x4241, 	 0, 0x3562, 0x5D72, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x3768, 	 0, 	 0, 0x3525, 0x5D70, 	 0, /* 0x70 */
+         0, 0x5D6E, 0x5D6B, 0x4D60, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x4440, 	 0, 	 0, 	 0, 0x4659, 0x5D6C, 	 0, 	 0, /* 0x80 */
+    0x5D74, 	 0, 0x5D73, 0x3723, 	 0, 	 0, 0x322D, 	 0, /* 0x90 */
+         0, 0x3A3B, 0x5D6D, 0x5D6F, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x4B57, 0x4274, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x4B77, 	 0, 	 0, 0x5D7C, 	 0, /* 0xA0 */
+         0, 0x5D7D, 	 0, 0x324F, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
     0x4A28, 0x4C7D, 0x5E21, 0x3C23, 0x3E42, 0x5D78, 0x5D7E, 0x3168, /* 0xB0 */
-         0, 0x3637,      0,      0, 0x5D75, 0x5D7A,      0,      0, /* 0xC0 */
-         0, 0x4074, 0x4771,      0, 0x4867,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0x5D77,      0, 0x4B21,      0, 0x5D79, /* 0xD0 */
-         0, 0x5E24,      0, 0x5E22,      0, 0x5D7B,      0,      0, /* 0xD0 */
-         0, 0x4B22, 0x4748, 0x3563,      0, 0x4525,      0,      0, /* 0xE0 */
-    0x436D,      0, 0x5E25,      0,      0,      0,      0, 0x5E23, /* 0xE0 */
-    0x4259, 0x5D76,      0, 0x314B                                  /* 0xF0 */
+         0, 0x3637, 	 0, 	 0, 0x5D75, 0x5D7A, 	 0, 	 0, /* 0xC0 */
+         0, 0x4074, 0x4771, 	 0, 0x4867, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x5D77, 	 0, 0x4B21, 	 0, 0x5D79, /* 0xD0 */
+         0, 0x5E24, 	 0, 0x5E22, 	 0, 0x5D7B, 	 0, 	 0, /* 0xD0 */
+         0, 0x4B22, 0x4748, 0x3563, 	 0, 0x4525, 	 0, 	 0, /* 0xE0 */
+    0x436D, 	 0, 0x5E25, 	 0, 	 0, 	 0, 	 0, 0x5E23, /* 0xE0 */
+    0x4259, 0x5D76, 	 0, 0x314B									/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -1591,599 +1591,599 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_6C[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_6D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-                            0x4D4E, 0x5E30,      0,      0,      0, /* 0x00 */
-         0,      0, 0x5E2F,      0,      0,      0,      0, 0x4076, /* 0x10 */
-         0, 0x5E2C,      0, 0x4D6C,      0,      0, 0x4636, 0x5E26, /* 0x10 */
-         0,      0,      0,      0,      0, 0x4445,      0,      0, /* 0x20 */
-         0, 0x314C, 0x393F, 0x5E29,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x3D27, 0x5E2E,      0, 0x5E2D, 0x5E28,      0, /* 0x30 */
-    0x5E2B,      0,      0, 0x3368,      0, 0x5E2A, 0x4749,      0, /* 0x30 */
-         0, 0x4E2E,      0,      0, 0x3E74, 0x4075,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0x5E36, 0x5E34,      0, 0x494D,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0x5E31, 0x5E33,      0, 0x313A,      0, /* 0x60 */
-         0, 0x3940, 0x4F32,      0, 0x333D,      0, 0x4962,      0, /* 0x60 */
-         0,      0,      0,      0, 0x4D61,      0,      0, 0x3324, /* 0x70 */
-    0x3F3B, 0x5E35,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0x5E3A,      0,      0, /* 0x80 */
-    0x3E43,      0,      0,      0, 0x4D30,      0, 0x5E37,      0, /* 0x80 */
-         0,      0,      0, 0x5E32,      0, 0x5E38,      0,      0, /* 0x90 */
-         0, 0x4E5E,      0, 0x4573, 0x4642,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0x3336, /* 0xA0 */
-         0,      0, 0x3155,      0,      0, 0x5E3E,      0,      0, /* 0xB0 */
-    0x5E41,      0,      0,      0, 0x4E43,      0,      0,      0, /* 0xB0 */
-    0x4D64,      0,      0,      0,      0, 0x5E48, 0x5E42, 0x5E3F, /* 0xC0 */
-         0,      0,      0, 0x4E54, 0x5E45,      0,      0,      0, /* 0xC0 */
-         0, 0x3D4A, 0x5E47,      0,      0, 0x5E4C,      0,      0, /* 0xD0 */
-    0x4571, 0x5E4A,      0,      0,      0,      0, 0x5E44,      0, /* 0xD0 */
-         0, 0x4338,      0,      0, 0x5E4B,      0, 0x5E40,      0, /* 0xE0 */
-    0x5E46,      0, 0x5E4D, 0x307C, 0x5E43,      0, 0x5E4E,      0, /* 0xE0 */
-         0, 0x3F3C,      0, 0x3D5F,      0, 0x4A25,      0, 0x3A2E, /* 0xF0 */
-         0, 0x5E3B, 0x5E49, 0x453A                                  /* 0xF0 */
+                            0x4D4E, 0x5E30, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x5E2F, 	 0, 	 0, 	 0, 	 0, 0x4076, /* 0x10 */
+         0, 0x5E2C, 	 0, 0x4D6C, 	 0, 	 0, 0x4636, 0x5E26, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4445, 	 0, 	 0, /* 0x20 */
+         0, 0x314C, 0x393F, 0x5E29, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x3D27, 0x5E2E, 	 0, 0x5E2D, 0x5E28, 	 0, /* 0x30 */
+    0x5E2B, 	 0, 	 0, 0x3368, 	 0, 0x5E2A, 0x4749, 	 0, /* 0x30 */
+         0, 0x4E2E, 	 0, 	 0, 0x3E74, 0x4075, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x5E36, 0x5E34, 	 0, 0x494D, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x5E31, 0x5E33, 	 0, 0x313A, 	 0, /* 0x60 */
+         0, 0x3940, 0x4F32, 	 0, 0x333D, 	 0, 0x4962, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x4D61, 	 0, 	 0, 0x3324, /* 0x70 */
+    0x3F3B, 0x5E35, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5E3A, 	 0, 	 0, /* 0x80 */
+    0x3E43, 	 0, 	 0, 	 0, 0x4D30, 	 0, 0x5E37, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x5E32, 	 0, 0x5E38, 	 0, 	 0, /* 0x90 */
+         0, 0x4E5E, 	 0, 0x4573, 0x4642, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3336, /* 0xA0 */
+         0, 	 0, 0x3155, 	 0, 	 0, 0x5E3E, 	 0, 	 0, /* 0xB0 */
+    0x5E41, 	 0, 	 0, 	 0, 0x4E43, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x4D64, 	 0, 	 0, 	 0, 	 0, 0x5E48, 0x5E42, 0x5E3F, /* 0xC0 */
+         0, 	 0, 	 0, 0x4E54, 0x5E45, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x3D4A, 0x5E47, 	 0, 	 0, 0x5E4C, 	 0, 	 0, /* 0xD0 */
+    0x4571, 0x5E4A, 	 0, 	 0, 	 0, 	 0, 0x5E44, 	 0, /* 0xD0 */
+         0, 0x4338, 	 0, 	 0, 0x5E4B, 	 0, 0x5E40, 	 0, /* 0xE0 */
+    0x5E46, 	 0, 0x5E4D, 0x307C, 0x5E43, 	 0, 0x5E4E, 	 0, /* 0xE0 */
+         0, 0x3F3C, 	 0, 0x3D5F, 	 0, 0x4A25, 	 0, 0x3A2E, /* 0xF0 */
+         0, 0x5E3B, 0x5E49, 0x453A									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_6E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0x4036,      0, 0x3369, /* 0x00 */
-    0x3A51, 0x3E44, 0x5E3D, 0x3D42,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0x374C,      0, 0x5E3C,      0,      0, /* 0x10 */
-         0, 0x5E52, 0x3D6D, 0x383A,      0, 0x5E61,      0, 0x5E5B, /* 0x10 */
-    0x3574, 0x454F,      0, 0x5E56, 0x5E5F, 0x302F, 0x3132,      0, /* 0x20 */
-         0, 0x3239,      0, 0x5E58, 0x422C, 0x5E4F, 0x5E51, 0x3941, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0x5E62,      0, 0x5E5D,      0,      0,      0, 0x5E55,      0, /* 0x30 */
-         0,      0,      0, 0x5E5C,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x4C2B,      0,      0, 0x5E5A, 0x5E5E,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0x3850,      0, /* 0x50 */
-    0x3E45,      0,      0, 0x4339,      0,      0,      0, 0x5E54, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0x4D2F, /* 0x60 */
-         0,      0,      0, 0x5E57,      0,      0, 0x5E50, 0x4572, /* 0x60 */
-         0,      0, 0x5E53,      0,      0,      0, 0x5E59,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x4F51, 0x3C3E, /* 0x70 */
-    0x4B7E,      0, 0x5E63,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0x482E,      0,      0, 0x5E6F, /* 0x80 */
-    0x383B,      0,      0,      0,      0,      0, 0x3D60,      0, /* 0x90 */
-    0x5E65,      0,      0,      0, 0x4E2F, 0x3942,      0, 0x5E72, /* 0x90 */
-         0,      0, 0x306E,      0,      0, 0x5E70,      0,      0, /* 0xA0 */
-         0,      0, 0x5E64,      0,      0,      0,      0, 0x5E6A, /* 0xA0 */
-         0,      0, 0x5E6C,      0,      0,      0, 0x4D4F, 0x5E67, /* 0xB0 */
-         0,      0, 0x452E,      0,      0, 0x5E69,      0,      0, /* 0xB0 */
-         0,      0, 0x5E71,      0, 0x5E6B, 0x4C47,      0,      0, /* 0xC0 */
-         0, 0x5E66,      0, 0x3C22, 0x5E7E,      0,      0,      0, /* 0xC0 */
-         0, 0x336A,      0, 0x5E68, 0x5E6D, 0x5E6E,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x426C, 0x425A,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0x5E76,      0,      0, 0x5E7C, /* 0xE0 */
-         0,      0, 0x5E7A,      0, 0x4529,      0,      0, 0x5F23, /* 0xF0 */
-    0x5E77,      0,      0,      0,      0,      0, 0x5E78, 0x5E60  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0x4036, 	 0, 0x3369, /* 0x00 */
+    0x3A51, 0x3E44, 0x5E3D, 0x3D42, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x374C, 	 0, 0x5E3C, 	 0, 	 0, /* 0x10 */
+         0, 0x5E52, 0x3D6D, 0x383A, 	 0, 0x5E61, 	 0, 0x5E5B, /* 0x10 */
+    0x3574, 0x454F, 	 0, 0x5E56, 0x5E5F, 0x302F, 0x3132, 	 0, /* 0x20 */
+         0, 0x3239, 	 0, 0x5E58, 0x422C, 0x5E4F, 0x5E51, 0x3941, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x5E62, 	 0, 0x5E5D, 	 0, 	 0, 	 0, 0x5E55, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x5E5C, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x4C2B, 	 0, 	 0, 0x5E5A, 0x5E5E, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3850, 	 0, /* 0x50 */
+    0x3E45, 	 0, 	 0, 0x4339, 	 0, 	 0, 	 0, 0x5E54, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4D2F, /* 0x60 */
+         0, 	 0, 	 0, 0x5E57, 	 0, 	 0, 0x5E50, 0x4572, /* 0x60 */
+         0, 	 0, 0x5E53, 	 0, 	 0, 	 0, 0x5E59, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4F51, 0x3C3E, /* 0x70 */
+    0x4B7E, 	 0, 0x5E63, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x482E, 	 0, 	 0, 0x5E6F, /* 0x80 */
+    0x383B, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3D60, 	 0, /* 0x90 */
+    0x5E65, 	 0, 	 0, 	 0, 0x4E2F, 0x3942, 	 0, 0x5E72, /* 0x90 */
+         0, 	 0, 0x306E, 	 0, 	 0, 0x5E70, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x5E64, 	 0, 	 0, 	 0, 	 0, 0x5E6A, /* 0xA0 */
+         0, 	 0, 0x5E6C, 	 0, 	 0, 	 0, 0x4D4F, 0x5E67, /* 0xB0 */
+         0, 	 0, 0x452E, 	 0, 	 0, 0x5E69, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x5E71, 	 0, 0x5E6B, 0x4C47, 	 0, 	 0, /* 0xC0 */
+         0, 0x5E66, 	 0, 0x3C22, 0x5E7E, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x336A, 	 0, 0x5E68, 0x5E6D, 0x5E6E, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x426C, 0x425A, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x5E76, 	 0, 	 0, 0x5E7C, /* 0xE0 */
+         0, 	 0, 0x5E7A, 	 0, 0x4529, 	 0, 	 0, 0x5F23, /* 0xF0 */
+    0x5E77, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5E78, 0x5E60	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_6F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3579, 0x493A,      0,      0,      0, 0x3C3F,      0, /* 0x00 */
-         0, 0x3977,      0,      0,      0,      0,      0, 0x4F33, /* 0x00 */
-         0, 0x5E74,      0, 0x5F22, 0x3169, 0x4166,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0x4779,      0, 0x3441, 0x4E7A,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0x4C21, 0x4452,      0,      0,      0, /* 0x20 */
-         0, 0x5E7B, 0x5E7D,      0,      0,      0,      0,      0, /* 0x30 */
-    0x4132,      0,      0,      0,      0,      0, 0x5F21, 0x5E79, /* 0x30 */
-         0, 0x5E73,      0,      0,      0, 0x3443,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0x3769,      0,      0,      0, /* 0x50 */
-    0x5F2F,      0,      0, 0x5F2A, 0x4078,      0,      0, 0x3363, /* 0x50 */
-         0,      0,      0,      0, 0x3D61,      0, 0x5F33,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0x5F2C, 0x442C, 0x5F29, /* 0x60 */
-    0x4459,      0,      0,      0, 0x5F4C,      0,      0,      0, /* 0x70 */
-    0x5F26,      0, 0x5F25,      0, 0x5F2E,      0,      0,      0, /* 0x70 */
-    0x5F28, 0x5F27, 0x5F2D,      0, 0x4021,      0, 0x5F24,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x5F30,      0, /* 0x80 */
-         0, 0x5F31,      0,      0,      0,      0,      0, 0x3442, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0x5F36,      0, 0x5F35, 0x5F37,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x5F3A,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0x4543,      0, 0x5F34,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x5F38,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x3763, 0x4279, 0x5F32, 0x473B,      0,      0, 0x5F39,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x5F3E, 0x5F3C,      0,      0, /* 0xD0 */
-    0x5F3F,      0,      0, 0x5F42,      0,      0,      0, 0x5F3B, /* 0xD0 */
-    0x396A, 0x4728,      0,      0, 0x5E39,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x4D74, 0x5F3D,      0, 0x5F41, 0x4275, /* 0xE0 */
-         0, 0x5F40,      0, 0x5F2B,      0,      0, 0x6F69,      0, /* 0xF0 */
-         0,      0, 0x5F45,      0,      0,      0, 0x5F49          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3579, 0x493A, 	 0, 	 0, 	 0, 0x3C3F, 	 0, /* 0x00 */
+         0, 0x3977, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4F33, /* 0x00 */
+         0, 0x5E74, 	 0, 0x5F22, 0x3169, 0x4166, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x4779, 	 0, 0x3441, 0x4E7A, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x4C21, 0x4452, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x5E7B, 0x5E7D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x4132, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5F21, 0x5E79, /* 0x30 */
+         0, 0x5E73, 	 0, 	 0, 	 0, 0x3443, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x3769, 	 0, 	 0, 	 0, /* 0x50 */
+    0x5F2F, 	 0, 	 0, 0x5F2A, 0x4078, 	 0, 	 0, 0x3363, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x3D61, 	 0, 0x5F33, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5F2C, 0x442C, 0x5F29, /* 0x60 */
+    0x4459, 	 0, 	 0, 	 0, 0x5F4C, 	 0, 	 0, 	 0, /* 0x70 */
+    0x5F26, 	 0, 0x5F25, 	 0, 0x5F2E, 	 0, 	 0, 	 0, /* 0x70 */
+    0x5F28, 0x5F27, 0x5F2D, 	 0, 0x4021, 	 0, 0x5F24, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5F30, 	 0, /* 0x80 */
+         0, 0x5F31, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3442, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x5F36, 	 0, 0x5F35, 0x5F37, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x5F3A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x4543, 	 0, 0x5F34, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x5F38, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x3763, 0x4279, 0x5F32, 0x473B, 	 0, 	 0, 0x5F39, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x5F3E, 0x5F3C, 	 0, 	 0, /* 0xD0 */
+    0x5F3F, 	 0, 	 0, 0x5F42, 	 0, 	 0, 	 0, 0x5F3B, /* 0xD0 */
+    0x396A, 0x4728, 	 0, 	 0, 0x5E39, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x4D74, 0x5F3D, 	 0, 0x5F41, 0x4275, /* 0xE0 */
+         0, 0x5F40, 	 0, 0x5F2B, 	 0, 	 0, 0x6F69, 	 0, /* 0xF0 */
+         0, 	 0, 0x5F45, 	 0, 	 0, 	 0, 0x5F49			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_70[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x5F47,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0x5F43,      0, 0x5F44,      0,      0,      0, 0x5F48, /* 0x00 */
-         0, 0x5F46,      0,      0,      0, 0x494E,      0,      0, /* 0x10 */
-    0x5F4E,      0, 0x5F4B, 0x5F4A,      0, 0x5F4D, 0x4654, 0x5F4F, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x4375, 0x426D, /* 0x20 */
-         0,      0,      0,      0, 0x4025,      0,      0,      0, /* 0x20 */
-    0x5F50,      0, 0x5F52,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0x5F51,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0x5E75,      0,      0,      0, /* 0x40 */
-         0, 0x5F53,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0x4667,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0x5F54,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0x3250,      0,      0,      0, 0x4574, /* 0x60 */
-    0x3325,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0x3564,      0,      0,      0, 0x3C5E, 0x3A52,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0x4F27, 0x3F66,      0,      0,      0, 0x316A,      0, /* 0x80 */
-         0,      0, 0x5F56,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0x5F55,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x5F59, 0x433A, 0x5F5C, 0x5F57, /* 0xA0 */
-         0,      0,      0, 0x5F5B,      0,      0,      0,      0, /* 0xB0 */
-    0x5F5A, 0x4540, 0x3059,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0x4E75,      0,      0, 0x5F5E,      0,      0,      0, 0x3128, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x5F60,      0,      0,      0, 0x5F5F,      0, 0x5F5D, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0x5F58,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0x4B23,      0,      0,      0, 0x5F62                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x5F47, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x5F43, 	 0, 0x5F44, 	 0, 	 0, 	 0, 0x5F48, /* 0x00 */
+         0, 0x5F46, 	 0, 	 0, 	 0, 0x494E, 	 0, 	 0, /* 0x10 */
+    0x5F4E, 	 0, 0x5F4B, 0x5F4A, 	 0, 0x5F4D, 0x4654, 0x5F4F, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4375, 0x426D, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x4025, 	 0, 	 0, 	 0, /* 0x20 */
+    0x5F50, 	 0, 0x5F52, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5F51, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x5E75, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x5F53, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x4667, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x5F54, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x3250, 	 0, 	 0, 	 0, 0x4574, /* 0x60 */
+    0x3325, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x3564, 	 0, 	 0, 	 0, 0x3C5E, 0x3A52, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x4F27, 0x3F66, 	 0, 	 0, 	 0, 0x316A, 	 0, /* 0x80 */
+         0, 	 0, 0x5F56, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x5F55, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x5F59, 0x433A, 0x5F5C, 0x5F57, /* 0xA0 */
+         0, 	 0, 	 0, 0x5F5B, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x5F5A, 0x4540, 0x3059, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x4E75, 	 0, 	 0, 0x5F5E, 	 0, 	 0, 	 0, 0x3128, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x5F60, 	 0, 	 0, 	 0, 0x5F5F, 	 0, 0x5F5D, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x5F58, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0x4B23, 	 0, 	 0, 	 0, 0x5F62					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_71[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-            0x5F61,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0x316B,      0,      0,      0, /* 0x10 */
-         0, 0x5F64, 0x4A32,      0, 0x5F63,      0,      0,      0, /* 0x10 */
-         0, 0x4C35,      0,      0,      0,      0, 0x3E47,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x4133,      0, /* 0x30 */
-         0,      0,      0,      0, 0x3E46,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0x4E7B,      0,      0, 0x5F6A,      0, 0x4079,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0x5F66, 0x5F6B,      0, /* 0x50 */
-         0, 0x316C,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0x5F69,      0, 0x4761, 0x5F65, 0x5F68, 0x3E48, /* 0x60 */
-         0, 0x4851,      0,      0, 0x5F6C,      0, 0x3C51,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0x407A,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0x5F6F,      0,      0,      0, /* 0x80 */
-    0x5F67,      0, 0x3727,      0,      0,      0,      0, 0x5F6D, /* 0x80 */
-         0,      0,      0,      0, 0x4D50, 0x5F70,      0,      0, /* 0x90 */
-         0, 0x7426,      0,      0,      0,      0,      0, 0x3D4F, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x5F71,      0,      0,      0, 0x5F72,      0,      0,      0, /* 0xA0 */
-         0, 0x472E,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x5F74,      0,      0,      0,      0, 0x5F75,      0, /* 0xB0 */
-         0,      0,      0, 0x4733,      0,      0,      0,      0, /* 0xC0 */
-    0x4575, 0x5F77,      0,      0,      0,      0, 0x5F79,      0, /* 0xC0 */
-    0x4E55,      0, 0x5F76,      0, 0x5F78, 0x316D,      0, 0x5F73, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0x535B, /* 0xD0 */
-    0x5F7A,      0,      0,      0,      0, 0x4167, 0x3B38, 0x5F7C, /* 0xE0 */
-         0,      0,      0,      0, 0x5F7B, 0x3F24, 0x5259,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0x5F7D,      0,      0, /* 0xF0 */
-         0, 0x6021,      0, 0x5F6E, 0x5F7E,      0,      0, 0x6022  /* 0xF0 */
+            0x5F61, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x316B, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x5F64, 0x4A32, 	 0, 0x5F63, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x4C35, 	 0, 	 0, 	 0, 	 0, 0x3E47, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4133, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x3E46, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x4E7B, 	 0, 	 0, 0x5F6A, 	 0, 0x4079, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5F66, 0x5F6B, 	 0, /* 0x50 */
+         0, 0x316C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x5F69, 	 0, 0x4761, 0x5F65, 0x5F68, 0x3E48, /* 0x60 */
+         0, 0x4851, 	 0, 	 0, 0x5F6C, 	 0, 0x3C51, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x407A, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0x5F6F, 	 0, 	 0, 	 0, /* 0x80 */
+    0x5F67, 	 0, 0x3727, 	 0, 	 0, 	 0, 	 0, 0x5F6D, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x4D50, 0x5F70, 	 0, 	 0, /* 0x90 */
+         0, 0x7426, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3D4F, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x5F71, 	 0, 	 0, 	 0, 0x5F72, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x472E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x5F74, 	 0, 	 0, 	 0, 	 0, 0x5F75, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x4733, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x4575, 0x5F77, 	 0, 	 0, 	 0, 	 0, 0x5F79, 	 0, /* 0xC0 */
+    0x4E55, 	 0, 0x5F76, 	 0, 0x5F78, 0x316D, 	 0, 0x5F73, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x535B, /* 0xD0 */
+    0x5F7A, 	 0, 	 0, 	 0, 	 0, 0x4167, 0x3B38, 0x5F7C, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x5F7B, 0x3F24, 0x5259, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5F7D, 	 0, 	 0, /* 0xF0 */
+         0, 0x6021, 	 0, 0x5F6E, 0x5F7E, 	 0, 	 0, 0x6022	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_72[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0x477A,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0x6023,      0,      0, /* 0x00 */
-    0x6024,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0x6025,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0x6026,      0, 0x445E,      0, 0x6028, 0x6027,      0,      0, /* 0x20 */
-    0x6029,      0, 0x602A,      0,      0, 0x3C5F, 0x4963,      0, /* 0x30 */
-         0,      0, 0x4C6C, 0x602B, 0x602C, 0x4156, 0x3C24, 0x602D, /* 0x30 */
-    0x602E,      0,      0,      0,      0,      0, 0x602F, 0x4A52, /* 0x40 */
-    0x4847,      0,      0, 0x6030, 0x4757,      0,      0,      0, /* 0x40 */
-         0,      0, 0x442D,      0,      0,      0,      0,      0, /* 0x50 */
-    0x6031, 0x3267,      0, 0x356D,      0, 0x4C46,      0, 0x4C36, /* 0x50 */
-         0, 0x3234, 0x4F34,      0,      0,      0,      0, 0x4B52, /* 0x60 */
-         0, 0x4A2A,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0x4037,      0, 0x6032,      0,      0,      0, /* 0x70 */
-         0, 0x4643,      0,      0,      0, 0x3823, 0x6033,      0, /* 0x70 */
-    0x3A54, 0x6035, 0x6034,      0,      0,      0,      0, 0x6036, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0x6037,      0,      0,      0, 0x6038,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x353E,      0, 0x6039,      0,      0,      0,      0, 0x603A, /* 0xA0 */
-         0,      0,      0,      0, 0x3824,      0,      0, 0x4848, /* 0xA0 */
-         0,      0, 0x603C,      0,      0,      0, 0x3E75,      0, /* 0xB0 */
-         0, 0x603B,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x3638, 0x603D, 0x603F,      0, 0x603E,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0x6040,      0, /* 0xC0 */
-    0x3851,      0, 0x6041,      0,      0,      0,      0, 0x3669, /* 0xD0 */
-         0, 0x4140,      0, 0x397D,      0,      0,      0,      0, /* 0xD0 */
-    0x6043, 0x6044, 0x6042,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0x3C6D,      0,      0, 0x4648, 0x3639,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0x6046, /* 0xF0 */
-    0x432C, 0x6045,      0,      0, 0x4F35, 0x4762                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0x477A, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6023, 	 0, 	 0, /* 0x00 */
+    0x6024, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x6025, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x6026, 	 0, 0x445E, 	 0, 0x6028, 0x6027, 	 0, 	 0, /* 0x20 */
+    0x6029, 	 0, 0x602A, 	 0, 	 0, 0x3C5F, 0x4963, 	 0, /* 0x30 */
+         0, 	 0, 0x4C6C, 0x602B, 0x602C, 0x4156, 0x3C24, 0x602D, /* 0x30 */
+    0x602E, 	 0, 	 0, 	 0, 	 0, 	 0, 0x602F, 0x4A52, /* 0x40 */
+    0x4847, 	 0, 	 0, 0x6030, 0x4757, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x442D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x6031, 0x3267, 	 0, 0x356D, 	 0, 0x4C46, 	 0, 0x4C36, /* 0x50 */
+         0, 0x3234, 0x4F34, 	 0, 	 0, 	 0, 	 0, 0x4B52, /* 0x60 */
+         0, 0x4A2A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x4037, 	 0, 0x6032, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x4643, 	 0, 	 0, 	 0, 0x3823, 0x6033, 	 0, /* 0x70 */
+    0x3A54, 0x6035, 0x6034, 	 0, 	 0, 	 0, 	 0, 0x6036, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x6037, 	 0, 	 0, 	 0, 0x6038, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x353E, 	 0, 0x6039, 	 0, 	 0, 	 0, 	 0, 0x603A, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x3824, 	 0, 	 0, 0x4848, /* 0xA0 */
+         0, 	 0, 0x603C, 	 0, 	 0, 	 0, 0x3E75, 	 0, /* 0xB0 */
+         0, 0x603B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x3638, 0x603D, 0x603F, 	 0, 0x603E, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6040, 	 0, /* 0xC0 */
+    0x3851, 	 0, 0x6041, 	 0, 	 0, 	 0, 	 0, 0x3669, /* 0xD0 */
+         0, 0x4140, 	 0, 0x397D, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x6043, 0x6044, 0x6042, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x3C6D, 	 0, 	 0, 0x4648, 0x3639, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6046, /* 0xF0 */
+    0x432C, 0x6045, 	 0, 	 0, 0x4F35, 0x4762					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_73[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-                    0x6049,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0x604B, 0x6048, /* 0x10 */
-         0,      0,      0, 0x4C54, 0x604A, 0x604C,      0, 0x4E44, /* 0x10 */
-         0,      0,      0,      0,      0, 0x6050,      0,      0, /* 0x20 */
-         0, 0x604F, 0x4376, 0x472D,      0,      0, 0x3825, 0x604E, /* 0x20 */
-         0,      0,      0,      0, 0x604D,      0, 0x4D31, 0x4D32, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0x6051, 0x316E, /* 0x30 */
-         0,      0,      0,      0, 0x3976, 0x3B62,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0x6052, 0x6053, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0x6055, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0x3D43,      0,      0,      0,      0, /* 0x60 */
-    0x6057,      0, 0x6056,      0,      0,      0,      0,      0, /* 0x60 */
-    0x6058,      0, 0x334D,      0,      0, 0x605A,      0,      0, /* 0x70 */
-    0x6059,      0, 0x605C, 0x605B,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0x383C,      0,      0, 0x4E28, /* 0x80 */
-         0, 0x364C,      0, 0x3226,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x366A,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0x3461,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x4E68, 0x605E,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x6060,      0,      0,      0,      0, /* 0xB0 */
-    0x6061,      0, 0x3251,      0,      0,      0,      0,      0, /* 0xC0 */
-    0x605D,      0, 0x3B39,      0,      0, 0x4441, 0x605F,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0x6064,      0, /* 0xD0 */
-    0x3C6E,      0,      0,      0,      0, 0x6062,      0,      0, /* 0xE0 */
-         0,      0, 0x373E,      0,      0, 0x4849, 0x6063,      0, /* 0xE0 */
-         0, 0x607E,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0x6069,      0,      0,      0,      0,      0, 0x383D          /* 0xF0 */
+                    0x6049, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x604B, 0x6048, /* 0x10 */
+         0, 	 0, 	 0, 0x4C54, 0x604A, 0x604C, 	 0, 0x4E44, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6050, 	 0, 	 0, /* 0x20 */
+         0, 0x604F, 0x4376, 0x472D, 	 0, 	 0, 0x3825, 0x604E, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x604D, 	 0, 0x4D31, 0x4D32, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6051, 0x316E, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x3976, 0x3B62, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6052, 0x6053, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6055, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x3D43, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x6057, 	 0, 0x6056, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x6058, 	 0, 0x334D, 	 0, 	 0, 0x605A, 	 0, 	 0, /* 0x70 */
+    0x6059, 	 0, 0x605C, 0x605B, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0x383C, 	 0, 	 0, 0x4E28, /* 0x80 */
+         0, 0x364C, 	 0, 0x3226, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x366A, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x3461, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x4E68, 0x605E, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x6060, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x6061, 	 0, 0x3251, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x605D, 	 0, 0x3B39, 	 0, 	 0, 0x4441, 0x605F, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6064, 	 0, /* 0xD0 */
+    0x3C6E, 	 0, 	 0, 	 0, 	 0, 0x6062, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x373E, 	 0, 	 0, 0x4849, 0x6063, 	 0, /* 0xE0 */
+         0, 0x607E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x6069, 	 0, 	 0, 	 0, 	 0, 	 0, 0x383D			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_74[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0x3565,      0, 0x6066, 0x4D7D,      0, /* 0x00 */
-         0, 0x4E30,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x4276,      0,      0, 0x6068,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x606A, 0x4E56, 0x3657, 0x487C, 0x474A,      0, /* 0x30 */
-         0,      0, 0x606B,      0,      0,      0,      0, 0x606D, /* 0x30 */
-         0, 0x6070,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0x606C,      0,      0, /* 0x50 */
-         0, 0x606F, 0x386A, 0x314D, 0x6071,      0, 0x3F70, 0x606E, /* 0x50 */
-    0x4E5C,      0,      0, 0x6074, 0x7424,      0,      0,      0, /* 0x60 */
-         0, 0x6072, 0x6075,      0,      0,      0,      0, 0x6067, /* 0x60 */
-    0x6073,      0,      0, 0x3A3C,      0,      0, 0x6076,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x6077,      0, /* 0x70 */
-         0,      0,      0, 0x4D7E,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x6078,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0x6079,      0, /* 0x90 */
-         0,      0, 0x6065,      0,      0,      0,      0, 0x607A, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x3444,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x3C25,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x607B,      0,      0,      0,      0, 0x607C, /* 0xC0 */
-         0,      0,      0,      0, 0x607D,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x313B,      0,      0,      0, /* 0xD0 */
-    0x6121,      0, 0x493B, 0x6122,      0,      0, 0x3424, 0x6123, /* 0xE0 */
-         0, 0x6124,      0,      0,      0,      0, 0x6125,      0, /* 0xE0 */
-    0x6127, 0x6128, 0x6126,      0,      0,      0, 0x4953, 0x612A, /* 0xF0 */
-    0x6129                                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0x3565, 	 0, 0x6066, 0x4D7D, 	 0, /* 0x00 */
+         0, 0x4E30, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x4276, 	 0, 	 0, 0x6068, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x606A, 0x4E56, 0x3657, 0x487C, 0x474A, 	 0, /* 0x30 */
+         0, 	 0, 0x606B, 	 0, 	 0, 	 0, 	 0, 0x606D, /* 0x30 */
+         0, 0x6070, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x606C, 	 0, 	 0, /* 0x50 */
+         0, 0x606F, 0x386A, 0x314D, 0x6071, 	 0, 0x3F70, 0x606E, /* 0x50 */
+    0x4E5C, 	 0, 	 0, 0x6074, 0x7424, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x6072, 0x6075, 	 0, 	 0, 	 0, 	 0, 0x6067, /* 0x60 */
+    0x6073, 	 0, 	 0, 0x3A3C, 	 0, 	 0, 0x6076, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6077, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x4D7E, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x6078, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6079, 	 0, /* 0x90 */
+         0, 	 0, 0x6065, 	 0, 	 0, 	 0, 	 0, 0x607A, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x3444, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3C25, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x607B, 	 0, 	 0, 	 0, 	 0, 0x607C, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x607D, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x313B, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x6121, 	 0, 0x493B, 0x6122, 	 0, 	 0, 0x3424, 0x6123, /* 0xE0 */
+         0, 0x6124, 	 0, 	 0, 	 0, 	 0, 0x6125, 	 0, /* 0xE0 */
+    0x6127, 0x6128, 0x6126, 	 0, 	 0, 	 0, 0x4953, 0x612A, /* 0xF0 */
+    0x6129															/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_75[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0x612C, 0x612B, 0x612D,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0x612E, 0x6130, 0x612F,      0, /* 0x00 */
-         0, 0x3979,      0, 0x6132,      0, 0x6131,      0,      0, /* 0x10 */
-    0x3445,      0, 0x3F53,      0, 0x453C,      0, 0x6133, 0x4038, /* 0x10 */
-         0,      0,      0, 0x3B3A,      0, 0x3179, 0x6134,      0, /* 0x20 */
-    0x4D51,      0,      0, 0x4A63, 0x6135,      0,      0,      0, /* 0x20 */
-    0x4544, 0x4D33, 0x3943, 0x3F3D,      0,      0,      0, 0x434B, /* 0x30 */
-    0x5234,      0, 0x442E, 0x3268, 0x6136,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0x6137,      0, 0x613C,      0, /* 0x40 */
-         0, 0x613A, 0x6139, 0x5A42, 0x3326, 0x6138,      0, 0x305A, /* 0x40 */
-         0, 0x482A,      0,      0, 0x484A,      0,      0,      0, /* 0x50 */
-         0, 0x4E31, 0x613D, 0x613B, 0x435C, 0x4026,      0,      0, /* 0x50 */
-    0x482B,      0, 0x492D,      0, 0x613F, 0x4E2C, 0x374D, 0x6140, /* 0x60 */
-         0, 0x613E, 0x4856, 0x6141,      0, 0x6142,      0,      0, /* 0x60 */
-    0x305B,      0,      0, 0x3E76, 0x6147,      0, 0x6144, 0x466D, /* 0x70 */
-    0x6143,      0,      0,      0,      0,      0,      0, 0x3526, /* 0x70 */
-         0,      0, 0x614A,      0,      0,      0, 0x6145, 0x6146, /* 0x80 */
-         0, 0x6149, 0x6148, 0x4925,      0,      0, 0x4142, 0x4141, /* 0x80 */
-         0, 0x353F,      0,      0, 0x614B,      0,      0,      0, /* 0x90 */
-         0,      0, 0x614C,      0,      0, 0x614D,      0,      0, /* 0x90 */
-         0,      0,      0, 0x614F,      0, 0x614E,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x3156,      0,      0,      0,      0, /* 0xA0 */
-         0, 0x6157, 0x4868, 0x6151,      0, 0x6153,      0,      0, /* 0xB0 */
-    0x6155, 0x3F3E,      0,      0, 0x6156, 0x6154, 0x3C40,      0, /* 0xB0 */
-         0,      0, 0x6150, 0x6152,      0, 0x4942,      0, 0x3E49, /* 0xC0 */
-         0,      0, 0x6159,      0,      0, 0x6158,      0,      0, /* 0xC0 */
-         0,      0, 0x615A,      0, 0x3C26, 0x3A2F,      0,      0, /* 0xD0 */
-    0x4577, 0x615B,      0, 0x444B,      0,      0, 0x615D,      0, /* 0xD0 */
-         0,      0, 0x4E21, 0x615C,      0,      0,      0,      0, /* 0xE0 */
-         0, 0x4169,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x6162,      0, 0x6164, 0x6165, 0x4354,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x6163,      0, 0x6160,      0, 0x615E, 0x615F  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0x612C, 0x612B, 0x612D, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x612E, 0x6130, 0x612F, 	 0, /* 0x00 */
+         0, 0x3979, 	 0, 0x6132, 	 0, 0x6131, 	 0, 	 0, /* 0x10 */
+    0x3445, 	 0, 0x3F53, 	 0, 0x453C, 	 0, 0x6133, 0x4038, /* 0x10 */
+         0, 	 0, 	 0, 0x3B3A, 	 0, 0x3179, 0x6134, 	 0, /* 0x20 */
+    0x4D51, 	 0, 	 0, 0x4A63, 0x6135, 	 0, 	 0, 	 0, /* 0x20 */
+    0x4544, 0x4D33, 0x3943, 0x3F3D, 	 0, 	 0, 	 0, 0x434B, /* 0x30 */
+    0x5234, 	 0, 0x442E, 0x3268, 0x6136, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x6137, 	 0, 0x613C, 	 0, /* 0x40 */
+         0, 0x613A, 0x6139, 0x5A42, 0x3326, 0x6138, 	 0, 0x305A, /* 0x40 */
+         0, 0x482A, 	 0, 	 0, 0x484A, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x4E31, 0x613D, 0x613B, 0x435C, 0x4026, 	 0, 	 0, /* 0x50 */
+    0x482B, 	 0, 0x492D, 	 0, 0x613F, 0x4E2C, 0x374D, 0x6140, /* 0x60 */
+         0, 0x613E, 0x4856, 0x6141, 	 0, 0x6142, 	 0, 	 0, /* 0x60 */
+    0x305B, 	 0, 	 0, 0x3E76, 0x6147, 	 0, 0x6144, 0x466D, /* 0x70 */
+    0x6143, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3526, /* 0x70 */
+         0, 	 0, 0x614A, 	 0, 	 0, 	 0, 0x6145, 0x6146, /* 0x80 */
+         0, 0x6149, 0x6148, 0x4925, 	 0, 	 0, 0x4142, 0x4141, /* 0x80 */
+         0, 0x353F, 	 0, 	 0, 0x614B, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x614C, 	 0, 	 0, 0x614D, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x614F, 	 0, 0x614E, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x3156, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x6157, 0x4868, 0x6151, 	 0, 0x6153, 	 0, 	 0, /* 0xB0 */
+    0x6155, 0x3F3E, 	 0, 	 0, 0x6156, 0x6154, 0x3C40, 	 0, /* 0xB0 */
+         0, 	 0, 0x6150, 0x6152, 	 0, 0x4942, 	 0, 0x3E49, /* 0xC0 */
+         0, 	 0, 0x6159, 	 0, 	 0, 0x6158, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x615A, 	 0, 0x3C26, 0x3A2F, 	 0, 	 0, /* 0xD0 */
+    0x4577, 0x615B, 	 0, 0x444B, 	 0, 	 0, 0x615D, 	 0, /* 0xD0 */
+         0, 	 0, 0x4E21, 0x615C, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x4169, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x6162, 	 0, 0x6164, 0x6165, 0x4354, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x6163, 	 0, 0x6160, 	 0, 0x615E, 0x615F	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_76[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x6161,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0x6168,      0, 0x6166,      0, 0x6167,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0x6169, /* 0x10 */
-    0x616B, 0x616C, 0x616D,      0, 0x616E,      0,      0, 0x616A, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0x6170,      0,      0,      0, 0x616F,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x6171,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0x4E45,      0,      0,      0, 0x6174, 0x6172, /* 0x40 */
-    0x6173,      0,      0,      0, 0x3462,      0,      0,      0, /* 0x40 */
-         0,      0, 0x4C7E,      0,      0,      0, 0x4A4A,      0, /* 0x50 */
-    0x6176,      0,      0,      0, 0x6175,      0,      0,      0, /* 0x50 */
-         0, 0x6177, 0x6178,      0,      0,      0,      0, 0x617C, /* 0x60 */
-    0x6179, 0x617A, 0x617B,      0, 0x617D,      0,      0,      0, /* 0x60 */
-    0x617E,      0, 0x6221,      0,      0,      0, 0x6222,      0, /* 0x70 */
-    0x6223,      0, 0x482F, 0x4550, 0x6224, 0x4772, 0x4934,      0, /* 0x70 */
-    0x6225,      0,      0, 0x6226, 0x452A,      0, 0x3327, 0x3944, /* 0x80 */
-    0x6227,      0,      0, 0x6228,      0,      0, 0x6229,      0, /* 0x80 */
-    0x3B29,      0,      0, 0x622B,      0,      0, 0x622A,      0, /* 0x90 */
-         0, 0x622C, 0x622D,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0x4869,      0, /* 0xA0 */
-    0x622E,      0,      0,      0, 0x622F,      0,      0, 0x7369, /* 0xB0 */
-    0x6230, 0x6231, 0x6232,      0,      0,      0,      0, 0x3B2E, /* 0xB0 */
-         0,      0, 0x6233, 0x4756,      0,      0, 0x4B5F,      0, /* 0xC0 */
-    0x314E,      0, 0x3157,      0,      0, 0x6234,      0,      0, /* 0xC0 */
-         0,      0, 0x6236,      0,      0,      0, 0x6235, 0x4570, /* 0xD0 */
-         0,      0,      0, 0x4039, 0x5D39,      0, 0x6237, 0x4C41, /* 0xD0 */
-         0, 0x6238,      0, 0x3446, 0x4857, 0x6239,      0, 0x623A, /* 0xE0 */
-         0,      0, 0x623B,      0,      0,      0, 0x4C5C,      0, /* 0xE0 */
-         0,      0, 0x4C55,      0, 0x443E,      0,      0,      0, /* 0xF0 */
-    0x416A,      0,      0, 0x623D,      0,      0, 0x3D62          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x6161, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x6168, 	 0, 0x6166, 	 0, 0x6167, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6169, /* 0x10 */
+    0x616B, 0x616C, 0x616D, 	 0, 0x616E, 	 0, 	 0, 0x616A, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x6170, 	 0, 	 0, 	 0, 0x616F, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x6171, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x4E45, 	 0, 	 0, 	 0, 0x6174, 0x6172, /* 0x40 */
+    0x6173, 	 0, 	 0, 	 0, 0x3462, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x4C7E, 	 0, 	 0, 	 0, 0x4A4A, 	 0, /* 0x50 */
+    0x6176, 	 0, 	 0, 	 0, 0x6175, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x6177, 0x6178, 	 0, 	 0, 	 0, 	 0, 0x617C, /* 0x60 */
+    0x6179, 0x617A, 0x617B, 	 0, 0x617D, 	 0, 	 0, 	 0, /* 0x60 */
+    0x617E, 	 0, 0x6221, 	 0, 	 0, 	 0, 0x6222, 	 0, /* 0x70 */
+    0x6223, 	 0, 0x482F, 0x4550, 0x6224, 0x4772, 0x4934, 	 0, /* 0x70 */
+    0x6225, 	 0, 	 0, 0x6226, 0x452A, 	 0, 0x3327, 0x3944, /* 0x80 */
+    0x6227, 	 0, 	 0, 0x6228, 	 0, 	 0, 0x6229, 	 0, /* 0x80 */
+    0x3B29, 	 0, 	 0, 0x622B, 	 0, 	 0, 0x622A, 	 0, /* 0x90 */
+         0, 0x622C, 0x622D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4869, 	 0, /* 0xA0 */
+    0x622E, 	 0, 	 0, 	 0, 0x622F, 	 0, 	 0, 0x7369, /* 0xB0 */
+    0x6230, 0x6231, 0x6232, 	 0, 	 0, 	 0, 	 0, 0x3B2E, /* 0xB0 */
+         0, 	 0, 0x6233, 0x4756, 	 0, 	 0, 0x4B5F, 	 0, /* 0xC0 */
+    0x314E, 	 0, 0x3157, 	 0, 	 0, 0x6234, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x6236, 	 0, 	 0, 	 0, 0x6235, 0x4570, /* 0xD0 */
+         0, 	 0, 	 0, 0x4039, 0x5D39, 	 0, 0x6237, 0x4C41, /* 0xD0 */
+         0, 0x6238, 	 0, 0x3446, 0x4857, 0x6239, 	 0, 0x623A, /* 0xE0 */
+         0, 	 0, 0x623B, 	 0, 	 0, 	 0, 0x4C5C, 	 0, /* 0xE0 */
+         0, 	 0, 0x4C55, 	 0, 0x443E, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x416A, 	 0, 	 0, 0x623D, 	 0, 	 0, 0x3D62			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_77[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3E4A,      0,      0, 0x6240,      0,      0, 0x623F, /* 0x00 */
-    0x623E, 0x487D,      0, 0x3447, 0x3829,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0x6246,      0,      0, 0x6243, 0x3F3F, /* 0x10 */
-    0x4C32,      0,      0,      0, 0x6242, 0x6244, 0x6245,      0, /* 0x20 */
-         0, 0x6241,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0x6247, /* 0x30 */
-    0x6248,      0, 0x442F,      0, 0x3463,      0,      0,      0, /* 0x30 */
-    0x4365,      0,      0,      0,      0,      0,      0, 0x6249, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0x624A, 0x624D,      0,      0,      0,      0, /* 0x50 */
-         0, 0x3F67,      0, 0x4644,      0, 0x624E, 0x4B53,      0, /* 0x60 */
-    0x624B,      0,      0, 0x624C,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x6251,      0,      0,      0,      0, 0x6250, 0x624F, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x6253,      0,      0, 0x6252,      0, /* 0x80 */
-         0, 0x6254,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0x6256,      0, /* 0x90 */
-    0x6255,      0,      0,      0,      0, 0x4A4D,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x3D56, 0x4E46,      0,      0, /* 0xA0 */
-    0x6257,      0,      0, 0x4637,      0,      0, 0x6258,      0, /* 0xB0 */
-         0, 0x6259,      0, 0x625D, 0x625B, 0x625C,      0, 0x625A, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0x625E, /* 0xC0 */
-         0,      0,      0,      0,      0, 0x625F,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0x6260, /* 0xD0 */
-         0,      0, 0x6261, 0x4C37, 0x6262,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x4C70, 0x6263,      0, 0x434E,      0, 0x476A, /* 0xE0 */
-         0, 0x366B,      0,      0,      0, 0x433B, 0x6264, 0x363A, /* 0xE0 */
-         0,      0,      0, 0x4050,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0, 0x6265                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3E4A, 	 0, 	 0, 0x6240, 	 0, 	 0, 0x623F, /* 0x00 */
+    0x623E, 0x487D, 	 0, 0x3447, 0x3829, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x6246, 	 0, 	 0, 0x6243, 0x3F3F, /* 0x10 */
+    0x4C32, 	 0, 	 0, 	 0, 0x6242, 0x6244, 0x6245, 	 0, /* 0x20 */
+         0, 0x6241, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6247, /* 0x30 */
+    0x6248, 	 0, 0x442F, 	 0, 0x3463, 	 0, 	 0, 	 0, /* 0x30 */
+    0x4365, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6249, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x624A, 0x624D, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x3F67, 	 0, 0x4644, 	 0, 0x624E, 0x4B53, 	 0, /* 0x60 */
+    0x624B, 	 0, 	 0, 0x624C, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x6251, 	 0, 	 0, 	 0, 	 0, 0x6250, 0x624F, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x6253, 	 0, 	 0, 0x6252, 	 0, /* 0x80 */
+         0, 0x6254, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6256, 	 0, /* 0x90 */
+    0x6255, 	 0, 	 0, 	 0, 	 0, 0x4A4D, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x3D56, 0x4E46, 	 0, 	 0, /* 0xA0 */
+    0x6257, 	 0, 	 0, 0x4637, 	 0, 	 0, 0x6258, 	 0, /* 0xB0 */
+         0, 0x6259, 	 0, 0x625D, 0x625B, 0x625C, 	 0, 0x625A, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x625E, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x625F, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6260, /* 0xD0 */
+         0, 	 0, 0x6261, 0x4C37, 0x6262, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x4C70, 0x6263, 	 0, 0x434E, 	 0, 0x476A, /* 0xE0 */
+         0, 0x366B, 	 0, 	 0, 	 0, 0x433B, 0x6264, 0x363A, /* 0xE0 */
+         0, 	 0, 	 0, 0x4050, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0x6265							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_78[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x3A3D,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0x6266,      0,      0,      0, /* 0x00 */
-         0,      0, 0x6267,      0, 0x3826, 0x3A55,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0x6269,      0,      0,      0,      0, 0x4556, 0x3A56, 0x354E, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x4B24,      0, 0x474B,      0,      0,      0, /* 0x30 */
-         0,      0, 0x4557,      0,      0,      0,      0, 0x395C, /* 0x30 */
-         0,      0,      0,      0,      0, 0x626B,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0x3E4B,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0x4E32, 0x3945,      0,      0, 0x3827, /* 0x60 */
-         0,      0, 0x4823,      0, 0x626D,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0x626F,      0,      0,      0, /* 0x70 */
-         0, 0x386B,      0,      0,      0,      0, 0x626E, 0x4476, /* 0x80 */
-         0,      0,      0,      0, 0x6271, 0x3337, 0x626C,      0, /* 0x80 */
-         0, 0x486A,      0, 0x3130,      0, 0x3A6C,      0, 0x4F52, /* 0x90 */
-         0,      0, 0x6270,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0x6272,      0,      0,      0, 0x4A4B, /* 0xA0 */
-         0, 0x4059, 0x6274,      0,      0,      0,      0, 0x6275, /* 0xA0 */
-         0,      0,      0,      0,      0, 0x6273,      0,      0, /* 0xB0 */
-         0,      0, 0x334E,      0, 0x627B,      0, 0x627A,      0, /* 0xB0 */
-         0, 0x3C27,      0,      0,      0, 0x627C, 0x6277,      0, /* 0xC0 */
-         0,      0, 0x627D, 0x6278,      0,      0,      0,      0, /* 0xC0 */
-    0x4858, 0x6276,      0,      0, 0x6279,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x6322,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0x6321, /* 0xE0 */
-    0x4B61,      0,      0,      0, 0x627E,      0,      0, 0x306B, /* 0xE0 */
-         0,      0,      0,      0, 0x6324,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0x6323                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x3A3D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x6266, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x6267, 	 0, 0x3826, 0x3A55, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x6269, 	 0, 	 0, 	 0, 	 0, 0x4556, 0x3A56, 0x354E, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x4B24, 	 0, 0x474B, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x4557, 	 0, 	 0, 	 0, 	 0, 0x395C, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x626B, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3E4B, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x4E32, 0x3945, 	 0, 	 0, 0x3827, /* 0x60 */
+         0, 	 0, 0x4823, 	 0, 0x626D, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0x626F, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x386B, 	 0, 	 0, 	 0, 	 0, 0x626E, 0x4476, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x6271, 0x3337, 0x626C, 	 0, /* 0x80 */
+         0, 0x486A, 	 0, 0x3130, 	 0, 0x3A6C, 	 0, 0x4F52, /* 0x90 */
+         0, 	 0, 0x6270, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x6272, 	 0, 	 0, 	 0, 0x4A4B, /* 0xA0 */
+         0, 0x4059, 0x6274, 	 0, 	 0, 	 0, 	 0, 0x6275, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6273, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x334E, 	 0, 0x627B, 	 0, 0x627A, 	 0, /* 0xB0 */
+         0, 0x3C27, 	 0, 	 0, 	 0, 0x627C, 0x6277, 	 0, /* 0xC0 */
+         0, 	 0, 0x627D, 0x6278, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x4858, 0x6276, 	 0, 	 0, 0x6279, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x6322, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6321, /* 0xE0 */
+    0x4B61, 	 0, 	 0, 	 0, 0x627E, 	 0, 	 0, 0x306B, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x6324, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6323					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_79[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3E4C,      0,      0,      0,      0,      0, 0x6325, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0x4143,      0, /* 0x00 */
-         0, 0x6327, 0x6326,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0x6328,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x6268,      0, /* 0x20 */
-         0,      0, 0x626A, 0x632A, 0x6329,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0x3C28,      0, 0x4E69,      0, 0x3C52,      0, /* 0x30 */
-    0x632B, 0x3737,      0,      0,      0,      0,      0, 0x3540, /* 0x40 */
-    0x3527, 0x3B63,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0x4D34,      0,      0, 0x6331,      0, 0x6330, 0x4144, 0x632D, /* 0x50 */
-         0,      0, 0x632F,      0,      0, 0x3D4B, 0x3F40, 0x632E, /* 0x50 */
-    0x632C,      0, 0x472A,      0,      0, 0x3E4D,      0,      0, /* 0x60 */
-    0x493C,      0,      0,      0,      0, 0x3A57,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0x4578, /* 0x70 */
-         0,      0, 0x6332,      0,      0,      0,      0, 0x6333, /* 0x70 */
-    0x6349, 0x3658,      0,      0, 0x4F3D, 0x4135,      0,      0, /* 0x80 */
-         0,      0, 0x6334,      0,      0, 0x3252, 0x4477, 0x4A21, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0x6335,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0x357A, 0x6336, /* 0xA0 */
-         0,      0, 0x6338,      0,      0,      0, 0x6339,      0, /* 0xA0 */
-    0x4729,      0,      0, 0x633A,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x633B, 0x633C,      0,      0, 0x3659, 0x3253, 0x4645, /* 0xB0 */
-    0x3D28, 0x3B64,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x633D,      0, 0x3D29,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x324A, 0x4943,      0,      0, 0x633E,      0,      0, /* 0xD0 */
-    0x486B,      0,      0,      0,      0,      0,      0, 0x4145, /* 0xD0 */
-         0, 0x6341,      0, 0x6342, 0x4769,      0, 0x3F41, 0x633F, /* 0xE0 */
-         0, 0x4361,      0,      0, 0x6340,      0,      0,      0, /* 0xE0 */
-    0x3E4E,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0x305C                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3E4C, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6325, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4143, 	 0, /* 0x00 */
+         0, 0x6327, 0x6326, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x6328, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6268, 	 0, /* 0x20 */
+         0, 	 0, 0x626A, 0x632A, 0x6329, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x3C28, 	 0, 0x4E69, 	 0, 0x3C52, 	 0, /* 0x30 */
+    0x632B, 0x3737, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3540, /* 0x40 */
+    0x3527, 0x3B63, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0x4D34, 	 0, 	 0, 0x6331, 	 0, 0x6330, 0x4144, 0x632D, /* 0x50 */
+         0, 	 0, 0x632F, 	 0, 	 0, 0x3D4B, 0x3F40, 0x632E, /* 0x50 */
+    0x632C, 	 0, 0x472A, 	 0, 	 0, 0x3E4D, 	 0, 	 0, /* 0x60 */
+    0x493C, 	 0, 	 0, 	 0, 	 0, 0x3A57, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4578, /* 0x70 */
+         0, 	 0, 0x6332, 	 0, 	 0, 	 0, 	 0, 0x6333, /* 0x70 */
+    0x6349, 0x3658, 	 0, 	 0, 0x4F3D, 0x4135, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x6334, 	 0, 	 0, 0x3252, 0x4477, 0x4A21, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6335, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x357A, 0x6336, /* 0xA0 */
+         0, 	 0, 0x6338, 	 0, 	 0, 	 0, 0x6339, 	 0, /* 0xA0 */
+    0x4729, 	 0, 	 0, 0x633A, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x633B, 0x633C, 	 0, 	 0, 0x3659, 0x3253, 0x4645, /* 0xB0 */
+    0x3D28, 0x3B64, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x633D, 	 0, 0x3D29, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x324A, 0x4943, 	 0, 	 0, 0x633E, 	 0, 	 0, /* 0xD0 */
+    0x486B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4145, /* 0xD0 */
+         0, 0x6341, 	 0, 0x6342, 0x4769, 	 0, 0x3F41, 0x633F, /* 0xE0 */
+         0, 0x4361, 	 0, 	 0, 0x6340, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x3E4E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0x305C									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_7A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x3529,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0x6343,      0,      0, 0x4478,      0, 0x6344, 0x4047,      0, /* 0x00 */
-         0,      0,      0,      0, 0x4C2D,      0,      0, 0x4923, /* 0x10 */
-    0x6345, 0x6346, 0x4355,      0, 0x4E47,      0,      0, 0x6348, /* 0x10 */
-    0x6347,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x3C6F,      0, /* 0x20 */
-         0, 0x634A, 0x3070,      0,      0,      0,      0, 0x634D, /* 0x30 */
-         0,      0,      0, 0x634B, 0x3254, 0x374E, 0x634C, 0x3946, /* 0x30 */
-    0x3972,      0, 0x4A66, 0x634E,      0,      0, 0x4B54,      0, /* 0x40 */
-         0, 0x6350,      0,      0,      0, 0x4051, 0x314F, 0x323A, /* 0x40 */
-    0x302C,      0,      0,      0,      0,      0,      0, 0x634F, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0x6351, 0x6352, 0x3E77,      0,      0,      0,      0, /* 0x60 */
-         0, 0x6353,      0, 0x334F,      0,      0,      0,      0, /* 0x60 */
-    0x6355,      0,      0,      0, 0x376A,      0, 0x3566,      0, /* 0x70 */
-         0, 0x6356, 0x3675,      0,      0, 0x6357,      0, 0x407C, /* 0x70 */
-         0, 0x464D,      0, 0x4060, 0x3A75,      0,      0,      0, /* 0x80 */
-    0x6358,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0x4362, 0x416B,      0, 0x635A, 0x635C, 0x6359, /* 0x90 */
-    0x635B,      0,      0,      0,      0,      0,      0, 0x3722, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0x635D, 0x3726,      0,      0,      0, 0x3567, 0x4D52, /* 0xA0 */
-    0x635F,      0,      0,      0,      0,      0, 0x6360,      0, /* 0xB0 */
-         0,      0, 0x312E,      0,      0,      0,      0, 0x6363, /* 0xB0 */
-         0,      0,      0, 0x3376, 0x6362, 0x6361,      0, 0x6365, /* 0xC0 */
-    0x635E,      0, 0x6366, 0x4E29,      0, 0x6367,      0, 0x6368, /* 0xC0 */
-         0,      0, 0x5474, 0x636A,      0, 0x6369,      0,      0, /* 0xD0 */
-         0, 0x636B, 0x636C,      0, 0x4E35, 0x636D,      0, 0x706F, /* 0xD0 */
-    0x3E4F, 0x636E, 0x636F, 0x3D57,      0, 0x4638, 0x6370,      0, /* 0xE0 */
-         0,      0, 0x4328,      0,      0, 0x6371,      0, 0x433C, /* 0xE0 */
-    0x6372,      0,      0,      0,      0,      0, 0x3625,      0, /* 0xF0 */
-    0x513F, 0x435D, 0x3C33,      0,      0,      0,      0, 0x3448  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x3529, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0x6343, 	 0, 	 0, 0x4478, 	 0, 0x6344, 0x4047, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x4C2D, 	 0, 	 0, 0x4923, /* 0x10 */
+    0x6345, 0x6346, 0x4355, 	 0, 0x4E47, 	 0, 	 0, 0x6348, /* 0x10 */
+    0x6347, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3C6F, 	 0, /* 0x20 */
+         0, 0x634A, 0x3070, 	 0, 	 0, 	 0, 	 0, 0x634D, /* 0x30 */
+         0, 	 0, 	 0, 0x634B, 0x3254, 0x374E, 0x634C, 0x3946, /* 0x30 */
+    0x3972, 	 0, 0x4A66, 0x634E, 	 0, 	 0, 0x4B54, 	 0, /* 0x40 */
+         0, 0x6350, 	 0, 	 0, 	 0, 0x4051, 0x314F, 0x323A, /* 0x40 */
+    0x302C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x634F, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x6351, 0x6352, 0x3E77, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x6353, 	 0, 0x334F, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x6355, 	 0, 	 0, 	 0, 0x376A, 	 0, 0x3566, 	 0, /* 0x70 */
+         0, 0x6356, 0x3675, 	 0, 	 0, 0x6357, 	 0, 0x407C, /* 0x70 */
+         0, 0x464D, 	 0, 0x4060, 0x3A75, 	 0, 	 0, 	 0, /* 0x80 */
+    0x6358, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x4362, 0x416B, 	 0, 0x635A, 0x635C, 0x6359, /* 0x90 */
+    0x635B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3722, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x635D, 0x3726, 	 0, 	 0, 	 0, 0x3567, 0x4D52, /* 0xA0 */
+    0x635F, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6360, 	 0, /* 0xB0 */
+         0, 	 0, 0x312E, 	 0, 	 0, 	 0, 	 0, 0x6363, /* 0xB0 */
+         0, 	 0, 	 0, 0x3376, 0x6362, 0x6361, 	 0, 0x6365, /* 0xC0 */
+    0x635E, 	 0, 0x6366, 0x4E29, 	 0, 0x6367, 	 0, 0x6368, /* 0xC0 */
+         0, 	 0, 0x5474, 0x636A, 	 0, 0x6369, 	 0, 	 0, /* 0xD0 */
+         0, 0x636B, 0x636C, 	 0, 0x4E35, 0x636D, 	 0, 0x706F, /* 0xD0 */
+    0x3E4F, 0x636E, 0x636F, 0x3D57, 	 0, 0x4638, 0x6370, 	 0, /* 0xE0 */
+         0, 	 0, 0x4328, 	 0, 	 0, 0x6371, 	 0, 0x433C, /* 0xE0 */
+    0x6372, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3625, 	 0, /* 0xF0 */
+    0x513F, 0x435D, 0x3C33, 	 0, 	 0, 	 0, 	 0, 0x3448	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_7B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x6373,      0, 0x6422,      0, 0x6376,      0, /* 0x00 */
-    0x3568,      0, 0x6375, 0x6424,      0,      0,      0, 0x6374, /* 0x00 */
-         0, 0x3E50,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0x6378, 0x6379,      0, 0x452B,      0,      0, 0x637A,      0, /* 0x10 */
-    0x335E,      0,      0,      0,      0, 0x3F5A, 0x4964,      0, /* 0x20 */
-    0x637C,      0,      0,      0, 0x4268,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0x6377,      0, 0x637B, 0x637D,      0, /* 0x30 */
-         0, 0x3A7B,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0x6426, 0x492E,      0, /* 0x40 */
-    0x4826, 0x4579,      0, 0x365A, 0x6425, 0x6423,      0, 0x4835, /* 0x40 */
-    0x637E, 0x435E, 0x457B,      0, 0x457A,      0, 0x3A76,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0x6438,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0x6428,      0, 0x642A, /* 0x60 */
-         0,      0,      0,      0, 0x642D,      0, 0x642E,      0, /* 0x60 */
-    0x642B, 0x642C,      0,      0, 0x6429, 0x6427,      0,      0, /* 0x70 */
-         0,      0, 0x6421,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x4A4F, 0x3255, /* 0x80 */
-         0,      0,      0, 0x6435,      0, 0x6432,      0, 0x6437, /* 0x80 */
-         0,      0, 0x6436,      0, 0x4773, 0x4C27,      0, 0x3B3B, /* 0x90 */
-    0x6430, 0x6439, 0x6434,      0, 0x6433, 0x642F,      0, 0x6431, /* 0x90 */
-         0, 0x3449,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x433D,      0,      0, 0x407D,      0,      0, /* 0xA0 */
-         0, 0x4822,      0,      0, 0x643E,      0,      0,      0, /* 0xB0 */
-    0x4824,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x4061, 0x643B,      0,      0, 0x484F,      0, 0x643F, 0x4A53, /* 0xC0 */
-         0, 0x435B,      0, 0x643A, 0x643C,      0,      0, 0x643D, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x6440,      0,      0, /* 0xD0 */
-    0x3C44,      0,      0,      0, 0x4646, 0x6445, 0x6444,      0, /* 0xE0 */
-         0, 0x6441,      0,      0,      0, 0x4F36,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x644A,      0,      0, 0x644E, 0x644B  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x6373, 	 0, 0x6422, 	 0, 0x6376, 	 0, /* 0x00 */
+    0x3568, 	 0, 0x6375, 0x6424, 	 0, 	 0, 	 0, 0x6374, /* 0x00 */
+         0, 0x3E50, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x6378, 0x6379, 	 0, 0x452B, 	 0, 	 0, 0x637A, 	 0, /* 0x10 */
+    0x335E, 	 0, 	 0, 	 0, 	 0, 0x3F5A, 0x4964, 	 0, /* 0x20 */
+    0x637C, 	 0, 	 0, 	 0, 0x4268, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x6377, 	 0, 0x637B, 0x637D, 	 0, /* 0x30 */
+         0, 0x3A7B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6426, 0x492E, 	 0, /* 0x40 */
+    0x4826, 0x4579, 	 0, 0x365A, 0x6425, 0x6423, 	 0, 0x4835, /* 0x40 */
+    0x637E, 0x435E, 0x457B, 	 0, 0x457A, 	 0, 0x3A76, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6438, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6428, 	 0, 0x642A, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x642D, 	 0, 0x642E, 	 0, /* 0x60 */
+    0x642B, 0x642C, 	 0, 	 0, 0x6429, 0x6427, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x6421, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4A4F, 0x3255, /* 0x80 */
+         0, 	 0, 	 0, 0x6435, 	 0, 0x6432, 	 0, 0x6437, /* 0x80 */
+         0, 	 0, 0x6436, 	 0, 0x4773, 0x4C27, 	 0, 0x3B3B, /* 0x90 */
+    0x6430, 0x6439, 0x6434, 	 0, 0x6433, 0x642F, 	 0, 0x6431, /* 0x90 */
+         0, 0x3449, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x433D, 	 0, 	 0, 0x407D, 	 0, 	 0, /* 0xA0 */
+         0, 0x4822, 	 0, 	 0, 0x643E, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x4824, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x4061, 0x643B, 	 0, 	 0, 0x484F, 	 0, 0x643F, 0x4A53, /* 0xC0 */
+         0, 0x435B, 	 0, 0x643A, 0x643C, 	 0, 	 0, 0x643D, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6440, 	 0, 	 0, /* 0xD0 */
+    0x3C44, 	 0, 	 0, 	 0, 0x4646, 0x6445, 0x6444, 	 0, /* 0xE0 */
+         0, 0x6441, 	 0, 	 0, 	 0, 0x4F36, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x644A, 	 0, 	 0, 0x644E, 0x644B	/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -2191,947 +2191,947 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_7B[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_7C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x6447,      0,      0,      0,      0,      0,      0, 0x6448, /* 0x00 */
-         0,      0,      0,      0,      0, 0x644D,      0,      0, /* 0x00 */
-         0, 0x6442, 0x5255, 0x6449, 0x6443,      0,      0, 0x644C, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0x6452, /* 0x10 */
-         0, 0x344A,      0, 0x644F,      0,      0,      0, 0x6450, /* 0x20 */
-         0,      0, 0x6451, 0x6454,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0x6453, /* 0x30 */
-    0x4876,      0,      0,      0,      0, 0x6455, 0x4E7C, 0x4A6D, /* 0x30 */
-    0x645A,      0,      0, 0x6457,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0x6456, 0x4052,      0, 0x6459, /* 0x40 */
-    0x645B,      0,      0,      0, 0x6458,      0, 0x645F,      0, /* 0x50 */
-    0x645C,      0,      0,      0,      0,      0,      0, 0x645D, /* 0x50 */
-    0x6446,      0,      0,      0, 0x645E, 0x6460,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0x6461,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0x4A46,      0, 0x6462,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x4C62,      0, /* 0x70 */
-         0, 0x364E, 0x3729, 0x6463,      0,      0,      0,      0, /* 0x80 */
-         0, 0x4A34,      0, 0x3F68,      0, 0x4C30,      0,      0, /* 0x80 */
-    0x6464,      0, 0x4E33,      0,      0, 0x4774,      0, 0x4146, /* 0x90 */
-    0x4734,      0,      0, 0x3D4D,      0,      0,      0, 0x3040, /* 0x90 */
-         0, 0x6469, 0x6467,      0, 0x6465, 0x3421,      0, 0x3E51, /* 0xA0 */
-    0x646A,      0,      0, 0x6468,      0, 0x6466, 0x646E,      0, /* 0xA0 */
-         0, 0x646D, 0x646C, 0x646B,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x646F,      0,      0,      0, 0x6470, 0x403A,      0, /* 0xB0 */
-    0x6471,      0, 0x6473,      0,      0, 0x6472,      0,      0, /* 0xC0 */
-         0,      0, 0x3852,      0,      0,      0, 0x4138,      0, /* 0xC0 */
-         0,      0, 0x6475,      0,      0,      0, 0x457C,      0, /* 0xD0 */
-    0x6474,      0,      0,      0, 0x6476,      0, 0x4A35, 0x416C, /* 0xD0 */
-    0x3947,      0, 0x6477,      0,      0,      0,      0, 0x4E48, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0x6479, /* 0xE0 */
-         0,      0, 0x647A,      0, 0x647B,      0, 0x647C,      0, /* 0xF0 */
-    0x3B65,      0, 0x647D, 0x374F,      0,      0, 0x356A          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x6447, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6448, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x644D, 	 0, 	 0, /* 0x00 */
+         0, 0x6442, 0x5255, 0x6449, 0x6443, 	 0, 	 0, 0x644C, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6452, /* 0x10 */
+         0, 0x344A, 	 0, 0x644F, 	 0, 	 0, 	 0, 0x6450, /* 0x20 */
+         0, 	 0, 0x6451, 0x6454, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6453, /* 0x30 */
+    0x4876, 	 0, 	 0, 	 0, 	 0, 0x6455, 0x4E7C, 0x4A6D, /* 0x30 */
+    0x645A, 	 0, 	 0, 0x6457, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x6456, 0x4052, 	 0, 0x6459, /* 0x40 */
+    0x645B, 	 0, 	 0, 	 0, 0x6458, 	 0, 0x645F, 	 0, /* 0x50 */
+    0x645C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x645D, /* 0x50 */
+    0x6446, 	 0, 	 0, 	 0, 0x645E, 0x6460, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x6461, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x4A46, 	 0, 0x6462, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4C62, 	 0, /* 0x70 */
+         0, 0x364E, 0x3729, 0x6463, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x4A34, 	 0, 0x3F68, 	 0, 0x4C30, 	 0, 	 0, /* 0x80 */
+    0x6464, 	 0, 0x4E33, 	 0, 	 0, 0x4774, 	 0, 0x4146, /* 0x90 */
+    0x4734, 	 0, 	 0, 0x3D4D, 	 0, 	 0, 	 0, 0x3040, /* 0x90 */
+         0, 0x6469, 0x6467, 	 0, 0x6465, 0x3421, 	 0, 0x3E51, /* 0xA0 */
+    0x646A, 	 0, 	 0, 0x6468, 	 0, 0x6466, 0x646E, 	 0, /* 0xA0 */
+         0, 0x646D, 0x646C, 0x646B, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x646F, 	 0, 	 0, 	 0, 0x6470, 0x403A, 	 0, /* 0xB0 */
+    0x6471, 	 0, 0x6473, 	 0, 	 0, 0x6472, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x3852, 	 0, 	 0, 	 0, 0x4138, 	 0, /* 0xC0 */
+         0, 	 0, 0x6475, 	 0, 	 0, 	 0, 0x457C, 	 0, /* 0xD0 */
+    0x6474, 	 0, 	 0, 	 0, 0x6476, 	 0, 0x4A35, 0x416C, /* 0xD0 */
+    0x3947, 	 0, 0x6477, 	 0, 	 0, 	 0, 	 0, 0x4E48, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6479, /* 0xE0 */
+         0, 	 0, 0x647A, 	 0, 0x647B, 	 0, 0x647C, 	 0, /* 0xF0 */
+    0x3B65, 	 0, 0x647D, 0x374F, 	 0, 	 0, 0x356A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_7D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x352A,      0, 0x6521,      0, 0x4C73, 0x3948, 0x647E,      0, /* 0x00 */
-         0,      0, 0x6524, 0x4C66,      0, 0x473C,      0,      0, /* 0x00 */
-    0x4933,      0,      0,      0, 0x3D63, 0x6523,      0, 0x3C53, /* 0x10 */
-    0x3949, 0x3B66, 0x3569, 0x4A36, 0x6522,      0,      0,      0, /* 0x10 */
-    0x4147, 0x4B42, 0x3A77,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0x3B67, 0x445D,      0, 0x6527, 0x4E5F, /* 0x20 */
-    0x3A59,      0, 0x6528, 0x3F42,      0, 0x652A,      0,      0, /* 0x30 */
-         0, 0x3E52, 0x3A30,      0,      0,      0,      0, 0x6529, /* 0x30 */
-         0,      0, 0x3D2A, 0x383E, 0x4148, 0x6525, 0x652B,      0, /* 0x40 */
-         0,      0,      0, 0x6526, 0x3750,      0, 0x652E, 0x6532, /* 0x40 */
-    0x376B,      0,      0,      0,      0,      0, 0x652D,      0, /* 0x50 */
-         0,      0,      0, 0x6536,      0,      0, 0x394A,      0, /* 0x50 */
-         0, 0x4D6D, 0x303C, 0x6533,      0,      0, 0x356B,      0, /* 0x60 */
-    0x6530,      0,      0,      0,      0,      0, 0x6531,      0, /* 0x60 */
-         0, 0x457D, 0x652F, 0x652C,      0, 0x3328, 0x4064,      0, /* 0x70 */
-         0, 0x3828,      0,      0,      0, 0x6538,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0x6535,      0,      0,      0,      0,      0, 0x6537, /* 0x80 */
-         0,      0,      0, 0x6534,      0,      0,      0,      0, /* 0x90 */
-         0, 0x3751, 0x4233, 0x6539, 0x416E,      0,      0, 0x6546, /* 0x90 */
-         0,      0, 0x6542, 0x653C,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x6540, 0x3C7A, 0x305D, 0x653B, 0x6543, /* 0xA0 */
-    0x6547, 0x394B, 0x4C56,      0, 0x4456, 0x653D,      0,      0, /* 0xB0 */
-    0x6545,      0, 0x653A, 0x433E,      0, 0x653F, 0x303D, 0x4C4A, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0x653E, /* 0xC0 */
-         0,      0, 0x365B, 0x486C,      0,      0,      0, 0x416D, /* 0xC0 */
-         0, 0x4E50, 0x3D6F,      0,      0, 0x656E,      0,      0, /* 0xD0 */
-    0x6548,      0, 0x407E,      0, 0x6544, 0x6549, 0x654B,      0, /* 0xD0 */
-    0x4479, 0x654E,      0,      0, 0x654A,      0,      0,      0, /* 0xE0 */
-    0x4A54, 0x344B,      0,      0, 0x4C4B,      0,      0, 0x305E, /* 0xE0 */
-         0,      0, 0x654D,      0, 0x4E7D,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0x654C                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x352A, 	 0, 0x6521, 	 0, 0x4C73, 0x3948, 0x647E, 	 0, /* 0x00 */
+         0, 	 0, 0x6524, 0x4C66, 	 0, 0x473C, 	 0, 	 0, /* 0x00 */
+    0x4933, 	 0, 	 0, 	 0, 0x3D63, 0x6523, 	 0, 0x3C53, /* 0x10 */
+    0x3949, 0x3B66, 0x3569, 0x4A36, 0x6522, 	 0, 	 0, 	 0, /* 0x10 */
+    0x4147, 0x4B42, 0x3A77, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x3B67, 0x445D, 	 0, 0x6527, 0x4E5F, /* 0x20 */
+    0x3A59, 	 0, 0x6528, 0x3F42, 	 0, 0x652A, 	 0, 	 0, /* 0x30 */
+         0, 0x3E52, 0x3A30, 	 0, 	 0, 	 0, 	 0, 0x6529, /* 0x30 */
+         0, 	 0, 0x3D2A, 0x383E, 0x4148, 0x6525, 0x652B, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x6526, 0x3750, 	 0, 0x652E, 0x6532, /* 0x40 */
+    0x376B, 	 0, 	 0, 	 0, 	 0, 	 0, 0x652D, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x6536, 	 0, 	 0, 0x394A, 	 0, /* 0x50 */
+         0, 0x4D6D, 0x303C, 0x6533, 	 0, 	 0, 0x356B, 	 0, /* 0x60 */
+    0x6530, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6531, 	 0, /* 0x60 */
+         0, 0x457D, 0x652F, 0x652C, 	 0, 0x3328, 0x4064, 	 0, /* 0x70 */
+         0, 0x3828, 	 0, 	 0, 	 0, 0x6538, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x6535, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6537, /* 0x80 */
+         0, 	 0, 	 0, 0x6534, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x3751, 0x4233, 0x6539, 0x416E, 	 0, 	 0, 0x6546, /* 0x90 */
+         0, 	 0, 0x6542, 0x653C, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x6540, 0x3C7A, 0x305D, 0x653B, 0x6543, /* 0xA0 */
+    0x6547, 0x394B, 0x4C56, 	 0, 0x4456, 0x653D, 	 0, 	 0, /* 0xB0 */
+    0x6545, 	 0, 0x653A, 0x433E, 	 0, 0x653F, 0x303D, 0x4C4A, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x653E, /* 0xC0 */
+         0, 	 0, 0x365B, 0x486C, 	 0, 	 0, 	 0, 0x416D, /* 0xC0 */
+         0, 0x4E50, 0x3D6F, 	 0, 	 0, 0x656E, 	 0, 	 0, /* 0xD0 */
+    0x6548, 	 0, 0x407E, 	 0, 0x6544, 0x6549, 0x654B, 	 0, /* 0xD0 */
+    0x4479, 0x654E, 	 0, 	 0, 0x654A, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x4A54, 0x344B, 	 0, 	 0, 0x4C4B, 	 0, 	 0, 0x305E, /* 0xE0 */
+         0, 	 0, 0x654D, 	 0, 0x4E7D, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0x654C									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_7E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x316F,      0,      0, 0x466C, 0x654F,      0,      0, /* 0x00 */
-         0, 0x6556, 0x6550, 0x6557,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0x6553,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0x477B,      0,      0, 0x3C4A, 0x6555, /* 0x10 */
-         0, 0x6552, 0x6558, 0x6551,      0,      0, 0x3D44,      0, /* 0x20 */
-         0,      0,      0, 0x4B25,      0,      0, 0x3D4C,      0, /* 0x20 */
-         0, 0x6554, 0x6560,      0,      0, 0x655C,      0, 0x655F, /* 0x30 */
-         0, 0x655D, 0x6561, 0x655B,      0, 0x6541, 0x4053,      0, /* 0x30 */
-         0, 0x484B,      0, 0x655E,      0,      0, 0x6559,      0, /* 0x40 */
-         0,      0, 0x4121, 0x3752,      0, 0x3D2B,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0x3F25, 0x4136, 0x6564,      0, /* 0x50 */
-         0, 0x6566, 0x6567,      0,      0, 0x6563, 0x6565,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0x655A, 0x6562, /* 0x60 */
-         0, 0x656A, 0x6569,      0,      0, 0x4B7A,      0,      0, /* 0x60 */
-    0x372B,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x6568,      0, 0x656C, 0x656B, 0x656F,      0, 0x6571, /* 0x70 */
-         0,      0, 0x3B3C, 0x656D,      0,      0,      0,      0, /* 0x80 */
-    0x6572, 0x6573,      0,      0, 0x6574,      0, 0x657A, 0x453B, /* 0x80 */
-    0x6576,      0, 0x6575, 0x6577, 0x6578,      0, 0x6579,      0, /* 0x90 */
-         0,      0,      0, 0x657B, 0x657C                          /* 0x90 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x316F, 	 0, 	 0, 0x466C, 0x654F, 	 0, 	 0, /* 0x00 */
+         0, 0x6556, 0x6550, 0x6557, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x6553, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x477B, 	 0, 	 0, 0x3C4A, 0x6555, /* 0x10 */
+         0, 0x6552, 0x6558, 0x6551, 	 0, 	 0, 0x3D44, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x4B25, 	 0, 	 0, 0x3D4C, 	 0, /* 0x20 */
+         0, 0x6554, 0x6560, 	 0, 	 0, 0x655C, 	 0, 0x655F, /* 0x30 */
+         0, 0x655D, 0x6561, 0x655B, 	 0, 0x6541, 0x4053, 	 0, /* 0x30 */
+         0, 0x484B, 	 0, 0x655E, 	 0, 	 0, 0x6559, 	 0, /* 0x40 */
+         0, 	 0, 0x4121, 0x3752, 	 0, 0x3D2B, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x3F25, 0x4136, 0x6564, 	 0, /* 0x50 */
+         0, 0x6566, 0x6567, 	 0, 	 0, 0x6563, 0x6565, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x655A, 0x6562, /* 0x60 */
+         0, 0x656A, 0x6569, 	 0, 	 0, 0x4B7A, 	 0, 	 0, /* 0x60 */
+    0x372B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x6568, 	 0, 0x656C, 0x656B, 0x656F, 	 0, 0x6571, /* 0x70 */
+         0, 	 0, 0x3B3C, 0x656D, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x6572, 0x6573, 	 0, 	 0, 0x6574, 	 0, 0x657A, 0x453B, /* 0x80 */
+    0x6576, 	 0, 0x6575, 0x6577, 0x6578, 	 0, 0x6579, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x657B, 0x657C							/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_7F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0x344C,      0, /* 0x30 */
-    0x657D,      0, 0x657E,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0x6621,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0x6622, 0x6623, 0x6624,      0, /* 0x40 */
-    0x6625, 0x6626,      0,      0, 0x6628, 0x6627,      0,      0, /* 0x50 */
-    0x6629,      0,      0,      0,      0,      0,      0, 0x662A, /* 0x50 */
-    0x662B,      0,      0,      0,      0,      0,      0, 0x662E, /* 0x60 */
-    0x662C, 0x662D, 0x3A61, 0x3753,      0,      0, 0x4356,      0, /* 0x60 */
-    0x4833,      0, 0x3D70,      0,      0, 0x474D,      0, 0x486D, /* 0x70 */
-    0x662F, 0x586D,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x6630, 0x6632,      0, 0x4D65, 0x6631, 0x6634, /* 0x80 */
-    0x6633,      0, 0x4D53,      0, 0x6635,      0, 0x487E,      0, /* 0x80 */
-         0,      0,      0,      0, 0x6636,      0,      0,      0, /* 0x90 */
-         0,      0, 0x6639,      0,      0, 0x6638, 0x6637,      0, /* 0x90 */
-         0,      0,      0, 0x663A, 0x3732,      0,      0,      0, /* 0xA0 */
-    0x4122, 0x3541,      0,      0,      0,      0, 0x663E, 0x663B, /* 0xA0 */
-         0,      0, 0x663C,      0,      0,      0, 0x663F,      0, /* 0xB0 */
-    0x6640, 0x663D,      0,      0,      0, 0x3129,      0,      0, /* 0xB0 */
-         0, 0x3227,      0,      0,      0, 0x6642, 0x6643,      0, /* 0xC0 */
-         0,      0, 0x6644,      0, 0x4D62,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x3D2C,      0, 0x6646, 0x6645,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x3F69, 0x6647,      0,      0,      0,      0, 0x6648,      0, /* 0xE0 */
-         0, 0x6649,      0, 0x3465,      0,      0,      0,      0, /* 0xE0 */
-    0x344D,      0,      0, 0x664A,      0,      0,      0,      0, /* 0xF0 */
-         0, 0x664B,      0, 0x4B5D, 0x4D63                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0x344C, 	 0, /* 0x30 */
+    0x657D, 	 0, 0x657E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6621, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x6622, 0x6623, 0x6624, 	 0, /* 0x40 */
+    0x6625, 0x6626, 	 0, 	 0, 0x6628, 0x6627, 	 0, 	 0, /* 0x50 */
+    0x6629, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x662A, /* 0x50 */
+    0x662B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x662E, /* 0x60 */
+    0x662C, 0x662D, 0x3A61, 0x3753, 	 0, 	 0, 0x4356, 	 0, /* 0x60 */
+    0x4833, 	 0, 0x3D70, 	 0, 	 0, 0x474D, 	 0, 0x486D, /* 0x70 */
+    0x662F, 0x586D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x6630, 0x6632, 	 0, 0x4D65, 0x6631, 0x6634, /* 0x80 */
+    0x6633, 	 0, 0x4D53, 	 0, 0x6635, 	 0, 0x487E, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x6636, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x6639, 	 0, 	 0, 0x6638, 0x6637, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x663A, 0x3732, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x4122, 0x3541, 	 0, 	 0, 	 0, 	 0, 0x663E, 0x663B, /* 0xA0 */
+         0, 	 0, 0x663C, 	 0, 	 0, 	 0, 0x663F, 	 0, /* 0xB0 */
+    0x6640, 0x663D, 	 0, 	 0, 	 0, 0x3129, 	 0, 	 0, /* 0xB0 */
+         0, 0x3227, 	 0, 	 0, 	 0, 0x6642, 0x6643, 	 0, /* 0xC0 */
+         0, 	 0, 0x6644, 	 0, 0x4D62, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x3D2C, 	 0, 0x6646, 0x6645, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x3F69, 0x6647, 	 0, 	 0, 	 0, 	 0, 0x6648, 	 0, /* 0xE0 */
+         0, 0x6649, 	 0, 0x3465, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x344D, 	 0, 	 0, 0x664A, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0x664B, 	 0, 0x4B5D, 0x4D63							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_80[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x4D54, 0x4F37,      0, 0x394D, 0x664E, 0x3C54, 0x664D,      0, /* 0x00 */
-         0,      0,      0, 0x664F, 0x3C29,      0,      0,      0, /* 0x00 */
-    0x4251,      0, 0x6650,      0,      0, 0x394C,      0, 0x4C57, /* 0x10 */
-    0x6651, 0x6652,      0,      0, 0x6653,      0,      0,      0, /* 0x10 */
-         0, 0x6654,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0x6655,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0x3C2A,      0,      0, 0x4C6D,      0, /* 0x30 */
-         0,      0,      0, 0x6657,      0, 0x433F,      0, 0x6656, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0x6659,      0, /* 0x40 */
-         0,      0, 0x6658,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x665A,      0,      0,      0, 0x403B,      0, /* 0x50 */
-    0x665B,      0, 0x665C,      0,      0,      0, 0x4A39, 0x665D, /* 0x50 */
-         0, 0x416F, 0x665E,      0,      0,      0,      0,      0, /* 0x60 */
-    0x665F,      0,      0,      0,      0,      0,      0, 0x4E7E, /* 0x60 */
-    0x6662,      0, 0x6661, 0x6660, 0x4430,      0, 0x6663, 0x3F26, /* 0x70 */
-         0, 0x6664,      0,      0,      0, 0x6665, 0x4F38, 0x6666, /* 0x70 */
-         0,      0,      0,      0, 0x6667, 0x6669, 0x6668, 0x4825, /* 0x80 */
-         0, 0x4679,      0, 0x4F3E, 0x4829,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x666B,      0,      0, 0x3E53,      0, /* 0x90 */
-    0x492A,      0, 0x666C, 0x666A,      0, 0x344E,      0,      0, /* 0x90 */
-         0, 0x3854, 0x3B68,      0,      0, 0x486E,      0,      0, /* 0xA0 */
-         0, 0x382A, 0x4B43,      0, 0x666F, 0x666D,      0, 0x394E, /* 0xA0 */
-         0, 0x394F, 0x3069,      0, 0x3A68,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x4759,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x305F, 0x6674,      0, 0x4340,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x4758,      0, 0x425B,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0x6676,      0, /* 0xD0 */
-         0, 0x6672, 0x6675, 0x6670,      0, 0x6673, 0x4B26,      0, /* 0xD0 */
-         0, 0x3855,      0,      0, 0x307D, 0x6671,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0x6678, /* 0xE0 */
-         0, 0x6679,      0,      0, 0x4639,      0,      0,      0, /* 0xF0 */
-    0x363B,      0,      0,      0, 0x6726, 0x473D                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x4D54, 0x4F37, 	 0, 0x394D, 0x664E, 0x3C54, 0x664D, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x664F, 0x3C29, 	 0, 	 0, 	 0, /* 0x00 */
+    0x4251, 	 0, 0x6650, 	 0, 	 0, 0x394C, 	 0, 0x4C57, /* 0x10 */
+    0x6651, 0x6652, 	 0, 	 0, 0x6653, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x6654, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x6655, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x3C2A, 	 0, 	 0, 0x4C6D, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x6657, 	 0, 0x433F, 	 0, 0x6656, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6659, 	 0, /* 0x40 */
+         0, 	 0, 0x6658, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x665A, 	 0, 	 0, 	 0, 0x403B, 	 0, /* 0x50 */
+    0x665B, 	 0, 0x665C, 	 0, 	 0, 	 0, 0x4A39, 0x665D, /* 0x50 */
+         0, 0x416F, 0x665E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x665F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4E7E, /* 0x60 */
+    0x6662, 	 0, 0x6661, 0x6660, 0x4430, 	 0, 0x6663, 0x3F26, /* 0x70 */
+         0, 0x6664, 	 0, 	 0, 	 0, 0x6665, 0x4F38, 0x6666, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0x6667, 0x6669, 0x6668, 0x4825, /* 0x80 */
+         0, 0x4679, 	 0, 0x4F3E, 0x4829, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x666B, 	 0, 	 0, 0x3E53, 	 0, /* 0x90 */
+    0x492A, 	 0, 0x666C, 0x666A, 	 0, 0x344E, 	 0, 	 0, /* 0x90 */
+         0, 0x3854, 0x3B68, 	 0, 	 0, 0x486E, 	 0, 	 0, /* 0xA0 */
+         0, 0x382A, 0x4B43, 	 0, 0x666F, 0x666D, 	 0, 0x394E, /* 0xA0 */
+         0, 0x394F, 0x3069, 	 0, 0x3A68, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x4759, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x305F, 0x6674, 	 0, 0x4340, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x4758, 	 0, 0x425B, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6676, 	 0, /* 0xD0 */
+         0, 0x6672, 0x6675, 0x6670, 	 0, 0x6673, 0x4B26, 	 0, /* 0xD0 */
+         0, 0x3855, 	 0, 	 0, 0x307D, 0x6671, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6678, /* 0xE0 */
+         0, 0x6679, 	 0, 	 0, 0x4639, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x363B, 	 0, 	 0, 	 0, 0x6726, 0x473D					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_81[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x3B69,      0,      0, 0x363C, 0x4048, 0x4F46, /* 0x00 */
-    0x4C2E, 0x6677, 0x4054,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x3553, 0x667A,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0x667C,      0,      0,      0,      0, /* 0x20 */
-         0, 0x667B,      0,      0,      0,      0,      0, 0x667D, /* 0x20 */
-         0, 0x4326,      0, 0x473E,      0,      0,      0,      0, /* 0x30 */
-         0, 0x4431,      0,      0,      0,      0, 0x6723,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0x6722,      0, /* 0x40 */
-         0,      0,      0, 0x667E,      0,      0, 0x3F55,      0, /* 0x40 */
-    0x4965, 0x6725,      0, 0x6724, 0x3950, 0x4F53,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0x6735, /* 0x50 */
-         0,      0,      0,      0,      0, 0x6729, 0x672A,      0, /* 0x60 */
-         0,      0,      0, 0x3C70,      0,      0, 0x6728,      0, /* 0x60 */
-    0x3978, 0x6727,      0,      0, 0x672B,      0,      0,      0, /* 0x70 */
-    0x4432, 0x4A22, 0x4123,      0,      0,      0,      0, 0x425C, /* 0x70 */
-    0x672F,      0, 0x6730, 0x672C,      0,      0,      0,      0, /* 0x80 */
-    0x672D,      0, 0x672E,      0,      0,      0,      0, 0x3951, /* 0x80 */
-         0,      0,      0, 0x6736,      0, 0x6732,      0,      0, /* 0x90 */
-         0,      0, 0x4966,      0, 0x4B6C, 0x4928,      0,      0, /* 0x90 */
-    0x6731,      0,      0, 0x6734, 0x6733,      0,      0,      0, /* 0xA0 */
-    0x4B44, 0x6737,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x6738,      0,      0, 0x4137,      0, 0x6739,      0,      0, /* 0xB0 */
-    0x673B,      0, 0x673F,      0,      0, 0x673C, 0x673A, 0x473F, /* 0xB0 */
-    0x673D,      0, 0x673E,      0,      0,      0, 0x3232,      0, /* 0xC0 */
-    0x6745, 0x6740,      0,      0,      0, 0x6741,      0,      0, /* 0xC0 */
-         0, 0x6742,      0, 0x4221,      0,      0,      0,      0, /* 0xD0 */
-    0x6744, 0x6743, 0x6746,      0,      0,      0,      0, 0x6747, /* 0xD0 */
-    0x6748,      0,      0, 0x3F43,      0, 0x3269,      0, 0x6749, /* 0xE0 */
-    0x4E57,      0, 0x3C2B,      0,      0, 0x3D2D,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x3B6A, 0x4357,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x674A, 0x674B, 0x3131,      0, 0x674C          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x3B69, 	 0, 	 0, 0x363C, 0x4048, 0x4F46, /* 0x00 */
+    0x4C2E, 0x6677, 0x4054, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x3553, 0x667A, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x667C, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x667B, 	 0, 	 0, 	 0, 	 0, 	 0, 0x667D, /* 0x20 */
+         0, 0x4326, 	 0, 0x473E, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x4431, 	 0, 	 0, 	 0, 	 0, 0x6723, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6722, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x667E, 	 0, 	 0, 0x3F55, 	 0, /* 0x40 */
+    0x4965, 0x6725, 	 0, 0x6724, 0x3950, 0x4F53, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6735, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6729, 0x672A, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x3C70, 	 0, 	 0, 0x6728, 	 0, /* 0x60 */
+    0x3978, 0x6727, 	 0, 	 0, 0x672B, 	 0, 	 0, 	 0, /* 0x70 */
+    0x4432, 0x4A22, 0x4123, 	 0, 	 0, 	 0, 	 0, 0x425C, /* 0x70 */
+    0x672F, 	 0, 0x6730, 0x672C, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x672D, 	 0, 0x672E, 	 0, 	 0, 	 0, 	 0, 0x3951, /* 0x80 */
+         0, 	 0, 	 0, 0x6736, 	 0, 0x6732, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x4966, 	 0, 0x4B6C, 0x4928, 	 0, 	 0, /* 0x90 */
+    0x6731, 	 0, 	 0, 0x6734, 0x6733, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x4B44, 0x6737, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x6738, 	 0, 	 0, 0x4137, 	 0, 0x6739, 	 0, 	 0, /* 0xB0 */
+    0x673B, 	 0, 0x673F, 	 0, 	 0, 0x673C, 0x673A, 0x473F, /* 0xB0 */
+    0x673D, 	 0, 0x673E, 	 0, 	 0, 	 0, 0x3232, 	 0, /* 0xC0 */
+    0x6745, 0x6740, 	 0, 	 0, 	 0, 0x6741, 	 0, 	 0, /* 0xC0 */
+         0, 0x6742, 	 0, 0x4221, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x6744, 0x6743, 0x6746, 	 0, 	 0, 	 0, 	 0, 0x6747, /* 0xD0 */
+    0x6748, 	 0, 	 0, 0x3F43, 	 0, 0x3269, 	 0, 0x6749, /* 0xE0 */
+    0x4E57, 	 0, 0x3C2B, 	 0, 	 0, 0x3D2D, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x3B6A, 0x4357, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x674A, 0x674B, 0x3131, 	 0, 0x674C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_82[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x674D, 0x674E,      0,      0, 0x674F,      0, 0x6750, /* 0x00 */
-    0x363D, 0x5A2A, 0x6751,      0, 0x4065, 0x6752, 0x3C4B,      0, /* 0x00 */
-    0x6753,      0, 0x5030,      0,      0,      0, 0x6754, 0x4A5E, /* 0x10 */
-    0x345C,      0,      0, 0x4124, 0x3D58,      0, 0x4971, 0x3D2E, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0x6755, 0x3952, 0x6756, 0x484C,      0, 0x6764,      0, /* 0x20 */
-         0,      0,      0, 0x6758,      0, 0x4249, 0x4775, 0x383F, /* 0x30 */
-    0x6757, 0x4125,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0x6759,      0,      0,      0,      0,      0,      0, 0x447A, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0x675B, 0x675A, 0x675D,      0,      0, 0x675C,      0, 0x675E, /* 0x50 */
-         0,      0, 0x6760,      0, 0x675F,      0, 0x344F,      0, /* 0x60 */
-    0x6761,      0, 0x6762, 0x6763,      0,      0, 0x3A31, 0x4E49, /* 0x60 */
-         0, 0x6765, 0x3F27,      0,      0,      0, 0x3170, 0x6766, /* 0x70 */
-    0x6767,      0,      0,      0,      0,      0, 0x6768,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x3072,      0, 0x6769,      0,      0, /* 0x80 */
-         0,      0, 0x676A,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0x4967,      0,      0,      0, 0x3C47,      0, 0x676C, /* 0x90 */
-         0,      0,      0,      0,      0, 0x3329, 0x3032,      0, /* 0xA0 */
-         0,      0,      0, 0x676B, 0x676E, 0x474E,      0, 0x3F44, /* 0xA0 */
-         0, 0x3256,      0, 0x4B27,      0,      0,      0,      0, /* 0xB0 */
-    0x375D, 0x365C,      0, 0x676D,      0, 0x326A,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x3423,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x3171, 0x6772, 0x4E6A, 0x425D,      0,      0, 0x4944, /* 0xD0 */
-         0, 0x677E,      0, 0x3257, 0x677C,      0, 0x677A, 0x6771, /* 0xD0 */
-         0, 0x676F,      0, 0x6770,      0, 0x3C63, 0x366C, 0x4377, /* 0xE0 */
-         0,      0,      0, 0x4651,      0,      0,      0,      0, /* 0xE0 */
-         0, 0x3151,      0, 0x6774, 0x6773,      0,      0,      0, /* 0xF0 */
-         0, 0x6779, 0x6775, 0x6778                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x674D, 0x674E, 	 0, 	 0, 0x674F, 	 0, 0x6750, /* 0x00 */
+    0x363D, 0x5A2A, 0x6751, 	 0, 0x4065, 0x6752, 0x3C4B, 	 0, /* 0x00 */
+    0x6753, 	 0, 0x5030, 	 0, 	 0, 	 0, 0x6754, 0x4A5E, /* 0x10 */
+    0x345C, 	 0, 	 0, 0x4124, 0x3D58, 	 0, 0x4971, 0x3D2E, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x6755, 0x3952, 0x6756, 0x484C, 	 0, 0x6764, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x6758, 	 0, 0x4249, 0x4775, 0x383F, /* 0x30 */
+    0x6757, 0x4125, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x6759, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x447A, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x675B, 0x675A, 0x675D, 	 0, 	 0, 0x675C, 	 0, 0x675E, /* 0x50 */
+         0, 	 0, 0x6760, 	 0, 0x675F, 	 0, 0x344F, 	 0, /* 0x60 */
+    0x6761, 	 0, 0x6762, 0x6763, 	 0, 	 0, 0x3A31, 0x4E49, /* 0x60 */
+         0, 0x6765, 0x3F27, 	 0, 	 0, 	 0, 0x3170, 0x6766, /* 0x70 */
+    0x6767, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6768, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x3072, 	 0, 0x6769, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x676A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x4967, 	 0, 	 0, 	 0, 0x3C47, 	 0, 0x676C, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3329, 0x3032, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x676B, 0x676E, 0x474E, 	 0, 0x3F44, /* 0xA0 */
+         0, 0x3256, 	 0, 0x4B27, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x375D, 0x365C, 	 0, 0x676D, 	 0, 0x326A, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3423, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x3171, 0x6772, 0x4E6A, 0x425D, 	 0, 	 0, 0x4944, /* 0xD0 */
+         0, 0x677E, 	 0, 0x3257, 0x677C, 	 0, 0x677A, 0x6771, /* 0xD0 */
+         0, 0x676F, 	 0, 0x6770, 	 0, 0x3C63, 0x366C, 0x4377, /* 0xE0 */
+         0, 	 0, 	 0, 0x4651, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x3151, 	 0, 0x6774, 0x6773, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0x6779, 0x6775, 0x6778									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_83[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x4C50, 0x6777, 0x3258, 0x337D, 0x677B,      0, /* 0x00 */
-         0, 0x677D,      0,      0,      0,      0, 0x3754,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0x6823, 0x682C, /* 0x10 */
-    0x682D,      0,      0,      0, 0x302B,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0x6834,      0,      0,      0,      0, /* 0x20 */
-    0x3071,      0,      0, 0x682B,      0,      0,      0, 0x682A, /* 0x20 */
-         0, 0x6825, 0x6824,      0, 0x6822, 0x6821, 0x4363,      0, /* 0x30 */
-    0x427B, 0x6827,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0x6826,      0,      0,      0,      0, 0x6829,      0,      0, /* 0x40 */
-         0, 0x4170, 0x3755,      0,      0,      0,      0, 0x3141, /* 0x40 */
-    0x6828,      0, 0x3953,      0,      0,      0,      0,      0, /* 0x50 */
-    0x4171,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0x683A,      0, 0x683B,      0, 0x3259, /* 0x70 */
-         0,      0,      0, 0x322E, 0x6838,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0x682E,      0, 0x6836, /* 0x80 */
-         0, 0x683D, 0x6837,      0,      0,      0, 0x6835,      0, /* 0x80 */
-         0,      0,      0, 0x6776,      0,      0, 0x6833,      0, /* 0x90 */
-         0,      0, 0x682F,      0,      0,      0, 0x3450, 0x6831, /* 0x90 */
-    0x683C,      0, 0x6832,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x683E,      0, 0x6830, 0x477C,      0,      0,      0,      0, /* 0xA0 */
-         0, 0x4D69,      0,      0,      0, 0x6839,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x684F,      0,      0, /* 0xB0 */
-         0, 0x6847,      0,      0,      0, 0x3F7B,      0,      0, /* 0xC0 */
-         0,      0, 0x3546,      0, 0x365D,      0, 0x6842,      0, /* 0xC0 */
-         0,      0,      0, 0x325B,      0,      0, 0x3E54,      0, /* 0xD0 */
-    0x6845,      0,      0,      0, 0x3A5A,      0,      0, 0x4551, /* 0xD0 */
-    0x684A,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0x4A6E,      0, 0x6841,      0,      0,      0, 0x325A, /* 0xE0 */
-    0x3856, 0x4929, 0x684B,      0, 0x683F,      0,      0, 0x6848, /* 0xF0 */
-         0,      0,      0, 0x6852,      0, 0x6843                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x4C50, 0x6777, 0x3258, 0x337D, 0x677B, 	 0, /* 0x00 */
+         0, 0x677D, 	 0, 	 0, 	 0, 	 0, 0x3754, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6823, 0x682C, /* 0x10 */
+    0x682D, 	 0, 	 0, 	 0, 0x302B, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x6834, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x3071, 	 0, 	 0, 0x682B, 	 0, 	 0, 	 0, 0x682A, /* 0x20 */
+         0, 0x6825, 0x6824, 	 0, 0x6822, 0x6821, 0x4363, 	 0, /* 0x30 */
+    0x427B, 0x6827, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x6826, 	 0, 	 0, 	 0, 	 0, 0x6829, 	 0, 	 0, /* 0x40 */
+         0, 0x4170, 0x3755, 	 0, 	 0, 	 0, 	 0, 0x3141, /* 0x40 */
+    0x6828, 	 0, 0x3953, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x4171, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x683A, 	 0, 0x683B, 	 0, 0x3259, /* 0x70 */
+         0, 	 0, 	 0, 0x322E, 0x6838, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x682E, 	 0, 0x6836, /* 0x80 */
+         0, 0x683D, 0x6837, 	 0, 	 0, 	 0, 0x6835, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x6776, 	 0, 	 0, 0x6833, 	 0, /* 0x90 */
+         0, 	 0, 0x682F, 	 0, 	 0, 	 0, 0x3450, 0x6831, /* 0x90 */
+    0x683C, 	 0, 0x6832, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x683E, 	 0, 0x6830, 0x477C, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x4D69, 	 0, 	 0, 	 0, 0x6839, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x684F, 	 0, 	 0, /* 0xB0 */
+         0, 0x6847, 	 0, 	 0, 	 0, 0x3F7B, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x3546, 	 0, 0x365D, 	 0, 0x6842, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x325B, 	 0, 	 0, 0x3E54, 	 0, /* 0xD0 */
+    0x6845, 	 0, 	 0, 	 0, 0x3A5A, 	 0, 	 0, 0x4551, /* 0xD0 */
+    0x684A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x4A6E, 	 0, 0x6841, 	 0, 	 0, 	 0, 0x325A, /* 0xE0 */
+    0x3856, 0x4929, 0x684B, 	 0, 0x683F, 	 0, 	 0, 0x6848, /* 0xF0 */
+         0, 	 0, 	 0, 0x6852, 	 0, 0x6843					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_84[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0x6844, 0x463A,      0,      0, 0x6849, /* 0x00 */
-         0,      0,      0, 0x6846, 0x4B28, 0x684C, 0x3060,      0, /* 0x00 */
-         0,      0,      0, 0x6840,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0x684E,      0, 0x684D,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0x476B, 0x6854,      0, 0x685F,      0,      0,      0, /* 0x20 */
-         0, 0x337E,      0,      0,      0, 0x6862,      0,      0, /* 0x30 */
-    0x6850,      0,      0,      0, 0x6855, 0x4D6E,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0x685E,      0, /* 0x40 */
-         0, 0x4D55,      0,      0,      0,      0, 0x4E2A,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0x4378, /* 0x50 */
-         0,      0,      0, 0x336B,      0,      0,      0,      0, /* 0x50 */
-         0, 0x4972, 0x6864, 0x4621,      0,      0, 0x3031,      0, /* 0x60 */
-         0, 0x685D,      0, 0x6859, 0x4172, 0x6853, 0x685B, 0x6860, /* 0x60 */
-         0, 0x472C,      0,      0,      0, 0x302A,      0, 0x6858, /* 0x70 */
-         0, 0x6861, 0x4978,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x685C,      0, 0x6857,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x3E55,      0,      0,      0,      0, /* 0x80 */
-    0x3D2F,      0,      0,      0, 0x3C2C,      0,      0,      0, /* 0x90 */
-         0, 0x4C58,      0,      0, 0x4947,      0,      0, 0x6867, /* 0x90 */
-         0, 0x6870,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0x685A,      0,      0, /* 0xA0 */
-         0,      0, 0x3377,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x3E78, 0x6865,      0, 0x686A, 0x4173,      0,      0, 0x6866, /* 0xB0 */
-         0, 0x686D,      0,      0, 0x435F,      0, 0x686E,      0, /* 0xC0 */
-         0, 0x4D56, 0x6863, 0x3338,      0, 0x6869,      0,      0, /* 0xC0 */
-    0x686C, 0x4C2C,      0,      0,      0,      0, 0x686F,      0, /* 0xD0 */
-         0, 0x6868, 0x686B,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0x4B29,      0, 0x4F21,      0, /* 0xE0 */
-         0,      0,      0,      0, 0x6873,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0, 0x687A,      0,      0, 0x6872  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0x6844, 0x463A, 	 0, 	 0, 0x6849, /* 0x00 */
+         0, 	 0, 	 0, 0x6846, 0x4B28, 0x684C, 0x3060, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x6840, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x684E, 	 0, 0x684D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x476B, 0x6854, 	 0, 0x685F, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x337E, 	 0, 	 0, 	 0, 0x6862, 	 0, 	 0, /* 0x30 */
+    0x6850, 	 0, 	 0, 	 0, 0x6855, 0x4D6E, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x685E, 	 0, /* 0x40 */
+         0, 0x4D55, 	 0, 	 0, 	 0, 	 0, 0x4E2A, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4378, /* 0x50 */
+         0, 	 0, 	 0, 0x336B, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x4972, 0x6864, 0x4621, 	 0, 	 0, 0x3031, 	 0, /* 0x60 */
+         0, 0x685D, 	 0, 0x6859, 0x4172, 0x6853, 0x685B, 0x6860, /* 0x60 */
+         0, 0x472C, 	 0, 	 0, 	 0, 0x302A, 	 0, 0x6858, /* 0x70 */
+         0, 0x6861, 0x4978, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x685C, 	 0, 0x6857, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x3E55, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x3D2F, 	 0, 	 0, 	 0, 0x3C2C, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x4C58, 	 0, 	 0, 0x4947, 	 0, 	 0, 0x6867, /* 0x90 */
+         0, 0x6870, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x685A, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x3377, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x3E78, 0x6865, 	 0, 0x686A, 0x4173, 	 0, 	 0, 0x6866, /* 0xB0 */
+         0, 0x686D, 	 0, 	 0, 0x435F, 	 0, 0x686E, 	 0, /* 0xC0 */
+         0, 0x4D56, 0x6863, 0x3338, 	 0, 0x6869, 	 0, 	 0, /* 0xC0 */
+    0x686C, 0x4C2C, 	 0, 	 0, 	 0, 	 0, 0x686F, 	 0, /* 0xD0 */
+         0, 0x6868, 0x686B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x4B29, 	 0, 0x4F21, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x6873, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0x687A, 	 0, 	 0, 0x6872	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_85[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x3C43,      0,      0,      0,      0,      0, 0x6851,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0x4A4E,      0, 0x4C22, 0x6879, 0x6878,      0, 0x6874, /* 0x10 */
-    0x6875,      0, 0x3136,      0,      0,      0,      0, 0x6877, /* 0x10 */
-         0, 0x6871,      0,      0,      0,      0, 0x4455,      0, /* 0x20 */
-         0,      0,      0,      0, 0x6876, 0x307E,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0x4222,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0x4A43,      0,      0, /* 0x30 */
-    0x687B, 0x6921,      0, 0x4859,      0,      0,      0,      0, /* 0x40 */
-    0x687E, 0x3E56, 0x3C49, 0x6923,      0,      0, 0x363E,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0x6924,      0, 0x4979, /* 0x50 */
-    0x687D,      0, 0x6856,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0x687C,      0,      0,      0,      0, /* 0x60 */
-    0x4F4F, 0x4622, 0x4973,      0,      0, 0x692B,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0x6931, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x6932,      0, /* 0x70 */
-    0x6925,      0,      0,      0, 0x4776,      0,      0, 0x692F, /* 0x80 */
-    0x6927,      0, 0x6929,      0,      0,      0,      0,      0, /* 0x80 */
-    0x6933, 0x6928,      0,      0, 0x692C,      0,      0, 0x3172, /* 0x90 */
-         0, 0x4665,      0, 0x692D, 0x6930,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0x6926,      0, 0x4126,      0, /* 0xA0 */
-    0x692A, 0x3B27, 0x3F45, 0x3730, 0x4C74,      0, 0x4C79, 0x3D72, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x6937, 0x6935,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x4F4E,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x6934,      0,      0,      0, 0x4D75,      0, 0x6936, /* 0xC0 */
-    0x6938,      0,      0,      0,      0, 0x6939,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x693C, 0x693A,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x4623, 0x693B,      0,      0, /* 0xE0 */
-         0, 0x484D, 0x692E,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0x3D73, /* 0xF0 */
-         0, 0x693D, 0x6942, 0x4174,      0,      0, 0x6941          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x3C43, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6851, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x4A4E, 	 0, 0x4C22, 0x6879, 0x6878, 	 0, 0x6874, /* 0x10 */
+    0x6875, 	 0, 0x3136, 	 0, 	 0, 	 0, 	 0, 0x6877, /* 0x10 */
+         0, 0x6871, 	 0, 	 0, 	 0, 	 0, 0x4455, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x6876, 0x307E, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4222, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4A43, 	 0, 	 0, /* 0x30 */
+    0x687B, 0x6921, 	 0, 0x4859, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0x687E, 0x3E56, 0x3C49, 0x6923, 	 0, 	 0, 0x363E, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6924, 	 0, 0x4979, /* 0x50 */
+    0x687D, 	 0, 0x6856, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x687C, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x4F4F, 0x4622, 0x4973, 	 0, 	 0, 0x692B, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6931, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6932, 	 0, /* 0x70 */
+    0x6925, 	 0, 	 0, 	 0, 0x4776, 	 0, 	 0, 0x692F, /* 0x80 */
+    0x6927, 	 0, 0x6929, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x6933, 0x6928, 	 0, 	 0, 0x692C, 	 0, 	 0, 0x3172, /* 0x90 */
+         0, 0x4665, 	 0, 0x692D, 0x6930, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x6926, 	 0, 0x4126, 	 0, /* 0xA0 */
+    0x692A, 0x3B27, 0x3F45, 0x3730, 0x4C74, 	 0, 0x4C79, 0x3D72, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x6937, 0x6935, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x4F4E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x6934, 	 0, 	 0, 	 0, 0x4D75, 	 0, 0x6936, /* 0xC0 */
+    0x6938, 	 0, 	 0, 	 0, 	 0, 0x6939, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x693C, 0x693A, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x4623, 0x693B, 	 0, 	 0, /* 0xE0 */
+         0, 0x484D, 0x692E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3D73, /* 0xF0 */
+         0, 0x693D, 0x6942, 0x4174, 	 0, 	 0, 0x6941			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_86[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x6922,      0,      0,      0, 0x6943, 0x4149, /* 0x00 */
-         0,      0, 0x693E, 0x6940,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0x693F,      0,      0, 0x5D31, 0x5D22, /* 0x10 */
-         0,      0, 0x6945,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x6944,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0x4D76,      0, 0x623C, /* 0x20 */
-    0x6946,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0x6947, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0x6948, 0x3857,      0, /* 0x40 */
-    0x3554,      0,      0,      0, 0x694A, 0x515D,      0,      0, /* 0x50 */
-         0,      0, 0x3575,      0, 0x4E3A,      0, 0x3673, 0x694B, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0x694C, /* 0x60 */
-         0,      0,      0, 0x436E,      0,      0,      0,      0, /* 0x60 */
-         0, 0x694D,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x467A,      0, 0x303A,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0x3263, 0x6952, 0x6953,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x694E,      0, 0x3B3D,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0x694F, 0x4742,      0,      0,      0, /* 0xA0 */
-         0, 0x6950, 0x6951, 0x695B,      0,      0,      0, 0x6955, /* 0xA0 */
-    0x6958,      0,      0,      0,      0,      0, 0x6954,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x6956,      0, 0x6957, 0x3C58, /* 0xC0 */
-         0, 0x6959,      0, 0x4341,      0, 0x3756, 0x3342,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x695C,      0,      0,      0, /* 0xD0 */
-         0, 0x333F,      0, 0x6961,      0,      0, 0x695D, 0x6960, /* 0xD0 */
-         0,      0,      0,      0, 0x483A,      0,      0,      0, /* 0xE0 */
-         0, 0x695E,      0,      0, 0x695F, 0x4948, 0x485A, 0x6962, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0x427D, 0x696C,      0, 0x6968,      0,      0, 0x326B          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x6922, 	 0, 	 0, 	 0, 0x6943, 0x4149, /* 0x00 */
+         0, 	 0, 0x693E, 0x6940, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x693F, 	 0, 	 0, 0x5D31, 0x5D22, /* 0x10 */
+         0, 	 0, 0x6945, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x6944, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4D76, 	 0, 0x623C, /* 0x20 */
+    0x6946, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6947, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6948, 0x3857, 	 0, /* 0x40 */
+    0x3554, 	 0, 	 0, 	 0, 0x694A, 0x515D, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x3575, 	 0, 0x4E3A, 	 0, 0x3673, 0x694B, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x694C, /* 0x60 */
+         0, 	 0, 	 0, 0x436E, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x694D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x467A, 	 0, 0x303A, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x3263, 0x6952, 0x6953, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x694E, 	 0, 0x3B3D, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x694F, 0x4742, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x6950, 0x6951, 0x695B, 	 0, 	 0, 	 0, 0x6955, /* 0xA0 */
+    0x6958, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6954, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x6956, 	 0, 0x6957, 0x3C58, /* 0xC0 */
+         0, 0x6959, 	 0, 0x4341, 	 0, 0x3756, 0x3342, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x695C, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x333F, 	 0, 0x6961, 	 0, 	 0, 0x695D, 0x6960, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x483A, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x695E, 	 0, 	 0, 0x695F, 0x4948, 0x485A, 0x6962, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x427D, 0x696C, 	 0, 0x6968, 	 0, 	 0, 0x326B			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_87[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x6966,      0, 0x4B2A, 0x6967,      0,      0, 0x6964,      0, /* 0x00 */
-    0x6965, 0x696A, 0x696D,      0,      0, 0x696B,      0,      0, /* 0x00 */
-         0, 0x6969, 0x6963,      0,      0,      0,      0,      0, /* 0x10 */
-    0x4358,      0, 0x6974,      0, 0x4C2A,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0x6972,      0,      0, /* 0x20 */
-         0, 0x6973,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0x696E,      0,      0, 0x6970, /* 0x30 */
-         0,      0,      0, 0x6971,      0,      0,      0, 0x696F, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0x4066,      0, 0x4F39, 0x6978,      0, 0x6979,      0, /* 0x40 */
-         0,      0,      0, 0x6A21,      0, 0x3F2A,      0, 0x697B, /* 0x50 */
-         0, 0x697E,      0,      0,      0,      0,      0, 0x6976, /* 0x50 */
-    0x6975,      0,      0, 0x6A22,      0,      0, 0x325C,      0, /* 0x60 */
-    0x697C,      0, 0x6A23,      0,      0,      0, 0x697D,      0, /* 0x60 */
-         0,      0,      0,      0, 0x697A,      0, 0x4433,      0, /* 0x70 */
-    0x6977,      0,      0,      0,      0,      0,      0, 0x4768, /* 0x70 */
-         0,      0, 0x6A27,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x4D3B,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0x6A26, /* 0x90 */
-         0,      0, 0x6A25,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x6A2E,      0,      0,      0, 0x6A28, /* 0xA0 */
-         0,      0,      0, 0x6A30,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x4D66, 0x6A33,      0, 0x6A2A,      0,      0, /* 0xB0 */
-    0x6A2B,      0,      0,      0, 0x6A2F,      0, 0x6A32, 0x6A31, /* 0xC0 */
-         0,      0,      0, 0x6A29,      0,      0,      0,      0, /* 0xC0 */
-    0x6A2C,      0, 0x6A3D,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x6A36,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0x6A34, /* 0xE0 */
-         0,      0, 0x6A35,      0,      0,      0, 0x6A3A, 0x6A3B, /* 0xF0 */
-         0, 0x332A,      0, 0x3542,      0,      0, 0x6A39          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x6966, 	 0, 0x4B2A, 0x6967, 	 0, 	 0, 0x6964, 	 0, /* 0x00 */
+    0x6965, 0x696A, 0x696D, 	 0, 	 0, 0x696B, 	 0, 	 0, /* 0x00 */
+         0, 0x6969, 0x6963, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x4358, 	 0, 0x6974, 	 0, 0x4C2A, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6972, 	 0, 	 0, /* 0x20 */
+         0, 0x6973, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x696E, 	 0, 	 0, 0x6970, /* 0x30 */
+         0, 	 0, 	 0, 0x6971, 	 0, 	 0, 	 0, 0x696F, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x4066, 	 0, 0x4F39, 0x6978, 	 0, 0x6979, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x6A21, 	 0, 0x3F2A, 	 0, 0x697B, /* 0x50 */
+         0, 0x697E, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6976, /* 0x50 */
+    0x6975, 	 0, 	 0, 0x6A22, 	 0, 	 0, 0x325C, 	 0, /* 0x60 */
+    0x697C, 	 0, 0x6A23, 	 0, 	 0, 	 0, 0x697D, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x697A, 	 0, 0x4433, 	 0, /* 0x70 */
+    0x6977, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4768, /* 0x70 */
+         0, 	 0, 0x6A27, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4D3B, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6A26, /* 0x90 */
+         0, 	 0, 0x6A25, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x6A2E, 	 0, 	 0, 	 0, 0x6A28, /* 0xA0 */
+         0, 	 0, 	 0, 0x6A30, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x4D66, 0x6A33, 	 0, 0x6A2A, 	 0, 	 0, /* 0xB0 */
+    0x6A2B, 	 0, 	 0, 	 0, 0x6A2F, 	 0, 0x6A32, 0x6A31, /* 0xC0 */
+         0, 	 0, 	 0, 0x6A29, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x6A2C, 	 0, 0x6A3D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x6A36, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6A34, /* 0xE0 */
+         0, 	 0, 0x6A35, 	 0, 	 0, 	 0, 0x6A3A, 0x6A3B, /* 0xF0 */
+         0, 0x332A, 	 0, 0x3542, 	 0, 	 0, 0x6A39			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_88[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0x6A24,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0x6A38, 0x6A3C, 0x6A37, /* 0x00 */
-         0, 0x6A3E,      0,      0,      0, 0x6A40, 0x6A3F,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0x6A42, 0x6A41, 0x695A,      0,      0,      0, 0x6A46, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0x6A43,      0,      0,      0,      0, 0x6A44,      0, /* 0x30 */
-         0, 0x6A45,      0, 0x6A47,      0,      0,      0,      0, /* 0x30 */
-    0x376C,      0, 0x6A49,      0, 0x6A48,      0, 0x3D30,      0, /* 0x40 */
-         0,      0,      0,      0, 0x3954, 0x5E27,      0,      0, /* 0x40 */
-         0,      0, 0x6A4A, 0x3D51,      0,      0,      0, 0x3339, /* 0x50 */
-         0, 0x6A4B,      0, 0x3152,      0, 0x3E57, 0x6A4C,      0, /* 0x50 */
-         0, 0x3955, 0x6A4D, 0x3061,      0,      0,      0,      0, /* 0x60 */
-    0x493D,      0,      0, 0x6A4E,      0,      0,      0,      0, /* 0x60 */
-    0x3F6A,      0, 0x6A55,      0,      0, 0x6A52,      0, 0x436F, /* 0x70 */
-         0,      0,      0,      0,      0, 0x6A53, 0x6A50, 0x365E, /* 0x70 */
-         0, 0x6A4F, 0x6A56,      0,      0,      0,      0,      0, /* 0x80 */
-    0x3736,      0,      0, 0x425E,      0, 0x6A5C,      0,      0, /* 0x80 */
-         0,      0, 0x6A58,      0,      0,      0, 0x4235, 0x6A57, /* 0x90 */
-         0, 0x6A5A,      0,      0,      0,      0, 0x6A51,      0, /* 0x90 */
-         0,      0, 0x6A5B,      0, 0x6A5D,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x486F,      0,      0, 0x6A59,      0, /* 0xA0 */
-    0x6A5E, 0x6A60,      0,      0, 0x3853, 0x6A54,      0, 0x3041, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0x6A5F, /* 0xB0 */
-         0, 0x3A5B, 0x4E76, 0x6A61, 0x6A62, 0x4175,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0x4E22, /* 0xC0 */
-         0,      0,      0,      0, 0x6A63, 0x4D35,      0,      0, /* 0xD0 */
-    0x6A64, 0x6A65,      0,      0, 0x4A64, 0x6A66,      0, 0x3A40, /* 0xD0 */
-         0, 0x4E23,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x6A6B,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0x6A6C, 0x3E58, 0x6A6A,      0,      0,      0, /* 0xF0 */
-    0x4D67, 0x6A67,      0,      0, 0x6A69, 0x403D, 0x3F7E          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0x6A24, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6A38, 0x6A3C, 0x6A37, /* 0x00 */
+         0, 0x6A3E, 	 0, 	 0, 	 0, 0x6A40, 0x6A3F, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x6A42, 0x6A41, 0x695A, 	 0, 	 0, 	 0, 0x6A46, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x6A43, 	 0, 	 0, 	 0, 	 0, 0x6A44, 	 0, /* 0x30 */
+         0, 0x6A45, 	 0, 0x6A47, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x376C, 	 0, 0x6A49, 	 0, 0x6A48, 	 0, 0x3D30, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x3954, 0x5E27, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x6A4A, 0x3D51, 	 0, 	 0, 	 0, 0x3339, /* 0x50 */
+         0, 0x6A4B, 	 0, 0x3152, 	 0, 0x3E57, 0x6A4C, 	 0, /* 0x50 */
+         0, 0x3955, 0x6A4D, 0x3061, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x493D, 	 0, 	 0, 0x6A4E, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x3F6A, 	 0, 0x6A55, 	 0, 	 0, 0x6A52, 	 0, 0x436F, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6A53, 0x6A50, 0x365E, /* 0x70 */
+         0, 0x6A4F, 0x6A56, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x3736, 	 0, 	 0, 0x425E, 	 0, 0x6A5C, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x6A58, 	 0, 	 0, 	 0, 0x4235, 0x6A57, /* 0x90 */
+         0, 0x6A5A, 	 0, 	 0, 	 0, 	 0, 0x6A51, 	 0, /* 0x90 */
+         0, 	 0, 0x6A5B, 	 0, 0x6A5D, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x486F, 	 0, 	 0, 0x6A59, 	 0, /* 0xA0 */
+    0x6A5E, 0x6A60, 	 0, 	 0, 0x3853, 0x6A54, 	 0, 0x3041, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6A5F, /* 0xB0 */
+         0, 0x3A5B, 0x4E76, 0x6A61, 0x6A62, 0x4175, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4E22, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x6A63, 0x4D35, 	 0, 	 0, /* 0xD0 */
+    0x6A64, 0x6A65, 	 0, 	 0, 0x4A64, 0x6A66, 	 0, 0x3A40, /* 0xD0 */
+         0, 0x4E23, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x6A6B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x6A6C, 0x3E58, 0x6A6A, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x4D67, 0x6A67, 	 0, 	 0, 0x6A69, 0x403D, 0x3F7E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_89[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x6A68,      0, 0x6A6D,      0,      0, 0x4A23, /* 0x00 */
-         0,      0, 0x6A6F,      0, 0x6A6E,      0,      0,      0, /* 0x00 */
-    0x336C,      0, 0x4B2B, 0x6A70,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0x6A7C, 0x6A72,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0x6A73,      0,      0, /* 0x20 */
-         0,      0, 0x6A74, 0x6A75,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x6A79,      0, /* 0x30 */
-    0x6A7A,      0,      0, 0x6A78,      0,      0,      0,      0, /* 0x30 */
-         0, 0x6A76,      0, 0x6A71, 0x6A77,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0x6A7B, 0x7037,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0x3228,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0x6A7E, 0x365F, /* 0x50 */
-    0x6A7D,      0,      0,      0, 0x6B22,      0, 0x6B21,      0, /* 0x60 */
-         0,      0, 0x6B24,      0,      0, 0x6B23,      0, 0x6B25, /* 0x60 */
-         0,      0, 0x3D31,      0, 0x6B26,      0,      0, 0x6B27, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x6B28, 0x403E, /* 0x70 */
-         0, 0x4D57,      0, 0x6B29,      0,      0, 0x4A24, 0x4746, /* 0x80 */
-    0x6B2A,      0, 0x6B2B, 0x382B,      0,      0,      0, 0x352C, /* 0x80 */
-         0,      0,      0, 0x6B2C,      0,      0, 0x3B6B, 0x4741, /* 0x90 */
-    0x6B2D,      0, 0x3350,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0x6B2E,      0,      0,      0,      0, 0x6B30, 0x4D77, /* 0xA0 */
-         0, 0x6B2F, 0x3F46,      0, 0x6B31,      0,      0, 0x6B32, /* 0xA0 */
-         0,      0, 0x6B33, 0x3451,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x6B34,      0,      0, 0x6B35,      0, 0x6B36, /* 0xB0 */
-    0x6B37,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x3351,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x6B38,      0, 0x6B39, 0x6B3A,      0,      0, /* 0xD0 */
-         0,      0,      0, 0x3272,      0,      0, 0x3F28, 0x6B3B, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0x6B3C,      0,      0,      0, /* 0xF0 */
-    0x6B3D                                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x6A68, 	 0, 0x6A6D, 	 0, 	 0, 0x4A23, /* 0x00 */
+         0, 	 0, 0x6A6F, 	 0, 0x6A6E, 	 0, 	 0, 	 0, /* 0x00 */
+    0x336C, 	 0, 0x4B2B, 0x6A70, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6A7C, 0x6A72, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6A73, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x6A74, 0x6A75, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6A79, 	 0, /* 0x30 */
+    0x6A7A, 	 0, 	 0, 0x6A78, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x6A76, 	 0, 0x6A71, 0x6A77, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x6A7B, 0x7037, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3228, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6A7E, 0x365F, /* 0x50 */
+    0x6A7D, 	 0, 	 0, 	 0, 0x6B22, 	 0, 0x6B21, 	 0, /* 0x60 */
+         0, 	 0, 0x6B24, 	 0, 	 0, 0x6B23, 	 0, 0x6B25, /* 0x60 */
+         0, 	 0, 0x3D31, 	 0, 0x6B26, 	 0, 	 0, 0x6B27, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6B28, 0x403E, /* 0x70 */
+         0, 0x4D57, 	 0, 0x6B29, 	 0, 	 0, 0x4A24, 0x4746, /* 0x80 */
+    0x6B2A, 	 0, 0x6B2B, 0x382B, 	 0, 	 0, 	 0, 0x352C, /* 0x80 */
+         0, 	 0, 	 0, 0x6B2C, 	 0, 	 0, 0x3B6B, 0x4741, /* 0x90 */
+    0x6B2D, 	 0, 0x3350, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x6B2E, 	 0, 	 0, 	 0, 	 0, 0x6B30, 0x4D77, /* 0xA0 */
+         0, 0x6B2F, 0x3F46, 	 0, 0x6B31, 	 0, 	 0, 0x6B32, /* 0xA0 */
+         0, 	 0, 0x6B33, 0x3451, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x6B34, 	 0, 	 0, 0x6B35, 	 0, 0x6B36, /* 0xB0 */
+    0x6B37, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x3351, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x6B38, 	 0, 0x6B39, 0x6B3A, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x3272, 	 0, 	 0, 0x3F28, 0x6B3B, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x6B3C, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x6B3D															/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_8A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x3840,      0, 0x447B, 0x6B3E,      0,      0,      0,      0, /* 0x00 */
-    0x3757,      0, 0x3F56,      0, 0x6B41,      0, 0x4624,      0, /* 0x00 */
-    0x6B40,      0,      0, 0x3731,      0,      0, 0x6B3F, 0x4277, /* 0x10 */
-    0x352D,      0,      0, 0x6B42,      0, 0x6B43,      0, 0x3E59, /* 0x10 */
-         0,      0,      0, 0x376D,      0, 0x6B44,      0,      0, /* 0x20 */
-         0,      0, 0x4B2C,      0,      0, 0x405F,      0,      0, /* 0x20 */
-         0, 0x3576,      0, 0x4C75, 0x414A,      0, 0x6B45,      0, /* 0x30 */
-         0,      0, 0x3F47, 0x4370, 0x3E5A,      0,      0,      0, /* 0x30 */
-         0, 0x6B46,      0,      0,      0,      0, 0x6B49,      0, /* 0x40 */
-    0x6B4A,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0x3A3E, 0x4242, 0x6B48,      0, 0x3E5B, 0x493E,      0,      0, /* 0x50 */
-         0,      0,      0, 0x6B47,      0,      0, 0x3B6C,      0, /* 0x50 */
-    0x3153,      0, 0x6B4E, 0x3758,      0,      0, 0x3B6E,      0, /* 0x60 */
-         0, 0x3B6D,      0, 0x4F4D, 0x6B4D, 0x6B4C, 0x4127,      0, /* 0x60 */
-    0x354D, 0x4F43, 0x333A, 0x3E5C,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0x6B4B,      0,      0,      0, /* 0x70 */
-         0,      0, 0x6B50,      0, 0x6B51, 0x6B4F,      0, 0x3858, /* 0x80 */
-         0, 0x4D40,      0,      0, 0x3B6F, 0x4727,      0,      0, /* 0x80 */
-         0, 0x6B54,      0, 0x4040,      0, 0x4342,      0,      0, /* 0x90 */
-    0x4D36,      0, 0x6B57,      0,      0,      0, 0x386C,      0, /* 0x90 */
-    0x403F, 0x6B53,      0, 0x6B58, 0x386D, 0x6B55, 0x6B56,      0, /* 0xA0 */
-    0x6B52,      0,      0,      0, 0x4062, 0x4649,      0,      0, /* 0xA0 */
-    0x432F,      0, 0x325D,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x4870,      0,      0, 0x3543,      0,      0, 0x4434, /* 0xB0 */
-         0,      0, 0x6B5B,      0, 0x6B59,      0,      0, 0x434C, /* 0xC0 */
-         0,      0,      0, 0x4041, 0x3452, 0x6B5A,      0, 0x3F5B, /* 0xC0 */
-         0,      0, 0x4E4A,      0,      0,      0, 0x4F40,      0, /* 0xD0 */
-         0,      0, 0x6B5C, 0x6B67, 0x4435,      0, 0x6B66,      0, /* 0xD0 */
-    0x6B63, 0x6B6B, 0x6B64,      0, 0x6B60,      0, 0x447C, 0x6B5F, /* 0xE0 */
-         0,      0,      0, 0x6B5D,      0, 0x4D21, 0x3B70,      0, /* 0xE0 */
-         0, 0x6B61,      0, 0x6B5E,      0,      0,      0, 0x6B65, /* 0xF0 */
-    0x3D74,      0, 0x3841,      0,      0,      0, 0x427A          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x3840, 	 0, 0x447B, 0x6B3E, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0x3757, 	 0, 0x3F56, 	 0, 0x6B41, 	 0, 0x4624, 	 0, /* 0x00 */
+    0x6B40, 	 0, 	 0, 0x3731, 	 0, 	 0, 0x6B3F, 0x4277, /* 0x10 */
+    0x352D, 	 0, 	 0, 0x6B42, 	 0, 0x6B43, 	 0, 0x3E59, /* 0x10 */
+         0, 	 0, 	 0, 0x376D, 	 0, 0x6B44, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x4B2C, 	 0, 	 0, 0x405F, 	 0, 	 0, /* 0x20 */
+         0, 0x3576, 	 0, 0x4C75, 0x414A, 	 0, 0x6B45, 	 0, /* 0x30 */
+         0, 	 0, 0x3F47, 0x4370, 0x3E5A, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x6B46, 	 0, 	 0, 	 0, 	 0, 0x6B49, 	 0, /* 0x40 */
+    0x6B4A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0x3A3E, 0x4242, 0x6B48, 	 0, 0x3E5B, 0x493E, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x6B47, 	 0, 	 0, 0x3B6C, 	 0, /* 0x50 */
+    0x3153, 	 0, 0x6B4E, 0x3758, 	 0, 	 0, 0x3B6E, 	 0, /* 0x60 */
+         0, 0x3B6D, 	 0, 0x4F4D, 0x6B4D, 0x6B4C, 0x4127, 	 0, /* 0x60 */
+    0x354D, 0x4F43, 0x333A, 0x3E5C, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0x6B4B, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x6B50, 	 0, 0x6B51, 0x6B4F, 	 0, 0x3858, /* 0x80 */
+         0, 0x4D40, 	 0, 	 0, 0x3B6F, 0x4727, 	 0, 	 0, /* 0x80 */
+         0, 0x6B54, 	 0, 0x4040, 	 0, 0x4342, 	 0, 	 0, /* 0x90 */
+    0x4D36, 	 0, 0x6B57, 	 0, 	 0, 	 0, 0x386C, 	 0, /* 0x90 */
+    0x403F, 0x6B53, 	 0, 0x6B58, 0x386D, 0x6B55, 0x6B56, 	 0, /* 0xA0 */
+    0x6B52, 	 0, 	 0, 	 0, 0x4062, 0x4649, 	 0, 	 0, /* 0xA0 */
+    0x432F, 	 0, 0x325D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x4870, 	 0, 	 0, 0x3543, 	 0, 	 0, 0x4434, /* 0xB0 */
+         0, 	 0, 0x6B5B, 	 0, 0x6B59, 	 0, 	 0, 0x434C, /* 0xC0 */
+         0, 	 0, 	 0, 0x4041, 0x3452, 0x6B5A, 	 0, 0x3F5B, /* 0xC0 */
+         0, 	 0, 0x4E4A, 	 0, 	 0, 	 0, 0x4F40, 	 0, /* 0xD0 */
+         0, 	 0, 0x6B5C, 0x6B67, 0x4435, 	 0, 0x6B66, 	 0, /* 0xD0 */
+    0x6B63, 0x6B6B, 0x6B64, 	 0, 0x6B60, 	 0, 0x447C, 0x6B5F, /* 0xE0 */
+         0, 	 0, 	 0, 0x6B5D, 	 0, 0x4D21, 0x3B70, 	 0, /* 0xE0 */
+         0, 0x6B61, 	 0, 0x6B5E, 	 0, 	 0, 	 0, 0x6B65, /* 0xF0 */
+    0x3D74, 	 0, 0x3841, 	 0, 	 0, 	 0, 0x427A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_8B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x4B45, 0x315A, 0x3062,      0, 0x4625,      0,      0, 0x6B69, /* 0x00 */
-         0,      0,      0,      0, 0x6B68,      0, 0x4666,      0, /* 0x00 */
-    0x6B6D,      0,      0,      0, 0x6B62,      0, 0x6B6C, 0x6B6E, /* 0x10 */
-         0, 0x382C, 0x6B6A, 0x3956,      0, 0x3C55,      0,      0, /* 0x10 */
-    0x6B6F, 0x4D58,      0,      0,      0,      0, 0x6B72,      0, /* 0x20 */
-    0x6B75,      0,      0, 0x6B73, 0x4935,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0x6B70,      0,      0,      0,      0, /* 0x30 */
-         0, 0x3660,      0,      0,      0,      0, 0x6B74,      0, /* 0x30 */
-         0, 0x6B76,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0x6B7A,      0,      0, 0x6B77,      0, 0x6B79, 0x6B78, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0x6B7B,      0, /* 0x50 */
-    0x3C31,      0, 0x6B7D, 0x6B7C, 0x4968,      0,      0, 0x6C21, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0x3759,      0, /* 0x60 */
-         0,      0,      0, 0x6B7E, 0x6C22,      0,      0, 0x6C23, /* 0x60 */
-    0x3544, 0x6641, 0x3E79,      0, 0x6C24,      0,      0, 0x386E, /* 0x70 */
-         0,      0,      0,      0,      0, 0x6C25,      0,      0, /* 0x70 */
-    0x6C26,      0,      0, 0x3B3E,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0x5A4E,      0, 0x6C27,      0, 0x6C28,      0, /* 0x80 */
-    0x3D32,      0, 0x6C29, 0x6C2A,      0,      0, 0x6C2B,      0, /* 0x90 */
-         0, 0x6C2C, 0x6C2D                                          /* 0x90 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x4B45, 0x315A, 0x3062, 	 0, 0x4625, 	 0, 	 0, 0x6B69, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x6B68, 	 0, 0x4666, 	 0, /* 0x00 */
+    0x6B6D, 	 0, 	 0, 	 0, 0x6B62, 	 0, 0x6B6C, 0x6B6E, /* 0x10 */
+         0, 0x382C, 0x6B6A, 0x3956, 	 0, 0x3C55, 	 0, 	 0, /* 0x10 */
+    0x6B6F, 0x4D58, 	 0, 	 0, 	 0, 	 0, 0x6B72, 	 0, /* 0x20 */
+    0x6B75, 	 0, 	 0, 0x6B73, 0x4935, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x6B70, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x3660, 	 0, 	 0, 	 0, 	 0, 0x6B74, 	 0, /* 0x30 */
+         0, 0x6B76, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x6B7A, 	 0, 	 0, 0x6B77, 	 0, 0x6B79, 0x6B78, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6B7B, 	 0, /* 0x50 */
+    0x3C31, 	 0, 0x6B7D, 0x6B7C, 0x4968, 	 0, 	 0, 0x6C21, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3759, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x6B7E, 0x6C22, 	 0, 	 0, 0x6C23, /* 0x60 */
+    0x3544, 0x6641, 0x3E79, 	 0, 0x6C24, 	 0, 	 0, 0x386E, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6C25, 	 0, 	 0, /* 0x70 */
+    0x6C26, 	 0, 	 0, 0x3B3E, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x5A4E, 	 0, 0x6C27, 	 0, 0x6C28, 	 0, /* 0x80 */
+    0x3D32, 	 0, 0x6C29, 0x6C2A, 	 0, 	 0, 0x6C2B, 	 0, /* 0x90 */
+         0, 0x6C2C, 0x6C2D											/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_8C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0x432B, /* 0x30 */
-         0,      0, 0x6C2E,      0,      0,      0,      0, 0x6C30, /* 0x30 */
-         0, 0x6C2F,      0,      0,      0,      0, 0x4626,      0, /* 0x40 */
-    0x6C31,      0, 0x4B2D,      0, 0x6C32,      0, 0x6C33,      0, /* 0x40 */
-    0x6C34,      0,      0,      0,      0, 0x6C35,      0,      0, /* 0x50 */
-         0,      0, 0x465A,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0x3E5D, 0x6C36,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0x396B, 0x502E, 0x6C37,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0x6C38, 0x493F, 0x6C39,      0, 0x6C41,      0,      0,      0, /* 0x70 */
-         0,      0, 0x6C3A,      0,      0, 0x6C3C,      0,      0, /* 0x80 */
-         0, 0x6C3B, 0x6C3D,      0, 0x4B46, 0x6C3E, 0x6C3F,      0, /* 0x80 */
-         0,      0,      0,      0, 0x6C40,      0,      0,      0, /* 0x90 */
-    0x6C42,      0,      0,      0,      0, 0x332D, 0x4467,      0, /* 0x90 */
-    0x4969, 0x3A62, 0x3957,      0,      0,      0,      0, 0x494F, /* 0xA0 */
+         0, 	 0, 0x6C2E, 	 0, 	 0, 	 0, 	 0, 0x6C30, /* 0x30 */
+         0, 0x6C2F, 	 0, 	 0, 	 0, 	 0, 0x4626, 	 0, /* 0x40 */
+    0x6C31, 	 0, 0x4B2D, 	 0, 0x6C32, 	 0, 0x6C33, 	 0, /* 0x40 */
+    0x6C34, 	 0, 	 0, 	 0, 	 0, 0x6C35, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x465A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x3E5D, 0x6C36, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x396B, 0x502E, 0x6C37, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x6C38, 0x493F, 0x6C39, 	 0, 0x6C41, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x6C3A, 	 0, 	 0, 0x6C3C, 	 0, 	 0, /* 0x80 */
+         0, 0x6C3B, 0x6C3D, 	 0, 0x4B46, 0x6C3E, 0x6C3F, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x6C40, 	 0, 	 0, 	 0, /* 0x90 */
+    0x6C42, 	 0, 	 0, 	 0, 	 0, 0x332D, 0x4467, 	 0, /* 0x90 */
+    0x4969, 0x3A62, 0x3957, 	 0, 	 0, 	 0, 	 0, 0x494F, /* 0xA0 */
     0x325F, 0x484E, 0x6C45, 0x3453, 0x4055, 0x6C44, 0x6C49, 0x4379, /* 0xA0 */
-    0x4C63,      0, 0x6C47, 0x6C48, 0x352E,      0, 0x6C4A, 0x4763, /* 0xB0 */
-    0x425F,      0,      0, 0x4871, 0x453D, 0x6C46,      0, 0x4B47, /* 0xB0 */
-    0x326C, 0x6C4C, 0x4F28, 0x4442, 0x4F45,      0,      0, 0x3B71, /* 0xC0 */
-    0x6C4B,      0, 0x4231,      0,      0, 0x6C5C, 0x4128,      0, /* 0xC0 */
-         0, 0x4678,      0, 0x4950,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x6C4F, 0x3B3F, 0x3B72,      0, 0x3E5E,      0, /* 0xD0 */
-    0x4765,      0, 0x382D, 0x6C4E, 0x6C4D,      0, 0x496A,      0, /* 0xE0 */
-         0,      0, 0x3C41,      0,      0, 0x4552,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x6C51, 0x6C52, 0x3958, 0x6C50                  /* 0xF0 */
+    0x4C63, 	 0, 0x6C47, 0x6C48, 0x352E, 	 0, 0x6C4A, 0x4763, /* 0xB0 */
+    0x425F, 	 0, 	 0, 0x4871, 0x453D, 0x6C46, 	 0, 0x4B47, /* 0xB0 */
+    0x326C, 0x6C4C, 0x4F28, 0x4442, 0x4F45, 	 0, 	 0, 0x3B71, /* 0xC0 */
+    0x6C4B, 	 0, 0x4231, 	 0, 	 0, 0x6C5C, 0x4128, 	 0, /* 0xC0 */
+         0, 0x4678, 	 0, 0x4950, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x6C4F, 0x3B3F, 0x3B72, 	 0, 0x3E5E, 	 0, /* 0xD0 */
+    0x4765, 	 0, 0x382D, 0x6C4E, 0x6C4D, 	 0, 0x496A, 	 0, /* 0xE0 */
+         0, 	 0, 0x3C41, 	 0, 	 0, 0x4552, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x6C51, 0x6C52, 0x3958, 0x6C50					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_8D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0x6C53, 0x6C54,      0, 0x6C56, /* 0x00 */
-    0x4223,      0, 0x6C55, 0x3466,      0, 0x6C58,      0, 0x6C57, /* 0x00 */
-    0x6C59,      0,      0, 0x6C5B, 0x6C5D,      0, 0x6C5E,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0x4056,      0, 0x3C4F, 0x6C5F, /* 0x60 */
-         0,      0,      0, 0x3352,      0, 0x6C60,      0,      0, /* 0x60 */
-    0x4176, 0x6C61,      0, 0x6C62, 0x496B,      0,      0, 0x352F, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x6C63,      0,      0,      0, 0x4436,      0,      0, /* 0x80 */
-         0,      0, 0x315B,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0x6C64,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0x3C71,      0,      0,      0,      0, /* 0xA0 */
-    0x3F76,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x422D,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x6C67,      0,      0,      0, 0x6C66,      0, /* 0xB0 */
-         0,      0, 0x6C65,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0x6C6D, 0x6C6B,      0,      0, 0x6C68, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0x6C6A,      0, /* 0xD0 */
-         0,      0, 0x6C69, 0x6C6C,      0, 0x3577,      0, 0x6C70, /* 0xD0 */
-         0, 0x4057,      0, 0x6C71,      0,      0,      0,      0, /* 0xE0 */
-    0x3859,      0, 0x6C6E, 0x6C6F,      0,      0,      0, 0x4F29, /* 0xE0 */
-         0,      0,      0, 0x4437,      0, 0x4129,      0,      0, /* 0xF0 */
-         0,      0,      0,      0, 0x6C72,      0,      0, 0x6C75  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0x6C53, 0x6C54, 	 0, 0x6C56, /* 0x00 */
+    0x4223, 	 0, 0x6C55, 0x3466, 	 0, 0x6C58, 	 0, 0x6C57, /* 0x00 */
+    0x6C59, 	 0, 	 0, 0x6C5B, 0x6C5D, 	 0, 0x6C5E, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x4056, 	 0, 0x3C4F, 0x6C5F, /* 0x60 */
+         0, 	 0, 	 0, 0x3352, 	 0, 0x6C60, 	 0, 	 0, /* 0x60 */
+    0x4176, 0x6C61, 	 0, 0x6C62, 0x496B, 	 0, 	 0, 0x352F, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x6C63, 	 0, 	 0, 	 0, 0x4436, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x315B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x6C64, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x3C71, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x3F76, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x422D, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x6C67, 	 0, 	 0, 	 0, 0x6C66, 	 0, /* 0xB0 */
+         0, 	 0, 0x6C65, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x6C6D, 0x6C6B, 	 0, 	 0, 0x6C68, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6C6A, 	 0, /* 0xD0 */
+         0, 	 0, 0x6C69, 0x6C6C, 	 0, 0x3577, 	 0, 0x6C70, /* 0xD0 */
+         0, 0x4057, 	 0, 0x6C71, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x3859, 	 0, 0x6C6E, 0x6C6F, 	 0, 	 0, 	 0, 0x4F29, /* 0xE0 */
+         0, 	 0, 	 0, 0x4437, 	 0, 0x4129, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0x6C72, 	 0, 	 0, 0x6C75	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_8E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-    0x6C73, 0x6C74, 0x4D59,      0,      0,      0,      0, 0x4627, /* 0x00 */
-    0x6C78,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0x6C76, 0x6C77, 0x6C79, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x6D29,      0,      0,      0,      0,      0, /* 0x20 */
-    0x6C7C,      0,      0,      0, 0x6C7D, 0x6C7B,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0x6C7A,      0, 0x447D,      0,      0, 0x6D21, /* 0x40 */
-    0x6D25, 0x6D22, 0x6C7E,      0, 0x6D23,      0,      0,      0, /* 0x40 */
-    0x6D24,      0,      0,      0,      0, 0x6D2B,      0,      0, /* 0x50 */
-         0, 0x6D26,      0,      0,      0,      0,      0, 0x4058, /* 0x50 */
-    0x6D28,      0,      0, 0x6D2A, 0x6D27,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0x6D2D,      0, 0x3D33,      0, 0x6D2C,      0, /* 0x70 */
-         0,      0,      0,      0, 0x6D2E,      0,      0,      0, /* 0x70 */
-         0, 0x6D2F,      0,      0, 0x6D32, 0x6D31,      0, 0x6D30, /* 0x80 */
-         0,      0, 0x6D34, 0x6D33,      0, 0x4C76,      0,      0, /* 0x80 */
-         0, 0x6D36,      0, 0x6D35, 0x6D37,      0,      0,      0, /* 0x90 */
-         0, 0x6D38,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0x6D3A,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x6D39, 0x3F48, 0x6D3B,      0,      0, 0x366D, /* 0xA0 */
-    0x6D3C, 0x6D3E,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x6D3F,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x6D40, 0x6D3D,      0, /* 0xC0 */
-    0x6D41,      0, 0x3C56, 0x6D42, 0x3530, 0x3733,      0,      0, /* 0xC0 */
-         0,      0, 0x382E,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0x6D43,      0,      0,      0, 0x4670, /* 0xD0 */
-         0,      0, 0x453E, 0x6D44,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x6D47,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0x3C34,      0,      0, 0x6D46, 0x6D45, 0x375A, 0x6D48          /* 0xF0 */
+    0x6C73, 0x6C74, 0x4D59, 	 0, 	 0, 	 0, 	 0, 0x4627, /* 0x00 */
+    0x6C78, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6C76, 0x6C77, 0x6C79, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x6D29, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x6C7C, 	 0, 	 0, 	 0, 0x6C7D, 0x6C7B, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x6C7A, 	 0, 0x447D, 	 0, 	 0, 0x6D21, /* 0x40 */
+    0x6D25, 0x6D22, 0x6C7E, 	 0, 0x6D23, 	 0, 	 0, 	 0, /* 0x40 */
+    0x6D24, 	 0, 	 0, 	 0, 	 0, 0x6D2B, 	 0, 	 0, /* 0x50 */
+         0, 0x6D26, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4058, /* 0x50 */
+    0x6D28, 	 0, 	 0, 0x6D2A, 0x6D27, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x6D2D, 	 0, 0x3D33, 	 0, 0x6D2C, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0x6D2E, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x6D2F, 	 0, 	 0, 0x6D32, 0x6D31, 	 0, 0x6D30, /* 0x80 */
+         0, 	 0, 0x6D34, 0x6D33, 	 0, 0x4C76, 	 0, 	 0, /* 0x80 */
+         0, 0x6D36, 	 0, 0x6D35, 0x6D37, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x6D38, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x6D3A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x6D39, 0x3F48, 0x6D3B, 	 0, 	 0, 0x366D, /* 0xA0 */
+    0x6D3C, 0x6D3E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6D3F, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6D40, 0x6D3D, 	 0, /* 0xC0 */
+    0x6D41, 	 0, 0x3C56, 0x6D42, 0x3530, 0x3733, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x382E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x6D43, 	 0, 	 0, 	 0, 0x4670, /* 0xD0 */
+         0, 	 0, 0x453E, 0x6D44, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x6D47, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x3C34, 	 0, 	 0, 0x6D46, 0x6D45, 0x375A, 0x6D48			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_8F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0x3353,      0, 0x6D4A,      0,      0, /* 0x00 */
-         0, 0x3A5C, 0x6D49,      0, 0x6D52,      0,      0,      0, /* 0x00 */
-         0,      0, 0x6D4C, 0x6D4E, 0x4A65, 0x6D4B,      0,      0, /* 0x10 */
-         0, 0x6D4D,      0, 0x6D51, 0x6D4F, 0x3531,      0, 0x6D50, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x6D53,      0, /* 0x20 */
-         0, 0x475A, 0x4E58,      0,      0,      0,      0, 0x3D34, /* 0x20 */
-         0,      0,      0, 0x6D54,      0,      0,      0,      0, /* 0x30 */
-    0x4D22, 0x6D56,      0, 0x6D55,      0,      0, 0x6D59, 0x4D41, /* 0x30 */
-         0,      0, 0x6D58,      0, 0x336D, 0x6D57, 0x6D5C,      0, /* 0x40 */
-         0, 0x6D5B,      0,      0, 0x6D5A, 0x4532, 0x6D5D,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0x6D5E, /* 0x50 */
-         0,      0,      0,      0, 0x6D5F,      0,      0, 0x396C, /* 0x50 */
-         0, 0x3725, 0x6D60, 0x6D61, 0x6D62,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0x3F49, 0x6D63,      0, 0x3C2D, 0x6D64, /* 0x90 */
-         0,      0,      0, 0x6D65,      0,      0,      0, 0x5221, /* 0xA0 */
-    0x517E,      0,      0,      0,      0, 0x6D66, 0x6570, 0x6D67, /* 0xA0 */
-    0x4324, 0x3F2B, 0x4740,      0,      0,      0,      0, 0x6D68, /* 0xB0 */
-         0,      0, 0x4A55, 0x4454, 0x397E,      0,      0, 0x4329, /* 0xB0 */
-         0,      0, 0x312A,      0, 0x4B78, 0x3F57,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0x375E,      0, /* 0xC0 */
-         0, 0x3661,      0,      0, 0x4A56,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x6D69,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x6D6B,      0,      0, 0x6D6A, 0x3260,      0, /* 0xE0 */
-         0, 0x4676, 0x6D6C, 0x4777,      0, 0x4533,      0, 0x6D6D, /* 0xE0 */
-    0x3D52,      0,      0,      0, 0x6D6F,      0,      0, 0x4C42, /* 0xF0 */
-    0x6D7E, 0x6D71, 0x6D72,      0,      0, 0x4449                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0x3353, 	 0, 0x6D4A, 	 0, 	 0, /* 0x00 */
+         0, 0x3A5C, 0x6D49, 	 0, 0x6D52, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x6D4C, 0x6D4E, 0x4A65, 0x6D4B, 	 0, 	 0, /* 0x10 */
+         0, 0x6D4D, 	 0, 0x6D51, 0x6D4F, 0x3531, 	 0, 0x6D50, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6D53, 	 0, /* 0x20 */
+         0, 0x475A, 0x4E58, 	 0, 	 0, 	 0, 	 0, 0x3D34, /* 0x20 */
+         0, 	 0, 	 0, 0x6D54, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x4D22, 0x6D56, 	 0, 0x6D55, 	 0, 	 0, 0x6D59, 0x4D41, /* 0x30 */
+         0, 	 0, 0x6D58, 	 0, 0x336D, 0x6D57, 0x6D5C, 	 0, /* 0x40 */
+         0, 0x6D5B, 	 0, 	 0, 0x6D5A, 0x4532, 0x6D5D, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6D5E, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x6D5F, 	 0, 	 0, 0x396C, /* 0x50 */
+         0, 0x3725, 0x6D60, 0x6D61, 0x6D62, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x3F49, 0x6D63, 	 0, 0x3C2D, 0x6D64, /* 0x90 */
+         0, 	 0, 	 0, 0x6D65, 	 0, 	 0, 	 0, 0x5221, /* 0xA0 */
+    0x517E, 	 0, 	 0, 	 0, 	 0, 0x6D66, 0x6570, 0x6D67, /* 0xA0 */
+    0x4324, 0x3F2B, 0x4740, 	 0, 	 0, 	 0, 	 0, 0x6D68, /* 0xB0 */
+         0, 	 0, 0x4A55, 0x4454, 0x397E, 	 0, 	 0, 0x4329, /* 0xB0 */
+         0, 	 0, 0x312A, 	 0, 0x4B78, 0x3F57, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x375E, 	 0, /* 0xC0 */
+         0, 0x3661, 	 0, 	 0, 0x4A56, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x6D69, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x6D6B, 	 0, 	 0, 0x6D6A, 0x3260, 	 0, /* 0xE0 */
+         0, 0x4676, 0x6D6C, 0x4777, 	 0, 0x4533, 	 0, 0x6D6D, /* 0xE0 */
+    0x3D52, 	 0, 	 0, 	 0, 0x6D6F, 	 0, 	 0, 0x4C42, /* 0xF0 */
+    0x6D7E, 0x6D71, 0x6D72, 	 0, 	 0, 0x4449					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_90[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x4260, 0x4177,      0, 0x4628,      0, 0x6D70, 0x3555,      0, /* 0x00 */
-         0,      0,      0, 0x6D79,      0, 0x6D76, 0x6E25, 0x4629, /* 0x00 */
-    0x4360, 0x6D73,      0, 0x447E, 0x4553, 0x6D74, 0x6D78, 0x3F60, /* 0x10 */
-         0, 0x4767, 0x444C,      0,      0, 0x4042, 0x6D77, 0x422E, /* 0x10 */
-    0x4224, 0x6D75, 0x3029, 0x4F22,      0,      0,      0, 0x6D7A, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x4261,      0, /* 0x20 */
-         0, 0x3D35, 0x3F4A,      0,      0, 0x6D7C, 0x6D7B,      0, /* 0x30 */
-    0x306F, 0x6D7D,      0,      0, 0x492F,      0, 0x6E27,      0, /* 0x30 */
-         0, 0x465B, 0x3F6B,      0,      0, 0x4359,      0, 0x3678, /* 0x40 */
-         0, 0x6E26, 0x4D37, 0x313F,      0, 0x4A57, 0x3261, 0x6E21, /* 0x40 */
-    0x6E22, 0x6E23, 0x6E24, 0x463B, 0x4323, 0x3063, 0x6E28,      0, /* 0x50 */
-    0x6E29, 0x7423,      0,      0, 0x423D,      0, 0x6E2A,      0, /* 0x50 */
-    0x3173, 0x414C,      0, 0x382F,      0, 0x4D5A,      0,      0, /* 0x60 */
-    0x6E2B, 0x452C,      0,      0,      0, 0x4178, 0x3C57, 0x6E2C, /* 0x60 */
-         0,      0, 0x6E2F,      0,      0, 0x3D65, 0x6E2D, 0x412B, /* 0x70 */
-    0x412A,      0, 0x3064,      0, 0x4E4B, 0x6E31,      0, 0x4872, /* 0x70 */
-    0x6E33, 0x6E32, 0x6E30, 0x6364, 0x3454,      0,      0, 0x6D6E, /* 0x80 */
-         0, 0x6E35, 0x6E34,      0,      0,      0,      0, 0x6E36, /* 0x80 */
-         0, 0x4D38,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0x4661,      0,      0, 0x4B2E,      0, /* 0xA0 */
-    0x6E37,      0, 0x3C59,      0,      0,      0,      0, 0x6E38, /* 0xA0 */
-         0, 0x6E39,      0,      0,      0, 0x6E3A,      0,      0, /* 0xB0 */
-    0x4521,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x306A,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x3959,      0,      0,      0, 0x4F3A,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0x6E3E,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x3734, 0x6E3B,      0, 0x6E3C,      0,      0,      0, /* 0xE0 */
-    0x4974,      0,      0,      0,      0, 0x3354,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0x4D39,      0, 0x363F, /* 0xF0 */
-         0,      0,      0,      0,      0, 0x4554                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x4260, 0x4177, 	 0, 0x4628, 	 0, 0x6D70, 0x3555, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x6D79, 	 0, 0x6D76, 0x6E25, 0x4629, /* 0x00 */
+    0x4360, 0x6D73, 	 0, 0x447E, 0x4553, 0x6D74, 0x6D78, 0x3F60, /* 0x10 */
+         0, 0x4767, 0x444C, 	 0, 	 0, 0x4042, 0x6D77, 0x422E, /* 0x10 */
+    0x4224, 0x6D75, 0x3029, 0x4F22, 	 0, 	 0, 	 0, 0x6D7A, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4261, 	 0, /* 0x20 */
+         0, 0x3D35, 0x3F4A, 	 0, 	 0, 0x6D7C, 0x6D7B, 	 0, /* 0x30 */
+    0x306F, 0x6D7D, 	 0, 	 0, 0x492F, 	 0, 0x6E27, 	 0, /* 0x30 */
+         0, 0x465B, 0x3F6B, 	 0, 	 0, 0x4359, 	 0, 0x3678, /* 0x40 */
+         0, 0x6E26, 0x4D37, 0x313F, 	 0, 0x4A57, 0x3261, 0x6E21, /* 0x40 */
+    0x6E22, 0x6E23, 0x6E24, 0x463B, 0x4323, 0x3063, 0x6E28, 	 0, /* 0x50 */
+    0x6E29, 0x7423, 	 0, 	 0, 0x423D, 	 0, 0x6E2A, 	 0, /* 0x50 */
+    0x3173, 0x414C, 	 0, 0x382F, 	 0, 0x4D5A, 	 0, 	 0, /* 0x60 */
+    0x6E2B, 0x452C, 	 0, 	 0, 	 0, 0x4178, 0x3C57, 0x6E2C, /* 0x60 */
+         0, 	 0, 0x6E2F, 	 0, 	 0, 0x3D65, 0x6E2D, 0x412B, /* 0x70 */
+    0x412A, 	 0, 0x3064, 	 0, 0x4E4B, 0x6E31, 	 0, 0x4872, /* 0x70 */
+    0x6E33, 0x6E32, 0x6E30, 0x6364, 0x3454, 	 0, 	 0, 0x6D6E, /* 0x80 */
+         0, 0x6E35, 0x6E34, 	 0, 	 0, 	 0, 	 0, 0x6E36, /* 0x80 */
+         0, 0x4D38, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x4661, 	 0, 	 0, 0x4B2E, 	 0, /* 0xA0 */
+    0x6E37, 	 0, 0x3C59, 	 0, 	 0, 	 0, 	 0, 0x6E38, /* 0xA0 */
+         0, 0x6E39, 	 0, 	 0, 	 0, 0x6E3A, 	 0, 	 0, /* 0xB0 */
+    0x4521, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x306A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x3959, 	 0, 	 0, 	 0, 0x4F3A, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x6E3E, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x3734, 0x6E3B, 	 0, 0x6E3C, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x4974, 	 0, 	 0, 	 0, 	 0, 0x3354, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4D39, 	 0, 0x363F, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4554					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_91[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x6E3F,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0x6E40,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0x6E41,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0x4522,      0,      0, /* 0x20 */
-    0x6E43,      0, 0x6E42,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0x4653, 0x6E44, 0x3D36, 0x3C60, 0x475B, 0x4371,      0, /* 0x40 */
-         0,      0, 0x3C72,      0, 0x3F6C,      0, 0x6E45,      0, /* 0x50 */
-    0x6E46,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0x3F5D, 0x6E47,      0, 0x6E48,      0,      0, /* 0x60 */
-         0, 0x6E49, 0x4D6F,      0, 0x3D37,      0,      0,      0, /* 0x60 */
-         0,      0, 0x6E4B, 0x6E4A,      0, 0x395A,      0, 0x3973, /* 0x70 */
-    0x3B40,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x6E4E,      0,      0,      0,      0, 0x3D66, /* 0x80 */
-         0, 0x6E4D,      0, 0x6E4C,      0, 0x4269,      0,      0, /* 0x80 */
-    0x386F,      0, 0x4043,      0,      0,      0,      0, 0x4830, /* 0x90 */
-         0,      0,      0,      0, 0x3D39,      0,      0,      0, /* 0x90 */
-         0,      0, 0x6E4F,      0, 0x3E5F,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x6E52, 0x6E50,      0,      0,      0, 0x6E51, /* 0xA0 */
-         0,      0,      0,      0, 0x6E54, 0x6E53,      0,      0, /* 0xB0 */
-    0x3E7A,      0, 0x6E55,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x6E56, 0x6E57,      0,      0,      0,      0, 0x4850, 0x3A53, /* 0xC0 */
-    0x3C61, 0x6E58,      0, 0x6E59, 0x4E24, 0x3D45, 0x4C6E, 0x4E4C, /* 0xC0 */
-    0x6E5A, 0x3662,      0,      0,      0,      0, 0x6E5B,      0, /* 0xD0 */
-    0x4523,      0,      0, 0x6E5E, 0x3378, 0x3F4B,      0, 0x6E5C, /* 0xD0 */
-         0, 0x6E5D,      0, 0x4460,      0,      0, 0x4B55, 0x367C, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0x6E60, 0x6E61,      0, /* 0xF0 */
-         0,      0,      0,      0, 0x6E5F,      0,      0, 0x6E63  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x6E3F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x6E40, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x6E41, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4522, 	 0, 	 0, /* 0x20 */
+    0x6E43, 	 0, 0x6E42, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x4653, 0x6E44, 0x3D36, 0x3C60, 0x475B, 0x4371, 	 0, /* 0x40 */
+         0, 	 0, 0x3C72, 	 0, 0x3F6C, 	 0, 0x6E45, 	 0, /* 0x50 */
+    0x6E46, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x3F5D, 0x6E47, 	 0, 0x6E48, 	 0, 	 0, /* 0x60 */
+         0, 0x6E49, 0x4D6F, 	 0, 0x3D37, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x6E4B, 0x6E4A, 	 0, 0x395A, 	 0, 0x3973, /* 0x70 */
+    0x3B40, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x6E4E, 	 0, 	 0, 	 0, 	 0, 0x3D66, /* 0x80 */
+         0, 0x6E4D, 	 0, 0x6E4C, 	 0, 0x4269, 	 0, 	 0, /* 0x80 */
+    0x386F, 	 0, 0x4043, 	 0, 	 0, 	 0, 	 0, 0x4830, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x3D39, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x6E4F, 	 0, 0x3E5F, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x6E52, 0x6E50, 	 0, 	 0, 	 0, 0x6E51, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x6E54, 0x6E53, 	 0, 	 0, /* 0xB0 */
+    0x3E7A, 	 0, 0x6E55, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x6E56, 0x6E57, 	 0, 	 0, 	 0, 	 0, 0x4850, 0x3A53, /* 0xC0 */
+    0x3C61, 0x6E58, 	 0, 0x6E59, 0x4E24, 0x3D45, 0x4C6E, 0x4E4C, /* 0xC0 */
+    0x6E5A, 0x3662, 	 0, 	 0, 	 0, 	 0, 0x6E5B, 	 0, /* 0xD0 */
+    0x4523, 	 0, 	 0, 0x6E5E, 0x3378, 0x3F4B, 	 0, 0x6E5C, /* 0xD0 */
+         0, 0x6E5D, 	 0, 0x4460, 	 0, 	 0, 0x4B55, 0x367C, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6E60, 0x6E61, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0x6E5F, 	 0, 	 0, 0x6E63	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_92[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-                                            0x465F, 0x3343,      0, /* 0x00 */
-         0, 0x6E67,      0,      0, 0x6E64, 0x6E66,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x6E62,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0x6F4F,      0,      0, 0x6E65,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0x4E6B,      0,      0, 0x385A, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0x6E6F, /* 0x30 */
-         0,      0,      0,      0, 0x4534, 0x6E6A,      0,      0, /* 0x40 */
-    0x6E6D, 0x6E6B,      0, 0x6E70,      0,      0,      0,      0, /* 0x40 */
-    0x6E71,      0,      0,      0,      0,      0,      0, 0x6E69, /* 0x50 */
-         0,      0, 0x6E76, 0x3174,      0,      0, 0x6E68,      0, /* 0x50 */
-         0,      0, 0x482D,      0, 0x6E6C,      0, 0x3E60,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0x395B,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x4B48,      0, /* 0x70 */
-    0x3664,      0,      0, 0x3D46,      0, 0x463C,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0x412D,      0, 0x6E74,      0, 0x6E6E, 0x6E73,      0, /* 0x90 */
-    0x4C43,      0, 0x4438, 0x6E75, 0x6E72,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0x412C,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0x6E79, /* 0xB0 */
-         0, 0x6E78,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0x6E77, /* 0xC0 */
-         0,      0, 0x4B2F,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x3D7B,      0,      0,      0, /* 0xE0 */
-         0, 0x6E7A, 0x4A5F,      0,      0, 0x3154,      0,      0, /* 0xE0 */
-         0,      0, 0x4946, 0x4372,      0,      0,      0,      0, /* 0xF0 */
-    0x3578,      0, 0x6E7C,      0, 0x395D                          /* 0xF0 */
+                                            0x465F, 0x3343, 	 0, /* 0x00 */
+         0, 0x6E67, 	 0, 	 0, 0x6E64, 0x6E66, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6E62, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x6F4F, 	 0, 	 0, 0x6E65, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x4E6B, 	 0, 	 0, 0x385A, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6E6F, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x4534, 0x6E6A, 	 0, 	 0, /* 0x40 */
+    0x6E6D, 0x6E6B, 	 0, 0x6E70, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0x6E71, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6E69, /* 0x50 */
+         0, 	 0, 0x6E76, 0x3174, 	 0, 	 0, 0x6E68, 	 0, /* 0x50 */
+         0, 	 0, 0x482D, 	 0, 0x6E6C, 	 0, 0x3E60, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x395B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4B48, 	 0, /* 0x70 */
+    0x3664, 	 0, 	 0, 0x3D46, 	 0, 0x463C, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x412D, 	 0, 0x6E74, 	 0, 0x6E6E, 0x6E73, 	 0, /* 0x90 */
+    0x4C43, 	 0, 0x4438, 0x6E75, 0x6E72, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x412C, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6E79, /* 0xB0 */
+         0, 0x6E78, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6E77, /* 0xC0 */
+         0, 	 0, 0x4B2F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x3D7B, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x6E7A, 0x4A5F, 	 0, 	 0, 0x3154, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x4946, 0x4372, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x3578, 	 0, 0x6E7C, 	 0, 0x395D							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_93[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0x3B2C,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0, 0x6E7B, /* 0x00 */
-    0x3F6D,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0x3F6E, 0x6F21, 0x6F23,      0,      0,      0,      0,      0, /* 0x10 */
-    0x3E7B,      0, 0x6F22, 0x6F24,      0,      0, 0x3653,      0, /* 0x20 */
-    0x4945,      0,      0, 0x3C62, 0x4F23,      0, 0x6E7E, 0x3A78, /* 0x20 */
-         0,      0, 0x4F3F,      0,      0, 0x6F26,      0,      0, /* 0x30 */
-         0,      0, 0x6F25, 0x6F27,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0x6E7D,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0x4669,      0, 0x4555,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0x4457,      0, 0x6F2C,      0, /* 0x50 */
-         0,      0,      0, 0x4343, 0x6F28,      0,      0,      0, /* 0x50 */
-    0x6F29,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0x372D,      0, 0x6F2B,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0x3830,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0x6F2A,      0, 0x3E61,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0x3379,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0x6F30,      0, 0x3A3F, 0x4179, /* 0x90 */
-         0,      0, 0x444A,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0x333B, /* 0xA0 */
-         0,      0,      0,      0, 0x6F2E, 0x6F2F, 0x4443,      0, /* 0xA0 */
-    0x6F2D,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x6F31,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x6F37,      0,      0,      0,      0, /* 0xC0 */
-    0x6F3A,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0x6F39, 0x452D,      0,      0,      0,      0, 0x6F32, 0x6F33, /* 0xD0 */
-    0x6F36,      0,      0,      0,      0, 0x6F38,      0,      0, /* 0xD0 */
-         0, 0x3640,      0,      0, 0x6F3B, 0x6F35,      0,      0, /* 0xE0 */
-    0x6F34                                                          /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0x3B2C, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6E7B, /* 0x00 */
+    0x3F6D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x3F6E, 0x6F21, 0x6F23, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x3E7B, 	 0, 0x6F22, 0x6F24, 	 0, 	 0, 0x3653, 	 0, /* 0x20 */
+    0x4945, 	 0, 	 0, 0x3C62, 0x4F23, 	 0, 0x6E7E, 0x3A78, /* 0x20 */
+         0, 	 0, 0x4F3F, 	 0, 	 0, 0x6F26, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x6F25, 0x6F27, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x6E7D, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x4669, 	 0, 0x4555, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x4457, 	 0, 0x6F2C, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x4343, 0x6F28, 	 0, 	 0, 	 0, /* 0x50 */
+    0x6F29, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x372D, 	 0, 0x6F2B, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3830, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0x6F2A, 	 0, 0x3E61, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x3379, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x6F30, 	 0, 0x3A3F, 0x4179, /* 0x90 */
+         0, 	 0, 0x444A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x333B, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x6F2E, 0x6F2F, 0x4443, 	 0, /* 0xA0 */
+    0x6F2D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x6F31, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x6F37, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x6F3A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x6F39, 0x452D, 	 0, 	 0, 	 0, 	 0, 0x6F32, 0x6F33, /* 0xD0 */
+    0x6F36, 	 0, 	 0, 	 0, 	 0, 0x6F38, 	 0, 	 0, /* 0xD0 */
+         0, 0x3640, 	 0, 	 0, 0x6F3B, 0x6F35, 	 0, 	 0, /* 0xE0 */
+    0x6F34															/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_94[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0x6F3F,      0,      0,      0, 0x6F40, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0x6F41,      0,      0, 0x6F3E, 0x6F3D,      0,      0,      0, /* 0x10 */
-    0x3E62, 0x462A, 0x6F3C,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0x6F45,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0x6F43,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0x6F44, 0x6F42,      0, /* 0x30 */
-    0x4278,      0, 0x6F46,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0x6F47,      0,      0, 0x6F49,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0x3455, 0x6F48, 0x4C7A,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0x6F54, 0x6F4A,      0,      0, 0x6F4D,      0, /* 0x50 */
-    0x6F4B,      0, 0x6F4C,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0x6F4E,      0,      0,      0,      0,      0, /* 0x60 */
-    0x6F50,      0,      0,      0,      0, 0x6F51,      0, 0x6F52, /* 0x70 */
-         0,      0,      0,      0, 0x6F55, 0x6F53, 0x6F56, 0x6F58, /* 0x70 */
-         0, 0x6F57                                                  /* 0x80 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0x6F3F, 	 0, 	 0, 	 0, 0x6F40, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0x6F41, 	 0, 	 0, 0x6F3E, 0x6F3D, 	 0, 	 0, 	 0, /* 0x10 */
+    0x3E62, 0x462A, 0x6F3C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x6F45, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x6F43, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6F44, 0x6F42, 	 0, /* 0x30 */
+    0x4278, 	 0, 0x6F46, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x6F47, 	 0, 	 0, 0x6F49, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x3455, 0x6F48, 0x4C7A, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x6F54, 0x6F4A, 	 0, 	 0, 0x6F4D, 	 0, /* 0x50 */
+    0x6F4B, 	 0, 0x6F4C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x6F4E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x6F50, 	 0, 	 0, 	 0, 	 0, 0x6F51, 	 0, 0x6F52, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0x6F55, 0x6F53, 0x6F56, 0x6F58, /* 0x70 */
+         0, 0x6F57													/* 0x80 */
                                                                     /* 0x80 */
 };
 
@@ -3139,23 +3139,23 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_94[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_95[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0x4439, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0x4C67,      0, 0x6F59, 0x412E,      0,      0,      0, 0x6F5A, /* 0x80 */
-         0, 0x4A44, 0x6F5B, 0x332B,      0,      0,      0, 0x313C, /* 0x80 */
-         0, 0x3457,      0, 0x3456, 0x6F5C,      0, 0x6F5D,      0, /* 0x90 */
-    0x6F5E, 0x6F5F,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x6F60,      0, 0x3458, 0x3355, 0x395E, 0x4836,      0, 0x6F62, /* 0xA0 */
-    0x6F61,      0,      0,      0,      0, 0x6F63,      0,      0, /* 0xA0 */
-         0,      0, 0x315C,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x6F66,      0, 0x6F65, 0x6F64,      0, 0x6F67,      0, /* 0xB0 */
-         0,      0,      0, 0x6F6A,      0,      0,      0, 0x3047, /* 0xC0 */
-         0,      0, 0x6F68,      0, 0x6F6C, 0x6F6B,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x6F6E, 0x6F6D, 0x6F6F,      0, /* 0xD0 */
-    0x462E,      0,      0,      0, 0x6F70,      0,      0,      0, /* 0xD0 */
-         0, 0x6F71, 0x6F73,      0,      0, 0x6F72                  /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x4C67, 	 0, 0x6F59, 0x412E, 	 0, 	 0, 	 0, 0x6F5A, /* 0x80 */
+         0, 0x4A44, 0x6F5B, 0x332B, 	 0, 	 0, 	 0, 0x313C, /* 0x80 */
+         0, 0x3457, 	 0, 0x3456, 0x6F5C, 	 0, 0x6F5D, 	 0, /* 0x90 */
+    0x6F5E, 0x6F5F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x6F60, 	 0, 0x3458, 0x3355, 0x395E, 0x4836, 	 0, 0x6F62, /* 0xA0 */
+    0x6F61, 	 0, 	 0, 	 0, 	 0, 0x6F63, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x315C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x6F66, 	 0, 0x6F65, 0x6F64, 	 0, 0x6F67, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x6F6A, 	 0, 	 0, 	 0, 0x3047, /* 0xC0 */
+         0, 	 0, 0x6F68, 	 0, 0x6F6C, 0x6F6B, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x6F6E, 0x6F6D, 0x6F6F, 	 0, /* 0xD0 */
+    0x462E, 	 0, 	 0, 	 0, 0x6F70, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x6F71, 0x6F73, 	 0, 	 0, 0x6F72					/* 0xE0 */
                                                                     /* 0xE0 */
 };
 
@@ -3163,237 +3163,237 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_95[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_96[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x10 */
-                                    0x496C,      0,      0,      0, /* 0x10 */
-         0, 0x6F74,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0x6F75,      0, 0x3A65,      0,      0,      0, 0x6F76, 0x6F77, /* 0x20 */
-         0,      0, 0x4B49,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x414B,      0,      0,      0, 0x3024, /* 0x30 */
-    0x424B,      0, 0x6F78,      0, 0x496D,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0x6F7B, 0x6F79, 0x395F,      0, 0x6F7A, /* 0x40 */
-    0x3842,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0x4A45, 0x6F7D, 0x7021, 0x6F7E, 0x7022, /* 0x50 */
-         0,      0, 0x3121, 0x3F58, 0x3D7C, 0x3459, 0x7023,      0, /* 0x60 */
-         0,      0, 0x4766,      0, 0x7025,      0,      0,      0, /* 0x60 */
-    0x3122,      0, 0x7024, 0x4444,      0, 0x4E4D, 0x462B, 0x6F7C, /* 0x70 */
-    0x4E26,      0, 0x3831,      0,      0, 0x4D5B,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0x3679, 0x4E34,      0, /* 0x80 */
-    0x3728,      0, 0x4262, 0x6721,      0, 0x7026, 0x332C, 0x3F6F, /* 0x80 */
-         0,      0,      0,      0, 0x3356, 0x7028,      0, 0x7029, /* 0x90 */
-    0x7027, 0x3764,      0, 0x3A5D, 0x3E63,      0,      0,      0, /* 0x90 */
-    0x3123,      0,      0, 0x4E59,      0,      0,      0, 0x702B, /* 0xA0 */
-    0x6E2E,      0, 0x702A,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x702E, 0x702C, 0x702D,      0, 0x702F,      0, 0x7030, 0x4E6C, /* 0xB0 */
-    0x7031, 0x7032,      0, 0x4049, 0x483B,      0,      0,      0, /* 0xB0 */
-    0x3F7D, 0x3467,      0,      0, 0x4D3A, 0x326D, 0x3D38, 0x385B, /* 0xC0 */
-         0, 0x7035,      0, 0x7034, 0x3B73, 0x7036, 0x7033,      0, /* 0xC0 */
-         0, 0x3B28,      0,      0,      0, 0x703A, 0x6A2D,      0, /* 0xD0 */
-         0, 0x5256,      0, 0x3F77, 0x7038,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x4E25, 0x4671,      0,      0,      0,      0, /* 0xE0 */
-    0x312B,      0, 0x4063, 0x3C36,      0,      0,      0,      0, /* 0xE0 */
-    0x4A37,      0, 0x3140,      0,      0,      0, 0x4E6D, 0x4D6B, /* 0xF0 */
-         0, 0x703B,      0, 0x4545                                  /* 0xF0 */
+                                    0x496C, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x6F74, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x6F75, 	 0, 0x3A65, 	 0, 	 0, 	 0, 0x6F76, 0x6F77, /* 0x20 */
+         0, 	 0, 0x4B49, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x414B, 	 0, 	 0, 	 0, 0x3024, /* 0x30 */
+    0x424B, 	 0, 0x6F78, 	 0, 0x496D, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x6F7B, 0x6F79, 0x395F, 	 0, 0x6F7A, /* 0x40 */
+    0x3842, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x4A45, 0x6F7D, 0x7021, 0x6F7E, 0x7022, /* 0x50 */
+         0, 	 0, 0x3121, 0x3F58, 0x3D7C, 0x3459, 0x7023, 	 0, /* 0x60 */
+         0, 	 0, 0x4766, 	 0, 0x7025, 	 0, 	 0, 	 0, /* 0x60 */
+    0x3122, 	 0, 0x7024, 0x4444, 	 0, 0x4E4D, 0x462B, 0x6F7C, /* 0x70 */
+    0x4E26, 	 0, 0x3831, 	 0, 	 0, 0x4D5B, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3679, 0x4E34, 	 0, /* 0x80 */
+    0x3728, 	 0, 0x4262, 0x6721, 	 0, 0x7026, 0x332C, 0x3F6F, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x3356, 0x7028, 	 0, 0x7029, /* 0x90 */
+    0x7027, 0x3764, 	 0, 0x3A5D, 0x3E63, 	 0, 	 0, 	 0, /* 0x90 */
+    0x3123, 	 0, 	 0, 0x4E59, 	 0, 	 0, 	 0, 0x702B, /* 0xA0 */
+    0x6E2E, 	 0, 0x702A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x702E, 0x702C, 0x702D, 	 0, 0x702F, 	 0, 0x7030, 0x4E6C, /* 0xB0 */
+    0x7031, 0x7032, 	 0, 0x4049, 0x483B, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x3F7D, 0x3467, 	 0, 	 0, 0x4D3A, 0x326D, 0x3D38, 0x385B, /* 0xC0 */
+         0, 0x7035, 	 0, 0x7034, 0x3B73, 0x7036, 0x7033, 	 0, /* 0xC0 */
+         0, 0x3B28, 	 0, 	 0, 	 0, 0x703A, 0x6A2D, 	 0, /* 0xD0 */
+         0, 0x5256, 	 0, 0x3F77, 0x7038, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x4E25, 0x4671, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x312B, 	 0, 0x4063, 0x3C36, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x4A37, 	 0, 0x3140, 	 0, 	 0, 	 0, 0x4E6D, 0x4D6B, /* 0xF0 */
+         0, 0x703B, 	 0, 0x4545									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_97[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x3C7B,      0,      0,      0, 0x703C,      0, 0x703D, 0x3F4C, /* 0x00 */
-    0x703E,      0, 0x4E6E,      0,      0, 0x7039, 0x7040, 0x7042, /* 0x00 */
-         0, 0x7041,      0, 0x703F,      0,      0, 0x7043,      0, /* 0x10 */
-         0, 0x7044,      0,      0, 0x417A,      0, 0x3262,      0, /* 0x10 */
-         0,      0,      0,      0, 0x7045,      0,      0, 0x4C38, /* 0x20 */
-         0,      0, 0x7046,      0,      0,      0,      0,      0, /* 0x20 */
-    0x7047,      0, 0x4F2A,      0,      0,      0,      0,      0, /* 0x30 */
-    0x5B31, 0x7048,      0,      0,      0, 0x7049, 0x704A,      0, /* 0x30 */
-         0,      0, 0x704E,      0, 0x704B,      0, 0x704C,      0, /* 0x40 */
-    0x704D, 0x704F,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x4044,      0,      0,      0, 0x4C77,      0, /* 0x50 */
-         0, 0x4045,      0,      0, 0x7050,      0, 0x4873,      0, /* 0x50 */
-    0x7051, 0x7353, 0x4C4C,      0, 0x7052,      0, 0x7053,      0, /* 0x60 */
-    0x7054, 0x3357,      0, 0x7056,      0, 0x3F59,      0,      0, /* 0x60 */
-         0, 0x7057,      0,      0, 0x3724,      0,      0,      0, /* 0x70 */
-         0, 0x7058, 0x705C,      0, 0x705A,      0,      0,      0, /* 0x70 */
-         0, 0x705B,      0,      0, 0x3373, 0x7059, 0x705D,      0, /* 0x80 */
-         0,      0,      0, 0x705E,      0, 0x3048,      0, 0x705F, /* 0x80 */
-    0x7060,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x3E64,      0,      0,      0, 0x7061,      0,      0,      0, /* 0x90 */
-    0x3547,      0,      0, 0x7064,      0,      0, 0x7063,      0, /* 0xA0 */
-    0x7062,      0,      0, 0x6B71,      0, 0x4A5C,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x7065, 0x7066,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x7067,      0,      0, 0x7068,      0, /* 0xC0 */
-    0x7069,      0,      0, 0x706A,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0x345A,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x706B,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0x706C, 0x4723,      0, /* 0xE0 */
-         0,      0, 0x706E, 0x323B,      0, 0x7071, 0x7070,      0, /* 0xF0 */
-         0,      0,      0, 0x3124,      0,      0,      0, 0x3641  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x3C7B, 	 0, 	 0, 	 0, 0x703C, 	 0, 0x703D, 0x3F4C, /* 0x00 */
+    0x703E, 	 0, 0x4E6E, 	 0, 	 0, 0x7039, 0x7040, 0x7042, /* 0x00 */
+         0, 0x7041, 	 0, 0x703F, 	 0, 	 0, 0x7043, 	 0, /* 0x10 */
+         0, 0x7044, 	 0, 	 0, 0x417A, 	 0, 0x3262, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x7045, 	 0, 	 0, 0x4C38, /* 0x20 */
+         0, 	 0, 0x7046, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x7047, 	 0, 0x4F2A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x5B31, 0x7048, 	 0, 	 0, 	 0, 0x7049, 0x704A, 	 0, /* 0x30 */
+         0, 	 0, 0x704E, 	 0, 0x704B, 	 0, 0x704C, 	 0, /* 0x40 */
+    0x704D, 0x704F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x4044, 	 0, 	 0, 	 0, 0x4C77, 	 0, /* 0x50 */
+         0, 0x4045, 	 0, 	 0, 0x7050, 	 0, 0x4873, 	 0, /* 0x50 */
+    0x7051, 0x7353, 0x4C4C, 	 0, 0x7052, 	 0, 0x7053, 	 0, /* 0x60 */
+    0x7054, 0x3357, 	 0, 0x7056, 	 0, 0x3F59, 	 0, 	 0, /* 0x60 */
+         0, 0x7057, 	 0, 	 0, 0x3724, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x7058, 0x705C, 	 0, 0x705A, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x705B, 	 0, 	 0, 0x3373, 0x7059, 0x705D, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x705E, 	 0, 0x3048, 	 0, 0x705F, /* 0x80 */
+    0x7060, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x3E64, 	 0, 	 0, 	 0, 0x7061, 	 0, 	 0, 	 0, /* 0x90 */
+    0x3547, 	 0, 	 0, 0x7064, 	 0, 	 0, 0x7063, 	 0, /* 0xA0 */
+    0x7062, 	 0, 	 0, 0x6B71, 	 0, 0x4A5C, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x7065, 0x7066, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x7067, 	 0, 	 0, 0x7068, 	 0, /* 0xC0 */
+    0x7069, 	 0, 	 0, 0x706A, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x345A, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x706B, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x706C, 0x4723, 	 0, /* 0xE0 */
+         0, 	 0, 0x706E, 0x323B, 	 0, 0x7071, 0x7070, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0x3124, 	 0, 	 0, 	 0, 0x3641	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_98[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x4A47, 0x443A, 0x3A22,      0, 0x3960, 0x3D67,      0, /* 0x00 */
-    0x3F5C,      0,      0,      0, 0x7073,      0,      0, 0x7072, /* 0x00 */
-    0x4D42, 0x3468, 0x4852, 0x465C,      0,      0,      0, 0x3F7C, /* 0x10 */
-    0x4E4E,      0, 0x375B,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0x7076,      0,      0, 0x7075,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0x4B4B, 0x462C,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0x3150,      0,      0, 0x7077, /* 0x30 */
-    0x7074,      0,      0, 0x4951, 0x4D6A, 0x7078,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0x7079,      0, /* 0x40 */
-         0,      0,      0, 0x707B, 0x426A, 0x335B, 0x335C, 0x707A, /* 0x40 */
-         0,      0,      0,      0, 0x3469, 0x3832,      0,      0, /* 0x50 */
-    0x346A,      0,      0, 0x453F,      0,      0, 0x4E60,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0x385C, /* 0x60 */
-         0,      0,      0, 0x707C,      0,      0,      0, 0x707D, /* 0x60 */
-    0x707E, 0x7121,      0, 0x7123, 0x7122,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x4977,      0, 0x7124,      0,      0,      0,      0, 0x7125, /* 0xA0 */
-         0, 0x7126,      0,      0,      0,      0, 0x7127,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x7129, 0x7128,      0, 0x712A,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0x4874, 0x664C,      0,      0, 0x3F29, /* 0xD0 */
-         0,      0, 0x3532,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0x712B,      0, 0x712C,      0, 0x522C, 0x5D3B, 0x4853, /* 0xE0 */
-         0,      0, 0x307B,      0, 0x303B,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0, 0x3B74, 0x4B30, 0x3E7E          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x4A47, 0x443A, 0x3A22, 	 0, 0x3960, 0x3D67, 	 0, /* 0x00 */
+    0x3F5C, 	 0, 	 0, 	 0, 0x7073, 	 0, 	 0, 0x7072, /* 0x00 */
+    0x4D42, 0x3468, 0x4852, 0x465C, 	 0, 	 0, 	 0, 0x3F7C, /* 0x10 */
+    0x4E4E, 	 0, 0x375B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x7076, 	 0, 	 0, 0x7075, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x4B4B, 0x462C, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x3150, 	 0, 	 0, 0x7077, /* 0x30 */
+    0x7074, 	 0, 	 0, 0x4951, 0x4D6A, 0x7078, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x7079, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x707B, 0x426A, 0x335B, 0x335C, 0x707A, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x3469, 0x3832, 	 0, 	 0, /* 0x50 */
+    0x346A, 	 0, 	 0, 0x453F, 	 0, 	 0, 0x4E60, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x385C, /* 0x60 */
+         0, 	 0, 	 0, 0x707C, 	 0, 	 0, 	 0, 0x707D, /* 0x60 */
+    0x707E, 0x7121, 	 0, 0x7123, 0x7122, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x4977, 	 0, 0x7124, 	 0, 	 0, 	 0, 	 0, 0x7125, /* 0xA0 */
+         0, 0x7126, 	 0, 	 0, 	 0, 	 0, 0x7127, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x7129, 0x7128, 	 0, 0x712A, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x4874, 0x664C, 	 0, 	 0, 0x3F29, /* 0xD0 */
+         0, 	 0, 0x3532, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x712B, 	 0, 0x712C, 	 0, 0x522C, 0x5D3B, 0x4853, /* 0xE0 */
+         0, 	 0, 0x307B, 	 0, 0x303B, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0x3B74, 0x4B30, 0x3E7E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_99[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0x712D,      0, 0x4C5F,      0,      0, /* 0x00 */
-         0, 0x712E, 0x4D5C,      0, 0x3142,      0,      0,      0, /* 0x00 */
-    0x3B41,      0, 0x712F, 0x326E, 0x7130,      0,      0,      0, /* 0x10 */
-    0x7131,      0,      0,      0,      0, 0x7133, 0x7134,      0, /* 0x10 */
-    0x7136, 0x7132,      0,      0, 0x7135,      0,      0,      0, /* 0x20 */
-    0x345B,      0,      0,      0, 0x7137,      0, 0x7138,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0x7139, 0x713A,      0, /* 0x30 */
-         0,      0, 0x713B,      0,      0, 0x713D,      0,      0, /* 0x40 */
-         0, 0x713C,      0, 0x713F, 0x7142,      0,      0,      0, /* 0x40 */
-    0x713E, 0x7140, 0x7141,      0,      0, 0x7143,      0, 0x3642, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x3C73, 0x7144, /* 0x90 */
-    0x7145, 0x3961,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0x7146,      0,      0, /* 0xA0 */
-    0x333E,      0,      0,      0, 0x474F, 0x7147, 0x7148,      0, /* 0xA0 */
-         0,      0,      0, 0x435A, 0x466B,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x7149,      0,      0,      0, /* 0xB0 */
-         0, 0x477D,      0,      0, 0x424C, 0x3158, 0x366E,      0, /* 0xC0 */
-    0x366F,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0x4373, 0x714E, 0x3670,      0,      0, 0x326F,      0,      0, /* 0xD0 */
-    0x714D,      0,      0, 0x714B,      0, 0x714C,      0, 0x714A, /* 0xD0 */
-         0,      0, 0x7158,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0x714F, 0x7150,      0, /* 0xE0 */
-         0, 0x7151, 0x7152,      0,      0,      0,      0,      0, /* 0xF0 */
-    0x7154,      0,      0, 0x7153,      0,      0,      0, 0x3D59  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0x712D, 	 0, 0x4C5F, 	 0, 	 0, /* 0x00 */
+         0, 0x712E, 0x4D5C, 	 0, 0x3142, 	 0, 	 0, 	 0, /* 0x00 */
+    0x3B41, 	 0, 0x712F, 0x326E, 0x7130, 	 0, 	 0, 	 0, /* 0x10 */
+    0x7131, 	 0, 	 0, 	 0, 	 0, 0x7133, 0x7134, 	 0, /* 0x10 */
+    0x7136, 0x7132, 	 0, 	 0, 0x7135, 	 0, 	 0, 	 0, /* 0x20 */
+    0x345B, 	 0, 	 0, 	 0, 0x7137, 	 0, 0x7138, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x7139, 0x713A, 	 0, /* 0x30 */
+         0, 	 0, 0x713B, 	 0, 	 0, 0x713D, 	 0, 	 0, /* 0x40 */
+         0, 0x713C, 	 0, 0x713F, 0x7142, 	 0, 	 0, 	 0, /* 0x40 */
+    0x713E, 0x7140, 0x7141, 	 0, 	 0, 0x7143, 	 0, 0x3642, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3C73, 0x7144, /* 0x90 */
+    0x7145, 0x3961, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x7146, 	 0, 	 0, /* 0xA0 */
+    0x333E, 	 0, 	 0, 	 0, 0x474F, 0x7147, 0x7148, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x435A, 0x466B, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x7149, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x477D, 	 0, 	 0, 0x424C, 0x3158, 0x366E, 	 0, /* 0xC0 */
+    0x366F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x4373, 0x714E, 0x3670, 	 0, 	 0, 0x326F, 	 0, 	 0, /* 0xD0 */
+    0x714D, 	 0, 	 0, 0x714B, 	 0, 0x714C, 	 0, 0x714A, /* 0xD0 */
+         0, 	 0, 0x7158, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x714F, 0x7150, 	 0, /* 0xE0 */
+         0, 0x7151, 0x7152, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x7154, 	 0, 	 0, 0x7153, 	 0, 	 0, 	 0, 0x3D59	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_9A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x7155,      0,      0,      0, 0x7157,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0x3533, 0x7156, /* 0x00 */
-         0,      0, 0x417B, 0x3833,      0,      0,      0,      0, /* 0x10 */
-         0, 0x7159,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0x424D,      0,      0, 0x715A,      0,      0,      0,      0, /* 0x20 */
-    0x462D,      0,      0,      0,      0,      0,      0, 0x715B, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0x7160,      0, /* 0x30 */
-    0x715E,      0, 0x715D, 0x715F,      0, 0x715C,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0x7162,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0x7161,      0, 0x7164, /* 0x50 */
-         0,      0, 0x3643, 0x7163,      0,      0,      0, 0x7165, /* 0x50 */
-         0,      0, 0x7166,      0, 0x7168, 0x7167,      0,      0, /* 0x60 */
-         0, 0x7169, 0x716B, 0x716A,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x397C,      0,      0,      0,      0, 0x716C,      0,      0, /* 0xA0 */
-    0x716D,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x333C,      0,      0,      0, 0x716E,      0,      0,      0, /* 0xB0 */
-    0x716F,      0,      0,      0, 0x3F71,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0x7170, /* 0xC0 */
-         0, 0x7171,      0, 0x7172, 0x7173,      0,      0,      0, /* 0xD0 */
-    0x3962,      0,      0,      0,      0,      0, 0x7174, 0x7175, /* 0xD0 */
-         0,      0, 0x7176, 0x7177,      0,      0, 0x7178,      0, /* 0xE0 */
-         0,      0, 0x4831, 0x717A,      0, 0x4926, 0x717B, 0x7179, /* 0xE0 */
-         0, 0x717D,      0,      0, 0x717C,      0,      0, 0x717E, /* 0xF0 */
-         0,      0,      0, 0x7221                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x7155, 	 0, 	 0, 	 0, 0x7157, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3533, 0x7156, /* 0x00 */
+         0, 	 0, 0x417B, 0x3833, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x7159, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x424D, 	 0, 	 0, 0x715A, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x462D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x715B, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x7160, 	 0, /* 0x30 */
+    0x715E, 	 0, 0x715D, 0x715F, 	 0, 0x715C, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x7162, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x7161, 	 0, 0x7164, /* 0x50 */
+         0, 	 0, 0x3643, 0x7163, 	 0, 	 0, 	 0, 0x7165, /* 0x50 */
+         0, 	 0, 0x7166, 	 0, 0x7168, 0x7167, 	 0, 	 0, /* 0x60 */
+         0, 0x7169, 0x716B, 0x716A, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x397C, 	 0, 	 0, 	 0, 	 0, 0x716C, 	 0, 	 0, /* 0xA0 */
+    0x716D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x333C, 	 0, 	 0, 	 0, 0x716E, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x716F, 	 0, 	 0, 	 0, 0x3F71, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x7170, /* 0xC0 */
+         0, 0x7171, 	 0, 0x7172, 0x7173, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x3962, 	 0, 	 0, 	 0, 	 0, 	 0, 0x7174, 0x7175, /* 0xD0 */
+         0, 	 0, 0x7176, 0x7177, 	 0, 	 0, 0x7178, 	 0, /* 0xE0 */
+         0, 	 0, 0x4831, 0x717A, 	 0, 0x4926, 0x717B, 0x7179, /* 0xE0 */
+         0, 0x717D, 	 0, 	 0, 0x717C, 	 0, 	 0, 0x717E, /* 0xF0 */
+         0, 	 0, 	 0, 0x7221									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_9B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0x7222,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0x7223,      0, 0x7224,      0,      0,      0,      0, 0x7225, /* 0x10 */
-         0,      0, 0x7226, 0x7227,      0, 0x7228,      0, 0x7229, /* 0x20 */
-    0x722A, 0x722B, 0x722C,      0,      0,      0, 0x722D, 0x722E, /* 0x20 */
-         0, 0x5D35, 0x722F,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x6478, 0x3534,      0,      0,      0, /* 0x30 */
-         0, 0x3321, 0x3A32, 0x7231, 0x7230, 0x4C25,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0x7233, 0x7234, 0x7232, /* 0x40 */
-         0, 0x7235,      0,      0, 0x4B62,      0,      0,      0, /* 0x50 */
-    0x7236,      0, 0x357B,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0x4F25, /* 0x60 */
-         0,      0,      0,      0, 0x7237,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0x7239,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x303E,      0, /* 0x80 */
-         0, 0x723A, 0x4A2B, 0x7238,      0,      0, 0x723B, 0x723C, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0x723D, /* 0x90 */
-    0x723E,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x723F,      0, 0x4B6E, 0x3B2D,      0, 0x3A7A, 0x412F,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x7240,      0,      0,      0, /* 0xB0 */
-         0, 0x7243,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x7241,      0,      0,      0,      0,      0, 0x7244,      0, /* 0xC0 */
-         0, 0x3871, 0x7242,      0,      0,      0,      0, 0x7245, /* 0xC0 */
-         0, 0x7246, 0x7247,      0, 0x724B,      0, 0x3B2A,      0, /* 0xD0 */
-         0,      0,      0, 0x4264,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x724C, 0x7249, 0x7248, 0x724A,      0,      0,      0, /* 0xE0 */
-    0x375F,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x7250, 0x724F, 0x724E,      0,      0, 0x3033                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0x7222, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x7223, 	 0, 0x7224, 	 0, 	 0, 	 0, 	 0, 0x7225, /* 0x10 */
+         0, 	 0, 0x7226, 0x7227, 	 0, 0x7228, 	 0, 0x7229, /* 0x20 */
+    0x722A, 0x722B, 0x722C, 	 0, 	 0, 	 0, 0x722D, 0x722E, /* 0x20 */
+         0, 0x5D35, 0x722F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x6478, 0x3534, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x3321, 0x3A32, 0x7231, 0x7230, 0x4C25, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x7233, 0x7234, 0x7232, /* 0x40 */
+         0, 0x7235, 	 0, 	 0, 0x4B62, 	 0, 	 0, 	 0, /* 0x50 */
+    0x7236, 	 0, 0x357B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4F25, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x7237, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x7239, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x303E, 	 0, /* 0x80 */
+         0, 0x723A, 0x4A2B, 0x7238, 	 0, 	 0, 0x723B, 0x723C, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x723D, /* 0x90 */
+    0x723E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x723F, 	 0, 0x4B6E, 0x3B2D, 	 0, 0x3A7A, 0x412F, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x7240, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x7243, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x7241, 	 0, 	 0, 	 0, 	 0, 	 0, 0x7244, 	 0, /* 0xC0 */
+         0, 0x3871, 0x7242, 	 0, 	 0, 	 0, 	 0, 0x7245, /* 0xC0 */
+         0, 0x7246, 0x7247, 	 0, 0x724B, 	 0, 0x3B2A, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x4264, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x724C, 0x7249, 0x7248, 0x724A, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x375F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x7250, 0x724F, 0x724E, 	 0, 	 0, 0x3033					/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -3401,39 +3401,39 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_9B[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_9C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0x725A,      0, 0x7256,      0, /* 0x00 */
-    0x7257, 0x7253, 0x7259,      0, 0x7255, 0x3362,      0,      0, /* 0x00 */
-    0x4F4C,      0, 0x7258, 0x7254, 0x7252, 0x7251,      0,      0, /* 0x10 */
-         0,      0,      0, 0x725C,      0,      0,      0,      0, /* 0x10 */
-         0, 0x725F,      0,      0, 0x725E, 0x725D,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0x4949, 0x725B, 0x3073, /* 0x20 */
-    0x7260,      0, 0x7262,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0x336F, 0x724D, 0x3137,      0,      0, 0x7264,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0x7263, 0x7261, /* 0x40 */
-    0x432D,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x4B70,      0,      0,      0,      0, 0x4E5A, /* 0x50 */
-         0,      0, 0x7265,      0,      0,      0,      0,      0, /* 0x50 */
-    0x7266,      0,      0,      0,      0,      0,      0, 0x7267, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0x7268,      0, /* 0x70 */
-    0x7269,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x443B,      0, 0x726A, /* 0xE0 */
-         0, 0x4837,      0, 0x726F, 0x726B,      0,      0,      0, /* 0xE0 */
-    0x726C,      0,      0, 0x4B31, 0x4C44,      0, 0x4650          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0x725A, 	 0, 0x7256, 	 0, /* 0x00 */
+    0x7257, 0x7253, 0x7259, 	 0, 0x7255, 0x3362, 	 0, 	 0, /* 0x00 */
+    0x4F4C, 	 0, 0x7258, 0x7254, 0x7252, 0x7251, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x725C, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x725F, 	 0, 	 0, 0x725E, 0x725D, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4949, 0x725B, 0x3073, /* 0x20 */
+    0x7260, 	 0, 0x7262, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x336F, 0x724D, 0x3137, 	 0, 	 0, 0x7264, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x7263, 0x7261, /* 0x40 */
+    0x432D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x4B70, 	 0, 	 0, 	 0, 	 0, 0x4E5A, /* 0x50 */
+         0, 	 0, 0x7265, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x7266, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x7267, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x7268, 	 0, /* 0x70 */
+    0x7269, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x443B, 	 0, 0x726A, /* 0xE0 */
+         0, 0x4837, 	 0, 0x726F, 0x726B, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x726C, 	 0, 	 0, 0x4B31, 0x4C44, 	 0, 0x4650			/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -3441,107 +3441,107 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_9C[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_9D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0x7270,      0,      0, 0x7271, 0x463E, /* 0x00 */
-    0x726E, 0x726D,      0,      0,      0,      0, 0x322A,      0, /* 0x00 */
-         0,      0, 0x7279,      0,      0, 0x7278,      0,      0, /* 0x10 */
-         0,      0,      0, 0x3175,      0,      0,      0, 0x7276, /* 0x10 */
-         0,      0,      0, 0x7275,      0,      0, 0x7273,      0, /* 0x20 */
-    0x337B,      0, 0x7272, 0x3C32, 0x3229,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x3963,      0,      0, 0x727C, 0x727B, /* 0x30 */
-         0, 0x727A,      0,      0, 0x7277,      0, 0x727D,      0, /* 0x40 */
-    0x727E,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0x7325, 0x7324,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0x7326,      0,      0, 0x312D, 0x7321, 0x7322,      0, /* 0x50 */
-    0x3974, 0x4C39,      0,      0, 0x7323,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0x4B32,      0,      0, 0x732B, /* 0x60 */
-         0,      0, 0x7327,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x732C,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0x7329, /* 0x80 */
-         0, 0x7328,      0,      0,      0,      0,      0, 0x375C, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0x732D,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0x732E,      0,      0,      0, /* 0xA0 */
-         0, 0x732F,      0, 0x732A,      0,      0,      0, 0x7274, /* 0xA0 */
-         0,      0, 0x7330,      0, 0x4461,      0,      0,      0, /* 0xB0 */
-    0x7334,      0, 0x7335, 0x7333,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x7332, 0x7338,      0, 0x7331,      0, 0x7336,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0x7337, /* 0xC0 */
-         0,      0,      0, 0x733A,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x7339,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0x733C,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0x733D,      0, 0x733E, /* 0xE0 */
-         0,      0, 0x4F49,      0,      0,      0,      0,      0, /* 0xF0 */
-    0x733B, 0x426B, 0x3A6D,      0,      0, 0x733F                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0x7270, 	 0, 	 0, 0x7271, 0x463E, /* 0x00 */
+    0x726E, 0x726D, 	 0, 	 0, 	 0, 	 0, 0x322A, 	 0, /* 0x00 */
+         0, 	 0, 0x7279, 	 0, 	 0, 0x7278, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x3175, 	 0, 	 0, 	 0, 0x7276, /* 0x10 */
+         0, 	 0, 	 0, 0x7275, 	 0, 	 0, 0x7273, 	 0, /* 0x20 */
+    0x337B, 	 0, 0x7272, 0x3C32, 0x3229, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x3963, 	 0, 	 0, 0x727C, 0x727B, /* 0x30 */
+         0, 0x727A, 	 0, 	 0, 0x7277, 	 0, 0x727D, 	 0, /* 0x40 */
+    0x727E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0x7325, 0x7324, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x7326, 	 0, 	 0, 0x312D, 0x7321, 0x7322, 	 0, /* 0x50 */
+    0x3974, 0x4C39, 	 0, 	 0, 0x7323, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x4B32, 	 0, 	 0, 0x732B, /* 0x60 */
+         0, 	 0, 0x7327, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x732C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x7329, /* 0x80 */
+         0, 0x7328, 	 0, 	 0, 	 0, 	 0, 	 0, 0x375C, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x732D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x732E, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x732F, 	 0, 0x732A, 	 0, 	 0, 	 0, 0x7274, /* 0xA0 */
+         0, 	 0, 0x7330, 	 0, 0x4461, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x7334, 	 0, 0x7335, 0x7333, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x7332, 0x7338, 	 0, 0x7331, 	 0, 0x7336, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x7337, /* 0xC0 */
+         0, 	 0, 	 0, 0x733A, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x7339, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x733C, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x733D, 	 0, 0x733E, /* 0xE0 */
+         0, 	 0, 0x4F49, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x733B, 0x426B, 0x3A6D, 	 0, 	 0, 0x733F					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_9E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x10 */
-                    0x7340, 0x7341,      0,      0, 0x7342,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0x7343,      0,      0, /* 0x70 */
-    0x3834, 0x7344,      0,      0,      0, 0x7345,      0, 0x3C2F, /* 0x70 */
-         0, 0x7346,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0x7347,      0,      0, 0x7348, 0x7349,      0,      0,      0, /* 0x80 */
-         0, 0x734C, 0x734A, 0x4F3C,      0, 0x734B,      0, 0x4E6F, /* 0x90 */
-         0,      0,      0,      0,      0, 0x734D,      0, 0x4E5B, /* 0x90 */
-         0,      0,      0,      0,      0, 0x734E, 0x477E,      0, /* 0xA0 */
-         0, 0x734F, 0x7351,      0,      0, 0x7352,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x7350, 0x396D, 0x4C4D, 0x4B63, 0x5677,      0, 0x5D60, 0x4B7B, /* 0xB0 */
-         0,      0,      0,      0, 0x322B,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x7354, 0x3550, 0x7355, 0x7356, /* 0xC0 */
-    0x7357,      0, 0x3975,      0, 0x7358,      0,      0,      0, /* 0xD0 */
-    0x6054, 0x4C5B,      0, 0x4263, 0x7359, 0x735B, 0x735A,      0, /* 0xD0 */
-    0x735C,      0,      0,      0,      0, 0x735D,      0,      0, /* 0xE0 */
-    0x735E,      0,      0,      0,      0,      0,      0, 0x735F, /* 0xE0 */
-         0,      0,      0,      0, 0x7360,      0, 0x7361, 0x7362, /* 0xF0 */
-         0, 0x7363,      0, 0x7364, 0x7365, 0x7366                  /* 0xF0 */
+                    0x7340, 0x7341, 	 0, 	 0, 0x7342, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x7343, 	 0, 	 0, /* 0x70 */
+    0x3834, 0x7344, 	 0, 	 0, 	 0, 0x7345, 	 0, 0x3C2F, /* 0x70 */
+         0, 0x7346, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x7347, 	 0, 	 0, 0x7348, 0x7349, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x734C, 0x734A, 0x4F3C, 	 0, 0x734B, 	 0, 0x4E6F, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x734D, 	 0, 0x4E5B, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x734E, 0x477E, 	 0, /* 0xA0 */
+         0, 0x734F, 0x7351, 	 0, 	 0, 0x7352, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x7350, 0x396D, 0x4C4D, 0x4B63, 0x5677, 	 0, 0x5D60, 0x4B7B, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x322B, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x7354, 0x3550, 0x7355, 0x7356, /* 0xC0 */
+    0x7357, 	 0, 0x3975, 	 0, 0x7358, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x6054, 0x4C5B, 	 0, 0x4263, 0x7359, 0x735B, 0x735A, 	 0, /* 0xD0 */
+    0x735C, 	 0, 	 0, 	 0, 	 0, 0x735D, 	 0, 	 0, /* 0xE0 */
+    0x735E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x735F, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x7360, 	 0, 0x7361, 0x7362, /* 0xF0 */
+         0, 0x7363, 	 0, 0x7364, 0x7365, 0x7366					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_9F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0x7367, /* 0x00 */
-    0x7368,      0,      0,      0,      0,      0, 0x4524,      0, /* 0x00 */
-         0,      0,      0, 0x385D,      0, 0x736A,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0x414D, 0x736B,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0x736C,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x4921,      0,      0, 0x736D,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x736E, 0x6337,      0,      0, 0x6C5A, 0x706D, /* 0x40 */
-         0,      0, 0x736F,      0, 0x7370,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0x7372, /* 0x50 */
-    0x7373, 0x7374, 0x4E70, 0x7371,      0,      0, 0x7375, 0x7376, /* 0x60 */
-         0,      0, 0x7378,      0, 0x7377,      0,      0,      0, /* 0x60 */
-         0,      0, 0x737A,      0,      0,      0, 0x737B, 0x7379, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x4E36,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x737C,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0x737D, 0x6354,      0,      0, /* 0x90 */
-    0x737E                                                          /* 0xA0 */
+    0x7368, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4524, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x385D, 	 0, 0x736A, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x414D, 0x736B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x736C, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x4921, 	 0, 	 0, 0x736D, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x736E, 0x6337, 	 0, 	 0, 0x6C5A, 0x706D, /* 0x40 */
+         0, 	 0, 0x736F, 	 0, 0x7370, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x7372, /* 0x50 */
+    0x7373, 0x7374, 0x4E70, 0x7371, 	 0, 	 0, 0x7375, 0x7376, /* 0x60 */
+         0, 	 0, 0x7378, 	 0, 0x7377, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x737A, 	 0, 	 0, 	 0, 0x737B, 0x7379, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4E36, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x737C, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x737D, 0x6354, 	 0, 	 0, /* 0x90 */
+    0x737E															/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -3549,37 +3549,37 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_9F[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_FF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x212A,      0, 0x2174, 0x2170, 0x2173, 0x2175,      0, /* 0x00 */
-    0x214A, 0x214B, 0x2176, 0x215C, 0x2124,      0, 0x2125, 0x213F, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x212A, 	 0, 0x2174, 0x2170, 0x2173, 0x2175, 	 0, /* 0x00 */
+    0x214A, 0x214B, 0x2176, 0x215C, 0x2124, 	 0, 0x2125, 0x213F, /* 0x00 */
     0x2330, 0x2331, 0x2332, 0x2333, 0x2334, 0x2335, 0x2336, 0x2337, /* 0x10 */
     0x2338, 0x2339, 0x2127, 0x2128, 0x2163, 0x2161, 0x2164, 0x2129, /* 0x10 */
     0x2177, 0x2341, 0x2342, 0x2343, 0x2344, 0x2345, 0x2346, 0x2347, /* 0x20 */
     0x2348, 0x2349, 0x234A, 0x234B, 0x234C, 0x234D, 0x234E, 0x234F, /* 0x20 */
     0x2350, 0x2351, 0x2352, 0x2353, 0x2354, 0x2355, 0x2356, 0x2357, /* 0x30 */
-    0x2358, 0x2359, 0x235A, 0x214E,      0, 0x214F, 0x2130, 0x2132, /* 0x30 */
+    0x2358, 0x2359, 0x235A, 0x214E, 	 0, 0x214F, 0x2130, 0x2132, /* 0x30 */
     0x212E, 0x2361, 0x2362, 0x2363, 0x2364, 0x2365, 0x2366, 0x2367, /* 0x40 */
     0x2368, 0x2369, 0x236A, 0x236B, 0x236C, 0x236D, 0x236E, 0x236F, /* 0x40 */
     0x2370, 0x2371, 0x2372, 0x2373, 0x2374, 0x2375, 0x2376, 0x2377, /* 0x50 */
-    0x2378, 0x2379, 0x237A, 0x2150, 0x2143, 0x2151,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0x2131,      0, 0x216F                  /* 0xE0 */
+    0x2378, 0x2379, 0x237A, 0x2150, 0x2143, 0x2151, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x2131, 	 0, 0x216F					/* 0xE0 */
                                                                     /* 0xE0 */
 };
 
diff --git a/sal/textenc/tcvtjp5.tab b/sal/textenc/tcvtjp5.tab
index 4437ecaa49db..e8bc6c18a382 100644
--- a/sal/textenc/tcvtjp5.tab
+++ b/sal/textenc/tcvtjp5.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,59 +34,59 @@
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_00[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x2242,      0,      0, 0x2270,      0, 0x2243,      0, /* 0xA0 */
-         0, 0x226D, 0x226C,      0,      0,      0, 0x226E, 0x2234, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x2231,      0, 0x226B,      0,      0,      0,      0, 0x2244, /* 0xB0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x2242, 	 0, 	 0, 0x2270, 	 0, 0x2243, 	 0, /* 0xA0 */
+         0, 0x226D, 0x226C, 	 0, 	 0, 	 0, 0x226E, 0x2234, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x2231, 	 0, 0x226B, 	 0, 	 0, 	 0, 	 0, 0x2244, /* 0xB0 */
     0x2A22, 0x2A21, 0x2A24, 0x2A2A, 0x2A23, 0x2A29, 0x2921, 0x2A2E, /* 0xC0 */
     0x2A32, 0x2A31, 0x2A34, 0x2A33, 0x2A40, 0x2A3F, 0x2A42, 0x2A41, /* 0xC0 */
-         0, 0x2A50, 0x2A52, 0x2A51, 0x2A54, 0x2A58, 0x2A53,      0, /* 0xD0 */
+         0, 0x2A50, 0x2A52, 0x2A51, 0x2A54, 0x2A58, 0x2A53, 	 0, /* 0xD0 */
     0x292C, 0x2A63, 0x2A62, 0x2A65, 0x2A64, 0x2A72, 0x2930, 0x294E, /* 0xD0 */
     0x2B22, 0x2B21, 0x2B24, 0x2B2A, 0x2B23, 0x2B29, 0x2941, 0x2B2E, /* 0xE0 */
     0x2B32, 0x2B31, 0x2B34, 0x2B33, 0x2B40, 0x2B3F, 0x2B42, 0x2B41, /* 0xE0 */
-    0x2943, 0x2B50, 0x2B52, 0x2B51, 0x2B54, 0x2B58, 0x2B53,      0, /* 0xF0 */
-    0x294C, 0x2B63, 0x2B62, 0x2B65, 0x2B64, 0x2B72, 0x2950, 0x2B73  /* 0xF0 */
+    0x2943, 0x2B50, 0x2B52, 0x2B51, 0x2B54, 0x2B58, 0x2B53, 	 0, /* 0xF0 */
+    0x294C, 0x2B63, 0x2B62, 0x2B65, 0x2B64, 0x2B72, 0x2950, 0x2B73	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_01[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x2A27, 0x2B27, 0x2A25, 0x2B25, 0x2A28, 0x2B28, 0x2A2B, 0x2B2B, /* 0x00 */
     0x2A2C, 0x2B2C, 0x2A2F, 0x2B2F, 0x2A2D, 0x2B2D, 0x2A30, 0x2B30, /* 0x00 */
-    0x2922, 0x2942, 0x2A37, 0x2B37,      0,      0, 0x2A36, 0x2B36, /* 0x10 */
+    0x2922, 0x2942, 0x2A37, 0x2B37, 	 0, 	 0, 0x2A36, 0x2B36, /* 0x10 */
     0x2A38, 0x2B38, 0x2A35, 0x2B35, 0x2A3A, 0x2B3A, 0x2A3B, 0x2B3B, /* 0x10 */
-    0x2A3D, 0x2B3D, 0x2A3C,      0, 0x2A3E, 0x2B3E, 0x2924, 0x2944, /* 0x20 */
-    0x2A47, 0x2B47, 0x2A45, 0x2B45,      0,      0, 0x2A46, 0x2B46, /* 0x20 */
+    0x2A3D, 0x2B3D, 0x2A3C, 	 0, 0x2A3E, 0x2B3E, 0x2924, 0x2944, /* 0x20 */
+    0x2A47, 0x2B47, 0x2A45, 0x2B45, 	 0, 	 0, 0x2A46, 0x2B46, /* 0x20 */
     0x2A44, 0x2945, 0x2926, 0x2946, 0x2A48, 0x2B48, 0x2A49, 0x2B49, /* 0x30 */
     0x2947, 0x2A4A, 0x2B4A, 0x2A4C, 0x2B4C, 0x2A4B, 0x2B4B, 0x2929, /* 0x30 */
     0x2949, 0x2928, 0x2948, 0x2A4D, 0x2B4D, 0x2A4F, 0x2B4F, 0x2A4E, /* 0x40 */
-    0x2B4E, 0x294A, 0x292B, 0x294B, 0x2A57, 0x2B57,      0,      0, /* 0x40 */
+    0x2B4E, 0x294A, 0x292B, 0x294B, 0x2A57, 0x2B57, 	 0, 	 0, /* 0x40 */
     0x2A56, 0x2B56, 0x292D, 0x294D, 0x2A59, 0x2B59, 0x2A5B, 0x2B5B, /* 0x50 */
     0x2A5A, 0x2B5A, 0x2A5C, 0x2B5C, 0x2A5D, 0x2B5D, 0x2A5F, 0x2B5F, /* 0x50 */
     0x2A5E, 0x2B5E, 0x2A61, 0x2B61, 0x2A60, 0x2B60, 0x292F, 0x294F, /* 0x60 */
     0x2A6C, 0x2B6C, 0x2A69, 0x2B69, 0x2A66, 0x2B66, 0x2A6B, 0x2B6B, /* 0x60 */
     0x2A68, 0x2B68, 0x2A6A, 0x2B6A, 0x2A71, 0x2B71, 0x2A74, 0x2B74, /* 0x70 */
-    0x2A73, 0x2A75, 0x2B75, 0x2A77, 0x2B77, 0x2A76, 0x2B76,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0x2A26, 0x2B26, 0x2A43, /* 0xC0 */
+    0x2A73, 0x2A75, 0x2B75, 0x2A77, 0x2B77, 0x2A76, 0x2B76, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x2A26, 0x2B26, 0x2A43, /* 0xC0 */
     0x2B43, 0x2A55, 0x2B55, 0x2A67, 0x2B67, 0x2A70, 0x2B70, 0x2A6D, /* 0xD0 */
-    0x2B6D, 0x2A6F, 0x2B6F, 0x2A6E, 0x2B6E,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0x2B39                  /* 0xF0 */
+    0x2B6D, 0x2A6F, 0x2B6F, 0x2A6E, 0x2B6E, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x2B39					/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -94,61 +94,61 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0212_01[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_02[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0x2230, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x222F, 0x2232, 0x2236, 0x2235,      0, 0x2233                  /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x222F, 0x2232, 0x2236, 0x2235, 	 0, 0x2233					/* 0xD0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_03[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0x2238, 0x2239, 0x2661,      0, /* 0x80 */
-    0x2662, 0x2663, 0x2664,      0, 0x2667,      0, 0x2669, 0x266C, /* 0x80 */
-    0x2676,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x2665, 0x266A, 0x2671, 0x2672, 0x2673, 0x2674, /* 0xA0 */
-    0x267B,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x2678,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x2675, 0x267A, 0x2677, 0x2679, 0x267C          /* 0xC0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0x2238, 0x2239, 0x2661, 	 0, /* 0x80 */
+    0x2662, 0x2663, 0x2664, 	 0, 0x2667, 	 0, 0x2669, 0x266C, /* 0x80 */
+    0x2676, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x2665, 0x266A, 0x2671, 0x2672, 0x2673, 0x2674, /* 0xA0 */
+    0x267B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x2678, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x2675, 0x267A, 0x2677, 0x2679, 0x267C			/* 0xC0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_04[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                     0x2742, 0x2743, 0x2744, 0x2745, 0x2746, 0x2747, /* 0x00 */
-    0x2748, 0x2749, 0x274A, 0x274B, 0x274C,      0, 0x274D, 0x274E, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x2772, 0x2773, 0x2774, 0x2775, 0x2776, 0x2777, /* 0x50 */
-    0x2778, 0x2779, 0x277A, 0x277B, 0x277C,      0, 0x277D, 0x277E  /* 0x50 */
+    0x2748, 0x2749, 0x274A, 0x274B, 0x274C, 	 0, 0x274D, 0x274E, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x2772, 0x2773, 0x2774, 0x2775, 0x2776, 0x2777, /* 0x50 */
+    0x2778, 0x2779, 0x277A, 0x277B, 0x277C, 	 0, 0x277D, 0x277E	/* 0x50 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_21[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0x2271,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x226F                                          /* 0x20 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0x2271, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x226F											/* 0x20 */
                                                                     /* 0x20 */
 };
 
@@ -156,159 +156,159 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0212_21[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_4E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x3021,      0, 0x3022, 0x3023,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0x3024,      0,      0,      0, /* 0x00 */
-         0,      0, 0x3025,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0x3026, /* 0x10 */
-         0,      0,      0, 0x3027, 0x3028,      0,      0,      0, /* 0x20 */
-    0x3029,      0,      0, 0x302A,      0,      0, 0x302B, 0x302C, /* 0x20 */
-    0x302D,      0,      0,      0,      0, 0x302E,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0x302F, 0x3030,      0,      0, 0x3031,      0,      0, 0x3032, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0x3033,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0x3034,      0, 0x3035,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0x3036,      0,      0,      0,      0, /* 0x60 */
-    0x3037, 0x3038,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0x3039, 0x303A,      0,      0, /* 0x70 */
-         0, 0x303B,      0,      0,      0,      0,      0, 0x303C, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x303D,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x303E, 0x303F, /* 0x90 */
-         0,      0,      0,      0,      0, 0x3040,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0x3041, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x3042,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x3043,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0x3044,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x3045, 0x3046,      0,      0,      0,      0, /* 0xD0 */
-    0x3047, 0x3048, 0x3049,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x304A,      0,      0,      0,      0,      0,      0, 0x304B, /* 0xE0 */
-         0, 0x304C,      0, 0x304D,      0, 0x304E,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0x304F, 0x3050, 0x3051  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x3021, 	 0, 0x3022, 0x3023, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x3024, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x3025, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3026, /* 0x10 */
+         0, 	 0, 	 0, 0x3027, 0x3028, 	 0, 	 0, 	 0, /* 0x20 */
+    0x3029, 	 0, 	 0, 0x302A, 	 0, 	 0, 0x302B, 0x302C, /* 0x20 */
+    0x302D, 	 0, 	 0, 	 0, 	 0, 0x302E, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x302F, 0x3030, 	 0, 	 0, 0x3031, 	 0, 	 0, 0x3032, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x3033, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x3034, 	 0, 0x3035, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x3036, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x3037, 0x3038, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x3039, 0x303A, 	 0, 	 0, /* 0x70 */
+         0, 0x303B, 	 0, 	 0, 	 0, 	 0, 	 0, 0x303C, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x303D, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x303E, 0x303F, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3040, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3041, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x3042, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x3043, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x3044, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x3045, 0x3046, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x3047, 0x3048, 0x3049, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x304A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x304B, /* 0xE0 */
+         0, 0x304C, 	 0, 0x304D, 	 0, 0x304E, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x304F, 0x3050, 0x3051	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_4F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x3052,      0, 0x3053, 0x3054,      0,      0,      0,      0, /* 0x00 */
-    0x3055,      0,      0, 0x3056, 0x3057,      0,      0,      0, /* 0x00 */
-         0,      0, 0x3058,      0,      0, 0x3059, 0x305A, 0x305B, /* 0x10 */
-         0, 0x305C,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x305D,      0, /* 0x20 */
-         0, 0x305E,      0, 0x3060,      0, 0x3061,      0, 0x3062, /* 0x30 */
-         0, 0x3063,      0, 0x3064,      0,      0, 0x3065,      0, /* 0x30 */
-    0x3066,      0, 0x3067,      0,      0,      0,      0,      0, /* 0x40 */
-    0x3068, 0x3069,      0, 0x306A, 0x306B,      0,      0,      0, /* 0x40 */
-         0,      0, 0x306C,      0, 0x306D,      0, 0x306E,      0, /* 0x50 */
-    0x306F,      0,      0,      0,      0,      0,      0, 0x3070, /* 0x50 */
-    0x305F,      0,      0, 0x3071,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0x3072,      0, 0x3073,      0, 0x3074,      0, /* 0x60 */
-         0, 0x3075,      0,      0,      0,      0,      0, 0x3076, /* 0x70 */
-    0x3077, 0x3078, 0x3079,      0,      0, 0x307A, 0x307B,      0, /* 0x70 */
-         0, 0x307C, 0x307D,      0, 0x307E, 0x3121,      0,      0, /* 0x80 */
-         0, 0x3122, 0x3123,      0, 0x3124,      0, 0x3125,      0, /* 0x80 */
-    0x3126,      0, 0x3127, 0x3128, 0x3129,      0,      0, 0x312A, /* 0x90 */
-         0, 0x312B, 0x312C,      0,      0,      0, 0x312D, 0x312E, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x312F,      0,      0,      0,      0, 0x3130, /* 0xB0 */
-         0, 0x3131,      0, 0x3132, 0x3133, 0x3134, 0x3135,      0, /* 0xB0 */
-    0x3136, 0x3137,      0,      0,      0, 0x3138, 0x3139,      0, /* 0xC0 */
-    0x313A, 0x313B,      0, 0x313C, 0x313D, 0x313E,      0, 0x313F, /* 0xC0 */
-         0,      0, 0x3140,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x3141,      0,      0,      0, /* 0xD0 */
-    0x3142,      0, 0x3143,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x3144,      0, 0x3145,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0, 0x3146, 0x3147,      0, 0x3148  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x3052, 	 0, 0x3053, 0x3054, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0x3055, 	 0, 	 0, 0x3056, 0x3057, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x3058, 	 0, 	 0, 0x3059, 0x305A, 0x305B, /* 0x10 */
+         0, 0x305C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x305D, 	 0, /* 0x20 */
+         0, 0x305E, 	 0, 0x3060, 	 0, 0x3061, 	 0, 0x3062, /* 0x30 */
+         0, 0x3063, 	 0, 0x3064, 	 0, 	 0, 0x3065, 	 0, /* 0x30 */
+    0x3066, 	 0, 0x3067, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0x3068, 0x3069, 	 0, 0x306A, 0x306B, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x306C, 	 0, 0x306D, 	 0, 0x306E, 	 0, /* 0x50 */
+    0x306F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3070, /* 0x50 */
+    0x305F, 	 0, 	 0, 0x3071, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x3072, 	 0, 0x3073, 	 0, 0x3074, 	 0, /* 0x60 */
+         0, 0x3075, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3076, /* 0x70 */
+    0x3077, 0x3078, 0x3079, 	 0, 	 0, 0x307A, 0x307B, 	 0, /* 0x70 */
+         0, 0x307C, 0x307D, 	 0, 0x307E, 0x3121, 	 0, 	 0, /* 0x80 */
+         0, 0x3122, 0x3123, 	 0, 0x3124, 	 0, 0x3125, 	 0, /* 0x80 */
+    0x3126, 	 0, 0x3127, 0x3128, 0x3129, 	 0, 	 0, 0x312A, /* 0x90 */
+         0, 0x312B, 0x312C, 	 0, 	 0, 	 0, 0x312D, 0x312E, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x312F, 	 0, 	 0, 	 0, 	 0, 0x3130, /* 0xB0 */
+         0, 0x3131, 	 0, 0x3132, 0x3133, 0x3134, 0x3135, 	 0, /* 0xB0 */
+    0x3136, 0x3137, 	 0, 	 0, 	 0, 0x3138, 0x3139, 	 0, /* 0xC0 */
+    0x313A, 0x313B, 	 0, 0x313C, 0x313D, 0x313E, 	 0, 0x313F, /* 0xC0 */
+         0, 	 0, 0x3140, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x3141, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x3142, 	 0, 0x3143, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x3144, 	 0, 0x3145, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0x3146, 0x3147, 	 0, 0x3148	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_50[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x3149, 0x314A,      0,      0, 0x314B,      0,      0, 0x314C, /* 0x00 */
-         0,      0, 0x314D,      0, 0x314E,      0, 0x314F,      0, /* 0x00 */
-    0x3150,      0,      0, 0x3151,      0,      0,      0, 0x3152, /* 0x10 */
-    0x3153,      0,      0, 0x3154, 0x3155, 0x3156, 0x3157,      0, /* 0x10 */
-         0,      0, 0x3158,      0,      0,      0,      0, 0x3159, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x315A,      0, /* 0x20 */
-    0x315B,      0, 0x315C, 0x315D,      0, 0x315E,      0,      0, /* 0x30 */
-         0,      0,      0, 0x3176,      0,      0,      0,      0, /* 0x30 */
-    0x315F, 0x3160, 0x3161,      0,      0, 0x3162, 0x3163,      0, /* 0x40 */
-         0,      0, 0x3164,      0, 0x3165,      0, 0x3166,      0, /* 0x40 */
-         0, 0x3167, 0x3168, 0x3169,      0,      0,      0, 0x316A, /* 0x50 */
-         0, 0x316B,      0,      0,      0,      0,      0, 0x316C, /* 0x50 */
-    0x316D,      0, 0x316E, 0x316F,      0,      0, 0x3170, 0x3171, /* 0x60 */
-         0,      0, 0x3172,      0,      0, 0x3173,      0,      0, /* 0x60 */
-    0x3174, 0x3175,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x3177,      0, 0x3178, 0x3179,      0, 0x317A,      0, /* 0x80 */
-         0,      0, 0x317B,      0,      0,      0, 0x317C, 0x317D, /* 0x80 */
-    0x317E,      0, 0x3221, 0x3222, 0x3223,      0, 0x3224,      0, /* 0x90 */
-         0,      0,      0, 0x3225, 0x3226,      0, 0x3227, 0x3228, /* 0x90 */
-    0x3229, 0x322A, 0x322B,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x322C,      0,      0,      0,      0, 0x322D, /* 0xA0 */
-    0x322E,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x322F, 0x3230,      0,      0, 0x3231,      0,      0, /* 0xB0 */
-    0x3232,      0,      0, 0x3233, 0x3234,      0,      0, 0x3235, /* 0xC0 */
-         0,      0,      0,      0, 0x3236,      0, 0x3237,      0, /* 0xC0 */
-    0x3238,      0,      0, 0x3239, 0x323A,      0,      0,      0, /* 0xD0 */
-    0x323B,      0,      0,      0, 0x323C, 0x323D,      0, 0x323E, /* 0xD0 */
-         0,      0, 0x323F,      0, 0x3240,      0, 0x3241,      0, /* 0xE0 */
-    0x3242, 0x3243,      0,      0,      0,      0,      0, 0x3244, /* 0xE0 */
-         0, 0x3245, 0x3251,      0,      0,      0, 0x3246,      0, /* 0xF0 */
-         0,      0, 0x3247,      0,      0,      0, 0x3248          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x3149, 0x314A, 	 0, 	 0, 0x314B, 	 0, 	 0, 0x314C, /* 0x00 */
+         0, 	 0, 0x314D, 	 0, 0x314E, 	 0, 0x314F, 	 0, /* 0x00 */
+    0x3150, 	 0, 	 0, 0x3151, 	 0, 	 0, 	 0, 0x3152, /* 0x10 */
+    0x3153, 	 0, 	 0, 0x3154, 0x3155, 0x3156, 0x3157, 	 0, /* 0x10 */
+         0, 	 0, 0x3158, 	 0, 	 0, 	 0, 	 0, 0x3159, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x315A, 	 0, /* 0x20 */
+    0x315B, 	 0, 0x315C, 0x315D, 	 0, 0x315E, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x3176, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x315F, 0x3160, 0x3161, 	 0, 	 0, 0x3162, 0x3163, 	 0, /* 0x40 */
+         0, 	 0, 0x3164, 	 0, 0x3165, 	 0, 0x3166, 	 0, /* 0x40 */
+         0, 0x3167, 0x3168, 0x3169, 	 0, 	 0, 	 0, 0x316A, /* 0x50 */
+         0, 0x316B, 	 0, 	 0, 	 0, 	 0, 	 0, 0x316C, /* 0x50 */
+    0x316D, 	 0, 0x316E, 0x316F, 	 0, 	 0, 0x3170, 0x3171, /* 0x60 */
+         0, 	 0, 0x3172, 	 0, 	 0, 0x3173, 	 0, 	 0, /* 0x60 */
+    0x3174, 0x3175, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x3177, 	 0, 0x3178, 0x3179, 	 0, 0x317A, 	 0, /* 0x80 */
+         0, 	 0, 0x317B, 	 0, 	 0, 	 0, 0x317C, 0x317D, /* 0x80 */
+    0x317E, 	 0, 0x3221, 0x3222, 0x3223, 	 0, 0x3224, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x3225, 0x3226, 	 0, 0x3227, 0x3228, /* 0x90 */
+    0x3229, 0x322A, 0x322B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x322C, 	 0, 	 0, 	 0, 	 0, 0x322D, /* 0xA0 */
+    0x322E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x322F, 0x3230, 	 0, 	 0, 0x3231, 	 0, 	 0, /* 0xB0 */
+    0x3232, 	 0, 	 0, 0x3233, 0x3234, 	 0, 	 0, 0x3235, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x3236, 	 0, 0x3237, 	 0, /* 0xC0 */
+    0x3238, 	 0, 	 0, 0x3239, 0x323A, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x323B, 	 0, 	 0, 	 0, 0x323C, 0x323D, 	 0, 0x323E, /* 0xD0 */
+         0, 	 0, 0x323F, 	 0, 0x3240, 	 0, 0x3241, 	 0, /* 0xE0 */
+    0x3242, 0x3243, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3244, /* 0xE0 */
+         0, 0x3245, 0x3251, 	 0, 	 0, 	 0, 0x3246, 	 0, /* 0xF0 */
+         0, 	 0, 0x3247, 	 0, 	 0, 	 0, 0x3248			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_51[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0x3249,      0,      0, 0x324A, 0x324B, /* 0x00 */
-    0x324C,      0,      0, 0x324D, 0x324E, 0x324F, 0x3250,      0, /* 0x00 */
-    0x3252,      0,      0,      0,      0,      0,      0, 0x3253, /* 0x10 */
-         0, 0x3254,      0, 0x3255, 0x3256, 0x3257, 0x3258,      0, /* 0x10 */
-         0,      0,      0, 0x3259,      0,      0,      0, 0x325A, /* 0x20 */
-    0x325B,      0,      0,      0, 0x325C, 0x325D,      0, 0x325E, /* 0x20 */
-         0, 0x325F,      0, 0x3260, 0x3261, 0x3262,      0,      0, /* 0x30 */
-    0x3263, 0x3264,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0x3265,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x3266,      0,      0,      0,      0, 0x3267, /* 0x40 */
-         0,      0,      0, 0x3268,      0, 0x3269,      0, 0x326A, /* 0x50 */
-    0x326B,      0,      0,      0,      0,      0,      0, 0x326C, /* 0x50 */
-         0,      0,      0,      0, 0x326D,      0, 0x326E,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x326F,      0, /* 0x70 */
-         0,      0,      0, 0x3270, 0x3271,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x3272,      0,      0, 0x3273,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x3274,      0,      0,      0,      0, 0x3275,      0,      0, /* 0x90 */
-         0, 0x3276,      0, 0x3277,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0x3278,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x3279,      0, 0x327A,      0, 0x327B,      0, 0x327C, 0x327D, /* 0xB0 */
-         0,      0, 0x327E,      0,      0,      0,      0,      0, /* 0xC0 */
-    0x3321,      0,      0,      0,      0,      0,      0, 0x3322, /* 0xC0 */
-         0, 0x3323, 0x3324, 0x3325,      0, 0x3326,      0,      0, /* 0xD0 */
-    0x3327,      0,      0,      0,      0,      0, 0x3328,      0, /* 0xD0 */
-         0,      0, 0x3329,      0,      0, 0x332A,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0x332B,      0, /* 0xE0 */
-         0,      0, 0x332C, 0x332D, 0x332E,      0,      0, 0x332F  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0x3249, 	 0, 	 0, 0x324A, 0x324B, /* 0x00 */
+    0x324C, 	 0, 	 0, 0x324D, 0x324E, 0x324F, 0x3250, 	 0, /* 0x00 */
+    0x3252, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3253, /* 0x10 */
+         0, 0x3254, 	 0, 0x3255, 0x3256, 0x3257, 0x3258, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x3259, 	 0, 	 0, 	 0, 0x325A, /* 0x20 */
+    0x325B, 	 0, 	 0, 	 0, 0x325C, 0x325D, 	 0, 0x325E, /* 0x20 */
+         0, 0x325F, 	 0, 0x3260, 0x3261, 0x3262, 	 0, 	 0, /* 0x30 */
+    0x3263, 0x3264, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x3265, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x3266, 	 0, 	 0, 	 0, 	 0, 0x3267, /* 0x40 */
+         0, 	 0, 	 0, 0x3268, 	 0, 0x3269, 	 0, 0x326A, /* 0x50 */
+    0x326B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x326C, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x326D, 	 0, 0x326E, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x326F, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x3270, 0x3271, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x3272, 	 0, 	 0, 0x3273, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x3274, 	 0, 	 0, 	 0, 	 0, 0x3275, 	 0, 	 0, /* 0x90 */
+         0, 0x3276, 	 0, 0x3277, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3278, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x3279, 	 0, 0x327A, 	 0, 0x327B, 	 0, 0x327C, 0x327D, /* 0xB0 */
+         0, 	 0, 0x327E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x3321, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3322, /* 0xC0 */
+         0, 0x3323, 0x3324, 0x3325, 	 0, 0x3326, 	 0, 	 0, /* 0xD0 */
+    0x3327, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3328, 	 0, /* 0xD0 */
+         0, 	 0, 0x3329, 	 0, 	 0, 0x332A, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x332B, 	 0, /* 0xE0 */
+         0, 	 0, 0x332C, 0x332D, 0x332E, 	 0, 	 0, 0x332F	/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -316,39 +316,39 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0212_51[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_52[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3330, 0x3331,      0,      0, 0x3332,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0x3333, 0x3334,      0, 0x3335, 0x3336,      0, /* 0x10 */
-    0x3337,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x3338,      0,      0,      0,      0,      0, /* 0x20 */
-    0x3339,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0x333A, 0x333B,      0,      0, 0x333C,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0x333D,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0x333E,      0,      0, /* 0x40 */
-         0, 0x333F,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0x3340,      0, 0x3341, /* 0x50 */
-    0x3342,      0, 0x3343,      0, 0x3344,      0,      0, 0x3345, /* 0x50 */
-    0x3346, 0x3347,      0,      0,      0,      0, 0x3348,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0x3349,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0x334A, /* 0x70 */
-    0x334B, 0x334C,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0x334D,      0, 0x334E,      0,      0, 0x334F,      0,      0, /* 0x80 */
-         0,      0, 0x3350,      0, 0x3351,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x3352,      0, 0x3353, 0x3354, 0x3355, /* 0x90 */
-    0x3356,      0, 0x3357,      0, 0x3358,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0x3359, 0x335A, 0x335B, 0x335C, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0x335D, /* 0xA0 */
-    0x335E,      0,      0,      0,      0,      0, 0x335F, 0x3360, /* 0xB0 */
-    0x3361,      0, 0x3362, 0x3363,      0, 0x3364,      0,      0, /* 0xB0 */
-    0x3365,      0,      0,      0, 0x3366,      0, 0x3367,      0, /* 0xC0 */
-    0x3368,      0,      0,      0, 0x3369,      0,      0, 0x336A, /* 0xC0 */
-         0, 0x336B,      0,      0, 0x336C,      0, 0x336D,      0, /* 0xD0 */
-         0,      0,      0, 0x336E, 0x336F,      0,      0,      0, /* 0xD0 */
-         0, 0x3370,      0,      0,      0, 0x3371,      0,      0, /* 0xE0 */
-    0x3372, 0x3373, 0x3374,      0, 0x3375,      0,      0,      0, /* 0xE0 */
-    0x3376, 0x3377,      0,      0, 0x3378,      0, 0x3379, 0x337A  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3330, 0x3331, 	 0, 	 0, 0x3332, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x3333, 0x3334, 	 0, 0x3335, 0x3336, 	 0, /* 0x10 */
+    0x3337, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x3338, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x3339, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x333A, 0x333B, 	 0, 	 0, 0x333C, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x333D, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x333E, 	 0, 	 0, /* 0x40 */
+         0, 0x333F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3340, 	 0, 0x3341, /* 0x50 */
+    0x3342, 	 0, 0x3343, 	 0, 0x3344, 	 0, 	 0, 0x3345, /* 0x50 */
+    0x3346, 0x3347, 	 0, 	 0, 	 0, 	 0, 0x3348, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3349, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x334A, /* 0x70 */
+    0x334B, 0x334C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x334D, 	 0, 0x334E, 	 0, 	 0, 0x334F, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x3350, 	 0, 0x3351, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x3352, 	 0, 0x3353, 0x3354, 0x3355, /* 0x90 */
+    0x3356, 	 0, 0x3357, 	 0, 0x3358, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x3359, 0x335A, 0x335B, 0x335C, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x335D, /* 0xA0 */
+    0x335E, 	 0, 	 0, 	 0, 	 0, 	 0, 0x335F, 0x3360, /* 0xB0 */
+    0x3361, 	 0, 0x3362, 0x3363, 	 0, 0x3364, 	 0, 	 0, /* 0xB0 */
+    0x3365, 	 0, 	 0, 	 0, 0x3366, 	 0, 0x3367, 	 0, /* 0xC0 */
+    0x3368, 	 0, 	 0, 	 0, 0x3369, 	 0, 	 0, 0x336A, /* 0xC0 */
+         0, 0x336B, 	 0, 	 0, 0x336C, 	 0, 0x336D, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x336E, 0x336F, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x3370, 	 0, 	 0, 	 0, 0x3371, 	 0, 	 0, /* 0xE0 */
+    0x3372, 0x3373, 0x3374, 	 0, 0x3375, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x3376, 0x3377, 	 0, 	 0, 0x3378, 	 0, 0x3379, 0x337A	/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -356,39 +356,39 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0212_52[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_53[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x337B,      0,      0, 0x337C,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0x337D, 0x337E, 0x3421,      0,      0,      0, /* 0x00 */
-         0, 0x3422,      0, 0x3423,      0,      0,      0,      0, /* 0x10 */
-    0x3424,      0,      0, 0x3425, 0x3426,      0, 0x3427, 0x3428, /* 0x10 */
-         0,      0,      0,      0,      0, 0x3429,      0, 0x342A, /* 0x20 */
-    0x342B, 0x342C,      0, 0x342D, 0x342E, 0x342F,      0,      0, /* 0x20 */
-    0x3430,      0, 0x3431,      0,      0, 0x3432,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0x3433, 0x3434, 0x3435,      0, /* 0x30 */
-         0,      0, 0x3436,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0x3438, 0x3437,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0x3439,      0, 0x343A,      0,      0,      0,      0, /* 0x50 */
-         0, 0x343B,      0, 0x343C,      0, 0x343D,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0x343E, 0x343F,      0,      0, /* 0x60 */
-         0,      0, 0x3440,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x3441,      0,      0,      0,      0, 0x3442,      0, /* 0x70 */
-         0,      0,      0, 0x3443,      0,      0,      0, 0x3444, /* 0x80 */
-    0x3445,      0,      0,      0,      0,      0, 0x3446,      0, /* 0x80 */
-         0,      0,      0, 0x3447, 0x3448,      0,      0,      0, /* 0x90 */
-         0, 0x3449,      0,      0,      0, 0x344A,      0,      0, /* 0x90 */
-         0, 0x344B,      0,      0, 0x344C,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x344D, 0x344E,      0,      0,      0, 0x344F, /* 0xA0 */
-         0,      0, 0x3450,      0, 0x3451, 0x3452,      0, 0x3453, /* 0xB0 */
-    0x3454,      0, 0x3455,      0,      0, 0x3456,      0,      0, /* 0xB0 */
-    0x3457,      0,      0,      0,      0, 0x3458,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0x3459, /* 0xC0 */
-         0,      0, 0x345A, 0x345B,      0, 0x345C,      0,      0, /* 0xD0 */
-         0,      0, 0x345D,      0,      0, 0x345E, 0x345F,      0, /* 0xD0 */
-    0x3460,      0,      0,      0,      0,      0, 0x3461, 0x3462, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0x3463                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x337B, 	 0, 	 0, 0x337C, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x337D, 0x337E, 0x3421, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x3422, 	 0, 0x3423, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x3424, 	 0, 	 0, 0x3425, 0x3426, 	 0, 0x3427, 0x3428, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3429, 	 0, 0x342A, /* 0x20 */
+    0x342B, 0x342C, 	 0, 0x342D, 0x342E, 0x342F, 	 0, 	 0, /* 0x20 */
+    0x3430, 	 0, 0x3431, 	 0, 	 0, 0x3432, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x3433, 0x3434, 0x3435, 	 0, /* 0x30 */
+         0, 	 0, 0x3436, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x3438, 0x3437, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x3439, 	 0, 0x343A, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x343B, 	 0, 0x343C, 	 0, 0x343D, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x343E, 0x343F, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x3440, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x3441, 	 0, 	 0, 	 0, 	 0, 0x3442, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x3443, 	 0, 	 0, 	 0, 0x3444, /* 0x80 */
+    0x3445, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3446, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x3447, 0x3448, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x3449, 	 0, 	 0, 	 0, 0x344A, 	 0, 	 0, /* 0x90 */
+         0, 0x344B, 	 0, 	 0, 0x344C, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x344D, 0x344E, 	 0, 	 0, 	 0, 0x344F, /* 0xA0 */
+         0, 	 0, 0x3450, 	 0, 0x3451, 0x3452, 	 0, 0x3453, /* 0xB0 */
+    0x3454, 	 0, 0x3455, 	 0, 	 0, 0x3456, 	 0, 	 0, /* 0xB0 */
+    0x3457, 	 0, 	 0, 	 0, 	 0, 0x3458, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3459, /* 0xC0 */
+         0, 	 0, 0x345A, 0x345B, 	 0, 0x345C, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x345D, 	 0, 	 0, 0x345E, 0x345F, 	 0, /* 0xD0 */
+    0x3460, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3461, 0x3462, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3463					/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -396,119 +396,119 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0212_53[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_54[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x3464,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0x3465,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x3466,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0x3467,      0,      0,      0,      0,      0, 0x3468, /* 0x20 */
-    0x3469,      0, 0x346A,      0,      0,      0,      0, 0x346B, /* 0x20 */
-         0, 0x346C,      0,      0, 0x346D, 0x346E,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x346F, 0x3470,      0,      0, 0x3471, /* 0x40 */
-         0,      0,      0,      0,      0, 0x3472,      0, 0x3473, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0x3474,      0, /* 0x50 */
-         0,      0, 0x3475,      0, 0x3476,      0, 0x3477, 0x3478, /* 0x60 */
-         0, 0x3479,      0, 0x347A,      0, 0x347B, 0x347C,      0, /* 0x60 */
-         0,      0,      0,      0, 0x347D,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0x347E, /* 0x70 */
-         0, 0x3521,      0, 0x3522,      0, 0x3523,      0,      0, /* 0x80 */
-    0x3524, 0x3525,      0,      0,      0, 0x3526,      0,      0, /* 0x80 */
-         0, 0x3527,      0,      0,      0, 0x3528, 0x3529,      0, /* 0x90 */
-         0,      0,      0,      0, 0x352A,      0,      0, 0x352B, /* 0x90 */
-         0, 0x352C,      0,      0,      0,      0, 0x352D, 0x352E, /* 0xA0 */
-         0, 0x352F, 0x3530,      0,      0, 0x3531, 0x3532,      0, /* 0xA0 */
-         0, 0x3533,      0,      0,      0,      0,      0, 0x3534, /* 0xB0 */
-         0, 0x3535, 0x3536, 0x3537,      0,      0,      0, 0x3538, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x3539,      0, /* 0xC0 */
-         0,      0, 0x353A,      0,      0, 0x353B, 0x353C,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x353D,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0x353E,      0, 0x353F,      0,      0, 0x3540, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0x3541,      0, /* 0xF0 */
-         0,      0,      0,      0, 0x3542,      0, 0x3543, 0x3544  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x3464, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x3465, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x3466, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x3467, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3468, /* 0x20 */
+    0x3469, 	 0, 0x346A, 	 0, 	 0, 	 0, 	 0, 0x346B, /* 0x20 */
+         0, 0x346C, 	 0, 	 0, 0x346D, 0x346E, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x346F, 0x3470, 	 0, 	 0, 0x3471, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3472, 	 0, 0x3473, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3474, 	 0, /* 0x50 */
+         0, 	 0, 0x3475, 	 0, 0x3476, 	 0, 0x3477, 0x3478, /* 0x60 */
+         0, 0x3479, 	 0, 0x347A, 	 0, 0x347B, 0x347C, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x347D, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x347E, /* 0x70 */
+         0, 0x3521, 	 0, 0x3522, 	 0, 0x3523, 	 0, 	 0, /* 0x80 */
+    0x3524, 0x3525, 	 0, 	 0, 	 0, 0x3526, 	 0, 	 0, /* 0x80 */
+         0, 0x3527, 	 0, 	 0, 	 0, 0x3528, 0x3529, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x352A, 	 0, 	 0, 0x352B, /* 0x90 */
+         0, 0x352C, 	 0, 	 0, 	 0, 	 0, 0x352D, 0x352E, /* 0xA0 */
+         0, 0x352F, 0x3530, 	 0, 	 0, 0x3531, 0x3532, 	 0, /* 0xA0 */
+         0, 0x3533, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3534, /* 0xB0 */
+         0, 0x3535, 0x3536, 0x3537, 	 0, 	 0, 	 0, 0x3538, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3539, 	 0, /* 0xC0 */
+         0, 	 0, 0x353A, 	 0, 	 0, 0x353B, 0x353C, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x353D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x353E, 	 0, 0x353F, 	 0, 	 0, 0x3540, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3541, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0x3542, 	 0, 0x3543, 0x3544	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_55[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x3545, 0x3546,      0,      0,      0, 0x3547,      0,      0, /* 0x00 */
-    0x3548, 0x3549,      0,      0, 0x354A, 0x354B, 0x354C,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0x354D,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x354E, 0x354F,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x3550,      0,      0, 0x3551, 0x3552,      0, /* 0x30 */
-         0,      0,      0, 0x3553, 0x3554, 0x3555,      0,      0, /* 0x30 */
-         0, 0x3556,      0,      0,      0,      0,      0, 0x3557, /* 0x40 */
-         0, 0x3558, 0x3559,      0,      0, 0x355A,      0,      0, /* 0x40 */
-    0x355B, 0x355C,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0x355D,      0, 0x355E, 0x355F,      0,      0, 0x3560,      0, /* 0x50 */
-    0x3561, 0x3562,      0,      0, 0x3563,      0, 0x3564,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0x3565, /* 0x70 */
-         0, 0x3566, 0x3567,      0,      0,      0, 0x3568,      0, /* 0x80 */
-    0x3569,      0,      0,      0,      0,      0, 0x356A, 0x356B, /* 0x80 */
-         0, 0x356C, 0x356D, 0x356E, 0x356F,      0,      0, 0x3570, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0x3571, 0x3572,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0x3573,      0,      0, /* 0xA0 */
-         0,      0, 0x3574,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0x3575, /* 0xB0 */
-         0, 0x3576,      0, 0x3577,      0,      0, 0x3578,      0, /* 0xC0 */
-         0, 0x3579,      0, 0x357A, 0x357B,      0, 0x357C,      0, /* 0xC0 */
-         0, 0x357D, 0x357E, 0x3621,      0,      0,      0, 0x3622, /* 0xD0 */
-    0x3623,      0,      0, 0x3624,      0,      0, 0x3625,      0, /* 0xD0 */
-         0,      0, 0x3626,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0x3627,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0x3628,      0, /* 0xF0 */
-         0,      0,      0,      0,      0,      0,      0, 0x3629  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x3545, 0x3546, 	 0, 	 0, 	 0, 0x3547, 	 0, 	 0, /* 0x00 */
+    0x3548, 0x3549, 	 0, 	 0, 0x354A, 0x354B, 0x354C, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x354D, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x354E, 0x354F, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x3550, 	 0, 	 0, 0x3551, 0x3552, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x3553, 0x3554, 0x3555, 	 0, 	 0, /* 0x30 */
+         0, 0x3556, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3557, /* 0x40 */
+         0, 0x3558, 0x3559, 	 0, 	 0, 0x355A, 	 0, 	 0, /* 0x40 */
+    0x355B, 0x355C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x355D, 	 0, 0x355E, 0x355F, 	 0, 	 0, 0x3560, 	 0, /* 0x50 */
+    0x3561, 0x3562, 	 0, 	 0, 0x3563, 	 0, 0x3564, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3565, /* 0x70 */
+         0, 0x3566, 0x3567, 	 0, 	 0, 	 0, 0x3568, 	 0, /* 0x80 */
+    0x3569, 	 0, 	 0, 	 0, 	 0, 	 0, 0x356A, 0x356B, /* 0x80 */
+         0, 0x356C, 0x356D, 0x356E, 0x356F, 	 0, 	 0, 0x3570, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x3571, 0x3572, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3573, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x3574, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3575, /* 0xB0 */
+         0, 0x3576, 	 0, 0x3577, 	 0, 	 0, 0x3578, 	 0, /* 0xC0 */
+         0, 0x3579, 	 0, 0x357A, 0x357B, 	 0, 0x357C, 	 0, /* 0xC0 */
+         0, 0x357D, 0x357E, 0x3621, 	 0, 	 0, 	 0, 0x3622, /* 0xD0 */
+    0x3623, 	 0, 	 0, 0x3624, 	 0, 	 0, 0x3625, 	 0, /* 0xD0 */
+         0, 	 0, 0x3626, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x3627, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3628, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3629	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_56[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0x362A,      0,      0, /* 0x00 */
-    0x362B,      0, 0x362C,      0,      0, 0x362D, 0x362E, 0x362F, /* 0x00 */
-    0x3630, 0x3631, 0x3632,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0x3633,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0x3634,      0,      0,      0, /* 0x20 */
-    0x3635,      0,      0, 0x3636,      0, 0x3637,      0, 0x3638, /* 0x30 */
-         0, 0x3639,      0, 0x363A, 0x363B, 0x363C,      0, 0x363D, /* 0x30 */
-    0x363E, 0x363F,      0, 0x3640, 0x3641,      0, 0x3642,      0, /* 0x40 */
-         0, 0x3643,      0, 0x3644,      0, 0x3645,      0, 0x3646, /* 0x40 */
-         0,      0,      0,      0, 0x3647,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0x3648,      0, /* 0x50 */
-    0x3649, 0x364A, 0x364B, 0x364C,      0,      0, 0x364D,      0, /* 0x60 */
-         0, 0x364E,      0,      0,      0, 0x364F,      0, 0x3650, /* 0x60 */
-         0, 0x3651, 0x3652,      0,      0, 0x3653,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0x3654, 0x3655,      0,      0, /* 0x80 */
-    0x3656,      0,      0, 0x3657, 0x3658,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x3659,      0,      0, /* 0x90 */
-         0, 0x365A, 0x365B,      0,      0, 0x365C, 0x365D, 0x365E, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0x365F, 0x3660, /* 0xA0 */
-    0x3661, 0x3662,      0, 0x3663, 0x3664, 0x3665,      0,      0, /* 0xA0 */
-         0, 0x3666,      0, 0x3667,      0,      0,      0, 0x3668, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x3669,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x366A,      0,      0, /* 0xC0 */
-         0, 0x366B, 0x366C, 0x366D, 0x3670, 0x3671,      0, 0x366E, /* 0xC0 */
-    0x366F,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x3672,      0,      0, 0x3673, 0x3674,      0, 0x3675, /* 0xD0 */
-         0, 0x3676,      0,      0, 0x3677, 0x3678, 0x3679, 0x367A, /* 0xE0 */
-    0x367B,      0,      0, 0x367D,      0, 0x367E,      0,      0, /* 0xE0 */
-         0, 0x367C,      0,      0,      0,      0, 0x3721, 0x3722  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0x362A, 	 0, 	 0, /* 0x00 */
+    0x362B, 	 0, 0x362C, 	 0, 	 0, 0x362D, 0x362E, 0x362F, /* 0x00 */
+    0x3630, 0x3631, 0x3632, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x3633, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x3634, 	 0, 	 0, 	 0, /* 0x20 */
+    0x3635, 	 0, 	 0, 0x3636, 	 0, 0x3637, 	 0, 0x3638, /* 0x30 */
+         0, 0x3639, 	 0, 0x363A, 0x363B, 0x363C, 	 0, 0x363D, /* 0x30 */
+    0x363E, 0x363F, 	 0, 0x3640, 0x3641, 	 0, 0x3642, 	 0, /* 0x40 */
+         0, 0x3643, 	 0, 0x3644, 	 0, 0x3645, 	 0, 0x3646, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x3647, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3648, 	 0, /* 0x50 */
+    0x3649, 0x364A, 0x364B, 0x364C, 	 0, 	 0, 0x364D, 	 0, /* 0x60 */
+         0, 0x364E, 	 0, 	 0, 	 0, 0x364F, 	 0, 0x3650, /* 0x60 */
+         0, 0x3651, 0x3652, 	 0, 	 0, 0x3653, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0x3654, 0x3655, 	 0, 	 0, /* 0x80 */
+    0x3656, 	 0, 	 0, 0x3657, 0x3658, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3659, 	 0, 	 0, /* 0x90 */
+         0, 0x365A, 0x365B, 	 0, 	 0, 0x365C, 0x365D, 0x365E, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x365F, 0x3660, /* 0xA0 */
+    0x3661, 0x3662, 	 0, 0x3663, 0x3664, 0x3665, 	 0, 	 0, /* 0xA0 */
+         0, 0x3666, 	 0, 0x3667, 	 0, 	 0, 	 0, 0x3668, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3669, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x366A, 	 0, 	 0, /* 0xC0 */
+         0, 0x366B, 0x366C, 0x366D, 0x3670, 0x3671, 	 0, 0x366E, /* 0xC0 */
+    0x366F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x3672, 	 0, 	 0, 0x3673, 0x3674, 	 0, 0x3675, /* 0xD0 */
+         0, 0x3676, 	 0, 	 0, 0x3677, 0x3678, 0x3679, 0x367A, /* 0xE0 */
+    0x367B, 	 0, 	 0, 0x367D, 	 0, 0x367E, 	 0, 	 0, /* 0xE0 */
+         0, 0x367C, 	 0, 	 0, 	 0, 	 0, 0x3721, 0x3722	/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -516,79 +516,79 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0212_56[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_57[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3723, 0x3724,      0,      0,      0,      0, 0x3725, /* 0x00 */
-         0,      0, 0x3726,      0, 0x3727,      0,      0,      0, /* 0x00 */
-         0, 0x3728,      0,      0,      0, 0x3729,      0,      0, /* 0x10 */
-         0,      0, 0x372A, 0x372B,      0, 0x372C,      0,      0, /* 0x10 */
-    0x372D,      0, 0x372E, 0x372F, 0x3730, 0x3731,      0,      0, /* 0x20 */
-         0, 0x3732, 0x3733,      0, 0x3734,      0, 0x3735, 0x3736, /* 0x20 */
-         0,      0,      0, 0x3737, 0x3738,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0x3739, 0x373A, 0x373B, /* 0x30 */
-         0,      0,      0,      0,      0, 0x373C, 0x373D,      0, /* 0x40 */
-         0,      0,      0,      0, 0x373E, 0x373F,      0,      0, /* 0x40 */
-         0,      0, 0x3740,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0x3741,      0,      0, 0x3742,      0, 0x3743, /* 0x60 */
-    0x3744,      0,      0, 0x3745,      0, 0x3746, 0x3747, 0x3748, /* 0x60 */
-    0x3749, 0x374A,      0, 0x374B, 0x374C, 0x374D,      0, 0x374E, /* 0x70 */
-         0, 0x374F, 0x3750, 0x3751, 0x3752,      0, 0x3753,      0, /* 0x70 */
-         0, 0x3754,      0, 0x3755,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0x3756,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0x3757, 0x3760,      0, 0x3758, /* 0x90 */
-         0, 0x3759, 0x375A,      0, 0x375B, 0x375C, 0x375D, 0x375E, /* 0x90 */
-         0, 0x375F,      0,      0,      0,      0,      0, 0x3761, /* 0xA0 */
-    0x3762, 0x3763,      0,      0, 0x3764,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x3765,      0,      0,      0,      0, 0x3766,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0x3767, /* 0xC0 */
-    0x3768,      0,      0,      0, 0x3769,      0,      0, 0x376A, /* 0xC0 */
-         0,      0,      0,      0,      0, 0x376B,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x376C, 0x376D,      0, /* 0xD0 */
-         0, 0x377E,      0,      0, 0x376E,      0, 0x376F, 0x3770, /* 0xE0 */
-         0, 0x3771,      0,      0,      0, 0x3772,      0,      0, /* 0xE0 */
-    0x3773,      0,      0,      0,      0, 0x3774, 0x3775,      0, /* 0xF0 */
-    0x3776,      0,      0,      0,      0, 0x3777, 0x3778, 0x3779  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3723, 0x3724, 	 0, 	 0, 	 0, 	 0, 0x3725, /* 0x00 */
+         0, 	 0, 0x3726, 	 0, 0x3727, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x3728, 	 0, 	 0, 	 0, 0x3729, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x372A, 0x372B, 	 0, 0x372C, 	 0, 	 0, /* 0x10 */
+    0x372D, 	 0, 0x372E, 0x372F, 0x3730, 0x3731, 	 0, 	 0, /* 0x20 */
+         0, 0x3732, 0x3733, 	 0, 0x3734, 	 0, 0x3735, 0x3736, /* 0x20 */
+         0, 	 0, 	 0, 0x3737, 0x3738, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3739, 0x373A, 0x373B, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x373C, 0x373D, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x373E, 0x373F, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x3740, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x3741, 	 0, 	 0, 0x3742, 	 0, 0x3743, /* 0x60 */
+    0x3744, 	 0, 	 0, 0x3745, 	 0, 0x3746, 0x3747, 0x3748, /* 0x60 */
+    0x3749, 0x374A, 	 0, 0x374B, 0x374C, 0x374D, 	 0, 0x374E, /* 0x70 */
+         0, 0x374F, 0x3750, 0x3751, 0x3752, 	 0, 0x3753, 	 0, /* 0x70 */
+         0, 0x3754, 	 0, 0x3755, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x3756, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x3757, 0x3760, 	 0, 0x3758, /* 0x90 */
+         0, 0x3759, 0x375A, 	 0, 0x375B, 0x375C, 0x375D, 0x375E, /* 0x90 */
+         0, 0x375F, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3761, /* 0xA0 */
+    0x3762, 0x3763, 	 0, 	 0, 0x3764, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x3765, 	 0, 	 0, 	 0, 	 0, 0x3766, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3767, /* 0xC0 */
+    0x3768, 	 0, 	 0, 	 0, 0x3769, 	 0, 	 0, 0x376A, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x376B, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x376C, 0x376D, 	 0, /* 0xD0 */
+         0, 0x377E, 	 0, 	 0, 0x376E, 	 0, 0x376F, 0x3770, /* 0xE0 */
+         0, 0x3771, 	 0, 	 0, 	 0, 0x3772, 	 0, 	 0, /* 0xE0 */
+    0x3773, 	 0, 	 0, 	 0, 	 0, 0x3774, 0x3775, 	 0, /* 0xF0 */
+    0x3776, 	 0, 	 0, 	 0, 	 0, 0x3777, 0x3778, 0x3779	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_58[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0x377A, 0x377B,      0,      0,      0, /* 0x00 */
-    0x377C, 0x377D,      0,      0, 0x3821, 0x3822,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0x3823,      0,      0, 0x3824, 0x3825, /* 0x10 */
-    0x3826,      0,      0,      0,      0,      0, 0x3827, 0x3828, /* 0x20 */
-         0,      0,      0,      0,      0, 0x3829,      0,      0, /* 0x20 */
-         0,      0, 0x382A,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0x382B,      0,      0,      0,      0,      0, 0x382C, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0x382D,      0,      0, 0x382E, 0x382F,      0, 0x3830, /* 0x40 */
-    0x3831,      0,      0,      0,      0, 0x3832,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0x3833, /* 0x50 */
-         0, 0x3834,      0,      0, 0x3835,      0,      0, 0x3836, /* 0x60 */
-    0x3837,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0x3838,      0,      0,      0, 0x3839,      0,      0, 0x383A, /* 0x70 */
-    0x383B, 0x383C,      0,      0,      0,      0,      0, 0x383D, /* 0x80 */
-    0x383E, 0x383F, 0x3840,      0, 0x3841, 0x3842,      0, 0x3843, /* 0x80 */
-    0x3844,      0,      0,      0, 0x3845,      0, 0x3846,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0x3847,      0,      0, /* 0x90 */
-    0x3848, 0x3849, 0x384A,      0,      0,      0, 0x384B,      0, /* 0xA0 */
-         0, 0x384C,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0x384D, 0x384E,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x3850,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x3851,      0, 0x384F,      0,      0,      0, /* 0xC0 */
-    0x3852,      0,      0,      0,      0, 0x3853, 0x3854,      0, /* 0xC0 */
-    0x3855,      0, 0x3856,      0, 0x3857,      0, 0x3858,      0, /* 0xD0 */
-         0,      0, 0x3859,      0,      0, 0x385A,      0,      0, /* 0xD0 */
-         0, 0x385B, 0x385C,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0x385D,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x385E                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0x377A, 0x377B, 	 0, 	 0, 	 0, /* 0x00 */
+    0x377C, 0x377D, 	 0, 	 0, 0x3821, 0x3822, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x3823, 	 0, 	 0, 0x3824, 0x3825, /* 0x10 */
+    0x3826, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3827, 0x3828, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3829, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x382A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x382B, 	 0, 	 0, 	 0, 	 0, 	 0, 0x382C, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x382D, 	 0, 	 0, 0x382E, 0x382F, 	 0, 0x3830, /* 0x40 */
+    0x3831, 	 0, 	 0, 	 0, 	 0, 0x3832, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3833, /* 0x50 */
+         0, 0x3834, 	 0, 	 0, 0x3835, 	 0, 	 0, 0x3836, /* 0x60 */
+    0x3837, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x3838, 	 0, 	 0, 	 0, 0x3839, 	 0, 	 0, 0x383A, /* 0x70 */
+    0x383B, 0x383C, 	 0, 	 0, 	 0, 	 0, 	 0, 0x383D, /* 0x80 */
+    0x383E, 0x383F, 0x3840, 	 0, 0x3841, 0x3842, 	 0, 0x3843, /* 0x80 */
+    0x3844, 	 0, 	 0, 	 0, 0x3845, 	 0, 0x3846, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3847, 	 0, 	 0, /* 0x90 */
+    0x3848, 0x3849, 0x384A, 	 0, 	 0, 	 0, 0x384B, 	 0, /* 0xA0 */
+         0, 0x384C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x384D, 0x384E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x3850, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x3851, 	 0, 0x384F, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x3852, 	 0, 	 0, 	 0, 	 0, 0x3853, 0x3854, 	 0, /* 0xC0 */
+    0x3855, 	 0, 0x3856, 	 0, 0x3857, 	 0, 0x3858, 	 0, /* 0xD0 */
+         0, 	 0, 0x3859, 	 0, 	 0, 0x385A, 	 0, 	 0, /* 0xD0 */
+         0, 0x385B, 0x385C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x385D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x385E									/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -596,39 +596,39 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0212_58[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_59[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0x385F, 0x3860,      0, /* 0x00 */
-         0,      0,      0, 0x3861, 0x3862,      0,      0,      0, /* 0x00 */
-         0,      0, 0x3863, 0x3864, 0x3865,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0x3867,      0,      0, /* 0x10 */
-         0, 0x3868,      0, 0x3869, 0x386A,      0,      0,      0, /* 0x20 */
-    0x386B,      0,      0,      0,      0,      0,      0, 0x386C, /* 0x20 */
-    0x386D,      0,      0, 0x386E,      0, 0x386F, 0x3870,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0x3871, /* 0x30 */
-         0,      0,      0, 0x3872,      0,      0, 0x3873,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x3874, 0x3875,      0,      0,      0,      0, /* 0x50 */
-         0, 0x3876,      0, 0x3877,      0, 0x3878, 0x3879, 0x387A, /* 0x50 */
-         0, 0x387B,      0, 0x387C,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0x387D,      0, 0x387E,      0, 0x3921, /* 0x60 */
-         0,      0, 0x3922,      0,      0, 0x3923, 0x3924,      0, /* 0x70 */
-         0, 0x3925,      0, 0x3926, 0x3927,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x3928, 0x3929,      0, 0x392A,      0, /* 0x80 */
-         0,      0, 0x392B,      0,      0, 0x392C,      0, 0x392D, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0x392E, /* 0x90 */
-         0,      0,      0,      0, 0x392F,      0,      0, 0x3930, /* 0xA0 */
-         0,      0,      0,      0,      0, 0x3931, 0x3932, 0x3933, /* 0xA0 */
-    0x3934,      0,      0, 0x3935,      0,      0,      0, 0x3936, /* 0xB0 */
-         0,      0, 0x3937,      0, 0x3938,      0,      0,      0, /* 0xB0 */
-         0, 0x3939,      0, 0x393A, 0x393B,      0,      0,      0, /* 0xC0 */
-    0x393C,      0, 0x393D,      0,      0, 0x393E,      0,      0, /* 0xC0 */
-         0,      0, 0x393F,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x3940, 0x3941, 0x3942, /* 0xD0 */
-         0,      0,      0, 0x3943, 0x3944,      0,      0, 0x3945, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0x3946, 0x3947, /* 0xE0 */
-         0, 0x3948, 0x3949,      0, 0x394A,      0,      0, 0x394B  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0x385F, 0x3860, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x3861, 0x3862, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x3863, 0x3864, 0x3865, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3867, 	 0, 	 0, /* 0x10 */
+         0, 0x3868, 	 0, 0x3869, 0x386A, 	 0, 	 0, 	 0, /* 0x20 */
+    0x386B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x386C, /* 0x20 */
+    0x386D, 	 0, 	 0, 0x386E, 	 0, 0x386F, 0x3870, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3871, /* 0x30 */
+         0, 	 0, 	 0, 0x3872, 	 0, 	 0, 0x3873, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x3874, 0x3875, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x3876, 	 0, 0x3877, 	 0, 0x3878, 0x3879, 0x387A, /* 0x50 */
+         0, 0x387B, 	 0, 0x387C, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x387D, 	 0, 0x387E, 	 0, 0x3921, /* 0x60 */
+         0, 	 0, 0x3922, 	 0, 	 0, 0x3923, 0x3924, 	 0, /* 0x70 */
+         0, 0x3925, 	 0, 0x3926, 0x3927, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x3928, 0x3929, 	 0, 0x392A, 	 0, /* 0x80 */
+         0, 	 0, 0x392B, 	 0, 	 0, 0x392C, 	 0, 0x392D, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x392E, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x392F, 	 0, 	 0, 0x3930, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3931, 0x3932, 0x3933, /* 0xA0 */
+    0x3934, 	 0, 	 0, 0x3935, 	 0, 	 0, 	 0, 0x3936, /* 0xB0 */
+         0, 	 0, 0x3937, 	 0, 0x3938, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x3939, 	 0, 0x393A, 0x393B, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x393C, 	 0, 0x393D, 	 0, 	 0, 0x393E, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x393F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3940, 0x3941, 0x3942, /* 0xD0 */
+         0, 	 0, 	 0, 0x3943, 0x3944, 	 0, 	 0, 0x3945, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3946, 0x3947, /* 0xE0 */
+         0, 0x3948, 0x3949, 	 0, 0x394A, 	 0, 	 0, 0x394B	/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -636,119 +636,119 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0212_59[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_5A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x394C,      0,      0,      0, 0x394D,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0x394E, 0x394F, 0x3950,      0, /* 0x00 */
-         0,      0, 0x3951, 0x3952,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x3953,      0, /* 0x10 */
-         0,      0,      0, 0x3954, 0x3955,      0,      0, 0x3956, /* 0x20 */
-    0x3957,      0, 0x3958,      0,      0, 0x3959,      0,      0, /* 0x20 */
-    0x395A,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0x395B, 0x395C,      0, 0x395D, /* 0x40 */
-    0x395E,      0,      0,      0, 0x395F,      0,      0,      0, /* 0x40 */
-    0x3960,      0,      0,      0,      0, 0x3961,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0x3962,      0, /* 0x50 */
-         0,      0,      0, 0x3963,      0, 0x3964,      0, 0x3965, /* 0x60 */
-         0,      0,      0,      0,      0, 0x3966,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0x3967, /* 0x70 */
-         0,      0, 0x3968, 0x3969,      0,      0, 0x396A,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x396B,      0,      0,      0,      0, /* 0x80 */
-    0x396C,      0,      0, 0x396D,      0,      0, 0x396E,      0, /* 0x90 */
-         0, 0x396F,      0,      0, 0x3970,      0, 0x3971, 0x3972, /* 0x90 */
-    0x3973,      0, 0x3974,      0,      0,      0,      0, 0x3975, /* 0xA0 */
-         0,      0,      0,      0, 0x3976,      0,      0,      0, /* 0xA0 */
-         0, 0x3977, 0x3978, 0x3979,      0, 0x397A,      0,      0, /* 0xB0 */
-    0x397B,      0, 0x397C, 0x397D,      0,      0,      0, 0x397E, /* 0xB0 */
-         0,      0,      0,      0, 0x3A21,      0, 0x3A22,      0, /* 0xC0 */
-    0x3A23,      0,      0,      0,      0,      0,      0, 0x3A24, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x3A25,      0, 0x3A26,      0,      0,      0, /* 0xD0 */
-    0x3A27,      0,      0,      0,      0, 0x3A28,      0,      0, /* 0xE0 */
-         0,      0, 0x3A29,      0,      0,      0, 0x3A2A,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0x3A2B, 0x3A2C,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0x3A2D                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x394C, 	 0, 	 0, 	 0, 0x394D, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x394E, 0x394F, 0x3950, 	 0, /* 0x00 */
+         0, 	 0, 0x3951, 0x3952, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3953, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x3954, 0x3955, 	 0, 	 0, 0x3956, /* 0x20 */
+    0x3957, 	 0, 0x3958, 	 0, 	 0, 0x3959, 	 0, 	 0, /* 0x20 */
+    0x395A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x395B, 0x395C, 	 0, 0x395D, /* 0x40 */
+    0x395E, 	 0, 	 0, 	 0, 0x395F, 	 0, 	 0, 	 0, /* 0x40 */
+    0x3960, 	 0, 	 0, 	 0, 	 0, 0x3961, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3962, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x3963, 	 0, 0x3964, 	 0, 0x3965, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3966, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3967, /* 0x70 */
+         0, 	 0, 0x3968, 0x3969, 	 0, 	 0, 0x396A, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x396B, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x396C, 	 0, 	 0, 0x396D, 	 0, 	 0, 0x396E, 	 0, /* 0x90 */
+         0, 0x396F, 	 0, 	 0, 0x3970, 	 0, 0x3971, 0x3972, /* 0x90 */
+    0x3973, 	 0, 0x3974, 	 0, 	 0, 	 0, 	 0, 0x3975, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x3976, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x3977, 0x3978, 0x3979, 	 0, 0x397A, 	 0, 	 0, /* 0xB0 */
+    0x397B, 	 0, 0x397C, 0x397D, 	 0, 	 0, 	 0, 0x397E, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x3A21, 	 0, 0x3A22, 	 0, /* 0xC0 */
+    0x3A23, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3A24, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x3A25, 	 0, 0x3A26, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x3A27, 	 0, 	 0, 	 0, 	 0, 0x3A28, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x3A29, 	 0, 	 0, 	 0, 0x3A2A, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3A2B, 0x3A2C, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3A2D					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_5B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x3A2E, 0x3A2F,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0x3A30,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0, 0x3A31, /* 0x10 */
-         0, 0x3A33,      0, 0x3A34,      0, 0x3A35,      0,      0, /* 0x10 */
-         0, 0x3A36,      0,      0,      0, 0x3A37,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0x3A38,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0x3A32,      0,      0,      0, /* 0x30 */
-    0x3A39,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0x3A3A,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0x3A3B, 0x3A3C,      0,      0,      0, /* 0x40 */
-         0,      0, 0x3A3D,      0,      0,      0, 0x3A3E,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0x3A3F,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0x3A40,      0,      0,      0,      0,      0, 0x3A41, 0x3A42, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0x3A43, 0x3A44, 0x3A45, 0x3A46, /* 0x70 */
-         0, 0x3A47,      0,      0, 0x3A48,      0, 0x3A49,      0, /* 0x80 */
-         0,      0, 0x3A4A,      0,      0,      0, 0x3A4B,      0, /* 0x80 */
-    0x3A4C, 0x3A4D,      0, 0x3A4E, 0x3A4F,      0, 0x3A50,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x3A51, 0x3A52,      0,      0, 0x3A53, 0x3A54,      0, 0x3A55, /* 0xA0 */
-         0, 0x3A56, 0x3A57,      0,      0,      0,      0, 0x3A58, /* 0xB0 */
-         0,      0, 0x3A59,      0, 0x3A5A,      0,      0,      0, /* 0xB0 */
-    0x3A5B, 0x3A5C,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0x3A5D,      0, 0x3A5E, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0x3A5F, 0x3A60, /* 0xD0 */
-    0x3A61, 0x3A62, 0x3A63,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x3A64,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0x3A65, /* 0xE0 */
-         0, 0x3A66,      0,      0, 0x3A67,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0x3A68                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x3A2E, 0x3A2F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0x3A30, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3A31, /* 0x10 */
+         0, 0x3A33, 	 0, 0x3A34, 	 0, 0x3A35, 	 0, 	 0, /* 0x10 */
+         0, 0x3A36, 	 0, 	 0, 	 0, 0x3A37, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3A38, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x3A32, 	 0, 	 0, 	 0, /* 0x30 */
+    0x3A39, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x3A3A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x3A3B, 0x3A3C, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x3A3D, 	 0, 	 0, 	 0, 0x3A3E, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3A3F, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x3A40, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3A41, 0x3A42, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0x3A43, 0x3A44, 0x3A45, 0x3A46, /* 0x70 */
+         0, 0x3A47, 	 0, 	 0, 0x3A48, 	 0, 0x3A49, 	 0, /* 0x80 */
+         0, 	 0, 0x3A4A, 	 0, 	 0, 	 0, 0x3A4B, 	 0, /* 0x80 */
+    0x3A4C, 0x3A4D, 	 0, 0x3A4E, 0x3A4F, 	 0, 0x3A50, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x3A51, 0x3A52, 	 0, 	 0, 0x3A53, 0x3A54, 	 0, 0x3A55, /* 0xA0 */
+         0, 0x3A56, 0x3A57, 	 0, 	 0, 	 0, 	 0, 0x3A58, /* 0xB0 */
+         0, 	 0, 0x3A59, 	 0, 0x3A5A, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x3A5B, 0x3A5C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3A5D, 	 0, 0x3A5E, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3A5F, 0x3A60, /* 0xD0 */
+    0x3A61, 0x3A62, 0x3A63, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x3A64, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3A65, /* 0xE0 */
+         0, 0x3A66, 	 0, 	 0, 0x3A67, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3A68					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_5C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-                                    0x3A69,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0, 0x3A6A, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x3A6B, 0x3A6C, /* 0x10 */
-         0,      0,      0, 0x3A6D,      0,      0, 0x3A6E,      0, /* 0x20 */
-         0, 0x3A6F,      0, 0x3A70, 0x3A71,      0, 0x3A72,      0, /* 0x20 */
-    0x3A73,      0, 0x3A74,      0,      0, 0x3A75, 0x3A76,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0x3A77, 0x3A78,      0, 0x3A79,      0,      0,      0, /* 0x50 */
-         0,      0, 0x3A7A, 0x3A7B,      0,      0,      0, 0x3A7C, /* 0x60 */
-    0x3A7D, 0x3A7E,      0,      0,      0, 0x3B21,      0,      0, /* 0x60 */
-    0x3B22,      0,      0,      0, 0x3B23, 0x3B24,      0,      0, /* 0x70 */
-         0,      0, 0x3B25, 0x3B26, 0x3B27, 0x3B28,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0x3B29, /* 0x80 */
-    0x3B2A,      0, 0x3B2B,      0,      0,      0,      0, 0x3B2C, /* 0x80 */
-         0,      0, 0x3B2D,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0x3B2E,      0, 0x3B2F, /* 0x90 */
-    0x3B30,      0, 0x3B31, 0x3B32,      0,      0, 0x3B33,      0, /* 0xA0 */
-         0,      0, 0x3B34,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x3B35,      0, 0x3B36, 0x3B37,      0,      0, /* 0xB0 */
-         0,      0, 0x3B38,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x3B39,      0, 0x3B3A,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x3B3B,      0,      0,      0,      0, 0x3B3D, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x3B3C,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0x3B3E,      0, /* 0xE0 */
-         0, 0x3B3F, 0x3B40,      0, 0x3B41                          /* 0xF0 */
+                                    0x3A69, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3A6A, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3A6B, 0x3A6C, /* 0x10 */
+         0, 	 0, 	 0, 0x3A6D, 	 0, 	 0, 0x3A6E, 	 0, /* 0x20 */
+         0, 0x3A6F, 	 0, 0x3A70, 0x3A71, 	 0, 0x3A72, 	 0, /* 0x20 */
+    0x3A73, 	 0, 0x3A74, 	 0, 	 0, 0x3A75, 0x3A76, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x3A77, 0x3A78, 	 0, 0x3A79, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x3A7A, 0x3A7B, 	 0, 	 0, 	 0, 0x3A7C, /* 0x60 */
+    0x3A7D, 0x3A7E, 	 0, 	 0, 	 0, 0x3B21, 	 0, 	 0, /* 0x60 */
+    0x3B22, 	 0, 	 0, 	 0, 0x3B23, 0x3B24, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x3B25, 0x3B26, 0x3B27, 0x3B28, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3B29, /* 0x80 */
+    0x3B2A, 	 0, 0x3B2B, 	 0, 	 0, 	 0, 	 0, 0x3B2C, /* 0x80 */
+         0, 	 0, 0x3B2D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3B2E, 	 0, 0x3B2F, /* 0x90 */
+    0x3B30, 	 0, 0x3B31, 0x3B32, 	 0, 	 0, 0x3B33, 	 0, /* 0xA0 */
+         0, 	 0, 0x3B34, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x3B35, 	 0, 0x3B36, 0x3B37, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x3B38, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x3B39, 	 0, 0x3B3A, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x3B3B, 	 0, 	 0, 	 0, 	 0, 0x3B3D, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3B3C, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3B3E, 	 0, /* 0xE0 */
+         0, 0x3B3F, 0x3B40, 	 0, 0x3B41							/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -756,633 +756,633 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0212_5C[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_5D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3B42,      0,      0,      0,      0, 0x3B43,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0x3B44,      0,      0, /* 0x00 */
-         0,      0, 0x3B45,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0x3B47, 0x3B48,      0, 0x3B49, 0x3B4A, /* 0x20 */
-         0,      0,      0, 0x3B46,      0,      0,      0,      0, /* 0x20 */
-         0, 0x3B4B,      0,      0, 0x3B4C,      0,      0,      0, /* 0x30 */
-         0, 0x3B4D,      0,      0,      0, 0x3B4E,      0, 0x3B4F, /* 0x30 */
-         0,      0, 0x3B50, 0x3B51,      0,      0, 0x3B52,      0, /* 0x40 */
-    0x3B53,      0, 0x3B57,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0x3B55,      0,      0,      0, 0x3B54,      0,      0, /* 0x50 */
-         0, 0x3B56,      0,      0,      0,      0,      0, 0x3B58, /* 0x50 */
-    0x3B59, 0x3B5A, 0x3B5B,      0, 0x3B5C,      0,      0,      0, /* 0x60 */
-         0,      0, 0x3B5D,      0,      0, 0x3B5E,      0,      0, /* 0x60 */
-    0x3B5F,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x3B60, 0x3B61,      0,      0,      0, 0x3B62, 0x3B63, /* 0x70 */
-         0, 0x3B64,      0, 0x3B65,      0,      0,      0,      0, /* 0x80 */
-    0x3B66,      0, 0x3B67,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0x3B68, 0x3B69, 0x3B6A, 0x3B6B,      0,      0, /* 0x90 */
-         0, 0x3B6C,      0, 0x3B6D,      0,      0,      0, 0x3B6E, /* 0x90 */
-    0x3B6F,      0,      0,      0,      0,      0,      0, 0x3B70, /* 0xA0 */
-         0,      0,      0, 0x3B71,      0,      0,      0,      0, /* 0xA0 */
-    0x3B72,      0, 0x6674,      0, 0x3B73,      0,      0,      0, /* 0xB0 */
-    0x3B74, 0x3B75,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x3B76,      0,      0,      0, 0x3B77, /* 0xC0 */
-         0,      0,      0, 0x3B78,      0,      0, 0x3B7A,      0, /* 0xC0 */
-    0x3B79,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x3B7B, 0x3B7C,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x3B7D,      0,      0,      0, 0x3B7E,      0,      0,      0, /* 0xE0 */
-         0, 0x3C21,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0x3C22, 0x3C23                                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3B42, 	 0, 	 0, 	 0, 	 0, 0x3B43, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3B44, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x3B45, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x3B47, 0x3B48, 	 0, 0x3B49, 0x3B4A, /* 0x20 */
+         0, 	 0, 	 0, 0x3B46, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x3B4B, 	 0, 	 0, 0x3B4C, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x3B4D, 	 0, 	 0, 	 0, 0x3B4E, 	 0, 0x3B4F, /* 0x30 */
+         0, 	 0, 0x3B50, 0x3B51, 	 0, 	 0, 0x3B52, 	 0, /* 0x40 */
+    0x3B53, 	 0, 0x3B57, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x3B55, 	 0, 	 0, 	 0, 0x3B54, 	 0, 	 0, /* 0x50 */
+         0, 0x3B56, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3B58, /* 0x50 */
+    0x3B59, 0x3B5A, 0x3B5B, 	 0, 0x3B5C, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x3B5D, 	 0, 	 0, 0x3B5E, 	 0, 	 0, /* 0x60 */
+    0x3B5F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x3B60, 0x3B61, 	 0, 	 0, 	 0, 0x3B62, 0x3B63, /* 0x70 */
+         0, 0x3B64, 	 0, 0x3B65, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x3B66, 	 0, 0x3B67, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x3B68, 0x3B69, 0x3B6A, 0x3B6B, 	 0, 	 0, /* 0x90 */
+         0, 0x3B6C, 	 0, 0x3B6D, 	 0, 	 0, 	 0, 0x3B6E, /* 0x90 */
+    0x3B6F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3B70, /* 0xA0 */
+         0, 	 0, 	 0, 0x3B71, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x3B72, 	 0, 0x6674, 	 0, 0x3B73, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x3B74, 0x3B75, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x3B76, 	 0, 	 0, 	 0, 0x3B77, /* 0xC0 */
+         0, 	 0, 	 0, 0x3B78, 	 0, 	 0, 0x3B7A, 	 0, /* 0xC0 */
+    0x3B79, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x3B7B, 0x3B7C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x3B7D, 	 0, 	 0, 	 0, 0x3B7E, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x3C21, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x3C22, 0x3C23													/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_5E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x3C24,      0,      0,      0,      0,      0,      0, 0x3C25, /* 0x00 */
-         0,      0,      0,      0,      0, 0x3C26,      0,      0, /* 0x00 */
-         0,      0, 0x3C27,      0, 0x3C28, 0x3C29,      0,      0, /* 0x10 */
-    0x3C2A,      0,      0,      0,      0,      0,      0, 0x3C2B, /* 0x10 */
-    0x3C2C,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0x3C2E,      0,      0,      0,      0,      0, 0x3C2D,      0, /* 0x20 */
-         0,      0, 0x3C2F,      0,      0, 0x3C30,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0x3C31,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0x3C34,      0, 0x3C32,      0,      0,      0,      0, /* 0x40 */
-    0x3C33, 0x3C35,      0,      0,      0,      0, 0x3C36,      0, /* 0x50 */
-    0x3C37,      0,      0, 0x3C38, 0x3C39,      0, 0x3C3A,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0x3C3B,      0, 0x3C3C, 0x3C3D, 0x3C3E, 0x3C3F, 0x3C40,      0, /* 0x60 */
-    0x3C41,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0x3C42,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x3C43,      0,      0, 0x3C44,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0x3C45,      0, 0x3C46, 0x3C47,      0,      0, /* 0xA0 */
-    0x3C48,      0, 0x3C49,      0, 0x3C4A,      0,      0,      0, /* 0xA0 */
-         0, 0x3C4B,      0, 0x3C4C,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x3C4D, 0x3C4E, 0x3C4F, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x3C50,      0, /* 0xC0 */
-         0,      0,      0, 0x3C52, 0x3C51,      0, 0x3C53,      0, /* 0xC0 */
-         0, 0x3C54, 0x3C55,      0, 0x3C56, 0x3C57,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x3C58,      0, 0x3C59,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x3C5A,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x3C5B                                  /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x3C24, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3C25, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3C26, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x3C27, 	 0, 0x3C28, 0x3C29, 	 0, 	 0, /* 0x10 */
+    0x3C2A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3C2B, /* 0x10 */
+    0x3C2C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x3C2E, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3C2D, 	 0, /* 0x20 */
+         0, 	 0, 0x3C2F, 	 0, 	 0, 0x3C30, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3C31, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x3C34, 	 0, 0x3C32, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0x3C33, 0x3C35, 	 0, 	 0, 	 0, 	 0, 0x3C36, 	 0, /* 0x50 */
+    0x3C37, 	 0, 	 0, 0x3C38, 0x3C39, 	 0, 0x3C3A, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x3C3B, 	 0, 0x3C3C, 0x3C3D, 0x3C3E, 0x3C3F, 0x3C40, 	 0, /* 0x60 */
+    0x3C41, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x3C42, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x3C43, 	 0, 	 0, 0x3C44, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x3C45, 	 0, 0x3C46, 0x3C47, 	 0, 	 0, /* 0xA0 */
+    0x3C48, 	 0, 0x3C49, 	 0, 0x3C4A, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x3C4B, 	 0, 0x3C4C, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3C4D, 0x3C4E, 0x3C4F, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3C50, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x3C52, 0x3C51, 	 0, 0x3C53, 	 0, /* 0xC0 */
+         0, 0x3C54, 0x3C55, 	 0, 0x3C56, 0x3C57, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x3C58, 	 0, 0x3C59, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3C5A, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x3C5B									/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_5F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x3C5C,      0,      0,      0, 0x3C5D, 0x3C5E, /* 0x00 */
-    0x3C5F,      0,      0,      0,      0,      0, 0x3C60,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0x3C61,      0,      0, 0x3C62, 0x3C63,      0,      0, /* 0x10 */
-         0, 0x3C64, 0x3C65, 0x3C66, 0x3C67,      0,      0,      0, /* 0x20 */
-    0x3C68,      0,      0, 0x3C69, 0x3C6A,      0, 0x3C6B,      0, /* 0x20 */
-    0x3C6C,      0,      0,      0, 0x3C6D,      0, 0x3C6E,      0, /* 0x30 */
-         0,      0,      0, 0x3C6F,      0, 0x3C70,      0, 0x3C71, /* 0x30 */
-    0x3C72,      0,      0,      0, 0x3C73, 0x3C74,      0, 0x3C75, /* 0x40 */
-         0,      0,      0,      0,      0, 0x3C76,      0,      0, /* 0x40 */
-    0x3C77,      0,      0,      0, 0x3C78,      0,      0,      0, /* 0x50 */
-    0x3C79,      0,      0, 0x3C7A,      0,      0,      0,      0, /* 0x50 */
-    0x3C7B,      0,      0, 0x3C7C, 0x3C7D,      0,      0, 0x3C7E, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0x3D21, /* 0x60 */
-         0,      0, 0x3D22,      0, 0x3D23, 0x3D24,      0,      0, /* 0x70 */
-    0x3D25,      0, 0x3D26,      0,      0, 0x3D27, 0x3D28,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0x3D29,      0,      0,      0, 0x3D2A,      0, 0x3D2B, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x3D2C,      0, /* 0x90 */
-         0,      0,      0,      0, 0x3D2D, 0x3D2E,      0,      0, /* 0x90 */
-         0,      0, 0x3D2F,      0, 0x3D32,      0,      0, 0x3D30, /* 0xA0 */
-         0,      0,      0, 0x3D31, 0x3D33,      0,      0, 0x3D34, /* 0xA0 */
-    0x3D35, 0x3D36,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x3D37,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x3D38,      0,      0, 0x3D39, /* 0xC0 */
-    0x3D3A, 0x3D3B,      0, 0x3D3C,      0,      0,      0,      0, /* 0xC0 */
-    0x3D3D, 0x3D3E, 0x3D3F, 0x3D40, 0x3D41,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0x3D42,      0, /* 0xD0 */
-         0, 0x3D43, 0x3D44,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x3D45, 0x3D46, 0x3D47,      0, 0x3D48, 0x3D49, 0x3D4A, 0x3D4B, /* 0xE0 */
-         0,      0, 0x3D4C, 0x3D4D,      0,      0, 0x3D4E,      0, /* 0xF0 */
-         0,      0, 0x3D4F,      0, 0x3D50                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x3C5C, 	 0, 	 0, 	 0, 0x3C5D, 0x3C5E, /* 0x00 */
+    0x3C5F, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3C60, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x3C61, 	 0, 	 0, 0x3C62, 0x3C63, 	 0, 	 0, /* 0x10 */
+         0, 0x3C64, 0x3C65, 0x3C66, 0x3C67, 	 0, 	 0, 	 0, /* 0x20 */
+    0x3C68, 	 0, 	 0, 0x3C69, 0x3C6A, 	 0, 0x3C6B, 	 0, /* 0x20 */
+    0x3C6C, 	 0, 	 0, 	 0, 0x3C6D, 	 0, 0x3C6E, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x3C6F, 	 0, 0x3C70, 	 0, 0x3C71, /* 0x30 */
+    0x3C72, 	 0, 	 0, 	 0, 0x3C73, 0x3C74, 	 0, 0x3C75, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3C76, 	 0, 	 0, /* 0x40 */
+    0x3C77, 	 0, 	 0, 	 0, 0x3C78, 	 0, 	 0, 	 0, /* 0x50 */
+    0x3C79, 	 0, 	 0, 0x3C7A, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x3C7B, 	 0, 	 0, 0x3C7C, 0x3C7D, 	 0, 	 0, 0x3C7E, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3D21, /* 0x60 */
+         0, 	 0, 0x3D22, 	 0, 0x3D23, 0x3D24, 	 0, 	 0, /* 0x70 */
+    0x3D25, 	 0, 0x3D26, 	 0, 	 0, 0x3D27, 0x3D28, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x3D29, 	 0, 	 0, 	 0, 0x3D2A, 	 0, 0x3D2B, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3D2C, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x3D2D, 0x3D2E, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x3D2F, 	 0, 0x3D32, 	 0, 	 0, 0x3D30, /* 0xA0 */
+         0, 	 0, 	 0, 0x3D31, 0x3D33, 	 0, 	 0, 0x3D34, /* 0xA0 */
+    0x3D35, 0x3D36, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x3D37, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x3D38, 	 0, 	 0, 0x3D39, /* 0xC0 */
+    0x3D3A, 0x3D3B, 	 0, 0x3D3C, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x3D3D, 0x3D3E, 0x3D3F, 0x3D40, 0x3D41, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3D42, 	 0, /* 0xD0 */
+         0, 0x3D43, 0x3D44, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x3D45, 0x3D46, 0x3D47, 	 0, 0x3D48, 0x3D49, 0x3D4A, 0x3D4B, /* 0xE0 */
+         0, 	 0, 0x3D4C, 0x3D4D, 	 0, 	 0, 0x3D4E, 	 0, /* 0xF0 */
+         0, 	 0, 0x3D4F, 	 0, 0x3D50							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_60[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0x3D51, /* 0x00 */
-         0,      0, 0x3D52,      0,      0, 0x3D53,      0,      0, /* 0x00 */
-         0,      0,      0, 0x3D54, 0x3D55,      0,      0, 0x3D56, /* 0x10 */
-    0x3D57,      0, 0x3D58,      0,      0,      0,      0, 0x3D59, /* 0x10 */
-         0,      0,      0,      0, 0x3D5A,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0x3D5B,      0,      0, /* 0x20 */
-         0,      0,      0, 0x3D5C,      0, 0x3D5D,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0x3D5E,      0,      0,      0,      0,      0,      0, 0x3D5F, /* 0x40 */
-    0x3D60, 0x3D61,      0,      0, 0x3D62,      0,      0,      0, /* 0x40 */
-         0, 0x3D63,      0,      0, 0x3D64,      0, 0x3D65, 0x3D66, /* 0x50 */
-         0,      0,      0,      0,      0, 0x3D67,      0,      0, /* 0x50 */
-         0, 0x3D68,      0,      0,      0,      0,      0, 0x3D69, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0x3D6A,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x3D6B, 0x3D6C, /* 0x70 */
-         0,      0, 0x3D6D,      0,      0,      0, 0x3D6E,      0, /* 0x80 */
-    0x3D6F,      0, 0x3D70,      0,      0,      0, 0x3D71,      0, /* 0x80 */
-         0, 0x3D72,      0, 0x3D73,      0, 0x3D74,      0,      0, /* 0x90 */
-    0x3D75,      0,      0,      0,      0, 0x3D76, 0x3D77,      0, /* 0x90 */
-         0,      0, 0x3D78,      0, 0x3D79, 0x3D7A,      0,      0, /* 0xA0 */
-    0x3D7B,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x3D7C, 0x3D7D,      0,      0,      0,      0,      0, 0x3D7E, /* 0xB0 */
-         0,      0,      0, 0x3E21,      0,      0, 0x3E22,      0, /* 0xB0 */
-         0,      0, 0x3E23,      0, 0x3E24,      0,      0,      0, /* 0xC0 */
-    0x3E25, 0x3E26, 0x3E27, 0x3E28,      0,      0, 0x3E29, 0x3E2A, /* 0xC0 */
-         0,      0,      0,      0, 0x3E2B, 0x3E2C,      0,      0, /* 0xD0 */
-         0, 0x3E2D,      0, 0x3E2E,      0, 0x3E2F, 0x3E30,      0, /* 0xD0 */
-         0,      0, 0x3E31,      0,      0, 0x3E32,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0x3E33,      0,      0, 0x3E34,      0,      0, /* 0xF0 */
-    0x3E35,      0,      0,      0, 0x3E36, 0x3E37                  /* 0xF0 */
+         0, 	 0, 0x3D52, 	 0, 	 0, 0x3D53, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x3D54, 0x3D55, 	 0, 	 0, 0x3D56, /* 0x10 */
+    0x3D57, 	 0, 0x3D58, 	 0, 	 0, 	 0, 	 0, 0x3D59, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x3D5A, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3D5B, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x3D5C, 	 0, 0x3D5D, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x3D5E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3D5F, /* 0x40 */
+    0x3D60, 0x3D61, 	 0, 	 0, 0x3D62, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x3D63, 	 0, 	 0, 0x3D64, 	 0, 0x3D65, 0x3D66, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3D67, 	 0, 	 0, /* 0x50 */
+         0, 0x3D68, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3D69, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x3D6A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3D6B, 0x3D6C, /* 0x70 */
+         0, 	 0, 0x3D6D, 	 0, 	 0, 	 0, 0x3D6E, 	 0, /* 0x80 */
+    0x3D6F, 	 0, 0x3D70, 	 0, 	 0, 	 0, 0x3D71, 	 0, /* 0x80 */
+         0, 0x3D72, 	 0, 0x3D73, 	 0, 0x3D74, 	 0, 	 0, /* 0x90 */
+    0x3D75, 	 0, 	 0, 	 0, 	 0, 0x3D76, 0x3D77, 	 0, /* 0x90 */
+         0, 	 0, 0x3D78, 	 0, 0x3D79, 0x3D7A, 	 0, 	 0, /* 0xA0 */
+    0x3D7B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x3D7C, 0x3D7D, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3D7E, /* 0xB0 */
+         0, 	 0, 	 0, 0x3E21, 	 0, 	 0, 0x3E22, 	 0, /* 0xB0 */
+         0, 	 0, 0x3E23, 	 0, 0x3E24, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x3E25, 0x3E26, 0x3E27, 0x3E28, 	 0, 	 0, 0x3E29, 0x3E2A, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x3E2B, 0x3E2C, 	 0, 	 0, /* 0xD0 */
+         0, 0x3E2D, 	 0, 0x3E2E, 	 0, 0x3E2F, 0x3E30, 	 0, /* 0xD0 */
+         0, 	 0, 0x3E31, 	 0, 	 0, 0x3E32, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x3E33, 	 0, 	 0, 0x3E34, 	 0, 	 0, /* 0xF0 */
+    0x3E35, 	 0, 	 0, 	 0, 0x3E36, 0x3E37					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_61[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x3E38,      0,      0,      0,      0, 0x3E39, /* 0x00 */
-         0,      0, 0x3E3A,      0, 0x3E3B,      0,      0,      0, /* 0x00 */
-    0x3E3C, 0x3E3D, 0x3E3E, 0x3E3F, 0x3E40,      0, 0x3E41, 0x3E42, /* 0x10 */
-         0, 0x3E43,      0,      0, 0x3E44,      0, 0x3E45,      0, /* 0x10 */
-         0,      0, 0x3E46,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x3E47, 0x3E48,      0,      0,      0,      0, /* 0x20 */
-    0x3E49, 0x3E4A,      0,      0,      0, 0x3E4B, 0x3E4C, 0x3E4D, /* 0x30 */
-         0, 0x3E4E,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0x3E4F,      0,      0,      0, 0x3E50, 0x3E51,      0, /* 0x40 */
-         0, 0x3E52,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0x3E53,      0, /* 0x50 */
-    0x3E54,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0x3E55,      0,      0,      0, /* 0x60 */
-         0,      0, 0x3E56,      0,      0,      0,      0,      0, /* 0x70 */
-    0x3E57,      0,      0, 0x3E58, 0x3E59,      0,      0, 0x3E5A, /* 0x70 */
-    0x3E5B, 0x3E5C,      0, 0x3E5D, 0x3E5E,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x3E5F,      0, 0x3E60,      0,      0, /* 0x80 */
-         0,      0, 0x3E61, 0x3E62,      0,      0,      0, 0x3E63, /* 0x90 */
-    0x3E64,      0,      0,      0, 0x3E65, 0x3E66,      0, 0x3E67, /* 0x90 */
-    0x3E68,      0,      0,      0,      0, 0x3E69,      0,      0, /* 0xA0 */
-    0x3E6A,      0, 0x3E6B,      0,      0, 0x3E6C,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x3E6D, 0x3E6E,      0,      0, 0x3E6F,      0,      0,      0, /* 0xB0 */
-    0x3E70, 0x3E71, 0x3E72,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0x3E73, 0x3E74, /* 0xC0 */
-         0,      0,      0,      0,      0, 0x3E75,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x3E76, 0x3E77, 0x3E78, 0x3E79, /* 0xD0 */
-         0, 0x3E7A, 0x3E7B,      0,      0, 0x3E7E,      0, 0x3E7C, /* 0xE0 */
-         0, 0x3E7D,      0,      0, 0x3F21, 0x3F22,      0, 0x3F23  /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x3E38, 	 0, 	 0, 	 0, 	 0, 0x3E39, /* 0x00 */
+         0, 	 0, 0x3E3A, 	 0, 0x3E3B, 	 0, 	 0, 	 0, /* 0x00 */
+    0x3E3C, 0x3E3D, 0x3E3E, 0x3E3F, 0x3E40, 	 0, 0x3E41, 0x3E42, /* 0x10 */
+         0, 0x3E43, 	 0, 	 0, 0x3E44, 	 0, 0x3E45, 	 0, /* 0x10 */
+         0, 	 0, 0x3E46, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x3E47, 0x3E48, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x3E49, 0x3E4A, 	 0, 	 0, 	 0, 0x3E4B, 0x3E4C, 0x3E4D, /* 0x30 */
+         0, 0x3E4E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x3E4F, 	 0, 	 0, 	 0, 0x3E50, 0x3E51, 	 0, /* 0x40 */
+         0, 0x3E52, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3E53, 	 0, /* 0x50 */
+    0x3E54, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x3E55, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x3E56, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x3E57, 	 0, 	 0, 0x3E58, 0x3E59, 	 0, 	 0, 0x3E5A, /* 0x70 */
+    0x3E5B, 0x3E5C, 	 0, 0x3E5D, 0x3E5E, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x3E5F, 	 0, 0x3E60, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x3E61, 0x3E62, 	 0, 	 0, 	 0, 0x3E63, /* 0x90 */
+    0x3E64, 	 0, 	 0, 	 0, 0x3E65, 0x3E66, 	 0, 0x3E67, /* 0x90 */
+    0x3E68, 	 0, 	 0, 	 0, 	 0, 0x3E69, 	 0, 	 0, /* 0xA0 */
+    0x3E6A, 	 0, 0x3E6B, 	 0, 	 0, 0x3E6C, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x3E6D, 0x3E6E, 	 0, 	 0, 0x3E6F, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x3E70, 0x3E71, 0x3E72, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3E73, 0x3E74, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3E75, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x3E76, 0x3E77, 0x3E78, 0x3E79, /* 0xD0 */
+         0, 0x3E7A, 0x3E7B, 	 0, 	 0, 0x3E7E, 	 0, 0x3E7C, /* 0xE0 */
+         0, 0x3E7D, 	 0, 	 0, 0x3F21, 0x3F22, 	 0, 0x3F23	/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_62[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3F24,      0, 0x3F25, 0x3F26,      0,      0, 0x3F27, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0x3F28,      0, 0x3F29,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0x3F2A,      0,      0,      0, /* 0x10 */
-    0x3F2B,      0, 0x3F2C, 0x3F2D,      0,      0,      0, 0x3F2E, /* 0x20 */
-         0, 0x3F2F,      0, 0x3F30,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0x3F31,      0,      0,      0, 0x3F32,      0,      0, /* 0x30 */
-         0,      0, 0x3F33, 0x3F34, 0x3F35,      0, 0x3F36,      0, /* 0x40 */
-         0,      0,      0,      0, 0x3F37,      0,      0,      0, /* 0x40 */
-    0x3F38, 0x3F39, 0x3F3A,      0, 0x3F3B,      0, 0x3F3C,      0, /* 0x50 */
-         0,      0, 0x3F3D,      0, 0x3F3E,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0x3F3F,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0x3F40,      0, 0x3F41, /* 0x60 */
-         0,      0,      0, 0x3F42,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x3F43,      0,      0, 0x3F44,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x3F45, 0x3F46, 0x3F47, /* 0x80 */
-    0x3F48,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0x3F49,      0, /* 0xA0 */
-    0x3F4A,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x3F4B,      0,      0, 0x3F4C, 0x3F4D, /* 0xB0 */
-         0,      0, 0x3F4E,      0,      0,      0, 0x3F4F, 0x3F50, /* 0xB0 */
-         0,      0,      0,      0, 0x3F51,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0x3F52,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0x3F53, 0x3F54,      0, /* 0xD0 */
-         0,      0, 0x3F55,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0x3F56,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0x3F57,      0, 0x3F58,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0, 0x3F59, 0x3F5A                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3F24, 	 0, 0x3F25, 0x3F26, 	 0, 	 0, 0x3F27, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x3F28, 	 0, 0x3F29, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x3F2A, 	 0, 	 0, 	 0, /* 0x10 */
+    0x3F2B, 	 0, 0x3F2C, 0x3F2D, 	 0, 	 0, 	 0, 0x3F2E, /* 0x20 */
+         0, 0x3F2F, 	 0, 0x3F30, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x3F31, 	 0, 	 0, 	 0, 0x3F32, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x3F33, 0x3F34, 0x3F35, 	 0, 0x3F36, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x3F37, 	 0, 	 0, 	 0, /* 0x40 */
+    0x3F38, 0x3F39, 0x3F3A, 	 0, 0x3F3B, 	 0, 0x3F3C, 	 0, /* 0x50 */
+         0, 	 0, 0x3F3D, 	 0, 0x3F3E, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x3F3F, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3F40, 	 0, 0x3F41, /* 0x60 */
+         0, 	 0, 	 0, 0x3F42, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x3F43, 	 0, 	 0, 0x3F44, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3F45, 0x3F46, 0x3F47, /* 0x80 */
+    0x3F48, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3F49, 	 0, /* 0xA0 */
+    0x3F4A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x3F4B, 	 0, 	 0, 0x3F4C, 0x3F4D, /* 0xB0 */
+         0, 	 0, 0x3F4E, 	 0, 	 0, 	 0, 0x3F4F, 0x3F50, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x3F51, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3F52, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3F53, 0x3F54, 	 0, /* 0xD0 */
+         0, 	 0, 0x3F55, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x3F56, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x3F57, 	 0, 0x3F58, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0x3F59, 0x3F5A					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_63[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0x3F5B, 0x3F5C,      0,      0,      0, /* 0x00 */
-         0,      0, 0x3F5D, 0x3F5E,      0, 0x3F5F,      0,      0, /* 0x00 */
-    0x3F60,      0,      0, 0x3F61,      0,      0, 0x3F62,      0, /* 0x10 */
-    0x3F63,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0x3F64, 0x3F65,      0,      0, 0x3F66,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0x3F67, 0x3F68,      0, /* 0x30 */
-         0, 0x3F69,      0,      0, 0x3F6A,      0,      0,      0, /* 0x30 */
-         0, 0x3F6B, 0x3F6C, 0x3F6D, 0x3F6E,      0, 0x3F6F,      0, /* 0x40 */
-         0,      0, 0x3F70, 0x3F71,      0,      0, 0x3F72,      0, /* 0x40 */
-         0,      0, 0x3F73, 0x3F74, 0x3F75,      0,      0,      0, /* 0x50 */
-    0x3F76,      0,      0, 0x3F77,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0x3F78, 0x3F79,      0, /* 0x60 */
-         0,      0,      0,      0, 0x3F7A, 0x3F7B,      0,      0, /* 0x60 */
-         0, 0x3F7C,      0,      0, 0x3F7D, 0x3F7E,      0,      0, /* 0x70 */
-    0x4021,      0,      0,      0, 0x4022, 0x4023,      0, 0x4024, /* 0x70 */
-         0,      0, 0x4025,      0, 0x4026,      0,      0, 0x4027, /* 0x80 */
-         0,      0, 0x4028,      0,      0,      0,      0,      0, /* 0x80 */
-    0x4029,      0,      0,      0, 0x402A, 0x402B,      0,      0, /* 0x90 */
-         0, 0x402C, 0x402D,      0,      0,      0, 0x402E,      0, /* 0x90 */
-         0,      0,      0,      0, 0x402F,      0, 0x4030,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0x4031, 0x4032, 0x4033, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x4034,      0,      0, /* 0xB0 */
-         0, 0x4035,      0,      0,      0, 0x4036,      0,      0, /* 0xC0 */
-    0x4037,      0,      0,      0,      0,      0, 0x4038,      0, /* 0xC0 */
-         0, 0x4039,      0, 0x403A, 0x403B, 0x403C,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x403D,      0,      0,      0, /* 0xD0 */
-    0x403E,      0,      0,      0,      0, 0x403F,      0,      0, /* 0xE0 */
-         0,      0, 0x4040,      0, 0x4041,      0,      0,      0, /* 0xE0 */
-         0,      0, 0x4042, 0x4043,      0, 0x4044,      0,      0, /* 0xF0 */
-    0x4045, 0x4046                                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0x3F5B, 0x3F5C, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x3F5D, 0x3F5E, 	 0, 0x3F5F, 	 0, 	 0, /* 0x00 */
+    0x3F60, 	 0, 	 0, 0x3F61, 	 0, 	 0, 0x3F62, 	 0, /* 0x10 */
+    0x3F63, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x3F64, 0x3F65, 	 0, 	 0, 0x3F66, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3F67, 0x3F68, 	 0, /* 0x30 */
+         0, 0x3F69, 	 0, 	 0, 0x3F6A, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x3F6B, 0x3F6C, 0x3F6D, 0x3F6E, 	 0, 0x3F6F, 	 0, /* 0x40 */
+         0, 	 0, 0x3F70, 0x3F71, 	 0, 	 0, 0x3F72, 	 0, /* 0x40 */
+         0, 	 0, 0x3F73, 0x3F74, 0x3F75, 	 0, 	 0, 	 0, /* 0x50 */
+    0x3F76, 	 0, 	 0, 0x3F77, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x3F78, 0x3F79, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x3F7A, 0x3F7B, 	 0, 	 0, /* 0x60 */
+         0, 0x3F7C, 	 0, 	 0, 0x3F7D, 0x3F7E, 	 0, 	 0, /* 0x70 */
+    0x4021, 	 0, 	 0, 	 0, 0x4022, 0x4023, 	 0, 0x4024, /* 0x70 */
+         0, 	 0, 0x4025, 	 0, 0x4026, 	 0, 	 0, 0x4027, /* 0x80 */
+         0, 	 0, 0x4028, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x4029, 	 0, 	 0, 	 0, 0x402A, 0x402B, 	 0, 	 0, /* 0x90 */
+         0, 0x402C, 0x402D, 	 0, 	 0, 	 0, 0x402E, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x402F, 	 0, 0x4030, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4031, 0x4032, 0x4033, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4034, 	 0, 	 0, /* 0xB0 */
+         0, 0x4035, 	 0, 	 0, 	 0, 0x4036, 	 0, 	 0, /* 0xC0 */
+    0x4037, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4038, 	 0, /* 0xC0 */
+         0, 0x4039, 	 0, 0x403A, 0x403B, 0x403C, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x403D, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x403E, 	 0, 	 0, 	 0, 	 0, 0x403F, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x4040, 	 0, 0x4041, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x4042, 0x4043, 	 0, 0x4044, 	 0, 	 0, /* 0xF0 */
+    0x4045, 0x4046													/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_64[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-            0x4047, 0x4048,      0,      0,      0,      0,      0, /* 0x00 */
-    0x4049,      0, 0x404A,      0, 0x404B,      0,      0,      0, /* 0x10 */
-    0x404C,      0,      0,      0,      0,      0, 0x404D,      0, /* 0x10 */
-    0x404E,      0, 0x404F,      0, 0x4050, 0x4051,      0,      0, /* 0x20 */
-         0, 0x4052, 0x4053,      0,      0,      0,      0, 0x4054, /* 0x20 */
-    0x4055,      0,      0,      0,      0, 0x4056,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0x4057,      0, 0x4058, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0x4059,      0,      0,      0, 0x405A, /* 0x40 */
-         0, 0x405B, 0x405C, 0x405D, 0x405E,      0,      0,      0, /* 0x50 */
-         0,      0, 0x405F, 0x4060, 0x4061, 0x4062,      0, 0x4063, /* 0x50 */
-    0x4064, 0x4065,      0, 0x4066,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0x4067,      0,      0, /* 0x60 */
-         0,      0,      0, 0x4068, 0x4069,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0x406A,      0, 0x406B,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0x406C,      0, 0x406D, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0, 0x406E, /* 0x80 */
-    0x406F, 0x4070,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x4071, 0x4072,      0, 0x4073,      0, 0x4074,      0, 0x4075, /* 0x90 */
-         0, 0x4076,      0, 0x4077,      0,      0, 0x4078,      0, /* 0xA0 */
-    0x4079,      0,      0,      0, 0x407A,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x407B,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x407C, 0x407D, 0x407E, /* 0xB0 */
-         0,      0,      0,      0, 0x4121,      0,      0,      0, /* 0xC0 */
-         0, 0x4122, 0x4123, 0x4124, 0x4125,      0, 0x4126,      0, /* 0xC0 */
-    0x4127, 0x4128,      0,      0,      0, 0x4129,      0, 0x412A, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x412B, 0x412C,      0,      0, /* 0xE0 */
-         0, 0x412D, 0x412E,      0,      0, 0x412F,      0,      0, /* 0xE0 */
-    0x4130,      0,      0,      0,      0, 0x4131,      0, 0x4132, /* 0xF0 */
-         0,      0,      0, 0x4133,      0,      0,      0, 0x4134  /* 0xF0 */
+            0x4047, 0x4048, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0x4049, 	 0, 0x404A, 	 0, 0x404B, 	 0, 	 0, 	 0, /* 0x10 */
+    0x404C, 	 0, 	 0, 	 0, 	 0, 	 0, 0x404D, 	 0, /* 0x10 */
+    0x404E, 	 0, 0x404F, 	 0, 0x4050, 0x4051, 	 0, 	 0, /* 0x20 */
+         0, 0x4052, 0x4053, 	 0, 	 0, 	 0, 	 0, 0x4054, /* 0x20 */
+    0x4055, 	 0, 	 0, 	 0, 	 0, 0x4056, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4057, 	 0, 0x4058, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x4059, 	 0, 	 0, 	 0, 0x405A, /* 0x40 */
+         0, 0x405B, 0x405C, 0x405D, 0x405E, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x405F, 0x4060, 0x4061, 0x4062, 	 0, 0x4063, /* 0x50 */
+    0x4064, 0x4065, 	 0, 0x4066, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4067, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x4068, 0x4069, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x406A, 	 0, 0x406B, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x406C, 	 0, 0x406D, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x406E, /* 0x80 */
+    0x406F, 0x4070, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x4071, 0x4072, 	 0, 0x4073, 	 0, 0x4074, 	 0, 0x4075, /* 0x90 */
+         0, 0x4076, 	 0, 0x4077, 	 0, 	 0, 0x4078, 	 0, /* 0xA0 */
+    0x4079, 	 0, 	 0, 	 0, 0x407A, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x407B, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x407C, 0x407D, 0x407E, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x4121, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x4122, 0x4123, 0x4124, 0x4125, 	 0, 0x4126, 	 0, /* 0xC0 */
+    0x4127, 0x4128, 	 0, 	 0, 	 0, 0x4129, 	 0, 0x412A, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x412B, 0x412C, 	 0, 	 0, /* 0xE0 */
+         0, 0x412D, 0x412E, 	 0, 	 0, 0x412F, 	 0, 	 0, /* 0xE0 */
+    0x4130, 	 0, 	 0, 	 0, 	 0, 0x4131, 	 0, 0x4132, /* 0xF0 */
+         0, 	 0, 	 0, 0x4133, 	 0, 	 0, 	 0, 0x4134	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_65[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x4135,      0,      0, 0x4136,      0,      0,      0, /* 0x00 */
-    0x4137, 0x4138, 0x4139,      0,      0,      0,      0, 0x413A, /* 0x00 */
-         0,      0,      0, 0x413B, 0x413C,      0, 0x413D,      0, /* 0x10 */
-         0, 0x413E,      0, 0x413F,      0,      0, 0x4140, 0x4141, /* 0x10 */
-         0,      0, 0x4142,      0,      0,      0, 0x4143,      0, /* 0x20 */
-         0, 0x4144,      0,      0,      0,      0, 0x4145,      0, /* 0x20 */
-         0, 0x4146,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0x4147,      0, 0x4148, 0x4149,      0,      0, /* 0x30 */
-         0,      0,      0, 0x414A,      0,      0,      0, 0x414B, /* 0x40 */
-         0, 0x414C,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0x414D,      0, 0x414E,      0, 0x414F,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0x4150, /* 0x50 */
-    0x4151,      0,      0,      0,      0,      0,      0, 0x4152, /* 0x60 */
-         0,      0,      0, 0x4153,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x4154,      0,      0, 0x4155,      0,      0, /* 0x70 */
-         0, 0x4156,      0,      0,      0, 0x4157,      0,      0, /* 0x80 */
-         0,      0, 0x4158,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0x4159,      0,      0, 0x415A,      0,      0, /* 0x90 */
-    0x415B,      0,      0,      0,      0, 0x415C,      0,      0, /* 0x90 */
-    0x415D,      0,      0, 0x415E,      0,      0, 0x415F,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0x4160,      0, /* 0xA0 */
-         0,      0, 0x4161, 0x4162, 0x4163,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0x4164, /* 0xB0 */
-         0,      0, 0x4165,      0,      0,      0,      0,      0, /* 0xC0 */
-    0x4166, 0x4167,      0,      0,      0,      0, 0x4168,      0, /* 0xC0 */
-    0x4169,      0,      0,      0, 0x416A,      0, 0x416B,      0, /* 0xD0 */
-    0x416C,      0,      0,      0,      0,      0,      0, 0x416D, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x416E,      0, 0x416F,      0, 0x4170, 0x4171,      0,      0, /* 0xF0 */
-         0, 0x4172,      0,      0,      0,      0, 0x4173, 0x4174  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x4135, 	 0, 	 0, 0x4136, 	 0, 	 0, 	 0, /* 0x00 */
+    0x4137, 0x4138, 0x4139, 	 0, 	 0, 	 0, 	 0, 0x413A, /* 0x00 */
+         0, 	 0, 	 0, 0x413B, 0x413C, 	 0, 0x413D, 	 0, /* 0x10 */
+         0, 0x413E, 	 0, 0x413F, 	 0, 	 0, 0x4140, 0x4141, /* 0x10 */
+         0, 	 0, 0x4142, 	 0, 	 0, 	 0, 0x4143, 	 0, /* 0x20 */
+         0, 0x4144, 	 0, 	 0, 	 0, 	 0, 0x4145, 	 0, /* 0x20 */
+         0, 0x4146, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x4147, 	 0, 0x4148, 0x4149, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x414A, 	 0, 	 0, 	 0, 0x414B, /* 0x40 */
+         0, 0x414C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0x414D, 	 0, 0x414E, 	 0, 0x414F, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4150, /* 0x50 */
+    0x4151, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4152, /* 0x60 */
+         0, 	 0, 	 0, 0x4153, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x4154, 	 0, 	 0, 0x4155, 	 0, 	 0, /* 0x70 */
+         0, 0x4156, 	 0, 	 0, 	 0, 0x4157, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x4158, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x4159, 	 0, 	 0, 0x415A, 	 0, 	 0, /* 0x90 */
+    0x415B, 	 0, 	 0, 	 0, 	 0, 0x415C, 	 0, 	 0, /* 0x90 */
+    0x415D, 	 0, 	 0, 0x415E, 	 0, 	 0, 0x415F, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4160, 	 0, /* 0xA0 */
+         0, 	 0, 0x4161, 0x4162, 0x4163, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4164, /* 0xB0 */
+         0, 	 0, 0x4165, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x4166, 0x4167, 	 0, 	 0, 	 0, 	 0, 0x4168, 	 0, /* 0xC0 */
+    0x4169, 	 0, 	 0, 	 0, 0x416A, 	 0, 0x416B, 	 0, /* 0xD0 */
+    0x416C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x416D, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x416E, 	 0, 0x416F, 	 0, 0x4170, 0x4171, 	 0, 	 0, /* 0xF0 */
+         0, 0x4172, 	 0, 	 0, 	 0, 	 0, 0x4173, 0x4174	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_66[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x4175,      0,      0,      0, 0x4176,      0,      0,      0, /* 0x00 */
-    0x4177, 0x4178,      0,      0,      0, 0x4179,      0,      0, /* 0x00 */
-         0, 0x417A, 0x417B,      0,      0, 0x417C, 0x417D,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0x417E, 0x4221,      0, /* 0x10 */
-         0, 0x4222, 0x4223, 0x4224, 0x4225,      0, 0x4226,      0, /* 0x20 */
-         0, 0x4227, 0x4228, 0x4229, 0x422A,      0, 0x422B,      0, /* 0x20 */
-    0x422C, 0x422D,      0, 0x422E,      0,      0,      0, 0x4230, /* 0x30 */
-         0, 0x422F,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0x4231,      0,      0,      0,      0, 0x4232, 0x4233,      0, /* 0x40 */
-         0,      0, 0x4234,      0, 0x4235,      0, 0x4237,      0, /* 0x40 */
-         0, 0x4236,      0,      0,      0,      0,      0, 0x4238, /* 0x50 */
-    0x4239, 0x423A,      0, 0x423B, 0x423C,      0,      0,      0, /* 0x50 */
-    0x423D, 0x423E,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0x4240, 0x4241, 0x4242,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0x4244,      0, 0x4245,      0, 0x4247, /* 0x70 */
-    0x4248, 0x4249,      0, 0x424A, 0x424C,      0, 0x4243, 0x4246, /* 0x70 */
-    0x424B,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x424D, 0x424E, 0x424F,      0,      0, /* 0x80 */
-    0x4250,      0, 0x4251,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0x4252, 0x4253, 0x4254, 0x4255,      0,      0, 0x4256, /* 0x90 */
-    0x4257,      0,      0,      0, 0x4258,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0x4259,      0,      0, /* 0xA0 */
-         0, 0x425A, 0x425B,      0,      0, 0x425C,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x425D,      0,      0,      0, 0x425E, /* 0xB0 */
-    0x425F,      0, 0x4260, 0x4261,      0,      0,      0,      0, /* 0xC0 */
-    0x4262,      0,      0,      0, 0x4263,      0, 0x4264, 0x4265, /* 0xC0 */
-         0,      0,      0,      0, 0x4266,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0x4267,      0,      0,      0, 0x4268, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x4269,      0,      0, 0x426A, 0x426B,      0, 0x426C,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x426D, 0x423F                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x4175, 	 0, 	 0, 	 0, 0x4176, 	 0, 	 0, 	 0, /* 0x00 */
+    0x4177, 0x4178, 	 0, 	 0, 	 0, 0x4179, 	 0, 	 0, /* 0x00 */
+         0, 0x417A, 0x417B, 	 0, 	 0, 0x417C, 0x417D, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x417E, 0x4221, 	 0, /* 0x10 */
+         0, 0x4222, 0x4223, 0x4224, 0x4225, 	 0, 0x4226, 	 0, /* 0x20 */
+         0, 0x4227, 0x4228, 0x4229, 0x422A, 	 0, 0x422B, 	 0, /* 0x20 */
+    0x422C, 0x422D, 	 0, 0x422E, 	 0, 	 0, 	 0, 0x4230, /* 0x30 */
+         0, 0x422F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x4231, 	 0, 	 0, 	 0, 	 0, 0x4232, 0x4233, 	 0, /* 0x40 */
+         0, 	 0, 0x4234, 	 0, 0x4235, 	 0, 0x4237, 	 0, /* 0x40 */
+         0, 0x4236, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4238, /* 0x50 */
+    0x4239, 0x423A, 	 0, 0x423B, 0x423C, 	 0, 	 0, 	 0, /* 0x50 */
+    0x423D, 0x423E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x4240, 0x4241, 0x4242, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x4244, 	 0, 0x4245, 	 0, 0x4247, /* 0x70 */
+    0x4248, 0x4249, 	 0, 0x424A, 0x424C, 	 0, 0x4243, 0x4246, /* 0x70 */
+    0x424B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x424D, 0x424E, 0x424F, 	 0, 	 0, /* 0x80 */
+    0x4250, 	 0, 0x4251, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x4252, 0x4253, 0x4254, 0x4255, 	 0, 	 0, 0x4256, /* 0x90 */
+    0x4257, 	 0, 	 0, 	 0, 0x4258, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4259, 	 0, 	 0, /* 0xA0 */
+         0, 0x425A, 0x425B, 	 0, 	 0, 0x425C, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x425D, 	 0, 	 0, 	 0, 0x425E, /* 0xB0 */
+    0x425F, 	 0, 0x4260, 0x4261, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x4262, 	 0, 	 0, 	 0, 0x4263, 	 0, 0x4264, 0x4265, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x4266, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x4267, 	 0, 	 0, 	 0, 0x4268, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x4269, 	 0, 	 0, 0x426A, 0x426B, 	 0, 0x426C, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x426D, 0x423F									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_67[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0x426E,      0, 0x426F, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0x4270,      0, /* 0x00 */
-         0,      0,      0, 0x4271,      0,      0,      0,      0, /* 0x10 */
-         0, 0x4272,      0,      0, 0x4273,      0,      0,      0, /* 0x10 */
-    0x4274,      0, 0x4275,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0x4276,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0x4277,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0x4278,      0, 0x4279, /* 0x40 */
-    0x427A,      0,      0,      0, 0x427B,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0x427C, 0x427D,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0x427E,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0x4321,      0, /* 0x60 */
-         0,      0,      0,      0, 0x4322,      0, 0x4323,      0, /* 0x60 */
-         0,      0,      0,      0, 0x4324,      0, 0x4325,      0, /* 0x70 */
-         0,      0,      0, 0x4326,      0,      0,      0,      0, /* 0x70 */
-         0, 0x4327,      0,      0, 0x4328,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x4329, 0x432A, /* 0x80 */
-         0, 0x432B,      0, 0x432C,      0,      0, 0x432D,      0, /* 0x90 */
-    0x432E, 0x432F,      0, 0x4330,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x4331, 0x4332, 0x4333,      0,      0, 0x4334,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x4335, 0x4336, 0x4337,      0,      0, /* 0xB0 */
-    0x4339,      0, 0x433A, 0x433B,      0, 0x433C,      0,      0, /* 0xC0 */
-    0x433D, 0x433E,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x433F,      0,      0,      0,      0, 0x4340, /* 0xD0 */
-         0, 0x4341,      0,      0, 0x4342,      0,      0,      0, /* 0xD0 */
-         0, 0x4343,      0,      0,      0,      0, 0x4344,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x4345,      0, 0x4346,      0,      0,      0, 0x4347, 0x4348, /* 0xF0 */
-         0, 0x4338                                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0x426E, 	 0, 0x426F, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4270, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x4271, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x4272, 	 0, 	 0, 0x4273, 	 0, 	 0, 	 0, /* 0x10 */
+    0x4274, 	 0, 0x4275, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x4276, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4277, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4278, 	 0, 0x4279, /* 0x40 */
+    0x427A, 	 0, 	 0, 	 0, 0x427B, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x427C, 0x427D, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x427E, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4321, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x4322, 	 0, 0x4323, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x4324, 	 0, 0x4325, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x4326, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x4327, 	 0, 	 0, 0x4328, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4329, 0x432A, /* 0x80 */
+         0, 0x432B, 	 0, 0x432C, 	 0, 	 0, 0x432D, 	 0, /* 0x90 */
+    0x432E, 0x432F, 	 0, 0x4330, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x4331, 0x4332, 0x4333, 	 0, 	 0, 0x4334, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x4335, 0x4336, 0x4337, 	 0, 	 0, /* 0xB0 */
+    0x4339, 	 0, 0x433A, 0x433B, 	 0, 0x433C, 	 0, 	 0, /* 0xC0 */
+    0x433D, 0x433E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x433F, 	 0, 	 0, 	 0, 	 0, 0x4340, /* 0xD0 */
+         0, 0x4341, 	 0, 	 0, 0x4342, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x4343, 	 0, 	 0, 	 0, 	 0, 0x4344, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x4345, 	 0, 0x4346, 	 0, 	 0, 	 0, 0x4347, 0x4348, /* 0xF0 */
+         0, 0x4338													/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_68[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0x434A,      0,      0,      0, /* 0x10 */
-         0, 0x434B,      0,      0,      0, 0x434C,      0, 0x434D, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0x434F, /* 0x20 */
-    0x434E,      0,      0,      0, 0x4350, 0x4351,      0, 0x4352, /* 0x20 */
-    0x4353, 0x4354,      0, 0x4355,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x4356,      0,      0,      0, 0x4357, /* 0x30 */
-         0,      0,      0,      0, 0x4358, 0x4359,      0,      0, /* 0x40 */
-         0,      0, 0x435A,      0, 0x435B,      0,      0,      0, /* 0x40 */
-         0,      0, 0x4349,      0,      0, 0x435C,      0, 0x435D, /* 0x50 */
-    0x435E,      0,      0, 0x435F,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0x4360,      0,      0, 0x4361, 0x4362, /* 0x60 */
-    0x4363, 0x4364, 0x4365,      0,      0, 0x4366,      0,      0, /* 0x70 */
-         0, 0x4367, 0x4368, 0x4369, 0x436A,      0,      0,      0, /* 0x70 */
-         0,      0, 0x436B,      0, 0x436C,      0, 0x436D,      0, /* 0x80 */
-    0x436E,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x436F,      0, /* 0x90 */
-    0x4370,      0, 0x4371,      0, 0x4372,      0,      0,      0, /* 0x90 */
-         0, 0x4373,      0, 0x4374,      0, 0x4375,      0,      0, /* 0xA0 */
-         0, 0x4376, 0x4377,      0,      0,      0, 0x4378,      0, /* 0xA0 */
-         0,      0, 0x4379,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x437A,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x437B,      0,      0, /* 0xC0 */
-    0x437C,      0,      0,      0, 0x437D,      0,      0, 0x437E, /* 0xC0 */
-    0x4421, 0x4422,      0, 0x4423,      0,      0, 0x4424,      0, /* 0xD0 */
-         0, 0x4425,      0,      0, 0x4426, 0x4427,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x4428,      0,      0, /* 0xE0 */
-    0x4429,      0, 0x442A, 0x442B, 0x442C, 0x442D,      0,      0, /* 0xE0 */
-    0x442E, 0x442F,      0,      0,      0, 0x4430, 0x4431,      0, /* 0xF0 */
-         0,      0,      0, 0x4432, 0x4433, 0x4434                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0x434A, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x434B, 	 0, 	 0, 	 0, 0x434C, 	 0, 0x434D, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x434F, /* 0x20 */
+    0x434E, 	 0, 	 0, 	 0, 0x4350, 0x4351, 	 0, 0x4352, /* 0x20 */
+    0x4353, 0x4354, 	 0, 0x4355, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x4356, 	 0, 	 0, 	 0, 0x4357, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x4358, 0x4359, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x435A, 	 0, 0x435B, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x4349, 	 0, 	 0, 0x435C, 	 0, 0x435D, /* 0x50 */
+    0x435E, 	 0, 	 0, 0x435F, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x4360, 	 0, 	 0, 0x4361, 0x4362, /* 0x60 */
+    0x4363, 0x4364, 0x4365, 	 0, 	 0, 0x4366, 	 0, 	 0, /* 0x70 */
+         0, 0x4367, 0x4368, 0x4369, 0x436A, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x436B, 	 0, 0x436C, 	 0, 0x436D, 	 0, /* 0x80 */
+    0x436E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x436F, 	 0, /* 0x90 */
+    0x4370, 	 0, 0x4371, 	 0, 0x4372, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x4373, 	 0, 0x4374, 	 0, 0x4375, 	 0, 	 0, /* 0xA0 */
+         0, 0x4376, 0x4377, 	 0, 	 0, 	 0, 0x4378, 	 0, /* 0xA0 */
+         0, 	 0, 0x4379, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x437A, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x437B, 	 0, 	 0, /* 0xC0 */
+    0x437C, 	 0, 	 0, 	 0, 0x437D, 	 0, 	 0, 0x437E, /* 0xC0 */
+    0x4421, 0x4422, 	 0, 0x4423, 	 0, 	 0, 0x4424, 	 0, /* 0xD0 */
+         0, 0x4425, 	 0, 	 0, 0x4426, 0x4427, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4428, 	 0, 	 0, /* 0xE0 */
+    0x4429, 	 0, 0x442A, 0x442B, 0x442C, 0x442D, 	 0, 	 0, /* 0xE0 */
+    0x442E, 0x442F, 	 0, 	 0, 	 0, 0x4430, 0x4431, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0x4432, 0x4433, 0x4434					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_69[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0x4435,      0, /* 0x00 */
-         0, 0x4436, 0x4437,      0,      0,      0,      0,      0, /* 0x00 */
-    0x4438, 0x4439,      0, 0x443A,      0,      0, 0x443B, 0x443C, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0x443D,      0, 0x443E,      0, 0x443F,      0,      0, /* 0x30 */
-    0x4440,      0,      0, 0x4441,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0x4442,      0,      0, 0x4443,      0,      0, /* 0x40 */
-         0, 0x4444,      0,      0,      0,      0, 0x4445,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0x4446, /* 0x50 */
-         0,      0,      0, 0x4447,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0x4448, 0x4449, 0x444A, 0x444B,      0, /* 0x60 */
-    0x444C, 0x444D,      0,      0, 0x444E,      0,      0,      0, /* 0x60 */
-    0x444F, 0x4450, 0x4451,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x4452, 0x4453,      0,      0,      0, 0x4454, /* 0x70 */
-    0x4455,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x4456,      0,      0, /* 0x80 */
-         0,      0, 0x4457,      0,      0,      0, 0x4458,      0, /* 0x90 */
-    0x4459,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0x445A,      0,      0,      0, 0x445B, 0x445C,      0, /* 0xA0 */
-    0x445D,      0,      0, 0x445E,      0, 0x445F,      0, 0x4460, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0x4461, /* 0xB0 */
-    0x4462,      0, 0x4463,      0, 0x4464,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x4465,      0,      0, /* 0xC0 */
-    0x4466,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x4467,      0,      0,      0,      0, 0x4468, 0x4469, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x446A,      0,      0, 0x446B,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0x446C, 0x446D, /* 0xE0 */
-         0, 0x446E,      0, 0x446F,      0, 0x4470,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0,      0, 0x4471          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0x4435, 	 0, /* 0x00 */
+         0, 0x4436, 0x4437, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0x4438, 0x4439, 	 0, 0x443A, 	 0, 	 0, 0x443B, 0x443C, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x443D, 	 0, 0x443E, 	 0, 0x443F, 	 0, 	 0, /* 0x30 */
+    0x4440, 	 0, 	 0, 0x4441, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x4442, 	 0, 	 0, 0x4443, 	 0, 	 0, /* 0x40 */
+         0, 0x4444, 	 0, 	 0, 	 0, 	 0, 0x4445, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4446, /* 0x50 */
+         0, 	 0, 	 0, 0x4447, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x4448, 0x4449, 0x444A, 0x444B, 	 0, /* 0x60 */
+    0x444C, 0x444D, 	 0, 	 0, 0x444E, 	 0, 	 0, 	 0, /* 0x60 */
+    0x444F, 0x4450, 0x4451, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x4452, 0x4453, 	 0, 	 0, 	 0, 0x4454, /* 0x70 */
+    0x4455, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4456, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x4457, 	 0, 	 0, 	 0, 0x4458, 	 0, /* 0x90 */
+    0x4459, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x445A, 	 0, 	 0, 	 0, 0x445B, 0x445C, 	 0, /* 0xA0 */
+    0x445D, 	 0, 	 0, 0x445E, 	 0, 0x445F, 	 0, 0x4460, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4461, /* 0xB0 */
+    0x4462, 	 0, 0x4463, 	 0, 0x4464, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4465, 	 0, 	 0, /* 0xC0 */
+    0x4466, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x4467, 	 0, 	 0, 	 0, 	 0, 0x4468, 0x4469, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x446A, 	 0, 	 0, 0x446B, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x446C, 0x446D, /* 0xE0 */
+         0, 0x446E, 	 0, 0x446F, 	 0, 0x4470, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4471			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_6A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x4472, 0x4473,      0, 0x4474,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0, 0x4475, /* 0x00 */
-         0, 0x4476,      0,      0,      0, 0x4477,      0,      0, /* 0x10 */
-         0,      0, 0x4478,      0,      0, 0x4479,      0,      0, /* 0x10 */
-    0x447A,      0,      0,      0, 0x447B,      0,      0,      0, /* 0x20 */
-    0x447C,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0x447D,      0, 0x447E,      0, 0x4521,      0,      0, 0x4522, /* 0x30 */
-         0,      0,      0, 0x4523,      0,      0, 0x4524, 0x4525, /* 0x30 */
-         0,      0,      0,      0,      0, 0x4526, 0x4527,      0, /* 0x40 */
-         0, 0x4528, 0x4529,      0,      0,      0, 0x452A,      0, /* 0x40 */
-    0x452B, 0x452C, 0x452D,      0,      0, 0x452E, 0x452F,      0, /* 0x50 */
-         0,      0,      0, 0x4530,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0x4531,      0,      0, 0x4532, /* 0x60 */
-         0,      0, 0x4533,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0x4534,      0, 0x4535,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x4536,      0, /* 0x70 */
-         0, 0x4537,      0, 0x4538,      0,      0, 0x4539, 0x453A, /* 0x80 */
-         0, 0x453B,      0, 0x453C,      0,      0,      0,      0, /* 0x80 */
-         0, 0x453D,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0x453E,      0, 0x453F, 0x4540, 0x4541, /* 0x90 */
-         0,      0,      0,      0,      0, 0x4542,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x4543,      0,      0,      0, 0x4544, /* 0xA0 */
-    0x4545, 0x4546,      0,      0, 0x4547,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x4548, 0x4549, 0x454A, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x454B,      0, /* 0xC0 */
-    0x454D, 0x454C,      0,      0, 0x454E,      0,      0,      0, /* 0xC0 */
-    0x454F,      0,      0,      0, 0x4550, 0x4551, 0x4552,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x4553, 0x4554,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x4555,      0,      0, 0x4556, /* 0xE0 */
-         0,      0,      0,      0, 0x4557,      0,      0,      0, /* 0xE0 */
-    0x4558, 0x4559, 0x455A,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0, 0x455B, 0x455C                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x4472, 0x4473, 	 0, 0x4474, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4475, /* 0x00 */
+         0, 0x4476, 	 0, 	 0, 	 0, 0x4477, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x4478, 	 0, 	 0, 0x4479, 	 0, 	 0, /* 0x10 */
+    0x447A, 	 0, 	 0, 	 0, 0x447B, 	 0, 	 0, 	 0, /* 0x20 */
+    0x447C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x447D, 	 0, 0x447E, 	 0, 0x4521, 	 0, 	 0, 0x4522, /* 0x30 */
+         0, 	 0, 	 0, 0x4523, 	 0, 	 0, 0x4524, 0x4525, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4526, 0x4527, 	 0, /* 0x40 */
+         0, 0x4528, 0x4529, 	 0, 	 0, 	 0, 0x452A, 	 0, /* 0x40 */
+    0x452B, 0x452C, 0x452D, 	 0, 	 0, 0x452E, 0x452F, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x4530, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x4531, 	 0, 	 0, 0x4532, /* 0x60 */
+         0, 	 0, 0x4533, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x4534, 	 0, 0x4535, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4536, 	 0, /* 0x70 */
+         0, 0x4537, 	 0, 0x4538, 	 0, 	 0, 0x4539, 0x453A, /* 0x80 */
+         0, 0x453B, 	 0, 0x453C, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x453D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x453E, 	 0, 0x453F, 0x4540, 0x4541, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4542, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x4543, 	 0, 	 0, 	 0, 0x4544, /* 0xA0 */
+    0x4545, 0x4546, 	 0, 	 0, 0x4547, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4548, 0x4549, 0x454A, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x454B, 	 0, /* 0xC0 */
+    0x454D, 0x454C, 	 0, 	 0, 0x454E, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x454F, 	 0, 	 0, 	 0, 0x4550, 0x4551, 0x4552, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x4553, 0x4554, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x4555, 	 0, 	 0, 0x4556, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x4557, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x4558, 0x4559, 0x455A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0x455B, 0x455C					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_6B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x455D, 0x455E,      0,      0, 0x455F, 0x4560, /* 0x00 */
-         0, 0x4561,      0,      0,      0,      0,      0, 0x4562, /* 0x00 */
-    0x4563, 0x4564,      0,      0,      0,      0,      0, 0x4565, /* 0x10 */
-         0,      0,      0, 0x4566,      0,      0, 0x4567,      0, /* 0x10 */
-         0,      0,      0,      0, 0x4568,      0,      0,      0, /* 0x20 */
-    0x4569,      0,      0, 0x456A, 0x456B,      0,      0, 0x456C, /* 0x20 */
-         0,      0,      0,      0,      0, 0x456D, 0x456E,      0, /* 0x30 */
-         0,      0,      0, 0x456F,      0,      0,      0, 0x4570, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0x4571,      0, /* 0x40 */
-         0,      0, 0x4572,      0,      0, 0x4573,      0,      0, /* 0x40 */
-         0,      0, 0x4574,      0,      0,      0, 0x4575,      0, /* 0x50 */
-    0x4576,      0,      0,      0,      0, 0x4577,      0,      0, /* 0x50 */
-    0x4578,      0,      0,      0,      0,      0,      0, 0x4579, /* 0x60 */
-         0,      0,      0, 0x457A,      0,      0, 0x457B,      0, /* 0x60 */
-    0x457C,      0,      0,      0,      0, 0x457D,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0x457E, 0x4621,      0, /* 0x70 */
-         0,      0, 0x4622,      0,      0, 0x4623,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0, 0x4624, /* 0x90 */
-         0,      0,      0, 0x4625,      0,      0,      0, 0x4626, /* 0x90 */
-    0x4627,      0, 0x4628, 0x4629,      0,      0,      0,      0, /* 0xA0 */
-    0x462A, 0x462B,      0,      0, 0x462C, 0x462D, 0x462E,      0, /* 0xA0 */
-    0x462F,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x4630, 0x4631,      0,      0,      0, 0x4632, 0x4633,      0, /* 0xB0 */
-         0,      0,      0, 0x4634, 0x4635,      0,      0,      0, /* 0xC0 */
-         0, 0x4636,      0,      0, 0x4637,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0x4638,      0, /* 0xD0 */
-         0,      0, 0x4639,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x463A,      0, 0x463B,      0,      0, 0x463C, 0x463D, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0x463E,      0, /* 0xE0 */
-         0, 0x463F,      0,      0,      0,      0,      0, 0x4640, /* 0xF0 */
-         0, 0x4641,      0,      0,      0,      0,      0, 0x4642  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x455D, 0x455E, 	 0, 	 0, 0x455F, 0x4560, /* 0x00 */
+         0, 0x4561, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4562, /* 0x00 */
+    0x4563, 0x4564, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4565, /* 0x10 */
+         0, 	 0, 	 0, 0x4566, 	 0, 	 0, 0x4567, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x4568, 	 0, 	 0, 	 0, /* 0x20 */
+    0x4569, 	 0, 	 0, 0x456A, 0x456B, 	 0, 	 0, 0x456C, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x456D, 0x456E, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x456F, 	 0, 	 0, 	 0, 0x4570, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4571, 	 0, /* 0x40 */
+         0, 	 0, 0x4572, 	 0, 	 0, 0x4573, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x4574, 	 0, 	 0, 	 0, 0x4575, 	 0, /* 0x50 */
+    0x4576, 	 0, 	 0, 	 0, 	 0, 0x4577, 	 0, 	 0, /* 0x50 */
+    0x4578, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4579, /* 0x60 */
+         0, 	 0, 	 0, 0x457A, 	 0, 	 0, 0x457B, 	 0, /* 0x60 */
+    0x457C, 	 0, 	 0, 	 0, 	 0, 0x457D, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x457E, 0x4621, 	 0, /* 0x70 */
+         0, 	 0, 0x4622, 	 0, 	 0, 0x4623, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4624, /* 0x90 */
+         0, 	 0, 	 0, 0x4625, 	 0, 	 0, 	 0, 0x4626, /* 0x90 */
+    0x4627, 	 0, 0x4628, 0x4629, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x462A, 0x462B, 	 0, 	 0, 0x462C, 0x462D, 0x462E, 	 0, /* 0xA0 */
+    0x462F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x4630, 0x4631, 	 0, 	 0, 	 0, 0x4632, 0x4633, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x4634, 0x4635, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x4636, 	 0, 	 0, 0x4637, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4638, 	 0, /* 0xD0 */
+         0, 	 0, 0x4639, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x463A, 	 0, 0x463B, 	 0, 	 0, 0x463C, 0x463D, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x463E, 	 0, /* 0xE0 */
+         0, 0x463F, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4640, /* 0xF0 */
+         0, 0x4641, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4642	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_6C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x4643,      0, 0x4644, 0x4645,      0,      0, /* 0x00 */
-         0, 0x4646,      0,      0,      0, 0x4647, 0x4648,      0, /* 0x00 */
-    0x4649,      0, 0x464A,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0x464B,      0,      0,      0,      0,      0, 0x464C, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x464D, 0x464E, /* 0x20 */
-    0x464F,      0,      0,      0, 0x4650,      0, 0x4651,      0, /* 0x20 */
-         0,      0,      0, 0x4652,      0, 0x4653, 0x4654,      0, /* 0x30 */
-         0,      0, 0x4655, 0x4656,      0,      0,      0, 0x4657, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x4658, 0x4659,      0, 0x465A,      0, 0x465B, /* 0x40 */
-         0,      0, 0x465C,      0, 0x465D,      0,      0,      0, /* 0x50 */
-         0, 0x465E,      0, 0x465F, 0x4660,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0x4736, /* 0x60 */
-         0,      0,      0, 0x4661,      0, 0x4662,      0, 0x4663, /* 0x60 */
-         0,      0,      0,      0, 0x4664,      0, 0x4665,      0, /* 0x70 */
-    0x4666, 0x4667,      0, 0x4668,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0x4669, 0x466A, 0x466B, /* 0x80 */
-         0, 0x466C,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0x466D, 0x466E,      0, 0x466F, /* 0x90 */
-    0x4670,      0,      0,      0, 0x4671,      0,      0, 0x4672, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x4673,      0, 0x4674,      0, 0x4675,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x4676,      0,      0,      0, 0x4677,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0x4678,      0, 0x4679, /* 0xC0 */
-    0x467A, 0x467B, 0x467C,      0, 0x467D,      0, 0x467E,      0, /* 0xD0 */
-         0,      0, 0x4721,      0, 0x4722,      0,      0,      0, /* 0xD0 */
-    0x4723,      0,      0,      0,      0,      0,      0, 0x4724, /* 0xE0 */
-         0, 0x4725,      0, 0x4726, 0x4727,      0, 0x4728,      0, /* 0xE0 */
-         0,      0, 0x4729,      0, 0x472A                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x4643, 	 0, 0x4644, 0x4645, 	 0, 	 0, /* 0x00 */
+         0, 0x4646, 	 0, 	 0, 	 0, 0x4647, 0x4648, 	 0, /* 0x00 */
+    0x4649, 	 0, 0x464A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x464B, 	 0, 	 0, 	 0, 	 0, 	 0, 0x464C, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x464D, 0x464E, /* 0x20 */
+    0x464F, 	 0, 	 0, 	 0, 0x4650, 	 0, 0x4651, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x4652, 	 0, 0x4653, 0x4654, 	 0, /* 0x30 */
+         0, 	 0, 0x4655, 0x4656, 	 0, 	 0, 	 0, 0x4657, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x4658, 0x4659, 	 0, 0x465A, 	 0, 0x465B, /* 0x40 */
+         0, 	 0, 0x465C, 	 0, 0x465D, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x465E, 	 0, 0x465F, 0x4660, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4736, /* 0x60 */
+         0, 	 0, 	 0, 0x4661, 	 0, 0x4662, 	 0, 0x4663, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x4664, 	 0, 0x4665, 	 0, /* 0x70 */
+    0x4666, 0x4667, 	 0, 0x4668, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4669, 0x466A, 0x466B, /* 0x80 */
+         0, 0x466C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x466D, 0x466E, 	 0, 0x466F, /* 0x90 */
+    0x4670, 	 0, 	 0, 	 0, 0x4671, 	 0, 	 0, 0x4672, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x4673, 	 0, 0x4674, 	 0, 0x4675, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x4676, 	 0, 	 0, 	 0, 0x4677, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4678, 	 0, 0x4679, /* 0xC0 */
+    0x467A, 0x467B, 0x467C, 	 0, 0x467D, 	 0, 0x467E, 	 0, /* 0xD0 */
+         0, 	 0, 0x4721, 	 0, 0x4722, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x4723, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4724, /* 0xE0 */
+         0, 0x4725, 	 0, 0x4726, 0x4727, 	 0, 0x4728, 	 0, /* 0xE0 */
+         0, 	 0, 0x4729, 	 0, 0x472A							/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -1390,639 +1390,639 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0212_6C[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_6D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0x472B,      0,      0, 0x472C, /* 0x00 */
-         0,      0, 0x472D,      0,      0,      0, 0x472E, 0x472F, /* 0x00 */
-         0, 0x4730,      0, 0x4731,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x4732,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x4733, 0x4734, /* 0x20 */
-    0x4735,      0,      0,      0,      0,      0, 0x4737, 0x4738, /* 0x20 */
-         0, 0x4739,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0x473A,      0,      0, 0x473B,      0,      0, 0x473C, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0x473D, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0x473E, 0x473F, /* 0x50 */
-         0, 0x4740,      0,      0,      0, 0x4741,      0, 0x4742, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0x4743, /* 0x60 */
-    0x4744,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0x4745,      0,      0,      0, /* 0x70 */
-         0,      0, 0x4746,      0,      0,      0,      0, 0x4747, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0x4748, 0x4749,      0, 0x474A,      0, 0x474B, 0x474C, /* 0x90 */
-    0x474D,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x474E,      0, 0x474F,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x4750,      0,      0, 0x4751, /* 0xB0 */
-         0, 0x4752,      0,      0,      0, 0x4753,      0, 0x4754, /* 0xB0 */
-         0,      0,      0,      0, 0x4755,      0,      0,      0, /* 0xC0 */
-    0x4756,      0, 0x4757,      0,      0,      0, 0x4758, 0x4759, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0x475A,      0, /* 0xD0 */
-         0,      0,      0, 0x475B,      0, 0x475C,      0, 0x475D, /* 0xD0 */
-    0x475E,      0, 0x475F,      0,      0, 0x4760,      0,      0, /* 0xE0 */
-         0, 0x4761,      0,      0,      0,      0,      0, 0x4762, /* 0xE0 */
-    0x4763,      0,      0,      0, 0x4764,      0, 0x4765,      0, /* 0xF0 */
-         0,      0,      0,      0, 0x4766                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0x472B, 	 0, 	 0, 0x472C, /* 0x00 */
+         0, 	 0, 0x472D, 	 0, 	 0, 	 0, 0x472E, 0x472F, /* 0x00 */
+         0, 0x4730, 	 0, 0x4731, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x4732, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4733, 0x4734, /* 0x20 */
+    0x4735, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4737, 0x4738, /* 0x20 */
+         0, 0x4739, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x473A, 	 0, 	 0, 0x473B, 	 0, 	 0, 0x473C, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x473D, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x473E, 0x473F, /* 0x50 */
+         0, 0x4740, 	 0, 	 0, 	 0, 0x4741, 	 0, 0x4742, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4743, /* 0x60 */
+    0x4744, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0x4745, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x4746, 	 0, 	 0, 	 0, 	 0, 0x4747, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x4748, 0x4749, 	 0, 0x474A, 	 0, 0x474B, 0x474C, /* 0x90 */
+    0x474D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x474E, 	 0, 0x474F, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x4750, 	 0, 	 0, 0x4751, /* 0xB0 */
+         0, 0x4752, 	 0, 	 0, 	 0, 0x4753, 	 0, 0x4754, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x4755, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x4756, 	 0, 0x4757, 	 0, 	 0, 	 0, 0x4758, 0x4759, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x475A, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x475B, 	 0, 0x475C, 	 0, 0x475D, /* 0xD0 */
+    0x475E, 	 0, 0x475F, 	 0, 	 0, 0x4760, 	 0, 	 0, /* 0xE0 */
+         0, 0x4761, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4762, /* 0xE0 */
+    0x4763, 	 0, 	 0, 	 0, 0x4764, 	 0, 0x4765, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0x4766							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_6E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x4767,      0,      0,      0, 0x4768,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x4769,      0, /* 0x10 */
-         0,      0, 0x476A,      0,      0,      0,      0, 0x476B, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x476C,      0,      0,      0, 0x476D,      0, /* 0x30 */
-         0, 0x476E,      0, 0x476F, 0x4770,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0x4771, 0x4772,      0,      0, /* 0x40 */
-    0x4773, 0x4774,      0, 0x4775,      0,      0,      0, 0x4776, /* 0x40 */
-         0, 0x4777, 0x4778, 0x4779, 0x477A,      0,      0, 0x477B, /* 0x50 */
-         0,      0,      0,      0, 0x477C, 0x477D, 0x477E,      0, /* 0x50 */
-         0,      0, 0x4821, 0x4822,      0,      0,      0,      0, /* 0x60 */
-    0x4823,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0x4824,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0x4825,      0, 0x4826,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x4827,      0,      0, /* 0x80 */
-         0,      0,      0, 0x4828,      0,      0,      0,      0, /* 0x90 */
-         0, 0x4829,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x482A,      0,      0,      0,      0,      0,      0, 0x482B, /* 0xA0 */
-         0,      0,      0,      0,      0, 0x482C, 0x482D,      0, /* 0xA0 */
-         0, 0x482E,      0, 0x482F,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x4830,      0,      0,      0, 0x4831, /* 0xB0 */
-    0x4832, 0x4833,      0, 0x4834,      0,      0,      0, 0x4835, /* 0xC0 */
-    0x4836,      0, 0x4837,      0,      0, 0x4838, 0x4839, 0x483A, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x483B,      0, 0x483C, 0x483D,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0x483E,      0, 0x483F,      0, 0x4840                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x4767, 	 0, 	 0, 	 0, 0x4768, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4769, 	 0, /* 0x10 */
+         0, 	 0, 0x476A, 	 0, 	 0, 	 0, 	 0, 0x476B, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x476C, 	 0, 	 0, 	 0, 0x476D, 	 0, /* 0x30 */
+         0, 0x476E, 	 0, 0x476F, 0x4770, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x4771, 0x4772, 	 0, 	 0, /* 0x40 */
+    0x4773, 0x4774, 	 0, 0x4775, 	 0, 	 0, 	 0, 0x4776, /* 0x40 */
+         0, 0x4777, 0x4778, 0x4779, 0x477A, 	 0, 	 0, 0x477B, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x477C, 0x477D, 0x477E, 	 0, /* 0x50 */
+         0, 	 0, 0x4821, 0x4822, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x4823, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x4824, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x4825, 	 0, 0x4826, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4827, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x4828, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x4829, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x482A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x482B, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x482C, 0x482D, 	 0, /* 0xA0 */
+         0, 0x482E, 	 0, 0x482F, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x4830, 	 0, 	 0, 	 0, 0x4831, /* 0xB0 */
+    0x4832, 0x4833, 	 0, 0x4834, 	 0, 	 0, 	 0, 0x4835, /* 0xC0 */
+    0x4836, 	 0, 0x4837, 	 0, 	 0, 0x4838, 0x4839, 0x483A, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x483B, 	 0, 0x483C, 0x483D, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0x483E, 	 0, 0x483F, 	 0, 0x4840					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_6F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0x4841,      0,      0,      0, /* 0x00 */
-    0x4842,      0, 0x4843,      0, 0x4844, 0x4845,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0x4846,      0, /* 0x10 */
-    0x4847,      0, 0x4848, 0x4849,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x484A,      0, /* 0x20 */
-         0, 0x484B, 0x484C,      0,      0, 0x4853,      0, 0x484D, /* 0x20 */
-    0x484E,      0,      0, 0x484F,      0,      0, 0x4850,      0, /* 0x30 */
-         0,      0,      0, 0x4851, 0x4852,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0x4854, /* 0x40 */
-         0, 0x4855, 0x4856, 0x4857,      0,      0,      0, 0x4858, /* 0x50 */
-         0, 0x4859, 0x485A,      0,      0, 0x485B, 0x485C,      0, /* 0x50 */
-         0, 0x485D, 0x485E,      0,      0,      0,      0,      0, /* 0x60 */
-    0x485F,      0,      0,      0, 0x4860,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0x4861, 0x4862,      0, /* 0x70 */
-         0,      0,      0, 0x4863,      0,      0,      0, 0x4864, /* 0x80 */
-    0x4865,      0,      0, 0x4866, 0x4867, 0x4868,      0,      0, /* 0x80 */
-    0x4869,      0, 0x486A, 0x486B, 0x486C,      0, 0x486D,      0, /* 0x90 */
-         0,      0, 0x486E,      0,      0,      0,      0, 0x486F, /* 0x90 */
-    0x4870,      0,      0,      0,      0, 0x4871, 0x4872, 0x4873, /* 0xA0 */
-    0x4874,      0,      0,      0,      0,      0, 0x4875, 0x4876, /* 0xA0 */
-    0x4877,      0,      0,      0,      0, 0x4878, 0x4879,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x487A,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x487B,      0, 0x487C, /* 0xC0 */
-    0x487D,      0, 0x487E,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x4921,      0,      0,      0, 0x4922,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x4923, 0x4924,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x4925,      0,      0,      0,      0, 0x4926,      0,      0, /* 0xF0 */
-         0, 0x4927,      0,      0, 0x4928, 0x4929                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0x4841, 	 0, 	 0, 	 0, /* 0x00 */
+    0x4842, 	 0, 0x4843, 	 0, 0x4844, 0x4845, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4846, 	 0, /* 0x10 */
+    0x4847, 	 0, 0x4848, 0x4849, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x484A, 	 0, /* 0x20 */
+         0, 0x484B, 0x484C, 	 0, 	 0, 0x4853, 	 0, 0x484D, /* 0x20 */
+    0x484E, 	 0, 	 0, 0x484F, 	 0, 	 0, 0x4850, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x4851, 0x4852, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4854, /* 0x40 */
+         0, 0x4855, 0x4856, 0x4857, 	 0, 	 0, 	 0, 0x4858, /* 0x50 */
+         0, 0x4859, 0x485A, 	 0, 	 0, 0x485B, 0x485C, 	 0, /* 0x50 */
+         0, 0x485D, 0x485E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x485F, 	 0, 	 0, 	 0, 0x4860, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4861, 0x4862, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x4863, 	 0, 	 0, 	 0, 0x4864, /* 0x80 */
+    0x4865, 	 0, 	 0, 0x4866, 0x4867, 0x4868, 	 0, 	 0, /* 0x80 */
+    0x4869, 	 0, 0x486A, 0x486B, 0x486C, 	 0, 0x486D, 	 0, /* 0x90 */
+         0, 	 0, 0x486E, 	 0, 	 0, 	 0, 	 0, 0x486F, /* 0x90 */
+    0x4870, 	 0, 	 0, 	 0, 	 0, 0x4871, 0x4872, 0x4873, /* 0xA0 */
+    0x4874, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4875, 0x4876, /* 0xA0 */
+    0x4877, 	 0, 	 0, 	 0, 	 0, 0x4878, 0x4879, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x487A, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x487B, 	 0, 0x487C, /* 0xC0 */
+    0x487D, 	 0, 0x487E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x4921, 	 0, 	 0, 	 0, 0x4922, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x4923, 0x4924, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x4925, 	 0, 	 0, 	 0, 	 0, 0x4926, 	 0, 	 0, /* 0xF0 */
+         0, 0x4927, 	 0, 	 0, 0x4928, 0x4929					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_70[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x492A,      0,      0,      0,      0, 0x492B, 0x492C, 0x492D, /* 0x00 */
-         0,      0,      0,      0,      0, 0x492E,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0, 0x492F, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0x4930,      0,      0, 0x4931,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0x4932, /* 0x20 */
-         0,      0,      0,      0, 0x4933,      0,      0, 0x4934, /* 0x30 */
-         0, 0x4935,      0,      0, 0x4936,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x4937, 0x4938,      0,      0,      0, /* 0x40 */
-    0x4939, 0x493A, 0x493B, 0x493C,      0,      0, 0x4941,      0, /* 0x40 */
-         0,      0,      0,      0, 0x493D, 0x493E,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0x493F, 0x4940,      0, /* 0x50 */
-         0,      0,      0,      0, 0x4942, 0x4943,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0x4944,      0, 0x4945,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0x4946, 0x4947,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x4948,      0, /* 0x70 */
-         0, 0x4949,      0,      0,      0, 0x494A, 0x494B,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0x494C, 0x494D, 0x494E, 0x494F, /* 0x90 */
-    0x4950,      0,      0, 0x4951,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0x4952,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x4953,      0,      0,      0,      0, /* 0xA0 */
-    0x4954, 0x4955,      0,      0, 0x4956,      0,      0, 0x4957, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x4958,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x4959,      0, 0x495A, 0x495B, 0x495C, 0x495D,      0, /* 0xD0 */
-    0x495E,      0,      0,      0, 0x495F,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x4960,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x4961                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x492A, 	 0, 	 0, 	 0, 	 0, 0x492B, 0x492C, 0x492D, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x492E, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x492F, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x4930, 	 0, 	 0, 0x4931, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4932, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x4933, 	 0, 	 0, 0x4934, /* 0x30 */
+         0, 0x4935, 	 0, 	 0, 0x4936, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x4937, 0x4938, 	 0, 	 0, 	 0, /* 0x40 */
+    0x4939, 0x493A, 0x493B, 0x493C, 	 0, 	 0, 0x4941, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x493D, 0x493E, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x493F, 0x4940, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x4942, 0x4943, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x4944, 	 0, 0x4945, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4946, 0x4947, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4948, 	 0, /* 0x70 */
+         0, 0x4949, 	 0, 	 0, 	 0, 0x494A, 0x494B, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x494C, 0x494D, 0x494E, 0x494F, /* 0x90 */
+    0x4950, 	 0, 	 0, 0x4951, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x4952, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x4953, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x4954, 0x4955, 	 0, 	 0, 0x4956, 	 0, 	 0, 0x4957, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x4958, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x4959, 	 0, 0x495A, 0x495B, 0x495C, 0x495D, 	 0, /* 0xD0 */
+    0x495E, 	 0, 	 0, 	 0, 0x495F, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x4960, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x4961											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_71[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                             0x4962, 0x4963, 0x4964, 0x4965, 0x4966, /* 0x00 */
-         0,      0,      0, 0x4967, 0x4968,      0,      0, 0x4969, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x496A,      0, /* 0x10 */
-    0x496B,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0x496C,      0, 0x496D,      0, 0x496E, /* 0x20 */
-    0x496F, 0x4970,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0x4971,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0x4972,      0,      0,      0, 0x4973, 0x4974, 0x4975, /* 0x40 */
-         0,      0, 0x4976, 0x4977,      0,      0,      0,      0, /* 0x40 */
-    0x4978,      0, 0x4979,      0,      0,      0,      0, 0x497A, /* 0x50 */
-         0,      0, 0x497B,      0, 0x497C,      0, 0x497D,      0, /* 0x50 */
-    0x497E,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0x4A21,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x4A22,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0x4A23,      0,      0,      0,      0, 0x4A24,      0, 0x4A25, /* 0x80 */
-         0,      0,      0,      0, 0x4A26,      0,      0,      0, /* 0x80 */
-         0,      0, 0x4A27,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0x4A28, 0x4A29,      0,      0,      0,      0, /* 0x90 */
-    0x4A2A,      0, 0x4A2B,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0x4A2C, /* 0xA0 */
-    0x4A2D,      0, 0x4A2E, 0x4A2F,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x4A30,      0,      0,      0,      0, 0x4A31, /* 0xB0 */
-    0x4A32, 0x4A33,      0,      0, 0x4A34,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0x4A35, 0x4A36,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0x4A37,      0,      0, 0x4A38,      0, /* 0xD0 */
-         0, 0x4A39, 0x4A3A,      0, 0x4A3B,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0x4A3C,      0,      0,      0,      0,      0, 0x4A3D          /* 0xF0 */
+         0, 	 0, 	 0, 0x4967, 0x4968, 	 0, 	 0, 0x4969, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x496A, 	 0, /* 0x10 */
+    0x496B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x496C, 	 0, 0x496D, 	 0, 0x496E, /* 0x20 */
+    0x496F, 0x4970, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x4971, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x4972, 	 0, 	 0, 	 0, 0x4973, 0x4974, 0x4975, /* 0x40 */
+         0, 	 0, 0x4976, 0x4977, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0x4978, 	 0, 0x4979, 	 0, 	 0, 	 0, 	 0, 0x497A, /* 0x50 */
+         0, 	 0, 0x497B, 	 0, 0x497C, 	 0, 0x497D, 	 0, /* 0x50 */
+    0x497E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x4A21, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x4A22, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x4A23, 	 0, 	 0, 	 0, 	 0, 0x4A24, 	 0, 0x4A25, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x4A26, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x4A27, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x4A28, 0x4A29, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x4A2A, 	 0, 0x4A2B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4A2C, /* 0xA0 */
+    0x4A2D, 	 0, 0x4A2E, 0x4A2F, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x4A30, 	 0, 	 0, 	 0, 	 0, 0x4A31, /* 0xB0 */
+    0x4A32, 0x4A33, 	 0, 	 0, 0x4A34, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x4A35, 0x4A36, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x4A37, 	 0, 	 0, 0x4A38, 	 0, /* 0xD0 */
+         0, 0x4A39, 0x4A3A, 	 0, 0x4A3B, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x4A3C, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4A3D			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_72[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x4A3E,      0,      0,      0,      0,      0,      0, 0x4A3F, /* 0x00 */
-    0x4A40, 0x4A41,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0x4A42,      0,      0,      0, 0x4A43, /* 0x10 */
-         0,      0, 0x4A44,      0,      0, 0x4A45,      0, 0x4A46, /* 0x10 */
-         0,      0,      0,      0, 0x4A47,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0x4A48,      0,      0,      0, 0x4A49, /* 0x20 */
-         0,      0,      0,      0, 0x4A4A,      0,      0,      0, /* 0x30 */
-    0x4A4B, 0x4A4C,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0x4A4D, 0x4A4E, 0x4A4F,      0, 0x4A50,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0x4A51, 0x4A52, /* 0x40 */
-    0x4A53,      0,      0, 0x4A54,      0, 0x4A55, 0x4A56,      0, /* 0x50 */
-         0,      0, 0x4A57,      0, 0x4A58,      0, 0x4A59,      0, /* 0x50 */
-    0x4A5A,      0,      0, 0x4A5B,      0,      0,      0,      0, /* 0x60 */
-    0x4A5C,      0,      0, 0x4A5D,      0,      0, 0x4A5E, 0x4A5F, /* 0x60 */
-         0, 0x4A60,      0,      0,      0,      0,      0, 0x4A61, /* 0x70 */
-    0x4A62,      0,      0, 0x4A63, 0x4A64,      0,      0, 0x4A65, /* 0x70 */
-         0,      0,      0,      0, 0x4A66,      0,      0,      0, /* 0x80 */
-         0, 0x4A67,      0,      0,      0, 0x4A68, 0x4A69,      0, /* 0x80 */
-         0,      0,      0, 0x4A6A,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0x4A6B,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x4A6C,      0,      0,      0,      0, 0x4A6D, 0x4A6E,      0, /* 0xA0 */
-         0, 0x4A6F,      0,      0, 0x4A70,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x4A71,      0, /* 0xB0 */
-         0, 0x4A72,      0,      0,      0,      0,      0, 0x4A73, /* 0xC0 */
-         0, 0x4A74,      0,      0, 0x4A75,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0x4A76, 0x4A77,      0, /* 0xD0 */
-    0x4A78,      0,      0,      0,      0,      0,      0, 0x4A79, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x4A7A,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x4A7B, 0x4A7C,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x4A7D, 0x4A7E,      0,      0, 0x4B21          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x4A3E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4A3F, /* 0x00 */
+    0x4A40, 0x4A41, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x4A42, 	 0, 	 0, 	 0, 0x4A43, /* 0x10 */
+         0, 	 0, 0x4A44, 	 0, 	 0, 0x4A45, 	 0, 0x4A46, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x4A47, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x4A48, 	 0, 	 0, 	 0, 0x4A49, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x4A4A, 	 0, 	 0, 	 0, /* 0x30 */
+    0x4A4B, 0x4A4C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x4A4D, 0x4A4E, 0x4A4F, 	 0, 0x4A50, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4A51, 0x4A52, /* 0x40 */
+    0x4A53, 	 0, 	 0, 0x4A54, 	 0, 0x4A55, 0x4A56, 	 0, /* 0x50 */
+         0, 	 0, 0x4A57, 	 0, 0x4A58, 	 0, 0x4A59, 	 0, /* 0x50 */
+    0x4A5A, 	 0, 	 0, 0x4A5B, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x4A5C, 	 0, 	 0, 0x4A5D, 	 0, 	 0, 0x4A5E, 0x4A5F, /* 0x60 */
+         0, 0x4A60, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4A61, /* 0x70 */
+    0x4A62, 	 0, 	 0, 0x4A63, 0x4A64, 	 0, 	 0, 0x4A65, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0x4A66, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x4A67, 	 0, 	 0, 	 0, 0x4A68, 0x4A69, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x4A6A, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x4A6B, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x4A6C, 	 0, 	 0, 	 0, 	 0, 0x4A6D, 0x4A6E, 	 0, /* 0xA0 */
+         0, 0x4A6F, 	 0, 	 0, 0x4A70, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4A71, 	 0, /* 0xB0 */
+         0, 0x4A72, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4A73, /* 0xC0 */
+         0, 0x4A74, 	 0, 	 0, 0x4A75, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4A76, 0x4A77, 	 0, /* 0xD0 */
+    0x4A78, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4A79, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4A7A, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x4A7B, 0x4A7C, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x4A7D, 0x4A7E, 	 0, 	 0, 0x4B21			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_73[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x4B22,      0, 0x4B23, 0x4B24,      0, 0x4B25, /* 0x00 */
-         0,      0,      0, 0x4B26,      0, 0x4B27,      0,      0, /* 0x00 */
-         0,      0, 0x4B28, 0x4B29,      0,      0,      0,      0, /* 0x10 */
-    0x4B2A, 0x4B2B,      0,      0,      0,      0, 0x4B2C,      0, /* 0x10 */
-         0,      0, 0x4B2D,      0, 0x4B2E,      0,      0, 0x4B2F, /* 0x20 */
-    0x4B30,      0,      0,      0, 0x4B31,      0,      0,      0, /* 0x20 */
-         0, 0x4B32, 0x4B33,      0,      0, 0x4B34,      0,      0, /* 0x30 */
-         0,      0, 0x4B35, 0x4B36,      0, 0x4B37,      0,      0, /* 0x30 */
-         0,      0,      0, 0x4B38,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0x4B39,      0,      0, /* 0x40 */
-    0x4B3A,      0, 0x4B3B,      0,      0,      0, 0x4B3C,      0, /* 0x50 */
-    0x4B3D,      0,      0,      0,      0, 0x4B3E, 0x4B3F, 0x4B40, /* 0x50 */
-    0x4B41,      0,      0,      0,      0,      0, 0x4B42, 0x4B43, /* 0x60 */
-         0, 0x4B44,      0, 0x4B45, 0x4B46,      0, 0x4B47, 0x4B48, /* 0x60 */
-         0, 0x4B49,      0,      0,      0,      0,      0, 0x4B4A, /* 0x70 */
-         0, 0x4B4B,      0,      0, 0x4B4C,      0,      0,      0, /* 0x70 */
-    0x4B4D, 0x4B4E,      0, 0x4B4F,      0, 0x4B50, 0x4B51,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x4B52,      0, /* 0x80 */
-    0x4B53,      0,      0, 0x4B54,      0, 0x4B55,      0, 0x4B56, /* 0x90 */
-    0x4B57,      0,      0,      0, 0x4B58,      0, 0x4B59, 0x4B5A, /* 0x90 */
-    0x4B5B,      0, 0x4B5C,      0,      0, 0x4B5D, 0x4B5E,      0, /* 0xA0 */
-         0,      0, 0x4B5F, 0x4B60,      0, 0x4B61,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0x4B62,      0, 0x4B63, /* 0xB0 */
-         0, 0x4B64,      0,      0, 0x4B65, 0x4B66,      0, 0x4B67, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x4B68, 0x4B69,      0, /* 0xC0 */
-         0, 0x4B6A,      0, 0x4B6B, 0x4B6C,      0,      0, 0x4B6D, /* 0xC0 */
-         0,      0, 0x4B6E, 0x4B6F,      0,      0, 0x4B70,      0, /* 0xD0 */
-         0, 0x4B71,      0,      0,      0, 0x4B72,      0,      0, /* 0xD0 */
-         0, 0x4B73,      0, 0x4B74,      0,      0, 0x4B75, 0x4B76, /* 0xE0 */
-         0, 0x4B77,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0x4B78, 0x4B79,      0, 0x4B7A, /* 0xF0 */
-         0, 0x4B7B, 0x4B7C, 0x4B7D,      0, 0x4B7E,      0, 0x4C21  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x4B22, 	 0, 0x4B23, 0x4B24, 	 0, 0x4B25, /* 0x00 */
+         0, 	 0, 	 0, 0x4B26, 	 0, 0x4B27, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x4B28, 0x4B29, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x4B2A, 0x4B2B, 	 0, 	 0, 	 0, 	 0, 0x4B2C, 	 0, /* 0x10 */
+         0, 	 0, 0x4B2D, 	 0, 0x4B2E, 	 0, 	 0, 0x4B2F, /* 0x20 */
+    0x4B30, 	 0, 	 0, 	 0, 0x4B31, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x4B32, 0x4B33, 	 0, 	 0, 0x4B34, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x4B35, 0x4B36, 	 0, 0x4B37, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x4B38, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4B39, 	 0, 	 0, /* 0x40 */
+    0x4B3A, 	 0, 0x4B3B, 	 0, 	 0, 	 0, 0x4B3C, 	 0, /* 0x50 */
+    0x4B3D, 	 0, 	 0, 	 0, 	 0, 0x4B3E, 0x4B3F, 0x4B40, /* 0x50 */
+    0x4B41, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4B42, 0x4B43, /* 0x60 */
+         0, 0x4B44, 	 0, 0x4B45, 0x4B46, 	 0, 0x4B47, 0x4B48, /* 0x60 */
+         0, 0x4B49, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4B4A, /* 0x70 */
+         0, 0x4B4B, 	 0, 	 0, 0x4B4C, 	 0, 	 0, 	 0, /* 0x70 */
+    0x4B4D, 0x4B4E, 	 0, 0x4B4F, 	 0, 0x4B50, 0x4B51, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4B52, 	 0, /* 0x80 */
+    0x4B53, 	 0, 	 0, 0x4B54, 	 0, 0x4B55, 	 0, 0x4B56, /* 0x90 */
+    0x4B57, 	 0, 	 0, 	 0, 0x4B58, 	 0, 0x4B59, 0x4B5A, /* 0x90 */
+    0x4B5B, 	 0, 0x4B5C, 	 0, 	 0, 0x4B5D, 0x4B5E, 	 0, /* 0xA0 */
+         0, 	 0, 0x4B5F, 0x4B60, 	 0, 0x4B61, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4B62, 	 0, 0x4B63, /* 0xB0 */
+         0, 0x4B64, 	 0, 	 0, 0x4B65, 0x4B66, 	 0, 0x4B67, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4B68, 0x4B69, 	 0, /* 0xC0 */
+         0, 0x4B6A, 	 0, 0x4B6B, 0x4B6C, 	 0, 	 0, 0x4B6D, /* 0xC0 */
+         0, 	 0, 0x4B6E, 0x4B6F, 	 0, 	 0, 0x4B70, 	 0, /* 0xD0 */
+         0, 0x4B71, 	 0, 	 0, 	 0, 0x4B72, 	 0, 	 0, /* 0xD0 */
+         0, 0x4B73, 	 0, 0x4B74, 	 0, 	 0, 0x4B75, 0x4B76, /* 0xE0 */
+         0, 0x4B77, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x4B78, 0x4B79, 	 0, 0x4B7A, /* 0xF0 */
+         0, 0x4B7B, 0x4B7C, 0x4B7D, 	 0, 0x4B7E, 	 0, 0x4C21	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_74[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x4C22, 0x4C23,      0,      0, 0x4C24,      0,      0, 0x4C25, /* 0x00 */
-         0,      0, 0x4C26,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0x4C27,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x4C28, 0x4C29,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0x4C2A,      0, 0x4C2B,      0, /* 0x20 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x4C22, 0x4C23, 	 0, 	 0, 0x4C24, 	 0, 	 0, 0x4C25, /* 0x00 */
+         0, 	 0, 0x4C26, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x4C27, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x4C28, 0x4C29, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x4C2A, 	 0, 0x4C2B, 	 0, /* 0x20 */
     0x4C2C, 0x4C2D, 0x4C2E, 0x4C2F, 0x4C30, 0x4C31, 0x4C32, 0x4C33, /* 0x20 */
-    0x4C34, 0x4C35,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0x4C36,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0x4C37,      0,      0, 0x4C38, 0x4C39,      0, 0x4C3A, 0x4C3B, /* 0x40 */
-         0,      0,      0, 0x4C3C,      0, 0x4C3D,      0,      0, /* 0x40 */
-         0, 0x4C3E, 0x4C3F,      0,      0,      0,      0, 0x4C40, /* 0x50 */
-         0,      0,      0,      0,      0, 0x4C41,      0,      0, /* 0x50 */
-         0,      0, 0x4C42,      0,      0,      0, 0x4C43, 0x4C44, /* 0x60 */
-    0x4C45,      0,      0, 0x4C46,      0, 0x4C47, 0x4C48,      0, /* 0x60 */
-         0, 0x4C49, 0x4C4A,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0x4C4B, 0x4C4C,      0,      0,      0, 0x4C4D, 0x4C4E, 0x4C4F, /* 0x80 */
-         0, 0x4C50,      0,      0,      0,      0,      0, 0x4C51, /* 0x80 */
-    0x4C52, 0x4C53, 0x4C54,      0,      0,      0,      0,      0, /* 0x90 */
-    0x4C55, 0x4C56, 0x4C57,      0, 0x4C58,      0,      0, 0x4C59, /* 0x90 */
-    0x4C5A, 0x4C5B,      0, 0x4C5C,      0,      0, 0x4C5D,      0, /* 0xA0 */
-    0x4C5E, 0x4C5F, 0x4C60, 0x4C61,      0,      0, 0x4C62, 0x4C63, /* 0xA0 */
-         0, 0x4C64, 0x4C65,      0,      0, 0x4C66,      0,      0, /* 0xB0 */
-         0, 0x4C67,      0, 0x4C68,      0,      0,      0, 0x4C69, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0x4C6A, 0x4C6B,      0,      0, 0x4C6C,      0,      0,      0, /* 0xC0 */
-    0x4C6D,      0,      0, 0x4C6E,      0,      0,      0,      0, /* 0xD0 */
-    0x4C6F,      0, 0x4C70, 0x4C71,      0,      0, 0x4C72, 0x4C73, /* 0xD0 */
-         0,      0,      0,      0, 0x4C74,      0,      0,      0, /* 0xE0 */
-    0x4C75,      0, 0x4C76, 0x4C77,      0,      0,      0, 0x4C78, /* 0xE0 */
-         0,      0,      0,      0, 0x4C79,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x4C7A, 0x4C7B, 0x4C7C,      0,      0, 0x4C7D  /* 0xF0 */
+    0x4C34, 0x4C35, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x4C36, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x4C37, 	 0, 	 0, 0x4C38, 0x4C39, 	 0, 0x4C3A, 0x4C3B, /* 0x40 */
+         0, 	 0, 	 0, 0x4C3C, 	 0, 0x4C3D, 	 0, 	 0, /* 0x40 */
+         0, 0x4C3E, 0x4C3F, 	 0, 	 0, 	 0, 	 0, 0x4C40, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4C41, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x4C42, 	 0, 	 0, 	 0, 0x4C43, 0x4C44, /* 0x60 */
+    0x4C45, 	 0, 	 0, 0x4C46, 	 0, 0x4C47, 0x4C48, 	 0, /* 0x60 */
+         0, 0x4C49, 0x4C4A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x4C4B, 0x4C4C, 	 0, 	 0, 	 0, 0x4C4D, 0x4C4E, 0x4C4F, /* 0x80 */
+         0, 0x4C50, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4C51, /* 0x80 */
+    0x4C52, 0x4C53, 0x4C54, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x4C55, 0x4C56, 0x4C57, 	 0, 0x4C58, 	 0, 	 0, 0x4C59, /* 0x90 */
+    0x4C5A, 0x4C5B, 	 0, 0x4C5C, 	 0, 	 0, 0x4C5D, 	 0, /* 0xA0 */
+    0x4C5E, 0x4C5F, 0x4C60, 0x4C61, 	 0, 	 0, 0x4C62, 0x4C63, /* 0xA0 */
+         0, 0x4C64, 0x4C65, 	 0, 	 0, 0x4C66, 	 0, 	 0, /* 0xB0 */
+         0, 0x4C67, 	 0, 0x4C68, 	 0, 	 0, 	 0, 0x4C69, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x4C6A, 0x4C6B, 	 0, 	 0, 0x4C6C, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x4C6D, 	 0, 	 0, 0x4C6E, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x4C6F, 	 0, 0x4C70, 0x4C71, 	 0, 	 0, 0x4C72, 0x4C73, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x4C74, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x4C75, 	 0, 0x4C76, 0x4C77, 	 0, 	 0, 	 0, 0x4C78, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x4C79, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x4C7A, 0x4C7B, 0x4C7C, 	 0, 	 0, 0x4C7D	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_75[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0x4C7E,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0x4D21,      0,      0,      0, 0x4D22, 0x4D23, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0x4D24, 0x4D25,      0,      0, 0x4D26,      0,      0, 0x4D27, /* 0x20 */
-         0, 0x4D28, 0x4D29,      0,      0,      0,      0, 0x4D2A, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x4D2B,      0, /* 0x30 */
-         0, 0x4D2C,      0,      0,      0, 0x4D2D, 0x4D2E, 0x4D2F, /* 0x30 */
-    0x4D30,      0,      0, 0x4D31,      0,      0,      0, 0x4D32, /* 0x40 */
-    0x4D33,      0,      0,      0,      0,      0, 0x4D34,      0, /* 0x40 */
-    0x4D35,      0, 0x4D36,      0,      0,      0,      0, 0x4D37, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0x4D38, 0x4D39, /* 0x50 */
-         0, 0x4D3A,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0x4D3B, /* 0x60 */
-         0, 0x4D3C,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x4D3D, 0x4D3E, 0x4D3F, 0x4D40, 0x4D41, 0x4D42,      0, /* 0x70 */
-         0, 0x4D43,      0,      0,      0, 0x4D44,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0x4D45,      0, 0x4D46, 0x4D47,      0, 0x4D48,      0,      0, /* 0x90 */
-         0, 0x4D49,      0,      0, 0x4D4A,      0,      0,      0, /* 0x90 */
-         0,      0, 0x4D4B,      0, 0x4D4C,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x4D4D,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x4D4E,      0,      0,      0,      0, 0x4D4F, /* 0xB0 */
-    0x4D50, 0x4D51,      0,      0, 0x4D52,      0, 0x4D53,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x4D54,      0, 0x4D55, 0x4D56, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0x4D57, /* 0xD0 */
-         0,      0,      0,      0, 0x4D58,      0,      0, 0x4D59, /* 0xD0 */
-    0x4D5A, 0x4D5B,      0,      0, 0x4D5C,      0,      0, 0x4D5D, /* 0xE0 */
-         0,      0,      0,      0, 0x4D5E,      0, 0x4D5F, 0x4D60, /* 0xE0 */
-         0, 0x4D61,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0x4D62                                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0x4C7E, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x4D21, 	 0, 	 0, 	 0, 0x4D22, 0x4D23, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x4D24, 0x4D25, 	 0, 	 0, 0x4D26, 	 0, 	 0, 0x4D27, /* 0x20 */
+         0, 0x4D28, 0x4D29, 	 0, 	 0, 	 0, 	 0, 0x4D2A, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4D2B, 	 0, /* 0x30 */
+         0, 0x4D2C, 	 0, 	 0, 	 0, 0x4D2D, 0x4D2E, 0x4D2F, /* 0x30 */
+    0x4D30, 	 0, 	 0, 0x4D31, 	 0, 	 0, 	 0, 0x4D32, /* 0x40 */
+    0x4D33, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4D34, 	 0, /* 0x40 */
+    0x4D35, 	 0, 0x4D36, 	 0, 	 0, 	 0, 	 0, 0x4D37, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4D38, 0x4D39, /* 0x50 */
+         0, 0x4D3A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4D3B, /* 0x60 */
+         0, 0x4D3C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x4D3D, 0x4D3E, 0x4D3F, 0x4D40, 0x4D41, 0x4D42, 	 0, /* 0x70 */
+         0, 0x4D43, 	 0, 	 0, 	 0, 0x4D44, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x4D45, 	 0, 0x4D46, 0x4D47, 	 0, 0x4D48, 	 0, 	 0, /* 0x90 */
+         0, 0x4D49, 	 0, 	 0, 0x4D4A, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x4D4B, 	 0, 0x4D4C, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x4D4D, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x4D4E, 	 0, 	 0, 	 0, 	 0, 0x4D4F, /* 0xB0 */
+    0x4D50, 0x4D51, 	 0, 	 0, 0x4D52, 	 0, 0x4D53, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x4D54, 	 0, 0x4D55, 0x4D56, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4D57, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x4D58, 	 0, 	 0, 0x4D59, /* 0xD0 */
+    0x4D5A, 0x4D5B, 	 0, 	 0, 0x4D5C, 	 0, 	 0, 0x4D5D, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x4D5E, 	 0, 0x4D5F, 0x4D60, /* 0xE0 */
+         0, 0x4D61, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0x4D62													/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_76[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x4D63,      0, 0x4D64, 0x4D65, 0x4D66,      0,      0, 0x4D67, /* 0x00 */
-    0x4D68,      0, 0x4D69,      0, 0x4D6A,      0,      0, 0x4D6B, /* 0x00 */
-         0,      0, 0x4D6C, 0x4D6D,      0, 0x4D6E, 0x4D6F,      0, /* 0x10 */
-         0, 0x4D70,      0, 0x4D71, 0x4D72, 0x4D73, 0x4D74,      0, /* 0x10 */
-         0,      0,      0, 0x4D75,      0, 0x4D76, 0x4D77,      0, /* 0x20 */
-         0, 0x4D78,      0,      0,      0, 0x4D79,      0,      0, /* 0x20 */
-         0,      0, 0x4D7A, 0x4D7B,      0, 0x4D7C,      0,      0, /* 0x30 */
-    0x4D7D, 0x4D7E, 0x4E21,      0, 0x4E22,      0,      0,      0, /* 0x30 */
-    0x4E24, 0x4E25,      0, 0x4E26, 0x4E27, 0x4E28,      0,      0, /* 0x40 */
-         0, 0x4E29, 0x4E23, 0x4E2A,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0x4E2B,      0,      0, /* 0x50 */
-         0, 0x4E2C,      0,      0,      0,      0,      0, 0x4E2D, /* 0x50 */
-         0,      0,      0,      0, 0x4E2E, 0x4E2F,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0x4E30, 0x4E31, 0x4E32, /* 0x60 */
-         0, 0x4E33,      0,      0, 0x4E34,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x4E35,      0,      0,      0, 0x4E36,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0x4E37, 0x4E38,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x4E39,      0,      0, /* 0x90 */
-         0,      0,      0, 0x4E3A, 0x4E3B, 0x4E3C,      0, 0x4E3D, /* 0x90 */
-    0x4E3E,      0, 0x4E3F, 0x4E40, 0x4E41, 0x4E42, 0x4E43, 0x4E44, /* 0xA0 */
-    0x4E45,      0, 0x4E46,      0,      0, 0x4E47,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x4E48,      0,      0, /* 0xB0 */
-         0, 0x4E49,      0,      0,      0, 0x4E4A,      0,      0, /* 0xC0 */
-         0, 0x4E4B,      0, 0x4E4C, 0x4E4D,      0, 0x4E4E,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x4E4F,      0,      0,      0, /* 0xD0 */
-         0, 0x4E50,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x4E51,      0,      0,      0,      0,      0, 0x4E52,      0, /* 0xE0 */
-    0x4E53,      0,      0,      0, 0x4E54,      0,      0,      0, /* 0xE0 */
-    0x4E55, 0x4E56,      0,      0,      0,      0, 0x4E57,      0, /* 0xF0 */
-         0, 0x4E58,      0,      0, 0x4E59                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x4D63, 	 0, 0x4D64, 0x4D65, 0x4D66, 	 0, 	 0, 0x4D67, /* 0x00 */
+    0x4D68, 	 0, 0x4D69, 	 0, 0x4D6A, 	 0, 	 0, 0x4D6B, /* 0x00 */
+         0, 	 0, 0x4D6C, 0x4D6D, 	 0, 0x4D6E, 0x4D6F, 	 0, /* 0x10 */
+         0, 0x4D70, 	 0, 0x4D71, 0x4D72, 0x4D73, 0x4D74, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x4D75, 	 0, 0x4D76, 0x4D77, 	 0, /* 0x20 */
+         0, 0x4D78, 	 0, 	 0, 	 0, 0x4D79, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x4D7A, 0x4D7B, 	 0, 0x4D7C, 	 0, 	 0, /* 0x30 */
+    0x4D7D, 0x4D7E, 0x4E21, 	 0, 0x4E22, 	 0, 	 0, 	 0, /* 0x30 */
+    0x4E24, 0x4E25, 	 0, 0x4E26, 0x4E27, 0x4E28, 	 0, 	 0, /* 0x40 */
+         0, 0x4E29, 0x4E23, 0x4E2A, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4E2B, 	 0, 	 0, /* 0x50 */
+         0, 0x4E2C, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4E2D, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x4E2E, 0x4E2F, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4E30, 0x4E31, 0x4E32, /* 0x60 */
+         0, 0x4E33, 	 0, 	 0, 0x4E34, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x4E35, 	 0, 	 0, 	 0, 0x4E36, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x4E37, 0x4E38, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4E39, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x4E3A, 0x4E3B, 0x4E3C, 	 0, 0x4E3D, /* 0x90 */
+    0x4E3E, 	 0, 0x4E3F, 0x4E40, 0x4E41, 0x4E42, 0x4E43, 0x4E44, /* 0xA0 */
+    0x4E45, 	 0, 0x4E46, 	 0, 	 0, 0x4E47, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4E48, 	 0, 	 0, /* 0xB0 */
+         0, 0x4E49, 	 0, 	 0, 	 0, 0x4E4A, 	 0, 	 0, /* 0xC0 */
+         0, 0x4E4B, 	 0, 0x4E4C, 0x4E4D, 	 0, 0x4E4E, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x4E4F, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x4E50, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x4E51, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4E52, 	 0, /* 0xE0 */
+    0x4E53, 	 0, 	 0, 	 0, 0x4E54, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x4E55, 0x4E56, 	 0, 	 0, 	 0, 	 0, 0x4E57, 	 0, /* 0xF0 */
+         0, 0x4E58, 	 0, 	 0, 0x4E59							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_77[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x4E5A,      0,      0,      0,      0,      0, 0x4E5B,      0, /* 0x00 */
-         0,      0, 0x4E5C,      0,      0,      0, 0x4E5D,      0, /* 0x00 */
-         0,      0, 0x4E5E,      0, 0x4E5F, 0x4E60,      0, 0x4E61, /* 0x10 */
-         0, 0x4E62, 0x4E63,      0, 0x4E64,      0,      0,      0, /* 0x10 */
-         0,      0, 0x4E65,      0,      0,      0,      0,      0, /* 0x20 */
-    0x4E66,      0,      0,      0,      0, 0x4E67, 0x4E68, 0x4E69, /* 0x20 */
-         0,      0,      0,      0, 0x4E6A, 0x4E6B, 0x4E6C,      0, /* 0x30 */
-         0, 0x4E6D,      0,      0,      0, 0x4E6E, 0x4E6F,      0, /* 0x30 */
-         0,      0, 0x4E70,      0,      0, 0x4E71, 0x4E72,      0, /* 0x40 */
-         0,      0, 0x4E73,      0,      0, 0x4E74, 0x4E75, 0x4E76, /* 0x40 */
-         0,      0, 0x4E77,      0,      0,      0, 0x4E78, 0x4E79, /* 0x50 */
-         0,      0,      0,      0, 0x4E7A,      0, 0x4E7B, 0x4E7C, /* 0x50 */
-    0x4E7D,      0, 0x4E7E,      0, 0x4F21,      0,      0, 0x4F22, /* 0x60 */
-         0,      0, 0x4F23,      0, 0x4F24,      0,      0,      0, /* 0x60 */
-    0x4F25,      0, 0x4F26, 0x4F27, 0x4F28,      0,      0,      0, /* 0x70 */
-         0,      0, 0x4F29,      0,      0, 0x4F2A,      0,      0, /* 0x70 */
-    0x4F2B,      0,      0,      0, 0x4F2C,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0x4F2D, 0x4F2E,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0x4F2F, 0x4F30, 0x4F31,      0, /* 0x90 */
-         0,      0, 0x4F32,      0,      0,      0,      0, 0x4F33, /* 0x90 */
-         0,      0, 0x4F34,      0,      0,      0,      0, 0x4F35, /* 0xA0 */
-         0,      0, 0x4F36,      0,      0,      0, 0x4F37, 0x4F38, /* 0xA0 */
-         0, 0x4F39,      0,      0,      0, 0x4F3A,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x4F3B,      0, /* 0xB0 */
-         0,      0,      0, 0x4F3C,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x4F3D,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x4F3E, 0x4F3F,      0,      0, 0x4F40,      0,      0, /* 0xD0 */
-         0, 0x4F41,      0,      0,      0,      0, 0x4F42, 0x4F43, /* 0xD0 */
-    0x4F44,      0,      0,      0, 0x4F45,      0, 0x4F46,      0, /* 0xE0 */
-         0,      0, 0x4F47,      0, 0x4F48,      0,      0,      0, /* 0xE0 */
-    0x4F49, 0x4F4A,      0,      0, 0x4F4B,      0,      0,      0, /* 0xF0 */
-    0x4F4C,      0,      0, 0x4F4D                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x4E5A, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4E5B, 	 0, /* 0x00 */
+         0, 	 0, 0x4E5C, 	 0, 	 0, 	 0, 0x4E5D, 	 0, /* 0x00 */
+         0, 	 0, 0x4E5E, 	 0, 0x4E5F, 0x4E60, 	 0, 0x4E61, /* 0x10 */
+         0, 0x4E62, 0x4E63, 	 0, 0x4E64, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x4E65, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x4E66, 	 0, 	 0, 	 0, 	 0, 0x4E67, 0x4E68, 0x4E69, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x4E6A, 0x4E6B, 0x4E6C, 	 0, /* 0x30 */
+         0, 0x4E6D, 	 0, 	 0, 	 0, 0x4E6E, 0x4E6F, 	 0, /* 0x30 */
+         0, 	 0, 0x4E70, 	 0, 	 0, 0x4E71, 0x4E72, 	 0, /* 0x40 */
+         0, 	 0, 0x4E73, 	 0, 	 0, 0x4E74, 0x4E75, 0x4E76, /* 0x40 */
+         0, 	 0, 0x4E77, 	 0, 	 0, 	 0, 0x4E78, 0x4E79, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x4E7A, 	 0, 0x4E7B, 0x4E7C, /* 0x50 */
+    0x4E7D, 	 0, 0x4E7E, 	 0, 0x4F21, 	 0, 	 0, 0x4F22, /* 0x60 */
+         0, 	 0, 0x4F23, 	 0, 0x4F24, 	 0, 	 0, 	 0, /* 0x60 */
+    0x4F25, 	 0, 0x4F26, 0x4F27, 0x4F28, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x4F29, 	 0, 	 0, 0x4F2A, 	 0, 	 0, /* 0x70 */
+    0x4F2B, 	 0, 	 0, 	 0, 0x4F2C, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x4F2D, 0x4F2E, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x4F2F, 0x4F30, 0x4F31, 	 0, /* 0x90 */
+         0, 	 0, 0x4F32, 	 0, 	 0, 	 0, 	 0, 0x4F33, /* 0x90 */
+         0, 	 0, 0x4F34, 	 0, 	 0, 	 0, 	 0, 0x4F35, /* 0xA0 */
+         0, 	 0, 0x4F36, 	 0, 	 0, 	 0, 0x4F37, 0x4F38, /* 0xA0 */
+         0, 0x4F39, 	 0, 	 0, 	 0, 0x4F3A, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x4F3B, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x4F3C, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x4F3D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x4F3E, 0x4F3F, 	 0, 	 0, 0x4F40, 	 0, 	 0, /* 0xD0 */
+         0, 0x4F41, 	 0, 	 0, 	 0, 	 0, 0x4F42, 0x4F43, /* 0xD0 */
+    0x4F44, 	 0, 	 0, 	 0, 0x4F45, 	 0, 0x4F46, 	 0, /* 0xE0 */
+         0, 	 0, 0x4F47, 	 0, 0x4F48, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x4F49, 0x4F4A, 	 0, 	 0, 0x4F4B, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x4F4C, 	 0, 	 0, 0x4F4D									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_78[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0x4F4E, 0x4F4F,      0, /* 0x00 */
-         0, 0x4F50,      0,      0,      0, 0x4F51, 0x4F52,      0, /* 0x00 */
-         0, 0x4F53,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0x4F54,      0,      0, /* 0x10 */
-         0, 0x4F55, 0x4F56, 0x4F57,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0x4F58, 0x4F59,      0, /* 0x20 */
-    0x4F5A,      0,      0,      0,      0, 0x4F5B,      0, 0x4F5C, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x4F5D, 0x4F5E,      0,      0, 0x4F5F, /* 0x40 */
-    0x4F60,      0,      0,      0, 0x4F61,      0, 0x4F62,      0, /* 0x40 */
-         0,      0, 0x4F63,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0x4F64,      0, 0x4F65,      0, /* 0x50 */
-    0x4F66, 0x4F67,      0, 0x4F68, 0x4F69,      0,      0,      0, /* 0x60 */
-    0x4F6A,      0, 0x4F6B,      0,      0,      0, 0x4F6C,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x4F6D,      0,      0,      0, 0x4F6E,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0x4F6F,      0,      0,      0,      0, 0x4F70, /* 0x80 */
-         0,      0,      0,      0, 0x4F71,      0,      0,      0, /* 0x90 */
-    0x4F72,      0,      0,      0,      0, 0x4F74, 0x4F75, 0x4F76, /* 0x90 */
-         0, 0x4F73,      0,      0, 0x4F77,      0,      0,      0, /* 0xA0 */
-    0x4F78,      0,      0,      0, 0x4F79, 0x4F7A,      0,      0, /* 0xA0 */
-    0x4F7B, 0x4F7C, 0x4F7D, 0x4F7E,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x5021,      0, 0x5022,      0, 0x5023, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0x5024, /* 0xC0 */
-    0x5025, 0x5026,      0,      0, 0x5027,      0, 0x5028,      0, /* 0xC0 */
-         0,      0, 0x5029, 0x502A,      0, 0x502B, 0x502C,      0, /* 0xD0 */
-         0,      0,      0, 0x502E,      0,      0,      0, 0x502F, /* 0xD0 */
-    0x5030, 0x5031,      0,      0, 0x502D,      0, 0x5032,      0, /* 0xE0 */
-         0,      0, 0x5033,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0x5034, 0x5035,      0,      0, 0x5037, 0x5038, /* 0xF0 */
-         0,      0, 0x5039, 0x503A,      0,      0,      0, 0x503B  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0x4F4E, 0x4F4F, 	 0, /* 0x00 */
+         0, 0x4F50, 	 0, 	 0, 	 0, 0x4F51, 0x4F52, 	 0, /* 0x00 */
+         0, 0x4F53, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4F54, 	 0, 	 0, /* 0x10 */
+         0, 0x4F55, 0x4F56, 0x4F57, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x4F58, 0x4F59, 	 0, /* 0x20 */
+    0x4F5A, 	 0, 	 0, 	 0, 	 0, 0x4F5B, 	 0, 0x4F5C, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x4F5D, 0x4F5E, 	 0, 	 0, 0x4F5F, /* 0x40 */
+    0x4F60, 	 0, 	 0, 	 0, 0x4F61, 	 0, 0x4F62, 	 0, /* 0x40 */
+         0, 	 0, 0x4F63, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x4F64, 	 0, 0x4F65, 	 0, /* 0x50 */
+    0x4F66, 0x4F67, 	 0, 0x4F68, 0x4F69, 	 0, 	 0, 	 0, /* 0x60 */
+    0x4F6A, 	 0, 0x4F6B, 	 0, 	 0, 	 0, 0x4F6C, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x4F6D, 	 0, 	 0, 	 0, 0x4F6E, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x4F6F, 	 0, 	 0, 	 0, 	 0, 0x4F70, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x4F71, 	 0, 	 0, 	 0, /* 0x90 */
+    0x4F72, 	 0, 	 0, 	 0, 	 0, 0x4F74, 0x4F75, 0x4F76, /* 0x90 */
+         0, 0x4F73, 	 0, 	 0, 0x4F77, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x4F78, 	 0, 	 0, 	 0, 0x4F79, 0x4F7A, 	 0, 	 0, /* 0xA0 */
+    0x4F7B, 0x4F7C, 0x4F7D, 0x4F7E, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x5021, 	 0, 0x5022, 	 0, 0x5023, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5024, /* 0xC0 */
+    0x5025, 0x5026, 	 0, 	 0, 0x5027, 	 0, 0x5028, 	 0, /* 0xC0 */
+         0, 	 0, 0x5029, 0x502A, 	 0, 0x502B, 0x502C, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x502E, 	 0, 	 0, 	 0, 0x502F, /* 0xD0 */
+    0x5030, 0x5031, 	 0, 	 0, 0x502D, 	 0, 0x5032, 	 0, /* 0xE0 */
+         0, 	 0, 0x5033, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x5034, 0x5035, 	 0, 	 0, 0x5037, 0x5038, /* 0xF0 */
+         0, 	 0, 0x5039, 0x503A, 	 0, 	 0, 	 0, 0x503B	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_79[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x5036,      0,      0,      0,      0,      0, 0x503C,      0, /* 0x00 */
-         0,      0,      0,      0, 0x503D,      0,      0,      0, /* 0x00 */
-    0x503E,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x503F,      0, 0x5040,      0, 0x5041, 0x5042, /* 0x10 */
-    0x5043,      0,      0,      0,      0, 0x5044,      0, 0x5045, /* 0x20 */
-         0, 0x5046,      0,      0,      0, 0x5047,      0,      0, /* 0x20 */
-         0, 0x5048,      0,      0, 0x5049, 0x504A,      0,      0, /* 0x30 */
-         0,      0,      0, 0x504B,      0, 0x504C,      0, 0x504D, /* 0x30 */
-         0,      0,      0,      0, 0x504E, 0x504F, 0x5050,      0, /* 0x40 */
-         0,      0, 0x5051, 0x5052,      0,      0,      0, 0x5053, /* 0x40 */
-         0, 0x5054,      0,      0, 0x5055,      0,      0,      0, /* 0x50 */
-    0x5056,      0,      0, 0x5057, 0x5058,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0x5059, /* 0x60 */
-         0, 0x505A,      0, 0x505B,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0x505C,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x505D,      0, 0x505E, 0x505F,      0, 0x5060,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x5061, 0x5062,      0,      0,      0, /* 0x80 */
-         0, 0x5063,      0, 0x5064, 0x5065, 0x5066, 0x5067,      0, /* 0x90 */
-    0x5068,      0,      0, 0x5069, 0x506A,      0,      0,      0, /* 0x90 */
-         0, 0x506B,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x506C, 0x506D,      0, 0x506E,      0,      0,      0, 0x506F, /* 0xA0 */
-         0, 0x5070,      0,      0, 0x5071,      0,      0,      0, /* 0xB0 */
-    0x5072,      0,      0, 0x5073,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x5074,      0, 0x5075,      0,      0, 0x5076, /* 0xC0 */
-    0x5077,      0, 0x5078,      0,      0,      0,      0, 0x5079, /* 0xC0 */
-         0,      0,      0,      0, 0x507A,      0, 0x507B,      0, /* 0xD0 */
-         0,      0, 0x507C,      0,      0, 0x507D, 0x507E,      0, /* 0xD0 */
-    0x5121,      0, 0x5122,      0,      0, 0x5123,      0,      0, /* 0xE0 */
-         0,      0, 0x5124, 0x5125,      0, 0x5126,      0,      0, /* 0xE0 */
-         0, 0x5127,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0x5128,      0,      0,      0, 0x5129                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x5036, 	 0, 	 0, 	 0, 	 0, 	 0, 0x503C, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x503D, 	 0, 	 0, 	 0, /* 0x00 */
+    0x503E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x503F, 	 0, 0x5040, 	 0, 0x5041, 0x5042, /* 0x10 */
+    0x5043, 	 0, 	 0, 	 0, 	 0, 0x5044, 	 0, 0x5045, /* 0x20 */
+         0, 0x5046, 	 0, 	 0, 	 0, 0x5047, 	 0, 	 0, /* 0x20 */
+         0, 0x5048, 	 0, 	 0, 0x5049, 0x504A, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x504B, 	 0, 0x504C, 	 0, 0x504D, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x504E, 0x504F, 0x5050, 	 0, /* 0x40 */
+         0, 	 0, 0x5051, 0x5052, 	 0, 	 0, 	 0, 0x5053, /* 0x40 */
+         0, 0x5054, 	 0, 	 0, 0x5055, 	 0, 	 0, 	 0, /* 0x50 */
+    0x5056, 	 0, 	 0, 0x5057, 0x5058, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5059, /* 0x60 */
+         0, 0x505A, 	 0, 0x505B, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0x505C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x505D, 	 0, 0x505E, 0x505F, 	 0, 0x5060, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x5061, 0x5062, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x5063, 	 0, 0x5064, 0x5065, 0x5066, 0x5067, 	 0, /* 0x90 */
+    0x5068, 	 0, 	 0, 0x5069, 0x506A, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x506B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x506C, 0x506D, 	 0, 0x506E, 	 0, 	 0, 	 0, 0x506F, /* 0xA0 */
+         0, 0x5070, 	 0, 	 0, 0x5071, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x5072, 	 0, 	 0, 0x5073, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x5074, 	 0, 0x5075, 	 0, 	 0, 0x5076, /* 0xC0 */
+    0x5077, 	 0, 0x5078, 	 0, 	 0, 	 0, 	 0, 0x5079, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x507A, 	 0, 0x507B, 	 0, /* 0xD0 */
+         0, 	 0, 0x507C, 	 0, 	 0, 0x507D, 0x507E, 	 0, /* 0xD0 */
+    0x5121, 	 0, 0x5122, 	 0, 	 0, 0x5123, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x5124, 0x5125, 	 0, 0x5126, 	 0, 	 0, /* 0xE0 */
+         0, 0x5127, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x5128, 	 0, 	 0, 	 0, 0x5129							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_7A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x512A, 0x512B,      0,      0,      0, 0x512C, /* 0x00 */
-         0, 0x512D, 0x512E,      0, 0x512F,      0,      0,      0, /* 0x00 */
-         0, 0x5130,      0,      0,      0, 0x5131,      0,      0, /* 0x10 */
-         0,      0,      0, 0x5132,      0,      0, 0x5133,      0, /* 0x10 */
-         0, 0x5134,      0,      0,      0,      0,      0, 0x5135, /* 0x20 */
-         0,      0,      0, 0x5136,      0, 0x5137,      0, 0x5138, /* 0x20 */
-    0x5139,      0,      0,      0, 0x513A, 0x513B,      0,      0, /* 0x30 */
-    0x513C, 0x513D, 0x513E,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0x513F, 0x5140,      0, 0x5141, /* 0x40 */
-    0x5142,      0,      0,      0, 0x5143,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0x5144, 0x5145,      0, /* 0x50 */
-         0, 0x5146,      0,      0, 0x5147, 0x5148,      0, 0x5149, /* 0x50 */
-    0x514A,      0,      0,      0,      0, 0x514B,      0, 0x514C, /* 0x60 */
-         0,      0, 0x514D,      0,      0, 0x514E,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0x514F,      0,      0, /* 0x70 */
-    0x5150,      0,      0,      0,      0,      0, 0x5151,      0, /* 0x70 */
-    0x5152,      0, 0x5153,      0,      0, 0x5154, 0x5155,      0, /* 0x80 */
-         0,      0, 0x5156, 0x5157,      0,      0,      0,      0, /* 0x80 */
-    0x5158, 0x5159,      0,      0, 0x515A,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0x515B,      0, /* 0x90 */
-    0x515C,      0,      0, 0x515D,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x515E,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x515F,      0, 0x5160,      0,      0, /* 0xB0 */
-         0, 0x5161,      0, 0x5162, 0x5163,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x5164,      0, /* 0xC0 */
-         0, 0x5165,      0,      0, 0x5166,      0, 0x5167,      0, /* 0xC0 */
-         0, 0x5168,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0x5169,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x516A, 0x516B,      0, 0x516C, 0x516D,      0,      0,      0, /* 0xE0 */
-         0, 0x516E,      0,      0, 0x516F,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0x5170,      0, 0x5171, 0x5172          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x512A, 0x512B, 	 0, 	 0, 	 0, 0x512C, /* 0x00 */
+         0, 0x512D, 0x512E, 	 0, 0x512F, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x5130, 	 0, 	 0, 	 0, 0x5131, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x5132, 	 0, 	 0, 0x5133, 	 0, /* 0x10 */
+         0, 0x5134, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5135, /* 0x20 */
+         0, 	 0, 	 0, 0x5136, 	 0, 0x5137, 	 0, 0x5138, /* 0x20 */
+    0x5139, 	 0, 	 0, 	 0, 0x513A, 0x513B, 	 0, 	 0, /* 0x30 */
+    0x513C, 0x513D, 0x513E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x513F, 0x5140, 	 0, 0x5141, /* 0x40 */
+    0x5142, 	 0, 	 0, 	 0, 0x5143, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5144, 0x5145, 	 0, /* 0x50 */
+         0, 0x5146, 	 0, 	 0, 0x5147, 0x5148, 	 0, 0x5149, /* 0x50 */
+    0x514A, 	 0, 	 0, 	 0, 	 0, 0x514B, 	 0, 0x514C, /* 0x60 */
+         0, 	 0, 0x514D, 	 0, 	 0, 0x514E, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x514F, 	 0, 	 0, /* 0x70 */
+    0x5150, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5151, 	 0, /* 0x70 */
+    0x5152, 	 0, 0x5153, 	 0, 	 0, 0x5154, 0x5155, 	 0, /* 0x80 */
+         0, 	 0, 0x5156, 0x5157, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x5158, 0x5159, 	 0, 	 0, 0x515A, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x515B, 	 0, /* 0x90 */
+    0x515C, 	 0, 	 0, 0x515D, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x515E, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x515F, 	 0, 0x5160, 	 0, 	 0, /* 0xB0 */
+         0, 0x5161, 	 0, 0x5162, 0x5163, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5164, 	 0, /* 0xC0 */
+         0, 0x5165, 	 0, 	 0, 0x5166, 	 0, 0x5167, 	 0, /* 0xC0 */
+         0, 0x5168, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x5169, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x516A, 0x516B, 	 0, 0x516C, 0x516D, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x516E, 	 0, 	 0, 0x516F, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0x5170, 	 0, 0x5171, 0x5172			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_7B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0x5173, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0x5174,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0x5175, /* 0x10 */
-         0,      0,      0, 0x5176,      0,      0,      0, 0x5177, /* 0x20 */
-         0, 0x5178, 0x5179, 0x517A,      0, 0x517B, 0x517C, 0x517D, /* 0x20 */
-    0x517E, 0x5221,      0,      0, 0x5222,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0x5223,      0, 0x5224, /* 0x30 */
-    0x5225, 0x5226,      0,      0,      0,      0,      0, 0x5227, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0x5228,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0x5229,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0x522A,      0,      0,      0, 0x522B,      0, 0x522C,      0, /* 0x60 */
-         0, 0x522D, 0x522E,      0,      0, 0x522F,      0, 0x5230, /* 0x60 */
-         0,      0, 0x5231, 0x5232,      0,      0,      0, 0x5233, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0x5234,      0,      0,      0, /* 0x80 */
-         0, 0x5235,      0,      0,      0,      0, 0x5236,      0, /* 0x80 */
-    0x5237, 0x5238,      0,      0,      0,      0, 0x5239,      0, /* 0x90 */
-         0,      0,      0, 0x523A,      0,      0, 0x523B,      0, /* 0x90 */
-    0x523C,      0,      0,      0,      0, 0x523D,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x523E,      0,      0, 0x523F, /* 0xA0 */
-    0x5240,      0, 0x5241,      0,      0, 0x5242, 0x5243,      0, /* 0xB0 */
-         0,      0, 0x5244, 0x5245, 0x5246, 0x5247,      0,      0, /* 0xB0 */
-         0,      0, 0x5248,      0,      0, 0x5249,      0,      0, /* 0xC0 */
-    0x524A,      0, 0x524B,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x524C,      0, 0x524D, 0x524E, /* 0xD0 */
-         0, 0x524F, 0x5250, 0x5251,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x5252,      0, 0x5253,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0x5254,      0, 0x5255, 0x5256,      0,      0, /* 0xF0 */
-    0x5257, 0x5258, 0x5259,      0, 0x525A,      0, 0x525B          /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x5174, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5175, /* 0x10 */
+         0, 	 0, 	 0, 0x5176, 	 0, 	 0, 	 0, 0x5177, /* 0x20 */
+         0, 0x5178, 0x5179, 0x517A, 	 0, 0x517B, 0x517C, 0x517D, /* 0x20 */
+    0x517E, 0x5221, 	 0, 	 0, 0x5222, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5223, 	 0, 0x5224, /* 0x30 */
+    0x5225, 0x5226, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5227, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5228, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5229, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x522A, 	 0, 	 0, 	 0, 0x522B, 	 0, 0x522C, 	 0, /* 0x60 */
+         0, 0x522D, 0x522E, 	 0, 	 0, 0x522F, 	 0, 0x5230, /* 0x60 */
+         0, 	 0, 0x5231, 0x5232, 	 0, 	 0, 	 0, 0x5233, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0x5234, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x5235, 	 0, 	 0, 	 0, 	 0, 0x5236, 	 0, /* 0x80 */
+    0x5237, 0x5238, 	 0, 	 0, 	 0, 	 0, 0x5239, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x523A, 	 0, 	 0, 0x523B, 	 0, /* 0x90 */
+    0x523C, 	 0, 	 0, 	 0, 	 0, 0x523D, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x523E, 	 0, 	 0, 0x523F, /* 0xA0 */
+    0x5240, 	 0, 0x5241, 	 0, 	 0, 0x5242, 0x5243, 	 0, /* 0xB0 */
+         0, 	 0, 0x5244, 0x5245, 0x5246, 0x5247, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x5248, 	 0, 	 0, 0x5249, 	 0, 	 0, /* 0xC0 */
+    0x524A, 	 0, 0x524B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x524C, 	 0, 0x524D, 0x524E, /* 0xD0 */
+         0, 0x524F, 0x5250, 0x5251, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x5252, 	 0, 0x5253, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x5254, 	 0, 0x5255, 0x5256, 	 0, 	 0, /* 0xF0 */
+    0x5257, 0x5258, 0x5259, 	 0, 0x525A, 	 0, 0x525B			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_7C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x525C, 0x525D, 0x525E, 0x525F,      0, 0x5260,      0, /* 0x00 */
-         0, 0x5261,      0, 0x5262, 0x5263,      0, 0x5264, 0x5265, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0x5266,      0, 0x5267,      0,      0,      0,      0, /* 0x10 */
-    0x5268,      0,      0,      0,      0, 0x5269, 0x526A,      0, /* 0x20 */
-    0x526B,      0,      0,      0, 0x526C,      0,      0,      0, /* 0x20 */
-         0, 0x526D,      0, 0x526E, 0x526F,      0, 0x5270,      0, /* 0x30 */
-         0, 0x5271, 0x5272,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0x5273,      0, /* 0x40 */
-         0,      0, 0x5274,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0x5276, 0x5277, 0x5278,      0, 0x5275,      0,      0, /* 0x50 */
-         0, 0x5279, 0x527A, 0x527B, 0x527C, 0x527D, 0x527E,      0, /* 0x50 */
-         0, 0x5321,      0, 0x5322,      0,      0,      0, 0x5323, /* 0x60 */
-         0, 0x5324,      0,      0,      0, 0x5325, 0x5326,      0, /* 0x60 */
-    0x5327,      0, 0x5328,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x5329,      0,      0, 0x532A, 0x532B,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x532C, 0x532D, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0, 0x532E, /* 0x80 */
-         0,      0,      0,      0, 0x532F,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0x5330,      0, /* 0x90 */
-    0x5331,      0,      0,      0,      0,      0, 0x5332,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x5333,      0,      0,      0,      0,      0, 0x5334, 0x5335, /* 0xB0 */
-         0,      0, 0x5336, 0x5337, 0x5338,      0,      0, 0x5339, /* 0xB0 */
-         0,      0,      0,      0, 0x533A,      0,      0, 0x533B, /* 0xC0 */
-    0x533C, 0x533D,      0,      0,      0, 0x533E,      0, 0x533F, /* 0xC0 */
-         0,      0,      0, 0x5340, 0x5341, 0x5342,      0, 0x5343, /* 0xD0 */
-         0, 0x5344, 0x5345,      0,      0, 0x5346,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0x5347,      0, /* 0xE0 */
-         0, 0x5348,      0, 0x5349,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0x534A                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x525C, 0x525D, 0x525E, 0x525F, 	 0, 0x5260, 	 0, /* 0x00 */
+         0, 0x5261, 	 0, 0x5262, 0x5263, 	 0, 0x5264, 0x5265, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x5266, 	 0, 0x5267, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x5268, 	 0, 	 0, 	 0, 	 0, 0x5269, 0x526A, 	 0, /* 0x20 */
+    0x526B, 	 0, 	 0, 	 0, 0x526C, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x526D, 	 0, 0x526E, 0x526F, 	 0, 0x5270, 	 0, /* 0x30 */
+         0, 0x5271, 0x5272, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5273, 	 0, /* 0x40 */
+         0, 	 0, 0x5274, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x5276, 0x5277, 0x5278, 	 0, 0x5275, 	 0, 	 0, /* 0x50 */
+         0, 0x5279, 0x527A, 0x527B, 0x527C, 0x527D, 0x527E, 	 0, /* 0x50 */
+         0, 0x5321, 	 0, 0x5322, 	 0, 	 0, 	 0, 0x5323, /* 0x60 */
+         0, 0x5324, 	 0, 	 0, 	 0, 0x5325, 0x5326, 	 0, /* 0x60 */
+    0x5327, 	 0, 0x5328, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x5329, 	 0, 	 0, 0x532A, 0x532B, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x532C, 0x532D, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x532E, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x532F, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5330, 	 0, /* 0x90 */
+    0x5331, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5332, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x5333, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5334, 0x5335, /* 0xB0 */
+         0, 	 0, 0x5336, 0x5337, 0x5338, 	 0, 	 0, 0x5339, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x533A, 	 0, 	 0, 0x533B, /* 0xC0 */
+    0x533C, 0x533D, 	 0, 	 0, 	 0, 0x533E, 	 0, 0x533F, /* 0xC0 */
+         0, 	 0, 	 0, 0x5340, 0x5341, 0x5342, 	 0, 0x5343, /* 0xD0 */
+         0, 0x5344, 0x5345, 	 0, 	 0, 0x5346, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5347, 	 0, /* 0xE0 */
+         0, 0x5348, 	 0, 0x5349, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x534A					/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -2030,461 +2030,461 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0212_7C[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_7D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0x534B,      0,      0,      0, 0x534C, /* 0x00 */
-    0x534D, 0x534E,      0,      0,      0,      0,      0, 0x534F, /* 0x00 */
-         0, 0x5350, 0x5351, 0x5352,      0,      0, 0x5353,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0x5354, 0x5355,      0, /* 0x10 */
-         0,      0,      0, 0x5356,      0,      0, 0x5357,      0, /* 0x20 */
-         0,      0, 0x5358,      0,      0, 0x5359,      0,      0, /* 0x20 */
-         0, 0x535A,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0x535B, 0x535C, 0x535D,      0, /* 0x30 */
-    0x535E, 0x535F,      0,      0,      0,      0,      0, 0x5360, /* 0x40 */
-    0x5361,      0,      0,      0,      0, 0x5362,      0,      0, /* 0x40 */
-         0, 0x5363,      0, 0x5364,      0,      0,      0, 0x5365, /* 0x50 */
-         0, 0x5366, 0x5367,      0, 0x5368, 0x5369,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0x536A,      0, 0x536B, /* 0x60 */
-         0,      0, 0x536C,      0,      0,      0,      0,      0, /* 0x60 */
-    0x536D,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0x536E,      0, 0x536F, 0x5370,      0,      0,      0, 0x5371, /* 0x70 */
-         0, 0x5372, 0x5373, 0x5374,      0, 0x5375, 0x5376,      0, /* 0x80 */
-    0x5377,      0,      0, 0x5378, 0x5379, 0x537A,      0,      0, /* 0x80 */
-         0, 0x537B,      0,      0,      0,      0, 0x537C, 0x537D, /* 0x90 */
-         0,      0,      0,      0,      0, 0x537E, 0x5421,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0x5422, 0x5423, /* 0xA0 */
-         0,      0, 0x5424,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x5425,      0,      0, 0x5426, 0x5427, /* 0xB0 */
-         0, 0x5428,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x5429, 0x542A, 0x542B, 0x542C, 0x542D,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x542E, 0x542F, 0x5430,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0x5431, /* 0xD0 */
-         0, 0x5432,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0x5434,      0,      0, 0x5435, 0x5436,      0, /* 0xE0 */
-         0,      0, 0x5437, 0x5438,      0, 0x5439,      0,      0, /* 0xE0 */
-         0, 0x543A,      0,      0,      0, 0x543B, 0x543C,      0, /* 0xF0 */
-         0, 0x543D, 0x543E                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0x534B, 	 0, 	 0, 	 0, 0x534C, /* 0x00 */
+    0x534D, 0x534E, 	 0, 	 0, 	 0, 	 0, 	 0, 0x534F, /* 0x00 */
+         0, 0x5350, 0x5351, 0x5352, 	 0, 	 0, 0x5353, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5354, 0x5355, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x5356, 	 0, 	 0, 0x5357, 	 0, /* 0x20 */
+         0, 	 0, 0x5358, 	 0, 	 0, 0x5359, 	 0, 	 0, /* 0x20 */
+         0, 0x535A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x535B, 0x535C, 0x535D, 	 0, /* 0x30 */
+    0x535E, 0x535F, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5360, /* 0x40 */
+    0x5361, 	 0, 	 0, 	 0, 	 0, 0x5362, 	 0, 	 0, /* 0x40 */
+         0, 0x5363, 	 0, 0x5364, 	 0, 	 0, 	 0, 0x5365, /* 0x50 */
+         0, 0x5366, 0x5367, 	 0, 0x5368, 0x5369, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x536A, 	 0, 0x536B, /* 0x60 */
+         0, 	 0, 0x536C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x536D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x536E, 	 0, 0x536F, 0x5370, 	 0, 	 0, 	 0, 0x5371, /* 0x70 */
+         0, 0x5372, 0x5373, 0x5374, 	 0, 0x5375, 0x5376, 	 0, /* 0x80 */
+    0x5377, 	 0, 	 0, 0x5378, 0x5379, 0x537A, 	 0, 	 0, /* 0x80 */
+         0, 0x537B, 	 0, 	 0, 	 0, 	 0, 0x537C, 0x537D, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x537E, 0x5421, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5422, 0x5423, /* 0xA0 */
+         0, 	 0, 0x5424, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x5425, 	 0, 	 0, 0x5426, 0x5427, /* 0xB0 */
+         0, 0x5428, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x5429, 0x542A, 0x542B, 0x542C, 0x542D, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x542E, 0x542F, 0x5430, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5431, /* 0xD0 */
+         0, 0x5432, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x5434, 	 0, 	 0, 0x5435, 0x5436, 	 0, /* 0xE0 */
+         0, 	 0, 0x5437, 0x5438, 	 0, 0x5439, 	 0, 	 0, /* 0xE0 */
+         0, 0x543A, 	 0, 	 0, 	 0, 0x543B, 0x543C, 	 0, /* 0xF0 */
+         0, 0x543D, 0x543E											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_7E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x5433,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0x543F,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0x5440, 0x5441,      0,      0,      0, 0x5442,      0, 0x5443, /* 0x10 */
-         0,      0,      0,      0, 0x5444, 0x5445,      0,      0, /* 0x10 */
-    0x5446,      0,      0,      0,      0,      0,      0, 0x5447, /* 0x20 */
-    0x5448,      0,      0,      0, 0x5449, 0x544A,      0, 0x544B, /* 0x20 */
-         0,      0,      0, 0x544C,      0,      0, 0x544D,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0x544E, /* 0x30 */
-         0,      0,      0,      0, 0x544F, 0x5450,      0, 0x5451, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0x5452,      0, /* 0x40 */
-    0x5453,      0, 0x5454,      0,      0,      0,      0,      0, /* 0x50 */
-    0x5455,      0,      0,      0,      0,      0,      0, 0x5456, /* 0x50 */
-         0, 0x5457, 0x5458,      0,      0, 0x5459,      0,      0, /* 0x60 */
-         0,      0,      0, 0x545A,      0,      0, 0x545B, 0x545C, /* 0x60 */
-         0,      0,      0, 0x545D,      0,      0,      0,      0, /* 0x70 */
-    0x545E,      0,      0,      0,      0,      0, 0x545F,      0, /* 0x70 */
-         0, 0x5460,      0,      0,      0,      0, 0x5461, 0x5462, /* 0x80 */
-         0,      0, 0x5463,      0,      0, 0x5464,      0,      0, /* 0x80 */
-         0, 0x5465,      0,      0,      0, 0x5466,      0,      0, /* 0x90 */
-    0x5467,      0, 0x5468,      0,      0, 0x5469, 0x546A          /* 0x90 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x5433, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0x543F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0x5440, 0x5441, 	 0, 	 0, 	 0, 0x5442, 	 0, 0x5443, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x5444, 0x5445, 	 0, 	 0, /* 0x10 */
+    0x5446, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5447, /* 0x20 */
+    0x5448, 	 0, 	 0, 	 0, 0x5449, 0x544A, 	 0, 0x544B, /* 0x20 */
+         0, 	 0, 	 0, 0x544C, 	 0, 	 0, 0x544D, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x544E, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x544F, 0x5450, 	 0, 0x5451, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5452, 	 0, /* 0x40 */
+    0x5453, 	 0, 0x5454, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x5455, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5456, /* 0x50 */
+         0, 0x5457, 0x5458, 	 0, 	 0, 0x5459, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x545A, 	 0, 	 0, 0x545B, 0x545C, /* 0x60 */
+         0, 	 0, 	 0, 0x545D, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x545E, 	 0, 	 0, 	 0, 	 0, 	 0, 0x545F, 	 0, /* 0x70 */
+         0, 0x5460, 	 0, 	 0, 	 0, 	 0, 0x5461, 0x5462, /* 0x80 */
+         0, 	 0, 0x5463, 	 0, 	 0, 0x5464, 	 0, 	 0, /* 0x80 */
+         0, 0x5465, 	 0, 	 0, 	 0, 0x5466, 	 0, 	 0, /* 0x90 */
+    0x5467, 	 0, 0x5468, 	 0, 	 0, 0x5469, 0x546A			/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_7F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x30 */
                             0x546C, 0x546B, 0x546D, 0x546E, 0x546F, /* 0x30 */
-         0,      0,      0, 0x5470, 0x5471,      0,      0, 0x5472, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0x5473, /* 0x40 */
-         0,      0, 0x5474, 0x5475,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0x5476, 0x5477, 0x5478,      0,      0, /* 0x50 */
-         0, 0x5479,      0, 0x547A, 0x547B, 0x547C, 0x547D,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0x547E,      0,      0, /* 0x60 */
-         0, 0x5521,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0x5522, 0x5523, 0x5524, /* 0x70 */
-    0x5525,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0x5526,      0, 0x5527,      0, 0x5528, /* 0x80 */
-    0x5529, 0x552A,      0,      0,      0,      0, 0x552B, 0x552C, /* 0x90 */
-         0,      0,      0,      0, 0x552D,      0,      0,      0, /* 0x90 */
-         0, 0x552E, 0x552F,      0,      0,      0, 0x5530,      0, /* 0xA0 */
-         0,      0, 0x5531,      0,      0, 0x5532,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x5533,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0x5534,      0,      0, 0x5535, /* 0xB0 */
-    0x5536,      0,      0, 0x5537,      0,      0,      0,      0, /* 0xC0 */
-    0x5538,      0,      0,      0,      0,      0, 0x5539, 0x553A, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0x553B,      0,      0,      0, 0x553C, /* 0xD0 */
-         0,      0,      0, 0x553D,      0, 0x553E,      0,      0, /* 0xE0 */
-    0x553F,      0,      0,      0, 0x5540,      0, 0x5541, 0x5542, /* 0xE0 */
-         0,      0, 0x5543,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x5544,      0,      0, 0x5545, 0x5546, 0x5547  /* 0xF0 */
+         0, 	 0, 	 0, 0x5470, 0x5471, 	 0, 	 0, 0x5472, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5473, /* 0x40 */
+         0, 	 0, 0x5474, 0x5475, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x5476, 0x5477, 0x5478, 	 0, 	 0, /* 0x50 */
+         0, 0x5479, 	 0, 0x547A, 0x547B, 0x547C, 0x547D, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x547E, 	 0, 	 0, /* 0x60 */
+         0, 0x5521, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5522, 0x5523, 0x5524, /* 0x70 */
+    0x5525, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x5526, 	 0, 0x5527, 	 0, 0x5528, /* 0x80 */
+    0x5529, 0x552A, 	 0, 	 0, 	 0, 	 0, 0x552B, 0x552C, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x552D, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x552E, 0x552F, 	 0, 	 0, 	 0, 0x5530, 	 0, /* 0xA0 */
+         0, 	 0, 0x5531, 	 0, 	 0, 0x5532, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x5533, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x5534, 	 0, 	 0, 0x5535, /* 0xB0 */
+    0x5536, 	 0, 	 0, 0x5537, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x5538, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5539, 0x553A, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x553B, 	 0, 	 0, 	 0, 0x553C, /* 0xD0 */
+         0, 	 0, 	 0, 0x553D, 	 0, 0x553E, 	 0, 	 0, /* 0xE0 */
+    0x553F, 	 0, 	 0, 	 0, 0x5540, 	 0, 0x5541, 0x5542, /* 0xE0 */
+         0, 	 0, 0x5543, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x5544, 	 0, 	 0, 0x5545, 0x5546, 0x5547	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_80[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0x5548, /* 0x00 */
-    0x5549,      0, 0x554A,      0,      0, 0x554B, 0x554C, 0x554D, /* 0x00 */
-         0, 0x554E,      0, 0x554F, 0x5550,      0, 0x5551,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0x5552, 0x5553, 0x5554, /* 0x10 */
-    0x5555,      0,      0,      0, 0x5556,      0, 0x5557,      0, /* 0x20 */
-         0,      0,      0,      0, 0x5558,      0, 0x5559,      0, /* 0x20 */
-    0x555A,      0,      0,      0, 0x555B, 0x555C,      0, 0x555D, /* 0x30 */
-         0, 0x555E, 0x555F,      0, 0x5560,      0, 0x5561,      0, /* 0x30 */
-    0x5562,      0,      0,      0, 0x5563,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0x5564,      0,      0,      0, 0x5565,      0, 0x5566,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0x5567,      0,      0, /* 0x60 */
-         0, 0x5568,      0,      0,      0, 0x5569,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x556A,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0x556B,      0,      0,      0,      0,      0, 0x556C,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0x556D,      0, 0x556E,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0x556F, 0x5570, /* 0xA0 */
-         0,      0,      0, 0x5571,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0x5572, 0x5573,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0x5574,      0,      0,      0,      0, 0x5575,      0, 0x5576, /* 0xC0 */
-         0,      0, 0x5577,      0, 0x5578, 0x5579,      0, 0x557A, /* 0xD0 */
-    0x557B,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x557C,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0x557D, 0x557E,      0, /* 0xE0 */
-    0x5621,      0, 0x5622, 0x5623,      0,      0, 0x5624,      0, /* 0xF0 */
-         0, 0x5625, 0x5626,      0,      0,      0, 0x5627          /* 0xF0 */
+    0x5549, 	 0, 0x554A, 	 0, 	 0, 0x554B, 0x554C, 0x554D, /* 0x00 */
+         0, 0x554E, 	 0, 0x554F, 0x5550, 	 0, 0x5551, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5552, 0x5553, 0x5554, /* 0x10 */
+    0x5555, 	 0, 	 0, 	 0, 0x5556, 	 0, 0x5557, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x5558, 	 0, 0x5559, 	 0, /* 0x20 */
+    0x555A, 	 0, 	 0, 	 0, 0x555B, 0x555C, 	 0, 0x555D, /* 0x30 */
+         0, 0x555E, 0x555F, 	 0, 0x5560, 	 0, 0x5561, 	 0, /* 0x30 */
+    0x5562, 	 0, 	 0, 	 0, 0x5563, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x5564, 	 0, 	 0, 	 0, 0x5565, 	 0, 0x5566, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5567, 	 0, 	 0, /* 0x60 */
+         0, 0x5568, 	 0, 	 0, 	 0, 0x5569, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x556A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x556B, 	 0, 	 0, 	 0, 	 0, 	 0, 0x556C, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x556D, 	 0, 0x556E, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x556F, 0x5570, /* 0xA0 */
+         0, 	 0, 	 0, 0x5571, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x5572, 0x5573, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x5574, 	 0, 	 0, 	 0, 	 0, 0x5575, 	 0, 0x5576, /* 0xC0 */
+         0, 	 0, 0x5577, 	 0, 0x5578, 0x5579, 	 0, 0x557A, /* 0xD0 */
+    0x557B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x557C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x557D, 0x557E, 	 0, /* 0xE0 */
+    0x5621, 	 0, 0x5622, 0x5623, 	 0, 	 0, 0x5624, 	 0, /* 0xF0 */
+         0, 0x5625, 0x5626, 	 0, 	 0, 	 0, 0x5627			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_81[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0x5628,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0x5629,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0x562A, 0x562B, /* 0x10 */
-    0x562C,      0,      0,      0, 0x562D,      0, 0x562E,      0, /* 0x10 */
-    0x562F,      0,      0,      0, 0x5630,      0,      0, 0x5631, /* 0x20 */
-         0,      0,      0,      0, 0x5632,      0,      0,      0, /* 0x20 */
-    0x5633,      0,      0,      0,      0, 0x5634,      0,      0, /* 0x30 */
-         0,      0, 0x5635,      0, 0x5636,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0x5637,      0, 0x5638, /* 0x40 */
-         0,      0, 0x5639,      0, 0x563A,      0,      0,      0, /* 0x40 */
-         0,      0, 0x563B,      0,      0,      0,      0, 0x563C, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0x563D, 0x563E,      0,      0,      0,      0,      0, 0x563F, /* 0x60 */
-    0x5640, 0x5641,      0,      0,      0, 0x5642,      0, 0x5643, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0x5644, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x5645,      0,      0, 0x5647, 0x5648, 0x5649,      0, /* 0x80 */
-         0,      0,      0, 0x564A,      0,      0, 0x564B,      0, /* 0x80 */
-    0x5646,      0,      0,      0,      0,      0, 0x564C,      0, /* 0x90 */
-    0x564D,      0,      0, 0x564E,      0,      0, 0x564F,      0, /* 0x90 */
-         0,      0, 0x5650,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0x5651,      0, /* 0xA0 */
-         0,      0, 0x5652,      0, 0x5653,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x5654,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0x5656,      0, 0x5657,      0,      0, /* 0xC0 */
-         0,      0, 0x5658, 0x5655,      0,      0, 0x5659, 0x565A, /* 0xC0 */
-         0,      0,      0,      0,      0, 0x565B,      0, 0x565C, /* 0xD0 */
-         0,      0,      0, 0x565D,      0, 0x565E, 0x565F,      0, /* 0xD0 */
-         0, 0x5660,      0,      0, 0x5661,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x5662, 0x5663,      0,      0,      0, /* 0xE0 */
-    0x5664, 0x5665, 0x5666,      0,      0, 0x5667, 0x5668,      0, /* 0xF0 */
-    0x5669, 0x566A,      0,      0,      0, 0x566B,      0, 0x566C  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0x5628, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x5629, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x562A, 0x562B, /* 0x10 */
+    0x562C, 	 0, 	 0, 	 0, 0x562D, 	 0, 0x562E, 	 0, /* 0x10 */
+    0x562F, 	 0, 	 0, 	 0, 0x5630, 	 0, 	 0, 0x5631, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x5632, 	 0, 	 0, 	 0, /* 0x20 */
+    0x5633, 	 0, 	 0, 	 0, 	 0, 0x5634, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x5635, 	 0, 0x5636, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5637, 	 0, 0x5638, /* 0x40 */
+         0, 	 0, 0x5639, 	 0, 0x563A, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x563B, 	 0, 	 0, 	 0, 	 0, 0x563C, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x563D, 0x563E, 	 0, 	 0, 	 0, 	 0, 	 0, 0x563F, /* 0x60 */
+    0x5640, 0x5641, 	 0, 	 0, 	 0, 0x5642, 	 0, 0x5643, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5644, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x5645, 	 0, 	 0, 0x5647, 0x5648, 0x5649, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x564A, 	 0, 	 0, 0x564B, 	 0, /* 0x80 */
+    0x5646, 	 0, 	 0, 	 0, 	 0, 	 0, 0x564C, 	 0, /* 0x90 */
+    0x564D, 	 0, 	 0, 0x564E, 	 0, 	 0, 0x564F, 	 0, /* 0x90 */
+         0, 	 0, 0x5650, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5651, 	 0, /* 0xA0 */
+         0, 	 0, 0x5652, 	 0, 0x5653, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x5654, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x5656, 	 0, 0x5657, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x5658, 0x5655, 	 0, 	 0, 0x5659, 0x565A, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x565B, 	 0, 0x565C, /* 0xD0 */
+         0, 	 0, 	 0, 0x565D, 	 0, 0x565E, 0x565F, 	 0, /* 0xD0 */
+         0, 0x5660, 	 0, 	 0, 0x5661, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x5662, 0x5663, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x5664, 0x5665, 0x5666, 	 0, 	 0, 0x5667, 0x5668, 	 0, /* 0xF0 */
+    0x5669, 0x566A, 	 0, 	 0, 	 0, 0x566B, 	 0, 0x566C	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_82[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x566D,      0,      0, 0x566E,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0, 0x566F, /* 0x00 */
-         0,      0,      0, 0x5670, 0x5671,      0,      0,      0, /* 0x10 */
-         0, 0x5672, 0x5673,      0,      0, 0x5674,      0,      0, /* 0x10 */
-         0, 0x5675, 0x5676,      0,      0,      0,      0,      0, /* 0x20 */
-    0x5677,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0x5678,      0, 0x5679,      0,      0,      0, /* 0x30 */
-         0,      0, 0x567A,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x567B, 0x567C, 0x567D, 0x567E,      0, /* 0x40 */
-         0,      0,      0, 0x5721,      0,      0, 0x5722, 0x5723, /* 0x40 */
-         0, 0x5724,      0,      0,      0,      0, 0x5725,      0, /* 0x50 */
-         0,      0,      0,      0, 0x5726,      0,      0,      0, /* 0x50 */
-    0x5727,      0,      0, 0x5728,      0,      0,      0, 0x5729, /* 0x60 */
-         0,      0,      0,      0,      0, 0x572A,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0x572B,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0x572C,      0, 0x572D,      0, 0x572E, /* 0x70 */
-    0x572F, 0x5730,      0, 0x5731, 0x5732,      0,      0, 0x5733, /* 0x80 */
-         0, 0x5734, 0x5735,      0,      0,      0, 0x5736,      0, /* 0x80 */
-         0, 0x5737,      0,      0, 0x5738,      0, 0x5739,      0, /* 0x90 */
-    0x573A,      0, 0x573B, 0x573C,      0,      0,      0,      0, /* 0x90 */
-    0x573D, 0x573E,      0, 0x573F, 0x5740,      0,      0, 0x5741, /* 0xA0 */
-    0x5742, 0x5743, 0x5744,      0,      0,      0, 0x5745,      0, /* 0xA0 */
-    0x5746,      0, 0x5747,      0, 0x5748,      0,      0, 0x5749, /* 0xB0 */
-         0,      0, 0x574A,      0, 0x574B,      0, 0x574C, 0x574D, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x574E,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0x574F,      0,      0,      0,      0, 0x5750,      0,      0, /* 0xD0 */
-         0,      0, 0x5751,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x5752,      0, 0x5753,      0, 0x5754,      0,      0,      0, /* 0xE0 */
-    0x5755,      0, 0x5756,      0,      0, 0x5757,      0, 0x5758, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0x5759, 0x575A, /* 0xF0 */
-         0,      0,      0,      0,      0, 0x575B, 0x575C          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x566D, 	 0, 	 0, 0x566E, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x566F, /* 0x00 */
+         0, 	 0, 	 0, 0x5670, 0x5671, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x5672, 0x5673, 	 0, 	 0, 0x5674, 	 0, 	 0, /* 0x10 */
+         0, 0x5675, 0x5676, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x5677, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0x5678, 	 0, 0x5679, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x567A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x567B, 0x567C, 0x567D, 0x567E, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x5721, 	 0, 	 0, 0x5722, 0x5723, /* 0x40 */
+         0, 0x5724, 	 0, 	 0, 	 0, 	 0, 0x5725, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x5726, 	 0, 	 0, 	 0, /* 0x50 */
+    0x5727, 	 0, 	 0, 0x5728, 	 0, 	 0, 	 0, 0x5729, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x572A, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x572B, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x572C, 	 0, 0x572D, 	 0, 0x572E, /* 0x70 */
+    0x572F, 0x5730, 	 0, 0x5731, 0x5732, 	 0, 	 0, 0x5733, /* 0x80 */
+         0, 0x5734, 0x5735, 	 0, 	 0, 	 0, 0x5736, 	 0, /* 0x80 */
+         0, 0x5737, 	 0, 	 0, 0x5738, 	 0, 0x5739, 	 0, /* 0x90 */
+    0x573A, 	 0, 0x573B, 0x573C, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x573D, 0x573E, 	 0, 0x573F, 0x5740, 	 0, 	 0, 0x5741, /* 0xA0 */
+    0x5742, 0x5743, 0x5744, 	 0, 	 0, 	 0, 0x5745, 	 0, /* 0xA0 */
+    0x5746, 	 0, 0x5747, 	 0, 0x5748, 	 0, 	 0, 0x5749, /* 0xB0 */
+         0, 	 0, 0x574A, 	 0, 0x574B, 	 0, 0x574C, 0x574D, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x574E, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x574F, 	 0, 	 0, 	 0, 	 0, 0x5750, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0x5751, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x5752, 	 0, 0x5753, 	 0, 0x5754, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x5755, 	 0, 0x5756, 	 0, 	 0, 0x5757, 	 0, 0x5758, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5759, 0x575A, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x575B, 0x575C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_83[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x575D, 0x575E,      0,      0,      0,      0,      0, 0x575F, /* 0x00 */
-    0x5760,      0, 0x5761, 0x5762,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0x5764,      0, 0x5765, 0x5766, 0x5767, /* 0x10 */
-         0, 0x5768, 0x5769,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0x576A, 0x576B, 0x576C,      0, /* 0x20 */
-    0x576D,      0,      0, 0x576E,      0,      0,      0, 0x576F, /* 0x30 */
-         0,      0, 0x5770,      0, 0x5771, 0x5772,      0,      0, /* 0x30 */
-         0,      0, 0x5773, 0x5774, 0x5775,      0,      0, 0x5776, /* 0x40 */
-         0,      0,      0,      0,      0, 0x5777, 0x5778,      0, /* 0x40 */
-         0, 0x5779,      0, 0x583E, 0x5763, 0x577A, 0x577B, 0x577C, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0x577D,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0x577E,      0,      0,      0,      0, 0x5821,      0, 0x5822, /* 0x70 */
-    0x5823,      0, 0x5824,      0, 0x5825,      0, 0x5826,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x5827,      0,      0, /* 0x80 */
-         0,      0, 0x5828,      0, 0x5829, 0x582A,      0,      0, /* 0x90 */
-    0x582B, 0x582C,      0, 0x582D, 0x582E, 0x582F,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0x5830, 0x5831, /* 0xA0 */
-         0, 0x5832,      0,      0, 0x5833, 0x584C,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x5834, 0x5835, /* 0xB0 */
-    0x5836,      0,      0,      0,      0,      0,      0, 0x5837, /* 0xC0 */
-         0, 0x5838,      0,      0,      0,      0,      0, 0x5839, /* 0xC0 */
-    0x583A, 0x583B,      0,      0, 0x583C,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x583D,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x583F,      0, 0x5840,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0x5841,      0, /* 0xF0 */
-    0x5842, 0x5843,      0,      0, 0x5844                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x575D, 0x575E, 	 0, 	 0, 	 0, 	 0, 	 0, 0x575F, /* 0x00 */
+    0x5760, 	 0, 0x5761, 0x5762, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x5764, 	 0, 0x5765, 0x5766, 0x5767, /* 0x10 */
+         0, 0x5768, 0x5769, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x576A, 0x576B, 0x576C, 	 0, /* 0x20 */
+    0x576D, 	 0, 	 0, 0x576E, 	 0, 	 0, 	 0, 0x576F, /* 0x30 */
+         0, 	 0, 0x5770, 	 0, 0x5771, 0x5772, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x5773, 0x5774, 0x5775, 	 0, 	 0, 0x5776, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5777, 0x5778, 	 0, /* 0x40 */
+         0, 0x5779, 	 0, 0x583E, 0x5763, 0x577A, 0x577B, 0x577C, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x577D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x577E, 	 0, 	 0, 	 0, 	 0, 0x5821, 	 0, 0x5822, /* 0x70 */
+    0x5823, 	 0, 0x5824, 	 0, 0x5825, 	 0, 0x5826, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5827, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x5828, 	 0, 0x5829, 0x582A, 	 0, 	 0, /* 0x90 */
+    0x582B, 0x582C, 	 0, 0x582D, 0x582E, 0x582F, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5830, 0x5831, /* 0xA0 */
+         0, 0x5832, 	 0, 	 0, 0x5833, 0x584C, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5834, 0x5835, /* 0xB0 */
+    0x5836, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5837, /* 0xC0 */
+         0, 0x5838, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5839, /* 0xC0 */
+    0x583A, 0x583B, 	 0, 	 0, 0x583C, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x583D, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x583F, 	 0, 0x5840, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5841, 	 0, /* 0xF0 */
+    0x5842, 0x5843, 	 0, 	 0, 0x5844							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_84[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x5845,      0,      0,      0,      0, 0x5846,      0, /* 0x00 */
-         0,      0, 0x5847,      0,      0,      0,      0, 0x5848, /* 0x00 */
-         0, 0x5849,      0,      0,      0, 0x584A,      0,      0, /* 0x10 */
-         0, 0x584B,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0x584D, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0x584E,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0x584F,      0, 0x5850, /* 0x40 */
-    0x5851,      0, 0x5852,      0,      0, 0x5853,      0, 0x5854, /* 0x40 */
-         0, 0x5855, 0x5856,      0,      0,      0, 0x5857,      0, /* 0x50 */
-    0x5858, 0x5859, 0x585A,      0, 0x585B,      0,      0,      0, /* 0x50 */
-    0x585C,      0,      0,      0, 0x585D, 0x585E,      0, 0x585F, /* 0x60 */
-         0,      0, 0x5860,      0,      0,      0,      0,      0, /* 0x60 */
-    0x5861,      0,      0, 0x5862, 0x5863,      0, 0x5864,      0, /* 0x70 */
-    0x5865,      0,      0,      0, 0x5866, 0x5867,      0,      0, /* 0x70 */
-         0, 0x5868,      0,      0,      0, 0x5869,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0x586A, 0x586B,      0, 0x586C,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0x586D,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0x586E,      0, /* 0xA0 */
-    0x586F, 0x5870, 0x5871,      0,      0,      0,      0, 0x5872, /* 0xA0 */
-         0, 0x5873,      0,      0, 0x5874,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x5875,      0,      0, 0x5876, 0x5877,      0, /* 0xB0 */
-    0x5878,      0, 0x5879,      0,      0,      0,      0, 0x587A, /* 0xC0 */
-    0x587B,      0,      0,      0, 0x587C,      0,      0, 0x587D, /* 0xC0 */
-         0,      0,      0, 0x587E,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x5921,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0x5922, /* 0xE0 */
-         0,      0, 0x5923,      0,      0,      0,      0, 0x5924, /* 0xE0 */
-    0x5925, 0x5926, 0x5927,      0,      0,      0,      0, 0x5928, /* 0xF0 */
-         0,      0, 0x592A, 0x592B,      0, 0x592C                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x5845, 	 0, 	 0, 	 0, 	 0, 0x5846, 	 0, /* 0x00 */
+         0, 	 0, 0x5847, 	 0, 	 0, 	 0, 	 0, 0x5848, /* 0x00 */
+         0, 0x5849, 	 0, 	 0, 	 0, 0x584A, 	 0, 	 0, /* 0x10 */
+         0, 0x584B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x584D, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x584E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x584F, 	 0, 0x5850, /* 0x40 */
+    0x5851, 	 0, 0x5852, 	 0, 	 0, 0x5853, 	 0, 0x5854, /* 0x40 */
+         0, 0x5855, 0x5856, 	 0, 	 0, 	 0, 0x5857, 	 0, /* 0x50 */
+    0x5858, 0x5859, 0x585A, 	 0, 0x585B, 	 0, 	 0, 	 0, /* 0x50 */
+    0x585C, 	 0, 	 0, 	 0, 0x585D, 0x585E, 	 0, 0x585F, /* 0x60 */
+         0, 	 0, 0x5860, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x5861, 	 0, 	 0, 0x5862, 0x5863, 	 0, 0x5864, 	 0, /* 0x70 */
+    0x5865, 	 0, 	 0, 	 0, 0x5866, 0x5867, 	 0, 	 0, /* 0x70 */
+         0, 0x5868, 	 0, 	 0, 	 0, 0x5869, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0x586A, 0x586B, 	 0, 0x586C, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x586D, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x586E, 	 0, /* 0xA0 */
+    0x586F, 0x5870, 0x5871, 	 0, 	 0, 	 0, 	 0, 0x5872, /* 0xA0 */
+         0, 0x5873, 	 0, 	 0, 0x5874, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x5875, 	 0, 	 0, 0x5876, 0x5877, 	 0, /* 0xB0 */
+    0x5878, 	 0, 0x5879, 	 0, 	 0, 	 0, 	 0, 0x587A, /* 0xC0 */
+    0x587B, 	 0, 	 0, 	 0, 0x587C, 	 0, 	 0, 0x587D, /* 0xC0 */
+         0, 	 0, 	 0, 0x587E, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x5921, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5922, /* 0xE0 */
+         0, 	 0, 0x5923, 	 0, 	 0, 	 0, 	 0, 0x5924, /* 0xE0 */
+    0x5925, 0x5926, 0x5927, 	 0, 	 0, 	 0, 	 0, 0x5928, /* 0xF0 */
+         0, 	 0, 0x592A, 0x592B, 	 0, 0x592C					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_85[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x592D, 0x592E,      0,      0,      0, 0x592F, /* 0x00 */
-         0,      0,      0,      0, 0x5930,      0, 0x5931,      0, /* 0x00 */
-    0x5932,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0x5933,      0, 0x5934,      0, /* 0x10 */
-         0,      0, 0x5935, 0x5936, 0x5937, 0x5938,      0, 0x5939, /* 0x20 */
-         0,      0, 0x593A, 0x593B,      0,      0,      0, 0x593C, /* 0x20 */
-         0,      0, 0x5929, 0x593D, 0x593E,      0, 0x593F,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0x5940, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0x5941,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0x5942, /* 0x40 */
-    0x5943, 0x5944, 0x5945, 0x5946,      0,      0, 0x5947,      0, /* 0x50 */
-         0, 0x5948,      0,      0, 0x5949, 0x594A, 0x594B, 0x594C, /* 0x50 */
-    0x594D, 0x594E, 0x594F,      0, 0x5950,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0x5951,      0,      0,      0, 0x5952, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x5953, 0x5954, 0x5955,      0, 0x5956,      0, 0x5957, /* 0x70 */
-         0, 0x5958,      0,      0,      0, 0x5959, 0x595A,      0, /* 0x80 */
-         0, 0x595B,      0, 0x595C, 0x595D,      0,      0, 0x595E, /* 0x80 */
-         0,      0,      0, 0x595F,      0,      0,      0,      0, /* 0x90 */
-    0x5960,      0,      0,      0,      0, 0x5961,      0, 0x5962, /* 0x90 */
-    0x5963,      0, 0x5964,      0,      0, 0x5965,      0, 0x5966, /* 0xA0 */
-         0,      0,      0,      0,      0, 0x5974,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x5967,      0, 0x5968, 0x5969, /* 0xB0 */
-    0x596A,      0,      0,      0, 0x596B, 0x596C, 0x596D, 0x596E, /* 0xB0 */
-         0,      0, 0x596F,      0,      0,      0,      0, 0x5970, /* 0xC0 */
-         0,      0, 0x5971, 0x5972,      0,      0, 0x5973,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x5975,      0, 0x5976,      0,      0,      0,      0, 0x5977, /* 0xD0 */
-    0x5978,      0,      0,      0,      0,      0, 0x5979,      0, /* 0xE0 */
-    0x597A,      0,      0,      0,      0, 0x597B,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x597C,      0,      0, 0x597D,      0, /* 0xF0 */
-         0,      0,      0,      0, 0x597E,      0,      0, 0x5A21  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x592D, 0x592E, 	 0, 	 0, 	 0, 0x592F, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x5930, 	 0, 0x5931, 	 0, /* 0x00 */
+    0x5932, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x5933, 	 0, 0x5934, 	 0, /* 0x10 */
+         0, 	 0, 0x5935, 0x5936, 0x5937, 0x5938, 	 0, 0x5939, /* 0x20 */
+         0, 	 0, 0x593A, 0x593B, 	 0, 	 0, 	 0, 0x593C, /* 0x20 */
+         0, 	 0, 0x5929, 0x593D, 0x593E, 	 0, 0x593F, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5940, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5941, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5942, /* 0x40 */
+    0x5943, 0x5944, 0x5945, 0x5946, 	 0, 	 0, 0x5947, 	 0, /* 0x50 */
+         0, 0x5948, 	 0, 	 0, 0x5949, 0x594A, 0x594B, 0x594C, /* 0x50 */
+    0x594D, 0x594E, 0x594F, 	 0, 0x5950, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x5951, 	 0, 	 0, 	 0, 0x5952, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x5953, 0x5954, 0x5955, 	 0, 0x5956, 	 0, 0x5957, /* 0x70 */
+         0, 0x5958, 	 0, 	 0, 	 0, 0x5959, 0x595A, 	 0, /* 0x80 */
+         0, 0x595B, 	 0, 0x595C, 0x595D, 	 0, 	 0, 0x595E, /* 0x80 */
+         0, 	 0, 	 0, 0x595F, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x5960, 	 0, 	 0, 	 0, 	 0, 0x5961, 	 0, 0x5962, /* 0x90 */
+    0x5963, 	 0, 0x5964, 	 0, 	 0, 0x5965, 	 0, 0x5966, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5974, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x5967, 	 0, 0x5968, 0x5969, /* 0xB0 */
+    0x596A, 	 0, 	 0, 	 0, 0x596B, 0x596C, 0x596D, 0x596E, /* 0xB0 */
+         0, 	 0, 0x596F, 	 0, 	 0, 	 0, 	 0, 0x5970, /* 0xC0 */
+         0, 	 0, 0x5971, 0x5972, 	 0, 	 0, 0x5973, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x5975, 	 0, 0x5976, 	 0, 	 0, 	 0, 	 0, 0x5977, /* 0xD0 */
+    0x5978, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5979, 	 0, /* 0xE0 */
+    0x597A, 	 0, 	 0, 	 0, 	 0, 0x597B, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x597C, 	 0, 	 0, 0x597D, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0x597E, 	 0, 	 0, 0x5A21	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_86[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x5A22,      0,      0,      0, 0x5A23, 0x5A24,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0x5A25, 0x5A26,      0, /* 0x00 */
-    0x5A27, 0x5A28, 0x5A29,      0,      0,      0,      0,      0, /* 0x10 */
-    0x5A2A, 0x5A2B,      0, 0x5A2C,      0,      0, 0x5A2D,      0, /* 0x10 */
-         0, 0x5A2E,      0,      0,      0,      0,      0, 0x5A2F, /* 0x20 */
-         0, 0x5A30,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x5A31,      0, /* 0x30 */
-    0x5A32,      0, 0x5A33,      0, 0x5A34, 0x5A35,      0,      0, /* 0x30 */
-    0x5A36, 0x3866, 0x5A37,      0,      0,      0, 0x5A38,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x5A39, 0x5A3A,      0,      0, 0x5A3B, 0x5A3C, /* 0x50 */
-    0x5A3D, 0x5A3E,      0,      0,      0, 0x5A3F,      0,      0, /* 0x50 */
-    0x5A40, 0x5A41, 0x5A42, 0x5A43, 0x5A44,      0,      0,      0, /* 0x60 */
-         0, 0x5A45,      0,      0, 0x5A46,      0,      0, 0x5A47, /* 0x60 */
-         0,      0,      0,      0,      0, 0x5A48, 0x5A49, 0x5A4A, /* 0x70 */
-         0,      0, 0x5A4B,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0x5A6D,      0,      0,      0,      0, 0x5A4C,      0,      0, /* 0x80 */
-         0, 0x5A4D,      0,      0,      0,      0, 0x5A4E,      0, /* 0x90 */
-    0x5A4F,      0, 0x5A50,      0, 0x5A51,      0,      0,      0, /* 0x90 */
-         0, 0x5A52,      0,      0,      0,      0, 0x5A53, 0x5A54, /* 0xA0 */
-    0x5A55,      0,      0,      0,      0, 0x5A56,      0,      0, /* 0xA0 */
-         0, 0x5A57,      0, 0x5A58, 0x5A59, 0x5A5A,      0, 0x5A5B, /* 0xB0 */
-    0x5A5C, 0x5A5D,      0,      0,      0,      0,      0, 0x5A5E, /* 0xB0 */
-    0x5A5F, 0x5A60,      0, 0x5A61,      0, 0x5A62,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x5A63, 0x5A64,      0,      0, 0x5A65,      0, 0x5A66, /* 0xD0 */
-         0,      0, 0x5A67,      0, 0x5A68,      0,      0,      0, /* 0xD0 */
-    0x5A69,      0,      0, 0x5A6A,      0, 0x5A6B,      0, 0x5A6C, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x5A6E,      0, 0x5A6F, 0x5A70                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x5A22, 	 0, 	 0, 	 0, 0x5A23, 0x5A24, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5A25, 0x5A26, 	 0, /* 0x00 */
+    0x5A27, 0x5A28, 0x5A29, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x5A2A, 0x5A2B, 	 0, 0x5A2C, 	 0, 	 0, 0x5A2D, 	 0, /* 0x10 */
+         0, 0x5A2E, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5A2F, /* 0x20 */
+         0, 0x5A30, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5A31, 	 0, /* 0x30 */
+    0x5A32, 	 0, 0x5A33, 	 0, 0x5A34, 0x5A35, 	 0, 	 0, /* 0x30 */
+    0x5A36, 0x3866, 0x5A37, 	 0, 	 0, 	 0, 0x5A38, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x5A39, 0x5A3A, 	 0, 	 0, 0x5A3B, 0x5A3C, /* 0x50 */
+    0x5A3D, 0x5A3E, 	 0, 	 0, 	 0, 0x5A3F, 	 0, 	 0, /* 0x50 */
+    0x5A40, 0x5A41, 0x5A42, 0x5A43, 0x5A44, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x5A45, 	 0, 	 0, 0x5A46, 	 0, 	 0, 0x5A47, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5A48, 0x5A49, 0x5A4A, /* 0x70 */
+         0, 	 0, 0x5A4B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x5A6D, 	 0, 	 0, 	 0, 	 0, 0x5A4C, 	 0, 	 0, /* 0x80 */
+         0, 0x5A4D, 	 0, 	 0, 	 0, 	 0, 0x5A4E, 	 0, /* 0x90 */
+    0x5A4F, 	 0, 0x5A50, 	 0, 0x5A51, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x5A52, 	 0, 	 0, 	 0, 	 0, 0x5A53, 0x5A54, /* 0xA0 */
+    0x5A55, 	 0, 	 0, 	 0, 	 0, 0x5A56, 	 0, 	 0, /* 0xA0 */
+         0, 0x5A57, 	 0, 0x5A58, 0x5A59, 0x5A5A, 	 0, 0x5A5B, /* 0xB0 */
+    0x5A5C, 0x5A5D, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5A5E, /* 0xB0 */
+    0x5A5F, 0x5A60, 	 0, 0x5A61, 	 0, 0x5A62, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x5A63, 0x5A64, 	 0, 	 0, 0x5A65, 	 0, 0x5A66, /* 0xD0 */
+         0, 	 0, 0x5A67, 	 0, 0x5A68, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x5A69, 	 0, 	 0, 0x5A6A, 	 0, 0x5A6B, 	 0, 0x5A6C, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x5A6E, 	 0, 0x5A6F, 0x5A70					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_87[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0x5A71, 0x5A72,      0, 0x5A73, /* 0x00 */
-         0,      0,      0, 0x5A74,      0,      0, 0x5A75, 0x5A76, /* 0x00 */
-    0x5A77,      0,      0, 0x5A78, 0x5A79,      0,      0,      0, /* 0x10 */
-         0, 0x5A7A,      0,      0,      0,      0, 0x5A7B, 0x5A7C, /* 0x10 */
-         0, 0x5A7D,      0, 0x5A7E,      0,      0,      0,      0, /* 0x20 */
-    0x5B21,      0,      0,      0,      0,      0, 0x5B22, 0x5B23, /* 0x20 */
-         0, 0x5B24, 0x5B25,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0x5B26, 0x5B27,      0, 0x5B28, 0x5B29, 0x5B2A,      0, /* 0x30 */
-    0x5B2B,      0,      0, 0x5B2C,      0, 0x5B2D,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0x5B2E,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0x5B2F,      0,      0,      0,      0, 0x5B30,      0,      0, /* 0x50 */
-         0, 0x5B31,      0,      0, 0x5B32, 0x5B33,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0x5B34, /* 0x60 */
-         0, 0x5B35, 0x5B36,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0x5B37,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0x5B38, 0x5B39, 0x5B3A, 0x5B3B, 0x5B3C, /* 0x80 */
-    0x5B3D, 0x5B3E,      0, 0x5B3F, 0x5B40,      0,      0,      0, /* 0x80 */
-    0x5B41,      0,      0, 0x5B42,      0, 0x5B43,      0, 0x5B44, /* 0x90 */
-    0x5B45, 0x5B46,      0,      0,      0,      0, 0x5B47,      0, /* 0x90 */
-    0x5B48,      0,      0, 0x5B49,      0,      0,      0, 0x5B4A, /* 0xA0 */
-         0,      0,      0,      0, 0x5B4B, 0x5B4C, 0x5B4D,      0, /* 0xA0 */
-         0, 0x5B4E,      0,      0,      0, 0x5B4F,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x5B50, 0x5B51, /* 0xB0 */
-         0, 0x5B52,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0x5B53, 0x5B54, 0x5B55,      0,      0,      0, 0x5B56,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0x5B57, 0x5B58,      0, /* 0xD0 */
-         0, 0x5B59, 0x5B5A,      0, 0x5B5B,      0,      0, 0x5B5C, /* 0xD0 */
-         0,      0, 0x5B5D, 0x5B5E, 0x5B5F,      0,      0,      0, /* 0xE0 */
-         0,      0, 0x5B60, 0x5B61,      0, 0x5B62,      0,      0, /* 0xE0 */
-         0, 0x5B63,      0, 0x5B64,      0,      0,      0,      0, /* 0xF0 */
-    0x5B65,      0, 0x5B66,      0,      0,      0,      0, 0x5B67  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0x5A71, 0x5A72, 	 0, 0x5A73, /* 0x00 */
+         0, 	 0, 	 0, 0x5A74, 	 0, 	 0, 0x5A75, 0x5A76, /* 0x00 */
+    0x5A77, 	 0, 	 0, 0x5A78, 0x5A79, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0x5A7A, 	 0, 	 0, 	 0, 	 0, 0x5A7B, 0x5A7C, /* 0x10 */
+         0, 0x5A7D, 	 0, 0x5A7E, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x5B21, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5B22, 0x5B23, /* 0x20 */
+         0, 0x5B24, 0x5B25, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x5B26, 0x5B27, 	 0, 0x5B28, 0x5B29, 0x5B2A, 	 0, /* 0x30 */
+    0x5B2B, 	 0, 	 0, 0x5B2C, 	 0, 0x5B2D, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5B2E, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x5B2F, 	 0, 	 0, 	 0, 	 0, 0x5B30, 	 0, 	 0, /* 0x50 */
+         0, 0x5B31, 	 0, 	 0, 0x5B32, 0x5B33, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5B34, /* 0x60 */
+         0, 0x5B35, 0x5B36, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x5B37, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x5B38, 0x5B39, 0x5B3A, 0x5B3B, 0x5B3C, /* 0x80 */
+    0x5B3D, 0x5B3E, 	 0, 0x5B3F, 0x5B40, 	 0, 	 0, 	 0, /* 0x80 */
+    0x5B41, 	 0, 	 0, 0x5B42, 	 0, 0x5B43, 	 0, 0x5B44, /* 0x90 */
+    0x5B45, 0x5B46, 	 0, 	 0, 	 0, 	 0, 0x5B47, 	 0, /* 0x90 */
+    0x5B48, 	 0, 	 0, 0x5B49, 	 0, 	 0, 	 0, 0x5B4A, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x5B4B, 0x5B4C, 0x5B4D, 	 0, /* 0xA0 */
+         0, 0x5B4E, 	 0, 	 0, 	 0, 0x5B4F, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5B50, 0x5B51, /* 0xB0 */
+         0, 0x5B52, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x5B53, 0x5B54, 0x5B55, 	 0, 	 0, 	 0, 0x5B56, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5B57, 0x5B58, 	 0, /* 0xD0 */
+         0, 0x5B59, 0x5B5A, 	 0, 0x5B5B, 	 0, 	 0, 0x5B5C, /* 0xD0 */
+         0, 	 0, 0x5B5D, 0x5B5E, 0x5B5F, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x5B60, 0x5B61, 	 0, 0x5B62, 	 0, 	 0, /* 0xE0 */
+         0, 0x5B63, 	 0, 0x5B64, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0x5B65, 	 0, 0x5B66, 	 0, 	 0, 	 0, 	 0, 0x5B67	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_88[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x5B68,      0, 0x5B69,      0,      0, 0x5B6A,      0, /* 0x00 */
-         0, 0x5B6B, 0x5B6C, 0x5B6D,      0,      0,      0,      0, /* 0x00 */
-    0x5B6E,      0, 0x5B70, 0x5B71, 0x5B72,      0,      0,      0, /* 0x10 */
-    0x5B73, 0x5B6F, 0x5B74, 0x5B75, 0x5B76,      0, 0x5B77, 0x5B78, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0x5B79,      0,      0,      0,      0, 0x5B7A, 0x5B7B,      0, /* 0x20 */
-    0x5B7C,      0, 0x5B7D,      0,      0, 0x5B7E,      0,      0, /* 0x30 */
-         0,      0, 0x5C21,      0, 0x5C22,      0,      0,      0, /* 0x30 */
-         0, 0x5C23,      0, 0x5C24,      0, 0x5C25,      0,      0, /* 0x40 */
-    0x5C26, 0x5C27, 0x5C28, 0x5C29,      0,      0, 0x5C2A,      0, /* 0x40 */
-         0, 0x5C2B,      0,      0,      0, 0x5C2C, 0x5C2D,      0, /* 0x50 */
-    0x5C2E,      0, 0x5C2F,      0, 0x5C30,      0,      0, 0x5C31, /* 0x50 */
-    0x5C32,      0,      0,      0, 0x5C33,      0,      0,      0, /* 0x60 */
-         0, 0x5C34,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0x5C35,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x5C36,      0, 0x5C37,      0,      0,      0,      0, /* 0x70 */
-    0x5C38,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x5C39,      0, 0x5C3A, 0x5C3B, 0x5C3C,      0,      0, 0x5C3D, /* 0x90 */
-    0x5C3E,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x5C3F,      0, 0x5C40,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x5C41,      0,      0, 0x5C42, 0x5C43,      0, /* 0xB0 */
-    0x5C44,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x5C45, 0x5C46, 0x5C47, 0x5C48, 0x5C49,      0, /* 0xC0 */
-         0, 0x5C4A, 0x5C4B, 0x5C4C,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0x5C4D,      0,      0, 0x5C4E,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0x5C4F, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0x5C50, /* 0xE0 */
-    0x5C51, 0x5C52,      0,      0,      0, 0x5C53,      0, 0x5C54  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x5B68, 	 0, 0x5B69, 	 0, 	 0, 0x5B6A, 	 0, /* 0x00 */
+         0, 0x5B6B, 0x5B6C, 0x5B6D, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0x5B6E, 	 0, 0x5B70, 0x5B71, 0x5B72, 	 0, 	 0, 	 0, /* 0x10 */
+    0x5B73, 0x5B6F, 0x5B74, 0x5B75, 0x5B76, 	 0, 0x5B77, 0x5B78, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x5B79, 	 0, 	 0, 	 0, 	 0, 0x5B7A, 0x5B7B, 	 0, /* 0x20 */
+    0x5B7C, 	 0, 0x5B7D, 	 0, 	 0, 0x5B7E, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x5C21, 	 0, 0x5C22, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x5C23, 	 0, 0x5C24, 	 0, 0x5C25, 	 0, 	 0, /* 0x40 */
+    0x5C26, 0x5C27, 0x5C28, 0x5C29, 	 0, 	 0, 0x5C2A, 	 0, /* 0x40 */
+         0, 0x5C2B, 	 0, 	 0, 	 0, 0x5C2C, 0x5C2D, 	 0, /* 0x50 */
+    0x5C2E, 	 0, 0x5C2F, 	 0, 0x5C30, 	 0, 	 0, 0x5C31, /* 0x50 */
+    0x5C32, 	 0, 	 0, 	 0, 0x5C33, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x5C34, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x5C35, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x5C36, 	 0, 0x5C37, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0x5C38, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x5C39, 	 0, 0x5C3A, 0x5C3B, 0x5C3C, 	 0, 	 0, 0x5C3D, /* 0x90 */
+    0x5C3E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x5C3F, 	 0, 0x5C40, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x5C41, 	 0, 	 0, 0x5C42, 0x5C43, 	 0, /* 0xB0 */
+    0x5C44, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x5C45, 0x5C46, 0x5C47, 0x5C48, 0x5C49, 	 0, /* 0xC0 */
+         0, 0x5C4A, 0x5C4B, 0x5C4C, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0x5C4D, 	 0, 	 0, 0x5C4E, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5C4F, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5C50, /* 0xE0 */
+    0x5C51, 0x5C52, 	 0, 	 0, 	 0, 0x5C53, 	 0, 0x5C54	/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -2492,447 +2492,447 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0212_88[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_89[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x5C55,      0,      0,      0,      0, 0x5C56,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0x5C57, 0x5C58, 0x5C59, /* 0x00 */
-         0,      0,      0,      0,      0, 0x5C5A, 0x5C5B,      0, /* 0x10 */
-    0x5C5C, 0x5C5D, 0x5C5E,      0, 0x5C5F,      0,      0,      0, /* 0x10 */
-    0x5C60,      0,      0,      0,      0,      0, 0x5C61, 0x5C62, /* 0x20 */
-    0x5C63,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0x5C64, 0x5C65, 0x5C66,      0,      0, 0x5C67,      0,      0, /* 0x30 */
-         0, 0x5C68, 0x5C69,      0,      0,      0, 0x5C6A,      0, /* 0x30 */
-    0x5C6B,      0, 0x5C6C,      0,      0, 0x5C6D, 0x5C6E,      0, /* 0x40 */
-         0, 0x5C6F,      0,      0,      0,      0,      0, 0x5C70, /* 0x40 */
-         0,      0, 0x5C71,      0,      0,      0,      0, 0x5C72, /* 0x50 */
-         0,      0, 0x5C73, 0x5C74, 0x5C75,      0,      0,      0, /* 0x50 */
-         0, 0x5C76, 0x5C77, 0x5C78,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0x5C79,      0,      0, 0x5C7A,      0, /* 0x60 */
-    0x5C7B,      0,      0, 0x5C7C,      0, 0x5C7D,      0,      0, /* 0x70 */
-         0,      0, 0x5C7E, 0x5D21, 0x5D22, 0x5D23,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0x5D24,      0,      0,      0, 0x5D25,      0,      0, /* 0x80 */
-    0x5D26,      0,      0,      0, 0x5D27, 0x5D28,      0,      0, /* 0x90 */
-         0,      0,      0, 0x5D29, 0x5D2A,      0,      0, 0x5D2B, /* 0x90 */
-    0x5D2C,      0,      0,      0,      0, 0x5D2D,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x5D2E,      0,      0,      0, 0x5D2F, 0x5D30, 0x5D31, 0x5D32, /* 0xB0 */
-         0,      0,      0,      0, 0x5D33,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x5D34, 0x5D35, 0x5D36, 0x5D37, /* 0xD0 */
-    0x5D38,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x5D39,      0,      0, /* 0xE0 */
-         0, 0x5D3A,      0, 0x5D3B,      0, 0x5D3C,      0,      0, /* 0xE0 */
-         0, 0x5D3D,      0, 0x5D3E,      0,      0, 0x5D3F,      0, /* 0xF0 */
-         0, 0x5D40,      0,      0,      0, 0x5D41,      0, 0x5D42  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x5C55, 	 0, 	 0, 	 0, 	 0, 0x5C56, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5C57, 0x5C58, 0x5C59, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5C5A, 0x5C5B, 	 0, /* 0x10 */
+    0x5C5C, 0x5C5D, 0x5C5E, 	 0, 0x5C5F, 	 0, 	 0, 	 0, /* 0x10 */
+    0x5C60, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5C61, 0x5C62, /* 0x20 */
+    0x5C63, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x5C64, 0x5C65, 0x5C66, 	 0, 	 0, 0x5C67, 	 0, 	 0, /* 0x30 */
+         0, 0x5C68, 0x5C69, 	 0, 	 0, 	 0, 0x5C6A, 	 0, /* 0x30 */
+    0x5C6B, 	 0, 0x5C6C, 	 0, 	 0, 0x5C6D, 0x5C6E, 	 0, /* 0x40 */
+         0, 0x5C6F, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5C70, /* 0x40 */
+         0, 	 0, 0x5C71, 	 0, 	 0, 	 0, 	 0, 0x5C72, /* 0x50 */
+         0, 	 0, 0x5C73, 0x5C74, 0x5C75, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x5C76, 0x5C77, 0x5C78, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x5C79, 	 0, 	 0, 0x5C7A, 	 0, /* 0x60 */
+    0x5C7B, 	 0, 	 0, 0x5C7C, 	 0, 0x5C7D, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x5C7E, 0x5D21, 0x5D22, 0x5D23, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x5D24, 	 0, 	 0, 	 0, 0x5D25, 	 0, 	 0, /* 0x80 */
+    0x5D26, 	 0, 	 0, 	 0, 0x5D27, 0x5D28, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x5D29, 0x5D2A, 	 0, 	 0, 0x5D2B, /* 0x90 */
+    0x5D2C, 	 0, 	 0, 	 0, 	 0, 0x5D2D, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x5D2E, 	 0, 	 0, 	 0, 0x5D2F, 0x5D30, 0x5D31, 0x5D32, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0x5D33, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x5D34, 0x5D35, 0x5D36, 0x5D37, /* 0xD0 */
+    0x5D38, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5D39, 	 0, 	 0, /* 0xE0 */
+         0, 0x5D3A, 	 0, 0x5D3B, 	 0, 0x5D3C, 	 0, 	 0, /* 0xE0 */
+         0, 0x5D3D, 	 0, 0x5D3E, 	 0, 	 0, 0x5D3F, 	 0, /* 0xF0 */
+         0, 0x5D40, 	 0, 	 0, 	 0, 0x5D41, 	 0, 0x5D42	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_8A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0x5D43, 0x5D44,      0, 0x5D45, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0, 0x5D46, /* 0x00 */
-         0, 0x5D47, 0x5D48,      0, 0x5D49, 0x5D4A,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x5D4B,      0, /* 0x10 */
-    0x5D4C,      0, 0x5D4D,      0, 0x5D4E,      0, 0x5D4F,      0, /* 0x20 */
-         0,      0,      0, 0x5D50, 0x5D51,      0,      0, 0x5D52, /* 0x20 */
-         0,      0,      0,      0,      0, 0x5D53,      0, 0x5D54, /* 0x30 */
-         0,      0,      0,      0,      0, 0x5D55, 0x5D56,      0, /* 0x30 */
-    0x5D57,      0,      0, 0x5D58,      0, 0x5D59,      0, 0x5D5A, /* 0x40 */
-         0, 0x5D5B,      0,      0,      0, 0x5D5C, 0x5D5D,      0, /* 0x40 */
-         0,      0,      0, 0x5D5E,      0,      0, 0x5D5F, 0x5D60, /* 0x50 */
-    0x5D61,      0,      0,      0, 0x5D62, 0x5D63,      0,      0, /* 0x50 */
-         0, 0x5D64,      0,      0,      0, 0x5D65,      0, 0x5D66, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0x5D67, 0x5D68, 0x5D69, /* 0x70 */
-         0, 0x5D6A, 0x5D6B, 0x5D6C,      0,      0, 0x5D6D, 0x5D6E, /* 0x70 */
-    0x5D6F,      0,      0, 0x5D70,      0,      0, 0x5D71,      0, /* 0x80 */
-         0,      0,      0, 0x5D72,      0,      0,      0, 0x5D73, /* 0x80 */
-    0x5D74,      0, 0x5D75,      0,      0,      0, 0x5D76, 0x5D77, /* 0x90 */
-         0, 0x5D78,      0,      0,      0,      0,      0, 0x5D79, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0x5D7A, /* 0xA0 */
-         0, 0x5D7B,      0,      0,      0,      0, 0x5D7C, 0x5D7D, /* 0xA0 */
-         0,      0,      0, 0x5D7E,      0,      0, 0x5E21, 0x5E22, /* 0xB0 */
-         0,      0,      0, 0x5E23,      0,      0, 0x5E24,      0, /* 0xB0 */
-         0,      0,      0, 0x5E25,      0,      0, 0x5E26,      0, /* 0xC0 */
-    0x5E27, 0x5E28, 0x5E29,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x5E2A,      0, 0x5E2B, 0x5E2C, 0x5E2D,      0, 0x5E2E, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x5E2F,      0, 0x5E30, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0x5E31,      0,      0,      0, /* 0xE0 */
-    0x5E32,      0,      0,      0, 0x5E33, 0x5E34, 0x5E35,      0, /* 0xF0 */
-         0,      0,      0,      0, 0x5E36,      0,      0, 0x5E37  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0x5D43, 0x5D44, 	 0, 0x5D45, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5D46, /* 0x00 */
+         0, 0x5D47, 0x5D48, 	 0, 0x5D49, 0x5D4A, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5D4B, 	 0, /* 0x10 */
+    0x5D4C, 	 0, 0x5D4D, 	 0, 0x5D4E, 	 0, 0x5D4F, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x5D50, 0x5D51, 	 0, 	 0, 0x5D52, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5D53, 	 0, 0x5D54, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5D55, 0x5D56, 	 0, /* 0x30 */
+    0x5D57, 	 0, 	 0, 0x5D58, 	 0, 0x5D59, 	 0, 0x5D5A, /* 0x40 */
+         0, 0x5D5B, 	 0, 	 0, 	 0, 0x5D5C, 0x5D5D, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x5D5E, 	 0, 	 0, 0x5D5F, 0x5D60, /* 0x50 */
+    0x5D61, 	 0, 	 0, 	 0, 0x5D62, 0x5D63, 	 0, 	 0, /* 0x50 */
+         0, 0x5D64, 	 0, 	 0, 	 0, 0x5D65, 	 0, 0x5D66, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5D67, 0x5D68, 0x5D69, /* 0x70 */
+         0, 0x5D6A, 0x5D6B, 0x5D6C, 	 0, 	 0, 0x5D6D, 0x5D6E, /* 0x70 */
+    0x5D6F, 	 0, 	 0, 0x5D70, 	 0, 	 0, 0x5D71, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x5D72, 	 0, 	 0, 	 0, 0x5D73, /* 0x80 */
+    0x5D74, 	 0, 0x5D75, 	 0, 	 0, 	 0, 0x5D76, 0x5D77, /* 0x90 */
+         0, 0x5D78, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5D79, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5D7A, /* 0xA0 */
+         0, 0x5D7B, 	 0, 	 0, 	 0, 	 0, 0x5D7C, 0x5D7D, /* 0xA0 */
+         0, 	 0, 	 0, 0x5D7E, 	 0, 	 0, 0x5E21, 0x5E22, /* 0xB0 */
+         0, 	 0, 	 0, 0x5E23, 	 0, 	 0, 0x5E24, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x5E25, 	 0, 	 0, 0x5E26, 	 0, /* 0xC0 */
+    0x5E27, 0x5E28, 0x5E29, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x5E2A, 	 0, 0x5E2B, 0x5E2C, 0x5E2D, 	 0, 0x5E2E, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5E2F, 	 0, 0x5E30, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x5E31, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x5E32, 	 0, 	 0, 	 0, 0x5E33, 0x5E34, 0x5E35, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0x5E36, 	 0, 	 0, 0x5E37	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_8B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0x5E38, 0x5E39,      0, /* 0x00 */
-         0,      0, 0x5E3F, 0x5E3A,      0,      0,      0,      0, /* 0x00 */
-         0, 0x5E3B,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0x5E3C,      0, 0x5E3D, 0x5E3E, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0x5E40,      0,      0, /* 0x20 */
-    0x5E41,      0,      0,      0,      0,      0,      0, 0x5E42, /* 0x30 */
-         0,      0,      0,      0, 0x5E43,      0,      0,      0, /* 0x30 */
-         0,      0, 0x5E44, 0x5E45, 0x5E46, 0x5E47, 0x5E48,      0, /* 0x40 */
-    0x5E49,      0,      0,      0,      0, 0x5E4E,      0,      0, /* 0x40 */
-         0,      0, 0x5E4A, 0x5E4B, 0x5E4C,      0,      0,      0, /* 0x50 */
-         0, 0x5E4D,      0,      0,      0,      0, 0x5E4F,      0, /* 0x50 */
-         0,      0,      0, 0x5E50,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0x5E51,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0x5E52,      0, /* 0x70 */
-    0x5E53, 0x5E54,      0,      0, 0x5E55,      0, 0x5E56,      0, /* 0x70 */
-         0, 0x5E57,      0,      0, 0x5E58, 0x5E59,      0,      0, /* 0x80 */
-         0,      0,      0, 0x5E5A,      0, 0x5E5B,      0, 0x5E5C, /* 0x80 */
-         0,      0,      0,      0, 0x5E5D, 0x5E5E,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0x5E5F,      0, 0x5E60, 0x5E61  /* 0x90 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0x5E38, 0x5E39, 	 0, /* 0x00 */
+         0, 	 0, 0x5E3F, 0x5E3A, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x5E3B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x5E3C, 	 0, 0x5E3D, 0x5E3E, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5E40, 	 0, 	 0, /* 0x20 */
+    0x5E41, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5E42, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x5E43, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x5E44, 0x5E45, 0x5E46, 0x5E47, 0x5E48, 	 0, /* 0x40 */
+    0x5E49, 	 0, 	 0, 	 0, 	 0, 0x5E4E, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x5E4A, 0x5E4B, 0x5E4C, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x5E4D, 	 0, 	 0, 	 0, 	 0, 0x5E4F, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x5E50, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5E51, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5E52, 	 0, /* 0x70 */
+    0x5E53, 0x5E54, 	 0, 	 0, 0x5E55, 	 0, 0x5E56, 	 0, /* 0x70 */
+         0, 0x5E57, 	 0, 	 0, 0x5E58, 0x5E59, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0x5E5A, 	 0, 0x5E5B, 	 0, 0x5E5C, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0x5E5D, 0x5E5E, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x5E5F, 	 0, 0x5E60, 0x5E61	/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_8C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x30 */
-    0x5E62, 0x5E63,      0,      0,      0, 0x5E64, 0x5E65,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0x5E66,      0, 0x5E67, /* 0x40 */
-         0, 0x5E68,      0, 0x5E69,      0,      0,      0, 0x5E6A, /* 0x40 */
-         0, 0x5E6B,      0, 0x5E6C, 0x5E6D,      0,      0, 0x5E6E, /* 0x50 */
-    0x5E6F, 0x5E72,      0, 0x5E70,      0, 0x5E71,      0,      0, /* 0x50 */
-         0,      0,      0, 0x5E73, 0x5E74,      0, 0x5E75,      0, /* 0x60 */
-    0x5E76, 0x5E77,      0,      0,      0, 0x5E78,      0,      0, /* 0x60 */
-         0,      0,      0, 0x5E79,      0, 0x5E7A, 0x5E7B,      0, /* 0x70 */
-         0,      0,      0, 0x5E7C,      0,      0, 0x5E7D,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0x5E7E, 0x5F21, /* 0x80 */
-         0,      0,      0, 0x5F22,      0,      0,      0,      0, /* 0x80 */
-    0x5F23,      0, 0x5F24, 0x5F25,      0,      0,      0,      0, /* 0x90 */
-         0, 0x5F26,      0, 0x5F27, 0x5F28,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0x5F29,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x5F2A, 0x5F2B,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x5F2C, 0x5F2D,      0, /* 0xC0 */
-         0, 0x5F2E,      0, 0x5F2F,      0,      0,      0, 0x5F30, /* 0xC0 */
-         0,      0,      0,      0,      0, 0x5F32, 0x5F31,      0, /* 0xD0 */
-         0, 0x5F33,      0,      0,      0, 0x5F34,      0,      0, /* 0xD0 */
-         0, 0x5F35,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x5F36,      0,      0,      0, 0x5F37,      0,      0, 0x5F38, /* 0xE0 */
-    0x5F39,      0, 0x5F3A,      0,      0, 0x5F3B,      0, 0x5F3C, /* 0xF0 */
-    0x5F3D,      0,      0,      0,      0,      0, 0x5F3E, 0x5F3F  /* 0xF0 */
+    0x5E62, 0x5E63, 	 0, 	 0, 	 0, 0x5E64, 0x5E65, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5E66, 	 0, 0x5E67, /* 0x40 */
+         0, 0x5E68, 	 0, 0x5E69, 	 0, 	 0, 	 0, 0x5E6A, /* 0x40 */
+         0, 0x5E6B, 	 0, 0x5E6C, 0x5E6D, 	 0, 	 0, 0x5E6E, /* 0x50 */
+    0x5E6F, 0x5E72, 	 0, 0x5E70, 	 0, 0x5E71, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x5E73, 0x5E74, 	 0, 0x5E75, 	 0, /* 0x60 */
+    0x5E76, 0x5E77, 	 0, 	 0, 	 0, 0x5E78, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x5E79, 	 0, 0x5E7A, 0x5E7B, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x5E7C, 	 0, 	 0, 0x5E7D, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5E7E, 0x5F21, /* 0x80 */
+         0, 	 0, 	 0, 0x5F22, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x5F23, 	 0, 0x5F24, 0x5F25, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x5F26, 	 0, 0x5F27, 0x5F28, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x5F29, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x5F2A, 0x5F2B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5F2C, 0x5F2D, 	 0, /* 0xC0 */
+         0, 0x5F2E, 	 0, 0x5F2F, 	 0, 	 0, 	 0, 0x5F30, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5F32, 0x5F31, 	 0, /* 0xD0 */
+         0, 0x5F33, 	 0, 	 0, 	 0, 0x5F34, 	 0, 	 0, /* 0xD0 */
+         0, 0x5F35, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x5F36, 	 0, 	 0, 	 0, 0x5F37, 	 0, 	 0, 0x5F38, /* 0xE0 */
+    0x5F39, 	 0, 0x5F3A, 	 0, 	 0, 0x5F3B, 	 0, 0x5F3C, /* 0xF0 */
+    0x5F3D, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5F3E, 0x5F3F	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_8D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x5F40,      0, 0x5F41,      0,      0,      0,      0, /* 0x00 */
-         0, 0x5F42,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0x5F43,      0,      0,      0,      0, 0x5F44, /* 0x10 */
-         0,      0,      0, 0x5F45,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0x5F46,      0,      0, /* 0x60 */
-         0, 0x5F47,      0,      0, 0x5F48,      0, 0x5F49,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0x5F4A, /* 0x70 */
-         0,      0, 0x5F4B,      0, 0x5F4C,      0,      0,      0, /* 0x80 */
-    0x5F4D,      0,      0,      0,      0, 0x5F4E,      0,      0, /* 0x80 */
-    0x5F4F, 0x5F50,      0,      0,      0, 0x5F51,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0x5F52, 0x5F53, /* 0x90 */
-    0x5F54,      0,      0,      0,      0,      0, 0x5F55,      0, /* 0xA0 */
-         0,      0,      0, 0x5F56, 0x5F57,      0,      0, 0x5F58, /* 0xA0 */
-         0,      0, 0x5F59,      0,      0, 0x5F5A,      0, 0x5F5B, /* 0xB0 */
-         0, 0x5F5C,      0, 0x5F5D, 0x5F6F,      0,      0,      0, /* 0xB0 */
-    0x5F5E,      0,      0,      0,      0, 0x5F5F, 0x5F60, 0x5F61, /* 0xC0 */
-    0x5F62,      0, 0x5F63,      0,      0,      0, 0x5F64,      0, /* 0xC0 */
-         0, 0x5F65,      0,      0, 0x5F66, 0x5F67,      0, 0x5F68, /* 0xD0 */
-         0, 0x5F69,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x5F6A, 0x5F6B,      0, 0x5F6C, /* 0xE0 */
-         0,      0,      0,      0, 0x5F6D,      0,      0,      0, /* 0xE0 */
-    0x5F6E, 0x5F70, 0x5F71,      0, 0x5F72,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0x5F73                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x5F40, 	 0, 0x5F41, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x5F42, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0x5F43, 	 0, 	 0, 	 0, 	 0, 0x5F44, /* 0x10 */
+         0, 	 0, 	 0, 0x5F45, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5F46, 	 0, 	 0, /* 0x60 */
+         0, 0x5F47, 	 0, 	 0, 0x5F48, 	 0, 0x5F49, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5F4A, /* 0x70 */
+         0, 	 0, 0x5F4B, 	 0, 0x5F4C, 	 0, 	 0, 	 0, /* 0x80 */
+    0x5F4D, 	 0, 	 0, 	 0, 	 0, 0x5F4E, 	 0, 	 0, /* 0x80 */
+    0x5F4F, 0x5F50, 	 0, 	 0, 	 0, 0x5F51, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5F52, 0x5F53, /* 0x90 */
+    0x5F54, 	 0, 	 0, 	 0, 	 0, 	 0, 0x5F55, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x5F56, 0x5F57, 	 0, 	 0, 0x5F58, /* 0xA0 */
+         0, 	 0, 0x5F59, 	 0, 	 0, 0x5F5A, 	 0, 0x5F5B, /* 0xB0 */
+         0, 0x5F5C, 	 0, 0x5F5D, 0x5F6F, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x5F5E, 	 0, 	 0, 	 0, 	 0, 0x5F5F, 0x5F60, 0x5F61, /* 0xC0 */
+    0x5F62, 	 0, 0x5F63, 	 0, 	 0, 	 0, 0x5F64, 	 0, /* 0xC0 */
+         0, 0x5F65, 	 0, 	 0, 0x5F66, 0x5F67, 	 0, 0x5F68, /* 0xD0 */
+         0, 0x5F69, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x5F6A, 0x5F6B, 	 0, 0x5F6C, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x5F6D, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x5F6E, 0x5F70, 0x5F71, 	 0, 0x5F72, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x5F73					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_8E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x5F74,      0,      0, 0x5F75, 0x5F76, 0x5F77,      0, /* 0x00 */
-         0,      0,      0, 0x5F78,      0,      0,      0,      0, /* 0x00 */
-         0, 0x5F79,      0,      0, 0x5F7A,      0, 0x5F7B,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0x5F7C, 0x5F7D, 0x5F7E, 0x6021,      0,      0, 0x6022, 0x6023, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0x6024,      0, 0x6025,      0,      0, 0x6026, 0x6027, /* 0x30 */
-    0x6028, 0x6029,      0,      0,      0, 0x602A,      0,      0, /* 0x30 */
-    0x602B, 0x602C,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0x602D,      0, 0x602E, 0x602F, 0x6030, /* 0x40 */
-         0,      0,      0,      0, 0x6031,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0x6032, 0x6033, 0x6034, 0x6035,      0, /* 0x50 */
-         0, 0x6036, 0x6037,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0x6038,      0,      0, 0x6039, 0x603A,      0, 0x603B, /* 0x60 */
-    0x603C, 0x603D,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x603E, 0x603F, 0x6040,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x6041, 0x6042,      0,      0,      0,      0, /* 0x80 */
-         0, 0x6043,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0x6044,      0, 0x6045,      0,      0, 0x6046,      0,      0, /* 0x90 */
-         0,      0, 0x6047, 0x6048,      0, 0x6049, 0x604A,      0, /* 0x90 */
-         0,      0, 0x604B,      0,      0,      0,      0, 0x604C, /* 0xA0 */
-         0, 0x604D,      0,      0,      0, 0x604E, 0x604F,      0, /* 0xA0 */
-         0,      0,      0, 0x6050,      0, 0x6051,      0,      0, /* 0xB0 */
-         0,      0, 0x6052, 0x6053,      0,      0,      0,      0, /* 0xB0 */
-    0x6054, 0x6055,      0, 0x6056, 0x6057,      0,      0, 0x6058, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0x6059, /* 0xC0 */
-         0, 0x605A,      0,      0, 0x605B,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x605C,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0x605D,      0,      0,      0,      0, 0x6064, 0x605E,      0, /* 0xE0 */
-    0x605F, 0x6060,      0,      0,      0,      0,      0, 0x6061, /* 0xF0 */
-         0, 0x6062, 0x6063                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x5F74, 	 0, 	 0, 0x5F75, 0x5F76, 0x5F77, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x5F78, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x5F79, 	 0, 	 0, 0x5F7A, 	 0, 0x5F7B, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x5F7C, 0x5F7D, 0x5F7E, 0x6021, 	 0, 	 0, 0x6022, 0x6023, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x6024, 	 0, 0x6025, 	 0, 	 0, 0x6026, 0x6027, /* 0x30 */
+    0x6028, 0x6029, 	 0, 	 0, 	 0, 0x602A, 	 0, 	 0, /* 0x30 */
+    0x602B, 0x602C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x602D, 	 0, 0x602E, 0x602F, 0x6030, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x6031, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x6032, 0x6033, 0x6034, 0x6035, 	 0, /* 0x50 */
+         0, 0x6036, 0x6037, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0x6038, 	 0, 	 0, 0x6039, 0x603A, 	 0, 0x603B, /* 0x60 */
+    0x603C, 0x603D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x603E, 0x603F, 0x6040, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x6041, 0x6042, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x6043, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x6044, 	 0, 0x6045, 	 0, 	 0, 0x6046, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x6047, 0x6048, 	 0, 0x6049, 0x604A, 	 0, /* 0x90 */
+         0, 	 0, 0x604B, 	 0, 	 0, 	 0, 	 0, 0x604C, /* 0xA0 */
+         0, 0x604D, 	 0, 	 0, 	 0, 0x604E, 0x604F, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x6050, 	 0, 0x6051, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x6052, 0x6053, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0x6054, 0x6055, 	 0, 0x6056, 0x6057, 	 0, 	 0, 0x6058, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6059, /* 0xC0 */
+         0, 0x605A, 	 0, 	 0, 0x605B, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x605C, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x605D, 	 0, 	 0, 	 0, 	 0, 0x6064, 0x605E, 	 0, /* 0xE0 */
+    0x605F, 0x6060, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6061, /* 0xF0 */
+         0, 0x6062, 0x6063											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_8F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x6065,      0, 0x6066,      0,      0,      0,      0, 0x6067, /* 0x00 */
-    0x6068,      0,      0,      0,      0,      0,      0, 0x6069, /* 0x00 */
-    0x606A,      0,      0,      0,      0,      0, 0x606B, 0x606C, /* 0x10 */
-    0x606D,      0,      0,      0,      0,      0, 0x606E,      0, /* 0x10 */
-    0x606F, 0x6070,      0, 0x6071,      0, 0x6072,      0, 0x6073, /* 0x20 */
-    0x6074,      0,      0,      0, 0x6075, 0x6076, 0x6077,      0, /* 0x20 */
-         0,      0,      0,      0, 0x6078, 0x6079, 0x607A, 0x607B, /* 0x30 */
-         0,      0, 0x607C,      0,      0,      0,      0,      0, /* 0x30 */
-    0x607D, 0x607E,      0, 0x6121,      0,      0,      0, 0x6122, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0x6123, /* 0x40 */
-         0, 0x6124, 0x6125, 0x6126, 0x6127, 0x6128,      0,      0, /* 0x50 */
-    0x6129,      0,      0,      0,      0, 0x612A, 0x612B,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0x612C,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0x612D,      0,      0, /* 0x90 */
-    0x612E, 0x612F,      0,      0, 0x6130, 0x6131, 0x6132,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0x6133, 0x6134,      0, /* 0xB0 */
-    0x6135,      0,      0,      0,      0,      0, 0x6136,      0, /* 0xB0 */
-    0x6137, 0x6138,      0,      0,      0,      0, 0x6139,      0, /* 0xC0 */
-         0,      0, 0x613A, 0x613B,      0, 0x613C,      0,      0, /* 0xC0 */
-    0x613D,      0, 0x613E, 0x613F,      0, 0x6140,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x6141,      0,      0, 0x6142, 0x6143,      0,      0,      0, /* 0xE0 */
-    0x6144,      0,      0,      0,      0,      0, 0x6145,      0, /* 0xE0 */
-         0, 0x6146,      0,      0,      0, 0x6147, 0x6148,      0, /* 0xF0 */
-         0,      0,      0, 0x6149,      0,      0, 0x614A          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x6065, 	 0, 0x6066, 	 0, 	 0, 	 0, 	 0, 0x6067, /* 0x00 */
+    0x6068, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6069, /* 0x00 */
+    0x606A, 	 0, 	 0, 	 0, 	 0, 	 0, 0x606B, 0x606C, /* 0x10 */
+    0x606D, 	 0, 	 0, 	 0, 	 0, 	 0, 0x606E, 	 0, /* 0x10 */
+    0x606F, 0x6070, 	 0, 0x6071, 	 0, 0x6072, 	 0, 0x6073, /* 0x20 */
+    0x6074, 	 0, 	 0, 	 0, 0x6075, 0x6076, 0x6077, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x6078, 0x6079, 0x607A, 0x607B, /* 0x30 */
+         0, 	 0, 0x607C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0x607D, 0x607E, 	 0, 0x6121, 	 0, 	 0, 	 0, 0x6122, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6123, /* 0x40 */
+         0, 0x6124, 0x6125, 0x6126, 0x6127, 0x6128, 	 0, 	 0, /* 0x50 */
+    0x6129, 	 0, 	 0, 	 0, 	 0, 0x612A, 0x612B, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x612C, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x612D, 	 0, 	 0, /* 0x90 */
+    0x612E, 0x612F, 	 0, 	 0, 0x6130, 0x6131, 0x6132, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6133, 0x6134, 	 0, /* 0xB0 */
+    0x6135, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6136, 	 0, /* 0xB0 */
+    0x6137, 0x6138, 	 0, 	 0, 	 0, 	 0, 0x6139, 	 0, /* 0xC0 */
+         0, 	 0, 0x613A, 0x613B, 	 0, 0x613C, 	 0, 	 0, /* 0xC0 */
+    0x613D, 	 0, 0x613E, 0x613F, 	 0, 0x6140, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x6141, 	 0, 	 0, 0x6142, 0x6143, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x6144, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6145, 	 0, /* 0xE0 */
+         0, 0x6146, 	 0, 	 0, 	 0, 0x6147, 0x6148, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0x6149, 	 0, 	 0, 0x614A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_90[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x614B,      0, 0x614C,      0,      0,      0, /* 0x00 */
-    0x614D,      0,      0,      0, 0x614E,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0x614F,      0,      0, 0x6150,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0x6151, 0x6152, 0x6154,      0, 0x6155, 0x6156,      0, 0x6153, /* 0x20 */
-         0,      0,      0, 0x6157, 0x6158,      0,      0, 0x6159, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0x615A, /* 0x30 */
-         0,      0,      0, 0x615B, 0x615C,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0x615D,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0x615E,      0, 0x615F,      0,      0, /* 0x50 */
-         0,      0, 0x6160,      0,      0,      0, 0x6161, 0x6162, /* 0x60 */
-         0,      0,      0,      0, 0x6163,      0,      0,      0, /* 0x60 */
-    0x6164,      0,      0,      0, 0x6165,      0,      0,      0, /* 0x70 */
-         0, 0x6166,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0x6167,      0,      0, /* 0x80 */
-    0x6168,      0,      0, 0x6169, 0x616A,      0, 0x616B,      0, /* 0x80 */
-    0x616C,      0,      0,      0,      0, 0x616D,      0, 0x616E, /* 0x90 */
-    0x616F, 0x6170,      0, 0x6171,      0,      0,      0,      0, /* 0x90 */
-    0x6172, 0x6173, 0x6174,      0,      0, 0x6175,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x6176,      0, 0x6177, 0x6178, 0x6179,      0, 0x617A,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0x617B, 0x617D,      0, /* 0xB0 */
-         0,      0,      0, 0x617E, 0x6221, 0x6222,      0, 0x6223, /* 0xC0 */
-    0x6224,      0,      0,      0, 0x617C,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x622D,      0,      0, 0x6225,      0, 0x6226, /* 0xD0 */
-    0x6227, 0x6228,      0,      0, 0x6229, 0x622A,      0, 0x622B, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x622C,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x622F,      0,      0,      0, 0x6230, /* 0xE0 */
-    0x6231,      0,      0,      0, 0x6232,      0, 0x622E,      0, /* 0xF0 */
-         0,      0,      0,      0,      0,      0, 0x6233, 0x6234  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x614B, 	 0, 0x614C, 	 0, 	 0, 	 0, /* 0x00 */
+    0x614D, 	 0, 	 0, 	 0, 0x614E, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0x614F, 	 0, 	 0, 0x6150, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x6151, 0x6152, 0x6154, 	 0, 0x6155, 0x6156, 	 0, 0x6153, /* 0x20 */
+         0, 	 0, 	 0, 0x6157, 0x6158, 	 0, 	 0, 0x6159, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x615A, /* 0x30 */
+         0, 	 0, 	 0, 0x615B, 0x615C, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x615D, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x615E, 	 0, 0x615F, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x6160, 	 0, 	 0, 	 0, 0x6161, 0x6162, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x6163, 	 0, 	 0, 	 0, /* 0x60 */
+    0x6164, 	 0, 	 0, 	 0, 0x6165, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x6166, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6167, 	 0, 	 0, /* 0x80 */
+    0x6168, 	 0, 	 0, 0x6169, 0x616A, 	 0, 0x616B, 	 0, /* 0x80 */
+    0x616C, 	 0, 	 0, 	 0, 	 0, 0x616D, 	 0, 0x616E, /* 0x90 */
+    0x616F, 0x6170, 	 0, 0x6171, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x6172, 0x6173, 0x6174, 	 0, 	 0, 0x6175, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x6176, 	 0, 0x6177, 0x6178, 0x6179, 	 0, 0x617A, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x617B, 0x617D, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x617E, 0x6221, 0x6222, 	 0, 0x6223, /* 0xC0 */
+    0x6224, 	 0, 	 0, 	 0, 0x617C, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x622D, 	 0, 	 0, 0x6225, 	 0, 0x6226, /* 0xD0 */
+    0x6227, 0x6228, 	 0, 	 0, 0x6229, 0x622A, 	 0, 0x622B, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x622C, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x622F, 	 0, 	 0, 	 0, 0x6230, /* 0xE0 */
+    0x6231, 	 0, 	 0, 	 0, 0x6232, 	 0, 0x622E, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6233, 0x6234	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_91[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x6235,      0,      0,      0, 0x6236, 0x6237, 0x6238,      0, /* 0x00 */
-    0x6239,      0,      0,      0,      0, 0x623A,      0,      0, /* 0x00 */
-    0x623B,      0,      0,      0, 0x623C,      0, 0x623D, 0x623E, /* 0x10 */
-    0x623F,      0, 0x6240,      0, 0x6241,      0, 0x6242,      0, /* 0x10 */
-    0x6243,      0, 0x6245, 0x6246,      0, 0x6244,      0, 0x6247, /* 0x20 */
-         0, 0x6248,      0,      0,      0,      0, 0x6249, 0x624A, /* 0x20 */
-         0, 0x624B,      0,      0, 0x624C,      0, 0x624D, 0x624E, /* 0x30 */
-         0, 0x624F, 0x6250,      0, 0x6251, 0x6252,      0,      0, /* 0x30 */
-         0,      0,      0, 0x6253,      0,      0,      0, 0x6254, /* 0x40 */
-    0x6255,      0,      0,      0,      0,      0,      0, 0x6256, /* 0x40 */
-         0,      0,      0, 0x6257,      0,      0,      0, 0x6258, /* 0x50 */
-         0, 0x6259, 0x625A, 0x625B,      0,      0,      0,      0, /* 0x50 */
-         0, 0x625C,      0,      0, 0x625D,      0,      0, 0x625E, /* 0x60 */
-         0,      0,      0,      0,      0, 0x625F,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0x6260,      0,      0,      0, /* 0x70 */
-         0, 0x6261, 0x6262, 0x6263,      0,      0,      0,      0, /* 0x70 */
-         0, 0x6264,      0, 0x6265,      0, 0x6266, 0x6267,      0, /* 0x80 */
-         0,      0, 0x6268,      0,      0,      0, 0x6269,      0, /* 0x80 */
-         0, 0x626A,      0, 0x626B, 0x626C, 0x626D,      0,      0, /* 0x90 */
-    0x626E,      0,      0,      0,      0,      0, 0x626F,      0, /* 0x90 */
-         0, 0x6270,      0,      0,      0,      0, 0x6271,      0, /* 0xA0 */
-    0x6272,      0,      0,      0, 0x6273, 0x6274, 0x6275,      0, /* 0xA0 */
-    0x6276, 0x6277, 0x6278, 0x6279,      0,      0, 0x627A,      0, /* 0xB0 */
-         0,      0,      0, 0x627B, 0x627C, 0x627D,      0, 0x627E, /* 0xB0 */
-         0,      0, 0x6321, 0x6322,      0, 0x6323,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0x6324, 0x6325,      0,      0, 0x6326, /* 0xD0 */
-         0, 0x6327, 0x6328,      0,      0,      0, 0x6329,      0, /* 0xD0 */
-         0,      0,      0,      0, 0x632A, 0x632B,      0,      0, /* 0xE0 */
-         0, 0x632C, 0x632D,      0, 0x632E, 0x632F, 0x6330, 0x6331, /* 0xE0 */
-    0x6332, 0x6333,      0,      0,      0,      0,      0, 0x6334, /* 0xF0 */
-         0, 0x6335,      0, 0x6336,      0, 0x6337                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x6235, 	 0, 	 0, 	 0, 0x6236, 0x6237, 0x6238, 	 0, /* 0x00 */
+    0x6239, 	 0, 	 0, 	 0, 	 0, 0x623A, 	 0, 	 0, /* 0x00 */
+    0x623B, 	 0, 	 0, 	 0, 0x623C, 	 0, 0x623D, 0x623E, /* 0x10 */
+    0x623F, 	 0, 0x6240, 	 0, 0x6241, 	 0, 0x6242, 	 0, /* 0x10 */
+    0x6243, 	 0, 0x6245, 0x6246, 	 0, 0x6244, 	 0, 0x6247, /* 0x20 */
+         0, 0x6248, 	 0, 	 0, 	 0, 	 0, 0x6249, 0x624A, /* 0x20 */
+         0, 0x624B, 	 0, 	 0, 0x624C, 	 0, 0x624D, 0x624E, /* 0x30 */
+         0, 0x624F, 0x6250, 	 0, 0x6251, 0x6252, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x6253, 	 0, 	 0, 	 0, 0x6254, /* 0x40 */
+    0x6255, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6256, /* 0x40 */
+         0, 	 0, 	 0, 0x6257, 	 0, 	 0, 	 0, 0x6258, /* 0x50 */
+         0, 0x6259, 0x625A, 0x625B, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x625C, 	 0, 	 0, 0x625D, 	 0, 	 0, 0x625E, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x625F, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x6260, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x6261, 0x6262, 0x6263, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x6264, 	 0, 0x6265, 	 0, 0x6266, 0x6267, 	 0, /* 0x80 */
+         0, 	 0, 0x6268, 	 0, 	 0, 	 0, 0x6269, 	 0, /* 0x80 */
+         0, 0x626A, 	 0, 0x626B, 0x626C, 0x626D, 	 0, 	 0, /* 0x90 */
+    0x626E, 	 0, 	 0, 	 0, 	 0, 	 0, 0x626F, 	 0, /* 0x90 */
+         0, 0x6270, 	 0, 	 0, 	 0, 	 0, 0x6271, 	 0, /* 0xA0 */
+    0x6272, 	 0, 	 0, 	 0, 0x6273, 0x6274, 0x6275, 	 0, /* 0xA0 */
+    0x6276, 0x6277, 0x6278, 0x6279, 	 0, 	 0, 0x627A, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0x627B, 0x627C, 0x627D, 	 0, 0x627E, /* 0xB0 */
+         0, 	 0, 0x6321, 0x6322, 	 0, 0x6323, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x6324, 0x6325, 	 0, 	 0, 0x6326, /* 0xD0 */
+         0, 0x6327, 0x6328, 	 0, 	 0, 	 0, 0x6329, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x632A, 0x632B, 	 0, 	 0, /* 0xE0 */
+         0, 0x632C, 0x632D, 	 0, 0x632E, 0x632F, 0x6330, 0x6331, /* 0xE0 */
+    0x6332, 0x6333, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6334, /* 0xF0 */
+         0, 0x6335, 	 0, 0x6336, 	 0, 0x6337					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_92[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x6338, 0x6339,      0,      0, 0x633A, 0x633B, 0x633C, 0x633D, /* 0x00 */
-         0, 0x633E, 0x633F,      0, 0x6340,      0,      0,      0, /* 0x00 */
-    0x6341,      0, 0x6342, 0x6343,      0,      0, 0x6344,      0, /* 0x10 */
-    0x6345,      0,      0,      0, 0x6346, 0x6347,      0,      0, /* 0x10 */
-         0,      0,      0, 0x6348, 0x6349, 0x634A, 0x634B,      0, /* 0x20 */
-    0x634C,      0,      0,      0,      0,      0, 0x634D, 0x634E, /* 0x20 */
-    0x634F,      0,      0, 0x6350,      0, 0x6351, 0x6352,      0, /* 0x30 */
-    0x6353, 0x6354, 0x6355,      0, 0x6356,      0, 0x6357,      0, /* 0x30 */
-    0x6358,      0, 0x6359, 0x635A,      0,      0, 0x635B, 0x635C, /* 0x40 */
-         0,      0, 0x635D,      0,      0, 0x635E, 0x635F, 0x6360, /* 0x40 */
-         0, 0x6361,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0x6362, 0x6363,      0,      0, 0x6364, 0x6365,      0,      0, /* 0x50 */
-    0x6366, 0x6367,      0,      0,      0, 0x6368,      0, 0x6369, /* 0x60 */
-    0x636A, 0x636B,      0,      0,      0,      0, 0x636C, 0x636D, /* 0x60 */
-    0x636E,      0,      0,      0,      0, 0x636F, 0x6370, 0x6371, /* 0x70 */
-    0x6372, 0x6373,      0, 0x6374, 0x6375, 0x6376,      0, 0x6377, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0x6378, 0x6379, 0x637A,      0,      0, 0x637B, 0x637C,      0, /* 0x80 */
-         0,      0, 0x637D,      0,      0,      0,      0, 0x637E, /* 0x90 */
-         0, 0x6421,      0,      0,      0,      0,      0, 0x6422, /* 0x90 */
-    0x6423,      0,      0,      0, 0x6424, 0x6425,      0, 0x6426, /* 0xA0 */
-    0x6427,      0,      0, 0x6428,      0,      0,      0, 0x6429, /* 0xA0 */
-         0,      0, 0x642A,      0,      0,      0, 0x642B,      0, /* 0xB0 */
-    0x642C,      0, 0x642D, 0x642E, 0x642F, 0x6430,      0, 0x6431, /* 0xB0 */
-    0x6432, 0x6433, 0x6434, 0x6435,      0, 0x6436, 0x6437, 0x6438, /* 0xC0 */
-    0x6439,      0,      0, 0x643A, 0x643B, 0x643C, 0x643D,      0, /* 0xC0 */
-    0x643E,      0,      0, 0x643F,      0, 0x6440,      0, 0x6441, /* 0xD0 */
-    0x6442, 0x6443,      0,      0, 0x6444, 0x6445,      0, 0x6446, /* 0xD0 */
-    0x6447, 0x6448,      0, 0x6449,      0, 0x644A,      0, 0x644B, /* 0xE0 */
-    0x644C,      0,      0,      0, 0x644D,      0, 0x644E,      0, /* 0xE0 */
-    0x644F,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0x6450,      0, 0x6451,      0,      0,      0, 0x6452  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x6338, 0x6339, 	 0, 	 0, 0x633A, 0x633B, 0x633C, 0x633D, /* 0x00 */
+         0, 0x633E, 0x633F, 	 0, 0x6340, 	 0, 	 0, 	 0, /* 0x00 */
+    0x6341, 	 0, 0x6342, 0x6343, 	 0, 	 0, 0x6344, 	 0, /* 0x10 */
+    0x6345, 	 0, 	 0, 	 0, 0x6346, 0x6347, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0x6348, 0x6349, 0x634A, 0x634B, 	 0, /* 0x20 */
+    0x634C, 	 0, 	 0, 	 0, 	 0, 	 0, 0x634D, 0x634E, /* 0x20 */
+    0x634F, 	 0, 	 0, 0x6350, 	 0, 0x6351, 0x6352, 	 0, /* 0x30 */
+    0x6353, 0x6354, 0x6355, 	 0, 0x6356, 	 0, 0x6357, 	 0, /* 0x30 */
+    0x6358, 	 0, 0x6359, 0x635A, 	 0, 	 0, 0x635B, 0x635C, /* 0x40 */
+         0, 	 0, 0x635D, 	 0, 	 0, 0x635E, 0x635F, 0x6360, /* 0x40 */
+         0, 0x6361, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0x6362, 0x6363, 	 0, 	 0, 0x6364, 0x6365, 	 0, 	 0, /* 0x50 */
+    0x6366, 0x6367, 	 0, 	 0, 	 0, 0x6368, 	 0, 0x6369, /* 0x60 */
+    0x636A, 0x636B, 	 0, 	 0, 	 0, 	 0, 0x636C, 0x636D, /* 0x60 */
+    0x636E, 	 0, 	 0, 	 0, 	 0, 0x636F, 0x6370, 0x6371, /* 0x70 */
+    0x6372, 0x6373, 	 0, 0x6374, 0x6375, 0x6376, 	 0, 0x6377, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x6378, 0x6379, 0x637A, 	 0, 	 0, 0x637B, 0x637C, 	 0, /* 0x80 */
+         0, 	 0, 0x637D, 	 0, 	 0, 	 0, 	 0, 0x637E, /* 0x90 */
+         0, 0x6421, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6422, /* 0x90 */
+    0x6423, 	 0, 	 0, 	 0, 0x6424, 0x6425, 	 0, 0x6426, /* 0xA0 */
+    0x6427, 	 0, 	 0, 0x6428, 	 0, 	 0, 	 0, 0x6429, /* 0xA0 */
+         0, 	 0, 0x642A, 	 0, 	 0, 	 0, 0x642B, 	 0, /* 0xB0 */
+    0x642C, 	 0, 0x642D, 0x642E, 0x642F, 0x6430, 	 0, 0x6431, /* 0xB0 */
+    0x6432, 0x6433, 0x6434, 0x6435, 	 0, 0x6436, 0x6437, 0x6438, /* 0xC0 */
+    0x6439, 	 0, 	 0, 0x643A, 0x643B, 0x643C, 0x643D, 	 0, /* 0xC0 */
+    0x643E, 	 0, 	 0, 0x643F, 	 0, 0x6440, 	 0, 0x6441, /* 0xD0 */
+    0x6442, 0x6443, 	 0, 	 0, 0x6444, 0x6445, 	 0, 0x6446, /* 0xD0 */
+    0x6447, 0x6448, 	 0, 0x6449, 	 0, 0x644A, 	 0, 0x644B, /* 0xE0 */
+    0x644C, 	 0, 	 0, 	 0, 0x644D, 	 0, 0x644E, 	 0, /* 0xE0 */
+    0x644F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0x6450, 	 0, 0x6451, 	 0, 	 0, 	 0, 0x6452	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_93[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x6453,      0, 0x6454,      0,      0,      0,      0,      0, /* 0x00 */
-    0x6455,      0,      0,      0,      0, 0x6456,      0,      0, /* 0x00 */
-         0, 0x6457,      0,      0, 0x6458, 0x6459,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0x645A, 0x645B, 0x645C, 0x645D, /* 0x10 */
-         0, 0x645E,      0,      0, 0x645F, 0x6460,      0, 0x6461, /* 0x20 */
-         0, 0x6462, 0x6463,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0x6464, 0x6465,      0, 0x6466, 0x6467, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0x6468, /* 0x40 */
-    0x6469, 0x646A,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0x646B, 0x646C, 0x646D,      0,      0, 0x646E,      0, 0x646F, /* 0x50 */
-    0x6470,      0, 0x6471,      0,      0,      0, 0x6472,      0, /* 0x50 */
-         0,      0,      0,      0, 0x6473, 0x6474,      0, 0x6475, /* 0x60 */
-         0, 0x6476, 0x6477,      0,      0, 0x6478,      0, 0x6479, /* 0x60 */
-    0x647A, 0x647B,      0, 0x647C, 0x647D,      0, 0x647E,      0, /* 0x70 */
-         0,      0, 0x6521,      0,      0, 0x6522,      0, 0x6523, /* 0x70 */
-    0x6524, 0x6525, 0x6526,      0,      0,      0,      0,      0, /* 0x80 */
-    0x6527,      0, 0x6528, 0x6529,      0, 0x652A,      0, 0x652B, /* 0x80 */
-         0,      0, 0x652C,      0,      0, 0x652D,      0,      0, /* 0x90 */
-    0x652E,      0,      0, 0x652F,      0,      0, 0x6530,      0, /* 0x90 */
-         0, 0x6531,      0, 0x6532, 0x6533,      0, 0x6534,      0, /* 0xA0 */
-    0x6535, 0x653B,      0, 0x6536,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x6537, 0x6538, 0x6539,      0, /* 0xB0 */
-         0,      0, 0x653A,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x653C,      0,      0, 0x653D, 0x653E, 0x653F, 0x6540, /* 0xC0 */
-         0, 0x6541, 0x6542, 0x6543, 0x6544, 0x6545,      0,      0, /* 0xC0 */
-         0,      0,      0, 0x6546,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x6547,      0,      0, 0x6548,      0, 0x6549, 0x654A, /* 0xD0 */
-         0,      0, 0x654B,      0,      0,      0, 0x654C, 0x654D, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0x654F, /* 0xF0 */
-    0x6550, 0x654E, 0x6551, 0x6552,      0, 0x6553                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x6453, 	 0, 0x6454, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0x6455, 	 0, 	 0, 	 0, 	 0, 0x6456, 	 0, 	 0, /* 0x00 */
+         0, 0x6457, 	 0, 	 0, 0x6458, 0x6459, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0x645A, 0x645B, 0x645C, 0x645D, /* 0x10 */
+         0, 0x645E, 	 0, 	 0, 0x645F, 0x6460, 	 0, 0x6461, /* 0x20 */
+         0, 0x6462, 0x6463, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x6464, 0x6465, 	 0, 0x6466, 0x6467, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6468, /* 0x40 */
+    0x6469, 0x646A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0x646B, 0x646C, 0x646D, 	 0, 	 0, 0x646E, 	 0, 0x646F, /* 0x50 */
+    0x6470, 	 0, 0x6471, 	 0, 	 0, 	 0, 0x6472, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0x6473, 0x6474, 	 0, 0x6475, /* 0x60 */
+         0, 0x6476, 0x6477, 	 0, 	 0, 0x6478, 	 0, 0x6479, /* 0x60 */
+    0x647A, 0x647B, 	 0, 0x647C, 0x647D, 	 0, 0x647E, 	 0, /* 0x70 */
+         0, 	 0, 0x6521, 	 0, 	 0, 0x6522, 	 0, 0x6523, /* 0x70 */
+    0x6524, 0x6525, 0x6526, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0x6527, 	 0, 0x6528, 0x6529, 	 0, 0x652A, 	 0, 0x652B, /* 0x80 */
+         0, 	 0, 0x652C, 	 0, 	 0, 0x652D, 	 0, 	 0, /* 0x90 */
+    0x652E, 	 0, 	 0, 0x652F, 	 0, 	 0, 0x6530, 	 0, /* 0x90 */
+         0, 0x6531, 	 0, 0x6532, 0x6533, 	 0, 0x6534, 	 0, /* 0xA0 */
+    0x6535, 0x653B, 	 0, 0x6536, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x6537, 0x6538, 0x6539, 	 0, /* 0xB0 */
+         0, 	 0, 0x653A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x653C, 	 0, 	 0, 0x653D, 0x653E, 0x653F, 0x6540, /* 0xC0 */
+         0, 0x6541, 0x6542, 0x6543, 0x6544, 0x6545, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x6546, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x6547, 	 0, 	 0, 0x6548, 	 0, 0x6549, 0x654A, /* 0xD0 */
+         0, 	 0, 0x654B, 	 0, 	 0, 	 0, 0x654C, 0x654D, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x654F, /* 0xF0 */
+    0x6550, 0x654E, 0x6551, 0x6552, 	 0, 0x6553					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_94[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x6554, 0x6555,      0, 0x6556,      0,      0,      0, /* 0x00 */
-    0x6557, 0x6558,      0,      0,      0, 0x6559, 0x655A, 0x655B, /* 0x00 */
-         0,      0,      0,      0,      0, 0x655C, 0x655D, 0x655E, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0x655F, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0x6560, 0x6561, /* 0x20 */
-         0, 0x6562, 0x6563, 0x6564, 0x6565,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0x6566,      0, 0x6568,      0, 0x6567, /* 0x30 */
-         0,      0,      0, 0x6569,      0, 0x656A,      0,      0, /* 0x40 */
-    0x656B,      0, 0x656C,      0, 0x656D,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0x656E,      0,      0, /* 0x50 */
-         0, 0x656F,      0,      0, 0x6570,      0,      0, 0x6571, /* 0x50 */
-         0, 0x6572,      0, 0x6573,      0,      0,      0,      0, /* 0x60 */
-    0x6574,      0,      0, 0x6575,      0, 0x6576, 0x6577, 0x6578, /* 0x60 */
-         0, 0x6579, 0x657A,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0x657C, 0x657B                          /* 0x80 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x6554, 0x6555, 	 0, 0x6556, 	 0, 	 0, 	 0, /* 0x00 */
+    0x6557, 0x6558, 	 0, 	 0, 	 0, 0x6559, 0x655A, 0x655B, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x655C, 0x655D, 0x655E, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x655F, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6560, 0x6561, /* 0x20 */
+         0, 0x6562, 0x6563, 0x6564, 0x6565, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0x6566, 	 0, 0x6568, 	 0, 0x6567, /* 0x30 */
+         0, 	 0, 	 0, 0x6569, 	 0, 0x656A, 	 0, 	 0, /* 0x40 */
+    0x656B, 	 0, 0x656C, 	 0, 0x656D, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x656E, 	 0, 	 0, /* 0x50 */
+         0, 0x656F, 	 0, 	 0, 0x6570, 	 0, 	 0, 0x6571, /* 0x50 */
+         0, 0x6572, 	 0, 0x6573, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x6574, 	 0, 	 0, 0x6575, 	 0, 0x6576, 0x6577, 0x6578, /* 0x60 */
+         0, 0x6579, 0x657A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x657C, 0x657B							/* 0x80 */
                                                                     /* 0x80 */
 };
 
@@ -2940,23 +2940,23 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0212_94[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_95[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x70 */
-    0x657D, 0x657E,      0,      0,      0,      0, 0x6621,      0, /* 0x70 */
-         0,      0,      0,      0, 0x6622,      0,      0,      0, /* 0x80 */
-    0x6623,      0,      0,      0, 0x6624, 0x6625, 0x6626,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0x6627, 0x6628, 0x6629, /* 0x90 */
-         0, 0x662A,      0,      0,      0,      0, 0x662B,      0, /* 0xA0 */
-         0, 0x662C,      0, 0x662D, 0x662E,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x662F,      0, 0x6630,      0, /* 0xB0 */
-         0,      0, 0x6631,      0,      0, 0x6632,      0, 0x6633, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x6634,      0, /* 0xC0 */
-    0x6635, 0x6636,      0, 0x6637,      0,      0,      0,      0, /* 0xC0 */
-    0x6638, 0x6639, 0x663A, 0x663B,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x663C, 0x663D,      0,      0, 0x663E, 0x663F, 0x6640, /* 0xD0 */
-    0x6641,      0,      0,      0, 0x6642,      0, 0x6643          /* 0xE0 */
+    0x657D, 0x657E, 	 0, 	 0, 	 0, 	 0, 0x6621, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0x6622, 	 0, 	 0, 	 0, /* 0x80 */
+    0x6623, 	 0, 	 0, 	 0, 0x6624, 0x6625, 0x6626, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6627, 0x6628, 0x6629, /* 0x90 */
+         0, 0x662A, 	 0, 	 0, 	 0, 	 0, 0x662B, 	 0, /* 0xA0 */
+         0, 0x662C, 	 0, 0x662D, 0x662E, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x662F, 	 0, 0x6630, 	 0, /* 0xB0 */
+         0, 	 0, 0x6631, 	 0, 	 0, 0x6632, 	 0, 0x6633, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6634, 	 0, /* 0xC0 */
+    0x6635, 0x6636, 	 0, 0x6637, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0x6638, 0x6639, 0x663A, 0x663B, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x663C, 0x663D, 	 0, 	 0, 0x663E, 0x663F, 0x6640, /* 0xD0 */
+    0x6641, 	 0, 	 0, 	 0, 0x6642, 	 0, 0x6643			/* 0xE0 */
                                                                     /* 0xE0 */
 };
 
@@ -2964,117 +2964,117 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0212_95[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_96[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x10 */
-                                            0x6644, 0x6645,      0, /* 0x10 */
-         0,      0, 0x6646,      0, 0x6647, 0x6648, 0x6649,      0, /* 0x20 */
-         0,      0,      0,      0, 0x664A,      0,      0,      0, /* 0x20 */
-         0, 0x664B,      0, 0x664C,      0,      0,      0, 0x664D, /* 0x30 */
-    0x664E, 0x664F, 0x6650,      0, 0x6651, 0x6652,      0,      0, /* 0x30 */
-         0, 0x6653,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x6654,      0, 0x6655,      0, 0x6656, 0x6657, /* 0x50 */
-    0x6658,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0x6659,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0x665A,      0, /* 0x60 */
-         0,      0,      0,      0, 0x665B,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0x665C, 0x665D,      0, 0x665E, 0x665F, /* 0x70 */
-         0, 0x6660, 0x6661, 0x6662, 0x6663,      0,      0,      0, /* 0x80 */
-         0, 0x6664,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0x6665,      0,      0,      0,      0, 0x6666,      0, /* 0x90 */
-         0,      0, 0x6667,      0,      0, 0x6668,      0, 0x6669, /* 0x90 */
-         0,      0,      0,      0, 0x666A, 0x666B, 0x666C,      0, /* 0xA0 */
-         0, 0x666D,      0,      0,      0,      0, 0x666E, 0x666F, /* 0xA0 */
-         0,      0,      0, 0x6670,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0x6671,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x6672,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0x6673,      0,      0,      0,      0,      0, /* 0xD0 */
-    0x6675,      0, 0x6676,      0,      0, 0x6677, 0x6678, 0x6679, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0x667A,      0,      0,      0,      0,      0, 0x667B, /* 0xE0 */
-         0, 0x667C,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0x667D                                          /* 0xF0 */
+                                            0x6644, 0x6645, 	 0, /* 0x10 */
+         0, 	 0, 0x6646, 	 0, 0x6647, 0x6648, 0x6649, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0x664A, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x664B, 	 0, 0x664C, 	 0, 	 0, 	 0, 0x664D, /* 0x30 */
+    0x664E, 0x664F, 0x6650, 	 0, 0x6651, 0x6652, 	 0, 	 0, /* 0x30 */
+         0, 0x6653, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x6654, 	 0, 0x6655, 	 0, 0x6656, 0x6657, /* 0x50 */
+    0x6658, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x6659, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x665A, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0x665B, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x665C, 0x665D, 	 0, 0x665E, 0x665F, /* 0x70 */
+         0, 0x6660, 0x6661, 0x6662, 0x6663, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x6664, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x6665, 	 0, 	 0, 	 0, 	 0, 0x6666, 	 0, /* 0x90 */
+         0, 	 0, 0x6667, 	 0, 	 0, 0x6668, 	 0, 0x6669, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x666A, 0x666B, 0x666C, 	 0, /* 0xA0 */
+         0, 0x666D, 	 0, 	 0, 	 0, 	 0, 0x666E, 0x666F, /* 0xA0 */
+         0, 	 0, 	 0, 0x6670, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0x6671, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x6672, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0x6673, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x6675, 	 0, 0x6676, 	 0, 	 0, 0x6677, 0x6678, 0x6679, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0x667A, 	 0, 	 0, 	 0, 	 0, 	 0, 0x667B, /* 0xE0 */
+         0, 0x667C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0x667D											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_97[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x667E, 0x6721,      0, 0x6722,      0,      0, /* 0x00 */
-         0, 0x6723,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x6724, 0x6725,      0, 0x6726,      0,      0, /* 0x10 */
-         0, 0x6727, 0x6728, 0x6729,      0,      0,      0,      0, /* 0x20 */
-    0x672A,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0x672B,      0, 0x672C,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0x672D,      0, 0x672E,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0x672F,      0,      0,      0, 0x6730, 0x6731, /* 0x40 */
-         0,      0,      0,      0,      0, 0x6732,      0, 0x6733, /* 0x50 */
-    0x6734,      0, 0x6735, 0x6736,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0x6737,      0,      0,      0, 0x6738, /* 0x60 */
-         0,      0, 0x6739,      0,      0,      0, 0x673A,      0, /* 0x60 */
-         0,      0,      0, 0x673B,      0,      0, 0x673C, 0x673D, /* 0x70 */
-    0x673E,      0,      0, 0x673F,      0, 0x6740,      0, 0x6741, /* 0x70 */
-    0x6742,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0x6743,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0x6744, 0x6745, 0x6746, /* 0x90 */
-         0, 0x6747, 0x6748,      0,      0,      0, 0x6749, 0x674A, /* 0x90 */
-         0,      0, 0x674B,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x674C,      0, 0x674D,      0, /* 0xA0 */
-         0, 0x674E, 0x674F,      0,      0, 0x6750, 0x6751,      0, /* 0xB0 */
-    0x6752, 0x6753, 0x6754,      0, 0x6755,      0, 0x6756, 0x6757, /* 0xB0 */
-         0, 0x6758,      0,      0, 0x6759, 0x675A,      0, 0x675B, /* 0xC0 */
-         0, 0x675C, 0x675D,      0, 0x675E, 0x675F, 0x6760,      0, /* 0xC0 */
-    0x6761, 0x6762,      0,      0, 0x6763,      0,      0, 0x6764, /* 0xD0 */
-    0x6765, 0x6766,      0, 0x676A,      0, 0x6767, 0x6768,      0, /* 0xD0 */
-    0x6769, 0x676B,      0,      0, 0x676C,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0x676D, /* 0xE0 */
-         0, 0x676E,      0,      0, 0x676F,      0,      0, 0x6770, /* 0xF0 */
-    0x6771,      0, 0x6772                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x667E, 0x6721, 	 0, 0x6722, 	 0, 	 0, /* 0x00 */
+         0, 0x6723, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x6724, 0x6725, 	 0, 0x6726, 	 0, 	 0, /* 0x10 */
+         0, 0x6727, 0x6728, 0x6729, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0x672A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x672B, 	 0, 0x672C, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x672D, 	 0, 0x672E, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0x672F, 	 0, 	 0, 	 0, 0x6730, 0x6731, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6732, 	 0, 0x6733, /* 0x50 */
+    0x6734, 	 0, 0x6735, 0x6736, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0x6737, 	 0, 	 0, 	 0, 0x6738, /* 0x60 */
+         0, 	 0, 0x6739, 	 0, 	 0, 	 0, 0x673A, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x673B, 	 0, 	 0, 0x673C, 0x673D, /* 0x70 */
+    0x673E, 	 0, 	 0, 0x673F, 	 0, 0x6740, 	 0, 0x6741, /* 0x70 */
+    0x6742, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x6743, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6744, 0x6745, 0x6746, /* 0x90 */
+         0, 0x6747, 0x6748, 	 0, 	 0, 	 0, 0x6749, 0x674A, /* 0x90 */
+         0, 	 0, 0x674B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x674C, 	 0, 0x674D, 	 0, /* 0xA0 */
+         0, 0x674E, 0x674F, 	 0, 	 0, 0x6750, 0x6751, 	 0, /* 0xB0 */
+    0x6752, 0x6753, 0x6754, 	 0, 0x6755, 	 0, 0x6756, 0x6757, /* 0xB0 */
+         0, 0x6758, 	 0, 	 0, 0x6759, 0x675A, 	 0, 0x675B, /* 0xC0 */
+         0, 0x675C, 0x675D, 	 0, 0x675E, 0x675F, 0x6760, 	 0, /* 0xC0 */
+    0x6761, 0x6762, 	 0, 	 0, 0x6763, 	 0, 	 0, 0x6764, /* 0xD0 */
+    0x6765, 0x6766, 	 0, 0x676A, 	 0, 0x6767, 0x6768, 	 0, /* 0xD0 */
+    0x6769, 0x676B, 	 0, 	 0, 0x676C, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x676D, /* 0xE0 */
+         0, 0x676E, 	 0, 	 0, 0x676F, 	 0, 	 0, 0x6770, /* 0xF0 */
+    0x6771, 	 0, 0x6772											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_98[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0x6773, /* 0x00 */
-         0,      0, 0x6774,      0,      0, 0x6776, 0x6777,      0, /* 0x00 */
-         0,      0,      0,      0, 0x6778,      0, 0x6779,      0, /* 0x10 */
-         0, 0x6775,      0,      0, 0x677A,      0, 0x677B,      0, /* 0x10 */
-    0x677C,      0,      0, 0x677D,      0, 0x6828, 0x677E,      0, /* 0x20 */
-         0,      0,      0, 0x6821,      0,      0, 0x6822, 0x6823, /* 0x20 */
-    0x6824,      0, 0x6825, 0x6826,      0, 0x6827,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0x6829,      0, /* 0x30 */
-         0,      0,      0,      0, 0x682A,      0,      0, 0x682B, /* 0x40 */
-         0,      0, 0x682C,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0x682D, 0x682E, 0x682F,      0,      0, 0x6830, 0x6831, /* 0x50 */
-         0, 0x6832, 0x6833,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0x6834, 0x6835,      0, 0x6836, 0x6837,      0, /* 0x60 */
-         0,      0, 0x6838,      0, 0x6839,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0x683A,      0, 0x683B, 0x683C,      0, /* 0xA0 */
-    0x683D,      0,      0,      0, 0x683E,      0,      0, 0x683F, /* 0xB0 */
-    0x6840,      0, 0x6841, 0x6842,      0,      0,      0, 0x6843, /* 0xB0 */
-         0,      0, 0x6844,      0,      0, 0x6845,      0,      0, /* 0xC0 */
-    0x6846,      0,      0,      0, 0x6847,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x6848,      0, 0x6849,      0, 0x684A, 0x684B, 0x684C, /* 0xE0 */
-         0,      0, 0x684D,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0x684E,      0,      0, 0x684F          /* 0xF0 */
+         0, 	 0, 0x6774, 	 0, 	 0, 0x6776, 0x6777, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0x6778, 	 0, 0x6779, 	 0, /* 0x10 */
+         0, 0x6775, 	 0, 	 0, 0x677A, 	 0, 0x677B, 	 0, /* 0x10 */
+    0x677C, 	 0, 	 0, 0x677D, 	 0, 0x6828, 0x677E, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x6821, 	 0, 	 0, 0x6822, 0x6823, /* 0x20 */
+    0x6824, 	 0, 0x6825, 0x6826, 	 0, 0x6827, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6829, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0x682A, 	 0, 	 0, 0x682B, /* 0x40 */
+         0, 	 0, 0x682C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0x682D, 0x682E, 0x682F, 	 0, 	 0, 0x6830, 0x6831, /* 0x50 */
+         0, 0x6832, 0x6833, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0x6834, 0x6835, 	 0, 0x6836, 0x6837, 	 0, /* 0x60 */
+         0, 	 0, 0x6838, 	 0, 0x6839, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0x683A, 	 0, 0x683B, 0x683C, 	 0, /* 0xA0 */
+    0x683D, 	 0, 	 0, 	 0, 0x683E, 	 0, 	 0, 0x683F, /* 0xB0 */
+    0x6840, 	 0, 0x6841, 0x6842, 	 0, 	 0, 	 0, 0x6843, /* 0xB0 */
+         0, 	 0, 0x6844, 	 0, 	 0, 0x6845, 	 0, 	 0, /* 0xC0 */
+    0x6846, 	 0, 	 0, 	 0, 0x6847, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x6848, 	 0, 0x6849, 	 0, 0x684A, 0x684B, 0x684C, /* 0xE0 */
+         0, 	 0, 0x684D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0x684E, 	 0, 	 0, 0x684F			/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -3082,269 +3082,269 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0212_98[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_99[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x6850,      0,      0,      0,      0, 0x6851, /* 0x00 */
-    0x6852,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0x6853,      0,      0,      0, 0x6854, 0x6855, 0x6856, /* 0x10 */
-         0,      0, 0x6857, 0x6858, 0x6859,      0,      0, 0x685A, /* 0x10 */
-         0,      0, 0x685B,      0,      0,      0, 0x685C, 0x685D, /* 0x20 */
-         0,      0,      0, 0x685E,      0,      0,      0,      0, /* 0x20 */
-         0, 0x685F, 0x6860, 0x6861, 0x6862, 0x6863,      0,      0, /* 0x30 */
-         0, 0x6864, 0x6865, 0x6866, 0x6867,      0,      0,      0, /* 0x30 */
-    0x6868, 0x6869,      0,      0,      0,      0, 0x686A, 0x686B, /* 0x40 */
-    0x686C,      0,      0,      0,      0, 0x686D, 0x686E,      0, /* 0x40 */
-         0,      0,      0,      0, 0x686F,      0,      0,      0, /* 0x50 */
-    0x6870, 0x6871,      0, 0x6872, 0x6873,      0, 0x6874, 0x6875, /* 0x50 */
-    0x6876,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0x6877,      0, 0x6878,      0, 0x6879, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0x687A,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0x687B, 0x687C, 0x687D,      0,      0, 0x687E,      0,      0, /* 0xB0 */
-         0, 0x6921, 0x6922,      0,      0, 0x6923,      0, 0x6924, /* 0xB0 */
-         0,      0,      0, 0x6925,      0,      0,      0,      0, /* 0xC0 */
-         0, 0x6926,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0x6927, 0x6928,      0,      0,      0, /* 0xD0 */
-         0, 0x6929, 0x692A,      0, 0x692B,      0, 0x692C,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0x692D, /* 0xE0 */
-         0,      0, 0x692E, 0x692F, 0x6930,      0,      0,      0, /* 0xE0 */
-    0x6931,      0,      0,      0, 0x6932, 0x6933,      0,      0, /* 0xF0 */
-         0, 0x6934,      0,      0,      0, 0x6935, 0x6936          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x6850, 	 0, 	 0, 	 0, 	 0, 0x6851, /* 0x00 */
+    0x6852, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x6853, 	 0, 	 0, 	 0, 0x6854, 0x6855, 0x6856, /* 0x10 */
+         0, 	 0, 0x6857, 0x6858, 0x6859, 	 0, 	 0, 0x685A, /* 0x10 */
+         0, 	 0, 0x685B, 	 0, 	 0, 	 0, 0x685C, 0x685D, /* 0x20 */
+         0, 	 0, 	 0, 0x685E, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x685F, 0x6860, 0x6861, 0x6862, 0x6863, 	 0, 	 0, /* 0x30 */
+         0, 0x6864, 0x6865, 0x6866, 0x6867, 	 0, 	 0, 	 0, /* 0x30 */
+    0x6868, 0x6869, 	 0, 	 0, 	 0, 	 0, 0x686A, 0x686B, /* 0x40 */
+    0x686C, 	 0, 	 0, 	 0, 	 0, 0x686D, 0x686E, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0x686F, 	 0, 	 0, 	 0, /* 0x50 */
+    0x6870, 0x6871, 	 0, 0x6872, 0x6873, 	 0, 0x6874, 0x6875, /* 0x50 */
+    0x6876, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0x6877, 	 0, 0x6878, 	 0, 0x6879, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x687A, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x687B, 0x687C, 0x687D, 	 0, 	 0, 0x687E, 	 0, 	 0, /* 0xB0 */
+         0, 0x6921, 0x6922, 	 0, 	 0, 0x6923, 	 0, 0x6924, /* 0xB0 */
+         0, 	 0, 	 0, 0x6925, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0x6926, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0x6927, 0x6928, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x6929, 0x692A, 	 0, 0x692B, 	 0, 0x692C, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x692D, /* 0xE0 */
+         0, 	 0, 0x692E, 0x692F, 0x6930, 	 0, 	 0, 	 0, /* 0xE0 */
+    0x6931, 	 0, 	 0, 	 0, 0x6932, 0x6933, 	 0, 	 0, /* 0xF0 */
+         0, 0x6934, 	 0, 	 0, 	 0, 0x6935, 0x6936			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_9A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x6937, 0x6938, 0x6939,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0x693A, 0x693B,      0,      0,      0, /* 0x00 */
-    0x693C, 0x693D,      0,      0,      0,      0, 0x693E,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0x693F,      0, /* 0x10 */
-    0x6940,      0, 0x6941, 0x6942, 0x6943,      0,      0, 0x6944, /* 0x20 */
-         0,      0,      0,      0,      0, 0x6945, 0x6946,      0, /* 0x20 */
-         0,      0,      0, 0x6947,      0, 0x6948, 0x6949,      0, /* 0x30 */
-    0x694A,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0x694C,      0,      0, 0x694D,      0,      0, 0x694B, /* 0x40 */
-         0,      0, 0x694E, 0x694F, 0x6950,      0, 0x6951,      0, /* 0x40 */
-         0, 0x6952,      0,      0, 0x6953,      0, 0x6954,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0x6955,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x6956,      0, 0x6957,      0, 0x6958, 0x6959, /* 0xA0 */
-         0,      0, 0x695A,      0, 0x695B, 0x695C, 0x695D,      0, /* 0xB0 */
-         0, 0x695E,      0, 0x695F,      0,      0, 0x6960, 0x6961, /* 0xB0 */
-         0, 0x6962,      0, 0x6963,      0,      0, 0x6964,      0, /* 0xC0 */
-    0x6965,      0,      0,      0,      0,      0, 0x6966,      0, /* 0xC0 */
-    0x6967,      0, 0x6968,      0,      0, 0x6969, 0x696A, 0x696B, /* 0xD0 */
-         0,      0,      0, 0x696C, 0x696D,      0,      0,      0, /* 0xD0 */
-    0x696E,      0,      0,      0, 0x696F, 0x6970,      0, 0x6971, /* 0xE0 */
-         0, 0x6972,      0,      0, 0x6973,      0,      0,      0, /* 0xE0 */
-         0,      0, 0x6974, 0x6975,      0, 0x6976,      0,      0, /* 0xF0 */
-         0, 0x6977, 0x6978,      0,      0, 0x6979,      0, 0x697A  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x6937, 0x6938, 0x6939, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x693A, 0x693B, 	 0, 	 0, 	 0, /* 0x00 */
+    0x693C, 0x693D, 	 0, 	 0, 	 0, 	 0, 0x693E, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x693F, 	 0, /* 0x10 */
+    0x6940, 	 0, 0x6941, 0x6942, 0x6943, 	 0, 	 0, 0x6944, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6945, 0x6946, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x6947, 	 0, 0x6948, 0x6949, 	 0, /* 0x30 */
+    0x694A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0x694C, 	 0, 	 0, 0x694D, 	 0, 	 0, 0x694B, /* 0x40 */
+         0, 	 0, 0x694E, 0x694F, 0x6950, 	 0, 0x6951, 	 0, /* 0x40 */
+         0, 0x6952, 	 0, 	 0, 0x6953, 	 0, 0x6954, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6955, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x6956, 	 0, 0x6957, 	 0, 0x6958, 0x6959, /* 0xA0 */
+         0, 	 0, 0x695A, 	 0, 0x695B, 0x695C, 0x695D, 	 0, /* 0xB0 */
+         0, 0x695E, 	 0, 0x695F, 	 0, 	 0, 0x6960, 0x6961, /* 0xB0 */
+         0, 0x6962, 	 0, 0x6963, 	 0, 	 0, 0x6964, 	 0, /* 0xC0 */
+    0x6965, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6966, 	 0, /* 0xC0 */
+    0x6967, 	 0, 0x6968, 	 0, 	 0, 0x6969, 0x696A, 0x696B, /* 0xD0 */
+         0, 	 0, 	 0, 0x696C, 0x696D, 	 0, 	 0, 	 0, /* 0xD0 */
+    0x696E, 	 0, 	 0, 	 0, 0x696F, 0x6970, 	 0, 0x6971, /* 0xE0 */
+         0, 0x6972, 	 0, 	 0, 0x6973, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x6974, 0x6975, 	 0, 0x6976, 	 0, 	 0, /* 0xF0 */
+         0, 0x6977, 0x6978, 	 0, 	 0, 0x6979, 	 0, 0x697A	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_9B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x697B, 0x697C, 0x697D, 0x697E, 0x6A21, 0x6A22,      0,      0, /* 0x00 */
-    0x6A23, 0x6A24,      0, 0x6A25, 0x6A26, 0x6A27, 0x6A28,      0, /* 0x00 */
-    0x6A29,      0, 0x6A2A,      0,      0,      0, 0x6A2B,      0, /* 0x10 */
-         0, 0x6A2C,      0, 0x6A2D, 0x6A2E,      0,      0,      0, /* 0x10 */
-    0x6A2F,      0,      0,      0,      0,      0, 0x6A30,      0, /* 0x20 */
-         0,      0,      0, 0x6A31,      0, 0x6A32,      0,      0, /* 0x20 */
-         0,      0,      0, 0x6A33, 0x6A34, 0x6A35,      0, 0x6A36, /* 0x30 */
-         0, 0x6A37, 0x6A38,      0,      0, 0x6A39,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0x6A3A,      0,      0, 0x6A3B, 0x6A3C,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0x6A3D, 0x6A3E, 0x6A3F, /* 0x50 */
-         0,      0,      0, 0x6A40,      0,      0, 0x6A41,      0, /* 0x50 */
-         0, 0x6A42,      0, 0x6A43,      0, 0x6A44, 0x6A45,      0, /* 0x60 */
-    0x6A46,      0, 0x6A47, 0x6A48, 0x6A49, 0x6A4A, 0x6A4B,      0, /* 0x60 */
-         0,      0,      0, 0x6A4C,      0, 0x6A4D,      0, 0x6A4E, /* 0x70 */
-    0x6A4F, 0x6A50,      0,      0,      0,      0,      0, 0x6A51, /* 0x70 */
-    0x6A52,      0,      0,      0, 0x6A53, 0x6A54, 0x6A55, 0x6A56, /* 0x80 */
-         0, 0x6A57, 0x6A58, 0x6A59,      0, 0x6A5A,      0, 0x6A5B, /* 0x80 */
-    0x6A5C,      0,      0,      0, 0x6A5D,      0,      0,      0, /* 0x90 */
-         0,      0, 0x6A5E,      0,      0, 0x6A5F, 0x6A60,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0x6A61, 0x6A62, /* 0xA0 */
-         0, 0x6A63,      0,      0, 0x6A64,      0,      0,      0, /* 0xA0 */
-    0x6A65, 0x6A66, 0x6A67,      0,      0,      0,      0, 0x6A68, /* 0xB0 */
-    0x6A69,      0,      0, 0x6A6A, 0x6A6B,      0, 0x6A6C, 0x6A6D, /* 0xB0 */
-         0, 0x6A6E,      0,      0,      0,      0,      0, 0x6A6F, /* 0xC0 */
-    0x6A70,      0,      0,      0,      0,      0, 0x6A71,      0, /* 0xC0 */
-    0x6A72,      0,      0,      0,      0,      0,      0, 0x6A73, /* 0xD0 */
-    0x6A74,      0,      0,      0,      0, 0x6A75,      0, 0x6A76, /* 0xD0 */
-         0,      0,      0,      0,      0, 0x6A77,      0, 0x6A78, /* 0xE0 */
-         0,      0, 0x6A79, 0x6A7A,      0,      0,      0, 0x6A7B, /* 0xE0 */
-         0,      0,      0, 0x6A7C,      0,      0,      0, 0x6A7D, /* 0xF0 */
-    0x6A7E, 0x6B21, 0x6B22,      0,      0, 0x6B23,      0, 0x6B24  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x697B, 0x697C, 0x697D, 0x697E, 0x6A21, 0x6A22, 	 0, 	 0, /* 0x00 */
+    0x6A23, 0x6A24, 	 0, 0x6A25, 0x6A26, 0x6A27, 0x6A28, 	 0, /* 0x00 */
+    0x6A29, 	 0, 0x6A2A, 	 0, 	 0, 	 0, 0x6A2B, 	 0, /* 0x10 */
+         0, 0x6A2C, 	 0, 0x6A2D, 0x6A2E, 	 0, 	 0, 	 0, /* 0x10 */
+    0x6A2F, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6A30, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x6A31, 	 0, 0x6A32, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0x6A33, 0x6A34, 0x6A35, 	 0, 0x6A36, /* 0x30 */
+         0, 0x6A37, 0x6A38, 	 0, 	 0, 0x6A39, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0x6A3A, 	 0, 	 0, 0x6A3B, 0x6A3C, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6A3D, 0x6A3E, 0x6A3F, /* 0x50 */
+         0, 	 0, 	 0, 0x6A40, 	 0, 	 0, 0x6A41, 	 0, /* 0x50 */
+         0, 0x6A42, 	 0, 0x6A43, 	 0, 0x6A44, 0x6A45, 	 0, /* 0x60 */
+    0x6A46, 	 0, 0x6A47, 0x6A48, 0x6A49, 0x6A4A, 0x6A4B, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0x6A4C, 	 0, 0x6A4D, 	 0, 0x6A4E, /* 0x70 */
+    0x6A4F, 0x6A50, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6A51, /* 0x70 */
+    0x6A52, 	 0, 	 0, 	 0, 0x6A53, 0x6A54, 0x6A55, 0x6A56, /* 0x80 */
+         0, 0x6A57, 0x6A58, 0x6A59, 	 0, 0x6A5A, 	 0, 0x6A5B, /* 0x80 */
+    0x6A5C, 	 0, 	 0, 	 0, 0x6A5D, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0x6A5E, 	 0, 	 0, 0x6A5F, 0x6A60, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6A61, 0x6A62, /* 0xA0 */
+         0, 0x6A63, 	 0, 	 0, 0x6A64, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x6A65, 0x6A66, 0x6A67, 	 0, 	 0, 	 0, 	 0, 0x6A68, /* 0xB0 */
+    0x6A69, 	 0, 	 0, 0x6A6A, 0x6A6B, 	 0, 0x6A6C, 0x6A6D, /* 0xB0 */
+         0, 0x6A6E, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6A6F, /* 0xC0 */
+    0x6A70, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6A71, 	 0, /* 0xC0 */
+    0x6A72, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6A73, /* 0xD0 */
+    0x6A74, 	 0, 	 0, 	 0, 	 0, 0x6A75, 	 0, 0x6A76, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6A77, 	 0, 0x6A78, /* 0xE0 */
+         0, 	 0, 0x6A79, 0x6A7A, 	 0, 	 0, 	 0, 0x6A7B, /* 0xE0 */
+         0, 	 0, 	 0, 0x6A7C, 	 0, 	 0, 	 0, 0x6A7D, /* 0xF0 */
+    0x6A7E, 0x6B21, 0x6B22, 	 0, 	 0, 0x6B23, 	 0, 0x6B24	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_9C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x6B25,      0, 0x6B26,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0x6B27,      0,      0,      0, 0x6B28, /* 0x00 */
-         0, 0x6B29,      0,      0,      0,      0, 0x6B2A,      0, /* 0x10 */
-    0x6B2B, 0x6B2C, 0x6B2D,      0, 0x6B2E,      0, 0x6B2F,      0, /* 0x10 */
-         0,      0, 0x6B30, 0x6B31,      0,      0, 0x6B32, 0x6B33, /* 0x20 */
-    0x6B34, 0x6B35, 0x6B36,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0x6B37,      0,      0,      0, 0x6B38, 0x6B39, 0x6B3A, /* 0x30 */
-         0,      0,      0,      0,      0, 0x6B3B,      0,      0, /* 0x30 */
-         0, 0x6B3C,      0, 0x6B3D, 0x6B3E, 0x6B3F,      0,      0, /* 0x40 */
-         0, 0x6B40, 0x6B41,      0,      0,      0, 0x6B42, 0x6B43, /* 0x40 */
-    0x6B44,      0,      0, 0x6B45, 0x6B46,      0, 0x6B47,      0, /* 0x50 */
-    0x6B48,      0,      0, 0x6B49, 0x6B50, 0x6B4A, 0x6B4B, 0x6B4C, /* 0x50 */
-         0,      0,      0, 0x6B4D,      0,      0,      0,      0, /* 0x60 */
-    0x6B52, 0x6B4E, 0x6B4F, 0x6B51,      0,      0, 0x6B53,      0, /* 0x60 */
-    0x6B54,      0, 0x6B55,      0,      0, 0x6B56,      0, 0x6B57, /* 0x70 */
-         0,      0,      0, 0x6B58,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0x6B59,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0x6B5A,      0,      0,      0,      0, 0x6B5B, /* 0xF0 */
-         0, 0x6B5C                                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x6B25, 	 0, 0x6B26, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x6B27, 	 0, 	 0, 	 0, 0x6B28, /* 0x00 */
+         0, 0x6B29, 	 0, 	 0, 	 0, 	 0, 0x6B2A, 	 0, /* 0x10 */
+    0x6B2B, 0x6B2C, 0x6B2D, 	 0, 0x6B2E, 	 0, 0x6B2F, 	 0, /* 0x10 */
+         0, 	 0, 0x6B30, 0x6B31, 	 0, 	 0, 0x6B32, 0x6B33, /* 0x20 */
+    0x6B34, 0x6B35, 0x6B36, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0x6B37, 	 0, 	 0, 	 0, 0x6B38, 0x6B39, 0x6B3A, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6B3B, 	 0, 	 0, /* 0x30 */
+         0, 0x6B3C, 	 0, 0x6B3D, 0x6B3E, 0x6B3F, 	 0, 	 0, /* 0x40 */
+         0, 0x6B40, 0x6B41, 	 0, 	 0, 	 0, 0x6B42, 0x6B43, /* 0x40 */
+    0x6B44, 	 0, 	 0, 0x6B45, 0x6B46, 	 0, 0x6B47, 	 0, /* 0x50 */
+    0x6B48, 	 0, 	 0, 0x6B49, 0x6B50, 0x6B4A, 0x6B4B, 0x6B4C, /* 0x50 */
+         0, 	 0, 	 0, 0x6B4D, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x6B52, 0x6B4E, 0x6B4F, 0x6B51, 	 0, 	 0, 0x6B53, 	 0, /* 0x60 */
+    0x6B54, 	 0, 0x6B55, 	 0, 	 0, 0x6B56, 	 0, 0x6B57, /* 0x70 */
+         0, 	 0, 	 0, 0x6B58, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6B59, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0x6B5A, 	 0, 	 0, 	 0, 	 0, 0x6B5B, /* 0xF0 */
+         0, 0x6B5C													/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_9D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x6B5E,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0x6B5D,      0,      0,      0,      0, /* 0x00 */
-         0, 0x6B5F,      0,      0,      0,      0,      0, 0x6B60, /* 0x10 */
-    0x6B61,      0,      0,      0, 0x6B62, 0x6B63, 0x6B64,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0x6B65, /* 0x20 */
-    0x6B66,      0, 0x6B67, 0x6B68, 0x6B69,      0,      0,      0, /* 0x30 */
-         0,      0, 0x6B6A,      0, 0x6B6B, 0x6B6D,      0,      0, /* 0x30 */
-         0,      0, 0x6B6E, 0x6B6F,      0, 0x6B6C,      0, 0x6B70, /* 0x40 */
-         0,      0, 0x6B71,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0x6B72, 0x6B73,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0x6B74, /* 0x50 */
-         0,      0, 0x6B76, 0x6B75,      0, 0x6B77,      0,      0, /* 0x60 */
-         0, 0x6B78, 0x6B79, 0x6B7A,      0,      0,      0,      0, /* 0x60 */
-    0x6B7B,      0,      0,      0,      0,      0, 0x6B7C, 0x6B7D, /* 0x70 */
-         0,      0,      0, 0x6B7E, 0x6C21,      0, 0x6C22,      0, /* 0x70 */
-         0,      0,      0, 0x6C23, 0x6C24,      0, 0x6C25,      0, /* 0x80 */
-         0,      0, 0x6C26,      0,      0, 0x6C27, 0x6C28,      0, /* 0x80 */
-         0,      0, 0x6C29, 0x6C2A,      0, 0x6C2B, 0x6C2C, 0x6C2D, /* 0x90 */
-    0x6C2E,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0x6C2F,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0x6C30,      0, 0x6C31,      0, 0x6C32,      0, /* 0xA0 */
-         0, 0x6C33,      0,      0,      0, 0x6C34,      0,      0, /* 0xB0 */
-         0, 0x6C35,      0,      0, 0x6C36,      0,      0, 0x6C37, /* 0xB0 */
-         0,      0,      0, 0x6C38,      0,      0,      0, 0x6C39, /* 0xC0 */
-         0, 0x6C3A, 0x6C3B,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0x6C3C, 0x6C3D, 0x6C3E, 0x6C3F, /* 0xD0 */
-         0,      0, 0x6C40,      0,      0,      0, 0x6C41, 0x6C42, /* 0xD0 */
-    0x6C43,      0,      0,      0,      0, 0x6C44,      0, 0x6C45, /* 0xE0 */
-         0, 0x6C46,      0, 0x6C47,      0,      0, 0x6C48,      0, /* 0xE0 */
-    0x6C49,      0,      0, 0x6C4A, 0x6C4B,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0,      0, 0x6C4C          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x6B5E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0x6B5D, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x6B5F, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6B60, /* 0x10 */
+    0x6B61, 	 0, 	 0, 	 0, 0x6B62, 0x6B63, 0x6B64, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6B65, /* 0x20 */
+    0x6B66, 	 0, 0x6B67, 0x6B68, 0x6B69, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x6B6A, 	 0, 0x6B6B, 0x6B6D, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0x6B6E, 0x6B6F, 	 0, 0x6B6C, 	 0, 0x6B70, /* 0x40 */
+         0, 	 0, 0x6B71, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x6B72, 0x6B73, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6B74, /* 0x50 */
+         0, 	 0, 0x6B76, 0x6B75, 	 0, 0x6B77, 	 0, 	 0, /* 0x60 */
+         0, 0x6B78, 0x6B79, 0x6B7A, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x6B7B, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6B7C, 0x6B7D, /* 0x70 */
+         0, 	 0, 	 0, 0x6B7E, 0x6C21, 	 0, 0x6C22, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0x6C23, 0x6C24, 	 0, 0x6C25, 	 0, /* 0x80 */
+         0, 	 0, 0x6C26, 	 0, 	 0, 0x6C27, 0x6C28, 	 0, /* 0x80 */
+         0, 	 0, 0x6C29, 0x6C2A, 	 0, 0x6C2B, 0x6C2C, 0x6C2D, /* 0x90 */
+    0x6C2E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x6C2F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0x6C30, 	 0, 0x6C31, 	 0, 0x6C32, 	 0, /* 0xA0 */
+         0, 0x6C33, 	 0, 	 0, 	 0, 0x6C34, 	 0, 	 0, /* 0xB0 */
+         0, 0x6C35, 	 0, 	 0, 0x6C36, 	 0, 	 0, 0x6C37, /* 0xB0 */
+         0, 	 0, 	 0, 0x6C38, 	 0, 	 0, 	 0, 0x6C39, /* 0xC0 */
+         0, 0x6C3A, 0x6C3B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0x6C3C, 0x6C3D, 0x6C3E, 0x6C3F, /* 0xD0 */
+         0, 	 0, 0x6C40, 	 0, 	 0, 	 0, 0x6C41, 0x6C42, /* 0xD0 */
+    0x6C43, 	 0, 	 0, 	 0, 	 0, 0x6C44, 	 0, 0x6C45, /* 0xE0 */
+         0, 0x6C46, 	 0, 0x6C47, 	 0, 	 0, 0x6C48, 	 0, /* 0xE0 */
+    0x6C49, 	 0, 	 0, 0x6C4A, 0x6C4B, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6C4C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_9E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x6C4E,      0,      0,      0,      0, 0x6C4F, /* 0x00 */
-         0,      0, 0x6C4D,      0,      0,      0, 0x6C50,      0, /* 0x00 */
-    0x6C51, 0x6C52, 0x6C53,      0,      0, 0x6C54, 0x6C55,      0, /* 0x10 */
-         0, 0x6C56,      0,      0, 0x6C57, 0x6C58,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0x6C59, 0x6C5A, 0x6C5B,      0,      0,      0, /* 0x70 */
-    0x6C5C,      0, 0x6C5D, 0x6C5E, 0x6C5F, 0x6C60,      0, 0x6C61, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x6C62, 0x6C63, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x6C64,      0, /* 0x90 */
-    0x6C65,      0,      0, 0x6C66,      0,      0, 0x6C67,      0, /* 0x90 */
-         0,      0,      0,      0, 0x6C68,      0,      0,      0, /* 0xA0 */
-    0x6C69,      0,      0,      0, 0x6C6A,      0, 0x6C6B, 0x6C6C, /* 0xA0 */
-    0x6C6D,      0,      0, 0x6C6E, 0x6C6F, 0x6C70,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0x6C71,      0, /* 0xC0 */
-    0x6C72,      0,      0, 0x6C73,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0x6C74,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0x6C75, /* 0xD0 */
-         0,      0,      0,      0, 0x6C76,      0,      0, 0x6C77, /* 0xE0 */
-         0,      0,      0,      0, 0x6C78, 0x6C79, 0x6C7A,      0, /* 0xE0 */
-    0x6C7B, 0x6C7C, 0x6C7D,      0,      0, 0x6C7E,      0,      0, /* 0xF0 */
-    0x6D21,      0,      0,      0,      0,      0,      0, 0x6D22  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x6C4E, 	 0, 	 0, 	 0, 	 0, 0x6C4F, /* 0x00 */
+         0, 	 0, 0x6C4D, 	 0, 	 0, 	 0, 0x6C50, 	 0, /* 0x00 */
+    0x6C51, 0x6C52, 0x6C53, 	 0, 	 0, 0x6C54, 0x6C55, 	 0, /* 0x10 */
+         0, 0x6C56, 	 0, 	 0, 0x6C57, 0x6C58, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x6C59, 0x6C5A, 0x6C5B, 	 0, 	 0, 	 0, /* 0x70 */
+    0x6C5C, 	 0, 0x6C5D, 0x6C5E, 0x6C5F, 0x6C60, 	 0, 0x6C61, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6C62, 0x6C63, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6C64, 	 0, /* 0x90 */
+    0x6C65, 	 0, 	 0, 0x6C66, 	 0, 	 0, 0x6C67, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x6C68, 	 0, 	 0, 	 0, /* 0xA0 */
+    0x6C69, 	 0, 	 0, 	 0, 0x6C6A, 	 0, 0x6C6B, 0x6C6C, /* 0xA0 */
+    0x6C6D, 	 0, 	 0, 0x6C6E, 0x6C6F, 0x6C70, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6C71, 	 0, /* 0xC0 */
+    0x6C72, 	 0, 	 0, 0x6C73, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0x6C74, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6C75, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0x6C76, 	 0, 	 0, 0x6C77, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0x6C78, 0x6C79, 0x6C7A, 	 0, /* 0xE0 */
+    0x6C7B, 0x6C7C, 0x6C7D, 	 0, 	 0, 0x6C7E, 	 0, 	 0, /* 0xF0 */
+    0x6D21, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6D22	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JIS0212_9F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0x6D23, 0x6D24,      0,      0,      0,      0, /* 0x00 */
-         0, 0x6D25,      0,      0,      0,      0,      0, 0x6D26, /* 0x00 */
-    0x6D27, 0x6D28, 0x6D29,      0, 0x6D2A,      0, 0x6D2B, 0x6D2C, /* 0x10 */
-         0, 0x6D2D, 0x6D2E, 0x6D2F,      0,      0,      0, 0x6D30, /* 0x10 */
-         0,      0, 0x6D31,      0,      0,      0, 0x6D32,      0, /* 0x20 */
-         0,      0, 0x6D33, 0x6D34,      0,      0,      0, 0x6D35, /* 0x20 */
-         0, 0x6D36, 0x6D37,      0, 0x6D38,      0,      0, 0x6D39, /* 0x30 */
-         0, 0x6D3A, 0x6D3B,      0, 0x6D3C, 0x6D3D,      0, 0x6D3E, /* 0x30 */
-         0, 0x6D3F,      0, 0x6D40, 0x6D41, 0x6D42, 0x6D43, 0x6D44, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0x6D45,      0, 0x6D46, 0x6D47, 0x6D48, /* 0x50 */
-    0x6D49,      0, 0x6D4A,      0,      0, 0x6D4B, 0x6D4C,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0x6D4D, 0x6D4E,      0,      0,      0, 0x6D4F, 0x6D50, 0x6D51, /* 0x60 */
-    0x6D52, 0x6D53,      0, 0x6D54,      0, 0x6D55,      0,      0, /* 0x70 */
-         0,      0, 0x6D56,      0,      0, 0x6D57,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0, 0x6D58, /* 0x80 */
-    0x6D59, 0x6D5A, 0x6D5B,      0, 0x6D5C,      0, 0x6D5D, 0x6D5E, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0x6D5F,      0, /* 0x90 */
-         0, 0x6D60, 0x6D61, 0x6D62,      0, 0x6D63                  /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0x6D23, 0x6D24, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0x6D25, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6D26, /* 0x00 */
+    0x6D27, 0x6D28, 0x6D29, 	 0, 0x6D2A, 	 0, 0x6D2B, 0x6D2C, /* 0x10 */
+         0, 0x6D2D, 0x6D2E, 0x6D2F, 	 0, 	 0, 	 0, 0x6D30, /* 0x10 */
+         0, 	 0, 0x6D31, 	 0, 	 0, 	 0, 0x6D32, 	 0, /* 0x20 */
+         0, 	 0, 0x6D33, 0x6D34, 	 0, 	 0, 	 0, 0x6D35, /* 0x20 */
+         0, 0x6D36, 0x6D37, 	 0, 0x6D38, 	 0, 	 0, 0x6D39, /* 0x30 */
+         0, 0x6D3A, 0x6D3B, 	 0, 0x6D3C, 0x6D3D, 	 0, 0x6D3E, /* 0x30 */
+         0, 0x6D3F, 	 0, 0x6D40, 0x6D41, 0x6D42, 0x6D43, 0x6D44, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0x6D45, 	 0, 0x6D46, 0x6D47, 0x6D48, /* 0x50 */
+    0x6D49, 	 0, 0x6D4A, 	 0, 	 0, 0x6D4B, 0x6D4C, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0x6D4D, 0x6D4E, 	 0, 	 0, 	 0, 0x6D4F, 0x6D50, 0x6D51, /* 0x60 */
+    0x6D52, 0x6D53, 	 0, 0x6D54, 	 0, 0x6D55, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0x6D56, 	 0, 	 0, 0x6D57, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6D58, /* 0x80 */
+    0x6D59, 0x6D5A, 0x6D5B, 	 0, 0x6D5C, 	 0, 0x6D5D, 0x6D5E, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x6D5F, 	 0, /* 0x90 */
+         0, 0x6D60, 0x6D61, 0x6D62, 	 0, 0x6D63					/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
diff --git a/sal/textenc/tcvtjp6.tab b/sal/textenc/tcvtjp6.tab
index 54ac2915d1bf..462c958f6e22 100644
--- a/sal/textenc/tcvtjp6.tab
+++ b/sal/textenc/tcvtjp6.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/tcvtkr1.tab b/sal/textenc/tcvtkr1.tab
index b7aacdf69abf..ef86f0865395 100644
--- a/sal/textenc/tcvtkr1.tab
+++ b/sal/textenc/tcvtkr1.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,16 +50,16 @@
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_81[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xAC02, 0xAC03, 0xAC05, 0xAC06, 0xAC0B, 0xAC0C, 0xAC0D, /* 0x40 */
     0xAC0E, 0xAC0F, 0xAC18, 0xAC1E, 0xAC1F, 0xAC21, 0xAC22, 0xAC23, /* 0x40 */
     0xAC25, 0xAC26, 0xAC27, 0xAC28, 0xAC29, 0xAC2A, 0xAC2B, 0xAC2E, /* 0x50 */
-    0xAC32, 0xAC33, 0xAC34,      0,      0,      0,      0,      0, /* 0x50 */
+    0xAC32, 0xAC33, 0xAC34, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xAC35, 0xAC36, 0xAC37, 0xAC3A, 0xAC3B, 0xAC3D, 0xAC3E, /* 0x60 */
     0xAC3F, 0xAC41, 0xAC42, 0xAC43, 0xAC44, 0xAC45, 0xAC46, 0xAC47, /* 0x60 */
     0xAC48, 0xAC49, 0xAC4A, 0xAC4C, 0xAC4E, 0xAC4F, 0xAC50, 0xAC51, /* 0x70 */
-    0xAC52, 0xAC53, 0xAC55,      0,      0,      0,      0,      0, /* 0x70 */
+    0xAC52, 0xAC53, 0xAC55, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xAC56, 0xAC57, 0xAC59, 0xAC5A, 0xAC5B, 0xAC5D, 0xAC5E, /* 0x80 */
     0xAC5F, 0xAC60, 0xAC61, 0xAC62, 0xAC63, 0xAC64, 0xAC65, 0xAC66, /* 0x80 */
     0xAC67, 0xAC68, 0xAC69, 0xAC6A, 0xAC6B, 0xAC6C, 0xAC6D, 0xAC6E, /* 0x90 */
@@ -75,23 +75,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_81[] =
     0xACDF, 0xACE2, 0xACE3, 0xACE5, 0xACE6, 0xACE9, 0xACEB, 0xACED, /* 0xE0 */
     0xACEE, 0xACF2, 0xACF4, 0xACF7, 0xACF8, 0xACF9, 0xACFA, 0xACFB, /* 0xE0 */
     0xACFE, 0xACFF, 0xAD01, 0xAD02, 0xAD03, 0xAD05, 0xAD07, 0xAD08, /* 0xF0 */
-    0xAD09, 0xAD0A, 0xAD0B, 0xAD0E, 0xAD10, 0xAD12, 0xAD13          /* 0xF0 */
+    0xAD09, 0xAD0A, 0xAD0B, 0xAD0E, 0xAD10, 0xAD12, 0xAD13			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_82[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xAD14, 0xAD15, 0xAD16, 0xAD17, 0xAD19, 0xAD1A, 0xAD1B, /* 0x40 */
     0xAD1D, 0xAD1E, 0xAD1F, 0xAD21, 0xAD22, 0xAD23, 0xAD24, 0xAD25, /* 0x40 */
     0xAD26, 0xAD27, 0xAD28, 0xAD2A, 0xAD2B, 0xAD2E, 0xAD2F, 0xAD30, /* 0x50 */
-    0xAD31, 0xAD32, 0xAD33,      0,      0,      0,      0,      0, /* 0x50 */
+    0xAD31, 0xAD32, 0xAD33, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xAD36, 0xAD37, 0xAD39, 0xAD3A, 0xAD3B, 0xAD3D, 0xAD3E, /* 0x60 */
     0xAD3F, 0xAD40, 0xAD41, 0xAD42, 0xAD43, 0xAD46, 0xAD48, 0xAD4A, /* 0x60 */
     0xAD4B, 0xAD4C, 0xAD4D, 0xAD4E, 0xAD4F, 0xAD51, 0xAD52, 0xAD53, /* 0x70 */
-    0xAD55, 0xAD56, 0xAD57,      0,      0,      0,      0,      0, /* 0x70 */
+    0xAD55, 0xAD56, 0xAD57, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xAD59, 0xAD5A, 0xAD5B, 0xAD5C, 0xAD5D, 0xAD5E, 0xAD5F, /* 0x80 */
     0xAD60, 0xAD62, 0xAD64, 0xAD65, 0xAD66, 0xAD67, 0xAD68, 0xAD69, /* 0x80 */
     0xAD6A, 0xAD6B, 0xAD6E, 0xAD6F, 0xAD71, 0xAD72, 0xAD77, 0xAD78, /* 0x90 */
@@ -107,23 +107,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_82[] =
     0xADD6, 0xADD7, 0xADD8, 0xADD9, 0xADDA, 0xADDB, 0xADDD, 0xADDE, /* 0xE0 */
     0xADDF, 0xADE1, 0xADE2, 0xADE3, 0xADE5, 0xADE6, 0xADE7, 0xADE8, /* 0xE0 */
     0xADE9, 0xADEA, 0xADEB, 0xADEC, 0xADED, 0xADEE, 0xADEF, 0xADF0, /* 0xF0 */
-    0xADF1, 0xADF2, 0xADF3, 0xADF4, 0xADF5, 0xADF6, 0xADF7          /* 0xF0 */
+    0xADF1, 0xADF2, 0xADF3, 0xADF4, 0xADF5, 0xADF6, 0xADF7			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_83[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xADFA, 0xADFB, 0xADFD, 0xADFE, 0xAE02, 0xAE03, 0xAE04, /* 0x40 */
     0xAE05, 0xAE06, 0xAE07, 0xAE0A, 0xAE0C, 0xAE0E, 0xAE0F, 0xAE10, /* 0x40 */
     0xAE11, 0xAE12, 0xAE13, 0xAE15, 0xAE16, 0xAE17, 0xAE18, 0xAE19, /* 0x50 */
-    0xAE1A, 0xAE1B, 0xAE1C,      0,      0,      0,      0,      0, /* 0x50 */
+    0xAE1A, 0xAE1B, 0xAE1C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xAE1D, 0xAE1E, 0xAE1F, 0xAE20, 0xAE21, 0xAE22, 0xAE23, /* 0x60 */
     0xAE24, 0xAE25, 0xAE26, 0xAE27, 0xAE28, 0xAE29, 0xAE2A, 0xAE2B, /* 0x60 */
     0xAE2C, 0xAE2D, 0xAE2E, 0xAE2F, 0xAE32, 0xAE33, 0xAE35, 0xAE36, /* 0x70 */
-    0xAE39, 0xAE3B, 0xAE3C,      0,      0,      0,      0,      0, /* 0x70 */
+    0xAE39, 0xAE3B, 0xAE3C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xAE3D, 0xAE3E, 0xAE3F, 0xAE42, 0xAE44, 0xAE47, 0xAE48, /* 0x80 */
     0xAE49, 0xAE4B, 0xAE4F, 0xAE51, 0xAE52, 0xAE53, 0xAE55, 0xAE57, /* 0x80 */
     0xAE58, 0xAE59, 0xAE5A, 0xAE5B, 0xAE5E, 0xAE62, 0xAE63, 0xAE64, /* 0x90 */
@@ -139,23 +139,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_83[] =
     0xAEBA, 0xAEBB, 0xAEBF, 0xAEC1, 0xAEC2, 0xAEC3, 0xAEC5, 0xAEC6, /* 0xE0 */
     0xAEC7, 0xAEC8, 0xAEC9, 0xAECA, 0xAECB, 0xAECE, 0xAED2, 0xAED3, /* 0xE0 */
     0xAED4, 0xAED5, 0xAED6, 0xAED7, 0xAEDA, 0xAEDB, 0xAEDD, 0xAEDE, /* 0xF0 */
-    0xAEDF, 0xAEE0, 0xAEE1, 0xAEE2, 0xAEE3, 0xAEE4, 0xAEE5          /* 0xF0 */
+    0xAEDF, 0xAEE0, 0xAEE1, 0xAEE2, 0xAEE3, 0xAEE4, 0xAEE5			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_84[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xAEE6, 0xAEE7, 0xAEE9, 0xAEEA, 0xAEEC, 0xAEEE, 0xAEEF, /* 0x40 */
     0xAEF0, 0xAEF1, 0xAEF2, 0xAEF3, 0xAEF5, 0xAEF6, 0xAEF7, 0xAEF9, /* 0x40 */
     0xAEFA, 0xAEFB, 0xAEFD, 0xAEFE, 0xAEFF, 0xAF00, 0xAF01, 0xAF02, /* 0x50 */
-    0xAF03, 0xAF04, 0xAF05,      0,      0,      0,      0,      0, /* 0x50 */
+    0xAF03, 0xAF04, 0xAF05, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xAF06, 0xAF09, 0xAF0A, 0xAF0B, 0xAF0C, 0xAF0E, 0xAF0F, /* 0x60 */
     0xAF11, 0xAF12, 0xAF13, 0xAF14, 0xAF15, 0xAF16, 0xAF17, 0xAF18, /* 0x60 */
     0xAF19, 0xAF1A, 0xAF1B, 0xAF1C, 0xAF1D, 0xAF1E, 0xAF1F, 0xAF20, /* 0x70 */
-    0xAF21, 0xAF22, 0xAF23,      0,      0,      0,      0,      0, /* 0x70 */
+    0xAF21, 0xAF22, 0xAF23, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xAF24, 0xAF25, 0xAF26, 0xAF27, 0xAF28, 0xAF29, 0xAF2A, /* 0x80 */
     0xAF2B, 0xAF2E, 0xAF2F, 0xAF31, 0xAF33, 0xAF35, 0xAF36, 0xAF37, /* 0x80 */
     0xAF38, 0xAF39, 0xAF3A, 0xAF3B, 0xAF3E, 0xAF40, 0xAF44, 0xAF45, /* 0x90 */
@@ -171,23 +171,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_84[] =
     0xAF9D, 0xAF9E, 0xAF9F, 0xAFA0, 0xAFA1, 0xAFA2, 0xAFA3, 0xAFA4, /* 0xE0 */
     0xAFA5, 0xAFA6, 0xAFA7, 0xAFA8, 0xAFA9, 0xAFAA, 0xAFAB, 0xAFAC, /* 0xE0 */
     0xAFAD, 0xAFAE, 0xAFAF, 0xAFB0, 0xAFB1, 0xAFB2, 0xAFB3, 0xAFB4, /* 0xF0 */
-    0xAFB5, 0xAFB6, 0xAFB7, 0xAFBA, 0xAFBB, 0xAFBD, 0xAFBE          /* 0xF0 */
+    0xAFB5, 0xAFB6, 0xAFB7, 0xAFBA, 0xAFBB, 0xAFBD, 0xAFBE			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_85[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xAFBF, 0xAFC1, 0xAFC2, 0xAFC3, 0xAFC4, 0xAFC5, 0xAFC6, /* 0x40 */
     0xAFCA, 0xAFCC, 0xAFCF, 0xAFD0, 0xAFD1, 0xAFD2, 0xAFD3, 0xAFD5, /* 0x40 */
     0xAFD6, 0xAFD7, 0xAFD8, 0xAFD9, 0xAFDA, 0xAFDB, 0xAFDD, 0xAFDE, /* 0x50 */
-    0xAFDF, 0xAFE0, 0xAFE1,      0,      0,      0,      0,      0, /* 0x50 */
+    0xAFDF, 0xAFE0, 0xAFE1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xAFE2, 0xAFE3, 0xAFE4, 0xAFE5, 0xAFE6, 0xAFE7, 0xAFEA, /* 0x60 */
     0xAFEB, 0xAFEC, 0xAFED, 0xAFEE, 0xAFEF, 0xAFF2, 0xAFF3, 0xAFF5, /* 0x60 */
     0xAFF6, 0xAFF7, 0xAFF9, 0xAFFA, 0xAFFB, 0xAFFC, 0xAFFD, 0xAFFE, /* 0x70 */
-    0xAFFF, 0xB002, 0xB003,      0,      0,      0,      0,      0, /* 0x70 */
+    0xAFFF, 0xB002, 0xB003, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xB005, 0xB006, 0xB007, 0xB008, 0xB009, 0xB00A, 0xB00B, /* 0x80 */
     0xB00D, 0xB00E, 0xB00F, 0xB011, 0xB012, 0xB013, 0xB015, 0xB016, /* 0x80 */
     0xB017, 0xB018, 0xB019, 0xB01A, 0xB01B, 0xB01E, 0xB01F, 0xB020, /* 0x90 */
@@ -203,23 +203,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_85[] =
     0xB076, 0xB077, 0xB078, 0xB079, 0xB07A, 0xB07B, 0xB07E, 0xB07F, /* 0xE0 */
     0xB081, 0xB082, 0xB083, 0xB085, 0xB086, 0xB087, 0xB088, 0xB089, /* 0xE0 */
     0xB08A, 0xB08B, 0xB08E, 0xB090, 0xB092, 0xB093, 0xB094, 0xB095, /* 0xF0 */
-    0xB096, 0xB097, 0xB09B, 0xB09D, 0xB09E, 0xB0A3, 0xB0A4          /* 0xF0 */
+    0xB096, 0xB097, 0xB09B, 0xB09D, 0xB09E, 0xB0A3, 0xB0A4			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_86[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB0A5, 0xB0A6, 0xB0A7, 0xB0AA, 0xB0B0, 0xB0B2, 0xB0B6, /* 0x40 */
     0xB0B7, 0xB0B9, 0xB0BA, 0xB0BB, 0xB0BD, 0xB0BE, 0xB0BF, 0xB0C0, /* 0x40 */
     0xB0C1, 0xB0C2, 0xB0C3, 0xB0C6, 0xB0CA, 0xB0CB, 0xB0CC, 0xB0CD, /* 0x50 */
-    0xB0CE, 0xB0CF, 0xB0D2,      0,      0,      0,      0,      0, /* 0x50 */
+    0xB0CE, 0xB0CF, 0xB0D2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xB0D3, 0xB0D5, 0xB0D6, 0xB0D7, 0xB0D9, 0xB0DA, 0xB0DB, /* 0x60 */
     0xB0DC, 0xB0DD, 0xB0DE, 0xB0DF, 0xB0E1, 0xB0E2, 0xB0E3, 0xB0E4, /* 0x60 */
     0xB0E6, 0xB0E7, 0xB0E8, 0xB0E9, 0xB0EA, 0xB0EB, 0xB0EC, 0xB0ED, /* 0x70 */
-    0xB0EE, 0xB0EF, 0xB0F0,      0,      0,      0,      0,      0, /* 0x70 */
+    0xB0EE, 0xB0EF, 0xB0F0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xB0F1, 0xB0F2, 0xB0F3, 0xB0F4, 0xB0F5, 0xB0F6, 0xB0F7, /* 0x80 */
     0xB0F8, 0xB0F9, 0xB0FA, 0xB0FB, 0xB0FC, 0xB0FD, 0xB0FE, 0xB0FF, /* 0x80 */
     0xB100, 0xB101, 0xB102, 0xB103, 0xB104, 0xB105, 0xB106, 0xB107, /* 0x90 */
@@ -235,23 +235,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_86[] =
     0xB171, 0xB172, 0xB173, 0xB174, 0xB175, 0xB176, 0xB177, 0xB17A, /* 0xE0 */
     0xB17B, 0xB17D, 0xB17E, 0xB17F, 0xB181, 0xB183, 0xB184, 0xB185, /* 0xE0 */
     0xB186, 0xB187, 0xB18A, 0xB18C, 0xB18E, 0xB18F, 0xB190, 0xB191, /* 0xF0 */
-    0xB195, 0xB196, 0xB197, 0xB199, 0xB19A, 0xB19B, 0xB19D          /* 0xF0 */
+    0xB195, 0xB196, 0xB197, 0xB199, 0xB19A, 0xB19B, 0xB19D			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_87[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB19E, 0xB19F, 0xB1A0, 0xB1A1, 0xB1A2, 0xB1A3, 0xB1A4, /* 0x40 */
     0xB1A5, 0xB1A6, 0xB1A7, 0xB1A9, 0xB1AA, 0xB1AB, 0xB1AC, 0xB1AD, /* 0x40 */
     0xB1AE, 0xB1AF, 0xB1B0, 0xB1B1, 0xB1B2, 0xB1B3, 0xB1B4, 0xB1B5, /* 0x50 */
-    0xB1B6, 0xB1B7, 0xB1B8,      0,      0,      0,      0,      0, /* 0x50 */
+    0xB1B6, 0xB1B7, 0xB1B8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xB1B9, 0xB1BA, 0xB1BB, 0xB1BC, 0xB1BD, 0xB1BE, 0xB1BF, /* 0x60 */
     0xB1C0, 0xB1C1, 0xB1C2, 0xB1C3, 0xB1C4, 0xB1C5, 0xB1C6, 0xB1C7, /* 0x60 */
     0xB1C8, 0xB1C9, 0xB1CA, 0xB1CB, 0xB1CD, 0xB1CE, 0xB1CF, 0xB1D1, /* 0x70 */
-    0xB1D2, 0xB1D3, 0xB1D5,      0,      0,      0,      0,      0, /* 0x70 */
+    0xB1D2, 0xB1D3, 0xB1D5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xB1D6, 0xB1D7, 0xB1D8, 0xB1D9, 0xB1DA, 0xB1DB, 0xB1DE, /* 0x80 */
     0xB1E0, 0xB1E1, 0xB1E2, 0xB1E3, 0xB1E4, 0xB1E5, 0xB1E6, 0xB1E7, /* 0x80 */
     0xB1EA, 0xB1EB, 0xB1ED, 0xB1EE, 0xB1EF, 0xB1F1, 0xB1F2, 0xB1F3, /* 0x90 */
@@ -267,23 +267,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_87[] =
     0xB24B, 0xB24C, 0xB24D, 0xB24E, 0xB24F, 0xB250, 0xB251, 0xB252, /* 0xE0 */
     0xB253, 0xB254, 0xB255, 0xB256, 0xB257, 0xB259, 0xB25A, 0xB25B, /* 0xE0 */
     0xB25D, 0xB25E, 0xB25F, 0xB261, 0xB262, 0xB263, 0xB264, 0xB265, /* 0xF0 */
-    0xB266, 0xB267, 0xB26A, 0xB26B, 0xB26C, 0xB26D, 0xB26E          /* 0xF0 */
+    0xB266, 0xB267, 0xB26A, 0xB26B, 0xB26C, 0xB26D, 0xB26E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_88[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB26F, 0xB270, 0xB271, 0xB272, 0xB273, 0xB276, 0xB277, /* 0x40 */
     0xB278, 0xB279, 0xB27A, 0xB27B, 0xB27D, 0xB27E, 0xB27F, 0xB280, /* 0x40 */
     0xB281, 0xB282, 0xB283, 0xB286, 0xB287, 0xB288, 0xB28A, 0xB28B, /* 0x50 */
-    0xB28C, 0xB28D, 0xB28E,      0,      0,      0,      0,      0, /* 0x50 */
+    0xB28C, 0xB28D, 0xB28E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xB28F, 0xB292, 0xB293, 0xB295, 0xB296, 0xB297, 0xB29B, /* 0x60 */
     0xB29C, 0xB29D, 0xB29E, 0xB29F, 0xB2A2, 0xB2A4, 0xB2A7, 0xB2A8, /* 0x60 */
     0xB2A9, 0xB2AB, 0xB2AD, 0xB2AE, 0xB2AF, 0xB2B1, 0xB2B2, 0xB2B3, /* 0x70 */
-    0xB2B5, 0xB2B6, 0xB2B7,      0,      0,      0,      0,      0, /* 0x70 */
+    0xB2B5, 0xB2B6, 0xB2B7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xB2B8, 0xB2B9, 0xB2BA, 0xB2BB, 0xB2BC, 0xB2BD, 0xB2BE, /* 0x80 */
     0xB2BF, 0xB2C0, 0xB2C1, 0xB2C2, 0xB2C3, 0xB2C4, 0xB2C5, 0xB2C6, /* 0x80 */
     0xB2C7, 0xB2CA, 0xB2CB, 0xB2CD, 0xB2CE, 0xB2CF, 0xB2D1, 0xB2D3, /* 0x90 */
@@ -299,23 +299,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_88[] =
     0xB33D, 0xB33E, 0xB33F, 0xB340, 0xB341, 0xB342, 0xB343, 0xB344, /* 0xE0 */
     0xB345, 0xB346, 0xB347, 0xB348, 0xB349, 0xB34A, 0xB34B, 0xB34C, /* 0xE0 */
     0xB34D, 0xB34E, 0xB34F, 0xB350, 0xB351, 0xB352, 0xB353, 0xB357, /* 0xF0 */
-    0xB359, 0xB35A, 0xB35D, 0xB360, 0xB361, 0xB362, 0xB363          /* 0xF0 */
+    0xB359, 0xB35A, 0xB35D, 0xB360, 0xB361, 0xB362, 0xB363			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_89[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB366, 0xB368, 0xB36A, 0xB36C, 0xB36D, 0xB36F, 0xB372, /* 0x40 */
     0xB373, 0xB375, 0xB376, 0xB377, 0xB379, 0xB37A, 0xB37B, 0xB37C, /* 0x40 */
     0xB37D, 0xB37E, 0xB37F, 0xB382, 0xB386, 0xB387, 0xB388, 0xB389, /* 0x50 */
-    0xB38A, 0xB38B, 0xB38D,      0,      0,      0,      0,      0, /* 0x50 */
+    0xB38A, 0xB38B, 0xB38D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xB38E, 0xB38F, 0xB391, 0xB392, 0xB393, 0xB395, 0xB396, /* 0x60 */
     0xB397, 0xB398, 0xB399, 0xB39A, 0xB39B, 0xB39C, 0xB39D, 0xB39E, /* 0x60 */
     0xB39F, 0xB3A2, 0xB3A3, 0xB3A4, 0xB3A5, 0xB3A6, 0xB3A7, 0xB3A9, /* 0x70 */
-    0xB3AA, 0xB3AB, 0xB3AD,      0,      0,      0,      0,      0, /* 0x70 */
+    0xB3AA, 0xB3AB, 0xB3AD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xB3AE, 0xB3AF, 0xB3B0, 0xB3B1, 0xB3B2, 0xB3B3, 0xB3B4, /* 0x80 */
     0xB3B5, 0xB3B6, 0xB3B7, 0xB3B8, 0xB3B9, 0xB3BA, 0xB3BB, 0xB3BC, /* 0x80 */
     0xB3BD, 0xB3BE, 0xB3BF, 0xB3C0, 0xB3C1, 0xB3C2, 0xB3C3, 0xB3C6, /* 0x90 */
@@ -331,23 +331,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_89[] =
     0xB422, 0xB423, 0xB424, 0xB425, 0xB426, 0xB427, 0xB42A, 0xB42C, /* 0xE0 */
     0xB42D, 0xB42E, 0xB42F, 0xB430, 0xB431, 0xB432, 0xB433, 0xB435, /* 0xE0 */
     0xB436, 0xB437, 0xB438, 0xB439, 0xB43A, 0xB43B, 0xB43C, 0xB43D, /* 0xF0 */
-    0xB43E, 0xB43F, 0xB440, 0xB441, 0xB442, 0xB443, 0xB444          /* 0xF0 */
+    0xB43E, 0xB43F, 0xB440, 0xB441, 0xB442, 0xB443, 0xB444			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_8A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB445, 0xB446, 0xB447, 0xB448, 0xB449, 0xB44A, 0xB44B, /* 0x40 */
     0xB44C, 0xB44D, 0xB44E, 0xB44F, 0xB452, 0xB453, 0xB455, 0xB456, /* 0x40 */
     0xB457, 0xB459, 0xB45A, 0xB45B, 0xB45C, 0xB45D, 0xB45E, 0xB45F, /* 0x50 */
-    0xB462, 0xB464, 0xB466,      0,      0,      0,      0,      0, /* 0x50 */
+    0xB462, 0xB464, 0xB466, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xB467, 0xB468, 0xB469, 0xB46A, 0xB46B, 0xB46D, 0xB46E, /* 0x60 */
     0xB46F, 0xB470, 0xB471, 0xB472, 0xB473, 0xB474, 0xB475, 0xB476, /* 0x60 */
     0xB477, 0xB478, 0xB479, 0xB47A, 0xB47B, 0xB47C, 0xB47D, 0xB47E, /* 0x70 */
-    0xB47F, 0xB481, 0xB482,      0,      0,      0,      0,      0, /* 0x70 */
+    0xB47F, 0xB481, 0xB482, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xB483, 0xB484, 0xB485, 0xB486, 0xB487, 0xB489, 0xB48A, /* 0x80 */
     0xB48B, 0xB48C, 0xB48D, 0xB48E, 0xB48F, 0xB490, 0xB491, 0xB492, /* 0x80 */
     0xB493, 0xB494, 0xB495, 0xB496, 0xB497, 0xB498, 0xB499, 0xB49A, /* 0x90 */
@@ -363,23 +363,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_8A[] =
     0xB4FA, 0xB4FB, 0xB4FC, 0xB4FD, 0xB4FE, 0xB4FF, 0xB500, 0xB501, /* 0xE0 */
     0xB502, 0xB503, 0xB504, 0xB505, 0xB506, 0xB507, 0xB508, 0xB509, /* 0xE0 */
     0xB50A, 0xB50B, 0xB50C, 0xB50D, 0xB50E, 0xB50F, 0xB510, 0xB511, /* 0xF0 */
-    0xB512, 0xB513, 0xB516, 0xB517, 0xB519, 0xB51A, 0xB51D          /* 0xF0 */
+    0xB512, 0xB513, 0xB516, 0xB517, 0xB519, 0xB51A, 0xB51D			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_8B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB51E, 0xB51F, 0xB520, 0xB521, 0xB522, 0xB523, 0xB526, /* 0x40 */
     0xB52B, 0xB52C, 0xB52D, 0xB52E, 0xB52F, 0xB532, 0xB533, 0xB535, /* 0x40 */
     0xB536, 0xB537, 0xB539, 0xB53A, 0xB53B, 0xB53C, 0xB53D, 0xB53E, /* 0x50 */
-    0xB53F, 0xB542, 0xB546,      0,      0,      0,      0,      0, /* 0x50 */
+    0xB53F, 0xB542, 0xB546, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xB547, 0xB548, 0xB549, 0xB54A, 0xB54E, 0xB54F, 0xB551, /* 0x60 */
     0xB552, 0xB553, 0xB555, 0xB556, 0xB557, 0xB558, 0xB559, 0xB55A, /* 0x60 */
     0xB55B, 0xB55E, 0xB562, 0xB563, 0xB564, 0xB565, 0xB566, 0xB567, /* 0x70 */
-    0xB568, 0xB569, 0xB56A,      0,      0,      0,      0,      0, /* 0x70 */
+    0xB568, 0xB569, 0xB56A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xB56B, 0xB56C, 0xB56D, 0xB56E, 0xB56F, 0xB570, 0xB571, /* 0x80 */
     0xB572, 0xB573, 0xB574, 0xB575, 0xB576, 0xB577, 0xB578, 0xB579, /* 0x80 */
     0xB57A, 0xB57B, 0xB57C, 0xB57D, 0xB57E, 0xB57F, 0xB580, 0xB581, /* 0x90 */
@@ -395,23 +395,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_8B[] =
     0xB5E0, 0xB5E1, 0xB5E2, 0xB5E3, 0xB5E4, 0xB5E5, 0xB5E6, 0xB5E7, /* 0xE0 */
     0xB5E8, 0xB5E9, 0xB5EA, 0xB5EB, 0xB5ED, 0xB5EE, 0xB5EF, 0xB5F0, /* 0xE0 */
     0xB5F1, 0xB5F2, 0xB5F3, 0xB5F4, 0xB5F5, 0xB5F6, 0xB5F7, 0xB5F8, /* 0xF0 */
-    0xB5F9, 0xB5FA, 0xB5FB, 0xB5FC, 0xB5FD, 0xB5FE, 0xB5FF          /* 0xF0 */
+    0xB5F9, 0xB5FA, 0xB5FB, 0xB5FC, 0xB5FD, 0xB5FE, 0xB5FF			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_8C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB600, 0xB601, 0xB602, 0xB603, 0xB604, 0xB605, 0xB606, /* 0x40 */
     0xB607, 0xB608, 0xB609, 0xB60A, 0xB60B, 0xB60C, 0xB60D, 0xB60E, /* 0x40 */
     0xB60F, 0xB612, 0xB613, 0xB615, 0xB616, 0xB617, 0xB619, 0xB61A, /* 0x50 */
-    0xB61B, 0xB61C, 0xB61D,      0,      0,      0,      0,      0, /* 0x50 */
+    0xB61B, 0xB61C, 0xB61D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xB61E, 0xB61F, 0xB620, 0xB621, 0xB622, 0xB623, 0xB624, /* 0x60 */
     0xB626, 0xB627, 0xB628, 0xB629, 0xB62A, 0xB62B, 0xB62D, 0xB62E, /* 0x60 */
     0xB62F, 0xB630, 0xB631, 0xB632, 0xB633, 0xB635, 0xB636, 0xB637, /* 0x70 */
-    0xB638, 0xB639, 0xB63A,      0,      0,      0,      0,      0, /* 0x70 */
+    0xB638, 0xB639, 0xB63A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xB63B, 0xB63C, 0xB63D, 0xB63E, 0xB63F, 0xB640, 0xB641, /* 0x80 */
     0xB642, 0xB643, 0xB644, 0xB645, 0xB646, 0xB647, 0xB649, 0xB64A, /* 0x80 */
     0xB64B, 0xB64C, 0xB64D, 0xB64E, 0xB64F, 0xB650, 0xB651, 0xB652, /* 0x90 */
@@ -427,23 +427,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_8C[] =
     0xB69F, 0xB6A1, 0xB6A2, 0xB6A3, 0xB6A5, 0xB6A6, 0xB6A7, 0xB6A8, /* 0xE0 */
     0xB6A9, 0xB6AA, 0xB6AD, 0xB6AE, 0xB6AF, 0xB6B0, 0xB6B2, 0xB6B3, /* 0xE0 */
     0xB6B4, 0xB6B5, 0xB6B6, 0xB6B7, 0xB6B8, 0xB6B9, 0xB6BA, 0xB6BB, /* 0xF0 */
-    0xB6BC, 0xB6BD, 0xB6BE, 0xB6BF, 0xB6C0, 0xB6C1, 0xB6C2          /* 0xF0 */
+    0xB6BC, 0xB6BD, 0xB6BE, 0xB6BF, 0xB6C0, 0xB6C1, 0xB6C2			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_8D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB6C3, 0xB6C4, 0xB6C5, 0xB6C6, 0xB6C7, 0xB6C8, 0xB6C9, /* 0x40 */
     0xB6CA, 0xB6CB, 0xB6CC, 0xB6CD, 0xB6CE, 0xB6CF, 0xB6D0, 0xB6D1, /* 0x40 */
     0xB6D2, 0xB6D3, 0xB6D5, 0xB6D6, 0xB6D7, 0xB6D8, 0xB6D9, 0xB6DA, /* 0x50 */
-    0xB6DB, 0xB6DC, 0xB6DD,      0,      0,      0,      0,      0, /* 0x50 */
+    0xB6DB, 0xB6DC, 0xB6DD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xB6DE, 0xB6DF, 0xB6E0, 0xB6E1, 0xB6E2, 0xB6E3, 0xB6E4, /* 0x60 */
     0xB6E5, 0xB6E6, 0xB6E7, 0xB6E8, 0xB6E9, 0xB6EA, 0xB6EB, 0xB6EC, /* 0x60 */
     0xB6ED, 0xB6EE, 0xB6EF, 0xB6F1, 0xB6F2, 0xB6F3, 0xB6F5, 0xB6F6, /* 0x70 */
-    0xB6F7, 0xB6F9, 0xB6FA,      0,      0,      0,      0,      0, /* 0x70 */
+    0xB6F7, 0xB6F9, 0xB6FA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xB6FB, 0xB6FC, 0xB6FD, 0xB6FE, 0xB6FF, 0xB702, 0xB703, /* 0x80 */
     0xB704, 0xB706, 0xB707, 0xB708, 0xB709, 0xB70A, 0xB70B, 0xB70C, /* 0x80 */
     0xB70D, 0xB70E, 0xB70F, 0xB710, 0xB711, 0xB712, 0xB713, 0xB714, /* 0x90 */
@@ -459,23 +459,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_8D[] =
     0xB76D, 0xB76E, 0xB76F, 0xB772, 0xB774, 0xB776, 0xB777, 0xB778, /* 0xE0 */
     0xB779, 0xB77A, 0xB77B, 0xB77E, 0xB77F, 0xB781, 0xB782, 0xB783, /* 0xE0 */
     0xB785, 0xB786, 0xB787, 0xB788, 0xB789, 0xB78A, 0xB78B, 0xB78E, /* 0xF0 */
-    0xB793, 0xB794, 0xB795, 0xB79A, 0xB79B, 0xB79D, 0xB79E          /* 0xF0 */
+    0xB793, 0xB794, 0xB795, 0xB79A, 0xB79B, 0xB79D, 0xB79E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_8E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB79F, 0xB7A1, 0xB7A2, 0xB7A3, 0xB7A4, 0xB7A5, 0xB7A6, /* 0x40 */
     0xB7A7, 0xB7AA, 0xB7AE, 0xB7AF, 0xB7B0, 0xB7B1, 0xB7B2, 0xB7B3, /* 0x40 */
     0xB7B6, 0xB7B7, 0xB7B9, 0xB7BA, 0xB7BB, 0xB7BC, 0xB7BD, 0xB7BE, /* 0x50 */
-    0xB7BF, 0xB7C0, 0xB7C1,      0,      0,      0,      0,      0, /* 0x50 */
+    0xB7BF, 0xB7C0, 0xB7C1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xB7C2, 0xB7C3, 0xB7C4, 0xB7C5, 0xB7C6, 0xB7C8, 0xB7CA, /* 0x60 */
     0xB7CB, 0xB7CC, 0xB7CD, 0xB7CE, 0xB7CF, 0xB7D0, 0xB7D1, 0xB7D2, /* 0x60 */
     0xB7D3, 0xB7D4, 0xB7D5, 0xB7D6, 0xB7D7, 0xB7D8, 0xB7D9, 0xB7DA, /* 0x70 */
-    0xB7DB, 0xB7DC, 0xB7DD,      0,      0,      0,      0,      0, /* 0x70 */
+    0xB7DB, 0xB7DC, 0xB7DD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xB7DE, 0xB7DF, 0xB7E0, 0xB7E1, 0xB7E2, 0xB7E3, 0xB7E4, /* 0x80 */
     0xB7E5, 0xB7E6, 0xB7E7, 0xB7E8, 0xB7E9, 0xB7EA, 0xB7EB, 0xB7EE, /* 0x80 */
     0xB7EF, 0xB7F1, 0xB7F2, 0xB7F3, 0xB7F5, 0xB7F6, 0xB7F7, 0xB7F8, /* 0x90 */
@@ -491,23 +491,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_8E[] =
     0xB85E, 0xB85F, 0xB861, 0xB862, 0xB863, 0xB865, 0xB866, 0xB867, /* 0xE0 */
     0xB868, 0xB869, 0xB86A, 0xB86B, 0xB86E, 0xB870, 0xB872, 0xB873, /* 0xE0 */
     0xB874, 0xB875, 0xB876, 0xB877, 0xB879, 0xB87A, 0xB87B, 0xB87D, /* 0xF0 */
-    0xB87E, 0xB87F, 0xB880, 0xB881, 0xB882, 0xB883, 0xB884          /* 0xF0 */
+    0xB87E, 0xB87F, 0xB880, 0xB881, 0xB882, 0xB883, 0xB884			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_8F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB885, 0xB886, 0xB887, 0xB888, 0xB889, 0xB88A, 0xB88B, /* 0x40 */
     0xB88C, 0xB88E, 0xB88F, 0xB890, 0xB891, 0xB892, 0xB893, 0xB894, /* 0x40 */
     0xB895, 0xB896, 0xB897, 0xB898, 0xB899, 0xB89A, 0xB89B, 0xB89C, /* 0x50 */
-    0xB89D, 0xB89E, 0xB89F,      0,      0,      0,      0,      0, /* 0x50 */
+    0xB89D, 0xB89E, 0xB89F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xB8A0, 0xB8A1, 0xB8A2, 0xB8A3, 0xB8A4, 0xB8A5, 0xB8A6, /* 0x60 */
     0xB8A7, 0xB8A9, 0xB8AA, 0xB8AB, 0xB8AC, 0xB8AD, 0xB8AE, 0xB8AF, /* 0x60 */
     0xB8B1, 0xB8B2, 0xB8B3, 0xB8B5, 0xB8B6, 0xB8B7, 0xB8B9, 0xB8BA, /* 0x70 */
-    0xB8BB, 0xB8BC, 0xB8BD,      0,      0,      0,      0,      0, /* 0x70 */
+    0xB8BB, 0xB8BC, 0xB8BD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xB8BE, 0xB8BF, 0xB8C2, 0xB8C4, 0xB8C6, 0xB8C7, 0xB8C8, /* 0x80 */
     0xB8C9, 0xB8CA, 0xB8CB, 0xB8CD, 0xB8CE, 0xB8CF, 0xB8D1, 0xB8D2, /* 0x80 */
     0xB8D3, 0xB8D5, 0xB8D6, 0xB8D7, 0xB8D8, 0xB8D9, 0xB8DA, 0xB8DB, /* 0x90 */
@@ -523,23 +523,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_8F[] =
     0xB932, 0xB933, 0xB934, 0xB935, 0xB936, 0xB937, 0xB938, 0xB939, /* 0xE0 */
     0xB93A, 0xB93B, 0xB93E, 0xB93F, 0xB941, 0xB942, 0xB943, 0xB945, /* 0xE0 */
     0xB946, 0xB947, 0xB948, 0xB949, 0xB94A, 0xB94B, 0xB94D, 0xB94E, /* 0xF0 */
-    0xB950, 0xB952, 0xB953, 0xB954, 0xB955, 0xB956, 0xB957          /* 0xF0 */
+    0xB950, 0xB952, 0xB953, 0xB954, 0xB955, 0xB956, 0xB957			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_90[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB95A, 0xB95B, 0xB95D, 0xB95E, 0xB95F, 0xB961, 0xB962, /* 0x40 */
     0xB963, 0xB964, 0xB965, 0xB966, 0xB967, 0xB96A, 0xB96C, 0xB96E, /* 0x40 */
     0xB96F, 0xB970, 0xB971, 0xB972, 0xB973, 0xB976, 0xB977, 0xB979, /* 0x50 */
-    0xB97A, 0xB97B, 0xB97D,      0,      0,      0,      0,      0, /* 0x50 */
+    0xB97A, 0xB97B, 0xB97D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xB97E, 0xB97F, 0xB980, 0xB981, 0xB982, 0xB983, 0xB986, /* 0x60 */
     0xB988, 0xB98B, 0xB98C, 0xB98F, 0xB990, 0xB991, 0xB992, 0xB993, /* 0x60 */
     0xB994, 0xB995, 0xB996, 0xB997, 0xB998, 0xB999, 0xB99A, 0xB99B, /* 0x70 */
-    0xB99C, 0xB99D, 0xB99E,      0,      0,      0,      0,      0, /* 0x70 */
+    0xB99C, 0xB99D, 0xB99E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xB99F, 0xB9A0, 0xB9A1, 0xB9A2, 0xB9A3, 0xB9A4, 0xB9A5, /* 0x80 */
     0xB9A6, 0xB9A7, 0xB9A8, 0xB9A9, 0xB9AA, 0xB9AB, 0xB9AE, 0xB9AF, /* 0x80 */
     0xB9B1, 0xB9B2, 0xB9B3, 0xB9B5, 0xB9B6, 0xB9B7, 0xB9B8, 0xB9B9, /* 0x90 */
@@ -555,23 +555,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_90[] =
     0xBA23, 0xBA24, 0xBA25, 0xBA26, 0xBA27, 0xBA28, 0xBA29, 0xBA2A, /* 0xE0 */
     0xBA2B, 0xBA2C, 0xBA2D, 0xBA2E, 0xBA2F, 0xBA30, 0xBA31, 0xBA32, /* 0xE0 */
     0xBA33, 0xBA34, 0xBA35, 0xBA36, 0xBA37, 0xBA3A, 0xBA3B, 0xBA3D, /* 0xF0 */
-    0xBA3E, 0xBA3F, 0xBA41, 0xBA43, 0xBA44, 0xBA45, 0xBA46          /* 0xF0 */
+    0xBA3E, 0xBA3F, 0xBA41, 0xBA43, 0xBA44, 0xBA45, 0xBA46			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_91[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xBA47, 0xBA4A, 0xBA4C, 0xBA4F, 0xBA50, 0xBA51, 0xBA52, /* 0x40 */
     0xBA56, 0xBA57, 0xBA59, 0xBA5A, 0xBA5B, 0xBA5D, 0xBA5E, 0xBA5F, /* 0x40 */
     0xBA60, 0xBA61, 0xBA62, 0xBA63, 0xBA66, 0xBA6A, 0xBA6B, 0xBA6C, /* 0x50 */
-    0xBA6D, 0xBA6E, 0xBA6F,      0,      0,      0,      0,      0, /* 0x50 */
+    0xBA6D, 0xBA6E, 0xBA6F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xBA72, 0xBA73, 0xBA75, 0xBA76, 0xBA77, 0xBA79, 0xBA7A, /* 0x60 */
     0xBA7B, 0xBA7C, 0xBA7D, 0xBA7E, 0xBA7F, 0xBA80, 0xBA81, 0xBA82, /* 0x60 */
     0xBA86, 0xBA88, 0xBA89, 0xBA8A, 0xBA8B, 0xBA8D, 0xBA8E, 0xBA8F, /* 0x70 */
-    0xBA90, 0xBA91, 0xBA92,      0,      0,      0,      0,      0, /* 0x70 */
+    0xBA90, 0xBA91, 0xBA92, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xBA93, 0xBA94, 0xBA95, 0xBA96, 0xBA97, 0xBA98, 0xBA99, /* 0x80 */
     0xBA9A, 0xBA9B, 0xBA9C, 0xBA9D, 0xBA9E, 0xBA9F, 0xBAA0, 0xBAA1, /* 0x80 */
     0xBAA2, 0xBAA3, 0xBAA4, 0xBAA5, 0xBAA6, 0xBAA7, 0xBAAA, 0xBAAD, /* 0x90 */
@@ -587,23 +587,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_91[] =
     0xBB02, 0xBB03, 0xBB05, 0xBB06, 0xBB07, 0xBB08, 0xBB09, 0xBB0A, /* 0xE0 */
     0xBB0B, 0xBB0C, 0xBB0E, 0xBB10, 0xBB12, 0xBB13, 0xBB14, 0xBB15, /* 0xE0 */
     0xBB16, 0xBB17, 0xBB19, 0xBB1A, 0xBB1B, 0xBB1D, 0xBB1E, 0xBB1F, /* 0xF0 */
-    0xBB21, 0xBB22, 0xBB23, 0xBB24, 0xBB25, 0xBB26, 0xBB27          /* 0xF0 */
+    0xBB21, 0xBB22, 0xBB23, 0xBB24, 0xBB25, 0xBB26, 0xBB27			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_92[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xBB28, 0xBB2A, 0xBB2C, 0xBB2D, 0xBB2E, 0xBB2F, 0xBB30, /* 0x40 */
     0xBB31, 0xBB32, 0xBB33, 0xBB37, 0xBB39, 0xBB3A, 0xBB3F, 0xBB40, /* 0x40 */
     0xBB41, 0xBB42, 0xBB43, 0xBB46, 0xBB48, 0xBB4A, 0xBB4B, 0xBB4C, /* 0x50 */
-    0xBB4E, 0xBB51, 0xBB52,      0,      0,      0,      0,      0, /* 0x50 */
+    0xBB4E, 0xBB51, 0xBB52, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xBB53, 0xBB55, 0xBB56, 0xBB57, 0xBB59, 0xBB5A, 0xBB5B, /* 0x60 */
     0xBB5C, 0xBB5D, 0xBB5E, 0xBB5F, 0xBB60, 0xBB62, 0xBB64, 0xBB65, /* 0x60 */
     0xBB66, 0xBB67, 0xBB68, 0xBB69, 0xBB6A, 0xBB6B, 0xBB6D, 0xBB6E, /* 0x70 */
-    0xBB6F, 0xBB70, 0xBB71,      0,      0,      0,      0,      0, /* 0x70 */
+    0xBB6F, 0xBB70, 0xBB71, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xBB72, 0xBB73, 0xBB74, 0xBB75, 0xBB76, 0xBB77, 0xBB78, /* 0x80 */
     0xBB79, 0xBB7A, 0xBB7B, 0xBB7C, 0xBB7D, 0xBB7E, 0xBB7F, 0xBB80, /* 0x80 */
     0xBB81, 0xBB82, 0xBB83, 0xBB84, 0xBB85, 0xBB86, 0xBB87, 0xBB89, /* 0x90 */
@@ -619,23 +619,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_92[] =
     0xBBDE, 0xBBDF, 0xBBE0, 0xBBE1, 0xBBE2, 0xBBE3, 0xBBE4, 0xBBE5, /* 0xE0 */
     0xBBE6, 0xBBE7, 0xBBE8, 0xBBE9, 0xBBEA, 0xBBEB, 0xBBEC, 0xBBED, /* 0xE0 */
     0xBBEE, 0xBBEF, 0xBBF0, 0xBBF1, 0xBBF2, 0xBBF3, 0xBBF4, 0xBBF5, /* 0xF0 */
-    0xBBF6, 0xBBF7, 0xBBFA, 0xBBFB, 0xBBFD, 0xBBFE, 0xBC01          /* 0xF0 */
+    0xBBF6, 0xBBF7, 0xBBFA, 0xBBFB, 0xBBFD, 0xBBFE, 0xBC01			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_93[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xBC03, 0xBC04, 0xBC05, 0xBC06, 0xBC07, 0xBC0A, 0xBC0E, /* 0x40 */
     0xBC10, 0xBC12, 0xBC13, 0xBC19, 0xBC1A, 0xBC20, 0xBC21, 0xBC22, /* 0x40 */
     0xBC23, 0xBC26, 0xBC28, 0xBC2A, 0xBC2B, 0xBC2C, 0xBC2E, 0xBC2F, /* 0x50 */
-    0xBC32, 0xBC33, 0xBC35,      0,      0,      0,      0,      0, /* 0x50 */
+    0xBC32, 0xBC33, 0xBC35, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xBC36, 0xBC37, 0xBC39, 0xBC3A, 0xBC3B, 0xBC3C, 0xBC3D, /* 0x60 */
     0xBC3E, 0xBC3F, 0xBC42, 0xBC46, 0xBC47, 0xBC48, 0xBC4A, 0xBC4B, /* 0x60 */
     0xBC4E, 0xBC4F, 0xBC51, 0xBC52, 0xBC53, 0xBC54, 0xBC55, 0xBC56, /* 0x70 */
-    0xBC57, 0xBC58, 0xBC59,      0,      0,      0,      0,      0, /* 0x70 */
+    0xBC57, 0xBC58, 0xBC59, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xBC5A, 0xBC5B, 0xBC5C, 0xBC5E, 0xBC5F, 0xBC60, 0xBC61, /* 0x80 */
     0xBC62, 0xBC63, 0xBC64, 0xBC65, 0xBC66, 0xBC67, 0xBC68, 0xBC69, /* 0x80 */
     0xBC6A, 0xBC6B, 0xBC6C, 0xBC6D, 0xBC6E, 0xBC6F, 0xBC70, 0xBC71, /* 0x90 */
@@ -651,23 +651,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_93[] =
     0xBCD9, 0xBCDA, 0xBCDB, 0xBCDD, 0xBCDE, 0xBCDF, 0xBCE0, 0xBCE1, /* 0xE0 */
     0xBCE2, 0xBCE3, 0xBCE4, 0xBCE5, 0xBCE6, 0xBCE7, 0xBCE8, 0xBCE9, /* 0xE0 */
     0xBCEA, 0xBCEB, 0xBCEC, 0xBCED, 0xBCEE, 0xBCEF, 0xBCF0, 0xBCF1, /* 0xF0 */
-    0xBCF2, 0xBCF3, 0xBCF7, 0xBCF9, 0xBCFA, 0xBCFB, 0xBCFD          /* 0xF0 */
+    0xBCF2, 0xBCF3, 0xBCF7, 0xBCF9, 0xBCFA, 0xBCFB, 0xBCFD			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_94[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xBCFE, 0xBCFF, 0xBD00, 0xBD01, 0xBD02, 0xBD03, 0xBD06, /* 0x40 */
     0xBD08, 0xBD0A, 0xBD0B, 0xBD0C, 0xBD0D, 0xBD0E, 0xBD0F, 0xBD11, /* 0x40 */
     0xBD12, 0xBD13, 0xBD15, 0xBD16, 0xBD17, 0xBD18, 0xBD19, 0xBD1A, /* 0x50 */
-    0xBD1B, 0xBD1C, 0xBD1D,      0,      0,      0,      0,      0, /* 0x50 */
+    0xBD1B, 0xBD1C, 0xBD1D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xBD1E, 0xBD1F, 0xBD20, 0xBD21, 0xBD22, 0xBD23, 0xBD25, /* 0x60 */
     0xBD26, 0xBD27, 0xBD28, 0xBD29, 0xBD2A, 0xBD2B, 0xBD2D, 0xBD2E, /* 0x60 */
     0xBD2F, 0xBD30, 0xBD31, 0xBD32, 0xBD33, 0xBD34, 0xBD35, 0xBD36, /* 0x70 */
-    0xBD37, 0xBD38, 0xBD39,      0,      0,      0,      0,      0, /* 0x70 */
+    0xBD37, 0xBD38, 0xBD39, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xBD3A, 0xBD3B, 0xBD3C, 0xBD3D, 0xBD3E, 0xBD3F, 0xBD41, /* 0x80 */
     0xBD42, 0xBD43, 0xBD44, 0xBD45, 0xBD46, 0xBD47, 0xBD4A, 0xBD4B, /* 0x80 */
     0xBD4D, 0xBD4E, 0xBD4F, 0xBD51, 0xBD52, 0xBD53, 0xBD54, 0xBD55, /* 0x90 */
@@ -683,23 +683,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_94[] =
     0xBDB2, 0xBDB3, 0xBDB4, 0xBDB5, 0xBDB6, 0xBDB7, 0xBDB9, 0xBDBA, /* 0xE0 */
     0xBDBB, 0xBDBC, 0xBDBD, 0xBDBE, 0xBDBF, 0xBDC0, 0xBDC1, 0xBDC2, /* 0xE0 */
     0xBDC3, 0xBDC4, 0xBDC5, 0xBDC6, 0xBDC7, 0xBDC8, 0xBDC9, 0xBDCA, /* 0xF0 */
-    0xBDCB, 0xBDCC, 0xBDCD, 0xBDCE, 0xBDCF, 0xBDD0, 0xBDD1          /* 0xF0 */
+    0xBDCB, 0xBDCC, 0xBDCD, 0xBDCE, 0xBDCF, 0xBDD0, 0xBDD1			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_95[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xBDD2, 0xBDD3, 0xBDD6, 0xBDD7, 0xBDD9, 0xBDDA, 0xBDDB, /* 0x40 */
     0xBDDD, 0xBDDE, 0xBDDF, 0xBDE0, 0xBDE1, 0xBDE2, 0xBDE3, 0xBDE4, /* 0x40 */
     0xBDE5, 0xBDE6, 0xBDE7, 0xBDE8, 0xBDEA, 0xBDEB, 0xBDEC, 0xBDED, /* 0x50 */
-    0xBDEE, 0xBDEF, 0xBDF1,      0,      0,      0,      0,      0, /* 0x50 */
+    0xBDEE, 0xBDEF, 0xBDF1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xBDF2, 0xBDF3, 0xBDF5, 0xBDF6, 0xBDF7, 0xBDF9, 0xBDFA, /* 0x60 */
     0xBDFB, 0xBDFC, 0xBDFD, 0xBDFE, 0xBDFF, 0xBE01, 0xBE02, 0xBE04, /* 0x60 */
     0xBE06, 0xBE07, 0xBE08, 0xBE09, 0xBE0A, 0xBE0B, 0xBE0E, 0xBE0F, /* 0x70 */
-    0xBE11, 0xBE12, 0xBE13,      0,      0,      0,      0,      0, /* 0x70 */
+    0xBE11, 0xBE12, 0xBE13, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xBE15, 0xBE16, 0xBE17, 0xBE18, 0xBE19, 0xBE1A, 0xBE1B, /* 0x80 */
     0xBE1E, 0xBE20, 0xBE21, 0xBE22, 0xBE23, 0xBE24, 0xBE25, 0xBE26, /* 0x80 */
     0xBE27, 0xBE28, 0xBE29, 0xBE2A, 0xBE2B, 0xBE2C, 0xBE2D, 0xBE2E, /* 0x90 */
@@ -715,23 +715,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_95[] =
     0xBE96, 0xBE97, 0xBE9A, 0xBE9B, 0xBE9C, 0xBE9D, 0xBE9E, 0xBE9F, /* 0xE0 */
     0xBEA0, 0xBEA1, 0xBEA2, 0xBEA3, 0xBEA4, 0xBEA5, 0xBEA6, 0xBEA7, /* 0xE0 */
     0xBEA9, 0xBEAA, 0xBEAB, 0xBEAC, 0xBEAD, 0xBEAE, 0xBEAF, 0xBEB0, /* 0xF0 */
-    0xBEB1, 0xBEB2, 0xBEB3, 0xBEB4, 0xBEB5, 0xBEB6, 0xBEB7          /* 0xF0 */
+    0xBEB1, 0xBEB2, 0xBEB3, 0xBEB4, 0xBEB5, 0xBEB6, 0xBEB7			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_96[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xBEB8, 0xBEB9, 0xBEBA, 0xBEBB, 0xBEBC, 0xBEBD, 0xBEBE, /* 0x40 */
     0xBEBF, 0xBEC0, 0xBEC1, 0xBEC2, 0xBEC3, 0xBEC4, 0xBEC5, 0xBEC6, /* 0x40 */
     0xBEC7, 0xBEC8, 0xBEC9, 0xBECA, 0xBECB, 0xBECC, 0xBECD, 0xBECE, /* 0x50 */
-    0xBECF, 0xBED2, 0xBED3,      0,      0,      0,      0,      0, /* 0x50 */
+    0xBECF, 0xBED2, 0xBED3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xBED5, 0xBED6, 0xBED9, 0xBEDA, 0xBEDB, 0xBEDC, 0xBEDD, /* 0x60 */
     0xBEDE, 0xBEDF, 0xBEE1, 0xBEE2, 0xBEE6, 0xBEE7, 0xBEE8, 0xBEE9, /* 0x60 */
     0xBEEA, 0xBEEB, 0xBEED, 0xBEEE, 0xBEEF, 0xBEF0, 0xBEF1, 0xBEF2, /* 0x70 */
-    0xBEF3, 0xBEF4, 0xBEF5,      0,      0,      0,      0,      0, /* 0x70 */
+    0xBEF3, 0xBEF4, 0xBEF5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xBEF6, 0xBEF7, 0xBEF8, 0xBEF9, 0xBEFA, 0xBEFB, 0xBEFC, /* 0x80 */
     0xBEFD, 0xBEFE, 0xBEFF, 0xBF00, 0xBF02, 0xBF03, 0xBF04, 0xBF05, /* 0x80 */
     0xBF06, 0xBF07, 0xBF0A, 0xBF0B, 0xBF0C, 0xBF0D, 0xBF0E, 0xBF0F, /* 0x90 */
@@ -747,23 +747,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_96[] =
     0xBF64, 0xBF65, 0xBF66, 0xBF67, 0xBF68, 0xBF69, 0xBF6A, 0xBF6B, /* 0xE0 */
     0xBF6C, 0xBF6D, 0xBF6E, 0xBF6F, 0xBF70, 0xBF71, 0xBF72, 0xBF73, /* 0xE0 */
     0xBF74, 0xBF75, 0xBF76, 0xBF77, 0xBF78, 0xBF79, 0xBF7A, 0xBF7B, /* 0xF0 */
-    0xBF7C, 0xBF7D, 0xBF7E, 0xBF7F, 0xBF80, 0xBF81, 0xBF82          /* 0xF0 */
+    0xBF7C, 0xBF7D, 0xBF7E, 0xBF7F, 0xBF80, 0xBF81, 0xBF82			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_97[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xBF83, 0xBF84, 0xBF85, 0xBF86, 0xBF87, 0xBF88, 0xBF89, /* 0x40 */
     0xBF8A, 0xBF8B, 0xBF8C, 0xBF8D, 0xBF8E, 0xBF8F, 0xBF90, 0xBF91, /* 0x40 */
     0xBF92, 0xBF93, 0xBF95, 0xBF96, 0xBF97, 0xBF98, 0xBF99, 0xBF9A, /* 0x50 */
-    0xBF9B, 0xBF9C, 0xBF9D,      0,      0,      0,      0,      0, /* 0x50 */
+    0xBF9B, 0xBF9C, 0xBF9D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xBF9E, 0xBF9F, 0xBFA0, 0xBFA1, 0xBFA2, 0xBFA3, 0xBFA4, /* 0x60 */
     0xBFA5, 0xBFA6, 0xBFA7, 0xBFA8, 0xBFA9, 0xBFAA, 0xBFAB, 0xBFAC, /* 0x60 */
     0xBFAD, 0xBFAE, 0xBFAF, 0xBFB1, 0xBFB2, 0xBFB3, 0xBFB4, 0xBFB5, /* 0x70 */
-    0xBFB6, 0xBFB7, 0xBFB8,      0,      0,      0,      0,      0, /* 0x70 */
+    0xBFB6, 0xBFB7, 0xBFB8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xBFB9, 0xBFBA, 0xBFBB, 0xBFBC, 0xBFBD, 0xBFBE, 0xBFBF, /* 0x80 */
     0xBFC0, 0xBFC1, 0xBFC2, 0xBFC3, 0xBFC4, 0xBFC6, 0xBFC7, 0xBFC8, /* 0x80 */
     0xBFC9, 0xBFCA, 0xBFCB, 0xBFCE, 0xBFCF, 0xBFD1, 0xBFD2, 0xBFD3, /* 0x90 */
@@ -779,23 +779,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_97[] =
     0xC020, 0xC021, 0xC022, 0xC023, 0xC024, 0xC025, 0xC026, 0xC027, /* 0xE0 */
     0xC028, 0xC029, 0xC02A, 0xC02B, 0xC02C, 0xC02D, 0xC02E, 0xC02F, /* 0xE0 */
     0xC030, 0xC031, 0xC032, 0xC033, 0xC034, 0xC035, 0xC036, 0xC037, /* 0xF0 */
-    0xC038, 0xC039, 0xC03A, 0xC03B, 0xC03D, 0xC03E, 0xC03F          /* 0xF0 */
+    0xC038, 0xC039, 0xC03A, 0xC03B, 0xC03D, 0xC03E, 0xC03F			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_98[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC040, 0xC041, 0xC042, 0xC043, 0xC044, 0xC045, 0xC046, /* 0x40 */
     0xC047, 0xC048, 0xC049, 0xC04A, 0xC04B, 0xC04C, 0xC04D, 0xC04E, /* 0x40 */
     0xC04F, 0xC050, 0xC052, 0xC053, 0xC054, 0xC055, 0xC056, 0xC057, /* 0x50 */
-    0xC059, 0xC05A, 0xC05B,      0,      0,      0,      0,      0, /* 0x50 */
+    0xC059, 0xC05A, 0xC05B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xC05D, 0xC05E, 0xC05F, 0xC061, 0xC062, 0xC063, 0xC064, /* 0x60 */
     0xC065, 0xC066, 0xC067, 0xC06A, 0xC06B, 0xC06C, 0xC06D, 0xC06E, /* 0x60 */
     0xC06F, 0xC070, 0xC071, 0xC072, 0xC073, 0xC074, 0xC075, 0xC076, /* 0x70 */
-    0xC077, 0xC078, 0xC079,      0,      0,      0,      0,      0, /* 0x70 */
+    0xC077, 0xC078, 0xC079, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xC07A, 0xC07B, 0xC07C, 0xC07D, 0xC07E, 0xC07F, 0xC080, /* 0x80 */
     0xC081, 0xC082, 0xC083, 0xC084, 0xC085, 0xC086, 0xC087, 0xC088, /* 0x80 */
     0xC089, 0xC08A, 0xC08B, 0xC08C, 0xC08D, 0xC08E, 0xC08F, 0xC092, /* 0x90 */
@@ -811,23 +811,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_98[] =
     0xC101, 0xC102, 0xC103, 0xC105, 0xC106, 0xC107, 0xC109, 0xC10A, /* 0xE0 */
     0xC10B, 0xC10C, 0xC10D, 0xC10E, 0xC10F, 0xC111, 0xC112, 0xC113, /* 0xE0 */
     0xC114, 0xC116, 0xC117, 0xC118, 0xC119, 0xC11A, 0xC11B, 0xC121, /* 0xF0 */
-    0xC122, 0xC125, 0xC128, 0xC129, 0xC12A, 0xC12B, 0xC12E          /* 0xF0 */
+    0xC122, 0xC125, 0xC128, 0xC129, 0xC12A, 0xC12B, 0xC12E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_99[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC132, 0xC133, 0xC134, 0xC135, 0xC137, 0xC13A, 0xC13B, /* 0x40 */
     0xC13D, 0xC13E, 0xC13F, 0xC141, 0xC142, 0xC143, 0xC144, 0xC145, /* 0x40 */
     0xC146, 0xC147, 0xC14A, 0xC14E, 0xC14F, 0xC150, 0xC151, 0xC152, /* 0x50 */
-    0xC153, 0xC156, 0xC157,      0,      0,      0,      0,      0, /* 0x50 */
+    0xC153, 0xC156, 0xC157, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xC159, 0xC15A, 0xC15B, 0xC15D, 0xC15E, 0xC15F, 0xC160, /* 0x60 */
     0xC161, 0xC162, 0xC163, 0xC166, 0xC16A, 0xC16B, 0xC16C, 0xC16D, /* 0x60 */
     0xC16E, 0xC16F, 0xC171, 0xC172, 0xC173, 0xC175, 0xC176, 0xC177, /* 0x70 */
-    0xC179, 0xC17A, 0xC17B,      0,      0,      0,      0,      0, /* 0x70 */
+    0xC179, 0xC17A, 0xC17B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xC17C, 0xC17D, 0xC17E, 0xC17F, 0xC180, 0xC181, 0xC182, /* 0x80 */
     0xC183, 0xC184, 0xC186, 0xC187, 0xC188, 0xC189, 0xC18A, 0xC18B, /* 0x80 */
     0xC18F, 0xC191, 0xC192, 0xC193, 0xC195, 0xC197, 0xC198, 0xC199, /* 0x90 */
@@ -843,23 +843,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_99[] =
     0xC1F8, 0xC1F9, 0xC1FA, 0xC1FB, 0xC1FE, 0xC1FF, 0xC201, 0xC202, /* 0xE0 */
     0xC203, 0xC205, 0xC206, 0xC207, 0xC208, 0xC209, 0xC20A, 0xC20B, /* 0xE0 */
     0xC20E, 0xC210, 0xC212, 0xC213, 0xC214, 0xC215, 0xC216, 0xC217, /* 0xF0 */
-    0xC21A, 0xC21B, 0xC21D, 0xC21E, 0xC221, 0xC222, 0xC223          /* 0xF0 */
+    0xC21A, 0xC21B, 0xC21D, 0xC21E, 0xC221, 0xC222, 0xC223			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_9A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC224, 0xC225, 0xC226, 0xC227, 0xC22A, 0xC22C, 0xC22E, /* 0x40 */
     0xC230, 0xC233, 0xC235, 0xC236, 0xC237, 0xC238, 0xC239, 0xC23A, /* 0x40 */
     0xC23B, 0xC23C, 0xC23D, 0xC23E, 0xC23F, 0xC240, 0xC241, 0xC242, /* 0x50 */
-    0xC243, 0xC244, 0xC245,      0,      0,      0,      0,      0, /* 0x50 */
+    0xC243, 0xC244, 0xC245, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xC246, 0xC247, 0xC249, 0xC24A, 0xC24B, 0xC24C, 0xC24D, /* 0x60 */
     0xC24E, 0xC24F, 0xC252, 0xC253, 0xC255, 0xC256, 0xC257, 0xC259, /* 0x60 */
     0xC25A, 0xC25B, 0xC25C, 0xC25D, 0xC25E, 0xC25F, 0xC261, 0xC262, /* 0x70 */
-    0xC263, 0xC264, 0xC266,      0,      0,      0,      0,      0, /* 0x70 */
+    0xC263, 0xC264, 0xC266, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xC267, 0xC268, 0xC269, 0xC26A, 0xC26B, 0xC26E, 0xC26F, /* 0x80 */
     0xC271, 0xC272, 0xC273, 0xC275, 0xC276, 0xC277, 0xC278, 0xC279, /* 0x80 */
     0xC27A, 0xC27B, 0xC27E, 0xC280, 0xC282, 0xC283, 0xC284, 0xC285, /* 0x90 */
@@ -875,23 +875,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_9A[] =
     0xC2DF, 0xC2E1, 0xC2E2, 0xC2E5, 0xC2E6, 0xC2E7, 0xC2E8, 0xC2E9, /* 0xE0 */
     0xC2EA, 0xC2EE, 0xC2F0, 0xC2F2, 0xC2F3, 0xC2F4, 0xC2F5, 0xC2F7, /* 0xE0 */
     0xC2FA, 0xC2FD, 0xC2FE, 0xC2FF, 0xC301, 0xC302, 0xC303, 0xC304, /* 0xF0 */
-    0xC305, 0xC306, 0xC307, 0xC30A, 0xC30B, 0xC30E, 0xC30F          /* 0xF0 */
+    0xC305, 0xC306, 0xC307, 0xC30A, 0xC30B, 0xC30E, 0xC30F			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_9B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC310, 0xC311, 0xC312, 0xC316, 0xC317, 0xC319, 0xC31A, /* 0x40 */
     0xC31B, 0xC31D, 0xC31E, 0xC31F, 0xC320, 0xC321, 0xC322, 0xC323, /* 0x40 */
     0xC326, 0xC327, 0xC32A, 0xC32B, 0xC32C, 0xC32D, 0xC32E, 0xC32F, /* 0x50 */
-    0xC330, 0xC331, 0xC332,      0,      0,      0,      0,      0, /* 0x50 */
+    0xC330, 0xC331, 0xC332, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xC333, 0xC334, 0xC335, 0xC336, 0xC337, 0xC338, 0xC339, /* 0x60 */
     0xC33A, 0xC33B, 0xC33C, 0xC33D, 0xC33E, 0xC33F, 0xC340, 0xC341, /* 0x60 */
     0xC342, 0xC343, 0xC344, 0xC346, 0xC347, 0xC348, 0xC349, 0xC34A, /* 0x70 */
-    0xC34B, 0xC34C, 0xC34D,      0,      0,      0,      0,      0, /* 0x70 */
+    0xC34B, 0xC34C, 0xC34D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xC34E, 0xC34F, 0xC350, 0xC351, 0xC352, 0xC353, 0xC354, /* 0x80 */
     0xC355, 0xC356, 0xC357, 0xC358, 0xC359, 0xC35A, 0xC35B, 0xC35C, /* 0x80 */
     0xC35D, 0xC35E, 0xC35F, 0xC360, 0xC361, 0xC362, 0xC363, 0xC364, /* 0x90 */
@@ -907,23 +907,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_9B[] =
     0xC3B9, 0xC3BA, 0xC3BB, 0xC3BC, 0xC3BD, 0xC3BE, 0xC3BF, 0xC3C1, /* 0xE0 */
     0xC3C2, 0xC3C3, 0xC3C4, 0xC3C5, 0xC3C6, 0xC3C7, 0xC3C8, 0xC3C9, /* 0xE0 */
     0xC3CA, 0xC3CB, 0xC3CC, 0xC3CD, 0xC3CE, 0xC3CF, 0xC3D0, 0xC3D1, /* 0xF0 */
-    0xC3D2, 0xC3D3, 0xC3D4, 0xC3D5, 0xC3D6, 0xC3D7, 0xC3DA          /* 0xF0 */
+    0xC3D2, 0xC3D3, 0xC3D4, 0xC3D5, 0xC3D6, 0xC3D7, 0xC3DA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_9C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC3DB, 0xC3DD, 0xC3DE, 0xC3E1, 0xC3E3, 0xC3E4, 0xC3E5, /* 0x40 */
     0xC3E6, 0xC3E7, 0xC3EA, 0xC3EB, 0xC3EC, 0xC3EE, 0xC3EF, 0xC3F0, /* 0x40 */
     0xC3F1, 0xC3F2, 0xC3F3, 0xC3F6, 0xC3F7, 0xC3F9, 0xC3FA, 0xC3FB, /* 0x50 */
-    0xC3FC, 0xC3FD, 0xC3FE,      0,      0,      0,      0,      0, /* 0x50 */
+    0xC3FC, 0xC3FD, 0xC3FE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xC3FF, 0xC400, 0xC401, 0xC402, 0xC403, 0xC404, 0xC405, /* 0x60 */
     0xC406, 0xC407, 0xC409, 0xC40A, 0xC40B, 0xC40C, 0xC40D, 0xC40E, /* 0x60 */
     0xC40F, 0xC411, 0xC412, 0xC413, 0xC414, 0xC415, 0xC416, 0xC417, /* 0x70 */
-    0xC418, 0xC419, 0xC41A,      0,      0,      0,      0,      0, /* 0x70 */
+    0xC418, 0xC419, 0xC41A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xC41B, 0xC41C, 0xC41D, 0xC41E, 0xC41F, 0xC420, 0xC421, /* 0x80 */
     0xC422, 0xC423, 0xC425, 0xC426, 0xC427, 0xC428, 0xC429, 0xC42A, /* 0x80 */
     0xC42B, 0xC42D, 0xC42E, 0xC42F, 0xC431, 0xC432, 0xC433, 0xC435, /* 0x90 */
@@ -939,23 +939,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_9C[] =
     0xC489, 0xC48A, 0xC48B, 0xC48C, 0xC48D, 0xC48E, 0xC48F, 0xC490, /* 0xE0 */
     0xC491, 0xC492, 0xC493, 0xC495, 0xC496, 0xC497, 0xC498, 0xC499, /* 0xE0 */
     0xC49A, 0xC49B, 0xC49D, 0xC49E, 0xC49F, 0xC4A0, 0xC4A1, 0xC4A2, /* 0xF0 */
-    0xC4A3, 0xC4A4, 0xC4A5, 0xC4A6, 0xC4A7, 0xC4A8, 0xC4A9          /* 0xF0 */
+    0xC4A3, 0xC4A4, 0xC4A5, 0xC4A6, 0xC4A7, 0xC4A8, 0xC4A9			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_9D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC4AA, 0xC4AB, 0xC4AC, 0xC4AD, 0xC4AE, 0xC4AF, 0xC4B0, /* 0x40 */
     0xC4B1, 0xC4B2, 0xC4B3, 0xC4B4, 0xC4B5, 0xC4B6, 0xC4B7, 0xC4B9, /* 0x40 */
     0xC4BA, 0xC4BB, 0xC4BD, 0xC4BE, 0xC4BF, 0xC4C0, 0xC4C1, 0xC4C2, /* 0x50 */
-    0xC4C3, 0xC4C4, 0xC4C5,      0,      0,      0,      0,      0, /* 0x50 */
+    0xC4C3, 0xC4C4, 0xC4C5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xC4C6, 0xC4C7, 0xC4C8, 0xC4C9, 0xC4CA, 0xC4CB, 0xC4CC, /* 0x60 */
     0xC4CD, 0xC4CE, 0xC4CF, 0xC4D0, 0xC4D1, 0xC4D2, 0xC4D3, 0xC4D4, /* 0x60 */
     0xC4D5, 0xC4D6, 0xC4D7, 0xC4D8, 0xC4D9, 0xC4DA, 0xC4DB, 0xC4DC, /* 0x70 */
-    0xC4DD, 0xC4DE, 0xC4DF,      0,      0,      0,      0,      0, /* 0x70 */
+    0xC4DD, 0xC4DE, 0xC4DF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xC4E0, 0xC4E1, 0xC4E2, 0xC4E3, 0xC4E4, 0xC4E5, 0xC4E6, /* 0x80 */
     0xC4E7, 0xC4E8, 0xC4EA, 0xC4EB, 0xC4EC, 0xC4ED, 0xC4EE, 0xC4EF, /* 0x80 */
     0xC4F2, 0xC4F3, 0xC4F5, 0xC4F6, 0xC4F7, 0xC4F9, 0xC4FB, 0xC4FC, /* 0x90 */
@@ -971,23 +971,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_9D[] =
     0xC567, 0xC569, 0xC56A, 0xC56B, 0xC56C, 0xC56D, 0xC56E, 0xC56F, /* 0xE0 */
     0xC572, 0xC576, 0xC577, 0xC578, 0xC579, 0xC57A, 0xC57B, 0xC57E, /* 0xE0 */
     0xC57F, 0xC581, 0xC582, 0xC583, 0xC585, 0xC586, 0xC588, 0xC589, /* 0xF0 */
-    0xC58A, 0xC58B, 0xC58E, 0xC590, 0xC592, 0xC593, 0xC594          /* 0xF0 */
+    0xC58A, 0xC58B, 0xC58E, 0xC590, 0xC592, 0xC593, 0xC594			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_9E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC596, 0xC599, 0xC59A, 0xC59B, 0xC59D, 0xC59E, 0xC59F, /* 0x40 */
     0xC5A1, 0xC5A2, 0xC5A3, 0xC5A4, 0xC5A5, 0xC5A6, 0xC5A7, 0xC5A8, /* 0x40 */
     0xC5AA, 0xC5AB, 0xC5AC, 0xC5AD, 0xC5AE, 0xC5AF, 0xC5B0, 0xC5B1, /* 0x50 */
-    0xC5B2, 0xC5B3, 0xC5B6,      0,      0,      0,      0,      0, /* 0x50 */
+    0xC5B2, 0xC5B3, 0xC5B6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xC5B7, 0xC5BA, 0xC5BF, 0xC5C0, 0xC5C1, 0xC5C2, 0xC5C3, /* 0x60 */
     0xC5CB, 0xC5CD, 0xC5CF, 0xC5D2, 0xC5D3, 0xC5D5, 0xC5D6, 0xC5D7, /* 0x60 */
     0xC5D9, 0xC5DA, 0xC5DB, 0xC5DC, 0xC5DD, 0xC5DE, 0xC5DF, 0xC5E2, /* 0x70 */
-    0xC5E4, 0xC5E6, 0xC5E7,      0,      0,      0,      0,      0, /* 0x70 */
+    0xC5E4, 0xC5E6, 0xC5E7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xC5E8, 0xC5E9, 0xC5EA, 0xC5EB, 0xC5EF, 0xC5F1, 0xC5F2, /* 0x80 */
     0xC5F3, 0xC5F5, 0xC5F8, 0xC5F9, 0xC5FA, 0xC5FB, 0xC602, 0xC603, /* 0x80 */
     0xC604, 0xC609, 0xC60A, 0xC60B, 0xC60D, 0xC60E, 0xC60F, 0xC611, /* 0x90 */
@@ -1003,23 +1003,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_9E[] =
     0xC67D, 0xC67E, 0xC67F, 0xC681, 0xC682, 0xC683, 0xC684, 0xC685, /* 0xE0 */
     0xC686, 0xC687, 0xC68A, 0xC68C, 0xC68E, 0xC68F, 0xC690, 0xC691, /* 0xE0 */
     0xC692, 0xC693, 0xC696, 0xC697, 0xC699, 0xC69A, 0xC69B, 0xC69D, /* 0xF0 */
-    0xC69E, 0xC69F, 0xC6A0, 0xC6A1, 0xC6A2, 0xC6A3, 0xC6A6          /* 0xF0 */
+    0xC69E, 0xC69F, 0xC6A0, 0xC6A1, 0xC6A2, 0xC6A3, 0xC6A6			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_9F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC6A8, 0xC6AA, 0xC6AB, 0xC6AC, 0xC6AD, 0xC6AE, 0xC6AF, /* 0x40 */
     0xC6B2, 0xC6B3, 0xC6B5, 0xC6B6, 0xC6B7, 0xC6BB, 0xC6BC, 0xC6BD, /* 0x40 */
     0xC6BE, 0xC6BF, 0xC6C2, 0xC6C4, 0xC6C6, 0xC6C7, 0xC6C8, 0xC6C9, /* 0x50 */
-    0xC6CA, 0xC6CB, 0xC6CE,      0,      0,      0,      0,      0, /* 0x50 */
+    0xC6CA, 0xC6CB, 0xC6CE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xC6CF, 0xC6D1, 0xC6D2, 0xC6D3, 0xC6D5, 0xC6D6, 0xC6D7, /* 0x60 */
     0xC6D8, 0xC6D9, 0xC6DA, 0xC6DB, 0xC6DE, 0xC6DF, 0xC6E2, 0xC6E3, /* 0x60 */
     0xC6E4, 0xC6E5, 0xC6E6, 0xC6E7, 0xC6EA, 0xC6EB, 0xC6ED, 0xC6EE, /* 0x70 */
-    0xC6EF, 0xC6F1, 0xC6F2,      0,      0,      0,      0,      0, /* 0x70 */
+    0xC6EF, 0xC6F1, 0xC6F2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xC6F3, 0xC6F4, 0xC6F5, 0xC6F6, 0xC6F7, 0xC6FA, 0xC6FB, /* 0x80 */
     0xC6FC, 0xC6FE, 0xC6FF, 0xC700, 0xC701, 0xC702, 0xC703, 0xC706, /* 0x80 */
     0xC707, 0xC709, 0xC70A, 0xC70B, 0xC70D, 0xC70E, 0xC70F, 0xC710, /* 0x90 */
@@ -1035,23 +1035,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_9F[] =
     0xC780, 0xC781, 0xC782, 0xC786, 0xC78B, 0xC78C, 0xC78D, 0xC78F, /* 0xE0 */
     0xC792, 0xC793, 0xC795, 0xC799, 0xC79B, 0xC79C, 0xC79D, 0xC79E, /* 0xE0 */
     0xC79F, 0xC7A2, 0xC7A7, 0xC7A8, 0xC7A9, 0xC7AA, 0xC7AB, 0xC7AE, /* 0xF0 */
-    0xC7AF, 0xC7B1, 0xC7B2, 0xC7B3, 0xC7B5, 0xC7B6, 0xC7B7          /* 0xF0 */
+    0xC7AF, 0xC7B1, 0xC7B2, 0xC7B3, 0xC7B5, 0xC7B6, 0xC7B7			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC7B8, 0xC7B9, 0xC7BA, 0xC7BB, 0xC7BE, 0xC7C2, 0xC7C3, /* 0x40 */
     0xC7C4, 0xC7C5, 0xC7C6, 0xC7C7, 0xC7CA, 0xC7CB, 0xC7CD, 0xC7CF, /* 0x40 */
     0xC7D1, 0xC7D2, 0xC7D3, 0xC7D4, 0xC7D5, 0xC7D6, 0xC7D7, 0xC7D9, /* 0x50 */
-    0xC7DA, 0xC7DB, 0xC7DC,      0,      0,      0,      0,      0, /* 0x50 */
+    0xC7DA, 0xC7DB, 0xC7DC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xC7DE, 0xC7DF, 0xC7E0, 0xC7E1, 0xC7E2, 0xC7E3, 0xC7E5, /* 0x60 */
     0xC7E6, 0xC7E7, 0xC7E9, 0xC7EA, 0xC7EB, 0xC7ED, 0xC7EE, 0xC7EF, /* 0x60 */
     0xC7F0, 0xC7F1, 0xC7F2, 0xC7F3, 0xC7F4, 0xC7F5, 0xC7F6, 0xC7F7, /* 0x70 */
-    0xC7F8, 0xC7F9, 0xC7FA,      0,      0,      0,      0,      0, /* 0x70 */
+    0xC7F8, 0xC7F9, 0xC7FA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xC7FB, 0xC7FC, 0xC7FD, 0xC7FE, 0xC7FF, 0xC802, 0xC803, /* 0x80 */
     0xC805, 0xC806, 0xC807, 0xC809, 0xC80B, 0xC80C, 0xC80D, 0xC80E, /* 0x80 */
     0xC80F, 0xC812, 0xC814, 0xC817, 0xC818, 0xC819, 0xC81A, 0xC81B, /* 0x90 */
@@ -1067,23 +1067,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A0[] =
     0xC877, 0xC879, 0xC87B, 0xC87C, 0xC87D, 0xC87E, 0xC87F, 0xC882, /* 0xE0 */
     0xC884, 0xC888, 0xC889, 0xC88A, 0xC88E, 0xC88F, 0xC890, 0xC891, /* 0xE0 */
     0xC892, 0xC893, 0xC895, 0xC896, 0xC897, 0xC898, 0xC899, 0xC89A, /* 0xF0 */
-    0xC89B, 0xC89C, 0xC89E, 0xC8A0, 0xC8A2, 0xC8A3, 0xC8A4          /* 0xF0 */
+    0xC89B, 0xC89C, 0xC89E, 0xC8A0, 0xC8A2, 0xC8A3, 0xC8A4			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC8A5, 0xC8A6, 0xC8A7, 0xC8A9, 0xC8AA, 0xC8AB, 0xC8AC, /* 0x40 */
     0xC8AD, 0xC8AE, 0xC8AF, 0xC8B0, 0xC8B1, 0xC8B2, 0xC8B3, 0xC8B4, /* 0x40 */
     0xC8B5, 0xC8B6, 0xC8B7, 0xC8B8, 0xC8B9, 0xC8BA, 0xC8BB, 0xC8BE, /* 0x50 */
-    0xC8BF, 0xC8C0, 0xC8C1,      0,      0,      0,      0,      0, /* 0x50 */
+    0xC8BF, 0xC8C0, 0xC8C1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xC8C2, 0xC8C3, 0xC8C5, 0xC8C6, 0xC8C7, 0xC8C9, 0xC8CA, /* 0x60 */
     0xC8CB, 0xC8CD, 0xC8CE, 0xC8CF, 0xC8D0, 0xC8D1, 0xC8D2, 0xC8D3, /* 0x60 */
     0xC8D6, 0xC8D8, 0xC8DA, 0xC8DB, 0xC8DC, 0xC8DD, 0xC8DE, 0xC8DF, /* 0x70 */
-    0xC8E2, 0xC8E3, 0xC8E5,      0,      0,      0,      0,      0, /* 0x70 */
+    0xC8E2, 0xC8E3, 0xC8E5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xC8E6, 0xC8E7, 0xC8E8, 0xC8E9, 0xC8EA, 0xC8EB, 0xC8EC, /* 0x80 */
     0xC8ED, 0xC8EE, 0xC8EF, 0xC8F0, 0xC8F1, 0xC8F2, 0xC8F3, 0xC8F4, /* 0x80 */
     0xC8F6, 0xC8F7, 0xC8F8, 0xC8F9, 0xC8FA, 0xC8FB, 0xC8FE, 0xC8FF, /* 0x90 */
@@ -1099,23 +1099,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A1[] =
     0x25A1, 0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC, 0x2192, 0x2190, /* 0xE0 */
     0x2191, 0x2193, 0x2194, 0x3013, 0x226A, 0x226B, 0x221A, 0x223D, /* 0xE0 */
     0x221D, 0x2235, 0x222B, 0x222C, 0x2208, 0x220B, 0x2286, 0x2287, /* 0xF0 */
-    0x2282, 0x2283, 0x222A, 0x2229, 0x2227, 0x2228, 0xFFE2          /* 0xF0 */
+    0x2282, 0x2283, 0x222A, 0x2229, 0x2227, 0x2228, 0xFFE2			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC910, 0xC912, 0xC913, 0xC914, 0xC915, 0xC916, 0xC917, /* 0x40 */
     0xC919, 0xC91A, 0xC91B, 0xC91C, 0xC91D, 0xC91E, 0xC91F, 0xC920, /* 0x40 */
     0xC921, 0xC922, 0xC923, 0xC924, 0xC925, 0xC926, 0xC927, 0xC928, /* 0x50 */
-    0xC929, 0xC92A, 0xC92B,      0,      0,      0,      0,      0, /* 0x50 */
+    0xC929, 0xC92A, 0xC92B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xC92D, 0xC92E, 0xC92F, 0xC930, 0xC931, 0xC932, 0xC933, /* 0x60 */
     0xC935, 0xC936, 0xC937, 0xC938, 0xC939, 0xC93A, 0xC93B, 0xC93C, /* 0x60 */
     0xC93D, 0xC93E, 0xC93F, 0xC940, 0xC941, 0xC942, 0xC943, 0xC944, /* 0x70 */
-    0xC945, 0xC946, 0xC947,      0,      0,      0,      0,      0, /* 0x70 */
+    0xC945, 0xC946, 0xC947, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xC948, 0xC949, 0xC94A, 0xC94B, 0xC94C, 0xC94D, 0xC94E, /* 0x80 */
     0xC94F, 0xC952, 0xC953, 0xC955, 0xC956, 0xC957, 0xC959, 0xC95A, /* 0x80 */
     0xC95B, 0xC95C, 0xC95D, 0xC95E, 0xC95F, 0xC962, 0xC964, 0xC965, /* 0x90 */
@@ -1128,23 +1128,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A2[] =
     0x25A5, 0x25A8, 0x25A7, 0x25A6, 0x25A9, 0x2668, 0x260F, 0x260E, /* 0xC0 */
     0x261C, 0x261E, 0x00B6, 0x2020, 0x2021, 0x2195, 0x2197, 0x2199, /* 0xD0 */
     0x2196, 0x2198, 0x266D, 0x2669, 0x266A, 0x266C, 0x327F, 0x321C, /* 0xD0 */
-    0x2116, 0x33C7, 0x2122, 0x33C2, 0x33D8, 0x2121, 0x20AC, 0x00AE  /* 0xE0 */
+    0x2116, 0x33C7, 0x2122, 0x33C2, 0x33D8, 0x2121, 0x20AC, 0x00AE	/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC971, 0xC972, 0xC973, 0xC975, 0xC976, 0xC977, 0xC978, /* 0x40 */
     0xC979, 0xC97A, 0xC97B, 0xC97D, 0xC97E, 0xC97F, 0xC980, 0xC981, /* 0x40 */
     0xC982, 0xC983, 0xC984, 0xC985, 0xC986, 0xC987, 0xC98A, 0xC98B, /* 0x50 */
-    0xC98D, 0xC98E, 0xC98F,      0,      0,      0,      0,      0, /* 0x50 */
+    0xC98D, 0xC98E, 0xC98F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xC991, 0xC992, 0xC993, 0xC994, 0xC995, 0xC996, 0xC997, /* 0x60 */
     0xC99A, 0xC99C, 0xC99E, 0xC99F, 0xC9A0, 0xC9A1, 0xC9A2, 0xC9A3, /* 0x60 */
     0xC9A4, 0xC9A5, 0xC9A6, 0xC9A7, 0xC9A8, 0xC9A9, 0xC9AA, 0xC9AB, /* 0x70 */
-    0xC9AC, 0xC9AD, 0xC9AE,      0,      0,      0,      0,      0, /* 0x70 */
+    0xC9AC, 0xC9AD, 0xC9AE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xC9AF, 0xC9B0, 0xC9B1, 0xC9B2, 0xC9B3, 0xC9B4, 0xC9B5, /* 0x80 */
     0xC9B6, 0xC9B7, 0xC9B8, 0xC9B9, 0xC9BA, 0xC9BB, 0xC9BC, 0xC9BD, /* 0x80 */
     0xC9BE, 0xC9BF, 0xC9C2, 0xC9C3, 0xC9C5, 0xC9C6, 0xC9C9, 0xC9CB, /* 0x90 */
@@ -1160,23 +1160,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A3[] =
     0xFF40, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47, /* 0xE0 */
     0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F, /* 0xE0 */
     0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57, /* 0xF0 */
-    0xFF58, 0xFF59, 0xFF5A, 0xFF5B, 0xFF5C, 0xFF5D, 0xFFE3          /* 0xF0 */
+    0xFF58, 0xFF59, 0xFF5A, 0xFF5B, 0xFF5C, 0xFF5D, 0xFFE3			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC9DE, 0xC9DF, 0xC9E1, 0xC9E3, 0xC9E5, 0xC9E6, 0xC9E8, /* 0x40 */
     0xC9E9, 0xC9EA, 0xC9EB, 0xC9EE, 0xC9F2, 0xC9F3, 0xC9F4, 0xC9F5, /* 0x40 */
     0xC9F6, 0xC9F7, 0xC9FA, 0xC9FB, 0xC9FD, 0xC9FE, 0xC9FF, 0xCA01, /* 0x50 */
-    0xCA02, 0xCA03, 0xCA04,      0,      0,      0,      0,      0, /* 0x50 */
+    0xCA02, 0xCA03, 0xCA04, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xCA05, 0xCA06, 0xCA07, 0xCA0A, 0xCA0E, 0xCA0F, 0xCA10, /* 0x60 */
     0xCA11, 0xCA12, 0xCA13, 0xCA15, 0xCA16, 0xCA17, 0xCA19, 0xCA1A, /* 0x60 */
     0xCA1B, 0xCA1C, 0xCA1D, 0xCA1E, 0xCA1F, 0xCA20, 0xCA21, 0xCA22, /* 0x70 */
-    0xCA23, 0xCA24, 0xCA25,      0,      0,      0,      0,      0, /* 0x70 */
+    0xCA23, 0xCA24, 0xCA25, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xCA26, 0xCA27, 0xCA28, 0xCA2A, 0xCA2B, 0xCA2C, 0xCA2D, /* 0x80 */
     0xCA2E, 0xCA2F, 0xCA30, 0xCA31, 0xCA32, 0xCA33, 0xCA34, 0xCA35, /* 0x80 */
     0xCA36, 0xCA37, 0xCA38, 0xCA39, 0xCA3A, 0xCA3B, 0xCA3C, 0xCA3D, /* 0x90 */
@@ -1192,55 +1192,55 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A4[] =
     0x3170, 0x3171, 0x3172, 0x3173, 0x3174, 0x3175, 0x3176, 0x3177, /* 0xE0 */
     0x3178, 0x3179, 0x317A, 0x317B, 0x317C, 0x317D, 0x317E, 0x317F, /* 0xE0 */
     0x3180, 0x3181, 0x3182, 0x3183, 0x3184, 0x3185, 0x3186, 0x3187, /* 0xF0 */
-    0x3188, 0x3189, 0x318A, 0x318B, 0x318C, 0x318D, 0x318E          /* 0xF0 */
+    0x3188, 0x3189, 0x318A, 0x318B, 0x318C, 0x318D, 0x318E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCA47, 0xCA48, 0xCA49, 0xCA4A, 0xCA4B, 0xCA4E, 0xCA4F, /* 0x40 */
     0xCA51, 0xCA52, 0xCA53, 0xCA55, 0xCA56, 0xCA57, 0xCA58, 0xCA59, /* 0x40 */
     0xCA5A, 0xCA5B, 0xCA5E, 0xCA62, 0xCA63, 0xCA64, 0xCA65, 0xCA66, /* 0x50 */
-    0xCA67, 0xCA69, 0xCA6A,      0,      0,      0,      0,      0, /* 0x50 */
+    0xCA67, 0xCA69, 0xCA6A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xCA6B, 0xCA6C, 0xCA6D, 0xCA6E, 0xCA6F, 0xCA70, 0xCA71, /* 0x60 */
     0xCA72, 0xCA73, 0xCA74, 0xCA75, 0xCA76, 0xCA77, 0xCA78, 0xCA79, /* 0x60 */
     0xCA7A, 0xCA7B, 0xCA7C, 0xCA7E, 0xCA7F, 0xCA80, 0xCA81, 0xCA82, /* 0x70 */
-    0xCA83, 0xCA85, 0xCA86,      0,      0,      0,      0,      0, /* 0x70 */
+    0xCA83, 0xCA85, 0xCA86, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xCA87, 0xCA88, 0xCA89, 0xCA8A, 0xCA8B, 0xCA8C, 0xCA8D, /* 0x80 */
     0xCA8E, 0xCA8F, 0xCA90, 0xCA91, 0xCA92, 0xCA93, 0xCA94, 0xCA95, /* 0x80 */
     0xCA96, 0xCA97, 0xCA99, 0xCA9A, 0xCA9B, 0xCA9C, 0xCA9D, 0xCA9E, /* 0x90 */
     0xCA9F, 0xCAA0, 0xCAA1, 0xCAA2, 0xCAA3, 0xCAA4, 0xCAA5, 0xCAA6, /* 0x90 */
     0xCAA7, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176, /* 0xA0 */
-    0x2177, 0x2178, 0x2179,      0,      0,      0,      0,      0, /* 0xA0 */
+    0x2177, 0x2178, 0x2179, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
     0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, /* 0xB0 */
-    0x2168, 0x2169,      0,      0,      0,      0,      0,      0, /* 0xB0 */
+    0x2168, 0x2169, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
          0, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, /* 0xC0 */
     0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, /* 0xC0 */
     0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, /* 0xD0 */
-    0x03A9,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
+    0x03A9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
          0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, /* 0xE0 */
     0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, /* 0xE0 */
     0x03C0, 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, /* 0xF0 */
-    0x03C9                                                          /* 0xF0 */
+    0x03C9															/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCAA8, 0xCAA9, 0xCAAA, 0xCAAB, 0xCAAC, 0xCAAD, 0xCAAE, /* 0x40 */
     0xCAAF, 0xCAB0, 0xCAB1, 0xCAB2, 0xCAB3, 0xCAB4, 0xCAB5, 0xCAB6, /* 0x40 */
     0xCAB7, 0xCAB8, 0xCAB9, 0xCABA, 0xCABB, 0xCABE, 0xCABF, 0xCAC1, /* 0x50 */
-    0xCAC2, 0xCAC3, 0xCAC5,      0,      0,      0,      0,      0, /* 0x50 */
+    0xCAC2, 0xCAC3, 0xCAC5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xCAC6, 0xCAC7, 0xCAC8, 0xCAC9, 0xCACA, 0xCACB, 0xCACE, /* 0x60 */
     0xCAD0, 0xCAD2, 0xCAD4, 0xCAD5, 0xCAD6, 0xCAD7, 0xCADA, 0xCADB, /* 0x60 */
     0xCADC, 0xCADD, 0xCADE, 0xCADF, 0xCAE1, 0xCAE2, 0xCAE3, 0xCAE4, /* 0x70 */
-    0xCAE5, 0xCAE6, 0xCAE7,      0,      0,      0,      0,      0, /* 0x70 */
+    0xCAE5, 0xCAE6, 0xCAE7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xCAE8, 0xCAE9, 0xCAEA, 0xCAEB, 0xCAED, 0xCAEE, 0xCAEF, /* 0x80 */
     0xCAF0, 0xCAF1, 0xCAF2, 0xCAF3, 0xCAF5, 0xCAF6, 0xCAF7, 0xCAF8, /* 0x80 */
     0xCAF9, 0xCAFA, 0xCAFB, 0xCAFC, 0xCAFD, 0xCAFE, 0xCAFF, 0xCB00, /* 0x90 */
@@ -1253,23 +1253,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A6[] =
     0x250D, 0x251E, 0x251F, 0x2521, 0x2522, 0x2526, 0x2527, 0x2529, /* 0xC0 */
     0x252A, 0x252D, 0x252E, 0x2531, 0x2532, 0x2535, 0x2536, 0x2539, /* 0xD0 */
     0x253A, 0x253D, 0x253E, 0x2540, 0x2541, 0x2543, 0x2544, 0x2545, /* 0xD0 */
-    0x2546, 0x2547, 0x2548, 0x2549, 0x254A                          /* 0xE0 */
+    0x2546, 0x2547, 0x2548, 0x2549, 0x254A							/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCB0B, 0xCB0C, 0xCB0D, 0xCB0E, 0xCB0F, 0xCB11, 0xCB12, /* 0x40 */
     0xCB13, 0xCB15, 0xCB16, 0xCB17, 0xCB19, 0xCB1A, 0xCB1B, 0xCB1C, /* 0x40 */
     0xCB1D, 0xCB1E, 0xCB1F, 0xCB22, 0xCB23, 0xCB24, 0xCB25, 0xCB26, /* 0x50 */
-    0xCB27, 0xCB28, 0xCB29,      0,      0,      0,      0,      0, /* 0x50 */
+    0xCB27, 0xCB28, 0xCB29, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xCB2A, 0xCB2B, 0xCB2C, 0xCB2D, 0xCB2E, 0xCB2F, 0xCB30, /* 0x60 */
     0xCB31, 0xCB32, 0xCB33, 0xCB34, 0xCB35, 0xCB36, 0xCB37, 0xCB38, /* 0x60 */
     0xCB39, 0xCB3A, 0xCB3B, 0xCB3C, 0xCB3D, 0xCB3E, 0xCB3F, 0xCB40, /* 0x70 */
-    0xCB42, 0xCB43, 0xCB44,      0,      0,      0,      0,      0, /* 0x70 */
+    0xCB42, 0xCB43, 0xCB44, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xCB45, 0xCB46, 0xCB47, 0xCB4A, 0xCB4B, 0xCB4D, 0xCB4E, /* 0x80 */
     0xCB4F, 0xCB51, 0xCB52, 0xCB53, 0xCB54, 0xCB55, 0xCB56, 0xCB57, /* 0x80 */
     0xCB5A, 0xCB5B, 0xCB5C, 0xCB5E, 0xCB5F, 0xCB60, 0xCB61, 0xCB62, /* 0x90 */
@@ -1283,28 +1283,28 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A7[] =
     0x33BC, 0x33BD, 0x33BE, 0x33BF, 0x3390, 0x3391, 0x3392, 0x3393, /* 0xD0 */
     0x3394, 0x2126, 0x33C0, 0x33C1, 0x338A, 0x338B, 0x338C, 0x33D6, /* 0xD0 */
     0x33C5, 0x33AD, 0x33AE, 0x33AF, 0x33DB, 0x33A9, 0x33AA, 0x33AB, /* 0xE0 */
-    0x33AC, 0x33DD, 0x33D0, 0x33D3, 0x33C3, 0x33C9, 0x33DC, 0x33C6  /* 0xE0 */
+    0x33AC, 0x33DD, 0x33D0, 0x33D3, 0x33C3, 0x33C9, 0x33DC, 0x33C6	/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCB6D, 0xCB6E, 0xCB6F, 0xCB70, 0xCB71, 0xCB72, 0xCB73, /* 0x40 */
     0xCB74, 0xCB75, 0xCB76, 0xCB77, 0xCB7A, 0xCB7B, 0xCB7C, 0xCB7D, /* 0x40 */
     0xCB7E, 0xCB7F, 0xCB80, 0xCB81, 0xCB82, 0xCB83, 0xCB84, 0xCB85, /* 0x50 */
-    0xCB86, 0xCB87, 0xCB88,      0,      0,      0,      0,      0, /* 0x50 */
+    0xCB86, 0xCB87, 0xCB88, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xCB89, 0xCB8A, 0xCB8B, 0xCB8C, 0xCB8D, 0xCB8E, 0xCB8F, /* 0x60 */
     0xCB90, 0xCB91, 0xCB92, 0xCB93, 0xCB94, 0xCB95, 0xCB96, 0xCB97, /* 0x60 */
     0xCB98, 0xCB99, 0xCB9A, 0xCB9B, 0xCB9D, 0xCB9E, 0xCB9F, 0xCBA0, /* 0x70 */
-    0xCBA1, 0xCBA2, 0xCBA3,      0,      0,      0,      0,      0, /* 0x70 */
+    0xCBA1, 0xCBA2, 0xCBA3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xCBA4, 0xCBA5, 0xCBA6, 0xCBA7, 0xCBA8, 0xCBA9, 0xCBAA, /* 0x80 */
     0xCBAB, 0xCBAC, 0xCBAD, 0xCBAE, 0xCBAF, 0xCBB0, 0xCBB1, 0xCBB2, /* 0x80 */
     0xCBB3, 0xCBB4, 0xCBB5, 0xCBB6, 0xCBB7, 0xCBB9, 0xCBBA, 0xCBBB, /* 0x90 */
     0xCBBC, 0xCBBD, 0xCBBE, 0xCBBF, 0xCBC0, 0xCBC1, 0xCBC2, 0xCBC3, /* 0x90 */
-    0xCBC4, 0x00C6, 0x00D0, 0x00AA, 0x0126,      0, 0x0132,      0, /* 0xA0 */
+    0xCBC4, 0x00C6, 0x00D0, 0x00AA, 0x0126, 	 0, 0x0132, 	 0, /* 0xA0 */
     0x013F, 0x0141, 0x00D8, 0x0152, 0x00BA, 0x00DE, 0x0166, 0x014A, /* 0xA0 */
          0, 0x3260, 0x3261, 0x3262, 0x3263, 0x3264, 0x3265, 0x3266, /* 0xB0 */
     0x3267, 0x3268, 0x3269, 0x326A, 0x326B, 0x326C, 0x326D, 0x326E, /* 0xB0 */
@@ -1315,23 +1315,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A8[] =
     0x24E3, 0x24E4, 0x24E5, 0x24E6, 0x24E7, 0x24E8, 0x24E9, 0x2460, /* 0xE0 */
     0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467, 0x2468, /* 0xE0 */
     0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x00BD, 0x2153, /* 0xF0 */
-    0x2154, 0x00BC, 0x00BE, 0x215B, 0x215C, 0x215D, 0x215E          /* 0xF0 */
+    0x2154, 0x00BC, 0x00BE, 0x215B, 0x215C, 0x215D, 0x215E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCBC5, 0xCBC6, 0xCBC7, 0xCBC8, 0xCBC9, 0xCBCA, 0xCBCB, /* 0x40 */
     0xCBCC, 0xCBCD, 0xCBCE, 0xCBCF, 0xCBD0, 0xCBD1, 0xCBD2, 0xCBD3, /* 0x40 */
     0xCBD5, 0xCBD6, 0xCBD7, 0xCBD8, 0xCBD9, 0xCBDA, 0xCBDB, 0xCBDC, /* 0x50 */
-    0xCBDD, 0xCBDE, 0xCBDF,      0,      0,      0,      0,      0, /* 0x50 */
+    0xCBDD, 0xCBDE, 0xCBDF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xCBE0, 0xCBE1, 0xCBE2, 0xCBE3, 0xCBE5, 0xCBE6, 0xCBE8, /* 0x60 */
     0xCBEA, 0xCBEB, 0xCBEC, 0xCBED, 0xCBEE, 0xCBEF, 0xCBF0, 0xCBF1, /* 0x60 */
     0xCBF2, 0xCBF3, 0xCBF4, 0xCBF5, 0xCBF6, 0xCBF7, 0xCBF8, 0xCBF9, /* 0x70 */
-    0xCBFA, 0xCBFB, 0xCBFC,      0,      0,      0,      0,      0, /* 0x70 */
+    0xCBFA, 0xCBFB, 0xCBFC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xCBFD, 0xCBFE, 0xCBFF, 0xCC00, 0xCC01, 0xCC02, 0xCC03, /* 0x80 */
     0xCC04, 0xCC05, 0xCC06, 0xCC07, 0xCC08, 0xCC09, 0xCC0A, 0xCC0B, /* 0x80 */
     0xCC0E, 0xCC0F, 0xCC11, 0xCC12, 0xCC13, 0xCC15, 0xCC16, 0xCC17, /* 0x90 */
@@ -1347,23 +1347,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_A9[] =
     0x24AF, 0x24B0, 0x24B1, 0x24B2, 0x24B3, 0x24B4, 0x24B5, 0x2474, /* 0xE0 */
     0x2475, 0x2476, 0x2477, 0x2478, 0x2479, 0x247A, 0x247B, 0x247C, /* 0xE0 */
     0x247D, 0x247E, 0x247F, 0x2480, 0x2481, 0x2482, 0x00B9, 0x00B2, /* 0xF0 */
-    0x00B3, 0x2074, 0x207F, 0x2081, 0x2082, 0x2083, 0x2084          /* 0xF0 */
+    0x00B3, 0x2074, 0x207F, 0x2081, 0x2082, 0x2083, 0x2084			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_AA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCC25, 0xCC26, 0xCC2A, 0xCC2B, 0xCC2D, 0xCC2F, 0xCC31, /* 0x40 */
     0xCC32, 0xCC33, 0xCC34, 0xCC35, 0xCC36, 0xCC37, 0xCC3A, 0xCC3F, /* 0x40 */
     0xCC40, 0xCC41, 0xCC42, 0xCC43, 0xCC46, 0xCC47, 0xCC49, 0xCC4A, /* 0x50 */
-    0xCC4B, 0xCC4D, 0xCC4E,      0,      0,      0,      0,      0, /* 0x50 */
+    0xCC4B, 0xCC4D, 0xCC4E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xCC4F, 0xCC50, 0xCC51, 0xCC52, 0xCC53, 0xCC56, 0xCC5A, /* 0x60 */
     0xCC5B, 0xCC5C, 0xCC5D, 0xCC5E, 0xCC5F, 0xCC61, 0xCC62, 0xCC63, /* 0x60 */
     0xCC65, 0xCC67, 0xCC69, 0xCC6A, 0xCC6B, 0xCC6C, 0xCC6D, 0xCC6E, /* 0x70 */
-    0xCC6F, 0xCC71, 0xCC72,      0,      0,      0,      0,      0, /* 0x70 */
+    0xCC6F, 0xCC71, 0xCC72, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xCC73, 0xCC74, 0xCC76, 0xCC77, 0xCC78, 0xCC79, 0xCC7A, /* 0x80 */
     0xCC7B, 0xCC7C, 0xCC7D, 0xCC7E, 0xCC7F, 0xCC80, 0xCC81, 0xCC82, /* 0x80 */
     0xCC83, 0xCC84, 0xCC85, 0xCC86, 0xCC87, 0xCC88, 0xCC89, 0xCC8A, /* 0x90 */
@@ -1378,23 +1378,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_AA[] =
     0x3078, 0x3079, 0x307A, 0x307B, 0x307C, 0x307D, 0x307E, 0x307F, /* 0xD0 */
     0x3080, 0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087, /* 0xE0 */
     0x3088, 0x3089, 0x308A, 0x308B, 0x308C, 0x308D, 0x308E, 0x308F, /* 0xE0 */
-    0x3090, 0x3091, 0x3092, 0x3093                                  /* 0xF0 */
+    0x3090, 0x3091, 0x3092, 0x3093									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_AB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCC94, 0xCC95, 0xCC96, 0xCC97, 0xCC9A, 0xCC9B, 0xCC9D, /* 0x40 */
     0xCC9E, 0xCC9F, 0xCCA1, 0xCCA2, 0xCCA3, 0xCCA4, 0xCCA5, 0xCCA6, /* 0x40 */
     0xCCA7, 0xCCAA, 0xCCAE, 0xCCAF, 0xCCB0, 0xCCB1, 0xCCB2, 0xCCB3, /* 0x50 */
-    0xCCB6, 0xCCB7, 0xCCB9,      0,      0,      0,      0,      0, /* 0x50 */
+    0xCCB6, 0xCCB7, 0xCCB9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xCCBA, 0xCCBB, 0xCCBD, 0xCCBE, 0xCCBF, 0xCCC0, 0xCCC1, /* 0x60 */
     0xCCC2, 0xCCC3, 0xCCC6, 0xCCC8, 0xCCCA, 0xCCCB, 0xCCCC, 0xCCCD, /* 0x60 */
     0xCCCE, 0xCCCF, 0xCCD1, 0xCCD2, 0xCCD3, 0xCCD5, 0xCCD6, 0xCCD7, /* 0x70 */
-    0xCCD8, 0xCCD9, 0xCCDA,      0,      0,      0,      0,      0, /* 0x70 */
+    0xCCD8, 0xCCD9, 0xCCDA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xCCDB, 0xCCDC, 0xCCDD, 0xCCDE, 0xCCDF, 0xCCE0, 0xCCE1, /* 0x80 */
     0xCCE2, 0xCCE3, 0xCCE5, 0xCCE6, 0xCCE7, 0xCCE8, 0xCCE9, 0xCCEA, /* 0x80 */
     0xCCEB, 0xCCED, 0xCCEE, 0xCCEF, 0xCCF1, 0xCCF2, 0xCCF3, 0xCCF4, /* 0x90 */
@@ -1409,23 +1409,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_AB[] =
     0x30D8, 0x30D9, 0x30DA, 0x30DB, 0x30DC, 0x30DD, 0x30DE, 0x30DF, /* 0xD0 */
     0x30E0, 0x30E1, 0x30E2, 0x30E3, 0x30E4, 0x30E5, 0x30E6, 0x30E7, /* 0xE0 */
     0x30E8, 0x30E9, 0x30EA, 0x30EB, 0x30EC, 0x30ED, 0x30EE, 0x30EF, /* 0xE0 */
-    0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6          /* 0xF0 */
+    0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_AC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCCFE, 0xCCFF, 0xCD00, 0xCD02, 0xCD03, 0xCD04, 0xCD05, /* 0x40 */
     0xCD06, 0xCD07, 0xCD0A, 0xCD0B, 0xCD0D, 0xCD0E, 0xCD0F, 0xCD11, /* 0x40 */
     0xCD12, 0xCD13, 0xCD14, 0xCD15, 0xCD16, 0xCD17, 0xCD1A, 0xCD1C, /* 0x50 */
-    0xCD1E, 0xCD1F, 0xCD20,      0,      0,      0,      0,      0, /* 0x50 */
+    0xCD1E, 0xCD1F, 0xCD20, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xCD21, 0xCD22, 0xCD23, 0xCD25, 0xCD26, 0xCD27, 0xCD29, /* 0x60 */
     0xCD2A, 0xCD2B, 0xCD2D, 0xCD2E, 0xCD2F, 0xCD30, 0xCD31, 0xCD32, /* 0x60 */
     0xCD33, 0xCD34, 0xCD35, 0xCD36, 0xCD37, 0xCD38, 0xCD3A, 0xCD3B, /* 0x70 */
-    0xCD3C, 0xCD3D, 0xCD3E,      0,      0,      0,      0,      0, /* 0x70 */
+    0xCD3C, 0xCD3D, 0xCD3E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xCD3F, 0xCD40, 0xCD41, 0xCD42, 0xCD43, 0xCD44, 0xCD45, /* 0x80 */
     0xCD46, 0xCD47, 0xCD48, 0xCD49, 0xCD4A, 0xCD4B, 0xCD4C, 0xCD4D, /* 0x80 */
     0xCD4E, 0xCD4F, 0xCD50, 0xCD51, 0xCD52, 0xCD53, 0xCD54, 0xCD55, /* 0x90 */
@@ -1434,92 +1434,92 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_AC[] =
     0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, /* 0xA0 */
     0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, /* 0xB0 */
     0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, /* 0xB0 */
-    0x042E, 0x042F,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
+    0x042E, 0x042F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
          0, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451, /* 0xD0 */
     0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, /* 0xD0 */
     0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, /* 0xE0 */
     0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, /* 0xE0 */
-    0x044E, 0x044F                                                  /* 0xF0 */
+    0x044E, 0x044F													/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_AD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCD61, 0xCD62, 0xCD63, 0xCD65, 0xCD66, 0xCD67, 0xCD68, /* 0x40 */
     0xCD69, 0xCD6A, 0xCD6B, 0xCD6E, 0xCD70, 0xCD72, 0xCD73, 0xCD74, /* 0x40 */
     0xCD75, 0xCD76, 0xCD77, 0xCD79, 0xCD7A, 0xCD7B, 0xCD7C, 0xCD7D, /* 0x50 */
-    0xCD7E, 0xCD7F, 0xCD80,      0,      0,      0,      0,      0, /* 0x50 */
+    0xCD7E, 0xCD7F, 0xCD80, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xCD81, 0xCD82, 0xCD83, 0xCD84, 0xCD85, 0xCD86, 0xCD87, /* 0x60 */
     0xCD89, 0xCD8A, 0xCD8B, 0xCD8C, 0xCD8D, 0xCD8E, 0xCD8F, 0xCD90, /* 0x60 */
     0xCD91, 0xCD92, 0xCD93, 0xCD96, 0xCD97, 0xCD99, 0xCD9A, 0xCD9B, /* 0x70 */
-    0xCD9D, 0xCD9E, 0xCD9F,      0,      0,      0,      0,      0, /* 0x70 */
+    0xCD9D, 0xCD9E, 0xCD9F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xCDA0, 0xCDA1, 0xCDA2, 0xCDA3, 0xCDA6, 0xCDA8, 0xCDAA, /* 0x80 */
     0xCDAB, 0xCDAC, 0xCDAD, 0xCDAE, 0xCDAF, 0xCDB1, 0xCDB2, 0xCDB3, /* 0x80 */
     0xCDB4, 0xCDB5, 0xCDB6, 0xCDB7, 0xCDB8, 0xCDB9, 0xCDBA, 0xCDBB, /* 0x90 */
     0xCDBC, 0xCDBD, 0xCDBE, 0xCDBF, 0xCDC0, 0xCDC1, 0xCDC2, 0xCDC3, /* 0x90 */
-    0xCDC5                                                          /* 0xA0 */
+    0xCDC5															/* 0xA0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_AE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCDC6, 0xCDC7, 0xCDC8, 0xCDC9, 0xCDCA, 0xCDCB, 0xCDCD, /* 0x40 */
     0xCDCE, 0xCDCF, 0xCDD1, 0xCDD2, 0xCDD3, 0xCDD4, 0xCDD5, 0xCDD6, /* 0x40 */
     0xCDD7, 0xCDD8, 0xCDD9, 0xCDDA, 0xCDDB, 0xCDDC, 0xCDDD, 0xCDDE, /* 0x50 */
-    0xCDDF, 0xCDE0, 0xCDE1,      0,      0,      0,      0,      0, /* 0x50 */
+    0xCDDF, 0xCDE0, 0xCDE1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xCDE2, 0xCDE3, 0xCDE4, 0xCDE5, 0xCDE6, 0xCDE7, 0xCDE9, /* 0x60 */
     0xCDEA, 0xCDEB, 0xCDED, 0xCDEE, 0xCDEF, 0xCDF1, 0xCDF2, 0xCDF3, /* 0x60 */
     0xCDF4, 0xCDF5, 0xCDF6, 0xCDF7, 0xCDFA, 0xCDFC, 0xCDFE, 0xCDFF, /* 0x70 */
-    0xCE00, 0xCE01, 0xCE02,      0,      0,      0,      0,      0, /* 0x70 */
+    0xCE00, 0xCE01, 0xCE02, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xCE03, 0xCE05, 0xCE06, 0xCE07, 0xCE09, 0xCE0A, 0xCE0B, /* 0x80 */
     0xCE0D, 0xCE0E, 0xCE0F, 0xCE10, 0xCE11, 0xCE12, 0xCE13, 0xCE15, /* 0x80 */
     0xCE16, 0xCE17, 0xCE18, 0xCE1A, 0xCE1B, 0xCE1C, 0xCE1D, 0xCE1E, /* 0x90 */
     0xCE1F, 0xCE22, 0xCE23, 0xCE25, 0xCE26, 0xCE27, 0xCE29, 0xCE2A, /* 0x90 */
-    0xCE2B                                                          /* 0xA0 */
+    0xCE2B															/* 0xA0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_AF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCE2C, 0xCE2D, 0xCE2E, 0xCE2F, 0xCE32, 0xCE34, 0xCE36, /* 0x40 */
     0xCE37, 0xCE38, 0xCE39, 0xCE3A, 0xCE3B, 0xCE3C, 0xCE3D, 0xCE3E, /* 0x40 */
     0xCE3F, 0xCE40, 0xCE41, 0xCE42, 0xCE43, 0xCE44, 0xCE45, 0xCE46, /* 0x50 */
-    0xCE47, 0xCE48, 0xCE49,      0,      0,      0,      0,      0, /* 0x50 */
+    0xCE47, 0xCE48, 0xCE49, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xCE4A, 0xCE4B, 0xCE4C, 0xCE4D, 0xCE4E, 0xCE4F, 0xCE50, /* 0x60 */
     0xCE51, 0xCE52, 0xCE53, 0xCE54, 0xCE55, 0xCE56, 0xCE57, 0xCE5A, /* 0x60 */
     0xCE5B, 0xCE5D, 0xCE5E, 0xCE62, 0xCE63, 0xCE64, 0xCE65, 0xCE66, /* 0x70 */
-    0xCE67, 0xCE6A, 0xCE6C,      0,      0,      0,      0,      0, /* 0x70 */
+    0xCE67, 0xCE6A, 0xCE6C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xCE6E, 0xCE6F, 0xCE70, 0xCE71, 0xCE72, 0xCE73, 0xCE76, /* 0x80 */
     0xCE77, 0xCE79, 0xCE7A, 0xCE7B, 0xCE7D, 0xCE7E, 0xCE7F, 0xCE80, /* 0x80 */
     0xCE81, 0xCE82, 0xCE83, 0xCE86, 0xCE88, 0xCE8A, 0xCE8B, 0xCE8C, /* 0x90 */
     0xCE8D, 0xCE8E, 0xCE8F, 0xCE92, 0xCE93, 0xCE95, 0xCE96, 0xCE97, /* 0x90 */
-    0xCE99                                                          /* 0xA0 */
+    0xCE99															/* 0xA0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCE9A, 0xCE9B, 0xCE9C, 0xCE9D, 0xCE9E, 0xCE9F, 0xCEA2, /* 0x40 */
     0xCEA6, 0xCEA7, 0xCEA8, 0xCEA9, 0xCEAA, 0xCEAB, 0xCEAE, 0xCEAF, /* 0x40 */
     0xCEB0, 0xCEB1, 0xCEB2, 0xCEB3, 0xCEB4, 0xCEB5, 0xCEB6, 0xCEB7, /* 0x50 */
-    0xCEB8, 0xCEB9, 0xCEBA,      0,      0,      0,      0,      0, /* 0x50 */
+    0xCEB8, 0xCEB9, 0xCEBA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xCEBB, 0xCEBC, 0xCEBD, 0xCEBE, 0xCEBF, 0xCEC0, 0xCEC2, /* 0x60 */
     0xCEC3, 0xCEC4, 0xCEC5, 0xCEC6, 0xCEC7, 0xCEC8, 0xCEC9, 0xCECA, /* 0x60 */
     0xCECB, 0xCECC, 0xCECD, 0xCECE, 0xCECF, 0xCED0, 0xCED1, 0xCED2, /* 0x70 */
-    0xCED3, 0xCED4, 0xCED5,      0,      0,      0,      0,      0, /* 0x70 */
+    0xCED3, 0xCED4, 0xCED5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xCED6, 0xCED7, 0xCED8, 0xCED9, 0xCEDA, 0xCEDB, 0xCEDC, /* 0x80 */
     0xCEDD, 0xCEDE, 0xCEDF, 0xCEE0, 0xCEE1, 0xCEE2, 0xCEE3, 0xCEE6, /* 0x80 */
     0xCEE7, 0xCEE9, 0xCEEA, 0xCEED, 0xCEEE, 0xCEEF, 0xCEF0, 0xCEF1, /* 0x90 */
@@ -1535,23 +1535,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B0[] =
     0xACAF, 0xACB0, 0xACB8, 0xACB9, 0xACBB, 0xACBC, 0xACBD, 0xACC1, /* 0xE0 */
     0xACC4, 0xACC8, 0xACCC, 0xACD5, 0xACD7, 0xACE0, 0xACE1, 0xACE4, /* 0xE0 */
     0xACE7, 0xACE8, 0xACEA, 0xACEC, 0xACEF, 0xACF0, 0xACF1, 0xACF3, /* 0xF0 */
-    0xACF5, 0xACF6, 0xACFC, 0xACFD, 0xAD00, 0xAD04, 0xAD06          /* 0xF0 */
+    0xACF5, 0xACF6, 0xACFC, 0xACFD, 0xAD00, 0xAD04, 0xAD06			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCF02, 0xCF03, 0xCF05, 0xCF06, 0xCF07, 0xCF09, 0xCF0A, /* 0x40 */
     0xCF0B, 0xCF0C, 0xCF0D, 0xCF0E, 0xCF0F, 0xCF12, 0xCF14, 0xCF16, /* 0x40 */
     0xCF17, 0xCF18, 0xCF19, 0xCF1A, 0xCF1B, 0xCF1D, 0xCF1E, 0xCF1F, /* 0x50 */
-    0xCF21, 0xCF22, 0xCF23,      0,      0,      0,      0,      0, /* 0x50 */
+    0xCF21, 0xCF22, 0xCF23, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xCF25, 0xCF26, 0xCF27, 0xCF28, 0xCF29, 0xCF2A, 0xCF2B, /* 0x60 */
     0xCF2E, 0xCF32, 0xCF33, 0xCF34, 0xCF35, 0xCF36, 0xCF37, 0xCF39, /* 0x60 */
     0xCF3A, 0xCF3B, 0xCF3C, 0xCF3D, 0xCF3E, 0xCF3F, 0xCF40, 0xCF41, /* 0x70 */
-    0xCF42, 0xCF43, 0xCF44,      0,      0,      0,      0,      0, /* 0x70 */
+    0xCF42, 0xCF43, 0xCF44, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xCF45, 0xCF46, 0xCF47, 0xCF48, 0xCF49, 0xCF4A, 0xCF4B, /* 0x80 */
     0xCF4C, 0xCF4D, 0xCF4E, 0xCF4F, 0xCF50, 0xCF51, 0xCF52, 0xCF53, /* 0x80 */
     0xCF56, 0xCF57, 0xCF59, 0xCF5A, 0xCF5B, 0xCF5D, 0xCF5E, 0xCF5F, /* 0x90 */
@@ -1567,23 +1567,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B1[] =
     0xAE0D, 0xAE14, 0xAE30, 0xAE31, 0xAE34, 0xAE37, 0xAE38, 0xAE3A, /* 0xE0 */
     0xAE40, 0xAE41, 0xAE43, 0xAE45, 0xAE46, 0xAE4A, 0xAE4C, 0xAE4D, /* 0xE0 */
     0xAE4E, 0xAE50, 0xAE54, 0xAE56, 0xAE5C, 0xAE5D, 0xAE5F, 0xAE60, /* 0xF0 */
-    0xAE61, 0xAE65, 0xAE68, 0xAE69, 0xAE6C, 0xAE70, 0xAE78          /* 0xF0 */
+    0xAE61, 0xAE65, 0xAE68, 0xAE69, 0xAE6C, 0xAE70, 0xAE78			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCF6D, 0xCF6E, 0xCF6F, 0xCF72, 0xCF73, 0xCF75, 0xCF76, /* 0x40 */
     0xCF77, 0xCF79, 0xCF7A, 0xCF7B, 0xCF7C, 0xCF7D, 0xCF7E, 0xCF7F, /* 0x40 */
     0xCF81, 0xCF82, 0xCF83, 0xCF84, 0xCF86, 0xCF87, 0xCF88, 0xCF89, /* 0x50 */
-    0xCF8A, 0xCF8B, 0xCF8D,      0,      0,      0,      0,      0, /* 0x50 */
+    0xCF8A, 0xCF8B, 0xCF8D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xCF8E, 0xCF8F, 0xCF90, 0xCF91, 0xCF92, 0xCF93, 0xCF94, /* 0x60 */
     0xCF95, 0xCF96, 0xCF97, 0xCF98, 0xCF99, 0xCF9A, 0xCF9B, 0xCF9C, /* 0x60 */
     0xCF9D, 0xCF9E, 0xCF9F, 0xCFA0, 0xCFA2, 0xCFA3, 0xCFA4, 0xCFA5, /* 0x70 */
-    0xCFA6, 0xCFA7, 0xCFA9,      0,      0,      0,      0,      0, /* 0x70 */
+    0xCFA6, 0xCFA7, 0xCFA9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xCFAA, 0xCFAB, 0xCFAC, 0xCFAD, 0xCFAE, 0xCFAF, 0xCFB1, /* 0x80 */
     0xCFB2, 0xCFB3, 0xCFB4, 0xCFB5, 0xCFB6, 0xCFB7, 0xCFB8, 0xCFB9, /* 0x80 */
     0xCFBA, 0xCFBB, 0xCFBC, 0xCFBD, 0xCFBE, 0xCFBF, 0xCFC0, 0xCFC1, /* 0x90 */
@@ -1599,23 +1599,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B2[] =
     0xAFCB, 0xAFCD, 0xAFCE, 0xAFD4, 0xAFDC, 0xAFE8, 0xAFE9, 0xAFF0, /* 0xE0 */
     0xAFF1, 0xAFF4, 0xAFF8, 0xB000, 0xB001, 0xB004, 0xB00C, 0xB010, /* 0xE0 */
     0xB014, 0xB01C, 0xB01D, 0xB028, 0xB044, 0xB045, 0xB048, 0xB04A, /* 0xF0 */
-    0xB04C, 0xB04E, 0xB053, 0xB054, 0xB055, 0xB057, 0xB059          /* 0xF0 */
+    0xB04C, 0xB04E, 0xB053, 0xB054, 0xB055, 0xB057, 0xB059			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCFCC, 0xCFCD, 0xCFCE, 0xCFCF, 0xCFD0, 0xCFD1, 0xCFD2, /* 0x40 */
     0xCFD3, 0xCFD4, 0xCFD5, 0xCFD6, 0xCFD7, 0xCFD8, 0xCFD9, 0xCFDA, /* 0x40 */
     0xCFDB, 0xCFDC, 0xCFDD, 0xCFDE, 0xCFDF, 0xCFE2, 0xCFE3, 0xCFE5, /* 0x50 */
-    0xCFE6, 0xCFE7, 0xCFE9,      0,      0,      0,      0,      0, /* 0x50 */
+    0xCFE6, 0xCFE7, 0xCFE9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xCFEA, 0xCFEB, 0xCFEC, 0xCFED, 0xCFEE, 0xCFEF, 0xCFF2, /* 0x60 */
     0xCFF4, 0xCFF6, 0xCFF7, 0xCFF8, 0xCFF9, 0xCFFA, 0xCFFB, 0xCFFD, /* 0x60 */
     0xCFFE, 0xCFFF, 0xD001, 0xD002, 0xD003, 0xD005, 0xD006, 0xD007, /* 0x70 */
-    0xD008, 0xD009, 0xD00A,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD008, 0xD009, 0xD00A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD00B, 0xD00C, 0xD00D, 0xD00E, 0xD00F, 0xD010, 0xD012, /* 0x80 */
     0xD013, 0xD014, 0xD015, 0xD016, 0xD017, 0xD019, 0xD01A, 0xD01B, /* 0x80 */
     0xD01C, 0xD01D, 0xD01E, 0xD01F, 0xD020, 0xD021, 0xD022, 0xD023, /* 0x90 */
@@ -1631,23 +1631,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B3[] =
     0xB140, 0xB141, 0xB144, 0xB148, 0xB150, 0xB151, 0xB154, 0xB155, /* 0xE0 */
     0xB158, 0xB15C, 0xB160, 0xB178, 0xB179, 0xB17C, 0xB180, 0xB182, /* 0xE0 */
     0xB188, 0xB189, 0xB18B, 0xB18D, 0xB192, 0xB193, 0xB194, 0xB198, /* 0xF0 */
-    0xB19C, 0xB1A8, 0xB1CC, 0xB1D0, 0xB1D4, 0xB1DC, 0xB1DD          /* 0xF0 */
+    0xB19C, 0xB1A8, 0xB1CC, 0xB1D0, 0xB1D4, 0xB1DC, 0xB1DD			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD02E, 0xD02F, 0xD030, 0xD031, 0xD032, 0xD033, 0xD036, /* 0x40 */
     0xD037, 0xD039, 0xD03A, 0xD03B, 0xD03D, 0xD03E, 0xD03F, 0xD040, /* 0x40 */
     0xD041, 0xD042, 0xD043, 0xD046, 0xD048, 0xD04A, 0xD04B, 0xD04C, /* 0x50 */
-    0xD04D, 0xD04E, 0xD04F,      0,      0,      0,      0,      0, /* 0x50 */
+    0xD04D, 0xD04E, 0xD04F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD051, 0xD052, 0xD053, 0xD055, 0xD056, 0xD057, 0xD059, /* 0x60 */
     0xD05A, 0xD05B, 0xD05C, 0xD05D, 0xD05E, 0xD05F, 0xD061, 0xD062, /* 0x60 */
     0xD063, 0xD064, 0xD065, 0xD066, 0xD067, 0xD068, 0xD069, 0xD06A, /* 0x70 */
-    0xD06B, 0xD06E, 0xD06F,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD06B, 0xD06E, 0xD06F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD071, 0xD072, 0xD073, 0xD075, 0xD076, 0xD077, 0xD078, /* 0x80 */
     0xD079, 0xD07A, 0xD07B, 0xD07E, 0xD07F, 0xD080, 0xD082, 0xD083, /* 0x80 */
     0xD084, 0xD085, 0xD086, 0xD087, 0xD088, 0xD089, 0xD08A, 0xD08B, /* 0x90 */
@@ -1663,23 +1663,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B4[] =
     0xB2EE, 0xB2EF, 0xB2F3, 0xB2F4, 0xB2F5, 0xB2F7, 0xB2F8, 0xB2F9, /* 0xE0 */
     0xB2FA, 0xB2FB, 0xB2FF, 0xB300, 0xB301, 0xB304, 0xB308, 0xB310, /* 0xE0 */
     0xB311, 0xB313, 0xB314, 0xB315, 0xB31C, 0xB354, 0xB355, 0xB356, /* 0xF0 */
-    0xB358, 0xB35B, 0xB35C, 0xB35E, 0xB35F, 0xB364, 0xB365          /* 0xF0 */
+    0xB358, 0xB35B, 0xB35C, 0xB35E, 0xB35F, 0xB364, 0xB365			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD095, 0xD096, 0xD097, 0xD098, 0xD099, 0xD09A, 0xD09B, /* 0x40 */
     0xD09C, 0xD09D, 0xD09E, 0xD09F, 0xD0A0, 0xD0A1, 0xD0A2, 0xD0A3, /* 0x40 */
     0xD0A6, 0xD0A7, 0xD0A9, 0xD0AA, 0xD0AB, 0xD0AD, 0xD0AE, 0xD0AF, /* 0x50 */
-    0xD0B0, 0xD0B1, 0xD0B2,      0,      0,      0,      0,      0, /* 0x50 */
+    0xD0B0, 0xD0B1, 0xD0B2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD0B3, 0xD0B6, 0xD0B8, 0xD0BA, 0xD0BB, 0xD0BC, 0xD0BD, /* 0x60 */
     0xD0BE, 0xD0BF, 0xD0C2, 0xD0C3, 0xD0C5, 0xD0C6, 0xD0C7, 0xD0CA, /* 0x60 */
     0xD0CB, 0xD0CC, 0xD0CD, 0xD0CE, 0xD0CF, 0xD0D2, 0xD0D6, 0xD0D7, /* 0x70 */
-    0xD0D8, 0xD0D9, 0xD0DA,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD0D8, 0xD0D9, 0xD0DA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD0DB, 0xD0DE, 0xD0DF, 0xD0E1, 0xD0E2, 0xD0E3, 0xD0E5, /* 0x80 */
     0xD0E6, 0xD0E7, 0xD0E8, 0xD0E9, 0xD0EA, 0xD0EB, 0xD0EE, 0xD0F2, /* 0x80 */
     0xD0F3, 0xD0F4, 0xD0F5, 0xD0F6, 0xD0F7, 0xD0F9, 0xD0FA, 0xD0FB, /* 0x90 */
@@ -1695,23 +1695,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B5[] =
     0xB4C0, 0xB4C4, 0xB4C8, 0xB4D0, 0xB4D5, 0xB4DC, 0xB4DD, 0xB4E0, /* 0xE0 */
     0xB4E3, 0xB4E4, 0xB4E6, 0xB4EC, 0xB4ED, 0xB4EF, 0xB4F1, 0xB4F8, /* 0xE0 */
     0xB514, 0xB515, 0xB518, 0xB51B, 0xB51C, 0xB524, 0xB525, 0xB527, /* 0xF0 */
-    0xB528, 0xB529, 0xB52A, 0xB530, 0xB531, 0xB534, 0xB538          /* 0xF0 */
+    0xB528, 0xB529, 0xB52A, 0xB530, 0xB531, 0xB534, 0xB538			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD105, 0xD106, 0xD107, 0xD108, 0xD109, 0xD10A, 0xD10B, /* 0x40 */
     0xD10C, 0xD10E, 0xD10F, 0xD110, 0xD111, 0xD112, 0xD113, 0xD114, /* 0x40 */
     0xD115, 0xD116, 0xD117, 0xD118, 0xD119, 0xD11A, 0xD11B, 0xD11C, /* 0x50 */
-    0xD11D, 0xD11E, 0xD11F,      0,      0,      0,      0,      0, /* 0x50 */
+    0xD11D, 0xD11E, 0xD11F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD120, 0xD121, 0xD122, 0xD123, 0xD124, 0xD125, 0xD126, /* 0x60 */
     0xD127, 0xD128, 0xD129, 0xD12A, 0xD12B, 0xD12C, 0xD12D, 0xD12E, /* 0x60 */
     0xD12F, 0xD132, 0xD133, 0xD135, 0xD136, 0xD137, 0xD139, 0xD13B, /* 0x70 */
-    0xD13C, 0xD13D, 0xD13E,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD13C, 0xD13D, 0xD13E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD13F, 0xD142, 0xD146, 0xD147, 0xD148, 0xD149, 0xD14A, /* 0x80 */
     0xD14B, 0xD14E, 0xD14F, 0xD151, 0xD152, 0xD153, 0xD155, 0xD156, /* 0x80 */
     0xD157, 0xD158, 0xD159, 0xD15A, 0xD15B, 0xD15E, 0xD160, 0xD162, /* 0x90 */
@@ -1727,23 +1727,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B6[] =
     0xB729, 0xB72C, 0xB72F, 0xB730, 0xB738, 0xB739, 0xB73B, 0xB744, /* 0xE0 */
     0xB748, 0xB74C, 0xB754, 0xB755, 0xB760, 0xB764, 0xB768, 0xB770, /* 0xE0 */
     0xB771, 0xB773, 0xB775, 0xB77C, 0xB77D, 0xB780, 0xB784, 0xB78C, /* 0xF0 */
-    0xB78D, 0xB78F, 0xB790, 0xB791, 0xB792, 0xB796, 0xB797          /* 0xF0 */
+    0xB78D, 0xB78F, 0xB790, 0xB791, 0xB792, 0xB796, 0xB797			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD16E, 0xD16F, 0xD170, 0xD171, 0xD172, 0xD173, 0xD174, /* 0x40 */
     0xD175, 0xD176, 0xD177, 0xD178, 0xD179, 0xD17A, 0xD17B, 0xD17D, /* 0x40 */
     0xD17E, 0xD17F, 0xD180, 0xD181, 0xD182, 0xD183, 0xD185, 0xD186, /* 0x50 */
-    0xD187, 0xD189, 0xD18A,      0,      0,      0,      0,      0, /* 0x50 */
+    0xD187, 0xD189, 0xD18A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD18B, 0xD18C, 0xD18D, 0xD18E, 0xD18F, 0xD190, 0xD191, /* 0x60 */
     0xD192, 0xD193, 0xD194, 0xD195, 0xD196, 0xD197, 0xD198, 0xD199, /* 0x60 */
     0xD19A, 0xD19B, 0xD19C, 0xD19D, 0xD19E, 0xD19F, 0xD1A2, 0xD1A3, /* 0x70 */
-    0xD1A5, 0xD1A6, 0xD1A7,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD1A5, 0xD1A6, 0xD1A7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD1A9, 0xD1AA, 0xD1AB, 0xD1AC, 0xD1AD, 0xD1AE, 0xD1AF, /* 0x80 */
     0xD1B2, 0xD1B4, 0xD1B6, 0xD1B7, 0xD1B8, 0xD1B9, 0xD1BB, 0xD1BD, /* 0x80 */
     0xD1BE, 0xD1BF, 0xD1C1, 0xD1C2, 0xD1C3, 0xD1C4, 0xD1C5, 0xD1C6, /* 0x90 */
@@ -1759,23 +1759,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B7[] =
     0xB8C5, 0xB8CC, 0xB8D0, 0xB8D4, 0xB8DD, 0xB8DF, 0xB8E1, 0xB8E8, /* 0xE0 */
     0xB8E9, 0xB8EC, 0xB8F0, 0xB8F8, 0xB8F9, 0xB8FB, 0xB8FD, 0xB904, /* 0xE0 */
     0xB918, 0xB920, 0xB93C, 0xB93D, 0xB940, 0xB944, 0xB94C, 0xB94F, /* 0xF0 */
-    0xB951, 0xB958, 0xB959, 0xB95C, 0xB960, 0xB968, 0xB969          /* 0xF0 */
+    0xB951, 0xB958, 0xB959, 0xB95C, 0xB960, 0xB968, 0xB969			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD1D0, 0xD1D1, 0xD1D2, 0xD1D3, 0xD1D4, 0xD1D5, 0xD1D6, /* 0x40 */
     0xD1D7, 0xD1D9, 0xD1DA, 0xD1DB, 0xD1DC, 0xD1DD, 0xD1DE, 0xD1DF, /* 0x40 */
     0xD1E0, 0xD1E1, 0xD1E2, 0xD1E3, 0xD1E4, 0xD1E5, 0xD1E6, 0xD1E7, /* 0x50 */
-    0xD1E8, 0xD1E9, 0xD1EA,      0,      0,      0,      0,      0, /* 0x50 */
+    0xD1E8, 0xD1E9, 0xD1EA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD1EB, 0xD1EC, 0xD1ED, 0xD1EE, 0xD1EF, 0xD1F0, 0xD1F1, /* 0x60 */
     0xD1F2, 0xD1F3, 0xD1F5, 0xD1F6, 0xD1F7, 0xD1F9, 0xD1FA, 0xD1FB, /* 0x60 */
     0xD1FC, 0xD1FD, 0xD1FE, 0xD1FF, 0xD200, 0xD201, 0xD202, 0xD203, /* 0x70 */
-    0xD204, 0xD205, 0xD206,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD204, 0xD205, 0xD206, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD208, 0xD20A, 0xD20B, 0xD20C, 0xD20D, 0xD20E, 0xD20F, /* 0x80 */
     0xD211, 0xD212, 0xD213, 0xD214, 0xD215, 0xD216, 0xD217, 0xD218, /* 0x80 */
     0xD219, 0xD21A, 0xD21B, 0xD21C, 0xD21D, 0xD21E, 0xD21F, 0xD220, /* 0x90 */
@@ -1791,23 +1791,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B8[] =
     0xBA58, 0xBA5C, 0xBA64, 0xBA65, 0xBA67, 0xBA68, 0xBA69, 0xBA70, /* 0xE0 */
     0xBA71, 0xBA74, 0xBA78, 0xBA83, 0xBA84, 0xBA85, 0xBA87, 0xBA8C, /* 0xE0 */
     0xBAA8, 0xBAA9, 0xBAAB, 0xBAAC, 0xBAB0, 0xBAB2, 0xBAB8, 0xBAB9, /* 0xF0 */
-    0xBABB, 0xBABD, 0xBAC4, 0xBAC8, 0xBAD8, 0xBAD9, 0xBAFC          /* 0xF0 */
+    0xBABB, 0xBABD, 0xBAC4, 0xBAC8, 0xBAD8, 0xBAD9, 0xBAFC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD22A, 0xD22B, 0xD22E, 0xD22F, 0xD231, 0xD232, 0xD233, /* 0x40 */
     0xD235, 0xD236, 0xD237, 0xD238, 0xD239, 0xD23A, 0xD23B, 0xD23E, /* 0x40 */
     0xD240, 0xD242, 0xD243, 0xD244, 0xD245, 0xD246, 0xD247, 0xD249, /* 0x50 */
-    0xD24A, 0xD24B, 0xD24C,      0,      0,      0,      0,      0, /* 0x50 */
+    0xD24A, 0xD24B, 0xD24C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD24D, 0xD24E, 0xD24F, 0xD250, 0xD251, 0xD252, 0xD253, /* 0x60 */
     0xD254, 0xD255, 0xD256, 0xD257, 0xD258, 0xD259, 0xD25A, 0xD25B, /* 0x60 */
     0xD25D, 0xD25E, 0xD25F, 0xD260, 0xD261, 0xD262, 0xD263, 0xD265, /* 0x70 */
-    0xD266, 0xD267, 0xD268,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD266, 0xD267, 0xD268, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD269, 0xD26A, 0xD26B, 0xD26C, 0xD26D, 0xD26E, 0xD26F, /* 0x80 */
     0xD270, 0xD271, 0xD272, 0xD273, 0xD274, 0xD275, 0xD276, 0xD277, /* 0x80 */
     0xD278, 0xD279, 0xD27A, 0xD27B, 0xD27C, 0xD27D, 0xD27E, 0xD27F, /* 0x90 */
@@ -1823,23 +1823,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_B9[] =
     0xBC1D, 0xBC1E, 0xBC1F, 0xBC24, 0xBC25, 0xBC27, 0xBC29, 0xBC2D, /* 0xE0 */
     0xBC30, 0xBC31, 0xBC34, 0xBC38, 0xBC40, 0xBC41, 0xBC43, 0xBC44, /* 0xE0 */
     0xBC45, 0xBC49, 0xBC4C, 0xBC4D, 0xBC50, 0xBC5D, 0xBC84, 0xBC85, /* 0xF0 */
-    0xBC88, 0xBC8B, 0xBC8C, 0xBC8E, 0xBC94, 0xBC95, 0xBC97          /* 0xF0 */
+    0xBC88, 0xBC8B, 0xBC8C, 0xBC8E, 0xBC94, 0xBC95, 0xBC97			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_BA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD28D, 0xD28E, 0xD28F, 0xD292, 0xD293, 0xD294, 0xD296, /* 0x40 */
     0xD297, 0xD298, 0xD299, 0xD29A, 0xD29B, 0xD29D, 0xD29E, 0xD29F, /* 0x40 */
     0xD2A1, 0xD2A2, 0xD2A3, 0xD2A5, 0xD2A6, 0xD2A7, 0xD2A8, 0xD2A9, /* 0x50 */
-    0xD2AA, 0xD2AB, 0xD2AD,      0,      0,      0,      0,      0, /* 0x50 */
+    0xD2AA, 0xD2AB, 0xD2AD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD2AE, 0xD2AF, 0xD2B0, 0xD2B2, 0xD2B3, 0xD2B4, 0xD2B5, /* 0x60 */
     0xD2B6, 0xD2B7, 0xD2BA, 0xD2BB, 0xD2BD, 0xD2BE, 0xD2C1, 0xD2C3, /* 0x60 */
     0xD2C4, 0xD2C5, 0xD2C6, 0xD2C7, 0xD2CA, 0xD2CC, 0xD2CD, 0xD2CE, /* 0x70 */
-    0xD2CF, 0xD2D0, 0xD2D1,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD2CF, 0xD2D0, 0xD2D1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD2D2, 0xD2D3, 0xD2D5, 0xD2D6, 0xD2D7, 0xD2D9, 0xD2DA, /* 0x80 */
     0xD2DB, 0xD2DD, 0xD2DE, 0xD2DF, 0xD2E0, 0xD2E1, 0xD2E2, 0xD2E3, /* 0x80 */
     0xD2E6, 0xD2E7, 0xD2E8, 0xD2E9, 0xD2EA, 0xD2EB, 0xD2EC, 0xD2ED, /* 0x90 */
@@ -1855,23 +1855,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_BA[] =
     0xBDD5, 0xBDD8, 0xBDDC, 0xBDE9, 0xBDF0, 0xBDF4, 0xBDF8, 0xBE00, /* 0xE0 */
     0xBE03, 0xBE05, 0xBE0C, 0xBE0D, 0xBE10, 0xBE14, 0xBE1C, 0xBE1D, /* 0xE0 */
     0xBE1F, 0xBE44, 0xBE45, 0xBE48, 0xBE4C, 0xBE4E, 0xBE54, 0xBE55, /* 0xF0 */
-    0xBE57, 0xBE59, 0xBE5A, 0xBE5B, 0xBE60, 0xBE61, 0xBE64          /* 0xF0 */
+    0xBE57, 0xBE59, 0xBE5A, 0xBE5B, 0xBE60, 0xBE61, 0xBE64			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_BB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD2FB, 0xD2FC, 0xD2FD, 0xD2FE, 0xD2FF, 0xD302, 0xD304, /* 0x40 */
     0xD306, 0xD307, 0xD308, 0xD309, 0xD30A, 0xD30B, 0xD30F, 0xD311, /* 0x40 */
     0xD312, 0xD313, 0xD315, 0xD317, 0xD318, 0xD319, 0xD31A, 0xD31B, /* 0x50 */
-    0xD31E, 0xD322, 0xD323,      0,      0,      0,      0,      0, /* 0x50 */
+    0xD31E, 0xD322, 0xD323, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD324, 0xD326, 0xD327, 0xD32A, 0xD32B, 0xD32D, 0xD32E, /* 0x60 */
     0xD32F, 0xD331, 0xD332, 0xD333, 0xD334, 0xD335, 0xD336, 0xD337, /* 0x60 */
     0xD33A, 0xD33E, 0xD33F, 0xD340, 0xD341, 0xD342, 0xD343, 0xD346, /* 0x70 */
-    0xD347, 0xD348, 0xD349,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD347, 0xD348, 0xD349, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD34A, 0xD34B, 0xD34C, 0xD34D, 0xD34E, 0xD34F, 0xD350, /* 0x80 */
     0xD351, 0xD352, 0xD353, 0xD354, 0xD355, 0xD356, 0xD357, 0xD358, /* 0x80 */
     0xD359, 0xD35A, 0xD35B, 0xD35C, 0xD35D, 0xD35E, 0xD35F, 0xD360, /* 0x90 */
@@ -1887,23 +1887,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_BB[] =
     0xC091, 0xC094, 0xC098, 0xC0A0, 0xC0A1, 0xC0A3, 0xC0A5, 0xC0AC, /* 0xE0 */
     0xC0AD, 0xC0AF, 0xC0B0, 0xC0B3, 0xC0B4, 0xC0B5, 0xC0B6, 0xC0BC, /* 0xE0 */
     0xC0BD, 0xC0BF, 0xC0C0, 0xC0C1, 0xC0C5, 0xC0C8, 0xC0C9, 0xC0CC, /* 0xF0 */
-    0xC0D0, 0xC0D8, 0xC0D9, 0xC0DB, 0xC0DC, 0xC0DD, 0xC0E4          /* 0xF0 */
+    0xC0D0, 0xC0D8, 0xC0D9, 0xC0DB, 0xC0DC, 0xC0DD, 0xC0E4			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_BC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD36A, 0xD36B, 0xD36C, 0xD36D, 0xD36E, 0xD36F, 0xD370, /* 0x40 */
     0xD371, 0xD372, 0xD373, 0xD374, 0xD375, 0xD376, 0xD377, 0xD378, /* 0x40 */
     0xD379, 0xD37A, 0xD37B, 0xD37E, 0xD37F, 0xD381, 0xD382, 0xD383, /* 0x50 */
-    0xD385, 0xD386, 0xD387,      0,      0,      0,      0,      0, /* 0x50 */
+    0xD385, 0xD386, 0xD387, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD388, 0xD389, 0xD38A, 0xD38B, 0xD38E, 0xD392, 0xD393, /* 0x60 */
     0xD394, 0xD395, 0xD396, 0xD397, 0xD39A, 0xD39B, 0xD39D, 0xD39E, /* 0x60 */
     0xD39F, 0xD3A1, 0xD3A2, 0xD3A3, 0xD3A4, 0xD3A5, 0xD3A6, 0xD3A7, /* 0x70 */
-    0xD3AA, 0xD3AC, 0xD3AE,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD3AA, 0xD3AC, 0xD3AE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD3AF, 0xD3B0, 0xD3B1, 0xD3B2, 0xD3B3, 0xD3B5, 0xD3B6, /* 0x80 */
     0xD3B7, 0xD3B9, 0xD3BA, 0xD3BB, 0xD3BD, 0xD3BE, 0xD3BF, 0xD3C0, /* 0x80 */
     0xD3C1, 0xD3C2, 0xD3C3, 0xD3C6, 0xD3C7, 0xD3CA, 0xD3CB, 0xD3CC, /* 0x90 */
@@ -1919,23 +1919,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_BC[] =
     0xC1B0, 0xC1BD, 0xC1C4, 0xC1C8, 0xC1CC, 0xC1D4, 0xC1D7, 0xC1D8, /* 0xE0 */
     0xC1E0, 0xC1E4, 0xC1E8, 0xC1F0, 0xC1F1, 0xC1F3, 0xC1FC, 0xC1FD, /* 0xE0 */
     0xC200, 0xC204, 0xC20C, 0xC20D, 0xC20F, 0xC211, 0xC218, 0xC219, /* 0xF0 */
-    0xC21C, 0xC21F, 0xC220, 0xC228, 0xC229, 0xC22B, 0xC22D          /* 0xF0 */
+    0xC21C, 0xC21F, 0xC220, 0xC228, 0xC229, 0xC22B, 0xC22D			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_BD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD3D7, 0xD3D9, 0xD3DA, 0xD3DB, 0xD3DC, 0xD3DD, 0xD3DE, /* 0x40 */
     0xD3DF, 0xD3E0, 0xD3E2, 0xD3E4, 0xD3E5, 0xD3E6, 0xD3E7, 0xD3E8, /* 0x40 */
     0xD3E9, 0xD3EA, 0xD3EB, 0xD3EE, 0xD3EF, 0xD3F1, 0xD3F2, 0xD3F3, /* 0x50 */
-    0xD3F5, 0xD3F6, 0xD3F7,      0,      0,      0,      0,      0, /* 0x50 */
+    0xD3F5, 0xD3F6, 0xD3F7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD3F8, 0xD3F9, 0xD3FA, 0xD3FB, 0xD3FE, 0xD400, 0xD402, /* 0x60 */
     0xD403, 0xD404, 0xD405, 0xD406, 0xD407, 0xD409, 0xD40A, 0xD40B, /* 0x60 */
     0xD40C, 0xD40D, 0xD40E, 0xD40F, 0xD410, 0xD411, 0xD412, 0xD413, /* 0x70 */
-    0xD414, 0xD415, 0xD416,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD414, 0xD415, 0xD416, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD417, 0xD418, 0xD419, 0xD41A, 0xD41B, 0xD41C, 0xD41E, /* 0x80 */
     0xD41F, 0xD420, 0xD421, 0xD422, 0xD423, 0xD424, 0xD425, 0xD426, /* 0x80 */
     0xD427, 0xD428, 0xD429, 0xD42A, 0xD42B, 0xD42C, 0xD42D, 0xD42E, /* 0x90 */
@@ -1951,23 +1951,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_BD[] =
     0xC345, 0xC368, 0xC369, 0xC36C, 0xC370, 0xC372, 0xC378, 0xC379, /* 0xE0 */
     0xC37C, 0xC37D, 0xC384, 0xC388, 0xC38C, 0xC3C0, 0xC3D8, 0xC3D9, /* 0xE0 */
     0xC3DC, 0xC3DF, 0xC3E0, 0xC3E2, 0xC3E8, 0xC3E9, 0xC3ED, 0xC3F4, /* 0xF0 */
-    0xC3F5, 0xC3F8, 0xC408, 0xC410, 0xC424, 0xC42C, 0xC430          /* 0xF0 */
+    0xC3F5, 0xC3F8, 0xC408, 0xC410, 0xC424, 0xC42C, 0xC430			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_BE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD438, 0xD439, 0xD43A, 0xD43B, 0xD43C, 0xD43D, 0xD43E, /* 0x40 */
     0xD43F, 0xD441, 0xD442, 0xD443, 0xD445, 0xD446, 0xD447, 0xD448, /* 0x40 */
     0xD449, 0xD44A, 0xD44B, 0xD44C, 0xD44D, 0xD44E, 0xD44F, 0xD450, /* 0x50 */
-    0xD451, 0xD452, 0xD453,      0,      0,      0,      0,      0, /* 0x50 */
+    0xD451, 0xD452, 0xD453, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD454, 0xD455, 0xD456, 0xD457, 0xD458, 0xD459, 0xD45A, /* 0x60 */
     0xD45B, 0xD45D, 0xD45E, 0xD45F, 0xD461, 0xD462, 0xD463, 0xD465, /* 0x60 */
     0xD466, 0xD467, 0xD468, 0xD469, 0xD46A, 0xD46B, 0xD46C, 0xD46E, /* 0x70 */
-    0xD470, 0xD471, 0xD472,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD470, 0xD471, 0xD472, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD473, 0xD474, 0xD475, 0xD476, 0xD477, 0xD47A, 0xD47B, /* 0x80 */
     0xD47D, 0xD47E, 0xD481, 0xD483, 0xD484, 0xD485, 0xD486, 0xD487, /* 0x80 */
     0xD48A, 0xD48C, 0xD48E, 0xD48F, 0xD490, 0xD491, 0xD492, 0xD493, /* 0x90 */
@@ -1983,23 +1983,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_BE[] =
     0xC57D, 0xC580, 0xC584, 0xC587, 0xC58C, 0xC58D, 0xC58F, 0xC591, /* 0xE0 */
     0xC595, 0xC597, 0xC598, 0xC59C, 0xC5A0, 0xC5A9, 0xC5B4, 0xC5B5, /* 0xE0 */
     0xC5B8, 0xC5B9, 0xC5BB, 0xC5BC, 0xC5BD, 0xC5BE, 0xC5C4, 0xC5C5, /* 0xF0 */
-    0xC5C6, 0xC5C7, 0xC5C8, 0xC5C9, 0xC5CA, 0xC5CC, 0xC5CE          /* 0xF0 */
+    0xC5C6, 0xC5C7, 0xC5C8, 0xC5C9, 0xC5CA, 0xC5CC, 0xC5CE			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_BF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD49E, 0xD49F, 0xD4A0, 0xD4A1, 0xD4A2, 0xD4A3, 0xD4A4, /* 0x40 */
     0xD4A5, 0xD4A6, 0xD4A7, 0xD4A8, 0xD4AA, 0xD4AB, 0xD4AC, 0xD4AD, /* 0x40 */
     0xD4AE, 0xD4AF, 0xD4B0, 0xD4B1, 0xD4B2, 0xD4B3, 0xD4B4, 0xD4B5, /* 0x50 */
-    0xD4B6, 0xD4B7, 0xD4B8,      0,      0,      0,      0,      0, /* 0x50 */
+    0xD4B6, 0xD4B7, 0xD4B8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD4B9, 0xD4BA, 0xD4BB, 0xD4BC, 0xD4BD, 0xD4BE, 0xD4BF, /* 0x60 */
     0xD4C0, 0xD4C1, 0xD4C2, 0xD4C3, 0xD4C4, 0xD4C5, 0xD4C6, 0xD4C7, /* 0x60 */
     0xD4C8, 0xD4C9, 0xD4CA, 0xD4CB, 0xD4CD, 0xD4CE, 0xD4CF, 0xD4D1, /* 0x70 */
-    0xD4D2, 0xD4D3, 0xD4D5,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD4D2, 0xD4D3, 0xD4D5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD4D6, 0xD4D7, 0xD4D8, 0xD4D9, 0xD4DA, 0xD4DB, 0xD4DD, /* 0x80 */
     0xD4DE, 0xD4E0, 0xD4E1, 0xD4E2, 0xD4E3, 0xD4E4, 0xD4E5, 0xD4E6, /* 0x80 */
     0xD4E7, 0xD4E9, 0xD4EA, 0xD4EB, 0xD4ED, 0xD4EE, 0xD4EF, 0xD4F1, /* 0x90 */
@@ -2015,23 +2015,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_BF[] =
     0xC688, 0xC689, 0xC68B, 0xC68D, 0xC694, 0xC695, 0xC698, 0xC69C, /* 0xE0 */
     0xC6A4, 0xC6A5, 0xC6A7, 0xC6A9, 0xC6B0, 0xC6B1, 0xC6B4, 0xC6B8, /* 0xE0 */
     0xC6B9, 0xC6BA, 0xC6C0, 0xC6C1, 0xC6C3, 0xC6C5, 0xC6CC, 0xC6CD, /* 0xF0 */
-    0xC6D0, 0xC6D4, 0xC6DC, 0xC6DD, 0xC6E0, 0xC6E1, 0xC6E8          /* 0xF0 */
+    0xC6D0, 0xC6D4, 0xC6DC, 0xC6DD, 0xC6E0, 0xC6E1, 0xC6E8			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_C0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD4FE, 0xD4FF, 0xD500, 0xD501, 0xD502, 0xD503, 0xD505, /* 0x40 */
     0xD506, 0xD507, 0xD509, 0xD50A, 0xD50B, 0xD50D, 0xD50E, 0xD50F, /* 0x40 */
     0xD510, 0xD511, 0xD512, 0xD513, 0xD516, 0xD518, 0xD519, 0xD51A, /* 0x50 */
-    0xD51B, 0xD51C, 0xD51D,      0,      0,      0,      0,      0, /* 0x50 */
+    0xD51B, 0xD51C, 0xD51D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD51E, 0xD51F, 0xD520, 0xD521, 0xD522, 0xD523, 0xD524, /* 0x60 */
     0xD525, 0xD526, 0xD527, 0xD528, 0xD529, 0xD52A, 0xD52B, 0xD52C, /* 0x60 */
     0xD52D, 0xD52E, 0xD52F, 0xD530, 0xD531, 0xD532, 0xD533, 0xD534, /* 0x70 */
-    0xD535, 0xD536, 0xD537,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD535, 0xD536, 0xD537, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD538, 0xD539, 0xD53A, 0xD53B, 0xD53E, 0xD53F, 0xD541, /* 0x80 */
     0xD542, 0xD543, 0xD545, 0xD546, 0xD547, 0xD548, 0xD549, 0xD54A, /* 0x80 */
     0xD54B, 0xD54E, 0xD550, 0xD552, 0xD553, 0xD554, 0xD555, 0xD556, /* 0x90 */
@@ -2047,23 +2047,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_C0[] =
     0xC79A, 0xC7A0, 0xC7A1, 0xC7A3, 0xC7A4, 0xC7A5, 0xC7A6, 0xC7AC, /* 0xE0 */
     0xC7AD, 0xC7B0, 0xC7B4, 0xC7BC, 0xC7BD, 0xC7BF, 0xC7C0, 0xC7C1, /* 0xE0 */
     0xC7C8, 0xC7C9, 0xC7CC, 0xC7CE, 0xC7D0, 0xC7D8, 0xC7DD, 0xC7E4, /* 0xF0 */
-    0xC7E8, 0xC7EC, 0xC800, 0xC801, 0xC804, 0xC808, 0xC80A          /* 0xF0 */
+    0xC7E8, 0xC7EC, 0xC800, 0xC801, 0xC804, 0xC808, 0xC80A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_C1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD564, 0xD566, 0xD567, 0xD56A, 0xD56C, 0xD56E, 0xD56F, /* 0x40 */
     0xD570, 0xD571, 0xD572, 0xD573, 0xD576, 0xD577, 0xD579, 0xD57A, /* 0x40 */
     0xD57B, 0xD57D, 0xD57E, 0xD57F, 0xD580, 0xD581, 0xD582, 0xD583, /* 0x50 */
-    0xD586, 0xD58A, 0xD58B,      0,      0,      0,      0,      0, /* 0x50 */
+    0xD586, 0xD58A, 0xD58B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD58C, 0xD58D, 0xD58E, 0xD58F, 0xD591, 0xD592, 0xD593, /* 0x60 */
     0xD594, 0xD595, 0xD596, 0xD597, 0xD598, 0xD599, 0xD59A, 0xD59B, /* 0x60 */
     0xD59C, 0xD59D, 0xD59E, 0xD59F, 0xD5A0, 0xD5A1, 0xD5A2, 0xD5A3, /* 0x70 */
-    0xD5A4, 0xD5A6, 0xD5A7,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD5A4, 0xD5A6, 0xD5A7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD5A8, 0xD5A9, 0xD5AA, 0xD5AB, 0xD5AC, 0xD5AD, 0xD5AE, /* 0x80 */
     0xD5AF, 0xD5B0, 0xD5B1, 0xD5B2, 0xD5B3, 0xD5B4, 0xD5B5, 0xD5B6, /* 0x80 */
     0xD5B7, 0xD5B8, 0xD5B9, 0xD5BA, 0xD5BB, 0xD5BC, 0xD5BD, 0xD5BE, /* 0x90 */
@@ -2079,23 +2079,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_C1[] =
     0xC918, 0xC92C, 0xC934, 0xC950, 0xC951, 0xC954, 0xC958, 0xC960, /* 0xE0 */
     0xC961, 0xC963, 0xC96C, 0xC970, 0xC974, 0xC97C, 0xC988, 0xC989, /* 0xE0 */
     0xC98C, 0xC990, 0xC998, 0xC999, 0xC99B, 0xC99D, 0xC9C0, 0xC9C1, /* 0xF0 */
-    0xC9C4, 0xC9C7, 0xC9C8, 0xC9CA, 0xC9D0, 0xC9D1, 0xC9D3          /* 0xF0 */
+    0xC9C4, 0xC9C7, 0xC9C8, 0xC9CA, 0xC9D0, 0xC9D1, 0xC9D3			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_C2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD5CA, 0xD5CB, 0xD5CD, 0xD5CE, 0xD5CF, 0xD5D1, 0xD5D3, /* 0x40 */
     0xD5D4, 0xD5D5, 0xD5D6, 0xD5D7, 0xD5DA, 0xD5DC, 0xD5DE, 0xD5DF, /* 0x40 */
     0xD5E0, 0xD5E1, 0xD5E2, 0xD5E3, 0xD5E6, 0xD5E7, 0xD5E9, 0xD5EA, /* 0x50 */
-    0xD5EB, 0xD5ED, 0xD5EE,      0,      0,      0,      0,      0, /* 0x50 */
+    0xD5EB, 0xD5ED, 0xD5EE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD5EF, 0xD5F0, 0xD5F1, 0xD5F2, 0xD5F3, 0xD5F6, 0xD5F8, /* 0x60 */
     0xD5FA, 0xD5FB, 0xD5FC, 0xD5FD, 0xD5FE, 0xD5FF, 0xD602, 0xD603, /* 0x60 */
     0xD605, 0xD606, 0xD607, 0xD609, 0xD60A, 0xD60B, 0xD60C, 0xD60D, /* 0x70 */
-    0xD60E, 0xD60F, 0xD612,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD60E, 0xD60F, 0xD612, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD616, 0xD617, 0xD618, 0xD619, 0xD61A, 0xD61B, 0xD61D, /* 0x80 */
     0xD61E, 0xD61F, 0xD621, 0xD622, 0xD623, 0xD625, 0xD626, 0xD627, /* 0x80 */
     0xD628, 0xD629, 0xD62A, 0xD62B, 0xD62C, 0xD62E, 0xD62F, 0xD630, /* 0x90 */
@@ -2111,23 +2111,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_C2[] =
     0xCB4C, 0xCB50, 0xCB58, 0xCB59, 0xCB5D, 0xCB64, 0xCB78, 0xCB79, /* 0xE0 */
     0xCB9C, 0xCBB8, 0xCBD4, 0xCBE4, 0xCBE7, 0xCBE9, 0xCC0C, 0xCC0D, /* 0xE0 */
     0xCC10, 0xCC14, 0xCC1C, 0xCC1D, 0xCC21, 0xCC22, 0xCC27, 0xCC28, /* 0xF0 */
-    0xCC29, 0xCC2C, 0xCC2E, 0xCC30, 0xCC38, 0xCC39, 0xCC3B          /* 0xF0 */
+    0xCC29, 0xCC2C, 0xCC2E, 0xCC30, 0xCC38, 0xCC39, 0xCC3B			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_C3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD63D, 0xD63E, 0xD63F, 0xD641, 0xD642, 0xD643, 0xD644, /* 0x40 */
     0xD646, 0xD647, 0xD64A, 0xD64C, 0xD64E, 0xD64F, 0xD650, 0xD652, /* 0x40 */
     0xD653, 0xD656, 0xD657, 0xD659, 0xD65A, 0xD65B, 0xD65D, 0xD65E, /* 0x50 */
-    0xD65F, 0xD660, 0xD661,      0,      0,      0,      0,      0, /* 0x50 */
+    0xD65F, 0xD660, 0xD661, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD662, 0xD663, 0xD664, 0xD665, 0xD666, 0xD668, 0xD66A, /* 0x60 */
     0xD66B, 0xD66C, 0xD66D, 0xD66E, 0xD66F, 0xD672, 0xD673, 0xD675, /* 0x60 */
     0xD676, 0xD677, 0xD678, 0xD679, 0xD67A, 0xD67B, 0xD67C, 0xD67D, /* 0x70 */
-    0xD67E, 0xD67F, 0xD680,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD67E, 0xD67F, 0xD680, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD681, 0xD682, 0xD684, 0xD686, 0xD687, 0xD688, 0xD689, /* 0x80 */
     0xD68A, 0xD68B, 0xD68E, 0xD68F, 0xD691, 0xD692, 0xD693, 0xD695, /* 0x80 */
     0xD696, 0xD697, 0xD698, 0xD699, 0xD69A, 0xD69B, 0xD69C, 0xD69E, /* 0x90 */
@@ -2143,23 +2143,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_C3[] =
     0xCD95, 0xCD98, 0xCD9C, 0xCDA4, 0xCDA5, 0xCDA7, 0xCDA9, 0xCDB0, /* 0xE0 */
     0xCDC4, 0xCDCC, 0xCDD0, 0xCDE8, 0xCDEC, 0xCDF0, 0xCDF8, 0xCDF9, /* 0xE0 */
     0xCDFB, 0xCDFD, 0xCE04, 0xCE08, 0xCE0C, 0xCE14, 0xCE19, 0xCE20, /* 0xF0 */
-    0xCE21, 0xCE24, 0xCE28, 0xCE30, 0xCE31, 0xCE33, 0xCE35          /* 0xF0 */
+    0xCE21, 0xCE24, 0xCE28, 0xCE30, 0xCE31, 0xCE33, 0xCE35			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_C4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD6AB, 0xD6AD, 0xD6AE, 0xD6AF, 0xD6B1, 0xD6B2, 0xD6B3, /* 0x40 */
     0xD6B4, 0xD6B5, 0xD6B6, 0xD6B7, 0xD6B8, 0xD6BA, 0xD6BC, 0xD6BD, /* 0x40 */
     0xD6BE, 0xD6BF, 0xD6C0, 0xD6C1, 0xD6C2, 0xD6C3, 0xD6C6, 0xD6C7, /* 0x50 */
-    0xD6C9, 0xD6CA, 0xD6CB,      0,      0,      0,      0,      0, /* 0x50 */
+    0xD6C9, 0xD6CA, 0xD6CB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD6CD, 0xD6CE, 0xD6CF, 0xD6D0, 0xD6D2, 0xD6D3, 0xD6D5, /* 0x60 */
     0xD6D6, 0xD6D8, 0xD6DA, 0xD6DB, 0xD6DC, 0xD6DD, 0xD6DE, 0xD6DF, /* 0x60 */
     0xD6E1, 0xD6E2, 0xD6E3, 0xD6E5, 0xD6E6, 0xD6E7, 0xD6E9, 0xD6EA, /* 0x70 */
-    0xD6EB, 0xD6EC, 0xD6ED,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD6EB, 0xD6EC, 0xD6ED, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD6EE, 0xD6EF, 0xD6F1, 0xD6F2, 0xD6F3, 0xD6F4, 0xD6F6, /* 0x80 */
     0xD6F7, 0xD6F8, 0xD6F9, 0xD6FA, 0xD6FB, 0xD6FE, 0xD6FF, 0xD701, /* 0x80 */
     0xD702, 0xD703, 0xD705, 0xD706, 0xD707, 0xD708, 0xD709, 0xD70A, /* 0x90 */
@@ -2175,23 +2175,23 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_C4[] =
     0xCF67, 0xCF69, 0xCF70, 0xCF71, 0xCF74, 0xCF78, 0xCF80, 0xCF85, /* 0xE0 */
     0xCF8C, 0xCFA1, 0xCFA8, 0xCFB0, 0xCFC4, 0xCFE0, 0xCFE1, 0xCFE4, /* 0xE0 */
     0xCFE8, 0xCFF0, 0xCFF1, 0xCFF3, 0xCFF5, 0xCFFC, 0xD000, 0xD004, /* 0xF0 */
-    0xD011, 0xD018, 0xD02D, 0xD034, 0xD035, 0xD038, 0xD03C          /* 0xF0 */
+    0xD011, 0xD018, 0xD02D, 0xD034, 0xD035, 0xD038, 0xD03C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_C5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD715, 0xD716, 0xD717, 0xD71A, 0xD71B, 0xD71D, 0xD71E, /* 0x40 */
     0xD71F, 0xD721, 0xD722, 0xD723, 0xD724, 0xD725, 0xD726, 0xD727, /* 0x40 */
     0xD72A, 0xD72C, 0xD72E, 0xD72F, 0xD730, 0xD731, 0xD732, 0xD733, /* 0x50 */
-    0xD736, 0xD737, 0xD739,      0,      0,      0,      0,      0, /* 0x50 */
+    0xD736, 0xD737, 0xD739, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD73A, 0xD73B, 0xD73D, 0xD73E, 0xD73F, 0xD740, 0xD741, /* 0x60 */
     0xD742, 0xD743, 0xD745, 0xD746, 0xD748, 0xD74A, 0xD74B, 0xD74C, /* 0x60 */
     0xD74D, 0xD74E, 0xD74F, 0xD752, 0xD753, 0xD755, 0xD75A, 0xD75B, /* 0x70 */
-    0xD75C, 0xD75D, 0xD75E,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD75C, 0xD75D, 0xD75E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xD75F, 0xD762, 0xD764, 0xD766, 0xD767, 0xD768, 0xD76A, /* 0x80 */
     0xD76B, 0xD76D, 0xD76E, 0xD76F, 0xD771, 0xD772, 0xD773, 0xD775, /* 0x80 */
     0xD776, 0xD777, 0xD778, 0xD779, 0xD77A, 0xD77B, 0xD77E, 0xD77F, /* 0x90 */
@@ -2207,27 +2207,27 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_C5[] =
     0xD16C, 0xD17C, 0xD184, 0xD188, 0xD1A0, 0xD1A1, 0xD1A4, 0xD1A8, /* 0xE0 */
     0xD1B0, 0xD1B1, 0xD1B3, 0xD1B5, 0xD1BA, 0xD1BC, 0xD1C0, 0xD1D8, /* 0xE0 */
     0xD1F4, 0xD1F8, 0xD207, 0xD209, 0xD210, 0xD22C, 0xD22D, 0xD230, /* 0xF0 */
-    0xD234, 0xD23C, 0xD23D, 0xD23F, 0xD241, 0xD248, 0xD25C          /* 0xF0 */
+    0xD234, 0xD23C, 0xD23D, 0xD23F, 0xD241, 0xD248, 0xD25C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_C6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD78D, 0xD78E, 0xD78F, 0xD791, 0xD792, 0xD793, 0xD794, /* 0x40 */
     0xD795, 0xD796, 0xD797, 0xD79A, 0xD79C, 0xD79E, 0xD79F, 0xD7A0, /* 0x40 */
-    0xD7A1, 0xD7A2, 0xD7A3,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0xD7A1, 0xD7A2, 0xD7A3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0xD264, 0xD280, 0xD281, 0xD284, 0xD288, 0xD290, 0xD291, /* 0xA0 */
     0xD295, 0xD29C, 0xD2A0, 0xD2A4, 0xD2AC, 0xD2B1, 0xD2B8, 0xD2B9, /* 0xA0 */
     0xD2BC, 0xD2BF, 0xD2C0, 0xD2C2, 0xD2C8, 0xD2C9, 0xD2CB, 0xD2D4, /* 0xB0 */
@@ -2239,15 +2239,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_C6[] =
     0xD38D, 0xD38F, 0xD390, 0xD391, 0xD398, 0xD399, 0xD39C, 0xD3A0, /* 0xE0 */
     0xD3A8, 0xD3A9, 0xD3AB, 0xD3AD, 0xD3B4, 0xD3B8, 0xD3BC, 0xD3C4, /* 0xE0 */
     0xD3C5, 0xD3C8, 0xD3C9, 0xD3D0, 0xD3D8, 0xD3E1, 0xD3E3, 0xD3EC, /* 0xF0 */
-    0xD3ED, 0xD3F0, 0xD3F4, 0xD3FC, 0xD3FD, 0xD3FF, 0xD401          /* 0xF0 */
+    0xD3ED, 0xD3F0, 0xD3F4, 0xD3FC, 0xD3FD, 0xD3FF, 0xD401			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_C7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD408, 0xD41D, 0xD440, 0xD444, 0xD45C, 0xD460, 0xD464, /* 0xA0 */
     0xD46D, 0xD46F, 0xD478, 0xD479, 0xD47C, 0xD47F, 0xD480, 0xD482, /* 0xA0 */
     0xD488, 0xD489, 0xD48B, 0xD48D, 0xD494, 0xD4A9, 0xD4CC, 0xD4D0, /* 0xB0 */
@@ -2259,15 +2259,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_C7[] =
     0xD589, 0xD590, 0xD5A5, 0xD5C8, 0xD5C9, 0xD5CC, 0xD5D0, 0xD5D2, /* 0xE0 */
     0xD5D8, 0xD5D9, 0xD5DB, 0xD5DD, 0xD5E4, 0xD5E5, 0xD5E8, 0xD5EC, /* 0xE0 */
     0xD5F4, 0xD5F5, 0xD5F7, 0xD5F9, 0xD600, 0xD601, 0xD604, 0xD608, /* 0xF0 */
-    0xD610, 0xD611, 0xD613, 0xD614, 0xD615, 0xD61C, 0xD620          /* 0xF0 */
+    0xD610, 0xD611, 0xD613, 0xD614, 0xD615, 0xD61C, 0xD620			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_C8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD624, 0xD62D, 0xD638, 0xD639, 0xD63C, 0xD640, 0xD645, /* 0xA0 */
     0xD648, 0xD649, 0xD64B, 0xD64D, 0xD651, 0xD654, 0xD655, 0xD658, /* 0xA0 */
     0xD65C, 0xD667, 0xD669, 0xD670, 0xD671, 0xD674, 0xD683, 0xD685, /* 0xB0 */
@@ -2279,15 +2279,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_C8[] =
     0xD738, 0xD73C, 0xD744, 0xD747, 0xD749, 0xD750, 0xD751, 0xD754, /* 0xE0 */
     0xD756, 0xD757, 0xD758, 0xD759, 0xD760, 0xD761, 0xD763, 0xD765, /* 0xE0 */
     0xD769, 0xD76C, 0xD770, 0xD774, 0xD77C, 0xD77D, 0xD781, 0xD788, /* 0xF0 */
-    0xD789, 0xD78C, 0xD790, 0xD798, 0xD799, 0xD79B, 0xD79D          /* 0xF0 */
+    0xD789, 0xD78C, 0xD790, 0xD798, 0xD799, 0xD79B, 0xD79D			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_CA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x4F3D, 0x4F73, 0x5047, 0x50F9, 0x52A0, 0x53EF, 0x5475, /* 0xA0 */
     0x54E5, 0x5609, 0x5AC1, 0x5BB6, 0x6687, 0x67B6, 0x67B7, 0x67EF, /* 0xA0 */
     0x6B4C, 0x73C2, 0x75C2, 0x7A3C, 0x82DB, 0x8304, 0x8857, 0x8888, /* 0xB0 */
@@ -2299,15 +2299,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_CA[] =
     0x9593, 0x4E6B, 0x559D, 0x66F7, 0x6E34, 0x78A3, 0x7AED, 0x845B, /* 0xE0 */
     0x8910, 0x874E, 0x97A8, 0x52D8, 0x574E, 0x582A, 0x5D4C, 0x611F, /* 0xE0 */
     0x61BE, 0x6221, 0x6562, 0x67D1, 0x6A44, 0x6E1B, 0x7518, 0x75B3, /* 0xF0 */
-    0x76E3, 0x77B0, 0x7D3A, 0x90AF, 0x9451, 0x9452, 0x9F95          /* 0xF0 */
+    0x76E3, 0x77B0, 0x7D3A, 0x90AF, 0x9451, 0x9452, 0x9F95			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_CB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5323, 0x5CAC, 0x7532, 0x80DB, 0x9240, 0x9598, 0x525B, /* 0xA0 */
     0x5808, 0x59DC, 0x5CA1, 0x5D17, 0x5EB7, 0x5F3A, 0x5F4A, 0x6177, /* 0xA0 */
     0x6C5F, 0x757A, 0x7586, 0x7CE0, 0x7D73, 0x7DB1, 0x7F8C, 0x8154, /* 0xB0 */
@@ -2319,15 +2319,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_CB[] =
     0x64DA, 0x64E7, 0x6E20, 0x70AC, 0x795B, 0x8DDD, 0x8E1E, 0xF902, /* 0xE0 */
     0x907D, 0x9245, 0x92F8, 0x4E7E, 0x4EF6, 0x5065, 0x5DFE, 0x5EFA, /* 0xE0 */
     0x6106, 0x6957, 0x8171, 0x8654, 0x8E47, 0x9375, 0x9A2B, 0x4E5E, /* 0xF0 */
-    0x5091, 0x6770, 0x6840, 0x5109, 0x528D, 0x5292, 0x6AA2          /* 0xF0 */
+    0x5091, 0x6770, 0x6840, 0x5109, 0x528D, 0x5292, 0x6AA2			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_CC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x77BC, 0x9210, 0x9ED4, 0x52AB, 0x602F, 0x8FF2, 0x5048, /* 0xA0 */
     0x61A9, 0x63ED, 0x64CA, 0x683C, 0x6A84, 0x6FC0, 0x8188, 0x89A1, /* 0xA0 */
     0x9694, 0x5805, 0x727D, 0x72AC, 0x7504, 0x7D79, 0x7E6D, 0x80A9, /* 0xB0 */
@@ -2339,15 +2339,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_CC[] =
     0x74A5, 0x74CA, 0x75D9, 0x786C, 0x78EC, 0x7ADF, 0x7AF6, 0x7D45, /* 0xE0 */
     0x7D93, 0x8015, 0x803F, 0x811B, 0x8396, 0x8B66, 0x8F15, 0x9015, /* 0xE0 */
     0x93E1, 0x9803, 0x9838, 0x9A5A, 0x9BE8, 0x4FC2, 0x5553, 0x583A, /* 0xF0 */
-    0x5951, 0x5B63, 0x5C46, 0x60B8, 0x6212, 0x6842, 0x68B0          /* 0xF0 */
+    0x5951, 0x5B63, 0x5C46, 0x60B8, 0x6212, 0x6842, 0x68B0			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_CD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x68E8, 0x6EAA, 0x754C, 0x7678, 0x78CE, 0x7A3D, 0x7CFB, /* 0xA0 */
     0x7E6B, 0x7E7C, 0x8A08, 0x8AA1, 0x8C3F, 0x968E, 0x9DC4, 0x53E4, /* 0xA0 */
     0x53E9, 0x544A, 0x5471, 0x56FA, 0x59D1, 0x5B64, 0x5C3B, 0x5EAB, /* 0xB0 */
@@ -2359,15 +2359,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_CD[] =
     0x6606, 0x68B1, 0x68CD, 0x6EFE, 0x7428, 0x889E, 0x9BE4, 0x6C68, /* 0xE0 */
     0xF904, 0x9AA8, 0x4F9B, 0x516C, 0x5171, 0x529F, 0x5B54, 0x5DE5, /* 0xE0 */
     0x6050, 0x606D, 0x62F1, 0x63A7, 0x653B, 0x73D9, 0x7A7A, 0x86A3, /* 0xF0 */
-    0x8CA2, 0x978F, 0x4E32, 0x5BE1, 0x6208, 0x679C, 0x74DC          /* 0xF0 */
+    0x8CA2, 0x978F, 0x4E32, 0x5BE1, 0x6208, 0x679C, 0x74DC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_CE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x79D1, 0x83D3, 0x8A87, 0x8AB2, 0x8DE8, 0x904E, 0x934B, /* 0xA0 */
     0x9846, 0x5ED3, 0x69E8, 0x85FF, 0x90ED, 0xF905, 0x51A0, 0x5B98, /* 0xA0 */
     0x5BEC, 0x6163, 0x68FA, 0x6B3E, 0x704C, 0x742F, 0x74D8, 0x7BA1, /* 0xB0 */
@@ -2379,15 +2379,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_CE[] =
     0x50D1, 0x54AC, 0x55AC, 0x5B0C, 0x5DA0, 0x5DE7, 0x652A, 0x654E, /* 0xE0 */
     0x6821, 0x6A4B, 0x72E1, 0x768E, 0x77EF, 0x7D5E, 0x7FF9, 0x81A0, /* 0xE0 */
     0x854E, 0x86DF, 0x8F03, 0x8F4E, 0x90CA, 0x9903, 0x9A55, 0x9BAB, /* 0xF0 */
-    0x4E18, 0x4E45, 0x4E5D, 0x4EC7, 0x4FF1, 0x5177, 0x52FE          /* 0xF0 */
+    0x4E18, 0x4E45, 0x4E5D, 0x4EC7, 0x4FF1, 0x5177, 0x52FE			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_CF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5340, 0x53E3, 0x53E5, 0x548E, 0x5614, 0x5775, 0x57A2, /* 0xA0 */
     0x5BC7, 0x5D87, 0x5ED0, 0x61FC, 0x62D8, 0x6551, 0x67B8, 0x67E9, /* 0xA0 */
     0x69CB, 0x6B50, 0x6BC6, 0x6BEC, 0x6C42, 0x6E9D, 0x7078, 0x72D7, /* 0xB0 */
@@ -2399,15 +2399,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_CF[] =
     0x5BAE, 0x5F13, 0x7A79, 0x7AAE, 0x828E, 0x8EAC, 0x5026, 0x5238, /* 0xE0 */
     0x52F8, 0x5377, 0x5708, 0x62F3, 0x6372, 0x6B0A, 0x6DC3, 0x7737, /* 0xE0 */
     0x53A5, 0x7357, 0x8568, 0x8E76, 0x95D5, 0x673A, 0x6AC3, 0x6F70, /* 0xF0 */
-    0x8A6D, 0x8ECC, 0x994B, 0xF906, 0x6677, 0x6B78, 0x8CB4          /* 0xF0 */
+    0x8A6D, 0x8ECC, 0x994B, 0xF906, 0x6677, 0x6B78, 0x8CB4			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9B3C, 0xF907, 0x53EB, 0x572D, 0x594E, 0x63C6, 0x69FB, /* 0xA0 */
     0x73EA, 0x7845, 0x7ABA, 0x7AC5, 0x7CFE, 0x8475, 0x898F, 0x8D73, /* 0xA0 */
     0x9035, 0x95A8, 0x52FB, 0x5747, 0x7547, 0x7B60, 0x83CC, 0x921E, /* 0xB0 */
@@ -2419,15 +2419,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D0[] =
     0x53CA, 0x6025, 0x6271, 0x6C72, 0x7D1A, 0x7D66, 0x4E98, 0x5162, /* 0xE0 */
     0x77DC, 0x80AF, 0x4F01, 0x4F0E, 0x5176, 0x5180, 0x55DC, 0x5668, /* 0xE0 */
     0x573B, 0x57FA, 0x57FC, 0x5914, 0x5947, 0x5993, 0x5BC4, 0x5C90, /* 0xF0 */
-    0x5D0E, 0x5DF1, 0x5E7E, 0x5FCC, 0x6280, 0x65D7, 0x65E3          /* 0xF0 */
+    0x5D0E, 0x5DF1, 0x5E7E, 0x5FCC, 0x6280, 0x65D7, 0x65E3			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x671E, 0x671F, 0x675E, 0x68CB, 0x68C4, 0x6A5F, 0x6B3A, /* 0xA0 */
     0x6C23, 0x6C7D, 0x6C82, 0x6DC7, 0x7398, 0x7426, 0x742A, 0x7482, /* 0xA0 */
     0x74A3, 0x7578, 0x757F, 0x7881, 0x78EF, 0x7941, 0x7947, 0x7948, /* 0xB0 */
@@ -2439,15 +2439,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D1[] =
     0xF913, 0x90A3, 0xF914, 0xF915, 0xF916, 0xF917, 0xF918, 0x8AFE, /* 0xE0 */
     0xF919, 0xF91A, 0xF91B, 0xF91C, 0x6696, 0xF91D, 0x7156, 0xF91E, /* 0xE0 */
     0xF91F, 0x96E3, 0xF920, 0x634F, 0x637A, 0x5357, 0xF921, 0x678F, /* 0xF0 */
-    0x6960, 0x6E73, 0xF922, 0x7537, 0xF923, 0xF924, 0xF925          /* 0xF0 */
+    0x6960, 0x6E73, 0xF922, 0x7537, 0xF923, 0xF924, 0xF925			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7D0D, 0xF926, 0xF927, 0x8872, 0x56CA, 0x5A18, 0xF928, /* 0xA0 */
     0xF929, 0xF92A, 0xF92B, 0xF92C, 0x4E43, 0xF92D, 0x5167, 0x5948, /* 0xA0 */
     0x67F0, 0x8010, 0xF92E, 0x5973, 0x5E74, 0x649A, 0x79CA, 0x5FF5, /* 0xB0 */
@@ -2459,15 +2459,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D2[] =
     0x8166, 0xF948, 0xF949, 0x5C3F, 0xF94A, 0xF94B, 0xF94C, 0xF94D, /* 0xE0 */
     0xF94E, 0xF94F, 0xF950, 0xF951, 0x5AE9, 0x8A25, 0x677B, 0x7D10, /* 0xE0 */
     0xF952, 0xF953, 0xF954, 0xF955, 0xF956, 0xF957, 0x80FD, 0xF958, /* 0xF0 */
-    0xF959, 0x5C3C, 0x6CE5, 0x533F, 0x6EBA, 0x591A, 0x8336          /* 0xF0 */
+    0xF959, 0x5C3C, 0x6CE5, 0x533F, 0x6EBA, 0x591A, 0x8336			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x4E39, 0x4EB6, 0x4F46, 0x55AE, 0x5718, 0x58C7, 0x5F56, /* 0xA0 */
     0x65B7, 0x65E6, 0x6A80, 0x6BB5, 0x6E4D, 0x77ED, 0x7AEF, 0x7C1E, /* 0xA0 */
     0x7DDE, 0x86CB, 0x8892, 0x9132, 0x935B, 0x64BB, 0x6FBE, 0x737A, /* 0xB0 */
@@ -2479,15 +2479,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D3[] =
     0x5CB1, 0x5E36, 0x5F85, 0x6234, 0x64E1, 0x73B3, 0x81FA, 0x888B, /* 0xE0 */
     0x8CB8, 0x968A, 0x9EDB, 0x5B85, 0x5FB7, 0x60B3, 0x5012, 0x5200, /* 0xE0 */
     0x5230, 0x5716, 0x5835, 0x5857, 0x5C0E, 0x5C60, 0x5CF6, 0x5D8B, /* 0xF0 */
-    0x5EA6, 0x5F92, 0x60BC, 0x6311, 0x6389, 0x6417, 0x6843          /* 0xF0 */
+    0x5EA6, 0x5F92, 0x60BC, 0x6311, 0x6389, 0x6417, 0x6843			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x68F9, 0x6AC2, 0x6DD8, 0x6E21, 0x6ED4, 0x6FE4, 0x71FE, /* 0xA0 */
     0x76DC, 0x7779, 0x79B1, 0x7A3B, 0x8404, 0x89A9, 0x8CED, 0x8DF3, /* 0xA0 */
     0x8E48, 0x9003, 0x9014, 0x9053, 0x90FD, 0x934D, 0x9676, 0x97DC, /* 0xB0 */
@@ -2499,15 +2499,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D4[] =
     0x6597, 0x675C, 0x6793, 0x75D8, 0x7AC7, 0x8373, 0xF95A, 0x8C46, /* 0xE0 */
     0x9017, 0x982D, 0x5C6F, 0x81C0, 0x829A, 0x9041, 0x906F, 0x920D, /* 0xE0 */
     0x5F97, 0x5D9D, 0x6A59, 0x71C8, 0x767B, 0x7B49, 0x85E4, 0x8B04, /* 0xF0 */
-    0x9127, 0x9A30, 0x5587, 0x61F6, 0xF95B, 0x7669, 0x7F85          /* 0xF0 */
+    0x9127, 0x9A30, 0x5587, 0x61F6, 0xF95B, 0x7669, 0x7F85			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x863F, 0x87BA, 0x88F8, 0x908F, 0xF95C, 0x6D1B, 0x70D9, /* 0xA0 */
     0x73DE, 0x7D61, 0x843D, 0xF95D, 0x916A, 0x99F1, 0xF95E, 0x4E82, /* 0xA0 */
     0x5375, 0x6B04, 0x6B12, 0x703E, 0x721B, 0x862D, 0x9E1E, 0x524C, /* 0xB0 */
@@ -2519,15 +2519,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D5[] =
     0x8F1B, 0x91CF, 0x4FB6, 0x5137, 0x52F5, 0x5442, 0x5EEC, 0x616E, /* 0xE0 */
     0x623E, 0x65C5, 0x6ADA, 0x6FFE, 0x792A, 0x85DC, 0x8823, 0x95AD, /* 0xE0 */
     0x9A62, 0x9A6A, 0x9E97, 0x9ECE, 0x529B, 0x66C6, 0x6B77, 0x701D, /* 0xF0 */
-    0x792B, 0x8F62, 0x9742, 0x6190, 0x6200, 0x6523, 0x6F23          /* 0xF0 */
+    0x792B, 0x8F62, 0x9742, 0x6190, 0x6200, 0x6523, 0x6F23			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7149, 0x7489, 0x7DF4, 0x806F, 0x84EE, 0x8F26, 0x9023, /* 0xA0 */
     0x934A, 0x51BD, 0x5217, 0x52A3, 0x6D0C, 0x70C8, 0x88C2, 0x5EC9, /* 0xA0 */
     0x6582, 0x6BAE, 0x6FC2, 0x7C3E, 0x7375, 0x4EE4, 0x4F36, 0x56F9, /* 0xB0 */
@@ -2539,15 +2539,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D6[] =
     0x7DA0, 0x83C9, 0x9304, 0x9E7F, 0x9E93, 0x8AD6, 0x58DF, 0x5F04, /* 0xE0 */
     0x6727, 0x7027, 0x74CF, 0x7C60, 0x807E, 0x5121, 0x7028, 0x7262, /* 0xE0 */
     0x78CA, 0x8CC2, 0x8CDA, 0x8CF4, 0x96F7, 0x4E86, 0x50DA, 0x5BEE, /* 0xF0 */
-    0x5ED6, 0x6599, 0x71CE, 0x7642, 0x77AD, 0x804A, 0x84FC          /* 0xF0 */
+    0x5ED6, 0x6599, 0x71CE, 0x7642, 0x77AD, 0x804A, 0x84FC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x907C, 0x9B27, 0x9F8D, 0x58D8, 0x5A41, 0x5C62, 0x6A13, /* 0xA0 */
     0x6DDA, 0x6F0F, 0x763B, 0x7D2F, 0x7E37, 0x851E, 0x8938, 0x93E4, /* 0xA0 */
     0x964B, 0x5289, 0x65D2, 0x67F3, 0x69B4, 0x6D41, 0x6E9C, 0x700F, /* 0xB0 */
@@ -2559,15 +2559,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D7[] =
     0x7281, 0x72F8, 0x7406, 0x7483, 0xF962, 0x75E2, 0x7C6C, 0x7F79, /* 0xE0 */
     0x7FB8, 0x8389, 0x88CF, 0x88E1, 0x91CC, 0x91D0, 0x96E2, 0x9BC9, /* 0xE0 */
     0x541D, 0x6F7E, 0x71D0, 0x7498, 0x85FA, 0x8EAA, 0x96A3, 0x9C57, /* 0xF0 */
-    0x9E9F, 0x6797, 0x6DCB, 0x7433, 0x81E8, 0x9716, 0x782C          /* 0xF0 */
+    0x9E9F, 0x6797, 0x6DCB, 0x7433, 0x81E8, 0x9716, 0x782C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7ACB, 0x7B20, 0x7C92, 0x6469, 0x746A, 0x75F2, 0x78BC, /* 0xA0 */
     0x78E8, 0x99AC, 0x9B54, 0x9EBB, 0x5BDE, 0x5E55, 0x6F20, 0x819C, /* 0xA0 */
     0x83AB, 0x9088, 0x4E07, 0x534D, 0x5A29, 0x5DD2, 0x5F4E, 0x6162, /* 0xB0 */
@@ -2579,15 +2579,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D8[] =
     0x7164, 0x7F75, 0x8CB7, 0x8CE3, 0x9081, 0x9B45, 0x8108, 0x8C8A, /* 0xE0 */
     0x964C, 0x9A40, 0x9EA5, 0x5B5F, 0x6C13, 0x731B, 0x76F2, 0x76DF, /* 0xE0 */
     0x840C, 0x51AA, 0x8993, 0x514D, 0x5195, 0x52C9, 0x68C9, 0x6C94, /* 0xF0 */
-    0x7704, 0x7720, 0x7DBF, 0x7DEC, 0x9762, 0x9EB5, 0x6EC5          /* 0xF0 */
+    0x7704, 0x7720, 0x7DBF, 0x7DEC, 0x9762, 0x9EB5, 0x6EC5			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8511, 0x51A5, 0x540D, 0x547D, 0x660E, 0x669D, 0x6927, /* 0xA0 */
     0x6E9F, 0x76BF, 0x7791, 0x8317, 0x84C2, 0x879F, 0x9169, 0x9298, /* 0xA0 */
     0x9CF4, 0x8882, 0x4FAE, 0x5192, 0x52DF, 0x59C6, 0x5E3D, 0x6155, /* 0xB0 */
@@ -2599,15 +2599,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_D9[] =
     0x82D7, 0x9328, 0x52D9, 0x5DEB, 0x61AE, 0x61CB, 0x620A, 0x62C7, /* 0xE0 */
     0x64AB, 0x65E0, 0x6959, 0x6B66, 0x6BCB, 0x7121, 0x73F7, 0x755D, /* 0xE0 */
     0x7E46, 0x821E, 0x8302, 0x856A, 0x8AA3, 0x8CBF, 0x9727, 0x9D61, /* 0xF0 */
-    0x58A8, 0x9ED8, 0x5011, 0x520E, 0x543B, 0x554F, 0x6587          /* 0xF0 */
+    0x58A8, 0x9ED8, 0x5011, 0x520E, 0x543B, 0x554F, 0x6587			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_DA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6C76, 0x7D0A, 0x7D0B, 0x805E, 0x868A, 0x9580, 0x96EF, /* 0xA0 */
     0x52FF, 0x6C95, 0x7269, 0x5473, 0x5A9A, 0x5C3E, 0x5D4B, 0x5F4C, /* 0xA0 */
     0x5FAE, 0x672A, 0x68B6, 0x6963, 0x6E3C, 0x6E44, 0x7709, 0x7C73, /* 0xB0 */
@@ -2619,15 +2619,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_DA[] =
     0x99C1, 0x4F34, 0x534A, 0x53CD, 0x53DB, 0x62CC, 0x642C, 0x6500, /* 0xE0 */
     0x6591, 0x69C3, 0x6CEE, 0x6F58, 0x73ED, 0x7554, 0x7622, 0x76E4, /* 0xE0 */
     0x76FC, 0x78D0, 0x78FB, 0x792C, 0x7D46, 0x822C, 0x87E0, 0x8FD4, /* 0xF0 */
-    0x9812, 0x98EF, 0x52C3, 0x62D4, 0x64A5, 0x6E24, 0x6F51          /* 0xF0 */
+    0x9812, 0x98EF, 0x52C3, 0x62D4, 0x64A5, 0x6E24, 0x6F51			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_DB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x767C, 0x8DCB, 0x91B1, 0x9262, 0x9AEE, 0x9B43, 0x5023, /* 0xA0 */
     0x508D, 0x574A, 0x59A8, 0x5C28, 0x5E47, 0x5F77, 0x623F, 0x653E, /* 0xA0 */
     0x65B9, 0x65C1, 0x6609, 0x678B, 0x699C, 0x6EC2, 0x78C5, 0x7D21, /* 0xB0 */
@@ -2639,15 +2639,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_DB[] =
     0x6A0A, 0x7169, 0x71D4, 0x756A, 0xF964, 0x7E41, 0x8543, 0x85E9, /* 0xE0 */
     0x98DC, 0x4F10, 0x7B4F, 0x7F70, 0x95A5, 0x51E1, 0x5E06, 0x68B5, /* 0xE0 */
     0x6C3E, 0x6C4E, 0x6CDB, 0x72AF, 0x7BC4, 0x8303, 0x6CD5, 0x743A, /* 0xF0 */
-    0x50FB, 0x5288, 0x58C1, 0x64D8, 0x6A97, 0x74A7, 0x7656          /* 0xF0 */
+    0x50FB, 0x5288, 0x58C1, 0x64D8, 0x6A97, 0x74A7, 0x7656			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_DC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x78A7, 0x8617, 0x95E2, 0x9739, 0xF965, 0x535E, 0x5F01, /* 0xA0 */
     0x8B8A, 0x8FA8, 0x8FAF, 0x908A, 0x5225, 0x77A5, 0x9C49, 0x9F08, /* 0xA0 */
     0x4E19, 0x5002, 0x5175, 0x5C5B, 0x5E77, 0x661E, 0x663A, 0x67C4, /* 0xB0 */
@@ -2659,15 +2659,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_DC[] =
     0x99A5, 0x9C12, 0x672C, 0x4E76, 0x4FF8, 0x5949, 0x5C01, 0x5CEF, /* 0xE0 */
     0x5CF0, 0x6367, 0x68D2, 0x70FD, 0x71A2, 0x742B, 0x7E2B, 0x84EC, /* 0xE0 */
     0x8702, 0x9022, 0x92D2, 0x9CF3, 0x4E0D, 0x4ED8, 0x4FEF, 0x5085, /* 0xF0 */
-    0x5256, 0x526F, 0x5426, 0x5490, 0x57E0, 0x592B, 0x5A66          /* 0xF0 */
+    0x5256, 0x526F, 0x5426, 0x5490, 0x57E0, 0x592B, 0x5A66			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_DD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5B5A, 0x5B75, 0x5BCC, 0x5E9C, 0xF966, 0x6276, 0x6577, /* 0xA0 */
     0x65A7, 0x6D6E, 0x6EA5, 0x7236, 0x7B26, 0x7C3F, 0x7F36, 0x8150, /* 0xA0 */
     0x8151, 0x819A, 0x8240, 0x8299, 0x83A9, 0x8A03, 0x8CA0, 0x8CE6, /* 0xB0 */
@@ -2679,15 +2679,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_DD[] =
     0x4E15, 0x5099, 0x5315, 0x532A, 0x5351, 0x5983, 0x5A62, 0x5E87, /* 0xE0 */
     0x60B2, 0x618A, 0x6249, 0x6279, 0x6590, 0x6787, 0x69A7, 0x6BD4, /* 0xE0 */
     0x6BD6, 0x6BD7, 0x6BD8, 0x6CB8, 0xF968, 0x7435, 0x75FA, 0x7812, /* 0xF0 */
-    0x7891, 0x79D5, 0x79D8, 0x7C83, 0x7DCB, 0x7FE1, 0x80A5          /* 0xF0 */
+    0x7891, 0x79D5, 0x79D8, 0x7C83, 0x7DCB, 0x7FE1, 0x80A5			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_DE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x813E, 0x81C2, 0x83F2, 0x871A, 0x88E8, 0x8AB9, 0x8B6C, /* 0xA0 */
     0x8CBB, 0x9119, 0x975E, 0x98DB, 0x9F3B, 0x56AC, 0x5B2A, 0x5F6C, /* 0xA0 */
     0x658C, 0x6AB3, 0x6BAF, 0x6D5C, 0x6FF1, 0x7015, 0x725D, 0x73AD, /* 0xB0 */
@@ -2699,15 +2699,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_DE[] =
     0x6E23, 0x7009, 0x7345, 0x7802, 0x793E, 0x7940, 0x7960, 0x79C1, /* 0xE0 */
     0x7BE9, 0x7D17, 0x7D72, 0x8086, 0x820D, 0x838E, 0x84D1, 0x86C7, /* 0xE0 */
     0x88DF, 0x8A50, 0x8A5E, 0x8B1D, 0x8CDC, 0x8D66, 0x8FAD, 0x90AA, /* 0xF0 */
-    0x98FC, 0x99DF, 0x9E9D, 0x524A, 0xF969, 0x6714, 0xF96A          /* 0xF0 */
+    0x98FC, 0x99DF, 0x9E9D, 0x524A, 0xF969, 0x6714, 0xF96A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_DF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5098, 0x522A, 0x5C71, 0x6563, 0x6C55, 0x73CA, 0x7523, /* 0xA0 */
     0x759D, 0x7B97, 0x849C, 0x9178, 0x9730, 0x4E77, 0x6492, 0x6BBA, /* 0xA0 */
     0x715E, 0x85A9, 0x4E09, 0xF96B, 0x6749, 0x68EE, 0x6E17, 0x829F, /* 0xB0 */
@@ -2719,15 +2719,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_DF[] =
     0x55C7, 0xF96C, 0x7A61, 0x7D22, 0x8272, 0x7272, 0x751F, 0x7525, /* 0xE0 */
     0xF96D, 0x7B19, 0x5885, 0x58FB, 0x5DBC, 0x5E8F, 0x5EB6, 0x5F90, /* 0xE0 */
     0x6055, 0x6292, 0x637F, 0x654D, 0x6691, 0x66D9, 0x66F8, 0x6816, /* 0xF0 */
-    0x68F2, 0x7280, 0x745E, 0x7B6E, 0x7D6E, 0x7DD6, 0x7F72          /* 0xF0 */
+    0x68F2, 0x7280, 0x745E, 0x7B6E, 0x7D6E, 0x7DD6, 0x7F72			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x80E5, 0x8212, 0x85AF, 0x897F, 0x8A93, 0x901D, 0x92E4, /* 0xA0 */
     0x9ECD, 0x9F20, 0x5915, 0x596D, 0x5E2D, 0x60DC, 0x6614, 0x6673, /* 0xA0 */
     0x6790, 0x6C50, 0x6DC5, 0x6F5F, 0x77F3, 0x78A9, 0x84C6, 0x91CB, /* 0xB0 */
@@ -2739,15 +2739,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E0[] =
     0x859B, 0x893B, 0x8A2D, 0x8AAA, 0x96EA, 0x9F67, 0x5261, 0x66B9, /* 0xE0 */
     0x6BB2, 0x7E96, 0x87FE, 0x8D0D, 0x9583, 0x965D, 0x651D, 0x6D89, /* 0xE0 */
     0x71EE, 0xF96E, 0x57CE, 0x59D3, 0x5BAC, 0x6027, 0x60FA, 0x6210, /* 0xF0 */
-    0x661F, 0x665F, 0x7329, 0x73F9, 0x76DB, 0x7701, 0x7B6C          /* 0xF0 */
+    0x661F, 0x665F, 0x7329, 0x73F9, 0x76DB, 0x7701, 0x7B6C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8056, 0x8072, 0x8165, 0x8AA0, 0x9192, 0x4E16, 0x52E2, /* 0xA0 */
     0x6B72, 0x6D17, 0x7A05, 0x7B39, 0x7D30, 0xF96F, 0x8CB0, 0x53EC, /* 0xA0 */
     0x562F, 0x5851, 0x5BB5, 0x5C0F, 0x5C11, 0x5DE2, 0x6240, 0x6383, /* 0xB0 */
@@ -2759,15 +2759,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E1[] =
     0x84C0, 0x905C, 0x98E1, 0x7387, 0x5B8B, 0x609A, 0x677E, 0x6DDE, /* 0xE0 */
     0x8A1F, 0x8AA6, 0x9001, 0x980C, 0x5237, 0xF970, 0x7051, 0x788E, /* 0xE0 */
     0x9396, 0x8870, 0x91D7, 0x4FEE, 0x53D7, 0x55FD, 0x56DA, 0x5782, /* 0xF0 */
-    0x58FD, 0x5AC2, 0x5B88, 0x5CAB, 0x5CC0, 0x5E25, 0x6101          /* 0xF0 */
+    0x58FD, 0x5AC2, 0x5B88, 0x5CAB, 0x5CC0, 0x5E25, 0x6101			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x620D, 0x624B, 0x6388, 0x641C, 0x6536, 0x6578, 0x6A39, /* 0xA0 */
     0x6B8A, 0x6C34, 0x6D19, 0x6F31, 0x71E7, 0x72E9, 0x7378, 0x7407, /* 0xA0 */
     0x74B2, 0x7626, 0x7761, 0x79C0, 0x7A57, 0x7AEA, 0x7CB9, 0x7D8F, /* 0xB0 */
@@ -2779,15 +2779,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E2[] =
     0x5FAA, 0x6042, 0x65EC, 0x6812, 0x696F, 0x6A53, 0x6B89, 0x6D35, /* 0xE0 */
     0x6DF3, 0x73E3, 0x76FE, 0x77AC, 0x7B4D, 0x7D14, 0x8123, 0x821C, /* 0xE0 */
     0x8340, 0x84F4, 0x8563, 0x8A62, 0x8AC4, 0x9187, 0x931E, 0x9806, /* 0xF0 */
-    0x99B4, 0x620C, 0x8853, 0x8FF0, 0x9265, 0x5D07, 0x5D27          /* 0xF0 */
+    0x99B4, 0x620C, 0x8853, 0x8FF0, 0x9265, 0x5D07, 0x5D27			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5D69, 0x745F, 0x819D, 0x8768, 0x6FD5, 0x62FE, 0x7FD2, /* 0xA0 */
     0x8936, 0x8972, 0x4E1E, 0x4E58, 0x50E7, 0x52DD, 0x5347, 0x627F, /* 0xA0 */
     0x6607, 0x7E69, 0x8805, 0x965E, 0x4F8D, 0x5319, 0x5636, 0x59CB, /* 0xB0 */
@@ -2799,15 +2799,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E3[] =
     0x4F81, 0x4FE1, 0x547B, 0x5A20, 0x5BB8, 0x613C, 0x65B0, 0x6668, /* 0xE0 */
     0x71FC, 0x7533, 0x795E, 0x7D33, 0x814E, 0x81E3, 0x8398, 0x85AA, /* 0xE0 */
     0x85CE, 0x8703, 0x8A0A, 0x8EAB, 0x8F9B, 0xF971, 0x8FC5, 0x5931, /* 0xF0 */
-    0x5BA4, 0x5BE6, 0x6089, 0x5BE9, 0x5C0B, 0x5FC3, 0x6C81          /* 0xF0 */
+    0x5BA4, 0x5BE6, 0x6089, 0x5BE9, 0x5C0B, 0x5FC3, 0x6C81			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xF972, 0x6DF1, 0x700B, 0x751A, 0x82AF, 0x8AF6, 0x4EC0, /* 0xA0 */
     0x5341, 0xF973, 0x96D9, 0x6C0F, 0x4E9E, 0x4FC4, 0x5152, 0x555E, /* 0xA0 */
     0x5A25, 0x5CE8, 0x6211, 0x7259, 0x82BD, 0x83AA, 0x86FE, 0x8859, /* 0xB0 */
@@ -2819,15 +2819,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E4[] =
     0x83F4, 0x95C7, 0x58D3, 0x62BC, 0x72CE, 0x9D28, 0x4EF0, 0x592E, /* 0xE0 */
     0x600F, 0x663B, 0x6B83, 0x79E7, 0x9D26, 0x5393, 0x54C0, 0x57C3, /* 0xE0 */
     0x5D16, 0x611B, 0x66D6, 0x6DAF, 0x788D, 0x827E, 0x9698, 0x9744, /* 0xF0 */
-    0x5384, 0x627C, 0x6396, 0x6DB2, 0x7E0A, 0x814B, 0x984D          /* 0xF0 */
+    0x5384, 0x627C, 0x6396, 0x6DB2, 0x7E0A, 0x814B, 0x984D			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6AFB, 0x7F4C, 0x9DAF, 0x9E1A, 0x4E5F, 0x503B, 0x51B6, /* 0xA0 */
     0x591C, 0x60F9, 0x63F6, 0x6930, 0x723A, 0x8036, 0xF974, 0x91CE, /* 0xA0 */
     0x5F31, 0xF975, 0xF976, 0x7D04, 0x82E5, 0x846F, 0x84BB, 0x85E5, /* 0xB0 */
@@ -2839,15 +2839,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E5[] =
     0x9B5A, 0x9F6C, 0x5104, 0x61B6, 0x6291, 0x6A8D, 0x81C6, 0x5043, /* 0xE0 */
     0x5830, 0x5F66, 0x7109, 0x8A00, 0x8AFA, 0x5B7C, 0x8616, 0x4FFA, /* 0xE0 */
     0x513C, 0x56B4, 0x5944, 0x63A9, 0x6DF9, 0x5DAA, 0x696D, 0x5186, /* 0xF0 */
-    0x4E88, 0x4F59, 0xF97F, 0xF980, 0xF981, 0x5982, 0xF982          /* 0xF0 */
+    0x4E88, 0x4F59, 0xF97F, 0xF980, 0xF981, 0x5982, 0xF982			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xF983, 0x6B5F, 0x6C5D, 0xF984, 0x74B5, 0x7916, 0xF985, /* 0xA0 */
     0x8207, 0x8245, 0x8339, 0x8F3F, 0x8F5D, 0xF986, 0x9918, 0xF987, /* 0xA0 */
     0xF988, 0xF989, 0x4EA6, 0xF98A, 0x57DF, 0x5F79, 0x6613, 0xF98B, /* 0xB0 */
@@ -2859,15 +2859,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E6[] =
     0x7E2F, 0xF997, 0x884D, 0x8EDF, 0xF998, 0xF999, 0xF99A, 0x925B, /* 0xE0 */
     0xF99B, 0x9CF6, 0xF99C, 0xF99D, 0xF99E, 0x6085, 0x6D85, 0xF99F, /* 0xE0 */
     0x71B1, 0xF9A0, 0xF9A1, 0x95B1, 0x53AD, 0xF9A2, 0xF9A3, 0xF9A4, /* 0xF0 */
-    0x67D3, 0xF9A5, 0x708E, 0x7130, 0x7430, 0x8276, 0x82D2          /* 0xF0 */
+    0x67D3, 0xF9A5, 0x708E, 0x7130, 0x7430, 0x8276, 0x82D2			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xF9A6, 0x95BB, 0x9AE5, 0x9E7D, 0x66C4, 0xF9A7, 0x71C1, /* 0xA0 */
     0x8449, 0xF9A8, 0xF9A9, 0x584B, 0xF9AA, 0xF9AB, 0x5DB8, 0x5F71, /* 0xA0 */
     0xF9AC, 0x6620, 0x668E, 0x6979, 0x69AE, 0x6C38, 0x6CF3, 0x6E36, /* 0xB0 */
@@ -2879,15 +2879,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E7[] =
     0x88D4, 0x8A63, 0x8B7D, 0x8C6B, 0xF9B7, 0x92B3, 0xF9B8, 0x9713, /* 0xE0 */
     0x9810, 0x4E94, 0x4F0D, 0x4FC9, 0x50B2, 0x5348, 0x543E, 0x5433, /* 0xE0 */
     0x55DA, 0x5862, 0x58BA, 0x5967, 0x5A1B, 0x5BE4, 0x609F, 0xF9B9, /* 0xF0 */
-    0x61CA, 0x6556, 0x65FF, 0x6664, 0x68A7, 0x6C5A, 0x6FB3          /* 0xF0 */
+    0x61CA, 0x6556, 0x65FF, 0x6664, 0x68A7, 0x6C5A, 0x6FB3			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x70CF, 0x71AC, 0x7352, 0x7B7D, 0x8708, 0x8AA4, 0x9C32, /* 0xA0 */
     0x9F07, 0x5C4B, 0x6C83, 0x7344, 0x7389, 0x923A, 0x6EAB, 0x7465, /* 0xA0 */
     0x761F, 0x7A69, 0x7E15, 0x860A, 0x5140, 0x58C5, 0x64C1, 0x74EE, /* 0xB0 */
@@ -2899,15 +2899,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E8[] =
     0x6B6A, 0x77EE, 0x5916, 0x5D6C, 0x5DCD, 0x7325, 0x754F, 0xF9BA, /* 0xE0 */
     0xF9BB, 0x50E5, 0x51F9, 0x582F, 0x592D, 0x5996, 0x59DA, 0x5BE5, /* 0xE0 */
     0xF9BC, 0xF9BD, 0x5DA2, 0x62D7, 0x6416, 0x6493, 0x64FE, 0xF9BE, /* 0xF0 */
-    0x66DC, 0xF9BF, 0x6A48, 0xF9C0, 0x71FF, 0x7464, 0xF9C1          /* 0xF0 */
+    0x66DC, 0xF9BF, 0x6A48, 0xF9C0, 0x71FF, 0x7464, 0xF9C1			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7A88, 0x7AAF, 0x7E47, 0x7E5E, 0x8000, 0x8170, 0xF9C2, /* 0xA0 */
     0x87EF, 0x8981, 0x8B20, 0x9059, 0xF9C3, 0x9080, 0x9952, 0x617E, /* 0xA0 */
     0x6B32, 0x6D74, 0x7E1F, 0x8925, 0x8FB1, 0x4FD1, 0x50AD, 0x5197, /* 0xB0 */
@@ -2919,15 +2919,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_E9[] =
     0x79B9, 0x7D06, 0x7FBD, 0x828B, 0x85D5, 0x865E, 0x8FC2, 0x9047, /* 0xE0 */
     0x90F5, 0x91EA, 0x9685, 0x96E8, 0x96E9, 0x52D6, 0x5F67, 0x65ED, /* 0xE0 */
     0x6631, 0x682F, 0x715C, 0x7A36, 0x90C1, 0x980A, 0x4E91, 0xF9C5, /* 0xF0 */
-    0x6A52, 0x6B9E, 0x6F90, 0x7189, 0x8018, 0x82B8, 0x8553          /* 0xF0 */
+    0x6A52, 0x6B9E, 0x6F90, 0x7189, 0x8018, 0x82B8, 0x8553			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_EA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x904B, 0x9695, 0x96F2, 0x97FB, 0x851A, 0x9B31, 0x4E90, /* 0xA0 */
     0x718A, 0x96C4, 0x5143, 0x539F, 0x54E1, 0x5713, 0x5712, 0x57A3, /* 0xA0 */
     0x5A9B, 0x5AC4, 0x5BC3, 0x6028, 0x613F, 0x63F4, 0x6C85, 0x6D39, /* 0xB0 */
@@ -2939,15 +2939,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_EA[] =
     0x9B4F, 0x4E73, 0x4F91, 0x5112, 0x516A, 0xF9C7, 0x552F, 0x55A9, /* 0xE0 */
     0x5B7A, 0x5BA5, 0x5E7C, 0x5E7D, 0x5EBE, 0x60A0, 0x60DF, 0x6108, /* 0xE0 */
     0x6109, 0x63C4, 0x6538, 0x6709, 0xF9C8, 0x67D4, 0x67DA, 0xF9C9, /* 0xF0 */
-    0x6961, 0x6962, 0x6CB9, 0x6D27, 0xF9CA, 0x6E38, 0xF9CB          /* 0xF0 */
+    0x6961, 0x6962, 0x6CB9, 0x6D27, 0xF9CA, 0x6E38, 0xF9CB			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_EB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6FE1, 0x7336, 0x7337, 0xF9CC, 0x745C, 0x7531, 0xF9CD, /* 0xA0 */
     0x7652, 0xF9CE, 0xF9CF, 0x7DAD, 0x81FE, 0x8438, 0x88D5, 0x8A98, /* 0xA0 */
     0x8ADB, 0x8AED, 0x8E30, 0x8E42, 0x904A, 0x903E, 0x907A, 0x9149, /* 0xB0 */
@@ -2959,15 +2959,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_EB[] =
     0x4E59, 0x541F, 0x6DEB, 0x852D, 0x9670, 0x97F3, 0x98EE, 0x63D6, /* 0xE0 */
     0x6CE3, 0x9091, 0x51DD, 0x61C9, 0x81BA, 0x9DF9, 0x4F9D, 0x501A, /* 0xE0 */
     0x5100, 0x5B9C, 0x610F, 0x61FF, 0x64EC, 0x6905, 0x6BC5, 0x7591, /* 0xF0 */
-    0x77E3, 0x7FA9, 0x8264, 0x858F, 0x87FB, 0x8863, 0x8ABC          /* 0xF0 */
+    0x77E3, 0x7FA9, 0x8264, 0x858F, 0x87FB, 0x8863, 0x8ABC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_EC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8B70, 0x91AB, 0x4E8C, 0x4EE5, 0x4F0A, 0xF9DD, 0xF9DE, /* 0xA0 */
     0x5937, 0x59E8, 0xF9DF, 0x5DF2, 0x5F1B, 0x5F5B, 0x6021, 0xF9E0, /* 0xA0 */
     0xF9E1, 0xF9E2, 0xF9E3, 0x723E, 0x73E5, 0xF9E4, 0x7570, 0x75CD, /* 0xB0 */
@@ -2979,15 +2979,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_EC[] =
     0x8335, 0xF9F0, 0x8693, 0x8A8D, 0xF9F1, 0x976D, 0x9777, 0xF9F2, /* 0xE0 */
     0xF9F3, 0x4E00, 0x4F5A, 0x4F7E, 0x58F9, 0x65E5, 0x6EA2, 0x9038, /* 0xE0 */
     0x93B0, 0x99B9, 0x4EFB, 0x58EC, 0x598A, 0x59D9, 0x6041, 0xF9F4, /* 0xF0 */
-    0xF9F5, 0x7A14, 0xF9F6, 0x834F, 0x8CC3, 0x5165, 0x5344          /* 0xF0 */
+    0xF9F5, 0x7A14, 0xF9F6, 0x834F, 0x8CC3, 0x5165, 0x5344			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_ED[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xF9F7, 0xF9F8, 0xF9F9, 0x4ECD, 0x5269, 0x5B55, 0x82BF, /* 0xA0 */
     0x4ED4, 0x523A, 0x54A8, 0x59C9, 0x59FF, 0x5B50, 0x5B57, 0x5B5C, /* 0xA0 */
     0x6063, 0x6148, 0x6ECB, 0x7099, 0x716E, 0x7386, 0x74F7, 0x75B5, /* 0xB0 */
@@ -2999,15 +2999,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_ED[] =
     0x58EF, 0x596C, 0x5C07, 0x5E33, 0x5E84, 0x5F35, 0x638C, 0x66B2, /* 0xE0 */
     0x6756, 0x6A1F, 0x6AA3, 0x6B0C, 0x6F3F, 0x7246, 0xF9FA, 0x7350, /* 0xE0 */
     0x748B, 0x7AE0, 0x7CA7, 0x8178, 0x81DF, 0x81E7, 0x838A, 0x846C, /* 0xF0 */
-    0x8523, 0x8594, 0x85CF, 0x88DD, 0x8D13, 0x91AC, 0x9577          /* 0xF0 */
+    0x8523, 0x8594, 0x85CF, 0x88DD, 0x8D13, 0x91AC, 0x9577			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_EE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x969C, 0x518D, 0x54C9, 0x5728, 0x5BB0, 0x624D, 0x6750, /* 0xA0 */
     0x683D, 0x6893, 0x6E3D, 0x6ED3, 0x707D, 0x7E21, 0x88C1, 0x8CA1, /* 0xA0 */
     0x8F09, 0x9F4B, 0x9F4E, 0x722D, 0x7B8F, 0x8ACD, 0x931A, 0x4F47, /* 0xB0 */
@@ -3019,15 +3019,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_EE[] =
     0x7E3E, 0x7FDF, 0x837B, 0x8B2B, 0x8CCA, 0x8D64, 0x8DE1, 0x8E5F, /* 0xE0 */
     0x8FEA, 0x8FF9, 0x9069, 0x93D1, 0x4F43, 0x4F7A, 0x50B3, 0x5168, /* 0xE0 */
     0x5178, 0x524D, 0x526A, 0x5861, 0x587C, 0x5960, 0x5C08, 0x5C55, /* 0xF0 */
-    0x5EDB, 0x609B, 0x6230, 0x6813, 0x6BBF, 0x6C08, 0x6FB1          /* 0xF0 */
+    0x5EDB, 0x609B, 0x6230, 0x6813, 0x6BBF, 0x6C08, 0x6FB1			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_EF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x714E, 0x7420, 0x7530, 0x7538, 0x7551, 0x7672, 0x7B4C, /* 0xA0 */
     0x7B8B, 0x7BAD, 0x7BC6, 0x7E8F, 0x8A6E, 0x8F3E, 0x8F49, 0x923F, /* 0xA0 */
     0x9293, 0x9322, 0x942B, 0x96FB, 0x985A, 0x986B, 0x991E, 0x5207, /* 0xB0 */
@@ -3039,15 +3039,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_EF[] =
     0x6A89, 0x6B63, 0x6C40, 0x6DC0, 0x6DE8, 0x6E1F, 0x6E5E, 0x701E, /* 0xE0 */
     0x70A1, 0x738E, 0x73FD, 0x753A, 0x775B, 0x7887, 0x798E, 0x7A0B, /* 0xE0 */
     0x7A7D, 0x7CBE, 0x7D8E, 0x8247, 0x8A02, 0x8AEA, 0x8C9E, 0x912D, /* 0xF0 */
-    0x914A, 0x91D8, 0x9266, 0x92CC, 0x9320, 0x9706, 0x9756          /* 0xF0 */
+    0x914A, 0x91D8, 0x9266, 0x92CC, 0x9320, 0x9706, 0x9756			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x975C, 0x9802, 0x9F0E, 0x5236, 0x5291, 0x557C, 0x5824, /* 0xA0 */
     0x5E1D, 0x5F1F, 0x608C, 0x63D0, 0x68AF, 0x6FDF, 0x796D, 0x7B2C, /* 0xA0 */
     0x81CD, 0x85BA, 0x88FD, 0x8AF8, 0x8E44, 0x918D, 0x9664, 0x969B, /* 0xB0 */
@@ -3059,15 +3059,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F0[] =
     0x8ABF, 0x8D99, 0x8E81, 0x9020, 0x906D, 0x91E3, 0x963B, 0x96D5, /* 0xE0 */
     0x9CE5, 0x65CF, 0x7C07, 0x8DB3, 0x93C3, 0x5B58, 0x5C0A, 0x5352, /* 0xE0 */
     0x62D9, 0x731D, 0x5027, 0x5B97, 0x5F9E, 0x60B0, 0x616B, 0x68D5, /* 0xF0 */
-    0x6DD9, 0x742E, 0x7A2E, 0x7D42, 0x7D9C, 0x7E31, 0x816B          /* 0xF0 */
+    0x6DD9, 0x742E, 0x7A2E, 0x7D42, 0x7D9C, 0x7E31, 0x816B			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8E2A, 0x8E35, 0x937E, 0x9418, 0x4F50, 0x5750, 0x5DE6, /* 0xA0 */
     0x5EA7, 0x632B, 0x7F6A, 0x4E3B, 0x4F4F, 0x4F8F, 0x505A, 0x59DD, /* 0xA0 */
     0x80C4, 0x546A, 0x5468, 0x55FE, 0x594F, 0x5B99, 0x5DDE, 0x5EDA, /* 0xB0 */
@@ -3079,15 +3079,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F1[] =
     0x710C, 0x756F, 0x7AE3, 0x8822, 0x9021, 0x9075, 0x96CB, 0x99FF, /* 0xE0 */
     0x8301, 0x4E2D, 0x4EF2, 0x8846, 0x91CD, 0x537D, 0x6ADB, 0x696B, /* 0xE0 */
     0x6C41, 0x847A, 0x589E, 0x618E, 0x66FE, 0x62EF, 0x70DD, 0x7511, /* 0xF0 */
-    0x75C7, 0x7E52, 0x84B8, 0x8B49, 0x8D08, 0x4E4B, 0x53EA          /* 0xF0 */
+    0x75C7, 0x7E52, 0x84B8, 0x8B49, 0x8D08, 0x4E4B, 0x53EA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x54AB, 0x5730, 0x5740, 0x5FD7, 0x6301, 0x6307, 0x646F, /* 0xA0 */
     0x652F, 0x65E8, 0x667A, 0x679D, 0x67B3, 0x6B62, 0x6C60, 0x6C9A, /* 0xA0 */
     0x6F2C, 0x77E5, 0x7825, 0x7949, 0x7957, 0x7D19, 0x80A2, 0x8102, /* 0xB0 */
@@ -3099,15 +3099,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F2[] =
     0x8A3A, 0x8CD1, 0x8EEB, 0x8FB0, 0x9032, 0x93AD, 0x9663, 0x9673, /* 0xE0 */
     0x9707, 0x4F84, 0x53F1, 0x59EA, 0x5AC9, 0x5E19, 0x684E, 0x74C6, /* 0xE0 */
     0x75BE, 0x79E9, 0x7A92, 0x81A3, 0x86ED, 0x8CEA, 0x8DCC, 0x8FED, /* 0xF0 */
-    0x659F, 0x6715, 0xF9FD, 0x57F7, 0x6F57, 0x7DDD, 0x8F2F          /* 0xF0 */
+    0x659F, 0x6715, 0xF9FD, 0x57F7, 0x6F57, 0x7DDD, 0x8F2F			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x93F6, 0x96C6, 0x5FB5, 0x61F2, 0x6F84, 0x4E14, 0x4F98, /* 0xA0 */
     0x501F, 0x53C9, 0x55DF, 0x5D6F, 0x5DEE, 0x6B21, 0x6B64, 0x78CB, /* 0xA0 */
     0x7B9A, 0xF9FE, 0x8E49, 0x8ECA, 0x906E, 0x6349, 0x643E, 0x7740, /* 0xB0 */
@@ -3119,15 +3119,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F3[] =
     0x5F70, 0x6134, 0x655E, 0x660C, 0x6636, 0x66A2, 0x69CD, 0x6EC4, /* 0xE0 */
     0x6F32, 0x7316, 0x7621, 0x7A93, 0x8139, 0x8259, 0x83D6, 0x84BC, /* 0xE0 */
     0x50B5, 0x57F0, 0x5BC0, 0x5BE8, 0x5F69, 0x63A1, 0x7826, 0x7DB5, /* 0xF0 */
-    0x83DC, 0x8521, 0x91C7, 0x91F5, 0x518A, 0x67F5, 0x7B56          /* 0xF0 */
+    0x83DC, 0x8521, 0x91C7, 0x91F5, 0x518A, 0x67F5, 0x7B56			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8CAC, 0x51C4, 0x59BB, 0x60BD, 0x8655, 0x501C, 0xF9FF, /* 0xA0 */
     0x5254, 0x5C3A, 0x617D, 0x621A, 0x62D3, 0x64F2, 0x65A5, 0x6ECC, /* 0xA0 */
     0x7620, 0x810A, 0x8E60, 0x965F, 0x96BB, 0x4EDF, 0x5343, 0x5598, /* 0xB0 */
@@ -3139,15 +3139,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F4[] =
     0x7252, 0x758A, 0x776B, 0x8ADC, 0x8CBC, 0x8F12, 0x5EF3, 0x6674, /* 0xE0 */
     0x6DF8, 0x807D, 0x83C1, 0x8ACB, 0x9751, 0x9BD6, 0xFA00, 0x5243, /* 0xE0 */
     0x66FF, 0x6D95, 0x6EEF, 0x7DE0, 0x8AE6, 0x902E, 0x905E, 0x9AD4, /* 0xF0 */
-    0x521D, 0x527F, 0x54E8, 0x6194, 0x6284, 0x62DB, 0x68A2          /* 0xF0 */
+    0x521D, 0x527F, 0x54E8, 0x6194, 0x6284, 0x62DB, 0x68A2			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6912, 0x695A, 0x6A35, 0x7092, 0x7126, 0x785D, 0x7901, /* 0xA0 */
     0x790E, 0x79D2, 0x7A0D, 0x8096, 0x8278, 0x82D5, 0x8349, 0x8549, /* 0xA0 */
     0x8C82, 0x8D85, 0x9162, 0x918B, 0x91AE, 0x4FC3, 0x56D1, 0x71ED, /* 0xB0 */
@@ -3159,15 +3159,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F5[] =
     0x939A, 0x96DB, 0x9A36, 0x9C0D, 0x4E11, 0x755C, 0x795D, 0x7AFA, /* 0xE0 */
     0x7B51, 0x7BC9, 0x7E2E, 0x84C4, 0x8E59, 0x8E74, 0x8EF8, 0x9010, /* 0xE0 */
     0x6625, 0x693F, 0x7443, 0x51FA, 0x672E, 0x9EDC, 0x5145, 0x5FE0, /* 0xF0 */
-    0x6C96, 0x87F2, 0x885D, 0x8877, 0x60B4, 0x81B5, 0x8403          /* 0xF0 */
+    0x6C96, 0x87F2, 0x885D, 0x8877, 0x60B4, 0x81B5, 0x8403			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8D05, 0x53D6, 0x5439, 0x5634, 0x5A36, 0x5C31, 0x708A, /* 0xA0 */
     0x7FE0, 0x805A, 0x8106, 0x81ED, 0x8DA3, 0x9189, 0x9A5F, 0x9DF2, /* 0xA0 */
     0x5074, 0x4EC4, 0x53A0, 0x60FB, 0x6E2C, 0x5C64, 0x4F88, 0x5024, /* 0xB0 */
@@ -3179,15 +3179,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F6[] =
     0x7A31, 0x5FEB, 0x4ED6, 0x54A4, 0x553E, 0x58AE, 0x59A5, 0x60F0, /* 0xE0 */
     0x6253, 0x62D6, 0x6736, 0x6955, 0x8235, 0x9640, 0x99B1, 0x99DD, /* 0xE0 */
     0x502C, 0x5353, 0x5544, 0x577C, 0xFA01, 0x6258, 0xFA02, 0x64E2, /* 0xF0 */
-    0x666B, 0x67DD, 0x6FC1, 0x6FEF, 0x7422, 0x7438, 0x8A17          /* 0xF0 */
+    0x666B, 0x67DD, 0x6FC1, 0x6FEF, 0x7422, 0x7438, 0x8A17			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9438, 0x5451, 0x5606, 0x5766, 0x5F48, 0x619A, 0x6B4E, /* 0xA0 */
     0x7058, 0x70AD, 0x7DBB, 0x8A95, 0x596A, 0x812B, 0x63A2, 0x7708, /* 0xA0 */
     0x803D, 0x8CAA, 0x5854, 0x642D, 0x69BB, 0x5B95, 0x5E11, 0x6E6F, /* 0xB0 */
@@ -3199,15 +3199,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F7[] =
     0x59AC, 0x6295, 0x900F, 0x9B2A, 0x615D, 0x7279, 0x95D6, 0x5761, /* 0xE0 */
     0x5A46, 0x5DF4, 0x628A, 0x64AD, 0x64FA, 0x6777, 0x6CE2, 0x6D3E, /* 0xE0 */
     0x722C, 0x7436, 0x7834, 0x7F77, 0x82AD, 0x8DDB, 0x9817, 0x5224, /* 0xF0 */
-    0x5742, 0x677F, 0x7248, 0x74E3, 0x8CA9, 0x8FA6, 0x9211          /* 0xF0 */
+    0x5742, 0x677F, 0x7248, 0x74E3, 0x8CA9, 0x8FA6, 0x9211			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x962A, 0x516B, 0x53ED, 0x634C, 0x4F69, 0x5504, 0x6096, /* 0xA0 */
     0x6557, 0x6C9B, 0x6D7F, 0x724C, 0x72FD, 0x7A17, 0x8987, 0x8C9D, /* 0xA0 */
     0x5F6D, 0x6F8E, 0x70F9, 0x81A8, 0x610E, 0x4FBF, 0x504F, 0x6241, /* 0xB0 */
@@ -3219,15 +3219,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F8[] =
     0x80DE, 0x812F, 0x82DE, 0x8461, 0x84B2, 0x888D, 0x8912, 0x900B, /* 0xE0 */
     0x92EA, 0x98FD, 0x9B91, 0x5E45, 0x66B4, 0x66DD, 0x7011, 0x7206, /* 0xE0 */
     0xFA07, 0x4FF5, 0x527D, 0x5F6A, 0x6153, 0x6753, 0x6A19, 0x6F02, /* 0xF0 */
-    0x74E2, 0x7968, 0x8868, 0x8C79, 0x98C7, 0x98C4, 0x9A43          /* 0xF0 */
+    0x74E2, 0x7968, 0x8868, 0x8C79, 0x98C7, 0x98C4, 0x9A43			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x54C1, 0x7A1F, 0x6953, 0x8AF7, 0x8C4A, 0x98A8, 0x99AE, /* 0xA0 */
     0x5F7C, 0x62AB, 0x75B2, 0x76AE, 0x88AB, 0x907F, 0x9642, 0x5339, /* 0xA0 */
     0x5F3C, 0x5FC5, 0x6CCC, 0x73CC, 0x7562, 0x758B, 0x7B46, 0x82FE, /* 0xB0 */
@@ -3239,15 +3239,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_F9[] =
     0x54B8, 0x5563, 0x558A, 0x6ABB, 0x6DB5, 0x7DD8, 0x8266, 0x929C, /* 0xE0 */
     0x9677, 0x9E79, 0x5408, 0x54C8, 0x76D2, 0x86E4, 0x95A4, 0x95D4, /* 0xE0 */
     0x965C, 0x4EA2, 0x4F09, 0x59EE, 0x5AE6, 0x5DF7, 0x6052, 0x6297, /* 0xF0 */
-    0x676D, 0x6841, 0x6C86, 0x6E2F, 0x7F38, 0x809B, 0x822A          /* 0xF0 */
+    0x676D, 0x6841, 0x6C86, 0x6E2F, 0x7F38, 0x809B, 0x822A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_FA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xFA08, 0xFA09, 0x9805, 0x4EA5, 0x5055, 0x54B3, 0x5793, /* 0xA0 */
     0x595A, 0x5B69, 0x5BB3, 0x61C8, 0x6977, 0x6D77, 0x7023, 0x87F9, /* 0xA0 */
     0x89E3, 0x8A72, 0x8AE7, 0x9082, 0x99ED, 0x9AB8, 0x52BE, 0x6838, /* 0xB0 */
@@ -3259,15 +3259,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_FA[] =
     0x774D, 0x7D43, 0x7D62, 0x7E23, 0x8237, 0x8852, 0xFA0A, 0x8CE2, /* 0xE0 */
     0x9249, 0x986F, 0x5B51, 0x7A74, 0x8840, 0x9801, 0x5ACC, 0x4FE0, /* 0xE0 */
     0x5354, 0x593E, 0x5CFD, 0x633E, 0x6D79, 0x72F9, 0x8105, 0x8107, /* 0xF0 */
-    0x83A2, 0x92CF, 0x9830, 0x4EA8, 0x5144, 0x5211, 0x578B          /* 0xF0 */
+    0x83A2, 0x92CF, 0x9830, 0x4EA8, 0x5144, 0x5211, 0x578B			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_FB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5F62, 0x6CC2, 0x6ECE, 0x7005, 0x7050, 0x70AF, 0x7192, /* 0xA0 */
     0x73E9, 0x7469, 0x834A, 0x87A2, 0x8861, 0x9008, 0x90A2, 0x93A3, /* 0xA0 */
     0x99A8, 0x516E, 0x5F57, 0x60E0, 0x6167, 0x66B3, 0x8559, 0x8E4A, /* 0xB0 */
@@ -3279,15 +3279,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_FB[] =
     0x93AC, 0x9800, 0x9865, 0x60D1, 0x6216, 0x9177, 0x5A5A, 0x660F, /* 0xE0 */
     0x6DF7, 0x6E3E, 0x743F, 0x9B42, 0x5FFD, 0x60DA, 0x7B0F, 0x54C4, /* 0xE0 */
     0x5F18, 0x6C5E, 0x6CD3, 0x6D2A, 0x70D8, 0x7D05, 0x8679, 0x8A0C, /* 0xF0 */
-    0x9D3B, 0x5316, 0x548C, 0x5B05, 0x6A3A, 0x706B, 0x7575          /* 0xF0 */
+    0x9D3B, 0x5316, 0x548C, 0x5B05, 0x6A3A, 0x706B, 0x7575			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_FC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x798D, 0x79BE, 0x82B1, 0x83EF, 0x8A71, 0x8B41, 0x8CA8, /* 0xA0 */
     0x9774, 0xFA0B, 0x64F4, 0x652B, 0x78BA, 0x78BB, 0x7A6B, 0x4E38, /* 0xA0 */
     0x559A, 0x5950, 0x5BA6, 0x5E7B, 0x60A3, 0x63DB, 0x6B61, 0x6665, /* 0xB0 */
@@ -3299,15 +3299,15 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_FC[] =
     0x5F8A, 0x6062, 0x6094, 0x61F7, 0x6666, 0x6703, 0x6A9C, 0x6DEE, /* 0xE0 */
     0x6FAE, 0x7070, 0x736A, 0x7E6A, 0x81BE, 0x8334, 0x86D4, 0x8AA8, /* 0xE0 */
     0x8CC4, 0x5283, 0x7372, 0x5B96, 0x6A6B, 0x9404, 0x54EE, 0x5686, /* 0xF0 */
-    0x5B5D, 0x6548, 0x6585, 0x66C9, 0x689F, 0x6D8D, 0x6DC6          /* 0xF0 */
+    0x5B5D, 0x6548, 0x6585, 0x66C9, 0x689F, 0x6D8D, 0x6DC6			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_KSC5601_FD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x723B, 0x80B4, 0x9175, 0x9A4D, 0x4FAF, 0x5019, 0x539A, /* 0xA0 */
     0x540E, 0x543C, 0x5589, 0x55C5, 0x5E3F, 0x5F8C, 0x673D, 0x7166, /* 0xA0 */
     0x73DD, 0x9005, 0x52DB, 0x52F3, 0x5864, 0x58CE, 0x7104, 0x718F, /* 0xB0 */
@@ -3319,5 +3319,5 @@ static sal_uInt16 const aImplDBCSToUniTab_KSC5601_FD[] =
     0x7D07, 0x8A16, 0x6B20, 0x6B3D, 0x6B46, 0x5438, 0x6070, 0x6D3D, /* 0xE0 */
     0x7FD5, 0x8208, 0x50D6, 0x51DE, 0x559C, 0x566B, 0x56CD, 0x59EC, /* 0xE0 */
     0x5B09, 0x5E0C, 0x6199, 0x6198, 0x6231, 0x665E, 0x66E6, 0x7199, /* 0xF0 */
-    0x71B9, 0x71BA, 0x72A7, 0x79A7, 0x7A00, 0x7FB2, 0x8A70          /* 0xF0 */
+    0x71B9, 0x71BA, 0x72A7, 0x79A7, 0x7A00, 0x7FB2, 0x8A70			/* 0xF0 */
 };
diff --git a/sal/textenc/tcvtkr2.tab b/sal/textenc/tcvtkr2.tab
index 4022bef83283..6aeaf4ecfd5b 100644
--- a/sal/textenc/tcvtkr2.tab
+++ b/sal/textenc/tcvtkr2.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,8 +35,8 @@
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_00[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, /* 0x00 */
     0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, /* 0x00 */
     0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, /* 0x10 */
@@ -53,79 +53,79 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_00[] =
     0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, /* 0x60 */
     0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, /* 0x70 */
     0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xA2AE,      0,      0, 0xA2B4,      0,      0, 0xA1D7, /* 0xA0 */
-    0xA1A7,      0, 0xA8A3,      0,      0, 0xA1A9, 0xA2E7,      0, /* 0xA0 */
-    0xA1C6, 0xA1BE, 0xA9F7, 0xA9F8, 0xA2A5,      0, 0xA2D2, 0xA1A4, /* 0xB0 */
-    0xA2AC, 0xA9F6, 0xA8AC,      0, 0xA8F9, 0xA8F6, 0xA8FA, 0xA2AF, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xA8A1,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xA8A2,      0,      0,      0,      0,      0,      0, 0xA1BF, /* 0xD0 */
-    0xA8AA,      0,      0,      0,      0,      0, 0xA8AD, 0xA9AC, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xA9A1,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xA9A3,      0,      0,      0,      0,      0,      0, 0xA1C0, /* 0xF0 */
-    0xA9AA,      0,      0,      0,      0,      0, 0xA9AD          /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xA2AE, 	 0, 	 0, 0xA2B4, 	 0, 	 0, 0xA1D7, /* 0xA0 */
+    0xA1A7, 	 0, 0xA8A3, 	 0, 	 0, 0xA1A9, 0xA2E7, 	 0, /* 0xA0 */
+    0xA1C6, 0xA1BE, 0xA9F7, 0xA9F8, 0xA2A5, 	 0, 0xA2D2, 0xA1A4, /* 0xB0 */
+    0xA2AC, 0xA9F6, 0xA8AC, 	 0, 0xA8F9, 0xA8F6, 0xA8FA, 0xA2AF, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA8A1, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xA8A2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1BF, /* 0xD0 */
+    0xA8AA, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA8AD, 0xA9AC, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA9A1, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xA9A3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1C0, /* 0xF0 */
+    0xA9AA, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA9AD			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_01[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xA9A2,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xA8A4, 0xA9A4, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xA9A5, 0xA8A6, 0xA9A6,      0,      0,      0,      0, /* 0x30 */
-    0xA9A7,      0,      0,      0,      0,      0,      0, 0xA8A8, /* 0x30 */
-    0xA9A8, 0xA8A9, 0xA9A9,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xA9B0, 0xA8AF, 0xA9AF,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xA8AB, 0xA9AB,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xA8AE, 0xA9AE  /* 0x60 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xA9A2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA8A4, 0xA9A4, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xA9A5, 0xA8A6, 0xA9A6, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xA9A7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA8A8, /* 0x30 */
+    0xA9A8, 0xA8A9, 0xA9A9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xA9B0, 0xA8AF, 0xA9AF, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xA8AB, 0xA9AB, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA8AE, 0xA9AE	/* 0x60 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_02[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xA2A7, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xA2B0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xA2A8, 0xA2AB, 0xA2AA, 0xA2AD,      0, 0xA2A9                  /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xA2B0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xA2A8, 0xA2AB, 0xA2AA, 0xA2AD, 	 0, 0xA2A9					/* 0xD0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_03[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xA5C1, 0xA5C2, 0xA5C3, 0xA5C4, 0xA5C5, 0xA5C6, 0xA5C7, /* 0x90 */
     0xA5C8, 0xA5C9, 0xA5CA, 0xA5CB, 0xA5CC, 0xA5CD, 0xA5CE, 0xA5CF, /* 0x90 */
-    0xA5D0, 0xA5D1,      0, 0xA5D2, 0xA5D3, 0xA5D4, 0xA5D5, 0xA5D6, /* 0xA0 */
-    0xA5D7, 0xA5D8,      0,      0,      0,      0,      0,      0, /* 0xA0 */
+    0xA5D0, 0xA5D1, 	 0, 0xA5D2, 0xA5D3, 0xA5D4, 0xA5D5, 0xA5D6, /* 0xA0 */
+    0xA5D7, 0xA5D8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
          0, 0xA5E1, 0xA5E2, 0xA5E3, 0xA5E4, 0xA5E5, 0xA5E6, 0xA5E7, /* 0xB0 */
     0xA5E8, 0xA5E9, 0xA5EA, 0xA5EB, 0xA5EC, 0xA5ED, 0xA5EE, 0xA5EF, /* 0xB0 */
-    0xA5F0, 0xA5F1,      0, 0xA5F2, 0xA5F3, 0xA5F4, 0xA5F5, 0xA5F6, /* 0xC0 */
-    0xA5F7, 0xA5F8                                                  /* 0xC0 */
+    0xA5F0, 0xA5F1, 	 0, 0xA5F2, 0xA5F3, 0xA5F4, 0xA5F5, 0xA5F6, /* 0xC0 */
+    0xA5F7, 0xA5F8													/* 0xC0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_04[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xACA7,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xACA7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
     0xACA1, 0xACA2, 0xACA3, 0xACA4, 0xACA5, 0xACA6, 0xACA8, 0xACA9, /* 0x10 */
     0xACAA, 0xACAB, 0xACAC, 0xACAD, 0xACAE, 0xACAF, 0xACB0, 0xACB1, /* 0x10 */
     0xACB2, 0xACB3, 0xACB4, 0xACB5, 0xACB6, 0xACB7, 0xACB8, 0xACB9, /* 0x20 */
@@ -134,144 +134,144 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_04[] =
     0xACDA, 0xACDB, 0xACDC, 0xACDD, 0xACDE, 0xACDF, 0xACE0, 0xACE1, /* 0x30 */
     0xACE2, 0xACE3, 0xACE4, 0xACE5, 0xACE6, 0xACE7, 0xACE8, 0xACE9, /* 0x40 */
     0xACEA, 0xACEB, 0xACEC, 0xACED, 0xACEE, 0xACEF, 0xACF0, 0xACF1, /* 0x40 */
-         0, 0xACD7                                                  /* 0x50 */
+         0, 0xACD7													/* 0x50 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_20[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xA1AA,      0,      0, /* 0x10 */
-    0xA1AE, 0xA1AF,      0,      0, 0xA1B0, 0xA1B1,      0,      0, /* 0x10 */
-    0xA2D3, 0xA2D4,      0,      0,      0, 0xA1A5, 0xA1A6,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xA2B6,      0, 0xA1C7, 0xA1C8,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xA1D8,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xA9F9,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xA9FA, /* 0x70 */
-         0, 0xA9FB, 0xA9FC, 0xA9FD, 0xA9FE,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xA2E6                          /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xA1AA, 	 0, 	 0, /* 0x10 */
+    0xA1AE, 0xA1AF, 	 0, 	 0, 0xA1B0, 0xA1B1, 	 0, 	 0, /* 0x10 */
+    0xA2D3, 0xA2D4, 	 0, 	 0, 	 0, 0xA1A5, 0xA1A6, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xA2B6, 	 0, 0xA1C7, 0xA1C8, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xA1D8, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xA9F9, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA9FA, /* 0x70 */
+         0, 0xA9FB, 0xA9FC, 0xA9FD, 0xA9FE, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xA2E6							/* 0xA0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_21[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xA1C9,      0,      0,      0,      0, /* 0x00 */
-         0, 0xA2B5,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0xA7A4,      0,      0, 0xA2E0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xA2E5, 0xA2E2,      0,      0,      0, 0xA7D9,      0, /* 0x20 */
-         0,      0,      0, 0xA1CA,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xA8F7, 0xA8F8,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xA8FB, 0xA8FC, 0xA8FD, 0xA8FE,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xA1C9, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xA2B5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xA7A4, 	 0, 	 0, 0xA2E0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xA2E5, 0xA2E2, 	 0, 	 0, 	 0, 0xA7D9, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xA1CA, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xA8F7, 0xA8F8, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xA8FB, 0xA8FC, 0xA8FD, 0xA8FE, 	 0, /* 0x50 */
     0xA5B0, 0xA5B1, 0xA5B2, 0xA5B3, 0xA5B4, 0xA5B5, 0xA5B6, 0xA5B7, /* 0x60 */
-    0xA5B8, 0xA5B9,      0,      0,      0,      0,      0,      0, /* 0x60 */
+    0xA5B8, 0xA5B9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
     0xA5A1, 0xA5A2, 0xA5A3, 0xA5A4, 0xA5A5, 0xA5A6, 0xA5A7, 0xA5A8, /* 0x70 */
-    0xA5A9, 0xA5AA,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0xA5A9, 0xA5AA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
     0xA1E7, 0xA1E8, 0xA1E6, 0xA1E9, 0xA1EA, 0xA2D5, 0xA2D8, 0xA2D6, /* 0x90 */
-    0xA2D9, 0xA2D7,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xA2A1,      0, 0xA2A2                          /* 0xD0 */
+    0xA2D9, 0xA2D7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xA2A1, 	 0, 0xA2A2							/* 0xD0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_22[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xA2A3,      0, 0xA1D3, 0xA2A4,      0,      0,      0, 0xA1D4, /* 0x00 */
-    0xA1F4,      0,      0, 0xA1F5,      0,      0,      0, 0xA2B3, /* 0x00 */
-         0, 0xA2B2,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0xA1EE,      0,      0, 0xA1F0, 0xA1C4,      0, /* 0x10 */
-    0xA1D0,      0,      0,      0,      0, 0xA1AB,      0, 0xA1FC, /* 0x20 */
-    0xA1FD, 0xA1FB, 0xA1FA, 0xA1F2, 0xA1F3,      0, 0xA2B1,      0, /* 0x20 */
-         0,      0,      0,      0, 0xA1C5, 0xA1F1,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xA1AD, 0xA1EF,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xA1D6,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xA1C1, 0xA1D5,      0,      0, 0xA1C2, 0xA1C3,      0,      0, /* 0x60 */
-         0,      0, 0xA1EC, 0xA1ED,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xA1F8, 0xA1F9,      0,      0, 0xA1F6, 0xA1F7, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xA2C1,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xA1D1                  /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xA2A3, 	 0, 0xA1D3, 0xA2A4, 	 0, 	 0, 	 0, 0xA1D4, /* 0x00 */
+    0xA1F4, 	 0, 	 0, 0xA1F5, 	 0, 	 0, 	 0, 0xA2B3, /* 0x00 */
+         0, 0xA2B2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xA1EE, 	 0, 	 0, 0xA1F0, 0xA1C4, 	 0, /* 0x10 */
+    0xA1D0, 	 0, 	 0, 	 0, 	 0, 0xA1AB, 	 0, 0xA1FC, /* 0x20 */
+    0xA1FD, 0xA1FB, 0xA1FA, 0xA1F2, 0xA1F3, 	 0, 0xA2B1, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xA1C5, 0xA1F1, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xA1AD, 0xA1EF, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xA1D6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xA1C1, 0xA1D5, 	 0, 	 0, 0xA1C2, 0xA1C3, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xA1EC, 0xA1ED, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xA1F8, 0xA1F9, 	 0, 	 0, 0xA1F6, 0xA1F7, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xA2C1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xA1D1					/* 0xA0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_23[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xA1D2                                          /* 0x10 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xA1D2											/* 0x10 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_24[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xA8E7, 0xA8E8, 0xA8E9, 0xA8EA, 0xA8EB, 0xA8EC, 0xA8ED, 0xA8EE, /* 0x60 */
-    0xA8EF, 0xA8F0, 0xA8F1, 0xA8F2, 0xA8F3, 0xA8F4, 0xA8F5,      0, /* 0x60 */
-         0,      0,      0,      0, 0xA9E7, 0xA9E8, 0xA9E9, 0xA9EA, /* 0x70 */
+    0xA8EF, 0xA8F0, 0xA8F1, 0xA8F2, 0xA8F3, 0xA8F4, 0xA8F5, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xA9E7, 0xA9E8, 0xA9E9, 0xA9EA, /* 0x70 */
     0xA9EB, 0xA9EC, 0xA9ED, 0xA9EE, 0xA9EF, 0xA9F0, 0xA9F1, 0xA9F2, /* 0x70 */
-    0xA9F3, 0xA9F4, 0xA9F5,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xA9CD, 0xA9CE, 0xA9CF, 0xA9D0, /* 0x90 */
+    0xA9F3, 0xA9F4, 0xA9F5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xA9CD, 0xA9CE, 0xA9CF, 0xA9D0, /* 0x90 */
     0xA9D1, 0xA9D2, 0xA9D3, 0xA9D4, 0xA9D5, 0xA9D6, 0xA9D7, 0xA9D8, /* 0xA0 */
     0xA9D9, 0xA9DA, 0xA9DB, 0xA9DC, 0xA9DD, 0xA9DE, 0xA9DF, 0xA9E0, /* 0xA0 */
-    0xA9E1, 0xA9E2, 0xA9E3, 0xA9E4, 0xA9E5, 0xA9E6,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
+    0xA9E1, 0xA9E2, 0xA9E3, 0xA9E4, 0xA9E5, 0xA9E6, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
     0xA8CD, 0xA8CE, 0xA8CF, 0xA8D0, 0xA8D1, 0xA8D2, 0xA8D3, 0xA8D4, /* 0xD0 */
     0xA8D5, 0xA8D6, 0xA8D7, 0xA8D8, 0xA8D9, 0xA8DA, 0xA8DB, 0xA8DC, /* 0xD0 */
     0xA8DD, 0xA8DE, 0xA8DF, 0xA8E0, 0xA8E1, 0xA8E2, 0xA8E3, 0xA8E4, /* 0xE0 */
-    0xA8E5, 0xA8E6                                                  /* 0xE0 */
+    0xA8E5, 0xA8E6													/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_25[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xA6A1, 0xA6AC, 0xA6A2, 0xA6AD,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0xA6A3, 0xA6C8, 0xA6C7, 0xA6AE, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xA6A1, 0xA6AC, 0xA6A2, 0xA6AD, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xA6A3, 0xA6C8, 0xA6C7, 0xA6AE, /* 0x00 */
     0xA6A4, 0xA6C2, 0xA6C1, 0xA6AF, 0xA6A6, 0xA6C6, 0xA6C5, 0xA6B1, /* 0x10 */
     0xA6A5, 0xA6C4, 0xA6C3, 0xA6B0, 0xA6A7, 0xA6BC, 0xA6C9, 0xA6CA, /* 0x10 */
     0xA6B7, 0xA6CB, 0xA6CC, 0xA6B2, 0xA6A9, 0xA6BE, 0xA6CD, 0xA6CE, /* 0x20 */
@@ -279,62 +279,62 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_25[] =
     0xA6BD, 0xA6D3, 0xA6D4, 0xA6B3, 0xA6AA, 0xA6D5, 0xA6D6, 0xA6BA, /* 0x30 */
     0xA6BF, 0xA6D7, 0xA6D8, 0xA6B5, 0xA6AB, 0xA6D9, 0xA6DA, 0xA6BB, /* 0x30 */
     0xA6DB, 0xA6DC, 0xA6C0, 0xA6DD, 0xA6DE, 0xA6DF, 0xA6E0, 0xA6E1, /* 0x40 */
-    0xA6E2, 0xA6E3, 0xA6E4, 0xA6B6,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xA2C6,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xA1E1, 0xA1E0,      0, 0xA2C3, 0xA2C7, 0xA2C8, 0xA2CB, 0xA2CA, /* 0xA0 */
-    0xA2C9, 0xA2CC,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xA1E3, 0xA1E2,      0,      0, 0xA2BA, 0xA2B9, /* 0xB0 */
-         0,      0,      0,      0, 0xA1E5, 0xA1E4,      0,      0, /* 0xB0 */
-    0xA2B8, 0xA2B7,      0,      0,      0,      0, 0xA1DF, 0xA1DE, /* 0xC0 */
-    0xA2C2,      0,      0, 0xA1DB,      0,      0, 0xA1DD, 0xA1DC, /* 0xC0 */
-    0xA2C4, 0xA2C5                                                  /* 0xD0 */
+    0xA6E2, 0xA6E3, 0xA6E4, 0xA6B6, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xA2C6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xA1E1, 0xA1E0, 	 0, 0xA2C3, 0xA2C7, 0xA2C8, 0xA2CB, 0xA2CA, /* 0xA0 */
+    0xA2C9, 0xA2CC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xA1E3, 0xA1E2, 	 0, 	 0, 0xA2BA, 0xA2B9, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xA1E5, 0xA1E4, 	 0, 	 0, /* 0xB0 */
+    0xA2B8, 0xA2B7, 	 0, 	 0, 	 0, 	 0, 0xA1DF, 0xA1DE, /* 0xC0 */
+    0xA2C2, 	 0, 	 0, 0xA1DB, 	 0, 	 0, 0xA1DD, 0xA1DC, /* 0xC0 */
+    0xA2C4, 0xA2C5													/* 0xD0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_26[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xA1DA, 0xA1D9,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xA2CF, 0xA2CE, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0xA2D0,      0, 0xA2D1,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xA1CF,      0, 0xA1CE,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xA2BC, 0xA2BD,      0, 0xA2C0, 0xA2BB, 0xA2BE,      0, 0xA2BF, /* 0x60 */
-    0xA2CD, 0xA2DB, 0xA2DC,      0, 0xA2DD, 0xA2DA                  /* 0x60 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xA1DA, 0xA1D9, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA2CF, 0xA2CE, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xA2D0, 	 0, 0xA2D1, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xA1CF, 	 0, 0xA1CE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xA2BC, 0xA2BD, 	 0, 0xA2C0, 0xA2BB, 0xA2BE, 	 0, 0xA2BF, /* 0x60 */
+    0xA2CD, 0xA2DB, 0xA2DC, 	 0, 0xA2DD, 0xA2DA					/* 0x60 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_30[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xA1A1, 0xA1A2, 0xA1A3, 0xA1A8,      0,      0,      0,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xA1A1, 0xA1A2, 0xA1A3, 0xA1A8, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
     0xA1B4, 0xA1B5, 0xA1B6, 0xA1B7, 0xA1B8, 0xA1B9, 0xA1BA, 0xA1BB, /* 0x00 */
-    0xA1BC, 0xA1BD,      0, 0xA1EB, 0xA1B2, 0xA1B3,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
+    0xA1BC, 0xA1BD, 	 0, 0xA1EB, 0xA1B2, 0xA1B3, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
          0, 0xAAA1, 0xAAA2, 0xAAA3, 0xAAA4, 0xAAA5, 0xAAA6, 0xAAA7, /* 0x40 */
     0xAAA8, 0xAAA9, 0xAAAA, 0xAAAB, 0xAAAC, 0xAAAD, 0xAAAE, 0xAAAF, /* 0x40 */
     0xAAB0, 0xAAB1, 0xAAB2, 0xAAB3, 0xAAB4, 0xAAB5, 0xAAB6, 0xAAB7, /* 0x50 */
@@ -345,8 +345,8 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_30[] =
     0xAAD8, 0xAAD9, 0xAADA, 0xAADB, 0xAADC, 0xAADD, 0xAADE, 0xAADF, /* 0x70 */
     0xAAE0, 0xAAE1, 0xAAE2, 0xAAE3, 0xAAE4, 0xAAE5, 0xAAE6, 0xAAE7, /* 0x80 */
     0xAAE8, 0xAAE9, 0xAAEA, 0xAAEB, 0xAAEC, 0xAAED, 0xAAEE, 0xAAEF, /* 0x80 */
-    0xAAF0, 0xAAF1, 0xAAF2, 0xAAF3,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0xAAF0, 0xAAF1, 0xAAF2, 0xAAF3, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0xABA1, 0xABA2, 0xABA3, 0xABA4, 0xABA5, 0xABA6, 0xABA7, /* 0xA0 */
     0xABA8, 0xABA9, 0xABAA, 0xABAB, 0xABAC, 0xABAD, 0xABAE, 0xABAF, /* 0xA0 */
     0xABB0, 0xABB1, 0xABB2, 0xABB3, 0xABB4, 0xABB5, 0xABB6, 0xABB7, /* 0xB0 */
@@ -357,15 +357,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_30[] =
     0xABD8, 0xABD9, 0xABDA, 0xABDB, 0xABDC, 0xABDD, 0xABDE, 0xABDF, /* 0xD0 */
     0xABE0, 0xABE1, 0xABE2, 0xABE3, 0xABE4, 0xABE5, 0xABE6, 0xABE7, /* 0xE0 */
     0xABE8, 0xABE9, 0xABEA, 0xABEB, 0xABEC, 0xABED, 0xABEE, 0xABEF, /* 0xE0 */
-    0xABF0, 0xABF1, 0xABF2, 0xABF3, 0xABF4, 0xABF5, 0xABF6          /* 0xF0 */
+    0xABF0, 0xABF1, 0xABF2, 0xABF3, 0xABF4, 0xABF5, 0xABF6			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_31[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xA4A1, 0xA4A2, 0xA4A3, 0xA4A4, 0xA4A5, 0xA4A6, 0xA4A7, /* 0x30 */
     0xA4A8, 0xA4A9, 0xA4AA, 0xA4AB, 0xA4AC, 0xA4AD, 0xA4AE, 0xA4AF, /* 0x30 */
     0xA4B0, 0xA4B1, 0xA4B2, 0xA4B3, 0xA4B4, 0xA4B5, 0xA4B6, 0xA4B7, /* 0x40 */
@@ -377,40 +377,40 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_31[] =
     0xA4E0, 0xA4E1, 0xA4E2, 0xA4E3, 0xA4E4, 0xA4E5, 0xA4E6, 0xA4E7, /* 0x70 */
     0xA4E8, 0xA4E9, 0xA4EA, 0xA4EB, 0xA4EC, 0xA4ED, 0xA4EE, 0xA4EF, /* 0x70 */
     0xA4F0, 0xA4F1, 0xA4F2, 0xA4F3, 0xA4F4, 0xA4F5, 0xA4F6, 0xA4F7, /* 0x80 */
-    0xA4F8, 0xA4F9, 0xA4FA, 0xA4FB, 0xA4FC, 0xA4FD, 0xA4FE          /* 0x80 */
+    0xA4F8, 0xA4F9, 0xA4FA, 0xA4FB, 0xA4FC, 0xA4FD, 0xA4FE			/* 0x80 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_32[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xA9B1, 0xA9B2, 0xA9B3, 0xA9B4, 0xA9B5, 0xA9B6, 0xA9B7, 0xA9B8, /* 0x00 */
     0xA9B9, 0xA9BA, 0xA9BB, 0xA9BC, 0xA9BD, 0xA9BE, 0xA9BF, 0xA9C0, /* 0x00 */
     0xA9C1, 0xA9C2, 0xA9C3, 0xA9C4, 0xA9C5, 0xA9C6, 0xA9C7, 0xA9C8, /* 0x10 */
-    0xA9C9, 0xA9CA, 0xA9CB, 0xA9CC, 0xA2DF,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+    0xA9C9, 0xA9CA, 0xA9CB, 0xA9CC, 0xA2DF, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
     0xA8B1, 0xA8B2, 0xA8B3, 0xA8B4, 0xA8B5, 0xA8B6, 0xA8B7, 0xA8B8, /* 0x60 */
     0xA8B9, 0xA8BA, 0xA8BB, 0xA8BC, 0xA8BD, 0xA8BE, 0xA8BF, 0xA8C0, /* 0x60 */
     0xA8C1, 0xA8C2, 0xA8C3, 0xA8C4, 0xA8C5, 0xA8C6, 0xA8C7, 0xA8C8, /* 0x70 */
-    0xA8C9, 0xA8CA, 0xA8CB, 0xA8CC,      0,      0,      0, 0xA2DE  /* 0x70 */
+    0xA8C9, 0xA8CA, 0xA8CB, 0xA8CC, 	 0, 	 0, 	 0, 0xA2DE	/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_33[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xA7C9, 0xA7CA, 0xA7CB, 0xA7CC, 0xA7CD,      0,      0,      0, /* 0x80 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xA7C9, 0xA7CA, 0xA7CB, 0xA7CC, 0xA7CD, 	 0, 	 0, 	 0, /* 0x80 */
     0xA7BA, 0xA7BB, 0xA7DC, 0xA7DD, 0xA7DE, 0xA7B6, 0xA7B7, 0xA7B8, /* 0x80 */
     0xA7D4, 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, 0xA7A1, 0xA7A2, 0xA7A3, /* 0x90 */
     0xA7A5, 0xA7AB, 0xA7AC, 0xA7AD, 0xA7AE, 0xA7AF, 0xA7B0, 0xA7B1, /* 0x90 */
@@ -419,3170 +419,3170 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_33[] =
     0xA7BF, 0xA7C0, 0xA7C1, 0xA7C2, 0xA7C3, 0xA7C4, 0xA7C5, 0xA7C6, /* 0xB0 */
     0xA7C7, 0xA7C8, 0xA7CE, 0xA7CF, 0xA7D0, 0xA7D1, 0xA7D2, 0xA7D3, /* 0xB0 */
     0xA7DA, 0xA7DB, 0xA2E3, 0xA7EC, 0xA7A6, 0xA7E0, 0xA7EF, 0xA2E1, /* 0xC0 */
-    0xA7BC, 0xA7ED, 0xA7B5,      0,      0,      0,      0, 0xA7B9, /* 0xC0 */
-    0xA7EA,      0,      0, 0xA7EB,      0,      0, 0xA7DF,      0, /* 0xD0 */
-    0xA2E4,      0,      0, 0xA7E4, 0xA7EE, 0xA7E9                  /* 0xD0 */
+    0xA7BC, 0xA7ED, 0xA7B5, 	 0, 	 0, 	 0, 	 0, 0xA7B9, /* 0xC0 */
+    0xA7EA, 	 0, 	 0, 0xA7EB, 	 0, 	 0, 0xA7DF, 	 0, /* 0xD0 */
+    0xA2E4, 	 0, 	 0, 0xA7E4, 0xA7EE, 0xA7E9					/* 0xD0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_4E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xECE9, 0xEFCB,      0, 0xF6D2,      0,      0,      0, 0xD8B2, /* 0x00 */
-    0xEDDB, 0xDFB2, 0xDFBE, 0xF9BB,      0, 0xDCF4,      0,      0, /* 0x00 */
-         0, 0xF5E4,      0,      0, 0xF3A6, 0xDDE0, 0xE1A6,      0, /* 0x10 */
-    0xCEF8, 0xDCB0,      0,      0,      0,      0, 0xE3AA,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xF1E9,      0,      0, /* 0x20 */
-         0,      0, 0xCDFA,      0,      0,      0,      0,      0, /* 0x30 */
-    0xFCAF, 0xD3A1,      0, 0xF1AB,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xE7D1, 0xD2AC,      0, 0xCEF9,      0,      0, /* 0x40 */
-         0,      0,      0, 0xF1FD,      0, 0xDEBF, 0xFBBA, 0xF9B9, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xCED2,      0, /* 0x50 */
-    0xE3AB, 0xEBE0,      0,      0,      0, 0xCEFA, 0xCBF7, 0xE5A5, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xCAE1,      0, 0xD4CC,      0,      0, /* 0x60 */
-         0,      0,      0, 0xEAE1,      0,      0, 0xDCE3, 0xDFAD, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xCBEB,      0, /* 0x70 */
-         0,      0, 0xD5AF,      0,      0,      0, 0xD6F5,      0, /* 0x80 */
-    0xE5F8,      0,      0, 0xDEC0, 0xECA3,      0, 0xE9CD,      0, /* 0x80 */
-    0xEAA7, 0xE9F6, 0xFBBB,      0, 0xE7E9, 0xEFCC,      0,      0, /* 0x90 */
-    0xD0E6,      0,      0, 0xDEC1,      0,      0, 0xE4AC,      0, /* 0x90 */
-         0, 0xD8CC, 0xF9F1,      0, 0xCEDF, 0xFAA4, 0xE6B2,      0, /* 0xA0 */
-    0xFAFB,      0,      0, 0xFABD, 0xCCC8, 0xEFCD, 0xD5D5,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xD3A2,      0, /* 0xB0 */
-         0,      0, 0xECD1,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xE4A7, 0xECD2,      0,      0, 0xF6B1,      0,      0, 0xCEFB, /* 0xC0 */
-         0,      0, 0xD0D1, 0xCBBF,      0, 0xEDA4,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xEDA8, 0xDEC2, 0xF6E2, 0xEDDC, /* 0xD0 */
-    0xDCF5, 0xE0B9,      0,      0,      0, 0xD4CE,      0, 0xF4B5, /* 0xD0 */
-         0,      0,      0, 0xD3DB, 0xD6B5, 0xECA4,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xE4E6,      0, 0xF1EA,      0,      0,      0, 0xCBEC, 0xCBC0, /* 0xF0 */
-         0,      0,      0, 0xECF2                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xECE9, 0xEFCB, 	 0, 0xF6D2, 	 0, 	 0, 	 0, 0xD8B2, /* 0x00 */
+    0xEDDB, 0xDFB2, 0xDFBE, 0xF9BB, 	 0, 0xDCF4, 	 0, 	 0, /* 0x00 */
+         0, 0xF5E4, 	 0, 	 0, 0xF3A6, 0xDDE0, 0xE1A6, 	 0, /* 0x10 */
+    0xCEF8, 0xDCB0, 	 0, 	 0, 	 0, 	 0, 0xE3AA, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF1E9, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xCDFA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xFCAF, 0xD3A1, 	 0, 0xF1AB, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xE7D1, 0xD2AC, 	 0, 0xCEF9, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xF1FD, 	 0, 0xDEBF, 0xFBBA, 0xF9B9, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCED2, 	 0, /* 0x50 */
+    0xE3AB, 0xEBE0, 	 0, 	 0, 	 0, 0xCEFA, 0xCBF7, 0xE5A5, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xCAE1, 	 0, 0xD4CC, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xEAE1, 	 0, 	 0, 0xDCE3, 0xDFAD, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBEB, 	 0, /* 0x70 */
+         0, 	 0, 0xD5AF, 	 0, 	 0, 	 0, 0xD6F5, 	 0, /* 0x80 */
+    0xE5F8, 	 0, 	 0, 0xDEC0, 0xECA3, 	 0, 0xE9CD, 	 0, /* 0x80 */
+    0xEAA7, 0xE9F6, 0xFBBB, 	 0, 0xE7E9, 0xEFCC, 	 0, 	 0, /* 0x90 */
+    0xD0E6, 	 0, 	 0, 0xDEC1, 	 0, 	 0, 0xE4AC, 	 0, /* 0x90 */
+         0, 0xD8CC, 0xF9F1, 	 0, 0xCEDF, 0xFAA4, 0xE6B2, 	 0, /* 0xA0 */
+    0xFAFB, 	 0, 	 0, 0xFABD, 0xCCC8, 0xEFCD, 0xD5D5, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD3A2, 	 0, /* 0xB0 */
+         0, 	 0, 0xECD1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xE4A7, 0xECD2, 	 0, 	 0, 0xF6B1, 	 0, 	 0, 0xCEFB, /* 0xC0 */
+         0, 	 0, 0xD0D1, 0xCBBF, 	 0, 0xEDA4, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xEDA8, 0xDEC2, 0xF6E2, 0xEDDC, /* 0xD0 */
+    0xDCF5, 0xE0B9, 	 0, 	 0, 	 0, 0xD4CE, 	 0, 0xF4B5, /* 0xD0 */
+         0, 	 0, 	 0, 0xD3DB, 0xD6B5, 0xECA4, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE4E6, 	 0, 0xF1EA, 	 0, 	 0, 	 0, 0xCBEC, 0xCBC0, /* 0xF0 */
+         0, 	 0, 	 0, 0xECF2									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_4F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xD0EA,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xF9F2, 0xECA5, 0xD0DF,      0, 0xE7EA, 0xD0EB, 0xDCD1, /* 0x00 */
-    0xDBE9, 0xFDCC,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xDBD7, /* 0x20 */
-         0,      0,      0,      0, 0xDAE1,      0, 0xD6B6,      0, /* 0x30 */
-    0xE3DF,      0, 0xDEC3,      0, 0xDEC4, 0xCAA1,      0,      0, /* 0x30 */
-         0,      0,      0, 0xEEEC,      0,      0, 0xD3A3, 0xEEB7, /* 0x40 */
-    0xF8CF,      0,      0,      0,      0, 0xEAC8, 0xEEB8, 0xF1AC, /* 0x40 */
-    0xF1A5, 0xE9CE,      0,      0,      0, 0xF9BC,      0,      0, /* 0x50 */
-         0, 0xE5F9, 0xECEA, 0xDDD6, 0xEDC2,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xF8A5,      0,      0,      0,      0,      0, 0xE5BA, /* 0x60 */
-    0xDBD8,      0,      0, 0xCAA2,      0,      0, 0xD1CD,      0, /* 0x70 */
-         0,      0, 0xEEED,      0,      0,      0, 0xECEB, 0xDEC5, /* 0x70 */
-         0, 0xE3E0,      0, 0xCAC9, 0xF2E9,      0, 0xD5CE,      0, /* 0x80 */
-    0xF6B6,      0, 0xCEC2, 0xD6C7,      0, 0xE3B4,      0, 0xF1AD, /* 0x80 */
-         0, 0xEAE2,      0,      0,      0,      0, 0xD7C2,      0, /* 0x90 */
-    0xF3A7,      0,      0, 0xCDEA,      0, 0xEBEE,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xD9B2, 0xFDA5, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xF6D5, 0xD5E2,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xF8B5, /* 0xB0 */
-         0,      0, 0xCCF5, 0xF5B5, 0xE4AD,      0,      0,      0, /* 0xC0 */
-         0, 0xE7EB, 0xF1D5,      0,      0,      0, 0xF0BB,      0, /* 0xC0 */
-         0, 0xE9B5,      0, 0xCCC9, 0xFAD5,      0,      0, 0xE1D4, /* 0xD0 */
-         0,      0, 0xD7D6,      0,      0, 0xDCC1,      0, 0xDEC6, /* 0xD0 */
-    0xFAEF, 0xE3E1,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xE1F3, 0xDCF6, /* 0xE0 */
-         0, 0xCEFC,      0, 0xDBC4,      0, 0xF8F1,      0,      0, /* 0xF0 */
-    0xDCE4,      0, 0xE5EF                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xD0EA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xF9F2, 0xECA5, 0xD0DF, 	 0, 0xE7EA, 0xD0EB, 0xDCD1, /* 0x00 */
+    0xDBE9, 0xFDCC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDBD7, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xDAE1, 	 0, 0xD6B6, 	 0, /* 0x30 */
+    0xE3DF, 	 0, 0xDEC3, 	 0, 0xDEC4, 0xCAA1, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xEEEC, 	 0, 	 0, 0xD3A3, 0xEEB7, /* 0x40 */
+    0xF8CF, 	 0, 	 0, 	 0, 	 0, 0xEAC8, 0xEEB8, 0xF1AC, /* 0x40 */
+    0xF1A5, 0xE9CE, 	 0, 	 0, 	 0, 0xF9BC, 	 0, 	 0, /* 0x50 */
+         0, 0xE5F9, 0xECEA, 0xDDD6, 0xEDC2, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xF8A5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5BA, /* 0x60 */
+    0xDBD8, 	 0, 	 0, 0xCAA2, 	 0, 	 0, 0xD1CD, 	 0, /* 0x70 */
+         0, 	 0, 0xEEED, 	 0, 	 0, 	 0, 0xECEB, 0xDEC5, /* 0x70 */
+         0, 0xE3E0, 	 0, 0xCAC9, 0xF2E9, 	 0, 0xD5CE, 	 0, /* 0x80 */
+    0xF6B6, 	 0, 0xCEC2, 0xD6C7, 	 0, 0xE3B4, 	 0, 0xF1AD, /* 0x80 */
+         0, 0xEAE2, 	 0, 	 0, 	 0, 	 0, 0xD7C2, 	 0, /* 0x90 */
+    0xF3A7, 	 0, 	 0, 0xCDEA, 	 0, 0xEBEE, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD9B2, 0xFDA5, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF6D5, 0xD5E2, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF8B5, /* 0xB0 */
+         0, 	 0, 0xCCF5, 0xF5B5, 0xE4AD, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xE7EB, 0xF1D5, 	 0, 	 0, 	 0, 0xF0BB, 	 0, /* 0xC0 */
+         0, 0xE9B5, 	 0, 0xCCC9, 0xFAD5, 	 0, 	 0, 0xE1D4, /* 0xD0 */
+         0, 	 0, 0xD7D6, 	 0, 	 0, 0xDCC1, 	 0, 0xDEC6, /* 0xD0 */
+    0xFAEF, 0xE3E1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1F3, 0xDCF6, /* 0xE0 */
+         0, 0xCEFC, 	 0, 0xDBC4, 	 0, 0xF8F1, 	 0, 	 0, /* 0xF0 */
+    0xDCE4, 	 0, 0xE5EF											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_50[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xDCB1,      0,      0,      0, 0xD5D6,      0, /* 0x00 */
-         0, 0xF3DA,      0, 0xCBC1,      0, 0xDBC3,      0,      0, /* 0x00 */
-         0, 0xD9FA, 0xD3EE,      0,      0,      0, 0xFAB8,      0, /* 0x10 */
-         0, 0xFDA6, 0xEBEF,      0, 0xF4A6,      0, 0xCCCA, 0xF3A8, /* 0x10 */
-         0, 0xF3DB,      0, 0xDBA7, 0xF6B7,      0, 0xCFE6, 0xF0F2, /* 0x20 */
-    0xCBDA,      0, 0xE7D2, 0xD7C3, 0xF6F0, 0xE8DE,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xE5A6,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xE5E7,      0,      0,      0, 0xCAA3, /* 0x40 */
-    0xCCA7, 0xEAC9,      0,      0,      0,      0,      0, 0xF8B6, /* 0x40 */
-         0,      0,      0,      0,      0, 0xFAA5,      0,      0, /* 0x50 */
-         0,      0, 0xF1AE,      0, 0xEFCE,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xCBED,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xF6B0, 0xEFCF, 0xE9CF,      0, /* 0x70 */
-    0xF7DE,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xCED3,      0,      0,      0,      0, 0xDCF7,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xDBA8,      0,      0, /* 0x80 */
-         0, 0xCBF8,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xDFA1, 0xDDE1,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xF5CA, 0xE9B6,      0,      0, /* 0xA0 */
-         0,      0, 0xE7EC, 0xEEEE,      0, 0xF3F0,      0, 0xDFBF, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xCCCB,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xD0C1,      0,      0, /* 0xC0 */
-         0, 0xF4D2, 0xE0BA,      0,      0,      0,      0, 0xDFC0, /* 0xC0 */
-         0, 0xCEE0,      0,      0,      0, 0xDCD2, 0xFDEA,      0, /* 0xD0 */
-         0,      0, 0xD6F6,      0,      0,      0, 0xEACA,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xE8E9,      0, 0xE3AC, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xF3D0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xCAA4,      0, 0xDBF8,      0,      0,      0, 0xDEC7  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xDCB1, 	 0, 	 0, 	 0, 0xD5D6, 	 0, /* 0x00 */
+         0, 0xF3DA, 	 0, 0xCBC1, 	 0, 0xDBC3, 	 0, 	 0, /* 0x00 */
+         0, 0xD9FA, 0xD3EE, 	 0, 	 0, 	 0, 0xFAB8, 	 0, /* 0x10 */
+         0, 0xFDA6, 0xEBEF, 	 0, 0xF4A6, 	 0, 0xCCCA, 0xF3A8, /* 0x10 */
+         0, 0xF3DB, 	 0, 0xDBA7, 0xF6B7, 	 0, 0xCFE6, 0xF0F2, /* 0x20 */
+    0xCBDA, 	 0, 0xE7D2, 0xD7C3, 0xF6F0, 0xE8DE, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xE5A6, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xE5E7, 	 0, 	 0, 	 0, 0xCAA3, /* 0x40 */
+    0xCCA7, 0xEAC9, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF8B6, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xFAA5, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xF1AE, 	 0, 0xEFCE, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCBED, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xF6B0, 0xEFCF, 0xE9CF, 	 0, /* 0x70 */
+    0xF7DE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xCED3, 	 0, 	 0, 	 0, 	 0, 0xDCF7, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDBA8, 	 0, 	 0, /* 0x80 */
+         0, 0xCBF8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xDFA1, 0xDDE1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xF5CA, 0xE9B6, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xE7EC, 0xEEEE, 	 0, 0xF3F0, 	 0, 0xDFBF, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCCCB, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD0C1, 	 0, 	 0, /* 0xC0 */
+         0, 0xF4D2, 0xE0BA, 	 0, 	 0, 	 0, 	 0, 0xDFC0, /* 0xC0 */
+         0, 0xCEE0, 	 0, 	 0, 	 0, 0xDCD2, 0xFDEA, 	 0, /* 0xD0 */
+         0, 	 0, 0xD6F6, 	 0, 	 0, 	 0, 0xEACA, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE8E9, 	 0, 0xE3AC, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF3D0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xCAA4, 	 0, 0xDBF8, 	 0, 	 0, 	 0, 0xDEC7	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_51[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xEBF0, 0xF1D6,      0,      0, 0xE5E2,      0, 0xCCCC,      0, /* 0x00 */
-         0, 0xCBFB,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xEAE3,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xDFC1, /* 0x10 */
-         0, 0xD6ED,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xE9D0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xEEB9,      0,      0,      0,      0, 0xD5E3, /* 0x30 */
-         0,      0, 0xD1D3,      0, 0xE5F0,      0,      0,      0, /* 0x30 */
-    0xE8B4, 0xEBC3,      0, 0xEAAA, 0xFAFC, 0xF5F6, 0xF0BC, 0xFDD4, /* 0x40 */
-    0xE0BB, 0xCEC3,      0, 0xD0BA, 0xF7BA, 0xD8F3, 0xF7CD,      0, /* 0x40 */
-         0,      0, 0xE4AE,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xD4DF,      0,      0,      0, /* 0x50 */
-         0,      0, 0xD0E7,      0,      0, 0xECFD,      0, 0xD2AE, /* 0x60 */
-    0xEEEF, 0xD5D7, 0xEAE4, 0xF8A2, 0xCDEB, 0xD7BF, 0xFBB1,      0, /* 0x60 */
-         0, 0xCDEC,      0,      0,      0, 0xDCB2, 0xD0EC, 0xCEFD, /* 0x70 */
-    0xEEF0,      0,      0,      0, 0xCCC2,      0,      0,      0, /* 0x70 */
-    0xD0ED,      0,      0,      0,      0,      0, 0xE5F7,      0, /* 0x80 */
-         0,      0, 0xF3FC,      0,      0, 0xEEA2,      0,      0, /* 0x80 */
-         0,      0, 0xD9B3,      0,      0, 0xD8F4,      0, 0xE9B7, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xCEAE,      0,      0,      0,      0, 0xD9A2,      0,      0, /* 0xA0 */
-         0,      0, 0xD8F1,      0, 0xD4CF,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xE5A7, 0xD5D2, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xD6A9,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xF4A2,      0, 0xF1D7,      0, /* 0xC0 */
-         0, 0xD5D8,      0, 0xF0BD, 0xD7D0, 0xD4D0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xD7CF, 0xEBEA, 0xFDEB,      0, /* 0xD0 */
-         0, 0xDBED,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xFCC5, 0xCBC2,      0,      0,      0,      0, 0xFDD5,      0, /* 0xF0 */
-    0xF4C8, 0xE8EA, 0xF5F3,      0,      0, 0xF9DE                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xEBF0, 0xF1D6, 	 0, 	 0, 0xE5E2, 	 0, 0xCCCC, 	 0, /* 0x00 */
+         0, 0xCBFB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xEAE3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDFC1, /* 0x10 */
+         0, 0xD6ED, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xE9D0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xEEB9, 	 0, 	 0, 	 0, 	 0, 0xD5E3, /* 0x30 */
+         0, 	 0, 0xD1D3, 	 0, 0xE5F0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xE8B4, 0xEBC3, 	 0, 0xEAAA, 0xFAFC, 0xF5F6, 0xF0BC, 0xFDD4, /* 0x40 */
+    0xE0BB, 0xCEC3, 	 0, 0xD0BA, 0xF7BA, 0xD8F3, 0xF7CD, 	 0, /* 0x40 */
+         0, 	 0, 0xE4AE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xD4DF, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xD0E7, 	 0, 	 0, 0xECFD, 	 0, 0xD2AE, /* 0x60 */
+    0xEEEF, 0xD5D7, 0xEAE4, 0xF8A2, 0xCDEB, 0xD7BF, 0xFBB1, 	 0, /* 0x60 */
+         0, 0xCDEC, 	 0, 	 0, 	 0, 0xDCB2, 0xD0EC, 0xCEFD, /* 0x70 */
+    0xEEF0, 	 0, 	 0, 	 0, 0xCCC2, 	 0, 	 0, 	 0, /* 0x70 */
+    0xD0ED, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5F7, 	 0, /* 0x80 */
+         0, 	 0, 0xF3FC, 	 0, 	 0, 0xEEA2, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xD9B3, 	 0, 	 0, 0xD8F4, 	 0, 0xE9B7, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xCEAE, 	 0, 	 0, 	 0, 	 0, 0xD9A2, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xD8F1, 	 0, 0xD4CF, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5A7, 0xD5D2, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD6A9, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xF4A2, 	 0, 0xF1D7, 	 0, /* 0xC0 */
+         0, 0xD5D8, 	 0, 0xF0BD, 0xD7D0, 0xD4D0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xD7CF, 0xEBEA, 0xFDEB, 	 0, /* 0xD0 */
+         0, 0xDBED, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xFCC5, 0xCBC2, 	 0, 	 0, 	 0, 	 0, 0xFDD5, 	 0, /* 0xF0 */
+    0xF4C8, 0xE8EA, 0xF5F3, 	 0, 	 0, 0xF9DE					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_52[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD3EF,      0,      0, 0xECD3,      0,      0, 0xDDC2, 0xEFB7, /* 0x00 */
-    0xE7D4,      0, 0xCACA,      0,      0,      0, 0xD9FB,      0, /* 0x00 */
-         0, 0xFAFD,      0,      0,      0,      0,      0, 0xD6AA, /* 0x10 */
-         0,      0,      0,      0,      0, 0xF4F8,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0xF7F7, 0xDCAC,      0,      0, /* 0x20 */
-         0, 0xD7D7, 0xDFA2,      0,      0,      0, 0xCEBE,      0, /* 0x20 */
-    0xD3F0,      0,      0,      0,      0,      0, 0xF0A4, 0xE1EC, /* 0x30 */
-    0xCFE7, 0xF3CB, 0xEDA9, 0xCABE,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xF4EF,      0,      0,      0, 0xF6CE, /* 0x40 */
-         0,      0, 0xDEFB, 0xD0BB, 0xD5B7, 0xEEF1,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xF4A8,      0, 0xDCF8,      0, /* 0x50 */
-         0,      0,      0, 0xCBA7,      0, 0xDACE,      0,      0, /* 0x50 */
-         0, 0xE0E6,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xEDA5, 0xEEF2,      0,      0,      0,      0, 0xDCF9, /* 0x60 */
-         0,      0, 0xF9DC,      0,      0, 0xF3DC,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF8F2,      0, 0xF4F9, /* 0x70 */
-         0,      0,      0, 0xFCF1,      0,      0,      0, 0xD0BC, /* 0x80 */
-    0xDBF9, 0xD7B1,      0,      0,      0, 0xCBFC,      0,      0, /* 0x80 */
-         0, 0xF0A5, 0xCBFD,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xD5F4,      0,      0,      0, 0xCDED, /* 0x90 */
-    0xCAA5,      0,      0, 0xD6AB, 0xD0C2,      0,      0,      0, /* 0xA0 */
-         0, 0xF0BE, 0xD2BD, 0xCCA4,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xFAB6,      0, /* 0xB0 */
-         0, 0xCCCD,      0, 0xDAFA,      0, 0xF6CF,      0, 0xE9B8, /* 0xC0 */
-         0, 0xD8F5,      0,      0,      0, 0xCCCE,      0,      0, /* 0xC0 */
-         0,      0, 0xD7CD,      0,      0, 0xD4D1, 0xE9ED,      0, /* 0xD0 */
-    0xCAEB, 0xD9E2,      0, 0xFDB2,      0, 0xE3AD, 0xD6CC, 0xD9B4, /* 0xD0 */
-         0,      0, 0xE1A7, 0xEED3, 0xD0C3,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xFDB3,      0, 0xD5E4,      0,      0, /* 0xF0 */
-    0xCFE8,      0, 0xEDC3, 0xD0B2,      0,      0, 0xCEFE, 0xDAA8  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD3EF, 	 0, 	 0, 0xECD3, 	 0, 	 0, 0xDDC2, 0xEFB7, /* 0x00 */
+    0xE7D4, 	 0, 0xCACA, 	 0, 	 0, 	 0, 0xD9FB, 	 0, /* 0x00 */
+         0, 0xFAFD, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD6AA, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF4F8, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xF7F7, 0xDCAC, 	 0, 	 0, /* 0x20 */
+         0, 0xD7D7, 0xDFA2, 	 0, 	 0, 	 0, 0xCEBE, 	 0, /* 0x20 */
+    0xD3F0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF0A4, 0xE1EC, /* 0x30 */
+    0xCFE7, 0xF3CB, 0xEDA9, 0xCABE, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xF4EF, 	 0, 	 0, 	 0, 0xF6CE, /* 0x40 */
+         0, 	 0, 0xDEFB, 0xD0BB, 0xD5B7, 0xEEF1, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xF4A8, 	 0, 0xDCF8, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xCBA7, 	 0, 0xDACE, 	 0, 	 0, /* 0x50 */
+         0, 0xE0E6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xEDA5, 0xEEF2, 	 0, 	 0, 	 0, 	 0, 0xDCF9, /* 0x60 */
+         0, 	 0, 0xF9DC, 	 0, 	 0, 0xF3DC, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF8F2, 	 0, 0xF4F9, /* 0x70 */
+         0, 	 0, 	 0, 0xFCF1, 	 0, 	 0, 	 0, 0xD0BC, /* 0x80 */
+    0xDBF9, 0xD7B1, 	 0, 	 0, 	 0, 0xCBFC, 	 0, 	 0, /* 0x80 */
+         0, 0xF0A5, 0xCBFD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xD5F4, 	 0, 	 0, 	 0, 0xCDED, /* 0x90 */
+    0xCAA5, 	 0, 	 0, 0xD6AB, 0xD0C2, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xF0BE, 0xD2BD, 0xCCA4, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFAB6, 	 0, /* 0xB0 */
+         0, 0xCCCD, 	 0, 0xDAFA, 	 0, 0xF6CF, 	 0, 0xE9B8, /* 0xC0 */
+         0, 0xD8F5, 	 0, 	 0, 	 0, 0xCCCE, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xD7CD, 	 0, 	 0, 0xD4D1, 0xE9ED, 	 0, /* 0xD0 */
+    0xCAEB, 0xD9E2, 	 0, 0xFDB2, 	 0, 0xE3AD, 0xD6CC, 0xD9B4, /* 0xD0 */
+         0, 	 0, 0xE1A7, 0xEED3, 0xD0C3, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xFDB3, 	 0, 0xD5E4, 	 0, 	 0, /* 0xF0 */
+    0xCFE8, 	 0, 0xEDC3, 0xD0B2, 	 0, 	 0, 0xCEFE, 0xDAA8	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_53[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xF8D0,      0,      0, /* 0x00 */
-    0xFDD6,      0,      0,      0,      0, 0xF8D1,      0, 0xF8D2, /* 0x00 */
-    0xDCD3,      0,      0,      0,      0, 0xDDE2, 0xFBF9, 0xDDC1, /* 0x10 */
-         0, 0xE3B5,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xEDDD, 0xCEC4,      0, 0xCBA1,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xDDE3,      0,      0,      0,      0, 0xFCDD, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xF9AF,      0,      0,      0,      0,      0, 0xD2FB, /* 0x30 */
-    0xCFA1, 0xE4A8,      0, 0xF4B6, 0xECFE,      0,      0, 0xE3AE, /* 0x40 */
-    0xE7ED, 0xFDC1, 0xDAE2,      0,      0, 0xD8B3,      0,      0, /* 0x40 */
-         0, 0xDDE4, 0xF0EF, 0xF6F1, 0xFAF0,      0,      0, 0xD1F5, /* 0x50 */
-         0,      0, 0xDACF,      0, 0xDCD4,      0, 0xDCA6,      0, /* 0x50 */
-    0xEFBF,      0,      0,      0,      0,      0, 0xCECF,      0, /* 0x60 */
-    0xE0D9,      0,      0,      0,      0,      0,      0, 0xD9D6, /* 0x60 */
-    0xECD4, 0xEACB,      0,      0, 0xCABF, 0xD5B0,      0, 0xCFE9, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF1ED,      0, 0xCCCF, /* 0x70 */
-         0,      0,      0,      0, 0xE4F8,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xE4ED,      0,      0,      0,      0, /* 0x90 */
-    0xD7D8,      0, 0xFDA7,      0,      0,      0,      0, 0xEAAB, /* 0x90 */
-    0xF6B2,      0,      0,      0,      0, 0xCFF0, 0xF9BD,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xE6F4,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xCBDB,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xF3D1,      0,      0,      0,      0, /* 0xC0 */
-    0xE9D1, 0xF3A9, 0xD0E0, 0xE9D2,      0, 0xDAE3,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xE2D2,      0, 0xF6A2, 0xE1F4, /* 0xD0 */
-         0,      0,      0, 0xDAE4,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xE7D5, 0xF5BF, 0xCFA2, 0xCDAF, 0xCFA3,      0,      0, /* 0xE0 */
-         0, 0xCDB0, 0xF1FE, 0xD0A3, 0xE1AF, 0xF8A3,      0, 0xCAA6, /* 0xE0 */
-    0xF7BB, 0xF2EA, 0xDEC8, 0xE9D3,      0,      0,      0,      0, /* 0xF0 */
-    0xDEC9                                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xF8D0, 	 0, 	 0, /* 0x00 */
+    0xFDD6, 	 0, 	 0, 	 0, 	 0, 0xF8D1, 	 0, 0xF8D2, /* 0x00 */
+    0xDCD3, 	 0, 	 0, 	 0, 	 0, 0xDDE2, 0xFBF9, 0xDDC1, /* 0x10 */
+         0, 0xE3B5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xEDDD, 0xCEC4, 	 0, 0xCBA1, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xDDE3, 	 0, 	 0, 	 0, 	 0, 0xFCDD, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xF9AF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD2FB, /* 0x30 */
+    0xCFA1, 0xE4A8, 	 0, 0xF4B6, 0xECFE, 	 0, 	 0, 0xE3AE, /* 0x40 */
+    0xE7ED, 0xFDC1, 0xDAE2, 	 0, 	 0, 0xD8B3, 	 0, 	 0, /* 0x40 */
+         0, 0xDDE4, 0xF0EF, 0xF6F1, 0xFAF0, 	 0, 	 0, 0xD1F5, /* 0x50 */
+         0, 	 0, 0xDACF, 	 0, 0xDCD4, 	 0, 0xDCA6, 	 0, /* 0x50 */
+    0xEFBF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCECF, 	 0, /* 0x60 */
+    0xE0D9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD9D6, /* 0x60 */
+    0xECD4, 0xEACB, 	 0, 	 0, 0xCABF, 0xD5B0, 	 0, 0xCFE9, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF1ED, 	 0, 0xCCCF, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xE4F8, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xE4ED, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xD7D8, 	 0, 0xFDA7, 	 0, 	 0, 	 0, 	 0, 0xEAAB, /* 0x90 */
+    0xF6B2, 	 0, 	 0, 	 0, 	 0, 0xCFF0, 0xF9BD, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE6F4, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xCBDB, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xF3D1, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xE9D1, 0xF3A9, 0xD0E0, 0xE9D2, 	 0, 0xDAE3, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xE2D2, 	 0, 0xF6A2, 0xE1F4, /* 0xD0 */
+         0, 	 0, 	 0, 0xDAE4, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xE7D5, 0xF5BF, 0xCFA2, 0xCDAF, 0xCFA3, 	 0, 	 0, /* 0xE0 */
+         0, 0xCDB0, 0xF1FE, 0xD0A3, 0xE1AF, 0xF8A3, 	 0, 0xCAA6, /* 0xE0 */
+    0xF7BB, 0xF2EA, 0xDEC8, 0xE9D3, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xDEC9															/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_54[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xFDDE, 0xCAC0,      0,      0,      0, /* 0x00 */
-    0xF9EA, 0xD1CE, 0xEED4,      0, 0xD4D2, 0xD9A3, 0xFDA8, 0xD7D9, /* 0x00 */
-    0xF7CE, 0xFABE,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xCFD6,      0, 0xD7F0,      0, 0xEBE1, /* 0x10 */
-    0xF8C5,      0,      0,      0,      0,      0, 0xDCFA,      0, /* 0x20 */
-         0, 0xDDC3,      0, 0xF9DF,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xE7EF,      0,      0,      0,      0, /* 0x30 */
-    0xFDE5, 0xF6A3,      0, 0xD9FC, 0xFDA9,      0, 0xE7EE,      0, /* 0x30 */
-         0,      0, 0xD5E5,      0,      0,      0,      0,      0, /* 0x40 */
-    0xEFD0,      0, 0xCDB1,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xF7A2,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0xF1B2,      0, 0xF1B1,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xCDB2,      0, 0xDAAB,      0, 0xCAA7,      0,      0, /* 0x70 */
-         0,      0,      0, 0xE3E2, 0xFBBC, 0xD9A4,      0,      0, /* 0x70 */
-    0xEEBA,      0,      0,      0,      0,      0, 0xF8D3,      0, /* 0x80 */
-         0,      0,      0,      0, 0xFBFA,      0, 0xCFA4,      0, /* 0x80 */
-    0xDCFB,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xF6E3,      0,      0,      0, /* 0xA0 */
-    0xEDAA,      0,      0, 0xF2A1, 0xCEE1,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xFAA6,      0,      0,      0,      0, /* 0xB0 */
-    0xF9E0,      0,      0,      0,      0, 0xECD6,      0,      0, /* 0xB0 */
-    0xE4EE, 0xF9A1,      0,      0, 0xFBEF,      0,      0,      0, /* 0xC0 */
-    0xF9EB, 0xEEA3,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xEAAC,      0,      0,      0, 0xCAA8,      0,      0, /* 0xE0 */
-    0xF4FA,      0,      0,      0,      0, 0xCDD6, 0xFCF6,      0, /* 0xE0 */
-         0,      0, 0xF4C9,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xF8D4                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xFDDE, 0xCAC0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xF9EA, 0xD1CE, 0xEED4, 	 0, 0xD4D2, 0xD9A3, 0xFDA8, 0xD7D9, /* 0x00 */
+    0xF7CE, 0xFABE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xCFD6, 	 0, 0xD7F0, 	 0, 0xEBE1, /* 0x10 */
+    0xF8C5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDCFA, 	 0, /* 0x20 */
+         0, 0xDDC3, 	 0, 0xF9DF, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xE7EF, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xFDE5, 0xF6A3, 	 0, 0xD9FC, 0xFDA9, 	 0, 0xE7EE, 	 0, /* 0x30 */
+         0, 	 0, 0xD5E5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xEFD0, 	 0, 0xCDB1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xF7A2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xF1B2, 	 0, 0xF1B1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xCDB2, 	 0, 0xDAAB, 	 0, 0xCAA7, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0xE3E2, 0xFBBC, 0xD9A4, 	 0, 	 0, /* 0x70 */
+    0xEEBA, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF8D3, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xFBFA, 	 0, 0xCFA4, 	 0, /* 0x80 */
+    0xDCFB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xF6E3, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xEDAA, 	 0, 	 0, 0xF2A1, 0xCEE1, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xFAA6, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xF9E0, 	 0, 	 0, 	 0, 	 0, 0xECD6, 	 0, 	 0, /* 0xB0 */
+    0xE4EE, 0xF9A1, 	 0, 	 0, 0xFBEF, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xF9EB, 0xEEA3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xEAAC, 	 0, 	 0, 	 0, 0xCAA8, 	 0, 	 0, /* 0xE0 */
+    0xF4FA, 	 0, 	 0, 	 0, 	 0, 0xCDD6, 0xFCF6, 	 0, /* 0xE0 */
+         0, 	 0, 0xF4C9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xF8D4											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_55[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xF8A6,      0, 0xDECA, 0xF2C6, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xD7DA,      0, /* 0x00 */
-    0xD3D0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0xD8C5,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xEAE6, /* 0x20 */
-         0, 0xF3DD,      0,      0,      0, 0xE4DA,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xF6E4,      0, /* 0x30 */
-         0,      0,      0,      0, 0xF6F2,      0, 0xDFC2,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xD9FD, /* 0x40 */
-         0,      0,      0, 0xCCF6,      0,      0, 0xD3BA,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xE4AF,      0, /* 0x50 */
-         0,      0,      0, 0xF9E1,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xF0A6,      0,      0,      0, /* 0x70 */
-    0xCBD3,      0,      0,      0, 0xE0BC,      0, 0xF4CA, 0xD4FA, /* 0x80 */
-         0, 0xFDAA, 0xF9E2,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xF4B7, 0xFDC2, 0xFCB0,      0, 0xFDEC, 0xCAE2,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xFDBD, /* 0xA0 */
-         0, 0xEAE7, 0xDFC3, 0xD1D2, 0xCEE2,      0, 0xD3A4,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xFDAB,      0, 0xDFE0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xF2C7,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xE7F0,      0, 0xD0EE,      0,      0, 0xF3AA, /* 0xD0 */
-         0,      0,      0, 0xDECB, 0xF6B8,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xE1F5, 0xF1B3          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xF8A6, 	 0, 0xDECA, 0xF2C6, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD7DA, 	 0, /* 0x00 */
+    0xD3D0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xD8C5, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEAE6, /* 0x20 */
+         0, 0xF3DD, 	 0, 	 0, 	 0, 0xE4DA, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF6E4, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xF6F2, 	 0, 0xDFC2, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD9FD, /* 0x40 */
+         0, 	 0, 	 0, 0xCCF6, 	 0, 	 0, 0xD3BA, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4AF, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xF9E1, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xF0A6, 	 0, 	 0, 	 0, /* 0x70 */
+    0xCBD3, 	 0, 	 0, 	 0, 0xE0BC, 	 0, 0xF4CA, 0xD4FA, /* 0x80 */
+         0, 0xFDAA, 0xF9E2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xF4B7, 0xFDC2, 0xFCB0, 	 0, 0xFDEC, 0xCAE2, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFDBD, /* 0xA0 */
+         0, 0xEAE7, 0xDFC3, 0xD1D2, 0xCEE2, 	 0, 0xD3A4, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xFDAB, 	 0, 0xDFE0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xF2C7, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xE7F0, 	 0, 0xD0EE, 	 0, 	 0, 0xF3AA, /* 0xD0 */
+         0, 	 0, 	 0, 0xDECB, 0xF6B8, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE1F5, 0xF1B3			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_56[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0xF7A3,      0, /* 0x00 */
-         0, 0xCAA9,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0xCFA5,      0,      0, 0xDFC4, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xE1B0, /* 0x20 */
-         0,      0, 0xF0BF,      0, 0xF6A4,      0, 0xE3B6,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xFAC6,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0xD0EF,      0,      0, 0xFDED,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xDDC4,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xFCF7,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xE6BF,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xDEAD,      0, 0xFABF,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xE5F1,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xEDC4,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xD2A5,      0,      0, 0xFDEE,      0,      0, /* 0xC0 */
-         0, 0xF5B6,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xE1F6, 0xDECC,      0,      0, 0xFCDE,      0, /* 0xD0 */
-    0xECD7,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xCDDD,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xD6B7, 0xCDB3                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0xF7A3, 	 0, /* 0x00 */
+         0, 0xCAA9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xCFA5, 	 0, 	 0, 0xDFC4, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1B0, /* 0x20 */
+         0, 	 0, 0xF0BF, 	 0, 0xF6A4, 	 0, 0xE3B6, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xFAC6, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xD0EF, 	 0, 	 0, 0xFDED, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xDDC4, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFCF7, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE6BF, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xDEAD, 	 0, 0xFABF, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xE5F1, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xEDC4, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xD2A5, 	 0, 	 0, 0xFDEE, 	 0, 	 0, /* 0xC0 */
+         0, 0xF5B6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xE1F6, 0xDECC, 	 0, 	 0, 0xFCDE, 	 0, /* 0xD0 */
+    0xECD7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xCDDD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xD6B7, 0xCDB3											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_57[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xF8D5, 0xE5D8,      0,      0,      0, /* 0x00 */
-    0xCFEA,      0,      0, 0xCFD0,      0, 0xEACC,      0,      0, /* 0x00 */
-         0,      0, 0xEAAE, 0xEAAD,      0,      0, 0xD3F1,      0, /* 0x10 */
-    0xD3A5,      0,      0,      0,      0,      0,      0, 0xF7CF, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xEEA4,      0,      0,      0,      0, 0xD0A4,      0,      0, /* 0x20 */
-    0xF2A2,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xD0F0,      0,      0,      0,      0, /* 0x30 */
-    0xF2A3,      0, 0xF7F8,      0,      0,      0,      0, 0xD0B3, /* 0x40 */
-         0,      0, 0xDBA9,      0,      0, 0xD3BB, 0xCAEC,      0, /* 0x40 */
-    0xF1A6, 0xCBD5,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xF7E7,      0,      0, 0xCDDE,      0, 0xF7A4,      0, /* 0x60 */
-         0,      0, 0xF8C0,      0,      0,      0, 0xD3DD,      0, /* 0x60 */
-    0xCCD0,      0,      0,      0,      0, 0xCFA6,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xF6F3,      0,      0,      0, /* 0x70 */
-         0,      0, 0xE1F7,      0,      0,      0,      0,      0, /* 0x80 */
-    0xD3DC,      0,      0, 0xFAFE,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xFAA7,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xEBD9,      0, 0xCFA7, 0xEAAF,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xE4EF,      0,      0,      0, 0xE9B9, /* 0xC0 */
-    0xF1D8,      0,      0, 0xD8D8,      0,      0, 0xE0F2,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE6B4, /* 0xD0 */
-    0xDCFC,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xF3F1,      0,      0,      0, 0xE3D0,      0,      0, 0xF2FB, /* 0xF0 */
-         0, 0xDBC6, 0xD0F1,      0, 0xD0F2                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xF8D5, 0xE5D8, 	 0, 	 0, 	 0, /* 0x00 */
+    0xCFEA, 	 0, 	 0, 0xCFD0, 	 0, 0xEACC, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xEAAE, 0xEAAD, 	 0, 	 0, 0xD3F1, 	 0, /* 0x10 */
+    0xD3A5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF7CF, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xEEA4, 	 0, 	 0, 	 0, 	 0, 0xD0A4, 	 0, 	 0, /* 0x20 */
+    0xF2A2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xD0F0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xF2A3, 	 0, 0xF7F8, 	 0, 	 0, 	 0, 	 0, 0xD0B3, /* 0x40 */
+         0, 	 0, 0xDBA9, 	 0, 	 0, 0xD3BB, 0xCAEC, 	 0, /* 0x40 */
+    0xF1A6, 0xCBD5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xF7E7, 	 0, 	 0, 0xCDDE, 	 0, 0xF7A4, 	 0, /* 0x60 */
+         0, 	 0, 0xF8C0, 	 0, 	 0, 	 0, 0xD3DD, 	 0, /* 0x60 */
+    0xCCD0, 	 0, 	 0, 	 0, 	 0, 0xCFA6, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xF6F3, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xE1F7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xD3DC, 	 0, 	 0, 0xFAFE, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xFAA7, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xEBD9, 	 0, 0xCFA7, 0xEAAF, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xE4EF, 	 0, 	 0, 	 0, 0xE9B9, /* 0xC0 */
+    0xF1D8, 	 0, 	 0, 0xD8D8, 	 0, 	 0, 0xE0F2, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6B4, /* 0xD0 */
+    0xDCFC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xF3F1, 	 0, 	 0, 	 0, 0xE3D0, 	 0, 	 0, 0xF2FB, /* 0xF0 */
+         0, 0xDBC6, 0xD0F1, 	 0, 0xD0F2							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_58[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xCFDC,      0, 0xD3D1,      0,      0, 0xCCB1, 0xF7D8,      0, /* 0x00 */
-    0xCBA8, 0xEBBC, 0xE4BE,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xF4DC,      0, /* 0x10 */
-         0, 0xDCC2,      0,      0, 0xF0A7,      0,      0, 0xE6C0, /* 0x20 */
-         0,      0, 0xCAED,      0,      0,      0,      0, 0xE8EB, /* 0x20 */
-    0xE5E8, 0xDCC3,      0,      0, 0xEDDE, 0xD3F2,      0,      0, /* 0x30 */
-         0,      0, 0xCCF7,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xCED4, 0xE7AB,      0,      0,      0, 0xCBC3, /* 0x40 */
-         0, 0xE1B1,      0,      0, 0xF7B2,      0,      0, 0xD3F3, /* 0x50 */
-    0xD3D2,      0, 0xF5C0,      0,      0,      0, 0xDFDD,      0, /* 0x50 */
-         0, 0xEEF3, 0xE7F1,      0, 0xFDB4,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xF2C8,      0,      0, /* 0x70 */
-         0, 0xF3D2,      0,      0, 0xEEF4,      0, 0xE2D3,      0, /* 0x70 */
-         0,      0,      0, 0xCCD1,      0, 0xDFEA,      0,      0, /* 0x80 */
-         0, 0xE9BA,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xD9D7,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xF5CD,      0, 0xF1F2, 0xFAC7, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xD9F8, 0xD4C2,      0,      0,      0,      0, 0xF6E5,      0, /* 0xA0 */
-         0,      0,      0, 0xDDC5,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xE7F2, 0xEDDF,      0,      0, 0xCACB,      0, /* 0xB0 */
-         0, 0xDBFA,      0,      0,      0, 0xE8B5,      0, 0xD3A6, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xFDB5,      0, /* 0xC0 */
-         0, 0xF9C9,      0, 0xE4E2,      0, 0xFBBD,      0,      0, /* 0xD0 */
-    0xD7A4, 0xCEC5,      0,      0,      0,      0, 0xCED5, 0xD6E6, /* 0xD0 */
-         0,      0,      0,      0, 0xE5BD,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xDECD, 0xECF3,      0,      0, 0xEDE0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xECEC, 0xFBBE, 0xDFEB,      0, 0xE1F8                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xCFDC, 	 0, 0xD3D1, 	 0, 	 0, 0xCCB1, 0xF7D8, 	 0, /* 0x00 */
+    0xCBA8, 0xEBBC, 0xE4BE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4DC, 	 0, /* 0x10 */
+         0, 0xDCC2, 	 0, 	 0, 0xF0A7, 	 0, 	 0, 0xE6C0, /* 0x20 */
+         0, 	 0, 0xCAED, 	 0, 	 0, 	 0, 	 0, 0xE8EB, /* 0x20 */
+    0xE5E8, 0xDCC3, 	 0, 	 0, 0xEDDE, 0xD3F2, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xCCF7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xCED4, 0xE7AB, 	 0, 	 0, 	 0, 0xCBC3, /* 0x40 */
+         0, 0xE1B1, 	 0, 	 0, 0xF7B2, 	 0, 	 0, 0xD3F3, /* 0x50 */
+    0xD3D2, 	 0, 0xF5C0, 	 0, 	 0, 	 0, 0xDFDD, 	 0, /* 0x50 */
+         0, 0xEEF3, 0xE7F1, 	 0, 0xFDB4, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF2C8, 	 0, 	 0, /* 0x70 */
+         0, 0xF3D2, 	 0, 	 0, 0xEEF4, 	 0, 0xE2D3, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0xCCD1, 	 0, 0xDFEA, 	 0, 	 0, /* 0x80 */
+         0, 0xE9BA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xD9D7, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xF5CD, 	 0, 0xF1F2, 0xFAC7, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xD9F8, 0xD4C2, 	 0, 	 0, 	 0, 	 0, 0xF6E5, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xDDC5, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xE7F2, 0xEDDF, 	 0, 	 0, 0xCACB, 	 0, /* 0xB0 */
+         0, 0xDBFA, 	 0, 	 0, 	 0, 0xE8B5, 	 0, 0xD3A6, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFDB5, 	 0, /* 0xC0 */
+         0, 0xF9C9, 	 0, 0xE4E2, 	 0, 0xFBBD, 	 0, 	 0, /* 0xD0 */
+    0xD7A4, 0xCEC5, 	 0, 	 0, 	 0, 	 0, 0xCED5, 0xD6E6, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xE5BD, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xDECD, 0xECF3, 	 0, 	 0, 0xEDE0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xECEC, 0xFBBE, 0xDFEB, 	 0, 0xE1F8					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_59[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xF9BE, /* 0x00 */
-         0,      0,      0,      0, 0xD0F3, 0xE0AA, 0xE8E2,      0, /* 0x10 */
-         0, 0xE2D4, 0xD2FD,      0, 0xE5A8,      0,      0,      0, /* 0x10 */
-         0,      0, 0xD9D3,      0,      0,      0,      0, 0xD3DE, /* 0x20 */
-         0, 0xF4B8, 0xF7BC, 0xDCFD,      0, 0xE8EC, 0xE4E7,      0, /* 0x20 */
-         0, 0xE3F7,      0,      0,      0,      0,      0, 0xECA8, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xFAF1,      0, /* 0x30 */
-         0,      0,      0,      0, 0xE5F2,      0,      0, 0xD0F4, /* 0x40 */
-    0xD2AF, 0xDCE5,      0,      0,      0,      0, 0xD0A5, 0xF1B4, /* 0x40 */
-    0xFCB1, 0xCCF8,      0,      0, 0xDDC6, 0xFAD1,      0, 0xF7DF, /* 0x50 */
-         0,      0, 0xFAA8,      0,      0,      0,      0,      0, /* 0x50 */
-    0xEEF5,      0, 0xDECE,      0,      0,      0,      0, 0xE7F3, /* 0x60 */
-         0,      0, 0xF7AC, 0xEBC4, 0xEDE1, 0xE0AB, 0xDDC7,      0, /* 0x60 */
-         0,      0,      0, 0xD2B3, 0xD2BF,      0,      0,      0, /* 0x70 */
-    0xCACC,      0,      0,      0,      0, 0xFBBF,      0,      0, /* 0x70 */
-         0,      0, 0xE5FD, 0xDDE5, 0xD8CD,      0,      0,      0, /* 0x80 */
-         0,      0, 0xECF4,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xD0F5,      0,      0, 0xE8ED, 0xD0D2, /* 0x90 */
-         0, 0xD9D8,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xF6E6,      0,      0, /* 0xA0 */
-    0xDBAA,      0,      0,      0, 0xF7E0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xD8D9,      0, 0xF4A3,      0,      0, 0xF4DD,      0, /* 0xB0 */
-         0,      0,      0, 0xEFD1,      0,      0, 0xD9B5,      0, /* 0xC0 */
-         0, 0xEDAB,      0, 0xE3B7,      0,      0,      0,      0, /* 0xC0 */
-    0xEEBB, 0xCDB4,      0, 0xE0F3, 0xEACD,      0,      0,      0, /* 0xD0 */
-         0, 0xECF5, 0xE8EE,      0, 0xCBA9, 0xF1AF,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xCACD,      0, /* 0xE0 */
-    0xECA9,      0, 0xF2EB,      0, 0xFDEF,      0, 0xF9F3,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xE6C1,      0,      0, 0xECD8,      0,      0,      0, 0xEDAC  /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xD0F3, 0xE0AA, 0xE8E2, 	 0, /* 0x10 */
+         0, 0xE2D4, 0xD2FD, 	 0, 0xE5A8, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xD9D3, 	 0, 	 0, 	 0, 	 0, 0xD3DE, /* 0x20 */
+         0, 0xF4B8, 0xF7BC, 0xDCFD, 	 0, 0xE8EC, 0xE4E7, 	 0, /* 0x20 */
+         0, 0xE3F7, 	 0, 	 0, 	 0, 	 0, 	 0, 0xECA8, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFAF1, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xE5F2, 	 0, 	 0, 0xD0F4, /* 0x40 */
+    0xD2AF, 0xDCE5, 	 0, 	 0, 	 0, 	 0, 0xD0A5, 0xF1B4, /* 0x40 */
+    0xFCB1, 0xCCF8, 	 0, 	 0, 0xDDC6, 0xFAD1, 	 0, 0xF7DF, /* 0x50 */
+         0, 	 0, 0xFAA8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xEEF5, 	 0, 0xDECE, 	 0, 	 0, 	 0, 	 0, 0xE7F3, /* 0x60 */
+         0, 	 0, 0xF7AC, 0xEBC4, 0xEDE1, 0xE0AB, 0xDDC7, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xD2B3, 0xD2BF, 	 0, 	 0, 	 0, /* 0x70 */
+    0xCACC, 	 0, 	 0, 	 0, 	 0, 0xFBBF, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xE5FD, 0xDDE5, 0xD8CD, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xECF4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xD0F5, 	 0, 	 0, 0xE8ED, 0xD0D2, /* 0x90 */
+         0, 0xD9D8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF6E6, 	 0, 	 0, /* 0xA0 */
+    0xDBAA, 	 0, 	 0, 	 0, 0xF7E0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xD8D9, 	 0, 0xF4A3, 	 0, 	 0, 0xF4DD, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xEFD1, 	 0, 	 0, 0xD9B5, 	 0, /* 0xC0 */
+         0, 0xEDAB, 	 0, 0xE3B7, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xEEBB, 0xCDB4, 	 0, 0xE0F3, 0xEACD, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xECF5, 0xE8EE, 	 0, 0xCBA9, 0xF1AF, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCACD, 	 0, /* 0xE0 */
+    0xECA9, 	 0, 0xF2EB, 	 0, 0xFDEF, 	 0, 0xF9F3, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xE6C1, 	 0, 	 0, 0xECD8, 	 0, 	 0, 	 0, 0xEDAC	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_5A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xEACE,      0, 0xE8DF,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xDECF,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xD2A6,      0,      0, 0xE7F4, 0xD1D6,      0,      0, 0xE6C2, /* 0x10 */
-    0xE3E3,      0,      0,      0,      0, 0xE4B0,      0,      0, /* 0x20 */
-         0, 0xD8B4,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0xF6A5,      0, /* 0x30 */
-         0,      0,      0,      0, 0xF3DE,      0,      0,      0, /* 0x30 */
-         0, 0xD7A5,      0,      0,      0,      0, 0xF7E8,      0, /* 0x40 */
-         0, 0xE8C6,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xFBE6,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xDDE6,      0,      0,      0, 0xDCFE,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xD8DA,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xDAAC, 0xEAB0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xE3B8,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xCAAA, 0xE1F9,      0, 0xEAB1,      0,      0,      0, /* 0xC0 */
-         0, 0xF2EC,      0,      0, 0xFAEE,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xEED5,      0,      0,      0,      0, 0xF9F4,      0, /* 0xE0 */
-         0, 0xD2EC                                                  /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xEACE, 	 0, 0xE8DF, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xDECF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xD2A6, 	 0, 	 0, 0xE7F4, 0xD1D6, 	 0, 	 0, 0xE6C2, /* 0x10 */
+    0xE3E3, 	 0, 	 0, 	 0, 	 0, 0xE4B0, 	 0, 	 0, /* 0x20 */
+         0, 0xD8B4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF6A5, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xF3DE, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xD7A5, 	 0, 	 0, 	 0, 	 0, 0xF7E8, 	 0, /* 0x40 */
+         0, 0xE8C6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xFBE6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xDDE6, 	 0, 	 0, 	 0, 0xDCFE, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xD8DA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xDAAC, 0xEAB0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xE3B8, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xCAAA, 0xE1F9, 	 0, 0xEAB1, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xF2EC, 	 0, 	 0, 0xFAEE, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xEED5, 	 0, 	 0, 	 0, 	 0, 0xF9F4, 	 0, /* 0xE0 */
+         0, 0xD2EC													/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_5B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xFBFB,      0,      0, /* 0x00 */
-         0, 0xFDF0,      0, 0xE0BD, 0xCEE3,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xF8C6,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xDEAE,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xDFC5,      0,      0, 0xE5BE,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xEDAD, 0xFAEA,      0,      0, 0xCDEE, 0xEDA6,      0, 0xEDAE, /* 0x50 */
-    0xF0ED,      0, 0xDDA1,      0, 0xEDAF, 0xFCF8,      0, 0xD8EB, /* 0x50 */
-         0,      0,      0, 0xCCF9, 0xCDB5,      0,      0,      0, /* 0x60 */
-         0, 0xFAA9,      0, 0xE1DD,      0,      0,      0,      0, /* 0x60 */
-    0xE2D5, 0xEDCF,      0,      0,      0, 0xDDA2,      0,      0, /* 0x70 */
-    0xF9CA,      0, 0xEAE8,      0, 0xE5ED,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xD3EB,      0, 0xE9D4, /* 0x80 */
-    0xE1FA, 0xE4CC,      0, 0xE1E4, 0xE8C7,      0,      0, 0xCEDB, /* 0x80 */
-         0,      0,      0, 0xDCD5,      0, 0xF7B5, 0xFCF3, 0xF0F3, /* 0x90 */
-    0xCEAF, 0xF1B5, 0xEFD2, 0xE8C8, 0xEBF1,      0,      0,      0, /* 0x90 */
-         0,      0, 0xCBD4, 0xE0BE, 0xE3F8, 0xEAE9, 0xFCB2,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xE0F4,      0, 0xCFE0,      0, /* 0xA0 */
-    0xEEA5,      0,      0, 0xFAAA, 0xE6C3, 0xE1B2, 0xCAAB,      0, /* 0xB0 */
-    0xE3E4, 0xE9BB,      0,      0,      0,      0,      0, 0xE2D6, /* 0xB0 */
-    0xF3F2,      0, 0xEED6, 0xEAB2, 0xD0F6, 0xECD9, 0xDACB, 0xCFA8, /* 0xC0 */
-         0,      0,      0,      0, 0xDDA3,      0,      0,      0, /* 0xC0 */
-    0xD8DB,      0, 0xF9CE, 0xE9D5, 0xE3D1,      0,      0, 0xD2BC, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xD8AC, 0xF3CC, /* 0xD0 */
-         0, 0xCDFB, 0xF6D6,      0, 0xE7F5, 0xE8EF, 0xE3F9, 0xD2BB, /* 0xE0 */
-    0xF3F3, 0xE3FB,      0, 0xDED0, 0xCEB0,      0, 0xD6F7, 0xF1D9, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xF5C1, 0xDCC4,      0, /* 0xF0 */
-    0xF5BB,      0, 0xDED1                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xFBFB, 	 0, 	 0, /* 0x00 */
+         0, 0xFDF0, 	 0, 0xE0BD, 0xCEE3, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF8C6, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xDEAE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xDFC5, 	 0, 	 0, 0xE5BE, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xEDAD, 0xFAEA, 	 0, 	 0, 0xCDEE, 0xEDA6, 	 0, 0xEDAE, /* 0x50 */
+    0xF0ED, 	 0, 0xDDA1, 	 0, 0xEDAF, 0xFCF8, 	 0, 0xD8EB, /* 0x50 */
+         0, 	 0, 	 0, 0xCCF9, 0xCDB5, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xFAA9, 	 0, 0xE1DD, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xE2D5, 0xEDCF, 	 0, 	 0, 	 0, 0xDDA2, 	 0, 	 0, /* 0x70 */
+    0xF9CA, 	 0, 0xEAE8, 	 0, 0xE5ED, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD3EB, 	 0, 0xE9D4, /* 0x80 */
+    0xE1FA, 0xE4CC, 	 0, 0xE1E4, 0xE8C7, 	 0, 	 0, 0xCEDB, /* 0x80 */
+         0, 	 0, 	 0, 0xDCD5, 	 0, 0xF7B5, 0xFCF3, 0xF0F3, /* 0x90 */
+    0xCEAF, 0xF1B5, 0xEFD2, 0xE8C8, 0xEBF1, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xCBD4, 0xE0BE, 0xE3F8, 0xEAE9, 0xFCB2, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xE0F4, 	 0, 0xCFE0, 	 0, /* 0xA0 */
+    0xEEA5, 	 0, 	 0, 0xFAAA, 0xE6C3, 0xE1B2, 0xCAAB, 	 0, /* 0xB0 */
+    0xE3E4, 0xE9BB, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2D6, /* 0xB0 */
+    0xF3F2, 	 0, 0xEED6, 0xEAB2, 0xD0F6, 0xECD9, 0xDACB, 0xCFA8, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xDDA3, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xD8DB, 	 0, 0xF9CE, 0xE9D5, 0xE3D1, 	 0, 	 0, 0xD2BC, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD8AC, 0xF3CC, /* 0xD0 */
+         0, 0xCDFB, 0xF6D6, 	 0, 0xE7F5, 0xE8EF, 0xE3F9, 0xD2BB, /* 0xE0 */
+    0xF3F3, 0xE3FB, 	 0, 0xDED0, 0xCEB0, 	 0, 0xD6F7, 0xF1D9, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF5C1, 0xDCC4, 	 0, /* 0xF0 */
+    0xF5BB, 	 0, 0xDED1											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_5C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xDCE6,      0,      0, 0xDED2,      0,      0, 0xEDE2, /* 0x00 */
-    0xEEF6, 0xEACF, 0xF0EE, 0xE3FC,      0, 0xD3DF, 0xD3F4, 0xE1B3, /* 0x00 */
-         0, 0xE1B4,      0,      0,      0,      0, 0xF4D3,      0, /* 0x10 */
-         0, 0xDFC6,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0xE9D6,      0,      0,      0, /* 0x20 */
-    0xDBAB,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xF6A6,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xE3B9, 0xEBC5, 0xF4A9, 0xCDB6, 0xD2F9,      0, 0xDAAD, 0xD2E3, /* 0x30 */
-    0xCFD1,      0,      0,      0,      0, 0xCBDC, 0xCCFA,      0, /* 0x40 */
-    0xCFDD,      0,      0, 0xE8A9,      0, 0xE3BB, 0xE3BA,      0, /* 0x40 */
-         0, 0xE0DA,      0,      0,      0, 0xEEF7,      0,      0, /* 0x50 */
-         0,      0,      0, 0xDCB3,      0,      0,      0,      0, /* 0x50 */
-    0xD3F5,      0, 0xD7A6,      0, 0xF6B5, 0xD7DB,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xE1D5,      0,      0, 0xD4EA, /* 0x60 */
-         0, 0xDFA3,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xFDDF,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xD0F7, 0xEDD4,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xCBAA,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xE4DB,      0, 0xE1FB, 0xCBA2,      0,      0,      0, /* 0xA0 */
-         0, 0xD3E0,      0, 0xE4BF,      0, 0xFBC0,      0, 0xDABE, /* 0xB0 */
-    0xE4CD,      0, 0xD6B9,      0,      0,      0, 0xEFC0,      0, /* 0xB0 */
-    0xE1FC,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xF6B9,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xDFC7,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xE4B1,      0,      0,      0,      0,      0,      0, 0xDCE7, /* 0xE0 */
-    0xDCE8,      0,      0,      0, 0xFAD6,      0, 0xD3F6,      0, /* 0xF0 */
-         0,      0,      0, 0xF1DA,      0, 0xFAF2                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xDCE6, 	 0, 	 0, 0xDED2, 	 0, 	 0, 0xEDE2, /* 0x00 */
+    0xEEF6, 0xEACF, 0xF0EE, 0xE3FC, 	 0, 0xD3DF, 0xD3F4, 0xE1B3, /* 0x00 */
+         0, 0xE1B4, 	 0, 	 0, 	 0, 	 0, 0xF4D3, 	 0, /* 0x10 */
+         0, 0xDFC6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xE9D6, 	 0, 	 0, 	 0, /* 0x20 */
+    0xDBAB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xF6A6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xE3B9, 0xEBC5, 0xF4A9, 0xCDB6, 0xD2F9, 	 0, 0xDAAD, 0xD2E3, /* 0x30 */
+    0xCFD1, 	 0, 	 0, 	 0, 	 0, 0xCBDC, 0xCCFA, 	 0, /* 0x40 */
+    0xCFDD, 	 0, 	 0, 0xE8A9, 	 0, 0xE3BB, 0xE3BA, 	 0, /* 0x40 */
+         0, 0xE0DA, 	 0, 	 0, 	 0, 0xEEF7, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xDCB3, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xD3F5, 	 0, 0xD7A6, 	 0, 0xF6B5, 0xD7DB, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xE1D5, 	 0, 	 0, 0xD4EA, /* 0x60 */
+         0, 0xDFA3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xFDDF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xD0F7, 0xEDD4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xCBAA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xE4DB, 	 0, 0xE1FB, 0xCBA2, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xD3E0, 	 0, 0xE4BF, 	 0, 0xFBC0, 	 0, 0xDABE, /* 0xB0 */
+    0xE4CD, 	 0, 0xD6B9, 	 0, 	 0, 	 0, 0xEFC0, 	 0, /* 0xB0 */
+    0xE1FC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xF6B9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xDFC7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE4B1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDCE7, /* 0xE0 */
+    0xDCE8, 	 0, 	 0, 	 0, 0xFAD6, 	 0, 0xD3F6, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xF1DA, 	 0, 0xFAF2					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_5D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xE2FD, /* 0x00 */
-         0,      0,      0,      0,      0, 0xD5CF, 0xD0F8,      0, /* 0x00 */
-         0, 0xCDDF,      0,      0, 0xF5CB,      0, 0xE4F0, 0xCBAB, /* 0x10 */
-         0, 0xD7C4,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xE2FE, /* 0x20 */
-         0, 0xDDDA,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xDAAE, 0xCAEE,      0,      0,      0, /* 0x40 */
-    0xD5B9,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xE3A1,      0,      0, 0xE8E3,      0,      0, 0xF3AB, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xCFA9, /* 0x80 */
-         0,      0,      0, 0xD3F7,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xD4F1,      0,      0, /* 0x90 */
-    0xCEE4,      0, 0xE8F2,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xE5F5,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xE7AE,      0, 0xD6BA,      0, 0xDFEC, 0xE4C0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xE8E4,      0,      0, /* 0xC0 */
-         0,      0, 0xD8B5,      0,      0,      0, 0xE4DC,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xF4B9, 0xF1B6,      0, /* 0xD0 */
-         0, 0xE2DE, 0xE1B5,      0,      0, 0xCDEF, 0xF1A7, 0xCEE5, /* 0xE0 */
-    0xCBDD,      0,      0, 0xD9E3,      0,      0, 0xF3AC,      0, /* 0xE0 */
-         0, 0xD0F9, 0xECAB, 0xDED3, 0xF7E9,      0,      0, 0xF9F5, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xE1DE, 0xCBEE          /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD5CF, 0xD0F8, 	 0, /* 0x00 */
+         0, 0xCDDF, 	 0, 	 0, 0xF5CB, 	 0, 0xE4F0, 0xCBAB, /* 0x10 */
+         0, 0xD7C4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2FE, /* 0x20 */
+         0, 0xDDDA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xDAAE, 0xCAEE, 	 0, 	 0, 	 0, /* 0x40 */
+    0xD5B9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xE3A1, 	 0, 	 0, 0xE8E3, 	 0, 	 0, 0xF3AB, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCFA9, /* 0x80 */
+         0, 	 0, 	 0, 0xD3F7, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD4F1, 	 0, 	 0, /* 0x90 */
+    0xCEE4, 	 0, 0xE8F2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xE5F5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xE7AE, 	 0, 0xD6BA, 	 0, 0xDFEC, 0xE4C0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE8E4, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xD8B5, 	 0, 	 0, 	 0, 0xE4DC, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF4B9, 0xF1B6, 	 0, /* 0xD0 */
+         0, 0xE2DE, 0xE1B5, 	 0, 	 0, 0xCDEF, 0xF1A7, 0xCEE5, /* 0xE0 */
+    0xCBDD, 	 0, 	 0, 0xD9E3, 	 0, 	 0, 0xF3AC, 	 0, /* 0xE0 */
+         0, 0xD0F9, 0xECAB, 0xDED3, 0xF7E9, 	 0, 	 0, 0xF9F5, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE1DE, 0xCBEE			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_5E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xE3BC, 0xF8D6,      0,      0, 0xDBEE,      0, /* 0x00 */
-         0,      0,      0,      0, 0xFDF1,      0,      0,      0, /* 0x00 */
-         0, 0xF7B6,      0,      0,      0,      0, 0xF4DE,      0, /* 0x10 */
-         0, 0xF2ED,      0, 0xDBD9,      0, 0xF0A8,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xE1FD,      0,      0, /* 0x20 */
-         0,      0,      0, 0xDED4,      0, 0xE0AC,      0,      0, /* 0x20 */
-         0,      0,      0, 0xEDE3,      0,      0, 0xD3E1,      0, /* 0x30 */
-    0xDFC8,      0,      0,      0,      0, 0xD9B6,      0, 0xFDAC, /* 0x30 */
-    0xEFD3,      0,      0,      0, 0xE4C1, 0xF8EB,      0, 0xDBAC, /* 0x40 */
-         0,      0,      0,      0, 0xFCC6,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xD8AD,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xF6BA, /* 0x50 */
-         0, 0xDBDF, 0xD3D3, 0xF8C7,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xCACE, 0xF8C1, 0xD2B4,      0,      0, 0xDCB4, /* 0x70 */
-    0xFAB9, 0xCACF,      0, 0xFCB3, 0xEAEA, 0xEAEB, 0xD0FA,      0, /* 0x70 */
-         0,      0,      0,      0, 0xEDE4,      0,      0, 0xDDE7, /* 0x80 */
-         0,      0, 0xDFC9,      0,      0,      0,      0, 0xDFED, /* 0x80 */
-         0,      0,      0,      0,      0, 0xEEBC,      0, 0xEFC1, /* 0x90 */
-         0,      0, 0xCCD2,      0, 0xDDA4,      0,      0,      0, /* 0x90 */
-    0xDFCA,      0,      0,      0,      0,      0, 0xD3F8, 0xF1A8, /* 0xA0 */
-         0,      0,      0, 0xCDB7,      0, 0xEFD4,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xE4DD, 0xDFEE, 0xCBAC, /* 0xB0 */
-    0xE9BC,      0,      0,      0,      0,      0, 0xEAEC,      0, /* 0xB0 */
-         0,      0, 0xDFCB,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xF9BF, 0xD6AF, 0xD5C6,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xCFAA,      0,      0, 0xCEA9,      0,      0, 0xD6F8,      0, /* 0xD0 */
-         0,      0, 0xF1B7, 0xEEF8,      0,      0,      0, 0xD9D9, /* 0xD0 */
-    0xF3DF,      0, 0xF8C8, 0xCEC6,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xD5E6,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xF4E6,      0,      0, 0xE6C5, 0xEFD5, /* 0xF0 */
-         0,      0, 0xCBEF, 0xFCDF                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xE3BC, 0xF8D6, 	 0, 	 0, 0xDBEE, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xFDF1, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xF7B6, 	 0, 	 0, 	 0, 	 0, 0xF4DE, 	 0, /* 0x10 */
+         0, 0xF2ED, 	 0, 0xDBD9, 	 0, 0xF0A8, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE1FD, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xDED4, 	 0, 0xE0AC, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xEDE3, 	 0, 	 0, 0xD3E1, 	 0, /* 0x30 */
+    0xDFC8, 	 0, 	 0, 	 0, 	 0, 0xD9B6, 	 0, 0xFDAC, /* 0x30 */
+    0xEFD3, 	 0, 	 0, 	 0, 0xE4C1, 0xF8EB, 	 0, 0xDBAC, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xFCC6, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD8AD, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF6BA, /* 0x50 */
+         0, 0xDBDF, 0xD3D3, 0xF8C7, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xCACE, 0xF8C1, 0xD2B4, 	 0, 	 0, 0xDCB4, /* 0x70 */
+    0xFAB9, 0xCACF, 	 0, 0xFCB3, 0xEAEA, 0xEAEB, 0xD0FA, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xEDE4, 	 0, 	 0, 0xDDE7, /* 0x80 */
+         0, 	 0, 0xDFC9, 	 0, 	 0, 	 0, 	 0, 0xDFED, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEEBC, 	 0, 0xEFC1, /* 0x90 */
+         0, 	 0, 0xCCD2, 	 0, 0xDDA4, 	 0, 	 0, 	 0, /* 0x90 */
+    0xDFCA, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD3F8, 0xF1A8, /* 0xA0 */
+         0, 	 0, 	 0, 0xCDB7, 	 0, 0xEFD4, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE4DD, 0xDFEE, 0xCBAC, /* 0xB0 */
+    0xE9BC, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEAEC, 	 0, /* 0xB0 */
+         0, 	 0, 0xDFCB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xF9BF, 0xD6AF, 0xD5C6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xCFAA, 	 0, 	 0, 0xCEA9, 	 0, 	 0, 0xD6F8, 	 0, /* 0xD0 */
+         0, 	 0, 0xF1B7, 0xEEF8, 	 0, 	 0, 	 0, 0xD9D9, /* 0xD0 */
+    0xF3DF, 	 0, 0xF8C8, 0xCEC6, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xD5E6, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xF4E6, 	 0, 	 0, 0xE6C5, 0xEFD5, /* 0xF0 */
+         0, 	 0, 0xCBEF, 0xFCDF									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_5F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xDCA7,      0,      0, 0xD6E7,      0,      0,      0, /* 0x00 */
-         0,      0, 0xF8C9,      0,      0,      0,      0, 0xE3D2, /* 0x00 */
-         0, 0xE3BD,      0, 0xCFE1, 0xF0C0, 0xECDA,      0, 0xDDD7, /* 0x10 */
-    0xFBF0,      0,      0, 0xECAC,      0,      0,      0, 0xF0A9, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xFAD7, 0xFBC1, /* 0x20 */
-         0, 0xD2C0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xE5B0,      0,      0,      0, 0xEDE5,      0,      0, /* 0x30 */
-         0,      0, 0xCBAD,      0, 0xF9B0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xF7A5,      0, 0xCBAE,      0, 0xDAAF,      0, 0xD8B6,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xD3A7, 0xFBB2, /* 0x50 */
-         0, 0xFDC4,      0, 0xECAD,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xFBA1,      0,      0,      0, 0xE5E9, 0xE9EE, /* 0x60 */
-         0, 0xF3F4, 0xF8F3, 0xF0C1, 0xDEAF, 0xF8B0,      0,      0, /* 0x60 */
-    0xF3E0, 0xE7AF,      0,      0,      0,      0,      0, 0xDBAD, /* 0x70 */
-         0, 0xE6B5,      0,      0, 0xF9A8,      0,      0, 0xDDD8, /* 0x70 */
-    0xE8D9, 0xEFD6,      0,      0,      0, 0xD3E2,      0, 0xE2DF, /* 0x80 */
-         0,      0, 0xFCE0, 0xD7C8, 0xFDAD,      0,      0,      0, /* 0x80 */
-    0xDFEF, 0xCCD3, 0xD3F9,      0,      0,      0,      0, 0xD4F0, /* 0x90 */
-    0xDBC7, 0xDED5,      0,      0,      0,      0, 0xF0F4,      0, /* 0x90 */
-    0xD5D0, 0xE5D9,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xFCC7, 0xDCD6, 0xE2E0,      0,      0,      0, 0xDAB0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xF3A3,      0, 0xD3EC, /* 0xB0 */
-         0, 0xF4CB,      0,      0,      0, 0xFDC5,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xE3FD,      0, 0xF9B1,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xD0FB, 0xECDB,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xF5BC, 0xF2A4, /* 0xD0 */
-    0xD8CE, 0xD8CF,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xF5F7,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xF6E1,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xD2B7,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xFBEC,      0, 0xDDC8  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xDCA7, 	 0, 	 0, 0xD6E7, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xF8C9, 	 0, 	 0, 	 0, 	 0, 0xE3D2, /* 0x00 */
+         0, 0xE3BD, 	 0, 0xCFE1, 0xF0C0, 0xECDA, 	 0, 0xDDD7, /* 0x10 */
+    0xFBF0, 	 0, 	 0, 0xECAC, 	 0, 	 0, 	 0, 0xF0A9, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFAD7, 0xFBC1, /* 0x20 */
+         0, 0xD2C0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xE5B0, 	 0, 	 0, 	 0, 0xEDE5, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xCBAD, 	 0, 0xF9B0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xF7A5, 	 0, 0xCBAE, 	 0, 0xDAAF, 	 0, 0xD8B6, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD3A7, 0xFBB2, /* 0x50 */
+         0, 0xFDC4, 	 0, 0xECAD, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xFBA1, 	 0, 	 0, 	 0, 0xE5E9, 0xE9EE, /* 0x60 */
+         0, 0xF3F4, 0xF8F3, 0xF0C1, 0xDEAF, 0xF8B0, 	 0, 	 0, /* 0x60 */
+    0xF3E0, 0xE7AF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDBAD, /* 0x70 */
+         0, 0xE6B5, 	 0, 	 0, 0xF9A8, 	 0, 	 0, 0xDDD8, /* 0x70 */
+    0xE8D9, 0xEFD6, 	 0, 	 0, 	 0, 0xD3E2, 	 0, 0xE2DF, /* 0x80 */
+         0, 	 0, 0xFCE0, 0xD7C8, 0xFDAD, 	 0, 	 0, 	 0, /* 0x80 */
+    0xDFEF, 0xCCD3, 0xD3F9, 	 0, 	 0, 	 0, 	 0, 0xD4F0, /* 0x90 */
+    0xDBC7, 0xDED5, 	 0, 	 0, 	 0, 	 0, 0xF0F4, 	 0, /* 0x90 */
+    0xD5D0, 0xE5D9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xFCC7, 0xDCD6, 0xE2E0, 	 0, 	 0, 	 0, 0xDAB0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF3A3, 	 0, 0xD3EC, /* 0xB0 */
+         0, 0xF4CB, 	 0, 	 0, 	 0, 0xFDC5, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xE3FD, 	 0, 0xF9B1, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xD0FB, 0xECDB, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF5BC, 0xF2A4, /* 0xD0 */
+    0xD8CE, 0xD8CF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xF5F7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xF6E1, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD2B7, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xFBEC, 	 0, 0xDDC8	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_60[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xE4E8, /* 0x00 */
-         0,      0, 0xD2C1,      0,      0,      0, 0xF8D7,      0, /* 0x10 */
-         0,      0,      0,      0, 0xD6BB, 0xDED6,      0,      0, /* 0x10 */
-    0xF7BD, 0xECAE,      0,      0,      0, 0xD0E1,      0, 0xE0F5, /* 0x20 */
-    0xEAB3,      0, 0xCED6,      0,      0,      0,      0, 0xCCA5, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xECF6, 0xE2E1, 0xE3BE,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xFCC8,      0,      0, /* 0x40 */
-    0xCDF0,      0, 0xF9F6,      0,      0, 0xDFF0,      0,      0, /* 0x50 */
-         0, 0xE5BF,      0,      0,      0, 0xCEBF,      0,      0, /* 0x50 */
-         0,      0, 0xFCE1, 0xEDB0, 0xFDD1, 0xF6BB,      0,      0, /* 0x60 */
-    0xF9CF, 0xEBDA, 0xCAC1,      0, 0xD2B8, 0xCDF1,      0, 0xE3D3, /* 0x60 */
-    0xFDE6,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xE6ED,      0,      0, /* 0x80 */
-         0, 0xE3FA,      0,      0, 0xF0AA, 0xF9D0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0xFCE2,      0, 0xF8A7,      0, /* 0x90 */
-         0,      0, 0xE1E5, 0xEEF9,      0,      0,      0, 0xE7F6, /* 0x90 */
-    0xEAED,      0,      0, 0xFCB4, 0xF5C2,      0,      0, 0xD7DC, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xF0F5,      0, 0xDDE8, 0xD3ED, 0xF5FC,      0, 0xDABF,      0, /* 0xB0 */
-    0xCCFB,      0,      0,      0, 0xD3FA, 0xF4A4,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xEFD7,      0, 0xD4C3, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xFBE3,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xFBED,      0, 0xE0AD,      0,      0, 0xEAEE, /* 0xD0 */
-    0xFBB3, 0xE4C2,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xF6E7, 0xD2DD,      0, 0xDFCC,      0,      0, 0xFCC9,      0, /* 0xF0 */
-         0, 0xE5A9, 0xE0F6, 0xF6B3                                  /* 0xF0 */
+         0, 	 0, 0xD2C1, 	 0, 	 0, 	 0, 0xF8D7, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xD6BB, 0xDED6, 	 0, 	 0, /* 0x10 */
+    0xF7BD, 0xECAE, 	 0, 	 0, 	 0, 0xD0E1, 	 0, 0xE0F5, /* 0x20 */
+    0xEAB3, 	 0, 0xCED6, 	 0, 	 0, 	 0, 	 0, 0xCCA5, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xECF6, 0xE2E1, 0xE3BE, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xFCC8, 	 0, 	 0, /* 0x40 */
+    0xCDF0, 	 0, 0xF9F6, 	 0, 	 0, 0xDFF0, 	 0, 	 0, /* 0x50 */
+         0, 0xE5BF, 	 0, 	 0, 	 0, 0xCEBF, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xFCE1, 0xEDB0, 0xFDD1, 0xF6BB, 	 0, 	 0, /* 0x60 */
+    0xF9CF, 0xEBDA, 0xCAC1, 	 0, 0xD2B8, 0xCDF1, 	 0, 0xE3D3, /* 0x60 */
+    0xFDE6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE6ED, 	 0, 	 0, /* 0x80 */
+         0, 0xE3FA, 	 0, 	 0, 0xF0AA, 0xF9D0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xFCE2, 	 0, 0xF8A7, 	 0, /* 0x90 */
+         0, 	 0, 0xE1E5, 0xEEF9, 	 0, 	 0, 	 0, 0xE7F6, /* 0x90 */
+    0xEAED, 	 0, 	 0, 0xFCB4, 0xF5C2, 	 0, 	 0, 0xD7DC, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xF0F5, 	 0, 0xDDE8, 0xD3ED, 0xF5FC, 	 0, 0xDABF, 	 0, /* 0xB0 */
+    0xCCFB, 	 0, 	 0, 	 0, 0xD3FA, 0xF4A4, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEFD7, 	 0, 0xD4C3, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xFBE3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xFBED, 	 0, 0xE0AD, 	 0, 	 0, 0xEAEE, /* 0xD0 */
+    0xFBB3, 0xE4C2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xF6E7, 0xD2DD, 	 0, 0xDFCC, 	 0, 	 0, 0xFCC9, 	 0, /* 0xF0 */
+         0, 0xE5A9, 0xE0F6, 0xF6B3									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_61[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE1FE,      0,      0,      0,      0, 0xCBF0,      0, /* 0x00 */
-    0xEAEF, 0xEAF0,      0,      0,      0, 0xDAC0, 0xF8B4, 0xEBF2, /* 0x00 */
-         0,      0,      0,      0,      0, 0xE4C3,      0,      0, /* 0x10 */
-         0,      0, 0xE9D7, 0xE4F1,      0,      0,      0, 0xCAEF, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xCED7, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xFCCA,      0,      0,      0, 0xF3E1,      0,      0, 0xCBC4, /* 0x30 */
-         0,      0,      0,      0, 0xE3E5,      0, 0xCBC5, 0xEAB4, /* 0x30 */
-         0,      0, 0xE9BD,      0, 0xD7C9,      0,      0, 0xEBDB, /* 0x40 */
-    0xEDB1,      0, 0xCCC3, 0xF7BE, 0xFCCB,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xF8F4,      0, 0xD9B7,      0,      0, /* 0x50 */
-    0xF3D3, 0xF3D4,      0,      0,      0, 0xF7E4,      0, 0xF7D1, /* 0x50 */
-         0,      0, 0xD8B7, 0xCEB1, 0xCAC2,      0,      0, 0xFBB4, /* 0x60 */
-    0xCBC6,      0,      0, 0xF0F6,      0,      0, 0xD5E7,      0, /* 0x60 */
-    0xEAD0,      0,      0,      0,      0,      0, 0xCCD4, 0xCBAF, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF4AA, 0xE9AF,      0, /* 0x70 */
-         0, 0xF5C3, 0xE9D8,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xDDE9,      0,      0,      0, 0xF1F3,      0, /* 0x80 */
-    0xD5FB, 0xDEBB,      0,      0, 0xF4FB,      0,      0,      0, /* 0x90 */
-    0xFDF3, 0xFDF2, 0xF7A6,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xDDC9,      0,      0, 0xD4D3, /* 0xA0 */
-         0, 0xCCA8,      0, 0xDAC1, 0xCCD5,      0, 0xD9E4,      0, /* 0xA0 */
-         0,      0, 0xFACA,      0,      0,      0, 0xE5E3,      0, /* 0xB0 */
-         0,      0, 0xD3BC,      0,      0,      0, 0xCAF0,      0, /* 0xB0 */
-         0,      0,      0, 0xD0C4,      0,      0,      0, 0xCAD0, /* 0xC0 */
-    0xFAAB, 0xEBEB, 0xE7F8, 0xD9E5,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xD1D7,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0xF3A4,      0,      0,      0, 0xD4FB, 0xFCE3, /* 0xF0 */
-    0xFAD8,      0, 0xF3D5,      0, 0xCFAB,      0,      0, 0xEBF3  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE1FE, 	 0, 	 0, 	 0, 	 0, 0xCBF0, 	 0, /* 0x00 */
+    0xEAEF, 0xEAF0, 	 0, 	 0, 	 0, 0xDAC0, 0xF8B4, 0xEBF2, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE4C3, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xE9D7, 0xE4F1, 	 0, 	 0, 	 0, 0xCAEF, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCED7, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xFCCA, 	 0, 	 0, 	 0, 0xF3E1, 	 0, 	 0, 0xCBC4, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xE3E5, 	 0, 0xCBC5, 0xEAB4, /* 0x30 */
+         0, 	 0, 0xE9BD, 	 0, 0xD7C9, 	 0, 	 0, 0xEBDB, /* 0x40 */
+    0xEDB1, 	 0, 0xCCC3, 0xF7BE, 0xFCCB, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xF8F4, 	 0, 0xD9B7, 	 0, 	 0, /* 0x50 */
+    0xF3D3, 0xF3D4, 	 0, 	 0, 	 0, 0xF7E4, 	 0, 0xF7D1, /* 0x50 */
+         0, 	 0, 0xD8B7, 0xCEB1, 0xCAC2, 	 0, 	 0, 0xFBB4, /* 0x60 */
+    0xCBC6, 	 0, 	 0, 0xF0F6, 	 0, 	 0, 0xD5E7, 	 0, /* 0x60 */
+    0xEAD0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCCD4, 0xCBAF, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF4AA, 0xE9AF, 	 0, /* 0x70 */
+         0, 0xF5C3, 0xE9D8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xDDE9, 	 0, 	 0, 	 0, 0xF1F3, 	 0, /* 0x80 */
+    0xD5FB, 0xDEBB, 	 0, 	 0, 0xF4FB, 	 0, 	 0, 	 0, /* 0x90 */
+    0xFDF3, 0xFDF2, 0xF7A6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xDDC9, 	 0, 	 0, 0xD4D3, /* 0xA0 */
+         0, 0xCCA8, 	 0, 0xDAC1, 0xCCD5, 	 0, 0xD9E4, 	 0, /* 0xA0 */
+         0, 	 0, 0xFACA, 	 0, 	 0, 	 0, 0xE5E3, 	 0, /* 0xB0 */
+         0, 	 0, 0xD3BC, 	 0, 	 0, 	 0, 0xCAF0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xD0C4, 	 0, 	 0, 	 0, 0xCAD0, /* 0xC0 */
+    0xFAAB, 0xEBEB, 0xE7F8, 0xD9E5, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD1D7, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xF3A4, 	 0, 	 0, 	 0, 0xD4FB, 0xFCE3, /* 0xF0 */
+    0xFAD8, 	 0, 0xF3D5, 	 0, 0xCFAB, 	 0, 	 0, 0xEBF3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_62[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD5FC,      0,      0,      0,      0,      0,      0, 0xD3D4, /* 0x00 */
-    0xCDFC,      0, 0xD9E6,      0, 0xE2F9, 0xE2A1, 0xEBD4,      0, /* 0x00 */
-    0xE0F7, 0xE4B2, 0xCCFC,      0,      0,      0, 0xFBE4,      0, /* 0x10 */
-         0,      0, 0xF4AB,      0,      0,      0,      0, 0xD0BD, /* 0x10 */
-         0, 0xCAF1,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xEFB8,      0,      0,      0, 0xD7C0,      0, /* 0x20 */
-    0xEEFA, 0xFDF4,      0,      0, 0xD3E3,      0, 0xFBC2,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xD5E8, 0xDBAE, /* 0x30 */
-    0xE1B6, 0xF8B7,      0,      0,      0,      0,      0, 0xE0BF, /* 0x40 */
-    0xFBC3, 0xDDEA,      0, 0xE2A2,      0, 0xEEA6,      0,      0, /* 0x40 */
-         0,      0,      0, 0xF6E8,      0,      0,      0,      0, /* 0x50 */
-    0xF6F5,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xDDCA,      0, /* 0x60 */
-         0, 0xD0E2,      0,      0,      0,      0, 0xDDA6,      0, /* 0x70 */
-         0, 0xDDEB,      0,      0, 0xE4F9,      0,      0, 0xE3AF, /* 0x70 */
-    0xD0FC,      0,      0,      0, 0xF4FC,      0,      0,      0, /* 0x80 */
-         0, 0xCCBC, 0xF7EA,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xE5E4, 0xDFF1,      0,      0, 0xF7E1,      0, 0xF9F7, /* 0x90 */
-    0xEFB9,      0,      0, 0xF8D8,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xF9A9,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xF8D9,      0,      0,      0, 0xEEBD,      0,      0, /* 0xB0 */
-         0, 0xD8C6,      0,      0, 0xE4E3, 0xF5CE,      0,      0, /* 0xB0 */
-         0,      0, 0xDDD9,      0,      0,      0,      0, 0xD9E7, /* 0xC0 */
-    0xD2B9, 0xD5C3,      0,      0, 0xDAE5, 0xDAD0,      0, 0xD1D9, /* 0xC0 */
-    0xCED8,      0, 0xCBDE, 0xF4AC, 0xDAFB,      0, 0xF6E9, 0xE8F3, /* 0xD0 */
-    0xCFAC, 0xF0F0,      0, 0xF4FD, 0xDBC8,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xCEC0, 0xE3D4, 0xD1CF, 0xF1F5, /* 0xE0 */
-         0, 0xCDF2,      0, 0xCFEB,      0,      0,      0, 0xCDB8, /* 0xF0 */
-         0,      0,      0,      0,      0,      0, 0xE3A6, 0xD1DA  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD5FC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD3D4, /* 0x00 */
+    0xCDFC, 	 0, 0xD9E6, 	 0, 0xE2F9, 0xE2A1, 0xEBD4, 	 0, /* 0x00 */
+    0xE0F7, 0xE4B2, 0xCCFC, 	 0, 	 0, 	 0, 0xFBE4, 	 0, /* 0x10 */
+         0, 	 0, 0xF4AB, 	 0, 	 0, 	 0, 	 0, 0xD0BD, /* 0x10 */
+         0, 0xCAF1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xEFB8, 	 0, 	 0, 	 0, 0xD7C0, 	 0, /* 0x20 */
+    0xEEFA, 0xFDF4, 	 0, 	 0, 0xD3E3, 	 0, 0xFBC2, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD5E8, 0xDBAE, /* 0x30 */
+    0xE1B6, 0xF8B7, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0BF, /* 0x40 */
+    0xFBC3, 0xDDEA, 	 0, 0xE2A2, 	 0, 0xEEA6, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xF6E8, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xF6F5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDDCA, 	 0, /* 0x60 */
+         0, 0xD0E2, 	 0, 	 0, 	 0, 	 0, 0xDDA6, 	 0, /* 0x70 */
+         0, 0xDDEB, 	 0, 	 0, 0xE4F9, 	 0, 	 0, 0xE3AF, /* 0x70 */
+    0xD0FC, 	 0, 	 0, 	 0, 0xF4FC, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xCCBC, 0xF7EA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xE5E4, 0xDFF1, 	 0, 	 0, 0xF7E1, 	 0, 0xF9F7, /* 0x90 */
+    0xEFB9, 	 0, 	 0, 0xF8D8, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xF9A9, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xF8D9, 	 0, 	 0, 	 0, 0xEEBD, 	 0, 	 0, /* 0xB0 */
+         0, 0xD8C6, 	 0, 	 0, 0xE4E3, 0xF5CE, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xDDD9, 	 0, 	 0, 	 0, 	 0, 0xD9E7, /* 0xC0 */
+    0xD2B9, 0xD5C3, 	 0, 	 0, 0xDAE5, 0xDAD0, 	 0, 0xD1D9, /* 0xC0 */
+    0xCED8, 	 0, 0xCBDE, 0xF4AC, 0xDAFB, 	 0, 0xF6E9, 0xE8F3, /* 0xD0 */
+    0xCFAC, 0xF0F0, 	 0, 0xF4FD, 0xDBC8, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xCEC0, 0xE3D4, 0xD1CF, 0xF1F5, /* 0xE0 */
+         0, 0xCDF2, 	 0, 0xCFEB, 	 0, 	 0, 	 0, 0xCDB8, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE3A6, 0xD1DA	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_63[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xF2A5,      0,      0,      0,      0,      0, 0xF2A6, /* 0x00 */
-         0, 0xE4CE,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xD3FB,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xF1A9,      0,      0,      0, 0xF2C9, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xEFD8, 0xE6C9,      0, 0xD8B8, 0xFAF3,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xF3B5,      0,      0, 0xF8A4,      0,      0, 0xD1F3, /* 0x40 */
-    0xE6C8,      0,      0,      0,      0, 0xF8DA,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xDCE9, /* 0x60 */
-    0xDED7,      0,      0,      0,      0,      0, 0xCBDF,      0, /* 0x60 */
-         0,      0, 0xCFEC,      0,      0,      0,      0, 0xF4DF, /* 0x70 */
-         0,      0, 0xD1F4, 0xD2BA,      0,      0,      0, 0xDFF2, /* 0x70 */
-         0,      0,      0, 0xE1B7,      0,      0,      0,      0, /* 0x80 */
-    0xE2A3, 0xD3FC,      0,      0, 0xEDE6,      0,      0,      0, /* 0x80 */
-         0,      0, 0xDBC9,      0,      0,      0, 0xE4FA,      0, /* 0x90 */
-    0xCFDE,      0,      0, 0xCED0,      0,      0,      0,      0, /* 0x90 */
-    0xD5D3, 0xF3F5, 0xF7AE,      0,      0, 0xEFC8,      0, 0xCDF3, /* 0xA0 */
-    0xF5CF, 0xE5F3, 0xF0C2,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xCAD1,      0,      0,      0, 0xEAF1,      0, 0xD0A6,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xD9DA, /* 0xC0 */
-    0xF0AB,      0,      0,      0,      0,      0, 0xEBE7,      0, /* 0xD0 */
-         0,      0, 0xE5C0, 0xFCB5,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xE4C4,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xCCA9, 0xFDC6,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xEAB5,      0, 0xE5AA, 0xDFBA  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xF2A5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF2A6, /* 0x00 */
+         0, 0xE4CE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xD3FB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xF1A9, 	 0, 	 0, 	 0, 0xF2C9, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xEFD8, 0xE6C9, 	 0, 0xD8B8, 0xFAF3, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xF3B5, 	 0, 	 0, 0xF8A4, 	 0, 	 0, 0xD1F3, /* 0x40 */
+    0xE6C8, 	 0, 	 0, 	 0, 	 0, 0xF8DA, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDCE9, /* 0x60 */
+    0xDED7, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBDF, 	 0, /* 0x60 */
+         0, 	 0, 0xCFEC, 	 0, 	 0, 	 0, 	 0, 0xF4DF, /* 0x70 */
+         0, 	 0, 0xD1F4, 0xD2BA, 	 0, 	 0, 	 0, 0xDFF2, /* 0x70 */
+         0, 	 0, 	 0, 0xE1B7, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE2A3, 0xD3FC, 	 0, 	 0, 0xEDE6, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xDBC9, 	 0, 	 0, 	 0, 0xE4FA, 	 0, /* 0x90 */
+    0xCFDE, 	 0, 	 0, 0xCED0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xD5D3, 0xF3F5, 0xF7AE, 	 0, 	 0, 0xEFC8, 	 0, 0xCDF3, /* 0xA0 */
+    0xF5CF, 0xE5F3, 0xF0C2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xCAD1, 	 0, 	 0, 	 0, 0xEAF1, 	 0, 0xD0A6, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD9DA, /* 0xC0 */
+    0xF0AB, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEBE7, 	 0, /* 0xD0 */
+         0, 	 0, 0xE5C0, 0xFCB5, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xE4C4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCCA9, 0xFDC6, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xEAB5, 	 0, 0xE5AA, 0xDFBA	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_64[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xE1DF,      0, 0xDAD1, /* 0x00 */
-         0,      0,      0,      0, 0xE1B8,      0, 0xE8F4, 0xD3FD, /* 0x10 */
-         0,      0,      0,      0, 0xE2A4,      0,      0,      0, /* 0x10 */
-         0,      0, 0xF2CA,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xDAE6, 0xF7B3,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xFDCD,      0,      0,      0, 0xF3B6,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xEED7,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xF5C4,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xD8A4,      0,      0,      0,      0,      0, 0xF2A7, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xD9B8, 0xD9B9, 0xEFC9,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xD6CE,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xF7CB, 0xDFAE, 0xE8F5,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xD2B5,      0,      0,      0, 0xD3D5,      0, /* 0x90 */
-         0,      0,      0,      0, 0xF4CC, 0xDAFC,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xD9E8,      0, 0xF7EB, 0xF5C9,      0, /* 0xA0 */
-    0xF3BC,      0, 0xDAD2,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xD3B5,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE8B6,      0,      0, 0xD6CF, 0xF4BA,      0, 0xF7C9, /* 0xC0 */
-         0,      0, 0xCCAA,      0,      0, 0xF0C3, 0xCCD6,      0, /* 0xC0 */
-         0,      0, 0xD0D3,      0, 0xD3BD,      0,      0,      0, /* 0xD0 */
-    0xDBFB,      0, 0xCBE0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xD3E4, 0xF6F7,      0,      0, 0xD5BA, 0xF3CD, 0xCBE1, /* 0xE0 */
-         0,      0,      0,      0, 0xEBF4,      0,      0,      0, /* 0xE0 */
-         0,      0, 0xF4AD,      0, 0xFCAA,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xF7EC,      0,      0,      0, 0xE8F6          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xE1DF, 	 0, 0xDAD1, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xE1B8, 	 0, 0xE8F4, 0xD3FD, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xE2A4, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xF2CA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xDAE6, 0xF7B3, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xFDCD, 	 0, 	 0, 	 0, 0xF3B6, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xEED7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xF5C4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xD8A4, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF2A7, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xD9B8, 0xD9B9, 0xEFC9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xD6CE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xF7CB, 0xDFAE, 0xE8F5, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xD2B5, 	 0, 	 0, 	 0, 0xD3D5, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xF4CC, 0xDAFC, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xD9E8, 	 0, 0xF7EB, 0xF5C9, 	 0, /* 0xA0 */
+    0xF3BC, 	 0, 0xDAD2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xD3B5, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE8B6, 	 0, 	 0, 0xD6CF, 0xF4BA, 	 0, 0xF7C9, /* 0xC0 */
+         0, 	 0, 0xCCAA, 	 0, 	 0, 0xF0C3, 0xCCD6, 	 0, /* 0xC0 */
+         0, 	 0, 0xD0D3, 	 0, 0xD3BD, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xDBFB, 	 0, 0xCBE0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xD3E4, 0xF6F7, 	 0, 	 0, 0xD5BA, 0xF3CD, 0xCBE1, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xEBF4, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xF4AD, 	 0, 0xFCAA, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xF7EC, 	 0, 	 0, 	 0, 0xE8F6			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_65[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xDAE7,      0,      0,      0, 0xF7CC,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xE5C1,      0,      0,      0,      0, 0xE0EE,      0,      0, /* 0x10 */
-         0,      0,      0, 0xD5FD,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xCEE6, 0xFCAB, 0xD5BB,      0,      0, 0xF2A8, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0xE2A5, 0xCDB9, /* 0x30 */
-    0xEAF2, 0xCBC7,      0, 0xCDF4,      0,      0, 0xDBAF, 0xEFD9, /* 0x30 */
-         0,      0,      0,      0,      0, 0xCDBA,      0,      0, /* 0x40 */
-    0xFCF9,      0,      0,      0,      0, 0xDFF3, 0xCEE7, 0xDAC2, /* 0x40 */
-         0, 0xCFAD,      0,      0,      0,      0, 0xE7F9, 0xF8A8, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xF3E2,      0, /* 0x50 */
-         0,      0, 0xCAF2, 0xDFA4,      0,      0, 0xD4C4,      0, /* 0x60 */
-         0,      0,      0,      0, 0xCCD7, 0xE5C2,      0,      0, /* 0x60 */
-         0,      0, 0xCDBB,      0, 0xEFDA, 0xEED8,      0, 0xDDA7, /* 0x70 */
-    0xE2A6,      0,      0,      0,      0,      0, 0xE0C0,      0, /* 0x70 */
-         0,      0, 0xD6B0, 0xF8CA,      0, 0xFCFA,      0, 0xD9FE, /* 0x80 */
-         0,      0,      0,      0, 0xDEB0,      0,      0,      0, /* 0x80 */
-    0xDDEC, 0xDAE8,      0,      0,      0,      0,      0, 0xD4E0, /* 0x90 */
-         0, 0xD6F9,      0, 0xCDD7, 0xDED8,      0,      0, 0xF2F8, /* 0x90 */
-         0, 0xE4D6,      0,      0, 0xD0C5, 0xF4AE,      0, 0xDDA8, /* 0xA0 */
-         0,      0,      0, 0xEDC5, 0xF3D6,      0,      0, 0xDED9, /* 0xA0 */
-    0xE3E6,      0,      0,      0,      0,      0,      0, 0xD3A8, /* 0xB0 */
-         0, 0xDBB0,      0,      0, 0xE5DA, 0xE3BF,      0,      0, /* 0xB0 */
-         0, 0xDBB1,      0,      0,      0, 0xD5E9,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xE0C1, 0xEFDB,      0,      0, 0xF0E9, /* 0xC0 */
-         0,      0, 0xD7B2,      0,      0,      0,      0, 0xD0FD, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xD9E9,      0,      0, 0xD0FE,      0, 0xECED, 0xD3A9,      0, /* 0xE0 */
-    0xF2A9, 0xF0C4,      0,      0, 0xE2E2, 0xE9EF,      0,      0, /* 0xE0 */
-         0, 0xF9D1,      0,      0, 0xE9D9,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xE8DA, 0xDAC3, 0xDAC4, 0xD4C5,      0, 0xE7FA  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xDAE7, 	 0, 	 0, 	 0, 0xF7CC, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xE5C1, 	 0, 	 0, 	 0, 	 0, 0xE0EE, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xD5FD, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xCEE6, 0xFCAB, 0xD5BB, 	 0, 	 0, 0xF2A8, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2A5, 0xCDB9, /* 0x30 */
+    0xEAF2, 0xCBC7, 	 0, 0xCDF4, 	 0, 	 0, 0xDBAF, 0xEFD9, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCDBA, 	 0, 	 0, /* 0x40 */
+    0xFCF9, 	 0, 	 0, 	 0, 	 0, 0xDFF3, 0xCEE7, 0xDAC2, /* 0x40 */
+         0, 0xCFAD, 	 0, 	 0, 	 0, 	 0, 0xE7F9, 0xF8A8, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF3E2, 	 0, /* 0x50 */
+         0, 	 0, 0xCAF2, 0xDFA4, 	 0, 	 0, 0xD4C4, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xCCD7, 0xE5C2, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xCDBB, 	 0, 0xEFDA, 0xEED8, 	 0, 0xDDA7, /* 0x70 */
+    0xE2A6, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0C0, 	 0, /* 0x70 */
+         0, 	 0, 0xD6B0, 0xF8CA, 	 0, 0xFCFA, 	 0, 0xD9FE, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xDEB0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xDDEC, 0xDAE8, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD4E0, /* 0x90 */
+         0, 0xD6F9, 	 0, 0xCDD7, 0xDED8, 	 0, 	 0, 0xF2F8, /* 0x90 */
+         0, 0xE4D6, 	 0, 	 0, 0xD0C5, 0xF4AE, 	 0, 0xDDA8, /* 0xA0 */
+         0, 	 0, 	 0, 0xEDC5, 0xF3D6, 	 0, 	 0, 0xDED9, /* 0xA0 */
+    0xE3E6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD3A8, /* 0xB0 */
+         0, 0xDBB0, 	 0, 	 0, 0xE5DA, 0xE3BF, 	 0, 	 0, /* 0xB0 */
+         0, 0xDBB1, 	 0, 	 0, 	 0, 0xD5E9, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xE0C1, 0xEFDB, 	 0, 	 0, 0xF0E9, /* 0xC0 */
+         0, 	 0, 0xD7B2, 	 0, 	 0, 	 0, 	 0, 0xD0FD, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xD9E9, 	 0, 	 0, 0xD0FE, 	 0, 0xECED, 0xD3A9, 	 0, /* 0xE0 */
+    0xF2A9, 0xF0C4, 	 0, 	 0, 0xE2E2, 0xE9EF, 	 0, 	 0, /* 0xE0 */
+         0, 0xF9D1, 	 0, 	 0, 0xE9D9, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xE8DA, 0xDAC3, 0xDAC4, 0xD4C5, 	 0, 0xE7FA	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_66[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                     0xCDE0, 0xE3B0, /* 0x00 */
-         0, 0xDBB2, 0xFBC4,      0, 0xF3E3,      0, 0xD9A5, 0xFBE7, /* 0x00 */
-    0xDDCB, 0xD0D4,      0, 0xE6B6, 0xE0AE, 0xFDDA,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xDCB5, 0xE0F8, /* 0x10 */
-    0xE7B1,      0,      0,      0,      0, 0xF5F0,      0, 0xD8DC, /* 0x20 */
-    0xEDC6,      0,      0,      0,      0, 0xE1B9,      0, 0xE3C0, /* 0x20 */
-    0xF9C0, 0xE9F0,      0,      0, 0xD9DB,      0, 0xF3E4,      0, /* 0x30 */
-         0,      0, 0xDCB6, 0xE4E9,      0,      0,      0,      0, /* 0x30 */
-         0, 0xF0C5, 0xE3C1, 0xFCCC, 0xFCCD,      0,      0,      0, /* 0x40 */
-         0, 0xF2CB,      0, 0xF2CC,      0,      0,      0, 0xE4CF, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xF1DB,      0, 0xFAD9,      0, 0xF1B8, 0xFDF5, 0xE0F9, /* 0x50 */
-         0,      0,      0,      0, 0xE7FB, 0xFCB7, 0xFCE4, 0xFBC5, /* 0x60 */
-    0xE3E7, 0xD8B9,      0, 0xF6F8,      0,      0, 0xDCC5, 0xCCD8, /* 0x60 */
-         0,      0,      0, 0xE0AF, 0xF4E7,      0, 0xEFDC, 0xCFFC, /* 0x70 */
-    0xEFDD,      0, 0xF2AA,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xFDBE,      0,      0, 0xCAAC, /* 0x80 */
-    0xFDBB, 0xFDC7,      0,      0,      0,      0, 0xE7B2,      0, /* 0x80 */
-    0xEAD1, 0xDFF4,      0,      0,      0,      0, 0xD1EC, 0xE4DE, /* 0x90 */
-    0xE5C3,      0,      0,      0,      0, 0xD9A6,      0,      0, /* 0x90 */
-    0xCDBC,      0, 0xF3E5,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xEDD5,      0,      0, 0xD9BA,      0, /* 0xA0 */
-         0,      0, 0xEDE7, 0xFBB5, 0xF8EC,      0,      0,      0, /* 0xB0 */
-         0, 0xE0E7,      0, 0xCCD9,      0,      0, 0xD4C6,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xE7A5,      0, 0xD5F5, 0xD3BE, /* 0xC0 */
-         0, 0xFCFB,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xE4F2,      0, /* 0xD0 */
-         0, 0xDFF5,      0,      0, 0xE8F8, 0xF8ED,      0,      0, /* 0xD0 */
-    0xCEC7,      0,      0,      0,      0,      0, 0xFDF6,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xE8D8,      0, 0xCDD8, 0xE7D6, 0xCCDA,      0,      0, 0xCAE3, /* 0xF0 */
-    0xDFF6, 0xF0C7, 0xF0C6,      0, 0xD8BA,      0, 0xF1F4, 0xF4F0  /* 0xF0 */
+         0, 0xDBB2, 0xFBC4, 	 0, 0xF3E3, 	 0, 0xD9A5, 0xFBE7, /* 0x00 */
+    0xDDCB, 0xD0D4, 	 0, 0xE6B6, 0xE0AE, 0xFDDA, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDCB5, 0xE0F8, /* 0x10 */
+    0xE7B1, 	 0, 	 0, 	 0, 	 0, 0xF5F0, 	 0, 0xD8DC, /* 0x20 */
+    0xEDC6, 	 0, 	 0, 	 0, 	 0, 0xE1B9, 	 0, 0xE3C0, /* 0x20 */
+    0xF9C0, 0xE9F0, 	 0, 	 0, 0xD9DB, 	 0, 0xF3E4, 	 0, /* 0x30 */
+         0, 	 0, 0xDCB6, 0xE4E9, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xF0C5, 0xE3C1, 0xFCCC, 0xFCCD, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xF2CB, 	 0, 0xF2CC, 	 0, 	 0, 	 0, 0xE4CF, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xF1DB, 	 0, 0xFAD9, 	 0, 0xF1B8, 0xFDF5, 0xE0F9, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xE7FB, 0xFCB7, 0xFCE4, 0xFBC5, /* 0x60 */
+    0xE3E7, 0xD8B9, 	 0, 0xF6F8, 	 0, 	 0, 0xDCC5, 0xCCD8, /* 0x60 */
+         0, 	 0, 	 0, 0xE0AF, 0xF4E7, 	 0, 0xEFDC, 0xCFFC, /* 0x70 */
+    0xEFDD, 	 0, 0xF2AA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xFDBE, 	 0, 	 0, 0xCAAC, /* 0x80 */
+    0xFDBB, 0xFDC7, 	 0, 	 0, 	 0, 	 0, 0xE7B2, 	 0, /* 0x80 */
+    0xEAD1, 0xDFF4, 	 0, 	 0, 	 0, 	 0, 0xD1EC, 0xE4DE, /* 0x90 */
+    0xE5C3, 	 0, 	 0, 	 0, 	 0, 0xD9A6, 	 0, 	 0, /* 0x90 */
+    0xCDBC, 	 0, 0xF3E5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xEDD5, 	 0, 	 0, 0xD9BA, 	 0, /* 0xA0 */
+         0, 	 0, 0xEDE7, 0xFBB5, 0xF8EC, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE0E7, 	 0, 0xCCD9, 	 0, 	 0, 0xD4C6, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xE7A5, 	 0, 0xD5F5, 0xD3BE, /* 0xC0 */
+         0, 0xFCFB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4F2, 	 0, /* 0xD0 */
+         0, 0xDFF5, 	 0, 	 0, 0xE8F8, 0xF8ED, 	 0, 	 0, /* 0xD0 */
+    0xCEC7, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFDF6, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE8D8, 	 0, 0xCDD8, 0xE7D6, 0xCCDA, 	 0, 	 0, 0xCAE3, /* 0xF0 */
+    0xDFF6, 0xF0C7, 0xF0C6, 	 0, 0xD8BA, 	 0, 0xF1F4, 0xF4F0	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_67[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF5CC,      0,      0, 0xFCE5,      0,      0,      0,      0, /* 0x00 */
-    0xEAC5, 0xEAF3,      0, 0xDDDB,      0, 0xDCD7,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0xDEFD, 0xF2F9,      0, 0xD5C7, /* 0x10 */
-         0,      0,      0, 0xD8D0,      0, 0xF0C8, 0xD1A1, 0xD1A2, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xD9D4, 0xD6E8, /* 0x20 */
-    0xD9CA,      0, 0xDAB1, 0xD8C7, 0xDCE2, 0xF3CE, 0xF5F4,      0, /* 0x20 */
-         0, 0xF1B9,      0,      0, 0xDAD3,      0, 0xF6EA,      0, /* 0x30 */
-         0,      0, 0xCFF5,      0,      0, 0xFDAE,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xCAD2,      0, /* 0x40 */
-         0, 0xDFB4,      0,      0,      0,      0, 0xD7DD, 0xFABA, /* 0x40 */
-    0xEEA7, 0xF5BD,      0, 0xF8F5,      0,      0, 0xEDE8,      0, /* 0x50 */
-         0,      0,      0,      0, 0xD4E1,      0, 0xD1A3, 0xE1D6, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xF9F8,      0, 0xDBCA, /* 0x60 */
-    0xCBF9, 0xD4D4,      0, 0xD9DC,      0, 0xEEBE,      0, 0xF7ED, /* 0x70 */
-         0,      0,      0, 0xD2EE,      0,      0, 0xE1E6, 0xF7F9, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xDDED, /* 0x80 */
-         0, 0xE8DB,      0, 0xDBB3,      0,      0,      0, 0xD1F7, /* 0x80 */
-    0xE0B0,      0,      0, 0xD4E2,      0, 0xF6D7,      0, 0xD7F9, /* 0x90 */
-         0,      0, 0xD8DD,      0, 0xCDFD, 0xF2AB,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0xCDBD, /* 0xA0 */
-    0xF8C2,      0,      0, 0xF2AC,      0,      0, 0xCAAD, 0xCAAE, /* 0xB0 */
-    0xCFAE,      0,      0,      0,      0,      0, 0xE3C2,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xDCB7,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xDBDA, /* 0xC0 */
-    0xD9BB, 0xCAF3, 0xF6D3, 0xE6F8, 0xEAF5,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xEAF6,      0,      0, 0xF6F9,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xCFAF,      0,      0, 0xCAD3,      0,      0, 0xCAAF, /* 0xE0 */
-    0xD2B0, 0xF1BA,      0, 0xD7B3, 0xE3C3, 0xF3FD, 0xDEDA,      0, /* 0xF0 */
-         0,      0,      0, 0xDEDB,      0,      0, 0xEFDE          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF5CC, 	 0, 	 0, 0xFCE5, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xEAC5, 0xEAF3, 	 0, 0xDDDB, 	 0, 0xDCD7, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xDEFD, 0xF2F9, 	 0, 0xD5C7, /* 0x10 */
+         0, 	 0, 	 0, 0xD8D0, 	 0, 0xF0C8, 0xD1A1, 0xD1A2, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD9D4, 0xD6E8, /* 0x20 */
+    0xD9CA, 	 0, 0xDAB1, 0xD8C7, 0xDCE2, 0xF3CE, 0xF5F4, 	 0, /* 0x20 */
+         0, 0xF1B9, 	 0, 	 0, 0xDAD3, 	 0, 0xF6EA, 	 0, /* 0x30 */
+         0, 	 0, 0xCFF5, 	 0, 	 0, 0xFDAE, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCAD2, 	 0, /* 0x40 */
+         0, 0xDFB4, 	 0, 	 0, 	 0, 	 0, 0xD7DD, 0xFABA, /* 0x40 */
+    0xEEA7, 0xF5BD, 	 0, 0xF8F5, 	 0, 	 0, 0xEDE8, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xD4E1, 	 0, 0xD1A3, 0xE1D6, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF9F8, 	 0, 0xDBCA, /* 0x60 */
+    0xCBF9, 0xD4D4, 	 0, 0xD9DC, 	 0, 0xEEBE, 	 0, 0xF7ED, /* 0x70 */
+         0, 	 0, 	 0, 0xD2EE, 	 0, 	 0, 0xE1E6, 0xF7F9, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDDED, /* 0x80 */
+         0, 0xE8DB, 	 0, 0xDBB3, 	 0, 	 0, 	 0, 0xD1F7, /* 0x80 */
+    0xE0B0, 	 0, 	 0, 0xD4E2, 	 0, 0xF6D7, 	 0, 0xD7F9, /* 0x90 */
+         0, 	 0, 0xD8DD, 	 0, 0xCDFD, 0xF2AB, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCDBD, /* 0xA0 */
+    0xF8C2, 	 0, 	 0, 0xF2AC, 	 0, 	 0, 0xCAAD, 0xCAAE, /* 0xB0 */
+    0xCFAE, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE3C2, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xDCB7, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDBDA, /* 0xC0 */
+    0xD9BB, 0xCAF3, 0xF6D3, 0xE6F8, 0xEAF5, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xEAF6, 	 0, 	 0, 0xF6F9, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xCFAF, 	 0, 	 0, 0xCAD3, 	 0, 	 0, 0xCAAF, /* 0xE0 */
+    0xD2B0, 0xF1BA, 	 0, 0xD7B3, 0xE3C3, 0xF3FD, 0xDEDA, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xDEDB, 	 0, 	 0, 0xEFDE			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_68[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xE2E3, 0xEEFB,      0,      0, 0xDFF7, 0xD7CA, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xCEE8, 0xDBDB,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xF1BB,      0,      0,      0,      0, 0xE9F1, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xFAB7, 0xD0C6,      0,      0, 0xCCAB, 0xEEA8,      0,      0, /* 0x30 */
-    0xCBFA, 0xF9F9, 0xCCFD, 0xD3FE,      0,      0,      0,      0, /* 0x40 */
-    0xE4D0,      0,      0,      0,      0,      0, 0xF2EE,      0, /* 0x40 */
-    0xD4D5, 0xDFCD,      0, 0xFCB8, 0xD1D0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xF2CD,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xF7D2,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xCAD4, /* 0x70 */
-         0, 0xD5D9,      0,      0,      0, 0xD8DE,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0, 0xCDD9, /* 0x80 */
-         0,      0,      0, 0xEEA9, 0xF6BC,      0,      0, 0xCCDB, /* 0x90 */
-         0,      0,      0,      0,      0, 0xF0C9,      0, 0xFCFC, /* 0x90 */
-         0, 0xE8C9, 0xF4FE,      0,      0,      0,      0, 0xE7FC, /* 0xA0 */
-    0xD7DE,      0,      0,      0,      0, 0xDEDC,      0, 0xF0AC, /* 0xA0 */
-    0xCCFE, 0xCDE1,      0, 0xE1BA,      0, 0xDBEF, 0xDAB2,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xD1A5, 0xDCB8,      0,      0, /* 0xC0 */
-         0, 0xD8F6,      0, 0xD1A4,      0, 0xCDE2,      0,      0, /* 0xC0 */
-         0,      0, 0xDCEA,      0,      0, 0xF0F7,      0, 0xF0CA, /* 0xD0 */
-    0xD0BE,      0, 0xDDDC,      0,      0,      0,      0, 0xD4D6, /* 0xD0 */
-    0xD3D6,      0,      0,      0,      0,      0,      0, 0xEDD0, /* 0xE0 */
-    0xCDA1,      0,      0,      0,      0,      0, 0xDFB5,      0, /* 0xE0 */
-         0,      0, 0xDFF8,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xD4A1, 0xCEB2                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xE2E3, 0xEEFB, 	 0, 	 0, 0xDFF7, 0xD7CA, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xCEE8, 0xDBDB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF1BB, 	 0, 	 0, 	 0, 	 0, 0xE9F1, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xFAB7, 0xD0C6, 	 0, 	 0, 0xCCAB, 0xEEA8, 	 0, 	 0, /* 0x30 */
+    0xCBFA, 0xF9F9, 0xCCFD, 0xD3FE, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xE4D0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF2EE, 	 0, /* 0x40 */
+    0xD4D5, 0xDFCD, 	 0, 0xFCB8, 0xD1D0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF2CD, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF7D2, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCAD4, /* 0x70 */
+         0, 0xD5D9, 	 0, 	 0, 	 0, 0xD8DE, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCDD9, /* 0x80 */
+         0, 	 0, 	 0, 0xEEA9, 0xF6BC, 	 0, 	 0, 0xCCDB, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF0C9, 	 0, 0xFCFC, /* 0x90 */
+         0, 0xE8C9, 0xF4FE, 	 0, 	 0, 	 0, 	 0, 0xE7FC, /* 0xA0 */
+    0xD7DE, 	 0, 	 0, 	 0, 	 0, 0xDEDC, 	 0, 0xF0AC, /* 0xA0 */
+    0xCCFE, 0xCDE1, 	 0, 0xE1BA, 	 0, 0xDBEF, 0xDAB2, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xD1A5, 0xDCB8, 	 0, 	 0, /* 0xC0 */
+         0, 0xD8F6, 	 0, 0xD1A4, 	 0, 0xCDE2, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xDCEA, 	 0, 	 0, 0xF0F7, 	 0, 0xF0CA, /* 0xD0 */
+    0xD0BE, 	 0, 0xDDDC, 	 0, 	 0, 	 0, 	 0, 0xD4D6, /* 0xD0 */
+    0xD3D6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEDD0, /* 0xE0 */
+    0xCDA1, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDFB5, 	 0, /* 0xE0 */
+         0, 	 0, 0xDFF8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xD4A1, 0xCEB2											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_69[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE8CA,      0,      0,      0,      0, 0xEBF5,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0xE3D5, 0xF5D0,      0, /* 0x00 */
-         0,      0, 0xF5A1,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xD9A7, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xE5AB,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xE6CB,      0, 0xF5F1, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xE5C5,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xF9A3, 0xE0DB, 0xF6EB,      0, 0xCBF1, /* 0x50 */
-         0, 0xD9EA, 0xF5A2,      0,      0,      0, 0xD7D1,      0, /* 0x50 */
-    0xD1F8, 0xEAF8, 0xEAF9, 0xDAB3,      0,      0,      0,      0, /* 0x60 */
-    0xEFDF,      0,      0, 0xF1EF,      0, 0xE5F6, 0xEEBF, 0xE2E4, /* 0x60 */
-         0,      0,      0,      0,      0, 0xD0BF,      0, 0xFAAC, /* 0x70 */
-    0xF5D1, 0xE7B3,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xE9BE,      0,      0, /* 0x90 */
-         0,      0,      0, 0xF2CE, 0xDBB4,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xFCCE,      0, 0xDDEE, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xE7B4,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xD7B4,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xF7B4,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xCDBE,      0, 0xDAE9,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xCFB0, 0xF7D9, 0xF3E6,      0,      0, /* 0xC0 */
-    0xCED9,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xCEAA,      0, 0xCBC8,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xD0A7,      0, 0xF0CB,      0, 0xD0C7  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE8CA, 	 0, 	 0, 	 0, 	 0, 0xEBF5, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE3D5, 0xF5D0, 	 0, /* 0x00 */
+         0, 	 0, 0xF5A1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD9A7, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xE5AB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE6CB, 	 0, 0xF5F1, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xE5C5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xF9A3, 0xE0DB, 0xF6EB, 	 0, 0xCBF1, /* 0x50 */
+         0, 0xD9EA, 0xF5A2, 	 0, 	 0, 	 0, 0xD7D1, 	 0, /* 0x50 */
+    0xD1F8, 0xEAF8, 0xEAF9, 0xDAB3, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xEFDF, 	 0, 	 0, 0xF1EF, 	 0, 0xE5F6, 0xEEBF, 0xE2E4, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD0BF, 	 0, 0xFAAC, /* 0x70 */
+    0xF5D1, 0xE7B3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE9BE, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xF2CE, 0xDBB4, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xFCCE, 	 0, 0xDDEE, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7B4, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xD7B4, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xF7B4, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xCDBE, 	 0, 0xDAE9, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xCFB0, 0xF7D9, 0xF3E6, 	 0, 	 0, /* 0xC0 */
+    0xCED9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xCEAA, 	 0, 0xCBC8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xD0A7, 	 0, 0xF0CB, 	 0, 0xD0C7	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_6A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xE4C5,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xDBE0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xD5DA,      0, 0xD7A7,      0,      0,      0, 0xEEC0, /* 0x10 */
-         0, 0xF8F6,      0,      0,      0,      0, 0xF5D2, 0xEDE9, /* 0x10 */
-         0, 0xD9BC,      0, 0xE5C6,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xF5A3,      0,      0, /* 0x30 */
-    0xDAD4, 0xE2A7, 0xFBFC,      0,      0, 0xF1DC,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xCAF4,      0,      0,      0, /* 0x40 */
-    0xE8FA,      0,      0, 0xCEE9,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xE9F8, 0xE2E5,      0,      0,      0,      0, /* 0x50 */
-    0xD0B9, 0xD4F2,      0,      0,      0,      0,      0, 0xD1A6, /* 0x50 */
-         0, 0xDFCE,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xFCF4,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xD3AA,      0,      0,      0, 0xCCAC,      0,      0,      0, /* 0x80 */
-         0, 0xEFE0,      0,      0,      0, 0xE5E5, 0xD0D5,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0, 0xDBFC, /* 0x90 */
-         0,      0,      0,      0, 0xFCE6,      0,      0,      0, /* 0x90 */
-         0,      0, 0xCBFE, 0xEDEA,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xDEB1,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xF9E3,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xD4A2, 0xCFF6,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xD6D0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xD5EA, 0xF1EE,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xFACB,      0, /* 0xF0 */
-         0,      0,      0, 0xE5A1                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xE4C5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xDBE0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xD5DA, 	 0, 0xD7A7, 	 0, 	 0, 	 0, 0xEEC0, /* 0x10 */
+         0, 0xF8F6, 	 0, 	 0, 	 0, 	 0, 0xF5D2, 0xEDE9, /* 0x10 */
+         0, 0xD9BC, 	 0, 0xE5C6, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF5A3, 	 0, 	 0, /* 0x30 */
+    0xDAD4, 0xE2A7, 0xFBFC, 	 0, 	 0, 0xF1DC, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xCAF4, 	 0, 	 0, 	 0, /* 0x40 */
+    0xE8FA, 	 0, 	 0, 0xCEE9, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xE9F8, 0xE2E5, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xD0B9, 0xD4F2, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD1A6, /* 0x50 */
+         0, 0xDFCE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xFCF4, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xD3AA, 	 0, 	 0, 	 0, 0xCCAC, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xEFE0, 	 0, 	 0, 	 0, 0xE5E5, 0xD0D5, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDBFC, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xFCE6, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xCBFE, 0xEDEA, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xDEB1, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xF9E3, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xD4A2, 0xCFF6, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xD6D0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xD5EA, 0xF1EE, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFACB, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xE5A1									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_6B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xD5B1,      0,      0,      0, /* 0x00 */
-         0,      0, 0xCFED,      0, 0xEDEB,      0,      0,      0, /* 0x00 */
-         0,      0, 0xD5B2,      0,      0,      0, 0xD5BC,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xFDE2, 0xF3AD,      0, 0xFDDB,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xE9B0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xD1A7,      0,      0, 0xFDE3, 0xCEB3,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xFDE4, 0xFACE, /* 0x40 */
-         0,      0,      0,      0, 0xCAB0,      0, 0xF7A7,      0, /* 0x40 */
-    0xCFB1,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xE6A2, /* 0x50 */
-         0, 0xFCB6, 0xF2AD, 0xEFE1, 0xF3AE, 0xDCC6, 0xD9EB,      0, /* 0x60 */
-         0,      0, 0xE8E0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xE1A8,      0,      0,      0,      0, 0xD5F6, /* 0x70 */
-    0xCFFD,      0,      0, 0xDEDD,      0,      0,      0, 0xD9D1, /* 0x70 */
-         0,      0,      0, 0xE4EA, 0xF2CF,      0, 0xF7BF,      0, /* 0x80 */
-         0, 0xE2E6, 0xE2A8,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xE3D6,      0, /* 0x90 */
-    0xEDD1,      0,      0,      0,      0,      0, 0xE9F9,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xD6B1, 0xDEB2, /* 0xA0 */
-         0,      0, 0xE0E8,      0,      0, 0xD3AB,      0, 0xEBDC, /* 0xB0 */
-         0,      0, 0xDFAF,      0, 0xCAC3,      0,      0, 0xEEFC, /* 0xB0 */
-         0, 0xFDC3,      0,      0,      0, 0xEBF6, 0xCFB2,      0, /* 0xC0 */
-         0,      0,      0, 0xD9EC,      0, 0xD9BD,      0, 0xD8DF, /* 0xC0 */
-         0,      0, 0xD4B8, 0xEBBE, 0xDDEF,      0, 0xDDF0, 0xDDF1, /* 0xD0 */
-    0xDDF2,      0,      0, 0xD9BE,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xFBC6, 0xCFB3                          /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xD5B1, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xCFED, 	 0, 0xEDEB, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xD5B2, 	 0, 	 0, 	 0, 0xD5BC, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xFDE2, 0xF3AD, 	 0, 0xFDDB, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xE9B0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xD1A7, 	 0, 	 0, 0xFDE3, 0xCEB3, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFDE4, 0xFACE, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xCAB0, 	 0, 0xF7A7, 	 0, /* 0x40 */
+    0xCFB1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6A2, /* 0x50 */
+         0, 0xFCB6, 0xF2AD, 0xEFE1, 0xF3AE, 0xDCC6, 0xD9EB, 	 0, /* 0x60 */
+         0, 	 0, 0xE8E0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xE1A8, 	 0, 	 0, 	 0, 	 0, 0xD5F6, /* 0x70 */
+    0xCFFD, 	 0, 	 0, 0xDEDD, 	 0, 	 0, 	 0, 0xD9D1, /* 0x70 */
+         0, 	 0, 	 0, 0xE4EA, 0xF2CF, 	 0, 0xF7BF, 	 0, /* 0x80 */
+         0, 0xE2E6, 0xE2A8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE3D6, 	 0, /* 0x90 */
+    0xEDD1, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9F9, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD6B1, 0xDEB2, /* 0xA0 */
+         0, 	 0, 0xE0E8, 	 0, 	 0, 0xD3AB, 	 0, 0xEBDC, /* 0xB0 */
+         0, 	 0, 0xDFAF, 	 0, 0xCAC3, 	 0, 	 0, 0xEEFC, /* 0xB0 */
+         0, 0xFDC3, 	 0, 	 0, 	 0, 0xEBF6, 0xCFB2, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xD9EC, 	 0, 0xD9BD, 	 0, 0xD8DF, /* 0xC0 */
+         0, 	 0, 0xD4B8, 0xEBBE, 0xDDEF, 	 0, 0xDDF0, 0xDDF1, /* 0xD0 */
+    0xDDF2, 	 0, 	 0, 0xD9BE, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xFBC6, 0xCFB3							/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_6C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xEEFD,      0,      0,      0,      0,      0,      0, 0xE4AB, /* 0x00 */
-         0, 0xDAC5,      0, 0xD8EC,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xD1A8,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xE2A9,      0,      0, 0xDEBC, /* 0x30 */
-    0xE7B5,      0,      0,      0,      0,      0, 0xDBF0,      0, /* 0x30 */
-    0xEFE2, 0xF1F0, 0xCFB4,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xDBF1,      0, /* 0x40 */
-    0xE0B1,      0,      0,      0,      0, 0xDFA5,      0, 0xF9D2, /* 0x50 */
-         0,      0, 0xE7FD,      0,      0, 0xE6A3, 0xFBF1, 0xCBB0, /* 0x50 */
-    0xF2AE,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0xCDE7,      0, 0xE8DC,      0,      0, 0xE7D7,      0,      0, /* 0x60 */
-    0xF7C0,      0, 0xD0E3,      0,      0,      0, 0xDAA1,      0, /* 0x70 */
-         0,      0, 0xCCBD,      0,      0, 0xD1A9, 0xDDCC,      0, /* 0x70 */
-         0, 0xE3FE, 0xD1AA, 0xE8AA,      0, 0xEAB6, 0xF9FA, 0xE6CC, /* 0x80 */
-    0xF6D8,      0,      0,      0, 0xD4C7,      0,      0,      0, /* 0x80 */
-    0xD9CB,      0, 0xD9D2, 0xD3CB, 0xD8F7, 0xDAA9, 0xF5F8,      0, /* 0x90 */
-         0, 0xDEDE, 0xF2AF, 0xF8A9,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xD8C8,      0,      0, 0xEEC1,      0, /* 0xA0 */
-         0,      0,      0, 0xF9C1,      0,      0,      0,      0, /* 0xB0 */
-    0xDDF3, 0xEAFA,      0, 0xF6BD, 0xE1BB, 0xCDBF, 0xF4D4, 0xE6CD, /* 0xB0 */
-         0, 0xFCCF, 0xFBA2,      0, 0xE0DC,      0,      0,      0, /* 0xC0 */
-         0, 0xF4BB, 0xDAD5,      0, 0xF9B2,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xFBF2,      0, 0xDBF6,      0, 0xDEDF, /* 0xD0 */
-         0,      0,      0, 0xDBF2,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xF8DC, 0xF7EE, 0xEBE8,      0, 0xD2FA,      0,      0, /* 0xE0 */
-    0xF1BC,      0,      0, 0xFADA,      0,      0, 0xDAEA, 0xDAC6, /* 0xE0 */
-    0xF7C1,      0,      0, 0xE7B6                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xEEFD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4AB, /* 0x00 */
+         0, 0xDAC5, 	 0, 0xD8EC, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xD1A8, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xE2A9, 	 0, 	 0, 0xDEBC, /* 0x30 */
+    0xE7B5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDBF0, 	 0, /* 0x30 */
+    0xEFE2, 0xF1F0, 0xCFB4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDBF1, 	 0, /* 0x40 */
+    0xE0B1, 	 0, 	 0, 	 0, 	 0, 0xDFA5, 	 0, 0xF9D2, /* 0x50 */
+         0, 	 0, 0xE7FD, 	 0, 	 0, 0xE6A3, 0xFBF1, 0xCBB0, /* 0x50 */
+    0xF2AE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xCDE7, 	 0, 0xE8DC, 	 0, 	 0, 0xE7D7, 	 0, 	 0, /* 0x60 */
+    0xF7C0, 	 0, 0xD0E3, 	 0, 	 0, 	 0, 0xDAA1, 	 0, /* 0x70 */
+         0, 	 0, 0xCCBD, 	 0, 	 0, 0xD1A9, 0xDDCC, 	 0, /* 0x70 */
+         0, 0xE3FE, 0xD1AA, 0xE8AA, 	 0, 0xEAB6, 0xF9FA, 0xE6CC, /* 0x80 */
+    0xF6D8, 	 0, 	 0, 	 0, 0xD4C7, 	 0, 	 0, 	 0, /* 0x80 */
+    0xD9CB, 	 0, 0xD9D2, 0xD3CB, 0xD8F7, 0xDAA9, 0xF5F8, 	 0, /* 0x90 */
+         0, 0xDEDE, 0xF2AF, 0xF8A9, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xD8C8, 	 0, 	 0, 0xEEC1, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xF9C1, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xDDF3, 0xEAFA, 	 0, 0xF6BD, 0xE1BB, 0xCDBF, 0xF4D4, 0xE6CD, /* 0xB0 */
+         0, 0xFCCF, 0xFBA2, 	 0, 0xE0DC, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xF4BB, 0xDAD5, 	 0, 0xF9B2, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xFBF2, 	 0, 0xDBF6, 	 0, 0xDEDF, /* 0xD0 */
+         0, 	 0, 	 0, 0xDBF2, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xF8DC, 0xF7EE, 0xEBE8, 	 0, 0xD2FA, 	 0, 	 0, /* 0xE0 */
+    0xF1BC, 	 0, 	 0, 0xFADA, 	 0, 	 0, 0xDAEA, 0xDAC6, /* 0xE0 */
+    0xF7C1, 	 0, 	 0, 0xE7B6									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_6D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xE5C7, 0xD6AC,      0,      0,      0, /* 0x00 */
-         0, 0xDCC7,      0,      0,      0,      0,      0, 0xE1A9, /* 0x10 */
-         0, 0xE2AA,      0, 0xD5A6,      0,      0, 0xD4D7,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xF2D0,      0, 0xEAFB, /* 0x20 */
-         0, 0xE0DD, 0xFBF3,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xF1BD,      0,      0, 0xE2E7, 0xFDD7,      0, /* 0x30 */
-    0xCEC8, 0xEAB7,      0, 0xFCC0,      0, 0xFDE7, 0xF7EF,      0, /* 0x30 */
-         0, 0xD7B5,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xEFBA, 0xF1DD,      0, 0xDEB3,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xE8CB,      0,      0, 0xF8DD,      0, /* 0x60 */
-         0, 0xFBC7, 0xD5C8,      0, 0xD7DF,      0, 0xDDA9,      0, /* 0x60 */
-         0,      0,      0,      0, 0xE9B1,      0,      0, 0xFAAD, /* 0x70 */
-    0xF6D9, 0xFAF4,      0,      0,      0,      0,      0, 0xF8AA, /* 0x70 */
-         0,      0,      0,      0,      0, 0xE6EE,      0, 0xCCDC, /* 0x80 */
-    0xE1BC, 0xE0EF,      0,      0, 0xE9BF, 0xFCFD, 0xE6CE,      0, /* 0x80 */
-         0, 0xE1D7,      0, 0xE6CF,      0, 0xF4F1,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE4F3, /* 0xA0 */
-         0,      0, 0xE4FB,      0,      0, 0xF9E4,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xEFE3,      0,      0, 0xCFEE, 0xF6BE, 0xE0B2, 0xFCFE, 0xD1AB, /* 0xC0 */
-         0,      0,      0, 0xD7FA,      0,      0,      0, 0xFBC8, /* 0xC0 */
-         0, 0xE2D7,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xD4A3, 0xF0F8, 0xD7A8,      0,      0,      0, 0xE1E7,      0, /* 0xD0 */
-         0, 0xD3BF,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xEFE4,      0, 0xD7C5, 0xEBE2,      0,      0, 0xFCE7,      0, /* 0xE0 */
-         0, 0xE4A2,      0, 0xE2E8,      0, 0xE6D0,      0, 0xFBE8, /* 0xF0 */
-    0xF4E8, 0xE5F4, 0xF4BC, 0xF4D5                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xE5C7, 0xD6AC, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xDCC7, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1A9, /* 0x10 */
+         0, 0xE2AA, 	 0, 0xD5A6, 	 0, 	 0, 0xD4D7, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF2D0, 	 0, 0xEAFB, /* 0x20 */
+         0, 0xE0DD, 0xFBF3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF1BD, 	 0, 	 0, 0xE2E7, 0xFDD7, 	 0, /* 0x30 */
+    0xCEC8, 0xEAB7, 	 0, 0xFCC0, 	 0, 0xFDE7, 0xF7EF, 	 0, /* 0x30 */
+         0, 0xD7B5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xEFBA, 0xF1DD, 	 0, 0xDEB3, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xE8CB, 	 0, 	 0, 0xF8DD, 	 0, /* 0x60 */
+         0, 0xFBC7, 0xD5C8, 	 0, 0xD7DF, 	 0, 0xDDA9, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xE9B1, 	 0, 	 0, 0xFAAD, /* 0x70 */
+    0xF6D9, 0xFAF4, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF8AA, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE6EE, 	 0, 0xCCDC, /* 0x80 */
+    0xE1BC, 0xE0EF, 	 0, 	 0, 0xE9BF, 0xFCFD, 0xE6CE, 	 0, /* 0x80 */
+         0, 0xE1D7, 	 0, 0xE6CF, 	 0, 0xF4F1, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4F3, /* 0xA0 */
+         0, 	 0, 0xE4FB, 	 0, 	 0, 0xF9E4, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xEFE3, 	 0, 	 0, 0xCFEE, 0xF6BE, 0xE0B2, 0xFCFE, 0xD1AB, /* 0xC0 */
+         0, 	 0, 	 0, 0xD7FA, 	 0, 	 0, 	 0, 0xFBC8, /* 0xC0 */
+         0, 0xE2D7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xD4A3, 0xF0F8, 0xD7A8, 	 0, 	 0, 	 0, 0xE1E7, 	 0, /* 0xD0 */
+         0, 0xD3BF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xEFE4, 	 0, 0xD7C5, 0xEBE2, 	 0, 	 0, 0xFCE7, 	 0, /* 0xE0 */
+         0, 0xE4A2, 	 0, 0xE2E8, 	 0, 0xE6D0, 	 0, 0xFBE8, /* 0xF0 */
+    0xF4E8, 0xE5F4, 0xF4BC, 0xF4D5									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_6E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xDFB6, /* 0x10 */
-         0, 0xFCB9, 0xEEC2, 0xCAF5,      0,      0,      0, 0xEFE5, /* 0x10 */
-    0xCBE2, 0xD4A4,      0, 0xDEE0, 0xDAFD, 0xE4C6, 0xE8BE,      0, /* 0x20 */
-         0,      0,      0, 0xE0DE, 0xF6B4, 0xEAD2,      0, 0xF9FB, /* 0x20 */
-         0,      0, 0xE0C2,      0, 0xCAE4,      0, 0xE7B7,      0, /* 0x30 */
-    0xEAFD,      0, 0xD9DD,      0, 0xDAB4, 0xEEAA, 0xFBE9,      0, /* 0x30 */
-         0,      0,      0, 0xDBCB, 0xDAB5,      0,      0,      0, /* 0x40 */
-         0,      0, 0xF1BE,      0,      0, 0xD3AC,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xFBC9,      0, /* 0x50 */
-    0xDFCF,      0,      0, 0xD3C0, 0xE3D7,      0, 0xEFE6, 0xFCD0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xE9C0, /* 0x60 */
-         0,      0,      0, 0xF5D3,      0,      0, 0xECDC, 0xF7B7, /* 0x60 */
-         0,      0, 0xEAB8, 0xD1F9,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xDCC8,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xEAB9,      0,      0,      0,      0,      0, 0xF1DE,      0, /* 0x90 */
-         0,      0,      0,      0, 0xD7B6, 0xCFB5,      0, 0xD9A8, /* 0x90 */
-         0,      0, 0xECEE,      0,      0, 0xDDAA,      0,      0, /* 0xA0 */
-         0,      0, 0xCDA2, 0xE8AE,      0,      0,      0, 0xE1BD, /* 0xA0 */
-         0, 0xF2D1,      0,      0,      0,      0, 0xE9C1,      0, /* 0xB0 */
-         0,      0, 0xD2FC,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xDBB5,      0, 0xF3E7, 0xD8FE,      0,      0, /* 0xC0 */
-         0, 0xFCD1,      0, 0xEDB2, 0xF4AF,      0, 0xFBA3,      0, /* 0xC0 */
-         0, 0xFCC1,      0, 0xEEAB, 0xD4A5,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xF4F2, /* 0xE0 */
-         0,      0,      0,      0, 0xEED9,      0,      0,      0, /* 0xF0 */
-    0xFBCA,      0,      0,      0,      0,      0, 0xCDE3, 0xD8BB  /* 0xF0 */
+         0, 0xFCB9, 0xEEC2, 0xCAF5, 	 0, 	 0, 	 0, 0xEFE5, /* 0x10 */
+    0xCBE2, 0xD4A4, 	 0, 0xDEE0, 0xDAFD, 0xE4C6, 0xE8BE, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xE0DE, 0xF6B4, 0xEAD2, 	 0, 0xF9FB, /* 0x20 */
+         0, 	 0, 0xE0C2, 	 0, 0xCAE4, 	 0, 0xE7B7, 	 0, /* 0x30 */
+    0xEAFD, 	 0, 0xD9DD, 	 0, 0xDAB4, 0xEEAA, 0xFBE9, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xDBCB, 0xDAB5, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xF1BE, 	 0, 	 0, 0xD3AC, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFBC9, 	 0, /* 0x50 */
+    0xDFCF, 	 0, 	 0, 0xD3C0, 0xE3D7, 	 0, 0xEFE6, 0xFCD0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9C0, /* 0x60 */
+         0, 	 0, 	 0, 0xF5D3, 	 0, 	 0, 0xECDC, 0xF7B7, /* 0x60 */
+         0, 	 0, 0xEAB8, 0xD1F9, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xDCC8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xEAB9, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF1DE, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xD7B6, 0xCFB5, 	 0, 0xD9A8, /* 0x90 */
+         0, 	 0, 0xECEE, 	 0, 	 0, 0xDDAA, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xCDA2, 0xE8AE, 	 0, 	 0, 	 0, 0xE1BD, /* 0xA0 */
+         0, 0xF2D1, 	 0, 	 0, 	 0, 	 0, 0xE9C1, 	 0, /* 0xB0 */
+         0, 	 0, 0xD2FC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xDBB5, 	 0, 0xF3E7, 0xD8FE, 	 0, 	 0, /* 0xC0 */
+         0, 0xFCD1, 	 0, 0xEDB2, 0xF4AF, 	 0, 0xFBA3, 	 0, /* 0xC0 */
+         0, 0xFCC1, 	 0, 0xEEAB, 0xD4A5, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4F2, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xEED9, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xFBCA, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCDE3, 0xD8BB	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_6F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE5DB, 0xF8F7,      0,      0,      0, 0xF6D4,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0, 0xD7A9, /* 0x00 */
-         0, 0xCBC9,      0,      0, 0xE6D1, 0xF0CC,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xD8AE,      0, 0xF9D3, 0xD5FE,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xD8BC, 0xF2B0,      0,      0,      0, /* 0x20 */
-         0, 0xE2AB, 0xF3E8,      0,      0,      0,      0,      0, /* 0x30 */
-    0xEFC2,      0,      0,      0,      0,      0,      0, 0xEDEC, /* 0x30 */
-         0, 0xE7B8,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xDAFE,      0,      0, 0xCCBE,      0,      0, 0xF2FC, /* 0x50 */
-    0xDAEB,      0, 0xE2D8, 0xEDD6,      0,      0, 0xD6D1, 0xE0B3, /* 0x50 */
-         0,      0, 0xFCD2,      0, 0xEBC8,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xD3C1, 0xF0CD,      0, /* 0x60 */
-    0xCFF7,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xEDD2,      0, 0xD4D8, 0xDCC9, 0xD7F1,      0, /* 0x70 */
-         0, 0xDFBB,      0,      0, 0xF3A5,      0,      0,      0, /* 0x80 */
-    0xF4CD,      0,      0,      0,      0, 0xF1BF, 0xF8B1,      0, /* 0x80 */
-    0xE9FA,      0,      0,      0, 0xFBCB,      0,      0, 0xCAD5, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xF9D4, 0xF7CA,      0,      0, 0xD6C8, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xFCE8, 0xF3BD, /* 0xA0 */
-         0, 0xEEFE,      0, 0xE7FE,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xD3C2,      0,      0,      0,      0, 0xD3B6,      0, /* 0xB0 */
-    0xCCAD, 0xF6FA, 0xD6B2, 0xD2D8,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xE7D8,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xE3A5,      0,      0, /* 0xD0 */
-         0,      0, 0xE7B9,      0,      0,      0,      0, 0xF0AD, /* 0xD0 */
-    0xFBCC, 0xEBA1,      0,      0, 0xD4A6,      0,      0,      0, /* 0xE0 */
-         0, 0xFBCD,      0, 0xD5BD, 0xF1DF,      0,      0, 0xF6FB, /* 0xE0 */
-         0, 0xDEB4,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0,      0, 0xD5EB          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE5DB, 0xF8F7, 	 0, 	 0, 	 0, 0xF6D4, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD7A9, /* 0x00 */
+         0, 0xCBC9, 	 0, 	 0, 0xE6D1, 0xF0CC, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xD8AE, 	 0, 0xF9D3, 0xD5FE, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xD8BC, 0xF2B0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xE2AB, 0xF3E8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xEFC2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEDEC, /* 0x30 */
+         0, 0xE7B8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xDAFE, 	 0, 	 0, 0xCCBE, 	 0, 	 0, 0xF2FC, /* 0x50 */
+    0xDAEB, 	 0, 0xE2D8, 0xEDD6, 	 0, 	 0, 0xD6D1, 0xE0B3, /* 0x50 */
+         0, 	 0, 0xFCD2, 	 0, 0xEBC8, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD3C1, 0xF0CD, 	 0, /* 0x60 */
+    0xCFF7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xEDD2, 	 0, 0xD4D8, 0xDCC9, 0xD7F1, 	 0, /* 0x70 */
+         0, 0xDFBB, 	 0, 	 0, 0xF3A5, 	 0, 	 0, 	 0, /* 0x80 */
+    0xF4CD, 	 0, 	 0, 	 0, 	 0, 0xF1BF, 0xF8B1, 	 0, /* 0x80 */
+    0xE9FA, 	 0, 	 0, 	 0, 0xFBCB, 	 0, 	 0, 0xCAD5, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xF9D4, 0xF7CA, 	 0, 	 0, 0xD6C8, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFCE8, 0xF3BD, /* 0xA0 */
+         0, 0xEEFE, 	 0, 0xE7FE, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xD3C2, 	 0, 	 0, 	 0, 	 0, 0xD3B6, 	 0, /* 0xB0 */
+    0xCCAD, 0xF6FA, 0xD6B2, 0xD2D8, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE7D8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE3A5, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xE7B9, 	 0, 	 0, 	 0, 	 0, 0xF0AD, /* 0xD0 */
+    0xFBCC, 0xEBA1, 	 0, 	 0, 0xD4A6, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xFBCD, 	 0, 0xD5BD, 0xF1DF, 	 0, 	 0, 0xF6FB, /* 0xE0 */
+         0, 0xDEB4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD5EB			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_70[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE5C8,      0,      0,      0, 0xFBA4, 0xD4B9,      0, /* 0x00 */
-         0, 0xDEE1,      0, 0xE4A3,      0,      0,      0, 0xD7B7, /* 0x00 */
-         0, 0xF8EE,      0,      0,      0, 0xDEB5,      0,      0, /* 0x10 */
-    0xD6D2,      0, 0xF9D5, 0xE7BA, 0xEBD5, 0xD5F7, 0xEFE7, 0xE1BE, /* 0x10 */
-         0,      0,      0, 0xFAAE,      0,      0,      0, 0xD6E9, /* 0x20 */
-    0xD6EE,      0,      0,      0,      0,      0,      0, 0xE7BB, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xECCB, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xD5B3,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xCEB4,      0,      0,      0, /* 0x40 */
-    0xFBA5, 0xE1EE,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xF7A8,      0,      0,      0,      0, 0xFBCE,      0,      0, /* 0x50 */
-         0,      0,      0, 0xD8BD,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xFBFD,      0,      0,      0,      0, /* 0x60 */
-    0xFCE9,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xCFB6,      0,      0,      0, 0xEDC7, 0xEEAC,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xCCDD,      0,      0, /* 0x80 */
-         0,      0, 0xF6A7,      0,      0,      0, 0xE6FA,      0, /* 0x80 */
-         0,      0, 0xF5A4,      0,      0,      0,      0,      0, /* 0x90 */
-    0xFDDC, 0xEDB3, 0xCEC9,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xEFE8,      0,      0, 0xE1BF,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xFADB, 0xCBE3, 0xF7A9,      0, 0xFBA6, /* 0xA0 */
-         0,      0,      0, 0xDCB9,      0,      0,      0, 0xF1C0, /* 0xB0 */
-    0xEDC8, 0xEFC3,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xD6AD,      0,      0, 0xFDCE,      0,      0,      0, 0xE8A1, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xFBF4, 0xD5A7,      0,      0,      0, 0xF1F6,      0, 0xE6D3, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xCCDE,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xF8B2,      0,      0,      0, 0xDCEB                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE5C8, 	 0, 	 0, 	 0, 0xFBA4, 0xD4B9, 	 0, /* 0x00 */
+         0, 0xDEE1, 	 0, 0xE4A3, 	 0, 	 0, 	 0, 0xD7B7, /* 0x00 */
+         0, 0xF8EE, 	 0, 	 0, 	 0, 0xDEB5, 	 0, 	 0, /* 0x10 */
+    0xD6D2, 	 0, 0xF9D5, 0xE7BA, 0xEBD5, 0xD5F7, 0xEFE7, 0xE1BE, /* 0x10 */
+         0, 	 0, 	 0, 0xFAAE, 	 0, 	 0, 	 0, 0xD6E9, /* 0x20 */
+    0xD6EE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7BB, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xECCB, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD5B3, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xCEB4, 	 0, 	 0, 	 0, /* 0x40 */
+    0xFBA5, 0xE1EE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xF7A8, 	 0, 	 0, 	 0, 	 0, 0xFBCE, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xD8BD, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xFBFD, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xFCE9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xCFB6, 	 0, 	 0, 	 0, 0xEDC7, 0xEEAC, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCCDD, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xF6A7, 	 0, 	 0, 	 0, 0xE6FA, 	 0, /* 0x80 */
+         0, 	 0, 0xF5A4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xFDDC, 0xEDB3, 0xCEC9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xEFE8, 	 0, 	 0, 0xE1BF, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xFADB, 0xCBE3, 0xF7A9, 	 0, 0xFBA6, /* 0xA0 */
+         0, 	 0, 	 0, 0xDCB9, 	 0, 	 0, 	 0, 0xF1C0, /* 0xB0 */
+    0xEDC8, 0xEFC3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xD6AD, 	 0, 	 0, 0xFDCE, 	 0, 	 0, 	 0, 0xE8A1, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xFBF4, 0xD5A7, 	 0, 	 0, 	 0, 0xF1F6, 	 0, 0xE6D3, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xCCDE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xF8B2, 	 0, 	 0, 	 0, 0xDCEB					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_71[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xFDB6,      0,      0,      0, /* 0x00 */
-         0, 0xE5EA,      0,      0, 0xF1E0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xDBCC, 0xDDCD,      0,      0,      0, 0xD4C8,      0, /* 0x10 */
-         0, 0xD9ED,      0,      0,      0,      0, 0xF5A5,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xE6FB,      0,      0,      0,      0,      0, 0xE6D4,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xFDC8, /* 0x40 */
-         0, 0xD6A1, 0xFDBF,      0, 0xFCD3,      0, 0xEFA1,      0, /* 0x40 */
-    0xE7BC,      0,      0,      0,      0,      0, 0xD1EE,      0, /* 0x50 */
-         0, 0xE6D5,      0,      0, 0xE9F2,      0, 0xDFB0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xD8E0, 0xFCBA, 0xFDAF, 0xF0CE, /* 0x60 */
-         0, 0xDBE1,      0,      0, 0xE5C9,      0, 0xEDB4,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xE0C3,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xE3D8,      0,      0,      0, /* 0x80 */
-         0, 0xE9FB, 0xEAA8,      0,      0,      0,      0, 0xFDB7, /* 0x80 */
-         0,      0, 0xFBA7,      0, 0xE9C2,      0,      0,      0, /* 0x90 */
-         0, 0xFDF7,      0,      0,      0,      0,      0, 0xE2D9, /* 0x90 */
-         0,      0, 0xDCEC,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xE8A2,      0,      0,      0, /* 0xA0 */
-         0, 0xE6F0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xFDF8, 0xFDF9,      0,      0,      0, 0xF6BF,      0, /* 0xB0 */
-         0, 0xE7A7,      0, 0xE6D7,      0,      0,      0,      0, /* 0xC0 */
-    0xD4F3, 0xD4C9,      0,      0,      0,      0, 0xD6FA,      0, /* 0xC0 */
-    0xD7F2,      0, 0xE1C0,      0, 0xDBE2, 0xE6D8,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE7BD, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xF0CF, 0xF3BE, 0xE2AC, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xF5B7, 0xE0F0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xFDB8, 0xE3E8,      0, 0xD4A7, 0xE8FC  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xFDB6, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xE5EA, 	 0, 	 0, 0xF1E0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xDBCC, 0xDDCD, 	 0, 	 0, 	 0, 0xD4C8, 	 0, /* 0x10 */
+         0, 0xD9ED, 	 0, 	 0, 	 0, 	 0, 0xF5A5, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xE6FB, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6D4, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFDC8, /* 0x40 */
+         0, 0xD6A1, 0xFDBF, 	 0, 0xFCD3, 	 0, 0xEFA1, 	 0, /* 0x40 */
+    0xE7BC, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD1EE, 	 0, /* 0x50 */
+         0, 0xE6D5, 	 0, 	 0, 0xE9F2, 	 0, 0xDFB0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xD8E0, 0xFCBA, 0xFDAF, 0xF0CE, /* 0x60 */
+         0, 0xDBE1, 	 0, 	 0, 0xE5C9, 	 0, 0xEDB4, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE0C3, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xE3D8, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xE9FB, 0xEAA8, 	 0, 	 0, 	 0, 	 0, 0xFDB7, /* 0x80 */
+         0, 	 0, 0xFBA7, 	 0, 0xE9C2, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xFDF7, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2D9, /* 0x90 */
+         0, 	 0, 0xDCEC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xE8A2, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xE6F0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xFDF8, 0xFDF9, 	 0, 	 0, 	 0, 0xF6BF, 	 0, /* 0xB0 */
+         0, 0xE7A7, 	 0, 0xE6D7, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xD4F3, 0xD4C9, 	 0, 	 0, 	 0, 	 0, 0xD6FA, 	 0, /* 0xC0 */
+    0xD7F2, 	 0, 0xE1C0, 	 0, 0xDBE2, 0xE6D8, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7BD, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF0CF, 0xF3BE, 0xE2AC, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF5B7, 0xE0F0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xFDB8, 0xE3E8, 	 0, 0xD4A7, 0xE8FC	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_72[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xFAD2,      0,      0,      0,      0,      0, 0xF8EF,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0xD6D3,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xD5B4,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xF0D0,      0, 0xF7F0, 0xEEB3,      0,      0, /* 0x20 */
-    0xEABA,      0, 0xEAD3,      0,      0, 0xEDC9, 0xDDAB,      0, /* 0x30 */
-         0,      0, 0xE5AC, 0xFDA1,      0, 0xDFD0, 0xECB3,      0, /* 0x30 */
-    0xDFD1,      0,      0,      0,      0,      0, 0xEDED, 0xF8B8, /* 0x40 */
-    0xF7FA,      0,      0,      0, 0xF8AB,      0,      0,      0, /* 0x40 */
-         0,      0, 0xF4E0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xD4BA, 0xE4B3,      0, 0xE9DA,      0, 0xDEB6,      0, 0xD9BF, /* 0x50 */
-         0, 0xD9C0, 0xD6EF,      0,      0,      0,      0, 0xD9CC, /* 0x60 */
-         0, 0xDAAA,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xDFE5,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xF7E5,      0,      0,      0, 0xCCB2,      0,      0, /* 0x70 */
-    0xDFF9, 0xD7E0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xD4BB,      0,      0,      0,      0, 0xFDFA, /* 0xA0 */
-         0,      0,      0,      0, 0xCCB3,      0,      0, 0xDBF3, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xDFD2,      0, 0xCECA,      0, 0xEEDA,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xE4E4,      0, /* 0xC0 */
-    0xFBCF,      0,      0,      0,      0,      0,      0, 0xCFB7, /* 0xD0 */
-         0, 0xEEC3,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xCEEA,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xE2AD,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xD7E1, 0xFAF5,      0,      0, 0xD5C9, 0xF8AC                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xFAD2, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF8EF, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xD6D3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xD5B4, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF0D0, 	 0, 0xF7F0, 0xEEB3, 	 0, 	 0, /* 0x20 */
+    0xEABA, 	 0, 0xEAD3, 	 0, 	 0, 0xEDC9, 0xDDAB, 	 0, /* 0x30 */
+         0, 	 0, 0xE5AC, 0xFDA1, 	 0, 0xDFD0, 0xECB3, 	 0, /* 0x30 */
+    0xDFD1, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEDED, 0xF8B8, /* 0x40 */
+    0xF7FA, 	 0, 	 0, 	 0, 0xF8AB, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xF4E0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xD4BA, 0xE4B3, 	 0, 0xE9DA, 	 0, 0xDEB6, 	 0, 0xD9BF, /* 0x50 */
+         0, 0xD9C0, 0xD6EF, 	 0, 	 0, 	 0, 	 0, 0xD9CC, /* 0x60 */
+         0, 0xDAAA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xDFE5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xF7E5, 	 0, 	 0, 	 0, 0xCCB2, 	 0, 	 0, /* 0x70 */
+    0xDFF9, 0xD7E0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xD4BB, 	 0, 	 0, 	 0, 	 0, 0xFDFA, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xCCB3, 	 0, 	 0, 0xDBF3, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xDFD2, 	 0, 0xCECA, 	 0, 0xEEDA, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4E4, 	 0, /* 0xC0 */
+    0xFBCF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCFB7, /* 0xD0 */
+         0, 0xEEC3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xCEEA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xE2AD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xD7E1, 0xFAF5, 	 0, 	 0, 0xD5C9, 0xF8AC					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_73[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xE7D9,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xF3E9,      0, /* 0x10 */
-         0,      0,      0, 0xD8ED, 0xE3C4, 0xF0F1,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xE8E5,      0,      0, /* 0x20 */
-         0, 0xE0FA, 0xEEC4, 0xD9DE,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0xEBA2, 0xEBA3, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xFCC2, 0xEABB, /* 0x30 */
-         0,      0,      0,      0, 0xE8AB, 0xDEE2,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xEDEF,      0, 0xE8A3,      0,      0,      0,      0, 0xCFF1, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0xD4BC,      0, 0xFCEA,      0,      0,      0,      0,      0, /* 0x60 */
-    0xE7BE,      0, 0xFCF2,      0,      0, 0xD6B4,      0,      0, /* 0x70 */
-    0xE2AE,      0, 0xD3B7, 0xFACC,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xFADC,      0, 0xEDB5, 0xE1E3, /* 0x80 */
-         0, 0xE8AC,      0, 0xE8DD,      0,      0, 0xEFE9,      0, /* 0x80 */
-         0,      0,      0,      0, 0xF4BD,      0, 0xCFB8, 0xE9DB, /* 0x90 */
-    0xD1AC,      0,      0,      0,      0,      0,      0, 0xDAC7, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xEBC9, /* 0xA0 */
-         0, 0xE8CC,      0,      0,      0, 0xDEB7,      0,      0, /* 0xA0 */
-         0,      0, 0xD6BC, 0xD3E5,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xFADD,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xDAD6,      0, 0xCAB1,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xDAC8, 0xDFA6,      0, 0xF9B3, 0xF2D2,      0, 0xCAC4, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xCECB,      0, /* 0xD0 */
-         0, 0xCDF5,      0,      0,      0, 0xFDB0, 0xD5A8,      0, /* 0xD0 */
-    0xF1C1,      0,      0, 0xE2E9, 0xDCCA, 0xECB4, 0xFAC0,      0, /* 0xE0 */
-         0, 0xFBA8, 0xD0A8,      0,      0, 0xDAEC,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xD9EE, /* 0xF0 */
-         0, 0xE0FB,      0,      0,      0, 0xEFEA, 0xFADE          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xE7D9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF3E9, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xD8ED, 0xE3C4, 0xF0F1, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE8E5, 	 0, 	 0, /* 0x20 */
+         0, 0xE0FA, 0xEEC4, 0xD9DE, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEBA2, 0xEBA3, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFCC2, 0xEABB, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xE8AB, 0xDEE2, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xEDEF, 	 0, 0xE8A3, 	 0, 	 0, 	 0, 	 0, 0xCFF1, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xD4BC, 	 0, 0xFCEA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xE7BE, 	 0, 0xFCF2, 	 0, 	 0, 0xD6B4, 	 0, 	 0, /* 0x70 */
+    0xE2AE, 	 0, 0xD3B7, 0xFACC, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xFADC, 	 0, 0xEDB5, 0xE1E3, /* 0x80 */
+         0, 0xE8AC, 	 0, 0xE8DD, 	 0, 	 0, 0xEFE9, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xF4BD, 	 0, 0xCFB8, 0xE9DB, /* 0x90 */
+    0xD1AC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDAC7, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEBC9, /* 0xA0 */
+         0, 0xE8CC, 	 0, 	 0, 	 0, 0xDEB7, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xD6BC, 0xD3E5, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xFADD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xDAD6, 	 0, 0xCAB1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xDAC8, 0xDFA6, 	 0, 0xF9B3, 0xF2D2, 	 0, 0xCAC4, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCECB, 	 0, /* 0xD0 */
+         0, 0xCDF5, 	 0, 	 0, 	 0, 0xFDB0, 0xD5A8, 	 0, /* 0xD0 */
+    0xF1C1, 	 0, 	 0, 0xE2E9, 0xDCCA, 0xECB4, 0xFAC0, 	 0, /* 0xE0 */
+         0, 0xFBA8, 0xD0A8, 	 0, 	 0, 0xDAEC, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD9EE, /* 0xF0 */
+         0, 0xE0FB, 	 0, 	 0, 	 0, 0xEFEA, 0xFADE			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_74[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE0C4,      0, 0xCFB9,      0, 0xD5CA, 0xD7E2, 0xE2AF, /* 0x00 */
-         0, 0xD7B8,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0xE8CD,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xF6DA,      0,      0,      0,      0, /* 0x10 */
-    0xEFA2, 0xE2DA, 0xF6FC,      0,      0, 0xFBD0, 0xD1AD,      0, /* 0x20 */
-    0xCDE4,      0, 0xD1AE, 0xDCED, 0xE8CE,      0, 0xF0F9, 0xCEB5, /* 0x20 */
-    0xE6FC,      0,      0, 0xD7FB, 0xD0D6, 0xDDF5, 0xF7F1,      0, /* 0x30 */
-    0xF6FD,      0, 0xDBF7,      0,      0,      0,      0, 0xFBEA, /* 0x30 */
-    0xE9DC, 0xD9C1,      0, 0xF5F2, 0xE0C5,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xEAD4,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xF9C2,      0, 0xEABC, /* 0x50 */
-         0, 0xD2C5, 0xFBD1, 0xE7C0, 0xEBA5,      0, 0xDFFA, 0xE3A2, /* 0x50 */
-    0xD7B9,      0, 0xE9C3,      0, 0xE8FD, 0xE8AF,      0,      0, /* 0x60 */
-    0xF2D3, 0xFBA9, 0xD8A5,      0,      0,      0,      0, 0xD5CB, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xD0C8,      0, /* 0x70 */
-         0,      0, 0xD1AF, 0xD7E3,      0,      0,      0, 0xE0C6, /* 0x80 */
-         0, 0xD6A2,      0, 0xEDF0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xD7F3,      0,      0,      0, 0xFCD4,      0, 0xDAD7, 0xCCDF, /* 0x90 */
-         0, 0xF2D4,      0, 0xD1B0,      0, 0xCCE0,      0, 0xDBFD, /* 0xA0 */
-    0xF3BF,      0, 0xF0D1,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xFCBB,      0, 0xE2B0,      0,      0, 0xE6A5,      0,      0, /* 0xB0 */
-         0, 0xE2DB,      0,      0,      0, 0xDFDE,      0, 0xE0C7, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xF2EF,      0, /* 0xC0 */
-         0,      0, 0xCCE1,      0,      0,      0,      0, 0xD6EA, /* 0xC0 */
-         0,      0,      0,      0, 0xE7C2,      0,      0,      0, /* 0xD0 */
-    0xCEB6,      0, 0xF3C0,      0, 0xCDFE,      0,      0,      0, /* 0xD0 */
-    0xFBD2,      0, 0xF8F8, 0xF7FB,      0,      0, 0xE8BF,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xE8B7,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xEDB6  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE0C4, 	 0, 0xCFB9, 	 0, 0xD5CA, 0xD7E2, 0xE2AF, /* 0x00 */
+         0, 0xD7B8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xE8CD, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xF6DA, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xEFA2, 0xE2DA, 0xF6FC, 	 0, 	 0, 0xFBD0, 0xD1AD, 	 0, /* 0x20 */
+    0xCDE4, 	 0, 0xD1AE, 0xDCED, 0xE8CE, 	 0, 0xF0F9, 0xCEB5, /* 0x20 */
+    0xE6FC, 	 0, 	 0, 0xD7FB, 0xD0D6, 0xDDF5, 0xF7F1, 	 0, /* 0x30 */
+    0xF6FD, 	 0, 0xDBF7, 	 0, 	 0, 	 0, 	 0, 0xFBEA, /* 0x30 */
+    0xE9DC, 0xD9C1, 	 0, 0xF5F2, 0xE0C5, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xEAD4, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF9C2, 	 0, 0xEABC, /* 0x50 */
+         0, 0xD2C5, 0xFBD1, 0xE7C0, 0xEBA5, 	 0, 0xDFFA, 0xE3A2, /* 0x50 */
+    0xD7B9, 	 0, 0xE9C3, 	 0, 0xE8FD, 0xE8AF, 	 0, 	 0, /* 0x60 */
+    0xF2D3, 0xFBA9, 0xD8A5, 	 0, 	 0, 	 0, 	 0, 0xD5CB, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD0C8, 	 0, /* 0x70 */
+         0, 	 0, 0xD1AF, 0xD7E3, 	 0, 	 0, 	 0, 0xE0C6, /* 0x80 */
+         0, 0xD6A2, 	 0, 0xEDF0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xD7F3, 	 0, 	 0, 	 0, 0xFCD4, 	 0, 0xDAD7, 0xCCDF, /* 0x90 */
+         0, 0xF2D4, 	 0, 0xD1B0, 	 0, 0xCCE0, 	 0, 0xDBFD, /* 0xA0 */
+    0xF3BF, 	 0, 0xF0D1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xFCBB, 	 0, 0xE2B0, 	 0, 	 0, 0xE6A5, 	 0, 	 0, /* 0xB0 */
+         0, 0xE2DB, 	 0, 	 0, 	 0, 0xDFDE, 	 0, 0xE0C7, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF2EF, 	 0, /* 0xC0 */
+         0, 	 0, 0xCCE1, 	 0, 	 0, 	 0, 	 0, 0xD6EA, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xE7C2, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xCEB6, 	 0, 0xF3C0, 	 0, 0xCDFE, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xFBD2, 	 0, 0xF8F8, 0xF7FB, 	 0, 	 0, 0xE8BF, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8B7, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEDB6	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_75[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xDCBA,      0,      0, 0xCCB4,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xF1F7,      0,      0,      0, 0xE8B8,      0,      0, /* 0x10 */
-    0xCAF6,      0, 0xE4A4, 0xF4D6,      0,      0,      0, 0xDFE6, /* 0x10 */
-         0,      0,      0, 0xDFA7,      0, 0xDFE7, 0xE1C1,      0, /* 0x20 */
-    0xE9C4,      0,      0, 0xDCCB, 0xE9C5,      0,      0,      0, /* 0x20 */
-    0xEFA3, 0xEBA6, 0xCBA3, 0xE3E9,      0,      0,      0, 0xD1FB, /* 0x30 */
-    0xEFA4,      0, 0xEFEB,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xD0B4, /* 0x40 */
-         0,      0,      0,      0, 0xCDA3,      0,      0, 0xE8E6, /* 0x40 */
-         0, 0xEFA5,      0, 0xD3CC, 0xDAED,      0,      0,      0, /* 0x50 */
-         0, 0xD7BA,      0, 0xF2D5, 0xF5E5, 0xD9EF,      0,      0, /* 0x50 */
-         0,      0, 0xF9B4,      0,      0, 0xD5D4, 0xFDCF,      0, /* 0x60 */
-         0,      0, 0xDBE3,      0,      0,      0,      0, 0xF1E1, /* 0x60 */
-    0xECB6,      0,      0,      0,      0, 0xFBFE, 0xD3D7,      0, /* 0x70 */
-    0xD1B1,      0, 0xCBB1,      0,      0,      0,      0, 0xD1B2, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xCBB2, 0xF1C2, /* 0x80 */
-         0,      0, 0xF4E1, 0xF9B5,      0,      0, 0xE1C3, 0xE1C2, /* 0x80 */
-         0, 0xEBF7,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xDFA8,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xCBCA,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xE6B9,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xF8DE, 0xF9AA, 0xCAF7,      0, 0xEDB7,      0,      0, /* 0xB0 */
-    0xD3B8, 0xF2D6,      0,      0, 0xD4D9, 0xEEC5, 0xF2F0,      0, /* 0xB0 */
-         0,      0, 0xCAB2,      0,      0, 0xDCBB,      0, 0xF1F8, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xECB7,      0,      0, /* 0xC0 */
-         0,      0, 0xE5CA,      0, 0xF6C0, 0xFDDD,      0,      0, /* 0xD0 */
-    0xD4E3, 0xCCE2,      0, 0xF7D4,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xD7E5,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xD3C3,      0, 0xD8A6,      0, 0xF6C1,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xDDF6,      0, 0xCDC0                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xDCBA, 	 0, 	 0, 0xCCB4, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xF1F7, 	 0, 	 0, 	 0, 0xE8B8, 	 0, 	 0, /* 0x10 */
+    0xCAF6, 	 0, 0xE4A4, 0xF4D6, 	 0, 	 0, 	 0, 0xDFE6, /* 0x10 */
+         0, 	 0, 	 0, 0xDFA7, 	 0, 0xDFE7, 0xE1C1, 	 0, /* 0x20 */
+    0xE9C4, 	 0, 	 0, 0xDCCB, 0xE9C5, 	 0, 	 0, 	 0, /* 0x20 */
+    0xEFA3, 0xEBA6, 0xCBA3, 0xE3E9, 	 0, 	 0, 	 0, 0xD1FB, /* 0x30 */
+    0xEFA4, 	 0, 0xEFEB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD0B4, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xCDA3, 	 0, 	 0, 0xE8E6, /* 0x40 */
+         0, 0xEFA5, 	 0, 0xD3CC, 0xDAED, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xD7BA, 	 0, 0xF2D5, 0xF5E5, 0xD9EF, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xF9B4, 	 0, 	 0, 0xD5D4, 0xFDCF, 	 0, /* 0x60 */
+         0, 	 0, 0xDBE3, 	 0, 	 0, 	 0, 	 0, 0xF1E1, /* 0x60 */
+    0xECB6, 	 0, 	 0, 	 0, 	 0, 0xFBFE, 0xD3D7, 	 0, /* 0x70 */
+    0xD1B1, 	 0, 0xCBB1, 	 0, 	 0, 	 0, 	 0, 0xD1B2, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBB2, 0xF1C2, /* 0x80 */
+         0, 	 0, 0xF4E1, 0xF9B5, 	 0, 	 0, 0xE1C3, 0xE1C2, /* 0x80 */
+         0, 0xEBF7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDFA8, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCBCA, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xE6B9, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xF8DE, 0xF9AA, 0xCAF7, 	 0, 0xEDB7, 	 0, 	 0, /* 0xB0 */
+    0xD3B8, 0xF2D6, 	 0, 	 0, 0xD4D9, 0xEEC5, 0xF2F0, 	 0, /* 0xB0 */
+         0, 	 0, 0xCAB2, 	 0, 	 0, 0xDCBB, 	 0, 0xF1F8, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xECB7, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE5CA, 	 0, 0xF6C0, 0xFDDD, 	 0, 	 0, /* 0xD0 */
+    0xD4E3, 0xCCE2, 	 0, 0xF7D4, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xD7E5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xD3C3, 	 0, 0xD8A6, 	 0, 0xF6C1, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xDDF6, 	 0, 0xCDC0							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_76[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE5DC,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0xE5CB,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xE1C4,      0,      0,      0,      0,      0, 0xE8B0, /* 0x10 */
-    0xF4B0, 0xF3EA, 0xDAEE,      0, 0xD7BB,      0, 0xE2B1,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xD7AA,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xD6FB,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xE4DF,      0, 0xCAD6,      0, /* 0x40 */
-         0,      0, 0xEBA8,      0,      0,      0, 0xDBFE,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xF6C2,      0,      0, 0xEFBB,      0,      0,      0, /* 0x60 */
-         0, 0xD4FD,      0,      0, 0xE0C8,      0,      0,      0, /* 0x60 */
-    0xE8B9,      0, 0xEFA6,      0,      0,      0,      0,      0, /* 0x70 */
-    0xCDA4,      0,      0, 0xD4F4, 0xDBA1, 0xDBDC, 0xDBDD,      0, /* 0x70 */
-         0,      0,      0,      0, 0xEEDC,      0, 0xCBCB, 0xFCD5, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xCEEB,      0, /* 0x80 */
-    0xCDC1,      0,      0, 0xFBD3,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xF9AB,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xF5D4,      0,      0,      0,      0, 0xD9A9, /* 0xB0 */
-         0,      0, 0xE9DD, 0xDBCD,      0,      0, 0xDDCE,      0, /* 0xC0 */
-    0xE7C3,      0, 0xECCC,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xF9EC,      0,      0,      0, 0xCBCC,      0, /* 0xD0 */
-         0,      0,      0, 0xE0FC, 0xD4A8,      0, 0xEDD3, 0xD8EF, /* 0xD0 */
-         0, 0xF2D7,      0, 0xCAF8, 0xDAEF,      0,      0, 0xD6D4, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xD9CD,      0, /* 0xE0 */
-         0,      0, 0xD8EE,      0, 0xF2C1,      0,      0,      0, /* 0xF0 */
-    0xDFD3,      0,      0,      0, 0xDAF0,      0, 0xE2EA          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE5DC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE5CB, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xE1C4, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8B0, /* 0x10 */
+    0xF4B0, 0xF3EA, 0xDAEE, 	 0, 0xD7BB, 	 0, 0xE2B1, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xD7AA, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xD6FB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xE4DF, 	 0, 0xCAD6, 	 0, /* 0x40 */
+         0, 	 0, 0xEBA8, 	 0, 	 0, 	 0, 0xDBFE, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xF6C2, 	 0, 	 0, 0xEFBB, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xD4FD, 	 0, 	 0, 0xE0C8, 	 0, 	 0, 	 0, /* 0x60 */
+    0xE8B9, 	 0, 0xEFA6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xCDA4, 	 0, 	 0, 0xD4F4, 0xDBA1, 0xDBDC, 0xDBDD, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xEEDC, 	 0, 0xCBCB, 0xFCD5, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCEEB, 	 0, /* 0x80 */
+    0xCDC1, 	 0, 	 0, 0xFBD3, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF9AB, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xF5D4, 	 0, 	 0, 	 0, 	 0, 0xD9A9, /* 0xB0 */
+         0, 	 0, 0xE9DD, 0xDBCD, 	 0, 	 0, 0xDDCE, 	 0, /* 0xC0 */
+    0xE7C3, 	 0, 0xECCC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xF9EC, 	 0, 	 0, 	 0, 0xCBCC, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xE0FC, 0xD4A8, 	 0, 0xEDD3, 0xD8EF, /* 0xD0 */
+         0, 0xF2D7, 	 0, 0xCAF8, 0xDAEF, 	 0, 	 0, 0xD6D4, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD9CD, 	 0, /* 0xE0 */
+         0, 	 0, 0xD8EE, 	 0, 0xF2C1, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xDFD3, 	 0, 	 0, 	 0, 0xDAF0, 	 0, 0xE2EA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_77[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE0FD,      0,      0, 0xD8F8,      0,      0,      0, /* 0x00 */
-    0xF7AF, 0xDAB6,      0, 0xCAD7,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xF2D8,      0, /* 0x10 */
-    0xD8F9,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xFADF,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xCFEF, /* 0x30 */
-    0xD9C2,      0, 0xF0D2,      0, 0xE4D1,      0,      0,      0, /* 0x30 */
-    0xF3B7,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xFAE0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xEFEC,      0,      0,      0,      0, /* 0x50 */
-         0, 0xE2B2,      0, 0xD4BD,      0,      0, 0xD9CE,      0, /* 0x60 */
-         0,      0,      0, 0xF4E2,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xD4A9,      0,      0,      0,      0, 0xCDC2, 0xE7DA, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xF2D9,      0,      0,      0,      0, /* 0x80 */
-         0, 0xD9AA,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0xD8BE,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xDCAD,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xE2EB, 0xD6FC,      0,      0, /* 0xA0 */
-    0xCAF9,      0,      0, 0xD4DA,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xF4D7, 0xCCA1,      0,      0, 0xCFBA, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xF5B8, /* 0xD0 */
-         0,      0,      0, 0xD9C3, 0xD0E8,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xE3C5, 0xEBF8,      0, 0xF2B1,      0,      0, /* 0xE0 */
-         0, 0xCFBB,      0,      0,      0, 0xD3AD, 0xE8E1, 0xCEEC, /* 0xE0 */
-         0,      0,      0, 0xE0B4                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE0FD, 	 0, 	 0, 0xD8F8, 	 0, 	 0, 	 0, /* 0x00 */
+    0xF7AF, 0xDAB6, 	 0, 0xCAD7, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF2D8, 	 0, /* 0x10 */
+    0xD8F9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xFADF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCFEF, /* 0x30 */
+    0xD9C2, 	 0, 0xF0D2, 	 0, 0xE4D1, 	 0, 	 0, 	 0, /* 0x30 */
+    0xF3B7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xFAE0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xEFEC, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xE2B2, 	 0, 0xD4BD, 	 0, 	 0, 0xD9CE, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xF4E2, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xD4A9, 	 0, 	 0, 	 0, 	 0, 0xCDC2, 0xE7DA, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xF2D9, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xD9AA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD8BE, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDCAD, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xE2EB, 0xD6FC, 	 0, 	 0, /* 0xA0 */
+    0xCAF9, 	 0, 	 0, 0xD4DA, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xF4D7, 0xCCA1, 	 0, 	 0, 0xCFBA, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF5B8, /* 0xD0 */
+         0, 	 0, 	 0, 0xD9C3, 0xD0E8, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xE3C5, 0xEBF8, 	 0, 0xF2B1, 	 0, 	 0, /* 0xE0 */
+         0, 0xCFBB, 	 0, 	 0, 	 0, 0xD3AD, 0xE8E1, 0xCEEC, /* 0xE0 */
+         0, 	 0, 	 0, 0xE0B4									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_78[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xDEE3,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xDDF7,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xF2B2, 0xF3F6, 0xF6DB, /* 0x20 */
-         0,      0,      0,      0, 0xD7FE,      0,      0,      0, /* 0x20 */
-         0,      0, 0xF8DF,      0, 0xF7F2,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xD0A9,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xE6DA, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xF5A6,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xD7BC, 0xCCE3,      0,      0, 0xE6DB, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xDDDD,      0,      0,      0, /* 0x70 */
-         0, 0xD1B3,      0,      0,      0,      0,      0, 0xEFED, /* 0x80 */
-         0,      0,      0,      0, 0xD6DE, 0xE4F4, 0xE1EF,      0, /* 0x80 */
-         0, 0xDDF8,      0,      0,      0,      0,      0, 0xE8CF, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xCAE5,      0,      0,      0, 0xDCA1, /* 0xA0 */
-         0, 0xE0B5,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xFCAC, 0xFCAD, 0xD8A7,      0,      0,      0, /* 0xB0 */
-         0, 0xEDB8,      0,      0,      0, 0xDBB6,      0,      0, /* 0xC0 */
-         0,      0, 0xD6F0, 0xF3AF,      0,      0, 0xCDA5,      0, /* 0xC0 */
-    0xDAF1,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xD8A8,      0,      0,      0, 0xCCE4,      0,      0, 0xD1B4, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xCAD8,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xDAF2                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xDEE3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xDDF7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF2B2, 0xF3F6, 0xF6DB, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xD7FE, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF8DF, 	 0, 0xF7F2, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD0A9, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6DA, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF5A6, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xD7BC, 0xCCE3, 	 0, 	 0, 0xE6DB, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xDDDD, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xD1B3, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEFED, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xD6DE, 0xE4F4, 0xE1EF, 	 0, /* 0x80 */
+         0, 0xDDF8, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8CF, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xCAE5, 	 0, 	 0, 	 0, 0xDCA1, /* 0xA0 */
+         0, 0xE0B5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xFCAC, 0xFCAD, 0xD8A7, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xEDB8, 	 0, 	 0, 	 0, 0xDBB6, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xD6F0, 0xF3AF, 	 0, 	 0, 0xCDA5, 	 0, /* 0xC0 */
+    0xDAF1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xD8A8, 	 0, 	 0, 	 0, 0xCCE4, 	 0, 	 0, 0xD1B4, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCAD8, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xDAF2									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_79[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xF5A7,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xF5A8,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xE6A6,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xD5EC, 0xD5F8, 0xDAF3,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xE3C6,      0,      0,      0, 0xDEE4,      0, /* 0x30 */
-    0xDEE5, 0xD1B5,      0,      0,      0,      0,      0, 0xD1B6, /* 0x40 */
-    0xD1B7, 0xF2B3,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xE9DE,      0,      0,      0,      0,      0, 0xF0D3, 0xF2B4, /* 0x50 */
-         0,      0, 0xF0D4, 0xCBE4, 0xFBD4, 0xF5E6, 0xE3EA,      0, /* 0x50 */
-    0xDEE6,      0,      0,      0,      0, 0xDFD4,      0,      0, /* 0x60 */
-    0xF8F9,      0,      0,      0,      0, 0xF0AE,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xD1B8,      0,      0,      0,      0, 0xD6DF, /* 0x70 */
-         0, 0xD0D7,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xFCA1, 0xEFEE, 0xDCD8, /* 0x80 */
-         0, 0xE9DF,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0xE5DD, 0xFDFB, /* 0xA0 */
-         0,      0, 0xE0C9,      0,      0,      0, 0xD6C9,      0, /* 0xA0 */
-         0, 0xD4AA,      0, 0xE5CC,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE9E0,      0,      0,      0, 0xD0D8, 0xFCA2, 0xD4BE, /* 0xB0 */
-    0xE2B3, 0xDEE7,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xDCBC, 0xD2B6, 0xF5D5,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xCEA1, 0xF5A9,      0,      0, 0xDDF9,      0,      0, /* 0xD0 */
-    0xDDFA,      0,      0,      0,      0,      0,      0, 0xF0D5, /* 0xD0 */
-         0,      0,      0,      0, 0xF6DF,      0, 0xF2DA, 0xE4EB, /* 0xE0 */
-         0, 0xF2F1,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xECB9                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xF5A7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF5A8, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6A6, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xD5EC, 0xD5F8, 0xDAF3, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xE3C6, 	 0, 	 0, 	 0, 0xDEE4, 	 0, /* 0x30 */
+    0xDEE5, 0xD1B5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD1B6, /* 0x40 */
+    0xD1B7, 0xF2B3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xE9DE, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF0D3, 0xF2B4, /* 0x50 */
+         0, 	 0, 0xF0D4, 0xCBE4, 0xFBD4, 0xF5E6, 0xE3EA, 	 0, /* 0x50 */
+    0xDEE6, 	 0, 	 0, 	 0, 	 0, 0xDFD4, 	 0, 	 0, /* 0x60 */
+    0xF8F9, 	 0, 	 0, 	 0, 	 0, 0xF0AE, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xD1B8, 	 0, 	 0, 	 0, 	 0, 0xD6DF, /* 0x70 */
+         0, 0xD0D7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xFCA1, 0xEFEE, 0xDCD8, /* 0x80 */
+         0, 0xE9DF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5DD, 0xFDFB, /* 0xA0 */
+         0, 	 0, 0xE0C9, 	 0, 	 0, 	 0, 0xD6C9, 	 0, /* 0xA0 */
+         0, 0xD4AA, 	 0, 0xE5CC, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE9E0, 	 0, 	 0, 	 0, 0xD0D8, 0xFCA2, 0xD4BE, /* 0xB0 */
+    0xE2B3, 0xDEE7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xDCBC, 0xD2B6, 0xF5D5, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xCEA1, 0xF5A9, 	 0, 	 0, 0xDDF9, 	 0, 	 0, /* 0xD0 */
+    0xDDFA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF0D5, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xF6DF, 	 0, 0xF2DA, 0xE4EB, /* 0xE0 */
+         0, 0xF2F1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xECB9									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_7A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xFDFC,      0,      0,      0,      0, 0xE1AA,      0,      0, /* 0x00 */
-    0xCAD9,      0,      0, 0xEFEF,      0, 0xF5AA,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0xECF9,      0,      0, 0xF8AD, /* 0x10 */
-         0, 0xF2C2, 0xF6C3,      0, 0xD7D2,      0,      0, 0xF9A2, /* 0x10 */
-    0xF0D6,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0xF0FA,      0, /* 0x20 */
-         0, 0xF6E0,      0,      0,      0,      0, 0xE9F3, 0xF2C3, /* 0x30 */
-         0,      0,      0, 0xD4AB, 0xCAB3, 0xCDA6,      0, 0xCDC3, /* 0x30 */
-    0xCDDA,      0,      0,      0,      0,      0, 0xD9CF,      0, /* 0x40 */
-         0, 0xF6C4,      0,      0,      0, 0xEEDD, 0xE7C4,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xE2B4, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xDFE2, 0xE7DB,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xE8B1,      0, 0xFCAE,      0,      0,      0,      0, /* 0x60 */
-    0xE5CD,      0,      0,      0, 0xFAEB,      0, 0xCFBC,      0, /* 0x70 */
-         0, 0xCFE2, 0xCDF6,      0,      0, 0xEFF0,      0, 0xF4BE, /* 0x70 */
-         0, 0xD4CD,      0,      0, 0xF3B8,      0,      0,      0, /* 0x80 */
-    0xE9A1,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xF2F2, 0xF3EB,      0, 0xF0D7,      0,      0, /* 0x90 */
-    0xCFD7,      0,      0,      0,      0,      0,      0, 0xCFDF, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xE8C0, 0xE8C1,      0,      0,      0, 0xCFE3, 0xE9A2, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xD0AA,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xF3C1, 0xD0AB,      0, 0xD4E4, /* 0xC0 */
-         0,      0, 0xEFBC, 0xD8A1,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xD9DF, /* 0xD0 */
-         0, 0xF3D7,      0,      0,      0, 0xDCBD,      0, 0xCCE5, /* 0xD0 */
-    0xEDF1,      0,      0, 0xF1E2,      0, 0xD4DB,      0,      0, /* 0xE0 */
-         0,      0, 0xE2B5,      0,      0, 0xCAE6,      0, 0xD3AE, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xCCE6,      0, /* 0xF0 */
-         0, 0xF1D3, 0xF5E7,      0,      0,      0,      0, 0xCADA  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xFDFC, 	 0, 	 0, 	 0, 	 0, 0xE1AA, 	 0, 	 0, /* 0x00 */
+    0xCAD9, 	 0, 	 0, 0xEFEF, 	 0, 0xF5AA, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xECF9, 	 0, 	 0, 0xF8AD, /* 0x10 */
+         0, 0xF2C2, 0xF6C3, 	 0, 0xD7D2, 	 0, 	 0, 0xF9A2, /* 0x10 */
+    0xF0D6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF0FA, 	 0, /* 0x20 */
+         0, 0xF6E0, 	 0, 	 0, 	 0, 	 0, 0xE9F3, 0xF2C3, /* 0x30 */
+         0, 	 0, 	 0, 0xD4AB, 0xCAB3, 0xCDA6, 	 0, 0xCDC3, /* 0x30 */
+    0xCDDA, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD9CF, 	 0, /* 0x40 */
+         0, 0xF6C4, 	 0, 	 0, 	 0, 0xEEDD, 0xE7C4, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2B4, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xDFE2, 0xE7DB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xE8B1, 	 0, 0xFCAE, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xE5CD, 	 0, 	 0, 	 0, 0xFAEB, 	 0, 0xCFBC, 	 0, /* 0x70 */
+         0, 0xCFE2, 0xCDF6, 	 0, 	 0, 0xEFF0, 	 0, 0xF4BE, /* 0x70 */
+         0, 0xD4CD, 	 0, 	 0, 0xF3B8, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE9A1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xF2F2, 0xF3EB, 	 0, 0xF0D7, 	 0, 	 0, /* 0x90 */
+    0xCFD7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCFDF, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xE8C0, 0xE8C1, 	 0, 	 0, 	 0, 0xCFE3, 0xE9A2, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xD0AA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xF3C1, 0xD0AB, 	 0, 0xD4E4, /* 0xC0 */
+         0, 	 0, 0xEFBC, 0xD8A1, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD9DF, /* 0xD0 */
+         0, 0xF3D7, 	 0, 	 0, 	 0, 0xDCBD, 	 0, 0xCCE5, /* 0xD0 */
+    0xEDF1, 	 0, 	 0, 0xF1E2, 	 0, 0xD4DB, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xE2B5, 	 0, 	 0, 0xCAE6, 	 0, 0xD3AE, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCCE6, 	 0, /* 0xF0 */
+         0, 0xF1D3, 0xF5E7, 	 0, 	 0, 	 0, 	 0, 0xCADA	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_7B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xFBEE, /* 0x00 */
-         0, 0xE1C5,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xDFE9,      0, 0xEEDE,      0,      0, 0xF7C2,      0, /* 0x10 */
-    0xD8A2,      0,      0,      0,      0,      0, 0xDDAC,      0, /* 0x20 */
-         0,      0,      0,      0, 0xF0AF, 0xD6BD,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xE1AB,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xF9B6,      0, /* 0x40 */
-         0, 0xD4F5,      0, 0xD0C9, 0xEFA7, 0xE2EC,      0, 0xDBEA, /* 0x40 */
-    0xCECC, 0xF5E8, 0xF7D5,      0, 0xD3CD,      0, 0xF3FE,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xD0B5,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xE0FE,      0, 0xDFFB,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xE6DD,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xE8A4,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xCBCD, /* 0x80 */
-         0,      0,      0, 0xEFA8,      0,      0,      0, 0xEEB4, /* 0x80 */
-         0,      0,      0,      0, 0xDAD8, 0xD1B9,      0, 0xDFA9, /* 0x90 */
-         0,      0, 0xF3B0,      0,      0, 0xCCC4,      0,      0, /* 0x90 */
-         0, 0xCEB7,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xEFA9,      0,      0, /* 0xA0 */
-         0, 0xDFD5,      0,      0, 0xEDD7,      0,      0,      0, /* 0xB0 */
-    0xEEC6,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xEFBD, 0xFCD6,      0,      0, 0xDBF4,      0, 0xEFAA, 0xF8B9, /* 0xC0 */
-         0, 0xF5E9,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xE3D9,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xE1C6,      0,      0,      0, 0xD4BF,      0,      0,      0, /* 0xE0 */
-         0, 0xDEE8                                                  /* 0xE0 */
+         0, 0xE1C5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xDFE9, 	 0, 0xEEDE, 	 0, 	 0, 0xF7C2, 	 0, /* 0x10 */
+    0xD8A2, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDDAC, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xF0AF, 0xD6BD, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xE1AB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF9B6, 	 0, /* 0x40 */
+         0, 0xD4F5, 	 0, 0xD0C9, 0xEFA7, 0xE2EC, 	 0, 0xDBEA, /* 0x40 */
+    0xCECC, 0xF5E8, 0xF7D5, 	 0, 0xD3CD, 	 0, 0xF3FE, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xD0B5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xE0FE, 	 0, 0xDFFB, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE6DD, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE8A4, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBCD, /* 0x80 */
+         0, 	 0, 	 0, 0xEFA8, 	 0, 	 0, 	 0, 0xEEB4, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xDAD8, 0xD1B9, 	 0, 0xDFA9, /* 0x90 */
+         0, 	 0, 0xF3B0, 	 0, 	 0, 0xCCC4, 	 0, 	 0, /* 0x90 */
+         0, 0xCEB7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEFA9, 	 0, 	 0, /* 0xA0 */
+         0, 0xDFD5, 	 0, 	 0, 0xEDD7, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xEEC6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xEFBD, 0xFCD6, 	 0, 	 0, 0xDBF4, 	 0, 0xEFAA, 0xF8B9, /* 0xC0 */
+         0, 0xF5E9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE3D9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE1C6, 	 0, 	 0, 	 0, 0xD4BF, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xDEE8													/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_7C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xF0EA, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xF3C2,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xD3AF,      0, /* 0x10 */
-         0, 0xCADB,      0,      0,      0,      0,      0, 0xFCD7, /* 0x20 */
-         0,      0, 0xEDD8, 0xE1C7,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xF4D8, 0xD6B3, 0xDDAD, /* 0x30 */
-         0,      0,      0, 0xD5BE,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xF1C3, 0xEEDF,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xD6EB,      0,      0,      0, 0xF4D9,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xD7E6,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xDAB7,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0xDDFB,      0,      0,      0,      0, /* 0x80 */
-         0, 0xDDCF,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xD8A3,      0,      0, 0xDAD9,      0, 0xF0D8, /* 0x90 */
-    0xEFC4,      0,      0,      0,      0,      0,      0, 0xE1D8, /* 0x90 */
-         0,      0,      0,      0,      0, 0xF1D4,      0, 0xEDF2, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xD5DB,      0, /* 0xA0 */
-         0, 0xD5DC, 0xF3C4, 0xCBD7,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE2B6,      0,      0,      0,      0, 0xEFF1,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xFBD5,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xD3D8,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xDDD0, 0xF0D9, /* 0xD0 */
-    0xCBB3,      0,      0,      0,      0,      0,      0, 0xD5DD, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xCDA7,      0,      0, 0xD0AC          /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xF3C2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD3AF, 	 0, /* 0x10 */
+         0, 0xCADB, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFCD7, /* 0x20 */
+         0, 	 0, 0xEDD8, 0xE1C7, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF4D8, 0xD6B3, 0xDDAD, /* 0x30 */
+         0, 	 0, 	 0, 0xD5BE, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xF1C3, 0xEEDF, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xD6EB, 	 0, 	 0, 	 0, 0xF4D9, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xD7E6, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xDAB7, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0xDDFB, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xDDCF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xD8A3, 	 0, 	 0, 0xDAD9, 	 0, 0xF0D8, /* 0x90 */
+    0xEFC4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1D8, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF1D4, 	 0, 0xEDF2, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD5DB, 	 0, /* 0xA0 */
+         0, 0xD5DC, 0xF3C4, 0xCBD7, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE2B6, 	 0, 	 0, 	 0, 	 0, 0xEFF1, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xFBD5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD3D8, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDDD0, 0xF0D9, /* 0xD0 */
+    0xCBB3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD5DD, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xCDA7, 	 0, 	 0, 0xD0AC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_7D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD1BA,      0, 0xF1C4,      0, 0xE5B3, 0xFBF5, 0xE9E1, 0xFDE0, /* 0x00 */
-    0xFCBC,      0, 0xDAA2, 0xDAA3,      0, 0xD2A1,      0,      0, /* 0x00 */
-    0xD2EF,      0,      0,      0, 0xE2ED,      0,      0, 0xDEE9, /* 0x10 */
-    0xCEDC, 0xF2B5, 0xD0E4, 0xDDD1,      0,      0,      0,      0, /* 0x10 */
-    0xE1C8, 0xDBB7, 0xDFE3,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xEDB9, 0xF1C5,      0, 0xF3CF, 0xD7AB, /* 0x20 */
-    0xE1AC,      0,      0, 0xE3EB,      0, 0xEEC7,      0,      0, /* 0x30 */
-         0, 0xE1C9, 0xCAFA,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xF0FB, 0xFAE1, 0xF0DA, 0xCCE7, 0xDAF4,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xCCBF,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xCEED,      0, /* 0x50 */
-         0, 0xD5A9, 0xFAE2,      0,      0,      0, 0xD0E5,      0, /* 0x60 */
-    0xEBD6,      0, 0xECDF,      0,      0,      0, 0xDFFC,      0, /* 0x60 */
-         0, 0xF7D6, 0xDEEA, 0xCBB4,      0,      0, 0xEFBE,      0, /* 0x70 */
-         0, 0xCCB5,      0,      0,      0,      0,      0, 0xCFBD, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xEFF2, 0xE2B7, /* 0x80 */
-         0,      0,      0, 0xCCE8,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xF0FC,      0,      0,      0, /* 0x90 */
-    0xD6E0,      0, 0xF1C6,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xE2B8, 0xEBAB,      0,      0, /* 0xA0 */
-         0, 0xCBB5, 0xD8D1,      0, 0xF4CE, 0xF3F7,      0,      0, /* 0xB0 */
-    0xD7C6,      0, 0xD1BB, 0xF7AA,      0, 0xEDCA, 0xD7D3, 0xD8FA, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xF6C5, /* 0xC0 */
-         0,      0, 0xD1CC, 0xDDFC,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xDFFD,      0, /* 0xD0 */
-    0xF9E5,      0, 0xE0CA,      0,      0, 0xF2FD, 0xD3B0,      0, /* 0xD0 */
-    0xF4F3, 0xDAC9,      0, 0xE6DE,      0,      0,      0,      0, /* 0xE0 */
-    0xF8BA, 0xE8D0,      0,      0, 0xD8FB,      0,      0, 0xEAD5, /* 0xE0 */
-         0,      0,      0,      0, 0xD6A3,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xF6C6                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD1BA, 	 0, 0xF1C4, 	 0, 0xE5B3, 0xFBF5, 0xE9E1, 0xFDE0, /* 0x00 */
+    0xFCBC, 	 0, 0xDAA2, 0xDAA3, 	 0, 0xD2A1, 	 0, 	 0, /* 0x00 */
+    0xD2EF, 	 0, 	 0, 	 0, 0xE2ED, 	 0, 	 0, 0xDEE9, /* 0x10 */
+    0xCEDC, 0xF2B5, 0xD0E4, 0xDDD1, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xE1C8, 0xDBB7, 0xDFE3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xEDB9, 0xF1C5, 	 0, 0xF3CF, 0xD7AB, /* 0x20 */
+    0xE1AC, 	 0, 	 0, 0xE3EB, 	 0, 0xEEC7, 	 0, 	 0, /* 0x30 */
+         0, 0xE1C9, 0xCAFA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xF0FB, 0xFAE1, 0xF0DA, 0xCCE7, 0xDAF4, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xCCBF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCEED, 	 0, /* 0x50 */
+         0, 0xD5A9, 0xFAE2, 	 0, 	 0, 	 0, 0xD0E5, 	 0, /* 0x60 */
+    0xEBD6, 	 0, 0xECDF, 	 0, 	 0, 	 0, 0xDFFC, 	 0, /* 0x60 */
+         0, 0xF7D6, 0xDEEA, 0xCBB4, 	 0, 	 0, 0xEFBE, 	 0, /* 0x70 */
+         0, 0xCCB5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCFBD, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEFF2, 0xE2B7, /* 0x80 */
+         0, 	 0, 	 0, 0xCCE8, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xF0FC, 	 0, 	 0, 	 0, /* 0x90 */
+    0xD6E0, 	 0, 0xF1C6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xE2B8, 0xEBAB, 	 0, 	 0, /* 0xA0 */
+         0, 0xCBB5, 0xD8D1, 	 0, 0xF4CE, 0xF3F7, 	 0, 	 0, /* 0xB0 */
+    0xD7C6, 	 0, 0xD1BB, 0xF7AA, 	 0, 0xEDCA, 0xD7D3, 0xD8FA, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF6C5, /* 0xC0 */
+         0, 	 0, 0xD1CC, 0xDDFC, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDFFD, 	 0, /* 0xD0 */
+    0xF9E5, 	 0, 0xE0CA, 	 0, 	 0, 0xF2FD, 0xD3B0, 	 0, /* 0xD0 */
+    0xF4F3, 0xDAC9, 	 0, 0xE6DE, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xF8BA, 0xE8D0, 	 0, 	 0, 0xD8FB, 	 0, 	 0, 0xEAD5, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xD6A3, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xF6C6									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_7E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xF2DB, 0xE4FC,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0xE8B2,      0,      0, /* 0x10 */
-         0,      0,      0, 0xDADA,      0, 0xF2DC, 0xFBD6, 0xE9B2, /* 0x10 */
-         0, 0xEEAD,      0, 0xFAE3,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xDCEE,      0,      0, 0xF5EA, 0xE6E0, /* 0x20 */
-         0, 0xF0FD,      0,      0,      0,      0,      0, 0xD7AC, /* 0x30 */
-         0,      0,      0,      0,      0, 0xF5C5, 0xEEE0,      0, /* 0x30 */
-         0, 0xDBE5,      0, 0xDDDE,      0,      0, 0xD9F0, 0xE9A3, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xF1F9,      0, 0xF2C4, 0xE0CB,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xE9A4,      0, /* 0x50 */
-         0, 0xE2B9,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xE3B1, 0xFCEB, 0xCDA8,      0, 0xCCB6,      0,      0, /* 0x60 */
-    0xF0DB,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xE6BA,      0,      0, 0xCDA9,      0,      0,      0, /* 0x70 */
-         0,      0, 0xF3C3,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0xE1D9,      0,      0, 0xEFAB, /* 0x80 */
-         0,      0,      0, 0xE7C5,      0,      0, 0xE0E9,      0, /* 0x90 */
-    0xF3C5,      0,      0, 0xD4C0, 0xD5BF                          /* 0x90 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xF2DB, 0xE4FC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE8B2, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xDADA, 	 0, 0xF2DC, 0xFBD6, 0xE9B2, /* 0x10 */
+         0, 0xEEAD, 	 0, 0xFAE3, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xDCEE, 	 0, 	 0, 0xF5EA, 0xE6E0, /* 0x20 */
+         0, 0xF0FD, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD7AC, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF5C5, 0xEEE0, 	 0, /* 0x30 */
+         0, 0xDBE5, 	 0, 0xDDDE, 	 0, 	 0, 0xD9F0, 0xE9A3, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xF1F9, 	 0, 0xF2C4, 0xE0CB, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9A4, 	 0, /* 0x50 */
+         0, 0xE2B9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xE3B1, 0xFCEB, 0xCDA8, 	 0, 0xCCB6, 	 0, 	 0, /* 0x60 */
+    0xF0DB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xE6BA, 	 0, 	 0, 0xCDA9, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xF3C3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xE1D9, 	 0, 	 0, 0xEFAB, /* 0x80 */
+         0, 	 0, 	 0, 0xE7C5, 	 0, 	 0, 0xE0E9, 	 0, /* 0x90 */
+    0xF3C5, 	 0, 	 0, 0xD4C0, 0xD5BF							/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_7F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0xDDAE,      0, /* 0x30 */
-    0xF9FC,      0, 0xCCC0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xE5A2,      0,      0,      0, /* 0x40 */
-    0xCEB8,      0,      0,      0, 0xD8D2, 0xF9D6,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xF1AA, 0xCED1,      0,      0, 0xF6C7,      0, /* 0x60 */
-    0xDBEB,      0, 0xDFFE,      0,      0, 0xD8E1,      0, 0xF7F3, /* 0x70 */
-         0, 0xD7E7,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xD4FE,      0,      0, /* 0x80 */
-    0xD1BC,      0, 0xE5CF,      0, 0xCBB6,      0, 0xDAB8,      0, /* 0x80 */
-         0,      0,      0,      0, 0xCDC4,      0,      0,      0, /* 0x90 */
-         0,      0, 0xD6BE,      0,      0,      0, 0xE2BA,      0, /* 0x90 */
-         0,      0,      0,      0, 0xCFD8,      0,      0,      0, /* 0xA0 */
-    0xE0CC, 0xEBF9,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xFDFD,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xD7E8, 0xCBD8,      0,      0,      0, 0xE9E2,      0,      0, /* 0xB0 */
-         0, 0xE8BA,      0,      0,      0, 0xE3C7,      0,      0, /* 0xC0 */
-         0,      0, 0xECCD,      0, 0xECCE,      0, 0xD6BF,      0, /* 0xC0 */
-         0,      0, 0xE3A7,      0, 0xDFD6, 0xFDE8,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0xEEE1, /* 0xD0 */
-    0xF6A8, 0xDDFD,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xF8BB,      0, 0xE8D1,      0,      0,      0,      0, /* 0xE0 */
-    0xF9D7,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xCEEE,      0,      0, 0xECCF                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0xDDAE, 	 0, /* 0x30 */
+    0xF9FC, 	 0, 0xCCC0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xE5A2, 	 0, 	 0, 	 0, /* 0x40 */
+    0xCEB8, 	 0, 	 0, 	 0, 0xD8D2, 0xF9D6, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xF1AA, 0xCED1, 	 0, 	 0, 0xF6C7, 	 0, /* 0x60 */
+    0xDBEB, 	 0, 0xDFFE, 	 0, 	 0, 0xD8E1, 	 0, 0xF7F3, /* 0x70 */
+         0, 0xD7E7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD4FE, 	 0, 	 0, /* 0x80 */
+    0xD1BC, 	 0, 0xE5CF, 	 0, 0xCBB6, 	 0, 0xDAB8, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xCDC4, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xD6BE, 	 0, 	 0, 	 0, 0xE2BA, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xCFD8, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xE0CC, 0xEBF9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xFDFD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xD7E8, 0xCBD8, 	 0, 	 0, 	 0, 0xE9E2, 	 0, 	 0, /* 0xB0 */
+         0, 0xE8BA, 	 0, 	 0, 	 0, 0xE3C7, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xECCD, 	 0, 0xECCE, 	 0, 0xD6BF, 	 0, /* 0xC0 */
+         0, 	 0, 0xE3A7, 	 0, 0xDFD6, 0xFDE8, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEEE1, /* 0xD0 */
+    0xF6A8, 0xDDFD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xF8BB, 	 0, 0xE8D1, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xF9D7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xCEEE, 	 0, 	 0, 0xECCF							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_80[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE9A5, 0xD6D5,      0, 0xCDC5,      0, 0xEDBA, 0xD1BD,      0, /* 0x00 */
-         0, 0xCFBE,      0,      0, 0xECBB,      0,      0,      0, /* 0x00 */
-    0xD2B1,      0,      0,      0,      0, 0xCCE9,      0, 0xD9C4, /* 0x10 */
-    0xE9FC,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xD1BE,      0,      0, /* 0x20 */
-         0,      0,      0, 0xECBC,      0,      0, 0xE5AD,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xF7B0,      0, 0xCCEA, /* 0x30 */
-         0,      0,      0, 0xD3C4,      0,      0, 0xD6C0,      0, /* 0x40 */
-         0,      0, 0xD6FD,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xE1A1,      0, /* 0x50 */
-    0xDEBD,      0, 0xF6A9,      0,      0,      0, 0xDAA4,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0xD6A4, /* 0x60 */
-    0xF5C6,      0, 0xE1A2, 0xE9C6,      0,      0,      0, 0xF2C5, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF4E9, 0xD6EC, 0xEBD3, /* 0x70 */
-         0,      0,      0,      0, 0xECBD, 0xE2DC, 0xDEEB, 0xF0DC, /* 0x80 */
-         0, 0xEBBF,      0, 0xD7CE, 0xD1BF,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xF5AB,      0, /* 0x90 */
-         0,      0,      0, 0xF9FD,      0, 0xCADC,      0,      0, /* 0x90 */
-         0, 0xCDC6, 0xF2B6,      0,      0, 0xDDFE,      0,      0, /* 0xA0 */
-         0, 0xCCB7, 0xDBB8,      0,      0,      0,      0, 0xD0E9, /* 0xA0 */
-         0, 0xCEDD, 0xEBC0,      0, 0xFDA2,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xF8CB,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xEAD6, 0xF1B0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xDBCE,      0, 0xF7C3,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xDBCF, 0xCBA4,      0,      0, 0xF8E0,      0, /* 0xD0 */
-         0, 0xFBD7,      0,      0, 0xEBCA, 0xE0A1,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xCECD,      0,      0, 0xD4DC,      0,      0,      0, /* 0xF0 */
-    0xFDD8,      0,      0,      0,      0, 0xD2F6                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE9A5, 0xD6D5, 	 0, 0xCDC5, 	 0, 0xEDBA, 0xD1BD, 	 0, /* 0x00 */
+         0, 0xCFBE, 	 0, 	 0, 0xECBB, 	 0, 	 0, 	 0, /* 0x00 */
+    0xD2B1, 	 0, 	 0, 	 0, 	 0, 0xCCE9, 	 0, 0xD9C4, /* 0x10 */
+    0xE9FC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD1BE, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xECBC, 	 0, 	 0, 0xE5AD, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF7B0, 	 0, 0xCCEA, /* 0x30 */
+         0, 	 0, 	 0, 0xD3C4, 	 0, 	 0, 0xD6C0, 	 0, /* 0x40 */
+         0, 	 0, 0xD6FD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1A1, 	 0, /* 0x50 */
+    0xDEBD, 	 0, 0xF6A9, 	 0, 	 0, 	 0, 0xDAA4, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD6A4, /* 0x60 */
+    0xF5C6, 	 0, 0xE1A2, 0xE9C6, 	 0, 	 0, 	 0, 0xF2C5, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF4E9, 0xD6EC, 0xEBD3, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xECBD, 0xE2DC, 0xDEEB, 0xF0DC, /* 0x80 */
+         0, 0xEBBF, 	 0, 0xD7CE, 0xD1BF, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF5AB, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xF9FD, 	 0, 0xCADC, 	 0, 	 0, /* 0x90 */
+         0, 0xCDC6, 0xF2B6, 	 0, 	 0, 0xDDFE, 	 0, 	 0, /* 0xA0 */
+         0, 0xCCB7, 0xDBB8, 	 0, 	 0, 	 0, 	 0, 0xD0E9, /* 0xA0 */
+         0, 0xCEDD, 0xEBC0, 	 0, 0xFDA2, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xF8CB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xEAD6, 0xF1B0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xDBCE, 	 0, 0xF7C3, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xDBCF, 0xCBA4, 	 0, 	 0, 0xF8E0, 	 0, /* 0xD0 */
+         0, 0xFBD7, 	 0, 	 0, 0xEBCA, 0xE0A1, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xCECD, 	 0, 	 0, 0xD4DC, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xFDD8, 	 0, 	 0, 	 0, 	 0, 0xD2F6					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_81[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xF2B7,      0,      0, 0xFAF6, 0xF6AA, 0xFAF7, /* 0x00 */
-    0xD8E6,      0, 0xF4B1,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xE8D2,      0, 0xCAC5, 0xCCEB,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xE2EE,      0,      0,      0,      0, /* 0x20 */
-         0, 0xE2BB,      0, 0xF7AD,      0,      0,      0, 0xF8E1, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xF3EC,      0,      0,      0,      0, 0xDEA1,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xE4FD,      0,      0, 0xE3EC,      0, /* 0x40 */
-    0xDDAF, 0xDDB0,      0,      0, 0xCBB7, 0xE8D3,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xE1A3, 0xD2E0,      0, /* 0x60 */
-         0,      0,      0, 0xF0FE,      0,      0,      0,      0, /* 0x60 */
-    0xE9A6, 0xCBF2,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xEDF3, 0xDCD9, 0xE0CD,      0,      0,      0,      0, 0xF7DA, /* 0x70 */
-    0xDBB9,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xCCAE,      0, 0xDADB,      0,      0,      0,      0, 0xCDC7, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xDDB1,      0, 0xD8AF, 0xE3A3,      0,      0, /* 0x90 */
-    0xCEEF,      0,      0, 0xF2F3,      0,      0,      0,      0, /* 0xA0 */
-    0xF8B3,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xE0CE,      0, 0xF5FD,      0,      0, /* 0xB0 */
-         0,      0, 0xEBEC,      0,      0, 0xD3C5, 0xFCEC, 0xD2DB, /* 0xB0 */
-    0xD4EB,      0, 0xDEA2,      0,      0,      0, 0xE5E6,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xF0B0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xD5C4,      0,      0,      0,      0,      0,      0, 0xEDF4, /* 0xD0 */
-         0,      0,      0, 0xE3ED,      0, 0xE8C2,      0, 0xEDF5, /* 0xE0 */
-    0xD7FC,      0, 0xEDBB,      0,      0, 0xF6AB,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xF2B8, 0xF6C8,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xD3E6, 0xF2DD, 0xCFBF,      0, 0xEBAC          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xF2B7, 	 0, 	 0, 0xFAF6, 0xF6AA, 0xFAF7, /* 0x00 */
+    0xD8E6, 	 0, 0xF4B1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xE8D2, 	 0, 0xCAC5, 0xCCEB, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xE2EE, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xE2BB, 	 0, 0xF7AD, 	 0, 	 0, 	 0, 0xF8E1, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xF3EC, 	 0, 	 0, 	 0, 	 0, 0xDEA1, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xE4FD, 	 0, 	 0, 0xE3EC, 	 0, /* 0x40 */
+    0xDDAF, 0xDDB0, 	 0, 	 0, 0xCBB7, 0xE8D3, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE1A3, 0xD2E0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xF0FE, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xE9A6, 0xCBF2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xEDF3, 0xDCD9, 0xE0CD, 	 0, 	 0, 	 0, 	 0, 0xF7DA, /* 0x70 */
+    0xDBB9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xCCAE, 	 0, 0xDADB, 	 0, 	 0, 	 0, 	 0, 0xCDC7, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xDDB1, 	 0, 0xD8AF, 0xE3A3, 	 0, 	 0, /* 0x90 */
+    0xCEEF, 	 0, 	 0, 0xF2F3, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xF8B3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xE0CE, 	 0, 0xF5FD, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xEBEC, 	 0, 	 0, 0xD3C5, 0xFCEC, 0xD2DB, /* 0xB0 */
+    0xD4EB, 	 0, 0xDEA2, 	 0, 	 0, 	 0, 0xE5E6, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF0B0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xD5C4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEDF4, /* 0xD0 */
+         0, 	 0, 	 0, 0xE3ED, 	 0, 0xE8C2, 	 0, 0xEDF5, /* 0xE0 */
+    0xD7FC, 	 0, 0xEDBB, 	 0, 	 0, 0xF6AB, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xF2B8, 0xF6C8, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xD3E6, 0xF2DD, 0xCFBF, 	 0, 0xEBAC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_82[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xCFC0,      0, 0xE6A8, /* 0x00 */
-    0xFDE9,      0, 0xCFC1,      0, 0xE0DF, 0xDEEC,      0,      0, /* 0x00 */
-         0,      0, 0xE0A2,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xF4BF, 0xE2EF,      0, 0xD9F1, 0xF1C7, /* 0x10 */
-         0, 0xCBB8,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xF9FE, 0xDBBA, 0xDAF5,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xF6EC, 0xDADC, 0xFAE4, /* 0x30 */
-         0, 0xE0CF,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xDDB2,      0,      0,      0,      0, 0xE6A9,      0, 0xEFF3, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xF3ED,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xEBFA,      0, 0xF9E6,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xCADD, 0xD5DE, /* 0x60 */
-         0, 0xCADE, 0xDFE4,      0,      0,      0, 0xE6FD,      0, /* 0x70 */
-    0xF5AC,      0,      0,      0,      0,      0, 0xE4F5,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xE9E3,      0, 0xEDCB, 0xCFE4,      0, /* 0x80 */
-         0,      0, 0xD8D3,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xDDB3, 0xD4EC,      0,      0, 0xF2B9,      0, 0xDFB7, /* 0x90 */
-         0,      0,      0,      0,      0, 0xCBCE, 0xFBD8,      0, /* 0xA0 */
-         0, 0xD0D9,      0,      0, 0xDDD2, 0xF7F4, 0xE7DC, 0xE4A5, /* 0xA0 */
-         0, 0xFCA3,      0, 0xDBBB,      0,      0,      0, 0xF2BA, /* 0xB0 */
-    0xE9FD, 0xD0CA,      0, 0xF5D6, 0xD9C5, 0xE4B4,      0, 0xEDA7, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xEABD, 0xE6FE,      0, 0xF7C4, 0xF5AD,      0, 0xD9E0, /* 0xD0 */
-         0,      0,      0, 0xCAB4,      0,      0, 0xF8E2, 0xCFC2, /* 0xD0 */
-         0, 0xECBE,      0,      0,      0, 0xE5B4, 0xCDC8, 0xEEC8, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xE7C8,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xCDC9, 0xF9B7          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xCFC0, 	 0, 0xE6A8, /* 0x00 */
+    0xFDE9, 	 0, 0xCFC1, 	 0, 0xE0DF, 0xDEEC, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xE0A2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xF4BF, 0xE2EF, 	 0, 0xD9F1, 0xF1C7, /* 0x10 */
+         0, 0xCBB8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF9FE, 0xDBBA, 0xDAF5, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF6EC, 0xDADC, 0xFAE4, /* 0x30 */
+         0, 0xE0CF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xDDB2, 	 0, 	 0, 	 0, 	 0, 0xE6A9, 	 0, 0xEFF3, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xF3ED, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xEBFA, 	 0, 0xF9E6, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCADD, 0xD5DE, /* 0x60 */
+         0, 0xCADE, 0xDFE4, 	 0, 	 0, 	 0, 0xE6FD, 	 0, /* 0x70 */
+    0xF5AC, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4F5, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xE9E3, 	 0, 0xEDCB, 0xCFE4, 	 0, /* 0x80 */
+         0, 	 0, 0xD8D3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xDDB3, 0xD4EC, 	 0, 	 0, 0xF2B9, 	 0, 0xDFB7, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCBCE, 0xFBD8, 	 0, /* 0xA0 */
+         0, 0xD0D9, 	 0, 	 0, 0xDDD2, 0xF7F4, 0xE7DC, 0xE4A5, /* 0xA0 */
+         0, 0xFCA3, 	 0, 0xDBBB, 	 0, 	 0, 	 0, 0xF2BA, /* 0xB0 */
+    0xE9FD, 0xD0CA, 	 0, 0xF5D6, 0xD9C5, 0xE4B4, 	 0, 0xEDA7, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xEABD, 0xE6FE, 	 0, 0xF7C4, 0xF5AD, 	 0, 0xD9E0, /* 0xD0 */
+         0, 	 0, 	 0, 0xCAB4, 	 0, 	 0, 0xF8E2, 0xCFC2, /* 0xD0 */
+         0, 0xECBE, 	 0, 	 0, 	 0, 0xE5B4, 0xCDC8, 0xEEC8, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xE7C8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCDC9, 0xF9B7			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_83[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xF1E8, 0xD9F2, 0xDBF5, 0xCAB5, 0xD9C6,      0,      0, /* 0x00 */
-         0, 0xD8C9,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0, 0xD9AB, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xEDBC,      0,      0, 0xD8D4,      0,      0,      0, 0xDCDA, /* 0x20 */
-         0, 0xE2BC,      0,      0, 0xFCED, 0xECE0, 0xD2FE,      0, /* 0x30 */
-    0xE9C7, 0xE6AA,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xE2F0,      0,      0,      0,      0,      0,      0, 0xFABB, /* 0x40 */
-         0, 0xF5AE, 0xFBAA,      0,      0,      0,      0, 0xECFB, /* 0x40 */
-         0, 0xECBF, 0xFCD8,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xD4E5,      0,      0,      0, 0xF9C3, /* 0x70 */
-         0,      0,      0, 0xEEE2,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xD7E9, 0xEDF6,      0,      0,      0, 0xDEED,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xCCEC,      0, /* 0x90 */
-    0xE3EE,      0,      0,      0,      0,      0, 0xE8D4,      0, /* 0x90 */
-         0,      0, 0xFAF8,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xDDB4, 0xE4B5, 0xD8B0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xD8D5,      0,      0, /* 0xB0 */
-         0, 0xF4EA,      0,      0,      0, 0xCEB9,      0,      0, /* 0xC0 */
-         0, 0xD6E1, 0xCFD2,      0, 0xD0B6,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xCEA2,      0,      0, 0xF3EE,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xF3F8,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xDCCC,      0, 0xD0CB,      0,      0,      0, 0xFCA4, /* 0xE0 */
-    0xCDCA, 0xD7D4, 0xDEA3,      0, 0xE4E0,      0,      0,      0, /* 0xF0 */
-         0, 0xEEC9,      0,      0,      0, 0xE2DD                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xF1E8, 0xD9F2, 0xDBF5, 0xCAB5, 0xD9C6, 	 0, 	 0, /* 0x00 */
+         0, 0xD8C9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD9AB, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xEDBC, 	 0, 	 0, 0xD8D4, 	 0, 	 0, 	 0, 0xDCDA, /* 0x20 */
+         0, 0xE2BC, 	 0, 	 0, 0xFCED, 0xECE0, 0xD2FE, 	 0, /* 0x30 */
+    0xE9C7, 0xE6AA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xE2F0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFABB, /* 0x40 */
+         0, 0xF5AE, 0xFBAA, 	 0, 	 0, 	 0, 	 0, 0xECFB, /* 0x40 */
+         0, 0xECBF, 0xFCD8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xD4E5, 	 0, 	 0, 	 0, 0xF9C3, /* 0x70 */
+         0, 	 0, 	 0, 0xEEE2, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xD7E9, 0xEDF6, 	 0, 	 0, 	 0, 0xDEED, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCCEC, 	 0, /* 0x90 */
+    0xE3EE, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8D4, 	 0, /* 0x90 */
+         0, 	 0, 0xFAF8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xDDB4, 0xE4B5, 0xD8B0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD8D5, 	 0, 	 0, /* 0xB0 */
+         0, 0xF4EA, 	 0, 	 0, 	 0, 0xCEB9, 	 0, 	 0, /* 0xC0 */
+         0, 0xD6E1, 0xCFD2, 	 0, 0xD0B6, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xCEA2, 	 0, 	 0, 0xF3EE, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xF3F8, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xDCCC, 	 0, 0xD0CB, 	 0, 	 0, 	 0, 0xFCA4, /* 0xE0 */
+    0xCDCA, 0xD7D4, 0xDEA3, 	 0, 0xE4E0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xEEC9, 	 0, 	 0, 	 0, 0xE2DD					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_84[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xF5FE, 0xD4AC,      0,      0,      0, /* 0x00 */
-         0,      0, 0xD5D1,      0, 0xD8F0, 0xF8C3, 0xEAD7,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xF5D7,      0,      0, 0xD8BF,      0,      0,      0, /* 0x20 */
-         0, 0xFDC0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xEBAD,      0,      0,      0,      0, 0xD5AA,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xE7A8,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xEECA, /* 0x50 */
-         0,      0,      0, 0xCAE7,      0,      0,      0,      0, /* 0x50 */
-         0, 0xF8E3,      0, 0xD4DD,      0,      0, 0xEAD8,      0, /* 0x60 */
-         0,      0,      0, 0xFBD9, 0xEDF7,      0,      0, 0xE5B5, /* 0x60 */
-         0,      0,      0,      0,      0, 0xD0AD,      0,      0, /* 0x70 */
-         0,      0, 0xF1F1,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xE2BD,      0,      0,      0, 0xE3C8,      0,      0,      0, /* 0x90 */
-         0, 0xD9D5,      0,      0, 0xDFAA,      0,      0,      0, /* 0x90 */
-         0, 0xDBBC,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xF8E4,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xF1FA,      0,      0, 0xE5B6, 0xF3EF,      0,      0, 0xFBDA, /* 0xB0 */
-    0xE1E0,      0, 0xD9AC,      0, 0xF5EB,      0, 0xE0B6,      0, /* 0xC0 */
-         0, 0xE9C8,      0, 0xCBCF,      0, 0xE3C9,      0,      0, /* 0xC0 */
-         0, 0xDEEE,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xE2BE,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xDCEF,      0, 0xD6A5,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xE2F1,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0, 0xD6FE                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xF5FE, 0xD4AC, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xD5D1, 	 0, 0xD8F0, 0xF8C3, 0xEAD7, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xF5D7, 	 0, 	 0, 0xD8BF, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xFDC0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xEBAD, 	 0, 	 0, 	 0, 	 0, 0xD5AA, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xE7A8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEECA, /* 0x50 */
+         0, 	 0, 	 0, 0xCAE7, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xF8E3, 	 0, 0xD4DD, 	 0, 	 0, 0xEAD8, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xFBD9, 0xEDF7, 	 0, 	 0, 0xE5B5, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD0AD, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xF1F1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE2BD, 	 0, 	 0, 	 0, 0xE3C8, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xD9D5, 	 0, 	 0, 0xDFAA, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xDBBC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xF8E4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xF1FA, 	 0, 	 0, 0xE5B6, 0xF3EF, 	 0, 	 0, 0xFBDA, /* 0xB0 */
+    0xE1E0, 	 0, 0xD9AC, 	 0, 0xF5EB, 	 0, 0xE0B6, 	 0, /* 0xC0 */
+         0, 0xE9C8, 	 0, 0xCBCF, 	 0, 0xE3C9, 	 0, 	 0, /* 0xC0 */
+         0, 0xDEEE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xE2BE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xDCEF, 	 0, 0xD6A5, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xE2F1, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xD6FE							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_85[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xD9A1,      0, 0xD8C0, 0xDCDB,      0,      0, 0xEDBD, /* 0x10 */
-    0xDFB8,      0, 0xEAA5,      0,      0,      0, 0xD7AD,      0, /* 0x10 */
-         0, 0xF3F9,      0, 0xEDF8,      0, 0xF5C7,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xE1CA, 0xEBE3,      0, 0xF2DE, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xF8CC,      0, 0xEAD9, /* 0x30 */
-         0, 0xD3C6,      0, 0xDBE6,      0,      0,      0,      0, /* 0x40 */
-         0, 0xF5AF,      0,      0,      0,      0, 0xCEF0,      0, /* 0x40 */
-         0,      0,      0, 0xE9FE,      0,      0,      0,      0, /* 0x50 */
-         0, 0xFBB6,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xE2F2,      0,      0,      0,      0, /* 0x60 */
-    0xCFF2, 0xF7B9, 0xD9F3,      0,      0, 0xE1CB,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xDADD,      0,      0, 0xDAB9, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0, 0xEBFB, /* 0x80 */
-         0, 0xCBB9,      0,      0, 0xEDF9,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xE0E0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0xF4C0,      0, /* 0xA0 */
-    0xFDBC, 0xDFB1, 0xE3EF,      0,      0,      0,      0, 0xE0A3, /* 0xA0 */
-    0xFDB9,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xF0B1,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xCDCB,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xEDBE,      0,      0,      0, 0xD5C0, 0xE3F0, 0xEDFA, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xE9E4,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xD5ED, 0xE7DD,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xD4F6, 0xE5B7,      0,      0, /* 0xE0 */
-         0, 0xDBE7, 0xE2BF,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xEECB, /* 0xF0 */
-         0,      0, 0xD7F4, 0xF0DD,      0,      0,      0, 0xCEAB  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xD9A1, 	 0, 0xD8C0, 0xDCDB, 	 0, 	 0, 0xEDBD, /* 0x10 */
+    0xDFB8, 	 0, 0xEAA5, 	 0, 	 0, 	 0, 0xD7AD, 	 0, /* 0x10 */
+         0, 0xF3F9, 	 0, 0xEDF8, 	 0, 0xF5C7, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xE1CA, 0xEBE3, 	 0, 0xF2DE, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF8CC, 	 0, 0xEAD9, /* 0x30 */
+         0, 0xD3C6, 	 0, 0xDBE6, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xF5AF, 	 0, 	 0, 	 0, 	 0, 0xCEF0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xE9FE, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xFBB6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xE2F2, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xCFF2, 0xF7B9, 0xD9F3, 	 0, 	 0, 0xE1CB, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xDADD, 	 0, 	 0, 0xDAB9, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEBFB, /* 0x80 */
+         0, 0xCBB9, 	 0, 	 0, 0xEDF9, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xE0E0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4C0, 	 0, /* 0xA0 */
+    0xFDBC, 0xDFB1, 0xE3EF, 	 0, 	 0, 	 0, 	 0, 0xE0A3, /* 0xA0 */
+    0xFDB9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xF0B1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xCDCB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xEDBE, 	 0, 	 0, 	 0, 0xD5C0, 0xE3F0, 0xEDFA, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE9E4, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xD5ED, 0xE7DD, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xD4F6, 0xE5B7, 	 0, 	 0, /* 0xE0 */
+         0, 0xDBE7, 0xE2BF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEECB, /* 0xF0 */
+         0, 	 0, 0xD7F4, 0xF0DD, 	 0, 	 0, 	 0, 0xCEAB	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_86[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xE7DE,      0,      0,      0, 0xD6D6, 0xE1CC, /* 0x00 */
-         0,      0, 0xE8B3,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xE5EE, 0xDCA2, /* 0x10 */
-         0,      0, 0xE0D0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xD5B5,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xD5A1, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xFBDB,      0, /* 0x40 */
-    0xF9CB,      0,      0,      0, 0xCBF3, 0xF4A5,      0,      0, /* 0x50 */
-         0,      0,      0, 0xFAC8, 0xD6D7,      0, 0xE9E5, 0xFBDC, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xFDD0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xFBF6,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xDAA5,      0, 0xDBBD,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xECE2,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xCDF7, 0xF0DE,      0,      0,      0, /* 0xA0 */
-         0, 0xF6C9,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xDEEF, /* 0xC0 */
-         0,      0,      0, 0xD3B1,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xFCEE,      0,      0,      0, /* 0xD0 */
-         0, 0xE8C3,      0, 0xF1C8,      0,      0,      0, 0xCEF1, /* 0xD0 */
-         0,      0,      0,      0, 0xF9ED,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xF2F4,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0,      0, 0xE4B6          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xE7DE, 	 0, 	 0, 	 0, 0xD6D6, 0xE1CC, /* 0x00 */
+         0, 	 0, 0xE8B3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5EE, 0xDCA2, /* 0x10 */
+         0, 	 0, 0xE0D0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD5B5, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD5A1, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFBDB, 	 0, /* 0x40 */
+    0xF9CB, 	 0, 	 0, 	 0, 0xCBF3, 0xF4A5, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xFAC8, 0xD6D7, 	 0, 0xE9E5, 0xFBDC, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFDD0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xFBF6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xDAA5, 	 0, 0xDBBD, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xECE2, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xCDF7, 0xF0DE, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xF6C9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDEEF, /* 0xC0 */
+         0, 	 0, 	 0, 0xD3B1, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xFCEE, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xE8C3, 	 0, 0xF1C8, 	 0, 	 0, 	 0, 0xCEF1, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xF9ED, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF2F4, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4B6			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_87[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF5B9,      0, 0xDCF0, 0xE3F1,      0,      0,      0,      0, /* 0x00 */
-    0xE8A5,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xF2BB,      0, 0xDEA4,      0, 0xDACC,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xCAE9,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xE3DA,      0, 0xFCD9, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xEADA, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xF9C4,      0, /* 0x60 */
-    0xE3A4,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xFBDD,      0, 0xEFCA,      0, /* 0x70 */
-    0xE8C4,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xD5CC,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xEBD7,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xD9AD, /* 0x90 */
-         0,      0, 0xFBAB,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xD3D9,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xD5A2,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xF6DE,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xDAF6,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xE0D1,      0,      0, 0xE9A8, /* 0xE0 */
-         0,      0, 0xF5F9,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xFAAF,      0, 0xEBFC,      0,      0, 0xE0EA          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF5B9, 	 0, 0xDCF0, 0xE3F1, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xE8A5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xF2BB, 	 0, 0xDEA4, 	 0, 0xDACC, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCAE9, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE3DA, 	 0, 0xFCD9, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEADA, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF9C4, 	 0, /* 0x60 */
+    0xE3A4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xFBDD, 	 0, 0xEFCA, 	 0, /* 0x70 */
+    0xE8C4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xD5CC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEBD7, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD9AD, /* 0x90 */
+         0, 	 0, 0xFBAB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xD3D9, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xD5A2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xF6DE, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xDAF6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xE0D1, 	 0, 	 0, 0xE9A8, /* 0xE0 */
+         0, 	 0, 0xF5F9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xFAAF, 	 0, 0xEBFC, 	 0, 	 0, 0xE0EA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_88[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xE3B2,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xD5C5, /* 0x10 */
-         0,      0, 0xF1E3, 0xD5EE,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xCDCC,      0,      0,      0,      0, 0xEDD9,      0, /* 0x30 */
-         0,      0,      0, 0xD8C1,      0,      0,      0,      0, /* 0x30 */
-    0xFAEC,      0,      0,      0,      0,      0, 0xF1EB,      0, /* 0x40 */
-         0,      0,      0,      0, 0xFABC, 0xE6E2,      0,      0, /* 0x40 */
-         0,      0, 0xFAE5, 0xE2FA,      0,      0,      0, 0xCAB6, /* 0x50 */
-         0, 0xE4B7,      0, 0xEADB,      0, 0xF5FA,      0,      0, /* 0x50 */
-         0, 0xFBAC, 0xCFC3, 0xEBFD,      0,      0,      0,      0, /* 0x60 */
-    0xF8FA,      0,      0, 0xDFB9,      0,      0,      0,      0, /* 0x60 */
-    0xE1F1,      0, 0xD2A4,      0,      0,      0,      0, 0xF5FB, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xD0DA, 0xD0DB, /* 0x70 */
-         0, 0xEABE, 0xD9B1,      0,      0,      0,      0,      0, /* 0x80 */
-    0xCAB7,      0,      0, 0xD3E7,      0, 0xF8E5,      0,      0, /* 0x80 */
-         0,      0, 0xD3B2,      0,      0,      0, 0xE2C0, 0xF2DF, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0xCDE5,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xF9AC,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xCDCD,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xEEAE, 0xD6AE,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xD7EA, /* 0xC0 */
-         0,      0,      0,      0, 0xE7E0, 0xEBAE,      0,      0, /* 0xD0 */
-         0, 0xCFD9,      0,      0, 0xDCCD, 0xEDFB,      0, 0xDEF0, /* 0xD0 */
-         0, 0xD7EB,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xDEA5,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xDFD7, 0xDBD0, 0xDBD1,      0,      0, /* 0xF0 */
-    0xD5A3,      0,      0,      0,      0, 0xF0B2                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xE3B2, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD5C5, /* 0x10 */
+         0, 	 0, 0xF1E3, 0xD5EE, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xCDCC, 	 0, 	 0, 	 0, 	 0, 0xEDD9, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xD8C1, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xFAEC, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF1EB, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xFABC, 0xE6E2, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xFAE5, 0xE2FA, 	 0, 	 0, 	 0, 0xCAB6, /* 0x50 */
+         0, 0xE4B7, 	 0, 0xEADB, 	 0, 0xF5FA, 	 0, 	 0, /* 0x50 */
+         0, 0xFBAC, 0xCFC3, 0xEBFD, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xF8FA, 	 0, 	 0, 0xDFB9, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xE1F1, 	 0, 0xD2A4, 	 0, 	 0, 	 0, 	 0, 0xF5FB, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD0DA, 0xD0DB, /* 0x70 */
+         0, 0xEABE, 0xD9B1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xCAB7, 	 0, 	 0, 0xD3E7, 	 0, 0xF8E5, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xD3B2, 	 0, 	 0, 	 0, 0xE2C0, 0xF2DF, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCDE5, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xF9AC, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xCDCD, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xEEAE, 0xD6AE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD7EA, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xE7E0, 0xEBAE, 	 0, 	 0, /* 0xD0 */
+         0, 0xCFD9, 	 0, 	 0, 0xDCCD, 0xEDFB, 	 0, 0xDEF0, /* 0xD0 */
+         0, 0xD7EB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xDEA5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xDFD7, 0xDBD0, 0xDBD1, 	 0, 	 0, /* 0xF0 */
+    0xD5A3, 	 0, 	 0, 	 0, 	 0, 0xF0B2					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_89[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xDCDC, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0xCAE8,      0, 0xF8E6, 0xDCCE,      0,      0,      0,      0, /* 0x10 */
-    0xEADC, 0xDBD2,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xE9B3,      0,      0, /* 0x20 */
-         0,      0, 0xF7DB,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0xE3A8,      0, /* 0x30 */
-    0xD7AE,      0,      0, 0xE0E1,      0,      0,      0,      0, /* 0x30 */
-         0, 0xCBBA,      0,      0, 0xE5D1,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xD0DC, /* 0x50 */
-         0,      0,      0,      0, 0xD5C1,      0,      0,      0, /* 0x60 */
-         0,      0, 0xD8CA,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xE3A9,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xE0A4, /* 0x70 */
-         0, 0xE9A9,      0, 0xD3C7,      0,      0, 0xDCDD, 0xF8AE, /* 0x80 */
-         0,      0,      0, 0xCCB8,      0,      0,      0, 0xD0AE, /* 0x80 */
-         0,      0,      0, 0xD8F2,      0,      0, 0xE3CA,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xCCAF,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xD4AD, 0xF6D1,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xD0CC,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xCAC6,      0,      0, 0xD5C2,      0,      0, /* 0xB0 */
-    0xCEBA,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xCAC7,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xFAB0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xDFD8,      0,      0,      0, /* 0xF0 */
-    0xF5BA                                                          /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xCAE8, 	 0, 0xF8E6, 0xDCCE, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xEADC, 0xDBD2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE9B3, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF7DB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE3A8, 	 0, /* 0x30 */
+    0xD7AE, 	 0, 	 0, 0xE0E1, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xCBBA, 	 0, 	 0, 0xE5D1, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD0DC, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xD5C1, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xD8CA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xE3A9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0A4, /* 0x70 */
+         0, 0xE9A9, 	 0, 0xD3C7, 	 0, 	 0, 0xDCDD, 0xF8AE, /* 0x80 */
+         0, 	 0, 	 0, 0xCCB8, 	 0, 	 0, 	 0, 0xD0AE, /* 0x80 */
+         0, 	 0, 	 0, 0xD8F2, 	 0, 	 0, 0xE3CA, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xCCAF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xD4AD, 0xF6D1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xD0CC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xCAC6, 	 0, 	 0, 0xD5C2, 	 0, 	 0, /* 0xB0 */
+    0xCEBA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xCAC7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xFAB0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xDFD8, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xF5BA															/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_8A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE5EB,      0, 0xEFF4, 0xDDB5,      0,      0,      0,      0, /* 0x00 */
-    0xCDAA,      0, 0xE3F2,      0, 0xFBF7,      0, 0xF7D0,      0, /* 0x00 */
-         0,      0,      0, 0xFDBA,      0,      0, 0xFDE1, 0xF6FE, /* 0x10 */
-    0xD1C0,      0,      0, 0xE8C5,      0, 0xE4B8,      0, 0xE1E8, /* 0x10 */
-         0,      0,      0, 0xCCC1,      0, 0xD2ED,      0,      0, /* 0x20 */
-         0,      0, 0xDBBE,      0,      0, 0xE0E2,      0,      0, /* 0x20 */
-         0, 0xFAC9,      0,      0, 0xE1CD,      0, 0xCAB8,      0, /* 0x30 */
-         0,      0, 0xF2E0, 0xF1C9,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xDEF1,      0,      0,      0, 0xF0DF, 0xF8C4,      0,      0, /* 0x50 */
-         0,      0,      0, 0xEECC,      0,      0, 0xDEF2,      0, /* 0x50 */
-    0xE7C9,      0, 0xE2F3, 0xE7E1,      0,      0, 0xE3CB,      0, /* 0x60 */
-         0, 0xE3CC,      0,      0,      0, 0xCFF8, 0xEFAC,      0, /* 0x60 */
-    0xFDFE, 0xFCA5, 0xFAB1, 0xDFD9,      0, 0xE0D2,      0,      0, /* 0x70 */
-         0, 0xF4DA,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF1CA,      0, 0xCEA3, /* 0x80 */
-         0,      0,      0,      0, 0xF2BC, 0xECE3,      0,      0, /* 0x80 */
-         0,      0,      0, 0xE0A5,      0, 0xF7AB,      0,      0, /* 0x90 */
-    0xEBAF,      0,      0,      0,      0,      0, 0xE5DE,      0, /* 0x90 */
-    0xE1A4, 0xCDAB,      0, 0xD9F4, 0xE8A6, 0xCDCE, 0xE1E9,      0, /* 0xA0 */
-    0xFCEF,      0, 0xE0E3,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xE2C1,      0, 0xCEA4,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xDEA6,      0,      0, 0xEBFE,      0, 0xEBDD, 0xF0E0, /* 0xB0 */
-         0,      0, 0xF4DB,      0, 0xE2F4,      0,      0, 0xD3C8, /* 0xC0 */
-         0,      0,      0, 0xF4EB,      0, 0xEEB5,      0, 0xF5D8, /* 0xC0 */
-         0,      0, 0xD5DF,      0,      0,      0, 0xD6E5,      0, /* 0xD0 */
-         0,      0,      0, 0xEBB0, 0xF4E3,      0,      0,      0, /* 0xD0 */
-         0, 0xE3CD,      0,      0,      0,      0, 0xF4F4, 0xFAB2, /* 0xE0 */
-         0,      0, 0xEFF5, 0xCADF,      0, 0xEBB1, 0xEDBF,      0, /* 0xE0 */
-         0, 0xFDC9,      0,      0,      0,      0, 0xE4A6, 0xF9A4, /* 0xF0 */
-    0xF0B3,      0, 0xE5EC,      0,      0,      0, 0xD1E7          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE5EB, 	 0, 0xEFF4, 0xDDB5, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xCDAA, 	 0, 0xE3F2, 	 0, 0xFBF7, 	 0, 0xF7D0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xFDBA, 	 0, 	 0, 0xFDE1, 0xF6FE, /* 0x10 */
+    0xD1C0, 	 0, 	 0, 0xE8C5, 	 0, 0xE4B8, 	 0, 0xE1E8, /* 0x10 */
+         0, 	 0, 	 0, 0xCCC1, 	 0, 0xD2ED, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xDBBE, 	 0, 	 0, 0xE0E2, 	 0, 	 0, /* 0x20 */
+         0, 0xFAC9, 	 0, 	 0, 0xE1CD, 	 0, 0xCAB8, 	 0, /* 0x30 */
+         0, 	 0, 0xF2E0, 0xF1C9, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xDEF1, 	 0, 	 0, 	 0, 0xF0DF, 0xF8C4, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xEECC, 	 0, 	 0, 0xDEF2, 	 0, /* 0x50 */
+    0xE7C9, 	 0, 0xE2F3, 0xE7E1, 	 0, 	 0, 0xE3CB, 	 0, /* 0x60 */
+         0, 0xE3CC, 	 0, 	 0, 	 0, 0xCFF8, 0xEFAC, 	 0, /* 0x60 */
+    0xFDFE, 0xFCA5, 0xFAB1, 0xDFD9, 	 0, 0xE0D2, 	 0, 	 0, /* 0x70 */
+         0, 0xF4DA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF1CA, 	 0, 0xCEA3, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xF2BC, 0xECE3, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xE0A5, 	 0, 0xF7AB, 	 0, 	 0, /* 0x90 */
+    0xEBAF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5DE, 	 0, /* 0x90 */
+    0xE1A4, 0xCDAB, 	 0, 0xD9F4, 0xE8A6, 0xCDCE, 0xE1E9, 	 0, /* 0xA0 */
+    0xFCEF, 	 0, 0xE0E3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xE2C1, 	 0, 0xCEA4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xDEA6, 	 0, 	 0, 0xEBFE, 	 0, 0xEBDD, 0xF0E0, /* 0xB0 */
+         0, 	 0, 0xF4DB, 	 0, 0xE2F4, 	 0, 	 0, 0xD3C8, /* 0xC0 */
+         0, 	 0, 	 0, 0xF4EB, 	 0, 0xEEB5, 	 0, 0xF5D8, /* 0xC0 */
+         0, 	 0, 0xD5DF, 	 0, 	 0, 	 0, 0xD6E5, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xEBB0, 0xF4E3, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xE3CD, 	 0, 	 0, 	 0, 	 0, 0xF4F4, 0xFAB2, /* 0xE0 */
+         0, 	 0, 0xEFF5, 0xCADF, 	 0, 0xEBB1, 0xEDBF, 	 0, /* 0xE0 */
+         0, 0xFDC9, 	 0, 	 0, 	 0, 	 0, 0xE4A6, 0xF9A4, /* 0xF0 */
+    0xF0B3, 	 0, 0xE5EC, 	 0, 	 0, 	 0, 0xD1E7			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_8B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD9C7, 0xE4D7, 0xEADD,      0, 0xD4F7,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xDABA,      0, /* 0x00 */
-    0xDACD,      0,      0,      0, 0xF9CC,      0, 0xE1DA, 0xDBBF, /* 0x10 */
-         0, 0xCCC5, 0xECD0, 0xCBBB,      0, 0xDEF3,      0,      0, /* 0x10 */
-    0xE9AA,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xD9C8,      0,      0, 0xEEE3, 0xD7BD,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xCFC4,      0,      0,      0,      0, /* 0x30 */
-         0, 0xD0CD,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xFCA6,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xF1FB,      0,      0,      0,      0, 0xFDD2, 0xD1C1, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xE3DB,      0, 0xD3C9,      0, 0xDCCF,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xCCED,      0, /* 0x60 */
-         0,      0,      0,      0, 0xDEA7,      0,      0, 0xE6BB, /* 0x60 */
-    0xECA1,      0,      0,      0, 0xCCB9,      0,      0, 0xFBDE, /* 0x70 */
-         0,      0,      0,      0,      0, 0xE7E2,      0,      0, /* 0x70 */
-    0xD4C1,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xDCA8,      0,      0,      0,      0,      0, /* 0x80 */
-    0xE2C2,      0, 0xF3D8, 0xE5D3,      0,      0, 0xF3D9,      0, /* 0x90 */
-         0,      0, 0xF3C6                                          /* 0x90 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD9C7, 0xE4D7, 0xEADD, 	 0, 0xD4F7, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDABA, 	 0, /* 0x00 */
+    0xDACD, 	 0, 	 0, 	 0, 0xF9CC, 	 0, 0xE1DA, 0xDBBF, /* 0x10 */
+         0, 0xCCC5, 0xECD0, 0xCBBB, 	 0, 0xDEF3, 	 0, 	 0, /* 0x10 */
+    0xE9AA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xD9C8, 	 0, 	 0, 0xEEE3, 0xD7BD, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xCFC4, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xD0CD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xFCA6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xF1FB, 	 0, 	 0, 	 0, 	 0, 0xFDD2, 0xD1C1, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xE3DB, 	 0, 0xD3C9, 	 0, 0xDCCF, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCCED, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xDEA7, 	 0, 	 0, 0xE6BB, /* 0x60 */
+    0xECA1, 	 0, 	 0, 	 0, 0xCCB9, 	 0, 	 0, 0xFBDE, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE7E2, 	 0, 	 0, /* 0x70 */
+    0xD4C1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xDCA8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE2C2, 	 0, 0xF3D8, 0xE5D3, 	 0, 	 0, 0xF3D9, 	 0, /* 0x90 */
+         0, 	 0, 0xF3C6											/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_8C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xCDDB, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xCDAC, /* 0x30 */
-         0, 0xFCC3,      0,      0,      0,      0, 0xD4E7,      0, /* 0x40 */
-    0xD1C2,      0, 0xF9A5,      0, 0xE8D5,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xE3CE,      0,      0, /* 0x50 */
-         0,      0, 0xD4CA,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xDFDA,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xFBDF, 0xE7E3,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xF8FB, 0xE3CF,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xF5B0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xD8E7,      0, 0xD9C9,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xF8AF, 0xEFF6,      0, /* 0x90 */
-    0xDDB6, 0xEEAF, 0xCDF8,      0,      0,      0,      0, 0xDEB8, /* 0xA0 */
-    0xFCA7, 0xF7FC, 0xF7B1, 0xCEBB, 0xF4A1,      0,      0, 0xEECD, /* 0xA0 */
-    0xE1AE,      0,      0, 0xECC3, 0xCFFE,      0, 0xF8BF, 0xD8E2, /* 0xB0 */
-    0xD3E8,      0,      0, 0xDEA8, 0xF4E4, 0xECC2,      0, 0xD9F5, /* 0xB0 */
-    0xF9C5, 0xDDD3, 0xD6F1, 0xECFC, 0xFCF0,      0,      0, 0xEDC0, /* 0xC0 */
-    0xCAB9,      0, 0xEEE4,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xF2E1,      0, 0xDEB9,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xD6F2,      0, 0xDEF4,      0, 0xDFDB,      0, /* 0xD0 */
-    0xDBD3,      0, 0xFAE7, 0xD8E3, 0xF4C1,      0, 0xDDB7,      0, /* 0xE0 */
-         0,      0, 0xF2F5,      0,      0, 0xD4AE,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xD6F3,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xDDB8, 0xCFC5, 0xDFDF                  /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCDAC, /* 0x30 */
+         0, 0xFCC3, 	 0, 	 0, 	 0, 	 0, 0xD4E7, 	 0, /* 0x40 */
+    0xD1C2, 	 0, 0xF9A5, 	 0, 0xE8D5, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE3CE, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xD4CA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xDFDA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xFBDF, 0xE7E3, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xF8FB, 0xE3CF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xF5B0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xD8E7, 	 0, 0xD9C9, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF8AF, 0xEFF6, 	 0, /* 0x90 */
+    0xDDB6, 0xEEAF, 0xCDF8, 	 0, 	 0, 	 0, 	 0, 0xDEB8, /* 0xA0 */
+    0xFCA7, 0xF7FC, 0xF7B1, 0xCEBB, 0xF4A1, 	 0, 	 0, 0xEECD, /* 0xA0 */
+    0xE1AE, 	 0, 	 0, 0xECC3, 0xCFFE, 	 0, 0xF8BF, 0xD8E2, /* 0xB0 */
+    0xD3E8, 	 0, 	 0, 0xDEA8, 0xF4E4, 0xECC2, 	 0, 0xD9F5, /* 0xB0 */
+    0xF9C5, 0xDDD3, 0xD6F1, 0xECFC, 0xFCF0, 	 0, 	 0, 0xEDC0, /* 0xC0 */
+    0xCAB9, 	 0, 0xEEE4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xF2E1, 	 0, 0xDEB9, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xD6F2, 	 0, 0xDEF4, 	 0, 0xDFDB, 	 0, /* 0xD0 */
+    0xDBD3, 	 0, 0xFAE7, 0xD8E3, 0xF4C1, 	 0, 0xDDB7, 	 0, /* 0xE0 */
+         0, 	 0, 0xF2F5, 	 0, 	 0, 0xD4AE, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xD6F3, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xDDB8, 0xCFC5, 0xDFDF					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_8D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xF2BE, 0xF6A1,      0, 0xEBCB, /* 0x00 */
-    0xF1FC,      0, 0xF3C7,      0,      0, 0xE0EB,      0,      0, /* 0x00 */
-         0,      0,      0, 0xEDFC,      0,      0, 0xE1DB,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xEEE5,      0, 0xDEF5,      0, /* 0x60 */
-         0,      0,      0, 0xFAD3,      0,      0,      0,      0, /* 0x60 */
-    0xF1CB,      0,      0, 0xD0AF, 0xDDB9,      0,      0, 0xD1C3, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF5B1,      0,      0, /* 0x80 */
-         0,      0, 0xEAC6,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xF0E1,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xF6AC,      0,      0,      0,      0, /* 0xA0 */
-    0xF5D9,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xF0EB,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xDDBA,      0,      0,      0, 0xF2BF,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xF7C5,      0, /* 0xC0 */
-         0,      0,      0, 0xDBA2, 0xF2F6,      0,      0, 0xCABA, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xF7F5,      0, 0xCBE5,      0,      0, /* 0xD0 */
-         0, 0xEEE6,      0, 0xE0D3,      0,      0,      0,      0, /* 0xE0 */
-    0xCEA5,      0,      0,      0,      0,      0,      0, 0xD6D8, /* 0xE0 */
-         0,      0,      0, 0xD4AF                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xF2BE, 0xF6A1, 	 0, 0xEBCB, /* 0x00 */
+    0xF1FC, 	 0, 0xF3C7, 	 0, 	 0, 0xE0EB, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xEDFC, 	 0, 	 0, 0xE1DB, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xEEE5, 	 0, 0xDEF5, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xFAD3, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xF1CB, 	 0, 	 0, 0xD0AF, 0xDDB9, 	 0, 	 0, 0xD1C3, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF5B1, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xEAC6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xF0E1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xF6AC, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xF5D9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xF0EB, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xDDBA, 	 0, 	 0, 	 0, 0xF2BF, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF7C5, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xDBA2, 0xF2F6, 	 0, 	 0, 0xCABA, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xF7F5, 	 0, 0xCBE5, 	 0, 	 0, /* 0xD0 */
+         0, 0xEEE6, 	 0, 0xE0D3, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xCEA5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD6D8, /* 0xE0 */
+         0, 	 0, 	 0, 0xD4AF									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_8E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xE9C9,      0,      0,      0,      0, 0xD3CE, /* 0x00 */
-    0xF4C2,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xCBE6,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xF1A1,      0,      0,      0,      0,      0, /* 0x20 */
-    0xEBB2,      0,      0,      0,      0, 0xF1A2,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xEBB3,      0, 0xF0B4,      0,      0, 0xCBF4, /* 0x40 */
-    0xD4B0, 0xF3B2, 0xFBB7,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xF5EC,      0,      0,      0,      0,      0, 0xEEE7, /* 0x50 */
-    0xF4B2,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xF5ED,      0, 0xCFF3,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xF0E2,      0,      0,      0,      0,      0, 0xEECE, /* 0x80 */
-         0,      0, 0xF1CC,      0,      0, 0xE5B8,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xD7F5, 0xE3F3, 0xCFE5,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xCFC6,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xF3B3, 0xE4D8, 0xCFF9, 0xCFDA,      0,      0, /* 0xC0 */
-         0,      0, 0xFACD,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE6E3, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xF2E2,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xF5EE,      0,      0, 0xCABB,      0,      0, 0xE3DC          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xE9C9, 	 0, 	 0, 	 0, 	 0, 0xD3CE, /* 0x00 */
+    0xF4C2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBE6, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF1A1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xEBB2, 	 0, 	 0, 	 0, 	 0, 0xF1A2, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xEBB3, 	 0, 0xF0B4, 	 0, 	 0, 0xCBF4, /* 0x40 */
+    0xD4B0, 0xF3B2, 0xFBB7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xF5EC, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEEE7, /* 0x50 */
+    0xF4B2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xF5ED, 	 0, 0xCFF3, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xF0E2, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEECE, /* 0x80 */
+         0, 	 0, 0xF1CC, 	 0, 	 0, 0xE5B8, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xD7F5, 0xE3F3, 0xCFE5, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xCFC6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xF3B3, 0xE4D8, 0xCFF9, 0xCFDA, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xFACD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6E3, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xF2E2, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xF5EE, 	 0, 	 0, 0xCABB, 	 0, 	 0, 0xE3DC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_8F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xCEF2,      0, 0xD6D9,      0,      0, /* 0x00 */
-         0, 0xEEB0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xF4E5, 0xD8C2, 0xDCD0, 0xCCEE,      0,      0, /* 0x10 */
-         0,      0,      0, 0xD5E0, 0xF6CA, 0xFDCA, 0xD8D6, 0xF4CF, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xD6A6, 0xDCBE, /* 0x20 */
-         0, 0xDBD4, 0xD7C7,      0,      0,      0,      0, 0xF2FE, /* 0x20 */
-         0,      0,      0, 0xF1CD,      0,      0,      0,      0, /* 0x30 */
-    0xE2C3, 0xDCDE,      0, 0xDCDF,      0,      0, 0xEFAD, 0xE6AB, /* 0x30 */
-         0,      0,      0,      0, 0xF9DD, 0xEABF,      0,      0, /* 0x40 */
-         0, 0xEFAE,      0,      0,      0, 0xF4D0, 0xCEF3,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xE6AC,      0, 0xCEDE, /* 0x50 */
-         0,      0, 0xD5F9,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xE3F4, 0xCDD0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xD5B8,      0,      0, 0xF7FD,      0, /* 0xA0 */
-    0xDCA9,      0,      0,      0,      0, 0xDEF6,      0, 0xDCAA, /* 0xA0 */
-    0xF2E3, 0xE9B4, 0xD2DC,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xE9E6,      0,      0, 0xE3F6,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xE7CA,      0, /* 0xC0 */
-         0, 0xD0CE,      0,      0, 0xDAF7,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xCABC,      0, /* 0xE0 */
-         0,      0, 0xEEE8, 0xDADE,      0, 0xF2F7,      0,      0, /* 0xE0 */
-    0xE2FB,      0, 0xCCA6,      0,      0,      0,      0, 0xDABB, /* 0xF0 */
-         0, 0xEEE9,      0,      0,      0, 0xF5DA                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xCEF2, 	 0, 0xD6D9, 	 0, 	 0, /* 0x00 */
+         0, 0xEEB0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xF4E5, 0xD8C2, 0xDCD0, 0xCCEE, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xD5E0, 0xF6CA, 0xFDCA, 0xD8D6, 0xF4CF, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD6A6, 0xDCBE, /* 0x20 */
+         0, 0xDBD4, 0xD7C7, 	 0, 	 0, 	 0, 	 0, 0xF2FE, /* 0x20 */
+         0, 	 0, 	 0, 0xF1CD, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xE2C3, 0xDCDE, 	 0, 0xDCDF, 	 0, 	 0, 0xEFAD, 0xE6AB, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xF9DD, 0xEABF, 	 0, 	 0, /* 0x40 */
+         0, 0xEFAE, 	 0, 	 0, 	 0, 0xF4D0, 0xCEF3, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE6AC, 	 0, 0xCEDE, /* 0x50 */
+         0, 	 0, 0xD5F9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xE3F4, 0xCDD0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xD5B8, 	 0, 	 0, 0xF7FD, 	 0, /* 0xA0 */
+    0xDCA9, 	 0, 	 0, 	 0, 	 0, 0xDEF6, 	 0, 0xDCAA, /* 0xA0 */
+    0xF2E3, 0xE9B4, 0xD2DC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xE9E6, 	 0, 	 0, 0xE3F6, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7CA, 	 0, /* 0xC0 */
+         0, 0xD0CE, 	 0, 	 0, 0xDAF7, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCABC, 	 0, /* 0xE0 */
+         0, 	 0, 0xEEE8, 0xDADE, 	 0, 0xF2F7, 	 0, 	 0, /* 0xE0 */
+    0xE2FB, 	 0, 0xCCA6, 	 0, 	 0, 	 0, 	 0, 0xDABB, /* 0xF0 */
+         0, 0xEEE9, 	 0, 	 0, 	 0, 0xF5DA					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_90[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF7DC, 0xE1EA, 0xCEC1, 0xD4B1,      0, 0xFDB1, 0xE6BD,      0, /* 0x00 */
-    0xFBAD,      0,      0, 0xF8E7,      0, 0xE1CE,      0, 0xF7E2, /* 0x00 */
-    0xF5EF, 0xCFC7,      0,      0, 0xD4B2, 0xCCEF,      0, 0xD4E8, /* 0x10 */
-         0, 0xEECF, 0xF7D7,      0,      0, 0xE0A6, 0xD6C1, 0xE1DC, /* 0x10 */
-    0xF0E3, 0xF1E4, 0xDCF1, 0xD6A7,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0xF4F5,      0, /* 0x20 */
-         0, 0xF1CE, 0xF2E4,      0,      0, 0xD0B0,      0,      0, /* 0x30 */
-    0xECEF,      0,      0,      0, 0xF9BA,      0, 0xEBB5,      0, /* 0x30 */
-         0, 0xD4ED, 0xE2C4,      0,      0,      0,      0, 0xE9E7, /* 0x40 */
-         0,      0, 0xEBB4, 0xEAA1,      0, 0xF8BC, 0xCEA6,      0, /* 0x40 */
-    0xF9C6, 0xFCDA,      0, 0xD4B3, 0xD3B9, 0xEADE,      0,      0, /* 0x50 */
-         0, 0xE9AB,      0,      0, 0xE1E1, 0xD3CF, 0xF4F6,      0, /* 0x50 */
-    0xEAC0, 0xE1CF,      0, 0xCCBA,      0,      0,      0,      0, /* 0x60 */
-         0, 0xEEEA,      0,      0,      0, 0xF0E4, 0xF3B4, 0xD4EE, /* 0x60 */
-         0,      0, 0xF2C0,      0,      0, 0xF1E5,      0, 0xF4C3, /* 0x70 */
-    0xE0D4,      0, 0xEBB6,      0, 0xD7A1, 0xCBE8,      0, 0xF9AD, /* 0x70 */
-    0xE9AD, 0xD8E4, 0xFAB3, 0xE2C5, 0xFCBD,      0,      0, 0xECC4, /* 0x80 */
-    0xD8B1,      0, 0xDCAB,      0,      0,      0,      0, 0xD5A4, /* 0x80 */
-         0, 0xEBE9,      0,      0,      0, 0xE8BB,      0,      0, /* 0x90 */
-         0, 0xD8D7,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xFBAE, 0xD1E1,      0,      0, 0xDBC0,      0, /* 0xA0 */
-    0xF5BE,      0, 0xDEF7,      0,      0,      0,      0, 0xCAFB, /* 0xA0 */
-    0xF7C6, 0xCFC8,      0,      0,      0, 0xE1D0,      0,      0, /* 0xB0 */
-    0xEED0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE9F4,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xCEF4,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xD5CD,      0, /* 0xD0 */
-         0, 0xCFDB,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xDDBB,      0,      0,      0,      0, 0xCEAC,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xE9E8,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xD4B4                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF7DC, 0xE1EA, 0xCEC1, 0xD4B1, 	 0, 0xFDB1, 0xE6BD, 	 0, /* 0x00 */
+    0xFBAD, 	 0, 	 0, 0xF8E7, 	 0, 0xE1CE, 	 0, 0xF7E2, /* 0x00 */
+    0xF5EF, 0xCFC7, 	 0, 	 0, 0xD4B2, 0xCCEF, 	 0, 0xD4E8, /* 0x10 */
+         0, 0xEECF, 0xF7D7, 	 0, 	 0, 0xE0A6, 0xD6C1, 0xE1DC, /* 0x10 */
+    0xF0E3, 0xF1E4, 0xDCF1, 0xD6A7, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4F5, 	 0, /* 0x20 */
+         0, 0xF1CE, 0xF2E4, 	 0, 	 0, 0xD0B0, 	 0, 	 0, /* 0x30 */
+    0xECEF, 	 0, 	 0, 	 0, 0xF9BA, 	 0, 0xEBB5, 	 0, /* 0x30 */
+         0, 0xD4ED, 0xE2C4, 	 0, 	 0, 	 0, 	 0, 0xE9E7, /* 0x40 */
+         0, 	 0, 0xEBB4, 0xEAA1, 	 0, 0xF8BC, 0xCEA6, 	 0, /* 0x40 */
+    0xF9C6, 0xFCDA, 	 0, 0xD4B3, 0xD3B9, 0xEADE, 	 0, 	 0, /* 0x50 */
+         0, 0xE9AB, 	 0, 	 0, 0xE1E1, 0xD3CF, 0xF4F6, 	 0, /* 0x50 */
+    0xEAC0, 0xE1CF, 	 0, 0xCCBA, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xEEEA, 	 0, 	 0, 	 0, 0xF0E4, 0xF3B4, 0xD4EE, /* 0x60 */
+         0, 	 0, 0xF2C0, 	 0, 	 0, 0xF1E5, 	 0, 0xF4C3, /* 0x70 */
+    0xE0D4, 	 0, 0xEBB6, 	 0, 0xD7A1, 0xCBE8, 	 0, 0xF9AD, /* 0x70 */
+    0xE9AD, 0xD8E4, 0xFAB3, 0xE2C5, 0xFCBD, 	 0, 	 0, 0xECC4, /* 0x80 */
+    0xD8B1, 	 0, 0xDCAB, 	 0, 	 0, 	 0, 	 0, 0xD5A4, /* 0x80 */
+         0, 0xEBE9, 	 0, 	 0, 	 0, 0xE8BB, 	 0, 	 0, /* 0x90 */
+         0, 0xD8D7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xFBAE, 0xD1E1, 	 0, 	 0, 0xDBC0, 	 0, /* 0xA0 */
+    0xF5BE, 	 0, 0xDEF7, 	 0, 	 0, 	 0, 	 0, 0xCAFB, /* 0xA0 */
+    0xF7C6, 0xCFC8, 	 0, 	 0, 	 0, 0xE1D0, 	 0, 	 0, /* 0xB0 */
+    0xEED0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE9F4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xCEF4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD5CD, 	 0, /* 0xD0 */
+         0, 0xCFDB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xDDBB, 	 0, 	 0, 	 0, 	 0, 0xCEAC, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE9E8, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD4B4					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_91[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xE4C7,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xF5DB,      0,      0, 0xFAC1,      0,      0, /* 0x10 */
-         0, 0xDEA9,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xD4F8, /* 0x20 */
-         0,      0,      0,      0,      0, 0xEFF7,      0,      0, /* 0x20 */
-         0,      0, 0xD3B3,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xEBB7, 0xEFF8, 0xF5DC, 0xEDCC, 0xDBD5, 0xF1CF,      0, /* 0x40 */
-         0,      0, 0xF1D0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xF5B2,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xD9AE, 0xD5AC,      0, 0xE2C6,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xFDA3,      0, 0xFBE5, /* 0x70 */
-    0xDFAB,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xE2F5, /* 0x80 */
-         0, 0xF6AD,      0, 0xF5B3,      0, 0xF0B5,      0,      0, /* 0x80 */
-         0,      0, 0xE1A5,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xF5DD,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xECA2, 0xEDFD,      0, 0xF5B4, 0xFBB8, /* 0xA0 */
-         0, 0xDBA3,      0,      0, 0xD6CA, 0xCBD9,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xE5D4,      0,      0,      0,      0,      0,      0, 0xF3FA, /* 0xC0 */
-         0, 0xEBB8,      0, 0xE0B7, 0xD7EC, 0xF1EC, 0xE5AF, 0xD5E1, /* 0xC0 */
-    0xD7ED, 0xD1D1,      0,      0,      0,      0,      0, 0xE1F2, /* 0xD0 */
-    0xEFF9,      0,      0,      0, 0xDDBC, 0xF6DC,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xF0E5,      0,      0,      0, 0xF4C4, /* 0xE0 */
-         0,      0, 0xE9E9,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xF3FB                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xE4C7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xF5DB, 	 0, 	 0, 0xFAC1, 	 0, 	 0, /* 0x10 */
+         0, 0xDEA9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD4F8, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEFF7, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xD3B3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xEBB7, 0xEFF8, 0xF5DC, 0xEDCC, 0xDBD5, 0xF1CF, 	 0, /* 0x40 */
+         0, 	 0, 0xF1D0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xF5B2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xD9AE, 0xD5AC, 	 0, 0xE2C6, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xFDA3, 	 0, 0xFBE5, /* 0x70 */
+    0xDFAB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2F5, /* 0x80 */
+         0, 0xF6AD, 	 0, 0xF5B3, 	 0, 0xF0B5, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE1A5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xF5DD, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xECA2, 0xEDFD, 	 0, 0xF5B4, 0xFBB8, /* 0xA0 */
+         0, 0xDBA3, 	 0, 	 0, 0xD6CA, 0xCBD9, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xE5D4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF3FA, /* 0xC0 */
+         0, 0xEBB8, 	 0, 0xE0B7, 0xD7EC, 0xF1EC, 0xE5AF, 0xD5E1, /* 0xC0 */
+    0xD7ED, 0xD1D1, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1F2, /* 0xD0 */
+    0xEFF9, 	 0, 	 0, 	 0, 0xDDBC, 0xF6DC, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xF0E5, 	 0, 	 0, 	 0, 0xF4C4, /* 0xE0 */
+         0, 	 0, 0xE9E9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF3FB					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_92[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xD4EF,      0,      0, /* 0x00 */
-    0xCCA2, 0xF7FE, 0xDFBC,      0,      0,      0,      0, 0xEBCD, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xD0B7,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xD6C2,      0,      0,      0, /* 0x30 */
-         0,      0, 0xE8AD,      0,      0,      0,      0, 0xEFAF, /* 0x30 */
-    0xCBA5,      0,      0,      0,      0, 0xCBE9,      0,      0, /* 0x40 */
-         0, 0xFAE8,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xCCC6, /* 0x50 */
-         0,      0,      0, 0xE6E7,      0,      0, 0xEAC7,      0, /* 0x50 */
-         0,      0, 0xDBA4,      0, 0xCFC9, 0xE2FC, 0xEFFA,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xEBDE,      0,      0, 0xF5C8,      0, 0xD4DE,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xE0D5,      0, 0xEFB0,      0,      0, 0xE2C7,      0, /* 0x90 */
-    0xD9AF,      0,      0,      0, 0xF9E7,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xE7E5,      0,      0, 0xCFCA, 0xE1D1, /* 0xB0 */
-         0, 0xE2C8,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xEFFB,      0,      0, 0xFAF9, /* 0xC0 */
-         0,      0, 0xDCF2,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xE0A7,      0,      0,      0, /* 0xE0 */
-         0,      0, 0xF8E8,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xCBEA,      0,      0,      0, 0xCBBC                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xD4EF, 	 0, 	 0, /* 0x00 */
+    0xCCA2, 0xF7FE, 0xDFBC, 	 0, 	 0, 	 0, 	 0, 0xEBCD, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD0B7, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xD6C2, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xE8AD, 	 0, 	 0, 	 0, 	 0, 0xEFAF, /* 0x30 */
+    0xCBA5, 	 0, 	 0, 	 0, 	 0, 0xCBE9, 	 0, 	 0, /* 0x40 */
+         0, 0xFAE8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCCC6, /* 0x50 */
+         0, 	 0, 	 0, 0xE6E7, 	 0, 	 0, 0xEAC7, 	 0, /* 0x50 */
+         0, 	 0, 0xDBA4, 	 0, 0xCFC9, 0xE2FC, 0xEFFA, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xEBDE, 	 0, 	 0, 0xF5C8, 	 0, 0xD4DE, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xE0D5, 	 0, 0xEFB0, 	 0, 	 0, 0xE2C7, 	 0, /* 0x90 */
+    0xD9AF, 	 0, 	 0, 	 0, 0xF9E7, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xE7E5, 	 0, 	 0, 0xCFCA, 0xE1D1, /* 0xB0 */
+         0, 0xE2C8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xEFFB, 	 0, 	 0, 0xFAF9, /* 0xC0 */
+         0, 	 0, 0xDCF2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xE0A7, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xF8E8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xCBEA, 	 0, 	 0, 	 0, 0xCBBC							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_93[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xD6E2,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0xF5DE,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xF5DF,      0, 0xEEB6,      0,      0,      0, 0xE2F6, 0xD3CA, /* 0x10 */
-    0xEFFC, 0xD1C4, 0xEFB1,      0, 0xD1C5,      0, 0xD0DE,      0, /* 0x20 */
-    0xD9E1,      0,      0, 0xE0B8,      0,      0, 0xCDD1, 0xF3B9, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xE7CC,      0, 0xD6A8, 0xCEA7,      0, 0xD4B5,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xE4C8,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xD3B4,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xEBB9,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xCBF5,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xF6DD,      0, 0xF1A3,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0xCCC7,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0xE9CA,      0, 0xE1F0,      0, /* 0x90 */
-         0,      0, 0xF5E0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xFBAF,      0,      0,      0, 0xCBD1, /* 0xA0 */
-         0,      0,      0,      0, 0xFBE0, 0xF2E5,      0,      0, /* 0xA0 */
-    0xECF0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xF0EC,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xEEEB,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xE9CB,      0, /* 0xD0 */
-         0, 0xCCF0,      0,      0, 0xD7AF,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xF3A1          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xD6E2, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xF5DE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xF5DF, 	 0, 0xEEB6, 	 0, 	 0, 	 0, 0xE2F6, 0xD3CA, /* 0x10 */
+    0xEFFC, 0xD1C4, 0xEFB1, 	 0, 0xD1C5, 	 0, 0xD0DE, 	 0, /* 0x20 */
+    0xD9E1, 	 0, 	 0, 0xE0B8, 	 0, 	 0, 0xCDD1, 0xF3B9, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xE7CC, 	 0, 0xD6A8, 0xCEA7, 	 0, 0xD4B5, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xE4C8, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xD3B4, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEBB9, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCBF5, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xF6DD, 	 0, 0xF1A3, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xCCC7, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xE9CA, 	 0, 0xE1F0, 	 0, /* 0x90 */
+         0, 	 0, 0xF5E0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xFBAF, 	 0, 	 0, 	 0, 0xCBD1, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xFBE0, 0xF2E5, 	 0, 	 0, /* 0xA0 */
+    0xECF0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xF0EC, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xEEEB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9CB, 	 0, /* 0xD0 */
+         0, 0xCCF0, 	 0, 	 0, 0xD7AF, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF3A1			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_94[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xFCF5,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xF1A4,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xE0D6,      0,      0, /* 0x20 */
-         0,      0,      0, 0xEFB2,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xF4D1,      0,      0, /* 0x30 */
-    0xF7A1,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xF1D1,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xCAFC, 0xCAFD,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xCECE,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF3C8,      0, 0xF3BA  /* 0x70 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xFCF5, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xF1A4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE0D6, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xEFB2, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF4D1, 	 0, 	 0, /* 0x30 */
+    0xF7A1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xF1D1, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xCAFC, 0xCAFD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xCECE, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF3C8, 	 0, 0xF3BA	/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_95[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xEDFE, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xDAA6,      0,      0, 0xE0EC,      0,      0,      0,      0, /* 0x80 */
-         0, 0xF8CD,      0, 0xCBD2,      0,      0,      0, 0xEBCE, /* 0x80 */
-         0, 0xF9D8, 0xF9D9, 0xCAE0, 0xDACA,      0,      0,      0, /* 0x90 */
-    0xCBA6,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xCAC8, 0xF9EE, 0xDBEC,      0,      0, /* 0xA0 */
-    0xD0B1,      0,      0,      0,      0, 0xD5EF,      0,      0, /* 0xA0 */
-         0, 0xE6F3,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xE7A2, 0xE4D9,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE4E1, /* 0xC0 */
-         0,      0, 0xFCC4,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xF9EF, 0xCFF4, 0xF7E6,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xCEBC,      0,      0,      0, /* 0xD0 */
-         0, 0xF4C5, 0xDCA3                                          /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xDAA6, 	 0, 	 0, 0xE0EC, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xF8CD, 	 0, 0xCBD2, 	 0, 	 0, 	 0, 0xEBCE, /* 0x80 */
+         0, 0xF9D8, 0xF9D9, 0xCAE0, 0xDACA, 	 0, 	 0, 	 0, /* 0x90 */
+    0xCBA6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xCAC8, 0xF9EE, 0xDBEC, 	 0, 	 0, /* 0xA0 */
+    0xD0B1, 	 0, 	 0, 	 0, 	 0, 0xD5EF, 	 0, 	 0, /* 0xA0 */
+         0, 0xE6F3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xE7A2, 0xE4D9, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4E1, /* 0xC0 */
+         0, 	 0, 0xFCC4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xF9EF, 0xCFF4, 0xF7E6, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xCEBC, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xF4C5, 0xDCA3											/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_96[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xDDBD,      0,      0,      0, /* 0x10 */
-         0, 0xF4C6,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xF8A1,      0,      0,      0, 0xE8D6,      0, /* 0x20 */
-         0,      0, 0xDBC1,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xF0E6,      0,      0,      0, 0xE4B9, /* 0x30 */
-    0xF6ED,      0, 0xF9AE,      0, 0xDDBE,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xD7B0, 0xD8E8, 0xCBBD,      0,      0, /* 0x40 */
-    0xF9DA,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xF8CE, 0xF9F0, 0xE0ED, 0xE3B3, 0xF4B3, /* 0x50 */
-         0,      0, 0xEAC2, 0xF2E6, 0xF0B6,      0,      0,      0, /* 0x60 */
-         0,      0, 0xDBD6,      0,      0,      0,      0,      0, /* 0x60 */
-    0xEBE4,      0,      0, 0xF2E7,      0, 0xD7D5, 0xD4B6, 0xF9E8, /* 0x70 */
-    0xD7C1,      0,      0,      0,      0, 0xE5D5,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xE9EA, 0xD7CC,      0, /* 0x80 */
-         0,      0, 0xD3E9, 0xE2C9,      0, 0xFCDB, 0xCDAD,      0, /* 0x80 */
-         0,      0,      0,      0, 0xCCB0, 0xEAA2,      0,      0, /* 0x90 */
-    0xE4F6, 0xD0C0,      0, 0xF0B7, 0xEEA1,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xD7F6,      0,      0,      0, 0xE2CA, /* 0xA0 */
-    0xE2CB,      0, 0xFACF,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xEBDF,      0,      0,      0,      0,      0, 0xD6CB, /* 0xB0 */
-         0,      0,      0, 0xF4B4,      0,      0,      0,      0, /* 0xB0 */
-    0xEDCD, 0xE4D2,      0,      0, 0xEAA9, 0xE4BA, 0xF3A2, 0xCDD2, /* 0xC0 */
-         0, 0xF6CB,      0, 0xF1E6, 0xEDC1, 0xE8BC, 0xEED1,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xF0E7, 0xE2CC,      0, /* 0xD0 */
-         0, 0xE4AA,      0, 0xF5E1, 0xEDDA,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xD7EE, 0xD1F1,      0,      0,      0,      0, /* 0xE0 */
-    0xE9EB, 0xE9EC, 0xE0E4,      0,      0,      0,      0, 0xDAA7, /* 0xE0 */
-    0xDDD4,      0, 0xEAA3,      0,      0,      0, 0xD6C3, 0xD6F4, /* 0xF0 */
-         0, 0xDADF,      0, 0xEFB3                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xDDBD, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xF4C6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF8A1, 	 0, 	 0, 	 0, 0xE8D6, 	 0, /* 0x20 */
+         0, 	 0, 0xDBC1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xF0E6, 	 0, 	 0, 	 0, 0xE4B9, /* 0x30 */
+    0xF6ED, 	 0, 0xF9AE, 	 0, 0xDDBE, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xD7B0, 0xD8E8, 0xCBBD, 	 0, 	 0, /* 0x40 */
+    0xF9DA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xF8CE, 0xF9F0, 0xE0ED, 0xE3B3, 0xF4B3, /* 0x50 */
+         0, 	 0, 0xEAC2, 0xF2E6, 0xF0B6, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xDBD6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xEBE4, 	 0, 	 0, 0xF2E7, 	 0, 0xD7D5, 0xD4B6, 0xF9E8, /* 0x70 */
+    0xD7C1, 	 0, 	 0, 	 0, 	 0, 0xE5D5, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE9EA, 0xD7CC, 	 0, /* 0x80 */
+         0, 	 0, 0xD3E9, 0xE2C9, 	 0, 0xFCDB, 0xCDAD, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xCCB0, 0xEAA2, 	 0, 	 0, /* 0x90 */
+    0xE4F6, 0xD0C0, 	 0, 0xF0B7, 0xEEA1, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xD7F6, 	 0, 	 0, 	 0, 0xE2CA, /* 0xA0 */
+    0xE2CB, 	 0, 0xFACF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xEBDF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD6CB, /* 0xB0 */
+         0, 	 0, 	 0, 0xF4B4, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xEDCD, 0xE4D2, 	 0, 	 0, 0xEAA9, 0xE4BA, 0xF3A2, 0xCDD2, /* 0xC0 */
+         0, 0xF6CB, 	 0, 0xF1E6, 0xEDC1, 0xE8BC, 0xEED1, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF0E7, 0xE2CC, 	 0, /* 0xD0 */
+         0, 0xE4AA, 	 0, 0xF5E1, 0xEDDA, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xD7EE, 0xD1F1, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE9EB, 0xE9EC, 0xE0E4, 	 0, 	 0, 	 0, 	 0, 0xDAA7, /* 0xE0 */
+    0xDDD4, 	 0, 0xEAA3, 	 0, 	 0, 	 0, 0xD6C3, 0xD6F4, /* 0xF0 */
+         0, 0xDADF, 	 0, 0xEFB3									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_97[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE2CD,      0,      0,      0,      0,      0, 0xEFFD, 0xF2E8, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xEFC5,      0, 0xE7E7,      0,      0, 0xD7FD,      0, /* 0x10 */
-         0, 0xE7CE,      0,      0, 0xDFDC,      0, 0xF9C7,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xD9F6, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xDFAC,      0, 0xD6DA,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xDCA4,      0,      0,      0, 0xF0B8,      0,      0, /* 0x30 */
-         0,      0, 0xD5FA,      0, 0xE4F7,      0,      0,      0, /* 0x40 */
-    0xD6C4,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xF4EC,      0,      0,      0,      0, 0xEFFE,      0, /* 0x50 */
-         0,      0,      0,      0, 0xF0A1,      0, 0xDEAA,      0, /* 0x50 */
-         0, 0xDABC, 0xD8FC,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xFAD4,      0,      0,      0, 0xECE5,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xFCA8,      0,      0, 0xECE6, /* 0x70 */
-         0,      0, 0xD8CB,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xFBB9,      0, 0xE4D3,      0, 0xCDF9, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xCFD3,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xCAEA,      0,      0, 0xCFD4,      0, 0xF8BD,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xF4C7,      0, /* 0xC0 */
-         0,      0,      0, 0xEADF,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xF9DB,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xD4B7,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xEBE5,      0,      0, 0xE1D2,      0, /* 0xF0 */
-         0,      0,      0, 0xEAA4,      0,      0,      0, 0xFAC2  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE2CD, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEFFD, 0xF2E8, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xEFC5, 	 0, 0xE7E7, 	 0, 	 0, 0xD7FD, 	 0, /* 0x10 */
+         0, 0xE7CE, 	 0, 	 0, 0xDFDC, 	 0, 0xF9C7, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD9F6, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xDFAC, 	 0, 0xD6DA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xDCA4, 	 0, 	 0, 	 0, 0xF0B8, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xD5FA, 	 0, 0xE4F7, 	 0, 	 0, 	 0, /* 0x40 */
+    0xD6C4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xF4EC, 	 0, 	 0, 	 0, 	 0, 0xEFFE, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xF0A1, 	 0, 0xDEAA, 	 0, /* 0x50 */
+         0, 0xDABC, 0xD8FC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xFAD4, 	 0, 	 0, 	 0, 0xECE5, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xFCA8, 	 0, 	 0, 0xECE6, /* 0x70 */
+         0, 	 0, 0xD8CB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xFBB9, 	 0, 0xE4D3, 	 0, 0xCDF9, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xCFD3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xCAEA, 	 0, 	 0, 0xCFD4, 	 0, 0xF8BD, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4C7, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xEADF, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xF9DB, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xD4B7, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xEBE5, 	 0, 	 0, 0xE1D2, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xEAA4, 	 0, 	 0, 	 0, 0xFAC2	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_98[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xFBE1, 0xFAED, 0xF0A2, 0xCCF1,      0, 0xFAA3, 0xE2F7,      0, /* 0x00 */
-    0xE2CE,      0, 0xE9F5,      0, 0xE1EB,      0,      0,      0, /* 0x00 */
-    0xE7E8, 0xE8D7, 0xDAF8, 0xD4CB,      0,      0,      0, 0xF7F6, /* 0x10 */
-    0xD6C5,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xD4E9,      0,      0, /* 0x20 */
-    0xFAFA,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xCCF2, 0xF7DD,      0, 0xDEBA,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xCEA8,      0, /* 0x40 */
-         0,      0,      0,      0, 0xF0B9, 0xE4FE, 0xE4C9,      0, /* 0x40 */
-         0,      0,      0,      0, 0xE4D4,      0,      0,      0, /* 0x50 */
-    0xEAC3,      0, 0xEFB4,      0,      0,      0, 0xD7BE,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xFBE2,      0, 0xCDD3, /* 0x60 */
-         0,      0,      0, 0xEFB5,      0,      0,      0, 0xFAE9, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xF9A6,      0,      0,      0,      0,      0,      0, 0xDFBD, /* 0xA0 */
-         0, 0xF7C7,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xF8FD,      0,      0, 0xF8FC, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xDEAB, 0xDBE8,      0,      0, 0xE3DD, /* 0xD0 */
-         0, 0xE1E2, 0xD1C6,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xF6D0, 0xEBE6, 0xDAF9, /* 0xE0 */
-         0,      0,      0,      0, 0xECC7,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0, 0xDEF8, 0xF8E9, 0xE3DE          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xFBE1, 0xFAED, 0xF0A2, 0xCCF1, 	 0, 0xFAA3, 0xE2F7, 	 0, /* 0x00 */
+    0xE2CE, 	 0, 0xE9F5, 	 0, 0xE1EB, 	 0, 	 0, 	 0, /* 0x00 */
+    0xE7E8, 0xE8D7, 0xDAF8, 0xD4CB, 	 0, 	 0, 	 0, 0xF7F6, /* 0x10 */
+    0xD6C5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD4E9, 	 0, 	 0, /* 0x20 */
+    0xFAFA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xCCF2, 0xF7DD, 	 0, 0xDEBA, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCEA8, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xF0B9, 0xE4FE, 0xE4C9, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xE4D4, 	 0, 	 0, 	 0, /* 0x50 */
+    0xEAC3, 	 0, 0xEFB4, 	 0, 	 0, 	 0, 0xD7BE, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xFBE2, 	 0, 0xCDD3, /* 0x60 */
+         0, 	 0, 	 0, 0xEFB5, 	 0, 	 0, 	 0, 0xFAE9, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xF9A6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDFBD, /* 0xA0 */
+         0, 0xF7C7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xF8FD, 	 0, 	 0, 0xF8FC, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xDEAB, 0xDBE8, 	 0, 	 0, 0xE3DD, /* 0xD0 */
+         0, 0xE1E2, 0xD1C6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF6D0, 0xEBE6, 0xDAF9, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xECC7, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xDEF8, 0xF8E9, 0xE3DE			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_99[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xCEF5,      0,      0,      0,      0, /* 0x00 */
-         0, 0xFAC3, 0xE5D7,      0, 0xECC8,      0,      0,      0, /* 0x00 */
-    0xF3C9,      0,      0, 0xE4BB,      0,      0,      0,      0, /* 0x10 */
-    0xE6AE,      0,      0,      0,      0,      0, 0xEFB6,      0, /* 0x10 */
-    0xDCBF,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xCEBD,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xD8C3,      0,      0, /* 0x40 */
-         0, 0xD0CF,      0, 0xCFFA, 0xF3CA, 0xE0D7,      0,      0, /* 0x40 */
-         0, 0xD1C7, 0xE9AE,      0, 0xE8BD,      0,      0, 0xFAC4, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xE2CF,      0, /* 0x90 */
-         0, 0xFAC5,      0,      0,      0, 0xF9B8,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xDCE0,      0,      0, /* 0xA0 */
-    0xFBB0,      0,      0,      0, 0xD8A9, 0xE5DF, 0xF9A7,      0, /* 0xA0 */
-         0, 0xF6EE,      0, 0xF6CC, 0xE2F8,      0,      0,      0, /* 0xB0 */
-         0, 0xECF1,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xDAE0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xF1D2, 0xD2CC, 0xCFCB,      0,      0, 0xCABD,      0,      0, /* 0xD0 */
-         0, 0xDDBF,      0,      0,      0, 0xF6EF,      0, 0xDEF9, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xFAB4,      0,      0, /* 0xE0 */
-         0, 0xD5AD,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0,      0,      0, 0xF1E7  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xCEF5, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xFAC3, 0xE5D7, 	 0, 0xECC8, 	 0, 	 0, 	 0, /* 0x00 */
+    0xF3C9, 	 0, 	 0, 0xE4BB, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xE6AE, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEFB6, 	 0, /* 0x10 */
+    0xDCBF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xCEBD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD8C3, 	 0, 	 0, /* 0x40 */
+         0, 0xD0CF, 	 0, 0xCFFA, 0xF3CA, 0xE0D7, 	 0, 	 0, /* 0x40 */
+         0, 0xD1C7, 0xE9AE, 	 0, 0xE8BD, 	 0, 	 0, 0xFAC4, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2CF, 	 0, /* 0x90 */
+         0, 0xFAC5, 	 0, 	 0, 	 0, 0xF9B8, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDCE0, 	 0, 	 0, /* 0xA0 */
+    0xFBB0, 	 0, 	 0, 	 0, 0xD8A9, 0xE5DF, 0xF9A7, 	 0, /* 0xA0 */
+         0, 0xF6EE, 	 0, 0xF6CC, 0xE2F8, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xECF1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xDAE0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xF1D2, 0xD2CC, 0xCFCB, 	 0, 	 0, 0xCABD, 	 0, 	 0, /* 0xD0 */
+         0, 0xDDBF, 	 0, 	 0, 	 0, 0xF6EF, 	 0, 0xDEF9, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xFAB4, 	 0, 	 0, /* 0xE0 */
+         0, 0xD5AD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF1E7	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_9A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xDEBE,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0xDCC0,      0,      0,      0,      0,      0, 0xD1C8, 0xD1C9, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xF8BE,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xCBF6,      0,      0,      0,      0, /* 0x20 */
-    0xD4F9,      0,      0,      0,      0,      0, 0xF5E2, 0xE1D3, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xD8E9,      0,      0, 0xF8FE,      0, 0xCFCC,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xFDA4,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xCEF6,      0, 0xFAD0, /* 0x50 */
-         0,      0, 0xCCF3, 0xE6BE,      0,      0,      0, 0xF6AE, /* 0x50 */
-         0,      0, 0xD5F0,      0,      0, 0xD1CA,      0,      0, /* 0x60 */
-         0, 0xFCBE, 0xD5F1,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xCDE9,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xFAB5,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xE2D0, 0xF4F7,      0,      0,      0, /* 0xD0 */
-    0xCDD4,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xE7A3,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xDBA5          /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xDEBE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xDCC0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD1C8, 0xD1C9, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xF8BE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xCBF6, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xD4F9, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF5E2, 0xE1D3, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xD8E9, 	 0, 	 0, 0xF8FE, 	 0, 0xCFCC, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xFDA4, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCEF6, 	 0, 0xFAD0, /* 0x50 */
+         0, 	 0, 0xCCF3, 0xE6BE, 	 0, 	 0, 	 0, 0xF6AE, /* 0x50 */
+         0, 	 0, 0xD5F0, 	 0, 	 0, 0xD1CA, 	 0, 	 0, /* 0x60 */
+         0, 0xFCBE, 0xD5F1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xCDE9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xFAB5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xE2D0, 0xF4F7, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xCDD4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE7A3, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDBA5			/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_9B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xE2D1,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xD7A2, /* 0x20 */
-         0,      0, 0xF7E3,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xEAA6,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xD0A1,      0,      0,      0, /* 0x30 */
-         0, 0xCEDA, 0xFBEB, 0xDBA6, 0xDBDE, 0xD8E5,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xEAE0, /* 0x40 */
-         0,      0,      0,      0, 0xD8AA,      0,      0,      0, /* 0x50 */
-         0,      0, 0xE5E0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0xD6DB, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xEFC6,      0, /* 0x80 */
-         0, 0xF8EA,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xE4D5, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xCEF7,      0,      0, 0xE0D8,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xD7EF,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xF4ED,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xCDE6,      0,      0,      0, /* 0xE0 */
-    0xCCF4                                                          /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xE2D1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD7A2, /* 0x20 */
+         0, 	 0, 0xF7E3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xEAA6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xD0A1, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xCEDA, 0xFBEB, 0xDBA6, 0xDBDE, 0xD8E5, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEAE0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xD8AA, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xE5E0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD6DB, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEFC6, 	 0, /* 0x80 */
+         0, 0xF8EA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4D5, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xCEF7, 	 0, 	 0, 0xE0D8, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xD7EF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4ED, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xCDE6, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xCCF4															/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_9C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xF5E3,      0,      0, /* 0x00 */
-    0xE4CA,      0, 0xDCE1,      0,      0, 0xF9C8,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xFCBF,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xE8A7,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xD8C4,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xCBBE, /* 0x40 */
-         0, 0xDCAE,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xD7F7, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xF0E8,      0, 0xDDC0, /* 0xE0 */
-         0, 0xCFCD,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xDCF3, 0xD9B0,      0, 0xE6E9          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xF5E3, 	 0, 	 0, /* 0x00 */
+    0xE4CA, 	 0, 0xDCE1, 	 0, 	 0, 0xF9C8, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xFCBF, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xE8A7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xD8C4, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBBE, /* 0x40 */
+         0, 0xDCAE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD7F7, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF0E8, 	 0, 0xDDC0, /* 0xE0 */
+         0, 0xCFCD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xDCF3, 0xD9B0, 	 0, 0xE6E9			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_9D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE4BC,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xEAC4,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xE4EC,      0, /* 0x20 */
-    0xE4E5,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xFBF8,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xCCBB,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xE4BD,      0,      0, /* 0x50 */
-    0xCDDC, 0xD9F7,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xDDDF,      0,      0,      0, /* 0x60 */
-         0,      0, 0xEDCE,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xD9D0,      0,      0,      0,      0,      0, 0xE5A3, /* 0xA0 */
-         0,      0,      0,      0, 0xF9CD,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xCDAE,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xCFCE, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0xF6AF,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xFDD3, 0xEBED, 0xD6DC                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE4BC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xEAC4, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4EC, 	 0, /* 0x20 */
+    0xE4E5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xFBF8, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xCCBB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE4BD, 	 0, 	 0, /* 0x50 */
+    0xCDDC, 0xD9F7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xDDDF, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xEDCE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xD9D0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5A3, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xF9CD, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xCDAE, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCFCE, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xF6AF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xFDD3, 0xEBED, 0xD6DC											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_9E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xE5A4,      0,      0,      0, 0xD5B6,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xD6DD,      0,      0, /* 0x70 */
-         0, 0xF9E9,      0,      0,      0, 0xE7A4,      0, 0xD6E3, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xD1CB, 0xD6E4,      0,      0,      0, 0xD5F2, /* 0x90 */
-         0,      0,      0,      0,      0, 0xDEFA,      0, 0xD7F8, /* 0x90 */
-         0,      0,      0,      0,      0, 0xD8EA,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xCFD5, 0xD8FD,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xD8AB,      0,      0, 0xFDCB,      0, /* 0xB0 */
-         0,      0,      0, 0xFCDC,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xE0A8, 0xD5F3,      0, /* 0xC0 */
-         0, 0xFDD9,      0,      0, 0xCCA3,      0,      0,      0, /* 0xD0 */
-    0xD9F9,      0,      0, 0xD3EA, 0xF5F5,      0, 0xEFC7,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xD3DA,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xDABD                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xE5A4, 	 0, 	 0, 	 0, 0xD5B6, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD6DD, 	 0, 	 0, /* 0x70 */
+         0, 0xF9E9, 	 0, 	 0, 	 0, 0xE7A4, 	 0, 0xD6E3, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xD1CB, 0xD6E4, 	 0, 	 0, 	 0, 0xD5F2, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDEFA, 	 0, 0xD7F8, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD8EA, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xCFD5, 0xD8FD, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xD8AB, 	 0, 	 0, 0xFDCB, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xFCDC, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE0A8, 0xD5F3, 	 0, /* 0xC0 */
+         0, 0xFDD9, 	 0, 	 0, 0xCCA3, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xD9F9, 	 0, 	 0, 0xD3EA, 0xF5F5, 	 0, 0xEFC7, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xD3DA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xDABD							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_9F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xE8A8, /* 0x00 */
-    0xDCAF,      0,      0,      0,      0,      0, 0xF0A3,      0, /* 0x00 */
-         0,      0,      0, 0xCDD5,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xE0A9,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xDEAC,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xF0BA, 0xEEB1,      0,      0, 0xEEB2,      0, /* 0x40 */
-         0,      0, 0xF6CD,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xEED2, /* 0x50 */
-         0, 0xD6C6,      0,      0,      0,      0,      0, 0xE0E5, /* 0x60 */
-         0,      0, 0xF3BB,      0, 0xE5E1,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0xE4CB, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xD7A3,      0,      0, /* 0x80 */
-    0xDBC2,      0,      0,      0,      0, 0xCAFE,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xCFCF                          /* 0x90 */
+    0xDCAF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF0A3, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xCDD5, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xE0A9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xDEAC, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xF0BA, 0xEEB1, 	 0, 	 0, 0xEEB2, 	 0, /* 0x40 */
+         0, 	 0, 0xF6CD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEED2, /* 0x50 */
+         0, 0xD6C6, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0E5, /* 0x60 */
+         0, 	 0, 0xF3BB, 	 0, 0xE5E1, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4CB, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD7A3, 	 0, 	 0, /* 0x80 */
+    0xDBC2, 	 0, 	 0, 	 0, 	 0, 0xCAFE, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xCFCF							/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_AC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB0A1, 0xB0A2, 0x8141, 0x8142, 0xB0A3, 0x8143, 0x8144, 0xB0A4, /* 0x00 */
     0xB0A5, 0xB0A6, 0xB0A7, 0x8145, 0x8146, 0x8147, 0x8148, 0x8149, /* 0x00 */
     0xB0A8, 0xB0A9, 0xB0AA, 0xB0AB, 0xB0AC, 0xB0AD, 0xB0AE, 0xB0AF, /* 0x10 */
@@ -3614,15 +3614,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_AC[] =
     0xB0ED, 0xB0EE, 0x81E1, 0x81E2, 0xB0EF, 0x81E3, 0x81E4, 0xB0F0, /* 0xE0 */
     0xB0F1, 0x81E5, 0xB0F2, 0x81E6, 0xB0F3, 0x81E7, 0x81E8, 0xB0F4, /* 0xE0 */
     0xB0F5, 0xB0F6, 0x81E9, 0xB0F7, 0x81EA, 0xB0F8, 0xB0F9, 0x81EB, /* 0xF0 */
-    0x81EC, 0x81ED, 0x81EE, 0x81EF, 0xB0FA, 0xB0FB, 0x81F0, 0x81F1  /* 0xF0 */
+    0x81EC, 0x81ED, 0x81EE, 0x81EF, 0xB0FA, 0xB0FB, 0x81F0, 0x81F1	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_AD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB0FC, 0x81F2, 0x81F3, 0x81F4, 0xB0FD, 0x81F5, 0xB0FE, 0x81F6, /* 0x00 */
     0x81F7, 0x81F8, 0x81F9, 0x81FA, 0xB1A1, 0xB1A2, 0x81FB, 0xB1A3, /* 0x00 */
     0x81FC, 0xB1A4, 0x81FD, 0x81FE, 0x8241, 0x8242, 0x8243, 0x8244, /* 0x10 */
@@ -3654,15 +3654,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_AD[] =
     0xB1D5, 0x82E9, 0x82EA, 0x82EB, 0xB1D6, 0x82EC, 0x82ED, 0x82EE, /* 0xE0 */
     0x82EF, 0x82F0, 0x82F1, 0x82F2, 0x82F3, 0x82F4, 0x82F5, 0x82F6, /* 0xE0 */
     0x82F7, 0x82F8, 0x82F9, 0x82FA, 0x82FB, 0x82FC, 0x82FD, 0x82FE, /* 0xF0 */
-    0xB1D7, 0xB1D8, 0x8341, 0x8342, 0xB1D9, 0x8343, 0x8344, 0xB1DA  /* 0xF0 */
+    0xB1D7, 0xB1D8, 0x8341, 0x8342, 0xB1D9, 0x8343, 0x8344, 0xB1DA	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_AE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB1DB, 0xB1DC, 0x8345, 0x8346, 0x8347, 0x8348, 0x8349, 0x834A, /* 0x00 */
     0xB1DD, 0xB1DE, 0x834B, 0xB1DF, 0x834C, 0xB1E0, 0x834D, 0x834E, /* 0x00 */
     0x834F, 0x8350, 0x8351, 0x8352, 0xB1E1, 0x8353, 0x8354, 0x8355, /* 0x10 */
@@ -3694,15 +3694,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_AE[] =
     0x83F9, 0x83FA, 0x83FB, 0x83FC, 0x83FD, 0x83FE, 0x8441, 0x8442, /* 0xE0 */
     0xB2B5, 0x8443, 0x8444, 0xB2B6, 0x8445, 0xB2B7, 0x8446, 0x8447, /* 0xE0 */
     0x8448, 0x8449, 0x844A, 0x844B, 0xB2B8, 0x844C, 0x844D, 0x844E, /* 0xF0 */
-    0xB2B9, 0x844F, 0x8450, 0x8451, 0xB2BA, 0x8452, 0x8453, 0x8454  /* 0xF0 */
+    0xB2B9, 0x844F, 0x8450, 0x8451, 0xB2BA, 0x8452, 0x8453, 0x8454	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_AF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8455, 0x8456, 0x8457, 0x8458, 0x8459, 0x845A, 0x8461, 0xB2BB, /* 0x00 */
     0xB2BC, 0x8462, 0x8463, 0x8464, 0x8465, 0xB2BD, 0x8466, 0x8467, /* 0x00 */
     0xB2BE, 0x8468, 0x8469, 0x846A, 0x846B, 0x846C, 0x846D, 0x846E, /* 0x10 */
@@ -3734,15 +3734,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_AF[] =
     0x8559, 0x855A, 0x8561, 0x8562, 0x8563, 0x8564, 0x8565, 0x8566, /* 0xE0 */
     0xB2E5, 0xB2E6, 0x8567, 0x8568, 0x8569, 0x856A, 0x856B, 0x856C, /* 0xE0 */
     0xB2E7, 0xB2E8, 0x856D, 0x856E, 0xB2E9, 0x856F, 0x8570, 0x8571, /* 0xF0 */
-    0xB2EA, 0x8572, 0x8573, 0x8574, 0x8575, 0x8576, 0x8577, 0x8578  /* 0xF0 */
+    0xB2EA, 0x8572, 0x8573, 0x8574, 0x8575, 0x8576, 0x8577, 0x8578	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB2EB, 0xB2EC, 0x8579, 0x857A, 0xB2ED, 0x8581, 0x8582, 0x8583, /* 0x00 */
     0x8584, 0x8585, 0x8586, 0x8587, 0xB2EE, 0x8588, 0x8589, 0x858A, /* 0x00 */
     0xB2EF, 0x858B, 0x858C, 0x858D, 0xB2F0, 0x858E, 0x858F, 0x8590, /* 0x10 */
@@ -3774,15 +3774,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B0[] =
     0xB3C8, 0x866C, 0x866D, 0x866E, 0x866F, 0xB3C9, 0x8670, 0x8671, /* 0xE0 */
     0x8672, 0x8673, 0x8674, 0x8675, 0x8676, 0x8677, 0x8678, 0x8679, /* 0xE0 */
     0x867A, 0x8681, 0x8682, 0x8683, 0x8684, 0x8685, 0x8686, 0x8687, /* 0xF0 */
-    0x8688, 0x8689, 0x868A, 0x868B, 0x868C, 0x868D, 0x868E, 0x868F  /* 0xF0 */
+    0x8688, 0x8689, 0x868A, 0x868B, 0x868C, 0x868D, 0x868E, 0x868F	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8690, 0x8691, 0x8692, 0x8693, 0x8694, 0x8695, 0x8696, 0x8697, /* 0x00 */
     0xB3CA, 0xB3CB, 0x8698, 0xB3CC, 0xB3CD, 0x8699, 0x869A, 0x869B, /* 0x00 */
     0xB3CE, 0x869C, 0xB3CF, 0xB3D0, 0x869D, 0x869E, 0x869F, 0x86A0, /* 0x10 */
@@ -3814,15 +3814,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B1[] =
     0x8788, 0x8789, 0x878A, 0x878B, 0x878C, 0x878D, 0x878E, 0x878F, /* 0xE0 */
     0xB4A2, 0xB4A3, 0x8790, 0x8791, 0xB4A4, 0x8792, 0x8793, 0x8794, /* 0xE0 */
     0xB4A5, 0x8795, 0x8796, 0x8797, 0x8798, 0x8799, 0x879A, 0x879B, /* 0xF0 */
-    0x879C, 0xB4A6, 0x879D, 0xB4A7, 0x879E, 0xB4A8, 0x879F, 0x87A0  /* 0xF0 */
+    0x879C, 0xB4A6, 0x879D, 0xB4A7, 0x879E, 0xB4A8, 0x879F, 0x87A0	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x87A1, 0x87A2, 0x87A3, 0x87A4, 0xB4A9, 0xB4AA, 0x87A5, 0x87A6, /* 0x00 */
     0xB4AB, 0x87A7, 0x87A8, 0xB4AC, 0xB4AD, 0x87A9, 0x87AA, 0x87AB, /* 0x00 */
     0x87AC, 0x87AD, 0x87AE, 0x87AF, 0xB4AE, 0xB4AF, 0x87B0, 0xB4B0, /* 0x10 */
@@ -3854,15 +3854,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B2[] =
     0x88A0, 0x88A1, 0xB4D8, 0x88A2, 0xB4D9, 0xB4DA, 0xB4DB, 0x88A3, /* 0xE0 */
     0xB4DC, 0x88A4, 0x88A5, 0xB4DD, 0xB4DE, 0xB4DF, 0xB4E0, 0xB4E1, /* 0xE0 */
     0x88A6, 0x88A7, 0x88A8, 0xB4E2, 0xB4E3, 0xB4E4, 0x88A9, 0xB4E5, /* 0xF0 */
-    0xB4E6, 0xB4E7, 0xB4E8, 0xB4E9, 0x88AA, 0x88AB, 0x88AC, 0xB4EA  /* 0xF0 */
+    0xB4E6, 0xB4E7, 0xB4E8, 0xB4E9, 0x88AA, 0x88AB, 0x88AC, 0xB4EA	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB4EB, 0xB4EC, 0x88AD, 0x88AE, 0xB4ED, 0x88AF, 0x88B0, 0x88B1, /* 0x00 */
     0xB4EE, 0x88B2, 0x88B3, 0x88B4, 0x88B5, 0x88B6, 0x88B7, 0x88B8, /* 0x00 */
     0xB4EF, 0xB4F0, 0x88B9, 0xB4F1, 0xB4F2, 0xB4F3, 0x88BA, 0x88BB, /* 0x10 */
@@ -3894,15 +3894,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B3[] =
     0xB5C2, 0x89A6, 0x89A7, 0x89A8, 0xB5C3, 0x89A9, 0x89AA, 0x89AB, /* 0xE0 */
     0xB5C4, 0x89AC, 0x89AD, 0x89AE, 0x89AF, 0x89B0, 0x89B1, 0x89B2, /* 0xE0 */
     0x89B3, 0x89B4, 0x89B5, 0x89B6, 0x89B7, 0x89B8, 0x89B9, 0x89BA, /* 0xF0 */
-    0x89BB, 0x89BC, 0x89BD, 0x89BE, 0xB5C5, 0x89BF, 0x89C0, 0x89C1  /* 0xF0 */
+    0x89BB, 0x89BC, 0x89BD, 0x89BE, 0xB5C5, 0x89BF, 0x89C0, 0x89C1	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x89C2, 0x89C3, 0x89C4, 0x89C5, 0x89C6, 0x89C7, 0x89C8, 0x89C9, /* 0x00 */
     0x89CA, 0x89CB, 0x89CC, 0x89CD, 0x89CE, 0x89CF, 0x89D0, 0x89D1, /* 0x00 */
     0xB5C6, 0x89D2, 0x89D3, 0x89D4, 0x89D5, 0x89D6, 0x89D7, 0x89D8, /* 0x10 */
@@ -3934,15 +3934,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B4[] =
     0xB5E7, 0x8ACF, 0x8AD0, 0xB5E8, 0xB5E9, 0x8AD1, 0xB5EA, 0x8AD2, /* 0xE0 */
     0x8AD3, 0x8AD4, 0x8AD5, 0x8AD6, 0xB5EB, 0xB5EC, 0x8AD7, 0xB5ED, /* 0xE0 */
     0x8AD8, 0xB5EE, 0x8AD9, 0x8ADA, 0x8ADB, 0x8ADC, 0x8ADD, 0x8ADE, /* 0xF0 */
-    0xB5EF, 0x8ADF, 0x8AE0, 0x8AE1, 0x8AE2, 0x8AE3, 0x8AE4, 0x8AE5  /* 0xF0 */
+    0xB5EF, 0x8ADF, 0x8AE0, 0x8AE1, 0x8AE2, 0x8AE3, 0x8AE4, 0x8AE5	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8AE6, 0x8AE7, 0x8AE8, 0x8AE9, 0x8AEA, 0x8AEB, 0x8AEC, 0x8AED, /* 0x00 */
     0x8AEE, 0x8AEF, 0x8AF0, 0x8AF1, 0x8AF2, 0x8AF3, 0x8AF4, 0x8AF5, /* 0x00 */
     0x8AF6, 0x8AF7, 0x8AF8, 0x8AF9, 0xB5F0, 0xB5F1, 0x8AFA, 0x8AFB, /* 0x10 */
@@ -3974,15 +3974,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B5[] =
     0x8BE0, 0x8BE1, 0x8BE2, 0x8BE3, 0x8BE4, 0x8BE5, 0x8BE6, 0x8BE7, /* 0xE0 */
     0x8BE8, 0x8BE9, 0x8BEA, 0x8BEB, 0xB6C6, 0x8BEC, 0x8BED, 0x8BEE, /* 0xE0 */
     0x8BEF, 0x8BF0, 0x8BF1, 0x8BF2, 0x8BF3, 0x8BF4, 0x8BF5, 0x8BF6, /* 0xF0 */
-    0x8BF7, 0x8BF8, 0x8BF9, 0x8BFA, 0x8BFB, 0x8BFC, 0x8BFD, 0x8BFE  /* 0xF0 */
+    0x8BF7, 0x8BF8, 0x8BF9, 0x8BFA, 0x8BFB, 0x8BFC, 0x8BFD, 0x8BFE	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8C41, 0x8C42, 0x8C43, 0x8C44, 0x8C45, 0x8C46, 0x8C47, 0x8C48, /* 0x00 */
     0x8C49, 0x8C4A, 0x8C4B, 0x8C4C, 0x8C4D, 0x8C4E, 0x8C4F, 0x8C50, /* 0x00 */
     0xB6C7, 0xB6C8, 0x8C51, 0x8C52, 0xB6C9, 0x8C53, 0x8C54, 0x8C55, /* 0x10 */
@@ -4014,15 +4014,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B6[] =
     0x8D63, 0x8D64, 0x8D65, 0x8D66, 0x8D67, 0x8D68, 0x8D69, 0x8D6A, /* 0xE0 */
     0x8D6B, 0x8D6C, 0x8D6D, 0x8D6E, 0x8D6F, 0x8D70, 0x8D71, 0x8D72, /* 0xE0 */
     0xB6D9, 0x8D73, 0x8D74, 0x8D75, 0xB6DA, 0x8D76, 0x8D77, 0x8D78, /* 0xF0 */
-    0xB6DB, 0x8D79, 0x8D7A, 0x8D81, 0x8D82, 0x8D83, 0x8D84, 0x8D85  /* 0xF0 */
+    0xB6DB, 0x8D79, 0x8D7A, 0x8D81, 0x8D82, 0x8D83, 0x8D84, 0x8D85	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB6DC, 0xB6DD, 0x8D86, 0x8D87, 0x8D88, 0xB6DE, 0x8D89, 0x8D8A, /* 0x00 */
     0x8D8B, 0x8D8C, 0x8D8D, 0x8D8E, 0x8D8F, 0x8D90, 0x8D91, 0x8D92, /* 0x00 */
     0x8D93, 0x8D94, 0x8D95, 0x8D96, 0x8D97, 0x8D98, 0x8D99, 0x8D9A, /* 0x10 */
@@ -4054,15 +4054,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B7[] =
     0x8E83, 0x8E84, 0x8E85, 0x8E86, 0x8E87, 0x8E88, 0x8E89, 0x8E8A, /* 0xE0 */
     0x8E8B, 0x8E8C, 0x8E8D, 0x8E8E, 0xB7AF, 0xB7B0, 0x8E8F, 0x8E90, /* 0xE0 */
     0xB7B1, 0x8E91, 0x8E92, 0x8E93, 0xB7B2, 0x8E94, 0x8E95, 0x8E96, /* 0xF0 */
-    0x8E97, 0x8E98, 0x8E99, 0x8E9A, 0xB7B3, 0xB7B4, 0x8E9B, 0xB7B5  /* 0xF0 */
+    0x8E97, 0x8E98, 0x8E99, 0x8E9A, 0xB7B3, 0xB7B4, 0x8E9B, 0xB7B5	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB7B6, 0xB7B7, 0x8E9C, 0x8E9D, 0x8E9E, 0x8E9F, 0x8EA0, 0xB7B8, /* 0x00 */
     0xB7B9, 0xB7BA, 0x8EA1, 0x8EA2, 0xB7BB, 0x8EA3, 0x8EA4, 0x8EA5, /* 0x00 */
     0xB7BC, 0x8EA6, 0x8EA7, 0x8EA8, 0x8EA9, 0x8EAA, 0x8EAB, 0x8EAC, /* 0x10 */
@@ -4094,15 +4094,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B8[] =
     0x8F9A, 0xB7E6, 0x8F9B, 0x8F9C, 0x8F9D, 0x8F9E, 0x8F9F, 0x8FA0, /* 0xE0 */
     0xB7E7, 0xB7E8, 0x8FA1, 0x8FA2, 0xB7E9, 0x8FA3, 0x8FA4, 0x8FA5, /* 0xE0 */
     0xB7EA, 0x8FA6, 0x8FA7, 0x8FA8, 0x8FA9, 0x8FAA, 0x8FAB, 0x8FAC, /* 0xF0 */
-    0xB7EB, 0xB7EC, 0x8FAD, 0xB7ED, 0x8FAE, 0xB7EE, 0x8FAF, 0x8FB0  /* 0xF0 */
+    0xB7EB, 0xB7EC, 0x8FAD, 0xB7ED, 0x8FAE, 0xB7EE, 0x8FAF, 0x8FB0	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8FB1, 0x8FB2, 0x8FB3, 0x8FB4, 0xB7EF, 0x8FB5, 0x8FB6, 0x8FB7, /* 0x00 */
     0x8FB8, 0x8FB9, 0x8FBA, 0x8FBB, 0x8FBC, 0x8FBD, 0x8FBE, 0x8FBF, /* 0x00 */
     0x8FC0, 0x8FC1, 0x8FC2, 0x8FC3, 0x8FC4, 0x8FC5, 0x8FC6, 0x8FC7, /* 0x10 */
@@ -4134,15 +4134,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_B9[] =
     0x90AD, 0xB8C3, 0x90AE, 0xB8C4, 0xB8C5, 0xB8C6, 0x90AF, 0x90B0, /* 0xE0 */
     0xB8C7, 0x90B1, 0x90B2, 0x90B3, 0xB8C8, 0x90B4, 0x90B5, 0x90B6, /* 0xE0 */
     0x90B7, 0x90B8, 0x90B9, 0x90BA, 0xB8C9, 0xB8CA, 0x90BB, 0xB8CB, /* 0xF0 */
-    0xB8CC, 0xB8CD, 0xB8CE, 0x90BC, 0x90BD, 0x90BE, 0x90BF, 0x90C0  /* 0xF0 */
+    0xB8CC, 0xB8CD, 0xB8CE, 0x90BC, 0x90BD, 0x90BE, 0x90BF, 0x90C0	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_BA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB8CF, 0xB8D0, 0x90C1, 0x90C2, 0x90C3, 0x90C4, 0x90C5, 0x90C6, /* 0x00 */
     0xB8D1, 0x90C7, 0x90C8, 0x90C9, 0x90CA, 0x90CB, 0x90CC, 0x90CD, /* 0x00 */
     0x90CE, 0x90CF, 0x90D0, 0x90D1, 0x90D2, 0xB8D2, 0x90D3, 0x90D4, /* 0x10 */
@@ -4174,15 +4174,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_BA[] =
     0x91C0, 0x91C1, 0x91C2, 0x91C3, 0x91C4, 0x91C5, 0x91C6, 0x91C7, /* 0xE0 */
     0x91C8, 0x91C9, 0x91CA, 0x91CB, 0x91CC, 0x91CD, 0x91CE, 0x91CF, /* 0xE0 */
     0x91D0, 0x91D1, 0x91D2, 0x91D3, 0x91D4, 0x91D5, 0x91D6, 0x91D7, /* 0xF0 */
-    0x91D8, 0x91D9, 0x91DA, 0x91DB, 0xB8FE, 0x91DC, 0x91DD, 0x91DE  /* 0xF0 */
+    0x91D8, 0x91D9, 0x91DA, 0x91DB, 0xB8FE, 0x91DC, 0x91DD, 0x91DE	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_BB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB9A1, 0x91DF, 0x91E0, 0x91E1, 0xB9A2, 0x91E2, 0x91E3, 0x91E4, /* 0x00 */
     0x91E5, 0x91E6, 0x91E7, 0x91E8, 0x91E9, 0xB9A3, 0x91EA, 0xB9A4, /* 0x00 */
     0x91EB, 0xB9A5, 0x91EC, 0x91ED, 0x91EE, 0x91EF, 0x91F0, 0x91F1, /* 0x10 */
@@ -4214,15 +4214,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_BB[] =
     0x92E2, 0x92E3, 0x92E4, 0x92E5, 0x92E6, 0x92E7, 0x92E8, 0x92E9, /* 0xE0 */
     0x92EA, 0x92EB, 0x92EC, 0x92ED, 0x92EE, 0x92EF, 0x92F0, 0x92F1, /* 0xE0 */
     0x92F2, 0x92F3, 0x92F4, 0x92F5, 0x92F6, 0x92F7, 0x92F8, 0x92F9, /* 0xF0 */
-    0xB9CC, 0xB9CD, 0x92FA, 0x92FB, 0xB9CE, 0x92FC, 0x92FD, 0xB9CF  /* 0xF0 */
+    0xB9CC, 0xB9CD, 0x92FA, 0x92FB, 0xB9CE, 0x92FC, 0x92FD, 0xB9CF	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_BC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB9D0, 0x92FE, 0xB9D1, 0x9341, 0x9342, 0x9343, 0x9344, 0x9345, /* 0x00 */
     0xB9D2, 0xB9D3, 0x9346, 0xB9D4, 0xB9D5, 0xB9D6, 0x9347, 0xB9D7, /* 0x00 */
     0x9348, 0xB9D8, 0x9349, 0x934A, 0xB9D9, 0xB9DA, 0xB9DB, 0xB9DC, /* 0x10 */
@@ -4254,15 +4254,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_BC[] =
     0x93E6, 0x93E7, 0x93E8, 0x93E9, 0x93EA, 0x93EB, 0x93EC, 0x93ED, /* 0xE0 */
     0x93EE, 0x93EF, 0x93F0, 0x93F1, 0x93F2, 0x93F3, 0x93F4, 0x93F5, /* 0xE0 */
     0x93F6, 0x93F7, 0x93F8, 0x93F9, 0xBAB8, 0xBAB9, 0xBABA, 0x93FA, /* 0xF0 */
-    0xBABB, 0x93FB, 0x93FC, 0x93FD, 0xBABC, 0x93FE, 0x9441, 0x9442  /* 0xF0 */
+    0xBABB, 0x93FB, 0x93FC, 0x93FD, 0xBABC, 0x93FE, 0x9441, 0x9442	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_BD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9443, 0x9444, 0x9445, 0x9446, 0xBABD, 0xBABE, 0x9447, 0xBABF, /* 0x00 */
     0x9448, 0xBAC0, 0x9449, 0x944A, 0x944B, 0x944C, 0x944D, 0x944E, /* 0x00 */
     0xBAC1, 0x944F, 0x9450, 0x9451, 0xBAC2, 0x9452, 0x9453, 0x9454, /* 0x10 */
@@ -4294,15 +4294,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_BD[] =
     0x954B, 0x954C, 0x954D, 0x954E, 0x954F, 0x9550, 0x9551, 0x9552, /* 0xE0 */
     0x9553, 0xBAE3, 0x9554, 0x9555, 0x9556, 0x9557, 0x9558, 0x9559, /* 0xE0 */
     0xBAE4, 0x955A, 0x9561, 0x9562, 0xBAE5, 0x9563, 0x9564, 0x9565, /* 0xF0 */
-    0xBAE6, 0x9566, 0x9567, 0x9568, 0x9569, 0x956A, 0x956B, 0x956C  /* 0xF0 */
+    0xBAE6, 0x9566, 0x9567, 0x9568, 0x9569, 0x956A, 0x956B, 0x956C	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_BE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xBAE7, 0x956D, 0x956E, 0xBAE8, 0x956F, 0xBAE9, 0x9570, 0x9571, /* 0x00 */
     0x9572, 0x9573, 0x9574, 0x9575, 0xBAEA, 0xBAEB, 0x9576, 0x9577, /* 0x00 */
     0xBAEC, 0x9578, 0x9579, 0x957A, 0xBAED, 0x9581, 0x9582, 0x9583, /* 0x10 */
@@ -4334,15 +4334,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_BE[] =
     0xBBBA, 0x966A, 0x966B, 0xBBBB, 0xBBBC, 0xBBBD, 0x966C, 0x966D, /* 0xE0 */
     0x966E, 0x966F, 0x9670, 0x9671, 0xBBBE, 0x9672, 0x9673, 0x9674, /* 0xE0 */
     0x9675, 0x9676, 0x9677, 0x9678, 0x9679, 0x967A, 0x9681, 0x9682, /* 0xF0 */
-    0x9683, 0x9684, 0x9685, 0x9686, 0x9687, 0x9688, 0x9689, 0x968A  /* 0xF0 */
+    0x9683, 0x9684, 0x9685, 0x9686, 0x9687, 0x9688, 0x9689, 0x968A	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_BF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x968B, 0xBBBF, 0x968C, 0x968D, 0x968E, 0x968F, 0x9690, 0x9691, /* 0x00 */
     0xBBC0, 0xBBC1, 0x9692, 0x9693, 0x9694, 0x9695, 0x9696, 0x9697, /* 0x00 */
     0x9698, 0x9699, 0x969A, 0x969B, 0x969C, 0x969D, 0x969E, 0x969F, /* 0x10 */
@@ -4374,15 +4374,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_BF[] =
     0x97A1, 0xBBD7, 0x97A2, 0x97A3, 0x97A4, 0x97A5, 0x97A6, 0x97A7, /* 0xE0 */
     0x97A8, 0x97A9, 0x97AA, 0x97AB, 0x97AC, 0x97AD, 0x97AE, 0x97AF, /* 0xE0 */
     0x97B0, 0x97B1, 0x97B2, 0x97B3, 0x97B4, 0x97B5, 0x97B6, 0x97B7, /* 0xF0 */
-    0x97B8, 0x97B9, 0x97BA, 0x97BB, 0x97BC, 0x97BD, 0x97BE, 0x97BF  /* 0xF0 */
+    0x97B8, 0x97B9, 0x97BA, 0x97BB, 0x97BC, 0x97BD, 0x97BE, 0x97BF	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x97C0, 0x97C1, 0x97C2, 0x97C3, 0x97C4, 0x97C5, 0x97C6, 0x97C7, /* 0x00 */
     0x97C8, 0x97C9, 0x97CA, 0x97CB, 0x97CC, 0x97CD, 0x97CE, 0x97CF, /* 0x00 */
     0x97D0, 0x97D1, 0x97D2, 0x97D3, 0x97D4, 0x97D5, 0x97D6, 0x97D7, /* 0x10 */
@@ -4414,15 +4414,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C0[] =
     0x98C8, 0x98C9, 0x98CA, 0x98CB, 0xBBFE, 0xBCA1, 0x98CC, 0x98CD, /* 0xE0 */
     0xBCA2, 0x98CE, 0x98CF, 0x98D0, 0xBCA3, 0x98D1, 0x98D2, 0x98D3, /* 0xE0 */
     0x98D4, 0x98D5, 0x98D6, 0x98D7, 0xBCA4, 0xBCA5, 0x98D8, 0xBCA6, /* 0xF0 */
-    0x98D9, 0xBCA7, 0x98DA, 0x98DB, 0x98DC, 0x98DD, 0x98DE, 0x98DF  /* 0xF0 */
+    0x98D9, 0xBCA7, 0x98DA, 0x98DB, 0x98DC, 0x98DD, 0x98DE, 0x98DF	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xBCA8, 0x98E0, 0x98E1, 0x98E2, 0xBCA9, 0x98E3, 0x98E4, 0x98E5, /* 0x00 */
     0xBCAA, 0x98E6, 0x98E7, 0x98E8, 0x98E9, 0x98EA, 0x98EB, 0x98EC, /* 0x00 */
     0xBCAB, 0x98ED, 0x98EE, 0x98EF, 0x98F0, 0xBCAC, 0x98F1, 0x98F2, /* 0x10 */
@@ -4454,15 +4454,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C1[] =
     0xBCE8, 0x99CE, 0x99CF, 0x99D0, 0xBCE9, 0x99D1, 0x99D2, 0x99D3, /* 0xE0 */
     0xBCEA, 0x99D4, 0x99D5, 0x99D6, 0x99D7, 0x99D8, 0x99D9, 0x99DA, /* 0xE0 */
     0xBCEB, 0xBCEC, 0x99DB, 0xBCED, 0x99DC, 0x99DD, 0x99DE, 0x99DF, /* 0xF0 */
-    0x99E0, 0x99E1, 0x99E2, 0x99E3, 0xBCEE, 0xBCEF, 0x99E4, 0x99E5  /* 0xF0 */
+    0x99E0, 0x99E1, 0x99E2, 0x99E3, 0xBCEE, 0xBCEF, 0x99E4, 0x99E5	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xBCF0, 0x99E6, 0x99E7, 0x99E8, 0xBCF1, 0x99E9, 0x99EA, 0x99EB, /* 0x00 */
     0x99EC, 0x99ED, 0x99EE, 0x99EF, 0xBCF2, 0xBCF3, 0x99F0, 0xBCF4, /* 0x00 */
     0x99F1, 0xBCF5, 0x99F2, 0x99F3, 0x99F4, 0x99F5, 0x99F6, 0x99F7, /* 0x10 */
@@ -4494,15 +4494,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C2[] =
     0xBDC5, 0x9AE1, 0x9AE2, 0xBDC6, 0xBDC7, 0x9AE3, 0x9AE4, 0x9AE5, /* 0xE0 */
     0x9AE6, 0x9AE7, 0x9AE8, 0xBDC8, 0xBDC9, 0xBDCA, 0x9AE9, 0xBDCB, /* 0xE0 */
     0x9AEA, 0xBDCC, 0x9AEB, 0x9AEC, 0x9AED, 0x9AEE, 0xBDCD, 0x9AEF, /* 0xF0 */
-    0xBDCE, 0xBDCF, 0x9AF0, 0xBDD0, 0xBDD1, 0x9AF1, 0x9AF2, 0x9AF3  /* 0xF0 */
+    0xBDCE, 0xBDCF, 0x9AF0, 0xBDD0, 0xBDD1, 0x9AF1, 0x9AF2, 0x9AF3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xBDD2, 0x9AF4, 0x9AF5, 0x9AF6, 0x9AF7, 0x9AF8, 0x9AF9, 0x9AFA, /* 0x00 */
     0xBDD3, 0xBDD4, 0x9AFB, 0x9AFC, 0xBDD5, 0xBDD6, 0x9AFD, 0x9AFE, /* 0x00 */
     0x9B41, 0x9B42, 0x9B43, 0xBDD7, 0xBDD8, 0xBDD9, 0x9B44, 0x9B45, /* 0x10 */
@@ -4534,15 +4534,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C3[] =
     0xBDF2, 0x9C44, 0xBDF3, 0x9C45, 0x9C46, 0x9C47, 0x9C48, 0x9C49, /* 0xE0 */
     0xBDF4, 0xBDF5, 0x9C4A, 0x9C4B, 0x9C4C, 0xBDF6, 0x9C4D, 0x9C4E, /* 0xE0 */
     0x9C4F, 0x9C50, 0x9C51, 0x9C52, 0xBDF7, 0xBDF8, 0x9C53, 0x9C54, /* 0xF0 */
-    0xBDF9, 0x9C55, 0x9C56, 0x9C57, 0x9C58, 0x9C59, 0x9C5A, 0x9C61  /* 0xF0 */
+    0xBDF9, 0x9C55, 0x9C56, 0x9C57, 0x9C58, 0x9C59, 0x9C5A, 0x9C61	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9C62, 0x9C63, 0x9C64, 0x9C65, 0x9C66, 0x9C67, 0x9C68, 0x9C69, /* 0x00 */
     0xBDFA, 0x9C6A, 0x9C6B, 0x9C6C, 0x9C6D, 0x9C6E, 0x9C6F, 0x9C70, /* 0x00 */
     0xBDFB, 0x9C71, 0x9C72, 0x9C73, 0x9C74, 0x9C75, 0x9C76, 0x9C77, /* 0x10 */
@@ -4574,15 +4574,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C4[] =
     0x9D81, 0x9D82, 0x9D83, 0x9D84, 0x9D85, 0x9D86, 0x9D87, 0x9D88, /* 0xE0 */
     0x9D89, 0xBEB1, 0x9D8A, 0x9D8B, 0x9D8C, 0x9D8D, 0x9D8E, 0x9D8F, /* 0xE0 */
     0xBEB2, 0xBEB3, 0x9D90, 0x9D91, 0xBEB4, 0x9D92, 0x9D93, 0x9D94, /* 0xF0 */
-    0xBEB5, 0x9D95, 0xBEB6, 0x9D96, 0x9D97, 0x9D98, 0x9D99, 0xBEB7  /* 0xF0 */
+    0xBEB5, 0x9D95, 0xBEB6, 0x9D96, 0x9D97, 0x9D98, 0x9D99, 0xBEB7	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xBEB8, 0xBEB9, 0x9D9A, 0x9D9B, 0x9D9C, 0x9D9D, 0x9D9E, 0x9D9F, /* 0x00 */
     0x9DA0, 0x9DA1, 0x9DA2, 0x9DA3, 0xBEBA, 0x9DA4, 0x9DA5, 0x9DA6, /* 0x00 */
     0xBEBB, 0x9DA7, 0x9DA8, 0x9DA9, 0xBEBC, 0x9DAA, 0x9DAB, 0x9DAC, /* 0x10 */
@@ -4614,15 +4614,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C5[] =
     0xBFA5, 0xBFA6, 0x9E77, 0xBFA7, 0x9E78, 0xBFA8, 0x9E79, 0x9E7A, /* 0xE0 */
     0x9E81, 0x9E82, 0x9E83, 0x9E84, 0xBFA9, 0xBFAA, 0xBFAB, 0x9E85, /* 0xE0 */
     0xBFAC, 0x9E86, 0x9E87, 0x9E88, 0xBFAD, 0x9E89, 0xBFAE, 0xBFAF, /* 0xF0 */
-    0x9E8A, 0x9E8B, 0x9E8C, 0x9E8D, 0xBFB0, 0xBFB1, 0xBFB2, 0xBFB3  /* 0xF0 */
+    0x9E8A, 0x9E8B, 0x9E8C, 0x9E8D, 0xBFB0, 0xBFB1, 0xBFB2, 0xBFB3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xBFB4, 0xBFB5, 0x9E8E, 0x9E8F, 0x9E90, 0xBFB6, 0xBFB7, 0xBFB8, /* 0x00 */
     0xBFB9, 0x9E91, 0x9E92, 0x9E93, 0xBFBA, 0x9E94, 0x9E95, 0x9E96, /* 0x00 */
     0xBFBB, 0x9E97, 0x9E98, 0x9E99, 0x9E9A, 0x9E9B, 0x9E9C, 0x9E9D, /* 0x10 */
@@ -4654,15 +4654,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C6[] =
     0xBFFC, 0xBFFD, 0x9F6E, 0x9F6F, 0x9F70, 0x9F71, 0x9F72, 0x9F73, /* 0xE0 */
     0xBFFE, 0xC0A1, 0x9F74, 0x9F75, 0xC0A2, 0x9F76, 0x9F77, 0x9F78, /* 0xE0 */
     0xC0A3, 0x9F79, 0x9F7A, 0x9F81, 0x9F82, 0x9F83, 0x9F84, 0x9F85, /* 0xF0 */
-    0xC0A4, 0xC0A5, 0x9F86, 0x9F87, 0x9F88, 0xC0A6, 0x9F89, 0x9F8A  /* 0xF0 */
+    0xC0A4, 0xC0A5, 0x9F86, 0x9F87, 0x9F88, 0xC0A6, 0x9F89, 0x9F8A	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9F8B, 0x9F8C, 0x9F8D, 0x9F8E, 0xC0A7, 0xC0A8, 0x9F8F, 0x9F90, /* 0x00 */
     0xC0A9, 0x9F91, 0x9F92, 0x9F93, 0xC0AA, 0x9F94, 0x9F95, 0x9F96, /* 0x00 */
     0x9F97, 0x9F98, 0x9F99, 0x9F9A, 0xC0AB, 0xC0AC, 0x9F9B, 0xC0AD, /* 0x10 */
@@ -4694,15 +4694,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C7[] =
     0xA063, 0xA064, 0xA065, 0xA066, 0xC0F7, 0xA067, 0xA068, 0xA069, /* 0xE0 */
     0xC0F8, 0xA06A, 0xA06B, 0xA06C, 0xC0F9, 0xA06D, 0xA06E, 0xA06F, /* 0xE0 */
     0xA070, 0xA071, 0xA072, 0xA073, 0xA074, 0xA075, 0xA076, 0xA077, /* 0xF0 */
-    0xA078, 0xA079, 0xA07A, 0xA081, 0xA082, 0xA083, 0xA084, 0xA085  /* 0xF0 */
+    0xA078, 0xA079, 0xA07A, 0xA081, 0xA082, 0xA083, 0xA084, 0xA085	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC0FA, 0xC0FB, 0xA086, 0xA087, 0xC0FC, 0xA088, 0xA089, 0xA08A, /* 0x00 */
     0xC0FD, 0xA08B, 0xC0FE, 0xA08C, 0xA08D, 0xA08E, 0xA08F, 0xA090, /* 0x00 */
     0xC1A1, 0xC1A2, 0xA091, 0xC1A3, 0xA092, 0xC1A4, 0xC1A5, 0xA093, /* 0x10 */
@@ -4734,15 +4734,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C8[] =
     0xC1D2, 0xC1D3, 0xA178, 0xA179, 0xC1D4, 0xA17A, 0xA181, 0xA182, /* 0xE0 */
     0xA183, 0xA184, 0xA185, 0xA186, 0xA187, 0xA188, 0xA189, 0xA18A, /* 0xE0 */
     0xA18B, 0xA18C, 0xA18D, 0xA18E, 0xA18F, 0xC1D5, 0xA190, 0xA191, /* 0xF0 */
-    0xA192, 0xA193, 0xA194, 0xA195, 0xC1D6, 0xC1D7, 0xA196, 0xA197  /* 0xF0 */
+    0xA192, 0xA193, 0xA194, 0xA195, 0xC1D6, 0xC1D7, 0xA196, 0xA197	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC1D8, 0xA198, 0xA199, 0xA19A, 0xC1D9, 0xC1DA, 0xC1DB, 0xA19B, /* 0x00 */
     0xA19C, 0xA19D, 0xA19E, 0xA19F, 0xC1DC, 0xC1DD, 0xA1A0, 0xC1DE, /* 0x00 */
     0xA241, 0xC1DF, 0xA242, 0xA243, 0xA244, 0xA245, 0xA246, 0xA247, /* 0x10 */
@@ -4774,15 +4774,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_C9[] =
     0xC2A7, 0xA443, 0xC2A8, 0xA444, 0xC2A9, 0xA445, 0xA446, 0xC2AA, /* 0xE0 */
     0xA447, 0xA448, 0xA449, 0xA44A, 0xC2AB, 0xC2AC, 0xA44B, 0xC2AD, /* 0xE0 */
     0xC2AE, 0xC2AF, 0xA44C, 0xA44D, 0xA44E, 0xA44F, 0xA450, 0xA451, /* 0xF0 */
-    0xC2B0, 0xC2B1, 0xA452, 0xA453, 0xC2B2, 0xA454, 0xA455, 0xA456  /* 0xF0 */
+    0xC2B0, 0xC2B1, 0xA452, 0xA453, 0xC2B2, 0xA454, 0xA455, 0xA456	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_CA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC2B3, 0xA457, 0xA458, 0xA459, 0xA45A, 0xA461, 0xA462, 0xA463, /* 0x00 */
     0xC2B4, 0xC2B5, 0xA464, 0xC2B6, 0xC2B7, 0xC2B8, 0xA465, 0xA466, /* 0x00 */
     0xA467, 0xA468, 0xA469, 0xA46A, 0xC2B9, 0xA46B, 0xA46C, 0xA46D, /* 0x10 */
@@ -4814,15 +4814,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_CA[] =
     0xC2D4, 0xA674, 0xA675, 0xA676, 0xA677, 0xA678, 0xA679, 0xA67A, /* 0xE0 */
     0xA681, 0xA682, 0xA683, 0xA684, 0xC2D5, 0xA685, 0xA686, 0xA687, /* 0xE0 */
     0xA688, 0xA689, 0xA68A, 0xA68B, 0xC2D6, 0xA68C, 0xA68D, 0xA68E, /* 0xF0 */
-    0xA68F, 0xA690, 0xA691, 0xA692, 0xA693, 0xA694, 0xA695, 0xA696  /* 0xF0 */
+    0xA68F, 0xA690, 0xA691, 0xA692, 0xA693, 0xA694, 0xA695, 0xA696	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_CB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xA697, 0xA698, 0xA699, 0xA69A, 0xA69B, 0xA69C, 0xA69D, 0xA69E, /* 0x00 */
     0xC2D7, 0xA69F, 0xA6A0, 0xA741, 0xA742, 0xA743, 0xA744, 0xA745, /* 0x00 */
     0xC2D8, 0xA746, 0xA747, 0xA748, 0xC2D9, 0xA749, 0xA74A, 0xA74B, /* 0x10 */
@@ -4854,15 +4854,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_CB[] =
     0xA961, 0xA962, 0xA963, 0xA964, 0xC2EB, 0xA965, 0xA966, 0xC2EC, /* 0xE0 */
     0xA967, 0xC2ED, 0xA968, 0xA969, 0xA96A, 0xA96B, 0xA96C, 0xA96D, /* 0xE0 */
     0xA96E, 0xA96F, 0xA970, 0xA971, 0xA972, 0xA973, 0xA974, 0xA975, /* 0xF0 */
-    0xA976, 0xA977, 0xA978, 0xA979, 0xA97A, 0xA981, 0xA982, 0xA983  /* 0xF0 */
+    0xA976, 0xA977, 0xA978, 0xA979, 0xA97A, 0xA981, 0xA982, 0xA983	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_CC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xA984, 0xA985, 0xA986, 0xA987, 0xA988, 0xA989, 0xA98A, 0xA98B, /* 0x00 */
     0xA98C, 0xA98D, 0xA98E, 0xA98F, 0xC2EE, 0xC2EF, 0xA990, 0xA991, /* 0x00 */
     0xC2F0, 0xA992, 0xA993, 0xA994, 0xC2F1, 0xA995, 0xA996, 0xA997, /* 0x10 */
@@ -4894,15 +4894,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_CC[] =
     0xAB86, 0xAB87, 0xAB88, 0xAB89, 0xC3C6, 0xAB8A, 0xAB8B, 0xAB8C, /* 0xE0 */
     0xAB8D, 0xAB8E, 0xAB8F, 0xAB90, 0xC3C7, 0xAB91, 0xAB92, 0xAB93, /* 0xE0 */
     0xC3C8, 0xAB94, 0xAB95, 0xAB96, 0xAB97, 0xAB98, 0xAB99, 0xAB9A, /* 0xF0 */
-    0xAB9B, 0xAB9C, 0xAB9D, 0xAB9E, 0xAB9F, 0xABA0, 0xAC41, 0xAC42  /* 0xF0 */
+    0xAB9B, 0xAB9C, 0xAB9D, 0xAB9E, 0xAB9F, 0xABA0, 0xAC41, 0xAC42	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_CD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xAC43, 0xC3C9, 0xAC44, 0xAC45, 0xAC46, 0xAC47, 0xAC48, 0xAC49, /* 0x00 */
     0xC3CA, 0xC3CB, 0xAC4A, 0xAC4B, 0xC3CC, 0xAC4C, 0xAC4D, 0xAC4E, /* 0x00 */
     0xC3CD, 0xAC4F, 0xAC50, 0xAC51, 0xAC52, 0xAC53, 0xAC54, 0xAC55, /* 0x10 */
@@ -4934,15 +4934,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_CD[] =
     0xAE59, 0xAE5A, 0xAE61, 0xAE62, 0xAE63, 0xAE64, 0xAE65, 0xAE66, /* 0xE0 */
     0xC3EB, 0xAE67, 0xAE68, 0xAE69, 0xC3EC, 0xAE6A, 0xAE6B, 0xAE6C, /* 0xE0 */
     0xC3ED, 0xAE6D, 0xAE6E, 0xAE6F, 0xAE70, 0xAE71, 0xAE72, 0xAE73, /* 0xF0 */
-    0xC3EE, 0xC3EF, 0xAE74, 0xC3F0, 0xAE75, 0xC3F1, 0xAE76, 0xAE77  /* 0xF0 */
+    0xC3EE, 0xC3EF, 0xAE74, 0xC3F0, 0xAE75, 0xC3F1, 0xAE76, 0xAE77	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_CE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xAE78, 0xAE79, 0xAE7A, 0xAE81, 0xC3F2, 0xAE82, 0xAE83, 0xAE84, /* 0x00 */
     0xC3F3, 0xAE85, 0xAE86, 0xAE87, 0xC3F4, 0xAE88, 0xAE89, 0xAE8A, /* 0x00 */
     0xAE8B, 0xAE8C, 0xAE8D, 0xAE8E, 0xC3F5, 0xAE8F, 0xAE90, 0xAE91, /* 0x10 */
@@ -4974,15 +4974,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_CE[] =
     0xB08B, 0xB08C, 0xB08D, 0xB08E, 0xC4BF, 0xC4C0, 0xB08F, 0xB090, /* 0xE0 */
     0xC4C1, 0xB091, 0xB092, 0xC4C2, 0xC4C3, 0xB093, 0xB094, 0xB095, /* 0xE0 */
     0xB096, 0xB097, 0xB098, 0xB099, 0xC4C4, 0xC4C5, 0xB09A, 0xC4C6, /* 0xF0 */
-    0xC4C7, 0xC4C8, 0xB09B, 0xB09C, 0xB09D, 0xB09E, 0xB09F, 0xB0A0  /* 0xF0 */
+    0xC4C7, 0xC4C8, 0xB09B, 0xB09C, 0xB09D, 0xB09E, 0xB09F, 0xB0A0	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_CF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC4C9, 0xC4CA, 0xB141, 0xB142, 0xC4CB, 0xB143, 0xB144, 0xB145, /* 0x00 */
     0xC4CC, 0xB146, 0xB147, 0xB148, 0xB149, 0xB14A, 0xB14B, 0xB14C, /* 0x00 */
     0xC4CD, 0xC4CE, 0xB14D, 0xC4CF, 0xB14E, 0xC4D0, 0xB14F, 0xB150, /* 0x10 */
@@ -5014,15 +5014,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_CF[] =
     0xC4ED, 0xC4EE, 0xB355, 0xB356, 0xC4EF, 0xB357, 0xB358, 0xB359, /* 0xE0 */
     0xC4F0, 0xB35A, 0xB361, 0xB362, 0xB363, 0xB364, 0xB365, 0xB366, /* 0xE0 */
     0xC4F1, 0xC4F2, 0xB367, 0xC4F3, 0xB368, 0xC4F4, 0xB369, 0xB36A, /* 0xF0 */
-    0xB36B, 0xB36C, 0xB36D, 0xB36E, 0xC4F5, 0xB36F, 0xB370, 0xB371  /* 0xF0 */
+    0xB36B, 0xB36C, 0xB36D, 0xB36E, 0xC4F5, 0xB36F, 0xB370, 0xB371	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_D0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC4F6, 0xB372, 0xB373, 0xB374, 0xC4F7, 0xB375, 0xB376, 0xB377, /* 0x00 */
     0xB378, 0xB379, 0xB37A, 0xB381, 0xB382, 0xB383, 0xB384, 0xB385, /* 0x00 */
     0xB386, 0xC4F8, 0xB387, 0xB388, 0xB389, 0xB38A, 0xB38B, 0xB38C, /* 0x10 */
@@ -5054,15 +5054,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_D0[] =
     0xC5C4, 0xB584, 0xB585, 0xB586, 0xC5C5, 0xB587, 0xB588, 0xB589, /* 0xE0 */
     0xB58A, 0xB58B, 0xB58C, 0xB58D, 0xC5C6, 0xC5C7, 0xB58E, 0xC5C8, /* 0xE0 */
     0xC5C9, 0xC5CA, 0xB58F, 0xB590, 0xB591, 0xB592, 0xB593, 0xB594, /* 0xF0 */
-    0xC5CB, 0xB595, 0xB596, 0xB597, 0xB598, 0xB599, 0xB59A, 0xB59B  /* 0xF0 */
+    0xC5CB, 0xB595, 0xB596, 0xB597, 0xB598, 0xB599, 0xB59A, 0xB59B	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_D1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB59C, 0xB59D, 0xB59E, 0xB59F, 0xB5A0, 0xB641, 0xB642, 0xB643, /* 0x00 */
     0xB644, 0xB645, 0xB646, 0xB647, 0xB648, 0xC5CC, 0xB649, 0xB64A, /* 0x00 */
     0xB64B, 0xB64C, 0xB64D, 0xB64E, 0xB64F, 0xB650, 0xB651, 0xB652, /* 0x10 */
@@ -5094,15 +5094,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_D1[] =
     0xB850, 0xB851, 0xB852, 0xB853, 0xB854, 0xB855, 0xB856, 0xB857, /* 0xE0 */
     0xB858, 0xB859, 0xB85A, 0xB861, 0xB862, 0xB863, 0xB864, 0xB865, /* 0xE0 */
     0xB866, 0xB867, 0xB868, 0xB869, 0xC5F0, 0xB86A, 0xB86B, 0xB86C, /* 0xF0 */
-    0xC5F1, 0xB86D, 0xB86E, 0xB86F, 0xB870, 0xB871, 0xB872, 0xB873  /* 0xF0 */
+    0xC5F1, 0xB86D, 0xB86E, 0xB86F, 0xB870, 0xB871, 0xB872, 0xB873	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_D2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB874, 0xB875, 0xB876, 0xB877, 0xB878, 0xB879, 0xB87A, 0xC5F2, /* 0x00 */
     0xB881, 0xC5F3, 0xB882, 0xB883, 0xB884, 0xB885, 0xB886, 0xB887, /* 0x00 */
     0xC5F4, 0xB888, 0xB889, 0xB88A, 0xB88B, 0xB88C, 0xB88D, 0xB88E, /* 0x10 */
@@ -5134,15 +5134,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_D2[] =
     0xBA8C, 0xBA8D, 0xBA8E, 0xBA8F, 0xC6BA, 0xC6BB, 0xBA90, 0xBA91, /* 0xE0 */
     0xBA92, 0xBA93, 0xBA94, 0xBA95, 0xBA96, 0xBA97, 0xBA98, 0xBA99, /* 0xE0 */
     0xC6BC, 0xC6BD, 0xBA9A, 0xBA9B, 0xC6BE, 0xBA9C, 0xBA9D, 0xBA9E, /* 0xF0 */
-    0xC6BF, 0xBA9F, 0xBAA0, 0xBB41, 0xBB42, 0xBB43, 0xBB44, 0xBB45  /* 0xF0 */
+    0xC6BF, 0xBA9F, 0xBAA0, 0xBB41, 0xBB42, 0xBB43, 0xBB44, 0xBB45	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_D3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC6C0, 0xC6C1, 0xBB46, 0xC6C2, 0xBB47, 0xC6C3, 0xBB48, 0xBB49, /* 0x00 */
     0xBB4A, 0xBB4B, 0xBB4C, 0xBB4D, 0xC6C4, 0xC6C5, 0xC6C6, 0xBB4E, /* 0x00 */
     0xC6C7, 0xBB4F, 0xBB50, 0xBB51, 0xC6C8, 0xBB52, 0xC6C9, 0xBB53, /* 0x10 */
@@ -5174,15 +5174,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_D3[] =
     0xBD49, 0xC6F5, 0xBD4A, 0xC6F6, 0xBD4B, 0xBD4C, 0xBD4D, 0xBD4E, /* 0xE0 */
     0xBD4F, 0xBD50, 0xBD51, 0xBD52, 0xC6F7, 0xC6F8, 0xBD53, 0xBD54, /* 0xE0 */
     0xC6F9, 0xBD55, 0xBD56, 0xBD57, 0xC6FA, 0xBD58, 0xBD59, 0xBD5A, /* 0xF0 */
-    0xBD61, 0xBD62, 0xBD63, 0xBD64, 0xC6FB, 0xC6FC, 0xBD65, 0xC6FD  /* 0xF0 */
+    0xBD61, 0xBD62, 0xBD63, 0xBD64, 0xC6FB, 0xC6FC, 0xBD65, 0xC6FD	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_D4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xBD66, 0xC6FE, 0xBD67, 0xBD68, 0xBD69, 0xBD6A, 0xBD6B, 0xBD6C, /* 0x00 */
     0xC7A1, 0xBD6D, 0xBD6E, 0xBD6F, 0xBD70, 0xBD71, 0xBD72, 0xBD73, /* 0x00 */
     0xBD74, 0xBD75, 0xBD76, 0xBD77, 0xBD78, 0xBD79, 0xBD7A, 0xBD81, /* 0x10 */
@@ -5214,15 +5214,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_D4[] =
     0xBF89, 0xBF8A, 0xBF8B, 0xBF8C, 0xBF8D, 0xBF8E, 0xBF8F, 0xBF90, /* 0xE0 */
     0xC7BB, 0xBF91, 0xBF92, 0xBF93, 0xC7BC, 0xBF94, 0xBF95, 0xBF96, /* 0xE0 */
     0xC7BD, 0xBF97, 0xBF98, 0xBF99, 0xBF9A, 0xBF9B, 0xBF9C, 0xBF9D, /* 0xF0 */
-    0xC7BE, 0xBF9E, 0xBF9F, 0xC7BF, 0xBFA0, 0xC7C0, 0xC041, 0xC042  /* 0xF0 */
+    0xC7BE, 0xBF9E, 0xBF9F, 0xC7BF, 0xBFA0, 0xC7C0, 0xC041, 0xC042	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_D5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC043, 0xC044, 0xC045, 0xC046, 0xC7C1, 0xC047, 0xC048, 0xC049, /* 0x00 */
     0xC7C2, 0xC04A, 0xC04B, 0xC04C, 0xC7C3, 0xC04D, 0xC04E, 0xC04F, /* 0x00 */
     0xC050, 0xC051, 0xC052, 0xC053, 0xC7C4, 0xC7C5, 0xC054, 0xC7C6, /* 0x10 */
@@ -5254,15 +5254,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_D5[] =
     0xC250, 0xC251, 0xC252, 0xC253, 0xC7EC, 0xC7ED, 0xC254, 0xC255, /* 0xE0 */
     0xC7EE, 0xC256, 0xC257, 0xC258, 0xC7EF, 0xC259, 0xC25A, 0xC261, /* 0xE0 */
     0xC262, 0xC263, 0xC264, 0xC265, 0xC7F0, 0xC7F1, 0xC266, 0xC7F2, /* 0xF0 */
-    0xC267, 0xC7F3, 0xC268, 0xC269, 0xC26A, 0xC26B, 0xC26C, 0xC26D  /* 0xF0 */
+    0xC267, 0xC7F3, 0xC268, 0xC269, 0xC26A, 0xC26B, 0xC26C, 0xC26D	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_D6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC7F4, 0xC7F5, 0xC26E, 0xC26F, 0xC7F6, 0xC270, 0xC271, 0xC272, /* 0x00 */
     0xC7F7, 0xC273, 0xC274, 0xC275, 0xC276, 0xC277, 0xC278, 0xC279, /* 0x00 */
     0xC7F8, 0xC7F9, 0xC27A, 0xC7FA, 0xC7FB, 0xC7FC, 0xC281, 0xC282, /* 0x10 */
@@ -5294,15 +5294,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_D6[] =
     0xC8CC, 0xC470, 0xC471, 0xC472, 0xC8CD, 0xC473, 0xC474, 0xC475, /* 0xE0 */
     0xC8CE, 0xC476, 0xC477, 0xC478, 0xC479, 0xC47A, 0xC481, 0xC482, /* 0xE0 */
     0xC8CF, 0xC483, 0xC484, 0xC485, 0xC486, 0xC8D0, 0xC487, 0xC488, /* 0xF0 */
-    0xC489, 0xC48A, 0xC48B, 0xC48C, 0xC8D1, 0xC8D2, 0xC48D, 0xC48E  /* 0xF0 */
+    0xC489, 0xC48A, 0xC48B, 0xC48C, 0xC8D1, 0xC8D2, 0xC48D, 0xC48E	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_D7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC8D3, 0xC48F, 0xC490, 0xC491, 0xC8D4, 0xC492, 0xC493, 0xC494, /* 0x00 */
     0xC495, 0xC496, 0xC497, 0xC498, 0xC499, 0xC49A, 0xC49B, 0xC49C, /* 0x00 */
     0xC49D, 0xC8D5, 0xC49E, 0xC49F, 0xC4A0, 0xC541, 0xC542, 0xC543, /* 0x10 */
@@ -5323,15 +5323,15 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_D7[] =
     0xC8F7, 0xC8F8, 0xC59F, 0xC5A0, 0xC8F9, 0xC641, 0xC642, 0xC643, /* 0x80 */
     0xC8FA, 0xC644, 0xC645, 0xC646, 0xC647, 0xC648, 0xC649, 0xC64A, /* 0x90 */
     0xC8FB, 0xC8FC, 0xC64B, 0xC8FD, 0xC64C, 0xC8FE, 0xC64D, 0xC64E, /* 0x90 */
-    0xC64F, 0xC650, 0xC651, 0xC652                                  /* 0xA0 */
+    0xC64F, 0xC650, 0xC651, 0xC652									/* 0xA0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_F9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xCBD0, 0xCBD6, 0xCBE7, 0xCDCF, 0xCDE8, 0xCEAD, 0xCFFB, 0xD0A2, /* 0x00 */
     0xD0B8, 0xD0D0, 0xD0DD, 0xD1D4, 0xD1D5, 0xD1D8, 0xD1DB, 0xD1DC, /* 0x00 */
     0xD1DD, 0xD1DE, 0xD1DF, 0xD1E0, 0xD1E2, 0xD1E3, 0xD1E4, 0xD1E5, /* 0x10 */
@@ -5363,25 +5363,25 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_F9[] =
     0xECAF, 0xECB0, 0xECB1, 0xECB2, 0xECB5, 0xECB8, 0xECBA, 0xECC0, /* 0xE0 */
     0xECC1, 0xECC5, 0xECC6, 0xECC9, 0xECCA, 0xECD5, 0xECDD, 0xECDE, /* 0xE0 */
     0xECE1, 0xECE4, 0xECE7, 0xECE8, 0xECF7, 0xECF8, 0xECFA, 0xEDA1, /* 0xF0 */
-    0xEDA2, 0xEDA3, 0xEDEE, 0xEEDB, 0xF2BD, 0xF2FA, 0xF3B1, 0xF4A7  /* 0xF0 */
+    0xEDA2, 0xEDA3, 0xEDEE, 0xEEDB, 0xF2BD, 0xF2FA, 0xF3B1, 0xF4A7	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_FA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xF4EE, 0xF6F4, 0xF6F6, 0xF7B8, 0xF7C8, 0xF7D3, 0xF8DB, 0xF8F0, /* 0x00 */
-    0xFAA1, 0xFAA2, 0xFAE6, 0xFCA9                                  /* 0x00 */
+    0xFAA1, 0xFAA2, 0xFAE6, 0xFCA9									/* 0x00 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_KSC5601_FF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xA3A1, 0xA3A2, 0xA3A3, 0xA3A4, 0xA3A5, 0xA3A6, 0xA3A7, /* 0x00 */
     0xA3A8, 0xA3A9, 0xA3AA, 0xA3AB, 0xA3AC, 0xA3AD, 0xA3AE, 0xA3AF, /* 0x00 */
     0xA3B0, 0xA3B1, 0xA3B2, 0xA3B3, 0xA3B4, 0xA3B5, 0xA3B6, 0xA3B7, /* 0x10 */
@@ -5393,23 +5393,23 @@ static sal_uInt16 const aImplUniToDBCSTab_KSC5601_FF[] =
     0xA3E0, 0xA3E1, 0xA3E2, 0xA3E3, 0xA3E4, 0xA3E5, 0xA3E6, 0xA3E7, /* 0x40 */
     0xA3E8, 0xA3E9, 0xA3EA, 0xA3EB, 0xA3EC, 0xA3ED, 0xA3EE, 0xA3EF, /* 0x40 */
     0xA3F0, 0xA3F1, 0xA3F2, 0xA3F3, 0xA3F4, 0xA3F5, 0xA3F6, 0xA3F7, /* 0x50 */
-    0xA3F8, 0xA3F9, 0xA3FA, 0xA3FB, 0xA3FC, 0xA3FD, 0xA2A6,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xA1CB, 0xA1CC, 0xA1FE, 0xA3FE,      0, 0xA1CD, 0xA3DC          /* 0xE0 */
+    0xA3F8, 0xA3F9, 0xA3FA, 0xA3FB, 0xA3FC, 0xA3FD, 0xA2A6, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xA1CB, 0xA1CC, 0xA1FE, 0xA3FE, 	 0, 0xA1CD, 0xA3DC			/* 0xE0 */
 };
 
diff --git a/sal/textenc/tcvtkr4.tab b/sal/textenc/tcvtkr4.tab
index 937d9c338d8d..ce365faa0c0d 100644
--- a/sal/textenc/tcvtkr4.tab
+++ b/sal/textenc/tcvtkr4.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,2396 +35,2396 @@
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_84[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0x3133,      0, 0x3135, 0x3136, /* 0x40 */
-         0,      0, 0x313A, 0x313B, 0x313C, 0x313D, 0x313E, 0x313F, /* 0x40 */
-    0x3140,      0,      0,      0, 0x3144,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0x314F,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x3150,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0x3151,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x3152,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x3153                                                  /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0x3133, 	 0, 0x3135, 0x3136, /* 0x40 */
+         0, 	 0, 0x313A, 0x313B, 0x313C, 0x313D, 0x313E, 0x313F, /* 0x40 */
+    0x3140, 	 0, 	 0, 	 0, 0x3144, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x314F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x3150, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x3151, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x3152, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x3153													/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_85[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3154,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0x3155,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x3156,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0x3157,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x3158,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x3159                                                  /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3154, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x3155, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x3156, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x3157, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x3158, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x3159													/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_86[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x315A,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0x315B,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x315C,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0x315D,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0x315E,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x315F                                                  /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x315A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x315B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x315C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x315D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0x315E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x315F													/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_87[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3160,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0x3161,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0x3162,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0x3163                                                  /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3160, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0x3161, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0x3162, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x3163													/* 0xA0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_88[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3131,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3131, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xAC00, 0xAC01, 0xAC02, 0xAC03, 0xAC04, 0xAC05, 0xAC06, /* 0x60 */
     0xAC07, 0xAC08, 0xAC09, 0xAC0A, 0xAC0B, 0xAC0C, 0xAC0D, 0xAC0E, /* 0x60 */
-    0xAC0F, 0xAC10,      0, 0xAC11, 0xAC12, 0xAC13, 0xAC14, 0xAC15, /* 0x70 */
-    0xAC16, 0xAC17, 0xAC18, 0xAC19, 0xAC1A, 0xAC1B,      0,      0, /* 0x70 */
+    0xAC0F, 0xAC10, 	 0, 0xAC11, 0xAC12, 0xAC13, 0xAC14, 0xAC15, /* 0x70 */
+    0xAC16, 0xAC17, 0xAC18, 0xAC19, 0xAC1A, 0xAC1B, 	 0, 	 0, /* 0x70 */
          0, 0xAC1C, 0xAC1D, 0xAC1E, 0xAC1F, 0xAC20, 0xAC21, 0xAC22, /* 0x80 */
     0xAC23, 0xAC24, 0xAC25, 0xAC26, 0xAC27, 0xAC28, 0xAC29, 0xAC2A, /* 0x80 */
-    0xAC2B, 0xAC2C,      0, 0xAC2D, 0xAC2E, 0xAC2F, 0xAC30, 0xAC31, /* 0x90 */
-    0xAC32, 0xAC33, 0xAC34, 0xAC35, 0xAC36, 0xAC37,      0,      0, /* 0x90 */
+    0xAC2B, 0xAC2C, 	 0, 0xAC2D, 0xAC2E, 0xAC2F, 0xAC30, 0xAC31, /* 0x90 */
+    0xAC32, 0xAC33, 0xAC34, 0xAC35, 0xAC36, 0xAC37, 	 0, 	 0, /* 0x90 */
          0, 0xAC38, 0xAC39, 0xAC3A, 0xAC3B, 0xAC3C, 0xAC3D, 0xAC3E, /* 0xA0 */
     0xAC3F, 0xAC40, 0xAC41, 0xAC42, 0xAC43, 0xAC44, 0xAC45, 0xAC46, /* 0xA0 */
-    0xAC47, 0xAC48,      0, 0xAC49, 0xAC4A, 0xAC4B, 0xAC4C, 0xAC4D, /* 0xB0 */
-    0xAC4E, 0xAC4F, 0xAC50, 0xAC51, 0xAC52, 0xAC53,      0,      0, /* 0xB0 */
+    0xAC47, 0xAC48, 	 0, 0xAC49, 0xAC4A, 0xAC4B, 0xAC4C, 0xAC4D, /* 0xB0 */
+    0xAC4E, 0xAC4F, 0xAC50, 0xAC51, 0xAC52, 0xAC53, 	 0, 	 0, /* 0xB0 */
          0, 0xAC54, 0xAC55, 0xAC56, 0xAC57, 0xAC58, 0xAC59, 0xAC5A, /* 0xC0 */
     0xAC5B, 0xAC5C, 0xAC5D, 0xAC5E, 0xAC5F, 0xAC60, 0xAC61, 0xAC62, /* 0xC0 */
-    0xAC63, 0xAC64,      0, 0xAC65, 0xAC66, 0xAC67, 0xAC68, 0xAC69, /* 0xD0 */
-    0xAC6A, 0xAC6B, 0xAC6C, 0xAC6D, 0xAC6E, 0xAC6F,      0,      0, /* 0xD0 */
+    0xAC63, 0xAC64, 	 0, 0xAC65, 0xAC66, 0xAC67, 0xAC68, 0xAC69, /* 0xD0 */
+    0xAC6A, 0xAC6B, 0xAC6C, 0xAC6D, 0xAC6E, 0xAC6F, 	 0, 	 0, /* 0xD0 */
          0, 0xAC70, 0xAC71, 0xAC72, 0xAC73, 0xAC74, 0xAC75, 0xAC76, /* 0xE0 */
     0xAC77, 0xAC78, 0xAC79, 0xAC7A, 0xAC7B, 0xAC7C, 0xAC7D, 0xAC7E, /* 0xE0 */
-    0xAC7F, 0xAC80,      0, 0xAC81, 0xAC82, 0xAC83, 0xAC84, 0xAC85, /* 0xF0 */
-    0xAC86, 0xAC87, 0xAC88, 0xAC89, 0xAC8A, 0xAC8B                  /* 0xF0 */
+    0xAC7F, 0xAC80, 	 0, 0xAC81, 0xAC82, 0xAC83, 0xAC84, 0xAC85, /* 0xF0 */
+    0xAC86, 0xAC87, 0xAC88, 0xAC89, 0xAC8A, 0xAC8B					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_89[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xAC8C, 0xAC8D, 0xAC8E, 0xAC8F, 0xAC90, 0xAC91, 0xAC92, /* 0x40 */
     0xAC93, 0xAC94, 0xAC95, 0xAC96, 0xAC97, 0xAC98, 0xAC99, 0xAC9A, /* 0x40 */
-    0xAC9B, 0xAC9C,      0, 0xAC9D, 0xAC9E, 0xAC9F, 0xACA0, 0xACA1, /* 0x50 */
-    0xACA2, 0xACA3, 0xACA4, 0xACA5, 0xACA6, 0xACA7,      0,      0, /* 0x50 */
+    0xAC9B, 0xAC9C, 	 0, 0xAC9D, 0xAC9E, 0xAC9F, 0xACA0, 0xACA1, /* 0x50 */
+    0xACA2, 0xACA3, 0xACA4, 0xACA5, 0xACA6, 0xACA7, 	 0, 	 0, /* 0x50 */
          0, 0xACA8, 0xACA9, 0xACAA, 0xACAB, 0xACAC, 0xACAD, 0xACAE, /* 0x60 */
     0xACAF, 0xACB0, 0xACB1, 0xACB2, 0xACB3, 0xACB4, 0xACB5, 0xACB6, /* 0x60 */
-    0xACB7, 0xACB8,      0, 0xACB9, 0xACBA, 0xACBB, 0xACBC, 0xACBD, /* 0x70 */
-    0xACBE, 0xACBF, 0xACC0, 0xACC1, 0xACC2, 0xACC3,      0,      0, /* 0x70 */
+    0xACB7, 0xACB8, 	 0, 0xACB9, 0xACBA, 0xACBB, 0xACBC, 0xACBD, /* 0x70 */
+    0xACBE, 0xACBF, 0xACC0, 0xACC1, 0xACC2, 0xACC3, 	 0, 	 0, /* 0x70 */
          0, 0xACC4, 0xACC5, 0xACC6, 0xACC7, 0xACC8, 0xACC9, 0xACCA, /* 0x80 */
     0xACCB, 0xACCC, 0xACCD, 0xACCE, 0xACCF, 0xACD0, 0xACD1, 0xACD2, /* 0x80 */
-    0xACD3, 0xACD4,      0, 0xACD5, 0xACD6, 0xACD7, 0xACD8, 0xACD9, /* 0x90 */
-    0xACDA, 0xACDB, 0xACDC, 0xACDD, 0xACDE, 0xACDF,      0,      0, /* 0x90 */
+    0xACD3, 0xACD4, 	 0, 0xACD5, 0xACD6, 0xACD7, 0xACD8, 0xACD9, /* 0x90 */
+    0xACDA, 0xACDB, 0xACDC, 0xACDD, 0xACDE, 0xACDF, 	 0, 	 0, /* 0x90 */
          0, 0xACE0, 0xACE1, 0xACE2, 0xACE3, 0xACE4, 0xACE5, 0xACE6, /* 0xA0 */
     0xACE7, 0xACE8, 0xACE9, 0xACEA, 0xACEB, 0xACEC, 0xACED, 0xACEE, /* 0xA0 */
-    0xACEF, 0xACF0,      0, 0xACF1, 0xACF2, 0xACF3, 0xACF4, 0xACF5, /* 0xB0 */
-    0xACF6, 0xACF7, 0xACF8, 0xACF9, 0xACFA, 0xACFB,      0,      0, /* 0xB0 */
+    0xACEF, 0xACF0, 	 0, 0xACF1, 0xACF2, 0xACF3, 0xACF4, 0xACF5, /* 0xB0 */
+    0xACF6, 0xACF7, 0xACF8, 0xACF9, 0xACFA, 0xACFB, 	 0, 	 0, /* 0xB0 */
          0, 0xACFC, 0xACFD, 0xACFE, 0xACFF, 0xAD00, 0xAD01, 0xAD02, /* 0xC0 */
     0xAD03, 0xAD04, 0xAD05, 0xAD06, 0xAD07, 0xAD08, 0xAD09, 0xAD0A, /* 0xC0 */
-    0xAD0B, 0xAD0C,      0, 0xAD0D, 0xAD0E, 0xAD0F, 0xAD10, 0xAD11, /* 0xD0 */
-    0xAD12, 0xAD13, 0xAD14, 0xAD15, 0xAD16, 0xAD17,      0,      0, /* 0xD0 */
+    0xAD0B, 0xAD0C, 	 0, 0xAD0D, 0xAD0E, 0xAD0F, 0xAD10, 0xAD11, /* 0xD0 */
+    0xAD12, 0xAD13, 0xAD14, 0xAD15, 0xAD16, 0xAD17, 	 0, 	 0, /* 0xD0 */
          0, 0xAD18, 0xAD19, 0xAD1A, 0xAD1B, 0xAD1C, 0xAD1D, 0xAD1E, /* 0xE0 */
     0xAD1F, 0xAD20, 0xAD21, 0xAD22, 0xAD23, 0xAD24, 0xAD25, 0xAD26, /* 0xE0 */
-    0xAD27, 0xAD28,      0, 0xAD29, 0xAD2A, 0xAD2B, 0xAD2C, 0xAD2D, /* 0xF0 */
-    0xAD2E, 0xAD2F, 0xAD30, 0xAD31, 0xAD32, 0xAD33                  /* 0xF0 */
+    0xAD27, 0xAD28, 	 0, 0xAD29, 0xAD2A, 0xAD2B, 0xAD2C, 0xAD2D, /* 0xF0 */
+    0xAD2E, 0xAD2F, 0xAD30, 0xAD31, 0xAD32, 0xAD33					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_8A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xAD34, 0xAD35, 0xAD36, 0xAD37, 0xAD38, 0xAD39, 0xAD3A, /* 0x40 */
     0xAD3B, 0xAD3C, 0xAD3D, 0xAD3E, 0xAD3F, 0xAD40, 0xAD41, 0xAD42, /* 0x40 */
-    0xAD43, 0xAD44,      0, 0xAD45, 0xAD46, 0xAD47, 0xAD48, 0xAD49, /* 0x50 */
-    0xAD4A, 0xAD4B, 0xAD4C, 0xAD4D, 0xAD4E, 0xAD4F,      0,      0, /* 0x50 */
+    0xAD43, 0xAD44, 	 0, 0xAD45, 0xAD46, 0xAD47, 0xAD48, 0xAD49, /* 0x50 */
+    0xAD4A, 0xAD4B, 0xAD4C, 0xAD4D, 0xAD4E, 0xAD4F, 	 0, 	 0, /* 0x50 */
          0, 0xAD50, 0xAD51, 0xAD52, 0xAD53, 0xAD54, 0xAD55, 0xAD56, /* 0x60 */
     0xAD57, 0xAD58, 0xAD59, 0xAD5A, 0xAD5B, 0xAD5C, 0xAD5D, 0xAD5E, /* 0x60 */
-    0xAD5F, 0xAD60,      0, 0xAD61, 0xAD62, 0xAD63, 0xAD64, 0xAD65, /* 0x70 */
-    0xAD66, 0xAD67, 0xAD68, 0xAD69, 0xAD6A, 0xAD6B,      0,      0, /* 0x70 */
+    0xAD5F, 0xAD60, 	 0, 0xAD61, 0xAD62, 0xAD63, 0xAD64, 0xAD65, /* 0x70 */
+    0xAD66, 0xAD67, 0xAD68, 0xAD69, 0xAD6A, 0xAD6B, 	 0, 	 0, /* 0x70 */
          0, 0xAD6C, 0xAD6D, 0xAD6E, 0xAD6F, 0xAD70, 0xAD71, 0xAD72, /* 0x80 */
     0xAD73, 0xAD74, 0xAD75, 0xAD76, 0xAD77, 0xAD78, 0xAD79, 0xAD7A, /* 0x80 */
-    0xAD7B, 0xAD7C,      0, 0xAD7D, 0xAD7E, 0xAD7F, 0xAD80, 0xAD81, /* 0x90 */
-    0xAD82, 0xAD83, 0xAD84, 0xAD85, 0xAD86, 0xAD87,      0,      0, /* 0x90 */
+    0xAD7B, 0xAD7C, 	 0, 0xAD7D, 0xAD7E, 0xAD7F, 0xAD80, 0xAD81, /* 0x90 */
+    0xAD82, 0xAD83, 0xAD84, 0xAD85, 0xAD86, 0xAD87, 	 0, 	 0, /* 0x90 */
          0, 0xAD88, 0xAD89, 0xAD8A, 0xAD8B, 0xAD8C, 0xAD8D, 0xAD8E, /* 0xA0 */
     0xAD8F, 0xAD90, 0xAD91, 0xAD92, 0xAD93, 0xAD94, 0xAD95, 0xAD96, /* 0xA0 */
-    0xAD97, 0xAD98,      0, 0xAD99, 0xAD9A, 0xAD9B, 0xAD9C, 0xAD9D, /* 0xB0 */
-    0xAD9E, 0xAD9F, 0xADA0, 0xADA1, 0xADA2, 0xADA3,      0,      0, /* 0xB0 */
+    0xAD97, 0xAD98, 	 0, 0xAD99, 0xAD9A, 0xAD9B, 0xAD9C, 0xAD9D, /* 0xB0 */
+    0xAD9E, 0xAD9F, 0xADA0, 0xADA1, 0xADA2, 0xADA3, 	 0, 	 0, /* 0xB0 */
          0, 0xADA4, 0xADA5, 0xADA6, 0xADA7, 0xADA8, 0xADA9, 0xADAA, /* 0xC0 */
     0xADAB, 0xADAC, 0xADAD, 0xADAE, 0xADAF, 0xADB0, 0xADB1, 0xADB2, /* 0xC0 */
-    0xADB3, 0xADB4,      0, 0xADB5, 0xADB6, 0xADB7, 0xADB8, 0xADB9, /* 0xD0 */
-    0xADBA, 0xADBB, 0xADBC, 0xADBD, 0xADBE, 0xADBF,      0,      0, /* 0xD0 */
+    0xADB3, 0xADB4, 	 0, 0xADB5, 0xADB6, 0xADB7, 0xADB8, 0xADB9, /* 0xD0 */
+    0xADBA, 0xADBB, 0xADBC, 0xADBD, 0xADBE, 0xADBF, 	 0, 	 0, /* 0xD0 */
          0, 0xADC0, 0xADC1, 0xADC2, 0xADC3, 0xADC4, 0xADC5, 0xADC6, /* 0xE0 */
     0xADC7, 0xADC8, 0xADC9, 0xADCA, 0xADCB, 0xADCC, 0xADCD, 0xADCE, /* 0xE0 */
-    0xADCF, 0xADD0,      0, 0xADD1, 0xADD2, 0xADD3, 0xADD4, 0xADD5, /* 0xF0 */
-    0xADD6, 0xADD7, 0xADD8, 0xADD9, 0xADDA, 0xADDB                  /* 0xF0 */
+    0xADCF, 0xADD0, 	 0, 0xADD1, 0xADD2, 0xADD3, 0xADD4, 0xADD5, /* 0xF0 */
+    0xADD6, 0xADD7, 0xADD8, 0xADD9, 0xADDA, 0xADDB					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_8B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xADDC, 0xADDD, 0xADDE, 0xADDF, 0xADE0, 0xADE1, 0xADE2, /* 0x40 */
     0xADE3, 0xADE4, 0xADE5, 0xADE6, 0xADE7, 0xADE8, 0xADE9, 0xADEA, /* 0x40 */
-    0xADEB, 0xADEC,      0, 0xADED, 0xADEE, 0xADEF, 0xADF0, 0xADF1, /* 0x50 */
-    0xADF2, 0xADF3, 0xADF4, 0xADF5, 0xADF6, 0xADF7,      0,      0, /* 0x50 */
+    0xADEB, 0xADEC, 	 0, 0xADED, 0xADEE, 0xADEF, 0xADF0, 0xADF1, /* 0x50 */
+    0xADF2, 0xADF3, 0xADF4, 0xADF5, 0xADF6, 0xADF7, 	 0, 	 0, /* 0x50 */
          0, 0xADF8, 0xADF9, 0xADFA, 0xADFB, 0xADFC, 0xADFD, 0xADFE, /* 0x60 */
     0xADFF, 0xAE00, 0xAE01, 0xAE02, 0xAE03, 0xAE04, 0xAE05, 0xAE06, /* 0x60 */
-    0xAE07, 0xAE08,      0, 0xAE09, 0xAE0A, 0xAE0B, 0xAE0C, 0xAE0D, /* 0x70 */
-    0xAE0E, 0xAE0F, 0xAE10, 0xAE11, 0xAE12, 0xAE13,      0,      0, /* 0x70 */
+    0xAE07, 0xAE08, 	 0, 0xAE09, 0xAE0A, 0xAE0B, 0xAE0C, 0xAE0D, /* 0x70 */
+    0xAE0E, 0xAE0F, 0xAE10, 0xAE11, 0xAE12, 0xAE13, 	 0, 	 0, /* 0x70 */
          0, 0xAE14, 0xAE15, 0xAE16, 0xAE17, 0xAE18, 0xAE19, 0xAE1A, /* 0x80 */
     0xAE1B, 0xAE1C, 0xAE1D, 0xAE1E, 0xAE1F, 0xAE20, 0xAE21, 0xAE22, /* 0x80 */
-    0xAE23, 0xAE24,      0, 0xAE25, 0xAE26, 0xAE27, 0xAE28, 0xAE29, /* 0x90 */
-    0xAE2A, 0xAE2B, 0xAE2C, 0xAE2D, 0xAE2E, 0xAE2F,      0,      0, /* 0x90 */
+    0xAE23, 0xAE24, 	 0, 0xAE25, 0xAE26, 0xAE27, 0xAE28, 0xAE29, /* 0x90 */
+    0xAE2A, 0xAE2B, 0xAE2C, 0xAE2D, 0xAE2E, 0xAE2F, 	 0, 	 0, /* 0x90 */
          0, 0xAE30, 0xAE31, 0xAE32, 0xAE33, 0xAE34, 0xAE35, 0xAE36, /* 0xA0 */
     0xAE37, 0xAE38, 0xAE39, 0xAE3A, 0xAE3B, 0xAE3C, 0xAE3D, 0xAE3E, /* 0xA0 */
-    0xAE3F, 0xAE40,      0, 0xAE41, 0xAE42, 0xAE43, 0xAE44, 0xAE45, /* 0xB0 */
-    0xAE46, 0xAE47, 0xAE48, 0xAE49, 0xAE4A, 0xAE4B                  /* 0xB0 */
+    0xAE3F, 0xAE40, 	 0, 0xAE41, 0xAE42, 0xAE43, 0xAE44, 0xAE45, /* 0xB0 */
+    0xAE46, 0xAE47, 0xAE48, 0xAE49, 0xAE4A, 0xAE4B					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_8C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3132,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3132, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xAE4C, 0xAE4D, 0xAE4E, 0xAE4F, 0xAE50, 0xAE51, 0xAE52, /* 0x60 */
     0xAE53, 0xAE54, 0xAE55, 0xAE56, 0xAE57, 0xAE58, 0xAE59, 0xAE5A, /* 0x60 */
-    0xAE5B, 0xAE5C,      0, 0xAE5D, 0xAE5E, 0xAE5F, 0xAE60, 0xAE61, /* 0x70 */
-    0xAE62, 0xAE63, 0xAE64, 0xAE65, 0xAE66, 0xAE67,      0,      0, /* 0x70 */
+    0xAE5B, 0xAE5C, 	 0, 0xAE5D, 0xAE5E, 0xAE5F, 0xAE60, 0xAE61, /* 0x70 */
+    0xAE62, 0xAE63, 0xAE64, 0xAE65, 0xAE66, 0xAE67, 	 0, 	 0, /* 0x70 */
          0, 0xAE68, 0xAE69, 0xAE6A, 0xAE6B, 0xAE6C, 0xAE6D, 0xAE6E, /* 0x80 */
     0xAE6F, 0xAE70, 0xAE71, 0xAE72, 0xAE73, 0xAE74, 0xAE75, 0xAE76, /* 0x80 */
-    0xAE77, 0xAE78,      0, 0xAE79, 0xAE7A, 0xAE7B, 0xAE7C, 0xAE7D, /* 0x90 */
-    0xAE7E, 0xAE7F, 0xAE80, 0xAE81, 0xAE82, 0xAE83,      0,      0, /* 0x90 */
+    0xAE77, 0xAE78, 	 0, 0xAE79, 0xAE7A, 0xAE7B, 0xAE7C, 0xAE7D, /* 0x90 */
+    0xAE7E, 0xAE7F, 0xAE80, 0xAE81, 0xAE82, 0xAE83, 	 0, 	 0, /* 0x90 */
          0, 0xAE84, 0xAE85, 0xAE86, 0xAE87, 0xAE88, 0xAE89, 0xAE8A, /* 0xA0 */
     0xAE8B, 0xAE8C, 0xAE8D, 0xAE8E, 0xAE8F, 0xAE90, 0xAE91, 0xAE92, /* 0xA0 */
-    0xAE93, 0xAE94,      0, 0xAE95, 0xAE96, 0xAE97, 0xAE98, 0xAE99, /* 0xB0 */
-    0xAE9A, 0xAE9B, 0xAE9C, 0xAE9D, 0xAE9E, 0xAE9F,      0,      0, /* 0xB0 */
+    0xAE93, 0xAE94, 	 0, 0xAE95, 0xAE96, 0xAE97, 0xAE98, 0xAE99, /* 0xB0 */
+    0xAE9A, 0xAE9B, 0xAE9C, 0xAE9D, 0xAE9E, 0xAE9F, 	 0, 	 0, /* 0xB0 */
          0, 0xAEA0, 0xAEA1, 0xAEA2, 0xAEA3, 0xAEA4, 0xAEA5, 0xAEA6, /* 0xC0 */
     0xAEA7, 0xAEA8, 0xAEA9, 0xAEAA, 0xAEAB, 0xAEAC, 0xAEAD, 0xAEAE, /* 0xC0 */
-    0xAEAF, 0xAEB0,      0, 0xAEB1, 0xAEB2, 0xAEB3, 0xAEB4, 0xAEB5, /* 0xD0 */
-    0xAEB6, 0xAEB7, 0xAEB8, 0xAEB9, 0xAEBA, 0xAEBB,      0,      0, /* 0xD0 */
+    0xAEAF, 0xAEB0, 	 0, 0xAEB1, 0xAEB2, 0xAEB3, 0xAEB4, 0xAEB5, /* 0xD0 */
+    0xAEB6, 0xAEB7, 0xAEB8, 0xAEB9, 0xAEBA, 0xAEBB, 	 0, 	 0, /* 0xD0 */
          0, 0xAEBC, 0xAEBD, 0xAEBE, 0xAEBF, 0xAEC0, 0xAEC1, 0xAEC2, /* 0xE0 */
     0xAEC3, 0xAEC4, 0xAEC5, 0xAEC6, 0xAEC7, 0xAEC8, 0xAEC9, 0xAECA, /* 0xE0 */
-    0xAECB, 0xAECC,      0, 0xAECD, 0xAECE, 0xAECF, 0xAED0, 0xAED1, /* 0xF0 */
-    0xAED2, 0xAED3, 0xAED4, 0xAED5, 0xAED6, 0xAED7                  /* 0xF0 */
+    0xAECB, 0xAECC, 	 0, 0xAECD, 0xAECE, 0xAECF, 0xAED0, 0xAED1, /* 0xF0 */
+    0xAED2, 0xAED3, 0xAED4, 0xAED5, 0xAED6, 0xAED7					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_8D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xAED8, 0xAED9, 0xAEDA, 0xAEDB, 0xAEDC, 0xAEDD, 0xAEDE, /* 0x40 */
     0xAEDF, 0xAEE0, 0xAEE1, 0xAEE2, 0xAEE3, 0xAEE4, 0xAEE5, 0xAEE6, /* 0x40 */
-    0xAEE7, 0xAEE8,      0, 0xAEE9, 0xAEEA, 0xAEEB, 0xAEEC, 0xAEED, /* 0x50 */
-    0xAEEE, 0xAEEF, 0xAEF0, 0xAEF1, 0xAEF2, 0xAEF3,      0,      0, /* 0x50 */
+    0xAEE7, 0xAEE8, 	 0, 0xAEE9, 0xAEEA, 0xAEEB, 0xAEEC, 0xAEED, /* 0x50 */
+    0xAEEE, 0xAEEF, 0xAEF0, 0xAEF1, 0xAEF2, 0xAEF3, 	 0, 	 0, /* 0x50 */
          0, 0xAEF4, 0xAEF5, 0xAEF6, 0xAEF7, 0xAEF8, 0xAEF9, 0xAEFA, /* 0x60 */
     0xAEFB, 0xAEFC, 0xAEFD, 0xAEFE, 0xAEFF, 0xAF00, 0xAF01, 0xAF02, /* 0x60 */
-    0xAF03, 0xAF04,      0, 0xAF05, 0xAF06, 0xAF07, 0xAF08, 0xAF09, /* 0x70 */
-    0xAF0A, 0xAF0B, 0xAF0C, 0xAF0D, 0xAF0E, 0xAF0F,      0,      0, /* 0x70 */
+    0xAF03, 0xAF04, 	 0, 0xAF05, 0xAF06, 0xAF07, 0xAF08, 0xAF09, /* 0x70 */
+    0xAF0A, 0xAF0B, 0xAF0C, 0xAF0D, 0xAF0E, 0xAF0F, 	 0, 	 0, /* 0x70 */
          0, 0xAF10, 0xAF11, 0xAF12, 0xAF13, 0xAF14, 0xAF15, 0xAF16, /* 0x80 */
     0xAF17, 0xAF18, 0xAF19, 0xAF1A, 0xAF1B, 0xAF1C, 0xAF1D, 0xAF1E, /* 0x80 */
-    0xAF1F, 0xAF20,      0, 0xAF21, 0xAF22, 0xAF23, 0xAF24, 0xAF25, /* 0x90 */
-    0xAF26, 0xAF27, 0xAF28, 0xAF29, 0xAF2A, 0xAF2B,      0,      0, /* 0x90 */
+    0xAF1F, 0xAF20, 	 0, 0xAF21, 0xAF22, 0xAF23, 0xAF24, 0xAF25, /* 0x90 */
+    0xAF26, 0xAF27, 0xAF28, 0xAF29, 0xAF2A, 0xAF2B, 	 0, 	 0, /* 0x90 */
          0, 0xAF2C, 0xAF2D, 0xAF2E, 0xAF2F, 0xAF30, 0xAF31, 0xAF32, /* 0xA0 */
     0xAF33, 0xAF34, 0xAF35, 0xAF36, 0xAF37, 0xAF38, 0xAF39, 0xAF3A, /* 0xA0 */
-    0xAF3B, 0xAF3C,      0, 0xAF3D, 0xAF3E, 0xAF3F, 0xAF40, 0xAF41, /* 0xB0 */
-    0xAF42, 0xAF43, 0xAF44, 0xAF45, 0xAF46, 0xAF47,      0,      0, /* 0xB0 */
+    0xAF3B, 0xAF3C, 	 0, 0xAF3D, 0xAF3E, 0xAF3F, 0xAF40, 0xAF41, /* 0xB0 */
+    0xAF42, 0xAF43, 0xAF44, 0xAF45, 0xAF46, 0xAF47, 	 0, 	 0, /* 0xB0 */
          0, 0xAF48, 0xAF49, 0xAF4A, 0xAF4B, 0xAF4C, 0xAF4D, 0xAF4E, /* 0xC0 */
     0xAF4F, 0xAF50, 0xAF51, 0xAF52, 0xAF53, 0xAF54, 0xAF55, 0xAF56, /* 0xC0 */
-    0xAF57, 0xAF58,      0, 0xAF59, 0xAF5A, 0xAF5B, 0xAF5C, 0xAF5D, /* 0xD0 */
-    0xAF5E, 0xAF5F, 0xAF60, 0xAF61, 0xAF62, 0xAF63,      0,      0, /* 0xD0 */
+    0xAF57, 0xAF58, 	 0, 0xAF59, 0xAF5A, 0xAF5B, 0xAF5C, 0xAF5D, /* 0xD0 */
+    0xAF5E, 0xAF5F, 0xAF60, 0xAF61, 0xAF62, 0xAF63, 	 0, 	 0, /* 0xD0 */
          0, 0xAF64, 0xAF65, 0xAF66, 0xAF67, 0xAF68, 0xAF69, 0xAF6A, /* 0xE0 */
     0xAF6B, 0xAF6C, 0xAF6D, 0xAF6E, 0xAF6F, 0xAF70, 0xAF71, 0xAF72, /* 0xE0 */
-    0xAF73, 0xAF74,      0, 0xAF75, 0xAF76, 0xAF77, 0xAF78, 0xAF79, /* 0xF0 */
-    0xAF7A, 0xAF7B, 0xAF7C, 0xAF7D, 0xAF7E, 0xAF7F                  /* 0xF0 */
+    0xAF73, 0xAF74, 	 0, 0xAF75, 0xAF76, 0xAF77, 0xAF78, 0xAF79, /* 0xF0 */
+    0xAF7A, 0xAF7B, 0xAF7C, 0xAF7D, 0xAF7E, 0xAF7F					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_8E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xAF80, 0xAF81, 0xAF82, 0xAF83, 0xAF84, 0xAF85, 0xAF86, /* 0x40 */
     0xAF87, 0xAF88, 0xAF89, 0xAF8A, 0xAF8B, 0xAF8C, 0xAF8D, 0xAF8E, /* 0x40 */
-    0xAF8F, 0xAF90,      0, 0xAF91, 0xAF92, 0xAF93, 0xAF94, 0xAF95, /* 0x50 */
-    0xAF96, 0xAF97, 0xAF98, 0xAF99, 0xAF9A, 0xAF9B,      0,      0, /* 0x50 */
+    0xAF8F, 0xAF90, 	 0, 0xAF91, 0xAF92, 0xAF93, 0xAF94, 0xAF95, /* 0x50 */
+    0xAF96, 0xAF97, 0xAF98, 0xAF99, 0xAF9A, 0xAF9B, 	 0, 	 0, /* 0x50 */
          0, 0xAF9C, 0xAF9D, 0xAF9E, 0xAF9F, 0xAFA0, 0xAFA1, 0xAFA2, /* 0x60 */
     0xAFA3, 0xAFA4, 0xAFA5, 0xAFA6, 0xAFA7, 0xAFA8, 0xAFA9, 0xAFAA, /* 0x60 */
-    0xAFAB, 0xAFAC,      0, 0xAFAD, 0xAFAE, 0xAFAF, 0xAFB0, 0xAFB1, /* 0x70 */
-    0xAFB2, 0xAFB3, 0xAFB4, 0xAFB5, 0xAFB6, 0xAFB7,      0,      0, /* 0x70 */
+    0xAFAB, 0xAFAC, 	 0, 0xAFAD, 0xAFAE, 0xAFAF, 0xAFB0, 0xAFB1, /* 0x70 */
+    0xAFB2, 0xAFB3, 0xAFB4, 0xAFB5, 0xAFB6, 0xAFB7, 	 0, 	 0, /* 0x70 */
          0, 0xAFB8, 0xAFB9, 0xAFBA, 0xAFBB, 0xAFBC, 0xAFBD, 0xAFBE, /* 0x80 */
     0xAFBF, 0xAFC0, 0xAFC1, 0xAFC2, 0xAFC3, 0xAFC4, 0xAFC5, 0xAFC6, /* 0x80 */
-    0xAFC7, 0xAFC8,      0, 0xAFC9, 0xAFCA, 0xAFCB, 0xAFCC, 0xAFCD, /* 0x90 */
-    0xAFCE, 0xAFCF, 0xAFD0, 0xAFD1, 0xAFD2, 0xAFD3,      0,      0, /* 0x90 */
+    0xAFC7, 0xAFC8, 	 0, 0xAFC9, 0xAFCA, 0xAFCB, 0xAFCC, 0xAFCD, /* 0x90 */
+    0xAFCE, 0xAFCF, 0xAFD0, 0xAFD1, 0xAFD2, 0xAFD3, 	 0, 	 0, /* 0x90 */
          0, 0xAFD4, 0xAFD5, 0xAFD6, 0xAFD7, 0xAFD8, 0xAFD9, 0xAFDA, /* 0xA0 */
     0xAFDB, 0xAFDC, 0xAFDD, 0xAFDE, 0xAFDF, 0xAFE0, 0xAFE1, 0xAFE2, /* 0xA0 */
-    0xAFE3, 0xAFE4,      0, 0xAFE5, 0xAFE6, 0xAFE7, 0xAFE8, 0xAFE9, /* 0xB0 */
-    0xAFEA, 0xAFEB, 0xAFEC, 0xAFED, 0xAFEE, 0xAFEF,      0,      0, /* 0xB0 */
+    0xAFE3, 0xAFE4, 	 0, 0xAFE5, 0xAFE6, 0xAFE7, 0xAFE8, 0xAFE9, /* 0xB0 */
+    0xAFEA, 0xAFEB, 0xAFEC, 0xAFED, 0xAFEE, 0xAFEF, 	 0, 	 0, /* 0xB0 */
          0, 0xAFF0, 0xAFF1, 0xAFF2, 0xAFF3, 0xAFF4, 0xAFF5, 0xAFF6, /* 0xC0 */
     0xAFF7, 0xAFF8, 0xAFF9, 0xAFFA, 0xAFFB, 0xAFFC, 0xAFFD, 0xAFFE, /* 0xC0 */
-    0xAFFF, 0xB000,      0, 0xB001, 0xB002, 0xB003, 0xB004, 0xB005, /* 0xD0 */
-    0xB006, 0xB007, 0xB008, 0xB009, 0xB00A, 0xB00B,      0,      0, /* 0xD0 */
+    0xAFFF, 0xB000, 	 0, 0xB001, 0xB002, 0xB003, 0xB004, 0xB005, /* 0xD0 */
+    0xB006, 0xB007, 0xB008, 0xB009, 0xB00A, 0xB00B, 	 0, 	 0, /* 0xD0 */
          0, 0xB00C, 0xB00D, 0xB00E, 0xB00F, 0xB010, 0xB011, 0xB012, /* 0xE0 */
     0xB013, 0xB014, 0xB015, 0xB016, 0xB017, 0xB018, 0xB019, 0xB01A, /* 0xE0 */
-    0xB01B, 0xB01C,      0, 0xB01D, 0xB01E, 0xB01F, 0xB020, 0xB021, /* 0xF0 */
-    0xB022, 0xB023, 0xB024, 0xB025, 0xB026, 0xB027                  /* 0xF0 */
+    0xB01B, 0xB01C, 	 0, 0xB01D, 0xB01E, 0xB01F, 0xB020, 0xB021, /* 0xF0 */
+    0xB022, 0xB023, 0xB024, 0xB025, 0xB026, 0xB027					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_8F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB028, 0xB029, 0xB02A, 0xB02B, 0xB02C, 0xB02D, 0xB02E, /* 0x40 */
     0xB02F, 0xB030, 0xB031, 0xB032, 0xB033, 0xB034, 0xB035, 0xB036, /* 0x40 */
-    0xB037, 0xB038,      0, 0xB039, 0xB03A, 0xB03B, 0xB03C, 0xB03D, /* 0x50 */
-    0xB03E, 0xB03F, 0xB040, 0xB041, 0xB042, 0xB043,      0,      0, /* 0x50 */
+    0xB037, 0xB038, 	 0, 0xB039, 0xB03A, 0xB03B, 0xB03C, 0xB03D, /* 0x50 */
+    0xB03E, 0xB03F, 0xB040, 0xB041, 0xB042, 0xB043, 	 0, 	 0, /* 0x50 */
          0, 0xB044, 0xB045, 0xB046, 0xB047, 0xB048, 0xB049, 0xB04A, /* 0x60 */
     0xB04B, 0xB04C, 0xB04D, 0xB04E, 0xB04F, 0xB050, 0xB051, 0xB052, /* 0x60 */
-    0xB053, 0xB054,      0, 0xB055, 0xB056, 0xB057, 0xB058, 0xB059, /* 0x70 */
-    0xB05A, 0xB05B, 0xB05C, 0xB05D, 0xB05E, 0xB05F,      0,      0, /* 0x70 */
+    0xB053, 0xB054, 	 0, 0xB055, 0xB056, 0xB057, 0xB058, 0xB059, /* 0x70 */
+    0xB05A, 0xB05B, 0xB05C, 0xB05D, 0xB05E, 0xB05F, 	 0, 	 0, /* 0x70 */
          0, 0xB060, 0xB061, 0xB062, 0xB063, 0xB064, 0xB065, 0xB066, /* 0x80 */
     0xB067, 0xB068, 0xB069, 0xB06A, 0xB06B, 0xB06C, 0xB06D, 0xB06E, /* 0x80 */
-    0xB06F, 0xB070,      0, 0xB071, 0xB072, 0xB073, 0xB074, 0xB075, /* 0x90 */
-    0xB076, 0xB077, 0xB078, 0xB079, 0xB07A, 0xB07B,      0,      0, /* 0x90 */
+    0xB06F, 0xB070, 	 0, 0xB071, 0xB072, 0xB073, 0xB074, 0xB075, /* 0x90 */
+    0xB076, 0xB077, 0xB078, 0xB079, 0xB07A, 0xB07B, 	 0, 	 0, /* 0x90 */
          0, 0xB07C, 0xB07D, 0xB07E, 0xB07F, 0xB080, 0xB081, 0xB082, /* 0xA0 */
     0xB083, 0xB084, 0xB085, 0xB086, 0xB087, 0xB088, 0xB089, 0xB08A, /* 0xA0 */
-    0xB08B, 0xB08C,      0, 0xB08D, 0xB08E, 0xB08F, 0xB090, 0xB091, /* 0xB0 */
-    0xB092, 0xB093, 0xB094, 0xB095, 0xB096, 0xB097                  /* 0xB0 */
+    0xB08B, 0xB08C, 	 0, 0xB08D, 0xB08E, 0xB08F, 0xB090, 0xB091, /* 0xB0 */
+    0xB092, 0xB093, 0xB094, 0xB095, 0xB096, 0xB097					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_90[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3134,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3134, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xB098, 0xB099, 0xB09A, 0xB09B, 0xB09C, 0xB09D, 0xB09E, /* 0x60 */
     0xB09F, 0xB0A0, 0xB0A1, 0xB0A2, 0xB0A3, 0xB0A4, 0xB0A5, 0xB0A6, /* 0x60 */
-    0xB0A7, 0xB0A8,      0, 0xB0A9, 0xB0AA, 0xB0AB, 0xB0AC, 0xB0AD, /* 0x70 */
-    0xB0AE, 0xB0AF, 0xB0B0, 0xB0B1, 0xB0B2, 0xB0B3,      0,      0, /* 0x70 */
+    0xB0A7, 0xB0A8, 	 0, 0xB0A9, 0xB0AA, 0xB0AB, 0xB0AC, 0xB0AD, /* 0x70 */
+    0xB0AE, 0xB0AF, 0xB0B0, 0xB0B1, 0xB0B2, 0xB0B3, 	 0, 	 0, /* 0x70 */
          0, 0xB0B4, 0xB0B5, 0xB0B6, 0xB0B7, 0xB0B8, 0xB0B9, 0xB0BA, /* 0x80 */
     0xB0BB, 0xB0BC, 0xB0BD, 0xB0BE, 0xB0BF, 0xB0C0, 0xB0C1, 0xB0C2, /* 0x80 */
-    0xB0C3, 0xB0C4,      0, 0xB0C5, 0xB0C6, 0xB0C7, 0xB0C8, 0xB0C9, /* 0x90 */
-    0xB0CA, 0xB0CB, 0xB0CC, 0xB0CD, 0xB0CE, 0xB0CF,      0,      0, /* 0x90 */
+    0xB0C3, 0xB0C4, 	 0, 0xB0C5, 0xB0C6, 0xB0C7, 0xB0C8, 0xB0C9, /* 0x90 */
+    0xB0CA, 0xB0CB, 0xB0CC, 0xB0CD, 0xB0CE, 0xB0CF, 	 0, 	 0, /* 0x90 */
          0, 0xB0D0, 0xB0D1, 0xB0D2, 0xB0D3, 0xB0D4, 0xB0D5, 0xB0D6, /* 0xA0 */
     0xB0D7, 0xB0D8, 0xB0D9, 0xB0DA, 0xB0DB, 0xB0DC, 0xB0DD, 0xB0DE, /* 0xA0 */
-    0xB0DF, 0xB0E0,      0, 0xB0E1, 0xB0E2, 0xB0E3, 0xB0E4, 0xB0E5, /* 0xB0 */
-    0xB0E6, 0xB0E7, 0xB0E8, 0xB0E9, 0xB0EA, 0xB0EB,      0,      0, /* 0xB0 */
+    0xB0DF, 0xB0E0, 	 0, 0xB0E1, 0xB0E2, 0xB0E3, 0xB0E4, 0xB0E5, /* 0xB0 */
+    0xB0E6, 0xB0E7, 0xB0E8, 0xB0E9, 0xB0EA, 0xB0EB, 	 0, 	 0, /* 0xB0 */
          0, 0xB0EC, 0xB0ED, 0xB0EE, 0xB0EF, 0xB0F0, 0xB0F1, 0xB0F2, /* 0xC0 */
     0xB0F3, 0xB0F4, 0xB0F5, 0xB0F6, 0xB0F7, 0xB0F8, 0xB0F9, 0xB0FA, /* 0xC0 */
-    0xB0FB, 0xB0FC,      0, 0xB0FD, 0xB0FE, 0xB0FF, 0xB100, 0xB101, /* 0xD0 */
-    0xB102, 0xB103, 0xB104, 0xB105, 0xB106, 0xB107,      0,      0, /* 0xD0 */
+    0xB0FB, 0xB0FC, 	 0, 0xB0FD, 0xB0FE, 0xB0FF, 0xB100, 0xB101, /* 0xD0 */
+    0xB102, 0xB103, 0xB104, 0xB105, 0xB106, 0xB107, 	 0, 	 0, /* 0xD0 */
          0, 0xB108, 0xB109, 0xB10A, 0xB10B, 0xB10C, 0xB10D, 0xB10E, /* 0xE0 */
     0xB10F, 0xB110, 0xB111, 0xB112, 0xB113, 0xB114, 0xB115, 0xB116, /* 0xE0 */
-    0xB117, 0xB118,      0, 0xB119, 0xB11A, 0xB11B, 0xB11C, 0xB11D, /* 0xF0 */
-    0xB11E, 0xB11F, 0xB120, 0xB121, 0xB122, 0xB123                  /* 0xF0 */
+    0xB117, 0xB118, 	 0, 0xB119, 0xB11A, 0xB11B, 0xB11C, 0xB11D, /* 0xF0 */
+    0xB11E, 0xB11F, 0xB120, 0xB121, 0xB122, 0xB123					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_91[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB124, 0xB125, 0xB126, 0xB127, 0xB128, 0xB129, 0xB12A, /* 0x40 */
     0xB12B, 0xB12C, 0xB12D, 0xB12E, 0xB12F, 0xB130, 0xB131, 0xB132, /* 0x40 */
-    0xB133, 0xB134,      0, 0xB135, 0xB136, 0xB137, 0xB138, 0xB139, /* 0x50 */
-    0xB13A, 0xB13B, 0xB13C, 0xB13D, 0xB13E, 0xB13F,      0,      0, /* 0x50 */
+    0xB133, 0xB134, 	 0, 0xB135, 0xB136, 0xB137, 0xB138, 0xB139, /* 0x50 */
+    0xB13A, 0xB13B, 0xB13C, 0xB13D, 0xB13E, 0xB13F, 	 0, 	 0, /* 0x50 */
          0, 0xB140, 0xB141, 0xB142, 0xB143, 0xB144, 0xB145, 0xB146, /* 0x60 */
     0xB147, 0xB148, 0xB149, 0xB14A, 0xB14B, 0xB14C, 0xB14D, 0xB14E, /* 0x60 */
-    0xB14F, 0xB150,      0, 0xB151, 0xB152, 0xB153, 0xB154, 0xB155, /* 0x70 */
-    0xB156, 0xB157, 0xB158, 0xB159, 0xB15A, 0xB15B,      0,      0, /* 0x70 */
+    0xB14F, 0xB150, 	 0, 0xB151, 0xB152, 0xB153, 0xB154, 0xB155, /* 0x70 */
+    0xB156, 0xB157, 0xB158, 0xB159, 0xB15A, 0xB15B, 	 0, 	 0, /* 0x70 */
          0, 0xB15C, 0xB15D, 0xB15E, 0xB15F, 0xB160, 0xB161, 0xB162, /* 0x80 */
     0xB163, 0xB164, 0xB165, 0xB166, 0xB167, 0xB168, 0xB169, 0xB16A, /* 0x80 */
-    0xB16B, 0xB16C,      0, 0xB16D, 0xB16E, 0xB16F, 0xB170, 0xB171, /* 0x90 */
-    0xB172, 0xB173, 0xB174, 0xB175, 0xB176, 0xB177,      0,      0, /* 0x90 */
+    0xB16B, 0xB16C, 	 0, 0xB16D, 0xB16E, 0xB16F, 0xB170, 0xB171, /* 0x90 */
+    0xB172, 0xB173, 0xB174, 0xB175, 0xB176, 0xB177, 	 0, 	 0, /* 0x90 */
          0, 0xB178, 0xB179, 0xB17A, 0xB17B, 0xB17C, 0xB17D, 0xB17E, /* 0xA0 */
     0xB17F, 0xB180, 0xB181, 0xB182, 0xB183, 0xB184, 0xB185, 0xB186, /* 0xA0 */
-    0xB187, 0xB188,      0, 0xB189, 0xB18A, 0xB18B, 0xB18C, 0xB18D, /* 0xB0 */
-    0xB18E, 0xB18F, 0xB190, 0xB191, 0xB192, 0xB193,      0,      0, /* 0xB0 */
+    0xB187, 0xB188, 	 0, 0xB189, 0xB18A, 0xB18B, 0xB18C, 0xB18D, /* 0xB0 */
+    0xB18E, 0xB18F, 0xB190, 0xB191, 0xB192, 0xB193, 	 0, 	 0, /* 0xB0 */
          0, 0xB194, 0xB195, 0xB196, 0xB197, 0xB198, 0xB199, 0xB19A, /* 0xC0 */
     0xB19B, 0xB19C, 0xB19D, 0xB19E, 0xB19F, 0xB1A0, 0xB1A1, 0xB1A2, /* 0xC0 */
-    0xB1A3, 0xB1A4,      0, 0xB1A5, 0xB1A6, 0xB1A7, 0xB1A8, 0xB1A9, /* 0xD0 */
-    0xB1AA, 0xB1AB, 0xB1AC, 0xB1AD, 0xB1AE, 0xB1AF,      0,      0, /* 0xD0 */
+    0xB1A3, 0xB1A4, 	 0, 0xB1A5, 0xB1A6, 0xB1A7, 0xB1A8, 0xB1A9, /* 0xD0 */
+    0xB1AA, 0xB1AB, 0xB1AC, 0xB1AD, 0xB1AE, 0xB1AF, 	 0, 	 0, /* 0xD0 */
          0, 0xB1B0, 0xB1B1, 0xB1B2, 0xB1B3, 0xB1B4, 0xB1B5, 0xB1B6, /* 0xE0 */
     0xB1B7, 0xB1B8, 0xB1B9, 0xB1BA, 0xB1BB, 0xB1BC, 0xB1BD, 0xB1BE, /* 0xE0 */
-    0xB1BF, 0xB1C0,      0, 0xB1C1, 0xB1C2, 0xB1C3, 0xB1C4, 0xB1C5, /* 0xF0 */
-    0xB1C6, 0xB1C7, 0xB1C8, 0xB1C9, 0xB1CA, 0xB1CB                  /* 0xF0 */
+    0xB1BF, 0xB1C0, 	 0, 0xB1C1, 0xB1C2, 0xB1C3, 0xB1C4, 0xB1C5, /* 0xF0 */
+    0xB1C6, 0xB1C7, 0xB1C8, 0xB1C9, 0xB1CA, 0xB1CB					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_92[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB1CC, 0xB1CD, 0xB1CE, 0xB1CF, 0xB1D0, 0xB1D1, 0xB1D2, /* 0x40 */
     0xB1D3, 0xB1D4, 0xB1D5, 0xB1D6, 0xB1D7, 0xB1D8, 0xB1D9, 0xB1DA, /* 0x40 */
-    0xB1DB, 0xB1DC,      0, 0xB1DD, 0xB1DE, 0xB1DF, 0xB1E0, 0xB1E1, /* 0x50 */
-    0xB1E2, 0xB1E3, 0xB1E4, 0xB1E5, 0xB1E6, 0xB1E7,      0,      0, /* 0x50 */
+    0xB1DB, 0xB1DC, 	 0, 0xB1DD, 0xB1DE, 0xB1DF, 0xB1E0, 0xB1E1, /* 0x50 */
+    0xB1E2, 0xB1E3, 0xB1E4, 0xB1E5, 0xB1E6, 0xB1E7, 	 0, 	 0, /* 0x50 */
          0, 0xB1E8, 0xB1E9, 0xB1EA, 0xB1EB, 0xB1EC, 0xB1ED, 0xB1EE, /* 0x60 */
     0xB1EF, 0xB1F0, 0xB1F1, 0xB1F2, 0xB1F3, 0xB1F4, 0xB1F5, 0xB1F6, /* 0x60 */
-    0xB1F7, 0xB1F8,      0, 0xB1F9, 0xB1FA, 0xB1FB, 0xB1FC, 0xB1FD, /* 0x70 */
-    0xB1FE, 0xB1FF, 0xB200, 0xB201, 0xB202, 0xB203,      0,      0, /* 0x70 */
+    0xB1F7, 0xB1F8, 	 0, 0xB1F9, 0xB1FA, 0xB1FB, 0xB1FC, 0xB1FD, /* 0x70 */
+    0xB1FE, 0xB1FF, 0xB200, 0xB201, 0xB202, 0xB203, 	 0, 	 0, /* 0x70 */
          0, 0xB204, 0xB205, 0xB206, 0xB207, 0xB208, 0xB209, 0xB20A, /* 0x80 */
     0xB20B, 0xB20C, 0xB20D, 0xB20E, 0xB20F, 0xB210, 0xB211, 0xB212, /* 0x80 */
-    0xB213, 0xB214,      0, 0xB215, 0xB216, 0xB217, 0xB218, 0xB219, /* 0x90 */
-    0xB21A, 0xB21B, 0xB21C, 0xB21D, 0xB21E, 0xB21F,      0,      0, /* 0x90 */
+    0xB213, 0xB214, 	 0, 0xB215, 0xB216, 0xB217, 0xB218, 0xB219, /* 0x90 */
+    0xB21A, 0xB21B, 0xB21C, 0xB21D, 0xB21E, 0xB21F, 	 0, 	 0, /* 0x90 */
          0, 0xB220, 0xB221, 0xB222, 0xB223, 0xB224, 0xB225, 0xB226, /* 0xA0 */
     0xB227, 0xB228, 0xB229, 0xB22A, 0xB22B, 0xB22C, 0xB22D, 0xB22E, /* 0xA0 */
-    0xB22F, 0xB230,      0, 0xB231, 0xB232, 0xB233, 0xB234, 0xB235, /* 0xB0 */
-    0xB236, 0xB237, 0xB238, 0xB239, 0xB23A, 0xB23B,      0,      0, /* 0xB0 */
+    0xB22F, 0xB230, 	 0, 0xB231, 0xB232, 0xB233, 0xB234, 0xB235, /* 0xB0 */
+    0xB236, 0xB237, 0xB238, 0xB239, 0xB23A, 0xB23B, 	 0, 	 0, /* 0xB0 */
          0, 0xB23C, 0xB23D, 0xB23E, 0xB23F, 0xB240, 0xB241, 0xB242, /* 0xC0 */
     0xB243, 0xB244, 0xB245, 0xB246, 0xB247, 0xB248, 0xB249, 0xB24A, /* 0xC0 */
-    0xB24B, 0xB24C,      0, 0xB24D, 0xB24E, 0xB24F, 0xB250, 0xB251, /* 0xD0 */
-    0xB252, 0xB253, 0xB254, 0xB255, 0xB256, 0xB257,      0,      0, /* 0xD0 */
+    0xB24B, 0xB24C, 	 0, 0xB24D, 0xB24E, 0xB24F, 0xB250, 0xB251, /* 0xD0 */
+    0xB252, 0xB253, 0xB254, 0xB255, 0xB256, 0xB257, 	 0, 	 0, /* 0xD0 */
          0, 0xB258, 0xB259, 0xB25A, 0xB25B, 0xB25C, 0xB25D, 0xB25E, /* 0xE0 */
     0xB25F, 0xB260, 0xB261, 0xB262, 0xB263, 0xB264, 0xB265, 0xB266, /* 0xE0 */
-    0xB267, 0xB268,      0, 0xB269, 0xB26A, 0xB26B, 0xB26C, 0xB26D, /* 0xF0 */
-    0xB26E, 0xB26F, 0xB270, 0xB271, 0xB272, 0xB273                  /* 0xF0 */
+    0xB267, 0xB268, 	 0, 0xB269, 0xB26A, 0xB26B, 0xB26C, 0xB26D, /* 0xF0 */
+    0xB26E, 0xB26F, 0xB270, 0xB271, 0xB272, 0xB273					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_93[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB274, 0xB275, 0xB276, 0xB277, 0xB278, 0xB279, 0xB27A, /* 0x40 */
     0xB27B, 0xB27C, 0xB27D, 0xB27E, 0xB27F, 0xB280, 0xB281, 0xB282, /* 0x40 */
-    0xB283, 0xB284,      0, 0xB285, 0xB286, 0xB287, 0xB288, 0xB289, /* 0x50 */
-    0xB28A, 0xB28B, 0xB28C, 0xB28D, 0xB28E, 0xB28F,      0,      0, /* 0x50 */
+    0xB283, 0xB284, 	 0, 0xB285, 0xB286, 0xB287, 0xB288, 0xB289, /* 0x50 */
+    0xB28A, 0xB28B, 0xB28C, 0xB28D, 0xB28E, 0xB28F, 	 0, 	 0, /* 0x50 */
          0, 0xB290, 0xB291, 0xB292, 0xB293, 0xB294, 0xB295, 0xB296, /* 0x60 */
     0xB297, 0xB298, 0xB299, 0xB29A, 0xB29B, 0xB29C, 0xB29D, 0xB29E, /* 0x60 */
-    0xB29F, 0xB2A0,      0, 0xB2A1, 0xB2A2, 0xB2A3, 0xB2A4, 0xB2A5, /* 0x70 */
-    0xB2A6, 0xB2A7, 0xB2A8, 0xB2A9, 0xB2AA, 0xB2AB,      0,      0, /* 0x70 */
+    0xB29F, 0xB2A0, 	 0, 0xB2A1, 0xB2A2, 0xB2A3, 0xB2A4, 0xB2A5, /* 0x70 */
+    0xB2A6, 0xB2A7, 0xB2A8, 0xB2A9, 0xB2AA, 0xB2AB, 	 0, 	 0, /* 0x70 */
          0, 0xB2AC, 0xB2AD, 0xB2AE, 0xB2AF, 0xB2B0, 0xB2B1, 0xB2B2, /* 0x80 */
     0xB2B3, 0xB2B4, 0xB2B5, 0xB2B6, 0xB2B7, 0xB2B8, 0xB2B9, 0xB2BA, /* 0x80 */
-    0xB2BB, 0xB2BC,      0, 0xB2BD, 0xB2BE, 0xB2BF, 0xB2C0, 0xB2C1, /* 0x90 */
-    0xB2C2, 0xB2C3, 0xB2C4, 0xB2C5, 0xB2C6, 0xB2C7,      0,      0, /* 0x90 */
+    0xB2BB, 0xB2BC, 	 0, 0xB2BD, 0xB2BE, 0xB2BF, 0xB2C0, 0xB2C1, /* 0x90 */
+    0xB2C2, 0xB2C3, 0xB2C4, 0xB2C5, 0xB2C6, 0xB2C7, 	 0, 	 0, /* 0x90 */
          0, 0xB2C8, 0xB2C9, 0xB2CA, 0xB2CB, 0xB2CC, 0xB2CD, 0xB2CE, /* 0xA0 */
     0xB2CF, 0xB2D0, 0xB2D1, 0xB2D2, 0xB2D3, 0xB2D4, 0xB2D5, 0xB2D6, /* 0xA0 */
-    0xB2D7, 0xB2D8,      0, 0xB2D9, 0xB2DA, 0xB2DB, 0xB2DC, 0xB2DD, /* 0xB0 */
-    0xB2DE, 0xB2DF, 0xB2E0, 0xB2E1, 0xB2E2, 0xB2E3                  /* 0xB0 */
+    0xB2D7, 0xB2D8, 	 0, 0xB2D9, 0xB2DA, 0xB2DB, 0xB2DC, 0xB2DD, /* 0xB0 */
+    0xB2DE, 0xB2DF, 0xB2E0, 0xB2E1, 0xB2E2, 0xB2E3					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_94[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3137,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3137, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xB2E4, 0xB2E5, 0xB2E6, 0xB2E7, 0xB2E8, 0xB2E9, 0xB2EA, /* 0x60 */
     0xB2EB, 0xB2EC, 0xB2ED, 0xB2EE, 0xB2EF, 0xB2F0, 0xB2F1, 0xB2F2, /* 0x60 */
-    0xB2F3, 0xB2F4,      0, 0xB2F5, 0xB2F6, 0xB2F7, 0xB2F8, 0xB2F9, /* 0x70 */
-    0xB2FA, 0xB2FB, 0xB2FC, 0xB2FD, 0xB2FE, 0xB2FF,      0,      0, /* 0x70 */
+    0xB2F3, 0xB2F4, 	 0, 0xB2F5, 0xB2F6, 0xB2F7, 0xB2F8, 0xB2F9, /* 0x70 */
+    0xB2FA, 0xB2FB, 0xB2FC, 0xB2FD, 0xB2FE, 0xB2FF, 	 0, 	 0, /* 0x70 */
          0, 0xB300, 0xB301, 0xB302, 0xB303, 0xB304, 0xB305, 0xB306, /* 0x80 */
     0xB307, 0xB308, 0xB309, 0xB30A, 0xB30B, 0xB30C, 0xB30D, 0xB30E, /* 0x80 */
-    0xB30F, 0xB310,      0, 0xB311, 0xB312, 0xB313, 0xB314, 0xB315, /* 0x90 */
-    0xB316, 0xB317, 0xB318, 0xB319, 0xB31A, 0xB31B,      0,      0, /* 0x90 */
+    0xB30F, 0xB310, 	 0, 0xB311, 0xB312, 0xB313, 0xB314, 0xB315, /* 0x90 */
+    0xB316, 0xB317, 0xB318, 0xB319, 0xB31A, 0xB31B, 	 0, 	 0, /* 0x90 */
          0, 0xB31C, 0xB31D, 0xB31E, 0xB31F, 0xB320, 0xB321, 0xB322, /* 0xA0 */
     0xB323, 0xB324, 0xB325, 0xB326, 0xB327, 0xB328, 0xB329, 0xB32A, /* 0xA0 */
-    0xB32B, 0xB32C,      0, 0xB32D, 0xB32E, 0xB32F, 0xB330, 0xB331, /* 0xB0 */
-    0xB332, 0xB333, 0xB334, 0xB335, 0xB336, 0xB337,      0,      0, /* 0xB0 */
+    0xB32B, 0xB32C, 	 0, 0xB32D, 0xB32E, 0xB32F, 0xB330, 0xB331, /* 0xB0 */
+    0xB332, 0xB333, 0xB334, 0xB335, 0xB336, 0xB337, 	 0, 	 0, /* 0xB0 */
          0, 0xB338, 0xB339, 0xB33A, 0xB33B, 0xB33C, 0xB33D, 0xB33E, /* 0xC0 */
     0xB33F, 0xB340, 0xB341, 0xB342, 0xB343, 0xB344, 0xB345, 0xB346, /* 0xC0 */
-    0xB347, 0xB348,      0, 0xB349, 0xB34A, 0xB34B, 0xB34C, 0xB34D, /* 0xD0 */
-    0xB34E, 0xB34F, 0xB350, 0xB351, 0xB352, 0xB353,      0,      0, /* 0xD0 */
+    0xB347, 0xB348, 	 0, 0xB349, 0xB34A, 0xB34B, 0xB34C, 0xB34D, /* 0xD0 */
+    0xB34E, 0xB34F, 0xB350, 0xB351, 0xB352, 0xB353, 	 0, 	 0, /* 0xD0 */
          0, 0xB354, 0xB355, 0xB356, 0xB357, 0xB358, 0xB359, 0xB35A, /* 0xE0 */
     0xB35B, 0xB35C, 0xB35D, 0xB35E, 0xB35F, 0xB360, 0xB361, 0xB362, /* 0xE0 */
-    0xB363, 0xB364,      0, 0xB365, 0xB366, 0xB367, 0xB368, 0xB369, /* 0xF0 */
-    0xB36A, 0xB36B, 0xB36C, 0xB36D, 0xB36E, 0xB36F                  /* 0xF0 */
+    0xB363, 0xB364, 	 0, 0xB365, 0xB366, 0xB367, 0xB368, 0xB369, /* 0xF0 */
+    0xB36A, 0xB36B, 0xB36C, 0xB36D, 0xB36E, 0xB36F					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_95[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB370, 0xB371, 0xB372, 0xB373, 0xB374, 0xB375, 0xB376, /* 0x40 */
     0xB377, 0xB378, 0xB379, 0xB37A, 0xB37B, 0xB37C, 0xB37D, 0xB37E, /* 0x40 */
-    0xB37F, 0xB380,      0, 0xB381, 0xB382, 0xB383, 0xB384, 0xB385, /* 0x50 */
-    0xB386, 0xB387, 0xB388, 0xB389, 0xB38A, 0xB38B,      0,      0, /* 0x50 */
+    0xB37F, 0xB380, 	 0, 0xB381, 0xB382, 0xB383, 0xB384, 0xB385, /* 0x50 */
+    0xB386, 0xB387, 0xB388, 0xB389, 0xB38A, 0xB38B, 	 0, 	 0, /* 0x50 */
          0, 0xB38C, 0xB38D, 0xB38E, 0xB38F, 0xB390, 0xB391, 0xB392, /* 0x60 */
     0xB393, 0xB394, 0xB395, 0xB396, 0xB397, 0xB398, 0xB399, 0xB39A, /* 0x60 */
-    0xB39B, 0xB39C,      0, 0xB39D, 0xB39E, 0xB39F, 0xB3A0, 0xB3A1, /* 0x70 */
-    0xB3A2, 0xB3A3, 0xB3A4, 0xB3A5, 0xB3A6, 0xB3A7,      0,      0, /* 0x70 */
+    0xB39B, 0xB39C, 	 0, 0xB39D, 0xB39E, 0xB39F, 0xB3A0, 0xB3A1, /* 0x70 */
+    0xB3A2, 0xB3A3, 0xB3A4, 0xB3A5, 0xB3A6, 0xB3A7, 	 0, 	 0, /* 0x70 */
          0, 0xB3A8, 0xB3A9, 0xB3AA, 0xB3AB, 0xB3AC, 0xB3AD, 0xB3AE, /* 0x80 */
     0xB3AF, 0xB3B0, 0xB3B1, 0xB3B2, 0xB3B3, 0xB3B4, 0xB3B5, 0xB3B6, /* 0x80 */
-    0xB3B7, 0xB3B8,      0, 0xB3B9, 0xB3BA, 0xB3BB, 0xB3BC, 0xB3BD, /* 0x90 */
-    0xB3BE, 0xB3BF, 0xB3C0, 0xB3C1, 0xB3C2, 0xB3C3,      0,      0, /* 0x90 */
+    0xB3B7, 0xB3B8, 	 0, 0xB3B9, 0xB3BA, 0xB3BB, 0xB3BC, 0xB3BD, /* 0x90 */
+    0xB3BE, 0xB3BF, 0xB3C0, 0xB3C1, 0xB3C2, 0xB3C3, 	 0, 	 0, /* 0x90 */
          0, 0xB3C4, 0xB3C5, 0xB3C6, 0xB3C7, 0xB3C8, 0xB3C9, 0xB3CA, /* 0xA0 */
     0xB3CB, 0xB3CC, 0xB3CD, 0xB3CE, 0xB3CF, 0xB3D0, 0xB3D1, 0xB3D2, /* 0xA0 */
-    0xB3D3, 0xB3D4,      0, 0xB3D5, 0xB3D6, 0xB3D7, 0xB3D8, 0xB3D9, /* 0xB0 */
-    0xB3DA, 0xB3DB, 0xB3DC, 0xB3DD, 0xB3DE, 0xB3DF,      0,      0, /* 0xB0 */
+    0xB3D3, 0xB3D4, 	 0, 0xB3D5, 0xB3D6, 0xB3D7, 0xB3D8, 0xB3D9, /* 0xB0 */
+    0xB3DA, 0xB3DB, 0xB3DC, 0xB3DD, 0xB3DE, 0xB3DF, 	 0, 	 0, /* 0xB0 */
          0, 0xB3E0, 0xB3E1, 0xB3E2, 0xB3E3, 0xB3E4, 0xB3E5, 0xB3E6, /* 0xC0 */
     0xB3E7, 0xB3E8, 0xB3E9, 0xB3EA, 0xB3EB, 0xB3EC, 0xB3ED, 0xB3EE, /* 0xC0 */
-    0xB3EF, 0xB3F0,      0, 0xB3F1, 0xB3F2, 0xB3F3, 0xB3F4, 0xB3F5, /* 0xD0 */
-    0xB3F6, 0xB3F7, 0xB3F8, 0xB3F9, 0xB3FA, 0xB3FB,      0,      0, /* 0xD0 */
+    0xB3EF, 0xB3F0, 	 0, 0xB3F1, 0xB3F2, 0xB3F3, 0xB3F4, 0xB3F5, /* 0xD0 */
+    0xB3F6, 0xB3F7, 0xB3F8, 0xB3F9, 0xB3FA, 0xB3FB, 	 0, 	 0, /* 0xD0 */
          0, 0xB3FC, 0xB3FD, 0xB3FE, 0xB3FF, 0xB400, 0xB401, 0xB402, /* 0xE0 */
     0xB403, 0xB404, 0xB405, 0xB406, 0xB407, 0xB408, 0xB409, 0xB40A, /* 0xE0 */
-    0xB40B, 0xB40C,      0, 0xB40D, 0xB40E, 0xB40F, 0xB410, 0xB411, /* 0xF0 */
-    0xB412, 0xB413, 0xB414, 0xB415, 0xB416, 0xB417                  /* 0xF0 */
+    0xB40B, 0xB40C, 	 0, 0xB40D, 0xB40E, 0xB40F, 0xB410, 0xB411, /* 0xF0 */
+    0xB412, 0xB413, 0xB414, 0xB415, 0xB416, 0xB417					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_96[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB418, 0xB419, 0xB41A, 0xB41B, 0xB41C, 0xB41D, 0xB41E, /* 0x40 */
     0xB41F, 0xB420, 0xB421, 0xB422, 0xB423, 0xB424, 0xB425, 0xB426, /* 0x40 */
-    0xB427, 0xB428,      0, 0xB429, 0xB42A, 0xB42B, 0xB42C, 0xB42D, /* 0x50 */
-    0xB42E, 0xB42F, 0xB430, 0xB431, 0xB432, 0xB433,      0,      0, /* 0x50 */
+    0xB427, 0xB428, 	 0, 0xB429, 0xB42A, 0xB42B, 0xB42C, 0xB42D, /* 0x50 */
+    0xB42E, 0xB42F, 0xB430, 0xB431, 0xB432, 0xB433, 	 0, 	 0, /* 0x50 */
          0, 0xB434, 0xB435, 0xB436, 0xB437, 0xB438, 0xB439, 0xB43A, /* 0x60 */
     0xB43B, 0xB43C, 0xB43D, 0xB43E, 0xB43F, 0xB440, 0xB441, 0xB442, /* 0x60 */
-    0xB443, 0xB444,      0, 0xB445, 0xB446, 0xB447, 0xB448, 0xB449, /* 0x70 */
-    0xB44A, 0xB44B, 0xB44C, 0xB44D, 0xB44E, 0xB44F,      0,      0, /* 0x70 */
+    0xB443, 0xB444, 	 0, 0xB445, 0xB446, 0xB447, 0xB448, 0xB449, /* 0x70 */
+    0xB44A, 0xB44B, 0xB44C, 0xB44D, 0xB44E, 0xB44F, 	 0, 	 0, /* 0x70 */
          0, 0xB450, 0xB451, 0xB452, 0xB453, 0xB454, 0xB455, 0xB456, /* 0x80 */
     0xB457, 0xB458, 0xB459, 0xB45A, 0xB45B, 0xB45C, 0xB45D, 0xB45E, /* 0x80 */
-    0xB45F, 0xB460,      0, 0xB461, 0xB462, 0xB463, 0xB464, 0xB465, /* 0x90 */
-    0xB466, 0xB467, 0xB468, 0xB469, 0xB46A, 0xB46B,      0,      0, /* 0x90 */
+    0xB45F, 0xB460, 	 0, 0xB461, 0xB462, 0xB463, 0xB464, 0xB465, /* 0x90 */
+    0xB466, 0xB467, 0xB468, 0xB469, 0xB46A, 0xB46B, 	 0, 	 0, /* 0x90 */
          0, 0xB46C, 0xB46D, 0xB46E, 0xB46F, 0xB470, 0xB471, 0xB472, /* 0xA0 */
     0xB473, 0xB474, 0xB475, 0xB476, 0xB477, 0xB478, 0xB479, 0xB47A, /* 0xA0 */
-    0xB47B, 0xB47C,      0, 0xB47D, 0xB47E, 0xB47F, 0xB480, 0xB481, /* 0xB0 */
-    0xB482, 0xB483, 0xB484, 0xB485, 0xB486, 0xB487,      0,      0, /* 0xB0 */
+    0xB47B, 0xB47C, 	 0, 0xB47D, 0xB47E, 0xB47F, 0xB480, 0xB481, /* 0xB0 */
+    0xB482, 0xB483, 0xB484, 0xB485, 0xB486, 0xB487, 	 0, 	 0, /* 0xB0 */
          0, 0xB488, 0xB489, 0xB48A, 0xB48B, 0xB48C, 0xB48D, 0xB48E, /* 0xC0 */
     0xB48F, 0xB490, 0xB491, 0xB492, 0xB493, 0xB494, 0xB495, 0xB496, /* 0xC0 */
-    0xB497, 0xB498,      0, 0xB499, 0xB49A, 0xB49B, 0xB49C, 0xB49D, /* 0xD0 */
-    0xB49E, 0xB49F, 0xB4A0, 0xB4A1, 0xB4A2, 0xB4A3,      0,      0, /* 0xD0 */
+    0xB497, 0xB498, 	 0, 0xB499, 0xB49A, 0xB49B, 0xB49C, 0xB49D, /* 0xD0 */
+    0xB49E, 0xB49F, 0xB4A0, 0xB4A1, 0xB4A2, 0xB4A3, 	 0, 	 0, /* 0xD0 */
          0, 0xB4A4, 0xB4A5, 0xB4A6, 0xB4A7, 0xB4A8, 0xB4A9, 0xB4AA, /* 0xE0 */
     0xB4AB, 0xB4AC, 0xB4AD, 0xB4AE, 0xB4AF, 0xB4B0, 0xB4B1, 0xB4B2, /* 0xE0 */
-    0xB4B3, 0xB4B4,      0, 0xB4B5, 0xB4B6, 0xB4B7, 0xB4B8, 0xB4B9, /* 0xF0 */
-    0xB4BA, 0xB4BB, 0xB4BC, 0xB4BD, 0xB4BE, 0xB4BF                  /* 0xF0 */
+    0xB4B3, 0xB4B4, 	 0, 0xB4B5, 0xB4B6, 0xB4B7, 0xB4B8, 0xB4B9, /* 0xF0 */
+    0xB4BA, 0xB4BB, 0xB4BC, 0xB4BD, 0xB4BE, 0xB4BF					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_97[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB4C0, 0xB4C1, 0xB4C2, 0xB4C3, 0xB4C4, 0xB4C5, 0xB4C6, /* 0x40 */
     0xB4C7, 0xB4C8, 0xB4C9, 0xB4CA, 0xB4CB, 0xB4CC, 0xB4CD, 0xB4CE, /* 0x40 */
-    0xB4CF, 0xB4D0,      0, 0xB4D1, 0xB4D2, 0xB4D3, 0xB4D4, 0xB4D5, /* 0x50 */
-    0xB4D6, 0xB4D7, 0xB4D8, 0xB4D9, 0xB4DA, 0xB4DB,      0,      0, /* 0x50 */
+    0xB4CF, 0xB4D0, 	 0, 0xB4D1, 0xB4D2, 0xB4D3, 0xB4D4, 0xB4D5, /* 0x50 */
+    0xB4D6, 0xB4D7, 0xB4D8, 0xB4D9, 0xB4DA, 0xB4DB, 	 0, 	 0, /* 0x50 */
          0, 0xB4DC, 0xB4DD, 0xB4DE, 0xB4DF, 0xB4E0, 0xB4E1, 0xB4E2, /* 0x60 */
     0xB4E3, 0xB4E4, 0xB4E5, 0xB4E6, 0xB4E7, 0xB4E8, 0xB4E9, 0xB4EA, /* 0x60 */
-    0xB4EB, 0xB4EC,      0, 0xB4ED, 0xB4EE, 0xB4EF, 0xB4F0, 0xB4F1, /* 0x70 */
-    0xB4F2, 0xB4F3, 0xB4F4, 0xB4F5, 0xB4F6, 0xB4F7,      0,      0, /* 0x70 */
+    0xB4EB, 0xB4EC, 	 0, 0xB4ED, 0xB4EE, 0xB4EF, 0xB4F0, 0xB4F1, /* 0x70 */
+    0xB4F2, 0xB4F3, 0xB4F4, 0xB4F5, 0xB4F6, 0xB4F7, 	 0, 	 0, /* 0x70 */
          0, 0xB4F8, 0xB4F9, 0xB4FA, 0xB4FB, 0xB4FC, 0xB4FD, 0xB4FE, /* 0x80 */
     0xB4FF, 0xB500, 0xB501, 0xB502, 0xB503, 0xB504, 0xB505, 0xB506, /* 0x80 */
-    0xB507, 0xB508,      0, 0xB509, 0xB50A, 0xB50B, 0xB50C, 0xB50D, /* 0x90 */
-    0xB50E, 0xB50F, 0xB510, 0xB511, 0xB512, 0xB513,      0,      0, /* 0x90 */
+    0xB507, 0xB508, 	 0, 0xB509, 0xB50A, 0xB50B, 0xB50C, 0xB50D, /* 0x90 */
+    0xB50E, 0xB50F, 0xB510, 0xB511, 0xB512, 0xB513, 	 0, 	 0, /* 0x90 */
          0, 0xB514, 0xB515, 0xB516, 0xB517, 0xB518, 0xB519, 0xB51A, /* 0xA0 */
     0xB51B, 0xB51C, 0xB51D, 0xB51E, 0xB51F, 0xB520, 0xB521, 0xB522, /* 0xA0 */
-    0xB523, 0xB524,      0, 0xB525, 0xB526, 0xB527, 0xB528, 0xB529, /* 0xB0 */
-    0xB52A, 0xB52B, 0xB52C, 0xB52D, 0xB52E, 0xB52F                  /* 0xB0 */
+    0xB523, 0xB524, 	 0, 0xB525, 0xB526, 0xB527, 0xB528, 0xB529, /* 0xB0 */
+    0xB52A, 0xB52B, 0xB52C, 0xB52D, 0xB52E, 0xB52F					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_98[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3138,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3138, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xB530, 0xB531, 0xB532, 0xB533, 0xB534, 0xB535, 0xB536, /* 0x60 */
     0xB537, 0xB538, 0xB539, 0xB53A, 0xB53B, 0xB53C, 0xB53D, 0xB53E, /* 0x60 */
-    0xB53F, 0xB540,      0, 0xB541, 0xB542, 0xB543, 0xB544, 0xB545, /* 0x70 */
-    0xB546, 0xB547, 0xB548, 0xB549, 0xB54A, 0xB54B,      0,      0, /* 0x70 */
+    0xB53F, 0xB540, 	 0, 0xB541, 0xB542, 0xB543, 0xB544, 0xB545, /* 0x70 */
+    0xB546, 0xB547, 0xB548, 0xB549, 0xB54A, 0xB54B, 	 0, 	 0, /* 0x70 */
          0, 0xB54C, 0xB54D, 0xB54E, 0xB54F, 0xB550, 0xB551, 0xB552, /* 0x80 */
     0xB553, 0xB554, 0xB555, 0xB556, 0xB557, 0xB558, 0xB559, 0xB55A, /* 0x80 */
-    0xB55B, 0xB55C,      0, 0xB55D, 0xB55E, 0xB55F, 0xB560, 0xB561, /* 0x90 */
-    0xB562, 0xB563, 0xB564, 0xB565, 0xB566, 0xB567,      0,      0, /* 0x90 */
+    0xB55B, 0xB55C, 	 0, 0xB55D, 0xB55E, 0xB55F, 0xB560, 0xB561, /* 0x90 */
+    0xB562, 0xB563, 0xB564, 0xB565, 0xB566, 0xB567, 	 0, 	 0, /* 0x90 */
          0, 0xB568, 0xB569, 0xB56A, 0xB56B, 0xB56C, 0xB56D, 0xB56E, /* 0xA0 */
     0xB56F, 0xB570, 0xB571, 0xB572, 0xB573, 0xB574, 0xB575, 0xB576, /* 0xA0 */
-    0xB577, 0xB578,      0, 0xB579, 0xB57A, 0xB57B, 0xB57C, 0xB57D, /* 0xB0 */
-    0xB57E, 0xB57F, 0xB580, 0xB581, 0xB582, 0xB583,      0,      0, /* 0xB0 */
+    0xB577, 0xB578, 	 0, 0xB579, 0xB57A, 0xB57B, 0xB57C, 0xB57D, /* 0xB0 */
+    0xB57E, 0xB57F, 0xB580, 0xB581, 0xB582, 0xB583, 	 0, 	 0, /* 0xB0 */
          0, 0xB584, 0xB585, 0xB586, 0xB587, 0xB588, 0xB589, 0xB58A, /* 0xC0 */
     0xB58B, 0xB58C, 0xB58D, 0xB58E, 0xB58F, 0xB590, 0xB591, 0xB592, /* 0xC0 */
-    0xB593, 0xB594,      0, 0xB595, 0xB596, 0xB597, 0xB598, 0xB599, /* 0xD0 */
-    0xB59A, 0xB59B, 0xB59C, 0xB59D, 0xB59E, 0xB59F,      0,      0, /* 0xD0 */
+    0xB593, 0xB594, 	 0, 0xB595, 0xB596, 0xB597, 0xB598, 0xB599, /* 0xD0 */
+    0xB59A, 0xB59B, 0xB59C, 0xB59D, 0xB59E, 0xB59F, 	 0, 	 0, /* 0xD0 */
          0, 0xB5A0, 0xB5A1, 0xB5A2, 0xB5A3, 0xB5A4, 0xB5A5, 0xB5A6, /* 0xE0 */
     0xB5A7, 0xB5A8, 0xB5A9, 0xB5AA, 0xB5AB, 0xB5AC, 0xB5AD, 0xB5AE, /* 0xE0 */
-    0xB5AF, 0xB5B0,      0, 0xB5B1, 0xB5B2, 0xB5B3, 0xB5B4, 0xB5B5, /* 0xF0 */
-    0xB5B6, 0xB5B7, 0xB5B8, 0xB5B9, 0xB5BA, 0xB5BB                  /* 0xF0 */
+    0xB5AF, 0xB5B0, 	 0, 0xB5B1, 0xB5B2, 0xB5B3, 0xB5B4, 0xB5B5, /* 0xF0 */
+    0xB5B6, 0xB5B7, 0xB5B8, 0xB5B9, 0xB5BA, 0xB5BB					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_99[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB5BC, 0xB5BD, 0xB5BE, 0xB5BF, 0xB5C0, 0xB5C1, 0xB5C2, /* 0x40 */
     0xB5C3, 0xB5C4, 0xB5C5, 0xB5C6, 0xB5C7, 0xB5C8, 0xB5C9, 0xB5CA, /* 0x40 */
-    0xB5CB, 0xB5CC,      0, 0xB5CD, 0xB5CE, 0xB5CF, 0xB5D0, 0xB5D1, /* 0x50 */
-    0xB5D2, 0xB5D3, 0xB5D4, 0xB5D5, 0xB5D6, 0xB5D7,      0,      0, /* 0x50 */
+    0xB5CB, 0xB5CC, 	 0, 0xB5CD, 0xB5CE, 0xB5CF, 0xB5D0, 0xB5D1, /* 0x50 */
+    0xB5D2, 0xB5D3, 0xB5D4, 0xB5D5, 0xB5D6, 0xB5D7, 	 0, 	 0, /* 0x50 */
          0, 0xB5D8, 0xB5D9, 0xB5DA, 0xB5DB, 0xB5DC, 0xB5DD, 0xB5DE, /* 0x60 */
     0xB5DF, 0xB5E0, 0xB5E1, 0xB5E2, 0xB5E3, 0xB5E4, 0xB5E5, 0xB5E6, /* 0x60 */
-    0xB5E7, 0xB5E8,      0, 0xB5E9, 0xB5EA, 0xB5EB, 0xB5EC, 0xB5ED, /* 0x70 */
-    0xB5EE, 0xB5EF, 0xB5F0, 0xB5F1, 0xB5F2, 0xB5F3,      0,      0, /* 0x70 */
+    0xB5E7, 0xB5E8, 	 0, 0xB5E9, 0xB5EA, 0xB5EB, 0xB5EC, 0xB5ED, /* 0x70 */
+    0xB5EE, 0xB5EF, 0xB5F0, 0xB5F1, 0xB5F2, 0xB5F3, 	 0, 	 0, /* 0x70 */
          0, 0xB5F4, 0xB5F5, 0xB5F6, 0xB5F7, 0xB5F8, 0xB5F9, 0xB5FA, /* 0x80 */
     0xB5FB, 0xB5FC, 0xB5FD, 0xB5FE, 0xB5FF, 0xB600, 0xB601, 0xB602, /* 0x80 */
-    0xB603, 0xB604,      0, 0xB605, 0xB606, 0xB607, 0xB608, 0xB609, /* 0x90 */
-    0xB60A, 0xB60B, 0xB60C, 0xB60D, 0xB60E, 0xB60F,      0,      0, /* 0x90 */
+    0xB603, 0xB604, 	 0, 0xB605, 0xB606, 0xB607, 0xB608, 0xB609, /* 0x90 */
+    0xB60A, 0xB60B, 0xB60C, 0xB60D, 0xB60E, 0xB60F, 	 0, 	 0, /* 0x90 */
          0, 0xB610, 0xB611, 0xB612, 0xB613, 0xB614, 0xB615, 0xB616, /* 0xA0 */
     0xB617, 0xB618, 0xB619, 0xB61A, 0xB61B, 0xB61C, 0xB61D, 0xB61E, /* 0xA0 */
-    0xB61F, 0xB620,      0, 0xB621, 0xB622, 0xB623, 0xB624, 0xB625, /* 0xB0 */
-    0xB626, 0xB627, 0xB628, 0xB629, 0xB62A, 0xB62B,      0,      0, /* 0xB0 */
+    0xB61F, 0xB620, 	 0, 0xB621, 0xB622, 0xB623, 0xB624, 0xB625, /* 0xB0 */
+    0xB626, 0xB627, 0xB628, 0xB629, 0xB62A, 0xB62B, 	 0, 	 0, /* 0xB0 */
          0, 0xB62C, 0xB62D, 0xB62E, 0xB62F, 0xB630, 0xB631, 0xB632, /* 0xC0 */
     0xB633, 0xB634, 0xB635, 0xB636, 0xB637, 0xB638, 0xB639, 0xB63A, /* 0xC0 */
-    0xB63B, 0xB63C,      0, 0xB63D, 0xB63E, 0xB63F, 0xB640, 0xB641, /* 0xD0 */
-    0xB642, 0xB643, 0xB644, 0xB645, 0xB646, 0xB647,      0,      0, /* 0xD0 */
+    0xB63B, 0xB63C, 	 0, 0xB63D, 0xB63E, 0xB63F, 0xB640, 0xB641, /* 0xD0 */
+    0xB642, 0xB643, 0xB644, 0xB645, 0xB646, 0xB647, 	 0, 	 0, /* 0xD0 */
          0, 0xB648, 0xB649, 0xB64A, 0xB64B, 0xB64C, 0xB64D, 0xB64E, /* 0xE0 */
     0xB64F, 0xB650, 0xB651, 0xB652, 0xB653, 0xB654, 0xB655, 0xB656, /* 0xE0 */
-    0xB657, 0xB658,      0, 0xB659, 0xB65A, 0xB65B, 0xB65C, 0xB65D, /* 0xF0 */
-    0xB65E, 0xB65F, 0xB660, 0xB661, 0xB662, 0xB663                  /* 0xF0 */
+    0xB657, 0xB658, 	 0, 0xB659, 0xB65A, 0xB65B, 0xB65C, 0xB65D, /* 0xF0 */
+    0xB65E, 0xB65F, 0xB660, 0xB661, 0xB662, 0xB663					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_9A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB664, 0xB665, 0xB666, 0xB667, 0xB668, 0xB669, 0xB66A, /* 0x40 */
     0xB66B, 0xB66C, 0xB66D, 0xB66E, 0xB66F, 0xB670, 0xB671, 0xB672, /* 0x40 */
-    0xB673, 0xB674,      0, 0xB675, 0xB676, 0xB677, 0xB678, 0xB679, /* 0x50 */
-    0xB67A, 0xB67B, 0xB67C, 0xB67D, 0xB67E, 0xB67F,      0,      0, /* 0x50 */
+    0xB673, 0xB674, 	 0, 0xB675, 0xB676, 0xB677, 0xB678, 0xB679, /* 0x50 */
+    0xB67A, 0xB67B, 0xB67C, 0xB67D, 0xB67E, 0xB67F, 	 0, 	 0, /* 0x50 */
          0, 0xB680, 0xB681, 0xB682, 0xB683, 0xB684, 0xB685, 0xB686, /* 0x60 */
     0xB687, 0xB688, 0xB689, 0xB68A, 0xB68B, 0xB68C, 0xB68D, 0xB68E, /* 0x60 */
-    0xB68F, 0xB690,      0, 0xB691, 0xB692, 0xB693, 0xB694, 0xB695, /* 0x70 */
-    0xB696, 0xB697, 0xB698, 0xB699, 0xB69A, 0xB69B,      0,      0, /* 0x70 */
+    0xB68F, 0xB690, 	 0, 0xB691, 0xB692, 0xB693, 0xB694, 0xB695, /* 0x70 */
+    0xB696, 0xB697, 0xB698, 0xB699, 0xB69A, 0xB69B, 	 0, 	 0, /* 0x70 */
          0, 0xB69C, 0xB69D, 0xB69E, 0xB69F, 0xB6A0, 0xB6A1, 0xB6A2, /* 0x80 */
     0xB6A3, 0xB6A4, 0xB6A5, 0xB6A6, 0xB6A7, 0xB6A8, 0xB6A9, 0xB6AA, /* 0x80 */
-    0xB6AB, 0xB6AC,      0, 0xB6AD, 0xB6AE, 0xB6AF, 0xB6B0, 0xB6B1, /* 0x90 */
-    0xB6B2, 0xB6B3, 0xB6B4, 0xB6B5, 0xB6B6, 0xB6B7,      0,      0, /* 0x90 */
+    0xB6AB, 0xB6AC, 	 0, 0xB6AD, 0xB6AE, 0xB6AF, 0xB6B0, 0xB6B1, /* 0x90 */
+    0xB6B2, 0xB6B3, 0xB6B4, 0xB6B5, 0xB6B6, 0xB6B7, 	 0, 	 0, /* 0x90 */
          0, 0xB6B8, 0xB6B9, 0xB6BA, 0xB6BB, 0xB6BC, 0xB6BD, 0xB6BE, /* 0xA0 */
     0xB6BF, 0xB6C0, 0xB6C1, 0xB6C2, 0xB6C3, 0xB6C4, 0xB6C5, 0xB6C6, /* 0xA0 */
-    0xB6C7, 0xB6C8,      0, 0xB6C9, 0xB6CA, 0xB6CB, 0xB6CC, 0xB6CD, /* 0xB0 */
-    0xB6CE, 0xB6CF, 0xB6D0, 0xB6D1, 0xB6D2, 0xB6D3,      0,      0, /* 0xB0 */
+    0xB6C7, 0xB6C8, 	 0, 0xB6C9, 0xB6CA, 0xB6CB, 0xB6CC, 0xB6CD, /* 0xB0 */
+    0xB6CE, 0xB6CF, 0xB6D0, 0xB6D1, 0xB6D2, 0xB6D3, 	 0, 	 0, /* 0xB0 */
          0, 0xB6D4, 0xB6D5, 0xB6D6, 0xB6D7, 0xB6D8, 0xB6D9, 0xB6DA, /* 0xC0 */
     0xB6DB, 0xB6DC, 0xB6DD, 0xB6DE, 0xB6DF, 0xB6E0, 0xB6E1, 0xB6E2, /* 0xC0 */
-    0xB6E3, 0xB6E4,      0, 0xB6E5, 0xB6E6, 0xB6E7, 0xB6E8, 0xB6E9, /* 0xD0 */
-    0xB6EA, 0xB6EB, 0xB6EC, 0xB6ED, 0xB6EE, 0xB6EF,      0,      0, /* 0xD0 */
+    0xB6E3, 0xB6E4, 	 0, 0xB6E5, 0xB6E6, 0xB6E7, 0xB6E8, 0xB6E9, /* 0xD0 */
+    0xB6EA, 0xB6EB, 0xB6EC, 0xB6ED, 0xB6EE, 0xB6EF, 	 0, 	 0, /* 0xD0 */
          0, 0xB6F0, 0xB6F1, 0xB6F2, 0xB6F3, 0xB6F4, 0xB6F5, 0xB6F6, /* 0xE0 */
     0xB6F7, 0xB6F8, 0xB6F9, 0xB6FA, 0xB6FB, 0xB6FC, 0xB6FD, 0xB6FE, /* 0xE0 */
-    0xB6FF, 0xB700,      0, 0xB701, 0xB702, 0xB703, 0xB704, 0xB705, /* 0xF0 */
-    0xB706, 0xB707, 0xB708, 0xB709, 0xB70A, 0xB70B                  /* 0xF0 */
+    0xB6FF, 0xB700, 	 0, 0xB701, 0xB702, 0xB703, 0xB704, 0xB705, /* 0xF0 */
+    0xB706, 0xB707, 0xB708, 0xB709, 0xB70A, 0xB70B					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_9B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB70C, 0xB70D, 0xB70E, 0xB70F, 0xB710, 0xB711, 0xB712, /* 0x40 */
     0xB713, 0xB714, 0xB715, 0xB716, 0xB717, 0xB718, 0xB719, 0xB71A, /* 0x40 */
-    0xB71B, 0xB71C,      0, 0xB71D, 0xB71E, 0xB71F, 0xB720, 0xB721, /* 0x50 */
-    0xB722, 0xB723, 0xB724, 0xB725, 0xB726, 0xB727,      0,      0, /* 0x50 */
+    0xB71B, 0xB71C, 	 0, 0xB71D, 0xB71E, 0xB71F, 0xB720, 0xB721, /* 0x50 */
+    0xB722, 0xB723, 0xB724, 0xB725, 0xB726, 0xB727, 	 0, 	 0, /* 0x50 */
          0, 0xB728, 0xB729, 0xB72A, 0xB72B, 0xB72C, 0xB72D, 0xB72E, /* 0x60 */
     0xB72F, 0xB730, 0xB731, 0xB732, 0xB733, 0xB734, 0xB735, 0xB736, /* 0x60 */
-    0xB737, 0xB738,      0, 0xB739, 0xB73A, 0xB73B, 0xB73C, 0xB73D, /* 0x70 */
-    0xB73E, 0xB73F, 0xB740, 0xB741, 0xB742, 0xB743,      0,      0, /* 0x70 */
+    0xB737, 0xB738, 	 0, 0xB739, 0xB73A, 0xB73B, 0xB73C, 0xB73D, /* 0x70 */
+    0xB73E, 0xB73F, 0xB740, 0xB741, 0xB742, 0xB743, 	 0, 	 0, /* 0x70 */
          0, 0xB744, 0xB745, 0xB746, 0xB747, 0xB748, 0xB749, 0xB74A, /* 0x80 */
     0xB74B, 0xB74C, 0xB74D, 0xB74E, 0xB74F, 0xB750, 0xB751, 0xB752, /* 0x80 */
-    0xB753, 0xB754,      0, 0xB755, 0xB756, 0xB757, 0xB758, 0xB759, /* 0x90 */
-    0xB75A, 0xB75B, 0xB75C, 0xB75D, 0xB75E, 0xB75F,      0,      0, /* 0x90 */
+    0xB753, 0xB754, 	 0, 0xB755, 0xB756, 0xB757, 0xB758, 0xB759, /* 0x90 */
+    0xB75A, 0xB75B, 0xB75C, 0xB75D, 0xB75E, 0xB75F, 	 0, 	 0, /* 0x90 */
          0, 0xB760, 0xB761, 0xB762, 0xB763, 0xB764, 0xB765, 0xB766, /* 0xA0 */
     0xB767, 0xB768, 0xB769, 0xB76A, 0xB76B, 0xB76C, 0xB76D, 0xB76E, /* 0xA0 */
-    0xB76F, 0xB770,      0, 0xB771, 0xB772, 0xB773, 0xB774, 0xB775, /* 0xB0 */
-    0xB776, 0xB777, 0xB778, 0xB779, 0xB77A, 0xB77B                  /* 0xB0 */
+    0xB76F, 0xB770, 	 0, 0xB771, 0xB772, 0xB773, 0xB774, 0xB775, /* 0xB0 */
+    0xB776, 0xB777, 0xB778, 0xB779, 0xB77A, 0xB77B					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_9C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3139,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3139, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xB77C, 0xB77D, 0xB77E, 0xB77F, 0xB780, 0xB781, 0xB782, /* 0x60 */
     0xB783, 0xB784, 0xB785, 0xB786, 0xB787, 0xB788, 0xB789, 0xB78A, /* 0x60 */
-    0xB78B, 0xB78C,      0, 0xB78D, 0xB78E, 0xB78F, 0xB790, 0xB791, /* 0x70 */
-    0xB792, 0xB793, 0xB794, 0xB795, 0xB796, 0xB797,      0,      0, /* 0x70 */
+    0xB78B, 0xB78C, 	 0, 0xB78D, 0xB78E, 0xB78F, 0xB790, 0xB791, /* 0x70 */
+    0xB792, 0xB793, 0xB794, 0xB795, 0xB796, 0xB797, 	 0, 	 0, /* 0x70 */
          0, 0xB798, 0xB799, 0xB79A, 0xB79B, 0xB79C, 0xB79D, 0xB79E, /* 0x80 */
     0xB79F, 0xB7A0, 0xB7A1, 0xB7A2, 0xB7A3, 0xB7A4, 0xB7A5, 0xB7A6, /* 0x80 */
-    0xB7A7, 0xB7A8,      0, 0xB7A9, 0xB7AA, 0xB7AB, 0xB7AC, 0xB7AD, /* 0x90 */
-    0xB7AE, 0xB7AF, 0xB7B0, 0xB7B1, 0xB7B2, 0xB7B3,      0,      0, /* 0x90 */
+    0xB7A7, 0xB7A8, 	 0, 0xB7A9, 0xB7AA, 0xB7AB, 0xB7AC, 0xB7AD, /* 0x90 */
+    0xB7AE, 0xB7AF, 0xB7B0, 0xB7B1, 0xB7B2, 0xB7B3, 	 0, 	 0, /* 0x90 */
          0, 0xB7B4, 0xB7B5, 0xB7B6, 0xB7B7, 0xB7B8, 0xB7B9, 0xB7BA, /* 0xA0 */
     0xB7BB, 0xB7BC, 0xB7BD, 0xB7BE, 0xB7BF, 0xB7C0, 0xB7C1, 0xB7C2, /* 0xA0 */
-    0xB7C3, 0xB7C4,      0, 0xB7C5, 0xB7C6, 0xB7C7, 0xB7C8, 0xB7C9, /* 0xB0 */
-    0xB7CA, 0xB7CB, 0xB7CC, 0xB7CD, 0xB7CE, 0xB7CF,      0,      0, /* 0xB0 */
+    0xB7C3, 0xB7C4, 	 0, 0xB7C5, 0xB7C6, 0xB7C7, 0xB7C8, 0xB7C9, /* 0xB0 */
+    0xB7CA, 0xB7CB, 0xB7CC, 0xB7CD, 0xB7CE, 0xB7CF, 	 0, 	 0, /* 0xB0 */
          0, 0xB7D0, 0xB7D1, 0xB7D2, 0xB7D3, 0xB7D4, 0xB7D5, 0xB7D6, /* 0xC0 */
     0xB7D7, 0xB7D8, 0xB7D9, 0xB7DA, 0xB7DB, 0xB7DC, 0xB7DD, 0xB7DE, /* 0xC0 */
-    0xB7DF, 0xB7E0,      0, 0xB7E1, 0xB7E2, 0xB7E3, 0xB7E4, 0xB7E5, /* 0xD0 */
-    0xB7E6, 0xB7E7, 0xB7E8, 0xB7E9, 0xB7EA, 0xB7EB,      0,      0, /* 0xD0 */
+    0xB7DF, 0xB7E0, 	 0, 0xB7E1, 0xB7E2, 0xB7E3, 0xB7E4, 0xB7E5, /* 0xD0 */
+    0xB7E6, 0xB7E7, 0xB7E8, 0xB7E9, 0xB7EA, 0xB7EB, 	 0, 	 0, /* 0xD0 */
          0, 0xB7EC, 0xB7ED, 0xB7EE, 0xB7EF, 0xB7F0, 0xB7F1, 0xB7F2, /* 0xE0 */
     0xB7F3, 0xB7F4, 0xB7F5, 0xB7F6, 0xB7F7, 0xB7F8, 0xB7F9, 0xB7FA, /* 0xE0 */
-    0xB7FB, 0xB7FC,      0, 0xB7FD, 0xB7FE, 0xB7FF, 0xB800, 0xB801, /* 0xF0 */
-    0xB802, 0xB803, 0xB804, 0xB805, 0xB806, 0xB807                  /* 0xF0 */
+    0xB7FB, 0xB7FC, 	 0, 0xB7FD, 0xB7FE, 0xB7FF, 0xB800, 0xB801, /* 0xF0 */
+    0xB802, 0xB803, 0xB804, 0xB805, 0xB806, 0xB807					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_9D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB808, 0xB809, 0xB80A, 0xB80B, 0xB80C, 0xB80D, 0xB80E, /* 0x40 */
     0xB80F, 0xB810, 0xB811, 0xB812, 0xB813, 0xB814, 0xB815, 0xB816, /* 0x40 */
-    0xB817, 0xB818,      0, 0xB819, 0xB81A, 0xB81B, 0xB81C, 0xB81D, /* 0x50 */
-    0xB81E, 0xB81F, 0xB820, 0xB821, 0xB822, 0xB823,      0,      0, /* 0x50 */
+    0xB817, 0xB818, 	 0, 0xB819, 0xB81A, 0xB81B, 0xB81C, 0xB81D, /* 0x50 */
+    0xB81E, 0xB81F, 0xB820, 0xB821, 0xB822, 0xB823, 	 0, 	 0, /* 0x50 */
          0, 0xB824, 0xB825, 0xB826, 0xB827, 0xB828, 0xB829, 0xB82A, /* 0x60 */
     0xB82B, 0xB82C, 0xB82D, 0xB82E, 0xB82F, 0xB830, 0xB831, 0xB832, /* 0x60 */
-    0xB833, 0xB834,      0, 0xB835, 0xB836, 0xB837, 0xB838, 0xB839, /* 0x70 */
-    0xB83A, 0xB83B, 0xB83C, 0xB83D, 0xB83E, 0xB83F,      0,      0, /* 0x70 */
+    0xB833, 0xB834, 	 0, 0xB835, 0xB836, 0xB837, 0xB838, 0xB839, /* 0x70 */
+    0xB83A, 0xB83B, 0xB83C, 0xB83D, 0xB83E, 0xB83F, 	 0, 	 0, /* 0x70 */
          0, 0xB840, 0xB841, 0xB842, 0xB843, 0xB844, 0xB845, 0xB846, /* 0x80 */
     0xB847, 0xB848, 0xB849, 0xB84A, 0xB84B, 0xB84C, 0xB84D, 0xB84E, /* 0x80 */
-    0xB84F, 0xB850,      0, 0xB851, 0xB852, 0xB853, 0xB854, 0xB855, /* 0x90 */
-    0xB856, 0xB857, 0xB858, 0xB859, 0xB85A, 0xB85B,      0,      0, /* 0x90 */
+    0xB84F, 0xB850, 	 0, 0xB851, 0xB852, 0xB853, 0xB854, 0xB855, /* 0x90 */
+    0xB856, 0xB857, 0xB858, 0xB859, 0xB85A, 0xB85B, 	 0, 	 0, /* 0x90 */
          0, 0xB85C, 0xB85D, 0xB85E, 0xB85F, 0xB860, 0xB861, 0xB862, /* 0xA0 */
     0xB863, 0xB864, 0xB865, 0xB866, 0xB867, 0xB868, 0xB869, 0xB86A, /* 0xA0 */
-    0xB86B, 0xB86C,      0, 0xB86D, 0xB86E, 0xB86F, 0xB870, 0xB871, /* 0xB0 */
-    0xB872, 0xB873, 0xB874, 0xB875, 0xB876, 0xB877,      0,      0, /* 0xB0 */
+    0xB86B, 0xB86C, 	 0, 0xB86D, 0xB86E, 0xB86F, 0xB870, 0xB871, /* 0xB0 */
+    0xB872, 0xB873, 0xB874, 0xB875, 0xB876, 0xB877, 	 0, 	 0, /* 0xB0 */
          0, 0xB878, 0xB879, 0xB87A, 0xB87B, 0xB87C, 0xB87D, 0xB87E, /* 0xC0 */
     0xB87F, 0xB880, 0xB881, 0xB882, 0xB883, 0xB884, 0xB885, 0xB886, /* 0xC0 */
-    0xB887, 0xB888,      0, 0xB889, 0xB88A, 0xB88B, 0xB88C, 0xB88D, /* 0xD0 */
-    0xB88E, 0xB88F, 0xB890, 0xB891, 0xB892, 0xB893,      0,      0, /* 0xD0 */
+    0xB887, 0xB888, 	 0, 0xB889, 0xB88A, 0xB88B, 0xB88C, 0xB88D, /* 0xD0 */
+    0xB88E, 0xB88F, 0xB890, 0xB891, 0xB892, 0xB893, 	 0, 	 0, /* 0xD0 */
          0, 0xB894, 0xB895, 0xB896, 0xB897, 0xB898, 0xB899, 0xB89A, /* 0xE0 */
     0xB89B, 0xB89C, 0xB89D, 0xB89E, 0xB89F, 0xB8A0, 0xB8A1, 0xB8A2, /* 0xE0 */
-    0xB8A3, 0xB8A4,      0, 0xB8A5, 0xB8A6, 0xB8A7, 0xB8A8, 0xB8A9, /* 0xF0 */
-    0xB8AA, 0xB8AB, 0xB8AC, 0xB8AD, 0xB8AE, 0xB8AF                  /* 0xF0 */
+    0xB8A3, 0xB8A4, 	 0, 0xB8A5, 0xB8A6, 0xB8A7, 0xB8A8, 0xB8A9, /* 0xF0 */
+    0xB8AA, 0xB8AB, 0xB8AC, 0xB8AD, 0xB8AE, 0xB8AF					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_9E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB8B0, 0xB8B1, 0xB8B2, 0xB8B3, 0xB8B4, 0xB8B5, 0xB8B6, /* 0x40 */
     0xB8B7, 0xB8B8, 0xB8B9, 0xB8BA, 0xB8BB, 0xB8BC, 0xB8BD, 0xB8BE, /* 0x40 */
-    0xB8BF, 0xB8C0,      0, 0xB8C1, 0xB8C2, 0xB8C3, 0xB8C4, 0xB8C5, /* 0x50 */
-    0xB8C6, 0xB8C7, 0xB8C8, 0xB8C9, 0xB8CA, 0xB8CB,      0,      0, /* 0x50 */
+    0xB8BF, 0xB8C0, 	 0, 0xB8C1, 0xB8C2, 0xB8C3, 0xB8C4, 0xB8C5, /* 0x50 */
+    0xB8C6, 0xB8C7, 0xB8C8, 0xB8C9, 0xB8CA, 0xB8CB, 	 0, 	 0, /* 0x50 */
          0, 0xB8CC, 0xB8CD, 0xB8CE, 0xB8CF, 0xB8D0, 0xB8D1, 0xB8D2, /* 0x60 */
     0xB8D3, 0xB8D4, 0xB8D5, 0xB8D6, 0xB8D7, 0xB8D8, 0xB8D9, 0xB8DA, /* 0x60 */
-    0xB8DB, 0xB8DC,      0, 0xB8DD, 0xB8DE, 0xB8DF, 0xB8E0, 0xB8E1, /* 0x70 */
-    0xB8E2, 0xB8E3, 0xB8E4, 0xB8E5, 0xB8E6, 0xB8E7,      0,      0, /* 0x70 */
+    0xB8DB, 0xB8DC, 	 0, 0xB8DD, 0xB8DE, 0xB8DF, 0xB8E0, 0xB8E1, /* 0x70 */
+    0xB8E2, 0xB8E3, 0xB8E4, 0xB8E5, 0xB8E6, 0xB8E7, 	 0, 	 0, /* 0x70 */
          0, 0xB8E8, 0xB8E9, 0xB8EA, 0xB8EB, 0xB8EC, 0xB8ED, 0xB8EE, /* 0x80 */
     0xB8EF, 0xB8F0, 0xB8F1, 0xB8F2, 0xB8F3, 0xB8F4, 0xB8F5, 0xB8F6, /* 0x80 */
-    0xB8F7, 0xB8F8,      0, 0xB8F9, 0xB8FA, 0xB8FB, 0xB8FC, 0xB8FD, /* 0x90 */
-    0xB8FE, 0xB8FF, 0xB900, 0xB901, 0xB902, 0xB903,      0,      0, /* 0x90 */
+    0xB8F7, 0xB8F8, 	 0, 0xB8F9, 0xB8FA, 0xB8FB, 0xB8FC, 0xB8FD, /* 0x90 */
+    0xB8FE, 0xB8FF, 0xB900, 0xB901, 0xB902, 0xB903, 	 0, 	 0, /* 0x90 */
          0, 0xB904, 0xB905, 0xB906, 0xB907, 0xB908, 0xB909, 0xB90A, /* 0xA0 */
     0xB90B, 0xB90C, 0xB90D, 0xB90E, 0xB90F, 0xB910, 0xB911, 0xB912, /* 0xA0 */
-    0xB913, 0xB914,      0, 0xB915, 0xB916, 0xB917, 0xB918, 0xB919, /* 0xB0 */
-    0xB91A, 0xB91B, 0xB91C, 0xB91D, 0xB91E, 0xB91F,      0,      0, /* 0xB0 */
+    0xB913, 0xB914, 	 0, 0xB915, 0xB916, 0xB917, 0xB918, 0xB919, /* 0xB0 */
+    0xB91A, 0xB91B, 0xB91C, 0xB91D, 0xB91E, 0xB91F, 	 0, 	 0, /* 0xB0 */
          0, 0xB920, 0xB921, 0xB922, 0xB923, 0xB924, 0xB925, 0xB926, /* 0xC0 */
     0xB927, 0xB928, 0xB929, 0xB92A, 0xB92B, 0xB92C, 0xB92D, 0xB92E, /* 0xC0 */
-    0xB92F, 0xB930,      0, 0xB931, 0xB932, 0xB933, 0xB934, 0xB935, /* 0xD0 */
-    0xB936, 0xB937, 0xB938, 0xB939, 0xB93A, 0xB93B,      0,      0, /* 0xD0 */
+    0xB92F, 0xB930, 	 0, 0xB931, 0xB932, 0xB933, 0xB934, 0xB935, /* 0xD0 */
+    0xB936, 0xB937, 0xB938, 0xB939, 0xB93A, 0xB93B, 	 0, 	 0, /* 0xD0 */
          0, 0xB93C, 0xB93D, 0xB93E, 0xB93F, 0xB940, 0xB941, 0xB942, /* 0xE0 */
     0xB943, 0xB944, 0xB945, 0xB946, 0xB947, 0xB948, 0xB949, 0xB94A, /* 0xE0 */
-    0xB94B, 0xB94C,      0, 0xB94D, 0xB94E, 0xB94F, 0xB950, 0xB951, /* 0xF0 */
-    0xB952, 0xB953, 0xB954, 0xB955, 0xB956, 0xB957                  /* 0xF0 */
+    0xB94B, 0xB94C, 	 0, 0xB94D, 0xB94E, 0xB94F, 0xB950, 0xB951, /* 0xF0 */
+    0xB952, 0xB953, 0xB954, 0xB955, 0xB956, 0xB957					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_9F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xB958, 0xB959, 0xB95A, 0xB95B, 0xB95C, 0xB95D, 0xB95E, /* 0x40 */
     0xB95F, 0xB960, 0xB961, 0xB962, 0xB963, 0xB964, 0xB965, 0xB966, /* 0x40 */
-    0xB967, 0xB968,      0, 0xB969, 0xB96A, 0xB96B, 0xB96C, 0xB96D, /* 0x50 */
-    0xB96E, 0xB96F, 0xB970, 0xB971, 0xB972, 0xB973,      0,      0, /* 0x50 */
+    0xB967, 0xB968, 	 0, 0xB969, 0xB96A, 0xB96B, 0xB96C, 0xB96D, /* 0x50 */
+    0xB96E, 0xB96F, 0xB970, 0xB971, 0xB972, 0xB973, 	 0, 	 0, /* 0x50 */
          0, 0xB974, 0xB975, 0xB976, 0xB977, 0xB978, 0xB979, 0xB97A, /* 0x60 */
     0xB97B, 0xB97C, 0xB97D, 0xB97E, 0xB97F, 0xB980, 0xB981, 0xB982, /* 0x60 */
-    0xB983, 0xB984,      0, 0xB985, 0xB986, 0xB987, 0xB988, 0xB989, /* 0x70 */
-    0xB98A, 0xB98B, 0xB98C, 0xB98D, 0xB98E, 0xB98F,      0,      0, /* 0x70 */
+    0xB983, 0xB984, 	 0, 0xB985, 0xB986, 0xB987, 0xB988, 0xB989, /* 0x70 */
+    0xB98A, 0xB98B, 0xB98C, 0xB98D, 0xB98E, 0xB98F, 	 0, 	 0, /* 0x70 */
          0, 0xB990, 0xB991, 0xB992, 0xB993, 0xB994, 0xB995, 0xB996, /* 0x80 */
     0xB997, 0xB998, 0xB999, 0xB99A, 0xB99B, 0xB99C, 0xB99D, 0xB99E, /* 0x80 */
-    0xB99F, 0xB9A0,      0, 0xB9A1, 0xB9A2, 0xB9A3, 0xB9A4, 0xB9A5, /* 0x90 */
-    0xB9A6, 0xB9A7, 0xB9A8, 0xB9A9, 0xB9AA, 0xB9AB,      0,      0, /* 0x90 */
+    0xB99F, 0xB9A0, 	 0, 0xB9A1, 0xB9A2, 0xB9A3, 0xB9A4, 0xB9A5, /* 0x90 */
+    0xB9A6, 0xB9A7, 0xB9A8, 0xB9A9, 0xB9AA, 0xB9AB, 	 0, 	 0, /* 0x90 */
          0, 0xB9AC, 0xB9AD, 0xB9AE, 0xB9AF, 0xB9B0, 0xB9B1, 0xB9B2, /* 0xA0 */
     0xB9B3, 0xB9B4, 0xB9B5, 0xB9B6, 0xB9B7, 0xB9B8, 0xB9B9, 0xB9BA, /* 0xA0 */
-    0xB9BB, 0xB9BC,      0, 0xB9BD, 0xB9BE, 0xB9BF, 0xB9C0, 0xB9C1, /* 0xB0 */
-    0xB9C2, 0xB9C3, 0xB9C4, 0xB9C5, 0xB9C6, 0xB9C7                  /* 0xB0 */
+    0xB9BB, 0xB9BC, 	 0, 0xB9BD, 0xB9BE, 0xB9BF, 0xB9C0, 0xB9C1, /* 0xB0 */
+    0xB9C2, 0xB9C3, 0xB9C4, 0xB9C5, 0xB9C6, 0xB9C7					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_A0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3141,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3141, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xB9C8, 0xB9C9, 0xB9CA, 0xB9CB, 0xB9CC, 0xB9CD, 0xB9CE, /* 0x60 */
     0xB9CF, 0xB9D0, 0xB9D1, 0xB9D2, 0xB9D3, 0xB9D4, 0xB9D5, 0xB9D6, /* 0x60 */
-    0xB9D7, 0xB9D8,      0, 0xB9D9, 0xB9DA, 0xB9DB, 0xB9DC, 0xB9DD, /* 0x70 */
-    0xB9DE, 0xB9DF, 0xB9E0, 0xB9E1, 0xB9E2, 0xB9E3,      0,      0, /* 0x70 */
+    0xB9D7, 0xB9D8, 	 0, 0xB9D9, 0xB9DA, 0xB9DB, 0xB9DC, 0xB9DD, /* 0x70 */
+    0xB9DE, 0xB9DF, 0xB9E0, 0xB9E1, 0xB9E2, 0xB9E3, 	 0, 	 0, /* 0x70 */
          0, 0xB9E4, 0xB9E5, 0xB9E6, 0xB9E7, 0xB9E8, 0xB9E9, 0xB9EA, /* 0x80 */
     0xB9EB, 0xB9EC, 0xB9ED, 0xB9EE, 0xB9EF, 0xB9F0, 0xB9F1, 0xB9F2, /* 0x80 */
-    0xB9F3, 0xB9F4,      0, 0xB9F5, 0xB9F6, 0xB9F7, 0xB9F8, 0xB9F9, /* 0x90 */
-    0xB9FA, 0xB9FB, 0xB9FC, 0xB9FD, 0xB9FE, 0xB9FF,      0,      0, /* 0x90 */
+    0xB9F3, 0xB9F4, 	 0, 0xB9F5, 0xB9F6, 0xB9F7, 0xB9F8, 0xB9F9, /* 0x90 */
+    0xB9FA, 0xB9FB, 0xB9FC, 0xB9FD, 0xB9FE, 0xB9FF, 	 0, 	 0, /* 0x90 */
          0, 0xBA00, 0xBA01, 0xBA02, 0xBA03, 0xBA04, 0xBA05, 0xBA06, /* 0xA0 */
     0xBA07, 0xBA08, 0xBA09, 0xBA0A, 0xBA0B, 0xBA0C, 0xBA0D, 0xBA0E, /* 0xA0 */
-    0xBA0F, 0xBA10,      0, 0xBA11, 0xBA12, 0xBA13, 0xBA14, 0xBA15, /* 0xB0 */
-    0xBA16, 0xBA17, 0xBA18, 0xBA19, 0xBA1A, 0xBA1B,      0,      0, /* 0xB0 */
+    0xBA0F, 0xBA10, 	 0, 0xBA11, 0xBA12, 0xBA13, 0xBA14, 0xBA15, /* 0xB0 */
+    0xBA16, 0xBA17, 0xBA18, 0xBA19, 0xBA1A, 0xBA1B, 	 0, 	 0, /* 0xB0 */
          0, 0xBA1C, 0xBA1D, 0xBA1E, 0xBA1F, 0xBA20, 0xBA21, 0xBA22, /* 0xC0 */
     0xBA23, 0xBA24, 0xBA25, 0xBA26, 0xBA27, 0xBA28, 0xBA29, 0xBA2A, /* 0xC0 */
-    0xBA2B, 0xBA2C,      0, 0xBA2D, 0xBA2E, 0xBA2F, 0xBA30, 0xBA31, /* 0xD0 */
-    0xBA32, 0xBA33, 0xBA34, 0xBA35, 0xBA36, 0xBA37,      0,      0, /* 0xD0 */
+    0xBA2B, 0xBA2C, 	 0, 0xBA2D, 0xBA2E, 0xBA2F, 0xBA30, 0xBA31, /* 0xD0 */
+    0xBA32, 0xBA33, 0xBA34, 0xBA35, 0xBA36, 0xBA37, 	 0, 	 0, /* 0xD0 */
          0, 0xBA38, 0xBA39, 0xBA3A, 0xBA3B, 0xBA3C, 0xBA3D, 0xBA3E, /* 0xE0 */
     0xBA3F, 0xBA40, 0xBA41, 0xBA42, 0xBA43, 0xBA44, 0xBA45, 0xBA46, /* 0xE0 */
-    0xBA47, 0xBA48,      0, 0xBA49, 0xBA4A, 0xBA4B, 0xBA4C, 0xBA4D, /* 0xF0 */
-    0xBA4E, 0xBA4F, 0xBA50, 0xBA51, 0xBA52, 0xBA53                  /* 0xF0 */
+    0xBA47, 0xBA48, 	 0, 0xBA49, 0xBA4A, 0xBA4B, 0xBA4C, 0xBA4D, /* 0xF0 */
+    0xBA4E, 0xBA4F, 0xBA50, 0xBA51, 0xBA52, 0xBA53					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_A1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xBA54, 0xBA55, 0xBA56, 0xBA57, 0xBA58, 0xBA59, 0xBA5A, /* 0x40 */
     0xBA5B, 0xBA5C, 0xBA5D, 0xBA5E, 0xBA5F, 0xBA60, 0xBA61, 0xBA62, /* 0x40 */
-    0xBA63, 0xBA64,      0, 0xBA65, 0xBA66, 0xBA67, 0xBA68, 0xBA69, /* 0x50 */
-    0xBA6A, 0xBA6B, 0xBA6C, 0xBA6D, 0xBA6E, 0xBA6F,      0,      0, /* 0x50 */
+    0xBA63, 0xBA64, 	 0, 0xBA65, 0xBA66, 0xBA67, 0xBA68, 0xBA69, /* 0x50 */
+    0xBA6A, 0xBA6B, 0xBA6C, 0xBA6D, 0xBA6E, 0xBA6F, 	 0, 	 0, /* 0x50 */
          0, 0xBA70, 0xBA71, 0xBA72, 0xBA73, 0xBA74, 0xBA75, 0xBA76, /* 0x60 */
     0xBA77, 0xBA78, 0xBA79, 0xBA7A, 0xBA7B, 0xBA7C, 0xBA7D, 0xBA7E, /* 0x60 */
-    0xBA7F, 0xBA80,      0, 0xBA81, 0xBA82, 0xBA83, 0xBA84, 0xBA85, /* 0x70 */
-    0xBA86, 0xBA87, 0xBA88, 0xBA89, 0xBA8A, 0xBA8B,      0,      0, /* 0x70 */
+    0xBA7F, 0xBA80, 	 0, 0xBA81, 0xBA82, 0xBA83, 0xBA84, 0xBA85, /* 0x70 */
+    0xBA86, 0xBA87, 0xBA88, 0xBA89, 0xBA8A, 0xBA8B, 	 0, 	 0, /* 0x70 */
          0, 0xBA8C, 0xBA8D, 0xBA8E, 0xBA8F, 0xBA90, 0xBA91, 0xBA92, /* 0x80 */
     0xBA93, 0xBA94, 0xBA95, 0xBA96, 0xBA97, 0xBA98, 0xBA99, 0xBA9A, /* 0x80 */
-    0xBA9B, 0xBA9C,      0, 0xBA9D, 0xBA9E, 0xBA9F, 0xBAA0, 0xBAA1, /* 0x90 */
-    0xBAA2, 0xBAA3, 0xBAA4, 0xBAA5, 0xBAA6, 0xBAA7,      0,      0, /* 0x90 */
+    0xBA9B, 0xBA9C, 	 0, 0xBA9D, 0xBA9E, 0xBA9F, 0xBAA0, 0xBAA1, /* 0x90 */
+    0xBAA2, 0xBAA3, 0xBAA4, 0xBAA5, 0xBAA6, 0xBAA7, 	 0, 	 0, /* 0x90 */
          0, 0xBAA8, 0xBAA9, 0xBAAA, 0xBAAB, 0xBAAC, 0xBAAD, 0xBAAE, /* 0xA0 */
     0xBAAF, 0xBAB0, 0xBAB1, 0xBAB2, 0xBAB3, 0xBAB4, 0xBAB5, 0xBAB6, /* 0xA0 */
-    0xBAB7, 0xBAB8,      0, 0xBAB9, 0xBABA, 0xBABB, 0xBABC, 0xBABD, /* 0xB0 */
-    0xBABE, 0xBABF, 0xBAC0, 0xBAC1, 0xBAC2, 0xBAC3,      0,      0, /* 0xB0 */
+    0xBAB7, 0xBAB8, 	 0, 0xBAB9, 0xBABA, 0xBABB, 0xBABC, 0xBABD, /* 0xB0 */
+    0xBABE, 0xBABF, 0xBAC0, 0xBAC1, 0xBAC2, 0xBAC3, 	 0, 	 0, /* 0xB0 */
          0, 0xBAC4, 0xBAC5, 0xBAC6, 0xBAC7, 0xBAC8, 0xBAC9, 0xBACA, /* 0xC0 */
     0xBACB, 0xBACC, 0xBACD, 0xBACE, 0xBACF, 0xBAD0, 0xBAD1, 0xBAD2, /* 0xC0 */
-    0xBAD3, 0xBAD4,      0, 0xBAD5, 0xBAD6, 0xBAD7, 0xBAD8, 0xBAD9, /* 0xD0 */
-    0xBADA, 0xBADB, 0xBADC, 0xBADD, 0xBADE, 0xBADF,      0,      0, /* 0xD0 */
+    0xBAD3, 0xBAD4, 	 0, 0xBAD5, 0xBAD6, 0xBAD7, 0xBAD8, 0xBAD9, /* 0xD0 */
+    0xBADA, 0xBADB, 0xBADC, 0xBADD, 0xBADE, 0xBADF, 	 0, 	 0, /* 0xD0 */
          0, 0xBAE0, 0xBAE1, 0xBAE2, 0xBAE3, 0xBAE4, 0xBAE5, 0xBAE6, /* 0xE0 */
     0xBAE7, 0xBAE8, 0xBAE9, 0xBAEA, 0xBAEB, 0xBAEC, 0xBAED, 0xBAEE, /* 0xE0 */
-    0xBAEF, 0xBAF0,      0, 0xBAF1, 0xBAF2, 0xBAF3, 0xBAF4, 0xBAF5, /* 0xF0 */
-    0xBAF6, 0xBAF7, 0xBAF8, 0xBAF9, 0xBAFA, 0xBAFB                  /* 0xF0 */
+    0xBAEF, 0xBAF0, 	 0, 0xBAF1, 0xBAF2, 0xBAF3, 0xBAF4, 0xBAF5, /* 0xF0 */
+    0xBAF6, 0xBAF7, 0xBAF8, 0xBAF9, 0xBAFA, 0xBAFB					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_A2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xBAFC, 0xBAFD, 0xBAFE, 0xBAFF, 0xBB00, 0xBB01, 0xBB02, /* 0x40 */
     0xBB03, 0xBB04, 0xBB05, 0xBB06, 0xBB07, 0xBB08, 0xBB09, 0xBB0A, /* 0x40 */
-    0xBB0B, 0xBB0C,      0, 0xBB0D, 0xBB0E, 0xBB0F, 0xBB10, 0xBB11, /* 0x50 */
-    0xBB12, 0xBB13, 0xBB14, 0xBB15, 0xBB16, 0xBB17,      0,      0, /* 0x50 */
+    0xBB0B, 0xBB0C, 	 0, 0xBB0D, 0xBB0E, 0xBB0F, 0xBB10, 0xBB11, /* 0x50 */
+    0xBB12, 0xBB13, 0xBB14, 0xBB15, 0xBB16, 0xBB17, 	 0, 	 0, /* 0x50 */
          0, 0xBB18, 0xBB19, 0xBB1A, 0xBB1B, 0xBB1C, 0xBB1D, 0xBB1E, /* 0x60 */
     0xBB1F, 0xBB20, 0xBB21, 0xBB22, 0xBB23, 0xBB24, 0xBB25, 0xBB26, /* 0x60 */
-    0xBB27, 0xBB28,      0, 0xBB29, 0xBB2A, 0xBB2B, 0xBB2C, 0xBB2D, /* 0x70 */
-    0xBB2E, 0xBB2F, 0xBB30, 0xBB31, 0xBB32, 0xBB33,      0,      0, /* 0x70 */
+    0xBB27, 0xBB28, 	 0, 0xBB29, 0xBB2A, 0xBB2B, 0xBB2C, 0xBB2D, /* 0x70 */
+    0xBB2E, 0xBB2F, 0xBB30, 0xBB31, 0xBB32, 0xBB33, 	 0, 	 0, /* 0x70 */
          0, 0xBB34, 0xBB35, 0xBB36, 0xBB37, 0xBB38, 0xBB39, 0xBB3A, /* 0x80 */
     0xBB3B, 0xBB3C, 0xBB3D, 0xBB3E, 0xBB3F, 0xBB40, 0xBB41, 0xBB42, /* 0x80 */
-    0xBB43, 0xBB44,      0, 0xBB45, 0xBB46, 0xBB47, 0xBB48, 0xBB49, /* 0x90 */
-    0xBB4A, 0xBB4B, 0xBB4C, 0xBB4D, 0xBB4E, 0xBB4F,      0,      0, /* 0x90 */
+    0xBB43, 0xBB44, 	 0, 0xBB45, 0xBB46, 0xBB47, 0xBB48, 0xBB49, /* 0x90 */
+    0xBB4A, 0xBB4B, 0xBB4C, 0xBB4D, 0xBB4E, 0xBB4F, 	 0, 	 0, /* 0x90 */
          0, 0xBB50, 0xBB51, 0xBB52, 0xBB53, 0xBB54, 0xBB55, 0xBB56, /* 0xA0 */
     0xBB57, 0xBB58, 0xBB59, 0xBB5A, 0xBB5B, 0xBB5C, 0xBB5D, 0xBB5E, /* 0xA0 */
-    0xBB5F, 0xBB60,      0, 0xBB61, 0xBB62, 0xBB63, 0xBB64, 0xBB65, /* 0xB0 */
-    0xBB66, 0xBB67, 0xBB68, 0xBB69, 0xBB6A, 0xBB6B,      0,      0, /* 0xB0 */
+    0xBB5F, 0xBB60, 	 0, 0xBB61, 0xBB62, 0xBB63, 0xBB64, 0xBB65, /* 0xB0 */
+    0xBB66, 0xBB67, 0xBB68, 0xBB69, 0xBB6A, 0xBB6B, 	 0, 	 0, /* 0xB0 */
          0, 0xBB6C, 0xBB6D, 0xBB6E, 0xBB6F, 0xBB70, 0xBB71, 0xBB72, /* 0xC0 */
     0xBB73, 0xBB74, 0xBB75, 0xBB76, 0xBB77, 0xBB78, 0xBB79, 0xBB7A, /* 0xC0 */
-    0xBB7B, 0xBB7C,      0, 0xBB7D, 0xBB7E, 0xBB7F, 0xBB80, 0xBB81, /* 0xD0 */
-    0xBB82, 0xBB83, 0xBB84, 0xBB85, 0xBB86, 0xBB87,      0,      0, /* 0xD0 */
+    0xBB7B, 0xBB7C, 	 0, 0xBB7D, 0xBB7E, 0xBB7F, 0xBB80, 0xBB81, /* 0xD0 */
+    0xBB82, 0xBB83, 0xBB84, 0xBB85, 0xBB86, 0xBB87, 	 0, 	 0, /* 0xD0 */
          0, 0xBB88, 0xBB89, 0xBB8A, 0xBB8B, 0xBB8C, 0xBB8D, 0xBB8E, /* 0xE0 */
     0xBB8F, 0xBB90, 0xBB91, 0xBB92, 0xBB93, 0xBB94, 0xBB95, 0xBB96, /* 0xE0 */
-    0xBB97, 0xBB98,      0, 0xBB99, 0xBB9A, 0xBB9B, 0xBB9C, 0xBB9D, /* 0xF0 */
-    0xBB9E, 0xBB9F, 0xBBA0, 0xBBA1, 0xBBA2, 0xBBA3                  /* 0xF0 */
+    0xBB97, 0xBB98, 	 0, 0xBB99, 0xBB9A, 0xBB9B, 0xBB9C, 0xBB9D, /* 0xF0 */
+    0xBB9E, 0xBB9F, 0xBBA0, 0xBBA1, 0xBBA2, 0xBBA3					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_A3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xBBA4, 0xBBA5, 0xBBA6, 0xBBA7, 0xBBA8, 0xBBA9, 0xBBAA, /* 0x40 */
     0xBBAB, 0xBBAC, 0xBBAD, 0xBBAE, 0xBBAF, 0xBBB0, 0xBBB1, 0xBBB2, /* 0x40 */
-    0xBBB3, 0xBBB4,      0, 0xBBB5, 0xBBB6, 0xBBB7, 0xBBB8, 0xBBB9, /* 0x50 */
-    0xBBBA, 0xBBBB, 0xBBBC, 0xBBBD, 0xBBBE, 0xBBBF,      0,      0, /* 0x50 */
+    0xBBB3, 0xBBB4, 	 0, 0xBBB5, 0xBBB6, 0xBBB7, 0xBBB8, 0xBBB9, /* 0x50 */
+    0xBBBA, 0xBBBB, 0xBBBC, 0xBBBD, 0xBBBE, 0xBBBF, 	 0, 	 0, /* 0x50 */
          0, 0xBBC0, 0xBBC1, 0xBBC2, 0xBBC3, 0xBBC4, 0xBBC5, 0xBBC6, /* 0x60 */
     0xBBC7, 0xBBC8, 0xBBC9, 0xBBCA, 0xBBCB, 0xBBCC, 0xBBCD, 0xBBCE, /* 0x60 */
-    0xBBCF, 0xBBD0,      0, 0xBBD1, 0xBBD2, 0xBBD3, 0xBBD4, 0xBBD5, /* 0x70 */
-    0xBBD6, 0xBBD7, 0xBBD8, 0xBBD9, 0xBBDA, 0xBBDB,      0,      0, /* 0x70 */
+    0xBBCF, 0xBBD0, 	 0, 0xBBD1, 0xBBD2, 0xBBD3, 0xBBD4, 0xBBD5, /* 0x70 */
+    0xBBD6, 0xBBD7, 0xBBD8, 0xBBD9, 0xBBDA, 0xBBDB, 	 0, 	 0, /* 0x70 */
          0, 0xBBDC, 0xBBDD, 0xBBDE, 0xBBDF, 0xBBE0, 0xBBE1, 0xBBE2, /* 0x80 */
     0xBBE3, 0xBBE4, 0xBBE5, 0xBBE6, 0xBBE7, 0xBBE8, 0xBBE9, 0xBBEA, /* 0x80 */
-    0xBBEB, 0xBBEC,      0, 0xBBED, 0xBBEE, 0xBBEF, 0xBBF0, 0xBBF1, /* 0x90 */
-    0xBBF2, 0xBBF3, 0xBBF4, 0xBBF5, 0xBBF6, 0xBBF7,      0,      0, /* 0x90 */
+    0xBBEB, 0xBBEC, 	 0, 0xBBED, 0xBBEE, 0xBBEF, 0xBBF0, 0xBBF1, /* 0x90 */
+    0xBBF2, 0xBBF3, 0xBBF4, 0xBBF5, 0xBBF6, 0xBBF7, 	 0, 	 0, /* 0x90 */
          0, 0xBBF8, 0xBBF9, 0xBBFA, 0xBBFB, 0xBBFC, 0xBBFD, 0xBBFE, /* 0xA0 */
     0xBBFF, 0xBC00, 0xBC01, 0xBC02, 0xBC03, 0xBC04, 0xBC05, 0xBC06, /* 0xA0 */
-    0xBC07, 0xBC08,      0, 0xBC09, 0xBC0A, 0xBC0B, 0xBC0C, 0xBC0D, /* 0xB0 */
-    0xBC0E, 0xBC0F, 0xBC10, 0xBC11, 0xBC12, 0xBC13                  /* 0xB0 */
+    0xBC07, 0xBC08, 	 0, 0xBC09, 0xBC0A, 0xBC0B, 0xBC0C, 0xBC0D, /* 0xB0 */
+    0xBC0E, 0xBC0F, 0xBC10, 0xBC11, 0xBC12, 0xBC13					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_A4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3142,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3142, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xBC14, 0xBC15, 0xBC16, 0xBC17, 0xBC18, 0xBC19, 0xBC1A, /* 0x60 */
     0xBC1B, 0xBC1C, 0xBC1D, 0xBC1E, 0xBC1F, 0xBC20, 0xBC21, 0xBC22, /* 0x60 */
-    0xBC23, 0xBC24,      0, 0xBC25, 0xBC26, 0xBC27, 0xBC28, 0xBC29, /* 0x70 */
-    0xBC2A, 0xBC2B, 0xBC2C, 0xBC2D, 0xBC2E, 0xBC2F,      0,      0, /* 0x70 */
+    0xBC23, 0xBC24, 	 0, 0xBC25, 0xBC26, 0xBC27, 0xBC28, 0xBC29, /* 0x70 */
+    0xBC2A, 0xBC2B, 0xBC2C, 0xBC2D, 0xBC2E, 0xBC2F, 	 0, 	 0, /* 0x70 */
          0, 0xBC30, 0xBC31, 0xBC32, 0xBC33, 0xBC34, 0xBC35, 0xBC36, /* 0x80 */
     0xBC37, 0xBC38, 0xBC39, 0xBC3A, 0xBC3B, 0xBC3C, 0xBC3D, 0xBC3E, /* 0x80 */
-    0xBC3F, 0xBC40,      0, 0xBC41, 0xBC42, 0xBC43, 0xBC44, 0xBC45, /* 0x90 */
-    0xBC46, 0xBC47, 0xBC48, 0xBC49, 0xBC4A, 0xBC4B,      0,      0, /* 0x90 */
+    0xBC3F, 0xBC40, 	 0, 0xBC41, 0xBC42, 0xBC43, 0xBC44, 0xBC45, /* 0x90 */
+    0xBC46, 0xBC47, 0xBC48, 0xBC49, 0xBC4A, 0xBC4B, 	 0, 	 0, /* 0x90 */
          0, 0xBC4C, 0xBC4D, 0xBC4E, 0xBC4F, 0xBC50, 0xBC51, 0xBC52, /* 0xA0 */
     0xBC53, 0xBC54, 0xBC55, 0xBC56, 0xBC57, 0xBC58, 0xBC59, 0xBC5A, /* 0xA0 */
-    0xBC5B, 0xBC5C,      0, 0xBC5D, 0xBC5E, 0xBC5F, 0xBC60, 0xBC61, /* 0xB0 */
-    0xBC62, 0xBC63, 0xBC64, 0xBC65, 0xBC66, 0xBC67,      0,      0, /* 0xB0 */
+    0xBC5B, 0xBC5C, 	 0, 0xBC5D, 0xBC5E, 0xBC5F, 0xBC60, 0xBC61, /* 0xB0 */
+    0xBC62, 0xBC63, 0xBC64, 0xBC65, 0xBC66, 0xBC67, 	 0, 	 0, /* 0xB0 */
          0, 0xBC68, 0xBC69, 0xBC6A, 0xBC6B, 0xBC6C, 0xBC6D, 0xBC6E, /* 0xC0 */
     0xBC6F, 0xBC70, 0xBC71, 0xBC72, 0xBC73, 0xBC74, 0xBC75, 0xBC76, /* 0xC0 */
-    0xBC77, 0xBC78,      0, 0xBC79, 0xBC7A, 0xBC7B, 0xBC7C, 0xBC7D, /* 0xD0 */
-    0xBC7E, 0xBC7F, 0xBC80, 0xBC81, 0xBC82, 0xBC83,      0,      0, /* 0xD0 */
+    0xBC77, 0xBC78, 	 0, 0xBC79, 0xBC7A, 0xBC7B, 0xBC7C, 0xBC7D, /* 0xD0 */
+    0xBC7E, 0xBC7F, 0xBC80, 0xBC81, 0xBC82, 0xBC83, 	 0, 	 0, /* 0xD0 */
          0, 0xBC84, 0xBC85, 0xBC86, 0xBC87, 0xBC88, 0xBC89, 0xBC8A, /* 0xE0 */
     0xBC8B, 0xBC8C, 0xBC8D, 0xBC8E, 0xBC8F, 0xBC90, 0xBC91, 0xBC92, /* 0xE0 */
-    0xBC93, 0xBC94,      0, 0xBC95, 0xBC96, 0xBC97, 0xBC98, 0xBC99, /* 0xF0 */
-    0xBC9A, 0xBC9B, 0xBC9C, 0xBC9D, 0xBC9E, 0xBC9F                  /* 0xF0 */
+    0xBC93, 0xBC94, 	 0, 0xBC95, 0xBC96, 0xBC97, 0xBC98, 0xBC99, /* 0xF0 */
+    0xBC9A, 0xBC9B, 0xBC9C, 0xBC9D, 0xBC9E, 0xBC9F					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_A5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xBCA0, 0xBCA1, 0xBCA2, 0xBCA3, 0xBCA4, 0xBCA5, 0xBCA6, /* 0x40 */
     0xBCA7, 0xBCA8, 0xBCA9, 0xBCAA, 0xBCAB, 0xBCAC, 0xBCAD, 0xBCAE, /* 0x40 */
-    0xBCAF, 0xBCB0,      0, 0xBCB1, 0xBCB2, 0xBCB3, 0xBCB4, 0xBCB5, /* 0x50 */
-    0xBCB6, 0xBCB7, 0xBCB8, 0xBCB9, 0xBCBA, 0xBCBB,      0,      0, /* 0x50 */
+    0xBCAF, 0xBCB0, 	 0, 0xBCB1, 0xBCB2, 0xBCB3, 0xBCB4, 0xBCB5, /* 0x50 */
+    0xBCB6, 0xBCB7, 0xBCB8, 0xBCB9, 0xBCBA, 0xBCBB, 	 0, 	 0, /* 0x50 */
          0, 0xBCBC, 0xBCBD, 0xBCBE, 0xBCBF, 0xBCC0, 0xBCC1, 0xBCC2, /* 0x60 */
     0xBCC3, 0xBCC4, 0xBCC5, 0xBCC6, 0xBCC7, 0xBCC8, 0xBCC9, 0xBCCA, /* 0x60 */
-    0xBCCB, 0xBCCC,      0, 0xBCCD, 0xBCCE, 0xBCCF, 0xBCD0, 0xBCD1, /* 0x70 */
-    0xBCD2, 0xBCD3, 0xBCD4, 0xBCD5, 0xBCD6, 0xBCD7,      0,      0, /* 0x70 */
+    0xBCCB, 0xBCCC, 	 0, 0xBCCD, 0xBCCE, 0xBCCF, 0xBCD0, 0xBCD1, /* 0x70 */
+    0xBCD2, 0xBCD3, 0xBCD4, 0xBCD5, 0xBCD6, 0xBCD7, 	 0, 	 0, /* 0x70 */
          0, 0xBCD8, 0xBCD9, 0xBCDA, 0xBCDB, 0xBCDC, 0xBCDD, 0xBCDE, /* 0x80 */
     0xBCDF, 0xBCE0, 0xBCE1, 0xBCE2, 0xBCE3, 0xBCE4, 0xBCE5, 0xBCE6, /* 0x80 */
-    0xBCE7, 0xBCE8,      0, 0xBCE9, 0xBCEA, 0xBCEB, 0xBCEC, 0xBCED, /* 0x90 */
-    0xBCEE, 0xBCEF, 0xBCF0, 0xBCF1, 0xBCF2, 0xBCF3,      0,      0, /* 0x90 */
+    0xBCE7, 0xBCE8, 	 0, 0xBCE9, 0xBCEA, 0xBCEB, 0xBCEC, 0xBCED, /* 0x90 */
+    0xBCEE, 0xBCEF, 0xBCF0, 0xBCF1, 0xBCF2, 0xBCF3, 	 0, 	 0, /* 0x90 */
          0, 0xBCF4, 0xBCF5, 0xBCF6, 0xBCF7, 0xBCF8, 0xBCF9, 0xBCFA, /* 0xA0 */
     0xBCFB, 0xBCFC, 0xBCFD, 0xBCFE, 0xBCFF, 0xBD00, 0xBD01, 0xBD02, /* 0xA0 */
-    0xBD03, 0xBD04,      0, 0xBD05, 0xBD06, 0xBD07, 0xBD08, 0xBD09, /* 0xB0 */
-    0xBD0A, 0xBD0B, 0xBD0C, 0xBD0D, 0xBD0E, 0xBD0F,      0,      0, /* 0xB0 */
+    0xBD03, 0xBD04, 	 0, 0xBD05, 0xBD06, 0xBD07, 0xBD08, 0xBD09, /* 0xB0 */
+    0xBD0A, 0xBD0B, 0xBD0C, 0xBD0D, 0xBD0E, 0xBD0F, 	 0, 	 0, /* 0xB0 */
          0, 0xBD10, 0xBD11, 0xBD12, 0xBD13, 0xBD14, 0xBD15, 0xBD16, /* 0xC0 */
     0xBD17, 0xBD18, 0xBD19, 0xBD1A, 0xBD1B, 0xBD1C, 0xBD1D, 0xBD1E, /* 0xC0 */
-    0xBD1F, 0xBD20,      0, 0xBD21, 0xBD22, 0xBD23, 0xBD24, 0xBD25, /* 0xD0 */
-    0xBD26, 0xBD27, 0xBD28, 0xBD29, 0xBD2A, 0xBD2B,      0,      0, /* 0xD0 */
+    0xBD1F, 0xBD20, 	 0, 0xBD21, 0xBD22, 0xBD23, 0xBD24, 0xBD25, /* 0xD0 */
+    0xBD26, 0xBD27, 0xBD28, 0xBD29, 0xBD2A, 0xBD2B, 	 0, 	 0, /* 0xD0 */
          0, 0xBD2C, 0xBD2D, 0xBD2E, 0xBD2F, 0xBD30, 0xBD31, 0xBD32, /* 0xE0 */
     0xBD33, 0xBD34, 0xBD35, 0xBD36, 0xBD37, 0xBD38, 0xBD39, 0xBD3A, /* 0xE0 */
-    0xBD3B, 0xBD3C,      0, 0xBD3D, 0xBD3E, 0xBD3F, 0xBD40, 0xBD41, /* 0xF0 */
-    0xBD42, 0xBD43, 0xBD44, 0xBD45, 0xBD46, 0xBD47                  /* 0xF0 */
+    0xBD3B, 0xBD3C, 	 0, 0xBD3D, 0xBD3E, 0xBD3F, 0xBD40, 0xBD41, /* 0xF0 */
+    0xBD42, 0xBD43, 0xBD44, 0xBD45, 0xBD46, 0xBD47					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_A6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xBD48, 0xBD49, 0xBD4A, 0xBD4B, 0xBD4C, 0xBD4D, 0xBD4E, /* 0x40 */
     0xBD4F, 0xBD50, 0xBD51, 0xBD52, 0xBD53, 0xBD54, 0xBD55, 0xBD56, /* 0x40 */
-    0xBD57, 0xBD58,      0, 0xBD59, 0xBD5A, 0xBD5B, 0xBD5C, 0xBD5D, /* 0x50 */
-    0xBD5E, 0xBD5F, 0xBD60, 0xBD61, 0xBD62, 0xBD63,      0,      0, /* 0x50 */
+    0xBD57, 0xBD58, 	 0, 0xBD59, 0xBD5A, 0xBD5B, 0xBD5C, 0xBD5D, /* 0x50 */
+    0xBD5E, 0xBD5F, 0xBD60, 0xBD61, 0xBD62, 0xBD63, 	 0, 	 0, /* 0x50 */
          0, 0xBD64, 0xBD65, 0xBD66, 0xBD67, 0xBD68, 0xBD69, 0xBD6A, /* 0x60 */
     0xBD6B, 0xBD6C, 0xBD6D, 0xBD6E, 0xBD6F, 0xBD70, 0xBD71, 0xBD72, /* 0x60 */
-    0xBD73, 0xBD74,      0, 0xBD75, 0xBD76, 0xBD77, 0xBD78, 0xBD79, /* 0x70 */
-    0xBD7A, 0xBD7B, 0xBD7C, 0xBD7D, 0xBD7E, 0xBD7F,      0,      0, /* 0x70 */
+    0xBD73, 0xBD74, 	 0, 0xBD75, 0xBD76, 0xBD77, 0xBD78, 0xBD79, /* 0x70 */
+    0xBD7A, 0xBD7B, 0xBD7C, 0xBD7D, 0xBD7E, 0xBD7F, 	 0, 	 0, /* 0x70 */
          0, 0xBD80, 0xBD81, 0xBD82, 0xBD83, 0xBD84, 0xBD85, 0xBD86, /* 0x80 */
     0xBD87, 0xBD88, 0xBD89, 0xBD8A, 0xBD8B, 0xBD8C, 0xBD8D, 0xBD8E, /* 0x80 */
-    0xBD8F, 0xBD90,      0, 0xBD91, 0xBD92, 0xBD93, 0xBD94, 0xBD95, /* 0x90 */
-    0xBD96, 0xBD97, 0xBD98, 0xBD99, 0xBD9A, 0xBD9B,      0,      0, /* 0x90 */
+    0xBD8F, 0xBD90, 	 0, 0xBD91, 0xBD92, 0xBD93, 0xBD94, 0xBD95, /* 0x90 */
+    0xBD96, 0xBD97, 0xBD98, 0xBD99, 0xBD9A, 0xBD9B, 	 0, 	 0, /* 0x90 */
          0, 0xBD9C, 0xBD9D, 0xBD9E, 0xBD9F, 0xBDA0, 0xBDA1, 0xBDA2, /* 0xA0 */
     0xBDA3, 0xBDA4, 0xBDA5, 0xBDA6, 0xBDA7, 0xBDA8, 0xBDA9, 0xBDAA, /* 0xA0 */
-    0xBDAB, 0xBDAC,      0, 0xBDAD, 0xBDAE, 0xBDAF, 0xBDB0, 0xBDB1, /* 0xB0 */
-    0xBDB2, 0xBDB3, 0xBDB4, 0xBDB5, 0xBDB6, 0xBDB7,      0,      0, /* 0xB0 */
+    0xBDAB, 0xBDAC, 	 0, 0xBDAD, 0xBDAE, 0xBDAF, 0xBDB0, 0xBDB1, /* 0xB0 */
+    0xBDB2, 0xBDB3, 0xBDB4, 0xBDB5, 0xBDB6, 0xBDB7, 	 0, 	 0, /* 0xB0 */
          0, 0xBDB8, 0xBDB9, 0xBDBA, 0xBDBB, 0xBDBC, 0xBDBD, 0xBDBE, /* 0xC0 */
     0xBDBF, 0xBDC0, 0xBDC1, 0xBDC2, 0xBDC3, 0xBDC4, 0xBDC5, 0xBDC6, /* 0xC0 */
-    0xBDC7, 0xBDC8,      0, 0xBDC9, 0xBDCA, 0xBDCB, 0xBDCC, 0xBDCD, /* 0xD0 */
-    0xBDCE, 0xBDCF, 0xBDD0, 0xBDD1, 0xBDD2, 0xBDD3,      0,      0, /* 0xD0 */
+    0xBDC7, 0xBDC8, 	 0, 0xBDC9, 0xBDCA, 0xBDCB, 0xBDCC, 0xBDCD, /* 0xD0 */
+    0xBDCE, 0xBDCF, 0xBDD0, 0xBDD1, 0xBDD2, 0xBDD3, 	 0, 	 0, /* 0xD0 */
          0, 0xBDD4, 0xBDD5, 0xBDD6, 0xBDD7, 0xBDD8, 0xBDD9, 0xBDDA, /* 0xE0 */
     0xBDDB, 0xBDDC, 0xBDDD, 0xBDDE, 0xBDDF, 0xBDE0, 0xBDE1, 0xBDE2, /* 0xE0 */
-    0xBDE3, 0xBDE4,      0, 0xBDE5, 0xBDE6, 0xBDE7, 0xBDE8, 0xBDE9, /* 0xF0 */
-    0xBDEA, 0xBDEB, 0xBDEC, 0xBDED, 0xBDEE, 0xBDEF                  /* 0xF0 */
+    0xBDE3, 0xBDE4, 	 0, 0xBDE5, 0xBDE6, 0xBDE7, 0xBDE8, 0xBDE9, /* 0xF0 */
+    0xBDEA, 0xBDEB, 0xBDEC, 0xBDED, 0xBDEE, 0xBDEF					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_A7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xBDF0, 0xBDF1, 0xBDF2, 0xBDF3, 0xBDF4, 0xBDF5, 0xBDF6, /* 0x40 */
     0xBDF7, 0xBDF8, 0xBDF9, 0xBDFA, 0xBDFB, 0xBDFC, 0xBDFD, 0xBDFE, /* 0x40 */
-    0xBDFF, 0xBE00,      0, 0xBE01, 0xBE02, 0xBE03, 0xBE04, 0xBE05, /* 0x50 */
-    0xBE06, 0xBE07, 0xBE08, 0xBE09, 0xBE0A, 0xBE0B,      0,      0, /* 0x50 */
+    0xBDFF, 0xBE00, 	 0, 0xBE01, 0xBE02, 0xBE03, 0xBE04, 0xBE05, /* 0x50 */
+    0xBE06, 0xBE07, 0xBE08, 0xBE09, 0xBE0A, 0xBE0B, 	 0, 	 0, /* 0x50 */
          0, 0xBE0C, 0xBE0D, 0xBE0E, 0xBE0F, 0xBE10, 0xBE11, 0xBE12, /* 0x60 */
     0xBE13, 0xBE14, 0xBE15, 0xBE16, 0xBE17, 0xBE18, 0xBE19, 0xBE1A, /* 0x60 */
-    0xBE1B, 0xBE1C,      0, 0xBE1D, 0xBE1E, 0xBE1F, 0xBE20, 0xBE21, /* 0x70 */
-    0xBE22, 0xBE23, 0xBE24, 0xBE25, 0xBE26, 0xBE27,      0,      0, /* 0x70 */
+    0xBE1B, 0xBE1C, 	 0, 0xBE1D, 0xBE1E, 0xBE1F, 0xBE20, 0xBE21, /* 0x70 */
+    0xBE22, 0xBE23, 0xBE24, 0xBE25, 0xBE26, 0xBE27, 	 0, 	 0, /* 0x70 */
          0, 0xBE28, 0xBE29, 0xBE2A, 0xBE2B, 0xBE2C, 0xBE2D, 0xBE2E, /* 0x80 */
     0xBE2F, 0xBE30, 0xBE31, 0xBE32, 0xBE33, 0xBE34, 0xBE35, 0xBE36, /* 0x80 */
-    0xBE37, 0xBE38,      0, 0xBE39, 0xBE3A, 0xBE3B, 0xBE3C, 0xBE3D, /* 0x90 */
-    0xBE3E, 0xBE3F, 0xBE40, 0xBE41, 0xBE42, 0xBE43,      0,      0, /* 0x90 */
+    0xBE37, 0xBE38, 	 0, 0xBE39, 0xBE3A, 0xBE3B, 0xBE3C, 0xBE3D, /* 0x90 */
+    0xBE3E, 0xBE3F, 0xBE40, 0xBE41, 0xBE42, 0xBE43, 	 0, 	 0, /* 0x90 */
          0, 0xBE44, 0xBE45, 0xBE46, 0xBE47, 0xBE48, 0xBE49, 0xBE4A, /* 0xA0 */
     0xBE4B, 0xBE4C, 0xBE4D, 0xBE4E, 0xBE4F, 0xBE50, 0xBE51, 0xBE52, /* 0xA0 */
-    0xBE53, 0xBE54,      0, 0xBE55, 0xBE56, 0xBE57, 0xBE58, 0xBE59, /* 0xB0 */
-    0xBE5A, 0xBE5B, 0xBE5C, 0xBE5D, 0xBE5E, 0xBE5F                  /* 0xB0 */
+    0xBE53, 0xBE54, 	 0, 0xBE55, 0xBE56, 0xBE57, 0xBE58, 0xBE59, /* 0xB0 */
+    0xBE5A, 0xBE5B, 0xBE5C, 0xBE5D, 0xBE5E, 0xBE5F					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_A8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3143,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3143, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xBE60, 0xBE61, 0xBE62, 0xBE63, 0xBE64, 0xBE65, 0xBE66, /* 0x60 */
     0xBE67, 0xBE68, 0xBE69, 0xBE6A, 0xBE6B, 0xBE6C, 0xBE6D, 0xBE6E, /* 0x60 */
-    0xBE6F, 0xBE70,      0, 0xBE71, 0xBE72, 0xBE73, 0xBE74, 0xBE75, /* 0x70 */
-    0xBE76, 0xBE77, 0xBE78, 0xBE79, 0xBE7A, 0xBE7B,      0,      0, /* 0x70 */
+    0xBE6F, 0xBE70, 	 0, 0xBE71, 0xBE72, 0xBE73, 0xBE74, 0xBE75, /* 0x70 */
+    0xBE76, 0xBE77, 0xBE78, 0xBE79, 0xBE7A, 0xBE7B, 	 0, 	 0, /* 0x70 */
          0, 0xBE7C, 0xBE7D, 0xBE7E, 0xBE7F, 0xBE80, 0xBE81, 0xBE82, /* 0x80 */
     0xBE83, 0xBE84, 0xBE85, 0xBE86, 0xBE87, 0xBE88, 0xBE89, 0xBE8A, /* 0x80 */
-    0xBE8B, 0xBE8C,      0, 0xBE8D, 0xBE8E, 0xBE8F, 0xBE90, 0xBE91, /* 0x90 */
-    0xBE92, 0xBE93, 0xBE94, 0xBE95, 0xBE96, 0xBE97,      0,      0, /* 0x90 */
+    0xBE8B, 0xBE8C, 	 0, 0xBE8D, 0xBE8E, 0xBE8F, 0xBE90, 0xBE91, /* 0x90 */
+    0xBE92, 0xBE93, 0xBE94, 0xBE95, 0xBE96, 0xBE97, 	 0, 	 0, /* 0x90 */
          0, 0xBE98, 0xBE99, 0xBE9A, 0xBE9B, 0xBE9C, 0xBE9D, 0xBE9E, /* 0xA0 */
     0xBE9F, 0xBEA0, 0xBEA1, 0xBEA2, 0xBEA3, 0xBEA4, 0xBEA5, 0xBEA6, /* 0xA0 */
-    0xBEA7, 0xBEA8,      0, 0xBEA9, 0xBEAA, 0xBEAB, 0xBEAC, 0xBEAD, /* 0xB0 */
-    0xBEAE, 0xBEAF, 0xBEB0, 0xBEB1, 0xBEB2, 0xBEB3,      0,      0, /* 0xB0 */
+    0xBEA7, 0xBEA8, 	 0, 0xBEA9, 0xBEAA, 0xBEAB, 0xBEAC, 0xBEAD, /* 0xB0 */
+    0xBEAE, 0xBEAF, 0xBEB0, 0xBEB1, 0xBEB2, 0xBEB3, 	 0, 	 0, /* 0xB0 */
          0, 0xBEB4, 0xBEB5, 0xBEB6, 0xBEB7, 0xBEB8, 0xBEB9, 0xBEBA, /* 0xC0 */
     0xBEBB, 0xBEBC, 0xBEBD, 0xBEBE, 0xBEBF, 0xBEC0, 0xBEC1, 0xBEC2, /* 0xC0 */
-    0xBEC3, 0xBEC4,      0, 0xBEC5, 0xBEC6, 0xBEC7, 0xBEC8, 0xBEC9, /* 0xD0 */
-    0xBECA, 0xBECB, 0xBECC, 0xBECD, 0xBECE, 0xBECF,      0,      0, /* 0xD0 */
+    0xBEC3, 0xBEC4, 	 0, 0xBEC5, 0xBEC6, 0xBEC7, 0xBEC8, 0xBEC9, /* 0xD0 */
+    0xBECA, 0xBECB, 0xBECC, 0xBECD, 0xBECE, 0xBECF, 	 0, 	 0, /* 0xD0 */
          0, 0xBED0, 0xBED1, 0xBED2, 0xBED3, 0xBED4, 0xBED5, 0xBED6, /* 0xE0 */
     0xBED7, 0xBED8, 0xBED9, 0xBEDA, 0xBEDB, 0xBEDC, 0xBEDD, 0xBEDE, /* 0xE0 */
-    0xBEDF, 0xBEE0,      0, 0xBEE1, 0xBEE2, 0xBEE3, 0xBEE4, 0xBEE5, /* 0xF0 */
-    0xBEE6, 0xBEE7, 0xBEE8, 0xBEE9, 0xBEEA, 0xBEEB                  /* 0xF0 */
+    0xBEDF, 0xBEE0, 	 0, 0xBEE1, 0xBEE2, 0xBEE3, 0xBEE4, 0xBEE5, /* 0xF0 */
+    0xBEE6, 0xBEE7, 0xBEE8, 0xBEE9, 0xBEEA, 0xBEEB					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_A9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xBEEC, 0xBEED, 0xBEEE, 0xBEEF, 0xBEF0, 0xBEF1, 0xBEF2, /* 0x40 */
     0xBEF3, 0xBEF4, 0xBEF5, 0xBEF6, 0xBEF7, 0xBEF8, 0xBEF9, 0xBEFA, /* 0x40 */
-    0xBEFB, 0xBEFC,      0, 0xBEFD, 0xBEFE, 0xBEFF, 0xBF00, 0xBF01, /* 0x50 */
-    0xBF02, 0xBF03, 0xBF04, 0xBF05, 0xBF06, 0xBF07,      0,      0, /* 0x50 */
+    0xBEFB, 0xBEFC, 	 0, 0xBEFD, 0xBEFE, 0xBEFF, 0xBF00, 0xBF01, /* 0x50 */
+    0xBF02, 0xBF03, 0xBF04, 0xBF05, 0xBF06, 0xBF07, 	 0, 	 0, /* 0x50 */
          0, 0xBF08, 0xBF09, 0xBF0A, 0xBF0B, 0xBF0C, 0xBF0D, 0xBF0E, /* 0x60 */
     0xBF0F, 0xBF10, 0xBF11, 0xBF12, 0xBF13, 0xBF14, 0xBF15, 0xBF16, /* 0x60 */
-    0xBF17, 0xBF18,      0, 0xBF19, 0xBF1A, 0xBF1B, 0xBF1C, 0xBF1D, /* 0x70 */
-    0xBF1E, 0xBF1F, 0xBF20, 0xBF21, 0xBF22, 0xBF23,      0,      0, /* 0x70 */
+    0xBF17, 0xBF18, 	 0, 0xBF19, 0xBF1A, 0xBF1B, 0xBF1C, 0xBF1D, /* 0x70 */
+    0xBF1E, 0xBF1F, 0xBF20, 0xBF21, 0xBF22, 0xBF23, 	 0, 	 0, /* 0x70 */
          0, 0xBF24, 0xBF25, 0xBF26, 0xBF27, 0xBF28, 0xBF29, 0xBF2A, /* 0x80 */
     0xBF2B, 0xBF2C, 0xBF2D, 0xBF2E, 0xBF2F, 0xBF30, 0xBF31, 0xBF32, /* 0x80 */
-    0xBF33, 0xBF34,      0, 0xBF35, 0xBF36, 0xBF37, 0xBF38, 0xBF39, /* 0x90 */
-    0xBF3A, 0xBF3B, 0xBF3C, 0xBF3D, 0xBF3E, 0xBF3F,      0,      0, /* 0x90 */
+    0xBF33, 0xBF34, 	 0, 0xBF35, 0xBF36, 0xBF37, 0xBF38, 0xBF39, /* 0x90 */
+    0xBF3A, 0xBF3B, 0xBF3C, 0xBF3D, 0xBF3E, 0xBF3F, 	 0, 	 0, /* 0x90 */
          0, 0xBF40, 0xBF41, 0xBF42, 0xBF43, 0xBF44, 0xBF45, 0xBF46, /* 0xA0 */
     0xBF47, 0xBF48, 0xBF49, 0xBF4A, 0xBF4B, 0xBF4C, 0xBF4D, 0xBF4E, /* 0xA0 */
-    0xBF4F, 0xBF50,      0, 0xBF51, 0xBF52, 0xBF53, 0xBF54, 0xBF55, /* 0xB0 */
-    0xBF56, 0xBF57, 0xBF58, 0xBF59, 0xBF5A, 0xBF5B,      0,      0, /* 0xB0 */
+    0xBF4F, 0xBF50, 	 0, 0xBF51, 0xBF52, 0xBF53, 0xBF54, 0xBF55, /* 0xB0 */
+    0xBF56, 0xBF57, 0xBF58, 0xBF59, 0xBF5A, 0xBF5B, 	 0, 	 0, /* 0xB0 */
          0, 0xBF5C, 0xBF5D, 0xBF5E, 0xBF5F, 0xBF60, 0xBF61, 0xBF62, /* 0xC0 */
     0xBF63, 0xBF64, 0xBF65, 0xBF66, 0xBF67, 0xBF68, 0xBF69, 0xBF6A, /* 0xC0 */
-    0xBF6B, 0xBF6C,      0, 0xBF6D, 0xBF6E, 0xBF6F, 0xBF70, 0xBF71, /* 0xD0 */
-    0xBF72, 0xBF73, 0xBF74, 0xBF75, 0xBF76, 0xBF77,      0,      0, /* 0xD0 */
+    0xBF6B, 0xBF6C, 	 0, 0xBF6D, 0xBF6E, 0xBF6F, 0xBF70, 0xBF71, /* 0xD0 */
+    0xBF72, 0xBF73, 0xBF74, 0xBF75, 0xBF76, 0xBF77, 	 0, 	 0, /* 0xD0 */
          0, 0xBF78, 0xBF79, 0xBF7A, 0xBF7B, 0xBF7C, 0xBF7D, 0xBF7E, /* 0xE0 */
     0xBF7F, 0xBF80, 0xBF81, 0xBF82, 0xBF83, 0xBF84, 0xBF85, 0xBF86, /* 0xE0 */
-    0xBF87, 0xBF88,      0, 0xBF89, 0xBF8A, 0xBF8B, 0xBF8C, 0xBF8D, /* 0xF0 */
-    0xBF8E, 0xBF8F, 0xBF90, 0xBF91, 0xBF92, 0xBF93                  /* 0xF0 */
+    0xBF87, 0xBF88, 	 0, 0xBF89, 0xBF8A, 0xBF8B, 0xBF8C, 0xBF8D, /* 0xF0 */
+    0xBF8E, 0xBF8F, 0xBF90, 0xBF91, 0xBF92, 0xBF93					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_AA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xBF94, 0xBF95, 0xBF96, 0xBF97, 0xBF98, 0xBF99, 0xBF9A, /* 0x40 */
     0xBF9B, 0xBF9C, 0xBF9D, 0xBF9E, 0xBF9F, 0xBFA0, 0xBFA1, 0xBFA2, /* 0x40 */
-    0xBFA3, 0xBFA4,      0, 0xBFA5, 0xBFA6, 0xBFA7, 0xBFA8, 0xBFA9, /* 0x50 */
-    0xBFAA, 0xBFAB, 0xBFAC, 0xBFAD, 0xBFAE, 0xBFAF,      0,      0, /* 0x50 */
+    0xBFA3, 0xBFA4, 	 0, 0xBFA5, 0xBFA6, 0xBFA7, 0xBFA8, 0xBFA9, /* 0x50 */
+    0xBFAA, 0xBFAB, 0xBFAC, 0xBFAD, 0xBFAE, 0xBFAF, 	 0, 	 0, /* 0x50 */
          0, 0xBFB0, 0xBFB1, 0xBFB2, 0xBFB3, 0xBFB4, 0xBFB5, 0xBFB6, /* 0x60 */
     0xBFB7, 0xBFB8, 0xBFB9, 0xBFBA, 0xBFBB, 0xBFBC, 0xBFBD, 0xBFBE, /* 0x60 */
-    0xBFBF, 0xBFC0,      0, 0xBFC1, 0xBFC2, 0xBFC3, 0xBFC4, 0xBFC5, /* 0x70 */
-    0xBFC6, 0xBFC7, 0xBFC8, 0xBFC9, 0xBFCA, 0xBFCB,      0,      0, /* 0x70 */
+    0xBFBF, 0xBFC0, 	 0, 0xBFC1, 0xBFC2, 0xBFC3, 0xBFC4, 0xBFC5, /* 0x70 */
+    0xBFC6, 0xBFC7, 0xBFC8, 0xBFC9, 0xBFCA, 0xBFCB, 	 0, 	 0, /* 0x70 */
          0, 0xBFCC, 0xBFCD, 0xBFCE, 0xBFCF, 0xBFD0, 0xBFD1, 0xBFD2, /* 0x80 */
     0xBFD3, 0xBFD4, 0xBFD5, 0xBFD6, 0xBFD7, 0xBFD8, 0xBFD9, 0xBFDA, /* 0x80 */
-    0xBFDB, 0xBFDC,      0, 0xBFDD, 0xBFDE, 0xBFDF, 0xBFE0, 0xBFE1, /* 0x90 */
-    0xBFE2, 0xBFE3, 0xBFE4, 0xBFE5, 0xBFE6, 0xBFE7,      0,      0, /* 0x90 */
+    0xBFDB, 0xBFDC, 	 0, 0xBFDD, 0xBFDE, 0xBFDF, 0xBFE0, 0xBFE1, /* 0x90 */
+    0xBFE2, 0xBFE3, 0xBFE4, 0xBFE5, 0xBFE6, 0xBFE7, 	 0, 	 0, /* 0x90 */
          0, 0xBFE8, 0xBFE9, 0xBFEA, 0xBFEB, 0xBFEC, 0xBFED, 0xBFEE, /* 0xA0 */
     0xBFEF, 0xBFF0, 0xBFF1, 0xBFF2, 0xBFF3, 0xBFF4, 0xBFF5, 0xBFF6, /* 0xA0 */
-    0xBFF7, 0xBFF8,      0, 0xBFF9, 0xBFFA, 0xBFFB, 0xBFFC, 0xBFFD, /* 0xB0 */
-    0xBFFE, 0xBFFF, 0xC000, 0xC001, 0xC002, 0xC003,      0,      0, /* 0xB0 */
+    0xBFF7, 0xBFF8, 	 0, 0xBFF9, 0xBFFA, 0xBFFB, 0xBFFC, 0xBFFD, /* 0xB0 */
+    0xBFFE, 0xBFFF, 0xC000, 0xC001, 0xC002, 0xC003, 	 0, 	 0, /* 0xB0 */
          0, 0xC004, 0xC005, 0xC006, 0xC007, 0xC008, 0xC009, 0xC00A, /* 0xC0 */
     0xC00B, 0xC00C, 0xC00D, 0xC00E, 0xC00F, 0xC010, 0xC011, 0xC012, /* 0xC0 */
-    0xC013, 0xC014,      0, 0xC015, 0xC016, 0xC017, 0xC018, 0xC019, /* 0xD0 */
-    0xC01A, 0xC01B, 0xC01C, 0xC01D, 0xC01E, 0xC01F,      0,      0, /* 0xD0 */
+    0xC013, 0xC014, 	 0, 0xC015, 0xC016, 0xC017, 0xC018, 0xC019, /* 0xD0 */
+    0xC01A, 0xC01B, 0xC01C, 0xC01D, 0xC01E, 0xC01F, 	 0, 	 0, /* 0xD0 */
          0, 0xC020, 0xC021, 0xC022, 0xC023, 0xC024, 0xC025, 0xC026, /* 0xE0 */
     0xC027, 0xC028, 0xC029, 0xC02A, 0xC02B, 0xC02C, 0xC02D, 0xC02E, /* 0xE0 */
-    0xC02F, 0xC030,      0, 0xC031, 0xC032, 0xC033, 0xC034, 0xC035, /* 0xF0 */
-    0xC036, 0xC037, 0xC038, 0xC039, 0xC03A, 0xC03B                  /* 0xF0 */
+    0xC02F, 0xC030, 	 0, 0xC031, 0xC032, 0xC033, 0xC034, 0xC035, /* 0xF0 */
+    0xC036, 0xC037, 0xC038, 0xC039, 0xC03A, 0xC03B					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_AB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC03C, 0xC03D, 0xC03E, 0xC03F, 0xC040, 0xC041, 0xC042, /* 0x40 */
     0xC043, 0xC044, 0xC045, 0xC046, 0xC047, 0xC048, 0xC049, 0xC04A, /* 0x40 */
-    0xC04B, 0xC04C,      0, 0xC04D, 0xC04E, 0xC04F, 0xC050, 0xC051, /* 0x50 */
-    0xC052, 0xC053, 0xC054, 0xC055, 0xC056, 0xC057,      0,      0, /* 0x50 */
+    0xC04B, 0xC04C, 	 0, 0xC04D, 0xC04E, 0xC04F, 0xC050, 0xC051, /* 0x50 */
+    0xC052, 0xC053, 0xC054, 0xC055, 0xC056, 0xC057, 	 0, 	 0, /* 0x50 */
          0, 0xC058, 0xC059, 0xC05A, 0xC05B, 0xC05C, 0xC05D, 0xC05E, /* 0x60 */
     0xC05F, 0xC060, 0xC061, 0xC062, 0xC063, 0xC064, 0xC065, 0xC066, /* 0x60 */
-    0xC067, 0xC068,      0, 0xC069, 0xC06A, 0xC06B, 0xC06C, 0xC06D, /* 0x70 */
-    0xC06E, 0xC06F, 0xC070, 0xC071, 0xC072, 0xC073,      0,      0, /* 0x70 */
+    0xC067, 0xC068, 	 0, 0xC069, 0xC06A, 0xC06B, 0xC06C, 0xC06D, /* 0x70 */
+    0xC06E, 0xC06F, 0xC070, 0xC071, 0xC072, 0xC073, 	 0, 	 0, /* 0x70 */
          0, 0xC074, 0xC075, 0xC076, 0xC077, 0xC078, 0xC079, 0xC07A, /* 0x80 */
     0xC07B, 0xC07C, 0xC07D, 0xC07E, 0xC07F, 0xC080, 0xC081, 0xC082, /* 0x80 */
-    0xC083, 0xC084,      0, 0xC085, 0xC086, 0xC087, 0xC088, 0xC089, /* 0x90 */
-    0xC08A, 0xC08B, 0xC08C, 0xC08D, 0xC08E, 0xC08F,      0,      0, /* 0x90 */
+    0xC083, 0xC084, 	 0, 0xC085, 0xC086, 0xC087, 0xC088, 0xC089, /* 0x90 */
+    0xC08A, 0xC08B, 0xC08C, 0xC08D, 0xC08E, 0xC08F, 	 0, 	 0, /* 0x90 */
          0, 0xC090, 0xC091, 0xC092, 0xC093, 0xC094, 0xC095, 0xC096, /* 0xA0 */
     0xC097, 0xC098, 0xC099, 0xC09A, 0xC09B, 0xC09C, 0xC09D, 0xC09E, /* 0xA0 */
-    0xC09F, 0xC0A0,      0, 0xC0A1, 0xC0A2, 0xC0A3, 0xC0A4, 0xC0A5, /* 0xB0 */
-    0xC0A6, 0xC0A7, 0xC0A8, 0xC0A9, 0xC0AA, 0xC0AB                  /* 0xB0 */
+    0xC09F, 0xC0A0, 	 0, 0xC0A1, 0xC0A2, 0xC0A3, 0xC0A4, 0xC0A5, /* 0xB0 */
+    0xC0A6, 0xC0A7, 0xC0A8, 0xC0A9, 0xC0AA, 0xC0AB					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_AC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3145,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3145, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xC0AC, 0xC0AD, 0xC0AE, 0xC0AF, 0xC0B0, 0xC0B1, 0xC0B2, /* 0x60 */
     0xC0B3, 0xC0B4, 0xC0B5, 0xC0B6, 0xC0B7, 0xC0B8, 0xC0B9, 0xC0BA, /* 0x60 */
-    0xC0BB, 0xC0BC,      0, 0xC0BD, 0xC0BE, 0xC0BF, 0xC0C0, 0xC0C1, /* 0x70 */
-    0xC0C2, 0xC0C3, 0xC0C4, 0xC0C5, 0xC0C6, 0xC0C7,      0,      0, /* 0x70 */
+    0xC0BB, 0xC0BC, 	 0, 0xC0BD, 0xC0BE, 0xC0BF, 0xC0C0, 0xC0C1, /* 0x70 */
+    0xC0C2, 0xC0C3, 0xC0C4, 0xC0C5, 0xC0C6, 0xC0C7, 	 0, 	 0, /* 0x70 */
          0, 0xC0C8, 0xC0C9, 0xC0CA, 0xC0CB, 0xC0CC, 0xC0CD, 0xC0CE, /* 0x80 */
     0xC0CF, 0xC0D0, 0xC0D1, 0xC0D2, 0xC0D3, 0xC0D4, 0xC0D5, 0xC0D6, /* 0x80 */
-    0xC0D7, 0xC0D8,      0, 0xC0D9, 0xC0DA, 0xC0DB, 0xC0DC, 0xC0DD, /* 0x90 */
-    0xC0DE, 0xC0DF, 0xC0E0, 0xC0E1, 0xC0E2, 0xC0E3,      0,      0, /* 0x90 */
+    0xC0D7, 0xC0D8, 	 0, 0xC0D9, 0xC0DA, 0xC0DB, 0xC0DC, 0xC0DD, /* 0x90 */
+    0xC0DE, 0xC0DF, 0xC0E0, 0xC0E1, 0xC0E2, 0xC0E3, 	 0, 	 0, /* 0x90 */
          0, 0xC0E4, 0xC0E5, 0xC0E6, 0xC0E7, 0xC0E8, 0xC0E9, 0xC0EA, /* 0xA0 */
     0xC0EB, 0xC0EC, 0xC0ED, 0xC0EE, 0xC0EF, 0xC0F0, 0xC0F1, 0xC0F2, /* 0xA0 */
-    0xC0F3, 0xC0F4,      0, 0xC0F5, 0xC0F6, 0xC0F7, 0xC0F8, 0xC0F9, /* 0xB0 */
-    0xC0FA, 0xC0FB, 0xC0FC, 0xC0FD, 0xC0FE, 0xC0FF,      0,      0, /* 0xB0 */
+    0xC0F3, 0xC0F4, 	 0, 0xC0F5, 0xC0F6, 0xC0F7, 0xC0F8, 0xC0F9, /* 0xB0 */
+    0xC0FA, 0xC0FB, 0xC0FC, 0xC0FD, 0xC0FE, 0xC0FF, 	 0, 	 0, /* 0xB0 */
          0, 0xC100, 0xC101, 0xC102, 0xC103, 0xC104, 0xC105, 0xC106, /* 0xC0 */
     0xC107, 0xC108, 0xC109, 0xC10A, 0xC10B, 0xC10C, 0xC10D, 0xC10E, /* 0xC0 */
-    0xC10F, 0xC110,      0, 0xC111, 0xC112, 0xC113, 0xC114, 0xC115, /* 0xD0 */
-    0xC116, 0xC117, 0xC118, 0xC119, 0xC11A, 0xC11B,      0,      0, /* 0xD0 */
+    0xC10F, 0xC110, 	 0, 0xC111, 0xC112, 0xC113, 0xC114, 0xC115, /* 0xD0 */
+    0xC116, 0xC117, 0xC118, 0xC119, 0xC11A, 0xC11B, 	 0, 	 0, /* 0xD0 */
          0, 0xC11C, 0xC11D, 0xC11E, 0xC11F, 0xC120, 0xC121, 0xC122, /* 0xE0 */
     0xC123, 0xC124, 0xC125, 0xC126, 0xC127, 0xC128, 0xC129, 0xC12A, /* 0xE0 */
-    0xC12B, 0xC12C,      0, 0xC12D, 0xC12E, 0xC12F, 0xC130, 0xC131, /* 0xF0 */
-    0xC132, 0xC133, 0xC134, 0xC135, 0xC136, 0xC137                  /* 0xF0 */
+    0xC12B, 0xC12C, 	 0, 0xC12D, 0xC12E, 0xC12F, 0xC130, 0xC131, /* 0xF0 */
+    0xC132, 0xC133, 0xC134, 0xC135, 0xC136, 0xC137					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_AD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC138, 0xC139, 0xC13A, 0xC13B, 0xC13C, 0xC13D, 0xC13E, /* 0x40 */
     0xC13F, 0xC140, 0xC141, 0xC142, 0xC143, 0xC144, 0xC145, 0xC146, /* 0x40 */
-    0xC147, 0xC148,      0, 0xC149, 0xC14A, 0xC14B, 0xC14C, 0xC14D, /* 0x50 */
-    0xC14E, 0xC14F, 0xC150, 0xC151, 0xC152, 0xC153,      0,      0, /* 0x50 */
+    0xC147, 0xC148, 	 0, 0xC149, 0xC14A, 0xC14B, 0xC14C, 0xC14D, /* 0x50 */
+    0xC14E, 0xC14F, 0xC150, 0xC151, 0xC152, 0xC153, 	 0, 	 0, /* 0x50 */
          0, 0xC154, 0xC155, 0xC156, 0xC157, 0xC158, 0xC159, 0xC15A, /* 0x60 */
     0xC15B, 0xC15C, 0xC15D, 0xC15E, 0xC15F, 0xC160, 0xC161, 0xC162, /* 0x60 */
-    0xC163, 0xC164,      0, 0xC165, 0xC166, 0xC167, 0xC168, 0xC169, /* 0x70 */
-    0xC16A, 0xC16B, 0xC16C, 0xC16D, 0xC16E, 0xC16F,      0,      0, /* 0x70 */
+    0xC163, 0xC164, 	 0, 0xC165, 0xC166, 0xC167, 0xC168, 0xC169, /* 0x70 */
+    0xC16A, 0xC16B, 0xC16C, 0xC16D, 0xC16E, 0xC16F, 	 0, 	 0, /* 0x70 */
          0, 0xC170, 0xC171, 0xC172, 0xC173, 0xC174, 0xC175, 0xC176, /* 0x80 */
     0xC177, 0xC178, 0xC179, 0xC17A, 0xC17B, 0xC17C, 0xC17D, 0xC17E, /* 0x80 */
-    0xC17F, 0xC180,      0, 0xC181, 0xC182, 0xC183, 0xC184, 0xC185, /* 0x90 */
-    0xC186, 0xC187, 0xC188, 0xC189, 0xC18A, 0xC18B,      0,      0, /* 0x90 */
+    0xC17F, 0xC180, 	 0, 0xC181, 0xC182, 0xC183, 0xC184, 0xC185, /* 0x90 */
+    0xC186, 0xC187, 0xC188, 0xC189, 0xC18A, 0xC18B, 	 0, 	 0, /* 0x90 */
          0, 0xC18C, 0xC18D, 0xC18E, 0xC18F, 0xC190, 0xC191, 0xC192, /* 0xA0 */
     0xC193, 0xC194, 0xC195, 0xC196, 0xC197, 0xC198, 0xC199, 0xC19A, /* 0xA0 */
-    0xC19B, 0xC19C,      0, 0xC19D, 0xC19E, 0xC19F, 0xC1A0, 0xC1A1, /* 0xB0 */
-    0xC1A2, 0xC1A3, 0xC1A4, 0xC1A5, 0xC1A6, 0xC1A7,      0,      0, /* 0xB0 */
+    0xC19B, 0xC19C, 	 0, 0xC19D, 0xC19E, 0xC19F, 0xC1A0, 0xC1A1, /* 0xB0 */
+    0xC1A2, 0xC1A3, 0xC1A4, 0xC1A5, 0xC1A6, 0xC1A7, 	 0, 	 0, /* 0xB0 */
          0, 0xC1A8, 0xC1A9, 0xC1AA, 0xC1AB, 0xC1AC, 0xC1AD, 0xC1AE, /* 0xC0 */
     0xC1AF, 0xC1B0, 0xC1B1, 0xC1B2, 0xC1B3, 0xC1B4, 0xC1B5, 0xC1B6, /* 0xC0 */
-    0xC1B7, 0xC1B8,      0, 0xC1B9, 0xC1BA, 0xC1BB, 0xC1BC, 0xC1BD, /* 0xD0 */
-    0xC1BE, 0xC1BF, 0xC1C0, 0xC1C1, 0xC1C2, 0xC1C3,      0,      0, /* 0xD0 */
+    0xC1B7, 0xC1B8, 	 0, 0xC1B9, 0xC1BA, 0xC1BB, 0xC1BC, 0xC1BD, /* 0xD0 */
+    0xC1BE, 0xC1BF, 0xC1C0, 0xC1C1, 0xC1C2, 0xC1C3, 	 0, 	 0, /* 0xD0 */
          0, 0xC1C4, 0xC1C5, 0xC1C6, 0xC1C7, 0xC1C8, 0xC1C9, 0xC1CA, /* 0xE0 */
     0xC1CB, 0xC1CC, 0xC1CD, 0xC1CE, 0xC1CF, 0xC1D0, 0xC1D1, 0xC1D2, /* 0xE0 */
-    0xC1D3, 0xC1D4,      0, 0xC1D5, 0xC1D6, 0xC1D7, 0xC1D8, 0xC1D9, /* 0xF0 */
-    0xC1DA, 0xC1DB, 0xC1DC, 0xC1DD, 0xC1DE, 0xC1DF                  /* 0xF0 */
+    0xC1D3, 0xC1D4, 	 0, 0xC1D5, 0xC1D6, 0xC1D7, 0xC1D8, 0xC1D9, /* 0xF0 */
+    0xC1DA, 0xC1DB, 0xC1DC, 0xC1DD, 0xC1DE, 0xC1DF					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_AE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC1E0, 0xC1E1, 0xC1E2, 0xC1E3, 0xC1E4, 0xC1E5, 0xC1E6, /* 0x40 */
     0xC1E7, 0xC1E8, 0xC1E9, 0xC1EA, 0xC1EB, 0xC1EC, 0xC1ED, 0xC1EE, /* 0x40 */
-    0xC1EF, 0xC1F0,      0, 0xC1F1, 0xC1F2, 0xC1F3, 0xC1F4, 0xC1F5, /* 0x50 */
-    0xC1F6, 0xC1F7, 0xC1F8, 0xC1F9, 0xC1FA, 0xC1FB,      0,      0, /* 0x50 */
+    0xC1EF, 0xC1F0, 	 0, 0xC1F1, 0xC1F2, 0xC1F3, 0xC1F4, 0xC1F5, /* 0x50 */
+    0xC1F6, 0xC1F7, 0xC1F8, 0xC1F9, 0xC1FA, 0xC1FB, 	 0, 	 0, /* 0x50 */
          0, 0xC1FC, 0xC1FD, 0xC1FE, 0xC1FF, 0xC200, 0xC201, 0xC202, /* 0x60 */
     0xC203, 0xC204, 0xC205, 0xC206, 0xC207, 0xC208, 0xC209, 0xC20A, /* 0x60 */
-    0xC20B, 0xC20C,      0, 0xC20D, 0xC20E, 0xC20F, 0xC210, 0xC211, /* 0x70 */
-    0xC212, 0xC213, 0xC214, 0xC215, 0xC216, 0xC217,      0,      0, /* 0x70 */
+    0xC20B, 0xC20C, 	 0, 0xC20D, 0xC20E, 0xC20F, 0xC210, 0xC211, /* 0x70 */
+    0xC212, 0xC213, 0xC214, 0xC215, 0xC216, 0xC217, 	 0, 	 0, /* 0x70 */
          0, 0xC218, 0xC219, 0xC21A, 0xC21B, 0xC21C, 0xC21D, 0xC21E, /* 0x80 */
     0xC21F, 0xC220, 0xC221, 0xC222, 0xC223, 0xC224, 0xC225, 0xC226, /* 0x80 */
-    0xC227, 0xC228,      0, 0xC229, 0xC22A, 0xC22B, 0xC22C, 0xC22D, /* 0x90 */
-    0xC22E, 0xC22F, 0xC230, 0xC231, 0xC232, 0xC233,      0,      0, /* 0x90 */
+    0xC227, 0xC228, 	 0, 0xC229, 0xC22A, 0xC22B, 0xC22C, 0xC22D, /* 0x90 */
+    0xC22E, 0xC22F, 0xC230, 0xC231, 0xC232, 0xC233, 	 0, 	 0, /* 0x90 */
          0, 0xC234, 0xC235, 0xC236, 0xC237, 0xC238, 0xC239, 0xC23A, /* 0xA0 */
     0xC23B, 0xC23C, 0xC23D, 0xC23E, 0xC23F, 0xC240, 0xC241, 0xC242, /* 0xA0 */
-    0xC243, 0xC244,      0, 0xC245, 0xC246, 0xC247, 0xC248, 0xC249, /* 0xB0 */
-    0xC24A, 0xC24B, 0xC24C, 0xC24D, 0xC24E, 0xC24F,      0,      0, /* 0xB0 */
+    0xC243, 0xC244, 	 0, 0xC245, 0xC246, 0xC247, 0xC248, 0xC249, /* 0xB0 */
+    0xC24A, 0xC24B, 0xC24C, 0xC24D, 0xC24E, 0xC24F, 	 0, 	 0, /* 0xB0 */
          0, 0xC250, 0xC251, 0xC252, 0xC253, 0xC254, 0xC255, 0xC256, /* 0xC0 */
     0xC257, 0xC258, 0xC259, 0xC25A, 0xC25B, 0xC25C, 0xC25D, 0xC25E, /* 0xC0 */
-    0xC25F, 0xC260,      0, 0xC261, 0xC262, 0xC263, 0xC264, 0xC265, /* 0xD0 */
-    0xC266, 0xC267, 0xC268, 0xC269, 0xC26A, 0xC26B,      0,      0, /* 0xD0 */
+    0xC25F, 0xC260, 	 0, 0xC261, 0xC262, 0xC263, 0xC264, 0xC265, /* 0xD0 */
+    0xC266, 0xC267, 0xC268, 0xC269, 0xC26A, 0xC26B, 	 0, 	 0, /* 0xD0 */
          0, 0xC26C, 0xC26D, 0xC26E, 0xC26F, 0xC270, 0xC271, 0xC272, /* 0xE0 */
     0xC273, 0xC274, 0xC275, 0xC276, 0xC277, 0xC278, 0xC279, 0xC27A, /* 0xE0 */
-    0xC27B, 0xC27C,      0, 0xC27D, 0xC27E, 0xC27F, 0xC280, 0xC281, /* 0xF0 */
-    0xC282, 0xC283, 0xC284, 0xC285, 0xC286, 0xC287                  /* 0xF0 */
+    0xC27B, 0xC27C, 	 0, 0xC27D, 0xC27E, 0xC27F, 0xC280, 0xC281, /* 0xF0 */
+    0xC282, 0xC283, 0xC284, 0xC285, 0xC286, 0xC287					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_AF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC288, 0xC289, 0xC28A, 0xC28B, 0xC28C, 0xC28D, 0xC28E, /* 0x40 */
     0xC28F, 0xC290, 0xC291, 0xC292, 0xC293, 0xC294, 0xC295, 0xC296, /* 0x40 */
-    0xC297, 0xC298,      0, 0xC299, 0xC29A, 0xC29B, 0xC29C, 0xC29D, /* 0x50 */
-    0xC29E, 0xC29F, 0xC2A0, 0xC2A1, 0xC2A2, 0xC2A3,      0,      0, /* 0x50 */
+    0xC297, 0xC298, 	 0, 0xC299, 0xC29A, 0xC29B, 0xC29C, 0xC29D, /* 0x50 */
+    0xC29E, 0xC29F, 0xC2A0, 0xC2A1, 0xC2A2, 0xC2A3, 	 0, 	 0, /* 0x50 */
          0, 0xC2A4, 0xC2A5, 0xC2A6, 0xC2A7, 0xC2A8, 0xC2A9, 0xC2AA, /* 0x60 */
     0xC2AB, 0xC2AC, 0xC2AD, 0xC2AE, 0xC2AF, 0xC2B0, 0xC2B1, 0xC2B2, /* 0x60 */
-    0xC2B3, 0xC2B4,      0, 0xC2B5, 0xC2B6, 0xC2B7, 0xC2B8, 0xC2B9, /* 0x70 */
-    0xC2BA, 0xC2BB, 0xC2BC, 0xC2BD, 0xC2BE, 0xC2BF,      0,      0, /* 0x70 */
+    0xC2B3, 0xC2B4, 	 0, 0xC2B5, 0xC2B6, 0xC2B7, 0xC2B8, 0xC2B9, /* 0x70 */
+    0xC2BA, 0xC2BB, 0xC2BC, 0xC2BD, 0xC2BE, 0xC2BF, 	 0, 	 0, /* 0x70 */
          0, 0xC2C0, 0xC2C1, 0xC2C2, 0xC2C3, 0xC2C4, 0xC2C5, 0xC2C6, /* 0x80 */
     0xC2C7, 0xC2C8, 0xC2C9, 0xC2CA, 0xC2CB, 0xC2CC, 0xC2CD, 0xC2CE, /* 0x80 */
-    0xC2CF, 0xC2D0,      0, 0xC2D1, 0xC2D2, 0xC2D3, 0xC2D4, 0xC2D5, /* 0x90 */
-    0xC2D6, 0xC2D7, 0xC2D8, 0xC2D9, 0xC2DA, 0xC2DB,      0,      0, /* 0x90 */
+    0xC2CF, 0xC2D0, 	 0, 0xC2D1, 0xC2D2, 0xC2D3, 0xC2D4, 0xC2D5, /* 0x90 */
+    0xC2D6, 0xC2D7, 0xC2D8, 0xC2D9, 0xC2DA, 0xC2DB, 	 0, 	 0, /* 0x90 */
          0, 0xC2DC, 0xC2DD, 0xC2DE, 0xC2DF, 0xC2E0, 0xC2E1, 0xC2E2, /* 0xA0 */
     0xC2E3, 0xC2E4, 0xC2E5, 0xC2E6, 0xC2E7, 0xC2E8, 0xC2E9, 0xC2EA, /* 0xA0 */
-    0xC2EB, 0xC2EC,      0, 0xC2ED, 0xC2EE, 0xC2EF, 0xC2F0, 0xC2F1, /* 0xB0 */
-    0xC2F2, 0xC2F3, 0xC2F4, 0xC2F5, 0xC2F6, 0xC2F7                  /* 0xB0 */
+    0xC2EB, 0xC2EC, 	 0, 0xC2ED, 0xC2EE, 0xC2EF, 0xC2F0, 0xC2F1, /* 0xB0 */
+    0xC2F2, 0xC2F3, 0xC2F4, 0xC2F5, 0xC2F6, 0xC2F7					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_B0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3146,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3146, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xC2F8, 0xC2F9, 0xC2FA, 0xC2FB, 0xC2FC, 0xC2FD, 0xC2FE, /* 0x60 */
     0xC2FF, 0xC300, 0xC301, 0xC302, 0xC303, 0xC304, 0xC305, 0xC306, /* 0x60 */
-    0xC307, 0xC308,      0, 0xC309, 0xC30A, 0xC30B, 0xC30C, 0xC30D, /* 0x70 */
-    0xC30E, 0xC30F, 0xC310, 0xC311, 0xC312, 0xC313,      0,      0, /* 0x70 */
+    0xC307, 0xC308, 	 0, 0xC309, 0xC30A, 0xC30B, 0xC30C, 0xC30D, /* 0x70 */
+    0xC30E, 0xC30F, 0xC310, 0xC311, 0xC312, 0xC313, 	 0, 	 0, /* 0x70 */
          0, 0xC314, 0xC315, 0xC316, 0xC317, 0xC318, 0xC319, 0xC31A, /* 0x80 */
     0xC31B, 0xC31C, 0xC31D, 0xC31E, 0xC31F, 0xC320, 0xC321, 0xC322, /* 0x80 */
-    0xC323, 0xC324,      0, 0xC325, 0xC326, 0xC327, 0xC328, 0xC329, /* 0x90 */
-    0xC32A, 0xC32B, 0xC32C, 0xC32D, 0xC32E, 0xC32F,      0,      0, /* 0x90 */
+    0xC323, 0xC324, 	 0, 0xC325, 0xC326, 0xC327, 0xC328, 0xC329, /* 0x90 */
+    0xC32A, 0xC32B, 0xC32C, 0xC32D, 0xC32E, 0xC32F, 	 0, 	 0, /* 0x90 */
          0, 0xC330, 0xC331, 0xC332, 0xC333, 0xC334, 0xC335, 0xC336, /* 0xA0 */
     0xC337, 0xC338, 0xC339, 0xC33A, 0xC33B, 0xC33C, 0xC33D, 0xC33E, /* 0xA0 */
-    0xC33F, 0xC340,      0, 0xC341, 0xC342, 0xC343, 0xC344, 0xC345, /* 0xB0 */
-    0xC346, 0xC347, 0xC348, 0xC349, 0xC34A, 0xC34B,      0,      0, /* 0xB0 */
+    0xC33F, 0xC340, 	 0, 0xC341, 0xC342, 0xC343, 0xC344, 0xC345, /* 0xB0 */
+    0xC346, 0xC347, 0xC348, 0xC349, 0xC34A, 0xC34B, 	 0, 	 0, /* 0xB0 */
          0, 0xC34C, 0xC34D, 0xC34E, 0xC34F, 0xC350, 0xC351, 0xC352, /* 0xC0 */
     0xC353, 0xC354, 0xC355, 0xC356, 0xC357, 0xC358, 0xC359, 0xC35A, /* 0xC0 */
-    0xC35B, 0xC35C,      0, 0xC35D, 0xC35E, 0xC35F, 0xC360, 0xC361, /* 0xD0 */
-    0xC362, 0xC363, 0xC364, 0xC365, 0xC366, 0xC367,      0,      0, /* 0xD0 */
+    0xC35B, 0xC35C, 	 0, 0xC35D, 0xC35E, 0xC35F, 0xC360, 0xC361, /* 0xD0 */
+    0xC362, 0xC363, 0xC364, 0xC365, 0xC366, 0xC367, 	 0, 	 0, /* 0xD0 */
          0, 0xC368, 0xC369, 0xC36A, 0xC36B, 0xC36C, 0xC36D, 0xC36E, /* 0xE0 */
     0xC36F, 0xC370, 0xC371, 0xC372, 0xC373, 0xC374, 0xC375, 0xC376, /* 0xE0 */
-    0xC377, 0xC378,      0, 0xC379, 0xC37A, 0xC37B, 0xC37C, 0xC37D, /* 0xF0 */
-    0xC37E, 0xC37F, 0xC380, 0xC381, 0xC382, 0xC383                  /* 0xF0 */
+    0xC377, 0xC378, 	 0, 0xC379, 0xC37A, 0xC37B, 0xC37C, 0xC37D, /* 0xF0 */
+    0xC37E, 0xC37F, 0xC380, 0xC381, 0xC382, 0xC383					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_B1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC384, 0xC385, 0xC386, 0xC387, 0xC388, 0xC389, 0xC38A, /* 0x40 */
     0xC38B, 0xC38C, 0xC38D, 0xC38E, 0xC38F, 0xC390, 0xC391, 0xC392, /* 0x40 */
-    0xC393, 0xC394,      0, 0xC395, 0xC396, 0xC397, 0xC398, 0xC399, /* 0x50 */
-    0xC39A, 0xC39B, 0xC39C, 0xC39D, 0xC39E, 0xC39F,      0,      0, /* 0x50 */
+    0xC393, 0xC394, 	 0, 0xC395, 0xC396, 0xC397, 0xC398, 0xC399, /* 0x50 */
+    0xC39A, 0xC39B, 0xC39C, 0xC39D, 0xC39E, 0xC39F, 	 0, 	 0, /* 0x50 */
          0, 0xC3A0, 0xC3A1, 0xC3A2, 0xC3A3, 0xC3A4, 0xC3A5, 0xC3A6, /* 0x60 */
     0xC3A7, 0xC3A8, 0xC3A9, 0xC3AA, 0xC3AB, 0xC3AC, 0xC3AD, 0xC3AE, /* 0x60 */
-    0xC3AF, 0xC3B0,      0, 0xC3B1, 0xC3B2, 0xC3B3, 0xC3B4, 0xC3B5, /* 0x70 */
-    0xC3B6, 0xC3B7, 0xC3B8, 0xC3B9, 0xC3BA, 0xC3BB,      0,      0, /* 0x70 */
+    0xC3AF, 0xC3B0, 	 0, 0xC3B1, 0xC3B2, 0xC3B3, 0xC3B4, 0xC3B5, /* 0x70 */
+    0xC3B6, 0xC3B7, 0xC3B8, 0xC3B9, 0xC3BA, 0xC3BB, 	 0, 	 0, /* 0x70 */
          0, 0xC3BC, 0xC3BD, 0xC3BE, 0xC3BF, 0xC3C0, 0xC3C1, 0xC3C2, /* 0x80 */
     0xC3C3, 0xC3C4, 0xC3C5, 0xC3C6, 0xC3C7, 0xC3C8, 0xC3C9, 0xC3CA, /* 0x80 */
-    0xC3CB, 0xC3CC,      0, 0xC3CD, 0xC3CE, 0xC3CF, 0xC3D0, 0xC3D1, /* 0x90 */
-    0xC3D2, 0xC3D3, 0xC3D4, 0xC3D5, 0xC3D6, 0xC3D7,      0,      0, /* 0x90 */
+    0xC3CB, 0xC3CC, 	 0, 0xC3CD, 0xC3CE, 0xC3CF, 0xC3D0, 0xC3D1, /* 0x90 */
+    0xC3D2, 0xC3D3, 0xC3D4, 0xC3D5, 0xC3D6, 0xC3D7, 	 0, 	 0, /* 0x90 */
          0, 0xC3D8, 0xC3D9, 0xC3DA, 0xC3DB, 0xC3DC, 0xC3DD, 0xC3DE, /* 0xA0 */
     0xC3DF, 0xC3E0, 0xC3E1, 0xC3E2, 0xC3E3, 0xC3E4, 0xC3E5, 0xC3E6, /* 0xA0 */
-    0xC3E7, 0xC3E8,      0, 0xC3E9, 0xC3EA, 0xC3EB, 0xC3EC, 0xC3ED, /* 0xB0 */
-    0xC3EE, 0xC3EF, 0xC3F0, 0xC3F1, 0xC3F2, 0xC3F3,      0,      0, /* 0xB0 */
+    0xC3E7, 0xC3E8, 	 0, 0xC3E9, 0xC3EA, 0xC3EB, 0xC3EC, 0xC3ED, /* 0xB0 */
+    0xC3EE, 0xC3EF, 0xC3F0, 0xC3F1, 0xC3F2, 0xC3F3, 	 0, 	 0, /* 0xB0 */
          0, 0xC3F4, 0xC3F5, 0xC3F6, 0xC3F7, 0xC3F8, 0xC3F9, 0xC3FA, /* 0xC0 */
     0xC3FB, 0xC3FC, 0xC3FD, 0xC3FE, 0xC3FF, 0xC400, 0xC401, 0xC402, /* 0xC0 */
-    0xC403, 0xC404,      0, 0xC405, 0xC406, 0xC407, 0xC408, 0xC409, /* 0xD0 */
-    0xC40A, 0xC40B, 0xC40C, 0xC40D, 0xC40E, 0xC40F,      0,      0, /* 0xD0 */
+    0xC403, 0xC404, 	 0, 0xC405, 0xC406, 0xC407, 0xC408, 0xC409, /* 0xD0 */
+    0xC40A, 0xC40B, 0xC40C, 0xC40D, 0xC40E, 0xC40F, 	 0, 	 0, /* 0xD0 */
          0, 0xC410, 0xC411, 0xC412, 0xC413, 0xC414, 0xC415, 0xC416, /* 0xE0 */
     0xC417, 0xC418, 0xC419, 0xC41A, 0xC41B, 0xC41C, 0xC41D, 0xC41E, /* 0xE0 */
-    0xC41F, 0xC420,      0, 0xC421, 0xC422, 0xC423, 0xC424, 0xC425, /* 0xF0 */
-    0xC426, 0xC427, 0xC428, 0xC429, 0xC42A, 0xC42B                  /* 0xF0 */
+    0xC41F, 0xC420, 	 0, 0xC421, 0xC422, 0xC423, 0xC424, 0xC425, /* 0xF0 */
+    0xC426, 0xC427, 0xC428, 0xC429, 0xC42A, 0xC42B					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_B2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC42C, 0xC42D, 0xC42E, 0xC42F, 0xC430, 0xC431, 0xC432, /* 0x40 */
     0xC433, 0xC434, 0xC435, 0xC436, 0xC437, 0xC438, 0xC439, 0xC43A, /* 0x40 */
-    0xC43B, 0xC43C,      0, 0xC43D, 0xC43E, 0xC43F, 0xC440, 0xC441, /* 0x50 */
-    0xC442, 0xC443, 0xC444, 0xC445, 0xC446, 0xC447,      0,      0, /* 0x50 */
+    0xC43B, 0xC43C, 	 0, 0xC43D, 0xC43E, 0xC43F, 0xC440, 0xC441, /* 0x50 */
+    0xC442, 0xC443, 0xC444, 0xC445, 0xC446, 0xC447, 	 0, 	 0, /* 0x50 */
          0, 0xC448, 0xC449, 0xC44A, 0xC44B, 0xC44C, 0xC44D, 0xC44E, /* 0x60 */
     0xC44F, 0xC450, 0xC451, 0xC452, 0xC453, 0xC454, 0xC455, 0xC456, /* 0x60 */
-    0xC457, 0xC458,      0, 0xC459, 0xC45A, 0xC45B, 0xC45C, 0xC45D, /* 0x70 */
-    0xC45E, 0xC45F, 0xC460, 0xC461, 0xC462, 0xC463,      0,      0, /* 0x70 */
+    0xC457, 0xC458, 	 0, 0xC459, 0xC45A, 0xC45B, 0xC45C, 0xC45D, /* 0x70 */
+    0xC45E, 0xC45F, 0xC460, 0xC461, 0xC462, 0xC463, 	 0, 	 0, /* 0x70 */
          0, 0xC464, 0xC465, 0xC466, 0xC467, 0xC468, 0xC469, 0xC46A, /* 0x80 */
     0xC46B, 0xC46C, 0xC46D, 0xC46E, 0xC46F, 0xC470, 0xC471, 0xC472, /* 0x80 */
-    0xC473, 0xC474,      0, 0xC475, 0xC476, 0xC477, 0xC478, 0xC479, /* 0x90 */
-    0xC47A, 0xC47B, 0xC47C, 0xC47D, 0xC47E, 0xC47F,      0,      0, /* 0x90 */
+    0xC473, 0xC474, 	 0, 0xC475, 0xC476, 0xC477, 0xC478, 0xC479, /* 0x90 */
+    0xC47A, 0xC47B, 0xC47C, 0xC47D, 0xC47E, 0xC47F, 	 0, 	 0, /* 0x90 */
          0, 0xC480, 0xC481, 0xC482, 0xC483, 0xC484, 0xC485, 0xC486, /* 0xA0 */
     0xC487, 0xC488, 0xC489, 0xC48A, 0xC48B, 0xC48C, 0xC48D, 0xC48E, /* 0xA0 */
-    0xC48F, 0xC490,      0, 0xC491, 0xC492, 0xC493, 0xC494, 0xC495, /* 0xB0 */
-    0xC496, 0xC497, 0xC498, 0xC499, 0xC49A, 0xC49B,      0,      0, /* 0xB0 */
+    0xC48F, 0xC490, 	 0, 0xC491, 0xC492, 0xC493, 0xC494, 0xC495, /* 0xB0 */
+    0xC496, 0xC497, 0xC498, 0xC499, 0xC49A, 0xC49B, 	 0, 	 0, /* 0xB0 */
          0, 0xC49C, 0xC49D, 0xC49E, 0xC49F, 0xC4A0, 0xC4A1, 0xC4A2, /* 0xC0 */
     0xC4A3, 0xC4A4, 0xC4A5, 0xC4A6, 0xC4A7, 0xC4A8, 0xC4A9, 0xC4AA, /* 0xC0 */
-    0xC4AB, 0xC4AC,      0, 0xC4AD, 0xC4AE, 0xC4AF, 0xC4B0, 0xC4B1, /* 0xD0 */
-    0xC4B2, 0xC4B3, 0xC4B4, 0xC4B5, 0xC4B6, 0xC4B7,      0,      0, /* 0xD0 */
+    0xC4AB, 0xC4AC, 	 0, 0xC4AD, 0xC4AE, 0xC4AF, 0xC4B0, 0xC4B1, /* 0xD0 */
+    0xC4B2, 0xC4B3, 0xC4B4, 0xC4B5, 0xC4B6, 0xC4B7, 	 0, 	 0, /* 0xD0 */
          0, 0xC4B8, 0xC4B9, 0xC4BA, 0xC4BB, 0xC4BC, 0xC4BD, 0xC4BE, /* 0xE0 */
     0xC4BF, 0xC4C0, 0xC4C1, 0xC4C2, 0xC4C3, 0xC4C4, 0xC4C5, 0xC4C6, /* 0xE0 */
-    0xC4C7, 0xC4C8,      0, 0xC4C9, 0xC4CA, 0xC4CB, 0xC4CC, 0xC4CD, /* 0xF0 */
-    0xC4CE, 0xC4CF, 0xC4D0, 0xC4D1, 0xC4D2, 0xC4D3                  /* 0xF0 */
+    0xC4C7, 0xC4C8, 	 0, 0xC4C9, 0xC4CA, 0xC4CB, 0xC4CC, 0xC4CD, /* 0xF0 */
+    0xC4CE, 0xC4CF, 0xC4D0, 0xC4D1, 0xC4D2, 0xC4D3					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_B3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC4D4, 0xC4D5, 0xC4D6, 0xC4D7, 0xC4D8, 0xC4D9, 0xC4DA, /* 0x40 */
     0xC4DB, 0xC4DC, 0xC4DD, 0xC4DE, 0xC4DF, 0xC4E0, 0xC4E1, 0xC4E2, /* 0x40 */
-    0xC4E3, 0xC4E4,      0, 0xC4E5, 0xC4E6, 0xC4E7, 0xC4E8, 0xC4E9, /* 0x50 */
-    0xC4EA, 0xC4EB, 0xC4EC, 0xC4ED, 0xC4EE, 0xC4EF,      0,      0, /* 0x50 */
+    0xC4E3, 0xC4E4, 	 0, 0xC4E5, 0xC4E6, 0xC4E7, 0xC4E8, 0xC4E9, /* 0x50 */
+    0xC4EA, 0xC4EB, 0xC4EC, 0xC4ED, 0xC4EE, 0xC4EF, 	 0, 	 0, /* 0x50 */
          0, 0xC4F0, 0xC4F1, 0xC4F2, 0xC4F3, 0xC4F4, 0xC4F5, 0xC4F6, /* 0x60 */
     0xC4F7, 0xC4F8, 0xC4F9, 0xC4FA, 0xC4FB, 0xC4FC, 0xC4FD, 0xC4FE, /* 0x60 */
-    0xC4FF, 0xC500,      0, 0xC501, 0xC502, 0xC503, 0xC504, 0xC505, /* 0x70 */
-    0xC506, 0xC507, 0xC508, 0xC509, 0xC50A, 0xC50B,      0,      0, /* 0x70 */
+    0xC4FF, 0xC500, 	 0, 0xC501, 0xC502, 0xC503, 0xC504, 0xC505, /* 0x70 */
+    0xC506, 0xC507, 0xC508, 0xC509, 0xC50A, 0xC50B, 	 0, 	 0, /* 0x70 */
          0, 0xC50C, 0xC50D, 0xC50E, 0xC50F, 0xC510, 0xC511, 0xC512, /* 0x80 */
     0xC513, 0xC514, 0xC515, 0xC516, 0xC517, 0xC518, 0xC519, 0xC51A, /* 0x80 */
-    0xC51B, 0xC51C,      0, 0xC51D, 0xC51E, 0xC51F, 0xC520, 0xC521, /* 0x90 */
-    0xC522, 0xC523, 0xC524, 0xC525, 0xC526, 0xC527,      0,      0, /* 0x90 */
+    0xC51B, 0xC51C, 	 0, 0xC51D, 0xC51E, 0xC51F, 0xC520, 0xC521, /* 0x90 */
+    0xC522, 0xC523, 0xC524, 0xC525, 0xC526, 0xC527, 	 0, 	 0, /* 0x90 */
          0, 0xC528, 0xC529, 0xC52A, 0xC52B, 0xC52C, 0xC52D, 0xC52E, /* 0xA0 */
     0xC52F, 0xC530, 0xC531, 0xC532, 0xC533, 0xC534, 0xC535, 0xC536, /* 0xA0 */
-    0xC537, 0xC538,      0, 0xC539, 0xC53A, 0xC53B, 0xC53C, 0xC53D, /* 0xB0 */
-    0xC53E, 0xC53F, 0xC540, 0xC541, 0xC542, 0xC543                  /* 0xB0 */
+    0xC537, 0xC538, 	 0, 0xC539, 0xC53A, 0xC53B, 0xC53C, 0xC53D, /* 0xB0 */
+    0xC53E, 0xC53F, 0xC540, 0xC541, 0xC542, 0xC543					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_B4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3147,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3147, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xC544, 0xC545, 0xC546, 0xC547, 0xC548, 0xC549, 0xC54A, /* 0x60 */
     0xC54B, 0xC54C, 0xC54D, 0xC54E, 0xC54F, 0xC550, 0xC551, 0xC552, /* 0x60 */
-    0xC553, 0xC554,      0, 0xC555, 0xC556, 0xC557, 0xC558, 0xC559, /* 0x70 */
-    0xC55A, 0xC55B, 0xC55C, 0xC55D, 0xC55E, 0xC55F,      0,      0, /* 0x70 */
+    0xC553, 0xC554, 	 0, 0xC555, 0xC556, 0xC557, 0xC558, 0xC559, /* 0x70 */
+    0xC55A, 0xC55B, 0xC55C, 0xC55D, 0xC55E, 0xC55F, 	 0, 	 0, /* 0x70 */
          0, 0xC560, 0xC561, 0xC562, 0xC563, 0xC564, 0xC565, 0xC566, /* 0x80 */
     0xC567, 0xC568, 0xC569, 0xC56A, 0xC56B, 0xC56C, 0xC56D, 0xC56E, /* 0x80 */
-    0xC56F, 0xC570,      0, 0xC571, 0xC572, 0xC573, 0xC574, 0xC575, /* 0x90 */
-    0xC576, 0xC577, 0xC578, 0xC579, 0xC57A, 0xC57B,      0,      0, /* 0x90 */
+    0xC56F, 0xC570, 	 0, 0xC571, 0xC572, 0xC573, 0xC574, 0xC575, /* 0x90 */
+    0xC576, 0xC577, 0xC578, 0xC579, 0xC57A, 0xC57B, 	 0, 	 0, /* 0x90 */
          0, 0xC57C, 0xC57D, 0xC57E, 0xC57F, 0xC580, 0xC581, 0xC582, /* 0xA0 */
     0xC583, 0xC584, 0xC585, 0xC586, 0xC587, 0xC588, 0xC589, 0xC58A, /* 0xA0 */
-    0xC58B, 0xC58C,      0, 0xC58D, 0xC58E, 0xC58F, 0xC590, 0xC591, /* 0xB0 */
-    0xC592, 0xC593, 0xC594, 0xC595, 0xC596, 0xC597,      0,      0, /* 0xB0 */
+    0xC58B, 0xC58C, 	 0, 0xC58D, 0xC58E, 0xC58F, 0xC590, 0xC591, /* 0xB0 */
+    0xC592, 0xC593, 0xC594, 0xC595, 0xC596, 0xC597, 	 0, 	 0, /* 0xB0 */
          0, 0xC598, 0xC599, 0xC59A, 0xC59B, 0xC59C, 0xC59D, 0xC59E, /* 0xC0 */
     0xC59F, 0xC5A0, 0xC5A1, 0xC5A2, 0xC5A3, 0xC5A4, 0xC5A5, 0xC5A6, /* 0xC0 */
-    0xC5A7, 0xC5A8,      0, 0xC5A9, 0xC5AA, 0xC5AB, 0xC5AC, 0xC5AD, /* 0xD0 */
-    0xC5AE, 0xC5AF, 0xC5B0, 0xC5B1, 0xC5B2, 0xC5B3,      0,      0, /* 0xD0 */
+    0xC5A7, 0xC5A8, 	 0, 0xC5A9, 0xC5AA, 0xC5AB, 0xC5AC, 0xC5AD, /* 0xD0 */
+    0xC5AE, 0xC5AF, 0xC5B0, 0xC5B1, 0xC5B2, 0xC5B3, 	 0, 	 0, /* 0xD0 */
          0, 0xC5B4, 0xC5B5, 0xC5B6, 0xC5B7, 0xC5B8, 0xC5B9, 0xC5BA, /* 0xE0 */
     0xC5BB, 0xC5BC, 0xC5BD, 0xC5BE, 0xC5BF, 0xC5C0, 0xC5C1, 0xC5C2, /* 0xE0 */
-    0xC5C3, 0xC5C4,      0, 0xC5C5, 0xC5C6, 0xC5C7, 0xC5C8, 0xC5C9, /* 0xF0 */
-    0xC5CA, 0xC5CB, 0xC5CC, 0xC5CD, 0xC5CE, 0xC5CF                  /* 0xF0 */
+    0xC5C3, 0xC5C4, 	 0, 0xC5C5, 0xC5C6, 0xC5C7, 0xC5C8, 0xC5C9, /* 0xF0 */
+    0xC5CA, 0xC5CB, 0xC5CC, 0xC5CD, 0xC5CE, 0xC5CF					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_B5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC5D0, 0xC5D1, 0xC5D2, 0xC5D3, 0xC5D4, 0xC5D5, 0xC5D6, /* 0x40 */
     0xC5D7, 0xC5D8, 0xC5D9, 0xC5DA, 0xC5DB, 0xC5DC, 0xC5DD, 0xC5DE, /* 0x40 */
-    0xC5DF, 0xC5E0,      0, 0xC5E1, 0xC5E2, 0xC5E3, 0xC5E4, 0xC5E5, /* 0x50 */
-    0xC5E6, 0xC5E7, 0xC5E8, 0xC5E9, 0xC5EA, 0xC5EB,      0,      0, /* 0x50 */
+    0xC5DF, 0xC5E0, 	 0, 0xC5E1, 0xC5E2, 0xC5E3, 0xC5E4, 0xC5E5, /* 0x50 */
+    0xC5E6, 0xC5E7, 0xC5E8, 0xC5E9, 0xC5EA, 0xC5EB, 	 0, 	 0, /* 0x50 */
          0, 0xC5EC, 0xC5ED, 0xC5EE, 0xC5EF, 0xC5F0, 0xC5F1, 0xC5F2, /* 0x60 */
     0xC5F3, 0xC5F4, 0xC5F5, 0xC5F6, 0xC5F7, 0xC5F8, 0xC5F9, 0xC5FA, /* 0x60 */
-    0xC5FB, 0xC5FC,      0, 0xC5FD, 0xC5FE, 0xC5FF, 0xC600, 0xC601, /* 0x70 */
-    0xC602, 0xC603, 0xC604, 0xC605, 0xC606, 0xC607,      0,      0, /* 0x70 */
+    0xC5FB, 0xC5FC, 	 0, 0xC5FD, 0xC5FE, 0xC5FF, 0xC600, 0xC601, /* 0x70 */
+    0xC602, 0xC603, 0xC604, 0xC605, 0xC606, 0xC607, 	 0, 	 0, /* 0x70 */
          0, 0xC608, 0xC609, 0xC60A, 0xC60B, 0xC60C, 0xC60D, 0xC60E, /* 0x80 */
     0xC60F, 0xC610, 0xC611, 0xC612, 0xC613, 0xC614, 0xC615, 0xC616, /* 0x80 */
-    0xC617, 0xC618,      0, 0xC619, 0xC61A, 0xC61B, 0xC61C, 0xC61D, /* 0x90 */
-    0xC61E, 0xC61F, 0xC620, 0xC621, 0xC622, 0xC623,      0,      0, /* 0x90 */
+    0xC617, 0xC618, 	 0, 0xC619, 0xC61A, 0xC61B, 0xC61C, 0xC61D, /* 0x90 */
+    0xC61E, 0xC61F, 0xC620, 0xC621, 0xC622, 0xC623, 	 0, 	 0, /* 0x90 */
          0, 0xC624, 0xC625, 0xC626, 0xC627, 0xC628, 0xC629, 0xC62A, /* 0xA0 */
     0xC62B, 0xC62C, 0xC62D, 0xC62E, 0xC62F, 0xC630, 0xC631, 0xC632, /* 0xA0 */
-    0xC633, 0xC634,      0, 0xC635, 0xC636, 0xC637, 0xC638, 0xC639, /* 0xB0 */
-    0xC63A, 0xC63B, 0xC63C, 0xC63D, 0xC63E, 0xC63F,      0,      0, /* 0xB0 */
+    0xC633, 0xC634, 	 0, 0xC635, 0xC636, 0xC637, 0xC638, 0xC639, /* 0xB0 */
+    0xC63A, 0xC63B, 0xC63C, 0xC63D, 0xC63E, 0xC63F, 	 0, 	 0, /* 0xB0 */
          0, 0xC640, 0xC641, 0xC642, 0xC643, 0xC644, 0xC645, 0xC646, /* 0xC0 */
     0xC647, 0xC648, 0xC649, 0xC64A, 0xC64B, 0xC64C, 0xC64D, 0xC64E, /* 0xC0 */
-    0xC64F, 0xC650,      0, 0xC651, 0xC652, 0xC653, 0xC654, 0xC655, /* 0xD0 */
-    0xC656, 0xC657, 0xC658, 0xC659, 0xC65A, 0xC65B,      0,      0, /* 0xD0 */
+    0xC64F, 0xC650, 	 0, 0xC651, 0xC652, 0xC653, 0xC654, 0xC655, /* 0xD0 */
+    0xC656, 0xC657, 0xC658, 0xC659, 0xC65A, 0xC65B, 	 0, 	 0, /* 0xD0 */
          0, 0xC65C, 0xC65D, 0xC65E, 0xC65F, 0xC660, 0xC661, 0xC662, /* 0xE0 */
     0xC663, 0xC664, 0xC665, 0xC666, 0xC667, 0xC668, 0xC669, 0xC66A, /* 0xE0 */
-    0xC66B, 0xC66C,      0, 0xC66D, 0xC66E, 0xC66F, 0xC670, 0xC671, /* 0xF0 */
-    0xC672, 0xC673, 0xC674, 0xC675, 0xC676, 0xC677                  /* 0xF0 */
+    0xC66B, 0xC66C, 	 0, 0xC66D, 0xC66E, 0xC66F, 0xC670, 0xC671, /* 0xF0 */
+    0xC672, 0xC673, 0xC674, 0xC675, 0xC676, 0xC677					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_B6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC678, 0xC679, 0xC67A, 0xC67B, 0xC67C, 0xC67D, 0xC67E, /* 0x40 */
     0xC67F, 0xC680, 0xC681, 0xC682, 0xC683, 0xC684, 0xC685, 0xC686, /* 0x40 */
-    0xC687, 0xC688,      0, 0xC689, 0xC68A, 0xC68B, 0xC68C, 0xC68D, /* 0x50 */
-    0xC68E, 0xC68F, 0xC690, 0xC691, 0xC692, 0xC693,      0,      0, /* 0x50 */
+    0xC687, 0xC688, 	 0, 0xC689, 0xC68A, 0xC68B, 0xC68C, 0xC68D, /* 0x50 */
+    0xC68E, 0xC68F, 0xC690, 0xC691, 0xC692, 0xC693, 	 0, 	 0, /* 0x50 */
          0, 0xC694, 0xC695, 0xC696, 0xC697, 0xC698, 0xC699, 0xC69A, /* 0x60 */
     0xC69B, 0xC69C, 0xC69D, 0xC69E, 0xC69F, 0xC6A0, 0xC6A1, 0xC6A2, /* 0x60 */
-    0xC6A3, 0xC6A4,      0, 0xC6A5, 0xC6A6, 0xC6A7, 0xC6A8, 0xC6A9, /* 0x70 */
-    0xC6AA, 0xC6AB, 0xC6AC, 0xC6AD, 0xC6AE, 0xC6AF,      0,      0, /* 0x70 */
+    0xC6A3, 0xC6A4, 	 0, 0xC6A5, 0xC6A6, 0xC6A7, 0xC6A8, 0xC6A9, /* 0x70 */
+    0xC6AA, 0xC6AB, 0xC6AC, 0xC6AD, 0xC6AE, 0xC6AF, 	 0, 	 0, /* 0x70 */
          0, 0xC6B0, 0xC6B1, 0xC6B2, 0xC6B3, 0xC6B4, 0xC6B5, 0xC6B6, /* 0x80 */
     0xC6B7, 0xC6B8, 0xC6B9, 0xC6BA, 0xC6BB, 0xC6BC, 0xC6BD, 0xC6BE, /* 0x80 */
-    0xC6BF, 0xC6C0,      0, 0xC6C1, 0xC6C2, 0xC6C3, 0xC6C4, 0xC6C5, /* 0x90 */
-    0xC6C6, 0xC6C7, 0xC6C8, 0xC6C9, 0xC6CA, 0xC6CB,      0,      0, /* 0x90 */
+    0xC6BF, 0xC6C0, 	 0, 0xC6C1, 0xC6C2, 0xC6C3, 0xC6C4, 0xC6C5, /* 0x90 */
+    0xC6C6, 0xC6C7, 0xC6C8, 0xC6C9, 0xC6CA, 0xC6CB, 	 0, 	 0, /* 0x90 */
          0, 0xC6CC, 0xC6CD, 0xC6CE, 0xC6CF, 0xC6D0, 0xC6D1, 0xC6D2, /* 0xA0 */
     0xC6D3, 0xC6D4, 0xC6D5, 0xC6D6, 0xC6D7, 0xC6D8, 0xC6D9, 0xC6DA, /* 0xA0 */
-    0xC6DB, 0xC6DC,      0, 0xC6DD, 0xC6DE, 0xC6DF, 0xC6E0, 0xC6E1, /* 0xB0 */
-    0xC6E2, 0xC6E3, 0xC6E4, 0xC6E5, 0xC6E6, 0xC6E7,      0,      0, /* 0xB0 */
+    0xC6DB, 0xC6DC, 	 0, 0xC6DD, 0xC6DE, 0xC6DF, 0xC6E0, 0xC6E1, /* 0xB0 */
+    0xC6E2, 0xC6E3, 0xC6E4, 0xC6E5, 0xC6E6, 0xC6E7, 	 0, 	 0, /* 0xB0 */
          0, 0xC6E8, 0xC6E9, 0xC6EA, 0xC6EB, 0xC6EC, 0xC6ED, 0xC6EE, /* 0xC0 */
     0xC6EF, 0xC6F0, 0xC6F1, 0xC6F2, 0xC6F3, 0xC6F4, 0xC6F5, 0xC6F6, /* 0xC0 */
-    0xC6F7, 0xC6F8,      0, 0xC6F9, 0xC6FA, 0xC6FB, 0xC6FC, 0xC6FD, /* 0xD0 */
-    0xC6FE, 0xC6FF, 0xC700, 0xC701, 0xC702, 0xC703,      0,      0, /* 0xD0 */
+    0xC6F7, 0xC6F8, 	 0, 0xC6F9, 0xC6FA, 0xC6FB, 0xC6FC, 0xC6FD, /* 0xD0 */
+    0xC6FE, 0xC6FF, 0xC700, 0xC701, 0xC702, 0xC703, 	 0, 	 0, /* 0xD0 */
          0, 0xC704, 0xC705, 0xC706, 0xC707, 0xC708, 0xC709, 0xC70A, /* 0xE0 */
     0xC70B, 0xC70C, 0xC70D, 0xC70E, 0xC70F, 0xC710, 0xC711, 0xC712, /* 0xE0 */
-    0xC713, 0xC714,      0, 0xC715, 0xC716, 0xC717, 0xC718, 0xC719, /* 0xF0 */
-    0xC71A, 0xC71B, 0xC71C, 0xC71D, 0xC71E, 0xC71F                  /* 0xF0 */
+    0xC713, 0xC714, 	 0, 0xC715, 0xC716, 0xC717, 0xC718, 0xC719, /* 0xF0 */
+    0xC71A, 0xC71B, 0xC71C, 0xC71D, 0xC71E, 0xC71F					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_B7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC720, 0xC721, 0xC722, 0xC723, 0xC724, 0xC725, 0xC726, /* 0x40 */
     0xC727, 0xC728, 0xC729, 0xC72A, 0xC72B, 0xC72C, 0xC72D, 0xC72E, /* 0x40 */
-    0xC72F, 0xC730,      0, 0xC731, 0xC732, 0xC733, 0xC734, 0xC735, /* 0x50 */
-    0xC736, 0xC737, 0xC738, 0xC739, 0xC73A, 0xC73B,      0,      0, /* 0x50 */
+    0xC72F, 0xC730, 	 0, 0xC731, 0xC732, 0xC733, 0xC734, 0xC735, /* 0x50 */
+    0xC736, 0xC737, 0xC738, 0xC739, 0xC73A, 0xC73B, 	 0, 	 0, /* 0x50 */
          0, 0xC73C, 0xC73D, 0xC73E, 0xC73F, 0xC740, 0xC741, 0xC742, /* 0x60 */
     0xC743, 0xC744, 0xC745, 0xC746, 0xC747, 0xC748, 0xC749, 0xC74A, /* 0x60 */
-    0xC74B, 0xC74C,      0, 0xC74D, 0xC74E, 0xC74F, 0xC750, 0xC751, /* 0x70 */
-    0xC752, 0xC753, 0xC754, 0xC755, 0xC756, 0xC757,      0,      0, /* 0x70 */
+    0xC74B, 0xC74C, 	 0, 0xC74D, 0xC74E, 0xC74F, 0xC750, 0xC751, /* 0x70 */
+    0xC752, 0xC753, 0xC754, 0xC755, 0xC756, 0xC757, 	 0, 	 0, /* 0x70 */
          0, 0xC758, 0xC759, 0xC75A, 0xC75B, 0xC75C, 0xC75D, 0xC75E, /* 0x80 */
     0xC75F, 0xC760, 0xC761, 0xC762, 0xC763, 0xC764, 0xC765, 0xC766, /* 0x80 */
-    0xC767, 0xC768,      0, 0xC769, 0xC76A, 0xC76B, 0xC76C, 0xC76D, /* 0x90 */
-    0xC76E, 0xC76F, 0xC770, 0xC771, 0xC772, 0xC773,      0,      0, /* 0x90 */
+    0xC767, 0xC768, 	 0, 0xC769, 0xC76A, 0xC76B, 0xC76C, 0xC76D, /* 0x90 */
+    0xC76E, 0xC76F, 0xC770, 0xC771, 0xC772, 0xC773, 	 0, 	 0, /* 0x90 */
          0, 0xC774, 0xC775, 0xC776, 0xC777, 0xC778, 0xC779, 0xC77A, /* 0xA0 */
     0xC77B, 0xC77C, 0xC77D, 0xC77E, 0xC77F, 0xC780, 0xC781, 0xC782, /* 0xA0 */
-    0xC783, 0xC784,      0, 0xC785, 0xC786, 0xC787, 0xC788, 0xC789, /* 0xB0 */
-    0xC78A, 0xC78B, 0xC78C, 0xC78D, 0xC78E, 0xC78F                  /* 0xB0 */
+    0xC783, 0xC784, 	 0, 0xC785, 0xC786, 0xC787, 0xC788, 0xC789, /* 0xB0 */
+    0xC78A, 0xC78B, 0xC78C, 0xC78D, 0xC78E, 0xC78F					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_B8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3148,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3148, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xC790, 0xC791, 0xC792, 0xC793, 0xC794, 0xC795, 0xC796, /* 0x60 */
     0xC797, 0xC798, 0xC799, 0xC79A, 0xC79B, 0xC79C, 0xC79D, 0xC79E, /* 0x60 */
-    0xC79F, 0xC7A0,      0, 0xC7A1, 0xC7A2, 0xC7A3, 0xC7A4, 0xC7A5, /* 0x70 */
-    0xC7A6, 0xC7A7, 0xC7A8, 0xC7A9, 0xC7AA, 0xC7AB,      0,      0, /* 0x70 */
+    0xC79F, 0xC7A0, 	 0, 0xC7A1, 0xC7A2, 0xC7A3, 0xC7A4, 0xC7A5, /* 0x70 */
+    0xC7A6, 0xC7A7, 0xC7A8, 0xC7A9, 0xC7AA, 0xC7AB, 	 0, 	 0, /* 0x70 */
          0, 0xC7AC, 0xC7AD, 0xC7AE, 0xC7AF, 0xC7B0, 0xC7B1, 0xC7B2, /* 0x80 */
     0xC7B3, 0xC7B4, 0xC7B5, 0xC7B6, 0xC7B7, 0xC7B8, 0xC7B9, 0xC7BA, /* 0x80 */
-    0xC7BB, 0xC7BC,      0, 0xC7BD, 0xC7BE, 0xC7BF, 0xC7C0, 0xC7C1, /* 0x90 */
-    0xC7C2, 0xC7C3, 0xC7C4, 0xC7C5, 0xC7C6, 0xC7C7,      0,      0, /* 0x90 */
+    0xC7BB, 0xC7BC, 	 0, 0xC7BD, 0xC7BE, 0xC7BF, 0xC7C0, 0xC7C1, /* 0x90 */
+    0xC7C2, 0xC7C3, 0xC7C4, 0xC7C5, 0xC7C6, 0xC7C7, 	 0, 	 0, /* 0x90 */
          0, 0xC7C8, 0xC7C9, 0xC7CA, 0xC7CB, 0xC7CC, 0xC7CD, 0xC7CE, /* 0xA0 */
     0xC7CF, 0xC7D0, 0xC7D1, 0xC7D2, 0xC7D3, 0xC7D4, 0xC7D5, 0xC7D6, /* 0xA0 */
-    0xC7D7, 0xC7D8,      0, 0xC7D9, 0xC7DA, 0xC7DB, 0xC7DC, 0xC7DD, /* 0xB0 */
-    0xC7DE, 0xC7DF, 0xC7E0, 0xC7E1, 0xC7E2, 0xC7E3,      0,      0, /* 0xB0 */
+    0xC7D7, 0xC7D8, 	 0, 0xC7D9, 0xC7DA, 0xC7DB, 0xC7DC, 0xC7DD, /* 0xB0 */
+    0xC7DE, 0xC7DF, 0xC7E0, 0xC7E1, 0xC7E2, 0xC7E3, 	 0, 	 0, /* 0xB0 */
          0, 0xC7E4, 0xC7E5, 0xC7E6, 0xC7E7, 0xC7E8, 0xC7E9, 0xC7EA, /* 0xC0 */
     0xC7EB, 0xC7EC, 0xC7ED, 0xC7EE, 0xC7EF, 0xC7F0, 0xC7F1, 0xC7F2, /* 0xC0 */
-    0xC7F3, 0xC7F4,      0, 0xC7F5, 0xC7F6, 0xC7F7, 0xC7F8, 0xC7F9, /* 0xD0 */
-    0xC7FA, 0xC7FB, 0xC7FC, 0xC7FD, 0xC7FE, 0xC7FF,      0,      0, /* 0xD0 */
+    0xC7F3, 0xC7F4, 	 0, 0xC7F5, 0xC7F6, 0xC7F7, 0xC7F8, 0xC7F9, /* 0xD0 */
+    0xC7FA, 0xC7FB, 0xC7FC, 0xC7FD, 0xC7FE, 0xC7FF, 	 0, 	 0, /* 0xD0 */
          0, 0xC800, 0xC801, 0xC802, 0xC803, 0xC804, 0xC805, 0xC806, /* 0xE0 */
     0xC807, 0xC808, 0xC809, 0xC80A, 0xC80B, 0xC80C, 0xC80D, 0xC80E, /* 0xE0 */
-    0xC80F, 0xC810,      0, 0xC811, 0xC812, 0xC813, 0xC814, 0xC815, /* 0xF0 */
-    0xC816, 0xC817, 0xC818, 0xC819, 0xC81A, 0xC81B                  /* 0xF0 */
+    0xC80F, 0xC810, 	 0, 0xC811, 0xC812, 0xC813, 0xC814, 0xC815, /* 0xF0 */
+    0xC816, 0xC817, 0xC818, 0xC819, 0xC81A, 0xC81B					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_B9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC81C, 0xC81D, 0xC81E, 0xC81F, 0xC820, 0xC821, 0xC822, /* 0x40 */
     0xC823, 0xC824, 0xC825, 0xC826, 0xC827, 0xC828, 0xC829, 0xC82A, /* 0x40 */
-    0xC82B, 0xC82C,      0, 0xC82D, 0xC82E, 0xC82F, 0xC830, 0xC831, /* 0x50 */
-    0xC832, 0xC833, 0xC834, 0xC835, 0xC836, 0xC837,      0,      0, /* 0x50 */
+    0xC82B, 0xC82C, 	 0, 0xC82D, 0xC82E, 0xC82F, 0xC830, 0xC831, /* 0x50 */
+    0xC832, 0xC833, 0xC834, 0xC835, 0xC836, 0xC837, 	 0, 	 0, /* 0x50 */
          0, 0xC838, 0xC839, 0xC83A, 0xC83B, 0xC83C, 0xC83D, 0xC83E, /* 0x60 */
     0xC83F, 0xC840, 0xC841, 0xC842, 0xC843, 0xC844, 0xC845, 0xC846, /* 0x60 */
-    0xC847, 0xC848,      0, 0xC849, 0xC84A, 0xC84B, 0xC84C, 0xC84D, /* 0x70 */
-    0xC84E, 0xC84F, 0xC850, 0xC851, 0xC852, 0xC853,      0,      0, /* 0x70 */
+    0xC847, 0xC848, 	 0, 0xC849, 0xC84A, 0xC84B, 0xC84C, 0xC84D, /* 0x70 */
+    0xC84E, 0xC84F, 0xC850, 0xC851, 0xC852, 0xC853, 	 0, 	 0, /* 0x70 */
          0, 0xC854, 0xC855, 0xC856, 0xC857, 0xC858, 0xC859, 0xC85A, /* 0x80 */
     0xC85B, 0xC85C, 0xC85D, 0xC85E, 0xC85F, 0xC860, 0xC861, 0xC862, /* 0x80 */
-    0xC863, 0xC864,      0, 0xC865, 0xC866, 0xC867, 0xC868, 0xC869, /* 0x90 */
-    0xC86A, 0xC86B, 0xC86C, 0xC86D, 0xC86E, 0xC86F,      0,      0, /* 0x90 */
+    0xC863, 0xC864, 	 0, 0xC865, 0xC866, 0xC867, 0xC868, 0xC869, /* 0x90 */
+    0xC86A, 0xC86B, 0xC86C, 0xC86D, 0xC86E, 0xC86F, 	 0, 	 0, /* 0x90 */
          0, 0xC870, 0xC871, 0xC872, 0xC873, 0xC874, 0xC875, 0xC876, /* 0xA0 */
     0xC877, 0xC878, 0xC879, 0xC87A, 0xC87B, 0xC87C, 0xC87D, 0xC87E, /* 0xA0 */
-    0xC87F, 0xC880,      0, 0xC881, 0xC882, 0xC883, 0xC884, 0xC885, /* 0xB0 */
-    0xC886, 0xC887, 0xC888, 0xC889, 0xC88A, 0xC88B,      0,      0, /* 0xB0 */
+    0xC87F, 0xC880, 	 0, 0xC881, 0xC882, 0xC883, 0xC884, 0xC885, /* 0xB0 */
+    0xC886, 0xC887, 0xC888, 0xC889, 0xC88A, 0xC88B, 	 0, 	 0, /* 0xB0 */
          0, 0xC88C, 0xC88D, 0xC88E, 0xC88F, 0xC890, 0xC891, 0xC892, /* 0xC0 */
     0xC893, 0xC894, 0xC895, 0xC896, 0xC897, 0xC898, 0xC899, 0xC89A, /* 0xC0 */
-    0xC89B, 0xC89C,      0, 0xC89D, 0xC89E, 0xC89F, 0xC8A0, 0xC8A1, /* 0xD0 */
-    0xC8A2, 0xC8A3, 0xC8A4, 0xC8A5, 0xC8A6, 0xC8A7,      0,      0, /* 0xD0 */
+    0xC89B, 0xC89C, 	 0, 0xC89D, 0xC89E, 0xC89F, 0xC8A0, 0xC8A1, /* 0xD0 */
+    0xC8A2, 0xC8A3, 0xC8A4, 0xC8A5, 0xC8A6, 0xC8A7, 	 0, 	 0, /* 0xD0 */
          0, 0xC8A8, 0xC8A9, 0xC8AA, 0xC8AB, 0xC8AC, 0xC8AD, 0xC8AE, /* 0xE0 */
     0xC8AF, 0xC8B0, 0xC8B1, 0xC8B2, 0xC8B3, 0xC8B4, 0xC8B5, 0xC8B6, /* 0xE0 */
-    0xC8B7, 0xC8B8,      0, 0xC8B9, 0xC8BA, 0xC8BB, 0xC8BC, 0xC8BD, /* 0xF0 */
-    0xC8BE, 0xC8BF, 0xC8C0, 0xC8C1, 0xC8C2, 0xC8C3                  /* 0xF0 */
+    0xC8B7, 0xC8B8, 	 0, 0xC8B9, 0xC8BA, 0xC8BB, 0xC8BC, 0xC8BD, /* 0xF0 */
+    0xC8BE, 0xC8BF, 0xC8C0, 0xC8C1, 0xC8C2, 0xC8C3					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_BA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC8C4, 0xC8C5, 0xC8C6, 0xC8C7, 0xC8C8, 0xC8C9, 0xC8CA, /* 0x40 */
     0xC8CB, 0xC8CC, 0xC8CD, 0xC8CE, 0xC8CF, 0xC8D0, 0xC8D1, 0xC8D2, /* 0x40 */
-    0xC8D3, 0xC8D4,      0, 0xC8D5, 0xC8D6, 0xC8D7, 0xC8D8, 0xC8D9, /* 0x50 */
-    0xC8DA, 0xC8DB, 0xC8DC, 0xC8DD, 0xC8DE, 0xC8DF,      0,      0, /* 0x50 */
+    0xC8D3, 0xC8D4, 	 0, 0xC8D5, 0xC8D6, 0xC8D7, 0xC8D8, 0xC8D9, /* 0x50 */
+    0xC8DA, 0xC8DB, 0xC8DC, 0xC8DD, 0xC8DE, 0xC8DF, 	 0, 	 0, /* 0x50 */
          0, 0xC8E0, 0xC8E1, 0xC8E2, 0xC8E3, 0xC8E4, 0xC8E5, 0xC8E6, /* 0x60 */
     0xC8E7, 0xC8E8, 0xC8E9, 0xC8EA, 0xC8EB, 0xC8EC, 0xC8ED, 0xC8EE, /* 0x60 */
-    0xC8EF, 0xC8F0,      0, 0xC8F1, 0xC8F2, 0xC8F3, 0xC8F4, 0xC8F5, /* 0x70 */
-    0xC8F6, 0xC8F7, 0xC8F8, 0xC8F9, 0xC8FA, 0xC8FB,      0,      0, /* 0x70 */
+    0xC8EF, 0xC8F0, 	 0, 0xC8F1, 0xC8F2, 0xC8F3, 0xC8F4, 0xC8F5, /* 0x70 */
+    0xC8F6, 0xC8F7, 0xC8F8, 0xC8F9, 0xC8FA, 0xC8FB, 	 0, 	 0, /* 0x70 */
          0, 0xC8FC, 0xC8FD, 0xC8FE, 0xC8FF, 0xC900, 0xC901, 0xC902, /* 0x80 */
     0xC903, 0xC904, 0xC905, 0xC906, 0xC907, 0xC908, 0xC909, 0xC90A, /* 0x80 */
-    0xC90B, 0xC90C,      0, 0xC90D, 0xC90E, 0xC90F, 0xC910, 0xC911, /* 0x90 */
-    0xC912, 0xC913, 0xC914, 0xC915, 0xC916, 0xC917,      0,      0, /* 0x90 */
+    0xC90B, 0xC90C, 	 0, 0xC90D, 0xC90E, 0xC90F, 0xC910, 0xC911, /* 0x90 */
+    0xC912, 0xC913, 0xC914, 0xC915, 0xC916, 0xC917, 	 0, 	 0, /* 0x90 */
          0, 0xC918, 0xC919, 0xC91A, 0xC91B, 0xC91C, 0xC91D, 0xC91E, /* 0xA0 */
     0xC91F, 0xC920, 0xC921, 0xC922, 0xC923, 0xC924, 0xC925, 0xC926, /* 0xA0 */
-    0xC927, 0xC928,      0, 0xC929, 0xC92A, 0xC92B, 0xC92C, 0xC92D, /* 0xB0 */
-    0xC92E, 0xC92F, 0xC930, 0xC931, 0xC932, 0xC933,      0,      0, /* 0xB0 */
+    0xC927, 0xC928, 	 0, 0xC929, 0xC92A, 0xC92B, 0xC92C, 0xC92D, /* 0xB0 */
+    0xC92E, 0xC92F, 0xC930, 0xC931, 0xC932, 0xC933, 	 0, 	 0, /* 0xB0 */
          0, 0xC934, 0xC935, 0xC936, 0xC937, 0xC938, 0xC939, 0xC93A, /* 0xC0 */
     0xC93B, 0xC93C, 0xC93D, 0xC93E, 0xC93F, 0xC940, 0xC941, 0xC942, /* 0xC0 */
-    0xC943, 0xC944,      0, 0xC945, 0xC946, 0xC947, 0xC948, 0xC949, /* 0xD0 */
-    0xC94A, 0xC94B, 0xC94C, 0xC94D, 0xC94E, 0xC94F,      0,      0, /* 0xD0 */
+    0xC943, 0xC944, 	 0, 0xC945, 0xC946, 0xC947, 0xC948, 0xC949, /* 0xD0 */
+    0xC94A, 0xC94B, 0xC94C, 0xC94D, 0xC94E, 0xC94F, 	 0, 	 0, /* 0xD0 */
          0, 0xC950, 0xC951, 0xC952, 0xC953, 0xC954, 0xC955, 0xC956, /* 0xE0 */
     0xC957, 0xC958, 0xC959, 0xC95A, 0xC95B, 0xC95C, 0xC95D, 0xC95E, /* 0xE0 */
-    0xC95F, 0xC960,      0, 0xC961, 0xC962, 0xC963, 0xC964, 0xC965, /* 0xF0 */
-    0xC966, 0xC967, 0xC968, 0xC969, 0xC96A, 0xC96B                  /* 0xF0 */
+    0xC95F, 0xC960, 	 0, 0xC961, 0xC962, 0xC963, 0xC964, 0xC965, /* 0xF0 */
+    0xC966, 0xC967, 0xC968, 0xC969, 0xC96A, 0xC96B					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_BB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC96C, 0xC96D, 0xC96E, 0xC96F, 0xC970, 0xC971, 0xC972, /* 0x40 */
     0xC973, 0xC974, 0xC975, 0xC976, 0xC977, 0xC978, 0xC979, 0xC97A, /* 0x40 */
-    0xC97B, 0xC97C,      0, 0xC97D, 0xC97E, 0xC97F, 0xC980, 0xC981, /* 0x50 */
-    0xC982, 0xC983, 0xC984, 0xC985, 0xC986, 0xC987,      0,      0, /* 0x50 */
+    0xC97B, 0xC97C, 	 0, 0xC97D, 0xC97E, 0xC97F, 0xC980, 0xC981, /* 0x50 */
+    0xC982, 0xC983, 0xC984, 0xC985, 0xC986, 0xC987, 	 0, 	 0, /* 0x50 */
          0, 0xC988, 0xC989, 0xC98A, 0xC98B, 0xC98C, 0xC98D, 0xC98E, /* 0x60 */
     0xC98F, 0xC990, 0xC991, 0xC992, 0xC993, 0xC994, 0xC995, 0xC996, /* 0x60 */
-    0xC997, 0xC998,      0, 0xC999, 0xC99A, 0xC99B, 0xC99C, 0xC99D, /* 0x70 */
-    0xC99E, 0xC99F, 0xC9A0, 0xC9A1, 0xC9A2, 0xC9A3,      0,      0, /* 0x70 */
+    0xC997, 0xC998, 	 0, 0xC999, 0xC99A, 0xC99B, 0xC99C, 0xC99D, /* 0x70 */
+    0xC99E, 0xC99F, 0xC9A0, 0xC9A1, 0xC9A2, 0xC9A3, 	 0, 	 0, /* 0x70 */
          0, 0xC9A4, 0xC9A5, 0xC9A6, 0xC9A7, 0xC9A8, 0xC9A9, 0xC9AA, /* 0x80 */
     0xC9AB, 0xC9AC, 0xC9AD, 0xC9AE, 0xC9AF, 0xC9B0, 0xC9B1, 0xC9B2, /* 0x80 */
-    0xC9B3, 0xC9B4,      0, 0xC9B5, 0xC9B6, 0xC9B7, 0xC9B8, 0xC9B9, /* 0x90 */
-    0xC9BA, 0xC9BB, 0xC9BC, 0xC9BD, 0xC9BE, 0xC9BF,      0,      0, /* 0x90 */
+    0xC9B3, 0xC9B4, 	 0, 0xC9B5, 0xC9B6, 0xC9B7, 0xC9B8, 0xC9B9, /* 0x90 */
+    0xC9BA, 0xC9BB, 0xC9BC, 0xC9BD, 0xC9BE, 0xC9BF, 	 0, 	 0, /* 0x90 */
          0, 0xC9C0, 0xC9C1, 0xC9C2, 0xC9C3, 0xC9C4, 0xC9C5, 0xC9C6, /* 0xA0 */
     0xC9C7, 0xC9C8, 0xC9C9, 0xC9CA, 0xC9CB, 0xC9CC, 0xC9CD, 0xC9CE, /* 0xA0 */
-    0xC9CF, 0xC9D0,      0, 0xC9D1, 0xC9D2, 0xC9D3, 0xC9D4, 0xC9D5, /* 0xB0 */
-    0xC9D6, 0xC9D7, 0xC9D8, 0xC9D9, 0xC9DA, 0xC9DB                  /* 0xB0 */
+    0xC9CF, 0xC9D0, 	 0, 0xC9D1, 0xC9D2, 0xC9D3, 0xC9D4, 0xC9D5, /* 0xB0 */
+    0xC9D6, 0xC9D7, 0xC9D8, 0xC9D9, 0xC9DA, 0xC9DB					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_BC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x3149,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x3149, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xC9DC, 0xC9DD, 0xC9DE, 0xC9DF, 0xC9E0, 0xC9E1, 0xC9E2, /* 0x60 */
     0xC9E3, 0xC9E4, 0xC9E5, 0xC9E6, 0xC9E7, 0xC9E8, 0xC9E9, 0xC9EA, /* 0x60 */
-    0xC9EB, 0xC9EC,      0, 0xC9ED, 0xC9EE, 0xC9EF, 0xC9F0, 0xC9F1, /* 0x70 */
-    0xC9F2, 0xC9F3, 0xC9F4, 0xC9F5, 0xC9F6, 0xC9F7,      0,      0, /* 0x70 */
+    0xC9EB, 0xC9EC, 	 0, 0xC9ED, 0xC9EE, 0xC9EF, 0xC9F0, 0xC9F1, /* 0x70 */
+    0xC9F2, 0xC9F3, 0xC9F4, 0xC9F5, 0xC9F6, 0xC9F7, 	 0, 	 0, /* 0x70 */
          0, 0xC9F8, 0xC9F9, 0xC9FA, 0xC9FB, 0xC9FC, 0xC9FD, 0xC9FE, /* 0x80 */
     0xC9FF, 0xCA00, 0xCA01, 0xCA02, 0xCA03, 0xCA04, 0xCA05, 0xCA06, /* 0x80 */
-    0xCA07, 0xCA08,      0, 0xCA09, 0xCA0A, 0xCA0B, 0xCA0C, 0xCA0D, /* 0x90 */
-    0xCA0E, 0xCA0F, 0xCA10, 0xCA11, 0xCA12, 0xCA13,      0,      0, /* 0x90 */
+    0xCA07, 0xCA08, 	 0, 0xCA09, 0xCA0A, 0xCA0B, 0xCA0C, 0xCA0D, /* 0x90 */
+    0xCA0E, 0xCA0F, 0xCA10, 0xCA11, 0xCA12, 0xCA13, 	 0, 	 0, /* 0x90 */
          0, 0xCA14, 0xCA15, 0xCA16, 0xCA17, 0xCA18, 0xCA19, 0xCA1A, /* 0xA0 */
     0xCA1B, 0xCA1C, 0xCA1D, 0xCA1E, 0xCA1F, 0xCA20, 0xCA21, 0xCA22, /* 0xA0 */
-    0xCA23, 0xCA24,      0, 0xCA25, 0xCA26, 0xCA27, 0xCA28, 0xCA29, /* 0xB0 */
-    0xCA2A, 0xCA2B, 0xCA2C, 0xCA2D, 0xCA2E, 0xCA2F,      0,      0, /* 0xB0 */
+    0xCA23, 0xCA24, 	 0, 0xCA25, 0xCA26, 0xCA27, 0xCA28, 0xCA29, /* 0xB0 */
+    0xCA2A, 0xCA2B, 0xCA2C, 0xCA2D, 0xCA2E, 0xCA2F, 	 0, 	 0, /* 0xB0 */
          0, 0xCA30, 0xCA31, 0xCA32, 0xCA33, 0xCA34, 0xCA35, 0xCA36, /* 0xC0 */
     0xCA37, 0xCA38, 0xCA39, 0xCA3A, 0xCA3B, 0xCA3C, 0xCA3D, 0xCA3E, /* 0xC0 */
-    0xCA3F, 0xCA40,      0, 0xCA41, 0xCA42, 0xCA43, 0xCA44, 0xCA45, /* 0xD0 */
-    0xCA46, 0xCA47, 0xCA48, 0xCA49, 0xCA4A, 0xCA4B,      0,      0, /* 0xD0 */
+    0xCA3F, 0xCA40, 	 0, 0xCA41, 0xCA42, 0xCA43, 0xCA44, 0xCA45, /* 0xD0 */
+    0xCA46, 0xCA47, 0xCA48, 0xCA49, 0xCA4A, 0xCA4B, 	 0, 	 0, /* 0xD0 */
          0, 0xCA4C, 0xCA4D, 0xCA4E, 0xCA4F, 0xCA50, 0xCA51, 0xCA52, /* 0xE0 */
     0xCA53, 0xCA54, 0xCA55, 0xCA56, 0xCA57, 0xCA58, 0xCA59, 0xCA5A, /* 0xE0 */
-    0xCA5B, 0xCA5C,      0, 0xCA5D, 0xCA5E, 0xCA5F, 0xCA60, 0xCA61, /* 0xF0 */
-    0xCA62, 0xCA63, 0xCA64, 0xCA65, 0xCA66, 0xCA67                  /* 0xF0 */
+    0xCA5B, 0xCA5C, 	 0, 0xCA5D, 0xCA5E, 0xCA5F, 0xCA60, 0xCA61, /* 0xF0 */
+    0xCA62, 0xCA63, 0xCA64, 0xCA65, 0xCA66, 0xCA67					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_BD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCA68, 0xCA69, 0xCA6A, 0xCA6B, 0xCA6C, 0xCA6D, 0xCA6E, /* 0x40 */
     0xCA6F, 0xCA70, 0xCA71, 0xCA72, 0xCA73, 0xCA74, 0xCA75, 0xCA76, /* 0x40 */
-    0xCA77, 0xCA78,      0, 0xCA79, 0xCA7A, 0xCA7B, 0xCA7C, 0xCA7D, /* 0x50 */
-    0xCA7E, 0xCA7F, 0xCA80, 0xCA81, 0xCA82, 0xCA83,      0,      0, /* 0x50 */
+    0xCA77, 0xCA78, 	 0, 0xCA79, 0xCA7A, 0xCA7B, 0xCA7C, 0xCA7D, /* 0x50 */
+    0xCA7E, 0xCA7F, 0xCA80, 0xCA81, 0xCA82, 0xCA83, 	 0, 	 0, /* 0x50 */
          0, 0xCA84, 0xCA85, 0xCA86, 0xCA87, 0xCA88, 0xCA89, 0xCA8A, /* 0x60 */
     0xCA8B, 0xCA8C, 0xCA8D, 0xCA8E, 0xCA8F, 0xCA90, 0xCA91, 0xCA92, /* 0x60 */
-    0xCA93, 0xCA94,      0, 0xCA95, 0xCA96, 0xCA97, 0xCA98, 0xCA99, /* 0x70 */
-    0xCA9A, 0xCA9B, 0xCA9C, 0xCA9D, 0xCA9E, 0xCA9F,      0,      0, /* 0x70 */
+    0xCA93, 0xCA94, 	 0, 0xCA95, 0xCA96, 0xCA97, 0xCA98, 0xCA99, /* 0x70 */
+    0xCA9A, 0xCA9B, 0xCA9C, 0xCA9D, 0xCA9E, 0xCA9F, 	 0, 	 0, /* 0x70 */
          0, 0xCAA0, 0xCAA1, 0xCAA2, 0xCAA3, 0xCAA4, 0xCAA5, 0xCAA6, /* 0x80 */
     0xCAA7, 0xCAA8, 0xCAA9, 0xCAAA, 0xCAAB, 0xCAAC, 0xCAAD, 0xCAAE, /* 0x80 */
-    0xCAAF, 0xCAB0,      0, 0xCAB1, 0xCAB2, 0xCAB3, 0xCAB4, 0xCAB5, /* 0x90 */
-    0xCAB6, 0xCAB7, 0xCAB8, 0xCAB9, 0xCABA, 0xCABB,      0,      0, /* 0x90 */
+    0xCAAF, 0xCAB0, 	 0, 0xCAB1, 0xCAB2, 0xCAB3, 0xCAB4, 0xCAB5, /* 0x90 */
+    0xCAB6, 0xCAB7, 0xCAB8, 0xCAB9, 0xCABA, 0xCABB, 	 0, 	 0, /* 0x90 */
          0, 0xCABC, 0xCABD, 0xCABE, 0xCABF, 0xCAC0, 0xCAC1, 0xCAC2, /* 0xA0 */
     0xCAC3, 0xCAC4, 0xCAC5, 0xCAC6, 0xCAC7, 0xCAC8, 0xCAC9, 0xCACA, /* 0xA0 */
-    0xCACB, 0xCACC,      0, 0xCACD, 0xCACE, 0xCACF, 0xCAD0, 0xCAD1, /* 0xB0 */
-    0xCAD2, 0xCAD3, 0xCAD4, 0xCAD5, 0xCAD6, 0xCAD7,      0,      0, /* 0xB0 */
+    0xCACB, 0xCACC, 	 0, 0xCACD, 0xCACE, 0xCACF, 0xCAD0, 0xCAD1, /* 0xB0 */
+    0xCAD2, 0xCAD3, 0xCAD4, 0xCAD5, 0xCAD6, 0xCAD7, 	 0, 	 0, /* 0xB0 */
          0, 0xCAD8, 0xCAD9, 0xCADA, 0xCADB, 0xCADC, 0xCADD, 0xCADE, /* 0xC0 */
     0xCADF, 0xCAE0, 0xCAE1, 0xCAE2, 0xCAE3, 0xCAE4, 0xCAE5, 0xCAE6, /* 0xC0 */
-    0xCAE7, 0xCAE8,      0, 0xCAE9, 0xCAEA, 0xCAEB, 0xCAEC, 0xCAED, /* 0xD0 */
-    0xCAEE, 0xCAEF, 0xCAF0, 0xCAF1, 0xCAF2, 0xCAF3,      0,      0, /* 0xD0 */
+    0xCAE7, 0xCAE8, 	 0, 0xCAE9, 0xCAEA, 0xCAEB, 0xCAEC, 0xCAED, /* 0xD0 */
+    0xCAEE, 0xCAEF, 0xCAF0, 0xCAF1, 0xCAF2, 0xCAF3, 	 0, 	 0, /* 0xD0 */
          0, 0xCAF4, 0xCAF5, 0xCAF6, 0xCAF7, 0xCAF8, 0xCAF9, 0xCAFA, /* 0xE0 */
     0xCAFB, 0xCAFC, 0xCAFD, 0xCAFE, 0xCAFF, 0xCB00, 0xCB01, 0xCB02, /* 0xE0 */
-    0xCB03, 0xCB04,      0, 0xCB05, 0xCB06, 0xCB07, 0xCB08, 0xCB09, /* 0xF0 */
-    0xCB0A, 0xCB0B, 0xCB0C, 0xCB0D, 0xCB0E, 0xCB0F                  /* 0xF0 */
+    0xCB03, 0xCB04, 	 0, 0xCB05, 0xCB06, 0xCB07, 0xCB08, 0xCB09, /* 0xF0 */
+    0xCB0A, 0xCB0B, 0xCB0C, 0xCB0D, 0xCB0E, 0xCB0F					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_BE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCB10, 0xCB11, 0xCB12, 0xCB13, 0xCB14, 0xCB15, 0xCB16, /* 0x40 */
     0xCB17, 0xCB18, 0xCB19, 0xCB1A, 0xCB1B, 0xCB1C, 0xCB1D, 0xCB1E, /* 0x40 */
-    0xCB1F, 0xCB20,      0, 0xCB21, 0xCB22, 0xCB23, 0xCB24, 0xCB25, /* 0x50 */
-    0xCB26, 0xCB27, 0xCB28, 0xCB29, 0xCB2A, 0xCB2B,      0,      0, /* 0x50 */
+    0xCB1F, 0xCB20, 	 0, 0xCB21, 0xCB22, 0xCB23, 0xCB24, 0xCB25, /* 0x50 */
+    0xCB26, 0xCB27, 0xCB28, 0xCB29, 0xCB2A, 0xCB2B, 	 0, 	 0, /* 0x50 */
          0, 0xCB2C, 0xCB2D, 0xCB2E, 0xCB2F, 0xCB30, 0xCB31, 0xCB32, /* 0x60 */
     0xCB33, 0xCB34, 0xCB35, 0xCB36, 0xCB37, 0xCB38, 0xCB39, 0xCB3A, /* 0x60 */
-    0xCB3B, 0xCB3C,      0, 0xCB3D, 0xCB3E, 0xCB3F, 0xCB40, 0xCB41, /* 0x70 */
-    0xCB42, 0xCB43, 0xCB44, 0xCB45, 0xCB46, 0xCB47,      0,      0, /* 0x70 */
+    0xCB3B, 0xCB3C, 	 0, 0xCB3D, 0xCB3E, 0xCB3F, 0xCB40, 0xCB41, /* 0x70 */
+    0xCB42, 0xCB43, 0xCB44, 0xCB45, 0xCB46, 0xCB47, 	 0, 	 0, /* 0x70 */
          0, 0xCB48, 0xCB49, 0xCB4A, 0xCB4B, 0xCB4C, 0xCB4D, 0xCB4E, /* 0x80 */
     0xCB4F, 0xCB50, 0xCB51, 0xCB52, 0xCB53, 0xCB54, 0xCB55, 0xCB56, /* 0x80 */
-    0xCB57, 0xCB58,      0, 0xCB59, 0xCB5A, 0xCB5B, 0xCB5C, 0xCB5D, /* 0x90 */
-    0xCB5E, 0xCB5F, 0xCB60, 0xCB61, 0xCB62, 0xCB63,      0,      0, /* 0x90 */
+    0xCB57, 0xCB58, 	 0, 0xCB59, 0xCB5A, 0xCB5B, 0xCB5C, 0xCB5D, /* 0x90 */
+    0xCB5E, 0xCB5F, 0xCB60, 0xCB61, 0xCB62, 0xCB63, 	 0, 	 0, /* 0x90 */
          0, 0xCB64, 0xCB65, 0xCB66, 0xCB67, 0xCB68, 0xCB69, 0xCB6A, /* 0xA0 */
     0xCB6B, 0xCB6C, 0xCB6D, 0xCB6E, 0xCB6F, 0xCB70, 0xCB71, 0xCB72, /* 0xA0 */
-    0xCB73, 0xCB74,      0, 0xCB75, 0xCB76, 0xCB77, 0xCB78, 0xCB79, /* 0xB0 */
-    0xCB7A, 0xCB7B, 0xCB7C, 0xCB7D, 0xCB7E, 0xCB7F,      0,      0, /* 0xB0 */
+    0xCB73, 0xCB74, 	 0, 0xCB75, 0xCB76, 0xCB77, 0xCB78, 0xCB79, /* 0xB0 */
+    0xCB7A, 0xCB7B, 0xCB7C, 0xCB7D, 0xCB7E, 0xCB7F, 	 0, 	 0, /* 0xB0 */
          0, 0xCB80, 0xCB81, 0xCB82, 0xCB83, 0xCB84, 0xCB85, 0xCB86, /* 0xC0 */
     0xCB87, 0xCB88, 0xCB89, 0xCB8A, 0xCB8B, 0xCB8C, 0xCB8D, 0xCB8E, /* 0xC0 */
-    0xCB8F, 0xCB90,      0, 0xCB91, 0xCB92, 0xCB93, 0xCB94, 0xCB95, /* 0xD0 */
-    0xCB96, 0xCB97, 0xCB98, 0xCB99, 0xCB9A, 0xCB9B,      0,      0, /* 0xD0 */
+    0xCB8F, 0xCB90, 	 0, 0xCB91, 0xCB92, 0xCB93, 0xCB94, 0xCB95, /* 0xD0 */
+    0xCB96, 0xCB97, 0xCB98, 0xCB99, 0xCB9A, 0xCB9B, 	 0, 	 0, /* 0xD0 */
          0, 0xCB9C, 0xCB9D, 0xCB9E, 0xCB9F, 0xCBA0, 0xCBA1, 0xCBA2, /* 0xE0 */
     0xCBA3, 0xCBA4, 0xCBA5, 0xCBA6, 0xCBA7, 0xCBA8, 0xCBA9, 0xCBAA, /* 0xE0 */
-    0xCBAB, 0xCBAC,      0, 0xCBAD, 0xCBAE, 0xCBAF, 0xCBB0, 0xCBB1, /* 0xF0 */
-    0xCBB2, 0xCBB3, 0xCBB4, 0xCBB5, 0xCBB6, 0xCBB7                  /* 0xF0 */
+    0xCBAB, 0xCBAC, 	 0, 0xCBAD, 0xCBAE, 0xCBAF, 0xCBB0, 0xCBB1, /* 0xF0 */
+    0xCBB2, 0xCBB3, 0xCBB4, 0xCBB5, 0xCBB6, 0xCBB7					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_BF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCBB8, 0xCBB9, 0xCBBA, 0xCBBB, 0xCBBC, 0xCBBD, 0xCBBE, /* 0x40 */
     0xCBBF, 0xCBC0, 0xCBC1, 0xCBC2, 0xCBC3, 0xCBC4, 0xCBC5, 0xCBC6, /* 0x40 */
-    0xCBC7, 0xCBC8,      0, 0xCBC9, 0xCBCA, 0xCBCB, 0xCBCC, 0xCBCD, /* 0x50 */
-    0xCBCE, 0xCBCF, 0xCBD0, 0xCBD1, 0xCBD2, 0xCBD3,      0,      0, /* 0x50 */
+    0xCBC7, 0xCBC8, 	 0, 0xCBC9, 0xCBCA, 0xCBCB, 0xCBCC, 0xCBCD, /* 0x50 */
+    0xCBCE, 0xCBCF, 0xCBD0, 0xCBD1, 0xCBD2, 0xCBD3, 	 0, 	 0, /* 0x50 */
          0, 0xCBD4, 0xCBD5, 0xCBD6, 0xCBD7, 0xCBD8, 0xCBD9, 0xCBDA, /* 0x60 */
     0xCBDB, 0xCBDC, 0xCBDD, 0xCBDE, 0xCBDF, 0xCBE0, 0xCBE1, 0xCBE2, /* 0x60 */
-    0xCBE3, 0xCBE4,      0, 0xCBE5, 0xCBE6, 0xCBE7, 0xCBE8, 0xCBE9, /* 0x70 */
-    0xCBEA, 0xCBEB, 0xCBEC, 0xCBED, 0xCBEE, 0xCBEF,      0,      0, /* 0x70 */
+    0xCBE3, 0xCBE4, 	 0, 0xCBE5, 0xCBE6, 0xCBE7, 0xCBE8, 0xCBE9, /* 0x70 */
+    0xCBEA, 0xCBEB, 0xCBEC, 0xCBED, 0xCBEE, 0xCBEF, 	 0, 	 0, /* 0x70 */
          0, 0xCBF0, 0xCBF1, 0xCBF2, 0xCBF3, 0xCBF4, 0xCBF5, 0xCBF6, /* 0x80 */
     0xCBF7, 0xCBF8, 0xCBF9, 0xCBFA, 0xCBFB, 0xCBFC, 0xCBFD, 0xCBFE, /* 0x80 */
-    0xCBFF, 0xCC00,      0, 0xCC01, 0xCC02, 0xCC03, 0xCC04, 0xCC05, /* 0x90 */
-    0xCC06, 0xCC07, 0xCC08, 0xCC09, 0xCC0A, 0xCC0B,      0,      0, /* 0x90 */
+    0xCBFF, 0xCC00, 	 0, 0xCC01, 0xCC02, 0xCC03, 0xCC04, 0xCC05, /* 0x90 */
+    0xCC06, 0xCC07, 0xCC08, 0xCC09, 0xCC0A, 0xCC0B, 	 0, 	 0, /* 0x90 */
          0, 0xCC0C, 0xCC0D, 0xCC0E, 0xCC0F, 0xCC10, 0xCC11, 0xCC12, /* 0xA0 */
     0xCC13, 0xCC14, 0xCC15, 0xCC16, 0xCC17, 0xCC18, 0xCC19, 0xCC1A, /* 0xA0 */
-    0xCC1B, 0xCC1C,      0, 0xCC1D, 0xCC1E, 0xCC1F, 0xCC20, 0xCC21, /* 0xB0 */
-    0xCC22, 0xCC23, 0xCC24, 0xCC25, 0xCC26, 0xCC27                  /* 0xB0 */
+    0xCC1B, 0xCC1C, 	 0, 0xCC1D, 0xCC1E, 0xCC1F, 0xCC20, 0xCC21, /* 0xB0 */
+    0xCC22, 0xCC23, 0xCC24, 0xCC25, 0xCC26, 0xCC27					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_C0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x314A,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x314A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xCC28, 0xCC29, 0xCC2A, 0xCC2B, 0xCC2C, 0xCC2D, 0xCC2E, /* 0x60 */
     0xCC2F, 0xCC30, 0xCC31, 0xCC32, 0xCC33, 0xCC34, 0xCC35, 0xCC36, /* 0x60 */
-    0xCC37, 0xCC38,      0, 0xCC39, 0xCC3A, 0xCC3B, 0xCC3C, 0xCC3D, /* 0x70 */
-    0xCC3E, 0xCC3F, 0xCC40, 0xCC41, 0xCC42, 0xCC43,      0,      0, /* 0x70 */
+    0xCC37, 0xCC38, 	 0, 0xCC39, 0xCC3A, 0xCC3B, 0xCC3C, 0xCC3D, /* 0x70 */
+    0xCC3E, 0xCC3F, 0xCC40, 0xCC41, 0xCC42, 0xCC43, 	 0, 	 0, /* 0x70 */
          0, 0xCC44, 0xCC45, 0xCC46, 0xCC47, 0xCC48, 0xCC49, 0xCC4A, /* 0x80 */
     0xCC4B, 0xCC4C, 0xCC4D, 0xCC4E, 0xCC4F, 0xCC50, 0xCC51, 0xCC52, /* 0x80 */
-    0xCC53, 0xCC54,      0, 0xCC55, 0xCC56, 0xCC57, 0xCC58, 0xCC59, /* 0x90 */
-    0xCC5A, 0xCC5B, 0xCC5C, 0xCC5D, 0xCC5E, 0xCC5F,      0,      0, /* 0x90 */
+    0xCC53, 0xCC54, 	 0, 0xCC55, 0xCC56, 0xCC57, 0xCC58, 0xCC59, /* 0x90 */
+    0xCC5A, 0xCC5B, 0xCC5C, 0xCC5D, 0xCC5E, 0xCC5F, 	 0, 	 0, /* 0x90 */
          0, 0xCC60, 0xCC61, 0xCC62, 0xCC63, 0xCC64, 0xCC65, 0xCC66, /* 0xA0 */
     0xCC67, 0xCC68, 0xCC69, 0xCC6A, 0xCC6B, 0xCC6C, 0xCC6D, 0xCC6E, /* 0xA0 */
-    0xCC6F, 0xCC70,      0, 0xCC71, 0xCC72, 0xCC73, 0xCC74, 0xCC75, /* 0xB0 */
-    0xCC76, 0xCC77, 0xCC78, 0xCC79, 0xCC7A, 0xCC7B,      0,      0, /* 0xB0 */
+    0xCC6F, 0xCC70, 	 0, 0xCC71, 0xCC72, 0xCC73, 0xCC74, 0xCC75, /* 0xB0 */
+    0xCC76, 0xCC77, 0xCC78, 0xCC79, 0xCC7A, 0xCC7B, 	 0, 	 0, /* 0xB0 */
          0, 0xCC7C, 0xCC7D, 0xCC7E, 0xCC7F, 0xCC80, 0xCC81, 0xCC82, /* 0xC0 */
     0xCC83, 0xCC84, 0xCC85, 0xCC86, 0xCC87, 0xCC88, 0xCC89, 0xCC8A, /* 0xC0 */
-    0xCC8B, 0xCC8C,      0, 0xCC8D, 0xCC8E, 0xCC8F, 0xCC90, 0xCC91, /* 0xD0 */
-    0xCC92, 0xCC93, 0xCC94, 0xCC95, 0xCC96, 0xCC97,      0,      0, /* 0xD0 */
+    0xCC8B, 0xCC8C, 	 0, 0xCC8D, 0xCC8E, 0xCC8F, 0xCC90, 0xCC91, /* 0xD0 */
+    0xCC92, 0xCC93, 0xCC94, 0xCC95, 0xCC96, 0xCC97, 	 0, 	 0, /* 0xD0 */
          0, 0xCC98, 0xCC99, 0xCC9A, 0xCC9B, 0xCC9C, 0xCC9D, 0xCC9E, /* 0xE0 */
     0xCC9F, 0xCCA0, 0xCCA1, 0xCCA2, 0xCCA3, 0xCCA4, 0xCCA5, 0xCCA6, /* 0xE0 */
-    0xCCA7, 0xCCA8,      0, 0xCCA9, 0xCCAA, 0xCCAB, 0xCCAC, 0xCCAD, /* 0xF0 */
-    0xCCAE, 0xCCAF, 0xCCB0, 0xCCB1, 0xCCB2, 0xCCB3                  /* 0xF0 */
+    0xCCA7, 0xCCA8, 	 0, 0xCCA9, 0xCCAA, 0xCCAB, 0xCCAC, 0xCCAD, /* 0xF0 */
+    0xCCAE, 0xCCAF, 0xCCB0, 0xCCB1, 0xCCB2, 0xCCB3					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_C1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCCB4, 0xCCB5, 0xCCB6, 0xCCB7, 0xCCB8, 0xCCB9, 0xCCBA, /* 0x40 */
     0xCCBB, 0xCCBC, 0xCCBD, 0xCCBE, 0xCCBF, 0xCCC0, 0xCCC1, 0xCCC2, /* 0x40 */
-    0xCCC3, 0xCCC4,      0, 0xCCC5, 0xCCC6, 0xCCC7, 0xCCC8, 0xCCC9, /* 0x50 */
-    0xCCCA, 0xCCCB, 0xCCCC, 0xCCCD, 0xCCCE, 0xCCCF,      0,      0, /* 0x50 */
+    0xCCC3, 0xCCC4, 	 0, 0xCCC5, 0xCCC6, 0xCCC7, 0xCCC8, 0xCCC9, /* 0x50 */
+    0xCCCA, 0xCCCB, 0xCCCC, 0xCCCD, 0xCCCE, 0xCCCF, 	 0, 	 0, /* 0x50 */
          0, 0xCCD0, 0xCCD1, 0xCCD2, 0xCCD3, 0xCCD4, 0xCCD5, 0xCCD6, /* 0x60 */
     0xCCD7, 0xCCD8, 0xCCD9, 0xCCDA, 0xCCDB, 0xCCDC, 0xCCDD, 0xCCDE, /* 0x60 */
-    0xCCDF, 0xCCE0,      0, 0xCCE1, 0xCCE2, 0xCCE3, 0xCCE4, 0xCCE5, /* 0x70 */
-    0xCCE6, 0xCCE7, 0xCCE8, 0xCCE9, 0xCCEA, 0xCCEB,      0,      0, /* 0x70 */
+    0xCCDF, 0xCCE0, 	 0, 0xCCE1, 0xCCE2, 0xCCE3, 0xCCE4, 0xCCE5, /* 0x70 */
+    0xCCE6, 0xCCE7, 0xCCE8, 0xCCE9, 0xCCEA, 0xCCEB, 	 0, 	 0, /* 0x70 */
          0, 0xCCEC, 0xCCED, 0xCCEE, 0xCCEF, 0xCCF0, 0xCCF1, 0xCCF2, /* 0x80 */
     0xCCF3, 0xCCF4, 0xCCF5, 0xCCF6, 0xCCF7, 0xCCF8, 0xCCF9, 0xCCFA, /* 0x80 */
-    0xCCFB, 0xCCFC,      0, 0xCCFD, 0xCCFE, 0xCCFF, 0xCD00, 0xCD01, /* 0x90 */
-    0xCD02, 0xCD03, 0xCD04, 0xCD05, 0xCD06, 0xCD07,      0,      0, /* 0x90 */
+    0xCCFB, 0xCCFC, 	 0, 0xCCFD, 0xCCFE, 0xCCFF, 0xCD00, 0xCD01, /* 0x90 */
+    0xCD02, 0xCD03, 0xCD04, 0xCD05, 0xCD06, 0xCD07, 	 0, 	 0, /* 0x90 */
          0, 0xCD08, 0xCD09, 0xCD0A, 0xCD0B, 0xCD0C, 0xCD0D, 0xCD0E, /* 0xA0 */
     0xCD0F, 0xCD10, 0xCD11, 0xCD12, 0xCD13, 0xCD14, 0xCD15, 0xCD16, /* 0xA0 */
-    0xCD17, 0xCD18,      0, 0xCD19, 0xCD1A, 0xCD1B, 0xCD1C, 0xCD1D, /* 0xB0 */
-    0xCD1E, 0xCD1F, 0xCD20, 0xCD21, 0xCD22, 0xCD23,      0,      0, /* 0xB0 */
+    0xCD17, 0xCD18, 	 0, 0xCD19, 0xCD1A, 0xCD1B, 0xCD1C, 0xCD1D, /* 0xB0 */
+    0xCD1E, 0xCD1F, 0xCD20, 0xCD21, 0xCD22, 0xCD23, 	 0, 	 0, /* 0xB0 */
          0, 0xCD24, 0xCD25, 0xCD26, 0xCD27, 0xCD28, 0xCD29, 0xCD2A, /* 0xC0 */
     0xCD2B, 0xCD2C, 0xCD2D, 0xCD2E, 0xCD2F, 0xCD30, 0xCD31, 0xCD32, /* 0xC0 */
-    0xCD33, 0xCD34,      0, 0xCD35, 0xCD36, 0xCD37, 0xCD38, 0xCD39, /* 0xD0 */
-    0xCD3A, 0xCD3B, 0xCD3C, 0xCD3D, 0xCD3E, 0xCD3F,      0,      0, /* 0xD0 */
+    0xCD33, 0xCD34, 	 0, 0xCD35, 0xCD36, 0xCD37, 0xCD38, 0xCD39, /* 0xD0 */
+    0xCD3A, 0xCD3B, 0xCD3C, 0xCD3D, 0xCD3E, 0xCD3F, 	 0, 	 0, /* 0xD0 */
          0, 0xCD40, 0xCD41, 0xCD42, 0xCD43, 0xCD44, 0xCD45, 0xCD46, /* 0xE0 */
     0xCD47, 0xCD48, 0xCD49, 0xCD4A, 0xCD4B, 0xCD4C, 0xCD4D, 0xCD4E, /* 0xE0 */
-    0xCD4F, 0xCD50,      0, 0xCD51, 0xCD52, 0xCD53, 0xCD54, 0xCD55, /* 0xF0 */
-    0xCD56, 0xCD57, 0xCD58, 0xCD59, 0xCD5A, 0xCD5B                  /* 0xF0 */
+    0xCD4F, 0xCD50, 	 0, 0xCD51, 0xCD52, 0xCD53, 0xCD54, 0xCD55, /* 0xF0 */
+    0xCD56, 0xCD57, 0xCD58, 0xCD59, 0xCD5A, 0xCD5B					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_C2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCD5C, 0xCD5D, 0xCD5E, 0xCD5F, 0xCD60, 0xCD61, 0xCD62, /* 0x40 */
     0xCD63, 0xCD64, 0xCD65, 0xCD66, 0xCD67, 0xCD68, 0xCD69, 0xCD6A, /* 0x40 */
-    0xCD6B, 0xCD6C,      0, 0xCD6D, 0xCD6E, 0xCD6F, 0xCD70, 0xCD71, /* 0x50 */
-    0xCD72, 0xCD73, 0xCD74, 0xCD75, 0xCD76, 0xCD77,      0,      0, /* 0x50 */
+    0xCD6B, 0xCD6C, 	 0, 0xCD6D, 0xCD6E, 0xCD6F, 0xCD70, 0xCD71, /* 0x50 */
+    0xCD72, 0xCD73, 0xCD74, 0xCD75, 0xCD76, 0xCD77, 	 0, 	 0, /* 0x50 */
          0, 0xCD78, 0xCD79, 0xCD7A, 0xCD7B, 0xCD7C, 0xCD7D, 0xCD7E, /* 0x60 */
     0xCD7F, 0xCD80, 0xCD81, 0xCD82, 0xCD83, 0xCD84, 0xCD85, 0xCD86, /* 0x60 */
-    0xCD87, 0xCD88,      0, 0xCD89, 0xCD8A, 0xCD8B, 0xCD8C, 0xCD8D, /* 0x70 */
-    0xCD8E, 0xCD8F, 0xCD90, 0xCD91, 0xCD92, 0xCD93,      0,      0, /* 0x70 */
+    0xCD87, 0xCD88, 	 0, 0xCD89, 0xCD8A, 0xCD8B, 0xCD8C, 0xCD8D, /* 0x70 */
+    0xCD8E, 0xCD8F, 0xCD90, 0xCD91, 0xCD92, 0xCD93, 	 0, 	 0, /* 0x70 */
          0, 0xCD94, 0xCD95, 0xCD96, 0xCD97, 0xCD98, 0xCD99, 0xCD9A, /* 0x80 */
     0xCD9B, 0xCD9C, 0xCD9D, 0xCD9E, 0xCD9F, 0xCDA0, 0xCDA1, 0xCDA2, /* 0x80 */
-    0xCDA3, 0xCDA4,      0, 0xCDA5, 0xCDA6, 0xCDA7, 0xCDA8, 0xCDA9, /* 0x90 */
-    0xCDAA, 0xCDAB, 0xCDAC, 0xCDAD, 0xCDAE, 0xCDAF,      0,      0, /* 0x90 */
+    0xCDA3, 0xCDA4, 	 0, 0xCDA5, 0xCDA6, 0xCDA7, 0xCDA8, 0xCDA9, /* 0x90 */
+    0xCDAA, 0xCDAB, 0xCDAC, 0xCDAD, 0xCDAE, 0xCDAF, 	 0, 	 0, /* 0x90 */
          0, 0xCDB0, 0xCDB1, 0xCDB2, 0xCDB3, 0xCDB4, 0xCDB5, 0xCDB6, /* 0xA0 */
     0xCDB7, 0xCDB8, 0xCDB9, 0xCDBA, 0xCDBB, 0xCDBC, 0xCDBD, 0xCDBE, /* 0xA0 */
-    0xCDBF, 0xCDC0,      0, 0xCDC1, 0xCDC2, 0xCDC3, 0xCDC4, 0xCDC5, /* 0xB0 */
-    0xCDC6, 0xCDC7, 0xCDC8, 0xCDC9, 0xCDCA, 0xCDCB,      0,      0, /* 0xB0 */
+    0xCDBF, 0xCDC0, 	 0, 0xCDC1, 0xCDC2, 0xCDC3, 0xCDC4, 0xCDC5, /* 0xB0 */
+    0xCDC6, 0xCDC7, 0xCDC8, 0xCDC9, 0xCDCA, 0xCDCB, 	 0, 	 0, /* 0xB0 */
          0, 0xCDCC, 0xCDCD, 0xCDCE, 0xCDCF, 0xCDD0, 0xCDD1, 0xCDD2, /* 0xC0 */
     0xCDD3, 0xCDD4, 0xCDD5, 0xCDD6, 0xCDD7, 0xCDD8, 0xCDD9, 0xCDDA, /* 0xC0 */
-    0xCDDB, 0xCDDC,      0, 0xCDDD, 0xCDDE, 0xCDDF, 0xCDE0, 0xCDE1, /* 0xD0 */
-    0xCDE2, 0xCDE3, 0xCDE4, 0xCDE5, 0xCDE6, 0xCDE7,      0,      0, /* 0xD0 */
+    0xCDDB, 0xCDDC, 	 0, 0xCDDD, 0xCDDE, 0xCDDF, 0xCDE0, 0xCDE1, /* 0xD0 */
+    0xCDE2, 0xCDE3, 0xCDE4, 0xCDE5, 0xCDE6, 0xCDE7, 	 0, 	 0, /* 0xD0 */
          0, 0xCDE8, 0xCDE9, 0xCDEA, 0xCDEB, 0xCDEC, 0xCDED, 0xCDEE, /* 0xE0 */
     0xCDEF, 0xCDF0, 0xCDF1, 0xCDF2, 0xCDF3, 0xCDF4, 0xCDF5, 0xCDF6, /* 0xE0 */
-    0xCDF7, 0xCDF8,      0, 0xCDF9, 0xCDFA, 0xCDFB, 0xCDFC, 0xCDFD, /* 0xF0 */
-    0xCDFE, 0xCDFF, 0xCE00, 0xCE01, 0xCE02, 0xCE03                  /* 0xF0 */
+    0xCDF7, 0xCDF8, 	 0, 0xCDF9, 0xCDFA, 0xCDFB, 0xCDFC, 0xCDFD, /* 0xF0 */
+    0xCDFE, 0xCDFF, 0xCE00, 0xCE01, 0xCE02, 0xCE03					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_C3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCE04, 0xCE05, 0xCE06, 0xCE07, 0xCE08, 0xCE09, 0xCE0A, /* 0x40 */
     0xCE0B, 0xCE0C, 0xCE0D, 0xCE0E, 0xCE0F, 0xCE10, 0xCE11, 0xCE12, /* 0x40 */
-    0xCE13, 0xCE14,      0, 0xCE15, 0xCE16, 0xCE17, 0xCE18, 0xCE19, /* 0x50 */
-    0xCE1A, 0xCE1B, 0xCE1C, 0xCE1D, 0xCE1E, 0xCE1F,      0,      0, /* 0x50 */
+    0xCE13, 0xCE14, 	 0, 0xCE15, 0xCE16, 0xCE17, 0xCE18, 0xCE19, /* 0x50 */
+    0xCE1A, 0xCE1B, 0xCE1C, 0xCE1D, 0xCE1E, 0xCE1F, 	 0, 	 0, /* 0x50 */
          0, 0xCE20, 0xCE21, 0xCE22, 0xCE23, 0xCE24, 0xCE25, 0xCE26, /* 0x60 */
     0xCE27, 0xCE28, 0xCE29, 0xCE2A, 0xCE2B, 0xCE2C, 0xCE2D, 0xCE2E, /* 0x60 */
-    0xCE2F, 0xCE30,      0, 0xCE31, 0xCE32, 0xCE33, 0xCE34, 0xCE35, /* 0x70 */
-    0xCE36, 0xCE37, 0xCE38, 0xCE39, 0xCE3A, 0xCE3B,      0,      0, /* 0x70 */
+    0xCE2F, 0xCE30, 	 0, 0xCE31, 0xCE32, 0xCE33, 0xCE34, 0xCE35, /* 0x70 */
+    0xCE36, 0xCE37, 0xCE38, 0xCE39, 0xCE3A, 0xCE3B, 	 0, 	 0, /* 0x70 */
          0, 0xCE3C, 0xCE3D, 0xCE3E, 0xCE3F, 0xCE40, 0xCE41, 0xCE42, /* 0x80 */
     0xCE43, 0xCE44, 0xCE45, 0xCE46, 0xCE47, 0xCE48, 0xCE49, 0xCE4A, /* 0x80 */
-    0xCE4B, 0xCE4C,      0, 0xCE4D, 0xCE4E, 0xCE4F, 0xCE50, 0xCE51, /* 0x90 */
-    0xCE52, 0xCE53, 0xCE54, 0xCE55, 0xCE56, 0xCE57,      0,      0, /* 0x90 */
+    0xCE4B, 0xCE4C, 	 0, 0xCE4D, 0xCE4E, 0xCE4F, 0xCE50, 0xCE51, /* 0x90 */
+    0xCE52, 0xCE53, 0xCE54, 0xCE55, 0xCE56, 0xCE57, 	 0, 	 0, /* 0x90 */
          0, 0xCE58, 0xCE59, 0xCE5A, 0xCE5B, 0xCE5C, 0xCE5D, 0xCE5E, /* 0xA0 */
     0xCE5F, 0xCE60, 0xCE61, 0xCE62, 0xCE63, 0xCE64, 0xCE65, 0xCE66, /* 0xA0 */
-    0xCE67, 0xCE68,      0, 0xCE69, 0xCE6A, 0xCE6B, 0xCE6C, 0xCE6D, /* 0xB0 */
-    0xCE6E, 0xCE6F, 0xCE70, 0xCE71, 0xCE72, 0xCE73                  /* 0xB0 */
+    0xCE67, 0xCE68, 	 0, 0xCE69, 0xCE6A, 0xCE6B, 0xCE6C, 0xCE6D, /* 0xB0 */
+    0xCE6E, 0xCE6F, 0xCE70, 0xCE71, 0xCE72, 0xCE73					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_C4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x314B,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x314B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xCE74, 0xCE75, 0xCE76, 0xCE77, 0xCE78, 0xCE79, 0xCE7A, /* 0x60 */
     0xCE7B, 0xCE7C, 0xCE7D, 0xCE7E, 0xCE7F, 0xCE80, 0xCE81, 0xCE82, /* 0x60 */
-    0xCE83, 0xCE84,      0, 0xCE85, 0xCE86, 0xCE87, 0xCE88, 0xCE89, /* 0x70 */
-    0xCE8A, 0xCE8B, 0xCE8C, 0xCE8D, 0xCE8E, 0xCE8F,      0,      0, /* 0x70 */
+    0xCE83, 0xCE84, 	 0, 0xCE85, 0xCE86, 0xCE87, 0xCE88, 0xCE89, /* 0x70 */
+    0xCE8A, 0xCE8B, 0xCE8C, 0xCE8D, 0xCE8E, 0xCE8F, 	 0, 	 0, /* 0x70 */
          0, 0xCE90, 0xCE91, 0xCE92, 0xCE93, 0xCE94, 0xCE95, 0xCE96, /* 0x80 */
     0xCE97, 0xCE98, 0xCE99, 0xCE9A, 0xCE9B, 0xCE9C, 0xCE9D, 0xCE9E, /* 0x80 */
-    0xCE9F, 0xCEA0,      0, 0xCEA1, 0xCEA2, 0xCEA3, 0xCEA4, 0xCEA5, /* 0x90 */
-    0xCEA6, 0xCEA7, 0xCEA8, 0xCEA9, 0xCEAA, 0xCEAB,      0,      0, /* 0x90 */
+    0xCE9F, 0xCEA0, 	 0, 0xCEA1, 0xCEA2, 0xCEA3, 0xCEA4, 0xCEA5, /* 0x90 */
+    0xCEA6, 0xCEA7, 0xCEA8, 0xCEA9, 0xCEAA, 0xCEAB, 	 0, 	 0, /* 0x90 */
          0, 0xCEAC, 0xCEAD, 0xCEAE, 0xCEAF, 0xCEB0, 0xCEB1, 0xCEB2, /* 0xA0 */
     0xCEB3, 0xCEB4, 0xCEB5, 0xCEB6, 0xCEB7, 0xCEB8, 0xCEB9, 0xCEBA, /* 0xA0 */
-    0xCEBB, 0xCEBC,      0, 0xCEBD, 0xCEBE, 0xCEBF, 0xCEC0, 0xCEC1, /* 0xB0 */
-    0xCEC2, 0xCEC3, 0xCEC4, 0xCEC5, 0xCEC6, 0xCEC7,      0,      0, /* 0xB0 */
+    0xCEBB, 0xCEBC, 	 0, 0xCEBD, 0xCEBE, 0xCEBF, 0xCEC0, 0xCEC1, /* 0xB0 */
+    0xCEC2, 0xCEC3, 0xCEC4, 0xCEC5, 0xCEC6, 0xCEC7, 	 0, 	 0, /* 0xB0 */
          0, 0xCEC8, 0xCEC9, 0xCECA, 0xCECB, 0xCECC, 0xCECD, 0xCECE, /* 0xC0 */
     0xCECF, 0xCED0, 0xCED1, 0xCED2, 0xCED3, 0xCED4, 0xCED5, 0xCED6, /* 0xC0 */
-    0xCED7, 0xCED8,      0, 0xCED9, 0xCEDA, 0xCEDB, 0xCEDC, 0xCEDD, /* 0xD0 */
-    0xCEDE, 0xCEDF, 0xCEE0, 0xCEE1, 0xCEE2, 0xCEE3,      0,      0, /* 0xD0 */
+    0xCED7, 0xCED8, 	 0, 0xCED9, 0xCEDA, 0xCEDB, 0xCEDC, 0xCEDD, /* 0xD0 */
+    0xCEDE, 0xCEDF, 0xCEE0, 0xCEE1, 0xCEE2, 0xCEE3, 	 0, 	 0, /* 0xD0 */
          0, 0xCEE4, 0xCEE5, 0xCEE6, 0xCEE7, 0xCEE8, 0xCEE9, 0xCEEA, /* 0xE0 */
     0xCEEB, 0xCEEC, 0xCEED, 0xCEEE, 0xCEEF, 0xCEF0, 0xCEF1, 0xCEF2, /* 0xE0 */
-    0xCEF3, 0xCEF4,      0, 0xCEF5, 0xCEF6, 0xCEF7, 0xCEF8, 0xCEF9, /* 0xF0 */
-    0xCEFA, 0xCEFB, 0xCEFC, 0xCEFD, 0xCEFE, 0xCEFF                  /* 0xF0 */
+    0xCEF3, 0xCEF4, 	 0, 0xCEF5, 0xCEF6, 0xCEF7, 0xCEF8, 0xCEF9, /* 0xF0 */
+    0xCEFA, 0xCEFB, 0xCEFC, 0xCEFD, 0xCEFE, 0xCEFF					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_C5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCF00, 0xCF01, 0xCF02, 0xCF03, 0xCF04, 0xCF05, 0xCF06, /* 0x40 */
     0xCF07, 0xCF08, 0xCF09, 0xCF0A, 0xCF0B, 0xCF0C, 0xCF0D, 0xCF0E, /* 0x40 */
-    0xCF0F, 0xCF10,      0, 0xCF11, 0xCF12, 0xCF13, 0xCF14, 0xCF15, /* 0x50 */
-    0xCF16, 0xCF17, 0xCF18, 0xCF19, 0xCF1A, 0xCF1B,      0,      0, /* 0x50 */
+    0xCF0F, 0xCF10, 	 0, 0xCF11, 0xCF12, 0xCF13, 0xCF14, 0xCF15, /* 0x50 */
+    0xCF16, 0xCF17, 0xCF18, 0xCF19, 0xCF1A, 0xCF1B, 	 0, 	 0, /* 0x50 */
          0, 0xCF1C, 0xCF1D, 0xCF1E, 0xCF1F, 0xCF20, 0xCF21, 0xCF22, /* 0x60 */
     0xCF23, 0xCF24, 0xCF25, 0xCF26, 0xCF27, 0xCF28, 0xCF29, 0xCF2A, /* 0x60 */
-    0xCF2B, 0xCF2C,      0, 0xCF2D, 0xCF2E, 0xCF2F, 0xCF30, 0xCF31, /* 0x70 */
-    0xCF32, 0xCF33, 0xCF34, 0xCF35, 0xCF36, 0xCF37,      0,      0, /* 0x70 */
+    0xCF2B, 0xCF2C, 	 0, 0xCF2D, 0xCF2E, 0xCF2F, 0xCF30, 0xCF31, /* 0x70 */
+    0xCF32, 0xCF33, 0xCF34, 0xCF35, 0xCF36, 0xCF37, 	 0, 	 0, /* 0x70 */
          0, 0xCF38, 0xCF39, 0xCF3A, 0xCF3B, 0xCF3C, 0xCF3D, 0xCF3E, /* 0x80 */
     0xCF3F, 0xCF40, 0xCF41, 0xCF42, 0xCF43, 0xCF44, 0xCF45, 0xCF46, /* 0x80 */
-    0xCF47, 0xCF48,      0, 0xCF49, 0xCF4A, 0xCF4B, 0xCF4C, 0xCF4D, /* 0x90 */
-    0xCF4E, 0xCF4F, 0xCF50, 0xCF51, 0xCF52, 0xCF53,      0,      0, /* 0x90 */
+    0xCF47, 0xCF48, 	 0, 0xCF49, 0xCF4A, 0xCF4B, 0xCF4C, 0xCF4D, /* 0x90 */
+    0xCF4E, 0xCF4F, 0xCF50, 0xCF51, 0xCF52, 0xCF53, 	 0, 	 0, /* 0x90 */
          0, 0xCF54, 0xCF55, 0xCF56, 0xCF57, 0xCF58, 0xCF59, 0xCF5A, /* 0xA0 */
     0xCF5B, 0xCF5C, 0xCF5D, 0xCF5E, 0xCF5F, 0xCF60, 0xCF61, 0xCF62, /* 0xA0 */
-    0xCF63, 0xCF64,      0, 0xCF65, 0xCF66, 0xCF67, 0xCF68, 0xCF69, /* 0xB0 */
-    0xCF6A, 0xCF6B, 0xCF6C, 0xCF6D, 0xCF6E, 0xCF6F,      0,      0, /* 0xB0 */
+    0xCF63, 0xCF64, 	 0, 0xCF65, 0xCF66, 0xCF67, 0xCF68, 0xCF69, /* 0xB0 */
+    0xCF6A, 0xCF6B, 0xCF6C, 0xCF6D, 0xCF6E, 0xCF6F, 	 0, 	 0, /* 0xB0 */
          0, 0xCF70, 0xCF71, 0xCF72, 0xCF73, 0xCF74, 0xCF75, 0xCF76, /* 0xC0 */
     0xCF77, 0xCF78, 0xCF79, 0xCF7A, 0xCF7B, 0xCF7C, 0xCF7D, 0xCF7E, /* 0xC0 */
-    0xCF7F, 0xCF80,      0, 0xCF81, 0xCF82, 0xCF83, 0xCF84, 0xCF85, /* 0xD0 */
-    0xCF86, 0xCF87, 0xCF88, 0xCF89, 0xCF8A, 0xCF8B,      0,      0, /* 0xD0 */
+    0xCF7F, 0xCF80, 	 0, 0xCF81, 0xCF82, 0xCF83, 0xCF84, 0xCF85, /* 0xD0 */
+    0xCF86, 0xCF87, 0xCF88, 0xCF89, 0xCF8A, 0xCF8B, 	 0, 	 0, /* 0xD0 */
          0, 0xCF8C, 0xCF8D, 0xCF8E, 0xCF8F, 0xCF90, 0xCF91, 0xCF92, /* 0xE0 */
     0xCF93, 0xCF94, 0xCF95, 0xCF96, 0xCF97, 0xCF98, 0xCF99, 0xCF9A, /* 0xE0 */
-    0xCF9B, 0xCF9C,      0, 0xCF9D, 0xCF9E, 0xCF9F, 0xCFA0, 0xCFA1, /* 0xF0 */
-    0xCFA2, 0xCFA3, 0xCFA4, 0xCFA5, 0xCFA6, 0xCFA7                  /* 0xF0 */
+    0xCF9B, 0xCF9C, 	 0, 0xCF9D, 0xCF9E, 0xCF9F, 0xCFA0, 0xCFA1, /* 0xF0 */
+    0xCFA2, 0xCFA3, 0xCFA4, 0xCFA5, 0xCFA6, 0xCFA7					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_C6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xCFA8, 0xCFA9, 0xCFAA, 0xCFAB, 0xCFAC, 0xCFAD, 0xCFAE, /* 0x40 */
     0xCFAF, 0xCFB0, 0xCFB1, 0xCFB2, 0xCFB3, 0xCFB4, 0xCFB5, 0xCFB6, /* 0x40 */
-    0xCFB7, 0xCFB8,      0, 0xCFB9, 0xCFBA, 0xCFBB, 0xCFBC, 0xCFBD, /* 0x50 */
-    0xCFBE, 0xCFBF, 0xCFC0, 0xCFC1, 0xCFC2, 0xCFC3,      0,      0, /* 0x50 */
+    0xCFB7, 0xCFB8, 	 0, 0xCFB9, 0xCFBA, 0xCFBB, 0xCFBC, 0xCFBD, /* 0x50 */
+    0xCFBE, 0xCFBF, 0xCFC0, 0xCFC1, 0xCFC2, 0xCFC3, 	 0, 	 0, /* 0x50 */
          0, 0xCFC4, 0xCFC5, 0xCFC6, 0xCFC7, 0xCFC8, 0xCFC9, 0xCFCA, /* 0x60 */
     0xCFCB, 0xCFCC, 0xCFCD, 0xCFCE, 0xCFCF, 0xCFD0, 0xCFD1, 0xCFD2, /* 0x60 */
-    0xCFD3, 0xCFD4,      0, 0xCFD5, 0xCFD6, 0xCFD7, 0xCFD8, 0xCFD9, /* 0x70 */
-    0xCFDA, 0xCFDB, 0xCFDC, 0xCFDD, 0xCFDE, 0xCFDF,      0,      0, /* 0x70 */
+    0xCFD3, 0xCFD4, 	 0, 0xCFD5, 0xCFD6, 0xCFD7, 0xCFD8, 0xCFD9, /* 0x70 */
+    0xCFDA, 0xCFDB, 0xCFDC, 0xCFDD, 0xCFDE, 0xCFDF, 	 0, 	 0, /* 0x70 */
          0, 0xCFE0, 0xCFE1, 0xCFE2, 0xCFE3, 0xCFE4, 0xCFE5, 0xCFE6, /* 0x80 */
     0xCFE7, 0xCFE8, 0xCFE9, 0xCFEA, 0xCFEB, 0xCFEC, 0xCFED, 0xCFEE, /* 0x80 */
-    0xCFEF, 0xCFF0,      0, 0xCFF1, 0xCFF2, 0xCFF3, 0xCFF4, 0xCFF5, /* 0x90 */
-    0xCFF6, 0xCFF7, 0xCFF8, 0xCFF9, 0xCFFA, 0xCFFB,      0,      0, /* 0x90 */
+    0xCFEF, 0xCFF0, 	 0, 0xCFF1, 0xCFF2, 0xCFF3, 0xCFF4, 0xCFF5, /* 0x90 */
+    0xCFF6, 0xCFF7, 0xCFF8, 0xCFF9, 0xCFFA, 0xCFFB, 	 0, 	 0, /* 0x90 */
          0, 0xCFFC, 0xCFFD, 0xCFFE, 0xCFFF, 0xD000, 0xD001, 0xD002, /* 0xA0 */
     0xD003, 0xD004, 0xD005, 0xD006, 0xD007, 0xD008, 0xD009, 0xD00A, /* 0xA0 */
-    0xD00B, 0xD00C,      0, 0xD00D, 0xD00E, 0xD00F, 0xD010, 0xD011, /* 0xB0 */
-    0xD012, 0xD013, 0xD014, 0xD015, 0xD016, 0xD017,      0,      0, /* 0xB0 */
+    0xD00B, 0xD00C, 	 0, 0xD00D, 0xD00E, 0xD00F, 0xD010, 0xD011, /* 0xB0 */
+    0xD012, 0xD013, 0xD014, 0xD015, 0xD016, 0xD017, 	 0, 	 0, /* 0xB0 */
          0, 0xD018, 0xD019, 0xD01A, 0xD01B, 0xD01C, 0xD01D, 0xD01E, /* 0xC0 */
     0xD01F, 0xD020, 0xD021, 0xD022, 0xD023, 0xD024, 0xD025, 0xD026, /* 0xC0 */
-    0xD027, 0xD028,      0, 0xD029, 0xD02A, 0xD02B, 0xD02C, 0xD02D, /* 0xD0 */
-    0xD02E, 0xD02F, 0xD030, 0xD031, 0xD032, 0xD033,      0,      0, /* 0xD0 */
+    0xD027, 0xD028, 	 0, 0xD029, 0xD02A, 0xD02B, 0xD02C, 0xD02D, /* 0xD0 */
+    0xD02E, 0xD02F, 0xD030, 0xD031, 0xD032, 0xD033, 	 0, 	 0, /* 0xD0 */
          0, 0xD034, 0xD035, 0xD036, 0xD037, 0xD038, 0xD039, 0xD03A, /* 0xE0 */
     0xD03B, 0xD03C, 0xD03D, 0xD03E, 0xD03F, 0xD040, 0xD041, 0xD042, /* 0xE0 */
-    0xD043, 0xD044,      0, 0xD045, 0xD046, 0xD047, 0xD048, 0xD049, /* 0xF0 */
-    0xD04A, 0xD04B, 0xD04C, 0xD04D, 0xD04E, 0xD04F                  /* 0xF0 */
+    0xD043, 0xD044, 	 0, 0xD045, 0xD046, 0xD047, 0xD048, 0xD049, /* 0xF0 */
+    0xD04A, 0xD04B, 0xD04C, 0xD04D, 0xD04E, 0xD04F					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_C7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD050, 0xD051, 0xD052, 0xD053, 0xD054, 0xD055, 0xD056, /* 0x40 */
     0xD057, 0xD058, 0xD059, 0xD05A, 0xD05B, 0xD05C, 0xD05D, 0xD05E, /* 0x40 */
-    0xD05F, 0xD060,      0, 0xD061, 0xD062, 0xD063, 0xD064, 0xD065, /* 0x50 */
-    0xD066, 0xD067, 0xD068, 0xD069, 0xD06A, 0xD06B,      0,      0, /* 0x50 */
+    0xD05F, 0xD060, 	 0, 0xD061, 0xD062, 0xD063, 0xD064, 0xD065, /* 0x50 */
+    0xD066, 0xD067, 0xD068, 0xD069, 0xD06A, 0xD06B, 	 0, 	 0, /* 0x50 */
          0, 0xD06C, 0xD06D, 0xD06E, 0xD06F, 0xD070, 0xD071, 0xD072, /* 0x60 */
     0xD073, 0xD074, 0xD075, 0xD076, 0xD077, 0xD078, 0xD079, 0xD07A, /* 0x60 */
-    0xD07B, 0xD07C,      0, 0xD07D, 0xD07E, 0xD07F, 0xD080, 0xD081, /* 0x70 */
-    0xD082, 0xD083, 0xD084, 0xD085, 0xD086, 0xD087,      0,      0, /* 0x70 */
+    0xD07B, 0xD07C, 	 0, 0xD07D, 0xD07E, 0xD07F, 0xD080, 0xD081, /* 0x70 */
+    0xD082, 0xD083, 0xD084, 0xD085, 0xD086, 0xD087, 	 0, 	 0, /* 0x70 */
          0, 0xD088, 0xD089, 0xD08A, 0xD08B, 0xD08C, 0xD08D, 0xD08E, /* 0x80 */
     0xD08F, 0xD090, 0xD091, 0xD092, 0xD093, 0xD094, 0xD095, 0xD096, /* 0x80 */
-    0xD097, 0xD098,      0, 0xD099, 0xD09A, 0xD09B, 0xD09C, 0xD09D, /* 0x90 */
-    0xD09E, 0xD09F, 0xD0A0, 0xD0A1, 0xD0A2, 0xD0A3,      0,      0, /* 0x90 */
+    0xD097, 0xD098, 	 0, 0xD099, 0xD09A, 0xD09B, 0xD09C, 0xD09D, /* 0x90 */
+    0xD09E, 0xD09F, 0xD0A0, 0xD0A1, 0xD0A2, 0xD0A3, 	 0, 	 0, /* 0x90 */
          0, 0xD0A4, 0xD0A5, 0xD0A6, 0xD0A7, 0xD0A8, 0xD0A9, 0xD0AA, /* 0xA0 */
     0xD0AB, 0xD0AC, 0xD0AD, 0xD0AE, 0xD0AF, 0xD0B0, 0xD0B1, 0xD0B2, /* 0xA0 */
-    0xD0B3, 0xD0B4,      0, 0xD0B5, 0xD0B6, 0xD0B7, 0xD0B8, 0xD0B9, /* 0xB0 */
-    0xD0BA, 0xD0BB, 0xD0BC, 0xD0BD, 0xD0BE, 0xD0BF                  /* 0xB0 */
+    0xD0B3, 0xD0B4, 	 0, 0xD0B5, 0xD0B6, 0xD0B7, 0xD0B8, 0xD0B9, /* 0xB0 */
+    0xD0BA, 0xD0BB, 0xD0BC, 0xD0BD, 0xD0BE, 0xD0BF					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_C8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x314C,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x314C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD0C0, 0xD0C1, 0xD0C2, 0xD0C3, 0xD0C4, 0xD0C5, 0xD0C6, /* 0x60 */
     0xD0C7, 0xD0C8, 0xD0C9, 0xD0CA, 0xD0CB, 0xD0CC, 0xD0CD, 0xD0CE, /* 0x60 */
-    0xD0CF, 0xD0D0,      0, 0xD0D1, 0xD0D2, 0xD0D3, 0xD0D4, 0xD0D5, /* 0x70 */
-    0xD0D6, 0xD0D7, 0xD0D8, 0xD0D9, 0xD0DA, 0xD0DB,      0,      0, /* 0x70 */
+    0xD0CF, 0xD0D0, 	 0, 0xD0D1, 0xD0D2, 0xD0D3, 0xD0D4, 0xD0D5, /* 0x70 */
+    0xD0D6, 0xD0D7, 0xD0D8, 0xD0D9, 0xD0DA, 0xD0DB, 	 0, 	 0, /* 0x70 */
          0, 0xD0DC, 0xD0DD, 0xD0DE, 0xD0DF, 0xD0E0, 0xD0E1, 0xD0E2, /* 0x80 */
     0xD0E3, 0xD0E4, 0xD0E5, 0xD0E6, 0xD0E7, 0xD0E8, 0xD0E9, 0xD0EA, /* 0x80 */
-    0xD0EB, 0xD0EC,      0, 0xD0ED, 0xD0EE, 0xD0EF, 0xD0F0, 0xD0F1, /* 0x90 */
-    0xD0F2, 0xD0F3, 0xD0F4, 0xD0F5, 0xD0F6, 0xD0F7,      0,      0, /* 0x90 */
+    0xD0EB, 0xD0EC, 	 0, 0xD0ED, 0xD0EE, 0xD0EF, 0xD0F0, 0xD0F1, /* 0x90 */
+    0xD0F2, 0xD0F3, 0xD0F4, 0xD0F5, 0xD0F6, 0xD0F7, 	 0, 	 0, /* 0x90 */
          0, 0xD0F8, 0xD0F9, 0xD0FA, 0xD0FB, 0xD0FC, 0xD0FD, 0xD0FE, /* 0xA0 */
     0xD0FF, 0xD100, 0xD101, 0xD102, 0xD103, 0xD104, 0xD105, 0xD106, /* 0xA0 */
-    0xD107, 0xD108,      0, 0xD109, 0xD10A, 0xD10B, 0xD10C, 0xD10D, /* 0xB0 */
-    0xD10E, 0xD10F, 0xD110, 0xD111, 0xD112, 0xD113,      0,      0, /* 0xB0 */
+    0xD107, 0xD108, 	 0, 0xD109, 0xD10A, 0xD10B, 0xD10C, 0xD10D, /* 0xB0 */
+    0xD10E, 0xD10F, 0xD110, 0xD111, 0xD112, 0xD113, 	 0, 	 0, /* 0xB0 */
          0, 0xD114, 0xD115, 0xD116, 0xD117, 0xD118, 0xD119, 0xD11A, /* 0xC0 */
     0xD11B, 0xD11C, 0xD11D, 0xD11E, 0xD11F, 0xD120, 0xD121, 0xD122, /* 0xC0 */
-    0xD123, 0xD124,      0, 0xD125, 0xD126, 0xD127, 0xD128, 0xD129, /* 0xD0 */
-    0xD12A, 0xD12B, 0xD12C, 0xD12D, 0xD12E, 0xD12F,      0,      0, /* 0xD0 */
+    0xD123, 0xD124, 	 0, 0xD125, 0xD126, 0xD127, 0xD128, 0xD129, /* 0xD0 */
+    0xD12A, 0xD12B, 0xD12C, 0xD12D, 0xD12E, 0xD12F, 	 0, 	 0, /* 0xD0 */
          0, 0xD130, 0xD131, 0xD132, 0xD133, 0xD134, 0xD135, 0xD136, /* 0xE0 */
     0xD137, 0xD138, 0xD139, 0xD13A, 0xD13B, 0xD13C, 0xD13D, 0xD13E, /* 0xE0 */
-    0xD13F, 0xD140,      0, 0xD141, 0xD142, 0xD143, 0xD144, 0xD145, /* 0xF0 */
-    0xD146, 0xD147, 0xD148, 0xD149, 0xD14A, 0xD14B                  /* 0xF0 */
+    0xD13F, 0xD140, 	 0, 0xD141, 0xD142, 0xD143, 0xD144, 0xD145, /* 0xF0 */
+    0xD146, 0xD147, 0xD148, 0xD149, 0xD14A, 0xD14B					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_C9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD14C, 0xD14D, 0xD14E, 0xD14F, 0xD150, 0xD151, 0xD152, /* 0x40 */
     0xD153, 0xD154, 0xD155, 0xD156, 0xD157, 0xD158, 0xD159, 0xD15A, /* 0x40 */
-    0xD15B, 0xD15C,      0, 0xD15D, 0xD15E, 0xD15F, 0xD160, 0xD161, /* 0x50 */
-    0xD162, 0xD163, 0xD164, 0xD165, 0xD166, 0xD167,      0,      0, /* 0x50 */
+    0xD15B, 0xD15C, 	 0, 0xD15D, 0xD15E, 0xD15F, 0xD160, 0xD161, /* 0x50 */
+    0xD162, 0xD163, 0xD164, 0xD165, 0xD166, 0xD167, 	 0, 	 0, /* 0x50 */
          0, 0xD168, 0xD169, 0xD16A, 0xD16B, 0xD16C, 0xD16D, 0xD16E, /* 0x60 */
     0xD16F, 0xD170, 0xD171, 0xD172, 0xD173, 0xD174, 0xD175, 0xD176, /* 0x60 */
-    0xD177, 0xD178,      0, 0xD179, 0xD17A, 0xD17B, 0xD17C, 0xD17D, /* 0x70 */
-    0xD17E, 0xD17F, 0xD180, 0xD181, 0xD182, 0xD183,      0,      0, /* 0x70 */
+    0xD177, 0xD178, 	 0, 0xD179, 0xD17A, 0xD17B, 0xD17C, 0xD17D, /* 0x70 */
+    0xD17E, 0xD17F, 0xD180, 0xD181, 0xD182, 0xD183, 	 0, 	 0, /* 0x70 */
          0, 0xD184, 0xD185, 0xD186, 0xD187, 0xD188, 0xD189, 0xD18A, /* 0x80 */
     0xD18B, 0xD18C, 0xD18D, 0xD18E, 0xD18F, 0xD190, 0xD191, 0xD192, /* 0x80 */
-    0xD193, 0xD194,      0, 0xD195, 0xD196, 0xD197, 0xD198, 0xD199, /* 0x90 */
-    0xD19A, 0xD19B, 0xD19C, 0xD19D, 0xD19E, 0xD19F,      0,      0, /* 0x90 */
+    0xD193, 0xD194, 	 0, 0xD195, 0xD196, 0xD197, 0xD198, 0xD199, /* 0x90 */
+    0xD19A, 0xD19B, 0xD19C, 0xD19D, 0xD19E, 0xD19F, 	 0, 	 0, /* 0x90 */
          0, 0xD1A0, 0xD1A1, 0xD1A2, 0xD1A3, 0xD1A4, 0xD1A5, 0xD1A6, /* 0xA0 */
     0xD1A7, 0xD1A8, 0xD1A9, 0xD1AA, 0xD1AB, 0xD1AC, 0xD1AD, 0xD1AE, /* 0xA0 */
-    0xD1AF, 0xD1B0,      0, 0xD1B1, 0xD1B2, 0xD1B3, 0xD1B4, 0xD1B5, /* 0xB0 */
-    0xD1B6, 0xD1B7, 0xD1B8, 0xD1B9, 0xD1BA, 0xD1BB,      0,      0, /* 0xB0 */
+    0xD1AF, 0xD1B0, 	 0, 0xD1B1, 0xD1B2, 0xD1B3, 0xD1B4, 0xD1B5, /* 0xB0 */
+    0xD1B6, 0xD1B7, 0xD1B8, 0xD1B9, 0xD1BA, 0xD1BB, 	 0, 	 0, /* 0xB0 */
          0, 0xD1BC, 0xD1BD, 0xD1BE, 0xD1BF, 0xD1C0, 0xD1C1, 0xD1C2, /* 0xC0 */
     0xD1C3, 0xD1C4, 0xD1C5, 0xD1C6, 0xD1C7, 0xD1C8, 0xD1C9, 0xD1CA, /* 0xC0 */
-    0xD1CB, 0xD1CC,      0, 0xD1CD, 0xD1CE, 0xD1CF, 0xD1D0, 0xD1D1, /* 0xD0 */
-    0xD1D2, 0xD1D3, 0xD1D4, 0xD1D5, 0xD1D6, 0xD1D7,      0,      0, /* 0xD0 */
+    0xD1CB, 0xD1CC, 	 0, 0xD1CD, 0xD1CE, 0xD1CF, 0xD1D0, 0xD1D1, /* 0xD0 */
+    0xD1D2, 0xD1D3, 0xD1D4, 0xD1D5, 0xD1D6, 0xD1D7, 	 0, 	 0, /* 0xD0 */
          0, 0xD1D8, 0xD1D9, 0xD1DA, 0xD1DB, 0xD1DC, 0xD1DD, 0xD1DE, /* 0xE0 */
     0xD1DF, 0xD1E0, 0xD1E1, 0xD1E2, 0xD1E3, 0xD1E4, 0xD1E5, 0xD1E6, /* 0xE0 */
-    0xD1E7, 0xD1E8,      0, 0xD1E9, 0xD1EA, 0xD1EB, 0xD1EC, 0xD1ED, /* 0xF0 */
-    0xD1EE, 0xD1EF, 0xD1F0, 0xD1F1, 0xD1F2, 0xD1F3                  /* 0xF0 */
+    0xD1E7, 0xD1E8, 	 0, 0xD1E9, 0xD1EA, 0xD1EB, 0xD1EC, 0xD1ED, /* 0xF0 */
+    0xD1EE, 0xD1EF, 0xD1F0, 0xD1F1, 0xD1F2, 0xD1F3					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_CA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD1F4, 0xD1F5, 0xD1F6, 0xD1F7, 0xD1F8, 0xD1F9, 0xD1FA, /* 0x40 */
     0xD1FB, 0xD1FC, 0xD1FD, 0xD1FE, 0xD1FF, 0xD200, 0xD201, 0xD202, /* 0x40 */
-    0xD203, 0xD204,      0, 0xD205, 0xD206, 0xD207, 0xD208, 0xD209, /* 0x50 */
-    0xD20A, 0xD20B, 0xD20C, 0xD20D, 0xD20E, 0xD20F,      0,      0, /* 0x50 */
+    0xD203, 0xD204, 	 0, 0xD205, 0xD206, 0xD207, 0xD208, 0xD209, /* 0x50 */
+    0xD20A, 0xD20B, 0xD20C, 0xD20D, 0xD20E, 0xD20F, 	 0, 	 0, /* 0x50 */
          0, 0xD210, 0xD211, 0xD212, 0xD213, 0xD214, 0xD215, 0xD216, /* 0x60 */
     0xD217, 0xD218, 0xD219, 0xD21A, 0xD21B, 0xD21C, 0xD21D, 0xD21E, /* 0x60 */
-    0xD21F, 0xD220,      0, 0xD221, 0xD222, 0xD223, 0xD224, 0xD225, /* 0x70 */
-    0xD226, 0xD227, 0xD228, 0xD229, 0xD22A, 0xD22B,      0,      0, /* 0x70 */
+    0xD21F, 0xD220, 	 0, 0xD221, 0xD222, 0xD223, 0xD224, 0xD225, /* 0x70 */
+    0xD226, 0xD227, 0xD228, 0xD229, 0xD22A, 0xD22B, 	 0, 	 0, /* 0x70 */
          0, 0xD22C, 0xD22D, 0xD22E, 0xD22F, 0xD230, 0xD231, 0xD232, /* 0x80 */
     0xD233, 0xD234, 0xD235, 0xD236, 0xD237, 0xD238, 0xD239, 0xD23A, /* 0x80 */
-    0xD23B, 0xD23C,      0, 0xD23D, 0xD23E, 0xD23F, 0xD240, 0xD241, /* 0x90 */
-    0xD242, 0xD243, 0xD244, 0xD245, 0xD246, 0xD247,      0,      0, /* 0x90 */
+    0xD23B, 0xD23C, 	 0, 0xD23D, 0xD23E, 0xD23F, 0xD240, 0xD241, /* 0x90 */
+    0xD242, 0xD243, 0xD244, 0xD245, 0xD246, 0xD247, 	 0, 	 0, /* 0x90 */
          0, 0xD248, 0xD249, 0xD24A, 0xD24B, 0xD24C, 0xD24D, 0xD24E, /* 0xA0 */
     0xD24F, 0xD250, 0xD251, 0xD252, 0xD253, 0xD254, 0xD255, 0xD256, /* 0xA0 */
-    0xD257, 0xD258,      0, 0xD259, 0xD25A, 0xD25B, 0xD25C, 0xD25D, /* 0xB0 */
-    0xD25E, 0xD25F, 0xD260, 0xD261, 0xD262, 0xD263,      0,      0, /* 0xB0 */
+    0xD257, 0xD258, 	 0, 0xD259, 0xD25A, 0xD25B, 0xD25C, 0xD25D, /* 0xB0 */
+    0xD25E, 0xD25F, 0xD260, 0xD261, 0xD262, 0xD263, 	 0, 	 0, /* 0xB0 */
          0, 0xD264, 0xD265, 0xD266, 0xD267, 0xD268, 0xD269, 0xD26A, /* 0xC0 */
     0xD26B, 0xD26C, 0xD26D, 0xD26E, 0xD26F, 0xD270, 0xD271, 0xD272, /* 0xC0 */
-    0xD273, 0xD274,      0, 0xD275, 0xD276, 0xD277, 0xD278, 0xD279, /* 0xD0 */
-    0xD27A, 0xD27B, 0xD27C, 0xD27D, 0xD27E, 0xD27F,      0,      0, /* 0xD0 */
+    0xD273, 0xD274, 	 0, 0xD275, 0xD276, 0xD277, 0xD278, 0xD279, /* 0xD0 */
+    0xD27A, 0xD27B, 0xD27C, 0xD27D, 0xD27E, 0xD27F, 	 0, 	 0, /* 0xD0 */
          0, 0xD280, 0xD281, 0xD282, 0xD283, 0xD284, 0xD285, 0xD286, /* 0xE0 */
     0xD287, 0xD288, 0xD289, 0xD28A, 0xD28B, 0xD28C, 0xD28D, 0xD28E, /* 0xE0 */
-    0xD28F, 0xD290,      0, 0xD291, 0xD292, 0xD293, 0xD294, 0xD295, /* 0xF0 */
-    0xD296, 0xD297, 0xD298, 0xD299, 0xD29A, 0xD29B                  /* 0xF0 */
+    0xD28F, 0xD290, 	 0, 0xD291, 0xD292, 0xD293, 0xD294, 0xD295, /* 0xF0 */
+    0xD296, 0xD297, 0xD298, 0xD299, 0xD29A, 0xD29B					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_CB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD29C, 0xD29D, 0xD29E, 0xD29F, 0xD2A0, 0xD2A1, 0xD2A2, /* 0x40 */
     0xD2A3, 0xD2A4, 0xD2A5, 0xD2A6, 0xD2A7, 0xD2A8, 0xD2A9, 0xD2AA, /* 0x40 */
-    0xD2AB, 0xD2AC,      0, 0xD2AD, 0xD2AE, 0xD2AF, 0xD2B0, 0xD2B1, /* 0x50 */
-    0xD2B2, 0xD2B3, 0xD2B4, 0xD2B5, 0xD2B6, 0xD2B7,      0,      0, /* 0x50 */
+    0xD2AB, 0xD2AC, 	 0, 0xD2AD, 0xD2AE, 0xD2AF, 0xD2B0, 0xD2B1, /* 0x50 */
+    0xD2B2, 0xD2B3, 0xD2B4, 0xD2B5, 0xD2B6, 0xD2B7, 	 0, 	 0, /* 0x50 */
          0, 0xD2B8, 0xD2B9, 0xD2BA, 0xD2BB, 0xD2BC, 0xD2BD, 0xD2BE, /* 0x60 */
     0xD2BF, 0xD2C0, 0xD2C1, 0xD2C2, 0xD2C3, 0xD2C4, 0xD2C5, 0xD2C6, /* 0x60 */
-    0xD2C7, 0xD2C8,      0, 0xD2C9, 0xD2CA, 0xD2CB, 0xD2CC, 0xD2CD, /* 0x70 */
-    0xD2CE, 0xD2CF, 0xD2D0, 0xD2D1, 0xD2D2, 0xD2D3,      0,      0, /* 0x70 */
+    0xD2C7, 0xD2C8, 	 0, 0xD2C9, 0xD2CA, 0xD2CB, 0xD2CC, 0xD2CD, /* 0x70 */
+    0xD2CE, 0xD2CF, 0xD2D0, 0xD2D1, 0xD2D2, 0xD2D3, 	 0, 	 0, /* 0x70 */
          0, 0xD2D4, 0xD2D5, 0xD2D6, 0xD2D7, 0xD2D8, 0xD2D9, 0xD2DA, /* 0x80 */
     0xD2DB, 0xD2DC, 0xD2DD, 0xD2DE, 0xD2DF, 0xD2E0, 0xD2E1, 0xD2E2, /* 0x80 */
-    0xD2E3, 0xD2E4,      0, 0xD2E5, 0xD2E6, 0xD2E7, 0xD2E8, 0xD2E9, /* 0x90 */
-    0xD2EA, 0xD2EB, 0xD2EC, 0xD2ED, 0xD2EE, 0xD2EF,      0,      0, /* 0x90 */
+    0xD2E3, 0xD2E4, 	 0, 0xD2E5, 0xD2E6, 0xD2E7, 0xD2E8, 0xD2E9, /* 0x90 */
+    0xD2EA, 0xD2EB, 0xD2EC, 0xD2ED, 0xD2EE, 0xD2EF, 	 0, 	 0, /* 0x90 */
          0, 0xD2F0, 0xD2F1, 0xD2F2, 0xD2F3, 0xD2F4, 0xD2F5, 0xD2F6, /* 0xA0 */
     0xD2F7, 0xD2F8, 0xD2F9, 0xD2FA, 0xD2FB, 0xD2FC, 0xD2FD, 0xD2FE, /* 0xA0 */
-    0xD2FF, 0xD300,      0, 0xD301, 0xD302, 0xD303, 0xD304, 0xD305, /* 0xB0 */
-    0xD306, 0xD307, 0xD308, 0xD309, 0xD30A, 0xD30B                  /* 0xB0 */
+    0xD2FF, 0xD300, 	 0, 0xD301, 0xD302, 0xD303, 0xD304, 0xD305, /* 0xB0 */
+    0xD306, 0xD307, 0xD308, 0xD309, 0xD30A, 0xD30B					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_CC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x314D,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x314D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD30C, 0xD30D, 0xD30E, 0xD30F, 0xD310, 0xD311, 0xD312, /* 0x60 */
     0xD313, 0xD314, 0xD315, 0xD316, 0xD317, 0xD318, 0xD319, 0xD31A, /* 0x60 */
-    0xD31B, 0xD31C,      0, 0xD31D, 0xD31E, 0xD31F, 0xD320, 0xD321, /* 0x70 */
-    0xD322, 0xD323, 0xD324, 0xD325, 0xD326, 0xD327,      0,      0, /* 0x70 */
+    0xD31B, 0xD31C, 	 0, 0xD31D, 0xD31E, 0xD31F, 0xD320, 0xD321, /* 0x70 */
+    0xD322, 0xD323, 0xD324, 0xD325, 0xD326, 0xD327, 	 0, 	 0, /* 0x70 */
          0, 0xD328, 0xD329, 0xD32A, 0xD32B, 0xD32C, 0xD32D, 0xD32E, /* 0x80 */
     0xD32F, 0xD330, 0xD331, 0xD332, 0xD333, 0xD334, 0xD335, 0xD336, /* 0x80 */
-    0xD337, 0xD338,      0, 0xD339, 0xD33A, 0xD33B, 0xD33C, 0xD33D, /* 0x90 */
-    0xD33E, 0xD33F, 0xD340, 0xD341, 0xD342, 0xD343,      0,      0, /* 0x90 */
+    0xD337, 0xD338, 	 0, 0xD339, 0xD33A, 0xD33B, 0xD33C, 0xD33D, /* 0x90 */
+    0xD33E, 0xD33F, 0xD340, 0xD341, 0xD342, 0xD343, 	 0, 	 0, /* 0x90 */
          0, 0xD344, 0xD345, 0xD346, 0xD347, 0xD348, 0xD349, 0xD34A, /* 0xA0 */
     0xD34B, 0xD34C, 0xD34D, 0xD34E, 0xD34F, 0xD350, 0xD351, 0xD352, /* 0xA0 */
-    0xD353, 0xD354,      0, 0xD355, 0xD356, 0xD357, 0xD358, 0xD359, /* 0xB0 */
-    0xD35A, 0xD35B, 0xD35C, 0xD35D, 0xD35E, 0xD35F,      0,      0, /* 0xB0 */
+    0xD353, 0xD354, 	 0, 0xD355, 0xD356, 0xD357, 0xD358, 0xD359, /* 0xB0 */
+    0xD35A, 0xD35B, 0xD35C, 0xD35D, 0xD35E, 0xD35F, 	 0, 	 0, /* 0xB0 */
          0, 0xD360, 0xD361, 0xD362, 0xD363, 0xD364, 0xD365, 0xD366, /* 0xC0 */
     0xD367, 0xD368, 0xD369, 0xD36A, 0xD36B, 0xD36C, 0xD36D, 0xD36E, /* 0xC0 */
-    0xD36F, 0xD370,      0, 0xD371, 0xD372, 0xD373, 0xD374, 0xD375, /* 0xD0 */
-    0xD376, 0xD377, 0xD378, 0xD379, 0xD37A, 0xD37B,      0,      0, /* 0xD0 */
+    0xD36F, 0xD370, 	 0, 0xD371, 0xD372, 0xD373, 0xD374, 0xD375, /* 0xD0 */
+    0xD376, 0xD377, 0xD378, 0xD379, 0xD37A, 0xD37B, 	 0, 	 0, /* 0xD0 */
          0, 0xD37C, 0xD37D, 0xD37E, 0xD37F, 0xD380, 0xD381, 0xD382, /* 0xE0 */
     0xD383, 0xD384, 0xD385, 0xD386, 0xD387, 0xD388, 0xD389, 0xD38A, /* 0xE0 */
-    0xD38B, 0xD38C,      0, 0xD38D, 0xD38E, 0xD38F, 0xD390, 0xD391, /* 0xF0 */
-    0xD392, 0xD393, 0xD394, 0xD395, 0xD396, 0xD397                  /* 0xF0 */
+    0xD38B, 0xD38C, 	 0, 0xD38D, 0xD38E, 0xD38F, 0xD390, 0xD391, /* 0xF0 */
+    0xD392, 0xD393, 0xD394, 0xD395, 0xD396, 0xD397					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_CD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD398, 0xD399, 0xD39A, 0xD39B, 0xD39C, 0xD39D, 0xD39E, /* 0x40 */
     0xD39F, 0xD3A0, 0xD3A1, 0xD3A2, 0xD3A3, 0xD3A4, 0xD3A5, 0xD3A6, /* 0x40 */
-    0xD3A7, 0xD3A8,      0, 0xD3A9, 0xD3AA, 0xD3AB, 0xD3AC, 0xD3AD, /* 0x50 */
-    0xD3AE, 0xD3AF, 0xD3B0, 0xD3B1, 0xD3B2, 0xD3B3,      0,      0, /* 0x50 */
+    0xD3A7, 0xD3A8, 	 0, 0xD3A9, 0xD3AA, 0xD3AB, 0xD3AC, 0xD3AD, /* 0x50 */
+    0xD3AE, 0xD3AF, 0xD3B0, 0xD3B1, 0xD3B2, 0xD3B3, 	 0, 	 0, /* 0x50 */
          0, 0xD3B4, 0xD3B5, 0xD3B6, 0xD3B7, 0xD3B8, 0xD3B9, 0xD3BA, /* 0x60 */
     0xD3BB, 0xD3BC, 0xD3BD, 0xD3BE, 0xD3BF, 0xD3C0, 0xD3C1, 0xD3C2, /* 0x60 */
-    0xD3C3, 0xD3C4,      0, 0xD3C5, 0xD3C6, 0xD3C7, 0xD3C8, 0xD3C9, /* 0x70 */
-    0xD3CA, 0xD3CB, 0xD3CC, 0xD3CD, 0xD3CE, 0xD3CF,      0,      0, /* 0x70 */
+    0xD3C3, 0xD3C4, 	 0, 0xD3C5, 0xD3C6, 0xD3C7, 0xD3C8, 0xD3C9, /* 0x70 */
+    0xD3CA, 0xD3CB, 0xD3CC, 0xD3CD, 0xD3CE, 0xD3CF, 	 0, 	 0, /* 0x70 */
          0, 0xD3D0, 0xD3D1, 0xD3D2, 0xD3D3, 0xD3D4, 0xD3D5, 0xD3D6, /* 0x80 */
     0xD3D7, 0xD3D8, 0xD3D9, 0xD3DA, 0xD3DB, 0xD3DC, 0xD3DD, 0xD3DE, /* 0x80 */
-    0xD3DF, 0xD3E0,      0, 0xD3E1, 0xD3E2, 0xD3E3, 0xD3E4, 0xD3E5, /* 0x90 */
-    0xD3E6, 0xD3E7, 0xD3E8, 0xD3E9, 0xD3EA, 0xD3EB,      0,      0, /* 0x90 */
+    0xD3DF, 0xD3E0, 	 0, 0xD3E1, 0xD3E2, 0xD3E3, 0xD3E4, 0xD3E5, /* 0x90 */
+    0xD3E6, 0xD3E7, 0xD3E8, 0xD3E9, 0xD3EA, 0xD3EB, 	 0, 	 0, /* 0x90 */
          0, 0xD3EC, 0xD3ED, 0xD3EE, 0xD3EF, 0xD3F0, 0xD3F1, 0xD3F2, /* 0xA0 */
     0xD3F3, 0xD3F4, 0xD3F5, 0xD3F6, 0xD3F7, 0xD3F8, 0xD3F9, 0xD3FA, /* 0xA0 */
-    0xD3FB, 0xD3FC,      0, 0xD3FD, 0xD3FE, 0xD3FF, 0xD400, 0xD401, /* 0xB0 */
-    0xD402, 0xD403, 0xD404, 0xD405, 0xD406, 0xD407,      0,      0, /* 0xB0 */
+    0xD3FB, 0xD3FC, 	 0, 0xD3FD, 0xD3FE, 0xD3FF, 0xD400, 0xD401, /* 0xB0 */
+    0xD402, 0xD403, 0xD404, 0xD405, 0xD406, 0xD407, 	 0, 	 0, /* 0xB0 */
          0, 0xD408, 0xD409, 0xD40A, 0xD40B, 0xD40C, 0xD40D, 0xD40E, /* 0xC0 */
     0xD40F, 0xD410, 0xD411, 0xD412, 0xD413, 0xD414, 0xD415, 0xD416, /* 0xC0 */
-    0xD417, 0xD418,      0, 0xD419, 0xD41A, 0xD41B, 0xD41C, 0xD41D, /* 0xD0 */
-    0xD41E, 0xD41F, 0xD420, 0xD421, 0xD422, 0xD423,      0,      0, /* 0xD0 */
+    0xD417, 0xD418, 	 0, 0xD419, 0xD41A, 0xD41B, 0xD41C, 0xD41D, /* 0xD0 */
+    0xD41E, 0xD41F, 0xD420, 0xD421, 0xD422, 0xD423, 	 0, 	 0, /* 0xD0 */
          0, 0xD424, 0xD425, 0xD426, 0xD427, 0xD428, 0xD429, 0xD42A, /* 0xE0 */
     0xD42B, 0xD42C, 0xD42D, 0xD42E, 0xD42F, 0xD430, 0xD431, 0xD432, /* 0xE0 */
-    0xD433, 0xD434,      0, 0xD435, 0xD436, 0xD437, 0xD438, 0xD439, /* 0xF0 */
-    0xD43A, 0xD43B, 0xD43C, 0xD43D, 0xD43E, 0xD43F                  /* 0xF0 */
+    0xD433, 0xD434, 	 0, 0xD435, 0xD436, 0xD437, 0xD438, 0xD439, /* 0xF0 */
+    0xD43A, 0xD43B, 0xD43C, 0xD43D, 0xD43E, 0xD43F					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_CE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD440, 0xD441, 0xD442, 0xD443, 0xD444, 0xD445, 0xD446, /* 0x40 */
     0xD447, 0xD448, 0xD449, 0xD44A, 0xD44B, 0xD44C, 0xD44D, 0xD44E, /* 0x40 */
-    0xD44F, 0xD450,      0, 0xD451, 0xD452, 0xD453, 0xD454, 0xD455, /* 0x50 */
-    0xD456, 0xD457, 0xD458, 0xD459, 0xD45A, 0xD45B,      0,      0, /* 0x50 */
+    0xD44F, 0xD450, 	 0, 0xD451, 0xD452, 0xD453, 0xD454, 0xD455, /* 0x50 */
+    0xD456, 0xD457, 0xD458, 0xD459, 0xD45A, 0xD45B, 	 0, 	 0, /* 0x50 */
          0, 0xD45C, 0xD45D, 0xD45E, 0xD45F, 0xD460, 0xD461, 0xD462, /* 0x60 */
     0xD463, 0xD464, 0xD465, 0xD466, 0xD467, 0xD468, 0xD469, 0xD46A, /* 0x60 */
-    0xD46B, 0xD46C,      0, 0xD46D, 0xD46E, 0xD46F, 0xD470, 0xD471, /* 0x70 */
-    0xD472, 0xD473, 0xD474, 0xD475, 0xD476, 0xD477,      0,      0, /* 0x70 */
+    0xD46B, 0xD46C, 	 0, 0xD46D, 0xD46E, 0xD46F, 0xD470, 0xD471, /* 0x70 */
+    0xD472, 0xD473, 0xD474, 0xD475, 0xD476, 0xD477, 	 0, 	 0, /* 0x70 */
          0, 0xD478, 0xD479, 0xD47A, 0xD47B, 0xD47C, 0xD47D, 0xD47E, /* 0x80 */
     0xD47F, 0xD480, 0xD481, 0xD482, 0xD483, 0xD484, 0xD485, 0xD486, /* 0x80 */
-    0xD487, 0xD488,      0, 0xD489, 0xD48A, 0xD48B, 0xD48C, 0xD48D, /* 0x90 */
-    0xD48E, 0xD48F, 0xD490, 0xD491, 0xD492, 0xD493,      0,      0, /* 0x90 */
+    0xD487, 0xD488, 	 0, 0xD489, 0xD48A, 0xD48B, 0xD48C, 0xD48D, /* 0x90 */
+    0xD48E, 0xD48F, 0xD490, 0xD491, 0xD492, 0xD493, 	 0, 	 0, /* 0x90 */
          0, 0xD494, 0xD495, 0xD496, 0xD497, 0xD498, 0xD499, 0xD49A, /* 0xA0 */
     0xD49B, 0xD49C, 0xD49D, 0xD49E, 0xD49F, 0xD4A0, 0xD4A1, 0xD4A2, /* 0xA0 */
-    0xD4A3, 0xD4A4,      0, 0xD4A5, 0xD4A6, 0xD4A7, 0xD4A8, 0xD4A9, /* 0xB0 */
-    0xD4AA, 0xD4AB, 0xD4AC, 0xD4AD, 0xD4AE, 0xD4AF,      0,      0, /* 0xB0 */
+    0xD4A3, 0xD4A4, 	 0, 0xD4A5, 0xD4A6, 0xD4A7, 0xD4A8, 0xD4A9, /* 0xB0 */
+    0xD4AA, 0xD4AB, 0xD4AC, 0xD4AD, 0xD4AE, 0xD4AF, 	 0, 	 0, /* 0xB0 */
          0, 0xD4B0, 0xD4B1, 0xD4B2, 0xD4B3, 0xD4B4, 0xD4B5, 0xD4B6, /* 0xC0 */
     0xD4B7, 0xD4B8, 0xD4B9, 0xD4BA, 0xD4BB, 0xD4BC, 0xD4BD, 0xD4BE, /* 0xC0 */
-    0xD4BF, 0xD4C0,      0, 0xD4C1, 0xD4C2, 0xD4C3, 0xD4C4, 0xD4C5, /* 0xD0 */
-    0xD4C6, 0xD4C7, 0xD4C8, 0xD4C9, 0xD4CA, 0xD4CB,      0,      0, /* 0xD0 */
+    0xD4BF, 0xD4C0, 	 0, 0xD4C1, 0xD4C2, 0xD4C3, 0xD4C4, 0xD4C5, /* 0xD0 */
+    0xD4C6, 0xD4C7, 0xD4C8, 0xD4C9, 0xD4CA, 0xD4CB, 	 0, 	 0, /* 0xD0 */
          0, 0xD4CC, 0xD4CD, 0xD4CE, 0xD4CF, 0xD4D0, 0xD4D1, 0xD4D2, /* 0xE0 */
     0xD4D3, 0xD4D4, 0xD4D5, 0xD4D6, 0xD4D7, 0xD4D8, 0xD4D9, 0xD4DA, /* 0xE0 */
-    0xD4DB, 0xD4DC,      0, 0xD4DD, 0xD4DE, 0xD4DF, 0xD4E0, 0xD4E1, /* 0xF0 */
-    0xD4E2, 0xD4E3, 0xD4E4, 0xD4E5, 0xD4E6, 0xD4E7                  /* 0xF0 */
+    0xD4DB, 0xD4DC, 	 0, 0xD4DD, 0xD4DE, 0xD4DF, 0xD4E0, 0xD4E1, /* 0xF0 */
+    0xD4E2, 0xD4E3, 0xD4E4, 0xD4E5, 0xD4E6, 0xD4E7					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_CF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD4E8, 0xD4E9, 0xD4EA, 0xD4EB, 0xD4EC, 0xD4ED, 0xD4EE, /* 0x40 */
     0xD4EF, 0xD4F0, 0xD4F1, 0xD4F2, 0xD4F3, 0xD4F4, 0xD4F5, 0xD4F6, /* 0x40 */
-    0xD4F7, 0xD4F8,      0, 0xD4F9, 0xD4FA, 0xD4FB, 0xD4FC, 0xD4FD, /* 0x50 */
-    0xD4FE, 0xD4FF, 0xD500, 0xD501, 0xD502, 0xD503,      0,      0, /* 0x50 */
+    0xD4F7, 0xD4F8, 	 0, 0xD4F9, 0xD4FA, 0xD4FB, 0xD4FC, 0xD4FD, /* 0x50 */
+    0xD4FE, 0xD4FF, 0xD500, 0xD501, 0xD502, 0xD503, 	 0, 	 0, /* 0x50 */
          0, 0xD504, 0xD505, 0xD506, 0xD507, 0xD508, 0xD509, 0xD50A, /* 0x60 */
     0xD50B, 0xD50C, 0xD50D, 0xD50E, 0xD50F, 0xD510, 0xD511, 0xD512, /* 0x60 */
-    0xD513, 0xD514,      0, 0xD515, 0xD516, 0xD517, 0xD518, 0xD519, /* 0x70 */
-    0xD51A, 0xD51B, 0xD51C, 0xD51D, 0xD51E, 0xD51F,      0,      0, /* 0x70 */
+    0xD513, 0xD514, 	 0, 0xD515, 0xD516, 0xD517, 0xD518, 0xD519, /* 0x70 */
+    0xD51A, 0xD51B, 0xD51C, 0xD51D, 0xD51E, 0xD51F, 	 0, 	 0, /* 0x70 */
          0, 0xD520, 0xD521, 0xD522, 0xD523, 0xD524, 0xD525, 0xD526, /* 0x80 */
     0xD527, 0xD528, 0xD529, 0xD52A, 0xD52B, 0xD52C, 0xD52D, 0xD52E, /* 0x80 */
-    0xD52F, 0xD530,      0, 0xD531, 0xD532, 0xD533, 0xD534, 0xD535, /* 0x90 */
-    0xD536, 0xD537, 0xD538, 0xD539, 0xD53A, 0xD53B,      0,      0, /* 0x90 */
+    0xD52F, 0xD530, 	 0, 0xD531, 0xD532, 0xD533, 0xD534, 0xD535, /* 0x90 */
+    0xD536, 0xD537, 0xD538, 0xD539, 0xD53A, 0xD53B, 	 0, 	 0, /* 0x90 */
          0, 0xD53C, 0xD53D, 0xD53E, 0xD53F, 0xD540, 0xD541, 0xD542, /* 0xA0 */
     0xD543, 0xD544, 0xD545, 0xD546, 0xD547, 0xD548, 0xD549, 0xD54A, /* 0xA0 */
-    0xD54B, 0xD54C,      0, 0xD54D, 0xD54E, 0xD54F, 0xD550, 0xD551, /* 0xB0 */
-    0xD552, 0xD553, 0xD554, 0xD555, 0xD556, 0xD557                  /* 0xB0 */
+    0xD54B, 0xD54C, 	 0, 0xD54D, 0xD54E, 0xD54F, 0xD550, 0xD551, /* 0xB0 */
+    0xD552, 0xD553, 0xD554, 0xD555, 0xD556, 0xD557					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_D0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0x314E,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0x314E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD558, 0xD559, 0xD55A, 0xD55B, 0xD55C, 0xD55D, 0xD55E, /* 0x60 */
     0xD55F, 0xD560, 0xD561, 0xD562, 0xD563, 0xD564, 0xD565, 0xD566, /* 0x60 */
-    0xD567, 0xD568,      0, 0xD569, 0xD56A, 0xD56B, 0xD56C, 0xD56D, /* 0x70 */
-    0xD56E, 0xD56F, 0xD570, 0xD571, 0xD572, 0xD573,      0,      0, /* 0x70 */
+    0xD567, 0xD568, 	 0, 0xD569, 0xD56A, 0xD56B, 0xD56C, 0xD56D, /* 0x70 */
+    0xD56E, 0xD56F, 0xD570, 0xD571, 0xD572, 0xD573, 	 0, 	 0, /* 0x70 */
          0, 0xD574, 0xD575, 0xD576, 0xD577, 0xD578, 0xD579, 0xD57A, /* 0x80 */
     0xD57B, 0xD57C, 0xD57D, 0xD57E, 0xD57F, 0xD580, 0xD581, 0xD582, /* 0x80 */
-    0xD583, 0xD584,      0, 0xD585, 0xD586, 0xD587, 0xD588, 0xD589, /* 0x90 */
-    0xD58A, 0xD58B, 0xD58C, 0xD58D, 0xD58E, 0xD58F,      0,      0, /* 0x90 */
+    0xD583, 0xD584, 	 0, 0xD585, 0xD586, 0xD587, 0xD588, 0xD589, /* 0x90 */
+    0xD58A, 0xD58B, 0xD58C, 0xD58D, 0xD58E, 0xD58F, 	 0, 	 0, /* 0x90 */
          0, 0xD590, 0xD591, 0xD592, 0xD593, 0xD594, 0xD595, 0xD596, /* 0xA0 */
     0xD597, 0xD598, 0xD599, 0xD59A, 0xD59B, 0xD59C, 0xD59D, 0xD59E, /* 0xA0 */
-    0xD59F, 0xD5A0,      0, 0xD5A1, 0xD5A2, 0xD5A3, 0xD5A4, 0xD5A5, /* 0xB0 */
-    0xD5A6, 0xD5A7, 0xD5A8, 0xD5A9, 0xD5AA, 0xD5AB,      0,      0, /* 0xB0 */
+    0xD59F, 0xD5A0, 	 0, 0xD5A1, 0xD5A2, 0xD5A3, 0xD5A4, 0xD5A5, /* 0xB0 */
+    0xD5A6, 0xD5A7, 0xD5A8, 0xD5A9, 0xD5AA, 0xD5AB, 	 0, 	 0, /* 0xB0 */
          0, 0xD5AC, 0xD5AD, 0xD5AE, 0xD5AF, 0xD5B0, 0xD5B1, 0xD5B2, /* 0xC0 */
     0xD5B3, 0xD5B4, 0xD5B5, 0xD5B6, 0xD5B7, 0xD5B8, 0xD5B9, 0xD5BA, /* 0xC0 */
-    0xD5BB, 0xD5BC,      0, 0xD5BD, 0xD5BE, 0xD5BF, 0xD5C0, 0xD5C1, /* 0xD0 */
-    0xD5C2, 0xD5C3, 0xD5C4, 0xD5C5, 0xD5C6, 0xD5C7,      0,      0, /* 0xD0 */
+    0xD5BB, 0xD5BC, 	 0, 0xD5BD, 0xD5BE, 0xD5BF, 0xD5C0, 0xD5C1, /* 0xD0 */
+    0xD5C2, 0xD5C3, 0xD5C4, 0xD5C5, 0xD5C6, 0xD5C7, 	 0, 	 0, /* 0xD0 */
          0, 0xD5C8, 0xD5C9, 0xD5CA, 0xD5CB, 0xD5CC, 0xD5CD, 0xD5CE, /* 0xE0 */
     0xD5CF, 0xD5D0, 0xD5D1, 0xD5D2, 0xD5D3, 0xD5D4, 0xD5D5, 0xD5D6, /* 0xE0 */
-    0xD5D7, 0xD5D8,      0, 0xD5D9, 0xD5DA, 0xD5DB, 0xD5DC, 0xD5DD, /* 0xF0 */
-    0xD5DE, 0xD5DF, 0xD5E0, 0xD5E1, 0xD5E2, 0xD5E3                  /* 0xF0 */
+    0xD5D7, 0xD5D8, 	 0, 0xD5D9, 0xD5DA, 0xD5DB, 0xD5DC, 0xD5DD, /* 0xF0 */
+    0xD5DE, 0xD5DF, 0xD5E0, 0xD5E1, 0xD5E2, 0xD5E3					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_D1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD5E4, 0xD5E5, 0xD5E6, 0xD5E7, 0xD5E8, 0xD5E9, 0xD5EA, /* 0x40 */
     0xD5EB, 0xD5EC, 0xD5ED, 0xD5EE, 0xD5EF, 0xD5F0, 0xD5F1, 0xD5F2, /* 0x40 */
-    0xD5F3, 0xD5F4,      0, 0xD5F5, 0xD5F6, 0xD5F7, 0xD5F8, 0xD5F9, /* 0x50 */
-    0xD5FA, 0xD5FB, 0xD5FC, 0xD5FD, 0xD5FE, 0xD5FF,      0,      0, /* 0x50 */
+    0xD5F3, 0xD5F4, 	 0, 0xD5F5, 0xD5F6, 0xD5F7, 0xD5F8, 0xD5F9, /* 0x50 */
+    0xD5FA, 0xD5FB, 0xD5FC, 0xD5FD, 0xD5FE, 0xD5FF, 	 0, 	 0, /* 0x50 */
          0, 0xD600, 0xD601, 0xD602, 0xD603, 0xD604, 0xD605, 0xD606, /* 0x60 */
     0xD607, 0xD608, 0xD609, 0xD60A, 0xD60B, 0xD60C, 0xD60D, 0xD60E, /* 0x60 */
-    0xD60F, 0xD610,      0, 0xD611, 0xD612, 0xD613, 0xD614, 0xD615, /* 0x70 */
-    0xD616, 0xD617, 0xD618, 0xD619, 0xD61A, 0xD61B,      0,      0, /* 0x70 */
+    0xD60F, 0xD610, 	 0, 0xD611, 0xD612, 0xD613, 0xD614, 0xD615, /* 0x70 */
+    0xD616, 0xD617, 0xD618, 0xD619, 0xD61A, 0xD61B, 	 0, 	 0, /* 0x70 */
          0, 0xD61C, 0xD61D, 0xD61E, 0xD61F, 0xD620, 0xD621, 0xD622, /* 0x80 */
     0xD623, 0xD624, 0xD625, 0xD626, 0xD627, 0xD628, 0xD629, 0xD62A, /* 0x80 */
-    0xD62B, 0xD62C,      0, 0xD62D, 0xD62E, 0xD62F, 0xD630, 0xD631, /* 0x90 */
-    0xD632, 0xD633, 0xD634, 0xD635, 0xD636, 0xD637,      0,      0, /* 0x90 */
+    0xD62B, 0xD62C, 	 0, 0xD62D, 0xD62E, 0xD62F, 0xD630, 0xD631, /* 0x90 */
+    0xD632, 0xD633, 0xD634, 0xD635, 0xD636, 0xD637, 	 0, 	 0, /* 0x90 */
          0, 0xD638, 0xD639, 0xD63A, 0xD63B, 0xD63C, 0xD63D, 0xD63E, /* 0xA0 */
     0xD63F, 0xD640, 0xD641, 0xD642, 0xD643, 0xD644, 0xD645, 0xD646, /* 0xA0 */
-    0xD647, 0xD648,      0, 0xD649, 0xD64A, 0xD64B, 0xD64C, 0xD64D, /* 0xB0 */
-    0xD64E, 0xD64F, 0xD650, 0xD651, 0xD652, 0xD653,      0,      0, /* 0xB0 */
+    0xD647, 0xD648, 	 0, 0xD649, 0xD64A, 0xD64B, 0xD64C, 0xD64D, /* 0xB0 */
+    0xD64E, 0xD64F, 0xD650, 0xD651, 0xD652, 0xD653, 	 0, 	 0, /* 0xB0 */
          0, 0xD654, 0xD655, 0xD656, 0xD657, 0xD658, 0xD659, 0xD65A, /* 0xC0 */
     0xD65B, 0xD65C, 0xD65D, 0xD65E, 0xD65F, 0xD660, 0xD661, 0xD662, /* 0xC0 */
-    0xD663, 0xD664,      0, 0xD665, 0xD666, 0xD667, 0xD668, 0xD669, /* 0xD0 */
-    0xD66A, 0xD66B, 0xD66C, 0xD66D, 0xD66E, 0xD66F,      0,      0, /* 0xD0 */
+    0xD663, 0xD664, 	 0, 0xD665, 0xD666, 0xD667, 0xD668, 0xD669, /* 0xD0 */
+    0xD66A, 0xD66B, 0xD66C, 0xD66D, 0xD66E, 0xD66F, 	 0, 	 0, /* 0xD0 */
          0, 0xD670, 0xD671, 0xD672, 0xD673, 0xD674, 0xD675, 0xD676, /* 0xE0 */
     0xD677, 0xD678, 0xD679, 0xD67A, 0xD67B, 0xD67C, 0xD67D, 0xD67E, /* 0xE0 */
-    0xD67F, 0xD680,      0, 0xD681, 0xD682, 0xD683, 0xD684, 0xD685, /* 0xF0 */
-    0xD686, 0xD687, 0xD688, 0xD689, 0xD68A, 0xD68B                  /* 0xF0 */
+    0xD67F, 0xD680, 	 0, 0xD681, 0xD682, 0xD683, 0xD684, 0xD685, /* 0xF0 */
+    0xD686, 0xD687, 0xD688, 0xD689, 0xD68A, 0xD68B					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_D2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD68C, 0xD68D, 0xD68E, 0xD68F, 0xD690, 0xD691, 0xD692, /* 0x40 */
     0xD693, 0xD694, 0xD695, 0xD696, 0xD697, 0xD698, 0xD699, 0xD69A, /* 0x40 */
-    0xD69B, 0xD69C,      0, 0xD69D, 0xD69E, 0xD69F, 0xD6A0, 0xD6A1, /* 0x50 */
-    0xD6A2, 0xD6A3, 0xD6A4, 0xD6A5, 0xD6A6, 0xD6A7,      0,      0, /* 0x50 */
+    0xD69B, 0xD69C, 	 0, 0xD69D, 0xD69E, 0xD69F, 0xD6A0, 0xD6A1, /* 0x50 */
+    0xD6A2, 0xD6A3, 0xD6A4, 0xD6A5, 0xD6A6, 0xD6A7, 	 0, 	 0, /* 0x50 */
          0, 0xD6A8, 0xD6A9, 0xD6AA, 0xD6AB, 0xD6AC, 0xD6AD, 0xD6AE, /* 0x60 */
     0xD6AF, 0xD6B0, 0xD6B1, 0xD6B2, 0xD6B3, 0xD6B4, 0xD6B5, 0xD6B6, /* 0x60 */
-    0xD6B7, 0xD6B8,      0, 0xD6B9, 0xD6BA, 0xD6BB, 0xD6BC, 0xD6BD, /* 0x70 */
-    0xD6BE, 0xD6BF, 0xD6C0, 0xD6C1, 0xD6C2, 0xD6C3,      0,      0, /* 0x70 */
+    0xD6B7, 0xD6B8, 	 0, 0xD6B9, 0xD6BA, 0xD6BB, 0xD6BC, 0xD6BD, /* 0x70 */
+    0xD6BE, 0xD6BF, 0xD6C0, 0xD6C1, 0xD6C2, 0xD6C3, 	 0, 	 0, /* 0x70 */
          0, 0xD6C4, 0xD6C5, 0xD6C6, 0xD6C7, 0xD6C8, 0xD6C9, 0xD6CA, /* 0x80 */
     0xD6CB, 0xD6CC, 0xD6CD, 0xD6CE, 0xD6CF, 0xD6D0, 0xD6D1, 0xD6D2, /* 0x80 */
-    0xD6D3, 0xD6D4,      0, 0xD6D5, 0xD6D6, 0xD6D7, 0xD6D8, 0xD6D9, /* 0x90 */
-    0xD6DA, 0xD6DB, 0xD6DC, 0xD6DD, 0xD6DE, 0xD6DF,      0,      0, /* 0x90 */
+    0xD6D3, 0xD6D4, 	 0, 0xD6D5, 0xD6D6, 0xD6D7, 0xD6D8, 0xD6D9, /* 0x90 */
+    0xD6DA, 0xD6DB, 0xD6DC, 0xD6DD, 0xD6DE, 0xD6DF, 	 0, 	 0, /* 0x90 */
          0, 0xD6E0, 0xD6E1, 0xD6E2, 0xD6E3, 0xD6E4, 0xD6E5, 0xD6E6, /* 0xA0 */
     0xD6E7, 0xD6E8, 0xD6E9, 0xD6EA, 0xD6EB, 0xD6EC, 0xD6ED, 0xD6EE, /* 0xA0 */
-    0xD6EF, 0xD6F0,      0, 0xD6F1, 0xD6F2, 0xD6F3, 0xD6F4, 0xD6F5, /* 0xB0 */
-    0xD6F6, 0xD6F7, 0xD6F8, 0xD6F9, 0xD6FA, 0xD6FB,      0,      0, /* 0xB0 */
+    0xD6EF, 0xD6F0, 	 0, 0xD6F1, 0xD6F2, 0xD6F3, 0xD6F4, 0xD6F5, /* 0xB0 */
+    0xD6F6, 0xD6F7, 0xD6F8, 0xD6F9, 0xD6FA, 0xD6FB, 	 0, 	 0, /* 0xB0 */
          0, 0xD6FC, 0xD6FD, 0xD6FE, 0xD6FF, 0xD700, 0xD701, 0xD702, /* 0xC0 */
     0xD703, 0xD704, 0xD705, 0xD706, 0xD707, 0xD708, 0xD709, 0xD70A, /* 0xC0 */
-    0xD70B, 0xD70C,      0, 0xD70D, 0xD70E, 0xD70F, 0xD710, 0xD711, /* 0xD0 */
-    0xD712, 0xD713, 0xD714, 0xD715, 0xD716, 0xD717,      0,      0, /* 0xD0 */
+    0xD70B, 0xD70C, 	 0, 0xD70D, 0xD70E, 0xD70F, 0xD710, 0xD711, /* 0xD0 */
+    0xD712, 0xD713, 0xD714, 0xD715, 0xD716, 0xD717, 	 0, 	 0, /* 0xD0 */
          0, 0xD718, 0xD719, 0xD71A, 0xD71B, 0xD71C, 0xD71D, 0xD71E, /* 0xE0 */
     0xD71F, 0xD720, 0xD721, 0xD722, 0xD723, 0xD724, 0xD725, 0xD726, /* 0xE0 */
-    0xD727, 0xD728,      0, 0xD729, 0xD72A, 0xD72B, 0xD72C, 0xD72D, /* 0xF0 */
-    0xD72E, 0xD72F, 0xD730, 0xD731, 0xD732, 0xD733                  /* 0xF0 */
+    0xD727, 0xD728, 	 0, 0xD729, 0xD72A, 0xD72B, 0xD72C, 0xD72D, /* 0xF0 */
+    0xD72E, 0xD72F, 0xD730, 0xD731, 0xD732, 0xD733					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_D3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD734, 0xD735, 0xD736, 0xD737, 0xD738, 0xD739, 0xD73A, /* 0x40 */
     0xD73B, 0xD73C, 0xD73D, 0xD73E, 0xD73F, 0xD740, 0xD741, 0xD742, /* 0x40 */
-    0xD743, 0xD744,      0, 0xD745, 0xD746, 0xD747, 0xD748, 0xD749, /* 0x50 */
-    0xD74A, 0xD74B, 0xD74C, 0xD74D, 0xD74E, 0xD74F,      0,      0, /* 0x50 */
+    0xD743, 0xD744, 	 0, 0xD745, 0xD746, 0xD747, 0xD748, 0xD749, /* 0x50 */
+    0xD74A, 0xD74B, 0xD74C, 0xD74D, 0xD74E, 0xD74F, 	 0, 	 0, /* 0x50 */
          0, 0xD750, 0xD751, 0xD752, 0xD753, 0xD754, 0xD755, 0xD756, /* 0x60 */
     0xD757, 0xD758, 0xD759, 0xD75A, 0xD75B, 0xD75C, 0xD75D, 0xD75E, /* 0x60 */
-    0xD75F, 0xD760,      0, 0xD761, 0xD762, 0xD763, 0xD764, 0xD765, /* 0x70 */
-    0xD766, 0xD767, 0xD768, 0xD769, 0xD76A, 0xD76B,      0,      0, /* 0x70 */
+    0xD75F, 0xD760, 	 0, 0xD761, 0xD762, 0xD763, 0xD764, 0xD765, /* 0x70 */
+    0xD766, 0xD767, 0xD768, 0xD769, 0xD76A, 0xD76B, 	 0, 	 0, /* 0x70 */
          0, 0xD76C, 0xD76D, 0xD76E, 0xD76F, 0xD770, 0xD771, 0xD772, /* 0x80 */
     0xD773, 0xD774, 0xD775, 0xD776, 0xD777, 0xD778, 0xD779, 0xD77A, /* 0x80 */
-    0xD77B, 0xD77C,      0, 0xD77D, 0xD77E, 0xD77F, 0xD780, 0xD781, /* 0x90 */
-    0xD782, 0xD783, 0xD784, 0xD785, 0xD786, 0xD787,      0,      0, /* 0x90 */
+    0xD77B, 0xD77C, 	 0, 0xD77D, 0xD77E, 0xD77F, 0xD780, 0xD781, /* 0x90 */
+    0xD782, 0xD783, 0xD784, 0xD785, 0xD786, 0xD787, 	 0, 	 0, /* 0x90 */
          0, 0xD788, 0xD789, 0xD78A, 0xD78B, 0xD78C, 0xD78D, 0xD78E, /* 0xA0 */
     0xD78F, 0xD790, 0xD791, 0xD792, 0xD793, 0xD794, 0xD795, 0xD796, /* 0xA0 */
-    0xD797, 0xD798,      0, 0xD799, 0xD79A, 0xD79B, 0xD79C, 0xD79D, /* 0xB0 */
-    0xD79E, 0xD79F, 0xD7A0, 0xD7A1, 0xD7A2, 0xD7A3                  /* 0xB0 */
+    0xD797, 0xD798, 	 0, 0xD799, 0xD79A, 0xD79B, 0xD79C, 0xD79D, /* 0xB0 */
+    0xD79E, 0xD79F, 0xD7A0, 0xD7A1, 0xD7A2, 0xD7A3					/* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_D9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x3000, 0x3001, 0x3002, 0x00B7, 0x2025, 0x2026, 0x00A8, /* 0x30 */
     0x3003, 0x00AD, 0x2015, 0x2225, 0xFF3C, 0x223C, 0x2018, 0x2019, /* 0x30 */
     0x201C, 0x201D, 0x3014, 0x3015, 0x3008, 0x3009, 0x300A, 0x300B, /* 0x40 */
@@ -2434,9 +2434,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_D9[] =
     0x2220, 0x22A5, 0x2312, 0x2202, 0x2207, 0x2261, 0x2252, 0x00A7, /* 0x60 */
     0x203B, 0x2606, 0x2605, 0x25CB, 0x25CF, 0x25CE, 0x25C7, 0x25C6, /* 0x60 */
     0x25A1, 0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC, 0x2192, 0x2190, /* 0x70 */
-    0x2191, 0x2193, 0x2194, 0x3013, 0x226A, 0x226B, 0x221A,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x2191, 0x2193, 0x2194, 0x3013, 0x226A, 0x226B, 0x221A, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x223D, 0x221D, 0x2235, 0x222B, 0x222C, 0x2208, 0x220B, /* 0x90 */
     0x2286, 0x2287, 0x2282, 0x2283, 0x222A, 0x2229, 0x2227, 0x2228, /* 0x90 */
     0xFFE2, 0x21D2, 0x21D4, 0x2200, 0x2203, 0x00B4, 0xFF5E, 0x02C7, /* 0xA0 */
@@ -2447,7 +2447,7 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_D9[] =
     0x25A5, 0x25A8, 0x25A7, 0x25A6, 0x25A9, 0x2668, 0x260F, 0x260E, /* 0xC0 */
     0x261C, 0x261E, 0x00B6, 0x2020, 0x2021, 0x2195, 0x2197, 0x2199, /* 0xD0 */
     0x2196, 0x2198, 0x266D, 0x2669, 0x266A, 0x266C, 0x327F, 0x321C, /* 0xD0 */
-    0x2116, 0x33C7, 0x2122, 0x33C2, 0x33D8, 0x2121                  /* 0xE0 */
+    0x2116, 0x33C7, 0x2122, 0x33C2, 0x33D8, 0x2121					/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -2457,8 +2457,8 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_D9[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_DA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xFF01, 0xFF02, 0xFF03, 0xFF04, 0xFF05, 0xFF06, 0xFF07, /* 0x30 */
     0xFF08, 0xFF09, 0xFF0A, 0xFF0B, 0xFF0C, 0xFF0D, 0xFF0E, 0xFF0F, /* 0x30 */
     0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17, /* 0x40 */
@@ -2468,9 +2468,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_DA[] =
     0xFF30, 0xFF31, 0xFF32, 0xFF33, 0xFF34, 0xFF35, 0xFF36, 0xFF37, /* 0x60 */
     0xFF38, 0xFF39, 0xFF3A, 0xFF3B, 0xFFE6, 0xFF3D, 0xFF3E, 0xFF3F, /* 0x60 */
     0xFF40, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47, /* 0x70 */
-    0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0xFF4F, 0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, /* 0x90 */
     0xFF56, 0xFF57, 0xFF58, 0xFF59, 0xFF5A, 0xFF5B, 0xFF5C, 0xFF5D, /* 0x90 */
     0xFFE3, 0x3131, 0x3132, 0x3133, 0x3134, 0x3135, 0x3136, 0x3137, /* 0xA0 */
@@ -2484,29 +2484,29 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_DA[] =
     0x3170, 0x3171, 0x3172, 0x3173, 0x3174, 0x3175, 0x3176, 0x3177, /* 0xE0 */
     0x3178, 0x3179, 0x317A, 0x317B, 0x317C, 0x317D, 0x317E, 0x317F, /* 0xE0 */
     0x3180, 0x3181, 0x3182, 0x3183, 0x3184, 0x3185, 0x3186, 0x3187, /* 0xF0 */
-    0x3188, 0x3189, 0x318A, 0x318B, 0x318C, 0x318D, 0x318E          /* 0xF0 */
+    0x3188, 0x3189, 0x318A, 0x318B, 0x318C, 0x318D, 0x318E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_DB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176, /* 0x30 */
-    0x2177, 0x2178, 0x2179,      0,      0,      0,      0,      0, /* 0x30 */
+    0x2177, 0x2178, 0x2179, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
     0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, /* 0x40 */
-    0x2168, 0x2169,      0,      0,      0,      0,      0,      0, /* 0x40 */
+    0x2168, 0x2169, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
          0, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, /* 0x50 */
     0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, /* 0x50 */
     0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, /* 0x60 */
-    0x03A9,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
+    0x03A9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
          0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, /* 0x70 */
-    0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x03BF, 0x03C0, 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03C6, /* 0x90 */
-    0x03C7, 0x03C8, 0x03C9,      0,      0,      0,      0,      0, /* 0x90 */
+    0x03C7, 0x03C8, 0x03C9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x2500, 0x2502, 0x250C, 0x2510, 0x2518, 0x2514, 0x251C, /* 0xA0 */
     0x252C, 0x2524, 0x2534, 0x253C, 0x2501, 0x2503, 0x250F, 0x2513, /* 0xA0 */
     0x251B, 0x2517, 0x2523, 0x2533, 0x252B, 0x253B, 0x254B, 0x2520, /* 0xB0 */
@@ -2515,15 +2515,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_DB[] =
     0x250D, 0x251E, 0x251F, 0x2521, 0x2522, 0x2526, 0x2527, 0x2529, /* 0xC0 */
     0x252A, 0x252D, 0x252E, 0x2531, 0x2532, 0x2535, 0x2536, 0x2539, /* 0xD0 */
     0x253A, 0x253D, 0x253E, 0x2540, 0x2541, 0x2543, 0x2544, 0x2545, /* 0xD0 */
-    0x2546, 0x2547, 0x2548, 0x2549, 0x254A                          /* 0xE0 */
+    0x2546, 0x2547, 0x2548, 0x2549, 0x254A							/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_DC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x3395, 0x3396, 0x3397, 0x2113, 0x3398, 0x33C4, 0x33A3, /* 0x30 */
     0x33A4, 0x33A5, 0x33A6, 0x3399, 0x339A, 0x339B, 0x339C, 0x339D, /* 0x30 */
     0x339E, 0x339F, 0x33A0, 0x33A1, 0x33A2, 0x33CA, 0x338D, 0x338E, /* 0x40 */
@@ -2533,12 +2533,12 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_DC[] =
     0x33BC, 0x33BD, 0x33BE, 0x33BF, 0x3390, 0x3391, 0x3392, 0x3393, /* 0x60 */
     0x3394, 0x2126, 0x33C0, 0x33C1, 0x338A, 0x338B, 0x338C, 0x33D6, /* 0x60 */
     0x33C5, 0x33AD, 0x33AE, 0x33AF, 0x33DB, 0x33A9, 0x33AA, 0x33AB, /* 0x70 */
-    0x33AC, 0x33DD, 0x33D0, 0x33D3, 0x33C3, 0x33C9, 0x33DC,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0x33C6,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0x00C6, 0x00D0, 0x00AA, 0x0126,      0, 0x0132,      0, /* 0xA0 */
+    0x33AC, 0x33DD, 0x33D0, 0x33D3, 0x33C3, 0x33C9, 0x33DC, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0x33C6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0x00C6, 0x00D0, 0x00AA, 0x0126, 	 0, 0x0132, 	 0, /* 0xA0 */
     0x013F, 0x0141, 0x00D8, 0x0152, 0x00BA, 0x00DE, 0x0166, 0x014A, /* 0xA0 */
          0, 0x3260, 0x3261, 0x3262, 0x3263, 0x3264, 0x3265, 0x3266, /* 0xB0 */
     0x3267, 0x3268, 0x3269, 0x326A, 0x326B, 0x326C, 0x326D, 0x326E, /* 0xB0 */
@@ -2549,15 +2549,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_DC[] =
     0x24E3, 0x24E4, 0x24E5, 0x24E6, 0x24E7, 0x24E8, 0x24E9, 0x2460, /* 0xE0 */
     0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467, 0x2468, /* 0xE0 */
     0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x00BD, 0x2153, /* 0xF0 */
-    0x2154, 0x00BC, 0x00BE, 0x215B, 0x215C, 0x215D, 0x215E          /* 0xF0 */
+    0x2154, 0x00BC, 0x00BE, 0x215B, 0x215C, 0x215D, 0x215E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_DD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x00E6, 0x0111, 0x00F0, 0x0127, 0x0131, 0x0133, 0x0138, /* 0x30 */
     0x0140, 0x0142, 0x00F8, 0x0153, 0x00DF, 0x00FE, 0x0167, 0x014B, /* 0x30 */
     0x0149, 0x3200, 0x3201, 0x3202, 0x3203, 0x3204, 0x3205, 0x3206, /* 0x40 */
@@ -2567,9 +2567,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_DD[] =
     0x249F, 0x24A0, 0x24A1, 0x24A2, 0x24A3, 0x24A4, 0x24A5, 0x24A6, /* 0x60 */
     0x24A7, 0x24A8, 0x24A9, 0x24AA, 0x24AB, 0x24AC, 0x24AD, 0x24AE, /* 0x60 */
     0x24AF, 0x24B0, 0x24B1, 0x24B2, 0x24B3, 0x24B4, 0x24B5, 0x2474, /* 0x70 */
-    0x2475, 0x2476, 0x2477, 0x2478, 0x2479, 0x247A, 0x247B,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x2475, 0x2476, 0x2477, 0x2478, 0x2479, 0x247A, 0x247B, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x247C, 0x247D, 0x247E, 0x247F, 0x2480, 0x2481, 0x2482, /* 0x90 */
     0x00B9, 0x00B2, 0x00B3, 0x2074, 0x207F, 0x2081, 0x2082, 0x2083, /* 0x90 */
     0x2084, 0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047, /* 0xA0 */
@@ -2582,15 +2582,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_DD[] =
     0x3078, 0x3079, 0x307A, 0x307B, 0x307C, 0x307D, 0x307E, 0x307F, /* 0xD0 */
     0x3080, 0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087, /* 0xE0 */
     0x3088, 0x3089, 0x308A, 0x308B, 0x308C, 0x308D, 0x308E, 0x308F, /* 0xE0 */
-    0x3090, 0x3091, 0x3092, 0x3093                                  /* 0xF0 */
+    0x3090, 0x3091, 0x3092, 0x3093									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_DE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7, /* 0x30 */
     0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC, 0x30AD, 0x30AE, 0x30AF, /* 0x30 */
     0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, 0x30B7, /* 0x40 */
@@ -2600,30 +2600,30 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_DE[] =
     0x30D0, 0x30D1, 0x30D2, 0x30D3, 0x30D4, 0x30D5, 0x30D6, 0x30D7, /* 0x60 */
     0x30D8, 0x30D9, 0x30DA, 0x30DB, 0x30DC, 0x30DD, 0x30DE, 0x30DF, /* 0x60 */
     0x30E0, 0x30E1, 0x30E2, 0x30E3, 0x30E4, 0x30E5, 0x30E6, 0x30E7, /* 0x70 */
-    0x30E8, 0x30E9, 0x30EA, 0x30EB, 0x30EC, 0x30ED, 0x30EE,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x30E8, 0x30E9, 0x30EA, 0x30EB, 0x30EC, 0x30ED, 0x30EE, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x30EF, 0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, /* 0x90 */
-    0x30F6,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x30F6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401, /* 0xA0 */
     0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, /* 0xA0 */
     0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, /* 0xB0 */
     0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, /* 0xB0 */
-    0x042E, 0x042F,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
+    0x042E, 0x042F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
          0, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451, /* 0xD0 */
     0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, /* 0xD0 */
     0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, /* 0xE0 */
     0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, /* 0xE0 */
-    0x044E, 0x044F                                                  /* 0xF0 */
+    0x044E, 0x044F													/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x4F3D, 0x4F73, 0x5047, 0x50F9, 0x52A0, 0x53EF, 0x5475, /* 0x30 */
     0x54E5, 0x5609, 0x5AC1, 0x5BB6, 0x6687, 0x67B6, 0x67B7, 0x67EF, /* 0x30 */
     0x6B4C, 0x73C2, 0x75C2, 0x7A3C, 0x82DB, 0x8304, 0x8857, 0x8888, /* 0x40 */
@@ -2633,9 +2633,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E0[] =
     0x61C7, 0x63C0, 0x6746, 0x67EC, 0x687F, 0x6F97, 0x764E, 0x770B, /* 0x60 */
     0x78F5, 0x7A08, 0x7AFF, 0x7C21, 0x809D, 0x826E, 0x8271, 0x8AEB, /* 0x60 */
     0x9593, 0x4E6B, 0x559D, 0x66F7, 0x6E34, 0x78A3, 0x7AED, 0x845B, /* 0x70 */
-    0x8910, 0x874E, 0x97A8, 0x52D8, 0x574E, 0x582A, 0x5D4C,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x8910, 0x874E, 0x97A8, 0x52D8, 0x574E, 0x582A, 0x5D4C, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x611F, 0x61BE, 0x6221, 0x6562, 0x67D1, 0x6A44, 0x6E1B, /* 0x90 */
     0x7518, 0x75B3, 0x76E3, 0x77B0, 0x7D3A, 0x90AF, 0x9451, 0x9452, /* 0x90 */
     0x9F95, 0x5323, 0x5CAC, 0x7532, 0x80DB, 0x9240, 0x9598, 0x525B, /* 0xA0 */
@@ -2649,15 +2649,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E0[] =
     0x64DA, 0x64E7, 0x6E20, 0x70AC, 0x795B, 0x8DDD, 0x8E1E, 0xF902, /* 0xE0 */
     0x907D, 0x9245, 0x92F8, 0x4E7E, 0x4EF6, 0x5065, 0x5DFE, 0x5EFA, /* 0xE0 */
     0x6106, 0x6957, 0x8171, 0x8654, 0x8E47, 0x9375, 0x9A2B, 0x4E5E, /* 0xF0 */
-    0x5091, 0x6770, 0x6840, 0x5109, 0x528D, 0x5292, 0x6AA2          /* 0xF0 */
+    0x5091, 0x6770, 0x6840, 0x5109, 0x528D, 0x5292, 0x6AA2			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x77BC, 0x9210, 0x9ED4, 0x52AB, 0x602F, 0x8FF2, 0x5048, /* 0x30 */
     0x61A9, 0x63ED, 0x64CA, 0x683C, 0x6A84, 0x6FC0, 0x8188, 0x89A1, /* 0x30 */
     0x9694, 0x5805, 0x727D, 0x72AC, 0x7504, 0x7D79, 0x7E6D, 0x80A9, /* 0x40 */
@@ -2667,9 +2667,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E1[] =
     0x5770, 0x5883, 0x5E9A, 0x5F91, 0x6176, 0x61AC, 0x64CE, 0x656C, /* 0x60 */
     0x666F, 0x66BB, 0x66F4, 0x6897, 0x6D87, 0x7085, 0x70F1, 0x749F, /* 0x60 */
     0x74A5, 0x74CA, 0x75D9, 0x786C, 0x78EC, 0x7ADF, 0x7AF6, 0x7D45, /* 0x70 */
-    0x7D93, 0x8015, 0x803F, 0x811B, 0x8396, 0x8B66, 0x8F15,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x7D93, 0x8015, 0x803F, 0x811B, 0x8396, 0x8B66, 0x8F15, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x9015, 0x93E1, 0x9803, 0x9838, 0x9A5A, 0x9BE8, 0x4FC2, /* 0x90 */
     0x5553, 0x583A, 0x5951, 0x5B63, 0x5C46, 0x60B8, 0x6212, 0x6842, /* 0x90 */
     0x68B0, 0x68E8, 0x6EAA, 0x754C, 0x7678, 0x78CE, 0x7A3D, 0x7CFB, /* 0xA0 */
@@ -2683,15 +2683,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E1[] =
     0x6606, 0x68B1, 0x68CD, 0x6EFE, 0x7428, 0x889E, 0x9BE4, 0x6C68, /* 0xE0 */
     0xF904, 0x9AA8, 0x4F9B, 0x516C, 0x5171, 0x529F, 0x5B54, 0x5DE5, /* 0xE0 */
     0x6050, 0x606D, 0x62F1, 0x63A7, 0x653B, 0x73D9, 0x7A7A, 0x86A3, /* 0xF0 */
-    0x8CA2, 0x978F, 0x4E32, 0x5BE1, 0x6208, 0x679C, 0x74DC          /* 0xF0 */
+    0x8CA2, 0x978F, 0x4E32, 0x5BE1, 0x6208, 0x679C, 0x74DC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x79D1, 0x83D3, 0x8A87, 0x8AB2, 0x8DE8, 0x904E, 0x934B, /* 0x30 */
     0x9846, 0x5ED3, 0x69E8, 0x85FF, 0x90ED, 0xF905, 0x51A0, 0x5B98, /* 0x30 */
     0x5BEC, 0x6163, 0x68FA, 0x6B3E, 0x704C, 0x742F, 0x74D8, 0x7BA1, /* 0x40 */
@@ -2701,9 +2701,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E2[] =
     0x639B, 0x7F6B, 0x4E56, 0x5080, 0x584A, 0x58DE, 0x602A, 0x6127, /* 0x60 */
     0x62D0, 0x69D0, 0x9B41, 0x5B8F, 0x7D18, 0x80B1, 0x8F5F, 0x4EA4, /* 0x60 */
     0x50D1, 0x54AC, 0x55AC, 0x5B0C, 0x5DA0, 0x5DE7, 0x652A, 0x654E, /* 0x70 */
-    0x6821, 0x6A4B, 0x72E1, 0x768E, 0x77EF, 0x7D5E, 0x7FF9,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x6821, 0x6A4B, 0x72E1, 0x768E, 0x77EF, 0x7D5E, 0x7FF9, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x81A0, 0x854E, 0x86DF, 0x8F03, 0x8F4E, 0x90CA, 0x9903, /* 0x90 */
     0x9A55, 0x9BAB, 0x4E18, 0x4E45, 0x4E5D, 0x4EC7, 0x4FF1, 0x5177, /* 0x90 */
     0x52FE, 0x5340, 0x53E3, 0x53E5, 0x548E, 0x5614, 0x5775, 0x57A2, /* 0xA0 */
@@ -2717,15 +2717,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E2[] =
     0x5BAE, 0x5F13, 0x7A79, 0x7AAE, 0x828E, 0x8EAC, 0x5026, 0x5238, /* 0xE0 */
     0x52F8, 0x5377, 0x5708, 0x62F3, 0x6372, 0x6B0A, 0x6DC3, 0x7737, /* 0xE0 */
     0x53A5, 0x7357, 0x8568, 0x8E76, 0x95D5, 0x673A, 0x6AC3, 0x6F70, /* 0xF0 */
-    0x8A6D, 0x8ECC, 0x994B, 0xF906, 0x6677, 0x6B78, 0x8CB4          /* 0xF0 */
+    0x8A6D, 0x8ECC, 0x994B, 0xF906, 0x6677, 0x6B78, 0x8CB4			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9B3C, 0xF907, 0x53EB, 0x572D, 0x594E, 0x63C6, 0x69FB, /* 0x30 */
     0x73EA, 0x7845, 0x7ABA, 0x7AC5, 0x7CFE, 0x8475, 0x898F, 0x8D73, /* 0x30 */
     0x9035, 0x95A8, 0x52FB, 0x5747, 0x7547, 0x7B60, 0x83CC, 0x921E, /* 0x40 */
@@ -2735,9 +2735,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E3[] =
     0xF909, 0x4ECA, 0x5997, 0x64D2, 0x6611, 0x6A8E, 0x7434, 0x7981, /* 0x60 */
     0x79BD, 0x82A9, 0x887E, 0x887F, 0x895F, 0xF90A, 0x9326, 0x4F0B, /* 0x60 */
     0x53CA, 0x6025, 0x6271, 0x6C72, 0x7D1A, 0x7D66, 0x4E98, 0x5162, /* 0x70 */
-    0x77DC, 0x80AF, 0x4F01, 0x4F0E, 0x5176, 0x5180, 0x55DC,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x77DC, 0x80AF, 0x4F01, 0x4F0E, 0x5176, 0x5180, 0x55DC, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x5668, 0x573B, 0x57FA, 0x57FC, 0x5914, 0x5947, 0x5993, /* 0x90 */
     0x5BC4, 0x5C90, 0x5D0E, 0x5DF1, 0x5E7E, 0x5FCC, 0x6280, 0x65D7, /* 0x90 */
     0x65E3, 0x671E, 0x671F, 0x675E, 0x68CB, 0x68C4, 0x6A5F, 0x6B3A, /* 0xA0 */
@@ -2751,15 +2751,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E3[] =
     0xF913, 0x90A3, 0xF914, 0xF915, 0xF916, 0xF917, 0xF918, 0x8AFE, /* 0xE0 */
     0xF919, 0xF91A, 0xF91B, 0xF91C, 0x6696, 0xF91D, 0x7156, 0xF91E, /* 0xE0 */
     0xF91F, 0x96E3, 0xF920, 0x634F, 0x637A, 0x5357, 0xF921, 0x678F, /* 0xF0 */
-    0x6960, 0x6E73, 0xF922, 0x7537, 0xF923, 0xF924, 0xF925          /* 0xF0 */
+    0x6960, 0x6E73, 0xF922, 0x7537, 0xF923, 0xF924, 0xF925			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7D0D, 0xF926, 0xF927, 0x8872, 0x56CA, 0x5A18, 0xF928, /* 0x30 */
     0xF929, 0xF92A, 0xF92B, 0xF92C, 0x4E43, 0xF92D, 0x5167, 0x5948, /* 0x30 */
     0x67F0, 0x8010, 0xF92E, 0x5973, 0x5E74, 0x649A, 0x79CA, 0x5FF5, /* 0x40 */
@@ -2769,9 +2769,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E4[] =
     0xF93C, 0xF93D, 0xF93E, 0xF93F, 0xF940, 0xF941, 0xF942, 0xF943, /* 0x60 */
     0x6FC3, 0xF944, 0xF945, 0x81BF, 0x8FB2, 0x60F1, 0xF946, 0xF947, /* 0x60 */
     0x8166, 0xF948, 0xF949, 0x5C3F, 0xF94A, 0xF94B, 0xF94C, 0xF94D, /* 0x70 */
-    0xF94E, 0xF94F, 0xF950, 0xF951, 0x5AE9, 0x8A25, 0x677B,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0xF94E, 0xF94F, 0xF950, 0xF951, 0x5AE9, 0x8A25, 0x677B, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x7D10, 0xF952, 0xF953, 0xF954, 0xF955, 0xF956, 0xF957, /* 0x90 */
     0x80FD, 0xF958, 0xF959, 0x5C3C, 0x6CE5, 0x533F, 0x6EBA, 0x591A, /* 0x90 */
     0x8336, 0x4E39, 0x4EB6, 0x4F46, 0x55AE, 0x5718, 0x58C7, 0x5F56, /* 0xA0 */
@@ -2785,15 +2785,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E4[] =
     0x5CB1, 0x5E36, 0x5F85, 0x6234, 0x64E1, 0x73B3, 0x81FA, 0x888B, /* 0xE0 */
     0x8CB8, 0x968A, 0x9EDB, 0x5B85, 0x5FB7, 0x60B3, 0x5012, 0x5200, /* 0xE0 */
     0x5230, 0x5716, 0x5835, 0x5857, 0x5C0E, 0x5C60, 0x5CF6, 0x5D8B, /* 0xF0 */
-    0x5EA6, 0x5F92, 0x60BC, 0x6311, 0x6389, 0x6417, 0x6843          /* 0xF0 */
+    0x5EA6, 0x5F92, 0x60BC, 0x6311, 0x6389, 0x6417, 0x6843			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x68F9, 0x6AC2, 0x6DD8, 0x6E21, 0x6ED4, 0x6FE4, 0x71FE, /* 0x30 */
     0x76DC, 0x7779, 0x79B1, 0x7A3B, 0x8404, 0x89A9, 0x8CED, 0x8DF3, /* 0x30 */
     0x8E48, 0x9003, 0x9014, 0x9053, 0x90FD, 0x934D, 0x9676, 0x97DC, /* 0x40 */
@@ -2803,9 +2803,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E5[] =
     0x51CD, 0x52D5, 0x540C, 0x61A7, 0x6771, 0x6850, 0x68DF, 0x6D1E, /* 0x60 */
     0x6F7C, 0x75BC, 0x77B3, 0x7AE5, 0x80F4, 0x8463, 0x9285, 0x515C, /* 0x60 */
     0x6597, 0x675C, 0x6793, 0x75D8, 0x7AC7, 0x8373, 0xF95A, 0x8C46, /* 0x70 */
-    0x9017, 0x982D, 0x5C6F, 0x81C0, 0x829A, 0x9041, 0x906F,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x9017, 0x982D, 0x5C6F, 0x81C0, 0x829A, 0x9041, 0x906F, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x920D, 0x5F97, 0x5D9D, 0x6A59, 0x71C8, 0x767B, 0x7B49, /* 0x90 */
     0x85E4, 0x8B04, 0x9127, 0x9A30, 0x5587, 0x61F6, 0xF95B, 0x7669, /* 0x90 */
     0x7F85, 0x863F, 0x87BA, 0x88F8, 0x908F, 0xF95C, 0x6D1B, 0x70D9, /* 0xA0 */
@@ -2819,15 +2819,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E5[] =
     0x8F1B, 0x91CF, 0x4FB6, 0x5137, 0x52F5, 0x5442, 0x5EEC, 0x616E, /* 0xE0 */
     0x623E, 0x65C5, 0x6ADA, 0x6FFE, 0x792A, 0x85DC, 0x8823, 0x95AD, /* 0xE0 */
     0x9A62, 0x9A6A, 0x9E97, 0x9ECE, 0x529B, 0x66C6, 0x6B77, 0x701D, /* 0xF0 */
-    0x792B, 0x8F62, 0x9742, 0x6190, 0x6200, 0x6523, 0x6F23          /* 0xF0 */
+    0x792B, 0x8F62, 0x9742, 0x6190, 0x6200, 0x6523, 0x6F23			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7149, 0x7489, 0x7DF4, 0x806F, 0x84EE, 0x8F26, 0x9023, /* 0x30 */
     0x934A, 0x51BD, 0x5217, 0x52A3, 0x6D0C, 0x70C8, 0x88C2, 0x5EC9, /* 0x30 */
     0x6582, 0x6BAE, 0x6FC2, 0x7C3E, 0x7375, 0x4EE4, 0x4F36, 0x56F9, /* 0x40 */
@@ -2837,9 +2837,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E6[] =
     0x6AD3, 0x6F5E, 0x7018, 0x7210, 0x76E7, 0x8001, 0x8606, 0x865C, /* 0x60 */
     0x8DEF, 0x8F05, 0x9732, 0x9B6F, 0x9DFA, 0x9E75, 0x788C, 0x797F, /* 0x60 */
     0x7DA0, 0x83C9, 0x9304, 0x9E7F, 0x9E93, 0x8AD6, 0x58DF, 0x5F04, /* 0x70 */
-    0x6727, 0x7027, 0x74CF, 0x7C60, 0x807E, 0x5121, 0x7028,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x6727, 0x7027, 0x74CF, 0x7C60, 0x807E, 0x5121, 0x7028, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x7262, 0x78CA, 0x8CC2, 0x8CDA, 0x8CF4, 0x96F7, 0x4E86, /* 0x90 */
     0x50DA, 0x5BEE, 0x5ED6, 0x6599, 0x71CE, 0x7642, 0x77AD, 0x804A, /* 0x90 */
     0x84FC, 0x907C, 0x9B27, 0x9F8D, 0x58D8, 0x5A41, 0x5C62, 0x6A13, /* 0xA0 */
@@ -2853,15 +2853,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E6[] =
     0x7281, 0x72F8, 0x7406, 0x7483, 0xF962, 0x75E2, 0x7C6C, 0x7F79, /* 0xE0 */
     0x7FB8, 0x8389, 0x88CF, 0x88E1, 0x91CC, 0x91D0, 0x96E2, 0x9BC9, /* 0xE0 */
     0x541D, 0x6F7E, 0x71D0, 0x7498, 0x85FA, 0x8EAA, 0x96A3, 0x9C57, /* 0xF0 */
-    0x9E9F, 0x6797, 0x6DCB, 0x7433, 0x81E8, 0x9716, 0x782C          /* 0xF0 */
+    0x9E9F, 0x6797, 0x6DCB, 0x7433, 0x81E8, 0x9716, 0x782C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7ACB, 0x7B20, 0x7C92, 0x6469, 0x746A, 0x75F2, 0x78BC, /* 0x30 */
     0x78E8, 0x99AC, 0x9B54, 0x9EBB, 0x5BDE, 0x5E55, 0x6F20, 0x819C, /* 0x30 */
     0x83AB, 0x9088, 0x4E07, 0x534D, 0x5A29, 0x5DD2, 0x5F4E, 0x6162, /* 0x40 */
@@ -2871,9 +2871,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E7[] =
     0x671B, 0x7DB2, 0x7F54, 0x8292, 0x832B, 0x83BD, 0x8F1E, 0x9099, /* 0x60 */
     0x57CB, 0x59B9, 0x5A92, 0x5BD0, 0x6627, 0x679A, 0x6885, 0x6BCF, /* 0x60 */
     0x7164, 0x7F75, 0x8CB7, 0x8CE3, 0x9081, 0x9B45, 0x8108, 0x8C8A, /* 0x70 */
-    0x964C, 0x9A40, 0x9EA5, 0x5B5F, 0x6C13, 0x731B, 0x76F2,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x964C, 0x9A40, 0x9EA5, 0x5B5F, 0x6C13, 0x731B, 0x76F2, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x76DF, 0x840C, 0x51AA, 0x8993, 0x514D, 0x5195, 0x52C9, /* 0x90 */
     0x68C9, 0x6C94, 0x7704, 0x7720, 0x7DBF, 0x7DEC, 0x9762, 0x9EB5, /* 0x90 */
     0x6EC5, 0x8511, 0x51A5, 0x540D, 0x547D, 0x660E, 0x669D, 0x6927, /* 0xA0 */
@@ -2887,15 +2887,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E7[] =
     0x82D7, 0x9328, 0x52D9, 0x5DEB, 0x61AE, 0x61CB, 0x620A, 0x62C7, /* 0xE0 */
     0x64AB, 0x65E0, 0x6959, 0x6B66, 0x6BCB, 0x7121, 0x73F7, 0x755D, /* 0xE0 */
     0x7E46, 0x821E, 0x8302, 0x856A, 0x8AA3, 0x8CBF, 0x9727, 0x9D61, /* 0xF0 */
-    0x58A8, 0x9ED8, 0x5011, 0x520E, 0x543B, 0x554F, 0x6587          /* 0xF0 */
+    0x58A8, 0x9ED8, 0x5011, 0x520E, 0x543B, 0x554F, 0x6587			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6C76, 0x7D0A, 0x7D0B, 0x805E, 0x868A, 0x9580, 0x96EF, /* 0x30 */
     0x52FF, 0x6C95, 0x7269, 0x5473, 0x5A9A, 0x5C3E, 0x5D4B, 0x5F4C, /* 0x30 */
     0x5FAE, 0x672A, 0x68B6, 0x6963, 0x6E3C, 0x6E44, 0x7709, 0x7C73, /* 0x40 */
@@ -2905,9 +2905,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E8[] =
     0x62CD, 0x640F, 0x64B2, 0x6734, 0x6A38, 0x6CCA, 0x73C0, 0x749E, /* 0x60 */
     0x7B94, 0x7C95, 0x7E1B, 0x818A, 0x8236, 0x8584, 0x8FEB, 0x96F9, /* 0x60 */
     0x99C1, 0x4F34, 0x534A, 0x53CD, 0x53DB, 0x62CC, 0x642C, 0x6500, /* 0x70 */
-    0x6591, 0x69C3, 0x6CEE, 0x6F58, 0x73ED, 0x7554, 0x7622,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x6591, 0x69C3, 0x6CEE, 0x6F58, 0x73ED, 0x7554, 0x7622, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x76E4, 0x76FC, 0x78D0, 0x78FB, 0x792C, 0x7D46, 0x822C, /* 0x90 */
     0x87E0, 0x8FD4, 0x9812, 0x98EF, 0x52C3, 0x62D4, 0x64A5, 0x6E24, /* 0x90 */
     0x6F51, 0x767C, 0x8DCB, 0x91B1, 0x9262, 0x9AEE, 0x9B43, 0x5023, /* 0xA0 */
@@ -2921,15 +2921,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E8[] =
     0x6A0A, 0x7169, 0x71D4, 0x756A, 0xF964, 0x7E41, 0x8543, 0x85E9, /* 0xE0 */
     0x98DC, 0x4F10, 0x7B4F, 0x7F70, 0x95A5, 0x51E1, 0x5E06, 0x68B5, /* 0xE0 */
     0x6C3E, 0x6C4E, 0x6CDB, 0x72AF, 0x7BC4, 0x8303, 0x6CD5, 0x743A, /* 0xF0 */
-    0x50FB, 0x5288, 0x58C1, 0x64D8, 0x6A97, 0x74A7, 0x7656          /* 0xF0 */
+    0x50FB, 0x5288, 0x58C1, 0x64D8, 0x6A97, 0x74A7, 0x7656			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x78A7, 0x8617, 0x95E2, 0x9739, 0xF965, 0x535E, 0x5F01, /* 0x30 */
     0x8B8A, 0x8FA8, 0x8FAF, 0x908A, 0x5225, 0x77A5, 0x9C49, 0x9F08, /* 0x30 */
     0x4E19, 0x5002, 0x5175, 0x5C5B, 0x5E77, 0x661E, 0x663A, 0x67C4, /* 0x40 */
@@ -2939,9 +2939,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E9[] =
     0x8F14, 0x4F0F, 0x50D5, 0x5310, 0x535C, 0x5B93, 0x5FA9, 0x670D, /* 0x60 */
     0x798F, 0x8179, 0x832F, 0x8514, 0x8907, 0x8986, 0x8F39, 0x8F3B, /* 0x60 */
     0x99A5, 0x9C12, 0x672C, 0x4E76, 0x4FF8, 0x5949, 0x5C01, 0x5CEF, /* 0x70 */
-    0x5CF0, 0x6367, 0x68D2, 0x70FD, 0x71A2, 0x742B, 0x7E2B,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x5CF0, 0x6367, 0x68D2, 0x70FD, 0x71A2, 0x742B, 0x7E2B, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x84EC, 0x8702, 0x9022, 0x92D2, 0x9CF3, 0x4E0D, 0x4ED8, /* 0x90 */
     0x4FEF, 0x5085, 0x5256, 0x526F, 0x5426, 0x5490, 0x57E0, 0x592B, /* 0x90 */
     0x5A66, 0x5B5A, 0x5B75, 0x5BCC, 0x5E9C, 0xF966, 0x6276, 0x6577, /* 0xA0 */
@@ -2955,15 +2955,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_E9[] =
     0x4E15, 0x5099, 0x5315, 0x532A, 0x5351, 0x5983, 0x5A62, 0x5E87, /* 0xE0 */
     0x60B2, 0x618A, 0x6249, 0x6279, 0x6590, 0x6787, 0x69A7, 0x6BD4, /* 0xE0 */
     0x6BD6, 0x6BD7, 0x6BD8, 0x6CB8, 0xF968, 0x7435, 0x75FA, 0x7812, /* 0xF0 */
-    0x7891, 0x79D5, 0x79D8, 0x7C83, 0x7DCB, 0x7FE1, 0x80A5          /* 0xF0 */
+    0x7891, 0x79D5, 0x79D8, 0x7C83, 0x7DCB, 0x7FE1, 0x80A5			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_EA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x813E, 0x81C2, 0x83F2, 0x871A, 0x88E8, 0x8AB9, 0x8B6C, /* 0x30 */
     0x8CBB, 0x9119, 0x975E, 0x98DB, 0x9F3B, 0x56AC, 0x5B2A, 0x5F6C, /* 0x30 */
     0x658C, 0x6AB3, 0x6BAF, 0x6D5C, 0x6FF1, 0x7015, 0x725D, 0x73AD, /* 0x40 */
@@ -2973,9 +2973,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_EA[] =
     0x5BEB, 0x5BFA, 0x5C04, 0x5DF3, 0x5E2B, 0x5F99, 0x601D, 0x6368, /* 0x60 */
     0x659C, 0x65AF, 0x67F6, 0x67FB, 0x68AD, 0x6B7B, 0x6C99, 0x6CD7, /* 0x60 */
     0x6E23, 0x7009, 0x7345, 0x7802, 0x793E, 0x7940, 0x7960, 0x79C1, /* 0x70 */
-    0x7BE9, 0x7D17, 0x7D72, 0x8086, 0x820D, 0x838E, 0x84D1,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x7BE9, 0x7D17, 0x7D72, 0x8086, 0x820D, 0x838E, 0x84D1, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x86C7, 0x88DF, 0x8A50, 0x8A5E, 0x8B1D, 0x8CDC, 0x8D66, /* 0x90 */
     0x8FAD, 0x90AA, 0x98FC, 0x99DF, 0x9E9D, 0x524A, 0xF969, 0x6714, /* 0x90 */
     0xF96A, 0x5098, 0x522A, 0x5C71, 0x6563, 0x6C55, 0x73CA, 0x7523, /* 0xA0 */
@@ -2989,15 +2989,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_EA[] =
     0x55C7, 0xF96C, 0x7A61, 0x7D22, 0x8272, 0x7272, 0x751F, 0x7525, /* 0xE0 */
     0xF96D, 0x7B19, 0x5885, 0x58FB, 0x5DBC, 0x5E8F, 0x5EB6, 0x5F90, /* 0xE0 */
     0x6055, 0x6292, 0x637F, 0x654D, 0x6691, 0x66D9, 0x66F8, 0x6816, /* 0xF0 */
-    0x68F2, 0x7280, 0x745E, 0x7B6E, 0x7D6E, 0x7DD6, 0x7F72          /* 0xF0 */
+    0x68F2, 0x7280, 0x745E, 0x7B6E, 0x7D6E, 0x7DD6, 0x7F72			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_EB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x80E5, 0x8212, 0x85AF, 0x897F, 0x8A93, 0x901D, 0x92E4, /* 0x30 */
     0x9ECD, 0x9F20, 0x5915, 0x596D, 0x5E2D, 0x60DC, 0x6614, 0x6673, /* 0x30 */
     0x6790, 0x6C50, 0x6DC5, 0x6F5F, 0x77F3, 0x78A9, 0x84C6, 0x91CB, /* 0x40 */
@@ -3007,9 +3007,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_EB[] =
     0x861A, 0x87EC, 0x8A75, 0x8DE3, 0x9078, 0x9291, 0x9425, 0x994D, /* 0x60 */
     0x9BAE, 0x5368, 0x5C51, 0x6954, 0x6CC4, 0x6D29, 0x6E2B, 0x820C, /* 0x60 */
     0x859B, 0x893B, 0x8A2D, 0x8AAA, 0x96EA, 0x9F67, 0x5261, 0x66B9, /* 0x70 */
-    0x6BB2, 0x7E96, 0x87FE, 0x8D0D, 0x9583, 0x965D, 0x651D,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x6BB2, 0x7E96, 0x87FE, 0x8D0D, 0x9583, 0x965D, 0x651D, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x6D89, 0x71EE, 0xF96E, 0x57CE, 0x59D3, 0x5BAC, 0x6027, /* 0x90 */
     0x60FA, 0x6210, 0x661F, 0x665F, 0x7329, 0x73F9, 0x76DB, 0x7701, /* 0x90 */
     0x7B6C, 0x8056, 0x8072, 0x8165, 0x8AA0, 0x9192, 0x4E16, 0x52E2, /* 0xA0 */
@@ -3023,15 +3023,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_EB[] =
     0x84C0, 0x905C, 0x98E1, 0x7387, 0x5B8B, 0x609A, 0x677E, 0x6DDE, /* 0xE0 */
     0x8A1F, 0x8AA6, 0x9001, 0x980C, 0x5237, 0xF970, 0x7051, 0x788E, /* 0xE0 */
     0x9396, 0x8870, 0x91D7, 0x4FEE, 0x53D7, 0x55FD, 0x56DA, 0x5782, /* 0xF0 */
-    0x58FD, 0x5AC2, 0x5B88, 0x5CAB, 0x5CC0, 0x5E25, 0x6101          /* 0xF0 */
+    0x58FD, 0x5AC2, 0x5B88, 0x5CAB, 0x5CC0, 0x5E25, 0x6101			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_EC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x620D, 0x624B, 0x6388, 0x641C, 0x6536, 0x6578, 0x6A39, /* 0x30 */
     0x6B8A, 0x6C34, 0x6D19, 0x6F31, 0x71E7, 0x72E9, 0x7378, 0x7407, /* 0x30 */
     0x74B2, 0x7626, 0x7761, 0x79C0, 0x7A57, 0x7AEA, 0x7CB9, 0x7D8F, /* 0x40 */
@@ -3041,9 +3041,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_EC[] =
     0x9AD3, 0x9B1A, 0x53D4, 0x587E, 0x5919, 0x5B70, 0x5BBF, 0x6DD1, /* 0x60 */
     0x6F5A, 0x719F, 0x7421, 0x74B9, 0x8085, 0x83FD, 0x5DE1, 0x5F87, /* 0x60 */
     0x5FAA, 0x6042, 0x65EC, 0x6812, 0x696F, 0x6A53, 0x6B89, 0x6D35, /* 0x70 */
-    0x6DF3, 0x73E3, 0x76FE, 0x77AC, 0x7B4D, 0x7D14, 0x8123,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x6DF3, 0x73E3, 0x76FE, 0x77AC, 0x7B4D, 0x7D14, 0x8123, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x821C, 0x8340, 0x84F4, 0x8563, 0x8A62, 0x8AC4, 0x9187, /* 0x90 */
     0x931E, 0x9806, 0x99B4, 0x620C, 0x8853, 0x8FF0, 0x9265, 0x5D07, /* 0x90 */
     0x5D27, 0x5D69, 0x745F, 0x819D, 0x8768, 0x6FD5, 0x62FE, 0x7FD2, /* 0xA0 */
@@ -3057,15 +3057,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_EC[] =
     0x4F81, 0x4FE1, 0x547B, 0x5A20, 0x5BB8, 0x613C, 0x65B0, 0x6668, /* 0xE0 */
     0x71FC, 0x7533, 0x795E, 0x7D33, 0x814E, 0x81E3, 0x8398, 0x85AA, /* 0xE0 */
     0x85CE, 0x8703, 0x8A0A, 0x8EAB, 0x8F9B, 0xF971, 0x8FC5, 0x5931, /* 0xF0 */
-    0x5BA4, 0x5BE6, 0x6089, 0x5BE9, 0x5C0B, 0x5FC3, 0x6C81          /* 0xF0 */
+    0x5BA4, 0x5BE6, 0x6089, 0x5BE9, 0x5C0B, 0x5FC3, 0x6C81			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_ED[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xF972, 0x6DF1, 0x700B, 0x751A, 0x82AF, 0x8AF6, 0x4EC0, /* 0x30 */
     0x5341, 0xF973, 0x96D9, 0x6C0F, 0x4E9E, 0x4FC4, 0x5152, 0x555E, /* 0x30 */
     0x5A25, 0x5CE8, 0x6211, 0x7259, 0x82BD, 0x83AA, 0x86FE, 0x8859, /* 0x40 */
@@ -3075,9 +3075,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_ED[] =
     0x6848, 0x773C, 0x96C1, 0x978D, 0x9854, 0x9B9F, 0x65A1, 0x8B01, /* 0x60 */
     0x8ECB, 0x95BC, 0x5535, 0x5CA9, 0x5DD6, 0x5EB5, 0x6697, 0x764C, /* 0x60 */
     0x83F4, 0x95C7, 0x58D3, 0x62BC, 0x72CE, 0x9D28, 0x4EF0, 0x592E, /* 0x70 */
-    0x600F, 0x663B, 0x6B83, 0x79E7, 0x9D26, 0x5393, 0x54C0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x600F, 0x663B, 0x6B83, 0x79E7, 0x9D26, 0x5393, 0x54C0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x57C3, 0x5D16, 0x611B, 0x66D6, 0x6DAF, 0x788D, 0x827E, /* 0x90 */
     0x9698, 0x9744, 0x5384, 0x627C, 0x6396, 0x6DB2, 0x7E0A, 0x814B, /* 0x90 */
     0x984D, 0x6AFB, 0x7F4C, 0x9DAF, 0x9E1A, 0x4E5F, 0x503B, 0x51B6, /* 0xA0 */
@@ -3091,15 +3091,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_ED[] =
     0x9B5A, 0x9F6C, 0x5104, 0x61B6, 0x6291, 0x6A8D, 0x81C6, 0x5043, /* 0xE0 */
     0x5830, 0x5F66, 0x7109, 0x8A00, 0x8AFA, 0x5B7C, 0x8616, 0x4FFA, /* 0xE0 */
     0x513C, 0x56B4, 0x5944, 0x63A9, 0x6DF9, 0x5DAA, 0x696D, 0x5186, /* 0xF0 */
-    0x4E88, 0x4F59, 0xF97F, 0xF980, 0xF981, 0x5982, 0xF982          /* 0xF0 */
+    0x4E88, 0x4F59, 0xF97F, 0xF980, 0xF981, 0x5982, 0xF982			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_EE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xF983, 0x6B5F, 0x6C5D, 0xF984, 0x74B5, 0x7916, 0xF985, /* 0x30 */
     0x8207, 0x8245, 0x8339, 0x8F3F, 0x8F5D, 0xF986, 0x9918, 0xF987, /* 0x30 */
     0xF988, 0xF989, 0x4EA6, 0xF98A, 0x57DF, 0x5F79, 0x6613, 0xF98B, /* 0x40 */
@@ -3109,9 +3109,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_EE[] =
     0x6DF5, 0x6F14, 0xF992, 0x70DF, 0x7136, 0x7159, 0xF993, 0x71C3, /* 0x60 */
     0x71D5, 0xF994, 0x784F, 0x786F, 0xF995, 0x7B75, 0x7DE3, 0xF996, /* 0x60 */
     0x7E2F, 0xF997, 0x884D, 0x8EDF, 0xF998, 0xF999, 0xF99A, 0x925B, /* 0x70 */
-    0xF99B, 0x9CF6, 0xF99C, 0xF99D, 0xF99E, 0x6085, 0x6D85,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0xF99B, 0x9CF6, 0xF99C, 0xF99D, 0xF99E, 0x6085, 0x6D85, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0xF99F, 0x71B1, 0xF9A0, 0xF9A1, 0x95B1, 0x53AD, 0xF9A2, /* 0x90 */
     0xF9A3, 0xF9A4, 0x67D3, 0xF9A5, 0x708E, 0x7130, 0x7430, 0x8276, /* 0x90 */
     0x82D2, 0xF9A6, 0x95BB, 0x9AE5, 0x9E7D, 0x66C4, 0xF9A7, 0x71C1, /* 0xA0 */
@@ -3125,15 +3125,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_EE[] =
     0x88D4, 0x8A63, 0x8B7D, 0x8C6B, 0xF9B7, 0x92B3, 0xF9B8, 0x9713, /* 0xE0 */
     0x9810, 0x4E94, 0x4F0D, 0x4FC9, 0x50B2, 0x5348, 0x543E, 0x5433, /* 0xE0 */
     0x55DA, 0x5862, 0x58BA, 0x5967, 0x5A1B, 0x5BE4, 0x609F, 0xF9B9, /* 0xF0 */
-    0x61CA, 0x6556, 0x65FF, 0x6664, 0x68A7, 0x6C5A, 0x6FB3          /* 0xF0 */
+    0x61CA, 0x6556, 0x65FF, 0x6664, 0x68A7, 0x6C5A, 0x6FB3			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_EF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x70CF, 0x71AC, 0x7352, 0x7B7D, 0x8708, 0x8AA4, 0x9C32, /* 0x30 */
     0x9F07, 0x5C4B, 0x6C83, 0x7344, 0x7389, 0x923A, 0x6EAB, 0x7465, /* 0x30 */
     0x761F, 0x7A69, 0x7E15, 0x860A, 0x5140, 0x58C5, 0x64C1, 0x74EE, /* 0x40 */
@@ -3143,9 +3143,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_EF[] =
     0x7DE9, 0x7FEB, 0x8118, 0x8155, 0x839E, 0x8C4C, 0x962E, 0x9811, /* 0x60 */
     0x66F0, 0x5F80, 0x65FA, 0x6789, 0x6C6A, 0x738B, 0x502D, 0x5A03, /* 0x60 */
     0x6B6A, 0x77EE, 0x5916, 0x5D6C, 0x5DCD, 0x7325, 0x754F, 0xF9BA, /* 0x70 */
-    0xF9BB, 0x50E5, 0x51F9, 0x582F, 0x592D, 0x5996, 0x59DA,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0xF9BB, 0x50E5, 0x51F9, 0x582F, 0x592D, 0x5996, 0x59DA, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x5BE5, 0xF9BC, 0xF9BD, 0x5DA2, 0x62D7, 0x6416, 0x6493, /* 0x90 */
     0x64FE, 0xF9BE, 0x66DC, 0xF9BF, 0x6A48, 0xF9C0, 0x71FF, 0x7464, /* 0x90 */
     0xF9C1, 0x7A88, 0x7AAF, 0x7E47, 0x7E5E, 0x8000, 0x8170, 0xF9C2, /* 0xA0 */
@@ -3159,15 +3159,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_EF[] =
     0x79B9, 0x7D06, 0x7FBD, 0x828B, 0x85D5, 0x865E, 0x8FC2, 0x9047, /* 0xE0 */
     0x90F5, 0x91EA, 0x9685, 0x96E8, 0x96E9, 0x52D6, 0x5F67, 0x65ED, /* 0xE0 */
     0x6631, 0x682F, 0x715C, 0x7A36, 0x90C1, 0x980A, 0x4E91, 0xF9C5, /* 0xF0 */
-    0x6A52, 0x6B9E, 0x6F90, 0x7189, 0x8018, 0x82B8, 0x8553          /* 0xF0 */
+    0x6A52, 0x6B9E, 0x6F90, 0x7189, 0x8018, 0x82B8, 0x8553			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x904B, 0x9695, 0x96F2, 0x97FB, 0x851A, 0x9B31, 0x4E90, /* 0x30 */
     0x718A, 0x96C4, 0x5143, 0x539F, 0x54E1, 0x5713, 0x5712, 0x57A3, /* 0x30 */
     0x5A9B, 0x5AC4, 0x5BC3, 0x6028, 0x613F, 0x63F4, 0x6C85, 0x6D39, /* 0x40 */
@@ -3177,9 +3177,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F0[] =
     0x6170, 0x6690, 0x6E2D, 0x7232, 0x744B, 0x7DEF, 0x80C3, 0x840E, /* 0x60 */
     0x8466, 0x853F, 0x875F, 0x885B, 0x8918, 0x8B02, 0x9055, 0x97CB, /* 0x60 */
     0x9B4F, 0x4E73, 0x4F91, 0x5112, 0x516A, 0xF9C7, 0x552F, 0x55A9, /* 0x70 */
-    0x5B7A, 0x5BA5, 0x5E7C, 0x5E7D, 0x5EBE, 0x60A0, 0x60DF,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x5B7A, 0x5BA5, 0x5E7C, 0x5E7D, 0x5EBE, 0x60A0, 0x60DF, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x6108, 0x6109, 0x63C4, 0x6538, 0x6709, 0xF9C8, 0x67D4, /* 0x90 */
     0x67DA, 0xF9C9, 0x6961, 0x6962, 0x6CB9, 0x6D27, 0xF9CA, 0x6E38, /* 0x90 */
     0xF9CB, 0x6FE1, 0x7336, 0x7337, 0xF9CC, 0x745C, 0x7531, 0xF9CD, /* 0xA0 */
@@ -3193,15 +3193,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F0[] =
     0x4E59, 0x541F, 0x6DEB, 0x852D, 0x9670, 0x97F3, 0x98EE, 0x63D6, /* 0xE0 */
     0x6CE3, 0x9091, 0x51DD, 0x61C9, 0x81BA, 0x9DF9, 0x4F9D, 0x501A, /* 0xE0 */
     0x5100, 0x5B9C, 0x610F, 0x61FF, 0x64EC, 0x6905, 0x6BC5, 0x7591, /* 0xF0 */
-    0x77E3, 0x7FA9, 0x8264, 0x858F, 0x87FB, 0x8863, 0x8ABC          /* 0xF0 */
+    0x77E3, 0x7FA9, 0x8264, 0x858F, 0x87FB, 0x8863, 0x8ABC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8B70, 0x91AB, 0x4E8C, 0x4EE5, 0x4F0A, 0xF9DD, 0xF9DE, /* 0x30 */
     0x5937, 0x59E8, 0xF9DF, 0x5DF2, 0x5F1B, 0x5F5B, 0x6021, 0xF9E0, /* 0x30 */
     0xF9E1, 0xF9E2, 0xF9E3, 0x723E, 0x73E5, 0xF9E4, 0x7570, 0x75CD, /* 0x40 */
@@ -3211,9 +3211,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F1[] =
     0x8B1A, 0x4EBA, 0x4EC1, 0x5203, 0x5370, 0xF9ED, 0x54BD, 0x56E0, /* 0x60 */
     0x59FB, 0x5BC5, 0x5F15, 0x5FCD, 0x6E6E, 0xF9EE, 0xF9EF, 0x7D6A, /* 0x60 */
     0x8335, 0xF9F0, 0x8693, 0x8A8D, 0xF9F1, 0x976D, 0x9777, 0xF9F2, /* 0x70 */
-    0xF9F3, 0x4E00, 0x4F5A, 0x4F7E, 0x58F9, 0x65E5, 0x6EA2,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0xF9F3, 0x4E00, 0x4F5A, 0x4F7E, 0x58F9, 0x65E5, 0x6EA2, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x9038, 0x93B0, 0x99B9, 0x4EFB, 0x58EC, 0x598A, 0x59D9, /* 0x90 */
     0x6041, 0xF9F4, 0xF9F5, 0x7A14, 0xF9F6, 0x834F, 0x8CC3, 0x5165, /* 0x90 */
     0x5344, 0xF9F7, 0xF9F8, 0xF9F9, 0x4ECD, 0x5269, 0x5B55, 0x82BF, /* 0xA0 */
@@ -3227,15 +3227,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F1[] =
     0x58EF, 0x596C, 0x5C07, 0x5E33, 0x5E84, 0x5F35, 0x638C, 0x66B2, /* 0xE0 */
     0x6756, 0x6A1F, 0x6AA3, 0x6B0C, 0x6F3F, 0x7246, 0xF9FA, 0x7350, /* 0xE0 */
     0x748B, 0x7AE0, 0x7CA7, 0x8178, 0x81DF, 0x81E7, 0x838A, 0x846C, /* 0xF0 */
-    0x8523, 0x8594, 0x85CF, 0x88DD, 0x8D13, 0x91AC, 0x9577          /* 0xF0 */
+    0x8523, 0x8594, 0x85CF, 0x88DD, 0x8D13, 0x91AC, 0x9577			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x969C, 0x518D, 0x54C9, 0x5728, 0x5BB0, 0x624D, 0x6750, /* 0x30 */
     0x683D, 0x6893, 0x6E3D, 0x6ED3, 0x707D, 0x7E21, 0x88C1, 0x8CA1, /* 0x30 */
     0x8F09, 0x9F4B, 0x9F4E, 0x722D, 0x7B8F, 0x8ACD, 0x931A, 0x4F47, /* 0x40 */
@@ -3245,9 +3245,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F2[] =
     0x90B8, 0x96CE, 0x9F5F, 0x52E3, 0x540A, 0x5AE1, 0x5BC2, 0x6458, /* 0x60 */
     0x6575, 0x6EF4, 0x72C4, 0xF9FB, 0x7684, 0x7A4D, 0x7B1B, 0x7C4D, /* 0x60 */
     0x7E3E, 0x7FDF, 0x837B, 0x8B2B, 0x8CCA, 0x8D64, 0x8DE1, 0x8E5F, /* 0x70 */
-    0x8FEA, 0x8FF9, 0x9069, 0x93D1, 0x4F43, 0x4F7A, 0x50B3,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x8FEA, 0x8FF9, 0x9069, 0x93D1, 0x4F43, 0x4F7A, 0x50B3, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x5168, 0x5178, 0x524D, 0x526A, 0x5861, 0x587C, 0x5960, /* 0x90 */
     0x5C08, 0x5C55, 0x5EDB, 0x609B, 0x6230, 0x6813, 0x6BBF, 0x6C08, /* 0x90 */
     0x6FB1, 0x714E, 0x7420, 0x7530, 0x7538, 0x7551, 0x7672, 0x7B4C, /* 0xA0 */
@@ -3261,15 +3261,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F2[] =
     0x6A89, 0x6B63, 0x6C40, 0x6DC0, 0x6DE8, 0x6E1F, 0x6E5E, 0x701E, /* 0xE0 */
     0x70A1, 0x738E, 0x73FD, 0x753A, 0x775B, 0x7887, 0x798E, 0x7A0B, /* 0xE0 */
     0x7A7D, 0x7CBE, 0x7D8E, 0x8247, 0x8A02, 0x8AEA, 0x8C9E, 0x912D, /* 0xF0 */
-    0x914A, 0x91D8, 0x9266, 0x92CC, 0x9320, 0x9706, 0x9756          /* 0xF0 */
+    0x914A, 0x91D8, 0x9266, 0x92CC, 0x9320, 0x9706, 0x9756			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x975C, 0x9802, 0x9F0E, 0x5236, 0x5291, 0x557C, 0x5824, /* 0x30 */
     0x5E1D, 0x5F1F, 0x608C, 0x63D0, 0x68AF, 0x6FDF, 0x796D, 0x7B2C, /* 0x30 */
     0x81CD, 0x85BA, 0x88FD, 0x8AF8, 0x8E44, 0x918D, 0x9664, 0x969B, /* 0x40 */
@@ -3279,9 +3279,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F3[] =
     0x722A, 0x74AA, 0x773A, 0x7956, 0x795A, 0x79DF, 0x7A20, 0x7A95, /* 0x60 */
     0x7C97, 0x7CDF, 0x7D44, 0x7E70, 0x8087, 0x85FB, 0x86A4, 0x8A54, /* 0x60 */
     0x8ABF, 0x8D99, 0x8E81, 0x9020, 0x906D, 0x91E3, 0x963B, 0x96D5, /* 0x70 */
-    0x9CE5, 0x65CF, 0x7C07, 0x8DB3, 0x93C3, 0x5B58, 0x5C0A,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x9CE5, 0x65CF, 0x7C07, 0x8DB3, 0x93C3, 0x5B58, 0x5C0A, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x5352, 0x62D9, 0x731D, 0x5027, 0x5B97, 0x5F9E, 0x60B0, /* 0x90 */
     0x616B, 0x68D5, 0x6DD9, 0x742E, 0x7A2E, 0x7D42, 0x7D9C, 0x7E31, /* 0x90 */
     0x816B, 0x8E2A, 0x8E35, 0x937E, 0x9418, 0x4F50, 0x5750, 0x5DE6, /* 0xA0 */
@@ -3295,15 +3295,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F3[] =
     0x710C, 0x756F, 0x7AE3, 0x8822, 0x9021, 0x9075, 0x96CB, 0x99FF, /* 0xE0 */
     0x8301, 0x4E2D, 0x4EF2, 0x8846, 0x91CD, 0x537D, 0x6ADB, 0x696B, /* 0xE0 */
     0x6C41, 0x847A, 0x589E, 0x618E, 0x66FE, 0x62EF, 0x70DD, 0x7511, /* 0xF0 */
-    0x75C7, 0x7E52, 0x84B8, 0x8B49, 0x8D08, 0x4E4B, 0x53EA          /* 0xF0 */
+    0x75C7, 0x7E52, 0x84B8, 0x8B49, 0x8D08, 0x4E4B, 0x53EA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x54AB, 0x5730, 0x5740, 0x5FD7, 0x6301, 0x6307, 0x646F, /* 0x30 */
     0x652F, 0x65E8, 0x667A, 0x679D, 0x67B3, 0x6B62, 0x6C60, 0x6C9A, /* 0x30 */
     0x6F2C, 0x77E5, 0x7825, 0x7949, 0x7957, 0x7D19, 0x80A2, 0x8102, /* 0x40 */
@@ -3313,9 +3313,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F4[] =
     0x6D25, 0x6EB1, 0x73CD, 0x7468, 0x74A1, 0x755B, 0x75B9, 0x76E1, /* 0x60 */
     0x771E, 0x778B, 0x79E6, 0x7E09, 0x7E1D, 0x81FB, 0x852F, 0x8897, /* 0x60 */
     0x8A3A, 0x8CD1, 0x8EEB, 0x8FB0, 0x9032, 0x93AD, 0x9663, 0x9673, /* 0x70 */
-    0x9707, 0x4F84, 0x53F1, 0x59EA, 0x5AC9, 0x5E19, 0x684E,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x9707, 0x4F84, 0x53F1, 0x59EA, 0x5AC9, 0x5E19, 0x684E, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x74C6, 0x75BE, 0x79E9, 0x7A92, 0x81A3, 0x86ED, 0x8CEA, /* 0x90 */
     0x8DCC, 0x8FED, 0x659F, 0x6715, 0xF9FD, 0x57F7, 0x6F57, 0x7DDD, /* 0x90 */
     0x8F2F, 0x93F6, 0x96C6, 0x5FB5, 0x61F2, 0x6F84, 0x4E14, 0x4F98, /* 0xA0 */
@@ -3329,15 +3329,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F4[] =
     0x5F70, 0x6134, 0x655E, 0x660C, 0x6636, 0x66A2, 0x69CD, 0x6EC4, /* 0xE0 */
     0x6F32, 0x7316, 0x7621, 0x7A93, 0x8139, 0x8259, 0x83D6, 0x84BC, /* 0xE0 */
     0x50B5, 0x57F0, 0x5BC0, 0x5BE8, 0x5F69, 0x63A1, 0x7826, 0x7DB5, /* 0xF0 */
-    0x83DC, 0x8521, 0x91C7, 0x91F5, 0x518A, 0x67F5, 0x7B56          /* 0xF0 */
+    0x83DC, 0x8521, 0x91C7, 0x91F5, 0x518A, 0x67F5, 0x7B56			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8CAC, 0x51C4, 0x59BB, 0x60BD, 0x8655, 0x501C, 0xF9FF, /* 0x30 */
     0x5254, 0x5C3A, 0x617D, 0x621A, 0x62D3, 0x64F2, 0x65A5, 0x6ECC, /* 0x30 */
     0x7620, 0x810A, 0x8E60, 0x965F, 0x96BB, 0x4EDF, 0x5343, 0x5598, /* 0x40 */
@@ -3347,9 +3347,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F5[] =
     0x8F4D, 0x9435, 0x50C9, 0x5C16, 0x6CBE, 0x6DFB, 0x751B, 0x77BB, /* 0x60 */
     0x7C3D, 0x7C64, 0x8A79, 0x8AC2, 0x581E, 0x59BE, 0x5E16, 0x6377, /* 0x60 */
     0x7252, 0x758A, 0x776B, 0x8ADC, 0x8CBC, 0x8F12, 0x5EF3, 0x6674, /* 0x70 */
-    0x6DF8, 0x807D, 0x83C1, 0x8ACB, 0x9751, 0x9BD6, 0xFA00,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x6DF8, 0x807D, 0x83C1, 0x8ACB, 0x9751, 0x9BD6, 0xFA00, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x5243, 0x66FF, 0x6D95, 0x6EEF, 0x7DE0, 0x8AE6, 0x902E, /* 0x90 */
     0x905E, 0x9AD4, 0x521D, 0x527F, 0x54E8, 0x6194, 0x6284, 0x62DB, /* 0x90 */
     0x68A2, 0x6912, 0x695A, 0x6A35, 0x7092, 0x7126, 0x785D, 0x7901, /* 0xA0 */
@@ -3363,15 +3363,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F5[] =
     0x939A, 0x96DB, 0x9A36, 0x9C0D, 0x4E11, 0x755C, 0x795D, 0x7AFA, /* 0xE0 */
     0x7B51, 0x7BC9, 0x7E2E, 0x84C4, 0x8E59, 0x8E74, 0x8EF8, 0x9010, /* 0xE0 */
     0x6625, 0x693F, 0x7443, 0x51FA, 0x672E, 0x9EDC, 0x5145, 0x5FE0, /* 0xF0 */
-    0x6C96, 0x87F2, 0x885D, 0x8877, 0x60B4, 0x81B5, 0x8403          /* 0xF0 */
+    0x6C96, 0x87F2, 0x885D, 0x8877, 0x60B4, 0x81B5, 0x8403			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8D05, 0x53D6, 0x5439, 0x5634, 0x5A36, 0x5C31, 0x708A, /* 0x30 */
     0x7FE0, 0x805A, 0x8106, 0x81ED, 0x8DA3, 0x9189, 0x9A5F, 0x9DF2, /* 0x30 */
     0x5074, 0x4EC4, 0x53A0, 0x60FB, 0x6E2C, 0x5C64, 0x4F88, 0x5024, /* 0x40 */
@@ -3381,9 +3381,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F6[] =
     0x98ED, 0x89AA, 0x4E03, 0x67D2, 0x6F06, 0x4FB5, 0x5BE2, 0x6795, /* 0x60 */
     0x6C88, 0x6D78, 0x741B, 0x7827, 0x91DD, 0x937C, 0x87C4, 0x79E4, /* 0x60 */
     0x7A31, 0x5FEB, 0x4ED6, 0x54A4, 0x553E, 0x58AE, 0x59A5, 0x60F0, /* 0x70 */
-    0x6253, 0x62D6, 0x6736, 0x6955, 0x8235, 0x9640, 0x99B1,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x6253, 0x62D6, 0x6736, 0x6955, 0x8235, 0x9640, 0x99B1, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x99DD, 0x502C, 0x5353, 0x5544, 0x577C, 0xFA01, 0x6258, /* 0x90 */
     0xFA02, 0x64E2, 0x666B, 0x67DD, 0x6FC1, 0x6FEF, 0x7422, 0x7438, /* 0x90 */
     0x8A17, 0x9438, 0x5451, 0x5606, 0x5766, 0x5F48, 0x619A, 0x6B4E, /* 0xA0 */
@@ -3397,15 +3397,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F6[] =
     0x59AC, 0x6295, 0x900F, 0x9B2A, 0x615D, 0x7279, 0x95D6, 0x5761, /* 0xE0 */
     0x5A46, 0x5DF4, 0x628A, 0x64AD, 0x64FA, 0x6777, 0x6CE2, 0x6D3E, /* 0xE0 */
     0x722C, 0x7436, 0x7834, 0x7F77, 0x82AD, 0x8DDB, 0x9817, 0x5224, /* 0xF0 */
-    0x5742, 0x677F, 0x7248, 0x74E3, 0x8CA9, 0x8FA6, 0x9211          /* 0xF0 */
+    0x5742, 0x677F, 0x7248, 0x74E3, 0x8CA9, 0x8FA6, 0x9211			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x962A, 0x516B, 0x53ED, 0x634C, 0x4F69, 0x5504, 0x6096, /* 0x30 */
     0x6557, 0x6C9B, 0x6D7F, 0x724C, 0x72FD, 0x7A17, 0x8987, 0x8C9D, /* 0x30 */
     0x5F6D, 0x6F8E, 0x70F9, 0x81A8, 0x610E, 0x4FBF, 0x504F, 0x6241, /* 0x40 */
@@ -3415,9 +3415,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F7[] =
     0x5305, 0x530D, 0x530F, 0x5486, 0x54FA, 0x5703, 0x5E03, 0x6016, /* 0x60 */
     0x629B, 0x62B1, 0x6355, 0xFA06, 0x6CE1, 0x6D66, 0x75B1, 0x7832, /* 0x60 */
     0x80DE, 0x812F, 0x82DE, 0x8461, 0x84B2, 0x888D, 0x8912, 0x900B, /* 0x70 */
-    0x92EA, 0x98FD, 0x9B91, 0x5E45, 0x66B4, 0x66DD, 0x7011,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x92EA, 0x98FD, 0x9B91, 0x5E45, 0x66B4, 0x66DD, 0x7011, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x7206, 0xFA07, 0x4FF5, 0x527D, 0x5F6A, 0x6153, 0x6753, /* 0x90 */
     0x6A19, 0x6F02, 0x74E2, 0x7968, 0x8868, 0x8C79, 0x98C7, 0x98C4, /* 0x90 */
     0x9A43, 0x54C1, 0x7A1F, 0x6953, 0x8AF7, 0x8C4A, 0x98A8, 0x99AE, /* 0xA0 */
@@ -3431,15 +3431,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F7[] =
     0x54B8, 0x5563, 0x558A, 0x6ABB, 0x6DB5, 0x7DD8, 0x8266, 0x929C, /* 0xE0 */
     0x9677, 0x9E79, 0x5408, 0x54C8, 0x76D2, 0x86E4, 0x95A4, 0x95D4, /* 0xE0 */
     0x965C, 0x4EA2, 0x4F09, 0x59EE, 0x5AE6, 0x5DF7, 0x6052, 0x6297, /* 0xF0 */
-    0x676D, 0x6841, 0x6C86, 0x6E2F, 0x7F38, 0x809B, 0x822A          /* 0xF0 */
+    0x676D, 0x6841, 0x6C86, 0x6E2F, 0x7F38, 0x809B, 0x822A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xFA08, 0xFA09, 0x9805, 0x4EA5, 0x5055, 0x54B3, 0x5793, /* 0x30 */
     0x595A, 0x5B69, 0x5BB3, 0x61C8, 0x6977, 0x6D77, 0x7023, 0x87F9, /* 0x30 */
     0x89E3, 0x8A72, 0x8AE7, 0x9082, 0x99ED, 0x9AB8, 0x52BE, 0x6838, /* 0x40 */
@@ -3449,9 +3449,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F8[] =
     0x9A57, 0x5955, 0x7200, 0x8D6B, 0x9769, 0x4FD4, 0x5CF4, 0x5F26, /* 0x60 */
     0x61F8, 0x665B, 0x6CEB, 0x70AB, 0x7384, 0x73B9, 0x73FE, 0x7729, /* 0x60 */
     0x774D, 0x7D43, 0x7D62, 0x7E23, 0x8237, 0x8852, 0xFA0A, 0x8CE2, /* 0x70 */
-    0x9249, 0x986F, 0x5B51, 0x7A74, 0x8840, 0x9801, 0x5ACC,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x9249, 0x986F, 0x5B51, 0x7A74, 0x8840, 0x9801, 0x5ACC, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x4FE0, 0x5354, 0x593E, 0x5CFD, 0x633E, 0x6D79, 0x72F9, /* 0x90 */
     0x8105, 0x8107, 0x83A2, 0x92CF, 0x9830, 0x4EA8, 0x5144, 0x5211, /* 0x90 */
     0x578B, 0x5F62, 0x6CC2, 0x6ECE, 0x7005, 0x7050, 0x70AF, 0x7192, /* 0xA0 */
@@ -3465,15 +3465,15 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F8[] =
     0x93AC, 0x9800, 0x9865, 0x60D1, 0x6216, 0x9177, 0x5A5A, 0x660F, /* 0xE0 */
     0x6DF7, 0x6E3E, 0x743F, 0x9B42, 0x5FFD, 0x60DA, 0x7B0F, 0x54C4, /* 0xE0 */
     0x5F18, 0x6C5E, 0x6CD3, 0x6D2A, 0x70D8, 0x7D05, 0x8679, 0x8A0C, /* 0xF0 */
-    0x9D3B, 0x5316, 0x548C, 0x5B05, 0x6A3A, 0x706B, 0x7575          /* 0xF0 */
+    0x9D3B, 0x5316, 0x548C, 0x5B05, 0x6A3A, 0x706B, 0x7575			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x798D, 0x79BE, 0x82B1, 0x83EF, 0x8A71, 0x8B41, 0x8CA8, /* 0x30 */
     0x9774, 0xFA0B, 0x64F4, 0x652B, 0x78BA, 0x78BB, 0x7A6B, 0x4E38, /* 0x30 */
     0x559A, 0x5950, 0x5BA6, 0x5E7B, 0x60A3, 0x63DB, 0x6B61, 0x6665, /* 0x40 */
@@ -3483,9 +3483,9 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F9[] =
     0x6E5F, 0x6EC9, 0x6F62, 0x714C, 0x749C, 0x7687, 0x7BC1, 0x7C27, /* 0x60 */
     0x8352, 0x8757, 0x9051, 0x968D, 0x9EC3, 0x532F, 0x56DE, 0x5EFB, /* 0x60 */
     0x5F8A, 0x6062, 0x6094, 0x61F7, 0x6666, 0x6703, 0x6A9C, 0x6DEE, /* 0x70 */
-    0x6FAE, 0x7070, 0x736A, 0x7E6A, 0x81BE, 0x8334, 0x86D4,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0x6FAE, 0x7070, 0x736A, 0x7E6A, 0x81BE, 0x8334, 0x86D4, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
          0, 0x8AA8, 0x8CC4, 0x5283, 0x7372, 0x5B96, 0x6A6B, 0x9404, /* 0x90 */
     0x54EE, 0x5686, 0x5B5D, 0x6548, 0x6585, 0x66C9, 0x689F, 0x6D8D, /* 0x90 */
     0x6DC6, 0x723B, 0x80B4, 0x9175, 0x9A4D, 0x4FAF, 0x5019, 0x539A, /* 0xA0 */
@@ -3499,5 +3499,5 @@ static sal_uInt16 const aImplDBCSToUniTab_JOHAB_F9[] =
     0x7D07, 0x8A16, 0x6B20, 0x6B3D, 0x6B46, 0x5438, 0x6070, 0x6D3D, /* 0xE0 */
     0x7FD5, 0x8208, 0x50D6, 0x51DE, 0x559C, 0x566B, 0x56CD, 0x59EC, /* 0xE0 */
     0x5B09, 0x5E0C, 0x6199, 0x6198, 0x6231, 0x665E, 0x66E6, 0x7199, /* 0xF0 */
-    0x71B9, 0x71BA, 0x72A7, 0x79A7, 0x7A00, 0x7FB2, 0x8A70          /* 0xF0 */
+    0x71B9, 0x71BA, 0x72A7, 0x79A7, 0x7A00, 0x7FB2, 0x8A70			/* 0xF0 */
 };
diff --git a/sal/textenc/tcvtkr5.tab b/sal/textenc/tcvtkr5.tab
index edd0810fa194..377dda22ee93 100644
--- a/sal/textenc/tcvtkr5.tab
+++ b/sal/textenc/tcvtkr5.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,8 +35,8 @@
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_00[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, /* 0x00 */
     0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, /* 0x00 */
     0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, /* 0x10 */
@@ -53,79 +53,79 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_00[] =
     0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, /* 0x60 */
     0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, /* 0x70 */
     0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xD9AE,      0,      0, 0xD9B4,      0,      0, 0xD967, /* 0xA0 */
-    0xD937,      0, 0xDCA3,      0,      0, 0xD939,      0,      0, /* 0xA0 */
-    0xD956, 0xD94E, 0xDD99, 0xDD9A, 0xD9A5,      0, 0xD9D2, 0xD934, /* 0xB0 */
-    0xD9AC, 0xDD98, 0xDCAC,      0, 0xDCF9, 0xDCF6, 0xDCFA, 0xD9AF, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xDCA1,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xDCA2,      0,      0,      0,      0,      0,      0, 0xD94F, /* 0xD0 */
-    0xDCAA,      0,      0,      0,      0,      0, 0xDCAD, 0xDD3C, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xDD31,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xDD33,      0,      0,      0,      0,      0,      0, 0xD950, /* 0xF0 */
-    0xDD3A,      0,      0,      0,      0,      0, 0xDD3D          /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xD9AE, 	 0, 	 0, 0xD9B4, 	 0, 	 0, 0xD967, /* 0xA0 */
+    0xD937, 	 0, 0xDCA3, 	 0, 	 0, 0xD939, 	 0, 	 0, /* 0xA0 */
+    0xD956, 0xD94E, 0xDD99, 0xDD9A, 0xD9A5, 	 0, 0xD9D2, 0xD934, /* 0xB0 */
+    0xD9AC, 0xDD98, 0xDCAC, 	 0, 0xDCF9, 0xDCF6, 0xDCFA, 0xD9AF, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDCA1, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xDCA2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD94F, /* 0xD0 */
+    0xDCAA, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDCAD, 0xDD3C, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDD31, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xDD33, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD950, /* 0xF0 */
+    0xDD3A, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDD3D			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_01[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xDD32,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xDCA4, 0xDD34, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xDD35, 0xDCA6, 0xDD36,      0,      0,      0,      0, /* 0x30 */
-    0xDD37,      0,      0,      0,      0,      0,      0, 0xDCA8, /* 0x30 */
-    0xDD38, 0xDCA9, 0xDD39,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xDD40, 0xDCAF, 0xDD3F,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xDCAB, 0xDD3B,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xDCAE, 0xDD3E  /* 0x60 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xDD32, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDCA4, 0xDD34, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xDD35, 0xDCA6, 0xDD36, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xDD37, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDCA8, /* 0x30 */
+    0xDD38, 0xDCA9, 0xDD39, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xDD40, 0xDCAF, 0xDD3F, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xDCAB, 0xDD3B, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDCAE, 0xDD3E	/* 0x60 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_02[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xD9A7, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xD9B0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xD9A8, 0xD9AB, 0xD9AA, 0xD9AD,      0, 0xD9A9                  /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xD9B0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xD9A8, 0xD9AB, 0xD9AA, 0xD9AD, 	 0, 0xD9A9					/* 0xD0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_03[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xDB51, 0xDB52, 0xDB53, 0xDB54, 0xDB55, 0xDB56, 0xDB57, /* 0x90 */
     0xDB58, 0xDB59, 0xDB5A, 0xDB5B, 0xDB5C, 0xDB5D, 0xDB5E, 0xDB5F, /* 0x90 */
-    0xDB60, 0xDB61,      0, 0xDB62, 0xDB63, 0xDB64, 0xDB65, 0xDB66, /* 0xA0 */
-    0xDB67, 0xDB68,      0,      0,      0,      0,      0,      0, /* 0xA0 */
+    0xDB60, 0xDB61, 	 0, 0xDB62, 0xDB63, 0xDB64, 0xDB65, 0xDB66, /* 0xA0 */
+    0xDB67, 0xDB68, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
          0, 0xDB71, 0xDB72, 0xDB73, 0xDB74, 0xDB75, 0xDB76, 0xDB77, /* 0xB0 */
     0xDB78, 0xDB79, 0xDB7A, 0xDB7B, 0xDB7C, 0xDB7D, 0xDB7E, 0xDB91, /* 0xB0 */
-    0xDB92, 0xDB93,      0, 0xDB94, 0xDB95, 0xDB96, 0xDB97, 0xDB98, /* 0xC0 */
-    0xDB99, 0xDB9A                                                  /* 0xC0 */
+    0xDB92, 0xDB93, 	 0, 0xDB94, 0xDB95, 0xDB96, 0xDB97, 0xDB98, /* 0xC0 */
+    0xDB99, 0xDB9A													/* 0xC0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_04[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xDEA7,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xDEA7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
     0xDEA1, 0xDEA2, 0xDEA3, 0xDEA4, 0xDEA5, 0xDEA6, 0xDEA8, 0xDEA9, /* 0x10 */
     0xDEAA, 0xDEAB, 0xDEAC, 0xDEAD, 0xDEAE, 0xDEAF, 0xDEB0, 0xDEB1, /* 0x10 */
     0xDEB2, 0xDEB3, 0xDEB4, 0xDEB5, 0xDEB6, 0xDEB7, 0xDEB8, 0xDEB9, /* 0x20 */
@@ -134,144 +134,144 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_04[] =
     0xDEDA, 0xDEDB, 0xDEDC, 0xDEDD, 0xDEDE, 0xDEDF, 0xDEE0, 0xDEE1, /* 0x30 */
     0xDEE2, 0xDEE3, 0xDEE4, 0xDEE5, 0xDEE6, 0xDEE7, 0xDEE8, 0xDEE9, /* 0x40 */
     0xDEEA, 0xDEEB, 0xDEEC, 0xDEED, 0xDEEE, 0xDEEF, 0xDEF0, 0xDEF1, /* 0x40 */
-         0, 0xDED7                                                  /* 0x50 */
+         0, 0xDED7													/* 0x50 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_20[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xD93A,      0,      0, /* 0x10 */
-    0xD93E, 0xD93F,      0,      0, 0xD940, 0xD941,      0,      0, /* 0x10 */
-    0xD9D3, 0xD9D4,      0,      0,      0, 0xD935, 0xD936,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xD9B6,      0, 0xD957, 0xD958,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xD968,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xDD9B,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xDD9C, /* 0x70 */
-         0, 0xDD9D, 0xDD9E, 0xDD9F, 0xDDA0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0x005C                                                  /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xD93A, 	 0, 	 0, /* 0x10 */
+    0xD93E, 0xD93F, 	 0, 	 0, 0xD940, 0xD941, 	 0, 	 0, /* 0x10 */
+    0xD9D3, 0xD9D4, 	 0, 	 0, 	 0, 0xD935, 0xD936, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xD9B6, 	 0, 0xD957, 0xD958, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xD968, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xDD9B, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDD9C, /* 0x70 */
+         0, 0xDD9D, 0xDD9E, 0xDD9F, 0xDDA0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0x005C													/* 0xA0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_21[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xD959,      0,      0,      0,      0, /* 0x00 */
-         0, 0xD9B5,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0xDC34,      0,      0, 0xD9E0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xD9E5, 0xD9E2,      0,      0,      0, 0xDC69,      0, /* 0x20 */
-         0,      0,      0, 0xD95A,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xDCF7, 0xDCF8,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xDCFB, 0xDCFC, 0xDCFD, 0xDCFE,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xD959, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xD9B5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xDC34, 	 0, 	 0, 0xD9E0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xD9E5, 0xD9E2, 	 0, 	 0, 	 0, 0xDC69, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xD95A, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xDCF7, 0xDCF8, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xDCFB, 0xDCFC, 0xDCFD, 0xDCFE, 	 0, /* 0x50 */
     0xDB40, 0xDB41, 0xDB42, 0xDB43, 0xDB44, 0xDB45, 0xDB46, 0xDB47, /* 0x60 */
-    0xDB48, 0xDB49,      0,      0,      0,      0,      0,      0, /* 0x60 */
+    0xDB48, 0xDB49, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
     0xDB31, 0xDB32, 0xDB33, 0xDB34, 0xDB35, 0xDB36, 0xDB37, 0xDB38, /* 0x70 */
-    0xDB39, 0xDB3A,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+    0xDB39, 0xDB3A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
     0xD977, 0xD978, 0xD976, 0xD979, 0xD97A, 0xD9D5, 0xD9D8, 0xD9D6, /* 0x90 */
-    0xD9D9, 0xD9D7,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xD9A1,      0, 0xD9A2                          /* 0xD0 */
+    0xD9D9, 0xD9D7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xD9A1, 	 0, 0xD9A2							/* 0xD0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_22[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD9A3,      0, 0xD963, 0xD9A4,      0,      0,      0, 0xD964, /* 0x00 */
-    0xD996,      0,      0, 0xD997,      0,      0,      0, 0xD9B3, /* 0x00 */
-         0, 0xD9B2,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0xD97E,      0,      0, 0xD992, 0xD954,      0, /* 0x10 */
-    0xD960,      0,      0,      0,      0, 0xD93B,      0, 0xD99E, /* 0x20 */
-    0xD99F, 0xD99D, 0xD99C, 0xD994, 0xD995,      0, 0xD9B1,      0, /* 0x20 */
-         0,      0,      0,      0, 0xD955, 0xD993,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xD93D, 0xD991,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xD966,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xD951, 0xD965,      0,      0, 0xD952, 0xD953,      0,      0, /* 0x60 */
-         0,      0, 0xD97C, 0xD97D,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xD99A, 0xD99B,      0,      0, 0xD998, 0xD999, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xD9C1,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xD961                  /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD9A3, 	 0, 0xD963, 0xD9A4, 	 0, 	 0, 	 0, 0xD964, /* 0x00 */
+    0xD996, 	 0, 	 0, 0xD997, 	 0, 	 0, 	 0, 0xD9B3, /* 0x00 */
+         0, 0xD9B2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xD97E, 	 0, 	 0, 0xD992, 0xD954, 	 0, /* 0x10 */
+    0xD960, 	 0, 	 0, 	 0, 	 0, 0xD93B, 	 0, 0xD99E, /* 0x20 */
+    0xD99F, 0xD99D, 0xD99C, 0xD994, 0xD995, 	 0, 0xD9B1, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xD955, 0xD993, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xD93D, 0xD991, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xD966, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xD951, 0xD965, 	 0, 	 0, 0xD952, 0xD953, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xD97C, 0xD97D, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xD99A, 0xD99B, 	 0, 	 0, 0xD998, 0xD999, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xD9C1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD961					/* 0xA0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_23[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xD962                                          /* 0x10 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xD962											/* 0x10 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_24[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xDCE7, 0xDCE8, 0xDCE9, 0xDCEA, 0xDCEB, 0xDCEC, 0xDCED, 0xDCEE, /* 0x60 */
-    0xDCEF, 0xDCF0, 0xDCF1, 0xDCF2, 0xDCF3, 0xDCF4, 0xDCF5,      0, /* 0x60 */
-         0,      0,      0,      0, 0xDD77, 0xDD78, 0xDD79, 0xDD7A, /* 0x70 */
+    0xDCEF, 0xDCF0, 0xDCF1, 0xDCF2, 0xDCF3, 0xDCF4, 0xDCF5, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xDD77, 0xDD78, 0xDD79, 0xDD7A, /* 0x70 */
     0xDD7B, 0xDD7C, 0xDD7D, 0xDD7E, 0xDD91, 0xDD92, 0xDD93, 0xDD94, /* 0x70 */
-    0xDD95, 0xDD96, 0xDD97,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xDD5D, 0xDD5E, 0xDD5F, 0xDD60, /* 0x90 */
+    0xDD95, 0xDD96, 0xDD97, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xDD5D, 0xDD5E, 0xDD5F, 0xDD60, /* 0x90 */
     0xDD61, 0xDD62, 0xDD63, 0xDD64, 0xDD65, 0xDD66, 0xDD67, 0xDD68, /* 0xA0 */
     0xDD69, 0xDD6A, 0xDD6B, 0xDD6C, 0xDD6D, 0xDD6E, 0xDD6F, 0xDD70, /* 0xA0 */
-    0xDD71, 0xDD72, 0xDD73, 0xDD74, 0xDD75, 0xDD76,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
+    0xDD71, 0xDD72, 0xDD73, 0xDD74, 0xDD75, 0xDD76, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
     0xDCCD, 0xDCCE, 0xDCCF, 0xDCD0, 0xDCD1, 0xDCD2, 0xDCD3, 0xDCD4, /* 0xD0 */
     0xDCD5, 0xDCD6, 0xDCD7, 0xDCD8, 0xDCD9, 0xDCDA, 0xDCDB, 0xDCDC, /* 0xD0 */
     0xDCDD, 0xDCDE, 0xDCDF, 0xDCE0, 0xDCE1, 0xDCE2, 0xDCE3, 0xDCE4, /* 0xE0 */
-    0xDCE5, 0xDCE6                                                  /* 0xE0 */
+    0xDCE5, 0xDCE6													/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_25[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xDBA1, 0xDBAC, 0xDBA2, 0xDBAD,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0xDBA3, 0xDBC8, 0xDBC7, 0xDBAE, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xDBA1, 0xDBAC, 0xDBA2, 0xDBAD, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xDBA3, 0xDBC8, 0xDBC7, 0xDBAE, /* 0x00 */
     0xDBA4, 0xDBC2, 0xDBC1, 0xDBAF, 0xDBA6, 0xDBC6, 0xDBC5, 0xDBB1, /* 0x10 */
     0xDBA5, 0xDBC4, 0xDBC3, 0xDBB0, 0xDBA7, 0xDBBC, 0xDBC9, 0xDBCA, /* 0x10 */
     0xDBB7, 0xDBCB, 0xDBCC, 0xDBB2, 0xDBA9, 0xDBBE, 0xDBCD, 0xDBCE, /* 0x20 */
@@ -279,62 +279,62 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_25[] =
     0xDBBD, 0xDBD3, 0xDBD4, 0xDBB3, 0xDBAA, 0xDBD5, 0xDBD6, 0xDBBA, /* 0x30 */
     0xDBBF, 0xDBD7, 0xDBD8, 0xDBB5, 0xDBAB, 0xDBD9, 0xDBDA, 0xDBBB, /* 0x30 */
     0xDBDB, 0xDBDC, 0xDBC0, 0xDBDD, 0xDBDE, 0xDBDF, 0xDBE0, 0xDBE1, /* 0x40 */
-    0xDBE2, 0xDBE3, 0xDBE4, 0xDBB6,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xD9C6,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xD971, 0xD970,      0, 0xD9C3, 0xD9C7, 0xD9C8, 0xD9CB, 0xD9CA, /* 0xA0 */
-    0xD9C9, 0xD9CC,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xD973, 0xD972,      0,      0, 0xD9BA, 0xD9B9, /* 0xB0 */
-         0,      0,      0,      0, 0xD975, 0xD974,      0,      0, /* 0xB0 */
-    0xD9B8, 0xD9B7,      0,      0,      0,      0, 0xD96F, 0xD96E, /* 0xC0 */
-    0xD9C2,      0,      0, 0xD96B,      0,      0, 0xD96D, 0xD96C, /* 0xC0 */
-    0xD9C4, 0xD9C5                                                  /* 0xD0 */
+    0xDBE2, 0xDBE3, 0xDBE4, 0xDBB6, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xD9C6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xD971, 0xD970, 	 0, 0xD9C3, 0xD9C7, 0xD9C8, 0xD9CB, 0xD9CA, /* 0xA0 */
+    0xD9C9, 0xD9CC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xD973, 0xD972, 	 0, 	 0, 0xD9BA, 0xD9B9, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xD975, 0xD974, 	 0, 	 0, /* 0xB0 */
+    0xD9B8, 0xD9B7, 	 0, 	 0, 	 0, 	 0, 0xD96F, 0xD96E, /* 0xC0 */
+    0xD9C2, 	 0, 	 0, 0xD96B, 	 0, 	 0, 0xD96D, 0xD96C, /* 0xC0 */
+    0xD9C4, 0xD9C5													/* 0xD0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_26[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xD96A, 0xD969,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xD9CF, 0xD9CE, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0xD9D0,      0, 0xD9D1,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xD95F,      0, 0xD95E,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xD9BC, 0xD9BD,      0, 0xD9C0, 0xD9BB, 0xD9BE,      0, 0xD9BF, /* 0x60 */
-    0xD9CD, 0xD9DB, 0xD9DC,      0, 0xD9DD, 0xD9DA                  /* 0x60 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xD96A, 0xD969, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD9CF, 0xD9CE, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xD9D0, 	 0, 0xD9D1, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xD95F, 	 0, 0xD95E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xD9BC, 0xD9BD, 	 0, 0xD9C0, 0xD9BB, 0xD9BE, 	 0, 0xD9BF, /* 0x60 */
+    0xD9CD, 0xD9DB, 0xD9DC, 	 0, 0xD9DD, 0xD9DA					/* 0x60 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_30[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD931, 0xD932, 0xD933, 0xD938,      0,      0,      0,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD931, 0xD932, 0xD933, 0xD938, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
     0xD944, 0xD945, 0xD946, 0xD947, 0xD948, 0xD949, 0xD94A, 0xD94B, /* 0x00 */
-    0xD94C, 0xD94D,      0, 0xD97B, 0xD942, 0xD943,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
+    0xD94C, 0xD94D, 	 0, 0xD97B, 0xD942, 0xD943, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
          0, 0xDDA1, 0xDDA2, 0xDDA3, 0xDDA4, 0xDDA5, 0xDDA6, 0xDDA7, /* 0x40 */
     0xDDA8, 0xDDA9, 0xDDAA, 0xDDAB, 0xDDAC, 0xDDAD, 0xDDAE, 0xDDAF, /* 0x40 */
     0xDDB0, 0xDDB1, 0xDDB2, 0xDDB3, 0xDDB4, 0xDDB5, 0xDDB6, 0xDDB7, /* 0x50 */
@@ -345,8 +345,8 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_30[] =
     0xDDD8, 0xDDD9, 0xDDDA, 0xDDDB, 0xDDDC, 0xDDDD, 0xDDDE, 0xDDDF, /* 0x70 */
     0xDDE0, 0xDDE1, 0xDDE2, 0xDDE3, 0xDDE4, 0xDDE5, 0xDDE6, 0xDDE7, /* 0x80 */
     0xDDE8, 0xDDE9, 0xDDEA, 0xDDEB, 0xDDEC, 0xDDED, 0xDDEE, 0xDDEF, /* 0x80 */
-    0xDDF0, 0xDDF1, 0xDDF2, 0xDDF3,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0xDDF0, 0xDDF1, 0xDDF2, 0xDDF3, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0xDE31, 0xDE32, 0xDE33, 0xDE34, 0xDE35, 0xDE36, 0xDE37, /* 0xA0 */
     0xDE38, 0xDE39, 0xDE3A, 0xDE3B, 0xDE3C, 0xDE3D, 0xDE3E, 0xDE3F, /* 0xA0 */
     0xDE40, 0xDE41, 0xDE42, 0xDE43, 0xDE44, 0xDE45, 0xDE46, 0xDE47, /* 0xB0 */
@@ -357,15 +357,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_30[] =
     0xDE68, 0xDE69, 0xDE6A, 0xDE6B, 0xDE6C, 0xDE6D, 0xDE6E, 0xDE6F, /* 0xD0 */
     0xDE70, 0xDE71, 0xDE72, 0xDE73, 0xDE74, 0xDE75, 0xDE76, 0xDE77, /* 0xE0 */
     0xDE78, 0xDE79, 0xDE7A, 0xDE7B, 0xDE7C, 0xDE7D, 0xDE7E, 0xDE91, /* 0xE0 */
-    0xDE92, 0xDE93, 0xDE94, 0xDE95, 0xDE96, 0xDE97, 0xDE98          /* 0xF0 */
+    0xDE92, 0xDE93, 0xDE94, 0xDE95, 0xDE96, 0xDE97, 0xDE98			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_31[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8841, 0x8C41, 0x8444, 0x9041, 0x8446, 0x8447, 0x9441, /* 0x30 */
     0x9841, 0x9C41, 0x844A, 0x844B, 0x844C, 0x844D, 0x844E, 0x844F, /* 0x30 */
     0x8450, 0xA041, 0xA441, 0xA841, 0x8454, 0xAC41, 0xB041, 0xB441, /* 0x40 */
@@ -377,40 +377,40 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_31[] =
     0xDAE0, 0xDAE1, 0xDAE2, 0xDAE3, 0xDAE4, 0xDAE5, 0xDAE6, 0xDAE7, /* 0x70 */
     0xDAE8, 0xDAE9, 0xDAEA, 0xDAEB, 0xDAEC, 0xDAED, 0xDAEE, 0xDAEF, /* 0x70 */
     0xDAF0, 0xDAF1, 0xDAF2, 0xDAF3, 0xDAF4, 0xDAF5, 0xDAF6, 0xDAF7, /* 0x80 */
-    0xDAF8, 0xDAF9, 0xDAFA, 0xDAFB, 0xDAFC, 0xDAFD, 0xDAFE          /* 0x80 */
+    0xDAF8, 0xDAF9, 0xDAFA, 0xDAFB, 0xDAFC, 0xDAFD, 0xDAFE			/* 0x80 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_32[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xDD41, 0xDD42, 0xDD43, 0xDD44, 0xDD45, 0xDD46, 0xDD47, 0xDD48, /* 0x00 */
     0xDD49, 0xDD4A, 0xDD4B, 0xDD4C, 0xDD4D, 0xDD4E, 0xDD4F, 0xDD50, /* 0x00 */
     0xDD51, 0xDD52, 0xDD53, 0xDD54, 0xDD55, 0xDD56, 0xDD57, 0xDD58, /* 0x10 */
-    0xDD59, 0xDD5A, 0xDD5B, 0xDD5C, 0xD9DF,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+    0xDD59, 0xDD5A, 0xDD5B, 0xDD5C, 0xD9DF, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
     0xDCB1, 0xDCB2, 0xDCB3, 0xDCB4, 0xDCB5, 0xDCB6, 0xDCB7, 0xDCB8, /* 0x60 */
     0xDCB9, 0xDCBA, 0xDCBB, 0xDCBC, 0xDCBD, 0xDCBE, 0xDCBF, 0xDCC0, /* 0x60 */
     0xDCC1, 0xDCC2, 0xDCC3, 0xDCC4, 0xDCC5, 0xDCC6, 0xDCC7, 0xDCC8, /* 0x70 */
-    0xDCC9, 0xDCCA, 0xDCCB, 0xDCCC,      0,      0,      0, 0xD9DE  /* 0x70 */
+    0xDCC9, 0xDCCA, 0xDCCB, 0xDCCC, 	 0, 	 0, 	 0, 0xD9DE	/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_33[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xDC59, 0xDC5A, 0xDC5B, 0xDC5C, 0xDC5D,      0,      0,      0, /* 0x80 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xDC59, 0xDC5A, 0xDC5B, 0xDC5C, 0xDC5D, 	 0, 	 0, 	 0, /* 0x80 */
     0xDC4A, 0xDC4B, 0xDC6C, 0xDC6D, 0xDC6E, 0xDC46, 0xDC47, 0xDC48, /* 0x80 */
     0xDC64, 0xDC65, 0xDC66, 0xDC67, 0xDC68, 0xDC31, 0xDC32, 0xDC33, /* 0x90 */
     0xDC35, 0xDC3B, 0xDC3C, 0xDC3D, 0xDC3E, 0xDC3F, 0xDC40, 0xDC41, /* 0x90 */
@@ -419,3170 +419,3170 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_33[] =
     0xDC4F, 0xDC50, 0xDC51, 0xDC52, 0xDC53, 0xDC54, 0xDC55, 0xDC56, /* 0xB0 */
     0xDC57, 0xDC58, 0xDC5E, 0xDC5F, 0xDC60, 0xDC61, 0xDC62, 0xDC63, /* 0xB0 */
     0xDC6A, 0xDC6B, 0xD9E3, 0xDC7C, 0xDC36, 0xDC70, 0xDC91, 0xD9E1, /* 0xC0 */
-    0xDC4C, 0xDC7D, 0xDC45,      0,      0,      0,      0, 0xDC49, /* 0xC0 */
-    0xDC7A,      0,      0, 0xDC7B,      0,      0, 0xDC6F,      0, /* 0xD0 */
-    0xD9E4,      0,      0, 0xDC74, 0xDC7E, 0xDC79                  /* 0xD0 */
+    0xDC4C, 0xDC7D, 0xDC45, 	 0, 	 0, 	 0, 	 0, 0xDC49, /* 0xC0 */
+    0xDC7A, 	 0, 	 0, 0xDC7B, 	 0, 	 0, 0xDC6F, 	 0, /* 0xD0 */
+    0xD9E4, 	 0, 	 0, 0xDC74, 0xDC7E, 0xDC79					/* 0xD0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_4E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF179, 0xF2CB,      0, 0xF662,      0,      0,      0, 0xE742, /* 0x00 */
-    0xF1DB, 0xEAB2, 0xEABE, 0xF7BB,      0, 0xE996,      0,      0, /* 0x00 */
-         0, 0xF5E4,      0,      0, 0xF4A6, 0xE9E0, 0xEBA6,      0, /* 0x10 */
-    0xE29A, 0xE940,      0,      0,      0,      0, 0xECAA,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xF3E9,      0,      0, /* 0x20 */
-         0,      0, 0xE1FA,      0,      0,      0,      0,      0, /* 0x30 */
-    0xF93F, 0xE4A1,      0, 0xF3AB,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xEED1, 0xE43C,      0, 0xE29B,      0,      0, /* 0x40 */
-         0,      0,      0, 0xF3FD,      0, 0xEA4F, 0xF8BA, 0xF7B9, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xE262,      0, /* 0x50 */
-    0xECAB, 0xF0E0,      0,      0,      0, 0xE29C, 0xE0F7, 0xEDA5, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xE071,      0, 0xE55C,      0,      0, /* 0x60 */
-         0,      0,      0, 0xF071,      0,      0, 0xE973, 0xEAAD, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xE0EB,      0, /* 0x70 */
-         0,      0, 0xE5AF,      0,      0,      0, 0xE697,      0, /* 0x80 */
-    0xEDF8,      0,      0, 0xEA50, 0xF133,      0, 0xEFCD,      0, /* 0x80 */
-    0xF037, 0xEFF6, 0xF8BB,      0, 0xEEE9, 0xF2CC,      0,      0, /* 0x90 */
-    0xE376,      0,      0, 0xEA51,      0,      0, 0xED3C,      0, /* 0x90 */
-         0, 0xE75C, 0xF7F1,      0, 0xE26F, 0xF834, 0xEE42,      0, /* 0xA0 */
-    0xF89D,      0,      0, 0xF84D, 0xE158, 0xF2CD, 0xE5D5,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xE4A2,      0, /* 0xB0 */
-         0,      0, 0xF161,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xED37, 0xF162,      0,      0, 0xF641,      0,      0, 0xE29D, /* 0xC0 */
-         0,      0, 0xE361, 0xE0BF,      0, 0xF1A4,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xF1A8, 0xEA52, 0xF672, 0xF1DC, /* 0xD0 */
-    0xE997, 0xEB49,      0,      0,      0, 0xE55E,      0, 0xF545, /* 0xD0 */
-         0,      0,      0, 0xE4DB, 0xE645, 0xF134,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xED76,      0, 0xF3EA,      0,      0,      0, 0xE0EC, 0xE0C0, /* 0xF0 */
-         0,      0,      0, 0xF194                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF179, 0xF2CB, 	 0, 0xF662, 	 0, 	 0, 	 0, 0xE742, /* 0x00 */
+    0xF1DB, 0xEAB2, 0xEABE, 0xF7BB, 	 0, 0xE996, 	 0, 	 0, /* 0x00 */
+         0, 0xF5E4, 	 0, 	 0, 0xF4A6, 0xE9E0, 0xEBA6, 	 0, /* 0x10 */
+    0xE29A, 0xE940, 	 0, 	 0, 	 0, 	 0, 0xECAA, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF3E9, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xE1FA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xF93F, 0xE4A1, 	 0, 0xF3AB, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xEED1, 0xE43C, 	 0, 0xE29B, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xF3FD, 	 0, 0xEA4F, 0xF8BA, 0xF7B9, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE262, 	 0, /* 0x50 */
+    0xECAB, 0xF0E0, 	 0, 	 0, 	 0, 0xE29C, 0xE0F7, 0xEDA5, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xE071, 	 0, 0xE55C, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xF071, 	 0, 	 0, 0xE973, 0xEAAD, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0EB, 	 0, /* 0x70 */
+         0, 	 0, 0xE5AF, 	 0, 	 0, 	 0, 0xE697, 	 0, /* 0x80 */
+    0xEDF8, 	 0, 	 0, 0xEA50, 0xF133, 	 0, 0xEFCD, 	 0, /* 0x80 */
+    0xF037, 0xEFF6, 0xF8BB, 	 0, 0xEEE9, 0xF2CC, 	 0, 	 0, /* 0x90 */
+    0xE376, 	 0, 	 0, 0xEA51, 	 0, 	 0, 0xED3C, 	 0, /* 0x90 */
+         0, 0xE75C, 0xF7F1, 	 0, 0xE26F, 0xF834, 0xEE42, 	 0, /* 0xA0 */
+    0xF89D, 	 0, 	 0, 0xF84D, 0xE158, 0xF2CD, 0xE5D5, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4A2, 	 0, /* 0xB0 */
+         0, 	 0, 0xF161, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xED37, 0xF162, 	 0, 	 0, 0xF641, 	 0, 	 0, 0xE29D, /* 0xC0 */
+         0, 	 0, 0xE361, 0xE0BF, 	 0, 0xF1A4, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xF1A8, 0xEA52, 0xF672, 0xF1DC, /* 0xD0 */
+    0xE997, 0xEB49, 	 0, 	 0, 	 0, 0xE55E, 	 0, 0xF545, /* 0xD0 */
+         0, 	 0, 	 0, 0xE4DB, 0xE645, 0xF134, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xED76, 	 0, 0xF3EA, 	 0, 	 0, 	 0, 0xE0EC, 0xE0C0, /* 0xF0 */
+         0, 	 0, 	 0, 0xF194									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_4F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE37A,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xF7F2, 0xF135, 0xE36F,      0, 0xEEEA, 0xE37B, 0xE961, /* 0x00 */
-    0xE8E9, 0xF9CC,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xE8D7, /* 0x20 */
-         0,      0,      0,      0, 0xE871,      0, 0xE646,      0, /* 0x30 */
-    0xECDF,      0, 0xEA53,      0, 0xEA54, 0xE031,      0,      0, /* 0x30 */
-         0,      0,      0, 0xF27C,      0,      0, 0xE4A3, 0xF247, /* 0x40 */
-    0xF75F,      0,      0,      0,      0, 0xF058, 0xF248, 0xF3AC, /* 0x40 */
-    0xF3A5, 0xEFCE,      0,      0,      0, 0xF7BC,      0,      0, /* 0x50 */
-         0, 0xEDF9, 0xF17A, 0xE9D6, 0xF1C2,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xF735,      0,      0,      0,      0,      0, 0xEDBA, /* 0x60 */
-    0xE8D8,      0,      0, 0xE032,      0,      0, 0xE3CD,      0, /* 0x70 */
-         0,      0, 0xF27D,      0,      0,      0, 0xF17B, 0xEA55, /* 0x70 */
-         0, 0xECE0,      0, 0xE059, 0xF479,      0, 0xE5CE,      0, /* 0x80 */
-    0xF646,      0, 0xE252, 0xE657,      0, 0xECB4,      0, 0xF3AD, /* 0x80 */
-         0, 0xF072,      0,      0,      0,      0, 0xE6C2,      0, /* 0x90 */
-    0xF4A7,      0,      0, 0xE1EA,      0, 0xF0EE,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xE7B2, 0xF9A5, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xF665, 0xE5E2,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xF745, /* 0xB0 */
-         0,      0, 0xE197, 0xF5B5, 0xED3D,      0,      0,      0, /* 0xC0 */
-         0, 0xEEEB, 0xF3D5,      0,      0,      0, 0xF34B,      0, /* 0xC0 */
-         0, 0xEFB5,      0, 0xE159, 0xF865,      0,      0, 0xEBD4, /* 0xD0 */
-         0,      0, 0xE6D6,      0,      0, 0xE951,      0, 0xEA56, /* 0xD0 */
-    0xF891, 0xECE1,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xEBF3, 0xE998, /* 0xE0 */
-         0, 0xE29E,      0, 0xE8C4,      0, 0xF793,      0,      0, /* 0xF0 */
-    0xE974,      0, 0xEDEF                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE37A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xF7F2, 0xF135, 0xE36F, 	 0, 0xEEEA, 0xE37B, 0xE961, /* 0x00 */
+    0xE8E9, 0xF9CC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8D7, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xE871, 	 0, 0xE646, 	 0, /* 0x30 */
+    0xECDF, 	 0, 0xEA53, 	 0, 0xEA54, 0xE031, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xF27C, 	 0, 	 0, 0xE4A3, 0xF247, /* 0x40 */
+    0xF75F, 	 0, 	 0, 	 0, 	 0, 0xF058, 0xF248, 0xF3AC, /* 0x40 */
+    0xF3A5, 0xEFCE, 	 0, 	 0, 	 0, 0xF7BC, 	 0, 	 0, /* 0x50 */
+         0, 0xEDF9, 0xF17A, 0xE9D6, 0xF1C2, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xF735, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEDBA, /* 0x60 */
+    0xE8D8, 	 0, 	 0, 0xE032, 	 0, 	 0, 0xE3CD, 	 0, /* 0x70 */
+         0, 	 0, 0xF27D, 	 0, 	 0, 	 0, 0xF17B, 0xEA55, /* 0x70 */
+         0, 0xECE0, 	 0, 0xE059, 0xF479, 	 0, 0xE5CE, 	 0, /* 0x80 */
+    0xF646, 	 0, 0xE252, 0xE657, 	 0, 0xECB4, 	 0, 0xF3AD, /* 0x80 */
+         0, 0xF072, 	 0, 	 0, 	 0, 	 0, 0xE6C2, 	 0, /* 0x90 */
+    0xF4A7, 	 0, 	 0, 0xE1EA, 	 0, 0xF0EE, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7B2, 0xF9A5, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF665, 0xE5E2, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF745, /* 0xB0 */
+         0, 	 0, 0xE197, 0xF5B5, 0xED3D, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xEEEB, 0xF3D5, 	 0, 	 0, 	 0, 0xF34B, 	 0, /* 0xC0 */
+         0, 0xEFB5, 	 0, 0xE159, 0xF865, 	 0, 	 0, 0xEBD4, /* 0xD0 */
+         0, 	 0, 0xE6D6, 	 0, 	 0, 0xE951, 	 0, 0xEA56, /* 0xD0 */
+    0xF891, 0xECE1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEBF3, 0xE998, /* 0xE0 */
+         0, 0xE29E, 	 0, 0xE8C4, 	 0, 0xF793, 	 0, 	 0, /* 0xF0 */
+    0xE974, 	 0, 0xEDEF											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_50[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xE941,      0,      0,      0, 0xE5D6,      0, /* 0x00 */
-         0, 0xF4DA,      0, 0xE0C1,      0, 0xE8C3,      0,      0, /* 0x00 */
-         0, 0xE7FA, 0xE4EE,      0,      0,      0, 0xF848,      0, /* 0x10 */
-         0, 0xF9A6, 0xF0EF,      0, 0xF536,      0, 0xE15A, 0xF4A8, /* 0x10 */
-         0, 0xF4DB,      0, 0xE8A7, 0xF647,      0, 0xE2E6, 0xF394, /* 0x20 */
-    0xE0DA,      0, 0xEED2, 0xE6C3, 0xF692, 0xEF6E,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xEDA6,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xEDE7,      0,      0,      0, 0xE033, /* 0x40 */
-    0xE137, 0xF059,      0,      0,      0,      0,      0, 0xF746, /* 0x40 */
-         0,      0,      0,      0,      0, 0xF835,      0,      0, /* 0x50 */
-         0,      0, 0xF3AE,      0, 0xF2CE,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xE0ED,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xF640, 0xF2CF, 0xEFCF,      0, /* 0x70 */
-    0xF6DE,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xE263,      0,      0,      0,      0, 0xE999,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xE8A8,      0,      0, /* 0x80 */
-         0, 0xE0F8,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xEAA1, 0xE9E1,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xF5CA, 0xEFB6,      0,      0, /* 0xA0 */
-         0,      0, 0xEEEC, 0xF27E,      0, 0xF4F0,      0, 0xEABF, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xE15B,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xE351,      0,      0, /* 0xC0 */
-         0, 0xF562, 0xEB4A,      0,      0,      0,      0, 0xEAC0, /* 0xC0 */
-         0, 0xE270,      0,      0,      0, 0xE962, 0xF9EA,      0, /* 0xD0 */
-         0,      0, 0xE698,      0,      0,      0, 0xF05A,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xEF79,      0, 0xECAC, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xF4D0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xE034,      0, 0xE8F8,      0,      0,      0, 0xEA57  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xE941, 	 0, 	 0, 	 0, 0xE5D6, 	 0, /* 0x00 */
+         0, 0xF4DA, 	 0, 0xE0C1, 	 0, 0xE8C3, 	 0, 	 0, /* 0x00 */
+         0, 0xE7FA, 0xE4EE, 	 0, 	 0, 	 0, 0xF848, 	 0, /* 0x10 */
+         0, 0xF9A6, 0xF0EF, 	 0, 0xF536, 	 0, 0xE15A, 0xF4A8, /* 0x10 */
+         0, 0xF4DB, 	 0, 0xE8A7, 0xF647, 	 0, 0xE2E6, 0xF394, /* 0x20 */
+    0xE0DA, 	 0, 0xEED2, 0xE6C3, 0xF692, 0xEF6E, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xEDA6, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xEDE7, 	 0, 	 0, 	 0, 0xE033, /* 0x40 */
+    0xE137, 0xF059, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF746, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF835, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xF3AE, 	 0, 0xF2CE, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE0ED, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xF640, 0xF2CF, 0xEFCF, 	 0, /* 0x70 */
+    0xF6DE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xE263, 	 0, 	 0, 	 0, 	 0, 0xE999, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE8A8, 	 0, 	 0, /* 0x80 */
+         0, 0xE0F8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xEAA1, 0xE9E1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xF5CA, 0xEFB6, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xEEEC, 0xF27E, 	 0, 0xF4F0, 	 0, 0xEABF, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE15B, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE351, 	 0, 	 0, /* 0xC0 */
+         0, 0xF562, 0xEB4A, 	 0, 	 0, 	 0, 	 0, 0xEAC0, /* 0xC0 */
+         0, 0xE270, 	 0, 	 0, 	 0, 0xE962, 0xF9EA, 	 0, /* 0xD0 */
+         0, 	 0, 0xE698, 	 0, 	 0, 	 0, 0xF05A, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEF79, 	 0, 0xECAC, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF4D0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xE034, 	 0, 0xE8F8, 	 0, 	 0, 	 0, 0xEA57	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_51[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF0F0, 0xF3D6,      0,      0, 0xEDE2,      0, 0xE15C,      0, /* 0x00 */
-         0, 0xE0FB,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xF073,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xEAC1, /* 0x10 */
-         0, 0xE67D,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xEFD0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xF249,      0,      0,      0,      0, 0xE5E3, /* 0x30 */
-         0,      0, 0xE3D3,      0, 0xEDF0,      0,      0,      0, /* 0x30 */
-    0xEF44, 0xF0C3,      0, 0xF03A, 0xF89E, 0xF5F6, 0xF34C, 0xF9D4, /* 0x40 */
-    0xEB4B, 0xE253,      0, 0xE34A, 0xF6BA, 0xE795, 0xF6CD,      0, /* 0x40 */
-         0,      0, 0xED3E,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xE56F,      0,      0,      0, /* 0x50 */
-         0,      0, 0xE377,      0,      0, 0xF19F,      0, 0xE43E, /* 0x60 */
-    0xF291, 0xE5D7, 0xF074, 0xF732, 0xE1EB, 0xE6BF, 0xF8B1,      0, /* 0x60 */
-         0, 0xE1EC,      0,      0,      0, 0xE942, 0xE37C, 0xE29F, /* 0x70 */
-    0xF292,      0,      0,      0, 0xE152,      0,      0,      0, /* 0x70 */
-    0xE37D,      0,      0,      0,      0,      0, 0xEDF7,      0, /* 0x80 */
-         0,      0, 0xF4FC,      0,      0, 0xF232,      0,      0, /* 0x80 */
-         0,      0, 0xE7B3,      0,      0, 0xE796,      0, 0xEFB7, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xE23E,      0,      0,      0,      0, 0xE7A2,      0,      0, /* 0xA0 */
-         0,      0, 0xE793,      0, 0xE55F,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xEDA7, 0xE5D2, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xE639,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xF532,      0, 0xF3D7,      0, /* 0xC0 */
-         0, 0xE5D8,      0, 0xF34D, 0xE6D0, 0xE560,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xE6CF, 0xF0EA, 0xF9EB,      0, /* 0xD0 */
-         0, 0xE8ED,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xF955, 0xE0C2,      0,      0,      0,      0, 0xF9D5,      0, /* 0xF0 */
-    0xF558, 0xEF7A, 0xF5F3,      0,      0, 0xF7DE                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF0F0, 0xF3D6, 	 0, 	 0, 0xEDE2, 	 0, 0xE15C, 	 0, /* 0x00 */
+         0, 0xE0FB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xF073, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEAC1, /* 0x10 */
+         0, 0xE67D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xEFD0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF249, 	 0, 	 0, 	 0, 	 0, 0xE5E3, /* 0x30 */
+         0, 	 0, 0xE3D3, 	 0, 0xEDF0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xEF44, 0xF0C3, 	 0, 0xF03A, 0xF89E, 0xF5F6, 0xF34C, 0xF9D4, /* 0x40 */
+    0xEB4B, 0xE253, 	 0, 0xE34A, 0xF6BA, 0xE795, 0xF6CD, 	 0, /* 0x40 */
+         0, 	 0, 0xED3E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xE56F, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xE377, 	 0, 	 0, 0xF19F, 	 0, 0xE43E, /* 0x60 */
+    0xF291, 0xE5D7, 0xF074, 0xF732, 0xE1EB, 0xE6BF, 0xF8B1, 	 0, /* 0x60 */
+         0, 0xE1EC, 	 0, 	 0, 	 0, 0xE942, 0xE37C, 0xE29F, /* 0x70 */
+    0xF292, 	 0, 	 0, 	 0, 0xE152, 	 0, 	 0, 	 0, /* 0x70 */
+    0xE37D, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEDF7, 	 0, /* 0x80 */
+         0, 	 0, 0xF4FC, 	 0, 	 0, 0xF232, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE7B3, 	 0, 	 0, 0xE796, 	 0, 0xEFB7, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xE23E, 	 0, 	 0, 	 0, 	 0, 0xE7A2, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xE793, 	 0, 0xE55F, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEDA7, 0xE5D2, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE639, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xF532, 	 0, 0xF3D7, 	 0, /* 0xC0 */
+         0, 0xE5D8, 	 0, 0xF34D, 0xE6D0, 0xE560, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xE6CF, 0xF0EA, 0xF9EB, 	 0, /* 0xD0 */
+         0, 0xE8ED, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xF955, 0xE0C2, 	 0, 	 0, 	 0, 	 0, 0xF9D5, 	 0, /* 0xF0 */
+    0xF558, 0xEF7A, 0xF5F3, 	 0, 	 0, 0xF7DE					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_52[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE4EF,      0,      0, 0xF163,      0,      0, 0xE9C2, 0xF2B7, /* 0x00 */
-    0xEED4,      0, 0xE05A,      0,      0,      0, 0xE7FB,      0, /* 0x00 */
-         0, 0xF89F,      0,      0,      0,      0,      0, 0xE63A, /* 0x10 */
-         0,      0,      0,      0,      0, 0xF59A,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0xF6F7, 0xE93C,      0,      0, /* 0x20 */
-         0, 0xE6D7, 0xEAA2,      0,      0,      0, 0xE24E,      0, /* 0x20 */
-    0xE4F0,      0,      0,      0,      0,      0, 0xF334, 0xEBEC, /* 0x30 */
-    0xE2E7, 0xF4CB, 0xF1A9, 0xE04E,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xF591,      0,      0,      0, 0xF65E, /* 0x40 */
-         0,      0, 0xEA9D, 0xE34B, 0xE5B7, 0xF293,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xF538,      0, 0xE99A,      0, /* 0x50 */
-         0,      0,      0, 0xE0A7,      0, 0xE85E,      0,      0, /* 0x50 */
-         0, 0xEB76,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xF1A5, 0xF294,      0,      0,      0,      0, 0xE99B, /* 0x60 */
-         0,      0, 0xF7DC,      0,      0, 0xF4DC,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF794,      0, 0xF59B, /* 0x70 */
-         0,      0,      0, 0xF993,      0,      0,      0, 0xE34C, /* 0x80 */
-    0xE8F9, 0xE6B1,      0,      0,      0, 0xE0FC,      0,      0, /* 0x80 */
-         0, 0xF335, 0xE0FD,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xE5F4,      0,      0,      0, 0xE1ED, /* 0x90 */
-    0xE035,      0,      0, 0xE63B, 0xE352,      0,      0,      0, /* 0xA0 */
-         0, 0xF34E, 0xE44D, 0xE134,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xF846,      0, /* 0xB0 */
-         0, 0xE15D,      0, 0xE89C,      0, 0xF65F,      0, 0xEFB8, /* 0xC0 */
-         0, 0xE797,      0,      0,      0, 0xE15E,      0,      0, /* 0xC0 */
-         0,      0, 0xE6CD,      0,      0, 0xE561, 0xEFED,      0, /* 0xD0 */
-    0xE07B, 0xE7E2,      0, 0xF9B2,      0, 0xECAD, 0xE65C, 0xE7B4, /* 0xD0 */
-         0,      0, 0xEBA7, 0xF263, 0xE353,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xF9B3,      0, 0xE5E4,      0,      0, /* 0xF0 */
-    0xE2E8,      0, 0xF1C3, 0xE342,      0,      0, 0xE2A0, 0xE838  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE4EF, 	 0, 	 0, 0xF163, 	 0, 	 0, 0xE9C2, 0xF2B7, /* 0x00 */
+    0xEED4, 	 0, 0xE05A, 	 0, 	 0, 	 0, 0xE7FB, 	 0, /* 0x00 */
+         0, 0xF89F, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE63A, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF59A, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xF6F7, 0xE93C, 	 0, 	 0, /* 0x20 */
+         0, 0xE6D7, 0xEAA2, 	 0, 	 0, 	 0, 0xE24E, 	 0, /* 0x20 */
+    0xE4F0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF334, 0xEBEC, /* 0x30 */
+    0xE2E7, 0xF4CB, 0xF1A9, 0xE04E, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xF591, 	 0, 	 0, 	 0, 0xF65E, /* 0x40 */
+         0, 	 0, 0xEA9D, 0xE34B, 0xE5B7, 0xF293, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xF538, 	 0, 0xE99A, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xE0A7, 	 0, 0xE85E, 	 0, 	 0, /* 0x50 */
+         0, 0xEB76, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xF1A5, 0xF294, 	 0, 	 0, 	 0, 	 0, 0xE99B, /* 0x60 */
+         0, 	 0, 0xF7DC, 	 0, 	 0, 0xF4DC, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF794, 	 0, 0xF59B, /* 0x70 */
+         0, 	 0, 	 0, 0xF993, 	 0, 	 0, 	 0, 0xE34C, /* 0x80 */
+    0xE8F9, 0xE6B1, 	 0, 	 0, 	 0, 0xE0FC, 	 0, 	 0, /* 0x80 */
+         0, 0xF335, 0xE0FD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xE5F4, 	 0, 	 0, 	 0, 0xE1ED, /* 0x90 */
+    0xE035, 	 0, 	 0, 0xE63B, 0xE352, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xF34E, 0xE44D, 0xE134, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF846, 	 0, /* 0xB0 */
+         0, 0xE15D, 	 0, 0xE89C, 	 0, 0xF65F, 	 0, 0xEFB8, /* 0xC0 */
+         0, 0xE797, 	 0, 	 0, 	 0, 0xE15E, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE6CD, 	 0, 	 0, 0xE561, 0xEFED, 	 0, /* 0xD0 */
+    0xE07B, 0xE7E2, 	 0, 0xF9B2, 	 0, 0xECAD, 0xE65C, 0xE7B4, /* 0xD0 */
+         0, 	 0, 0xEBA7, 0xF263, 0xE353, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xF9B3, 	 0, 0xE5E4, 	 0, 	 0, /* 0xF0 */
+    0xE2E8, 	 0, 0xF1C3, 0xE342, 	 0, 	 0, 0xE2A0, 0xE838	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_53[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xF760,      0,      0, /* 0x00 */
-    0xF9D6,      0,      0,      0,      0, 0xF761,      0, 0xF762, /* 0x00 */
-    0xE963,      0,      0,      0,      0, 0xE9E2, 0xF8F9, 0xE9C1, /* 0x10 */
-         0, 0xECB5,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xF1DD, 0xE254,      0, 0xE0A1,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xE9E3,      0,      0,      0,      0, 0xF96D, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xF7AF,      0,      0,      0,      0,      0, 0xE49D, /* 0x30 */
-    0xE2A1, 0xED38,      0, 0xF546, 0xF1A0,      0,      0, 0xECAE, /* 0x40 */
-    0xEEED, 0xF9C1, 0xE872,      0,      0, 0xE743,      0,      0, /* 0x40 */
-         0, 0xE9E4, 0xF391, 0xF693, 0xF892,      0,      0, 0xE3F5, /* 0x50 */
-         0,      0, 0xE85F,      0, 0xE964,      0, 0xE936,      0, /* 0x50 */
-    0xF2BF,      0,      0,      0,      0,      0, 0xE25F,      0, /* 0x60 */
-    0xEB69,      0,      0,      0,      0,      0,      0, 0xE7D6, /* 0x60 */
-    0xF164, 0xF05B,      0,      0, 0xE04F, 0xE5B0,      0, 0xE2E9, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF3ED,      0, 0xE15F, /* 0x70 */
-         0,      0,      0,      0, 0xED9A,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xED7D,      0,      0,      0,      0, /* 0x90 */
-    0xE6D8,      0, 0xF9A7,      0,      0,      0,      0, 0xF03B, /* 0x90 */
-    0xF642,      0,      0,      0,      0, 0xE2F0, 0xF7BD,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xEE96,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xE0DB,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xF4D1,      0,      0,      0,      0, /* 0xC0 */
-    0xEFD1, 0xF4A9, 0xE370, 0xEFD2,      0, 0xE873,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xEC62,      0, 0xF632, 0xEBF4, /* 0xD0 */
-         0,      0,      0, 0xE874,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xEED5, 0xF5BF, 0xE2A2, 0xE1AF, 0xE2A3,      0,      0, /* 0xE0 */
-         0, 0xE1B0, 0xF3FE, 0xE333, 0xEBAF, 0xF733,      0, 0xE036, /* 0xE0 */
-    0xF6BB, 0xF47A, 0xEA58, 0xEFD3,      0,      0,      0,      0, /* 0xF0 */
-    0xEA59                                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xF760, 	 0, 	 0, /* 0x00 */
+    0xF9D6, 	 0, 	 0, 	 0, 	 0, 0xF761, 	 0, 0xF762, /* 0x00 */
+    0xE963, 	 0, 	 0, 	 0, 	 0, 0xE9E2, 0xF8F9, 0xE9C1, /* 0x10 */
+         0, 0xECB5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xF1DD, 0xE254, 	 0, 0xE0A1, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xE9E3, 	 0, 	 0, 	 0, 	 0, 0xF96D, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xF7AF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE49D, /* 0x30 */
+    0xE2A1, 0xED38, 	 0, 0xF546, 0xF1A0, 	 0, 	 0, 0xECAE, /* 0x40 */
+    0xEEED, 0xF9C1, 0xE872, 	 0, 	 0, 0xE743, 	 0, 	 0, /* 0x40 */
+         0, 0xE9E4, 0xF391, 0xF693, 0xF892, 	 0, 	 0, 0xE3F5, /* 0x50 */
+         0, 	 0, 0xE85F, 	 0, 0xE964, 	 0, 0xE936, 	 0, /* 0x50 */
+    0xF2BF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE25F, 	 0, /* 0x60 */
+    0xEB69, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7D6, /* 0x60 */
+    0xF164, 0xF05B, 	 0, 	 0, 0xE04F, 0xE5B0, 	 0, 0xE2E9, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF3ED, 	 0, 0xE15F, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xED9A, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xED7D, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xE6D8, 	 0, 0xF9A7, 	 0, 	 0, 	 0, 	 0, 0xF03B, /* 0x90 */
+    0xF642, 	 0, 	 0, 	 0, 	 0, 0xE2F0, 0xF7BD, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEE96, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xE0DB, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xF4D1, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xEFD1, 0xF4A9, 0xE370, 0xEFD2, 	 0, 0xE873, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xEC62, 	 0, 0xF632, 0xEBF4, /* 0xD0 */
+         0, 	 0, 	 0, 0xE874, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xEED5, 0xF5BF, 0xE2A2, 0xE1AF, 0xE2A3, 	 0, 	 0, /* 0xE0 */
+         0, 0xE1B0, 0xF3FE, 0xE333, 0xEBAF, 0xF733, 	 0, 0xE036, /* 0xE0 */
+    0xF6BB, 0xF47A, 0xEA58, 0xEFD3, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xEA59															/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_54[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xF9DE, 0xE050,      0,      0,      0, /* 0x00 */
-    0xF7EA, 0xE3CE, 0xF264,      0, 0xE562, 0xE7A3, 0xF9A8, 0xE6D9, /* 0x00 */
-    0xF6CE, 0xF84E,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xE2D6,      0, 0xE6F0,      0, 0xF0E1, /* 0x10 */
-    0xF755,      0,      0,      0,      0,      0, 0xE99C,      0, /* 0x20 */
-         0, 0xE9C3,      0, 0xF7DF,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xEEEF,      0,      0,      0,      0, /* 0x30 */
-    0xF9E5, 0xF633,      0, 0xE7FC, 0xF9A9,      0, 0xEEEE,      0, /* 0x30 */
-         0,      0, 0xE5E5,      0,      0,      0,      0,      0, /* 0x40 */
-    0xF2D0,      0, 0xE1B1,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xF6A2,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0xF3B2,      0, 0xF3B1,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xE1B2,      0, 0xE83B,      0, 0xE037,      0,      0, /* 0x70 */
-         0,      0,      0, 0xECE2, 0xF8BC, 0xE7A4,      0,      0, /* 0x70 */
-    0xF24A,      0,      0,      0,      0,      0, 0xF763,      0, /* 0x80 */
-         0,      0,      0,      0, 0xF8FA,      0, 0xE2A4,      0, /* 0x80 */
-    0xE99D,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xF673,      0,      0,      0, /* 0xA0 */
-    0xF1AA,      0,      0, 0xF431, 0xE271,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xF836,      0,      0,      0,      0, /* 0xB0 */
-    0xF7E0,      0,      0,      0,      0, 0xF166,      0,      0, /* 0xB0 */
-    0xED7E, 0xF7A1,      0,      0, 0xF8EF,      0,      0,      0, /* 0xC0 */
-    0xF7EB, 0xF233,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xF03C,      0,      0,      0, 0xE038,      0,      0, /* 0xE0 */
-    0xF59C,      0,      0,      0,      0, 0xE1D6, 0xF998,      0, /* 0xE0 */
-         0,      0, 0xF559,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xF764                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xF9DE, 0xE050, 	 0, 	 0, 	 0, /* 0x00 */
+    0xF7EA, 0xE3CE, 0xF264, 	 0, 0xE562, 0xE7A3, 0xF9A8, 0xE6D9, /* 0x00 */
+    0xF6CE, 0xF84E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xE2D6, 	 0, 0xE6F0, 	 0, 0xF0E1, /* 0x10 */
+    0xF755, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE99C, 	 0, /* 0x20 */
+         0, 0xE9C3, 	 0, 0xF7DF, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xEEEF, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xF9E5, 0xF633, 	 0, 0xE7FC, 0xF9A9, 	 0, 0xEEEE, 	 0, /* 0x30 */
+         0, 	 0, 0xE5E5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xF2D0, 	 0, 0xE1B1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xF6A2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xF3B2, 	 0, 0xF3B1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xE1B2, 	 0, 0xE83B, 	 0, 0xE037, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0xECE2, 0xF8BC, 0xE7A4, 	 0, 	 0, /* 0x70 */
+    0xF24A, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF763, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xF8FA, 	 0, 0xE2A4, 	 0, /* 0x80 */
+    0xE99D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xF673, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xF1AA, 	 0, 	 0, 0xF431, 0xE271, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xF836, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xF7E0, 	 0, 	 0, 	 0, 	 0, 0xF166, 	 0, 	 0, /* 0xB0 */
+    0xED7E, 0xF7A1, 	 0, 	 0, 0xF8EF, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xF7EB, 0xF233, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xF03C, 	 0, 	 0, 	 0, 0xE038, 	 0, 	 0, /* 0xE0 */
+    0xF59C, 	 0, 	 0, 	 0, 	 0, 0xE1D6, 0xF998, 	 0, /* 0xE0 */
+         0, 	 0, 0xF559, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xF764											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_55[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xF736,      0, 0xEA5A, 0xF456, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xE6DA,      0, /* 0x00 */
-    0xE4D0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0xE755,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xF076, /* 0x20 */
-         0, 0xF4DD,      0,      0,      0, 0xED6A,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xF674,      0, /* 0x30 */
-         0,      0,      0,      0, 0xF694,      0, 0xEAC2,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xE7FD, /* 0x40 */
-         0,      0,      0, 0xE198,      0,      0, 0xE4BA,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xED3F,      0, /* 0x50 */
-         0,      0,      0, 0xF7E1,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xF336,      0,      0,      0, /* 0x70 */
-    0xE0D3,      0,      0,      0, 0xEB4C,      0, 0xF55A, 0xE59C, /* 0x80 */
-         0, 0xF9AA, 0xF7E2,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xF547, 0xF9C2, 0xF940,      0, 0xF9EC, 0xE072,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xF9BD, /* 0xA0 */
-         0, 0xF077, 0xEAC3, 0xE3D2, 0xE272,      0, 0xE4A4,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xF9AB,      0, 0xEAE0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xF457,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xEEF0,      0, 0xE37E,      0,      0, 0xF4AA, /* 0xD0 */
-         0,      0,      0, 0xEA5B, 0xF648,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xEBF5, 0xF3B3          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xF736, 	 0, 0xEA5A, 0xF456, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6DA, 	 0, /* 0x00 */
+    0xE4D0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xE755, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF076, /* 0x20 */
+         0, 0xF4DD, 	 0, 	 0, 	 0, 0xED6A, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF674, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xF694, 	 0, 0xEAC2, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7FD, /* 0x40 */
+         0, 	 0, 	 0, 0xE198, 	 0, 	 0, 0xE4BA, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xED3F, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xF7E1, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xF336, 	 0, 	 0, 	 0, /* 0x70 */
+    0xE0D3, 	 0, 	 0, 	 0, 0xEB4C, 	 0, 0xF55A, 0xE59C, /* 0x80 */
+         0, 0xF9AA, 0xF7E2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xF547, 0xF9C2, 0xF940, 	 0, 0xF9EC, 0xE072, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF9BD, /* 0xA0 */
+         0, 0xF077, 0xEAC3, 0xE3D2, 0xE272, 	 0, 0xE4A4, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF9AB, 	 0, 0xEAE0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xF457, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xEEF0, 	 0, 0xE37E, 	 0, 	 0, 0xF4AA, /* 0xD0 */
+         0, 	 0, 	 0, 0xEA5B, 0xF648, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEBF5, 0xF3B3			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_56[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0xF6A3,      0, /* 0x00 */
-         0, 0xE039,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0xE2A5,      0,      0, 0xEAC4, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xEBB0, /* 0x20 */
-         0,      0, 0xF34F,      0, 0xF634,      0, 0xECB6,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xF856,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0xE391,      0,      0, 0xF9ED,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xE9C4,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xF999,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xEE4F,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xEA3D,      0, 0xF84F,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xEDF1,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xF1C4,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xE435,      0,      0, 0xF9EE,      0,      0, /* 0xC0 */
-         0, 0xF5B6,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xEBF6, 0xEA5C,      0,      0, 0xF96E,      0, /* 0xD0 */
-    0xF167,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xE1DD,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xE647, 0xE1B3                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0xF6A3, 	 0, /* 0x00 */
+         0, 0xE039, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xE2A5, 	 0, 	 0, 0xEAC4, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEBB0, /* 0x20 */
+         0, 	 0, 0xF34F, 	 0, 0xF634, 	 0, 0xECB6, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xF856, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xE391, 	 0, 	 0, 0xF9ED, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xE9C4, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF999, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEE4F, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xEA3D, 	 0, 0xF84F, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xEDF1, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xF1C4, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE435, 	 0, 	 0, 0xF9EE, 	 0, 	 0, /* 0xC0 */
+         0, 0xF5B6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xEBF6, 0xEA5C, 	 0, 	 0, 0xF96E, 	 0, /* 0xD0 */
+    0xF167, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE1DD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xE647, 0xE1B3											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_57[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xF765, 0xEDD8,      0,      0,      0, /* 0x00 */
-    0xE2EA,      0,      0, 0xE2D0,      0, 0xF05C,      0,      0, /* 0x00 */
-         0,      0, 0xF03E, 0xF03D,      0,      0, 0xE4F1,      0, /* 0x10 */
-    0xE4A5,      0,      0,      0,      0,      0,      0, 0xF6CF, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xF234,      0,      0,      0,      0, 0xE334,      0,      0, /* 0x20 */
-    0xF432,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xE392,      0,      0,      0,      0, /* 0x30 */
-    0xF433,      0, 0xF6F8,      0,      0,      0,      0, 0xE343, /* 0x40 */
-         0,      0, 0xE8A9,      0,      0, 0xE4BB, 0xE07C,      0, /* 0x40 */
-    0xF3A6, 0xE0D5,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xF6E7,      0,      0, 0xE1DE,      0, 0xF6A4,      0, /* 0x60 */
-         0,      0, 0xF750,      0,      0,      0, 0xE4DD,      0, /* 0x60 */
-    0xE160,      0,      0,      0,      0, 0xE2A6,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xF695,      0,      0,      0, /* 0x70 */
-         0,      0, 0xEBF7,      0,      0,      0,      0,      0, /* 0x80 */
-    0xE4DC,      0,      0, 0xF8A0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xF837,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xF0D9,      0, 0xE2A7, 0xF03F,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xED91,      0,      0,      0, 0xEFB9, /* 0xC0 */
-    0xF3D8,      0,      0, 0xE768,      0,      0, 0xEB94,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0xEE44, /* 0xD0 */
-    0xE99E,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xF4F1,      0,      0,      0, 0xECD0,      0,      0, 0xF49D, /* 0xF0 */
-         0, 0xE8C6, 0xE393,      0, 0xE394                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xF765, 0xEDD8, 	 0, 	 0, 	 0, /* 0x00 */
+    0xE2EA, 	 0, 	 0, 0xE2D0, 	 0, 0xF05C, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xF03E, 0xF03D, 	 0, 	 0, 0xE4F1, 	 0, /* 0x10 */
+    0xE4A5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF6CF, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xF234, 	 0, 	 0, 	 0, 	 0, 0xE334, 	 0, 	 0, /* 0x20 */
+    0xF432, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xE392, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xF433, 	 0, 0xF6F8, 	 0, 	 0, 	 0, 	 0, 0xE343, /* 0x40 */
+         0, 	 0, 0xE8A9, 	 0, 	 0, 0xE4BB, 0xE07C, 	 0, /* 0x40 */
+    0xF3A6, 0xE0D5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xF6E7, 	 0, 	 0, 0xE1DE, 	 0, 0xF6A4, 	 0, /* 0x60 */
+         0, 	 0, 0xF750, 	 0, 	 0, 	 0, 0xE4DD, 	 0, /* 0x60 */
+    0xE160, 	 0, 	 0, 	 0, 	 0, 0xE2A6, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xF695, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xEBF7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE4DC, 	 0, 	 0, 0xF8A0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xF837, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xF0D9, 	 0, 0xE2A7, 0xF03F, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xED91, 	 0, 	 0, 	 0, 0xEFB9, /* 0xC0 */
+    0xF3D8, 	 0, 	 0, 0xE768, 	 0, 	 0, 0xEB94, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEE44, /* 0xD0 */
+    0xE99E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xF4F1, 	 0, 	 0, 	 0, 0xECD0, 	 0, 	 0, 0xF49D, /* 0xF0 */
+         0, 0xE8C6, 0xE393, 	 0, 0xE394							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_58[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE2DC,      0, 0xE4D1,      0,      0, 0xE141, 0xF6D8,      0, /* 0x00 */
-    0xE0A8, 0xF0BC, 0xED4E,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xF56C,      0, /* 0x10 */
-         0, 0xE952,      0,      0, 0xF337,      0,      0, 0xEE50, /* 0x20 */
-         0,      0, 0xE07D,      0,      0,      0,      0, 0xEF7B, /* 0x20 */
-    0xEDE8, 0xE953,      0,      0, 0xF1DE, 0xE4F2,      0,      0, /* 0x30 */
-         0,      0, 0xE199,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xE264, 0xEEAB,      0,      0,      0, 0xE0C3, /* 0x40 */
-         0, 0xEBB1,      0,      0, 0xF6B2,      0,      0, 0xE4F3, /* 0x50 */
-    0xE4D2,      0, 0xF5C0,      0,      0,      0, 0xEADD,      0, /* 0x50 */
-         0, 0xF295, 0xEEF1,      0, 0xF9B4,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xF458,      0,      0, /* 0x70 */
-         0, 0xF4D2,      0,      0, 0xF296,      0, 0xEC63,      0, /* 0x70 */
-         0,      0,      0, 0xE161,      0, 0xEAEA,      0,      0, /* 0x80 */
-         0, 0xEFBA,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xE7D7,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xF5CD,      0, 0xF3F2, 0xF857, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xE7F8, 0xE552,      0,      0,      0,      0, 0xF675,      0, /* 0xA0 */
-         0,      0,      0, 0xE9C5,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xEEF2, 0xF1DF,      0,      0, 0xE05B,      0, /* 0xB0 */
-         0, 0xE8FA,      0,      0,      0, 0xEF45,      0, 0xE4A6, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xF9B5,      0, /* 0xC0 */
-         0, 0xF7C9,      0, 0xED72,      0, 0xF8BD,      0,      0, /* 0xD0 */
-    0xE6A4, 0xE255,      0,      0,      0,      0, 0xE265, 0xE676, /* 0xD0 */
-         0,      0,      0,      0, 0xEDBD,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xEA5D, 0xF195,      0,      0, 0xF1E0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xF17C, 0xF8BE, 0xEAEB,      0, 0xEBF8                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE2DC, 	 0, 0xE4D1, 	 0, 	 0, 0xE141, 0xF6D8, 	 0, /* 0x00 */
+    0xE0A8, 0xF0BC, 0xED4E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF56C, 	 0, /* 0x10 */
+         0, 0xE952, 	 0, 	 0, 0xF337, 	 0, 	 0, 0xEE50, /* 0x20 */
+         0, 	 0, 0xE07D, 	 0, 	 0, 	 0, 	 0, 0xEF7B, /* 0x20 */
+    0xEDE8, 0xE953, 	 0, 	 0, 0xF1DE, 0xE4F2, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xE199, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xE264, 0xEEAB, 	 0, 	 0, 	 0, 0xE0C3, /* 0x40 */
+         0, 0xEBB1, 	 0, 	 0, 0xF6B2, 	 0, 	 0, 0xE4F3, /* 0x50 */
+    0xE4D2, 	 0, 0xF5C0, 	 0, 	 0, 	 0, 0xEADD, 	 0, /* 0x50 */
+         0, 0xF295, 0xEEF1, 	 0, 0xF9B4, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF458, 	 0, 	 0, /* 0x70 */
+         0, 0xF4D2, 	 0, 	 0, 0xF296, 	 0, 0xEC63, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0xE161, 	 0, 0xEAEA, 	 0, 	 0, /* 0x80 */
+         0, 0xEFBA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xE7D7, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xF5CD, 	 0, 0xF3F2, 0xF857, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xE7F8, 0xE552, 	 0, 	 0, 	 0, 	 0, 0xF675, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xE9C5, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xEEF2, 0xF1DF, 	 0, 	 0, 0xE05B, 	 0, /* 0xB0 */
+         0, 0xE8FA, 	 0, 	 0, 	 0, 0xEF45, 	 0, 0xE4A6, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF9B5, 	 0, /* 0xC0 */
+         0, 0xF7C9, 	 0, 0xED72, 	 0, 0xF8BD, 	 0, 	 0, /* 0xD0 */
+    0xE6A4, 0xE255, 	 0, 	 0, 	 0, 	 0, 0xE265, 0xE676, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xEDBD, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xEA5D, 0xF195, 	 0, 	 0, 0xF1E0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xF17C, 0xF8BE, 0xEAEB, 	 0, 0xEBF8					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_59[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xF7BE, /* 0x00 */
-         0,      0,      0,      0, 0xE395, 0xEB3A, 0xEF72,      0, /* 0x10 */
-         0, 0xEC64, 0xE49F,      0, 0xEDA8,      0,      0,      0, /* 0x10 */
-         0,      0, 0xE7D3,      0,      0,      0,      0, 0xE4DE, /* 0x20 */
-         0, 0xF548, 0xF6BC, 0xE99F,      0, 0xEF7C, 0xED77,      0, /* 0x20 */
-         0, 0xECF7,      0,      0,      0,      0,      0, 0xF138, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xF893,      0, /* 0x30 */
-         0,      0,      0,      0, 0xEDF2,      0,      0, 0xE396, /* 0x40 */
-    0xE43F, 0xE975,      0,      0,      0,      0, 0xE335, 0xF3B4, /* 0x40 */
-    0xF941, 0xE19A,      0,      0, 0xE9C6, 0xF861,      0, 0xF6DF, /* 0x50 */
-         0,      0, 0xF838,      0,      0,      0,      0,      0, /* 0x50 */
-    0xF297,      0, 0xEA5E,      0,      0,      0,      0, 0xEEF3, /* 0x60 */
-         0,      0, 0xF6AC, 0xF0C4, 0xF1E1, 0xEB3B, 0xE9C7,      0, /* 0x60 */
-         0,      0,      0, 0xE443, 0xE44F,      0,      0,      0, /* 0x70 */
-    0xE05C,      0,      0,      0,      0, 0xF8BF,      0,      0, /* 0x70 */
-         0,      0, 0xEDFD, 0xE9E5, 0xE75D,      0,      0,      0, /* 0x80 */
-         0,      0, 0xF196,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xE397,      0,      0, 0xEF7D, 0xE362, /* 0x90 */
-         0, 0xE7D8,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xF676,      0,      0, /* 0xA0 */
-    0xE8AA,      0,      0,      0, 0xF6E0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE769,      0, 0xF533,      0,      0, 0xF56D,      0, /* 0xB0 */
-         0,      0,      0, 0xF2D1,      0,      0, 0xE7B5,      0, /* 0xC0 */
-         0, 0xF1AB,      0, 0xECB7,      0,      0,      0,      0, /* 0xC0 */
-    0xF24B, 0xE1B4,      0, 0xEB95, 0xF05D,      0,      0,      0, /* 0xD0 */
-         0, 0xF197, 0xEF7E,      0, 0xE0A9, 0xF3AF,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xE05D,      0, /* 0xE0 */
-    0xF139,      0, 0xF47B,      0, 0xF9EF,      0, 0xF7F3,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xEE51,      0,      0, 0xF168,      0,      0,      0, 0xF1AC  /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xE395, 0xEB3A, 0xEF72, 	 0, /* 0x10 */
+         0, 0xEC64, 0xE49F, 	 0, 0xEDA8, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xE7D3, 	 0, 	 0, 	 0, 	 0, 0xE4DE, /* 0x20 */
+         0, 0xF548, 0xF6BC, 0xE99F, 	 0, 0xEF7C, 0xED77, 	 0, /* 0x20 */
+         0, 0xECF7, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF138, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF893, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xEDF2, 	 0, 	 0, 0xE396, /* 0x40 */
+    0xE43F, 0xE975, 	 0, 	 0, 	 0, 	 0, 0xE335, 0xF3B4, /* 0x40 */
+    0xF941, 0xE19A, 	 0, 	 0, 0xE9C6, 0xF861, 	 0, 0xF6DF, /* 0x50 */
+         0, 	 0, 0xF838, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xF297, 	 0, 0xEA5E, 	 0, 	 0, 	 0, 	 0, 0xEEF3, /* 0x60 */
+         0, 	 0, 0xF6AC, 0xF0C4, 0xF1E1, 0xEB3B, 0xE9C7, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xE443, 0xE44F, 	 0, 	 0, 	 0, /* 0x70 */
+    0xE05C, 	 0, 	 0, 	 0, 	 0, 0xF8BF, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xEDFD, 0xE9E5, 0xE75D, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xF196, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xE397, 	 0, 	 0, 0xEF7D, 0xE362, /* 0x90 */
+         0, 0xE7D8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF676, 	 0, 	 0, /* 0xA0 */
+    0xE8AA, 	 0, 	 0, 	 0, 0xF6E0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE769, 	 0, 0xF533, 	 0, 	 0, 0xF56D, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xF2D1, 	 0, 	 0, 0xE7B5, 	 0, /* 0xC0 */
+         0, 0xF1AB, 	 0, 0xECB7, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xF24B, 0xE1B4, 	 0, 0xEB95, 0xF05D, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xF197, 0xEF7E, 	 0, 0xE0A9, 0xF3AF, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE05D, 	 0, /* 0xE0 */
+    0xF139, 	 0, 0xF47B, 	 0, 0xF9EF, 	 0, 0xF7F3, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xEE51, 	 0, 	 0, 0xF168, 	 0, 	 0, 	 0, 0xF1AC	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_5A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xF05E,      0, 0xEF6F,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xEA5F,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xE436,      0,      0, 0xEEF4, 0xE3D6,      0,      0, 0xEE52, /* 0x10 */
-    0xECE3,      0,      0,      0,      0, 0xED40,      0,      0, /* 0x20 */
-         0, 0xE744,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0xF635,      0, /* 0x30 */
-         0,      0,      0,      0, 0xF4DE,      0,      0,      0, /* 0x30 */
-         0, 0xE6A5,      0,      0,      0,      0, 0xF6E8,      0, /* 0x40 */
-         0, 0xEF56,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xF8E6,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xE9E6,      0,      0,      0, 0xE9A0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xE76A,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xE83C, 0xF040,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xECB8,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE03A, 0xEBF9,      0, 0xF041,      0,      0,      0, /* 0xC0 */
-         0, 0xF47C,      0,      0, 0xF87E,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xF265,      0,      0,      0,      0, 0xF7F4,      0, /* 0xE0 */
-         0, 0xE47C                                                  /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xF05E, 	 0, 0xEF6F, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xEA5F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xE436, 	 0, 	 0, 0xEEF4, 0xE3D6, 	 0, 	 0, 0xEE52, /* 0x10 */
+    0xECE3, 	 0, 	 0, 	 0, 	 0, 0xED40, 	 0, 	 0, /* 0x20 */
+         0, 0xE744, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF635, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xF4DE, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xE6A5, 	 0, 	 0, 	 0, 	 0, 0xF6E8, 	 0, /* 0x40 */
+         0, 0xEF56, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xF8E6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xE9E6, 	 0, 	 0, 	 0, 0xE9A0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE76A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xE83C, 0xF040, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xECB8, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE03A, 0xEBF9, 	 0, 0xF041, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xF47C, 	 0, 	 0, 0xF87E, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xF265, 	 0, 	 0, 	 0, 	 0, 0xF7F4, 	 0, /* 0xE0 */
+         0, 0xE47C													/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_5B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xF8FB,      0,      0, /* 0x00 */
-         0, 0xF9F0,      0, 0xEB4D, 0xE273,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xF756,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xEA3E,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xEAC5,      0,      0, 0xEDBE,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xF1AD, 0xF87A,      0,      0, 0xE1EE, 0xF1A6,      0, 0xF1AE, /* 0x50 */
-    0xF37D,      0, 0xE9A1,      0, 0xF1AF, 0xF99A,      0, 0xE77B, /* 0x50 */
-         0,      0,      0, 0xE19B, 0xE1B5,      0,      0,      0, /* 0x60 */
-         0, 0xF839,      0, 0xEBDD,      0,      0,      0,      0, /* 0x60 */
-    0xEC65, 0xF1CF,      0,      0,      0, 0xE9A2,      0,      0, /* 0x70 */
-    0xF7CA,      0, 0xF078,      0, 0xEDED,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xE4EB,      0, 0xEFD4, /* 0x80 */
-    0xEBFA, 0xED5C,      0, 0xEBE4, 0xEF57,      0,      0, 0xE26B, /* 0x80 */
-         0,      0,      0, 0xE965,      0, 0xF6B5, 0xF995, 0xF395, /* 0x90 */
-    0xE23F, 0xF3B5, 0xF2D2, 0xEF58, 0xF0F1,      0,      0,      0, /* 0x90 */
-         0,      0, 0xE0D4, 0xEB4E, 0xECF8, 0xF079, 0xF942,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xEB96,      0, 0xE2E0,      0, /* 0xA0 */
-    0xF235,      0,      0, 0xF83A, 0xEE53, 0xEBB2, 0xE03B,      0, /* 0xB0 */
-    0xECE4, 0xEFBB,      0,      0,      0,      0,      0, 0xEC66, /* 0xB0 */
-    0xF4F2,      0, 0xF266, 0xF042, 0xE398, 0xF169, 0xE85B, 0xE2A8, /* 0xC0 */
-         0,      0,      0,      0, 0xE9A3,      0,      0,      0, /* 0xC0 */
-    0xE76B,      0, 0xF7CE, 0xEFD5, 0xECD1,      0,      0, 0xE44C, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xE73C, 0xF4CC, /* 0xD0 */
-         0, 0xE1FB, 0xF666,      0, 0xEEF5, 0xEF91, 0xECF9, 0xE44B, /* 0xE0 */
-    0xF4F3, 0xECFB,      0, 0xEA60, 0xE240,      0, 0xE699, 0xF3D9, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xF5C1, 0xE954,      0, /* 0xF0 */
-    0xF5BB,      0, 0xEA61                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xF8FB, 	 0, 	 0, /* 0x00 */
+         0, 0xF9F0, 	 0, 0xEB4D, 0xE273, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF756, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xEA3E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xEAC5, 	 0, 	 0, 0xEDBE, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xF1AD, 0xF87A, 	 0, 	 0, 0xE1EE, 0xF1A6, 	 0, 0xF1AE, /* 0x50 */
+    0xF37D, 	 0, 0xE9A1, 	 0, 0xF1AF, 0xF99A, 	 0, 0xE77B, /* 0x50 */
+         0, 	 0, 	 0, 0xE19B, 0xE1B5, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xF839, 	 0, 0xEBDD, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xEC65, 0xF1CF, 	 0, 	 0, 	 0, 0xE9A2, 	 0, 	 0, /* 0x70 */
+    0xF7CA, 	 0, 0xF078, 	 0, 0xEDED, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE4EB, 	 0, 0xEFD4, /* 0x80 */
+    0xEBFA, 0xED5C, 	 0, 0xEBE4, 0xEF57, 	 0, 	 0, 0xE26B, /* 0x80 */
+         0, 	 0, 	 0, 0xE965, 	 0, 0xF6B5, 0xF995, 0xF395, /* 0x90 */
+    0xE23F, 0xF3B5, 0xF2D2, 0xEF58, 0xF0F1, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xE0D4, 0xEB4E, 0xECF8, 0xF079, 0xF942, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xEB96, 	 0, 0xE2E0, 	 0, /* 0xA0 */
+    0xF235, 	 0, 	 0, 0xF83A, 0xEE53, 0xEBB2, 0xE03B, 	 0, /* 0xB0 */
+    0xECE4, 0xEFBB, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEC66, /* 0xB0 */
+    0xF4F2, 	 0, 0xF266, 0xF042, 0xE398, 0xF169, 0xE85B, 0xE2A8, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xE9A3, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xE76B, 	 0, 0xF7CE, 0xEFD5, 0xECD1, 	 0, 	 0, 0xE44C, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE73C, 0xF4CC, /* 0xD0 */
+         0, 0xE1FB, 0xF666, 	 0, 0xEEF5, 0xEF91, 0xECF9, 0xE44B, /* 0xE0 */
+    0xF4F3, 0xECFB, 	 0, 0xEA60, 0xE240, 	 0, 0xE699, 0xF3D9, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF5C1, 0xE954, 	 0, /* 0xF0 */
+    0xF5BB, 	 0, 0xEA61											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_5C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE976,      0,      0, 0xEA62,      0,      0, 0xF1E2, /* 0x00 */
-    0xF298, 0xF05F, 0xF37E, 0xECFC,      0, 0xE4DF, 0xE4F4, 0xEBB3, /* 0x00 */
-         0, 0xEBB4,      0,      0,      0,      0, 0xF563,      0, /* 0x10 */
-         0, 0xEAC6,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0xEFD6,      0,      0,      0, /* 0x20 */
-    0xE8AB,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xF636,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xECB9, 0xF0C5, 0xF539, 0xE1B6, 0xE49B,      0, 0xE83D, 0xE473, /* 0x30 */
-    0xE2D1,      0,      0,      0,      0, 0xE0DC, 0xE19C,      0, /* 0x40 */
-    0xE2DD,      0,      0, 0xEF39,      0, 0xECBB, 0xECBA,      0, /* 0x40 */
-         0, 0xEB6A,      0,      0,      0, 0xF299,      0,      0, /* 0x50 */
-         0,      0,      0, 0xE943,      0,      0,      0,      0, /* 0x50 */
-    0xE4F5,      0, 0xE6A6,      0, 0xF645, 0xE6DB,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xEBD5,      0,      0, 0xE57A, /* 0x60 */
-         0, 0xEAA3,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xF9DF,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xE399, 0xF1D4,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xE0AA,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xED6B,      0, 0xEBFB, 0xE0A2,      0,      0,      0, /* 0xA0 */
-         0, 0xE4E0,      0, 0xED4F,      0, 0xF8C0,      0, 0xE84E, /* 0xB0 */
-    0xED5D,      0, 0xE649,      0,      0,      0, 0xF2C0,      0, /* 0xB0 */
-    0xEBFC,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xF649,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xEAC7,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xED41,      0,      0,      0,      0,      0,      0, 0xE977, /* 0xE0 */
-    0xE978,      0,      0,      0, 0xF866,      0, 0xE4F6,      0, /* 0xF0 */
-         0,      0,      0, 0xF3DA,      0, 0xF894                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE976, 	 0, 	 0, 0xEA62, 	 0, 	 0, 0xF1E2, /* 0x00 */
+    0xF298, 0xF05F, 0xF37E, 0xECFC, 	 0, 0xE4DF, 0xE4F4, 0xEBB3, /* 0x00 */
+         0, 0xEBB4, 	 0, 	 0, 	 0, 	 0, 0xF563, 	 0, /* 0x10 */
+         0, 0xEAC6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xEFD6, 	 0, 	 0, 	 0, /* 0x20 */
+    0xE8AB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xF636, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xECB9, 0xF0C5, 0xF539, 0xE1B6, 0xE49B, 	 0, 0xE83D, 0xE473, /* 0x30 */
+    0xE2D1, 	 0, 	 0, 	 0, 	 0, 0xE0DC, 0xE19C, 	 0, /* 0x40 */
+    0xE2DD, 	 0, 	 0, 0xEF39, 	 0, 0xECBB, 0xECBA, 	 0, /* 0x40 */
+         0, 0xEB6A, 	 0, 	 0, 	 0, 0xF299, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xE943, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xE4F5, 	 0, 0xE6A6, 	 0, 0xF645, 0xE6DB, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xEBD5, 	 0, 	 0, 0xE57A, /* 0x60 */
+         0, 0xEAA3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xF9DF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE399, 0xF1D4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xE0AA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xED6B, 	 0, 0xEBFB, 0xE0A2, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xE4E0, 	 0, 0xED4F, 	 0, 0xF8C0, 	 0, 0xE84E, /* 0xB0 */
+    0xED5D, 	 0, 0xE649, 	 0, 	 0, 	 0, 0xF2C0, 	 0, /* 0xB0 */
+    0xEBFC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xF649, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xEAC7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xED41, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE977, /* 0xE0 */
+    0xE978, 	 0, 	 0, 	 0, 0xF866, 	 0, 0xE4F6, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xF3DA, 	 0, 0xF894					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_5D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xEC9F, /* 0x00 */
-         0,      0,      0,      0,      0, 0xE5CF, 0xE39A,      0, /* 0x00 */
-         0, 0xE1DF,      0,      0, 0xF5CB,      0, 0xED92, 0xE0AB, /* 0x10 */
-         0, 0xE6C4,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xECA0, /* 0x20 */
-         0, 0xE9DA,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xE83E, 0xE07E,      0,      0,      0, /* 0x40 */
-    0xE5B9,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xECA1,      0,      0, 0xEF73,      0,      0, 0xF4AB, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xE2A9, /* 0x80 */
-         0,      0,      0, 0xE4F7,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xE593,      0,      0, /* 0x90 */
-    0xE274,      0, 0xEF94,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xEDF5,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xEEAE,      0, 0xE64A,      0, 0xEAEC, 0xED50,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xEF74,      0,      0, /* 0xC0 */
-         0,      0, 0xE745,      0,      0,      0, 0xED6C,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xF549, 0xF3B6,      0, /* 0xD0 */
-         0, 0xEC6E, 0xEBB5,      0,      0, 0xE1EF, 0xF3A7, 0xE275, /* 0xE0 */
-    0xE0DD,      0,      0, 0xE7E3,      0,      0, 0xF4AC,      0, /* 0xE0 */
-         0, 0xE39B, 0xF13B, 0xEA63, 0xF6E9,      0,      0, 0xF7F5, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xEBDE, 0xE0EE          /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE5CF, 0xE39A, 	 0, /* 0x00 */
+         0, 0xE1DF, 	 0, 	 0, 0xF5CB, 	 0, 0xED92, 0xE0AB, /* 0x10 */
+         0, 0xE6C4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xECA0, /* 0x20 */
+         0, 0xE9DA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xE83E, 0xE07E, 	 0, 	 0, 	 0, /* 0x40 */
+    0xE5B9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xECA1, 	 0, 	 0, 0xEF73, 	 0, 	 0, 0xF4AB, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2A9, /* 0x80 */
+         0, 	 0, 	 0, 0xE4F7, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE593, 	 0, 	 0, /* 0x90 */
+    0xE274, 	 0, 0xEF94, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xEDF5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xEEAE, 	 0, 0xE64A, 	 0, 0xEAEC, 0xED50, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEF74, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE745, 	 0, 	 0, 	 0, 0xED6C, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF549, 0xF3B6, 	 0, /* 0xD0 */
+         0, 0xEC6E, 0xEBB5, 	 0, 	 0, 0xE1EF, 0xF3A7, 0xE275, /* 0xE0 */
+    0xE0DD, 	 0, 	 0, 0xE7E3, 	 0, 	 0, 0xF4AC, 	 0, /* 0xE0 */
+         0, 0xE39B, 0xF13B, 0xEA63, 0xF6E9, 	 0, 	 0, 0xF7F5, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEBDE, 0xE0EE			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_5E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xECBC, 0xF766,      0,      0, 0xE8EE,      0, /* 0x00 */
-         0,      0,      0,      0, 0xF9F1,      0,      0,      0, /* 0x00 */
-         0, 0xF6B6,      0,      0,      0,      0, 0xF56E,      0, /* 0x10 */
-         0, 0xF47D,      0, 0xE8D9,      0, 0xF338,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xEBFD,      0,      0, /* 0x20 */
-         0,      0,      0, 0xEA64,      0, 0xEB3C,      0,      0, /* 0x20 */
-         0,      0,      0, 0xF1E3,      0,      0, 0xE4E1,      0, /* 0x30 */
-    0xEAC8,      0,      0,      0,      0, 0xE7B6,      0, 0xF9AC, /* 0x30 */
-    0xF2D3,      0,      0,      0, 0xED51, 0xF77B,      0, 0xE8AC, /* 0x40 */
-         0,      0,      0,      0, 0xF956,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xE73D,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xF64A, /* 0x50 */
-         0, 0xE8DF, 0xE4D3, 0xF757,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xE05E, 0xF751, 0xE444,      0,      0, 0xE944, /* 0x70 */
-    0xF849, 0xE05F,      0, 0xF943, 0xF07A, 0xF07B, 0xE39C,      0, /* 0x70 */
-         0,      0,      0,      0, 0xF1E4,      0,      0, 0xE9E7, /* 0x80 */
-         0,      0, 0xEAC9,      0,      0,      0,      0, 0xEAED, /* 0x80 */
-         0,      0,      0,      0,      0, 0xF24C,      0, 0xF2C1, /* 0x90 */
-         0,      0, 0xE162,      0, 0xE9A4,      0,      0,      0, /* 0x90 */
-    0xEACA,      0,      0,      0,      0,      0, 0xE4F8, 0xF3A8, /* 0xA0 */
-         0,      0,      0, 0xE1B7,      0, 0xF2D4,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xED6D, 0xEAEE, 0xE0AC, /* 0xB0 */
-    0xEFBC,      0,      0,      0,      0,      0, 0xF07C,      0, /* 0xB0 */
-         0,      0, 0xEACB,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xF7BF, 0xE63F, 0xE5C6,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xE2AA,      0,      0, 0xE239,      0,      0, 0xE69A,      0, /* 0xD0 */
-         0,      0, 0xF3B7, 0xF29A,      0,      0,      0, 0xE7D9, /* 0xD0 */
-    0xF4DF,      0, 0xF758, 0xE256,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xE5E6,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xF576,      0,      0, 0xEE55, 0xF2D5, /* 0xF0 */
-         0,      0, 0xE0EF, 0xF96F                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xECBC, 0xF766, 	 0, 	 0, 0xE8EE, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xF9F1, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xF6B6, 	 0, 	 0, 	 0, 	 0, 0xF56E, 	 0, /* 0x10 */
+         0, 0xF47D, 	 0, 0xE8D9, 	 0, 0xF338, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEBFD, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xEA64, 	 0, 0xEB3C, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xF1E3, 	 0, 	 0, 0xE4E1, 	 0, /* 0x30 */
+    0xEAC8, 	 0, 	 0, 	 0, 	 0, 0xE7B6, 	 0, 0xF9AC, /* 0x30 */
+    0xF2D3, 	 0, 	 0, 	 0, 0xED51, 0xF77B, 	 0, 0xE8AC, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xF956, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE73D, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF64A, /* 0x50 */
+         0, 0xE8DF, 0xE4D3, 0xF757, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xE05E, 0xF751, 0xE444, 	 0, 	 0, 0xE944, /* 0x70 */
+    0xF849, 0xE05F, 	 0, 0xF943, 0xF07A, 0xF07B, 0xE39C, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xF1E4, 	 0, 	 0, 0xE9E7, /* 0x80 */
+         0, 	 0, 0xEAC9, 	 0, 	 0, 	 0, 	 0, 0xEAED, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF24C, 	 0, 0xF2C1, /* 0x90 */
+         0, 	 0, 0xE162, 	 0, 0xE9A4, 	 0, 	 0, 	 0, /* 0x90 */
+    0xEACA, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4F8, 0xF3A8, /* 0xA0 */
+         0, 	 0, 	 0, 0xE1B7, 	 0, 0xF2D4, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xED6D, 0xEAEE, 0xE0AC, /* 0xB0 */
+    0xEFBC, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF07C, 	 0, /* 0xB0 */
+         0, 	 0, 0xEACB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xF7BF, 0xE63F, 0xE5C6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xE2AA, 	 0, 	 0, 0xE239, 	 0, 	 0, 0xE69A, 	 0, /* 0xD0 */
+         0, 	 0, 0xF3B7, 0xF29A, 	 0, 	 0, 	 0, 0xE7D9, /* 0xD0 */
+    0xF4DF, 	 0, 0xF758, 0xE256, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xE5E6, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xF576, 	 0, 	 0, 0xEE55, 0xF2D5, /* 0xF0 */
+         0, 	 0, 0xE0EF, 0xF96F									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_5F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE937,      0,      0, 0xE677,      0,      0,      0, /* 0x00 */
-         0,      0, 0xF759,      0,      0,      0,      0, 0xECD2, /* 0x00 */
-         0, 0xECBD,      0, 0xE2E1, 0xF350, 0xF16A,      0, 0xE9D7, /* 0x10 */
-    0xF8F0,      0,      0, 0xF13C,      0,      0,      0, 0xF339, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xF867, 0xF8C1, /* 0x20 */
-         0, 0xE450,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xEDB0,      0,      0,      0, 0xF1E5,      0,      0, /* 0x30 */
-         0,      0, 0xE0AD,      0, 0xF7B0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xF6A5,      0, 0xE0AE,      0, 0xE83F,      0, 0xE746,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xE4A7, 0xF8B2, /* 0x50 */
-         0, 0xF9C4,      0, 0xF13D,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xF8A1,      0,      0,      0, 0xEDE9, 0xEFEE, /* 0x60 */
-         0, 0xF4F4, 0xF795, 0xF351, 0xEA3F, 0xF740,      0,      0, /* 0x60 */
-    0xF4E0, 0xEEAF,      0,      0,      0,      0,      0, 0xE8AD, /* 0x70 */
-         0, 0xEE45,      0,      0, 0xF7A8,      0,      0, 0xE9D8, /* 0x70 */
-    0xEF69, 0xF2D6,      0,      0,      0, 0xE4E2,      0, 0xEC6F, /* 0x80 */
-         0,      0, 0xF970, 0xE6C8, 0xF9AD,      0,      0,      0, /* 0x80 */
-    0xEAEF, 0xE163, 0xE4F9,      0,      0,      0,      0, 0xE592, /* 0x90 */
-    0xE8C7, 0xEA65,      0,      0,      0,      0, 0xF396,      0, /* 0x90 */
-    0xE5D0, 0xEDD9,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xF957, 0xE966, 0xEC70,      0,      0,      0, 0xE840,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xF4A3,      0, 0xE4EC, /* 0xB0 */
-         0, 0xF55B,      0,      0,      0, 0xF9C5,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xECFD,      0, 0xF7B1,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xE39D, 0xF16B,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xF5BC, 0xF434, /* 0xD0 */
-    0xE75E, 0xE75F,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xF5F7,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xF671,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xE447,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xF8EC,      0, 0xE9C8  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE937, 	 0, 	 0, 0xE677, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xF759, 	 0, 	 0, 	 0, 	 0, 0xECD2, /* 0x00 */
+         0, 0xECBD, 	 0, 0xE2E1, 0xF350, 0xF16A, 	 0, 0xE9D7, /* 0x10 */
+    0xF8F0, 	 0, 	 0, 0xF13C, 	 0, 	 0, 	 0, 0xF339, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF867, 0xF8C1, /* 0x20 */
+         0, 0xE450, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xEDB0, 	 0, 	 0, 	 0, 0xF1E5, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xE0AD, 	 0, 0xF7B0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xF6A5, 	 0, 0xE0AE, 	 0, 0xE83F, 	 0, 0xE746, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4A7, 0xF8B2, /* 0x50 */
+         0, 0xF9C4, 	 0, 0xF13D, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xF8A1, 	 0, 	 0, 	 0, 0xEDE9, 0xEFEE, /* 0x60 */
+         0, 0xF4F4, 0xF795, 0xF351, 0xEA3F, 0xF740, 	 0, 	 0, /* 0x60 */
+    0xF4E0, 0xEEAF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8AD, /* 0x70 */
+         0, 0xEE45, 	 0, 	 0, 0xF7A8, 	 0, 	 0, 0xE9D8, /* 0x70 */
+    0xEF69, 0xF2D6, 	 0, 	 0, 	 0, 0xE4E2, 	 0, 0xEC6F, /* 0x80 */
+         0, 	 0, 0xF970, 0xE6C8, 0xF9AD, 	 0, 	 0, 	 0, /* 0x80 */
+    0xEAEF, 0xE163, 0xE4F9, 	 0, 	 0, 	 0, 	 0, 0xE592, /* 0x90 */
+    0xE8C7, 0xEA65, 	 0, 	 0, 	 0, 	 0, 0xF396, 	 0, /* 0x90 */
+    0xE5D0, 0xEDD9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xF957, 0xE966, 0xEC70, 	 0, 	 0, 	 0, 0xE840, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF4A3, 	 0, 0xE4EC, /* 0xB0 */
+         0, 0xF55B, 	 0, 	 0, 	 0, 0xF9C5, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xECFD, 	 0, 0xF7B1, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xE39D, 0xF16B, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF5BC, 0xF434, /* 0xD0 */
+    0xE75E, 0xE75F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xF5F7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xF671, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE447, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF8EC, 	 0, 0xE9C8	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_60[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xED78, /* 0x00 */
-         0,      0, 0xE451,      0,      0,      0, 0xF767,      0, /* 0x10 */
-         0,      0,      0,      0, 0xE64B, 0xEA66,      0,      0, /* 0x10 */
-    0xF6BD, 0xF13E,      0,      0,      0, 0xE371,      0, 0xEB97, /* 0x20 */
-    0xF043,      0, 0xE266,      0,      0,      0,      0, 0xE135, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xF198, 0xEC71, 0xECBE,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xF958,      0,      0, /* 0x40 */
-    0xE1F0,      0, 0xF7F6,      0,      0, 0xEAF0,      0,      0, /* 0x50 */
-         0, 0xEDBF,      0,      0,      0, 0xE24F,      0,      0, /* 0x50 */
-         0,      0, 0xF971, 0xF1B0, 0xF9D1, 0xF64B,      0,      0, /* 0x60 */
-    0xF7CF, 0xF0DA, 0xE051,      0, 0xE448, 0xE1F1,      0, 0xECD3, /* 0x60 */
-    0xF9E6,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xEE7D,      0,      0, /* 0x80 */
-         0, 0xECFA,      0,      0, 0xF33A, 0xF7D0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0xF972,      0, 0xF737,      0, /* 0x90 */
-         0,      0, 0xEBE5, 0xF29B,      0,      0,      0, 0xEEF6, /* 0x90 */
-    0xF07D,      0,      0, 0xF944, 0xF5C2,      0,      0, 0xE6DC, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xF397,      0, 0xE9E8, 0xE4ED, 0xF5FC,      0, 0xE84F,      0, /* 0xB0 */
-    0xE19D,      0,      0,      0, 0xE4FA, 0xF534,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xF2D7,      0, 0xE553, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xF8E3,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xF8ED,      0, 0xEB3D,      0,      0, 0xF07E, /* 0xD0 */
-    0xF8B3, 0xED52,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xF677, 0xE46D,      0, 0xEACC,      0,      0, 0xF959,      0, /* 0xF0 */
-         0, 0xEDA9, 0xEB98, 0xF643                                  /* 0xF0 */
+         0, 	 0, 0xE451, 	 0, 	 0, 	 0, 0xF767, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xE64B, 0xEA66, 	 0, 	 0, /* 0x10 */
+    0xF6BD, 0xF13E, 	 0, 	 0, 	 0, 0xE371, 	 0, 0xEB97, /* 0x20 */
+    0xF043, 	 0, 0xE266, 	 0, 	 0, 	 0, 	 0, 0xE135, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xF198, 0xEC71, 0xECBE, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF958, 	 0, 	 0, /* 0x40 */
+    0xE1F0, 	 0, 0xF7F6, 	 0, 	 0, 0xEAF0, 	 0, 	 0, /* 0x50 */
+         0, 0xEDBF, 	 0, 	 0, 	 0, 0xE24F, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xF971, 0xF1B0, 0xF9D1, 0xF64B, 	 0, 	 0, /* 0x60 */
+    0xF7CF, 0xF0DA, 0xE051, 	 0, 0xE448, 0xE1F1, 	 0, 0xECD3, /* 0x60 */
+    0xF9E6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEE7D, 	 0, 	 0, /* 0x80 */
+         0, 0xECFA, 	 0, 	 0, 0xF33A, 0xF7D0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xF972, 	 0, 0xF737, 	 0, /* 0x90 */
+         0, 	 0, 0xEBE5, 0xF29B, 	 0, 	 0, 	 0, 0xEEF6, /* 0x90 */
+    0xF07D, 	 0, 	 0, 0xF944, 0xF5C2, 	 0, 	 0, 0xE6DC, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xF397, 	 0, 0xE9E8, 0xE4ED, 0xF5FC, 	 0, 0xE84F, 	 0, /* 0xB0 */
+    0xE19D, 	 0, 	 0, 	 0, 0xE4FA, 0xF534, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF2D7, 	 0, 0xE553, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xF8E3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xF8ED, 	 0, 0xEB3D, 	 0, 	 0, 0xF07E, /* 0xD0 */
+    0xF8B3, 0xED52, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xF677, 0xE46D, 	 0, 0xEACC, 	 0, 	 0, 0xF959, 	 0, /* 0xF0 */
+         0, 0xEDA9, 0xEB98, 0xF643									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_61[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xEBFE,      0,      0,      0,      0, 0xE0F0,      0, /* 0x00 */
-    0xF091, 0xF092,      0,      0,      0, 0xE850, 0xF744, 0xF0F2, /* 0x00 */
-         0,      0,      0,      0,      0, 0xED53,      0,      0, /* 0x10 */
-         0,      0, 0xEFD7, 0xED93,      0,      0,      0, 0xE091, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xE267, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xF95A,      0,      0,      0, 0xF4E1,      0,      0, 0xE0C4, /* 0x30 */
-         0,      0,      0,      0, 0xECE5,      0, 0xE0C5, 0xF044, /* 0x30 */
-         0,      0, 0xEFBD,      0, 0xE6C9,      0,      0, 0xF0DB, /* 0x40 */
-    0xF1B1,      0, 0xE153, 0xF6BE, 0xF95B,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xF796,      0, 0xE7B7,      0,      0, /* 0x50 */
-    0xF4D3, 0xF4D4,      0,      0,      0, 0xF6E4,      0, 0xF6D1, /* 0x50 */
-         0,      0, 0xE747, 0xE241, 0xE052,      0,      0, 0xF8B4, /* 0x60 */
-    0xE0C6,      0,      0, 0xF398,      0,      0, 0xE5E7,      0, /* 0x60 */
-    0xF060,      0,      0,      0,      0,      0, 0xE164, 0xE0AF, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF53A, 0xEFAF,      0, /* 0x70 */
-         0, 0xF5C3, 0xEFD8,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xE9E9,      0,      0,      0, 0xF3F3,      0, /* 0x80 */
-    0xE5FB, 0xEA4B,      0,      0, 0xF59D,      0,      0,      0, /* 0x90 */
-    0xF9F3, 0xF9F2, 0xF6A6,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xE9C9,      0,      0, 0xE563, /* 0xA0 */
-         0, 0xE138,      0, 0xE851, 0xE165,      0, 0xE7E4,      0, /* 0xA0 */
-         0,      0, 0xF85A,      0,      0,      0, 0xEDE3,      0, /* 0xB0 */
-         0,      0, 0xE4BC,      0,      0,      0, 0xE092,      0, /* 0xB0 */
-         0,      0,      0, 0xE354,      0,      0,      0, 0xE060, /* 0xC0 */
-    0xF83B, 0xF0EB, 0xEEF8, 0xE7E5,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xE3D7,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0xF4A4,      0,      0,      0, 0xE59D, 0xF973, /* 0xF0 */
-    0xF868,      0, 0xF4D5,      0, 0xE2AB,      0,      0, 0xF0F3  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xEBFE, 	 0, 	 0, 	 0, 	 0, 0xE0F0, 	 0, /* 0x00 */
+    0xF091, 0xF092, 	 0, 	 0, 	 0, 0xE850, 0xF744, 0xF0F2, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xED53, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xEFD7, 0xED93, 	 0, 	 0, 	 0, 0xE091, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE267, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xF95A, 	 0, 	 0, 	 0, 0xF4E1, 	 0, 	 0, 0xE0C4, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xECE5, 	 0, 0xE0C5, 0xF044, /* 0x30 */
+         0, 	 0, 0xEFBD, 	 0, 0xE6C9, 	 0, 	 0, 0xF0DB, /* 0x40 */
+    0xF1B1, 	 0, 0xE153, 0xF6BE, 0xF95B, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xF796, 	 0, 0xE7B7, 	 0, 	 0, /* 0x50 */
+    0xF4D3, 0xF4D4, 	 0, 	 0, 	 0, 0xF6E4, 	 0, 0xF6D1, /* 0x50 */
+         0, 	 0, 0xE747, 0xE241, 0xE052, 	 0, 	 0, 0xF8B4, /* 0x60 */
+    0xE0C6, 	 0, 	 0, 0xF398, 	 0, 	 0, 0xE5E7, 	 0, /* 0x60 */
+    0xF060, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE164, 0xE0AF, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF53A, 0xEFAF, 	 0, /* 0x70 */
+         0, 0xF5C3, 0xEFD8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE9E9, 	 0, 	 0, 	 0, 0xF3F3, 	 0, /* 0x80 */
+    0xE5FB, 0xEA4B, 	 0, 	 0, 0xF59D, 	 0, 	 0, 	 0, /* 0x90 */
+    0xF9F3, 0xF9F2, 0xF6A6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xE9C9, 	 0, 	 0, 0xE563, /* 0xA0 */
+         0, 0xE138, 	 0, 0xE851, 0xE165, 	 0, 0xE7E4, 	 0, /* 0xA0 */
+         0, 	 0, 0xF85A, 	 0, 	 0, 	 0, 0xEDE3, 	 0, /* 0xB0 */
+         0, 	 0, 0xE4BC, 	 0, 	 0, 	 0, 0xE092, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xE354, 	 0, 	 0, 	 0, 0xE060, /* 0xC0 */
+    0xF83B, 0xF0EB, 0xEEF8, 0xE7E5, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE3D7, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xF4A4, 	 0, 	 0, 	 0, 0xE59D, 0xF973, /* 0xF0 */
+    0xF868, 	 0, 0xF4D5, 	 0, 0xE2AB, 	 0, 	 0, 0xF0F3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_62[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE5FC,      0,      0,      0,      0,      0,      0, 0xE4D4, /* 0x00 */
-    0xE1FC,      0, 0xE7E6,      0, 0xEC9B, 0xEC31, 0xF0D4,      0, /* 0x00 */
-    0xEB99, 0xED42, 0xE19E,      0,      0,      0, 0xF8E4,      0, /* 0x10 */
-         0,      0, 0xF53B,      0,      0,      0,      0, 0xE34D, /* 0x10 */
-         0, 0xE093,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xF2B8,      0,      0,      0, 0xE6C0,      0, /* 0x20 */
-    0xF29C, 0xF9F4,      0,      0, 0xE4E3,      0, 0xF8C2,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xE5E8, 0xE8AE, /* 0x30 */
-    0xEBB6, 0xF747,      0,      0,      0,      0,      0, 0xEB4F, /* 0x40 */
-    0xF8C3, 0xE9EA,      0, 0xEC32,      0, 0xF236,      0,      0, /* 0x40 */
-         0,      0,      0, 0xF678,      0,      0,      0,      0, /* 0x50 */
-    0xF697,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xE9CA,      0, /* 0x60 */
-         0, 0xE372,      0,      0,      0,      0, 0xE9A6,      0, /* 0x70 */
-         0, 0xE9EB,      0,      0, 0xED9B,      0,      0, 0xECAF, /* 0x70 */
-    0xE39E,      0,      0,      0, 0xF59E,      0,      0,      0, /* 0x80 */
-         0, 0xE14C, 0xF6EA,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xEDE4, 0xEAF1,      0,      0, 0xF6E1,      0, 0xF7F7, /* 0x90 */
-    0xF2B9,      0,      0, 0xF768,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xF7A9,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xF769,      0,      0,      0, 0xF24D,      0,      0, /* 0xB0 */
-         0, 0xE756,      0,      0, 0xED73, 0xF5CE,      0,      0, /* 0xB0 */
-         0,      0, 0xE9D9,      0,      0,      0,      0, 0xE7E7, /* 0xC0 */
-    0xE449, 0xE5C3,      0,      0, 0xE875, 0xE860,      0, 0xE3D9, /* 0xC0 */
-    0xE268,      0, 0xE0DE, 0xF53C, 0xE89D,      0, 0xF679, 0xEF95, /* 0xD0 */
-    0xE2AC, 0xF392,      0, 0xF59F, 0xE8C8,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xE250, 0xECD4, 0xE3CF, 0xF3F5, /* 0xE0 */
-         0, 0xE1F2,      0, 0xE2EB,      0,      0,      0, 0xE1B8, /* 0xF0 */
-         0,      0,      0,      0,      0,      0, 0xECA6, 0xE3DA  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE5FC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4D4, /* 0x00 */
+    0xE1FC, 	 0, 0xE7E6, 	 0, 0xEC9B, 0xEC31, 0xF0D4, 	 0, /* 0x00 */
+    0xEB99, 0xED42, 0xE19E, 	 0, 	 0, 	 0, 0xF8E4, 	 0, /* 0x10 */
+         0, 	 0, 0xF53B, 	 0, 	 0, 	 0, 	 0, 0xE34D, /* 0x10 */
+         0, 0xE093, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF2B8, 	 0, 	 0, 	 0, 0xE6C0, 	 0, /* 0x20 */
+    0xF29C, 0xF9F4, 	 0, 	 0, 0xE4E3, 	 0, 0xF8C2, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5E8, 0xE8AE, /* 0x30 */
+    0xEBB6, 0xF747, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEB4F, /* 0x40 */
+    0xF8C3, 0xE9EA, 	 0, 0xEC32, 	 0, 0xF236, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xF678, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xF697, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9CA, 	 0, /* 0x60 */
+         0, 0xE372, 	 0, 	 0, 	 0, 	 0, 0xE9A6, 	 0, /* 0x70 */
+         0, 0xE9EB, 	 0, 	 0, 0xED9B, 	 0, 	 0, 0xECAF, /* 0x70 */
+    0xE39E, 	 0, 	 0, 	 0, 0xF59E, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xE14C, 0xF6EA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xEDE4, 0xEAF1, 	 0, 	 0, 0xF6E1, 	 0, 0xF7F7, /* 0x90 */
+    0xF2B9, 	 0, 	 0, 0xF768, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xF7A9, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xF769, 	 0, 	 0, 	 0, 0xF24D, 	 0, 	 0, /* 0xB0 */
+         0, 0xE756, 	 0, 	 0, 0xED73, 0xF5CE, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xE9D9, 	 0, 	 0, 	 0, 	 0, 0xE7E7, /* 0xC0 */
+    0xE449, 0xE5C3, 	 0, 	 0, 0xE875, 0xE860, 	 0, 0xE3D9, /* 0xC0 */
+    0xE268, 	 0, 0xE0DE, 0xF53C, 0xE89D, 	 0, 0xF679, 0xEF95, /* 0xD0 */
+    0xE2AC, 0xF392, 	 0, 0xF59F, 0xE8C8, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xE250, 0xECD4, 0xE3CF, 0xF3F5, /* 0xE0 */
+         0, 0xE1F2, 	 0, 0xE2EB, 	 0, 	 0, 	 0, 0xE1B8, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xECA6, 0xE3DA	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_63[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xF435,      0,      0,      0,      0,      0, 0xF436, /* 0x00 */
-         0, 0xED5E,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xE4FB,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xF3A9,      0,      0,      0, 0xF459, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xF2D8, 0xEE59,      0, 0xE748, 0xF895,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xF4B5,      0,      0, 0xF734,      0,      0, 0xE3F3, /* 0x40 */
-    0xEE58,      0,      0,      0,      0, 0xF76A,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xE979, /* 0x60 */
-    0xEA67,      0,      0,      0,      0,      0, 0xE0DF,      0, /* 0x60 */
-         0,      0, 0xE2EC,      0,      0,      0,      0, 0xF56F, /* 0x70 */
-         0,      0, 0xE3F4, 0xE44A,      0,      0,      0, 0xEAF2, /* 0x70 */
-         0,      0,      0, 0xEBB7,      0,      0,      0,      0, /* 0x80 */
-    0xEC33, 0xE4FC,      0,      0, 0xF1E6,      0,      0,      0, /* 0x80 */
-         0,      0, 0xE8C9,      0,      0,      0, 0xED9C,      0, /* 0x90 */
-    0xE2DE,      0,      0, 0xE260,      0,      0,      0,      0, /* 0x90 */
-    0xE5D3, 0xF4F5, 0xF6AE,      0,      0, 0xF2C8,      0, 0xE1F3, /* 0xA0 */
-    0xF5CF, 0xEDF3, 0xF352,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xE061,      0,      0,      0, 0xF093,      0, 0xE336,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE7DA, /* 0xC0 */
-    0xF33B,      0,      0,      0,      0,      0, 0xF0E7,      0, /* 0xD0 */
-         0,      0, 0xEDC0, 0xF945,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xED54,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xE139, 0xF9C6,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xF045,      0, 0xEDAA, 0xEABA  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xF435, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF436, /* 0x00 */
+         0, 0xED5E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xE4FB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xF3A9, 	 0, 	 0, 	 0, 0xF459, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xF2D8, 0xEE59, 	 0, 0xE748, 0xF895, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xF4B5, 	 0, 	 0, 0xF734, 	 0, 	 0, 0xE3F3, /* 0x40 */
+    0xEE58, 	 0, 	 0, 	 0, 	 0, 0xF76A, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE979, /* 0x60 */
+    0xEA67, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0DF, 	 0, /* 0x60 */
+         0, 	 0, 0xE2EC, 	 0, 	 0, 	 0, 	 0, 0xF56F, /* 0x70 */
+         0, 	 0, 0xE3F4, 0xE44A, 	 0, 	 0, 	 0, 0xEAF2, /* 0x70 */
+         0, 	 0, 	 0, 0xEBB7, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xEC33, 0xE4FC, 	 0, 	 0, 0xF1E6, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE8C9, 	 0, 	 0, 	 0, 0xED9C, 	 0, /* 0x90 */
+    0xE2DE, 	 0, 	 0, 0xE260, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xE5D3, 0xF4F5, 0xF6AE, 	 0, 	 0, 0xF2C8, 	 0, 0xE1F3, /* 0xA0 */
+    0xF5CF, 0xEDF3, 0xF352, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xE061, 	 0, 	 0, 	 0, 0xF093, 	 0, 0xE336, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7DA, /* 0xC0 */
+    0xF33B, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF0E7, 	 0, /* 0xD0 */
+         0, 	 0, 0xEDC0, 0xF945, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xED54, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE139, 0xF9C6, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xF045, 	 0, 0xEDAA, 0xEABA	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_64[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xEBDF,      0, 0xE861, /* 0x00 */
-         0,      0,      0,      0, 0xEBB8,      0, 0xEF96, 0xE4FD, /* 0x10 */
-         0,      0,      0,      0, 0xEC34,      0,      0,      0, /* 0x10 */
-         0,      0, 0xF45A,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xE876, 0xF6B3,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xF9CD,      0,      0,      0, 0xF4B6,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xF267,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xF5C4,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xE734,      0,      0,      0,      0,      0, 0xF437, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xE7B8, 0xE7B9, 0xF2C9,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xE65E,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xF6CB, 0xEAAE, 0xEF97,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xE445,      0,      0,      0, 0xE4D5,      0, /* 0x90 */
-         0,      0,      0,      0, 0xF55C, 0xE89E,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xE7E8,      0, 0xF6EB, 0xF5C9,      0, /* 0xA0 */
-    0xF4BC,      0, 0xE862,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xE4B5,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xEF46,      0,      0, 0xE65F, 0xF54A,      0, 0xF6C9, /* 0xC0 */
-         0,      0, 0xE13A,      0,      0, 0xF353, 0xE166,      0, /* 0xC0 */
-         0,      0, 0xE363,      0, 0xE4BD,      0,      0,      0, /* 0xD0 */
-    0xE8FB,      0, 0xE0E0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xE4E4, 0xF699,      0,      0, 0xE5BA, 0xF4CD, 0xE0E1, /* 0xE0 */
-         0,      0,      0,      0, 0xF0F4,      0,      0,      0, /* 0xE0 */
-         0,      0, 0xF53D,      0, 0xF93A,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xF6EC,      0,      0,      0, 0xEF98          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xEBDF, 	 0, 0xE861, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xEBB8, 	 0, 0xEF96, 0xE4FD, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xEC34, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xF45A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xE876, 0xF6B3, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xF9CD, 	 0, 	 0, 	 0, 0xF4B6, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xF267, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xF5C4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xE734, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF437, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xE7B8, 0xE7B9, 0xF2C9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE65E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xF6CB, 0xEAAE, 0xEF97, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xE445, 	 0, 	 0, 	 0, 0xE4D5, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xF55C, 0xE89E, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xE7E8, 	 0, 0xF6EB, 0xF5C9, 	 0, /* 0xA0 */
+    0xF4BC, 	 0, 0xE862, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xE4B5, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xEF46, 	 0, 	 0, 0xE65F, 0xF54A, 	 0, 0xF6C9, /* 0xC0 */
+         0, 	 0, 0xE13A, 	 0, 	 0, 0xF353, 0xE166, 	 0, /* 0xC0 */
+         0, 	 0, 0xE363, 	 0, 0xE4BD, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE8FB, 	 0, 0xE0E0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xE4E4, 0xF699, 	 0, 	 0, 0xE5BA, 0xF4CD, 0xE0E1, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xF0F4, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xF53D, 	 0, 0xF93A, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xF6EC, 	 0, 	 0, 	 0, 0xEF98			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_65[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE877,      0,      0,      0, 0xF6CC,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xEDC1,      0,      0,      0,      0, 0xEB7E,      0,      0, /* 0x10 */
-         0,      0,      0, 0xE5FD,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xE276, 0xF93B, 0xE5BB,      0,      0, 0xF438, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0xEC35, 0xE1B9, /* 0x30 */
-    0xF094, 0xE0C7,      0, 0xE1F4,      0,      0, 0xE8AF, 0xF2D9, /* 0x30 */
-         0,      0,      0,      0,      0, 0xE1BA,      0,      0, /* 0x40 */
-    0xF99B,      0,      0,      0,      0, 0xEAF3, 0xE277, 0xE852, /* 0x40 */
-         0, 0xE2AD,      0,      0,      0,      0, 0xEEF9, 0xF738, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xF4E2,      0, /* 0x50 */
-         0,      0, 0xE094, 0xEAA4,      0,      0, 0xE554,      0, /* 0x60 */
-         0,      0,      0,      0, 0xE167, 0xEDC2,      0,      0, /* 0x60 */
-         0,      0, 0xE1BB,      0, 0xF2DA, 0xF268,      0, 0xE9A7, /* 0x70 */
-    0xEC36,      0,      0,      0,      0,      0, 0xEB50,      0, /* 0x70 */
-         0,      0, 0xE640, 0xF75A,      0, 0xF99C,      0, 0xE7FE, /* 0x80 */
-         0,      0,      0,      0, 0xEA40,      0,      0,      0, /* 0x80 */
-    0xE9EC, 0xE878,      0,      0,      0,      0,      0, 0xE570, /* 0x90 */
-         0, 0xE69B,      0, 0xE1D7, 0xEA68,      0,      0, 0xF49A, /* 0x90 */
-         0, 0xED66,      0,      0, 0xE355, 0xF53E,      0, 0xE9A8, /* 0xA0 */
-         0,      0,      0, 0xF1C5, 0xF4D6,      0,      0, 0xEA69, /* 0xA0 */
-    0xECE6,      0,      0,      0,      0,      0,      0, 0xE4A8, /* 0xB0 */
-         0, 0xE8B0,      0,      0, 0xEDDA, 0xECBF,      0,      0, /* 0xB0 */
-         0, 0xE8B1,      0,      0,      0, 0xE5E9,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xEB51, 0xF2DB,      0,      0, 0xF379, /* 0xC0 */
-         0,      0, 0xE6B2,      0,      0,      0,      0, 0xE39F, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xE7E9,      0,      0, 0xE3A0,      0, 0xF17D, 0xE4A9,      0, /* 0xE0 */
-    0xF439, 0xF354,      0,      0, 0xEC72, 0xEFEF,      0,      0, /* 0xE0 */
-         0, 0xF7D1,      0,      0, 0xEFD9,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xEF6A, 0xE853, 0xE854, 0xE555,      0, 0xEEFA  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE877, 	 0, 	 0, 	 0, 0xF6CC, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xEDC1, 	 0, 	 0, 	 0, 	 0, 0xEB7E, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xE5FD, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xE276, 0xF93B, 0xE5BB, 	 0, 	 0, 0xF438, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEC35, 0xE1B9, /* 0x30 */
+    0xF094, 0xE0C7, 	 0, 0xE1F4, 	 0, 	 0, 0xE8AF, 0xF2D9, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE1BA, 	 0, 	 0, /* 0x40 */
+    0xF99B, 	 0, 	 0, 	 0, 	 0, 0xEAF3, 0xE277, 0xE852, /* 0x40 */
+         0, 0xE2AD, 	 0, 	 0, 	 0, 	 0, 0xEEF9, 0xF738, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4E2, 	 0, /* 0x50 */
+         0, 	 0, 0xE094, 0xEAA4, 	 0, 	 0, 0xE554, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xE167, 0xEDC2, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xE1BB, 	 0, 0xF2DA, 0xF268, 	 0, 0xE9A7, /* 0x70 */
+    0xEC36, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEB50, 	 0, /* 0x70 */
+         0, 	 0, 0xE640, 0xF75A, 	 0, 0xF99C, 	 0, 0xE7FE, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xEA40, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE9EC, 0xE878, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE570, /* 0x90 */
+         0, 0xE69B, 	 0, 0xE1D7, 0xEA68, 	 0, 	 0, 0xF49A, /* 0x90 */
+         0, 0xED66, 	 0, 	 0, 0xE355, 0xF53E, 	 0, 0xE9A8, /* 0xA0 */
+         0, 	 0, 	 0, 0xF1C5, 0xF4D6, 	 0, 	 0, 0xEA69, /* 0xA0 */
+    0xECE6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4A8, /* 0xB0 */
+         0, 0xE8B0, 	 0, 	 0, 0xEDDA, 0xECBF, 	 0, 	 0, /* 0xB0 */
+         0, 0xE8B1, 	 0, 	 0, 	 0, 0xE5E9, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xEB51, 0xF2DB, 	 0, 	 0, 0xF379, /* 0xC0 */
+         0, 	 0, 0xE6B2, 	 0, 	 0, 	 0, 	 0, 0xE39F, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE7E9, 	 0, 	 0, 0xE3A0, 	 0, 0xF17D, 0xE4A9, 	 0, /* 0xE0 */
+    0xF439, 0xF354, 	 0, 	 0, 0xEC72, 0xEFEF, 	 0, 	 0, /* 0xE0 */
+         0, 0xF7D1, 	 0, 	 0, 0xEFD9, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xEF6A, 0xE853, 0xE854, 0xE555, 	 0, 0xEEFA	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_66[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                     0xE1E0, 0xECB0, /* 0x00 */
-         0, 0xE8B2, 0xF8C4,      0, 0xF4E3,      0, 0xE7A5, 0xF8E7, /* 0x00 */
-    0xE9CB, 0xE364,      0, 0xEE46, 0xEB3E, 0xF9DA,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xE945, 0xEB9A, /* 0x10 */
-    0xEEB1,      0,      0,      0,      0, 0xF5F0,      0, 0xE76C, /* 0x20 */
-    0xF1C6,      0,      0,      0,      0, 0xEBB9,      0, 0xECC0, /* 0x20 */
-    0xF7C0, 0xEFF0,      0,      0, 0xE7DB,      0, 0xF4E4,      0, /* 0x30 */
-         0,      0, 0xE946, 0xED79,      0,      0,      0,      0, /* 0x30 */
-         0, 0xF355, 0xECC1, 0xF95C, 0xF95D,      0,      0,      0, /* 0x40 */
-         0, 0xF45B,      0, 0xF45C,      0,      0,      0, 0xED5F, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xF3DB,      0, 0xF869,      0, 0xF3B8, 0xF9F5, 0xEB9B, /* 0x50 */
-         0,      0,      0,      0, 0xEEFB, 0xF947, 0xF974, 0xF8C5, /* 0x60 */
-    0xECE7, 0xE749,      0, 0xF69A,      0,      0, 0xE955, 0xE168, /* 0x60 */
-         0,      0,      0, 0xEB3F, 0xF577,      0, 0xF2DC, 0xE2FC, /* 0x70 */
-    0xF2DD,      0, 0xF43A,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xF9BE,      0,      0, 0xE03C, /* 0x80 */
-    0xF9BB, 0xF9C7,      0,      0,      0,      0, 0xEEB2,      0, /* 0x80 */
-    0xF061, 0xEAF4,      0,      0,      0,      0, 0xE3EC, 0xED6E, /* 0x90 */
-    0xEDC3,      0,      0,      0,      0, 0xE7A6,      0,      0, /* 0x90 */
-    0xE1BC,      0, 0xF4E5,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xF1D5,      0,      0, 0xE7BA,      0, /* 0xA0 */
-         0,      0, 0xF1E7, 0xF8B5, 0xF77C,      0,      0,      0, /* 0xB0 */
-         0, 0xEB77,      0, 0xE169,      0,      0, 0xE556,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xEEA5,      0, 0xE5F5, 0xE4BE, /* 0xC0 */
-         0, 0xF99D,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xED94,      0, /* 0xD0 */
-         0, 0xEAF5,      0,      0, 0xEF9A, 0xF77D,      0,      0, /* 0xD0 */
-    0xE257,      0,      0,      0,      0,      0, 0xF9F6,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xEF68,      0, 0xE1D8, 0xEED6, 0xE16A,      0,      0, 0xE073, /* 0xF0 */
-    0xEAF6, 0xF357, 0xF356,      0, 0xE74A,      0, 0xF3F4, 0xF592  /* 0xF0 */
+         0, 0xE8B2, 0xF8C4, 	 0, 0xF4E3, 	 0, 0xE7A5, 0xF8E7, /* 0x00 */
+    0xE9CB, 0xE364, 	 0, 0xEE46, 0xEB3E, 0xF9DA, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE945, 0xEB9A, /* 0x10 */
+    0xEEB1, 	 0, 	 0, 	 0, 	 0, 0xF5F0, 	 0, 0xE76C, /* 0x20 */
+    0xF1C6, 	 0, 	 0, 	 0, 	 0, 0xEBB9, 	 0, 0xECC0, /* 0x20 */
+    0xF7C0, 0xEFF0, 	 0, 	 0, 0xE7DB, 	 0, 0xF4E4, 	 0, /* 0x30 */
+         0, 	 0, 0xE946, 0xED79, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xF355, 0xECC1, 0xF95C, 0xF95D, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xF45B, 	 0, 0xF45C, 	 0, 	 0, 	 0, 0xED5F, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xF3DB, 	 0, 0xF869, 	 0, 0xF3B8, 0xF9F5, 0xEB9B, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xEEFB, 0xF947, 0xF974, 0xF8C5, /* 0x60 */
+    0xECE7, 0xE749, 	 0, 0xF69A, 	 0, 	 0, 0xE955, 0xE168, /* 0x60 */
+         0, 	 0, 	 0, 0xEB3F, 0xF577, 	 0, 0xF2DC, 0xE2FC, /* 0x70 */
+    0xF2DD, 	 0, 0xF43A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xF9BE, 	 0, 	 0, 0xE03C, /* 0x80 */
+    0xF9BB, 0xF9C7, 	 0, 	 0, 	 0, 	 0, 0xEEB2, 	 0, /* 0x80 */
+    0xF061, 0xEAF4, 	 0, 	 0, 	 0, 	 0, 0xE3EC, 0xED6E, /* 0x90 */
+    0xEDC3, 	 0, 	 0, 	 0, 	 0, 0xE7A6, 	 0, 	 0, /* 0x90 */
+    0xE1BC, 	 0, 0xF4E5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xF1D5, 	 0, 	 0, 0xE7BA, 	 0, /* 0xA0 */
+         0, 	 0, 0xF1E7, 0xF8B5, 0xF77C, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xEB77, 	 0, 0xE169, 	 0, 	 0, 0xE556, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xEEA5, 	 0, 0xE5F5, 0xE4BE, /* 0xC0 */
+         0, 0xF99D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xED94, 	 0, /* 0xD0 */
+         0, 0xEAF5, 	 0, 	 0, 0xEF9A, 0xF77D, 	 0, 	 0, /* 0xD0 */
+    0xE257, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF9F6, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xEF68, 	 0, 0xE1D8, 0xEED6, 0xE16A, 	 0, 	 0, 0xE073, /* 0xF0 */
+    0xEAF6, 0xF357, 0xF356, 	 0, 0xE74A, 	 0, 0xF3F4, 0xF592	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_67[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF5CC,      0,      0, 0xF975,      0,      0,      0,      0, /* 0x00 */
-    0xF055, 0xF095,      0, 0xE9DB,      0, 0xE967,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0xEA9F, 0xF49B,      0, 0xE5C7, /* 0x10 */
-         0,      0,      0, 0xE760,      0, 0xF358, 0xE3A1, 0xE3A2, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xE7D4, 0xE678, /* 0x20 */
-    0xE7CA,      0, 0xE841, 0xE757, 0xE972, 0xF4CE, 0xF5F4,      0, /* 0x20 */
-         0, 0xF3B9,      0,      0, 0xE863,      0, 0xF67A,      0, /* 0x30 */
-         0,      0, 0xE2F5,      0,      0, 0xF9AE,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xE062,      0, /* 0x40 */
-         0, 0xEAB4,      0,      0,      0,      0, 0xE6DD, 0xF84A, /* 0x40 */
-    0xF237, 0xF5BD,      0, 0xF797,      0,      0, 0xF1E8,      0, /* 0x50 */
-         0,      0,      0,      0, 0xE571,      0, 0xE3A3, 0xEBD6, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xF7F8,      0, 0xE8CA, /* 0x60 */
-    0xE0F9, 0xE564,      0, 0xE7DC,      0, 0xF24E,      0, 0xF6ED, /* 0x70 */
-         0,      0,      0, 0xE47E,      0,      0, 0xEBE6, 0xF6F9, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xE9ED, /* 0x80 */
-         0, 0xEF6B,      0, 0xE8B3,      0,      0,      0, 0xE3F7, /* 0x80 */
-    0xEB40,      0,      0, 0xE572,      0, 0xF667,      0, 0xE6F9, /* 0x90 */
-         0,      0, 0xE76D,      0, 0xE1FD, 0xF43B,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE1BD, /* 0xA0 */
-    0xF752,      0,      0, 0xF43C,      0,      0, 0xE03D, 0xE03E, /* 0xB0 */
-    0xE2AE,      0,      0,      0,      0,      0, 0xECC2,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xE947,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE8DA, /* 0xC0 */
-    0xE7BB, 0xE095, 0xF663, 0xEE9A, 0xF097,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xF098,      0,      0, 0xF69B,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xE2AF,      0,      0, 0xE063,      0,      0, 0xE03F, /* 0xE0 */
-    0xE440, 0xF3BA,      0, 0xE6B3, 0xECC3, 0xF4FD, 0xEA6A,      0, /* 0xF0 */
-         0,      0,      0, 0xEA6B,      0,      0, 0xF2DE          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF5CC, 	 0, 	 0, 0xF975, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xF055, 0xF095, 	 0, 0xE9DB, 	 0, 0xE967, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xEA9F, 0xF49B, 	 0, 0xE5C7, /* 0x10 */
+         0, 	 0, 	 0, 0xE760, 	 0, 0xF358, 0xE3A1, 0xE3A2, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7D4, 0xE678, /* 0x20 */
+    0xE7CA, 	 0, 0xE841, 0xE757, 0xE972, 0xF4CE, 0xF5F4, 	 0, /* 0x20 */
+         0, 0xF3B9, 	 0, 	 0, 0xE863, 	 0, 0xF67A, 	 0, /* 0x30 */
+         0, 	 0, 0xE2F5, 	 0, 	 0, 0xF9AE, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE062, 	 0, /* 0x40 */
+         0, 0xEAB4, 	 0, 	 0, 	 0, 	 0, 0xE6DD, 0xF84A, /* 0x40 */
+    0xF237, 0xF5BD, 	 0, 0xF797, 	 0, 	 0, 0xF1E8, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xE571, 	 0, 0xE3A3, 0xEBD6, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF7F8, 	 0, 0xE8CA, /* 0x60 */
+    0xE0F9, 0xE564, 	 0, 0xE7DC, 	 0, 0xF24E, 	 0, 0xF6ED, /* 0x70 */
+         0, 	 0, 	 0, 0xE47E, 	 0, 	 0, 0xEBE6, 0xF6F9, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9ED, /* 0x80 */
+         0, 0xEF6B, 	 0, 0xE8B3, 	 0, 	 0, 	 0, 0xE3F7, /* 0x80 */
+    0xEB40, 	 0, 	 0, 0xE572, 	 0, 0xF667, 	 0, 0xE6F9, /* 0x90 */
+         0, 	 0, 0xE76D, 	 0, 0xE1FD, 0xF43B, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1BD, /* 0xA0 */
+    0xF752, 	 0, 	 0, 0xF43C, 	 0, 	 0, 0xE03D, 0xE03E, /* 0xB0 */
+    0xE2AE, 	 0, 	 0, 	 0, 	 0, 	 0, 0xECC2, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xE947, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8DA, /* 0xC0 */
+    0xE7BB, 0xE095, 0xF663, 0xEE9A, 0xF097, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xF098, 	 0, 	 0, 0xF69B, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xE2AF, 	 0, 	 0, 0xE063, 	 0, 	 0, 0xE03F, /* 0xE0 */
+    0xE440, 0xF3BA, 	 0, 0xE6B3, 0xECC3, 0xF4FD, 0xEA6A, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xEA6B, 	 0, 	 0, 0xF2DE			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_68[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xEC73, 0xF29D,      0,      0, 0xEAF7, 0xE6CA, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xE278, 0xE8DB,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xF3BB,      0,      0,      0,      0, 0xEFF1, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xF847, 0xE356,      0,      0, 0xE13B, 0xF238,      0,      0, /* 0x30 */
-    0xE0FA, 0xF7F9, 0xE19F, 0xE4FE,      0,      0,      0,      0, /* 0x40 */
-    0xED60,      0,      0,      0,      0,      0, 0xF47E,      0, /* 0x40 */
-    0xE565, 0xEACD,      0, 0xF948, 0xE3D0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xF45D,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xF6D2,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xE064, /* 0x70 */
-         0, 0xE5D9,      0,      0,      0, 0xE76E,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0, 0xE1D9, /* 0x80 */
-         0,      0,      0, 0xF239, 0xF64C,      0,      0, 0xE16B, /* 0x90 */
-         0,      0,      0,      0,      0, 0xF359,      0, 0xF99E, /* 0x90 */
-         0, 0xEF59, 0xF5A0,      0,      0,      0,      0, 0xEEFC, /* 0xA0 */
-    0xE6DE,      0,      0,      0,      0, 0xEA6C,      0, 0xF33C, /* 0xA0 */
-    0xE1A0, 0xE1E1,      0, 0xEBBA,      0, 0xE8EF, 0xE842,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xE3A5, 0xE948,      0,      0, /* 0xC0 */
-         0, 0xE798,      0, 0xE3A4,      0, 0xE1E2,      0,      0, /* 0xC0 */
-         0,      0, 0xE97A,      0,      0, 0xF399,      0, 0xF35A, /* 0xD0 */
-    0xE34E,      0, 0xE9DC,      0,      0,      0,      0, 0xE566, /* 0xD0 */
-    0xE4D6,      0,      0,      0,      0,      0,      0, 0xF1D0, /* 0xE0 */
-    0xE1A1,      0,      0,      0,      0,      0, 0xEAB5,      0, /* 0xE0 */
-         0,      0, 0xEAF8,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xE531, 0xE242                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xEC73, 0xF29D, 	 0, 	 0, 0xEAF7, 0xE6CA, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xE278, 0xE8DB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF3BB, 	 0, 	 0, 	 0, 	 0, 0xEFF1, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xF847, 0xE356, 	 0, 	 0, 0xE13B, 0xF238, 	 0, 	 0, /* 0x30 */
+    0xE0FA, 0xF7F9, 0xE19F, 0xE4FE, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xED60, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF47E, 	 0, /* 0x40 */
+    0xE565, 0xEACD, 	 0, 0xF948, 0xE3D0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF45D, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF6D2, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE064, /* 0x70 */
+         0, 0xE5D9, 	 0, 	 0, 	 0, 0xE76E, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1D9, /* 0x80 */
+         0, 	 0, 	 0, 0xF239, 0xF64C, 	 0, 	 0, 0xE16B, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF359, 	 0, 0xF99E, /* 0x90 */
+         0, 0xEF59, 0xF5A0, 	 0, 	 0, 	 0, 	 0, 0xEEFC, /* 0xA0 */
+    0xE6DE, 	 0, 	 0, 	 0, 	 0, 0xEA6C, 	 0, 0xF33C, /* 0xA0 */
+    0xE1A0, 0xE1E1, 	 0, 0xEBBA, 	 0, 0xE8EF, 0xE842, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xE3A5, 0xE948, 	 0, 	 0, /* 0xC0 */
+         0, 0xE798, 	 0, 0xE3A4, 	 0, 0xE1E2, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE97A, 	 0, 	 0, 0xF399, 	 0, 0xF35A, /* 0xD0 */
+    0xE34E, 	 0, 0xE9DC, 	 0, 	 0, 	 0, 	 0, 0xE566, /* 0xD0 */
+    0xE4D6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF1D0, /* 0xE0 */
+    0xE1A1, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEAB5, 	 0, /* 0xE0 */
+         0, 	 0, 0xEAF8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xE531, 0xE242											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_69[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xEF5A,      0,      0,      0,      0, 0xF0F5,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0xECD5, 0xF5D0,      0, /* 0x00 */
-         0,      0, 0xF5A1,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xE7A7, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xEDAB,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xEE5B,      0, 0xF5F1, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xEDC5,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xF7A3, 0xEB6B, 0xF67B,      0, 0xE0F1, /* 0x50 */
-         0, 0xE7EA, 0xF5A2,      0,      0,      0, 0xE6D1,      0, /* 0x50 */
-    0xE3F8, 0xF09A, 0xF09B, 0xE843,      0,      0,      0,      0, /* 0x60 */
-    0xF2DF,      0,      0, 0xF3EF,      0, 0xEDF6, 0xF24F, 0xEC74, /* 0x60 */
-         0,      0,      0,      0,      0, 0xE34F,      0, 0xF83C, /* 0x70 */
-    0xF5D1, 0xEEB3,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xEFBE,      0,      0, /* 0x90 */
-         0,      0,      0, 0xF45E, 0xE8B4,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xF95E,      0, 0xE9EE, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xEEB4,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xE6B4,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xF6B4,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE1BE,      0, 0xE879,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xE2B0, 0xF6D9, 0xF4E6,      0,      0, /* 0xC0 */
-    0xE269,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xE23A,      0, 0xE0C8,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xE337,      0, 0xF35B,      0, 0xE357  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xEF5A, 	 0, 	 0, 	 0, 	 0, 0xF0F5, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xECD5, 0xF5D0, 	 0, /* 0x00 */
+         0, 	 0, 0xF5A1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7A7, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xEDAB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEE5B, 	 0, 0xF5F1, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xEDC5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xF7A3, 0xEB6B, 0xF67B, 	 0, 0xE0F1, /* 0x50 */
+         0, 0xE7EA, 0xF5A2, 	 0, 	 0, 	 0, 0xE6D1, 	 0, /* 0x50 */
+    0xE3F8, 0xF09A, 0xF09B, 0xE843, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xF2DF, 	 0, 	 0, 0xF3EF, 	 0, 0xEDF6, 0xF24F, 0xEC74, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE34F, 	 0, 0xF83C, /* 0x70 */
+    0xF5D1, 0xEEB3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEFBE, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xF45E, 0xE8B4, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF95E, 	 0, 0xE9EE, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEEB4, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xE6B4, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xF6B4, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE1BE, 	 0, 0xE879, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xE2B0, 0xF6D9, 0xF4E6, 	 0, 	 0, /* 0xC0 */
+    0xE269, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE23A, 	 0, 0xE0C8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xE337, 	 0, 0xF35B, 	 0, 0xE357	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_6A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xED55,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xE8E0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xE5DA,      0, 0xE6A7,      0,      0,      0, 0xF250, /* 0x10 */
-         0, 0xF798,      0,      0,      0,      0, 0xF5D2, 0xF1E9, /* 0x10 */
-         0, 0xE7BC,      0, 0xEDC6,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xF5A3,      0,      0, /* 0x30 */
-    0xE864, 0xEC37, 0xF8FC,      0,      0, 0xF3DC,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xE096,      0,      0,      0, /* 0x40 */
-    0xEF9C,      0,      0, 0xE279,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xEFF8, 0xEC75,      0,      0,      0,      0, /* 0x50 */
-    0xE349, 0xE594,      0,      0,      0,      0,      0, 0xE3A6, /* 0x50 */
-         0, 0xEACE,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xF996,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xE4AA,      0,      0,      0, 0xE13C,      0,      0,      0, /* 0x80 */
-         0, 0xF2E0,      0,      0,      0, 0xEDE5, 0xE365,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0, 0xE8FC, /* 0x90 */
-         0,      0,      0,      0, 0xF976,      0,      0,      0, /* 0x90 */
-         0,      0, 0xE0FE, 0xF1EA,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xEA41,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xF7E3,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xE532, 0xE2F6,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xE660,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xE5EA, 0xF3EE,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xF85B,      0, /* 0xF0 */
-         0,      0,      0, 0xEDA1                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xED55, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xE8E0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xE5DA, 	 0, 0xE6A7, 	 0, 	 0, 	 0, 0xF250, /* 0x10 */
+         0, 0xF798, 	 0, 	 0, 	 0, 	 0, 0xF5D2, 0xF1E9, /* 0x10 */
+         0, 0xE7BC, 	 0, 0xEDC6, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF5A3, 	 0, 	 0, /* 0x30 */
+    0xE864, 0xEC37, 0xF8FC, 	 0, 	 0, 0xF3DC, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xE096, 	 0, 	 0, 	 0, /* 0x40 */
+    0xEF9C, 	 0, 	 0, 0xE279, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xEFF8, 0xEC75, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xE349, 0xE594, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE3A6, /* 0x50 */
+         0, 0xEACE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xF996, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xE4AA, 	 0, 	 0, 	 0, 0xE13C, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xF2E0, 	 0, 	 0, 	 0, 0xEDE5, 0xE365, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8FC, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xF976, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xE0FE, 0xF1EA, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xEA41, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xF7E3, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xE532, 0xE2F6, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xE660, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xE5EA, 0xF3EE, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF85B, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xEDA1									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_6B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xE5B1,      0,      0,      0, /* 0x00 */
-         0,      0, 0xE2ED,      0, 0xF1EB,      0,      0,      0, /* 0x00 */
-         0,      0, 0xE5B2,      0,      0,      0, 0xE5BC,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xF9E2, 0xF4AD,      0, 0xF9DB,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xEFB0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xE3A7,      0,      0, 0xF9E3, 0xE243,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xF9E4, 0xF85E, /* 0x40 */
-         0,      0,      0,      0, 0xE040,      0, 0xF6A7,      0, /* 0x40 */
-    0xE2B1,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xEE32, /* 0x50 */
-         0, 0xF946, 0xF43D, 0xF2E1, 0xF4AE, 0xE956, 0xE7EB,      0, /* 0x60 */
-         0,      0, 0xEF70,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xEBA8,      0,      0,      0,      0, 0xE5F6, /* 0x70 */
-    0xE2FD,      0,      0, 0xEA6D,      0,      0,      0, 0xE7D1, /* 0x70 */
-         0,      0,      0, 0xED7A, 0xF45F,      0, 0xF6BF,      0, /* 0x80 */
-         0, 0xEC76, 0xEC38,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xECD6,      0, /* 0x90 */
-    0xF1D1,      0,      0,      0,      0,      0, 0xEFF9,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xE641, 0xEA42, /* 0xA0 */
-         0,      0, 0xEB78,      0,      0, 0xE4AB,      0, 0xF0DC, /* 0xB0 */
-         0,      0, 0xEAAF,      0, 0xE053,      0,      0, 0xF29E, /* 0xB0 */
-         0, 0xF9C3,      0,      0,      0, 0xF0F6, 0xE2B2,      0, /* 0xC0 */
-         0,      0,      0, 0xE7EC,      0, 0xE7BD,      0, 0xE76F, /* 0xC0 */
-         0,      0, 0xE548, 0xF0BE, 0xE9EF,      0, 0xE9F0, 0xE9F1, /* 0xD0 */
-    0xE9F2,      0,      0, 0xE7BE,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xF8C6, 0xE2B3                          /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xE5B1, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xE2ED, 	 0, 0xF1EB, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xE5B2, 	 0, 	 0, 	 0, 0xE5BC, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xF9E2, 0xF4AD, 	 0, 0xF9DB, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xEFB0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xE3A7, 	 0, 	 0, 0xF9E3, 0xE243, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF9E4, 0xF85E, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xE040, 	 0, 0xF6A7, 	 0, /* 0x40 */
+    0xE2B1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEE32, /* 0x50 */
+         0, 0xF946, 0xF43D, 0xF2E1, 0xF4AE, 0xE956, 0xE7EB, 	 0, /* 0x60 */
+         0, 	 0, 0xEF70, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xEBA8, 	 0, 	 0, 	 0, 	 0, 0xE5F6, /* 0x70 */
+    0xE2FD, 	 0, 	 0, 0xEA6D, 	 0, 	 0, 	 0, 0xE7D1, /* 0x70 */
+         0, 	 0, 	 0, 0xED7A, 0xF45F, 	 0, 0xF6BF, 	 0, /* 0x80 */
+         0, 0xEC76, 0xEC38, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xECD6, 	 0, /* 0x90 */
+    0xF1D1, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEFF9, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE641, 0xEA42, /* 0xA0 */
+         0, 	 0, 0xEB78, 	 0, 	 0, 0xE4AB, 	 0, 0xF0DC, /* 0xB0 */
+         0, 	 0, 0xEAAF, 	 0, 0xE053, 	 0, 	 0, 0xF29E, /* 0xB0 */
+         0, 0xF9C3, 	 0, 	 0, 	 0, 0xF0F6, 0xE2B2, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xE7EC, 	 0, 0xE7BD, 	 0, 0xE76F, /* 0xC0 */
+         0, 	 0, 0xE548, 0xF0BE, 0xE9EF, 	 0, 0xE9F0, 0xE9F1, /* 0xD0 */
+    0xE9F2, 	 0, 	 0, 0xE7BE, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xF8C6, 0xE2B3							/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_6C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF29F,      0,      0,      0,      0,      0,      0, 0xED3B, /* 0x00 */
-         0, 0xE855,      0, 0xE77C,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xE3A8,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xEC39,      0,      0, 0xEA4C, /* 0x30 */
-    0xEEB5,      0,      0,      0,      0,      0, 0xE8F0,      0, /* 0x30 */
-    0xF2E2, 0xF3F0, 0xE2B4,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xE8F1,      0, /* 0x40 */
-    0xEB41,      0,      0,      0,      0, 0xEAA5,      0, 0xF7D2, /* 0x50 */
-         0,      0, 0xEEFD,      0,      0, 0xEE33, 0xF8F1, 0xE0B0, /* 0x50 */
-    0xF43E,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0xE1E7,      0, 0xEF6C,      0,      0, 0xEED7,      0,      0, /* 0x60 */
-    0xF6C0,      0, 0xE373,      0,      0,      0, 0xE831,      0, /* 0x70 */
-         0,      0, 0xE14D,      0,      0, 0xE3A9, 0xE9CC,      0, /* 0x70 */
-         0, 0xECFE, 0xE3AA, 0xEF3A,      0, 0xF046, 0xF7FA, 0xEE5C, /* 0x80 */
-    0xF668,      0,      0,      0, 0xE557,      0,      0,      0, /* 0x80 */
-    0xE7CB,      0, 0xE7D2, 0xE4CB, 0xE799, 0xE839, 0xF5F8,      0, /* 0x90 */
-         0, 0xEA6E, 0xF43F, 0xF739,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xE758,      0,      0, 0xF251,      0, /* 0xA0 */
-         0,      0,      0, 0xF7C1,      0,      0,      0,      0, /* 0xB0 */
-    0xE9F3, 0xF09C,      0, 0xF64D, 0xEBBB, 0xE1BF, 0xF564, 0xEE5D, /* 0xB0 */
-         0, 0xF95F, 0xF8A2,      0, 0xEB6C,      0,      0,      0, /* 0xC0 */
-         0, 0xF54B, 0xE865,      0, 0xF7B2,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xF8F2,      0, 0xE8F6,      0, 0xEA6F, /* 0xD0 */
-         0,      0,      0, 0xE8F2,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xF76C, 0xF6EE, 0xF0E8,      0, 0xE49C,      0,      0, /* 0xE0 */
-    0xF3BC,      0,      0, 0xF86A,      0,      0, 0xE87A, 0xE856, /* 0xE0 */
-    0xF6C1,      0,      0, 0xEEB6                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF29F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xED3B, /* 0x00 */
+         0, 0xE855, 	 0, 0xE77C, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xE3A8, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xEC39, 	 0, 	 0, 0xEA4C, /* 0x30 */
+    0xEEB5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8F0, 	 0, /* 0x30 */
+    0xF2E2, 0xF3F0, 0xE2B4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8F1, 	 0, /* 0x40 */
+    0xEB41, 	 0, 	 0, 	 0, 	 0, 0xEAA5, 	 0, 0xF7D2, /* 0x50 */
+         0, 	 0, 0xEEFD, 	 0, 	 0, 0xEE33, 0xF8F1, 0xE0B0, /* 0x50 */
+    0xF43E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xE1E7, 	 0, 0xEF6C, 	 0, 	 0, 0xEED7, 	 0, 	 0, /* 0x60 */
+    0xF6C0, 	 0, 0xE373, 	 0, 	 0, 	 0, 0xE831, 	 0, /* 0x70 */
+         0, 	 0, 0xE14D, 	 0, 	 0, 0xE3A9, 0xE9CC, 	 0, /* 0x70 */
+         0, 0xECFE, 0xE3AA, 0xEF3A, 	 0, 0xF046, 0xF7FA, 0xEE5C, /* 0x80 */
+    0xF668, 	 0, 	 0, 	 0, 0xE557, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE7CB, 	 0, 0xE7D2, 0xE4CB, 0xE799, 0xE839, 0xF5F8, 	 0, /* 0x90 */
+         0, 0xEA6E, 0xF43F, 0xF739, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xE758, 	 0, 	 0, 0xF251, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xF7C1, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xE9F3, 0xF09C, 	 0, 0xF64D, 0xEBBB, 0xE1BF, 0xF564, 0xEE5D, /* 0xB0 */
+         0, 0xF95F, 0xF8A2, 	 0, 0xEB6C, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xF54B, 0xE865, 	 0, 0xF7B2, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xF8F2, 	 0, 0xE8F6, 	 0, 0xEA6F, /* 0xD0 */
+         0, 	 0, 	 0, 0xE8F2, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xF76C, 0xF6EE, 0xF0E8, 	 0, 0xE49C, 	 0, 	 0, /* 0xE0 */
+    0xF3BC, 	 0, 	 0, 0xF86A, 	 0, 	 0, 0xE87A, 0xE856, /* 0xE0 */
+    0xF6C1, 	 0, 	 0, 0xEEB6									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_6D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xEDC7, 0xE63C,      0,      0,      0, /* 0x00 */
-         0, 0xE957,      0,      0,      0,      0,      0, 0xEBA9, /* 0x10 */
-         0, 0xEC3A,      0, 0xE5A6,      0,      0, 0xE567,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xF460,      0, 0xF09D, /* 0x20 */
-         0, 0xEB6D, 0xF8F3,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xF3BD,      0,      0, 0xEC77, 0xF9D7,      0, /* 0x30 */
-    0xE258, 0xF047,      0, 0xF950,      0, 0xF9E7, 0xF6EF,      0, /* 0x30 */
-         0, 0xE6B5,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xF2BA, 0xF3DD,      0, 0xEA43,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xEF5B,      0,      0, 0xF76D,      0, /* 0x60 */
-         0, 0xF8C7, 0xE5C8,      0, 0xE6DF,      0, 0xE9A9,      0, /* 0x60 */
-         0,      0,      0,      0, 0xEFB1,      0,      0, 0xF83D, /* 0x70 */
-    0xF669, 0xF896,      0,      0,      0,      0,      0, 0xF73A, /* 0x70 */
-         0,      0,      0,      0,      0, 0xEE7E,      0, 0xE16C, /* 0x80 */
-    0xEBBC, 0xEB91,      0,      0, 0xEFBF, 0xF99F, 0xEE5E,      0, /* 0x80 */
-         0, 0xEBD7,      0, 0xEE5F,      0, 0xF593,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0xED95, /* 0xA0 */
-         0,      0, 0xED9D,      0,      0, 0xF7E4,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xF2E3,      0,      0, 0xE2EE, 0xF64E, 0xEB42, 0xF9A0, 0xE3AB, /* 0xC0 */
-         0,      0,      0, 0xE6FA,      0,      0,      0, 0xF8C8, /* 0xC0 */
-         0, 0xEC67,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xE533, 0xF39A, 0xE6A8,      0,      0,      0, 0xEBE7,      0, /* 0xD0 */
-         0, 0xE4BF,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xF2E4,      0, 0xE6C5, 0xF0E2,      0,      0, 0xF977,      0, /* 0xE0 */
-         0, 0xED32,      0, 0xEC78,      0, 0xEE60,      0, 0xF8E8, /* 0xF0 */
-    0xF578, 0xEDF4, 0xF54C, 0xF565                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xEDC7, 0xE63C, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xE957, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEBA9, /* 0x10 */
+         0, 0xEC3A, 	 0, 0xE5A6, 	 0, 	 0, 0xE567, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF460, 	 0, 0xF09D, /* 0x20 */
+         0, 0xEB6D, 0xF8F3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF3BD, 	 0, 	 0, 0xEC77, 0xF9D7, 	 0, /* 0x30 */
+    0xE258, 0xF047, 	 0, 0xF950, 	 0, 0xF9E7, 0xF6EF, 	 0, /* 0x30 */
+         0, 0xE6B5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xF2BA, 0xF3DD, 	 0, 0xEA43, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xEF5B, 	 0, 	 0, 0xF76D, 	 0, /* 0x60 */
+         0, 0xF8C7, 0xE5C8, 	 0, 0xE6DF, 	 0, 0xE9A9, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xEFB1, 	 0, 	 0, 0xF83D, /* 0x70 */
+    0xF669, 0xF896, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF73A, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEE7E, 	 0, 0xE16C, /* 0x80 */
+    0xEBBC, 0xEB91, 	 0, 	 0, 0xEFBF, 0xF99F, 0xEE5E, 	 0, /* 0x80 */
+         0, 0xEBD7, 	 0, 0xEE5F, 	 0, 0xF593, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xED95, /* 0xA0 */
+         0, 	 0, 0xED9D, 	 0, 	 0, 0xF7E4, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xF2E3, 	 0, 	 0, 0xE2EE, 0xF64E, 0xEB42, 0xF9A0, 0xE3AB, /* 0xC0 */
+         0, 	 0, 	 0, 0xE6FA, 	 0, 	 0, 	 0, 0xF8C8, /* 0xC0 */
+         0, 0xEC67, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE533, 0xF39A, 0xE6A8, 	 0, 	 0, 	 0, 0xEBE7, 	 0, /* 0xD0 */
+         0, 0xE4BF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xF2E4, 	 0, 0xE6C5, 0xF0E2, 	 0, 	 0, 0xF977, 	 0, /* 0xE0 */
+         0, 0xED32, 	 0, 0xEC78, 	 0, 0xEE60, 	 0, 0xF8E8, /* 0xF0 */
+    0xF578, 0xEDF4, 0xF54C, 0xF565									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_6E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xEAB6, /* 0x10 */
-         0, 0xF949, 0xF252, 0xE097,      0,      0,      0, 0xF2E5, /* 0x10 */
-    0xE0E2, 0xE534,      0, 0xEA70, 0xE89F, 0xED56, 0xEF4E,      0, /* 0x20 */
-         0,      0,      0, 0xEB6E, 0xF644, 0xF062,      0, 0xF7FB, /* 0x20 */
-         0,      0, 0xEB52,      0, 0xE074,      0, 0xEEB7,      0, /* 0x30 */
-    0xF09F,      0, 0xE7DD,      0, 0xE844, 0xF23A, 0xF8E9,      0, /* 0x30 */
-         0,      0,      0, 0xE8CB, 0xE845,      0,      0,      0, /* 0x40 */
-         0,      0, 0xF3BE,      0,      0, 0xE4AC,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xF8C9,      0, /* 0x50 */
-    0xEACF,      0,      0, 0xE4C0, 0xECD7,      0, 0xF2E6, 0xF960, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xEFC0, /* 0x60 */
-         0,      0,      0, 0xF5D3,      0,      0, 0xF16C, 0xF6B7, /* 0x60 */
-         0,      0, 0xF048, 0xE3F9,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xE958,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xF049,      0,      0,      0,      0,      0, 0xF3DE,      0, /* 0x90 */
-         0,      0,      0,      0, 0xE6B6, 0xE2B5,      0, 0xE7A8, /* 0x90 */
-         0,      0, 0xF17E,      0,      0, 0xE9AA,      0,      0, /* 0xA0 */
-         0,      0, 0xE1A2, 0xEF3E,      0,      0,      0, 0xEBBD, /* 0xA0 */
-         0, 0xF461,      0,      0,      0,      0, 0xEFC1,      0, /* 0xB0 */
-         0,      0, 0xE49E,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xE8B5,      0, 0xF4E7, 0xE7A0,      0,      0, /* 0xC0 */
-         0, 0xF961,      0, 0xF1B2, 0xF53F,      0, 0xF8A3,      0, /* 0xC0 */
-         0, 0xF951,      0, 0xF23B, 0xE535,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xF594, /* 0xE0 */
-         0,      0,      0,      0, 0xF269,      0,      0,      0, /* 0xF0 */
-    0xF8CA,      0,      0,      0,      0,      0, 0xE1E3, 0xE74B  /* 0xF0 */
+         0, 0xF949, 0xF252, 0xE097, 	 0, 	 0, 	 0, 0xF2E5, /* 0x10 */
+    0xE0E2, 0xE534, 	 0, 0xEA70, 0xE89F, 0xED56, 0xEF4E, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xEB6E, 0xF644, 0xF062, 	 0, 0xF7FB, /* 0x20 */
+         0, 	 0, 0xEB52, 	 0, 0xE074, 	 0, 0xEEB7, 	 0, /* 0x30 */
+    0xF09F, 	 0, 0xE7DD, 	 0, 0xE844, 0xF23A, 0xF8E9, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xE8CB, 0xE845, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xF3BE, 	 0, 	 0, 0xE4AC, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF8C9, 	 0, /* 0x50 */
+    0xEACF, 	 0, 	 0, 0xE4C0, 0xECD7, 	 0, 0xF2E6, 0xF960, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEFC0, /* 0x60 */
+         0, 	 0, 	 0, 0xF5D3, 	 0, 	 0, 0xF16C, 0xF6B7, /* 0x60 */
+         0, 	 0, 0xF048, 0xE3F9, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xE958, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xF049, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF3DE, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xE6B6, 0xE2B5, 	 0, 0xE7A8, /* 0x90 */
+         0, 	 0, 0xF17E, 	 0, 	 0, 0xE9AA, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xE1A2, 0xEF3E, 	 0, 	 0, 	 0, 0xEBBD, /* 0xA0 */
+         0, 0xF461, 	 0, 	 0, 	 0, 	 0, 0xEFC1, 	 0, /* 0xB0 */
+         0, 	 0, 0xE49E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xE8B5, 	 0, 0xF4E7, 0xE7A0, 	 0, 	 0, /* 0xC0 */
+         0, 0xF961, 	 0, 0xF1B2, 0xF53F, 	 0, 0xF8A3, 	 0, /* 0xC0 */
+         0, 0xF951, 	 0, 0xF23B, 0xE535, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF594, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xF269, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xF8CA, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1E3, 0xE74B	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_6F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xEDDB, 0xF799,      0,      0,      0, 0xF664,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0, 0xE6A9, /* 0x00 */
-         0, 0xE0C9,      0,      0, 0xEE61, 0xF35C,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xE73E,      0, 0xF7D3, 0xE5FE,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xE74C, 0xF440,      0,      0,      0, /* 0x20 */
-         0, 0xEC3B, 0xF4E8,      0,      0,      0,      0,      0, /* 0x30 */
-    0xF2C2,      0,      0,      0,      0,      0,      0, 0xF1EC, /* 0x30 */
-         0, 0xEEB8,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xE8A0,      0,      0, 0xE14E,      0,      0, 0xF49E, /* 0x50 */
-    0xE87B,      0, 0xEC68, 0xF1D6,      0,      0, 0xE661, 0xEB43, /* 0x50 */
-         0,      0, 0xF962,      0, 0xF0C8,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xE4C1, 0xF35D,      0, /* 0x60 */
-    0xE2F7,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xF1D2,      0, 0xE568, 0xE959, 0xE6F1,      0, /* 0x70 */
-         0, 0xEABB,      0,      0, 0xF4A5,      0,      0,      0, /* 0x80 */
-    0xF55D,      0,      0,      0,      0, 0xF3BF, 0xF741,      0, /* 0x80 */
-    0xEFFA,      0,      0,      0, 0xF8CB,      0,      0, 0xE065, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xF7D4, 0xF6CA,      0,      0, 0xE658, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xF978, 0xF4BD, /* 0xA0 */
-         0, 0xF2A0,      0, 0xEEFE,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE4C2,      0,      0,      0,      0, 0xE4B6,      0, /* 0xB0 */
-    0xE13D, 0xF69C, 0xE642, 0xE468,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xEED8,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xECA5,      0,      0, /* 0xD0 */
-         0,      0, 0xEEB9,      0,      0,      0,      0, 0xF33D, /* 0xD0 */
-    0xF8CC, 0xF0A1,      0,      0, 0xE536,      0,      0,      0, /* 0xE0 */
-         0, 0xF8CD,      0, 0xE5BD, 0xF3DF,      0,      0, 0xF69D, /* 0xE0 */
-         0, 0xEA44,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0,      0, 0xE5EB          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xEDDB, 0xF799, 	 0, 	 0, 	 0, 0xF664, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6A9, /* 0x00 */
+         0, 0xE0C9, 	 0, 	 0, 0xEE61, 0xF35C, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xE73E, 	 0, 0xF7D3, 0xE5FE, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xE74C, 0xF440, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xEC3B, 0xF4E8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xF2C2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF1EC, /* 0x30 */
+         0, 0xEEB8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xE8A0, 	 0, 	 0, 0xE14E, 	 0, 	 0, 0xF49E, /* 0x50 */
+    0xE87B, 	 0, 0xEC68, 0xF1D6, 	 0, 	 0, 0xE661, 0xEB43, /* 0x50 */
+         0, 	 0, 0xF962, 	 0, 0xF0C8, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE4C1, 0xF35D, 	 0, /* 0x60 */
+    0xE2F7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xF1D2, 	 0, 0xE568, 0xE959, 0xE6F1, 	 0, /* 0x70 */
+         0, 0xEABB, 	 0, 	 0, 0xF4A5, 	 0, 	 0, 	 0, /* 0x80 */
+    0xF55D, 	 0, 	 0, 	 0, 	 0, 0xF3BF, 0xF741, 	 0, /* 0x80 */
+    0xEFFA, 	 0, 	 0, 	 0, 0xF8CB, 	 0, 	 0, 0xE065, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xF7D4, 0xF6CA, 	 0, 	 0, 0xE658, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF978, 0xF4BD, /* 0xA0 */
+         0, 0xF2A0, 	 0, 0xEEFE, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE4C2, 	 0, 	 0, 	 0, 	 0, 0xE4B6, 	 0, /* 0xB0 */
+    0xE13D, 0xF69C, 0xE642, 0xE468, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xEED8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xECA5, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xEEB9, 	 0, 	 0, 	 0, 	 0, 0xF33D, /* 0xD0 */
+    0xF8CC, 0xF0A1, 	 0, 	 0, 0xE536, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xF8CD, 	 0, 0xE5BD, 0xF3DF, 	 0, 	 0, 0xF69D, /* 0xE0 */
+         0, 0xEA44, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5EB			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_70[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xEDC8,      0,      0,      0, 0xF8A4, 0xE549,      0, /* 0x00 */
-         0, 0xEA71,      0, 0xED33,      0,      0,      0, 0xE6B7, /* 0x00 */
-         0, 0xF77E,      0,      0,      0, 0xEA45,      0,      0, /* 0x10 */
-    0xE662,      0, 0xF7D5, 0xEEBA, 0xF0D5, 0xE5F7, 0xF2E7, 0xEBBE, /* 0x10 */
-         0,      0,      0, 0xF83E,      0,      0,      0, 0xE679, /* 0x20 */
-    0xE67E,      0,      0,      0,      0,      0,      0, 0xEEBB, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xF15B, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xE5B3,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xE244,      0,      0,      0, /* 0x40 */
-    0xF8A5, 0xEBEE,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xF6A8,      0,      0,      0,      0, 0xF8CE,      0,      0, /* 0x50 */
-         0,      0,      0, 0xE74D,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xF8FD,      0,      0,      0,      0, /* 0x60 */
-    0xF979,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xE2B6,      0,      0,      0, 0xF1C7, 0xF23C,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xE16D,      0,      0, /* 0x80 */
-         0,      0, 0xF637,      0,      0,      0, 0xEE9C,      0, /* 0x80 */
-         0,      0, 0xF5A4,      0,      0,      0,      0,      0, /* 0x90 */
-    0xF9DC, 0xF1B3, 0xE259,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xF2E8,      0,      0, 0xEBBF,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xF86B, 0xE0E3, 0xF6A9,      0, 0xF8A6, /* 0xA0 */
-         0,      0,      0, 0xE949,      0,      0,      0, 0xF3C0, /* 0xB0 */
-    0xF1C8, 0xF2C3,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xE63D,      0,      0, 0xF9CE,      0,      0,      0, 0xEF31, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xF8F4, 0xE5A7,      0,      0,      0, 0xF3F6,      0, 0xEE63, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xE16E,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xF742,      0,      0,      0, 0xE97B                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xEDC8, 	 0, 	 0, 	 0, 0xF8A4, 0xE549, 	 0, /* 0x00 */
+         0, 0xEA71, 	 0, 0xED33, 	 0, 	 0, 	 0, 0xE6B7, /* 0x00 */
+         0, 0xF77E, 	 0, 	 0, 	 0, 0xEA45, 	 0, 	 0, /* 0x10 */
+    0xE662, 	 0, 0xF7D5, 0xEEBA, 0xF0D5, 0xE5F7, 0xF2E7, 0xEBBE, /* 0x10 */
+         0, 	 0, 	 0, 0xF83E, 	 0, 	 0, 	 0, 0xE679, /* 0x20 */
+    0xE67E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEEBB, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF15B, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5B3, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xE244, 	 0, 	 0, 	 0, /* 0x40 */
+    0xF8A5, 0xEBEE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xF6A8, 	 0, 	 0, 	 0, 	 0, 0xF8CE, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xE74D, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xF8FD, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xF979, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xE2B6, 	 0, 	 0, 	 0, 0xF1C7, 0xF23C, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE16D, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xF637, 	 0, 	 0, 	 0, 0xEE9C, 	 0, /* 0x80 */
+         0, 	 0, 0xF5A4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xF9DC, 0xF1B3, 0xE259, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xF2E8, 	 0, 	 0, 0xEBBF, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xF86B, 0xE0E3, 0xF6A9, 	 0, 0xF8A6, /* 0xA0 */
+         0, 	 0, 	 0, 0xE949, 	 0, 	 0, 	 0, 0xF3C0, /* 0xB0 */
+    0xF1C8, 0xF2C3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xE63D, 	 0, 	 0, 0xF9CE, 	 0, 	 0, 	 0, 0xEF31, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xF8F4, 0xE5A7, 	 0, 	 0, 	 0, 0xF3F6, 	 0, 0xEE63, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xE16E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xF742, 	 0, 	 0, 	 0, 0xE97B					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_71[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xF9B6,      0,      0,      0, /* 0x00 */
-         0, 0xEDEA,      0,      0, 0xF3E0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xE8CC, 0xE9CD,      0,      0,      0, 0xE558,      0, /* 0x10 */
-         0, 0xE7ED,      0,      0,      0,      0, 0xF5A5,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xEE9D,      0,      0,      0,      0,      0, 0xEE64,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xF9C8, /* 0x40 */
-         0, 0xE631, 0xF9BF,      0, 0xF963,      0, 0xF2A1,      0, /* 0x40 */
-    0xEEBC,      0,      0,      0,      0,      0, 0xE3EE,      0, /* 0x50 */
-         0, 0xEE65,      0,      0, 0xEFF2,      0, 0xEAB0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xE770, 0xF94A, 0xF9AF, 0xF35E, /* 0x60 */
-         0, 0xE8E1,      0,      0, 0xEDC9,      0, 0xF1B4,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xEB53,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xECD8,      0,      0,      0, /* 0x80 */
-         0, 0xEFFB, 0xF038,      0,      0,      0,      0, 0xF9B7, /* 0x80 */
-         0,      0, 0xF8A7,      0, 0xEFC2,      0,      0,      0, /* 0x90 */
-         0, 0xF9F7,      0,      0,      0,      0,      0, 0xEC69, /* 0x90 */
-         0,      0, 0xE97C,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xEF32,      0,      0,      0, /* 0xA0 */
-         0, 0xEE92,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xF9F8, 0xF9F9,      0,      0,      0, 0xF64F,      0, /* 0xB0 */
-         0, 0xEEA7,      0, 0xEE67,      0,      0,      0,      0, /* 0xC0 */
-    0xE595, 0xE559,      0,      0,      0,      0, 0xE69C,      0, /* 0xC0 */
-    0xE6F2,      0, 0xEBC0,      0, 0xE8E2, 0xEE68,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0xEEBD, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xF35F, 0xF4BE, 0xEC3C, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xF5B7, 0xEB92,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xF9B8, 0xECE8,      0, 0xE537, 0xEF9E  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xF9B6, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xEDEA, 	 0, 	 0, 0xF3E0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xE8CC, 0xE9CD, 	 0, 	 0, 	 0, 0xE558, 	 0, /* 0x10 */
+         0, 0xE7ED, 	 0, 	 0, 	 0, 	 0, 0xF5A5, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xEE9D, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEE64, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF9C8, /* 0x40 */
+         0, 0xE631, 0xF9BF, 	 0, 0xF963, 	 0, 0xF2A1, 	 0, /* 0x40 */
+    0xEEBC, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE3EE, 	 0, /* 0x50 */
+         0, 0xEE65, 	 0, 	 0, 0xEFF2, 	 0, 0xEAB0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xE770, 0xF94A, 0xF9AF, 0xF35E, /* 0x60 */
+         0, 0xE8E1, 	 0, 	 0, 0xEDC9, 	 0, 0xF1B4, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEB53, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xECD8, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xEFFB, 0xF038, 	 0, 	 0, 	 0, 	 0, 0xF9B7, /* 0x80 */
+         0, 	 0, 0xF8A7, 	 0, 0xEFC2, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xF9F7, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEC69, /* 0x90 */
+         0, 	 0, 0xE97C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xEF32, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xEE92, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xF9F8, 0xF9F9, 	 0, 	 0, 	 0, 0xF64F, 	 0, /* 0xB0 */
+         0, 0xEEA7, 	 0, 0xEE67, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xE595, 0xE559, 	 0, 	 0, 	 0, 	 0, 0xE69C, 	 0, /* 0xC0 */
+    0xE6F2, 	 0, 0xEBC0, 	 0, 0xE8E2, 0xEE68, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEEBD, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF35F, 0xF4BE, 0xEC3C, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF5B7, 0xEB92, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xF9B8, 0xECE8, 	 0, 0xE537, 0xEF9E	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_72[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF862,      0,      0,      0,      0,      0, 0xF791,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0xE663,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xE5B4,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xF360,      0, 0xF6F0, 0xF243,      0,      0, /* 0x20 */
-    0xF04A,      0, 0xF063,      0,      0, 0xF1C9, 0xE9AB,      0, /* 0x30 */
-         0,      0, 0xEDAC, 0xF9A1,      0, 0xEAD0, 0xF143,      0, /* 0x30 */
-    0xEAD1,      0,      0,      0,      0,      0, 0xF1ED, 0xF748, /* 0x40 */
-    0xF6FA,      0,      0,      0, 0xF73B,      0,      0,      0, /* 0x40 */
-         0,      0, 0xF570,      0,      0,      0,      0,      0, /* 0x50 */
-    0xE54A, 0xED43,      0, 0xEFDA,      0, 0xEA46,      0, 0xE7BF, /* 0x50 */
-         0, 0xE7C0, 0xE691,      0,      0,      0,      0, 0xE7CC, /* 0x60 */
-         0, 0xE83A,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xEAE5,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xF6E5,      0,      0,      0, 0xE142,      0,      0, /* 0x70 */
-    0xEAF9, 0xE6E0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xE54B,      0,      0,      0,      0, 0xF9FA, /* 0xA0 */
-         0,      0,      0,      0, 0xE143,      0,      0, 0xE8F3, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xEAD2,      0, 0xE25A,      0, 0xF26A,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xED74,      0, /* 0xC0 */
-    0xF8CF,      0,      0,      0,      0,      0,      0, 0xE2B7, /* 0xD0 */
-         0, 0xF253,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xE27A,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xEC3D,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xE6E1, 0xF897,      0,      0, 0xE5C9, 0xF73C                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF862, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF791, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xE663, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xE5B4, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF360, 	 0, 0xF6F0, 0xF243, 	 0, 	 0, /* 0x20 */
+    0xF04A, 	 0, 0xF063, 	 0, 	 0, 0xF1C9, 0xE9AB, 	 0, /* 0x30 */
+         0, 	 0, 0xEDAC, 0xF9A1, 	 0, 0xEAD0, 0xF143, 	 0, /* 0x30 */
+    0xEAD1, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF1ED, 0xF748, /* 0x40 */
+    0xF6FA, 	 0, 	 0, 	 0, 0xF73B, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xF570, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xE54A, 0xED43, 	 0, 0xEFDA, 	 0, 0xEA46, 	 0, 0xE7BF, /* 0x50 */
+         0, 0xE7C0, 0xE691, 	 0, 	 0, 	 0, 	 0, 0xE7CC, /* 0x60 */
+         0, 0xE83A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xEAE5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xF6E5, 	 0, 	 0, 	 0, 0xE142, 	 0, 	 0, /* 0x70 */
+    0xEAF9, 0xE6E0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xE54B, 	 0, 	 0, 	 0, 	 0, 0xF9FA, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xE143, 	 0, 	 0, 0xE8F3, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xEAD2, 	 0, 0xE25A, 	 0, 0xF26A, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xED74, 	 0, /* 0xC0 */
+    0xF8CF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2B7, /* 0xD0 */
+         0, 0xF253, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xE27A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xEC3D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xE6E1, 0xF897, 	 0, 	 0, 0xE5C9, 0xF73C					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_73[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xEED9,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xF4E9,      0, /* 0x10 */
-         0,      0,      0, 0xE77D, 0xECC4, 0xF393,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xEF75,      0,      0, /* 0x20 */
-         0, 0xEB9C, 0xF254, 0xE7DE,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0xF0A2, 0xF0A3, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xF952, 0xF04B, /* 0x30 */
-         0,      0,      0,      0, 0xEF3B, 0xEA72,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xF1EF,      0, 0xEF33,      0,      0,      0,      0, 0xE2F1, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0xE54C,      0, 0xF97A,      0,      0,      0,      0,      0, /* 0x60 */
-    0xEEBE,      0, 0xF994,      0,      0, 0xE644,      0,      0, /* 0x70 */
-    0xEC3E,      0, 0xE4B7, 0xF85C,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xF86C,      0, 0xF1B5, 0xEBE3, /* 0x80 */
-         0, 0xEF3C,      0, 0xEF6D,      0,      0, 0xF2E9,      0, /* 0x80 */
-         0,      0,      0,      0, 0xF54D,      0, 0xE2B8, 0xEFDB, /* 0x90 */
-    0xE3AC,      0,      0,      0,      0,      0,      0, 0xE857, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xF0C9, /* 0xA0 */
-         0, 0xEF5C,      0,      0,      0, 0xEA47,      0,      0, /* 0xA0 */
-         0,      0, 0xE64C, 0xE4E5,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xF86D,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xE866,      0, 0xE041,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xE858, 0xEAA6,      0, 0xF7B3, 0xF462,      0, 0xE054, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xE25B,      0, /* 0xD0 */
-         0, 0xE1F5,      0,      0,      0, 0xF9B0, 0xE5A8,      0, /* 0xD0 */
-    0xF3C1,      0,      0, 0xEC79, 0xE95A, 0xF144, 0xF850,      0, /* 0xE0 */
-         0, 0xF8A8, 0xE338,      0,      0, 0xE87C,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE7EE, /* 0xF0 */
-         0, 0xEB9D,      0,      0,      0, 0xF2EA, 0xF86E          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xEED9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4E9, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xE77D, 0xECC4, 0xF393, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEF75, 	 0, 	 0, /* 0x20 */
+         0, 0xEB9C, 0xF254, 0xE7DE, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF0A2, 0xF0A3, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF952, 0xF04B, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xEF3B, 0xEA72, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xF1EF, 	 0, 0xEF33, 	 0, 	 0, 	 0, 	 0, 0xE2F1, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xE54C, 	 0, 0xF97A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xEEBE, 	 0, 0xF994, 	 0, 	 0, 0xE644, 	 0, 	 0, /* 0x70 */
+    0xEC3E, 	 0, 0xE4B7, 0xF85C, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xF86C, 	 0, 0xF1B5, 0xEBE3, /* 0x80 */
+         0, 0xEF3C, 	 0, 0xEF6D, 	 0, 	 0, 0xF2E9, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xF54D, 	 0, 0xE2B8, 0xEFDB, /* 0x90 */
+    0xE3AC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE857, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF0C9, /* 0xA0 */
+         0, 0xEF5C, 	 0, 	 0, 	 0, 0xEA47, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xE64C, 0xE4E5, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xF86D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xE866, 	 0, 0xE041, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xE858, 0xEAA6, 	 0, 0xF7B3, 0xF462, 	 0, 0xE054, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE25B, 	 0, /* 0xD0 */
+         0, 0xE1F5, 	 0, 	 0, 	 0, 0xF9B0, 0xE5A8, 	 0, /* 0xD0 */
+    0xF3C1, 	 0, 	 0, 0xEC79, 0xE95A, 0xF144, 0xF850, 	 0, /* 0xE0 */
+         0, 0xF8A8, 0xE338, 	 0, 	 0, 0xE87C, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7EE, /* 0xF0 */
+         0, 0xEB9D, 	 0, 	 0, 	 0, 0xF2EA, 0xF86E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_74[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xEB54,      0, 0xE2B9,      0, 0xE5CA, 0xE6E2, 0xEC3F, /* 0x00 */
-         0, 0xE6B8,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0xEF5D,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xF66A,      0,      0,      0,      0, /* 0x10 */
-    0xF2A2, 0xEC6A, 0xF69E,      0,      0, 0xF8D0, 0xE3AD,      0, /* 0x20 */
-    0xE1E4,      0, 0xE3AE, 0xE97D, 0xEF5E,      0, 0xF39B, 0xE245, /* 0x20 */
-    0xEE9E,      0,      0, 0xE6FB, 0xE366, 0xE9F5, 0xF6F1,      0, /* 0x30 */
-    0xF69F,      0, 0xE8F7,      0,      0,      0,      0, 0xF8EA, /* 0x30 */
-    0xEFDC, 0xE7C1,      0, 0xF5F2, 0xEB55,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xF064,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xF7C2,      0, 0xF04C, /* 0x50 */
-         0, 0xE455, 0xF8D1, 0xEEC0, 0xF0A5,      0, 0xEAFA, 0xECA2, /* 0x50 */
-    0xE6B9,      0, 0xEFC3,      0, 0xEF9F, 0xEF3F,      0,      0, /* 0x60 */
-    0xF463, 0xF8A9, 0xE735,      0,      0,      0,      0, 0xE5CB, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xE358,      0, /* 0x70 */
-         0,      0, 0xE3AF, 0xE6E3,      0,      0,      0, 0xEB56, /* 0x80 */
-         0, 0xE632,      0, 0xF1F0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xE6F3,      0,      0,      0, 0xF964,      0, 0xE867, 0xE16F, /* 0x90 */
-         0, 0xF464,      0, 0xE3B0,      0, 0xE170,      0, 0xE8FD, /* 0xA0 */
-    0xF4BF,      0, 0xF361,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xF94B,      0, 0xEC40,      0,      0, 0xEE35,      0,      0, /* 0xB0 */
-         0, 0xEC6B,      0,      0,      0, 0xEADE,      0, 0xEB57, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xF491,      0, /* 0xC0 */
-         0,      0, 0xE171,      0,      0,      0,      0, 0xE67A, /* 0xC0 */
-         0,      0,      0,      0, 0xEEC2,      0,      0,      0, /* 0xD0 */
-    0xE246,      0, 0xF4C0,      0, 0xE1FE,      0,      0,      0, /* 0xD0 */
-    0xF8D2,      0, 0xF79A, 0xF6FB,      0,      0, 0xEF4F,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xEF47,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xF1B6  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xEB54, 	 0, 0xE2B9, 	 0, 0xE5CA, 0xE6E2, 0xEC3F, /* 0x00 */
+         0, 0xE6B8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xEF5D, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xF66A, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xF2A2, 0xEC6A, 0xF69E, 	 0, 	 0, 0xF8D0, 0xE3AD, 	 0, /* 0x20 */
+    0xE1E4, 	 0, 0xE3AE, 0xE97D, 0xEF5E, 	 0, 0xF39B, 0xE245, /* 0x20 */
+    0xEE9E, 	 0, 	 0, 0xE6FB, 0xE366, 0xE9F5, 0xF6F1, 	 0, /* 0x30 */
+    0xF69F, 	 0, 0xE8F7, 	 0, 	 0, 	 0, 	 0, 0xF8EA, /* 0x30 */
+    0xEFDC, 0xE7C1, 	 0, 0xF5F2, 0xEB55, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xF064, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF7C2, 	 0, 0xF04C, /* 0x50 */
+         0, 0xE455, 0xF8D1, 0xEEC0, 0xF0A5, 	 0, 0xEAFA, 0xECA2, /* 0x50 */
+    0xE6B9, 	 0, 0xEFC3, 	 0, 0xEF9F, 0xEF3F, 	 0, 	 0, /* 0x60 */
+    0xF463, 0xF8A9, 0xE735, 	 0, 	 0, 	 0, 	 0, 0xE5CB, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE358, 	 0, /* 0x70 */
+         0, 	 0, 0xE3AF, 0xE6E3, 	 0, 	 0, 	 0, 0xEB56, /* 0x80 */
+         0, 0xE632, 	 0, 0xF1F0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xE6F3, 	 0, 	 0, 	 0, 0xF964, 	 0, 0xE867, 0xE16F, /* 0x90 */
+         0, 0xF464, 	 0, 0xE3B0, 	 0, 0xE170, 	 0, 0xE8FD, /* 0xA0 */
+    0xF4BF, 	 0, 0xF361, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xF94B, 	 0, 0xEC40, 	 0, 	 0, 0xEE35, 	 0, 	 0, /* 0xB0 */
+         0, 0xEC6B, 	 0, 	 0, 	 0, 0xEADE, 	 0, 0xEB57, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF491, 	 0, /* 0xC0 */
+         0, 	 0, 0xE171, 	 0, 	 0, 	 0, 	 0, 0xE67A, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xEEC2, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE246, 	 0, 0xF4C0, 	 0, 0xE1FE, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xF8D2, 	 0, 0xF79A, 0xF6FB, 	 0, 	 0, 0xEF4F, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEF47, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF1B6	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_75[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE94A,      0,      0, 0xE144,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xF3F7,      0,      0,      0, 0xEF48,      0,      0, /* 0x10 */
-    0xE098,      0, 0xED34, 0xF566,      0,      0,      0, 0xEAE6, /* 0x10 */
-         0,      0,      0, 0xEAA7,      0, 0xEAE7, 0xEBC1,      0, /* 0x20 */
-    0xEFC4,      0,      0, 0xE95B, 0xEFC5,      0,      0,      0, /* 0x20 */
-    0xF2A3, 0xF0A6, 0xE0A3, 0xECE9,      0,      0,      0, 0xE3FB, /* 0x30 */
-    0xF2A4,      0, 0xF2EB,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xE344, /* 0x40 */
-         0,      0,      0,      0, 0xE1A3,      0,      0, 0xEF76, /* 0x40 */
-         0, 0xF2A5,      0, 0xE4CC, 0xE87D,      0,      0,      0, /* 0x50 */
-         0, 0xE6BA,      0, 0xF465, 0xF5E5, 0xE7EF,      0,      0, /* 0x50 */
-         0,      0, 0xF7B4,      0,      0, 0xE5D4, 0xF9CF,      0, /* 0x60 */
-         0,      0, 0xE8E3,      0,      0,      0,      0, 0xF3E1, /* 0x60 */
-    0xF146,      0,      0,      0,      0, 0xF8FE, 0xE4D7,      0, /* 0x70 */
-    0xE3B1,      0, 0xE0B1,      0,      0,      0,      0, 0xE3B2, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xE0B2, 0xF3C2, /* 0x80 */
-         0,      0, 0xF571, 0xF7B5,      0,      0, 0xEBC3, 0xEBC2, /* 0x80 */
-         0, 0xF0F7,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xEAA8,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xE0CA,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xEE49,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xF76E, 0xF7AA, 0xE099,      0, 0xF1B7,      0,      0, /* 0xB0 */
-    0xE4B8, 0xF466,      0,      0, 0xE569, 0xF255, 0xF492,      0, /* 0xB0 */
-         0,      0, 0xE042,      0,      0, 0xE94B,      0, 0xF3F8, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xF147,      0,      0, /* 0xC0 */
-         0,      0, 0xEDCA,      0, 0xF650, 0xF9DD,      0,      0, /* 0xD0 */
-    0xE573, 0xE172,      0, 0xF6D4,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xE6E5,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xE4C3,      0, 0xE736,      0, 0xF651,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xE9F6,      0, 0xE1C0                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE94A, 	 0, 	 0, 0xE144, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xF3F7, 	 0, 	 0, 	 0, 0xEF48, 	 0, 	 0, /* 0x10 */
+    0xE098, 	 0, 0xED34, 0xF566, 	 0, 	 0, 	 0, 0xEAE6, /* 0x10 */
+         0, 	 0, 	 0, 0xEAA7, 	 0, 0xEAE7, 0xEBC1, 	 0, /* 0x20 */
+    0xEFC4, 	 0, 	 0, 0xE95B, 0xEFC5, 	 0, 	 0, 	 0, /* 0x20 */
+    0xF2A3, 0xF0A6, 0xE0A3, 0xECE9, 	 0, 	 0, 	 0, 0xE3FB, /* 0x30 */
+    0xF2A4, 	 0, 0xF2EB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE344, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xE1A3, 	 0, 	 0, 0xEF76, /* 0x40 */
+         0, 0xF2A5, 	 0, 0xE4CC, 0xE87D, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xE6BA, 	 0, 0xF465, 0xF5E5, 0xE7EF, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xF7B4, 	 0, 	 0, 0xE5D4, 0xF9CF, 	 0, /* 0x60 */
+         0, 	 0, 0xE8E3, 	 0, 	 0, 	 0, 	 0, 0xF3E1, /* 0x60 */
+    0xF146, 	 0, 	 0, 	 0, 	 0, 0xF8FE, 0xE4D7, 	 0, /* 0x70 */
+    0xE3B1, 	 0, 0xE0B1, 	 0, 	 0, 	 0, 	 0, 0xE3B2, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0B2, 0xF3C2, /* 0x80 */
+         0, 	 0, 0xF571, 0xF7B5, 	 0, 	 0, 0xEBC3, 0xEBC2, /* 0x80 */
+         0, 0xF0F7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEAA8, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE0CA, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xEE49, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xF76E, 0xF7AA, 0xE099, 	 0, 0xF1B7, 	 0, 	 0, /* 0xB0 */
+    0xE4B8, 0xF466, 	 0, 	 0, 0xE569, 0xF255, 0xF492, 	 0, /* 0xB0 */
+         0, 	 0, 0xE042, 	 0, 	 0, 0xE94B, 	 0, 0xF3F8, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF147, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xEDCA, 	 0, 0xF650, 0xF9DD, 	 0, 	 0, /* 0xD0 */
+    0xE573, 0xE172, 	 0, 0xF6D4, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xE6E5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE4C3, 	 0, 0xE736, 	 0, 0xF651, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xE9F6, 	 0, 0xE1C0							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_76[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xEDDC,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0xEDCB,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xEBC4,      0,      0,      0,      0,      0, 0xEF40, /* 0x10 */
-    0xF540, 0xF4EA, 0xE87E,      0, 0xE6BB,      0, 0xEC41,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xE6AA,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xE69D,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xED6F,      0, 0xE066,      0, /* 0x40 */
-         0,      0, 0xF0A8,      0,      0,      0, 0xE8FE,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xF652,      0,      0, 0xF2BB,      0,      0,      0, /* 0x60 */
-         0, 0xE59F,      0,      0, 0xEB58,      0,      0,      0, /* 0x60 */
-    0xEF49,      0, 0xF2A6,      0,      0,      0,      0,      0, /* 0x70 */
-    0xE1A4,      0,      0, 0xE596, 0xE8A1, 0xE8DC, 0xE8DD,      0, /* 0x70 */
-         0,      0,      0,      0, 0xF26C,      0, 0xE0CB, 0xF965, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xE27B,      0, /* 0x80 */
-    0xE1C1,      0,      0, 0xF8D3,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xF7AB,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xF5D4,      0,      0,      0,      0, 0xE7A9, /* 0xB0 */
-         0,      0, 0xEFDD, 0xE8CD,      0,      0, 0xE9CE,      0, /* 0xC0 */
-    0xEEC3,      0, 0xF15C,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xF7EC,      0,      0,      0, 0xE0CC,      0, /* 0xD0 */
-         0,      0,      0, 0xEB9E, 0xE538,      0, 0xF1D3, 0xE791, /* 0xD0 */
-         0, 0xF467,      0, 0xE09A, 0xE891,      0,      0, 0xE664, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xE7CD,      0, /* 0xE0 */
-         0,      0, 0xE77E,      0, 0xF451,      0,      0,      0, /* 0xF0 */
-    0xEAD3,      0,      0,      0, 0xE892,      0, 0xEC7A          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xEDDC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEDCB, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xEBC4, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEF40, /* 0x10 */
+    0xF540, 0xF4EA, 0xE87E, 	 0, 0xE6BB, 	 0, 0xEC41, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xE6AA, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xE69D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xED6F, 	 0, 0xE066, 	 0, /* 0x40 */
+         0, 	 0, 0xF0A8, 	 0, 	 0, 	 0, 0xE8FE, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xF652, 	 0, 	 0, 0xF2BB, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xE59F, 	 0, 	 0, 0xEB58, 	 0, 	 0, 	 0, /* 0x60 */
+    0xEF49, 	 0, 0xF2A6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xE1A4, 	 0, 	 0, 0xE596, 0xE8A1, 0xE8DC, 0xE8DD, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xF26C, 	 0, 0xE0CB, 0xF965, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE27B, 	 0, /* 0x80 */
+    0xE1C1, 	 0, 	 0, 0xF8D3, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF7AB, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xF5D4, 	 0, 	 0, 	 0, 	 0, 0xE7A9, /* 0xB0 */
+         0, 	 0, 0xEFDD, 0xE8CD, 	 0, 	 0, 0xE9CE, 	 0, /* 0xC0 */
+    0xEEC3, 	 0, 0xF15C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xF7EC, 	 0, 	 0, 	 0, 0xE0CC, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xEB9E, 0xE538, 	 0, 0xF1D3, 0xE791, /* 0xD0 */
+         0, 0xF467, 	 0, 0xE09A, 0xE891, 	 0, 	 0, 0xE664, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7CD, 	 0, /* 0xE0 */
+         0, 	 0, 0xE77E, 	 0, 0xF451, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xEAD3, 	 0, 	 0, 	 0, 0xE892, 	 0, 0xEC7A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_77[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xEB9F,      0,      0, 0xE79A,      0,      0,      0, /* 0x00 */
-    0xF6AF, 0xE846,      0, 0xE067,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xF468,      0, /* 0x10 */
-    0xE79B,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xF86F,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xE2EF, /* 0x30 */
-    0xE7C2,      0, 0xF362,      0, 0xED61,      0,      0,      0, /* 0x30 */
-    0xF4B7,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xF870,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xF2EC,      0,      0,      0,      0, /* 0x50 */
-         0, 0xEC42,      0, 0xE54D,      0,      0, 0xE7CE,      0, /* 0x60 */
-         0,      0,      0, 0xF572,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xE539,      0,      0,      0,      0, 0xE1C2, 0xEEDA, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xF469,      0,      0,      0,      0, /* 0x80 */
-         0, 0xE7AA,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0xE74E,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xE93D,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xEC7B, 0xE69E,      0,      0, /* 0xA0 */
-    0xE09B,      0,      0, 0xE56A,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xF567, 0xE131,      0,      0, 0xE2BA, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xF5B8, /* 0xD0 */
-         0,      0,      0, 0xE7C3, 0xE378,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xECC5, 0xF0F8,      0, 0xF441,      0,      0, /* 0xE0 */
-         0, 0xE2BB,      0,      0,      0, 0xE4AD, 0xEF71, 0xE27C, /* 0xE0 */
-         0,      0,      0, 0xEB44                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xEB9F, 	 0, 	 0, 0xE79A, 	 0, 	 0, 	 0, /* 0x00 */
+    0xF6AF, 0xE846, 	 0, 0xE067, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF468, 	 0, /* 0x10 */
+    0xE79B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xF86F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2EF, /* 0x30 */
+    0xE7C2, 	 0, 0xF362, 	 0, 0xED61, 	 0, 	 0, 	 0, /* 0x30 */
+    0xF4B7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF870, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xF2EC, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xEC42, 	 0, 0xE54D, 	 0, 	 0, 0xE7CE, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xF572, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xE539, 	 0, 	 0, 	 0, 	 0, 0xE1C2, 0xEEDA, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xF469, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xE7AA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE74E, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE93D, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xEC7B, 0xE69E, 	 0, 	 0, /* 0xA0 */
+    0xE09B, 	 0, 	 0, 0xE56A, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xF567, 0xE131, 	 0, 	 0, 0xE2BA, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF5B8, /* 0xD0 */
+         0, 	 0, 	 0, 0xE7C3, 0xE378, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xECC5, 0xF0F8, 	 0, 0xF441, 	 0, 	 0, /* 0xE0 */
+         0, 0xE2BB, 	 0, 	 0, 	 0, 0xE4AD, 0xEF71, 0xE27C, /* 0xE0 */
+         0, 	 0, 	 0, 0xEB44									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_78[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xEA73,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xE9F7,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xF442, 0xF4F6, 0xF66B, /* 0x20 */
-         0,      0,      0,      0, 0xE6FE,      0,      0,      0, /* 0x20 */
-         0,      0, 0xF76F,      0, 0xF6F2,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xE339,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xEE6A, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xF5A6,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xE6BC, 0xE173,      0,      0, 0xEE6B, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xE9DD,      0,      0,      0, /* 0x70 */
-         0, 0xE3B3,      0,      0,      0,      0,      0, 0xF2ED, /* 0x80 */
-         0,      0,      0,      0, 0xE66E, 0xED96, 0xEBEF,      0, /* 0x80 */
-         0, 0xE9F8,      0,      0,      0,      0,      0, 0xEF5F, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xE075,      0,      0,      0, 0xE931, /* 0xA0 */
-         0, 0xEB45,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xF93C, 0xF93D, 0xE737,      0,      0,      0, /* 0xB0 */
-         0, 0xF1B8,      0,      0,      0, 0xE8B6,      0,      0, /* 0xC0 */
-         0,      0, 0xE692, 0xF4AF,      0,      0, 0xE1A5,      0, /* 0xC0 */
-    0xE893,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xE738,      0,      0,      0, 0xE174,      0,      0, 0xE3B4, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xE068,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xE894                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xEA73, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xE9F7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF442, 0xF4F6, 0xF66B, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xE6FE, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF76F, 	 0, 0xF6F2, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE339, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEE6A, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF5A6, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xE6BC, 0xE173, 	 0, 	 0, 0xEE6B, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xE9DD, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xE3B3, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF2ED, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xE66E, 0xED96, 0xEBEF, 	 0, /* 0x80 */
+         0, 0xE9F8, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEF5F, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xE075, 	 0, 	 0, 	 0, 0xE931, /* 0xA0 */
+         0, 0xEB45, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xF93C, 0xF93D, 0xE737, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xF1B8, 	 0, 	 0, 	 0, 0xE8B6, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE692, 0xF4AF, 	 0, 	 0, 0xE1A5, 	 0, /* 0xC0 */
+    0xE893, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE738, 	 0, 	 0, 	 0, 0xE174, 	 0, 	 0, 0xE3B4, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE068, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xE894									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_79[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xF5A7,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xF5A8,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xEE36,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xE5EC, 0xE5F8, 0xE895,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xECC6,      0,      0,      0, 0xEA74,      0, /* 0x30 */
-    0xEA75, 0xE3B5,      0,      0,      0,      0,      0, 0xE3B6, /* 0x40 */
-    0xE3B7, 0xF443,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xEFDE,      0,      0,      0,      0,      0, 0xF363, 0xF444, /* 0x50 */
-         0,      0, 0xF364, 0xE0E4, 0xF8D4, 0xF5E6, 0xECEA,      0, /* 0x50 */
-    0xEA76,      0,      0,      0,      0, 0xEAD4,      0,      0, /* 0x60 */
-    0xF79B,      0,      0,      0,      0, 0xF33E,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xE3B8,      0,      0,      0,      0, 0xE66F, /* 0x70 */
-         0, 0xE367,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xF931, 0xF2EE, 0xE968, /* 0x80 */
-         0, 0xEFDF,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0xEDDD, 0xF9FB, /* 0xA0 */
-         0,      0, 0xEB59,      0,      0,      0, 0xE659,      0, /* 0xA0 */
-         0, 0xE53A,      0, 0xEDCC,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xEFE0,      0,      0,      0, 0xE368, 0xF932, 0xE54E, /* 0xB0 */
-    0xEC43, 0xEA77,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xE94C, 0xE446, 0xF5D5,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xE231, 0xF5A9,      0,      0, 0xE9F9,      0,      0, /* 0xD0 */
-    0xE9FA,      0,      0,      0,      0,      0,      0, 0xF365, /* 0xD0 */
-         0,      0,      0,      0, 0xF66F,      0, 0xF46A, 0xED7B, /* 0xE0 */
-         0, 0xF493,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xF149                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xF5A7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF5A8, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEE36, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xE5EC, 0xE5F8, 0xE895, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xECC6, 	 0, 	 0, 	 0, 0xEA74, 	 0, /* 0x30 */
+    0xEA75, 0xE3B5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE3B6, /* 0x40 */
+    0xE3B7, 0xF443, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xEFDE, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF363, 0xF444, /* 0x50 */
+         0, 	 0, 0xF364, 0xE0E4, 0xF8D4, 0xF5E6, 0xECEA, 	 0, /* 0x50 */
+    0xEA76, 	 0, 	 0, 	 0, 	 0, 0xEAD4, 	 0, 	 0, /* 0x60 */
+    0xF79B, 	 0, 	 0, 	 0, 	 0, 0xF33E, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xE3B8, 	 0, 	 0, 	 0, 	 0, 0xE66F, /* 0x70 */
+         0, 0xE367, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF931, 0xF2EE, 0xE968, /* 0x80 */
+         0, 0xEFDF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEDDD, 0xF9FB, /* 0xA0 */
+         0, 	 0, 0xEB59, 	 0, 	 0, 	 0, 0xE659, 	 0, /* 0xA0 */
+         0, 0xE53A, 	 0, 0xEDCC, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xEFE0, 	 0, 	 0, 	 0, 0xE368, 0xF932, 0xE54E, /* 0xB0 */
+    0xEC43, 0xEA77, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xE94C, 0xE446, 0xF5D5, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xE231, 0xF5A9, 	 0, 	 0, 0xE9F9, 	 0, 	 0, /* 0xD0 */
+    0xE9FA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF365, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xF66F, 	 0, 0xF46A, 0xED7B, /* 0xE0 */
+         0, 0xF493, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xF149									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_7A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF9FC,      0,      0,      0,      0, 0xEBAA,      0,      0, /* 0x00 */
-    0xE069,      0,      0, 0xF2EF,      0, 0xF5AA,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0xF19B,      0,      0, 0xF73D, /* 0x10 */
-         0, 0xF452, 0xF653,      0, 0xE6D2,      0,      0, 0xF7A2, /* 0x10 */
-    0xF366,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0xF39C,      0, /* 0x20 */
-         0, 0xF670,      0,      0,      0,      0, 0xEFF3, 0xF453, /* 0x30 */
-         0,      0,      0, 0xE53B, 0xE043, 0xE1A6,      0, 0xE1C3, /* 0x30 */
-    0xE1DA,      0,      0,      0,      0,      0, 0xE7CF,      0, /* 0x40 */
-         0, 0xF654,      0,      0,      0, 0xF26D, 0xEEC4,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xEC44, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xEAE2, 0xEEDB,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xEF41,      0, 0xF93E,      0,      0,      0,      0, /* 0x60 */
-    0xEDCD,      0,      0,      0, 0xF87B,      0, 0xE2BC,      0, /* 0x70 */
-         0, 0xE2E2, 0xE1F6,      0,      0, 0xF2F0,      0, 0xF54E, /* 0x70 */
-         0, 0xE55D,      0,      0, 0xF4B8,      0,      0,      0, /* 0x80 */
-    0xEFA1,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xF494, 0xF4EB,      0, 0xF367,      0,      0, /* 0x90 */
-    0xE2D7,      0,      0,      0,      0,      0,      0, 0xE2DF, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xEF50, 0xEF51,      0,      0,      0, 0xE2E3, 0xEFA2, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xE33A,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xF4C1, 0xE33B,      0, 0xE574, /* 0xC0 */
-         0,      0, 0xF2BC, 0xE731,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE7DF, /* 0xD0 */
-         0, 0xF4D7,      0,      0,      0, 0xE94D,      0, 0xE175, /* 0xD0 */
-    0xF1F1,      0,      0, 0xF3E2,      0, 0xE56B,      0,      0, /* 0xE0 */
-         0,      0, 0xEC45,      0,      0, 0xE076,      0, 0xE4AE, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xE176,      0, /* 0xF0 */
-         0, 0xF3D3, 0xF5E7,      0,      0,      0,      0, 0xE06A  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF9FC, 	 0, 	 0, 	 0, 	 0, 0xEBAA, 	 0, 	 0, /* 0x00 */
+    0xE069, 	 0, 	 0, 0xF2EF, 	 0, 0xF5AA, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xF19B, 	 0, 	 0, 0xF73D, /* 0x10 */
+         0, 0xF452, 0xF653, 	 0, 0xE6D2, 	 0, 	 0, 0xF7A2, /* 0x10 */
+    0xF366, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF39C, 	 0, /* 0x20 */
+         0, 0xF670, 	 0, 	 0, 	 0, 	 0, 0xEFF3, 0xF453, /* 0x30 */
+         0, 	 0, 	 0, 0xE53B, 0xE043, 0xE1A6, 	 0, 0xE1C3, /* 0x30 */
+    0xE1DA, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7CF, 	 0, /* 0x40 */
+         0, 0xF654, 	 0, 	 0, 	 0, 0xF26D, 0xEEC4, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEC44, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xEAE2, 0xEEDB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xEF41, 	 0, 0xF93E, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xEDCD, 	 0, 	 0, 	 0, 0xF87B, 	 0, 0xE2BC, 	 0, /* 0x70 */
+         0, 0xE2E2, 0xE1F6, 	 0, 	 0, 0xF2F0, 	 0, 0xF54E, /* 0x70 */
+         0, 0xE55D, 	 0, 	 0, 0xF4B8, 	 0, 	 0, 	 0, /* 0x80 */
+    0xEFA1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xF494, 0xF4EB, 	 0, 0xF367, 	 0, 	 0, /* 0x90 */
+    0xE2D7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2DF, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xEF50, 0xEF51, 	 0, 	 0, 	 0, 0xE2E3, 0xEFA2, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xE33A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xF4C1, 0xE33B, 	 0, 0xE574, /* 0xC0 */
+         0, 	 0, 0xF2BC, 0xE731, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7DF, /* 0xD0 */
+         0, 0xF4D7, 	 0, 	 0, 	 0, 0xE94D, 	 0, 0xE175, /* 0xD0 */
+    0xF1F1, 	 0, 	 0, 0xF3E2, 	 0, 0xE56B, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xEC45, 	 0, 	 0, 0xE076, 	 0, 0xE4AE, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE176, 	 0, /* 0xF0 */
+         0, 0xF3D3, 0xF5E7, 	 0, 	 0, 	 0, 	 0, 0xE06A	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_7B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xF8EE, /* 0x00 */
-         0, 0xEBC5,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xEAE9,      0, 0xF26E,      0,      0, 0xF6C2,      0, /* 0x10 */
-    0xE732,      0,      0,      0,      0,      0, 0xE9AC,      0, /* 0x20 */
-         0,      0,      0,      0, 0xF33F, 0xE64D,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xEBAB,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xF7B6,      0, /* 0x40 */
-         0, 0xE597,      0, 0xE359, 0xF2A7, 0xEC7C,      0, 0xE8EA, /* 0x40 */
-    0xE25C, 0xF5E8, 0xF6D5,      0, 0xE4CD,      0, 0xF4FE,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xE345,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xEBA0,      0, 0xEAFB,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xEE6D,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xEF34,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xE0CD, /* 0x80 */
-         0,      0,      0, 0xF2A8,      0,      0,      0, 0xF244, /* 0x80 */
-         0,      0,      0,      0, 0xE868, 0xE3B9,      0, 0xEAA9, /* 0x90 */
-         0,      0, 0xF4B0,      0,      0, 0xE154,      0,      0, /* 0x90 */
-         0, 0xE247,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xF2A9,      0,      0, /* 0xA0 */
-         0, 0xEAD5,      0,      0, 0xF1D7,      0,      0,      0, /* 0xB0 */
-    0xF256,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xF2BD, 0xF966,      0,      0, 0xE8F4,      0, 0xF2AA, 0xF749, /* 0xC0 */
-         0, 0xF5E9,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xECD9,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xEBC6,      0,      0,      0, 0xE54F,      0,      0,      0, /* 0xE0 */
-         0, 0xEA78                                                  /* 0xE0 */
+         0, 0xEBC5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xEAE9, 	 0, 0xF26E, 	 0, 	 0, 0xF6C2, 	 0, /* 0x10 */
+    0xE732, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9AC, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xF33F, 0xE64D, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xEBAB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF7B6, 	 0, /* 0x40 */
+         0, 0xE597, 	 0, 0xE359, 0xF2A7, 0xEC7C, 	 0, 0xE8EA, /* 0x40 */
+    0xE25C, 0xF5E8, 0xF6D5, 	 0, 0xE4CD, 	 0, 0xF4FE, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xE345, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xEBA0, 	 0, 0xEAFB, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEE6D, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEF34, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0CD, /* 0x80 */
+         0, 	 0, 	 0, 0xF2A8, 	 0, 	 0, 	 0, 0xF244, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xE868, 0xE3B9, 	 0, 0xEAA9, /* 0x90 */
+         0, 	 0, 0xF4B0, 	 0, 	 0, 0xE154, 	 0, 	 0, /* 0x90 */
+         0, 0xE247, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF2A9, 	 0, 	 0, /* 0xA0 */
+         0, 0xEAD5, 	 0, 	 0, 0xF1D7, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xF256, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xF2BD, 0xF966, 	 0, 	 0, 0xE8F4, 	 0, 0xF2AA, 0xF749, /* 0xC0 */
+         0, 0xF5E9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xECD9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xEBC6, 	 0, 	 0, 	 0, 0xE54F, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xEA78													/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_7C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xF37A, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xF4C2,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xE4AF,      0, /* 0x10 */
-         0, 0xE06B,      0,      0,      0,      0,      0, 0xF967, /* 0x20 */
-         0,      0, 0xF1D8, 0xEBC7,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xF568, 0xE643, 0xE9AD, /* 0x30 */
-         0,      0,      0, 0xE5BE,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xF3C3, 0xF26F,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xE67B,      0,      0,      0, 0xF569,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xE6E6,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xE847,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0xE9FB,      0,      0,      0,      0, /* 0x80 */
-         0, 0xE9CF,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xE733,      0,      0, 0xE869,      0, 0xF368, /* 0x90 */
-    0xF2C4,      0,      0,      0,      0,      0,      0, 0xEBD8, /* 0x90 */
-         0,      0,      0,      0,      0, 0xF3D4,      0, 0xF1F2, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xE5DB,      0, /* 0xA0 */
-         0, 0xE5DC, 0xF4C4, 0xE0D7,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xEC46,      0,      0,      0,      0, 0xF2F1,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xF8D5,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xE4D8,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xE9D0, 0xF369, /* 0xD0 */
-    0xE0B3,      0,      0,      0,      0,      0,      0, 0xE5DD, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xE1A7,      0,      0, 0xE33C          /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xF4C2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4AF, 	 0, /* 0x10 */
+         0, 0xE06B, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF967, /* 0x20 */
+         0, 	 0, 0xF1D8, 0xEBC7, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF568, 0xE643, 0xE9AD, /* 0x30 */
+         0, 	 0, 	 0, 0xE5BE, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xF3C3, 0xF26F, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xE67B, 	 0, 	 0, 	 0, 0xF569, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xE6E6, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xE847, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0xE9FB, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xE9CF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE733, 	 0, 	 0, 0xE869, 	 0, 0xF368, /* 0x90 */
+    0xF2C4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEBD8, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF3D4, 	 0, 0xF1F2, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5DB, 	 0, /* 0xA0 */
+         0, 0xE5DC, 0xF4C4, 0xE0D7, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xEC46, 	 0, 	 0, 	 0, 	 0, 0xF2F1, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xF8D5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4D8, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9D0, 0xF369, /* 0xD0 */
+    0xE0B3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5DD, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xE1A7, 	 0, 	 0, 0xE33C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_7D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE3BA,      0, 0xF3C4,      0, 0xEDB3, 0xF8F5, 0xEFE1, 0xF9E0, /* 0x00 */
-    0xF94C,      0, 0xE832, 0xE833,      0, 0xE431,      0,      0, /* 0x00 */
-    0xE491,      0,      0,      0, 0xEC7D,      0,      0, 0xEA79, /* 0x10 */
-    0xE26C, 0xF445, 0xE374, 0xE9D1,      0,      0,      0,      0, /* 0x10 */
-    0xEBC8, 0xE8B7, 0xEAE3,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xF1B9, 0xF3C5,      0, 0xF4CF, 0xE6AB, /* 0x20 */
-    0xEBAC,      0,      0, 0xECEB,      0, 0xF257,      0,      0, /* 0x30 */
-         0, 0xEBC9, 0xE09C,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xF39D, 0xF871, 0xF36A, 0xE177, 0xE896,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xE14F,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xE27D,      0, /* 0x50 */
-         0, 0xE5A9, 0xF872,      0,      0,      0, 0xE375,      0, /* 0x60 */
-    0xF0D6,      0, 0xF16F,      0,      0,      0, 0xEAFC,      0, /* 0x60 */
-         0, 0xF6D6, 0xEA7A, 0xE0B4,      0,      0, 0xF2BE,      0, /* 0x70 */
-         0, 0xE145,      0,      0,      0,      0,      0, 0xE2BD, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xF2F2, 0xEC47, /* 0x80 */
-         0,      0,      0, 0xE178,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xF39E,      0,      0,      0, /* 0x90 */
-    0xE670,      0, 0xF3C6,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xEC48, 0xF0AB,      0,      0, /* 0xA0 */
-         0, 0xE0B5, 0xE761,      0, 0xF55E, 0xF4F7,      0,      0, /* 0xB0 */
-    0xE6C6,      0, 0xE3BB, 0xF6AA,      0, 0xF1CA, 0xE6D3, 0xE79C, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xF655, /* 0xC0 */
-         0,      0, 0xE3CC, 0xE9FC,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xEAFD,      0, /* 0xD0 */
-    0xF7E5,      0, 0xEB5A,      0,      0, 0xF49F, 0xE4B0,      0, /* 0xD0 */
-    0xF595, 0xE859,      0, 0xEE6E,      0,      0,      0,      0, /* 0xE0 */
-    0xF74A, 0xEF60,      0,      0, 0xE79D,      0,      0, 0xF065, /* 0xE0 */
-         0,      0,      0,      0, 0xE633,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xF656                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE3BA, 	 0, 0xF3C4, 	 0, 0xEDB3, 0xF8F5, 0xEFE1, 0xF9E0, /* 0x00 */
+    0xF94C, 	 0, 0xE832, 0xE833, 	 0, 0xE431, 	 0, 	 0, /* 0x00 */
+    0xE491, 	 0, 	 0, 	 0, 0xEC7D, 	 0, 	 0, 0xEA79, /* 0x10 */
+    0xE26C, 0xF445, 0xE374, 0xE9D1, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xEBC8, 0xE8B7, 0xEAE3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xF1B9, 0xF3C5, 	 0, 0xF4CF, 0xE6AB, /* 0x20 */
+    0xEBAC, 	 0, 	 0, 0xECEB, 	 0, 0xF257, 	 0, 	 0, /* 0x30 */
+         0, 0xEBC9, 0xE09C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xF39D, 0xF871, 0xF36A, 0xE177, 0xE896, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xE14F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE27D, 	 0, /* 0x50 */
+         0, 0xE5A9, 0xF872, 	 0, 	 0, 	 0, 0xE375, 	 0, /* 0x60 */
+    0xF0D6, 	 0, 0xF16F, 	 0, 	 0, 	 0, 0xEAFC, 	 0, /* 0x60 */
+         0, 0xF6D6, 0xEA7A, 0xE0B4, 	 0, 	 0, 0xF2BE, 	 0, /* 0x70 */
+         0, 0xE145, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2BD, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF2F2, 0xEC47, /* 0x80 */
+         0, 	 0, 	 0, 0xE178, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xF39E, 	 0, 	 0, 	 0, /* 0x90 */
+    0xE670, 	 0, 0xF3C6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xEC48, 0xF0AB, 	 0, 	 0, /* 0xA0 */
+         0, 0xE0B5, 0xE761, 	 0, 0xF55E, 0xF4F7, 	 0, 	 0, /* 0xB0 */
+    0xE6C6, 	 0, 0xE3BB, 0xF6AA, 	 0, 0xF1CA, 0xE6D3, 0xE79C, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF655, /* 0xC0 */
+         0, 	 0, 0xE3CC, 0xE9FC, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEAFD, 	 0, /* 0xD0 */
+    0xF7E5, 	 0, 0xEB5A, 	 0, 	 0, 0xF49F, 0xE4B0, 	 0, /* 0xD0 */
+    0xF595, 0xE859, 	 0, 0xEE6E, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xF74A, 0xEF60, 	 0, 	 0, 0xE79D, 	 0, 	 0, 0xF065, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xE633, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xF656									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_7E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xF46B, 0xED9E,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0xEF42,      0,      0, /* 0x10 */
-         0,      0,      0, 0xE86A,      0, 0xF46C, 0xF8D6, 0xEFB2, /* 0x10 */
-         0, 0xF23D,      0, 0xF873,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xE97E,      0,      0, 0xF5EA, 0xEE70, /* 0x20 */
-         0, 0xF39F,      0,      0,      0,      0,      0, 0xE6AC, /* 0x30 */
-         0,      0,      0,      0,      0, 0xF5C5, 0xF270,      0, /* 0x30 */
-         0, 0xE8E5,      0, 0xE9DE,      0,      0, 0xE7F0, 0xEFA3, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xF3F9,      0, 0xF454, 0xEB5B,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xEFA4,      0, /* 0x50 */
-         0, 0xEC49,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xECB1, 0xF97B, 0xE1A8,      0, 0xE146,      0,      0, /* 0x60 */
-    0xF36B,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xEE4A,      0,      0, 0xE1A9,      0,      0,      0, /* 0x70 */
-         0,      0, 0xF4C3,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0xEBD9,      0,      0, 0xF2AB, /* 0x80 */
-         0,      0,      0, 0xEEC5,      0,      0, 0xEB79,      0, /* 0x90 */
-    0xF4C5,      0,      0, 0xE550, 0xE5BF                          /* 0x90 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xF46B, 0xED9E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEF42, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xE86A, 	 0, 0xF46C, 0xF8D6, 0xEFB2, /* 0x10 */
+         0, 0xF23D, 	 0, 0xF873, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xE97E, 	 0, 	 0, 0xF5EA, 0xEE70, /* 0x20 */
+         0, 0xF39F, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6AC, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF5C5, 0xF270, 	 0, /* 0x30 */
+         0, 0xE8E5, 	 0, 0xE9DE, 	 0, 	 0, 0xE7F0, 0xEFA3, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xF3F9, 	 0, 0xF454, 0xEB5B, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEFA4, 	 0, /* 0x50 */
+         0, 0xEC49, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xECB1, 0xF97B, 0xE1A8, 	 0, 0xE146, 	 0, 	 0, /* 0x60 */
+    0xF36B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xEE4A, 	 0, 	 0, 0xE1A9, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xF4C3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xEBD9, 	 0, 	 0, 0xF2AB, /* 0x80 */
+         0, 	 0, 	 0, 0xEEC5, 	 0, 	 0, 0xEB79, 	 0, /* 0x90 */
+    0xF4C5, 	 0, 	 0, 0xE550, 0xE5BF							/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_7F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0xE9AE,      0, /* 0x30 */
-    0xF7FC,      0, 0xE150,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xEDA2,      0,      0,      0, /* 0x40 */
-    0xE248,      0,      0,      0, 0xE762, 0xF7D6,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xF3AA, 0xE261,      0,      0, 0xF657,      0, /* 0x60 */
-    0xE8EB,      0, 0xEAFE,      0,      0, 0xE771,      0, 0xF6F3, /* 0x70 */
-         0, 0xE6E7,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xE5A0,      0,      0, /* 0x80 */
-    0xE3BC,      0, 0xEDCF,      0, 0xE0B6,      0, 0xE848,      0, /* 0x80 */
-         0,      0,      0,      0, 0xE1C4,      0,      0,      0, /* 0x90 */
-         0,      0, 0xE64E,      0,      0,      0, 0xEC4A,      0, /* 0x90 */
-         0,      0,      0,      0, 0xE2D8,      0,      0,      0, /* 0xA0 */
-    0xEB5C, 0xF0F9,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xF9FD,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xE6E8, 0xE0D8,      0,      0,      0, 0xEFE2,      0,      0, /* 0xB0 */
-         0, 0xEF4A,      0,      0,      0, 0xECC7,      0,      0, /* 0xC0 */
-         0,      0, 0xF15D,      0, 0xF15E,      0, 0xE64F,      0, /* 0xC0 */
-         0,      0, 0xECA7,      0, 0xEAD6, 0xF9E8,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0xF271, /* 0xD0 */
-    0xF638, 0xE9FD,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xF74B,      0, 0xEF61,      0,      0,      0,      0, /* 0xE0 */
-    0xF7D7,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xE27E,      0,      0, 0xF15F                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0xE9AE, 	 0, /* 0x30 */
+    0xF7FC, 	 0, 0xE150, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xEDA2, 	 0, 	 0, 	 0, /* 0x40 */
+    0xE248, 	 0, 	 0, 	 0, 0xE762, 0xF7D6, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xF3AA, 0xE261, 	 0, 	 0, 0xF657, 	 0, /* 0x60 */
+    0xE8EB, 	 0, 0xEAFE, 	 0, 	 0, 0xE771, 	 0, 0xF6F3, /* 0x70 */
+         0, 0xE6E7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE5A0, 	 0, 	 0, /* 0x80 */
+    0xE3BC, 	 0, 0xEDCF, 	 0, 0xE0B6, 	 0, 0xE848, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xE1C4, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xE64E, 	 0, 	 0, 	 0, 0xEC4A, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xE2D8, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xEB5C, 0xF0F9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xF9FD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xE6E8, 0xE0D8, 	 0, 	 0, 	 0, 0xEFE2, 	 0, 	 0, /* 0xB0 */
+         0, 0xEF4A, 	 0, 	 0, 	 0, 0xECC7, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xF15D, 	 0, 0xF15E, 	 0, 0xE64F, 	 0, /* 0xC0 */
+         0, 	 0, 0xECA7, 	 0, 0xEAD6, 0xF9E8, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF271, /* 0xD0 */
+    0xF638, 0xE9FD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xF74B, 	 0, 0xEF61, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xF7D7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xE27E, 	 0, 	 0, 0xF15F							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_80[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xEFA5, 0xE665,      0, 0xE1C5,      0, 0xF1BA, 0xE3BD,      0, /* 0x00 */
-         0, 0xE2BE,      0,      0, 0xF14B,      0,      0,      0, /* 0x00 */
-    0xE441,      0,      0,      0,      0, 0xE179,      0, 0xE7C4, /* 0x10 */
-    0xEFFC,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xE3BE,      0,      0, /* 0x20 */
-         0,      0,      0, 0xF14C,      0,      0, 0xEDAD,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xF6B0,      0, 0xE17A, /* 0x30 */
-         0,      0,      0, 0xE4C4,      0,      0, 0xE650,      0, /* 0x40 */
-         0,      0, 0xE69F,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xEBA1,      0, /* 0x50 */
-    0xEA4D,      0, 0xF639,      0,      0,      0, 0xE834,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0xE634, /* 0x60 */
-    0xF5C6,      0, 0xEBA2, 0xEFC6,      0,      0,      0, 0xF455, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF579, 0xE67C, 0xF0D3, /* 0x70 */
-         0,      0,      0,      0, 0xF14D, 0xEC6C, 0xEA7B, 0xF36C, /* 0x80 */
-         0, 0xF0BF,      0, 0xE6CE, 0xE3BF,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xF5AB,      0, /* 0x90 */
-         0,      0,      0, 0xF7FD,      0, 0xE06C,      0,      0, /* 0x90 */
-         0, 0xE1C6, 0xF446,      0,      0, 0xE9FE,      0,      0, /* 0xA0 */
-         0, 0xE147, 0xE8B8,      0,      0,      0,      0, 0xE379, /* 0xA0 */
-         0, 0xE26D, 0xF0C0,      0, 0xF9A2,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xF75B,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xF066, 0xF3B0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xE8CE,      0, 0xF6C3,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xE8CF, 0xE0A4,      0,      0, 0xF770,      0, /* 0xD0 */
-         0, 0xF8D7,      0,      0, 0xF0CA, 0xEB31,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xE25D,      0,      0, 0xE56C,      0,      0,      0, /* 0xF0 */
-    0xF9D8,      0,      0,      0,      0, 0xE498                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xEFA5, 0xE665, 	 0, 0xE1C5, 	 0, 0xF1BA, 0xE3BD, 	 0, /* 0x00 */
+         0, 0xE2BE, 	 0, 	 0, 0xF14B, 	 0, 	 0, 	 0, /* 0x00 */
+    0xE441, 	 0, 	 0, 	 0, 	 0, 0xE179, 	 0, 0xE7C4, /* 0x10 */
+    0xEFFC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE3BE, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xF14C, 	 0, 	 0, 0xEDAD, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF6B0, 	 0, 0xE17A, /* 0x30 */
+         0, 	 0, 	 0, 0xE4C4, 	 0, 	 0, 0xE650, 	 0, /* 0x40 */
+         0, 	 0, 0xE69F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEBA1, 	 0, /* 0x50 */
+    0xEA4D, 	 0, 0xF639, 	 0, 	 0, 	 0, 0xE834, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE634, /* 0x60 */
+    0xF5C6, 	 0, 0xEBA2, 0xEFC6, 	 0, 	 0, 	 0, 0xF455, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF579, 0xE67C, 0xF0D3, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xF14D, 0xEC6C, 0xEA7B, 0xF36C, /* 0x80 */
+         0, 0xF0BF, 	 0, 0xE6CE, 0xE3BF, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF5AB, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xF7FD, 	 0, 0xE06C, 	 0, 	 0, /* 0x90 */
+         0, 0xE1C6, 0xF446, 	 0, 	 0, 0xE9FE, 	 0, 	 0, /* 0xA0 */
+         0, 0xE147, 0xE8B8, 	 0, 	 0, 	 0, 	 0, 0xE379, /* 0xA0 */
+         0, 0xE26D, 0xF0C0, 	 0, 0xF9A2, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xF75B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xF066, 0xF3B0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xE8CE, 	 0, 0xF6C3, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xE8CF, 0xE0A4, 	 0, 	 0, 0xF770, 	 0, /* 0xD0 */
+         0, 0xF8D7, 	 0, 	 0, 0xF0CA, 0xEB31, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xE25D, 	 0, 	 0, 0xE56C, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xF9D8, 	 0, 	 0, 	 0, 	 0, 0xE498					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_81[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xF447,      0,      0, 0xF898, 0xF63A, 0xF899, /* 0x00 */
-    0xE776,      0, 0xF541,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xEF62,      0, 0xE055, 0xE17B,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xEC7E,      0,      0,      0,      0, /* 0x20 */
-         0, 0xEC4B,      0, 0xF6AD,      0,      0,      0, 0xF771, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xF4EC,      0,      0,      0,      0, 0xEA31,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xED9F,      0,      0, 0xECEC,      0, /* 0x40 */
-    0xE9AF, 0xE9B0,      0,      0, 0xE0B7, 0xEF63,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xEBA3, 0xE470,      0, /* 0x60 */
-         0,      0,      0, 0xF3A0,      0,      0,      0,      0, /* 0x60 */
-    0xEFA6, 0xE0F2,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xF1F3, 0xE969, 0xEB5D,      0,      0,      0,      0, 0xF6DA, /* 0x70 */
-    0xE8B9,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xE13E,      0, 0xE86B,      0,      0,      0,      0, 0xE1C7, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xE9B1,      0, 0xE73F, 0xECA3,      0,      0, /* 0x90 */
-    0xE291,      0,      0, 0xF495,      0,      0,      0,      0, /* 0xA0 */
-    0xF743,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xEB5E,      0, 0xF5FD,      0,      0, /* 0xB0 */
-         0,      0, 0xF0EC,      0,      0, 0xE4C5, 0xF97C, 0xE46B, /* 0xB0 */
-    0xE57B,      0, 0xEA32,      0,      0,      0, 0xEDE6,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xF340,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xE5C4,      0,      0,      0,      0,      0,      0, 0xF1F4, /* 0xD0 */
-         0,      0,      0, 0xECED,      0, 0xEF52,      0, 0xF1F5, /* 0xE0 */
-    0xE6FC,      0, 0xF1BB,      0,      0, 0xF63B,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xF448, 0xF658,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xE4E6, 0xF46D, 0xE2BF,      0, 0xF0AC          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xF447, 	 0, 	 0, 0xF898, 0xF63A, 0xF899, /* 0x00 */
+    0xE776, 	 0, 0xF541, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xEF62, 	 0, 0xE055, 0xE17B, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xEC7E, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xEC4B, 	 0, 0xF6AD, 	 0, 	 0, 	 0, 0xF771, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xF4EC, 	 0, 	 0, 	 0, 	 0, 0xEA31, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xED9F, 	 0, 	 0, 0xECEC, 	 0, /* 0x40 */
+    0xE9AF, 0xE9B0, 	 0, 	 0, 0xE0B7, 0xEF63, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEBA3, 0xE470, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xF3A0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xEFA6, 0xE0F2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xF1F3, 0xE969, 0xEB5D, 	 0, 	 0, 	 0, 	 0, 0xF6DA, /* 0x70 */
+    0xE8B9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE13E, 	 0, 0xE86B, 	 0, 	 0, 	 0, 	 0, 0xE1C7, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xE9B1, 	 0, 0xE73F, 0xECA3, 	 0, 	 0, /* 0x90 */
+    0xE291, 	 0, 	 0, 0xF495, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xF743, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xEB5E, 	 0, 0xF5FD, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xF0EC, 	 0, 	 0, 0xE4C5, 0xF97C, 0xE46B, /* 0xB0 */
+    0xE57B, 	 0, 0xEA32, 	 0, 	 0, 	 0, 0xEDE6, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF340, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE5C4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF1F4, /* 0xD0 */
+         0, 	 0, 	 0, 0xECED, 	 0, 0xEF52, 	 0, 0xF1F5, /* 0xE0 */
+    0xE6FC, 	 0, 0xF1BB, 	 0, 	 0, 0xF63B, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xF448, 0xF658, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xE4E6, 0xF46D, 0xE2BF, 	 0, 0xF0AC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_82[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xE2C0,      0, 0xEE38, /* 0x00 */
-    0xF9E9,      0, 0xE2C1,      0, 0xEB6F, 0xEA7C,      0,      0, /* 0x00 */
-         0,      0, 0xEB32,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xF54F, 0xEC91,      0, 0xE7F1, 0xF3C7, /* 0x10 */
-         0, 0xE0B8,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xF7FE, 0xE8BA, 0xE897,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xF67C, 0xE86C, 0xF874, /* 0x30 */
-         0, 0xEB5F,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xE9B2,      0,      0,      0,      0, 0xEE39,      0, 0xF2F3, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xF4ED,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xF0FA,      0, 0xF7E6,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xE06D, 0xE5DE, /* 0x60 */
-         0, 0xE06E, 0xEAE4,      0,      0,      0, 0xEE9F,      0, /* 0x70 */
-    0xF5AC,      0,      0,      0,      0,      0, 0xED97,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xEFE3,      0, 0xF1CB, 0xE2E4,      0, /* 0x80 */
-         0,      0, 0xE763,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xE9B3, 0xE57C,      0,      0, 0xF449,      0, 0xEAB7, /* 0x90 */
-         0,      0,      0,      0,      0, 0xE0CE, 0xF8D8,      0, /* 0xA0 */
-         0, 0xE369,      0,      0, 0xE9D2, 0xF6F4, 0xEEDC, 0xED35, /* 0xA0 */
-         0, 0xF933,      0, 0xE8BB,      0,      0,      0, 0xF44A, /* 0xB0 */
-    0xEFFD, 0xE35A,      0, 0xF5D6, 0xE7C5, 0xED44,      0, 0xF1A7, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xF04D, 0xEEA0,      0, 0xF6C4, 0xF5AD,      0, 0xE7E0, /* 0xD0 */
-         0,      0,      0, 0xE044,      0,      0, 0xF772, 0xE2C2, /* 0xD0 */
-         0, 0xF14E,      0,      0,      0, 0xEDB4, 0xE1C8, 0xF258, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xEEC8,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xE1C9, 0xF7B7          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xE2C0, 	 0, 0xEE38, /* 0x00 */
+    0xF9E9, 	 0, 0xE2C1, 	 0, 0xEB6F, 0xEA7C, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xEB32, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xF54F, 0xEC91, 	 0, 0xE7F1, 0xF3C7, /* 0x10 */
+         0, 0xE0B8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF7FE, 0xE8BA, 0xE897, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF67C, 0xE86C, 0xF874, /* 0x30 */
+         0, 0xEB5F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xE9B2, 	 0, 	 0, 	 0, 	 0, 0xEE39, 	 0, 0xF2F3, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xF4ED, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xF0FA, 	 0, 0xF7E6, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE06D, 0xE5DE, /* 0x60 */
+         0, 0xE06E, 0xEAE4, 	 0, 	 0, 	 0, 0xEE9F, 	 0, /* 0x70 */
+    0xF5AC, 	 0, 	 0, 	 0, 	 0, 	 0, 0xED97, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xEFE3, 	 0, 0xF1CB, 0xE2E4, 	 0, /* 0x80 */
+         0, 	 0, 0xE763, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xE9B3, 0xE57C, 	 0, 	 0, 0xF449, 	 0, 0xEAB7, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE0CE, 0xF8D8, 	 0, /* 0xA0 */
+         0, 0xE369, 	 0, 	 0, 0xE9D2, 0xF6F4, 0xEEDC, 0xED35, /* 0xA0 */
+         0, 0xF933, 	 0, 0xE8BB, 	 0, 	 0, 	 0, 0xF44A, /* 0xB0 */
+    0xEFFD, 0xE35A, 	 0, 0xF5D6, 0xE7C5, 0xED44, 	 0, 0xF1A7, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xF04D, 0xEEA0, 	 0, 0xF6C4, 0xF5AD, 	 0, 0xE7E0, /* 0xD0 */
+         0, 	 0, 	 0, 0xE044, 	 0, 	 0, 0xF772, 0xE2C2, /* 0xD0 */
+         0, 0xF14E, 	 0, 	 0, 	 0, 0xEDB4, 0xE1C8, 0xF258, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xEEC8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE1C9, 0xF7B7			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_83[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xF3E8, 0xE7F2, 0xE8F5, 0xE045, 0xE7C6,      0,      0, /* 0x00 */
-         0, 0xE759,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0, 0xE7AB, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xF1BC,      0,      0, 0xE764,      0,      0,      0, 0xE96A, /* 0x20 */
-         0, 0xEC4C,      0,      0, 0xF97D, 0xF170, 0xE4A0,      0, /* 0x30 */
-    0xEFC7, 0xEE3A,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xEC92,      0,      0,      0,      0,      0,      0, 0xF84B, /* 0x40 */
-         0, 0xF5AE, 0xF8AA,      0,      0,      0,      0, 0xF19D, /* 0x40 */
-         0, 0xF14F, 0xF968,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xE575,      0,      0,      0, 0xF7C3, /* 0x70 */
-         0,      0,      0, 0xF272,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xE6E9, 0xF1F6,      0,      0,      0, 0xEA7D,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xE17C,      0, /* 0x90 */
-    0xECEE,      0,      0,      0,      0,      0, 0xEF64,      0, /* 0x90 */
-         0,      0, 0xF89A,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xE9B4, 0xED45, 0xE740,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xE765,      0,      0, /* 0xB0 */
-         0, 0xF57A,      0,      0,      0, 0xE249,      0,      0, /* 0xC0 */
-         0, 0xE671, 0xE2D2,      0, 0xE346,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xE232,      0,      0, 0xF4EE,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xF4F8,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xE95C,      0, 0xE35B,      0,      0,      0, 0xF934, /* 0xE0 */
-    0xE1CA, 0xE6D4, 0xEA33,      0, 0xED70,      0,      0,      0, /* 0xF0 */
-         0, 0xF259,      0,      0,      0, 0xEC6D                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xF3E8, 0xE7F2, 0xE8F5, 0xE045, 0xE7C6, 	 0, 	 0, /* 0x00 */
+         0, 0xE759, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7AB, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xF1BC, 	 0, 	 0, 0xE764, 	 0, 	 0, 	 0, 0xE96A, /* 0x20 */
+         0, 0xEC4C, 	 0, 	 0, 0xF97D, 0xF170, 0xE4A0, 	 0, /* 0x30 */
+    0xEFC7, 0xEE3A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xEC92, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF84B, /* 0x40 */
+         0, 0xF5AE, 0xF8AA, 	 0, 	 0, 	 0, 	 0, 0xF19D, /* 0x40 */
+         0, 0xF14F, 0xF968, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xE575, 	 0, 	 0, 	 0, 0xF7C3, /* 0x70 */
+         0, 	 0, 	 0, 0xF272, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xE6E9, 0xF1F6, 	 0, 	 0, 	 0, 0xEA7D, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE17C, 	 0, /* 0x90 */
+    0xECEE, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEF64, 	 0, /* 0x90 */
+         0, 	 0, 0xF89A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xE9B4, 0xED45, 0xE740, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE765, 	 0, 	 0, /* 0xB0 */
+         0, 0xF57A, 	 0, 	 0, 	 0, 0xE249, 	 0, 	 0, /* 0xC0 */
+         0, 0xE671, 0xE2D2, 	 0, 0xE346, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xE232, 	 0, 	 0, 0xF4EE, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xF4F8, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xE95C, 	 0, 0xE35B, 	 0, 	 0, 	 0, 0xF934, /* 0xE0 */
+    0xE1CA, 0xE6D4, 0xEA33, 	 0, 0xED70, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xF259, 	 0, 	 0, 	 0, 0xEC6D					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_84[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xF5FE, 0xE53C,      0,      0,      0, /* 0x00 */
-         0,      0, 0xE5D1,      0, 0xE792, 0xF753, 0xF067,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xF5D7,      0,      0, 0xE74F,      0,      0,      0, /* 0x20 */
-         0, 0xF9C0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xF0AD,      0,      0,      0,      0, 0xE5AA,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xEEA8,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xF25A, /* 0x50 */
-         0,      0,      0, 0xE077,      0,      0,      0,      0, /* 0x50 */
-         0, 0xF773,      0, 0xE56D,      0,      0, 0xF068,      0, /* 0x60 */
-         0,      0,      0, 0xF8D9, 0xF1F7,      0,      0, 0xEDB5, /* 0x60 */
-         0,      0,      0,      0,      0, 0xE33D,      0,      0, /* 0x70 */
-         0,      0, 0xF3F1,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xEC4D,      0,      0,      0, 0xECC8,      0,      0,      0, /* 0x90 */
-         0, 0xE7D5,      0,      0, 0xEAAA,      0,      0,      0, /* 0x90 */
-         0, 0xE8BC,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xF774,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xF3FA,      0,      0, 0xEDB6, 0xF4EF,      0,      0, 0xF8DA, /* 0xB0 */
-    0xEBE0,      0, 0xE7AC,      0, 0xF5EB,      0, 0xEB46,      0, /* 0xC0 */
-         0, 0xEFC8,      0, 0xE0CF,      0, 0xECC9,      0,      0, /* 0xC0 */
-         0, 0xEA7E,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xEC4E,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xE991,      0, 0xE635,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xEC93,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0, 0xE6A0                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xF5FE, 0xE53C, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xE5D1, 	 0, 0xE792, 0xF753, 0xF067, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xF5D7, 	 0, 	 0, 0xE74F, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xF9C0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xF0AD, 	 0, 	 0, 	 0, 	 0, 0xE5AA, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xEEA8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF25A, /* 0x50 */
+         0, 	 0, 	 0, 0xE077, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xF773, 	 0, 0xE56D, 	 0, 	 0, 0xF068, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xF8D9, 0xF1F7, 	 0, 	 0, 0xEDB5, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE33D, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xF3F1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xEC4D, 	 0, 	 0, 	 0, 0xECC8, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xE7D5, 	 0, 	 0, 0xEAAA, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xE8BC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xF774, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xF3FA, 	 0, 	 0, 0xEDB6, 0xF4EF, 	 0, 	 0, 0xF8DA, /* 0xB0 */
+    0xEBE0, 	 0, 0xE7AC, 	 0, 0xF5EB, 	 0, 0xEB46, 	 0, /* 0xC0 */
+         0, 0xEFC8, 	 0, 0xE0CF, 	 0, 0xECC9, 	 0, 	 0, /* 0xC0 */
+         0, 0xEA7E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xEC4E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xE991, 	 0, 0xE635, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xEC93, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xE6A0							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_85[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE7A1,      0, 0xE750, 0xE96B,      0,      0, 0xF1BD, /* 0x10 */
-    0xEAB8,      0, 0xF035,      0,      0,      0, 0xE6AD,      0, /* 0x10 */
-         0, 0xF4F9,      0, 0xF1F8,      0, 0xF5C7,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xEBCA, 0xF0E3,      0, 0xF46E, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xF75C,      0, 0xF069, /* 0x30 */
-         0, 0xE4C6,      0, 0xE8E6,      0,      0,      0,      0, /* 0x40 */
-         0, 0xF5AF,      0,      0,      0,      0, 0xE292,      0, /* 0x40 */
-         0,      0,      0, 0xEFFE,      0,      0,      0,      0, /* 0x50 */
-         0, 0xF8B6,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xEC94,      0,      0,      0,      0, /* 0x60 */
-    0xE2F2, 0xF6B9, 0xE7F3,      0,      0, 0xEBCB,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xE86D,      0,      0, 0xE849, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0, 0xF0FB, /* 0x80 */
-         0, 0xE0B9,      0,      0, 0xF1F9,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xEB70,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0xF550,      0, /* 0xA0 */
-    0xF9BC, 0xEAB1, 0xECEF,      0,      0,      0,      0, 0xEB33, /* 0xA0 */
-    0xF9B9,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xF341,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE1CB,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xF1BE,      0,      0,      0, 0xE5C0, 0xECF0, 0xF1FA, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xEFE4,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xE5ED, 0xEEDD,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xE598, 0xEDB7,      0,      0, /* 0xE0 */
-         0, 0xE8E7, 0xEC4F,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xF25B, /* 0xF0 */
-         0,      0, 0xE6F4, 0xF36D,      0,      0,      0, 0xE23B  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE7A1, 	 0, 0xE750, 0xE96B, 	 0, 	 0, 0xF1BD, /* 0x10 */
+    0xEAB8, 	 0, 0xF035, 	 0, 	 0, 	 0, 0xE6AD, 	 0, /* 0x10 */
+         0, 0xF4F9, 	 0, 0xF1F8, 	 0, 0xF5C7, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xEBCA, 0xF0E3, 	 0, 0xF46E, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF75C, 	 0, 0xF069, /* 0x30 */
+         0, 0xE4C6, 	 0, 0xE8E6, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xF5AF, 	 0, 	 0, 	 0, 	 0, 0xE292, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xEFFE, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xF8B6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xEC94, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xE2F2, 0xF6B9, 0xE7F3, 	 0, 	 0, 0xEBCB, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xE86D, 	 0, 	 0, 0xE849, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF0FB, /* 0x80 */
+         0, 0xE0B9, 	 0, 	 0, 0xF1F9, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xEB70, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF550, 	 0, /* 0xA0 */
+    0xF9BC, 0xEAB1, 0xECEF, 	 0, 	 0, 	 0, 	 0, 0xEB33, /* 0xA0 */
+    0xF9B9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xF341, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE1CB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xF1BE, 	 0, 	 0, 	 0, 0xE5C0, 0xECF0, 0xF1FA, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEFE4, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xE5ED, 0xEEDD, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xE598, 0xEDB7, 	 0, 	 0, /* 0xE0 */
+         0, 0xE8E7, 0xEC4F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF25B, /* 0xF0 */
+         0, 	 0, 0xE6F4, 0xF36D, 	 0, 	 0, 	 0, 0xE23B	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_86[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xEEDE,      0,      0,      0, 0xE666, 0xEBCC, /* 0x00 */
-         0,      0, 0xEF43,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xEDEE, 0xE932, /* 0x10 */
-         0,      0, 0xEB60,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xE5B5,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xE5A1, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xF8DB,      0, /* 0x40 */
-    0xF7CB,      0,      0,      0, 0xE0F3, 0xF535,      0,      0, /* 0x50 */
-         0,      0,      0, 0xF858, 0xE667,      0, 0xEFE5, 0xF8DC, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xF9D0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xF8F6,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xE835,      0, 0xE8BD,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xF172,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xE1F7, 0xF36E,      0,      0,      0, /* 0xA0 */
-         0, 0xF659,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xEA91, /* 0xC0 */
-         0,      0,      0, 0xE4B1,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xF97E,      0,      0,      0, /* 0xD0 */
-         0, 0xEF53,      0, 0xF3C8,      0,      0,      0, 0xE293, /* 0xD0 */
-         0,      0,      0,      0, 0xF7ED,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xF496,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0,      0, 0xED46          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xEEDE, 	 0, 	 0, 	 0, 0xE666, 0xEBCC, /* 0x00 */
+         0, 	 0, 0xEF43, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEDEE, 0xE932, /* 0x10 */
+         0, 	 0, 0xEB60, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE5B5, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5A1, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF8DB, 	 0, /* 0x40 */
+    0xF7CB, 	 0, 	 0, 	 0, 0xE0F3, 0xF535, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xF858, 0xE667, 	 0, 0xEFE5, 0xF8DC, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF9D0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xF8F6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE835, 	 0, 0xE8BD, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xF172, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xE1F7, 0xF36E, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xF659, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEA91, /* 0xC0 */
+         0, 	 0, 	 0, 0xE4B1, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xF97E, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xEF53, 	 0, 0xF3C8, 	 0, 	 0, 	 0, 0xE293, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xF7ED, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF496, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xED46			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_87[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF5B9,      0, 0xE992, 0xECF1,      0,      0,      0,      0, /* 0x00 */
-    0xEF35,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xF44B,      0, 0xEA34,      0, 0xE85C,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xE079,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xECDA,      0, 0xF969, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xF06A, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xF7C4,      0, /* 0x60 */
-    0xECA4,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xF8DD,      0, 0xF2CA,      0, /* 0x70 */
-    0xEF54,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xE5CC,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xF0D7,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xE7AD, /* 0x90 */
-         0,      0, 0xF8AB,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xE4D9,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xE5A2,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xF66E,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xE898,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xEB61,      0,      0, 0xEFA8, /* 0xE0 */
-         0,      0, 0xF5F9,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xF83F,      0, 0xF0FC,      0,      0, 0xEB7A          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF5B9, 	 0, 0xE992, 0xECF1, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xEF35, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xF44B, 	 0, 0xEA34, 	 0, 0xE85C, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE079, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xECDA, 	 0, 0xF969, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF06A, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF7C4, 	 0, /* 0x60 */
+    0xECA4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xF8DD, 	 0, 0xF2CA, 	 0, /* 0x70 */
+    0xEF54, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xE5CC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF0D7, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7AD, /* 0x90 */
+         0, 	 0, 0xF8AB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xE4D9, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xE5A2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xF66E, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE898, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xEB61, 	 0, 	 0, 0xEFA8, /* 0xE0 */
+         0, 	 0, 0xF5F9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xF83F, 	 0, 0xF0FC, 	 0, 	 0, 0xEB7A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_88[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xECB2,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xE5C5, /* 0x10 */
-         0,      0, 0xF3E3, 0xE5EE,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xE1CC,      0,      0,      0,      0, 0xF1D9,      0, /* 0x30 */
-         0,      0,      0, 0xE751,      0,      0,      0,      0, /* 0x30 */
-    0xF87C,      0,      0,      0,      0,      0, 0xF3EB,      0, /* 0x40 */
-         0,      0,      0,      0, 0xF84C, 0xEE72,      0,      0, /* 0x40 */
-         0,      0, 0xF875, 0xEC9C,      0,      0,      0, 0xE046, /* 0x50 */
-         0, 0xED47,      0, 0xF06B,      0, 0xF5FA,      0,      0, /* 0x50 */
-         0, 0xF8AC, 0xE2C3, 0xF0FD,      0,      0,      0,      0, /* 0x60 */
-    0xF79C,      0,      0, 0xEAB9,      0,      0,      0,      0, /* 0x60 */
-    0xEBF1,      0, 0xE434,      0,      0,      0,      0, 0xF5FB, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xE36A, 0xE36B, /* 0x70 */
-         0, 0xF04E, 0xE7B1,      0,      0,      0,      0,      0, /* 0x80 */
-    0xE047,      0,      0, 0xE4E7,      0, 0xF775,      0,      0, /* 0x80 */
-         0,      0, 0xE4B2,      0,      0,      0, 0xEC50, 0xF46F, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0xE1E5,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xF7AC,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xE1CD,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xF23E, 0xE63E,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE6EA, /* 0xC0 */
-         0,      0,      0,      0, 0xEEE0, 0xF0AE,      0,      0, /* 0xD0 */
-         0, 0xE2D9,      0,      0, 0xE95D, 0xF1FB,      0, 0xEA92, /* 0xD0 */
-         0, 0xE6EB,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xEA35,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xEAD7, 0xE8D0, 0xE8D1,      0,      0, /* 0xF0 */
-    0xE5A3,      0,      0,      0,      0, 0xF342                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xECB2, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5C5, /* 0x10 */
+         0, 	 0, 0xF3E3, 0xE5EE, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xE1CC, 	 0, 	 0, 	 0, 	 0, 0xF1D9, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xE751, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xF87C, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF3EB, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xF84C, 0xEE72, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xF875, 0xEC9C, 	 0, 	 0, 	 0, 0xE046, /* 0x50 */
+         0, 0xED47, 	 0, 0xF06B, 	 0, 0xF5FA, 	 0, 	 0, /* 0x50 */
+         0, 0xF8AC, 0xE2C3, 0xF0FD, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xF79C, 	 0, 	 0, 0xEAB9, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xEBF1, 	 0, 0xE434, 	 0, 	 0, 	 0, 	 0, 0xF5FB, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE36A, 0xE36B, /* 0x70 */
+         0, 0xF04E, 0xE7B1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE047, 	 0, 	 0, 0xE4E7, 	 0, 0xF775, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE4B2, 	 0, 	 0, 	 0, 0xEC50, 0xF46F, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1E5, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xF7AC, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xE1CD, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xF23E, 0xE63E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6EA, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xEEE0, 0xF0AE, 	 0, 	 0, /* 0xD0 */
+         0, 0xE2D9, 	 0, 	 0, 0xE95D, 0xF1FB, 	 0, 0xEA92, /* 0xD0 */
+         0, 0xE6EB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xEA35, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xEAD7, 0xE8D0, 0xE8D1, 	 0, 	 0, /* 0xF0 */
+    0xE5A3, 	 0, 	 0, 	 0, 	 0, 0xF342					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_89[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xE96C, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0xE078,      0, 0xF776, 0xE95E,      0,      0,      0,      0, /* 0x10 */
-    0xF06C, 0xE8D2,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xEFB3,      0,      0, /* 0x20 */
-         0,      0, 0xF6DB,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0xECA8,      0, /* 0x30 */
-    0xE6AE,      0,      0, 0xEB71,      0,      0,      0,      0, /* 0x30 */
-         0, 0xE0BA,      0,      0, 0xEDD1,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xE36C, /* 0x50 */
-         0,      0,      0,      0, 0xE5C1,      0,      0,      0, /* 0x60 */
-         0,      0, 0xE75A,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xECA9,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xEB34, /* 0x70 */
-         0, 0xEFA9,      0, 0xE4C7,      0,      0, 0xE96D, 0xF73E, /* 0x80 */
-         0,      0,      0, 0xE148,      0,      0,      0, 0xE33E, /* 0x80 */
-         0,      0,      0, 0xE794,      0,      0, 0xECCA,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xE13F,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xE53D, 0xF661,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xE35C,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xE056,      0,      0, 0xE5C2,      0,      0, /* 0xB0 */
-    0xE24A,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xE057,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xF840,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xEAD8,      0,      0,      0, /* 0xF0 */
-    0xF5BA                                                          /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xE078, 	 0, 0xF776, 0xE95E, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xF06C, 0xE8D2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEFB3, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF6DB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xECA8, 	 0, /* 0x30 */
+    0xE6AE, 	 0, 	 0, 0xEB71, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xE0BA, 	 0, 	 0, 0xEDD1, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE36C, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xE5C1, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xE75A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xECA9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEB34, /* 0x70 */
+         0, 0xEFA9, 	 0, 0xE4C7, 	 0, 	 0, 0xE96D, 0xF73E, /* 0x80 */
+         0, 	 0, 	 0, 0xE148, 	 0, 	 0, 	 0, 0xE33E, /* 0x80 */
+         0, 	 0, 	 0, 0xE794, 	 0, 	 0, 0xECCA, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xE13F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xE53D, 0xF661, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xE35C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xE056, 	 0, 	 0, 0xE5C2, 	 0, 	 0, /* 0xB0 */
+    0xE24A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE057, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xF840, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xEAD8, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xF5BA															/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_8A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xEDEB,      0, 0xF2F4, 0xE9B5,      0,      0,      0,      0, /* 0x00 */
-    0xE1AA,      0, 0xECF2,      0, 0xF8F7,      0, 0xF6D0,      0, /* 0x00 */
-         0,      0,      0, 0xF9BA,      0,      0, 0xF9E1, 0xF6A0, /* 0x10 */
-    0xE3C0,      0,      0, 0xEF55,      0, 0xED48,      0, 0xEBE8, /* 0x10 */
-         0,      0,      0, 0xE151,      0, 0xE47D,      0,      0, /* 0x20 */
-         0,      0, 0xE8BE,      0,      0, 0xEB72,      0,      0, /* 0x20 */
-         0, 0xF859,      0,      0, 0xEBCD,      0, 0xE048,      0, /* 0x30 */
-         0,      0, 0xF470, 0xF3C9,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xEA93,      0,      0,      0, 0xF36F, 0xF754,      0,      0, /* 0x50 */
-         0,      0,      0, 0xF25C,      0,      0, 0xEA94,      0, /* 0x50 */
-    0xEEC9,      0, 0xEC95, 0xEEE1,      0,      0, 0xECCB,      0, /* 0x60 */
-         0, 0xECCC,      0,      0,      0, 0xE2F8, 0xF2AC,      0, /* 0x60 */
-    0xF9FE, 0xF935, 0xF841, 0xEAD9,      0, 0xEB62,      0,      0, /* 0x70 */
-         0, 0xF56A,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF3CA,      0, 0xE233, /* 0x80 */
-         0,      0,      0,      0, 0xF44C, 0xF173,      0,      0, /* 0x80 */
-         0,      0,      0, 0xEB35,      0, 0xF6AB,      0,      0, /* 0x90 */
-    0xF0AF,      0,      0,      0,      0,      0, 0xEDDE,      0, /* 0x90 */
-    0xEBA4, 0xE1AB,      0, 0xE7F4, 0xEF36, 0xE1CE, 0xEBE9,      0, /* 0xA0 */
-    0xF991,      0, 0xEB73,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xEC51,      0, 0xE234,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xEA36,      0,      0, 0xF0FE,      0, 0xF0DD, 0xF370, /* 0xB0 */
-         0,      0, 0xF56B,      0, 0xEC96,      0,      0, 0xE4C8, /* 0xC0 */
-         0,      0,      0, 0xF57B,      0, 0xF245,      0, 0xF5D8, /* 0xC0 */
-         0,      0, 0xE5DF,      0,      0,      0, 0xE675,      0, /* 0xD0 */
-         0,      0,      0, 0xF0B0, 0xF573,      0,      0,      0, /* 0xD0 */
-         0, 0xECCD,      0,      0,      0,      0, 0xF596, 0xF842, /* 0xE0 */
-         0,      0, 0xF2F5, 0xE06F,      0, 0xF0B1, 0xF1BF,      0, /* 0xE0 */
-         0, 0xF9C9,      0,      0,      0,      0, 0xED36, 0xF7A4, /* 0xF0 */
-    0xF343,      0, 0xEDEC,      0,      0,      0, 0xE3E7          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xEDEB, 	 0, 0xF2F4, 0xE9B5, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xE1AA, 	 0, 0xECF2, 	 0, 0xF8F7, 	 0, 0xF6D0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xF9BA, 	 0, 	 0, 0xF9E1, 0xF6A0, /* 0x10 */
+    0xE3C0, 	 0, 	 0, 0xEF55, 	 0, 0xED48, 	 0, 0xEBE8, /* 0x10 */
+         0, 	 0, 	 0, 0xE151, 	 0, 0xE47D, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xE8BE, 	 0, 	 0, 0xEB72, 	 0, 	 0, /* 0x20 */
+         0, 0xF859, 	 0, 	 0, 0xEBCD, 	 0, 0xE048, 	 0, /* 0x30 */
+         0, 	 0, 0xF470, 0xF3C9, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xEA93, 	 0, 	 0, 	 0, 0xF36F, 0xF754, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xF25C, 	 0, 	 0, 0xEA94, 	 0, /* 0x50 */
+    0xEEC9, 	 0, 0xEC95, 0xEEE1, 	 0, 	 0, 0xECCB, 	 0, /* 0x60 */
+         0, 0xECCC, 	 0, 	 0, 	 0, 0xE2F8, 0xF2AC, 	 0, /* 0x60 */
+    0xF9FE, 0xF935, 0xF841, 0xEAD9, 	 0, 0xEB62, 	 0, 	 0, /* 0x70 */
+         0, 0xF56A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF3CA, 	 0, 0xE233, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xF44C, 0xF173, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xEB35, 	 0, 0xF6AB, 	 0, 	 0, /* 0x90 */
+    0xF0AF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEDDE, 	 0, /* 0x90 */
+    0xEBA4, 0xE1AB, 	 0, 0xE7F4, 0xEF36, 0xE1CE, 0xEBE9, 	 0, /* 0xA0 */
+    0xF991, 	 0, 0xEB73, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xEC51, 	 0, 0xE234, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xEA36, 	 0, 	 0, 0xF0FE, 	 0, 0xF0DD, 0xF370, /* 0xB0 */
+         0, 	 0, 0xF56B, 	 0, 0xEC96, 	 0, 	 0, 0xE4C8, /* 0xC0 */
+         0, 	 0, 	 0, 0xF57B, 	 0, 0xF245, 	 0, 0xF5D8, /* 0xC0 */
+         0, 	 0, 0xE5DF, 	 0, 	 0, 	 0, 0xE675, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xF0B0, 0xF573, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xECCD, 	 0, 	 0, 	 0, 	 0, 0xF596, 0xF842, /* 0xE0 */
+         0, 	 0, 0xF2F5, 0xE06F, 	 0, 0xF0B1, 0xF1BF, 	 0, /* 0xE0 */
+         0, 0xF9C9, 	 0, 	 0, 	 0, 	 0, 0xED36, 0xF7A4, /* 0xF0 */
+    0xF343, 	 0, 0xEDEC, 	 0, 	 0, 	 0, 0xE3E7			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_8B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE7C7, 0xED67, 0xF06D,      0, 0xE599,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xE84A,      0, /* 0x00 */
-    0xE85D,      0,      0,      0, 0xF7CC,      0, 0xEBDA, 0xE8BF, /* 0x10 */
-         0, 0xE155, 0xF160, 0xE0BB,      0, 0xEA95,      0,      0, /* 0x10 */
-    0xEFAA,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xE7C8,      0,      0, 0xF273, 0xE6BD,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xE2C4,      0,      0,      0,      0, /* 0x30 */
-         0, 0xE35D,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xF936,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xF3FB,      0,      0,      0,      0, 0xF9D2, 0xE3C1, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xECDB,      0, 0xE4C9,      0, 0xE95F,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xE17D,      0, /* 0x60 */
-         0,      0,      0,      0, 0xEA37,      0,      0, 0xEE4B, /* 0x60 */
-    0xF131,      0,      0,      0, 0xE149,      0,      0, 0xF8DE, /* 0x70 */
-         0,      0,      0,      0,      0, 0xEEE2,      0,      0, /* 0x70 */
-    0xE551,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xE938,      0,      0,      0,      0,      0, /* 0x80 */
-    0xEC52,      0, 0xF4D8, 0xEDD3,      0,      0, 0xF4D9,      0, /* 0x90 */
-         0,      0, 0xF4C6                                          /* 0x90 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE7C7, 0xED67, 0xF06D, 	 0, 0xE599, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE84A, 	 0, /* 0x00 */
+    0xE85D, 	 0, 	 0, 	 0, 0xF7CC, 	 0, 0xEBDA, 0xE8BF, /* 0x10 */
+         0, 0xE155, 0xF160, 0xE0BB, 	 0, 0xEA95, 	 0, 	 0, /* 0x10 */
+    0xEFAA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xE7C8, 	 0, 	 0, 0xF273, 0xE6BD, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xE2C4, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xE35D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xF936, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xF3FB, 	 0, 	 0, 	 0, 	 0, 0xF9D2, 0xE3C1, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xECDB, 	 0, 0xE4C9, 	 0, 0xE95F, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE17D, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xEA37, 	 0, 	 0, 0xEE4B, /* 0x60 */
+    0xF131, 	 0, 	 0, 	 0, 0xE149, 	 0, 	 0, 0xF8DE, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEEE2, 	 0, 	 0, /* 0x70 */
+    0xE551, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE938, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xEC52, 	 0, 0xF4D8, 0xEDD3, 	 0, 	 0, 0xF4D9, 	 0, /* 0x90 */
+         0, 	 0, 0xF4C6											/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_8C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xE1DB, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xE1AC, /* 0x30 */
-         0, 0xF953,      0,      0,      0,      0, 0xE577,      0, /* 0x40 */
-    0xE3C2,      0, 0xF7A5,      0, 0xEF65,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xECCE,      0,      0, /* 0x50 */
-         0,      0, 0xE55A,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xEADA,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xF8DF, 0xEEE3,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xF79D, 0xECCF,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xF5B0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xE777,      0, 0xE7C9,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xF73F, 0xF2F6,      0, /* 0x90 */
-    0xE9B6, 0xF23F, 0xE1F8,      0,      0,      0,      0, 0xEA48, /* 0xA0 */
-    0xF937, 0xF6FC, 0xF6B1, 0xE24B, 0xF531,      0,      0, 0xF25D, /* 0xA0 */
-    0xEBAE,      0,      0, 0xF153, 0xE2FE,      0, 0xF74F, 0xE772, /* 0xB0 */
-    0xE4E8,      0,      0, 0xEA38, 0xF574, 0xF152,      0, 0xE7F5, /* 0xB0 */
-    0xF7C5, 0xE9D3, 0xE693, 0xF19E, 0xF992,      0,      0, 0xF1C0, /* 0xC0 */
-    0xE049,      0, 0xF274,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xF471,      0, 0xEA49,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xE694,      0, 0xEA96,      0, 0xEADB,      0, /* 0xD0 */
-    0xE8D3,      0, 0xF877, 0xE773, 0xF551,      0, 0xE9B7,      0, /* 0xE0 */
-         0,      0, 0xF497,      0,      0, 0xE53E,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xE695,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xE9B8, 0xE2C5, 0xEADF                  /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1AC, /* 0x30 */
+         0, 0xF953, 	 0, 	 0, 	 0, 	 0, 0xE577, 	 0, /* 0x40 */
+    0xE3C2, 	 0, 0xF7A5, 	 0, 0xEF65, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xECCE, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xE55A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xEADA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xF8DF, 0xEEE3, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xF79D, 0xECCF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xF5B0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE777, 	 0, 0xE7C9, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF73F, 0xF2F6, 	 0, /* 0x90 */
+    0xE9B6, 0xF23F, 0xE1F8, 	 0, 	 0, 	 0, 	 0, 0xEA48, /* 0xA0 */
+    0xF937, 0xF6FC, 0xF6B1, 0xE24B, 0xF531, 	 0, 	 0, 0xF25D, /* 0xA0 */
+    0xEBAE, 	 0, 	 0, 0xF153, 0xE2FE, 	 0, 0xF74F, 0xE772, /* 0xB0 */
+    0xE4E8, 	 0, 	 0, 0xEA38, 0xF574, 0xF152, 	 0, 0xE7F5, /* 0xB0 */
+    0xF7C5, 0xE9D3, 0xE693, 0xF19E, 0xF992, 	 0, 	 0, 0xF1C0, /* 0xC0 */
+    0xE049, 	 0, 0xF274, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xF471, 	 0, 0xEA49, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xE694, 	 0, 0xEA96, 	 0, 0xEADB, 	 0, /* 0xD0 */
+    0xE8D3, 	 0, 0xF877, 0xE773, 0xF551, 	 0, 0xE9B7, 	 0, /* 0xE0 */
+         0, 	 0, 0xF497, 	 0, 	 0, 0xE53E, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xE695, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xE9B8, 0xE2C5, 0xEADF					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_8D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xF44E, 0xF631,      0, 0xF0CB, /* 0x00 */
-    0xF3FC,      0, 0xF4C7,      0,      0, 0xEB7B,      0,      0, /* 0x00 */
-         0,      0,      0, 0xF1FC,      0,      0, 0xEBDB,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xF275,      0, 0xEA97,      0, /* 0x60 */
-         0,      0,      0, 0xF863,      0,      0,      0,      0, /* 0x60 */
-    0xF3CB,      0,      0, 0xE33F, 0xE9B9,      0,      0, 0xE3C3, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF5B1,      0,      0, /* 0x80 */
-         0,      0, 0xF056,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xF371,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xF63C,      0,      0,      0,      0, /* 0xA0 */
-    0xF5D9,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xF37B,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xE9BA,      0,      0,      0, 0xF44F,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xF6C5,      0, /* 0xC0 */
-         0,      0,      0, 0xE8A2, 0xF498,      0,      0, 0xE04A, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xF6F5,      0, 0xE0E5,      0,      0, /* 0xD0 */
-         0, 0xF276,      0, 0xEB63,      0,      0,      0,      0, /* 0xE0 */
-    0xE235,      0,      0,      0,      0,      0,      0, 0xE668, /* 0xE0 */
-         0,      0,      0, 0xE53F                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xF44E, 0xF631, 	 0, 0xF0CB, /* 0x00 */
+    0xF3FC, 	 0, 0xF4C7, 	 0, 	 0, 0xEB7B, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xF1FC, 	 0, 	 0, 0xEBDB, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xF275, 	 0, 0xEA97, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xF863, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xF3CB, 	 0, 	 0, 0xE33F, 0xE9B9, 	 0, 	 0, 0xE3C3, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF5B1, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xF056, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xF371, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xF63C, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xF5D9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xF37B, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xE9BA, 	 0, 	 0, 	 0, 0xF44F, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF6C5, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xE8A2, 0xF498, 	 0, 	 0, 0xE04A, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xF6F5, 	 0, 0xE0E5, 	 0, 	 0, /* 0xD0 */
+         0, 0xF276, 	 0, 0xEB63, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE235, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE668, /* 0xE0 */
+         0, 	 0, 	 0, 0xE53F									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_8E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xEFC9,      0,      0,      0,      0, 0xE4CE, /* 0x00 */
-    0xF552,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xE0E6,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xF3A1,      0,      0,      0,      0,      0, /* 0x20 */
-    0xF0B2,      0,      0,      0,      0, 0xF3A2,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xF0B3,      0, 0xF344,      0,      0, 0xE0F4, /* 0x40 */
-    0xE540, 0xF4B2, 0xF8B7,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xF5EC,      0,      0,      0,      0,      0, 0xF277, /* 0x50 */
-    0xF542,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xF5ED,      0, 0xE2F3,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xF372,      0,      0,      0,      0,      0, 0xF25E, /* 0x80 */
-         0,      0, 0xF3CC,      0,      0, 0xEDB8,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xE6F5, 0xECF3, 0xE2E5,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xE2C6,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xF4B3, 0xED68, 0xE2F9, 0xE2DA,      0,      0, /* 0xC0 */
-         0,      0, 0xF85D,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0xEE73, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xF472,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xF5EE,      0,      0, 0xE04B,      0,      0, 0xECDC          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xEFC9, 	 0, 	 0, 	 0, 	 0, 0xE4CE, /* 0x00 */
+    0xF552, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0E6, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF3A1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xF0B2, 	 0, 	 0, 	 0, 	 0, 0xF3A2, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xF0B3, 	 0, 0xF344, 	 0, 	 0, 0xE0F4, /* 0x40 */
+    0xE540, 0xF4B2, 0xF8B7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xF5EC, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF277, /* 0x50 */
+    0xF542, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xF5ED, 	 0, 0xE2F3, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xF372, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF25E, /* 0x80 */
+         0, 	 0, 0xF3CC, 	 0, 	 0, 0xEDB8, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xE6F5, 0xECF3, 0xE2E5, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xE2C6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xF4B3, 0xED68, 0xE2F9, 0xE2DA, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xF85D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEE73, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xF472, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xF5EE, 	 0, 	 0, 0xE04B, 	 0, 	 0, 0xECDC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_8F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xE294,      0, 0xE669,      0,      0, /* 0x00 */
-         0, 0xF240,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xF575, 0xE752, 0xE960, 0xE17E,      0,      0, /* 0x10 */
-         0,      0,      0, 0xE5E0, 0xF65A, 0xF9CA, 0xE766, 0xF55F, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xE636, 0xE94E, /* 0x20 */
-         0, 0xE8D4, 0xE6C7,      0,      0,      0,      0, 0xF4A0, /* 0x20 */
-         0,      0,      0, 0xF3CD,      0,      0,      0,      0, /* 0x30 */
-    0xEC53, 0xE96E,      0, 0xE96F,      0,      0, 0xF2AD, 0xEE3B, /* 0x30 */
-         0,      0,      0,      0, 0xF7DD, 0xF04F,      0,      0, /* 0x40 */
-         0, 0xF2AE,      0,      0,      0, 0xF560, 0xE295,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xEE3C,      0, 0xE26E, /* 0x50 */
-         0,      0, 0xE5F9,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xECF4, 0xE1D0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xE5B8,      0,      0, 0xF6FD,      0, /* 0xA0 */
-    0xE939,      0,      0,      0,      0, 0xEA98,      0, 0xE93A, /* 0xA0 */
-    0xF473, 0xEFB4, 0xE46C,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xEFE6,      0,      0, 0xECF6,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xEECA,      0, /* 0xC0 */
-         0, 0xE35E,      0,      0, 0xE899,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xE04C,      0, /* 0xE0 */
-         0,      0, 0xF278, 0xE86E,      0, 0xF499,      0,      0, /* 0xE0 */
-    0xEC9D,      0, 0xE136,      0,      0,      0,      0, 0xE84B, /* 0xF0 */
-         0, 0xF279,      0,      0,      0, 0xF5DA                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xE294, 	 0, 0xE669, 	 0, 	 0, /* 0x00 */
+         0, 0xF240, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xF575, 0xE752, 0xE960, 0xE17E, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xE5E0, 0xF65A, 0xF9CA, 0xE766, 0xF55F, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE636, 0xE94E, /* 0x20 */
+         0, 0xE8D4, 0xE6C7, 	 0, 	 0, 	 0, 	 0, 0xF4A0, /* 0x20 */
+         0, 	 0, 	 0, 0xF3CD, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xEC53, 0xE96E, 	 0, 0xE96F, 	 0, 	 0, 0xF2AD, 0xEE3B, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xF7DD, 0xF04F, 	 0, 	 0, /* 0x40 */
+         0, 0xF2AE, 	 0, 	 0, 	 0, 0xF560, 0xE295, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEE3C, 	 0, 0xE26E, /* 0x50 */
+         0, 	 0, 0xE5F9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xECF4, 0xE1D0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xE5B8, 	 0, 	 0, 0xF6FD, 	 0, /* 0xA0 */
+    0xE939, 	 0, 	 0, 	 0, 	 0, 0xEA98, 	 0, 0xE93A, /* 0xA0 */
+    0xF473, 0xEFB4, 0xE46C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xEFE6, 	 0, 	 0, 0xECF6, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEECA, 	 0, /* 0xC0 */
+         0, 0xE35E, 	 0, 	 0, 0xE899, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE04C, 	 0, /* 0xE0 */
+         0, 	 0, 0xF278, 0xE86E, 	 0, 0xF499, 	 0, 	 0, /* 0xE0 */
+    0xEC9D, 	 0, 0xE136, 	 0, 	 0, 	 0, 	 0, 0xE84B, /* 0xF0 */
+         0, 0xF279, 	 0, 	 0, 	 0, 0xF5DA					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_90[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF6DC, 0xEBEA, 0xE251, 0xE541,      0, 0xF9B1, 0xEE4D,      0, /* 0x00 */
-    0xF8AD,      0,      0, 0xF777,      0, 0xEBCE,      0, 0xF6E2, /* 0x00 */
-    0xF5EF, 0xE2C7,      0,      0, 0xE542, 0xE191,      0, 0xE578, /* 0x10 */
-         0, 0xF25F, 0xF6D7,      0,      0, 0xEB36, 0xE651, 0xEBDC, /* 0x10 */
-    0xF373, 0xF3E4, 0xE993, 0xE637,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0xF597,      0, /* 0x20 */
-         0, 0xF3CE, 0xF474,      0,      0, 0xE340,      0,      0, /* 0x30 */
-    0xF191,      0,      0,      0, 0xF7BA,      0, 0xF0B5,      0, /* 0x30 */
-         0, 0xE57D, 0xEC54,      0,      0,      0,      0, 0xEFE7, /* 0x40 */
-         0,      0, 0xF0B4, 0xF031,      0, 0xF74C, 0xE236,      0, /* 0x40 */
-    0xF7C6, 0xF96A,      0, 0xE543, 0xE4B9, 0xF06E,      0,      0, /* 0x50 */
-         0, 0xEFAB,      0,      0, 0xEBE1, 0xE4CF, 0xF598,      0, /* 0x50 */
-    0xF050, 0xEBCF,      0, 0xE14A,      0,      0,      0,      0, /* 0x60 */
-         0, 0xF27A,      0,      0,      0, 0xF374, 0xF4B4, 0xE57E, /* 0x60 */
-         0,      0, 0xF450,      0,      0, 0xF3E5,      0, 0xF553, /* 0x70 */
-    0xEB64,      0, 0xF0B6,      0, 0xE6A1, 0xE0E8,      0, 0xF7AD, /* 0x70 */
-    0xEFAD, 0xE774, 0xF843, 0xEC55, 0xF94D,      0,      0, 0xF154, /* 0x80 */
-    0xE741,      0, 0xE93B,      0,      0,      0,      0, 0xE5A4, /* 0x80 */
-         0, 0xF0E9,      0,      0,      0, 0xEF4B,      0,      0, /* 0x90 */
-         0, 0xE767,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xF8AE, 0xE3E1,      0,      0, 0xE8C0,      0, /* 0xA0 */
-    0xF5BE,      0, 0xEA99,      0,      0,      0,      0, 0xE09D, /* 0xA0 */
-    0xF6C6, 0xE2C8,      0,      0,      0, 0xEBD0,      0,      0, /* 0xB0 */
-    0xF260,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xEFF4,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xE296,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xE5CD,      0, /* 0xD0 */
-         0, 0xE2DB,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xE9BB,      0,      0,      0,      0, 0xE23C,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xEFE8,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xE544                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF6DC, 0xEBEA, 0xE251, 0xE541, 	 0, 0xF9B1, 0xEE4D, 	 0, /* 0x00 */
+    0xF8AD, 	 0, 	 0, 0xF777, 	 0, 0xEBCE, 	 0, 0xF6E2, /* 0x00 */
+    0xF5EF, 0xE2C7, 	 0, 	 0, 0xE542, 0xE191, 	 0, 0xE578, /* 0x10 */
+         0, 0xF25F, 0xF6D7, 	 0, 	 0, 0xEB36, 0xE651, 0xEBDC, /* 0x10 */
+    0xF373, 0xF3E4, 0xE993, 0xE637, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF597, 	 0, /* 0x20 */
+         0, 0xF3CE, 0xF474, 	 0, 	 0, 0xE340, 	 0, 	 0, /* 0x30 */
+    0xF191, 	 0, 	 0, 	 0, 0xF7BA, 	 0, 0xF0B5, 	 0, /* 0x30 */
+         0, 0xE57D, 0xEC54, 	 0, 	 0, 	 0, 	 0, 0xEFE7, /* 0x40 */
+         0, 	 0, 0xF0B4, 0xF031, 	 0, 0xF74C, 0xE236, 	 0, /* 0x40 */
+    0xF7C6, 0xF96A, 	 0, 0xE543, 0xE4B9, 0xF06E, 	 0, 	 0, /* 0x50 */
+         0, 0xEFAB, 	 0, 	 0, 0xEBE1, 0xE4CF, 0xF598, 	 0, /* 0x50 */
+    0xF050, 0xEBCF, 	 0, 0xE14A, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xF27A, 	 0, 	 0, 	 0, 0xF374, 0xF4B4, 0xE57E, /* 0x60 */
+         0, 	 0, 0xF450, 	 0, 	 0, 0xF3E5, 	 0, 0xF553, /* 0x70 */
+    0xEB64, 	 0, 0xF0B6, 	 0, 0xE6A1, 0xE0E8, 	 0, 0xF7AD, /* 0x70 */
+    0xEFAD, 0xE774, 0xF843, 0xEC55, 0xF94D, 	 0, 	 0, 0xF154, /* 0x80 */
+    0xE741, 	 0, 0xE93B, 	 0, 	 0, 	 0, 	 0, 0xE5A4, /* 0x80 */
+         0, 0xF0E9, 	 0, 	 0, 	 0, 0xEF4B, 	 0, 	 0, /* 0x90 */
+         0, 0xE767, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xF8AE, 0xE3E1, 	 0, 	 0, 0xE8C0, 	 0, /* 0xA0 */
+    0xF5BE, 	 0, 0xEA99, 	 0, 	 0, 	 0, 	 0, 0xE09D, /* 0xA0 */
+    0xF6C6, 0xE2C8, 	 0, 	 0, 	 0, 0xEBD0, 	 0, 	 0, /* 0xB0 */
+    0xF260, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xEFF4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE296, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5CD, 	 0, /* 0xD0 */
+         0, 0xE2DB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE9BB, 	 0, 	 0, 	 0, 	 0, 0xE23C, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEFE8, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE544					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_91[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xED57,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xF5DB,      0,      0, 0xF851,      0,      0, /* 0x10 */
-         0, 0xEA39,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xE59A, /* 0x20 */
-         0,      0,      0,      0,      0, 0xF2F7,      0,      0, /* 0x20 */
-         0,      0, 0xE4B3,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xF0B7, 0xF2F8, 0xF5DC, 0xF1CC, 0xE8D5, 0xF3CF,      0, /* 0x40 */
-         0,      0, 0xF3D0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xF5B2,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xE7AE, 0xE5AC,      0, 0xEC56,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xF9A3,      0, 0xF8E5, /* 0x70 */
-    0xEAAB,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xEC97, /* 0x80 */
-         0, 0xF63D,      0, 0xF5B3,      0, 0xF345,      0,      0, /* 0x80 */
-         0,      0, 0xEBA5,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xF5DD,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xF132, 0xF1FD,      0, 0xF5B4, 0xF8B8, /* 0xA0 */
-         0, 0xE8A3,      0,      0, 0xE65A, 0xE0D9,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xEDD4,      0,      0,      0,      0,      0,      0, 0xF4FA, /* 0xC0 */
-         0, 0xF0B8,      0, 0xEB47, 0xE6EC, 0xF3EC, 0xEDAF, 0xE5E1, /* 0xC0 */
-    0xE6ED, 0xE3D1,      0,      0,      0,      0,      0, 0xEBF2, /* 0xD0 */
-    0xF2F9,      0,      0,      0, 0xE9BC, 0xF66C,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xF375,      0,      0,      0, 0xF554, /* 0xE0 */
-         0,      0, 0xEFE9,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xF4FB                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xED57, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xF5DB, 	 0, 	 0, 0xF851, 	 0, 	 0, /* 0x10 */
+         0, 0xEA39, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE59A, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF2F7, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xE4B3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xF0B7, 0xF2F8, 0xF5DC, 0xF1CC, 0xE8D5, 0xF3CF, 	 0, /* 0x40 */
+         0, 	 0, 0xF3D0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xF5B2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xE7AE, 0xE5AC, 	 0, 0xEC56, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF9A3, 	 0, 0xF8E5, /* 0x70 */
+    0xEAAB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEC97, /* 0x80 */
+         0, 0xF63D, 	 0, 0xF5B3, 	 0, 0xF345, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xEBA5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xF5DD, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xF132, 0xF1FD, 	 0, 0xF5B4, 0xF8B8, /* 0xA0 */
+         0, 0xE8A3, 	 0, 	 0, 0xE65A, 0xE0D9, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xEDD4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4FA, /* 0xC0 */
+         0, 0xF0B8, 	 0, 0xEB47, 0xE6EC, 0xF3EC, 0xEDAF, 0xE5E1, /* 0xC0 */
+    0xE6ED, 0xE3D1, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEBF2, /* 0xD0 */
+    0xF2F9, 	 0, 	 0, 	 0, 0xE9BC, 0xF66C, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xF375, 	 0, 	 0, 	 0, 0xF554, /* 0xE0 */
+         0, 	 0, 0xEFE9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF4FB					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_92[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xE591,      0,      0, /* 0x00 */
-    0xE132, 0xF6FE, 0xEABC,      0,      0,      0,      0, 0xF0CD, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xE347,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xE652,      0,      0,      0, /* 0x30 */
-         0,      0, 0xEF3D,      0,      0,      0,      0, 0xF2AF, /* 0x30 */
-    0xE0A5,      0,      0,      0,      0, 0xE0E9,      0,      0, /* 0x40 */
-         0, 0xF878,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xE156, /* 0x50 */
-         0,      0,      0, 0xEE77,      0,      0, 0xF057,      0, /* 0x50 */
-         0,      0, 0xE8A4,      0, 0xE2C9, 0xEC9E, 0xF2FA,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xF0DE,      0,      0, 0xF5C8,      0, 0xE56E,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xEB65,      0, 0xF2B0,      0,      0, 0xEC57,      0, /* 0x90 */
-    0xE7AF,      0,      0,      0, 0xF7E7,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xEEE5,      0,      0, 0xE2CA, 0xEBD1, /* 0xB0 */
-         0, 0xEC58,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xF2FB,      0,      0, 0xF89B, /* 0xC0 */
-         0,      0, 0xE994,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xEB37,      0,      0,      0, /* 0xE0 */
-         0,      0, 0xF778,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xE0EA,      0,      0,      0, 0xE0BC                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xE591, 	 0, 	 0, /* 0x00 */
+    0xE132, 0xF6FE, 0xEABC, 	 0, 	 0, 	 0, 	 0, 0xF0CD, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE347, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xE652, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xEF3D, 	 0, 	 0, 	 0, 	 0, 0xF2AF, /* 0x30 */
+    0xE0A5, 	 0, 	 0, 	 0, 	 0, 0xE0E9, 	 0, 	 0, /* 0x40 */
+         0, 0xF878, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE156, /* 0x50 */
+         0, 	 0, 	 0, 0xEE77, 	 0, 	 0, 0xF057, 	 0, /* 0x50 */
+         0, 	 0, 0xE8A4, 	 0, 0xE2C9, 0xEC9E, 0xF2FA, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xF0DE, 	 0, 	 0, 0xF5C8, 	 0, 0xE56E, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xEB65, 	 0, 0xF2B0, 	 0, 	 0, 0xEC57, 	 0, /* 0x90 */
+    0xE7AF, 	 0, 	 0, 	 0, 0xF7E7, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xEEE5, 	 0, 	 0, 0xE2CA, 0xEBD1, /* 0xB0 */
+         0, 0xEC58, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xF2FB, 	 0, 	 0, 0xF89B, /* 0xC0 */
+         0, 	 0, 0xE994, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xEB37, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xF778, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xE0EA, 	 0, 	 0, 	 0, 0xE0BC							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_93[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xE672,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0xF5DE,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xF5DF,      0, 0xF246,      0,      0,      0, 0xEC98, 0xE4CA, /* 0x10 */
-    0xF2FC, 0xE3C4, 0xF2B1,      0, 0xE3C5,      0, 0xE36E,      0, /* 0x20 */
-    0xE7E1,      0,      0, 0xEB48,      0,      0, 0xE1D1, 0xF4B9, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xEECC,      0, 0xE638, 0xE237,      0, 0xE545,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xED58,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xE4B4,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xF0B9,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xE0F5,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xF66D,      0, 0xF3A3,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0xE157,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0xEFCA,      0, 0xEBF0,      0, /* 0x90 */
-         0,      0, 0xF5E0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xF8AF,      0,      0,      0, 0xE0D1, /* 0xA0 */
-         0,      0,      0,      0, 0xF8E0, 0xF475,      0,      0, /* 0xA0 */
-    0xF192,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xF37C,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xF27B,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xEFCB,      0, /* 0xD0 */
-         0, 0xE192,      0,      0, 0xE6AF,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xF4A1          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xE672, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xF5DE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xF5DF, 	 0, 0xF246, 	 0, 	 0, 	 0, 0xEC98, 0xE4CA, /* 0x10 */
+    0xF2FC, 0xE3C4, 0xF2B1, 	 0, 0xE3C5, 	 0, 0xE36E, 	 0, /* 0x20 */
+    0xE7E1, 	 0, 	 0, 0xEB48, 	 0, 	 0, 0xE1D1, 0xF4B9, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xEECC, 	 0, 0xE638, 0xE237, 	 0, 0xE545, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xED58, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xE4B4, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF0B9, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE0F5, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xF66D, 	 0, 0xF3A3, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xE157, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xEFCA, 	 0, 0xEBF0, 	 0, /* 0x90 */
+         0, 	 0, 0xF5E0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xF8AF, 	 0, 	 0, 	 0, 0xE0D1, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xF8E0, 0xF475, 	 0, 	 0, /* 0xA0 */
+    0xF192, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xF37C, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xF27B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEFCB, 	 0, /* 0xD0 */
+         0, 0xE192, 	 0, 	 0, 0xE6AF, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4A1			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_94[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xF997,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xF3A4,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xEB66,      0,      0, /* 0x20 */
-         0,      0,      0, 0xF2B2,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xF561,      0,      0, /* 0x30 */
-    0xF6A1,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xF3D1,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xE09E, 0xE09F,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xE25E,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF4C8,      0, 0xF4BA  /* 0x70 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xF997, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xF3A4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEB66, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xF2B2, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF561, 	 0, 	 0, /* 0x30 */
+    0xF6A1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xF3D1, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xE09E, 0xE09F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xE25E, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF4C8, 	 0, 0xF4BA	/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_95[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xF1FE, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xE836,      0,      0, 0xEB7C,      0,      0,      0,      0, /* 0x80 */
-         0, 0xF75D,      0, 0xE0D2,      0,      0,      0, 0xF0CE, /* 0x80 */
-         0, 0xF7D8, 0xF7D9, 0xE070, 0xE85A,      0,      0,      0, /* 0x90 */
-    0xE0A6,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xE058, 0xF7EE, 0xE8EC,      0,      0, /* 0xA0 */
-    0xE341,      0,      0,      0,      0, 0xE5EF,      0,      0, /* 0xA0 */
-         0, 0xEE95,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xEEA2, 0xED69,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xED71, /* 0xC0 */
-         0,      0, 0xF954,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xF7EF, 0xE2F4, 0xF6E6,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xE24C,      0,      0,      0, /* 0xD0 */
-         0, 0xF555, 0xE933                                          /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xE836, 	 0, 	 0, 0xEB7C, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xF75D, 	 0, 0xE0D2, 	 0, 	 0, 	 0, 0xF0CE, /* 0x80 */
+         0, 0xF7D8, 0xF7D9, 0xE070, 0xE85A, 	 0, 	 0, 	 0, /* 0x90 */
+    0xE0A6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xE058, 0xF7EE, 0xE8EC, 	 0, 	 0, /* 0xA0 */
+    0xE341, 	 0, 	 0, 	 0, 	 0, 0xE5EF, 	 0, 	 0, /* 0xA0 */
+         0, 0xEE95, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xEEA2, 0xED69, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xED71, /* 0xC0 */
+         0, 	 0, 0xF954, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xF7EF, 0xE2F4, 0xF6E6, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xE24C, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xF555, 0xE933											/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_96[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xE9BD,      0,      0,      0, /* 0x10 */
-         0, 0xF556,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xF731,      0,      0,      0, 0xEF66,      0, /* 0x20 */
-         0,      0, 0xE8C1,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xF376,      0,      0,      0, 0xED49, /* 0x30 */
-    0xF67D,      0, 0xF7AE,      0, 0xE9BE,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xE6B0, 0xE778, 0xE0BD,      0,      0, /* 0x40 */
-    0xF7DA,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xF75E, 0xF7F0, 0xEB7D, 0xECB3, 0xF543, /* 0x50 */
-         0,      0, 0xF052, 0xF476, 0xF346,      0,      0,      0, /* 0x60 */
-         0,      0, 0xE8D6,      0,      0,      0,      0,      0, /* 0x60 */
-    0xF0E4,      0,      0, 0xF477,      0, 0xE6D5, 0xE546, 0xF7E8, /* 0x70 */
-    0xE6C1,      0,      0,      0,      0, 0xEDD5,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xEFEA, 0xE6CC,      0, /* 0x80 */
-         0,      0, 0xE4E9, 0xEC59,      0, 0xF96B, 0xE1AD,      0, /* 0x80 */
-         0,      0,      0,      0, 0xE140, 0xF032,      0,      0, /* 0x90 */
-    0xED98, 0xE350,      0, 0xF347, 0xF231,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xE6F6,      0,      0,      0, 0xEC5A, /* 0xA0 */
-    0xEC5B,      0, 0xF85F,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xF0DF,      0,      0,      0,      0,      0, 0xE65B, /* 0xB0 */
-         0,      0,      0, 0xF544,      0,      0,      0,      0, /* 0xB0 */
-    0xF1CD, 0xED62,      0,      0, 0xF039, 0xED4A, 0xF4A2, 0xE1D2, /* 0xC0 */
-         0, 0xF65B,      0, 0xF3E6, 0xF1C1, 0xEF4C, 0xF261,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xF377, 0xEC5C,      0, /* 0xD0 */
-         0, 0xED3A,      0, 0xF5E1, 0xF1DA,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xE6EE, 0xE3F1,      0,      0,      0,      0, /* 0xE0 */
-    0xEFEB, 0xEFEC, 0xEB74,      0,      0,      0,      0, 0xE837, /* 0xE0 */
-    0xE9D4,      0, 0xF033,      0,      0,      0, 0xE653, 0xE696, /* 0xF0 */
-         0, 0xE86F,      0, 0xF2B3                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xE9BD, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xF556, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF731, 	 0, 	 0, 	 0, 0xEF66, 	 0, /* 0x20 */
+         0, 	 0, 0xE8C1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xF376, 	 0, 	 0, 	 0, 0xED49, /* 0x30 */
+    0xF67D, 	 0, 0xF7AE, 	 0, 0xE9BE, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xE6B0, 0xE778, 0xE0BD, 	 0, 	 0, /* 0x40 */
+    0xF7DA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xF75E, 0xF7F0, 0xEB7D, 0xECB3, 0xF543, /* 0x50 */
+         0, 	 0, 0xF052, 0xF476, 0xF346, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xE8D6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xF0E4, 	 0, 	 0, 0xF477, 	 0, 0xE6D5, 0xE546, 0xF7E8, /* 0x70 */
+    0xE6C1, 	 0, 	 0, 	 0, 	 0, 0xEDD5, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEFEA, 0xE6CC, 	 0, /* 0x80 */
+         0, 	 0, 0xE4E9, 0xEC59, 	 0, 0xF96B, 0xE1AD, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xE140, 0xF032, 	 0, 	 0, /* 0x90 */
+    0xED98, 0xE350, 	 0, 0xF347, 0xF231, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xE6F6, 	 0, 	 0, 	 0, 0xEC5A, /* 0xA0 */
+    0xEC5B, 	 0, 0xF85F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xF0DF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE65B, /* 0xB0 */
+         0, 	 0, 	 0, 0xF544, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xF1CD, 0xED62, 	 0, 	 0, 0xF039, 0xED4A, 0xF4A2, 0xE1D2, /* 0xC0 */
+         0, 0xF65B, 	 0, 0xF3E6, 0xF1C1, 0xEF4C, 0xF261, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF377, 0xEC5C, 	 0, /* 0xD0 */
+         0, 0xED3A, 	 0, 0xF5E1, 0xF1DA, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xE6EE, 0xE3F1, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xEFEB, 0xEFEC, 0xEB74, 	 0, 	 0, 	 0, 	 0, 0xE837, /* 0xE0 */
+    0xE9D4, 	 0, 0xF033, 	 0, 	 0, 	 0, 0xE653, 0xE696, /* 0xF0 */
+         0, 0xE86F, 	 0, 0xF2B3									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_97[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xEC5D,      0,      0,      0,      0,      0, 0xF2FD, 0xF478, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xF2C5,      0, 0xEEE7,      0,      0, 0xE6FD,      0, /* 0x10 */
-         0, 0xEECE,      0,      0, 0xEADC,      0, 0xF7C7,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xE7F6, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xEAAC,      0, 0xE66A,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xE934,      0,      0,      0, 0xF348,      0,      0, /* 0x30 */
-         0,      0, 0xE5FA,      0, 0xED99,      0,      0,      0, /* 0x40 */
-    0xE654,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xF57C,      0,      0,      0,      0, 0xF2FE,      0, /* 0x50 */
-         0,      0,      0,      0, 0xF331,      0, 0xEA3A,      0, /* 0x50 */
-         0, 0xE84C, 0xE79E,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xF864,      0,      0,      0, 0xF175,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xF938,      0,      0, 0xF176, /* 0x70 */
-         0,      0, 0xE75B,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xF8B9,      0, 0xED63,      0, 0xE1F9, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xE2D3,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xE07A,      0,      0, 0xE2D4,      0, 0xF74D,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xF557,      0, /* 0xC0 */
-         0,      0,      0, 0xF06F,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xF7DB,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xE547,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xF0E5,      0,      0, 0xEBD2,      0, /* 0xF0 */
-         0,      0,      0, 0xF034,      0,      0,      0, 0xF852  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xEC5D, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF2FD, 0xF478, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xF2C5, 	 0, 0xEEE7, 	 0, 	 0, 0xE6FD, 	 0, /* 0x10 */
+         0, 0xEECE, 	 0, 	 0, 0xEADC, 	 0, 0xF7C7, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7F6, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xEAAC, 	 0, 0xE66A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xE934, 	 0, 	 0, 	 0, 0xF348, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xE5FA, 	 0, 0xED99, 	 0, 	 0, 	 0, /* 0x40 */
+    0xE654, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xF57C, 	 0, 	 0, 	 0, 	 0, 0xF2FE, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xF331, 	 0, 0xEA3A, 	 0, /* 0x50 */
+         0, 0xE84C, 0xE79E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xF864, 	 0, 	 0, 	 0, 0xF175, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xF938, 	 0, 	 0, 0xF176, /* 0x70 */
+         0, 	 0, 0xE75B, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xF8B9, 	 0, 0xED63, 	 0, 0xE1F9, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xE2D3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xE07A, 	 0, 	 0, 0xE2D4, 	 0, 0xF74D, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF557, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xF06F, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xF7DB, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xE547, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xF0E5, 	 0, 	 0, 0xEBD2, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xF034, 	 0, 	 0, 	 0, 0xF852	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_98[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF8E1, 0xF87D, 0xF332, 0xE193,      0, 0xF833, 0xEC99,      0, /* 0x00 */
-    0xEC5E,      0, 0xEFF5,      0, 0xEBEB,      0,      0,      0, /* 0x00 */
-    0xEEE8, 0xEF67, 0xE89A, 0xE55B,      0,      0,      0, 0xF6F6, /* 0x10 */
-    0xE655,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xE579,      0,      0, /* 0x20 */
-    0xF89C,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xE194, 0xF6DD,      0, 0xEA4A,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xE238,      0, /* 0x40 */
-         0,      0,      0,      0, 0xF349, 0xEDA0, 0xED59,      0, /* 0x40 */
-         0,      0,      0,      0, 0xED64,      0,      0,      0, /* 0x50 */
-    0xF053,      0, 0xF2B4,      0,      0,      0, 0xE6BE,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xF8E2,      0, 0xE1D3, /* 0x60 */
-         0,      0,      0, 0xF2B5,      0,      0,      0, 0xF879, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xF7A6,      0,      0,      0,      0,      0,      0, 0xEABD, /* 0xA0 */
-         0, 0xF6C7,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xF79F,      0,      0, 0xF79E, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xEA3B, 0xE8E8,      0,      0, 0xECDD, /* 0xD0 */
-         0, 0xEBE2, 0xE3C6,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xF660, 0xF0E6, 0xE89B, /* 0xE0 */
-         0,      0,      0,      0, 0xF157,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0, 0xEA9A, 0xF779, 0xECDE          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF8E1, 0xF87D, 0xF332, 0xE193, 	 0, 0xF833, 0xEC99, 	 0, /* 0x00 */
+    0xEC5E, 	 0, 0xEFF5, 	 0, 0xEBEB, 	 0, 	 0, 	 0, /* 0x00 */
+    0xEEE8, 0xEF67, 0xE89A, 0xE55B, 	 0, 	 0, 	 0, 0xF6F6, /* 0x10 */
+    0xE655, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE579, 	 0, 	 0, /* 0x20 */
+    0xF89C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xE194, 0xF6DD, 	 0, 0xEA4A, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE238, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xF349, 0xEDA0, 0xED59, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xED64, 	 0, 	 0, 	 0, /* 0x50 */
+    0xF053, 	 0, 0xF2B4, 	 0, 	 0, 	 0, 0xE6BE, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF8E2, 	 0, 0xE1D3, /* 0x60 */
+         0, 	 0, 	 0, 0xF2B5, 	 0, 	 0, 	 0, 0xF879, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xF7A6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEABD, /* 0xA0 */
+         0, 0xF6C7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xF79F, 	 0, 	 0, 0xF79E, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xEA3B, 0xE8E8, 	 0, 	 0, 0xECDD, /* 0xD0 */
+         0, 0xEBE2, 0xE3C6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF660, 0xF0E6, 0xE89B, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xF157, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xEA9A, 0xF779, 0xECDE			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_99[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xE297,      0,      0,      0,      0, /* 0x00 */
-         0, 0xF853, 0xEDD7,      0, 0xF158,      0,      0,      0, /* 0x00 */
-    0xF4C9,      0,      0, 0xED4B,      0,      0,      0,      0, /* 0x10 */
-    0xEE3E,      0,      0,      0,      0,      0, 0xF2B6,      0, /* 0x10 */
-    0xE94F,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xE24D,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xE753,      0,      0, /* 0x40 */
-         0, 0xE35F,      0, 0xE2FA, 0xF4CA, 0xEB67,      0,      0, /* 0x40 */
-         0, 0xE3C7, 0xEFAE,      0, 0xEF4D,      0,      0, 0xF854, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xEC5F,      0, /* 0x90 */
-         0, 0xF855,      0,      0,      0, 0xF7B8,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xE970,      0,      0, /* 0xA0 */
-    0xF8B0,      0,      0,      0, 0xE739, 0xEDDF, 0xF7A7,      0, /* 0xA0 */
-         0, 0xF67E,      0, 0xF65C, 0xEC9A,      0,      0,      0, /* 0xB0 */
-         0, 0xF193,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE870,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xF3D2, 0xE45C, 0xE2CB,      0,      0, 0xE04D,      0,      0, /* 0xD0 */
-         0, 0xE9BF,      0,      0,      0, 0xF691,      0, 0xEA9B, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xF844,      0,      0, /* 0xE0 */
-         0, 0xE5AD,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0,      0,      0, 0xF3E7  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xE297, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xF853, 0xEDD7, 	 0, 0xF158, 	 0, 	 0, 	 0, /* 0x00 */
+    0xF4C9, 	 0, 	 0, 0xED4B, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xEE3E, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF2B6, 	 0, /* 0x10 */
+    0xE94F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xE24D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE753, 	 0, 	 0, /* 0x40 */
+         0, 0xE35F, 	 0, 0xE2FA, 0xF4CA, 0xEB67, 	 0, 	 0, /* 0x40 */
+         0, 0xE3C7, 0xEFAE, 	 0, 0xEF4D, 	 0, 	 0, 0xF854, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEC5F, 	 0, /* 0x90 */
+         0, 0xF855, 	 0, 	 0, 	 0, 0xF7B8, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE970, 	 0, 	 0, /* 0xA0 */
+    0xF8B0, 	 0, 	 0, 	 0, 0xE739, 0xEDDF, 0xF7A7, 	 0, /* 0xA0 */
+         0, 0xF67E, 	 0, 0xF65C, 0xEC9A, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xF193, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE870, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xF3D2, 0xE45C, 0xE2CB, 	 0, 	 0, 0xE04D, 	 0, 	 0, /* 0xD0 */
+         0, 0xE9BF, 	 0, 	 0, 	 0, 0xF691, 	 0, 0xEA9B, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF844, 	 0, 	 0, /* 0xE0 */
+         0, 0xE5AD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF3E7	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_9A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xEA4E,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0xE950,      0,      0,      0,      0,      0, 0xE3C8, 0xE3C9, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xF74E,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xE0F6,      0,      0,      0,      0, /* 0x20 */
-    0xE59B,      0,      0,      0,      0,      0, 0xF5E2, 0xEBD3, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xE779,      0,      0, 0xF7A0,      0, 0xE2CC,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xF9A4,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xE298,      0, 0xF860, /* 0x50 */
-         0,      0, 0xE195, 0xEE4E,      0,      0,      0, 0xF63E, /* 0x50 */
-         0,      0, 0xE5F0,      0,      0, 0xE3CA,      0,      0, /* 0x60 */
-         0, 0xF94E, 0xE5F1,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xE1E9,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xF845,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xEC60, 0xF599,      0,      0,      0, /* 0xD0 */
-    0xE1D4,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xEEA3,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xE8A5          /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xEA4E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xE950, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE3C8, 0xE3C9, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xF74E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xE0F6, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xE59B, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF5E2, 0xEBD3, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xE779, 	 0, 	 0, 0xF7A0, 	 0, 0xE2CC, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF9A4, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE298, 	 0, 0xF860, /* 0x50 */
+         0, 	 0, 0xE195, 0xEE4E, 	 0, 	 0, 	 0, 0xF63E, /* 0x50 */
+         0, 	 0, 0xE5F0, 	 0, 	 0, 0xE3CA, 	 0, 	 0, /* 0x60 */
+         0, 0xF94E, 0xE5F1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xE1E9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xF845, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xEC60, 0xF599, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE1D4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEEA3, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8A5			/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_9B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xEC61,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xE6A2, /* 0x20 */
-         0,      0, 0xF6E3,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xF036,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xE331,      0,      0,      0, /* 0x30 */
-         0, 0xE26A, 0xF8EB, 0xE8A6, 0xE8DE, 0xE775,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xF070, /* 0x40 */
-         0,      0,      0,      0, 0xE73A,      0,      0,      0, /* 0x50 */
-         0,      0, 0xEDE0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0xE66B, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xF2C6,      0, /* 0x80 */
-         0, 0xF77A,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xED65, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xE299,      0,      0, 0xEB68,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xE6EF,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xF57D,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xE1E6,      0,      0,      0, /* 0xE0 */
-    0xE196                                                          /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xEC61, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6A2, /* 0x20 */
+         0, 	 0, 0xF6E3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xF036, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xE331, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xE26A, 0xF8EB, 0xE8A6, 0xE8DE, 0xE775, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF070, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xE73A, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xEDE0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE66B, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF2C6, 	 0, /* 0x80 */
+         0, 0xF77A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xED65, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xE299, 	 0, 	 0, 0xEB68, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xE6EF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF57D, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xE1E6, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE196															/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_9C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xF5E3,      0,      0, /* 0x00 */
-    0xED5A,      0, 0xE971,      0,      0, 0xF7C8,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xF94F,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xEF37,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xE754,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xE0BE, /* 0x40 */
-         0, 0xE93E,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xE6F7, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xF378,      0, 0xE9C0, /* 0xE0 */
-         0, 0xE2CD,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xE995, 0xE7B0,      0, 0xEE79          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xF5E3, 	 0, 	 0, /* 0x00 */
+    0xED5A, 	 0, 0xE971, 	 0, 	 0, 0xF7C8, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF94F, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xEF37, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xE754, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0BE, /* 0x40 */
+         0, 0xE93E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6F7, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF378, 	 0, 0xE9C0, /* 0xE0 */
+         0, 0xE2CD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xE995, 0xE7B0, 	 0, 0xEE79			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_9D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xED4C,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xF054,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xED7C,      0, /* 0x20 */
-    0xED75,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xF8F8,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xE14B,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xED4D,      0,      0, /* 0x50 */
-    0xE1DC, 0xE7F7,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xE9DF,      0,      0,      0, /* 0x60 */
-         0,      0, 0xF1CE,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xE7D0,      0,      0,      0,      0,      0, 0xEDA3, /* 0xA0 */
-         0,      0,      0,      0, 0xF7CD,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xE1AE,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE2CE, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0xF63F,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xF9D3, 0xF0ED, 0xE66C                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xED4C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xF054, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xED7C, 	 0, /* 0x20 */
+    0xED75, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xF8F8, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xE14B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xED4D, 	 0, 	 0, /* 0x50 */
+    0xE1DC, 0xE7F7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xE9DF, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xF1CE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xE7D0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEDA3, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xF7CD, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xE1AE, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2CE, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xF63F, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xF9D3, 0xF0ED, 0xE66C											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_9E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xEDA4,      0,      0,      0, 0xE5B6,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xE66D,      0,      0, /* 0x70 */
-         0, 0xF7E9,      0,      0,      0, 0xEEA4,      0, 0xE673, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xE3CB, 0xE674,      0,      0,      0, 0xE5F2, /* 0x90 */
-         0,      0,      0,      0,      0, 0xEA9C,      0, 0xE6F8, /* 0x90 */
-         0,      0,      0,      0,      0, 0xE77A,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xE2D5, 0xE79F,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xE73B,      0,      0, 0xF9CB,      0, /* 0xB0 */
-         0,      0,      0, 0xF96C,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xEB38, 0xE5F3,      0, /* 0xC0 */
-         0, 0xF9D9,      0,      0, 0xE133,      0,      0,      0, /* 0xD0 */
-    0xE7F9,      0,      0, 0xE4EA, 0xF5F5,      0, 0xF2C7,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xE4DA,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xE84D                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xEDA4, 	 0, 	 0, 	 0, 0xE5B6, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE66D, 	 0, 	 0, /* 0x70 */
+         0, 0xF7E9, 	 0, 	 0, 	 0, 0xEEA4, 	 0, 0xE673, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE3CB, 0xE674, 	 0, 	 0, 	 0, 0xE5F2, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEA9C, 	 0, 0xE6F8, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE77A, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xE2D5, 0xE79F, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xE73B, 	 0, 	 0, 0xF9CB, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xF96C, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEB38, 0xE5F3, 	 0, /* 0xC0 */
+         0, 0xF9D9, 	 0, 	 0, 0xE133, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE7F9, 	 0, 	 0, 0xE4EA, 0xF5F5, 	 0, 0xF2C7, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE4DA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xE84D							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_9F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xEF38, /* 0x00 */
-    0xE93F,      0,      0,      0,      0,      0, 0xF333,      0, /* 0x00 */
-         0,      0,      0, 0xE1D5,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xEB39,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xEA3C,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xF34A, 0xF241,      0,      0, 0xF242,      0, /* 0x40 */
-         0,      0, 0xF65D,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xF262, /* 0x50 */
-         0, 0xE656,      0,      0,      0,      0,      0, 0xEB75, /* 0x60 */
-         0,      0, 0xF4BB,      0, 0xEDE1,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0xED5B, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xE6A3,      0,      0, /* 0x80 */
-    0xE8C2,      0,      0,      0,      0, 0xE0A0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xE2CF                          /* 0x90 */
+    0xE93F, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF333, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xE1D5, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xEB39, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xEA3C, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xF34A, 0xF241, 	 0, 	 0, 0xF242, 	 0, /* 0x40 */
+         0, 	 0, 0xF65D, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF262, /* 0x50 */
+         0, 0xE656, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEB75, /* 0x60 */
+         0, 	 0, 0xF4BB, 	 0, 0xEDE1, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xED5B, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE6A3, 	 0, 	 0, /* 0x80 */
+    0xE8C2, 	 0, 	 0, 	 0, 	 0, 0xE0A0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xE2CF							/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_AC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8861, 0x8862, 0x8863, 0x8864, 0x8865, 0x8866, 0x8867, 0x8868, /* 0x00 */
     0x8869, 0x886A, 0x886B, 0x886C, 0x886D, 0x886E, 0x886F, 0x8870, /* 0x00 */
     0x8871, 0x8873, 0x8874, 0x8875, 0x8876, 0x8877, 0x8878, 0x8879, /* 0x10 */
@@ -3614,15 +3614,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_AC[] =
     0x89A1, 0x89A2, 0x89A3, 0x89A4, 0x89A5, 0x89A6, 0x89A7, 0x89A8, /* 0xE0 */
     0x89A9, 0x89AA, 0x89AB, 0x89AC, 0x89AD, 0x89AE, 0x89AF, 0x89B0, /* 0xE0 */
     0x89B1, 0x89B3, 0x89B4, 0x89B5, 0x89B6, 0x89B7, 0x89B8, 0x89B9, /* 0xF0 */
-    0x89BA, 0x89BB, 0x89BC, 0x89BD, 0x89C1, 0x89C2, 0x89C3, 0x89C4  /* 0xF0 */
+    0x89BA, 0x89BB, 0x89BC, 0x89BD, 0x89C1, 0x89C2, 0x89C3, 0x89C4	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_AD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x89C5, 0x89C6, 0x89C7, 0x89C8, 0x89C9, 0x89CA, 0x89CB, 0x89CC, /* 0x00 */
     0x89CD, 0x89CE, 0x89CF, 0x89D0, 0x89D1, 0x89D3, 0x89D4, 0x89D5, /* 0x00 */
     0x89D6, 0x89D7, 0x89D8, 0x89D9, 0x89DA, 0x89DB, 0x89DC, 0x89DD, /* 0x10 */
@@ -3654,15 +3654,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_AD[] =
     0x8B45, 0x8B46, 0x8B47, 0x8B48, 0x8B49, 0x8B4A, 0x8B4B, 0x8B4C, /* 0xE0 */
     0x8B4D, 0x8B4E, 0x8B4F, 0x8B50, 0x8B51, 0x8B53, 0x8B54, 0x8B55, /* 0xE0 */
     0x8B56, 0x8B57, 0x8B58, 0x8B59, 0x8B5A, 0x8B5B, 0x8B5C, 0x8B5D, /* 0xF0 */
-    0x8B61, 0x8B62, 0x8B63, 0x8B64, 0x8B65, 0x8B66, 0x8B67, 0x8B68  /* 0xF0 */
+    0x8B61, 0x8B62, 0x8B63, 0x8B64, 0x8B65, 0x8B66, 0x8B67, 0x8B68	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_AE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8B69, 0x8B6A, 0x8B6B, 0x8B6C, 0x8B6D, 0x8B6E, 0x8B6F, 0x8B70, /* 0x00 */
     0x8B71, 0x8B73, 0x8B74, 0x8B75, 0x8B76, 0x8B77, 0x8B78, 0x8B79, /* 0x00 */
     0x8B7A, 0x8B7B, 0x8B7C, 0x8B7D, 0x8B81, 0x8B82, 0x8B83, 0x8B84, /* 0x10 */
@@ -3694,15 +3694,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_AE[] =
     0x8D49, 0x8D4A, 0x8D4B, 0x8D4C, 0x8D4D, 0x8D4E, 0x8D4F, 0x8D50, /* 0xE0 */
     0x8D51, 0x8D53, 0x8D54, 0x8D55, 0x8D56, 0x8D57, 0x8D58, 0x8D59, /* 0xE0 */
     0x8D5A, 0x8D5B, 0x8D5C, 0x8D5D, 0x8D61, 0x8D62, 0x8D63, 0x8D64, /* 0xF0 */
-    0x8D65, 0x8D66, 0x8D67, 0x8D68, 0x8D69, 0x8D6A, 0x8D6B, 0x8D6C  /* 0xF0 */
+    0x8D65, 0x8D66, 0x8D67, 0x8D68, 0x8D69, 0x8D6A, 0x8D6B, 0x8D6C	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_AF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8D6D, 0x8D6E, 0x8D6F, 0x8D70, 0x8D71, 0x8D73, 0x8D74, 0x8D75, /* 0x00 */
     0x8D76, 0x8D77, 0x8D78, 0x8D79, 0x8D7A, 0x8D7B, 0x8D7C, 0x8D7D, /* 0x00 */
     0x8D81, 0x8D82, 0x8D83, 0x8D84, 0x8D85, 0x8D86, 0x8D87, 0x8D88, /* 0x10 */
@@ -3734,15 +3734,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_AF[] =
     0x8EAD, 0x8EAE, 0x8EAF, 0x8EB0, 0x8EB1, 0x8EB3, 0x8EB4, 0x8EB5, /* 0xE0 */
     0x8EB6, 0x8EB7, 0x8EB8, 0x8EB9, 0x8EBA, 0x8EBB, 0x8EBC, 0x8EBD, /* 0xE0 */
     0x8EC1, 0x8EC2, 0x8EC3, 0x8EC4, 0x8EC5, 0x8EC6, 0x8EC7, 0x8EC8, /* 0xF0 */
-    0x8EC9, 0x8ECA, 0x8ECB, 0x8ECC, 0x8ECD, 0x8ECE, 0x8ECF, 0x8ED0  /* 0xF0 */
+    0x8EC9, 0x8ECA, 0x8ECB, 0x8ECC, 0x8ECD, 0x8ECE, 0x8ECF, 0x8ED0	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8ED1, 0x8ED3, 0x8ED4, 0x8ED5, 0x8ED6, 0x8ED7, 0x8ED8, 0x8ED9, /* 0x00 */
     0x8EDA, 0x8EDB, 0x8EDC, 0x8EDD, 0x8EE1, 0x8EE2, 0x8EE3, 0x8EE4, /* 0x00 */
     0x8EE5, 0x8EE6, 0x8EE7, 0x8EE8, 0x8EE9, 0x8EEA, 0x8EEB, 0x8EEC, /* 0x10 */
@@ -3774,15 +3774,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B0[] =
     0x90B1, 0x90B3, 0x90B4, 0x90B5, 0x90B6, 0x90B7, 0x90B8, 0x90B9, /* 0xE0 */
     0x90BA, 0x90BB, 0x90BC, 0x90BD, 0x90C1, 0x90C2, 0x90C3, 0x90C4, /* 0xE0 */
     0x90C5, 0x90C6, 0x90C7, 0x90C8, 0x90C9, 0x90CA, 0x90CB, 0x90CC, /* 0xF0 */
-    0x90CD, 0x90CE, 0x90CF, 0x90D0, 0x90D1, 0x90D3, 0x90D4, 0x90D5  /* 0xF0 */
+    0x90CD, 0x90CE, 0x90CF, 0x90D0, 0x90D1, 0x90D3, 0x90D4, 0x90D5	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x90D6, 0x90D7, 0x90D8, 0x90D9, 0x90DA, 0x90DB, 0x90DC, 0x90DD, /* 0x00 */
     0x90E1, 0x90E2, 0x90E3, 0x90E4, 0x90E5, 0x90E6, 0x90E7, 0x90E8, /* 0x00 */
     0x90E9, 0x90EA, 0x90EB, 0x90EC, 0x90ED, 0x90EE, 0x90EF, 0x90F0, /* 0x10 */
@@ -3814,15 +3814,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B1[] =
     0x9256, 0x9257, 0x9258, 0x9259, 0x925A, 0x925B, 0x925C, 0x925D, /* 0xE0 */
     0x9261, 0x9262, 0x9263, 0x9264, 0x9265, 0x9266, 0x9267, 0x9268, /* 0xE0 */
     0x9269, 0x926A, 0x926B, 0x926C, 0x926D, 0x926E, 0x926F, 0x9270, /* 0xF0 */
-    0x9271, 0x9273, 0x9274, 0x9275, 0x9276, 0x9277, 0x9278, 0x9279  /* 0xF0 */
+    0x9271, 0x9273, 0x9274, 0x9275, 0x9276, 0x9277, 0x9278, 0x9279	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x927A, 0x927B, 0x927C, 0x927D, 0x9281, 0x9282, 0x9283, 0x9284, /* 0x00 */
     0x9285, 0x9286, 0x9287, 0x9288, 0x9289, 0x928A, 0x928B, 0x928C, /* 0x00 */
     0x928D, 0x928E, 0x928F, 0x9290, 0x9291, 0x9293, 0x9294, 0x9295, /* 0x10 */
@@ -3854,15 +3854,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B2[] =
     0x93BA, 0x93BB, 0x93BC, 0x93BD, 0x9461, 0x9462, 0x9463, 0x9464, /* 0xE0 */
     0x9465, 0x9466, 0x9467, 0x9468, 0x9469, 0x946A, 0x946B, 0x946C, /* 0xE0 */
     0x946D, 0x946E, 0x946F, 0x9470, 0x9471, 0x9473, 0x9474, 0x9475, /* 0xF0 */
-    0x9476, 0x9477, 0x9478, 0x9479, 0x947A, 0x947B, 0x947C, 0x947D  /* 0xF0 */
+    0x9476, 0x9477, 0x9478, 0x9479, 0x947A, 0x947B, 0x947C, 0x947D	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9481, 0x9482, 0x9483, 0x9484, 0x9485, 0x9486, 0x9487, 0x9488, /* 0x00 */
     0x9489, 0x948A, 0x948B, 0x948C, 0x948D, 0x948E, 0x948F, 0x9490, /* 0x00 */
     0x9491, 0x9493, 0x9494, 0x9495, 0x9496, 0x9497, 0x9498, 0x9499, /* 0x10 */
@@ -3894,15 +3894,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B3[] =
     0x95C1, 0x95C2, 0x95C3, 0x95C4, 0x95C5, 0x95C6, 0x95C7, 0x95C8, /* 0xE0 */
     0x95C9, 0x95CA, 0x95CB, 0x95CC, 0x95CD, 0x95CE, 0x95CF, 0x95D0, /* 0xE0 */
     0x95D1, 0x95D3, 0x95D4, 0x95D5, 0x95D6, 0x95D7, 0x95D8, 0x95D9, /* 0xF0 */
-    0x95DA, 0x95DB, 0x95DC, 0x95DD, 0x95E1, 0x95E2, 0x95E3, 0x95E4  /* 0xF0 */
+    0x95DA, 0x95DB, 0x95DC, 0x95DD, 0x95E1, 0x95E2, 0x95E3, 0x95E4	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x95E5, 0x95E6, 0x95E7, 0x95E8, 0x95E9, 0x95EA, 0x95EB, 0x95EC, /* 0x00 */
     0x95ED, 0x95EE, 0x95EF, 0x95F0, 0x95F1, 0x95F3, 0x95F4, 0x95F5, /* 0x00 */
     0x95F6, 0x95F7, 0x95F8, 0x95F9, 0x95FA, 0x95FB, 0x95FC, 0x95FD, /* 0x10 */
@@ -3934,15 +3934,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B4[] =
     0x9765, 0x9766, 0x9767, 0x9768, 0x9769, 0x976A, 0x976B, 0x976C, /* 0xE0 */
     0x976D, 0x976E, 0x976F, 0x9770, 0x9771, 0x9773, 0x9774, 0x9775, /* 0xE0 */
     0x9776, 0x9777, 0x9778, 0x9779, 0x977A, 0x977B, 0x977C, 0x977D, /* 0xF0 */
-    0x9781, 0x9782, 0x9783, 0x9784, 0x9785, 0x9786, 0x9787, 0x9788  /* 0xF0 */
+    0x9781, 0x9782, 0x9783, 0x9784, 0x9785, 0x9786, 0x9787, 0x9788	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9789, 0x978A, 0x978B, 0x978C, 0x978D, 0x978E, 0x978F, 0x9790, /* 0x00 */
     0x9791, 0x9793, 0x9794, 0x9795, 0x9796, 0x9797, 0x9798, 0x9799, /* 0x00 */
     0x979A, 0x979B, 0x979C, 0x979D, 0x97A1, 0x97A2, 0x97A3, 0x97A4, /* 0x10 */
@@ -3974,15 +3974,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B5[] =
     0x9969, 0x996A, 0x996B, 0x996C, 0x996D, 0x996E, 0x996F, 0x9970, /* 0xE0 */
     0x9971, 0x9973, 0x9974, 0x9975, 0x9976, 0x9977, 0x9978, 0x9979, /* 0xE0 */
     0x997A, 0x997B, 0x997C, 0x997D, 0x9981, 0x9982, 0x9983, 0x9984, /* 0xF0 */
-    0x9985, 0x9986, 0x9987, 0x9988, 0x9989, 0x998A, 0x998B, 0x998C  /* 0xF0 */
+    0x9985, 0x9986, 0x9987, 0x9988, 0x9989, 0x998A, 0x998B, 0x998C	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x998D, 0x998E, 0x998F, 0x9990, 0x9991, 0x9993, 0x9994, 0x9995, /* 0x00 */
     0x9996, 0x9997, 0x9998, 0x9999, 0x999A, 0x999B, 0x999C, 0x999D, /* 0x00 */
     0x99A1, 0x99A2, 0x99A3, 0x99A4, 0x99A5, 0x99A6, 0x99A7, 0x99A8, /* 0x10 */
@@ -4014,15 +4014,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B6[] =
     0x9ACD, 0x9ACE, 0x9ACF, 0x9AD0, 0x9AD1, 0x9AD3, 0x9AD4, 0x9AD5, /* 0xE0 */
     0x9AD6, 0x9AD7, 0x9AD8, 0x9AD9, 0x9ADA, 0x9ADB, 0x9ADC, 0x9ADD, /* 0xE0 */
     0x9AE1, 0x9AE2, 0x9AE3, 0x9AE4, 0x9AE5, 0x9AE6, 0x9AE7, 0x9AE8, /* 0xF0 */
-    0x9AE9, 0x9AEA, 0x9AEB, 0x9AEC, 0x9AED, 0x9AEE, 0x9AEF, 0x9AF0  /* 0xF0 */
+    0x9AE9, 0x9AEA, 0x9AEB, 0x9AEC, 0x9AED, 0x9AEE, 0x9AEF, 0x9AF0	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9AF1, 0x9AF3, 0x9AF4, 0x9AF5, 0x9AF6, 0x9AF7, 0x9AF8, 0x9AF9, /* 0x00 */
     0x9AFA, 0x9AFB, 0x9AFC, 0x9AFD, 0x9B41, 0x9B42, 0x9B43, 0x9B44, /* 0x00 */
     0x9B45, 0x9B46, 0x9B47, 0x9B48, 0x9B49, 0x9B4A, 0x9B4B, 0x9B4C, /* 0x10 */
@@ -4054,15 +4054,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B7[] =
     0x9CD1, 0x9CD3, 0x9CD4, 0x9CD5, 0x9CD6, 0x9CD7, 0x9CD8, 0x9CD9, /* 0xE0 */
     0x9CDA, 0x9CDB, 0x9CDC, 0x9CDD, 0x9CE1, 0x9CE2, 0x9CE3, 0x9CE4, /* 0xE0 */
     0x9CE5, 0x9CE6, 0x9CE7, 0x9CE8, 0x9CE9, 0x9CEA, 0x9CEB, 0x9CEC, /* 0xF0 */
-    0x9CED, 0x9CEE, 0x9CEF, 0x9CF0, 0x9CF1, 0x9CF3, 0x9CF4, 0x9CF5  /* 0xF0 */
+    0x9CED, 0x9CEE, 0x9CEF, 0x9CF0, 0x9CF1, 0x9CF3, 0x9CF4, 0x9CF5	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9CF6, 0x9CF7, 0x9CF8, 0x9CF9, 0x9CFA, 0x9CFB, 0x9CFC, 0x9CFD, /* 0x00 */
     0x9D41, 0x9D42, 0x9D43, 0x9D44, 0x9D45, 0x9D46, 0x9D47, 0x9D48, /* 0x00 */
     0x9D49, 0x9D4A, 0x9D4B, 0x9D4C, 0x9D4D, 0x9D4E, 0x9D4F, 0x9D50, /* 0x10 */
@@ -4094,15 +4094,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B8[] =
     0x9E76, 0x9E77, 0x9E78, 0x9E79, 0x9E7A, 0x9E7B, 0x9E7C, 0x9E7D, /* 0xE0 */
     0x9E81, 0x9E82, 0x9E83, 0x9E84, 0x9E85, 0x9E86, 0x9E87, 0x9E88, /* 0xE0 */
     0x9E89, 0x9E8A, 0x9E8B, 0x9E8C, 0x9E8D, 0x9E8E, 0x9E8F, 0x9E90, /* 0xF0 */
-    0x9E91, 0x9E93, 0x9E94, 0x9E95, 0x9E96, 0x9E97, 0x9E98, 0x9E99  /* 0xF0 */
+    0x9E91, 0x9E93, 0x9E94, 0x9E95, 0x9E96, 0x9E97, 0x9E98, 0x9E99	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9E9A, 0x9E9B, 0x9E9C, 0x9E9D, 0x9EA1, 0x9EA2, 0x9EA3, 0x9EA4, /* 0x00 */
     0x9EA5, 0x9EA6, 0x9EA7, 0x9EA8, 0x9EA9, 0x9EAA, 0x9EAB, 0x9EAC, /* 0x00 */
     0x9EAD, 0x9EAE, 0x9EAF, 0x9EB0, 0x9EB1, 0x9EB3, 0x9EB4, 0x9EB5, /* 0x10 */
@@ -4134,15 +4134,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_B9[] =
     0xA07A, 0xA07B, 0xA07C, 0xA07D, 0xA081, 0xA082, 0xA083, 0xA084, /* 0xE0 */
     0xA085, 0xA086, 0xA087, 0xA088, 0xA089, 0xA08A, 0xA08B, 0xA08C, /* 0xE0 */
     0xA08D, 0xA08E, 0xA08F, 0xA090, 0xA091, 0xA093, 0xA094, 0xA095, /* 0xF0 */
-    0xA096, 0xA097, 0xA098, 0xA099, 0xA09A, 0xA09B, 0xA09C, 0xA09D  /* 0xF0 */
+    0xA096, 0xA097, 0xA098, 0xA099, 0xA09A, 0xA09B, 0xA09C, 0xA09D	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_BA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xA0A1, 0xA0A2, 0xA0A3, 0xA0A4, 0xA0A5, 0xA0A6, 0xA0A7, 0xA0A8, /* 0x00 */
     0xA0A9, 0xA0AA, 0xA0AB, 0xA0AC, 0xA0AD, 0xA0AE, 0xA0AF, 0xA0B0, /* 0x00 */
     0xA0B1, 0xA0B3, 0xA0B4, 0xA0B5, 0xA0B6, 0xA0B7, 0xA0B8, 0xA0B9, /* 0x10 */
@@ -4174,15 +4174,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_BA[] =
     0xA1E1, 0xA1E2, 0xA1E3, 0xA1E4, 0xA1E5, 0xA1E6, 0xA1E7, 0xA1E8, /* 0xE0 */
     0xA1E9, 0xA1EA, 0xA1EB, 0xA1EC, 0xA1ED, 0xA1EE, 0xA1EF, 0xA1F0, /* 0xE0 */
     0xA1F1, 0xA1F3, 0xA1F4, 0xA1F5, 0xA1F6, 0xA1F7, 0xA1F8, 0xA1F9, /* 0xF0 */
-    0xA1FA, 0xA1FB, 0xA1FC, 0xA1FD, 0xA241, 0xA242, 0xA243, 0xA244  /* 0xF0 */
+    0xA1FA, 0xA1FB, 0xA1FC, 0xA1FD, 0xA241, 0xA242, 0xA243, 0xA244	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_BB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xA245, 0xA246, 0xA247, 0xA248, 0xA249, 0xA24A, 0xA24B, 0xA24C, /* 0x00 */
     0xA24D, 0xA24E, 0xA24F, 0xA250, 0xA251, 0xA253, 0xA254, 0xA255, /* 0x00 */
     0xA256, 0xA257, 0xA258, 0xA259, 0xA25A, 0xA25B, 0xA25C, 0xA25D, /* 0x10 */
@@ -4214,15 +4214,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_BB[] =
     0xA385, 0xA386, 0xA387, 0xA388, 0xA389, 0xA38A, 0xA38B, 0xA38C, /* 0xE0 */
     0xA38D, 0xA38E, 0xA38F, 0xA390, 0xA391, 0xA393, 0xA394, 0xA395, /* 0xE0 */
     0xA396, 0xA397, 0xA398, 0xA399, 0xA39A, 0xA39B, 0xA39C, 0xA39D, /* 0xF0 */
-    0xA3A1, 0xA3A2, 0xA3A3, 0xA3A4, 0xA3A5, 0xA3A6, 0xA3A7, 0xA3A8  /* 0xF0 */
+    0xA3A1, 0xA3A2, 0xA3A3, 0xA3A4, 0xA3A5, 0xA3A6, 0xA3A7, 0xA3A8	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_BC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xA3A9, 0xA3AA, 0xA3AB, 0xA3AC, 0xA3AD, 0xA3AE, 0xA3AF, 0xA3B0, /* 0x00 */
     0xA3B1, 0xA3B3, 0xA3B4, 0xA3B5, 0xA3B6, 0xA3B7, 0xA3B8, 0xA3B9, /* 0x00 */
     0xA3BA, 0xA3BB, 0xA3BC, 0xA3BD, 0xA461, 0xA462, 0xA463, 0xA464, /* 0x10 */
@@ -4254,15 +4254,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_BC[] =
     0xA589, 0xA58A, 0xA58B, 0xA58C, 0xA58D, 0xA58E, 0xA58F, 0xA590, /* 0xE0 */
     0xA591, 0xA593, 0xA594, 0xA595, 0xA596, 0xA597, 0xA598, 0xA599, /* 0xE0 */
     0xA59A, 0xA59B, 0xA59C, 0xA59D, 0xA5A1, 0xA5A2, 0xA5A3, 0xA5A4, /* 0xF0 */
-    0xA5A5, 0xA5A6, 0xA5A7, 0xA5A8, 0xA5A9, 0xA5AA, 0xA5AB, 0xA5AC  /* 0xF0 */
+    0xA5A5, 0xA5A6, 0xA5A7, 0xA5A8, 0xA5A9, 0xA5AA, 0xA5AB, 0xA5AC	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_BD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xA5AD, 0xA5AE, 0xA5AF, 0xA5B0, 0xA5B1, 0xA5B3, 0xA5B4, 0xA5B5, /* 0x00 */
     0xA5B6, 0xA5B7, 0xA5B8, 0xA5B9, 0xA5BA, 0xA5BB, 0xA5BC, 0xA5BD, /* 0x00 */
     0xA5C1, 0xA5C2, 0xA5C3, 0xA5C4, 0xA5C5, 0xA5C6, 0xA5C7, 0xA5C8, /* 0x10 */
@@ -4294,15 +4294,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_BD[] =
     0xA6ED, 0xA6EE, 0xA6EF, 0xA6F0, 0xA6F1, 0xA6F3, 0xA6F4, 0xA6F5, /* 0xE0 */
     0xA6F6, 0xA6F7, 0xA6F8, 0xA6F9, 0xA6FA, 0xA6FB, 0xA6FC, 0xA6FD, /* 0xE0 */
     0xA741, 0xA742, 0xA743, 0xA744, 0xA745, 0xA746, 0xA747, 0xA748, /* 0xF0 */
-    0xA749, 0xA74A, 0xA74B, 0xA74C, 0xA74D, 0xA74E, 0xA74F, 0xA750  /* 0xF0 */
+    0xA749, 0xA74A, 0xA74B, 0xA74C, 0xA74D, 0xA74E, 0xA74F, 0xA750	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_BE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xA751, 0xA753, 0xA754, 0xA755, 0xA756, 0xA757, 0xA758, 0xA759, /* 0x00 */
     0xA75A, 0xA75B, 0xA75C, 0xA75D, 0xA761, 0xA762, 0xA763, 0xA764, /* 0x00 */
     0xA765, 0xA766, 0xA767, 0xA768, 0xA769, 0xA76A, 0xA76B, 0xA76C, /* 0x10 */
@@ -4334,15 +4334,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_BE[] =
     0xA8F1, 0xA8F3, 0xA8F4, 0xA8F5, 0xA8F6, 0xA8F7, 0xA8F8, 0xA8F9, /* 0xE0 */
     0xA8FA, 0xA8FB, 0xA8FC, 0xA8FD, 0xA941, 0xA942, 0xA943, 0xA944, /* 0xE0 */
     0xA945, 0xA946, 0xA947, 0xA948, 0xA949, 0xA94A, 0xA94B, 0xA94C, /* 0xF0 */
-    0xA94D, 0xA94E, 0xA94F, 0xA950, 0xA951, 0xA953, 0xA954, 0xA955  /* 0xF0 */
+    0xA94D, 0xA94E, 0xA94F, 0xA950, 0xA951, 0xA953, 0xA954, 0xA955	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_BF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xA956, 0xA957, 0xA958, 0xA959, 0xA95A, 0xA95B, 0xA95C, 0xA95D, /* 0x00 */
     0xA961, 0xA962, 0xA963, 0xA964, 0xA965, 0xA966, 0xA967, 0xA968, /* 0x00 */
     0xA969, 0xA96A, 0xA96B, 0xA96C, 0xA96D, 0xA96E, 0xA96F, 0xA970, /* 0x10 */
@@ -4374,15 +4374,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_BF[] =
     0xAA96, 0xAA97, 0xAA98, 0xAA99, 0xAA9A, 0xAA9B, 0xAA9C, 0xAA9D, /* 0xE0 */
     0xAAA1, 0xAAA2, 0xAAA3, 0xAAA4, 0xAAA5, 0xAAA6, 0xAAA7, 0xAAA8, /* 0xE0 */
     0xAAA9, 0xAAAA, 0xAAAB, 0xAAAC, 0xAAAD, 0xAAAE, 0xAAAF, 0xAAB0, /* 0xF0 */
-    0xAAB1, 0xAAB3, 0xAAB4, 0xAAB5, 0xAAB6, 0xAAB7, 0xAAB8, 0xAAB9  /* 0xF0 */
+    0xAAB1, 0xAAB3, 0xAAB4, 0xAAB5, 0xAAB6, 0xAAB7, 0xAAB8, 0xAAB9	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xAABA, 0xAABB, 0xAABC, 0xAABD, 0xAAC1, 0xAAC2, 0xAAC3, 0xAAC4, /* 0x00 */
     0xAAC5, 0xAAC6, 0xAAC7, 0xAAC8, 0xAAC9, 0xAACA, 0xAACB, 0xAACC, /* 0x00 */
     0xAACD, 0xAACE, 0xAACF, 0xAAD0, 0xAAD1, 0xAAD3, 0xAAD4, 0xAAD5, /* 0x10 */
@@ -4414,15 +4414,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C0[] =
     0xAC9A, 0xAC9B, 0xAC9C, 0xAC9D, 0xACA1, 0xACA2, 0xACA3, 0xACA4, /* 0xE0 */
     0xACA5, 0xACA6, 0xACA7, 0xACA8, 0xACA9, 0xACAA, 0xACAB, 0xACAC, /* 0xE0 */
     0xACAD, 0xACAE, 0xACAF, 0xACB0, 0xACB1, 0xACB3, 0xACB4, 0xACB5, /* 0xF0 */
-    0xACB6, 0xACB7, 0xACB8, 0xACB9, 0xACBA, 0xACBB, 0xACBC, 0xACBD  /* 0xF0 */
+    0xACB6, 0xACB7, 0xACB8, 0xACB9, 0xACBA, 0xACBB, 0xACBC, 0xACBD	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xACC1, 0xACC2, 0xACC3, 0xACC4, 0xACC5, 0xACC6, 0xACC7, 0xACC8, /* 0x00 */
     0xACC9, 0xACCA, 0xACCB, 0xACCC, 0xACCD, 0xACCE, 0xACCF, 0xACD0, /* 0x00 */
     0xACD1, 0xACD3, 0xACD4, 0xACD5, 0xACD6, 0xACD7, 0xACD8, 0xACD9, /* 0x10 */
@@ -4454,15 +4454,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C1[] =
     0xAE41, 0xAE42, 0xAE43, 0xAE44, 0xAE45, 0xAE46, 0xAE47, 0xAE48, /* 0xE0 */
     0xAE49, 0xAE4A, 0xAE4B, 0xAE4C, 0xAE4D, 0xAE4E, 0xAE4F, 0xAE50, /* 0xE0 */
     0xAE51, 0xAE53, 0xAE54, 0xAE55, 0xAE56, 0xAE57, 0xAE58, 0xAE59, /* 0xF0 */
-    0xAE5A, 0xAE5B, 0xAE5C, 0xAE5D, 0xAE61, 0xAE62, 0xAE63, 0xAE64  /* 0xF0 */
+    0xAE5A, 0xAE5B, 0xAE5C, 0xAE5D, 0xAE61, 0xAE62, 0xAE63, 0xAE64	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xAE65, 0xAE66, 0xAE67, 0xAE68, 0xAE69, 0xAE6A, 0xAE6B, 0xAE6C, /* 0x00 */
     0xAE6D, 0xAE6E, 0xAE6F, 0xAE70, 0xAE71, 0xAE73, 0xAE74, 0xAE75, /* 0x00 */
     0xAE76, 0xAE77, 0xAE78, 0xAE79, 0xAE7A, 0xAE7B, 0xAE7C, 0xAE7D, /* 0x10 */
@@ -4494,15 +4494,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C2[] =
     0xAFA5, 0xAFA6, 0xAFA7, 0xAFA8, 0xAFA9, 0xAFAA, 0xAFAB, 0xAFAC, /* 0xE0 */
     0xAFAD, 0xAFAE, 0xAFAF, 0xAFB0, 0xAFB1, 0xAFB3, 0xAFB4, 0xAFB5, /* 0xE0 */
     0xAFB6, 0xAFB7, 0xAFB8, 0xAFB9, 0xAFBA, 0xAFBB, 0xAFBC, 0xAFBD, /* 0xF0 */
-    0xB061, 0xB062, 0xB063, 0xB064, 0xB065, 0xB066, 0xB067, 0xB068  /* 0xF0 */
+    0xB061, 0xB062, 0xB063, 0xB064, 0xB065, 0xB066, 0xB067, 0xB068	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB069, 0xB06A, 0xB06B, 0xB06C, 0xB06D, 0xB06E, 0xB06F, 0xB070, /* 0x00 */
     0xB071, 0xB073, 0xB074, 0xB075, 0xB076, 0xB077, 0xB078, 0xB079, /* 0x00 */
     0xB07A, 0xB07B, 0xB07C, 0xB07D, 0xB081, 0xB082, 0xB083, 0xB084, /* 0x10 */
@@ -4534,15 +4534,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C3[] =
     0xB1A9, 0xB1AA, 0xB1AB, 0xB1AC, 0xB1AD, 0xB1AE, 0xB1AF, 0xB1B0, /* 0xE0 */
     0xB1B1, 0xB1B3, 0xB1B4, 0xB1B5, 0xB1B6, 0xB1B7, 0xB1B8, 0xB1B9, /* 0xE0 */
     0xB1BA, 0xB1BB, 0xB1BC, 0xB1BD, 0xB1C1, 0xB1C2, 0xB1C3, 0xB1C4, /* 0xF0 */
-    0xB1C5, 0xB1C6, 0xB1C7, 0xB1C8, 0xB1C9, 0xB1CA, 0xB1CB, 0xB1CC  /* 0xF0 */
+    0xB1C5, 0xB1C6, 0xB1C7, 0xB1C8, 0xB1C9, 0xB1CA, 0xB1CB, 0xB1CC	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB1CD, 0xB1CE, 0xB1CF, 0xB1D0, 0xB1D1, 0xB1D3, 0xB1D4, 0xB1D5, /* 0x00 */
     0xB1D6, 0xB1D7, 0xB1D8, 0xB1D9, 0xB1DA, 0xB1DB, 0xB1DC, 0xB1DD, /* 0x00 */
     0xB1E1, 0xB1E2, 0xB1E3, 0xB1E4, 0xB1E5, 0xB1E6, 0xB1E7, 0xB1E8, /* 0x10 */
@@ -4574,15 +4574,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C4[] =
     0xB34D, 0xB34E, 0xB34F, 0xB350, 0xB351, 0xB353, 0xB354, 0xB355, /* 0xE0 */
     0xB356, 0xB357, 0xB358, 0xB359, 0xB35A, 0xB35B, 0xB35C, 0xB35D, /* 0xE0 */
     0xB361, 0xB362, 0xB363, 0xB364, 0xB365, 0xB366, 0xB367, 0xB368, /* 0xF0 */
-    0xB369, 0xB36A, 0xB36B, 0xB36C, 0xB36D, 0xB36E, 0xB36F, 0xB370  /* 0xF0 */
+    0xB369, 0xB36A, 0xB36B, 0xB36C, 0xB36D, 0xB36E, 0xB36F, 0xB370	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB371, 0xB373, 0xB374, 0xB375, 0xB376, 0xB377, 0xB378, 0xB379, /* 0x00 */
     0xB37A, 0xB37B, 0xB37C, 0xB37D, 0xB381, 0xB382, 0xB383, 0xB384, /* 0x00 */
     0xB385, 0xB386, 0xB387, 0xB388, 0xB389, 0xB38A, 0xB38B, 0xB38C, /* 0x10 */
@@ -4614,15 +4614,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C5[] =
     0xB551, 0xB553, 0xB554, 0xB555, 0xB556, 0xB557, 0xB558, 0xB559, /* 0xE0 */
     0xB55A, 0xB55B, 0xB55C, 0xB55D, 0xB561, 0xB562, 0xB563, 0xB564, /* 0xE0 */
     0xB565, 0xB566, 0xB567, 0xB568, 0xB569, 0xB56A, 0xB56B, 0xB56C, /* 0xF0 */
-    0xB56D, 0xB56E, 0xB56F, 0xB570, 0xB571, 0xB573, 0xB574, 0xB575  /* 0xF0 */
+    0xB56D, 0xB56E, 0xB56F, 0xB570, 0xB571, 0xB573, 0xB574, 0xB575	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB576, 0xB577, 0xB578, 0xB579, 0xB57A, 0xB57B, 0xB57C, 0xB57D, /* 0x00 */
     0xB581, 0xB582, 0xB583, 0xB584, 0xB585, 0xB586, 0xB587, 0xB588, /* 0x00 */
     0xB589, 0xB58A, 0xB58B, 0xB58C, 0xB58D, 0xB58E, 0xB58F, 0xB590, /* 0x10 */
@@ -4654,15 +4654,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C6[] =
     0xB6B6, 0xB6B7, 0xB6B8, 0xB6B9, 0xB6BA, 0xB6BB, 0xB6BC, 0xB6BD, /* 0xE0 */
     0xB6C1, 0xB6C2, 0xB6C3, 0xB6C4, 0xB6C5, 0xB6C6, 0xB6C7, 0xB6C8, /* 0xE0 */
     0xB6C9, 0xB6CA, 0xB6CB, 0xB6CC, 0xB6CD, 0xB6CE, 0xB6CF, 0xB6D0, /* 0xF0 */
-    0xB6D1, 0xB6D3, 0xB6D4, 0xB6D5, 0xB6D6, 0xB6D7, 0xB6D8, 0xB6D9  /* 0xF0 */
+    0xB6D1, 0xB6D3, 0xB6D4, 0xB6D5, 0xB6D6, 0xB6D7, 0xB6D8, 0xB6D9	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB6DA, 0xB6DB, 0xB6DC, 0xB6DD, 0xB6E1, 0xB6E2, 0xB6E3, 0xB6E4, /* 0x00 */
     0xB6E5, 0xB6E6, 0xB6E7, 0xB6E8, 0xB6E9, 0xB6EA, 0xB6EB, 0xB6EC, /* 0x00 */
     0xB6ED, 0xB6EE, 0xB6EF, 0xB6F0, 0xB6F1, 0xB6F3, 0xB6F4, 0xB6F5, /* 0x10 */
@@ -4694,15 +4694,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C7[] =
     0xB8BA, 0xB8BB, 0xB8BC, 0xB8BD, 0xB8C1, 0xB8C2, 0xB8C3, 0xB8C4, /* 0xE0 */
     0xB8C5, 0xB8C6, 0xB8C7, 0xB8C8, 0xB8C9, 0xB8CA, 0xB8CB, 0xB8CC, /* 0xE0 */
     0xB8CD, 0xB8CE, 0xB8CF, 0xB8D0, 0xB8D1, 0xB8D3, 0xB8D4, 0xB8D5, /* 0xF0 */
-    0xB8D6, 0xB8D7, 0xB8D8, 0xB8D9, 0xB8DA, 0xB8DB, 0xB8DC, 0xB8DD  /* 0xF0 */
+    0xB8D6, 0xB8D7, 0xB8D8, 0xB8D9, 0xB8DA, 0xB8DB, 0xB8DC, 0xB8DD	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB8E1, 0xB8E2, 0xB8E3, 0xB8E4, 0xB8E5, 0xB8E6, 0xB8E7, 0xB8E8, /* 0x00 */
     0xB8E9, 0xB8EA, 0xB8EB, 0xB8EC, 0xB8ED, 0xB8EE, 0xB8EF, 0xB8F0, /* 0x00 */
     0xB8F1, 0xB8F3, 0xB8F4, 0xB8F5, 0xB8F6, 0xB8F7, 0xB8F8, 0xB8F9, /* 0x10 */
@@ -4734,15 +4734,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C8[] =
     0xBA61, 0xBA62, 0xBA63, 0xBA64, 0xBA65, 0xBA66, 0xBA67, 0xBA68, /* 0xE0 */
     0xBA69, 0xBA6A, 0xBA6B, 0xBA6C, 0xBA6D, 0xBA6E, 0xBA6F, 0xBA70, /* 0xE0 */
     0xBA71, 0xBA73, 0xBA74, 0xBA75, 0xBA76, 0xBA77, 0xBA78, 0xBA79, /* 0xF0 */
-    0xBA7A, 0xBA7B, 0xBA7C, 0xBA7D, 0xBA81, 0xBA82, 0xBA83, 0xBA84  /* 0xF0 */
+    0xBA7A, 0xBA7B, 0xBA7C, 0xBA7D, 0xBA81, 0xBA82, 0xBA83, 0xBA84	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xBA85, 0xBA86, 0xBA87, 0xBA88, 0xBA89, 0xBA8A, 0xBA8B, 0xBA8C, /* 0x00 */
     0xBA8D, 0xBA8E, 0xBA8F, 0xBA90, 0xBA91, 0xBA93, 0xBA94, 0xBA95, /* 0x00 */
     0xBA96, 0xBA97, 0xBA98, 0xBA99, 0xBA9A, 0xBA9B, 0xBA9C, 0xBA9D, /* 0x10 */
@@ -4774,15 +4774,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_C9[] =
     0xBC65, 0xBC66, 0xBC67, 0xBC68, 0xBC69, 0xBC6A, 0xBC6B, 0xBC6C, /* 0xE0 */
     0xBC6D, 0xBC6E, 0xBC6F, 0xBC70, 0xBC71, 0xBC73, 0xBC74, 0xBC75, /* 0xE0 */
     0xBC76, 0xBC77, 0xBC78, 0xBC79, 0xBC7A, 0xBC7B, 0xBC7C, 0xBC7D, /* 0xF0 */
-    0xBC81, 0xBC82, 0xBC83, 0xBC84, 0xBC85, 0xBC86, 0xBC87, 0xBC88  /* 0xF0 */
+    0xBC81, 0xBC82, 0xBC83, 0xBC84, 0xBC85, 0xBC86, 0xBC87, 0xBC88	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_CA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xBC89, 0xBC8A, 0xBC8B, 0xBC8C, 0xBC8D, 0xBC8E, 0xBC8F, 0xBC90, /* 0x00 */
     0xBC91, 0xBC93, 0xBC94, 0xBC95, 0xBC96, 0xBC97, 0xBC98, 0xBC99, /* 0x00 */
     0xBC9A, 0xBC9B, 0xBC9C, 0xBC9D, 0xBCA1, 0xBCA2, 0xBCA3, 0xBCA4, /* 0x10 */
@@ -4814,15 +4814,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_CA[] =
     0xBDC9, 0xBDCA, 0xBDCB, 0xBDCC, 0xBDCD, 0xBDCE, 0xBDCF, 0xBDD0, /* 0xE0 */
     0xBDD1, 0xBDD3, 0xBDD4, 0xBDD5, 0xBDD6, 0xBDD7, 0xBDD8, 0xBDD9, /* 0xE0 */
     0xBDDA, 0xBDDB, 0xBDDC, 0xBDDD, 0xBDE1, 0xBDE2, 0xBDE3, 0xBDE4, /* 0xF0 */
-    0xBDE5, 0xBDE6, 0xBDE7, 0xBDE8, 0xBDE9, 0xBDEA, 0xBDEB, 0xBDEC  /* 0xF0 */
+    0xBDE5, 0xBDE6, 0xBDE7, 0xBDE8, 0xBDE9, 0xBDEA, 0xBDEB, 0xBDEC	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_CB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xBDED, 0xBDEE, 0xBDEF, 0xBDF0, 0xBDF1, 0xBDF3, 0xBDF4, 0xBDF5, /* 0x00 */
     0xBDF6, 0xBDF7, 0xBDF8, 0xBDF9, 0xBDFA, 0xBDFB, 0xBDFC, 0xBDFD, /* 0x00 */
     0xBE41, 0xBE42, 0xBE43, 0xBE44, 0xBE45, 0xBE46, 0xBE47, 0xBE48, /* 0x10 */
@@ -4854,15 +4854,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_CB[] =
     0xBF6D, 0xBF6E, 0xBF6F, 0xBF70, 0xBF71, 0xBF73, 0xBF74, 0xBF75, /* 0xE0 */
     0xBF76, 0xBF77, 0xBF78, 0xBF79, 0xBF7A, 0xBF7B, 0xBF7C, 0xBF7D, /* 0xE0 */
     0xBF81, 0xBF82, 0xBF83, 0xBF84, 0xBF85, 0xBF86, 0xBF87, 0xBF88, /* 0xF0 */
-    0xBF89, 0xBF8A, 0xBF8B, 0xBF8C, 0xBF8D, 0xBF8E, 0xBF8F, 0xBF90  /* 0xF0 */
+    0xBF89, 0xBF8A, 0xBF8B, 0xBF8C, 0xBF8D, 0xBF8E, 0xBF8F, 0xBF90	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_CC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xBF91, 0xBF93, 0xBF94, 0xBF95, 0xBF96, 0xBF97, 0xBF98, 0xBF99, /* 0x00 */
     0xBF9A, 0xBF9B, 0xBF9C, 0xBF9D, 0xBFA1, 0xBFA2, 0xBFA3, 0xBFA4, /* 0x00 */
     0xBFA5, 0xBFA6, 0xBFA7, 0xBFA8, 0xBFA9, 0xBFAA, 0xBFAB, 0xBFAC, /* 0x10 */
@@ -4894,15 +4894,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_CC[] =
     0xC171, 0xC173, 0xC174, 0xC175, 0xC176, 0xC177, 0xC178, 0xC179, /* 0xE0 */
     0xC17A, 0xC17B, 0xC17C, 0xC17D, 0xC181, 0xC182, 0xC183, 0xC184, /* 0xE0 */
     0xC185, 0xC186, 0xC187, 0xC188, 0xC189, 0xC18A, 0xC18B, 0xC18C, /* 0xF0 */
-    0xC18D, 0xC18E, 0xC18F, 0xC190, 0xC191, 0xC193, 0xC194, 0xC195  /* 0xF0 */
+    0xC18D, 0xC18E, 0xC18F, 0xC190, 0xC191, 0xC193, 0xC194, 0xC195	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_CD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC196, 0xC197, 0xC198, 0xC199, 0xC19A, 0xC19B, 0xC19C, 0xC19D, /* 0x00 */
     0xC1A1, 0xC1A2, 0xC1A3, 0xC1A4, 0xC1A5, 0xC1A6, 0xC1A7, 0xC1A8, /* 0x00 */
     0xC1A9, 0xC1AA, 0xC1AB, 0xC1AC, 0xC1AD, 0xC1AE, 0xC1AF, 0xC1B0, /* 0x10 */
@@ -4934,15 +4934,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_CD[] =
     0xC2D6, 0xC2D7, 0xC2D8, 0xC2D9, 0xC2DA, 0xC2DB, 0xC2DC, 0xC2DD, /* 0xE0 */
     0xC2E1, 0xC2E2, 0xC2E3, 0xC2E4, 0xC2E5, 0xC2E6, 0xC2E7, 0xC2E8, /* 0xE0 */
     0xC2E9, 0xC2EA, 0xC2EB, 0xC2EC, 0xC2ED, 0xC2EE, 0xC2EF, 0xC2F0, /* 0xF0 */
-    0xC2F1, 0xC2F3, 0xC2F4, 0xC2F5, 0xC2F6, 0xC2F7, 0xC2F8, 0xC2F9  /* 0xF0 */
+    0xC2F1, 0xC2F3, 0xC2F4, 0xC2F5, 0xC2F6, 0xC2F7, 0xC2F8, 0xC2F9	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_CE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC2FA, 0xC2FB, 0xC2FC, 0xC2FD, 0xC341, 0xC342, 0xC343, 0xC344, /* 0x00 */
     0xC345, 0xC346, 0xC347, 0xC348, 0xC349, 0xC34A, 0xC34B, 0xC34C, /* 0x00 */
     0xC34D, 0xC34E, 0xC34F, 0xC350, 0xC351, 0xC353, 0xC354, 0xC355, /* 0x10 */
@@ -4974,15 +4974,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_CE[] =
     0xC4DA, 0xC4DB, 0xC4DC, 0xC4DD, 0xC4E1, 0xC4E2, 0xC4E3, 0xC4E4, /* 0xE0 */
     0xC4E5, 0xC4E6, 0xC4E7, 0xC4E8, 0xC4E9, 0xC4EA, 0xC4EB, 0xC4EC, /* 0xE0 */
     0xC4ED, 0xC4EE, 0xC4EF, 0xC4F0, 0xC4F1, 0xC4F3, 0xC4F4, 0xC4F5, /* 0xF0 */
-    0xC4F6, 0xC4F7, 0xC4F8, 0xC4F9, 0xC4FA, 0xC4FB, 0xC4FC, 0xC4FD  /* 0xF0 */
+    0xC4F6, 0xC4F7, 0xC4F8, 0xC4F9, 0xC4FA, 0xC4FB, 0xC4FC, 0xC4FD	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_CF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC541, 0xC542, 0xC543, 0xC544, 0xC545, 0xC546, 0xC547, 0xC548, /* 0x00 */
     0xC549, 0xC54A, 0xC54B, 0xC54C, 0xC54D, 0xC54E, 0xC54F, 0xC550, /* 0x00 */
     0xC551, 0xC553, 0xC554, 0xC555, 0xC556, 0xC557, 0xC558, 0xC559, /* 0x10 */
@@ -5014,15 +5014,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_CF[] =
     0xC681, 0xC682, 0xC683, 0xC684, 0xC685, 0xC686, 0xC687, 0xC688, /* 0xE0 */
     0xC689, 0xC68A, 0xC68B, 0xC68C, 0xC68D, 0xC68E, 0xC68F, 0xC690, /* 0xE0 */
     0xC691, 0xC693, 0xC694, 0xC695, 0xC696, 0xC697, 0xC698, 0xC699, /* 0xF0 */
-    0xC69A, 0xC69B, 0xC69C, 0xC69D, 0xC6A1, 0xC6A2, 0xC6A3, 0xC6A4  /* 0xF0 */
+    0xC69A, 0xC69B, 0xC69C, 0xC69D, 0xC6A1, 0xC6A2, 0xC6A3, 0xC6A4	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_D0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC6A5, 0xC6A6, 0xC6A7, 0xC6A8, 0xC6A9, 0xC6AA, 0xC6AB, 0xC6AC, /* 0x00 */
     0xC6AD, 0xC6AE, 0xC6AF, 0xC6B0, 0xC6B1, 0xC6B3, 0xC6B4, 0xC6B5, /* 0x00 */
     0xC6B6, 0xC6B7, 0xC6B8, 0xC6B9, 0xC6BA, 0xC6BB, 0xC6BC, 0xC6BD, /* 0x10 */
@@ -5054,15 +5054,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_D0[] =
     0xC885, 0xC886, 0xC887, 0xC888, 0xC889, 0xC88A, 0xC88B, 0xC88C, /* 0xE0 */
     0xC88D, 0xC88E, 0xC88F, 0xC890, 0xC891, 0xC893, 0xC894, 0xC895, /* 0xE0 */
     0xC896, 0xC897, 0xC898, 0xC899, 0xC89A, 0xC89B, 0xC89C, 0xC89D, /* 0xF0 */
-    0xC8A1, 0xC8A2, 0xC8A3, 0xC8A4, 0xC8A5, 0xC8A6, 0xC8A7, 0xC8A8  /* 0xF0 */
+    0xC8A1, 0xC8A2, 0xC8A3, 0xC8A4, 0xC8A5, 0xC8A6, 0xC8A7, 0xC8A8	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_D1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC8A9, 0xC8AA, 0xC8AB, 0xC8AC, 0xC8AD, 0xC8AE, 0xC8AF, 0xC8B0, /* 0x00 */
     0xC8B1, 0xC8B3, 0xC8B4, 0xC8B5, 0xC8B6, 0xC8B7, 0xC8B8, 0xC8B9, /* 0x00 */
     0xC8BA, 0xC8BB, 0xC8BC, 0xC8BD, 0xC8C1, 0xC8C2, 0xC8C3, 0xC8C4, /* 0x10 */
@@ -5094,15 +5094,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_D1[] =
     0xC9E9, 0xC9EA, 0xC9EB, 0xC9EC, 0xC9ED, 0xC9EE, 0xC9EF, 0xC9F0, /* 0xE0 */
     0xC9F1, 0xC9F3, 0xC9F4, 0xC9F5, 0xC9F6, 0xC9F7, 0xC9F8, 0xC9F9, /* 0xE0 */
     0xC9FA, 0xC9FB, 0xC9FC, 0xC9FD, 0xCA41, 0xCA42, 0xCA43, 0xCA44, /* 0xF0 */
-    0xCA45, 0xCA46, 0xCA47, 0xCA48, 0xCA49, 0xCA4A, 0xCA4B, 0xCA4C  /* 0xF0 */
+    0xCA45, 0xCA46, 0xCA47, 0xCA48, 0xCA49, 0xCA4A, 0xCA4B, 0xCA4C	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_D2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xCA4D, 0xCA4E, 0xCA4F, 0xCA50, 0xCA51, 0xCA53, 0xCA54, 0xCA55, /* 0x00 */
     0xCA56, 0xCA57, 0xCA58, 0xCA59, 0xCA5A, 0xCA5B, 0xCA5C, 0xCA5D, /* 0x00 */
     0xCA61, 0xCA62, 0xCA63, 0xCA64, 0xCA65, 0xCA66, 0xCA67, 0xCA68, /* 0x10 */
@@ -5134,15 +5134,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_D2[] =
     0xCB8D, 0xCB8E, 0xCB8F, 0xCB90, 0xCB91, 0xCB93, 0xCB94, 0xCB95, /* 0xE0 */
     0xCB96, 0xCB97, 0xCB98, 0xCB99, 0xCB9A, 0xCB9B, 0xCB9C, 0xCB9D, /* 0xE0 */
     0xCBA1, 0xCBA2, 0xCBA3, 0xCBA4, 0xCBA5, 0xCBA6, 0xCBA7, 0xCBA8, /* 0xF0 */
-    0xCBA9, 0xCBAA, 0xCBAB, 0xCBAC, 0xCBAD, 0xCBAE, 0xCBAF, 0xCBB0  /* 0xF0 */
+    0xCBA9, 0xCBAA, 0xCBAB, 0xCBAC, 0xCBAD, 0xCBAE, 0xCBAF, 0xCBB0	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_D3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xCBB1, 0xCBB3, 0xCBB4, 0xCBB5, 0xCBB6, 0xCBB7, 0xCBB8, 0xCBB9, /* 0x00 */
     0xCBBA, 0xCBBB, 0xCBBC, 0xCBBD, 0xCC61, 0xCC62, 0xCC63, 0xCC64, /* 0x00 */
     0xCC65, 0xCC66, 0xCC67, 0xCC68, 0xCC69, 0xCC6A, 0xCC6B, 0xCC6C, /* 0x10 */
@@ -5174,15 +5174,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_D3[] =
     0xCD91, 0xCD93, 0xCD94, 0xCD95, 0xCD96, 0xCD97, 0xCD98, 0xCD99, /* 0xE0 */
     0xCD9A, 0xCD9B, 0xCD9C, 0xCD9D, 0xCDA1, 0xCDA2, 0xCDA3, 0xCDA4, /* 0xE0 */
     0xCDA5, 0xCDA6, 0xCDA7, 0xCDA8, 0xCDA9, 0xCDAA, 0xCDAB, 0xCDAC, /* 0xF0 */
-    0xCDAD, 0xCDAE, 0xCDAF, 0xCDB0, 0xCDB1, 0xCDB3, 0xCDB4, 0xCDB5  /* 0xF0 */
+    0xCDAD, 0xCDAE, 0xCDAF, 0xCDB0, 0xCDB1, 0xCDB3, 0xCDB4, 0xCDB5	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_D4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xCDB6, 0xCDB7, 0xCDB8, 0xCDB9, 0xCDBA, 0xCDBB, 0xCDBC, 0xCDBD, /* 0x00 */
     0xCDC1, 0xCDC2, 0xCDC3, 0xCDC4, 0xCDC5, 0xCDC6, 0xCDC7, 0xCDC8, /* 0x00 */
     0xCDC9, 0xCDCA, 0xCDCB, 0xCDCC, 0xCDCD, 0xCDCE, 0xCDCF, 0xCDD0, /* 0x10 */
@@ -5214,15 +5214,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_D4[] =
     0xCEF6, 0xCEF7, 0xCEF8, 0xCEF9, 0xCEFA, 0xCEFB, 0xCEFC, 0xCEFD, /* 0xE0 */
     0xCF41, 0xCF42, 0xCF43, 0xCF44, 0xCF45, 0xCF46, 0xCF47, 0xCF48, /* 0xE0 */
     0xCF49, 0xCF4A, 0xCF4B, 0xCF4C, 0xCF4D, 0xCF4E, 0xCF4F, 0xCF50, /* 0xF0 */
-    0xCF51, 0xCF53, 0xCF54, 0xCF55, 0xCF56, 0xCF57, 0xCF58, 0xCF59  /* 0xF0 */
+    0xCF51, 0xCF53, 0xCF54, 0xCF55, 0xCF56, 0xCF57, 0xCF58, 0xCF59	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_D5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xCF5A, 0xCF5B, 0xCF5C, 0xCF5D, 0xCF61, 0xCF62, 0xCF63, 0xCF64, /* 0x00 */
     0xCF65, 0xCF66, 0xCF67, 0xCF68, 0xCF69, 0xCF6A, 0xCF6B, 0xCF6C, /* 0x00 */
     0xCF6D, 0xCF6E, 0xCF6F, 0xCF70, 0xCF71, 0xCF73, 0xCF74, 0xCF75, /* 0x10 */
@@ -5254,15 +5254,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_D5[] =
     0xD0FA, 0xD0FB, 0xD0FC, 0xD0FD, 0xD141, 0xD142, 0xD143, 0xD144, /* 0xE0 */
     0xD145, 0xD146, 0xD147, 0xD148, 0xD149, 0xD14A, 0xD14B, 0xD14C, /* 0xE0 */
     0xD14D, 0xD14E, 0xD14F, 0xD150, 0xD151, 0xD153, 0xD154, 0xD155, /* 0xF0 */
-    0xD156, 0xD157, 0xD158, 0xD159, 0xD15A, 0xD15B, 0xD15C, 0xD15D  /* 0xF0 */
+    0xD156, 0xD157, 0xD158, 0xD159, 0xD15A, 0xD15B, 0xD15C, 0xD15D	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_D6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xD161, 0xD162, 0xD163, 0xD164, 0xD165, 0xD166, 0xD167, 0xD168, /* 0x00 */
     0xD169, 0xD16A, 0xD16B, 0xD16C, 0xD16D, 0xD16E, 0xD16F, 0xD170, /* 0x00 */
     0xD171, 0xD173, 0xD174, 0xD175, 0xD176, 0xD177, 0xD178, 0xD179, /* 0x10 */
@@ -5294,15 +5294,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_D6[] =
     0xD2A1, 0xD2A2, 0xD2A3, 0xD2A4, 0xD2A5, 0xD2A6, 0xD2A7, 0xD2A8, /* 0xE0 */
     0xD2A9, 0xD2AA, 0xD2AB, 0xD2AC, 0xD2AD, 0xD2AE, 0xD2AF, 0xD2B0, /* 0xE0 */
     0xD2B1, 0xD2B3, 0xD2B4, 0xD2B5, 0xD2B6, 0xD2B7, 0xD2B8, 0xD2B9, /* 0xF0 */
-    0xD2BA, 0xD2BB, 0xD2BC, 0xD2BD, 0xD2C1, 0xD2C2, 0xD2C3, 0xD2C4  /* 0xF0 */
+    0xD2BA, 0xD2BB, 0xD2BC, 0xD2BD, 0xD2C1, 0xD2C2, 0xD2C3, 0xD2C4	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_D7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xD2C5, 0xD2C6, 0xD2C7, 0xD2C8, 0xD2C9, 0xD2CA, 0xD2CB, 0xD2CC, /* 0x00 */
     0xD2CD, 0xD2CE, 0xD2CF, 0xD2D0, 0xD2D1, 0xD2D3, 0xD2D4, 0xD2D5, /* 0x00 */
     0xD2D6, 0xD2D7, 0xD2D8, 0xD2D9, 0xD2DA, 0xD2DB, 0xD2DC, 0xD2DD, /* 0x10 */
@@ -5323,15 +5323,15 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_D7[] =
     0xD3A1, 0xD3A2, 0xD3A3, 0xD3A4, 0xD3A5, 0xD3A6, 0xD3A7, 0xD3A8, /* 0x80 */
     0xD3A9, 0xD3AA, 0xD3AB, 0xD3AC, 0xD3AD, 0xD3AE, 0xD3AF, 0xD3B0, /* 0x90 */
     0xD3B1, 0xD3B3, 0xD3B4, 0xD3B5, 0xD3B6, 0xD3B7, 0xD3B8, 0xD3B9, /* 0x90 */
-    0xD3BA, 0xD3BB, 0xD3BC, 0xD3BD                                  /* 0xA0 */
+    0xD3BA, 0xD3BB, 0xD3BC, 0xD3BD									/* 0xA0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_F9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xE0D0, 0xE0D6, 0xE0E7, 0xE1CF, 0xE1E8, 0xE23D, 0xE2FB, 0xE332, /* 0x00 */
     0xE348, 0xE360, 0xE36D, 0xE3D4, 0xE3D5, 0xE3D8, 0xE3DB, 0xE3DC, /* 0x00 */
     0xE3DD, 0xE3DE, 0xE3DF, 0xE3E0, 0xE3E2, 0xE3E3, 0xE3E4, 0xE3E5, /* 0x10 */
@@ -5363,25 +5363,25 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_F9[] =
     0xF13F, 0xF140, 0xF141, 0xF142, 0xF145, 0xF148, 0xF14A, 0xF150, /* 0xE0 */
     0xF151, 0xF155, 0xF156, 0xF159, 0xF15A, 0xF165, 0xF16D, 0xF16E, /* 0xE0 */
     0xF171, 0xF174, 0xF177, 0xF178, 0xF199, 0xF19A, 0xF19C, 0xF1A1, /* 0xF0 */
-    0xF1A2, 0xF1A3, 0xF1EE, 0xF26B, 0xF44D, 0xF49C, 0xF4B1, 0xF537  /* 0xF0 */
+    0xF1A2, 0xF1A3, 0xF1EE, 0xF26B, 0xF44D, 0xF49C, 0xF4B1, 0xF537	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_FA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xF57E, 0xF696, 0xF698, 0xF6B8, 0xF6C8, 0xF6D3, 0xF76B, 0xF792, /* 0x00 */
-    0xF831, 0xF832, 0xF876, 0xF939                                  /* 0x00 */
+    0xF831, 0xF832, 0xF876, 0xF939									/* 0x00 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_JOHAB_FF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xDA31, 0xDA32, 0xDA33, 0xDA34, 0xDA35, 0xDA36, 0xDA37, /* 0x00 */
     0xDA38, 0xDA39, 0xDA3A, 0xDA3B, 0xDA3C, 0xDA3D, 0xDA3E, 0xDA3F, /* 0x00 */
     0xDA40, 0xDA41, 0xDA42, 0xDA43, 0xDA44, 0xDA45, 0xDA46, 0xDA47, /* 0x10 */
@@ -5393,23 +5393,23 @@ static sal_uInt16 const aImplUniToDBCSTab_JOHAB_FF[] =
     0xDA70, 0xDA71, 0xDA72, 0xDA73, 0xDA74, 0xDA75, 0xDA76, 0xDA77, /* 0x40 */
     0xDA78, 0xDA79, 0xDA7A, 0xDA7B, 0xDA7C, 0xDA7D, 0xDA7E, 0xDA91, /* 0x40 */
     0xDA92, 0xDA93, 0xDA94, 0xDA95, 0xDA96, 0xDA97, 0xDA98, 0xDA99, /* 0x50 */
-    0xDA9A, 0xDA9B, 0xDA9C, 0xDA9D, 0xDA9E, 0xDA9F, 0xD9A6,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xD95B, 0xD95C, 0xD9A0, 0xDAA0,      0, 0xD95D, 0xDA6C          /* 0xE0 */
+    0xDA9A, 0xDA9B, 0xDA9C, 0xDA9D, 0xDA9E, 0xDA9F, 0xD9A6, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xD95B, 0xD95C, 0xD9A0, 0xDAA0, 	 0, 0xD95D, 0xDA6C			/* 0xE0 */
 };
 
diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab
index 3b96647086cc..ef9e4cd9e015 100644
--- a/sal/textenc/tcvtkr6.tab
+++ b/sal/textenc/tcvtkr6.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/tcvtlat1.tab b/sal/textenc/tcvtlat1.tab
index 60c3218b64b3..9c0a0e3a8327 100644
--- a/sal/textenc/tcvtlat1.tab
+++ b/sal/textenc/tcvtlat1.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/tcvtmb.c b/sal/textenc/tcvtmb.c
index 568fdd0762b7..345e0662646a 100644
--- a/sal/textenc/tcvtmb.c
+++ b/sal/textenc/tcvtmb.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/tcvtscn1.tab b/sal/textenc/tcvtscn1.tab
index c6ee51d726d7..07ec8230d64c 100644
--- a/sal/textenc/tcvtscn1.tab
+++ b/sal/textenc/tcvtscn1.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,8 +38,8 @@
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_81[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x4E02, 0x4E04, 0x4E05, 0x4E06, 0x4E0F, 0x4E12, 0x4E17, 0x4E1F, /* 0x40 */
     0x4E20, 0x4E21, 0x4E23, 0x4E26, 0x4E29, 0x4E2E, 0x4E2F, 0x4E31, /* 0x40 */
     0x4E33, 0x4E35, 0x4E37, 0x4E3C, 0x4E40, 0x4E41, 0x4E42, 0x4E44, /* 0x50 */
@@ -47,7 +47,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_81[] =
     0x4E63, 0x4E64, 0x4E65, 0x4E67, 0x4E68, 0x4E6A, 0x4E6B, 0x4E6C, /* 0x60 */
     0x4E6D, 0x4E6E, 0x4E6F, 0x4E72, 0x4E74, 0x4E75, 0x4E76, 0x4E77, /* 0x60 */
     0x4E78, 0x4E79, 0x4E7A, 0x4E7B, 0x4E7C, 0x4E7D, 0x4E7F, 0x4E80, /* 0x70 */
-    0x4E81, 0x4E82, 0x4E83, 0x4E84, 0x4E85, 0x4E87, 0x4E8A,      0, /* 0x70 */
+    0x4E81, 0x4E82, 0x4E83, 0x4E84, 0x4E85, 0x4E87, 0x4E8A, 	 0, /* 0x70 */
     0x4E90, 0x4E96, 0x4E97, 0x4E99, 0x4E9C, 0x4E9D, 0x4E9E, 0x4EA3, /* 0x80 */
     0x4EAA, 0x4EAF, 0x4EB0, 0x4EB1, 0x4EB4, 0x4EB6, 0x4EB7, 0x4EB8, /* 0x80 */
     0x4EB9, 0x4EBC, 0x4EBD, 0x4EBE, 0x4EC8, 0x4ECC, 0x4ECF, 0x4ED0, /* 0x90 */
@@ -63,15 +63,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_81[] =
     0x4F6E, 0x4F71, 0x4F72, 0x4F75, 0x4F77, 0x4F78, 0x4F79, 0x4F7A, /* 0xE0 */
     0x4F7D, 0x4F80, 0x4F81, 0x4F82, 0x4F85, 0x4F86, 0x4F87, 0x4F8A, /* 0xE0 */
     0x4F8C, 0x4F8E, 0x4F90, 0x4F92, 0x4F93, 0x4F95, 0x4F96, 0x4F98, /* 0xF0 */
-    0x4F99, 0x4F9A, 0x4F9C, 0x4F9E, 0x4F9F, 0x4FA1, 0x4FA2          /* 0xF0 */
+    0x4F99, 0x4F9A, 0x4F9C, 0x4F9E, 0x4F9F, 0x4FA1, 0x4FA2			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_82[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x4FA4, 0x4FAB, 0x4FAD, 0x4FB0, 0x4FB1, 0x4FB2, 0x4FB3, 0x4FB4, /* 0x40 */
     0x4FB6, 0x4FB7, 0x4FB8, 0x4FB9, 0x4FBA, 0x4FBB, 0x4FBC, 0x4FBD, /* 0x40 */
     0x4FBE, 0x4FC0, 0x4FC1, 0x4FC2, 0x4FC6, 0x4FC7, 0x4FC8, 0x4FC9, /* 0x50 */
@@ -79,7 +79,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_82[] =
     0x4FD9, 0x4FDB, 0x4FE0, 0x4FE2, 0x4FE4, 0x4FE5, 0x4FE7, 0x4FEB, /* 0x60 */
     0x4FEC, 0x4FF0, 0x4FF2, 0x4FF4, 0x4FF5, 0x4FF6, 0x4FF7, 0x4FF9, /* 0x60 */
     0x4FFB, 0x4FFC, 0x4FFD, 0x4FFF, 0x5000, 0x5001, 0x5002, 0x5003, /* 0x70 */
-    0x5004, 0x5005, 0x5006, 0x5007, 0x5008, 0x5009, 0x500A,      0, /* 0x70 */
+    0x5004, 0x5005, 0x5006, 0x5007, 0x5008, 0x5009, 0x500A, 	 0, /* 0x70 */
     0x500B, 0x500E, 0x5010, 0x5011, 0x5013, 0x5015, 0x5016, 0x5017, /* 0x80 */
     0x501B, 0x501D, 0x501E, 0x5020, 0x5022, 0x5023, 0x5024, 0x5027, /* 0x80 */
     0x502B, 0x502F, 0x5030, 0x5031, 0x5032, 0x5033, 0x5034, 0x5035, /* 0x90 */
@@ -95,15 +95,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_82[] =
     0x5095, 0x5096, 0x5097, 0x5098, 0x5099, 0x509A, 0x509B, 0x509C, /* 0xE0 */
     0x509D, 0x509E, 0x509F, 0x50A0, 0x50A1, 0x50A2, 0x50A4, 0x50A6, /* 0xE0 */
     0x50AA, 0x50AB, 0x50AD, 0x50AE, 0x50AF, 0x50B0, 0x50B1, 0x50B3, /* 0xF0 */
-    0x50B4, 0x50B5, 0x50B6, 0x50B7, 0x50B8, 0x50B9, 0x50BC          /* 0xF0 */
+    0x50B4, 0x50B5, 0x50B6, 0x50B7, 0x50B8, 0x50B9, 0x50BC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_83[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x50BD, 0x50BE, 0x50BF, 0x50C0, 0x50C1, 0x50C2, 0x50C3, 0x50C4, /* 0x40 */
     0x50C5, 0x50C6, 0x50C7, 0x50C8, 0x50C9, 0x50CA, 0x50CB, 0x50CC, /* 0x40 */
     0x50CD, 0x50CE, 0x50D0, 0x50D1, 0x50D2, 0x50D3, 0x50D4, 0x50D5, /* 0x50 */
@@ -111,7 +111,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_83[] =
     0x50E0, 0x50E1, 0x50E2, 0x50E3, 0x50E4, 0x50E5, 0x50E8, 0x50E9, /* 0x60 */
     0x50EA, 0x50EB, 0x50EF, 0x50F0, 0x50F1, 0x50F2, 0x50F4, 0x50F6, /* 0x60 */
     0x50F7, 0x50F8, 0x50F9, 0x50FA, 0x50FC, 0x50FD, 0x50FE, 0x50FF, /* 0x70 */
-    0x5100, 0x5101, 0x5102, 0x5103, 0x5104, 0x5105, 0x5108,      0, /* 0x70 */
+    0x5100, 0x5101, 0x5102, 0x5103, 0x5104, 0x5105, 0x5108, 	 0, /* 0x70 */
     0x5109, 0x510A, 0x510C, 0x510D, 0x510E, 0x510F, 0x5110, 0x5111, /* 0x80 */
     0x5113, 0x5114, 0x5115, 0x5116, 0x5117, 0x5118, 0x5119, 0x511A, /* 0x80 */
     0x511B, 0x511C, 0x511D, 0x511E, 0x511F, 0x5120, 0x5122, 0x5123, /* 0x90 */
@@ -127,15 +127,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_83[] =
     0x519F, 0x51A1, 0x51A3, 0x51A6, 0x51A7, 0x51A8, 0x51A9, 0x51AA, /* 0xE0 */
     0x51AD, 0x51AE, 0x51B4, 0x51B8, 0x51B9, 0x51BA, 0x51BE, 0x51BF, /* 0xE0 */
     0x51C1, 0x51C2, 0x51C3, 0x51C5, 0x51C8, 0x51CA, 0x51CD, 0x51CE, /* 0xF0 */
-    0x51D0, 0x51D2, 0x51D3, 0x51D4, 0x51D5, 0x51D6, 0x51D7          /* 0xF0 */
+    0x51D0, 0x51D2, 0x51D3, 0x51D4, 0x51D5, 0x51D6, 0x51D7			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_84[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x51D8, 0x51D9, 0x51DA, 0x51DC, 0x51DE, 0x51DF, 0x51E2, 0x51E3, /* 0x40 */
     0x51E5, 0x51E6, 0x51E7, 0x51E8, 0x51E9, 0x51EA, 0x51EC, 0x51EE, /* 0x40 */
     0x51F1, 0x51F2, 0x51F4, 0x51F7, 0x51FE, 0x5204, 0x5205, 0x5209, /* 0x50 */
@@ -143,7 +143,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_84[] =
     0x521E, 0x521F, 0x5221, 0x5222, 0x5223, 0x5225, 0x5226, 0x5227, /* 0x60 */
     0x522A, 0x522C, 0x522F, 0x5231, 0x5232, 0x5234, 0x5235, 0x523C, /* 0x60 */
     0x523E, 0x5244, 0x5245, 0x5246, 0x5247, 0x5248, 0x5249, 0x524B, /* 0x70 */
-    0x524E, 0x524F, 0x5252, 0x5253, 0x5255, 0x5257, 0x5258,      0, /* 0x70 */
+    0x524E, 0x524F, 0x5252, 0x5253, 0x5255, 0x5257, 0x5258, 	 0, /* 0x70 */
     0x5259, 0x525A, 0x525B, 0x525D, 0x525F, 0x5260, 0x5262, 0x5263, /* 0x80 */
     0x5264, 0x5266, 0x5268, 0x526B, 0x526C, 0x526D, 0x526E, 0x5270, /* 0x80 */
     0x5271, 0x5273, 0x5274, 0x5275, 0x5276, 0x5277, 0x5278, 0x5279, /* 0x90 */
@@ -159,15 +159,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_84[] =
     0x52E6, 0x52E7, 0x52E8, 0x52E9, 0x52EA, 0x52EB, 0x52EC, 0x52ED, /* 0xE0 */
     0x52EE, 0x52EF, 0x52F1, 0x52F2, 0x52F3, 0x52F4, 0x52F5, 0x52F6, /* 0xE0 */
     0x52F7, 0x52F8, 0x52FB, 0x52FC, 0x52FD, 0x5301, 0x5302, 0x5303, /* 0xF0 */
-    0x5304, 0x5307, 0x5309, 0x530A, 0x530B, 0x530C, 0x530E          /* 0xF0 */
+    0x5304, 0x5307, 0x5309, 0x530A, 0x530B, 0x530C, 0x530E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_85[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5311, 0x5312, 0x5313, 0x5314, 0x5318, 0x531B, 0x531C, 0x531E, /* 0x40 */
     0x531F, 0x5322, 0x5324, 0x5325, 0x5327, 0x5328, 0x5329, 0x532B, /* 0x40 */
     0x532C, 0x532D, 0x532F, 0x5330, 0x5331, 0x5332, 0x5333, 0x5334, /* 0x50 */
@@ -175,7 +175,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_85[] =
     0x5344, 0x5346, 0x534B, 0x534C, 0x534D, 0x5350, 0x5354, 0x5358, /* 0x60 */
     0x5359, 0x535B, 0x535D, 0x5365, 0x5368, 0x536A, 0x536C, 0x536D, /* 0x60 */
     0x5372, 0x5376, 0x5379, 0x537B, 0x537C, 0x537D, 0x537E, 0x5380, /* 0x70 */
-    0x5381, 0x5383, 0x5387, 0x5388, 0x538A, 0x538E, 0x538F,      0, /* 0x70 */
+    0x5381, 0x5383, 0x5387, 0x5388, 0x538A, 0x538E, 0x538F, 	 0, /* 0x70 */
     0x5390, 0x5391, 0x5392, 0x5393, 0x5394, 0x5396, 0x5397, 0x5399, /* 0x80 */
     0x539B, 0x539C, 0x539E, 0x53A0, 0x53A1, 0x53A4, 0x53A7, 0x53AA, /* 0x80 */
     0x53AB, 0x53AC, 0x53AD, 0x53AF, 0x53B0, 0x53B1, 0x53B2, 0x53B3, /* 0x90 */
@@ -191,15 +191,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_85[] =
     0x5467, 0x5469, 0x546A, 0x546B, 0x546C, 0x546D, 0x546E, 0x546F, /* 0xE0 */
     0x5470, 0x5474, 0x5479, 0x547A, 0x547E, 0x547F, 0x5481, 0x5483, /* 0xE0 */
     0x5485, 0x5487, 0x5488, 0x5489, 0x548A, 0x548D, 0x5491, 0x5493, /* 0xF0 */
-    0x5497, 0x5498, 0x549C, 0x549E, 0x549F, 0x54A0, 0x54A1          /* 0xF0 */
+    0x5497, 0x5498, 0x549C, 0x549E, 0x549F, 0x54A0, 0x54A1			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_86[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x54A2, 0x54A5, 0x54AE, 0x54B0, 0x54B2, 0x54B5, 0x54B6, 0x54B7, /* 0x40 */
     0x54B9, 0x54BA, 0x54BC, 0x54BE, 0x54C3, 0x54C5, 0x54CA, 0x54CB, /* 0x40 */
     0x54D6, 0x54D8, 0x54DB, 0x54E0, 0x54E1, 0x54E2, 0x54E3, 0x54E4, /* 0x50 */
@@ -207,7 +207,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_86[] =
     0x54F7, 0x54F8, 0x54F9, 0x54FB, 0x54FE, 0x5500, 0x5502, 0x5503, /* 0x60 */
     0x5504, 0x5505, 0x5508, 0x550A, 0x550B, 0x550C, 0x550D, 0x550E, /* 0x60 */
     0x5512, 0x5513, 0x5515, 0x5516, 0x5517, 0x5518, 0x5519, 0x551A, /* 0x70 */
-    0x551C, 0x551D, 0x551E, 0x551F, 0x5521, 0x5525, 0x5526,      0, /* 0x70 */
+    0x551C, 0x551D, 0x551E, 0x551F, 0x5521, 0x5525, 0x5526, 	 0, /* 0x70 */
     0x5528, 0x5529, 0x552B, 0x552D, 0x5532, 0x5534, 0x5535, 0x5536, /* 0x80 */
     0x5538, 0x5539, 0x553A, 0x553B, 0x553D, 0x5540, 0x5542, 0x5545, /* 0x80 */
     0x5547, 0x5548, 0x554B, 0x554C, 0x554D, 0x554E, 0x554F, 0x5551, /* 0x90 */
@@ -223,15 +223,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_86[] =
     0x55CB, 0x55CE, 0x55CF, 0x55D0, 0x55D5, 0x55D7, 0x55D8, 0x55D9, /* 0xE0 */
     0x55DA, 0x55DB, 0x55DE, 0x55E0, 0x55E2, 0x55E7, 0x55E9, 0x55ED, /* 0xE0 */
     0x55EE, 0x55F0, 0x55F1, 0x55F4, 0x55F6, 0x55F8, 0x55F9, 0x55FA, /* 0xF0 */
-    0x55FB, 0x55FC, 0x55FF, 0x5602, 0x5603, 0x5604, 0x5605          /* 0xF0 */
+    0x55FB, 0x55FC, 0x55FF, 0x5602, 0x5603, 0x5604, 0x5605			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_87[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5606, 0x5607, 0x560A, 0x560B, 0x560D, 0x5610, 0x5611, 0x5612, /* 0x40 */
     0x5613, 0x5614, 0x5615, 0x5616, 0x5617, 0x5619, 0x561A, 0x561C, /* 0x40 */
     0x561D, 0x5620, 0x5621, 0x5622, 0x5625, 0x5626, 0x5628, 0x5629, /* 0x50 */
@@ -239,7 +239,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_87[] =
     0x5638, 0x563A, 0x563C, 0x563D, 0x563E, 0x5640, 0x5641, 0x5642, /* 0x60 */
     0x5643, 0x5644, 0x5645, 0x5646, 0x5647, 0x5648, 0x5649, 0x564A, /* 0x60 */
     0x564B, 0x564F, 0x5650, 0x5651, 0x5652, 0x5653, 0x5655, 0x5656, /* 0x70 */
-    0x565A, 0x565B, 0x565D, 0x565E, 0x565F, 0x5660, 0x5661,      0, /* 0x70 */
+    0x565A, 0x565B, 0x565D, 0x565E, 0x565F, 0x5660, 0x5661, 	 0, /* 0x70 */
     0x5663, 0x5665, 0x5666, 0x5667, 0x566D, 0x566E, 0x566F, 0x5670, /* 0x80 */
     0x5672, 0x5673, 0x5674, 0x5675, 0x5677, 0x5678, 0x5679, 0x567A, /* 0x80 */
     0x567D, 0x567E, 0x567F, 0x5680, 0x5681, 0x5682, 0x5683, 0x5684, /* 0x90 */
@@ -255,15 +255,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_87[] =
     0x56D9, 0x56DC, 0x56E3, 0x56E5, 0x56E6, 0x56E7, 0x56E8, 0x56E9, /* 0xE0 */
     0x56EA, 0x56EC, 0x56EE, 0x56EF, 0x56F2, 0x56F3, 0x56F6, 0x56F7, /* 0xE0 */
     0x56F8, 0x56FB, 0x56FC, 0x5700, 0x5701, 0x5702, 0x5705, 0x5707, /* 0xF0 */
-    0x570B, 0x570C, 0x570D, 0x570E, 0x570F, 0x5710, 0x5711          /* 0xF0 */
+    0x570B, 0x570C, 0x570D, 0x570E, 0x570F, 0x5710, 0x5711			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_88[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5712, 0x5713, 0x5714, 0x5715, 0x5716, 0x5717, 0x5718, 0x5719, /* 0x40 */
     0x571A, 0x571B, 0x571D, 0x571E, 0x5720, 0x5721, 0x5722, 0x5724, /* 0x40 */
     0x5725, 0x5726, 0x5727, 0x572B, 0x5731, 0x5732, 0x5734, 0x5735, /* 0x50 */
@@ -271,7 +271,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_88[] =
     0x5744, 0x5745, 0x5746, 0x5748, 0x5749, 0x574B, 0x5752, 0x5753, /* 0x60 */
     0x5754, 0x5755, 0x5756, 0x5758, 0x5759, 0x5762, 0x5763, 0x5765, /* 0x60 */
     0x5767, 0x576C, 0x576E, 0x5770, 0x5771, 0x5772, 0x5774, 0x5775, /* 0x70 */
-    0x5778, 0x5779, 0x577A, 0x577D, 0x577E, 0x577F, 0x5780,      0, /* 0x70 */
+    0x5778, 0x5779, 0x577A, 0x577D, 0x577E, 0x577F, 0x5780, 	 0, /* 0x70 */
     0x5781, 0x5787, 0x5788, 0x5789, 0x578A, 0x578D, 0x578E, 0x578F, /* 0x80 */
     0x5790, 0x5791, 0x5794, 0x5795, 0x5796, 0x5797, 0x5798, 0x5799, /* 0x80 */
     0x579A, 0x579C, 0x579D, 0x579E, 0x579F, 0x57A5, 0x57A8, 0x57AA, /* 0x90 */
@@ -287,15 +287,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_88[] =
     0x5817, 0x5818, 0x581A, 0x581B, 0x581C, 0x581D, 0x581F, 0x5822, /* 0xE0 */
     0x5823, 0x5825, 0x5826, 0x5827, 0x5828, 0x5829, 0x582B, 0x582C, /* 0xE0 */
     0x582D, 0x582E, 0x582F, 0x5831, 0x5832, 0x5833, 0x5834, 0x5836, /* 0xF0 */
-    0x5837, 0x5838, 0x5839, 0x583A, 0x583B, 0x583C, 0x583D          /* 0xF0 */
+    0x5837, 0x5838, 0x5839, 0x583A, 0x583B, 0x583C, 0x583D			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_89[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x583E, 0x583F, 0x5840, 0x5841, 0x5842, 0x5843, 0x5845, 0x5846, /* 0x40 */
     0x5847, 0x5848, 0x5849, 0x584A, 0x584B, 0x584E, 0x584F, 0x5850, /* 0x40 */
     0x5852, 0x5853, 0x5855, 0x5856, 0x5857, 0x5859, 0x585A, 0x585B, /* 0x50 */
@@ -303,7 +303,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_89[] =
     0x5866, 0x5867, 0x5868, 0x5869, 0x586A, 0x586D, 0x586E, 0x586F, /* 0x60 */
     0x5870, 0x5871, 0x5872, 0x5873, 0x5874, 0x5875, 0x5876, 0x5877, /* 0x60 */
     0x5878, 0x5879, 0x587A, 0x587B, 0x587C, 0x587D, 0x587F, 0x5882, /* 0x70 */
-    0x5884, 0x5886, 0x5887, 0x5888, 0x588A, 0x588B, 0x588C,      0, /* 0x70 */
+    0x5884, 0x5886, 0x5887, 0x5888, 0x588A, 0x588B, 0x588C, 	 0, /* 0x70 */
     0x588D, 0x588E, 0x588F, 0x5890, 0x5891, 0x5894, 0x5895, 0x5896, /* 0x80 */
     0x5897, 0x5898, 0x589B, 0x589C, 0x589D, 0x58A0, 0x58A1, 0x58A2, /* 0x80 */
     0x58A3, 0x58A4, 0x58A5, 0x58A6, 0x58A7, 0x58AA, 0x58AB, 0x58AC, /* 0x90 */
@@ -319,15 +319,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_89[] =
     0x5903, 0x5905, 0x5906, 0x5908, 0x5909, 0x590A, 0x590B, 0x590C, /* 0xE0 */
     0x590E, 0x5910, 0x5911, 0x5912, 0x5913, 0x5917, 0x5918, 0x591B, /* 0xE0 */
     0x591D, 0x591E, 0x5920, 0x5921, 0x5922, 0x5923, 0x5926, 0x5928, /* 0xF0 */
-    0x592C, 0x5930, 0x5932, 0x5933, 0x5935, 0x5936, 0x593B          /* 0xF0 */
+    0x592C, 0x5930, 0x5932, 0x5933, 0x5935, 0x5936, 0x593B			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_8A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x593D, 0x593E, 0x593F, 0x5940, 0x5943, 0x5945, 0x5946, 0x594A, /* 0x40 */
     0x594C, 0x594D, 0x5950, 0x5952, 0x5953, 0x5959, 0x595B, 0x595C, /* 0x40 */
     0x595D, 0x595E, 0x595F, 0x5961, 0x5963, 0x5964, 0x5966, 0x5967, /* 0x50 */
@@ -335,7 +335,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_8A[] =
     0x5970, 0x5971, 0x5972, 0x5975, 0x5977, 0x597A, 0x597B, 0x597C, /* 0x60 */
     0x597E, 0x597F, 0x5980, 0x5985, 0x5989, 0x598B, 0x598C, 0x598E, /* 0x60 */
     0x598F, 0x5990, 0x5991, 0x5994, 0x5995, 0x5998, 0x599A, 0x599B, /* 0x70 */
-    0x599C, 0x599D, 0x599F, 0x59A0, 0x59A1, 0x59A2, 0x59A6,      0, /* 0x70 */
+    0x599C, 0x599D, 0x599F, 0x59A0, 0x59A1, 0x59A2, 0x59A6, 	 0, /* 0x70 */
     0x59A7, 0x59AC, 0x59AD, 0x59B0, 0x59B1, 0x59B3, 0x59B4, 0x59B5, /* 0x80 */
     0x59B6, 0x59B7, 0x59B8, 0x59BA, 0x59BC, 0x59BD, 0x59BF, 0x59C0, /* 0x80 */
     0x59C1, 0x59C2, 0x59C3, 0x59C4, 0x59C5, 0x59C7, 0x59C8, 0x59C9, /* 0x90 */
@@ -351,15 +351,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_8A[] =
     0x5A3B, 0x5A3D, 0x5A3E, 0x5A3F, 0x5A41, 0x5A42, 0x5A43, 0x5A44, /* 0xE0 */
     0x5A45, 0x5A47, 0x5A48, 0x5A4B, 0x5A4C, 0x5A4D, 0x5A4E, 0x5A4F, /* 0xE0 */
     0x5A50, 0x5A51, 0x5A52, 0x5A53, 0x5A54, 0x5A56, 0x5A57, 0x5A58, /* 0xF0 */
-    0x5A59, 0x5A5B, 0x5A5C, 0x5A5D, 0x5A5E, 0x5A5F, 0x5A60          /* 0xF0 */
+    0x5A59, 0x5A5B, 0x5A5C, 0x5A5D, 0x5A5E, 0x5A5F, 0x5A60			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_8B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5A61, 0x5A63, 0x5A64, 0x5A65, 0x5A66, 0x5A68, 0x5A69, 0x5A6B, /* 0x40 */
     0x5A6C, 0x5A6D, 0x5A6E, 0x5A6F, 0x5A70, 0x5A71, 0x5A72, 0x5A73, /* 0x40 */
     0x5A78, 0x5A79, 0x5A7B, 0x5A7C, 0x5A7D, 0x5A7E, 0x5A80, 0x5A81, /* 0x50 */
@@ -367,7 +367,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_8B[] =
     0x5A8A, 0x5A8B, 0x5A8C, 0x5A8D, 0x5A8E, 0x5A8F, 0x5A90, 0x5A91, /* 0x60 */
     0x5A93, 0x5A94, 0x5A95, 0x5A96, 0x5A97, 0x5A98, 0x5A99, 0x5A9C, /* 0x60 */
     0x5A9D, 0x5A9E, 0x5A9F, 0x5AA0, 0x5AA1, 0x5AA2, 0x5AA3, 0x5AA4, /* 0x70 */
-    0x5AA5, 0x5AA6, 0x5AA7, 0x5AA8, 0x5AA9, 0x5AAB, 0x5AAC,      0, /* 0x70 */
+    0x5AA5, 0x5AA6, 0x5AA7, 0x5AA8, 0x5AA9, 0x5AAB, 0x5AAC, 	 0, /* 0x70 */
     0x5AAD, 0x5AAE, 0x5AAF, 0x5AB0, 0x5AB1, 0x5AB4, 0x5AB6, 0x5AB7, /* 0x80 */
     0x5AB9, 0x5ABA, 0x5ABB, 0x5ABC, 0x5ABD, 0x5ABF, 0x5AC0, 0x5AC3, /* 0x80 */
     0x5AC4, 0x5AC5, 0x5AC6, 0x5AC7, 0x5AC8, 0x5ACA, 0x5ACB, 0x5ACD, /* 0x90 */
@@ -383,15 +383,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_8B[] =
     0x5B25, 0x5B26, 0x5B27, 0x5B28, 0x5B29, 0x5B2A, 0x5B2B, 0x5B2C, /* 0xE0 */
     0x5B2D, 0x5B2E, 0x5B2F, 0x5B30, 0x5B31, 0x5B33, 0x5B35, 0x5B36, /* 0xE0 */
     0x5B38, 0x5B39, 0x5B3A, 0x5B3B, 0x5B3C, 0x5B3D, 0x5B3E, 0x5B3F, /* 0xF0 */
-    0x5B41, 0x5B42, 0x5B43, 0x5B44, 0x5B45, 0x5B46, 0x5B47          /* 0xF0 */
+    0x5B41, 0x5B42, 0x5B43, 0x5B44, 0x5B45, 0x5B46, 0x5B47			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_8C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5B48, 0x5B49, 0x5B4A, 0x5B4B, 0x5B4C, 0x5B4D, 0x5B4E, 0x5B4F, /* 0x40 */
     0x5B52, 0x5B56, 0x5B5E, 0x5B60, 0x5B61, 0x5B67, 0x5B68, 0x5B6B, /* 0x40 */
     0x5B6D, 0x5B6E, 0x5B6F, 0x5B72, 0x5B74, 0x5B76, 0x5B77, 0x5B78, /* 0x50 */
@@ -399,7 +399,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_8C[] =
     0x5B8D, 0x5B8E, 0x5B90, 0x5B91, 0x5B92, 0x5B94, 0x5B96, 0x5B9F, /* 0x60 */
     0x5BA7, 0x5BA8, 0x5BA9, 0x5BAC, 0x5BAD, 0x5BAE, 0x5BAF, 0x5BB1, /* 0x60 */
     0x5BB2, 0x5BB7, 0x5BBA, 0x5BBB, 0x5BBC, 0x5BC0, 0x5BC1, 0x5BC3, /* 0x70 */
-    0x5BC8, 0x5BC9, 0x5BCA, 0x5BCB, 0x5BCD, 0x5BCE, 0x5BCF,      0, /* 0x70 */
+    0x5BC8, 0x5BC9, 0x5BCA, 0x5BCB, 0x5BCD, 0x5BCE, 0x5BCF, 	 0, /* 0x70 */
     0x5BD1, 0x5BD4, 0x5BD5, 0x5BD6, 0x5BD7, 0x5BD8, 0x5BD9, 0x5BDA, /* 0x80 */
     0x5BDB, 0x5BDC, 0x5BE0, 0x5BE2, 0x5BE3, 0x5BE6, 0x5BE7, 0x5BE9, /* 0x80 */
     0x5BEA, 0x5BEB, 0x5BEC, 0x5BED, 0x5BEF, 0x5BF1, 0x5BF2, 0x5BF3, /* 0x90 */
@@ -415,15 +415,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_8C[] =
     0x5C76, 0x5C77, 0x5C78, 0x5C7B, 0x5C7C, 0x5C7D, 0x5C7E, 0x5C80, /* 0xE0 */
     0x5C83, 0x5C84, 0x5C85, 0x5C86, 0x5C87, 0x5C89, 0x5C8A, 0x5C8B, /* 0xE0 */
     0x5C8E, 0x5C8F, 0x5C92, 0x5C93, 0x5C95, 0x5C9D, 0x5C9E, 0x5C9F, /* 0xF0 */
-    0x5CA0, 0x5CA1, 0x5CA4, 0x5CA5, 0x5CA6, 0x5CA7, 0x5CA8          /* 0xF0 */
+    0x5CA0, 0x5CA1, 0x5CA4, 0x5CA5, 0x5CA6, 0x5CA7, 0x5CA8			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_8D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5CAA, 0x5CAE, 0x5CAF, 0x5CB0, 0x5CB2, 0x5CB4, 0x5CB6, 0x5CB9, /* 0x40 */
     0x5CBA, 0x5CBB, 0x5CBC, 0x5CBE, 0x5CC0, 0x5CC2, 0x5CC3, 0x5CC5, /* 0x40 */
     0x5CC6, 0x5CC7, 0x5CC8, 0x5CC9, 0x5CCA, 0x5CCC, 0x5CCD, 0x5CCE, /* 0x50 */
@@ -431,7 +431,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_8D[] =
     0x5CD8, 0x5CDA, 0x5CDB, 0x5CDC, 0x5CDD, 0x5CDE, 0x5CDF, 0x5CE0, /* 0x60 */
     0x5CE2, 0x5CE3, 0x5CE7, 0x5CE9, 0x5CEB, 0x5CEC, 0x5CEE, 0x5CEF, /* 0x60 */
     0x5CF1, 0x5CF2, 0x5CF3, 0x5CF4, 0x5CF5, 0x5CF6, 0x5CF7, 0x5CF8, /* 0x70 */
-    0x5CF9, 0x5CFA, 0x5CFC, 0x5CFD, 0x5CFE, 0x5CFF, 0x5D00,      0, /* 0x70 */
+    0x5CF9, 0x5CFA, 0x5CFC, 0x5CFD, 0x5CFE, 0x5CFF, 0x5D00, 	 0, /* 0x70 */
     0x5D01, 0x5D04, 0x5D05, 0x5D08, 0x5D09, 0x5D0A, 0x5D0B, 0x5D0C, /* 0x80 */
     0x5D0D, 0x5D0F, 0x5D10, 0x5D11, 0x5D12, 0x5D13, 0x5D15, 0x5D17, /* 0x80 */
     0x5D18, 0x5D19, 0x5D1A, 0x5D1C, 0x5D1D, 0x5D1F, 0x5D20, 0x5D21, /* 0x90 */
@@ -447,15 +447,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_8D[] =
     0x5D7F, 0x5D80, 0x5D81, 0x5D83, 0x5D84, 0x5D85, 0x5D86, 0x5D87, /* 0xE0 */
     0x5D88, 0x5D89, 0x5D8A, 0x5D8B, 0x5D8C, 0x5D8D, 0x5D8E, 0x5D8F, /* 0xE0 */
     0x5D90, 0x5D91, 0x5D92, 0x5D93, 0x5D94, 0x5D95, 0x5D96, 0x5D97, /* 0xF0 */
-    0x5D98, 0x5D9A, 0x5D9B, 0x5D9C, 0x5D9E, 0x5D9F, 0x5DA0          /* 0xF0 */
+    0x5D98, 0x5D9A, 0x5D9B, 0x5D9C, 0x5D9E, 0x5D9F, 0x5DA0			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_8E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5DA1, 0x5DA2, 0x5DA3, 0x5DA4, 0x5DA5, 0x5DA6, 0x5DA7, 0x5DA8, /* 0x40 */
     0x5DA9, 0x5DAA, 0x5DAB, 0x5DAC, 0x5DAD, 0x5DAE, 0x5DAF, 0x5DB0, /* 0x40 */
     0x5DB1, 0x5DB2, 0x5DB3, 0x5DB4, 0x5DB5, 0x5DB6, 0x5DB8, 0x5DB9, /* 0x50 */
@@ -463,7 +463,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_8E[] =
     0x5DC2, 0x5DC3, 0x5DC4, 0x5DC6, 0x5DC7, 0x5DC8, 0x5DC9, 0x5DCA, /* 0x60 */
     0x5DCB, 0x5DCC, 0x5DCE, 0x5DCF, 0x5DD0, 0x5DD1, 0x5DD2, 0x5DD3, /* 0x60 */
     0x5DD4, 0x5DD5, 0x5DD6, 0x5DD7, 0x5DD8, 0x5DD9, 0x5DDA, 0x5DDC, /* 0x70 */
-    0x5DDF, 0x5DE0, 0x5DE3, 0x5DE4, 0x5DEA, 0x5DEC, 0x5DED,      0, /* 0x70 */
+    0x5DDF, 0x5DE0, 0x5DE3, 0x5DE4, 0x5DEA, 0x5DEC, 0x5DED, 	 0, /* 0x70 */
     0x5DF0, 0x5DF5, 0x5DF6, 0x5DF8, 0x5DF9, 0x5DFA, 0x5DFB, 0x5DFC, /* 0x80 */
     0x5DFF, 0x5E00, 0x5E04, 0x5E07, 0x5E09, 0x5E0A, 0x5E0B, 0x5E0D, /* 0x80 */
     0x5E0E, 0x5E12, 0x5E13, 0x5E17, 0x5E1E, 0x5E1F, 0x5E20, 0x5E21, /* 0x90 */
@@ -479,15 +479,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_8E[] =
     0x5E8E, 0x5E92, 0x5E98, 0x5E9B, 0x5E9D, 0x5EA1, 0x5EA2, 0x5EA3, /* 0xE0 */
     0x5EA4, 0x5EA8, 0x5EA9, 0x5EAA, 0x5EAB, 0x5EAC, 0x5EAE, 0x5EAF, /* 0xE0 */
     0x5EB0, 0x5EB1, 0x5EB2, 0x5EB4, 0x5EBA, 0x5EBB, 0x5EBC, 0x5EBD, /* 0xF0 */
-    0x5EBF, 0x5EC0, 0x5EC1, 0x5EC2, 0x5EC3, 0x5EC4, 0x5EC5          /* 0xF0 */
+    0x5EBF, 0x5EC0, 0x5EC1, 0x5EC2, 0x5EC3, 0x5EC4, 0x5EC5			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_8F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5EC6, 0x5EC7, 0x5EC8, 0x5ECB, 0x5ECC, 0x5ECD, 0x5ECE, 0x5ECF, /* 0x40 */
     0x5ED0, 0x5ED4, 0x5ED5, 0x5ED7, 0x5ED8, 0x5ED9, 0x5EDA, 0x5EDC, /* 0x40 */
     0x5EDD, 0x5EDE, 0x5EDF, 0x5EE0, 0x5EE1, 0x5EE2, 0x5EE3, 0x5EE4, /* 0x50 */
@@ -495,7 +495,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_8F[] =
     0x5EEF, 0x5EF0, 0x5EF1, 0x5EF2, 0x5EF3, 0x5EF5, 0x5EF8, 0x5EF9, /* 0x60 */
     0x5EFB, 0x5EFC, 0x5EFD, 0x5F05, 0x5F06, 0x5F07, 0x5F09, 0x5F0C, /* 0x60 */
     0x5F0D, 0x5F0E, 0x5F10, 0x5F12, 0x5F14, 0x5F16, 0x5F19, 0x5F1A, /* 0x70 */
-    0x5F1C, 0x5F1D, 0x5F1E, 0x5F21, 0x5F22, 0x5F23, 0x5F24,      0, /* 0x70 */
+    0x5F1C, 0x5F1D, 0x5F1E, 0x5F21, 0x5F22, 0x5F23, 0x5F24, 	 0, /* 0x70 */
     0x5F28, 0x5F2B, 0x5F2C, 0x5F2E, 0x5F30, 0x5F32, 0x5F33, 0x5F34, /* 0x80 */
     0x5F35, 0x5F36, 0x5F37, 0x5F38, 0x5F3B, 0x5F3D, 0x5F3E, 0x5F3F, /* 0x80 */
     0x5F41, 0x5F42, 0x5F43, 0x5F44, 0x5F45, 0x5F46, 0x5F47, 0x5F48, /* 0x90 */
@@ -511,15 +511,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_8F[] =
     0x5FC7, 0x5FC8, 0x5FCA, 0x5FCB, 0x5FCE, 0x5FD3, 0x5FD4, 0x5FD5, /* 0xE0 */
     0x5FDA, 0x5FDB, 0x5FDC, 0x5FDE, 0x5FDF, 0x5FE2, 0x5FE3, 0x5FE5, /* 0xE0 */
     0x5FE6, 0x5FE8, 0x5FE9, 0x5FEC, 0x5FEF, 0x5FF0, 0x5FF2, 0x5FF3, /* 0xF0 */
-    0x5FF4, 0x5FF6, 0x5FF7, 0x5FF9, 0x5FFA, 0x5FFC, 0x6007          /* 0xF0 */
+    0x5FF4, 0x5FF6, 0x5FF7, 0x5FF9, 0x5FFA, 0x5FFC, 0x6007			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_90[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6008, 0x6009, 0x600B, 0x600C, 0x6010, 0x6011, 0x6013, 0x6017, /* 0x40 */
     0x6018, 0x601A, 0x601E, 0x601F, 0x6022, 0x6023, 0x6024, 0x602C, /* 0x40 */
     0x602D, 0x602E, 0x6030, 0x6031, 0x6032, 0x6033, 0x6034, 0x6036, /* 0x50 */
@@ -527,7 +527,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_90[] =
     0x6045, 0x6046, 0x6047, 0x6048, 0x6049, 0x604A, 0x604C, 0x604E, /* 0x60 */
     0x604F, 0x6051, 0x6053, 0x6054, 0x6056, 0x6057, 0x6058, 0x605B, /* 0x60 */
     0x605C, 0x605E, 0x605F, 0x6060, 0x6061, 0x6065, 0x6066, 0x606E, /* 0x70 */
-    0x6071, 0x6072, 0x6074, 0x6075, 0x6077, 0x607E, 0x6080,      0, /* 0x70 */
+    0x6071, 0x6072, 0x6074, 0x6075, 0x6077, 0x607E, 0x6080, 	 0, /* 0x70 */
     0x6081, 0x6082, 0x6085, 0x6086, 0x6087, 0x6088, 0x608A, 0x608B, /* 0x80 */
     0x608E, 0x608F, 0x6090, 0x6091, 0x6093, 0x6095, 0x6097, 0x6098, /* 0x80 */
     0x6099, 0x609C, 0x609E, 0x60A1, 0x60A2, 0x60A4, 0x60A5, 0x60A7, /* 0x90 */
@@ -543,15 +543,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_90[] =
     0x6122, 0x6125, 0x6128, 0x6129, 0x612A, 0x612C, 0x612D, 0x612E, /* 0xE0 */
     0x612F, 0x6130, 0x6131, 0x6132, 0x6133, 0x6134, 0x6135, 0x6136, /* 0xE0 */
     0x6137, 0x6138, 0x6139, 0x613A, 0x613B, 0x613C, 0x613D, 0x613E, /* 0xF0 */
-    0x6140, 0x6141, 0x6142, 0x6143, 0x6144, 0x6145, 0x6146          /* 0xF0 */
+    0x6140, 0x6141, 0x6142, 0x6143, 0x6144, 0x6145, 0x6146			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_91[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6147, 0x6149, 0x614B, 0x614D, 0x614F, 0x6150, 0x6152, 0x6153, /* 0x40 */
     0x6154, 0x6156, 0x6157, 0x6158, 0x6159, 0x615A, 0x615B, 0x615C, /* 0x40 */
     0x615E, 0x615F, 0x6160, 0x6161, 0x6163, 0x6164, 0x6165, 0x6166, /* 0x50 */
@@ -559,7 +559,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_91[] =
     0x6172, 0x6173, 0x6174, 0x6176, 0x6178, 0x6179, 0x617A, 0x617B, /* 0x60 */
     0x617C, 0x617D, 0x617E, 0x617F, 0x6180, 0x6181, 0x6182, 0x6183, /* 0x60 */
     0x6184, 0x6185, 0x6186, 0x6187, 0x6188, 0x6189, 0x618A, 0x618C, /* 0x70 */
-    0x618D, 0x618F, 0x6190, 0x6191, 0x6192, 0x6193, 0x6195,      0, /* 0x70 */
+    0x618D, 0x618F, 0x6190, 0x6191, 0x6192, 0x6193, 0x6195, 	 0, /* 0x70 */
     0x6196, 0x6197, 0x6198, 0x6199, 0x619A, 0x619B, 0x619C, 0x619E, /* 0x80 */
     0x619F, 0x61A0, 0x61A1, 0x61A2, 0x61A3, 0x61A4, 0x61A5, 0x61A6, /* 0x80 */
     0x61AA, 0x61AB, 0x61AD, 0x61AE, 0x61AF, 0x61B0, 0x61B1, 0x61B2, /* 0x90 */
@@ -575,15 +575,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_91[] =
     0x6209, 0x6213, 0x6214, 0x6219, 0x621C, 0x621D, 0x621E, 0x6220, /* 0xE0 */
     0x6223, 0x6226, 0x6227, 0x6228, 0x6229, 0x622B, 0x622D, 0x622F, /* 0xE0 */
     0x6230, 0x6231, 0x6232, 0x6235, 0x6236, 0x6238, 0x6239, 0x623A, /* 0xF0 */
-    0x623B, 0x623C, 0x6242, 0x6244, 0x6245, 0x6246, 0x624A          /* 0xF0 */
+    0x623B, 0x623C, 0x6242, 0x6244, 0x6245, 0x6246, 0x624A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_92[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x624F, 0x6250, 0x6255, 0x6256, 0x6257, 0x6259, 0x625A, 0x625C, /* 0x40 */
     0x625D, 0x625E, 0x625F, 0x6260, 0x6261, 0x6262, 0x6264, 0x6265, /* 0x40 */
     0x6268, 0x6271, 0x6272, 0x6274, 0x6275, 0x6277, 0x6278, 0x627A, /* 0x50 */
@@ -591,7 +591,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_92[] =
     0x6288, 0x628B, 0x628C, 0x628D, 0x628E, 0x628F, 0x6290, 0x6294, /* 0x60 */
     0x6299, 0x629C, 0x629D, 0x629E, 0x62A3, 0x62A6, 0x62A7, 0x62A9, /* 0x60 */
     0x62AA, 0x62AD, 0x62AE, 0x62AF, 0x62B0, 0x62B2, 0x62B3, 0x62B4, /* 0x70 */
-    0x62B6, 0x62B7, 0x62B8, 0x62BA, 0x62BE, 0x62C0, 0x62C1,      0, /* 0x70 */
+    0x62B6, 0x62B7, 0x62B8, 0x62BA, 0x62BE, 0x62C0, 0x62C1, 	 0, /* 0x70 */
     0x62C3, 0x62CB, 0x62CF, 0x62D1, 0x62D5, 0x62DD, 0x62DE, 0x62E0, /* 0x80 */
     0x62E1, 0x62E4, 0x62EA, 0x62EB, 0x62F0, 0x62F2, 0x62F5, 0x62F8, /* 0x80 */
     0x62F9, 0x62FA, 0x62FB, 0x6300, 0x6303, 0x6304, 0x6305, 0x6306, /* 0x90 */
@@ -607,15 +607,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_92[] =
     0x6384, 0x6385, 0x6386, 0x638B, 0x638D, 0x6391, 0x6393, 0x6394, /* 0xE0 */
     0x6395, 0x6397, 0x6399, 0x639A, 0x639B, 0x639C, 0x639D, 0x639E, /* 0xE0 */
     0x639F, 0x63A1, 0x63A4, 0x63A6, 0x63AB, 0x63AF, 0x63B1, 0x63B2, /* 0xF0 */
-    0x63B5, 0x63B6, 0x63B9, 0x63BB, 0x63BD, 0x63BF, 0x63C0          /* 0xF0 */
+    0x63B5, 0x63B6, 0x63B9, 0x63BB, 0x63BD, 0x63BF, 0x63C0			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_93[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x63C1, 0x63C2, 0x63C3, 0x63C5, 0x63C7, 0x63C8, 0x63CA, 0x63CB, /* 0x40 */
     0x63CC, 0x63D1, 0x63D3, 0x63D4, 0x63D5, 0x63D7, 0x63D8, 0x63D9, /* 0x40 */
     0x63DA, 0x63DB, 0x63DC, 0x63DD, 0x63DF, 0x63E2, 0x63E4, 0x63E5, /* 0x50 */
@@ -623,7 +623,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_93[] =
     0x63F1, 0x63F3, 0x63F5, 0x63F7, 0x63F9, 0x63FA, 0x63FB, 0x63FC, /* 0x60 */
     0x63FE, 0x6403, 0x6404, 0x6406, 0x6407, 0x6408, 0x6409, 0x640A, /* 0x60 */
     0x640D, 0x640E, 0x6411, 0x6412, 0x6415, 0x6416, 0x6417, 0x6418, /* 0x70 */
-    0x6419, 0x641A, 0x641D, 0x641F, 0x6422, 0x6423, 0x6424,      0, /* 0x70 */
+    0x6419, 0x641A, 0x641D, 0x641F, 0x6422, 0x6423, 0x6424, 	 0, /* 0x70 */
     0x6425, 0x6427, 0x6428, 0x6429, 0x642B, 0x642E, 0x642F, 0x6430, /* 0x80 */
     0x6431, 0x6432, 0x6433, 0x6435, 0x6436, 0x6437, 0x6438, 0x6439, /* 0x80 */
     0x643B, 0x643C, 0x643E, 0x6440, 0x6442, 0x6443, 0x6449, 0x644B, /* 0x90 */
@@ -639,15 +639,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_93[] =
     0x64AA, 0x64AB, 0x64AF, 0x64B1, 0x64B2, 0x64B3, 0x64B4, 0x64B6, /* 0xE0 */
     0x64B9, 0x64BB, 0x64BD, 0x64BE, 0x64BF, 0x64C1, 0x64C3, 0x64C4, /* 0xE0 */
     0x64C6, 0x64C7, 0x64C8, 0x64C9, 0x64CA, 0x64CB, 0x64CC, 0x64CF, /* 0xF0 */
-    0x64D1, 0x64D3, 0x64D4, 0x64D5, 0x64D6, 0x64D9, 0x64DA          /* 0xF0 */
+    0x64D1, 0x64D3, 0x64D4, 0x64D5, 0x64D6, 0x64D9, 0x64DA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_94[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x64DB, 0x64DC, 0x64DD, 0x64DF, 0x64E0, 0x64E1, 0x64E3, 0x64E5, /* 0x40 */
     0x64E7, 0x64E8, 0x64E9, 0x64EA, 0x64EB, 0x64EC, 0x64ED, 0x64EE, /* 0x40 */
     0x64EF, 0x64F0, 0x64F1, 0x64F2, 0x64F3, 0x64F4, 0x64F5, 0x64F6, /* 0x50 */
@@ -655,7 +655,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_94[] =
     0x64FF, 0x6501, 0x6502, 0x6503, 0x6504, 0x6505, 0x6506, 0x6507, /* 0x60 */
     0x6508, 0x650A, 0x650B, 0x650C, 0x650D, 0x650E, 0x650F, 0x6510, /* 0x60 */
     0x6511, 0x6513, 0x6514, 0x6515, 0x6516, 0x6517, 0x6519, 0x651A, /* 0x70 */
-    0x651B, 0x651C, 0x651D, 0x651E, 0x651F, 0x6520, 0x6521,      0, /* 0x70 */
+    0x651B, 0x651C, 0x651D, 0x651E, 0x651F, 0x6520, 0x6521, 	 0, /* 0x70 */
     0x6522, 0x6523, 0x6524, 0x6526, 0x6527, 0x6528, 0x6529, 0x652A, /* 0x80 */
     0x652C, 0x652D, 0x6530, 0x6531, 0x6532, 0x6533, 0x6537, 0x653A, /* 0x80 */
     0x653C, 0x653D, 0x6540, 0x6541, 0x6542, 0x6543, 0x6544, 0x6546, /* 0x90 */
@@ -671,15 +671,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_94[] =
     0x65B7, 0x65B8, 0x65BA, 0x65BB, 0x65BE, 0x65BF, 0x65C0, 0x65C2, /* 0xE0 */
     0x65C7, 0x65C8, 0x65C9, 0x65CA, 0x65CD, 0x65D0, 0x65D1, 0x65D3, /* 0xE0 */
     0x65D4, 0x65D5, 0x65D8, 0x65D9, 0x65DA, 0x65DB, 0x65DC, 0x65DD, /* 0xF0 */
-    0x65DE, 0x65DF, 0x65E1, 0x65E3, 0x65E4, 0x65EA, 0x65EB          /* 0xF0 */
+    0x65DE, 0x65DF, 0x65E1, 0x65E3, 0x65E4, 0x65EA, 0x65EB			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_95[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x65F2, 0x65F3, 0x65F4, 0x65F5, 0x65F8, 0x65F9, 0x65FB, 0x65FC, /* 0x40 */
     0x65FD, 0x65FE, 0x65FF, 0x6601, 0x6604, 0x6605, 0x6607, 0x6608, /* 0x40 */
     0x6609, 0x660B, 0x660D, 0x6610, 0x6611, 0x6612, 0x6616, 0x6617, /* 0x50 */
@@ -687,7 +687,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_95[] =
     0x6624, 0x6626, 0x6629, 0x662A, 0x662B, 0x662C, 0x662E, 0x6630, /* 0x60 */
     0x6632, 0x6633, 0x6637, 0x6638, 0x6639, 0x663A, 0x663B, 0x663D, /* 0x60 */
     0x663F, 0x6640, 0x6642, 0x6644, 0x6645, 0x6646, 0x6647, 0x6648, /* 0x70 */
-    0x6649, 0x664A, 0x664D, 0x664E, 0x6650, 0x6651, 0x6658,      0, /* 0x70 */
+    0x6649, 0x664A, 0x664D, 0x664E, 0x6650, 0x6651, 0x6658, 	 0, /* 0x70 */
     0x6659, 0x665B, 0x665C, 0x665D, 0x665E, 0x6660, 0x6662, 0x6663, /* 0x80 */
     0x6665, 0x6667, 0x6669, 0x666A, 0x666B, 0x666C, 0x666D, 0x6671, /* 0x80 */
     0x6672, 0x6673, 0x6675, 0x6678, 0x6679, 0x667B, 0x667C, 0x667D, /* 0x90 */
@@ -703,15 +703,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_95[] =
     0x66D5, 0x66D6, 0x66D7, 0x66D8, 0x66DA, 0x66DE, 0x66DF, 0x66E0, /* 0xE0 */
     0x66E1, 0x66E2, 0x66E3, 0x66E4, 0x66E5, 0x66E7, 0x66E8, 0x66EA, /* 0xE0 */
     0x66EB, 0x66EC, 0x66ED, 0x66EE, 0x66EF, 0x66F1, 0x66F5, 0x66F6, /* 0xF0 */
-    0x66F8, 0x66FA, 0x66FB, 0x66FD, 0x6701, 0x6702, 0x6703          /* 0xF0 */
+    0x66F8, 0x66FA, 0x66FB, 0x66FD, 0x6701, 0x6702, 0x6703			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_96[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6704, 0x6705, 0x6706, 0x6707, 0x670C, 0x670E, 0x670F, 0x6711, /* 0x40 */
     0x6712, 0x6713, 0x6716, 0x6718, 0x6719, 0x671A, 0x671C, 0x671E, /* 0x40 */
     0x6720, 0x6721, 0x6722, 0x6723, 0x6724, 0x6725, 0x6727, 0x6729, /* 0x50 */
@@ -719,7 +719,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_96[] =
     0x673B, 0x673C, 0x673E, 0x673F, 0x6741, 0x6744, 0x6745, 0x6747, /* 0x60 */
     0x674A, 0x674B, 0x674D, 0x6752, 0x6754, 0x6755, 0x6757, 0x6758, /* 0x60 */
     0x6759, 0x675A, 0x675B, 0x675D, 0x6762, 0x6763, 0x6764, 0x6766, /* 0x70 */
-    0x6767, 0x676B, 0x676C, 0x676E, 0x6771, 0x6774, 0x6776,      0, /* 0x70 */
+    0x6767, 0x676B, 0x676C, 0x676E, 0x6771, 0x6774, 0x6776, 	 0, /* 0x70 */
     0x6778, 0x6779, 0x677A, 0x677B, 0x677D, 0x6780, 0x6782, 0x6783, /* 0x80 */
     0x6785, 0x6786, 0x6788, 0x678A, 0x678C, 0x678D, 0x678E, 0x678F, /* 0x80 */
     0x6791, 0x6792, 0x6793, 0x6794, 0x6796, 0x6799, 0x679B, 0x679F, /* 0x90 */
@@ -735,15 +735,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_96[] =
     0x6822, 0x6823, 0x6824, 0x6825, 0x6826, 0x6827, 0x6828, 0x682B, /* 0xE0 */
     0x682C, 0x682D, 0x682E, 0x682F, 0x6830, 0x6831, 0x6834, 0x6835, /* 0xE0 */
     0x6836, 0x683A, 0x683B, 0x683F, 0x6847, 0x684B, 0x684D, 0x684F, /* 0xF0 */
-    0x6852, 0x6856, 0x6857, 0x6858, 0x6859, 0x685A, 0x685B          /* 0xF0 */
+    0x6852, 0x6856, 0x6857, 0x6858, 0x6859, 0x685A, 0x685B			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_97[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x685C, 0x685D, 0x685E, 0x685F, 0x686A, 0x686C, 0x686D, 0x686E, /* 0x40 */
     0x686F, 0x6870, 0x6871, 0x6872, 0x6873, 0x6875, 0x6878, 0x6879, /* 0x40 */
     0x687A, 0x687B, 0x687C, 0x687D, 0x687E, 0x687F, 0x6880, 0x6882, /* 0x50 */
@@ -751,7 +751,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_97[] =
     0x688E, 0x6890, 0x6891, 0x6892, 0x6894, 0x6895, 0x6896, 0x6898, /* 0x60 */
     0x6899, 0x689A, 0x689B, 0x689C, 0x689D, 0x689E, 0x689F, 0x68A0, /* 0x60 */
     0x68A1, 0x68A3, 0x68A4, 0x68A5, 0x68A9, 0x68AA, 0x68AB, 0x68AC, /* 0x70 */
-    0x68AE, 0x68B1, 0x68B2, 0x68B4, 0x68B6, 0x68B7, 0x68B8,      0, /* 0x70 */
+    0x68AE, 0x68B1, 0x68B2, 0x68B4, 0x68B6, 0x68B7, 0x68B8, 	 0, /* 0x70 */
     0x68B9, 0x68BA, 0x68BB, 0x68BC, 0x68BD, 0x68BE, 0x68BF, 0x68C1, /* 0x80 */
     0x68C3, 0x68C4, 0x68C5, 0x68C6, 0x68C7, 0x68C8, 0x68CA, 0x68CC, /* 0x80 */
     0x68CE, 0x68CF, 0x68D0, 0x68D1, 0x68D3, 0x68D4, 0x68D6, 0x68D7, /* 0x90 */
@@ -767,15 +767,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_97[] =
     0x6938, 0x693A, 0x693B, 0x693C, 0x693E, 0x6940, 0x6941, 0x6943, /* 0xE0 */
     0x6944, 0x6945, 0x6946, 0x6947, 0x6948, 0x6949, 0x694A, 0x694B, /* 0xE0 */
     0x694C, 0x694D, 0x694E, 0x694F, 0x6950, 0x6951, 0x6952, 0x6953, /* 0xF0 */
-    0x6955, 0x6956, 0x6958, 0x6959, 0x695B, 0x695C, 0x695F          /* 0xF0 */
+    0x6955, 0x6956, 0x6958, 0x6959, 0x695B, 0x695C, 0x695F			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_98[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6961, 0x6962, 0x6964, 0x6965, 0x6967, 0x6968, 0x6969, 0x696A, /* 0x40 */
     0x696C, 0x696D, 0x696F, 0x6970, 0x6972, 0x6973, 0x6974, 0x6975, /* 0x40 */
     0x6976, 0x697A, 0x697B, 0x697D, 0x697E, 0x697F, 0x6981, 0x6983, /* 0x50 */
@@ -783,7 +783,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_98[] =
     0x6992, 0x6993, 0x6996, 0x6997, 0x6999, 0x699A, 0x699D, 0x699E, /* 0x60 */
     0x699F, 0x69A0, 0x69A1, 0x69A2, 0x69A3, 0x69A4, 0x69A5, 0x69A6, /* 0x60 */
     0x69A9, 0x69AA, 0x69AC, 0x69AE, 0x69AF, 0x69B0, 0x69B2, 0x69B3, /* 0x70 */
-    0x69B5, 0x69B6, 0x69B8, 0x69B9, 0x69BA, 0x69BC, 0x69BD,      0, /* 0x70 */
+    0x69B5, 0x69B6, 0x69B8, 0x69B9, 0x69BA, 0x69BC, 0x69BD, 	 0, /* 0x70 */
     0x69BE, 0x69BF, 0x69C0, 0x69C2, 0x69C3, 0x69C4, 0x69C5, 0x69C6, /* 0x80 */
     0x69C7, 0x69C8, 0x69C9, 0x69CB, 0x69CD, 0x69CF, 0x69D1, 0x69D2, /* 0x80 */
     0x69D3, 0x69D5, 0x69D6, 0x69D7, 0x69D8, 0x69D9, 0x69DA, 0x69DC, /* 0x90 */
@@ -799,15 +799,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_98[] =
     0x6A34, 0x6A36, 0x6A37, 0x6A38, 0x6A39, 0x6A3A, 0x6A3B, 0x6A3C, /* 0xE0 */
     0x6A3F, 0x6A40, 0x6A41, 0x6A42, 0x6A43, 0x6A45, 0x6A46, 0x6A48, /* 0xE0 */
     0x6A49, 0x6A4A, 0x6A4B, 0x6A4C, 0x6A4D, 0x6A4E, 0x6A4F, 0x6A51, /* 0xF0 */
-    0x6A52, 0x6A53, 0x6A54, 0x6A55, 0x6A56, 0x6A57, 0x6A5A          /* 0xF0 */
+    0x6A52, 0x6A53, 0x6A54, 0x6A55, 0x6A56, 0x6A57, 0x6A5A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_99[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6A5C, 0x6A5D, 0x6A5E, 0x6A5F, 0x6A60, 0x6A62, 0x6A63, 0x6A64, /* 0x40 */
     0x6A66, 0x6A67, 0x6A68, 0x6A69, 0x6A6A, 0x6A6B, 0x6A6C, 0x6A6D, /* 0x40 */
     0x6A6E, 0x6A6F, 0x6A70, 0x6A72, 0x6A73, 0x6A74, 0x6A75, 0x6A76, /* 0x50 */
@@ -815,7 +815,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_99[] =
     0x6A82, 0x6A83, 0x6A85, 0x6A86, 0x6A87, 0x6A88, 0x6A89, 0x6A8A, /* 0x60 */
     0x6A8B, 0x6A8C, 0x6A8D, 0x6A8F, 0x6A92, 0x6A93, 0x6A94, 0x6A95, /* 0x60 */
     0x6A96, 0x6A98, 0x6A99, 0x6A9A, 0x6A9B, 0x6A9C, 0x6A9D, 0x6A9E, /* 0x70 */
-    0x6A9F, 0x6AA1, 0x6AA2, 0x6AA3, 0x6AA4, 0x6AA5, 0x6AA6,      0, /* 0x70 */
+    0x6A9F, 0x6AA1, 0x6AA2, 0x6AA3, 0x6AA4, 0x6AA5, 0x6AA6, 	 0, /* 0x70 */
     0x6AA7, 0x6AA8, 0x6AAA, 0x6AAD, 0x6AAE, 0x6AAF, 0x6AB0, 0x6AB1, /* 0x80 */
     0x6AB2, 0x6AB3, 0x6AB4, 0x6AB5, 0x6AB6, 0x6AB7, 0x6AB8, 0x6AB9, /* 0x80 */
     0x6ABA, 0x6ABB, 0x6ABC, 0x6ABD, 0x6ABE, 0x6ABF, 0x6AC0, 0x6AC1, /* 0x90 */
@@ -831,15 +831,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_99[] =
     0x6B0A, 0x6B0B, 0x6B0C, 0x6B0D, 0x6B0E, 0x6B0F, 0x6B10, 0x6B11, /* 0xE0 */
     0x6B12, 0x6B13, 0x6B14, 0x6B15, 0x6B16, 0x6B17, 0x6B18, 0x6B19, /* 0xE0 */
     0x6B1A, 0x6B1B, 0x6B1C, 0x6B1D, 0x6B1E, 0x6B1F, 0x6B25, 0x6B26, /* 0xF0 */
-    0x6B28, 0x6B29, 0x6B2A, 0x6B2B, 0x6B2C, 0x6B2D, 0x6B2E          /* 0xF0 */
+    0x6B28, 0x6B29, 0x6B2A, 0x6B2B, 0x6B2C, 0x6B2D, 0x6B2E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_9A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6B2F, 0x6B30, 0x6B31, 0x6B33, 0x6B34, 0x6B35, 0x6B36, 0x6B38, /* 0x40 */
     0x6B3B, 0x6B3C, 0x6B3D, 0x6B3F, 0x6B40, 0x6B41, 0x6B42, 0x6B44, /* 0x40 */
     0x6B45, 0x6B48, 0x6B4A, 0x6B4B, 0x6B4D, 0x6B4E, 0x6B4F, 0x6B50, /* 0x50 */
@@ -847,7 +847,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_9A[] =
     0x6B5A, 0x6B5B, 0x6B5C, 0x6B5D, 0x6B5E, 0x6B5F, 0x6B60, 0x6B61, /* 0x60 */
     0x6B68, 0x6B69, 0x6B6B, 0x6B6C, 0x6B6D, 0x6B6E, 0x6B6F, 0x6B70, /* 0x60 */
     0x6B71, 0x6B72, 0x6B73, 0x6B74, 0x6B75, 0x6B76, 0x6B77, 0x6B78, /* 0x70 */
-    0x6B7A, 0x6B7D, 0x6B7E, 0x6B7F, 0x6B80, 0x6B85, 0x6B88,      0, /* 0x70 */
+    0x6B7A, 0x6B7D, 0x6B7E, 0x6B7F, 0x6B80, 0x6B85, 0x6B88, 	 0, /* 0x70 */
     0x6B8C, 0x6B8E, 0x6B8F, 0x6B90, 0x6B91, 0x6B94, 0x6B95, 0x6B97, /* 0x80 */
     0x6B98, 0x6B99, 0x6B9C, 0x6B9D, 0x6B9E, 0x6B9F, 0x6BA0, 0x6BA2, /* 0x80 */
     0x6BA3, 0x6BA4, 0x6BA5, 0x6BA6, 0x6BA7, 0x6BA8, 0x6BA9, 0x6BAB, /* 0x90 */
@@ -863,15 +863,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_9A[] =
     0x6C1E, 0x6C20, 0x6C23, 0x6C25, 0x6C2B, 0x6C2C, 0x6C2D, 0x6C31, /* 0xE0 */
     0x6C33, 0x6C36, 0x6C37, 0x6C39, 0x6C3A, 0x6C3B, 0x6C3C, 0x6C3E, /* 0xE0 */
     0x6C3F, 0x6C43, 0x6C44, 0x6C45, 0x6C48, 0x6C4B, 0x6C4C, 0x6C4D, /* 0xF0 */
-    0x6C4E, 0x6C4F, 0x6C51, 0x6C52, 0x6C53, 0x6C56, 0x6C58          /* 0xF0 */
+    0x6C4E, 0x6C4F, 0x6C51, 0x6C52, 0x6C53, 0x6C56, 0x6C58			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_9B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6C59, 0x6C5A, 0x6C62, 0x6C63, 0x6C65, 0x6C66, 0x6C67, 0x6C6B, /* 0x40 */
     0x6C6C, 0x6C6D, 0x6C6E, 0x6C6F, 0x6C71, 0x6C73, 0x6C75, 0x6C77, /* 0x40 */
     0x6C78, 0x6C7A, 0x6C7B, 0x6C7C, 0x6C7F, 0x6C80, 0x6C84, 0x6C87, /* 0x50 */
@@ -879,7 +879,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_9B[] =
     0x6C97, 0x6C98, 0x6C9A, 0x6C9C, 0x6C9D, 0x6C9E, 0x6CA0, 0x6CA2, /* 0x60 */
     0x6CA8, 0x6CAC, 0x6CAF, 0x6CB0, 0x6CB4, 0x6CB5, 0x6CB6, 0x6CB7, /* 0x60 */
     0x6CBA, 0x6CC0, 0x6CC1, 0x6CC2, 0x6CC3, 0x6CC6, 0x6CC7, 0x6CC8, /* 0x70 */
-    0x6CCB, 0x6CCD, 0x6CCE, 0x6CCF, 0x6CD1, 0x6CD2, 0x6CD8,      0, /* 0x70 */
+    0x6CCB, 0x6CCD, 0x6CCE, 0x6CCF, 0x6CD1, 0x6CD2, 0x6CD8, 	 0, /* 0x70 */
     0x6CD9, 0x6CDA, 0x6CDC, 0x6CDD, 0x6CDF, 0x6CE4, 0x6CE6, 0x6CE7, /* 0x80 */
     0x6CE9, 0x6CEC, 0x6CED, 0x6CF2, 0x6CF4, 0x6CF9, 0x6CFF, 0x6D00, /* 0x80 */
     0x6D02, 0x6D03, 0x6D05, 0x6D06, 0x6D08, 0x6D09, 0x6D0A, 0x6D0D, /* 0x90 */
@@ -895,15 +895,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_9B[] =
     0x6D8F, 0x6D90, 0x6D92, 0x6D96, 0x6D97, 0x6D98, 0x6D99, 0x6D9A, /* 0xE0 */
     0x6D9C, 0x6DA2, 0x6DA5, 0x6DAC, 0x6DAD, 0x6DB0, 0x6DB1, 0x6DB3, /* 0xE0 */
     0x6DB4, 0x6DB6, 0x6DB7, 0x6DB9, 0x6DBA, 0x6DBB, 0x6DBC, 0x6DBD, /* 0xF0 */
-    0x6DBE, 0x6DC1, 0x6DC2, 0x6DC3, 0x6DC8, 0x6DC9, 0x6DCA          /* 0xF0 */
+    0x6DBE, 0x6DC1, 0x6DC2, 0x6DC3, 0x6DC8, 0x6DC9, 0x6DCA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_9C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6DCD, 0x6DCE, 0x6DCF, 0x6DD0, 0x6DD2, 0x6DD3, 0x6DD4, 0x6DD5, /* 0x40 */
     0x6DD7, 0x6DDA, 0x6DDB, 0x6DDC, 0x6DDF, 0x6DE2, 0x6DE3, 0x6DE5, /* 0x40 */
     0x6DE7, 0x6DE8, 0x6DE9, 0x6DEA, 0x6DED, 0x6DEF, 0x6DF0, 0x6DF2, /* 0x50 */
@@ -911,7 +911,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_9C[] =
     0x6E00, 0x6E01, 0x6E02, 0x6E03, 0x6E04, 0x6E06, 0x6E07, 0x6E08, /* 0x60 */
     0x6E09, 0x6E0B, 0x6E0F, 0x6E12, 0x6E13, 0x6E15, 0x6E18, 0x6E19, /* 0x60 */
     0x6E1B, 0x6E1C, 0x6E1E, 0x6E1F, 0x6E22, 0x6E26, 0x6E27, 0x6E28, /* 0x70 */
-    0x6E2A, 0x6E2C, 0x6E2E, 0x6E30, 0x6E31, 0x6E33, 0x6E35,      0, /* 0x70 */
+    0x6E2A, 0x6E2C, 0x6E2E, 0x6E30, 0x6E31, 0x6E33, 0x6E35, 	 0, /* 0x70 */
     0x6E36, 0x6E37, 0x6E39, 0x6E3B, 0x6E3C, 0x6E3D, 0x6E3E, 0x6E3F, /* 0x80 */
     0x6E40, 0x6E41, 0x6E42, 0x6E45, 0x6E46, 0x6E47, 0x6E48, 0x6E49, /* 0x80 */
     0x6E4A, 0x6E4B, 0x6E4C, 0x6E4F, 0x6E50, 0x6E51, 0x6E52, 0x6E55, /* 0x90 */
@@ -927,15 +927,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_9C[] =
     0x6EB9, 0x6EBC, 0x6EBE, 0x6EBF, 0x6EC0, 0x6EC3, 0x6EC4, 0x6EC5, /* 0xE0 */
     0x6EC6, 0x6EC8, 0x6EC9, 0x6ECA, 0x6ECC, 0x6ECD, 0x6ECE, 0x6ED0, /* 0xE0 */
     0x6ED2, 0x6ED6, 0x6ED8, 0x6ED9, 0x6EDB, 0x6EDC, 0x6EDD, 0x6EE3, /* 0xF0 */
-    0x6EE7, 0x6EEA, 0x6EEB, 0x6EEC, 0x6EED, 0x6EEE, 0x6EEF          /* 0xF0 */
+    0x6EE7, 0x6EEA, 0x6EEB, 0x6EEC, 0x6EED, 0x6EEE, 0x6EEF			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_9D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6EF0, 0x6EF1, 0x6EF2, 0x6EF3, 0x6EF5, 0x6EF6, 0x6EF7, 0x6EF8, /* 0x40 */
     0x6EFA, 0x6EFB, 0x6EFC, 0x6EFD, 0x6EFE, 0x6EFF, 0x6F00, 0x6F01, /* 0x40 */
     0x6F03, 0x6F04, 0x6F05, 0x6F07, 0x6F08, 0x6F0A, 0x6F0B, 0x6F0C, /* 0x50 */
@@ -943,7 +943,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_9D[] =
     0x6F19, 0x6F1A, 0x6F1B, 0x6F1C, 0x6F1D, 0x6F1E, 0x6F1F, 0x6F21, /* 0x60 */
     0x6F22, 0x6F23, 0x6F25, 0x6F26, 0x6F27, 0x6F28, 0x6F2C, 0x6F2E, /* 0x60 */
     0x6F30, 0x6F32, 0x6F34, 0x6F35, 0x6F37, 0x6F38, 0x6F39, 0x6F3A, /* 0x70 */
-    0x6F3B, 0x6F3C, 0x6F3D, 0x6F3F, 0x6F40, 0x6F41, 0x6F42,      0, /* 0x70 */
+    0x6F3B, 0x6F3C, 0x6F3D, 0x6F3F, 0x6F40, 0x6F41, 0x6F42, 	 0, /* 0x70 */
     0x6F43, 0x6F44, 0x6F45, 0x6F48, 0x6F49, 0x6F4A, 0x6F4C, 0x6F4E, /* 0x80 */
     0x6F4F, 0x6F50, 0x6F51, 0x6F52, 0x6F53, 0x6F54, 0x6F55, 0x6F56, /* 0x80 */
     0x6F57, 0x6F59, 0x6F5A, 0x6F5B, 0x6F5D, 0x6F5F, 0x6F60, 0x6F61, /* 0x90 */
@@ -959,15 +959,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_9D[] =
     0x6FBF, 0x6FC1, 0x6FC3, 0x6FC4, 0x6FC5, 0x6FC6, 0x6FC7, 0x6FC8, /* 0xE0 */
     0x6FCA, 0x6FCB, 0x6FCC, 0x6FCD, 0x6FCE, 0x6FCF, 0x6FD0, 0x6FD3, /* 0xE0 */
     0x6FD4, 0x6FD5, 0x6FD6, 0x6FD7, 0x6FD8, 0x6FD9, 0x6FDA, 0x6FDB, /* 0xF0 */
-    0x6FDC, 0x6FDD, 0x6FDF, 0x6FE2, 0x6FE3, 0x6FE4, 0x6FE5          /* 0xF0 */
+    0x6FDC, 0x6FDD, 0x6FDF, 0x6FE2, 0x6FE3, 0x6FE4, 0x6FE5			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_9E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6FE6, 0x6FE7, 0x6FE8, 0x6FE9, 0x6FEA, 0x6FEB, 0x6FEC, 0x6FED, /* 0x40 */
     0x6FF0, 0x6FF1, 0x6FF2, 0x6FF3, 0x6FF4, 0x6FF5, 0x6FF6, 0x6FF7, /* 0x40 */
     0x6FF8, 0x6FF9, 0x6FFA, 0x6FFB, 0x6FFC, 0x6FFD, 0x6FFE, 0x6FFF, /* 0x50 */
@@ -975,7 +975,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_9E[] =
     0x7008, 0x7009, 0x700A, 0x700B, 0x700C, 0x700D, 0x700E, 0x700F, /* 0x60 */
     0x7010, 0x7012, 0x7013, 0x7014, 0x7015, 0x7016, 0x7017, 0x7018, /* 0x60 */
     0x7019, 0x701C, 0x701D, 0x701E, 0x701F, 0x7020, 0x7021, 0x7022, /* 0x70 */
-    0x7024, 0x7025, 0x7026, 0x7027, 0x7028, 0x7029, 0x702A,      0, /* 0x70 */
+    0x7024, 0x7025, 0x7026, 0x7027, 0x7028, 0x7029, 0x702A, 	 0, /* 0x70 */
     0x702B, 0x702C, 0x702D, 0x702E, 0x702F, 0x7030, 0x7031, 0x7032, /* 0x80 */
     0x7033, 0x7034, 0x7036, 0x7037, 0x7038, 0x703A, 0x703B, 0x703C, /* 0x80 */
     0x703D, 0x703E, 0x703F, 0x7040, 0x7041, 0x7042, 0x7043, 0x7044, /* 0x90 */
@@ -991,15 +991,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_9E[] =
     0x70A7, 0x70A8, 0x70A9, 0x70AA, 0x70B0, 0x70B2, 0x70B4, 0x70B5, /* 0xE0 */
     0x70B6, 0x70BA, 0x70BE, 0x70BF, 0x70C4, 0x70C5, 0x70C6, 0x70C7, /* 0xE0 */
     0x70C9, 0x70CB, 0x70CC, 0x70CD, 0x70CE, 0x70CF, 0x70D0, 0x70D1, /* 0xF0 */
-    0x70D2, 0x70D3, 0x70D4, 0x70D5, 0x70D6, 0x70D7, 0x70DA          /* 0xF0 */
+    0x70D2, 0x70D3, 0x70D4, 0x70D5, 0x70D6, 0x70D7, 0x70DA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_9F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x70DC, 0x70DD, 0x70DE, 0x70E0, 0x70E1, 0x70E2, 0x70E3, 0x70E5, /* 0x40 */
     0x70EA, 0x70EE, 0x70F0, 0x70F1, 0x70F2, 0x70F3, 0x70F4, 0x70F5, /* 0x40 */
     0x70F6, 0x70F8, 0x70FA, 0x70FB, 0x70FC, 0x70FE, 0x70FF, 0x7100, /* 0x50 */
@@ -1007,7 +1007,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_9F[] =
     0x710B, 0x710C, 0x710D, 0x710E, 0x710F, 0x7111, 0x7112, 0x7114, /* 0x60 */
     0x7117, 0x711B, 0x711C, 0x711D, 0x711E, 0x711F, 0x7120, 0x7121, /* 0x60 */
     0x7122, 0x7123, 0x7124, 0x7125, 0x7127, 0x7128, 0x7129, 0x712A, /* 0x70 */
-    0x712B, 0x712C, 0x712D, 0x712E, 0x7132, 0x7133, 0x7134,      0, /* 0x70 */
+    0x712B, 0x712C, 0x712D, 0x712E, 0x7132, 0x7133, 0x7134, 	 0, /* 0x70 */
     0x7135, 0x7137, 0x7138, 0x7139, 0x713A, 0x713B, 0x713C, 0x713D, /* 0x80 */
     0x713E, 0x713F, 0x7140, 0x7141, 0x7142, 0x7143, 0x7144, 0x7146, /* 0x80 */
     0x7147, 0x7148, 0x7149, 0x714B, 0x714D, 0x714F, 0x7150, 0x7151, /* 0x90 */
@@ -1023,15 +1023,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_9F[] =
     0x71B0, 0x71B1, 0x71B2, 0x71B4, 0x71B6, 0x71B7, 0x71B8, 0x71BA, /* 0xE0 */
     0x71BB, 0x71BC, 0x71BD, 0x71BE, 0x71BF, 0x71C0, 0x71C1, 0x71C2, /* 0xE0 */
     0x71C4, 0x71C5, 0x71C6, 0x71C7, 0x71C8, 0x71C9, 0x71CA, 0x71CB, /* 0xF0 */
-    0x71CC, 0x71CD, 0x71CF, 0x71D0, 0x71D1, 0x71D2, 0x71D3          /* 0xF0 */
+    0x71CC, 0x71CD, 0x71CF, 0x71D0, 0x71D1, 0x71D2, 0x71D3			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_A0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x71D6, 0x71D7, 0x71D8, 0x71D9, 0x71DA, 0x71DB, 0x71DC, 0x71DD, /* 0x40 */
     0x71DE, 0x71DF, 0x71E1, 0x71E2, 0x71E3, 0x71E4, 0x71E6, 0x71E8, /* 0x40 */
     0x71E9, 0x71EA, 0x71EB, 0x71EC, 0x71ED, 0x71EF, 0x71F0, 0x71F1, /* 0x50 */
@@ -1039,7 +1039,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_A0[] =
     0x71FB, 0x71FC, 0x71FD, 0x71FE, 0x71FF, 0x7200, 0x7201, 0x7202, /* 0x60 */
     0x7203, 0x7204, 0x7205, 0x7207, 0x7208, 0x7209, 0x720A, 0x720B, /* 0x60 */
     0x720C, 0x720D, 0x720E, 0x720F, 0x7210, 0x7211, 0x7212, 0x7213, /* 0x70 */
-    0x7214, 0x7215, 0x7216, 0x7217, 0x7218, 0x7219, 0x721A,      0, /* 0x70 */
+    0x7214, 0x7215, 0x7216, 0x7217, 0x7218, 0x7219, 0x721A, 	 0, /* 0x70 */
     0x721B, 0x721C, 0x721E, 0x721F, 0x7220, 0x7221, 0x7222, 0x7223, /* 0x80 */
     0x7224, 0x7225, 0x7226, 0x7227, 0x7229, 0x722B, 0x722D, 0x722E, /* 0x80 */
     0x722F, 0x7232, 0x7233, 0x7234, 0x723A, 0x723C, 0x723E, 0x7240, /* 0x90 */
@@ -1055,7 +1055,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_A0[] =
     0x72A9, 0x72AA, 0x72AB, 0x72AE, 0x72B1, 0x72B2, 0x72B3, 0x72B5, /* 0xE0 */
     0x72BA, 0x72BB, 0x72BC, 0x72BD, 0x72BE, 0x72BF, 0x72C0, 0x72C5, /* 0xE0 */
     0x72C6, 0x72C7, 0x72C9, 0x72CA, 0x72CB, 0x72CC, 0x72CF, 0x72D1, /* 0xF0 */
-    0x72D3, 0x72D4, 0x72D5, 0x72D6, 0x72D8, 0x72DA, 0x72DB          /* 0xF0 */
+    0x72D3, 0x72D4, 0x72D5, 0x72D6, 0x72D8, 0x72DA, 0x72DB			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -1070,8 +1070,8 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_A0[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GB_A1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x3000, 0x3001, 0x3002, 0x00B7, 0x02C9, 0x02C7, 0x00A8, /* 0xA0 */
     0x3003, 0x3005, 0x2014, 0xFF5E, 0x2016, 0x2026, 0x2018, 0x2019, /* 0xA0 */
     0x201C, 0x201D, 0x3014, 0x3015, 0x3008, 0x3009, 0x300A, 0x300B, /* 0xB0 */
@@ -1083,7 +1083,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GB_A1[] =
     0x2234, 0x2642, 0x2640, 0x00B0, 0x2032, 0x2033, 0x2103, 0xFF04, /* 0xE0 */
     0x00A4, 0xFFE0, 0xFFE1, 0x2030, 0x00A7, 0x2116, 0x2606, 0x2605, /* 0xE0 */
     0x25CB, 0x25CF, 0x25CE, 0x25C7, 0x25C6, 0x25A1, 0x25A0, 0x25B3, /* 0xF0 */
-    0x25B2, 0x203B, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013          /* 0xF0 */
+    0x25B2, 0x203B, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -1092,20 +1092,20 @@ static sal_uInt16 const aImplDBCSToUniTab_GB_A1[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GB_A2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176, /* 0xA0 */
-    0x2177, 0x2178, 0x2179,      0,      0,      0,      0,      0, /* 0xA0 */
+    0x2177, 0x2178, 0x2179, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
          0, 0x2488, 0x2489, 0x248A, 0x248B, 0x248C, 0x248D, 0x248E, /* 0xB0 */
     0x248F, 0x2490, 0x2491, 0x2492, 0x2493, 0x2494, 0x2495, 0x2496, /* 0xB0 */
     0x2497, 0x2498, 0x2499, 0x249A, 0x249B, 0x2474, 0x2475, 0x2476, /* 0xC0 */
     0x2477, 0x2478, 0x2479, 0x247A, 0x247B, 0x247C, 0x247D, 0x247E, /* 0xC0 */
     0x247F, 0x2480, 0x2481, 0x2482, 0x2483, 0x2484, 0x2485, 0x2486, /* 0xD0 */
     0x2487, 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, /* 0xD0 */
-    0x2467, 0x2468, 0x2469,      0,      0, 0x3220, 0x3221, 0x3222, /* 0xE0 */
-    0x3223, 0x3224, 0x3225, 0x3226, 0x3227, 0x3228, 0x3229,      0, /* 0xE0 */
+    0x2467, 0x2468, 0x2469, 	 0, 	 0, 0x3220, 0x3221, 0x3222, /* 0xE0 */
+    0x3223, 0x3224, 0x3225, 0x3226, 0x3227, 0x3228, 0x3229, 	 0, /* 0xE0 */
          0, 0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166, /* 0xF0 */
-    0x2167, 0x2168, 0x2169, 0x216A, 0x216B                          /* 0xF0 */
+    0x2167, 0x2168, 0x2169, 0x216A, 0x216B							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -1116,8 +1116,8 @@ static sal_uInt16 const aImplDBCSToUniTab_GB_A2[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GB_A3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xFF01, 0xFF02, 0xFF03, 0xFFE5, 0xFF05, 0xFF06, 0xFF07, /* 0xA0 */
     0xFF08, 0xFF09, 0xFF0A, 0xFF0B, 0xFF0C, 0xFF0D, 0xFF0E, 0xFF0F, /* 0xA0 */
     0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17, /* 0xB0 */
@@ -1129,15 +1129,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GB_A3[] =
     0xFF40, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47, /* 0xE0 */
     0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F, /* 0xE0 */
     0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57, /* 0xF0 */
-    0xFF58, 0xFF59, 0xFF5A, 0xFF5B, 0xFF5C, 0xFF5D, 0xFFE3          /* 0xF0 */
+    0xFF58, 0xFF59, 0xFF5A, 0xFF5B, 0xFF5C, 0xFF5D, 0xFFE3			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GB_A4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047, /* 0xA0 */
     0x3048, 0x3049, 0x304A, 0x304B, 0x304C, 0x304D, 0x304E, 0x304F, /* 0xA0 */
     0x3050, 0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056, 0x3057, /* 0xB0 */
@@ -1148,7 +1148,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GB_A4[] =
     0x3078, 0x3079, 0x307A, 0x307B, 0x307C, 0x307D, 0x307E, 0x307F, /* 0xD0 */
     0x3080, 0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087, /* 0xE0 */
     0x3088, 0x3089, 0x308A, 0x308B, 0x308C, 0x308D, 0x308E, 0x308F, /* 0xE0 */
-    0x3090, 0x3091, 0x3092, 0x3093                                  /* 0xF0 */
+    0x3090, 0x3091, 0x3092, 0x3093									/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -1156,8 +1156,8 @@ static sal_uInt16 const aImplDBCSToUniTab_GB_A4[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GB_A5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7, /* 0xA0 */
     0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC, 0x30AD, 0x30AE, 0x30AF, /* 0xA0 */
     0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, 0x30B7, /* 0xB0 */
@@ -1168,7 +1168,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GB_A5[] =
     0x30D8, 0x30D9, 0x30DA, 0x30DB, 0x30DC, 0x30DD, 0x30DE, 0x30DF, /* 0xD0 */
     0x30E0, 0x30E1, 0x30E2, 0x30E3, 0x30E4, 0x30E5, 0x30E6, 0x30E7, /* 0xE0 */
     0x30E8, 0x30E9, 0x30EA, 0x30EB, 0x30EC, 0x30ED, 0x30EE, 0x30EF, /* 0xE0 */
-    0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6          /* 0xF0 */
+    0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6			/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -1176,19 +1176,19 @@ static sal_uInt16 const aImplDBCSToUniTab_GB_A5[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GB_A6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, /* 0xA0 */
     0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, /* 0xA0 */
     0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, /* 0xB0 */
-    0x03A9,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
+    0x03A9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
          0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, /* 0xC0 */
     0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, /* 0xC0 */
     0x03C0, 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, /* 0xD0 */
-    0x03C9,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
+    0x03C9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
     0xFE35, 0xFE36, 0xFE39, 0xFE3A, 0xFE3F, 0xFE40, 0xFE3D, 0xFE3E, /* 0xE0 */
-    0xFE41, 0xFE42, 0xFE43, 0xFE44,      0,      0, 0xFE3B, 0xFE3C, /* 0xE0 */
-    0xFE37, 0xFE38, 0xFE31,      0, 0xFE33, 0xFE34                  /* 0xF0 */
+    0xFE41, 0xFE42, 0xFE43, 0xFE44, 	 0, 	 0, 0xFE3B, 0xFE3C, /* 0xE0 */
+    0xFE37, 0xFE38, 0xFE31, 	 0, 0xFE33, 0xFE34					/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -1196,19 +1196,19 @@ static sal_uInt16 const aImplDBCSToUniTab_GB_A6[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GB_A7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401, /* 0xA0 */
     0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, /* 0xA0 */
     0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, /* 0xB0 */
     0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, /* 0xB0 */
-    0x042E, 0x042F,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
+    0x042E, 0x042F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
          0, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451, /* 0xD0 */
     0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, /* 0xD0 */
     0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, /* 0xE0 */
     0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, /* 0xE0 */
-    0x044E, 0x044F                                                  /* 0xF0 */
+    0x044E, 0x044F													/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -1218,8 +1218,8 @@ static sal_uInt16 const aImplDBCSToUniTab_GB_A7[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_A8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x02CA, 0x02CB, 0x02D9, 0x2013, 0x2015, 0x2025, 0x2035, 0x2105, /* 0x40 */
     0x2109, 0x2196, 0x2197, 0x2198, 0x2199, 0x2215, 0x221F, 0x2223, /* 0x40 */
     0x2252, 0x2266, 0x2267, 0x22BF, 0x2550, 0x2551, 0x2552, 0x2553, /* 0x50 */
@@ -1227,42 +1227,42 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_A8[] =
     0x255C, 0x255D, 0x255E, 0x255F, 0x2560, 0x2561, 0x2562, 0x2563, /* 0x60 */
     0x2564, 0x2565, 0x2566, 0x2567, 0x2568, 0x2569, 0x256A, 0x256B, /* 0x60 */
     0x256C, 0x256D, 0x256E, 0x256F, 0x2570, 0x2571, 0x2572, 0x2573, /* 0x70 */
-    0x2581, 0x2582, 0x2583, 0x2584, 0x2585, 0x2586, 0x2587,      0, /* 0x70 */
+    0x2581, 0x2582, 0x2583, 0x2584, 0x2585, 0x2586, 0x2587, 	 0, /* 0x70 */
     0x2588, 0x2589, 0x258A, 0x258B, 0x258C, 0x258D, 0x258E, 0x258F, /* 0x80 */
     0x2593, 0x2594, 0x2595, 0x25BC, 0x25BD, 0x25E2, 0x25E3, 0x25E4, /* 0x80 */
-    0x25E5, 0x2609, 0x2295, 0x3012, 0x301D, 0x301E,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x25E5, 0x2609, 0x2295, 0x3012, 0x301D, 0x301E, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x0101, 0x00E1, 0x01CE, 0x00E0, 0x0113, 0x00E9, 0x011B, /* 0xA0 */
     0x00E8, 0x012B, 0x00ED, 0x01D0, 0x00EC, 0x014D, 0x00F3, 0x01D2, /* 0xA0 */
     0x00F2, 0x016B, 0x00FA, 0x01D4, 0x00F9, 0x01D6, 0x01D8, 0x01DA, /* 0xB0 */
-    0x01DC, 0x00FC, 0x00EA, 0x0251, 0x1E3F, 0x0144, 0x0148,      0, /* 0xB0 */
-    0x0261,      0,      0,      0,      0, 0x3105, 0x3106, 0x3107, /* 0xC0 */
+    0x01DC, 0x00FC, 0x00EA, 0x0251, 0x1E3F, 0x0144, 0x0148, 	 0, /* 0xB0 */
+    0x0261, 	 0, 	 0, 	 0, 	 0, 0x3105, 0x3106, 0x3107, /* 0xC0 */
     0x3108, 0x3109, 0x310A, 0x310B, 0x310C, 0x310D, 0x310E, 0x310F, /* 0xC0 */
     0x3110, 0x3111, 0x3112, 0x3113, 0x3114, 0x3115, 0x3116, 0x3117, /* 0xD0 */
     0x3118, 0x3119, 0x311A, 0x311B, 0x311C, 0x311D, 0x311E, 0x311F, /* 0xD0 */
     0x3120, 0x3121, 0x3122, 0x3123, 0x3124, 0x3125, 0x3126, 0x3127, /* 0xE0 */
-    0x3128, 0x3129                                                  /* 0xE0 */
+    0x3128, 0x3129													/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_A9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x3021, 0x3022, 0x3023, 0x3024, 0x3025, 0x3026, 0x3027, 0x3028, /* 0x40 */
     0x3029, 0x32A3, 0x338E, 0x338F, 0x339C, 0x339D, 0x339E, 0x33A1, /* 0x40 */
     0x33C4, 0x33CE, 0x33D1, 0x33D2, 0x33D5, 0xFE30, 0xFFE2, 0xFFE4, /* 0x50 */
-         0, 0x2121, 0x3231,      0, 0x2010,      0,      0,      0, /* 0x50 */
+         0, 0x2121, 0x3231, 	 0, 0x2010, 	 0, 	 0, 	 0, /* 0x50 */
     0x30FC, 0x309B, 0x309C, 0x30FD, 0x30FE, 0x3006, 0x309D, 0x309E, /* 0x60 */
     0xFE49, 0xFE4A, 0xFE4B, 0xFE4C, 0xFE4D, 0xFE4E, 0xFE4F, 0xFE50, /* 0x60 */
     0xFE51, 0xFE52, 0xFE54, 0xFE55, 0xFE56, 0xFE57, 0xFE59, 0xFE5A, /* 0x70 */
-    0xFE5B, 0xFE5C, 0xFE5D, 0xFE5E, 0xFE5F, 0xFE60, 0xFE61,      0, /* 0x70 */
+    0xFE5B, 0xFE5C, 0xFE5D, 0xFE5E, 0xFE5F, 0xFE60, 0xFE61, 	 0, /* 0x70 */
     0xFE62, 0xFE63, 0xFE64, 0xFE65, 0xFE66, 0xFE68, 0xFE69, 0xFE6A, /* 0x80 */
-    0xFE6B,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0x3007,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0x2500, 0x2501, 0x2502, 0x2503, /* 0xA0 */
+    0xFE6B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0x3007, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0x2500, 0x2501, 0x2502, 0x2503, /* 0xA0 */
     0x2504, 0x2505, 0x2506, 0x2507, 0x2508, 0x2509, 0x250A, 0x250B, /* 0xA0 */
     0x250C, 0x250D, 0x250E, 0x250F, 0x2510, 0x2511, 0x2512, 0x2513, /* 0xB0 */
     0x2514, 0x2515, 0x2516, 0x2517, 0x2518, 0x2519, 0x251A, 0x251B, /* 0xB0 */
@@ -1271,15 +1271,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_A9[] =
     0x252C, 0x252D, 0x252E, 0x252F, 0x2530, 0x2531, 0x2532, 0x2533, /* 0xD0 */
     0x2534, 0x2535, 0x2536, 0x2537, 0x2538, 0x2539, 0x253A, 0x253B, /* 0xD0 */
     0x253C, 0x253D, 0x253E, 0x253F, 0x2540, 0x2541, 0x2542, 0x2543, /* 0xE0 */
-    0x2544, 0x2545, 0x2546, 0x2547, 0x2548, 0x2549, 0x254A, 0x254B  /* 0xE0 */
+    0x2544, 0x2545, 0x2546, 0x2547, 0x2548, 0x2549, 0x254A, 0x254B	/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_AA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x72DC, 0x72DD, 0x72DF, 0x72E2, 0x72E3, 0x72E4, 0x72E5, 0x72E6, /* 0x40 */
     0x72E7, 0x72EA, 0x72EB, 0x72F5, 0x72F6, 0x72F9, 0x72FD, 0x72FE, /* 0x40 */
     0x72FF, 0x7300, 0x7302, 0x7304, 0x7305, 0x7306, 0x7307, 0x7308, /* 0x50 */
@@ -1287,12 +1287,12 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_AA[] =
     0x7314, 0x7318, 0x7319, 0x731A, 0x731F, 0x7320, 0x7323, 0x7324, /* 0x60 */
     0x7326, 0x7327, 0x7328, 0x732D, 0x732F, 0x7330, 0x7332, 0x7333, /* 0x60 */
     0x7335, 0x7336, 0x733A, 0x733B, 0x733C, 0x733D, 0x7340, 0x7341, /* 0x70 */
-    0x7342, 0x7343, 0x7344, 0x7345, 0x7346, 0x7347, 0x7348,      0, /* 0x70 */
+    0x7342, 0x7343, 0x7344, 0x7345, 0x7346, 0x7347, 0x7348, 	 0, /* 0x70 */
     0x7349, 0x734A, 0x734B, 0x734C, 0x734E, 0x734F, 0x7351, 0x7353, /* 0x80 */
     0x7354, 0x7355, 0x7356, 0x7358, 0x7359, 0x735A, 0x735B, 0x735C, /* 0x80 */
     0x735D, 0x735E, 0x735F, 0x7361, 0x7362, 0x7363, 0x7364, 0x7365, /* 0x90 */
     0x7366, 0x7367, 0x7368, 0x7369, 0x736A, 0x736B, 0x736E, 0x7370, /* 0x90 */
-    0x7371                                                          /* 0xA0 */
+    0x7371															/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -1300,8 +1300,8 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_AA[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_AB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7372, 0x7373, 0x7374, 0x7375, 0x7376, 0x7377, 0x7378, 0x7379, /* 0x40 */
     0x737A, 0x737B, 0x737C, 0x737D, 0x737F, 0x7380, 0x7381, 0x7382, /* 0x40 */
     0x7383, 0x7385, 0x7386, 0x7388, 0x738A, 0x738C, 0x738D, 0x738F, /* 0x50 */
@@ -1309,12 +1309,12 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_AB[] =
     0x739A, 0x739C, 0x739D, 0x739E, 0x73A0, 0x73A1, 0x73A3, 0x73A4, /* 0x60 */
     0x73A5, 0x73A6, 0x73A7, 0x73A8, 0x73AA, 0x73AC, 0x73AD, 0x73B1, /* 0x60 */
     0x73B4, 0x73B5, 0x73B6, 0x73B8, 0x73B9, 0x73BC, 0x73BD, 0x73BE, /* 0x70 */
-    0x73BF, 0x73C1, 0x73C3, 0x73C4, 0x73C5, 0x73C6, 0x73C7,      0, /* 0x70 */
+    0x73BF, 0x73C1, 0x73C3, 0x73C4, 0x73C5, 0x73C6, 0x73C7, 	 0, /* 0x70 */
     0x73CB, 0x73CC, 0x73CE, 0x73D2, 0x73D3, 0x73D4, 0x73D5, 0x73D6, /* 0x80 */
     0x73D7, 0x73D8, 0x73DA, 0x73DB, 0x73DC, 0x73DD, 0x73DF, 0x73E1, /* 0x80 */
     0x73E2, 0x73E3, 0x73E4, 0x73E6, 0x73E8, 0x73EA, 0x73EB, 0x73EC, /* 0x90 */
     0x73EE, 0x73EF, 0x73F0, 0x73F1, 0x73F3, 0x73F4, 0x73F5, 0x73F6, /* 0x90 */
-    0x73F7                                                          /* 0xA0 */
+    0x73F7															/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -1322,8 +1322,8 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_AB[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_AC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x73F8, 0x73F9, 0x73FA, 0x73FB, 0x73FC, 0x73FD, 0x73FE, 0x73FF, /* 0x40 */
     0x7400, 0x7401, 0x7402, 0x7404, 0x7407, 0x7408, 0x740B, 0x740C, /* 0x40 */
     0x740D, 0x740E, 0x7411, 0x7412, 0x7413, 0x7414, 0x7415, 0x7416, /* 0x50 */
@@ -1331,12 +1331,12 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_AC[] =
     0x7421, 0x7423, 0x7424, 0x7427, 0x7429, 0x742B, 0x742D, 0x742F, /* 0x60 */
     0x7431, 0x7432, 0x7437, 0x7438, 0x7439, 0x743A, 0x743B, 0x743D, /* 0x60 */
     0x743E, 0x743F, 0x7440, 0x7442, 0x7443, 0x7444, 0x7445, 0x7446, /* 0x70 */
-    0x7447, 0x7448, 0x7449, 0x744A, 0x744B, 0x744C, 0x744D,      0, /* 0x70 */
+    0x7447, 0x7448, 0x7449, 0x744A, 0x744B, 0x744C, 0x744D, 	 0, /* 0x70 */
     0x744E, 0x744F, 0x7450, 0x7451, 0x7452, 0x7453, 0x7454, 0x7456, /* 0x80 */
     0x7458, 0x745D, 0x7460, 0x7461, 0x7462, 0x7463, 0x7464, 0x7465, /* 0x80 */
     0x7466, 0x7467, 0x7468, 0x7469, 0x746A, 0x746B, 0x746C, 0x746E, /* 0x90 */
     0x746F, 0x7471, 0x7472, 0x7473, 0x7474, 0x7475, 0x7478, 0x7479, /* 0x90 */
-    0x747A                                                          /* 0xA0 */
+    0x747A															/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -1344,8 +1344,8 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_AC[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_AD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x747B, 0x747C, 0x747D, 0x747F, 0x7482, 0x7484, 0x7485, 0x7486, /* 0x40 */
     0x7488, 0x7489, 0x748A, 0x748C, 0x748D, 0x748F, 0x7491, 0x7492, /* 0x40 */
     0x7493, 0x7494, 0x7495, 0x7496, 0x7497, 0x7498, 0x7499, 0x749A, /* 0x50 */
@@ -1353,12 +1353,12 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_AD[] =
     0x74A5, 0x74A6, 0x74AA, 0x74AB, 0x74AC, 0x74AD, 0x74AE, 0x74AF, /* 0x60 */
     0x74B0, 0x74B1, 0x74B2, 0x74B3, 0x74B4, 0x74B5, 0x74B6, 0x74B7, /* 0x60 */
     0x74B8, 0x74B9, 0x74BB, 0x74BC, 0x74BD, 0x74BE, 0x74BF, 0x74C0, /* 0x70 */
-    0x74C1, 0x74C2, 0x74C3, 0x74C4, 0x74C5, 0x74C6, 0x74C7,      0, /* 0x70 */
+    0x74C1, 0x74C2, 0x74C3, 0x74C4, 0x74C5, 0x74C6, 0x74C7, 	 0, /* 0x70 */
     0x74C8, 0x74C9, 0x74CA, 0x74CB, 0x74CC, 0x74CD, 0x74CE, 0x74CF, /* 0x80 */
     0x74D0, 0x74D1, 0x74D3, 0x74D4, 0x74D5, 0x74D6, 0x74D7, 0x74D8, /* 0x80 */
     0x74D9, 0x74DA, 0x74DB, 0x74DD, 0x74DF, 0x74E1, 0x74E5, 0x74E7, /* 0x90 */
     0x74E8, 0x74E9, 0x74EA, 0x74EB, 0x74EC, 0x74ED, 0x74F0, 0x74F1, /* 0x90 */
-    0x74F2                                                          /* 0xA0 */
+    0x74F2															/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -1366,8 +1366,8 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_AD[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_AE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x74F3, 0x74F5, 0x74F8, 0x74F9, 0x74FA, 0x74FB, 0x74FC, 0x74FD, /* 0x40 */
     0x74FE, 0x7500, 0x7501, 0x7502, 0x7503, 0x7505, 0x7506, 0x7507, /* 0x40 */
     0x7508, 0x7509, 0x750A, 0x750B, 0x750C, 0x750E, 0x7510, 0x7512, /* 0x50 */
@@ -1375,12 +1375,12 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_AE[] =
     0x7521, 0x7522, 0x7523, 0x7524, 0x7526, 0x7527, 0x752A, 0x752E, /* 0x60 */
     0x7534, 0x7536, 0x7539, 0x753C, 0x753D, 0x753F, 0x7541, 0x7542, /* 0x60 */
     0x7543, 0x7544, 0x7546, 0x7547, 0x7549, 0x754A, 0x754D, 0x7550, /* 0x70 */
-    0x7551, 0x7552, 0x7553, 0x7555, 0x7556, 0x7557, 0x7558,      0, /* 0x70 */
+    0x7551, 0x7552, 0x7553, 0x7555, 0x7556, 0x7557, 0x7558, 	 0, /* 0x70 */
     0x755D, 0x755E, 0x755F, 0x7560, 0x7561, 0x7562, 0x7563, 0x7564, /* 0x80 */
     0x7567, 0x7568, 0x7569, 0x756B, 0x756C, 0x756D, 0x756E, 0x756F, /* 0x80 */
     0x7570, 0x7571, 0x7573, 0x7575, 0x7576, 0x7577, 0x757A, 0x757B, /* 0x90 */
     0x757C, 0x757D, 0x757E, 0x7580, 0x7581, 0x7582, 0x7584, 0x7585, /* 0x90 */
-    0x7587                                                          /* 0xA0 */
+    0x7587															/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -1388,8 +1388,8 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_AE[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_AF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7588, 0x7589, 0x758A, 0x758C, 0x758D, 0x758E, 0x7590, 0x7593, /* 0x40 */
     0x7595, 0x7598, 0x759B, 0x759C, 0x759E, 0x75A2, 0x75A6, 0x75A7, /* 0x40 */
     0x75A8, 0x75A9, 0x75AA, 0x75AD, 0x75B6, 0x75B7, 0x75BA, 0x75BB, /* 0x50 */
@@ -1397,12 +1397,12 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_AF[] =
     0x75D0, 0x75D1, 0x75D3, 0x75D7, 0x75D9, 0x75DA, 0x75DC, 0x75DD, /* 0x60 */
     0x75DF, 0x75E0, 0x75E1, 0x75E5, 0x75E9, 0x75EC, 0x75ED, 0x75EE, /* 0x60 */
     0x75EF, 0x75F2, 0x75F3, 0x75F5, 0x75F6, 0x75F7, 0x75F8, 0x75FA, /* 0x70 */
-    0x75FB, 0x75FD, 0x75FE, 0x7602, 0x7604, 0x7606, 0x7607,      0, /* 0x70 */
+    0x75FB, 0x75FD, 0x75FE, 0x7602, 0x7604, 0x7606, 0x7607, 	 0, /* 0x70 */
     0x7608, 0x7609, 0x760B, 0x760D, 0x760E, 0x760F, 0x7611, 0x7612, /* 0x80 */
     0x7613, 0x7614, 0x7616, 0x761A, 0x761C, 0x761D, 0x761E, 0x7621, /* 0x80 */
     0x7623, 0x7627, 0x7628, 0x762C, 0x762E, 0x762F, 0x7631, 0x7632, /* 0x90 */
     0x7636, 0x7637, 0x7639, 0x763A, 0x763B, 0x763D, 0x7641, 0x7642, /* 0x90 */
-    0x7644                                                          /* 0xA0 */
+    0x7644															/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -1410,8 +1410,8 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_AF[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_B0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7645, 0x7646, 0x7647, 0x7648, 0x7649, 0x764A, 0x764B, 0x764E, /* 0x40 */
     0x764F, 0x7650, 0x7651, 0x7652, 0x7653, 0x7655, 0x7657, 0x7658, /* 0x40 */
     0x7659, 0x765A, 0x765B, 0x765D, 0x765F, 0x7660, 0x7661, 0x7662, /* 0x50 */
@@ -1419,7 +1419,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B0[] =
     0x766D, 0x766E, 0x7670, 0x7671, 0x7672, 0x7673, 0x7674, 0x7675, /* 0x60 */
     0x7676, 0x7677, 0x7679, 0x767A, 0x767C, 0x767F, 0x7680, 0x7681, /* 0x60 */
     0x7683, 0x7685, 0x7689, 0x768A, 0x768C, 0x768D, 0x768F, 0x7690, /* 0x70 */
-    0x7692, 0x7694, 0x7695, 0x7697, 0x7698, 0x769A, 0x769B,      0, /* 0x70 */
+    0x7692, 0x7694, 0x7695, 0x7697, 0x7698, 0x769A, 0x769B, 	 0, /* 0x70 */
     0x769C, 0x769D, 0x769E, 0x769F, 0x76A0, 0x76A1, 0x76A2, 0x76A3, /* 0x80 */
     0x76A5, 0x76A6, 0x76A7, 0x76A8, 0x76A9, 0x76AA, 0x76AB, 0x76AC, /* 0x80 */
     0x76AD, 0x76AF, 0x76B0, 0x76B3, 0x76B5, 0x76B6, 0x76B7, 0x76B8, /* 0x90 */
@@ -1435,15 +1435,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B0[] =
     0x73ED, 0x642C, 0x6273, 0x822C, 0x9881, 0x677F, 0x7248, 0x626E, /* 0xE0 */
     0x62CC, 0x4F34, 0x74E3, 0x534A, 0x529E, 0x7ECA, 0x90A6, 0x5E2E, /* 0xE0 */
     0x6886, 0x699C, 0x8180, 0x7ED1, 0x68D2, 0x78C5, 0x868C, 0x9551, /* 0xF0 */
-    0x508D, 0x8C24, 0x82DE, 0x80DE, 0x5305, 0x8912, 0x5265          /* 0xF0 */
+    0x508D, 0x8C24, 0x82DE, 0x80DE, 0x5305, 0x8912, 0x5265			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_B1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x76C4, 0x76C7, 0x76C9, 0x76CB, 0x76CC, 0x76D3, 0x76D5, 0x76D9, /* 0x40 */
     0x76DA, 0x76DC, 0x76DD, 0x76DE, 0x76E0, 0x76E1, 0x76E2, 0x76E3, /* 0x40 */
     0x76E4, 0x76E6, 0x76E7, 0x76E8, 0x76E9, 0x76EA, 0x76EB, 0x76EC, /* 0x50 */
@@ -1451,7 +1451,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B1[] =
     0x76FD, 0x76FF, 0x7700, 0x7702, 0x7703, 0x7705, 0x7706, 0x770A, /* 0x60 */
     0x770C, 0x770E, 0x770F, 0x7710, 0x7711, 0x7712, 0x7713, 0x7714, /* 0x60 */
     0x7715, 0x7716, 0x7717, 0x7718, 0x771B, 0x771C, 0x771D, 0x771E, /* 0x70 */
-    0x7721, 0x7723, 0x7724, 0x7725, 0x7727, 0x772A, 0x772B,      0, /* 0x70 */
+    0x7721, 0x7723, 0x7724, 0x7725, 0x7727, 0x772A, 0x772B, 	 0, /* 0x70 */
     0x772C, 0x772E, 0x7730, 0x7731, 0x7732, 0x7733, 0x7734, 0x7739, /* 0x80 */
     0x773B, 0x773D, 0x773E, 0x773F, 0x7742, 0x7744, 0x7745, 0x7746, /* 0x80 */
     0x7748, 0x7749, 0x774A, 0x774B, 0x774C, 0x774D, 0x774E, 0x774F, /* 0x90 */
@@ -1467,15 +1467,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B1[] =
     0x7F16, 0x8D2C, 0x6241, 0x4FBF, 0x53D8, 0x535E, 0x8FA8, 0x8FA9, /* 0xE0 */
     0x8FAB, 0x904D, 0x6807, 0x5F6A, 0x8198, 0x8868, 0x9CD6, 0x618B, /* 0xE0 */
     0x522B, 0x762A, 0x5F6C, 0x658C, 0x6FD2, 0x6EE8, 0x5BBE, 0x6448, /* 0xF0 */
-    0x5175, 0x51B0, 0x67C4, 0x4E19, 0x79C9, 0x997C, 0x70B3          /* 0xF0 */
+    0x5175, 0x51B0, 0x67C4, 0x4E19, 0x79C9, 0x997C, 0x70B3			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_B2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x775D, 0x775E, 0x775F, 0x7760, 0x7764, 0x7767, 0x7769, 0x776A, /* 0x40 */
     0x776D, 0x776E, 0x776F, 0x7770, 0x7771, 0x7772, 0x7773, 0x7774, /* 0x40 */
     0x7775, 0x7776, 0x7777, 0x7778, 0x777A, 0x777B, 0x777C, 0x7781, /* 0x50 */
@@ -1483,7 +1483,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B2[] =
     0x778F, 0x7790, 0x7793, 0x7794, 0x7795, 0x7796, 0x7797, 0x7798, /* 0x60 */
     0x7799, 0x779A, 0x779B, 0x779C, 0x779D, 0x779E, 0x77A1, 0x77A3, /* 0x60 */
     0x77A4, 0x77A6, 0x77A8, 0x77AB, 0x77AD, 0x77AE, 0x77AF, 0x77B1, /* 0x70 */
-    0x77B2, 0x77B4, 0x77B6, 0x77B7, 0x77B8, 0x77B9, 0x77BA,      0, /* 0x70 */
+    0x77B2, 0x77B4, 0x77B6, 0x77B7, 0x77B8, 0x77B9, 0x77BA, 	 0, /* 0x70 */
     0x77BC, 0x77BE, 0x77C0, 0x77C1, 0x77C2, 0x77C3, 0x77C4, 0x77C5, /* 0x80 */
     0x77C6, 0x77C7, 0x77C8, 0x77C9, 0x77CA, 0x77CB, 0x77CC, 0x77CE, /* 0x80 */
     0x77CF, 0x77D0, 0x77D1, 0x77D2, 0x77D3, 0x77D4, 0x77D5, 0x77D6, /* 0x90 */
@@ -1499,15 +1499,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B2[] =
     0x4FA7, 0x518C, 0x6D4B, 0x5C42, 0x8E6D, 0x63D2, 0x53C9, 0x832C, /* 0xE0 */
     0x8336, 0x67E5, 0x78B4, 0x643D, 0x5BDF, 0x5C94, 0x5DEE, 0x8BE7, /* 0xE0 */
     0x62C6, 0x67F4, 0x8C7A, 0x6400, 0x63BA, 0x8749, 0x998B, 0x8C17, /* 0xF0 */
-    0x7F20, 0x94F2, 0x4EA7, 0x9610, 0x98A4, 0x660C, 0x7316          /* 0xF0 */
+    0x7F20, 0x94F2, 0x4EA7, 0x9610, 0x98A4, 0x660C, 0x7316			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_B3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x77E6, 0x77E8, 0x77EA, 0x77EF, 0x77F0, 0x77F1, 0x77F2, 0x77F4, /* 0x40 */
     0x77F5, 0x77F7, 0x77F9, 0x77FA, 0x77FB, 0x77FC, 0x7803, 0x7804, /* 0x40 */
     0x7805, 0x7806, 0x7807, 0x7808, 0x780A, 0x780B, 0x780E, 0x780F, /* 0x50 */
@@ -1515,7 +1515,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B3[] =
     0x7822, 0x7824, 0x7828, 0x782A, 0x782B, 0x782E, 0x782F, 0x7831, /* 0x60 */
     0x7832, 0x7833, 0x7835, 0x7836, 0x783D, 0x783F, 0x7841, 0x7842, /* 0x60 */
     0x7843, 0x7844, 0x7846, 0x7848, 0x7849, 0x784A, 0x784B, 0x784D, /* 0x70 */
-    0x784F, 0x7851, 0x7853, 0x7854, 0x7858, 0x7859, 0x785A,      0, /* 0x70 */
+    0x784F, 0x7851, 0x7853, 0x7854, 0x7858, 0x7859, 0x785A, 	 0, /* 0x70 */
     0x785B, 0x785C, 0x785E, 0x785F, 0x7860, 0x7861, 0x7862, 0x7863, /* 0x80 */
     0x7864, 0x7865, 0x7866, 0x7867, 0x7868, 0x7869, 0x786F, 0x7870, /* 0x80 */
     0x7871, 0x7872, 0x7873, 0x7874, 0x7875, 0x7876, 0x7878, 0x7879, /* 0x90 */
@@ -1531,15 +1531,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B3[] =
     0x8D64, 0x7FC5, 0x65A5, 0x70BD, 0x5145, 0x51B2, 0x866B, 0x5D07, /* 0xE0 */
     0x5BA0, 0x62BD, 0x916C, 0x7574, 0x8E0C, 0x7A20, 0x6101, 0x7B79, /* 0xE0 */
     0x4EC7, 0x7EF8, 0x7785, 0x4E11, 0x81ED, 0x521D, 0x51FA, 0x6A71, /* 0xF0 */
-    0x53A8, 0x8E87, 0x9504, 0x96CF, 0x6EC1, 0x9664, 0x695A          /* 0xF0 */
+    0x53A8, 0x8E87, 0x9504, 0x96CF, 0x6EC1, 0x9664, 0x695A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_B4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7884, 0x7885, 0x7886, 0x7888, 0x788A, 0x788B, 0x788F, 0x7890, /* 0x40 */
     0x7892, 0x7894, 0x7895, 0x7896, 0x7899, 0x789D, 0x789E, 0x78A0, /* 0x40 */
     0x78A2, 0x78A4, 0x78A6, 0x78A8, 0x78A9, 0x78AA, 0x78AB, 0x78AC, /* 0x50 */
@@ -1547,7 +1547,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B4[] =
     0x78BB, 0x78BC, 0x78BD, 0x78BF, 0x78C0, 0x78C2, 0x78C3, 0x78C4, /* 0x60 */
     0x78C6, 0x78C7, 0x78C8, 0x78CC, 0x78CD, 0x78CE, 0x78CF, 0x78D1, /* 0x60 */
     0x78D2, 0x78D3, 0x78D6, 0x78D7, 0x78D8, 0x78DA, 0x78DB, 0x78DC, /* 0x70 */
-    0x78DD, 0x78DE, 0x78DF, 0x78E0, 0x78E1, 0x78E2, 0x78E3,      0, /* 0x70 */
+    0x78DD, 0x78DE, 0x78DF, 0x78E0, 0x78E1, 0x78E2, 0x78E3, 	 0, /* 0x70 */
     0x78E4, 0x78E5, 0x78E6, 0x78E7, 0x78E9, 0x78EA, 0x78EB, 0x78ED, /* 0x80 */
     0x78EE, 0x78EF, 0x78F0, 0x78F1, 0x78F3, 0x78F5, 0x78F6, 0x78F8, /* 0x80 */
     0x78F9, 0x78FB, 0x78FC, 0x78FD, 0x78FE, 0x78FF, 0x7900, 0x7902, /* 0x90 */
@@ -1563,15 +1563,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B4[] =
     0x8106, 0x7601, 0x7CB9, 0x6DEC, 0x7FE0, 0x6751, 0x5B58, 0x5BF8, /* 0xE0 */
     0x78CB, 0x64AE, 0x6413, 0x63AA, 0x632B, 0x9519, 0x642D, 0x8FBE, /* 0xE0 */
     0x7B54, 0x7629, 0x6253, 0x5927, 0x5446, 0x6B79, 0x50A3, 0x6234, /* 0xF0 */
-    0x5E26, 0x6B86, 0x4EE3, 0x8D37, 0x888B, 0x5F85, 0x902E          /* 0xF0 */
+    0x5E26, 0x6B86, 0x4EE3, 0x8D37, 0x888B, 0x5F85, 0x902E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_B5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x790D, 0x790E, 0x790F, 0x7910, 0x7911, 0x7912, 0x7914, 0x7915, /* 0x40 */
     0x7916, 0x7917, 0x7918, 0x7919, 0x791A, 0x791B, 0x791C, 0x791D, /* 0x40 */
     0x791F, 0x7920, 0x7921, 0x7922, 0x7923, 0x7925, 0x7926, 0x7927, /* 0x50 */
@@ -1579,7 +1579,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B5[] =
     0x7930, 0x7931, 0x7932, 0x7933, 0x7935, 0x7936, 0x7937, 0x7938, /* 0x60 */
     0x7939, 0x793D, 0x793F, 0x7942, 0x7943, 0x7944, 0x7945, 0x7947, /* 0x60 */
     0x794A, 0x794B, 0x794C, 0x794D, 0x794E, 0x794F, 0x7950, 0x7951, /* 0x70 */
-    0x7952, 0x7954, 0x7955, 0x7958, 0x7959, 0x7961, 0x7963,      0, /* 0x70 */
+    0x7952, 0x7954, 0x7955, 0x7958, 0x7959, 0x7961, 0x7963, 	 0, /* 0x70 */
     0x7964, 0x7966, 0x7969, 0x796A, 0x796B, 0x796C, 0x796E, 0x7970, /* 0x80 */
     0x7971, 0x7972, 0x7973, 0x7974, 0x7975, 0x7976, 0x7979, 0x797B, /* 0x80 */
     0x797C, 0x797D, 0x797E, 0x797F, 0x7982, 0x7983, 0x7986, 0x7987, /* 0x90 */
@@ -1595,15 +1595,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B5[] =
     0x6382, 0x6EC7, 0x7898, 0x70B9, 0x5178, 0x975B, 0x57AB, 0x7535, /* 0xE0 */
     0x4F43, 0x7538, 0x5E97, 0x60E6, 0x5960, 0x6DC0, 0x6BBF, 0x7889, /* 0xE0 */
     0x53FC, 0x96D5, 0x51CB, 0x5201, 0x6389, 0x540A, 0x9493, 0x8C03, /* 0xF0 */
-    0x8DCC, 0x7239, 0x789F, 0x8776, 0x8FED, 0x8C0D, 0x53E0          /* 0xF0 */
+    0x8DCC, 0x7239, 0x789F, 0x8776, 0x8FED, 0x8C0D, 0x53E0			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_B6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7993, 0x7994, 0x7995, 0x7996, 0x7997, 0x7998, 0x7999, 0x799B, /* 0x40 */
     0x799C, 0x799D, 0x799E, 0x799F, 0x79A0, 0x79A1, 0x79A2, 0x79A3, /* 0x40 */
     0x79A4, 0x79A5, 0x79A6, 0x79A8, 0x79A9, 0x79AA, 0x79AB, 0x79AC, /* 0x50 */
@@ -1611,7 +1611,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B6[] =
     0x79B6, 0x79B7, 0x79B8, 0x79BC, 0x79BF, 0x79C2, 0x79C4, 0x79C5, /* 0x60 */
     0x79C7, 0x79C8, 0x79CA, 0x79CC, 0x79CE, 0x79CF, 0x79D0, 0x79D3, /* 0x60 */
     0x79D4, 0x79D6, 0x79D7, 0x79D9, 0x79DA, 0x79DB, 0x79DC, 0x79DD, /* 0x70 */
-    0x79DE, 0x79E0, 0x79E1, 0x79E2, 0x79E5, 0x79E8, 0x79EA,      0, /* 0x70 */
+    0x79DE, 0x79E0, 0x79E1, 0x79E2, 0x79E5, 0x79E8, 0x79EA, 	 0, /* 0x70 */
     0x79EC, 0x79EE, 0x79F1, 0x79F2, 0x79F3, 0x79F4, 0x79F5, 0x79F6, /* 0x80 */
     0x79F7, 0x79F9, 0x79FA, 0x79FC, 0x79FE, 0x79FF, 0x7A01, 0x7A04, /* 0x80 */
     0x7A05, 0x7A07, 0x7A08, 0x7A09, 0x7A0A, 0x7A0C, 0x7A0F, 0x7A10, /* 0x90 */
@@ -1627,15 +1627,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B6[] =
     0x591A, 0x593A, 0x579B, 0x8EB2, 0x6735, 0x8DFA, 0x8235, 0x5241, /* 0xE0 */
     0x60F0, 0x5815, 0x86FE, 0x5CE8, 0x9E45, 0x4FC4, 0x989D, 0x8BB9, /* 0xE0 */
     0x5A25, 0x6076, 0x5384, 0x627C, 0x904F, 0x9102, 0x997F, 0x6069, /* 0xF0 */
-    0x800C, 0x513F, 0x8033, 0x5C14, 0x9975, 0x6D31, 0x4E8C          /* 0xF0 */
+    0x800C, 0x513F, 0x8033, 0x5C14, 0x9975, 0x6D31, 0x4E8C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_B7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7A1D, 0x7A1F, 0x7A21, 0x7A22, 0x7A24, 0x7A25, 0x7A26, 0x7A27, /* 0x40 */
     0x7A28, 0x7A29, 0x7A2A, 0x7A2B, 0x7A2C, 0x7A2D, 0x7A2E, 0x7A2F, /* 0x40 */
     0x7A30, 0x7A31, 0x7A32, 0x7A34, 0x7A35, 0x7A36, 0x7A38, 0x7A3A, /* 0x50 */
@@ -1643,7 +1643,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B7[] =
     0x7A48, 0x7A49, 0x7A4A, 0x7A4B, 0x7A4C, 0x7A4D, 0x7A4E, 0x7A4F, /* 0x60 */
     0x7A50, 0x7A52, 0x7A53, 0x7A54, 0x7A55, 0x7A56, 0x7A58, 0x7A59, /* 0x60 */
     0x7A5A, 0x7A5B, 0x7A5C, 0x7A5D, 0x7A5E, 0x7A5F, 0x7A60, 0x7A61, /* 0x70 */
-    0x7A62, 0x7A63, 0x7A64, 0x7A65, 0x7A66, 0x7A67, 0x7A68,      0, /* 0x70 */
+    0x7A62, 0x7A63, 0x7A64, 0x7A65, 0x7A66, 0x7A67, 0x7A68, 	 0, /* 0x70 */
     0x7A69, 0x7A6A, 0x7A6B, 0x7A6C, 0x7A6D, 0x7A6E, 0x7A6F, 0x7A71, /* 0x80 */
     0x7A72, 0x7A73, 0x7A75, 0x7A7B, 0x7A7C, 0x7A7D, 0x7A7E, 0x7A82, /* 0x80 */
     0x7A85, 0x7A87, 0x7A89, 0x7A8A, 0x7A8B, 0x7A8C, 0x7A8E, 0x7A8F, /* 0x90 */
@@ -1659,15 +1659,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B7[] =
     0x7CAA, 0x4E30, 0x5C01, 0x67AB, 0x8702, 0x5CF0, 0x950B, 0x98CE, /* 0xE0 */
     0x75AF, 0x70FD, 0x9022, 0x51AF, 0x7F1D, 0x8BBD, 0x5949, 0x51E4, /* 0xE0 */
     0x4F5B, 0x5426, 0x592B, 0x6577, 0x80A4, 0x5B75, 0x6276, 0x62C2, /* 0xF0 */
-    0x8F90, 0x5E45, 0x6C1F, 0x7B26, 0x4F0F, 0x4FD8, 0x670D          /* 0xF0 */
+    0x8F90, 0x5E45, 0x6C1F, 0x7B26, 0x4F0F, 0x4FD8, 0x670D			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_B8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7AA3, 0x7AA4, 0x7AA7, 0x7AA9, 0x7AAA, 0x7AAB, 0x7AAE, 0x7AAF, /* 0x40 */
     0x7AB0, 0x7AB1, 0x7AB2, 0x7AB4, 0x7AB5, 0x7AB6, 0x7AB7, 0x7AB8, /* 0x40 */
     0x7AB9, 0x7ABA, 0x7ABB, 0x7ABC, 0x7ABD, 0x7ABE, 0x7AC0, 0x7AC1, /* 0x50 */
@@ -1675,7 +1675,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B8[] =
     0x7ACA, 0x7ACC, 0x7ACD, 0x7ACE, 0x7ACF, 0x7AD0, 0x7AD1, 0x7AD2, /* 0x60 */
     0x7AD3, 0x7AD4, 0x7AD5, 0x7AD7, 0x7AD8, 0x7ADA, 0x7ADB, 0x7ADC, /* 0x60 */
     0x7ADD, 0x7AE1, 0x7AE2, 0x7AE4, 0x7AE7, 0x7AE8, 0x7AE9, 0x7AEA, /* 0x70 */
-    0x7AEB, 0x7AEC, 0x7AEE, 0x7AF0, 0x7AF1, 0x7AF2, 0x7AF3,      0, /* 0x70 */
+    0x7AEB, 0x7AEC, 0x7AEE, 0x7AF0, 0x7AF1, 0x7AF2, 0x7AF3, 	 0, /* 0x70 */
     0x7AF4, 0x7AF5, 0x7AF6, 0x7AF7, 0x7AF8, 0x7AFB, 0x7AFC, 0x7AFE, /* 0x80 */
     0x7B00, 0x7B01, 0x7B02, 0x7B05, 0x7B07, 0x7B09, 0x7B0C, 0x7B0D, /* 0x80 */
     0x7B0E, 0x7B10, 0x7B12, 0x7B13, 0x7B16, 0x7B17, 0x7B18, 0x7B1A, /* 0x90 */
@@ -1691,15 +1691,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B8[] =
     0x818F, 0x7F94, 0x7CD5, 0x641E, 0x9550, 0x7A3F, 0x544A, 0x54E5, /* 0xE0 */
     0x6B4C, 0x6401, 0x6208, 0x9E3D, 0x80F3, 0x7599, 0x5272, 0x9769, /* 0xE0 */
     0x845B, 0x683C, 0x86E4, 0x9601, 0x9694, 0x94EC, 0x4E2A, 0x5404, /* 0xF0 */
-    0x7ED9, 0x6839, 0x8DDF, 0x8015, 0x66F4, 0x5E9A, 0x7FB9          /* 0xF0 */
+    0x7ED9, 0x6839, 0x8DDF, 0x8015, 0x66F4, 0x5E9A, 0x7FB9			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_B9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7B2F, 0x7B30, 0x7B32, 0x7B34, 0x7B35, 0x7B36, 0x7B37, 0x7B39, /* 0x40 */
     0x7B3B, 0x7B3D, 0x7B3F, 0x7B40, 0x7B41, 0x7B42, 0x7B43, 0x7B44, /* 0x40 */
     0x7B46, 0x7B48, 0x7B4A, 0x7B4D, 0x7B4E, 0x7B53, 0x7B55, 0x7B57, /* 0x50 */
@@ -1707,7 +1707,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B9[] =
     0x7B66, 0x7B67, 0x7B68, 0x7B69, 0x7B6A, 0x7B6B, 0x7B6C, 0x7B6D, /* 0x60 */
     0x7B6F, 0x7B70, 0x7B73, 0x7B74, 0x7B76, 0x7B78, 0x7B7A, 0x7B7C, /* 0x60 */
     0x7B7D, 0x7B7F, 0x7B81, 0x7B82, 0x7B83, 0x7B84, 0x7B86, 0x7B87, /* 0x70 */
-    0x7B88, 0x7B89, 0x7B8A, 0x7B8B, 0x7B8C, 0x7B8E, 0x7B8F,      0, /* 0x70 */
+    0x7B88, 0x7B89, 0x7B8A, 0x7B8B, 0x7B8C, 0x7B8E, 0x7B8F, 	 0, /* 0x70 */
     0x7B91, 0x7B92, 0x7B93, 0x7B96, 0x7B98, 0x7B99, 0x7B9A, 0x7B9B, /* 0x80 */
     0x7B9E, 0x7B9F, 0x7BA0, 0x7BA3, 0x7BA4, 0x7BA5, 0x7BAE, 0x7BAF, /* 0x80 */
     0x7BB0, 0x7BB2, 0x7BB3, 0x7BB5, 0x7BB6, 0x7BB7, 0x7BB9, 0x7BBA, /* 0x90 */
@@ -1723,15 +1723,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_B9[] =
     0x704C, 0x8D2F, 0x5149, 0x5E7F, 0x901B, 0x7470, 0x89C4, 0x572D, /* 0xE0 */
     0x7845, 0x5F52, 0x9F9F, 0x95FA, 0x8F68, 0x9B3C, 0x8BE1, 0x7678, /* 0xE0 */
     0x6842, 0x67DC, 0x8DEA, 0x8D35, 0x523D, 0x8F8A, 0x6EDA, 0x68CD, /* 0xF0 */
-    0x9505, 0x90ED, 0x56FD, 0x679C, 0x88F9, 0x8FC7, 0x54C8          /* 0xF0 */
+    0x9505, 0x90ED, 0x56FD, 0x679C, 0x88F9, 0x8FC7, 0x54C8			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_BA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7BC5, 0x7BC8, 0x7BC9, 0x7BCA, 0x7BCB, 0x7BCD, 0x7BCE, 0x7BCF, /* 0x40 */
     0x7BD0, 0x7BD2, 0x7BD4, 0x7BD5, 0x7BD6, 0x7BD7, 0x7BD8, 0x7BDB, /* 0x40 */
     0x7BDC, 0x7BDE, 0x7BDF, 0x7BE0, 0x7BE2, 0x7BE3, 0x7BE4, 0x7BE7, /* 0x50 */
@@ -1739,7 +1739,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_BA[] =
     0x7BF3, 0x7BF4, 0x7BF5, 0x7BF6, 0x7BF8, 0x7BF9, 0x7BFA, 0x7BFB, /* 0x60 */
     0x7BFD, 0x7BFF, 0x7C00, 0x7C01, 0x7C02, 0x7C03, 0x7C04, 0x7C05, /* 0x60 */
     0x7C06, 0x7C08, 0x7C09, 0x7C0A, 0x7C0D, 0x7C0E, 0x7C10, 0x7C11, /* 0x70 */
-    0x7C12, 0x7C13, 0x7C14, 0x7C15, 0x7C17, 0x7C18, 0x7C19,      0, /* 0x70 */
+    0x7C12, 0x7C13, 0x7C14, 0x7C15, 0x7C17, 0x7C18, 0x7C19, 	 0, /* 0x70 */
     0x7C1A, 0x7C1B, 0x7C1C, 0x7C1D, 0x7C1E, 0x7C20, 0x7C21, 0x7C22, /* 0x80 */
     0x7C23, 0x7C24, 0x7C25, 0x7C28, 0x7C29, 0x7C2B, 0x7C2C, 0x7C2D, /* 0x80 */
     0x7C2E, 0x7C2F, 0x7C30, 0x7C31, 0x7C32, 0x7C33, 0x7C34, 0x7C35, /* 0x90 */
@@ -1755,15 +1755,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_BA[] =
     0x4EA8, 0x6A2A, 0x8861, 0x6052, 0x8F70, 0x54C4, 0x70D8, 0x8679, /* 0xE0 */
     0x9E3F, 0x6D2A, 0x5B8F, 0x5F18, 0x7EA2, 0x5589, 0x4FAF, 0x7334, /* 0xE0 */
     0x543C, 0x539A, 0x5019, 0x540E, 0x547C, 0x4E4E, 0x5FFD, 0x745A, /* 0xF0 */
-    0x58F6, 0x846B, 0x80E1, 0x8774, 0x72D0, 0x7CCA, 0x6E56          /* 0xF0 */
+    0x58F6, 0x846B, 0x80E1, 0x8774, 0x72D0, 0x7CCA, 0x6E56			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_BB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7C43, 0x7C44, 0x7C45, 0x7C46, 0x7C47, 0x7C48, 0x7C49, 0x7C4A, /* 0x40 */
     0x7C4B, 0x7C4C, 0x7C4E, 0x7C4F, 0x7C50, 0x7C51, 0x7C52, 0x7C53, /* 0x40 */
     0x7C54, 0x7C55, 0x7C56, 0x7C57, 0x7C58, 0x7C59, 0x7C5A, 0x7C5B, /* 0x50 */
@@ -1771,7 +1771,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_BB[] =
     0x7C64, 0x7C65, 0x7C66, 0x7C67, 0x7C68, 0x7C69, 0x7C6A, 0x7C6B, /* 0x60 */
     0x7C6C, 0x7C6D, 0x7C6E, 0x7C6F, 0x7C70, 0x7C71, 0x7C72, 0x7C75, /* 0x60 */
     0x7C76, 0x7C77, 0x7C78, 0x7C79, 0x7C7A, 0x7C7E, 0x7C7F, 0x7C80, /* 0x70 */
-    0x7C81, 0x7C82, 0x7C83, 0x7C84, 0x7C85, 0x7C86, 0x7C87,      0, /* 0x70 */
+    0x7C81, 0x7C82, 0x7C83, 0x7C84, 0x7C85, 0x7C86, 0x7C87, 	 0, /* 0x70 */
     0x7C88, 0x7C8A, 0x7C8B, 0x7C8C, 0x7C8D, 0x7C8E, 0x7C8F, 0x7C90, /* 0x80 */
     0x7C93, 0x7C94, 0x7C96, 0x7C99, 0x7C9A, 0x7C9B, 0x7CA0, 0x7CA1, /* 0x80 */
     0x7CA3, 0x7CA6, 0x7CA7, 0x7CA8, 0x7CA9, 0x7CAB, 0x7CAC, 0x7CAD, /* 0x90 */
@@ -1787,15 +1787,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_BB[] =
     0x79FD, 0x4F1A, 0x70E9, 0x6C47, 0x8BB3, 0x8BF2, 0x7ED8, 0x8364, /* 0xE0 */
     0x660F, 0x5A5A, 0x9B42, 0x6D51, 0x6DF7, 0x8C41, 0x6D3B, 0x4F19, /* 0xE0 */
     0x706B, 0x83B7, 0x6216, 0x60D1, 0x970D, 0x8D27, 0x7978, 0x51FB, /* 0xF0 */
-    0x573E, 0x57FA, 0x673A, 0x7578, 0x7A3D, 0x79EF, 0x7B95          /* 0xF0 */
+    0x573E, 0x57FA, 0x673A, 0x7578, 0x7A3D, 0x79EF, 0x7B95			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_BC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7CBF, 0x7CC0, 0x7CC2, 0x7CC3, 0x7CC4, 0x7CC6, 0x7CC9, 0x7CCB, /* 0x40 */
     0x7CCE, 0x7CCF, 0x7CD0, 0x7CD1, 0x7CD2, 0x7CD3, 0x7CD4, 0x7CD8, /* 0x40 */
     0x7CDA, 0x7CDB, 0x7CDD, 0x7CDE, 0x7CE1, 0x7CE2, 0x7CE3, 0x7CE4, /* 0x50 */
@@ -1803,7 +1803,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_BC[] =
     0x7CEE, 0x7CF0, 0x7CF1, 0x7CF2, 0x7CF3, 0x7CF4, 0x7CF5, 0x7CF6, /* 0x60 */
     0x7CF7, 0x7CF9, 0x7CFA, 0x7CFC, 0x7CFD, 0x7CFE, 0x7CFF, 0x7D00, /* 0x60 */
     0x7D01, 0x7D02, 0x7D03, 0x7D04, 0x7D05, 0x7D06, 0x7D07, 0x7D08, /* 0x70 */
-    0x7D09, 0x7D0B, 0x7D0C, 0x7D0D, 0x7D0E, 0x7D0F, 0x7D10,      0, /* 0x70 */
+    0x7D09, 0x7D0B, 0x7D0C, 0x7D0D, 0x7D0E, 0x7D0F, 0x7D10, 	 0, /* 0x70 */
     0x7D11, 0x7D12, 0x7D13, 0x7D14, 0x7D15, 0x7D16, 0x7D17, 0x7D18, /* 0x80 */
     0x7D19, 0x7D1A, 0x7D1B, 0x7D1C, 0x7D1D, 0x7D1E, 0x7D1F, 0x7D21, /* 0x80 */
     0x7D23, 0x7D24, 0x7D25, 0x7D26, 0x7D28, 0x7D29, 0x7D2A, 0x7D2C, /* 0x90 */
@@ -1819,15 +1819,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_BC[] =
     0x76D1, 0x575A, 0x5C16, 0x7B3A, 0x95F4, 0x714E, 0x517C, 0x80A9, /* 0xE0 */
     0x8270, 0x5978, 0x7F04, 0x8327, 0x68C0, 0x67EC, 0x78B1, 0x7877, /* 0xE0 */
     0x62E3, 0x6361, 0x7B80, 0x4FED, 0x526A, 0x51CF, 0x8350, 0x69DB, /* 0xF0 */
-    0x9274, 0x8DF5, 0x8D31, 0x89C1, 0x952E, 0x7BAD, 0x4EF6          /* 0xF0 */
+    0x9274, 0x8DF5, 0x8D31, 0x89C1, 0x952E, 0x7BAD, 0x4EF6			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_BD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7D37, 0x7D38, 0x7D39, 0x7D3A, 0x7D3B, 0x7D3C, 0x7D3D, 0x7D3E, /* 0x40 */
     0x7D3F, 0x7D40, 0x7D41, 0x7D42, 0x7D43, 0x7D44, 0x7D45, 0x7D46, /* 0x40 */
     0x7D47, 0x7D48, 0x7D49, 0x7D4A, 0x7D4B, 0x7D4C, 0x7D4D, 0x7D4E, /* 0x50 */
@@ -1835,7 +1835,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_BD[] =
     0x7D57, 0x7D58, 0x7D59, 0x7D5A, 0x7D5B, 0x7D5C, 0x7D5D, 0x7D5E, /* 0x60 */
     0x7D5F, 0x7D60, 0x7D61, 0x7D62, 0x7D63, 0x7D64, 0x7D65, 0x7D66, /* 0x60 */
     0x7D67, 0x7D68, 0x7D69, 0x7D6A, 0x7D6B, 0x7D6C, 0x7D6D, 0x7D6F, /* 0x70 */
-    0x7D70, 0x7D71, 0x7D72, 0x7D73, 0x7D74, 0x7D75, 0x7D76,      0, /* 0x70 */
+    0x7D70, 0x7D71, 0x7D72, 0x7D73, 0x7D74, 0x7D75, 0x7D76, 	 0, /* 0x70 */
     0x7D78, 0x7D79, 0x7D7A, 0x7D7B, 0x7D7C, 0x7D7D, 0x7D7E, 0x7D7F, /* 0x80 */
     0x7D80, 0x7D81, 0x7D82, 0x7D83, 0x7D84, 0x7D85, 0x7D86, 0x7D87, /* 0x80 */
     0x7D88, 0x7D89, 0x7D8A, 0x7D8B, 0x7D8C, 0x7D8D, 0x7D8E, 0x7D8F, /* 0x90 */
@@ -1851,15 +1851,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_BD[] =
     0x6D01, 0x7ED3, 0x89E3, 0x59D0, 0x6212, 0x85C9, 0x82A5, 0x754C, /* 0xE0 */
     0x501F, 0x4ECB, 0x75A5, 0x8BEB, 0x5C4A, 0x5DFE, 0x7B4B, 0x65A4, /* 0xE0 */
     0x91D1, 0x4ECA, 0x6D25, 0x895F, 0x7D27, 0x9526, 0x4EC5, 0x8C28, /* 0xF0 */
-    0x8FDB, 0x9773, 0x664B, 0x7981, 0x8FD1, 0x70EC, 0x6D78          /* 0xF0 */
+    0x8FDB, 0x9773, 0x664B, 0x7981, 0x8FD1, 0x70EC, 0x6D78			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_BE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7D99, 0x7D9A, 0x7D9B, 0x7D9C, 0x7D9D, 0x7D9E, 0x7D9F, 0x7DA0, /* 0x40 */
     0x7DA1, 0x7DA2, 0x7DA3, 0x7DA4, 0x7DA5, 0x7DA7, 0x7DA8, 0x7DA9, /* 0x40 */
     0x7DAA, 0x7DAB, 0x7DAC, 0x7DAD, 0x7DAF, 0x7DB0, 0x7DB1, 0x7DB2, /* 0x50 */
@@ -1867,7 +1867,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_BE[] =
     0x7DBB, 0x7DBC, 0x7DBD, 0x7DBE, 0x7DBF, 0x7DC0, 0x7DC1, 0x7DC2, /* 0x60 */
     0x7DC3, 0x7DC4, 0x7DC5, 0x7DC6, 0x7DC7, 0x7DC8, 0x7DC9, 0x7DCA, /* 0x60 */
     0x7DCB, 0x7DCC, 0x7DCD, 0x7DCE, 0x7DCF, 0x7DD0, 0x7DD1, 0x7DD2, /* 0x70 */
-    0x7DD3, 0x7DD4, 0x7DD5, 0x7DD6, 0x7DD7, 0x7DD8, 0x7DD9,      0, /* 0x70 */
+    0x7DD3, 0x7DD4, 0x7DD5, 0x7DD6, 0x7DD7, 0x7DD8, 0x7DD9, 	 0, /* 0x70 */
     0x7DDA, 0x7DDB, 0x7DDC, 0x7DDD, 0x7DDE, 0x7DDF, 0x7DE0, 0x7DE1, /* 0x80 */
     0x7DE2, 0x7DE3, 0x7DE4, 0x7DE5, 0x7DE6, 0x7DE7, 0x7DE8, 0x7DE9, /* 0x80 */
     0x7DEA, 0x7DEB, 0x7DEC, 0x7DED, 0x7DEE, 0x7DEF, 0x7DF0, 0x7DF1, /* 0x90 */
@@ -1883,15 +1883,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_BE[] =
     0x8DDD, 0x8E1E, 0x952F, 0x4FF1, 0x53E5, 0x60E7, 0x70AC, 0x5267, /* 0xE0 */
     0x6350, 0x9E43, 0x5A1F, 0x5026, 0x7737, 0x5377, 0x7EE2, 0x6485, /* 0xE0 */
     0x652B, 0x6289, 0x6398, 0x5014, 0x7235, 0x89C9, 0x51B3, 0x8BC0, /* 0xF0 */
-    0x7EDD, 0x5747, 0x83CC, 0x94A7, 0x519B, 0x541B, 0x5CFB          /* 0xF0 */
+    0x7EDD, 0x5747, 0x83CC, 0x94A7, 0x519B, 0x541B, 0x5CFB			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_BF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7DFB, 0x7DFC, 0x7DFD, 0x7DFE, 0x7DFF, 0x7E00, 0x7E01, 0x7E02, /* 0x40 */
     0x7E03, 0x7E04, 0x7E05, 0x7E06, 0x7E07, 0x7E08, 0x7E09, 0x7E0A, /* 0x40 */
     0x7E0B, 0x7E0C, 0x7E0D, 0x7E0E, 0x7E0F, 0x7E10, 0x7E11, 0x7E12, /* 0x50 */
@@ -1899,7 +1899,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_BF[] =
     0x7E1B, 0x7E1C, 0x7E1D, 0x7E1E, 0x7E1F, 0x7E20, 0x7E21, 0x7E22, /* 0x60 */
     0x7E23, 0x7E24, 0x7E25, 0x7E26, 0x7E27, 0x7E28, 0x7E29, 0x7E2A, /* 0x60 */
     0x7E2B, 0x7E2C, 0x7E2D, 0x7E2E, 0x7E2F, 0x7E30, 0x7E31, 0x7E32, /* 0x70 */
-    0x7E33, 0x7E34, 0x7E35, 0x7E36, 0x7E37, 0x7E38, 0x7E39,      0, /* 0x70 */
+    0x7E33, 0x7E34, 0x7E35, 0x7E36, 0x7E37, 0x7E38, 0x7E39, 	 0, /* 0x70 */
     0x7E3A, 0x7E3C, 0x7E3D, 0x7E3E, 0x7E3F, 0x7E40, 0x7E42, 0x7E43, /* 0x80 */
     0x7E44, 0x7E45, 0x7E46, 0x7E48, 0x7E49, 0x7E4A, 0x7E4B, 0x7E4C, /* 0x80 */
     0x7E4D, 0x7E4E, 0x7E4F, 0x7E50, 0x7E51, 0x7E52, 0x7E53, 0x7E54, /* 0x90 */
@@ -1915,15 +1915,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_BF[] =
     0x82E6, 0x9177, 0x5E93, 0x88E4, 0x5938, 0x57AE, 0x630E, 0x8DE8, /* 0xE0 */
     0x80EF, 0x5757, 0x7B77, 0x4FA9, 0x5FEB, 0x5BBD, 0x6B3E, 0x5321, /* 0xE0 */
     0x7B50, 0x72C2, 0x6846, 0x77FF, 0x7736, 0x65F7, 0x51B5, 0x4E8F, /* 0xF0 */
-    0x76D4, 0x5CBF, 0x7AA5, 0x8475, 0x594E, 0x9B41, 0x5080          /* 0xF0 */
+    0x76D4, 0x5CBF, 0x7AA5, 0x8475, 0x594E, 0x9B41, 0x5080			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_C0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7E5E, 0x7E5F, 0x7E60, 0x7E61, 0x7E62, 0x7E63, 0x7E64, 0x7E65, /* 0x40 */
     0x7E66, 0x7E67, 0x7E68, 0x7E69, 0x7E6A, 0x7E6B, 0x7E6C, 0x7E6D, /* 0x40 */
     0x7E6E, 0x7E6F, 0x7E70, 0x7E71, 0x7E72, 0x7E73, 0x7E74, 0x7E75, /* 0x50 */
@@ -1931,7 +1931,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C0[] =
     0x7E7E, 0x7E7F, 0x7E80, 0x7E81, 0x7E83, 0x7E84, 0x7E85, 0x7E86, /* 0x60 */
     0x7E87, 0x7E88, 0x7E89, 0x7E8A, 0x7E8B, 0x7E8C, 0x7E8D, 0x7E8E, /* 0x60 */
     0x7E8F, 0x7E90, 0x7E91, 0x7E92, 0x7E93, 0x7E94, 0x7E95, 0x7E96, /* 0x70 */
-    0x7E97, 0x7E98, 0x7E99, 0x7E9A, 0x7E9C, 0x7E9D, 0x7E9E,      0, /* 0x70 */
+    0x7E97, 0x7E98, 0x7E99, 0x7E9A, 0x7E9C, 0x7E9D, 0x7E9E, 	 0, /* 0x70 */
     0x7EAE, 0x7EB4, 0x7EBB, 0x7EBC, 0x7ED6, 0x7EE4, 0x7EEC, 0x7EF9, /* 0x80 */
     0x7F0A, 0x7F10, 0x7F1E, 0x7F37, 0x7F39, 0x7F3B, 0x7F3C, 0x7F3D, /* 0x80 */
     0x7F3E, 0x7F3F, 0x7F40, 0x7F41, 0x7F43, 0x7F46, 0x7F47, 0x7F48, /* 0x90 */
@@ -1947,15 +1947,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C0[] =
     0x7C7B, 0x6CEA, 0x68F1, 0x695E, 0x51B7, 0x5398, 0x68A8, 0x7281, /* 0xE0 */
     0x9ECE, 0x7BF1, 0x72F8, 0x79BB, 0x6F13, 0x7406, 0x674E, 0x91CC, /* 0xE0 */
     0x9CA4, 0x793C, 0x8389, 0x8354, 0x540F, 0x6817, 0x4E3D, 0x5389, /* 0xF0 */
-    0x52B1, 0x783E, 0x5386, 0x5229, 0x5088, 0x4F8B, 0x4FD0          /* 0xF0 */
+    0x52B1, 0x783E, 0x5386, 0x5229, 0x5088, 0x4F8B, 0x4FD0			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_C1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7F56, 0x7F59, 0x7F5B, 0x7F5C, 0x7F5D, 0x7F5E, 0x7F60, 0x7F63, /* 0x40 */
     0x7F64, 0x7F65, 0x7F66, 0x7F67, 0x7F6B, 0x7F6C, 0x7F6D, 0x7F6F, /* 0x40 */
     0x7F70, 0x7F73, 0x7F75, 0x7F76, 0x7F77, 0x7F78, 0x7F7A, 0x7F7B, /* 0x50 */
@@ -1963,7 +1963,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C1[] =
     0x7F86, 0x7F87, 0x7F88, 0x7F89, 0x7F8B, 0x7F8D, 0x7F8F, 0x7F90, /* 0x60 */
     0x7F91, 0x7F92, 0x7F93, 0x7F95, 0x7F96, 0x7F97, 0x7F98, 0x7F99, /* 0x60 */
     0x7F9B, 0x7F9C, 0x7FA0, 0x7FA2, 0x7FA3, 0x7FA5, 0x7FA6, 0x7FA8, /* 0x70 */
-    0x7FA9, 0x7FAA, 0x7FAB, 0x7FAC, 0x7FAD, 0x7FAE, 0x7FB1,      0, /* 0x70 */
+    0x7FA9, 0x7FAA, 0x7FAB, 0x7FAC, 0x7FAD, 0x7FAE, 0x7FB1, 	 0, /* 0x70 */
     0x7FB3, 0x7FB4, 0x7FB5, 0x7FB6, 0x7FB7, 0x7FBA, 0x7FBB, 0x7FBE, /* 0x80 */
     0x7FC0, 0x7FC2, 0x7FC3, 0x7FC4, 0x7FC6, 0x7FC7, 0x7FC8, 0x7FC9, /* 0x80 */
     0x7FCB, 0x7FCD, 0x7FCF, 0x7FD0, 0x7FD1, 0x7FD2, 0x7FD3, 0x7FD6, /* 0x90 */
@@ -1979,15 +1979,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C1[] =
     0x62CE, 0x73B2, 0x83F1, 0x96F6, 0x9F84, 0x94C3, 0x4F36, 0x7F9A, /* 0xE0 */
     0x51CC, 0x7075, 0x9675, 0x5CAD, 0x9886, 0x53E6, 0x4EE4, 0x6E9C, /* 0xE0 */
     0x7409, 0x69B4, 0x786B, 0x998F, 0x7559, 0x5218, 0x7624, 0x6D41, /* 0xF0 */
-    0x67F3, 0x516D, 0x9F99, 0x804B, 0x5499, 0x7B3C, 0x7ABF          /* 0xF0 */
+    0x67F3, 0x516D, 0x9F99, 0x804B, 0x5499, 0x7B3C, 0x7ABF			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_C2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7FE4, 0x7FE7, 0x7FE8, 0x7FEA, 0x7FEB, 0x7FEC, 0x7FED, 0x7FEF, /* 0x40 */
     0x7FF2, 0x7FF4, 0x7FF5, 0x7FF6, 0x7FF7, 0x7FF8, 0x7FF9, 0x7FFA, /* 0x40 */
     0x7FFD, 0x7FFE, 0x7FFF, 0x8002, 0x8007, 0x8008, 0x8009, 0x800A, /* 0x50 */
@@ -1995,7 +1995,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C2[] =
     0x801F, 0x8021, 0x8023, 0x8024, 0x802B, 0x802C, 0x802D, 0x802E, /* 0x60 */
     0x802F, 0x8030, 0x8032, 0x8034, 0x8039, 0x803A, 0x803C, 0x803E, /* 0x60 */
     0x8040, 0x8041, 0x8044, 0x8045, 0x8047, 0x8048, 0x8049, 0x804E, /* 0x70 */
-    0x804F, 0x8050, 0x8051, 0x8053, 0x8055, 0x8056, 0x8057,      0, /* 0x70 */
+    0x804F, 0x8050, 0x8051, 0x8053, 0x8055, 0x8056, 0x8057, 	 0, /* 0x70 */
     0x8059, 0x805B, 0x805C, 0x805D, 0x805E, 0x805F, 0x8060, 0x8061, /* 0x80 */
     0x8062, 0x8063, 0x8064, 0x8065, 0x8066, 0x8067, 0x8068, 0x806B, /* 0x80 */
     0x806C, 0x806D, 0x806E, 0x806F, 0x8070, 0x8072, 0x8073, 0x8074, /* 0x90 */
@@ -2011,15 +2011,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C2[] =
     0x9523, 0x7BA9, 0x9AA1, 0x88F8, 0x843D, 0x6D1B, 0x9A86, 0x7EDC, /* 0xE0 */
     0x5988, 0x9EBB, 0x739B, 0x7801, 0x8682, 0x9A6C, 0x9A82, 0x561B, /* 0xE0 */
     0x5417, 0x57CB, 0x4E70, 0x9EA6, 0x5356, 0x8FC8, 0x8109, 0x7792, /* 0xF0 */
-    0x9992, 0x86EE, 0x6EE1, 0x8513, 0x66FC, 0x6162, 0x6F2B          /* 0xF0 */
+    0x9992, 0x86EE, 0x6EE1, 0x8513, 0x66FC, 0x6162, 0x6F2B			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_C3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x807E, 0x8081, 0x8082, 0x8085, 0x8088, 0x808A, 0x808D, 0x808E, /* 0x40 */
     0x808F, 0x8090, 0x8091, 0x8092, 0x8094, 0x8095, 0x8097, 0x8099, /* 0x40 */
     0x809E, 0x80A3, 0x80A6, 0x80A7, 0x80A8, 0x80AC, 0x80B0, 0x80B3, /* 0x50 */
@@ -2027,7 +2027,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C3[] =
     0x80C9, 0x80CA, 0x80CB, 0x80CF, 0x80D0, 0x80D1, 0x80D2, 0x80D3, /* 0x60 */
     0x80D4, 0x80D5, 0x80D8, 0x80DF, 0x80E0, 0x80E2, 0x80E3, 0x80E6, /* 0x60 */
     0x80EE, 0x80F5, 0x80F7, 0x80F9, 0x80FB, 0x80FE, 0x80FF, 0x8100, /* 0x70 */
-    0x8101, 0x8103, 0x8104, 0x8105, 0x8107, 0x8108, 0x810B,      0, /* 0x70 */
+    0x8101, 0x8103, 0x8104, 0x8105, 0x8107, 0x8108, 0x810B, 	 0, /* 0x70 */
     0x810C, 0x8115, 0x8117, 0x8119, 0x811B, 0x811C, 0x811D, 0x811F, /* 0x80 */
     0x8120, 0x8121, 0x8122, 0x8123, 0x8124, 0x8125, 0x8126, 0x8127, /* 0x80 */
     0x8128, 0x8129, 0x812A, 0x812B, 0x812D, 0x812E, 0x8130, 0x8133, /* 0x90 */
@@ -2043,15 +2043,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C3[] =
     0x7EF5, 0x5195, 0x514D, 0x52C9, 0x5A29, 0x7F05, 0x9762, 0x82D7, /* 0xE0 */
     0x63CF, 0x7784, 0x85D0, 0x79D2, 0x6E3A, 0x5E99, 0x5999, 0x8511, /* 0xE0 */
     0x706D, 0x6C11, 0x62BF, 0x76BF, 0x654F, 0x60AF, 0x95FD, 0x660E, /* 0xF0 */
-    0x879F, 0x9E23, 0x94ED, 0x540D, 0x547D, 0x8C2C, 0x6478          /* 0xF0 */
+    0x879F, 0x9E23, 0x94ED, 0x540D, 0x547D, 0x8C2C, 0x6478			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_C4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8140, 0x8141, 0x8142, 0x8143, 0x8144, 0x8145, 0x8147, 0x8149, /* 0x40 */
     0x814D, 0x814E, 0x814F, 0x8152, 0x8156, 0x8157, 0x8158, 0x815B, /* 0x40 */
     0x815C, 0x815D, 0x815E, 0x815F, 0x8161, 0x8162, 0x8163, 0x8164, /* 0x50 */
@@ -2059,7 +2059,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C4[] =
     0x8175, 0x8176, 0x8177, 0x8178, 0x8181, 0x8183, 0x8184, 0x8185, /* 0x60 */
     0x8186, 0x8187, 0x8189, 0x818B, 0x818C, 0x818D, 0x818E, 0x8190, /* 0x60 */
     0x8192, 0x8193, 0x8194, 0x8195, 0x8196, 0x8197, 0x8199, 0x819A, /* 0x70 */
-    0x819E, 0x819F, 0x81A0, 0x81A1, 0x81A2, 0x81A4, 0x81A5,      0, /* 0x70 */
+    0x819E, 0x819F, 0x81A0, 0x81A1, 0x81A2, 0x81A4, 0x81A5, 	 0, /* 0x70 */
     0x81A7, 0x81A9, 0x81AB, 0x81AC, 0x81AD, 0x81AE, 0x81AF, 0x81B0, /* 0x80 */
     0x81B1, 0x81B2, 0x81B4, 0x81B5, 0x81B6, 0x81B7, 0x81B8, 0x81B9, /* 0x80 */
     0x81BC, 0x81BD, 0x81BE, 0x81BF, 0x81C4, 0x81C5, 0x81C7, 0x81C8, /* 0x90 */
@@ -2075,15 +2075,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C4[] =
     0x6CE5, 0x5C3C, 0x62DF, 0x4F60, 0x533F, 0x817B, 0x9006, 0x6EBA, /* 0xE0 */
     0x852B, 0x62C8, 0x5E74, 0x78BE, 0x64B5, 0x637B, 0x5FF5, 0x5A18, /* 0xE0 */
     0x917F, 0x9E1F, 0x5C3F, 0x634F, 0x8042, 0x5B7D, 0x556E, 0x954A, /* 0xF0 */
-    0x954D, 0x6D85, 0x60A8, 0x67E0, 0x72DE, 0x51DD, 0x5B81          /* 0xF0 */
+    0x954D, 0x6D85, 0x60A8, 0x67E0, 0x72DE, 0x51DD, 0x5B81			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_C5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x81D4, 0x81D5, 0x81D6, 0x81D7, 0x81D8, 0x81D9, 0x81DA, 0x81DB, /* 0x40 */
     0x81DC, 0x81DD, 0x81DE, 0x81DF, 0x81E0, 0x81E1, 0x81E2, 0x81E4, /* 0x40 */
     0x81E5, 0x81E6, 0x81E8, 0x81E9, 0x81EB, 0x81EE, 0x81EF, 0x81F0, /* 0x50 */
@@ -2091,7 +2091,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C5[] =
     0x81FD, 0x81FF, 0x8203, 0x8207, 0x8208, 0x8209, 0x820A, 0x820B, /* 0x60 */
     0x820E, 0x820F, 0x8211, 0x8213, 0x8215, 0x8216, 0x8217, 0x8218, /* 0x60 */
     0x8219, 0x821A, 0x821D, 0x8220, 0x8224, 0x8225, 0x8226, 0x8227, /* 0x70 */
-    0x8229, 0x822E, 0x8232, 0x823A, 0x823C, 0x823D, 0x823F,      0, /* 0x70 */
+    0x8229, 0x822E, 0x8232, 0x823A, 0x823C, 0x823D, 0x823F, 	 0, /* 0x70 */
     0x8240, 0x8241, 0x8242, 0x8243, 0x8245, 0x8246, 0x8248, 0x824A, /* 0x80 */
     0x824C, 0x824D, 0x824E, 0x8250, 0x8251, 0x8252, 0x8253, 0x8254, /* 0x80 */
     0x8255, 0x8256, 0x8257, 0x8259, 0x825B, 0x825C, 0x825D, 0x825E, /* 0x90 */
@@ -2107,15 +2107,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C5[] =
     0x57F9, 0x88F4, 0x8D54, 0x966A, 0x914D, 0x4F69, 0x6C9B, 0x55B7, /* 0xE0 */
     0x76C6, 0x7830, 0x62A8, 0x70F9, 0x6F8E, 0x5F6D, 0x84EC, 0x68DA, /* 0xE0 */
     0x787C, 0x7BF7, 0x81A8, 0x670B, 0x9E4F, 0x6367, 0x78B0, 0x576F, /* 0xF0 */
-    0x7812, 0x9739, 0x6279, 0x62AB, 0x5288, 0x7435, 0x6BD7          /* 0xF0 */
+    0x7812, 0x9739, 0x6279, 0x62AB, 0x5288, 0x7435, 0x6BD7			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_C6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x826A, 0x826B, 0x826C, 0x826D, 0x8271, 0x8275, 0x8276, 0x8277, /* 0x40 */
     0x8278, 0x827B, 0x827C, 0x8280, 0x8281, 0x8283, 0x8285, 0x8286, /* 0x40 */
     0x8287, 0x8289, 0x828C, 0x8290, 0x8293, 0x8294, 0x8295, 0x8296, /* 0x50 */
@@ -2123,7 +2123,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C6[] =
     0x82B5, 0x82B6, 0x82BA, 0x82BB, 0x82BC, 0x82BF, 0x82C0, 0x82C2, /* 0x60 */
     0x82C3, 0x82C5, 0x82C6, 0x82C9, 0x82D0, 0x82D6, 0x82D9, 0x82DA, /* 0x60 */
     0x82DD, 0x82E2, 0x82E7, 0x82E8, 0x82E9, 0x82EA, 0x82EC, 0x82ED, /* 0x70 */
-    0x82EE, 0x82F0, 0x82F2, 0x82F3, 0x82F5, 0x82F6, 0x82F8,      0, /* 0x70 */
+    0x82EE, 0x82F0, 0x82F2, 0x82F3, 0x82F5, 0x82F6, 0x82F8, 	 0, /* 0x70 */
     0x82FA, 0x82FC, 0x82FD, 0x82FE, 0x82FF, 0x8300, 0x830A, 0x830B, /* 0x80 */
     0x830D, 0x8310, 0x8312, 0x8313, 0x8316, 0x8318, 0x8319, 0x831D, /* 0x80 */
     0x831E, 0x831F, 0x8320, 0x8321, 0x8322, 0x8323, 0x8324, 0x8325, /* 0x90 */
@@ -2139,15 +2139,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C6[] =
     0x51C4, 0x6F06, 0x67D2, 0x6C8F, 0x5176, 0x68CB, 0x5947, 0x6B67, /* 0xE0 */
     0x7566, 0x5D0E, 0x8110, 0x9F50, 0x65D7, 0x7948, 0x7941, 0x9A91, /* 0xE0 */
     0x8D77, 0x5C82, 0x4E5E, 0x4F01, 0x542F, 0x5951, 0x780C, 0x5668, /* 0xF0 */
-    0x6C14, 0x8FC4, 0x5F03, 0x6C7D, 0x6CE3, 0x8BAB, 0x6390          /* 0xF0 */
+    0x6C14, 0x8FC4, 0x5F03, 0x6C7D, 0x6CE3, 0x8BAB, 0x6390			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_C7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x833E, 0x833F, 0x8341, 0x8342, 0x8344, 0x8345, 0x8348, 0x834A, /* 0x40 */
     0x834B, 0x834C, 0x834D, 0x834E, 0x8353, 0x8355, 0x8356, 0x8357, /* 0x40 */
     0x8358, 0x8359, 0x835D, 0x8362, 0x8370, 0x8371, 0x8372, 0x8373, /* 0x50 */
@@ -2155,7 +2155,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C7[] =
     0x8381, 0x8382, 0x8383, 0x8384, 0x8387, 0x8388, 0x838A, 0x838B, /* 0x60 */
     0x838C, 0x838D, 0x838F, 0x8390, 0x8391, 0x8394, 0x8395, 0x8396, /* 0x60 */
     0x8397, 0x8399, 0x839A, 0x839D, 0x839F, 0x83A1, 0x83A2, 0x83A3, /* 0x70 */
-    0x83A4, 0x83A5, 0x83A6, 0x83A7, 0x83AC, 0x83AD, 0x83AE,      0, /* 0x70 */
+    0x83A4, 0x83A5, 0x83A6, 0x83A7, 0x83AC, 0x83AD, 0x83AE, 	 0, /* 0x70 */
     0x83AF, 0x83B5, 0x83BB, 0x83BE, 0x83BF, 0x83C2, 0x83C3, 0x83C4, /* 0x80 */
     0x83C6, 0x83C8, 0x83C9, 0x83CB, 0x83CD, 0x83CE, 0x83D0, 0x83D1, /* 0x80 */
     0x83D2, 0x83D3, 0x83D5, 0x83D7, 0x83D9, 0x83DA, 0x83DB, 0x83DE, /* 0x90 */
@@ -2171,15 +2171,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C7[] =
     0x9752, 0x8F7B, 0x6C22, 0x503E, 0x537F, 0x6E05, 0x64CE, 0x6674, /* 0xE0 */
     0x6C30, 0x60C5, 0x9877, 0x8BF7, 0x5E86, 0x743C, 0x7A77, 0x79CB, /* 0xE0 */
     0x4E18, 0x90B1, 0x7403, 0x6C42, 0x56DA, 0x914B, 0x6CC5, 0x8D8B, /* 0xF0 */
-    0x533A, 0x86C6, 0x66F2, 0x8EAF, 0x5C48, 0x9A71, 0x6E20          /* 0xF0 */
+    0x533A, 0x86C6, 0x66F2, 0x8EAF, 0x5C48, 0x9A71, 0x6E20			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_C8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x83EE, 0x83EF, 0x83F3, 0x83F4, 0x83F5, 0x83F6, 0x83F7, 0x83FA, /* 0x40 */
     0x83FB, 0x83FC, 0x83FE, 0x83FF, 0x8400, 0x8402, 0x8405, 0x8407, /* 0x40 */
     0x8408, 0x8409, 0x840A, 0x8410, 0x8412, 0x8413, 0x8414, 0x8415, /* 0x50 */
@@ -2187,7 +2187,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C8[] =
     0x8421, 0x8422, 0x8423, 0x8429, 0x842A, 0x842B, 0x842C, 0x842D, /* 0x60 */
     0x842E, 0x842F, 0x8430, 0x8432, 0x8433, 0x8434, 0x8435, 0x8436, /* 0x60 */
     0x8437, 0x8439, 0x843A, 0x843B, 0x843E, 0x843F, 0x8440, 0x8441, /* 0x70 */
-    0x8442, 0x8443, 0x8444, 0x8445, 0x8447, 0x8448, 0x8449,      0, /* 0x70 */
+    0x8442, 0x8443, 0x8444, 0x8445, 0x8447, 0x8448, 0x8449, 	 0, /* 0x70 */
     0x844A, 0x844B, 0x844C, 0x844D, 0x844E, 0x844F, 0x8450, 0x8452, /* 0x80 */
     0x8453, 0x8454, 0x8455, 0x8456, 0x8458, 0x845D, 0x845E, 0x845F, /* 0x80 */
     0x8460, 0x8462, 0x8464, 0x8465, 0x8466, 0x8467, 0x8468, 0x846A, /* 0x90 */
@@ -2203,15 +2203,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C8[] =
     0x63C9, 0x67D4, 0x8089, 0x8339, 0x8815, 0x5112, 0x5B7A, 0x5982, /* 0xE0 */
     0x8FB1, 0x4E73, 0x6C5D, 0x5165, 0x8925, 0x8F6F, 0x962E, 0x854A, /* 0xE0 */
     0x745E, 0x9510, 0x95F0, 0x6DA6, 0x82E5, 0x5F31, 0x6492, 0x6D12, /* 0xF0 */
-    0x8428, 0x816E, 0x9CC3, 0x585E, 0x8D5B, 0x4E09, 0x53C1          /* 0xF0 */
+    0x8428, 0x816E, 0x9CC3, 0x585E, 0x8D5B, 0x4E09, 0x53C1			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_C9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x847D, 0x847E, 0x847F, 0x8480, 0x8481, 0x8483, 0x8484, 0x8485, /* 0x40 */
     0x8486, 0x848A, 0x848D, 0x848F, 0x8490, 0x8491, 0x8492, 0x8493, /* 0x40 */
     0x8494, 0x8495, 0x8496, 0x8498, 0x849A, 0x849B, 0x849D, 0x849E, /* 0x50 */
@@ -2219,7 +2219,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C9[] =
     0x84A8, 0x84A9, 0x84AA, 0x84AB, 0x84AC, 0x84AD, 0x84AE, 0x84B0, /* 0x60 */
     0x84B1, 0x84B3, 0x84B5, 0x84B6, 0x84B7, 0x84BB, 0x84BC, 0x84BE, /* 0x60 */
     0x84C0, 0x84C2, 0x84C3, 0x84C5, 0x84C6, 0x84C7, 0x84C8, 0x84CB, /* 0x70 */
-    0x84CC, 0x84CE, 0x84CF, 0x84D2, 0x84D4, 0x84D5, 0x84D7,      0, /* 0x70 */
+    0x84CC, 0x84CE, 0x84CF, 0x84D2, 0x84D4, 0x84D5, 0x84D7, 	 0, /* 0x70 */
     0x84D8, 0x84D9, 0x84DA, 0x84DB, 0x84DC, 0x84DE, 0x84E1, 0x84E2, /* 0x80 */
     0x84E4, 0x84E7, 0x84E8, 0x84E9, 0x84EA, 0x84EB, 0x84ED, 0x84EE, /* 0x80 */
     0x84EF, 0x84F1, 0x84F2, 0x84F3, 0x84F4, 0x84F5, 0x84F6, 0x84F7, /* 0x90 */
@@ -2235,15 +2235,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_C9[] =
     0x820C, 0x820D, 0x8D66, 0x6444, 0x5C04, 0x6151, 0x6D89, 0x793E, /* 0xE0 */
     0x8BBE, 0x7837, 0x7533, 0x547B, 0x4F38, 0x8EAB, 0x6DF1, 0x5A20, /* 0xE0 */
     0x7EC5, 0x795E, 0x6C88, 0x5BA1, 0x5A76, 0x751A, 0x80BE, 0x614E, /* 0xF0 */
-    0x6E17, 0x58F0, 0x751F, 0x7525, 0x7272, 0x5347, 0x7EF3          /* 0xF0 */
+    0x6E17, 0x58F0, 0x751F, 0x7525, 0x7272, 0x5347, 0x7EF3			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_CA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8503, 0x8504, 0x8505, 0x8506, 0x8507, 0x8508, 0x8509, 0x850A, /* 0x40 */
     0x850B, 0x850D, 0x850E, 0x850F, 0x8510, 0x8512, 0x8514, 0x8515, /* 0x40 */
     0x8516, 0x8518, 0x8519, 0x851B, 0x851C, 0x851D, 0x851E, 0x8520, /* 0x50 */
@@ -2251,7 +2251,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_CA[] =
     0x852A, 0x852D, 0x852E, 0x852F, 0x8530, 0x8531, 0x8532, 0x8533, /* 0x60 */
     0x8534, 0x8535, 0x8536, 0x853E, 0x853F, 0x8540, 0x8541, 0x8542, /* 0x60 */
     0x8544, 0x8545, 0x8546, 0x8547, 0x854B, 0x854C, 0x854D, 0x854E, /* 0x70 */
-    0x854F, 0x8550, 0x8551, 0x8552, 0x8553, 0x8554, 0x8555,      0, /* 0x70 */
+    0x854F, 0x8550, 0x8551, 0x8552, 0x8553, 0x8554, 0x8555, 	 0, /* 0x70 */
     0x8557, 0x8558, 0x855A, 0x855B, 0x855C, 0x855D, 0x855F, 0x8560, /* 0x80 */
     0x8561, 0x8562, 0x8563, 0x8565, 0x8566, 0x8567, 0x8569, 0x856A, /* 0x80 */
     0x856B, 0x856C, 0x856D, 0x856E, 0x856F, 0x8570, 0x8571, 0x8573, /* 0x90 */
@@ -2267,15 +2267,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_CA[] =
     0x67A2, 0x68B3, 0x6B8A, 0x6292, 0x8F93, 0x53D4, 0x8212, 0x6DD1, /* 0xE0 */
     0x758F, 0x4E66, 0x8D4E, 0x5B70, 0x719F, 0x85AF, 0x6691, 0x66D9, /* 0xE0 */
     0x7F72, 0x8700, 0x9ECD, 0x9F20, 0x5C5E, 0x672F, 0x8FF0, 0x6811, /* 0xF0 */
-    0x675F, 0x620D, 0x7AD6, 0x5885, 0x5EB6, 0x6570, 0x6F31          /* 0xF0 */
+    0x675F, 0x620D, 0x7AD6, 0x5885, 0x5EB6, 0x6570, 0x6F31			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_CB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8582, 0x8583, 0x8586, 0x8588, 0x8589, 0x858A, 0x858B, 0x858C, /* 0x40 */
     0x858D, 0x858E, 0x8590, 0x8591, 0x8592, 0x8593, 0x8594, 0x8595, /* 0x40 */
     0x8596, 0x8597, 0x8598, 0x8599, 0x859A, 0x859D, 0x859E, 0x859F, /* 0x50 */
@@ -2283,7 +2283,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_CB[] =
     0x85AB, 0x85AC, 0x85AD, 0x85B1, 0x85B2, 0x85B3, 0x85B4, 0x85B5, /* 0x60 */
     0x85B6, 0x85B8, 0x85BA, 0x85BB, 0x85BC, 0x85BD, 0x85BE, 0x85BF, /* 0x60 */
     0x85C0, 0x85C2, 0x85C3, 0x85C4, 0x85C5, 0x85C6, 0x85C7, 0x85C8, /* 0x70 */
-    0x85CA, 0x85CB, 0x85CC, 0x85CD, 0x85CE, 0x85D1, 0x85D2,      0, /* 0x70 */
+    0x85CA, 0x85CB, 0x85CC, 0x85CD, 0x85CE, 0x85D1, 0x85D2, 	 0, /* 0x70 */
     0x85D4, 0x85D6, 0x85D7, 0x85D8, 0x85D9, 0x85DA, 0x85DB, 0x85DD, /* 0x80 */
     0x85DE, 0x85DF, 0x85E0, 0x85E1, 0x85E2, 0x85E3, 0x85E5, 0x85E6, /* 0x80 */
     0x85E7, 0x85E8, 0x85EA, 0x85EB, 0x85EC, 0x85ED, 0x85EE, 0x85EF, /* 0x90 */
@@ -2299,15 +2299,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_CB[] =
     0x8083, 0x9178, 0x849C, 0x7B97, 0x867D, 0x968B, 0x968F, 0x7EE5, /* 0xE0 */
     0x9AD3, 0x788E, 0x5C81, 0x7A57, 0x9042, 0x96A7, 0x795F, 0x5B59, /* 0xE0 */
     0x635F, 0x7B0B, 0x84D1, 0x68AD, 0x5506, 0x7F29, 0x7410, 0x7D22, /* 0xF0 */
-    0x9501, 0x6240, 0x584C, 0x4ED6, 0x5B83, 0x5979, 0x5854          /* 0xF0 */
+    0x9501, 0x6240, 0x584C, 0x4ED6, 0x5B83, 0x5979, 0x5854			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_CC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x85F9, 0x85FA, 0x85FC, 0x85FD, 0x85FE, 0x8600, 0x8601, 0x8602, /* 0x40 */
     0x8603, 0x8604, 0x8606, 0x8607, 0x8608, 0x8609, 0x860A, 0x860B, /* 0x40 */
     0x860C, 0x860D, 0x860E, 0x860F, 0x8610, 0x8612, 0x8613, 0x8614, /* 0x50 */
@@ -2315,7 +2315,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_CC[] =
     0x861E, 0x861F, 0x8620, 0x8621, 0x8622, 0x8623, 0x8624, 0x8625, /* 0x60 */
     0x8626, 0x8628, 0x862A, 0x862B, 0x862C, 0x862D, 0x862E, 0x862F, /* 0x60 */
     0x8630, 0x8631, 0x8632, 0x8633, 0x8634, 0x8635, 0x8636, 0x8637, /* 0x70 */
-    0x8639, 0x863A, 0x863B, 0x863D, 0x863E, 0x863F, 0x8640,      0, /* 0x70 */
+    0x8639, 0x863A, 0x863B, 0x863D, 0x863E, 0x863F, 0x8640, 	 0, /* 0x70 */
     0x8641, 0x8642, 0x8643, 0x8644, 0x8645, 0x8646, 0x8647, 0x8648, /* 0x80 */
     0x8649, 0x864A, 0x864B, 0x864C, 0x8652, 0x8653, 0x8655, 0x8656, /* 0x80 */
     0x8657, 0x8658, 0x8659, 0x865B, 0x865C, 0x865D, 0x865F, 0x8660, /* 0x90 */
@@ -2331,15 +2331,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_CC[] =
     0x9511, 0x63D0, 0x9898, 0x8E44, 0x557C, 0x4F53, 0x66FF, 0x568F, /* 0xE0 */
     0x60D5, 0x6D95, 0x5243, 0x5C49, 0x5929, 0x6DFB, 0x586B, 0x7530, /* 0xE0 */
     0x751C, 0x606C, 0x8214, 0x8146, 0x6311, 0x6761, 0x8FE2, 0x773A, /* 0xF0 */
-    0x8DF3, 0x8D34, 0x94C1, 0x5E16, 0x5385, 0x542C, 0x70C3          /* 0xF0 */
+    0x8DF3, 0x8D34, 0x94C1, 0x5E16, 0x5385, 0x542C, 0x70C3			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_CD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x866D, 0x866F, 0x8670, 0x8672, 0x8673, 0x8674, 0x8675, 0x8676, /* 0x40 */
     0x8677, 0x8678, 0x8683, 0x8684, 0x8685, 0x8686, 0x8687, 0x8688, /* 0x40 */
     0x8689, 0x868E, 0x868F, 0x8690, 0x8691, 0x8692, 0x8694, 0x8696, /* 0x50 */
@@ -2347,7 +2347,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_CD[] =
     0x86A1, 0x86A2, 0x86A5, 0x86A6, 0x86AB, 0x86AD, 0x86AE, 0x86B2, /* 0x60 */
     0x86B3, 0x86B7, 0x86B8, 0x86B9, 0x86BB, 0x86BC, 0x86BD, 0x86BE, /* 0x60 */
     0x86BF, 0x86C1, 0x86C2, 0x86C3, 0x86C5, 0x86C8, 0x86CC, 0x86CD, /* 0x70 */
-    0x86D2, 0x86D3, 0x86D5, 0x86D6, 0x86D7, 0x86DA, 0x86DC,      0, /* 0x70 */
+    0x86D2, 0x86D3, 0x86D5, 0x86D6, 0x86D7, 0x86DA, 0x86DC, 	 0, /* 0x70 */
     0x86DD, 0x86E0, 0x86E1, 0x86E2, 0x86E3, 0x86E5, 0x86E6, 0x86E7, /* 0x80 */
     0x86E8, 0x86EA, 0x86EB, 0x86EC, 0x86EF, 0x86F5, 0x86F6, 0x86F7, /* 0x80 */
     0x86FA, 0x86FB, 0x86FC, 0x86FD, 0x86FF, 0x8701, 0x8704, 0x8705, /* 0x90 */
@@ -2363,15 +2363,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_CD[] =
     0x889C, 0x6B6A, 0x5916, 0x8C4C, 0x5F2F, 0x6E7E, 0x73A9, 0x987D, /* 0xE0 */
     0x4E38, 0x70F7, 0x5B8C, 0x7897, 0x633D, 0x665A, 0x7696, 0x60CB, /* 0xE0 */
     0x5B9B, 0x5A49, 0x4E07, 0x8155, 0x6C6A, 0x738B, 0x4EA1, 0x6789, /* 0xF0 */
-    0x7F51, 0x5F80, 0x65FA, 0x671B, 0x5FD8, 0x5984, 0x5A01          /* 0xF0 */
+    0x7F51, 0x5F80, 0x65FA, 0x671B, 0x5FD8, 0x5984, 0x5A01			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_CE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8719, 0x871B, 0x871D, 0x871F, 0x8720, 0x8724, 0x8726, 0x8727, /* 0x40 */
     0x8728, 0x872A, 0x872B, 0x872C, 0x872D, 0x872F, 0x8730, 0x8732, /* 0x40 */
     0x8733, 0x8735, 0x8736, 0x8738, 0x8739, 0x873A, 0x873C, 0x873D, /* 0x50 */
@@ -2379,7 +2379,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_CE[] =
     0x874B, 0x874D, 0x874F, 0x8750, 0x8751, 0x8752, 0x8754, 0x8755, /* 0x60 */
     0x8756, 0x8758, 0x875A, 0x875B, 0x875C, 0x875D, 0x875E, 0x875F, /* 0x60 */
     0x8761, 0x8762, 0x8766, 0x8767, 0x8768, 0x8769, 0x876A, 0x876B, /* 0x70 */
-    0x876C, 0x876D, 0x876F, 0x8771, 0x8772, 0x8773, 0x8775,      0, /* 0x70 */
+    0x876C, 0x876D, 0x876F, 0x8771, 0x8772, 0x8773, 0x8775, 	 0, /* 0x70 */
     0x8777, 0x8778, 0x8779, 0x877A, 0x877F, 0x8780, 0x8781, 0x8784, /* 0x80 */
     0x8786, 0x8787, 0x8789, 0x878A, 0x878C, 0x878E, 0x878F, 0x8790, /* 0x80 */
     0x8791, 0x8792, 0x8794, 0x8795, 0x8796, 0x8798, 0x8799, 0x879A, /* 0x90 */
@@ -2395,15 +2395,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_CE[] =
     0x68A7, 0x543E, 0x5434, 0x6BCB, 0x6B66, 0x4E94, 0x6342, 0x5348, /* 0xE0 */
     0x821E, 0x4F0D, 0x4FAE, 0x575E, 0x620A, 0x96FE, 0x6664, 0x7269, /* 0xE0 */
     0x52FF, 0x52A1, 0x609F, 0x8BEF, 0x6614, 0x7199, 0x6790, 0x897F, /* 0xF0 */
-    0x7852, 0x77FD, 0x6670, 0x563B, 0x5438, 0x9521, 0x727A          /* 0xF0 */
+    0x7852, 0x77FD, 0x6670, 0x563B, 0x5438, 0x9521, 0x727A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_CF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x87A5, 0x87A6, 0x87A7, 0x87A9, 0x87AA, 0x87AE, 0x87B0, 0x87B1, /* 0x40 */
     0x87B2, 0x87B4, 0x87B6, 0x87B7, 0x87B8, 0x87B9, 0x87BB, 0x87BC, /* 0x40 */
     0x87BE, 0x87BF, 0x87C1, 0x87C2, 0x87C3, 0x87C4, 0x87C5, 0x87C7, /* 0x50 */
@@ -2411,7 +2411,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_CF[] =
     0x87D5, 0x87D6, 0x87D7, 0x87D8, 0x87D9, 0x87DA, 0x87DC, 0x87DD, /* 0x60 */
     0x87DE, 0x87DF, 0x87E1, 0x87E2, 0x87E3, 0x87E4, 0x87E6, 0x87E7, /* 0x60 */
     0x87E8, 0x87E9, 0x87EB, 0x87EC, 0x87ED, 0x87EF, 0x87F0, 0x87F1, /* 0x70 */
-    0x87F2, 0x87F3, 0x87F4, 0x87F5, 0x87F6, 0x87F7, 0x87F8,      0, /* 0x70 */
+    0x87F2, 0x87F3, 0x87F4, 0x87F5, 0x87F6, 0x87F7, 0x87F8, 	 0, /* 0x70 */
     0x87FA, 0x87FB, 0x87FC, 0x87FD, 0x87FF, 0x8800, 0x8801, 0x8802, /* 0x80 */
     0x8804, 0x8805, 0x8806, 0x8807, 0x8808, 0x8809, 0x880B, 0x880C, /* 0x80 */
     0x880D, 0x880E, 0x880F, 0x8810, 0x8811, 0x8812, 0x8814, 0x8817, /* 0x90 */
@@ -2427,15 +2427,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_CF[] =
     0x76F8, 0x53A2, 0x9576, 0x9999, 0x7BB1, 0x8944, 0x6E58, 0x4E61, /* 0xE0 */
     0x7FD4, 0x7965, 0x8BE6, 0x60F3, 0x54CD, 0x4EAB, 0x9879, 0x5DF7, /* 0xE0 */
     0x6A61, 0x50CF, 0x5411, 0x8C61, 0x8427, 0x785D, 0x9704, 0x524A, /* 0xF0 */
-    0x54EE, 0x56A3, 0x9500, 0x6D88, 0x5BB5, 0x6DC6, 0x6653          /* 0xF0 */
+    0x54EE, 0x56A3, 0x9500, 0x6D88, 0x5BB5, 0x6DC6, 0x6653			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_D0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8824, 0x8825, 0x8826, 0x8827, 0x8828, 0x8829, 0x882A, 0x882B, /* 0x40 */
     0x882C, 0x882D, 0x882E, 0x882F, 0x8830, 0x8831, 0x8833, 0x8834, /* 0x40 */
     0x8835, 0x8836, 0x8837, 0x8838, 0x883A, 0x883B, 0x883D, 0x883E, /* 0x50 */
@@ -2443,7 +2443,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D0[] =
     0x884A, 0x884B, 0x884E, 0x884F, 0x8850, 0x8851, 0x8852, 0x8853, /* 0x60 */
     0x8855, 0x8856, 0x8858, 0x885A, 0x885B, 0x885C, 0x885D, 0x885E, /* 0x60 */
     0x885F, 0x8860, 0x8866, 0x8867, 0x886A, 0x886D, 0x886F, 0x8871, /* 0x70 */
-    0x8873, 0x8874, 0x8875, 0x8876, 0x8878, 0x8879, 0x887A,      0, /* 0x70 */
+    0x8873, 0x8874, 0x8875, 0x8876, 0x8878, 0x8879, 0x887A, 	 0, /* 0x70 */
     0x887B, 0x887C, 0x8880, 0x8883, 0x8886, 0x8887, 0x8889, 0x888A, /* 0x80 */
     0x888C, 0x888E, 0x888F, 0x8890, 0x8891, 0x8893, 0x8894, 0x8895, /* 0x80 */
     0x8897, 0x8898, 0x8899, 0x889A, 0x889B, 0x889D, 0x889E, 0x889F, /* 0x90 */
@@ -2459,15 +2459,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D0[] =
     0x673D, 0x55C5, 0x9508, 0x79C0, 0x8896, 0x7EE3, 0x589F, 0x620C, /* 0xE0 */
     0x9700, 0x865A, 0x5618, 0x987B, 0x5F90, 0x8BB8, 0x84C4, 0x9157, /* 0xE0 */
     0x53D9, 0x65ED, 0x5E8F, 0x755C, 0x6064, 0x7D6E, 0x5A7F, 0x7EEA, /* 0xF0 */
-    0x7EED, 0x8F69, 0x55A7, 0x5BA3, 0x60AC, 0x65CB, 0x7384          /* 0xF0 */
+    0x7EED, 0x8F69, 0x55A7, 0x5BA3, 0x60AC, 0x65CB, 0x7384			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_D1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x88AC, 0x88AE, 0x88AF, 0x88B0, 0x88B2, 0x88B3, 0x88B4, 0x88B5, /* 0x40 */
     0x88B6, 0x88B8, 0x88B9, 0x88BA, 0x88BB, 0x88BD, 0x88BE, 0x88BF, /* 0x40 */
     0x88C0, 0x88C3, 0x88C4, 0x88C7, 0x88C8, 0x88CA, 0x88CB, 0x88CC, /* 0x50 */
@@ -2475,7 +2475,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D1[] =
     0x88DB, 0x88DC, 0x88DD, 0x88DE, 0x88E0, 0x88E1, 0x88E6, 0x88E7, /* 0x60 */
     0x88E9, 0x88EA, 0x88EB, 0x88EC, 0x88ED, 0x88EE, 0x88EF, 0x88F2, /* 0x60 */
     0x88F5, 0x88F6, 0x88F7, 0x88FA, 0x88FB, 0x88FD, 0x88FF, 0x8900, /* 0x70 */
-    0x8901, 0x8903, 0x8904, 0x8905, 0x8906, 0x8907, 0x8908,      0, /* 0x70 */
+    0x8901, 0x8903, 0x8904, 0x8905, 0x8906, 0x8907, 0x8908, 	 0, /* 0x70 */
     0x8909, 0x890B, 0x890C, 0x890D, 0x890E, 0x890F, 0x8911, 0x8914, /* 0x80 */
     0x8915, 0x8916, 0x8917, 0x8918, 0x891C, 0x891D, 0x891E, 0x891F, /* 0x80 */
     0x8920, 0x8922, 0x8923, 0x8924, 0x8926, 0x8927, 0x8928, 0x8929, /* 0x90 */
@@ -2491,15 +2491,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D1[] =
     0x71D5, 0x538C, 0x781A, 0x96C1, 0x5501, 0x5F66, 0x7130, 0x5BB4, /* 0xE0 */
     0x8C1A, 0x9A8C, 0x6B83, 0x592E, 0x9E2F, 0x79E7, 0x6768, 0x626C, /* 0xE0 */
     0x4F6F, 0x75A1, 0x7F8A, 0x6D0B, 0x9633, 0x6C27, 0x4EF0, 0x75D2, /* 0xF0 */
-    0x517B, 0x6837, 0x6F3E, 0x9080, 0x8170, 0x5996, 0x7476          /* 0xF0 */
+    0x517B, 0x6837, 0x6F3E, 0x9080, 0x8170, 0x5996, 0x7476			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_D2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8938, 0x8939, 0x893A, 0x893B, 0x893C, 0x893D, 0x893E, 0x893F, /* 0x40 */
     0x8940, 0x8942, 0x8943, 0x8945, 0x8946, 0x8947, 0x8948, 0x8949, /* 0x40 */
     0x894A, 0x894B, 0x894C, 0x894D, 0x894E, 0x894F, 0x8950, 0x8951, /* 0x50 */
@@ -2507,7 +2507,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D2[] =
     0x895A, 0x895B, 0x895C, 0x895D, 0x8960, 0x8961, 0x8962, 0x8963, /* 0x60 */
     0x8964, 0x8965, 0x8967, 0x8968, 0x8969, 0x896A, 0x896B, 0x896C, /* 0x60 */
     0x896D, 0x896E, 0x896F, 0x8970, 0x8971, 0x8972, 0x8973, 0x8974, /* 0x70 */
-    0x8975, 0x8976, 0x8977, 0x8978, 0x8979, 0x897A, 0x897C,      0, /* 0x70 */
+    0x8975, 0x8976, 0x8977, 0x8978, 0x8979, 0x897A, 0x897C, 	 0, /* 0x70 */
     0x897D, 0x897E, 0x8980, 0x8982, 0x8984, 0x8985, 0x8987, 0x8988, /* 0x80 */
     0x8989, 0x898A, 0x898B, 0x898C, 0x898D, 0x898E, 0x898F, 0x8990, /* 0x80 */
     0x8991, 0x8992, 0x8993, 0x8994, 0x8995, 0x8996, 0x8997, 0x8998, /* 0x90 */
@@ -2523,15 +2523,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D2[] =
     0x4EA6, 0x88D4, 0x610F, 0x6BC5, 0x5FC6, 0x4E49, 0x76CA, 0x6EA2, /* 0xE0 */
     0x8BE3, 0x8BAE, 0x8C0A, 0x8BD1, 0x5F02, 0x7FFC, 0x7FCC, 0x7ECE, /* 0xE0 */
     0x8335, 0x836B, 0x56E0, 0x6BB7, 0x97F3, 0x9634, 0x59FB, 0x541F, /* 0xF0 */
-    0x94F6, 0x6DEB, 0x5BC5, 0x996E, 0x5C39, 0x5F15, 0x9690          /* 0xF0 */
+    0x94F6, 0x6DEB, 0x5BC5, 0x996E, 0x5C39, 0x5F15, 0x9690			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_D3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x89A2, 0x89A3, 0x89A4, 0x89A5, 0x89A6, 0x89A7, 0x89A8, 0x89A9, /* 0x40 */
     0x89AA, 0x89AB, 0x89AC, 0x89AD, 0x89AE, 0x89AF, 0x89B0, 0x89B1, /* 0x40 */
     0x89B2, 0x89B3, 0x89B4, 0x89B5, 0x89B6, 0x89B7, 0x89B8, 0x89B9, /* 0x50 */
@@ -2539,7 +2539,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D3[] =
     0x89CD, 0x89D3, 0x89D4, 0x89D5, 0x89D7, 0x89D8, 0x89D9, 0x89DB, /* 0x60 */
     0x89DD, 0x89DF, 0x89E0, 0x89E1, 0x89E2, 0x89E4, 0x89E7, 0x89E8, /* 0x60 */
     0x89E9, 0x89EA, 0x89EC, 0x89ED, 0x89EE, 0x89F0, 0x89F1, 0x89F2, /* 0x70 */
-    0x89F4, 0x89F5, 0x89F6, 0x89F7, 0x89F8, 0x89F9, 0x89FA,      0, /* 0x70 */
+    0x89F4, 0x89F5, 0x89F6, 0x89F7, 0x89F8, 0x89F9, 0x89FA, 	 0, /* 0x70 */
     0x89FB, 0x89FC, 0x89FD, 0x89FE, 0x89FF, 0x8A01, 0x8A02, 0x8A03, /* 0x80 */
     0x8A04, 0x8A05, 0x8A06, 0x8A08, 0x8A09, 0x8A0A, 0x8A0B, 0x8A0C, /* 0x80 */
     0x8A0D, 0x8A0E, 0x8A0F, 0x8A10, 0x8A11, 0x8A12, 0x8A13, 0x8A14, /* 0x90 */
@@ -2555,15 +2555,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D3[] =
     0x4F59, 0x4FDE, 0x903E, 0x9C7C, 0x6109, 0x6E1D, 0x6E14, 0x9685, /* 0xE0 */
     0x4E88, 0x5A31, 0x96E8, 0x4E0E, 0x5C7F, 0x79B9, 0x5B87, 0x8BED, /* 0xE0 */
     0x7FBD, 0x7389, 0x57DF, 0x828B, 0x90C1, 0x5401, 0x9047, 0x55BB, /* 0xF0 */
-    0x5CEA, 0x5FA1, 0x6108, 0x6B32, 0x72F1, 0x80B2, 0x8A89          /* 0xF0 */
+    0x5CEA, 0x5FA1, 0x6108, 0x6B32, 0x72F1, 0x80B2, 0x8A89			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_D4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8A1E, 0x8A1F, 0x8A20, 0x8A21, 0x8A22, 0x8A23, 0x8A24, 0x8A25, /* 0x40 */
     0x8A26, 0x8A27, 0x8A28, 0x8A29, 0x8A2A, 0x8A2B, 0x8A2C, 0x8A2D, /* 0x40 */
     0x8A2E, 0x8A2F, 0x8A30, 0x8A31, 0x8A32, 0x8A33, 0x8A34, 0x8A35, /* 0x50 */
@@ -2571,7 +2571,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D4[] =
     0x8A3F, 0x8A40, 0x8A41, 0x8A42, 0x8A43, 0x8A44, 0x8A45, 0x8A46, /* 0x60 */
     0x8A47, 0x8A49, 0x8A4A, 0x8A4B, 0x8A4C, 0x8A4D, 0x8A4E, 0x8A4F, /* 0x60 */
     0x8A50, 0x8A51, 0x8A52, 0x8A53, 0x8A54, 0x8A55, 0x8A56, 0x8A57, /* 0x70 */
-    0x8A58, 0x8A59, 0x8A5A, 0x8A5B, 0x8A5C, 0x8A5D, 0x8A5E,      0, /* 0x70 */
+    0x8A58, 0x8A59, 0x8A5A, 0x8A5B, 0x8A5C, 0x8A5D, 0x8A5E, 	 0, /* 0x70 */
     0x8A5F, 0x8A60, 0x8A61, 0x8A62, 0x8A63, 0x8A64, 0x8A65, 0x8A66, /* 0x80 */
     0x8A67, 0x8A68, 0x8A69, 0x8A6A, 0x8A6B, 0x8A6C, 0x8A6D, 0x8A6E, /* 0x80 */
     0x8A6F, 0x8A70, 0x8A71, 0x8A72, 0x8A73, 0x8A74, 0x8A75, 0x8A76, /* 0x90 */
@@ -2587,15 +2587,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D4[] =
     0x810F, 0x846C, 0x906D, 0x7CDF, 0x51FF, 0x85FB, 0x67A3, 0x65E9, /* 0xE0 */
     0x6FA1, 0x86A4, 0x8E81, 0x566A, 0x9020, 0x7682, 0x7076, 0x71E5, /* 0xE0 */
     0x8D23, 0x62E9, 0x5219, 0x6CFD, 0x8D3C, 0x600E, 0x589E, 0x618E, /* 0xF0 */
-    0x66FE, 0x8D60, 0x624E, 0x55B3, 0x6E23, 0x672D, 0x8F67          /* 0xF0 */
+    0x66FE, 0x8D60, 0x624E, 0x55B3, 0x6E23, 0x672D, 0x8F67			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_D5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8A81, 0x8A82, 0x8A83, 0x8A84, 0x8A85, 0x8A86, 0x8A87, 0x8A88, /* 0x40 */
     0x8A8B, 0x8A8C, 0x8A8D, 0x8A8E, 0x8A8F, 0x8A90, 0x8A91, 0x8A92, /* 0x40 */
     0x8A94, 0x8A95, 0x8A96, 0x8A97, 0x8A98, 0x8A99, 0x8A9A, 0x8A9B, /* 0x50 */
@@ -2603,7 +2603,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D5[] =
     0x8AA4, 0x8AA5, 0x8AA6, 0x8AA7, 0x8AA8, 0x8AA9, 0x8AAA, 0x8AAB, /* 0x60 */
     0x8AAC, 0x8AAD, 0x8AAE, 0x8AAF, 0x8AB0, 0x8AB1, 0x8AB2, 0x8AB3, /* 0x60 */
     0x8AB4, 0x8AB5, 0x8AB6, 0x8AB7, 0x8AB8, 0x8AB9, 0x8ABA, 0x8ABB, /* 0x70 */
-    0x8ABC, 0x8ABD, 0x8ABE, 0x8ABF, 0x8AC0, 0x8AC1, 0x8AC2,      0, /* 0x70 */
+    0x8ABC, 0x8ABD, 0x8ABE, 0x8ABF, 0x8AC0, 0x8AC1, 0x8AC2, 	 0, /* 0x70 */
     0x8AC3, 0x8AC4, 0x8AC5, 0x8AC6, 0x8AC7, 0x8AC8, 0x8AC9, 0x8ACA, /* 0x80 */
     0x8ACB, 0x8ACC, 0x8ACD, 0x8ACE, 0x8ACF, 0x8AD0, 0x8AD1, 0x8AD2, /* 0x80 */
     0x8AD3, 0x8AD4, 0x8AD5, 0x8AD6, 0x8AD7, 0x8AD8, 0x8AD9, 0x8ADA, /* 0x90 */
@@ -2619,15 +2619,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D5[] =
     0x9517, 0x8517, 0x8FD9, 0x6D59, 0x73CD, 0x659F, 0x771F, 0x7504, /* 0xE0 */
     0x7827, 0x81FB, 0x8D1E, 0x9488, 0x4FA6, 0x6795, 0x75B9, 0x8BCA, /* 0xE0 */
     0x9707, 0x632F, 0x9547, 0x9635, 0x84B8, 0x6323, 0x7741, 0x5F81, /* 0xF0 */
-    0x72F0, 0x4E89, 0x6014, 0x6574, 0x62EF, 0x6B63, 0x653F          /* 0xF0 */
+    0x72F0, 0x4E89, 0x6014, 0x6574, 0x62EF, 0x6B63, 0x653F			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_D6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8AE4, 0x8AE5, 0x8AE6, 0x8AE7, 0x8AE8, 0x8AE9, 0x8AEA, 0x8AEB, /* 0x40 */
     0x8AEC, 0x8AED, 0x8AEE, 0x8AEF, 0x8AF0, 0x8AF1, 0x8AF2, 0x8AF3, /* 0x40 */
     0x8AF4, 0x8AF5, 0x8AF6, 0x8AF7, 0x8AF8, 0x8AF9, 0x8AFA, 0x8AFB, /* 0x50 */
@@ -2635,7 +2635,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D6[] =
     0x8B04, 0x8B05, 0x8B06, 0x8B08, 0x8B09, 0x8B0A, 0x8B0B, 0x8B0C, /* 0x60 */
     0x8B0D, 0x8B0E, 0x8B0F, 0x8B10, 0x8B11, 0x8B12, 0x8B13, 0x8B14, /* 0x60 */
     0x8B15, 0x8B16, 0x8B17, 0x8B18, 0x8B19, 0x8B1A, 0x8B1B, 0x8B1C, /* 0x70 */
-    0x8B1D, 0x8B1E, 0x8B1F, 0x8B20, 0x8B21, 0x8B22, 0x8B23,      0, /* 0x70 */
+    0x8B1D, 0x8B1E, 0x8B1F, 0x8B20, 0x8B21, 0x8B22, 0x8B23, 	 0, /* 0x70 */
     0x8B24, 0x8B25, 0x8B27, 0x8B28, 0x8B29, 0x8B2A, 0x8B2B, 0x8B2C, /* 0x80 */
     0x8B2D, 0x8B2E, 0x8B2F, 0x8B30, 0x8B31, 0x8B32, 0x8B33, 0x8B34, /* 0x80 */
     0x8B35, 0x8B36, 0x8B37, 0x8B38, 0x8B39, 0x8B3A, 0x8B3B, 0x8B3C, /* 0x90 */
@@ -2651,15 +2651,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D6[] =
     0x7CA5, 0x8F74, 0x8098, 0x5E1A, 0x5492, 0x76B1, 0x5B99, 0x663C, /* 0xE0 */
     0x9AA4, 0x73E0, 0x682A, 0x86DB, 0x6731, 0x732A, 0x8BF8, 0x8BDB, /* 0xE0 */
     0x9010, 0x7AF9, 0x70DB, 0x716E, 0x62C4, 0x77A9, 0x5631, 0x4E3B, /* 0xF0 */
-    0x8457, 0x67F1, 0x52A9, 0x86C0, 0x8D2E, 0x94F8, 0x7B51          /* 0xF0 */
+    0x8457, 0x67F1, 0x52A9, 0x86C0, 0x8D2E, 0x94F8, 0x7B51			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_D7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8B46, 0x8B47, 0x8B48, 0x8B49, 0x8B4A, 0x8B4B, 0x8B4C, 0x8B4D, /* 0x40 */
     0x8B4E, 0x8B4F, 0x8B50, 0x8B51, 0x8B52, 0x8B53, 0x8B54, 0x8B55, /* 0x40 */
     0x8B56, 0x8B57, 0x8B58, 0x8B59, 0x8B5A, 0x8B5B, 0x8B5C, 0x8B5D, /* 0x50 */
@@ -2667,7 +2667,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D7[] =
     0x8B67, 0x8B68, 0x8B69, 0x8B6A, 0x8B6B, 0x8B6D, 0x8B6E, 0x8B6F, /* 0x60 */
     0x8B70, 0x8B71, 0x8B72, 0x8B73, 0x8B74, 0x8B75, 0x8B76, 0x8B77, /* 0x60 */
     0x8B78, 0x8B79, 0x8B7A, 0x8B7B, 0x8B7C, 0x8B7D, 0x8B7E, 0x8B7F, /* 0x70 */
-    0x8B80, 0x8B81, 0x8B82, 0x8B83, 0x8B84, 0x8B85, 0x8B86,      0, /* 0x70 */
+    0x8B80, 0x8B81, 0x8B82, 0x8B83, 0x8B84, 0x8B85, 0x8B86, 	 0, /* 0x70 */
     0x8B87, 0x8B88, 0x8B89, 0x8B8A, 0x8B8B, 0x8B8C, 0x8B8D, 0x8B8E, /* 0x80 */
     0x8B8F, 0x8B90, 0x8B91, 0x8B92, 0x8B93, 0x8B94, 0x8B95, 0x8B96, /* 0x80 */
     0x8B97, 0x8B98, 0x8B99, 0x8B9A, 0x8B9B, 0x8B9C, 0x8B9D, 0x8B9E, /* 0x90 */
@@ -2683,15 +2683,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D7[] =
     0x594F, 0x63CD, 0x79DF, 0x8DB3, 0x5352, 0x65CF, 0x7956, 0x8BC5, /* 0xE0 */
     0x963B, 0x7EC4, 0x94BB, 0x7E82, 0x5634, 0x9189, 0x6700, 0x7F6A, /* 0xE0 */
     0x5C0A, 0x9075, 0x6628, 0x5DE6, 0x4F50, 0x67DE, 0x505A, 0x4F5C, /* 0xF0 */
-    0x5750, 0x5EA7                                                  /* 0xF0 */
+    0x5750, 0x5EA7													/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_D8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8C38, 0x8C39, 0x8C3A, 0x8C3B, 0x8C3C, 0x8C3D, 0x8C3E, 0x8C3F, /* 0x40 */
     0x8C40, 0x8C42, 0x8C43, 0x8C44, 0x8C45, 0x8C48, 0x8C4A, 0x8C4B, /* 0x40 */
     0x8C4D, 0x8C4E, 0x8C4F, 0x8C50, 0x8C51, 0x8C52, 0x8C53, 0x8C54, /* 0x50 */
@@ -2699,7 +2699,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D8[] =
     0x8C5F, 0x8C60, 0x8C63, 0x8C64, 0x8C65, 0x8C66, 0x8C67, 0x8C68, /* 0x60 */
     0x8C69, 0x8C6C, 0x8C6D, 0x8C6E, 0x8C6F, 0x8C70, 0x8C71, 0x8C72, /* 0x60 */
     0x8C74, 0x8C75, 0x8C76, 0x8C77, 0x8C7B, 0x8C7C, 0x8C7D, 0x8C7E, /* 0x70 */
-    0x8C7F, 0x8C80, 0x8C81, 0x8C83, 0x8C84, 0x8C86, 0x8C87,      0, /* 0x70 */
+    0x8C7F, 0x8C80, 0x8C81, 0x8C83, 0x8C84, 0x8C86, 0x8C87, 	 0, /* 0x70 */
     0x8C88, 0x8C8B, 0x8C8D, 0x8C8E, 0x8C8F, 0x8C90, 0x8C91, 0x8C92, /* 0x80 */
     0x8C93, 0x8C95, 0x8C96, 0x8C97, 0x8C99, 0x8C9A, 0x8C9B, 0x8C9C, /* 0x80 */
     0x8C9D, 0x8C9E, 0x8C9F, 0x8CA0, 0x8CA1, 0x8CA2, 0x8CA3, 0x8CA4, /* 0x90 */
@@ -2715,15 +2715,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D8[] =
     0x525C, 0x84AF, 0x527D, 0x5282, 0x5281, 0x5290, 0x5293, 0x5182, /* 0xE0 */
     0x7F54, 0x4EBB, 0x4EC3, 0x4EC9, 0x4EC2, 0x4EE8, 0x4EE1, 0x4EEB, /* 0xE0 */
     0x4EDE, 0x4F1B, 0x4EF3, 0x4F22, 0x4F64, 0x4EF5, 0x4F25, 0x4F27, /* 0xF0 */
-    0x4F09, 0x4F2B, 0x4F5E, 0x4F67, 0x6538, 0x4F5A, 0x4F5D          /* 0xF0 */
+    0x4F09, 0x4F2B, 0x4F5E, 0x4F67, 0x6538, 0x4F5A, 0x4F5D			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_D9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8CAE, 0x8CAF, 0x8CB0, 0x8CB1, 0x8CB2, 0x8CB3, 0x8CB4, 0x8CB5, /* 0x40 */
     0x8CB6, 0x8CB7, 0x8CB8, 0x8CB9, 0x8CBA, 0x8CBB, 0x8CBC, 0x8CBD, /* 0x40 */
     0x8CBE, 0x8CBF, 0x8CC0, 0x8CC1, 0x8CC2, 0x8CC3, 0x8CC4, 0x8CC5, /* 0x50 */
@@ -2731,7 +2731,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D9[] =
     0x8CCE, 0x8CCF, 0x8CD0, 0x8CD1, 0x8CD2, 0x8CD3, 0x8CD4, 0x8CD5, /* 0x60 */
     0x8CD6, 0x8CD7, 0x8CD8, 0x8CD9, 0x8CDA, 0x8CDB, 0x8CDC, 0x8CDD, /* 0x60 */
     0x8CDE, 0x8CDF, 0x8CE0, 0x8CE1, 0x8CE2, 0x8CE3, 0x8CE4, 0x8CE5, /* 0x70 */
-    0x8CE6, 0x8CE7, 0x8CE8, 0x8CE9, 0x8CEA, 0x8CEB, 0x8CEC,      0, /* 0x70 */
+    0x8CE6, 0x8CE7, 0x8CE8, 0x8CE9, 0x8CEA, 0x8CEB, 0x8CEC, 	 0, /* 0x70 */
     0x8CED, 0x8CEE, 0x8CEF, 0x8CF0, 0x8CF1, 0x8CF2, 0x8CF3, 0x8CF4, /* 0x80 */
     0x8CF5, 0x8CF6, 0x8CF7, 0x8CF8, 0x8CF9, 0x8CFA, 0x8CFB, 0x8CFC, /* 0x80 */
     0x8CFD, 0x8CFE, 0x8CFF, 0x8D00, 0x8D01, 0x8D02, 0x8D03, 0x8D04, /* 0x90 */
@@ -2747,15 +2747,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_D9[] =
     0x6C46, 0x7C74, 0x516E, 0x5DFD, 0x9EC9, 0x9998, 0x5181, 0x5914, /* 0xE0 */
     0x52F9, 0x530D, 0x8A07, 0x5310, 0x51EB, 0x5919, 0x5155, 0x4EA0, /* 0xE0 */
     0x5156, 0x4EB3, 0x886E, 0x88A4, 0x4EB5, 0x8114, 0x88D2, 0x7980, /* 0xF0 */
-    0x5B34, 0x8803, 0x7FB8, 0x51AB, 0x51B1, 0x51BD, 0x51BC          /* 0xF0 */
+    0x5B34, 0x8803, 0x7FB8, 0x51AB, 0x51B1, 0x51BD, 0x51BC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_DA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8D0E, 0x8D0F, 0x8D10, 0x8D11, 0x8D12, 0x8D13, 0x8D14, 0x8D15, /* 0x40 */
     0x8D16, 0x8D17, 0x8D18, 0x8D19, 0x8D1A, 0x8D1B, 0x8D1C, 0x8D20, /* 0x40 */
     0x8D51, 0x8D52, 0x8D57, 0x8D5F, 0x8D65, 0x8D68, 0x8D69, 0x8D6A, /* 0x50 */
@@ -2763,7 +2763,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_DA[] =
     0x8D7B, 0x8D7C, 0x8D7D, 0x8D7E, 0x8D7F, 0x8D80, 0x8D82, 0x8D83, /* 0x60 */
     0x8D86, 0x8D87, 0x8D88, 0x8D89, 0x8D8C, 0x8D8D, 0x8D8E, 0x8D8F, /* 0x60 */
     0x8D90, 0x8D92, 0x8D93, 0x8D95, 0x8D96, 0x8D97, 0x8D98, 0x8D99, /* 0x70 */
-    0x8D9A, 0x8D9B, 0x8D9C, 0x8D9D, 0x8D9E, 0x8DA0, 0x8DA1,      0, /* 0x70 */
+    0x8D9A, 0x8D9B, 0x8D9C, 0x8D9D, 0x8D9E, 0x8DA0, 0x8DA1, 	 0, /* 0x70 */
     0x8DA2, 0x8DA4, 0x8DA5, 0x8DA6, 0x8DA7, 0x8DA8, 0x8DA9, 0x8DAA, /* 0x80 */
     0x8DAB, 0x8DAC, 0x8DAD, 0x8DAE, 0x8DAF, 0x8DB0, 0x8DB2, 0x8DB6, /* 0x80 */
     0x8DB7, 0x8DB9, 0x8DBB, 0x8DBD, 0x8DC0, 0x8DC1, 0x8DC2, 0x8DC5, /* 0x90 */
@@ -2779,15 +2779,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_DA[] =
     0x5369, 0x537A, 0x961D, 0x9622, 0x9621, 0x9631, 0x962A, 0x963D, /* 0xE0 */
     0x963C, 0x9642, 0x9649, 0x9654, 0x965F, 0x9667, 0x966C, 0x9672, /* 0xE0 */
     0x9674, 0x9688, 0x968D, 0x9697, 0x96B0, 0x9097, 0x909B, 0x909D, /* 0xF0 */
-    0x9099, 0x90AC, 0x90A1, 0x90B4, 0x90B3, 0x90B6, 0x90BA          /* 0xF0 */
+    0x9099, 0x90AC, 0x90A1, 0x90B4, 0x90B3, 0x90B6, 0x90BA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_DB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8DD5, 0x8DD8, 0x8DD9, 0x8DDC, 0x8DE0, 0x8DE1, 0x8DE2, 0x8DE5, /* 0x40 */
     0x8DE6, 0x8DE7, 0x8DE9, 0x8DED, 0x8DEE, 0x8DF0, 0x8DF1, 0x8DF2, /* 0x40 */
     0x8DF4, 0x8DF6, 0x8DFC, 0x8DFE, 0x8DFF, 0x8E00, 0x8E01, 0x8E02, /* 0x50 */
@@ -2795,7 +2795,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_DB[] =
     0x8E10, 0x8E11, 0x8E12, 0x8E13, 0x8E15, 0x8E16, 0x8E17, 0x8E18, /* 0x60 */
     0x8E19, 0x8E1A, 0x8E1B, 0x8E1C, 0x8E20, 0x8E21, 0x8E24, 0x8E25, /* 0x60 */
     0x8E26, 0x8E27, 0x8E28, 0x8E2B, 0x8E2D, 0x8E30, 0x8E32, 0x8E33, /* 0x70 */
-    0x8E34, 0x8E36, 0x8E37, 0x8E38, 0x8E3B, 0x8E3C, 0x8E3E,      0, /* 0x70 */
+    0x8E34, 0x8E36, 0x8E37, 0x8E38, 0x8E3B, 0x8E3C, 0x8E3E, 	 0, /* 0x70 */
     0x8E3F, 0x8E43, 0x8E45, 0x8E46, 0x8E4C, 0x8E4D, 0x8E4E, 0x8E4F, /* 0x80 */
     0x8E50, 0x8E53, 0x8E54, 0x8E55, 0x8E56, 0x8E57, 0x8E58, 0x8E5A, /* 0x80 */
     0x8E5B, 0x8E5C, 0x8E5D, 0x8E5E, 0x8E5F, 0x8E60, 0x8E61, 0x8E62, /* 0x90 */
@@ -2811,15 +2811,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_DB[] =
     0x5742, 0x5769, 0x5785, 0x576B, 0x5786, 0x577C, 0x577B, 0x5768, /* 0xE0 */
     0x576D, 0x5776, 0x5773, 0x57AD, 0x57A4, 0x578C, 0x57B2, 0x57CF, /* 0xE0 */
     0x57A7, 0x57B4, 0x5793, 0x57A0, 0x57D5, 0x57D8, 0x57DA, 0x57D9, /* 0xF0 */
-    0x57D2, 0x57B8, 0x57F4, 0x57EF, 0x57F8, 0x57E4, 0x57DD          /* 0xF0 */
+    0x57D2, 0x57B8, 0x57F4, 0x57EF, 0x57F8, 0x57E4, 0x57DD			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_DC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8E73, 0x8E75, 0x8E77, 0x8E78, 0x8E79, 0x8E7A, 0x8E7B, 0x8E7D, /* 0x40 */
     0x8E7E, 0x8E80, 0x8E82, 0x8E83, 0x8E84, 0x8E86, 0x8E88, 0x8E89, /* 0x40 */
     0x8E8A, 0x8E8B, 0x8E8C, 0x8E8D, 0x8E8E, 0x8E91, 0x8E92, 0x8E93, /* 0x50 */
@@ -2827,7 +2827,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_DC[] =
     0x8E9F, 0x8EA0, 0x8EA1, 0x8EA2, 0x8EA3, 0x8EA4, 0x8EA5, 0x8EA6, /* 0x60 */
     0x8EA7, 0x8EA8, 0x8EA9, 0x8EAA, 0x8EAD, 0x8EAE, 0x8EB0, 0x8EB1, /* 0x60 */
     0x8EB3, 0x8EB4, 0x8EB5, 0x8EB6, 0x8EB7, 0x8EB8, 0x8EB9, 0x8EBB, /* 0x70 */
-    0x8EBC, 0x8EBD, 0x8EBE, 0x8EBF, 0x8EC0, 0x8EC1, 0x8EC2,      0, /* 0x70 */
+    0x8EBC, 0x8EBD, 0x8EBE, 0x8EBF, 0x8EC0, 0x8EC1, 0x8EC2, 	 0, /* 0x70 */
     0x8EC3, 0x8EC4, 0x8EC5, 0x8EC6, 0x8EC7, 0x8EC8, 0x8EC9, 0x8ECA, /* 0x80 */
     0x8ECB, 0x8ECC, 0x8ECD, 0x8ECF, 0x8ED0, 0x8ED1, 0x8ED2, 0x8ED3, /* 0x80 */
     0x8ED4, 0x8ED5, 0x8ED6, 0x8ED7, 0x8ED8, 0x8ED9, 0x8EDA, 0x8EDB, /* 0x90 */
@@ -2843,15 +2843,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_DC[] =
     0x8311, 0x831A, 0x8306, 0x8314, 0x8315, 0x82E0, 0x82D5, 0x831C, /* 0xE0 */
     0x8351, 0x835B, 0x835C, 0x8308, 0x8392, 0x833C, 0x8334, 0x8331, /* 0xE0 */
     0x839B, 0x835E, 0x832F, 0x834F, 0x8347, 0x8343, 0x835F, 0x8340, /* 0xF0 */
-    0x8317, 0x8360, 0x832D, 0x833A, 0x8333, 0x8366, 0x8365          /* 0xF0 */
+    0x8317, 0x8360, 0x832D, 0x833A, 0x8333, 0x8366, 0x8365			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_DD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8EE5, 0x8EE6, 0x8EE7, 0x8EE8, 0x8EE9, 0x8EEA, 0x8EEB, 0x8EEC, /* 0x40 */
     0x8EED, 0x8EEE, 0x8EEF, 0x8EF0, 0x8EF1, 0x8EF2, 0x8EF3, 0x8EF4, /* 0x40 */
     0x8EF5, 0x8EF6, 0x8EF7, 0x8EF8, 0x8EF9, 0x8EFA, 0x8EFB, 0x8EFC, /* 0x50 */
@@ -2859,7 +2859,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_DD[] =
     0x8F05, 0x8F06, 0x8F07, 0x8F08, 0x8F09, 0x8F0A, 0x8F0B, 0x8F0C, /* 0x60 */
     0x8F0D, 0x8F0E, 0x8F0F, 0x8F10, 0x8F11, 0x8F12, 0x8F13, 0x8F14, /* 0x60 */
     0x8F15, 0x8F16, 0x8F17, 0x8F18, 0x8F19, 0x8F1A, 0x8F1B, 0x8F1C, /* 0x70 */
-    0x8F1D, 0x8F1E, 0x8F1F, 0x8F20, 0x8F21, 0x8F22, 0x8F23,      0, /* 0x70 */
+    0x8F1D, 0x8F1E, 0x8F1F, 0x8F20, 0x8F21, 0x8F22, 0x8F23, 	 0, /* 0x70 */
     0x8F24, 0x8F25, 0x8F26, 0x8F27, 0x8F28, 0x8F29, 0x8F2A, 0x8F2B, /* 0x80 */
     0x8F2C, 0x8F2D, 0x8F2E, 0x8F2F, 0x8F30, 0x8F31, 0x8F32, 0x8F33, /* 0x80 */
     0x8F34, 0x8F35, 0x8F36, 0x8F37, 0x8F38, 0x8F39, 0x8F3A, 0x8F3B, /* 0x90 */
@@ -2875,15 +2875,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_DD[] =
     0x843C, 0x8446, 0x8469, 0x8476, 0x848C, 0x848E, 0x8431, 0x846D, /* 0xE0 */
     0x84C1, 0x84CD, 0x84D0, 0x84E6, 0x84BD, 0x84D3, 0x84CA, 0x84BF, /* 0xE0 */
     0x84BA, 0x84E0, 0x84A1, 0x84B9, 0x84B4, 0x8497, 0x84E5, 0x84E3, /* 0xF0 */
-    0x850C, 0x750D, 0x8538, 0x84F0, 0x8539, 0x851F, 0x853A          /* 0xF0 */
+    0x850C, 0x750D, 0x8538, 0x84F0, 0x8539, 0x851F, 0x853A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_DE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8F45, 0x8F46, 0x8F47, 0x8F48, 0x8F49, 0x8F4A, 0x8F4B, 0x8F4C, /* 0x40 */
     0x8F4D, 0x8F4E, 0x8F4F, 0x8F50, 0x8F51, 0x8F52, 0x8F53, 0x8F54, /* 0x40 */
     0x8F55, 0x8F56, 0x8F57, 0x8F58, 0x8F59, 0x8F5A, 0x8F5B, 0x8F5C, /* 0x50 */
@@ -2891,7 +2891,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_DE[] =
     0x8F65, 0x8F6A, 0x8F80, 0x8F8C, 0x8F92, 0x8F9D, 0x8FA0, 0x8FA1, /* 0x60 */
     0x8FA2, 0x8FA4, 0x8FA5, 0x8FA6, 0x8FA7, 0x8FAA, 0x8FAC, 0x8FAD, /* 0x60 */
     0x8FAE, 0x8FAF, 0x8FB2, 0x8FB3, 0x8FB4, 0x8FB5, 0x8FB7, 0x8FB8, /* 0x70 */
-    0x8FBA, 0x8FBB, 0x8FBC, 0x8FBF, 0x8FC0, 0x8FC3, 0x8FC6,      0, /* 0x70 */
+    0x8FBA, 0x8FBB, 0x8FBC, 0x8FBF, 0x8FC0, 0x8FC3, 0x8FC6, 	 0, /* 0x70 */
     0x8FC9, 0x8FCA, 0x8FCB, 0x8FCC, 0x8FCD, 0x8FCF, 0x8FD2, 0x8FD6, /* 0x80 */
     0x8FD7, 0x8FDA, 0x8FE0, 0x8FE1, 0x8FE3, 0x8FE7, 0x8FEC, 0x8FEF, /* 0x80 */
     0x8FF1, 0x8FF2, 0x8FF4, 0x8FF5, 0x8FF6, 0x8FFA, 0x8FFB, 0x8FFC, /* 0x90 */
@@ -2907,12 +2907,12 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_DE[] =
     0x637A, 0x638E, 0x63B4, 0x636D, 0x63AC, 0x638A, 0x6369, 0x63AE, /* 0xE0 */
     0x63BC, 0x63F2, 0x63F8, 0x63E0, 0x63FF, 0x63C4, 0x63DE, 0x63CE, /* 0xE0 */
     0x6452, 0x63C6, 0x63BE, 0x6445, 0x6441, 0x640B, 0x641B, 0x6420, /* 0xF0 */
-    0x640C, 0x6426, 0x6421, 0x645E, 0x6484, 0x646D, 0x6496          /* 0xF0 */
+    0x640C, 0x6426, 0x6421, 0x645E, 0x6484, 0x646D, 0x6496			/* 0xF0 */
 };
 static sal_uInt16 const aImplDBCSToUniTab_GBK_DF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9019, 0x901C, 0x9023, 0x9024, 0x9025, 0x9027, 0x9028, 0x9029, /* 0x40 */
     0x902A, 0x902B, 0x902C, 0x9030, 0x9031, 0x9032, 0x9033, 0x9034, /* 0x40 */
     0x9037, 0x9039, 0x903A, 0x903D, 0x903F, 0x9040, 0x9043, 0x9045, /* 0x50 */
@@ -2920,7 +2920,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_DF[] =
     0x9055, 0x9056, 0x9059, 0x905A, 0x905C, 0x905D, 0x905E, 0x905F, /* 0x60 */
     0x9060, 0x9061, 0x9064, 0x9066, 0x9067, 0x9069, 0x906A, 0x906B, /* 0x60 */
     0x906C, 0x906F, 0x9070, 0x9071, 0x9072, 0x9073, 0x9076, 0x9077, /* 0x70 */
-    0x9078, 0x9079, 0x907A, 0x907B, 0x907C, 0x907E, 0x9081,      0, /* 0x70 */
+    0x9078, 0x9079, 0x907A, 0x907B, 0x907C, 0x907E, 0x9081, 	 0, /* 0x70 */
     0x9084, 0x9085, 0x9086, 0x9087, 0x9089, 0x908A, 0x908C, 0x908D, /* 0x80 */
     0x908E, 0x908F, 0x9090, 0x9092, 0x9094, 0x9096, 0x9098, 0x909A, /* 0x80 */
     0x909C, 0x909E, 0x909F, 0x90A0, 0x90A4, 0x90A5, 0x90A7, 0x90A8, /* 0x90 */
@@ -2936,15 +2936,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_DF[] =
     0x54D9, 0x54DA, 0x54DC, 0x54A9, 0x54AA, 0x54A4, 0x54DD, 0x54CF, /* 0xE0 */
     0x54DE, 0x551B, 0x54E7, 0x5520, 0x54FD, 0x5514, 0x54F3, 0x5522, /* 0xE0 */
     0x5523, 0x550F, 0x5511, 0x5527, 0x552A, 0x5567, 0x558F, 0x55B5, /* 0xF0 */
-    0x5549, 0x556D, 0x5541, 0x5555, 0x553F, 0x5550, 0x553C          /* 0xF0 */
+    0x5549, 0x556D, 0x5541, 0x5555, 0x553F, 0x5550, 0x553C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_E0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x90C2, 0x90C3, 0x90C6, 0x90C8, 0x90C9, 0x90CB, 0x90CC, 0x90CD, /* 0x40 */
     0x90D2, 0x90D4, 0x90D5, 0x90D6, 0x90D8, 0x90D9, 0x90DA, 0x90DE, /* 0x40 */
     0x90DF, 0x90E0, 0x90E3, 0x90E4, 0x90E5, 0x90E9, 0x90EA, 0x90EC, /* 0x50 */
@@ -2952,7 +2952,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E0[] =
     0x90F9, 0x90FA, 0x90FB, 0x90FC, 0x90FF, 0x9100, 0x9101, 0x9103, /* 0x60 */
     0x9105, 0x9106, 0x9107, 0x9108, 0x9109, 0x910A, 0x910B, 0x910C, /* 0x60 */
     0x910D, 0x910E, 0x910F, 0x9110, 0x9111, 0x9112, 0x9113, 0x9114, /* 0x70 */
-    0x9115, 0x9116, 0x9117, 0x9118, 0x911A, 0x911B, 0x911C,      0, /* 0x70 */
+    0x9115, 0x9116, 0x9117, 0x9118, 0x911A, 0x911B, 0x911C, 	 0, /* 0x70 */
     0x911D, 0x911F, 0x9120, 0x9121, 0x9124, 0x9125, 0x9126, 0x9127, /* 0x80 */
     0x9128, 0x9129, 0x912A, 0x912B, 0x912C, 0x912D, 0x912E, 0x9130, /* 0x80 */
     0x9132, 0x9133, 0x9134, 0x9135, 0x9136, 0x9137, 0x9138, 0x913A, /* 0x90 */
@@ -2968,15 +2968,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E0[] =
     0x565C, 0x564C, 0x5654, 0x5686, 0x5664, 0x5671, 0x566B, 0x567B, /* 0xE0 */
     0x567C, 0x5685, 0x5693, 0x56AF, 0x56D4, 0x56D7, 0x56DD, 0x56E1, /* 0xE0 */
     0x56F5, 0x56EB, 0x56F9, 0x56FF, 0x5704, 0x570A, 0x5709, 0x571C, /* 0xF0 */
-    0x5E0F, 0x5E19, 0x5E14, 0x5E11, 0x5E31, 0x5E3B, 0x5E3C          /* 0xF0 */
+    0x5E0F, 0x5E19, 0x5E14, 0x5E11, 0x5E31, 0x5E3B, 0x5E3C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_E1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9145, 0x9147, 0x9148, 0x9151, 0x9153, 0x9154, 0x9155, 0x9156, /* 0x40 */
     0x9158, 0x9159, 0x915B, 0x915C, 0x915F, 0x9160, 0x9166, 0x9167, /* 0x40 */
     0x9168, 0x916B, 0x916D, 0x9173, 0x917A, 0x917B, 0x917C, 0x9180, /* 0x50 */
@@ -2984,7 +2984,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E1[] =
     0x918F, 0x9193, 0x9194, 0x9195, 0x9196, 0x9197, 0x9198, 0x9199, /* 0x60 */
     0x919C, 0x919D, 0x919E, 0x919F, 0x91A0, 0x91A1, 0x91A4, 0x91A5, /* 0x60 */
     0x91A6, 0x91A7, 0x91A8, 0x91A9, 0x91AB, 0x91AC, 0x91B0, 0x91B1, /* 0x70 */
-    0x91B2, 0x91B3, 0x91B6, 0x91B7, 0x91B8, 0x91B9, 0x91BB,      0, /* 0x70 */
+    0x91B2, 0x91B3, 0x91B6, 0x91B7, 0x91B8, 0x91B9, 0x91BB, 	 0, /* 0x70 */
     0x91BC, 0x91BD, 0x91BE, 0x91BF, 0x91C0, 0x91C1, 0x91C2, 0x91C3, /* 0x80 */
     0x91C4, 0x91C5, 0x91C6, 0x91C8, 0x91CB, 0x91D0, 0x91D2, 0x91D3, /* 0x80 */
     0x91D4, 0x91D5, 0x91D6, 0x91D7, 0x91D8, 0x91D9, 0x91DA, 0x91DB, /* 0x90 */
@@ -3000,15 +3000,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E1[] =
     0x5F89, 0x5F8C, 0x5F95, 0x5F99, 0x5F9C, 0x5FA8, 0x5FAD, 0x5FB5, /* 0xE0 */
     0x5FBC, 0x8862, 0x5F61, 0x72AD, 0x72B0, 0x72B4, 0x72B7, 0x72B8, /* 0xE0 */
     0x72C3, 0x72C1, 0x72CE, 0x72CD, 0x72D2, 0x72E8, 0x72EF, 0x72E9, /* 0xF0 */
-    0x72F2, 0x72F4, 0x72F7, 0x7301, 0x72F3, 0x7303, 0x72FA          /* 0xF0 */
+    0x72F2, 0x72F4, 0x72F7, 0x7301, 0x72F3, 0x7303, 0x72FA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_E2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x91E6, 0x91E7, 0x91E8, 0x91E9, 0x91EA, 0x91EB, 0x91EC, 0x91ED, /* 0x40 */
     0x91EE, 0x91EF, 0x91F0, 0x91F1, 0x91F2, 0x91F3, 0x91F4, 0x91F5, /* 0x40 */
     0x91F6, 0x91F7, 0x91F8, 0x91F9, 0x91FA, 0x91FB, 0x91FC, 0x91FD, /* 0x50 */
@@ -3016,7 +3016,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E2[] =
     0x9206, 0x9207, 0x9208, 0x9209, 0x920A, 0x920B, 0x920C, 0x920D, /* 0x60 */
     0x920E, 0x920F, 0x9210, 0x9211, 0x9212, 0x9213, 0x9214, 0x9215, /* 0x60 */
     0x9216, 0x9217, 0x9218, 0x9219, 0x921A, 0x921B, 0x921C, 0x921D, /* 0x70 */
-    0x921E, 0x921F, 0x9220, 0x9221, 0x9222, 0x9223, 0x9224,      0, /* 0x70 */
+    0x921E, 0x921F, 0x9220, 0x9221, 0x9222, 0x9223, 0x9224, 	 0, /* 0x70 */
     0x9225, 0x9226, 0x9227, 0x9228, 0x9229, 0x922A, 0x922B, 0x922C, /* 0x80 */
     0x922D, 0x922E, 0x922F, 0x9230, 0x9231, 0x9232, 0x9233, 0x9234, /* 0x80 */
     0x9235, 0x9236, 0x9237, 0x9238, 0x9239, 0x923A, 0x923B, 0x923C, /* 0x90 */
@@ -3032,15 +3032,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E2[] =
     0x5FC4, 0x5FC9, 0x5FD6, 0x5FCF, 0x6003, 0x5FEE, 0x6004, 0x5FE1, /* 0xE0 */
     0x5FE4, 0x5FFE, 0x6005, 0x6006, 0x5FEA, 0x5FED, 0x5FF8, 0x6019, /* 0xE0 */
     0x6035, 0x6026, 0x601B, 0x600F, 0x600D, 0x6029, 0x602B, 0x600A, /* 0xF0 */
-    0x603F, 0x6021, 0x6078, 0x6079, 0x607B, 0x607A, 0x6042          /* 0xF0 */
+    0x603F, 0x6021, 0x6078, 0x6079, 0x607B, 0x607A, 0x6042			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_E3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9246, 0x9247, 0x9248, 0x9249, 0x924A, 0x924B, 0x924C, 0x924D, /* 0x40 */
     0x924E, 0x924F, 0x9250, 0x9251, 0x9252, 0x9253, 0x9254, 0x9255, /* 0x40 */
     0x9256, 0x9257, 0x9258, 0x9259, 0x925A, 0x925B, 0x925C, 0x925D, /* 0x50 */
@@ -3048,7 +3048,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E3[] =
     0x9266, 0x9267, 0x9268, 0x9269, 0x926A, 0x926B, 0x926C, 0x926D, /* 0x60 */
     0x926E, 0x926F, 0x9270, 0x9271, 0x9272, 0x9273, 0x9275, 0x9276, /* 0x60 */
     0x9277, 0x9278, 0x9279, 0x927A, 0x927B, 0x927C, 0x927D, 0x927E, /* 0x70 */
-    0x927F, 0x9280, 0x9281, 0x9282, 0x9283, 0x9284, 0x9285,      0, /* 0x70 */
+    0x927F, 0x9280, 0x9281, 0x9282, 0x9283, 0x9284, 0x9285, 	 0, /* 0x70 */
     0x9286, 0x9287, 0x9288, 0x9289, 0x928A, 0x928B, 0x928C, 0x928D, /* 0x80 */
     0x928F, 0x9290, 0x9291, 0x9292, 0x9293, 0x9294, 0x9295, 0x9296, /* 0x80 */
     0x9297, 0x9298, 0x9299, 0x929A, 0x929B, 0x929C, 0x929D, 0x929E, /* 0x90 */
@@ -3064,15 +3064,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E3[] =
     0x6C54, 0x6C5C, 0x6C4A, 0x6CA3, 0x6C85, 0x6C90, 0x6C94, 0x6C8C, /* 0xE0 */
     0x6C68, 0x6C69, 0x6C74, 0x6C76, 0x6C86, 0x6CA9, 0x6CD0, 0x6CD4, /* 0xE0 */
     0x6CAD, 0x6CF7, 0x6CF8, 0x6CF1, 0x6CD7, 0x6CB2, 0x6CE0, 0x6CD6, /* 0xF0 */
-    0x6CFA, 0x6CEB, 0x6CEE, 0x6CB1, 0x6CD3, 0x6CEF, 0x6CFE          /* 0xF0 */
+    0x6CFA, 0x6CEB, 0x6CEE, 0x6CB1, 0x6CD3, 0x6CEF, 0x6CFE			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_E4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x92A8, 0x92A9, 0x92AA, 0x92AB, 0x92AC, 0x92AD, 0x92AF, 0x92B0, /* 0x40 */
     0x92B1, 0x92B2, 0x92B3, 0x92B4, 0x92B5, 0x92B6, 0x92B7, 0x92B8, /* 0x40 */
     0x92B9, 0x92BA, 0x92BB, 0x92BC, 0x92BD, 0x92BE, 0x92BF, 0x92C0, /* 0x50 */
@@ -3080,7 +3080,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E4[] =
     0x92CA, 0x92CB, 0x92CC, 0x92CD, 0x92CE, 0x92CF, 0x92D0, 0x92D1, /* 0x60 */
     0x92D2, 0x92D3, 0x92D4, 0x92D5, 0x92D6, 0x92D7, 0x92D8, 0x92D9, /* 0x60 */
     0x92DA, 0x92DB, 0x92DC, 0x92DD, 0x92DE, 0x92DF, 0x92E0, 0x92E1, /* 0x70 */
-    0x92E2, 0x92E3, 0x92E4, 0x92E5, 0x92E6, 0x92E7, 0x92E8,      0, /* 0x70 */
+    0x92E2, 0x92E3, 0x92E4, 0x92E5, 0x92E6, 0x92E7, 0x92E8, 	 0, /* 0x70 */
     0x92E9, 0x92EA, 0x92EB, 0x92EC, 0x92ED, 0x92EE, 0x92EF, 0x92F0, /* 0x80 */
     0x92F1, 0x92F2, 0x92F3, 0x92F4, 0x92F5, 0x92F6, 0x92F7, 0x92F8, /* 0x80 */
     0x92F9, 0x92FA, 0x92FB, 0x92FC, 0x92FD, 0x92FE, 0x92FF, 0x9300, /* 0x90 */
@@ -3096,15 +3096,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E4[] =
     0x6EA7, 0x6EBD, 0x6EBB, 0x6EB7, 0x6ED7, 0x6EB4, 0x6ECF, 0x6E8F, /* 0xE0 */
     0x6EC2, 0x6E9F, 0x6F62, 0x6F46, 0x6F47, 0x6F24, 0x6F15, 0x6EF9, /* 0xE0 */
     0x6F2F, 0x6F36, 0x6F4B, 0x6F74, 0x6F2A, 0x6F09, 0x6F29, 0x6F89, /* 0xF0 */
-    0x6F8D, 0x6F8C, 0x6F78, 0x6F72, 0x6F7C, 0x6F7A, 0x6FD1          /* 0xF0 */
+    0x6F8D, 0x6F8C, 0x6F78, 0x6F72, 0x6F7C, 0x6F7A, 0x6FD1			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_E5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x930A, 0x930B, 0x930C, 0x930D, 0x930E, 0x930F, 0x9310, 0x9311, /* 0x40 */
     0x9312, 0x9313, 0x9314, 0x9315, 0x9316, 0x9317, 0x9318, 0x9319, /* 0x40 */
     0x931A, 0x931B, 0x931C, 0x931D, 0x931E, 0x931F, 0x9320, 0x9321, /* 0x50 */
@@ -3112,7 +3112,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E5[] =
     0x932A, 0x932B, 0x932C, 0x932D, 0x932E, 0x932F, 0x9330, 0x9331, /* 0x60 */
     0x9332, 0x9333, 0x9334, 0x9335, 0x9336, 0x9337, 0x9338, 0x9339, /* 0x60 */
     0x933A, 0x933B, 0x933C, 0x933D, 0x933F, 0x9340, 0x9341, 0x9342, /* 0x70 */
-    0x9343, 0x9344, 0x9345, 0x9346, 0x9347, 0x9348, 0x9349,      0, /* 0x70 */
+    0x9343, 0x9344, 0x9345, 0x9346, 0x9347, 0x9348, 0x9349, 	 0, /* 0x70 */
     0x934A, 0x934B, 0x934C, 0x934D, 0x934E, 0x934F, 0x9350, 0x9351, /* 0x80 */
     0x9352, 0x9353, 0x9354, 0x9355, 0x9356, 0x9357, 0x9358, 0x9359, /* 0x80 */
     0x935A, 0x935B, 0x935C, 0x935D, 0x935E, 0x935F, 0x9360, 0x9361, /* 0x90 */
@@ -3128,15 +3128,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E5[] =
     0x9074, 0x907D, 0x9082, 0x9088, 0x9083, 0x908B, 0x5F50, 0x5F57, /* 0xE0 */
     0x5F56, 0x5F58, 0x5C3B, 0x54AB, 0x5C50, 0x5C59, 0x5B71, 0x5C63, /* 0xE0 */
     0x5C66, 0x7FBC, 0x5F2A, 0x5F29, 0x5F2D, 0x8274, 0x5F3C, 0x9B3B, /* 0xF0 */
-    0x5C6E, 0x5981, 0x5983, 0x598D, 0x59A9, 0x59AA, 0x59A3          /* 0xF0 */
+    0x5C6E, 0x5981, 0x5983, 0x598D, 0x59A9, 0x59AA, 0x59A3			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_E6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x936C, 0x936D, 0x936E, 0x936F, 0x9370, 0x9371, 0x9372, 0x9373, /* 0x40 */
     0x9374, 0x9375, 0x9376, 0x9377, 0x9378, 0x9379, 0x937A, 0x937B, /* 0x40 */
     0x937C, 0x937D, 0x937E, 0x937F, 0x9380, 0x9381, 0x9382, 0x9383, /* 0x50 */
@@ -3144,7 +3144,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E6[] =
     0x938C, 0x938D, 0x938E, 0x9390, 0x9391, 0x9392, 0x9393, 0x9394, /* 0x60 */
     0x9395, 0x9396, 0x9397, 0x9398, 0x9399, 0x939A, 0x939B, 0x939C, /* 0x60 */
     0x939D, 0x939E, 0x939F, 0x93A0, 0x93A1, 0x93A2, 0x93A3, 0x93A4, /* 0x70 */
-    0x93A5, 0x93A6, 0x93A7, 0x93A8, 0x93A9, 0x93AA, 0x93AB,      0, /* 0x70 */
+    0x93A5, 0x93A6, 0x93A7, 0x93A8, 0x93A9, 0x93AA, 0x93AB, 	 0, /* 0x70 */
     0x93AC, 0x93AD, 0x93AE, 0x93AF, 0x93B0, 0x93B1, 0x93B2, 0x93B3, /* 0x80 */
     0x93B4, 0x93B5, 0x93B6, 0x93B7, 0x93B8, 0x93B9, 0x93BA, 0x93BB, /* 0x80 */
     0x93BC, 0x93BD, 0x93BE, 0x93BF, 0x93C0, 0x93C1, 0x93C2, 0x93C3, /* 0x90 */
@@ -3160,15 +3160,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E6[] =
     0x9A75, 0x9A77, 0x9A78, 0x9A7A, 0x9A7F, 0x9A7D, 0x9A80, 0x9A81, /* 0xE0 */
     0x9A85, 0x9A88, 0x9A8A, 0x9A90, 0x9A92, 0x9A93, 0x9A96, 0x9A98, /* 0xE0 */
     0x9A9B, 0x9A9C, 0x9A9D, 0x9A9F, 0x9AA0, 0x9AA2, 0x9AA3, 0x9AA5, /* 0xF0 */
-    0x9AA7, 0x7E9F, 0x7EA1, 0x7EA3, 0x7EA5, 0x7EA8, 0x7EA9          /* 0xF0 */
+    0x9AA7, 0x7E9F, 0x7EA1, 0x7EA3, 0x7EA5, 0x7EA8, 0x7EA9			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_E7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x93CE, 0x93CF, 0x93D0, 0x93D1, 0x93D2, 0x93D3, 0x93D4, 0x93D5, /* 0x40 */
     0x93D7, 0x93D8, 0x93D9, 0x93DA, 0x93DB, 0x93DC, 0x93DD, 0x93DE, /* 0x40 */
     0x93DF, 0x93E0, 0x93E1, 0x93E2, 0x93E3, 0x93E4, 0x93E5, 0x93E6, /* 0x50 */
@@ -3176,7 +3176,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E7[] =
     0x93EF, 0x93F0, 0x93F1, 0x93F2, 0x93F3, 0x93F4, 0x93F5, 0x93F6, /* 0x60 */
     0x93F7, 0x93F8, 0x93F9, 0x93FA, 0x93FB, 0x93FC, 0x93FD, 0x93FE, /* 0x60 */
     0x93FF, 0x9400, 0x9401, 0x9402, 0x9403, 0x9404, 0x9405, 0x9406, /* 0x70 */
-    0x9407, 0x9408, 0x9409, 0x940A, 0x940B, 0x940C, 0x940D,      0, /* 0x70 */
+    0x9407, 0x9408, 0x9409, 0x940A, 0x940B, 0x940C, 0x940D, 	 0, /* 0x70 */
     0x940E, 0x940F, 0x9410, 0x9411, 0x9412, 0x9413, 0x9414, 0x9415, /* 0x80 */
     0x9416, 0x9417, 0x9418, 0x9419, 0x941A, 0x941B, 0x941C, 0x941D, /* 0x80 */
     0x941E, 0x941F, 0x9420, 0x9421, 0x9422, 0x9423, 0x9424, 0x9425, /* 0x90 */
@@ -3192,15 +3192,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E7[] =
     0x738E, 0x7391, 0x73AE, 0x73A2, 0x739F, 0x73CF, 0x73C2, 0x73D1, /* 0xE0 */
     0x73B7, 0x73B3, 0x73C0, 0x73C9, 0x73C8, 0x73E5, 0x73D9, 0x987C, /* 0xE0 */
     0x740A, 0x73E9, 0x73E7, 0x73DE, 0x73BA, 0x73F2, 0x740F, 0x742A, /* 0xF0 */
-    0x745B, 0x7426, 0x7425, 0x7428, 0x7430, 0x742E, 0x742C          /* 0xF0 */
+    0x745B, 0x7426, 0x7425, 0x7428, 0x7430, 0x742E, 0x742C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_E8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x942F, 0x9430, 0x9431, 0x9432, 0x9433, 0x9434, 0x9435, 0x9436, /* 0x40 */
     0x9437, 0x9438, 0x9439, 0x943A, 0x943B, 0x943C, 0x943D, 0x943F, /* 0x40 */
     0x9440, 0x9441, 0x9442, 0x9443, 0x9444, 0x9445, 0x9446, 0x9447, /* 0x50 */
@@ -3208,7 +3208,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E8[] =
     0x9450, 0x9451, 0x9452, 0x9453, 0x9454, 0x9455, 0x9456, 0x9457, /* 0x60 */
     0x9458, 0x9459, 0x945A, 0x945B, 0x945C, 0x945D, 0x945E, 0x945F, /* 0x60 */
     0x9460, 0x9461, 0x9462, 0x9463, 0x9464, 0x9465, 0x9466, 0x9467, /* 0x70 */
-    0x9468, 0x9469, 0x946A, 0x946C, 0x946D, 0x946E, 0x946F,      0, /* 0x70 */
+    0x9468, 0x9469, 0x946A, 0x946C, 0x946D, 0x946E, 0x946F, 	 0, /* 0x70 */
     0x9470, 0x9471, 0x9472, 0x9473, 0x9474, 0x9475, 0x9476, 0x9477, /* 0x80 */
     0x9478, 0x9479, 0x947A, 0x947B, 0x947C, 0x947D, 0x947E, 0x947F, /* 0x80 */
     0x9480, 0x9481, 0x9482, 0x9483, 0x9484, 0x9491, 0x9496, 0x9498, /* 0x90 */
@@ -3224,15 +3224,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E8[] =
     0x6832, 0x6833, 0x6860, 0x6861, 0x684E, 0x6862, 0x6844, 0x6864, /* 0xE0 */
     0x6883, 0x681D, 0x6855, 0x6866, 0x6841, 0x6867, 0x6840, 0x683E, /* 0xE0 */
     0x684A, 0x6849, 0x6829, 0x68B5, 0x688F, 0x6874, 0x6877, 0x6893, /* 0xF0 */
-    0x686B, 0x68C2, 0x696E, 0x68FC, 0x691F, 0x6920, 0x68F9          /* 0xF0 */
+    0x686B, 0x68C2, 0x696E, 0x68FC, 0x691F, 0x6920, 0x68F9			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_E9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9527, 0x9533, 0x953D, 0x9543, 0x9548, 0x954B, 0x9555, 0x955A, /* 0x40 */
     0x9560, 0x956E, 0x9574, 0x9575, 0x9577, 0x9578, 0x9579, 0x957A, /* 0x40 */
     0x957B, 0x957C, 0x957D, 0x957E, 0x9580, 0x9581, 0x9582, 0x9583, /* 0x50 */
@@ -3240,7 +3240,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E9[] =
     0x958C, 0x958D, 0x958E, 0x958F, 0x9590, 0x9591, 0x9592, 0x9593, /* 0x60 */
     0x9594, 0x9595, 0x9596, 0x9597, 0x9598, 0x9599, 0x959A, 0x959B, /* 0x60 */
     0x959C, 0x959D, 0x959E, 0x959F, 0x95A0, 0x95A1, 0x95A2, 0x95A3, /* 0x70 */
-    0x95A4, 0x95A5, 0x95A6, 0x95A7, 0x95A8, 0x95A9, 0x95AA,      0, /* 0x70 */
+    0x95A4, 0x95A5, 0x95A6, 0x95A7, 0x95A8, 0x95A9, 0x95AA, 	 0, /* 0x70 */
     0x95AB, 0x95AC, 0x95AD, 0x95AE, 0x95AF, 0x95B0, 0x95B1, 0x95B2, /* 0x80 */
     0x95B3, 0x95B4, 0x95B5, 0x95B6, 0x95B7, 0x95B8, 0x95B9, 0x95BA, /* 0x80 */
     0x95BB, 0x95BC, 0x95BD, 0x95BE, 0x95BF, 0x95C0, 0x95C1, 0x95C2, /* 0x90 */
@@ -3256,15 +3256,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_E9[] =
     0x7337, 0x7352, 0x6B81, 0x6B82, 0x6B87, 0x6B84, 0x6B92, 0x6B93, /* 0xE0 */
     0x6B8D, 0x6B9A, 0x6B9B, 0x6BA1, 0x6BAA, 0x8F6B, 0x8F6D, 0x8F71, /* 0xE0 */
     0x8F72, 0x8F73, 0x8F75, 0x8F76, 0x8F78, 0x8F77, 0x8F79, 0x8F7A, /* 0xF0 */
-    0x8F7C, 0x8F7E, 0x8F81, 0x8F82, 0x8F84, 0x8F87, 0x8F8B          /* 0xF0 */
+    0x8F7C, 0x8F7E, 0x8F81, 0x8F82, 0x8F84, 0x8F87, 0x8F8B			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_EA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x95CC, 0x95CD, 0x95CE, 0x95CF, 0x95D0, 0x95D1, 0x95D2, 0x95D3, /* 0x40 */
     0x95D4, 0x95D5, 0x95D6, 0x95D7, 0x95D8, 0x95D9, 0x95DA, 0x95DB, /* 0x40 */
     0x95DC, 0x95DD, 0x95DE, 0x95DF, 0x95E0, 0x95E1, 0x95E2, 0x95E3, /* 0x50 */
@@ -3272,7 +3272,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_EA[] =
     0x9618, 0x961B, 0x961E, 0x9620, 0x9623, 0x9624, 0x9625, 0x9626, /* 0x60 */
     0x9627, 0x9628, 0x9629, 0x962B, 0x962C, 0x962D, 0x962F, 0x9630, /* 0x60 */
     0x9637, 0x9638, 0x9639, 0x963A, 0x963E, 0x9641, 0x9643, 0x964A, /* 0x70 */
-    0x964E, 0x964F, 0x9651, 0x9652, 0x9653, 0x9656, 0x9657,      0, /* 0x70 */
+    0x964E, 0x964F, 0x9651, 0x9652, 0x9653, 0x9656, 0x9657, 	 0, /* 0x70 */
     0x9658, 0x9659, 0x965A, 0x965C, 0x965D, 0x965E, 0x9660, 0x9663, /* 0x80 */
     0x9665, 0x9666, 0x966B, 0x966D, 0x966E, 0x966F, 0x9670, 0x9671, /* 0x80 */
     0x9673, 0x9678, 0x9679, 0x967A, 0x967B, 0x967C, 0x967D, 0x967E, /* 0x90 */
@@ -3288,15 +3288,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_EA[] =
     0x8D45, 0x8D46, 0x8D48, 0x8D49, 0x8D47, 0x8D4D, 0x8D55, 0x8D59, /* 0xE0 */
     0x89C7, 0x89CA, 0x89CB, 0x89CC, 0x89CE, 0x89CF, 0x89D0, 0x89D1, /* 0xE0 */
     0x726E, 0x729F, 0x725D, 0x7266, 0x726F, 0x727E, 0x727F, 0x7284, /* 0xF0 */
-    0x728B, 0x728D, 0x728F, 0x7292, 0x6308, 0x6332, 0x63B0          /* 0xF0 */
+    0x728B, 0x728D, 0x728F, 0x7292, 0x6308, 0x6332, 0x63B0			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_EB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x968C, 0x968E, 0x9691, 0x9692, 0x9693, 0x9695, 0x9696, 0x969A, /* 0x40 */
     0x969B, 0x969D, 0x969E, 0x969F, 0x96A0, 0x96A1, 0x96A2, 0x96A3, /* 0x40 */
     0x96A4, 0x96A5, 0x96A6, 0x96A8, 0x96A9, 0x96AA, 0x96AB, 0x96AC, /* 0x50 */
@@ -3304,7 +3304,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_EB[] =
     0x96B8, 0x96BA, 0x96BB, 0x96BF, 0x96C2, 0x96C3, 0x96C8, 0x96CA, /* 0x60 */
     0x96CB, 0x96D0, 0x96D1, 0x96D3, 0x96D4, 0x96D6, 0x96D7, 0x96D8, /* 0x60 */
     0x96D9, 0x96DA, 0x96DB, 0x96DC, 0x96DD, 0x96DE, 0x96DF, 0x96E1, /* 0x70 */
-    0x96E2, 0x96E3, 0x96E4, 0x96E5, 0x96E6, 0x96E7, 0x96EB,      0, /* 0x70 */
+    0x96E2, 0x96E3, 0x96E4, 0x96E5, 0x96E6, 0x96E7, 0x96EB, 	 0, /* 0x70 */
     0x96EC, 0x96ED, 0x96EE, 0x96F0, 0x96F1, 0x96F2, 0x96F4, 0x96F5, /* 0x80 */
     0x96F8, 0x96FA, 0x96FB, 0x96FC, 0x96FD, 0x96FF, 0x9702, 0x9703, /* 0x80 */
     0x9705, 0x970A, 0x970B, 0x970C, 0x9710, 0x9711, 0x9712, 0x9714, /* 0x90 */
@@ -3320,15 +3320,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_EB[] =
     0x8C5A, 0x8136, 0x811E, 0x812C, 0x8118, 0x8132, 0x8148, 0x814C, /* 0xE0 */
     0x8153, 0x8174, 0x8159, 0x815A, 0x8171, 0x8160, 0x8169, 0x817C, /* 0xE0 */
     0x817D, 0x816D, 0x8167, 0x584D, 0x5AB5, 0x8188, 0x8182, 0x8191, /* 0xF0 */
-    0x6ED5, 0x81A3, 0x81AA, 0x81CC, 0x6726, 0x81CA, 0x81BB          /* 0xF0 */
+    0x6ED5, 0x81A3, 0x81AA, 0x81CC, 0x6726, 0x81CA, 0x81BB			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_EC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9721, 0x9722, 0x9723, 0x9724, 0x9725, 0x9726, 0x9727, 0x9728, /* 0x40 */
     0x9729, 0x972B, 0x972C, 0x972E, 0x972F, 0x9731, 0x9733, 0x9734, /* 0x40 */
     0x9735, 0x9736, 0x9737, 0x973A, 0x973B, 0x973C, 0x973D, 0x973F, /* 0x50 */
@@ -3336,7 +3336,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_EC[] =
     0x9748, 0x9749, 0x974A, 0x974B, 0x974C, 0x974D, 0x974E, 0x974F, /* 0x60 */
     0x9750, 0x9751, 0x9754, 0x9755, 0x9757, 0x9758, 0x975A, 0x975C, /* 0x60 */
     0x975D, 0x975F, 0x9763, 0x9764, 0x9766, 0x9767, 0x9768, 0x976A, /* 0x70 */
-    0x976B, 0x976C, 0x976D, 0x976E, 0x976F, 0x9770, 0x9771,      0, /* 0x70 */
+    0x976B, 0x976C, 0x976D, 0x976E, 0x976F, 0x9770, 0x9771, 	 0, /* 0x70 */
     0x9772, 0x9775, 0x9777, 0x9778, 0x9779, 0x977A, 0x977B, 0x977D, /* 0x80 */
     0x977E, 0x977F, 0x9780, 0x9781, 0x9782, 0x9783, 0x9784, 0x9786, /* 0x80 */
     0x9787, 0x9788, 0x9789, 0x978A, 0x978C, 0x978E, 0x978F, 0x9790, /* 0x90 */
@@ -3352,15 +3352,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_EC[] =
     0x7228, 0x706C, 0x7118, 0x7166, 0x71B9, 0x623E, 0x623D, 0x6243, /* 0xE0 */
     0x6248, 0x6249, 0x793B, 0x7940, 0x7946, 0x7949, 0x795B, 0x795C, /* 0xE0 */
     0x7953, 0x795A, 0x7962, 0x7957, 0x7960, 0x796F, 0x7967, 0x797A, /* 0xF0 */
-    0x7985, 0x798A, 0x799A, 0x79A7, 0x79B3, 0x5FD1, 0x5FD0          /* 0xF0 */
+    0x7985, 0x798A, 0x799A, 0x79A7, 0x79B3, 0x5FD1, 0x5FD0			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_ED[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x979E, 0x979F, 0x97A1, 0x97A2, 0x97A4, 0x97A5, 0x97A6, 0x97A7, /* 0x40 */
     0x97A8, 0x97A9, 0x97AA, 0x97AC, 0x97AE, 0x97B0, 0x97B1, 0x97B3, /* 0x40 */
     0x97B5, 0x97B6, 0x97B7, 0x97B8, 0x97B9, 0x97BA, 0x97BB, 0x97BC, /* 0x50 */
@@ -3368,7 +3368,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_ED[] =
     0x97C5, 0x97C6, 0x97C7, 0x97C8, 0x97C9, 0x97CA, 0x97CB, 0x97CC, /* 0x60 */
     0x97CD, 0x97CE, 0x97CF, 0x97D0, 0x97D1, 0x97D2, 0x97D3, 0x97D4, /* 0x60 */
     0x97D5, 0x97D6, 0x97D7, 0x97D8, 0x97D9, 0x97DA, 0x97DB, 0x97DC, /* 0x70 */
-    0x97DD, 0x97DE, 0x97DF, 0x97E0, 0x97E1, 0x97E2, 0x97E3,      0, /* 0x70 */
+    0x97DD, 0x97DE, 0x97DF, 0x97E0, 0x97E1, 0x97E2, 0x97E3, 	 0, /* 0x70 */
     0x97E4, 0x97E5, 0x97E8, 0x97EE, 0x97EF, 0x97F0, 0x97F1, 0x97F2, /* 0x80 */
     0x97F4, 0x97F7, 0x97F8, 0x97F9, 0x97FA, 0x97FB, 0x97FC, 0x97FD, /* 0x80 */
     0x97FE, 0x97FF, 0x9800, 0x9801, 0x9802, 0x9803, 0x9804, 0x9805, /* 0x90 */
@@ -3384,15 +3384,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_ED[] =
     0x78EC, 0x78F2, 0x7905, 0x78F4, 0x7913, 0x7924, 0x791E, 0x7934, /* 0xE0 */
     0x9F9B, 0x9EF9, 0x9EFB, 0x9EFC, 0x76F1, 0x7704, 0x770D, 0x76F9, /* 0xE0 */
     0x7707, 0x7708, 0x771A, 0x7722, 0x7719, 0x772D, 0x7726, 0x7735, /* 0xF0 */
-    0x7738, 0x7750, 0x7751, 0x7747, 0x7743, 0x775A, 0x7768          /* 0xF0 */
+    0x7738, 0x7750, 0x7751, 0x7747, 0x7743, 0x775A, 0x7768			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_EE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x980F, 0x9810, 0x9811, 0x9812, 0x9813, 0x9814, 0x9815, 0x9816, /* 0x40 */
     0x9817, 0x9818, 0x9819, 0x981A, 0x981B, 0x981C, 0x981D, 0x981E, /* 0x40 */
     0x981F, 0x9820, 0x9821, 0x9822, 0x9823, 0x9824, 0x9825, 0x9826, /* 0x50 */
@@ -3400,7 +3400,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_EE[] =
     0x982F, 0x9830, 0x9831, 0x9832, 0x9833, 0x9834, 0x9835, 0x9836, /* 0x60 */
     0x9837, 0x9838, 0x9839, 0x983A, 0x983B, 0x983C, 0x983D, 0x983E, /* 0x60 */
     0x983F, 0x9840, 0x9841, 0x9842, 0x9843, 0x9844, 0x9845, 0x9846, /* 0x70 */
-    0x9847, 0x9848, 0x9849, 0x984A, 0x984B, 0x984C, 0x984D,      0, /* 0x70 */
+    0x9847, 0x9848, 0x9849, 0x984A, 0x984B, 0x984C, 0x984D, 	 0, /* 0x70 */
     0x984E, 0x984F, 0x9850, 0x9851, 0x9852, 0x9853, 0x9854, 0x9855, /* 0x80 */
     0x9856, 0x9857, 0x9858, 0x9859, 0x985A, 0x985B, 0x985C, 0x985D, /* 0x80 */
     0x985E, 0x985F, 0x9860, 0x9861, 0x9862, 0x9863, 0x9864, 0x9865, /* 0x90 */
@@ -3416,15 +3416,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_EE[] =
     0x94B9, 0x94BA, 0x94BC, 0x94BD, 0x94BF, 0x94C4, 0x94C8, 0x94C9, /* 0xE0 */
     0x94CA, 0x94CB, 0x94CC, 0x94CD, 0x94CE, 0x94D0, 0x94D1, 0x94D2, /* 0xE0 */
     0x94D5, 0x94D6, 0x94D7, 0x94D9, 0x94D8, 0x94DB, 0x94DE, 0x94DF, /* 0xF0 */
-    0x94E0, 0x94E2, 0x94E4, 0x94E5, 0x94E7, 0x94E8, 0x94EA          /* 0xF0 */
+    0x94E0, 0x94E2, 0x94E4, 0x94E5, 0x94E7, 0x94E8, 0x94EA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_EF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x986F, 0x9870, 0x9871, 0x9872, 0x9873, 0x9874, 0x988B, 0x988E, /* 0x40 */
     0x9892, 0x9895, 0x9899, 0x98A3, 0x98A8, 0x98A9, 0x98AA, 0x98AB, /* 0x40 */
     0x98AC, 0x98AD, 0x98AE, 0x98AF, 0x98B0, 0x98B1, 0x98B2, 0x98B3, /* 0x50 */
@@ -3432,7 +3432,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_EF[] =
     0x98BC, 0x98BD, 0x98BE, 0x98BF, 0x98C0, 0x98C1, 0x98C2, 0x98C3, /* 0x60 */
     0x98C4, 0x98C5, 0x98C6, 0x98C7, 0x98C8, 0x98C9, 0x98CA, 0x98CB, /* 0x60 */
     0x98CC, 0x98CD, 0x98CF, 0x98D0, 0x98D4, 0x98D6, 0x98D7, 0x98DB, /* 0x70 */
-    0x98DC, 0x98DD, 0x98E0, 0x98E1, 0x98E2, 0x98E3, 0x98E4,      0, /* 0x70 */
+    0x98DC, 0x98DD, 0x98E0, 0x98E1, 0x98E2, 0x98E3, 0x98E4, 	 0, /* 0x70 */
     0x98E5, 0x98E6, 0x98E9, 0x98EA, 0x98EB, 0x98EC, 0x98ED, 0x98EE, /* 0x80 */
     0x98EF, 0x98F0, 0x98F1, 0x98F2, 0x98F3, 0x98F4, 0x98F5, 0x98F6, /* 0x80 */
     0x98F7, 0x98F8, 0x98F9, 0x98FA, 0x98FB, 0x98FC, 0x98FD, 0x98FE, /* 0x90 */
@@ -3448,15 +3448,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_EF[] =
     0x955F, 0x955D, 0x9561, 0x9562, 0x9564, 0x9565, 0x9566, 0x9567, /* 0xE0 */
     0x9568, 0x9569, 0x956A, 0x956B, 0x956C, 0x956F, 0x9571, 0x9572, /* 0xE0 */
     0x9573, 0x953A, 0x77E7, 0x77EC, 0x96C9, 0x79D5, 0x79ED, 0x79E3, /* 0xF0 */
-    0x79EB, 0x7A06, 0x5D47, 0x7A03, 0x7A02, 0x7A1E, 0x7A14          /* 0xF0 */
+    0x79EB, 0x7A06, 0x5D47, 0x7A03, 0x7A02, 0x7A1E, 0x7A14			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_F0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9908, 0x9909, 0x990A, 0x990B, 0x990C, 0x990E, 0x990F, 0x9911, /* 0x40 */
     0x9912, 0x9913, 0x9914, 0x9915, 0x9916, 0x9917, 0x9918, 0x9919, /* 0x40 */
     0x991A, 0x991B, 0x991C, 0x991D, 0x991E, 0x991F, 0x9920, 0x9921, /* 0x50 */
@@ -3464,7 +3464,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F0[] =
     0x992A, 0x992B, 0x992C, 0x992D, 0x992F, 0x9930, 0x9931, 0x9932, /* 0x60 */
     0x9933, 0x9934, 0x9935, 0x9936, 0x9937, 0x9938, 0x9939, 0x993A, /* 0x60 */
     0x993B, 0x993C, 0x993D, 0x993E, 0x993F, 0x9940, 0x9941, 0x9942, /* 0x70 */
-    0x9943, 0x9944, 0x9945, 0x9946, 0x9947, 0x9948, 0x9949,      0, /* 0x70 */
+    0x9943, 0x9944, 0x9945, 0x9946, 0x9947, 0x9948, 0x9949, 	 0, /* 0x70 */
     0x994A, 0x994B, 0x994C, 0x994D, 0x994E, 0x994F, 0x9950, 0x9951, /* 0x80 */
     0x9952, 0x9953, 0x9956, 0x9957, 0x9958, 0x9959, 0x995A, 0x995B, /* 0x80 */
     0x995C, 0x995D, 0x995E, 0x995F, 0x9960, 0x9961, 0x9962, 0x9964, /* 0x90 */
@@ -3480,15 +3480,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F0[] =
     0x75A3, 0x75B3, 0x75B4, 0x75B8, 0x75C4, 0x75B1, 0x75B0, 0x75C3, /* 0xE0 */
     0x75C2, 0x75D6, 0x75CD, 0x75E3, 0x75E8, 0x75E6, 0x75E4, 0x75EB, /* 0xE0 */
     0x75E7, 0x7603, 0x75F1, 0x75FC, 0x75FF, 0x7610, 0x7600, 0x7605, /* 0xF0 */
-    0x760C, 0x7617, 0x760A, 0x7625, 0x7618, 0x7615, 0x7619          /* 0xF0 */
+    0x760C, 0x7617, 0x760A, 0x7625, 0x7618, 0x7615, 0x7619			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_F1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x998C, 0x998E, 0x999A, 0x999B, 0x999C, 0x999D, 0x999E, 0x999F, /* 0x40 */
     0x99A0, 0x99A1, 0x99A2, 0x99A3, 0x99A4, 0x99A6, 0x99A7, 0x99A9, /* 0x40 */
     0x99AA, 0x99AB, 0x99AC, 0x99AD, 0x99AE, 0x99AF, 0x99B0, 0x99B1, /* 0x50 */
@@ -3496,7 +3496,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F1[] =
     0x99BA, 0x99BB, 0x99BC, 0x99BD, 0x99BE, 0x99BF, 0x99C0, 0x99C1, /* 0x60 */
     0x99C2, 0x99C3, 0x99C4, 0x99C5, 0x99C6, 0x99C7, 0x99C8, 0x99C9, /* 0x60 */
     0x99CA, 0x99CB, 0x99CC, 0x99CD, 0x99CE, 0x99CF, 0x99D0, 0x99D1, /* 0x70 */
-    0x99D2, 0x99D3, 0x99D4, 0x99D5, 0x99D6, 0x99D7, 0x99D8,      0, /* 0x70 */
+    0x99D2, 0x99D3, 0x99D4, 0x99D5, 0x99D6, 0x99D7, 0x99D8, 	 0, /* 0x70 */
     0x99D9, 0x99DA, 0x99DB, 0x99DC, 0x99DD, 0x99DE, 0x99DF, 0x99E0, /* 0x80 */
     0x99E1, 0x99E2, 0x99E3, 0x99E4, 0x99E5, 0x99E6, 0x99E7, 0x99E8, /* 0x80 */
     0x99E9, 0x99EA, 0x99EB, 0x99EC, 0x99ED, 0x99EE, 0x99EF, 0x99F0, /* 0x90 */
@@ -3512,15 +3512,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F1[] =
     0x8966, 0x897B, 0x758B, 0x80E5, 0x76B2, 0x76B4, 0x77DC, 0x8012, /* 0xE0 */
     0x8014, 0x8016, 0x801C, 0x8020, 0x8022, 0x8025, 0x8026, 0x8027, /* 0xE0 */
     0x8029, 0x8028, 0x8031, 0x800B, 0x8035, 0x8043, 0x8046, 0x804D, /* 0xF0 */
-    0x8052, 0x8069, 0x8071, 0x8983, 0x9878, 0x9880, 0x9883          /* 0xF0 */
+    0x8052, 0x8069, 0x8071, 0x8983, 0x9878, 0x9880, 0x9883			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_F2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x99FA, 0x99FB, 0x99FC, 0x99FD, 0x99FE, 0x99FF, 0x9A00, 0x9A01, /* 0x40 */
     0x9A02, 0x9A03, 0x9A04, 0x9A05, 0x9A06, 0x9A07, 0x9A08, 0x9A09, /* 0x40 */
     0x9A0A, 0x9A0B, 0x9A0C, 0x9A0D, 0x9A0E, 0x9A0F, 0x9A10, 0x9A11, /* 0x50 */
@@ -3528,7 +3528,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F2[] =
     0x9A1A, 0x9A1B, 0x9A1C, 0x9A1D, 0x9A1E, 0x9A1F, 0x9A20, 0x9A21, /* 0x60 */
     0x9A22, 0x9A23, 0x9A24, 0x9A25, 0x9A26, 0x9A27, 0x9A28, 0x9A29, /* 0x60 */
     0x9A2A, 0x9A2B, 0x9A2C, 0x9A2D, 0x9A2E, 0x9A2F, 0x9A30, 0x9A31, /* 0x70 */
-    0x9A32, 0x9A33, 0x9A34, 0x9A35, 0x9A36, 0x9A37, 0x9A38,      0, /* 0x70 */
+    0x9A32, 0x9A33, 0x9A34, 0x9A35, 0x9A36, 0x9A37, 0x9A38, 	 0, /* 0x70 */
     0x9A39, 0x9A3A, 0x9A3B, 0x9A3C, 0x9A3D, 0x9A3E, 0x9A3F, 0x9A40, /* 0x80 */
     0x9A41, 0x9A42, 0x9A43, 0x9A44, 0x9A45, 0x9A46, 0x9A47, 0x9A48, /* 0x80 */
     0x9A49, 0x9A4A, 0x9A4B, 0x9A4C, 0x9A4D, 0x9A4E, 0x9A4F, 0x9A50, /* 0x90 */
@@ -3544,15 +3544,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F2[] =
     0x871E, 0x8725, 0x872E, 0x871A, 0x873E, 0x8748, 0x8734, 0x8731, /* 0xE0 */
     0x8729, 0x8737, 0x873F, 0x8782, 0x8722, 0x877D, 0x877E, 0x877B, /* 0xE0 */
     0x8760, 0x8770, 0x874C, 0x876E, 0x878B, 0x8753, 0x8763, 0x877C, /* 0xF0 */
-    0x8764, 0x8759, 0x8765, 0x8793, 0x87AF, 0x87A8, 0x87D2          /* 0xF0 */
+    0x8764, 0x8759, 0x8765, 0x8793, 0x87AF, 0x87A8, 0x87D2			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_F3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9A5A, 0x9A5B, 0x9A5C, 0x9A5D, 0x9A5E, 0x9A5F, 0x9A60, 0x9A61, /* 0x40 */
     0x9A62, 0x9A63, 0x9A64, 0x9A65, 0x9A66, 0x9A67, 0x9A68, 0x9A69, /* 0x40 */
     0x9A6A, 0x9A6B, 0x9A72, 0x9A83, 0x9A89, 0x9A8D, 0x9A8E, 0x9A94, /* 0x50 */
@@ -3560,7 +3560,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F3[] =
     0x9AAE, 0x9AAF, 0x9AB2, 0x9AB3, 0x9AB4, 0x9AB5, 0x9AB9, 0x9ABB, /* 0x60 */
     0x9ABD, 0x9ABE, 0x9ABF, 0x9AC3, 0x9AC4, 0x9AC6, 0x9AC7, 0x9AC8, /* 0x60 */
     0x9AC9, 0x9ACA, 0x9ACD, 0x9ACE, 0x9ACF, 0x9AD0, 0x9AD2, 0x9AD4, /* 0x70 */
-    0x9AD5, 0x9AD6, 0x9AD7, 0x9AD9, 0x9ADA, 0x9ADB, 0x9ADC,      0, /* 0x70 */
+    0x9AD5, 0x9AD6, 0x9AD7, 0x9AD9, 0x9ADA, 0x9ADB, 0x9ADC, 	 0, /* 0x70 */
     0x9ADD, 0x9ADE, 0x9AE0, 0x9AE2, 0x9AE3, 0x9AE4, 0x9AE5, 0x9AE7, /* 0x80 */
     0x9AE8, 0x9AE9, 0x9AEA, 0x9AEC, 0x9AEE, 0x9AF0, 0x9AF1, 0x9AF2, /* 0x80 */
     0x9AF3, 0x9AF4, 0x9AF5, 0x9AF6, 0x9AF7, 0x9AF8, 0x9AFA, 0x9AFC, /* 0x90 */
@@ -3576,15 +3576,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F3[] =
     0x7B7B, 0x7B62, 0x7B72, 0x7B71, 0x7B90, 0x7BA6, 0x7BA7, 0x7BB8, /* 0xE0 */
     0x7BAC, 0x7B9D, 0x7BA8, 0x7B85, 0x7BAA, 0x7B9C, 0x7BA2, 0x7BAB, /* 0xE0 */
     0x7BB4, 0x7BD1, 0x7BC1, 0x7BCC, 0x7BDD, 0x7BDA, 0x7BE5, 0x7BE6, /* 0xF0 */
-    0x7BEA, 0x7C0C, 0x7BFE, 0x7BFC, 0x7C0F, 0x7C16, 0x7C0B          /* 0xF0 */
+    0x7BEA, 0x7C0C, 0x7BFE, 0x7BFC, 0x7C0F, 0x7C16, 0x7C0B			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_F4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9B07, 0x9B09, 0x9B0A, 0x9B0B, 0x9B0C, 0x9B0D, 0x9B0E, 0x9B10, /* 0x40 */
     0x9B11, 0x9B12, 0x9B14, 0x9B15, 0x9B16, 0x9B17, 0x9B18, 0x9B19, /* 0x40 */
     0x9B1A, 0x9B1B, 0x9B1C, 0x9B1D, 0x9B1E, 0x9B20, 0x9B21, 0x9B22, /* 0x50 */
@@ -3592,7 +3592,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F4[] =
     0x9B2C, 0x9B2D, 0x9B2E, 0x9B30, 0x9B31, 0x9B33, 0x9B34, 0x9B35, /* 0x60 */
     0x9B36, 0x9B37, 0x9B38, 0x9B39, 0x9B3A, 0x9B3D, 0x9B3E, 0x9B3F, /* 0x60 */
     0x9B40, 0x9B46, 0x9B4A, 0x9B4B, 0x9B4C, 0x9B4E, 0x9B50, 0x9B52, /* 0x70 */
-    0x9B53, 0x9B55, 0x9B56, 0x9B57, 0x9B58, 0x9B59, 0x9B5A,      0, /* 0x70 */
+    0x9B53, 0x9B55, 0x9B56, 0x9B57, 0x9B58, 0x9B59, 0x9B5A, 	 0, /* 0x70 */
     0x9B5B, 0x9B5C, 0x9B5D, 0x9B5E, 0x9B5F, 0x9B60, 0x9B61, 0x9B62, /* 0x80 */
     0x9B63, 0x9B64, 0x9B65, 0x9B66, 0x9B67, 0x9B68, 0x9B69, 0x9B6A, /* 0x80 */
     0x9B6B, 0x9B6C, 0x9B6D, 0x9B6E, 0x9B6F, 0x9B70, 0x9B71, 0x9B72, /* 0x90 */
@@ -3608,15 +3608,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F4[] =
     0x7FBF, 0x7FCE, 0x7FD5, 0x7FE5, 0x7FE1, 0x7FE6, 0x7FE9, 0x7FEE, /* 0xE0 */
     0x7FF3, 0x7CF8, 0x7D77, 0x7DA6, 0x7DAE, 0x7E47, 0x7E9B, 0x9EB8, /* 0xE0 */
     0x9EB4, 0x8D73, 0x8D84, 0x8D94, 0x8D91, 0x8DB1, 0x8D67, 0x8D6D, /* 0xF0 */
-    0x8C47, 0x8C49, 0x914A, 0x9150, 0x914E, 0x914F, 0x9164          /* 0xF0 */
+    0x8C47, 0x8C49, 0x914A, 0x9150, 0x914E, 0x914F, 0x9164			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_F5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9B7C, 0x9B7D, 0x9B7E, 0x9B7F, 0x9B80, 0x9B81, 0x9B82, 0x9B83, /* 0x40 */
     0x9B84, 0x9B85, 0x9B86, 0x9B87, 0x9B88, 0x9B89, 0x9B8A, 0x9B8B, /* 0x40 */
     0x9B8C, 0x9B8D, 0x9B8E, 0x9B8F, 0x9B90, 0x9B91, 0x9B92, 0x9B93, /* 0x50 */
@@ -3624,7 +3624,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F5[] =
     0x9B9C, 0x9B9D, 0x9B9E, 0x9B9F, 0x9BA0, 0x9BA1, 0x9BA2, 0x9BA3, /* 0x60 */
     0x9BA4, 0x9BA5, 0x9BA6, 0x9BA7, 0x9BA8, 0x9BA9, 0x9BAA, 0x9BAB, /* 0x60 */
     0x9BAC, 0x9BAD, 0x9BAE, 0x9BAF, 0x9BB0, 0x9BB1, 0x9BB2, 0x9BB3, /* 0x70 */
-    0x9BB4, 0x9BB5, 0x9BB6, 0x9BB7, 0x9BB8, 0x9BB9, 0x9BBA,      0, /* 0x70 */
+    0x9BB4, 0x9BB5, 0x9BB6, 0x9BB7, 0x9BB8, 0x9BB9, 0x9BBA, 	 0, /* 0x70 */
     0x9BBB, 0x9BBC, 0x9BBD, 0x9BBE, 0x9BBF, 0x9BC0, 0x9BC1, 0x9BC2, /* 0x80 */
     0x9BC3, 0x9BC4, 0x9BC5, 0x9BC6, 0x9BC7, 0x9BC8, 0x9BC9, 0x9BCA, /* 0x80 */
     0x9BCB, 0x9BCC, 0x9BCD, 0x9BCE, 0x9BCF, 0x9BD0, 0x9BD1, 0x9BD2, /* 0x90 */
@@ -3640,15 +3640,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F5[] =
     0x8E35, 0x8E3D, 0x8E31, 0x8E49, 0x8E41, 0x8E42, 0x8E51, 0x8E52, /* 0xE0 */
     0x8E4A, 0x8E70, 0x8E76, 0x8E7C, 0x8E6F, 0x8E74, 0x8E85, 0x8E8F, /* 0xE0 */
     0x8E94, 0x8E90, 0x8E9C, 0x8E9E, 0x8C78, 0x8C82, 0x8C8A, 0x8C85, /* 0xF0 */
-    0x8C98, 0x8C94, 0x659B, 0x89D6, 0x89DE, 0x89DA, 0x89DC          /* 0xF0 */
+    0x8C98, 0x8C94, 0x659B, 0x89D6, 0x89DE, 0x89DA, 0x89DC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_F6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9BDC, 0x9BDD, 0x9BDE, 0x9BDF, 0x9BE0, 0x9BE1, 0x9BE2, 0x9BE3, /* 0x40 */
     0x9BE4, 0x9BE5, 0x9BE6, 0x9BE7, 0x9BE8, 0x9BE9, 0x9BEA, 0x9BEB, /* 0x40 */
     0x9BEC, 0x9BED, 0x9BEE, 0x9BEF, 0x9BF0, 0x9BF1, 0x9BF2, 0x9BF3, /* 0x50 */
@@ -3656,7 +3656,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F6[] =
     0x9BFC, 0x9BFD, 0x9BFE, 0x9BFF, 0x9C00, 0x9C01, 0x9C02, 0x9C03, /* 0x60 */
     0x9C04, 0x9C05, 0x9C06, 0x9C07, 0x9C08, 0x9C09, 0x9C0A, 0x9C0B, /* 0x60 */
     0x9C0C, 0x9C0D, 0x9C0E, 0x9C0F, 0x9C10, 0x9C11, 0x9C12, 0x9C13, /* 0x70 */
-    0x9C14, 0x9C15, 0x9C16, 0x9C17, 0x9C18, 0x9C19, 0x9C1A,      0, /* 0x70 */
+    0x9C14, 0x9C15, 0x9C16, 0x9C17, 0x9C18, 0x9C19, 0x9C1A, 	 0, /* 0x70 */
     0x9C1B, 0x9C1C, 0x9C1D, 0x9C1E, 0x9C1F, 0x9C20, 0x9C21, 0x9C22, /* 0x80 */
     0x9C23, 0x9C24, 0x9C25, 0x9C26, 0x9C27, 0x9C28, 0x9C29, 0x9C2A, /* 0x80 */
     0x9C2B, 0x9C2C, 0x9C2D, 0x9C2E, 0x9C2F, 0x9C30, 0x9C31, 0x9C32, /* 0x90 */
@@ -3672,15 +3672,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F6[] =
     0x9C9F, 0x9CA0, 0x9CA1, 0x9CA2, 0x9CA3, 0x9CA5, 0x9CA6, 0x9CA7, /* 0xE0 */
     0x9CA8, 0x9CA9, 0x9CAB, 0x9CAD, 0x9CAE, 0x9CB0, 0x9CB1, 0x9CB2, /* 0xE0 */
     0x9CB3, 0x9CB4, 0x9CB5, 0x9CB6, 0x9CB7, 0x9CBA, 0x9CBB, 0x9CBC, /* 0xF0 */
-    0x9CBD, 0x9CC4, 0x9CC5, 0x9CC6, 0x9CC7, 0x9CCA, 0x9CCB          /* 0xF0 */
+    0x9CBD, 0x9CC4, 0x9CC5, 0x9CC6, 0x9CC7, 0x9CCA, 0x9CCB			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_F7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9C3C, 0x9C3D, 0x9C3E, 0x9C3F, 0x9C40, 0x9C41, 0x9C42, 0x9C43, /* 0x40 */
     0x9C44, 0x9C45, 0x9C46, 0x9C47, 0x9C48, 0x9C49, 0x9C4A, 0x9C4B, /* 0x40 */
     0x9C4C, 0x9C4D, 0x9C4E, 0x9C4F, 0x9C50, 0x9C51, 0x9C52, 0x9C53, /* 0x50 */
@@ -3688,7 +3688,7 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F7[] =
     0x9C5C, 0x9C5D, 0x9C5E, 0x9C5F, 0x9C60, 0x9C61, 0x9C62, 0x9C63, /* 0x60 */
     0x9C64, 0x9C65, 0x9C66, 0x9C67, 0x9C68, 0x9C69, 0x9C6A, 0x9C6B, /* 0x60 */
     0x9C6C, 0x9C6D, 0x9C6E, 0x9C6F, 0x9C70, 0x9C71, 0x9C72, 0x9C73, /* 0x70 */
-    0x9C74, 0x9C75, 0x9C76, 0x9C77, 0x9C78, 0x9C79, 0x9C7A,      0, /* 0x70 */
+    0x9C74, 0x9C75, 0x9C76, 0x9C77, 0x9C78, 0x9C79, 0x9C7A, 	 0, /* 0x70 */
     0x9C7B, 0x9C7D, 0x9C7E, 0x9C80, 0x9C83, 0x9C84, 0x9C89, 0x9C8A, /* 0x80 */
     0x9C8C, 0x9C8F, 0x9C93, 0x9C96, 0x9C97, 0x9C98, 0x9C99, 0x9C9D, /* 0x80 */
     0x9CAA, 0x9CAC, 0x9CAF, 0x9CB9, 0x9CBE, 0x9CBF, 0x9CC0, 0x9CC1, /* 0x90 */
@@ -3704,15 +3704,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F7[] =
     0x9B23, 0x9EBD, 0x9EBE, 0x7E3B, 0x9E82, 0x9E87, 0x9E88, 0x9E8B, /* 0xE0 */
     0x9E92, 0x93D6, 0x9E9D, 0x9E9F, 0x9EDB, 0x9EDC, 0x9EDD, 0x9EE0, /* 0xE0 */
     0x9EDF, 0x9EE2, 0x9EE9, 0x9EE7, 0x9EE5, 0x9EEA, 0x9EEF, 0x9F22, /* 0xF0 */
-    0x9F2C, 0x9F2F, 0x9F39, 0x9F37, 0x9F3D, 0x9F3E, 0x9F44          /* 0xF0 */
+    0x9F2C, 0x9F2F, 0x9F39, 0x9F37, 0x9F3D, 0x9F3E, 0x9F44			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_F8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9CE3, 0x9CE4, 0x9CE5, 0x9CE6, 0x9CE7, 0x9CE8, 0x9CE9, 0x9CEA, /* 0x40 */
     0x9CEB, 0x9CEC, 0x9CED, 0x9CEE, 0x9CEF, 0x9CF0, 0x9CF1, 0x9CF2, /* 0x40 */
     0x9CF3, 0x9CF4, 0x9CF5, 0x9CF6, 0x9CF7, 0x9CF8, 0x9CF9, 0x9CFA, /* 0x50 */
@@ -3720,12 +3720,12 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F8[] =
     0x9D03, 0x9D04, 0x9D05, 0x9D06, 0x9D07, 0x9D08, 0x9D09, 0x9D0A, /* 0x60 */
     0x9D0B, 0x9D0C, 0x9D0D, 0x9D0E, 0x9D0F, 0x9D10, 0x9D11, 0x9D12, /* 0x60 */
     0x9D13, 0x9D14, 0x9D15, 0x9D16, 0x9D17, 0x9D18, 0x9D19, 0x9D1A, /* 0x70 */
-    0x9D1B, 0x9D1C, 0x9D1D, 0x9D1E, 0x9D1F, 0x9D20, 0x9D21,      0, /* 0x70 */
+    0x9D1B, 0x9D1C, 0x9D1D, 0x9D1E, 0x9D1F, 0x9D20, 0x9D21, 	 0, /* 0x70 */
     0x9D22, 0x9D23, 0x9D24, 0x9D25, 0x9D26, 0x9D27, 0x9D28, 0x9D29, /* 0x80 */
     0x9D2A, 0x9D2B, 0x9D2C, 0x9D2D, 0x9D2E, 0x9D2F, 0x9D30, 0x9D31, /* 0x80 */
     0x9D32, 0x9D33, 0x9D34, 0x9D35, 0x9D36, 0x9D37, 0x9D38, 0x9D39, /* 0x90 */
     0x9D3A, 0x9D3B, 0x9D3C, 0x9D3D, 0x9D3E, 0x9D3F, 0x9D40, 0x9D41, /* 0x90 */
-    0x9D42                                                          /* 0xA0 */
+    0x9D42															/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -3733,8 +3733,8 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F8[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_F9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9D43, 0x9D44, 0x9D45, 0x9D46, 0x9D47, 0x9D48, 0x9D49, 0x9D4A, /* 0x40 */
     0x9D4B, 0x9D4C, 0x9D4D, 0x9D4E, 0x9D4F, 0x9D50, 0x9D51, 0x9D52, /* 0x40 */
     0x9D53, 0x9D54, 0x9D55, 0x9D56, 0x9D57, 0x9D58, 0x9D59, 0x9D5A, /* 0x50 */
@@ -3742,12 +3742,12 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F9[] =
     0x9D63, 0x9D64, 0x9D65, 0x9D66, 0x9D67, 0x9D68, 0x9D69, 0x9D6A, /* 0x60 */
     0x9D6B, 0x9D6C, 0x9D6D, 0x9D6E, 0x9D6F, 0x9D70, 0x9D71, 0x9D72, /* 0x60 */
     0x9D73, 0x9D74, 0x9D75, 0x9D76, 0x9D77, 0x9D78, 0x9D79, 0x9D7A, /* 0x70 */
-    0x9D7B, 0x9D7C, 0x9D7D, 0x9D7E, 0x9D7F, 0x9D80, 0x9D81,      0, /* 0x70 */
+    0x9D7B, 0x9D7C, 0x9D7D, 0x9D7E, 0x9D7F, 0x9D80, 0x9D81, 	 0, /* 0x70 */
     0x9D82, 0x9D83, 0x9D84, 0x9D85, 0x9D86, 0x9D87, 0x9D88, 0x9D89, /* 0x80 */
     0x9D8A, 0x9D8B, 0x9D8C, 0x9D8D, 0x9D8E, 0x9D8F, 0x9D90, 0x9D91, /* 0x80 */
     0x9D92, 0x9D93, 0x9D94, 0x9D95, 0x9D96, 0x9D97, 0x9D98, 0x9D99, /* 0x90 */
     0x9D9A, 0x9D9B, 0x9D9C, 0x9D9D, 0x9D9E, 0x9D9F, 0x9DA0, 0x9DA1, /* 0x90 */
-    0x9DA2                                                          /* 0xA0 */
+    0x9DA2															/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -3755,8 +3755,8 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_F9[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_FA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9DA3, 0x9DA4, 0x9DA5, 0x9DA6, 0x9DA7, 0x9DA8, 0x9DA9, 0x9DAA, /* 0x40 */
     0x9DAB, 0x9DAC, 0x9DAD, 0x9DAE, 0x9DAF, 0x9DB0, 0x9DB1, 0x9DB2, /* 0x40 */
     0x9DB3, 0x9DB4, 0x9DB5, 0x9DB6, 0x9DB7, 0x9DB8, 0x9DB9, 0x9DBA, /* 0x50 */
@@ -3764,12 +3764,12 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_FA[] =
     0x9DC3, 0x9DC4, 0x9DC5, 0x9DC6, 0x9DC7, 0x9DC8, 0x9DC9, 0x9DCA, /* 0x60 */
     0x9DCB, 0x9DCC, 0x9DCD, 0x9DCE, 0x9DCF, 0x9DD0, 0x9DD1, 0x9DD2, /* 0x60 */
     0x9DD3, 0x9DD4, 0x9DD5, 0x9DD6, 0x9DD7, 0x9DD8, 0x9DD9, 0x9DDA, /* 0x70 */
-    0x9DDB, 0x9DDC, 0x9DDD, 0x9DDE, 0x9DDF, 0x9DE0, 0x9DE1,      0, /* 0x70 */
+    0x9DDB, 0x9DDC, 0x9DDD, 0x9DDE, 0x9DDF, 0x9DE0, 0x9DE1, 	 0, /* 0x70 */
     0x9DE2, 0x9DE3, 0x9DE4, 0x9DE5, 0x9DE6, 0x9DE7, 0x9DE8, 0x9DE9, /* 0x80 */
     0x9DEA, 0x9DEB, 0x9DEC, 0x9DED, 0x9DEE, 0x9DEF, 0x9DF0, 0x9DF1, /* 0x80 */
     0x9DF2, 0x9DF3, 0x9DF4, 0x9DF5, 0x9DF6, 0x9DF7, 0x9DF8, 0x9DF9, /* 0x90 */
     0x9DFA, 0x9DFB, 0x9DFC, 0x9DFD, 0x9DFE, 0x9DFF, 0x9E00, 0x9E01, /* 0x90 */
-    0x9E02                                                          /* 0xA0 */
+    0x9E02															/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -3777,8 +3777,8 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_FA[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_FB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9E03, 0x9E04, 0x9E05, 0x9E06, 0x9E07, 0x9E08, 0x9E09, 0x9E0A, /* 0x40 */
     0x9E0B, 0x9E0C, 0x9E0D, 0x9E0E, 0x9E0F, 0x9E10, 0x9E11, 0x9E12, /* 0x40 */
     0x9E13, 0x9E14, 0x9E15, 0x9E16, 0x9E17, 0x9E18, 0x9E19, 0x9E1A, /* 0x50 */
@@ -3786,12 +3786,12 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_FB[] =
     0x9E34, 0x9E3B, 0x9E3C, 0x9E40, 0x9E4D, 0x9E50, 0x9E52, 0x9E53, /* 0x60 */
     0x9E54, 0x9E56, 0x9E59, 0x9E5D, 0x9E5F, 0x9E60, 0x9E61, 0x9E62, /* 0x60 */
     0x9E65, 0x9E6E, 0x9E6F, 0x9E72, 0x9E74, 0x9E75, 0x9E76, 0x9E77, /* 0x70 */
-    0x9E78, 0x9E79, 0x9E7A, 0x9E7B, 0x9E7C, 0x9E7D, 0x9E80,      0, /* 0x70 */
+    0x9E78, 0x9E79, 0x9E7A, 0x9E7B, 0x9E7C, 0x9E7D, 0x9E80, 	 0, /* 0x70 */
     0x9E81, 0x9E83, 0x9E84, 0x9E85, 0x9E86, 0x9E89, 0x9E8A, 0x9E8C, /* 0x80 */
     0x9E8D, 0x9E8E, 0x9E8F, 0x9E90, 0x9E91, 0x9E94, 0x9E95, 0x9E96, /* 0x80 */
     0x9E97, 0x9E98, 0x9E99, 0x9E9A, 0x9E9B, 0x9E9C, 0x9E9E, 0x9EA0, /* 0x90 */
     0x9EA1, 0x9EA2, 0x9EA3, 0x9EA4, 0x9EA5, 0x9EA7, 0x9EA8, 0x9EA9, /* 0x90 */
-    0x9EAA                                                          /* 0xA0 */
+    0x9EAA															/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -3799,8 +3799,8 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_FB[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_FC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9EAB, 0x9EAC, 0x9EAD, 0x9EAE, 0x9EAF, 0x9EB0, 0x9EB1, 0x9EB2, /* 0x40 */
     0x9EB3, 0x9EB5, 0x9EB6, 0x9EB7, 0x9EB9, 0x9EBA, 0x9EBC, 0x9EBF, /* 0x40 */
     0x9EC0, 0x9EC1, 0x9EC2, 0x9EC3, 0x9EC5, 0x9EC6, 0x9EC7, 0x9EC8, /* 0x50 */
@@ -3808,12 +3808,12 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_FC[] =
     0x9ED7, 0x9ED9, 0x9EDA, 0x9EDE, 0x9EE1, 0x9EE3, 0x9EE4, 0x9EE6, /* 0x60 */
     0x9EE8, 0x9EEB, 0x9EEC, 0x9EED, 0x9EEE, 0x9EF0, 0x9EF1, 0x9EF2, /* 0x60 */
     0x9EF3, 0x9EF4, 0x9EF5, 0x9EF6, 0x9EF7, 0x9EF8, 0x9EFA, 0x9EFD, /* 0x70 */
-    0x9EFF, 0x9F00, 0x9F01, 0x9F02, 0x9F03, 0x9F04, 0x9F05,      0, /* 0x70 */
+    0x9EFF, 0x9F00, 0x9F01, 0x9F02, 0x9F03, 0x9F04, 0x9F05, 	 0, /* 0x70 */
     0x9F06, 0x9F07, 0x9F08, 0x9F09, 0x9F0A, 0x9F0C, 0x9F0F, 0x9F11, /* 0x80 */
     0x9F12, 0x9F14, 0x9F15, 0x9F16, 0x9F18, 0x9F1A, 0x9F1B, 0x9F1C, /* 0x80 */
     0x9F1D, 0x9F1E, 0x9F1F, 0x9F21, 0x9F23, 0x9F24, 0x9F25, 0x9F26, /* 0x90 */
     0x9F27, 0x9F28, 0x9F29, 0x9F2A, 0x9F2B, 0x9F2D, 0x9F2E, 0x9F30, /* 0x90 */
-    0x9F31                                                          /* 0xA0 */
+    0x9F31															/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -3821,8 +3821,8 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_FC[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_FD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9F32, 0x9F33, 0x9F34, 0x9F35, 0x9F36, 0x9F38, 0x9F3A, 0x9F3C, /* 0x40 */
     0x9F3F, 0x9F40, 0x9F41, 0x9F42, 0x9F43, 0x9F45, 0x9F46, 0x9F47, /* 0x40 */
     0x9F48, 0x9F49, 0x9F4A, 0x9F4B, 0x9F4C, 0x9F4D, 0x9F4E, 0x9F4F, /* 0x50 */
@@ -3830,12 +3830,12 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_FD[] =
     0x9F5A, 0x9F5B, 0x9F5C, 0x9F5D, 0x9F5E, 0x9F5F, 0x9F60, 0x9F61, /* 0x60 */
     0x9F62, 0x9F63, 0x9F64, 0x9F65, 0x9F66, 0x9F67, 0x9F68, 0x9F69, /* 0x60 */
     0x9F6A, 0x9F6B, 0x9F6C, 0x9F6D, 0x9F6E, 0x9F6F, 0x9F70, 0x9F71, /* 0x70 */
-    0x9F72, 0x9F73, 0x9F74, 0x9F75, 0x9F76, 0x9F77, 0x9F78,      0, /* 0x70 */
+    0x9F72, 0x9F73, 0x9F74, 0x9F75, 0x9F76, 0x9F77, 0x9F78, 	 0, /* 0x70 */
     0x9F79, 0x9F7A, 0x9F7B, 0x9F7C, 0x9F7D, 0x9F7E, 0x9F81, 0x9F82, /* 0x80 */
     0x9F8D, 0x9F8E, 0x9F8F, 0x9F90, 0x9F91, 0x9F92, 0x9F93, 0x9F94, /* 0x80 */
     0x9F95, 0x9F96, 0x9F97, 0x9F98, 0x9F9C, 0x9F9D, 0x9F9E, 0x9FA1, /* 0x90 */
     0x9FA2, 0x9FA3, 0x9FA4, 0x9FA5, 0xF92C, 0xF979, 0xF995, 0xF9E7, /* 0x90 */
-    0xF9F1                                                          /* 0xA0 */
+    0xF9F1															/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -3843,8 +3843,8 @@ static sal_uInt16 const aImplDBCSToUniTab_GBK_FD[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_GBK_FE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xFA0C, 0xFA0D, 0xFA0E, 0xFA0F, 0xFA11, 0xFA13, 0xFA14, 0xFA18, /* 0x40 */
     0xFA1F, 0xFA20, 0xFA21, 0xFA23, 0xFA24, 0xFA27, 0xFA28, 0xFA29, /* 0x40 */
     0x2E81,      0,      0,      0, 0x2E84, 0x3473, 0x3447, 0x2E88, /* 0x50 */
diff --git a/sal/textenc/tcvtscn2.tab b/sal/textenc/tcvtscn2.tab
index 1a967267f889..57945835d65d 100644
--- a/sal/textenc/tcvtscn2.tab
+++ b/sal/textenc/tcvtscn2.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,8 +35,8 @@
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_00[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, /* 0x00 */
     0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, /* 0x00 */
     0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, /* 0x10 */
@@ -53,30 +53,30 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_00[] =
     0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, /* 0x60 */
     0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, /* 0x70 */
     0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xA1E8,      0,      0, 0xA1EC, /* 0xA0 */
-    0xA1A7,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xA1E3, 0xA1C0,      0,      0,      0,      0,      0, 0xA1A4, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xA1C1, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xA8A4, 0xA8A2,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xA8A8, 0xA8A6, 0xA8BA,      0, 0xA8AC, 0xA8AA,      0,      0, /* 0xE0 */
-         0,      0, 0xA8B0, 0xA8AE,      0,      0,      0, 0xA1C2, /* 0xF0 */
-         0, 0xA8B4, 0xA8B2,      0, 0xA8B9                          /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xA1E8, 	 0, 	 0, 0xA1EC, /* 0xA0 */
+    0xA1A7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xA1E3, 0xA1C0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1A4, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1C1, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xA8A4, 0xA8A2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xA8A8, 0xA8A6, 0xA8BA, 	 0, 0xA8AC, 0xA8AA, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xA8B0, 0xA8AE, 	 0, 	 0, 	 0, 0xA1C2, /* 0xF0 */
+         0, 0xA8B4, 0xA8B2, 	 0, 0xA8B9							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_APPLECHINSIMP_00[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, /* 0x00 */
     0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, /* 0x00 */
     0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, /* 0x10 */
@@ -92,135 +92,135 @@ static sal_uInt16 const aImplUniToDBCSTab_APPLECHINSIMP_00[] =
     0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, /* 0x60 */
     0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, /* 0x60 */
     0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, /* 0x70 */
-    0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x00A0,      0, 0xA1E9, 0xA1EA, 0xA1E8, 0xA3A4,      0, 0xA1EC, /* 0xA0 */
-    0xA1A7, 0x00FD,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xA1E3, 0xA1C0,      0,      0,      0,      0,      0, 0xA1A4, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xA1C1, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xA8A4, 0xA8A2,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xA8A8, 0xA8A6, 0xA8BA,      0, 0xA8AC, 0xA8AA,      0,      0, /* 0xE0 */
-         0,      0, 0xA8B0, 0xA8AE,      0,      0,      0, 0xA1C2, /* 0xF0 */
-         0, 0xA8B4, 0xA8B2,      0, 0xA8B9                          /* 0xF0 */
+    0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x00A0, 	 0, 0xA1E9, 0xA1EA, 0xA1E8, 0xA3A4, 	 0, 0xA1EC, /* 0xA0 */
+    0xA1A7, 0x00FD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xA1E3, 0xA1C0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1A4, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1C1, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xA8A4, 0xA8A2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xA8A8, 0xA8A6, 0xA8BA, 	 0, 0xA8AC, 0xA8AA, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xA8B0, 0xA8AE, 	 0, 	 0, 	 0, 0xA1C2, /* 0xF0 */
+         0, 0xA8B4, 0xA8B2, 	 0, 0xA8B9							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_01[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xA8A1,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0xA8A5,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xA8A7,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xA8A9,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xA8BD,      0,      0,      0, /* 0x40 */
-    0xA8BE,      0,      0,      0,      0, 0xA8AD,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xA8B1,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xA8A3,      0, /* 0xC0 */
-    0xA8AB,      0, 0xA8AF,      0, 0xA8B3,      0, 0xA8B5,      0, /* 0xD0 */
-    0xA8B6,      0, 0xA8B7,      0, 0xA8B8                          /* 0xD0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xA8A1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xA8A5, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xA8A7, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xA8A9, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xA8BD, 	 0, 	 0, 	 0, /* 0x40 */
+    0xA8BE, 	 0, 	 0, 	 0, 	 0, 0xA8AD, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xA8B1, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA8A3, 	 0, /* 0xC0 */
+    0xA8AB, 	 0, 0xA8AF, 	 0, 0xA8B3, 	 0, 0xA8B5, 	 0, /* 0xD0 */
+    0xA8B6, 	 0, 0xA8B7, 	 0, 0xA8B8							/* 0xD0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_02[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xA8BB,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xA8C0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xA1A6, /* 0xC0 */
-         0, 0xA1A5, 0xA840, 0xA841,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xA842                                                  /* 0xD0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xA8BB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xA8C0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1A6, /* 0xC0 */
+         0, 0xA1A5, 0xA840, 0xA841, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xA842													/* 0xD0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_02[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xA8BB,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xA8C0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xA1A6, /* 0xC0 */
-         0, 0xA1A5                                                  /* 0xC0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xA8BB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xA8C0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1A6, /* 0xC0 */
+         0, 0xA1A5													/* 0xC0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_03[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xA6A1, 0xA6A2, 0xA6A3, 0xA6A4, 0xA6A5, 0xA6A6, 0xA6A7, /* 0x90 */
     0xA6A8, 0xA6A9, 0xA6AA, 0xA6AB, 0xA6AC, 0xA6AD, 0xA6AE, 0xA6AF, /* 0x90 */
-    0xA6B0, 0xA6B1,      0, 0xA6B2, 0xA6B3, 0xA6B4, 0xA6B5, 0xA6B6, /* 0xA0 */
-    0xA6B7, 0xA6B8,      0,      0,      0,      0,      0,      0, /* 0xA0 */
+    0xA6B0, 0xA6B1, 	 0, 0xA6B2, 0xA6B3, 0xA6B4, 0xA6B5, 0xA6B6, /* 0xA0 */
+    0xA6B7, 0xA6B8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
          0, 0xA6C1, 0xA6C2, 0xA6C3, 0xA6C4, 0xA6C5, 0xA6C6, 0xA6C7, /* 0xB0 */
     0xA6C8, 0xA6C9, 0xA6CA, 0xA6CB, 0xA6CC, 0xA6CD, 0xA6CE, 0xA6CF, /* 0xB0 */
-    0xA6D0, 0xA6D1,      0, 0xA6D2, 0xA6D3, 0xA6D4, 0xA6D5, 0xA6D6, /* 0xC0 */
-    0xA6D7, 0xA6D8                                                  /* 0xC0 */
+    0xA6D0, 0xA6D1, 	 0, 0xA6D2, 0xA6D3, 0xA6D4, 0xA6D5, 0xA6D6, /* 0xC0 */
+    0xA6D7, 0xA6D8													/* 0xC0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_04[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xA7A7,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xA7A7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
     0xA7A1, 0xA7A2, 0xA7A3, 0xA7A4, 0xA7A5, 0xA7A6, 0xA7A8, 0xA7A9, /* 0x10 */
     0xA7AA, 0xA7AB, 0xA7AC, 0xA7AD, 0xA7AE, 0xA7AF, 0xA7B0, 0xA7B1, /* 0x10 */
     0xA7B2, 0xA7B3, 0xA7B4, 0xA7B5, 0xA7B6, 0xA7B7, 0xA7B8, 0xA7B9, /* 0x20 */
@@ -229,7 +229,7 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_04[] =
     0xA7DA, 0xA7DB, 0xA7DC, 0xA7DD, 0xA7DE, 0xA7DF, 0xA7E0, 0xA7E1, /* 0x30 */
     0xA7E2, 0xA7E3, 0xA7E4, 0xA7E5, 0xA7E6, 0xA7E7, 0xA7E8, 0xA7E9, /* 0x40 */
     0xA7EA, 0xA7EB, 0xA7EC, 0xA7ED, 0xA7EE, 0xA7EF, 0xA7F0, 0xA7F1, /* 0x40 */
-         0, 0xA7D7                                                  /* 0x50 */
+         0, 0xA7D7													/* 0x50 */
                                                                     /* 0x50 */
 };
 
@@ -237,8 +237,8 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_04[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_APPLECHINSIMP_1E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x30 */
                                                             0xA8BC, /* 0x30 */
 };
@@ -247,111 +247,111 @@ static sal_uInt16 const aImplUniToDBCSTab_APPLECHINSIMP_1E[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_20[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xA95C,      0,      0, 0xA843, 0xA1AA, 0xA844, 0xA1AC,      0, /* 0x10 */
-    0xA1AE, 0xA1AF,      0,      0, 0xA1B0, 0xA1B1,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xA845, 0xA1AD,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xA1EB,      0, 0xA1E4, 0xA1E5,      0, 0xA846,      0,      0, /* 0x30 */
-         0,      0,      0, 0xA1F9,      0,      0, 0xA3FE,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x0080                          /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xA95C, 	 0, 	 0, 0xA843, 0xA1AA, 0xA844, 0xA1AC, 	 0, /* 0x10 */
+    0xA1AE, 0xA1AF, 	 0, 	 0, 0xA1B0, 0xA1B1, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xA845, 0xA1AD, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xA1EB, 	 0, 0xA1E4, 0xA1E5, 	 0, 0xA846, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xA1F9, 	 0, 	 0, 0xA3FE, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x0080							/* 0xA0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_20[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xA1AA, 0xA1AA, 0xA1AC,      0, /* 0x10 */
-    0xA1AE, 0xA1AF,      0,      0, 0xA1B0, 0xA1B1,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xA1AD,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xA1EB,      0, 0xA1E4, 0xA1E5,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xA1F9,      0,      0, 0xA3FE,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0x0080                          /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xA1AA, 0xA1AA, 0xA1AC, 	 0, /* 0x10 */
+    0xA1AE, 0xA1AF, 	 0, 	 0, 0xA1B0, 0xA1B1, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1AD, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xA1EB, 	 0, 0xA1E4, 0xA1E5, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xA1F9, 	 0, 	 0, 0xA3FE, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0x0080							/* 0xA0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_21[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xA1E6,      0, 0xA847,      0,      0, /* 0x00 */
-         0, 0xA848,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xA1ED,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xA959,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xA1E6, 	 0, 0xA847, 	 0, 	 0, /* 0x00 */
+         0, 0xA848, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1ED, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xA959, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
     0xA2F1, 0xA2F2, 0xA2F3, 0xA2F4, 0xA2F5, 0xA2F6, 0xA2F7, 0xA2F8, /* 0x60 */
-    0xA2F9, 0xA2FA, 0xA2FB, 0xA2FC,      0,      0,      0,      0, /* 0x60 */
+    0xA2F9, 0xA2FA, 0xA2FB, 0xA2FC, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
     0xA2A1, 0xA2A2, 0xA2A3, 0xA2A4, 0xA2A5, 0xA2A6, 0xA2A7, 0xA2A8, /* 0x70 */
-    0xA2A9, 0xA2AA,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xA1FB, 0xA1FC, 0xA1FA, 0xA1FD,      0,      0, 0xA849, 0xA84A, /* 0x90 */
-    0xA84B, 0xA84C                                                  /* 0x90 */
+    0xA2A9, 0xA2AA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xA1FB, 0xA1FC, 0xA1FA, 0xA1FD, 	 0, 	 0, 0xA849, 0xA84A, /* 0x90 */
+    0xA84B, 0xA84C													/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_21[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xA1E6,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xA1ED,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xA1E6, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1ED, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
     0xA2F1, 0xA2F2, 0xA2F3, 0xA2F4, 0xA2F5, 0xA2F6, 0xA2F7, 0xA2F8, /* 0x60 */
-    0xA2F9, 0xA2FA, 0xA2FB, 0xA2FC,      0,      0,      0,      0, /* 0x60 */
+    0xA2F9, 0xA2FA, 0xA2FB, 0xA2FC, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
     0xA2A1, 0xA2A2, 0xA2A3, 0xA2A4, 0xA2A5, 0xA2A6, 0xA2A7, 0xA2A8, /* 0x70 */
-    0xA2A9, 0xA2AA,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xA1FB, 0xA1FC, 0xA1FA, 0xA1FD                                  /* 0x90 */
+    0xA2A9, 0xA2AA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xA1FB, 0xA1FC, 0xA1FA, 0xA1FD									/* 0x90 */
                                                                     /* 0x90 */
 };
 
@@ -359,27 +359,27 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_21[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_APPLECHINSIMP_21[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xA1E6,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xA1ED,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x00FE,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xA1E6, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1ED, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x00FE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
     0xA2F1, 0xA2F2, 0xA2F3, 0xA2F4, 0xA2F5, 0xA2F6, 0xA2F7, 0xA2F8, /* 0x60 */
-    0xA2F9, 0xA2FA, 0xA2FB, 0xA2FC,      0,      0,      0,      0, /* 0x60 */
+    0xA2F9, 0xA2FA, 0xA2FB, 0xA2FC, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
     0xA2A1, 0xA2A2, 0xA2A3, 0xA2A4, 0xA2A5, 0xA2A6, 0xA2A7, 0xA2A8, /* 0x70 */
-    0xA2A9, 0xA2AA,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xA1FB, 0xA1FC, 0xA1FA, 0xA1FD                                  /* 0x90 */
+    0xA2A9, 0xA2AA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xA1FB, 0xA1FC, 0xA1FA, 0xA1FD									/* 0x90 */
                                                                     /* 0x90 */
 };
 
@@ -387,85 +387,85 @@ static sal_uInt16 const aImplUniToDBCSTab_APPLECHINSIMP_21[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_22[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-    0xA1CA,      0,      0,      0,      0,      0,      0, 0xA1C7, /* 0x00 */
-         0, 0xA1C6,      0,      0,      0, 0xA84D,      0,      0, /* 0x10 */
-         0,      0, 0xA1CC,      0,      0, 0xA1D8, 0xA1DE, 0xA84E, /* 0x10 */
-    0xA1CF,      0,      0, 0xA84F,      0, 0xA1CE,      0, 0xA1C4, /* 0x20 */
-    0xA1C5, 0xA1C9, 0xA1C8, 0xA1D2,      0,      0, 0xA1D3,      0, /* 0x20 */
-         0,      0,      0,      0, 0xA1E0, 0xA1DF, 0xA1C3, 0xA1CB, /* 0x30 */
-         0,      0,      0,      0,      0, 0xA1D7,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xA1D6,      0,      0,      0, 0xA1D5,      0,      0,      0, /* 0x40 */
-         0,      0, 0xA850,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xA1D9, 0xA1D4,      0,      0, 0xA1DC, 0xA1DD, 0xA851, 0xA852, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xA1DA, 0xA1DB, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xA892,      0,      0, /* 0x90 */
-         0, 0xA1D1,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xA1CD,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xA853, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xA1AD  /* 0xE0 */
+    0xA1CA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1C7, /* 0x00 */
+         0, 0xA1C6, 	 0, 	 0, 	 0, 0xA84D, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xA1CC, 	 0, 	 0, 0xA1D8, 0xA1DE, 0xA84E, /* 0x10 */
+    0xA1CF, 	 0, 	 0, 0xA84F, 	 0, 0xA1CE, 	 0, 0xA1C4, /* 0x20 */
+    0xA1C5, 0xA1C9, 0xA1C8, 0xA1D2, 	 0, 	 0, 0xA1D3, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xA1E0, 0xA1DF, 0xA1C3, 0xA1CB, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xA1D7, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xA1D6, 	 0, 	 0, 	 0, 0xA1D5, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xA850, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xA1D9, 0xA1D4, 	 0, 	 0, 0xA1DC, 0xA1DD, 0xA851, 0xA852, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1DA, 0xA1DB, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xA892, 	 0, 	 0, /* 0x90 */
+         0, 0xA1D1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xA1CD, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA853, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1AD	/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_22[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-    0xA1CA,      0,      0,      0,      0,      0,      0, 0xA1C7, /* 0x00 */
-         0, 0xA1C6,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0xA1CC,      0,      0, 0xA1D8, 0xA1DE,      0, /* 0x10 */
-    0xA1CF,      0,      0,      0,      0, 0xA1CE,      0, 0xA1C4, /* 0x20 */
-    0xA1C5, 0xA1C9, 0xA1C8, 0xA1D2,      0,      0, 0xA1D3,      0, /* 0x20 */
-         0,      0,      0,      0, 0xA1E0, 0xA1DF, 0xA1C3, 0xA1CB, /* 0x30 */
-         0,      0,      0,      0,      0, 0xA1D7,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xA1D6,      0,      0,      0, 0xA1D5,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xA1D9, 0xA1D4,      0,      0, 0xA1DC, 0xA1DD,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xA1DA, 0xA1DB, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xA1D1,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xA1CD,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xA1AD  /* 0xE0 */
+    0xA1CA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1C7, /* 0x00 */
+         0, 0xA1C6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xA1CC, 	 0, 	 0, 0xA1D8, 0xA1DE, 	 0, /* 0x10 */
+    0xA1CF, 	 0, 	 0, 	 0, 	 0, 0xA1CE, 	 0, 0xA1C4, /* 0x20 */
+    0xA1C5, 0xA1C9, 0xA1C8, 0xA1D2, 	 0, 	 0, 0xA1D3, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xA1E0, 0xA1DF, 0xA1C3, 0xA1CB, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xA1D7, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xA1D6, 	 0, 	 0, 	 0, 0xA1D5, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xA1D9, 0xA1D4, 	 0, 	 0, 0xA1DC, 0xA1DD, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1DA, 0xA1DB, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xA1D1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xA1CD, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1AD	/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_23[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xA1D0                                          /* 0x10 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xA1D0											/* 0x10 */
                                                                     /* 0x10 */
 };
 
@@ -473,24 +473,24 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_23[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_24[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xA2D9, 0xA2DA, 0xA2DB, 0xA2DC, 0xA2DD, 0xA2DE, 0xA2DF, 0xA2E0, /* 0x60 */
-    0xA2E1, 0xA2E2,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xA2C5, 0xA2C6, 0xA2C7, 0xA2C8, /* 0x70 */
+    0xA2E1, 0xA2E2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xA2C5, 0xA2C6, 0xA2C7, 0xA2C8, /* 0x70 */
     0xA2C9, 0xA2CA, 0xA2CB, 0xA2CC, 0xA2CD, 0xA2CE, 0xA2CF, 0xA2D0, /* 0x70 */
     0xA2D1, 0xA2D2, 0xA2D3, 0xA2D4, 0xA2D5, 0xA2D6, 0xA2D7, 0xA2D8, /* 0x80 */
     0xA2B1, 0xA2B2, 0xA2B3, 0xA2B4, 0xA2B5, 0xA2B6, 0xA2B7, 0xA2B8, /* 0x80 */
     0xA2B9, 0xA2BA, 0xA2BB, 0xA2BC, 0xA2BD, 0xA2BE, 0xA2BF, 0xA2C0, /* 0x90 */
-    0xA2C1, 0xA2C2, 0xA2C3, 0xA2C4                                  /* 0x90 */
+    0xA2C1, 0xA2C2, 0xA2C3, 0xA2C4									/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_25[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xA9A4, 0xA9A5, 0xA9A6, 0xA9A7, 0xA9A8, 0xA9A9, 0xA9AA, 0xA9AB, /* 0x00 */
     0xA9AC, 0xA9AD, 0xA9AE, 0xA9AF, 0xA9B0, 0xA9B1, 0xA9B2, 0xA9B3, /* 0x00 */
     0xA9B4, 0xA9B5, 0xA9B6, 0xA9B7, 0xA9B8, 0xA9B9, 0xA9BA, 0xA9BB, /* 0x10 */
@@ -500,26 +500,26 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_25[] =
     0xA9D4, 0xA9D5, 0xA9D6, 0xA9D7, 0xA9D8, 0xA9D9, 0xA9DA, 0xA9DB, /* 0x30 */
     0xA9DC, 0xA9DD, 0xA9DE, 0xA9DF, 0xA9E0, 0xA9E1, 0xA9E2, 0xA9E3, /* 0x30 */
     0xA9E4, 0xA9E5, 0xA9E6, 0xA9E7, 0xA9E8, 0xA9E9, 0xA9EA, 0xA9EB, /* 0x40 */
-    0xA9EC, 0xA9ED, 0xA9EE, 0xA9EF,      0,      0,      0,      0, /* 0x40 */
+    0xA9EC, 0xA9ED, 0xA9EE, 0xA9EF, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
     0xA854, 0xA855, 0xA856, 0xA857, 0xA858, 0xA859, 0xA85A, 0xA85B, /* 0x50 */
     0xA85C, 0xA85D, 0xA85E, 0xA85F, 0xA860, 0xA861, 0xA862, 0xA863, /* 0x50 */
     0xA864, 0xA865, 0xA866, 0xA867, 0xA868, 0xA869, 0xA86A, 0xA86B, /* 0x60 */
     0xA86C, 0xA86D, 0xA86E, 0xA86F, 0xA870, 0xA871, 0xA872, 0xA873, /* 0x60 */
-    0xA874, 0xA875, 0xA876, 0xA877,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
+    0xA874, 0xA875, 0xA876, 0xA877, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xA878, 0xA879, 0xA87A, 0xA87B, 0xA87C, 0xA87D, 0xA87E, /* 0x80 */
     0xA880, 0xA881, 0xA882, 0xA883, 0xA884, 0xA885, 0xA886, 0xA887, /* 0x80 */
-         0,      0,      0, 0xA888, 0xA889, 0xA88A,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xA1F6, 0xA1F5,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xA1F8, 0xA1F7,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xA88B, 0xA88C,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xA1F4, 0xA1F3, /* 0xC0 */
-         0,      0,      0, 0xA1F0,      0,      0, 0xA1F2, 0xA1F1, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xA88D, 0xA88E, 0xA88F, 0xA890                  /* 0xE0 */
+         0, 	 0, 	 0, 0xA888, 0xA889, 0xA88A, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xA1F6, 0xA1F5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xA1F8, 0xA1F7, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xA88B, 0xA88C, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1F4, 0xA1F3, /* 0xC0 */
+         0, 	 0, 	 0, 0xA1F0, 	 0, 	 0, 0xA1F2, 0xA1F1, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xA88D, 0xA88E, 0xA88F, 0xA890					/* 0xE0 */
                                                                     /* 0xE0 */
 };
 
@@ -527,8 +527,8 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_25[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_25[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xA9A4, 0xA9A5, 0xA9A6, 0xA9A7, 0xA9A8, 0xA9A9, 0xA9AA, 0xA9AB, /* 0x00 */
     0xA9AC, 0xA9AD, 0xA9AE, 0xA9AF, 0xA9B0, 0xA9B1, 0xA9B2, 0xA9B3, /* 0x00 */
     0xA9B4, 0xA9B5, 0xA9B6, 0xA9B7, 0xA9B8, 0xA9B9, 0xA9BA, 0xA9BB, /* 0x10 */
@@ -538,40 +538,40 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_25[] =
     0xA9D4, 0xA9D5, 0xA9D6, 0xA9D7, 0xA9D8, 0xA9D9, 0xA9DA, 0xA9DB, /* 0x30 */
     0xA9DC, 0xA9DD, 0xA9DE, 0xA9DF, 0xA9E0, 0xA9E1, 0xA9E2, 0xA9E3, /* 0x30 */
     0xA9E4, 0xA9E5, 0xA9E6, 0xA9E7, 0xA9E8, 0xA9E9, 0xA9EA, 0xA9EB, /* 0x40 */
-    0xA9EC, 0xA9ED, 0xA9EE, 0xA9EF,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xA1F6, 0xA1F5,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xA1F8, 0xA1F7,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xA1F4, 0xA1F3, /* 0xC0 */
-         0,      0,      0, 0xA1F0,      0,      0, 0xA1F2, 0xA1F1  /* 0xC0 */
+    0xA9EC, 0xA9ED, 0xA9EE, 0xA9EF, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xA1F6, 0xA1F5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xA1F8, 0xA1F7, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1F4, 0xA1F3, /* 0xC0 */
+         0, 	 0, 	 0, 0xA1F0, 	 0, 	 0, 0xA1F2, 0xA1F1	/* 0xC0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_26[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xA1EF, 0xA1EE,      0, /* 0x00 */
-         0, 0xA891,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xA1E2,      0, 0xA1E1                                          /* 0x40 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xA1EF, 0xA1EE, 	 0, /* 0x00 */
+         0, 0xA891, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xA1E2, 	 0, 0xA1E1											/* 0x40 */
                                                                     /* 0x40 */
 };
 
@@ -579,17 +579,17 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_26[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_26[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xA1EF, 0xA1EE,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xA1E2,      0, 0xA1E1                                          /* 0x40 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xA1EF, 0xA1EE, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xA1E2, 	 0, 0xA1E1											/* 0x40 */
                                                                     /* 0x40 */
 };
 
@@ -615,16 +615,16 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_2E[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_30[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xA1A1, 0xA1A2, 0xA1A3, 0xA1A8,      0, 0xA1A9, 0xA965, 0xA996, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xA1A1, 0xA1A2, 0xA1A3, 0xA1A8, 	 0, 0xA1A9, 0xA965, 0xA996, /* 0x00 */
     0xA1B4, 0xA1B5, 0xA1B6, 0xA1B7, 0xA1B8, 0xA1B9, 0xA1BA, 0xA1BB, /* 0x00 */
     0xA1BE, 0xA1BF, 0xA893, 0xA1FE, 0xA1B2, 0xA1B3, 0xA1BC, 0xA1BD, /* 0x10 */
-         0,      0,      0,      0, 0xA1AB, 0xA894, 0xA895,      0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xA1AB, 0xA894, 0xA895, 	 0, /* 0x10 */
          0, 0xA940, 0xA941, 0xA942, 0xA943, 0xA944, 0xA945, 0xA946, /* 0x20 */
-    0xA947, 0xA948,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
+    0xA947, 0xA948, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
          0, 0xA4A1, 0xA4A2, 0xA4A3, 0xA4A4, 0xA4A5, 0xA4A6, 0xA4A7, /* 0x40 */
     0xA4A8, 0xA4A9, 0xA4AA, 0xA4AB, 0xA4AC, 0xA4AD, 0xA4AE, 0xA4AF, /* 0x40 */
     0xA4B0, 0xA4B1, 0xA4B2, 0xA4B3, 0xA4B4, 0xA4B5, 0xA4B6, 0xA4B7, /* 0x50 */
@@ -635,8 +635,8 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_30[] =
     0xA4D8, 0xA4D9, 0xA4DA, 0xA4DB, 0xA4DC, 0xA4DD, 0xA4DE, 0xA4DF, /* 0x70 */
     0xA4E0, 0xA4E1, 0xA4E2, 0xA4E3, 0xA4E4, 0xA4E5, 0xA4E6, 0xA4E7, /* 0x80 */
     0xA4E8, 0xA4E9, 0xA4EA, 0xA4EB, 0xA4EC, 0xA4ED, 0xA4EE, 0xA4EF, /* 0x80 */
-    0xA4F0, 0xA4F1, 0xA4F2, 0xA4F3,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xA961, 0xA962, 0xA966, 0xA967,      0, /* 0x90 */
+    0xA4F0, 0xA4F1, 0xA4F2, 0xA4F3, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xA961, 0xA962, 0xA966, 0xA967, 	 0, /* 0x90 */
          0, 0xA5A1, 0xA5A2, 0xA5A3, 0xA5A4, 0xA5A5, 0xA5A6, 0xA5A7, /* 0xA0 */
     0xA5A8, 0xA5A9, 0xA5AA, 0xA5AB, 0xA5AC, 0xA5AD, 0xA5AE, 0xA5AF, /* 0xA0 */
     0xA5B0, 0xA5B1, 0xA5B2, 0xA5B3, 0xA5B4, 0xA5B5, 0xA5B6, 0xA5B7, /* 0xB0 */
@@ -647,24 +647,24 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_30[] =
     0xA5D8, 0xA5D9, 0xA5DA, 0xA5DB, 0xA5DC, 0xA5DD, 0xA5DE, 0xA5DF, /* 0xD0 */
     0xA5E0, 0xA5E1, 0xA5E2, 0xA5E3, 0xA5E4, 0xA5E5, 0xA5E6, 0xA5E7, /* 0xE0 */
     0xA5E8, 0xA5E9, 0xA5EA, 0xA5EB, 0xA5EC, 0xA5ED, 0xA5EE, 0xA5EF, /* 0xE0 */
-    0xA5F0, 0xA5F1, 0xA5F2, 0xA5F3, 0xA5F4, 0xA5F5, 0xA5F6,      0, /* 0xF0 */
-         0,      0,      0, 0xA1A4, 0xA960, 0xA963, 0xA964          /* 0xF0 */
+    0xA5F0, 0xA5F1, 0xA5F2, 0xA5F3, 0xA5F4, 0xA5F5, 0xA5F6, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xA1A4, 0xA960, 0xA963, 0xA964			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_30[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xA1A1, 0xA1A2, 0xA1A3, 0xA1A8,      0, 0xA1A9,      0,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xA1A1, 0xA1A2, 0xA1A3, 0xA1A8, 	 0, 0xA1A9, 	 0, 	 0, /* 0x00 */
     0xA1B4, 0xA1B5, 0xA1B6, 0xA1B7, 0xA1B8, 0xA1B9, 0xA1BA, 0xA1BB, /* 0x00 */
-    0xA1BE, 0xA1BF,      0, 0xA1FE, 0xA1B2, 0xA1B3, 0xA1BC, 0xA1BD, /* 0x10 */
-         0,      0,      0,      0, 0xA1AB,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
+    0xA1BE, 0xA1BF, 	 0, 0xA1FE, 0xA1B2, 0xA1B3, 0xA1BC, 0xA1BD, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xA1AB, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
          0, 0xA4A1, 0xA4A2, 0xA4A3, 0xA4A4, 0xA4A5, 0xA4A6, 0xA4A7, /* 0x40 */
     0xA4A8, 0xA4A9, 0xA4AA, 0xA4AB, 0xA4AC, 0xA4AD, 0xA4AE, 0xA4AF, /* 0x40 */
     0xA4B0, 0xA4B1, 0xA4B2, 0xA4B3, 0xA4B4, 0xA4B5, 0xA4B6, 0xA4B7, /* 0x50 */
@@ -675,8 +675,8 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_30[] =
     0xA4D8, 0xA4D9, 0xA4DA, 0xA4DB, 0xA4DC, 0xA4DD, 0xA4DE, 0xA4DF, /* 0x70 */
     0xA4E0, 0xA4E1, 0xA4E2, 0xA4E3, 0xA4E4, 0xA4E5, 0xA4E6, 0xA4E7, /* 0x80 */
     0xA4E8, 0xA4E9, 0xA4EA, 0xA4EB, 0xA4EC, 0xA4ED, 0xA4EE, 0xA4EF, /* 0x80 */
-    0xA4F0, 0xA4F1, 0xA4F2, 0xA4F3,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0xA4F0, 0xA4F1, 0xA4F2, 0xA4F3, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0xA5A1, 0xA5A2, 0xA5A3, 0xA5A4, 0xA5A5, 0xA5A6, 0xA5A7, /* 0xA0 */
     0xA5A8, 0xA5A9, 0xA5AA, 0xA5AB, 0xA5AC, 0xA5AD, 0xA5AE, 0xA5AF, /* 0xA0 */
     0xA5B0, 0xA5B1, 0xA5B2, 0xA5B3, 0xA5B4, 0xA5B5, 0xA5B6, 0xA5B7, /* 0xB0 */
@@ -687,22 +687,22 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_30[] =
     0xA5D8, 0xA5D9, 0xA5DA, 0xA5DB, 0xA5DC, 0xA5DD, 0xA5DE, 0xA5DF, /* 0xD0 */
     0xA5E0, 0xA5E1, 0xA5E2, 0xA5E3, 0xA5E4, 0xA5E5, 0xA5E6, 0xA5E7, /* 0xE0 */
     0xA5E8, 0xA5E9, 0xA5EA, 0xA5EB, 0xA5EC, 0xA5ED, 0xA5EE, 0xA5EF, /* 0xE0 */
-    0xA5F0, 0xA5F1, 0xA5F2, 0xA5F3, 0xA5F4, 0xA5F5, 0xA5F6,      0, /* 0xF0 */
-         0,      0,      0, 0xA1A4                                  /* 0xF0 */
+    0xA5F0, 0xA5F1, 0xA5F2, 0xA5F3, 0xA5F4, 0xA5F5, 0xA5F6, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xA1A4									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_31[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                             0xA8C5, 0xA8C6, 0xA8C7, /* 0x00 */
     0xA8C8, 0xA8C9, 0xA8CA, 0xA8CB, 0xA8CC, 0xA8CD, 0xA8CE, 0xA8CF, /* 0x00 */
     0xA8D0, 0xA8D1, 0xA8D2, 0xA8D3, 0xA8D4, 0xA8D5, 0xA8D6, 0xA8D7, /* 0x10 */
     0xA8D8, 0xA8D9, 0xA8DA, 0xA8DB, 0xA8DC, 0xA8DD, 0xA8DE, 0xA8DF, /* 0x10 */
     0xA8E0, 0xA8E1, 0xA8E2, 0xA8E3, 0xA8E4, 0xA8E5, 0xA8E6, 0xA8E7, /* 0x20 */
-    0xA8E8, 0xA8E9                                                  /* 0x20 */
+    0xA8E8, 0xA8E9													/* 0x20 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -711,25 +711,25 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_31[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_32[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xA2E5, 0xA2E6, 0xA2E7, 0xA2E8, 0xA2E9, 0xA2EA, 0xA2EB, 0xA2EC, /* 0x20 */
-    0xA2ED, 0xA2EE,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xA95A,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xA949                                  /* 0xA0 */
+    0xA2ED, 0xA2EE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xA95A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xA949									/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -737,19 +737,19 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_32[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_33[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x80 */
                                                     0xA94A, 0xA94B, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xA94C, 0xA94D, 0xA94E,      0, /* 0x90 */
-         0, 0xA94F,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xA950,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xA951,      0, /* 0xC0 */
-         0, 0xA952, 0xA953,      0,      0, 0xA954                  /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xA94C, 0xA94D, 0xA94E, 	 0, /* 0x90 */
+         0, 0xA94F, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xA950, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA951, 	 0, /* 0xC0 */
+         0, 0xA952, 0xA953, 	 0, 	 0, 0xA954					/* 0xD0 */
                                                                     /* 0xD0 */
 };
 
@@ -1031,8 +1031,8 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_4D[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_4E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xD2BB, 0xB6A1, 0x8140, 0xC6DF, 0x8141, 0x8142, 0x8143, 0xCDF2, /* 0x00 */
     0xD5C9, 0xC8FD, 0xC9CF, 0xCFC2, 0xD8A2, 0xB2BB, 0xD3EB, 0x8144, /* 0x00 */
     0xD8A4, 0xB3F3, 0x8145, 0xD7A8, 0xC7D2, 0xD8A7, 0xCAC0, 0x8146, /* 0x10 */
@@ -1064,15 +1064,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_4E[] =
     0x819C, 0xD8EE, 0x819D, 0xB4FA, 0xC1EE, 0xD2D4, 0x819E, 0x819F, /* 0xE0 */
     0xD8ED, 0x81A0, 0xD2C7, 0xD8EF, 0xC3C7, 0x81A1, 0x81A2, 0x81A3, /* 0xE0 */
     0xD1F6, 0x81A4, 0xD6D9, 0xD8F2, 0x81A5, 0xD8F5, 0xBCFE, 0xBCDB, /* 0xF0 */
-    0x81A6, 0x81A7, 0x81A8, 0xC8CE, 0x81A9, 0xB7DD, 0x81AA, 0xB7C2  /* 0xF0 */
+    0x81A6, 0x81A7, 0x81A8, 0xC8CE, 0x81A9, 0xB7DD, 0x81AA, 0xB7C2	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_4F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x81AB, 0xC6F3, 0x81AC, 0x81AD, 0x81AE, 0x81AF, 0x81B0, 0x81B1, /* 0x00 */
     0x81B2, 0xD8F8, 0xD2C1, 0x81B3, 0x81B4, 0xCEE9, 0xBCBF, 0xB7FC, /* 0x00 */
     0xB7A5, 0xD0DD, 0x81B5, 0x81B6, 0x81B7, 0x81B8, 0x81B9, 0xD6DA, /* 0x10 */
@@ -1104,15 +1104,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_4F[] =
     0x8262, 0xD0C5, 0x8263, 0xD9B6, 0x8264, 0x8265, 0xD9B1, 0x8266, /* 0xE0 */
     0xD9B2, 0xC1A9, 0xD9B3, 0x8267, 0x8268, 0xBCF3, 0xD0DE, 0xB8A9, /* 0xE0 */
     0x8269, 0xBEE3, 0x826A, 0xD9BD, 0x826B, 0x826C, 0x826D, 0x826E, /* 0xF0 */
-    0xD9BA, 0x826F, 0xB0B3, 0x8270, 0x8271, 0x8272, 0xD9C2, 0x8273  /* 0xF0 */
+    0xD9BA, 0x826F, 0xB0B3, 0x8270, 0x8271, 0x8272, 0xD9C2, 0x8273	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_50[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8274, 0x8275, 0x8276, 0x8277, 0x8278, 0x8279, 0x827A, 0x827B, /* 0x00 */
     0x827C, 0x827D, 0x827E, 0x8280, 0xD9C4, 0xB1B6, 0x8281, 0xD9BF, /* 0x00 */
     0x8282, 0x8283, 0xB5B9, 0x8284, 0xBEF3, 0x8285, 0x8286, 0x8287, /* 0x10 */
@@ -1144,15 +1144,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_50[] =
     0x8360, 0x8361, 0x8362, 0x8363, 0x8364, 0x8365, 0xD9D6, 0xC9AE, /* 0xE0 */
     0x8366, 0x8367, 0x8368, 0x8369, 0xD9D5, 0xD9D4, 0xD9D7, 0x836A, /* 0xE0 */
     0x836B, 0x836C, 0x836D, 0xCBDB, 0x836E, 0xBDA9, 0x836F, 0x8370, /* 0xF0 */
-    0x8371, 0x8372, 0x8373, 0xC6A7, 0x8374, 0x8375, 0x8376, 0x8377  /* 0xF0 */
+    0x8371, 0x8372, 0x8373, 0xC6A7, 0x8374, 0x8375, 0x8376, 0x8377	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_51[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8378, 0x8379, 0x837A, 0x837B, 0x837C, 0x837D, 0xD9D3, 0xD9D8, /* 0x00 */
     0x837E, 0x8380, 0x8381, 0xD9D9, 0x8382, 0x8383, 0x8384, 0x8385, /* 0x00 */
     0x8386, 0x8387, 0xC8E5, 0x8388, 0x8389, 0x838A, 0x838B, 0x838C, /* 0x10 */
@@ -1184,15 +1184,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_51[] =
     0xBCB8, 0xB7B2, 0x8446, 0x8447, 0xB7EF, 0x8448, 0x8449, 0x844A, /* 0xE0 */
     0x844B, 0x844C, 0x844D, 0xD9EC, 0x844E, 0xC6BE, 0x844F, 0xBFAD, /* 0xE0 */
     0xBBCB, 0x8450, 0x8451, 0xB5CA, 0x8452, 0xDBC9, 0xD0D7, 0x8453, /* 0xF0 */
-    0xCDB9, 0xB0BC, 0xB3F6, 0xBBF7, 0xDBCA, 0xBAAF, 0x8454, 0xD4E4  /* 0xF0 */
+    0xCDB9, 0xB0BC, 0xB3F6, 0xBBF7, 0xDBCA, 0xBAAF, 0x8454, 0xD4E4	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_52[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB5B6, 0xB5F3, 0xD8D6, 0xC8D0, 0x8455, 0x8456, 0xB7D6, 0xC7D0, /* 0x00 */
     0xD8D7, 0x8457, 0xBFAF, 0x8458, 0x8459, 0xDBBB, 0xD8D8, 0x845A, /* 0x00 */
     0x845B, 0xD0CC, 0xBBAE, 0x845C, 0x845D, 0x845E, 0xEBBE, 0xC1D0, /* 0x10 */
@@ -1224,15 +1224,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_52[] =
     0x84DB, 0x84DC, 0x84DD, 0x84DE, 0xC7DA, 0x84DF, 0x84E0, 0x84E1, /* 0xE0 */
     0x84E2, 0x84E3, 0x84E4, 0x84E5, 0x84E6, 0x84E7, 0x84E8, 0x84E9, /* 0xE0 */
     0xDBC4, 0x84EA, 0x84EB, 0x84EC, 0x84ED, 0x84EE, 0x84EF, 0x84F0, /* 0xF0 */
-    0x84F1, 0xD9E8, 0xC9D7, 0x84F2, 0x84F3, 0x84F4, 0xB9B4, 0xCEF0  /* 0xF0 */
+    0x84F1, 0xD9E8, 0xC9D7, 0x84F2, 0x84F3, 0x84F4, 0xB9B4, 0xCEF0	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_53[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xD4C8, 0x84F5, 0x84F6, 0x84F7, 0x84F8, 0xB0FC, 0xB4D2, 0x84F9, /* 0x00 */
     0xD0D9, 0x84FA, 0x84FB, 0x84FC, 0x84FD, 0xD9E9, 0x84FE, 0xDECB, /* 0x00 */
     0xD9EB, 0x8540, 0x8541, 0x8542, 0x8543, 0xD8B0, 0xBBAF, 0xB1B1, /* 0x10 */
@@ -1264,15 +1264,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_53[] =
     0xB5FE, 0x85B1, 0x85B2, 0xBFDA, 0xB9C5, 0xBEE4, 0xC1ED, 0x85B3, /* 0xE0 */
     0xDFB6, 0xDFB5, 0xD6BB, 0xBDD0, 0xD5D9, 0xB0C8, 0xB6A3, 0xBFC9, /* 0xE0 */
     0xCCA8, 0xDFB3, 0xCAB7, 0xD3D2, 0x85B4, 0xD8CF, 0xD2B6, 0xBAC5, /* 0xF0 */
-    0xCBBE, 0xCCBE, 0x85B5, 0xDFB7, 0xB5F0, 0xDFB4, 0x85B6, 0x85B7  /* 0xF0 */
+    0xCBBE, 0xCCBE, 0x85B5, 0xDFB7, 0xB5F0, 0xDFB4, 0x85B6, 0x85B7	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_54[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x85B8, 0xD3F5, 0x85B9, 0xB3D4, 0xB8F7, 0x85BA, 0xDFBA, 0x85BB, /* 0x00 */
     0xBACF, 0xBCAA, 0xB5F5, 0x85BC, 0xCDAC, 0xC3FB, 0xBAF3, 0xC0F4, /* 0x00 */
     0xCDC2, 0xCFF2, 0xDFB8, 0xCFC5, 0x85BD, 0xC2C0, 0xDFB9, 0xC2F0, /* 0x10 */
@@ -1304,15 +1304,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_54[] =
     0x8653, 0x8654, 0x8655, 0x8656, 0x8657, 0xB8E7, 0xC5B6, 0xDFEA, /* 0xE0 */
     0xC9DA, 0xC1A8, 0xC4C4, 0x8658, 0x8659, 0xBFDE, 0xCFF8, 0x865A, /* 0xE0 */
     0x865B, 0x865C, 0xD5DC, 0xDFEE, 0x865D, 0x865E, 0x865F, 0x8660, /* 0xF0 */
-    0x8661, 0x8662, 0xB2B8, 0x8663, 0xBADF, 0xDFEC, 0x8664, 0xDBC1  /* 0xF0 */
+    0x8661, 0x8662, 0xB2B8, 0x8663, 0xBADF, 0xDFEC, 0x8664, 0xDBC1	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_55[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8665, 0xD1E4, 0x8666, 0x8667, 0x8668, 0x8669, 0xCBF4, 0xB4BD, /* 0x00 */
     0x866A, 0xB0A6, 0x866B, 0x866C, 0x866D, 0x866E, 0x866F, 0xDFF1, /* 0x00 */
     0xCCC6, 0xDFF2, 0x8670, 0x8671, 0xDFED, 0x8672, 0x8673, 0x8674, /* 0x10 */
@@ -1344,15 +1344,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_55[] =
     0x86EB, 0xCECB, 0x86EC, 0xCBC3, 0xE0CD, 0xE0C6, 0xE0C2, 0x86ED, /* 0xE0 */
     0xE0CB, 0x86EE, 0xE0BA, 0xE0BF, 0xE0C0, 0x86EF, 0x86F0, 0xE0C5, /* 0xE0 */
     0x86F1, 0x86F2, 0xE0C7, 0xE0C8, 0x86F3, 0xE0CC, 0x86F4, 0xE0BB, /* 0xF0 */
-    0x86F5, 0x86F6, 0x86F7, 0x86F8, 0x86F9, 0xCBD4, 0xE0D5, 0x86FA  /* 0xF0 */
+    0x86F5, 0x86F6, 0x86F7, 0x86F8, 0x86F9, 0xCBD4, 0xE0D5, 0x86FA	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_56[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xE0D6, 0xE0D2, 0x86FB, 0x86FC, 0x86FD, 0x86FE, 0x8740, 0x8741, /* 0x00 */
     0xE0D0, 0xBCCE, 0x8742, 0x8743, 0xE0D1, 0x8744, 0xB8C2, 0xD8C5, /* 0x00 */
     0x8745, 0x8746, 0x8747, 0x8748, 0x8749, 0x874A, 0x874B, 0x874C, /* 0x10 */
@@ -1384,15 +1384,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_56[] =
     0xD2F2, 0xE0EF, 0xCDC5, 0x87E2, 0xB6DA, 0x87E3, 0x87E4, 0x87E5, /* 0xE0 */
     0x87E6, 0x87E7, 0x87E8, 0xE0F1, 0x87E9, 0xD4B0, 0x87EA, 0x87EB, /* 0xE0 */
     0xC0A7, 0xB4D1, 0x87EC, 0x87ED, 0xCEA7, 0xE0F0, 0x87EE, 0x87EF, /* 0xF0 */
-    0x87F0, 0xE0F2, 0xB9CC, 0x87F1, 0x87F2, 0xB9FA, 0xCDBC, 0xE0F3  /* 0xF0 */
+    0x87F0, 0xE0F2, 0xB9CC, 0x87F1, 0x87F2, 0xB9FA, 0xCDBC, 0xE0F3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_57[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x87F3, 0x87F4, 0x87F5, 0xC6D4, 0xE0F4, 0x87F6, 0xD4B2, 0x87F7, /* 0x00 */
     0xC8A6, 0xE0F6, 0xE0F5, 0x87F8, 0x87F9, 0x87FA, 0x87FB, 0x87FC, /* 0x00 */
     0x87FD, 0x87FE, 0x8840, 0x8841, 0x8842, 0x8843, 0x8844, 0x8845, /* 0x10 */
@@ -1424,15 +1424,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_57[] =
     0xB2BA, 0x88BA, 0x88BB, 0x88BC, 0xDBFD, 0x88BD, 0x88BE, 0x88BF, /* 0xE0 */
     0x88C0, 0x88C1, 0x88C2, 0x88C3, 0x88C4, 0xDCA4, 0x88C5, 0xDBFB, /* 0xE0 */
     0x88C6, 0x88C7, 0x88C8, 0x88C9, 0xDBFA, 0x88CA, 0x88CB, 0x88CC, /* 0xF0 */
-    0xDBFC, 0xC5E0, 0xBBF9, 0x88CD, 0x88CE, 0xDCA3, 0x88CF, 0x88D0  /* 0xF0 */
+    0xDBFC, 0xC5E0, 0xBBF9, 0x88CD, 0x88CE, 0xDCA3, 0x88CF, 0x88D0	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_58[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xDCA5, 0x88D1, 0xCCC3, 0x88D2, 0x88D3, 0x88D4, 0xB6D1, 0xDDC0, /* 0x00 */
     0x88D5, 0x88D6, 0x88D7, 0xDCA1, 0x88D8, 0xDCA2, 0x88D9, 0x88DA, /* 0x00 */
     0x88DB, 0xC7B5, 0x88DC, 0x88DD, 0x88DE, 0xB6E9, 0x88DF, 0x88E0, /* 0x10 */
@@ -1464,15 +1464,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_58[] =
     0x89C6, 0x89C7, 0x89C8, 0x89C9, 0xC8C0, 0x89CA, 0x89CB, 0x89CC, /* 0xE0 */
     0x89CD, 0x89CE, 0x89CF, 0xCABF, 0xC8C9, 0x89D0, 0xD7B3, 0x89D1, /* 0xE0 */
     0xC9F9, 0x89D2, 0x89D3, 0xBFC7, 0x89D4, 0x89D5, 0xBAF8, 0x89D6, /* 0xF0 */
-    0x89D7, 0xD2BC, 0x89D8, 0x89D9, 0x89DA, 0x89DB, 0x89DC, 0x89DD  /* 0xF0 */
+    0x89D7, 0xD2BC, 0x89D8, 0x89D9, 0x89DA, 0x89DB, 0x89DC, 0x89DD	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_59[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x89DE, 0x89DF, 0xE2BA, 0x89E0, 0xB4A6, 0x89E1, 0x89E2, 0xB1B8, /* 0x00 */
     0x89E3, 0x89E4, 0x89E5, 0x89E6, 0x89E7, 0xB8B4, 0x89E8, 0xCFC4, /* 0x00 */
     0x89E9, 0x89EA, 0x89EB, 0x89EC, 0xD9E7, 0xCFA6, 0xCDE2, 0x89ED, /* 0x10 */
@@ -1504,15 +1504,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_59[] =
     0x8AA2, 0x8AA3, 0x8AA4, 0xE6AF, 0x8AA5, 0xC0D1, 0x8AA6, 0x8AA7, /* 0xE0 */
     0xD2CC, 0x8AA8, 0x8AA9, 0x8AAA, 0xBCA7, 0x8AAB, 0x8AAC, 0x8AAD, /* 0xE0 */
     0x8AAE, 0x8AAF, 0x8AB0, 0x8AB1, 0x8AB2, 0x8AB3, 0x8AB4, 0x8AB5, /* 0xF0 */
-    0x8AB6, 0xE6B1, 0x8AB7, 0xD2F6, 0x8AB8, 0x8AB9, 0x8ABA, 0xD7CB  /* 0xF0 */
+    0x8AB6, 0xE6B1, 0x8AB7, 0xD2F6, 0x8AB8, 0x8AB9, 0x8ABA, 0xD7CB	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_5A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8ABB, 0xCDFE, 0x8ABC, 0xCDDE, 0xC2A6, 0xE6AB, 0xE6AC, 0xBDBF, /* 0x00 */
     0xE6AE, 0xE6B3, 0x8ABD, 0x8ABE, 0xE6B2, 0x8ABF, 0x8AC0, 0x8AC1, /* 0x00 */
     0x8AC2, 0xE6B6, 0x8AC3, 0xE6B8, 0x8AC4, 0x8AC5, 0x8AC6, 0x8AC7, /* 0x10 */
@@ -1544,15 +1544,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_5A[] =
     0xE6CB, 0xB5D5, 0x8BA5, 0xE6CC, 0x8BA6, 0x8BA7, 0xE6CF, 0x8BA8, /* 0xE0 */
     0x8BA9, 0xC4DB, 0x8BAA, 0xE6C6, 0x8BAB, 0x8BAC, 0x8BAD, 0x8BAE, /* 0xE0 */
     0x8BAF, 0xE6CD, 0x8BB0, 0x8BB1, 0x8BB2, 0x8BB3, 0x8BB4, 0x8BB5, /* 0xF0 */
-    0x8BB6, 0x8BB7, 0x8BB8, 0x8BB9, 0x8BBA, 0x8BBB, 0x8BBC, 0x8BBD  /* 0xF0 */
+    0x8BB6, 0x8BB7, 0x8BB8, 0x8BB9, 0x8BBA, 0x8BBB, 0x8BBC, 0x8BBD	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_5B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8BBE, 0x8BBF, 0x8BC0, 0x8BC1, 0x8BC2, 0x8BC3, 0x8BC4, 0x8BC5, /* 0x00 */
     0x8BC6, 0xE6D2, 0x8BC7, 0x8BC8, 0x8BC9, 0x8BCA, 0x8BCB, 0x8BCC, /* 0x00 */
     0x8BCD, 0x8BCE, 0x8BCF, 0x8BD0, 0x8BD1, 0x8BD2, 0xE6D4, 0xE6D3, /* 0x10 */
@@ -1584,15 +1584,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_5B[] =
     0x8C8A, 0xB9D1, 0x8C8B, 0x8C8C, 0xE5BB, 0xC1C8, 0x8C8D, 0x8C8E, /* 0xE0 */
     0xD5AF, 0x8C8F, 0x8C90, 0x8C91, 0x8C92, 0x8C93, 0xE5BC, 0x8C94, /* 0xE0 */
     0xE5BE, 0x8C95, 0x8C96, 0x8C97, 0x8C98, 0x8C99, 0x8C9A, 0x8C9B, /* 0xF0 */
-    0xB4E7, 0xB6D4, 0xCBC2, 0xD1B0, 0xB5BC, 0x8C9C, 0x8C9D, 0xCAD9  /* 0xF0 */
+    0xB4E7, 0xB6D4, 0xCBC2, 0xD1B0, 0xB5BC, 0x8C9C, 0x8C9D, 0xCAD9	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_5C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8C9E, 0xB7E2, 0x8C9F, 0x8CA0, 0xC9E4, 0x8CA1, 0xBDAB, 0x8CA2, /* 0x00 */
     0x8CA3, 0xCEBE, 0xD7F0, 0x8CA4, 0x8CA5, 0x8CA6, 0x8CA7, 0xD0A1, /* 0x00 */
     0x8CA8, 0xC9D9, 0x8CA9, 0x8CAA, 0xB6FB, 0xE6D8, 0xBCE2, 0x8CAB, /* 0x10 */
@@ -1624,15 +1624,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_5C[] =
     0x8D67, 0xCFBF, 0x8D68, 0x8D69, 0xE1BD, 0xE1BF, 0xC2CD, 0x8D6A, /* 0xE0 */
     0xB6EB, 0x8D6B, 0xD3F8, 0x8D6C, 0x8D6D, 0xC7CD, 0x8D6E, 0x8D6F, /* 0xE0 */
     0xB7E5, 0x8D70, 0x8D71, 0x8D72, 0x8D73, 0x8D74, 0x8D75, 0x8D76, /* 0xF0 */
-    0x8D77, 0x8D78, 0x8D79, 0xBEFE, 0x8D7A, 0x8D7B, 0x8D7C, 0x8D7D  /* 0xF0 */
+    0x8D77, 0x8D78, 0x8D79, 0xBEFE, 0x8D7A, 0x8D7B, 0x8D7C, 0x8D7D	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_5D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8D7E, 0x8D80, 0xE1C0, 0xE1C1, 0x8D81, 0x8D82, 0xE1C7, 0xB3E7, /* 0x00 */
     0x8D83, 0x8D84, 0x8D85, 0x8D86, 0x8D87, 0x8D88, 0xC6E9, 0x8D89, /* 0x00 */
     0x8D8A, 0x8D8B, 0x8D8C, 0x8D8D, 0xB4DE, 0x8D8E, 0xD1C2, 0x8D8F, /* 0x10 */
@@ -1664,15 +1664,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_5D[] =
     0x8E79, 0xD1B2, 0xB3B2, 0x8E7A, 0x8E7B, 0xB9A4, 0xD7F3, 0xC7C9, /* 0xE0 */
     0xBEDE, 0xB9AE, 0x8E7C, 0xCED7, 0x8E7D, 0x8E7E, 0xB2EE, 0xDBCF, /* 0xE0 */
     0x8E80, 0xBCBA, 0xD2D1, 0xCBC8, 0xB0CD, 0x8E81, 0x8E82, 0xCFEF, /* 0xF0 */
-    0x8E83, 0x8E84, 0x8E85, 0x8E86, 0x8E87, 0xD9E3, 0xBDED, 0x8E88  /* 0xF0 */
+    0x8E83, 0x8E84, 0x8E85, 0x8E86, 0x8E87, 0xD9E3, 0xBDED, 0x8E88	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_5E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8E89, 0xB1D2, 0xCAD0, 0xB2BC, 0x8E8A, 0xCBA7, 0xB7AB, 0x8E8B, /* 0x00 */
     0xCAA6, 0x8E8C, 0x8E8D, 0x8E8E, 0xCFA3, 0x8E8F, 0x8E90, 0xE0F8, /* 0x00 */
     0xD5CA, 0xE0FB, 0x8E91, 0x8E92, 0xE0FA, 0xC5C1, 0xCCFB, 0x8E93, /* 0x10 */
@@ -1704,15 +1704,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_5E[] =
     0x8F53, 0x8F54, 0x8F55, 0x8F56, 0x8F57, 0x8F58, 0x8F59, 0x8F5A, /* 0xE0 */
     0xE2DD, 0x8F5B, 0xE2DE, 0x8F5C, 0x8F5D, 0x8F5E, 0x8F5F, 0x8F60, /* 0xE0 */
     0x8F61, 0x8F62, 0x8F63, 0x8F64, 0xDBC8, 0x8F65, 0xD1D3, 0xCDA2, /* 0xF0 */
-    0x8F66, 0x8F67, 0xBDA8, 0x8F68, 0x8F69, 0x8F6A, 0xDEC3, 0xD8A5  /* 0xF0 */
+    0x8F66, 0x8F67, 0xBDA8, 0x8F68, 0x8F69, 0x8F6A, 0xDEC3, 0xD8A5	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_5F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xBFAA, 0xDBCD, 0xD2EC, 0xC6FA, 0xC5AA, 0x8F6B, 0x8F6C, 0x8F6D, /* 0x00 */
     0xDEC4, 0x8F6E, 0xB1D7, 0xDFAE, 0x8F6F, 0x8F70, 0x8F71, 0xCABD, /* 0x00 */
     0x8F72, 0xDFB1, 0x8F73, 0xB9AD, 0x8F74, 0xD2FD, 0x8F75, 0xB8A5, /* 0x10 */
@@ -1744,15 +1744,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_5F[] =
     0xD6D2, 0xE2E7, 0x8FED, 0x8FEE, 0xE2E8, 0x8FEF, 0x8FF0, 0xD3C7, /* 0xE0 */
     0x8FF1, 0x8FF2, 0xE2EC, 0xBFEC, 0x8FF3, 0xE2ED, 0xE2E5, 0x8FF4, /* 0xE0 */
     0x8FF5, 0xB3C0, 0x8FF6, 0x8FF7, 0x8FF8, 0xC4EE, 0x8FF9, 0x8FFA, /* 0xF0 */
-    0xE2EE, 0x8FFB, 0x8FFC, 0xD0C3, 0x8FFD, 0xBAF6, 0xE2E9, 0xB7DE  /* 0xF0 */
+    0xE2EE, 0x8FFB, 0x8FFC, 0xD0C3, 0x8FFD, 0xBAF6, 0xE2E9, 0xB7DE	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_60[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xBBB3, 0xCCAC, 0xCBCB, 0xE2E4, 0xE2E6, 0xE2EA, 0xE2EB, 0x8FFE, /* 0x00 */
     0x9040, 0x9041, 0xE2F7, 0x9042, 0x9043, 0xE2F4, 0xD4F5, 0xE2F3, /* 0x00 */
     0x9044, 0x9045, 0xC5AD, 0x9046, 0xD5FA, 0xC5C2, 0xB2C0, 0x9047, /* 0x10 */
@@ -1784,15 +1784,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_60[] =
     0xBBDD, 0x90BA, 0x90BB, 0x90BC, 0x90BD, 0x90BE, 0xB5EB, 0xBEE5, /* 0xE0 */
     0xB2D2, 0xB3CD, 0x90BF, 0xB1B9, 0xE3AB, 0xB2D1, 0xB5AC, 0xB9DF, /* 0xE0 */
     0xB6E8, 0x90C0, 0x90C1, 0xCFEB, 0xE3B7, 0x90C2, 0xBBCC, 0x90C3, /* 0xF0 */
-    0x90C4, 0xC8C7, 0xD0CA, 0x90C5, 0x90C6, 0x90C7, 0x90C8, 0x90C9  /* 0xF0 */
+    0x90C4, 0xC8C7, 0xD0CA, 0x90C5, 0x90C6, 0x90C7, 0x90C8, 0x90C9	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_61[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xE3B8, 0xB3EE, 0x90CA, 0x90CB, 0x90CC, 0x90CD, 0xEDA9, 0x90CE, /* 0x00 */
     0xD3FA, 0xD3E4, 0x90CF, 0x90D0, 0x90D1, 0xEDAA, 0xE3B9, 0xD2E2, /* 0x00 */
     0x90D2, 0x90D3, 0x90D4, 0x90D5, 0x90D6, 0xE3B5, 0x90D7, 0x90D8, /* 0x10 */
@@ -1824,15 +1824,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_61[] =
     0x91BC, 0x91BD, 0x91BE, 0x91BF, 0x91C0, 0x91C1, 0xC5B3, 0x91C2, /* 0xE0 */
     0x91C3, 0x91C4, 0x91C5, 0x91C6, 0x91C7, 0x91C8, 0x91C9, 0x91CA, /* 0xE0 */
     0x91CB, 0x91CC, 0x91CD, 0x91CE, 0x91CF, 0xE3C2, 0x91D0, 0x91D1, /* 0xF0 */
-    0x91D2, 0x91D3, 0x91D4, 0x91D5, 0x91D6, 0x91D7, 0x91D8, 0xDCB2  /* 0xF0 */
+    0x91D2, 0x91D3, 0x91D4, 0x91D5, 0x91D6, 0x91D7, 0x91D8, 0xDCB2	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_62[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x91D9, 0x91DA, 0x91DB, 0x91DC, 0x91DD, 0x91DE, 0xEDB0, 0x91DF, /* 0x00 */
     0xB8EA, 0x91E0, 0xCEEC, 0xEAA7, 0xD0E7, 0xCAF9, 0xC8D6, 0xCFB7, /* 0x00 */
     0xB3C9, 0xCED2, 0xBDE4, 0x91E1, 0x91E2, 0xE3DE, 0xBBF2, 0xEAA8, /* 0x10 */
@@ -1864,15 +1864,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_62[] =
     0x9287, 0x9288, 0xC2A3, 0xBCF0, 0x9289, 0xD3B5, 0xC0B9, 0xC5A1, /* 0xE0 */
     0xB2A6, 0xD4F1, 0x928A, 0x928B, 0xC0A8, 0xCAC3, 0xDED7, 0xD5FC, /* 0xE0 */
     0x928C, 0xB9B0, 0x928D, 0xC8AD, 0xCBA9, 0x928E, 0xDED9, 0xBFBD, /* 0xF0 */
-    0x928F, 0x9290, 0x9291, 0x9292, 0xC6B4, 0xD7A7, 0xCAB0, 0xC4C3  /* 0xF0 */
+    0x928F, 0x9290, 0x9291, 0x9292, 0xC6B4, 0xD7A7, 0xCAB0, 0xC4C3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_63[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9293, 0xB3D6, 0xB9D2, 0x9294, 0x9295, 0x9296, 0x9297, 0xD6B8, /* 0x00 */
     0xEAFC, 0xB0B4, 0x9298, 0x9299, 0x929A, 0x929B, 0xBFE6, 0x929C, /* 0x00 */
     0x929D, 0xCCF4, 0x929E, 0x929F, 0x92A0, 0x92A1, 0xCDDA, 0x92A2, /* 0x10 */
@@ -1904,15 +1904,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_63[] =
     0xDEEB, 0xCED5, 0x9355, 0xB4A7, 0x9356, 0x9357, 0x9358, 0x9359, /* 0xE0 */
     0x935A, 0xBFAB, 0xBEBE, 0x935B, 0x935C, 0xBDD2, 0x935D, 0x935E, /* 0xE0 */
     0x935F, 0x9360, 0xDEE9, 0x9361, 0xD4AE, 0x9362, 0xDEDE, 0x9363, /* 0xF0 */
-    0xDEEA, 0x9364, 0x9365, 0x9366, 0x9367, 0xC0BF, 0x9368, 0xDEEC  /* 0xF0 */
+    0xDEEA, 0x9364, 0x9365, 0x9366, 0x9367, 0xC0BF, 0x9368, 0xDEEC	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_64[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB2F3, 0xB8E9, 0xC2A7, 0x9369, 0x936A, 0xBDC1, 0x936B, 0x936C, /* 0x00 */
     0x936D, 0x936E, 0x936F, 0xDEF5, 0xDEF8, 0x9370, 0x9371, 0xB2AB, /* 0x00 */
     0xB4A4, 0x9372, 0x9373, 0xB4EA, 0xC9A6, 0x9374, 0x9375, 0x9376, /* 0x10 */
@@ -1944,15 +1944,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_64[] =
     0x9444, 0x9445, 0xDFAA, 0x9446, 0xDFA9, 0x9447, 0xB2C1, 0x9448, /* 0xE0 */
     0x9449, 0x944A, 0x944B, 0x944C, 0x944D, 0x944E, 0x944F, 0x9450, /* 0xE0 */
     0x9451, 0x9452, 0x9453, 0x9454, 0x9455, 0x9456, 0x9457, 0x9458, /* 0xF0 */
-    0x9459, 0x945A, 0x945B, 0x945C, 0x945D, 0x945E, 0x945F, 0x9460  /* 0xF0 */
+    0x9459, 0x945A, 0x945B, 0x945C, 0x945D, 0x945E, 0x945F, 0x9460	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_65[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC5CA, 0x9461, 0x9462, 0x9463, 0x9464, 0x9465, 0x9466, 0x9467, /* 0x00 */
     0x9468, 0xDFAB, 0x9469, 0x946A, 0x946B, 0x946C, 0x946D, 0x946E, /* 0x00 */
     0x946F, 0x9470, 0xD4DC, 0x9471, 0x9472, 0x9473, 0x9474, 0x9475, /* 0x10 */
@@ -1984,15 +1984,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_65[] =
     0xCEDE, 0x94FA, 0xBCC8, 0x94FB, 0x94FC, 0xC8D5, 0xB5A9, 0xBEC9, /* 0xE0 */
     0xD6BC, 0xD4E7, 0x94FD, 0x94FE, 0xD1AE, 0xD0F1, 0xEAB8, 0xEAB9, /* 0xE0 */
     0xEABA, 0xBAB5, 0x9540, 0x9541, 0x9542, 0x9543, 0xCAB1, 0xBFF5, /* 0xF0 */
-    0x9544, 0x9545, 0xCDFA, 0x9546, 0x9547, 0x9548, 0x9549, 0x954A  /* 0xF0 */
+    0x9544, 0x9545, 0xCDFA, 0x9546, 0x9547, 0x9548, 0x9549, 0x954A	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_66[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xEAC0, 0x954B, 0xB0BA, 0xEABE, 0x954C, 0x954D, 0xC0A5, 0x954E, /* 0x00 */
     0x954F, 0x9550, 0xEABB, 0x9551, 0xB2FD, 0x9552, 0xC3F7, 0xBBE8, /* 0x00 */
     0x9553, 0x9554, 0x9555, 0xD2D7, 0xCEF4, 0xEABF, 0x9556, 0x9557, /* 0x10 */
@@ -2024,15 +2024,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_66[] =
     0x95E7, 0x95E8, 0x95E9, 0x95EA, 0x95EB, 0x95EC, 0xEAD8, 0x95ED, /* 0xE0 */
     0x95EE, 0xEAD9, 0x95EF, 0x95F0, 0x95F1, 0x95F2, 0x95F3, 0x95F4, /* 0xE0 */
     0xD4BB, 0x95F5, 0xC7FA, 0xD2B7, 0xB8FC, 0x95F6, 0x95F7, 0xEAC2, /* 0xF0 */
-    0x95F8, 0xB2DC, 0x95F9, 0x95FA, 0xC2FC, 0x95FB, 0xD4F8, 0xCCE6  /* 0xF0 */
+    0x95F8, 0xB2DC, 0x95F9, 0x95FA, 0xC2FC, 0x95FB, 0xD4F8, 0xCCE6	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_67[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xD7EE, 0x95FC, 0x95FD, 0x95FE, 0x9640, 0x9641, 0x9642, 0x9643, /* 0x00 */
     0xD4C2, 0xD3D0, 0xEBC3, 0xC5F3, 0x9644, 0xB7FE, 0x9645, 0x9646, /* 0x00 */
     0xEBD4, 0x9647, 0x9648, 0x9649, 0xCBB7, 0xEBDE, 0x964A, 0xC0CA, /* 0x10 */
@@ -2064,15 +2064,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_67[] =
     0xC4FB, 0x96BA, 0xE8DC, 0x96BB, 0x96BC, 0xB2E9, 0x96BD, 0x96BE, /* 0xE0 */
     0x96BF, 0xE8D1, 0x96C0, 0x96C1, 0xBCED, 0x96C2, 0x96C3, 0xBFC2, /* 0xE0 */
     0xE8CD, 0xD6F9, 0x96C4, 0xC1F8, 0xB2F1, 0x96C5, 0x96C6, 0x96C7, /* 0xF0 */
-    0x96C8, 0x96C9, 0x96CA, 0x96CB, 0x96CC, 0xE8DF, 0x96CD, 0xCAC1  /* 0xF0 */
+    0x96C8, 0x96C9, 0x96CA, 0x96CB, 0x96CC, 0xE8DF, 0x96CD, 0xCAC1	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_68[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xE8D9, 0x96CE, 0x96CF, 0x96D0, 0x96D1, 0xD5A4, 0x96D2, 0xB1EA, /* 0x00 */
     0xD5BB, 0xE8CE, 0xE8D0, 0xB6B0, 0xE8D3, 0x96D3, 0xE8DD, 0xC0B8, /* 0x00 */
     0x96D4, 0xCAF7, 0x96D5, 0xCBA8, 0x96D6, 0x96D7, 0xC6DC, 0xC0F5, /* 0x10 */
@@ -2104,15 +2104,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_68[] =
     0xCCC4, 0x979E, 0x979F, 0xE9A6, 0x97A0, 0x97A1, 0x97A2, 0x97A3, /* 0xE0 */
     0x97A4, 0x97A5, 0x97A6, 0x97A7, 0x97A8, 0x97A9, 0xC9AD, 0x97AA, /* 0xE0 */
     0xE9A2, 0xC0E2, 0x97AB, 0x97AC, 0x97AD, 0xBFC3, 0x97AE, 0x97AF, /* 0xF0 */
-    0x97B0, 0xE8FE, 0xB9D7, 0x97B1, 0xE8FB, 0x97B2, 0x97B3, 0x97B4  /* 0xF0 */
+    0x97B0, 0xE8FE, 0xB9D7, 0x97B1, 0xE8FB, 0x97B2, 0x97B3, 0x97B4	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_69[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x97B5, 0xE9A4, 0x97B6, 0x97B7, 0x97B8, 0xD2CE, 0x97B9, 0x97BA, /* 0x00 */
     0x97BB, 0x97BC, 0x97BD, 0xE9A3, 0x97BE, 0xD6B2, 0xD7B5, 0x97BF, /* 0x00 */
     0xE9A7, 0x97C0, 0xBDB7, 0x97C1, 0x97C2, 0x97C3, 0x97C4, 0x97C5, /* 0x10 */
@@ -2144,15 +2144,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_69[] =
     0xE9C6, 0x989A, 0x989B, 0x989C, 0x989D, 0x989E, 0x989F, 0x98A0, /* 0xE0 */
     0x98A1, 0x98A2, 0x98A3, 0x98A4, 0x98A5, 0xE9CA, 0x98A6, 0x98A7, /* 0xE0 */
     0x98A8, 0x98A9, 0xE9CE, 0x98AA, 0x98AB, 0x98AC, 0x98AD, 0x98AE, /* 0xF0 */
-    0x98AF, 0x98B0, 0x98B1, 0x98B2, 0x98B3, 0xB2DB, 0x98B4, 0xE9C8  /* 0xF0 */
+    0x98AF, 0x98B0, 0x98B1, 0x98B2, 0x98B3, 0xB2DB, 0x98B4, 0xE9C8	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_6A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x98B5, 0x98B6, 0x98B7, 0x98B8, 0x98B9, 0x98BA, 0x98BB, 0x98BC, /* 0x00 */
     0x98BD, 0x98BE, 0xB7AE, 0x98BF, 0x98C0, 0x98C1, 0x98C2, 0x98C3, /* 0x00 */
     0x98C4, 0x98C5, 0x98C6, 0x98C7, 0x98C8, 0x98C9, 0x98CA, 0xE9CB, /* 0x10 */
@@ -2184,15 +2184,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_6A[] =
     0x99B6, 0x99B7, 0x99B8, 0x99B9, 0x99BA, 0x99BB, 0x99BC, 0x99BD, /* 0xE0 */
     0x99BE, 0x99BF, 0x99C0, 0x99C1, 0x99C2, 0x99C3, 0x99C4, 0x99C5, /* 0xE0 */
     0x99C6, 0x99C7, 0x99C8, 0x99C9, 0x99CA, 0x99CB, 0x99CC, 0x99CD, /* 0xF0 */
-    0x99CE, 0x99CF, 0x99D0, 0x99D1, 0x99D2, 0x99D3, 0x99D4, 0x99D5  /* 0xF0 */
+    0x99CE, 0x99CF, 0x99D0, 0x99D1, 0x99D2, 0x99D3, 0x99D4, 0x99D5	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_6B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x99D6, 0x99D7, 0x99D8, 0x99D9, 0x99DA, 0x99DB, 0x99DC, 0x99DD, /* 0x00 */
     0x99DE, 0x99DF, 0x99E0, 0x99E1, 0x99E2, 0x99E3, 0x99E4, 0x99E5, /* 0x00 */
     0x99E6, 0x99E7, 0x99E8, 0x99E9, 0x99EA, 0x99EB, 0x99EC, 0x99ED, /* 0x10 */
@@ -2224,15 +2224,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_6B[] =
     0x9AB9, 0xD5B1, 0x9ABA, 0x9ABB, 0x9ABC, 0x9ABD, 0x9ABE, 0x9ABF, /* 0xE0 */
     0x9AC0, 0x9AC1, 0xEBA4, 0xBAC1, 0x9AC2, 0x9AC3, 0x9AC4, 0xCCBA, /* 0xE0 */
     0x9AC5, 0x9AC6, 0x9AC7, 0xEBA5, 0x9AC8, 0xEBA7, 0x9AC9, 0x9ACA, /* 0xF0 */
-    0x9ACB, 0xEBA8, 0x9ACC, 0x9ACD, 0x9ACE, 0xEBA6, 0x9ACF, 0x9AD0  /* 0xF0 */
+    0x9ACB, 0xEBA8, 0x9ACC, 0x9ACD, 0x9ACE, 0xEBA6, 0x9ACF, 0x9AD0	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_6C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9AD1, 0x9AD2, 0x9AD3, 0x9AD4, 0x9AD5, 0xEBA9, 0xEBAB, 0xEBAA, /* 0x00 */
     0x9AD6, 0x9AD7, 0x9AD8, 0x9AD9, 0x9ADA, 0xEBAC, 0x9ADB, 0xCACF, /* 0x00 */
     0xD8B5, 0xC3F1, 0x9ADC, 0xC3A5, 0xC6F8, 0xEBAD, 0xC4CA, 0x9ADD, /* 0x10 */
@@ -2264,15 +2264,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_6C[] =
     0xE3F6, 0xC5DD, 0xB2A8, 0xC6FC, 0x9B85, 0xC4E0, 0x9B86, 0x9B87, /* 0xE0 */
     0xD7A2, 0x9B88, 0xC0E1, 0xE3F9, 0x9B89, 0x9B8A, 0xE3FA, 0xE3FD, /* 0xE0 */
     0xCCA9, 0xE3F3, 0x9B8B, 0xD3BE, 0x9B8C, 0xB1C3, 0xEDB4, 0xE3F1, /* 0xF0 */
-    0xE3F2, 0x9B8D, 0xE3F8, 0xD0BA, 0xC6C3, 0xD4F3, 0xE3FE, 0x9B8E  /* 0xF0 */
+    0xE3F2, 0x9B8D, 0xE3F8, 0xD0BA, 0xC6C3, 0xD4F3, 0xE3FE, 0x9B8E	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_6D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9B8F, 0xBDE0, 0x9B90, 0x9B91, 0xE4A7, 0x9B92, 0x9B93, 0xE4A6, /* 0x00 */
     0x9B94, 0x9B95, 0x9B96, 0xD1F3, 0xE4A3, 0x9B97, 0xE4A9, 0x9B98, /* 0x00 */
     0x9B99, 0x9B9A, 0xC8F7, 0x9B9B, 0x9B9C, 0x9B9D, 0x9B9E, 0xCFB4, /* 0x10 */
@@ -2304,15 +2304,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_6D[] =
     0xE4C4, 0xB5AD, 0x9C4D, 0x9C4E, 0xD3D9, 0x9C4F, 0xE4C6, 0x9C50, /* 0xE0 */
     0x9C51, 0x9C52, 0x9C53, 0xD2F9, 0xB4E3, 0x9C54, 0xBBB4, 0x9C55, /* 0xE0 */
     0x9C56, 0xC9EE, 0x9C57, 0xB4BE, 0x9C58, 0x9C59, 0x9C5A, 0xBBEC, /* 0xF0 */
-    0x9C5B, 0xD1CD, 0x9C5C, 0xCCED, 0xEDB5, 0x9C5D, 0x9C5E, 0x9C5F  /* 0xF0 */
+    0x9C5B, 0xD1CD, 0x9C5C, 0xCCED, 0xEDB5, 0x9C5D, 0x9C5E, 0x9C5F	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_6E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9C60, 0x9C61, 0x9C62, 0x9C63, 0x9C64, 0xC7E5, 0x9C65, 0x9C66, /* 0x00 */
     0x9C67, 0x9C68, 0xD4A8, 0x9C69, 0xE4CB, 0xD7D5, 0xE4C2, 0x9C6A, /* 0x00 */
     0xBDA5, 0xE4C5, 0x9C6B, 0x9C6C, 0xD3E6, 0x9C6D, 0xE4C9, 0xC9F8, /* 0x10 */
@@ -2344,15 +2344,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_6E[] =
     0xE4DC, 0xC2FA, 0xE4DE, 0x9CF7, 0xC2CB, 0xC0C4, 0xC2D0, 0x9CF8, /* 0xE0 */
     0xB1F5, 0xCCB2, 0x9CF9, 0x9CFA, 0x9CFB, 0x9CFC, 0x9CFD, 0x9CFE, /* 0xE0 */
     0x9D40, 0x9D41, 0x9D42, 0x9D43, 0xB5CE, 0x9D44, 0x9D45, 0x9D46, /* 0xF0 */
-    0x9D47, 0xE4EF, 0x9D48, 0x9D49, 0x9D4A, 0x9D4B, 0x9D4C, 0x9D4D  /* 0xF0 */
+    0x9D47, 0xE4EF, 0x9D48, 0x9D49, 0x9D4A, 0x9D4B, 0x9D4C, 0x9D4D	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_6F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9D4E, 0x9D4F, 0xC6AF, 0x9D50, 0x9D51, 0x9D52, 0xC6E1, 0x9D53, /* 0x00 */
     0x9D54, 0xE4F5, 0x9D55, 0x9D56, 0x9D57, 0x9D58, 0x9D59, 0xC2A9, /* 0x00 */
     0x9D5A, 0x9D5B, 0x9D5C, 0xC0EC, 0xD1DD, 0xE4EE, 0x9D5D, 0x9D5E, /* 0x10 */
@@ -2384,15 +2384,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_6F[] =
     0xE5A9, 0xE5A6, 0x9DFB, 0x9DFC, 0x9DFD, 0x9DFE, 0x9E40, 0x9E41, /* 0xE0 */
     0x9E42, 0x9E43, 0x9E44, 0x9E45, 0x9E46, 0x9E47, 0xE5A7, 0xE5AA, /* 0xE0 */
     0x9E48, 0x9E49, 0x9E4A, 0x9E4B, 0x9E4C, 0x9E4D, 0x9E4E, 0x9E4F, /* 0xF0 */
-    0x9E50, 0x9E51, 0x9E52, 0x9E53, 0x9E54, 0x9E55, 0x9E56, 0x9E57  /* 0xF0 */
+    0x9E50, 0x9E51, 0x9E52, 0x9E53, 0x9E54, 0x9E55, 0x9E56, 0x9E57	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_70[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9E58, 0x9E59, 0x9E5A, 0x9E5B, 0x9E5C, 0x9E5D, 0x9E5E, 0x9E5F, /* 0x00 */
     0x9E60, 0x9E61, 0x9E62, 0x9E63, 0x9E64, 0x9E65, 0x9E66, 0x9E67, /* 0x00 */
     0x9E68, 0xC6D9, 0x9E69, 0x9E6A, 0x9E6B, 0x9E6C, 0x9E6D, 0x9E6E, /* 0x10 */
@@ -2424,15 +2424,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_70[] =
     0x9F43, 0x9F44, 0x9F45, 0x9F46, 0xBFBE, 0x9F47, 0xB7B3, 0xC9D5, /* 0xE0 */
     0xECC7, 0xBBE2, 0x9F48, 0xCCCC, 0xBDFD, 0xC8C8, 0x9F49, 0xCFA9, /* 0xE0 */
     0x9F4A, 0x9F4B, 0x9F4C, 0x9F4D, 0x9F4E, 0x9F4F, 0x9F50, 0xCDE9, /* 0xF0 */
-    0x9F51, 0xC5EB, 0x9F52, 0x9F53, 0x9F54, 0xB7E9, 0x9F55, 0x9F56  /* 0xF0 */
+    0x9F51, 0xC5EB, 0x9F52, 0x9F53, 0x9F54, 0xB7E9, 0x9F55, 0x9F56	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_71[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9F57, 0x9F58, 0x9F59, 0x9F5A, 0x9F5B, 0x9F5C, 0x9F5D, 0x9F5E, /* 0x00 */
     0x9F5F, 0xD1C9, 0xBAB8, 0x9F60, 0x9F61, 0x9F62, 0x9F63, 0x9F64, /* 0x00 */
     0xECC9, 0x9F65, 0x9F66, 0xECCA, 0x9F67, 0xBBC0, 0xECCB, 0x9F68, /* 0x10 */
@@ -2464,15 +2464,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_71[] =
     0xECDB, 0xA04A, 0xA04B, 0xA04C, 0xA04D, 0xD4EF, 0xA04E, 0xECDD, /* 0xE0 */
     0xA04F, 0xA050, 0xA051, 0xA052, 0xA053, 0xA054, 0xDBC6, 0xA055, /* 0xE0 */
     0xA056, 0xA057, 0xA058, 0xA059, 0xA05A, 0xA05B, 0xA05C, 0xA05D, /* 0xF0 */
-    0xA05E, 0xECDE, 0xA05F, 0xA060, 0xA061, 0xA062, 0xA063, 0xA064  /* 0xF0 */
+    0xA05E, 0xECDE, 0xA05F, 0xA060, 0xA061, 0xA062, 0xA063, 0xA064	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_72[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xA065, 0xA066, 0xA067, 0xA068, 0xA069, 0xA06A, 0xB1AC, 0xA06B, /* 0x00 */
     0xA06C, 0xA06D, 0xA06E, 0xA06F, 0xA070, 0xA071, 0xA072, 0xA073, /* 0x00 */
     0xA074, 0xA075, 0xA076, 0xA077, 0xA078, 0xA079, 0xA07A, 0xA07B, /* 0x10 */
@@ -2504,15 +2504,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_72[] =
     0xBADD, 0xBDC6, 0xAA43, 0xAA44, 0xAA45, 0xAA46, 0xAA47, 0xAA48, /* 0xE0 */
     0xE1F5, 0xE1F7, 0xAA49, 0xAA4A, 0xB6C0, 0xCFC1, 0xCAA8, 0xE1F6, /* 0xE0 */
     0xD5F8, 0xD3FC, 0xE1F8, 0xE1FC, 0xE1F9, 0xAA4B, 0xAA4C, 0xE1FA, /* 0xF0 */
-    0xC0EA, 0xAA4D, 0xE1FE, 0xE2A1, 0xC0C7, 0xAA4E, 0xAA4F, 0xAA50  /* 0xF0 */
+    0xC0EA, 0xAA4D, 0xE1FE, 0xE2A1, 0xC0C7, 0xAA4E, 0xAA4F, 0xAA50	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_73[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xAA51, 0xE1FB, 0xAA52, 0xE1FD, 0xAA53, 0xAA54, 0xAA55, 0xAA56, /* 0x00 */
     0xAA57, 0xAA58, 0xE2A5, 0xAA59, 0xAA5A, 0xAA5B, 0xC1D4, 0xAA5C, /* 0x00 */
     0xAA5D, 0xAA5E, 0xAA5F, 0xE2A3, 0xAA60, 0xE2A8, 0xB2FE, 0xE2A2, /* 0x10 */
@@ -2544,15 +2544,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_73[] =
     0xD6E9, 0xAB8F, 0xAB90, 0xAB91, 0xAB92, 0xE7ED, 0xAB93, 0xE7F2, /* 0xE0 */
     0xAB94, 0xE7F1, 0xAB95, 0xAB96, 0xAB97, 0xB0E0, 0xAB98, 0xAB99, /* 0xE0 */
     0xAB9A, 0xAB9B, 0xE7F5, 0xAB9C, 0xAB9D, 0xAB9E, 0xAB9F, 0xABA0, /* 0xF0 */
-    0xAC40, 0xAC41, 0xAC42, 0xAC43, 0xAC44, 0xAC45, 0xAC46, 0xAC47  /* 0xF0 */
+    0xAC40, 0xAC41, 0xAC42, 0xAC43, 0xAC44, 0xAC45, 0xAC46, 0xAC47	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_74[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xAC48, 0xAC49, 0xAC4A, 0xC7F2, 0xAC4B, 0xC0C5, 0xC0ED, 0xAC4C, /* 0x00 */
     0xAC4D, 0xC1F0, 0xE7F0, 0xAC4E, 0xAC4F, 0xAC50, 0xAC51, 0xE7F6, /* 0x00 */
     0xCBF6, 0xAC52, 0xAC53, 0xAC54, 0xAC55, 0xAC56, 0xAC57, 0xAC58, /* 0x10 */
@@ -2584,15 +2584,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_74[] =
     0xF0AD, 0xAD95, 0xC6B0, 0xB0EA, 0xC8BF, 0xAD96, 0xCDDF, 0xAD97, /* 0xE0 */
     0xAD98, 0xAD99, 0xAD9A, 0xAD9B, 0xAD9C, 0xAD9D, 0xCECD, 0xEAB1, /* 0xE0 */
     0xAD9E, 0xAD9F, 0xADA0, 0xAE40, 0xEAB2, 0xAE41, 0xC6BF, 0xB4C9, /* 0xF0 */
-    0xAE42, 0xAE43, 0xAE44, 0xAE45, 0xAE46, 0xAE47, 0xAE48, 0xEAB3  /* 0xF0 */
+    0xAE42, 0xAE43, 0xAE44, 0xAE45, 0xAE46, 0xAE47, 0xAE48, 0xEAB3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_75[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xAE49, 0xAE4A, 0xAE4B, 0xAE4C, 0xD5E7, 0xAE4D, 0xAE4E, 0xAE4F, /* 0x00 */
     0xAE50, 0xAE51, 0xAE52, 0xAE53, 0xAE54, 0xDDF9, 0xAE55, 0xEAB4, /* 0x00 */
     0xAE56, 0xEAB5, 0xAE57, 0xEAB6, 0xAE58, 0xAE59, 0xAE5A, 0xAE5B, /* 0x10 */
@@ -2624,15 +2624,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_75[] =
     0xAF69, 0xAF6A, 0xC1A1, 0xF0EB, 0xF0EE, 0xAF6B, 0xF0ED, 0xF0F0, /* 0xE0 */
     0xF0EC, 0xAF6C, 0xBBBE, 0xF0EF, 0xAF6D, 0xAF6E, 0xAF6F, 0xAF70, /* 0xE0 */
     0xCCB5, 0xF0F2, 0xAF71, 0xAF72, 0xB3D5, 0xAF73, 0xAF74, 0xAF75, /* 0xF0 */
-    0xAF76, 0xB1D4, 0xAF77, 0xAF78, 0xF0F3, 0xAF79, 0xAF7A, 0xF0F4  /* 0xF0 */
+    0xAF76, 0xB1D4, 0xAF77, 0xAF78, 0xF0F3, 0xAF79, 0xAF7A, 0xF0F4	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_76[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xF0F6, 0xB4E1, 0xAF7B, 0xF0F1, 0xAF7C, 0xF0F7, 0xAF7D, 0xAF7E, /* 0x00 */
     0xAF80, 0xAF81, 0xF0FA, 0xAF82, 0xF0F8, 0xAF83, 0xAF84, 0xAF85, /* 0x00 */
     0xF0F5, 0xAF86, 0xAF87, 0xAF88, 0xAF89, 0xF0FD, 0xAF8A, 0xF0F9, /* 0x10 */
@@ -2664,15 +2664,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_76[] =
     0xB14C, 0xB14D, 0xB14E, 0xB14F, 0xB150, 0xEEC2, 0xB151, 0xB152, /* 0xE0 */
     0xB153, 0xB154, 0xB155, 0xB156, 0xB157, 0xB158, 0xC4BF, 0xB6A2, /* 0xE0 */
     0xB159, 0xEDEC, 0xC3A4, 0xB15A, 0xD6B1, 0xB15B, 0xB15C, 0xB15D, /* 0xF0 */
-    0xCFE0, 0xEDEF, 0xB15E, 0xB15F, 0xC5CE, 0xB160, 0xB6DC, 0xB161  /* 0xF0 */
+    0xCFE0, 0xEDEF, 0xB15E, 0xB15F, 0xC5CE, 0xB160, 0xB6DC, 0xB161	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_77[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB162, 0xCAA1, 0xB163, 0xB164, 0xEDED, 0xB165, 0xB166, 0xEDF0, /* 0x00 */
     0xEDF1, 0xC3BC, 0xB167, 0xBFB4, 0xB168, 0xEDEE, 0xB169, 0xB16A, /* 0x00 */
     0xB16B, 0xB16C, 0xB16D, 0xB16E, 0xB16F, 0xB170, 0xB171, 0xB172, /* 0x10 */
@@ -2704,15 +2704,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_77[] =
     0xB29E, 0xB29F, 0xCAB8, 0xD2D3, 0xB2A0, 0xD6AA, 0xB340, 0xEFF2, /* 0xE0 */
     0xB341, 0xBED8, 0xB342, 0xBDC3, 0xEFF3, 0xB6CC, 0xB0AB, 0xB343, /* 0xE0 */
     0xB344, 0xB345, 0xB346, 0xCAAF, 0xB347, 0xB348, 0xEDB6, 0xB349, /* 0xF0 */
-    0xEDB7, 0xB34A, 0xB34B, 0xB34C, 0xB34D, 0xCEF9, 0xB7AF, 0xBFF3  /* 0xF0 */
+    0xEDB7, 0xB34A, 0xB34B, 0xB34C, 0xB34D, 0xCEF9, 0xB7AF, 0xBFF3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_78[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xEDB8, 0xC2EB, 0xC9B0, 0xB34E, 0xB34F, 0xB350, 0xB351, 0xB352, /* 0x00 */
     0xB353, 0xEDB9, 0xB354, 0xB355, 0xC6F6, 0xBFB3, 0xB356, 0xB357, /* 0x00 */
     0xB358, 0xEDBC, 0xC5F8, 0xB359, 0xD1D0, 0xB35A, 0xD7A9, 0xEDBA, /* 0x10 */
@@ -2744,15 +2744,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_78[] =
     0xB47B, 0xB47C, 0xB47D, 0xB47E, 0xB480, 0xB481, 0xB482, 0xB483, /* 0xE0 */
     0xC4A5, 0xB484, 0xB485, 0xB486, 0xEDE0, 0xB487, 0xB488, 0xB489, /* 0xE0 */
     0xB48A, 0xB48B, 0xEDE1, 0xB48C, 0xEDE3, 0xB48D, 0xB48E, 0xC1D7, /* 0xF0 */
-    0xB48F, 0xB490, 0xBBC7, 0xB491, 0xB492, 0xB493, 0xB494, 0xB495  /* 0xF0 */
+    0xB48F, 0xB490, 0xBBC7, 0xB491, 0xB492, 0xB493, 0xB494, 0xB495	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_79[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB496, 0xBDB8, 0xB497, 0xB498, 0xB499, 0xEDE2, 0xB49A, 0xB49B, /* 0x00 */
     0xB49C, 0xB49D, 0xB49E, 0xB49F, 0xB4A0, 0xB540, 0xB541, 0xB542, /* 0x00 */
     0xB543, 0xB544, 0xB545, 0xEDE4, 0xB546, 0xB547, 0xB548, 0xB549, /* 0x10 */
@@ -2784,15 +2784,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_79[] =
     0xB679, 0xB67A, 0xB67B, 0xEFF7, 0xB3D3, 0xB67C, 0xC7D8, 0xD1ED, /* 0xE0 */
     0xB67D, 0xD6C8, 0xB67E, 0xEFF8, 0xB680, 0xEFF6, 0xB681, 0xBBFD, /* 0xE0 */
     0xB3C6, 0xB682, 0xB683, 0xB684, 0xB685, 0xB686, 0xB687, 0xB688, /* 0xF0 */
-    0xBDD5, 0xB689, 0xB68A, 0xD2C6, 0xB68B, 0xBBE0, 0xB68C, 0xB68D  /* 0xF0 */
+    0xBDD5, 0xB689, 0xB68A, 0xD2C6, 0xB68B, 0xBBE0, 0xB68C, 0xB68D	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_7A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xCFA1, 0xB68E, 0xEFFC, 0xEFFB, 0xB68F, 0xB690, 0xEFF9, 0xB691, /* 0x00 */
     0xB692, 0xB693, 0xB694, 0xB3CC, 0xB695, 0xC9D4, 0xCBB0, 0xB696, /* 0x00 */
     0xB697, 0xB698, 0xB699, 0xB69A, 0xEFFE, 0xB69B, 0xB69C, 0xB0DE, /* 0x10 */
@@ -2824,15 +2824,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_7A[] =
     0xD5C2, 0xB871, 0xB872, 0xBFA2, 0xB873, 0xCDAF, 0xF1B5, 0xB874, /* 0xE0 */
     0xB875, 0xB876, 0xB877, 0xB878, 0xB879, 0xBDDF, 0xB87A, 0xB6CB, /* 0xE0 */
     0xB87B, 0xB87C, 0xB87D, 0xB87E, 0xB880, 0xB881, 0xB882, 0xB883, /* 0xF0 */
-    0xB884, 0xD6F1, 0xF3C3, 0xB885, 0xB886, 0xF3C4, 0xB887, 0xB8CD  /* 0xF0 */
+    0xB884, 0xD6F1, 0xF3C3, 0xB885, 0xB886, 0xF3C4, 0xB887, 0xB8CD	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_7B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB888, 0xB889, 0xB88A, 0xF3C6, 0xF3C7, 0xB88B, 0xB0CA, 0xB88C, /* 0x00 */
     0xF3C5, 0xB88D, 0xF3C9, 0xCBF1, 0xB88E, 0xB88F, 0xB890, 0xF3CB, /* 0x00 */
     0xB891, 0xD0A6, 0xB892, 0xB893, 0xB1CA, 0xF3C8, 0xB894, 0xB895, /* 0x10 */
@@ -2864,15 +2864,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_7B[] =
     0xBA53, 0xB4DB, 0xBA54, 0xBA55, 0xBA56, 0xF3F6, 0xF3F7, 0xBA57, /* 0xE0 */
     0xBA58, 0xBA59, 0xF3F8, 0xBA5A, 0xBA5B, 0xBA5C, 0xC0BA, 0xBA5D, /* 0xE0 */
     0xBA5E, 0xC0E9, 0xBA5F, 0xBA60, 0xBA61, 0xBA62, 0xBA63, 0xC5F1, /* 0xF0 */
-    0xBA64, 0xBA65, 0xBA66, 0xBA67, 0xF3FB, 0xBA68, 0xF3FA, 0xBA69  /* 0xF0 */
+    0xBA64, 0xBA65, 0xBA66, 0xBA67, 0xF3FB, 0xBA68, 0xF3FA, 0xBA69	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_7C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xBA6A, 0xBA6B, 0xBA6C, 0xBA6D, 0xBA6E, 0xBA6F, 0xBA70, 0xB4D8, /* 0x00 */
     0xBA71, 0xBA72, 0xBA73, 0xF3FE, 0xF3F9, 0xBA74, 0xBA75, 0xF3FC, /* 0x00 */
     0xBA76, 0xBA77, 0xBA78, 0xBA79, 0xBA7A, 0xBA7B, 0xF3FD, 0xBA7C, /* 0x10 */
@@ -2904,15 +2904,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_7C[] =
     0xBFB7, 0xBC54, 0xBC55, 0xBC56, 0xBC57, 0xBC58, 0xBC59, 0xBC5A, /* 0xE0 */
     0xF4DD, 0xBC5B, 0xBC5C, 0xBC5D, 0xBC5E, 0xBC5F, 0xBC60, 0xC5B4, /* 0xE0 */
     0xBC61, 0xBC62, 0xBC63, 0xBC64, 0xBC65, 0xBC66, 0xBC67, 0xBC68, /* 0xF0 */
-    0xF4E9, 0xBC69, 0xBC6A, 0xCFB5, 0xBC6B, 0xBC6C, 0xBC6D, 0xBC6E  /* 0xF0 */
+    0xF4E9, 0xBC69, 0xBC6A, 0xCFB5, 0xBC6B, 0xBC6C, 0xBC6D, 0xBC6E	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_7D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xBC6F, 0xBC70, 0xBC71, 0xBC72, 0xBC73, 0xBC74, 0xBC75, 0xBC76, /* 0x00 */
     0xBC77, 0xBC78, 0xCEC9, 0xBC79, 0xBC7A, 0xBC7B, 0xBC7C, 0xBC7D, /* 0x00 */
     0xBC7E, 0xBC80, 0xBC81, 0xBC82, 0xBC83, 0xBC84, 0xBC85, 0xBC86, /* 0x10 */
@@ -2944,15 +2944,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_7D[] =
     0xBE86, 0xBE87, 0xBE88, 0xBE89, 0xBE8A, 0xBE8B, 0xBE8C, 0xBE8D, /* 0xE0 */
     0xBE8E, 0xBE8F, 0xBE90, 0xBE91, 0xBE92, 0xBE93, 0xBE94, 0xBE95, /* 0xE0 */
     0xBE96, 0xBE97, 0xBE98, 0xBE99, 0xBE9A, 0xBE9B, 0xBE9C, 0xBE9D, /* 0xF0 */
-    0xBE9E, 0xBE9F, 0xBEA0, 0xBF40, 0xBF41, 0xBF42, 0xBF43, 0xBF44  /* 0xF0 */
+    0xBE9E, 0xBE9F, 0xBEA0, 0xBF40, 0xBF41, 0xBF42, 0xBF43, 0xBF44	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_7E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xBF45, 0xBF46, 0xBF47, 0xBF48, 0xBF49, 0xBF4A, 0xBF4B, 0xBF4C, /* 0x00 */
     0xBF4D, 0xBF4E, 0xBF4F, 0xBF50, 0xBF51, 0xBF52, 0xBF53, 0xBF54, /* 0x00 */
     0xBF55, 0xBF56, 0xBF57, 0xBF58, 0xBF59, 0xBF5A, 0xBF5B, 0xBF5C, /* 0x10 */
@@ -2984,15 +2984,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_7E[] =
     0xE7AE, 0xE7AF, 0xBEEE, 0xD0E5, 0xC085, 0xCBE7, 0xCCD0, 0xBCCC, /* 0xE0 */
     0xE7B0, 0xBCA8, 0xD0F7, 0xE7B1, 0xC086, 0xD0F8, 0xE7B2, 0xE7B3, /* 0xE0 */
     0xB4C2, 0xE7B4, 0xE7B5, 0xC9FE, 0xCEAC, 0xC3E0, 0xE7B7, 0xB1C1, /* 0xF0 */
-    0xB3F1, 0xC087, 0xE7B8, 0xE7B9, 0xD7DB, 0xD5C0, 0xE7BA, 0xC2CC  /* 0xF0 */
+    0xB3F1, 0xC087, 0xE7B8, 0xE7B9, 0xD7DB, 0xD5C0, 0xE7BA, 0xC2CC	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_7F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xD7BA, 0xE7BB, 0xE7BC, 0xE7BD, 0xBCEA, 0xC3E5, 0xC0C2, 0xE7BE, /* 0x00 */
     0xE7BF, 0xBCA9, 0xC088, 0xE7C0, 0xE7C1, 0xE7B6, 0xB6D0, 0xE7C2, /* 0x00 */
     0xC089, 0xE7C3, 0xE7C4, 0xBBBA, 0xB5DE, 0xC2C6, 0xB1E0, 0xE7C5, /* 0x10 */
@@ -3024,15 +3024,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_7F[] =
     0xB4E4, 0xF4E4, 0xC19F, 0xC1A0, 0xC240, 0xF4E3, 0xF4E5, 0xC241, /* 0xE0 */
     0xC242, 0xF4E6, 0xC243, 0xC244, 0xC245, 0xC246, 0xF4E7, 0xC247, /* 0xE0 */
     0xBAB2, 0xB0BF, 0xC248, 0xF4E8, 0xC249, 0xC24A, 0xC24B, 0xC24C, /* 0xF0 */
-    0xC24D, 0xC24E, 0xC24F, 0xB7AD, 0xD2ED, 0xC250, 0xC251, 0xC252  /* 0xF0 */
+    0xC24D, 0xC24E, 0xC24F, 0xB7AD, 0xD2ED, 0xC250, 0xC251, 0xC252	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_80[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xD2AB, 0xC0CF, 0xC253, 0xBFBC, 0xEBA3, 0xD5DF, 0xEAC8, 0xC254, /* 0x00 */
     0xC255, 0xC256, 0xC257, 0xF1F3, 0xB6F8, 0xCBA3, 0xC258, 0xC259, /* 0x00 */
     0xC4CD, 0xC25A, 0xF1E7, 0xC25B, 0xF1E8, 0xB8FB, 0xF1E9, 0xBAC4, /* 0x10 */
@@ -3064,15 +3064,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_80[] =
     0xC36C, 0xBAFA, 0xC36D, 0xC36E, 0xD8B7, 0xF1E3, 0xC36F, 0xEBCA, /* 0xE0 */
     0xEBCB, 0xEBCC, 0xEBCD, 0xEBD6, 0xE6C0, 0xEBD9, 0xC370, 0xBFE8, /* 0xE0 */
     0xD2C8, 0xEBD7, 0xEBDC, 0xB8EC, 0xEBD8, 0xC371, 0xBDBA, 0xC372, /* 0xF0 */
-    0xD0D8, 0xC373, 0xB0B7, 0xC374, 0xEBDD, 0xC4DC, 0xC375, 0xC376  /* 0xF0 */
+    0xD0D8, 0xC373, 0xB0B7, 0xC374, 0xEBDD, 0xC4DC, 0xC375, 0xC376	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_81[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC377, 0xC378, 0xD6AC, 0xC379, 0xC37A, 0xC37B, 0xB4E0, 0xC37C, /* 0x00 */
     0xC37D, 0xC2F6, 0xBCB9, 0xC37E, 0xC380, 0xEBDA, 0xEBDB, 0xD4E0, /* 0x00 */
     0xC6EA, 0xC4D4, 0xEBDF, 0xC5A7, 0xD9F5, 0xC381, 0xB2B1, 0xC382, /* 0x10 */
@@ -3104,15 +3104,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_81[] =
     0xC54C, 0xC54D, 0xC54E, 0xB3BC, 0xC54F, 0xC550, 0xC551, 0xEAB0, /* 0xE0 */
     0xC552, 0xC553, 0xD7D4, 0xC554, 0xF4AB, 0xB3F4, 0xC555, 0xC556, /* 0xE0 */
     0xC557, 0xC558, 0xC559, 0xD6C1, 0xD6C2, 0xC55A, 0xC55B, 0xC55C, /* 0xF0 */
-    0xC55D, 0xC55E, 0xC55F, 0xD5E9, 0xBECA, 0xC560, 0xF4A7, 0xC561  /* 0xF0 */
+    0xC55D, 0xC55E, 0xC55F, 0xD5E9, 0xBECA, 0xC560, 0xF4A7, 0xC561	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_82[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xD2A8, 0xF4A8, 0xF4A9, 0xC562, 0xF4AA, 0xBECB, 0xD3DF, 0xC563, /* 0x00 */
     0xC564, 0xC565, 0xC566, 0xC567, 0xC9E0, 0xC9E1, 0xC568, 0xC569, /* 0x00 */
     0xF3C2, 0xC56A, 0xCAE6, 0xC56B, 0xCCF2, 0xC56C, 0xC56D, 0xC56E, /* 0x10 */
@@ -3144,15 +3144,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_82[] =
     0xDCE5, 0xDCD3, 0xC671, 0xDCC4, 0xDCD6, 0xC8F4, 0xBFE0, 0xC672, /* 0xE0 */
     0xC673, 0xC674, 0xC675, 0xC9BB, 0xC676, 0xC677, 0xC678, 0xB1BD, /* 0xE0 */
     0xC679, 0xD3A2, 0xC67A, 0xC67B, 0xDCDA, 0xC67C, 0xC67D, 0xDCD5, /* 0xF0 */
-    0xC67E, 0xC6BB, 0xC680, 0xDCDE, 0xC681, 0xC682, 0xC683, 0xC684  /* 0xF0 */
+    0xC67E, 0xC6BB, 0xC680, 0xDCDE, 0xC681, 0xC682, 0xC683, 0xC684	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_83[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC685, 0xD7C2, 0xC3AF, 0xB7B6, 0xC7D1, 0xC3A9, 0xDCE2, 0xDCD8, /* 0x00 */
     0xDCEB, 0xDCD4, 0xC686, 0xC687, 0xDCDD, 0xC688, 0xBEA5, 0xDCD7, /* 0x00 */
     0xC689, 0xDCE0, 0xC68A, 0xC68B, 0xDCE3, 0xDCE4, 0xC68C, 0xDCF8, /* 0x10 */
@@ -3184,15 +3184,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_83[] =
     0xB2A4, 0xDDD5, 0xC798, 0xC799, 0xC79A, 0xDDBE, 0xC79B, 0xC79C, /* 0xE0 */
     0xC79D, 0xC6D0, 0xDDD0, 0xC79E, 0xC79F, 0xC7A0, 0xC840, 0xC841, /* 0xE0 */
     0xDDD4, 0xC1E2, 0xB7C6, 0xC842, 0xC843, 0xC844, 0xC845, 0xC846, /* 0xF0 */
-    0xDDCE, 0xDDCF, 0xC847, 0xC848, 0xC849, 0xDDC4, 0xC84A, 0xC84B  /* 0xF0 */
+    0xDDCE, 0xDDCF, 0xC847, 0xC848, 0xC849, 0xDDC4, 0xC84A, 0xC84B	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_84[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC84C, 0xDDBD, 0xC84D, 0xDDCD, 0xCCD1, 0xC84E, 0xDDC9, 0xC84F, /* 0x00 */
     0xC850, 0xC851, 0xC852, 0xDDC2, 0xC3C8, 0xC6BC, 0xCEAE, 0xDDCC, /* 0x00 */
     0xC853, 0xDDC8, 0xC854, 0xC855, 0xC856, 0xC857, 0xC858, 0xC859, /* 0x10 */
@@ -3224,15 +3224,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_84[] =
     0xDDF1, 0xC986, 0xC987, 0xDDF7, 0xC988, 0xDDF6, 0xDDEB, 0xC989, /* 0xE0 */
     0xC98A, 0xC98B, 0xC98C, 0xC98D, 0xC5EE, 0xC98E, 0xC98F, 0xC990, /* 0xE0 */
     0xDDFB, 0xC991, 0xC992, 0xC993, 0xC994, 0xC995, 0xC996, 0xC997, /* 0xF0 */
-    0xC998, 0xC999, 0xC99A, 0xC99B, 0xDEA4, 0xC99C, 0xC99D, 0xDEA3  /* 0xF0 */
+    0xC998, 0xC999, 0xC99A, 0xC99B, 0xDEA4, 0xC99C, 0xC99D, 0xDEA3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_85[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC99E, 0xC99F, 0xC9A0, 0xCA40, 0xCA41, 0xCA42, 0xCA43, 0xCA44, /* 0x00 */
     0xCA45, 0xCA46, 0xCA47, 0xCA48, 0xDDF8, 0xCA49, 0xCA4A, 0xCA4B, /* 0x00 */
     0xCA4C, 0xC3EF, 0xCA4D, 0xC2FB, 0xCA4E, 0xCA4F, 0xCA50, 0xD5E1, /* 0x10 */
@@ -3264,15 +3264,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_85[] =
     0xCB8A, 0xCB8B, 0xCB8C, 0xCB8D, 0xCCD9, 0xCB8E, 0xCB8F, 0xCB90, /* 0xE0 */
     0xCB91, 0xB7AA, 0xCB92, 0xCB93, 0xCB94, 0xCB95, 0xCB96, 0xCB97, /* 0xE0 */
     0xCB98, 0xCB99, 0xCB9A, 0xCB9B, 0xCB9C, 0xCB9D, 0xCB9E, 0xCB9F, /* 0xF0 */
-    0xCBA0, 0xCC40, 0xCC41, 0xD4E5, 0xCC42, 0xCC43, 0xCC44, 0xDEBD  /* 0xF0 */
+    0xCBA0, 0xCC40, 0xCC41, 0xD4E5, 0xCC42, 0xCC43, 0xCC44, 0xDEBD	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_86[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xCC45, 0xCC46, 0xCC47, 0xCC48, 0xCC49, 0xDEBF, 0xCC4A, 0xCC4B, /* 0x00 */
     0xCC4C, 0xCC4D, 0xCC4E, 0xCC4F, 0xCC50, 0xCC51, 0xCC52, 0xCC53, /* 0x00 */
     0xCC54, 0xC4A2, 0xCC55, 0xCC56, 0xCC57, 0xCC58, 0xDEC1, 0xCC59, /* 0x10 */
@@ -3304,15 +3304,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_86[] =
     0xCD81, 0xCD82, 0xCD83, 0xCD84, 0xB8F2, 0xCD85, 0xCD86, 0xCD87, /* 0xE0 */
     0xCD88, 0xF2CB, 0xCD89, 0xCD8A, 0xCD8B, 0xF2CE, 0xC2F9, 0xCD8C, /* 0xE0 */
     0xD5DD, 0xF2CC, 0xF2CD, 0xF2CF, 0xF2D3, 0xCD8D, 0xCD8E, 0xCD8F, /* 0xF0 */
-    0xF2D9, 0xD3BC, 0xCD90, 0xCD91, 0xCD92, 0xCD93, 0xB6EA, 0xCD94  /* 0xF0 */
+    0xF2D9, 0xD3BC, 0xCD90, 0xCD91, 0xCD92, 0xCD93, 0xB6EA, 0xCD94	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_87[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xCAF1, 0xCD95, 0xB7E4, 0xF2D7, 0xCD96, 0xCD97, 0xCD98, 0xF2D8, /* 0x00 */
     0xF2DA, 0xF2DD, 0xF2DB, 0xCD99, 0xCD9A, 0xF2DC, 0xCD9B, 0xCD9C, /* 0x00 */
     0xCD9D, 0xCD9E, 0xD1D1, 0xF2D1, 0xCD9F, 0xCDC9, 0xCDA0, 0xCECF, /* 0x10 */
@@ -3344,15 +3344,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_87[] =
     0xF3B4, 0xCF6A, 0xCF6B, 0xCF6C, 0xCF6D, 0xF3A8, 0xCF6E, 0xCF6F, /* 0xE0 */
     0xCF70, 0xCF71, 0xF3B3, 0xCF72, 0xCF73, 0xCF74, 0xF3B5, 0xCF75, /* 0xE0 */
     0xCF76, 0xCF77, 0xCF78, 0xCF79, 0xCF7A, 0xCF7B, 0xCF7C, 0xCF7D, /* 0xF0 */
-    0xCF7E, 0xD0B7, 0xCF80, 0xCF81, 0xCF82, 0xCF83, 0xF3B8, 0xCF84  /* 0xF0 */
+    0xCF7E, 0xD0B7, 0xCF80, 0xCF81, 0xCF82, 0xCF83, 0xF3B8, 0xCF84	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_88[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xCF85, 0xCF86, 0xCF87, 0xD9F9, 0xCF88, 0xCF89, 0xCF8A, 0xCF8B, /* 0x00 */
     0xCF8C, 0xCF8D, 0xF3B9, 0xCF8E, 0xCF8F, 0xCF90, 0xCF91, 0xCF92, /* 0x00 */
     0xCF93, 0xCF94, 0xCF95, 0xF3B7, 0xCF96, 0xC8E4, 0xF3B6, 0xCF97, /* 0x10 */
@@ -3384,15 +3384,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_88[] =
     0xD164, 0xD165, 0xF1CD, 0xF1CF, 0xBFE3, 0xF1D0, 0xD166, 0xD167, /* 0xE0 */
     0xF1D4, 0xD168, 0xD169, 0xD16A, 0xD16B, 0xD16C, 0xD16D, 0xD16E, /* 0xE0 */
     0xF1D6, 0xF1D1, 0xD16F, 0xC9D1, 0xC5E1, 0xD170, 0xD171, 0xD172, /* 0xF0 */
-    0xC2E3, 0xB9FC, 0xD173, 0xD174, 0xF1D3, 0xD175, 0xF1D5, 0xD176  /* 0xF0 */
+    0xC2E3, 0xB9FC, 0xD173, 0xD174, 0xF1D3, 0xD175, 0xF1D5, 0xD176	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_89[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xD177, 0xD178, 0xB9D3, 0xD179, 0xD17A, 0xD17B, 0xD17C, 0xD17D, /* 0x00 */
     0xD17E, 0xD180, 0xF1DB, 0xD181, 0xD182, 0xD183, 0xD184, 0xD185, /* 0x00 */
     0xBAD6, 0xD186, 0xB0FD, 0xF1D9, 0xD187, 0xD188, 0xD189, 0xD18A, /* 0x10 */
@@ -3424,15 +3424,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_89[] =
     0xD36A, 0xD36B, 0xD36C, 0xBDE2, 0xD36D, 0xF6A1, 0xB4A5, 0xD36E, /* 0xE0 */
     0xD36F, 0xD370, 0xD371, 0xF6A2, 0xD372, 0xD373, 0xD374, 0xF6A3, /* 0xE0 */
     0xD375, 0xD376, 0xD377, 0xECB2, 0xD378, 0xD379, 0xD37A, 0xD37B, /* 0xF0 */
-    0xD37C, 0xD37D, 0xD37E, 0xD380, 0xD381, 0xD382, 0xD383, 0xD384  /* 0xF0 */
+    0xD37C, 0xD37D, 0xD37E, 0xD380, 0xD381, 0xD382, 0xD383, 0xD384	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_8A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xD1D4, 0xD385, 0xD386, 0xD387, 0xD388, 0xD389, 0xD38A, 0xD9EA, /* 0x00 */
     0xD38B, 0xD38C, 0xD38D, 0xD38E, 0xD38F, 0xD390, 0xD391, 0xD392, /* 0x00 */
     0xD393, 0xD394, 0xD395, 0xD396, 0xD397, 0xD398, 0xD399, 0xD39A, /* 0x10 */
@@ -3464,15 +3464,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_8A[] =
     0xD59D, 0xD59E, 0xD59F, 0xD5A0, 0xD640, 0xD641, 0xD642, 0xD643, /* 0xE0 */
     0xD644, 0xD645, 0xD646, 0xD647, 0xD648, 0xD649, 0xD64A, 0xD64B, /* 0xE0 */
     0xD64C, 0xD64D, 0xD64E, 0xD64F, 0xD650, 0xD651, 0xD652, 0xD653, /* 0xF0 */
-    0xD654, 0xD655, 0xD656, 0xD657, 0xD658, 0xD659, 0xD65A, 0xD65B  /* 0xF0 */
+    0xD654, 0xD655, 0xD656, 0xD657, 0xD658, 0xD659, 0xD65A, 0xD65B	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_8B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xD65C, 0xD65D, 0xD65E, 0xD65F, 0xD660, 0xD661, 0xD662, 0xE5C0, /* 0x00 */
     0xD663, 0xD664, 0xD665, 0xD666, 0xD667, 0xD668, 0xD669, 0xD66A, /* 0x00 */
     0xD66B, 0xD66C, 0xD66D, 0xD66E, 0xD66F, 0xD670, 0xD671, 0xD672, /* 0x10 */
@@ -3504,15 +3504,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_8B[] =
     0xDAB9, 0xB9EE, 0xD1AF, 0xD2E8, 0xDABA, 0xB8C3, 0xCFEA, 0xB2EF, /* 0xE0 */
     0xDABB, 0xDABC, 0xD79E, 0xBDEB, 0xCEDC, 0xD3EF, 0xDABD, 0xCEF3, /* 0xE0 */
     0xDABE, 0xD3D5, 0xBBE5, 0xDABF, 0xCBB5, 0xCBD0, 0xDAC0, 0xC7EB, /* 0xF0 */
-    0xD6EE, 0xDAC1, 0xC5B5, 0xB6C1, 0xDAC2, 0xB7CC, 0xBFCE, 0xDAC3  /* 0xF0 */
+    0xD6EE, 0xDAC1, 0xC5B5, 0xB6C1, 0xDAC2, 0xB7CC, 0xBFCE, 0xDAC3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_8C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xDAC4, 0xCBAD, 0xDAC5, 0xB5F7, 0xDAC6, 0xC1C2, 0xD7BB, 0xDAC7, /* 0x00 */
     0xCCB8, 0xD79F, 0xD2EA, 0xC4B1, 0xDAC8, 0xB5FD, 0xBBD1, 0xDAC9, /* 0x00 */
     0xD0B3, 0xDACA, 0xDACB, 0xCEBD, 0xDACC, 0xDACD, 0xDACE, 0xB2F7, /* 0x10 */
@@ -3544,15 +3544,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_8C[] =
     0xD972, 0xD973, 0xD974, 0xD975, 0xD976, 0xD977, 0xD978, 0xD979, /* 0xE0 */
     0xD97A, 0xD97B, 0xD97C, 0xD97D, 0xD97E, 0xD980, 0xD981, 0xD982, /* 0xE0 */
     0xD983, 0xD984, 0xD985, 0xD986, 0xD987, 0xD988, 0xD989, 0xD98A, /* 0xF0 */
-    0xD98B, 0xD98C, 0xD98D, 0xD98E, 0xD98F, 0xD990, 0xD991, 0xD992  /* 0xF0 */
+    0xD98B, 0xD98C, 0xD98D, 0xD98E, 0xD98F, 0xD990, 0xD991, 0xD992	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_8D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xD993, 0xD994, 0xD995, 0xD996, 0xD997, 0xD998, 0xD999, 0xD99A, /* 0x00 */
     0xD99B, 0xD99C, 0xD99D, 0xD99E, 0xD99F, 0xD9A0, 0xDA40, 0xDA41, /* 0x00 */
     0xDA42, 0xDA43, 0xDA44, 0xDA45, 0xDA46, 0xDA47, 0xDA48, 0xDA49, /* 0x10 */
@@ -3584,15 +3584,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_8D[] =
     0xDB44, 0xDB45, 0xDB46, 0xF5D0, 0xF5D3, 0xDB47, 0xDB48, 0xDB49, /* 0xE0 */
     0xBFE7, 0xDB4A, 0xB9F2, 0xF5BC, 0xF5CD, 0xDB4B, 0xDB4C, 0xC2B7, /* 0xE0 */
     0xDB4D, 0xDB4E, 0xDB4F, 0xCCF8, 0xDB50, 0xBCF9, 0xDB51, 0xF5CE, /* 0xF0 */
-    0xF5CF, 0xF5D1, 0xB6E5, 0xF5D2, 0xDB52, 0xF5D5, 0xDB53, 0xDB54  /* 0xF0 */
+    0xF5CF, 0xF5D1, 0xB6E5, 0xF5D2, 0xDB52, 0xF5D5, 0xDB53, 0xDB54	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_8E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xDB55, 0xDB56, 0xDB57, 0xDB58, 0xDB59, 0xF5BD, 0xDB5A, 0xDB5B, /* 0x00 */
     0xDB5C, 0xF5D4, 0xD3BB, 0xDB5D, 0xB3EC, 0xDB5E, 0xDB5F, 0xCCA4, /* 0x00 */
     0xDB60, 0xDB61, 0xDB62, 0xDB63, 0xF5D6, 0xDB64, 0xDB65, 0xDB66, /* 0x10 */
@@ -3624,15 +3624,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_8E[] =
     0xDC9C, 0xDC9D, 0xDC9E, 0xDC9F, 0xDCA0, 0xDD40, 0xDD41, 0xDD42, /* 0xE0 */
     0xDD43, 0xDD44, 0xDD45, 0xDD46, 0xDD47, 0xDD48, 0xDD49, 0xDD4A, /* 0xE0 */
     0xDD4B, 0xDD4C, 0xDD4D, 0xDD4E, 0xDD4F, 0xDD50, 0xDD51, 0xDD52, /* 0xF0 */
-    0xDD53, 0xDD54, 0xDD55, 0xDD56, 0xDD57, 0xDD58, 0xDD59, 0xDD5A  /* 0xF0 */
+    0xDD53, 0xDD54, 0xDD55, 0xDD56, 0xDD57, 0xDD58, 0xDD59, 0xDD5A	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_8F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xDD5B, 0xDD5C, 0xDD5D, 0xDD5E, 0xDD5F, 0xDD60, 0xDD61, 0xDD62, /* 0x00 */
     0xDD63, 0xDD64, 0xDD65, 0xDD66, 0xDD67, 0xDD68, 0xDD69, 0xDD6A, /* 0x00 */
     0xDD6B, 0xDD6C, 0xDD6D, 0xDD6E, 0xDD6F, 0xDD70, 0xDD71, 0xDD72, /* 0x10 */
@@ -3664,15 +3664,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_8F[] =
     0xDE8A, 0xDE8B, 0xCCF6, 0xDE8C, 0xE5C6, 0xE5C4, 0xE5C8, 0xDE8D, /* 0xE0 */
     0xE5CA, 0xE5C7, 0xB5CF, 0xC6C8, 0xDE8E, 0xB5FC, 0xE5C5, 0xDE8F, /* 0xE0 */
     0xCAF6, 0xDE90, 0xDE91, 0xE5C9, 0xDE92, 0xDE93, 0xDE94, 0xC3D4, /* 0xF0 */
-    0xB1C5, 0xBCA3, 0xDE95, 0xDE96, 0xDE97, 0xD7B7, 0xDE98, 0xDE99  /* 0xF0 */
+    0xB1C5, 0xBCA3, 0xDE95, 0xDE96, 0xDE97, 0xD7B7, 0xDE98, 0xDE99	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_90[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xCDCB, 0xCBCD, 0xCACA, 0xCCD3, 0xE5CC, 0xE5CB, 0xC4E6, 0xDE9A, /* 0x00 */
     0xDE9B, 0xD1A1, 0xD1B7, 0xE5CD, 0xDE9C, 0xE5D0, 0xDE9D, 0xCDB8, /* 0x00 */
     0xD6F0, 0xE5CF, 0xB5DD, 0xDE9E, 0xCDBE, 0xDE9F, 0xE5D1, 0xB6BA, /* 0x10 */
@@ -3704,15 +3704,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_90[] =
     0xE051, 0xBFA4, 0xDBAB, 0xE052, 0xE053, 0xE054, 0xDBAA, 0xD4C7, /* 0xE0 */
     0xB2BF, 0xE055, 0xE056, 0xDBAF, 0xE057, 0xB9F9, 0xE058, 0xDBB0, /* 0xE0 */
     0xE059, 0xE05A, 0xE05B, 0xE05C, 0xB3BB, 0xE05D, 0xE05E, 0xE05F, /* 0xF0 */
-    0xB5A6, 0xE060, 0xE061, 0xE062, 0xE063, 0xB6BC, 0xDBB1, 0xE064  /* 0xF0 */
+    0xB5A6, 0xE060, 0xE061, 0xE062, 0xE063, 0xB6BC, 0xDBB1, 0xE064	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_91[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xE065, 0xE066, 0xB6F5, 0xE067, 0xDBB2, 0xE068, 0xE069, 0xE06A, /* 0x00 */
     0xE06B, 0xE06C, 0xE06D, 0xE06E, 0xE06F, 0xE070, 0xE071, 0xE072, /* 0x00 */
     0xE073, 0xE074, 0xE075, 0xE076, 0xE077, 0xE078, 0xE079, 0xE07A, /* 0x10 */
@@ -3744,15 +3744,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_91[] =
     0xE19B, 0xE19C, 0xE19D, 0xE19E, 0xE19F, 0xE1A0, 0xE240, 0xE241, /* 0xE0 */
     0xE242, 0xE243, 0xE244, 0xE245, 0xE246, 0xE247, 0xE248, 0xE249, /* 0xE0 */
     0xE24A, 0xE24B, 0xE24C, 0xE24D, 0xE24E, 0xE24F, 0xE250, 0xE251, /* 0xF0 */
-    0xE252, 0xE253, 0xE254, 0xE255, 0xE256, 0xE257, 0xE258, 0xE259  /* 0xF0 */
+    0xE252, 0xE253, 0xE254, 0xE255, 0xE256, 0xE257, 0xE258, 0xE259	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_92[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xE25A, 0xE25B, 0xE25C, 0xE25D, 0xE25E, 0xE25F, 0xE260, 0xE261, /* 0x00 */
     0xE262, 0xE263, 0xE264, 0xE265, 0xE266, 0xE267, 0xE268, 0xE269, /* 0x00 */
     0xE26A, 0xE26B, 0xE26C, 0xE26D, 0xE26E, 0xE26F, 0xE270, 0xE271, /* 0x10 */
@@ -3784,15 +3784,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_92[] =
     0xE476, 0xE477, 0xE478, 0xE479, 0xE47A, 0xE47B, 0xE47C, 0xE47D, /* 0xE0 */
     0xE47E, 0xE480, 0xE481, 0xE482, 0xE483, 0xE484, 0xE485, 0xE486, /* 0xE0 */
     0xE487, 0xE488, 0xE489, 0xE48A, 0xE48B, 0xE48C, 0xE48D, 0xE48E, /* 0xF0 */
-    0xE48F, 0xE490, 0xE491, 0xE492, 0xE493, 0xE494, 0xE495, 0xE496  /* 0xF0 */
+    0xE48F, 0xE490, 0xE491, 0xE492, 0xE493, 0xE494, 0xE495, 0xE496	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_93[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xE497, 0xE498, 0xE499, 0xE49A, 0xE49B, 0xE49C, 0xE49D, 0xE49E, /* 0x00 */
     0xE49F, 0xE4A0, 0xE540, 0xE541, 0xE542, 0xE543, 0xE544, 0xE545, /* 0x00 */
     0xE546, 0xE547, 0xE548, 0xE549, 0xE54A, 0xE54B, 0xE54C, 0xE54D, /* 0x10 */
@@ -3824,15 +3824,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_93[] =
     0xE751, 0xE752, 0xE753, 0xE754, 0xE755, 0xE756, 0xE757, 0xE758, /* 0xE0 */
     0xE759, 0xE75A, 0xE75B, 0xE75C, 0xE75D, 0xE75E, 0xE75F, 0xE760, /* 0xE0 */
     0xE761, 0xE762, 0xE763, 0xE764, 0xE765, 0xE766, 0xE767, 0xE768, /* 0xF0 */
-    0xE769, 0xE76A, 0xE76B, 0xE76C, 0xE76D, 0xE76E, 0xE76F, 0xE770  /* 0xF0 */
+    0xE769, 0xE76A, 0xE76B, 0xE76C, 0xE76D, 0xE76E, 0xE76F, 0xE770	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_94[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xE771, 0xE772, 0xE773, 0xE774, 0xE775, 0xE776, 0xE777, 0xE778, /* 0x00 */
     0xE779, 0xE77A, 0xE77B, 0xE77C, 0xE77D, 0xE77E, 0xE780, 0xE781, /* 0x00 */
     0xE782, 0xE783, 0xE784, 0xE785, 0xE786, 0xE787, 0xE788, 0xE789, /* 0x10 */
@@ -3864,15 +3864,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_94[] =
     0xEEF8, 0xD5A1, 0xEEF9, 0xCFB3, 0xEEFA, 0xEEFB, 0xE89D, 0xEEFC, /* 0xE0 */
     0xEEFD, 0xEFA1, 0xEEFE, 0xEFA2, 0xB8F5, 0xC3FA, 0xEFA3, 0xEFA4, /* 0xE0 */
     0xBDC2, 0xD2BF, 0xB2F9, 0xEFA5, 0xEFA6, 0xEFA7, 0xD2F8, 0xEFA8, /* 0xF0 */
-    0xD6FD, 0xEFA9, 0xC6CC, 0xE89E, 0xEFAA, 0xEFAB, 0xC1B4, 0xEFAC  /* 0xF0 */
+    0xD6FD, 0xEFA9, 0xC6CC, 0xE89E, 0xEFAA, 0xEFAB, 0xC1B4, 0xEFAC	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_95[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xCFFA, 0xCBF8, 0xEFAE, 0xEFAD, 0xB3FA, 0xB9F8, 0xEFAF, 0xEFB0, /* 0x00 */
     0xD0E2, 0xEFB1, 0xEFB2, 0xB7E6, 0xD0BF, 0xEFB3, 0xEFB4, 0xEFB5, /* 0x00 */
     0xC8F1, 0xCCE0, 0xEFB6, 0xEFB7, 0xEFB8, 0xEFB9, 0xEFBA, 0xD5E0, /* 0x10 */
@@ -3904,15 +3904,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_95[] =
     0xEA54, 0xEA55, 0xEA56, 0xEA57, 0xEA58, 0xEA59, 0xEA5A, 0xEA5B, /* 0xE0 */
     0xC3C5, 0xE3C5, 0xC9C1, 0xE3C6, 0xEA5C, 0xB1D5, 0xCECA, 0xB4B3, /* 0xE0 */
     0xC8F2, 0xE3C7, 0xCFD0, 0xE3C8, 0xBCE4, 0xE3C9, 0xE3CA, 0xC3C6, /* 0xF0 */
-    0xD5A2, 0xC4D6, 0xB9EB, 0xCEC5, 0xE3CB, 0xC3F6, 0xE3CC, 0xEA5D  /* 0xF0 */
+    0xD5A2, 0xC4D6, 0xB9EB, 0xCEC5, 0xE3CB, 0xC3F6, 0xE3CC, 0xEA5D	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_96[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB7A7, 0xB8F3, 0xBAD2, 0xE3CD, 0xE3CE, 0xD4C4, 0xE3CF, 0xEA5E, /* 0x00 */
     0xE3D0, 0xD1CB, 0xE3D1, 0xE3D2, 0xE3D3, 0xE3D4, 0xD1D6, 0xE3D5, /* 0x00 */
     0xB2FB, 0xC0BB, 0xE3D6, 0xEA5F, 0xC0AB, 0xE3D7, 0xE3D8, 0xE3D9, /* 0x10 */
@@ -3944,15 +3944,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_96[] =
     0xF6C5, 0xEB77, 0xEB78, 0xEB79, 0xEB7A, 0xEB7B, 0xEB7C, 0xEB7D, /* 0xE0 */
     0xD3EA, 0xF6A7, 0xD1A9, 0xEB7E, 0xEB80, 0xEB81, 0xEB82, 0xF6A9, /* 0xE0 */
     0xEB83, 0xEB84, 0xEB85, 0xF6A8, 0xEB86, 0xEB87, 0xC1E3, 0xC0D7, /* 0xF0 */
-    0xEB88, 0xB1A2, 0xEB89, 0xEB8A, 0xEB8B, 0xEB8C, 0xCEED, 0xEB8D  /* 0xF0 */
+    0xEB88, 0xB1A2, 0xEB89, 0xEB8A, 0xEB8B, 0xEB8C, 0xCEED, 0xEB8D	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_97[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xD0E8, 0xF6AB, 0xEB8E, 0xEB8F, 0xCFF6, 0xEB90, 0xF6AA, 0xD5F0, /* 0x00 */
     0xF6AC, 0xC3B9, 0xEB91, 0xEB92, 0xEB93, 0xBBF4, 0xF6AE, 0xF6AD, /* 0x00 */
     0xEB94, 0xEB95, 0xEB96, 0xC4DE, 0xEB97, 0xEB98, 0xC1D8, 0xEB99, /* 0x10 */
@@ -3984,15 +3984,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_97[] =
     0xED7B, 0xED7C, 0xED7D, 0xED7E, 0xED80, 0xED81, 0xCEA4, 0xC8CD, /* 0xE0 */
     0xED82, 0xBAAB, 0xE8B8, 0xE8B9, 0xE8BA, 0xBEC2, 0xED83, 0xED84, /* 0xE0 */
     0xED85, 0xED86, 0xED87, 0xD2F4, 0xED88, 0xD4CF, 0xC9D8, 0xED89, /* 0xF0 */
-    0xED8A, 0xED8B, 0xED8C, 0xED8D, 0xED8E, 0xED8F, 0xED90, 0xED91  /* 0xF0 */
+    0xED8A, 0xED8B, 0xED8C, 0xED8D, 0xED8E, 0xED8F, 0xED90, 0xED91	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_98[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xED92, 0xED93, 0xED94, 0xED95, 0xED96, 0xED97, 0xED98, 0xED99, /* 0x00 */
     0xED9A, 0xED9B, 0xED9C, 0xED9D, 0xED9E, 0xED9F, 0xEDA0, 0xEE40, /* 0x00 */
     0xEE41, 0xEE42, 0xEE43, 0xEE44, 0xEE45, 0xEE46, 0xEE47, 0xEE48, /* 0x10 */
@@ -4024,15 +4024,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_98[] =
     0xEF7A, 0xEF7B, 0xEF7C, 0xEF7D, 0xEF7E, 0xEF80, 0xEF81, 0xE2B8, /* 0xE0 */
     0xF7CF, 0xEF82, 0xEF83, 0xEF84, 0xEF85, 0xEF86, 0xEF87, 0xEF88, /* 0xE0 */
     0xEF89, 0xEF8A, 0xEF8B, 0xEF8C, 0xEF8D, 0xEF8E, 0xEF8F, 0xEF90, /* 0xF0 */
-    0xEF91, 0xEF92, 0xEF93, 0xEF94, 0xEF95, 0xEF96, 0xEF97, 0xEF98  /* 0xF0 */
+    0xEF91, 0xEF92, 0xEF93, 0xEF94, 0xEF95, 0xEF96, 0xEF97, 0xEF98	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_99[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xEF99, 0xEF9A, 0xEF9B, 0xEF9C, 0xEF9D, 0xEF9E, 0xEF9F, 0xEFA0, /* 0x00 */
     0xF040, 0xF041, 0xF042, 0xF043, 0xF044, 0xF7D0, 0xF045, 0xF046, /* 0x00 */
     0xB2CD, 0xF047, 0xF048, 0xF049, 0xF04A, 0xF04B, 0xF04C, 0xF04D, /* 0x10 */
@@ -4064,15 +4064,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_99[] =
     0xF187, 0xF188, 0xF189, 0xF18A, 0xF18B, 0xF18C, 0xF18D, 0xF18E, /* 0xE0 */
     0xF18F, 0xF190, 0xF191, 0xF192, 0xF193, 0xF194, 0xF195, 0xF196, /* 0xE0 */
     0xF197, 0xF198, 0xF199, 0xF19A, 0xF19B, 0xF19C, 0xF19D, 0xF19E, /* 0xF0 */
-    0xF19F, 0xF1A0, 0xF240, 0xF241, 0xF242, 0xF243, 0xF244, 0xF245  /* 0xF0 */
+    0xF19F, 0xF1A0, 0xF240, 0xF241, 0xF242, 0xF243, 0xF244, 0xF245	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_9A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xF246, 0xF247, 0xF248, 0xF249, 0xF24A, 0xF24B, 0xF24C, 0xF24D, /* 0x00 */
     0xF24E, 0xF24F, 0xF250, 0xF251, 0xF252, 0xF253, 0xF254, 0xF255, /* 0x00 */
     0xF256, 0xF257, 0xF258, 0xF259, 0xF25A, 0xF25B, 0xF25C, 0xF25D, /* 0x10 */
@@ -4104,15 +4104,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_9A[] =
     0xF382, 0xF7D5, 0xF383, 0xF384, 0xF385, 0xF386, 0xF7D6, 0xF387, /* 0xE0 */
     0xF388, 0xF389, 0xF38A, 0xF7D8, 0xF38B, 0xF7DA, 0xF38C, 0xF7D7, /* 0xE0 */
     0xF38D, 0xF38E, 0xF38F, 0xF390, 0xF391, 0xF392, 0xF393, 0xF394, /* 0xF0 */
-    0xF395, 0xF7DB, 0xF396, 0xF7D9, 0xF397, 0xF398, 0xF399, 0xF39A  /* 0xF0 */
+    0xF395, 0xF7DB, 0xF396, 0xF7D9, 0xF397, 0xF398, 0xF399, 0xF39A	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_9B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xF39B, 0xF39C, 0xF39D, 0xD7D7, 0xF39E, 0xF39F, 0xF3A0, 0xF440, /* 0x00 */
     0xF7DC, 0xF441, 0xF442, 0xF443, 0xF444, 0xF445, 0xF446, 0xF7DD, /* 0x00 */
     0xF447, 0xF448, 0xF449, 0xF7DE, 0xF44A, 0xF44B, 0xF44C, 0xF44D, /* 0x10 */
@@ -4144,15 +4144,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_9B[] =
     0xF644, 0xF645, 0xF646, 0xF647, 0xF648, 0xF649, 0xF64A, 0xF64B, /* 0xE0 */
     0xF64C, 0xF64D, 0xF64E, 0xF64F, 0xF650, 0xF651, 0xF652, 0xF653, /* 0xE0 */
     0xF654, 0xF655, 0xF656, 0xF657, 0xF658, 0xF659, 0xF65A, 0xF65B, /* 0xF0 */
-    0xF65C, 0xF65D, 0xF65E, 0xF65F, 0xF660, 0xF661, 0xF662, 0xF663  /* 0xF0 */
+    0xF65C, 0xF65D, 0xF65E, 0xF65F, 0xF660, 0xF661, 0xF662, 0xF663	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_9C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xF664, 0xF665, 0xF666, 0xF667, 0xF668, 0xF669, 0xF66A, 0xF66B, /* 0x00 */
     0xF66C, 0xF66D, 0xF66E, 0xF66F, 0xF670, 0xF671, 0xF672, 0xF673, /* 0x00 */
     0xF674, 0xF675, 0xF676, 0xF677, 0xF678, 0xF679, 0xF67A, 0xF67B, /* 0x10 */
@@ -4184,15 +4184,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_9C[] =
     0xF79F, 0xF7A0, 0xF7AF, 0xF840, 0xF841, 0xF842, 0xF843, 0xF844, /* 0xE0 */
     0xF845, 0xF846, 0xF847, 0xF848, 0xF849, 0xF84A, 0xF84B, 0xF84C, /* 0xE0 */
     0xF84D, 0xF84E, 0xF84F, 0xF850, 0xF851, 0xF852, 0xF853, 0xF854, /* 0xF0 */
-    0xF855, 0xF856, 0xF857, 0xF858, 0xF859, 0xF85A, 0xF85B, 0xF85C  /* 0xF0 */
+    0xF855, 0xF856, 0xF857, 0xF858, 0xF859, 0xF85A, 0xF85B, 0xF85C	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_9D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xF85D, 0xF85E, 0xF85F, 0xF860, 0xF861, 0xF862, 0xF863, 0xF864, /* 0x00 */
     0xF865, 0xF866, 0xF867, 0xF868, 0xF869, 0xF86A, 0xF86B, 0xF86C, /* 0x00 */
     0xF86D, 0xF86E, 0xF86F, 0xF870, 0xF871, 0xF872, 0xF873, 0xF874, /* 0x10 */
@@ -4224,15 +4224,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_9D[] =
     0xFA7D, 0xFA7E, 0xFA80, 0xFA81, 0xFA82, 0xFA83, 0xFA84, 0xFA85, /* 0xE0 */
     0xFA86, 0xFA87, 0xFA88, 0xFA89, 0xFA8A, 0xFA8B, 0xFA8C, 0xFA8D, /* 0xE0 */
     0xFA8E, 0xFA8F, 0xFA90, 0xFA91, 0xFA92, 0xFA93, 0xFA94, 0xFA95, /* 0xF0 */
-    0xFA96, 0xFA97, 0xFA98, 0xFA99, 0xFA9A, 0xFA9B, 0xFA9C, 0xFA9D  /* 0xF0 */
+    0xFA96, 0xFA97, 0xFA98, 0xFA99, 0xFA9A, 0xFA9B, 0xFA9C, 0xFA9D	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_9E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xFA9E, 0xFA9F, 0xFAA0, 0xFB40, 0xFB41, 0xFB42, 0xFB43, 0xFB44, /* 0x00 */
     0xFB45, 0xFB46, 0xFB47, 0xFB48, 0xFB49, 0xFB4A, 0xFB4B, 0xFB4C, /* 0x00 */
     0xFB4D, 0xFB4E, 0xFB4F, 0xFB50, 0xFB51, 0xFB52, 0xFB53, 0xFB54, /* 0x10 */
@@ -4264,15 +4264,15 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_9E[] =
     0xF7EF, 0xFC64, 0xF7F1, 0xFC65, 0xFC66, 0xF7F4, 0xFC67, 0xF7F3, /* 0xE0 */
     0xFC68, 0xF7F2, 0xF7F5, 0xFC69, 0xFC6A, 0xFC6B, 0xFC6C, 0xF7F6, /* 0xE0 */
     0xFC6D, 0xFC6E, 0xFC6F, 0xFC70, 0xFC71, 0xFC72, 0xFC73, 0xFC74, /* 0xF0 */
-    0xFC75, 0xEDE9, 0xFC76, 0xEDEA, 0xEDEB, 0xFC77, 0xF6BC, 0xFC78  /* 0xF0 */
+    0xFC75, 0xEDE9, 0xFC76, 0xEDEA, 0xEDEB, 0xFC77, 0xF6BC, 0xFC78	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_9F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xFC79, 0xFC7A, 0xFC7B, 0xFC7C, 0xFC7D, 0xFC7E, 0xFC80, 0xFC81, /* 0x00 */
     0xFC82, 0xFC83, 0xFC84, 0xF6BD, 0xFC85, 0xF6BE, 0xB6A6, 0xFC86, /* 0x00 */
     0xD8BE, 0xFC87, 0xFC88, 0xB9C4, 0xFC89, 0xFC8A, 0xFC8B, 0xD8BB, /* 0x10 */
@@ -4293,7 +4293,7 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_9F[] =
     0xF6B8, 0xF6B9, 0xF6BA, 0xC8A3, 0xF6BB, 0xFD88, 0xFD89, 0xFD8A, /* 0x80 */
     0xFD8B, 0xFD8C, 0xFD8D, 0xFD8E, 0xFD8F, 0xFD90, 0xFD91, 0xFD92, /* 0x90 */
     0xFD93, 0xC1FA, 0xB9A8, 0xEDE8, 0xFD94, 0xFD95, 0xFD96, 0xB9EA, /* 0x90 */
-    0xD9DF, 0xFD97, 0xFD98, 0xFD99, 0xFD9A, 0xFD9B                  /* 0xA0 */
+    0xD9DF, 0xFD97, 0xFD98, 0xFD99, 0xFD9A, 0xFD9B					/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -4301,9 +4301,9 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_9F[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_APPLECHINSIMP_F8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x0081, 0x0082                                                  /* 0x80 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x0081, 0x0082													/* 0x80 */
                                                                     /* 0x80 */
 };
 
@@ -4311,35 +4311,35 @@ static sal_uInt16 const aImplUniToDBCSTab_APPLECHINSIMP_F8[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_F9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x20 */
-                                    0xFD9C,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xFD9D,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xFD9E,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0xFD9F, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xFDA0                                                  /* 0xF0 */
+                                    0xFD9C, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xFD9D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xFD9E, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFD9F, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xFDA0													/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -4347,41 +4347,41 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_F9[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_FA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
                                     0xFE40, 0xFE41, 0xFE42, 0xFE43, /* 0x00 */
-         0, 0xFE44,      0, 0xFE45, 0xFE46,      0,      0,      0, /* 0x10 */
-    0xFE47,      0,      0,      0,      0,      0,      0, 0xFE48, /* 0x10 */
-    0xFE49, 0xFE4A,      0, 0xFE4B, 0xFE4C,      0,      0, 0xFE4D, /* 0x20 */
-    0xFE4E, 0xFE4F                                                  /* 0x20 */
+         0, 0xFE44, 	 0, 0xFE45, 0xFE46, 	 0, 	 0, 	 0, /* 0x10 */
+    0xFE47, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xFE48, /* 0x10 */
+    0xFE49, 0xFE4A, 	 0, 0xFE4B, 0xFE4C, 	 0, 	 0, 0xFE4D, /* 0x20 */
+    0xFE4E, 0xFE4F													/* 0x20 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_FE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xA955, 0xA6F2,      0, 0xA6F4, 0xA6F5, 0xA6E0, 0xA6E1, 0xA6F0, /* 0x30 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xA955, 0xA6F2, 	 0, 0xA6F4, 0xA6F5, 0xA6E0, 0xA6E1, 0xA6F0, /* 0x30 */
     0xA6F1, 0xA6E2, 0xA6E3, 0xA6EE, 0xA6EF, 0xA6E6, 0xA6E7, 0xA6E4, /* 0x30 */
-    0xA6E5, 0xA6E8, 0xA6E9, 0xA6EA, 0xA6EB,      0,      0,      0, /* 0x40 */
+    0xA6E5, 0xA6E8, 0xA6E9, 0xA6EA, 0xA6EB, 	 0, 	 0, 	 0, /* 0x40 */
          0, 0xA968, 0xA969, 0xA96A, 0xA96B, 0xA96C, 0xA96D, 0xA96E, /* 0x40 */
-    0xA96F, 0xA970, 0xA971,      0, 0xA972, 0xA973, 0xA974, 0xA975, /* 0x50 */
+    0xA96F, 0xA970, 0xA971, 	 0, 0xA972, 0xA973, 0xA974, 0xA975, /* 0x50 */
          0, 0xA976, 0xA977, 0xA978, 0xA979, 0xA97A, 0xA97B, 0xA97C, /* 0x50 */
-    0xA97D, 0xA97E, 0xA980, 0xA981, 0xA982, 0xA983, 0xA984,      0, /* 0x60 */
-    0xA985, 0xA986, 0xA987, 0xA988                                  /* 0x60 */
+    0xA97D, 0xA97E, 0xA980, 0xA981, 0xA982, 0xA983, 0xA984, 	 0, /* 0x60 */
+    0xA985, 0xA986, 0xA987, 0xA988									/* 0x60 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_FE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xA6F2,      0, 0xA6F4, 0xA6F5, 0xA6E0, 0xA6E1, 0xA6F0, /* 0x30 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xA6F2, 	 0, 0xA6F4, 0xA6F5, 0xA6E0, 0xA6E1, 0xA6F0, /* 0x30 */
     0xA6F1, 0xA6E2, 0xA6E3, 0xA6EE, 0xA6EF, 0xA6E6, 0xA6E7, 0xA6E4, /* 0x30 */
-    0xA6E5, 0xA6E8, 0xA6E9, 0xA6EA, 0xA6EB                          /* 0x40 */
+    0xA6E5, 0xA6E8, 0xA6E9, 0xA6EA, 0xA6EB							/* 0x40 */
                                                                     /* 0x40 */
 };
 
@@ -4389,8 +4389,8 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_FE[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GBK_FF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xA3A1, 0xA3A2, 0xA3A3, 0xA1E7, 0xA3A5, 0xA3A6, 0xA3A7, /* 0x00 */
     0xA3A8, 0xA3A9, 0xA3AA, 0xA3AB, 0xA3AC, 0xA3AD, 0xA3AE, 0xA3AF, /* 0x00 */
     0xA3B0, 0xA3B1, 0xA3B2, 0xA3B3, 0xA3B4, 0xA3B5, 0xA3B6, 0xA3B7, /* 0x10 */
@@ -4402,24 +4402,24 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_FF[] =
     0xA3E0, 0xA3E1, 0xA3E2, 0xA3E3, 0xA3E4, 0xA3E5, 0xA3E6, 0xA3E7, /* 0x40 */
     0xA3E8, 0xA3E9, 0xA3EA, 0xA3EB, 0xA3EC, 0xA3ED, 0xA3EE, 0xA3EF, /* 0x40 */
     0xA3F0, 0xA3F1, 0xA3F2, 0xA3F3, 0xA3F4, 0xA3F5, 0xA3F6, 0xA3F7, /* 0x50 */
-    0xA3F8, 0xA3F9, 0xA3FA, 0xA3FB, 0xA3FC, 0xA3FD, 0xA1AB,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xA1E9, 0xA1EA, 0xA956, 0xA3FE, 0xA957, 0xA3A4                  /* 0xE0 */
+    0xA3F8, 0xA3F9, 0xA3FA, 0xA3FB, 0xA3FC, 0xA3FD, 0xA1AB, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xA1E9, 0xA1EA, 0xA956, 0xA3FE, 0xA957, 0xA3A4					/* 0xE0 */
                                                                     /* 0xE0 */
 };
 
@@ -4427,8 +4427,8 @@ static sal_uInt16 const aImplUniToDBCSTab_GBK_FF[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_FF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xA3A1, 0xA3A2, 0xA3A3, 0xA1E7, 0xA3A5, 0xA3A6, 0xA3A7, /* 0x00 */
     0xA3A8, 0xA3A9, 0xA3AA, 0xA3AB, 0xA3AC, 0xA3AD, 0xA3AE, 0xA3AF, /* 0x00 */
     0xA3B0, 0xA3B1, 0xA3B2, 0xA3B3, 0xA3B4, 0xA3B5, 0xA3B6, 0xA3B7, /* 0x10 */
@@ -4440,24 +4440,24 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_FF[] =
     0xA3E0, 0xA3E1, 0xA3E2, 0xA3E3, 0xA3E4, 0xA3E5, 0xA3E6, 0xA3E7, /* 0x40 */
     0xA3E8, 0xA3E9, 0xA3EA, 0xA3EB, 0xA3EC, 0xA3ED, 0xA3EE, 0xA3EF, /* 0x40 */
     0xA3F0, 0xA3F1, 0xA3F2, 0xA3F3, 0xA3F4, 0xA3F5, 0xA3F6, 0xA3F7, /* 0x50 */
-    0xA3F8, 0xA3F9, 0xA3FA, 0xA3FB, 0xA3FC, 0xA3FD, 0xA1AB,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xA1E9, 0xA1EA,      0, 0xA3FE,      0, 0xA3A4,                 /* 0xE0 */
+    0xA3F8, 0xA3F9, 0xA3FA, 0xA3FB, 0xA3FC, 0xA3FD, 0xA1AB, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xA1E9, 0xA1EA, 	 0, 0xA3FE, 	 0, 0xA3A4, 				/* 0xE0 */
                                                                     /* 0xE0 */
 };
 
diff --git a/sal/textenc/tcvtscn3.tab b/sal/textenc/tcvtscn3.tab
index b45e9d12de92..fd7ab00286b0 100644
--- a/sal/textenc/tcvtscn3.tab
+++ b/sal/textenc/tcvtscn3.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,8 +35,8 @@
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_B0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x554A, 0x963F, 0x57C3, 0x6328, 0x54CE, 0x5509, 0x54C0, /* 0xA0 */
     0x769A, 0x764C, 0x85F9, 0x77EE, 0x827E, 0x7919, 0x611B, 0x9698, /* 0xA0 */
     0x978D, 0x6C28, 0x5B89, 0x4FFA, 0x6309, 0x6697, 0x5CB8, 0x80FA, /* 0xB0 */
@@ -48,15 +48,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_B0[] =
     0x73ED, 0x642C, 0x6273, 0x822C, 0x9812, 0x677F, 0x7248, 0x626E, /* 0xE0 */
     0x62CC, 0x4F34, 0x74E3, 0x534A, 0x8FA6, 0x7D46, 0x90A6, 0x5E6B, /* 0xE0 */
     0x6886, 0x699C, 0x8180, 0x7D81, 0x68D2, 0x78C5, 0x868C, 0x938A, /* 0xF0 */
-    0x508D, 0x8B17, 0x82DE, 0x80DE, 0x5305, 0x8912, 0x5265          /* 0xF0 */
+    0x508D, 0x8B17, 0x82DE, 0x80DE, 0x5305, 0x8912, 0x5265			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_B1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8584, 0x96F9, 0x4FDD, 0x5821, 0x98FD, 0x5BF6, 0x62B1, /* 0xA0 */
     0x5831, 0x66B4, 0x8C79, 0x9B91, 0x7206, 0x676F, 0x7891, 0x60B2, /* 0xA0 */
     0x5351, 0x5317, 0x8F29, 0x80CC, 0x8C9D, 0x92C7, 0x500D, 0x72FD, /* 0xB0 */
@@ -68,15 +68,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_B1[] =
     0x7DE8, 0x8CB6, 0x6241, 0x4FBF, 0x8B8A, 0x535E, 0x8FA8, 0x8FAF, /* 0xE0 */
     0x8FAE, 0x904D, 0x6A19, 0x5F6A, 0x8198, 0x8868, 0x9C49, 0x618B, /* 0xE0 */
     0x522B, 0x765F, 0x5F6C, 0x658C, 0x7015, 0x6FF1, 0x8CD3, 0x64EF, /* 0xF0 */
-    0x5175, 0x51B0, 0x67C4, 0x4E19, 0x79C9, 0x9905, 0x70B3          /* 0xF0 */
+    0x5175, 0x51B0, 0x67C4, 0x4E19, 0x79C9, 0x9905, 0x70B3			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_B2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x75C5, 0x5E76, 0x73BB, 0x83E0, 0x64AD, 0x64A5, 0x9262, /* 0xA0 */
     0x6CE2, 0x535A, 0x52C3, 0x640F, 0x9251, 0x7B94, 0x4F2F, 0x5E1B, /* 0xA0 */
     0x8236, 0x8116, 0x818A, 0x6E24, 0x6CCA, 0x99C1, 0x6355, 0x535C, /* 0xB0 */
@@ -88,15 +88,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_B2[] =
     0x5074, 0x518C, 0x6E2C, 0x5C64, 0x8E6D, 0x63D2, 0x53C9, 0x832C, /* 0xE0 */
     0x8336, 0x67E5, 0x78B4, 0x643D, 0x5BDF, 0x5C94, 0x5DEE, 0x8A6B, /* 0xE0 */
     0x62C6, 0x67F4, 0x8C7A, 0x6519, 0x647B, 0x87EC, 0x995E, 0x8B92, /* 0xF0 */
-    0x7E8F, 0x93DF, 0x7523, 0x95E1, 0x986B, 0x660C, 0x7316          /* 0xF0 */
+    0x7E8F, 0x93DF, 0x7523, 0x95E1, 0x986B, 0x660C, 0x7316			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_B3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5834, 0x5617, 0x5E38, 0x9577, 0x511F, 0x8178, 0x5EE0, /* 0xA0 */
     0x655E, 0x66A2, 0x5531, 0x5021, 0x8D85, 0x6284, 0x9214, 0x671D, /* 0xA0 */
     0x5632, 0x6F6E, 0x5DE2, 0x5435, 0x7092, 0x8ECA, 0x626F, 0x64A4, /* 0xB0 */
@@ -108,15 +108,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_B3[] =
     0x8D64, 0x7FC5, 0x65A5, 0x71BE, 0x5145, 0x885D, 0x87F2, 0x5D07, /* 0xE0 */
     0x5BF5, 0x62BD, 0x916C, 0x7587, 0x8E8A, 0x7A20, 0x6101, 0x7C4C, /* 0xE0 */
     0x4EC7, 0x7DA2, 0x7785, 0x919C, 0x81ED, 0x521D, 0x51FA, 0x6A71, /* 0xF0 */
-    0x53A8, 0x8E87, 0x92E4, 0x96DB, 0x6EC1, 0x9664, 0x695A          /* 0xF0 */
+    0x53A8, 0x8E87, 0x92E4, 0x96DB, 0x6EC1, 0x9664, 0x695A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_B4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x790E, 0x5132, 0x77D7, 0x6410, 0x89F8, 0x8655, 0x63E3, /* 0xA0 */
     0x5DDD, 0x7A7F, 0x693D, 0x50B3, 0x8239, 0x5598, 0x4E32, 0x7621, /* 0xA0 */
     0x7A97, 0x5E62, 0x5E8A, 0x95D6, 0x5275, 0x5439, 0x708A, 0x6376, /* 0xB0 */
@@ -128,15 +128,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_B4[] =
     0x8106, 0x7601, 0x7CB9, 0x6DEC, 0x7FE0, 0x6751, 0x5B58, 0x5BF8, /* 0xE0 */
     0x78CB, 0x64AE, 0x6413, 0x63AA, 0x632B, 0x932F, 0x642D, 0x9054, /* 0xE0 */
     0x7B54, 0x7629, 0x6253, 0x5927, 0x5446, 0x6B79, 0x50A3, 0x6234, /* 0xF0 */
-    0x5E36, 0x6B86, 0x4EE3, 0x8CB8, 0x888B, 0x5F85, 0x902E          /* 0xF0 */
+    0x5E36, 0x6B86, 0x4EE3, 0x8CB8, 0x888B, 0x5F85, 0x902E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_B5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6020, 0x803D, 0x64D4, 0x4E39, 0x55AE, 0x9132, 0x64A3, /* 0xA0 */
     0x81BD, 0x65E6, 0x6C2E, 0x4F46, 0x619A, 0x6DE1, 0x8A95, 0x5F48, /* 0xA0 */
     0x86CB, 0x7576, 0x64CB, 0x9EE8, 0x8569, 0x6A94, 0x5200, 0x6417, /* 0xB0 */
@@ -148,15 +148,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_B5[] =
     0x6382, 0x6EC7, 0x7898, 0x9EDE, 0x5178, 0x975B, 0x588A, 0x96FB, /* 0xE0 */
     0x4F43, 0x7538, 0x5E97, 0x60E6, 0x5960, 0x6FB1, 0x6BBF, 0x7889, /* 0xE0 */
     0x53FC, 0x96D5, 0x51CB, 0x5201, 0x6389, 0x540A, 0x91E3, 0x8ABF, /* 0xF0 */
-    0x8DCC, 0x7239, 0x789F, 0x8776, 0x8FED, 0x8ADC, 0x758A          /* 0xF0 */
+    0x8DCC, 0x7239, 0x789F, 0x8776, 0x8FED, 0x8ADC, 0x758A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_B6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x4E01, 0x76EF, 0x53EE, 0x91D8, 0x9802, 0x9F0E, 0x9320, /* 0xA0 */
     0x5B9A, 0x8A02, 0x4E22, 0x6771, 0x51AC, 0x8463, 0x61C2, 0x52D5, /* 0xA0 */
     0x68DF, 0x4F97, 0x606B, 0x51CD, 0x6D1E, 0x515C, 0x6296, 0x9B25, /* 0xB0 */
@@ -168,15 +168,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_B6[] =
     0x591A, 0x596A, 0x579B, 0x8EB2, 0x6735, 0x8DFA, 0x8235, 0x5241, /* 0xE0 */
     0x60F0, 0x58AE, 0x86FE, 0x5CE8, 0x9D5D, 0x4FC4, 0x984D, 0x8A1B, /* 0xE0 */
     0x5A25, 0x60E1, 0x5384, 0x627C, 0x904F, 0x9102, 0x9913, 0x6069, /* 0xF0 */
-    0x800C, 0x5152, 0x8033, 0x723E, 0x990C, 0x6D31, 0x4E8C          /* 0xF0 */
+    0x800C, 0x5152, 0x8033, 0x723E, 0x990C, 0x6D31, 0x4E8C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_B7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8CB3, 0x767C, 0x7F70, 0x7B4F, 0x4F10, 0x4E4F, 0x95A5, /* 0xA0 */
     0x6CD5, 0x73D0, 0x85E9, 0x5E06, 0x756A, 0x7FFB, 0x6A0A, 0x792C, /* 0xA0 */
     0x91E9, 0x7E41, 0x51E1, 0x7169, 0x53CD, 0x8FD4, 0x7BC4, 0x8CA9, /* 0xB0 */
@@ -188,15 +188,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_B7[] =
     0x7CDE, 0x8C50, 0x5C01, 0x6953, 0x8702, 0x5CF0, 0x92D2, 0x98A8, /* 0xE0 */
     0x760B, 0x70FD, 0x9022, 0x99AE, 0x7E2B, 0x8AF7, 0x5949, 0x9CF3, /* 0xE0 */
     0x4F5B, 0x5426, 0x592B, 0x6577, 0x819A, 0x5B75, 0x6276, 0x62C2, /* 0xF0 */
-    0x8F3B, 0x5E45, 0x6C1F, 0x7B26, 0x4F0F, 0x4FD8, 0x670D          /* 0xF0 */
+    0x8F3B, 0x5E45, 0x6C1F, 0x7B26, 0x4F0F, 0x4FD8, 0x670D			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_B8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6D6E, 0x6DAA, 0x798F, 0x88B1, 0x5F17, 0x752B, 0x64AB, /* 0xA0 */
     0x8F14, 0x4FEF, 0x91DC, 0x65A7, 0x812F, 0x8151, 0x5E9C, 0x8150, /* 0xA0 */
     0x8D74, 0x526F, 0x8986, 0x8CE6, 0x5FA9, 0x5085, 0x4ED8, 0x961C, /* 0xB0 */
@@ -208,15 +208,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_B8[] =
     0x818F, 0x7F94, 0x7CD5, 0x641E, 0x93AC, 0x7A3F, 0x544A, 0x54E5, /* 0xE0 */
     0x6B4C, 0x64F1, 0x6208, 0x9D3F, 0x80F3, 0x7599, 0x5272, 0x9769, /* 0xE0 */
     0x845B, 0x683C, 0x86E4, 0x95A3, 0x9694, 0x927B, 0x500B, 0x5404, /* 0xF0 */
-    0x7D66, 0x6839, 0x8DDF, 0x8015, 0x66F4, 0x5E9A, 0x7FB9          /* 0xF0 */
+    0x7D66, 0x6839, 0x8DDF, 0x8015, 0x66F4, 0x5E9A, 0x7FB9			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_B9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x57C2, 0x803F, 0x6897, 0x5DE5, 0x653B, 0x529F, 0x606D, /* 0xA0 */
     0x9F94, 0x4F9B, 0x8EAC, 0x516C, 0x5BAB, 0x5F13, 0x978F, 0x6C5E, /* 0xA0 */
     0x62F1, 0x8CA2, 0x5171, 0x920E, 0x52FE, 0x6E9D, 0x82DF, 0x72D7, /* 0xB0 */
@@ -228,15 +228,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_B9[] =
     0x704C, 0x8CAB, 0x5149, 0x5EE3, 0x901B, 0x7470, 0x898F, 0x572D, /* 0xE0 */
     0x7845, 0x6B78, 0x9F9C, 0x95A8, 0x8ECC, 0x9B3C, 0x8A6D, 0x7678, /* 0xE0 */
     0x6842, 0x6AC3, 0x8DEA, 0x8CB4, 0x528A, 0x8F25, 0x6EDA, 0x68CD, /* 0xF0 */
-    0x934B, 0x90ED, 0x570B, 0x679C, 0x88F9, 0x904E, 0x54C8          /* 0xF0 */
+    0x934B, 0x90ED, 0x570B, 0x679C, 0x88F9, 0x904E, 0x54C8			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_BA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9AB8, 0x5B69, 0x6D77, 0x6C26, 0x4EA5, 0x5BB3, 0x99ED, /* 0xA0 */
     0x9163, 0x61A8, 0x90AF, 0x97D3, 0x542B, 0x6DB5, 0x5BD2, 0x51FD, /* 0xA0 */
     0x558A, 0x7F55, 0x7FF0, 0x64BC, 0x634D, 0x65F1, 0x61BE, 0x608D, /* 0xB0 */
@@ -248,15 +248,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_BA[] =
     0x4EA8, 0x6A2A, 0x8861, 0x6052, 0x8F5F, 0x54C4, 0x70D8, 0x8679, /* 0xE0 */
     0x9D3B, 0x6D2A, 0x5B8F, 0x5F18, 0x7D05, 0x5589, 0x4FAF, 0x7334, /* 0xE0 */
     0x543C, 0x539A, 0x5019, 0x5F8C, 0x547C, 0x4E4E, 0x5FFD, 0x745A, /* 0xF0 */
-    0x58FA, 0x846B, 0x80E1, 0x8774, 0x72D0, 0x7CCA, 0x6E56          /* 0xF0 */
+    0x58FA, 0x846B, 0x80E1, 0x8774, 0x72D0, 0x7CCA, 0x6E56			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_BB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5F27, 0x864E, 0x552C, 0x8B77, 0x4E92, 0x6EEC, 0x6237, /* 0xA0 */
     0x82B1, 0x5629, 0x83EF, 0x733E, 0x6ED1, 0x756B, 0x5283, 0x5316, /* 0xA0 */
     0x8A71, 0x69D0, 0x5F8A, 0x61F7, 0x6DEE, 0x58DE, 0x6B61, 0x74B0, /* 0xB0 */
@@ -268,15 +268,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_BB[] =
     0x7A62, 0x6703, 0x71F4, 0x532F, 0x8AF1, 0x8AA8, 0x7E6A, 0x8477, /* 0xE0 */
     0x660F, 0x5A5A, 0x9B42, 0x6E3E, 0x6DF7, 0x8C41, 0x6D3B, 0x4F19, /* 0xE0 */
     0x706B, 0x7372, 0x6216, 0x60D1, 0x970D, 0x8CA8, 0x798D, 0x64CA, /* 0xF0 */
-    0x573E, 0x57FA, 0x6A5F, 0x7578, 0x7A3D, 0x7A4D, 0x7B95          /* 0xF0 */
+    0x573E, 0x57FA, 0x6A5F, 0x7578, 0x7A3D, 0x7A4D, 0x7B95			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_BC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x808C, 0x9951, 0x8FF9, 0x6FC0, 0x8B4F, 0x9DC4, 0x59EC, /* 0xA0 */
     0x7E3E, 0x7DDD, 0x5409, 0x6975, 0x68D8, 0x8F2F, 0x7C4D, 0x96C6, /* 0xA0 */
     0x53CA, 0x6025, 0x75BE, 0x6C72, 0x5373, 0x5AC9, 0x7D1A, 0x64E0, /* 0xB0 */
@@ -288,15 +288,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_BC[] =
     0x76E3, 0x5805, 0x5C16, 0x7B8B, 0x9593, 0x714E, 0x517C, 0x80A9, /* 0xE0 */
     0x8271, 0x5978, 0x7DD8, 0x7E6D, 0x6AA2, 0x67EC, 0x78B1, 0x9E7C, /* 0xE0 */
     0x63C0, 0x64BF, 0x7C21, 0x5109, 0x526A, 0x51CF, 0x85A6, 0x6ABB, /* 0xF0 */
-    0x9452, 0x8E10, 0x8CE4, 0x898B, 0x9375, 0x7BAD, 0x4EF6          /* 0xF0 */
+    0x9452, 0x8E10, 0x8CE4, 0x898B, 0x9375, 0x7BAD, 0x4EF6			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_BD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5065, 0x8266, 0x528D, 0x991E, 0x6F38, 0x6FFA, 0x6F97, /* 0xA0 */
     0x5EFA, 0x50F5, 0x59DC, 0x5C07, 0x6F3F, 0x6C5F, 0x7586, 0x8523, /* 0xA0 */
     0x69F3, 0x596C, 0x8B1B, 0x5320, 0x91AC, 0x964D, 0x8549, 0x6912, /* 0xB0 */
@@ -308,15 +308,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_BD[] =
     0x6F54, 0x7D50, 0x89E3, 0x59D0, 0x6212, 0x85C9, 0x82A5, 0x754C, /* 0xE0 */
     0x501F, 0x4ECB, 0x75A5, 0x8AA1, 0x5C4A, 0x5DFE, 0x7B4B, 0x65A4, /* 0xE0 */
     0x91D1, 0x4ECA, 0x6D25, 0x895F, 0x7DCA, 0x9326, 0x50C5, 0x8B39, /* 0xF0 */
-    0x9032, 0x9773, 0x6649, 0x7981, 0x8FD1, 0x71FC, 0x6D78          /* 0xF0 */
+    0x9032, 0x9773, 0x6649, 0x7981, 0x8FD1, 0x71FC, 0x6D78			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_BE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x76E1, 0x52C1, 0x8346, 0x5162, 0x8396, 0x775B, 0x6676, /* 0xA0 */
     0x9BE8, 0x4EAC, 0x9A5A, 0x7CBE, 0x7CB3, 0x7D93, 0x4E95, 0x8B66, /* 0xA0 */
     0x666F, 0x9838, 0x975C, 0x5883, 0x656C, 0x93E1, 0x5F91, 0x75D9, /* 0xB0 */
@@ -328,15 +328,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_BE[] =
     0x8DDD, 0x8E1E, 0x92F8, 0x4FF1, 0x53E5, 0x61FC, 0x70AC, 0x5287, /* 0xE0 */
     0x6350, 0x9D51, 0x5A1F, 0x5026, 0x7737, 0x5377, 0x7D79, 0x6485, /* 0xE0 */
     0x652B, 0x6289, 0x6398, 0x5014, 0x7235, 0x89BA, 0x51B3, 0x8A23, /* 0xF0 */
-    0x7D76, 0x5747, 0x83CC, 0x921E, 0x8ECD, 0x541B, 0x5CFB          /* 0xF0 */
+    0x7D76, 0x5747, 0x83CC, 0x921E, 0x8ECD, 0x541B, 0x5CFB			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_BF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x4FCA, 0x7AE3, 0x6D5A, 0x90E1, 0x99FF, 0x5580, 0x5496, /* 0xA0 */
     0x5361, 0x54AF, 0x958B, 0x63E9, 0x6977, 0x51F1, 0x6168, 0x520A, /* 0xA0 */
     0x582A, 0x52D8, 0x574E, 0x780D, 0x770B, 0x5EB7, 0x6177, 0x7CE0, /* 0xB0 */
@@ -348,15 +348,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_BF[] =
     0x82E6, 0x9177, 0x5EAB, 0x8932, 0x8A87, 0x57AE, 0x630E, 0x8DE8, /* 0xE0 */
     0x80EF, 0x584A, 0x7B77, 0x5108, 0x5FEB, 0x5BEC, 0x6B3E, 0x5321, /* 0xE0 */
     0x7B50, 0x72C2, 0x6846, 0x7926, 0x7736, 0x66E0, 0x51B5, 0x8667, /* 0xF0 */
-    0x76D4, 0x5DCB, 0x7ABA, 0x8475, 0x594E, 0x9B41, 0x5080          /* 0xF0 */
+    0x76D4, 0x5DCB, 0x7ABA, 0x8475, 0x594E, 0x9B41, 0x5080			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_C0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x994B, 0x6127, 0x6F70, 0x5764, 0x6606, 0x6346, 0x56F0, /* 0xA0 */
     0x62EC, 0x64F4, 0x5ED3, 0x95CA, 0x5783, 0x62C9, 0x5587, 0x881F, /* 0xA0 */
     0x81D8, 0x8FA3, 0x5566, 0x840A, 0x4F86, 0x8CF4, 0x85CD, 0x5A6A, /* 0xB0 */
@@ -368,15 +368,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_C0[] =
     0x985E, 0x6CEA, 0x68F1, 0x695E, 0x51B7, 0x5398, 0x68A8, 0x7281, /* 0xE0 */
     0x9ECE, 0x7C6C, 0x72F8, 0x96E2, 0x7055, 0x7406, 0x674E, 0x88CF, /* 0xE0 */
     0x9BC9, 0x79AE, 0x8389, 0x8354, 0x540F, 0x6817, 0x9E97, 0x53B2, /* 0xF0 */
-    0x52F5, 0x792B, 0x6B77, 0x5229, 0x5088, 0x4F8B, 0x4FD0          /* 0xF0 */
+    0x52F5, 0x792B, 0x6B77, 0x5229, 0x5088, 0x4F8B, 0x4FD0			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_C1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x75E2, 0x7ACB, 0x7C92, 0x701D, 0x96B8, 0x529B, 0x7483, /* 0xA0 */
     0x54E9, 0x5006, 0x806F, 0x84EE, 0x9023, 0x942E, 0x5EC9, 0x6190, /* 0xA0 */
     0x6F23, 0x7C3E, 0x6582, 0x81C9, 0x93C8, 0x6200, 0x7149, 0x7DF4, /* 0xB0 */
@@ -388,15 +388,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_C1[] =
     0x62CE, 0x73B2, 0x83F1, 0x96F6, 0x9F61, 0x9234, 0x4F36, 0x7F9A, /* 0xE0 */
     0x51CC, 0x9748, 0x9675, 0x5DBA, 0x9818, 0x53E6, 0x4EE4, 0x6E9C, /* 0xE0 */
     0x7409, 0x69B4, 0x786B, 0x993E, 0x7559, 0x5289, 0x7624, 0x6D41, /* 0xF0 */
-    0x67F3, 0x516D, 0x9F8D, 0x807E, 0x56A8, 0x7C60, 0x7ABF          /* 0xF0 */
+    0x67F3, 0x516D, 0x9F8D, 0x807E, 0x56A8, 0x7C60, 0x7ABF			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_C2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9686, 0x58DF, 0x650F, 0x96B4, 0x6A13, 0x5A41, 0x645F, /* 0xA0 */
     0x7C0D, 0x6F0F, 0x964B, 0x8606, 0x76E7, 0x9871, 0x5EEC, 0x7210, /* 0xA0 */
     0x64C4, 0x6EF7, 0x865C, 0x9B6F, 0x9E93, 0x788C, 0x9732, 0x8DEF, /* 0xB0 */
@@ -408,15 +408,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_C2[] =
     0x947C, 0x7C6E, 0x9A3E, 0x88F8, 0x843D, 0x6D1B, 0x99F1, 0x7D61, /* 0xE0 */
     0x5ABD, 0x9EBB, 0x746A, 0x78BC, 0x879E, 0x99AC, 0x99E1, 0x561B, /* 0xE0 */
     0x55CE, 0x57CB, 0x8CB7, 0x9EA5, 0x8CE3, 0x9081, 0x8109, 0x779E, /* 0xF0 */
-    0x9945, 0x883B, 0x6EFF, 0x8513, 0x66FC, 0x6162, 0x6F2B          /* 0xF0 */
+    0x9945, 0x883B, 0x6EFF, 0x8513, 0x66FC, 0x6162, 0x6F2B			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_C3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8B3E, 0x8292, 0x832B, 0x76F2, 0x6C13, 0x5FD9, 0x83BD, /* 0xA0 */
     0x732B, 0x8305, 0x9328, 0x6BDB, 0x77DB, 0x925A, 0x536F, 0x8302, /* 0xA0 */
     0x5192, 0x5E3D, 0x8C8C, 0x8CBF, 0x9EBD, 0x73AB, 0x679A, 0x6885, /* 0xB0 */
@@ -428,15 +428,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_C3[] =
     0x7DBF, 0x5195, 0x514D, 0x52C9, 0x5A29, 0x7DEC, 0x9762, 0x82D7, /* 0xE0 */
     0x63CF, 0x7784, 0x85D0, 0x79D2, 0x6E3A, 0x5EDF, 0x5999, 0x8511, /* 0xE0 */
     0x6EC5, 0x6C11, 0x62BF, 0x76BF, 0x654F, 0x61AB, 0x95A9, 0x660E, /* 0xF0 */
-    0x879F, 0x9CF4, 0x9298, 0x540D, 0x547D, 0x8B2C, 0x6478          /* 0xF0 */
+    0x879F, 0x9CF4, 0x9298, 0x540D, 0x547D, 0x8B2C, 0x6478			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_C4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6479, 0x8611, 0x6A21, 0x819C, 0x78E8, 0x6469, 0x9B54, /* 0xA0 */
     0x62B9, 0x672B, 0x83AB, 0x58A8, 0x9ED8, 0x6CAB, 0x6F20, 0x5BDE, /* 0xA0 */
     0x964C, 0x8B00, 0x725F, 0x67D0, 0x62C7, 0x7261, 0x755D, 0x59C6, /* 0xB0 */
@@ -448,15 +448,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_C4[] =
     0x6CE5, 0x5C3C, 0x64EC, 0x4F60, 0x533F, 0x81A9, 0x9006, 0x6EBA, /* 0xE0 */
     0x852B, 0x62C8, 0x5E74, 0x78BE, 0x6506, 0x637B, 0x5FF5, 0x5A18, /* 0xE0 */
     0x91C0, 0x9CE5, 0x5C3F, 0x634F, 0x8076, 0x5B7D, 0x5699, 0x9477, /* 0xF0 */
-    0x93B3, 0x6D85, 0x60A8, 0x6AB8, 0x7370, 0x51DD, 0x5BE7          /* 0xF0 */
+    0x93B3, 0x6D85, 0x60A8, 0x6AB8, 0x7370, 0x51DD, 0x5BE7			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_C5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x64F0, 0x6FD8, 0x725B, 0x626D, 0x9215, 0x7D10, 0x81BF, /* 0xA0 */
     0x6FC3, 0x8FB2, 0x5F04, 0x5974, 0x52AA, 0x6012, 0x5973, 0x6696, /* 0xA0 */
     0x8650, 0x7627, 0x632A, 0x61E6, 0x7CEF, 0x8AFE, 0x54E6, 0x6B50, /* 0xB0 */
@@ -468,15 +468,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_C5[] =
     0x57F9, 0x88F4, 0x8CE0, 0x966A, 0x914D, 0x4F69, 0x6C9B, 0x5674, /* 0xE0 */
     0x76C6, 0x7830, 0x62A8, 0x70F9, 0x6F8E, 0x5F6D, 0x84EC, 0x68DA, /* 0xE0 */
     0x787C, 0x7BF7, 0x81A8, 0x670B, 0x9D6C, 0x6367, 0x78B0, 0x576F, /* 0xF0 */
-    0x7812, 0x9739, 0x6279, 0x62AB, 0x5288, 0x7435, 0x6BD7          /* 0xF0 */
+    0x7812, 0x9739, 0x6279, 0x62AB, 0x5288, 0x7435, 0x6BD7			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_C6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5564, 0x813E, 0x75B2, 0x76AE, 0x5339, 0x75DE, 0x50FB, /* 0xA0 */
     0x5C41, 0x8B6C, 0x7BC7, 0x504F, 0x7247, 0x9A19, 0x98C4, 0x6F02, /* 0xA0 */
     0x74E2, 0x7968, 0x6487, 0x77A5, 0x62FC, 0x983B, 0x8CA7, 0x54C1, /* 0xB0 */
@@ -488,15 +488,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_C6[] =
     0x51C4, 0x6F06, 0x67D2, 0x6C8F, 0x5176, 0x68CB, 0x5947, 0x6B67, /* 0xE0 */
     0x7566, 0x5D0E, 0x81CD, 0x9F4A, 0x65D7, 0x7948, 0x7941, 0x9A0E, /* 0xE0 */
     0x8D77, 0x8C48, 0x4E5E, 0x4F01, 0x5553, 0x5951, 0x780C, 0x5668, /* 0xF0 */
-    0x6C23, 0x8FC4, 0x68C4, 0x6C7D, 0x6CE3, 0x8A16, 0x6390          /* 0xF0 */
+    0x6C23, 0x8FC4, 0x68C4, 0x6C7D, 0x6CE3, 0x8A16, 0x6390			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_C7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6070, 0x6D3D, 0x727D, 0x6266, 0x91FA, 0x925B, 0x5343, /* 0xA0 */
     0x9077, 0x7C3D, 0x4EDF, 0x8B19, 0x4E7E, 0x9ED4, 0x9322, 0x9257, /* 0xA0 */
     0x524D, 0x6F5B, 0x9063, 0x6DFA, 0x8B74, 0x5879, 0x5D4C, 0x6B20, /* 0xB0 */
@@ -508,15 +508,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_C7[] =
     0x9752, 0x8F15, 0x6C2B, 0x50BE, 0x537F, 0x6E05, 0x64CE, 0x6674, /* 0xE0 */
     0x6C30, 0x60C5, 0x9803, 0x8ACB, 0x6176, 0x74CA, 0x7AAE, 0x79CB, /* 0xE0 */
     0x4E18, 0x90B1, 0x7403, 0x6C42, 0x56DA, 0x914B, 0x6CC5, 0x8DA8, /* 0xF0 */
-    0x5340, 0x86C6, 0x66F2, 0x8EC0, 0x5C48, 0x9A45, 0x6E20          /* 0xF0 */
+    0x5340, 0x86C6, 0x66F2, 0x8EC0, 0x5C48, 0x9A45, 0x6E20			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_C8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x53D6, 0x5A36, 0x9F72, 0x8DA3, 0x53BB, 0x5708, 0x9874, /* 0xA0 */
     0x6B0A, 0x919B, 0x6CC9, 0x5168, 0x75CA, 0x62F3, 0x72AC, 0x5238, /* 0xA0 */
     0x52F8, 0x7F3A, 0x7094, 0x7638, 0x5374, 0x9D72, 0x69B7, 0x78BA, /* 0xB0 */
@@ -528,15 +528,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_C8[] =
     0x63C9, 0x67D4, 0x8089, 0x8339, 0x8815, 0x5112, 0x5B7A, 0x5982, /* 0xE0 */
     0x8FB1, 0x4E73, 0x6C5D, 0x5165, 0x8925, 0x8EDF, 0x962E, 0x854A, /* 0xE0 */
     0x745E, 0x92ED, 0x958F, 0x6F64, 0x82E5, 0x5F31, 0x6492, 0x7051, /* 0xF0 */
-    0x85A9, 0x816E, 0x9C13, 0x585E, 0x8CFD, 0x4E09, 0x53C1          /* 0xF0 */
+    0x85A9, 0x816E, 0x9C13, 0x585E, 0x8CFD, 0x4E09, 0x53C1			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_C9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5098, 0x6563, 0x6851, 0x55D3, 0x55AA, 0x6414, 0x9A37, /* 0xA0 */
     0x6383, 0x5AC2, 0x745F, 0x8272, 0x6F80, 0x68EE, 0x50E7, 0x838E, /* 0xA0 */
     0x7802, 0x6BBA, 0x5239, 0x6C99, 0x7D17, 0x50BB, 0x5565, 0x715E, /* 0xB0 */
@@ -548,15 +548,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_C9[] =
     0x820C, 0x6368, 0x8D66, 0x651D, 0x5C04, 0x61FE, 0x6D89, 0x793E, /* 0xE0 */
     0x8A2D, 0x7837, 0x7533, 0x547B, 0x4F38, 0x8EAB, 0x6DF1, 0x5A20, /* 0xE0 */
     0x7D33, 0x795E, 0x6C88, 0x5BE9, 0x5B38, 0x751A, 0x814E, 0x614E, /* 0xF0 */
-    0x6EF2, 0x8072, 0x751F, 0x7525, 0x7272, 0x5347, 0x7E69          /* 0xF0 */
+    0x6EF2, 0x8072, 0x751F, 0x7525, 0x7272, 0x5347, 0x7E69			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_CA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7701, 0x76DB, 0x5269, 0x52DD, 0x8056, 0x5E2B, 0x5931, /* 0xA0 */
     0x7345, 0x65BD, 0x6FD5, 0x8A69, 0x5C38, 0x8671, 0x5341, 0x77F3, /* 0xA0 */
     0x62FE, 0x6642, 0x4EC0, 0x98DF, 0x8755, 0x5BE6, 0x8B58, 0x53F2, /* 0xB0 */
@@ -568,15 +568,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_CA[] =
     0x6A1E, 0x68B3, 0x6B8A, 0x6292, 0x8F38, 0x53D4, 0x8212, 0x6DD1, /* 0xE0 */
     0x758F, 0x66F8, 0x8D16, 0x5B70, 0x719F, 0x85AF, 0x6691, 0x66D9, /* 0xE0 */
     0x7F72, 0x8700, 0x9ECD, 0x9F20, 0x5C6C, 0x8853, 0x8FF0, 0x6A39, /* 0xF0 */
-    0x675F, 0x620D, 0x7AEA, 0x5885, 0x5EB6, 0x6578, 0x6F31          /* 0xF0 */
+    0x675F, 0x620D, 0x7AEA, 0x5885, 0x5EB6, 0x6578, 0x6F31			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_CB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6055, 0x5237, 0x800D, 0x6454, 0x8870, 0x7529, 0x5E25, /* 0xA0 */
     0x6813, 0x62F4, 0x971C, 0x96D9, 0x723D, 0x8AB0, 0x6C34, 0x7761, /* 0xA0 */
     0x7A0E, 0x542E, 0x77AC, 0x9806, 0x821C, 0x8AAC, 0x78A9, 0x6714, /* 0xB0 */
@@ -588,15 +588,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_CB[] =
     0x8085, 0x9178, 0x849C, 0x7B97, 0x96D6, 0x968B, 0x96A8, 0x7D8F, /* 0xE0 */
     0x9AD3, 0x788E, 0x6B72, 0x7A57, 0x9042, 0x96A7, 0x795F, 0x5B6B, /* 0xE0 */
     0x640D, 0x7B0B, 0x84D1, 0x68AD, 0x5506, 0x7E2E, 0x7463, 0x7D22, /* 0xF0 */
-    0x9396, 0x6240, 0x584C, 0x4ED6, 0x5B83, 0x5979, 0x5854          /* 0xF0 */
+    0x9396, 0x6240, 0x584C, 0x4ED6, 0x5B83, 0x5979, 0x5854			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_CC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x737A, 0x64BB, 0x8E4B, 0x8E0F, 0x80CE, 0x82D4, 0x62AC, /* 0xA0 */
     0x81FA, 0x6CF0, 0x915E, 0x592A, 0x614B, 0x6C70, 0x574D, 0x6524, /* 0xA0 */
     0x8CAA, 0x7671, 0x7058, 0x58C7, 0x6A80, 0x75F0, 0x6F6D, 0x8B5A, /* 0xB0 */
@@ -608,15 +608,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_CC[] =
     0x92BB, 0x63D0, 0x984C, 0x8E44, 0x557C, 0x9AD4, 0x66FF, 0x568F, /* 0xE0 */
     0x60D5, 0x6D95, 0x5243, 0x5C49, 0x5929, 0x6DFB, 0x586B, 0x7530, /* 0xE0 */
     0x751C, 0x606C, 0x8214, 0x8146, 0x6311, 0x689D, 0x8FE2, 0x773A, /* 0xF0 */
-    0x8DF3, 0x8CBC, 0x9435, 0x5E16, 0x5EF3, 0x807D, 0x70F4          /* 0xF0 */
+    0x8DF3, 0x8CBC, 0x9435, 0x5E16, 0x5EF3, 0x807D, 0x70F4			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_CD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6C40, 0x5EF7, 0x505C, 0x4EAD, 0x5EAD, 0x633A, 0x8247, /* 0xA0 */
     0x901A, 0x6850, 0x916E, 0x77B3, 0x540C, 0x9285, 0x5F64, 0x7AE5, /* 0xA0 */
     0x6876, 0x6345, 0x7B52, 0x7D71, 0x75DB, 0x5077, 0x6295, 0x982D, /* 0xB0 */
@@ -628,15 +628,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_CD[] =
     0x896A, 0x6B6A, 0x5916, 0x8C4C, 0x5F4E, 0x7063, 0x73A9, 0x9811, /* 0xE0 */
     0x4E38, 0x70F7, 0x5B8C, 0x7897, 0x633D, 0x665A, 0x7696, 0x60CB, /* 0xE0 */
     0x5B9B, 0x5A49, 0x842C, 0x8155, 0x6C6A, 0x738B, 0x4EA1, 0x6789, /* 0xF0 */
-    0x7DB2, 0x5F80, 0x65FA, 0x671B, 0x5FD8, 0x5984, 0x5A01          /* 0xF0 */
+    0x7DB2, 0x5F80, 0x65FA, 0x671B, 0x5FD8, 0x5984, 0x5A01			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_CE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5DCD, 0x5FAE, 0x5371, 0x97CB, 0x9055, 0x6845, 0x570D, /* 0xA0 */
     0x552F, 0x60DF, 0x7232, 0x6FF0, 0x7DAD, 0x8466, 0x840E, 0x59D4, /* 0xA0 */
     0x5049, 0x50DE, 0x5C3E, 0x7DEF, 0x672A, 0x851A, 0x5473, 0x754F, /* 0xB0 */
@@ -648,15 +648,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_CE[] =
     0x68A7, 0x543E, 0x5434, 0x6BCB, 0x6B66, 0x4E94, 0x6342, 0x5348, /* 0xE0 */
     0x821E, 0x4F0D, 0x4FAE, 0x5862, 0x620A, 0x9727, 0x6664, 0x7269, /* 0xE0 */
     0x52FF, 0x52D9, 0x609F, 0x8AA4, 0x6614, 0x7199, 0x6790, 0x897F, /* 0xF0 */
-    0x7852, 0x77FD, 0x6670, 0x563B, 0x5438, 0x932B, 0x72A7          /* 0xF0 */
+    0x7852, 0x77FD, 0x6670, 0x563B, 0x5438, 0x932B, 0x72A7			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_CF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7A00, 0x606F, 0x5E0C, 0x6089, 0x819D, 0x5915, 0x60DC, /* 0xA0 */
     0x7184, 0x70EF, 0x6EAA, 0x6C50, 0x7280, 0x6A84, 0x8972, 0x5E2D, /* 0xA0 */
     0x7FD2, 0x5AB3, 0x559C, 0x9291, 0x6D17, 0x7CFB, 0x9699, 0x6232, /* 0xB0 */
@@ -668,15 +668,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_CF[] =
     0x76F8, 0x53A2, 0x9472, 0x9999, 0x7BB1, 0x8944, 0x6E58, 0x9109, /* 0xE0 */
     0x7FD4, 0x7965, 0x8A73, 0x60F3, 0x97FF, 0x4EAB, 0x9805, 0x5DF7, /* 0xE0 */
     0x6A61, 0x50CF, 0x5411, 0x8C61, 0x856D, 0x785D, 0x9704, 0x524A, /* 0xF0 */
-    0x54EE, 0x56C2, 0x92B7, 0x6D88, 0x5BB5, 0x6DC6, 0x66C9          /* 0xF0 */
+    0x54EE, 0x56C2, 0x92B7, 0x6D88, 0x5BB5, 0x6DC6, 0x66C9			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_D0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5C0F, 0x5B5D, 0x6821, 0x8096, 0x562F, 0x7B11, 0x6548, /* 0xA0 */
     0x6954, 0x4E9B, 0x6B47, 0x874E, 0x978B, 0x5354, 0x633E, 0x643A, /* 0xA0 */
     0x90AA, 0x659C, 0x8105, 0x8AE7, 0x5BEB, 0x68B0, 0x5378, 0x87F9, /* 0xB0 */
@@ -688,15 +688,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_D0[] =
     0x673D, 0x55C5, 0x92B9, 0x79C0, 0x8896, 0x7D89, 0x589F, 0x620C, /* 0xE0 */
     0x9700, 0x865A, 0x5618, 0x9808, 0x5F90, 0x8A31, 0x84C4, 0x9157, /* 0xE0 */
     0x53D9, 0x65ED, 0x5E8F, 0x755C, 0x6064, 0x7D6E, 0x5A7F, 0x7DD2, /* 0xF0 */
-    0x7E8C, 0x8ED2, 0x55A7, 0x5BA3, 0x61F8, 0x65CB, 0x7384          /* 0xF0 */
+    0x7E8C, 0x8ED2, 0x55A7, 0x5BA3, 0x61F8, 0x65CB, 0x7384			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_D1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9078, 0x766C, 0x7729, 0x7D62, 0x9774, 0x859B, 0x5B78, /* 0xA0 */
     0x7A74, 0x96EA, 0x8840, 0x52DB, 0x718F, 0x5FAA, 0x65EC, 0x8A62, /* 0xA0 */
     0x5C0B, 0x99B4, 0x5DE1, 0x6B89, 0x6C5B, 0x8A13, 0x8A0A, 0x905C, /* 0xB0 */
@@ -708,15 +708,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_D1[] =
     0x71D5, 0x53AD, 0x786F, 0x96C1, 0x5501, 0x5F66, 0x7130, 0x5BB4, /* 0xE0 */
     0x8AFA, 0x9A57, 0x6B83, 0x592E, 0x9D26, 0x79E7, 0x694A, 0x63DA, /* 0xE0 */
     0x4F6F, 0x760D, 0x7F8A, 0x6D0B, 0x967D, 0x6C27, 0x4EF0, 0x7662, /* 0xF0 */
-    0x990A, 0x6A23, 0x6F3E, 0x9080, 0x8170, 0x5996, 0x7476          /* 0xF0 */
+    0x990A, 0x6A23, 0x6F3E, 0x9080, 0x8170, 0x5996, 0x7476			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_D2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6447, 0x582F, 0x9065, 0x7A91, 0x8B21, 0x59DA, 0x54AC, /* 0xA0 */
     0x8200, 0x85E5, 0x8981, 0x8000, 0x6930, 0x564E, 0x8036, 0x723A, /* 0xA0 */
     0x91CE, 0x51B6, 0x4E5F, 0x9801, 0x6396, 0x696D, 0x8449, 0x66F3, /* 0xB0 */
@@ -728,15 +728,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_D2[] =
     0x4EA6, 0x88D4, 0x610F, 0x6BC5, 0x61B6, 0x7FA9, 0x76CA, 0x6EA2, /* 0xE0 */
     0x8A63, 0x8B70, 0x8ABC, 0x8B6F, 0x5F02, 0x7FFC, 0x7FCC, 0x7E79, /* 0xE0 */
     0x8335, 0x852D, 0x56E0, 0x6BB7, 0x97F3, 0x9670, 0x59FB, 0x541F, /* 0xF0 */
-    0x9280, 0x6DEB, 0x5BC5, 0x98F2, 0x5C39, 0x5F15, 0x96B1          /* 0xF0 */
+    0x9280, 0x6DEB, 0x5BC5, 0x98F2, 0x5C39, 0x5F15, 0x96B1			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_D3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5370, 0x82F1, 0x6AFB, 0x5B30, 0x9DF9, 0x61C9, 0x7E93, /* 0xA0 */
     0x7469, 0x87A2, 0x71DF, 0x7192, 0x8805, 0x8FCE, 0x8D0F, 0x76C8, /* 0xA0 */
     0x5F71, 0x7A4E, 0x786C, 0x6620, 0x55B2, 0x64C1, 0x50AD, 0x81C3, /* 0xB0 */
@@ -748,15 +748,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_D3[] =
     0x9918, 0x4FDE, 0x903E, 0x9B5A, 0x6109, 0x6E1D, 0x6F01, 0x9685, /* 0xE0 */
     0x4E88, 0x5A31, 0x96E8, 0x8207, 0x5DBC, 0x79B9, 0x5B87, 0x8A9E, /* 0xE0 */
     0x7FBD, 0x7389, 0x57DF, 0x828B, 0x9B31, 0x5401, 0x9047, 0x55BB, /* 0xF0 */
-    0x5CEA, 0x5FA1, 0x6108, 0x6B32, 0x7344, 0x80B2, 0x8B7D          /* 0xF0 */
+    0x5CEA, 0x5FA1, 0x6108, 0x6B32, 0x7344, 0x80B2, 0x8B7D			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_D4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6D74, 0x5BD3, 0x88D5, 0x9810, 0x8C6B, 0x99AD, 0x9D1B, /* 0xA0 */
     0x6DF5, 0x51A4, 0x5143, 0x57A3, 0x8881, 0x539F, 0x63F4, 0x8F45, /* 0xA0 */
     0x5712, 0x54E1, 0x5713, 0x733F, 0x6E90, 0x7DE3, 0x9060, 0x82D1, /* 0xB0 */
@@ -768,15 +768,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_D4[] =
     0x81DF, 0x846C, 0x906D, 0x7CDF, 0x947F, 0x85FB, 0x68D7, 0x65E9, /* 0xE0 */
     0x6FA1, 0x86A4, 0x8E81, 0x566A, 0x9020, 0x7682, 0x7AC8, 0x71E5, /* 0xE0 */
     0x8CAC, 0x64C7, 0x5247, 0x6FA4, 0x8CCA, 0x600E, 0x589E, 0x618E, /* 0xF0 */
-    0x66FE, 0x8D08, 0x624E, 0x55B3, 0x6E23, 0x672D, 0x8ECB          /* 0xF0 */
+    0x66FE, 0x8D08, 0x624E, 0x55B3, 0x6E23, 0x672D, 0x8ECB			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_D5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9358, 0x9598, 0x7728, 0x6805, 0x69A8, 0x548B, 0x4E4D, /* 0xA0 */
     0x70B8, 0x8A50, 0x6458, 0x9F4B, 0x5B85, 0x7A84, 0x50B5, 0x5BE8, /* 0xA0 */
     0x77BB, 0x6C08, 0x8A79, 0x7C98, 0x6CBE, 0x76DE, 0x65AC, 0x8F3E, /* 0xB0 */
@@ -788,15 +788,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_D5[] =
     0x937A, 0x8517, 0x9019, 0x6D59, 0x73CD, 0x659F, 0x771F, 0x7504, /* 0xE0 */
     0x7827, 0x81FB, 0x8C9E, 0x91DD, 0x5075, 0x6795, 0x75B9, 0x8A3A, /* 0xE0 */
     0x9707, 0x632F, 0x93AE, 0x9663, 0x84B8, 0x6399, 0x775C, 0x5F81, /* 0xF0 */
-    0x7319, 0x722D, 0x6014, 0x6574, 0x62EF, 0x6B63, 0x653F          /* 0xF0 */
+    0x7319, 0x722D, 0x6014, 0x6574, 0x62EF, 0x6B63, 0x653F			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_D6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5E40, 0x7665, 0x912D, 0x8B49, 0x829D, 0x679D, 0x652F, /* 0xA0 */
     0x5431, 0x8718, 0x77E5, 0x80A2, 0x8102, 0x6C41, 0x4E4B, 0x7E54, /* 0xA0 */
     0x8077, 0x76F4, 0x690D, 0x6B96, 0x57F7, 0x503C, 0x4F84, 0x5740, /* 0xB0 */
@@ -808,15 +808,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_D6[] =
     0x7CA5, 0x8EF8, 0x8098, 0x5E1A, 0x5492, 0x76BA, 0x5B99, 0x665D, /* 0xE0 */
     0x9A5F, 0x73E0, 0x682A, 0x86DB, 0x6731, 0x732A, 0x8AF8, 0x8A85, /* 0xE0 */
     0x9010, 0x7AF9, 0x71ED, 0x716E, 0x62C4, 0x77DA, 0x56D1, 0x4E3B, /* 0xF0 */
-    0x8457, 0x67F1, 0x52A9, 0x86C0, 0x8CAF, 0x9444, 0x7BC9          /* 0xF0 */
+    0x8457, 0x67F1, 0x52A9, 0x86C0, 0x8CAF, 0x9444, 0x7BC9			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_D7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x4F4F, 0x6CE8, 0x795D, 0x99D0, 0x6293, 0x722A, 0x62FD, /* 0xA0 */
     0x5C08, 0x78DA, 0x8F49, 0x64B0, 0x8CFA, 0x7BC6, 0x6A01, 0x838A, /* 0xA0 */
     0x88DD, 0x599D, 0x649E, 0x58EF, 0x72C0, 0x690E, 0x9310, 0x8FFD, /* 0xB0 */
@@ -828,15 +828,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_D7[] =
     0x594F, 0x63CD, 0x79DF, 0x8DB3, 0x5352, 0x65CF, 0x7956, 0x8A5B, /* 0xE0 */
     0x963B, 0x7D44, 0x947D, 0x7E82, 0x5634, 0x9189, 0x6700, 0x7F6A, /* 0xE0 */
     0x5C0A, 0x9075, 0x6628, 0x5DE6, 0x4F50, 0x67DE, 0x505A, 0x4F5C, /* 0xF0 */
-    0x5750, 0x5EA7                                                  /* 0xF0 */
+    0x5750, 0x5EA7													/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_D8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x4E8D, 0x4E0C, 0x5140, 0x4E10, 0x5EFF, 0x5345, 0x4E15, /* 0xA0 */
     0x4E98, 0x4E1E, 0x9B32, 0x5B6C, 0x5669, 0x4E28, 0x79BA, 0x4E3F, /* 0xA0 */
     0x5315, 0x4E47, 0x592D, 0x723B, 0x536E, 0x6C10, 0x56DF, 0x80E4, /* 0xB0 */
@@ -848,15 +848,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_D8[] =
     0x525C, 0x84AF, 0x527D, 0x5282, 0x5281, 0x5290, 0x5293, 0x5182, /* 0xE0 */
     0x7F54, 0x4EBB, 0x4EC3, 0x4EC9, 0x4EC2, 0x4EE8, 0x4EE1, 0x4EEB, /* 0xE0 */
     0x4EDE, 0x50B4, 0x4EF3, 0x4F22, 0x4F64, 0x4EF5, 0x5000, 0x5096, /* 0xF0 */
-    0x4F09, 0x4F47, 0x4F5E, 0x4F67, 0x6538, 0x4F5A, 0x4F5D          /* 0xF0 */
+    0x4F09, 0x4F47, 0x4F5E, 0x4F67, 0x6538, 0x4F5A, 0x4F5D			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_D9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x4F5F, 0x4F57, 0x4F32, 0x4F3D, 0x4F76, 0x4F74, 0x4F91, /* 0xA0 */
     0x4F89, 0x4F83, 0x4F8F, 0x4F7E, 0x4F7B, 0x5115, 0x4F7C, 0x5102, /* 0xA0 */
     0x4F94, 0x5114, 0x513C, 0x5137, 0x4FC5, 0x4FDA, 0x4FE3, 0x4FDC, /* 0xB0 */
@@ -868,15 +868,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_D9[] =
     0x6C46, 0x7CF4, 0x516E, 0x5DFD, 0x9ECC, 0x9998, 0x56C5, 0x5914, /* 0xE0 */
     0x52F9, 0x530D, 0x8A07, 0x5310, 0x9CEC, 0x5919, 0x5155, 0x4EA0, /* 0xE0 */
     0x5156, 0x4EB3, 0x886E, 0x88A4, 0x893B, 0x81E0, 0x88D2, 0x7980, /* 0xF0 */
-    0x5B34, 0x8803, 0x7FB8, 0x51AB, 0x51B1, 0x51BD, 0x51BC          /* 0xF0 */
+    0x5B34, 0x8803, 0x7FB8, 0x51AB, 0x51B1, 0x51BD, 0x51BC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_DA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x51C7, 0x5196, 0x51A2, 0x51A5, 0x8A01, 0x8A10, 0x8A0C, /* 0xA0 */
     0x8A15, 0x8B33, 0x8A4E, 0x8A25, 0x8A41, 0x8A36, 0x8A46, 0x8A54, /* 0xA0 */
     0x8A58, 0x8A52, 0x8A86, 0x8A84, 0x8A7F, 0x8A70, 0x8A7C, 0x8A75, /* 0xB0 */
@@ -888,15 +888,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_DA[] =
     0x5369, 0x537A, 0x961D, 0x9622, 0x9621, 0x9631, 0x962A, 0x963D, /* 0xE0 */
     0x963C, 0x9642, 0x9658, 0x9654, 0x965F, 0x9689, 0x966C, 0x9672, /* 0xE0 */
     0x9674, 0x9688, 0x968D, 0x9697, 0x96B0, 0x9097, 0x909B, 0x913A, /* 0xF0 */
-    0x9099, 0x9114, 0x90A1, 0x90B4, 0x90B3, 0x90B6, 0x9134          /* 0xF0 */
+    0x9099, 0x9114, 0x90A1, 0x90B4, 0x90B3, 0x90B6, 0x9134			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_DB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x90B8, 0x90B0, 0x90DF, 0x90C5, 0x90BE, 0x9136, 0x90C4, /* 0xA0 */
     0x90C7, 0x9106, 0x9148, 0x90E2, 0x90DC, 0x90D7, 0x90DB, 0x90EB, /* 0xA0 */
     0x90EF, 0x90FE, 0x9104, 0x9122, 0x911E, 0x9123, 0x9131, 0x912F, /* 0xB0 */
@@ -908,15 +908,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_DB[] =
     0x5742, 0x5769, 0x58E0, 0x576B, 0x58DA, 0x577C, 0x577B, 0x5768, /* 0xE0 */
     0x576D, 0x5776, 0x5773, 0x57E1, 0x57A4, 0x578C, 0x584F, 0x57CF, /* 0xE0 */
     0x57A7, 0x5816, 0x5793, 0x57A0, 0x57D5, 0x5852, 0x581D, 0x5864, /* 0xF0 */
-    0x57D2, 0x57B8, 0x57F4, 0x57EF, 0x57F8, 0x57E4, 0x57DD          /* 0xF0 */
+    0x57D2, 0x57B8, 0x57F4, 0x57EF, 0x57F8, 0x57E4, 0x57DD			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_DC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x580B, 0x580D, 0x57FD, 0x57ED, 0x5800, 0x581E, 0x5819, /* 0xA0 */
     0x5844, 0x5820, 0x5865, 0x586C, 0x5881, 0x5889, 0x589A, 0x5880, /* 0xA0 */
     0x99A8, 0x9F19, 0x61FF, 0x8279, 0x827D, 0x827F, 0x828F, 0x828A, /* 0xB0 */
@@ -928,15 +928,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_DC[] =
     0x8526, 0x831A, 0x8306, 0x584B, 0x7162, 0x82E0, 0x82D5, 0x831C, /* 0xE0 */
     0x8351, 0x8558, 0x84FD, 0x8308, 0x8392, 0x833C, 0x8334, 0x8331, /* 0xE0 */
     0x839B, 0x854E, 0x832F, 0x834F, 0x8347, 0x8343, 0x8588, 0x8340, /* 0xF0 */
-    0x8317, 0x85BA, 0x832D, 0x833A, 0x8333, 0x7296, 0x6ECE          /* 0xF0 */
+    0x8317, 0x85BA, 0x832D, 0x833A, 0x8333, 0x7296, 0x6ECE			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_DD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8541, 0x831B, 0x85CE, 0x8552, 0x84C0, 0x8452, 0x8464, /* 0xA0 */
     0x83B0, 0x8378, 0x8494, 0x8435, 0x83A0, 0x83AA, 0x8393, 0x839C, /* 0xA0 */
     0x8385, 0x837C, 0x859F, 0x83A9, 0x837D, 0x8555, 0x837B, 0x8398, /* 0xB0 */
@@ -948,15 +948,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_DD[] =
     0x843C, 0x8446, 0x8469, 0x8476, 0x851E, 0x848E, 0x8431, 0x846D, /* 0xE0 */
     0x84C1, 0x84CD, 0x84D0, 0x9A40, 0x84BD, 0x84D3, 0x84CA, 0x84BF, /* 0xE0 */
     0x84BA, 0x863A, 0x84A1, 0x84B9, 0x84B4, 0x8497, 0x93A3, 0x8577, /* 0xF0 */
-    0x850C, 0x750D, 0x8538, 0x84F0, 0x861E, 0x851F, 0x85FA          /* 0xF0 */
+    0x850C, 0x750D, 0x8538, 0x84F0, 0x861E, 0x851F, 0x85FA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_DE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8556, 0x853B, 0x84FF, 0x84FC, 0x8559, 0x8548, 0x8568, /* 0xA0 */
     0x8564, 0x855E, 0x857A, 0x77A2, 0x8543, 0x8604, 0x857B, 0x85A4, /* 0xA0 */
     0x85A8, 0x8587, 0x858F, 0x8579, 0x85EA, 0x859C, 0x8585, 0x85B9, /* 0xB0 */
@@ -968,15 +968,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_DE[] =
     0x637A, 0x638E, 0x6451, 0x636D, 0x63AC, 0x638A, 0x6369, 0x63AE, /* 0xE0 */
     0x645C, 0x63F2, 0x63F8, 0x63E0, 0x64B3, 0x63C4, 0x63DE, 0x63CE, /* 0xE0 */
     0x6452, 0x63C6, 0x63BE, 0x6504, 0x6441, 0x640B, 0x641B, 0x6420, /* 0xF0 */
-    0x640C, 0x6426, 0x6421, 0x645E, 0x6516, 0x646D, 0x6496          /* 0xF0 */
+    0x640C, 0x6426, 0x6421, 0x645E, 0x6516, 0x646D, 0x6496			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_DF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x647A, 0x64F7, 0x64FC, 0x6499, 0x651B, 0x64C0, 0x64D0, /* 0xA0 */
     0x64D7, 0x64E4, 0x64E2, 0x6509, 0x6525, 0x652E, 0x5F0B, 0x5FD2, /* 0xA0 */
     0x7519, 0x5F11, 0x535F, 0x53F1, 0x5630, 0x53E9, 0x53E8, 0x53FB, /* 0xB0 */
@@ -988,15 +988,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_DF[] =
     0x5672, 0x54DA, 0x568C, 0x54A9, 0x54AA, 0x54A4, 0x5665, 0x54CF, /* 0xE0 */
     0x54DE, 0x561C, 0x54E7, 0x562E, 0x54FD, 0x5514, 0x54F3, 0x55E9, /* 0xE0 */
     0x5523, 0x550F, 0x5511, 0x5527, 0x552A, 0x5616, 0x558F, 0x55B5, /* 0xF0 */
-    0x5549, 0x56C0, 0x5541, 0x5555, 0x553F, 0x5550, 0x553C          /* 0xF0 */
+    0x5549, 0x56C0, 0x5541, 0x5555, 0x553F, 0x5550, 0x553C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_E0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5537, 0x5556, 0x5575, 0x5576, 0x5577, 0x5533, 0x5530, /* 0xA0 */
     0x555C, 0x558B, 0x55D2, 0x5583, 0x55B1, 0x55B9, 0x5588, 0x5581, /* 0xA0 */
     0x559F, 0x557E, 0x55D6, 0x5591, 0x557B, 0x55DF, 0x560D, 0x56B3, /* 0xB0 */
@@ -1008,15 +1008,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_E0[] =
     0x5695, 0x564C, 0x5654, 0x5686, 0x5664, 0x5671, 0x566B, 0x567B, /* 0xE0 */
     0x567C, 0x5685, 0x5693, 0x56AF, 0x56D4, 0x56D7, 0x56DD, 0x56E1, /* 0xE0 */
     0x5707, 0x56EB, 0x56F9, 0x56FF, 0x5704, 0x570A, 0x5709, 0x571C, /* 0xF0 */
-    0x5E43, 0x5E19, 0x5E14, 0x5E11, 0x5E6C, 0x5E58, 0x5E57          /* 0xF0 */
+    0x5E43, 0x5E19, 0x5E14, 0x5E11, 0x5E6C, 0x5E58, 0x5E57			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_E1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5E37, 0x5E44, 0x5E54, 0x5E5B, 0x5E5E, 0x5E61, 0x5C8C, /* 0xA0 */
     0x5C7A, 0x5C8D, 0x5C90, 0x5D87, 0x5C88, 0x5CF4, 0x5C99, 0x5C91, /* 0xA0 */
     0x5D50, 0x5C9C, 0x5CB5, 0x5CA2, 0x5D2C, 0x5CAC, 0x5CAB, 0x5CB1, /* 0xB0 */
@@ -1028,15 +1028,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_E1[] =
     0x5F89, 0x540E, 0x5FA0, 0x5F99, 0x5F9C, 0x5FA8, 0x5FAD, 0x5FB5, /* 0xE0 */
     0x5FBC, 0x8862, 0x5F61, 0x72AD, 0x72B0, 0x72B4, 0x7377, 0x7341, /* 0xE0 */
     0x72C3, 0x72C1, 0x72CE, 0x72CD, 0x72D2, 0x72E8, 0x736A, 0x72E9, /* 0xF0 */
-    0x733B, 0x72F4, 0x72F7, 0x7301, 0x72F3, 0x736B, 0x72FA          /* 0xF0 */
+    0x733B, 0x72F4, 0x72F7, 0x7301, 0x72F3, 0x736B, 0x72FA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_E2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x72FB, 0x7317, 0x7313, 0x7380, 0x730A, 0x731E, 0x731D, /* 0xA0 */
     0x737C, 0x7322, 0x7339, 0x7325, 0x732C, 0x7338, 0x7331, 0x7350, /* 0xA0 */
     0x734D, 0x7357, 0x7360, 0x736C, 0x736F, 0x737E, 0x821B, 0x5925, /* 0xB0 */
@@ -1048,15 +1048,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_E2[] =
     0x5FC4, 0x5FC9, 0x5FD6, 0x61FA, 0x61AE, 0x5FEE, 0x616A, 0x5FE1, /* 0xE0 */
     0x5FE4, 0x613E, 0x60B5, 0x6134, 0x5FEA, 0x5FED, 0x5FF8, 0x6019, /* 0xE0 */
     0x6035, 0x6026, 0x601B, 0x600F, 0x600D, 0x6029, 0x602B, 0x600A, /* 0xF0 */
-    0x61CC, 0x6021, 0x615F, 0x61E8, 0x60FB, 0x6137, 0x6042          /* 0xF0 */
+    0x61CC, 0x6021, 0x615F, 0x61E8, 0x60FB, 0x6137, 0x6042			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_E3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x606A, 0x60F2, 0x6096, 0x609A, 0x6173, 0x609D, 0x6083, /* 0xA0 */
     0x6092, 0x608C, 0x609B, 0x611C, 0x60BB, 0x60B1, 0x60DD, 0x60D8, /* 0xA0 */
     0x60C6, 0x60DA, 0x60B4, 0x6120, 0x6192, 0x6115, 0x6123, 0x60F4, /* 0xB0 */
@@ -1068,15 +1068,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_E3[] =
     0x6C54, 0x6C5C, 0x6C4A, 0x7043, 0x6C85, 0x6C90, 0x6C94, 0x6C8C, /* 0xE0 */
     0x6C68, 0x6C69, 0x6C74, 0x6C76, 0x6C86, 0x6F59, 0x6CD0, 0x6CD4, /* 0xE0 */
     0x6CAD, 0x7027, 0x7018, 0x6CF1, 0x6CD7, 0x6CB2, 0x6CE0, 0x6CD6, /* 0xF0 */
-    0x6FFC, 0x6CEB, 0x6CEE, 0x6CB1, 0x6CD3, 0x6CEF, 0x6D87          /* 0xF0 */
+    0x6FFC, 0x6CEB, 0x6CEE, 0x6CB1, 0x6CD3, 0x6CEF, 0x6D87			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_E4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6D39, 0x6D27, 0x6D0C, 0x6D79, 0x6E5E, 0x6D07, 0x6D04, /* 0xA0 */
     0x6D19, 0x6D0E, 0x6D2B, 0x6FAE, 0x6D2E, 0x6D35, 0x6D1A, 0x700F, /* 0xA0 */
     0x6EF8, 0x6F6F, 0x6D33, 0x6D91, 0x6D6F, 0x6DF6, 0x6F7F, 0x6D5E, /* 0xB0 */
@@ -1088,15 +1088,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_E4[] =
     0x6EA7, 0x6EBD, 0x6EBB, 0x6EB7, 0x6F77, 0x6EB4, 0x6ECF, 0x6E8F, /* 0xE0 */
     0x6EC2, 0x6E9F, 0x6F62, 0x7020, 0x701F, 0x6F24, 0x6F15, 0x6EF9, /* 0xE0 */
     0x6F2F, 0x6F36, 0x7032, 0x6F74, 0x6F2A, 0x6F09, 0x6F29, 0x6F89, /* 0xF0 */
-    0x6F8D, 0x6F8C, 0x6F78, 0x6F72, 0x6F7C, 0x6F7A, 0x7028          /* 0xF0 */
+    0x6F8D, 0x6F8C, 0x6F78, 0x6F72, 0x6F7C, 0x6F7A, 0x7028			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_E5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6FC9, 0x6FA7, 0x6FB9, 0x6FB6, 0x6FC2, 0x6FE1, 0x6FEE, /* 0xA0 */
     0x6FDE, 0x6FE0, 0x6FEF, 0x701A, 0x7023, 0x701B, 0x7039, 0x7035, /* 0xA0 */
     0x705D, 0x705E, 0x5B80, 0x5B84, 0x5B95, 0x5B93, 0x5BA5, 0x5BB8, /* 0xB0 */
@@ -1108,15 +1108,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_E5[] =
     0x9074, 0x907D, 0x9082, 0x9088, 0x9083, 0x908B, 0x5F50, 0x5F57, /* 0xE0 */
     0x5F56, 0x5F58, 0x5C3B, 0x54AB, 0x5C50, 0x5C59, 0x5B71, 0x5C63, /* 0xE0 */
     0x5C68, 0x7FBC, 0x5F33, 0x5F29, 0x5F2D, 0x8274, 0x5F3C, 0x9B3B, /* 0xF0 */
-    0x5C6E, 0x5981, 0x5983, 0x598D, 0x5AF5, 0x5AD7, 0x59A3          /* 0xF0 */
+    0x5C6E, 0x5981, 0x5983, 0x598D, 0x5AF5, 0x5AD7, 0x59A3			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_E6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x5997, 0x59CA, 0x5B00, 0x599E, 0x59A4, 0x59D2, 0x59B2, /* 0xA0 */
     0x59AF, 0x59D7, 0x59BE, 0x5A6D, 0x5B08, 0x59DD, 0x5B4C, 0x59E3, /* 0xA0 */
     0x59D8, 0x59F9, 0x5A0C, 0x5A09, 0x5AA7, 0x5AFB, 0x5A11, 0x5A23, /* 0xB0 */
@@ -1128,15 +1128,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_E6[] =
     0x99D4, 0x99DF, 0x99D9, 0x9A36, 0x9A5B, 0x99D1, 0x99D8, 0x9A4D, /* 0xE0 */
     0x9A4A, 0x99E2, 0x9A6A, 0x9A0F, 0x9A0D, 0x9A05, 0x9A42, 0x9A2D, /* 0xE0 */
     0x9A16, 0x9A41, 0x9A2E, 0x9A38, 0x9A43, 0x9A44, 0x9A4F, 0x9A65, /* 0xF0 */
-    0x9A64, 0x7CF9, 0x7D06, 0x7D02, 0x7D07, 0x7D08, 0x7E8A          /* 0xF0 */
+    0x9A64, 0x7CF9, 0x7D06, 0x7D02, 0x7D07, 0x7D08, 0x7E8A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_E7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7D1C, 0x7D15, 0x7D13, 0x7D3A, 0x7D32, 0x7D31, 0x7E10, /* 0xA0 */
     0x7D3C, 0x7D40, 0x7D3F, 0x7D5D, 0x7D4E, 0x7D73, 0x7D86, 0x7D83, /* 0xA0 */
     0x7D88, 0x7DBE, 0x7DBA, 0x7DCB, 0x7DD4, 0x7DC4, 0x7D9E, 0x7DAC, /* 0xB0 */
@@ -1148,15 +1148,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_E7[] =
     0x738E, 0x74A3, 0x744B, 0x73A2, 0x739F, 0x73CF, 0x73C2, 0x74CF, /* 0xE0 */
     0x73B7, 0x73B3, 0x73C0, 0x73C9, 0x73C8, 0x73E5, 0x73D9, 0x980A, /* 0xE0 */
     0x740A, 0x73E9, 0x73E7, 0x73DE, 0x74BD, 0x743F, 0x7489, 0x742A, /* 0xF0 */
-    0x745B, 0x7426, 0x7425, 0x7428, 0x7430, 0x742E, 0x742C          /* 0xF0 */
+    0x745B, 0x7426, 0x7425, 0x7428, 0x7430, 0x742E, 0x742C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_E8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x741B, 0x741A, 0x7441, 0x745C, 0x7457, 0x7455, 0x7459, /* 0xA0 */
     0x74A6, 0x746D, 0x747E, 0x749C, 0x74D4, 0x7480, 0x7481, 0x7487, /* 0xA0 */
     0x748B, 0x749E, 0x74A8, 0x74A9, 0x7490, 0x74A7, 0x74DA, 0x74BA, /* 0xB0 */
@@ -1168,15 +1168,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_E8[] =
     0x6832, 0x6833, 0x690F, 0x6A48, 0x684E, 0x6968, 0x6844, 0x69BF, /* 0xE0 */
     0x6883, 0x681D, 0x6855, 0x6A3A, 0x6841, 0x6A9C, 0x6840, 0x6B12, /* 0xE0 */
     0x684A, 0x6849, 0x6829, 0x68B5, 0x688F, 0x6874, 0x6877, 0x6893, /* 0xF0 */
-    0x686B, 0x6B1E, 0x696E, 0x68FC, 0x6ADD, 0x69E7, 0x68F9          /* 0xF0 */
+    0x686B, 0x6B1E, 0x696E, 0x68FC, 0x6ADD, 0x69E7, 0x68F9			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_E9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x6B0F, 0x68F0, 0x690B, 0x6901, 0x6957, 0x68E3, 0x6910, /* 0xA0 */
     0x6971, 0x6939, 0x6960, 0x6942, 0x695D, 0x6B16, 0x696B, 0x6980, /* 0xA0 */
     0x6998, 0x6978, 0x6934, 0x69CC, 0x6AEC, 0x6ADA, 0x69CE, 0x6AF8, /* 0xB0 */
@@ -1188,15 +1188,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_E9[] =
     0x7337, 0x7352, 0x6B81, 0x6B82, 0x6BA4, 0x6B84, 0x6B9E, 0x6BAE, /* 0xE0 */
     0x6B8D, 0x6BAB, 0x6B9B, 0x6BAF, 0x6BAA, 0x8ED4, 0x8EDB, 0x8EF2, /* 0xE0 */
     0x8EFB, 0x8F64, 0x8EF9, 0x8EFC, 0x8EEB, 0x8EE4, 0x8F62, 0x8EFA, /* 0xF0 */
-    0x8EFE, 0x8F0A, 0x8F07, 0x8F05, 0x8F12, 0x8F26, 0x8F1E          /* 0xF0 */
+    0x8EFE, 0x8F0A, 0x8F07, 0x8F05, 0x8F12, 0x8F26, 0x8F1E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_EA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x8F1F, 0x8F1C, 0x8F33, 0x8F46, 0x8F54, 0x8ECE, 0x6214, /* 0xA0 */
     0x6227, 0x621B, 0x621F, 0x6222, 0x6221, 0x6225, 0x6224, 0x6229, /* 0xA0 */
     0x81E7, 0x750C, 0x74F4, 0x74FF, 0x750F, 0x7511, 0x7513, 0x6534, /* 0xB0 */
@@ -1208,15 +1208,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_EA[] =
     0x8CC5, 0x8D10, 0x8CD1, 0x8CDA, 0x8CD5, 0x8CEB, 0x8CE7, 0x8CFB, /* 0xE0 */
     0x8998, 0x89AC, 0x89A1, 0x89BF, 0x89A6, 0x89AF, 0x89B2, 0x89B7, /* 0xE0 */
     0x726E, 0x729F, 0x725D, 0x7266, 0x726F, 0x727E, 0x727F, 0x7284, /* 0xF0 */
-    0x728B, 0x728D, 0x728F, 0x7292, 0x6308, 0x6332, 0x63B0          /* 0xF0 */
+    0x728B, 0x728D, 0x728F, 0x7292, 0x6308, 0x6332, 0x63B0			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_EB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x643F, 0x64D8, 0x8004, 0x6BEA, 0x6BF3, 0x6BFD, 0x6BFF, /* 0xA0 */
     0x6BF9, 0x6C05, 0x6C0C, 0x6C06, 0x6C0D, 0x6C15, 0x6C18, 0x6C19, /* 0xA0 */
     0x6C1A, 0x6C21, 0x6C2C, 0x6C24, 0x6C2A, 0x6C32, 0x6535, 0x6555, /* 0xB0 */
@@ -1228,15 +1228,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_EB[] =
     0x8C5A, 0x8161, 0x811E, 0x812C, 0x8118, 0x8132, 0x8148, 0x814C, /* 0xE0 */
     0x8153, 0x8174, 0x8159, 0x815A, 0x8171, 0x8160, 0x8169, 0x817C, /* 0xE0 */
     0x817D, 0x816D, 0x8167, 0x584D, 0x5AB5, 0x8188, 0x8182, 0x81CF, /* 0xF0 */
-    0x6ED5, 0x81A3, 0x81AA, 0x81CC, 0x6726, 0x81CA, 0x81BB          /* 0xF0 */
+    0x6ED5, 0x81A3, 0x81AA, 0x81CC, 0x6726, 0x81CA, 0x81BB			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_EC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x81C1, 0x81A6, 0x6B5F, 0x6B37, 0x6B39, 0x6B43, 0x6B46, /* 0xA0 */
     0x6B59, 0x98AE, 0x98AF, 0x98B6, 0x98BC, 0x98C6, 0x98C8, 0x6BB3, /* 0xA0 */
     0x5F40, 0x8F42, 0x89F3, 0x6590, 0x9F4F, 0x6595, 0x65BC, 0x65C6, /* 0xB0 */
@@ -1248,15 +1248,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_EC[] =
     0x7228, 0x706C, 0x71FE, 0x7166, 0x71B9, 0x623E, 0x623D, 0x6243, /* 0xE0 */
     0x6248, 0x6249, 0x793B, 0x7940, 0x7946, 0x7949, 0x795B, 0x795C, /* 0xE0 */
     0x7953, 0x795A, 0x79B0, 0x7957, 0x7960, 0x798E, 0x7967, 0x797A, /* 0xF0 */
-    0x79AA, 0x798A, 0x799A, 0x79A7, 0x79B3, 0x5FD1, 0x5FD0          /* 0xF0 */
+    0x79AA, 0x798A, 0x799A, 0x79A7, 0x79B3, 0x5FD1, 0x5FD0			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_ED[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x61DF, 0x605D, 0x605A, 0x6067, 0x6041, 0x6059, 0x6063, /* 0xA0 */
     0x6164, 0x6106, 0x610D, 0x615D, 0x61A9, 0x619D, 0x61CB, 0x61E3, /* 0xA0 */
     0x6207, 0x8080, 0x807F, 0x6C93, 0x6FA9, 0x6DFC, 0x78EF, 0x77F8, /* 0xB0 */
@@ -1268,15 +1268,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_ED[] =
     0x78EC, 0x78F2, 0x7905, 0x78F4, 0x7913, 0x7924, 0x791E, 0x7934, /* 0xE0 */
     0x9F95, 0x9EF9, 0x9EFB, 0x9EFC, 0x76F1, 0x7704, 0x7798, 0x76F9, /* 0xE0 */
     0x7707, 0x7708, 0x771A, 0x7722, 0x7719, 0x772D, 0x7726, 0x7735, /* 0xF0 */
-    0x7738, 0x775E, 0x77BC, 0x7747, 0x7743, 0x775A, 0x7768          /* 0xF0 */
+    0x7738, 0x775E, 0x77BC, 0x7747, 0x7743, 0x775A, 0x7768			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_EE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7762, 0x7765, 0x777F, 0x778D, 0x777D, 0x7780, 0x778C, /* 0xA0 */
     0x7791, 0x779F, 0x77A0, 0x77B0, 0x77B5, 0x77BD, 0x753A, 0x7540, /* 0xA0 */
     0x754E, 0x754B, 0x7548, 0x755B, 0x7572, 0x7579, 0x7583, 0x7F58, /* 0xB0 */
@@ -1288,15 +1288,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_EE[] =
     0x9238, 0x925E, 0x926C, 0x926D, 0x923F, 0x9460, 0x9230, 0x9249, /* 0xE0 */
     0x9248, 0x924D, 0x922E, 0x9239, 0x9438, 0x92AC, 0x92A0, 0x927A, /* 0xE0 */
     0x92AA, 0x92EE, 0x92CF, 0x9403, 0x92E3, 0x943A, 0x92B1, 0x92A6, /* 0xF0 */
-    0x93A7, 0x9296, 0x92CC, 0x92A9, 0x93F5, 0x9293, 0x927F          /* 0xF0 */
+    0x93A7, 0x9296, 0x92CC, 0x92A9, 0x93F5, 0x9293, 0x927F			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_EF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x93A9, 0x929A, 0x931A, 0x92AB, 0x9283, 0x940B, 0x92A8, /* 0xA0 */
     0x92A3, 0x9412, 0x9338, 0x92F1, 0x93D7, 0x92E5, 0x92F0, 0x92EF, /* 0xA0 */
     0x92E8, 0x92BC, 0x92DD, 0x92F6, 0x9426, 0x9427, 0x92C3, 0x92DF, /* 0xB0 */
@@ -1308,15 +1308,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_EF[] =
     0x93C7, 0x93D1, 0x9414, 0x941D, 0x93F7, 0x9465, 0x9413, 0x946D, /* 0xE0 */
     0x9420, 0x9479, 0x93F9, 0x9419, 0x944A, 0x9432, 0x943F, 0x9454, /* 0xE0 */
     0x9463, 0x937E, 0x77E7, 0x77EC, 0x96C9, 0x79D5, 0x79ED, 0x79E3, /* 0xF0 */
-    0x79EB, 0x7A06, 0x5D47, 0x7A03, 0x7A02, 0x7A1E, 0x7A14          /* 0xF0 */
+    0x79EB, 0x7A06, 0x5D47, 0x7A03, 0x7A02, 0x7A1E, 0x7A14			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_F0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7A39, 0x7A37, 0x7A61, 0x9ECF, 0x99A5, 0x7A70, 0x7688, /* 0xA0 */
     0x768E, 0x7693, 0x7699, 0x76A4, 0x74DE, 0x74E0, 0x752C, 0x9CE9, /* 0xA0 */
     0x9CF6, 0x9D07, 0x9D06, 0x9D23, 0x9D87, 0x9E15, 0x9D1D, 0x9D1F, /* 0xB0 */
@@ -1328,15 +1328,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_F0[] =
     0x75A3, 0x75B3, 0x75B4, 0x75B8, 0x75C4, 0x75B1, 0x75B0, 0x75C3, /* 0xE0 */
     0x75C2, 0x7602, 0x75CD, 0x75E3, 0x7646, 0x75E6, 0x75E4, 0x7647, /* 0xE0 */
     0x75E7, 0x7603, 0x75F1, 0x75FC, 0x75FF, 0x7610, 0x7600, 0x7649, /* 0xF0 */
-    0x760C, 0x761E, 0x760A, 0x7625, 0x763B, 0x7615, 0x7619          /* 0xF0 */
+    0x760C, 0x761E, 0x760A, 0x7625, 0x763B, 0x7615, 0x7619			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_F1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x761B, 0x763C, 0x7622, 0x7620, 0x7640, 0x762D, 0x7630, /* 0xA0 */
     0x766D, 0x7635, 0x7643, 0x766E, 0x7633, 0x764D, 0x7669, 0x7654, /* 0xA0 */
     0x765C, 0x7656, 0x7672, 0x766F, 0x7FCA, 0x7AE6, 0x7A78, 0x7A79, /* 0xB0 */
@@ -1348,15 +1348,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_F1[] =
     0x8966, 0x897B, 0x758B, 0x80E5, 0x76B8, 0x76B4, 0x77DC, 0x8012, /* 0xE0 */
     0x8014, 0x8016, 0x801C, 0x8020, 0x802E, 0x8025, 0x8026, 0x802C, /* 0xE0 */
     0x8029, 0x8028, 0x8031, 0x800B, 0x8035, 0x8043, 0x8046, 0x8079, /* 0xF0 */
-    0x8052, 0x8075, 0x8071, 0x8983, 0x9807, 0x980E, 0x980F          /* 0xF0 */
+    0x8052, 0x8075, 0x8071, 0x8983, 0x9807, 0x980E, 0x980F			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_F2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9821, 0x981C, 0x6F41, 0x9826, 0x9837, 0x984E, 0x9853, /* 0xA0 */
     0x9873, 0x9862, 0x9859, 0x9865, 0x986C, 0x9870, 0x864D, 0x8654, /* 0xA0 */
     0x866C, 0x87E3, 0x8806, 0x867A, 0x867C, 0x867B, 0x86A8, 0x868D, /* 0xB0 */
@@ -1368,15 +1368,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_F2[] =
     0x871E, 0x8725, 0x872E, 0x871A, 0x873E, 0x87C8, 0x8734, 0x8731, /* 0xE0 */
     0x8729, 0x8737, 0x873F, 0x8782, 0x8722, 0x877D, 0x8811, 0x877B, /* 0xE0 */
     0x8760, 0x8770, 0x874C, 0x876E, 0x878B, 0x8753, 0x8763, 0x87BB, /* 0xF0 */
-    0x8764, 0x8759, 0x8765, 0x8793, 0x87AF, 0x87CE, 0x87D2          /* 0xF0 */
+    0x8764, 0x8759, 0x8765, 0x8793, 0x87AF, 0x87CE, 0x87D2			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_F3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x87C6, 0x8788, 0x8785, 0x87AD, 0x8797, 0x8783, 0x87AB, /* 0xA0 */
     0x87E5, 0x87AC, 0x87B5, 0x87B3, 0x87CB, 0x87D3, 0x87BD, 0x87D1, /* 0xA0 */
     0x87C0, 0x87CA, 0x87DB, 0x87EA, 0x87E0, 0x87EE, 0x8816, 0x8813, /* 0xB0 */
@@ -1388,15 +1388,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_F3[] =
     0x7B7B, 0x7B62, 0x7B72, 0x7B71, 0x7B90, 0x7C00, 0x7BCB, 0x7BB8, /* 0xE0 */
     0x7BAC, 0x7B9D, 0x7C5C, 0x7B85, 0x7C1E, 0x7B9C, 0x7BA2, 0x7C2B, /* 0xE0 */
     0x7BB4, 0x7C23, 0x7BC1, 0x7BCC, 0x7BDD, 0x7BDA, 0x7BE5, 0x7BE6, /* 0xF0 */
-    0x7BEA, 0x7C0C, 0x7BFE, 0x7BFC, 0x7C0F, 0x7C6A, 0x7C0B          /* 0xF0 */
+    0x7BEA, 0x7C0C, 0x7BFE, 0x7BFC, 0x7C0F, 0x7C6A, 0x7C0B			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_F4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x7C1F, 0x7C2A, 0x7C26, 0x7C38, 0x7C5F, 0x7C40, 0x81FE, /* 0xA0 */
     0x8201, 0x8202, 0x8204, 0x81EC, 0x8844, 0x8221, 0x8222, 0x8264, /* 0xA0 */
     0x822D, 0x822F, 0x8228, 0x822B, 0x8238, 0x826B, 0x8233, 0x8234, /* 0xB0 */
@@ -1408,15 +1408,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_F4[] =
     0x7FBF, 0x7FCE, 0x7FD5, 0x7FE5, 0x7FE1, 0x7FE6, 0x7FE9, 0x7FEE, /* 0xE0 */
     0x7FF3, 0x7CF8, 0x7E36, 0x7DA6, 0x7DAE, 0x7E47, 0x7E9B, 0x9EA9, /* 0xE0 */
     0x9EB4, 0x8D73, 0x8D84, 0x8D94, 0x8D91, 0x8DB2, 0x8D67, 0x8D6D, /* 0xF0 */
-    0x8C47, 0x8C49, 0x914A, 0x9150, 0x914E, 0x914F, 0x9164          /* 0xF0 */
+    0x8C47, 0x8C49, 0x914A, 0x9150, 0x914E, 0x914F, 0x9164			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_F5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9162, 0x9161, 0x9170, 0x9169, 0x916F, 0x91C5, 0x91C3, /* 0xA0 */
     0x9172, 0x9174, 0x9179, 0x918C, 0x9185, 0x9190, 0x918D, 0x9191, /* 0xA0 */
     0x91A2, 0x91A3, 0x91AA, 0x91AD, 0x91AE, 0x91AF, 0x91B5, 0x91B4, /* 0xB0 */
@@ -1428,15 +1428,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_F5[] =
     0x8E35, 0x8E3D, 0x8E31, 0x8E49, 0x8E41, 0x8E42, 0x8EA1, 0x8E63, /* 0xE0 */
     0x8E4A, 0x8E70, 0x8E76, 0x8E7C, 0x8E6F, 0x8E74, 0x8E85, 0x8EAA, /* 0xE0 */
     0x8E94, 0x8E90, 0x8EA6, 0x8E9E, 0x8C78, 0x8C82, 0x8C8A, 0x8C85, /* 0xF0 */
-    0x8C98, 0x8C94, 0x659B, 0x89D6, 0x89F4, 0x89DA, 0x89DC          /* 0xF0 */
+    0x8C98, 0x8C94, 0x659B, 0x89D6, 0x89F4, 0x89DA, 0x89DC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_F6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x89E5, 0x89EB, 0x89F6, 0x8A3E, 0x8B26, 0x975A, 0x96E9, /* 0xA0 */
     0x9742, 0x96EF, 0x9706, 0x973D, 0x9708, 0x970F, 0x970E, 0x972A, /* 0xA0 */
     0x9744, 0x9730, 0x973E, 0x9F54, 0x9F5F, 0x9F59, 0x9F60, 0x9F5C, /* 0xB0 */
@@ -1448,15 +1448,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_F6[] =
     0x9C58, 0x9BC1, 0x9C7A, 0x9C31, 0x9C39, 0x9C23, 0x9C37, 0x9BC0, /* 0xE0 */
     0x9BCA, 0x9BC7, 0x9BFD, 0x9BD6, 0x9BEA, 0x9BEB, 0x9BE1, 0x9BE4, /* 0xE0 */
     0x9BE7, 0x9BDD, 0x9BE2, 0x9BF0, 0x9BDB, 0x9BF4, 0x9BD4, 0x9C5D, /* 0xF0 */
-    0x9C08, 0x9C10, 0x9C0D, 0x9C12, 0x9C09, 0x9BFF, 0x9C20          /* 0xF0 */
+    0x9C08, 0x9C10, 0x9C0D, 0x9C12, 0x9C09, 0x9BFF, 0x9C20			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_F7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x9C32, 0x9C2D, 0x9C28, 0x9C25, 0x9C29, 0x9C33, 0x9C3E, /* 0xA0 */
     0x9C48, 0x9C3B, 0x9C35, 0x9C45, 0x9C56, 0x9C54, 0x9C52, 0x9C67, /* 0xA0 */
     0x977C, 0x9785, 0x97C3, 0x97BD, 0x9794, 0x97C9, 0x97AB, 0x97A3, /* 0xB0 */
@@ -1468,15 +1468,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_F7[] =
     0x9B23, 0x4E48, 0x9EBE, 0x7E3B, 0x9E82, 0x9E87, 0x9E88, 0x9E8B, /* 0xE0 */
     0x9E92, 0x93D6, 0x9E9D, 0x9E9F, 0x9EDB, 0x9EDC, 0x9EDD, 0x9EE0, /* 0xE0 */
     0x9EDF, 0x9EE2, 0x9EF7, 0x9EE7, 0x9EE5, 0x9EF2, 0x9EEF, 0x9F22, /* 0xF0 */
-    0x9F2C, 0x9F2F, 0x9F39, 0x9F37, 0x9F3D, 0x9F3E, 0x9F44          /* 0xF0 */
+    0x9F2C, 0x9F2F, 0x9F39, 0x9F37, 0x9F3D, 0x9F3E, 0x9F44			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_F8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x896C, 0x95C6, 0x9336, 0x5F46, 0x8514, 0x7E94, 0x5382, /* 0xA0 */
     0x51B2, 0x4E11, 0x9F63, 0x5679, 0x515A, 0x6DC0, 0x9F15, 0x6597, /* 0xA0 */
     0x5641, 0x9AEE, 0x8303, 0x4E30, 0x8907, 0x5E72, 0x7A40, 0x98B3, /* 0xB0 */
@@ -1488,15 +1488,15 @@ static sal_uInt16 const aImplDBCSToUniTab_GBT_F8[] =
     0x6734, 0x97C6, 0x7C64, 0x7E34, 0x97A6, 0x9EAF, 0x786E, 0x820D, /* 0xE0 */
     0x672F, 0x677E, 0x56CC, 0x53F0, 0x98B1, 0x6AAF, 0x7F4E, 0x6D82, /* 0xE0 */
     0x7CF0, 0x4E07, 0x4FC2, 0x7E6B, 0x9E79, 0x56AE, 0x9B1A, 0x846F, /* 0xF0 */
-    0x53F6, 0x90C1, 0x79A6, 0x7C72, 0x613F, 0x4E91, 0x9AD2          /* 0xF0 */
+    0x53F6, 0x90C1, 0x79A6, 0x7C72, 0x613F, 0x4E91, 0x9AD2			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_GBT_F9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0x75C7, 0x96BB, 0x53EA, 0x7DFB, 0x88FD, 0x79CD, 0x7843, /* 0xA0 */
-    0x7B51, 0x51C6                                                  /* 0xA0 */
+    0x7B51, 0x51C6													/* 0xA0 */
 };
diff --git a/sal/textenc/tcvtscn4.tab b/sal/textenc/tcvtscn4.tab
index c1251741759d..b5d068f21d3d 100644
--- a/sal/textenc/tcvtscn4.tab
+++ b/sal/textenc/tcvtscn4.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,519 +38,519 @@
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_4E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD2BB, 0xB6A1,      0, 0xC6DF,      0,      0,      0, 0xCDF2, /* 0x00 */
-    0xD5C9, 0xC8FD, 0xC9CF, 0xCFC2, 0xD8A2, 0xB2BB, 0xD3EB,      0, /* 0x00 */
-    0xD8A4, 0xB3F3,      0, 0xD7A8, 0xC7D2, 0xD8A7, 0xCAC0,      0, /* 0x10 */
-    0xC7F0, 0xB1FB, 0xD2B5, 0xB4D4, 0xB6AB, 0xCBBF, 0xD8A9,      0, /* 0x10 */
-         0,      0, 0xB6AA,      0, 0xC1BD, 0xD1CF,      0, 0xC9A5, /* 0x20 */
-    0xD8AD,      0, 0xB8F6, 0xD1BE, 0xE3DC, 0xD6D0,      0,      0, /* 0x20 */
-    0xB7E1,      0, 0xB4AE,      0, 0xC1D9,      0, 0xD8BC,      0, /* 0x30 */
-    0xCDE8, 0xB5A4, 0xCEAA, 0xD6F7,      0, 0xC0F6, 0xBED9, 0xD8AF, /* 0x30 */
-         0,      0,      0, 0xC4CB,      0, 0xBEC3,      0, 0xD8B1, /* 0x40 */
-    0xC3B4, 0xD2E5,      0, 0xD6AE, 0xCEDA, 0xD5A7, 0xBAF5, 0xB7A6, /* 0x40 */
-    0xC0D6,      0, 0xC6B9, 0xC5D2, 0xC7C7,      0, 0xB9D4,      0, /* 0x50 */
-    0xB3CB, 0xD2D2,      0,      0, 0xD8BF, 0xBEC5, 0xC6F2, 0xD2B2, /* 0x50 */
-    0xCFB0, 0xCFE7,      0,      0,      0,      0, 0xCAE9,      0, /* 0x60 */
-         0, 0xD8C0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0xC2F2, 0xC2D2,      0, 0xC8E9,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xC7AC,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xC1CB,      0, /* 0x80 */
-    0xD3E8, 0xD5F9,      0, 0xCAC2, 0xB6FE, 0xD8A1, 0xD3DA, 0xBFF7, /* 0x80 */
-         0, 0xD4C6, 0xBBA5, 0xD8C1, 0xCEE5, 0xBEAE,      0,      0, /* 0x90 */
-    0xD8A8,      0, 0xD1C7, 0xD0A9,      0,      0,      0, 0xD8BD, /* 0x90 */
-    0xD9EF, 0xCDF6, 0xBFBA,      0, 0xBDBB, 0xBAA5, 0xD2E0, 0xB2FA, /* 0xA0 */
-    0xBAE0, 0xC4B6,      0, 0xCFED, 0xBEA9, 0xCDA4, 0xC1C1,      0, /* 0xA0 */
-         0,      0, 0xC7D7, 0xD9F1,      0, 0xD9F4,      0,      0, /* 0xB0 */
-         0,      0, 0xC8CB, 0xD8E9,      0,      0,      0, 0xD2DA, /* 0xB0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD2BB, 0xB6A1, 	 0, 0xC6DF, 	 0, 	 0, 	 0, 0xCDF2, /* 0x00 */
+    0xD5C9, 0xC8FD, 0xC9CF, 0xCFC2, 0xD8A2, 0xB2BB, 0xD3EB, 	 0, /* 0x00 */
+    0xD8A4, 0xB3F3, 	 0, 0xD7A8, 0xC7D2, 0xD8A7, 0xCAC0, 	 0, /* 0x10 */
+    0xC7F0, 0xB1FB, 0xD2B5, 0xB4D4, 0xB6AB, 0xCBBF, 0xD8A9, 	 0, /* 0x10 */
+         0, 	 0, 0xB6AA, 	 0, 0xC1BD, 0xD1CF, 	 0, 0xC9A5, /* 0x20 */
+    0xD8AD, 	 0, 0xB8F6, 0xD1BE, 0xE3DC, 0xD6D0, 	 0, 	 0, /* 0x20 */
+    0xB7E1, 	 0, 0xB4AE, 	 0, 0xC1D9, 	 0, 0xD8BC, 	 0, /* 0x30 */
+    0xCDE8, 0xB5A4, 0xCEAA, 0xD6F7, 	 0, 0xC0F6, 0xBED9, 0xD8AF, /* 0x30 */
+         0, 	 0, 	 0, 0xC4CB, 	 0, 0xBEC3, 	 0, 0xD8B1, /* 0x40 */
+    0xC3B4, 0xD2E5, 	 0, 0xD6AE, 0xCEDA, 0xD5A7, 0xBAF5, 0xB7A6, /* 0x40 */
+    0xC0D6, 	 0, 0xC6B9, 0xC5D2, 0xC7C7, 	 0, 0xB9D4, 	 0, /* 0x50 */
+    0xB3CB, 0xD2D2, 	 0, 	 0, 0xD8BF, 0xBEC5, 0xC6F2, 0xD2B2, /* 0x50 */
+    0xCFB0, 0xCFE7, 	 0, 	 0, 	 0, 	 0, 0xCAE9, 	 0, /* 0x60 */
+         0, 0xD8C0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xC2F2, 0xC2D2, 	 0, 0xC8E9, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC7AC, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC1CB, 	 0, /* 0x80 */
+    0xD3E8, 0xD5F9, 	 0, 0xCAC2, 0xB6FE, 0xD8A1, 0xD3DA, 0xBFF7, /* 0x80 */
+         0, 0xD4C6, 0xBBA5, 0xD8C1, 0xCEE5, 0xBEAE, 	 0, 	 0, /* 0x90 */
+    0xD8A8, 	 0, 0xD1C7, 0xD0A9, 	 0, 	 0, 	 0, 0xD8BD, /* 0x90 */
+    0xD9EF, 0xCDF6, 0xBFBA, 	 0, 0xBDBB, 0xBAA5, 0xD2E0, 0xB2FA, /* 0xA0 */
+    0xBAE0, 0xC4B6, 	 0, 0xCFED, 0xBEA9, 0xCDA4, 0xC1C1, 	 0, /* 0xA0 */
+         0, 	 0, 0xC7D7, 0xD9F1, 	 0, 0xD9F4, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xC8CB, 0xD8E9, 	 0, 	 0, 	 0, 0xD2DA, /* 0xB0 */
     0xCAB2, 0xC8CA, 0xD8EC, 0xD8EA, 0xD8C6, 0xBDF6, 0xC6CD, 0xB3F0, /* 0xC0 */
-         0, 0xD8EB, 0xBDF1, 0xBDE9,      0, 0xC8D4, 0xB4D3,      0, /* 0xC0 */
-         0, 0xC2D8,      0, 0xB2D6, 0xD7D0, 0xCACB, 0xCBFB, 0xD5CC, /* 0xD0 */
-    0xB8B6, 0xCFC9,      0,      0,      0, 0xD9DA, 0xD8F0, 0xC7AA, /* 0xD0 */
-         0, 0xD8EE,      0, 0xB4FA, 0xC1EE, 0xD2D4,      0,      0, /* 0xE0 */
-    0xD8ED,      0, 0xD2C7, 0xD8EF, 0xC3C7,      0,      0,      0, /* 0xE0 */
-    0xD1F6,      0, 0xD6D9, 0xD8F2,      0, 0xD8F5, 0xBCFE, 0xBCDB, /* 0xF0 */
-         0,      0,      0, 0xC8CE,      0, 0xB7DD,      0, 0xB7C2  /* 0xF0 */
+         0, 0xD8EB, 0xBDF1, 0xBDE9, 	 0, 0xC8D4, 0xB4D3, 	 0, /* 0xC0 */
+         0, 0xC2D8, 	 0, 0xB2D6, 0xD7D0, 0xCACB, 0xCBFB, 0xD5CC, /* 0xD0 */
+    0xB8B6, 0xCFC9, 	 0, 	 0, 	 0, 0xD9DA, 0xD8F0, 0xC7AA, /* 0xD0 */
+         0, 0xD8EE, 	 0, 0xB4FA, 0xC1EE, 0xD2D4, 	 0, 	 0, /* 0xE0 */
+    0xD8ED, 	 0, 0xD2C7, 0xD8EF, 0xC3C7, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xD1F6, 	 0, 0xD6D9, 0xD8F2, 	 0, 0xD8F5, 0xBCFE, 0xBCDB, /* 0xF0 */
+         0, 	 0, 	 0, 0xC8CE, 	 0, 0xB7DD, 	 0, 0xB7C2	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_4F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xC6F3,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xD8F8, 0xD2C1,      0,      0, 0xCEE9, 0xBCBF, 0xB7FC, /* 0x00 */
-    0xB7A5, 0xD0DD,      0,      0,      0,      0,      0, 0xD6DA, /* 0x10 */
-    0xD3C5, 0xBBEF, 0xBBE1, 0xD8F1,      0,      0, 0xC9A1, 0xCEB0, /* 0x10 */
-    0xB4AB,      0, 0xD8F3,      0, 0xC9CB, 0xD8F6, 0xC2D7, 0xD8F7, /* 0x20 */
-         0,      0, 0xCEB1, 0xD8F9,      0,      0,      0, 0xB2AE, /* 0x20 */
-    0xB9C0,      0, 0xD9A3,      0, 0xB0E9,      0, 0xC1E6,      0, /* 0x30 */
-    0xC9EC,      0, 0xCBC5,      0, 0xCBC6, 0xD9A4,      0,      0, /* 0x30 */
-         0,      0,      0, 0xB5E8,      0,      0, 0xB5AB,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xCEBB, 0xB5CD, 0xD7A1, /* 0x40 */
-    0xD7F4, 0xD3D3,      0, 0xCCE5,      0, 0xBACE,      0, 0xD9A2, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xC6F3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xD8F8, 0xD2C1, 	 0, 	 0, 0xCEE9, 0xBCBF, 0xB7FC, /* 0x00 */
+    0xB7A5, 0xD0DD, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD6DA, /* 0x10 */
+    0xD3C5, 0xBBEF, 0xBBE1, 0xD8F1, 	 0, 	 0, 0xC9A1, 0xCEB0, /* 0x10 */
+    0xB4AB, 	 0, 0xD8F3, 	 0, 0xC9CB, 0xD8F6, 0xC2D7, 0xD8F7, /* 0x20 */
+         0, 	 0, 0xCEB1, 0xD8F9, 	 0, 	 0, 	 0, 0xB2AE, /* 0x20 */
+    0xB9C0, 	 0, 0xD9A3, 	 0, 0xB0E9, 	 0, 0xC1E6, 	 0, /* 0x30 */
+    0xC9EC, 	 0, 0xCBC5, 	 0, 0xCBC6, 0xD9A4, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xB5E8, 	 0, 	 0, 0xB5AB, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCEBB, 0xB5CD, 0xD7A1, /* 0x40 */
+    0xD7F4, 0xD3D3, 	 0, 0xCCE5, 	 0, 0xBACE, 	 0, 0xD9A2, /* 0x50 */
     0xD9DC, 0xD3E0, 0xD8FD, 0xB7F0, 0xD7F7, 0xD8FE, 0xD8FA, 0xD9A1, /* 0x50 */
-    0xC4E3,      0,      0, 0xD3B6, 0xD8F4, 0xD9DD,      0, 0xD8FB, /* 0x60 */
-         0, 0xC5E5,      0,      0, 0xC0D0,      0,      0, 0xD1F0, /* 0x60 */
-    0xB0DB,      0,      0, 0xBCD1, 0xD9A6,      0, 0xD9A5,      0, /* 0x70 */
-         0,      0,      0, 0xD9AC, 0xD9AE,      0, 0xD9AB, 0xCAB9, /* 0x70 */
-         0,      0,      0, 0xD9A9, 0xD6B6,      0,      0,      0, /* 0x80 */
-    0xB3DE, 0xD9A8,      0, 0xC0FD,      0, 0xCACC,      0, 0xD9AA, /* 0x80 */
-         0, 0xD9A7,      0,      0, 0xD9B0,      0,      0, 0xB6B1, /* 0x90 */
-         0,      0,      0, 0xB9A9,      0, 0xD2C0,      0,      0, /* 0x90 */
-    0xCFC0,      0,      0, 0xC2C2,      0, 0xBDC4, 0xD5EC, 0xB2E0, /* 0xA0 */
-    0xC7C8, 0xBFEB, 0xD9AD,      0, 0xD9AF,      0, 0xCEEA, 0xBAEE, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xC7D6,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xB1E3, /* 0xB0 */
-         0,      0,      0, 0xB4D9, 0xB6ED, 0xD9B4,      0,      0, /* 0xC0 */
-         0,      0, 0xBFA1,      0,      0,      0, 0xD9DE, 0xC7CE, /* 0xC0 */
-    0xC0FE, 0xD9B8,      0,      0,      0,      0,      0, 0xCBD7, /* 0xD0 */
-    0xB7FD,      0, 0xD9B5,      0, 0xD9B7, 0xB1A3, 0xD3E1, 0xD9B9, /* 0xD0 */
-         0, 0xD0C5,      0, 0xD9B6,      0,      0, 0xD9B1,      0, /* 0xE0 */
-    0xD9B2, 0xC1A9, 0xD9B3,      0,      0, 0xBCF3, 0xD0DE, 0xB8A9, /* 0xE0 */
-         0, 0xBEE3,      0, 0xD9BD,      0,      0,      0,      0, /* 0xF0 */
-    0xD9BA,      0, 0xB0B3,      0,      0,      0, 0xD9C2          /* 0xF0 */
+    0xC4E3, 	 0, 	 0, 0xD3B6, 0xD8F4, 0xD9DD, 	 0, 0xD8FB, /* 0x60 */
+         0, 0xC5E5, 	 0, 	 0, 0xC0D0, 	 0, 	 0, 0xD1F0, /* 0x60 */
+    0xB0DB, 	 0, 	 0, 0xBCD1, 0xD9A6, 	 0, 0xD9A5, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0xD9AC, 0xD9AE, 	 0, 0xD9AB, 0xCAB9, /* 0x70 */
+         0, 	 0, 	 0, 0xD9A9, 0xD6B6, 	 0, 	 0, 	 0, /* 0x80 */
+    0xB3DE, 0xD9A8, 	 0, 0xC0FD, 	 0, 0xCACC, 	 0, 0xD9AA, /* 0x80 */
+         0, 0xD9A7, 	 0, 	 0, 0xD9B0, 	 0, 	 0, 0xB6B1, /* 0x90 */
+         0, 	 0, 	 0, 0xB9A9, 	 0, 0xD2C0, 	 0, 	 0, /* 0x90 */
+    0xCFC0, 	 0, 	 0, 0xC2C2, 	 0, 0xBDC4, 0xD5EC, 0xB2E0, /* 0xA0 */
+    0xC7C8, 0xBFEB, 0xD9AD, 	 0, 0xD9AF, 	 0, 0xCEEA, 0xBAEE, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC7D6, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB1E3, /* 0xB0 */
+         0, 	 0, 	 0, 0xB4D9, 0xB6ED, 0xD9B4, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xBFA1, 	 0, 	 0, 	 0, 0xD9DE, 0xC7CE, /* 0xC0 */
+    0xC0FE, 0xD9B8, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBD7, /* 0xD0 */
+    0xB7FD, 	 0, 0xD9B5, 	 0, 0xD9B7, 0xB1A3, 0xD3E1, 0xD9B9, /* 0xD0 */
+         0, 0xD0C5, 	 0, 0xD9B6, 	 0, 	 0, 0xD9B1, 	 0, /* 0xE0 */
+    0xD9B2, 0xC1A9, 0xD9B3, 	 0, 	 0, 0xBCF3, 0xD0DE, 0xB8A9, /* 0xE0 */
+         0, 0xBEE3, 	 0, 0xD9BD, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xD9BA, 	 0, 0xB0B3, 	 0, 	 0, 	 0, 0xD9C2			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_50[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-                                    0xD9C4, 0xB1B6,      0, 0xD9BF, /* 0x00 */
-         0,      0, 0xB5B9,      0, 0xBEF3,      0,      0,      0, /* 0x10 */
-    0xCCC8, 0xBAF2, 0xD2D0,      0, 0xD9C3,      0,      0, 0xBDE8, /* 0x10 */
-         0, 0xB3AB,      0,      0,      0, 0xD9C5, 0xBEEB,      0, /* 0x20 */
-    0xD9C6, 0xD9BB, 0xC4DF,      0, 0xD9BE, 0xD9C1, 0xD9C0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xD5AE,      0, 0xD6B5,      0, 0xC7E3,      0, /* 0x30 */
-         0,      0,      0, 0xD9C8,      0,      0,      0, 0xBCD9, /* 0x40 */
-    0xD9CA,      0,      0,      0, 0xD9BC,      0, 0xD9CB, 0xC6AB, /* 0x40 */
-         0,      0,      0,      0,      0, 0xD9C9,      0,      0, /* 0x50 */
-         0,      0, 0xD7F6,      0, 0xCDA3,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xBDA1,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xD9CC,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xC5BC, 0xCDB5, /* 0x70 */
-         0,      0,      0, 0xD9CD,      0,      0, 0xD9C7, 0xB3A5, /* 0x70 */
-    0xBFFE,      0,      0,      0,      0, 0xB8B5,      0,      0, /* 0x80 */
-    0xC0FC,      0,      0,      0,      0, 0xB0F8,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xB4F6,      0, 0xD9CE,      0, 0xD9CF, /* 0xA0 */
-    0xB4A2, 0xD9D0,      0,      0, 0xB4DF,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xB0C1,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xD9D1, 0xC9B5,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xCFF1, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xD9D2,      0, /* 0xD0 */
-         0,      0, 0xC1C5,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xD9D6, 0xC9AE, /* 0xE0 */
-         0,      0,      0,      0, 0xD9D5, 0xD9D4, 0xD9D7,      0, /* 0xE0 */
-         0,      0,      0, 0xCBDB,      0, 0xBDA9,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xC6A7                                  /* 0xF0 */
+                                    0xD9C4, 0xB1B6, 	 0, 0xD9BF, /* 0x00 */
+         0, 	 0, 0xB5B9, 	 0, 0xBEF3, 	 0, 	 0, 	 0, /* 0x10 */
+    0xCCC8, 0xBAF2, 0xD2D0, 	 0, 0xD9C3, 	 0, 	 0, 0xBDE8, /* 0x10 */
+         0, 0xB3AB, 	 0, 	 0, 	 0, 0xD9C5, 0xBEEB, 	 0, /* 0x20 */
+    0xD9C6, 0xD9BB, 0xC4DF, 	 0, 0xD9BE, 0xD9C1, 0xD9C0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xD5AE, 	 0, 0xD6B5, 	 0, 0xC7E3, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xD9C8, 	 0, 	 0, 	 0, 0xBCD9, /* 0x40 */
+    0xD9CA, 	 0, 	 0, 	 0, 0xD9BC, 	 0, 0xD9CB, 0xC6AB, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD9C9, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xD7F6, 	 0, 0xCDA3, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xBDA1, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xD9CC, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC5BC, 0xCDB5, /* 0x70 */
+         0, 	 0, 	 0, 0xD9CD, 	 0, 	 0, 0xD9C7, 0xB3A5, /* 0x70 */
+    0xBFFE, 	 0, 	 0, 	 0, 	 0, 0xB8B5, 	 0, 	 0, /* 0x80 */
+    0xC0FC, 	 0, 	 0, 	 0, 	 0, 0xB0F8, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xB4F6, 	 0, 0xD9CE, 	 0, 0xD9CF, /* 0xA0 */
+    0xB4A2, 0xD9D0, 	 0, 	 0, 0xB4DF, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xB0C1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xD9D1, 0xC9B5, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCFF1, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD9D2, 	 0, /* 0xD0 */
+         0, 	 0, 0xC1C5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD9D6, 0xC9AE, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xD9D5, 0xD9D4, 0xD9D7, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xCBDB, 	 0, 0xBDA9, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xC6A7									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_51[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                     0xD9D3, 0xD9D8, /* 0x00 */
-         0,      0,      0, 0xD9D9,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xC8E5,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xC0DC,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xB6F9, /* 0x30 */
-    0xD8A3, 0xD4CA,      0, 0xD4AA, 0xD0D6, 0xB3E4, 0xD5D7,      0, /* 0x40 */
-    0xCFC8, 0xB9E2,      0, 0xBFCB,      0, 0xC3E2,      0,      0, /* 0x40 */
-         0, 0xB6D2,      0,      0, 0xCDC3, 0xD9EE, 0xD9F0,      0, /* 0x50 */
-         0,      0, 0xB5B3,      0, 0xB6B5,      0,      0,      0, /* 0x50 */
-         0,      0, 0xBEA4,      0,      0, 0xC8EB,      0,      0, /* 0x60 */
-    0xC8AB,      0,      0, 0xB0CB, 0xB9AB, 0xC1F9, 0xD9E2,      0, /* 0x60 */
-    0xC0BC, 0xB9B2,      0, 0xB9D8, 0xD0CB, 0xB1F8, 0xC6E4, 0xBEDF, /* 0x70 */
-    0xB5E4, 0xD7C8,      0, 0xD1F8, 0xBCE6, 0xCADE,      0,      0, /* 0x70 */
-    0xBCBD, 0xD9E6, 0xD8E7,      0,      0, 0xC4DA,      0,      0, /* 0x80 */
-    0xB8D4, 0xC8BD,      0,      0, 0xB2E1, 0xD4D9,      0,      0, /* 0x80 */
-         0,      0, 0xC3B0,      0,      0, 0xC3E1, 0xDAA2, 0xC8DF, /* 0x90 */
-         0, 0xD0B4,      0, 0xBEFC, 0xC5A9,      0,      0,      0, /* 0x90 */
-    0xB9DA,      0, 0xDAA3,      0, 0xD4A9, 0xDAA4,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xD9FB, 0xB6AC,      0,      0, 0xB7EB, /* 0xA0 */
-    0xB1F9, 0xD9FC, 0xB3E5, 0xBEF6,      0, 0xBFF6, 0xD2B1, 0xC0E4, /* 0xB0 */
-         0,      0,      0, 0xB6B3, 0xD9FE, 0xD9FD,      0,      0, /* 0xB0 */
-    0xBEBB,      0,      0,      0, 0xC6E0,      0, 0xD7BC, 0xDAA1, /* 0xC0 */
-         0, 0xC1B9,      0, 0xB5F2, 0xC1E8,      0,      0, 0xBCF5, /* 0xC0 */
-         0, 0xB4D5,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xC1DD,      0, 0xC4FD,      0,      0, /* 0xD0 */
-    0xBCB8, 0xB7B2,      0,      0, 0xB7EF,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xD9EC,      0, 0xC6BE,      0, 0xBFAD, /* 0xE0 */
-    0xBBCB,      0,      0, 0xB5CA,      0, 0xDBC9, 0xD0D7,      0, /* 0xF0 */
-    0xCDB9, 0xB0BC, 0xB3F6, 0xBBF7, 0xDBCA, 0xBAAF,      0, 0xD4E4  /* 0xF0 */
+         0, 	 0, 	 0, 0xD9D9, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xC8E5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xC0DC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB6F9, /* 0x30 */
+    0xD8A3, 0xD4CA, 	 0, 0xD4AA, 0xD0D6, 0xB3E4, 0xD5D7, 	 0, /* 0x40 */
+    0xCFC8, 0xB9E2, 	 0, 0xBFCB, 	 0, 0xC3E2, 	 0, 	 0, /* 0x40 */
+         0, 0xB6D2, 	 0, 	 0, 0xCDC3, 0xD9EE, 0xD9F0, 	 0, /* 0x50 */
+         0, 	 0, 0xB5B3, 	 0, 0xB6B5, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xBEA4, 	 0, 	 0, 0xC8EB, 	 0, 	 0, /* 0x60 */
+    0xC8AB, 	 0, 	 0, 0xB0CB, 0xB9AB, 0xC1F9, 0xD9E2, 	 0, /* 0x60 */
+    0xC0BC, 0xB9B2, 	 0, 0xB9D8, 0xD0CB, 0xB1F8, 0xC6E4, 0xBEDF, /* 0x70 */
+    0xB5E4, 0xD7C8, 	 0, 0xD1F8, 0xBCE6, 0xCADE, 	 0, 	 0, /* 0x70 */
+    0xBCBD, 0xD9E6, 0xD8E7, 	 0, 	 0, 0xC4DA, 	 0, 	 0, /* 0x80 */
+    0xB8D4, 0xC8BD, 	 0, 	 0, 0xB2E1, 0xD4D9, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xC3B0, 	 0, 	 0, 0xC3E1, 0xDAA2, 0xC8DF, /* 0x90 */
+         0, 0xD0B4, 	 0, 0xBEFC, 0xC5A9, 	 0, 	 0, 	 0, /* 0x90 */
+    0xB9DA, 	 0, 0xDAA3, 	 0, 0xD4A9, 0xDAA4, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xD9FB, 0xB6AC, 	 0, 	 0, 0xB7EB, /* 0xA0 */
+    0xB1F9, 0xD9FC, 0xB3E5, 0xBEF6, 	 0, 0xBFF6, 0xD2B1, 0xC0E4, /* 0xB0 */
+         0, 	 0, 	 0, 0xB6B3, 0xD9FE, 0xD9FD, 	 0, 	 0, /* 0xB0 */
+    0xBEBB, 	 0, 	 0, 	 0, 0xC6E0, 	 0, 0xD7BC, 0xDAA1, /* 0xC0 */
+         0, 0xC1B9, 	 0, 0xB5F2, 0xC1E8, 	 0, 	 0, 0xBCF5, /* 0xC0 */
+         0, 0xB4D5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xC1DD, 	 0, 0xC4FD, 	 0, 	 0, /* 0xD0 */
+    0xBCB8, 0xB7B2, 	 0, 	 0, 0xB7EF, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xD9EC, 	 0, 0xC6BE, 	 0, 0xBFAD, /* 0xE0 */
+    0xBBCB, 	 0, 	 0, 0xB5CA, 	 0, 0xDBC9, 0xD0D7, 	 0, /* 0xF0 */
+    0xCDB9, 0xB0BC, 0xB3F6, 0xBBF7, 0xDBCA, 0xBAAF, 	 0, 0xD4E4	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_52[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xB5B6, 0xB5F3, 0xD8D6, 0xC8D0,      0,      0, 0xB7D6, 0xC7D0, /* 0x00 */
-    0xD8D7,      0, 0xBFAF,      0,      0, 0xDBBB, 0xD8D8,      0, /* 0x00 */
-         0, 0xD0CC, 0xBBAE,      0,      0,      0, 0xEBBE, 0xC1D0, /* 0x10 */
-    0xC1F5, 0xD4F2, 0xB8D5, 0xB4B4,      0, 0xB3F5,      0,      0, /* 0x10 */
-    0xC9BE,      0,      0,      0, 0xC5D0,      0,      0,      0, /* 0x20 */
-    0xC5D9, 0xC0FB,      0, 0xB1F0,      0, 0xD8D9, 0xB9CE,      0, /* 0x20 */
-    0xB5BD,      0,      0, 0xD8DA,      0,      0, 0xD6C6, 0xCBA2, /* 0x30 */
-    0xC8AF, 0xC9B2, 0xB4CC, 0xBFCC,      0, 0xB9F4,      0, 0xD8DB, /* 0x30 */
-    0xD8DC, 0xB6E7, 0xBCC1, 0xCCEA,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xCFF7,      0, 0xD8DD, 0xC7B0,      0,      0, /* 0x40 */
-    0xB9D0, 0xBDA3,      0,      0, 0xCCDE,      0, 0xC6CA,      0, /* 0x50 */
-         0,      0,      0,      0, 0xD8E0,      0, 0xD8DE,      0, /* 0x50 */
-         0, 0xD8DF,      0,      0,      0, 0xB0FE,      0, 0xBEE7, /* 0x60 */
-         0, 0xCAA3, 0xBCF4,      0,      0,      0,      0, 0xB8B1, /* 0x60 */
-         0,      0, 0xB8EE,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xD8E2,      0, 0xBDCB, /* 0x70 */
-         0, 0xD8E4, 0xD8E3,      0,      0,      0,      0,      0, /* 0x80 */
-    0xC5FC,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xD8E5,      0,      0, 0xD8E6,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xC1A6,      0, 0xC8B0, 0xB0EC, 0xB9A6, /* 0x90 */
-    0xBCD3, 0xCEF1, 0xDBBD, 0xC1D3,      0,      0,      0,      0, /* 0xA0 */
-    0xB6AF, 0xD6FA, 0xC5AC, 0xBDD9, 0xDBBE, 0xDBBF,      0,      0, /* 0xA0 */
-         0, 0xC0F8, 0xBEA2, 0xC0CD,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xDBC0, 0xCAC6, /* 0xB0 */
-         0,      0,      0, 0xB2AA,      0,      0,      0, 0xD3C2, /* 0xC0 */
-         0, 0xC3E3,      0, 0xD1AB,      0,      0,      0,      0, /* 0xC0 */
-    0xDBC2,      0, 0xC0D5,      0,      0,      0, 0xDBC3,      0, /* 0xD0 */
-    0xBFB1,      0,      0,      0,      0,      0,      0, 0xC4BC, /* 0xD0 */
-         0,      0,      0,      0, 0xC7DA,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xDBC4,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xD9E8, 0xC9D7,      0,      0,      0, 0xB9B4, 0xCEF0  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xB5B6, 0xB5F3, 0xD8D6, 0xC8D0, 	 0, 	 0, 0xB7D6, 0xC7D0, /* 0x00 */
+    0xD8D7, 	 0, 0xBFAF, 	 0, 	 0, 0xDBBB, 0xD8D8, 	 0, /* 0x00 */
+         0, 0xD0CC, 0xBBAE, 	 0, 	 0, 	 0, 0xEBBE, 0xC1D0, /* 0x10 */
+    0xC1F5, 0xD4F2, 0xB8D5, 0xB4B4, 	 0, 0xB3F5, 	 0, 	 0, /* 0x10 */
+    0xC9BE, 	 0, 	 0, 	 0, 0xC5D0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xC5D9, 0xC0FB, 	 0, 0xB1F0, 	 0, 0xD8D9, 0xB9CE, 	 0, /* 0x20 */
+    0xB5BD, 	 0, 	 0, 0xD8DA, 	 0, 	 0, 0xD6C6, 0xCBA2, /* 0x30 */
+    0xC8AF, 0xC9B2, 0xB4CC, 0xBFCC, 	 0, 0xB9F4, 	 0, 0xD8DB, /* 0x30 */
+    0xD8DC, 0xB6E7, 0xBCC1, 0xCCEA, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xCFF7, 	 0, 0xD8DD, 0xC7B0, 	 0, 	 0, /* 0x40 */
+    0xB9D0, 0xBDA3, 	 0, 	 0, 0xCCDE, 	 0, 0xC6CA, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xD8E0, 	 0, 0xD8DE, 	 0, /* 0x50 */
+         0, 0xD8DF, 	 0, 	 0, 	 0, 0xB0FE, 	 0, 0xBEE7, /* 0x60 */
+         0, 0xCAA3, 0xBCF4, 	 0, 	 0, 	 0, 	 0, 0xB8B1, /* 0x60 */
+         0, 	 0, 0xB8EE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD8E2, 	 0, 0xBDCB, /* 0x70 */
+         0, 0xD8E4, 0xD8E3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xC5FC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xD8E5, 	 0, 	 0, 0xD8E6, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xC1A6, 	 0, 0xC8B0, 0xB0EC, 0xB9A6, /* 0x90 */
+    0xBCD3, 0xCEF1, 0xDBBD, 0xC1D3, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xB6AF, 0xD6FA, 0xC5AC, 0xBDD9, 0xDBBE, 0xDBBF, 	 0, 	 0, /* 0xA0 */
+         0, 0xC0F8, 0xBEA2, 0xC0CD, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDBC0, 0xCAC6, /* 0xB0 */
+         0, 	 0, 	 0, 0xB2AA, 	 0, 	 0, 	 0, 0xD3C2, /* 0xC0 */
+         0, 0xC3E3, 	 0, 0xD1AB, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xDBC2, 	 0, 0xC0D5, 	 0, 	 0, 	 0, 0xDBC3, 	 0, /* 0xD0 */
+    0xBFB1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC4BC, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xC7DA, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xDBC4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xD9E8, 0xC9D7, 	 0, 	 0, 	 0, 0xB9B4, 0xCEF0	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_53[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD4C8,      0,      0,      0,      0, 0xB0FC, 0xB4D2,      0, /* 0x00 */
-    0xD0D9,      0,      0,      0,      0, 0xD9E9,      0, 0xDECB, /* 0x00 */
-    0xD9EB,      0,      0,      0,      0, 0xD8B0, 0xBBAF, 0xB1B1, /* 0x10 */
-         0, 0xB3D7, 0xD8CE,      0,      0, 0xD4D1,      0,      0, /* 0x10 */
-    0xBDB3, 0xBFEF,      0, 0xCFBB,      0,      0, 0xD8D0,      0, /* 0x20 */
-         0,      0, 0xB7CB,      0,      0,      0, 0xD8D1,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xC6A5, 0xC7F8, 0xD2BD,      0,      0, 0xD8D2, 0xC4E4, /* 0x30 */
-         0, 0xCAAE,      0, 0xC7A7,      0, 0xD8A6,      0, 0xC9FD, /* 0x40 */
-    0xCEE7, 0xBBDC, 0xB0EB,      0,      0,      0, 0xBBAA, 0xD0AD, /* 0x40 */
-         0, 0xB1B0, 0xD7E4, 0xD7BF,      0, 0xB5A5, 0xC2F4, 0xC4CF, /* 0x50 */
-         0,      0, 0xB2A9,      0, 0xB2B7,      0, 0xB1E5, 0xDFB2, /* 0x50 */
-    0xD5BC, 0xBFA8, 0xC2AC, 0xD8D5, 0xC2B1,      0, 0xD8D4, 0xCED4, /* 0x60 */
-         0, 0xDAE0,      0, 0xCEC0,      0,      0, 0xD8B4, 0xC3AE, /* 0x60 */
-    0xD3A1, 0xCEA3,      0, 0xBCB4, 0xC8B4, 0xC2D1,      0, 0xBEED, /* 0x70 */
-    0xD0B6,      0, 0xDAE1,      0,      0,      0,      0, 0xC7E4, /* 0x70 */
-         0,      0, 0xB3A7,      0, 0xB6F2, 0xCCFC, 0xC0FA,      0, /* 0x80 */
-         0, 0xC0F7,      0, 0xD1B9, 0xD1E1, 0xD8C7,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xB2DE,      0,      0, /* 0x90 */
-    0xC0E5,      0, 0xBAF1,      0,      0, 0xD8C8,      0, 0xD4AD, /* 0x90 */
-         0,      0, 0xCFE1, 0xD8C9,      0, 0xD8CA, 0xCFC3,      0, /* 0xA0 */
-    0xB3F8, 0xBEC7,      0,      0,      0,      0, 0xD8CB,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xDBCC,      0, /* 0xB0 */
-         0,      0,      0, 0xC8A5,      0,      0,      0, 0xCFD8, /* 0xB0 */
-         0, 0xC8FE, 0xB2CE,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xD3D6, 0xB2E6, 0xBCB0, 0xD3D1, 0xCBAB, 0xB7B4,      0,      0, /* 0xC0 */
-         0, 0xB7A2,      0,      0, 0xCAE5,      0, 0xC8A1, 0xCADC, /* 0xD0 */
-    0xB1E4, 0xD0F0,      0, 0xC5D1,      0,      0,      0, 0xDBC5, /* 0xD0 */
-    0xB5FE,      0,      0, 0xBFDA, 0xB9C5, 0xBEE4, 0xC1ED,      0, /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD4C8, 	 0, 	 0, 	 0, 	 0, 0xB0FC, 0xB4D2, 	 0, /* 0x00 */
+    0xD0D9, 	 0, 	 0, 	 0, 	 0, 0xD9E9, 	 0, 0xDECB, /* 0x00 */
+    0xD9EB, 	 0, 	 0, 	 0, 	 0, 0xD8B0, 0xBBAF, 0xB1B1, /* 0x10 */
+         0, 0xB3D7, 0xD8CE, 	 0, 	 0, 0xD4D1, 	 0, 	 0, /* 0x10 */
+    0xBDB3, 0xBFEF, 	 0, 0xCFBB, 	 0, 	 0, 0xD8D0, 	 0, /* 0x20 */
+         0, 	 0, 0xB7CB, 	 0, 	 0, 	 0, 0xD8D1, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xC6A5, 0xC7F8, 0xD2BD, 	 0, 	 0, 0xD8D2, 0xC4E4, /* 0x30 */
+         0, 0xCAAE, 	 0, 0xC7A7, 	 0, 0xD8A6, 	 0, 0xC9FD, /* 0x40 */
+    0xCEE7, 0xBBDC, 0xB0EB, 	 0, 	 0, 	 0, 0xBBAA, 0xD0AD, /* 0x40 */
+         0, 0xB1B0, 0xD7E4, 0xD7BF, 	 0, 0xB5A5, 0xC2F4, 0xC4CF, /* 0x50 */
+         0, 	 0, 0xB2A9, 	 0, 0xB2B7, 	 0, 0xB1E5, 0xDFB2, /* 0x50 */
+    0xD5BC, 0xBFA8, 0xC2AC, 0xD8D5, 0xC2B1, 	 0, 0xD8D4, 0xCED4, /* 0x60 */
+         0, 0xDAE0, 	 0, 0xCEC0, 	 0, 	 0, 0xD8B4, 0xC3AE, /* 0x60 */
+    0xD3A1, 0xCEA3, 	 0, 0xBCB4, 0xC8B4, 0xC2D1, 	 0, 0xBEED, /* 0x70 */
+    0xD0B6, 	 0, 0xDAE1, 	 0, 	 0, 	 0, 	 0, 0xC7E4, /* 0x70 */
+         0, 	 0, 0xB3A7, 	 0, 0xB6F2, 0xCCFC, 0xC0FA, 	 0, /* 0x80 */
+         0, 0xC0F7, 	 0, 0xD1B9, 0xD1E1, 0xD8C7, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB2DE, 	 0, 	 0, /* 0x90 */
+    0xC0E5, 	 0, 0xBAF1, 	 0, 	 0, 0xD8C8, 	 0, 0xD4AD, /* 0x90 */
+         0, 	 0, 0xCFE1, 0xD8C9, 	 0, 0xD8CA, 0xCFC3, 	 0, /* 0xA0 */
+    0xB3F8, 0xBEC7, 	 0, 	 0, 	 0, 	 0, 0xD8CB, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDBCC, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xC8A5, 	 0, 	 0, 	 0, 0xCFD8, /* 0xB0 */
+         0, 0xC8FE, 0xB2CE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xD3D6, 0xB2E6, 0xBCB0, 0xD3D1, 0xCBAB, 0xB7B4, 	 0, 	 0, /* 0xC0 */
+         0, 0xB7A2, 	 0, 	 0, 0xCAE5, 	 0, 0xC8A1, 0xCADC, /* 0xD0 */
+    0xB1E4, 0xD0F0, 	 0, 0xC5D1, 	 0, 	 0, 	 0, 0xDBC5, /* 0xD0 */
+    0xB5FE, 	 0, 	 0, 0xBFDA, 0xB9C5, 0xBEE4, 0xC1ED, 	 0, /* 0xE0 */
     0xDFB6, 0xDFB5, 0xD6BB, 0xBDD0, 0xD5D9, 0xB0C8, 0xB6A3, 0xBFC9, /* 0xE0 */
-    0xCCA8, 0xDFB3, 0xCAB7, 0xD3D2,      0, 0xD8CF, 0xD2B6, 0xBAC5, /* 0xF0 */
-    0xCBBE, 0xCCBE,      0, 0xDFB7, 0xB5F0, 0xDFB4                  /* 0xF0 */
+    0xCCA8, 0xDFB3, 0xCAB7, 0xD3D2, 	 0, 0xD8CF, 0xD2B6, 0xBAC5, /* 0xF0 */
+    0xCBBE, 0xCCBE, 	 0, 0xDFB7, 0xB5F0, 0xDFB4					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_54[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xD3F5,      0, 0xB3D4, 0xB8F7,      0, 0xDFBA,      0, /* 0x00 */
-    0xBACF, 0xBCAA, 0xB5F5,      0, 0xCDAC, 0xC3FB, 0xBAF3, 0xC0F4, /* 0x00 */
-    0xCDC2, 0xCFF2, 0xDFB8, 0xCFC5,      0, 0xC2C0, 0xDFB9, 0xC2F0, /* 0x10 */
-         0,      0,      0, 0xBEFD,      0, 0xC1DF, 0xCDCC, 0xD2F7, /* 0x10 */
-    0xB7CD, 0xDFC1,      0, 0xDFC4,      0,      0, 0xB7F1, 0xB0C9, /* 0x20 */
-    0xB6D6, 0xB7D4,      0, 0xBAAC, 0xCCFD, 0xBFD4, 0xCBB1, 0xC6F4, /* 0x20 */
-         0, 0xD6A8, 0xDFC5,      0, 0xCEE2, 0xB3B3,      0,      0, /* 0x30 */
-    0xCEFC, 0xB4B5,      0, 0xCEC7, 0xBAF0,      0, 0xCEE1,      0, /* 0x30 */
-    0xD1BD,      0,      0, 0xDFC0,      0,      0, 0xB4F4,      0, /* 0x40 */
-    0xB3CA,      0, 0xB8E6, 0xDFBB,      0,      0,      0,      0, /* 0x40 */
-    0xC4C5,      0, 0xDFBC, 0xDFBD, 0xDFBE, 0xC5BB, 0xDFBF, 0xDFC2, /* 0x50 */
-    0xD4B1, 0xDFC3,      0, 0xC7BA, 0xCED8,      0,      0,      0, /* 0x50 */
-         0,      0, 0xC4D8,      0, 0xDFCA,      0, 0xDFCF,      0, /* 0x60 */
-    0xD6DC,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xDFC9, 0xDFDA, 0xCEB6,      0, 0xBAC7, 0xDFCE, 0xDFC8, /* 0x70 */
-    0xC5DE,      0,      0, 0xC9EB, 0xBAF4, 0xC3FC,      0,      0, /* 0x70 */
-    0xBED7,      0, 0xDFC6,      0, 0xDFCD,      0, 0xC5D8,      0, /* 0x80 */
-         0,      0,      0, 0xD5A6, 0xBACD,      0, 0xBECC, 0xD3BD, /* 0x80 */
-    0xB8C0,      0, 0xD6E4,      0, 0xDFC7, 0xB9BE, 0xBFA7,      0, /* 0x90 */
-         0, 0xC1FC, 0xDFCB, 0xDFCC,      0, 0xDFD0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xDFDB, 0xDFE5,      0, 0xDFD7, 0xDFD6, /* 0xA0 */
-    0xD7C9, 0xDFE3, 0xDFE4, 0xE5EB, 0xD2A7, 0xDFD2,      0, 0xBFA9, /* 0xA0 */
-         0, 0xD4DB,      0, 0xBFC8, 0xDFD4,      0,      0,      0, /* 0xB0 */
-    0xCFCC,      0,      0, 0xDFDD,      0, 0xD1CA,      0, 0xDFDE, /* 0xB0 */
-    0xB0A7, 0xC6B7, 0xDFD3,      0, 0xBAE5,      0, 0xB6DF, 0xCDDB, /* 0xC0 */
-    0xB9FE, 0xD4D5,      0,      0, 0xDFDF, 0xCFEC, 0xB0A5, 0xDFE7, /* 0xC0 */
-    0xDFD1, 0xD1C6, 0xDFD5, 0xDFD8, 0xDFD9, 0xDFDC,      0, 0xBBA9, /* 0xD0 */
-         0, 0xDFE0, 0xDFE1,      0, 0xDFE2, 0xDFE6, 0xDFE8, 0xD3B4, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xB8E7, 0xC5B6, 0xDFEA, /* 0xE0 */
-    0xC9DA, 0xC1A8, 0xC4C4,      0,      0, 0xBFDE, 0xCFF8,      0, /* 0xE0 */
-         0,      0, 0xD5DC, 0xDFEE,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xB2B8,      0, 0xBADF, 0xDFEC,      0, 0xDBC1  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xD3F5, 	 0, 0xB3D4, 0xB8F7, 	 0, 0xDFBA, 	 0, /* 0x00 */
+    0xBACF, 0xBCAA, 0xB5F5, 	 0, 0xCDAC, 0xC3FB, 0xBAF3, 0xC0F4, /* 0x00 */
+    0xCDC2, 0xCFF2, 0xDFB8, 0xCFC5, 	 0, 0xC2C0, 0xDFB9, 0xC2F0, /* 0x10 */
+         0, 	 0, 	 0, 0xBEFD, 	 0, 0xC1DF, 0xCDCC, 0xD2F7, /* 0x10 */
+    0xB7CD, 0xDFC1, 	 0, 0xDFC4, 	 0, 	 0, 0xB7F1, 0xB0C9, /* 0x20 */
+    0xB6D6, 0xB7D4, 	 0, 0xBAAC, 0xCCFD, 0xBFD4, 0xCBB1, 0xC6F4, /* 0x20 */
+         0, 0xD6A8, 0xDFC5, 	 0, 0xCEE2, 0xB3B3, 	 0, 	 0, /* 0x30 */
+    0xCEFC, 0xB4B5, 	 0, 0xCEC7, 0xBAF0, 	 0, 0xCEE1, 	 0, /* 0x30 */
+    0xD1BD, 	 0, 	 0, 0xDFC0, 	 0, 	 0, 0xB4F4, 	 0, /* 0x40 */
+    0xB3CA, 	 0, 0xB8E6, 0xDFBB, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xC4C5, 	 0, 0xDFBC, 0xDFBD, 0xDFBE, 0xC5BB, 0xDFBF, 0xDFC2, /* 0x50 */
+    0xD4B1, 0xDFC3, 	 0, 0xC7BA, 0xCED8, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xC4D8, 	 0, 0xDFCA, 	 0, 0xDFCF, 	 0, /* 0x60 */
+    0xD6DC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xDFC9, 0xDFDA, 0xCEB6, 	 0, 0xBAC7, 0xDFCE, 0xDFC8, /* 0x70 */
+    0xC5DE, 	 0, 	 0, 0xC9EB, 0xBAF4, 0xC3FC, 	 0, 	 0, /* 0x70 */
+    0xBED7, 	 0, 0xDFC6, 	 0, 0xDFCD, 	 0, 0xC5D8, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xD5A6, 0xBACD, 	 0, 0xBECC, 0xD3BD, /* 0x80 */
+    0xB8C0, 	 0, 0xD6E4, 	 0, 0xDFC7, 0xB9BE, 0xBFA7, 	 0, /* 0x90 */
+         0, 0xC1FC, 0xDFCB, 0xDFCC, 	 0, 0xDFD0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xDFDB, 0xDFE5, 	 0, 0xDFD7, 0xDFD6, /* 0xA0 */
+    0xD7C9, 0xDFE3, 0xDFE4, 0xE5EB, 0xD2A7, 0xDFD2, 	 0, 0xBFA9, /* 0xA0 */
+         0, 0xD4DB, 	 0, 0xBFC8, 0xDFD4, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xCFCC, 	 0, 	 0, 0xDFDD, 	 0, 0xD1CA, 	 0, 0xDFDE, /* 0xB0 */
+    0xB0A7, 0xC6B7, 0xDFD3, 	 0, 0xBAE5, 	 0, 0xB6DF, 0xCDDB, /* 0xC0 */
+    0xB9FE, 0xD4D5, 	 0, 	 0, 0xDFDF, 0xCFEC, 0xB0A5, 0xDFE7, /* 0xC0 */
+    0xDFD1, 0xD1C6, 0xDFD5, 0xDFD8, 0xDFD9, 0xDFDC, 	 0, 0xBBA9, /* 0xD0 */
+         0, 0xDFE0, 0xDFE1, 	 0, 0xDFE2, 0xDFE6, 0xDFE8, 0xD3B4, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB8E7, 0xC5B6, 0xDFEA, /* 0xE0 */
+    0xC9DA, 0xC1A8, 0xC4C4, 	 0, 	 0, 0xBFDE, 0xCFF8, 	 0, /* 0xE0 */
+         0, 	 0, 0xD5DC, 0xDFEE, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xB2B8, 	 0, 0xBADF, 0xDFEC, 	 0, 0xDBC1	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_55[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xD1E4,      0,      0,      0,      0, 0xCBF4, 0xB4BD, /* 0x00 */
-         0, 0xB0A6,      0,      0,      0,      0,      0, 0xDFF1, /* 0x00 */
-    0xCCC6, 0xDFF2,      0,      0, 0xDFED,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xDFE9,      0,      0,      0,      0, /* 0x10 */
-    0xDFEB,      0, 0xDFEF, 0xDFF0, 0xBBBD,      0,      0, 0xDFF3, /* 0x20 */
-         0,      0, 0xDFF4,      0, 0xBBA3,      0, 0xCADB, 0xCEA8, /* 0x20 */
-    0xE0A7, 0xB3AA,      0, 0xE0A6,      0,      0,      0, 0xE0A1, /* 0x30 */
-         0,      0,      0,      0, 0xDFFE,      0, 0xCDD9, 0xDFFC, /* 0x30 */
-         0, 0xDFFA,      0, 0xBFD0, 0xD7C4,      0, 0xC9CC,      0, /* 0x40 */
-         0, 0xDFF8, 0xB0A1,      0,      0,      0,      0,      0, /* 0x40 */
-    0xDFFD,      0,      0,      0,      0, 0xDFFB, 0xE0A2,      0, /* 0x50 */
-         0,      0,      0,      0, 0xE0A8,      0,      0,      0, /* 0x50 */
-         0, 0xB7C8,      0,      0, 0xC6A1, 0xC9B6, 0xC0B2, 0xDFF5, /* 0x60 */
-         0,      0, 0xC5BE,      0, 0xD8C4, 0xDFF9, 0xC4F6,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xE0A3, 0xE0A4, 0xE0A5, /* 0x70 */
-    0xD0A5,      0,      0, 0xE0B4, 0xCCE4,      0, 0xE0B1,      0, /* 0x70 */
-    0xBFA6, 0xE0AF, 0xCEB9, 0xE0AB, 0xC9C6,      0,      0, 0xC0AE, /* 0x80 */
-    0xE0AE, 0xBAED, 0xBAB0, 0xE0A9,      0,      0,      0, 0xDFF6, /* 0x80 */
-         0, 0xE0B3,      0,      0, 0xE0B8,      0,      0,      0, /* 0x90 */
-    0xB4AD, 0xE0B9,      0,      0, 0xCFB2, 0xBAC8,      0, 0xE0B0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xD0FA, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xE0AC,      0, 0xD4FB,      0, 0xDFF7,      0, 0xC5E7, /* 0xB0 */
-         0, 0xE0AD,      0, 0xD3F7,      0, 0xE0B6, 0xE0B7,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xE0C4, 0xD0E1,      0,      0, /* 0xC0 */
-         0, 0xE0BC,      0,      0, 0xE0C9, 0xE0CA,      0,      0, /* 0xC0 */
-         0, 0xE0BE, 0xE0AA, 0xC9A4, 0xE0C1,      0, 0xE0B2,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xCAC8, 0xE0C3,      0, 0xE0B5, /* 0xD0 */
-         0, 0xCECB,      0, 0xCBC3, 0xE0CD, 0xE0C6, 0xE0C2,      0, /* 0xE0 */
-    0xE0CB,      0, 0xE0BA, 0xE0BF, 0xE0C0,      0,      0, 0xE0C5, /* 0xE0 */
-         0,      0, 0xE0C7, 0xE0C8,      0, 0xE0CC,      0, 0xE0BB, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xCBD4, 0xE0D5          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xD1E4, 	 0, 	 0, 	 0, 	 0, 0xCBF4, 0xB4BD, /* 0x00 */
+         0, 0xB0A6, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDFF1, /* 0x00 */
+    0xCCC6, 0xDFF2, 	 0, 	 0, 0xDFED, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xDFE9, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xDFEB, 	 0, 0xDFEF, 0xDFF0, 0xBBBD, 	 0, 	 0, 0xDFF3, /* 0x20 */
+         0, 	 0, 0xDFF4, 	 0, 0xBBA3, 	 0, 0xCADB, 0xCEA8, /* 0x20 */
+    0xE0A7, 0xB3AA, 	 0, 0xE0A6, 	 0, 	 0, 	 0, 0xE0A1, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xDFFE, 	 0, 0xCDD9, 0xDFFC, /* 0x30 */
+         0, 0xDFFA, 	 0, 0xBFD0, 0xD7C4, 	 0, 0xC9CC, 	 0, /* 0x40 */
+         0, 0xDFF8, 0xB0A1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xDFFD, 	 0, 	 0, 	 0, 	 0, 0xDFFB, 0xE0A2, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xE0A8, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xB7C8, 	 0, 	 0, 0xC6A1, 0xC9B6, 0xC0B2, 0xDFF5, /* 0x60 */
+         0, 	 0, 0xC5BE, 	 0, 0xD8C4, 0xDFF9, 0xC4F6, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE0A3, 0xE0A4, 0xE0A5, /* 0x70 */
+    0xD0A5, 	 0, 	 0, 0xE0B4, 0xCCE4, 	 0, 0xE0B1, 	 0, /* 0x70 */
+    0xBFA6, 0xE0AF, 0xCEB9, 0xE0AB, 0xC9C6, 	 0, 	 0, 0xC0AE, /* 0x80 */
+    0xE0AE, 0xBAED, 0xBAB0, 0xE0A9, 	 0, 	 0, 	 0, 0xDFF6, /* 0x80 */
+         0, 0xE0B3, 	 0, 	 0, 0xE0B8, 	 0, 	 0, 	 0, /* 0x90 */
+    0xB4AD, 0xE0B9, 	 0, 	 0, 0xCFB2, 0xBAC8, 	 0, 0xE0B0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD0FA, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xE0AC, 	 0, 0xD4FB, 	 0, 0xDFF7, 	 0, 0xC5E7, /* 0xB0 */
+         0, 0xE0AD, 	 0, 0xD3F7, 	 0, 0xE0B6, 0xE0B7, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xE0C4, 0xD0E1, 	 0, 	 0, /* 0xC0 */
+         0, 0xE0BC, 	 0, 	 0, 0xE0C9, 0xE0CA, 	 0, 	 0, /* 0xC0 */
+         0, 0xE0BE, 0xE0AA, 0xC9A4, 0xE0C1, 	 0, 0xE0B2, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xCAC8, 0xE0C3, 	 0, 0xE0B5, /* 0xD0 */
+         0, 0xCECB, 	 0, 0xCBC3, 0xE0CD, 0xE0C6, 0xE0C2, 	 0, /* 0xE0 */
+    0xE0CB, 	 0, 0xE0BA, 0xE0BF, 0xE0C0, 	 0, 	 0, 0xE0C5, /* 0xE0 */
+         0, 	 0, 0xE0C7, 0xE0C8, 	 0, 0xE0CC, 	 0, 0xE0BB, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCBD4, 0xE0D5			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_56[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE0D6, 0xE0D2,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0xE0D0, 0xBCCE,      0,      0, 0xE0D1,      0, 0xB8C2, 0xD8C5, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xD0EA,      0,      0, 0xC2EF,      0,      0, 0xE0CF, 0xE0BD, /* 0x10 */
-         0,      0,      0, 0xE0D4, 0xE0D3,      0,      0, 0xE0D7, /* 0x20 */
-         0,      0,      0,      0, 0xE0DC, 0xE0D8,      0,      0, /* 0x20 */
-         0, 0xD6F6, 0xB3B0,      0, 0xD7EC,      0, 0xCBBB,      0, /* 0x30 */
-         0, 0xE0DA,      0, 0xCEFB,      0,      0,      0, 0xBAD9, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xE0E1, 0xE0DD, 0xD2AD,      0, /* 0x40 */
-         0,      0,      0,      0, 0xE0E2,      0,      0, 0xE0DB, /* 0x50 */
-    0xE0D9, 0xE0DF,      0,      0, 0xE0E0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xE0DE,      0, 0xE0E4,      0,      0,      0, /* 0x60 */
-    0xC6F7, 0xD8AC, 0xD4EB, 0xE0E6, 0xCAC9,      0,      0,      0, /* 0x60 */
-         0, 0xE0E5,      0,      0,      0,      0, 0xB8C1,      0, /* 0x70 */
-         0,      0,      0, 0xE0E7, 0xE0E8,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xE0E9, 0xE0E3,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xBABF, 0xCCE7, /* 0x80 */
-         0,      0,      0, 0xE0EA,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xCFF9,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE0EB, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0xC8C2, /* 0xB0 */
-         0,      0,      0,      0, 0xBDC0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xC4D2,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xE0EC,      0,      0, 0xE0ED, /* 0xD0 */
-         0,      0, 0xC7F4, 0xCBC4,      0, 0xE0EE, 0xBBD8, 0xD8B6, /* 0xD0 */
-    0xD2F2, 0xE0EF, 0xCDC5,      0, 0xB6DA,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xE0F1,      0, 0xD4B0,      0,      0, /* 0xE0 */
-    0xC0A7, 0xB4D1,      0,      0, 0xCEA7, 0xE0F0,      0,      0, /* 0xF0 */
-         0, 0xE0F2, 0xB9CC,      0,      0, 0xB9FA, 0xCDBC, 0xE0F3  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE0D6, 0xE0D2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xE0D0, 0xBCCE, 	 0, 	 0, 0xE0D1, 	 0, 0xB8C2, 0xD8C5, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xD0EA, 	 0, 	 0, 0xC2EF, 	 0, 	 0, 0xE0CF, 0xE0BD, /* 0x10 */
+         0, 	 0, 	 0, 0xE0D4, 0xE0D3, 	 0, 	 0, 0xE0D7, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xE0DC, 0xE0D8, 	 0, 	 0, /* 0x20 */
+         0, 0xD6F6, 0xB3B0, 	 0, 0xD7EC, 	 0, 0xCBBB, 	 0, /* 0x30 */
+         0, 0xE0DA, 	 0, 0xCEFB, 	 0, 	 0, 	 0, 0xBAD9, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xE0E1, 0xE0DD, 0xD2AD, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xE0E2, 	 0, 	 0, 0xE0DB, /* 0x50 */
+    0xE0D9, 0xE0DF, 	 0, 	 0, 0xE0E0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xE0DE, 	 0, 0xE0E4, 	 0, 	 0, 	 0, /* 0x60 */
+    0xC6F7, 0xD8AC, 0xD4EB, 0xE0E6, 0xCAC9, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xE0E5, 	 0, 	 0, 	 0, 	 0, 0xB8C1, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0xE0E7, 0xE0E8, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE0E9, 0xE0E3, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBABF, 0xCCE7, /* 0x80 */
+         0, 	 0, 	 0, 0xE0EA, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xCFF9, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE0EB, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC8C2, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xBDC0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xC4D2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xE0EC, 	 0, 	 0, 0xE0ED, /* 0xD0 */
+         0, 	 0, 0xC7F4, 0xCBC4, 	 0, 0xE0EE, 0xBBD8, 0xD8B6, /* 0xD0 */
+    0xD2F2, 0xE0EF, 0xCDC5, 	 0, 0xB6DA, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xE0F1, 	 0, 0xD4B0, 	 0, 	 0, /* 0xE0 */
+    0xC0A7, 0xB4D1, 	 0, 	 0, 0xCEA7, 0xE0F0, 	 0, 	 0, /* 0xF0 */
+         0, 0xE0F2, 0xB9CC, 	 0, 	 0, 0xB9FA, 0xCDBC, 0xE0F3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_57[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xC6D4, 0xE0F4,      0, 0xD4B2,      0, /* 0x00 */
-    0xC8A6, 0xE0F6, 0xE0F5,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0xE0F7,      0,      0, 0xCDC1, /* 0x10 */
-         0,      0,      0, 0xCAA5,      0,      0,      0,      0, /* 0x20 */
-    0xD4DA, 0xDBD7, 0xDBD9,      0, 0xDBD8, 0xB9E7, 0xDBDC, 0xDBDD, /* 0x20 */
-    0xB5D8,      0,      0, 0xDBDA,      0,      0,      0,      0, /* 0x30 */
-         0, 0xDBDB, 0xB3A1, 0xDBDF,      0,      0, 0xBBF8,      0, /* 0x30 */
-    0xD6B7,      0, 0xDBE0,      0,      0,      0,      0, 0xBEF9, /* 0x40 */
-         0,      0, 0xB7BB,      0, 0xDBD0, 0xCCAE, 0xBFB2, 0xBBB5, /* 0x40 */
-    0xD7F8, 0xBFD3,      0,      0,      0,      0,      0, 0xBFE9, /* 0x50 */
-         0,      0, 0xBCE1, 0xCCB3, 0xDBDE, 0xB0D3, 0xCEEB, 0xB7D8, /* 0x50 */
-    0xD7B9, 0xC6C2,      0,      0, 0xC0A4,      0, 0xCCB9,      0, /* 0x60 */
-    0xDBE7, 0xDBE1, 0xC6BA, 0xDBE3,      0, 0xDBE8,      0, 0xC5F7, /* 0x60 */
-         0,      0,      0, 0xDBEA,      0,      0, 0xDBE9, 0xBFC0, /* 0x70 */
-         0,      0,      0, 0xDBE6, 0xDBE5,      0,      0,      0, /* 0x70 */
-         0,      0, 0xB4B9, 0xC0AC, 0xC2A2, 0xDBE2, 0xDBE4,      0, /* 0x80 */
-         0,      0,      0, 0xD0CD, 0xDBED,      0,      0,      0, /* 0x80 */
-         0,      0, 0xC0DD, 0xDBF2,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xB6E2,      0,      0,      0,      0, /* 0x90 */
-    0xDBF3, 0xDBD2, 0xB9B8, 0xD4AB, 0xDBEC,      0, 0xBFD1, 0xDBF0, /* 0xA0 */
-         0, 0xDBD1,      0, 0xB5E6,      0, 0xDBEB, 0xBFE5,      0, /* 0xA0 */
-         0,      0, 0xDBEE,      0, 0xDBF1,      0,      0,      0, /* 0xB0 */
-    0xDBF9,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xB9A1, 0xB0A3,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xC2F1,      0,      0, 0xB3C7, 0xDBEF, /* 0xC0 */
-         0,      0, 0xDBF8,      0, 0xC6D2, 0xDBF4,      0,      0, /* 0xD0 */
-    0xDBF5, 0xDBF7, 0xDBF6,      0,      0, 0xDBFE,      0, 0xD3F2, /* 0xD0 */
-    0xB2BA,      0,      0,      0, 0xDBFD,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xDCA4,      0, 0xDBFB, /* 0xE0 */
-         0,      0,      0,      0, 0xDBFA,      0,      0,      0, /* 0xF0 */
-    0xDBFC, 0xC5E0, 0xBBF9,      0,      0, 0xDCA3                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xC6D4, 0xE0F4, 	 0, 0xD4B2, 	 0, /* 0x00 */
+    0xC8A6, 0xE0F6, 0xE0F5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xE0F7, 	 0, 	 0, 0xCDC1, /* 0x10 */
+         0, 	 0, 	 0, 0xCAA5, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xD4DA, 0xDBD7, 0xDBD9, 	 0, 0xDBD8, 0xB9E7, 0xDBDC, 0xDBDD, /* 0x20 */
+    0xB5D8, 	 0, 	 0, 0xDBDA, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xDBDB, 0xB3A1, 0xDBDF, 	 0, 	 0, 0xBBF8, 	 0, /* 0x30 */
+    0xD6B7, 	 0, 0xDBE0, 	 0, 	 0, 	 0, 	 0, 0xBEF9, /* 0x40 */
+         0, 	 0, 0xB7BB, 	 0, 0xDBD0, 0xCCAE, 0xBFB2, 0xBBB5, /* 0x40 */
+    0xD7F8, 0xBFD3, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBFE9, /* 0x50 */
+         0, 	 0, 0xBCE1, 0xCCB3, 0xDBDE, 0xB0D3, 0xCEEB, 0xB7D8, /* 0x50 */
+    0xD7B9, 0xC6C2, 	 0, 	 0, 0xC0A4, 	 0, 0xCCB9, 	 0, /* 0x60 */
+    0xDBE7, 0xDBE1, 0xC6BA, 0xDBE3, 	 0, 0xDBE8, 	 0, 0xC5F7, /* 0x60 */
+         0, 	 0, 	 0, 0xDBEA, 	 0, 	 0, 0xDBE9, 0xBFC0, /* 0x70 */
+         0, 	 0, 	 0, 0xDBE6, 0xDBE5, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xB4B9, 0xC0AC, 0xC2A2, 0xDBE2, 0xDBE4, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xD0CD, 0xDBED, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xC0DD, 0xDBF2, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xB6E2, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xDBF3, 0xDBD2, 0xB9B8, 0xD4AB, 0xDBEC, 	 0, 0xBFD1, 0xDBF0, /* 0xA0 */
+         0, 0xDBD1, 	 0, 0xB5E6, 	 0, 0xDBEB, 0xBFE5, 	 0, /* 0xA0 */
+         0, 	 0, 0xDBEE, 	 0, 0xDBF1, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xDBF9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xB9A1, 0xB0A3, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xC2F1, 	 0, 	 0, 0xB3C7, 0xDBEF, /* 0xC0 */
+         0, 	 0, 0xDBF8, 	 0, 0xC6D2, 0xDBF4, 	 0, 	 0, /* 0xD0 */
+    0xDBF5, 0xDBF7, 0xDBF6, 	 0, 	 0, 0xDBFE, 	 0, 0xD3F2, /* 0xD0 */
+    0xB2BA, 	 0, 	 0, 	 0, 0xDBFD, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDCA4, 	 0, 0xDBFB, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xDBFA, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xDBFC, 0xC5E0, 0xBBF9, 	 0, 	 0, 0xDCA3					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_58[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xDCA5,      0, 0xCCC3,      0,      0,      0, 0xB6D1, 0xDDC0, /* 0x00 */
-         0,      0,      0, 0xDCA1,      0, 0xDCA2,      0,      0, /* 0x00 */
-         0, 0xC7B5,      0,      0,      0, 0xB6E9,      0,      0, /* 0x10 */
-         0, 0xDCA7,      0,      0,      0,      0, 0xDCA6,      0, /* 0x10 */
-    0xDCA9, 0xB1A4,      0,      0, 0xB5CC,      0,      0,      0, /* 0x20 */
-         0,      0, 0xBFB0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xD1DF,      0,      0,      0,      0, 0xB6C2,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xDCA8,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xCBFA, 0xEBF3,      0,      0, /* 0x40 */
-         0, 0xCBDC,      0,      0, 0xCBFE,      0,      0,      0, /* 0x50 */
-    0xCCC1,      0,      0,      0,      0,      0, 0xC8FB,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xDCAA,      0,      0, /* 0x60 */
-         0,      0,      0, 0xCCEE, 0xDCAB,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xDBD3,      0, /* 0x70 */
-    0xDCAF, 0xDCAC,      0, 0xBEB3,      0, 0xCAFB,      0,      0, /* 0x80 */
-         0, 0xDCAD,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xC9CA, 0xC4B9,      0,      0,      0,      0, /* 0x90 */
-         0, 0xC7BD, 0xDCAE,      0,      0,      0, 0xD4F6, 0xD0E6, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xC4AB, 0xB6D5,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xDBD4,      0,      0,      0, /* 0xB0 */
-         0, 0xB1DA,      0,      0,      0, 0xDBD5,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xDBD6,      0,      0,      0, 0xBABE,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xC8C0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xCABF, 0xC8C9,      0, 0xD7B3,      0, /* 0xE0 */
-    0xC9F9,      0,      0, 0xBFC7,      0,      0, 0xBAF8,      0, /* 0xF0 */
-         0, 0xD2BC                                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xDCA5, 	 0, 0xCCC3, 	 0, 	 0, 	 0, 0xB6D1, 0xDDC0, /* 0x00 */
+         0, 	 0, 	 0, 0xDCA1, 	 0, 0xDCA2, 	 0, 	 0, /* 0x00 */
+         0, 0xC7B5, 	 0, 	 0, 	 0, 0xB6E9, 	 0, 	 0, /* 0x10 */
+         0, 0xDCA7, 	 0, 	 0, 	 0, 	 0, 0xDCA6, 	 0, /* 0x10 */
+    0xDCA9, 0xB1A4, 	 0, 	 0, 0xB5CC, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xBFB0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xD1DF, 	 0, 	 0, 	 0, 	 0, 0xB6C2, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xDCA8, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xCBFA, 0xEBF3, 	 0, 	 0, /* 0x40 */
+         0, 0xCBDC, 	 0, 	 0, 0xCBFE, 	 0, 	 0, 	 0, /* 0x50 */
+    0xCCC1, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC8FB, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDCAA, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xCCEE, 0xDCAB, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDBD3, 	 0, /* 0x70 */
+    0xDCAF, 0xDCAC, 	 0, 0xBEB3, 	 0, 0xCAFB, 	 0, 	 0, /* 0x80 */
+         0, 0xDCAD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xC9CA, 0xC4B9, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xC7BD, 0xDCAE, 	 0, 	 0, 	 0, 0xD4F6, 0xD0E6, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xC4AB, 0xB6D5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xDBD4, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xB1DA, 	 0, 	 0, 	 0, 0xDBD5, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xDBD6, 	 0, 	 0, 	 0, 0xBABE, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xC8C0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xCABF, 0xC8C9, 	 0, 0xD7B3, 	 0, /* 0xE0 */
+    0xC9F9, 	 0, 	 0, 0xBFC7, 	 0, 	 0, 0xBAF8, 	 0, /* 0xF0 */
+         0, 0xD2BC													/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_59[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xE2BA,      0, 0xB4A6,      0,      0, 0xB1B8, /* 0x00 */
-         0,      0,      0,      0,      0, 0xB8B4,      0, 0xCFC4, /* 0x00 */
-         0,      0,      0,      0, 0xD9E7, 0xCFA6, 0xCDE2,      0, /* 0x10 */
-         0, 0xD9ED, 0xB6E0,      0, 0xD2B9,      0,      0, 0xB9BB, /* 0x10 */
-         0,      0,      0,      0, 0xE2B9, 0xE2B7,      0, 0xB4F3, /* 0x20 */
-         0, 0xCCEC, 0xCCAB, 0xB7F2,      0, 0xD8B2, 0xD1EB, 0xBABB, /* 0x20 */
-         0, 0xCAA7,      0,      0, 0xCDB7,      0,      0, 0xD2C4, /* 0x30 */
-    0xBFE4, 0xBCD0, 0xB6E1,      0, 0xDEC5,      0,      0,      0, /* 0x30 */
-         0, 0xDEC6, 0xDBBC,      0, 0xD1D9,      0,      0, 0xC6E6, /* 0x40 */
-    0xC4CE, 0xB7EE,      0, 0xB7DC,      0,      0, 0xBFFC, 0xD7E0, /* 0x40 */
-         0, 0xC6F5,      0,      0, 0xB1BC, 0xDEC8, 0xBDB1, 0xCCD7, /* 0x50 */
-    0xDECA,      0, 0xDEC9,      0,      0,      0,      0,      0, /* 0x50 */
-    0xB5EC,      0, 0xC9DD,      0,      0, 0xB0C2,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xC5AE, 0xC5AB,      0, 0xC4CC,      0, /* 0x70 */
-    0xBCE9, 0xCBFD,      0,      0,      0, 0xBAC3,      0,      0, /* 0x70 */
-         0, 0xE5F9, 0xC8E7, 0xE5FA, 0xCDFD,      0, 0xD7B1, 0xB8BE, /* 0x80 */
-    0xC2E8,      0, 0xC8D1,      0,      0, 0xE5FB,      0,      0, /* 0x80 */
-         0,      0, 0xB6CA, 0xBCCB,      0,      0, 0xD1FD, 0xE6A1, /* 0x90 */
-         0, 0xC3EE,      0,      0,      0,      0, 0xE6A4,      0, /* 0x90 */
-         0,      0,      0, 0xE5FE, 0xE6A5, 0xCDD7,      0,      0, /* 0xA0 */
-    0xB7C1, 0xE5FC, 0xE5FD, 0xE6A3,      0,      0, 0xC4DD, 0xE6A8, /* 0xA0 */
-         0,      0, 0xE6A7,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xC3C3,      0, 0xC6DE,      0,      0, 0xE6AA,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xC4B7,      0, /* 0xC0 */
-         0,      0, 0xE6A2, 0xCABC,      0,      0,      0,      0, /* 0xC0 */
-    0xBDE3, 0xB9C3, 0xE6A6, 0xD0D5, 0xCEAF,      0,      0, 0xE6A9, /* 0xD0 */
-    0xE6B0,      0, 0xD2A6,      0, 0xBDAA, 0xE6AD,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xE6AF,      0, 0xC0D1,      0,      0, /* 0xE0 */
-    0xD2CC,      0,      0,      0, 0xBCA7,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xE6B1,      0, 0xD2F6,      0,      0,      0, 0xD7CB  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xE2BA, 	 0, 0xB4A6, 	 0, 	 0, 0xB1B8, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB8B4, 	 0, 0xCFC4, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xD9E7, 0xCFA6, 0xCDE2, 	 0, /* 0x10 */
+         0, 0xD9ED, 0xB6E0, 	 0, 0xD2B9, 	 0, 	 0, 0xB9BB, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xE2B9, 0xE2B7, 	 0, 0xB4F3, /* 0x20 */
+         0, 0xCCEC, 0xCCAB, 0xB7F2, 	 0, 0xD8B2, 0xD1EB, 0xBABB, /* 0x20 */
+         0, 0xCAA7, 	 0, 	 0, 0xCDB7, 	 0, 	 0, 0xD2C4, /* 0x30 */
+    0xBFE4, 0xBCD0, 0xB6E1, 	 0, 0xDEC5, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xDEC6, 0xDBBC, 	 0, 0xD1D9, 	 0, 	 0, 0xC6E6, /* 0x40 */
+    0xC4CE, 0xB7EE, 	 0, 0xB7DC, 	 0, 	 0, 0xBFFC, 0xD7E0, /* 0x40 */
+         0, 0xC6F5, 	 0, 	 0, 0xB1BC, 0xDEC8, 0xBDB1, 0xCCD7, /* 0x50 */
+    0xDECA, 	 0, 0xDEC9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xB5EC, 	 0, 0xC9DD, 	 0, 	 0, 0xB0C2, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xC5AE, 0xC5AB, 	 0, 0xC4CC, 	 0, /* 0x70 */
+    0xBCE9, 0xCBFD, 	 0, 	 0, 	 0, 0xBAC3, 	 0, 	 0, /* 0x70 */
+         0, 0xE5F9, 0xC8E7, 0xE5FA, 0xCDFD, 	 0, 0xD7B1, 0xB8BE, /* 0x80 */
+    0xC2E8, 	 0, 0xC8D1, 	 0, 	 0, 0xE5FB, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xB6CA, 0xBCCB, 	 0, 	 0, 0xD1FD, 0xE6A1, /* 0x90 */
+         0, 0xC3EE, 	 0, 	 0, 	 0, 	 0, 0xE6A4, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xE5FE, 0xE6A5, 0xCDD7, 	 0, 	 0, /* 0xA0 */
+    0xB7C1, 0xE5FC, 0xE5FD, 0xE6A3, 	 0, 	 0, 0xC4DD, 0xE6A8, /* 0xA0 */
+         0, 	 0, 0xE6A7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xC3C3, 	 0, 0xC6DE, 	 0, 	 0, 0xE6AA, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC4B7, 	 0, /* 0xC0 */
+         0, 	 0, 0xE6A2, 0xCABC, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xBDE3, 0xB9C3, 0xE6A6, 0xD0D5, 0xCEAF, 	 0, 	 0, 0xE6A9, /* 0xD0 */
+    0xE6B0, 	 0, 0xD2A6, 	 0, 0xBDAA, 0xE6AD, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xE6AF, 	 0, 0xC0D1, 	 0, 	 0, /* 0xE0 */
+    0xD2CC, 	 0, 	 0, 	 0, 0xBCA7, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xE6B1, 	 0, 0xD2F6, 	 0, 	 0, 	 0, 0xD7CB	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_5A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xCDFE,      0, 0xCDDE, 0xC2A6, 0xE6AB, 0xE6AC, 0xBDBF, /* 0x00 */
-    0xE6AE, 0xE6B3,      0,      0, 0xE6B2,      0,      0,      0, /* 0x00 */
-         0, 0xE6B6,      0, 0xE6B8,      0,      0,      0,      0, /* 0x10 */
-    0xC4EF,      0,      0,      0, 0xC4C8,      0,      0, 0xBEEA, /* 0x10 */
-    0xC9EF,      0,      0, 0xE6B7,      0, 0xB6F0,      0,      0, /* 0x20 */
-         0, 0xC3E4,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xD3E9, 0xE6B4,      0, 0xE6B5,      0, 0xC8A2,      0, /* 0x30 */
-         0,      0,      0,      0, 0xE6BD,      0,      0,      0, /* 0x30 */
-    0xE6B9,      0,      0,      0,      0,      0, 0xC6C5,      0, /* 0x40 */
-         0, 0xCDF1, 0xE6BB,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xE6BC,      0,      0, /* 0x50 */
-         0,      0, 0xBBE9,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xE6BE,      0,      0,      0,      0, 0xE6BA, /* 0x60 */
-         0,      0, 0xC0B7,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xD3A4, 0xE6BF, 0xC9F4, 0xE6C3, /* 0x70 */
-         0,      0, 0xE6C4,      0,      0,      0,      0, 0xD0F6, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xC3BD,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xC3C4, 0xE6C2,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xE6C1,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xE6C7, 0xCFB1,      0, 0xEBF4,      0,      0, /* 0xB0 */
-    0xE6CA,      0,      0,      0,      0,      0, 0xE6C5,      0, /* 0xB0 */
-         0, 0xBCDE, 0xC9A9,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xBCB5,      0,      0, 0xCFD3,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xE6C8,      0, 0xE6C9,      0, 0xE6CE,      0, /* 0xD0 */
-    0xE6D0,      0,      0,      0, 0xE6D1,      0,      0,      0, /* 0xD0 */
-    0xE6CB, 0xB5D5,      0, 0xE6CC,      0,      0, 0xE6CF,      0, /* 0xE0 */
-         0, 0xC4DB,      0, 0xE6C6,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xE6CD                                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xCDFE, 	 0, 0xCDDE, 0xC2A6, 0xE6AB, 0xE6AC, 0xBDBF, /* 0x00 */
+    0xE6AE, 0xE6B3, 	 0, 	 0, 0xE6B2, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xE6B6, 	 0, 0xE6B8, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xC4EF, 	 0, 	 0, 	 0, 0xC4C8, 	 0, 	 0, 0xBEEA, /* 0x10 */
+    0xC9EF, 	 0, 	 0, 0xE6B7, 	 0, 0xB6F0, 	 0, 	 0, /* 0x20 */
+         0, 0xC3E4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xD3E9, 0xE6B4, 	 0, 0xE6B5, 	 0, 0xC8A2, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xE6BD, 	 0, 	 0, 	 0, /* 0x30 */
+    0xE6B9, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC6C5, 	 0, /* 0x40 */
+         0, 0xCDF1, 0xE6BB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE6BC, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xBBE9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xE6BE, 	 0, 	 0, 	 0, 	 0, 0xE6BA, /* 0x60 */
+         0, 	 0, 0xC0B7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xD3A4, 0xE6BF, 0xC9F4, 0xE6C3, /* 0x70 */
+         0, 	 0, 0xE6C4, 	 0, 	 0, 	 0, 	 0, 0xD0F6, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xC3BD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xC3C4, 0xE6C2, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xE6C1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xE6C7, 0xCFB1, 	 0, 0xEBF4, 	 0, 	 0, /* 0xB0 */
+    0xE6CA, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6C5, 	 0, /* 0xB0 */
+         0, 0xBCDE, 0xC9A9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xBCB5, 	 0, 	 0, 0xCFD3, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE6C8, 	 0, 0xE6C9, 	 0, 0xE6CE, 	 0, /* 0xD0 */
+    0xE6D0, 	 0, 	 0, 	 0, 0xE6D1, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE6CB, 0xB5D5, 	 0, 0xE6CC, 	 0, 	 0, 0xE6CF, 	 0, /* 0xE0 */
+         0, 0xC4DB, 	 0, 0xE6C6, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xE6CD													/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -558,397 +558,397 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_5A[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_5B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-            0xE6D2,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xE6D4, 0xE6D3, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xE6D5,      0, 0xD9F8,      0,      0, 0xE6D6, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xE6D7,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xD7D3, 0xE6DD,      0, 0xE6DE, 0xBFD7, 0xD4D0,      0, 0xD7D6, /* 0x50 */
-    0xB4E6, 0xCBEF, 0xE6DA, 0xD8C3, 0xD7CE, 0xD0A2,      0, 0xC3CF, /* 0x50 */
-         0,      0, 0xE6DF, 0xBCBE, 0xB9C2, 0xE6DB, 0xD1A7,      0, /* 0x60 */
-         0, 0xBAA2, 0xC2CF,      0, 0xD8AB,      0,      0,      0, /* 0x60 */
-    0xCAEB, 0xE5EE,      0, 0xE6DC,      0, 0xB7F5,      0,      0, /* 0x70 */
-         0,      0, 0xC8E6,      0,      0, 0xC4F5,      0,      0, /* 0x70 */
-    0xE5B2, 0xC4FE,      0, 0xCBFC, 0xE5B3, 0xD5AC,      0, 0xD3EE, /* 0x80 */
-    0xCAD8, 0xB0B2,      0, 0xCBCE, 0xCDEA,      0,      0, 0xBAEA, /* 0x80 */
-         0,      0,      0, 0xE5B5,      0, 0xE5B4,      0, 0xD7DA, /* 0x90 */
-    0xB9D9, 0xD6E6, 0xB6A8, 0xCDF0, 0xD2CB, 0xB1A6, 0xCAB5,      0, /* 0x90 */
-    0xB3E8, 0xC9F3, 0xBFCD, 0xD0FB, 0xCAD2, 0xE5B6, 0xBBC2,      0, /* 0xA0 */
-         0,      0, 0xCFDC, 0xB9AC,      0,      0,      0,      0, /* 0xA0 */
-    0xD4D7,      0,      0, 0xBAA6, 0xD1E7, 0xCFFC, 0xBCD2,      0, /* 0xB0 */
-    0xE5B7, 0xC8DD,      0,      0,      0, 0xBFED, 0xB1F6, 0xCBDE, /* 0xB0 */
-         0,      0, 0xBCC5,      0, 0xBCC4, 0xD2FA, 0xC3DC, 0xBFDC, /* 0xC0 */
-         0,      0,      0,      0, 0xB8BB,      0,      0,      0, /* 0xC0 */
-    0xC3C2,      0, 0xBAAE, 0xD4A2,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xC7DE, 0xC4AF, 0xB2EC, /* 0xD0 */
-         0, 0xB9D1,      0,      0, 0xE5BB, 0xC1C8,      0,      0, /* 0xE0 */
-    0xD5AF,      0,      0,      0,      0,      0, 0xE5BC,      0, /* 0xE0 */
-    0xE5BE,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xB4E7, 0xB6D4, 0xCBC2, 0xD1B0, 0xB5BC,      0,      0, 0xCAD9  /* 0xF0 */
+            0xE6D2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6D4, 0xE6D3, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xE6D5, 	 0, 0xD9F8, 	 0, 	 0, 0xE6D6, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xE6D7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xD7D3, 0xE6DD, 	 0, 0xE6DE, 0xBFD7, 0xD4D0, 	 0, 0xD7D6, /* 0x50 */
+    0xB4E6, 0xCBEF, 0xE6DA, 0xD8C3, 0xD7CE, 0xD0A2, 	 0, 0xC3CF, /* 0x50 */
+         0, 	 0, 0xE6DF, 0xBCBE, 0xB9C2, 0xE6DB, 0xD1A7, 	 0, /* 0x60 */
+         0, 0xBAA2, 0xC2CF, 	 0, 0xD8AB, 	 0, 	 0, 	 0, /* 0x60 */
+    0xCAEB, 0xE5EE, 	 0, 0xE6DC, 	 0, 0xB7F5, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xC8E6, 	 0, 	 0, 0xC4F5, 	 0, 	 0, /* 0x70 */
+    0xE5B2, 0xC4FE, 	 0, 0xCBFC, 0xE5B3, 0xD5AC, 	 0, 0xD3EE, /* 0x80 */
+    0xCAD8, 0xB0B2, 	 0, 0xCBCE, 0xCDEA, 	 0, 	 0, 0xBAEA, /* 0x80 */
+         0, 	 0, 	 0, 0xE5B5, 	 0, 0xE5B4, 	 0, 0xD7DA, /* 0x90 */
+    0xB9D9, 0xD6E6, 0xB6A8, 0xCDF0, 0xD2CB, 0xB1A6, 0xCAB5, 	 0, /* 0x90 */
+    0xB3E8, 0xC9F3, 0xBFCD, 0xD0FB, 0xCAD2, 0xE5B6, 0xBBC2, 	 0, /* 0xA0 */
+         0, 	 0, 0xCFDC, 0xB9AC, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xD4D7, 	 0, 	 0, 0xBAA6, 0xD1E7, 0xCFFC, 0xBCD2, 	 0, /* 0xB0 */
+    0xE5B7, 0xC8DD, 	 0, 	 0, 	 0, 0xBFED, 0xB1F6, 0xCBDE, /* 0xB0 */
+         0, 	 0, 0xBCC5, 	 0, 0xBCC4, 0xD2FA, 0xC3DC, 0xBFDC, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xB8BB, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xC3C2, 	 0, 0xBAAE, 0xD4A2, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC7DE, 0xC4AF, 0xB2EC, /* 0xD0 */
+         0, 0xB9D1, 	 0, 	 0, 0xE5BB, 0xC1C8, 	 0, 	 0, /* 0xE0 */
+    0xD5AF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5BC, 	 0, /* 0xE0 */
+    0xE5BE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xB4E7, 0xB6D4, 0xCBC2, 0xD1B0, 0xB5BC, 	 0, 	 0, 0xCAD9	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_5C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xB7E2,      0,      0, 0xC9E4,      0, 0xBDAB,      0, /* 0x00 */
-         0, 0xCEBE, 0xD7F0,      0,      0,      0,      0, 0xD0A1, /* 0x00 */
-         0, 0xC9D9,      0,      0, 0xB6FB, 0xE6D8, 0xBCE2,      0, /* 0x10 */
-    0xB3BE,      0, 0xC9D0,      0, 0xE6D9, 0xB3A2,      0,      0, /* 0x10 */
-         0,      0, 0xDECC,      0, 0xD3C8, 0xDECD,      0, 0xD2A2, /* 0x20 */
-         0,      0,      0,      0, 0xDECE,      0,      0,      0, /* 0x20 */
-         0, 0xBECD,      0,      0, 0xDECF,      0,      0,      0, /* 0x30 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xB7E2, 	 0, 	 0, 0xC9E4, 	 0, 0xBDAB, 	 0, /* 0x00 */
+         0, 0xCEBE, 0xD7F0, 	 0, 	 0, 	 0, 	 0, 0xD0A1, /* 0x00 */
+         0, 0xC9D9, 	 0, 	 0, 0xB6FB, 0xE6D8, 0xBCE2, 	 0, /* 0x10 */
+    0xB3BE, 	 0, 0xC9D0, 	 0, 0xE6D9, 0xB3A2, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xDECC, 	 0, 0xD3C8, 0xDECD, 	 0, 0xD2A2, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xDECE, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xBECD, 	 0, 	 0, 0xDECF, 	 0, 	 0, 	 0, /* 0x30 */
     0xCAAC, 0xD2FC, 0xB3DF, 0xE5EA, 0xC4E1, 0xBEA1, 0xCEB2, 0xC4F2, /* 0x30 */
-    0xBED6, 0xC6A8, 0xB2E3,      0,      0, 0xBED3,      0,      0, /* 0x40 */
-    0xC7FC, 0xCCEB, 0xBDEC, 0xCEDD,      0,      0, 0xCABA, 0xC6C1, /* 0x40 */
-    0xE5EC, 0xD0BC,      0,      0,      0, 0xD5B9,      0,      0, /* 0x50 */
-         0, 0xE5ED,      0,      0,      0,      0, 0xCAF4,      0, /* 0x50 */
-    0xCDC0, 0xC2C5,      0, 0xE5EF,      0, 0xC2C4, 0xE5F0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xE5F8, 0xCDCD, /* 0x60 */
-         0, 0xC9BD,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xD2D9, 0xE1A8,      0,      0,      0,      0, 0xD3EC, /* 0x70 */
-         0, 0xCBEA, 0xC6F1,      0,      0,      0,      0,      0, /* 0x80 */
-    0xE1AC,      0,      0,      0, 0xE1A7, 0xE1A9,      0,      0, /* 0x80 */
-    0xE1AA, 0xE1AF,      0,      0, 0xB2ED,      0, 0xE1AB, 0xB8DA, /* 0x90 */
-    0xE1AD, 0xE1AE, 0xE1B0, 0xB5BA, 0xE1B1,      0,      0,      0, /* 0x90 */
-         0,      0, 0xE1B3, 0xE1B8,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xD1D2,      0, 0xE1B6, 0xE1B5, 0xC1EB,      0,      0, /* 0xA0 */
-         0, 0xE1B7,      0, 0xD4C0,      0, 0xE1B2,      0, 0xE1BA, /* 0xB0 */
-    0xB0B6,      0,      0,      0,      0, 0xE1B4,      0, 0xBFF9, /* 0xB0 */
-         0, 0xE1B9,      0,      0, 0xE1BB,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xE1BE,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xE1BC,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xD6C5,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xCFBF,      0,      0, 0xE1BD, 0xE1BF, 0xC2CD,      0, /* 0xE0 */
-    0xB6EB,      0, 0xD3F8,      0,      0, 0xC7CD,      0,      0, /* 0xE0 */
-    0xB7E5,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xBEFE                                  /* 0xF0 */
+    0xBED6, 0xC6A8, 0xB2E3, 	 0, 	 0, 0xBED3, 	 0, 	 0, /* 0x40 */
+    0xC7FC, 0xCCEB, 0xBDEC, 0xCEDD, 	 0, 	 0, 0xCABA, 0xC6C1, /* 0x40 */
+    0xE5EC, 0xD0BC, 	 0, 	 0, 	 0, 0xD5B9, 	 0, 	 0, /* 0x50 */
+         0, 0xE5ED, 	 0, 	 0, 	 0, 	 0, 0xCAF4, 	 0, /* 0x50 */
+    0xCDC0, 0xC2C5, 	 0, 0xE5EF, 	 0, 0xC2C4, 0xE5F0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5F8, 0xCDCD, /* 0x60 */
+         0, 0xC9BD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xD2D9, 0xE1A8, 	 0, 	 0, 	 0, 	 0, 0xD3EC, /* 0x70 */
+         0, 0xCBEA, 0xC6F1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE1AC, 	 0, 	 0, 	 0, 0xE1A7, 0xE1A9, 	 0, 	 0, /* 0x80 */
+    0xE1AA, 0xE1AF, 	 0, 	 0, 0xB2ED, 	 0, 0xE1AB, 0xB8DA, /* 0x90 */
+    0xE1AD, 0xE1AE, 0xE1B0, 0xB5BA, 0xE1B1, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xE1B3, 0xE1B8, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xD1D2, 	 0, 0xE1B6, 0xE1B5, 0xC1EB, 	 0, 	 0, /* 0xA0 */
+         0, 0xE1B7, 	 0, 0xD4C0, 	 0, 0xE1B2, 	 0, 0xE1BA, /* 0xB0 */
+    0xB0B6, 	 0, 	 0, 	 0, 	 0, 0xE1B4, 	 0, 0xBFF9, /* 0xB0 */
+         0, 0xE1B9, 	 0, 	 0, 0xE1BB, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xE1BE, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE1BC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xD6C5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xCFBF, 	 0, 	 0, 0xE1BD, 0xE1BF, 0xC2CD, 	 0, /* 0xE0 */
+    0xB6EB, 	 0, 0xD3F8, 	 0, 	 0, 0xC7CD, 	 0, 	 0, /* 0xE0 */
+    0xB7E5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xBEFE									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_5D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xE1C0, 0xE1C1,      0,      0, 0xE1C7, 0xB3E7, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xC6E9,      0, /* 0x00 */
-         0,      0,      0,      0, 0xB4DE,      0, 0xD1C2,      0, /* 0x10 */
-         0,      0,      0, 0xE1C8,      0,      0, 0xE1C6,      0, /* 0x10 */
-         0,      0,      0,      0, 0xE1C5,      0, 0xE1C3, 0xE1C2, /* 0x20 */
-         0, 0xB1C0,      0,      0,      0, 0xD5B8, 0xE1C4,      0, /* 0x20 */
-         0,      0,      0,      0, 0xE1CB,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xE1CC, 0xE1CA,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xEFFA, /* 0x40 */
-         0,      0, 0xE1D3, 0xE1D2, 0xC7B6,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xE1C9,      0,      0, 0xE1CE,      0, 0xE1D0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xE1D4,      0, 0xE1D1, 0xE1CD,      0,      0, 0xE1CF, /* 0x60 */
-         0,      0,      0,      0, 0xE1D5,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xE1D6,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xE1D7,      0,      0,      0, 0xE1D8,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE1DA, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xE1DB,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xCEA1,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xE7DD,      0, 0xB4A8, 0xD6DD,      0, /* 0xD0 */
-         0, 0xD1B2, 0xB3B2,      0,      0, 0xB9A4, 0xD7F3, 0xC7C9, /* 0xE0 */
-    0xBEDE, 0xB9AE,      0, 0xCED7,      0,      0, 0xB2EE, 0xDBCF, /* 0xE0 */
-         0, 0xBCBA, 0xD2D1, 0xCBC8, 0xB0CD,      0,      0, 0xCFEF, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xD9E3, 0xBDED          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xE1C0, 0xE1C1, 	 0, 	 0, 0xE1C7, 0xB3E7, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC6E9, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xB4DE, 	 0, 0xD1C2, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xE1C8, 	 0, 	 0, 0xE1C6, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xE1C5, 	 0, 0xE1C3, 0xE1C2, /* 0x20 */
+         0, 0xB1C0, 	 0, 	 0, 	 0, 0xD5B8, 0xE1C4, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xE1CB, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE1CC, 0xE1CA, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEFFA, /* 0x40 */
+         0, 	 0, 0xE1D3, 0xE1D2, 0xC7B6, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xE1C9, 	 0, 	 0, 0xE1CE, 	 0, 0xE1D0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xE1D4, 	 0, 0xE1D1, 0xE1CD, 	 0, 	 0, 0xE1CF, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xE1D5, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xE1D6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xE1D7, 	 0, 	 0, 	 0, 0xE1D8, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1DA, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE1DB, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCEA1, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xE7DD, 	 0, 0xB4A8, 0xD6DD, 	 0, /* 0xD0 */
+         0, 0xD1B2, 0xB3B2, 	 0, 	 0, 0xB9A4, 0xD7F3, 0xC7C9, /* 0xE0 */
+    0xBEDE, 0xB9AE, 	 0, 0xCED7, 	 0, 	 0, 0xB2EE, 0xDBCF, /* 0xE0 */
+         0, 0xBCBA, 0xD2D1, 0xCBC8, 0xB0CD, 	 0, 	 0, 0xCFEF, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD9E3, 0xBDED			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_5E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xB1D2, 0xCAD0, 0xB2BC,      0, 0xCBA7, 0xB7AB,      0, /* 0x00 */
-    0xCAA6,      0,      0,      0, 0xCFA3,      0,      0, 0xE0F8, /* 0x00 */
-    0xD5CA, 0xE0FB,      0,      0, 0xE0FA, 0xC5C1, 0xCCFB,      0, /* 0x10 */
-    0xC1B1, 0xE0F9, 0xD6E3, 0xB2AF, 0xD6C4, 0xB5DB,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xB4F8, 0xD6A1, /* 0x20 */
-         0,      0,      0,      0,      0, 0xCFAF, 0xB0EF,      0, /* 0x20 */
-         0, 0xE0FC,      0,      0,      0,      0,      0, 0xE1A1, /* 0x30 */
-    0xB3A3,      0,      0, 0xE0FD, 0xE0FE, 0xC3B1,      0,      0, /* 0x30 */
-         0,      0, 0xC3DD,      0, 0xE1A2, 0xB7F9,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xBBCF,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xE1A3, 0xC4BB,      0,      0, /* 0x50 */
-         0,      0,      0, 0xE1A4,      0,      0, 0xE1A5,      0, /* 0x50 */
-         0, 0xE1A6, 0xB4B1,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xB8C9, 0xC6BD, 0xC4EA,      0, 0xB2A2,      0, /* 0x70 */
-    0xD0D2,      0, 0xE7DB, 0xBBC3, 0xD3D7, 0xD3C4,      0, 0xB9E3, /* 0x70 */
-    0xE2CF,      0,      0,      0, 0xD7AF,      0, 0xC7EC, 0xB1D3, /* 0x80 */
-         0,      0, 0xB4B2, 0xE2D1,      0,      0,      0, 0xD0F2, /* 0x80 */
-    0xC2AE, 0xE2D0,      0, 0xBFE2, 0xD3A6, 0xB5D7, 0xE2D2, 0xB5EA, /* 0x90 */
-         0, 0xC3ED, 0xB8FD,      0, 0xB8AE,      0, 0xC5D3, 0xB7CF, /* 0x90 */
-    0xE2D4,      0,      0,      0,      0, 0xE2D3, 0xB6C8, 0xD7F9, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xCDA5,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xE2D8,      0, 0xE2D6, 0xCAFC, 0xBFB5, /* 0xB0 */
-    0xD3B9, 0xE2D5,      0,      0,      0,      0, 0xE2D7,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xC1AE, 0xC0C8,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xE2DB, 0xE2DA, 0xC0AA,      0,      0, 0xC1CE,      0, /* 0xD0 */
-         0,      0,      0, 0xE2DC,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xE2DD,      0, 0xE2DE,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xDBC8,      0, 0xD1D3, 0xCDA2, /* 0xF0 */
-         0,      0, 0xBDA8,      0,      0,      0, 0xDEC3, 0xD8A5  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xB1D2, 0xCAD0, 0xB2BC, 	 0, 0xCBA7, 0xB7AB, 	 0, /* 0x00 */
+    0xCAA6, 	 0, 	 0, 	 0, 0xCFA3, 	 0, 	 0, 0xE0F8, /* 0x00 */
+    0xD5CA, 0xE0FB, 	 0, 	 0, 0xE0FA, 0xC5C1, 0xCCFB, 	 0, /* 0x10 */
+    0xC1B1, 0xE0F9, 0xD6E3, 0xB2AF, 0xD6C4, 0xB5DB, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB4F8, 0xD6A1, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCFAF, 0xB0EF, 	 0, /* 0x20 */
+         0, 0xE0FC, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1A1, /* 0x30 */
+    0xB3A3, 	 0, 	 0, 0xE0FD, 0xE0FE, 0xC3B1, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xC3DD, 	 0, 0xE1A2, 0xB7F9, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xBBCF, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xE1A3, 0xC4BB, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xE1A4, 	 0, 	 0, 0xE1A5, 	 0, /* 0x50 */
+         0, 0xE1A6, 0xB4B1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xB8C9, 0xC6BD, 0xC4EA, 	 0, 0xB2A2, 	 0, /* 0x70 */
+    0xD0D2, 	 0, 0xE7DB, 0xBBC3, 0xD3D7, 0xD3C4, 	 0, 0xB9E3, /* 0x70 */
+    0xE2CF, 	 0, 	 0, 	 0, 0xD7AF, 	 0, 0xC7EC, 0xB1D3, /* 0x80 */
+         0, 	 0, 0xB4B2, 0xE2D1, 	 0, 	 0, 	 0, 0xD0F2, /* 0x80 */
+    0xC2AE, 0xE2D0, 	 0, 0xBFE2, 0xD3A6, 0xB5D7, 0xE2D2, 0xB5EA, /* 0x90 */
+         0, 0xC3ED, 0xB8FD, 	 0, 0xB8AE, 	 0, 0xC5D3, 0xB7CF, /* 0x90 */
+    0xE2D4, 	 0, 	 0, 	 0, 	 0, 0xE2D3, 0xB6C8, 0xD7F9, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCDA5, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xE2D8, 	 0, 0xE2D6, 0xCAFC, 0xBFB5, /* 0xB0 */
+    0xD3B9, 0xE2D5, 	 0, 	 0, 	 0, 	 0, 0xE2D7, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xC1AE, 0xC0C8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xE2DB, 0xE2DA, 0xC0AA, 	 0, 	 0, 0xC1CE, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xE2DC, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE2DD, 	 0, 0xE2DE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xDBC8, 	 0, 0xD1D3, 0xCDA2, /* 0xF0 */
+         0, 	 0, 0xBDA8, 	 0, 	 0, 	 0, 0xDEC3, 0xD8A5	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_5F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xBFAA, 0xDBCD, 0xD2EC, 0xC6FA, 0xC5AA,      0,      0,      0, /* 0x00 */
-    0xDEC4,      0, 0xB1D7, 0xDFAE,      0,      0,      0, 0xCABD, /* 0x00 */
-         0, 0xDFB1,      0, 0xB9AD,      0, 0xD2FD,      0, 0xB8A5, /* 0x10 */
-    0xBAEB,      0,      0, 0xB3DA,      0,      0,      0, 0xB5DC, /* 0x10 */
-    0xD5C5,      0,      0,      0,      0, 0xC3D6, 0xCFD2, 0xBBA1, /* 0x20 */
-         0, 0xE5F3, 0xE5F2,      0,      0, 0xE5F4,      0, 0xCDE4, /* 0x20 */
-         0, 0xC8F5,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xB5AF, 0xC7BF,      0, 0xE5F6,      0,      0,      0, /* 0x30 */
-    0xECB0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xE5E6,      0, 0xB9E9, 0xB5B1,      0, 0xC2BC, 0xE5E8, 0xE5E7, /* 0x50 */
-    0xE5E9,      0,      0,      0,      0, 0xD2CD,      0,      0, /* 0x50 */
-         0, 0xE1EA, 0xD0CE,      0, 0xCDAE,      0, 0xD1E5,      0, /* 0x60 */
-         0, 0xB2CA, 0xB1EB,      0, 0xB1F2, 0xC5ED,      0,      0, /* 0x60 */
-    0xD5C3, 0xD3B0,      0, 0xE1DC,      0,      0,      0, 0xE1DD, /* 0x70 */
-         0, 0xD2DB,      0, 0xB3B9, 0xB1CB,      0,      0,      0, /* 0x70 */
-    0xCDF9, 0xD5F7, 0xE1DE,      0, 0xBEB6, 0xB4FD,      0, 0xE1DF, /* 0x80 */
-    0xBADC, 0xE1E0, 0xBBB2, 0xC2C9, 0xE1E1,      0,      0,      0, /* 0x80 */
-    0xD0EC,      0, 0xCDBD,      0,      0, 0xE1E2,      0, 0xB5C3, /* 0x90 */
-    0xC5C7, 0xE1E3,      0,      0, 0xE1E4,      0,      0,      0, /* 0x90 */
-         0, 0xD3F9,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xE1E5,      0, 0xD1AD,      0,      0, 0xE1E6, 0xCEA2,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xE1E7,      0, 0xB5C2, /* 0xB0 */
-         0,      0,      0,      0, 0xE1E8, 0xBBD5,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xD0C4, 0xE2E0, 0xB1D8, 0xD2E4,      0, /* 0xC0 */
-         0, 0xE2E1,      0,      0, 0xBCC9, 0xC8CC,      0, 0xE2E3, /* 0xC0 */
-    0xECFE, 0xECFD, 0xDFAF,      0,      0,      0, 0xE2E2, 0xD6BE, /* 0xD0 */
-    0xCDFC, 0xC3A6,      0,      0,      0, 0xE3C3,      0,      0, /* 0xD0 */
-    0xD6D2, 0xE2E7,      0,      0, 0xE2E8,      0,      0, 0xD3C7, /* 0xE0 */
-         0,      0, 0xE2EC, 0xBFEC,      0, 0xE2ED, 0xE2E5,      0, /* 0xE0 */
-         0, 0xB3C0,      0,      0,      0, 0xC4EE,      0,      0, /* 0xF0 */
-    0xE2EE,      0,      0, 0xD0C3,      0, 0xBAF6, 0xE2E9, 0xB7DE  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xBFAA, 0xDBCD, 0xD2EC, 0xC6FA, 0xC5AA, 	 0, 	 0, 	 0, /* 0x00 */
+    0xDEC4, 	 0, 0xB1D7, 0xDFAE, 	 0, 	 0, 	 0, 0xCABD, /* 0x00 */
+         0, 0xDFB1, 	 0, 0xB9AD, 	 0, 0xD2FD, 	 0, 0xB8A5, /* 0x10 */
+    0xBAEB, 	 0, 	 0, 0xB3DA, 	 0, 	 0, 	 0, 0xB5DC, /* 0x10 */
+    0xD5C5, 	 0, 	 0, 	 0, 	 0, 0xC3D6, 0xCFD2, 0xBBA1, /* 0x20 */
+         0, 0xE5F3, 0xE5F2, 	 0, 	 0, 0xE5F4, 	 0, 0xCDE4, /* 0x20 */
+         0, 0xC8F5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xB5AF, 0xC7BF, 	 0, 0xE5F6, 	 0, 	 0, 	 0, /* 0x30 */
+    0xECB0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xE5E6, 	 0, 0xB9E9, 0xB5B1, 	 0, 0xC2BC, 0xE5E8, 0xE5E7, /* 0x50 */
+    0xE5E9, 	 0, 	 0, 	 0, 	 0, 0xD2CD, 	 0, 	 0, /* 0x50 */
+         0, 0xE1EA, 0xD0CE, 	 0, 0xCDAE, 	 0, 0xD1E5, 	 0, /* 0x60 */
+         0, 0xB2CA, 0xB1EB, 	 0, 0xB1F2, 0xC5ED, 	 0, 	 0, /* 0x60 */
+    0xD5C3, 0xD3B0, 	 0, 0xE1DC, 	 0, 	 0, 	 0, 0xE1DD, /* 0x70 */
+         0, 0xD2DB, 	 0, 0xB3B9, 0xB1CB, 	 0, 	 0, 	 0, /* 0x70 */
+    0xCDF9, 0xD5F7, 0xE1DE, 	 0, 0xBEB6, 0xB4FD, 	 0, 0xE1DF, /* 0x80 */
+    0xBADC, 0xE1E0, 0xBBB2, 0xC2C9, 0xE1E1, 	 0, 	 0, 	 0, /* 0x80 */
+    0xD0EC, 	 0, 0xCDBD, 	 0, 	 0, 0xE1E2, 	 0, 0xB5C3, /* 0x90 */
+    0xC5C7, 0xE1E3, 	 0, 	 0, 0xE1E4, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xD3F9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xE1E5, 	 0, 0xD1AD, 	 0, 	 0, 0xE1E6, 0xCEA2, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE1E7, 	 0, 0xB5C2, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xE1E8, 0xBBD5, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xD0C4, 0xE2E0, 0xB1D8, 0xD2E4, 	 0, /* 0xC0 */
+         0, 0xE2E1, 	 0, 	 0, 0xBCC9, 0xC8CC, 	 0, 0xE2E3, /* 0xC0 */
+    0xECFE, 0xECFD, 0xDFAF, 	 0, 	 0, 	 0, 0xE2E2, 0xD6BE, /* 0xD0 */
+    0xCDFC, 0xC3A6, 	 0, 	 0, 	 0, 0xE3C3, 	 0, 	 0, /* 0xD0 */
+    0xD6D2, 0xE2E7, 	 0, 	 0, 0xE2E8, 	 0, 	 0, 0xD3C7, /* 0xE0 */
+         0, 	 0, 0xE2EC, 0xBFEC, 	 0, 0xE2ED, 0xE2E5, 	 0, /* 0xE0 */
+         0, 0xB3C0, 	 0, 	 0, 	 0, 0xC4EE, 	 0, 	 0, /* 0xF0 */
+    0xE2EE, 	 0, 	 0, 0xD0C3, 	 0, 0xBAF6, 0xE2E9, 0xB7DE	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_60[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xBBB3, 0xCCAC, 0xCBCB, 0xE2E4, 0xE2E6, 0xE2EA, 0xE2EB,      0, /* 0x00 */
-         0,      0, 0xE2F7,      0,      0, 0xE2F4, 0xD4F5, 0xE2F3, /* 0x00 */
-         0,      0, 0xC5AD,      0, 0xD5FA, 0xC5C2, 0xB2C0,      0, /* 0x10 */
-         0, 0xE2EF,      0, 0xE2F2, 0xC1AF, 0xCBBC,      0,      0, /* 0x10 */
-    0xB5A1, 0xE2F9,      0,      0,      0, 0xBCB1, 0xE2F1, 0xD0D4, /* 0x20 */
-    0xD4B9, 0xE2F5, 0xB9D6, 0xE2F6,      0,      0,      0, 0xC7D3, /* 0x20 */
-         0,      0,      0,      0,      0, 0xE2F0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xD7DC, 0xEDA1,      0,      0, 0xE2F8, /* 0x30 */
-         0, 0xEDA5, 0xE2FE, 0xCAD1,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xC1B5,      0, 0xBBD0,      0,      0, /* 0x40 */
-    0xBFD6,      0, 0xBAE3,      0,      0, 0xCBA1,      0,      0, /* 0x50 */
-         0, 0xEDA6, 0xEDA3,      0,      0, 0xEDA2,      0,      0, /* 0x50 */
-         0,      0, 0xBBD6, 0xEDA7, 0xD0F4,      0,      0, 0xEDA4, /* 0x60 */
-    0xBADE, 0xB6F7, 0xE3A1, 0xB6B2, 0xCCF1, 0xB9A7,      0, 0xCFA2, /* 0x60 */
-    0xC7A1,      0,      0, 0xBFD2,      0,      0, 0xB6F1,      0, /* 0x70 */
-    0xE2FA, 0xE2FB, 0xE2FD, 0xE2FC, 0xC4D5, 0xE3A2,      0, 0xD3C1, /* 0x70 */
-         0,      0,      0, 0xE3A7, 0xC7C4,      0,      0,      0, /* 0x80 */
-         0, 0xCFA4,      0,      0, 0xE3A9, 0xBAB7,      0,      0, /* 0x80 */
-         0,      0, 0xE3A8,      0, 0xBBDA,      0, 0xE3A3,      0, /* 0x90 */
-         0,      0, 0xE3A4, 0xE3AA,      0, 0xE3A6,      0, 0xCEF2, /* 0x90 */
-    0xD3C6,      0,      0, 0xBBBC,      0,      0, 0xD4C3,      0, /* 0xA0 */
-    0xC4FA,      0,      0, 0xEDA8, 0xD0FC, 0xE3A5,      0, 0xC3F5, /* 0xA0 */
-         0, 0xE3AD, 0xB1AF,      0, 0xE3B2,      0,      0,      0, /* 0xB0 */
-    0xBCC2,      0,      0, 0xE3AC, 0xB5BF,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xC7E9, 0xE3B0,      0, /* 0xC0 */
-         0,      0, 0xBEAA, 0xCDEF,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xBBF3,      0,      0,      0, 0xCCE8,      0,      0, /* 0xD0 */
-    0xE3AF,      0, 0xE3B1,      0, 0xCFA7, 0xE3AE,      0, 0xCEA9, /* 0xD0 */
-    0xBBDD,      0,      0,      0,      0,      0, 0xB5EB, 0xBEE5, /* 0xE0 */
-    0xB2D2, 0xB3CD,      0, 0xB1B9, 0xE3AB, 0xB2D1, 0xB5AC, 0xB9DF, /* 0xE0 */
-    0xB6E8,      0,      0, 0xCFEB, 0xE3B7,      0, 0xBBCC,      0, /* 0xF0 */
-         0, 0xC8C7, 0xD0CA                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xBBB3, 0xCCAC, 0xCBCB, 0xE2E4, 0xE2E6, 0xE2EA, 0xE2EB, 	 0, /* 0x00 */
+         0, 	 0, 0xE2F7, 	 0, 	 0, 0xE2F4, 0xD4F5, 0xE2F3, /* 0x00 */
+         0, 	 0, 0xC5AD, 	 0, 0xD5FA, 0xC5C2, 0xB2C0, 	 0, /* 0x10 */
+         0, 0xE2EF, 	 0, 0xE2F2, 0xC1AF, 0xCBBC, 	 0, 	 0, /* 0x10 */
+    0xB5A1, 0xE2F9, 	 0, 	 0, 	 0, 0xBCB1, 0xE2F1, 0xD0D4, /* 0x20 */
+    0xD4B9, 0xE2F5, 0xB9D6, 0xE2F6, 	 0, 	 0, 	 0, 0xC7D3, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE2F0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xD7DC, 0xEDA1, 	 0, 	 0, 0xE2F8, /* 0x30 */
+         0, 0xEDA5, 0xE2FE, 0xCAD1, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xC1B5, 	 0, 0xBBD0, 	 0, 	 0, /* 0x40 */
+    0xBFD6, 	 0, 0xBAE3, 	 0, 	 0, 0xCBA1, 	 0, 	 0, /* 0x50 */
+         0, 0xEDA6, 0xEDA3, 	 0, 	 0, 0xEDA2, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xBBD6, 0xEDA7, 0xD0F4, 	 0, 	 0, 0xEDA4, /* 0x60 */
+    0xBADE, 0xB6F7, 0xE3A1, 0xB6B2, 0xCCF1, 0xB9A7, 	 0, 0xCFA2, /* 0x60 */
+    0xC7A1, 	 0, 	 0, 0xBFD2, 	 0, 	 0, 0xB6F1, 	 0, /* 0x70 */
+    0xE2FA, 0xE2FB, 0xE2FD, 0xE2FC, 0xC4D5, 0xE3A2, 	 0, 0xD3C1, /* 0x70 */
+         0, 	 0, 	 0, 0xE3A7, 0xC7C4, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xCFA4, 	 0, 	 0, 0xE3A9, 0xBAB7, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE3A8, 	 0, 0xBBDA, 	 0, 0xE3A3, 	 0, /* 0x90 */
+         0, 	 0, 0xE3A4, 0xE3AA, 	 0, 0xE3A6, 	 0, 0xCEF2, /* 0x90 */
+    0xD3C6, 	 0, 	 0, 0xBBBC, 	 0, 	 0, 0xD4C3, 	 0, /* 0xA0 */
+    0xC4FA, 	 0, 	 0, 0xEDA8, 0xD0FC, 0xE3A5, 	 0, 0xC3F5, /* 0xA0 */
+         0, 0xE3AD, 0xB1AF, 	 0, 0xE3B2, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xBCC2, 	 0, 	 0, 0xE3AC, 0xB5BF, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC7E9, 0xE3B0, 	 0, /* 0xC0 */
+         0, 	 0, 0xBEAA, 0xCDEF, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xBBF3, 	 0, 	 0, 	 0, 0xCCE8, 	 0, 	 0, /* 0xD0 */
+    0xE3AF, 	 0, 0xE3B1, 	 0, 0xCFA7, 0xE3AE, 	 0, 0xCEA9, /* 0xD0 */
+    0xBBDD, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB5EB, 0xBEE5, /* 0xE0 */
+    0xB2D2, 0xB3CD, 	 0, 0xB1B9, 0xE3AB, 0xB2D1, 0xB5AC, 0xB9DF, /* 0xE0 */
+    0xB6E8, 	 0, 	 0, 0xCFEB, 0xE3B7, 	 0, 0xBBCC, 	 0, /* 0xF0 */
+         0, 0xC8C7, 0xD0CA											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_61[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE3B8, 0xB3EE,      0,      0,      0,      0, 0xEDA9,      0, /* 0x00 */
-    0xD3FA, 0xD3E4,      0,      0,      0, 0xEDAA, 0xE3B9, 0xD2E2, /* 0x00 */
-         0,      0,      0,      0,      0, 0xE3B5,      0,      0, /* 0x10 */
-         0,      0, 0xD3DE,      0,      0,      0,      0, 0xB8D0, /* 0x10 */
-    0xE3B3,      0,      0, 0xE3B6, 0xB7DF,      0, 0xE3B4, 0xC0A2, /* 0x20 */
-         0,      0,      0, 0xE3BA,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xD4B8, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xB4C8,      0, 0xE3BB,      0, 0xBBC5,      0, 0xC9F7,      0, /* 0x40 */
-         0, 0xC9E5,      0,      0,      0, 0xC4BD,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xEDAB,      0,      0, /* 0x50 */
-         0,      0, 0xC2FD,      0,      0,      0,      0, 0xBBDB, /* 0x60 */
-    0xBFAE,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0xCEBF,      0,      0,      0,      0, 0xE3BC,      0, 0xBFB6, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xB1EF,      0,      0, 0xD4F7,      0, /* 0x80 */
-         0,      0,      0,      0, 0xE3BE,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xEDAD,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xE3BF, /* 0xA0 */
-    0xBAA9, 0xEDAC,      0,      0, 0xE3BD,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE3C0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xBAB6,      0, /* 0xB0 */
-         0,      0, 0xB6AE,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xD0B8,      0, 0xB0C3, 0xEDAE,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xEDAF, 0xC0C1,      0, 0xE3C1,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xC5B3,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xE3C2,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0,      0,      0, 0xDCB2  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE3B8, 0xB3EE, 	 0, 	 0, 	 0, 	 0, 0xEDA9, 	 0, /* 0x00 */
+    0xD3FA, 0xD3E4, 	 0, 	 0, 	 0, 0xEDAA, 0xE3B9, 0xD2E2, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE3B5, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xD3DE, 	 0, 	 0, 	 0, 	 0, 0xB8D0, /* 0x10 */
+    0xE3B3, 	 0, 	 0, 0xE3B6, 0xB7DF, 	 0, 0xE3B4, 0xC0A2, /* 0x20 */
+         0, 	 0, 	 0, 0xE3BA, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD4B8, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xB4C8, 	 0, 0xE3BB, 	 0, 0xBBC5, 	 0, 0xC9F7, 	 0, /* 0x40 */
+         0, 0xC9E5, 	 0, 	 0, 	 0, 0xC4BD, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEDAB, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xC2FD, 	 0, 	 0, 	 0, 	 0, 0xBBDB, /* 0x60 */
+    0xBFAE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xCEBF, 	 0, 	 0, 	 0, 	 0, 0xE3BC, 	 0, 0xBFB6, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xB1EF, 	 0, 	 0, 0xD4F7, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xE3BE, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEDAD, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE3BF, /* 0xA0 */
+    0xBAA9, 0xEDAC, 	 0, 	 0, 0xE3BD, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE3C0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBAB6, 	 0, /* 0xB0 */
+         0, 	 0, 0xB6AE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xD0B8, 	 0, 0xB0C3, 0xEDAE, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xEDAF, 0xC0C1, 	 0, 0xE3C1, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC5B3, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE3C2, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDCB2	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_62[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0xEDB0,      0, /* 0x00 */
-    0xB8EA,      0, 0xCEEC, 0xEAA7, 0xD0E7, 0xCAF9, 0xC8D6, 0xCFB7, /* 0x00 */
-    0xB3C9, 0xCED2, 0xBDE4,      0,      0, 0xE3DE, 0xBBF2, 0xEAA8, /* 0x10 */
-    0xD5BD,      0, 0xC6DD, 0xEAA9,      0,      0,      0, 0xEAAA, /* 0x10 */
-         0, 0xEAAC, 0xEAAB,      0, 0xEAAE, 0xEAAD,      0,      0, /* 0x20 */
-         0,      0, 0xBDD8,      0, 0xEAAF,      0, 0xC2BE,      0, /* 0x20 */
-         0,      0,      0, 0xB4C1, 0xB4F7,      0,      0, 0xBBA7, /* 0x30 */
-         0,      0,      0,      0,      0, 0xECE6, 0xECE5, 0xB7BF, /* 0x30 */
-    0xCBF9, 0xB1E2,      0, 0xECE7,      0,      0,      0, 0xC9C8, /* 0x40 */
-    0xECE8, 0xECE9,      0, 0xCAD6, 0xDED0, 0xB2C5, 0xD4FA,      0, /* 0x40 */
-         0, 0xC6CB, 0xB0C7, 0xB4F2, 0xC8D3,      0,      0,      0, /* 0x50 */
-    0xCDD0,      0,      0, 0xBFB8,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xBFDB,      0,      0, 0xC7A4, 0xD6B4, /* 0x60 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0xEDB0, 	 0, /* 0x00 */
+    0xB8EA, 	 0, 0xCEEC, 0xEAA7, 0xD0E7, 0xCAF9, 0xC8D6, 0xCFB7, /* 0x00 */
+    0xB3C9, 0xCED2, 0xBDE4, 	 0, 	 0, 0xE3DE, 0xBBF2, 0xEAA8, /* 0x10 */
+    0xD5BD, 	 0, 0xC6DD, 0xEAA9, 	 0, 	 0, 	 0, 0xEAAA, /* 0x10 */
+         0, 0xEAAC, 0xEAAB, 	 0, 0xEAAE, 0xEAAD, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xBDD8, 	 0, 0xEAAF, 	 0, 0xC2BE, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xB4C1, 0xB4F7, 	 0, 	 0, 0xBBA7, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xECE6, 0xECE5, 0xB7BF, /* 0x30 */
+    0xCBF9, 0xB1E2, 	 0, 0xECE7, 	 0, 	 0, 	 0, 0xC9C8, /* 0x40 */
+    0xECE8, 0xECE9, 	 0, 0xCAD6, 0xDED0, 0xB2C5, 0xD4FA, 	 0, /* 0x40 */
+         0, 0xC6CB, 0xB0C7, 0xB4F2, 0xC8D3, 	 0, 	 0, 	 0, /* 0x50 */
+    0xCDD0, 	 0, 	 0, 0xBFB8, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xBFDB, 	 0, 	 0, 0xC7A4, 0xD6B4, /* 0x60 */
          0, 0xC0A9, 0xDED1, 0xC9A8, 0xD1EF, 0xC5A4, 0xB0E7, 0xB3B6, /* 0x60 */
-    0xC8C5,      0,      0, 0xB0E2,      0,      0, 0xB7F6,      0, /* 0x70 */
-         0, 0xC5FA,      0,      0, 0xB6F3,      0, 0xD5D2, 0xB3D0, /* 0x70 */
-    0xBCBC,      0,      0,      0, 0xB3AD,      0,      0,      0, /* 0x80 */
-         0, 0xBEF1, 0xB0D1,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xD2D6, 0xCAE3, 0xD7A5,      0, 0xCDB6, 0xB6B6, 0xBFB9, /* 0x90 */
-    0xD5DB,      0, 0xB8A7, 0xC5D7,      0,      0,      0, 0xDED2, /* 0x90 */
-    0xBFD9, 0xC2D5, 0xC7C0,      0, 0xBBA4, 0xB1A8,      0,      0, /* 0xA0 */
-    0xC5EA,      0,      0, 0xC5FB, 0xCCA7,      0,      0,      0, /* 0xA0 */
-         0, 0xB1A7,      0,      0,      0, 0xB5D6,      0,      0, /* 0xB0 */
-         0, 0xC4A8,      0, 0xDED3, 0xD1BA, 0xB3E9,      0, 0xC3F2, /* 0xB0 */
-         0,      0, 0xB7F7,      0, 0xD6F4, 0xB5A3, 0xB2F0, 0xC4B4, /* 0xC0 */
-    0xC4E9, 0xC0AD, 0xDED4,      0, 0xB0E8, 0xC5C4, 0xC1E0,      0, /* 0xC0 */
-    0xB9D5,      0, 0xBEDC, 0xCDD8, 0xB0CE,      0, 0xCDCF, 0xDED6, /* 0xD0 */
-    0xBED0, 0xD7BE, 0xDED5, 0xD5D0, 0xB0DD,      0,      0, 0xC4E2, /* 0xD0 */
-         0,      0, 0xC2A3, 0xBCF0,      0, 0xD3B5, 0xC0B9, 0xC5A1, /* 0xE0 */
-    0xB2A6, 0xD4F1,      0,      0, 0xC0A8, 0xCAC3, 0xDED7, 0xD5FC, /* 0xE0 */
-         0, 0xB9B0,      0, 0xC8AD, 0xCBA9,      0, 0xDED9, 0xBFBD, /* 0xF0 */
-         0,      0,      0,      0, 0xC6B4, 0xD7A7, 0xCAB0, 0xC4C3  /* 0xF0 */
+    0xC8C5, 	 0, 	 0, 0xB0E2, 	 0, 	 0, 0xB7F6, 	 0, /* 0x70 */
+         0, 0xC5FA, 	 0, 	 0, 0xB6F3, 	 0, 0xD5D2, 0xB3D0, /* 0x70 */
+    0xBCBC, 	 0, 	 0, 	 0, 0xB3AD, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xBEF1, 0xB0D1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xD2D6, 0xCAE3, 0xD7A5, 	 0, 0xCDB6, 0xB6B6, 0xBFB9, /* 0x90 */
+    0xD5DB, 	 0, 0xB8A7, 0xC5D7, 	 0, 	 0, 	 0, 0xDED2, /* 0x90 */
+    0xBFD9, 0xC2D5, 0xC7C0, 	 0, 0xBBA4, 0xB1A8, 	 0, 	 0, /* 0xA0 */
+    0xC5EA, 	 0, 	 0, 0xC5FB, 0xCCA7, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xB1A7, 	 0, 	 0, 	 0, 0xB5D6, 	 0, 	 0, /* 0xB0 */
+         0, 0xC4A8, 	 0, 0xDED3, 0xD1BA, 0xB3E9, 	 0, 0xC3F2, /* 0xB0 */
+         0, 	 0, 0xB7F7, 	 0, 0xD6F4, 0xB5A3, 0xB2F0, 0xC4B4, /* 0xC0 */
+    0xC4E9, 0xC0AD, 0xDED4, 	 0, 0xB0E8, 0xC5C4, 0xC1E0, 	 0, /* 0xC0 */
+    0xB9D5, 	 0, 0xBEDC, 0xCDD8, 0xB0CE, 	 0, 0xCDCF, 0xDED6, /* 0xD0 */
+    0xBED0, 0xD7BE, 0xDED5, 0xD5D0, 0xB0DD, 	 0, 	 0, 0xC4E2, /* 0xD0 */
+         0, 	 0, 0xC2A3, 0xBCF0, 	 0, 0xD3B5, 0xC0B9, 0xC5A1, /* 0xE0 */
+    0xB2A6, 0xD4F1, 	 0, 	 0, 0xC0A8, 0xCAC3, 0xDED7, 0xD5FC, /* 0xE0 */
+         0, 0xB9B0, 	 0, 0xC8AD, 0xCBA9, 	 0, 0xDED9, 0xBFBD, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xC6B4, 0xD7A7, 0xCAB0, 0xC4C3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_63[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xB3D6, 0xB9D2,      0,      0,      0,      0, 0xD6B8, /* 0x00 */
-    0xEAFC, 0xB0B4,      0,      0,      0,      0, 0xBFE6,      0, /* 0x00 */
-         0, 0xCCF4,      0,      0,      0,      0, 0xCDDA,      0, /* 0x10 */
-         0,      0, 0xD6BF, 0xC2CE,      0, 0xCECE, 0xCCA2, 0xD0AE, /* 0x10 */
-    0xC4D3, 0xB5B2, 0xDED8, 0xD5F5, 0xBCB7, 0xBBD3,      0,      0, /* 0x20 */
-    0xB0A4,      0, 0xC5B2, 0xB4EC,      0,      0,      0, 0xD5F1, /* 0x20 */
-         0,      0, 0xEAFD,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xDEDA, 0xCDA6,      0,      0, 0xCDEC,      0,      0, /* 0x30 */
-         0,      0, 0xCEE6, 0xDEDC,      0, 0xCDB1, 0xC0A6,      0, /* 0x40 */
-         0, 0xD7BD,      0, 0xDEDB, 0xB0C6, 0xBAB4, 0xC9D3, 0xC4F3, /* 0x40 */
-    0xBEE8,      0,      0,      0,      0, 0xB2B6,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xC0CC, 0xCBF0, /* 0x50 */
-         0, 0xBCF1, 0xBBBB, 0xB5B7,      0,      0,      0, 0xC5F5, /* 0x60 */
-         0, 0xDEE6,      0,      0,      0, 0xDEE3, 0xBEDD,      0, /* 0x60 */
-         0, 0xDEDF,      0,      0,      0,      0, 0xB4B7, 0xBDDD, /* 0x70 */
-         0,      0, 0xDEE0, 0xC4ED,      0,      0,      0,      0, /* 0x70 */
-    0xCFC6,      0, 0xB5E0,      0,      0,      0,      0, 0xB6DE, /* 0x80 */
-    0xCADA, 0xB5F4, 0xDEE5,      0, 0xD5C6,      0, 0xDEE1, 0xCCCD, /* 0x80 */
-    0xC6FE,      0, 0xC5C5,      0,      0,      0, 0xD2B4,      0, /* 0x90 */
-    0xBEF2,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xC2D3,      0, 0xCCBD, 0xB3B8,      0, 0xBDD3,      0, 0xBFD8, /* 0xA0 */
-    0xCDC6, 0xD1DA, 0xB4EB,      0, 0xDEE4, 0xDEDD, 0xDEE7,      0, /* 0xA0 */
-    0xEAFE,      0,      0, 0xC2B0, 0xDEE2,      0,      0, 0xD6C0, /* 0xB0 */
-    0xB5A7,      0, 0xB2F4,      0, 0xDEE8,      0, 0xDEF2,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xDEED,      0, 0xDEF1,      0, /* 0xC0 */
-         0, 0xC8E0,      0,      0,      0, 0xD7E1, 0xDEEF, 0xC3E8, /* 0xC0 */
-    0xCCE1,      0, 0xB2E5,      0,      0,      0, 0xD2BE,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xDEEE,      0, /* 0xD0 */
-    0xDEEB, 0xCED5,      0, 0xB4A7,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xBFAB, 0xBEBE,      0,      0, 0xBDD2,      0,      0, /* 0xE0 */
-         0,      0, 0xDEE9,      0, 0xD4AE,      0, 0xDEDE,      0, /* 0xF0 */
-    0xDEEA,      0,      0,      0,      0, 0xC0BF,      0, 0xDEEC  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xB3D6, 0xB9D2, 	 0, 	 0, 	 0, 	 0, 0xD6B8, /* 0x00 */
+    0xEAFC, 0xB0B4, 	 0, 	 0, 	 0, 	 0, 0xBFE6, 	 0, /* 0x00 */
+         0, 0xCCF4, 	 0, 	 0, 	 0, 	 0, 0xCDDA, 	 0, /* 0x10 */
+         0, 	 0, 0xD6BF, 0xC2CE, 	 0, 0xCECE, 0xCCA2, 0xD0AE, /* 0x10 */
+    0xC4D3, 0xB5B2, 0xDED8, 0xD5F5, 0xBCB7, 0xBBD3, 	 0, 	 0, /* 0x20 */
+    0xB0A4, 	 0, 0xC5B2, 0xB4EC, 	 0, 	 0, 	 0, 0xD5F1, /* 0x20 */
+         0, 	 0, 0xEAFD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xDEDA, 0xCDA6, 	 0, 	 0, 0xCDEC, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xCEE6, 0xDEDC, 	 0, 0xCDB1, 0xC0A6, 	 0, /* 0x40 */
+         0, 0xD7BD, 	 0, 0xDEDB, 0xB0C6, 0xBAB4, 0xC9D3, 0xC4F3, /* 0x40 */
+    0xBEE8, 	 0, 	 0, 	 0, 	 0, 0xB2B6, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC0CC, 0xCBF0, /* 0x50 */
+         0, 0xBCF1, 0xBBBB, 0xB5B7, 	 0, 	 0, 	 0, 0xC5F5, /* 0x60 */
+         0, 0xDEE6, 	 0, 	 0, 	 0, 0xDEE3, 0xBEDD, 	 0, /* 0x60 */
+         0, 0xDEDF, 	 0, 	 0, 	 0, 	 0, 0xB4B7, 0xBDDD, /* 0x70 */
+         0, 	 0, 0xDEE0, 0xC4ED, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xCFC6, 	 0, 0xB5E0, 	 0, 	 0, 	 0, 	 0, 0xB6DE, /* 0x80 */
+    0xCADA, 0xB5F4, 0xDEE5, 	 0, 0xD5C6, 	 0, 0xDEE1, 0xCCCD, /* 0x80 */
+    0xC6FE, 	 0, 0xC5C5, 	 0, 	 0, 	 0, 0xD2B4, 	 0, /* 0x90 */
+    0xBEF2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xC2D3, 	 0, 0xCCBD, 0xB3B8, 	 0, 0xBDD3, 	 0, 0xBFD8, /* 0xA0 */
+    0xCDC6, 0xD1DA, 0xB4EB, 	 0, 0xDEE4, 0xDEDD, 0xDEE7, 	 0, /* 0xA0 */
+    0xEAFE, 	 0, 	 0, 0xC2B0, 0xDEE2, 	 0, 	 0, 0xD6C0, /* 0xB0 */
+    0xB5A7, 	 0, 0xB2F4, 	 0, 0xDEE8, 	 0, 0xDEF2, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xDEED, 	 0, 0xDEF1, 	 0, /* 0xC0 */
+         0, 0xC8E0, 	 0, 	 0, 	 0, 0xD7E1, 0xDEEF, 0xC3E8, /* 0xC0 */
+    0xCCE1, 	 0, 0xB2E5, 	 0, 	 0, 	 0, 0xD2BE, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDEEE, 	 0, /* 0xD0 */
+    0xDEEB, 0xCED5, 	 0, 0xB4A7, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xBFAB, 0xBEBE, 	 0, 	 0, 0xBDD2, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xDEE9, 	 0, 0xD4AE, 	 0, 0xDEDE, 	 0, /* 0xF0 */
+    0xDEEA, 	 0, 	 0, 	 0, 	 0, 0xC0BF, 	 0, 0xDEEC	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_64[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xB2F3, 0xB8E9, 0xC2A7,      0,      0, 0xBDC1,      0,      0, /* 0x00 */
-         0,      0,      0, 0xDEF5, 0xDEF8,      0,      0, 0xB2AB, /* 0x00 */
-    0xB4A4,      0,      0, 0xB4EA, 0xC9A6,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xDEF6, 0xCBD1,      0, 0xB8E3,      0, /* 0x10 */
-    0xDEF7, 0xDEFA,      0,      0,      0,      0, 0xDEF9,      0, /* 0x20 */
-         0,      0, 0xCCC2,      0, 0xB0E1, 0xB4EE,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xE5BA,      0,      0,      0, /* 0x30 */
-         0,      0, 0xD0AF,      0,      0, 0xB2EB,      0, 0xEBA1, /* 0x30 */
-         0, 0xDEF4,      0,      0, 0xC9E3, 0xDEF3, 0xB0DA, 0xD2A1, /* 0x40 */
-    0xB1F7,      0, 0xCCAF,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xDEF0,      0, 0xCBA4,      0,      0,      0, /* 0x50 */
-    0xD5AA,      0,      0,      0,      0,      0, 0xDEFB,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xB4DD, /* 0x60 */
-         0, 0xC4A6,      0,      0,      0, 0xDEFD,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xC3FE, 0xC4A1, 0xDFA1,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xC1CC,      0, 0xDEFC, 0xBEEF,      0, 0xC6B2, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xB3C5, 0xC8F6,      0,      0, 0xCBBA, 0xDEFE,      0, /* 0x90 */
-         0, 0xDFA4,      0,      0,      0,      0, 0xD7B2,      0, /* 0x90 */
-         0,      0,      0,      0, 0xB3B7,      0,      0,      0, /* 0xA0 */
-         0, 0xC1C3,      0,      0, 0xC7CB, 0xB2A5, 0xB4E9,      0, /* 0xA0 */
-    0xD7AB,      0,      0,      0,      0, 0xC4EC,      0, 0xDFA2, /* 0xB0 */
-    0xDFA3,      0, 0xDFA5,      0, 0xBAB3,      0,      0,      0, /* 0xB0 */
-    0xDFA6,      0, 0xC0DE,      0,      0, 0xC9C3,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xB2D9, 0xC7E6,      0, /* 0xC0 */
-    0xDFA7,      0, 0xC7DC,      0,      0,      0,      0, 0xDFA8, /* 0xD0 */
-    0xEBA2,      0,      0,      0,      0,      0, 0xCBD3,      0, /* 0xD0 */
-         0,      0, 0xDFAA,      0, 0xDFA9,      0, 0xB2C1          /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xB2F3, 0xB8E9, 0xC2A7, 	 0, 	 0, 0xBDC1, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xDEF5, 0xDEF8, 	 0, 	 0, 0xB2AB, /* 0x00 */
+    0xB4A4, 	 0, 	 0, 0xB4EA, 0xC9A6, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xDEF6, 0xCBD1, 	 0, 0xB8E3, 	 0, /* 0x10 */
+    0xDEF7, 0xDEFA, 	 0, 	 0, 	 0, 	 0, 0xDEF9, 	 0, /* 0x20 */
+         0, 	 0, 0xCCC2, 	 0, 0xB0E1, 0xB4EE, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xE5BA, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xD0AF, 	 0, 	 0, 0xB2EB, 	 0, 0xEBA1, /* 0x30 */
+         0, 0xDEF4, 	 0, 	 0, 0xC9E3, 0xDEF3, 0xB0DA, 0xD2A1, /* 0x40 */
+    0xB1F7, 	 0, 0xCCAF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xDEF0, 	 0, 0xCBA4, 	 0, 	 0, 	 0, /* 0x50 */
+    0xD5AA, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDEFB, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB4DD, /* 0x60 */
+         0, 0xC4A6, 	 0, 	 0, 	 0, 0xDEFD, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xC3FE, 0xC4A1, 0xDFA1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xC1CC, 	 0, 0xDEFC, 0xBEEF, 	 0, 0xC6B2, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xB3C5, 0xC8F6, 	 0, 	 0, 0xCBBA, 0xDEFE, 	 0, /* 0x90 */
+         0, 0xDFA4, 	 0, 	 0, 	 0, 	 0, 0xD7B2, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xB3B7, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xC1C3, 	 0, 	 0, 0xC7CB, 0xB2A5, 0xB4E9, 	 0, /* 0xA0 */
+    0xD7AB, 	 0, 	 0, 	 0, 	 0, 0xC4EC, 	 0, 0xDFA2, /* 0xB0 */
+    0xDFA3, 	 0, 0xDFA5, 	 0, 0xBAB3, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xDFA6, 	 0, 0xC0DE, 	 0, 	 0, 0xC9C3, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB2D9, 0xC7E6, 	 0, /* 0xC0 */
+    0xDFA7, 	 0, 0xC7DC, 	 0, 	 0, 	 0, 	 0, 0xDFA8, /* 0xD0 */
+    0xEBA2, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBD3, 	 0, /* 0xD0 */
+         0, 	 0, 0xDFAA, 	 0, 0xDFA9, 	 0, 0xB2C1			/* 0xE0 */
                                                                     /* 0xE0 */
 };
 
@@ -956,581 +956,581 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_64[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_65[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xC5CA,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xDFAB,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xD4DC,      0,      0,      0,      0,      0, /* 0x10 */
-    0xC8C1,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xDFAC,      0,      0, /* 0x20 */
-         0,      0,      0, 0xBEF0,      0,      0, 0xDFAD, 0xD6A7, /* 0x20 */
-         0,      0,      0,      0, 0xEAB7, 0xEBB6, 0xCAD5,      0, /* 0x30 */
-    0xD8FC, 0xB8C4,      0, 0xB9A5,      0,      0, 0xB7C5, 0xD5FE, /* 0x30 */
-         0,      0,      0,      0,      0, 0xB9CA,      0,      0, /* 0x40 */
-    0xD0A7, 0xF4CD,      0,      0, 0xB5D0,      0,      0, 0xC3F4, /* 0x40 */
-         0, 0xBEC8,      0,      0,      0, 0xEBB7, 0xB0BD,      0, /* 0x50 */
-         0, 0xBDCC,      0, 0xC1B2,      0, 0xB1D6, 0xB3A8,      0, /* 0x50 */
-         0,      0, 0xB8D2, 0xC9A2,      0,      0, 0xB6D8,      0, /* 0x60 */
-         0,      0,      0, 0xEBB8, 0xBEB4,      0,      0,      0, /* 0x60 */
-    0xCAFD,      0, 0xC7C3,      0, 0xD5FB,      0,      0, 0xB7F3, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xCEC4, /* 0x80 */
-         0,      0,      0, 0xD5AB, 0xB1F3,      0,      0,      0, /* 0x80 */
-    0xECB3, 0xB0DF,      0, 0xECB5,      0,      0,      0, 0xB6B7, /* 0x90 */
-         0, 0xC1CF,      0, 0xF5FA, 0xD0B1,      0,      0, 0xD5E5, /* 0x90 */
-         0, 0xCED3,      0,      0, 0xBDEF, 0xB3E2,      0, 0xB8AB, /* 0xA0 */
-         0, 0xD5B6,      0, 0xEDBD,      0, 0xB6CF,      0, 0xCBB9, /* 0xA0 */
-    0xD0C2,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xB7BD,      0,      0, 0xECB6, 0xCAA9,      0,      0, /* 0xB0 */
-         0, 0xC5D4,      0, 0xECB9, 0xECB8, 0xC2C3, 0xECB7,      0, /* 0xC0 */
-         0,      0,      0, 0xD0FD, 0xECBA,      0, 0xECBB, 0xD7E5, /* 0xC0 */
-         0,      0, 0xECBC,      0,      0,      0, 0xECBD, 0xC6EC, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xCEDE,      0, 0xBCC8,      0,      0, 0xC8D5, 0xB5A9, 0xBEC9, /* 0xE0 */
-    0xD6BC, 0xD4E7,      0,      0, 0xD1AE, 0xD0F1, 0xEAB8, 0xEAB9, /* 0xE0 */
-    0xEABA, 0xBAB5,      0,      0,      0,      0, 0xCAB1, 0xBFF5, /* 0xF0 */
-         0,      0, 0xCDFA                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xC5CA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xDFAB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xD4DC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xC8C1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDFAC, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xBEF0, 	 0, 	 0, 0xDFAD, 0xD6A7, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xEAB7, 0xEBB6, 0xCAD5, 	 0, /* 0x30 */
+    0xD8FC, 0xB8C4, 	 0, 0xB9A5, 	 0, 	 0, 0xB7C5, 0xD5FE, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB9CA, 	 0, 	 0, /* 0x40 */
+    0xD0A7, 0xF4CD, 	 0, 	 0, 0xB5D0, 	 0, 	 0, 0xC3F4, /* 0x40 */
+         0, 0xBEC8, 	 0, 	 0, 	 0, 0xEBB7, 0xB0BD, 	 0, /* 0x50 */
+         0, 0xBDCC, 	 0, 0xC1B2, 	 0, 0xB1D6, 0xB3A8, 	 0, /* 0x50 */
+         0, 	 0, 0xB8D2, 0xC9A2, 	 0, 	 0, 0xB6D8, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xEBB8, 0xBEB4, 	 0, 	 0, 	 0, /* 0x60 */
+    0xCAFD, 	 0, 0xC7C3, 	 0, 0xD5FB, 	 0, 	 0, 0xB7F3, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCEC4, /* 0x80 */
+         0, 	 0, 	 0, 0xD5AB, 0xB1F3, 	 0, 	 0, 	 0, /* 0x80 */
+    0xECB3, 0xB0DF, 	 0, 0xECB5, 	 0, 	 0, 	 0, 0xB6B7, /* 0x90 */
+         0, 0xC1CF, 	 0, 0xF5FA, 0xD0B1, 	 0, 	 0, 0xD5E5, /* 0x90 */
+         0, 0xCED3, 	 0, 	 0, 0xBDEF, 0xB3E2, 	 0, 0xB8AB, /* 0xA0 */
+         0, 0xD5B6, 	 0, 0xEDBD, 	 0, 0xB6CF, 	 0, 0xCBB9, /* 0xA0 */
+    0xD0C2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xB7BD, 	 0, 	 0, 0xECB6, 0xCAA9, 	 0, 	 0, /* 0xB0 */
+         0, 0xC5D4, 	 0, 0xECB9, 0xECB8, 0xC2C3, 0xECB7, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xD0FD, 0xECBA, 	 0, 0xECBB, 0xD7E5, /* 0xC0 */
+         0, 	 0, 0xECBC, 	 0, 	 0, 	 0, 0xECBD, 0xC6EC, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xCEDE, 	 0, 0xBCC8, 	 0, 	 0, 0xC8D5, 0xB5A9, 0xBEC9, /* 0xE0 */
+    0xD6BC, 0xD4E7, 	 0, 	 0, 0xD1AE, 0xD0F1, 0xEAB8, 0xEAB9, /* 0xE0 */
+    0xEABA, 0xBAB5, 	 0, 	 0, 	 0, 	 0, 0xCAB1, 0xBFF5, /* 0xF0 */
+         0, 	 0, 0xCDFA											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_66[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xEAC0,      0, 0xB0BA, 0xEABE,      0,      0, 0xC0A5,      0, /* 0x00 */
-         0,      0, 0xEABB,      0, 0xB2FD,      0, 0xC3F7, 0xBBE8, /* 0x00 */
-         0,      0,      0, 0xD2D7, 0xCEF4, 0xEABF,      0,      0, /* 0x10 */
-         0, 0xEABC,      0,      0,      0, 0xEAC3,      0, 0xD0C7, /* 0x10 */
-    0xD3B3,      0,      0,      0,      0, 0xB4BA,      0, 0xC3C1, /* 0x20 */
-    0xD7F2,      0,      0,      0,      0, 0xD5D1,      0, 0xCAC7, /* 0x20 */
-         0, 0xEAC5,      0,      0, 0xEAC4, 0xEAC7, 0xEAC6,      0, /* 0x30 */
-         0,      0,      0,      0, 0xD6E7,      0, 0xCFD4,      0, /* 0x30 */
-         0, 0xEACB,      0, 0xBBCE,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xBDFA, 0xC9CE,      0,      0, 0xEACC, /* 0x40 */
-         0,      0, 0xC9B9, 0xCFFE, 0xEACA, 0xD4CE, 0xEACD, 0xEACF, /* 0x50 */
-         0,      0, 0xCDED,      0,      0,      0,      0, 0xEAC9, /* 0x50 */
-         0, 0xEACE,      0,      0, 0xCEEE,      0, 0xBBDE,      0, /* 0x60 */
-    0xB3BF,      0,      0,      0,      0,      0, 0xC6D5, 0xBEB0, /* 0x60 */
-    0xCEFA,      0,      0,      0, 0xC7E7,      0, 0xBEA7, 0xEAD0, /* 0x70 */
-         0,      0, 0xD6C7,      0,      0,      0, 0xC1C0,      0, /* 0x70 */
-         0,      0, 0xD4DD,      0, 0xEAD1,      0,      0, 0xCFBE, /* 0x80 */
-         0,      0,      0,      0, 0xEAD2,      0,      0,      0, /* 0x80 */
-         0, 0xCAEE,      0,      0,      0,      0, 0xC5AF, 0xB0B5, /* 0x90 */
-         0,      0,      0,      0,      0, 0xEAD4,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xEAD3, /* 0xA0 */
-    0xF4DF,      0,      0,      0,      0,      0, 0xC4BA,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xB1A9,      0,      0,      0, /* 0xB0 */
-         0, 0xE5DF,      0,      0,      0,      0, 0xEAD5,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xCAEF,      0, 0xEAD6, 0xEAD7, 0xC6D8,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xEAD8,      0, /* 0xE0 */
-         0, 0xEAD9,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xD4BB,      0, 0xC7FA, 0xD2B7, 0xB8FC,      0,      0, 0xEAC2, /* 0xF0 */
-         0, 0xB2DC,      0,      0, 0xC2FC,      0, 0xD4F8, 0xCCE6  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xEAC0, 	 0, 0xB0BA, 0xEABE, 	 0, 	 0, 0xC0A5, 	 0, /* 0x00 */
+         0, 	 0, 0xEABB, 	 0, 0xB2FD, 	 0, 0xC3F7, 0xBBE8, /* 0x00 */
+         0, 	 0, 	 0, 0xD2D7, 0xCEF4, 0xEABF, 	 0, 	 0, /* 0x10 */
+         0, 0xEABC, 	 0, 	 0, 	 0, 0xEAC3, 	 0, 0xD0C7, /* 0x10 */
+    0xD3B3, 	 0, 	 0, 	 0, 	 0, 0xB4BA, 	 0, 0xC3C1, /* 0x20 */
+    0xD7F2, 	 0, 	 0, 	 0, 	 0, 0xD5D1, 	 0, 0xCAC7, /* 0x20 */
+         0, 0xEAC5, 	 0, 	 0, 0xEAC4, 0xEAC7, 0xEAC6, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xD6E7, 	 0, 0xCFD4, 	 0, /* 0x30 */
+         0, 0xEACB, 	 0, 0xBBCE, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xBDFA, 0xC9CE, 	 0, 	 0, 0xEACC, /* 0x40 */
+         0, 	 0, 0xC9B9, 0xCFFE, 0xEACA, 0xD4CE, 0xEACD, 0xEACF, /* 0x50 */
+         0, 	 0, 0xCDED, 	 0, 	 0, 	 0, 	 0, 0xEAC9, /* 0x50 */
+         0, 0xEACE, 	 0, 	 0, 0xCEEE, 	 0, 0xBBDE, 	 0, /* 0x60 */
+    0xB3BF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC6D5, 0xBEB0, /* 0x60 */
+    0xCEFA, 	 0, 	 0, 	 0, 0xC7E7, 	 0, 0xBEA7, 0xEAD0, /* 0x70 */
+         0, 	 0, 0xD6C7, 	 0, 	 0, 	 0, 0xC1C0, 	 0, /* 0x70 */
+         0, 	 0, 0xD4DD, 	 0, 0xEAD1, 	 0, 	 0, 0xCFBE, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xEAD2, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xCAEE, 	 0, 	 0, 	 0, 	 0, 0xC5AF, 0xB0B5, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEAD4, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEAD3, /* 0xA0 */
+    0xF4DF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC4BA, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xB1A9, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE5DF, 	 0, 	 0, 	 0, 	 0, 0xEAD5, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xCAEF, 	 0, 0xEAD6, 0xEAD7, 0xC6D8, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEAD8, 	 0, /* 0xE0 */
+         0, 0xEAD9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xD4BB, 	 0, 0xC7FA, 0xD2B7, 0xB8FC, 	 0, 	 0, 0xEAC2, /* 0xF0 */
+         0, 0xB2DC, 	 0, 	 0, 0xC2FC, 	 0, 0xD4F8, 0xCCE6	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_67[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD7EE,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0xD4C2, 0xD3D0, 0xEBC3, 0xC5F3,      0, 0xB7FE,      0,      0, /* 0x00 */
-    0xEBD4,      0,      0,      0, 0xCBB7, 0xEBDE,      0, 0xC0CA, /* 0x10 */
-         0,      0,      0, 0xCDFB,      0, 0xB3AF,      0, 0xC6DA, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xEBFC,      0, /* 0x20 */
-    0xC4BE,      0, 0xCEB4, 0xC4A9, 0xB1BE, 0xD4FD,      0, 0xCAF5, /* 0x20 */
-         0, 0xD6EC,      0,      0, 0xC6D3, 0xB6E4,      0,      0, /* 0x30 */
-         0,      0, 0xBBFA,      0,      0, 0xD0E0,      0,      0, /* 0x30 */
-    0xC9B1,      0, 0xD4D3, 0xC8A8,      0,      0, 0xB8CB,      0, /* 0x40 */
-    0xE8BE, 0xC9BC,      0,      0, 0xE8BB,      0, 0xC0EE, 0xD0D3, /* 0x40 */
-    0xB2C4, 0xB4E5,      0, 0xE8BC,      0,      0, 0xD5C8,      0, /* 0x50 */
-         0,      0,      0,      0, 0xB6C5,      0, 0xE8BD, 0xCAF8, /* 0x50 */
-    0xB8DC, 0xCCF5,      0,      0,      0, 0xC0B4,      0,      0, /* 0x60 */
-    0xD1EE, 0xE8BF, 0xE8C2,      0,      0, 0xBABC,      0, 0xB1AD, /* 0x60 */
-    0xBDDC,      0, 0xEABD, 0xE8C3,      0, 0xE8C6,      0, 0xE8CB, /* 0x70 */
-         0,      0,      0,      0, 0xE8CC,      0, 0xCBC9, 0xB0E5, /* 0x70 */
-         0, 0xBCAB,      0,      0, 0xB9B9,      0,      0, 0xE8C1, /* 0x80 */
-         0, 0xCDF7,      0, 0xE8CA,      0,      0,      0,      0, /* 0x80 */
-    0xCEF6,      0,      0,      0,      0, 0xD5ED,      0, 0xC1D6, /* 0x90 */
-    0xE8C4,      0, 0xC3B6,      0, 0xB9FB, 0xD6A6, 0xE8C8,      0, /* 0x90 */
-         0,      0, 0xCAE0, 0xD4E6,      0, 0xE8C0,      0, 0xE8C5, /* 0xA0 */
-    0xE8C7,      0, 0xC7B9, 0xB7E3,      0, 0xE8C9,      0, 0xBFDD, /* 0xA0 */
-    0xE8D2,      0,      0, 0xE8D7,      0, 0xE8D5, 0xBCDC, 0xBCCF, /* 0xB0 */
-    0xE8DB,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE8DE,      0, 0xE8DA, 0xB1FA,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xB0D8, /* 0xC0 */
-    0xC4B3, 0xB8CC, 0xC6E2, 0xC8BE, 0xC8E1,      0,      0,      0, /* 0xD0 */
-    0xE8CF, 0xE8D4, 0xE8D6,      0, 0xB9F1, 0xE8D8, 0xD7F5,      0, /* 0xD0 */
-    0xC4FB,      0, 0xE8DC,      0,      0, 0xB2E9,      0,      0, /* 0xE0 */
-         0, 0xE8D1,      0,      0, 0xBCED,      0,      0, 0xBFC2, /* 0xE0 */
-    0xE8CD, 0xD6F9,      0, 0xC1F8, 0xB2F1,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xE8DF,      0, 0xCAC1  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD7EE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xD4C2, 0xD3D0, 0xEBC3, 0xC5F3, 	 0, 0xB7FE, 	 0, 	 0, /* 0x00 */
+    0xEBD4, 	 0, 	 0, 	 0, 0xCBB7, 0xEBDE, 	 0, 0xC0CA, /* 0x10 */
+         0, 	 0, 	 0, 0xCDFB, 	 0, 0xB3AF, 	 0, 0xC6DA, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEBFC, 	 0, /* 0x20 */
+    0xC4BE, 	 0, 0xCEB4, 0xC4A9, 0xB1BE, 0xD4FD, 	 0, 0xCAF5, /* 0x20 */
+         0, 0xD6EC, 	 0, 	 0, 0xC6D3, 0xB6E4, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xBBFA, 	 0, 	 0, 0xD0E0, 	 0, 	 0, /* 0x30 */
+    0xC9B1, 	 0, 0xD4D3, 0xC8A8, 	 0, 	 0, 0xB8CB, 	 0, /* 0x40 */
+    0xE8BE, 0xC9BC, 	 0, 	 0, 0xE8BB, 	 0, 0xC0EE, 0xD0D3, /* 0x40 */
+    0xB2C4, 0xB4E5, 	 0, 0xE8BC, 	 0, 	 0, 0xD5C8, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xB6C5, 	 0, 0xE8BD, 0xCAF8, /* 0x50 */
+    0xB8DC, 0xCCF5, 	 0, 	 0, 	 0, 0xC0B4, 	 0, 	 0, /* 0x60 */
+    0xD1EE, 0xE8BF, 0xE8C2, 	 0, 	 0, 0xBABC, 	 0, 0xB1AD, /* 0x60 */
+    0xBDDC, 	 0, 0xEABD, 0xE8C3, 	 0, 0xE8C6, 	 0, 0xE8CB, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xE8CC, 	 0, 0xCBC9, 0xB0E5, /* 0x70 */
+         0, 0xBCAB, 	 0, 	 0, 0xB9B9, 	 0, 	 0, 0xE8C1, /* 0x80 */
+         0, 0xCDF7, 	 0, 0xE8CA, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xCEF6, 	 0, 	 0, 	 0, 	 0, 0xD5ED, 	 0, 0xC1D6, /* 0x90 */
+    0xE8C4, 	 0, 0xC3B6, 	 0, 0xB9FB, 0xD6A6, 0xE8C8, 	 0, /* 0x90 */
+         0, 	 0, 0xCAE0, 0xD4E6, 	 0, 0xE8C0, 	 0, 0xE8C5, /* 0xA0 */
+    0xE8C7, 	 0, 0xC7B9, 0xB7E3, 	 0, 0xE8C9, 	 0, 0xBFDD, /* 0xA0 */
+    0xE8D2, 	 0, 	 0, 0xE8D7, 	 0, 0xE8D5, 0xBCDC, 0xBCCF, /* 0xB0 */
+    0xE8DB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE8DE, 	 0, 0xE8DA, 0xB1FA, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB0D8, /* 0xC0 */
+    0xC4B3, 0xB8CC, 0xC6E2, 0xC8BE, 0xC8E1, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE8CF, 0xE8D4, 0xE8D6, 	 0, 0xB9F1, 0xE8D8, 0xD7F5, 	 0, /* 0xD0 */
+    0xC4FB, 	 0, 0xE8DC, 	 0, 	 0, 0xB2E9, 	 0, 	 0, /* 0xE0 */
+         0, 0xE8D1, 	 0, 	 0, 0xBCED, 	 0, 	 0, 0xBFC2, /* 0xE0 */
+    0xE8CD, 0xD6F9, 	 0, 0xC1F8, 0xB2F1, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE8DF, 	 0, 0xCAC1	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_68[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE8D9,      0,      0,      0,      0, 0xD5A4,      0, 0xB1EA, /* 0x00 */
-    0xD5BB, 0xE8CE, 0xE8D0, 0xB6B0, 0xE8D3,      0, 0xE8DD, 0xC0B8, /* 0x00 */
-         0, 0xCAF7,      0, 0xCBA8,      0,      0, 0xC6DC, 0xC0F5, /* 0x10 */
-         0,      0,      0,      0,      0, 0xE8E9,      0,      0, /* 0x10 */
-         0, 0xD0A3,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xE8F2, 0xD6EA,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xE8E0, 0xE8E1,      0,      0,      0, 0xD1F9, /* 0x30 */
-    0xBACB, 0xB8F9,      0,      0, 0xB8F1, 0xD4D4, 0xE8EF,      0, /* 0x30 */
-    0xE8EE, 0xE8EC, 0xB9F0, 0xCCD2, 0xE8E6, 0xCEA6, 0xBFF2,      0, /* 0x40 */
-    0xB0B8, 0xE8F1, 0xE8F0,      0, 0xD7C0,      0, 0xE8E4,      0, /* 0x40 */
-    0xCDA9, 0xC9A3,      0, 0xBBB8, 0xBDDB, 0xE8EA,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE8D9, 	 0, 	 0, 	 0, 	 0, 0xD5A4, 	 0, 0xB1EA, /* 0x00 */
+    0xD5BB, 0xE8CE, 0xE8D0, 0xB6B0, 0xE8D3, 	 0, 0xE8DD, 0xC0B8, /* 0x00 */
+         0, 0xCAF7, 	 0, 0xCBA8, 	 0, 	 0, 0xC6DC, 0xC0F5, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE8E9, 	 0, 	 0, /* 0x10 */
+         0, 0xD0A3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xE8F2, 0xD6EA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xE8E0, 0xE8E1, 	 0, 	 0, 	 0, 0xD1F9, /* 0x30 */
+    0xBACB, 0xB8F9, 	 0, 	 0, 0xB8F1, 0xD4D4, 0xE8EF, 	 0, /* 0x30 */
+    0xE8EE, 0xE8EC, 0xB9F0, 0xCCD2, 0xE8E6, 0xCEA6, 0xBFF2, 	 0, /* 0x40 */
+    0xB0B8, 0xE8F1, 0xE8F0, 	 0, 0xD7C0, 	 0, 0xE8E4, 	 0, /* 0x40 */
+    0xCDA9, 0xC9A3, 	 0, 0xBBB8, 0xBDDB, 0xE8EA, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
     0xE8E2, 0xE8E3, 0xE8E5, 0xB5B5, 0xE8E7, 0xC7C5, 0xE8EB, 0xE8ED, /* 0x60 */
-    0xBDB0, 0xD7AE,      0, 0xE8F8,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xE8F5,      0, 0xCDB0, 0xE8F6, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xC1BA,      0, 0xE8E8,      0, 0xC3B7, 0xB0F0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0, 0xE8F4, /* 0x80 */
-         0,      0,      0, 0xE8F7,      0,      0,      0, 0xB9A3, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xC9D2,      0,      0,      0, 0xC3CE, 0xCEE0, /* 0xA0 */
-    0xC0E6,      0,      0,      0,      0, 0xCBF3,      0, 0xCCDD, /* 0xA0 */
-    0xD0B5,      0,      0, 0xCAE1,      0, 0xE8F3,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xBCEC,      0, 0xE8F9,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xC3DE,      0, 0xC6E5,      0, 0xB9F7,      0,      0, /* 0xC0 */
-         0,      0, 0xB0F4,      0,      0, 0xD7D8,      0,      0, /* 0xD0 */
-    0xBCAC,      0, 0xC5EF,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xCCC4,      0,      0, 0xE9A6,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xC9AD,      0, /* 0xE0 */
-    0xE9A2, 0xC0E2,      0,      0,      0, 0xBFC3,      0,      0, /* 0xF0 */
-         0, 0xE8FE, 0xB9D7,      0, 0xE8FB                          /* 0xF0 */
+    0xBDB0, 0xD7AE, 	 0, 0xE8F8, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xE8F5, 	 0, 0xCDB0, 0xE8F6, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xC1BA, 	 0, 0xE8E8, 	 0, 0xC3B7, 0xB0F0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8F4, /* 0x80 */
+         0, 	 0, 	 0, 0xE8F7, 	 0, 	 0, 	 0, 0xB9A3, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xC9D2, 	 0, 	 0, 	 0, 0xC3CE, 0xCEE0, /* 0xA0 */
+    0xC0E6, 	 0, 	 0, 	 0, 	 0, 0xCBF3, 	 0, 0xCCDD, /* 0xA0 */
+    0xD0B5, 	 0, 	 0, 0xCAE1, 	 0, 0xE8F3, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xBCEC, 	 0, 0xE8F9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xC3DE, 	 0, 0xC6E5, 	 0, 0xB9F7, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xB0F4, 	 0, 	 0, 0xD7D8, 	 0, 	 0, /* 0xD0 */
+    0xBCAC, 	 0, 0xC5EF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xCCC4, 	 0, 	 0, 0xE9A6, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC9AD, 	 0, /* 0xE0 */
+    0xE9A2, 0xC0E2, 	 0, 	 0, 	 0, 0xBFC3, 	 0, 	 0, /* 0xF0 */
+         0, 0xE8FE, 0xB9D7, 	 0, 0xE8FB							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_69[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE9A4,      0,      0,      0, 0xD2CE,      0,      0, /* 0x00 */
-         0,      0,      0, 0xE9A3,      0, 0xD6B2, 0xD7B5,      0, /* 0x00 */
-    0xE9A7,      0, 0xBDB7,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xE8FC, /* 0x10 */
-    0xE8FD,      0,      0,      0, 0xE9A1,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xCDD6,      0,      0, /* 0x20 */
-    0xD2AC,      0,      0,      0, 0xE9B2,      0,      0,      0, /* 0x30 */
-         0, 0xE9A9,      0,      0,      0, 0xB4AA,      0, 0xB4BB, /* 0x30 */
-         0,      0, 0xE9AB,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xD0A8,      0,      0, 0xE9A5, /* 0x50 */
-         0,      0, 0xB3FE,      0,      0, 0xE9AC, 0xC0E3,      0, /* 0x50 */
-    0xE9AA,      0,      0, 0xE9B9,      0,      0, 0xE9B8,      0, /* 0x60 */
-         0,      0,      0, 0xE9AE,      0,      0, 0xE8FA,      0, /* 0x60 */
-         0, 0xE9A8,      0,      0,      0,      0,      0, 0xBFAC, /* 0x70 */
-    0xE9B1, 0xE9BA,      0,      0, 0xC2A5,      0,      0,      0, /* 0x70 */
-    0xE9AF,      0, 0xB8C5,      0, 0xE9AD,      0, 0xD3DC, 0xE9B4, /* 0x80 */
-    0xE9B5, 0xE9B7,      0,      0,      0, 0xE9C7,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0xC0C6, 0xE9C5,      0,      0, /* 0x90 */
-    0xE9B0,      0,      0, 0xE9BB, 0xB0F1,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xE9BC, /* 0xA0 */
-    0xD5A5,      0,      0, 0xE9BE,      0, 0xE9BF,      0,      0, /* 0xA0 */
-         0, 0xE9C1,      0,      0, 0xC1F1,      0,      0, 0xC8B6, /* 0xB0 */
-         0,      0,      0, 0xE9BD,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE9C2,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xE9C3,      0, 0xE9B3,      0, 0xE9B6,      0, /* 0xC0 */
-    0xBBB1,      0,      0,      0, 0xE9C0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xBCF7,      0,      0,      0, 0xE9C4, /* 0xD0 */
-    0xE9C6,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xE9CA,      0,      0, /* 0xE0 */
-         0,      0, 0xE9CE,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xB2DB,      0, 0xE9C8  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE9A4, 	 0, 	 0, 	 0, 0xD2CE, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xE9A3, 	 0, 0xD6B2, 0xD7B5, 	 0, /* 0x00 */
+    0xE9A7, 	 0, 0xBDB7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8FC, /* 0x10 */
+    0xE8FD, 	 0, 	 0, 	 0, 0xE9A1, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCDD6, 	 0, 	 0, /* 0x20 */
+    0xD2AC, 	 0, 	 0, 	 0, 0xE9B2, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xE9A9, 	 0, 	 0, 	 0, 0xB4AA, 	 0, 0xB4BB, /* 0x30 */
+         0, 	 0, 0xE9AB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xD0A8, 	 0, 	 0, 0xE9A5, /* 0x50 */
+         0, 	 0, 0xB3FE, 	 0, 	 0, 0xE9AC, 0xC0E3, 	 0, /* 0x50 */
+    0xE9AA, 	 0, 	 0, 0xE9B9, 	 0, 	 0, 0xE9B8, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xE9AE, 	 0, 	 0, 0xE8FA, 	 0, /* 0x60 */
+         0, 0xE9A8, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBFAC, /* 0x70 */
+    0xE9B1, 0xE9BA, 	 0, 	 0, 0xC2A5, 	 0, 	 0, 	 0, /* 0x70 */
+    0xE9AF, 	 0, 0xB8C5, 	 0, 0xE9AD, 	 0, 0xD3DC, 0xE9B4, /* 0x80 */
+    0xE9B5, 0xE9B7, 	 0, 	 0, 	 0, 0xE9C7, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xC0C6, 0xE9C5, 	 0, 	 0, /* 0x90 */
+    0xE9B0, 	 0, 	 0, 0xE9BB, 0xB0F1, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9BC, /* 0xA0 */
+    0xD5A5, 	 0, 	 0, 0xE9BE, 	 0, 0xE9BF, 	 0, 	 0, /* 0xA0 */
+         0, 0xE9C1, 	 0, 	 0, 0xC1F1, 	 0, 	 0, 0xC8B6, /* 0xB0 */
+         0, 	 0, 	 0, 0xE9BD, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE9C2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE9C3, 	 0, 0xE9B3, 	 0, 0xE9B6, 	 0, /* 0xC0 */
+    0xBBB1, 	 0, 	 0, 	 0, 0xE9C0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xBCF7, 	 0, 	 0, 	 0, 0xE9C4, /* 0xD0 */
+    0xE9C6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE9CA, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xE9CE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB2DB, 	 0, 0xE9C8	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_6A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-                    0xB7AE,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0, 0xE9CB, /* 0x10 */
-    0xE9CC,      0,      0,      0,      0,      0,      0, 0xD5C1, /* 0x10 */
-         0, 0xC4A3,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xE9D8,      0, 0xBAE1,      0,      0,      0,      0, 0xE9C9, /* 0x20 */
-         0, 0xD3A3,      0,      0,      0, 0xE9D4,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xE9D7, 0xE9D0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xE9CF,      0,      0, 0xC7C1, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xE9D2,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xE9D9, 0xB3C8,      0, 0xE9D3,      0,      0,      0,      0, /* 0x50 */
-         0, 0xCFF0,      0,      0,      0, 0xE9CD,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xB3F7,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xE9D6,      0,      0, 0xE9DA,      0,      0,      0, /* 0x70 */
-    0xCCB4,      0,      0,      0, 0xCFAD,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xE9D5,      0, /* 0x80 */
-    0xE9DC, 0xE9DB,      0,      0,      0,      0,      0, 0xE9DE, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xE9D1,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xE9DD,      0, 0xE9DF, 0xC3CA                          /* 0xA0 */
+                    0xB7AE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9CB, /* 0x10 */
+    0xE9CC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD5C1, /* 0x10 */
+         0, 0xC4A3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xE9D8, 	 0, 0xBAE1, 	 0, 	 0, 	 0, 	 0, 0xE9C9, /* 0x20 */
+         0, 0xD3A3, 	 0, 	 0, 	 0, 0xE9D4, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE9D7, 0xE9D0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xE9CF, 	 0, 	 0, 0xC7C1, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xE9D2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xE9D9, 0xB3C8, 	 0, 0xE9D3, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xCFF0, 	 0, 	 0, 	 0, 0xE9CD, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xB3F7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xE9D6, 	 0, 	 0, 0xE9DA, 	 0, 	 0, 	 0, /* 0x70 */
+    0xCCB4, 	 0, 	 0, 	 0, 0xCFAD, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9D5, 	 0, /* 0x80 */
+    0xE9DC, 0xE9DB, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9DE, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xE9D1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xE9DD, 	 0, 0xE9DF, 0xC3CA							/* 0xA0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_6B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xC7B7, 0xB4CE, 0xBBB6, 0xD0C0, 0xECA3,      0,      0, 0xC5B7, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xD3FB,      0,      0,      0,      0, 0xECA4, /* 0x30 */
-         0, 0xECA5, 0xC6DB,      0,      0,      0, 0xBFEE,      0, /* 0x30 */
-         0,      0,      0, 0xECA6,      0,      0, 0xECA7, 0xD0AA, /* 0x40 */
-         0, 0xC7B8,      0,      0, 0xB8E8,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xECA8,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xD6B9, 0xD5FD, 0xB4CB, 0xB2BD, 0xCEE4, 0xC6E7, /* 0x60 */
-         0,      0, 0xCDE1,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xB4F5,      0, 0xCBC0, 0xBCDF,      0,      0,      0, /* 0x70 */
-         0, 0xE9E2, 0xE9E3, 0xD1EA, 0xE9E5,      0, 0xB4F9, 0xE9E4, /* 0x80 */
-         0, 0xD1B3, 0xCAE2, 0xB2D0,      0, 0xE9E8,      0,      0, /* 0x80 */
-         0,      0, 0xE9E6, 0xE9E7,      0,      0, 0xD6B3,      0, /* 0x90 */
-         0,      0, 0xE9E9, 0xE9EA,      0,      0,      0,      0, /* 0x90 */
-         0, 0xE9EB,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xE9EC,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xECAF, 0xC5B9, 0xB6CE,      0, 0xD2F3, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xB5EE, /* 0xB0 */
-         0, 0xBBD9, 0xECB1,      0,      0, 0xD2E3,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xCEE3,      0, 0xC4B8,      0, 0xC3BF, /* 0xC0 */
-         0,      0, 0xB6BE, 0xD8B9, 0xB1C8, 0xB1CF, 0xB1D1, 0xC5FE, /* 0xD0 */
-         0, 0xB1D0,      0, 0xC3AB,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xD5B1,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0xEBA4, 0xBAC1,      0,      0,      0, 0xCCBA, /* 0xE0 */
-         0,      0,      0, 0xEBA5,      0, 0xEBA7,      0,      0, /* 0xF0 */
-         0, 0xEBA8,      0,      0,      0, 0xEBA6                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xC7B7, 0xB4CE, 0xBBB6, 0xD0C0, 0xECA3, 	 0, 	 0, 0xC5B7, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xD3FB, 	 0, 	 0, 	 0, 	 0, 0xECA4, /* 0x30 */
+         0, 0xECA5, 0xC6DB, 	 0, 	 0, 	 0, 0xBFEE, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xECA6, 	 0, 	 0, 0xECA7, 0xD0AA, /* 0x40 */
+         0, 0xC7B8, 	 0, 	 0, 0xB8E8, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xECA8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xD6B9, 0xD5FD, 0xB4CB, 0xB2BD, 0xCEE4, 0xC6E7, /* 0x60 */
+         0, 	 0, 0xCDE1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xB4F5, 	 0, 0xCBC0, 0xBCDF, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xE9E2, 0xE9E3, 0xD1EA, 0xE9E5, 	 0, 0xB4F9, 0xE9E4, /* 0x80 */
+         0, 0xD1B3, 0xCAE2, 0xB2D0, 	 0, 0xE9E8, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE9E6, 0xE9E7, 	 0, 	 0, 0xD6B3, 	 0, /* 0x90 */
+         0, 	 0, 0xE9E9, 0xE9EA, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xE9EB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xE9EC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xECAF, 0xC5B9, 0xB6CE, 	 0, 0xD2F3, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB5EE, /* 0xB0 */
+         0, 0xBBD9, 0xECB1, 	 0, 	 0, 0xD2E3, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xCEE3, 	 0, 0xC4B8, 	 0, 0xC3BF, /* 0xC0 */
+         0, 	 0, 0xB6BE, 0xD8B9, 0xB1C8, 0xB1CF, 0xB1D1, 0xC5FE, /* 0xD0 */
+         0, 0xB1D0, 	 0, 0xC3AB, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xD5B1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xEBA4, 0xBAC1, 	 0, 	 0, 	 0, 0xCCBA, /* 0xE0 */
+         0, 	 0, 	 0, 0xEBA5, 	 0, 0xEBA7, 	 0, 	 0, /* 0xF0 */
+         0, 0xEBA8, 	 0, 	 0, 	 0, 0xEBA6					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_6C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                             0xEBA9, 0xEBAB, 0xEBAA, /* 0x00 */
-         0,      0,      0,      0,      0, 0xEBAC,      0, 0xCACF, /* 0x00 */
-    0xD8B5, 0xC3F1,      0, 0xC3A5, 0xC6F8, 0xEBAD, 0xC4CA,      0, /* 0x10 */
-    0xEBAE, 0xEBAF, 0xEBB0, 0xB7D5,      0,      0,      0, 0xB7FA, /* 0x10 */
-         0, 0xEBB1, 0xC7E2,      0, 0xEBB3,      0, 0xBAA4, 0xD1F5, /* 0x20 */
-    0xB0B1, 0xEBB2, 0xEBB4,      0,      0,      0, 0xB5AA, 0xC2C8, /* 0x20 */
-    0xC7E8,      0, 0xEBB5,      0, 0xCBAE, 0xE3DF,      0,      0, /* 0x30 */
-    0xD3C0,      0,      0,      0,      0, 0xD9DB,      0,      0, /* 0x30 */
-    0xCDA1, 0xD6AD, 0xC7F3,      0,      0,      0, 0xD9E0, 0xBBE3, /* 0x40 */
-         0, 0xBABA, 0xE3E2,      0,      0,      0,      0,      0, /* 0x40 */
-    0xCFAB,      0,      0,      0, 0xE3E0, 0xC9C7,      0, 0xBAB9, /* 0x50 */
-         0,      0,      0, 0xD1B4, 0xE3E1, 0xC8EA, 0xB9AF, 0xBDAD, /* 0x50 */
-    0xB3D8, 0xCEDB,      0,      0, 0xCCC0,      0,      0,      0, /* 0x60 */
-    0xE3E8, 0xE3E9, 0xCDF4,      0,      0,      0,      0,      0, /* 0x60 */
-    0xCCAD,      0, 0xBCB3,      0, 0xE3EA,      0, 0xE3EB,      0, /* 0x70 */
-         0, 0xD0DA,      0,      0,      0, 0xC6FB, 0xB7DA,      0, /* 0x70 */
-         0, 0xC7DF, 0xD2CA, 0xCED6,      0, 0xE3E4, 0xE3EC,      0, /* 0x80 */
-    0xC9F2, 0xB3C1,      0,      0, 0xE3E7,      0,      0, 0xC6E3, /* 0x80 */
-    0xE3E5,      0,      0, 0xEDB3, 0xE3E6,      0,      0,      0, /* 0x90 */
-         0, 0xC9B3,      0, 0xC5E6,      0,      0,      0, 0xB9B5, /* 0x90 */
-         0, 0xC3BB,      0, 0xE3E3, 0xC5BD, 0xC1A4, 0xC2D9, 0xB2D7, /* 0xA0 */
-         0, 0xE3ED, 0xBBA6, 0xC4AD,      0, 0xE3F0, 0xBEDA,      0, /* 0xA0 */
-         0, 0xE3FB, 0xE3F5, 0xBAD3,      0,      0,      0,      0, /* 0xB0 */
-    0xB7D0, 0xD3CD,      0, 0xD6CE, 0xD5D3, 0xB9C1, 0xD5B4, 0xD1D8, /* 0xB0 */
-         0,      0,      0,      0, 0xD0B9, 0xC7F6,      0,      0, /* 0xC0 */
-         0, 0xC8AA, 0xB2B4,      0, 0xC3DA,      0,      0,      0, /* 0xC0 */
-    0xE3EE,      0,      0, 0xE3FC, 0xE3EF, 0xB7A8, 0xE3F7, 0xE3F4, /* 0xD0 */
-         0,      0,      0, 0xB7BA,      0,      0, 0xC5A2,      0, /* 0xD0 */
-    0xE3F6, 0xC5DD, 0xB2A8, 0xC6FC,      0, 0xC4E0,      0,      0, /* 0xE0 */
-    0xD7A2,      0, 0xC0E1, 0xE3F9,      0,      0, 0xE3FA, 0xE3FD, /* 0xE0 */
-    0xCCA9, 0xE3F3,      0, 0xD3BE,      0, 0xB1C3, 0xEDB4, 0xE3F1, /* 0xF0 */
-    0xE3F2,      0, 0xE3F8, 0xD0BA, 0xC6C3, 0xD4F3, 0xE3FE          /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEBAC, 	 0, 0xCACF, /* 0x00 */
+    0xD8B5, 0xC3F1, 	 0, 0xC3A5, 0xC6F8, 0xEBAD, 0xC4CA, 	 0, /* 0x10 */
+    0xEBAE, 0xEBAF, 0xEBB0, 0xB7D5, 	 0, 	 0, 	 0, 0xB7FA, /* 0x10 */
+         0, 0xEBB1, 0xC7E2, 	 0, 0xEBB3, 	 0, 0xBAA4, 0xD1F5, /* 0x20 */
+    0xB0B1, 0xEBB2, 0xEBB4, 	 0, 	 0, 	 0, 0xB5AA, 0xC2C8, /* 0x20 */
+    0xC7E8, 	 0, 0xEBB5, 	 0, 0xCBAE, 0xE3DF, 	 0, 	 0, /* 0x30 */
+    0xD3C0, 	 0, 	 0, 	 0, 	 0, 0xD9DB, 	 0, 	 0, /* 0x30 */
+    0xCDA1, 0xD6AD, 0xC7F3, 	 0, 	 0, 	 0, 0xD9E0, 0xBBE3, /* 0x40 */
+         0, 0xBABA, 0xE3E2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xCFAB, 	 0, 	 0, 	 0, 0xE3E0, 0xC9C7, 	 0, 0xBAB9, /* 0x50 */
+         0, 	 0, 	 0, 0xD1B4, 0xE3E1, 0xC8EA, 0xB9AF, 0xBDAD, /* 0x50 */
+    0xB3D8, 0xCEDB, 	 0, 	 0, 0xCCC0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xE3E8, 0xE3E9, 0xCDF4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xCCAD, 	 0, 0xBCB3, 	 0, 0xE3EA, 	 0, 0xE3EB, 	 0, /* 0x70 */
+         0, 0xD0DA, 	 0, 	 0, 	 0, 0xC6FB, 0xB7DA, 	 0, /* 0x70 */
+         0, 0xC7DF, 0xD2CA, 0xCED6, 	 0, 0xE3E4, 0xE3EC, 	 0, /* 0x80 */
+    0xC9F2, 0xB3C1, 	 0, 	 0, 0xE3E7, 	 0, 	 0, 0xC6E3, /* 0x80 */
+    0xE3E5, 	 0, 	 0, 0xEDB3, 0xE3E6, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xC9B3, 	 0, 0xC5E6, 	 0, 	 0, 	 0, 0xB9B5, /* 0x90 */
+         0, 0xC3BB, 	 0, 0xE3E3, 0xC5BD, 0xC1A4, 0xC2D9, 0xB2D7, /* 0xA0 */
+         0, 0xE3ED, 0xBBA6, 0xC4AD, 	 0, 0xE3F0, 0xBEDA, 	 0, /* 0xA0 */
+         0, 0xE3FB, 0xE3F5, 0xBAD3, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xB7D0, 0xD3CD, 	 0, 0xD6CE, 0xD5D3, 0xB9C1, 0xD5B4, 0xD1D8, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xD0B9, 0xC7F6, 	 0, 	 0, /* 0xC0 */
+         0, 0xC8AA, 0xB2B4, 	 0, 0xC3DA, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xE3EE, 	 0, 	 0, 0xE3FC, 0xE3EF, 0xB7A8, 0xE3F7, 0xE3F4, /* 0xD0 */
+         0, 	 0, 	 0, 0xB7BA, 	 0, 	 0, 0xC5A2, 	 0, /* 0xD0 */
+    0xE3F6, 0xC5DD, 0xB2A8, 0xC6FC, 	 0, 0xC4E0, 	 0, 	 0, /* 0xE0 */
+    0xD7A2, 	 0, 0xC0E1, 0xE3F9, 	 0, 	 0, 0xE3FA, 0xE3FD, /* 0xE0 */
+    0xCCA9, 0xE3F3, 	 0, 0xD3BE, 	 0, 0xB1C3, 0xEDB4, 0xE3F1, /* 0xF0 */
+    0xE3F2, 	 0, 0xE3F8, 0xD0BA, 0xC6C3, 0xD4F3, 0xE3FE			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_6D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xBDE0,      0,      0, 0xE4A7,      0,      0, 0xE4A6, /* 0x00 */
-         0,      0,      0, 0xD1F3, 0xE4A3,      0, 0xE4A9,      0, /* 0x00 */
-         0,      0, 0xC8F7,      0,      0,      0,      0, 0xCFB4, /* 0x10 */
-         0, 0xE4A8, 0xE4AE, 0xC2E5,      0,      0, 0xB6B4,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xBDF2,      0, 0xE4A2, /* 0x20 */
-         0,      0, 0xBAE9, 0xE4AA,      0,      0, 0xE4AC,      0, /* 0x20 */
-         0, 0xB6FD, 0xD6DE, 0xE4B2,      0, 0xE4AD,      0,      0, /* 0x30 */
-         0, 0xE4A1,      0, 0xBBEE, 0xCDDD, 0xC7A2, 0xC5C9,      0, /* 0x30 */
-         0, 0xC1F7,      0, 0xE4A4,      0, 0xC7B3, 0xBDAC, 0xBDBD, /* 0x40 */
-    0xE4A5,      0, 0xD7C7, 0xB2E2,      0, 0xE4AB, 0xBCC3, 0xE4AF, /* 0x40 */
-         0, 0xBBEB, 0xE4B0, 0xC5A8, 0xE4B1,      0,      0,      0, /* 0x50 */
-         0, 0xD5E3, 0xBFA3,      0, 0xE4BA,      0, 0xE4B7,      0, /* 0x50 */
-    0xE4BB,      0,      0, 0xE4BD,      0,      0, 0xC6D6,      0, /* 0x60 */
-         0, 0xBAC6, 0xC0CB,      0,      0,      0, 0xB8A1, 0xE4B4, /* 0x60 */
-         0,      0,      0,      0, 0xD4A1,      0,      0, 0xBAA3, /* 0x70 */
-    0xBDFE,      0,      0,      0, 0xE4BC,      0,      0,      0, /* 0x70 */
-         0,      0, 0xCDBF,      0,      0, 0xC4F9,      0,      0, /* 0x80 */
-    0xCFFB, 0xC9E6,      0,      0, 0xD3BF,      0, 0xCFD1,      0, /* 0x80 */
-         0, 0xE4B3,      0, 0xE4B8, 0xE4B9, 0xCCE9,      0,      0, /* 0x90 */
-         0,      0,      0, 0xCCCE,      0, 0xC0D4, 0xE4B5, 0xC1B0, /* 0x90 */
-    0xE4B6, 0xCED0,      0, 0xBBC1, 0xB5D3,      0, 0xC8F3, 0xBDA7, /* 0xA0 */
-    0xD5C7, 0xC9AC, 0xB8A2, 0xE4CA,      0,      0, 0xE4CC, 0xD1C4, /* 0xA0 */
-         0,      0, 0xD2BA,      0,      0, 0xBAAD,      0,      0, /* 0xB0 */
-    0xBAD4,      0,      0,      0,      0,      0,      0, 0xE4C3, /* 0xB0 */
-    0xB5ED,      0,      0,      0, 0xD7CD, 0xE4C0, 0xCFFD, 0xE4BF, /* 0xC0 */
-         0,      0,      0, 0xC1DC, 0xCCCA,      0,      0,      0, /* 0xC0 */
-         0, 0xCAE7,      0,      0,      0,      0, 0xC4D7,      0, /* 0xD0 */
-    0xCCD4, 0xE4C8,      0,      0,      0, 0xE4C7, 0xE4C1,      0, /* 0xD0 */
-    0xE4C4, 0xB5AD,      0,      0, 0xD3D9,      0, 0xE4C6,      0, /* 0xE0 */
-         0,      0,      0, 0xD2F9, 0xB4E3,      0, 0xBBB4,      0, /* 0xE0 */
-         0, 0xC9EE,      0, 0xB4BE,      0,      0,      0, 0xBBEC, /* 0xF0 */
-         0, 0xD1CD,      0, 0xCCED, 0xEDB5                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xBDE0, 	 0, 	 0, 0xE4A7, 	 0, 	 0, 0xE4A6, /* 0x00 */
+         0, 	 0, 	 0, 0xD1F3, 0xE4A3, 	 0, 0xE4A9, 	 0, /* 0x00 */
+         0, 	 0, 0xC8F7, 	 0, 	 0, 	 0, 	 0, 0xCFB4, /* 0x10 */
+         0, 0xE4A8, 0xE4AE, 0xC2E5, 	 0, 	 0, 0xB6B4, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xBDF2, 	 0, 0xE4A2, /* 0x20 */
+         0, 	 0, 0xBAE9, 0xE4AA, 	 0, 	 0, 0xE4AC, 	 0, /* 0x20 */
+         0, 0xB6FD, 0xD6DE, 0xE4B2, 	 0, 0xE4AD, 	 0, 	 0, /* 0x30 */
+         0, 0xE4A1, 	 0, 0xBBEE, 0xCDDD, 0xC7A2, 0xC5C9, 	 0, /* 0x30 */
+         0, 0xC1F7, 	 0, 0xE4A4, 	 0, 0xC7B3, 0xBDAC, 0xBDBD, /* 0x40 */
+    0xE4A5, 	 0, 0xD7C7, 0xB2E2, 	 0, 0xE4AB, 0xBCC3, 0xE4AF, /* 0x40 */
+         0, 0xBBEB, 0xE4B0, 0xC5A8, 0xE4B1, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xD5E3, 0xBFA3, 	 0, 0xE4BA, 	 0, 0xE4B7, 	 0, /* 0x50 */
+    0xE4BB, 	 0, 	 0, 0xE4BD, 	 0, 	 0, 0xC6D6, 	 0, /* 0x60 */
+         0, 0xBAC6, 0xC0CB, 	 0, 	 0, 	 0, 0xB8A1, 0xE4B4, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xD4A1, 	 0, 	 0, 0xBAA3, /* 0x70 */
+    0xBDFE, 	 0, 	 0, 	 0, 0xE4BC, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xCDBF, 	 0, 	 0, 0xC4F9, 	 0, 	 0, /* 0x80 */
+    0xCFFB, 0xC9E6, 	 0, 	 0, 0xD3BF, 	 0, 0xCFD1, 	 0, /* 0x80 */
+         0, 0xE4B3, 	 0, 0xE4B8, 0xE4B9, 0xCCE9, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xCCCE, 	 0, 0xC0D4, 0xE4B5, 0xC1B0, /* 0x90 */
+    0xE4B6, 0xCED0, 	 0, 0xBBC1, 0xB5D3, 	 0, 0xC8F3, 0xBDA7, /* 0xA0 */
+    0xD5C7, 0xC9AC, 0xB8A2, 0xE4CA, 	 0, 	 0, 0xE4CC, 0xD1C4, /* 0xA0 */
+         0, 	 0, 0xD2BA, 	 0, 	 0, 0xBAAD, 	 0, 	 0, /* 0xB0 */
+    0xBAD4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4C3, /* 0xB0 */
+    0xB5ED, 	 0, 	 0, 	 0, 0xD7CD, 0xE4C0, 0xCFFD, 0xE4BF, /* 0xC0 */
+         0, 	 0, 	 0, 0xC1DC, 0xCCCA, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xCAE7, 	 0, 	 0, 	 0, 	 0, 0xC4D7, 	 0, /* 0xD0 */
+    0xCCD4, 0xE4C8, 	 0, 	 0, 	 0, 0xE4C7, 0xE4C1, 	 0, /* 0xD0 */
+    0xE4C4, 0xB5AD, 	 0, 	 0, 0xD3D9, 	 0, 0xE4C6, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xD2F9, 0xB4E3, 	 0, 0xBBB4, 	 0, /* 0xE0 */
+         0, 0xC9EE, 	 0, 0xB4BE, 	 0, 	 0, 	 0, 0xBBEC, /* 0xF0 */
+         0, 0xD1CD, 	 0, 0xCCED, 0xEDB5							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_6E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xC7E5,      0,      0, /* 0x00 */
-         0,      0, 0xD4A8,      0, 0xE4CB, 0xD7D5, 0xE4C2,      0, /* 0x00 */
-    0xBDA5, 0xE4C5,      0,      0, 0xD3E6,      0, 0xE4C9, 0xC9F8, /* 0x10 */
-         0,      0, 0xE4BE,      0,      0, 0xD3E5,      0,      0, /* 0x10 */
-    0xC7FE, 0xB6C9,      0, 0xD4FC, 0xB2B3, 0xE4D7,      0,      0, /* 0x20 */
-         0, 0xCEC2,      0, 0xE4CD,      0, 0xCEBC,      0, 0xB8DB, /* 0x20 */
-         0,      0, 0xE4D6,      0, 0xBFCA,      0,      0,      0, /* 0x30 */
-    0xD3CE,      0, 0xC3EC,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xC5C8, 0xE4D8,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xCDC4, 0xE4CF,      0, /* 0x40 */
-         0,      0,      0, 0xE4D4, 0xE4D5,      0, 0xBAFE,      0, /* 0x50 */
-    0xCFE6,      0,      0, 0xD5BF,      0,      0,      0, 0xE4D2, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xE4D0,      0,      0, 0xE4CE,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xCDE5, 0xCAAA, /* 0x70 */
-         0,      0,      0, 0xC0A3,      0, 0xBDA6, 0xE4D3,      0, /* 0x80 */
-         0, 0xB8C8,      0,      0,      0,      0,      0, 0xE4E7, /* 0x80 */
-    0xD4B4,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xE4DB,      0,      0,      0, 0xC1EF,      0,      0, 0xE4E9, /* 0x90 */
-         0,      0, 0xD2E7,      0,      0, 0xE4DF,      0, 0xE4E0, /* 0xA0 */
-         0,      0, 0xCFAA,      0,      0,      0,      0, 0xCBDD, /* 0xA0 */
-         0, 0xE4DA, 0xE4D1,      0, 0xE4E5,      0, 0xC8DC, 0xE4E3, /* 0xB0 */
-         0,      0, 0xC4E7, 0xE4E2,      0, 0xE4E1,      0,      0, /* 0xB0 */
-         0, 0xB3FC, 0xE4E8,      0,      0,      0,      0, 0xB5E1, /* 0xC0 */
-         0,      0,      0, 0xD7CC,      0,      0,      0, 0xE4E6, /* 0xC0 */
-         0, 0xBBAC,      0, 0xD7D2, 0xCCCF, 0xEBF8,      0, 0xE4E4, /* 0xD0 */
-         0,      0, 0xB9F6,      0,      0,      0, 0xD6CD, 0xE4D9, /* 0xD0 */
-    0xE4DC, 0xC2FA, 0xE4DE,      0, 0xC2CB, 0xC0C4, 0xC2D0,      0, /* 0xE0 */
-    0xB1F5, 0xCCB2,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xB5CE,      0,      0,      0, /* 0xF0 */
-         0, 0xE4EF                                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xC7E5, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xD4A8, 	 0, 0xE4CB, 0xD7D5, 0xE4C2, 	 0, /* 0x00 */
+    0xBDA5, 0xE4C5, 	 0, 	 0, 0xD3E6, 	 0, 0xE4C9, 0xC9F8, /* 0x10 */
+         0, 	 0, 0xE4BE, 	 0, 	 0, 0xD3E5, 	 0, 	 0, /* 0x10 */
+    0xC7FE, 0xB6C9, 	 0, 0xD4FC, 0xB2B3, 0xE4D7, 	 0, 	 0, /* 0x20 */
+         0, 0xCEC2, 	 0, 0xE4CD, 	 0, 0xCEBC, 	 0, 0xB8DB, /* 0x20 */
+         0, 	 0, 0xE4D6, 	 0, 0xBFCA, 	 0, 	 0, 	 0, /* 0x30 */
+    0xD3CE, 	 0, 0xC3EC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xC5C8, 0xE4D8, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCDC4, 0xE4CF, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xE4D4, 0xE4D5, 	 0, 0xBAFE, 	 0, /* 0x50 */
+    0xCFE6, 	 0, 	 0, 0xD5BF, 	 0, 	 0, 	 0, 0xE4D2, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xE4D0, 	 0, 	 0, 0xE4CE, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCDE5, 0xCAAA, /* 0x70 */
+         0, 	 0, 	 0, 0xC0A3, 	 0, 0xBDA6, 0xE4D3, 	 0, /* 0x80 */
+         0, 0xB8C8, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4E7, /* 0x80 */
+    0xD4B4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xE4DB, 	 0, 	 0, 	 0, 0xC1EF, 	 0, 	 0, 0xE4E9, /* 0x90 */
+         0, 	 0, 0xD2E7, 	 0, 	 0, 0xE4DF, 	 0, 0xE4E0, /* 0xA0 */
+         0, 	 0, 0xCFAA, 	 0, 	 0, 	 0, 	 0, 0xCBDD, /* 0xA0 */
+         0, 0xE4DA, 0xE4D1, 	 0, 0xE4E5, 	 0, 0xC8DC, 0xE4E3, /* 0xB0 */
+         0, 	 0, 0xC4E7, 0xE4E2, 	 0, 0xE4E1, 	 0, 	 0, /* 0xB0 */
+         0, 0xB3FC, 0xE4E8, 	 0, 	 0, 	 0, 	 0, 0xB5E1, /* 0xC0 */
+         0, 	 0, 	 0, 0xD7CC, 	 0, 	 0, 	 0, 0xE4E6, /* 0xC0 */
+         0, 0xBBAC, 	 0, 0xD7D2, 0xCCCF, 0xEBF8, 	 0, 0xE4E4, /* 0xD0 */
+         0, 	 0, 0xB9F6, 	 0, 	 0, 	 0, 0xD6CD, 0xE4D9, /* 0xD0 */
+    0xE4DC, 0xC2FA, 0xE4DE, 	 0, 0xC2CB, 0xC0C4, 0xC2D0, 	 0, /* 0xE0 */
+    0xB1F5, 0xCCB2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xB5CE, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xE4EF													/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_6F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xC6AF,      0,      0,      0, 0xC6E1,      0, /* 0x00 */
-         0, 0xE4F5,      0,      0,      0,      0,      0, 0xC2A9, /* 0x00 */
-         0,      0,      0, 0xC0EC, 0xD1DD, 0xE4EE,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xC4AE,      0,      0,      0, 0xE4ED,      0,      0,      0, /* 0x20 */
-         0, 0xE4F6, 0xE4F4, 0xC2FE,      0, 0xE4DD,      0, 0xE4F0, /* 0x20 */
-         0, 0xCAFE,      0, 0xD5C4,      0,      0, 0xE4F1,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xD1FA,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xE4EB, 0xE4EC, /* 0x40 */
-         0,      0,      0, 0xE4F2,      0, 0xCEAB,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xC5CB,      0,      0,      0, 0xC7B1,      0, 0xC2BA,      0, /* 0x50 */
-         0,      0, 0xE4EA,      0,      0,      0, 0xC1CA,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xCCB6, 0xB3B1,      0, /* 0x60 */
-         0,      0, 0xE4FB,      0, 0xE4F3,      0,      0,      0, /* 0x70 */
-    0xE4FA,      0, 0xE4FD,      0, 0xE4FC,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xB3CE,      0,      0,      0, /* 0x80 */
-    0xB3BA, 0xE4F7,      0,      0, 0xE4F9, 0xE4F8, 0xC5EC,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xC0BD,      0,      0,      0, /* 0x90 */
-         0, 0xD4E8,      0,      0,      0,      0,      0, 0xE5A2, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xB0C4,      0,      0, 0xE5A4,      0, /* 0xB0 */
-         0, 0xE5A3,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xBCA4,      0, 0xE5A5,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xE5A1,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xE4FE, 0xB1F4,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xE5A8,      0, /* 0xD0 */
-    0xE5A9, 0xE5A6,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xE5A7, 0xE5AA  /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xC6AF, 	 0, 	 0, 	 0, 0xC6E1, 	 0, /* 0x00 */
+         0, 0xE4F5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC2A9, /* 0x00 */
+         0, 	 0, 	 0, 0xC0EC, 0xD1DD, 0xE4EE, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xC4AE, 	 0, 	 0, 	 0, 0xE4ED, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xE4F6, 0xE4F4, 0xC2FE, 	 0, 0xE4DD, 	 0, 0xE4F0, /* 0x20 */
+         0, 0xCAFE, 	 0, 0xD5C4, 	 0, 	 0, 0xE4F1, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD1FA, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4EB, 0xE4EC, /* 0x40 */
+         0, 	 0, 	 0, 0xE4F2, 	 0, 0xCEAB, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xC5CB, 	 0, 	 0, 	 0, 0xC7B1, 	 0, 0xC2BA, 	 0, /* 0x50 */
+         0, 	 0, 0xE4EA, 	 0, 	 0, 	 0, 0xC1CA, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCCB6, 0xB3B1, 	 0, /* 0x60 */
+         0, 	 0, 0xE4FB, 	 0, 0xE4F3, 	 0, 	 0, 	 0, /* 0x70 */
+    0xE4FA, 	 0, 0xE4FD, 	 0, 0xE4FC, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xB3CE, 	 0, 	 0, 	 0, /* 0x80 */
+    0xB3BA, 0xE4F7, 	 0, 	 0, 0xE4F9, 0xE4F8, 0xC5EC, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xC0BD, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xD4E8, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5A2, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xB0C4, 	 0, 	 0, 0xE5A4, 	 0, /* 0xB0 */
+         0, 0xE5A3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xBCA4, 	 0, 0xE5A5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xE5A1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xE4FE, 0xB1F4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5A8, 	 0, /* 0xD0 */
+    0xE5A9, 0xE5A6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5A7, 0xE5AA	/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_70[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xC6D9,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0xE5AB, 0xE5AD,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xE5AC,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xE5AF,      0,      0, /* 0x30 */
-         0, 0xE5AE,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xB9E0,      0,      0, 0xE5B0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xE5B1,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xBBF0, 0xECE1, 0xC3F0,      0, 0xB5C6, /* 0x60 */
-    0xBBD2,      0,      0,      0,      0, 0xC1E9, 0xD4EE,      0, /* 0x70 */
-    0xBEC4,      0,      0,      0, 0xD7C6,      0, 0xD4D6, 0xB2D3, /* 0x70 */
-    0xECBE,      0,      0,      0,      0, 0xEAC1,      0,      0, /* 0x80 */
-         0, 0xC2AF, 0xB4B6,      0,      0,      0, 0xD1D7,      0, /* 0x80 */
-         0,      0, 0xB3B4,      0, 0xC8B2, 0xBFBB, 0xECC0,      0, /* 0x90 */
-         0, 0xD6CB,      0,      0, 0xECBF, 0xECC1,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xECC5, 0xBEE6, 0xCCBF, 0xC5DA, 0xBEBC, /* 0xA0 */
-         0, 0xECC6,      0, 0xB1FE,      0,      0,      0, 0xECC4, /* 0xB0 */
-    0xD5A8, 0xB5E3,      0, 0xECC2, 0xC1B6, 0xB3E3,      0,      0, /* 0xB0 */
-    0xECC3, 0xCBB8, 0xC0C3, 0xCCFE,      0,      0,      0,      0, /* 0xC0 */
-    0xC1D2,      0, 0xECC8,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xBAE6, 0xC0D3,      0, 0xD6F2,      0,      0,      0, 0xD1CC, /* 0xD0 */
-         0,      0,      0,      0, 0xBFBE,      0, 0xB7B3, 0xC9D5, /* 0xE0 */
-    0xECC7, 0xBBE2,      0, 0xCCCC, 0xBDFD, 0xC8C8,      0, 0xCFA9, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xCDE9, /* 0xF0 */
-         0, 0xC5EB,      0,      0,      0, 0xB7E9                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xC6D9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xE5AB, 0xE5AD, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xE5AC, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE5AF, 	 0, 	 0, /* 0x30 */
+         0, 0xE5AE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xB9E0, 	 0, 	 0, 0xE5B0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5B1, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xBBF0, 0xECE1, 0xC3F0, 	 0, 0xB5C6, /* 0x60 */
+    0xBBD2, 	 0, 	 0, 	 0, 	 0, 0xC1E9, 0xD4EE, 	 0, /* 0x70 */
+    0xBEC4, 	 0, 	 0, 	 0, 0xD7C6, 	 0, 0xD4D6, 0xB2D3, /* 0x70 */
+    0xECBE, 	 0, 	 0, 	 0, 	 0, 0xEAC1, 	 0, 	 0, /* 0x80 */
+         0, 0xC2AF, 0xB4B6, 	 0, 	 0, 	 0, 0xD1D7, 	 0, /* 0x80 */
+         0, 	 0, 0xB3B4, 	 0, 0xC8B2, 0xBFBB, 0xECC0, 	 0, /* 0x90 */
+         0, 0xD6CB, 	 0, 	 0, 0xECBF, 0xECC1, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xECC5, 0xBEE6, 0xCCBF, 0xC5DA, 0xBEBC, /* 0xA0 */
+         0, 0xECC6, 	 0, 0xB1FE, 	 0, 	 0, 	 0, 0xECC4, /* 0xB0 */
+    0xD5A8, 0xB5E3, 	 0, 0xECC2, 0xC1B6, 0xB3E3, 	 0, 	 0, /* 0xB0 */
+    0xECC3, 0xCBB8, 0xC0C3, 0xCCFE, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xC1D2, 	 0, 0xECC8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xBAE6, 0xC0D3, 	 0, 0xD6F2, 	 0, 	 0, 	 0, 0xD1CC, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xBFBE, 	 0, 0xB7B3, 0xC9D5, /* 0xE0 */
+    0xECC7, 0xBBE2, 	 0, 0xCCCC, 0xBDFD, 0xC8C8, 	 0, 0xCFA9, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCDE9, /* 0xF0 */
+         0, 0xC5EB, 	 0, 	 0, 	 0, 0xB7E9					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_71[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-            0xD1C9, 0xBAB8,      0,      0,      0,      0,      0, /* 0x00 */
-    0xECC9,      0,      0, 0xECCA,      0, 0xBBC0, 0xECCB,      0, /* 0x10 */
-    0xECE2, 0xB1BA, 0xB7D9,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xBDB9,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xECCC, /* 0x20 */
-    0xD1E6, 0xECCD,      0,      0,      0,      0, 0xC8BB,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xECD1,      0,      0, /* 0x40 */
-         0,      0, 0xECD3,      0, 0xBBCD,      0, 0xBCE5,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xECCF,      0, 0xC9B7,      0, /* 0x50 */
-         0,      0,      0,      0, 0xC3BA,      0, 0xECE3, 0xD5D5, /* 0x60 */
-    0xECD0,      0,      0,      0,      0,      0, 0xD6F3,      0, /* 0x60 */
-         0,      0, 0xECD2, 0xECCE,      0,      0,      0,      0, /* 0x70 */
-    0xECD4,      0, 0xECD5,      0,      0, 0xC9BF,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xCFA8,      0,      0,      0, /* 0x80 */
-         0,      0, 0xD0DC,      0,      0,      0,      0, 0xD1AC, /* 0x80 */
-         0,      0,      0,      0, 0xC8DB,      0,      0,      0, /* 0x90 */
-    0xECD6, 0xCEF5,      0,      0,      0,      0,      0, 0xCAEC, /* 0x90 */
-    0xECDA,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xECD9,      0,      0,      0, 0xB0BE,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xECD7,      0, 0xECD8,      0,      0, /* 0xB0 */
-         0, 0xECE4,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xC8BC,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xC1C7,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xECDC, 0xD1E0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xECDB,      0,      0,      0,      0, 0xD4EF,      0, 0xECDD, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xDBC6,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xECDE                                                  /* 0xF0 */
+            0xD1C9, 0xBAB8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xECC9, 	 0, 	 0, 0xECCA, 	 0, 0xBBC0, 0xECCB, 	 0, /* 0x10 */
+    0xECE2, 0xB1BA, 0xB7D9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBDB9, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xECCC, /* 0x20 */
+    0xD1E6, 0xECCD, 	 0, 	 0, 	 0, 	 0, 0xC8BB, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xECD1, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xECD3, 	 0, 0xBBCD, 	 0, 0xBCE5, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xECCF, 	 0, 0xC9B7, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xC3BA, 	 0, 0xECE3, 0xD5D5, /* 0x60 */
+    0xECD0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD6F3, 	 0, /* 0x60 */
+         0, 	 0, 0xECD2, 0xECCE, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xECD4, 	 0, 0xECD5, 	 0, 	 0, 0xC9BF, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xCFA8, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xD0DC, 	 0, 	 0, 	 0, 	 0, 0xD1AC, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xC8DB, 	 0, 	 0, 	 0, /* 0x90 */
+    0xECD6, 0xCEF5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCAEC, /* 0x90 */
+    0xECDA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xECD9, 	 0, 	 0, 	 0, 0xB0BE, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xECD7, 	 0, 0xECD8, 	 0, 	 0, /* 0xB0 */
+         0, 0xECE4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xC8BC, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC1C7, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xECDC, 0xD1E0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xECDB, 	 0, 	 0, 	 0, 	 0, 0xD4EF, 	 0, 0xECDD, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDBC6, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xECDE													/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_72[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0xB1AC,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xECDF,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xECE0,      0, 0xD7A6,      0, 0xC5C0,      0,      0,      0, /* 0x20 */
-    0xEBBC, 0xB0AE,      0,      0,      0, 0xBEF4, 0xB8B8, 0xD2AF, /* 0x30 */
-    0xB0D6, 0xB5F9,      0, 0xD8B3,      0, 0xCBAC,      0, 0xE3DD, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xC6AC, /* 0x40 */
-    0xB0E6,      0,      0,      0, 0xC5C6, 0xEBB9,      0,      0, /* 0x40 */
-         0,      0, 0xEBBA,      0,      0,      0, 0xEBBB,      0, /* 0x50 */
-         0, 0xD1C0,      0, 0xC5A3,      0, 0xEAF2,      0, 0xC4B2, /* 0x50 */
-         0, 0xC4B5, 0xC0CE,      0,      0,      0, 0xEAF3, 0xC4C1, /* 0x60 */
-         0, 0xCEEF,      0,      0,      0,      0, 0xEAF0, 0xEAF4, /* 0x60 */
-         0,      0, 0xC9FC,      0,      0, 0xC7A3,      0,      0, /* 0x70 */
-         0, 0xCCD8, 0xCEFE,      0,      0,      0, 0xEAF5, 0xEAF6, /* 0x70 */
-    0xCFAC, 0xC0E7,      0,      0, 0xEAF7,      0,      0,      0, /* 0x80 */
-         0,      0, 0xB6BF, 0xEAF8,      0, 0xEAF9,      0, 0xEAFA, /* 0x80 */
-         0,      0, 0xEAFB,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xEAF1, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xC8AE, 0xE1EB,      0, 0xB7B8, /* 0xA0 */
-    0xE1EC,      0,      0,      0, 0xE1ED,      0, 0xD7B4, 0xE1EE, /* 0xB0 */
-    0xE1EF, 0xD3CC,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE1F1, 0xBFF1, 0xE1F0, 0xB5D2,      0,      0,      0, /* 0xC0 */
-    0xB1B7,      0,      0,      0,      0, 0xE1F3, 0xE1F2,      0, /* 0xC0 */
-    0xBAFC,      0, 0xE1F4,      0,      0,      0,      0, 0xB9B7, /* 0xD0 */
-         0, 0xBED1,      0,      0,      0,      0, 0xC4FC,      0, /* 0xD0 */
-    0xBADD, 0xBDC6,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xE1F5, 0xE1F7,      0,      0, 0xB6C0, 0xCFC1, 0xCAA8, 0xE1F6, /* 0xE0 */
-    0xD5F8, 0xD3FC, 0xE1F8, 0xE1FC, 0xE1F9,      0,      0, 0xE1FA, /* 0xF0 */
-    0xC0EA,      0, 0xE1FE, 0xE2A1, 0xC0C7                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0xB1AC, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xECDF, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xECE0, 	 0, 0xD7A6, 	 0, 0xC5C0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xEBBC, 0xB0AE, 	 0, 	 0, 	 0, 0xBEF4, 0xB8B8, 0xD2AF, /* 0x30 */
+    0xB0D6, 0xB5F9, 	 0, 0xD8B3, 	 0, 0xCBAC, 	 0, 0xE3DD, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC6AC, /* 0x40 */
+    0xB0E6, 	 0, 	 0, 	 0, 0xC5C6, 0xEBB9, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xEBBA, 	 0, 	 0, 	 0, 0xEBBB, 	 0, /* 0x50 */
+         0, 0xD1C0, 	 0, 0xC5A3, 	 0, 0xEAF2, 	 0, 0xC4B2, /* 0x50 */
+         0, 0xC4B5, 0xC0CE, 	 0, 	 0, 	 0, 0xEAF3, 0xC4C1, /* 0x60 */
+         0, 0xCEEF, 	 0, 	 0, 	 0, 	 0, 0xEAF0, 0xEAF4, /* 0x60 */
+         0, 	 0, 0xC9FC, 	 0, 	 0, 0xC7A3, 	 0, 	 0, /* 0x70 */
+         0, 0xCCD8, 0xCEFE, 	 0, 	 0, 	 0, 0xEAF5, 0xEAF6, /* 0x70 */
+    0xCFAC, 0xC0E7, 	 0, 	 0, 0xEAF7, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xB6BF, 0xEAF8, 	 0, 0xEAF9, 	 0, 0xEAFA, /* 0x80 */
+         0, 	 0, 0xEAFB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEAF1, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xC8AE, 0xE1EB, 	 0, 0xB7B8, /* 0xA0 */
+    0xE1EC, 	 0, 	 0, 	 0, 0xE1ED, 	 0, 0xD7B4, 0xE1EE, /* 0xB0 */
+    0xE1EF, 0xD3CC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE1F1, 0xBFF1, 0xE1F0, 0xB5D2, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xB1B7, 	 0, 	 0, 	 0, 	 0, 0xE1F3, 0xE1F2, 	 0, /* 0xC0 */
+    0xBAFC, 	 0, 0xE1F4, 	 0, 	 0, 	 0, 	 0, 0xB9B7, /* 0xD0 */
+         0, 0xBED1, 	 0, 	 0, 	 0, 	 0, 0xC4FC, 	 0, /* 0xD0 */
+    0xBADD, 0xBDC6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE1F5, 0xE1F7, 	 0, 	 0, 0xB6C0, 0xCFC1, 0xCAA8, 0xE1F6, /* 0xE0 */
+    0xD5F8, 0xD3FC, 0xE1F8, 0xE1FC, 0xE1F9, 	 0, 	 0, 0xE1FA, /* 0xF0 */
+    0xC0EA, 	 0, 0xE1FE, 0xE2A1, 0xC0C7							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_73[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE1FB,      0, 0xE1FD,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xE2A5,      0,      0,      0, 0xC1D4,      0, /* 0x00 */
-         0,      0,      0, 0xE2A3,      0, 0xE2A8, 0xB2FE, 0xE2A2, /* 0x10 */
-         0,      0,      0, 0xC3CD, 0xB2C2, 0xE2A7, 0xE2A6,      0, /* 0x10 */
-         0, 0xE2A4, 0xE2A9,      0,      0, 0xE2AB,      0,      0, /* 0x20 */
-         0, 0xD0C9, 0xD6ED, 0xC3A8, 0xE2AC,      0, 0xCFD7,      0, /* 0x20 */
-         0, 0xE2AE,      0,      0, 0xBAEF,      0,      0, 0xE9E0, /* 0x30 */
-    0xE2AD, 0xE2AA,      0,      0,      0,      0, 0xBBAB, 0xD4B3, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xE2B0,      0,      0, /* 0x40 */
-    0xE2AF,      0, 0xE9E1,      0,      0,      0,      0, 0xE2B1, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xE2B2,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xE2B3, 0xCCA1,      0, 0xE2B4, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xE2B5,      0, /* 0x70 */
-         0,      0,      0,      0, 0xD0FE,      0,      0, 0xC2CA, /* 0x80 */
-         0, 0xD3F1,      0, 0xCDF5,      0,      0, 0xE7E0,      0, /* 0x80 */
-         0, 0xE7E1,      0,      0,      0,      0, 0xBEC1,      0, /* 0x90 */
-         0,      0,      0, 0xC2EA,      0,      0,      0, 0xE7E4, /* 0x90 */
-         0,      0, 0xE7E3,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xCDE6,      0, 0xC3B5,      0,      0, 0xE7E2, 0xBBB7, /* 0xA0 */
-    0xCFD6,      0, 0xC1E1, 0xE7E9,      0,      0,      0, 0xE7E8, /* 0xB0 */
-         0,      0, 0xE7F4, 0xB2A3,      0,      0,      0,      0, /* 0xB0 */
-    0xE7EA,      0, 0xE7E6,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xE7EC, 0xE7EB, 0xC9BA,      0,      0, 0xD5E4,      0, 0xE7E5, /* 0xC0 */
-    0xB7A9, 0xE7E7,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xE7EE,      0,      0,      0,      0, 0xE7F3,      0, /* 0xD0 */
-    0xD6E9,      0,      0,      0,      0, 0xE7ED,      0, 0xE7F2, /* 0xE0 */
-         0, 0xE7F1,      0,      0,      0, 0xB0E0,      0,      0, /* 0xE0 */
-         0,      0, 0xE7F5                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE1FB, 	 0, 0xE1FD, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xE2A5, 	 0, 	 0, 	 0, 0xC1D4, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xE2A3, 	 0, 0xE2A8, 0xB2FE, 0xE2A2, /* 0x10 */
+         0, 	 0, 	 0, 0xC3CD, 0xB2C2, 0xE2A7, 0xE2A6, 	 0, /* 0x10 */
+         0, 0xE2A4, 0xE2A9, 	 0, 	 0, 0xE2AB, 	 0, 	 0, /* 0x20 */
+         0, 0xD0C9, 0xD6ED, 0xC3A8, 0xE2AC, 	 0, 0xCFD7, 	 0, /* 0x20 */
+         0, 0xE2AE, 	 0, 	 0, 0xBAEF, 	 0, 	 0, 0xE9E0, /* 0x30 */
+    0xE2AD, 0xE2AA, 	 0, 	 0, 	 0, 	 0, 0xBBAB, 0xD4B3, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE2B0, 	 0, 	 0, /* 0x40 */
+    0xE2AF, 	 0, 0xE9E1, 	 0, 	 0, 	 0, 	 0, 0xE2B1, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xE2B2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xE2B3, 0xCCA1, 	 0, 0xE2B4, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2B5, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xD0FE, 	 0, 	 0, 0xC2CA, /* 0x80 */
+         0, 0xD3F1, 	 0, 0xCDF5, 	 0, 	 0, 0xE7E0, 	 0, /* 0x80 */
+         0, 0xE7E1, 	 0, 	 0, 	 0, 	 0, 0xBEC1, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xC2EA, 	 0, 	 0, 	 0, 0xE7E4, /* 0x90 */
+         0, 	 0, 0xE7E3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xCDE6, 	 0, 0xC3B5, 	 0, 	 0, 0xE7E2, 0xBBB7, /* 0xA0 */
+    0xCFD6, 	 0, 0xC1E1, 0xE7E9, 	 0, 	 0, 	 0, 0xE7E8, /* 0xB0 */
+         0, 	 0, 0xE7F4, 0xB2A3, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xE7EA, 	 0, 0xE7E6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xE7EC, 0xE7EB, 0xC9BA, 	 0, 	 0, 0xD5E4, 	 0, 0xE7E5, /* 0xC0 */
+    0xB7A9, 0xE7E7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xE7EE, 	 0, 	 0, 	 0, 	 0, 0xE7F3, 	 0, /* 0xD0 */
+    0xD6E9, 	 0, 	 0, 	 0, 	 0, 0xE7ED, 	 0, 0xE7F2, /* 0xE0 */
+         0, 0xE7F1, 	 0, 	 0, 	 0, 0xB0E0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xE7F5											/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -1538,863 +1538,863 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_73[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_74[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xC7F2,      0, 0xC0C5, 0xC0ED,      0, /* 0x00 */
-         0, 0xC1F0, 0xE7F0,      0,      0,      0,      0, 0xE7F6, /* 0x00 */
-    0xCBF6,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0xE8A2, 0xE8A1,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0xD7C1,      0,      0, 0xE7FA, 0xE7F9,      0, /* 0x20 */
-    0xE7FB,      0, 0xE7F7,      0, 0xE7FE,      0, 0xE7FD,      0, /* 0x20 */
-    0xE7FC,      0,      0, 0xC1D5, 0xC7D9, 0xC5FD, 0xC5C3,      0, /* 0x30 */
-         0,      0,      0,      0, 0xC7ED,      0,      0,      0, /* 0x30 */
-         0, 0xE8A3,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xE8A6,      0, 0xE8A5, /* 0x50 */
-         0, 0xE8A7, 0xBAF7, 0xE7F8, 0xE8A4,      0, 0xC8F0, 0xC9AA, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xE8A9,      0,      0, /* 0x60 */
-    0xB9E5,      0,      0,      0,      0,      0, 0xD1FE, 0xE8A8, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xE8AA,      0, /* 0x70 */
-    0xE8AD, 0xE8AE,      0, 0xC1A7,      0,      0,      0, 0xE8AF, /* 0x80 */
-         0,      0,      0, 0xE8B0,      0,      0, 0xE8AC,      0, /* 0x80 */
-    0xE8B4,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xE8AB,      0, 0xE8B1,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xE8B5, /* 0xA0 */
-    0xE8B2, 0xE8B3,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xE8B7,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xE8B6,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xB9CF,      0, 0xF0AC,      0, /* 0xD0 */
-    0xF0AD,      0, 0xC6B0, 0xB0EA, 0xC8BF,      0, 0xCDDF,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xCECD, 0xEAB1, /* 0xE0 */
-         0,      0,      0,      0, 0xEAB2,      0, 0xC6BF, 0xB4C9, /* 0xF0 */
-         0,      0,      0,      0,      0,      0,      0, 0xEAB3  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xC7F2, 	 0, 0xC0C5, 0xC0ED, 	 0, /* 0x00 */
+         0, 0xC1F0, 0xE7F0, 	 0, 	 0, 	 0, 	 0, 0xE7F6, /* 0x00 */
+    0xCBF6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xE8A2, 0xE8A1, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xD7C1, 	 0, 	 0, 0xE7FA, 0xE7F9, 	 0, /* 0x20 */
+    0xE7FB, 	 0, 0xE7F7, 	 0, 0xE7FE, 	 0, 0xE7FD, 	 0, /* 0x20 */
+    0xE7FC, 	 0, 	 0, 0xC1D5, 0xC7D9, 0xC5FD, 0xC5C3, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xC7ED, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xE8A3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE8A6, 	 0, 0xE8A5, /* 0x50 */
+         0, 0xE8A7, 0xBAF7, 0xE7F8, 0xE8A4, 	 0, 0xC8F0, 0xC9AA, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE8A9, 	 0, 	 0, /* 0x60 */
+    0xB9E5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD1FE, 0xE8A8, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8AA, 	 0, /* 0x70 */
+    0xE8AD, 0xE8AE, 	 0, 0xC1A7, 	 0, 	 0, 	 0, 0xE8AF, /* 0x80 */
+         0, 	 0, 	 0, 0xE8B0, 	 0, 	 0, 0xE8AC, 	 0, /* 0x80 */
+    0xE8B4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xE8AB, 	 0, 0xE8B1, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8B5, /* 0xA0 */
+    0xE8B2, 0xE8B3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xE8B7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE8B6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xB9CF, 	 0, 0xF0AC, 	 0, /* 0xD0 */
+    0xF0AD, 	 0, 0xC6B0, 0xB0EA, 0xC8BF, 	 0, 0xCDDF, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCECD, 0xEAB1, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xEAB2, 	 0, 0xC6BF, 0xB4C9, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEAB3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_75[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xD5E7,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0xDDF9,      0, 0xEAB4, /* 0x00 */
-         0, 0xEAB5,      0, 0xEAB6,      0,      0,      0,      0, /* 0x10 */
-    0xB8CA, 0xDFB0, 0xC9F5,      0, 0xCCF0,      0,      0, 0xC9FA, /* 0x10 */
-         0,      0,      0,      0,      0, 0xC9FB,      0,      0, /* 0x20 */
-    0xD3C3, 0xCBA6,      0, 0xB8A6, 0xF0AE, 0xB1C2,      0, 0xE5B8, /* 0x20 */
-    0xCCEF, 0xD3C9, 0xBCD7, 0xC9EA,      0, 0xB5E7,      0, 0xC4D0, /* 0x30 */
-    0xB5E9,      0, 0xEEAE, 0xBBAD,      0,      0, 0xE7DE,      0, /* 0x30 */
-    0xEEAF,      0,      0,      0,      0, 0xB3A9,      0,      0, /* 0x40 */
-    0xEEB2,      0,      0, 0xEEB1, 0xBDE7,      0, 0xEEB0, 0xCEB7, /* 0x40 */
-         0,      0,      0,      0, 0xC5CF,      0,      0,      0, /* 0x50 */
-         0, 0xC1F4, 0xDBCE, 0xEEB3, 0xD0F3,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xC2D4, 0xC6E8,      0, /* 0x60 */
-         0,      0, 0xB7AC,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xEEB4,      0, 0xB3EB,      0,      0,      0, /* 0x70 */
-    0xBBFB, 0xEEB5,      0,      0,      0,      0,      0, 0xE7DC, /* 0x70 */
-         0,      0,      0, 0xEEB6,      0,      0, 0xBDAE,      0, /* 0x80 */
-         0,      0,      0, 0xF1E2,      0,      0,      0, 0xCAE8, /* 0x80 */
-         0, 0xD2C9, 0xF0DA,      0, 0xF0DB,      0, 0xF0DC, 0xC1C6, /* 0x90 */
-         0, 0xB8ED, 0xBECE,      0,      0, 0xF0DE,      0, 0xC5B1, /* 0x90 */
-    0xF0DD, 0xD1F1,      0, 0xF0E0, 0xB0CC, 0xBDEA,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xD2DF, 0xF0DF,      0, 0xB4AF, 0xB7E8, /* 0xA0 */
-    0xF0E6, 0xF0E5, 0xC6A3, 0xF0E1, 0xF0E2, 0xB4C3,      0,      0, /* 0xB0 */
-    0xF0E3, 0xD5EE,      0,      0, 0xCCDB, 0xBED2, 0xBCB2,      0, /* 0xB0 */
-         0,      0, 0xF0E8, 0xF0E7, 0xF0E4, 0xB2A1,      0, 0xD6A2, /* 0xC0 */
-    0xD3B8, 0xBEB7, 0xC8AC,      0,      0, 0xF0EA,      0,      0, /* 0xC0 */
-         0,      0, 0xD1F7,      0, 0xD6CC, 0xBADB, 0xF0E9,      0, /* 0xD0 */
-    0xB6BB,      0,      0, 0xCDB4,      0,      0, 0xC6A6,      0, /* 0xD0 */
-         0,      0, 0xC1A1, 0xF0EB, 0xF0EE,      0, 0xF0ED, 0xF0F0, /* 0xE0 */
-    0xF0EC,      0, 0xBBBE, 0xF0EF,      0,      0,      0,      0, /* 0xE0 */
-    0xCCB5, 0xF0F2,      0,      0, 0xB3D5,      0,      0,      0, /* 0xF0 */
-         0, 0xB1D4,      0,      0, 0xF0F3,      0,      0, 0xF0F4  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xD5E7, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDDF9, 	 0, 0xEAB4, /* 0x00 */
+         0, 0xEAB5, 	 0, 0xEAB6, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xB8CA, 0xDFB0, 0xC9F5, 	 0, 0xCCF0, 	 0, 	 0, 0xC9FA, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC9FB, 	 0, 	 0, /* 0x20 */
+    0xD3C3, 0xCBA6, 	 0, 0xB8A6, 0xF0AE, 0xB1C2, 	 0, 0xE5B8, /* 0x20 */
+    0xCCEF, 0xD3C9, 0xBCD7, 0xC9EA, 	 0, 0xB5E7, 	 0, 0xC4D0, /* 0x30 */
+    0xB5E9, 	 0, 0xEEAE, 0xBBAD, 	 0, 	 0, 0xE7DE, 	 0, /* 0x30 */
+    0xEEAF, 	 0, 	 0, 	 0, 	 0, 0xB3A9, 	 0, 	 0, /* 0x40 */
+    0xEEB2, 	 0, 	 0, 0xEEB1, 0xBDE7, 	 0, 0xEEB0, 0xCEB7, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xC5CF, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xC1F4, 0xDBCE, 0xEEB3, 0xD0F3, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC2D4, 0xC6E8, 	 0, /* 0x60 */
+         0, 	 0, 0xB7AC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xEEB4, 	 0, 0xB3EB, 	 0, 	 0, 	 0, /* 0x70 */
+    0xBBFB, 0xEEB5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7DC, /* 0x70 */
+         0, 	 0, 	 0, 0xEEB6, 	 0, 	 0, 0xBDAE, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xF1E2, 	 0, 	 0, 	 0, 0xCAE8, /* 0x80 */
+         0, 0xD2C9, 0xF0DA, 	 0, 0xF0DB, 	 0, 0xF0DC, 0xC1C6, /* 0x90 */
+         0, 0xB8ED, 0xBECE, 	 0, 	 0, 0xF0DE, 	 0, 0xC5B1, /* 0x90 */
+    0xF0DD, 0xD1F1, 	 0, 0xF0E0, 0xB0CC, 0xBDEA, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xD2DF, 0xF0DF, 	 0, 0xB4AF, 0xB7E8, /* 0xA0 */
+    0xF0E6, 0xF0E5, 0xC6A3, 0xF0E1, 0xF0E2, 0xB4C3, 	 0, 	 0, /* 0xB0 */
+    0xF0E3, 0xD5EE, 	 0, 	 0, 0xCCDB, 0xBED2, 0xBCB2, 	 0, /* 0xB0 */
+         0, 	 0, 0xF0E8, 0xF0E7, 0xF0E4, 0xB2A1, 	 0, 0xD6A2, /* 0xC0 */
+    0xD3B8, 0xBEB7, 0xC8AC, 	 0, 	 0, 0xF0EA, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xD1F7, 	 0, 0xD6CC, 0xBADB, 0xF0E9, 	 0, /* 0xD0 */
+    0xB6BB, 	 0, 	 0, 0xCDB4, 	 0, 	 0, 0xC6A6, 	 0, /* 0xD0 */
+         0, 	 0, 0xC1A1, 0xF0EB, 0xF0EE, 	 0, 0xF0ED, 0xF0F0, /* 0xE0 */
+    0xF0EC, 	 0, 0xBBBE, 0xF0EF, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xCCB5, 0xF0F2, 	 0, 	 0, 0xB3D5, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xB1D4, 	 0, 	 0, 0xF0F3, 	 0, 	 0, 0xF0F4	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_76[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF0F6, 0xB4E1,      0, 0xF0F1,      0, 0xF0F7,      0,      0, /* 0x00 */
-         0,      0, 0xF0FA,      0, 0xF0F8,      0,      0,      0, /* 0x00 */
-    0xF0F5,      0,      0,      0,      0, 0xF0FD,      0, 0xF0F9, /* 0x10 */
-    0xF0FC, 0xF0FE,      0, 0xF1A1,      0,      0,      0, 0xCEC1, /* 0x10 */
-    0xF1A4,      0, 0xF1A3,      0, 0xC1F6, 0xF0FB, 0xCADD,      0, /* 0x20 */
-         0, 0xB4F1, 0xB1F1, 0xCCB1,      0, 0xF1A6,      0,      0, /* 0x20 */
-    0xF1A7,      0,      0, 0xF1AC, 0xD5CE, 0xF1A9,      0,      0, /* 0x30 */
-    0xC8B3,      0,      0,      0, 0xF1A2,      0, 0xF1AB, 0xF1A8, /* 0x30 */
-    0xF1A5,      0,      0, 0xF1AA,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xB0A9, 0xF1AD,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xF1AF,      0, 0xF1B1,      0, /* 0x50 */
-         0,      0,      0,      0, 0xF1B0,      0, 0xF1AE,      0, /* 0x50 */
-         0,      0,      0, 0xD1A2,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xF1B2,      0,      0,      0, 0xF1B3, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xB9EF,      0,      0, 0xB5C7,      0, 0xB0D7, 0xB0D9,      0, /* 0x70 */
-         0,      0, 0xD4ED,      0, 0xB5C4,      0, 0xBDD4, 0xBBCA, /* 0x80 */
-    0xF0A7,      0,      0, 0xB8DE,      0,      0, 0xF0A8,      0, /* 0x80 */
-         0, 0xB0A8,      0, 0xF0A9,      0,      0, 0xCDEE,      0, /* 0x90 */
-         0, 0xF0AA,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xF0AB,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xC6A4,      0, /* 0xA0 */
-         0, 0xD6E5, 0xF1E4,      0, 0xF1E5,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xC3F3, /* 0xB0 */
-         0,      0, 0xD3DB,      0,      0, 0xD6D1, 0xC5E8,      0, /* 0xC0 */
-    0xD3AF,      0, 0xD2E6,      0,      0, 0xEEC1, 0xB0BB, 0xD5B5, /* 0xC0 */
-    0xD1CE, 0xBCE0, 0xBAD0,      0, 0xBFF8,      0, 0xB8C7, 0xB5C1, /* 0xD0 */
-    0xC5CC,      0,      0, 0xCAA2,      0,      0,      0, 0xC3CB, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xEEC2,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xC4BF, 0xB6A2, /* 0xE0 */
-         0, 0xEDEC, 0xC3A4,      0, 0xD6B1,      0,      0,      0, /* 0xF0 */
-    0xCFE0, 0xEDEF,      0,      0, 0xC5CE,      0, 0xB6DC          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF0F6, 0xB4E1, 	 0, 0xF0F1, 	 0, 0xF0F7, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xF0FA, 	 0, 0xF0F8, 	 0, 	 0, 	 0, /* 0x00 */
+    0xF0F5, 	 0, 	 0, 	 0, 	 0, 0xF0FD, 	 0, 0xF0F9, /* 0x10 */
+    0xF0FC, 0xF0FE, 	 0, 0xF1A1, 	 0, 	 0, 	 0, 0xCEC1, /* 0x10 */
+    0xF1A4, 	 0, 0xF1A3, 	 0, 0xC1F6, 0xF0FB, 0xCADD, 	 0, /* 0x20 */
+         0, 0xB4F1, 0xB1F1, 0xCCB1, 	 0, 0xF1A6, 	 0, 	 0, /* 0x20 */
+    0xF1A7, 	 0, 	 0, 0xF1AC, 0xD5CE, 0xF1A9, 	 0, 	 0, /* 0x30 */
+    0xC8B3, 	 0, 	 0, 	 0, 0xF1A2, 	 0, 0xF1AB, 0xF1A8, /* 0x30 */
+    0xF1A5, 	 0, 	 0, 0xF1AA, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xB0A9, 0xF1AD, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xF1AF, 	 0, 0xF1B1, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xF1B0, 	 0, 0xF1AE, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xD1A2, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xF1B2, 	 0, 	 0, 	 0, 0xF1B3, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xB9EF, 	 0, 	 0, 0xB5C7, 	 0, 0xB0D7, 0xB0D9, 	 0, /* 0x70 */
+         0, 	 0, 0xD4ED, 	 0, 0xB5C4, 	 0, 0xBDD4, 0xBBCA, /* 0x80 */
+    0xF0A7, 	 0, 	 0, 0xB8DE, 	 0, 	 0, 0xF0A8, 	 0, /* 0x80 */
+         0, 0xB0A8, 	 0, 0xF0A9, 	 0, 	 0, 0xCDEE, 	 0, /* 0x90 */
+         0, 0xF0AA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xF0AB, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC6A4, 	 0, /* 0xA0 */
+         0, 0xD6E5, 0xF1E4, 	 0, 0xF1E5, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC3F3, /* 0xB0 */
+         0, 	 0, 0xD3DB, 	 0, 	 0, 0xD6D1, 0xC5E8, 	 0, /* 0xC0 */
+    0xD3AF, 	 0, 0xD2E6, 	 0, 	 0, 0xEEC1, 0xB0BB, 0xD5B5, /* 0xC0 */
+    0xD1CE, 0xBCE0, 0xBAD0, 	 0, 0xBFF8, 	 0, 0xB8C7, 0xB5C1, /* 0xD0 */
+    0xC5CC, 	 0, 	 0, 0xCAA2, 	 0, 	 0, 	 0, 0xC3CB, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEEC2, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC4BF, 0xB6A2, /* 0xE0 */
+         0, 0xEDEC, 0xC3A4, 	 0, 0xD6B1, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xCFE0, 0xEDEF, 	 0, 	 0, 0xC5CE, 	 0, 0xB6DC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_77[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xCAA1,      0,      0, 0xEDED,      0,      0, 0xEDF0, /* 0x00 */
-    0xEDF1, 0xC3BC,      0, 0xBFB4,      0, 0xEDEE,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xEDF4, 0xEDF2,      0,      0,      0,      0, 0xD5E6, /* 0x10 */
-    0xC3DF,      0, 0xEDF3,      0,      0,      0, 0xEDF6,      0, /* 0x20 */
-    0xD5A3, 0xD1A3,      0,      0,      0, 0xEDF5,      0, 0xC3D0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xEDF7, 0xBFF4, 0xBEEC, /* 0x30 */
-    0xEDF8,      0, 0xCCF7,      0, 0xD1DB,      0,      0,      0, /* 0x30 */
-    0xD7C5, 0xD5F6,      0, 0xEDFC,      0,      0,      0, 0xEDFB, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xEDF9, 0xEDFA,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xEDFD, 0xBEA6,      0,      0,      0,      0, /* 0x50 */
-         0, 0xCBAF, 0xEEA1, 0xB6BD,      0, 0xEEA2, 0xC4C0,      0, /* 0x60 */
-    0xEDFE,      0,      0, 0xBDDE, 0xB2C7,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xB6C3,      0,      0,      0, 0xEEA5, 0xD8BA, 0xEEA3, /* 0x70 */
-    0xEEA6,      0,      0,      0, 0xC3E9, 0xB3F2,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0xEEA7, 0xEEA4, 0xCFB9,      0, /* 0x80 */
-         0, 0xEEA8, 0xC2F7,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xEEA9, /* 0x90 */
-    0xEEAA,      0, 0xDEAB,      0,      0, 0xC6B3,      0, 0xC7C6, /* 0xA0 */
-         0, 0xD6F5, 0xB5C9,      0, 0xCBB2,      0,      0,      0, /* 0xA0 */
-    0xEEAB,      0,      0, 0xCDAB,      0, 0xEEAC,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xD5B0,      0, 0xEEAD,      0, 0xF6C4, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xDBC7,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xB4A3, /* 0xD0 */
-         0,      0,      0, 0xC3AC, 0xF1E6,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xCAB8, 0xD2D3,      0, 0xD6AA,      0, 0xEFF2, /* 0xE0 */
-         0, 0xBED8,      0, 0xBDC3, 0xEFF3, 0xB6CC, 0xB0AB,      0, /* 0xE0 */
-         0,      0,      0, 0xCAAF,      0,      0, 0xEDB6,      0, /* 0xF0 */
-    0xEDB7,      0,      0,      0,      0, 0xCEF9, 0xB7AF, 0xBFF3  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xCAA1, 	 0, 	 0, 0xEDED, 	 0, 	 0, 0xEDF0, /* 0x00 */
+    0xEDF1, 0xC3BC, 	 0, 0xBFB4, 	 0, 0xEDEE, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xEDF4, 0xEDF2, 	 0, 	 0, 	 0, 	 0, 0xD5E6, /* 0x10 */
+    0xC3DF, 	 0, 0xEDF3, 	 0, 	 0, 	 0, 0xEDF6, 	 0, /* 0x20 */
+    0xD5A3, 0xD1A3, 	 0, 	 0, 	 0, 0xEDF5, 	 0, 0xC3D0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEDF7, 0xBFF4, 0xBEEC, /* 0x30 */
+    0xEDF8, 	 0, 0xCCF7, 	 0, 0xD1DB, 	 0, 	 0, 	 0, /* 0x30 */
+    0xD7C5, 0xD5F6, 	 0, 0xEDFC, 	 0, 	 0, 	 0, 0xEDFB, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xEDF9, 0xEDFA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xEDFD, 0xBEA6, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xCBAF, 0xEEA1, 0xB6BD, 	 0, 0xEEA2, 0xC4C0, 	 0, /* 0x60 */
+    0xEDFE, 	 0, 	 0, 0xBDDE, 0xB2C7, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xB6C3, 	 0, 	 0, 	 0, 0xEEA5, 0xD8BA, 0xEEA3, /* 0x70 */
+    0xEEA6, 	 0, 	 0, 	 0, 0xC3E9, 0xB3F2, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xEEA7, 0xEEA4, 0xCFB9, 	 0, /* 0x80 */
+         0, 0xEEA8, 0xC2F7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEEA9, /* 0x90 */
+    0xEEAA, 	 0, 0xDEAB, 	 0, 	 0, 0xC6B3, 	 0, 0xC7C6, /* 0xA0 */
+         0, 0xD6F5, 0xB5C9, 	 0, 0xCBB2, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xEEAB, 	 0, 	 0, 0xCDAB, 	 0, 0xEEAC, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xD5B0, 	 0, 0xEEAD, 	 0, 0xF6C4, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDBC7, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB4A3, /* 0xD0 */
+         0, 	 0, 	 0, 0xC3AC, 0xF1E6, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xCAB8, 0xD2D3, 	 0, 0xD6AA, 	 0, 0xEFF2, /* 0xE0 */
+         0, 0xBED8, 	 0, 0xBDC3, 0xEFF3, 0xB6CC, 0xB0AB, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xCAAF, 	 0, 	 0, 0xEDB6, 	 0, /* 0xF0 */
+    0xEDB7, 	 0, 	 0, 	 0, 	 0, 0xCEF9, 0xB7AF, 0xBFF3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_78[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xEDB8, 0xC2EB, 0xC9B0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xEDB9,      0,      0, 0xC6F6, 0xBFB3,      0,      0, /* 0x00 */
-         0, 0xEDBC, 0xC5F8,      0, 0xD1D0,      0, 0xD7A9, 0xEDBA, /* 0x10 */
-    0xEDBB,      0, 0xD1E2,      0, 0xEDBF, 0xEDC0,      0, 0xEDC4, /* 0x10 */
-         0,      0,      0, 0xEDC8,      0, 0xEDC6, 0xEDCE, 0xD5E8, /* 0x20 */
-         0, 0xEDC9,      0,      0, 0xEDC7, 0xEDBE,      0,      0, /* 0x20 */
-    0xC5E9,      0,      0,      0, 0xC6C6,      0,      0, 0xC9E9, /* 0x30 */
-    0xD4D2, 0xEDC1, 0xEDC2, 0xEDC3, 0xEDC5,      0, 0xC0F9,      0, /* 0x30 */
-    0xB4A1,      0,      0,      0,      0, 0xB9E8,      0, 0xEDD0, /* 0x40 */
-         0,      0,      0,      0, 0xEDD1,      0, 0xEDCA,      0, /* 0x40 */
-    0xEDCF,      0, 0xCEF8,      0,      0, 0xCBB6, 0xEDCC, 0xEDCD, /* 0x50 */
-         0,      0,      0,      0,      0, 0xCFF5,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xEDD2, 0xC1F2, 0xD3B2, 0xEDCB, 0xC8B7,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0xBCEF, /* 0x70 */
-         0,      0,      0,      0, 0xC5F0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xEDD6, /* 0x80 */
-         0, 0xB5EF,      0,      0, 0xC2B5, 0xB0AD, 0xCBE9,      0, /* 0x80 */
-         0, 0xB1AE,      0, 0xEDD4,      0,      0,      0, 0xCDEB, /* 0x90 */
-    0xB5E2,      0, 0xEDD5, 0xEDD3, 0xEDD7,      0,      0, 0xB5FA, /* 0x90 */
-         0, 0xEDD8,      0, 0xEDD9,      0, 0xEDDC,      0, 0xB1CC, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xC5F6, 0xBCEE, 0xEDDA, 0xCCBC, 0xB2EA,      0,      0,      0, /* 0xB0 */
-         0, 0xEDDB,      0,      0,      0,      0, 0xC4EB,      0, /* 0xB0 */
-         0, 0xB4C5,      0,      0,      0, 0xB0F5,      0,      0, /* 0xC0 */
-         0, 0xEDDF, 0xC0DA, 0xB4E8,      0,      0,      0,      0, /* 0xC0 */
-    0xC5CD,      0,      0,      0, 0xEDDD, 0xBFC4,      0,      0, /* 0xD0 */
-         0, 0xEDDE,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xC4A5,      0,      0,      0, 0xEDE0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0xEDE1,      0, 0xEDE3,      0,      0, 0xC1D7, /* 0xF0 */
-         0,      0, 0xBBC7                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xEDB8, 0xC2EB, 0xC9B0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xEDB9, 	 0, 	 0, 0xC6F6, 0xBFB3, 	 0, 	 0, /* 0x00 */
+         0, 0xEDBC, 0xC5F8, 	 0, 0xD1D0, 	 0, 0xD7A9, 0xEDBA, /* 0x10 */
+    0xEDBB, 	 0, 0xD1E2, 	 0, 0xEDBF, 0xEDC0, 	 0, 0xEDC4, /* 0x10 */
+         0, 	 0, 	 0, 0xEDC8, 	 0, 0xEDC6, 0xEDCE, 0xD5E8, /* 0x20 */
+         0, 0xEDC9, 	 0, 	 0, 0xEDC7, 0xEDBE, 	 0, 	 0, /* 0x20 */
+    0xC5E9, 	 0, 	 0, 	 0, 0xC6C6, 	 0, 	 0, 0xC9E9, /* 0x30 */
+    0xD4D2, 0xEDC1, 0xEDC2, 0xEDC3, 0xEDC5, 	 0, 0xC0F9, 	 0, /* 0x30 */
+    0xB4A1, 	 0, 	 0, 	 0, 	 0, 0xB9E8, 	 0, 0xEDD0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xEDD1, 	 0, 0xEDCA, 	 0, /* 0x40 */
+    0xEDCF, 	 0, 0xCEF8, 	 0, 	 0, 0xCBB6, 0xEDCC, 0xEDCD, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCFF5, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xEDD2, 0xC1F2, 0xD3B2, 0xEDCB, 0xC8B7, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBCEF, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xC5F0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEDD6, /* 0x80 */
+         0, 0xB5EF, 	 0, 	 0, 0xC2B5, 0xB0AD, 0xCBE9, 	 0, /* 0x80 */
+         0, 0xB1AE, 	 0, 0xEDD4, 	 0, 	 0, 	 0, 0xCDEB, /* 0x90 */
+    0xB5E2, 	 0, 0xEDD5, 0xEDD3, 0xEDD7, 	 0, 	 0, 0xB5FA, /* 0x90 */
+         0, 0xEDD8, 	 0, 0xEDD9, 	 0, 0xEDDC, 	 0, 0xB1CC, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xC5F6, 0xBCEE, 0xEDDA, 0xCCBC, 0xB2EA, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xEDDB, 	 0, 	 0, 	 0, 	 0, 0xC4EB, 	 0, /* 0xB0 */
+         0, 0xB4C5, 	 0, 	 0, 	 0, 0xB0F5, 	 0, 	 0, /* 0xC0 */
+         0, 0xEDDF, 0xC0DA, 0xB4E8, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xC5CD, 	 0, 	 0, 	 0, 0xEDDD, 0xBFC4, 	 0, 	 0, /* 0xD0 */
+         0, 0xEDDE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xC4A5, 	 0, 	 0, 	 0, 0xEDE0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xEDE1, 	 0, 0xEDE3, 	 0, 	 0, 0xC1D7, /* 0xF0 */
+         0, 	 0, 0xBBC7											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_79[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xBDB8,      0,      0,      0, 0xEDE2,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0xEDE4,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xEDE6,      0, /* 0x10 */
-         0,      0,      0,      0, 0xEDE5,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xEDE7,      0,      0,      0, /* 0x30 */
-         0,      0, 0xCABE, 0xECEA, 0xC0F1,      0, 0xC9E7,      0, /* 0x30 */
-    0xECEB, 0xC6EE,      0,      0,      0,      0, 0xECEC,      0, /* 0x40 */
-    0xC6ED, 0xECED,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xECF0,      0,      0, 0xD7E6, 0xECF3, /* 0x50 */
-         0,      0, 0xECF1, 0xECEE, 0xECEF, 0xD7A3, 0xC9F1, 0xCBEE, /* 0x50 */
-    0xECF4,      0, 0xECF2,      0,      0, 0xCFE9,      0, 0xECF6, /* 0x60 */
-    0xC6B1,      0,      0,      0,      0, 0xBCC0,      0, 0xECF5, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0xB5BB, /* 0x70 */
-    0xBBF6,      0, 0xECF7,      0,      0,      0,      0,      0, /* 0x70 */
-    0xD9F7, 0xBDFB,      0,      0, 0xC2BB, 0xECF8,      0,      0, /* 0x80 */
-         0,      0, 0xECF9,      0,      0,      0,      0, 0xB8A3, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xECFA,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xECFB, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xECFC,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xD3ED, 0xD8AE, 0xC0EB,      0, 0xC7DD, 0xBACC,      0, /* 0xB0 */
-    0xD0E3, 0xCBBD,      0, 0xCDBA,      0,      0, 0xB8D1,      0, /* 0xC0 */
-         0, 0xB1FC,      0, 0xC7EF,      0, 0xD6D6,      0,      0, /* 0xC0 */
-         0, 0xBFC6, 0xC3EB,      0,      0, 0xEFF5,      0,      0, /* 0xD0 */
-    0xC3D8,      0,      0,      0,      0,      0,      0, 0xD7E2, /* 0xD0 */
-         0,      0,      0, 0xEFF7, 0xB3D3,      0, 0xC7D8, 0xD1ED, /* 0xE0 */
-         0, 0xD6C8,      0, 0xEFF8,      0, 0xEFF6,      0, 0xBBFD, /* 0xE0 */
-    0xB3C6,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xBDD5,      0,      0, 0xD2C6,      0, 0xBBE0                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xBDB8, 	 0, 	 0, 	 0, 0xEDE2, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xEDE4, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEDE6, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xEDE5, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xEDE7, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xCABE, 0xECEA, 0xC0F1, 	 0, 0xC9E7, 	 0, /* 0x30 */
+    0xECEB, 0xC6EE, 	 0, 	 0, 	 0, 	 0, 0xECEC, 	 0, /* 0x40 */
+    0xC6ED, 0xECED, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xECF0, 	 0, 	 0, 0xD7E6, 0xECF3, /* 0x50 */
+         0, 	 0, 0xECF1, 0xECEE, 0xECEF, 0xD7A3, 0xC9F1, 0xCBEE, /* 0x50 */
+    0xECF4, 	 0, 0xECF2, 	 0, 	 0, 0xCFE9, 	 0, 0xECF6, /* 0x60 */
+    0xC6B1, 	 0, 	 0, 	 0, 	 0, 0xBCC0, 	 0, 0xECF5, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB5BB, /* 0x70 */
+    0xBBF6, 	 0, 0xECF7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xD9F7, 0xBDFB, 	 0, 	 0, 0xC2BB, 0xECF8, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xECF9, 	 0, 	 0, 	 0, 	 0, 0xB8A3, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xECFA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xECFB, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xECFC, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xD3ED, 0xD8AE, 0xC0EB, 	 0, 0xC7DD, 0xBACC, 	 0, /* 0xB0 */
+    0xD0E3, 0xCBBD, 	 0, 0xCDBA, 	 0, 	 0, 0xB8D1, 	 0, /* 0xC0 */
+         0, 0xB1FC, 	 0, 0xC7EF, 	 0, 0xD6D6, 	 0, 	 0, /* 0xC0 */
+         0, 0xBFC6, 0xC3EB, 	 0, 	 0, 0xEFF5, 	 0, 	 0, /* 0xD0 */
+    0xC3D8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD7E2, /* 0xD0 */
+         0, 	 0, 	 0, 0xEFF7, 0xB3D3, 	 0, 0xC7D8, 0xD1ED, /* 0xE0 */
+         0, 0xD6C8, 	 0, 0xEFF8, 	 0, 0xEFF6, 	 0, 0xBBFD, /* 0xE0 */
+    0xB3C6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xBDD5, 	 0, 	 0, 0xD2C6, 	 0, 0xBBE0					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_7A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xCFA1,      0, 0xEFFC, 0xEFFB,      0,      0, 0xEFF9,      0, /* 0x00 */
-         0,      0,      0, 0xB3CC,      0, 0xC9D4, 0xCBB0,      0, /* 0x00 */
-         0,      0,      0,      0, 0xEFFE,      0,      0, 0xB0DE, /* 0x10 */
-         0,      0, 0xD6C9,      0,      0,      0, 0xEFFD,      0, /* 0x10 */
-    0xB3ED,      0,      0, 0xF6D5,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xCEC8,      0,      0,      0, 0xF0A2, /* 0x30 */
-         0, 0xF0A1,      0, 0xB5BE, 0xBCDA, 0xBBFC,      0, 0xB8E5, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xC4C2,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xF0A3,      0,      0,      0,      0,      0, 0xCBEB, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0xF0A6,      0,      0,      0, 0xD1A8,      0, 0xBEBF, 0xC7EE, /* 0x70 */
-    0xF1B6, 0xF1B7, 0xBFD5,      0,      0,      0,      0, 0xB4A9, /* 0x70 */
-    0xF1B8, 0xCDBB,      0, 0xC7D4, 0xD5AD,      0, 0xF1B9,      0, /* 0x80 */
-    0xF1BA,      0,      0,      0,      0, 0xC7CF,      0,      0, /* 0x80 */
-         0, 0xD2A4, 0xD6CF,      0,      0, 0xF1BB, 0xBDD1, 0xB4B0, /* 0x90 */
-    0xBEBD,      0,      0,      0, 0xB4DC, 0xCED1,      0, 0xBFDF, /* 0x90 */
-    0xF1BD,      0,      0,      0,      0, 0xBFFA, 0xF1BC,      0, /* 0xA0 */
-    0xF1BF,      0,      0,      0, 0xF1BE, 0xF1C0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xF1C1,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xC1FE, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xC1A2,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xCAFA,      0, /* 0xD0 */
-         0, 0xD5BE,      0,      0,      0,      0, 0xBEBA, 0xBEB9, /* 0xD0 */
-    0xD5C2,      0,      0, 0xBFA2,      0, 0xCDAF, 0xF1B5,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xBDDF,      0, 0xB6CB, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xD6F1, 0xF3C3,      0,      0, 0xF3C4,      0, 0xB8CD  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xCFA1, 	 0, 0xEFFC, 0xEFFB, 	 0, 	 0, 0xEFF9, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xB3CC, 	 0, 0xC9D4, 0xCBB0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xEFFE, 	 0, 	 0, 0xB0DE, /* 0x10 */
+         0, 	 0, 0xD6C9, 	 0, 	 0, 	 0, 0xEFFD, 	 0, /* 0x10 */
+    0xB3ED, 	 0, 	 0, 0xF6D5, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xCEC8, 	 0, 	 0, 	 0, 0xF0A2, /* 0x30 */
+         0, 0xF0A1, 	 0, 0xB5BE, 0xBCDA, 0xBBFC, 	 0, 0xB8E5, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC4C2, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xF0A3, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBEB, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xF0A6, 	 0, 	 0, 	 0, 0xD1A8, 	 0, 0xBEBF, 0xC7EE, /* 0x70 */
+    0xF1B6, 0xF1B7, 0xBFD5, 	 0, 	 0, 	 0, 	 0, 0xB4A9, /* 0x70 */
+    0xF1B8, 0xCDBB, 	 0, 0xC7D4, 0xD5AD, 	 0, 0xF1B9, 	 0, /* 0x80 */
+    0xF1BA, 	 0, 	 0, 	 0, 	 0, 0xC7CF, 	 0, 	 0, /* 0x80 */
+         0, 0xD2A4, 0xD6CF, 	 0, 	 0, 0xF1BB, 0xBDD1, 0xB4B0, /* 0x90 */
+    0xBEBD, 	 0, 	 0, 	 0, 0xB4DC, 0xCED1, 	 0, 0xBFDF, /* 0x90 */
+    0xF1BD, 	 0, 	 0, 	 0, 	 0, 0xBFFA, 0xF1BC, 	 0, /* 0xA0 */
+    0xF1BF, 	 0, 	 0, 	 0, 0xF1BE, 0xF1C0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xF1C1, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC1FE, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xC1A2, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCAFA, 	 0, /* 0xD0 */
+         0, 0xD5BE, 	 0, 	 0, 	 0, 	 0, 0xBEBA, 0xBEB9, /* 0xD0 */
+    0xD5C2, 	 0, 	 0, 0xBFA2, 	 0, 0xCDAF, 0xF1B5, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xBDDF, 	 0, 0xB6CB, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xD6F1, 0xF3C3, 	 0, 	 0, 0xF3C4, 	 0, 0xB8CD	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_7B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xF3C6, 0xF3C7,      0, 0xB0CA,      0, /* 0x00 */
-    0xF3C5,      0, 0xF3C9, 0xCBF1,      0,      0,      0, 0xF3CB, /* 0x00 */
-         0, 0xD0A6,      0,      0, 0xB1CA, 0xF3C8,      0,      0, /* 0x10 */
-         0, 0xF3CF,      0, 0xB5D1,      0,      0, 0xF3D7,      0, /* 0x10 */
-    0xF3D2,      0,      0,      0, 0xF3D4, 0xF3D3, 0xB7FB,      0, /* 0x20 */
-    0xB1BF,      0, 0xF3CE, 0xF3CA, 0xB5DA,      0, 0xF3D0,      0, /* 0x20 */
-         0, 0xF3D1,      0, 0xF3D5,      0,      0,      0,      0, /* 0x30 */
-    0xF3CD,      0, 0xBCE3,      0, 0xC1FD,      0, 0xF3D6,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xF3DA,      0, 0xF3CC, /* 0x40 */
-         0, 0xB5C8,      0, 0xBDEE, 0xF3DC,      0,      0, 0xB7A4, /* 0x40 */
-    0xBFF0, 0xD6FE, 0xCDB2,      0, 0xB4F0,      0, 0xB2DF,      0, /* 0x50 */
-    0xF3D8,      0, 0xF3D9, 0xC9B8,      0, 0xF3DD,      0,      0, /* 0x50 */
-    0xF3DE,      0, 0xF3E1,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xF3DF,      0, /* 0x60 */
-         0, 0xF3E3, 0xF3E2,      0,      0, 0xF3DB,      0, 0xBFEA, /* 0x70 */
-         0, 0xB3EF,      0, 0xF3E0,      0,      0, 0xC7A9,      0, /* 0x70 */
-    0xBCF2,      0,      0,      0,      0, 0xF3EB,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xB9BF,      0,      0, /* 0x80 */
-    0xF3E4,      0,      0,      0, 0xB2AD, 0xBBFE,      0, 0xCBE3, /* 0x90 */
-         0,      0,      0,      0, 0xF3ED, 0xF3E9,      0,      0, /* 0x90 */
-         0, 0xB9DC, 0xF3EE,      0,      0,      0, 0xF3E5, 0xF3E6, /* 0xA0 */
-    0xF3EA, 0xC2E1, 0xF3EC, 0xF3EF, 0xF3E8, 0xBCFD,      0,      0, /* 0xA0 */
-         0, 0xCFE4,      0,      0, 0xF3F0,      0,      0,      0, /* 0xB0 */
-    0xF3E7,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xF3F2,      0,      0,      0,      0, 0xD7AD, 0xC6AA, /* 0xC0 */
-         0,      0,      0,      0, 0xF3F3,      0,      0,      0, /* 0xC0 */
-         0, 0xF3F1,      0, 0xC2A8,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xB8DD, 0xF3F5,      0,      0, 0xF3F4,      0,      0, /* 0xD0 */
-         0, 0xB4DB,      0,      0,      0, 0xF3F6, 0xF3F7,      0, /* 0xE0 */
-         0,      0, 0xF3F8,      0,      0,      0, 0xC0BA,      0, /* 0xE0 */
-         0, 0xC0E9,      0,      0,      0,      0,      0, 0xC5F1, /* 0xF0 */
-         0,      0,      0,      0, 0xF3FB,      0, 0xF3FA          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xF3C6, 0xF3C7, 	 0, 0xB0CA, 	 0, /* 0x00 */
+    0xF3C5, 	 0, 0xF3C9, 0xCBF1, 	 0, 	 0, 	 0, 0xF3CB, /* 0x00 */
+         0, 0xD0A6, 	 0, 	 0, 0xB1CA, 0xF3C8, 	 0, 	 0, /* 0x10 */
+         0, 0xF3CF, 	 0, 0xB5D1, 	 0, 	 0, 0xF3D7, 	 0, /* 0x10 */
+    0xF3D2, 	 0, 	 0, 	 0, 0xF3D4, 0xF3D3, 0xB7FB, 	 0, /* 0x20 */
+    0xB1BF, 	 0, 0xF3CE, 0xF3CA, 0xB5DA, 	 0, 0xF3D0, 	 0, /* 0x20 */
+         0, 0xF3D1, 	 0, 0xF3D5, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xF3CD, 	 0, 0xBCE3, 	 0, 0xC1FD, 	 0, 0xF3D6, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF3DA, 	 0, 0xF3CC, /* 0x40 */
+         0, 0xB5C8, 	 0, 0xBDEE, 0xF3DC, 	 0, 	 0, 0xB7A4, /* 0x40 */
+    0xBFF0, 0xD6FE, 0xCDB2, 	 0, 0xB4F0, 	 0, 0xB2DF, 	 0, /* 0x50 */
+    0xF3D8, 	 0, 0xF3D9, 0xC9B8, 	 0, 0xF3DD, 	 0, 	 0, /* 0x50 */
+    0xF3DE, 	 0, 0xF3E1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF3DF, 	 0, /* 0x60 */
+         0, 0xF3E3, 0xF3E2, 	 0, 	 0, 0xF3DB, 	 0, 0xBFEA, /* 0x70 */
+         0, 0xB3EF, 	 0, 0xF3E0, 	 0, 	 0, 0xC7A9, 	 0, /* 0x70 */
+    0xBCF2, 	 0, 	 0, 	 0, 	 0, 0xF3EB, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB9BF, 	 0, 	 0, /* 0x80 */
+    0xF3E4, 	 0, 	 0, 	 0, 0xB2AD, 0xBBFE, 	 0, 0xCBE3, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xF3ED, 0xF3E9, 	 0, 	 0, /* 0x90 */
+         0, 0xB9DC, 0xF3EE, 	 0, 	 0, 	 0, 0xF3E5, 0xF3E6, /* 0xA0 */
+    0xF3EA, 0xC2E1, 0xF3EC, 0xF3EF, 0xF3E8, 0xBCFD, 	 0, 	 0, /* 0xA0 */
+         0, 0xCFE4, 	 0, 	 0, 0xF3F0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xF3E7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xF3F2, 	 0, 	 0, 	 0, 	 0, 0xD7AD, 0xC6AA, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xF3F3, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xF3F1, 	 0, 0xC2A8, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xB8DD, 0xF3F5, 	 0, 	 0, 0xF3F4, 	 0, 	 0, /* 0xD0 */
+         0, 0xB4DB, 	 0, 	 0, 	 0, 0xF3F6, 0xF3F7, 	 0, /* 0xE0 */
+         0, 	 0, 0xF3F8, 	 0, 	 0, 	 0, 0xC0BA, 	 0, /* 0xE0 */
+         0, 0xC0E9, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC5F1, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xF3FB, 	 0, 0xF3FA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_7C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xB4D8, /* 0x00 */
-         0,      0,      0, 0xF3FE, 0xF3F9,      0,      0, 0xF3FC, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xF3FD,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xF4A1, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xF4A3, 0xBBC9, /* 0x20 */
-         0,      0, 0xF4A2,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xF4A4,      0,      0,      0,      0,      0,      0, 0xB2BE, /* 0x30 */
-    0xF4A6, 0xF4A5,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xBCAE,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xC3D7, 0xD9E1,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0xC0E0, 0xF4CC, 0xD7D1,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xB7DB,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xF4CE, 0xC1A3,      0,      0, 0xC6C9,      0, 0xB4D6, /* 0x90 */
-    0xD5B3,      0,      0,      0, 0xF4D0, 0xF4CF, 0xF4D1, 0xCBDA, /* 0x90 */
-         0,      0, 0xF4D2,      0, 0xD4C1, 0xD6E0,      0,      0, /* 0xA0 */
-         0,      0, 0xB7E0,      0,      0,      0, 0xC1B8,      0, /* 0xA0 */
-         0, 0xC1BB, 0xF4D3, 0xBEAC,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xB4E2,      0,      0, 0xF4D4, 0xF4D5, 0xBEAB,      0, /* 0xB0 */
-         0, 0xF4D6,      0,      0,      0, 0xF4DB,      0, 0xF4D7, /* 0xC0 */
-    0xF4DA,      0, 0xBAFD,      0, 0xF4D8, 0xF4D9,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xB8E2, 0xCCC7, 0xF4DC, /* 0xD0 */
-         0, 0xB2DA,      0,      0, 0xC3D3,      0,      0, 0xD4E3, /* 0xD0 */
-    0xBFB7,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xF4DD,      0,      0,      0,      0,      0,      0, 0xC5B4, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xF4E9,      0,      0, 0xCFB5                                  /* 0xF0 */
+         0, 	 0, 	 0, 0xF3FE, 0xF3F9, 	 0, 	 0, 0xF3FC, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF3FD, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4A1, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4A3, 0xBBC9, /* 0x20 */
+         0, 	 0, 0xF4A2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xF4A4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB2BE, /* 0x30 */
+    0xF4A6, 0xF4A5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xBCAE, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xC3D7, 0xD9E1, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0xC0E0, 0xF4CC, 0xD7D1, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xB7DB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xF4CE, 0xC1A3, 	 0, 	 0, 0xC6C9, 	 0, 0xB4D6, /* 0x90 */
+    0xD5B3, 	 0, 	 0, 	 0, 0xF4D0, 0xF4CF, 0xF4D1, 0xCBDA, /* 0x90 */
+         0, 	 0, 0xF4D2, 	 0, 0xD4C1, 0xD6E0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xB7E0, 	 0, 	 0, 	 0, 0xC1B8, 	 0, /* 0xA0 */
+         0, 0xC1BB, 0xF4D3, 0xBEAC, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xB4E2, 	 0, 	 0, 0xF4D4, 0xF4D5, 0xBEAB, 	 0, /* 0xB0 */
+         0, 0xF4D6, 	 0, 	 0, 	 0, 0xF4DB, 	 0, 0xF4D7, /* 0xC0 */
+    0xF4DA, 	 0, 0xBAFD, 	 0, 0xF4D8, 0xF4D9, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB8E2, 0xCCC7, 0xF4DC, /* 0xD0 */
+         0, 0xB2DA, 	 0, 	 0, 0xC3D3, 	 0, 	 0, 0xD4E3, /* 0xD0 */
+    0xBFB7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xF4DD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC5B4, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xF4E9, 	 0, 	 0, 0xCFB5									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_7D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-                    0xCEC9,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xCBD8,      0, 0xCBF7,      0,      0,      0,      0, 0xBDF4, /* 0x20 */
-         0,      0,      0, 0xD7CF,      0,      0,      0, 0xC0DB, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xD0F5,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0xF4EA, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0xF4EB,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xF4EC          /* 0xA0 */
+                    0xCEC9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xCBD8, 	 0, 0xCBF7, 	 0, 	 0, 	 0, 	 0, 0xBDF4, /* 0x20 */
+         0, 	 0, 	 0, 0xD7CF, 	 0, 	 0, 	 0, 0xC0DB, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD0F5, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4EA, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4EB, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4EC			/* 0xA0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_7E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x30 */
-                            0xF7E3,      0,      0,      0,      0, /* 0x30 */
-         0, 0xB7B1,      0,      0,      0,      0,      0, 0xF4ED, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xD7EB,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xF4EE,      0,      0,      0, 0xE6F9, /* 0x90 */
+                            0xF7E3, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xB7B1, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4ED, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xD7EB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xF4EE, 	 0, 	 0, 	 0, 0xE6F9, /* 0x90 */
     0xBEC0, 0xE6FA, 0xBAEC, 0xE6FB, 0xCFCB, 0xE6FC, 0xD4BC, 0xBCB6, /* 0xA0 */
-    0xE6FD, 0xE6FE, 0xBCCD, 0xC8D2, 0xCEB3, 0xE7A1,      0, 0xB4BF, /* 0xA0 */
-    0xE7A2, 0xC9B4, 0xB8D9, 0xC4C9,      0, 0xD7DD, 0xC2DA, 0xB7D7, /* 0xB0 */
-    0xD6BD, 0xCEC6, 0xB7C4,      0,      0, 0xC5A6, 0xE7A3, 0xCFDF, /* 0xB0 */
+    0xE6FD, 0xE6FE, 0xBCCD, 0xC8D2, 0xCEB3, 0xE7A1, 	 0, 0xB4BF, /* 0xA0 */
+    0xE7A2, 0xC9B4, 0xB8D9, 0xC4C9, 	 0, 0xD7DD, 0xC2DA, 0xB7D7, /* 0xB0 */
+    0xD6BD, 0xCEC6, 0xB7C4, 	 0, 	 0, 0xC5A6, 0xE7A3, 0xCFDF, /* 0xB0 */
     0xE7A4, 0xE7A5, 0xE7A6, 0xC1B7, 0xD7E9, 0xC9F0, 0xCFB8, 0xD6AF, /* 0xC0 */
     0xD6D5, 0xE7A7, 0xB0ED, 0xE7A8, 0xE7A9, 0xC9DC, 0xD2EF, 0xBEAD, /* 0xC0 */
-    0xE7AA, 0xB0F3, 0xC8DE, 0xBDE1, 0xE7AB, 0xC8C6,      0, 0xE7AC, /* 0xD0 */
+    0xE7AA, 0xB0F3, 0xC8DE, 0xBDE1, 0xE7AB, 0xC8C6, 	 0, 0xE7AC, /* 0xD0 */
     0xBBE6, 0xB8F8, 0xD1A4, 0xE7AD, 0xC2E7, 0xBEF8, 0xBDCA, 0xCDB3, /* 0xD0 */
-    0xE7AE, 0xE7AF, 0xBEEE, 0xD0E5,      0, 0xCBE7, 0xCCD0, 0xBCCC, /* 0xE0 */
-    0xE7B0, 0xBCA8, 0xD0F7, 0xE7B1,      0, 0xD0F8, 0xE7B2, 0xE7B3, /* 0xE0 */
+    0xE7AE, 0xE7AF, 0xBEEE, 0xD0E5, 	 0, 0xCBE7, 0xCCD0, 0xBCCC, /* 0xE0 */
+    0xE7B0, 0xBCA8, 0xD0F7, 0xE7B1, 	 0, 0xD0F8, 0xE7B2, 0xE7B3, /* 0xE0 */
     0xB4C2, 0xE7B4, 0xE7B5, 0xC9FE, 0xCEAC, 0xC3E0, 0xE7B7, 0xB1C1, /* 0xF0 */
-    0xB3F1,      0, 0xE7B8, 0xE7B9, 0xD7DB, 0xD5C0, 0xE7BA, 0xC2CC  /* 0xF0 */
+    0xB3F1, 	 0, 0xE7B8, 0xE7B9, 0xD7DB, 0xD5C0, 0xE7BA, 0xC2CC	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_7F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xD7BA, 0xE7BB, 0xE7BC, 0xE7BD, 0xBCEA, 0xC3E5, 0xC0C2, 0xE7BE, /* 0x00 */
-    0xE7BF, 0xBCA9,      0, 0xE7C0, 0xE7C1, 0xE7B6, 0xB6D0, 0xE7C2, /* 0x00 */
+    0xE7BF, 0xBCA9, 	 0, 0xE7C0, 0xE7C1, 0xE7B6, 0xB6D0, 0xE7C2, /* 0x00 */
          0, 0xE7C3, 0xE7C4, 0xBBBA, 0xB5DE, 0xC2C6, 0xB1E0, 0xE7C5, /* 0x10 */
-    0xD4B5, 0xE7C6, 0xB8BF, 0xE7C8, 0xE7C7, 0xB7EC,      0, 0xE7C9, /* 0x10 */
+    0xD4B5, 0xE7C6, 0xB8BF, 0xE7C8, 0xE7C7, 0xB7EC, 	 0, 0xE7C9, /* 0x10 */
     0xB2F8, 0xE7CA, 0xE7CB, 0xE7CC, 0xE7CD, 0xE7CE, 0xE7CF, 0xE7D0, /* 0x20 */
     0xD3A7, 0xCBF5, 0xE7D1, 0xE7D2, 0xE7D3, 0xE7D4, 0xC9C9, 0xE7D5, /* 0x20 */
-    0xE7D6, 0xE7D7, 0xE7D8, 0xE7D9, 0xBDC9, 0xE7DA, 0xF3BE,      0, /* 0x30 */
-    0xB8D7,      0, 0xC8B1,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0, 0xF3BF,      0, 0xF3C0, 0xF3C1,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xB9DE, 0xCDF8,      0,      0, 0xD8E8, 0xBAB1,      0, 0xC2DE, /* 0x50 */
-    0xEEB7,      0, 0xB7A3,      0,      0,      0,      0, 0xEEB9, /* 0x50 */
-         0, 0xEEB8, 0xB0D5,      0,      0,      0,      0,      0, /* 0x60 */
-    0xEEBB, 0xD5D6, 0xD7EF,      0,      0,      0, 0xD6C3,      0, /* 0x60 */
-         0, 0xEEBD, 0xCAF0,      0, 0xEEBC,      0,      0,      0, /* 0x70 */
-         0, 0xEEBE,      0,      0,      0,      0, 0xEEC0,      0, /* 0x70 */
-         0, 0xEEBF,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xD1F2,      0, 0xC7BC,      0, 0xC3C0,      0, /* 0x80 */
-         0,      0,      0,      0, 0xB8E1,      0,      0,      0, /* 0x90 */
-         0,      0, 0xC1E7,      0,      0, 0xF4C6, 0xD0DF, 0xF4C7, /* 0x90 */
-         0, 0xCFDB,      0,      0, 0xC8BA,      0,      0, 0xF4C8, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0xF4C9, /* 0xA0 */
-    0xF4CA,      0, 0xF4CB,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xD9FA, 0xB8FE,      0,      0, 0xE5F1, 0xD3F0,      0, 0xF4E0, /* 0xB0 */
-         0, 0xCECC,      0,      0,      0, 0xB3E1,      0,      0, /* 0xC0 */
-         0,      0, 0xF1B4,      0, 0xD2EE,      0, 0xF4E1,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xCFE8, 0xF4E2,      0,      0, /* 0xD0 */
-    0xC7CC,      0,      0,      0,      0,      0,      0, 0xB5D4, /* 0xD0 */
-    0xB4E4, 0xF4E4,      0,      0,      0, 0xF4E3, 0xF4E5,      0, /* 0xE0 */
-         0, 0xF4E6,      0,      0,      0,      0, 0xF4E7,      0, /* 0xE0 */
-    0xBAB2, 0xB0BF,      0, 0xF4E8,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xB7AD, 0xD2ED                          /* 0xF0 */
+    0xE7D6, 0xE7D7, 0xE7D8, 0xE7D9, 0xBDC9, 0xE7DA, 0xF3BE, 	 0, /* 0x30 */
+    0xB8D7, 	 0, 0xC8B1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xF3BF, 	 0, 0xF3C0, 0xF3C1, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xB9DE, 0xCDF8, 	 0, 	 0, 0xD8E8, 0xBAB1, 	 0, 0xC2DE, /* 0x50 */
+    0xEEB7, 	 0, 0xB7A3, 	 0, 	 0, 	 0, 	 0, 0xEEB9, /* 0x50 */
+         0, 0xEEB8, 0xB0D5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xEEBB, 0xD5D6, 0xD7EF, 	 0, 	 0, 	 0, 0xD6C3, 	 0, /* 0x60 */
+         0, 0xEEBD, 0xCAF0, 	 0, 0xEEBC, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xEEBE, 	 0, 	 0, 	 0, 	 0, 0xEEC0, 	 0, /* 0x70 */
+         0, 0xEEBF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xD1F2, 	 0, 0xC7BC, 	 0, 0xC3C0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xB8E1, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xC1E7, 	 0, 	 0, 0xF4C6, 0xD0DF, 0xF4C7, /* 0x90 */
+         0, 0xCFDB, 	 0, 	 0, 0xC8BA, 	 0, 	 0, 0xF4C8, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4C9, /* 0xA0 */
+    0xF4CA, 	 0, 0xF4CB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xD9FA, 0xB8FE, 	 0, 	 0, 0xE5F1, 0xD3F0, 	 0, 0xF4E0, /* 0xB0 */
+         0, 0xCECC, 	 0, 	 0, 	 0, 0xB3E1, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xF1B4, 	 0, 0xD2EE, 	 0, 0xF4E1, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xCFE8, 0xF4E2, 	 0, 	 0, /* 0xD0 */
+    0xC7CC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB5D4, /* 0xD0 */
+    0xB4E4, 0xF4E4, 	 0, 	 0, 	 0, 0xF4E3, 0xF4E5, 	 0, /* 0xE0 */
+         0, 0xF4E6, 	 0, 	 0, 	 0, 	 0, 0xF4E7, 	 0, /* 0xE0 */
+    0xBAB2, 0xB0BF, 	 0, 0xF4E8, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xB7AD, 0xD2ED							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_80[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD2AB, 0xC0CF,      0, 0xBFBC, 0xEBA3, 0xD5DF, 0xEAC8,      0, /* 0x00 */
-         0,      0,      0, 0xF1F3, 0xB6F8, 0xCBA3,      0,      0, /* 0x00 */
-    0xC4CD,      0, 0xF1E7,      0, 0xF1E8, 0xB8FB, 0xF1E9, 0xBAC4, /* 0x10 */
-    0xD4C5, 0xB0D2,      0,      0, 0xF1EA,      0,      0,      0, /* 0x10 */
-    0xF1EB,      0, 0xF1EC,      0,      0, 0xF1ED, 0xF1EE, 0xF1EF, /* 0x20 */
-    0xF1F1, 0xF1F0, 0xC5D5,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xF1F2,      0, 0xB6FA,      0, 0xF1F4, 0xD2AE, 0xDEC7, /* 0x30 */
-    0xCBCA,      0,      0, 0xB3DC,      0, 0xB5A2,      0, 0xB9A2, /* 0x30 */
-         0,      0, 0xC4F4, 0xF1F5,      0,      0, 0xF1F6,      0, /* 0x40 */
-         0,      0, 0xC1C4, 0xC1FB, 0xD6B0, 0xF1F7,      0,      0, /* 0x40 */
-         0,      0, 0xF1F8,      0, 0xC1AA,      0,      0,      0, /* 0x50 */
-    0xC6B8,      0, 0xBEDB,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xF1F9, 0xB4CF,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xF1FA,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xEDB2, /* 0x70 */
-    0xEDB1,      0,      0, 0xCBE0, 0xD2DE,      0, 0xCBC1, 0xD5D8, /* 0x80 */
-         0, 0xC8E2,      0, 0xC0DF, 0xBCA1,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xEBC1,      0,      0, 0xD0A4,      0, /* 0x90 */
-    0xD6E2,      0, 0xB6C7, 0xB8D8, 0xEBC0, 0xB8CE,      0, 0xEBBF, /* 0x90 */
-    0xB3A6, 0xB9C9, 0xD6AB,      0, 0xB7F4, 0xB7CA,      0,      0, /* 0xA0 */
-         0, 0xBCE7, 0xB7BE, 0xEBC6,      0, 0xEBC7, 0xB0B9, 0xBFCF, /* 0xA0 */
-         0, 0xEBC5, 0xD3FD,      0, 0xEBC8,      0,      0, 0xEBC9, /* 0xB0 */
-         0,      0, 0xB7CE,      0, 0xEBC2, 0xEBC4, 0xC9F6, 0xD6D7, /* 0xB0 */
-    0xD5CD, 0xD0B2, 0xEBCF, 0xCEB8, 0xEBD0,      0, 0xB5A8,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xB1B3, 0xEBD2, 0xCCA5,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xC5D6, 0xEBD3, /* 0xD0 */
-         0, 0xEBD1, 0xC5DF, 0xEBCE, 0xCAA4, 0xEBD5, 0xB0FB,      0, /* 0xD0 */
-         0, 0xBAFA,      0,      0, 0xD8B7, 0xF1E3,      0, 0xEBCA, /* 0xE0 */
-    0xEBCB, 0xEBCC, 0xEBCD, 0xEBD6, 0xE6C0, 0xEBD9,      0, 0xBFE8, /* 0xE0 */
-    0xD2C8, 0xEBD7, 0xEBDC, 0xB8EC, 0xEBD8,      0, 0xBDBA,      0, /* 0xF0 */
-    0xD0D8,      0, 0xB0B7,      0, 0xEBDD, 0xC4DC                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD2AB, 0xC0CF, 	 0, 0xBFBC, 0xEBA3, 0xD5DF, 0xEAC8, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xF1F3, 0xB6F8, 0xCBA3, 	 0, 	 0, /* 0x00 */
+    0xC4CD, 	 0, 0xF1E7, 	 0, 0xF1E8, 0xB8FB, 0xF1E9, 0xBAC4, /* 0x10 */
+    0xD4C5, 0xB0D2, 	 0, 	 0, 0xF1EA, 	 0, 	 0, 	 0, /* 0x10 */
+    0xF1EB, 	 0, 0xF1EC, 	 0, 	 0, 0xF1ED, 0xF1EE, 0xF1EF, /* 0x20 */
+    0xF1F1, 0xF1F0, 0xC5D5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xF1F2, 	 0, 0xB6FA, 	 0, 0xF1F4, 0xD2AE, 0xDEC7, /* 0x30 */
+    0xCBCA, 	 0, 	 0, 0xB3DC, 	 0, 0xB5A2, 	 0, 0xB9A2, /* 0x30 */
+         0, 	 0, 0xC4F4, 0xF1F5, 	 0, 	 0, 0xF1F6, 	 0, /* 0x40 */
+         0, 	 0, 0xC1C4, 0xC1FB, 0xD6B0, 0xF1F7, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xF1F8, 	 0, 0xC1AA, 	 0, 	 0, 	 0, /* 0x50 */
+    0xC6B8, 	 0, 0xBEDB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xF1F9, 0xB4CF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xF1FA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEDB2, /* 0x70 */
+    0xEDB1, 	 0, 	 0, 0xCBE0, 0xD2DE, 	 0, 0xCBC1, 0xD5D8, /* 0x80 */
+         0, 0xC8E2, 	 0, 0xC0DF, 0xBCA1, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xEBC1, 	 0, 	 0, 0xD0A4, 	 0, /* 0x90 */
+    0xD6E2, 	 0, 0xB6C7, 0xB8D8, 0xEBC0, 0xB8CE, 	 0, 0xEBBF, /* 0x90 */
+    0xB3A6, 0xB9C9, 0xD6AB, 	 0, 0xB7F4, 0xB7CA, 	 0, 	 0, /* 0xA0 */
+         0, 0xBCE7, 0xB7BE, 0xEBC6, 	 0, 0xEBC7, 0xB0B9, 0xBFCF, /* 0xA0 */
+         0, 0xEBC5, 0xD3FD, 	 0, 0xEBC8, 	 0, 	 0, 0xEBC9, /* 0xB0 */
+         0, 	 0, 0xB7CE, 	 0, 0xEBC2, 0xEBC4, 0xC9F6, 0xD6D7, /* 0xB0 */
+    0xD5CD, 0xD0B2, 0xEBCF, 0xCEB8, 0xEBD0, 	 0, 0xB5A8, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xB1B3, 0xEBD2, 0xCCA5, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC5D6, 0xEBD3, /* 0xD0 */
+         0, 0xEBD1, 0xC5DF, 0xEBCE, 0xCAA4, 0xEBD5, 0xB0FB, 	 0, /* 0xD0 */
+         0, 0xBAFA, 	 0, 	 0, 0xD8B7, 0xF1E3, 	 0, 0xEBCA, /* 0xE0 */
+    0xEBCB, 0xEBCC, 0xEBCD, 0xEBD6, 0xE6C0, 0xEBD9, 	 0, 0xBFE8, /* 0xE0 */
+    0xD2C8, 0xEBD7, 0xEBDC, 0xB8EC, 0xEBD8, 	 0, 0xBDBA, 	 0, /* 0xF0 */
+    0xD0D8, 	 0, 0xB0B7, 	 0, 0xEBDD, 0xC4DC					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_81[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xD6AC,      0,      0,      0, 0xB4E0,      0, /* 0x00 */
-         0, 0xC2F6, 0xBCB9,      0,      0, 0xEBDA, 0xEBDB, 0xD4E0, /* 0x00 */
-    0xC6EA, 0xC4D4, 0xEBDF, 0xC5A7, 0xD9F5,      0, 0xB2B1,      0, /* 0x10 */
-    0xEBE4,      0, 0xBDC5,      0,      0,      0, 0xEBE2,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xEBE3,      0,      0, 0xB8AC, /* 0x20 */
-         0, 0xCDD1, 0xEBE5,      0,      0,      0, 0xEBE1,      0, /* 0x30 */
-    0xC1B3,      0,      0,      0,      0,      0, 0xC6A2,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xCCF3,      0, /* 0x40 */
-    0xEBE6,      0, 0xC0B0, 0xD2B8, 0xEBE7,      0,      0,      0, /* 0x40 */
-    0xB8AF, 0xB8AD,      0, 0xEBE8, 0xC7BB, 0xCDF3,      0,      0, /* 0x50 */
-         0, 0xEBEA, 0xEBEB,      0,      0,      0,      0,      0, /* 0x50 */
-    0xEBED,      0,      0,      0,      0, 0xD0C8,      0, 0xEBF2, /* 0x60 */
-         0, 0xEBEE,      0,      0,      0, 0xEBF1, 0xC8F9,      0, /* 0x60 */
-    0xD1FC, 0xEBEC,      0,      0, 0xEBE9,      0,      0,      0, /* 0x70 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xD6AC, 	 0, 	 0, 	 0, 0xB4E0, 	 0, /* 0x00 */
+         0, 0xC2F6, 0xBCB9, 	 0, 	 0, 0xEBDA, 0xEBDB, 0xD4E0, /* 0x00 */
+    0xC6EA, 0xC4D4, 0xEBDF, 0xC5A7, 0xD9F5, 	 0, 0xB2B1, 	 0, /* 0x10 */
+    0xEBE4, 	 0, 0xBDC5, 	 0, 	 0, 	 0, 0xEBE2, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xEBE3, 	 0, 	 0, 0xB8AC, /* 0x20 */
+         0, 0xCDD1, 0xEBE5, 	 0, 	 0, 	 0, 0xEBE1, 	 0, /* 0x30 */
+    0xC1B3, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC6A2, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCCF3, 	 0, /* 0x40 */
+    0xEBE6, 	 0, 0xC0B0, 0xD2B8, 0xEBE7, 	 0, 	 0, 	 0, /* 0x40 */
+    0xB8AF, 0xB8AD, 	 0, 0xEBE8, 0xC7BB, 0xCDF3, 	 0, 	 0, /* 0x50 */
+         0, 0xEBEA, 0xEBEB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xEBED, 	 0, 	 0, 	 0, 	 0, 0xD0C8, 	 0, 0xEBF2, /* 0x60 */
+         0, 0xEBEE, 	 0, 	 0, 	 0, 0xEBF1, 0xC8F9, 	 0, /* 0x60 */
+    0xD1FC, 0xEBEC, 	 0, 	 0, 0xEBE9, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xB8B9, 0xCFD9, 0xC4E5, 0xEBEF, 0xEBF0, 0xCCDA, 0xCDC8, /* 0x70 */
-    0xB0F2,      0, 0xEBF6,      0,      0,      0,      0,      0, /* 0x80 */
-    0xEBF5,      0, 0xB2B2,      0,      0,      0,      0, 0xB8E0, /* 0x80 */
-         0, 0xEBF7,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xB1EC,      0,      0, 0xCCC5, 0xC4A4, 0xCFA5,      0,      0, /* 0x90 */
-         0,      0,      0, 0xEBF9,      0,      0, 0xECA2,      0, /* 0xA0 */
-    0xC5F2,      0, 0xEBFA,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xC9C5,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xE2DF, 0xEBFE,      0,      0,      0,      0, /* 0xB0 */
-    0xCDCE, 0xECA1, 0xB1DB, 0xD3B7,      0,      0, 0xD2DC,      0, /* 0xC0 */
-         0,      0, 0xEBFD,      0, 0xEBFB,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xB3BC,      0,      0,      0, 0xEAB0, /* 0xE0 */
-         0,      0, 0xD7D4,      0, 0xF4AB, 0xB3F4,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xD6C1, 0xD6C2,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xD5E9, 0xBECA,      0, 0xF4A7          /* 0xF0 */
+    0xB0F2, 	 0, 0xEBF6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xEBF5, 	 0, 0xB2B2, 	 0, 	 0, 	 0, 	 0, 0xB8E0, /* 0x80 */
+         0, 0xEBF7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xB1EC, 	 0, 	 0, 0xCCC5, 0xC4A4, 0xCFA5, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xEBF9, 	 0, 	 0, 0xECA2, 	 0, /* 0xA0 */
+    0xC5F2, 	 0, 0xEBFA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xC9C5, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xE2DF, 0xEBFE, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xCDCE, 0xECA1, 0xB1DB, 0xD3B7, 	 0, 	 0, 0xD2DC, 	 0, /* 0xC0 */
+         0, 	 0, 0xEBFD, 	 0, 0xEBFB, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xB3BC, 	 0, 	 0, 	 0, 0xEAB0, /* 0xE0 */
+         0, 	 0, 0xD7D4, 	 0, 0xF4AB, 0xB3F4, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xD6C1, 0xD6C2, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xD5E9, 0xBECA, 	 0, 0xF4A7			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_82[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD2A8, 0xF4A8, 0xF4A9,      0, 0xF4AA, 0xBECB, 0xD3DF,      0, /* 0x00 */
-         0,      0,      0,      0, 0xC9E0, 0xC9E1,      0,      0, /* 0x00 */
-    0xF3C2,      0, 0xCAE6,      0, 0xCCF2,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xE2B6, 0xCBB4,      0, 0xCEE8, 0xD6DB, /* 0x10 */
-         0, 0xF4AD, 0xF4AE, 0xF4AF,      0,      0,      0,      0, /* 0x20 */
-    0xF4B2,      0, 0xBABD, 0xF4B3, 0xB0E3, 0xF4B0,      0, 0xF4B1, /* 0x20 */
-    0xBDA2, 0xB2D5,      0, 0xF4B6, 0xF4B7, 0xB6E6, 0xB2B0, 0xCFCF, /* 0x30 */
-    0xF4B4, 0xB4AC,      0, 0xF4B5,      0,      0, 0xF4B8,      0, /* 0x30 */
-         0,      0,      0,      0, 0xF4B9,      0,      0, 0xCDA7, /* 0x40 */
-         0, 0xF4BA,      0, 0xF4BB,      0,      0,      0, 0xF4BC, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xCBD2,      0, 0xF4BD,      0,      0,      0,      0, 0xF4BE, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0xF4BF,      0,      0,      0,      0,      0, 0xF4DE, 0xC1BC, /* 0x60 */
-    0xBCE8,      0, 0xC9AB, 0xD1DE, 0xE5F5,      0,      0,      0, /* 0x70 */
-         0, 0xDCB3, 0xD2D5,      0,      0, 0xDCB4, 0xB0AC, 0xDCB5, /* 0x70 */
-         0,      0, 0xBDDA,      0, 0xDCB9,      0,      0,      0, /* 0x80 */
-    0xD8C2,      0, 0xDCB7, 0xD3F3,      0, 0xC9D6, 0xDCBA, 0xDCB6, /* 0x80 */
-         0, 0xDCBB, 0xC3A2,      0,      0,      0,      0, 0xDCBC, /* 0x90 */
-    0xDCC5, 0xDCBD,      0,      0, 0xCEDF, 0xD6A5,      0, 0xDCCF, /* 0x90 */
-         0, 0xDCCD,      0,      0, 0xDCD2, 0xBDE6, 0xC2AB,      0, /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD2A8, 0xF4A8, 0xF4A9, 	 0, 0xF4AA, 0xBECB, 0xD3DF, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xC9E0, 0xC9E1, 	 0, 	 0, /* 0x00 */
+    0xF3C2, 	 0, 0xCAE6, 	 0, 0xCCF2, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xE2B6, 0xCBB4, 	 0, 0xCEE8, 0xD6DB, /* 0x10 */
+         0, 0xF4AD, 0xF4AE, 0xF4AF, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xF4B2, 	 0, 0xBABD, 0xF4B3, 0xB0E3, 0xF4B0, 	 0, 0xF4B1, /* 0x20 */
+    0xBDA2, 0xB2D5, 	 0, 0xF4B6, 0xF4B7, 0xB6E6, 0xB2B0, 0xCFCF, /* 0x30 */
+    0xF4B4, 0xB4AC, 	 0, 0xF4B5, 	 0, 	 0, 0xF4B8, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xF4B9, 	 0, 	 0, 0xCDA7, /* 0x40 */
+         0, 0xF4BA, 	 0, 0xF4BB, 	 0, 	 0, 	 0, 0xF4BC, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xCBD2, 	 0, 0xF4BD, 	 0, 	 0, 	 0, 	 0, 0xF4BE, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xF4BF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4DE, 0xC1BC, /* 0x60 */
+    0xBCE8, 	 0, 0xC9AB, 0xD1DE, 0xE5F5, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xDCB3, 0xD2D5, 	 0, 	 0, 0xDCB4, 0xB0AC, 0xDCB5, /* 0x70 */
+         0, 	 0, 0xBDDA, 	 0, 0xDCB9, 	 0, 	 0, 	 0, /* 0x80 */
+    0xD8C2, 	 0, 0xDCB7, 0xD3F3, 	 0, 0xC9D6, 0xDCBA, 0xDCB6, /* 0x80 */
+         0, 0xDCBB, 0xC3A2, 	 0, 	 0, 	 0, 	 0, 0xDCBC, /* 0x90 */
+    0xDCC5, 0xDCBD, 	 0, 	 0, 0xCEDF, 0xD6A5, 	 0, 0xDCCF, /* 0x90 */
+         0, 0xDCCD, 	 0, 	 0, 0xDCD2, 0xBDE6, 0xC2AB, 	 0, /* 0xA0 */
     0xDCB8, 0xDCCB, 0xDCCE, 0xDCBE, 0xB7D2, 0xB0C5, 0xDCC7, 0xD0BE, /* 0xA0 */
-    0xDCC1, 0xBBA8,      0, 0xB7BC, 0xDCCC,      0,      0, 0xDCC6, /* 0xB0 */
-    0xDCBF, 0xC7DB,      0,      0,      0, 0xD1BF, 0xDCC0,      0, /* 0xB0 */
-         0, 0xDCCA,      0,      0, 0xDCD0,      0,      0, 0xCEAD, /* 0xC0 */
-    0xDCC2,      0, 0xDCC3, 0xDCC8, 0xDCC9, 0xB2D4, 0xDCD1, 0xCBD5, /* 0xC0 */
-         0, 0xD4B7, 0xDCDB, 0xDCDF, 0xCCA6, 0xDCE6,      0, 0xC3E7, /* 0xD0 */
-    0xDCDC,      0,      0, 0xBFC1, 0xDCD9,      0, 0xB0FA, 0xB9B6, /* 0xD0 */
-    0xDCE5, 0xDCD3,      0, 0xDCC4, 0xDCD6, 0xC8F4, 0xBFE0,      0, /* 0xE0 */
-         0,      0,      0, 0xC9BB,      0,      0,      0, 0xB1BD, /* 0xE0 */
-         0, 0xD3A2,      0,      0, 0xDCDA,      0,      0, 0xDCD5, /* 0xF0 */
-         0, 0xC6BB,      0, 0xDCDE                                  /* 0xF0 */
+    0xDCC1, 0xBBA8, 	 0, 0xB7BC, 0xDCCC, 	 0, 	 0, 0xDCC6, /* 0xB0 */
+    0xDCBF, 0xC7DB, 	 0, 	 0, 	 0, 0xD1BF, 0xDCC0, 	 0, /* 0xB0 */
+         0, 0xDCCA, 	 0, 	 0, 0xDCD0, 	 0, 	 0, 0xCEAD, /* 0xC0 */
+    0xDCC2, 	 0, 0xDCC3, 0xDCC8, 0xDCC9, 0xB2D4, 0xDCD1, 0xCBD5, /* 0xC0 */
+         0, 0xD4B7, 0xDCDB, 0xDCDF, 0xCCA6, 0xDCE6, 	 0, 0xC3E7, /* 0xD0 */
+    0xDCDC, 	 0, 	 0, 0xBFC1, 0xDCD9, 	 0, 0xB0FA, 0xB9B6, /* 0xD0 */
+    0xDCE5, 0xDCD3, 	 0, 0xDCC4, 0xDCD6, 0xC8F4, 0xBFE0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xC9BB, 	 0, 	 0, 	 0, 0xB1BD, /* 0xE0 */
+         0, 0xD3A2, 	 0, 	 0, 0xDCDA, 	 0, 	 0, 0xDCD5, /* 0xF0 */
+         0, 0xC6BB, 	 0, 0xDCDE									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_83[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD7C2, 0xC3AF, 0xB7B6, 0xC7D1, 0xC3A9, 0xDCE2, 0xDCD8, /* 0x00 */
-    0xDCEB, 0xDCD4,      0,      0, 0xDCDD,      0, 0xBEA5, 0xDCD7, /* 0x00 */
-         0, 0xDCE0,      0,      0, 0xDCE3, 0xDCE4,      0, 0xDCF8, /* 0x10 */
-         0,      0, 0xDCE1, 0xDDA2, 0xDCE7,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xBCEB, /* 0x20 */
-    0xB4C4,      0,      0, 0xC3A3, 0xB2E7, 0xDCFA,      0, 0xDCF2, /* 0x20 */
-         0, 0xDCEF,      0, 0xDCFC, 0xDCEE, 0xD2F0, 0xB2E8,      0, /* 0x30 */
-    0xC8D7, 0xC8E3, 0xDCFB,      0, 0xDCED,      0,      0,      0, /* 0x30 */
-    0xDCF7,      0,      0, 0xDCF5,      0,      0, 0xBEA3, 0xDCF4, /* 0x40 */
-         0, 0xB2DD,      0,      0,      0,      0,      0, 0xDCF3, /* 0x40 */
-    0xBCF6, 0xDCE8, 0xBBC4,      0, 0xC0F3,      0,      0,      0, /* 0x50 */
-         0,      0, 0xBCD4, 0xDCE9, 0xDCEA,      0, 0xDCF1, 0xDCF6, /* 0x50 */
-    0xDCF9, 0xB5B4,      0, 0xC8D9, 0xBBE7, 0xDCFE, 0xDCFD, 0xD3AB, /* 0x60 */
+    0xDCEB, 0xDCD4, 	 0, 	 0, 0xDCDD, 	 0, 0xBEA5, 0xDCD7, /* 0x00 */
+         0, 0xDCE0, 	 0, 	 0, 0xDCE3, 0xDCE4, 	 0, 0xDCF8, /* 0x10 */
+         0, 	 0, 0xDCE1, 0xDDA2, 0xDCE7, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBCEB, /* 0x20 */
+    0xB4C4, 	 0, 	 0, 0xC3A3, 0xB2E7, 0xDCFA, 	 0, 0xDCF2, /* 0x20 */
+         0, 0xDCEF, 	 0, 0xDCFC, 0xDCEE, 0xD2F0, 0xB2E8, 	 0, /* 0x30 */
+    0xC8D7, 0xC8E3, 0xDCFB, 	 0, 0xDCED, 	 0, 	 0, 	 0, /* 0x30 */
+    0xDCF7, 	 0, 	 0, 0xDCF5, 	 0, 	 0, 0xBEA3, 0xDCF4, /* 0x40 */
+         0, 0xB2DD, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDCF3, /* 0x40 */
+    0xBCF6, 0xDCE8, 0xBBC4, 	 0, 0xC0F3, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xBCD4, 0xDCE9, 0xDCEA, 	 0, 0xDCF1, 0xDCF6, /* 0x50 */
+    0xDCF9, 0xB5B4, 	 0, 0xC8D9, 0xBBE7, 0xDCFE, 0xDCFD, 0xD3AB, /* 0x60 */
     0xDDA1, 0xDDA3, 0xDDA5, 0xD2F1, 0xDDA4, 0xDDA6, 0xDDA7, 0xD2A9, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0xBAC9, /* 0x70 */
-    0xDDA9,      0,      0, 0xDDB6, 0xDDB1, 0xDDB4,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xDDB0, 0xC6CE,      0, /* 0x80 */
-         0, 0xC0F2,      0,      0,      0,      0, 0xC9AF,      0, /* 0x80 */
-         0,      0, 0xDCEC, 0xDDAE,      0,      0,      0,      0, /* 0x90 */
-    0xDDB7,      0,      0, 0xDCF0, 0xDDAF,      0, 0xDDB8,      0, /* 0x90 */
-    0xDDAC,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xDDB9, 0xDDB3, 0xDDAD, 0xC4AA,      0,      0,      0,      0, /* 0xA0 */
-    0xDDA8, 0xC0B3, 0xC1AB, 0xDDAA, 0xDDAB,      0, 0xDDB2, 0xBBF1, /* 0xB0 */
-    0xDDB5, 0xD3A8, 0xDDBA,      0, 0xDDBB, 0xC3A7,      0,      0, /* 0xB0 */
-    0xDDD2, 0xDDBC,      0,      0,      0, 0xDDD1,      0, 0xB9BD, /* 0xC0 */
-         0,      0, 0xBED5,      0, 0xBEFA,      0,      0, 0xBACA, /* 0xC0 */
-         0,      0,      0,      0, 0xDDCA,      0, 0xDDC5,      0, /* 0xD0 */
-    0xDDBF,      0,      0,      0, 0xB2CB, 0xDDC3,      0, 0xDDCB, /* 0xD0 */
-    0xB2A4, 0xDDD5,      0,      0,      0, 0xDDBE,      0,      0, /* 0xE0 */
-         0, 0xC6D0, 0xDDD0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xDDD4, 0xC1E2, 0xB7C6,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xDDCE, 0xDDCF,      0,      0,      0, 0xDDC4                  /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBAC9, /* 0x70 */
+    0xDDA9, 	 0, 	 0, 0xDDB6, 0xDDB1, 0xDDB4, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDDB0, 0xC6CE, 	 0, /* 0x80 */
+         0, 0xC0F2, 	 0, 	 0, 	 0, 	 0, 0xC9AF, 	 0, /* 0x80 */
+         0, 	 0, 0xDCEC, 0xDDAE, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xDDB7, 	 0, 	 0, 0xDCF0, 0xDDAF, 	 0, 0xDDB8, 	 0, /* 0x90 */
+    0xDDAC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xDDB9, 0xDDB3, 0xDDAD, 0xC4AA, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xDDA8, 0xC0B3, 0xC1AB, 0xDDAA, 0xDDAB, 	 0, 0xDDB2, 0xBBF1, /* 0xB0 */
+    0xDDB5, 0xD3A8, 0xDDBA, 	 0, 0xDDBB, 0xC3A7, 	 0, 	 0, /* 0xB0 */
+    0xDDD2, 0xDDBC, 	 0, 	 0, 	 0, 0xDDD1, 	 0, 0xB9BD, /* 0xC0 */
+         0, 	 0, 0xBED5, 	 0, 0xBEFA, 	 0, 	 0, 0xBACA, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xDDCA, 	 0, 0xDDC5, 	 0, /* 0xD0 */
+    0xDDBF, 	 0, 	 0, 	 0, 0xB2CB, 0xDDC3, 	 0, 0xDDCB, /* 0xD0 */
+    0xB2A4, 0xDDD5, 	 0, 	 0, 	 0, 0xDDBE, 	 0, 	 0, /* 0xE0 */
+         0, 0xC6D0, 0xDDD0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xDDD4, 0xC1E2, 0xB7C6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xDDCE, 0xDDCF, 	 0, 	 0, 	 0, 0xDDC4					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_84[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xDDBD,      0, 0xDDCD, 0xCCD1,      0, 0xDDC9,      0, /* 0x00 */
-         0,      0,      0, 0xDDC2, 0xC3C8, 0xC6BC, 0xCEAE, 0xDDCC, /* 0x00 */
-         0, 0xDDC8,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xDDC1,      0,      0,      0, 0xDDC6, 0xC2DC,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0xD3A9, 0xD3AA, 0xDDD3, 0xCFF4, /* 0x20 */
-    0xC8F8,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xDDE6,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xDDC7,      0,      0,      0, 0xDDE0, 0xC2E4,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xDDE1,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xDDD7,      0,      0,      0,      0,      0, 0xD6F8, /* 0x50 */
-         0, 0xDDD9, 0xDDD8, 0xB8F0, 0xDDD6,      0,      0,      0, /* 0x50 */
-         0, 0xC6CF,      0, 0xB6AD,      0,      0,      0,      0, /* 0x60 */
-         0, 0xDDE2,      0, 0xBAF9, 0xD4E1, 0xDDE7,      0,      0, /* 0x60 */
-         0, 0xB4D0,      0, 0xDDDA,      0, 0xBFFB, 0xDDE3,      0, /* 0x70 */
-    0xDDDF,      0, 0xDDDD,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xB5D9,      0,      0,      0,      0, 0xDDDB, /* 0x80 */
-    0xDDDC, 0xDDDE,      0, 0xBDAF, 0xDDE4,      0, 0xDDE5,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0, 0xDDF5, /* 0x90 */
-         0, 0xC3C9,      0,      0, 0xCBE2,      0,      0,      0, /* 0x90 */
-         0, 0xDDF2,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0xD8E1, /* 0xA0 */
-         0,      0, 0xC6D1,      0, 0xDDF4,      0,      0,      0, /* 0xB0 */
-    0xD5F4, 0xDDF3, 0xDDF0,      0,      0, 0xDDEC,      0, 0xDDEF, /* 0xB0 */
-         0, 0xDDE8,      0,      0, 0xD0EE,      0,      0,      0, /* 0xC0 */
-         0, 0xC8D8, 0xDDEE,      0,      0, 0xDDE9,      0,      0, /* 0xC0 */
-    0xDDEA, 0xCBF2,      0, 0xDDED,      0,      0, 0xB1CD,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xC0B6,      0, 0xBCBB, /* 0xD0 */
-    0xDDF1,      0,      0, 0xDDF7,      0, 0xDDF6, 0xDDEB,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xC5EE,      0,      0,      0, /* 0xE0 */
-    0xDDFB,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0, 0xDEA4,      0,      0, 0xDEA3  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xDDBD, 	 0, 0xDDCD, 0xCCD1, 	 0, 0xDDC9, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xDDC2, 0xC3C8, 0xC6BC, 0xCEAE, 0xDDCC, /* 0x00 */
+         0, 0xDDC8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xDDC1, 	 0, 	 0, 	 0, 0xDDC6, 0xC2DC, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xD3A9, 0xD3AA, 0xDDD3, 0xCFF4, /* 0x20 */
+    0xC8F8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xDDE6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xDDC7, 	 0, 	 0, 	 0, 0xDDE0, 0xC2E4, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDDE1, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xDDD7, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD6F8, /* 0x50 */
+         0, 0xDDD9, 0xDDD8, 0xB8F0, 0xDDD6, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xC6CF, 	 0, 0xB6AD, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xDDE2, 	 0, 0xBAF9, 0xD4E1, 0xDDE7, 	 0, 	 0, /* 0x60 */
+         0, 0xB4D0, 	 0, 0xDDDA, 	 0, 0xBFFB, 0xDDE3, 	 0, /* 0x70 */
+    0xDDDF, 	 0, 0xDDDD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xB5D9, 	 0, 	 0, 	 0, 	 0, 0xDDDB, /* 0x80 */
+    0xDDDC, 0xDDDE, 	 0, 0xBDAF, 0xDDE4, 	 0, 0xDDE5, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDDF5, /* 0x90 */
+         0, 0xC3C9, 	 0, 	 0, 0xCBE2, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xDDF2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD8E1, /* 0xA0 */
+         0, 	 0, 0xC6D1, 	 0, 0xDDF4, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xD5F4, 0xDDF3, 0xDDF0, 	 0, 	 0, 0xDDEC, 	 0, 0xDDEF, /* 0xB0 */
+         0, 0xDDE8, 	 0, 	 0, 0xD0EE, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xC8D8, 0xDDEE, 	 0, 	 0, 0xDDE9, 	 0, 	 0, /* 0xC0 */
+    0xDDEA, 0xCBF2, 	 0, 0xDDED, 	 0, 	 0, 0xB1CD, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC0B6, 	 0, 0xBCBB, /* 0xD0 */
+    0xDDF1, 	 0, 	 0, 0xDDF7, 	 0, 0xDDF6, 0xDDEB, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xC5EE, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xDDFB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xDEA4, 	 0, 	 0, 0xDEA3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_85[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-                                    0xDDF8,      0,      0,      0, /* 0x00 */
-         0, 0xC3EF,      0, 0xC2FB,      0,      0,      0, 0xD5E1, /* 0x10 */
-         0,      0, 0xCEB5,      0,      0,      0,      0, 0xDDFD, /* 0x10 */
-         0, 0xB2CC,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xC4E8, 0xCADF,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xC7BE, /* 0x30 */
-    0xDDFA, 0xDDFC, 0xDDFE, 0xDEA2, 0xB0AA, 0xB1CE,      0,      0, /* 0x30 */
-         0,      0,      0, 0xDEAC,      0,      0,      0,      0, /* 0x40 */
-    0xDEA6, 0xBDB6, 0xC8EF,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xDEA1,      0, /* 0x50 */
-         0, 0xDEA5,      0,      0,      0,      0, 0xDEA9,      0, /* 0x50 */
-         0,      0,      0,      0, 0xDEA8,      0,      0,      0, /* 0x60 */
-    0xDEA7,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xDEAD,      0, 0xD4CC,      0,      0,      0, /* 0x70 */
-         0, 0xDEB3, 0xDEAA, 0xDEAE,      0,      0, 0xC0D9,      0, /* 0x70 */
-         0,      0,      0,      0, 0xB1A1, 0xDEB6,      0, 0xDEB1, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0, 0xDEB2, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xD1A6, 0xDEB5,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xDEAF,      0,      0,      0, /* 0xA0 */
-    0xDEB0,      0, 0xD0BD,      0,      0,      0, 0xDEB4, 0xCAED, /* 0xA0 */
-    0xDEB9,      0,      0,      0,      0,      0,      0, 0xDEB8, /* 0xB0 */
-         0, 0xDEB7,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xDEBB,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xBDE5,      0,      0,      0,      0,      0, 0xB2D8, /* 0xC0 */
-    0xC3EA,      0,      0, 0xDEBA,      0, 0xC5BA,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xDEBC,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xCCD9,      0,      0,      0, /* 0xE0 */
-         0, 0xB7AA,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xD4E5,      0,      0,      0, 0xDEBD  /* 0xF0 */
+                                    0xDDF8, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xC3EF, 	 0, 0xC2FB, 	 0, 	 0, 	 0, 0xD5E1, /* 0x10 */
+         0, 	 0, 0xCEB5, 	 0, 	 0, 	 0, 	 0, 0xDDFD, /* 0x10 */
+         0, 0xB2CC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xC4E8, 0xCADF, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC7BE, /* 0x30 */
+    0xDDFA, 0xDDFC, 0xDDFE, 0xDEA2, 0xB0AA, 0xB1CE, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xDEAC, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xDEA6, 0xBDB6, 0xC8EF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDEA1, 	 0, /* 0x50 */
+         0, 0xDEA5, 	 0, 	 0, 	 0, 	 0, 0xDEA9, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xDEA8, 	 0, 	 0, 	 0, /* 0x60 */
+    0xDEA7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xDEAD, 	 0, 0xD4CC, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xDEB3, 0xDEAA, 0xDEAE, 	 0, 	 0, 0xC0D9, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xB1A1, 0xDEB6, 	 0, 0xDEB1, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDEB2, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xD1A6, 0xDEB5, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xDEAF, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xDEB0, 	 0, 0xD0BD, 	 0, 	 0, 	 0, 0xDEB4, 0xCAED, /* 0xA0 */
+    0xDEB9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDEB8, /* 0xB0 */
+         0, 0xDEB7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xDEBB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xBDE5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB2D8, /* 0xC0 */
+    0xC3EA, 	 0, 	 0, 0xDEBA, 	 0, 0xC5BA, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xDEBC, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xCCD9, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xB7AA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xD4E5, 	 0, 	 0, 	 0, 0xDEBD	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_86[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xDEBF,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xC4A2,      0,      0,      0,      0, 0xDEC1,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xDEBE, /* 0x20 */
-         0, 0xDEC0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xD5BA,      0,      0,      0, 0xDEC2,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xF2AE, 0xBBA2, 0xC2B2, /* 0x40 */
-    0xC5B0, 0xC2C7,      0,      0, 0xF2AF,      0,      0,      0, /* 0x50 */
-         0,      0, 0xD0E9,      0,      0,      0, 0xD3DD,      0, /* 0x50 */
-         0,      0, 0xEBBD,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xB3E6, 0xF2B0,      0, 0xF2B1,      0, /* 0x60 */
-         0, 0xCAAD,      0,      0,      0,      0,      0,      0, /* 0x70 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xDEBF, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xC4A2, 	 0, 	 0, 	 0, 	 0, 0xDEC1, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDEBE, /* 0x20 */
+         0, 0xDEC0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xD5BA, 	 0, 	 0, 	 0, 0xDEC2, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF2AE, 0xBBA2, 0xC2B2, /* 0x40 */
+    0xC5B0, 0xC2C7, 	 0, 	 0, 0xF2AF, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xD0E9, 	 0, 	 0, 	 0, 0xD3DD, 	 0, /* 0x50 */
+         0, 	 0, 0xEBBD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xB3E6, 0xF2B0, 	 0, 0xF2B1, 	 0, /* 0x60 */
+         0, 0xCAAD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xBAE7, 0xF2B3, 0xF2B5, 0xF2B4, 0xCBE4, 0xCFBA, 0xF2B2, /* 0x70 */
-    0xCAB4, 0xD2CF, 0xC2EC,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xCEC3, 0xF2B8, 0xB0F6, 0xF2B7,      0,      0, /* 0x80 */
-         0,      0,      0, 0xF2BE,      0, 0xB2CF,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xD1C1, 0xF2BA,      0,      0, /* 0x90 */
-         0,      0,      0, 0xF2BC, 0xD4E9,      0,      0, 0xF2BB, /* 0xA0 */
-    0xF2B6, 0xF2BF, 0xF2BD,      0, 0xF2B9,      0,      0, 0xF2C7, /* 0xA0 */
-    0xF2C4, 0xF2C6,      0,      0, 0xF2CA, 0xF2C2, 0xF2C0,      0, /* 0xB0 */
-         0,      0, 0xF2C5,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xD6FB,      0,      0,      0, 0xF2C1,      0, 0xC7F9, 0xC9DF, /* 0xC0 */
-         0, 0xF2C8, 0xB9C6, 0xB5B0,      0,      0, 0xF2C3, 0xF2C9, /* 0xC0 */
-    0xF2D0, 0xF2D6,      0,      0, 0xBBD7,      0,      0,      0, /* 0xD0 */
-    0xF2D5, 0xCDDC,      0, 0xD6EB,      0,      0, 0xF2D2, 0xF2D4, /* 0xD0 */
-         0,      0,      0,      0, 0xB8F2,      0,      0,      0, /* 0xE0 */
-         0, 0xF2CB,      0,      0,      0, 0xF2CE, 0xC2F9,      0, /* 0xE0 */
-    0xD5DD, 0xF2CC, 0xF2CD, 0xF2CF, 0xF2D3,      0,      0,      0, /* 0xF0 */
-    0xF2D9, 0xD3BC,      0,      0,      0,      0, 0xB6EA          /* 0xF0 */
+    0xCAB4, 0xD2CF, 0xC2EC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xCEC3, 0xF2B8, 0xB0F6, 0xF2B7, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xF2BE, 	 0, 0xB2CF, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xD1C1, 0xF2BA, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xF2BC, 0xD4E9, 	 0, 	 0, 0xF2BB, /* 0xA0 */
+    0xF2B6, 0xF2BF, 0xF2BD, 	 0, 0xF2B9, 	 0, 	 0, 0xF2C7, /* 0xA0 */
+    0xF2C4, 0xF2C6, 	 0, 	 0, 0xF2CA, 0xF2C2, 0xF2C0, 	 0, /* 0xB0 */
+         0, 	 0, 0xF2C5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xD6FB, 	 0, 	 0, 	 0, 0xF2C1, 	 0, 0xC7F9, 0xC9DF, /* 0xC0 */
+         0, 0xF2C8, 0xB9C6, 0xB5B0, 	 0, 	 0, 0xF2C3, 0xF2C9, /* 0xC0 */
+    0xF2D0, 0xF2D6, 	 0, 	 0, 0xBBD7, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xF2D5, 0xCDDC, 	 0, 0xD6EB, 	 0, 	 0, 0xF2D2, 0xF2D4, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xB8F2, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xF2CB, 	 0, 	 0, 	 0, 0xF2CE, 0xC2F9, 	 0, /* 0xE0 */
+    0xD5DD, 0xF2CC, 0xF2CD, 0xF2CF, 0xF2D3, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xF2D9, 0xD3BC, 	 0, 	 0, 	 0, 	 0, 0xB6EA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_87[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xCAF1,      0, 0xB7E4, 0xF2D7,      0,      0,      0, 0xF2D8, /* 0x00 */
-    0xF2DA, 0xF2DD, 0xF2DB,      0,      0, 0xF2DC,      0,      0, /* 0x00 */
-         0,      0, 0xD1D1, 0xF2D1,      0, 0xCDC9,      0, 0xCECF, /* 0x10 */
-    0xD6A9,      0, 0xF2E3,      0, 0xC3DB,      0, 0xF2E0,      0, /* 0x10 */
-         0, 0xC0AF, 0xF2EC, 0xF2DE,      0, 0xF2E1,      0,      0, /* 0x20 */
-         0, 0xF2E8,      0,      0,      0,      0, 0xF2E2,      0, /* 0x20 */
-         0, 0xF2E7,      0,      0, 0xF2E6,      0,      0, 0xF2E9, /* 0x30 */
-         0,      0,      0, 0xF2DF,      0,      0, 0xF2E4, 0xF2EA, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xD3AC, /* 0x40 */
-    0xF2E5, 0xB2F5,      0,      0, 0xF2F2,      0, 0xD0AB,      0, /* 0x40 */
-         0,      0,      0, 0xF2F5,      0,      0,      0, 0xBBC8, /* 0x50 */
-         0, 0xF2F9,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xF2F0,      0,      0, 0xF2F6, 0xF2F8, 0xF2FA,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xF2F3,      0, /* 0x60 */
-    0xF2F1,      0,      0,      0, 0xBAFB,      0, 0xB5FB,      0, /* 0x70 */
-         0,      0,      0, 0xF2EF, 0xF2F7, 0xF2ED, 0xF2EE,      0, /* 0x70 */
-         0,      0, 0xF2EB, 0xF3A6,      0, 0xF3A3,      0,      0, /* 0x80 */
-    0xF3A2,      0,      0, 0xF2F4,      0, 0xC8DA,      0,      0, /* 0x80 */
-         0,      0,      0, 0xF2FB,      0,      0,      0, 0xF3A5, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xC3F8, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xF2FD,      0,      0, 0xF3A7, 0xF3A9, 0xF3A4,      0, 0xF2FC, /* 0xA0 */
-         0,      0,      0, 0xF3AB,      0, 0xF3AA,      0,      0, /* 0xB0 */
-         0,      0, 0xC2DD,      0,      0, 0xF3AE,      0,      0, /* 0xB0 */
-    0xF3B0,      0,      0,      0,      0,      0, 0xF3A1,      0, /* 0xC0 */
-         0,      0, 0xF3B1, 0xF3AC,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xF3AF, 0xF2FE, 0xF3AD,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xF3B2,      0,      0,      0,      0, /* 0xD0 */
-    0xF3B4,      0,      0,      0,      0, 0xF3A8,      0,      0, /* 0xE0 */
-         0,      0, 0xF3B3,      0,      0,      0, 0xF3B5,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xD0B7,      0,      0,      0,      0, 0xF3B8          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xCAF1, 	 0, 0xB7E4, 0xF2D7, 	 0, 	 0, 	 0, 0xF2D8, /* 0x00 */
+    0xF2DA, 0xF2DD, 0xF2DB, 	 0, 	 0, 0xF2DC, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xD1D1, 0xF2D1, 	 0, 0xCDC9, 	 0, 0xCECF, /* 0x10 */
+    0xD6A9, 	 0, 0xF2E3, 	 0, 0xC3DB, 	 0, 0xF2E0, 	 0, /* 0x10 */
+         0, 0xC0AF, 0xF2EC, 0xF2DE, 	 0, 0xF2E1, 	 0, 	 0, /* 0x20 */
+         0, 0xF2E8, 	 0, 	 0, 	 0, 	 0, 0xF2E2, 	 0, /* 0x20 */
+         0, 0xF2E7, 	 0, 	 0, 0xF2E6, 	 0, 	 0, 0xF2E9, /* 0x30 */
+         0, 	 0, 	 0, 0xF2DF, 	 0, 	 0, 0xF2E4, 0xF2EA, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD3AC, /* 0x40 */
+    0xF2E5, 0xB2F5, 	 0, 	 0, 0xF2F2, 	 0, 0xD0AB, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xF2F5, 	 0, 	 0, 	 0, 0xBBC8, /* 0x50 */
+         0, 0xF2F9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xF2F0, 	 0, 	 0, 0xF2F6, 0xF2F8, 0xF2FA, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF2F3, 	 0, /* 0x60 */
+    0xF2F1, 	 0, 	 0, 	 0, 0xBAFB, 	 0, 0xB5FB, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0xF2EF, 0xF2F7, 0xF2ED, 0xF2EE, 	 0, /* 0x70 */
+         0, 	 0, 0xF2EB, 0xF3A6, 	 0, 0xF3A3, 	 0, 	 0, /* 0x80 */
+    0xF3A2, 	 0, 	 0, 0xF2F4, 	 0, 0xC8DA, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xF2FB, 	 0, 	 0, 	 0, 0xF3A5, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC3F8, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xF2FD, 	 0, 	 0, 0xF3A7, 0xF3A9, 0xF3A4, 	 0, 0xF2FC, /* 0xA0 */
+         0, 	 0, 	 0, 0xF3AB, 	 0, 0xF3AA, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xC2DD, 	 0, 	 0, 0xF3AE, 	 0, 	 0, /* 0xB0 */
+    0xF3B0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF3A1, 	 0, /* 0xC0 */
+         0, 	 0, 0xF3B1, 0xF3AC, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xF3AF, 0xF2FE, 0xF3AD, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xF3B2, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xF3B4, 	 0, 	 0, 	 0, 	 0, 0xF3A8, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xF3B3, 	 0, 	 0, 	 0, 0xF3B5, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xD0B7, 	 0, 	 0, 	 0, 	 0, 0xF3B8			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_88[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xD9F9,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xF3B9,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0xF3B7,      0, 0xC8E4, 0xF3B6,      0, /* 0x10 */
-         0,      0,      0, 0xF3BA,      0,      0,      0,      0, /* 0x10 */
-         0, 0xF3BB, 0xB4C0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xEEC3,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xF3BC,      0,      0, 0xF3BD,      0,      0,      0, /* 0x30 */
-    0xD1AA,      0,      0,      0, 0xF4AC, 0xD0C6,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xD0D0, 0xD1DC,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xCFCE,      0,      0, 0xBDD6, /* 0x50 */
-         0, 0xD1C3,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xBAE2, 0xE1E9, 0xD2C2, 0xF1C2, 0xB2B9,      0,      0, /* 0x60 */
-    0xB1ED, 0xF1C3,      0, 0xC9C0, 0xB3C4,      0, 0xD9F2,      0, /* 0x60 */
-    0xCBA5,      0, 0xF1C4,      0,      0,      0,      0, 0xD6D4, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF1C5, 0xF4C0, 0xF1C6, /* 0x70 */
-         0, 0xD4AC, 0xF1C7,      0, 0xB0C0, 0xF4C1,      0,      0, /* 0x80 */
-    0xF4C2,      0,      0, 0xB4FC,      0, 0xC5DB,      0,      0, /* 0x80 */
-         0,      0, 0xCCBB,      0,      0,      0, 0xD0E4,      0, /* 0x90 */
-         0,      0,      0,      0, 0xCDE0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xF1C8,      0, 0xD9F3,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xB1BB,      0, 0xCFAE,      0,      0, /* 0xA0 */
-         0, 0xB8A4,      0,      0,      0,      0,      0, 0xF1CA, /* 0xB0 */
-         0,      0,      0,      0, 0xF1CB,      0,      0,      0, /* 0xB0 */
-         0, 0xB2C3, 0xC1D1,      0,      0, 0xD7B0, 0xF1C9,      0, /* 0xC0 */
-         0, 0xF1CC,      0,      0,      0,      0, 0xF1CE,      0, /* 0xC0 */
-         0,      0, 0xD9F6,      0, 0xD2E1, 0xD4A3,      0,      0, /* 0xD0 */
-    0xF4C3, 0xC8B9,      0,      0,      0,      0,      0, 0xF4C4, /* 0xD0 */
-         0,      0, 0xF1CD, 0xF1CF, 0xBFE3, 0xF1D0,      0,      0, /* 0xE0 */
-    0xF1D4,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xF1D6, 0xF1D1,      0, 0xC9D1, 0xC5E1,      0,      0,      0, /* 0xF0 */
-    0xC2E3, 0xB9FC,      0,      0, 0xF1D3,      0, 0xF1D5          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xD9F9, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xF3B9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xF3B7, 	 0, 0xC8E4, 0xF3B6, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xF3BA, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xF3BB, 0xB4C0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xEEC3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xF3BC, 	 0, 	 0, 0xF3BD, 	 0, 	 0, 	 0, /* 0x30 */
+    0xD1AA, 	 0, 	 0, 	 0, 0xF4AC, 0xD0C6, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xD0D0, 0xD1DC, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xCFCE, 	 0, 	 0, 0xBDD6, /* 0x50 */
+         0, 0xD1C3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xBAE2, 0xE1E9, 0xD2C2, 0xF1C2, 0xB2B9, 	 0, 	 0, /* 0x60 */
+    0xB1ED, 0xF1C3, 	 0, 0xC9C0, 0xB3C4, 	 0, 0xD9F2, 	 0, /* 0x60 */
+    0xCBA5, 	 0, 0xF1C4, 	 0, 	 0, 	 0, 	 0, 0xD6D4, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF1C5, 0xF4C0, 0xF1C6, /* 0x70 */
+         0, 0xD4AC, 0xF1C7, 	 0, 0xB0C0, 0xF4C1, 	 0, 	 0, /* 0x80 */
+    0xF4C2, 	 0, 	 0, 0xB4FC, 	 0, 0xC5DB, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xCCBB, 	 0, 	 0, 	 0, 0xD0E4, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xCDE0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xF1C8, 	 0, 0xD9F3, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xB1BB, 	 0, 0xCFAE, 	 0, 	 0, /* 0xA0 */
+         0, 0xB8A4, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF1CA, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xF1CB, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xB2C3, 0xC1D1, 	 0, 	 0, 0xD7B0, 0xF1C9, 	 0, /* 0xC0 */
+         0, 0xF1CC, 	 0, 	 0, 	 0, 	 0, 0xF1CE, 	 0, /* 0xC0 */
+         0, 	 0, 0xD9F6, 	 0, 0xD2E1, 0xD4A3, 	 0, 	 0, /* 0xD0 */
+    0xF4C3, 0xC8B9, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4C4, /* 0xD0 */
+         0, 	 0, 0xF1CD, 0xF1CF, 0xBFE3, 0xF1D0, 	 0, 	 0, /* 0xE0 */
+    0xF1D4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xF1D6, 0xF1D1, 	 0, 0xC9D1, 0xC5E1, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xC2E3, 0xB9FC, 	 0, 	 0, 0xF1D3, 	 0, 0xF1D5			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_89[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xB9D3,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xF1DB,      0,      0,      0,      0,      0, /* 0x00 */
-    0xBAD6,      0, 0xB0FD, 0xF1D9,      0,      0,      0,      0, /* 0x10 */
-         0, 0xF1D8, 0xF1D2, 0xF1DA,      0,      0,      0,      0, /* 0x10 */
-         0, 0xF1D7,      0,      0,      0, 0xC8EC,      0,      0, /* 0x20 */
-         0,      0, 0xCDCA, 0xF1DD,      0,      0,      0,      0, /* 0x20 */
-    0xE5BD,      0,      0,      0, 0xF1DC,      0, 0xF1DE,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xF1DF,      0,      0, 0xCFE5,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xF4C5, 0xBDF3, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xF1E0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0xF1E1,      0,      0,      0, 0xCEF7, /* 0x70 */
-         0, 0xD2AA,      0, 0xF1FB,      0,      0, 0xB8B2,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xBCFB, 0xB9DB,      0, 0xB9E6, 0xC3D9, 0xCAD3, 0xEAE8, /* 0xC0 */
-    0xC0C0, 0xBEF5, 0xEAE9, 0xEAEA, 0xEAEB,      0, 0xEAEC, 0xEAED, /* 0xC0 */
-    0xEAEE, 0xEAEF, 0xBDC7,      0,      0,      0, 0xF5FB,      0, /* 0xD0 */
-         0,      0, 0xF5FD,      0, 0xF5FE,      0, 0xF5FC,      0, /* 0xD0 */
-         0,      0,      0, 0xBDE2,      0, 0xF6A1, 0xB4A5,      0, /* 0xE0 */
-         0,      0,      0, 0xF6A2,      0,      0,      0, 0xF6A3, /* 0xE0 */
-         0,      0,      0, 0xECB2                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xB9D3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xF1DB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xBAD6, 	 0, 0xB0FD, 0xF1D9, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xF1D8, 0xF1D2, 0xF1DA, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xF1D7, 	 0, 	 0, 	 0, 0xC8EC, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xCDCA, 0xF1DD, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xE5BD, 	 0, 	 0, 	 0, 0xF1DC, 	 0, 0xF1DE, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xF1DF, 	 0, 	 0, 0xCFE5, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4C5, 0xBDF3, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF1E0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0xF1E1, 	 0, 	 0, 	 0, 0xCEF7, /* 0x70 */
+         0, 0xD2AA, 	 0, 0xF1FB, 	 0, 	 0, 0xB8B2, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xBCFB, 0xB9DB, 	 0, 0xB9E6, 0xC3D9, 0xCAD3, 0xEAE8, /* 0xC0 */
+    0xC0C0, 0xBEF5, 0xEAE9, 0xEAEA, 0xEAEB, 	 0, 0xEAEC, 0xEAED, /* 0xC0 */
+    0xEAEE, 0xEAEF, 0xBDC7, 	 0, 	 0, 	 0, 0xF5FB, 	 0, /* 0xD0 */
+         0, 	 0, 0xF5FD, 	 0, 0xF5FE, 	 0, 0xF5FC, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xBDE2, 	 0, 0xF6A1, 0xB4A5, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xF6A2, 	 0, 	 0, 	 0, 0xF6A3, /* 0xE0 */
+         0, 	 0, 	 0, 0xECB2									/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -2402,27 +2402,27 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_89[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_8A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD1D4,      0,      0,      0,      0,      0,      0, 0xD9EA, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xF6A4,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xEEBA,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xD5B2,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xD3FE, 0xCCDC,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xCAC4                                  /* 0x90 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD1D4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD9EA, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF6A4, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xEEBA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xD5B2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xD3FE, 0xCCDC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xCAC4									/* 0x90 */
                                                                     /* 0x90 */
 };
 
@@ -2430,76 +2430,76 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_8A[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_8B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xE5C0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xF6A5,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xBEAF,      0, /* 0x60 */
-         0,      0,      0,      0, 0xC6A9,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF6A5, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBEAF, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xC6A9, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
     0xDAA5, 0xBCC6, 0xB6A9, 0xB8BC, 0xC8CF, 0xBCA5, 0xDAA6, 0xDAA7, /* 0xA0 */
-    0xCCD6, 0xC8C3, 0xDAA8, 0xC6FD,      0, 0xD1B5, 0xD2E9, 0xD1B6, /* 0xA0 */
-    0xBCC7,      0, 0xBDB2, 0xBBE4, 0xDAA9, 0xDAAA, 0xD1C8, 0xDAAB, /* 0xB0 */
-    0xD0ED, 0xB6EF, 0xC2DB,      0, 0xCBCF, 0xB7ED, 0xC9E8, 0xB7C3, /* 0xB0 */
-    0xBEF7, 0xD6A4, 0xDAAC, 0xDAAD, 0xC6C0, 0xD7E7, 0xCAB6,      0, /* 0xC0 */
+    0xCCD6, 0xC8C3, 0xDAA8, 0xC6FD, 	 0, 0xD1B5, 0xD2E9, 0xD1B6, /* 0xA0 */
+    0xBCC7, 	 0, 0xBDB2, 0xBBE4, 0xDAA9, 0xDAAA, 0xD1C8, 0xDAAB, /* 0xB0 */
+    0xD0ED, 0xB6EF, 0xC2DB, 	 0, 0xCBCF, 0xB7ED, 0xC9E8, 0xB7C3, /* 0xB0 */
+    0xBEF7, 0xD6A4, 0xDAAC, 0xDAAD, 0xC6C0, 0xD7E7, 0xCAB6, 	 0, /* 0xC0 */
     0xD5A9, 0xCBDF, 0xD5EF, 0xDAAE, 0xD6DF, 0xB4CA, 0xDAB0, 0xDAAF, /* 0xC0 */
          0, 0xD2EB, 0xDAB1, 0xDAB2, 0xDAB3, 0xCAD4, 0xDAB4, 0xCAAB, /* 0xD0 */
     0xDAB5, 0xDAB6, 0xB3CF, 0xD6EF, 0xDAB7, 0xBBB0, 0xB5AE, 0xDAB8, /* 0xD0 */
     0xDAB9, 0xB9EE, 0xD1AF, 0xD2E8, 0xDABA, 0xB8C3, 0xCFEA, 0xB2EF, /* 0xE0 */
-    0xDABB, 0xDABC,      0, 0xBDEB, 0xCEDC, 0xD3EF, 0xDABD, 0xCEF3, /* 0xE0 */
+    0xDABB, 0xDABC, 	 0, 0xBDEB, 0xCEDC, 0xD3EF, 0xDABD, 0xCEF3, /* 0xE0 */
     0xDABE, 0xD3D5, 0xBBE5, 0xDABF, 0xCBB5, 0xCBD0, 0xDAC0, 0xC7EB, /* 0xF0 */
-    0xD6EE, 0xDAC1, 0xC5B5, 0xB6C1, 0xDAC2, 0xB7CC, 0xBFCE, 0xDAC3  /* 0xF0 */
+    0xD6EE, 0xDAC1, 0xC5B5, 0xB6C1, 0xDAC2, 0xB7CC, 0xBFCE, 0xDAC3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_8C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xDAC4, 0xCBAD, 0xDAC5, 0xB5F7, 0xDAC6, 0xC1C2, 0xD7BB, 0xDAC7, /* 0x00 */
-    0xCCB8,      0, 0xD2EA, 0xC4B1, 0xDAC8, 0xB5FD, 0xBBD1, 0xDAC9, /* 0x00 */
+    0xCCB8, 	 0, 0xD2EA, 0xC4B1, 0xDAC8, 0xB5FD, 0xBBD1, 0xDAC9, /* 0x00 */
     0xD0B3, 0xDACA, 0xDACB, 0xCEBD, 0xDACC, 0xDACD, 0xDACE, 0xB2F7, /* 0x10 */
-    0xDAD1, 0xDACF, 0xD1E8, 0xDAD0, 0xC3D5, 0xDAD2,      0, 0xDAD3, /* 0x10 */
+    0xDAD1, 0xDACF, 0xD1E8, 0xDAD0, 0xC3D5, 0xDAD2, 	 0, 0xDAD3, /* 0x10 */
     0xDAD4, 0xDAD5, 0xD0BB, 0xD2A5, 0xB0F9, 0xDAD6, 0xC7AB, 0xDAD7, /* 0x20 */
     0xBDF7, 0xC3A1, 0xDAD8, 0xDAD9, 0xC3FD, 0xCCB7, 0xDADA, 0xDADB, /* 0x20 */
     0xC0BE, 0xC6D7, 0xDADC, 0xDADD, 0xC7B4, 0xDADE, 0xDADF, 0xB9C8, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xBBED,      0,      0,      0,      0, 0xB6B9, 0xF4F8, /* 0x40 */
-         0, 0xF4F9,      0,      0, 0xCDE3,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xF5B9,      0,      0, /* 0x50 */
-         0,      0, 0xEBE0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xCFF3, 0xBBBF,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xBAC0, 0xD4A5,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xE1D9,      0,      0,      0,      0, /* 0x70 */
-    0xF5F4, 0xB1AA, 0xB2F2,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xF5F5,      0,      0, 0xF5F7,      0,      0, /* 0x80 */
-         0, 0xBAD1, 0xF5F6,      0, 0xC3B2,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0xF5F9,      0,      0,      0, /* 0x90 */
-    0xF5F8                                                          /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xBBED, 	 0, 	 0, 	 0, 	 0, 0xB6B9, 0xF4F8, /* 0x40 */
+         0, 0xF4F9, 	 0, 	 0, 0xCDE3, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF5B9, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xEBE0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xCFF3, 0xBBBF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xBAC0, 0xD4A5, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xE1D9, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xF5F4, 0xB1AA, 0xB2F2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xF5F5, 	 0, 	 0, 0xF5F7, 	 0, 	 0, /* 0x80 */
+         0, 0xBAD1, 0xF5F6, 	 0, 0xC3B2, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xF5F9, 	 0, 	 0, 	 0, /* 0x90 */
+    0xF5F8															/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_8D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x10 */
                                             0xB1B4, 0xD5EA, 0xB8BA, /* 0x10 */
          0, 0xB9B1, 0xB2C6, 0xD4F0, 0xCFCD, 0xB0DC, 0xD5CB, 0xBBF5, /* 0x20 */
@@ -2508,215 +2508,215 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_8D[] =
     0xC3B3, 0xB7D1, 0xBAD8, 0xEADD, 0xD4F4, 0xEADE, 0xBCD6, 0xBBDF, /* 0x30 */
     0xEADF, 0xC1DE, 0xC2B8, 0xD4DF, 0xD7CA, 0xEAE0, 0xEAE1, 0xEAE4, /* 0x40 */
     0xEAE2, 0xEAE3, 0xC9DE, 0xB8B3, 0xB6C4, 0xEAE5, 0xCAEA, 0xC9CD, /* 0x40 */
-    0xB4CD,      0,      0, 0xE2D9, 0xC5E2, 0xEAE6, 0xC0B5,      0, /* 0x50 */
-    0xD7B8, 0xEAE7, 0xD7AC, 0xC8FC, 0xD8D3, 0xD8CD, 0xD4DE,      0, /* 0x50 */
-    0xD4F9, 0xC9C4, 0xD3AE, 0xB8D3, 0xB3E0,      0, 0xC9E2, 0xF4F6, /* 0x60 */
-         0,      0,      0, 0xBAD5,      0, 0xF4F7,      0,      0, /* 0x60 */
-    0xD7DF,      0,      0, 0xF4F1, 0xB8B0, 0xD5D4, 0xB8CF, 0xC6F0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xB3C3,      0,      0, 0xF4F2, 0xB3AC,      0,      0, /* 0x80 */
-         0,      0, 0xD4BD, 0xC7F7,      0,      0,      0,      0, /* 0x80 */
-         0, 0xF4F4,      0,      0, 0xF4F3,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xCCCB, /* 0x90 */
-         0,      0,      0, 0xC8A4,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xF4F5,      0, 0xD7E3, 0xC5BF, 0xF5C0,      0,      0, /* 0xB0 */
-    0xF5BB,      0, 0xF5C3,      0, 0xF5C2,      0, 0xD6BA, 0xF5C1, /* 0xB0 */
-         0,      0,      0, 0xD4BE, 0xF5C4,      0, 0xF5CC,      0, /* 0xC0 */
-         0,      0,      0, 0xB0CF, 0xB5F8,      0, 0xF5C9, 0xF5CA, /* 0xC0 */
-         0, 0xC5DC,      0,      0,      0,      0, 0xF5C5, 0xF5C6, /* 0xD0 */
-         0,      0, 0xF5C7, 0xF5CB,      0, 0xBEE0, 0xF5C8, 0xB8FA, /* 0xD0 */
-         0,      0,      0, 0xF5D0, 0xF5D3,      0,      0,      0, /* 0xE0 */
-    0xBFE7,      0, 0xB9F2, 0xF5BC, 0xF5CD,      0,      0, 0xC2B7, /* 0xE0 */
-         0,      0,      0, 0xCCF8,      0, 0xBCF9,      0, 0xF5CE, /* 0xF0 */
-    0xF5CF, 0xF5D1, 0xB6E5, 0xF5D2,      0, 0xF5D5                  /* 0xF0 */
+    0xB4CD, 	 0, 	 0, 0xE2D9, 0xC5E2, 0xEAE6, 0xC0B5, 	 0, /* 0x50 */
+    0xD7B8, 0xEAE7, 0xD7AC, 0xC8FC, 0xD8D3, 0xD8CD, 0xD4DE, 	 0, /* 0x50 */
+    0xD4F9, 0xC9C4, 0xD3AE, 0xB8D3, 0xB3E0, 	 0, 0xC9E2, 0xF4F6, /* 0x60 */
+         0, 	 0, 	 0, 0xBAD5, 	 0, 0xF4F7, 	 0, 	 0, /* 0x60 */
+    0xD7DF, 	 0, 	 0, 0xF4F1, 0xB8B0, 0xD5D4, 0xB8CF, 0xC6F0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xB3C3, 	 0, 	 0, 0xF4F2, 0xB3AC, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xD4BD, 0xC7F7, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xF4F4, 	 0, 	 0, 0xF4F3, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCCCB, /* 0x90 */
+         0, 	 0, 	 0, 0xC8A4, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xF4F5, 	 0, 0xD7E3, 0xC5BF, 0xF5C0, 	 0, 	 0, /* 0xB0 */
+    0xF5BB, 	 0, 0xF5C3, 	 0, 0xF5C2, 	 0, 0xD6BA, 0xF5C1, /* 0xB0 */
+         0, 	 0, 	 0, 0xD4BE, 0xF5C4, 	 0, 0xF5CC, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xB0CF, 0xB5F8, 	 0, 0xF5C9, 0xF5CA, /* 0xC0 */
+         0, 0xC5DC, 	 0, 	 0, 	 0, 	 0, 0xF5C5, 0xF5C6, /* 0xD0 */
+         0, 	 0, 0xF5C7, 0xF5CB, 	 0, 0xBEE0, 0xF5C8, 0xB8FA, /* 0xD0 */
+         0, 	 0, 	 0, 0xF5D0, 0xF5D3, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xBFE7, 	 0, 0xB9F2, 0xF5BC, 0xF5CD, 	 0, 	 0, 0xC2B7, /* 0xE0 */
+         0, 	 0, 	 0, 0xCCF8, 	 0, 0xBCF9, 	 0, 0xF5CE, /* 0xF0 */
+    0xF5CF, 0xF5D1, 0xB6E5, 0xF5D2, 	 0, 0xF5D5					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_8E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xF5BD,      0,      0, /* 0x00 */
-         0, 0xF5D4, 0xD3BB,      0, 0xB3EC,      0,      0, 0xCCA4, /* 0x00 */
-         0,      0,      0,      0, 0xF5D6,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xF5D7, 0xBEE1, 0xF5D8, /* 0x10 */
-         0,      0, 0xCCDF, 0xF5DB,      0,      0,      0,      0, /* 0x20 */
-         0, 0xB2C8, 0xD7D9,      0, 0xF5D9,      0, 0xF5DA, 0xF5DC, /* 0x20 */
-         0, 0xF5E2,      0,      0,      0, 0xF5E0,      0,      0, /* 0x30 */
-         0, 0xF5DF, 0xF5DD,      0,      0, 0xF5E1,      0,      0, /* 0x30 */
-    0xF5DE, 0xF5E4, 0xF5E5,      0, 0xCCE3,      0,      0, 0xE5BF, /* 0x40 */
-    0xB5B8, 0xF5E3, 0xF5E8, 0xCCA3,      0,      0,      0,      0, /* 0x40 */
-         0, 0xF5E6, 0xF5E7,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xF5BE,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xB1C4,      0, /* 0x60 */
-         0, 0xF5BF,      0,      0, 0xB5C5, 0xB2E4,      0, 0xF5EC, /* 0x60 */
-    0xF5E9,      0, 0xB6D7,      0, 0xF5ED,      0, 0xF5EA,      0, /* 0x70 */
-         0,      0,      0,      0, 0xF5EB,      0,      0, 0xB4DA, /* 0x70 */
-         0, 0xD4EA,      0,      0,      0, 0xF5EE,      0, 0xB3F9, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0, 0xF5EF, /* 0x80 */
-    0xF5F1,      0,      0,      0, 0xF5F0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xF5F2,      0, 0xF5F3,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xC9ED, 0xB9AA,      0,      0, 0xC7FB, /* 0xA0 */
-         0,      0, 0xB6E3,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xCCC9,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xEAA6          /* 0xC0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xF5BD, 	 0, 	 0, /* 0x00 */
+         0, 0xF5D4, 0xD3BB, 	 0, 0xB3EC, 	 0, 	 0, 0xCCA4, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xF5D6, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF5D7, 0xBEE1, 0xF5D8, /* 0x10 */
+         0, 	 0, 0xCCDF, 0xF5DB, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xB2C8, 0xD7D9, 	 0, 0xF5D9, 	 0, 0xF5DA, 0xF5DC, /* 0x20 */
+         0, 0xF5E2, 	 0, 	 0, 	 0, 0xF5E0, 	 0, 	 0, /* 0x30 */
+         0, 0xF5DF, 0xF5DD, 	 0, 	 0, 0xF5E1, 	 0, 	 0, /* 0x30 */
+    0xF5DE, 0xF5E4, 0xF5E5, 	 0, 0xCCE3, 	 0, 	 0, 0xE5BF, /* 0x40 */
+    0xB5B8, 0xF5E3, 0xF5E8, 0xCCA3, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xF5E6, 0xF5E7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xF5BE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB1C4, 	 0, /* 0x60 */
+         0, 0xF5BF, 	 0, 	 0, 0xB5C5, 0xB2E4, 	 0, 0xF5EC, /* 0x60 */
+    0xF5E9, 	 0, 0xB6D7, 	 0, 0xF5ED, 	 0, 0xF5EA, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xF5EB, 	 0, 	 0, 0xB4DA, /* 0x70 */
+         0, 0xD4EA, 	 0, 	 0, 	 0, 0xF5EE, 	 0, 0xB3F9, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF5EF, /* 0x80 */
+    0xF5F1, 	 0, 	 0, 	 0, 0xF5F0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xF5F2, 	 0, 0xF5F3, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xC9ED, 0xB9AA, 	 0, 	 0, 0xC7FB, /* 0xA0 */
+         0, 	 0, 0xB6E3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xCCC9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEAA6			/* 0xC0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_8F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                     0xB3B5, 0xD4FE, /* 0x60 */
-    0xB9EC, 0xD0F9,      0, 0xE9ED, 0xD7AA, 0xE9EE, 0xC2D6, 0xC8ED, /* 0x60 */
+    0xB9EC, 0xD0F9, 	 0, 0xE9ED, 0xD7AA, 0xE9EE, 0xC2D6, 0xC8ED, /* 0x60 */
     0xBAE4, 0xE9EF, 0xE9F0, 0xE9F1, 0xD6E1, 0xE9F2, 0xE9F3, 0xE9F5, /* 0x70 */
     0xE9F4, 0xE9F6, 0xE9F7, 0xC7E1, 0xE9F8, 0xD4D8, 0xE9F9, 0xBDCE, /* 0x70 */
          0, 0xE9FA, 0xE9FB, 0xBDCF, 0xE9FC, 0xB8A8, 0xC1BE, 0xE9FD, /* 0x80 */
-    0xB1B2, 0xBBD4, 0xB9F5, 0xE9FE,      0, 0xEAA1, 0xEAA2, 0xEAA3, /* 0x80 */
-    0xB7F8, 0xBCAD,      0, 0xCAE4, 0xE0CE, 0xD4AF, 0xCFBD, 0xD5B7, /* 0x90 */
-    0xEAA4, 0xD5DE, 0xEAA5, 0xD0C1, 0xB9BC,      0, 0xB4C7, 0xB1D9, /* 0x90 */
-         0,      0,      0, 0xC0B1,      0,      0,      0,      0, /* 0xA0 */
-    0xB1E6, 0xB1E7,      0, 0xB1E8,      0,      0,      0,      0, /* 0xA0 */
-    0xB3BD, 0xC8E8,      0,      0,      0,      0, 0xE5C1,      0, /* 0xB0 */
-         0, 0xB1DF,      0,      0,      0, 0xC1C9, 0xB4EF,      0, /* 0xB0 */
-         0, 0xC7A8, 0xD3D8,      0, 0xC6F9, 0xD1B8,      0, 0xB9FD, /* 0xC0 */
-    0xC2F5,      0,      0,      0,      0,      0, 0xD3AD,      0, /* 0xC0 */
-    0xD4CB, 0xBDFC,      0, 0xE5C2, 0xB7B5, 0xE5C3,      0,      0, /* 0xD0 */
-    0xBBB9, 0xD5E2,      0, 0xBDF8, 0xD4B6, 0xCEA5, 0xC1AC, 0xB3D9, /* 0xD0 */
-         0,      0, 0xCCF6,      0, 0xE5C6, 0xE5C4, 0xE5C8,      0, /* 0xE0 */
-    0xE5CA, 0xE5C7, 0xB5CF, 0xC6C8,      0, 0xB5FC, 0xE5C5,      0, /* 0xE0 */
-    0xCAF6,      0,      0, 0xE5C9,      0,      0,      0, 0xC3D4, /* 0xF0 */
-    0xB1C5, 0xBCA3,      0,      0,      0, 0xD7B7                  /* 0xF0 */
+    0xB1B2, 0xBBD4, 0xB9F5, 0xE9FE, 	 0, 0xEAA1, 0xEAA2, 0xEAA3, /* 0x80 */
+    0xB7F8, 0xBCAD, 	 0, 0xCAE4, 0xE0CE, 0xD4AF, 0xCFBD, 0xD5B7, /* 0x90 */
+    0xEAA4, 0xD5DE, 0xEAA5, 0xD0C1, 0xB9BC, 	 0, 0xB4C7, 0xB1D9, /* 0x90 */
+         0, 	 0, 	 0, 0xC0B1, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xB1E6, 0xB1E7, 	 0, 0xB1E8, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xB3BD, 0xC8E8, 	 0, 	 0, 	 0, 	 0, 0xE5C1, 	 0, /* 0xB0 */
+         0, 0xB1DF, 	 0, 	 0, 	 0, 0xC1C9, 0xB4EF, 	 0, /* 0xB0 */
+         0, 0xC7A8, 0xD3D8, 	 0, 0xC6F9, 0xD1B8, 	 0, 0xB9FD, /* 0xC0 */
+    0xC2F5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD3AD, 	 0, /* 0xC0 */
+    0xD4CB, 0xBDFC, 	 0, 0xE5C2, 0xB7B5, 0xE5C3, 	 0, 	 0, /* 0xD0 */
+    0xBBB9, 0xD5E2, 	 0, 0xBDF8, 0xD4B6, 0xCEA5, 0xC1AC, 0xB3D9, /* 0xD0 */
+         0, 	 0, 0xCCF6, 	 0, 0xE5C6, 0xE5C4, 0xE5C8, 	 0, /* 0xE0 */
+    0xE5CA, 0xE5C7, 0xB5CF, 0xC6C8, 	 0, 0xB5FC, 0xE5C5, 	 0, /* 0xE0 */
+    0xCAF6, 	 0, 	 0, 0xE5C9, 	 0, 	 0, 	 0, 0xC3D4, /* 0xF0 */
+    0xB1C5, 0xBCA3, 	 0, 	 0, 	 0, 0xD7B7					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_90[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xCDCB, 0xCBCD, 0xCACA, 0xCCD3, 0xE5CC, 0xE5CB, 0xC4E6,      0, /* 0x00 */
-         0, 0xD1A1, 0xD1B7, 0xE5CD,      0, 0xE5D0,      0, 0xCDB8, /* 0x00 */
-    0xD6F0, 0xE5CF, 0xB5DD,      0, 0xCDBE,      0, 0xE5D1, 0xB6BA, /* 0x10 */
-         0,      0, 0xCDA8, 0xB9E4,      0, 0xCAC5, 0xB3D1, 0xCBD9, /* 0x10 */
-    0xD4EC, 0xE5D2, 0xB7EA,      0,      0,      0, 0xE5CE,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xE5D5, 0xB4FE, 0xE5D6, /* 0x20 */
-         0,      0,      0,      0,      0, 0xE5D3, 0xE5D4,      0, /* 0x30 */
-    0xD2DD,      0,      0, 0xC2DF, 0xB1C6,      0, 0xD3E2,      0, /* 0x30 */
-         0, 0xB6DD, 0xCBEC,      0, 0xE5D7,      0,      0, 0xD3F6, /* 0x40 */
-         0,      0,      0,      0,      0, 0xB1E9,      0, 0xB6F4, /* 0x40 */
-    0xE5DA, 0xE5D8, 0xE5D9, 0xB5C0,      0,      0,      0, 0xD2C5, /* 0x50 */
-    0xE5DC,      0,      0, 0xE5DE,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xE5DD, 0xC7B2,      0, 0xD2A3,      0,      0, /* 0x60 */
-    0xE5DB,      0,      0,      0,      0, 0xD4E2, 0xD5DA,      0, /* 0x60 */
-         0,      0,      0,      0, 0xE5E0, 0xD7F1,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xE5E1,      0, 0xB1DC, /* 0x70 */
-    0xD1FB,      0, 0xE5E2, 0xE5E4,      0,      0,      0,      0, /* 0x80 */
-    0xE5E3,      0,      0, 0xE5E5,      0,      0,      0,      0, /* 0x80 */
-         0, 0xD2D8,      0, 0xB5CB,      0, 0xE7DF,      0, 0xDAF5, /* 0x90 */
-         0, 0xDAF8,      0, 0xDAF6,      0, 0xDAF7,      0,      0, /* 0x90 */
-         0, 0xDAFA, 0xD0CF, 0xC4C7,      0,      0, 0xB0EE,      0, /* 0xA0 */
-         0,      0, 0xD0B0,      0, 0xDAF9,      0, 0xD3CA, 0xBAAA, /* 0xA0 */
-    0xDBA2, 0xC7F1,      0, 0xDAFC, 0xDAFB, 0xC9DB, 0xDAFD,      0, /* 0xB0 */
-    0xDBA1, 0xD7DE, 0xDAFE, 0xC1DA,      0,      0, 0xDBA5,      0, /* 0xB0 */
-         0, 0xD3F4,      0,      0, 0xDBA7, 0xDBA4,      0, 0xDBA8, /* 0xC0 */
-         0,      0, 0xBDBC,      0,      0,      0, 0xC0C9, 0xDBA3, /* 0xC0 */
-    0xDBA6, 0xD6A3,      0, 0xDBA9,      0,      0,      0, 0xDBAD, /* 0xD0 */
-         0,      0,      0, 0xDBAE, 0xDBAC, 0xBAC2,      0,      0, /* 0xD0 */
-         0, 0xBFA4, 0xDBAB,      0,      0,      0, 0xDBAA, 0xD4C7, /* 0xE0 */
-    0xB2BF,      0,      0, 0xDBAF,      0, 0xB9F9,      0, 0xDBB0, /* 0xE0 */
-         0,      0,      0,      0, 0xB3BB,      0,      0,      0, /* 0xF0 */
-    0xB5A6,      0,      0,      0,      0, 0xB6BC, 0xDBB1          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xCDCB, 0xCBCD, 0xCACA, 0xCCD3, 0xE5CC, 0xE5CB, 0xC4E6, 	 0, /* 0x00 */
+         0, 0xD1A1, 0xD1B7, 0xE5CD, 	 0, 0xE5D0, 	 0, 0xCDB8, /* 0x00 */
+    0xD6F0, 0xE5CF, 0xB5DD, 	 0, 0xCDBE, 	 0, 0xE5D1, 0xB6BA, /* 0x10 */
+         0, 	 0, 0xCDA8, 0xB9E4, 	 0, 0xCAC5, 0xB3D1, 0xCBD9, /* 0x10 */
+    0xD4EC, 0xE5D2, 0xB7EA, 	 0, 	 0, 	 0, 0xE5CE, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE5D5, 0xB4FE, 0xE5D6, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE5D3, 0xE5D4, 	 0, /* 0x30 */
+    0xD2DD, 	 0, 	 0, 0xC2DF, 0xB1C6, 	 0, 0xD3E2, 	 0, /* 0x30 */
+         0, 0xB6DD, 0xCBEC, 	 0, 0xE5D7, 	 0, 	 0, 0xD3F6, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB1E9, 	 0, 0xB6F4, /* 0x40 */
+    0xE5DA, 0xE5D8, 0xE5D9, 0xB5C0, 	 0, 	 0, 	 0, 0xD2C5, /* 0x50 */
+    0xE5DC, 	 0, 	 0, 0xE5DE, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xE5DD, 0xC7B2, 	 0, 0xD2A3, 	 0, 	 0, /* 0x60 */
+    0xE5DB, 	 0, 	 0, 	 0, 	 0, 0xD4E2, 0xD5DA, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xE5E0, 0xD7F1, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE5E1, 	 0, 0xB1DC, /* 0x70 */
+    0xD1FB, 	 0, 0xE5E2, 0xE5E4, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE5E3, 	 0, 	 0, 0xE5E5, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xD2D8, 	 0, 0xB5CB, 	 0, 0xE7DF, 	 0, 0xDAF5, /* 0x90 */
+         0, 0xDAF8, 	 0, 0xDAF6, 	 0, 0xDAF7, 	 0, 	 0, /* 0x90 */
+         0, 0xDAFA, 0xD0CF, 0xC4C7, 	 0, 	 0, 0xB0EE, 	 0, /* 0xA0 */
+         0, 	 0, 0xD0B0, 	 0, 0xDAF9, 	 0, 0xD3CA, 0xBAAA, /* 0xA0 */
+    0xDBA2, 0xC7F1, 	 0, 0xDAFC, 0xDAFB, 0xC9DB, 0xDAFD, 	 0, /* 0xB0 */
+    0xDBA1, 0xD7DE, 0xDAFE, 0xC1DA, 	 0, 	 0, 0xDBA5, 	 0, /* 0xB0 */
+         0, 0xD3F4, 	 0, 	 0, 0xDBA7, 0xDBA4, 	 0, 0xDBA8, /* 0xC0 */
+         0, 	 0, 0xBDBC, 	 0, 	 0, 	 0, 0xC0C9, 0xDBA3, /* 0xC0 */
+    0xDBA6, 0xD6A3, 	 0, 0xDBA9, 	 0, 	 0, 	 0, 0xDBAD, /* 0xD0 */
+         0, 	 0, 	 0, 0xDBAE, 0xDBAC, 0xBAC2, 	 0, 	 0, /* 0xD0 */
+         0, 0xBFA4, 0xDBAB, 	 0, 	 0, 	 0, 0xDBAA, 0xD4C7, /* 0xE0 */
+    0xB2BF, 	 0, 	 0, 0xDBAF, 	 0, 0xB9F9, 	 0, 0xDBB0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xB3BB, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xB5A6, 	 0, 	 0, 	 0, 	 0, 0xB6BC, 0xDBB1			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_91[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xB6F5,      0, 0xDBB2,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xB1C9,      0,      0,      0,      0, 0xDBB4,      0, /* 0x10 */
-         0,      0, 0xDBB3, 0xDBB5,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xDBB7, /* 0x20 */
-         0, 0xDBB6,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xDBB8,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xDBB9,      0,      0, 0xDBBA,      0, /* 0x40 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xB6F5, 	 0, 0xDBB2, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xB1C9, 	 0, 	 0, 	 0, 	 0, 0xDBB4, 	 0, /* 0x10 */
+         0, 	 0, 0xDBB3, 0xDBB5, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDBB7, /* 0x20 */
+         0, 0xDBB6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xDBB8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xDBB9, 	 0, 	 0, 0xDBBA, 	 0, /* 0x40 */
          0, 0xD3CF, 0xF4FA, 0xC7F5, 0xD7C3, 0xC5E4, 0xF4FC, 0xF4FD, /* 0x40 */
-    0xF4FB,      0, 0xBEC6,      0,      0,      0,      0, 0xD0EF, /* 0x50 */
-         0,      0, 0xB7D3,      0,      0, 0xD4CD, 0xCCAA,      0, /* 0x50 */
-         0, 0xF5A2, 0xF5A1, 0xBAA8, 0xF4FE, 0xCBD6,      0,      0, /* 0x60 */
-         0, 0xF5A4, 0xC0D2,      0, 0xB3EA,      0, 0xCDAA, 0xF5A5, /* 0x60 */
-    0xF5A3, 0xBDB4, 0xF5A8,      0, 0xF5A9, 0xBDCD, 0xC3B8, 0xBFE1, /* 0x70 */
-    0xCBE1, 0xF5AA,      0,      0,      0, 0xF5A6, 0xF5A7, 0xC4F0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF5AC,      0, 0xB4BC, /* 0x80 */
-         0, 0xD7ED,      0, 0xB4D7, 0xF5AB, 0xF5AE,      0,      0, /* 0x80 */
-    0xF5AD, 0xF5AF, 0xD0D1,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xC3D1, 0xC8A9,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xF5B0, 0xF5B1,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xF5B2,      0,      0, 0xF5B3, 0xF5B4, 0xF5B5, /* 0xA0 */
-         0,      0,      0,      0, 0xF5B7, 0xF5B6,      0,      0, /* 0xB0 */
-         0,      0, 0xF5B8,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xB2C9, /* 0xC0 */
-         0, 0xD3D4, 0xCACD,      0, 0xC0EF, 0xD6D8, 0xD2B0, 0xC1BF, /* 0xC0 */
-         0, 0xBDF0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xB8AA                          /* 0xD0 */
+    0xF4FB, 	 0, 0xBEC6, 	 0, 	 0, 	 0, 	 0, 0xD0EF, /* 0x50 */
+         0, 	 0, 0xB7D3, 	 0, 	 0, 0xD4CD, 0xCCAA, 	 0, /* 0x50 */
+         0, 0xF5A2, 0xF5A1, 0xBAA8, 0xF4FE, 0xCBD6, 	 0, 	 0, /* 0x60 */
+         0, 0xF5A4, 0xC0D2, 	 0, 0xB3EA, 	 0, 0xCDAA, 0xF5A5, /* 0x60 */
+    0xF5A3, 0xBDB4, 0xF5A8, 	 0, 0xF5A9, 0xBDCD, 0xC3B8, 0xBFE1, /* 0x70 */
+    0xCBE1, 0xF5AA, 	 0, 	 0, 	 0, 0xF5A6, 0xF5A7, 0xC4F0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF5AC, 	 0, 0xB4BC, /* 0x80 */
+         0, 0xD7ED, 	 0, 0xB4D7, 0xF5AB, 0xF5AE, 	 0, 	 0, /* 0x80 */
+    0xF5AD, 0xF5AF, 0xD0D1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xC3D1, 0xC8A9, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xF5B0, 0xF5B1, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xF5B2, 	 0, 	 0, 0xF5B3, 0xF5B4, 0xF5B5, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xF5B7, 0xF5B6, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xF5B8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB2C9, /* 0xC0 */
+         0, 0xD3D4, 0xCACD, 	 0, 0xC0EF, 0xD6D8, 0xD2B0, 0xC1BF, /* 0xC0 */
+         0, 0xBDF0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xB8AA							/* 0xD0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_92[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xBCF8,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xF6C6,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xF6C7,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xF6C8                                                          /* 0xC0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xBCF8, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF6C6, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF6C7, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xF6C8															/* 0xC0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_93[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x30 */
-                                                    0xF6C9,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xF6CA,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0, 0xF6CC, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xF6CB,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xF7E9          /* 0xD0 */
+                                                    0xF6C9, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xF6CA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF6CC, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xF6CB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF7E9			/* 0xD0 */
                                                                     /* 0xD0 */
 };
 
@@ -2724,153 +2724,153 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_93[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_94[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x30 */
-                                                    0xF6CD,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xF6CE,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xEEC4, 0xEEC5, 0xEEC6, /* 0x80 */
+                                                    0xF6CD, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xF6CE, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEEC4, 0xEEC5, 0xEEC6, /* 0x80 */
     0xD5EB, 0xB6A4, 0xEEC8, 0xEEC7, 0xEEC9, 0xEECA, 0xC7A5, 0xEECB, /* 0x80 */
-    0xEECC,      0, 0xB7B0, 0xB5F6, 0xEECD, 0xEECF,      0, 0xEECE, /* 0x90 */
+    0xEECC, 	 0, 0xB7B0, 0xB5F6, 0xEECD, 0xEECF, 	 0, 0xEECE, /* 0x90 */
          0, 0xB8C6, 0xEED0, 0xEED1, 0xEED2, 0xB6DB, 0xB3AE, 0xD6D3, /* 0x90 */
     0xC4C6, 0xB1B5, 0xB8D6, 0xEED3, 0xEED4, 0xD4BF, 0xC7D5, 0xBEFB, /* 0xA0 */
     0xCED9, 0xB9B3, 0xEED6, 0xEED5, 0xEED8, 0xEED7, 0xC5A5, 0xEED9, /* 0xA0 */
     0xEEDA, 0xC7AE, 0xEEDB, 0xC7AF, 0xEEDC, 0xB2A7, 0xEEDD, 0xEEDE, /* 0xB0 */
     0xEEDF, 0xEEE0, 0xEEE1, 0xD7EA, 0xEEE2, 0xEEE3, 0xBCD8, 0xEEE4, /* 0xB0 */
-    0xD3CB, 0xCCFA, 0xB2AC, 0xC1E5, 0xEEE5, 0xC7A6, 0xC3AD,      0, /* 0xC0 */
-    0xEEE6, 0xEEE7, 0xEEE8, 0xEEE9, 0xEEEA, 0xEEEB, 0xEEEC,      0, /* 0xC0 */
-    0xEEED, 0xEEEE, 0xEEEF,      0,      0, 0xEEF0, 0xEEF1, 0xEEF2, /* 0xD0 */
-    0xEEF4, 0xEEF3,      0, 0xEEF5, 0xCDAD, 0xC2C1, 0xEEF6, 0xEEF7, /* 0xD0 */
-    0xEEF8, 0xD5A1, 0xEEF9, 0xCFB3, 0xEEFA, 0xEEFB,      0, 0xEEFC, /* 0xE0 */
+    0xD3CB, 0xCCFA, 0xB2AC, 0xC1E5, 0xEEE5, 0xC7A6, 0xC3AD, 	 0, /* 0xC0 */
+    0xEEE6, 0xEEE7, 0xEEE8, 0xEEE9, 0xEEEA, 0xEEEB, 0xEEEC, 	 0, /* 0xC0 */
+    0xEEED, 0xEEEE, 0xEEEF, 	 0, 	 0, 0xEEF0, 0xEEF1, 0xEEF2, /* 0xD0 */
+    0xEEF4, 0xEEF3, 	 0, 0xEEF5, 0xCDAD, 0xC2C1, 0xEEF6, 0xEEF7, /* 0xD0 */
+    0xEEF8, 0xD5A1, 0xEEF9, 0xCFB3, 0xEEFA, 0xEEFB, 	 0, 0xEEFC, /* 0xE0 */
     0xEEFD, 0xEFA1, 0xEEFE, 0xEFA2, 0xB8F5, 0xC3FA, 0xEFA3, 0xEFA4, /* 0xE0 */
     0xBDC2, 0xD2BF, 0xB2F9, 0xEFA5, 0xEFA6, 0xEFA7, 0xD2F8, 0xEFA8, /* 0xF0 */
-    0xD6FD, 0xEFA9, 0xC6CC,      0, 0xEFAA, 0xEFAB, 0xC1B4, 0xEFAC  /* 0xF0 */
+    0xD6FD, 0xEFA9, 0xC6CC, 	 0, 0xEFAA, 0xEFAB, 0xC1B4, 0xEFAC	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_95[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xCFFA, 0xCBF8, 0xEFAE, 0xEFAD, 0xB3FA, 0xB9F8, 0xEFAF, 0xEFB0, /* 0x00 */
     0xD0E2, 0xEFB1, 0xEFB2, 0xB7E6, 0xD0BF, 0xEFB3, 0xEFB4, 0xEFB5, /* 0x00 */
     0xC8F1, 0xCCE0, 0xEFB6, 0xEFB7, 0xEFB8, 0xEFB9, 0xEFBA, 0xD5E0, /* 0x10 */
-    0xEFBB, 0xB4ED, 0xC3AA, 0xEFBC,      0, 0xEFBD, 0xEFBE, 0xEFBF, /* 0x10 */
-         0, 0xCEFD, 0xEFC0, 0xC2E0, 0xB4B8, 0xD7B6, 0xBDF5,      0, /* 0x20 */
+    0xEFBB, 0xB4ED, 0xC3AA, 0xEFBC, 	 0, 0xEFBD, 0xEFBE, 0xEFBF, /* 0x10 */
+         0, 0xCEFD, 0xEFC0, 0xC2E0, 0xB4B8, 0xD7B6, 0xBDF5, 	 0, /* 0x20 */
     0xCFC7, 0xEFC3, 0xEFC1, 0xEFC2, 0xEFC4, 0xB6A7, 0xBCFC, 0xBEE2, /* 0x20 */
-    0xC3CC, 0xEFC5, 0xEFC6,      0, 0xEFC7, 0xEFCF, 0xEFC8, 0xEFC9, /* 0x30 */
-    0xEFCA, 0xC7C2, 0xEFF1, 0xB6CD, 0xEFCB,      0, 0xEFCC, 0xEFCD, /* 0x30 */
-    0xB6C6, 0xC3BE, 0xEFCE,      0, 0xEFD0, 0xEFD1, 0xEFD2, 0xD5F2, /* 0x40 */
-         0, 0xEFD3, 0xC4F7,      0, 0xEFD4, 0xC4F8, 0xEFD5, 0xEFD6, /* 0x40 */
-    0xB8E4, 0xB0F7, 0xEFD7, 0xEFD8, 0xEFD9,      0, 0xEFDA, 0xEFDB, /* 0x50 */
-    0xEFDC, 0xEFDD,      0, 0xEFDE, 0xBEB5, 0xEFE1, 0xEFDF, 0xEFE0, /* 0x50 */
+    0xC3CC, 0xEFC5, 0xEFC6, 	 0, 0xEFC7, 0xEFCF, 0xEFC8, 0xEFC9, /* 0x30 */
+    0xEFCA, 0xC7C2, 0xEFF1, 0xB6CD, 0xEFCB, 	 0, 0xEFCC, 0xEFCD, /* 0x30 */
+    0xB6C6, 0xC3BE, 0xEFCE, 	 0, 0xEFD0, 0xEFD1, 0xEFD2, 0xD5F2, /* 0x40 */
+         0, 0xEFD3, 0xC4F7, 	 0, 0xEFD4, 0xC4F8, 0xEFD5, 0xEFD6, /* 0x40 */
+    0xB8E4, 0xB0F7, 0xEFD7, 0xEFD8, 0xEFD9, 	 0, 0xEFDA, 0xEFDB, /* 0x50 */
+    0xEFDC, 0xEFDD, 	 0, 0xEFDE, 0xBEB5, 0xEFE1, 0xEFDF, 0xEFE0, /* 0x50 */
          0, 0xEFE2, 0xEFE3, 0xC1CD, 0xEFE4, 0xEFE5, 0xEFE6, 0xEFE7, /* 0x60 */
-    0xEFE8, 0xEFE9, 0xEFEA, 0xEFEB, 0xEFEC, 0xC0D8,      0, 0xEFED, /* 0x60 */
-    0xC1AD, 0xEFEE, 0xEFEF, 0xEFF0,      0,      0, 0xCFE2,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xB3A4, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xC3C5, 0xE3C5, 0xC9C1, 0xE3C6,      0, 0xB1D5, 0xCECA, 0xB4B3, /* 0xE0 */
+    0xEFE8, 0xEFE9, 0xEFEA, 0xEFEB, 0xEFEC, 0xC0D8, 	 0, 0xEFED, /* 0x60 */
+    0xC1AD, 0xEFEE, 0xEFEF, 0xEFF0, 	 0, 	 0, 0xCFE2, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB3A4, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xC3C5, 0xE3C5, 0xC9C1, 0xE3C6, 	 0, 0xB1D5, 0xCECA, 0xB4B3, /* 0xE0 */
     0xC8F2, 0xE3C7, 0xCFD0, 0xE3C8, 0xBCE4, 0xE3C9, 0xE3CA, 0xC3C6, /* 0xF0 */
-    0xD5A2, 0xC4D6, 0xB9EB, 0xCEC5, 0xE3CB, 0xC3F6, 0xE3CC          /* 0xF0 */
+    0xD5A2, 0xC4D6, 0xB9EB, 0xCEC5, 0xE3CB, 0xC3F6, 0xE3CC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_96[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xB7A7, 0xB8F3, 0xBAD2, 0xE3CD, 0xE3CE, 0xD4C4, 0xE3CF,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xB7A7, 0xB8F3, 0xBAD2, 0xE3CD, 0xE3CE, 0xD4C4, 0xE3CF, 	 0, /* 0x00 */
     0xE3D0, 0xD1CB, 0xE3D1, 0xE3D2, 0xE3D3, 0xE3D4, 0xD1D6, 0xE3D5, /* 0x00 */
-    0xB2FB, 0xC0BB, 0xE3D6,      0, 0xC0AB, 0xE3D7, 0xE3D8, 0xE3D9, /* 0x10 */
-         0, 0xE3DA, 0xE3DB,      0, 0xB8B7, 0xDAE2,      0, 0xB6D3, /* 0x10 */
-         0, 0xDAE4, 0xDAE3,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xDAE6,      0,      0,      0, 0xC8EE,      0, /* 0x20 */
-         0, 0xDAE5, 0xB7C0, 0xD1F4, 0xD2F5, 0xD5F3, 0xBDD7,      0, /* 0x30 */
-         0,      0,      0, 0xD7E8, 0xDAE8, 0xDAE7,      0, 0xB0A2, /* 0x30 */
-    0xCDD3,      0, 0xDAE9,      0, 0xB8BD, 0xBCCA, 0xC2BD, 0xC2A4, /* 0x40 */
-    0xB3C2, 0xDAEA,      0, 0xC2AA, 0xC4B0, 0xBDB5,      0,      0, /* 0x40 */
-    0xCFDE,      0,      0,      0, 0xDAEB, 0xC9C2,      0,      0, /* 0x50 */
-         0,      0,      0, 0xB1DD,      0,      0,      0, 0xDAEC, /* 0x50 */
-         0, 0xB6B8, 0xD4BA,      0, 0xB3FD,      0,      0, 0xDAED, /* 0x60 */
-    0xD4C9, 0xCFD5, 0xC5E3,      0, 0xDAEE,      0,      0,      0, /* 0x60 */
-         0,      0, 0xDAEF,      0, 0xDAF0, 0xC1EA, 0xCCD5, 0xCFDD, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xD3E7, 0xC2A1,      0, /* 0x80 */
-    0xDAF1,      0,      0, 0xCBE5,      0, 0xDAF2,      0, 0xCBE6, /* 0x80 */
-    0xD2FE,      0,      0,      0, 0xB8F4,      0,      0, 0xDAF3, /* 0x90 */
-    0xB0AF, 0xCFB6,      0,      0, 0xD5CF,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xCBED, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xDAF4,      0,      0, 0xE3C4,      0,      0, 0xC1A5,      0, /* 0xB0 */
-         0, 0xF6BF,      0,      0, 0xF6C0, 0xF6C1, 0xC4D1,      0, /* 0xB0 */
-    0xC8B8, 0xD1E3,      0,      0, 0xD0DB, 0xD1C5, 0xBCAF, 0xB9CD, /* 0xC0 */
-         0, 0xEFF4,      0,      0, 0xB4C6, 0xD3BA, 0xF6C2, 0xB3FB, /* 0xC0 */
-         0,      0, 0xF6C3,      0,      0, 0xB5F1,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xF6C5,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xD3EA, 0xF6A7, 0xD1A9,      0,      0,      0,      0, 0xF6A9, /* 0xE0 */
-         0,      0,      0, 0xF6A8,      0,      0, 0xC1E3, 0xC0D7, /* 0xF0 */
-         0, 0xB1A2,      0,      0,      0,      0, 0xCEED          /* 0xF0 */
+    0xB2FB, 0xC0BB, 0xE3D6, 	 0, 0xC0AB, 0xE3D7, 0xE3D8, 0xE3D9, /* 0x10 */
+         0, 0xE3DA, 0xE3DB, 	 0, 0xB8B7, 0xDAE2, 	 0, 0xB6D3, /* 0x10 */
+         0, 0xDAE4, 0xDAE3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xDAE6, 	 0, 	 0, 	 0, 0xC8EE, 	 0, /* 0x20 */
+         0, 0xDAE5, 0xB7C0, 0xD1F4, 0xD2F5, 0xD5F3, 0xBDD7, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xD7E8, 0xDAE8, 0xDAE7, 	 0, 0xB0A2, /* 0x30 */
+    0xCDD3, 	 0, 0xDAE9, 	 0, 0xB8BD, 0xBCCA, 0xC2BD, 0xC2A4, /* 0x40 */
+    0xB3C2, 0xDAEA, 	 0, 0xC2AA, 0xC4B0, 0xBDB5, 	 0, 	 0, /* 0x40 */
+    0xCFDE, 	 0, 	 0, 	 0, 0xDAEB, 0xC9C2, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xB1DD, 	 0, 	 0, 	 0, 0xDAEC, /* 0x50 */
+         0, 0xB6B8, 0xD4BA, 	 0, 0xB3FD, 	 0, 	 0, 0xDAED, /* 0x60 */
+    0xD4C9, 0xCFD5, 0xC5E3, 	 0, 0xDAEE, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xDAEF, 	 0, 0xDAF0, 0xC1EA, 0xCCD5, 0xCFDD, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD3E7, 0xC2A1, 	 0, /* 0x80 */
+    0xDAF1, 	 0, 	 0, 0xCBE5, 	 0, 0xDAF2, 	 0, 0xCBE6, /* 0x80 */
+    0xD2FE, 	 0, 	 0, 	 0, 0xB8F4, 	 0, 	 0, 0xDAF3, /* 0x90 */
+    0xB0AF, 0xCFB6, 	 0, 	 0, 0xD5CF, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBED, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xDAF4, 	 0, 	 0, 0xE3C4, 	 0, 	 0, 0xC1A5, 	 0, /* 0xB0 */
+         0, 0xF6BF, 	 0, 	 0, 0xF6C0, 0xF6C1, 0xC4D1, 	 0, /* 0xB0 */
+    0xC8B8, 0xD1E3, 	 0, 	 0, 0xD0DB, 0xD1C5, 0xBCAF, 0xB9CD, /* 0xC0 */
+         0, 0xEFF4, 	 0, 	 0, 0xB4C6, 0xD3BA, 0xF6C2, 0xB3FB, /* 0xC0 */
+         0, 	 0, 0xF6C3, 	 0, 	 0, 0xB5F1, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xF6C5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xD3EA, 0xF6A7, 0xD1A9, 	 0, 	 0, 	 0, 	 0, 0xF6A9, /* 0xE0 */
+         0, 	 0, 	 0, 0xF6A8, 	 0, 	 0, 0xC1E3, 0xC0D7, /* 0xF0 */
+         0, 0xB1A2, 	 0, 	 0, 	 0, 	 0, 0xCEED			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_97[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD0E8, 0xF6AB,      0,      0, 0xCFF6,      0, 0xF6AA, 0xD5F0, /* 0x00 */
-    0xF6AC, 0xC3B9,      0,      0,      0, 0xBBF4, 0xF6AE, 0xF6AD, /* 0x00 */
-         0,      0,      0, 0xC4DE,      0,      0, 0xC1D8,      0, /* 0x10 */
-         0,      0,      0,      0, 0xCBAA,      0, 0xCFBC,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xF6AF,      0,      0, 0xF6B0,      0,      0, /* 0x20 */
-    0xF6B1,      0, 0xC2B6,      0,      0,      0,      0,      0, /* 0x30 */
-    0xB0D4, 0xC5F9,      0,      0,      0,      0, 0xF6B2,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xC7E0, 0xF6A6,      0,      0, 0xBEB8,      0, /* 0x50 */
-         0, 0xBEB2,      0, 0xB5E5,      0,      0, 0xB7C7,      0, /* 0x50 */
-    0xBFBF, 0xC3D2, 0xC3E6,      0,      0, 0xD8CC,      0,      0, /* 0x60 */
-         0, 0xB8EF,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xBDF9, 0xD1A5,      0, 0xB0D0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xF7B0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF7B1,      0,      0, /* 0x80 */
-         0,      0,      0, 0xD0AC,      0, 0xB0B0,      0,      0, /* 0x80 */
-         0, 0xF7B2, 0xF7B3,      0, 0xF7B4,      0,      0,      0, /* 0x90 */
-    0xC7CA,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xBECF,      0,      0, 0xF7B7,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xF7B6,      0, 0xB1DE,      0, 0xF7B5, /* 0xA0 */
-         0,      0, 0xF7B8,      0, 0xF7B9,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xCEA4, 0xC8CD, /* 0xE0 */
-         0, 0xBAAB, 0xE8B8, 0xE8B9, 0xE8BA, 0xBEC2,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xD2F4,      0, 0xD4CF, 0xC9D8          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD0E8, 0xF6AB, 	 0, 	 0, 0xCFF6, 	 0, 0xF6AA, 0xD5F0, /* 0x00 */
+    0xF6AC, 0xC3B9, 	 0, 	 0, 	 0, 0xBBF4, 0xF6AE, 0xF6AD, /* 0x00 */
+         0, 	 0, 	 0, 0xC4DE, 	 0, 	 0, 0xC1D8, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xCBAA, 	 0, 0xCFBC, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xF6AF, 	 0, 	 0, 0xF6B0, 	 0, 	 0, /* 0x20 */
+    0xF6B1, 	 0, 0xC2B6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xB0D4, 0xC5F9, 	 0, 	 0, 	 0, 	 0, 0xF6B2, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xC7E0, 0xF6A6, 	 0, 	 0, 0xBEB8, 	 0, /* 0x50 */
+         0, 0xBEB2, 	 0, 0xB5E5, 	 0, 	 0, 0xB7C7, 	 0, /* 0x50 */
+    0xBFBF, 0xC3D2, 0xC3E6, 	 0, 	 0, 0xD8CC, 	 0, 	 0, /* 0x60 */
+         0, 0xB8EF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xBDF9, 0xD1A5, 	 0, 0xB0D0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xF7B0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF7B1, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xD0AC, 	 0, 0xB0B0, 	 0, 	 0, /* 0x80 */
+         0, 0xF7B2, 0xF7B3, 	 0, 0xF7B4, 	 0, 	 0, 	 0, /* 0x90 */
+    0xC7CA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xBECF, 	 0, 	 0, 0xF7B7, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xF7B6, 	 0, 0xB1DE, 	 0, 0xF7B5, /* 0xA0 */
+         0, 	 0, 0xF7B8, 	 0, 0xF7B9, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCEA4, 0xC8CD, /* 0xE0 */
+         0, 0xBAAB, 0xE8B8, 0xE8B9, 0xE8BA, 0xBEC2, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xD2F4, 	 0, 0xD4CF, 0xC9D8			/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -2878,101 +2878,101 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_97[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_98[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                             0xD2B3, 0xB6A5, 0xC7EA, /* 0x70 */
     0xF1FC, 0xCFEE, 0xCBB3, 0xD0EB, 0xE7EF, 0xCDE7, 0xB9CB, 0xB6D9, /* 0x70 */
     0xF1FD, 0xB0E4, 0xCBCC, 0xF1FE, 0xD4A4, 0xC2AD, 0xC1EC, 0xC6C4, /* 0x80 */
-    0xBEB1, 0xF2A1, 0xBCD5,      0, 0xF2A2, 0xF2A3,      0, 0xF2A4, /* 0x80 */
-    0xD2C3, 0xC6B5,      0, 0xCDC7, 0xF2A5,      0, 0xD3B1, 0xBFC5, /* 0x90 */
-    0xCCE2,      0, 0xF2A6, 0xF2A7, 0xD1D5, 0xB6EE, 0xF2A8, 0xF2A9, /* 0x90 */
-    0xB5DF, 0xF2AA, 0xF2AB,      0, 0xB2FC, 0xF2AC, 0xF2AD, 0xC8A7, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xB7E7,      0, /* 0xC0 */
-         0, 0xECA9, 0xECAA, 0xECAB,      0, 0xECAC,      0,      0, /* 0xD0 */
-    0xC6AE, 0xECAD, 0xECAE,      0,      0,      0, 0xB7C9, 0xCAB3, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE2B8, /* 0xE0 */
-    0xF7CF                                                          /* 0xE0 */
+    0xBEB1, 0xF2A1, 0xBCD5, 	 0, 0xF2A2, 0xF2A3, 	 0, 0xF2A4, /* 0x80 */
+    0xD2C3, 0xC6B5, 	 0, 0xCDC7, 0xF2A5, 	 0, 0xD3B1, 0xBFC5, /* 0x90 */
+    0xCCE2, 	 0, 0xF2A6, 0xF2A7, 0xD1D5, 0xB6EE, 0xF2A8, 0xF2A9, /* 0x90 */
+    0xB5DF, 0xF2AA, 0xF2AB, 	 0, 0xB2FC, 0xF2AC, 0xF2AD, 0xC8A7, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB7E7, 	 0, /* 0xC0 */
+         0, 0xECA9, 0xECAA, 0xECAB, 	 0, 0xECAC, 	 0, 	 0, /* 0xD0 */
+    0xC6AE, 0xECAD, 0xECAE, 	 0, 	 0, 	 0, 0xB7C9, 0xCAB3, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2B8, /* 0xE0 */
+    0xF7CF															/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_99[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-                                            0xF7D0,      0,      0, /* 0x00 */
-    0xB2CD,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0xF7D1,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xF7D3, 0xF7D2,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xE2BB,      0, 0xBCA2,      0, 0xE2BC, /* 0x60 */
+                                            0xF7D0, 	 0, 	 0, /* 0x00 */
+    0xB2CD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF7D1, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xF7D3, 0xF7D2, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xE2BB, 	 0, 0xBCA2, 	 0, 0xE2BC, /* 0x60 */
     0xE2BD, 0xE2BE, 0xE2BF, 0xE2C0, 0xE2C1, 0xB7B9, 0xD2FB, 0xBDA4, /* 0x60 */
-    0xCACE, 0xB1A5, 0xCBC7,      0, 0xE2C2, 0xB6FC, 0xC8C4, 0xE2C3, /* 0x70 */
-         0,      0, 0xBDC8,      0, 0xB1FD, 0xE2C4,      0, 0xB6F6, /* 0x70 */
-    0xE2C5, 0xC4D9,      0,      0, 0xE2C6, 0xCFDA, 0xB9DD, 0xE2C7, /* 0x80 */
-    0xC0A1,      0, 0xE2C8, 0xB2F6,      0, 0xE2C9,      0, 0xC1F3, /* 0x80 */
+    0xCACE, 0xB1A5, 0xCBC7, 	 0, 0xE2C2, 0xB6FC, 0xC8C4, 0xE2C3, /* 0x70 */
+         0, 	 0, 0xBDC8, 	 0, 0xB1FD, 0xE2C4, 	 0, 0xB6F6, /* 0x70 */
+    0xE2C5, 0xC4D9, 	 0, 	 0, 0xE2C6, 0xCFDA, 0xB9DD, 0xE2C7, /* 0x80 */
+    0xC0A1, 	 0, 0xE2C8, 0xB2F6, 	 0, 0xE2C9, 	 0, 0xC1F3, /* 0x80 */
     0xE2CA, 0xE2CB, 0xC2F8, 0xE2CC, 0xE2CD, 0xE2CE, 0xCAD7, 0xD8B8, /* 0x90 */
-    0xD9E5, 0xCFE3,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xF0A5,      0,      0, /* 0xA0 */
-    0xDCB0                                                          /* 0xA0 */
+    0xD9E5, 0xCFE3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF0A5, 	 0, 	 0, /* 0xA0 */
+    0xDCB0															/* 0xA0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_9A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x60 */
                                     0xC2ED, 0xD4A6, 0xCDD4, 0xD1B1, /* 0x60 */
-    0xB3DB, 0xC7FD,      0, 0xB2B5, 0xC2BF, 0xE6E0, 0xCABB, 0xE6E1, /* 0x70 */
+    0xB3DB, 0xC7FD, 	 0, 0xB2B5, 0xC2BF, 0xE6E0, 0xCABB, 0xE6E1, /* 0x70 */
     0xE6E2, 0xBED4, 0xE6E3, 0xD7A4, 0xCDD5, 0xE6E5, 0xBCDD, 0xE6E4, /* 0x70 */
-    0xE6E6, 0xE6E7, 0xC2EE,      0, 0xBDBE, 0xE6E8, 0xC2E6, 0xBAA7, /* 0x80 */
-    0xE6E9,      0, 0xE6EA, 0xB3D2, 0xD1E9,      0,      0, 0xBFA5, /* 0x80 */
-    0xE6EB, 0xC6EF, 0xE6EC, 0xE6ED,      0,      0, 0xE6EE, 0xC6AD, /* 0x90 */
-    0xE6EF,      0, 0xC9A7, 0xE6F0, 0xE6F1, 0xE6F2, 0xE5B9, 0xE6F3, /* 0x90 */
-    0xE6F4, 0xC2E2, 0xE6F5, 0xE6F6, 0xD6E8, 0xE6F7,      0, 0xE6F8, /* 0xA0 */
-    0xB9C7,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xF7BB, 0xF7BA,      0,      0,      0,      0, 0xF7BE, 0xF7BC, /* 0xB0 */
-    0xBAA1,      0, 0xF7BF,      0, 0xF7C0,      0,      0,      0, /* 0xB0 */
-    0xF7C2, 0xF7C1, 0xF7C4,      0,      0, 0xF7C3,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xF7C5, 0xF7C6,      0,      0,      0, /* 0xC0 */
-         0, 0xF7C7,      0, 0xCBE8,      0,      0,      0,      0, /* 0xD0 */
-    0xB8DF,      0,      0,      0,      0,      0,      0, 0xF7D4, /* 0xD0 */
-         0, 0xF7D5,      0,      0,      0,      0, 0xF7D6,      0, /* 0xE0 */
-         0,      0,      0, 0xF7D8,      0, 0xF7DA,      0, 0xF7D7, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xF7DB,      0, 0xF7D9                                  /* 0xF0 */
+    0xE6E6, 0xE6E7, 0xC2EE, 	 0, 0xBDBE, 0xE6E8, 0xC2E6, 0xBAA7, /* 0x80 */
+    0xE6E9, 	 0, 0xE6EA, 0xB3D2, 0xD1E9, 	 0, 	 0, 0xBFA5, /* 0x80 */
+    0xE6EB, 0xC6EF, 0xE6EC, 0xE6ED, 	 0, 	 0, 0xE6EE, 0xC6AD, /* 0x90 */
+    0xE6EF, 	 0, 0xC9A7, 0xE6F0, 0xE6F1, 0xE6F2, 0xE5B9, 0xE6F3, /* 0x90 */
+    0xE6F4, 0xC2E2, 0xE6F5, 0xE6F6, 0xD6E8, 0xE6F7, 	 0, 0xE6F8, /* 0xA0 */
+    0xB9C7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xF7BB, 0xF7BA, 	 0, 	 0, 	 0, 	 0, 0xF7BE, 0xF7BC, /* 0xB0 */
+    0xBAA1, 	 0, 0xF7BF, 	 0, 0xF7C0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xF7C2, 0xF7C1, 0xF7C4, 	 0, 	 0, 0xF7C3, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xF7C5, 0xF7C6, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xF7C7, 	 0, 0xCBE8, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xB8DF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF7D4, /* 0xD0 */
+         0, 0xF7D5, 	 0, 	 0, 	 0, 	 0, 0xF7D6, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xF7D8, 	 0, 0xF7DA, 	 0, 0xF7D7, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xF7DB, 	 0, 0xF7D9									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_9B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xD7D7,      0,      0,      0,      0, /* 0x00 */
-    0xF7DC,      0,      0,      0,      0,      0,      0, 0xF7DD, /* 0x00 */
-         0,      0,      0, 0xF7DE,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xF7DF, /* 0x10 */
-         0,      0,      0, 0xF7E0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xDBCB, /* 0x20 */
-         0,      0, 0xD8AA,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xE5F7, 0xB9ED,      0,      0,      0, /* 0x30 */
-         0, 0xBFFD, 0xBBEA, 0xF7C9, 0xC6C7, 0xF7C8,      0, 0xF7CA, /* 0x40 */
-    0xF7CC, 0xF7CB,      0,      0,      0, 0xF7CD,      0, 0xCEBA, /* 0x40 */
-         0, 0xF7CE,      0,      0, 0xC4A7                          /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xD7D7, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xF7DC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF7DD, /* 0x00 */
+         0, 	 0, 	 0, 0xF7DE, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF7DF, /* 0x10 */
+         0, 	 0, 	 0, 0xF7E0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDBCB, /* 0x20 */
+         0, 	 0, 0xD8AA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xE5F7, 0xB9ED, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xBFFD, 0xBBEA, 0xF7C9, 0xC6C7, 0xF7C8, 	 0, 0xF7CA, /* 0x40 */
+    0xF7CC, 0xF7CB, 	 0, 	 0, 	 0, 0xF7CD, 	 0, 0xCEBA, /* 0x40 */
+         0, 0xF7CE, 	 0, 	 0, 0xC4A7							/* 0x50 */
                                                                     /* 0x50 */
 };
 
@@ -2980,23 +2980,23 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_9B[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_9C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x70 */
-                                    0xD3E3,      0,      0, 0xF6CF, /* 0x70 */
-         0, 0xC2B3, 0xF6D0,      0,      0, 0xF6D1, 0xF6D2, 0xF6D3, /* 0x80 */
-    0xF6D4,      0,      0, 0xF6D6,      0, 0xB1AB, 0xF6D7,      0, /* 0x80 */
-    0xF6D8, 0xF6D9, 0xF6DA,      0, 0xF6DB, 0xF6DC,      0,      0, /* 0x90 */
-         0,      0, 0xF6DD, 0xF6DE, 0xCFCA,      0, 0xF6DF, 0xF6E0, /* 0x90 */
+                                    0xD3E3, 	 0, 	 0, 0xF6CF, /* 0x70 */
+         0, 0xC2B3, 0xF6D0, 	 0, 	 0, 0xF6D1, 0xF6D2, 0xF6D3, /* 0x80 */
+    0xF6D4, 	 0, 	 0, 0xF6D6, 	 0, 0xB1AB, 0xF6D7, 	 0, /* 0x80 */
+    0xF6D8, 0xF6D9, 0xF6DA, 	 0, 0xF6DB, 0xF6DC, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xF6DD, 0xF6DE, 0xCFCA, 	 0, 0xF6DF, 0xF6E0, /* 0x90 */
     0xF6E1, 0xF6E2, 0xF6E3, 0xF6E4, 0xC0F0, 0xF6E5, 0xF6E6, 0xF6E7, /* 0xA0 */
-    0xF6E8, 0xF6E9,      0, 0xF6EA,      0, 0xF6EB, 0xF6EC,      0, /* 0xA0 */
+    0xF6E8, 0xF6E9, 	 0, 0xF6EA, 	 0, 0xF6EB, 0xF6EC, 	 0, /* 0xA0 */
     0xF6ED, 0xF6EE, 0xF6EF, 0xF6F0, 0xF6F1, 0xF6F2, 0xF6F3, 0xF6F4, /* 0xB0 */
-    0xBEA8,      0, 0xF6F5, 0xF6F6, 0xF6F7, 0xF6F8,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xC8FA, 0xF6F9, 0xF6FA, 0xF6FB, 0xF6FC, /* 0xC0 */
-         0,      0, 0xF6FD, 0xF6FE, 0xF7A1, 0xF7A2, 0xF7A3, 0xF7A4, /* 0xC0 */
-    0xF7A5,      0,      0, 0xF7A6, 0xF7A7, 0xF7A8, 0xB1EE, 0xF7A9, /* 0xD0 */
-    0xF7AA, 0xF7AB,      0,      0, 0xF7AC, 0xF7AD, 0xC1DB, 0xF7AE, /* 0xD0 */
-         0,      0, 0xF7AF                                          /* 0xE0 */
+    0xBEA8, 	 0, 0xF6F5, 0xF6F6, 0xF6F7, 0xF6F8, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xC8FA, 0xF6F9, 0xF6FA, 0xF6FB, 0xF6FC, /* 0xC0 */
+         0, 	 0, 0xF6FD, 0xF6FE, 0xF7A1, 0xF7A2, 0xF7A3, 0xF7A4, /* 0xC0 */
+    0xF7A5, 	 0, 	 0, 0xF7A6, 0xF7A7, 0xF7A8, 0xB1EE, 0xF7A9, /* 0xD0 */
+    0xF7AA, 0xF7AB, 	 0, 	 0, 0xF7AC, 0xF7AD, 0xC1DB, 0xF7AE, /* 0xD0 */
+         0, 	 0, 0xF7AF											/* 0xE0 */
                                                                     /* 0xE0 */
 };
 
@@ -3004,67 +3004,67 @@ static sal_uInt16 const aImplUniToDBCSTab_GB_9C[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_9E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x10 */
                                                             0xC4F1, /* 0x10 */
-    0xF0AF, 0xBCA6, 0xF0B0, 0xC3F9,      0, 0xC5B8, 0xD1BB,      0, /* 0x20 */
-    0xF0B1, 0xF0B2, 0xF0B3, 0xF0B4, 0xF0B5, 0xD1BC,      0, 0xD1EC, /* 0x20 */
-         0, 0xF0B7, 0xF0B6, 0xD4A7,      0, 0xCDD2, 0xF0B8, 0xF0BA, /* 0x30 */
-    0xF0B9, 0xF0BB, 0xF0BC,      0,      0, 0xB8EB, 0xF0BD, 0xBAE8, /* 0x30 */
+    0xF0AF, 0xBCA6, 0xF0B0, 0xC3F9, 	 0, 0xC5B8, 0xD1BB, 	 0, /* 0x20 */
+    0xF0B1, 0xF0B2, 0xF0B3, 0xF0B4, 0xF0B5, 0xD1BC, 	 0, 0xD1EC, /* 0x20 */
+         0, 0xF0B7, 0xF0B6, 0xD4A7, 	 0, 0xCDD2, 0xF0B8, 0xF0BA, /* 0x30 */
+    0xF0B9, 0xF0BB, 0xF0BC, 	 0, 	 0, 0xB8EB, 0xF0BD, 0xBAE8, /* 0x30 */
          0, 0xF0BE, 0xF0BF, 0xBEE9, 0xF0C0, 0xB6EC, 0xF0C1, 0xF0C2, /* 0x40 */
-    0xF0C3, 0xF0C4, 0xC8B5, 0xF0C5, 0xF0C6,      0, 0xF0C7, 0xC5F4, /* 0x40 */
-         0, 0xF0C8,      0,      0,      0, 0xF0C9,      0, 0xF0CA, /* 0x50 */
-    0xF7BD,      0, 0xF0CB, 0xF0CC, 0xF0CD,      0, 0xF0CE,      0, /* 0x50 */
-         0,      0,      0, 0xF0CF, 0xBAD7,      0, 0xF0D0, 0xF0D1, /* 0x60 */
-    0xF0D2, 0xF0D3, 0xF0D4, 0xF0D5, 0xF0D6, 0xF0D8,      0,      0, /* 0x60 */
-    0xD3A5, 0xF0D7,      0, 0xF0D9,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xF5BA, 0xC2B9, /* 0x70 */
-         0,      0, 0xF7E4,      0,      0,      0,      0, 0xF7E5, /* 0x80 */
-    0xF7E6,      0,      0, 0xF7E7,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xF7E8, 0xC2B4,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xF7EA,      0, 0xF7EB, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0xC2F3,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xF4F0,      0,      0,      0, /* 0xB0 */
-    0xF4EF,      0,      0, 0xC2E9,      0, 0xF7E1, 0xF7E2,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xBBC6,      0,      0,      0, /* 0xC0 */
-         0, 0xD9E4,      0,      0,      0, 0xCAF2, 0xC0E8, 0xF0A4, /* 0xC0 */
-         0, 0xBADA,      0,      0, 0xC7AD,      0,      0,      0, /* 0xD0 */
-    0xC4AC,      0,      0, 0xF7EC, 0xF7ED, 0xF7EE,      0, 0xF7F0, /* 0xD0 */
-    0xF7EF,      0, 0xF7F1,      0,      0, 0xF7F4,      0, 0xF7F3, /* 0xE0 */
-         0, 0xF7F2, 0xF7F5,      0,      0,      0,      0, 0xF7F6, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xEDE9,      0, 0xEDEA, 0xEDEB,      0, 0xF6BC          /* 0xF0 */
+    0xF0C3, 0xF0C4, 0xC8B5, 0xF0C5, 0xF0C6, 	 0, 0xF0C7, 0xC5F4, /* 0x40 */
+         0, 0xF0C8, 	 0, 	 0, 	 0, 0xF0C9, 	 0, 0xF0CA, /* 0x50 */
+    0xF7BD, 	 0, 0xF0CB, 0xF0CC, 0xF0CD, 	 0, 0xF0CE, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xF0CF, 0xBAD7, 	 0, 0xF0D0, 0xF0D1, /* 0x60 */
+    0xF0D2, 0xF0D3, 0xF0D4, 0xF0D5, 0xF0D6, 0xF0D8, 	 0, 	 0, /* 0x60 */
+    0xD3A5, 0xF0D7, 	 0, 0xF0D9, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF5BA, 0xC2B9, /* 0x70 */
+         0, 	 0, 0xF7E4, 	 0, 	 0, 	 0, 	 0, 0xF7E5, /* 0x80 */
+    0xF7E6, 	 0, 	 0, 0xF7E7, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xF7E8, 0xC2B4, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF7EA, 	 0, 0xF7EB, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC2F3, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xF4F0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xF4EF, 	 0, 	 0, 0xC2E9, 	 0, 0xF7E1, 0xF7E2, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xBBC6, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xD9E4, 	 0, 	 0, 	 0, 0xCAF2, 0xC0E8, 0xF0A4, /* 0xC0 */
+         0, 0xBADA, 	 0, 	 0, 0xC7AD, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xC4AC, 	 0, 	 0, 0xF7EC, 0xF7ED, 0xF7EE, 	 0, 0xF7F0, /* 0xD0 */
+    0xF7EF, 	 0, 0xF7F1, 	 0, 	 0, 0xF7F4, 	 0, 0xF7F3, /* 0xE0 */
+         0, 0xF7F2, 0xF7F5, 	 0, 	 0, 	 0, 	 0, 0xF7F6, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xEDE9, 	 0, 0xEDEA, 0xEDEB, 	 0, 0xF6BC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GB_9F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-                            0xF6BD,      0, 0xF6BE, 0xB6A6,      0, /* 0x00 */
-    0xD8BE,      0,      0, 0xB9C4,      0,      0,      0, 0xD8BB, /* 0x10 */
-         0, 0xDCB1,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xCAF3,      0, 0xF7F7,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xF7F8,      0,      0, 0xF7F9, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xF7FB, /* 0x30 */
-         0, 0xF7FA,      0, 0xB1C7,      0, 0xF7FC, 0xF7FD,      0, /* 0x30 */
-         0,      0,      0,      0, 0xF7FE,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xC6EB, 0xECB4,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xB3DD, /* 0x70 */
-    0xF6B3,      0,      0, 0xF6B4, 0xC1E4, 0xF6B5, 0xF6B6, 0xF6B7, /* 0x80 */
-    0xF6B8, 0xF6B9, 0xF6BA, 0xC8A3, 0xF6BB,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xC1FA, 0xB9A8, 0xEDE8,      0,      0,      0, 0xB9EA, /* 0x90 */
-    0xD9DF                                                          /* 0xA0 */
+                            0xF6BD, 	 0, 0xF6BE, 0xB6A6, 	 0, /* 0x00 */
+    0xD8BE, 	 0, 	 0, 0xB9C4, 	 0, 	 0, 	 0, 0xD8BB, /* 0x10 */
+         0, 0xDCB1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xCAF3, 	 0, 0xF7F7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xF7F8, 	 0, 	 0, 0xF7F9, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF7FB, /* 0x30 */
+         0, 0xF7FA, 	 0, 0xB1C7, 	 0, 0xF7FC, 0xF7FD, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xF7FE, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xC6EB, 0xECB4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB3DD, /* 0x70 */
+    0xF6B3, 	 0, 	 0, 0xF6B4, 0xC1E4, 0xF6B5, 0xF6B6, 0xF6B7, /* 0x80 */
+    0xF6B8, 0xF6B9, 0xF6BA, 0xC8A3, 0xF6BB, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xC1FA, 0xB9A8, 0xEDE8, 	 0, 	 0, 	 0, 0xB9EA, /* 0x90 */
+    0xD9DF															/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
diff --git a/sal/textenc/tcvtscn5.tab b/sal/textenc/tcvtscn5.tab
index c2f33488fe53..15e25d57961b 100644
--- a/sal/textenc/tcvtscn5.tab
+++ b/sal/textenc/tcvtscn5.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,1239 +38,1239 @@
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_4E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD2BB, 0xB6A1,      0, 0xC6DF,      0,      0,      0, 0xF8F1, /* 0x00 */
-    0xD5C9, 0xC8FD, 0xC9CF, 0xCFC2, 0xD8A2, 0xB2BB,      0,      0, /* 0x00 */
-    0xD8A4, 0xF8A9,      0,      0, 0xC7D2, 0xD8A7, 0xCAC0,      0, /* 0x10 */
-    0xC7F0, 0xB1FB,      0,      0,      0,      0, 0xD8A9,      0, /* 0x10 */
-         0,      0, 0xB6AA,      0,      0,      0,      0,      0, /* 0x20 */
-    0xD8AD,      0,      0, 0xD1BE, 0xE3DC, 0xD6D0,      0,      0, /* 0x20 */
-    0xF8B3,      0, 0xB4AE,      0,      0,      0, 0xD8BC,      0, /* 0x30 */
-    0xCDE8, 0xB5A4,      0, 0xD6F7,      0,      0,      0, 0xD8AF, /* 0x30 */
-         0,      0,      0, 0xC4CB,      0, 0xBEC3,      0, 0xD8B1, /* 0x40 */
-    0xF7E1,      0,      0, 0xD6AE,      0, 0xD5A7, 0xBAF5, 0xB7A6, /* 0x40 */
-         0,      0, 0xC6B9, 0xC5D2,      0,      0, 0xB9D4,      0, /* 0x50 */
-    0xB3CB, 0xD2D2,      0,      0, 0xD8BF, 0xBEC5, 0xC6F2, 0xD2B2, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xD8C0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xC8E9,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xC7AC,      0, /* 0x70 */
-         0,      0, 0xC2D2,      0,      0,      0, 0xC1CB,      0, /* 0x80 */
-    0xD3E8,      0,      0, 0xCAC2, 0xB6FE, 0xD8A1, 0xD3DA,      0, /* 0x80 */
-         0, 0xF8FD, 0xBBA5, 0xD8C1, 0xCEE5, 0xBEAE,      0,      0, /* 0x90 */
-    0xD8A8,      0,      0, 0xD0A9,      0,      0, 0xD1C7, 0xD8BD, /* 0x90 */
-    0xD9EF, 0xCDF6, 0xBFBA,      0, 0xBDBB, 0xBAA5, 0xD2E0,      0, /* 0xA0 */
-    0xBAE0,      0,      0, 0xCFED, 0xBEA9, 0xCDA4, 0xC1C1,      0, /* 0xA0 */
-         0,      0,      0, 0xD9F1,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xC8CB, 0xD8E9,      0,      0,      0,      0, /* 0xB0 */
-    0xCAB2, 0xC8CA, 0xD8EC, 0xD8EA, 0xD8C6,      0, 0xF8DF, 0xB3F0, /* 0xC0 */
-         0, 0xD8EB, 0xBDF1, 0xBDE9,      0, 0xC8D4,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xD7D0, 0xCACB, 0xCBFB, 0xD5CC, /* 0xD0 */
-    0xB8B6, 0xCFC9,      0,      0,      0, 0xD9DA, 0xD8F0, 0xC7AA, /* 0xD0 */
-         0, 0xD8EE,      0, 0xB4FA, 0xC1EE, 0xD2D4,      0,      0, /* 0xE0 */
-    0xD8ED,      0,      0, 0xD8EF,      0,      0,      0,      0, /* 0xE0 */
-    0xD1F6,      0, 0xD6D9, 0xD8F2,      0, 0xD8F5, 0xBCFE, 0xF8C2, /* 0xF0 */
-         0,      0,      0, 0xC8CE,      0, 0xB7DD,      0, 0xB7C2  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD2BB, 0xB6A1, 	 0, 0xC6DF, 	 0, 	 0, 	 0, 0xF8F1, /* 0x00 */
+    0xD5C9, 0xC8FD, 0xC9CF, 0xCFC2, 0xD8A2, 0xB2BB, 	 0, 	 0, /* 0x00 */
+    0xD8A4, 0xF8A9, 	 0, 	 0, 0xC7D2, 0xD8A7, 0xCAC0, 	 0, /* 0x10 */
+    0xC7F0, 0xB1FB, 	 0, 	 0, 	 0, 	 0, 0xD8A9, 	 0, /* 0x10 */
+         0, 	 0, 0xB6AA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xD8AD, 	 0, 	 0, 0xD1BE, 0xE3DC, 0xD6D0, 	 0, 	 0, /* 0x20 */
+    0xF8B3, 	 0, 0xB4AE, 	 0, 	 0, 	 0, 0xD8BC, 	 0, /* 0x30 */
+    0xCDE8, 0xB5A4, 	 0, 0xD6F7, 	 0, 	 0, 	 0, 0xD8AF, /* 0x30 */
+         0, 	 0, 	 0, 0xC4CB, 	 0, 0xBEC3, 	 0, 0xD8B1, /* 0x40 */
+    0xF7E1, 	 0, 	 0, 0xD6AE, 	 0, 0xD5A7, 0xBAF5, 0xB7A6, /* 0x40 */
+         0, 	 0, 0xC6B9, 0xC5D2, 	 0, 	 0, 0xB9D4, 	 0, /* 0x50 */
+    0xB3CB, 0xD2D2, 	 0, 	 0, 0xD8BF, 0xBEC5, 0xC6F2, 0xD2B2, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xD8C0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xC8E9, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC7AC, 	 0, /* 0x70 */
+         0, 	 0, 0xC2D2, 	 0, 	 0, 	 0, 0xC1CB, 	 0, /* 0x80 */
+    0xD3E8, 	 0, 	 0, 0xCAC2, 0xB6FE, 0xD8A1, 0xD3DA, 	 0, /* 0x80 */
+         0, 0xF8FD, 0xBBA5, 0xD8C1, 0xCEE5, 0xBEAE, 	 0, 	 0, /* 0x90 */
+    0xD8A8, 	 0, 	 0, 0xD0A9, 	 0, 	 0, 0xD1C7, 0xD8BD, /* 0x90 */
+    0xD9EF, 0xCDF6, 0xBFBA, 	 0, 0xBDBB, 0xBAA5, 0xD2E0, 	 0, /* 0xA0 */
+    0xBAE0, 	 0, 	 0, 0xCFED, 0xBEA9, 0xCDA4, 0xC1C1, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xD9F1, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xC8CB, 0xD8E9, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xCAB2, 0xC8CA, 0xD8EC, 0xD8EA, 0xD8C6, 	 0, 0xF8DF, 0xB3F0, /* 0xC0 */
+         0, 0xD8EB, 0xBDF1, 0xBDE9, 	 0, 0xC8D4, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xD7D0, 0xCACB, 0xCBFB, 0xD5CC, /* 0xD0 */
+    0xB8B6, 0xCFC9, 	 0, 	 0, 	 0, 0xD9DA, 0xD8F0, 0xC7AA, /* 0xD0 */
+         0, 0xD8EE, 	 0, 0xB4FA, 0xC1EE, 0xD2D4, 	 0, 	 0, /* 0xE0 */
+    0xD8ED, 	 0, 	 0, 0xD8EF, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xD1F6, 	 0, 0xD6D9, 0xD8F2, 	 0, 0xD8F5, 0xBCFE, 0xF8C2, /* 0xF0 */
+         0, 	 0, 	 0, 0xC8CE, 	 0, 0xB7DD, 	 0, 0xB7C2	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_4F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xC6F3,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xD8F8, 0xD2C1,      0,      0, 0xCEE9, 0xBCBF, 0xB7FC, /* 0x00 */
-    0xB7A5, 0xD0DD,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xBBEF,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0xD8F3,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xB2AE, /* 0x20 */
-    0xB9C0,      0, 0xD9A3,      0, 0xB0E9,      0, 0xC1E6,      0, /* 0x30 */
-    0xC9EC,      0, 0xCBC5,      0, 0xCBC6, 0xD9A4,      0,      0, /* 0x30 */
-         0,      0,      0, 0xB5E8,      0,      0, 0xB5AB, 0xD8F9, /* 0x40 */
-         0,      0,      0,      0,      0, 0xCEBB, 0xB5CD, 0xD7A1, /* 0x40 */
-    0xD7F4, 0xD3D3,      0,      0,      0, 0xBACE,      0, 0xD9A2, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xC6F3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xD8F8, 0xD2C1, 	 0, 	 0, 0xCEE9, 0xBCBF, 0xB7FC, /* 0x00 */
+    0xB7A5, 0xD0DD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xBBEF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xD8F3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB2AE, /* 0x20 */
+    0xB9C0, 	 0, 0xD9A3, 	 0, 0xB0E9, 	 0, 0xC1E6, 	 0, /* 0x30 */
+    0xC9EC, 	 0, 0xCBC5, 	 0, 0xCBC6, 0xD9A4, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xB5E8, 	 0, 	 0, 0xB5AB, 0xD8F9, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCEBB, 0xB5CD, 0xD7A1, /* 0x40 */
+    0xD7F4, 0xD3D3, 	 0, 	 0, 	 0, 0xBACE, 	 0, 0xD9A2, /* 0x50 */
     0xD9DC, 0xE2C5, 0xD8FD, 0xB7F0, 0xD7F7, 0xD8FE, 0xD8FA, 0xD9A1, /* 0x50 */
-    0xC4E3,      0,      0,      0, 0xD8F4,      0,      0, 0xD8FB, /* 0x60 */
-         0, 0xC5E5,      0,      0, 0xC0D0,      0,      0, 0xD1F0, /* 0x60 */
-    0xB0DB,      0,      0, 0xBCD1, 0xD9A6,      0, 0xD9A5,      0, /* 0x70 */
-         0,      0,      0, 0xD9AC, 0xD9AE,      0, 0xD9AB, 0xCAB9, /* 0x70 */
-         0,      0,      0, 0xD9A9, 0xD6B6,      0, 0xC0B4,      0, /* 0x80 */
-    0xB3DE, 0xD9A8,      0, 0xC0FD,      0, 0xCACC,      0, 0xD9AA, /* 0x80 */
-         0, 0xD9A7,      0,      0, 0xD9B0,      0, 0xC2D8, 0xB6B1, /* 0x90 */
-         0,      0,      0, 0xB9A9,      0, 0xD2C0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xC2C2,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xCEEA, 0xBAEE, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xC7D6,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xB1E3, /* 0xB0 */
-         0,      0, 0xF8F2, 0xB4D9, 0xB6ED, 0xD9B4,      0,      0, /* 0xC0 */
-         0,      0, 0xBFA1,      0,      0,      0, 0xD9DE, 0xC7CE, /* 0xC0 */
-    0xC0FE, 0xD9B8,      0,      0,      0,      0,      0, 0xCBD7, /* 0xD0 */
-    0xB7FD,      0, 0xD9B5,      0, 0xD9B7, 0xB1A3, 0xD3E1, 0xD9B9, /* 0xD0 */
-    0xCFC0, 0xD0C5,      0, 0xD9B6,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xD0DE, 0xB8A9, /* 0xE0 */
-         0, 0xBEE3,      0, 0xD9BD,      0,      0,      0,      0, /* 0xF0 */
-    0xD9BA,      0, 0xB0B3,      0,      0,      0, 0xD9C2          /* 0xF0 */
+    0xC4E3, 	 0, 	 0, 	 0, 0xD8F4, 	 0, 	 0, 0xD8FB, /* 0x60 */
+         0, 0xC5E5, 	 0, 	 0, 0xC0D0, 	 0, 	 0, 0xD1F0, /* 0x60 */
+    0xB0DB, 	 0, 	 0, 0xBCD1, 0xD9A6, 	 0, 0xD9A5, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0xD9AC, 0xD9AE, 	 0, 0xD9AB, 0xCAB9, /* 0x70 */
+         0, 	 0, 	 0, 0xD9A9, 0xD6B6, 	 0, 0xC0B4, 	 0, /* 0x80 */
+    0xB3DE, 0xD9A8, 	 0, 0xC0FD, 	 0, 0xCACC, 	 0, 0xD9AA, /* 0x80 */
+         0, 0xD9A7, 	 0, 	 0, 0xD9B0, 	 0, 0xC2D8, 0xB6B1, /* 0x90 */
+         0, 	 0, 	 0, 0xB9A9, 	 0, 0xD2C0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xC2C2, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCEEA, 0xBAEE, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC7D6, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB1E3, /* 0xB0 */
+         0, 	 0, 0xF8F2, 0xB4D9, 0xB6ED, 0xD9B4, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xBFA1, 	 0, 	 0, 	 0, 0xD9DE, 0xC7CE, /* 0xC0 */
+    0xC0FE, 0xD9B8, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBD7, /* 0xD0 */
+    0xB7FD, 	 0, 0xD9B5, 	 0, 0xD9B7, 0xB1A3, 0xD3E1, 0xD9B9, /* 0xD0 */
+    0xCFC0, 0xD0C5, 	 0, 0xD9B6, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD0DE, 0xB8A9, /* 0xE0 */
+         0, 0xBEE3, 	 0, 0xD9BD, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xD9BA, 	 0, 0xB0B3, 	 0, 	 0, 	 0, 0xD9C2			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_50[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD8F6,      0,      0,      0,      0,      0, 0xC1A9,      0, /* 0x00 */
-         0, 0xB2D6,      0, 0xB8F6, 0xD9C4, 0xB1B6,      0, 0xD9BF, /* 0x00 */
-         0, 0xC3C7, 0xB5B9,      0, 0xBEF3,      0,      0,      0, /* 0x10 */
-    0xCCC8, 0xBAF2, 0xD2D0,      0, 0xD9C3,      0,      0, 0xBDE8, /* 0x10 */
-         0, 0xB3AB,      0,      0,      0, 0xD9C5, 0xBEEB,      0, /* 0x20 */
-    0xD9C6, 0xD9BB, 0xC4DF, 0xC2D7, 0xD9BE, 0xD9C1, 0xD9C0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xD6B5,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xD9C8,      0,      0,      0, 0xBCD9, /* 0x40 */
-    0xD9CA, 0xCEB0,      0,      0, 0xD9BC,      0, 0xD9CB, 0xC6AB, /* 0x40 */
-         0,      0,      0,      0,      0, 0xD9C9,      0,      0, /* 0x50 */
-         0,      0, 0xD7F6,      0, 0xCDA3,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xBDA1,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xD9CC,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xB2E0, 0xD5EC, 0xC5BC, 0xCDB5, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xBFFE,      0,      0,      0,      0, 0xB8B5,      0,      0, /* 0x80 */
-    0xC0FC,      0,      0,      0,      0, 0xB0F8,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xD8F7,      0, /* 0x90 */
-    0xC9A1, 0xB1B8,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xF8C1, 0xB4F6,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xB4DF, 0xD3B6,      0,      0, /* 0xA0 */
-         0,      0, 0xB0C1, 0xB4AB, 0xD8F1, 0xD5AE,      0, 0xC9CB, /* 0xB0 */
-         0,      0, 0xD9D1, 0xC9B5,      0,      0, 0xC7E3,      0, /* 0xB0 */
-         0,      0, 0xD9CD,      0,      0, 0xBDF6,      0,      0, /* 0xC0 */
-         0, 0xD9DD,      0,      0,      0,      0,      0, 0xCFF1, /* 0xC0 */
-         0, 0xC7C8,      0,      0,      0, 0xC6CD, 0xD9D2,      0, /* 0xD0 */
-         0,      0, 0xC1C5,      0,      0,      0, 0xCEB1,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xBDC4, 0xD9D6, 0xC9AE, /* 0xE0 */
-    0xD9C7,      0,      0,      0, 0xD9D5, 0xD9D4, 0xD9D7,      0, /* 0xE0 */
-         0,      0,      0, 0xCBDB,      0, 0xBDA9,      0,      0, /* 0xF0 */
-         0, 0xBCDB,      0, 0xC6A7                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD8F6, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC1A9, 	 0, /* 0x00 */
+         0, 0xB2D6, 	 0, 0xB8F6, 0xD9C4, 0xB1B6, 	 0, 0xD9BF, /* 0x00 */
+         0, 0xC3C7, 0xB5B9, 	 0, 0xBEF3, 	 0, 	 0, 	 0, /* 0x10 */
+    0xCCC8, 0xBAF2, 0xD2D0, 	 0, 0xD9C3, 	 0, 	 0, 0xBDE8, /* 0x10 */
+         0, 0xB3AB, 	 0, 	 0, 	 0, 0xD9C5, 0xBEEB, 	 0, /* 0x20 */
+    0xD9C6, 0xD9BB, 0xC4DF, 0xC2D7, 0xD9BE, 0xD9C1, 0xD9C0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xD6B5, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xD9C8, 	 0, 	 0, 	 0, 0xBCD9, /* 0x40 */
+    0xD9CA, 0xCEB0, 	 0, 	 0, 0xD9BC, 	 0, 0xD9CB, 0xC6AB, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD9C9, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xD7F6, 	 0, 0xCDA3, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xBDA1, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xD9CC, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xB2E0, 0xD5EC, 0xC5BC, 0xCDB5, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xBFFE, 	 0, 	 0, 	 0, 	 0, 0xB8B5, 	 0, 	 0, /* 0x80 */
+    0xC0FC, 	 0, 	 0, 	 0, 	 0, 0xB0F8, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD8F7, 	 0, /* 0x90 */
+    0xC9A1, 0xB1B8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xF8C1, 0xB4F6, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xB4DF, 0xD3B6, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xB0C1, 0xB4AB, 0xD8F1, 0xD5AE, 	 0, 0xC9CB, /* 0xB0 */
+         0, 	 0, 0xD9D1, 0xC9B5, 	 0, 	 0, 0xC7E3, 	 0, /* 0xB0 */
+         0, 	 0, 0xD9CD, 	 0, 	 0, 0xBDF6, 	 0, 	 0, /* 0xC0 */
+         0, 0xD9DD, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCFF1, /* 0xC0 */
+         0, 0xC7C8, 	 0, 	 0, 	 0, 0xC6CD, 0xD9D2, 	 0, /* 0xD0 */
+         0, 	 0, 0xC1C5, 	 0, 	 0, 	 0, 0xCEB1, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xBDC4, 0xD9D6, 0xC9AE, /* 0xE0 */
+    0xD9C7, 	 0, 	 0, 	 0, 0xD9D5, 0xD9D4, 0xD9D7, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xCBDB, 	 0, 0xBDA9, 	 0, 	 0, /* 0xF0 */
+         0, 0xBCDB, 	 0, 0xC6A7									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_51[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD2C7,      0, 0xD9AF,      0, 0xD2DA,      0, 0xD9D3, 0xD9D8, /* 0x00 */
-    0xBFEB, 0xBCF3,      0, 0xD9D9,      0,      0,      0,      0, /* 0x00 */
-    0xD9CF,      0, 0xC8E5,      0, 0xD9B1, 0xD9AD,      0,      0, /* 0x10 */
-    0xF8C5,      0,      0,      0,      0,      0,      0, 0xB3A5, /* 0x10 */
-         0, 0xC0DC,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xD3C5,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xB4A2,      0,      0,      0,      0, 0xD9B3, /* 0x30 */
-         0,      0, 0xD9D0, 0xD9CE, 0xD9B2,      0,      0,      0, /* 0x30 */
-    0xD8A3, 0xD4CA,      0, 0xD4AA, 0xD0D6, 0xB3E4, 0xD5D7,      0, /* 0x40 */
-    0xCFC8, 0xB9E2,      0, 0xBFCB,      0, 0xC3E2,      0,      0, /* 0x40 */
-         0, 0xB6D2, 0xB6F9,      0, 0xCDC3, 0xD9EE, 0xD9F0,      0, /* 0x50 */
-         0,      0, 0xF8AC,      0, 0xB6B5,      0,      0,      0, /* 0x50 */
-         0,      0, 0xBEA4,      0,      0, 0xC8EB,      0,      0, /* 0x60 */
-    0xC8AB, 0xC1BD,      0, 0xB0CB, 0xB9AB, 0xC1F9, 0xD9E2,      0, /* 0x60 */
-         0, 0xB9B2,      0,      0,      0, 0xB1F8, 0xC6E4, 0xBEDF, /* 0x70 */
-    0xB5E4, 0xD7C8,      0,      0, 0xBCE6,      0,      0,      0, /* 0x70 */
-    0xBCBD,      0, 0xD8E7,      0,      0, 0xC4DA,      0,      0, /* 0x80 */
-         0, 0xC8BD,      0,      0, 0xB2E1, 0xD4D9,      0,      0, /* 0x80 */
-         0,      0, 0xC3B0,      0,      0, 0xC3E1, 0xDAA2, 0xC8DF, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xB9DA,      0, 0xDAA3,      0, 0xD4A9, 0xDAA4,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xD9FB, 0xB6AC,      0,      0,      0, /* 0xA0 */
-    0xB1F9, 0xD9FC, 0xF8A8, 0xBEF6,      0, 0xBFF6, 0xD2B1, 0xC0E4, /* 0xB0 */
-         0,      0,      0,      0, 0xD9FE, 0xD9FD,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xC6E0,      0, 0xF9A9, 0xDAA1, /* 0xC0 */
-    0xBEBB, 0xC1B9,      0, 0xB5F2, 0xC1E8, 0xB6B3,      0, 0xBCF5, /* 0xC0 */
-         0, 0xB4D5,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xC1DD,      0, 0xC4FD,      0,      0, /* 0xD0 */
-    0xF8C0, 0xB7B2,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xF8DD,      0,      0, /* 0xE0 */
-    0xBBCB, 0xBFAD,      0, 0xB5CA,      0, 0xDBC9, 0xD0D7,      0, /* 0xF0 */
-    0xCDB9, 0xB0BC, 0xB3F6,      0, 0xDBCA, 0xBAAF                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD2C7, 	 0, 0xD9AF, 	 0, 0xD2DA, 	 0, 0xD9D3, 0xD9D8, /* 0x00 */
+    0xBFEB, 0xBCF3, 	 0, 0xD9D9, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xD9CF, 	 0, 0xC8E5, 	 0, 0xD9B1, 0xD9AD, 	 0, 	 0, /* 0x10 */
+    0xF8C5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB3A5, /* 0x10 */
+         0, 0xC0DC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xD3C5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xB4A2, 	 0, 	 0, 	 0, 	 0, 0xD9B3, /* 0x30 */
+         0, 	 0, 0xD9D0, 0xD9CE, 0xD9B2, 	 0, 	 0, 	 0, /* 0x30 */
+    0xD8A3, 0xD4CA, 	 0, 0xD4AA, 0xD0D6, 0xB3E4, 0xD5D7, 	 0, /* 0x40 */
+    0xCFC8, 0xB9E2, 	 0, 0xBFCB, 	 0, 0xC3E2, 	 0, 	 0, /* 0x40 */
+         0, 0xB6D2, 0xB6F9, 	 0, 0xCDC3, 0xD9EE, 0xD9F0, 	 0, /* 0x50 */
+         0, 	 0, 0xF8AC, 	 0, 0xB6B5, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xBEA4, 	 0, 	 0, 0xC8EB, 	 0, 	 0, /* 0x60 */
+    0xC8AB, 0xC1BD, 	 0, 0xB0CB, 0xB9AB, 0xC1F9, 0xD9E2, 	 0, /* 0x60 */
+         0, 0xB9B2, 	 0, 	 0, 	 0, 0xB1F8, 0xC6E4, 0xBEDF, /* 0x70 */
+    0xB5E4, 0xD7C8, 	 0, 	 0, 0xBCE6, 	 0, 	 0, 	 0, /* 0x70 */
+    0xBCBD, 	 0, 0xD8E7, 	 0, 	 0, 0xC4DA, 	 0, 	 0, /* 0x80 */
+         0, 0xC8BD, 	 0, 	 0, 0xB2E1, 0xD4D9, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xC3B0, 	 0, 	 0, 0xC3E1, 0xDAA2, 0xC8DF, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xB9DA, 	 0, 0xDAA3, 	 0, 0xD4A9, 0xDAA4, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xD9FB, 0xB6AC, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xB1F9, 0xD9FC, 0xF8A8, 0xBEF6, 	 0, 0xBFF6, 0xD2B1, 0xC0E4, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xD9FE, 0xD9FD, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xC6E0, 	 0, 0xF9A9, 0xDAA1, /* 0xC0 */
+    0xBEBB, 0xC1B9, 	 0, 0xB5F2, 0xC1E8, 0xB6B3, 	 0, 0xBCF5, /* 0xC0 */
+         0, 0xB4D5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xC1DD, 	 0, 0xC4FD, 	 0, 	 0, /* 0xD0 */
+    0xF8C0, 0xB7B2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF8DD, 	 0, 	 0, /* 0xE0 */
+    0xBBCB, 0xBFAD, 	 0, 0xB5CA, 	 0, 0xDBC9, 0xD0D7, 	 0, /* 0xF0 */
+    0xCDB9, 0xB0BC, 0xB3F6, 	 0, 0xDBCA, 0xBAAF					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_52[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xB5B6, 0xB5F3, 0xD8D6, 0xC8D0,      0,      0, 0xB7D6, 0xC7D0, /* 0x00 */
-    0xD8D7,      0, 0xBFAF,      0,      0,      0, 0xD8D8,      0, /* 0x00 */
-         0, 0xD0CC, 0xF8BB,      0,      0,      0, 0xEBBE, 0xC1D0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xB3F5,      0,      0, /* 0x10 */
-    0xC9BE,      0,      0,      0, 0xC5D0,      0,      0,      0, /* 0x20 */
-    0xC5D9, 0xC0FB,      0, 0xB1F0,      0,      0, 0xB9CE,      0, /* 0x20 */
-    0xB5BD,      0,      0, 0xD8DA,      0,      0, 0xD6C6, 0xCBA2, /* 0x30 */
-    0xC8AF, 0xC9B2, 0xB4CC, 0xBFCC,      0,      0,      0,      0, /* 0x30 */
-         0, 0xB6E7,      0, 0xCCEA, 0xD8D9,      0,      0, 0xD4F2, /* 0x40 */
-         0,      0, 0xCFF7, 0xF8C8, 0xD8DD, 0xC7B0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xCCDE,      0, 0xC6CA,      0, /* 0x50 */
-         0,      0,      0, 0xB8D5, 0xD8E0,      0, 0xD8DE,      0, /* 0x50 */
-         0, 0xD8DF,      0,      0,      0, 0xB0FE,      0,      0, /* 0x60 */
-         0, 0xCAA3, 0xBCF4,      0,      0,      0, 0xB9D0, 0xB8B1, /* 0x60 */
-         0,      0, 0xB8EE,      0, 0xD8DC, 0xB4B4,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xD8E2,      0, 0xBDCB, /* 0x70 */
-         0, 0xD8E4, 0xD8E3, 0xBBAE,      0,      0,      0, 0xBEE7, /* 0x80 */
-    0xC5FC, 0xC1F5, 0xB9F4,      0, 0xD8DB, 0xBDA3,      0,      0, /* 0x80 */
-    0xD8E5, 0xBCC1,      0, 0xD8E6,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xC1A6,      0,      0,      0, 0xB9A6, /* 0x90 */
-    0xBCD3,      0,      0, 0xC1D3,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xD6FA, 0xC5AC, 0xBDD9, 0xDBBE, 0xDBBF,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xDBC0,      0, /* 0xB0 */
-         0, 0xBEA2,      0, 0xB2AA,      0,      0,      0, 0xD3C2, /* 0xC0 */
-         0, 0xC3E3,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xDBC2,      0, 0xC0D5,      0,      0, 0xB6AF, 0xDBC3,      0, /* 0xD0 */
-    0xBFB1, 0xCEF1,      0, 0xD1AB,      0, 0xCAA4, 0xC0CD, 0xC4BC, /* 0xD0 */
-         0,      0, 0xCAC6,      0, 0xC7DA,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xDBC4, 0xDBBD,      0,      0,      0, 0xC0F8,      0,      0, /* 0xF0 */
-    0xC8B0, 0xD9E8, 0xC9D7,      0,      0,      0, 0xB9B4, 0xCEF0  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xB5B6, 0xB5F3, 0xD8D6, 0xC8D0, 	 0, 	 0, 0xB7D6, 0xC7D0, /* 0x00 */
+    0xD8D7, 	 0, 0xBFAF, 	 0, 	 0, 	 0, 0xD8D8, 	 0, /* 0x00 */
+         0, 0xD0CC, 0xF8BB, 	 0, 	 0, 	 0, 0xEBBE, 0xC1D0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB3F5, 	 0, 	 0, /* 0x10 */
+    0xC9BE, 	 0, 	 0, 	 0, 0xC5D0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xC5D9, 0xC0FB, 	 0, 0xB1F0, 	 0, 	 0, 0xB9CE, 	 0, /* 0x20 */
+    0xB5BD, 	 0, 	 0, 0xD8DA, 	 0, 	 0, 0xD6C6, 0xCBA2, /* 0x30 */
+    0xC8AF, 0xC9B2, 0xB4CC, 0xBFCC, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xB6E7, 	 0, 0xCCEA, 0xD8D9, 	 0, 	 0, 0xD4F2, /* 0x40 */
+         0, 	 0, 0xCFF7, 0xF8C8, 0xD8DD, 0xC7B0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xCCDE, 	 0, 0xC6CA, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xB8D5, 0xD8E0, 	 0, 0xD8DE, 	 0, /* 0x50 */
+         0, 0xD8DF, 	 0, 	 0, 	 0, 0xB0FE, 	 0, 	 0, /* 0x60 */
+         0, 0xCAA3, 0xBCF4, 	 0, 	 0, 	 0, 0xB9D0, 0xB8B1, /* 0x60 */
+         0, 	 0, 0xB8EE, 	 0, 0xD8DC, 0xB4B4, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD8E2, 	 0, 0xBDCB, /* 0x70 */
+         0, 0xD8E4, 0xD8E3, 0xBBAE, 	 0, 	 0, 	 0, 0xBEE7, /* 0x80 */
+    0xC5FC, 0xC1F5, 0xB9F4, 	 0, 0xD8DB, 0xBDA3, 	 0, 	 0, /* 0x80 */
+    0xD8E5, 0xBCC1, 	 0, 0xD8E6, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xC1A6, 	 0, 	 0, 	 0, 0xB9A6, /* 0x90 */
+    0xBCD3, 	 0, 	 0, 0xC1D3, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xD6FA, 0xC5AC, 0xBDD9, 0xDBBE, 0xDBBF, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDBC0, 	 0, /* 0xB0 */
+         0, 0xBEA2, 	 0, 0xB2AA, 	 0, 	 0, 	 0, 0xD3C2, /* 0xC0 */
+         0, 0xC3E3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xDBC2, 	 0, 0xC0D5, 	 0, 	 0, 0xB6AF, 0xDBC3, 	 0, /* 0xD0 */
+    0xBFB1, 0xCEF1, 	 0, 0xD1AB, 	 0, 0xCAA4, 0xC0CD, 0xC4BC, /* 0xD0 */
+         0, 	 0, 0xCAC6, 	 0, 0xC7DA, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xDBC4, 0xDBBD, 	 0, 	 0, 	 0, 0xC0F8, 	 0, 	 0, /* 0xF0 */
+    0xC8B0, 0xD9E8, 0xC9D7, 	 0, 	 0, 	 0, 0xB9B4, 0xCEF0	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_53[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD4C8,      0,      0,      0,      0, 0xB0FC, 0xB4D2,      0, /* 0x00 */
-    0xD0D9,      0,      0,      0,      0, 0xD9E9,      0, 0xDECB, /* 0x00 */
-    0xD9EB,      0,      0,      0,      0, 0xD8B0, 0xBBAF, 0xB1B1, /* 0x10 */
-         0, 0xB3D7, 0xD8CE,      0,      0, 0xD4D1,      0,      0, /* 0x10 */
-    0xBDB3, 0xBFEF,      0, 0xCFBB,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xB7CB,      0,      0, 0xD8D0,      0, 0xBBE3, /* 0x20 */
-         0, 0xD8D1,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xC6A5,      0,      0,      0,      0, 0xD8D2, 0xC4E4, /* 0x30 */
-    0xC7F8, 0xCAAE,      0, 0xC7A7,      0, 0xD8A6,      0, 0xC9FD, /* 0x40 */
-    0xCEE7, 0xBBDC, 0xB0EB,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xB1B0, 0xD7E4, 0xD7BF, 0xD0AD,      0,      0, 0xC4CF, /* 0x50 */
-         0,      0, 0xB2A9,      0, 0xB2B7,      0, 0xB1E5, 0xDFB2, /* 0x50 */
-    0xD5BC, 0xBFA8,      0, 0xD8D5,      0,      0, 0xD8D4, 0xCED4, /* 0x60 */
-         0, 0xDAE0,      0,      0,      0,      0, 0xD8B4, 0xC3AE, /* 0x60 */
-    0xD3A1, 0xCEA3,      0, 0xBCB4, 0xC8B4, 0xC2D1,      0, 0xBEED, /* 0x70 */
-    0xD0B6,      0, 0xDAE1,      0,      0,      0,      0, 0xC7E4, /* 0x70 */
-         0,      0, 0xF8A7,      0, 0xB6F2,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xC0E5, 0xD8C7, 0xBAF1,      0,      0, 0xD8C8,      0, 0xD4AD, /* 0x90 */
-    0xB2DE,      0, 0xCFE1,      0,      0, 0xD8CA, 0xCFC3,      0, /* 0xA0 */
-    0xB3F8, 0xBEC7,      0,      0,      0, 0xD1E1, 0xD8CB,      0, /* 0xA0 */
-         0,      0, 0xC0F7,      0, 0xD8C9,      0, 0xDBCC,      0, /* 0xB0 */
-         0,      0,      0, 0xC8A5,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xC8FE,      0, 0xB2CE,      0,      0,      0,      0, /* 0xC0 */
-    0xD3D6, 0xB2E6, 0xBCB0, 0xD3D1,      0, 0xB7B4,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xCAE5,      0, 0xC8A1, 0xCADC, /* 0xD0 */
-         0, 0xD0F0,      0, 0xC5D1,      0,      0,      0, 0xDBC5, /* 0xD0 */
-         0,      0, 0xB4D4, 0xBFDA, 0xB9C5, 0xBEE4, 0xC1ED,      0, /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD4C8, 	 0, 	 0, 	 0, 	 0, 0xB0FC, 0xB4D2, 	 0, /* 0x00 */
+    0xD0D9, 	 0, 	 0, 	 0, 	 0, 0xD9E9, 	 0, 0xDECB, /* 0x00 */
+    0xD9EB, 	 0, 	 0, 	 0, 	 0, 0xD8B0, 0xBBAF, 0xB1B1, /* 0x10 */
+         0, 0xB3D7, 0xD8CE, 	 0, 	 0, 0xD4D1, 	 0, 	 0, /* 0x10 */
+    0xBDB3, 0xBFEF, 	 0, 0xCFBB, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xB7CB, 	 0, 	 0, 0xD8D0, 	 0, 0xBBE3, /* 0x20 */
+         0, 0xD8D1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xC6A5, 	 0, 	 0, 	 0, 	 0, 0xD8D2, 0xC4E4, /* 0x30 */
+    0xC7F8, 0xCAAE, 	 0, 0xC7A7, 	 0, 0xD8A6, 	 0, 0xC9FD, /* 0x40 */
+    0xCEE7, 0xBBDC, 0xB0EB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xB1B0, 0xD7E4, 0xD7BF, 0xD0AD, 	 0, 	 0, 0xC4CF, /* 0x50 */
+         0, 	 0, 0xB2A9, 	 0, 0xB2B7, 	 0, 0xB1E5, 0xDFB2, /* 0x50 */
+    0xD5BC, 0xBFA8, 	 0, 0xD8D5, 	 0, 	 0, 0xD8D4, 0xCED4, /* 0x60 */
+         0, 0xDAE0, 	 0, 	 0, 	 0, 	 0, 0xD8B4, 0xC3AE, /* 0x60 */
+    0xD3A1, 0xCEA3, 	 0, 0xBCB4, 0xC8B4, 0xC2D1, 	 0, 0xBEED, /* 0x70 */
+    0xD0B6, 	 0, 0xDAE1, 	 0, 	 0, 	 0, 	 0, 0xC7E4, /* 0x70 */
+         0, 	 0, 0xF8A7, 	 0, 0xB6F2, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xC0E5, 0xD8C7, 0xBAF1, 	 0, 	 0, 0xD8C8, 	 0, 0xD4AD, /* 0x90 */
+    0xB2DE, 	 0, 0xCFE1, 	 0, 	 0, 0xD8CA, 0xCFC3, 	 0, /* 0xA0 */
+    0xB3F8, 0xBEC7, 	 0, 	 0, 	 0, 0xD1E1, 0xD8CB, 	 0, /* 0xA0 */
+         0, 	 0, 0xC0F7, 	 0, 0xD8C9, 	 0, 0xDBCC, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xC8A5, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xC8FE, 	 0, 0xB2CE, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xD3D6, 0xB2E6, 0xBCB0, 0xD3D1, 	 0, 0xB7B4, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xCAE5, 	 0, 0xC8A1, 0xCADC, /* 0xD0 */
+         0, 0xD0F0, 	 0, 0xC5D1, 	 0, 	 0, 	 0, 0xDBC5, /* 0xD0 */
+         0, 	 0, 0xB4D4, 0xBFDA, 0xB9C5, 0xBEE4, 0xC1ED, 	 0, /* 0xE0 */
     0xDFB6, 0xDFB5, 0xF9A3, 0xBDD0, 0xD5D9, 0xB0C8, 0xB6A3, 0xBFC9, /* 0xE0 */
-    0xF8EB, 0xDFB3, 0xCAB7, 0xD3D2,      0, 0xD8CF, 0xF8F8,      0, /* 0xF0 */
-    0xCBBE,      0,      0, 0xDFB7, 0xB5F0                          /* 0xF0 */
+    0xF8EB, 0xDFB3, 0xCAB7, 0xD3D2, 	 0, 0xD8CF, 0xF8F8, 	 0, /* 0xF0 */
+    0xCBBE, 	 0, 	 0, 0xDFB7, 0xB5F0							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_54[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xD3F5,      0, 0xB3D4, 0xB8F7,      0, 0xDFBA,      0, /* 0x00 */
-    0xBACF, 0xBCAA, 0xB5F5,      0, 0xCDAC, 0xC3FB, 0xE1E1, 0xC0F4, /* 0x00 */
-    0xCDC2, 0xCFF2, 0xDFB8,      0,      0, 0xC2C0, 0xDFB9,      0, /* 0x10 */
-         0,      0,      0, 0xBEFD,      0, 0xC1DF, 0xCDCC, 0xD2F7, /* 0x10 */
-    0xB7CD, 0xDFC1,      0, 0xDFC4,      0,      0, 0xB7F1, 0xB0C9, /* 0x20 */
-         0, 0xB7D4,      0, 0xBAAC,      0, 0xBFD4, 0xCBB1,      0, /* 0x20 */
-         0, 0xD6A8, 0xDFC5,      0, 0xCEE2, 0xB3B3,      0,      0, /* 0x30 */
-    0xCEFC, 0xB4B5,      0, 0xCEC7, 0xBAF0,      0, 0xCEE1,      0, /* 0x30 */
-    0xD1BD,      0,      0, 0xDFC0,      0,      0, 0xB4F4,      0, /* 0x40 */
-    0xB3CA,      0, 0xB8E6, 0xDFBB,      0,      0,      0,      0, /* 0x40 */
-    0xC4C5,      0,      0,      0, 0xDFBE,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xC4D8,      0, 0xDFCA,      0, 0xDFCF,      0, /* 0x60 */
-    0xD6DC,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xDFC9, 0xDFDA, 0xCEB6,      0, 0xBAC7, 0xDFCE, 0xDFC8, /* 0x70 */
-    0xC5DE,      0,      0, 0xC9EB, 0xBAF4, 0xC3FC,      0,      0, /* 0x70 */
-    0xBED7,      0, 0xDFC6,      0, 0xDFCD,      0, 0xC5D8,      0, /* 0x80 */
-         0,      0,      0, 0xD5A6, 0xBACD,      0, 0xBECC, 0xD3BD, /* 0x80 */
-    0xB8C0,      0, 0xD6E4,      0, 0xDFC7, 0xB9BE, 0xBFA7,      0, /* 0x90 */
-         0,      0, 0xDFCB,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xDFDB, 0xDFE5,      0, 0xDFD7, 0xDFD6, /* 0xA0 */
-    0xD7C9, 0xDFE3, 0xDFE4, 0xE5EB, 0xD2A7, 0xDFD2,      0, 0xBFA9, /* 0xA0 */
-         0, 0xD4DB,      0, 0xBFC8, 0xDFD4,      0,      0,      0, /* 0xB0 */
-    0xCFCC,      0,      0, 0xDFDD, 0xDFC3, 0xD1CA,      0, 0xDFDE, /* 0xB0 */
-    0xB0A7, 0xC6B7, 0xDFD3,      0, 0xBAE5,      0, 0xB6DF, 0xCDDB, /* 0xC0 */
-    0xB9FE, 0xD4D5,      0,      0, 0xDFDF,      0, 0xB0A5, 0xDFE7, /* 0xC0 */
-    0xDFD1,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xDFE1,      0,      0,      0, 0xDFE8,      0, /* 0xD0 */
-         0, 0xD4B1,      0,      0,      0, 0xB8E7, 0xC5B6, 0xDFEA, /* 0xE0 */
-    0xC9DA, 0xC1A8, 0xC4C4,      0,      0, 0xBFDE, 0xCFF8,      0, /* 0xE0 */
-         0,      0, 0xD5DC, 0xDFEE,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xB2B8,      0, 0xBADF, 0xDFEC,      0, 0xDBC1  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xD3F5, 	 0, 0xB3D4, 0xB8F7, 	 0, 0xDFBA, 	 0, /* 0x00 */
+    0xBACF, 0xBCAA, 0xB5F5, 	 0, 0xCDAC, 0xC3FB, 0xE1E1, 0xC0F4, /* 0x00 */
+    0xCDC2, 0xCFF2, 0xDFB8, 	 0, 	 0, 0xC2C0, 0xDFB9, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xBEFD, 	 0, 0xC1DF, 0xCDCC, 0xD2F7, /* 0x10 */
+    0xB7CD, 0xDFC1, 	 0, 0xDFC4, 	 0, 	 0, 0xB7F1, 0xB0C9, /* 0x20 */
+         0, 0xB7D4, 	 0, 0xBAAC, 	 0, 0xBFD4, 0xCBB1, 	 0, /* 0x20 */
+         0, 0xD6A8, 0xDFC5, 	 0, 0xCEE2, 0xB3B3, 	 0, 	 0, /* 0x30 */
+    0xCEFC, 0xB4B5, 	 0, 0xCEC7, 0xBAF0, 	 0, 0xCEE1, 	 0, /* 0x30 */
+    0xD1BD, 	 0, 	 0, 0xDFC0, 	 0, 	 0, 0xB4F4, 	 0, /* 0x40 */
+    0xB3CA, 	 0, 0xB8E6, 0xDFBB, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xC4C5, 	 0, 	 0, 	 0, 0xDFBE, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xC4D8, 	 0, 0xDFCA, 	 0, 0xDFCF, 	 0, /* 0x60 */
+    0xD6DC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xDFC9, 0xDFDA, 0xCEB6, 	 0, 0xBAC7, 0xDFCE, 0xDFC8, /* 0x70 */
+    0xC5DE, 	 0, 	 0, 0xC9EB, 0xBAF4, 0xC3FC, 	 0, 	 0, /* 0x70 */
+    0xBED7, 	 0, 0xDFC6, 	 0, 0xDFCD, 	 0, 0xC5D8, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xD5A6, 0xBACD, 	 0, 0xBECC, 0xD3BD, /* 0x80 */
+    0xB8C0, 	 0, 0xD6E4, 	 0, 0xDFC7, 0xB9BE, 0xBFA7, 	 0, /* 0x90 */
+         0, 	 0, 0xDFCB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xDFDB, 0xDFE5, 	 0, 0xDFD7, 0xDFD6, /* 0xA0 */
+    0xD7C9, 0xDFE3, 0xDFE4, 0xE5EB, 0xD2A7, 0xDFD2, 	 0, 0xBFA9, /* 0xA0 */
+         0, 0xD4DB, 	 0, 0xBFC8, 0xDFD4, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xCFCC, 	 0, 	 0, 0xDFDD, 0xDFC3, 0xD1CA, 	 0, 0xDFDE, /* 0xB0 */
+    0xB0A7, 0xC6B7, 0xDFD3, 	 0, 0xBAE5, 	 0, 0xB6DF, 0xCDDB, /* 0xC0 */
+    0xB9FE, 0xD4D5, 	 0, 	 0, 0xDFDF, 	 0, 0xB0A5, 0xDFE7, /* 0xC0 */
+    0xDFD1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xDFE1, 	 0, 	 0, 	 0, 0xDFE8, 	 0, /* 0xD0 */
+         0, 0xD4B1, 	 0, 	 0, 	 0, 0xB8E7, 0xC5B6, 0xDFEA, /* 0xE0 */
+    0xC9DA, 0xC1A8, 0xC4C4, 	 0, 	 0, 0xBFDE, 0xCFF8, 	 0, /* 0xE0 */
+         0, 	 0, 0xD5DC, 0xDFEE, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xB2B8, 	 0, 0xBADF, 0xDFEC, 	 0, 0xDBC1	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_55[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xD1E4,      0,      0, 0xDFC2,      0, 0xCBF4, 0xB4BD, /* 0x00 */
-         0, 0xB0A6,      0,      0,      0,      0,      0, 0xDFF1, /* 0x00 */
-    0xCCC6, 0xDFF2,      0,      0, 0xDFED,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xDFF0,      0,      0,      0, 0xDFF3, /* 0x20 */
-         0,      0, 0xDFF4,      0, 0xBBA3,      0, 0xCADB, 0xCEA8, /* 0x20 */
-    0xE0A7, 0xB3AA,      0, 0xE0A6,      0,      0,      0, 0xE0A1, /* 0x30 */
-         0,      0,      0,      0, 0xDFFE,      0, 0xCDD9, 0xDFFC, /* 0x30 */
-         0, 0xDFFA,      0, 0xBFD0, 0xD7C4,      0, 0xC9CC,      0, /* 0x40 */
-         0, 0xDFF8, 0xB0A1,      0,      0,      0,      0, 0xCECA, /* 0x40 */
-    0xDFFD,      0,      0, 0xC6F4,      0, 0xDFFB, 0xE0A2,      0, /* 0x50 */
-         0,      0,      0,      0, 0xE0A8,      0, 0xD1C6,      0, /* 0x50 */
-         0, 0xB7C8,      0,      0, 0xC6A1, 0xC9B6, 0xC0B2,      0, /* 0x60 */
-         0,      0, 0xC5BE,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xE0A3, 0xE0A4, 0xE0A5, /* 0x70 */
-         0,      0,      0, 0xE0B4, 0xCCE4,      0, 0xE0B1,      0, /* 0x70 */
-    0xBFA6, 0xE0AF, 0xCEB9, 0xE0AB, 0xC9C6,      0,      0, 0xC0AE, /* 0x80 */
-    0xE0AE, 0xBAED, 0xBAB0, 0xE0A9,      0,      0,      0, 0xDFF6, /* 0x80 */
-         0, 0xE0B3,      0,      0, 0xE0B8,      0,      0,      0, /* 0x90 */
-    0xB4AD, 0xE0B9, 0xBBBD,      0, 0xCFB2, 0xBAC8,      0, 0xE0B0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xD0FA, /* 0xA0 */
-         0,      0, 0xC9A5,      0, 0xC7C7,      0, 0xB5A5,      0, /* 0xA0 */
-         0, 0xE0AC, 0xD3B4, 0xD4FB,      0, 0xDFF7,      0,      0, /* 0xB0 */
-         0, 0xE0AD,      0, 0xD3F7,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xE0C4, 0xD0E1, 0xC7BA, 0xD8C4, /* 0xC0 */
-         0, 0xE0BC,      0,      0, 0xE0C9, 0xE0CA, 0xC2F0,      0, /* 0xC0 */
-         0, 0xE0BE, 0xE0AA, 0xC9A4, 0xE0C1,      0, 0xE0B2,      0, /* 0xD0 */
-         0,      0, 0xCED8,      0, 0xCAC8, 0xE0C3,      0, 0xE0B5, /* 0xD0 */
-         0, 0xCECB,      0, 0xCBC3, 0xE0CD, 0xE0C6, 0xE0C2,      0, /* 0xE0 */
-    0xE0CB, 0xDFEF, 0xE0BA,      0, 0xE0C0,      0,      0, 0xE0C5, /* 0xE0 */
-         0,      0, 0xE0C7,      0,      0, 0xE0CC, 0xDFD9, 0xE0BB, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xCBD4, 0xE0D5          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xD1E4, 	 0, 	 0, 0xDFC2, 	 0, 0xCBF4, 0xB4BD, /* 0x00 */
+         0, 0xB0A6, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDFF1, /* 0x00 */
+    0xCCC6, 0xDFF2, 	 0, 	 0, 0xDFED, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xDFF0, 	 0, 	 0, 	 0, 0xDFF3, /* 0x20 */
+         0, 	 0, 0xDFF4, 	 0, 0xBBA3, 	 0, 0xCADB, 0xCEA8, /* 0x20 */
+    0xE0A7, 0xB3AA, 	 0, 0xE0A6, 	 0, 	 0, 	 0, 0xE0A1, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xDFFE, 	 0, 0xCDD9, 0xDFFC, /* 0x30 */
+         0, 0xDFFA, 	 0, 0xBFD0, 0xD7C4, 	 0, 0xC9CC, 	 0, /* 0x40 */
+         0, 0xDFF8, 0xB0A1, 	 0, 	 0, 	 0, 	 0, 0xCECA, /* 0x40 */
+    0xDFFD, 	 0, 	 0, 0xC6F4, 	 0, 0xDFFB, 0xE0A2, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xE0A8, 	 0, 0xD1C6, 	 0, /* 0x50 */
+         0, 0xB7C8, 	 0, 	 0, 0xC6A1, 0xC9B6, 0xC0B2, 	 0, /* 0x60 */
+         0, 	 0, 0xC5BE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE0A3, 0xE0A4, 0xE0A5, /* 0x70 */
+         0, 	 0, 	 0, 0xE0B4, 0xCCE4, 	 0, 0xE0B1, 	 0, /* 0x70 */
+    0xBFA6, 0xE0AF, 0xCEB9, 0xE0AB, 0xC9C6, 	 0, 	 0, 0xC0AE, /* 0x80 */
+    0xE0AE, 0xBAED, 0xBAB0, 0xE0A9, 	 0, 	 0, 	 0, 0xDFF6, /* 0x80 */
+         0, 0xE0B3, 	 0, 	 0, 0xE0B8, 	 0, 	 0, 	 0, /* 0x90 */
+    0xB4AD, 0xE0B9, 0xBBBD, 	 0, 0xCFB2, 0xBAC8, 	 0, 0xE0B0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD0FA, /* 0xA0 */
+         0, 	 0, 0xC9A5, 	 0, 0xC7C7, 	 0, 0xB5A5, 	 0, /* 0xA0 */
+         0, 0xE0AC, 0xD3B4, 0xD4FB, 	 0, 0xDFF7, 	 0, 	 0, /* 0xB0 */
+         0, 0xE0AD, 	 0, 0xD3F7, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xE0C4, 0xD0E1, 0xC7BA, 0xD8C4, /* 0xC0 */
+         0, 0xE0BC, 	 0, 	 0, 0xE0C9, 0xE0CA, 0xC2F0, 	 0, /* 0xC0 */
+         0, 0xE0BE, 0xE0AA, 0xC9A4, 0xE0C1, 	 0, 0xE0B2, 	 0, /* 0xD0 */
+         0, 	 0, 0xCED8, 	 0, 0xCAC8, 0xE0C3, 	 0, 0xE0B5, /* 0xD0 */
+         0, 0xCECB, 	 0, 0xCBC3, 0xE0CD, 0xE0C6, 0xE0C2, 	 0, /* 0xE0 */
+    0xE0CB, 0xDFEF, 0xE0BA, 	 0, 0xE0C0, 	 0, 	 0, 0xE0C5, /* 0xE0 */
+         0, 	 0, 0xE0C7, 	 0, 	 0, 0xE0CC, 0xDFD9, 0xE0BB, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCBD4, 0xE0D5			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_56[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE0D6, 0xE0D2,      0,      0,      0,      0, 0xCCBE,      0, /* 0x00 */
-    0xE0D0, 0xBCCE,      0,      0, 0xE0D1, 0xE0B6, 0xB8C2, 0xD8C5, /* 0x00 */
-         0,      0,      0,      0, 0xC5BB,      0, 0xDFF5, 0xB3A2, /* 0x10 */
-    0xD0EA,      0,      0, 0xC2EF, 0xDFE9,      0, 0xE0CF, 0xE0BD, /* 0x10 */
-         0,      0,      0, 0xE0D4,      0,      0,      0, 0xE0D7, /* 0x20 */
-         0, 0xBBA9,      0,      0, 0xE0DC, 0xE0D8, 0xDFEB, 0xD0A5, /* 0x20 */
-    0xDFB4,      0, 0xB3B0,      0, 0xD7EC, 0xDFD8, 0xCBBB,      0, /* 0x30 */
-    0xDFBC, 0xE0DA,      0, 0xCEFB,      0,      0,      0, 0xBAD9, /* 0x30 */
-         0, 0xF8B0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xE0E1, 0xE0DD, 0xD2AD,      0, /* 0x40 */
-         0,      0,      0,      0, 0xE0E2,      0,      0, 0xE0DB, /* 0x50 */
-    0xE0D9, 0xE0DF,      0,      0,      0, 0xDFD0,      0,      0, /* 0x50 */
-    0xDFD5,      0, 0xE0DE,      0, 0xE0E4, 0xDFE6, 0xDFDC,      0, /* 0x60 */
-    0xC6F7, 0xD8AC, 0xD4EB, 0xE0E6, 0xCAC9,      0,      0, 0xE0C8, /* 0x60 */
-         0, 0xE0E5, 0xDFE0,      0, 0xC5E7,      0, 0xB8C1,      0, /* 0x70 */
-    0xB6D6, 0xF8AB,      0, 0xE0E7, 0xE0E8,      0,      0,      0, /* 0x70 */
-    0xDFCC,      0,      0,      0,      0, 0xE0E9, 0xE0E3, 0xCFC5, /* 0x80 */
-         0,      0,      0,      0, 0xDFE2,      0, 0xBABF, 0xCCE7, /* 0x80 */
-         0,      0,      0, 0xE0EA,      0, 0xE0E0,      0,      0, /* 0x90 */
-         0, 0xC4F6,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0xDFBF,      0, /* 0xA0 */
-    0xC1FC,      0,      0,      0,      0,      0, 0xF8F5, 0xE0EB, /* 0xA0 */
-         0,      0,      0, 0xE0B7, 0xD1CF,      0, 0xE0D3, 0xC8C2, /* 0xB0 */
-         0,      0,      0,      0, 0xBDC0,      0,      0,      0, /* 0xB0 */
-    0xDFF9, 0xE0BF, 0xCFF9,      0,      0, 0xD9E6,      0,      0, /* 0xC0 */
-    0xDFBD, 0xF8D3, 0xC4D2,      0, 0xF8EA,      0,      0,      0, /* 0xC0 */
-         0, 0xD6F6,      0,      0, 0xE0EC,      0,      0, 0xE0ED, /* 0xD0 */
-         0,      0, 0xC7F4, 0xCBC4,      0, 0xE0EE, 0xBBD8, 0xD8B6, /* 0xD0 */
-    0xD2F2, 0xE0EF,      0,      0, 0xB6DA,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xE0F1,      0,      0,      0,      0, /* 0xE0 */
-    0xC0A7, 0xB4D1,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xE0F2, 0xB9CC,      0,      0,      0,      0, 0xE0F3  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE0D6, 0xE0D2, 	 0, 	 0, 	 0, 	 0, 0xCCBE, 	 0, /* 0x00 */
+    0xE0D0, 0xBCCE, 	 0, 	 0, 0xE0D1, 0xE0B6, 0xB8C2, 0xD8C5, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xC5BB, 	 0, 0xDFF5, 0xB3A2, /* 0x10 */
+    0xD0EA, 	 0, 	 0, 0xC2EF, 0xDFE9, 	 0, 0xE0CF, 0xE0BD, /* 0x10 */
+         0, 	 0, 	 0, 0xE0D4, 	 0, 	 0, 	 0, 0xE0D7, /* 0x20 */
+         0, 0xBBA9, 	 0, 	 0, 0xE0DC, 0xE0D8, 0xDFEB, 0xD0A5, /* 0x20 */
+    0xDFB4, 	 0, 0xB3B0, 	 0, 0xD7EC, 0xDFD8, 0xCBBB, 	 0, /* 0x30 */
+    0xDFBC, 0xE0DA, 	 0, 0xCEFB, 	 0, 	 0, 	 0, 0xBAD9, /* 0x30 */
+         0, 0xF8B0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xE0E1, 0xE0DD, 0xD2AD, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xE0E2, 	 0, 	 0, 0xE0DB, /* 0x50 */
+    0xE0D9, 0xE0DF, 	 0, 	 0, 	 0, 0xDFD0, 	 0, 	 0, /* 0x50 */
+    0xDFD5, 	 0, 0xE0DE, 	 0, 0xE0E4, 0xDFE6, 0xDFDC, 	 0, /* 0x60 */
+    0xC6F7, 0xD8AC, 0xD4EB, 0xE0E6, 0xCAC9, 	 0, 	 0, 0xE0C8, /* 0x60 */
+         0, 0xE0E5, 0xDFE0, 	 0, 0xC5E7, 	 0, 0xB8C1, 	 0, /* 0x70 */
+    0xB6D6, 0xF8AB, 	 0, 0xE0E7, 0xE0E8, 	 0, 	 0, 	 0, /* 0x70 */
+    0xDFCC, 	 0, 	 0, 	 0, 	 0, 0xE0E9, 0xE0E3, 0xCFC5, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xDFE2, 	 0, 0xBABF, 0xCCE7, /* 0x80 */
+         0, 	 0, 	 0, 0xE0EA, 	 0, 0xE0E0, 	 0, 	 0, /* 0x90 */
+         0, 0xC4F6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDFBF, 	 0, /* 0xA0 */
+    0xC1FC, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF8F5, 0xE0EB, /* 0xA0 */
+         0, 	 0, 	 0, 0xE0B7, 0xD1CF, 	 0, 0xE0D3, 0xC8C2, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xBDC0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xDFF9, 0xE0BF, 0xCFF9, 	 0, 	 0, 0xD9E6, 	 0, 	 0, /* 0xC0 */
+    0xDFBD, 0xF8D3, 0xC4D2, 	 0, 0xF8EA, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xD6F6, 	 0, 	 0, 0xE0EC, 	 0, 	 0, 0xE0ED, /* 0xD0 */
+         0, 	 0, 0xC7F4, 0xCBC4, 	 0, 0xE0EE, 0xBBD8, 0xD8B6, /* 0xD0 */
+    0xD2F2, 0xE0EF, 	 0, 	 0, 0xB6DA, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xE0F1, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xC0A7, 0xB4D1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xE0F2, 0xB9CC, 	 0, 	 0, 	 0, 	 0, 0xE0F3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_57[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xC6D4, 0xE0F4,      0,      0, 0xE0F0, /* 0x00 */
-    0xC8A6, 0xE0F6, 0xE0F5, 0xB9FA,      0, 0xCEA7,      0,      0, /* 0x00 */
-         0,      0, 0xD4B0, 0xD4B2,      0,      0, 0xCDBC,      0, /* 0x10 */
-    0xCDC5,      0,      0,      0, 0xE0F7,      0,      0, 0xCDC1, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xD4DA, 0xDBD7, 0xDBD9,      0, 0xDBD8, 0xB9E7, 0xDBDC, 0xDBDD, /* 0x20 */
-    0xB5D8,      0,      0, 0xDBDA,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xDBDF,      0,      0, 0xBBF8,      0, /* 0x30 */
-    0xD6B7,      0, 0xDBE0,      0,      0,      0,      0, 0xBEF9, /* 0x40 */
-         0,      0, 0xB7BB,      0, 0xDBD0, 0xCCAE, 0xBFB2,      0, /* 0x40 */
-    0xD7F8, 0xBFD3,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xC6C2,      0,      0, 0xC0A4,      0, 0xCCB9,      0, /* 0x60 */
-    0xDBE7, 0xDBE1, 0xC6BA, 0xDBE3,      0, 0xDBE8,      0, 0xC5F7, /* 0x60 */
-         0,      0,      0, 0xDBEA,      0,      0, 0xDBE9, 0xBFC0, /* 0x70 */
-         0,      0,      0, 0xDBE6, 0xDBE5,      0,      0,      0, /* 0x70 */
-         0,      0, 0xB4B9, 0xC0AC,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xD0CD, 0xDBED,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xDBF2,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xB6E2,      0,      0,      0,      0, /* 0x90 */
-    0xDBF3, 0xDBD2, 0xB9B8, 0xD4AB, 0xDBEC,      0,      0, 0xDBF0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xBFE5,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xDBF9,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xB9A1, 0xB0A3,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xC2F1,      0,      0, 0xB3C7, 0xDBEF, /* 0xC0 */
-         0,      0, 0xDBF8,      0, 0xC6D2, 0xDBF4,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xDBFE,      0, 0xD3F2, /* 0xD0 */
-    0xB2BA, 0xDBEB,      0,      0, 0xDBFD,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xDCA4,      0, 0xDBFB, /* 0xE0 */
-         0,      0,      0,      0, 0xDBFA,      0,      0, 0xD6B4, /* 0xF0 */
-    0xDBFC, 0xC5E0, 0xBBF9,      0,      0, 0xDCA3                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xC6D4, 0xE0F4, 	 0, 	 0, 0xE0F0, /* 0x00 */
+    0xC8A6, 0xE0F6, 0xE0F5, 0xB9FA, 	 0, 0xCEA7, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xD4B0, 0xD4B2, 	 0, 	 0, 0xCDBC, 	 0, /* 0x10 */
+    0xCDC5, 	 0, 	 0, 	 0, 0xE0F7, 	 0, 	 0, 0xCDC1, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xD4DA, 0xDBD7, 0xDBD9, 	 0, 0xDBD8, 0xB9E7, 0xDBDC, 0xDBDD, /* 0x20 */
+    0xB5D8, 	 0, 	 0, 0xDBDA, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xDBDF, 	 0, 	 0, 0xBBF8, 	 0, /* 0x30 */
+    0xD6B7, 	 0, 0xDBE0, 	 0, 	 0, 	 0, 	 0, 0xBEF9, /* 0x40 */
+         0, 	 0, 0xB7BB, 	 0, 0xDBD0, 0xCCAE, 0xBFB2, 	 0, /* 0x40 */
+    0xD7F8, 0xBFD3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xC6C2, 	 0, 	 0, 0xC0A4, 	 0, 0xCCB9, 	 0, /* 0x60 */
+    0xDBE7, 0xDBE1, 0xC6BA, 0xDBE3, 	 0, 0xDBE8, 	 0, 0xC5F7, /* 0x60 */
+         0, 	 0, 	 0, 0xDBEA, 	 0, 	 0, 0xDBE9, 0xBFC0, /* 0x70 */
+         0, 	 0, 	 0, 0xDBE6, 0xDBE5, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xB4B9, 0xC0AC, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xD0CD, 0xDBED, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xDBF2, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xB6E2, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xDBF3, 0xDBD2, 0xB9B8, 0xD4AB, 0xDBEC, 	 0, 	 0, 0xDBF0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBFE5, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xDBF9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xB9A1, 0xB0A3, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xC2F1, 	 0, 	 0, 0xB3C7, 0xDBEF, /* 0xC0 */
+         0, 	 0, 0xDBF8, 	 0, 0xC6D2, 0xDBF4, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDBFE, 	 0, 0xD3F2, /* 0xD0 */
+    0xB2BA, 0xDBEB, 	 0, 	 0, 0xDBFD, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDCA4, 	 0, 0xDBFB, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xDBFA, 	 0, 	 0, 0xD6B4, /* 0xF0 */
+    0xDBFC, 0xC5E0, 0xBBF9, 	 0, 	 0, 0xDCA3					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_58[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xDCA5,      0, 0xCCC3,      0,      0, 0xBCE1, 0xB6D1, 0xDDC0, /* 0x00 */
-         0,      0, 0xDBD1, 0xDCA1,      0, 0xDCA2,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xDBF1,      0, /* 0x10 */
-         0, 0xDCA7,      0,      0,      0, 0xDBF6, 0xDCA6,      0, /* 0x10 */
-    0xDCA9, 0xB1A4,      0,      0, 0xB5CC,      0,      0,      0, /* 0x20 */
-         0,      0, 0xBFB0,      0,      0,      0,      0, 0xD2A2, /* 0x20 */
-    0xD1DF, 0xB1A8,      0,      0, 0xB3A1, 0xB6C2,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xDCA8,      0,      0,      0, /* 0x40 */
-         0,      0, 0xBFE9, 0xDCE3, 0xCBFA, 0xEBF3,      0, 0xDBEE, /* 0x40 */
-         0, 0xCBDC, 0xDBF5,      0, 0xCBFE,      0,      0, 0xCDBF, /* 0x50 */
-    0xCCC1,      0,      0,      0,      0,      0, 0xC8FB,      0, /* 0x50 */
-         0,      0, 0xCEEB,      0, 0xDBF7, 0xDCAA,      0,      0, /* 0x60 */
-         0,      0,      0, 0xCCEE, 0xDCAB,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xB3BE,      0,      0, /* 0x70 */
-         0, 0xC7B5,      0,      0,      0,      0, 0xDBD3,      0, /* 0x70 */
-    0xDCAF, 0xDCAC,      0, 0xBEB3,      0, 0xCAFB,      0,      0, /* 0x80 */
-         0, 0xDCAD, 0xB5E6,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xC9CA, 0xC4B9,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xDCAE,      0, 0xD7B9,      0, 0xD4F6, 0xD0E6, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xC4AB, 0xB6D5,      0,      0,      0,      0, 0xB6E9,      0, /* 0xA0 */
-         0,      0,      0, 0xB7D8,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xC7BD, 0xDBD4,      0, 0xBFD1,      0, /* 0xB0 */
-         0, 0xB1DA,      0,      0,      0, 0xDBD5,      0, 0xCCB3, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xDBD6,      0, 0xD1B9,      0, 0xBABE,      0,      0, /* 0xD0 */
-    0xC0DD, 0xDBDB, 0xDBE4,      0,      0,      0, 0xBBB5, 0xC2A2, /* 0xD0 */
-    0xDBE2,      0, 0xDBDE,      0, 0xC8C0,      0,      0,      0, /* 0xE0 */
-         0, 0xB0D3,      0, 0xCABF, 0xC8C9,      0,      0, 0xD7B3, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xD2BC, 0xBAF8,      0,      0, 0xCAD9                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xDCA5, 	 0, 0xCCC3, 	 0, 	 0, 0xBCE1, 0xB6D1, 0xDDC0, /* 0x00 */
+         0, 	 0, 0xDBD1, 0xDCA1, 	 0, 0xDCA2, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDBF1, 	 0, /* 0x10 */
+         0, 0xDCA7, 	 0, 	 0, 	 0, 0xDBF6, 0xDCA6, 	 0, /* 0x10 */
+    0xDCA9, 0xB1A4, 	 0, 	 0, 0xB5CC, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xBFB0, 	 0, 	 0, 	 0, 	 0, 0xD2A2, /* 0x20 */
+    0xD1DF, 0xB1A8, 	 0, 	 0, 0xB3A1, 0xB6C2, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xDCA8, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xBFE9, 0xDCE3, 0xCBFA, 0xEBF3, 	 0, 0xDBEE, /* 0x40 */
+         0, 0xCBDC, 0xDBF5, 	 0, 0xCBFE, 	 0, 	 0, 0xCDBF, /* 0x50 */
+    0xCCC1, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC8FB, 	 0, /* 0x50 */
+         0, 	 0, 0xCEEB, 	 0, 0xDBF7, 0xDCAA, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xCCEE, 0xDCAB, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB3BE, 	 0, 	 0, /* 0x70 */
+         0, 0xC7B5, 	 0, 	 0, 	 0, 	 0, 0xDBD3, 	 0, /* 0x70 */
+    0xDCAF, 0xDCAC, 	 0, 0xBEB3, 	 0, 0xCAFB, 	 0, 	 0, /* 0x80 */
+         0, 0xDCAD, 0xB5E6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xC9CA, 0xC4B9, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xDCAE, 	 0, 0xD7B9, 	 0, 0xD4F6, 0xD0E6, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xC4AB, 0xB6D5, 	 0, 	 0, 	 0, 	 0, 0xB6E9, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xB7D8, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xC7BD, 0xDBD4, 	 0, 0xBFD1, 	 0, /* 0xB0 */
+         0, 0xB1DA, 	 0, 	 0, 	 0, 0xDBD5, 	 0, 0xCCB3, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xDBD6, 	 0, 0xD1B9, 	 0, 0xBABE, 	 0, 	 0, /* 0xD0 */
+    0xC0DD, 0xDBDB, 0xDBE4, 	 0, 	 0, 	 0, 0xBBB5, 0xC2A2, /* 0xD0 */
+    0xDBE2, 	 0, 0xDBDE, 	 0, 0xC8C0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xB0D3, 	 0, 0xCABF, 0xC8C9, 	 0, 	 0, 0xD7B3, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xD2BC, 0xBAF8, 	 0, 	 0, 0xCAD9					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_59[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xE2BA,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0, 0xCFC4, /* 0x00 */
-         0,      0,      0,      0, 0xD9E7, 0xCFA6, 0xCDE2,      0, /* 0x10 */
-         0, 0xD9ED, 0xB6E0,      0, 0xD2B9,      0,      0, 0xB9BB, /* 0x10 */
-         0,      0, 0xC3CE,      0, 0xE2B9, 0xE2B7,      0, 0xB4F3, /* 0x20 */
-         0, 0xCCEC, 0xCCAB, 0xB7F2,      0, 0xD8B2, 0xD1EB, 0xBABB, /* 0x20 */
-         0, 0xCAA7,      0,      0,      0,      0,      0, 0xD2C4, /* 0x30 */
-    0xF8C9,      0,      0,      0, 0xDEC5,      0, 0xBCD0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xD1D9,      0,      0, 0xC6E6, /* 0x40 */
-    0xC4CE, 0xB7EE,      0,      0,      0,      0, 0xBFFC, 0xD7E0, /* 0x40 */
-    0xDBBC, 0xC6F5,      0,      0, 0xB1BC, 0xDEC8,      0, 0xCCD7, /* 0x50 */
-    0xDECA,      0, 0xDEC9,      0,      0,      0,      0,      0, /* 0x50 */
-    0xB5EC,      0, 0xC9DD,      0,      0, 0xB0C2,      0,      0, /* 0x60 */
-         0, 0xDEC6, 0xB6E1,      0, 0xBDB1,      0, 0xB7DC,      0, /* 0x60 */
-         0,      0,      0, 0xC5AE, 0xC5AB,      0, 0xC4CC,      0, /* 0x70 */
-    0xBCE9, 0xCBFD,      0,      0,      0, 0xBAC3,      0,      0, /* 0x70 */
-         0, 0xE5F9, 0xC8E7, 0xE5FA, 0xCDFD,      0,      0,      0, /* 0x80 */
-         0,      0, 0xC8D1,      0,      0, 0xE5FB,      0,      0, /* 0x80 */
-         0,      0, 0xB6CA, 0xBCCB,      0,      0, 0xD1FD, 0xE6A1, /* 0x90 */
-         0, 0xC3EE,      0,      0,      0, 0xD7B1, 0xE6A4,      0, /* 0x90 */
-         0,      0,      0, 0xE5FE, 0xE6A5, 0xCDD7,      0,      0, /* 0xA0 */
-    0xB7C1,      0,      0,      0,      0,      0, 0xC4DD, 0xE6A8, /* 0xA0 */
-         0,      0, 0xE6A7,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xC3C3,      0, 0xC6DE,      0,      0, 0xE6AA,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xC4B7,      0, /* 0xC0 */
-         0,      0, 0xE6A2, 0xCABC,      0,      0,      0,      0, /* 0xC0 */
-    0xBDE3, 0xB9C3, 0xE6A6, 0xD0D5, 0xCEAF,      0,      0, 0xE6A9, /* 0xD0 */
-    0xE6B0,      0, 0xD2A6,      0, 0xBDAA, 0xE6AD,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xE6AF,      0, 0xC0D1,      0,      0, /* 0xE0 */
-    0xD2CC,      0,      0,      0, 0xBCA7,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xE6B1,      0, 0xD2F6,      0,      0,      0, 0xD7CB  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xE2BA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCFC4, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xD9E7, 0xCFA6, 0xCDE2, 	 0, /* 0x10 */
+         0, 0xD9ED, 0xB6E0, 	 0, 0xD2B9, 	 0, 	 0, 0xB9BB, /* 0x10 */
+         0, 	 0, 0xC3CE, 	 0, 0xE2B9, 0xE2B7, 	 0, 0xB4F3, /* 0x20 */
+         0, 0xCCEC, 0xCCAB, 0xB7F2, 	 0, 0xD8B2, 0xD1EB, 0xBABB, /* 0x20 */
+         0, 0xCAA7, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD2C4, /* 0x30 */
+    0xF8C9, 	 0, 	 0, 	 0, 0xDEC5, 	 0, 0xBCD0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xD1D9, 	 0, 	 0, 0xC6E6, /* 0x40 */
+    0xC4CE, 0xB7EE, 	 0, 	 0, 	 0, 	 0, 0xBFFC, 0xD7E0, /* 0x40 */
+    0xDBBC, 0xC6F5, 	 0, 	 0, 0xB1BC, 0xDEC8, 	 0, 0xCCD7, /* 0x50 */
+    0xDECA, 	 0, 0xDEC9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xB5EC, 	 0, 0xC9DD, 	 0, 	 0, 0xB0C2, 	 0, 	 0, /* 0x60 */
+         0, 0xDEC6, 0xB6E1, 	 0, 0xBDB1, 	 0, 0xB7DC, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xC5AE, 0xC5AB, 	 0, 0xC4CC, 	 0, /* 0x70 */
+    0xBCE9, 0xCBFD, 	 0, 	 0, 	 0, 0xBAC3, 	 0, 	 0, /* 0x70 */
+         0, 0xE5F9, 0xC8E7, 0xE5FA, 0xCDFD, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xC8D1, 	 0, 	 0, 0xE5FB, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xB6CA, 0xBCCB, 	 0, 	 0, 0xD1FD, 0xE6A1, /* 0x90 */
+         0, 0xC3EE, 	 0, 	 0, 	 0, 0xD7B1, 0xE6A4, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xE5FE, 0xE6A5, 0xCDD7, 	 0, 	 0, /* 0xA0 */
+    0xB7C1, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC4DD, 0xE6A8, /* 0xA0 */
+         0, 	 0, 0xE6A7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xC3C3, 	 0, 0xC6DE, 	 0, 	 0, 0xE6AA, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC4B7, 	 0, /* 0xC0 */
+         0, 	 0, 0xE6A2, 0xCABC, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xBDE3, 0xB9C3, 0xE6A6, 0xD0D5, 0xCEAF, 	 0, 	 0, 0xE6A9, /* 0xD0 */
+    0xE6B0, 	 0, 0xD2A6, 	 0, 0xBDAA, 0xE6AD, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xE6AF, 	 0, 0xC0D1, 	 0, 	 0, /* 0xE0 */
+    0xD2CC, 	 0, 	 0, 	 0, 0xBCA7, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xE6B1, 	 0, 0xD2F6, 	 0, 	 0, 	 0, 0xD7CB	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_5A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xCDFE,      0, 0xCDDE,      0,      0,      0,      0, /* 0x00 */
-         0, 0xE6B3,      0,      0, 0xE6B2,      0,      0,      0, /* 0x00 */
-         0, 0xE6B6,      0, 0xE6B8,      0,      0,      0,      0, /* 0x10 */
-    0xC4EF,      0,      0,      0, 0xC4C8,      0,      0, 0xBEEA, /* 0x10 */
-    0xC9EF,      0,      0, 0xE6B7,      0, 0xB6F0,      0,      0, /* 0x20 */
-         0, 0xC3E4,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xD3E9,      0,      0,      0,      0, 0xC8A2,      0, /* 0x30 */
-         0,      0,      0,      0, 0xE6BD,      0,      0,      0, /* 0x30 */
-    0xE6B9, 0xC2A6,      0,      0,      0,      0, 0xC6C5,      0, /* 0x40 */
-         0, 0xCDF1, 0xE6BB,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xE6BC,      0,      0, /* 0x50 */
-         0,      0, 0xBBE9,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xE6BE,      0,      0,      0, 0xB8BE, 0xE6BA, /* 0x60 */
-         0,      0, 0xC0B7,      0,      0, 0xE6AB,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0xE6C3, /* 0x70 */
-         0,      0, 0xE6C4,      0,      0,      0,      0, 0xD0F6, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xC3BD,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xC3C4, 0xE6C2,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xE6B4, /* 0xA0 */
-         0,      0, 0xE6C1,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xE6C7, 0xCFB1,      0, 0xEBF4,      0,      0, /* 0xB0 */
-    0xE6CA,      0,      0,      0,      0, 0xC2E8, 0xE6C5,      0, /* 0xB0 */
-         0, 0xBCDE, 0xC9A9,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xBCB5,      0,      0, 0xCFD3,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xE6CE, 0xE5FD, /* 0xD0 */
-    0xE6D0,      0,      0,      0, 0xE6D1,      0,      0,      0, /* 0xD0 */
-    0xE6CB, 0xB5D5,      0, 0xE6CC,      0,      0, 0xE6CF,      0, /* 0xE0 */
-         0, 0xC4DB,      0, 0xE6C6,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xE5FC,      0,      0, /* 0xF0 */
-         0,      0,      0, 0xE6B5                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xCDFE, 	 0, 0xCDDE, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xE6B3, 	 0, 	 0, 0xE6B2, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xE6B6, 	 0, 0xE6B8, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xC4EF, 	 0, 	 0, 	 0, 0xC4C8, 	 0, 	 0, 0xBEEA, /* 0x10 */
+    0xC9EF, 	 0, 	 0, 0xE6B7, 	 0, 0xB6F0, 	 0, 	 0, /* 0x20 */
+         0, 0xC3E4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xD3E9, 	 0, 	 0, 	 0, 	 0, 0xC8A2, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xE6BD, 	 0, 	 0, 	 0, /* 0x30 */
+    0xE6B9, 0xC2A6, 	 0, 	 0, 	 0, 	 0, 0xC6C5, 	 0, /* 0x40 */
+         0, 0xCDF1, 0xE6BB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE6BC, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xBBE9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xE6BE, 	 0, 	 0, 	 0, 0xB8BE, 0xE6BA, /* 0x60 */
+         0, 	 0, 0xC0B7, 	 0, 	 0, 0xE6AB, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6C3, /* 0x70 */
+         0, 	 0, 0xE6C4, 	 0, 	 0, 	 0, 	 0, 0xD0F6, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xC3BD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xC3C4, 0xE6C2, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6B4, /* 0xA0 */
+         0, 	 0, 0xE6C1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xE6C7, 0xCFB1, 	 0, 0xEBF4, 	 0, 	 0, /* 0xB0 */
+    0xE6CA, 	 0, 	 0, 	 0, 	 0, 0xC2E8, 0xE6C5, 	 0, /* 0xB0 */
+         0, 0xBCDE, 0xC9A9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xBCB5, 	 0, 	 0, 0xCFD3, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6CE, 0xE5FD, /* 0xD0 */
+    0xE6D0, 	 0, 	 0, 	 0, 0xE6D1, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE6CB, 0xB5D5, 	 0, 0xE6CC, 	 0, 	 0, 0xE6CF, 	 0, /* 0xE0 */
+         0, 0xC4DB, 	 0, 0xE6C6, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE5FC, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xE6B5									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_5B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE6A3,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0xE6AC, 0xE6D2,      0, 0xE6BF, 0xBDBF,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xE6D4, 0xE6D3, /* 0x10 */
-         0, 0xE6CD,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xE6C8,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xE6C9,      0,      0,      0,      0,      0, /* 0x20 */
-    0xD3A4,      0, 0xE6D5,      0, 0xD9F8,      0,      0, 0xE6D6, /* 0x30 */
-    0xC9F4,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xE6D7,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xE6AE,      0,      0,      0, /* 0x40 */
-    0xD7D3, 0xE6DD,      0, 0xE6DE, 0xBFD7, 0xD4D0,      0, 0xD7D6, /* 0x50 */
-    0xB4E6,      0, 0xE6DA, 0xD8C3, 0xD7CE, 0xD0A2,      0, 0xC3CF, /* 0x50 */
-         0,      0, 0xE6DF, 0xBCBE, 0xB9C2, 0xE6DB,      0,      0, /* 0x60 */
-         0, 0xBAA2,      0, 0xCBEF, 0xD8AB,      0,      0,      0, /* 0x60 */
-    0xCAEB, 0xE5EE,      0, 0xE6DC,      0, 0xB7F5,      0,      0, /* 0x70 */
-    0xD1A7,      0, 0xC8E6,      0,      0, 0xC4F5,      0, 0xC2CF, /* 0x70 */
-    0xE5B2,      0,      0, 0xCBFC, 0xE5B3, 0xD5AC,      0, 0xD3EE, /* 0x80 */
-    0xCAD8, 0xB0B2,      0, 0xCBCE, 0xCDEA,      0,      0, 0xBAEA, /* 0x80 */
-         0,      0,      0, 0xE5B5,      0, 0xE5B4,      0, 0xD7DA, /* 0x90 */
-    0xB9D9, 0xD6E6, 0xB6A8, 0xCDF0, 0xD2CB,      0,      0,      0, /* 0x90 */
-         0,      0, 0xBFCD, 0xD0FB, 0xCAD2, 0xE5B6, 0xBBC2,      0, /* 0xA0 */
-         0,      0,      0, 0xB9AC,      0,      0,      0,      0, /* 0xA0 */
-    0xD4D7,      0,      0, 0xBAA6, 0xD1E7, 0xCFFC, 0xBCD2,      0, /* 0xB0 */
-    0xE5B7, 0xC8DD,      0,      0,      0,      0,      0, 0xCBDE, /* 0xB0 */
-         0,      0, 0xBCC5,      0, 0xBCC4, 0xD2FA, 0xC3DC, 0xBFDC, /* 0xC0 */
-         0,      0,      0,      0, 0xB8BB,      0,      0,      0, /* 0xC0 */
-    0xC3C2,      0, 0xBAAE, 0xD4A2,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xC4AF, 0xB2EC, /* 0xD0 */
-         0, 0xB9D1, 0xC7DE,      0, 0xE5BB, 0xC1C8, 0xCAB5, 0xC4FE, /* 0xE0 */
-    0xD5AF, 0xC9F3,      0, 0xD0B4, 0xBFED,      0, 0xE5BC,      0, /* 0xE0 */
-    0xE5BE,      0,      0,      0,      0, 0xB3E8, 0xB1A6,      0, /* 0xF0 */
-    0xB4E7,      0, 0xCBC2                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE6A3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xE6AC, 0xE6D2, 	 0, 0xE6BF, 0xBDBF, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6D4, 0xE6D3, /* 0x10 */
+         0, 0xE6CD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xE6C8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xE6C9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xD3A4, 	 0, 0xE6D5, 	 0, 0xD9F8, 	 0, 	 0, 0xE6D6, /* 0x30 */
+    0xC9F4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xE6D7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xE6AE, 	 0, 	 0, 	 0, /* 0x40 */
+    0xD7D3, 0xE6DD, 	 0, 0xE6DE, 0xBFD7, 0xD4D0, 	 0, 0xD7D6, /* 0x50 */
+    0xB4E6, 	 0, 0xE6DA, 0xD8C3, 0xD7CE, 0xD0A2, 	 0, 0xC3CF, /* 0x50 */
+         0, 	 0, 0xE6DF, 0xBCBE, 0xB9C2, 0xE6DB, 	 0, 	 0, /* 0x60 */
+         0, 0xBAA2, 	 0, 0xCBEF, 0xD8AB, 	 0, 	 0, 	 0, /* 0x60 */
+    0xCAEB, 0xE5EE, 	 0, 0xE6DC, 	 0, 0xB7F5, 	 0, 	 0, /* 0x70 */
+    0xD1A7, 	 0, 0xC8E6, 	 0, 	 0, 0xC4F5, 	 0, 0xC2CF, /* 0x70 */
+    0xE5B2, 	 0, 	 0, 0xCBFC, 0xE5B3, 0xD5AC, 	 0, 0xD3EE, /* 0x80 */
+    0xCAD8, 0xB0B2, 	 0, 0xCBCE, 0xCDEA, 	 0, 	 0, 0xBAEA, /* 0x80 */
+         0, 	 0, 	 0, 0xE5B5, 	 0, 0xE5B4, 	 0, 0xD7DA, /* 0x90 */
+    0xB9D9, 0xD6E6, 0xB6A8, 0xCDF0, 0xD2CB, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xBFCD, 0xD0FB, 0xCAD2, 0xE5B6, 0xBBC2, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xB9AC, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xD4D7, 	 0, 	 0, 0xBAA6, 0xD1E7, 0xCFFC, 0xBCD2, 	 0, /* 0xB0 */
+    0xE5B7, 0xC8DD, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBDE, /* 0xB0 */
+         0, 	 0, 0xBCC5, 	 0, 0xBCC4, 0xD2FA, 0xC3DC, 0xBFDC, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xB8BB, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xC3C2, 	 0, 0xBAAE, 0xD4A2, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC4AF, 0xB2EC, /* 0xD0 */
+         0, 0xB9D1, 0xC7DE, 	 0, 0xE5BB, 0xC1C8, 0xCAB5, 0xC4FE, /* 0xE0 */
+    0xD5AF, 0xC9F3, 	 0, 0xD0B4, 0xBFED, 	 0, 0xE5BC, 	 0, /* 0xE0 */
+    0xE5BE, 	 0, 	 0, 	 0, 	 0, 0xB3E8, 0xB1A6, 	 0, /* 0xF0 */
+    0xB4E7, 	 0, 0xCBC2											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_5C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xB7E2,      0,      0, 0xC9E4,      0,      0, 0xBDAB, /* 0x00 */
-    0xD7A8, 0xCEBE, 0xD7F0, 0xD1B0,      0, 0xB6D4, 0xB5BC, 0xD0A1, /* 0x00 */
-         0, 0xC9D9,      0,      0,      0, 0xE6D8, 0xBCE2,      0, /* 0x10 */
-         0,      0, 0xC9D0,      0, 0xE6D9,      0,      0,      0, /* 0x10 */
-         0,      0, 0xDECC,      0, 0xD3C8, 0xDECD,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xDECE,      0,      0,      0, /* 0x20 */
-         0, 0xBECD,      0,      0,      0,      0,      0, 0xDECF, /* 0x30 */
-    0xCAAC, 0xD2FC, 0xB3DF, 0xE5EA, 0xC4E1,      0, 0xCEB2, 0xC4F2, /* 0x30 */
-    0xBED6, 0xC6A8,      0,      0,      0, 0xBED3,      0,      0, /* 0x40 */
-    0xC7FC, 0xCCEB, 0xBDEC, 0xCEDD,      0,      0, 0xCABA, 0xC6C1, /* 0x40 */
-    0xE5EC, 0xD0BC,      0,      0,      0, 0xD5B9,      0,      0, /* 0x50 */
-         0, 0xE5ED,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xCDC0,      0, 0xC2C5, 0xE5EF, 0xB2E3, 0xC2C4,      0,      0, /* 0x60 */
-    0xE5F0,      0,      0,      0, 0xCAF4,      0, 0xE5F8, 0xCDCD, /* 0x60 */
-         0, 0xC9BD,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xD2D9, 0xE1A8,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xE1AC,      0,      0,      0, 0xE1A7, 0xE1A9,      0,      0, /* 0x80 */
-    0xE1AA, 0xE1AF,      0,      0, 0xB2ED,      0,      0,      0, /* 0x90 */
-         0, 0xE1AE,      0,      0, 0xE1B1,      0,      0,      0, /* 0x90 */
-         0, 0xB8D4, 0xE1B3, 0xE1B8,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xD1D2,      0, 0xE1B6, 0xE1B5,      0,      0,      0, /* 0xA0 */
-         0, 0xE1B7,      0, 0xD4C0,      0, 0xE1B2,      0, 0xE1BA, /* 0xB0 */
-    0xB0B6,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE1B9,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xE1BE,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xE1BC,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xD6C5,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xB6EB,      0, 0xD3F8,      0,      0, 0xC7CD,      0,      0, /* 0xE0 */
-    0xB7E5,      0,      0,      0, 0xE1AD,      0, 0xB5BA,      0, /* 0xF0 */
-         0,      0,      0, 0xBEFE,      0, 0xCFBF                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xB7E2, 	 0, 	 0, 0xC9E4, 	 0, 	 0, 0xBDAB, /* 0x00 */
+    0xD7A8, 0xCEBE, 0xD7F0, 0xD1B0, 	 0, 0xB6D4, 0xB5BC, 0xD0A1, /* 0x00 */
+         0, 0xC9D9, 	 0, 	 0, 	 0, 0xE6D8, 0xBCE2, 	 0, /* 0x10 */
+         0, 	 0, 0xC9D0, 	 0, 0xE6D9, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xDECC, 	 0, 0xD3C8, 0xDECD, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xDECE, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xBECD, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDECF, /* 0x30 */
+    0xCAAC, 0xD2FC, 0xB3DF, 0xE5EA, 0xC4E1, 	 0, 0xCEB2, 0xC4F2, /* 0x30 */
+    0xBED6, 0xC6A8, 	 0, 	 0, 	 0, 0xBED3, 	 0, 	 0, /* 0x40 */
+    0xC7FC, 0xCCEB, 0xBDEC, 0xCEDD, 	 0, 	 0, 0xCABA, 0xC6C1, /* 0x40 */
+    0xE5EC, 0xD0BC, 	 0, 	 0, 	 0, 0xD5B9, 	 0, 	 0, /* 0x50 */
+         0, 0xE5ED, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xCDC0, 	 0, 0xC2C5, 0xE5EF, 0xB2E3, 0xC2C4, 	 0, 	 0, /* 0x60 */
+    0xE5F0, 	 0, 	 0, 	 0, 0xCAF4, 	 0, 0xE5F8, 0xCDCD, /* 0x60 */
+         0, 0xC9BD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xD2D9, 0xE1A8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE1AC, 	 0, 	 0, 	 0, 0xE1A7, 0xE1A9, 	 0, 	 0, /* 0x80 */
+    0xE1AA, 0xE1AF, 	 0, 	 0, 0xB2ED, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xE1AE, 	 0, 	 0, 0xE1B1, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xB8D4, 0xE1B3, 0xE1B8, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xD1D2, 	 0, 0xE1B6, 0xE1B5, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xE1B7, 	 0, 0xD4C0, 	 0, 0xE1B2, 	 0, 0xE1BA, /* 0xB0 */
+    0xB0B6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE1B9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xE1BE, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE1BC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xD6C5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xB6EB, 	 0, 0xD3F8, 	 0, 	 0, 0xC7CD, 	 0, 	 0, /* 0xE0 */
+    0xB7E5, 	 0, 	 0, 	 0, 0xE1AD, 	 0, 0xB5BA, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 0xBEFE, 	 0, 0xCFBF					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_5D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                     0xE1C7, 0xB3E7, /* 0x00 */
-         0,      0,      0,      0,      0, 0xE1C1, 0xC6E9,      0, /* 0x00 */
-         0,      0,      0,      0, 0xB4DE,      0, 0xD1C2, 0xB8DA, /* 0x10 */
-         0,      0,      0, 0xE1C8,      0,      0, 0xE1C6,      0, /* 0x10 */
-         0,      0, 0xE1BF,      0, 0xE1C5,      0, 0xE1C3, 0xE1C2, /* 0x20 */
-         0, 0xB1C0,      0,      0, 0xE1B4,      0, 0xE1C4,      0, /* 0x20 */
-         0,      0,      0,      0, 0xE1CB,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xE1CC, 0xE1CA,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xEFFA, /* 0x40 */
-         0,      0, 0xE1D3, 0xE1D2, 0xC7B6,      0,      0,      0, /* 0x40 */
-    0xE1B0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xE1CE,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xE1D4,      0, 0xE1D1, 0xE1CD,      0,      0, 0xE1CF, /* 0x60 */
-         0,      0,      0,      0, 0xE1D5,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xE1D0, 0xE1D6,      0, 0xD5B8,      0,      0, 0xE1AB, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0, 0xE1C0, /* 0x90 */
-         0, 0xE1D7,      0,      0,      0, 0xE1D8,      0,      0, /* 0x90 */
-    0xE1BD,      0,      0,      0,      0,      0,      0, 0xE1BB, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE1DA, /* 0xB0 */
-    0xE1C9,      0, 0xC1EB,      0, 0xD3EC,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xBFF9,      0, 0xCEA1,      0,      0, /* 0xC0 */
-         0,      0, 0xC2CD,      0, 0xE1DB,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xE7DD,      0, 0xB4A8, 0xD6DD,      0, /* 0xD0 */
-         0, 0xD1B2, 0xB3B2,      0,      0, 0xB9A4, 0xD7F3, 0xC7C9, /* 0xE0 */
-    0xBEDE,      0,      0, 0xCED7,      0,      0, 0xB2EE,      0, /* 0xE0 */
-    0xDBCF, 0xBCBA, 0xD2D1, 0xCBC8, 0xB0CD,      0,      0, 0xCFEF, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xD9E3, 0xBDED          /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE1C1, 0xC6E9, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xB4DE, 	 0, 0xD1C2, 0xB8DA, /* 0x10 */
+         0, 	 0, 	 0, 0xE1C8, 	 0, 	 0, 0xE1C6, 	 0, /* 0x10 */
+         0, 	 0, 0xE1BF, 	 0, 0xE1C5, 	 0, 0xE1C3, 0xE1C2, /* 0x20 */
+         0, 0xB1C0, 	 0, 	 0, 0xE1B4, 	 0, 0xE1C4, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xE1CB, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE1CC, 0xE1CA, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEFFA, /* 0x40 */
+         0, 	 0, 0xE1D3, 0xE1D2, 0xC7B6, 	 0, 	 0, 	 0, /* 0x40 */
+    0xE1B0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xE1CE, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xE1D4, 	 0, 0xE1D1, 0xE1CD, 	 0, 	 0, 0xE1CF, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xE1D5, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xE1D0, 0xE1D6, 	 0, 0xD5B8, 	 0, 	 0, 0xE1AB, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1C0, /* 0x90 */
+         0, 0xE1D7, 	 0, 	 0, 	 0, 0xE1D8, 	 0, 	 0, /* 0x90 */
+    0xE1BD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1BB, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE1DA, /* 0xB0 */
+    0xE1C9, 	 0, 0xC1EB, 	 0, 0xD3EC, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xBFF9, 	 0, 0xCEA1, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xC2CD, 	 0, 0xE1DB, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xE7DD, 	 0, 0xB4A8, 0xD6DD, 	 0, /* 0xD0 */
+         0, 0xD1B2, 0xB3B2, 	 0, 	 0, 0xB9A4, 0xD7F3, 0xC7C9, /* 0xE0 */
+    0xBEDE, 	 0, 	 0, 0xCED7, 	 0, 	 0, 0xB2EE, 	 0, /* 0xE0 */
+    0xDBCF, 0xBCBA, 0xD2D1, 0xCBC8, 0xB0CD, 	 0, 	 0, 0xCFEF, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD9E3, 0xBDED			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_5E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xCAD0, 0xB2BC,      0,      0, 0xB7AB,      0, /* 0x00 */
-         0,      0,      0,      0, 0xCFA3,      0,      0,      0, /* 0x00 */
-         0, 0xE0FB,      0,      0, 0xE0FA, 0xC5C1, 0xCCFB,      0, /* 0x10 */
-    0xF8D0, 0xE0F9, 0xD6E3, 0xB2AF,      0, 0xB5DB,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xCBA7,      0,      0, /* 0x20 */
-         0,      0,      0, 0xCAA6,      0, 0xCFAF,      0,      0, /* 0x20 */
-         0,      0,      0, 0xD5CA,      0,      0, 0xB4F8, 0xE1A1, /* 0x30 */
-    0xB3A3,      0,      0,      0,      0, 0xC3B1,      0,      0, /* 0x30 */
-    0xD6A1,      0, 0xC3DD, 0xE0F8, 0xE1A2, 0xB7F9,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xBBCF,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xE1A3, 0xC4BB,      0, 0xE0FE, /* 0x50 */
-    0xE0FD,      0,      0, 0xE1A4,      0,      0, 0xE1A5, 0xD6C4, /* 0x50 */
-         0, 0xE1A6, 0xB4B1, 0xB1D2,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xB0EF, 0xE0FC,      0,      0,      0, /* 0x60 */
-         0,      0, 0xF8B5, 0xC6BD, 0xC4EA,      0, 0xB2A2,      0, /* 0x70 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xCAD0, 0xB2BC, 	 0, 	 0, 0xB7AB, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xCFA3, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xE0FB, 	 0, 	 0, 0xE0FA, 0xC5C1, 0xCCFB, 	 0, /* 0x10 */
+    0xF8D0, 0xE0F9, 0xD6E3, 0xB2AF, 	 0, 0xB5DB, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCBA7, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xCAA6, 	 0, 0xCFAF, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xD5CA, 	 0, 	 0, 0xB4F8, 0xE1A1, /* 0x30 */
+    0xB3A3, 	 0, 	 0, 	 0, 	 0, 0xC3B1, 	 0, 	 0, /* 0x30 */
+    0xD6A1, 	 0, 0xC3DD, 0xE0F8, 0xE1A2, 0xB7F9, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xBBCF, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xE1A3, 0xC4BB, 	 0, 0xE0FE, /* 0x50 */
+    0xE0FD, 	 0, 	 0, 0xE1A4, 	 0, 	 0, 0xE1A5, 0xD6C4, /* 0x50 */
+         0, 0xE1A6, 0xB4B1, 0xB1D2, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xB0EF, 0xE0FC, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xF8B5, 0xC6BD, 0xC4EA, 	 0, 0xB2A2, 	 0, /* 0x70 */
     0xD0D2, 0xB8C9, 0xE7DB, 0xBBC3, 0xD3D7, 0xD3C4, 0xBCB8, 0xF8B8, /* 0x70 */
-    0xE2CF,      0,      0,      0,      0,      0,      0, 0xB1D3, /* 0x80 */
-         0,      0, 0xB4B2, 0xE2D1,      0,      0,      0, 0xD0F2, /* 0x80 */
-         0,      0,      0,      0,      0, 0xB5D7, 0xE2D2, 0xB5EA, /* 0x90 */
-         0,      0, 0xB8FD,      0, 0xB8AE,      0,      0,      0, /* 0x90 */
-    0xE2D4,      0,      0,      0,      0, 0xE2D3, 0xB6C8, 0xD7F9, /* 0xA0 */
-         0,      0,      0, 0xBFE2,      0, 0xCDA5,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xE2D8,      0, 0xE2D6, 0xCAFC, 0xBFB5, /* 0xB0 */
-    0xD3B9, 0xE2D5,      0,      0,      0,      0, 0xE2D7,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xC1AE, 0xC0C8,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xE2DB, 0xE2DA, 0xC0AA,      0,      0, 0xC1CE,      0, /* 0xD0 */
-         0,      0,      0, 0xE2DC,      0,      0,      0, 0xC3ED, /* 0xD0 */
-    0xB3A7, 0xE2D0, 0xB7CF, 0xB9E3,      0,      0,      0,      0, /* 0xE0 */
-    0xE2DD,      0, 0xE2DE,      0, 0xC2AE,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xCCFC, 0xDBC8,      0, 0xD1D3, 0xCDA2, /* 0xF0 */
-         0,      0, 0xBDA8,      0,      0,      0, 0xDEC3, 0xD8A5  /* 0xF0 */
+    0xE2CF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB1D3, /* 0x80 */
+         0, 	 0, 0xB4B2, 0xE2D1, 	 0, 	 0, 	 0, 0xD0F2, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB5D7, 0xE2D2, 0xB5EA, /* 0x90 */
+         0, 	 0, 0xB8FD, 	 0, 0xB8AE, 	 0, 	 0, 	 0, /* 0x90 */
+    0xE2D4, 	 0, 	 0, 	 0, 	 0, 0xE2D3, 0xB6C8, 0xD7F9, /* 0xA0 */
+         0, 	 0, 	 0, 0xBFE2, 	 0, 0xCDA5, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xE2D8, 	 0, 0xE2D6, 0xCAFC, 0xBFB5, /* 0xB0 */
+    0xD3B9, 0xE2D5, 	 0, 	 0, 	 0, 	 0, 0xE2D7, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xC1AE, 0xC0C8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xE2DB, 0xE2DA, 0xC0AA, 	 0, 	 0, 0xC1CE, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xE2DC, 	 0, 	 0, 	 0, 0xC3ED, /* 0xD0 */
+    0xB3A7, 0xE2D0, 0xB7CF, 0xB9E3, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE2DD, 	 0, 0xE2DE, 	 0, 0xC2AE, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xCCFC, 0xDBC8, 	 0, 0xD1D3, 0xCDA2, /* 0xF0 */
+         0, 	 0, 0xBDA8, 	 0, 	 0, 	 0, 0xDEC3, 0xD8A5	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_5F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xDBCD, 0xD2EC,      0, 0xC5AA,      0,      0,      0, /* 0x00 */
-    0xDEC4,      0, 0xB1D7, 0xDFAE,      0,      0,      0, 0xCABD, /* 0x00 */
-         0, 0xDFB1,      0, 0xB9AD,      0, 0xD2FD,      0, 0xB8A5, /* 0x10 */
-    0xBAEB,      0,      0, 0xB3DA,      0,      0,      0, 0xB5DC, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xCFD2, 0xBBA1, /* 0x20 */
-         0, 0xE5F3,      0,      0,      0, 0xE5F4,      0,      0, /* 0x20 */
-         0, 0xC8F5,      0, 0xE5F2,      0, 0xD5C5,      0,      0, /* 0x30 */
-         0,      0, 0xC7BF,      0, 0xE5F6,      0,      0,      0, /* 0x30 */
-    0xECB0,      0,      0,      0,      0,      0, 0xF8A4,      0, /* 0x40 */
-    0xB5AF,      0,      0,      0, 0xC3D6,      0, 0xCDE4,      0, /* 0x40 */
-    0xE5E6,      0,      0,      0,      0,      0, 0xE5E8, 0xE5E7, /* 0x50 */
-    0xE5E9, 0xF8BD,      0,      0,      0, 0xD2CD,      0,      0, /* 0x50 */
-         0, 0xE1EA, 0xD0CE,      0, 0xCDAE,      0, 0xD1E5,      0, /* 0x60 */
-         0, 0xB2CA, 0xB1EB,      0, 0xB1F2, 0xC5ED,      0,      0, /* 0x60 */
-    0xD5C3, 0xD3B0,      0, 0xE1DC,      0,      0,      0, 0xE1DD, /* 0x70 */
-         0, 0xD2DB,      0,      0, 0xB1CB,      0,      0,      0, /* 0x70 */
-    0xCDF9, 0xD5F7, 0xE1DE,      0,      0, 0xB4FD,      0, 0xE1DF, /* 0x80 */
-    0xBADC, 0xE1E0, 0xBBB2, 0xC2C9, 0xBAF3,      0,      0,      0, /* 0x80 */
-    0xD0EC, 0xBEB6, 0xCDBD,      0,      0,      0,      0, 0xB5C3, /* 0x90 */
-    0xC5C7, 0xE1E3,      0,      0, 0xE1E4,      0, 0xB4D3,      0, /* 0x90 */
-    0xE1E2, 0xD3F9,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xE1E5, 0xB8B4, 0xD1AD,      0,      0, 0xE1E6, 0xCEA2,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xE1E7,      0, 0xB5C2, /* 0xB0 */
-         0, 0xB3B9,      0,      0, 0xE1E8, 0xBBD5,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xD0C4, 0xE2E0, 0xB1D8,      0,      0, /* 0xC0 */
-         0, 0xE2E1,      0,      0, 0xBCC9, 0xC8CC,      0,      0, /* 0xC0 */
-    0xECFE, 0xECFD, 0xDFAF,      0,      0,      0, 0xE2E2, 0xD6BE, /* 0xD0 */
-    0xCDFC, 0xC3A6,      0,      0,      0, 0xE3C3,      0,      0, /* 0xD0 */
-    0xD6D2, 0xE2E7,      0,      0, 0xE2E8,      0,      0,      0, /* 0xE0 */
-         0,      0, 0xE2EC, 0xBFEC,      0, 0xE2ED, 0xE2E5,      0, /* 0xE0 */
-         0, 0xB3C0,      0,      0,      0, 0xC4EE,      0,      0, /* 0xF0 */
-    0xE2EE,      0,      0, 0xD0C3,      0, 0xBAF6,      0, 0xB7DE  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xDBCD, 0xD2EC, 	 0, 0xC5AA, 	 0, 	 0, 	 0, /* 0x00 */
+    0xDEC4, 	 0, 0xB1D7, 0xDFAE, 	 0, 	 0, 	 0, 0xCABD, /* 0x00 */
+         0, 0xDFB1, 	 0, 0xB9AD, 	 0, 0xD2FD, 	 0, 0xB8A5, /* 0x10 */
+    0xBAEB, 	 0, 	 0, 0xB3DA, 	 0, 	 0, 	 0, 0xB5DC, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCFD2, 0xBBA1, /* 0x20 */
+         0, 0xE5F3, 	 0, 	 0, 	 0, 0xE5F4, 	 0, 	 0, /* 0x20 */
+         0, 0xC8F5, 	 0, 0xE5F2, 	 0, 0xD5C5, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xC7BF, 	 0, 0xE5F6, 	 0, 	 0, 	 0, /* 0x30 */
+    0xECB0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF8A4, 	 0, /* 0x40 */
+    0xB5AF, 	 0, 	 0, 	 0, 0xC3D6, 	 0, 0xCDE4, 	 0, /* 0x40 */
+    0xE5E6, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE5E8, 0xE5E7, /* 0x50 */
+    0xE5E9, 0xF8BD, 	 0, 	 0, 	 0, 0xD2CD, 	 0, 	 0, /* 0x50 */
+         0, 0xE1EA, 0xD0CE, 	 0, 0xCDAE, 	 0, 0xD1E5, 	 0, /* 0x60 */
+         0, 0xB2CA, 0xB1EB, 	 0, 0xB1F2, 0xC5ED, 	 0, 	 0, /* 0x60 */
+    0xD5C3, 0xD3B0, 	 0, 0xE1DC, 	 0, 	 0, 	 0, 0xE1DD, /* 0x70 */
+         0, 0xD2DB, 	 0, 	 0, 0xB1CB, 	 0, 	 0, 	 0, /* 0x70 */
+    0xCDF9, 0xD5F7, 0xE1DE, 	 0, 	 0, 0xB4FD, 	 0, 0xE1DF, /* 0x80 */
+    0xBADC, 0xE1E0, 0xBBB2, 0xC2C9, 0xBAF3, 	 0, 	 0, 	 0, /* 0x80 */
+    0xD0EC, 0xBEB6, 0xCDBD, 	 0, 	 0, 	 0, 	 0, 0xB5C3, /* 0x90 */
+    0xC5C7, 0xE1E3, 	 0, 	 0, 0xE1E4, 	 0, 0xB4D3, 	 0, /* 0x90 */
+    0xE1E2, 0xD3F9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xE1E5, 0xB8B4, 0xD1AD, 	 0, 	 0, 0xE1E6, 0xCEA2, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE1E7, 	 0, 0xB5C2, /* 0xB0 */
+         0, 0xB3B9, 	 0, 	 0, 0xE1E8, 0xBBD5, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xD0C4, 0xE2E0, 0xB1D8, 	 0, 	 0, /* 0xC0 */
+         0, 0xE2E1, 	 0, 	 0, 0xBCC9, 0xC8CC, 	 0, 	 0, /* 0xC0 */
+    0xECFE, 0xECFD, 0xDFAF, 	 0, 	 0, 	 0, 0xE2E2, 0xD6BE, /* 0xD0 */
+    0xCDFC, 0xC3A6, 	 0, 	 0, 	 0, 0xE3C3, 	 0, 	 0, /* 0xD0 */
+    0xD6D2, 0xE2E7, 	 0, 	 0, 0xE2E8, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xE2EC, 0xBFEC, 	 0, 0xE2ED, 0xE2E5, 	 0, /* 0xE0 */
+         0, 0xB3C0, 	 0, 	 0, 	 0, 0xC4EE, 	 0, 	 0, /* 0xF0 */
+    0xE2EE, 	 0, 	 0, 0xD0C3, 	 0, 0xBAF6, 	 0, 0xB7DE	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_60[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-                    0xE2F7,      0,      0, 0xE2F4, 0xD4F5, 0xE2F3, /* 0x00 */
-         0,      0, 0xC5AD,      0, 0xD5FA, 0xC5C2, 0xB2C0,      0, /* 0x10 */
-         0, 0xE2EF,      0, 0xE2F2,      0, 0xCBBC,      0,      0, /* 0x10 */
-    0xB5A1, 0xE2F9,      0,      0,      0, 0xBCB1, 0xE2F1, 0xD0D4, /* 0x20 */
-    0xD4B9, 0xE2F5, 0xB9D6, 0xE2F6,      0,      0,      0, 0xC7D3, /* 0x20 */
-         0,      0,      0,      0,      0, 0xE2F0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xEDA5, 0xE2FE, 0xCAD1,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xBBD0,      0,      0, /* 0x40 */
-    0xBFD6,      0, 0xBAE3,      0,      0, 0xCBA1,      0,      0, /* 0x50 */
-         0, 0xEDA6, 0xEDA3,      0,      0, 0xEDA2,      0,      0, /* 0x50 */
-         0,      0, 0xBBD6, 0xEDA7, 0xD0F4,      0,      0, 0xEDA4, /* 0x60 */
-    0xBADE, 0xB6F7, 0xE3A1, 0xB6B2, 0xCCF1, 0xB9A7,      0, 0xCFA2, /* 0x60 */
-    0xC7A1,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xD3C1, /* 0x70 */
-         0,      0,      0, 0xE3A7, 0xC7C4,      0,      0,      0, /* 0x80 */
-         0, 0xCFA4,      0,      0, 0xE3A9, 0xBAB7,      0,      0, /* 0x80 */
-         0,      0, 0xE3A8,      0, 0xBBDA,      0, 0xE3A3,      0, /* 0x90 */
-         0,      0, 0xE3A4, 0xE3AA,      0, 0xE3A6,      0, 0xCEF2, /* 0x90 */
-    0xD3C6,      0,      0, 0xBBBC,      0,      0, 0xD4C3,      0, /* 0xA0 */
-    0xC4FA,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xE3AD, 0xB1AF,      0, 0xE3B2, 0xE2EA, 0xC3C6,      0, /* 0xB0 */
-    0xBCC2,      0,      0, 0xE3AC, 0xB5BF,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xC7E9, 0xE3B0,      0, /* 0xC0 */
-         0,      0,      0, 0xCDEF,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xBBF3,      0,      0,      0, 0xCCE8,      0,      0, /* 0xD0 */
-    0xE3AF,      0, 0xE3B1,      0, 0xCFA7, 0xE3AE,      0, 0xCEA9, /* 0xD0 */
-    0xBBDD, 0xB6F1,      0,      0,      0,      0, 0xB5EB,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xB6E8, 0xC4D5, 0xE3A2, 0xCFEB, 0xE3B7,      0, 0xBBCC,      0, /* 0xF0 */
-         0, 0xC8C7, 0xD0CA, 0xE2FC                                  /* 0xF0 */
+                    0xE2F7, 	 0, 	 0, 0xE2F4, 0xD4F5, 0xE2F3, /* 0x00 */
+         0, 	 0, 0xC5AD, 	 0, 0xD5FA, 0xC5C2, 0xB2C0, 	 0, /* 0x10 */
+         0, 0xE2EF, 	 0, 0xE2F2, 	 0, 0xCBBC, 	 0, 	 0, /* 0x10 */
+    0xB5A1, 0xE2F9, 	 0, 	 0, 	 0, 0xBCB1, 0xE2F1, 0xD0D4, /* 0x20 */
+    0xD4B9, 0xE2F5, 0xB9D6, 0xE2F6, 	 0, 	 0, 	 0, 0xC7D3, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE2F0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xEDA5, 0xE2FE, 0xCAD1, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xBBD0, 	 0, 	 0, /* 0x40 */
+    0xBFD6, 	 0, 0xBAE3, 	 0, 	 0, 0xCBA1, 	 0, 	 0, /* 0x50 */
+         0, 0xEDA6, 0xEDA3, 	 0, 	 0, 0xEDA2, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xBBD6, 0xEDA7, 0xD0F4, 	 0, 	 0, 0xEDA4, /* 0x60 */
+    0xBADE, 0xB6F7, 0xE3A1, 0xB6B2, 0xCCF1, 0xB9A7, 	 0, 0xCFA2, /* 0x60 */
+    0xC7A1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD3C1, /* 0x70 */
+         0, 	 0, 	 0, 0xE3A7, 0xC7C4, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xCFA4, 	 0, 	 0, 0xE3A9, 0xBAB7, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE3A8, 	 0, 0xBBDA, 	 0, 0xE3A3, 	 0, /* 0x90 */
+         0, 	 0, 0xE3A4, 0xE3AA, 	 0, 0xE3A6, 	 0, 0xCEF2, /* 0x90 */
+    0xD3C6, 	 0, 	 0, 0xBBBC, 	 0, 	 0, 0xD4C3, 	 0, /* 0xA0 */
+    0xC4FA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xE3AD, 0xB1AF, 	 0, 0xE3B2, 0xE2EA, 0xC3C6, 	 0, /* 0xB0 */
+    0xBCC2, 	 0, 	 0, 0xE3AC, 0xB5BF, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC7E9, 0xE3B0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xCDEF, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xBBF3, 	 0, 	 0, 	 0, 0xCCE8, 	 0, 	 0, /* 0xD0 */
+    0xE3AF, 	 0, 0xE3B1, 	 0, 0xCFA7, 0xE3AE, 	 0, 0xCEA9, /* 0xD0 */
+    0xBBDD, 0xB6F1, 	 0, 	 0, 	 0, 	 0, 0xB5EB, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xB6E8, 0xC4D5, 0xE3A2, 0xCFEB, 0xE3B7, 	 0, 0xBBCC, 	 0, /* 0xF0 */
+         0, 0xC8C7, 0xD0CA, 0xE2FC									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_61[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE3B8, 0xB3EE,      0,      0,      0,      0, 0xEDA9,      0, /* 0x00 */
-    0xD3FA, 0xD3E4,      0,      0,      0, 0xEDAA, 0xE3B9, 0xD2E2, /* 0x00 */
-         0,      0,      0,      0,      0, 0xE3B5,      0,      0, /* 0x10 */
-         0,      0, 0xD3DE, 0xB0AE, 0xE3AB,      0,      0, 0xB8D0, /* 0x10 */
-    0xE3B3,      0,      0, 0xE3B6,      0,      0,      0, 0xC0A2, /* 0x20 */
-         0,      0,      0, 0xE3BA,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xE2EB,      0,      0, 0xE2FD, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xE2E9, 0xF8FC, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xB4C8,      0, 0xE3BB, 0xCCAC, 0xBBC5,      0, 0xC9F7,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xC4BD,      0,      0, /* 0x50 */
-    0xB2D2,      0, 0xB2D1,      0,      0, 0xEDAB,      0, 0xE2FA, /* 0x50 */
-         0,      0, 0xC2FD, 0xB9DF, 0xEDA8,      0,      0, 0xBBDB, /* 0x60 */
-    0xBFAE,      0, 0xE2E6, 0xCBCB,      0,      0, 0xC2C7,      0, /* 0x60 */
-    0xCEBF,      0,      0, 0xE3A5,      0, 0xE3BC, 0xC7EC, 0xBFB6, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xD3C7,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xB1B9, 0xB1EF,      0,      0, 0xD4F7,      0, /* 0x80 */
-    0xC1AF, 0xC6BE, 0xE3B4,      0, 0xE3BE,      0,      0,      0, /* 0x90 */
-         0,      0, 0xB5AC,      0,      0, 0xEDAD,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xB7DF,      0,      0, 0xE3BF, /* 0xA0 */
-    0xBAA9, 0xEDAC,      0, 0xC3F5, 0xE3BD,      0, 0xE2E4,      0, /* 0xA0 */
-         0,      0, 0xCFDC,      0,      0,      0, 0xD2E4, 0xE3C0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xBAB6,      0, /* 0xB0 */
-         0,      0, 0xB6AE,      0,      0,      0,      0, 0xBFD2, /* 0xC0 */
-    0xD0B8, 0xD3A6, 0xB0C3, 0xEDAE, 0xE2F8,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xE3C1,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xF8D6, 0xEDA1, /* 0xD0 */
-         0,      0,      0, 0xEDAF,      0,      0, 0xC5B3,      0, /* 0xE0 */
-    0xE2FB,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0xB3CD,      0,      0, 0xE3C2, 0xC0C1, 0xBBB3, /* 0xF0 */
-    0xD0FC,      0, 0xE2E3,      0, 0xBEE5,      0, 0xC9E5, 0xDCB2  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE3B8, 0xB3EE, 	 0, 	 0, 	 0, 	 0, 0xEDA9, 	 0, /* 0x00 */
+    0xD3FA, 0xD3E4, 	 0, 	 0, 	 0, 0xEDAA, 0xE3B9, 0xD2E2, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE3B5, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xD3DE, 0xB0AE, 0xE3AB, 	 0, 	 0, 0xB8D0, /* 0x10 */
+    0xE3B3, 	 0, 	 0, 0xE3B6, 	 0, 	 0, 	 0, 0xC0A2, /* 0x20 */
+         0, 	 0, 	 0, 0xE3BA, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xE2EB, 	 0, 	 0, 0xE2FD, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE2E9, 0xF8FC, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xB4C8, 	 0, 0xE3BB, 0xCCAC, 0xBBC5, 	 0, 0xC9F7, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC4BD, 	 0, 	 0, /* 0x50 */
+    0xB2D2, 	 0, 0xB2D1, 	 0, 	 0, 0xEDAB, 	 0, 0xE2FA, /* 0x50 */
+         0, 	 0, 0xC2FD, 0xB9DF, 0xEDA8, 	 0, 	 0, 0xBBDB, /* 0x60 */
+    0xBFAE, 	 0, 0xE2E6, 0xCBCB, 	 0, 	 0, 0xC2C7, 	 0, /* 0x60 */
+    0xCEBF, 	 0, 	 0, 0xE3A5, 	 0, 0xE3BC, 0xC7EC, 0xBFB6, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xD3C7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xB1B9, 0xB1EF, 	 0, 	 0, 0xD4F7, 	 0, /* 0x80 */
+    0xC1AF, 0xC6BE, 0xE3B4, 	 0, 0xE3BE, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xB5AC, 	 0, 	 0, 0xEDAD, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xB7DF, 	 0, 	 0, 0xE3BF, /* 0xA0 */
+    0xBAA9, 0xEDAC, 	 0, 0xC3F5, 0xE3BD, 	 0, 0xE2E4, 	 0, /* 0xA0 */
+         0, 	 0, 0xCFDC, 	 0, 	 0, 	 0, 0xD2E4, 0xE3C0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBAB6, 	 0, /* 0xB0 */
+         0, 	 0, 0xB6AE, 	 0, 	 0, 	 0, 	 0, 0xBFD2, /* 0xC0 */
+    0xD0B8, 0xD3A6, 0xB0C3, 0xEDAE, 0xE2F8, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xE3C1, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF8D6, 0xEDA1, /* 0xD0 */
+         0, 	 0, 	 0, 0xEDAF, 	 0, 	 0, 0xC5B3, 	 0, /* 0xE0 */
+    0xE2FB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xB3CD, 	 0, 	 0, 0xE3C2, 0xC0C1, 0xBBB3, /* 0xF0 */
+    0xD0FC, 	 0, 0xE2E3, 	 0, 0xBEE5, 	 0, 0xC9E5, 0xDCB2	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_62[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xC1B5,      0,      0,      0,      0,      0,      0, 0xEDB0, /* 0x00 */
-    0xB8EA,      0, 0xCEEC,      0, 0xD0E7, 0xCAF9, 0xC8D6,      0, /* 0x00 */
-    0xB3C9, 0xCED2, 0xBDE4,      0, 0xEAA7, 0xE3DE, 0xBBF2,      0, /* 0x10 */
-         0,      0, 0xC6DD, 0xEAA9,      0,      0,      0, 0xEAAA, /* 0x10 */
-         0, 0xEAAC, 0xEAAB,      0, 0xEAAE, 0xEAAD,      0, 0xEAA8, /* 0x20 */
-         0, 0xEAAF, 0xBDD8,      0,      0,      0, 0xC2BE,      0, /* 0x20 */
-    0xD5BD,      0, 0xCFB7, 0xB4C1, 0xB4F7,      0,      0, 0xBBA7, /* 0x30 */
-         0,      0,      0,      0,      0, 0xECE6, 0xECE5, 0xB7BF, /* 0x30 */
-    0xCBF9, 0xB1E2,      0, 0xECE7,      0,      0,      0, 0xC9C8, /* 0x40 */
-    0xECE8, 0xECE9,      0, 0xCAD6, 0xDED0, 0xB2C5, 0xD4FA,      0, /* 0x40 */
-         0, 0xF8DE, 0xB0C7, 0xB4F2, 0xC8D3,      0,      0,      0, /* 0x50 */
-    0xCDD0,      0,      0, 0xBFB8,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xBFDB,      0,      0, 0xC7A4,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xC5A4, 0xB0E7, 0xB3B6, /* 0x60 */
-         0,      0,      0, 0xB0E2,      0,      0, 0xB7F6,      0, /* 0x70 */
-         0, 0xC5FA,      0,      0, 0xB6F3,      0, 0xD5D2, 0xB3D0, /* 0x70 */
-    0xBCBC,      0,      0,      0, 0xB3AD,      0,      0,      0, /* 0x80 */
-         0, 0xBEF1, 0xB0D1,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xD2D6, 0xCAE3, 0xD7A5,      0, 0xCDB6, 0xB6B6, 0xBFB9, /* 0x90 */
-    0xD5DB,      0,      0, 0xC5D7,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xC5EA,      0,      0, 0xC5FB, 0xCCA7,      0,      0,      0, /* 0xA0 */
-         0, 0xB1A7,      0,      0,      0, 0xB5D6,      0,      0, /* 0xB0 */
-         0, 0xC4A8,      0, 0xDED3, 0xD1BA, 0xB3E9,      0, 0xC3F2, /* 0xB0 */
-         0,      0, 0xB7F7,      0, 0xD6F4,      0, 0xB2F0, 0xC4B4, /* 0xC0 */
-    0xC4E9, 0xC0AD, 0xDED4,      0, 0xB0E8, 0xC5C4, 0xC1E0,      0, /* 0xC0 */
-    0xB9D5,      0, 0xBEDC, 0xCDD8, 0xB0CE,      0, 0xCDCF, 0xDED6, /* 0xD0 */
-    0xBED0, 0xD7BE, 0xDED5, 0xD5D0, 0xB0DD,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xC0A8, 0xCAC3, 0xDED7, 0xD5FC, /* 0xE0 */
-         0, 0xB9B0,      0, 0xC8AD, 0xCBA9,      0, 0xDED9, 0xBFBD, /* 0xF0 */
-         0,      0,      0,      0, 0xC6B4, 0xD7A7, 0xCAB0, 0xC4C3  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xC1B5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEDB0, /* 0x00 */
+    0xB8EA, 	 0, 0xCEEC, 	 0, 0xD0E7, 0xCAF9, 0xC8D6, 	 0, /* 0x00 */
+    0xB3C9, 0xCED2, 0xBDE4, 	 0, 0xEAA7, 0xE3DE, 0xBBF2, 	 0, /* 0x10 */
+         0, 	 0, 0xC6DD, 0xEAA9, 	 0, 	 0, 	 0, 0xEAAA, /* 0x10 */
+         0, 0xEAAC, 0xEAAB, 	 0, 0xEAAE, 0xEAAD, 	 0, 0xEAA8, /* 0x20 */
+         0, 0xEAAF, 0xBDD8, 	 0, 	 0, 	 0, 0xC2BE, 	 0, /* 0x20 */
+    0xD5BD, 	 0, 0xCFB7, 0xB4C1, 0xB4F7, 	 0, 	 0, 0xBBA7, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xECE6, 0xECE5, 0xB7BF, /* 0x30 */
+    0xCBF9, 0xB1E2, 	 0, 0xECE7, 	 0, 	 0, 	 0, 0xC9C8, /* 0x40 */
+    0xECE8, 0xECE9, 	 0, 0xCAD6, 0xDED0, 0xB2C5, 0xD4FA, 	 0, /* 0x40 */
+         0, 0xF8DE, 0xB0C7, 0xB4F2, 0xC8D3, 	 0, 	 0, 	 0, /* 0x50 */
+    0xCDD0, 	 0, 	 0, 0xBFB8, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xBFDB, 	 0, 	 0, 0xC7A4, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC5A4, 0xB0E7, 0xB3B6, /* 0x60 */
+         0, 	 0, 	 0, 0xB0E2, 	 0, 	 0, 0xB7F6, 	 0, /* 0x70 */
+         0, 0xC5FA, 	 0, 	 0, 0xB6F3, 	 0, 0xD5D2, 0xB3D0, /* 0x70 */
+    0xBCBC, 	 0, 	 0, 	 0, 0xB3AD, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xBEF1, 0xB0D1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xD2D6, 0xCAE3, 0xD7A5, 	 0, 0xCDB6, 0xB6B6, 0xBFB9, /* 0x90 */
+    0xD5DB, 	 0, 	 0, 0xC5D7, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xC5EA, 	 0, 	 0, 0xC5FB, 0xCCA7, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xB1A7, 	 0, 	 0, 	 0, 0xB5D6, 	 0, 	 0, /* 0xB0 */
+         0, 0xC4A8, 	 0, 0xDED3, 0xD1BA, 0xB3E9, 	 0, 0xC3F2, /* 0xB0 */
+         0, 	 0, 0xB7F7, 	 0, 0xD6F4, 	 0, 0xB2F0, 0xC4B4, /* 0xC0 */
+    0xC4E9, 0xC0AD, 0xDED4, 	 0, 0xB0E8, 0xC5C4, 0xC1E0, 	 0, /* 0xC0 */
+    0xB9D5, 	 0, 0xBEDC, 0xCDD8, 0xB0CE, 	 0, 0xCDCF, 0xDED6, /* 0xD0 */
+    0xBED0, 0xD7BE, 0xDED5, 0xD5D0, 0xB0DD, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xC0A8, 0xCAC3, 0xDED7, 0xD5FC, /* 0xE0 */
+         0, 0xB9B0, 	 0, 0xC8AD, 0xCBA9, 	 0, 0xDED9, 0xBFBD, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xC6B4, 0xD7A7, 0xCAB0, 0xC4C3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_63[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xB3D6, 0xB9D2,      0,      0,      0,      0, 0xD6B8, /* 0x00 */
-    0xEAFC, 0xB0B4,      0,      0,      0,      0, 0xBFE6,      0, /* 0x00 */
-         0, 0xCCF4,      0,      0,      0,      0, 0xCDDA,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xB0A4,      0, 0xC5B2, 0xB4EC,      0,      0,      0, 0xD5F1, /* 0x20 */
-         0,      0, 0xEAFD,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xDEDA, 0xCDA6,      0,      0, 0xCDEC, 0xD0AE,      0, /* 0x30 */
-         0,      0, 0xCEE6, 0xDEDC,      0, 0xCDB1, 0xC0A6,      0, /* 0x40 */
-         0, 0xD7BD,      0, 0xDEDB, 0xB0C6, 0xBAB4, 0xC9D3, 0xC4F3, /* 0x40 */
-    0xBEE8,      0,      0,      0,      0, 0xB2B6,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xC5F5, /* 0x60 */
-    0xC9E1, 0xDEE6,      0, 0xDED1,      0, 0xDEE3, 0xF8C6,      0, /* 0x60 */
-         0, 0xDEDF, 0xF8C7,      0,      0,      0, 0xB4B7, 0xBDDD, /* 0x70 */
-         0,      0, 0xDEE0, 0xC4ED,      0,      0,      0,      0, /* 0x70 */
-    0xCFC6,      0, 0xB5E0, 0xC9A8, 0xC2D5,      0,      0, 0xB6DE, /* 0x80 */
-    0xCADA, 0xB5F4, 0xDEE5,      0, 0xD5C6,      0, 0xDEE1, 0xCCCD, /* 0x80 */
-    0xC6FE,      0, 0xC5C5,      0,      0,      0, 0xD2B4,      0, /* 0x90 */
-    0xBEF2, 0xD5F5,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xC2D3,      0, 0xCCBD, 0xB3B8,      0, 0xBDD3,      0, 0xBFD8, /* 0xA0 */
-    0xCDC6, 0xD1DA, 0xB4EB,      0, 0xDEE4, 0xDEDD, 0xDEE7,      0, /* 0xA0 */
-    0xEAFE,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xDEF2,      0, /* 0xB0 */
-    0xBCF0,      0,      0,      0, 0xDEED,      0, 0xDEF1,      0, /* 0xC0 */
-         0, 0xC8E0,      0,      0,      0, 0xD7E1, 0xDEEF, 0xC3E8, /* 0xC0 */
-    0xCCE1,      0, 0xB2E5,      0,      0,      0, 0xD2BE,      0, /* 0xD0 */
-         0,      0, 0xD1EF, 0xBBBB,      0,      0, 0xDEEE,      0, /* 0xD0 */
-    0xDEEB, 0xCED5,      0, 0xB4A7,      0,      0,      0,      0, /* 0xE0 */
-         0, 0xBFAB, 0xBEBE,      0,      0, 0xBDD2, 0xBBD3,      0, /* 0xE0 */
-         0,      0, 0xDEE9,      0, 0xD4AE,      0, 0xDEDE,      0, /* 0xF0 */
-    0xDEEA                                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xB3D6, 0xB9D2, 	 0, 	 0, 	 0, 	 0, 0xD6B8, /* 0x00 */
+    0xEAFC, 0xB0B4, 	 0, 	 0, 	 0, 	 0, 0xBFE6, 	 0, /* 0x00 */
+         0, 0xCCF4, 	 0, 	 0, 	 0, 	 0, 0xCDDA, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xB0A4, 	 0, 0xC5B2, 0xB4EC, 	 0, 	 0, 	 0, 0xD5F1, /* 0x20 */
+         0, 	 0, 0xEAFD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xDEDA, 0xCDA6, 	 0, 	 0, 0xCDEC, 0xD0AE, 	 0, /* 0x30 */
+         0, 	 0, 0xCEE6, 0xDEDC, 	 0, 0xCDB1, 0xC0A6, 	 0, /* 0x40 */
+         0, 0xD7BD, 	 0, 0xDEDB, 0xB0C6, 0xBAB4, 0xC9D3, 0xC4F3, /* 0x40 */
+    0xBEE8, 	 0, 	 0, 	 0, 	 0, 0xB2B6, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC5F5, /* 0x60 */
+    0xC9E1, 0xDEE6, 	 0, 0xDED1, 	 0, 0xDEE3, 0xF8C6, 	 0, /* 0x60 */
+         0, 0xDEDF, 0xF8C7, 	 0, 	 0, 	 0, 0xB4B7, 0xBDDD, /* 0x70 */
+         0, 	 0, 0xDEE0, 0xC4ED, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xCFC6, 	 0, 0xB5E0, 0xC9A8, 0xC2D5, 	 0, 	 0, 0xB6DE, /* 0x80 */
+    0xCADA, 0xB5F4, 0xDEE5, 	 0, 0xD5C6, 	 0, 0xDEE1, 0xCCCD, /* 0x80 */
+    0xC6FE, 	 0, 0xC5C5, 	 0, 	 0, 	 0, 0xD2B4, 	 0, /* 0x90 */
+    0xBEF2, 0xD5F5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xC2D3, 	 0, 0xCCBD, 0xB3B8, 	 0, 0xBDD3, 	 0, 0xBFD8, /* 0xA0 */
+    0xCDC6, 0xD1DA, 0xB4EB, 	 0, 0xDEE4, 0xDEDD, 0xDEE7, 	 0, /* 0xA0 */
+    0xEAFE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDEF2, 	 0, /* 0xB0 */
+    0xBCF0, 	 0, 	 0, 	 0, 0xDEED, 	 0, 0xDEF1, 	 0, /* 0xC0 */
+         0, 0xC8E0, 	 0, 	 0, 	 0, 0xD7E1, 0xDEEF, 0xC3E8, /* 0xC0 */
+    0xCCE1, 	 0, 0xB2E5, 	 0, 	 0, 	 0, 0xD2BE, 	 0, /* 0xD0 */
+         0, 	 0, 0xD1EF, 0xBBBB, 	 0, 	 0, 0xDEEE, 	 0, /* 0xD0 */
+    0xDEEB, 0xCED5, 	 0, 0xB4A7, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xBFAB, 0xBEBE, 	 0, 	 0, 0xBDD2, 0xBBD3, 	 0, /* 0xE0 */
+         0, 	 0, 0xDEE9, 	 0, 0xD4AE, 	 0, 0xDEDE, 	 0, /* 0xF0 */
+    0xDEEA															/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_64[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-                            0xDEF5, 0xDEF8, 0xCBF0,      0, 0xB2AB, /* 0x00 */
-    0xB4A4,      0,      0, 0xB4EA, 0xC9A6,      0,      0, 0xB5B7, /* 0x10 */
-         0,      0,      0, 0xDEF6, 0xCBD1,      0, 0xB8E3,      0, /* 0x10 */
-    0xDEF7, 0xDEFA,      0,      0,      0,      0, 0xDEF9,      0, /* 0x20 */
-         0,      0, 0xCCC2,      0, 0xB0E1, 0xB4EE,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xE5BA,      0, 0xC7C0,      0, /* 0x30 */
-         0,      0, 0xD0AF,      0,      0, 0xB2EB,      0, 0xEBA1, /* 0x30 */
-         0, 0xDEF4,      0,      0,      0,      0,      0, 0xD2A1, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xDEE2, 0xDEF0,      0, 0xCBA4,      0,      0,      0, /* 0x50 */
-    0xD5AA,      0,      0,      0, 0xDEE8,      0, 0xDEFB, 0xC2A7, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xB4DD, /* 0x60 */
-         0, 0xC4A6,      0,      0,      0, 0xDEFD,      0, 0xD6BF, /* 0x60 */
-         0,      0,      0, 0xBFD9,      0,      0, 0xDED2,      0, /* 0x70 */
-    0xC3FE, 0xC4A1, 0xDFA1, 0xB2F4,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xC1CC,      0,      0, 0xBEEF,      0, 0xC6B2, /* 0x80 */
-    0xC0CC,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xB3C5, 0xC8F6, 0xC4D3,      0, 0xCBBA, 0xDEFE,      0, /* 0x90 */
-         0, 0xDFA4,      0,      0,      0,      0, 0xD7B2, 0xDED8, /* 0x90 */
-         0,      0,      0, 0xB5A7, 0xB3B7, 0xB2A6,      0,      0, /* 0xA0 */
-         0, 0xC1C3,      0, 0xB8A7, 0xC7CB, 0xB2A5, 0xB4E9,      0, /* 0xA0 */
-    0xD7AB,      0, 0xC6CB, 0xDEEC,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xCCA2, 0xBAB3,      0, 0xCECE, 0xBCF1, /* 0xB0 */
-    0xDFA6, 0xD3B5, 0xC0DE,      0, 0xC2B0, 0xC9C3,      0, 0xD4F1, /* 0xC0 */
-         0,      0, 0xBBF7, 0xB5B2,      0, 0xB2D9, 0xC7E6,      0, /* 0xC0 */
-    0xDFA7,      0, 0xC7DC,      0, 0xB5A3,      0,      0, 0xDFA8, /* 0xD0 */
-    0xEBA2,      0, 0xBEDD,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xBCB7,      0, 0xDFAA,      0, 0xDFA9,      0, 0xB2C1,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xC4E2,      0,      0, 0xB1F7, /* 0xE0 */
-    0xC5A1, 0xB8E9, 0xD6C0,      0, 0xC0A9,      0,      0, 0xDFA2, /* 0xF0 */
-         0,      0, 0xB0DA, 0xCBD3, 0xDFA3,      0, 0xC8C5          /* 0xF0 */
+                            0xDEF5, 0xDEF8, 0xCBF0, 	 0, 0xB2AB, /* 0x00 */
+    0xB4A4, 	 0, 	 0, 0xB4EA, 0xC9A6, 	 0, 	 0, 0xB5B7, /* 0x10 */
+         0, 	 0, 	 0, 0xDEF6, 0xCBD1, 	 0, 0xB8E3, 	 0, /* 0x10 */
+    0xDEF7, 0xDEFA, 	 0, 	 0, 	 0, 	 0, 0xDEF9, 	 0, /* 0x20 */
+         0, 	 0, 0xCCC2, 	 0, 0xB0E1, 0xB4EE, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xE5BA, 	 0, 0xC7C0, 	 0, /* 0x30 */
+         0, 	 0, 0xD0AF, 	 0, 	 0, 0xB2EB, 	 0, 0xEBA1, /* 0x30 */
+         0, 0xDEF4, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD2A1, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xDEE2, 0xDEF0, 	 0, 0xCBA4, 	 0, 	 0, 	 0, /* 0x50 */
+    0xD5AA, 	 0, 	 0, 	 0, 0xDEE8, 	 0, 0xDEFB, 0xC2A7, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB4DD, /* 0x60 */
+         0, 0xC4A6, 	 0, 	 0, 	 0, 0xDEFD, 	 0, 0xD6BF, /* 0x60 */
+         0, 	 0, 	 0, 0xBFD9, 	 0, 	 0, 0xDED2, 	 0, /* 0x70 */
+    0xC3FE, 0xC4A1, 0xDFA1, 0xB2F4, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xC1CC, 	 0, 	 0, 0xBEEF, 	 0, 0xC6B2, /* 0x80 */
+    0xC0CC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xB3C5, 0xC8F6, 0xC4D3, 	 0, 0xCBBA, 0xDEFE, 	 0, /* 0x90 */
+         0, 0xDFA4, 	 0, 	 0, 	 0, 	 0, 0xD7B2, 0xDED8, /* 0x90 */
+         0, 	 0, 	 0, 0xB5A7, 0xB3B7, 0xB2A6, 	 0, 	 0, /* 0xA0 */
+         0, 0xC1C3, 	 0, 0xB8A7, 0xC7CB, 0xB2A5, 0xB4E9, 	 0, /* 0xA0 */
+    0xD7AB, 	 0, 0xC6CB, 0xDEEC, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xCCA2, 0xBAB3, 	 0, 0xCECE, 0xBCF1, /* 0xB0 */
+    0xDFA6, 0xD3B5, 0xC0DE, 	 0, 0xC2B0, 0xC9C3, 	 0, 0xD4F1, /* 0xC0 */
+         0, 	 0, 0xBBF7, 0xB5B2, 	 0, 0xB2D9, 0xC7E6, 	 0, /* 0xC0 */
+    0xDFA7, 	 0, 0xC7DC, 	 0, 0xB5A3, 	 0, 	 0, 0xDFA8, /* 0xD0 */
+    0xEBA2, 	 0, 0xBEDD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xBCB7, 	 0, 0xDFAA, 	 0, 0xDFA9, 	 0, 0xB2C1, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xC4E2, 	 0, 	 0, 0xB1F7, /* 0xE0 */
+    0xC5A1, 0xB8E9, 0xD6C0, 	 0, 0xC0A9, 	 0, 	 0, 0xDFA2, /* 0xF0 */
+         0, 	 0, 0xB0DA, 0xCBD3, 0xDFA3, 	 0, 0xC8C5			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_65[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xC5CA,      0,      0,      0, 0xDEF3,      0, 0xC4EC,      0, /* 0x00 */
-         0, 0xDFAB,      0,      0,      0,      0,      0, 0xC2A3, /* 0x00 */
-         0,      0,      0,      0, 0xC0B9,      0, 0xDEFC,      0, /* 0x10 */
-    0xC8C1, 0xB2F3,      0, 0xDFA5,      0, 0xC9E3,      0,      0, /* 0x10 */
-         0,      0, 0xD4DC, 0xC2CE, 0xCCAF, 0xDFAC,      0,      0, /* 0x20 */
-         0,      0, 0xBDC1, 0xBEF0, 0xC0BF,      0, 0xDFAD, 0xD6A7, /* 0x20 */
-         0,      0,      0,      0, 0xEAB7, 0xEBB6, 0xCAD5,      0, /* 0x30 */
-    0xD8FC, 0xB8C4,      0, 0xB9A5,      0,      0, 0xB7C5, 0xD5FE, /* 0x30 */
-         0,      0,      0,      0,      0, 0xB9CA,      0,      0, /* 0x40 */
-    0xD0A7, 0xF4CD,      0,      0,      0,      0,      0, 0xC3F4, /* 0x40 */
-         0, 0xBEC8,      0,      0,      0, 0xEBB7, 0xB0BD, 0xB0DC, /* 0x50 */
-         0, 0xBDCC,      0,      0,      0, 0xB1D6, 0xB3A8,      0, /* 0x50 */
-         0,      0, 0xB8D2, 0xC9A2,      0,      0, 0xB6D8,      0, /* 0x60 */
-         0,      0,      0, 0xEBB8, 0xBEB4,      0,      0,      0, /* 0x60 */
-         0,      0, 0xC7C3,      0, 0xD5FB, 0xB5D0,      0, 0xB7F3, /* 0x70 */
-    0xCAFD,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xC1B2, 0xB1D0,      0,      0,      0, 0xCEC4, /* 0x80 */
-         0,      0,      0,      0, 0xB1F3,      0,      0,      0, /* 0x80 */
-    0xECB3, 0xB0DF,      0,      0,      0, 0xECB5,      0, 0xF8AF, /* 0x90 */
-         0, 0xC1CF,      0, 0xF5FA, 0xD0B1,      0,      0, 0xD5E5, /* 0x90 */
-         0, 0xCED3,      0,      0, 0xBDEF, 0xB3E2,      0, 0xB8AB, /* 0xA0 */
-         0,      0,      0, 0xEDBD, 0xD5B6,      0,      0, 0xCBB9, /* 0xA0 */
-    0xD0C2,      0,      0,      0,      0,      0,      0, 0xB6CF, /* 0xB0 */
-         0, 0xB7BD,      0,      0, 0xECB6, 0xCAA9,      0,      0, /* 0xB0 */
-         0, 0xC5D4,      0, 0xECB9, 0xECB8, 0xC2C3, 0xECB7,      0, /* 0xC0 */
-         0,      0,      0, 0xD0FD, 0xECBA,      0, 0xECBB, 0xD7E5, /* 0xC0 */
-         0,      0, 0xECBC,      0,      0,      0, 0xECBD, 0xC6EC, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xBCC8,      0,      0, 0xC8D5, 0xB5A9,      0, /* 0xE0 */
-    0xD6BC, 0xD4E7,      0,      0, 0xD1AE, 0xD0F1, 0xEAB8, 0xEAB9, /* 0xE0 */
-    0xEABA, 0xBAB5,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xCDFA                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xC5CA, 	 0, 	 0, 	 0, 0xDEF3, 	 0, 0xC4EC, 	 0, /* 0x00 */
+         0, 0xDFAB, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC2A3, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xC0B9, 	 0, 0xDEFC, 	 0, /* 0x10 */
+    0xC8C1, 0xB2F3, 	 0, 0xDFA5, 	 0, 0xC9E3, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xD4DC, 0xC2CE, 0xCCAF, 0xDFAC, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xBDC1, 0xBEF0, 0xC0BF, 	 0, 0xDFAD, 0xD6A7, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xEAB7, 0xEBB6, 0xCAD5, 	 0, /* 0x30 */
+    0xD8FC, 0xB8C4, 	 0, 0xB9A5, 	 0, 	 0, 0xB7C5, 0xD5FE, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB9CA, 	 0, 	 0, /* 0x40 */
+    0xD0A7, 0xF4CD, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC3F4, /* 0x40 */
+         0, 0xBEC8, 	 0, 	 0, 	 0, 0xEBB7, 0xB0BD, 0xB0DC, /* 0x50 */
+         0, 0xBDCC, 	 0, 	 0, 	 0, 0xB1D6, 0xB3A8, 	 0, /* 0x50 */
+         0, 	 0, 0xB8D2, 0xC9A2, 	 0, 	 0, 0xB6D8, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xEBB8, 0xBEB4, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xC7C3, 	 0, 0xD5FB, 0xB5D0, 	 0, 0xB7F3, /* 0x70 */
+    0xCAFD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xC1B2, 0xB1D0, 	 0, 	 0, 	 0, 0xCEC4, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xB1F3, 	 0, 	 0, 	 0, /* 0x80 */
+    0xECB3, 0xB0DF, 	 0, 	 0, 	 0, 0xECB5, 	 0, 0xF8AF, /* 0x90 */
+         0, 0xC1CF, 	 0, 0xF5FA, 0xD0B1, 	 0, 	 0, 0xD5E5, /* 0x90 */
+         0, 0xCED3, 	 0, 	 0, 0xBDEF, 0xB3E2, 	 0, 0xB8AB, /* 0xA0 */
+         0, 	 0, 	 0, 0xEDBD, 0xD5B6, 	 0, 	 0, 0xCBB9, /* 0xA0 */
+    0xD0C2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB6CF, /* 0xB0 */
+         0, 0xB7BD, 	 0, 	 0, 0xECB6, 0xCAA9, 	 0, 	 0, /* 0xB0 */
+         0, 0xC5D4, 	 0, 0xECB9, 0xECB8, 0xC2C3, 0xECB7, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xD0FD, 0xECBA, 	 0, 0xECBB, 0xD7E5, /* 0xC0 */
+         0, 	 0, 0xECBC, 	 0, 	 0, 	 0, 0xECBD, 0xC6EC, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xBCC8, 	 0, 	 0, 0xC8D5, 0xB5A9, 	 0, /* 0xE0 */
+    0xD6BC, 0xD4E7, 	 0, 	 0, 0xD1AE, 0xD0F1, 0xEAB8, 0xEAB9, /* 0xE0 */
+    0xEABA, 0xBAB5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xCDFA											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_66[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xEAC0,      0, 0xB0BA, 0xEABE,      0,      0, 0xC0A5,      0, /* 0x00 */
-         0,      0, 0xEABB,      0, 0xB2FD,      0, 0xC3F7, 0xBBE8, /* 0x00 */
-         0,      0,      0, 0xD2D7, 0xCEF4, 0xEABF,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xEAC3,      0, 0xD0C7, /* 0x10 */
-    0xD3B3,      0,      0,      0,      0, 0xB4BA,      0, 0xC3C1, /* 0x20 */
-    0xD7F2,      0,      0,      0,      0, 0xD5D1,      0, 0xCAC7, /* 0x20 */
-         0, 0xEAC5,      0,      0, 0xEAC4, 0xEAC7, 0xEAC6,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xEACB, 0xCAB1, 0xBBCE,      0,      0,      0,      0, /* 0x40 */
-         0, 0xBDFA,      0,      0, 0xC9CE,      0,      0, 0xEACC, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xEACF, /* 0x50 */
-         0,      0, 0xCDED,      0,      0, 0xD6E7,      0, 0xEAC9, /* 0x50 */
-         0, 0xEACE,      0,      0, 0xCEEE,      0, 0xBBDE,      0, /* 0x60 */
-    0xB3BF,      0,      0,      0,      0,      0, 0xC6D5, 0xBEB0, /* 0x60 */
-    0xCEFA,      0,      0,      0, 0xC7E7,      0, 0xBEA7, 0xEAD0, /* 0x70 */
-         0,      0, 0xD6C7,      0,      0,      0, 0xC1C0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xEAD1,      0,      0, 0xCFBE, /* 0x80 */
-    0xD4CE, 0xEACD,      0,      0, 0xEAD2,      0,      0,      0, /* 0x80 */
-         0, 0xCAEE,      0,      0,      0,      0, 0xC5AF, 0xB0B5, /* 0x90 */
-         0,      0,      0,      0,      0, 0xEAD4,      0,      0, /* 0x90 */
-         0,      0, 0xB3A9,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xF4DF,      0,      0, 0xD4DD,      0,      0, 0xC4BA,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xB1A9,      0,      0,      0, /* 0xB0 */
-         0, 0xE5DF,      0,      0,      0,      0, 0xEAD5,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xEACA,      0, 0xF8CF, 0xEABC, /* 0xC0 */
-         0, 0xCFFE,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xEAD3,      0, /* 0xD0 */
-         0, 0xCAEF,      0, 0xEAD6, 0xEAD7, 0xC6D8,      0,      0, /* 0xD0 */
-    0xBFF5,      0,      0,      0,      0,      0, 0xEAD8,      0, /* 0xE0 */
-         0, 0xEAD9,      0,      0, 0xC9B9,      0,      0,      0, /* 0xE0 */
-    0xD4BB,      0, 0xC7FA, 0xD2B7, 0xB8FC,      0,      0, 0xEAC2, /* 0xF0 */
-    0xCAE9, 0xB2DC,      0,      0, 0xC2FC,      0, 0xD4F8, 0xCCE6  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xEAC0, 	 0, 0xB0BA, 0xEABE, 	 0, 	 0, 0xC0A5, 	 0, /* 0x00 */
+         0, 	 0, 0xEABB, 	 0, 0xB2FD, 	 0, 0xC3F7, 0xBBE8, /* 0x00 */
+         0, 	 0, 	 0, 0xD2D7, 0xCEF4, 0xEABF, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEAC3, 	 0, 0xD0C7, /* 0x10 */
+    0xD3B3, 	 0, 	 0, 	 0, 	 0, 0xB4BA, 	 0, 0xC3C1, /* 0x20 */
+    0xD7F2, 	 0, 	 0, 	 0, 	 0, 0xD5D1, 	 0, 0xCAC7, /* 0x20 */
+         0, 0xEAC5, 	 0, 	 0, 0xEAC4, 0xEAC7, 0xEAC6, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xEACB, 0xCAB1, 0xBBCE, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xBDFA, 	 0, 	 0, 0xC9CE, 	 0, 	 0, 0xEACC, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEACF, /* 0x50 */
+         0, 	 0, 0xCDED, 	 0, 	 0, 0xD6E7, 	 0, 0xEAC9, /* 0x50 */
+         0, 0xEACE, 	 0, 	 0, 0xCEEE, 	 0, 0xBBDE, 	 0, /* 0x60 */
+    0xB3BF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC6D5, 0xBEB0, /* 0x60 */
+    0xCEFA, 	 0, 	 0, 	 0, 0xC7E7, 	 0, 0xBEA7, 0xEAD0, /* 0x70 */
+         0, 	 0, 0xD6C7, 	 0, 	 0, 	 0, 0xC1C0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xEAD1, 	 0, 	 0, 0xCFBE, /* 0x80 */
+    0xD4CE, 0xEACD, 	 0, 	 0, 0xEAD2, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xCAEE, 	 0, 	 0, 	 0, 	 0, 0xC5AF, 0xB0B5, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEAD4, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xB3A9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xF4DF, 	 0, 	 0, 0xD4DD, 	 0, 	 0, 0xC4BA, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xB1A9, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE5DF, 	 0, 	 0, 	 0, 	 0, 0xEAD5, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xEACA, 	 0, 0xF8CF, 0xEABC, /* 0xC0 */
+         0, 0xCFFE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEAD3, 	 0, /* 0xD0 */
+         0, 0xCAEF, 	 0, 0xEAD6, 0xEAD7, 0xC6D8, 	 0, 	 0, /* 0xD0 */
+    0xBFF5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEAD8, 	 0, /* 0xE0 */
+         0, 0xEAD9, 	 0, 	 0, 0xC9B9, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xD4BB, 	 0, 0xC7FA, 0xD2B7, 0xB8FC, 	 0, 	 0, 0xEAC2, /* 0xF0 */
+    0xCAE9, 0xB2DC, 	 0, 	 0, 0xC2FC, 	 0, 0xD4F8, 0xCCE6	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_67[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD7EE,      0,      0, 0xBBE1,      0,      0,      0,      0, /* 0x00 */
-    0xD4C2, 0xD3D0, 0xEBC3, 0xC5F3,      0, 0xB7FE,      0,      0, /* 0x00 */
-    0xEBD4,      0,      0,      0, 0xCBB7, 0xEBDE,      0, 0xC0CA, /* 0x10 */
-         0,      0,      0, 0xCDFB,      0, 0xB3AF,      0, 0xC6DA, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xEBFC, 0xEBCA, /* 0x20 */
-    0xC4BE,      0, 0xCEB4, 0xC4A9, 0xB1BE, 0xD4FD,      0, 0xF8E8, /* 0x20 */
-         0, 0xD6EC,      0,      0, 0xF8E0, 0xB6E4,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xD0E0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xB8CB,      0, /* 0x40 */
-    0xE8BE, 0xC9BC,      0,      0, 0xE8BB,      0, 0xC0EE, 0xD0D3, /* 0x40 */
-    0xB2C4, 0xB4E5,      0, 0xE8BC,      0,      0, 0xD5C8,      0, /* 0x50 */
-         0,      0,      0,      0, 0xB6C5,      0, 0xE8BD, 0xCAF8, /* 0x50 */
-    0xB8DC,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xE8C2,      0,      0, 0xBABC,      0, 0xB1AD, /* 0x60 */
-    0xBDDC, 0xB6AB, 0xEABD, 0xE8C3,      0, 0xE8C6,      0, 0xE8CB, /* 0x70 */
-         0,      0,      0,      0, 0xE8CC,      0, 0xF8E9, 0xB0E5, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xE8C1, /* 0x80 */
-         0, 0xCDF7,      0, 0xE8CA,      0,      0,      0,      0, /* 0x80 */
-    0xCEF6,      0,      0,      0,      0, 0xD5ED,      0, 0xC1D6, /* 0x90 */
-    0xE8C4,      0, 0xC3B6,      0, 0xB9FB, 0xD6A6,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0xBFDD, /* 0xA0 */
-    0xE8D2,      0,      0, 0xE8D7,      0, 0xE8D5, 0xBCDC, 0xBCCF, /* 0xB0 */
-    0xE8DB,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xE8DE,      0, 0xE8DA, 0xB1FA,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xB0D8, /* 0xC0 */
-    0xC4B3, 0xB8CC, 0xC6E2, 0xC8BE, 0xC8E1,      0,      0,      0, /* 0xD0 */
-    0xE8CF, 0xE8D4, 0xE8D6,      0,      0, 0xE8D8, 0xD7F5,      0, /* 0xD0 */
-         0,      0, 0xE8DC,      0,      0, 0xB2E9,      0,      0, /* 0xE0 */
-         0, 0xE8D1,      0,      0, 0xBCED,      0,      0, 0xBFC2, /* 0xE0 */
-    0xE8CD, 0xD6F9,      0, 0xC1F8, 0xB2F1,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0,      0,      0, 0xCAC1  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD7EE, 	 0, 	 0, 0xBBE1, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xD4C2, 0xD3D0, 0xEBC3, 0xC5F3, 	 0, 0xB7FE, 	 0, 	 0, /* 0x00 */
+    0xEBD4, 	 0, 	 0, 	 0, 0xCBB7, 0xEBDE, 	 0, 0xC0CA, /* 0x10 */
+         0, 	 0, 	 0, 0xCDFB, 	 0, 0xB3AF, 	 0, 0xC6DA, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEBFC, 0xEBCA, /* 0x20 */
+    0xC4BE, 	 0, 0xCEB4, 0xC4A9, 0xB1BE, 0xD4FD, 	 0, 0xF8E8, /* 0x20 */
+         0, 0xD6EC, 	 0, 	 0, 0xF8E0, 0xB6E4, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD0E0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB8CB, 	 0, /* 0x40 */
+    0xE8BE, 0xC9BC, 	 0, 	 0, 0xE8BB, 	 0, 0xC0EE, 0xD0D3, /* 0x40 */
+    0xB2C4, 0xB4E5, 	 0, 0xE8BC, 	 0, 	 0, 0xD5C8, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xB6C5, 	 0, 0xE8BD, 0xCAF8, /* 0x50 */
+    0xB8DC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xE8C2, 	 0, 	 0, 0xBABC, 	 0, 0xB1AD, /* 0x60 */
+    0xBDDC, 0xB6AB, 0xEABD, 0xE8C3, 	 0, 0xE8C6, 	 0, 0xE8CB, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xE8CC, 	 0, 0xF8E9, 0xB0E5, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8C1, /* 0x80 */
+         0, 0xCDF7, 	 0, 0xE8CA, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xCEF6, 	 0, 	 0, 	 0, 	 0, 0xD5ED, 	 0, 0xC1D6, /* 0x90 */
+    0xE8C4, 	 0, 0xC3B6, 	 0, 0xB9FB, 0xD6A6, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBFDD, /* 0xA0 */
+    0xE8D2, 	 0, 	 0, 0xE8D7, 	 0, 0xE8D5, 0xBCDC, 0xBCCF, /* 0xB0 */
+    0xE8DB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xE8DE, 	 0, 0xE8DA, 0xB1FA, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB0D8, /* 0xC0 */
+    0xC4B3, 0xB8CC, 0xC6E2, 0xC8BE, 0xC8E1, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE8CF, 0xE8D4, 0xE8D6, 	 0, 	 0, 0xE8D8, 0xD7F5, 	 0, /* 0xD0 */
+         0, 	 0, 0xE8DC, 	 0, 	 0, 0xB2E9, 	 0, 	 0, /* 0xE0 */
+         0, 0xE8D1, 	 0, 	 0, 0xBCED, 	 0, 	 0, 0xBFC2, /* 0xE0 */
+    0xE8CD, 0xD6F9, 	 0, 0xC1F8, 0xB2F1, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCAC1	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_68[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE8D9,      0,      0,      0,      0, 0xD5A4,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0xCBA8,      0,      0,      0, 0xC0F5, /* 0x10 */
-         0,      0,      0,      0,      0, 0xE8E9,      0,      0, /* 0x10 */
-         0, 0xD0A3,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xE8F2, 0xD6EA,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xE8E0, 0xE8E1,      0,      0,      0,      0, /* 0x30 */
-    0xBACB, 0xB8F9,      0,      0, 0xB8F1, 0xD4D4,      0,      0, /* 0x30 */
-    0xE8EE, 0xE8EC, 0xB9F0, 0xCCD2, 0xE8E6, 0xCEA6, 0xBFF2,      0, /* 0x40 */
-    0xB0B8, 0xE8F1, 0xE8F0,      0, 0xD7C0,      0, 0xE8E4,      0, /* 0x40 */
-    0xCDA9, 0xC9A3,      0, 0xBBB8, 0xBDDB, 0xE8EA,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xE8F8,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xE8F5,      0, 0xCDB0, 0xE8F6, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xC1BA,      0, 0xE8E8,      0, 0xC3B7, 0xB0F0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0, 0xE8F4, /* 0x80 */
-         0,      0,      0, 0xE8F7,      0,      0,      0, 0xB9A3, /* 0x90 */
-    0xE8C5,      0,      0,      0,      0, 0xCCF5,      0, 0xE8C9, /* 0x90 */
-         0,      0, 0xC9D2,      0,      0,      0,      0, 0xCEE0, /* 0xA0 */
-    0xC0E6,      0,      0,      0,      0, 0xCBF3,      0, 0xCCDD, /* 0xA0 */
-    0xD0B5,      0,      0, 0xCAE1,      0, 0xE8F3,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xC6FA,      0,      0,      0, /* 0xC0 */
-         0, 0xC3DE,      0, 0xC6E5,      0, 0xB9F7,      0,      0, /* 0xC0 */
-         0,      0, 0xB0F4,      0,      0, 0xD7D8, 0xE8C7, 0xD4E6, /* 0xD0 */
-    0xBCAC,      0, 0xC5EF,      0,      0,      0,      0, 0xB6B0, /* 0xD0 */
-    0xCCC4,      0,      0, 0xE9A6,      0,      0,      0, 0xD5BB, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xC9AD,      0, /* 0xE0 */
-    0xE9A2, 0xC0E2, 0xC6DC,      0,      0, 0xBFC3,      0,      0, /* 0xF0 */
-         0, 0xE8FE, 0xB9D7,      0, 0xE8FB                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE8D9, 	 0, 	 0, 	 0, 	 0, 0xD5A4, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xCBA8, 	 0, 	 0, 	 0, 0xC0F5, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE8E9, 	 0, 	 0, /* 0x10 */
+         0, 0xD0A3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xE8F2, 0xD6EA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xE8E0, 0xE8E1, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xBACB, 0xB8F9, 	 0, 	 0, 0xB8F1, 0xD4D4, 	 0, 	 0, /* 0x30 */
+    0xE8EE, 0xE8EC, 0xB9F0, 0xCCD2, 0xE8E6, 0xCEA6, 0xBFF2, 	 0, /* 0x40 */
+    0xB0B8, 0xE8F1, 0xE8F0, 	 0, 0xD7C0, 	 0, 0xE8E4, 	 0, /* 0x40 */
+    0xCDA9, 0xC9A3, 	 0, 0xBBB8, 0xBDDB, 0xE8EA, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xE8F8, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xE8F5, 	 0, 0xCDB0, 0xE8F6, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xC1BA, 	 0, 0xE8E8, 	 0, 0xC3B7, 0xB0F0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8F4, /* 0x80 */
+         0, 	 0, 	 0, 0xE8F7, 	 0, 	 0, 	 0, 0xB9A3, /* 0x90 */
+    0xE8C5, 	 0, 	 0, 	 0, 	 0, 0xCCF5, 	 0, 0xE8C9, /* 0x90 */
+         0, 	 0, 0xC9D2, 	 0, 	 0, 	 0, 	 0, 0xCEE0, /* 0xA0 */
+    0xC0E6, 	 0, 	 0, 	 0, 	 0, 0xCBF3, 	 0, 0xCCDD, /* 0xA0 */
+    0xD0B5, 	 0, 	 0, 0xCAE1, 	 0, 0xE8F3, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xC6FA, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xC3DE, 	 0, 0xC6E5, 	 0, 0xB9F7, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xB0F4, 	 0, 	 0, 0xD7D8, 0xE8C7, 0xD4E6, /* 0xD0 */
+    0xBCAC, 	 0, 0xC5EF, 	 0, 	 0, 	 0, 	 0, 0xB6B0, /* 0xD0 */
+    0xCCC4, 	 0, 	 0, 0xE9A6, 	 0, 	 0, 	 0, 0xD5BB, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC9AD, 	 0, /* 0xE0 */
+    0xE9A2, 0xC0E2, 0xC6DC, 	 0, 	 0, 0xBFC3, 	 0, 	 0, /* 0xF0 */
+         0, 0xE8FE, 0xB9D7, 	 0, 0xE8FB							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_69[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE9A4,      0,      0,      0, 0xD2CE,      0,      0, /* 0x00 */
-         0,      0,      0, 0xE9A3,      0, 0xD6B2, 0xD7B5, 0xE8E2, /* 0x00 */
-    0xE9A7,      0, 0xBDB7,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xD2AC,      0,      0,      0, 0xE9B2,      0,      0,      0, /* 0x30 */
-         0, 0xE9A9,      0,      0,      0, 0xB4AA,      0, 0xB4BB, /* 0x30 */
-         0,      0, 0xE9AB,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xD1EE,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xB7E3, 0xD0A8,      0,      0, 0xE9A5, /* 0x50 */
-         0,      0, 0xB3FE,      0,      0, 0xE9AC, 0xC0E3,      0, /* 0x50 */
-    0xE9AA,      0,      0, 0xE9B9,      0,      0, 0xE9B8,      0, /* 0x60 */
-    0xE8E5,      0,      0, 0xE9AE,      0, 0xD2B5, 0xE8FA,      0, /* 0x60 */
-         0, 0xE9A8,      0,      0,      0, 0xBCAB,      0, 0xBFAC, /* 0x70 */
-    0xE9B1, 0xE9BA,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xE9AF,      0, 0xB8C5,      0,      0,      0, 0xD3DC,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xE9C7,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0xC0C6, 0xE9C5,      0,      0, /* 0x90 */
-    0xE9B0,      0,      0, 0xE9BB, 0xB0F1,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xE9BC, /* 0xA0 */
-    0xD5A5,      0, 0xE8BF, 0xE9BE,      0, 0xE9BF, 0xC8D9,      0, /* 0xA0 */
-         0, 0xE9C1,      0,      0, 0xC1F1,      0,      0, 0xC8B6, /* 0xB0 */
-         0,      0,      0, 0xE9BD,      0,      0,      0, 0xE8E7, /* 0xB0 */
-         0, 0xE9C2,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xE9C3, 0xB9B9, 0xE9B3, 0xC7B9, 0xE9B6,      0, /* 0xC0 */
-    0xBBB1,      0,      0,      0, 0xE9C0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE8FD, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xE9CA,      0,      0, /* 0xE0 */
-         0,      0, 0xE9CE, 0xBDB0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xB2DB,      0, 0xE9C8  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE9A4, 	 0, 	 0, 	 0, 0xD2CE, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xE9A3, 	 0, 0xD6B2, 0xD7B5, 0xE8E2, /* 0x00 */
+    0xE9A7, 	 0, 0xBDB7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xD2AC, 	 0, 	 0, 	 0, 0xE9B2, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xE9A9, 	 0, 	 0, 	 0, 0xB4AA, 	 0, 0xB4BB, /* 0x30 */
+         0, 	 0, 0xE9AB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xD1EE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xB7E3, 0xD0A8, 	 0, 	 0, 0xE9A5, /* 0x50 */
+         0, 	 0, 0xB3FE, 	 0, 	 0, 0xE9AC, 0xC0E3, 	 0, /* 0x50 */
+    0xE9AA, 	 0, 	 0, 0xE9B9, 	 0, 	 0, 0xE9B8, 	 0, /* 0x60 */
+    0xE8E5, 	 0, 	 0, 0xE9AE, 	 0, 0xD2B5, 0xE8FA, 	 0, /* 0x60 */
+         0, 0xE9A8, 	 0, 	 0, 	 0, 0xBCAB, 	 0, 0xBFAC, /* 0x70 */
+    0xE9B1, 0xE9BA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xE9AF, 	 0, 0xB8C5, 	 0, 	 0, 	 0, 0xD3DC, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE9C7, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xC0C6, 0xE9C5, 	 0, 	 0, /* 0x90 */
+    0xE9B0, 	 0, 	 0, 0xE9BB, 0xB0F1, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9BC, /* 0xA0 */
+    0xD5A5, 	 0, 0xE8BF, 0xE9BE, 	 0, 0xE9BF, 0xC8D9, 	 0, /* 0xA0 */
+         0, 0xE9C1, 	 0, 	 0, 0xC1F1, 	 0, 	 0, 0xC8B6, /* 0xB0 */
+         0, 	 0, 	 0, 0xE9BD, 	 0, 	 0, 	 0, 0xE8E7, /* 0xB0 */
+         0, 0xE9C2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xE9C3, 0xB9B9, 0xE9B3, 0xC7B9, 0xE9B6, 	 0, /* 0xC0 */
+    0xBBB1, 	 0, 	 0, 	 0, 0xE9C0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8FD, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE9CA, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xE9CE, 0xBDB0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB2DB, 	 0, 0xE9C8	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_6A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xD7AE, 0xC0D6,      0,      0, 0xE8C8,      0,      0, /* 0x00 */
-         0,      0, 0xB7AE,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0xC2A5,      0,      0,      0, 0xE9CB, /* 0x10 */
-    0xE9CC, 0xB1EA,      0,      0,      0,      0, 0xCAE0, 0xD5C1, /* 0x10 */
-         0, 0xC4A3,      0, 0xD1F9,      0,      0,      0,      0, /* 0x20 */
-    0xE9D8,      0, 0xBAE1,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xE9D4,      0,      0, /* 0x30 */
-    0xC6D3, 0xCAF7, 0xE8EB,      0,      0, 0xE9D7, 0xE9D0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xE9CF,      0,      0, 0xC7C1, /* 0x40 */
-    0xE8E3,      0,      0, 0xC7C5,      0,      0,      0,      0, /* 0x40 */
-    0xE9D2,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xE9D9, 0xB3C8,      0, 0xE9D3,      0,      0,      0, 0xBBFA, /* 0x50 */
-         0, 0xCFF0, 0xCDD6,      0,      0, 0xE9CD,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xB3F7,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xCCB4,      0,      0,      0, 0xCFAD,      0,      0,      0, /* 0x80 */
-         0, 0xE8DF,      0,      0,      0,      0, 0xE9D5,      0, /* 0x80 */
-    0xE9DC, 0xE9DB,      0,      0, 0xB5B5,      0,      0, 0xE9DE, /* 0x90 */
-         0,      0,      0,      0, 0xE8ED,      0,      0,      0, /* 0x90 */
-    0xE9D1,      0, 0xBCEC, 0xE9C9,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xE9DD,      0, 0xE9DF, 0xC3CA,      0,      0, 0xF8ED, /* 0xA0 */
-         0,      0,      0, 0xE9C4,      0,      0,      0,      0, /* 0xB0 */
-    0xC4FB,      0,      0, 0xBCF7,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xB9F1,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xE9D6,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xE9B5, 0xE8CE,      0, 0xE8FC, 0xE9DA, 0xE8DD, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE9C6, /* 0xE0 */
-    0xE8D3,      0, 0xE8C0,      0, 0xE9B4,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xE8D0,      0,      0,      0,      0, /* 0xF0 */
-    0xE9B7,      0,      0, 0xD3A3                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xD7AE, 0xC0D6, 	 0, 	 0, 0xE8C8, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xB7AE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xC2A5, 	 0, 	 0, 	 0, 0xE9CB, /* 0x10 */
+    0xE9CC, 0xB1EA, 	 0, 	 0, 	 0, 	 0, 0xCAE0, 0xD5C1, /* 0x10 */
+         0, 0xC4A3, 	 0, 0xD1F9, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xE9D8, 	 0, 0xBAE1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE9D4, 	 0, 	 0, /* 0x30 */
+    0xC6D3, 0xCAF7, 0xE8EB, 	 0, 	 0, 0xE9D7, 0xE9D0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xE9CF, 	 0, 	 0, 0xC7C1, /* 0x40 */
+    0xE8E3, 	 0, 	 0, 0xC7C5, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xE9D2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xE9D9, 0xB3C8, 	 0, 0xE9D3, 	 0, 	 0, 	 0, 0xBBFA, /* 0x50 */
+         0, 0xCFF0, 0xCDD6, 	 0, 	 0, 0xE9CD, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xB3F7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xCCB4, 	 0, 	 0, 	 0, 0xCFAD, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xE8DF, 	 0, 	 0, 	 0, 	 0, 0xE9D5, 	 0, /* 0x80 */
+    0xE9DC, 0xE9DB, 	 0, 	 0, 0xB5B5, 	 0, 	 0, 0xE9DE, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xE8ED, 	 0, 	 0, 	 0, /* 0x90 */
+    0xE9D1, 	 0, 0xBCEC, 0xE9C9, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xE9DD, 	 0, 0xE9DF, 0xC3CA, 	 0, 	 0, 0xF8ED, /* 0xA0 */
+         0, 	 0, 	 0, 0xE9C4, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xC4FB, 	 0, 	 0, 0xBCF7, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xB9F1, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xE9D6, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xE9B5, 0xE8CE, 	 0, 0xE8FC, 0xE9DA, 0xE8DD, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9C6, /* 0xE0 */
+    0xE8D3, 	 0, 0xE8C0, 	 0, 0xE9B4, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xE8D0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xE9B7, 	 0, 	 0, 0xD3A3									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_6B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xC0B8,      0,      0,      0, /* 0x00 */
-         0,      0, 0xC8A8,      0,      0,      0,      0, 0xE9A1, /* 0x00 */
-         0,      0, 0xE8EF,      0,      0,      0, 0xE9AD,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xE8F9,      0, /* 0x10 */
-    0xC7B7, 0xB4CE,      0, 0xD0C0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xD3FB,      0,      0,      0,      0, 0xECA4, /* 0x30 */
-         0, 0xECA5, 0xC6DB,      0,      0, 0xC7D5, 0xBFEE,      0, /* 0x30 */
-         0,      0,      0, 0xECA6,      0,      0, 0xECA7, 0xD0AA, /* 0x40 */
-         0, 0xC7B8,      0,      0, 0xB8E8,      0,      0,      0, /* 0x40 */
-    0xC5B7,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xECA8,      0,      0,      0,      0,      0, 0xECA3, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xC0B8, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xC8A8, 	 0, 	 0, 	 0, 	 0, 0xE9A1, /* 0x00 */
+         0, 	 0, 0xE8EF, 	 0, 	 0, 	 0, 0xE9AD, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8F9, 	 0, /* 0x10 */
+    0xC7B7, 0xB4CE, 	 0, 0xD0C0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xD3FB, 	 0, 	 0, 	 0, 	 0, 0xECA4, /* 0x30 */
+         0, 0xECA5, 0xC6DB, 	 0, 	 0, 0xC7D5, 0xBFEE, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xECA6, 	 0, 	 0, 0xECA7, 0xD0AA, /* 0x40 */
+         0, 0xC7B8, 	 0, 	 0, 0xB8E8, 	 0, 	 0, 	 0, /* 0x40 */
+    0xC5B7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xECA8, 	 0, 	 0, 	 0, 	 0, 	 0, 0xECA3, /* 0x50 */
          0, 0xBBB6, 0xD6B9, 0xD5FD, 0xB4CB, 0xB2BD, 0xCEE4, 0xC6E7, /* 0x60 */
-         0,      0, 0xCDE1,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xCBEA,      0,      0,      0,      0, 0xC0FA, /* 0x70 */
-    0xB9E9, 0xB4F5,      0, 0xCBC0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xE9E2, 0xE9E3, 0xD1EA, 0xE9E5,      0, 0xB4F9,      0, /* 0x80 */
-         0, 0xD1B3, 0xCAE2,      0,      0, 0xE9E8,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xD6B3,      0, /* 0x90 */
-    0xB2D0,      0,      0, 0xE9EA,      0,      0, 0xE9E6,      0, /* 0x90 */
-         0,      0,      0,      0, 0xE9E4,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xE9EC, 0xE9E9,      0,      0, 0xE9E7, 0xE9EB, /* 0xA0 */
-         0,      0, 0xBCDF, 0xECAF,      0, 0xB6CE,      0, 0xD2F3, /* 0xB0 */
-         0,      0, 0xC9B1, 0xBFC7,      0,      0,      0, 0xB5EE, /* 0xB0 */
-         0, 0xBBD9,      0,      0,      0, 0xD2E3, 0xC5B9,      0, /* 0xC0 */
-         0,      0,      0, 0xCEE3,      0, 0xC4B8,      0, 0xC3BF, /* 0xC0 */
-         0,      0, 0xB6BE, 0xD8B9, 0xB1C8,      0, 0xB1D1, 0xC5FE, /* 0xD0 */
-         0,      0,      0, 0xC3AB,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0xEBA4, 0xBAC1,      0,      0,      0, 0xCCBA, /* 0xE0 */
-         0,      0,      0, 0xEBA5,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xEBA8,      0,      0,      0, 0xEBA6,      0, 0xEBA7  /* 0xF0 */
+         0, 	 0, 0xCDE1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xCBEA, 	 0, 	 0, 	 0, 	 0, 0xC0FA, /* 0x70 */
+    0xB9E9, 0xB4F5, 	 0, 0xCBC0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xE9E2, 0xE9E3, 0xD1EA, 0xE9E5, 	 0, 0xB4F9, 	 0, /* 0x80 */
+         0, 0xD1B3, 0xCAE2, 	 0, 	 0, 0xE9E8, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD6B3, 	 0, /* 0x90 */
+    0xB2D0, 	 0, 	 0, 0xE9EA, 	 0, 	 0, 0xE9E6, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xE9E4, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xE9EC, 0xE9E9, 	 0, 	 0, 0xE9E7, 0xE9EB, /* 0xA0 */
+         0, 	 0, 0xBCDF, 0xECAF, 	 0, 0xB6CE, 	 0, 0xD2F3, /* 0xB0 */
+         0, 	 0, 0xC9B1, 0xBFC7, 	 0, 	 0, 	 0, 0xB5EE, /* 0xB0 */
+         0, 0xBBD9, 	 0, 	 0, 	 0, 0xD2E3, 0xC5B9, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xCEE3, 	 0, 0xC4B8, 	 0, 0xC3BF, /* 0xC0 */
+         0, 	 0, 0xB6BE, 0xD8B9, 0xB1C8, 	 0, 0xB1D1, 0xC5FE, /* 0xD0 */
+         0, 	 0, 	 0, 0xC3AB, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xEBA4, 0xBAC1, 	 0, 	 0, 	 0, 0xCCBA, /* 0xE0 */
+         0, 	 0, 	 0, 0xEBA5, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xEBA8, 	 0, 	 0, 	 0, 0xEBA6, 	 0, 0xEBA7	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_6C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xEBA9, 0xEBAB,      0, /* 0x00 */
-    0xD5B1,      0,      0,      0, 0xEBAA, 0xEBAC,      0, 0xCACF, /* 0x00 */
-    0xD8B5, 0xC3F1,      0, 0xC3A5,      0, 0xEBAD, 0xC4CA,      0, /* 0x10 */
-    0xEBAE, 0xEBAF, 0xEBB0, 0xB7D5,      0,      0,      0, 0xB7FA, /* 0x10 */
-         0, 0xEBB1,      0, 0xC6F8, 0xEBB3,      0, 0xBAA4, 0xD1F5, /* 0x20 */
-    0xB0B1,      0, 0xEBB4, 0xC7E2, 0xEBB2,      0, 0xB5AA, 0xC2C8, /* 0x20 */
-    0xC7E8,      0, 0xEBB5,      0, 0xCBAE, 0xE3DF,      0,      0, /* 0x30 */
-    0xD3C0,      0,      0,      0,      0, 0xD9DB,      0,      0, /* 0x30 */
-    0xCDA1, 0xD6AD, 0xC7F3,      0,      0,      0, 0xD9E0,      0, /* 0x40 */
-         0,      0, 0xE3E2,      0,      0,      0,      0,      0, /* 0x40 */
-    0xCFAB,      0,      0,      0, 0xE3E0, 0xC9C7,      0, 0xBAB9, /* 0x50 */
-         0,      0,      0, 0xD1B4, 0xE3E1, 0xC8EA, 0xB9AF, 0xBDAD, /* 0x50 */
-    0xB3D8, 0xCEDB,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0xE3E8, 0xE3E9, 0xCDF4,      0,      0,      0,      0,      0, /* 0x60 */
-    0xCCAD,      0, 0xBCB3,      0, 0xE3EA,      0, 0xE3EB,      0, /* 0x70 */
-         0, 0xD0DA,      0,      0,      0, 0xC6FB, 0xB7DA,      0, /* 0x70 */
-         0, 0xC7DF, 0xD2CA, 0xCED6,      0, 0xE3E4, 0xE3EC,      0, /* 0x80 */
-    0xC9F2, 0xB3C1,      0,      0, 0xE3E7,      0,      0, 0xC6E3, /* 0x80 */
-    0xE3E5,      0,      0, 0xEDB3, 0xE3E6,      0,      0,      0, /* 0x90 */
-         0, 0xC9B3,      0, 0xC5E6,      0,      0,      0,      0, /* 0x90 */
-         0, 0xC3BB,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xC4AD,      0, 0xE3F0, 0xBEDA,      0, /* 0xA0 */
-         0, 0xE3FB, 0xE3F5, 0xBAD3,      0,      0,      0,      0, /* 0xB0 */
-    0xB7D0, 0xD3CD,      0, 0xD6CE, 0xD5D3, 0xB9C1, 0xD5B4, 0xD1D8, /* 0xB0 */
-         0,      0,      0,      0, 0xD0B9, 0xC7F6,      0,      0, /* 0xC0 */
-         0, 0xC8AA, 0xB2B4,      0, 0xC3DA,      0,      0,      0, /* 0xC0 */
-    0xE3EE,      0,      0, 0xE3FC, 0xE3EF, 0xB7A8, 0xE3F7, 0xE3F4, /* 0xD0 */
-         0,      0,      0, 0xB7BA,      0,      0,      0,      0, /* 0xD0 */
-    0xE3F6, 0xC5DD, 0xB2A8, 0xC6FC,      0, 0xC4E0,      0,      0, /* 0xE0 */
-    0xD7A2,      0, 0xC0E1, 0xE3F9,      0,      0, 0xE3FA, 0xE3FD, /* 0xE0 */
-    0xCCA9, 0xE3F3,      0, 0xD3BE,      0, 0xB1C3                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xEBA9, 0xEBAB, 	 0, /* 0x00 */
+    0xD5B1, 	 0, 	 0, 	 0, 0xEBAA, 0xEBAC, 	 0, 0xCACF, /* 0x00 */
+    0xD8B5, 0xC3F1, 	 0, 0xC3A5, 	 0, 0xEBAD, 0xC4CA, 	 0, /* 0x10 */
+    0xEBAE, 0xEBAF, 0xEBB0, 0xB7D5, 	 0, 	 0, 	 0, 0xB7FA, /* 0x10 */
+         0, 0xEBB1, 	 0, 0xC6F8, 0xEBB3, 	 0, 0xBAA4, 0xD1F5, /* 0x20 */
+    0xB0B1, 	 0, 0xEBB4, 0xC7E2, 0xEBB2, 	 0, 0xB5AA, 0xC2C8, /* 0x20 */
+    0xC7E8, 	 0, 0xEBB5, 	 0, 0xCBAE, 0xE3DF, 	 0, 	 0, /* 0x30 */
+    0xD3C0, 	 0, 	 0, 	 0, 	 0, 0xD9DB, 	 0, 	 0, /* 0x30 */
+    0xCDA1, 0xD6AD, 0xC7F3, 	 0, 	 0, 	 0, 0xD9E0, 	 0, /* 0x40 */
+         0, 	 0, 0xE3E2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xCFAB, 	 0, 	 0, 	 0, 0xE3E0, 0xC9C7, 	 0, 0xBAB9, /* 0x50 */
+         0, 	 0, 	 0, 0xD1B4, 0xE3E1, 0xC8EA, 0xB9AF, 0xBDAD, /* 0x50 */
+    0xB3D8, 0xCEDB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xE3E8, 0xE3E9, 0xCDF4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xCCAD, 	 0, 0xBCB3, 	 0, 0xE3EA, 	 0, 0xE3EB, 	 0, /* 0x70 */
+         0, 0xD0DA, 	 0, 	 0, 	 0, 0xC6FB, 0xB7DA, 	 0, /* 0x70 */
+         0, 0xC7DF, 0xD2CA, 0xCED6, 	 0, 0xE3E4, 0xE3EC, 	 0, /* 0x80 */
+    0xC9F2, 0xB3C1, 	 0, 	 0, 0xE3E7, 	 0, 	 0, 0xC6E3, /* 0x80 */
+    0xE3E5, 	 0, 	 0, 0xEDB3, 0xE3E6, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xC9B3, 	 0, 0xC5E6, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xC3BB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xC4AD, 	 0, 0xE3F0, 0xBEDA, 	 0, /* 0xA0 */
+         0, 0xE3FB, 0xE3F5, 0xBAD3, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xB7D0, 0xD3CD, 	 0, 0xD6CE, 0xD5D3, 0xB9C1, 0xD5B4, 0xD1D8, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xD0B9, 0xC7F6, 	 0, 	 0, /* 0xC0 */
+         0, 0xC8AA, 0xB2B4, 	 0, 0xC3DA, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xE3EE, 	 0, 	 0, 0xE3FC, 0xE3EF, 0xB7A8, 0xE3F7, 0xE3F4, /* 0xD0 */
+         0, 	 0, 	 0, 0xB7BA, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xE3F6, 0xC5DD, 0xB2A8, 0xC6FC, 	 0, 0xC4E0, 	 0, 	 0, /* 0xE0 */
+    0xD7A2, 	 0, 0xC0E1, 0xE3F9, 	 0, 	 0, 0xE3FA, 0xE3FD, /* 0xE0 */
+    0xCCA9, 0xE3F3, 	 0, 0xD3BE, 	 0, 0xB1C3					/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -1278,1571 +1278,1571 @@ static sal_uInt16 const aImplUniToDBCSTab_GBT_6C[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_6D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xE4A7,      0,      0, 0xE4A6, /* 0x00 */
-         0,      0,      0, 0xD1F3, 0xE4A3,      0, 0xE4A9,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0, 0xCFB4, /* 0x10 */
-         0, 0xE4A8, 0xE4AE, 0xC2E5,      0,      0, 0xB6B4,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xBDF2,      0, 0xE4A2, /* 0x20 */
-         0,      0, 0xBAE9, 0xE4AA,      0,      0, 0xE4AC,      0, /* 0x20 */
-         0, 0xB6FD, 0xD6DE, 0xE4B2,      0, 0xE4AD,      0,      0, /* 0x30 */
-         0, 0xE4A1,      0, 0xBBEE,      0, 0xC7A2, 0xC5C9,      0, /* 0x30 */
-         0, 0xC1F7,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xD5E3, 0xBFA3,      0, 0xE4BA,      0, 0xE4B7,      0, /* 0x50 */
-    0xE4BB,      0,      0, 0xE4BD,      0,      0, 0xC6D6,      0, /* 0x60 */
-         0, 0xBAC6, 0xC0CB,      0,      0,      0, 0xB8A1, 0xE4B4, /* 0x60 */
-         0,      0,      0,      0, 0xD4A1,      0,      0, 0xBAA3, /* 0x70 */
-    0xBDFE, 0xE4A4,      0,      0, 0xE4BC,      0,      0,      0, /* 0x70 */
-         0,      0, 0xF8EF,      0,      0, 0xC4F9,      0, 0xE3FE, /* 0x80 */
-    0xCFFB, 0xC9E6,      0,      0, 0xD3BF,      0, 0xCFD1,      0, /* 0x80 */
-         0, 0xE4B3,      0, 0xE4B8, 0xE4B9, 0xCCE9,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xB8A2, 0xE4CA,      0,      0, 0xE4CC, 0xD1C4, /* 0xA0 */
-         0,      0, 0xD2BA,      0,      0, 0xBAAD,      0,      0, /* 0xB0 */
-    0xBAD4,      0,      0,      0,      0,      0,      0, 0xE4C3, /* 0xB0 */
-    0xF8AD,      0,      0,      0, 0xD7CD, 0xE4C0, 0xCFFD, 0xE4BF, /* 0xC0 */
-         0,      0,      0, 0xC1DC, 0xCCCA,      0,      0,      0, /* 0xC0 */
-         0, 0xCAE7,      0,      0,      0,      0, 0xC4D7,      0, /* 0xD0 */
-    0xCCD4, 0xE4C8,      0,      0,      0, 0xE4C7, 0xE4C1,      0, /* 0xD0 */
-    0xE4C4, 0xB5AD,      0,      0, 0xD3D9,      0, 0xE4C6,      0, /* 0xE0 */
-         0,      0, 0xC2D9, 0xD2F9, 0xB4E3,      0, 0xBBB4,      0, /* 0xE0 */
-         0, 0xC9EE,      0, 0xB4BE,      0, 0xD4A8, 0xE4B5, 0xBBEC, /* 0xF0 */
-         0, 0xD1CD, 0xC7B3, 0xCCED, 0xEDB5                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xE4A7, 	 0, 	 0, 0xE4A6, /* 0x00 */
+         0, 	 0, 	 0, 0xD1F3, 0xE4A3, 	 0, 0xE4A9, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCFB4, /* 0x10 */
+         0, 0xE4A8, 0xE4AE, 0xC2E5, 	 0, 	 0, 0xB6B4, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xBDF2, 	 0, 0xE4A2, /* 0x20 */
+         0, 	 0, 0xBAE9, 0xE4AA, 	 0, 	 0, 0xE4AC, 	 0, /* 0x20 */
+         0, 0xB6FD, 0xD6DE, 0xE4B2, 	 0, 0xE4AD, 	 0, 	 0, /* 0x30 */
+         0, 0xE4A1, 	 0, 0xBBEE, 	 0, 0xC7A2, 0xC5C9, 	 0, /* 0x30 */
+         0, 0xC1F7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xD5E3, 0xBFA3, 	 0, 0xE4BA, 	 0, 0xE4B7, 	 0, /* 0x50 */
+    0xE4BB, 	 0, 	 0, 0xE4BD, 	 0, 	 0, 0xC6D6, 	 0, /* 0x60 */
+         0, 0xBAC6, 0xC0CB, 	 0, 	 0, 	 0, 0xB8A1, 0xE4B4, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xD4A1, 	 0, 	 0, 0xBAA3, /* 0x70 */
+    0xBDFE, 0xE4A4, 	 0, 	 0, 0xE4BC, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xF8EF, 	 0, 	 0, 0xC4F9, 	 0, 0xE3FE, /* 0x80 */
+    0xCFFB, 0xC9E6, 	 0, 	 0, 0xD3BF, 	 0, 0xCFD1, 	 0, /* 0x80 */
+         0, 0xE4B3, 	 0, 0xE4B8, 0xE4B9, 0xCCE9, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xB8A2, 0xE4CA, 	 0, 	 0, 0xE4CC, 0xD1C4, /* 0xA0 */
+         0, 	 0, 0xD2BA, 	 0, 	 0, 0xBAAD, 	 0, 	 0, /* 0xB0 */
+    0xBAD4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4C3, /* 0xB0 */
+    0xF8AD, 	 0, 	 0, 	 0, 0xD7CD, 0xE4C0, 0xCFFD, 0xE4BF, /* 0xC0 */
+         0, 	 0, 	 0, 0xC1DC, 0xCCCA, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xCAE7, 	 0, 	 0, 	 0, 	 0, 0xC4D7, 	 0, /* 0xD0 */
+    0xCCD4, 0xE4C8, 	 0, 	 0, 	 0, 0xE4C7, 0xE4C1, 	 0, /* 0xD0 */
+    0xE4C4, 0xB5AD, 	 0, 	 0, 0xD3D9, 	 0, 0xE4C6, 	 0, /* 0xE0 */
+         0, 	 0, 0xC2D9, 0xD2F9, 0xB4E3, 	 0, 0xBBB4, 	 0, /* 0xE0 */
+         0, 0xC9EE, 	 0, 0xB4BE, 	 0, 0xD4A8, 0xE4B5, 0xBBEC, /* 0xF0 */
+         0, 0xD1CD, 0xC7B3, 0xCCED, 0xEDB5							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_6E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xC7E5,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0xE4CB,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xBBC1, 0xE4BE,      0,      0, 0xD3E5,      0,      0, /* 0x10 */
-    0xC7FE, 0xB6C9,      0, 0xD4FC, 0xB2B3, 0xE4D7, 0xCED0,      0, /* 0x20 */
-         0, 0xCEC2,      0, 0xE4CD, 0xB2E2, 0xCEBC,      0, 0xB8DB, /* 0x20 */
-         0,      0, 0xE4D6,      0, 0xBFCA,      0,      0,      0, /* 0x30 */
-    0xD3CE,      0, 0xC3EC,      0,      0,      0, 0xBBEB,      0, /* 0x30 */
-         0,      0,      0, 0xC5C8, 0xE4D8,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xCDC4, 0xE4CF,      0, /* 0x40 */
-         0,      0,      0, 0xE4D4, 0xE4D5,      0, 0xBAFE,      0, /* 0x50 */
-    0xCFE6,      0,      0, 0xD5BF,      0,      0, 0xE4A5, 0xE4D2, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xE4D0,      0,      0, 0xE4CE, 0xCCC0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xE4D3,      0, /* 0x80 */
-         0, 0xB8C8,      0,      0,      0,      0,      0, 0xE4E7, /* 0x80 */
-    0xD4B4,      0,      0,      0,      0,      0, 0xD7BC,      0, /* 0x90 */
-    0xE4DB,      0,      0,      0, 0xC1EF, 0xB9B5,      0, 0xE4E9, /* 0x90 */
-         0,      0, 0xD2E7,      0,      0, 0xE4DF,      0, 0xE4E0, /* 0xA0 */
-         0,      0, 0xCFAA,      0,      0,      0,      0, 0xCBDD, /* 0xA0 */
-         0, 0xE4DA, 0xE4D1,      0, 0xE4E5,      0, 0xC8DC, 0xE4E3, /* 0xB0 */
-         0,      0, 0xC4E7, 0xE4E2,      0, 0xE4E1,      0,      0, /* 0xB0 */
-         0, 0xB3FC, 0xE4E8,      0, 0xB2D7, 0xC3F0,      0, 0xB5E1, /* 0xC0 */
-         0,      0,      0, 0xD7CC, 0xB5D3,      0, 0xDCFE, 0xE4E6, /* 0xC0 */
-         0, 0xBBAC,      0, 0xD7D2, 0xCCCF, 0xEBF8,      0,      0, /* 0xD0 */
-         0,      0, 0xB9F6,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xBBA6,      0,      0, 0xD6CD, /* 0xE0 */
-         0,      0, 0xC9F8,      0, 0xB5CE,      0,      0, 0xC2B1, /* 0xF0 */
-    0xE4B0, 0xE4EF,      0,      0,      0,      0,      0, 0xC2FA  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xC7E5, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xE4CB, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xBBC1, 0xE4BE, 	 0, 	 0, 0xD3E5, 	 0, 	 0, /* 0x10 */
+    0xC7FE, 0xB6C9, 	 0, 0xD4FC, 0xB2B3, 0xE4D7, 0xCED0, 	 0, /* 0x20 */
+         0, 0xCEC2, 	 0, 0xE4CD, 0xB2E2, 0xCEBC, 	 0, 0xB8DB, /* 0x20 */
+         0, 	 0, 0xE4D6, 	 0, 0xBFCA, 	 0, 	 0, 	 0, /* 0x30 */
+    0xD3CE, 	 0, 0xC3EC, 	 0, 	 0, 	 0, 0xBBEB, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xC5C8, 0xE4D8, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCDC4, 0xE4CF, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xE4D4, 0xE4D5, 	 0, 0xBAFE, 	 0, /* 0x50 */
+    0xCFE6, 	 0, 	 0, 0xD5BF, 	 0, 	 0, 0xE4A5, 0xE4D2, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xE4D0, 	 0, 	 0, 0xE4CE, 0xCCC0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4D3, 	 0, /* 0x80 */
+         0, 0xB8C8, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE4E7, /* 0x80 */
+    0xD4B4, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD7BC, 	 0, /* 0x90 */
+    0xE4DB, 	 0, 	 0, 	 0, 0xC1EF, 0xB9B5, 	 0, 0xE4E9, /* 0x90 */
+         0, 	 0, 0xD2E7, 	 0, 	 0, 0xE4DF, 	 0, 0xE4E0, /* 0xA0 */
+         0, 	 0, 0xCFAA, 	 0, 	 0, 	 0, 	 0, 0xCBDD, /* 0xA0 */
+         0, 0xE4DA, 0xE4D1, 	 0, 0xE4E5, 	 0, 0xC8DC, 0xE4E3, /* 0xB0 */
+         0, 	 0, 0xC4E7, 0xE4E2, 	 0, 0xE4E1, 	 0, 	 0, /* 0xB0 */
+         0, 0xB3FC, 0xE4E8, 	 0, 0xB2D7, 0xC3F0, 	 0, 0xB5E1, /* 0xC0 */
+         0, 	 0, 	 0, 0xD7CC, 0xB5D3, 	 0, 0xDCFE, 0xE4E6, /* 0xC0 */
+         0, 0xBBAC, 	 0, 0xD7D2, 0xCCCF, 0xEBF8, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xB9F6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xBBA6, 	 0, 	 0, 0xD6CD, /* 0xE0 */
+         0, 	 0, 0xC9F8, 	 0, 0xB5CE, 	 0, 	 0, 0xC2B1, /* 0xF0 */
+    0xE4B0, 0xE4EF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC2FA	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_6F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xD3E6, 0xC6AF,      0,      0,      0, 0xC6E1,      0, /* 0x00 */
-         0, 0xE4F5,      0,      0,      0,      0,      0, 0xC2A9, /* 0x00 */
-         0,      0,      0,      0, 0xD1DD, 0xE4EE,      0,      0, /* 0x10 */
-         0,      0, 0xC5BD,      0,      0,      0,      0,      0, /* 0x10 */
-    0xC4AE,      0, 0xBABA, 0xC1B0, 0xE4ED,      0,      0,      0, /* 0x20 */
-         0, 0xE4F6, 0xE4F4, 0xC2FE, 0xD7D5, 0xE4DD,      0, 0xE4F0, /* 0x20 */
-         0, 0xCAFE, 0xD5C7, 0xD5C4,      0,      0, 0xE4F1,      0, /* 0x30 */
-    0xBDA5,      0,      0,      0,      0,      0, 0xD1FA, 0xBDAC, /* 0x30 */
-         0, 0xF2A3,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xC6C3,      0,      0, 0xBDE0,      0,      0,      0, /* 0x50 */
-    0xC5CB, 0xE3ED,      0, 0xC7B1,      0,      0, 0xC2BA,      0, /* 0x50 */
-         0,      0, 0xE4EA,      0, 0xC8F3,      0, 0xC1CA,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xCCB6, 0xB3B1, 0xE4B1, /* 0x60 */
-    0xC0A3,      0, 0xE4FB,      0, 0xE4F3,      0,      0, 0xE4E4, /* 0x70 */
-    0xE4FA,      0, 0xE4FD,      0, 0xE4FC,      0,      0, 0xE4B6, /* 0x70 */
-    0xC9AC,      0,      0,      0, 0xB3CE,      0, 0xBDBD, 0xC0D4, /* 0x80 */
-    0xB3BA, 0xE4F7,      0,      0, 0xE4F9, 0xE4F8, 0xC5EC,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0, 0xBDA7, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xE4C5, 0xD4E8,      0,      0, 0xD4F3,      0,      0, 0xE5A2, /* 0xA0 */
-         0, 0xEDB4,      0,      0,      0,      0, 0xE4AB,      0, /* 0xA0 */
-         0, 0xB5ED,      0, 0xB0C4,      0,      0, 0xE5A4,      0, /* 0xB0 */
-         0, 0xE5A3,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xBCA4, 0xD7C7, 0xE5A5, 0xC5A8,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xE5A1,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xCAAA,      0,      0, /* 0xD0 */
-    0xC5A2,      0,      0, 0xF8D5,      0,      0, 0xE5A8, 0xBCC3, /* 0xD0 */
-    0xE5A9, 0xE5A6,      0,      0, 0xCCCE,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xC0C4,      0,      0, 0xE5A7, 0xE5AA, /* 0xE0 */
-    0xCEAB, 0xB1F5,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xBDA6,      0, 0xE3F8,      0, 0xC2CB          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xD3E6, 0xC6AF, 	 0, 	 0, 	 0, 0xC6E1, 	 0, /* 0x00 */
+         0, 0xE4F5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC2A9, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xD1DD, 0xE4EE, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xC5BD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xC4AE, 	 0, 0xBABA, 0xC1B0, 0xE4ED, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xE4F6, 0xE4F4, 0xC2FE, 0xD7D5, 0xE4DD, 	 0, 0xE4F0, /* 0x20 */
+         0, 0xCAFE, 0xD5C7, 0xD5C4, 	 0, 	 0, 0xE4F1, 	 0, /* 0x30 */
+    0xBDA5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD1FA, 0xBDAC, /* 0x30 */
+         0, 0xF2A3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xC6C3, 	 0, 	 0, 0xBDE0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xC5CB, 0xE3ED, 	 0, 0xC7B1, 	 0, 	 0, 0xC2BA, 	 0, /* 0x50 */
+         0, 	 0, 0xE4EA, 	 0, 0xC8F3, 	 0, 0xC1CA, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCCB6, 0xB3B1, 0xE4B1, /* 0x60 */
+    0xC0A3, 	 0, 0xE4FB, 	 0, 0xE4F3, 	 0, 	 0, 0xE4E4, /* 0x70 */
+    0xE4FA, 	 0, 0xE4FD, 	 0, 0xE4FC, 	 0, 	 0, 0xE4B6, /* 0x70 */
+    0xC9AC, 	 0, 	 0, 	 0, 0xB3CE, 	 0, 0xBDBD, 0xC0D4, /* 0x80 */
+    0xB3BA, 0xE4F7, 	 0, 	 0, 0xE4F9, 0xE4F8, 0xC5EC, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBDA7, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xE4C5, 0xD4E8, 	 0, 	 0, 0xD4F3, 	 0, 	 0, 0xE5A2, /* 0xA0 */
+         0, 0xEDB4, 	 0, 	 0, 	 0, 	 0, 0xE4AB, 	 0, /* 0xA0 */
+         0, 0xB5ED, 	 0, 0xB0C4, 	 0, 	 0, 0xE5A4, 	 0, /* 0xB0 */
+         0, 0xE5A3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xBCA4, 0xD7C7, 0xE5A5, 0xC5A8, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xE5A1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCAAA, 	 0, 	 0, /* 0xD0 */
+    0xC5A2, 	 0, 	 0, 0xF8D5, 	 0, 	 0, 0xE5A8, 0xBCC3, /* 0xD0 */
+    0xE5A9, 0xE5A6, 	 0, 	 0, 0xCCCE, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xC0C4, 	 0, 	 0, 0xE5A7, 0xE5AA, /* 0xE0 */
+    0xCEAB, 0xB1F5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xBDA6, 	 0, 0xE3F8, 	 0, 0xC2CB			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_70[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xE4DE, 0xE4C2,      0, /* 0x00 */
-         0, 0xD0BA,      0, 0xE4C9,      0,      0,      0, 0xE4AF, /* 0x00 */
-         0, 0xC6D9,      0,      0,      0, 0xB1F4,      0,      0, /* 0x10 */
-    0xE3F2,      0, 0xE5AB, 0xE5AD,      0, 0xC1A4,      0, 0xE4EC, /* 0x10 */
-    0xE4EB,      0,      0, 0xE5AC,      0,      0,      0, 0xE3F1, /* 0x20 */
-    0xE4FE,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xF8D8,      0, 0xE4F2,      0,      0, 0xE5AF,      0,      0, /* 0x30 */
-         0, 0xE5AE,      0,      0,      0,      0, 0xC0BD,      0, /* 0x30 */
-         0,      0,      0, 0xE3E3, 0xE4DC,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xB9E0,      0,      0,      0, /* 0x40 */
-         0, 0xC8F7,      0,      0,      0, 0xC0EC,      0,      0, /* 0x50 */
-    0xCCB2,      0,      0,      0,      0, 0xE5B0, 0xE5B1,      0, /* 0x50 */
-         0,      0,      0, 0xCDE5, 0xC2D0,      0,      0, 0xE4D9, /* 0x60 */
-         0,      0,      0, 0xBBF0, 0xECE1,      0,      0,      0, /* 0x60 */
-    0xBBD2,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xBEC4,      0,      0,      0, 0xD7C6,      0, 0xD4D6,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xEAC1,      0,      0, /* 0x80 */
-         0,      0, 0xB4B6,      0,      0,      0, 0xD1D7,      0, /* 0x80 */
-         0,      0, 0xB3B4,      0, 0xC8B2, 0xBFBB, 0xECC0,      0, /* 0x90 */
-         0, 0xD6CB,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xECC5, 0xBEE6, 0xCCBF, 0xC5DA, 0xBEBC, /* 0xA0 */
-         0, 0xECC6,      0, 0xB1FE,      0,      0,      0, 0xECC4, /* 0xB0 */
-    0xD5A8,      0,      0, 0xECC2,      0,      0,      0,      0, /* 0xB0 */
-    0xECC3,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xC1D2,      0, 0xECC8,      0,      0,      0,      0, 0xCEDA, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xBAE6, 0xC0D3,      0,      0,      0,      0,      0, 0xD1CC, /* 0xD0 */
-         0,      0,      0,      0, 0xBFBE,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xCFA9, /* 0xE0 */
-         0,      0,      0,      0, 0xCCFE,      0,      0, 0xCDE9, /* 0xF0 */
-         0, 0xC5EB,      0,      0,      0, 0xB7E9                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xE4DE, 0xE4C2, 	 0, /* 0x00 */
+         0, 0xD0BA, 	 0, 0xE4C9, 	 0, 	 0, 	 0, 0xE4AF, /* 0x00 */
+         0, 0xC6D9, 	 0, 	 0, 	 0, 0xB1F4, 	 0, 	 0, /* 0x10 */
+    0xE3F2, 	 0, 0xE5AB, 0xE5AD, 	 0, 0xC1A4, 	 0, 0xE4EC, /* 0x10 */
+    0xE4EB, 	 0, 	 0, 0xE5AC, 	 0, 	 0, 	 0, 0xE3F1, /* 0x20 */
+    0xE4FE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xF8D8, 	 0, 0xE4F2, 	 0, 	 0, 0xE5AF, 	 0, 	 0, /* 0x30 */
+         0, 0xE5AE, 	 0, 	 0, 	 0, 	 0, 0xC0BD, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xE3E3, 0xE4DC, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xB9E0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xC8F7, 	 0, 	 0, 	 0, 0xC0EC, 	 0, 	 0, /* 0x50 */
+    0xCCB2, 	 0, 	 0, 	 0, 	 0, 0xE5B0, 0xE5B1, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xCDE5, 0xC2D0, 	 0, 	 0, 0xE4D9, /* 0x60 */
+         0, 	 0, 	 0, 0xBBF0, 0xECE1, 	 0, 	 0, 	 0, /* 0x60 */
+    0xBBD2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xBEC4, 	 0, 	 0, 	 0, 0xD7C6, 	 0, 0xD4D6, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEAC1, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xB4B6, 	 0, 	 0, 	 0, 0xD1D7, 	 0, /* 0x80 */
+         0, 	 0, 0xB3B4, 	 0, 0xC8B2, 0xBFBB, 0xECC0, 	 0, /* 0x90 */
+         0, 0xD6CB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xECC5, 0xBEE6, 0xCCBF, 0xC5DA, 0xBEBC, /* 0xA0 */
+         0, 0xECC6, 	 0, 0xB1FE, 	 0, 	 0, 	 0, 0xECC4, /* 0xB0 */
+    0xD5A8, 	 0, 	 0, 0xECC2, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xECC3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xC1D2, 	 0, 0xECC8, 	 0, 	 0, 	 0, 	 0, 0xCEDA, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xBAE6, 0xC0D3, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD1CC, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xBFBE, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCFA9, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xCCFE, 	 0, 	 0, 0xCDE9, /* 0xF0 */
+         0, 0xC5EB, 	 0, 	 0, 	 0, 0xB7E9					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_71[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-            0xD1C9, 0xBAB8,      0,      0,      0,      0,      0, /* 0x00 */
-    0xECC9,      0,      0, 0xECCA,      0,      0,      0,      0, /* 0x10 */
-         0, 0xB1BA, 0xB7D9,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xCEDE,      0,      0,      0,      0, 0xBDB9,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xECCC, /* 0x20 */
-    0xD1E6, 0xECCD,      0,      0,      0,      0, 0xC8BB,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xECD1,      0,      0, /* 0x40 */
-         0, 0xC1B6, 0xECD3,      0, 0xBBCD,      0, 0xBCE5,      0, /* 0x40 */
-         0,      0, 0xECBF,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xECCF,      0, 0xC9B7,      0, /* 0x50 */
-         0,      0, 0xDCE4,      0, 0xC3BA, 0xBBC0, 0xECE3, 0xD5D5, /* 0x60 */
-    0xECD0, 0xB7B3,      0,      0, 0xECBE,      0, 0xD6F3,      0, /* 0x60 */
-         0,      0, 0xECD2, 0xECCE,      0,      0,      0,      0, /* 0x70 */
-    0xECD4,      0, 0xECD5,      0,      0, 0xC9BF,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xCFA8,      0,      0,      0, /* 0x80 */
-         0,      0, 0xD0DC,      0,      0,      0,      0, 0xD1AC, /* 0x80 */
-         0,      0, 0xD3AB,      0, 0xC8DB,      0,      0, 0xECC1, /* 0x90 */
-    0xECD6, 0xCEF5,      0,      0,      0,      0,      0, 0xCAEC, /* 0x90 */
-    0xECDA,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xECD9,      0,      0,      0, 0xB0BE,      0,      0,      0, /* 0xA0 */
-         0, 0xC8C8,      0, 0xECD7,      0, 0xECD8,      0,      0, /* 0xB0 */
-         0, 0xECE4,      0,      0,      0,      0, 0xB3E3,      0, /* 0xB0 */
-         0, 0xECC7,      0, 0xC8BC,      0,      0,      0,      0, /* 0xC0 */
-    0xB5C6,      0,      0,      0,      0,      0, 0xC1C7,      0, /* 0xC0 */
-         0,      0, 0xC9D5,      0, 0xECDC, 0xD1E0,      0,      0, /* 0xD0 */
-         0, 0xCCCC,      0,      0, 0xECCB,      0,      0, 0xD3AA, /* 0xD0 */
-    0xECDB,      0,      0,      0,      0, 0xD4EF, 0xB2D3, 0xECDD, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xD6F2, 0xDBC6,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xBBE2,      0,      0,      0, /* 0xF0 */
-         0, 0xECDE,      0,      0, 0xBDFD,      0, 0xECE2          /* 0xF0 */
+            0xD1C9, 0xBAB8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xECC9, 	 0, 	 0, 0xECCA, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xB1BA, 0xB7D9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xCEDE, 	 0, 	 0, 	 0, 	 0, 0xBDB9, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xECCC, /* 0x20 */
+    0xD1E6, 0xECCD, 	 0, 	 0, 	 0, 	 0, 0xC8BB, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xECD1, 	 0, 	 0, /* 0x40 */
+         0, 0xC1B6, 0xECD3, 	 0, 0xBBCD, 	 0, 0xBCE5, 	 0, /* 0x40 */
+         0, 	 0, 0xECBF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xECCF, 	 0, 0xC9B7, 	 0, /* 0x50 */
+         0, 	 0, 0xDCE4, 	 0, 0xC3BA, 0xBBC0, 0xECE3, 0xD5D5, /* 0x60 */
+    0xECD0, 0xB7B3, 	 0, 	 0, 0xECBE, 	 0, 0xD6F3, 	 0, /* 0x60 */
+         0, 	 0, 0xECD2, 0xECCE, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xECD4, 	 0, 0xECD5, 	 0, 	 0, 0xC9BF, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xCFA8, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xD0DC, 	 0, 	 0, 	 0, 	 0, 0xD1AC, /* 0x80 */
+         0, 	 0, 0xD3AB, 	 0, 0xC8DB, 	 0, 	 0, 0xECC1, /* 0x90 */
+    0xECD6, 0xCEF5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCAEC, /* 0x90 */
+    0xECDA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xECD9, 	 0, 	 0, 	 0, 0xB0BE, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xC8C8, 	 0, 0xECD7, 	 0, 0xECD8, 	 0, 	 0, /* 0xB0 */
+         0, 0xECE4, 	 0, 	 0, 	 0, 	 0, 0xB3E3, 	 0, /* 0xB0 */
+         0, 0xECC7, 	 0, 0xC8BC, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xB5C6, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC1C7, 	 0, /* 0xC0 */
+         0, 	 0, 0xC9D5, 	 0, 0xECDC, 0xD1E0, 	 0, 	 0, /* 0xD0 */
+         0, 0xCCCC, 	 0, 	 0, 0xECCB, 	 0, 	 0, 0xD3AA, /* 0xD0 */
+    0xECDB, 	 0, 	 0, 	 0, 	 0, 0xD4EF, 0xB2D3, 0xECDD, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD6F2, 0xDBC6, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xBBE2, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xECDE, 	 0, 	 0, 0xBDFD, 	 0, 0xECE2			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_72[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0xB1AC,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0xCBB8,      0,      0, /* 0x00 */
-    0xC2AF,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xC0C3,      0, 0xECDF,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xECE0,      0, 0xD7A6,      0, 0xC5C0, 0xD5F9,      0,      0, /* 0x20 */
-    0xEBBC,      0, 0xCEAA,      0,      0, 0xBEF4, 0xB8B8,      0, /* 0x30 */
-    0xB0D6, 0xB5F9, 0xD2AF, 0xD8B3,      0, 0xCBAC, 0xB6FB, 0xE3DD, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xC6AC, /* 0x40 */
-    0xB0E6,      0,      0,      0, 0xC5C6,      0,      0,      0, /* 0x40 */
-         0,      0, 0xEBBA,      0,      0,      0, 0xEBBB,      0, /* 0x50 */
-    0xEBB9, 0xD1C0,      0, 0xC5A3,      0, 0xEAF2,      0, 0xC4B2, /* 0x50 */
-         0, 0xC4B5, 0xC0CE,      0,      0,      0, 0xEAF3, 0xC4C1, /* 0x60 */
-         0, 0xCEEF,      0,      0,      0,      0, 0xEAF0, 0xEAF4, /* 0x60 */
-         0,      0, 0xC9FC,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xCCD8,      0,      0,      0, 0xC7A3, 0xEAF5, 0xEAF6, /* 0x70 */
-    0xCFAC, 0xC0E7,      0,      0, 0xEAF7,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xEAF8,      0, 0xEAF9,      0, 0xEAFA, /* 0x80 */
-         0,      0, 0xEAFB,      0,      0,      0, 0xDCFD,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xEAF1, /* 0x90 */
-         0,      0, 0xB6BF,      0,      0,      0,      0, 0xCEFE, /* 0xA0 */
-         0,      0,      0,      0, 0xC8AE, 0xE1EB,      0, 0xB7B8, /* 0xA0 */
-    0xE1EC,      0,      0,      0, 0xE1ED,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xD7B4, 0xE1F1, 0xBFF1, 0xE1F0, 0xB5D2,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xE1F3, 0xE1F2,      0, /* 0xC0 */
-    0xBAFC,      0, 0xE1F4,      0,      0,      0,      0, 0xB9B7, /* 0xD0 */
-         0, 0xBED1,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xBADD, 0xBDC6,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xE1F5, 0xE1F7,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xE1FC, 0xE1F9,      0,      0, 0xE1FA, /* 0xF0 */
-    0xC0EA, 0xCFC1, 0xE1FE, 0xE2A1, 0xC0C7, 0xB1B7                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0xB1AC, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCBB8, 	 0, 	 0, /* 0x00 */
+    0xC2AF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xC0C3, 	 0, 0xECDF, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xECE0, 	 0, 0xD7A6, 	 0, 0xC5C0, 0xD5F9, 	 0, 	 0, /* 0x20 */
+    0xEBBC, 	 0, 0xCEAA, 	 0, 	 0, 0xBEF4, 0xB8B8, 	 0, /* 0x30 */
+    0xB0D6, 0xB5F9, 0xD2AF, 0xD8B3, 	 0, 0xCBAC, 0xB6FB, 0xE3DD, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC6AC, /* 0x40 */
+    0xB0E6, 	 0, 	 0, 	 0, 0xC5C6, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xEBBA, 	 0, 	 0, 	 0, 0xEBBB, 	 0, /* 0x50 */
+    0xEBB9, 0xD1C0, 	 0, 0xC5A3, 	 0, 0xEAF2, 	 0, 0xC4B2, /* 0x50 */
+         0, 0xC4B5, 0xC0CE, 	 0, 	 0, 	 0, 0xEAF3, 0xC4C1, /* 0x60 */
+         0, 0xCEEF, 	 0, 	 0, 	 0, 	 0, 0xEAF0, 0xEAF4, /* 0x60 */
+         0, 	 0, 0xC9FC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xCCD8, 	 0, 	 0, 	 0, 0xC7A3, 0xEAF5, 0xEAF6, /* 0x70 */
+    0xCFAC, 0xC0E7, 	 0, 	 0, 0xEAF7, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xEAF8, 	 0, 0xEAF9, 	 0, 0xEAFA, /* 0x80 */
+         0, 	 0, 0xEAFB, 	 0, 	 0, 	 0, 0xDCFD, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEAF1, /* 0x90 */
+         0, 	 0, 0xB6BF, 	 0, 	 0, 	 0, 	 0, 0xCEFE, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xC8AE, 0xE1EB, 	 0, 0xB7B8, /* 0xA0 */
+    0xE1EC, 	 0, 	 0, 	 0, 0xE1ED, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xD7B4, 0xE1F1, 0xBFF1, 0xE1F0, 0xB5D2, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE1F3, 0xE1F2, 	 0, /* 0xC0 */
+    0xBAFC, 	 0, 0xE1F4, 	 0, 	 0, 	 0, 	 0, 0xB9B7, /* 0xD0 */
+         0, 0xBED1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xBADD, 0xBDC6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xE1F5, 0xE1F7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xE1FC, 0xE1F9, 	 0, 	 0, 0xE1FA, /* 0xF0 */
+    0xC0EA, 0xCFC1, 0xE1FE, 0xE2A1, 0xC0C7, 0xB1B7					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_73[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE1FB,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xE2A5,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0xE2A3,      0,      0, 0xB2FE, 0xE2A2, /* 0x10 */
-         0, 0xD5F8,      0, 0xC3CD, 0xB2C2, 0xE2A7, 0xE2A6,      0, /* 0x10 */
-         0,      0, 0xE2A9,      0,      0, 0xE2AB,      0,      0, /* 0x20 */
-         0, 0xD0C9, 0xD6ED, 0xC3A8, 0xE2AC,      0,      0,      0, /* 0x20 */
-         0, 0xE2AE,      0,      0, 0xBAEF,      0, 0xD3CC, 0xE9E0, /* 0x30 */
-    0xE2AD, 0xE2AA,      0, 0xE1F8,      0,      0, 0xBBAB, 0xD4B3, /* 0x30 */
-         0, 0xE1EF,      0,      0, 0xD3FC, 0xCAA8,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xE2B0,      0,      0, /* 0x40 */
-    0xE2AF,      0, 0xE9E1,      0,      0,      0,      0, 0xE2B1, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xE2B2,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0xB6C0,      0, 0xE1F6, 0xE1FD, 0xE2B3,      0,      0, 0xE2B4, /* 0x60 */
-    0xC4FC,      0, 0xBBF1,      0,      0, 0xC1D4,      0, 0xE1EE, /* 0x70 */
-    0xCADE,      0, 0xCCA1, 0xCFD7, 0xE2A8,      0, 0xE2B5,      0, /* 0x70 */
-    0xE2A4,      0,      0,      0, 0xD0FE,      0,      0, 0xC2CA, /* 0x80 */
-         0, 0xD3F1,      0, 0xCDF5,      0,      0, 0xE7E0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xBEC1,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xE7E4, /* 0x90 */
-         0,      0, 0xE7E3,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xCDE6,      0, 0xC3B5,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xC1E1, 0xE7E9,      0,      0,      0, 0xE7E8, /* 0xB0 */
-         0,      0,      0, 0xB2A3,      0,      0,      0,      0, /* 0xB0 */
-    0xE7EA,      0, 0xE7E6,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xE7EC, 0xE7EB, 0xC9BA,      0,      0, 0xD5E4,      0, 0xE7E5, /* 0xC0 */
-    0xB7A9,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xE7EE,      0,      0,      0,      0, 0xE7F3,      0, /* 0xD0 */
-    0xD6E9,      0,      0,      0,      0, 0xE7ED,      0, 0xE7F2, /* 0xE0 */
-         0, 0xE7F1,      0,      0,      0, 0xB0E0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0,      0, 0xCFD6          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE1FB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xE2A5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xE2A3, 	 0, 	 0, 0xB2FE, 0xE2A2, /* 0x10 */
+         0, 0xD5F8, 	 0, 0xC3CD, 0xB2C2, 0xE2A7, 0xE2A6, 	 0, /* 0x10 */
+         0, 	 0, 0xE2A9, 	 0, 	 0, 0xE2AB, 	 0, 	 0, /* 0x20 */
+         0, 0xD0C9, 0xD6ED, 0xC3A8, 0xE2AC, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xE2AE, 	 0, 	 0, 0xBAEF, 	 0, 0xD3CC, 0xE9E0, /* 0x30 */
+    0xE2AD, 0xE2AA, 	 0, 0xE1F8, 	 0, 	 0, 0xBBAB, 0xD4B3, /* 0x30 */
+         0, 0xE1EF, 	 0, 	 0, 0xD3FC, 0xCAA8, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE2B0, 	 0, 	 0, /* 0x40 */
+    0xE2AF, 	 0, 0xE9E1, 	 0, 	 0, 	 0, 	 0, 0xE2B1, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xE2B2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xB6C0, 	 0, 0xE1F6, 0xE1FD, 0xE2B3, 	 0, 	 0, 0xE2B4, /* 0x60 */
+    0xC4FC, 	 0, 0xBBF1, 	 0, 	 0, 0xC1D4, 	 0, 0xE1EE, /* 0x70 */
+    0xCADE, 	 0, 0xCCA1, 0xCFD7, 0xE2A8, 	 0, 0xE2B5, 	 0, /* 0x70 */
+    0xE2A4, 	 0, 	 0, 	 0, 0xD0FE, 	 0, 	 0, 0xC2CA, /* 0x80 */
+         0, 0xD3F1, 	 0, 0xCDF5, 	 0, 	 0, 0xE7E0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBEC1, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7E4, /* 0x90 */
+         0, 	 0, 0xE7E3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xCDE6, 	 0, 0xC3B5, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xC1E1, 0xE7E9, 	 0, 	 0, 	 0, 0xE7E8, /* 0xB0 */
+         0, 	 0, 	 0, 0xB2A3, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xE7EA, 	 0, 0xE7E6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xE7EC, 0xE7EB, 0xC9BA, 	 0, 	 0, 0xD5E4, 	 0, 0xE7E5, /* 0xC0 */
+    0xB7A9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xE7EE, 	 0, 	 0, 	 0, 	 0, 0xE7F3, 	 0, /* 0xD0 */
+    0xD6E9, 	 0, 	 0, 	 0, 	 0, 0xE7ED, 	 0, 0xE7F2, /* 0xE0 */
+         0, 0xE7F1, 	 0, 	 0, 	 0, 0xB0E0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCFD6			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_74[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xC7F2,      0, 0xC0C5, 0xC0ED,      0, /* 0x00 */
-         0, 0xC1F0, 0xE7F0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0xE8A2, 0xE8A1,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0xD7C1,      0,      0, 0xE7FA, 0xE7F9,      0, /* 0x20 */
-    0xE7FB,      0, 0xE7F7,      0, 0xE7FE,      0, 0xE7FD,      0, /* 0x20 */
-    0xE7FC,      0,      0, 0xC1D5, 0xC7D9, 0xC5FD, 0xC5C3,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0, 0xE7F5, /* 0x30 */
-         0, 0xE8A3,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xE7E2,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xE8A6,      0, 0xE8A5, /* 0x50 */
-         0, 0xE8A7, 0xBAF7, 0xE7F8, 0xE8A4,      0, 0xC8F0, 0xC9AA, /* 0x50 */
-         0,      0,      0, 0xCBF6,      0,      0,      0,      0, /* 0x60 */
-         0, 0xD3A8, 0xC2EA,      0,      0, 0xE8A9,      0,      0, /* 0x60 */
-    0xB9E5,      0,      0,      0,      0,      0, 0xD1FE,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xE8AA,      0, /* 0x70 */
-    0xE8AD, 0xE8AE,      0, 0xC1A7,      0,      0,      0, 0xE8AF, /* 0x80 */
-         0, 0xE7F6,      0, 0xE8B0,      0,      0,      0,      0, /* 0x80 */
-    0xE8B4,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xE8AB,      0, 0xE8B1,      0, /* 0x90 */
-         0,      0,      0, 0xE7E1,      0,      0, 0xE8A8, 0xE8B5, /* 0xA0 */
-    0xE8B2, 0xE8B3,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xBBB7,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xE8B7,      0,      0, 0xE7F4,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xC7ED,      0,      0,      0,      0, 0xE7E7, /* 0xC0 */
-         0,      0,      0,      0, 0xE8AC,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xE8B6,      0, 0xB9CF,      0, 0xF0AC,      0, /* 0xD0 */
-    0xF0AD,      0, 0xC6B0, 0xB0EA, 0xC8BF,      0, 0xCDDF,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xCECD,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xEAB2,      0, 0xC6BF, 0xB4C9, /* 0xF0 */
-         0,      0,      0,      0,      0,      0,      0, 0xEAB3  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xC7F2, 	 0, 0xC0C5, 0xC0ED, 	 0, /* 0x00 */
+         0, 0xC1F0, 0xE7F0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xE8A2, 0xE8A1, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xD7C1, 	 0, 	 0, 0xE7FA, 0xE7F9, 	 0, /* 0x20 */
+    0xE7FB, 	 0, 0xE7F7, 	 0, 0xE7FE, 	 0, 0xE7FD, 	 0, /* 0x20 */
+    0xE7FC, 	 0, 	 0, 0xC1D5, 0xC7D9, 0xC5FD, 0xC5C3, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7F5, /* 0x30 */
+         0, 0xE8A3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xE7E2, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE8A6, 	 0, 0xE8A5, /* 0x50 */
+         0, 0xE8A7, 0xBAF7, 0xE7F8, 0xE8A4, 	 0, 0xC8F0, 0xC9AA, /* 0x50 */
+         0, 	 0, 	 0, 0xCBF6, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xD3A8, 0xC2EA, 	 0, 	 0, 0xE8A9, 	 0, 	 0, /* 0x60 */
+    0xB9E5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD1FE, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE8AA, 	 0, /* 0x70 */
+    0xE8AD, 0xE8AE, 	 0, 0xC1A7, 	 0, 	 0, 	 0, 0xE8AF, /* 0x80 */
+         0, 0xE7F6, 	 0, 0xE8B0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE8B4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xE8AB, 	 0, 0xE8B1, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xE7E1, 	 0, 	 0, 0xE8A8, 0xE8B5, /* 0xA0 */
+    0xE8B2, 0xE8B3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xBBB7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xE8B7, 	 0, 	 0, 0xE7F4, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xC7ED, 	 0, 	 0, 	 0, 	 0, 0xE7E7, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xE8AC, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xE8B6, 	 0, 0xB9CF, 	 0, 0xF0AC, 	 0, /* 0xD0 */
+    0xF0AD, 	 0, 0xC6B0, 0xB0EA, 0xC8BF, 	 0, 0xCDDF, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCECD, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xEAB2, 	 0, 0xC6BF, 0xB4C9, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEAB3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_75[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xD5E7,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0xEAB1, 0xDDF9,      0, 0xEAB4, /* 0x00 */
-         0, 0xEAB5,      0, 0xEAB6,      0,      0,      0,      0, /* 0x10 */
-    0xB8CA, 0xDFB0, 0xC9F5,      0, 0xCCF0,      0,      0, 0xC9FA, /* 0x10 */
-         0,      0,      0, 0xB2FA,      0, 0xC9FB,      0,      0, /* 0x20 */
-    0xD3C3, 0xCBA6,      0, 0xB8A6, 0xF0AE, 0xB1C2,      0, 0xE5B8, /* 0x20 */
-    0xCCEF, 0xD3C9, 0xBCD7, 0xC9EA,      0,      0,      0, 0xC4D0, /* 0x30 */
-    0xB5E9,      0, 0xEEAE,      0,      0,      0, 0xE7DE,      0, /* 0x30 */
-    0xEEAF,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-    0xEEB2,      0,      0, 0xEEB1, 0xBDE7,      0, 0xEEB0, 0xCEB7, /* 0x40 */
-         0,      0,      0,      0, 0xC5CF,      0,      0,      0, /* 0x50 */
-         0, 0xC1F4, 0xDBCE, 0xEEB3, 0xD0F3, 0xC4B6,      0,      0, /* 0x50 */
-         0,      0, 0xB1CF,      0,      0, 0xC2D4, 0xC6E8,      0, /* 0x60 */
-         0,      0, 0xB7AC, 0xBBAD,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xEEB4,      0,      0,      0, 0xB5B1,      0, /* 0x70 */
-    0xBBFB, 0xEEB5,      0,      0,      0,      0,      0, 0xE7DC, /* 0x70 */
-         0,      0,      0, 0xEEB6,      0,      0, 0xBDAE, 0xB3EB, /* 0x80 */
-         0,      0, 0xB5FE, 0xF1E2,      0,      0,      0, 0xCAE8, /* 0x80 */
-         0, 0xD2C9, 0xF0DA,      0, 0xF0DB,      0,      0,      0, /* 0x90 */
-         0, 0xB8ED, 0xBECE,      0,      0, 0xF0DE,      0,      0, /* 0x90 */
-         0,      0,      0, 0xF0E0, 0xB0CC, 0xBDEA,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xD2DF,      0,      0,      0,      0, /* 0xA0 */
-    0xF0E6, 0xF0E5, 0xC6A3, 0xF0E1, 0xF0E2, 0xB4C3,      0,      0, /* 0xB0 */
-    0xF0E3, 0xD5EE,      0,      0, 0xCCDB, 0xBED2, 0xBCB2,      0, /* 0xB0 */
-         0,      0, 0xF0E8, 0xF0E7, 0xF0E4, 0xB2A1,      0, 0xF9A1, /* 0xC0 */
-         0,      0, 0xC8AC,      0,      0, 0xF0EA,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xD6CC, 0xBADB,      0,      0, /* 0xD0 */
-    0xB6BB, 0xBEB7,      0, 0xCDB4,      0,      0, 0xC6A6,      0, /* 0xD0 */
-         0,      0, 0xC1A1, 0xF0EB, 0xF0EE,      0, 0xF0ED, 0xF0F0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xCCB5, 0xF0F2,      0,      0, 0xB3D5,      0,      0,      0, /* 0xF0 */
-         0, 0xB1D4,      0,      0, 0xF0F3,      0,      0, 0xF0F4  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xD5E7, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xEAB1, 0xDDF9, 	 0, 0xEAB4, /* 0x00 */
+         0, 0xEAB5, 	 0, 0xEAB6, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xB8CA, 0xDFB0, 0xC9F5, 	 0, 0xCCF0, 	 0, 	 0, 0xC9FA, /* 0x10 */
+         0, 	 0, 	 0, 0xB2FA, 	 0, 0xC9FB, 	 0, 	 0, /* 0x20 */
+    0xD3C3, 0xCBA6, 	 0, 0xB8A6, 0xF0AE, 0xB1C2, 	 0, 0xE5B8, /* 0x20 */
+    0xCCEF, 0xD3C9, 0xBCD7, 0xC9EA, 	 0, 	 0, 	 0, 0xC4D0, /* 0x30 */
+    0xB5E9, 	 0, 0xEEAE, 	 0, 	 0, 	 0, 0xE7DE, 	 0, /* 0x30 */
+    0xEEAF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xEEB2, 	 0, 	 0, 0xEEB1, 0xBDE7, 	 0, 0xEEB0, 0xCEB7, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xC5CF, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xC1F4, 0xDBCE, 0xEEB3, 0xD0F3, 0xC4B6, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xB1CF, 	 0, 	 0, 0xC2D4, 0xC6E8, 	 0, /* 0x60 */
+         0, 	 0, 0xB7AC, 0xBBAD, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xEEB4, 	 0, 	 0, 	 0, 0xB5B1, 	 0, /* 0x70 */
+    0xBBFB, 0xEEB5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7DC, /* 0x70 */
+         0, 	 0, 	 0, 0xEEB6, 	 0, 	 0, 0xBDAE, 0xB3EB, /* 0x80 */
+         0, 	 0, 0xB5FE, 0xF1E2, 	 0, 	 0, 	 0, 0xCAE8, /* 0x80 */
+         0, 0xD2C9, 0xF0DA, 	 0, 0xF0DB, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xB8ED, 0xBECE, 	 0, 	 0, 0xF0DE, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xF0E0, 0xB0CC, 0xBDEA, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xD2DF, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xF0E6, 0xF0E5, 0xC6A3, 0xF0E1, 0xF0E2, 0xB4C3, 	 0, 	 0, /* 0xB0 */
+    0xF0E3, 0xD5EE, 	 0, 	 0, 0xCCDB, 0xBED2, 0xBCB2, 	 0, /* 0xB0 */
+         0, 	 0, 0xF0E8, 0xF0E7, 0xF0E4, 0xB2A1, 	 0, 0xF9A1, /* 0xC0 */
+         0, 	 0, 0xC8AC, 	 0, 	 0, 0xF0EA, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xD6CC, 0xBADB, 	 0, 	 0, /* 0xD0 */
+    0xB6BB, 0xBEB7, 	 0, 0xCDB4, 	 0, 	 0, 0xC6A6, 	 0, /* 0xD0 */
+         0, 	 0, 0xC1A1, 0xF0EB, 0xF0EE, 	 0, 0xF0ED, 0xF0F0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xCCB5, 0xF0F2, 	 0, 	 0, 0xB3D5, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xB1D4, 	 0, 	 0, 0xF0F3, 	 0, 	 0, 0xF0F4	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_76[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF0F6, 0xB4E1, 0xF0E9, 0xF0F1,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xF0FA, 0xB7E8, 0xF0F8, 0xD1F1,      0,      0, /* 0x00 */
-    0xF0F5,      0,      0, 0xBBBE,      0, 0xF0FD,      0,      0, /* 0x10 */
-         0, 0xF0FE,      0, 0xF1A1,      0,      0, 0xF0F9, 0xCEC1, /* 0x10 */
-    0xF1A4, 0xB4AF, 0xF1A3,      0, 0xC1F6, 0xF0FB, 0xCADD, 0xC5B1, /* 0x20 */
-         0, 0xB4F1,      0,      0,      0, 0xF1A6,      0,      0, /* 0x20 */
-    0xF1A7,      0,      0, 0xF1AC, 0xD5CE, 0xF1A9,      0,      0, /* 0x30 */
-    0xC8B3,      0,      0, 0xF0FC, 0xF1A2,      0,      0,      0, /* 0x30 */
-    0xF1A5,      0, 0xC1C6, 0xF1AA,      0,      0, 0xF0EC, 0xF0EF, /* 0x40 */
-         0, 0xF0F7,      0,      0, 0xB0A9, 0xF1AD,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xF1AF,      0, 0xF1B1,      0, /* 0x50 */
-    0xF0DD,      0,      0,      0, 0xF1B0,      0,      0, 0xB1F1, /* 0x50 */
-         0,      0, 0xD1F7,      0, 0xF0DC, 0xD6A2,      0, 0xF0DF, /* 0x60 */
-         0, 0xF1AE,      0,      0, 0xD1A2, 0xF1A8, 0xF1AB, 0xF1B3, /* 0x60 */
-    0xD3B8, 0xCCB1, 0xF1B2,      0,      0,      0,      0,      0, /* 0x70 */
-    0xB9EF,      0,      0, 0xB5C7, 0xB7A2, 0xB0D7, 0xB0D9,      0, /* 0x70 */
-         0,      0, 0xD4ED,      0, 0xB5C4,      0, 0xBDD4, 0xBBCA, /* 0x80 */
-    0xF0A7,      0,      0, 0xB8DE,      0,      0, 0xF0A8,      0, /* 0x80 */
-         0,      0,      0, 0xF0A9,      0,      0, 0xCDEE,      0, /* 0x90 */
-         0, 0xF0AA, 0xB0A8,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xF0AB,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xC6A4,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xF1E5,      0,      0,      0, /* 0xB0 */
-    0xF1E4,      0, 0xD6E5,      0,      0,      0,      0, 0xC3F3, /* 0xB0 */
-         0,      0, 0xD3DB,      0,      0, 0xD6D1, 0xC5E8,      0, /* 0xC0 */
-    0xD3AF,      0, 0xD2E6,      0,      0, 0xEEC1, 0xB0BB,      0, /* 0xC0 */
-         0,      0, 0xBAD0,      0, 0xBFF8,      0,      0, 0xB5C1, /* 0xD0 */
-         0,      0,      0, 0xCAA2,      0,      0, 0xD5B5, 0xC3CB, /* 0xD0 */
-         0, 0xBEA1,      0, 0xBCE0, 0xC5CC, 0xEEC2,      0, 0xC2AC, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xC4BF, 0xB6A2, /* 0xE0 */
-         0, 0xEDEC, 0xC3A4,      0, 0xD6B1,      0,      0,      0, /* 0xF0 */
-    0xCFE0, 0xEDEF,      0,      0, 0xC5CE,      0, 0xB6DC          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF0F6, 0xB4E1, 0xF0E9, 0xF0F1, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xF0FA, 0xB7E8, 0xF0F8, 0xD1F1, 	 0, 	 0, /* 0x00 */
+    0xF0F5, 	 0, 	 0, 0xBBBE, 	 0, 0xF0FD, 	 0, 	 0, /* 0x10 */
+         0, 0xF0FE, 	 0, 0xF1A1, 	 0, 	 0, 0xF0F9, 0xCEC1, /* 0x10 */
+    0xF1A4, 0xB4AF, 0xF1A3, 	 0, 0xC1F6, 0xF0FB, 0xCADD, 0xC5B1, /* 0x20 */
+         0, 0xB4F1, 	 0, 	 0, 	 0, 0xF1A6, 	 0, 	 0, /* 0x20 */
+    0xF1A7, 	 0, 	 0, 0xF1AC, 0xD5CE, 0xF1A9, 	 0, 	 0, /* 0x30 */
+    0xC8B3, 	 0, 	 0, 0xF0FC, 0xF1A2, 	 0, 	 0, 	 0, /* 0x30 */
+    0xF1A5, 	 0, 0xC1C6, 0xF1AA, 	 0, 	 0, 0xF0EC, 0xF0EF, /* 0x40 */
+         0, 0xF0F7, 	 0, 	 0, 0xB0A9, 0xF1AD, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xF1AF, 	 0, 0xF1B1, 	 0, /* 0x50 */
+    0xF0DD, 	 0, 	 0, 	 0, 0xF1B0, 	 0, 	 0, 0xB1F1, /* 0x50 */
+         0, 	 0, 0xD1F7, 	 0, 0xF0DC, 0xD6A2, 	 0, 0xF0DF, /* 0x60 */
+         0, 0xF1AE, 	 0, 	 0, 0xD1A2, 0xF1A8, 0xF1AB, 0xF1B3, /* 0x60 */
+    0xD3B8, 0xCCB1, 0xF1B2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xB9EF, 	 0, 	 0, 0xB5C7, 0xB7A2, 0xB0D7, 0xB0D9, 	 0, /* 0x70 */
+         0, 	 0, 0xD4ED, 	 0, 0xB5C4, 	 0, 0xBDD4, 0xBBCA, /* 0x80 */
+    0xF0A7, 	 0, 	 0, 0xB8DE, 	 0, 	 0, 0xF0A8, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xF0A9, 	 0, 	 0, 0xCDEE, 	 0, /* 0x90 */
+         0, 0xF0AA, 0xB0A8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xF0AB, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC6A4, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xF1E5, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xF1E4, 	 0, 0xD6E5, 	 0, 	 0, 	 0, 	 0, 0xC3F3, /* 0xB0 */
+         0, 	 0, 0xD3DB, 	 0, 	 0, 0xD6D1, 0xC5E8, 	 0, /* 0xC0 */
+    0xD3AF, 	 0, 0xD2E6, 	 0, 	 0, 0xEEC1, 0xB0BB, 	 0, /* 0xC0 */
+         0, 	 0, 0xBAD0, 	 0, 0xBFF8, 	 0, 	 0, 0xB5C1, /* 0xD0 */
+         0, 	 0, 	 0, 0xCAA2, 	 0, 	 0, 0xD5B5, 0xC3CB, /* 0xD0 */
+         0, 0xBEA1, 	 0, 0xBCE0, 0xC5CC, 0xEEC2, 	 0, 0xC2AC, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC4BF, 0xB6A2, /* 0xE0 */
+         0, 0xEDEC, 0xC3A4, 	 0, 0xD6B1, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xCFE0, 0xEDEF, 	 0, 	 0, 0xC5CE, 	 0, 0xB6DC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_77[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xCAA1,      0,      0, 0xEDED,      0,      0, 0xEDF0, /* 0x00 */
-    0xEDF1, 0xC3BC,      0, 0xBFB4,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xEDF4, 0xEDF2,      0,      0,      0,      0, 0xD5E6, /* 0x10 */
-    0xC3DF,      0, 0xEDF3,      0,      0,      0, 0xEDF6,      0, /* 0x20 */
-    0xD5A3, 0xD1A3,      0,      0,      0, 0xEDF5,      0, 0xC3D0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xEDF7, 0xBFF4, 0xBEEC, /* 0x30 */
-    0xEDF8,      0, 0xCCF7,      0, 0xD1DB,      0,      0,      0, /* 0x30 */
-    0xD7C5,      0,      0, 0xEDFC,      0,      0,      0, 0xEDFB, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xF8CA, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0, 0xEDFD, 0xBEA6, 0xD5F6,      0, 0xEDF9,      0, /* 0x50 */
-         0, 0xCBAF, 0xEEA1, 0xB6BD,      0, 0xEEA2, 0xC4C0,      0, /* 0x60 */
-    0xEDFE,      0,      0, 0xBDDE, 0xB2C7,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xB6C3,      0,      0,      0, 0xEEA5, 0xD8BA, 0xEEA3, /* 0x70 */
-    0xEEA6,      0,      0,      0, 0xC3E9, 0xB3F2,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0xEEA7, 0xEEA4, 0xCFB9,      0, /* 0x80 */
-         0, 0xEEA8,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xEDEE,      0,      0,      0,      0,      0, 0xC2F7, 0xEEA9, /* 0x90 */
-    0xEEAA,      0, 0xDEAB,      0,      0, 0xC6B3,      0, 0xC7C6, /* 0xA0 */
-         0,      0, 0xB5C9,      0, 0xCBB2, 0xF8D1,      0,      0, /* 0xA0 */
-    0xEEAB,      0,      0, 0xCDAB,      0, 0xEEAC,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xD5B0, 0xEDFA, 0xEEAD,      0, 0xF6C4, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xF8D7, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xDBC7,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xB4A3, /* 0xD0 */
-         0,      0, 0xD6F5, 0xC3AC, 0xF1E6,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xCAB8, 0xD2D3,      0, 0xD6AA,      0, 0xEFF2, /* 0xE0 */
-         0, 0xBED8,      0,      0, 0xEFF3, 0xB6CC, 0xB0AB, 0xBDC3, /* 0xE0 */
-         0,      0,      0, 0xCAAF,      0,      0,      0,      0, /* 0xF0 */
-    0xEDB7,      0,      0,      0,      0, 0xCEF9                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xCAA1, 	 0, 	 0, 0xEDED, 	 0, 	 0, 0xEDF0, /* 0x00 */
+    0xEDF1, 0xC3BC, 	 0, 0xBFB4, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xEDF4, 0xEDF2, 	 0, 	 0, 	 0, 	 0, 0xD5E6, /* 0x10 */
+    0xC3DF, 	 0, 0xEDF3, 	 0, 	 0, 	 0, 0xEDF6, 	 0, /* 0x20 */
+    0xD5A3, 0xD1A3, 	 0, 	 0, 	 0, 0xEDF5, 	 0, 0xC3D0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEDF7, 0xBFF4, 0xBEEC, /* 0x30 */
+    0xEDF8, 	 0, 0xCCF7, 	 0, 0xD1DB, 	 0, 	 0, 	 0, /* 0x30 */
+    0xD7C5, 	 0, 	 0, 0xEDFC, 	 0, 	 0, 	 0, 0xEDFB, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF8CA, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xEDFD, 0xBEA6, 0xD5F6, 	 0, 0xEDF9, 	 0, /* 0x50 */
+         0, 0xCBAF, 0xEEA1, 0xB6BD, 	 0, 0xEEA2, 0xC4C0, 	 0, /* 0x60 */
+    0xEDFE, 	 0, 	 0, 0xBDDE, 0xB2C7, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xB6C3, 	 0, 	 0, 	 0, 0xEEA5, 0xD8BA, 0xEEA3, /* 0x70 */
+    0xEEA6, 	 0, 	 0, 	 0, 0xC3E9, 0xB3F2, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xEEA7, 0xEEA4, 0xCFB9, 	 0, /* 0x80 */
+         0, 0xEEA8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xEDEE, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC2F7, 0xEEA9, /* 0x90 */
+    0xEEAA, 	 0, 0xDEAB, 	 0, 	 0, 0xC6B3, 	 0, 0xC7C6, /* 0xA0 */
+         0, 	 0, 0xB5C9, 	 0, 0xCBB2, 0xF8D1, 	 0, 	 0, /* 0xA0 */
+    0xEEAB, 	 0, 	 0, 0xCDAB, 	 0, 0xEEAC, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xD5B0, 0xEDFA, 0xEEAD, 	 0, 0xF6C4, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF8D7, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDBC7, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB4A3, /* 0xD0 */
+         0, 	 0, 0xD6F5, 0xC3AC, 0xF1E6, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xCAB8, 0xD2D3, 	 0, 0xD6AA, 	 0, 0xEFF2, /* 0xE0 */
+         0, 0xBED8, 	 0, 	 0, 0xEFF3, 0xB6CC, 0xB0AB, 0xBDC3, /* 0xE0 */
+         0, 	 0, 	 0, 0xCAAF, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xEDB7, 	 0, 	 0, 	 0, 	 0, 0xCEF9					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_78[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xC9B0,      0,      0,      0,      0,      0, /* 0x00 */
-         0, 0xEDB9,      0,      0, 0xC6F6, 0xBFB3,      0,      0, /* 0x00 */
-         0, 0xEDBC, 0xC5F8,      0, 0xD1D0,      0,      0,      0, /* 0x10 */
-    0xEDBB,      0,      0,      0,      0, 0xEDC0,      0, 0xEDC4, /* 0x10 */
-         0,      0,      0, 0xEDC8,      0, 0xEDC6, 0xEDCE, 0xD5E8, /* 0x20 */
-         0, 0xEDC9,      0,      0, 0xEDC7, 0xEDBE,      0,      0, /* 0x20 */
-    0xC5E9,      0,      0,      0, 0xC6C6,      0,      0, 0xC9E9, /* 0x30 */
-    0xD4D2, 0xEDC1,      0,      0, 0xEDC5,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xF9A7,      0, 0xB9E8,      0, 0xEDD0, /* 0x40 */
-         0,      0,      0,      0, 0xEDD1,      0, 0xEDCA,      0, /* 0x40 */
-    0xEDCF,      0, 0xCEF8,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xCFF5,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xEDCC,      0,      0,      0, /* 0x60 */
-    0xEDBA,      0, 0xEDD2, 0xC1F2, 0xD3B2, 0xEDCB, 0xF8E6, 0xD1E2, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xC5F0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xEDD6, /* 0x80 */
-         0, 0xB5EF,      0,      0, 0xC2B5,      0, 0xCBE9,      0, /* 0x80 */
-         0, 0xB1AE,      0, 0xEDD4,      0,      0,      0, 0xCDEB, /* 0x90 */
-    0xB5E2,      0, 0xEDD5,      0,      0,      0,      0, 0xB5FA, /* 0x90 */
-         0, 0xEDD8,      0, 0xEDD9,      0, 0xEDDC,      0, 0xB1CC, /* 0xA0 */
-         0, 0xCBB6,      0,      0,      0, 0xEDB8,      0,      0, /* 0xA0 */
-    0xC5F6, 0xBCEE, 0xEDDA, 0xCCBC, 0xB2EA,      0,      0,      0, /* 0xB0 */
-    0xEDBF, 0xEDDB, 0xC8B7,      0, 0xC2EB,      0, 0xC4EB,      0, /* 0xB0 */
-         0, 0xB4C5,      0,      0,      0, 0xB0F5,      0,      0, /* 0xC0 */
-         0, 0xEDDF, 0xC0DA, 0xB4E8,      0,      0,      0,      0, /* 0xC0 */
-    0xC5CD,      0,      0,      0, 0xEDDD, 0xBFC4,      0,      0, /* 0xD0 */
-         0, 0xEDDE, 0xD7A9,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xEDD7,      0,      0,      0, 0xEDD3, /* 0xE0 */
-    0xC4A5,      0,      0,      0, 0xEDE0,      0,      0, 0xEDB6, /* 0xE0 */
-         0,      0, 0xEDE1,      0, 0xEDE3,      0,      0, 0xC1D7, /* 0xF0 */
-         0,      0, 0xBBC7,      0,      0, 0xEDCD                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xC9B0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xEDB9, 	 0, 	 0, 0xC6F6, 0xBFB3, 	 0, 	 0, /* 0x00 */
+         0, 0xEDBC, 0xC5F8, 	 0, 0xD1D0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xEDBB, 	 0, 	 0, 	 0, 	 0, 0xEDC0, 	 0, 0xEDC4, /* 0x10 */
+         0, 	 0, 	 0, 0xEDC8, 	 0, 0xEDC6, 0xEDCE, 0xD5E8, /* 0x20 */
+         0, 0xEDC9, 	 0, 	 0, 0xEDC7, 0xEDBE, 	 0, 	 0, /* 0x20 */
+    0xC5E9, 	 0, 	 0, 	 0, 0xC6C6, 	 0, 	 0, 0xC9E9, /* 0x30 */
+    0xD4D2, 0xEDC1, 	 0, 	 0, 0xEDC5, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xF9A7, 	 0, 0xB9E8, 	 0, 0xEDD0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xEDD1, 	 0, 0xEDCA, 	 0, /* 0x40 */
+    0xEDCF, 	 0, 0xCEF8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCFF5, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xEDCC, 	 0, 	 0, 	 0, /* 0x60 */
+    0xEDBA, 	 0, 0xEDD2, 0xC1F2, 0xD3B2, 0xEDCB, 0xF8E6, 0xD1E2, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xC5F0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEDD6, /* 0x80 */
+         0, 0xB5EF, 	 0, 	 0, 0xC2B5, 	 0, 0xCBE9, 	 0, /* 0x80 */
+         0, 0xB1AE, 	 0, 0xEDD4, 	 0, 	 0, 	 0, 0xCDEB, /* 0x90 */
+    0xB5E2, 	 0, 0xEDD5, 	 0, 	 0, 	 0, 	 0, 0xB5FA, /* 0x90 */
+         0, 0xEDD8, 	 0, 0xEDD9, 	 0, 0xEDDC, 	 0, 0xB1CC, /* 0xA0 */
+         0, 0xCBB6, 	 0, 	 0, 	 0, 0xEDB8, 	 0, 	 0, /* 0xA0 */
+    0xC5F6, 0xBCEE, 0xEDDA, 0xCCBC, 0xB2EA, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xEDBF, 0xEDDB, 0xC8B7, 	 0, 0xC2EB, 	 0, 0xC4EB, 	 0, /* 0xB0 */
+         0, 0xB4C5, 	 0, 	 0, 	 0, 0xB0F5, 	 0, 	 0, /* 0xC0 */
+         0, 0xEDDF, 0xC0DA, 0xB4E8, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xC5CD, 	 0, 	 0, 	 0, 0xEDDD, 0xBFC4, 	 0, 	 0, /* 0xD0 */
+         0, 0xEDDE, 0xD7A9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xEDD7, 	 0, 	 0, 	 0, 0xEDD3, /* 0xE0 */
+    0xC4A5, 	 0, 	 0, 	 0, 0xEDE0, 	 0, 	 0, 0xEDB6, /* 0xE0 */
+         0, 	 0, 0xEDE1, 	 0, 0xEDE3, 	 0, 	 0, 0xC1D7, /* 0xF0 */
+         0, 	 0, 0xBBC7, 	 0, 	 0, 0xEDCD					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_79[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xBDB8,      0,      0,      0, 0xEDE2,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xB4A1,      0, /* 0x00 */
-         0,      0,      0, 0xEDE4,      0,      0,      0,      0, /* 0x10 */
-         0, 0xB0AD,      0,      0,      0,      0, 0xEDE6,      0, /* 0x10 */
-         0,      0,      0,      0, 0xEDE5,      0, 0xBFF3,      0, /* 0x20 */
-         0,      0, 0xEDC2, 0xC0F9, 0xB7AF,      0,      0,      0, /* 0x20 */
-         0, 0xEDC3,      0,      0, 0xEDE7,      0,      0,      0, /* 0x30 */
-         0,      0, 0xCABE, 0xECEA,      0,      0, 0xC9E7,      0, /* 0x30 */
-    0xECEB, 0xC6EE,      0,      0,      0,      0, 0xECEC,      0, /* 0x40 */
-    0xC6ED, 0xECED,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xECF0,      0,      0, 0xD7E6, 0xECF3, /* 0x50 */
-         0,      0, 0xECF1, 0xECEE, 0xECEF, 0xD7A3, 0xC9F1, 0xCBEE, /* 0x50 */
-    0xECF4,      0,      0,      0,      0, 0xCFE9,      0, 0xECF6, /* 0x60 */
-    0xC6B1,      0,      0,      0,      0, 0xBCC0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xECF7,      0,      0,      0,      0,      0, /* 0x70 */
-    0xD9F7, 0xBDFB,      0,      0, 0xC2BB,      0,      0,      0, /* 0x80 */
-         0,      0, 0xECF9,      0,      0, 0xBBF6, 0xECF5, 0xB8A3, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xECFA,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0xF8FA, 0xECFB, /* 0xA0 */
-         0,      0, 0xECF8,      0,      0,      0, 0xC0F1,      0, /* 0xA0 */
-    0xECF2, 0xB5BB,      0, 0xECFC,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xD3ED, 0xD8AE,      0,      0, 0xC7DD, 0xBACC,      0, /* 0xB0 */
-    0xD0E3, 0xCBBD,      0, 0xCDBA,      0,      0, 0xB8D1,      0, /* 0xC0 */
-         0, 0xB1FC,      0, 0xC7EF,      0, 0xF9A6,      0,      0, /* 0xC0 */
-         0, 0xBFC6, 0xC3EB,      0,      0, 0xEFF5,      0,      0, /* 0xD0 */
-    0xC3D8,      0,      0,      0,      0,      0,      0, 0xD7E2, /* 0xD0 */
-         0,      0,      0, 0xEFF7, 0xB3D3,      0, 0xC7D8, 0xD1ED, /* 0xE0 */
-         0, 0xD6C8,      0, 0xEFF8,      0, 0xEFF6,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xBDD5,      0,      0, 0xD2C6                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xBDB8, 	 0, 	 0, 	 0, 0xEDE2, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB4A1, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xEDE4, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xB0AD, 	 0, 	 0, 	 0, 	 0, 0xEDE6, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xEDE5, 	 0, 0xBFF3, 	 0, /* 0x20 */
+         0, 	 0, 0xEDC2, 0xC0F9, 0xB7AF, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xEDC3, 	 0, 	 0, 0xEDE7, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xCABE, 0xECEA, 	 0, 	 0, 0xC9E7, 	 0, /* 0x30 */
+    0xECEB, 0xC6EE, 	 0, 	 0, 	 0, 	 0, 0xECEC, 	 0, /* 0x40 */
+    0xC6ED, 0xECED, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xECF0, 	 0, 	 0, 0xD7E6, 0xECF3, /* 0x50 */
+         0, 	 0, 0xECF1, 0xECEE, 0xECEF, 0xD7A3, 0xC9F1, 0xCBEE, /* 0x50 */
+    0xECF4, 	 0, 	 0, 	 0, 	 0, 0xCFE9, 	 0, 0xECF6, /* 0x60 */
+    0xC6B1, 	 0, 	 0, 	 0, 	 0, 0xBCC0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xECF7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xD9F7, 0xBDFB, 	 0, 	 0, 0xC2BB, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xECF9, 	 0, 	 0, 0xBBF6, 0xECF5, 0xB8A3, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xECFA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF8FA, 0xECFB, /* 0xA0 */
+         0, 	 0, 0xECF8, 	 0, 	 0, 	 0, 0xC0F1, 	 0, /* 0xA0 */
+    0xECF2, 0xB5BB, 	 0, 0xECFC, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xD3ED, 0xD8AE, 	 0, 	 0, 0xC7DD, 0xBACC, 	 0, /* 0xB0 */
+    0xD0E3, 0xCBBD, 	 0, 0xCDBA, 	 0, 	 0, 0xB8D1, 	 0, /* 0xC0 */
+         0, 0xB1FC, 	 0, 0xC7EF, 	 0, 0xF9A6, 	 0, 	 0, /* 0xC0 */
+         0, 0xBFC6, 0xC3EB, 	 0, 	 0, 0xEFF5, 	 0, 	 0, /* 0xD0 */
+    0xC3D8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD7E2, /* 0xD0 */
+         0, 	 0, 	 0, 0xEFF7, 0xB3D3, 	 0, 0xC7D8, 0xD1ED, /* 0xE0 */
+         0, 0xD6C8, 	 0, 0xEFF8, 	 0, 0xEFF6, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xBDD5, 	 0, 	 0, 0xD2C6									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_7A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xCFA1,      0, 0xEFFC, 0xEFFB,      0,      0, 0xEFF9,      0, /* 0x00 */
-         0,      0,      0, 0xB3CC,      0, 0xC9D4, 0xCBB0,      0, /* 0x00 */
-         0,      0,      0,      0, 0xEFFE,      0,      0, 0xB0DE, /* 0x10 */
-         0,      0, 0xD6C9,      0,      0,      0, 0xEFFD,      0, /* 0x10 */
-    0xB3ED,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0xD6D6,      0, /* 0x20 */
-         0, 0xB3C6,      0,      0,      0,      0,      0, 0xF0A2, /* 0x30 */
-         0, 0xF0A1,      0, 0xB5BE, 0xBCDA, 0xBBFC,      0, 0xB8E5, /* 0x30 */
-    0xF8B6,      0,      0,      0,      0,      0, 0xC4C2,      0, /* 0x40 */
-         0,      0,      0,      0, 0xF6D5, 0xBBFD, 0xD3B1,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0, 0xCBEB, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xF0A3, 0xBBE0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xCEC8,      0, 0xF8BE,      0,      0,      0,      0, /* 0x60 */
-    0xF0A6,      0,      0,      0, 0xD1A8,      0, 0xBEBF,      0, /* 0x70 */
-    0xF1B6, 0xF1B7, 0xBFD5,      0,      0,      0,      0, 0xB4A9, /* 0x70 */
-    0xF1B8, 0xCDBB,      0,      0, 0xD5AD,      0, 0xF1B9,      0, /* 0x80 */
-    0xF1BA,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xD2A4, 0xD6CF,      0,      0, 0xF1BB, 0xBDD1, 0xB4B0, /* 0x90 */
-    0xBEBD,      0,      0,      0,      0,      0,      0, 0xBFDF, /* 0x90 */
-    0xF1BD,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xF1BF, 0xCED1, 0xCDDD,      0, 0xF1BE,      0, 0xC7EE,      0, /* 0xA0 */
-         0,      0,      0, 0xF1C1,      0,      0, 0xF1C0,      0, /* 0xB0 */
-         0,      0, 0xBFFA,      0,      0,      0,      0, 0xC1FE, /* 0xB0 */
-         0,      0,      0,      0, 0xB4DC, 0xC7CF,      0, 0xF1BC, /* 0xC0 */
-    0xD4EE,      0, 0xC7D4, 0xC1A2,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xD5BE,      0,      0,      0,      0,      0, 0xBEB9, /* 0xD0 */
-    0xD5C2,      0,      0, 0xBFA2,      0, 0xCDAF, 0xF1B5,      0, /* 0xE0 */
-         0,      0, 0xCAFA,      0,      0, 0xBDDF,      0, 0xB6CB, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xBEBA,      0, /* 0xF0 */
-         0, 0xD6F1, 0xF3C3,      0,      0, 0xF3C4,      0, 0xB8CD  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xCFA1, 	 0, 0xEFFC, 0xEFFB, 	 0, 	 0, 0xEFF9, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xB3CC, 	 0, 0xC9D4, 0xCBB0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xEFFE, 	 0, 	 0, 0xB0DE, /* 0x10 */
+         0, 	 0, 0xD6C9, 	 0, 	 0, 	 0, 0xEFFD, 	 0, /* 0x10 */
+    0xB3ED, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD6D6, 	 0, /* 0x20 */
+         0, 0xB3C6, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF0A2, /* 0x30 */
+         0, 0xF0A1, 	 0, 0xB5BE, 0xBCDA, 0xBBFC, 	 0, 0xB8E5, /* 0x30 */
+    0xF8B6, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC4C2, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xF6D5, 0xBBFD, 0xD3B1, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBEB, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xF0A3, 0xBBE0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xCEC8, 	 0, 0xF8BE, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xF0A6, 	 0, 	 0, 	 0, 0xD1A8, 	 0, 0xBEBF, 	 0, /* 0x70 */
+    0xF1B6, 0xF1B7, 0xBFD5, 	 0, 	 0, 	 0, 	 0, 0xB4A9, /* 0x70 */
+    0xF1B8, 0xCDBB, 	 0, 	 0, 0xD5AD, 	 0, 0xF1B9, 	 0, /* 0x80 */
+    0xF1BA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xD2A4, 0xD6CF, 	 0, 	 0, 0xF1BB, 0xBDD1, 0xB4B0, /* 0x90 */
+    0xBEBD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBFDF, /* 0x90 */
+    0xF1BD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xF1BF, 0xCED1, 0xCDDD, 	 0, 0xF1BE, 	 0, 0xC7EE, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xF1C1, 	 0, 	 0, 0xF1C0, 	 0, /* 0xB0 */
+         0, 	 0, 0xBFFA, 	 0, 	 0, 	 0, 	 0, 0xC1FE, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xB4DC, 0xC7CF, 	 0, 0xF1BC, /* 0xC0 */
+    0xD4EE, 	 0, 0xC7D4, 0xC1A2, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xD5BE, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBEB9, /* 0xD0 */
+    0xD5C2, 	 0, 	 0, 0xBFA2, 	 0, 0xCDAF, 0xF1B5, 	 0, /* 0xE0 */
+         0, 	 0, 0xCAFA, 	 0, 	 0, 0xBDDF, 	 0, 0xB6CB, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBEBA, 	 0, /* 0xF0 */
+         0, 0xD6F1, 0xF3C3, 	 0, 	 0, 0xF3C4, 	 0, 0xB8CD	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_7B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xF3C7,      0, 0xB0CA,      0, /* 0x00 */
-    0xF3C5,      0, 0xF3C9, 0xCBF1,      0,      0,      0, 0xF3CB, /* 0x00 */
-         0, 0xD0A6,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xF3CF,      0, 0xB5D1,      0,      0, 0xF3D7,      0, /* 0x10 */
-    0xF3D2,      0,      0,      0, 0xF3D4, 0xF3D3, 0xB7FB,      0, /* 0x20 */
-    0xB1BF,      0, 0xF3CE, 0xF3CA, 0xB5DA,      0, 0xF3D0,      0, /* 0x20 */
-         0, 0xF3D1,      0, 0xF3D5,      0,      0,      0,      0, /* 0x30 */
-    0xF3CD,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xF3DA, 0xB1CA, 0xF3CC, /* 0x40 */
-         0, 0xB5C8,      0, 0xBDEE, 0xF3DC,      0,      0, 0xB7A4, /* 0x40 */
-    0xBFF0, 0xF9A8, 0xCDB2,      0, 0xB4F0,      0, 0xB2DF,      0, /* 0x50 */
-    0xF3D8,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xF3DE,      0, 0xF3E1,      0,      0,      0,      0, 0xF3C8, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xF3DF,      0, /* 0x60 */
-         0, 0xF3E3, 0xF3E2,      0,      0, 0xF3DB,      0, 0xBFEA, /* 0x70 */
-         0,      0,      0, 0xF3E0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF3EB,      0,      0, /* 0x80 */
-         0,      0,      0, 0xBCE3,      0, 0xB9BF,      0, 0xF3DD, /* 0x80 */
-    0xF3E4,      0,      0,      0, 0xB2AD, 0xBBFE,      0, 0xCBE3, /* 0x90 */
-         0,      0,      0,      0, 0xF3ED, 0xF3E9,      0,      0, /* 0x90 */
-         0, 0xB9DC, 0xF3EE,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xF3E8, 0xBCFD,      0,      0, /* 0xA0 */
-         0, 0xCFE4,      0,      0, 0xF3F0,      0,      0,      0, /* 0xB0 */
-    0xF3E7,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xBDDA, 0xF3F2,      0,      0, 0xB7B6,      0, 0xD7AD, 0xC6AA, /* 0xC0 */
-         0, 0xD6FE,      0, 0xF3E6, 0xF3F3,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xB8DD, 0xF3F5,      0,      0, 0xF3F4,      0,      0, /* 0xD0 */
-         0, 0xB4DB,      0,      0, 0xF3C6, 0xF3F6, 0xF3F7,      0, /* 0xE0 */
-         0, 0xC9B8, 0xF3F8,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xF3D9,      0,      0,      0, 0xC5F1, /* 0xF0 */
-         0,      0,      0,      0, 0xF3FB,      0, 0xF3FA          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xF3C7, 	 0, 0xB0CA, 	 0, /* 0x00 */
+    0xF3C5, 	 0, 0xF3C9, 0xCBF1, 	 0, 	 0, 	 0, 0xF3CB, /* 0x00 */
+         0, 0xD0A6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xF3CF, 	 0, 0xB5D1, 	 0, 	 0, 0xF3D7, 	 0, /* 0x10 */
+    0xF3D2, 	 0, 	 0, 	 0, 0xF3D4, 0xF3D3, 0xB7FB, 	 0, /* 0x20 */
+    0xB1BF, 	 0, 0xF3CE, 0xF3CA, 0xB5DA, 	 0, 0xF3D0, 	 0, /* 0x20 */
+         0, 0xF3D1, 	 0, 0xF3D5, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xF3CD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF3DA, 0xB1CA, 0xF3CC, /* 0x40 */
+         0, 0xB5C8, 	 0, 0xBDEE, 0xF3DC, 	 0, 	 0, 0xB7A4, /* 0x40 */
+    0xBFF0, 0xF9A8, 0xCDB2, 	 0, 0xB4F0, 	 0, 0xB2DF, 	 0, /* 0x50 */
+    0xF3D8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xF3DE, 	 0, 0xF3E1, 	 0, 	 0, 	 0, 	 0, 0xF3C8, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF3DF, 	 0, /* 0x60 */
+         0, 0xF3E3, 0xF3E2, 	 0, 	 0, 0xF3DB, 	 0, 0xBFEA, /* 0x70 */
+         0, 	 0, 	 0, 0xF3E0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF3EB, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xBCE3, 	 0, 0xB9BF, 	 0, 0xF3DD, /* 0x80 */
+    0xF3E4, 	 0, 	 0, 	 0, 0xB2AD, 0xBBFE, 	 0, 0xCBE3, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xF3ED, 0xF3E9, 	 0, 	 0, /* 0x90 */
+         0, 0xB9DC, 0xF3EE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xF3E8, 0xBCFD, 	 0, 	 0, /* 0xA0 */
+         0, 0xCFE4, 	 0, 	 0, 0xF3F0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xF3E7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xBDDA, 0xF3F2, 	 0, 	 0, 0xB7B6, 	 0, 0xD7AD, 0xC6AA, /* 0xC0 */
+         0, 0xD6FE, 	 0, 0xF3E6, 0xF3F3, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xB8DD, 0xF3F5, 	 0, 	 0, 0xF3F4, 	 0, 	 0, /* 0xD0 */
+         0, 0xB4DB, 	 0, 	 0, 0xF3C6, 0xF3F6, 0xF3F7, 	 0, /* 0xE0 */
+         0, 0xC9B8, 0xF3F8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xF3D9, 	 0, 	 0, 	 0, 0xC5F1, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xF3FB, 	 0, 0xF3FA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_7C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF3E5,      0,      0,      0,      0,      0,      0, 0xB4D8, /* 0x00 */
-         0,      0,      0, 0xF3FE, 0xF3F9, 0xC2A8,      0, 0xF3FC, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xF3EC, 0xF4A1, /* 0x10 */
-         0, 0xBCF2,      0, 0xF3F1,      0,      0, 0xF4A3, 0xBBC9, /* 0x20 */
-         0,      0, 0xF4A2, 0xF3EF,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xF4A4,      0,      0,      0,      0, 0xC7A9, 0xC1B1, 0xB2BE, /* 0x30 */
-    0xF4A6,      0,      0, 0xC0BA,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xB3EF, 0xBCAE,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xF3EA,      0,      0, 0xF4A5, /* 0x50 */
-    0xC1FD,      0,      0,      0, 0xF8E2,      0,      0,      0, /* 0x60 */
-         0, 0xF3D6, 0xF3FD,      0, 0xC0E9,      0, 0xC2E1,      0, /* 0x60 */
-         0,      0, 0xF8FB, 0xC3D7,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xF4CC, 0xD7D1,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xB7DB,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xF4CE, 0xC1A3,      0,      0, 0xC6C9,      0, 0xB4D6, /* 0x90 */
-    0xD5B3,      0,      0,      0,      0,      0, 0xF4D1, 0xCBDA, /* 0x90 */
-         0,      0, 0xF4D2,      0, 0xD4C1, 0xD6E0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xC1BB, 0xF4D3, 0xBEAC,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xB4E2,      0,      0, 0xF4D4, 0xF4D5, 0xBEAB,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xF4DB,      0, 0xF4D7, /* 0xC0 */
-    0xF4DA,      0, 0xBAFD,      0, 0xF4D8, 0xF4D9,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xB8E2, 0xCCC7, 0xF4DC, /* 0xD0 */
-         0, 0xB2DA,      0,      0, 0xC3D3, 0xF4D6, 0xB7E0, 0xD4E3, /* 0xD0 */
-    0xBFB7,      0,      0,      0,      0,      0,      0, 0xC1B8, /* 0xE0 */
-    0xF4DD,      0,      0,      0,      0,      0,      0, 0xC5B4, /* 0xE0 */
-    0xF8F0,      0, 0xF4CF,      0, 0xD9E1,      0, 0xF4D0,      0, /* 0xF0 */
-    0xF4E9, 0xE6F9,      0, 0xCFB5,      0,      0, 0xBEC0          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF3E5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB4D8, /* 0x00 */
+         0, 	 0, 	 0, 0xF3FE, 0xF3F9, 0xC2A8, 	 0, 0xF3FC, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF3EC, 0xF4A1, /* 0x10 */
+         0, 0xBCF2, 	 0, 0xF3F1, 	 0, 	 0, 0xF4A3, 0xBBC9, /* 0x20 */
+         0, 	 0, 0xF4A2, 0xF3EF, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xF4A4, 	 0, 	 0, 	 0, 	 0, 0xC7A9, 0xC1B1, 0xB2BE, /* 0x30 */
+    0xF4A6, 	 0, 	 0, 0xC0BA, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xB3EF, 0xBCAE, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xF3EA, 	 0, 	 0, 0xF4A5, /* 0x50 */
+    0xC1FD, 	 0, 	 0, 	 0, 0xF8E2, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xF3D6, 0xF3FD, 	 0, 0xC0E9, 	 0, 0xC2E1, 	 0, /* 0x60 */
+         0, 	 0, 0xF8FB, 0xC3D7, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xF4CC, 0xD7D1, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xB7DB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xF4CE, 0xC1A3, 	 0, 	 0, 0xC6C9, 	 0, 0xB4D6, /* 0x90 */
+    0xD5B3, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4D1, 0xCBDA, /* 0x90 */
+         0, 	 0, 0xF4D2, 	 0, 0xD4C1, 0xD6E0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xC1BB, 0xF4D3, 0xBEAC, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xB4E2, 	 0, 	 0, 0xF4D4, 0xF4D5, 0xBEAB, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF4DB, 	 0, 0xF4D7, /* 0xC0 */
+    0xF4DA, 	 0, 0xBAFD, 	 0, 0xF4D8, 0xF4D9, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB8E2, 0xCCC7, 0xF4DC, /* 0xD0 */
+         0, 0xB2DA, 	 0, 	 0, 0xC3D3, 0xF4D6, 0xB7E0, 0xD4E3, /* 0xD0 */
+    0xBFB7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC1B8, /* 0xE0 */
+    0xF4DD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC5B4, /* 0xE0 */
+    0xF8F0, 	 0, 0xF4CF, 	 0, 0xD9E1, 	 0, 0xF4D0, 	 0, /* 0xF0 */
+    0xF4E9, 0xE6F9, 	 0, 0xCFB5, 	 0, 	 0, 0xBEC0			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_7D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xBCCD,      0, 0xE6FB,      0, 0xD4BC, 0xBAEC, 0xE6FA, 0xE6FC, /* 0x00 */
-    0xE6FD, 0xC8D2, 0xCEC9, 0xCEC6,      0, 0xC4C9,      0,      0, /* 0x00 */
-    0xC5A6,      0,      0, 0xE7A3, 0xB4BF, 0xE7A2,      0, 0xC9B4, /* 0x10 */
-         0, 0xD6BD, 0xBCB6, 0xB7D7, 0xE7A1,      0,      0,      0, /* 0x10 */
-    0xCBD8, 0xB7C4, 0xCBF7,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xD7CF,      0,      0,      0, 0xC0DB, /* 0x20 */
-    0xCFB8, 0xE7A6, 0xE7A5, 0xC9F0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xC9DC, 0xE7A4,      0, 0xE7A8,      0,      0, 0xE7AA, /* 0x30 */
-    0xE7A9,      0, 0xD6D5,      0, 0xD7E9,      0, 0xB0ED,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xE7AC,      0, /* 0x40 */
-    0xBDE1,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xE7AB, 0xBDCA,      0, /* 0x50 */
-         0, 0xC2E7, 0xD1A4,      0,      0,      0, 0xB8F8,      0, /* 0x60 */
-    0xC8DE,      0,      0,      0,      0,      0, 0xD0F5,      0, /* 0x60 */
-         0, 0xCDB3, 0xCBBF, 0xE7AD,      0,      0, 0xBEF8,      0, /* 0x70 */
-         0, 0xBEEE,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xB0F3,      0, 0xE7AF,      0,      0, 0xE7AE,      0, /* 0x80 */
-    0xE7B0, 0xD0E5,      0,      0,      0,      0,      0, 0xCBE7, /* 0x80 */
-         0,      0,      0, 0xBEAD,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xD7DB,      0, 0xE7B6,      0, /* 0x90 */
-         0,      0, 0xB3F1, 0xE7B9,      0,      0, 0xF4EB,      0, /* 0xA0 */
-         0,      0,      0, 0xCFDF, 0xE7B7, 0xCEAC, 0xF4EC,      0, /* 0xA0 */
-    0xE7BA, 0xB8D9, 0xCDF8, 0xB1C1, 0xD7BA,      0,      0,      0, /* 0xB0 */
-    0xC2DA, 0xE7B8, 0xE7B2, 0xD5C0,      0, 0xB4C2, 0xE7B1, 0xC3E0, /* 0xB0 */
-         0,      0,      0,      0, 0xE7B5,      0,      0, 0xE7BB, /* 0xC0 */
-         0,      0, 0xBDF4, 0xE7B3,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xC2CC, 0xD0F7,      0, 0xE7B4,      0,      0, 0xE7BD, /* 0xD0 */
-    0xBCEA, 0xE7BC,      0,      0,      0, 0xBCA9, 0xB6D0,      0, /* 0xD0 */
-    0xB5DE, 0xE7C5,      0, 0xD4B5,      0,      0, 0xE7C1,      0, /* 0xE0 */
-    0xB1E0, 0xBBBA,      0,      0, 0xC3E5,      0,      0, 0xCEB3, /* 0xE0 */
-         0, 0xE7C3, 0xE7BF,      0, 0xC1B7,      0, 0xE7C2,      0, /* 0xF0 */
-         0, 0xE7BE,      0, 0xF9A4                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xBCCD, 	 0, 0xE6FB, 	 0, 0xD4BC, 0xBAEC, 0xE6FA, 0xE6FC, /* 0x00 */
+    0xE6FD, 0xC8D2, 0xCEC9, 0xCEC6, 	 0, 0xC4C9, 	 0, 	 0, /* 0x00 */
+    0xC5A6, 	 0, 	 0, 0xE7A3, 0xB4BF, 0xE7A2, 	 0, 0xC9B4, /* 0x10 */
+         0, 0xD6BD, 0xBCB6, 0xB7D7, 0xE7A1, 	 0, 	 0, 	 0, /* 0x10 */
+    0xCBD8, 0xB7C4, 0xCBF7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xD7CF, 	 0, 	 0, 	 0, 0xC0DB, /* 0x20 */
+    0xCFB8, 0xE7A6, 0xE7A5, 0xC9F0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xC9DC, 0xE7A4, 	 0, 0xE7A8, 	 0, 	 0, 0xE7AA, /* 0x30 */
+    0xE7A9, 	 0, 0xD6D5, 	 0, 0xD7E9, 	 0, 0xB0ED, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE7AC, 	 0, /* 0x40 */
+    0xBDE1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE7AB, 0xBDCA, 	 0, /* 0x50 */
+         0, 0xC2E7, 0xD1A4, 	 0, 	 0, 	 0, 0xB8F8, 	 0, /* 0x60 */
+    0xC8DE, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD0F5, 	 0, /* 0x60 */
+         0, 0xCDB3, 0xCBBF, 0xE7AD, 	 0, 	 0, 0xBEF8, 	 0, /* 0x70 */
+         0, 0xBEEE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xB0F3, 	 0, 0xE7AF, 	 0, 	 0, 0xE7AE, 	 0, /* 0x80 */
+    0xE7B0, 0xD0E5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBE7, /* 0x80 */
+         0, 	 0, 	 0, 0xBEAD, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xD7DB, 	 0, 0xE7B6, 	 0, /* 0x90 */
+         0, 	 0, 0xB3F1, 0xE7B9, 	 0, 	 0, 0xF4EB, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xCFDF, 0xE7B7, 0xCEAC, 0xF4EC, 	 0, /* 0xA0 */
+    0xE7BA, 0xB8D9, 0xCDF8, 0xB1C1, 0xD7BA, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xC2DA, 0xE7B8, 0xE7B2, 0xD5C0, 	 0, 0xB4C2, 0xE7B1, 0xC3E0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xE7B5, 	 0, 	 0, 0xE7BB, /* 0xC0 */
+         0, 	 0, 0xBDF4, 0xE7B3, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xC2CC, 0xD0F7, 	 0, 0xE7B4, 	 0, 	 0, 0xE7BD, /* 0xD0 */
+    0xBCEA, 0xE7BC, 	 0, 	 0, 	 0, 0xBCA9, 0xB6D0, 	 0, /* 0xD0 */
+    0xB5DE, 0xE7C5, 	 0, 0xD4B5, 	 0, 	 0, 0xE7C1, 	 0, /* 0xE0 */
+    0xB1E0, 0xBBBA, 	 0, 	 0, 0xC3E5, 	 0, 	 0, 0xCEB3, /* 0xE0 */
+         0, 0xE7C3, 0xE7BF, 	 0, 0xC1B7, 	 0, 0xE7C2, 	 0, /* 0xF0 */
+         0, 0xE7BE, 	 0, 0xF9A4									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_7E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-    0xDDD3, 0xE7C6, 0xE7CB, 0xE7C4,      0,      0,      0,      0, /* 0x00 */
-    0xE7A7, 0xE7CC,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xB8BF,      0, 0xE7C7, 0xE7C9, 0xE7C8, /* 0x10 */
-         0,      0,      0, 0xCFD8,      0,      0,      0, 0xCCD0, /* 0x20 */
-         0,      0,      0, 0xB7EC,      0, 0xE7CA, 0xCBF5,      0, /* 0x20 */
-         0, 0xD7DD, 0xE7D0,      0, 0xF8E3, 0xE7CF, 0xF4EA, 0xC2C6, /* 0x30 */
-         0, 0xE7CE,      0, 0xF7E3,      0, 0xD7DC, 0xBCA8,      0, /* 0x30 */
-         0, 0xB7B1,      0,      0,      0, 0xE7D2, 0xE7D1, 0xF4ED, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xE7D5,      0, 0xD6AF, 0xC9C9,      0,      0, /* 0x50 */
-         0,      0, 0xE7D4,      0,      0,      0, 0xC8C6,      0, /* 0x50 */
-         0,      0, 0xE7C0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xC9FE, 0xBBE6, 0xF8F3,      0, 0xBCEB, 0xE7D6, 0xE7D9, /* 0x60 */
-    0xE7D8,      0,      0, 0xBDC9,      0,      0,      0,      0, /* 0x70 */
-         0, 0xD2EF,      0,      0, 0xBCCC, 0xE7CD, 0xE7D7,      0, /* 0x70 */
-         0,      0, 0xD7EB,      0,      0,      0,      0,      0, /* 0x80 */
-    0xE7D3,      0, 0xE6FE,      0, 0xD0F8, 0xF8CD,      0, 0xB2F8, /* 0x80 */
-         0,      0,      0, 0xD3A7, 0xF8A6,      0, 0xCFCB,      0, /* 0x90 */
-    0xE7DA,      0,      0, 0xF4EE, 0xC0C2                          /* 0x90 */
+    0xDDD3, 0xE7C6, 0xE7CB, 0xE7C4, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xE7A7, 0xE7CC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xB8BF, 	 0, 0xE7C7, 0xE7C9, 0xE7C8, /* 0x10 */
+         0, 	 0, 	 0, 0xCFD8, 	 0, 	 0, 	 0, 0xCCD0, /* 0x20 */
+         0, 	 0, 	 0, 0xB7EC, 	 0, 0xE7CA, 0xCBF5, 	 0, /* 0x20 */
+         0, 0xD7DD, 0xE7D0, 	 0, 0xF8E3, 0xE7CF, 0xF4EA, 0xC2C6, /* 0x30 */
+         0, 0xE7CE, 	 0, 0xF7E3, 	 0, 0xD7DC, 0xBCA8, 	 0, /* 0x30 */
+         0, 0xB7B1, 	 0, 	 0, 	 0, 0xE7D2, 0xE7D1, 0xF4ED, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xE7D5, 	 0, 0xD6AF, 0xC9C9, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xE7D4, 	 0, 	 0, 	 0, 0xC8C6, 	 0, /* 0x50 */
+         0, 	 0, 0xE7C0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xC9FE, 0xBBE6, 0xF8F3, 	 0, 0xBCEB, 0xE7D6, 0xE7D9, /* 0x60 */
+    0xE7D8, 	 0, 	 0, 0xBDC9, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xD2EF, 	 0, 	 0, 0xBCCC, 0xE7CD, 0xE7D7, 	 0, /* 0x70 */
+         0, 	 0, 0xD7EB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE7D3, 	 0, 0xE6FE, 	 0, 0xD0F8, 0xF8CD, 	 0, 0xB2F8, /* 0x80 */
+         0, 	 0, 	 0, 0xD3A7, 0xF8A6, 	 0, 0xCFCB, 	 0, /* 0x90 */
+    0xE7DA, 	 0, 	 0, 0xF4EE, 0xC0C2							/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_7F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0xF3BE,      0, /* 0x30 */
-    0xB8D7,      0, 0xC8B1,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xF3C0, 0xF3C1,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xF3BF,      0, 0xF8EE,      0, /* 0x40 */
-    0xB9DE,      0,      0,      0, 0xD8E8, 0xBAB1,      0,      0, /* 0x50 */
-    0xEEB7,      0,      0,      0,      0,      0,      0, 0xEEB9, /* 0x50 */
-         0, 0xEEB8,      0,      0,      0,      0,      0,      0, /* 0x60 */
-    0xEEBB, 0xD5D6, 0xD7EF,      0,      0,      0, 0xD6C3,      0, /* 0x60 */
-    0xB7A3, 0xEEBD, 0xCAF0,      0,      0,      0,      0, 0xB0D5, /* 0x70 */
-         0, 0xEEBE,      0,      0,      0,      0, 0xEEC0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xC2DE, 0xEEBC,      0, /* 0x80 */
-    0xEEBF,      0, 0xD1F2,      0, 0xC7BC,      0, 0xC3C0,      0, /* 0x80 */
-         0,      0,      0,      0, 0xB8E1,      0,      0,      0, /* 0x90 */
-         0,      0, 0xC1E7,      0,      0, 0xF4C6, 0xD0DF,      0, /* 0x90 */
-         0, 0xCFDB,      0,      0, 0xC8BA, 0xF4C7,      0, 0xF4C8, /* 0xA0 */
-         0, 0xD2E5,      0,      0,      0,      0,      0, 0xF4C9, /* 0xA0 */
-    0xF4CA,      0, 0xF4CB,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xD9FA, 0xB8FE,      0,      0, 0xE5F1, 0xD3F0,      0, 0xF4E0, /* 0xB0 */
-         0, 0xCECC,      0,      0,      0, 0xB3E1,      0,      0, /* 0xC0 */
-         0,      0, 0xF1B4,      0, 0xD2EE,      0, 0xF4E1,      0, /* 0xC0 */
-         0,      0, 0xCFB0,      0, 0xCFE8, 0xF4E2,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0xB5D4, /* 0xD0 */
-    0xB4E4, 0xF4E4,      0,      0,      0, 0xF4E3, 0xF4E5,      0, /* 0xE0 */
-         0, 0xF4E6,      0,      0,      0,      0, 0xF4E7,      0, /* 0xE0 */
-    0xBAB2, 0xB0BF,      0, 0xF4E8,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xC7CC,      0, 0xB7AD, 0xD2ED                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0xF3BE, 	 0, /* 0x30 */
+    0xB8D7, 	 0, 0xC8B1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xF3C0, 0xF3C1, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xF3BF, 	 0, 0xF8EE, 	 0, /* 0x40 */
+    0xB9DE, 	 0, 	 0, 	 0, 0xD8E8, 0xBAB1, 	 0, 	 0, /* 0x50 */
+    0xEEB7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEEB9, /* 0x50 */
+         0, 0xEEB8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xEEBB, 0xD5D6, 0xD7EF, 	 0, 	 0, 	 0, 0xD6C3, 	 0, /* 0x60 */
+    0xB7A3, 0xEEBD, 0xCAF0, 	 0, 	 0, 	 0, 	 0, 0xB0D5, /* 0x70 */
+         0, 0xEEBE, 	 0, 	 0, 	 0, 	 0, 0xEEC0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC2DE, 0xEEBC, 	 0, /* 0x80 */
+    0xEEBF, 	 0, 0xD1F2, 	 0, 0xC7BC, 	 0, 0xC3C0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xB8E1, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xC1E7, 	 0, 	 0, 0xF4C6, 0xD0DF, 	 0, /* 0x90 */
+         0, 0xCFDB, 	 0, 	 0, 0xC8BA, 0xF4C7, 	 0, 0xF4C8, /* 0xA0 */
+         0, 0xD2E5, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF4C9, /* 0xA0 */
+    0xF4CA, 	 0, 0xF4CB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xD9FA, 0xB8FE, 	 0, 	 0, 0xE5F1, 0xD3F0, 	 0, 0xF4E0, /* 0xB0 */
+         0, 0xCECC, 	 0, 	 0, 	 0, 0xB3E1, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xF1B4, 	 0, 0xD2EE, 	 0, 0xF4E1, 	 0, /* 0xC0 */
+         0, 	 0, 0xCFB0, 	 0, 0xCFE8, 0xF4E2, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB5D4, /* 0xD0 */
+    0xB4E4, 0xF4E4, 	 0, 	 0, 	 0, 0xF4E3, 0xF4E5, 	 0, /* 0xE0 */
+         0, 0xF4E6, 	 0, 	 0, 	 0, 	 0, 0xF4E7, 	 0, /* 0xE0 */
+    0xBAB2, 0xB0BF, 	 0, 0xF4E8, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xC7CC, 	 0, 0xB7AD, 0xD2ED							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_80[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD2AB, 0xC0CF,      0, 0xBFBC, 0xEBA3, 0xD5DF, 0xEAC8,      0, /* 0x00 */
-         0,      0,      0, 0xF1F3, 0xB6F8, 0xCBA3,      0,      0, /* 0x00 */
-    0xC4CD,      0, 0xF1E7,      0, 0xF1E8, 0xB8FB, 0xF1E9, 0xBAC4, /* 0x10 */
-    0xD4C5, 0xB0D2,      0,      0, 0xF1EA,      0,      0,      0, /* 0x10 */
-    0xF1EB,      0,      0,      0,      0, 0xF1ED, 0xF1EE,      0, /* 0x20 */
-    0xF1F1, 0xF1F0, 0xC5D5,      0, 0xF1EF,      0, 0xF1EC,      0, /* 0x20 */
-         0, 0xF1F2,      0, 0xB6FA,      0, 0xF1F4, 0xD2AE, 0xDEC7, /* 0x30 */
-         0,      0,      0, 0xB3DC,      0, 0xB5A2,      0, 0xB9A2, /* 0x30 */
-         0,      0,      0, 0xF1F5,      0,      0, 0xF1F6,      0, /* 0x40 */
-         0,      0, 0xC1C4,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xF1F8,      0,      0,      0, 0xCAA5,      0, /* 0x50 */
-    0xC6B8,      0, 0xBEDB,      0,      0,      0, 0xCEC5,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0xC1AA, /* 0x60 */
-    0xB4CF, 0xF1FA, 0xC9F9, 0xCBCA,      0, 0xF1F9, 0xC4F4, 0xD6B0, /* 0x70 */
-         0, 0xF1F7,      0,      0,      0, 0xCCFD, 0xC1FB, 0xEDB2, /* 0x70 */
-    0xEDB1,      0,      0,      0, 0xD2DE, 0xCBE0, 0xCBC1, 0xD5D8, /* 0x80 */
-         0, 0xC8E2,      0, 0xC0DF, 0xBCA1,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xEBC1,      0,      0, 0xD0A4,      0, /* 0x90 */
-    0xD6E2,      0, 0xB6C7, 0xB8D8, 0xEBC0, 0xB8CE,      0, 0xEBBF, /* 0x90 */
-         0, 0xB9C9, 0xD6AB,      0,      0, 0xB7CA,      0,      0, /* 0xA0 */
-         0, 0xBCE7, 0xB7BE, 0xEBC6,      0, 0xEBC7,      0, 0xBFCF, /* 0xA0 */
-         0, 0xEBC5, 0xD3FD,      0, 0xEBC8,      0,      0, 0xEBC9, /* 0xB0 */
-         0,      0, 0xB7CE,      0, 0xEBC2, 0xEBC4,      0,      0, /* 0xB0 */
-         0,      0, 0xEBCF, 0xCEB8, 0xEBD0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xB1B3, 0xEBD2, 0xCCA5,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xC5D6, 0xEBD3, /* 0xD0 */
-         0, 0xEBD1, 0xC5DF, 0xEBCE,      0, 0xEBD5, 0xB0FB,      0, /* 0xD0 */
-         0, 0xBAFA,      0,      0, 0xD8B7, 0xF1E3,      0,      0, /* 0xE0 */
-         0, 0xEBCC,      0,      0, 0xE6C0, 0xEBD9,      0, 0xBFE8, /* 0xE0 */
-    0xD2C8, 0xEBD7, 0xEBDC, 0xB8EC, 0xEBD8,      0,      0,      0, /* 0xF0 */
-    0xD0D8,      0, 0xB0B7,      0, 0xEBDD, 0xC4DC                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD2AB, 0xC0CF, 	 0, 0xBFBC, 0xEBA3, 0xD5DF, 0xEAC8, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xF1F3, 0xB6F8, 0xCBA3, 	 0, 	 0, /* 0x00 */
+    0xC4CD, 	 0, 0xF1E7, 	 0, 0xF1E8, 0xB8FB, 0xF1E9, 0xBAC4, /* 0x10 */
+    0xD4C5, 0xB0D2, 	 0, 	 0, 0xF1EA, 	 0, 	 0, 	 0, /* 0x10 */
+    0xF1EB, 	 0, 	 0, 	 0, 	 0, 0xF1ED, 0xF1EE, 	 0, /* 0x20 */
+    0xF1F1, 0xF1F0, 0xC5D5, 	 0, 0xF1EF, 	 0, 0xF1EC, 	 0, /* 0x20 */
+         0, 0xF1F2, 	 0, 0xB6FA, 	 0, 0xF1F4, 0xD2AE, 0xDEC7, /* 0x30 */
+         0, 	 0, 	 0, 0xB3DC, 	 0, 0xB5A2, 	 0, 0xB9A2, /* 0x30 */
+         0, 	 0, 	 0, 0xF1F5, 	 0, 	 0, 0xF1F6, 	 0, /* 0x40 */
+         0, 	 0, 0xC1C4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xF1F8, 	 0, 	 0, 	 0, 0xCAA5, 	 0, /* 0x50 */
+    0xC6B8, 	 0, 0xBEDB, 	 0, 	 0, 	 0, 0xCEC5, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC1AA, /* 0x60 */
+    0xB4CF, 0xF1FA, 0xC9F9, 0xCBCA, 	 0, 0xF1F9, 0xC4F4, 0xD6B0, /* 0x70 */
+         0, 0xF1F7, 	 0, 	 0, 	 0, 0xCCFD, 0xC1FB, 0xEDB2, /* 0x70 */
+    0xEDB1, 	 0, 	 0, 	 0, 0xD2DE, 0xCBE0, 0xCBC1, 0xD5D8, /* 0x80 */
+         0, 0xC8E2, 	 0, 0xC0DF, 0xBCA1, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xEBC1, 	 0, 	 0, 0xD0A4, 	 0, /* 0x90 */
+    0xD6E2, 	 0, 0xB6C7, 0xB8D8, 0xEBC0, 0xB8CE, 	 0, 0xEBBF, /* 0x90 */
+         0, 0xB9C9, 0xD6AB, 	 0, 	 0, 0xB7CA, 	 0, 	 0, /* 0xA0 */
+         0, 0xBCE7, 0xB7BE, 0xEBC6, 	 0, 0xEBC7, 	 0, 0xBFCF, /* 0xA0 */
+         0, 0xEBC5, 0xD3FD, 	 0, 0xEBC8, 	 0, 	 0, 0xEBC9, /* 0xB0 */
+         0, 	 0, 0xB7CE, 	 0, 0xEBC2, 0xEBC4, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xEBCF, 0xCEB8, 0xEBD0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xB1B3, 0xEBD2, 0xCCA5, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC5D6, 0xEBD3, /* 0xD0 */
+         0, 0xEBD1, 0xC5DF, 0xEBCE, 	 0, 0xEBD5, 0xB0FB, 	 0, /* 0xD0 */
+         0, 0xBAFA, 	 0, 	 0, 0xD8B7, 0xF1E3, 	 0, 	 0, /* 0xE0 */
+         0, 0xEBCC, 	 0, 	 0, 0xE6C0, 0xEBD9, 	 0, 0xBFE8, /* 0xE0 */
+    0xD2C8, 0xEBD7, 0xEBDC, 0xB8EC, 0xEBD8, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xD0D8, 	 0, 0xB0B7, 	 0, 0xEBDD, 0xC4DC					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_81[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xD6AC,      0,      0, 0xD0B2, 0xB4E0,      0, /* 0x00 */
-         0, 0xC2F6, 0xBCB9,      0,      0,      0, 0xEBDB,      0, /* 0x00 */
-         0,      0, 0xEBDF,      0,      0,      0, 0xB2B1,      0, /* 0x10 */
-    0xEBE4,      0, 0xBDC5, 0xEBD6,      0,      0, 0xEBE2,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xEBE3,      0,      0, 0xB8AC, /* 0x20 */
-         0, 0xCDD1, 0xEBE5,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xD5CD,      0,      0,      0,      0, 0xC6A2,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xCCF3,      0, /* 0x40 */
-    0xEBE6,      0, 0xF8CC, 0xD2B8, 0xEBE7,      0, 0xC9F6,      0, /* 0x40 */
-    0xB8AF, 0xB8AD,      0, 0xEBE8, 0xC7BB, 0xCDF3, 0xEBCB,      0, /* 0x50 */
-         0, 0xEBEA, 0xEBEB,      0,      0,      0,      0,      0, /* 0x50 */
-    0xEBED, 0xEBE1,      0,      0,      0, 0xD0C8, 0xC4D4, 0xEBF2, /* 0x60 */
-         0, 0xEBEE,      0, 0xD6D7,      0, 0xEBF1, 0xC8F9,      0, /* 0x60 */
-    0xD1FC, 0xEBEC,      0,      0, 0xEBE9,      0,      0,      0, /* 0x70 */
-    0xB3A6, 0xB8B9, 0xCFD9,      0, 0xEBEF, 0xEBF0,      0, 0xCDC8, /* 0x70 */
-    0xB0F2,      0, 0xEBF6,      0,      0,      0,      0,      0, /* 0x80 */
-    0xEBF5,      0, 0xB2B2,      0,      0,      0,      0, 0xB8E0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xB1EC,      0, 0xB7F4, 0xCCC5, 0xC4A4, 0xCFA5,      0,      0, /* 0x90 */
-    0xBDBA,      0,      0, 0xEBF9,      0,      0, 0xECA2,      0, /* 0xA0 */
-    0xC5F2, 0xC4E5, 0xEBFA,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xC9C5,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xE2DF, 0xEBFE,      0, 0xB5A8, 0xEBDA, 0xC5A7, /* 0xB0 */
-    0xCDCE, 0xECA1, 0xB1DB, 0xD3B7,      0,      0, 0xD2DC,      0, /* 0xC0 */
-         0, 0xC1B3, 0xEBFD,      0, 0xEBFB, 0xC6EA,      0, 0xEBF7, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xC0B0,      0, 0xEBCD,      0,      0,      0,      0, 0xD4E0, /* 0xD0 */
-    0xD9F5,      0,      0, 0xB3BC,      0,      0,      0, 0xEAB0, /* 0xE0 */
-    0xC1D9,      0, 0xD7D4,      0, 0xF4AB, 0xB3F4,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xD6C1, 0xD6C2,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xCCA8, 0xD5E9, 0xBECA,      0, 0xF4A7          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xD6AC, 	 0, 	 0, 0xD0B2, 0xB4E0, 	 0, /* 0x00 */
+         0, 0xC2F6, 0xBCB9, 	 0, 	 0, 	 0, 0xEBDB, 	 0, /* 0x00 */
+         0, 	 0, 0xEBDF, 	 0, 	 0, 	 0, 0xB2B1, 	 0, /* 0x10 */
+    0xEBE4, 	 0, 0xBDC5, 0xEBD6, 	 0, 	 0, 0xEBE2, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xEBE3, 	 0, 	 0, 0xB8AC, /* 0x20 */
+         0, 0xCDD1, 0xEBE5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xD5CD, 	 0, 	 0, 	 0, 	 0, 0xC6A2, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCCF3, 	 0, /* 0x40 */
+    0xEBE6, 	 0, 0xF8CC, 0xD2B8, 0xEBE7, 	 0, 0xC9F6, 	 0, /* 0x40 */
+    0xB8AF, 0xB8AD, 	 0, 0xEBE8, 0xC7BB, 0xCDF3, 0xEBCB, 	 0, /* 0x50 */
+         0, 0xEBEA, 0xEBEB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xEBED, 0xEBE1, 	 0, 	 0, 	 0, 0xD0C8, 0xC4D4, 0xEBF2, /* 0x60 */
+         0, 0xEBEE, 	 0, 0xD6D7, 	 0, 0xEBF1, 0xC8F9, 	 0, /* 0x60 */
+    0xD1FC, 0xEBEC, 	 0, 	 0, 0xEBE9, 	 0, 	 0, 	 0, /* 0x70 */
+    0xB3A6, 0xB8B9, 0xCFD9, 	 0, 0xEBEF, 0xEBF0, 	 0, 0xCDC8, /* 0x70 */
+    0xB0F2, 	 0, 0xEBF6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xEBF5, 	 0, 0xB2B2, 	 0, 	 0, 	 0, 	 0, 0xB8E0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xB1EC, 	 0, 0xB7F4, 0xCCC5, 0xC4A4, 0xCFA5, 	 0, 	 0, /* 0x90 */
+    0xBDBA, 	 0, 	 0, 0xEBF9, 	 0, 	 0, 0xECA2, 	 0, /* 0xA0 */
+    0xC5F2, 0xC4E5, 0xEBFA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xC9C5, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xE2DF, 0xEBFE, 	 0, 0xB5A8, 0xEBDA, 0xC5A7, /* 0xB0 */
+    0xCDCE, 0xECA1, 0xB1DB, 0xD3B7, 	 0, 	 0, 0xD2DC, 	 0, /* 0xC0 */
+         0, 0xC1B3, 0xEBFD, 	 0, 0xEBFB, 0xC6EA, 	 0, 0xEBF7, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xC0B0, 	 0, 0xEBCD, 	 0, 	 0, 	 0, 	 0, 0xD4E0, /* 0xD0 */
+    0xD9F5, 	 0, 	 0, 0xB3BC, 	 0, 	 0, 	 0, 0xEAB0, /* 0xE0 */
+    0xC1D9, 	 0, 0xD7D4, 	 0, 0xF4AB, 0xB3F4, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xD6C1, 0xD6C2, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xCCA8, 0xD5E9, 0xBECA, 	 0, 0xF4A7			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_82[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD2A8, 0xF4A8, 0xF4A9,      0, 0xF4AA, 0xBECB,      0, 0xD3EB, /* 0x00 */
-    0xD0CB, 0xBED9, 0xBEC9,      0, 0xC9E0, 0xF8E7,      0,      0, /* 0x00 */
-    0xF3C2,      0, 0xCAE6,      0, 0xCCF2,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xE2B6, 0xCBB4,      0, 0xCEE8, 0xD6DB, /* 0x10 */
-         0, 0xF4AD, 0xF4AE,      0,      0,      0,      0,      0, /* 0x20 */
-    0xF4B2,      0, 0xBABD, 0xF4B3, 0xB0E3, 0xF4B0,      0, 0xF4B1, /* 0x20 */
-         0,      0,      0, 0xF4B6, 0xF4B7, 0xB6E6, 0xB2B0, 0xCFCF, /* 0x30 */
-    0xF4B4, 0xB4AC,      0,      0,      0,      0, 0xF4B8,      0, /* 0x30 */
-         0,      0,      0,      0, 0xF4B9,      0,      0, 0xCDA7, /* 0x40 */
-         0, 0xF4BA,      0, 0xF4BB,      0,      0,      0, 0xF4BC, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xCBD2, 0xB2D5, 0xF4BD,      0,      0,      0,      0, 0xF4BE, /* 0x50 */
-         0,      0,      0,      0, 0xF4AF,      0, 0xBDA2,      0, /* 0x60 */
-    0xF4BF,      0,      0, 0xF4B5,      0,      0, 0xF4DE, 0xC1BC, /* 0x60 */
-         0, 0xBCE8, 0xC9AB,      0, 0xE5F5,      0,      0, 0xD1DE, /* 0x70 */
-         0, 0xDCB3,      0,      0,      0, 0xDCB4, 0xB0AC, 0xDCB5, /* 0x70 */
-         0,      0,      0,      0, 0xDCB9,      0,      0,      0, /* 0x80 */
-    0xD8C2,      0, 0xDCB7, 0xD3F3,      0, 0xC9D6, 0xDCBA, 0xDCB6, /* 0x80 */
-         0, 0xDCBB, 0xC3A2,      0,      0,      0,      0,      0, /* 0x90 */
-    0xDCC5, 0xDCBD,      0,      0,      0, 0xD6A5,      0, 0xDCCF, /* 0x90 */
-         0, 0xDCCD,      0,      0, 0xDCD2, 0xBDE6,      0,      0, /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD2A8, 0xF4A8, 0xF4A9, 	 0, 0xF4AA, 0xBECB, 	 0, 0xD3EB, /* 0x00 */
+    0xD0CB, 0xBED9, 0xBEC9, 	 0, 0xC9E0, 0xF8E7, 	 0, 	 0, /* 0x00 */
+    0xF3C2, 	 0, 0xCAE6, 	 0, 0xCCF2, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xE2B6, 0xCBB4, 	 0, 0xCEE8, 0xD6DB, /* 0x10 */
+         0, 0xF4AD, 0xF4AE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xF4B2, 	 0, 0xBABD, 0xF4B3, 0xB0E3, 0xF4B0, 	 0, 0xF4B1, /* 0x20 */
+         0, 	 0, 	 0, 0xF4B6, 0xF4B7, 0xB6E6, 0xB2B0, 0xCFCF, /* 0x30 */
+    0xF4B4, 0xB4AC, 	 0, 	 0, 	 0, 	 0, 0xF4B8, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xF4B9, 	 0, 	 0, 0xCDA7, /* 0x40 */
+         0, 0xF4BA, 	 0, 0xF4BB, 	 0, 	 0, 	 0, 0xF4BC, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xCBD2, 0xB2D5, 0xF4BD, 	 0, 	 0, 	 0, 	 0, 0xF4BE, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xF4AF, 	 0, 0xBDA2, 	 0, /* 0x60 */
+    0xF4BF, 	 0, 	 0, 0xF4B5, 	 0, 	 0, 0xF4DE, 0xC1BC, /* 0x60 */
+         0, 0xBCE8, 0xC9AB, 	 0, 0xE5F5, 	 0, 	 0, 0xD1DE, /* 0x70 */
+         0, 0xDCB3, 	 0, 	 0, 	 0, 0xDCB4, 0xB0AC, 0xDCB5, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xDCB9, 	 0, 	 0, 	 0, /* 0x80 */
+    0xD8C2, 	 0, 0xDCB7, 0xD3F3, 	 0, 0xC9D6, 0xDCBA, 0xDCB6, /* 0x80 */
+         0, 0xDCBB, 0xC3A2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xDCC5, 0xDCBD, 	 0, 	 0, 	 0, 0xD6A5, 	 0, 0xDCCF, /* 0x90 */
+         0, 0xDCCD, 	 0, 	 0, 0xDCD2, 0xBDE6, 	 0, 	 0, /* 0xA0 */
     0xDCB8, 0xDCCB, 0xDCCE, 0xDCBE, 0xB7D2, 0xB0C5, 0xDCC7, 0xD0BE, /* 0xA0 */
-    0xDCC1, 0xBBA8,      0, 0xB7BC, 0xDCCC,      0,      0, 0xDCC6, /* 0xB0 */
-         0, 0xC7DB,      0, 0xDBBB,      0, 0xD1BF, 0xDCC0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xDCD0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xDCC3,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xD4B7, 0xDCDB, 0xDCDF, 0xCCA6, 0xDCE6,      0, 0xC3E7, /* 0xD0 */
-    0xDCDC,      0,      0, 0xBFC1, 0xDCD9,      0, 0xB0FA, 0xB9B6, /* 0xD0 */
-    0xDCE5, 0xDCD3,      0, 0xDCC4, 0xDCD6, 0xC8F4, 0xBFE0, 0xDCD1, /* 0xE0 */
-         0,      0,      0, 0xC9BB,      0,      0,      0, 0xB1BD, /* 0xE0 */
-         0, 0xD3A2,      0,      0, 0xDCDA,      0,      0, 0xDCD5, /* 0xF0 */
-         0, 0xF8DC,      0, 0xDCDE                                  /* 0xF0 */
+    0xDCC1, 0xBBA8, 	 0, 0xB7BC, 0xDCCC, 	 0, 	 0, 0xDCC6, /* 0xB0 */
+         0, 0xC7DB, 	 0, 0xDBBB, 	 0, 0xD1BF, 0xDCC0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xDCD0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xDCC3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xD4B7, 0xDCDB, 0xDCDF, 0xCCA6, 0xDCE6, 	 0, 0xC3E7, /* 0xD0 */
+    0xDCDC, 	 0, 	 0, 0xBFC1, 0xDCD9, 	 0, 0xB0FA, 0xB9B6, /* 0xD0 */
+    0xDCE5, 0xDCD3, 	 0, 0xDCC4, 0xDCD6, 0xC8F4, 0xBFE0, 0xDCD1, /* 0xE0 */
+         0, 	 0, 	 0, 0xC9BB, 	 0, 	 0, 	 0, 0xB1BD, /* 0xE0 */
+         0, 0xD3A2, 	 0, 	 0, 0xDCDA, 	 0, 	 0, 0xDCD5, /* 0xF0 */
+         0, 0xF8DC, 	 0, 0xDCDE									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_83[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xD7C2, 0xC3AF, 0xF8B2, 0xC7D1, 0xC3A9, 0xDCE2, 0xDCD8, /* 0x00 */
-    0xDCEB, 0xDCD4,      0,      0, 0xDCDD,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0, 0xDCF8, /* 0x10 */
-         0,      0, 0xDCE1, 0xDDA2, 0xDCE7,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xB4C4,      0,      0, 0xC3A3, 0xB2E7, 0xDCFA,      0, 0xDCF2, /* 0x20 */
-         0, 0xDCEF,      0, 0xDCFC, 0xDCEE, 0xD2F0, 0xB2E8,      0, /* 0x30 */
-    0xC8D7, 0xC8E3, 0xDCFB,      0, 0xDCED,      0,      0,      0, /* 0x30 */
-    0xDCF7,      0,      0, 0xDCF5,      0,      0, 0xBEA3, 0xDCF4, /* 0x40 */
-         0, 0xB2DD,      0,      0,      0,      0,      0, 0xDCF3, /* 0x40 */
-    0xF8C3, 0xDCE8, 0xBBC4,      0, 0xC0F3,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0xBAC9, /* 0x70 */
-    0xDDA9,      0,      0, 0xDDB6, 0xDDB1, 0xDDB4,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xDDB0, 0xC6CE,      0, /* 0x80 */
-         0, 0xC0F2, 0xD7AF,      0,      0,      0, 0xC9AF,      0, /* 0x80 */
-         0,      0, 0xDCEC, 0xDDAE,      0,      0, 0xBEA5,      0, /* 0x90 */
-    0xDDB7,      0,      0, 0xDCF0, 0xDDAF,      0, 0xDDB8,      0, /* 0x90 */
-    0xDDAC,      0, 0xBCD4,      0,      0,      0,      0, 0xDCC8, /* 0xA0 */
-    0xDDB9, 0xDDB3, 0xDDAD, 0xC4AA,      0,      0,      0,      0, /* 0xA0 */
-    0xDDA8,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xC3A7,      0,      0, /* 0xB0 */
-    0xDDD2, 0xDDBC,      0,      0,      0, 0xDDD1,      0, 0xB9BD, /* 0xC0 */
-         0,      0, 0xBED5,      0, 0xBEFA,      0,      0, 0xBACA, /* 0xC0 */
-         0,      0,      0,      0, 0xDDCA,      0, 0xDDC5,      0, /* 0xD0 */
-    0xDDBF,      0,      0,      0, 0xB2CB, 0xDDC3,      0, 0xDDCB, /* 0xD0 */
-    0xB2A4, 0xDDD5,      0,      0,      0, 0xDDBE,      0,      0, /* 0xE0 */
-         0, 0xC6D0, 0xDDD0,      0,      0,      0,      0, 0xBBAA, /* 0xE0 */
-    0xDDD4, 0xC1E2, 0xB7C6,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xDDCE, 0xDDCF,      0,      0,      0, 0xDDC4                  /* 0xF0 */
+    0xDCEB, 0xDCD4, 	 0, 	 0, 0xDCDD, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDCF8, /* 0x10 */
+         0, 	 0, 0xDCE1, 0xDDA2, 0xDCE7, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xB4C4, 	 0, 	 0, 0xC3A3, 0xB2E7, 0xDCFA, 	 0, 0xDCF2, /* 0x20 */
+         0, 0xDCEF, 	 0, 0xDCFC, 0xDCEE, 0xD2F0, 0xB2E8, 	 0, /* 0x30 */
+    0xC8D7, 0xC8E3, 0xDCFB, 	 0, 0xDCED, 	 0, 	 0, 	 0, /* 0x30 */
+    0xDCF7, 	 0, 	 0, 0xDCF5, 	 0, 	 0, 0xBEA3, 0xDCF4, /* 0x40 */
+         0, 0xB2DD, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDCF3, /* 0x40 */
+    0xF8C3, 0xDCE8, 0xBBC4, 	 0, 0xC0F3, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBAC9, /* 0x70 */
+    0xDDA9, 	 0, 	 0, 0xDDB6, 0xDDB1, 0xDDB4, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDDB0, 0xC6CE, 	 0, /* 0x80 */
+         0, 0xC0F2, 0xD7AF, 	 0, 	 0, 	 0, 0xC9AF, 	 0, /* 0x80 */
+         0, 	 0, 0xDCEC, 0xDDAE, 	 0, 	 0, 0xBEA5, 	 0, /* 0x90 */
+    0xDDB7, 	 0, 	 0, 0xDCF0, 0xDDAF, 	 0, 0xDDB8, 	 0, /* 0x90 */
+    0xDDAC, 	 0, 0xBCD4, 	 0, 	 0, 	 0, 	 0, 0xDCC8, /* 0xA0 */
+    0xDDB9, 0xDDB3, 0xDDAD, 0xC4AA, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xDDA8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC3A7, 	 0, 	 0, /* 0xB0 */
+    0xDDD2, 0xDDBC, 	 0, 	 0, 	 0, 0xDDD1, 	 0, 0xB9BD, /* 0xC0 */
+         0, 	 0, 0xBED5, 	 0, 0xBEFA, 	 0, 	 0, 0xBACA, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xDDCA, 	 0, 0xDDC5, 	 0, /* 0xD0 */
+    0xDDBF, 	 0, 	 0, 	 0, 0xB2CB, 0xDDC3, 	 0, 0xDDCB, /* 0xD0 */
+    0xB2A4, 0xDDD5, 	 0, 	 0, 	 0, 0xDDBE, 	 0, 	 0, /* 0xE0 */
+         0, 0xC6D0, 0xDDD0, 	 0, 	 0, 	 0, 	 0, 0xBBAA, /* 0xE0 */
+    0xDDD4, 0xC1E2, 0xB7C6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xDDCE, 0xDDCF, 	 0, 	 0, 	 0, 0xDDC4					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_84[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xDDBD,      0, 0xDDCD, 0xCCD1,      0, 0xDDC9, 0xDCC9, /* 0x00 */
-         0,      0, 0xC0B3, 0xDDC2, 0xC3C8, 0xC6BC, 0xCEAE, 0xDDCC, /* 0x00 */
-         0, 0xDDC8,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xDDC1,      0,      0,      0, 0xDDC6,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xCDF2,      0,      0,      0, /* 0x20 */
-         0, 0xDDE6,      0,      0,      0, 0xDDAB,      0,      0, /* 0x30 */
-    0xDDC7,      0,      0,      0, 0xDDE0, 0xC2E4,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xDDE1,      0, /* 0x40 */
-         0, 0xD2B6,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xDDD7, 0xDDA6,      0,      0,      0,      0, 0xD6F8, /* 0x50 */
-         0, 0xDDD9, 0xDDD8, 0xB8F0, 0xDDD6,      0,      0,      0, /* 0x50 */
-         0, 0xC6CF,      0, 0xB6AD, 0xDDA7,      0, 0xCEAD,      0, /* 0x60 */
-         0, 0xDDE2,      0, 0xBAF9, 0xD4E1, 0xDDE7,      0, 0xF8F7, /* 0x60 */
-         0, 0xB4D0,      0, 0xDDDA,      0, 0xBFFB, 0xDDE3, 0xBBE7, /* 0x70 */
-    0xDDDF,      0, 0xDDDD,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xB5D9,      0,      0,      0,      0,      0, /* 0x80 */
-    0xDDDC,      0,      0,      0,      0,      0, 0xDDE5,      0, /* 0x80 */
-         0,      0,      0, 0xDDBB, 0xDDAA,      0,      0, 0xDDF5, /* 0x90 */
-         0, 0xC3C9,      0,      0, 0xCBE2,      0,      0,      0, /* 0x90 */
-         0, 0xDDF2,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0xD8E1, /* 0xA0 */
-         0,      0, 0xC6D1,      0, 0xDDF4,      0,      0,      0, /* 0xB0 */
-    0xD5F4, 0xDDF3, 0xDDF0,      0, 0xB2D4, 0xDDEC,      0, 0xDDEF, /* 0xB0 */
-    0xDDA5, 0xDDE8,      0,      0, 0xD0EE,      0,      0,      0, /* 0xC0 */
-         0, 0xC8D8, 0xDDEE, 0xB8C7,      0, 0xDDE9,      0,      0, /* 0xC0 */
-    0xDDEA, 0xCBF2,      0, 0xDDED,      0,      0, 0xB1CD,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xC5EE,      0, 0xC1AB, 0xDCCA, /* 0xE0 */
-    0xDDFB,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0, 0xDEA4, 0xDCEA,      0, 0xDEA3  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xDDBD, 	 0, 0xDDCD, 0xCCD1, 	 0, 0xDDC9, 0xDCC9, /* 0x00 */
+         0, 	 0, 0xC0B3, 0xDDC2, 0xC3C8, 0xC6BC, 0xCEAE, 0xDDCC, /* 0x00 */
+         0, 0xDDC8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xDDC1, 	 0, 	 0, 	 0, 0xDDC6, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xCDF2, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xDDE6, 	 0, 	 0, 	 0, 0xDDAB, 	 0, 	 0, /* 0x30 */
+    0xDDC7, 	 0, 	 0, 	 0, 0xDDE0, 0xC2E4, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDDE1, 	 0, /* 0x40 */
+         0, 0xD2B6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xDDD7, 0xDDA6, 	 0, 	 0, 	 0, 	 0, 0xD6F8, /* 0x50 */
+         0, 0xDDD9, 0xDDD8, 0xB8F0, 0xDDD6, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xC6CF, 	 0, 0xB6AD, 0xDDA7, 	 0, 0xCEAD, 	 0, /* 0x60 */
+         0, 0xDDE2, 	 0, 0xBAF9, 0xD4E1, 0xDDE7, 	 0, 0xF8F7, /* 0x60 */
+         0, 0xB4D0, 	 0, 0xDDDA, 	 0, 0xBFFB, 0xDDE3, 0xBBE7, /* 0x70 */
+    0xDDDF, 	 0, 0xDDDD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xB5D9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xDDDC, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDDE5, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xDDBB, 0xDDAA, 	 0, 	 0, 0xDDF5, /* 0x90 */
+         0, 0xC3C9, 	 0, 	 0, 0xCBE2, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xDDF2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD8E1, /* 0xA0 */
+         0, 	 0, 0xC6D1, 	 0, 0xDDF4, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xD5F4, 0xDDF3, 0xDDF0, 	 0, 0xB2D4, 0xDDEC, 	 0, 0xDDEF, /* 0xB0 */
+    0xDDA5, 0xDDE8, 	 0, 	 0, 0xD0EE, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xC8D8, 0xDDEE, 0xB8C7, 	 0, 0xDDE9, 	 0, 	 0, /* 0xC0 */
+    0xDDEA, 0xCBF2, 	 0, 0xDDED, 	 0, 	 0, 0xB1CD, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xC5EE, 	 0, 0xC1AB, 0xDCCA, /* 0xE0 */
+    0xDDFB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xDEA4, 0xDCEA, 	 0, 0xDEA3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_85[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-                                    0xDDF8,      0,      0,      0, /* 0x00 */
-         0, 0xC3EF,      0, 0xC2FB, 0xF8A5,      0,      0, 0xD5E1, /* 0x10 */
-         0,      0, 0xCEB5,      0,      0,      0, 0xDDE4, 0xDDFD, /* 0x10 */
-         0, 0xB2CC,      0, 0xBDAF,      0,      0, 0xDCE0,      0, /* 0x20 */
-         0,      0,      0, 0xC4E8, 0xCADF, 0xD2F1,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xDDFA,      0,      0, 0xDEA2,      0, 0xB1CE,      0,      0, /* 0x30 */
-         0, 0xDDA1,      0, 0xDEAC,      0,      0, 0xDDDB,      0, /* 0x40 */
-    0xDEA6, 0xBDB6, 0xC8EF,      0,      0,      0, 0xDCF1,      0, /* 0x40 */
-         0,      0, 0xDDA4, 0xDCBF,      0, 0xDDB5, 0xDEA1,      0, /* 0x50 */
-    0xDCE9, 0xDEA5,      0,      0,      0,      0, 0xDEA9,      0, /* 0x50 */
-         0,      0, 0xDDDE,      0, 0xDEA8,      0,      0,      0, /* 0x60 */
-    0xDEA7, 0xB5B4, 0xCEDF,      0,      0, 0xCFF4,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0xDDF7, /* 0x70 */
-         0, 0xDEB3, 0xDEAA, 0xDEAE,      0,      0, 0xC0D9,      0, /* 0x70 */
-         0,      0,      0,      0, 0xB1A1, 0xDEB6,      0, 0xDEB1, /* 0x80 */
-    0xDCF6,      0, 0xBCBB,      0, 0xDCBC,      0,      0, 0xDEB2, /* 0x80 */
-         0, 0xF8C4,      0,      0, 0xC7BE,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xD1A6, 0xDEB5,      0,      0, 0xDDB2, /* 0x90 */
-         0,      0,      0,      0, 0xDEAF,      0, 0xBCF6,      0, /* 0xA0 */
-    0xDEB0, 0xC8F8, 0xD0BD,      0,      0,      0,      0, 0xCAED, /* 0xA0 */
-    0xDEB9,      0,      0,      0,      0,      0,      0, 0xDEB8, /* 0xB0 */
-         0, 0xDEB7, 0xDCF9,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xDEBB,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xBDE5,      0,      0,      0, 0xC0B6, 0xDDA3, 0xB2D8, /* 0xC0 */
-    0xC3EA,      0,      0,      0,      0, 0xC5BA,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xDEBC, 0xD2D5,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xCCD9, 0xD2A9,      0,      0, /* 0xE0 */
-         0, 0xB7AA, 0xDEB4,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xD4CC,      0, 0xDCC2,      0, /* 0xF0 */
-         0, 0xB0AA, 0xDDFE, 0xD4E5,      0,      0,      0, 0xDEBD  /* 0xF0 */
+                                    0xDDF8, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xC3EF, 	 0, 0xC2FB, 0xF8A5, 	 0, 	 0, 0xD5E1, /* 0x10 */
+         0, 	 0, 0xCEB5, 	 0, 	 0, 	 0, 0xDDE4, 0xDDFD, /* 0x10 */
+         0, 0xB2CC, 	 0, 0xBDAF, 	 0, 	 0, 0xDCE0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xC4E8, 0xCADF, 0xD2F1, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xDDFA, 	 0, 	 0, 0xDEA2, 	 0, 0xB1CE, 	 0, 	 0, /* 0x30 */
+         0, 0xDDA1, 	 0, 0xDEAC, 	 0, 	 0, 0xDDDB, 	 0, /* 0x40 */
+    0xDEA6, 0xBDB6, 0xC8EF, 	 0, 	 0, 	 0, 0xDCF1, 	 0, /* 0x40 */
+         0, 	 0, 0xDDA4, 0xDCBF, 	 0, 0xDDB5, 0xDEA1, 	 0, /* 0x50 */
+    0xDCE9, 0xDEA5, 	 0, 	 0, 	 0, 	 0, 0xDEA9, 	 0, /* 0x50 */
+         0, 	 0, 0xDDDE, 	 0, 0xDEA8, 	 0, 	 0, 	 0, /* 0x60 */
+    0xDEA7, 0xB5B4, 0xCEDF, 	 0, 	 0, 0xCFF4, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDDF7, /* 0x70 */
+         0, 0xDEB3, 0xDEAA, 0xDEAE, 	 0, 	 0, 0xC0D9, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xB1A1, 0xDEB6, 	 0, 0xDEB1, /* 0x80 */
+    0xDCF6, 	 0, 0xBCBB, 	 0, 0xDCBC, 	 0, 	 0, 0xDEB2, /* 0x80 */
+         0, 0xF8C4, 	 0, 	 0, 0xC7BE, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xD1A6, 0xDEB5, 	 0, 	 0, 0xDDB2, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xDEAF, 	 0, 0xBCF6, 	 0, /* 0xA0 */
+    0xDEB0, 0xC8F8, 0xD0BD, 	 0, 	 0, 	 0, 	 0, 0xCAED, /* 0xA0 */
+    0xDEB9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDEB8, /* 0xB0 */
+         0, 0xDEB7, 0xDCF9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xDEBB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xBDE5, 	 0, 	 0, 	 0, 0xC0B6, 0xDDA3, 0xB2D8, /* 0xC0 */
+    0xC3EA, 	 0, 	 0, 	 0, 	 0, 0xC5BA, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xDEBC, 0xD2D5, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xCCD9, 0xD2A9, 	 0, 	 0, /* 0xE0 */
+         0, 0xB7AA, 0xDEB4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xD4CC, 	 0, 0xDCC2, 	 0, /* 0xF0 */
+         0, 0xB0AA, 0xDDFE, 0xD4E5, 	 0, 	 0, 	 0, 0xDEBD	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_86[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                     0xDEAD, 0xDEBF, 0xC2AB, 0xCBD5, /* 0x00 */
-         0,      0,      0, 0xC6BB,      0,      0,      0,      0, /* 0x00 */
-         0, 0xC4A2,      0,      0,      0,      0, 0xDEC1,      0, /* 0x10 */
-         0,      0, 0xDEBA,      0,      0,      0, 0xDDFC,      0, /* 0x10 */
-         0,      0, 0xDCD7,      0,      0,      0,      0, 0xDEBE, /* 0x20 */
-         0, 0xDEC0,      0,      0,      0, 0xC0BC,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xD5BA,      0, 0xDDF1,      0, 0xDEC2,      0,      0, 0xC2DC, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xF2AE, 0xBBA2,      0, /* 0x40 */
-    0xC5B0,      0,      0,      0, 0xF2AF, 0xB4A6,      0,      0, /* 0x50 */
-         0,      0, 0xD0E9,      0, 0xC2B2,      0, 0xD3DD, 0xBAC5, /* 0x50 */
-         0,      0, 0xEBBD,      0,      0,      0,      0, 0xBFF7, /* 0x60 */
-         0,      0,      0,      0, 0xF2B0,      0,      0,      0, /* 0x60 */
-         0, 0xCAAD,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xBAE7, 0xF2B3, 0xF2B5, 0xF2B4,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xCEC3, 0xF2B8, 0xB0F6, 0xF2B7,      0,      0, /* 0x80 */
-         0,      0,      0, 0xF2BE,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xD1C1, 0xF2BA,      0,      0, /* 0x90 */
-         0,      0,      0, 0xF2BC, 0xD4E9,      0,      0, 0xF2BB, /* 0xA0 */
-    0xF2B6, 0xF2BF, 0xF2BD,      0,      0,      0,      0, 0xF2C7, /* 0xA0 */
-    0xF2C4, 0xF2C6,      0,      0, 0xF2CA, 0xF2C2, 0xF2C0,      0, /* 0xB0 */
-         0,      0, 0xF2C5,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xD6FB,      0,      0,      0, 0xF2C1,      0, 0xC7F9, 0xC9DF, /* 0xC0 */
-         0, 0xF2C8,      0, 0xB5B0,      0,      0,      0,      0, /* 0xC0 */
-    0xF2D0, 0xF2D6,      0,      0, 0xBBD7,      0,      0,      0, /* 0xD0 */
-    0xF2D5, 0xCDDC,      0, 0xD6EB,      0,      0, 0xF2D2, 0xF2D4, /* 0xD0 */
-         0,      0,      0,      0, 0xB8F2,      0,      0,      0, /* 0xE0 */
-         0, 0xF2CB,      0,      0,      0, 0xF2CE,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xF2D9, 0xD3BC, 0xF2CC,      0,      0,      0, 0xB6EA          /* 0xF0 */
+         0, 	 0, 	 0, 0xC6BB, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xC4A2, 	 0, 	 0, 	 0, 	 0, 0xDEC1, 	 0, /* 0x10 */
+         0, 	 0, 0xDEBA, 	 0, 	 0, 	 0, 0xDDFC, 	 0, /* 0x10 */
+         0, 	 0, 0xDCD7, 	 0, 	 0, 	 0, 	 0, 0xDEBE, /* 0x20 */
+         0, 0xDEC0, 	 0, 	 0, 	 0, 0xC0BC, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xD5BA, 	 0, 0xDDF1, 	 0, 0xDEC2, 	 0, 	 0, 0xC2DC, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF2AE, 0xBBA2, 	 0, /* 0x40 */
+    0xC5B0, 	 0, 	 0, 	 0, 0xF2AF, 0xB4A6, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xD0E9, 	 0, 0xC2B2, 	 0, 0xD3DD, 0xBAC5, /* 0x50 */
+         0, 	 0, 0xEBBD, 	 0, 	 0, 	 0, 	 0, 0xBFF7, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xF2B0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xCAAD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xBAE7, 0xF2B3, 0xF2B5, 0xF2B4, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xCEC3, 0xF2B8, 0xB0F6, 0xF2B7, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xF2BE, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xD1C1, 0xF2BA, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xF2BC, 0xD4E9, 	 0, 	 0, 0xF2BB, /* 0xA0 */
+    0xF2B6, 0xF2BF, 0xF2BD, 	 0, 	 0, 	 0, 	 0, 0xF2C7, /* 0xA0 */
+    0xF2C4, 0xF2C6, 	 0, 	 0, 0xF2CA, 0xF2C2, 0xF2C0, 	 0, /* 0xB0 */
+         0, 	 0, 0xF2C5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xD6FB, 	 0, 	 0, 	 0, 0xF2C1, 	 0, 0xC7F9, 0xC9DF, /* 0xC0 */
+         0, 0xF2C8, 	 0, 0xB5B0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xF2D0, 0xF2D6, 	 0, 	 0, 0xBBD7, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xF2D5, 0xCDDC, 	 0, 0xD6EB, 	 0, 	 0, 0xF2D2, 0xF2D4, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xB8F2, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 0xF2CB, 	 0, 	 0, 	 0, 0xF2CE, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xF2D9, 0xD3BC, 0xF2CC, 	 0, 	 0, 	 0, 0xB6EA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_87[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xCAF1,      0, 0xB7E4, 0xF2D7,      0,      0, 0xF2B9, 0xF2D8, /* 0x00 */
-    0xF2DA, 0xF2DD, 0xF2DB,      0,      0, 0xF2DC,      0,      0, /* 0x00 */
-         0,      0, 0xD1D1, 0xF2D1,      0, 0xCDC9,      0,      0, /* 0x10 */
-    0xD6A9,      0, 0xF2E3,      0, 0xC3DB,      0, 0xF2E0,      0, /* 0x10 */
-         0, 0xF8CB, 0xF2EC, 0xF2DE,      0, 0xF2E1,      0,      0, /* 0x20 */
-         0, 0xF2E8,      0,      0,      0,      0, 0xF2E2,      0, /* 0x20 */
-         0, 0xF2E7,      0,      0, 0xF2E6,      0,      0, 0xF2E9, /* 0x30 */
-         0,      0,      0, 0xF2DF,      0,      0, 0xF2E4, 0xF2EA, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xF2F2,      0, 0xD0AB,      0, /* 0x40 */
-         0,      0,      0, 0xF2F5,      0, 0xCAB4,      0, 0xBBC8, /* 0x50 */
-         0, 0xF2F9,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xF2F0,      0,      0, 0xF2F6, 0xF2F8, 0xF2FA, 0xCFBA,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xF2F3,      0, /* 0x60 */
-    0xF2F1,      0,      0,      0, 0xBAFB,      0, 0xB5FB,      0, /* 0x70 */
-    0xCECF,      0,      0, 0xF2EF,      0, 0xF2ED,      0,      0, /* 0x70 */
-         0,      0, 0xF2EB, 0xF3A6, 0xF2CF, 0xF3A3,      0,      0, /* 0x80 */
-    0xF3A2,      0,      0, 0xF2F4,      0, 0xC8DA,      0,      0, /* 0x80 */
-         0,      0,      0, 0xF2FB,      0,      0,      0, 0xF3A5, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0xC2EC, 0xC3F8, /* 0x90 */
-         0,      0, 0xD3A9,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xF3A7, 0xF3A9, 0xF3A4,      0, 0xF2FC, /* 0xA0 */
-         0,      0,      0, 0xF3AB,      0, 0xF3AA,      0,      0, /* 0xB0 */
-         0,      0, 0xC2DD, 0xF2F7,      0, 0xF3AE,      0,      0, /* 0xB0 */
-    0xF3B0,      0,      0,      0, 0xD5DD,      0, 0xF3A1,      0, /* 0xC0 */
-    0xF2E5,      0, 0xF3B1, 0xF3AC,      0,      0, 0xF2FD,      0, /* 0xC0 */
-         0, 0xF3AF, 0xF2FE, 0xF3AD,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xF3B2,      0,      0,      0,      0, /* 0xD0 */
-    0xF3B4,      0,      0, 0xF2B1,      0, 0xF3A8,      0,      0, /* 0xE0 */
-         0,      0, 0xF3B3,      0, 0xB2F5,      0, 0xF3B5, 0xF2CD, /* 0xE0 */
-         0,      0, 0xB3E6,      0,      0,      0, 0xF2C9,      0, /* 0xF0 */
-         0, 0xD0B7,      0, 0xD2CF,      0,      0, 0xF3B8          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xCAF1, 	 0, 0xB7E4, 0xF2D7, 	 0, 	 0, 0xF2B9, 0xF2D8, /* 0x00 */
+    0xF2DA, 0xF2DD, 0xF2DB, 	 0, 	 0, 0xF2DC, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xD1D1, 0xF2D1, 	 0, 0xCDC9, 	 0, 	 0, /* 0x10 */
+    0xD6A9, 	 0, 0xF2E3, 	 0, 0xC3DB, 	 0, 0xF2E0, 	 0, /* 0x10 */
+         0, 0xF8CB, 0xF2EC, 0xF2DE, 	 0, 0xF2E1, 	 0, 	 0, /* 0x20 */
+         0, 0xF2E8, 	 0, 	 0, 	 0, 	 0, 0xF2E2, 	 0, /* 0x20 */
+         0, 0xF2E7, 	 0, 	 0, 0xF2E6, 	 0, 	 0, 0xF2E9, /* 0x30 */
+         0, 	 0, 	 0, 0xF2DF, 	 0, 	 0, 0xF2E4, 0xF2EA, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xF2F2, 	 0, 0xD0AB, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xF2F5, 	 0, 0xCAB4, 	 0, 0xBBC8, /* 0x50 */
+         0, 0xF2F9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xF2F0, 	 0, 	 0, 0xF2F6, 0xF2F8, 0xF2FA, 0xCFBA, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF2F3, 	 0, /* 0x60 */
+    0xF2F1, 	 0, 	 0, 	 0, 0xBAFB, 	 0, 0xB5FB, 	 0, /* 0x70 */
+    0xCECF, 	 0, 	 0, 0xF2EF, 	 0, 0xF2ED, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xF2EB, 0xF3A6, 0xF2CF, 0xF3A3, 	 0, 	 0, /* 0x80 */
+    0xF3A2, 	 0, 	 0, 0xF2F4, 	 0, 0xC8DA, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xF2FB, 	 0, 	 0, 	 0, 0xF3A5, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC2EC, 0xC3F8, /* 0x90 */
+         0, 	 0, 0xD3A9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xF3A7, 0xF3A9, 0xF3A4, 	 0, 0xF2FC, /* 0xA0 */
+         0, 	 0, 	 0, 0xF3AB, 	 0, 0xF3AA, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xC2DD, 0xF2F7, 	 0, 0xF3AE, 	 0, 	 0, /* 0xB0 */
+    0xF3B0, 	 0, 	 0, 	 0, 0xD5DD, 	 0, 0xF3A1, 	 0, /* 0xC0 */
+    0xF2E5, 	 0, 0xF3B1, 0xF3AC, 	 0, 	 0, 0xF2FD, 	 0, /* 0xC0 */
+         0, 0xF3AF, 0xF2FE, 0xF3AD, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xF3B2, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xF3B4, 	 0, 	 0, 0xF2B1, 	 0, 0xF3A8, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xF3B3, 	 0, 0xB2F5, 	 0, 0xF3B5, 0xF2CD, /* 0xE0 */
+         0, 	 0, 0xB3E6, 	 0, 	 0, 	 0, 0xF2C9, 	 0, /* 0xF0 */
+         0, 0xD0B7, 	 0, 0xD2CF, 	 0, 	 0, 0xF3B8			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_88[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xD9F9,      0, 0xD3AC, 0xF2B2,      0, /* 0x00 */
-         0,      0, 0xF3B9,      0,      0,      0,      0,      0, /* 0x00 */
-    0xF2D3, 0xF2EE,      0, 0xF3B7,      0, 0xC8E4, 0xF3B6,      0, /* 0x10 */
-         0,      0,      0, 0xF3BA,      0,      0,      0, 0xC0AF, /* 0x10 */
-         0, 0xF3BB, 0xB4C0, 0xF2C3,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0, 0xB9C6, 0xEEC3,      0,      0,      0, 0xB2CF,      0, /* 0x30 */
-         0, 0xF3BC,      0, 0xC2F9, 0xF3BD,      0,      0,      0, /* 0x30 */
-    0xD1AA,      0,      0,      0, 0xF4AC,      0, 0xD6DA,      0, /* 0x40 */
-         0,      0, 0xF8DA,      0, 0xD0D0, 0xD1DC,      0,      0, /* 0x40 */
-         0,      0,      0, 0xCAF5,      0,      0,      0, 0xBDD6, /* 0x50 */
-         0, 0xD1C3,      0, 0xCEC0,      0, 0xB3E5,      0,      0, /* 0x50 */
-         0, 0xBAE2, 0xE1E9, 0xD2C2, 0xF1C2,      0,      0,      0, /* 0x60 */
-    0xB1ED, 0xF1C3,      0, 0xC9C0,      0,      0, 0xD9F2,      0, /* 0x60 */
-    0xCBA5,      0, 0xF1C4,      0,      0,      0,      0, 0xD6D4, /* 0x70 */
-         0, 0xD6BB,      0,      0,      0, 0xF1C5, 0xF4C0, 0xF1C6, /* 0x70 */
-         0, 0xD4AC, 0xF1C7,      0,      0,      0,      0,      0, /* 0x80 */
-    0xF4C2,      0,      0, 0xB4FC,      0, 0xC5DB,      0,      0, /* 0x80 */
-         0,      0, 0xCCBB,      0,      0,      0, 0xD0E4,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xF1C8,      0, 0xD9F3,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xB1BB,      0,      0,      0,      0, /* 0xA0 */
-         0, 0xB8A4,      0,      0,      0,      0,      0, 0xF1CA, /* 0xB0 */
-         0,      0,      0,      0, 0xF1CB,      0,      0,      0, /* 0xB0 */
-         0, 0xB2C3, 0xC1D1,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xF1CC, 0xF4C1,      0,      0,      0, 0xF1CE, 0xC0EF, /* 0xC0 */
-         0,      0, 0xD9F6,      0, 0xD2E1, 0xD4A3,      0,      0, /* 0xD0 */
-    0xF4C3, 0xC8B9,      0,      0, 0xB2B9, 0xD7B0,      0, 0xF4C4, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xF1D4,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xF1D6, 0xF1D1,      0, 0xC9D1, 0xC5E1,      0,      0,      0, /* 0xF0 */
-    0xC2E3, 0xB9FC,      0,      0, 0xF1D3, 0xF9A5, 0xF1D5          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xD9F9, 	 0, 0xD3AC, 0xF2B2, 	 0, /* 0x00 */
+         0, 	 0, 0xF3B9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xF2D3, 0xF2EE, 	 0, 0xF3B7, 	 0, 0xC8E4, 0xF3B6, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xF3BA, 	 0, 	 0, 	 0, 0xC0AF, /* 0x10 */
+         0, 0xF3BB, 0xB4C0, 0xF2C3, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xB9C6, 0xEEC3, 	 0, 	 0, 	 0, 0xB2CF, 	 0, /* 0x30 */
+         0, 0xF3BC, 	 0, 0xC2F9, 0xF3BD, 	 0, 	 0, 	 0, /* 0x30 */
+    0xD1AA, 	 0, 	 0, 	 0, 0xF4AC, 	 0, 0xD6DA, 	 0, /* 0x40 */
+         0, 	 0, 0xF8DA, 	 0, 0xD0D0, 0xD1DC, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xCAF5, 	 0, 	 0, 	 0, 0xBDD6, /* 0x50 */
+         0, 0xD1C3, 	 0, 0xCEC0, 	 0, 0xB3E5, 	 0, 	 0, /* 0x50 */
+         0, 0xBAE2, 0xE1E9, 0xD2C2, 0xF1C2, 	 0, 	 0, 	 0, /* 0x60 */
+    0xB1ED, 0xF1C3, 	 0, 0xC9C0, 	 0, 	 0, 0xD9F2, 	 0, /* 0x60 */
+    0xCBA5, 	 0, 0xF1C4, 	 0, 	 0, 	 0, 	 0, 0xD6D4, /* 0x70 */
+         0, 0xD6BB, 	 0, 	 0, 	 0, 0xF1C5, 0xF4C0, 0xF1C6, /* 0x70 */
+         0, 0xD4AC, 0xF1C7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xF4C2, 	 0, 	 0, 0xB4FC, 	 0, 0xC5DB, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xCCBB, 	 0, 	 0, 	 0, 0xD0E4, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xF1C8, 	 0, 0xD9F3, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xB1BB, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xB8A4, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF1CA, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xF1CB, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xB2C3, 0xC1D1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xF1CC, 0xF4C1, 	 0, 	 0, 	 0, 0xF1CE, 0xC0EF, /* 0xC0 */
+         0, 	 0, 0xD9F6, 	 0, 0xD2E1, 0xD4A3, 	 0, 	 0, /* 0xD0 */
+    0xF4C3, 0xC8B9, 	 0, 	 0, 0xB2B9, 0xD7B0, 	 0, 0xF4C4, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xF1D4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xF1D6, 0xF1D1, 	 0, 0xC9D1, 0xC5E1, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xC2E3, 0xB9FC, 	 0, 	 0, 0xF1D3, 0xF9A5, 0xF1D5			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_89[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xB9D3,      0,      0,      0,      0, 0xF8B4, /* 0x00 */
-         0,      0, 0xF1DB,      0,      0,      0,      0,      0, /* 0x00 */
-    0xBAD6,      0, 0xB0FD, 0xF1D9,      0,      0,      0,      0, /* 0x10 */
-         0, 0xF1D8, 0xF1D2,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xF1D7,      0,      0,      0, 0xC8EC,      0,      0, /* 0x20 */
-         0,      0, 0xCDCA, 0xF1DD,      0,      0,      0,      0, /* 0x20 */
-    0xE5BD,      0, 0xBFE3, 0xF1CD,      0,      0, 0xF1DE,      0, /* 0x30 */
-    0xF1DA,      0,      0, 0xD9F4,      0,      0,      0,      0, /* 0x30 */
-         0, 0xF1DF,      0,      0, 0xCFE5,      0,      0, 0xF1D0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xB0C0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xF1CF, 0xF4C5, 0xBDF3, /* 0x50 */
-    0xF1C9,      0,      0,      0, 0xF1DC,      0, 0xF1E0,      0, /* 0x60 */
-         0,      0, 0xCDE0,      0, 0xF8A1,      0,      0, 0xB3C4, /* 0x60 */
-         0,      0, 0xCFAE,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0, 0xF1E1,      0,      0,      0, 0xCEF7, /* 0x70 */
-         0, 0xD2AA,      0, 0xF1FB,      0,      0, 0xB8B2,      0, /* 0x80 */
-         0,      0,      0, 0xBCFB,      0,      0,      0, 0xB9E6, /* 0x80 */
-         0,      0,      0, 0xC3D9,      0,      0, 0xCAD3,      0, /* 0x90 */
-    0xEAE8,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xEAEA,      0,      0,      0,      0, 0xEAEC,      0, /* 0xA0 */
-         0,      0, 0xC7D7,      0, 0xEAE9,      0,      0, 0xEAED, /* 0xA0 */
-         0,      0, 0xEAEE,      0,      0,      0,      0, 0xEAEF, /* 0xB0 */
-         0,      0, 0xBEF5,      0,      0, 0xC0C0,      0, 0xEAEB, /* 0xB0 */
-    0xB9DB,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xBDC7,      0,      0,      0, 0xF5FB,      0, /* 0xD0 */
-         0,      0, 0xF5FD,      0, 0xF5FE,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xBDE2,      0, 0xF6A1,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xF6A2,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xECB2, 0xF5FC,      0, 0xF6A3,      0, /* 0xF0 */
-    0xB4A5                                                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xB9D3, 	 0, 	 0, 	 0, 	 0, 0xF8B4, /* 0x00 */
+         0, 	 0, 0xF1DB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xBAD6, 	 0, 0xB0FD, 0xF1D9, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xF1D8, 0xF1D2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xF1D7, 	 0, 	 0, 	 0, 0xC8EC, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xCDCA, 0xF1DD, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xE5BD, 	 0, 0xBFE3, 0xF1CD, 	 0, 	 0, 0xF1DE, 	 0, /* 0x30 */
+    0xF1DA, 	 0, 	 0, 0xD9F4, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xF1DF, 	 0, 	 0, 0xCFE5, 	 0, 	 0, 0xF1D0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB0C0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF1CF, 0xF4C5, 0xBDF3, /* 0x50 */
+    0xF1C9, 	 0, 	 0, 	 0, 0xF1DC, 	 0, 0xF1E0, 	 0, /* 0x60 */
+         0, 	 0, 0xCDE0, 	 0, 0xF8A1, 	 0, 	 0, 0xB3C4, /* 0x60 */
+         0, 	 0, 0xCFAE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 0xF1E1, 	 0, 	 0, 	 0, 0xCEF7, /* 0x70 */
+         0, 0xD2AA, 	 0, 0xF1FB, 	 0, 	 0, 0xB8B2, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xBCFB, 	 0, 	 0, 	 0, 0xB9E6, /* 0x80 */
+         0, 	 0, 	 0, 0xC3D9, 	 0, 	 0, 0xCAD3, 	 0, /* 0x90 */
+    0xEAE8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xEAEA, 	 0, 	 0, 	 0, 	 0, 0xEAEC, 	 0, /* 0xA0 */
+         0, 	 0, 0xC7D7, 	 0, 0xEAE9, 	 0, 	 0, 0xEAED, /* 0xA0 */
+         0, 	 0, 0xEAEE, 	 0, 	 0, 	 0, 	 0, 0xEAEF, /* 0xB0 */
+         0, 	 0, 0xBEF5, 	 0, 	 0, 0xC0C0, 	 0, 0xEAEB, /* 0xB0 */
+    0xB9DB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xBDC7, 	 0, 	 0, 	 0, 0xF5FB, 	 0, /* 0xD0 */
+         0, 	 0, 0xF5FD, 	 0, 0xF5FE, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xBDE2, 	 0, 0xF6A1, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xF6A2, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xECB2, 0xF5FC, 	 0, 0xF6A3, 	 0, /* 0xF0 */
+    0xB4A5															/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_8A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD1D4, 0xDAA5, 0xB6A9, 0xB8BC,      0,      0,      0, 0xD9EA, /* 0x00 */
-    0xBCC6,      0, 0xD1B6,      0, 0xDAA7,      0, 0xCCD6,      0, /* 0x00 */
-    0xDAA6,      0,      0, 0xD1B5,      0, 0xDAA8, 0xC6FD,      0, /* 0x10 */
-    0xBCC7,      0,      0, 0xB6EF,      0, 0xD1C8,      0, 0xCBCF, /* 0x10 */
-         0,      0,      0, 0xBEF7,      0, 0xDAAB,      0,      0, /* 0x20 */
-         0,      0, 0xB7C3,      0,      0, 0xC9E8,      0,      0, /* 0x20 */
-         0, 0xD0ED,      0,      0, 0xCBDF,      0, 0xDAAD,      0, /* 0x30 */
-         0,      0, 0xD5EF,      0,      0,      0, 0xF6A4,      0, /* 0x30 */
-         0, 0xDAAC,      0,      0,      0,      0, 0xDAAE,      0, /* 0x40 */
-    0xEEBA,      0,      0,      0,      0,      0, 0xDAAA,      0, /* 0x40 */
-    0xD5A9,      0, 0xDAB1,      0, 0xDAAF, 0xC6C0,      0,      0, /* 0x50 */
-    0xDAB0,      0,      0, 0xD7E7,      0,      0, 0xB4CA,      0, /* 0x50 */
-         0, 0xDABC, 0xD1AF, 0xD2E8,      0,      0, 0xCAD4,      0, /* 0x60 */
-         0, 0xCAAB,      0, 0xB2EF, 0xDAB8, 0xB9EE, 0xDAB9,      0, /* 0x60 */
-    0xDAB5, 0xBBB0, 0xB8C3, 0xCFEA,      0, 0xDAB7,      0,      0, /* 0x70 */
-         0, 0xD5B2,      0,      0, 0xDAB6,      0,      0, 0xDAB4, /* 0x70 */
-         0,      0,      0,      0, 0xDAB3, 0xD6EF, 0xDAB2, 0xBFE4, /* 0x80 */
-         0,      0,      0,      0,      0, 0xC8CF,      0,      0, /* 0x80 */
-         0, 0xDABF, 0xDAC0, 0xCAC4,      0, 0xB5AE,      0,      0, /* 0x90 */
-    0xD3D5,      0, 0xDABD,      0,      0,      0, 0xD3EF,      0, /* 0x90 */
-    0xB3CF, 0xBDEB,      0, 0xCEDC, 0xCEF3, 0xDABE, 0xCBD0,      0, /* 0xA0 */
-    0xBBE5,      0,      0,      0, 0xCBB5,      0,      0,      0, /* 0xA0 */
-    0xCBAD,      0, 0xBFCE,      0,      0,      0, 0xDAC7,      0, /* 0xB0 */
-         0, 0xB7CC,      0,      0, 0xD2EA,      0,      0, 0xB5F7, /* 0xB0 */
-         0,      0, 0xDAC6,      0, 0xD7BB,      0,      0, 0xCCB8, /* 0xC0 */
-         0, 0xDAC3,      0, 0xC7EB,      0, 0xDABA,      0, 0xDAC1, /* 0xC0 */
-         0, 0xDAC2, 0xC1C2,      0,      0,      0, 0xC2DB, 0xDAC5, /* 0xD0 */
-         0,      0,      0, 0xDAC4, 0xB5FD,      0, 0xDAD2,      0, /* 0xD0 */
-         0,      0, 0xDABB,      0, 0xDACC,      0, 0xDAD0, 0xD0B3, /* 0xE0 */
-         0,      0,      0, 0xDAC9,      0, 0xDACD, 0xDAD1,      0, /* 0xE0 */
-         0, 0xBBE4,      0, 0xDACF,      0,      0, 0xDAC8, 0xB7ED, /* 0xF0 */
-    0xD6EE,      0, 0xD1E8,      0, 0xDACE,      0, 0xC5B5          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD1D4, 0xDAA5, 0xB6A9, 0xB8BC, 	 0, 	 0, 	 0, 0xD9EA, /* 0x00 */
+    0xBCC6, 	 0, 0xD1B6, 	 0, 0xDAA7, 	 0, 0xCCD6, 	 0, /* 0x00 */
+    0xDAA6, 	 0, 	 0, 0xD1B5, 	 0, 0xDAA8, 0xC6FD, 	 0, /* 0x10 */
+    0xBCC7, 	 0, 	 0, 0xB6EF, 	 0, 0xD1C8, 	 0, 0xCBCF, /* 0x10 */
+         0, 	 0, 	 0, 0xBEF7, 	 0, 0xDAAB, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xB7C3, 	 0, 	 0, 0xC9E8, 	 0, 	 0, /* 0x20 */
+         0, 0xD0ED, 	 0, 	 0, 0xCBDF, 	 0, 0xDAAD, 	 0, /* 0x30 */
+         0, 	 0, 0xD5EF, 	 0, 	 0, 	 0, 0xF6A4, 	 0, /* 0x30 */
+         0, 0xDAAC, 	 0, 	 0, 	 0, 	 0, 0xDAAE, 	 0, /* 0x40 */
+    0xEEBA, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDAAA, 	 0, /* 0x40 */
+    0xD5A9, 	 0, 0xDAB1, 	 0, 0xDAAF, 0xC6C0, 	 0, 	 0, /* 0x50 */
+    0xDAB0, 	 0, 	 0, 0xD7E7, 	 0, 	 0, 0xB4CA, 	 0, /* 0x50 */
+         0, 0xDABC, 0xD1AF, 0xD2E8, 	 0, 	 0, 0xCAD4, 	 0, /* 0x60 */
+         0, 0xCAAB, 	 0, 0xB2EF, 0xDAB8, 0xB9EE, 0xDAB9, 	 0, /* 0x60 */
+    0xDAB5, 0xBBB0, 0xB8C3, 0xCFEA, 	 0, 0xDAB7, 	 0, 	 0, /* 0x70 */
+         0, 0xD5B2, 	 0, 	 0, 0xDAB6, 	 0, 	 0, 0xDAB4, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xDAB3, 0xD6EF, 0xDAB2, 0xBFE4, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC8CF, 	 0, 	 0, /* 0x80 */
+         0, 0xDABF, 0xDAC0, 0xCAC4, 	 0, 0xB5AE, 	 0, 	 0, /* 0x90 */
+    0xD3D5, 	 0, 0xDABD, 	 0, 	 0, 	 0, 0xD3EF, 	 0, /* 0x90 */
+    0xB3CF, 0xBDEB, 	 0, 0xCEDC, 0xCEF3, 0xDABE, 0xCBD0, 	 0, /* 0xA0 */
+    0xBBE5, 	 0, 	 0, 	 0, 0xCBB5, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xCBAD, 	 0, 0xBFCE, 	 0, 	 0, 	 0, 0xDAC7, 	 0, /* 0xB0 */
+         0, 0xB7CC, 	 0, 	 0, 0xD2EA, 	 0, 	 0, 0xB5F7, /* 0xB0 */
+         0, 	 0, 0xDAC6, 	 0, 0xD7BB, 	 0, 	 0, 0xCCB8, /* 0xC0 */
+         0, 0xDAC3, 	 0, 0xC7EB, 	 0, 0xDABA, 	 0, 0xDAC1, /* 0xC0 */
+         0, 0xDAC2, 0xC1C2, 	 0, 	 0, 	 0, 0xC2DB, 0xDAC5, /* 0xD0 */
+         0, 	 0, 	 0, 0xDAC4, 0xB5FD, 	 0, 0xDAD2, 	 0, /* 0xD0 */
+         0, 	 0, 0xDABB, 	 0, 0xDACC, 	 0, 0xDAD0, 0xD0B3, /* 0xE0 */
+         0, 	 0, 	 0, 0xDAC9, 	 0, 0xDACD, 0xDAD1, 	 0, /* 0xE0 */
+         0, 0xBBE4, 	 0, 0xDACF, 	 0, 	 0, 0xDAC8, 0xB7ED, /* 0xF0 */
+    0xD6EE, 	 0, 0xD1E8, 	 0, 0xDACE, 	 0, 0xC5B5			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_8B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xC4B1, 0xDACB, 0xCEBD,      0, 0xCCDC, 0xD6DF,      0, 0xE5C0, /* 0x00 */
-         0,      0, 0xBBD1,      0,      0,      0, 0xC3D5,      0, /* 0x00 */
-    0xDAD7,      0,      0,      0, 0xDACA,      0, 0xDAD5, 0xB0F9, /* 0x10 */
-         0, 0xC7AB, 0xDAD6, 0xBDB2,      0, 0xD0BB,      0,      0, /* 0x10 */
-         0, 0xD2A5,      0,      0,      0,      0, 0xF6A5,      0, /* 0x20 */
-    0xDAD3,      0,      0, 0xDAD8, 0xC3FD, 0xDAD9,      0,      0, /* 0x20 */
-         0,      0,      0, 0xDAA9,      0,      0,      0,      0, /* 0x30 */
-         0, 0xBDF7,      0,      0,      0,      0, 0xC3A1,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xD6A4,      0,      0,      0,      0, 0xDADC, 0xBCA5, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xDADA,      0, /* 0x50 */
-    0xCAB6, 0xDADB, 0xCCB7,      0, 0xC6D7,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0, 0xBEAF,      0, /* 0x60 */
-         0,      0,      0, 0xDADE, 0xC6A9,      0,      0, 0xD2EB, /* 0x60 */
-    0xD2E9,      0,      0,      0, 0xC7B4,      0,      0, 0xBBA4, /* 0x70 */
-         0,      0,      0,      0,      0, 0xD3FE,      0,      0, /* 0x70 */
-    0xB6C1,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xB1E4,      0,      0,      0, 0xF6C5,      0, /* 0x80 */
-         0,      0, 0xB2F7, 0xC8C3,      0, 0xC0BE, 0xDADF,      0, /* 0x90 */
-         0,      0,      0,      0, 0xDAD4,      0, 0xDADD          /* 0x90 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xC4B1, 0xDACB, 0xCEBD, 	 0, 0xCCDC, 0xD6DF, 	 0, 0xE5C0, /* 0x00 */
+         0, 	 0, 0xBBD1, 	 0, 	 0, 	 0, 0xC3D5, 	 0, /* 0x00 */
+    0xDAD7, 	 0, 	 0, 	 0, 0xDACA, 	 0, 0xDAD5, 0xB0F9, /* 0x10 */
+         0, 0xC7AB, 0xDAD6, 0xBDB2, 	 0, 0xD0BB, 	 0, 	 0, /* 0x10 */
+         0, 0xD2A5, 	 0, 	 0, 	 0, 	 0, 0xF6A5, 	 0, /* 0x20 */
+    0xDAD3, 	 0, 	 0, 0xDAD8, 0xC3FD, 0xDAD9, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xDAA9, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xBDF7, 	 0, 	 0, 	 0, 	 0, 0xC3A1, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xD6A4, 	 0, 	 0, 	 0, 	 0, 0xDADC, 0xBCA5, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDADA, 	 0, /* 0x50 */
+    0xCAB6, 0xDADB, 0xCCB7, 	 0, 0xC6D7, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBEAF, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xDADE, 0xC6A9, 	 0, 	 0, 0xD2EB, /* 0x60 */
+    0xD2E9, 	 0, 	 0, 	 0, 0xC7B4, 	 0, 	 0, 0xBBA4, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD3FE, 	 0, 	 0, /* 0x70 */
+    0xB6C1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xB1E4, 	 0, 	 0, 	 0, 0xF6C5, 	 0, /* 0x80 */
+         0, 	 0, 0xB2F7, 0xC8C3, 	 0, 0xC0BE, 0xDADF, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xDAD4, 	 0, 0xDADD			/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_8C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xB9C8, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xBBED,      0,      0,      0,      0, 0xB6B9, 0xF4F8, /* 0x40 */
-    0xC6F1, 0xF4F9,      0,      0, 0xCDE3,      0,      0,      0, /* 0x40 */
-    0xB7E1,      0,      0,      0,      0, 0xF5B9,      0,      0, /* 0x50 */
-         0,      0, 0xEBE0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xCFF3, 0xBBBF,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xBAC0, 0xD4A5,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xE1D9,      0,      0,      0,      0, /* 0x70 */
-    0xF5F4, 0xB1AA, 0xB2F2,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xF5F5,      0,      0, 0xF5F7,      0,      0, /* 0x80 */
-         0, 0xBAD1, 0xF5F6,      0, 0xC3B2,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0, 0xF5F9,      0,      0,      0, /* 0x90 */
-    0xF5F8,      0,      0,      0,      0, 0xB1B4, 0xD5EA,      0, /* 0x90 */
-    0xB8BA, 0xB2C6, 0xB9B1,      0,      0,      0,      0, 0xC6B6, /* 0xA0 */
-    0xBBF5, 0xB7B7, 0xCCB0, 0xB9E1, 0xD4F0,      0,      0, 0xD6FC, /* 0xA0 */
-    0xEADB,      0, 0xEADF, 0xB7A1, 0xB9F3,      0, 0xB1E1, 0xC2F2, /* 0xB0 */
-    0xB4FB,      0, 0xEADC, 0xB7D1, 0xCCF9, 0xEADD,      0, 0xC3B3, /* 0xB0 */
-    0xBAD8, 0xEADA, 0xC2B8, 0xC1DE, 0xBBDF, 0xEAE0,      0, 0xD7CA, /* 0xC0 */
-    0xBCD6,      0, 0xD4F4,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xEAE2, 0xC9DE, 0xB1F6,      0, 0xEAE4,      0,      0, /* 0xD0 */
-         0,      0, 0xEAE3,      0, 0xB4CD,      0, 0xC9CD,      0, /* 0xD0 */
-    0xC5E2, 0xE2D9, 0xCFCD, 0xC2F4, 0xBCFA,      0, 0xB8B3, 0xEAE6, /* 0xE0 */
-         0,      0, 0xD6CA, 0xEAE5, 0xD5CB, 0xB6C4,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xC0B5,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xD7AC, 0xEAE7, 0xB9BA, 0xC8FC, 0xD8D3          /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xBBED, 	 0, 	 0, 	 0, 	 0, 0xB6B9, 0xF4F8, /* 0x40 */
+    0xC6F1, 0xF4F9, 	 0, 	 0, 0xCDE3, 	 0, 	 0, 	 0, /* 0x40 */
+    0xB7E1, 	 0, 	 0, 	 0, 	 0, 0xF5B9, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xEBE0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xCFF3, 0xBBBF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xBAC0, 0xD4A5, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xE1D9, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xF5F4, 0xB1AA, 0xB2F2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xF5F5, 	 0, 	 0, 0xF5F7, 	 0, 	 0, /* 0x80 */
+         0, 0xBAD1, 0xF5F6, 	 0, 0xC3B2, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xF5F9, 	 0, 	 0, 	 0, /* 0x90 */
+    0xF5F8, 	 0, 	 0, 	 0, 	 0, 0xB1B4, 0xD5EA, 	 0, /* 0x90 */
+    0xB8BA, 0xB2C6, 0xB9B1, 	 0, 	 0, 	 0, 	 0, 0xC6B6, /* 0xA0 */
+    0xBBF5, 0xB7B7, 0xCCB0, 0xB9E1, 0xD4F0, 	 0, 	 0, 0xD6FC, /* 0xA0 */
+    0xEADB, 	 0, 0xEADF, 0xB7A1, 0xB9F3, 	 0, 0xB1E1, 0xC2F2, /* 0xB0 */
+    0xB4FB, 	 0, 0xEADC, 0xB7D1, 0xCCF9, 0xEADD, 	 0, 0xC3B3, /* 0xB0 */
+    0xBAD8, 0xEADA, 0xC2B8, 0xC1DE, 0xBBDF, 0xEAE0, 	 0, 0xD7CA, /* 0xC0 */
+    0xBCD6, 	 0, 0xD4F4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xEAE2, 0xC9DE, 0xB1F6, 	 0, 0xEAE4, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xEAE3, 	 0, 0xB4CD, 	 0, 0xC9CD, 	 0, /* 0xD0 */
+    0xC5E2, 0xE2D9, 0xCFCD, 0xC2F4, 0xBCFA, 	 0, 0xB8B3, 0xEAE6, /* 0xE0 */
+         0, 	 0, 0xD6CA, 0xEAE5, 0xD5CB, 0xB6C4, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xC0B5, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xD7AC, 0xEAE7, 0xB9BA, 0xC8FC, 0xD8D3			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_8D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                    0xEADE, 0xD7B8,      0,      0, /* 0x00 */
-    0xD4F9,      0, 0xD4DE, 0xD8CD,      0, 0xC9C4,      0, 0xD3AE, /* 0x00 */
-    0xEAE1,      0,      0,      0,      0,      0, 0xCAEA,      0, /* 0x10 */
-         0,      0,      0, 0xB8D3, 0xD4DF,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xB3E0,      0, 0xC9E2, 0xF4F6, /* 0x60 */
-         0,      0,      0, 0xBAD5,      0, 0xF4F7,      0,      0, /* 0x60 */
-    0xD7DF,      0,      0, 0xF4F1, 0xB8B0,      0,      0, 0xC6F0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xB3C3,      0,      0, 0xF4F2, 0xB3AC,      0,      0, /* 0x80 */
-         0,      0, 0xD4BD,      0,      0,      0,      0,      0, /* 0x80 */
-         0, 0xF4F4,      0,      0, 0xF4F3, 0xB8CF,      0,      0, /* 0x90 */
-         0, 0xD5D4,      0,      0,      0,      0,      0, 0xCCCB, /* 0x90 */
-         0,      0,      0, 0xC8A4,      0,      0,      0,      0, /* 0xA0 */
-    0xC7F7,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xF4F5, 0xD7E3, 0xC5BF, 0xF5C0,      0,      0, /* 0xB0 */
-         0,      0, 0xF5C3,      0, 0xF5C2,      0, 0xD6BA, 0xF5C1, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xF5CC,      0, /* 0xC0 */
-         0,      0,      0, 0xB0CF, 0xB5F8,      0, 0xF5C9, 0xF5CA, /* 0xC0 */
-         0, 0xC5DC,      0,      0,      0,      0, 0xF5C5, 0xF5C6, /* 0xD0 */
-         0,      0, 0xF5C7, 0xF5CB,      0, 0xBEE0,      0, 0xB8FA, /* 0xD0 */
-         0,      0,      0, 0xF5D0, 0xF5D3,      0,      0,      0, /* 0xE0 */
-    0xBFE7,      0, 0xB9F2, 0xF5BC, 0xF5CD,      0,      0, 0xC2B7, /* 0xE0 */
-         0,      0,      0, 0xCCF8,      0,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xB6E5,      0,      0, 0xF5D5                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                    0xEADE, 0xD7B8, 	 0, 	 0, /* 0x00 */
+    0xD4F9, 	 0, 0xD4DE, 0xD8CD, 	 0, 0xC9C4, 	 0, 0xD3AE, /* 0x00 */
+    0xEAE1, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCAEA, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xB8D3, 0xD4DF, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xB3E0, 	 0, 0xC9E2, 0xF4F6, /* 0x60 */
+         0, 	 0, 	 0, 0xBAD5, 	 0, 0xF4F7, 	 0, 	 0, /* 0x60 */
+    0xD7DF, 	 0, 	 0, 0xF4F1, 0xB8B0, 	 0, 	 0, 0xC6F0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xB3C3, 	 0, 	 0, 0xF4F2, 0xB3AC, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xD4BD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xF4F4, 	 0, 	 0, 0xF4F3, 0xB8CF, 	 0, 	 0, /* 0x90 */
+         0, 0xD5D4, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCCCB, /* 0x90 */
+         0, 	 0, 	 0, 0xC8A4, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xC7F7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xF4F5, 0xD7E3, 0xC5BF, 0xF5C0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xF5C3, 	 0, 0xF5C2, 	 0, 0xD6BA, 0xF5C1, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF5CC, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xB0CF, 0xB5F8, 	 0, 0xF5C9, 0xF5CA, /* 0xC0 */
+         0, 0xC5DC, 	 0, 	 0, 	 0, 	 0, 0xF5C5, 0xF5C6, /* 0xD0 */
+         0, 	 0, 0xF5C7, 0xF5CB, 	 0, 0xBEE0, 	 0, 0xB8FA, /* 0xD0 */
+         0, 	 0, 	 0, 0xF5D0, 0xF5D3, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xBFE7, 	 0, 0xB9F2, 0xF5BC, 0xF5CD, 	 0, 	 0, 0xC2B7, /* 0xE0 */
+         0, 	 0, 	 0, 0xCCF8, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xB6E5, 	 0, 	 0, 0xF5D5					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_8E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xF5BD,      0,      0, /* 0x00 */
-         0, 0xF5D4,      0,      0,      0,      0,      0, 0xCCA4, /* 0x00 */
-    0xBCF9,      0,      0,      0, 0xF5D6,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xF5D7, 0xBEE1, 0xF5D8, /* 0x10 */
-         0,      0, 0xCCDF, 0xF5DB,      0,      0,      0,      0, /* 0x20 */
-         0, 0xB2C8, 0xD7D9,      0,      0,      0, 0xF5DA,      0, /* 0x20 */
-         0, 0xF5E2,      0,      0, 0xD3BB, 0xF5E0,      0,      0, /* 0x30 */
-         0, 0xF5DF, 0xF5DD,      0,      0, 0xF5E1,      0,      0, /* 0x30 */
-    0xF5DE, 0xF5E4, 0xF5E5,      0, 0xCCE3,      0,      0, 0xE5BF, /* 0x40 */
-    0xB5B8, 0xF5E3, 0xF5E8, 0xCCA3, 0xF5C4,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0, 0xF5CF,      0,      0, /* 0x50 */
-         0, 0xF5BE,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0, 0xF5E7,      0,      0, 0xB1C4,      0, /* 0x60 */
-         0, 0xF5BF,      0,      0, 0xB5C5, 0xB2E4,      0, 0xF5EC, /* 0x60 */
-    0xF5E9,      0, 0xB6D7,      0, 0xF5ED,      0, 0xF5EA,      0, /* 0x70 */
-         0,      0, 0xF5CE,      0, 0xF5EB,      0,      0,      0, /* 0x70 */
-         0, 0xD4EA,      0,      0,      0, 0xF5EE,      0, 0xB3F9, /* 0x80 */
-         0, 0xF5BB, 0xB3EC, 0xF5D2,      0, 0xD4BE,      0,      0, /* 0x80 */
-    0xF5F1, 0xF5DC, 0xF5C8, 0xF5D9, 0xF5F0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xF5D1,      0,      0,      0, 0xF5F3,      0, /* 0x90 */
-         0, 0xF5E6,      0,      0,      0, 0xB4DA, 0xF5F2,      0, /* 0xA0 */
-         0,      0, 0xF5EF, 0xC9ED, 0xB9AA,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xB6E3,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xCCC9,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xC7FB,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xB3B5, 0xD4FE, 0xB9EC, 0xBEFC, 0xEAA6,      0, /* 0xC0 */
-         0,      0, 0xD0F9,      0, 0xE9ED,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xE9EE,      0,      0,      0, 0xC8ED, /* 0xD0 */
-         0,      0,      0,      0, 0xE9F5,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xE9F4,      0,      0,      0,      0, /* 0xE0 */
-         0,      0, 0xE9EF,      0,      0,      0,      0,      0, /* 0xF0 */
-    0xD6E1, 0xE9F2, 0xE9F7, 0xE9F0, 0xE9F3,      0, 0xE9F8          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xF5BD, 	 0, 	 0, /* 0x00 */
+         0, 0xF5D4, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCCA4, /* 0x00 */
+    0xBCF9, 	 0, 	 0, 	 0, 0xF5D6, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF5D7, 0xBEE1, 0xF5D8, /* 0x10 */
+         0, 	 0, 0xCCDF, 0xF5DB, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xB2C8, 0xD7D9, 	 0, 	 0, 	 0, 0xF5DA, 	 0, /* 0x20 */
+         0, 0xF5E2, 	 0, 	 0, 0xD3BB, 0xF5E0, 	 0, 	 0, /* 0x30 */
+         0, 0xF5DF, 0xF5DD, 	 0, 	 0, 0xF5E1, 	 0, 	 0, /* 0x30 */
+    0xF5DE, 0xF5E4, 0xF5E5, 	 0, 0xCCE3, 	 0, 	 0, 0xE5BF, /* 0x40 */
+    0xB5B8, 0xF5E3, 0xF5E8, 0xCCA3, 0xF5C4, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF5CF, 	 0, 	 0, /* 0x50 */
+         0, 0xF5BE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xF5E7, 	 0, 	 0, 0xB1C4, 	 0, /* 0x60 */
+         0, 0xF5BF, 	 0, 	 0, 0xB5C5, 0xB2E4, 	 0, 0xF5EC, /* 0x60 */
+    0xF5E9, 	 0, 0xB6D7, 	 0, 0xF5ED, 	 0, 0xF5EA, 	 0, /* 0x70 */
+         0, 	 0, 0xF5CE, 	 0, 0xF5EB, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xD4EA, 	 0, 	 0, 	 0, 0xF5EE, 	 0, 0xB3F9, /* 0x80 */
+         0, 0xF5BB, 0xB3EC, 0xF5D2, 	 0, 0xD4BE, 	 0, 	 0, /* 0x80 */
+    0xF5F1, 0xF5DC, 0xF5C8, 0xF5D9, 0xF5F0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xF5D1, 	 0, 	 0, 	 0, 0xF5F3, 	 0, /* 0x90 */
+         0, 0xF5E6, 	 0, 	 0, 	 0, 0xB4DA, 0xF5F2, 	 0, /* 0xA0 */
+         0, 	 0, 0xF5EF, 0xC9ED, 0xB9AA, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xB6E3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xCCC9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xC7FB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xB3B5, 0xD4FE, 0xB9EC, 0xBEFC, 0xEAA6, 	 0, /* 0xC0 */
+         0, 	 0, 0xD0F9, 	 0, 0xE9ED, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xE9EE, 	 0, 	 0, 	 0, 0xC8ED, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xE9F5, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xE9F4, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 0xE9EF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xD6E1, 0xE9F2, 0xE9F7, 0xE9F0, 0xE9F3, 	 0, 0xE9F8			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_8F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xBDCF,      0, 0xE9FB,      0, 0xE9FA, /* 0x00 */
-         0, 0xD4D8, 0xE9F9,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xE9FC,      0, 0xB8A8, 0xC7E1,      0,      0, /* 0x10 */
-         0,      0,      0, 0xC1BE, 0xEAA2, 0xBBD4, 0xE9FE, 0xEAA1, /* 0x10 */
-         0,      0,      0,      0,      0, 0xB9F5, 0xE9FD,      0, /* 0x20 */
-         0, 0xB1B2, 0xC2D6,      0,      0,      0,      0, 0xBCAD, /* 0x20 */
-         0,      0,      0, 0xEAA3,      0,      0,      0,      0, /* 0x30 */
-    0xCAE4,      0,      0, 0xB7F8,      0,      0, 0xD5B7, 0xD3DF, /* 0x30 */
-         0,      0, 0xECB1,      0, 0xCFBD, 0xD4AF, 0xEAA4,      0, /* 0x40 */
-         0, 0xD7AA,      0,      0,      0, 0xD5DE, 0xBDCE,      0, /* 0x40 */
-         0,      0,      0,      0, 0xEAA5,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xBAE4, /* 0x50 */
-         0, 0xE0CE, 0xE9F6,      0, 0xE9F1,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xD0C1, 0xB9BC,      0,      0, 0xB1D9, /* 0x90 */
-         0,      0,      0, 0xC0B1,      0,      0, 0xB0EC,      0, /* 0xA0 */
-    0xB1E6,      0,      0,      0,      0, 0xB4C7, 0xB1E8, 0xB1E7, /* 0xA0 */
-    0xB3BD, 0xC8E8, 0xC5A9,      0,      0,      0, 0xE5C1,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xD3D8,      0, 0xC6F9, 0xD1B8,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xD3AD,      0, /* 0xC0 */
-         0, 0xBDFC,      0, 0xE5C2, 0xB7B5, 0xE5C3,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xCCF6,      0, 0xE5C6, 0xE5C4, 0xE5C8,      0, /* 0xE0 */
-    0xE5CA,      0, 0xB5CF, 0xC6C8,      0, 0xB5FC, 0xE5C5,      0, /* 0xE0 */
-    0xCAF6,      0,      0,      0, 0xF8BC,      0,      0, 0xC3D4, /* 0xF0 */
-    0xB1C5, 0xBCA3,      0,      0,      0, 0xD7B7                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xBDCF, 	 0, 0xE9FB, 	 0, 0xE9FA, /* 0x00 */
+         0, 0xD4D8, 0xE9F9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xE9FC, 	 0, 0xB8A8, 0xC7E1, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xC1BE, 0xEAA2, 0xBBD4, 0xE9FE, 0xEAA1, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB9F5, 0xE9FD, 	 0, /* 0x20 */
+         0, 0xB1B2, 0xC2D6, 	 0, 	 0, 	 0, 	 0, 0xBCAD, /* 0x20 */
+         0, 	 0, 	 0, 0xEAA3, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xCAE4, 	 0, 	 0, 0xB7F8, 	 0, 	 0, 0xD5B7, 0xD3DF, /* 0x30 */
+         0, 	 0, 0xECB1, 	 0, 0xCFBD, 0xD4AF, 0xEAA4, 	 0, /* 0x40 */
+         0, 0xD7AA, 	 0, 	 0, 	 0, 0xD5DE, 0xBDCE, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xEAA5, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBAE4, /* 0x50 */
+         0, 0xE0CE, 0xE9F6, 	 0, 0xE9F1, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xD0C1, 0xB9BC, 	 0, 	 0, 0xB1D9, /* 0x90 */
+         0, 	 0, 	 0, 0xC0B1, 	 0, 	 0, 0xB0EC, 	 0, /* 0xA0 */
+    0xB1E6, 	 0, 	 0, 	 0, 	 0, 0xB4C7, 0xB1E8, 0xB1E7, /* 0xA0 */
+    0xB3BD, 0xC8E8, 0xC5A9, 	 0, 	 0, 	 0, 0xE5C1, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xD3D8, 	 0, 0xC6F9, 0xD1B8, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD3AD, 	 0, /* 0xC0 */
+         0, 0xBDFC, 	 0, 0xE5C2, 0xB7B5, 0xE5C3, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xCCF6, 	 0, 0xE5C6, 0xE5C4, 0xE5C8, 	 0, /* 0xE0 */
+    0xE5CA, 	 0, 0xB5CF, 0xC6C8, 	 0, 0xB5FC, 0xE5C5, 	 0, /* 0xE0 */
+    0xCAF6, 	 0, 	 0, 	 0, 0xF8BC, 	 0, 	 0, 0xC3D4, /* 0xF0 */
+    0xB1C5, 0xBCA3, 	 0, 	 0, 	 0, 0xD7B7					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_90[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xCDCB, 0xCBCD,      0, 0xCCD3, 0xE5CC, 0xE5CB, 0xC4E6,      0, /* 0x00 */
-         0,      0,      0, 0xE5CD,      0, 0xE5D0,      0, 0xCDB8, /* 0x00 */
-    0xD6F0, 0xE5CF,      0,      0, 0xCDBE, 0xE5C9, 0xE5D1, 0xB6BA, /* 0x10 */
-         0, 0xD5E2, 0xCDA8, 0xB9E4,      0, 0xCAC5, 0xB3D1, 0xCBD9, /* 0x10 */
-    0xD4EC, 0xE5D2, 0xB7EA, 0xC1AC,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xE5D5, 0xB4FE, 0xE5D6, /* 0x20 */
-         0,      0, 0xBDF8,      0,      0, 0xE5D3, 0xE5D4,      0, /* 0x30 */
-    0xD2DD,      0,      0,      0, 0xB1C6,      0, 0xD3E2,      0, /* 0x30 */
-         0, 0xB6DD, 0xCBEC,      0, 0xE5D7,      0,      0, 0xD3F6, /* 0x40 */
-         0,      0,      0, 0xD4CB,      0, 0xB1E9, 0xB9FD, 0xB6F4, /* 0x40 */
-    0xE5DA, 0xE5D8, 0xE5D9, 0xB5C0, 0xB4EF, 0xCEA5,      0,      0, /* 0x50 */
-    0xE5DC,      0,      0, 0xE5DE, 0xD1B7,      0, 0xB5DD,      0, /* 0x50 */
-    0xD4B6,      0, 0xE5DD, 0xC7B2,      0, 0xD2A3,      0,      0, /* 0x60 */
-    0xE5DB, 0xCACA,      0,      0,      0, 0xD4E2, 0xD5DA,      0, /* 0x60 */
-         0,      0, 0xB3D9,      0, 0xE5E0, 0xD7F1,      0, 0xC7A8, /* 0x70 */
-    0xD1A1,      0, 0xD2C5,      0, 0xC1C9, 0xE5E1,      0, 0xB1DC, /* 0x70 */
-    0xD1FB, 0xC2F5, 0xE5E2, 0xE5E4, 0xBBB9,      0,      0, 0xE5C7, /* 0x80 */
-    0xE5E3,      0, 0xB1DF, 0xE5E5,      0,      0,      0, 0xC2DF, /* 0x80 */
-    0xE5CE, 0xD2D8,      0,      0,      0, 0xE7DF,      0, 0xDAF5, /* 0x90 */
-         0, 0xDAF8,      0, 0xDAF6,      0,      0,      0,      0, /* 0x90 */
-         0, 0xDAFA, 0xD0CF, 0xC4C7,      0,      0, 0xB0EE,      0, /* 0xA0 */
-         0,      0, 0xD0B0,      0,      0,      0,      0, 0xBAAA, /* 0xA0 */
-    0xDBA2, 0xC7F1,      0, 0xDAFC, 0xDAFB, 0xC9DB, 0xDAFD,      0, /* 0xB0 */
-    0xDBA1,      0,      0,      0,      0,      0, 0xDBA5,      0, /* 0xB0 */
-         0, 0xF8F9,      0,      0, 0xDBA7, 0xDBA4,      0, 0xDBA8, /* 0xC0 */
-         0,      0, 0xBDBC,      0,      0,      0, 0xC0C9,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xDBAD, /* 0xD0 */
-         0,      0,      0, 0xDBAE, 0xDBAC, 0xBAC2,      0, 0xDBA3, /* 0xD0 */
-         0, 0xBFA4, 0xDBAB,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xB2BF,      0,      0, 0xDBAF,      0, 0xB9F9,      0, 0xDBB0, /* 0xE0 */
-         0,      0,      0,      0, 0xB3BB, 0xD3CA,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xB6BC, 0xDBB1          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xCDCB, 0xCBCD, 	 0, 0xCCD3, 0xE5CC, 0xE5CB, 0xC4E6, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xE5CD, 	 0, 0xE5D0, 	 0, 0xCDB8, /* 0x00 */
+    0xD6F0, 0xE5CF, 	 0, 	 0, 0xCDBE, 0xE5C9, 0xE5D1, 0xB6BA, /* 0x10 */
+         0, 0xD5E2, 0xCDA8, 0xB9E4, 	 0, 0xCAC5, 0xB3D1, 0xCBD9, /* 0x10 */
+    0xD4EC, 0xE5D2, 0xB7EA, 0xC1AC, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE5D5, 0xB4FE, 0xE5D6, /* 0x20 */
+         0, 	 0, 0xBDF8, 	 0, 	 0, 0xE5D3, 0xE5D4, 	 0, /* 0x30 */
+    0xD2DD, 	 0, 	 0, 	 0, 0xB1C6, 	 0, 0xD3E2, 	 0, /* 0x30 */
+         0, 0xB6DD, 0xCBEC, 	 0, 0xE5D7, 	 0, 	 0, 0xD3F6, /* 0x40 */
+         0, 	 0, 	 0, 0xD4CB, 	 0, 0xB1E9, 0xB9FD, 0xB6F4, /* 0x40 */
+    0xE5DA, 0xE5D8, 0xE5D9, 0xB5C0, 0xB4EF, 0xCEA5, 	 0, 	 0, /* 0x50 */
+    0xE5DC, 	 0, 	 0, 0xE5DE, 0xD1B7, 	 0, 0xB5DD, 	 0, /* 0x50 */
+    0xD4B6, 	 0, 0xE5DD, 0xC7B2, 	 0, 0xD2A3, 	 0, 	 0, /* 0x60 */
+    0xE5DB, 0xCACA, 	 0, 	 0, 	 0, 0xD4E2, 0xD5DA, 	 0, /* 0x60 */
+         0, 	 0, 0xB3D9, 	 0, 0xE5E0, 0xD7F1, 	 0, 0xC7A8, /* 0x70 */
+    0xD1A1, 	 0, 0xD2C5, 	 0, 0xC1C9, 0xE5E1, 	 0, 0xB1DC, /* 0x70 */
+    0xD1FB, 0xC2F5, 0xE5E2, 0xE5E4, 0xBBB9, 	 0, 	 0, 0xE5C7, /* 0x80 */
+    0xE5E3, 	 0, 0xB1DF, 0xE5E5, 	 0, 	 0, 	 0, 0xC2DF, /* 0x80 */
+    0xE5CE, 0xD2D8, 	 0, 	 0, 	 0, 0xE7DF, 	 0, 0xDAF5, /* 0x90 */
+         0, 0xDAF8, 	 0, 0xDAF6, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xDAFA, 0xD0CF, 0xC4C7, 	 0, 	 0, 0xB0EE, 	 0, /* 0xA0 */
+         0, 	 0, 0xD0B0, 	 0, 	 0, 	 0, 	 0, 0xBAAA, /* 0xA0 */
+    0xDBA2, 0xC7F1, 	 0, 0xDAFC, 0xDAFB, 0xC9DB, 0xDAFD, 	 0, /* 0xB0 */
+    0xDBA1, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDBA5, 	 0, /* 0xB0 */
+         0, 0xF8F9, 	 0, 	 0, 0xDBA7, 0xDBA4, 	 0, 0xDBA8, /* 0xC0 */
+         0, 	 0, 0xBDBC, 	 0, 	 0, 	 0, 0xC0C9, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDBAD, /* 0xD0 */
+         0, 	 0, 	 0, 0xDBAE, 0xDBAC, 0xBAC2, 	 0, 0xDBA3, /* 0xD0 */
+         0, 0xBFA4, 0xDBAB, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xB2BF, 	 0, 	 0, 0xDBAF, 	 0, 0xB9F9, 	 0, 0xDBB0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xB3BB, 0xD3CA, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB6BC, 0xDBB1			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_91[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xB6F5,      0, 0xDBB2,      0, 0xDBA9,      0, /* 0x00 */
-         0, 0xCFE7,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0xD7DE,      0, 0xDAF9,      0, 0xD4C7,      0, /* 0x10 */
-         0, 0xB1C9,      0,      0,      0,      0, 0xDBB4,      0, /* 0x10 */
-         0,      0, 0xDBB3, 0xDBB5,      0,      0,      0, 0xB5CB, /* 0x20 */
-         0,      0,      0,      0,      0, 0xD6A3,      0, 0xDBB7, /* 0x20 */
-    0xC1DA, 0xDBB6, 0xB5A6,      0, 0xDAFE,      0, 0xDBA6,      0, /* 0x30 */
-         0, 0xDBB8, 0xDAF7,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xDBB9,      0,      0, 0xDBBA,      0, /* 0x40 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xB6F5, 	 0, 0xDBB2, 	 0, 0xDBA9, 	 0, /* 0x00 */
+         0, 0xCFE7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xD7DE, 	 0, 0xDAF9, 	 0, 0xD4C7, 	 0, /* 0x10 */
+         0, 0xB1C9, 	 0, 	 0, 	 0, 	 0, 0xDBB4, 	 0, /* 0x10 */
+         0, 	 0, 0xDBB3, 0xDBB5, 	 0, 	 0, 	 0, 0xB5CB, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD6A3, 	 0, 0xDBB7, /* 0x20 */
+    0xC1DA, 0xDBB6, 0xB5A6, 	 0, 0xDAFE, 	 0, 0xDBA6, 	 0, /* 0x30 */
+         0, 0xDBB8, 0xDAF7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xDBB9, 	 0, 	 0, 0xDBBA, 	 0, /* 0x40 */
     0xDBAA, 0xD3CF, 0xF4FA, 0xC7F5, 0xD7C3, 0xC5E4, 0xF4FC, 0xF4FD, /* 0x40 */
-    0xF4FB,      0, 0xBEC6,      0,      0,      0,      0, 0xD0EF, /* 0x50 */
-         0,      0, 0xB7D3,      0,      0,      0, 0xCCAA,      0, /* 0x50 */
-         0, 0xF5A2, 0xF5A1, 0xBAA8, 0xF4FE, 0xCBD6,      0,      0, /* 0x60 */
-         0, 0xF5A4, 0xC0D2,      0, 0xB3EA,      0, 0xCDAA, 0xF5A5, /* 0x60 */
-    0xF5A3,      0, 0xF5A8,      0, 0xF5A9, 0xBDCD, 0xC3B8, 0xBFE1, /* 0x70 */
-    0xCBE1, 0xF5AA,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF5AC,      0, 0xB4BC, /* 0x80 */
-         0, 0xD7ED,      0, 0xB4D7, 0xF5AB, 0xF5AE,      0,      0, /* 0x80 */
-    0xF5AD, 0xF5AF, 0xD0D1,      0,      0,      0, 0xD4CD,      0, /* 0x90 */
-         0,      0, 0xC3D1, 0xC8A9, 0xB3F3,      0,      0,      0, /* 0x90 */
-         0,      0, 0xF5B0, 0xF5B1,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xF5B2, 0xD2BD, 0xBDB4, 0xF5B3, 0xF5B4, 0xF5B5, /* 0xA0 */
-         0,      0,      0,      0, 0xF5B7, 0xF5B6,      0,      0, /* 0xB0 */
-         0,      0, 0xF5B8,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xC4F0, 0xD0C6,      0, 0xF5A7,      0, 0xF5A6,      0, 0xB2C9, /* 0xC0 */
-         0, 0xD3D4,      0, 0xCACD, 0xF8CE, 0xD6D8, 0xD2B0, 0xC1BF, /* 0xC0 */
-         0, 0xBDF0, 0xEEC4, 0xEEC5, 0xEEC6, 0xEEC9,      0, 0xEEC8, /* 0xD0 */
-    0xB6A4, 0xEEC7,      0,      0, 0xB8AA, 0xD5EB,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xB5F6, 0xEECC,      0,      0, 0xEECB, /* 0xE0 */
-         0, 0xB7B0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xEECE,      0, 0xEECA, /* 0xF0 */
-         0, 0xEECF, 0xC7A5                                          /* 0xF0 */
+    0xF4FB, 	 0, 0xBEC6, 	 0, 	 0, 	 0, 	 0, 0xD0EF, /* 0x50 */
+         0, 	 0, 0xB7D3, 	 0, 	 0, 	 0, 0xCCAA, 	 0, /* 0x50 */
+         0, 0xF5A2, 0xF5A1, 0xBAA8, 0xF4FE, 0xCBD6, 	 0, 	 0, /* 0x60 */
+         0, 0xF5A4, 0xC0D2, 	 0, 0xB3EA, 	 0, 0xCDAA, 0xF5A5, /* 0x60 */
+    0xF5A3, 	 0, 0xF5A8, 	 0, 0xF5A9, 0xBDCD, 0xC3B8, 0xBFE1, /* 0x70 */
+    0xCBE1, 0xF5AA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF5AC, 	 0, 0xB4BC, /* 0x80 */
+         0, 0xD7ED, 	 0, 0xB4D7, 0xF5AB, 0xF5AE, 	 0, 	 0, /* 0x80 */
+    0xF5AD, 0xF5AF, 0xD0D1, 	 0, 	 0, 	 0, 0xD4CD, 	 0, /* 0x90 */
+         0, 	 0, 0xC3D1, 0xC8A9, 0xB3F3, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xF5B0, 0xF5B1, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xF5B2, 0xD2BD, 0xBDB4, 0xF5B3, 0xF5B4, 0xF5B5, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xF5B7, 0xF5B6, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xF5B8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xC4F0, 0xD0C6, 	 0, 0xF5A7, 	 0, 0xF5A6, 	 0, 0xB2C9, /* 0xC0 */
+         0, 0xD3D4, 	 0, 0xCACD, 0xF8CE, 0xD6D8, 0xD2B0, 0xC1BF, /* 0xC0 */
+         0, 0xBDF0, 0xEEC4, 0xEEC5, 0xEEC6, 0xEEC9, 	 0, 0xEEC8, /* 0xD0 */
+    0xB6A4, 0xEEC7, 	 0, 	 0, 0xB8AA, 0xD5EB, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xB5F6, 0xEECC, 	 0, 	 0, 0xEECB, /* 0xE0 */
+         0, 0xB7B0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEECE, 	 0, 0xEECA, /* 0xF0 */
+         0, 0xEECF, 0xC7A5											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_92[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xEED9, 0xEED5,      0,      0, 0xEED7,      0,      0,      0, /* 0x00 */
-    0xEED0, 0xC4C6,      0,      0,      0, 0xB6DB, 0xB9B3,      0, /* 0x00 */
-    0xEED4, 0xEED3,      0,      0, 0xB3AE, 0xC5A5,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xBEFB,      0, /* 0x10 */
-         0,      0,      0, 0xB8C6,      0, 0xEED8, 0xEED1, 0xEED6, /* 0x20 */
-         0,      0,      0,      0,      0,      0, 0xEEEA,      0, /* 0x20 */
-    0xEEE6,      0,      0, 0xEEDD, 0xC1E5,      0,      0, 0xEEDC, /* 0x30 */
-    0xEEE0, 0xEEEB, 0xEEDA,      0,      0, 0xEEDF, 0xD3CB, 0xEEE4, /* 0x30 */
-    0xBCD8,      0,      0,      0,      0, 0xEED2,      0,      0, /* 0x40 */
-    0xEEE8, 0xEEE7,      0,      0,      0, 0xEEE9,      0,      0, /* 0x40 */
-         0, 0xB2AC,      0,      0,      0, 0xEEDE,      0, 0xC7AF, /* 0x50 */
-         0,      0, 0xC3AD, 0xC7A6,      0,      0, 0xEEE1,      0, /* 0x50 */
-         0,      0, 0xB2A7,      0,      0,      0, 0xEEDB,      0, /* 0x60 */
-         0,      0,      0,      0, 0xEEE2, 0xEEE3,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xBDC2,      0, 0xEEEF, 0xB8F5,      0,      0,      0, 0xEEFE, /* 0x70 */
-    0xD2F8,      0,      0, 0xEFA5,      0, 0xCDAD,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xF6C6,      0, /* 0x80 */
-         0, 0xCFB3,      0, 0xEEFD,      0,      0, 0xEEF9,      0, /* 0x90 */
-    0xC3FA,      0, 0xEFA2,      0, 0xCFCE,      0,      0,      0, /* 0x90 */
-    0xEEEE,      0,      0, 0xEFA8,      0, 0xD2BF, 0xEEF7,      0, /* 0xA0 */
-    0xEFA7, 0xEEFB, 0xEEF0, 0xEFA4, 0xEEED,      0,      0,      0, /* 0xA0 */
-         0, 0xEEF6,      0,      0,      0,      0,      0, 0xCFFA, /* 0xB0 */
-         0, 0xD0E2,      0, 0xCCE0, 0xEFB1,      0,      0,      0, /* 0xB0 */
-         0, 0xC2C1,      0, 0xEFB6,      0, 0xD0BF,      0, 0xB1B5, /* 0xC0 */
-    0xF6C8,      0,      0,      0, 0xEEFA,      0,      0, 0xEEF2, /* 0xC0 */
-         0,      0, 0xB7E6,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xEFB2,      0, 0xEFB7, /* 0xD0 */
-         0,      0,      0, 0xEEF4, 0xB3FA, 0xEFAD, 0xEFB8,      0, /* 0xE0 */
-    0xEFB0,      0, 0xC6CC,      0,      0, 0xC8F1, 0xEEF1, 0xEFAF, /* 0xE0 */
-    0xEFAE, 0xEFAB,      0,      0,      0,      0, 0xEFB3,      0, /* 0xF0 */
-    0xBEE2,      0,      0,      0, 0xB8D6                          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xEED9, 0xEED5, 	 0, 	 0, 0xEED7, 	 0, 	 0, 	 0, /* 0x00 */
+    0xEED0, 0xC4C6, 	 0, 	 0, 	 0, 0xB6DB, 0xB9B3, 	 0, /* 0x00 */
+    0xEED4, 0xEED3, 	 0, 	 0, 0xB3AE, 0xC5A5, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBEFB, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xB8C6, 	 0, 0xEED8, 0xEED1, 0xEED6, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEEEA, 	 0, /* 0x20 */
+    0xEEE6, 	 0, 	 0, 0xEEDD, 0xC1E5, 	 0, 	 0, 0xEEDC, /* 0x30 */
+    0xEEE0, 0xEEEB, 0xEEDA, 	 0, 	 0, 0xEEDF, 0xD3CB, 0xEEE4, /* 0x30 */
+    0xBCD8, 	 0, 	 0, 	 0, 	 0, 0xEED2, 	 0, 	 0, /* 0x40 */
+    0xEEE8, 0xEEE7, 	 0, 	 0, 	 0, 0xEEE9, 	 0, 	 0, /* 0x40 */
+         0, 0xB2AC, 	 0, 	 0, 	 0, 0xEEDE, 	 0, 0xC7AF, /* 0x50 */
+         0, 	 0, 0xC3AD, 0xC7A6, 	 0, 	 0, 0xEEE1, 	 0, /* 0x50 */
+         0, 	 0, 0xB2A7, 	 0, 	 0, 	 0, 0xEEDB, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xEEE2, 0xEEE3, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xBDC2, 	 0, 0xEEEF, 0xB8F5, 	 0, 	 0, 	 0, 0xEEFE, /* 0x70 */
+    0xD2F8, 	 0, 	 0, 0xEFA5, 	 0, 0xCDAD, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF6C6, 	 0, /* 0x80 */
+         0, 0xCFB3, 	 0, 0xEEFD, 	 0, 	 0, 0xEEF9, 	 0, /* 0x90 */
+    0xC3FA, 	 0, 0xEFA2, 	 0, 0xCFCE, 	 0, 	 0, 	 0, /* 0x90 */
+    0xEEEE, 	 0, 	 0, 0xEFA8, 	 0, 0xD2BF, 0xEEF7, 	 0, /* 0xA0 */
+    0xEFA7, 0xEEFB, 0xEEF0, 0xEFA4, 0xEEED, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xEEF6, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCFFA, /* 0xB0 */
+         0, 0xD0E2, 	 0, 0xCCE0, 0xEFB1, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xC2C1, 	 0, 0xEFB6, 	 0, 0xD0BF, 	 0, 0xB1B5, /* 0xC0 */
+    0xF6C8, 	 0, 	 0, 	 0, 0xEEFA, 	 0, 	 0, 0xEEF2, /* 0xC0 */
+         0, 	 0, 0xB7E6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEFB2, 	 0, 0xEFB7, /* 0xD0 */
+         0, 	 0, 	 0, 0xEEF4, 0xB3FA, 0xEFAD, 0xEFB8, 	 0, /* 0xE0 */
+    0xEFB0, 	 0, 0xC6CC, 	 0, 	 0, 0xC8F1, 0xEEF1, 0xEFAF, /* 0xE0 */
+    0xEFAE, 0xEFAB, 	 0, 	 0, 	 0, 	 0, 0xEFB3, 	 0, /* 0xF0 */
+    0xBEE2, 	 0, 	 0, 	 0, 0xB8D6							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_93[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xEFBE,      0,      0,      0,      0, 0xEFBA, 0xEFC2, /* 0x00 */
-    0xEFC3,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0xD7B6,      0, 0xEFB9,      0,      0, 0xEFBF,      0,      0, /* 0x10 */
-    0xB4B8, 0xEFC5, 0xEFA3, 0xEFBC,      0,      0,      0, 0xEFC4, /* 0x10 */
-    0xB6A7,      0, 0xC7AE,      0,      0,      0, 0xBDF5,      0, /* 0x20 */
-    0xC3AA,      0,      0, 0xCEFD,      0,      0, 0xEFC0, 0xB4ED, /* 0x20 */
-         0,      0, 0xC2BC, 0xC3CC,      0,      0, 0xF8A3,      0, /* 0x30 */
-    0xEFAA,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xEFBD, 0xCFC7,      0, 0xEFC1,      0,      0, 0xEECD, 0xEFC7, /* 0x40 */
-         0,      0,      0, 0xB9F8,      0, 0xB6C6,      0,      0, /* 0x40 */
-         0,      0,      0,      0, 0xEFC9,      0,      0,      0, /* 0x50 */
-    0xD5A1,      0,      0, 0xB6CD,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xEFCA, 0xEFC6,      0,      0, /* 0x60 */
-         0, 0xEFBB, 0xF6CA,      0, 0xC7C2,      0,      0,      0, /* 0x60 */
-    0xEFCC,      0,      0,      0,      0, 0xBCFC, 0xEFC8,      0, /* 0x70 */
-         0,      0, 0xD5E0,      0,      0,      0, 0xEFF1,      0, /* 0x70 */
-         0,      0, 0xC3BE,      0, 0xEFCD,      0,      0, 0xEFD1, /* 0x80 */
-         0,      0, 0xB0F7,      0,      0,      0,      0, 0xF6CC, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xCBF8,      0, /* 0x90 */
-    0xEFD3,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xCED9, 0xDDF6,      0,      0, 0xEFD6, 0xEEF8, /* 0xA0 */
-         0, 0xEFA1, 0xEFCB,      0, 0xB8E4,      0, 0xD5F2,      0, /* 0xA0 */
-    0xEFD7,      0,      0, 0xC4F8,      0, 0xEFD8,      0,      0, /* 0xB0 */
-    0xEFD4,      0,      0,      0,      0,      0,      0, 0xEFD5, /* 0xB0 */
-         0,      0,      0, 0xEFDF,      0,      0,      0, 0xEFE0, /* 0xC0 */
-    0xC1B4,      0, 0xF6CB,      0, 0xEFD2, 0xEFDD,      0,      0, /* 0xC0 */
-         0, 0xEFE1,      0,      0,      0,      0, 0xF7E9, 0xEFAC, /* 0xD0 */
-    0xEFCF,      0,      0,      0, 0xEFDB, 0xEFDC, 0xEFDE, 0xB2F9, /* 0xD0 */
-         0, 0xBEB5, 0xEFDA,      0, 0xEFCE,      0,      0,      0, /* 0xE0 */
-    0xF6C9,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xEEFC,      0, 0xEFE4, /* 0xF0 */
-         0, 0xEFEA                                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xEFBE, 	 0, 	 0, 	 0, 	 0, 0xEFBA, 0xEFC2, /* 0x00 */
+    0xEFC3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xD7B6, 	 0, 0xEFB9, 	 0, 	 0, 0xEFBF, 	 0, 	 0, /* 0x10 */
+    0xB4B8, 0xEFC5, 0xEFA3, 0xEFBC, 	 0, 	 0, 	 0, 0xEFC4, /* 0x10 */
+    0xB6A7, 	 0, 0xC7AE, 	 0, 	 0, 	 0, 0xBDF5, 	 0, /* 0x20 */
+    0xC3AA, 	 0, 	 0, 0xCEFD, 	 0, 	 0, 0xEFC0, 0xB4ED, /* 0x20 */
+         0, 	 0, 0xC2BC, 0xC3CC, 	 0, 	 0, 0xF8A3, 	 0, /* 0x30 */
+    0xEFAA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xEFBD, 0xCFC7, 	 0, 0xEFC1, 	 0, 	 0, 0xEECD, 0xEFC7, /* 0x40 */
+         0, 	 0, 	 0, 0xB9F8, 	 0, 0xB6C6, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xEFC9, 	 0, 	 0, 	 0, /* 0x50 */
+    0xD5A1, 	 0, 	 0, 0xB6CD, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xEFCA, 0xEFC6, 	 0, 	 0, /* 0x60 */
+         0, 0xEFBB, 0xF6CA, 	 0, 0xC7C2, 	 0, 	 0, 	 0, /* 0x60 */
+    0xEFCC, 	 0, 	 0, 	 0, 	 0, 0xBCFC, 0xEFC8, 	 0, /* 0x70 */
+         0, 	 0, 0xD5E0, 	 0, 	 0, 	 0, 0xEFF1, 	 0, /* 0x70 */
+         0, 	 0, 0xC3BE, 	 0, 0xEFCD, 	 0, 	 0, 0xEFD1, /* 0x80 */
+         0, 	 0, 0xB0F7, 	 0, 	 0, 	 0, 	 0, 0xF6CC, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBF8, 	 0, /* 0x90 */
+    0xEFD3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xCED9, 0xDDF6, 	 0, 	 0, 0xEFD6, 0xEEF8, /* 0xA0 */
+         0, 0xEFA1, 0xEFCB, 	 0, 0xB8E4, 	 0, 0xD5F2, 	 0, /* 0xA0 */
+    0xEFD7, 	 0, 	 0, 0xC4F8, 	 0, 0xEFD8, 	 0, 	 0, /* 0xB0 */
+    0xEFD4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEFD5, /* 0xB0 */
+         0, 	 0, 	 0, 0xEFDF, 	 0, 	 0, 	 0, 0xEFE0, /* 0xC0 */
+    0xC1B4, 	 0, 0xF6CB, 	 0, 0xEFD2, 0xEFDD, 	 0, 	 0, /* 0xC0 */
+         0, 0xEFE1, 	 0, 	 0, 	 0, 	 0, 0xF7E9, 0xEFAC, /* 0xD0 */
+    0xEFCF, 	 0, 	 0, 	 0, 0xEFDB, 0xEFDC, 0xEFDE, 0xB2F9, /* 0xD0 */
+         0, 0xBEB5, 0xEFDA, 	 0, 0xEFCE, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xF6C9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xEEFC, 	 0, 0xEFE4, /* 0xF0 */
+         0, 0xEFEA													/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_94[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xEEF3,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0, 0xEFA6,      0,      0,      0,      0, /* 0x00 */
-    0xC1CD,      0, 0xEFA9, 0xEFE6, 0xEFE2,      0,      0,      0, /* 0x10 */
-    0xD6D3, 0xEFEB,      0,      0,      0, 0xEFE3,      0,      0, /* 0x10 */
-    0xEFE8,      0,      0,      0,      0,      0, 0xEFB4, 0xEFB5, /* 0x20 */
-    0xEFD0,      0,      0,      0,      0,      0, 0xC1AD,      0, /* 0x20 */
-         0,      0, 0xEFED, 0xC0D8,      0, 0xCCFA,      0,      0, /* 0x30 */
-    0xEEEC,      0, 0xEEF5,      0,      0,      0, 0xF6CD, 0xEFEE, /* 0x30 */
-         0,      0,      0,      0, 0xD6FD,      0,      0,      0, /* 0x40 */
-         0,      0, 0xEFEC,      0, 0xEFD9,      0,      0,      0, /* 0x40 */
-         0,      0, 0xBCF8,      0, 0xEFEF,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xEEE5,      0,      0, 0xEFF0,      0, 0xEFE5,      0,      0, /* 0x60 */
-         0,      0,      0, 0xF6CE,      0, 0xEFE7,      0,      0, /* 0x60 */
-    0xD4BF,      0, 0xCFE2,      0,      0,      0,      0, 0xC4F7, /* 0x70 */
-         0, 0xEFE9,      0,      0, 0xC2E0, 0xD7EA, 0xF6C7, 0xD4E4  /* 0x70 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xEEF3, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xEFA6, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xC1CD, 	 0, 0xEFA9, 0xEFE6, 0xEFE2, 	 0, 	 0, 	 0, /* 0x10 */
+    0xD6D3, 0xEFEB, 	 0, 	 0, 	 0, 0xEFE3, 	 0, 	 0, /* 0x10 */
+    0xEFE8, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEFB4, 0xEFB5, /* 0x20 */
+    0xEFD0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC1AD, 	 0, /* 0x20 */
+         0, 	 0, 0xEFED, 0xC0D8, 	 0, 0xCCFA, 	 0, 	 0, /* 0x30 */
+    0xEEEC, 	 0, 0xEEF5, 	 0, 	 0, 	 0, 0xF6CD, 0xEFEE, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xD6FD, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xEFEC, 	 0, 0xEFD9, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xBCF8, 	 0, 0xEFEF, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xEEE5, 	 0, 	 0, 0xEFF0, 	 0, 0xEFE5, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xF6CE, 	 0, 0xEFE7, 	 0, 	 0, /* 0x60 */
+    0xD4BF, 	 0, 0xCFE2, 	 0, 	 0, 	 0, 	 0, 0xC4F7, /* 0x70 */
+         0, 0xEFE9, 	 0, 	 0, 0xC2E0, 0xD7EA, 0xF6C7, 0xD4E4	/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_95[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xB3A4, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xC3C5,      0, 0xE3C5, 0xC9C1,      0,      0, 0xE3C6,      0, /* 0x80 */
-         0, 0xB1D5,      0, 0xBFAA, 0xE3CA,      0, 0xE3C8, 0xC8F2, /* 0x80 */
-         0, 0xCFD0,      0, 0xBCE4, 0xE3C9,      0,      0,      0, /* 0x90 */
-    0xD5A2,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0, 0xBAD2,      0, 0xB8F3, 0xF8B9, 0xB7A7,      0,      0, /* 0xA0 */
-    0xB9EB, 0xC3F6,      0, 0xE3CD, 0xE3CF, 0xE3CC,      0,      0, /* 0xA0 */
-         0,      0, 0xD4C4,      0,      0,      0, 0xE3D1,      0, /* 0xB0 */
-         0, 0xD1CB,      0, 0xD1D6, 0xE3D5, 0xE3D4, 0xE3D0, 0xE3D3, /* 0xB0 */
-         0,      0,      0, 0xE3D6,      0,      0, 0xF8A2,      0, /* 0xC0 */
-    0xE3C7,      0, 0xC0AB, 0xE3D7, 0xC0BB,      0,      0,      0, /* 0xC0 */
-    0xE3D9,      0,      0,      0, 0xE3D8, 0xE3DA, 0xB4B3,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xB9D8,      0, 0xE3DB,      0, /* 0xD0 */
-         0, 0xB2FB, 0xF8DB,      0,      0, 0xE3CB                  /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xC3C5, 	 0, 0xE3C5, 0xC9C1, 	 0, 	 0, 0xE3C6, 	 0, /* 0x80 */
+         0, 0xB1D5, 	 0, 0xBFAA, 0xE3CA, 	 0, 0xE3C8, 0xC8F2, /* 0x80 */
+         0, 0xCFD0, 	 0, 0xBCE4, 0xE3C9, 	 0, 	 0, 	 0, /* 0x90 */
+    0xD5A2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 0xBAD2, 	 0, 0xB8F3, 0xF8B9, 0xB7A7, 	 0, 	 0, /* 0xA0 */
+    0xB9EB, 0xC3F6, 	 0, 0xE3CD, 0xE3CF, 0xE3CC, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xD4C4, 	 0, 	 0, 	 0, 0xE3D1, 	 0, /* 0xB0 */
+         0, 0xD1CB, 	 0, 0xD1D6, 0xE3D5, 0xE3D4, 0xE3D0, 0xE3D3, /* 0xB0 */
+         0, 	 0, 	 0, 0xE3D6, 	 0, 	 0, 0xF8A2, 	 0, /* 0xC0 */
+    0xE3C7, 	 0, 0xC0AB, 0xE3D7, 0xC0BB, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xE3D9, 	 0, 	 0, 	 0, 0xE3D8, 0xE3DA, 0xB4B3, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xB9D8, 	 0, 0xE3DB, 	 0, /* 0xD0 */
+         0, 0xB2FB, 0xF8DB, 	 0, 	 0, 0xE3CB					/* 0xE0 */
                                                                     /* 0xE0 */
 };
 
@@ -2850,277 +2850,277 @@ static sal_uInt16 const aImplUniToDBCSTab_GBT_95[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_96[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x10 */
-                                    0xB8B7, 0xDAE2,      0,      0, /* 0x10 */
-         0, 0xDAE4, 0xDAE3,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xDAE6,      0,      0,      0, 0xC8EE,      0, /* 0x20 */
-         0, 0xDAE5, 0xB7C0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xD7E8, 0xDAE8, 0xDAE7,      0, 0xB0A2, /* 0x30 */
-    0xCDD3,      0, 0xDAE9,      0, 0xB8BD,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xC2AA, 0xC4B0, 0xBDB5,      0,      0, /* 0x40 */
-    0xCFDE,      0,      0,      0, 0xDAEB,      0,      0,      0, /* 0x50 */
-    0xDAEA,      0,      0, 0xB1DD,      0, 0xC9C2,      0, 0xDAEC, /* 0x50 */
-         0, 0xB6B8, 0xD4BA, 0xD5F3, 0xB3FD,      0,      0,      0, /* 0x60 */
-         0,      0, 0xC5E3,      0, 0xDAEE,      0,      0,      0, /* 0x60 */
-    0xD2F5,      0, 0xDAEF, 0xB3C2, 0xDAF0, 0xC1EA, 0xCCD5, 0xCFDD, /* 0x70 */
-    0xC2BD,      0,      0,      0,      0, 0xD1F4,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xD3E7, 0xC2A1,      0, /* 0x80 */
-    0xDAF1, 0xDAED, 0xB6D3, 0xCBE5,      0, 0xDAF2, 0xBDD7,      0, /* 0x80 */
-         0,      0,      0,      0, 0xB8F4, 0xD4C9,      0, 0xDAF3, /* 0x90 */
-    0xB0AF, 0xCFB6,      0, 0xBCCA, 0xD5CF,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0, 0xCBED, /* 0xA0 */
-    0xCBE6,      0, 0xCFD5,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xDAF4, 0xD2FE,      0, 0xE3C4, 0xC2A4,      0,      0,      0, /* 0xB0 */
-    0xC1A5, 0xF6BF,      0, 0xF9A2, 0xF6C0, 0xF6C1,      0,      0, /* 0xB0 */
-    0xC8B8, 0xD1E3,      0,      0, 0xD0DB, 0xD1C5, 0xBCAF, 0xB9CD, /* 0xC0 */
-         0, 0xEFF4,      0,      0, 0xB4C6, 0xD3BA, 0xF6C2,      0, /* 0xC0 */
-         0,      0, 0xF6C3,      0,      0, 0xB5F1, 0xCBE4,      0, /* 0xD0 */
-         0, 0xCBAB,      0, 0xB3FB, 0xD4D3,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xC0EB, 0xC4D1,      0,      0,      0,      0, /* 0xE0 */
-    0xD3EA, 0xF6A7, 0xD1A9,      0,      0,      0,      0, 0xF6A9, /* 0xE0 */
-         0,      0, 0xD4C6,      0,      0,      0, 0xC1E3, 0xC0D7, /* 0xF0 */
-         0, 0xB1A2,      0, 0xB5E7                                  /* 0xF0 */
+                                    0xB8B7, 0xDAE2, 	 0, 	 0, /* 0x10 */
+         0, 0xDAE4, 0xDAE3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xDAE6, 	 0, 	 0, 	 0, 0xC8EE, 	 0, /* 0x20 */
+         0, 0xDAE5, 0xB7C0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xD7E8, 0xDAE8, 0xDAE7, 	 0, 0xB0A2, /* 0x30 */
+    0xCDD3, 	 0, 0xDAE9, 	 0, 0xB8BD, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xC2AA, 0xC4B0, 0xBDB5, 	 0, 	 0, /* 0x40 */
+    0xCFDE, 	 0, 	 0, 	 0, 0xDAEB, 	 0, 	 0, 	 0, /* 0x50 */
+    0xDAEA, 	 0, 	 0, 0xB1DD, 	 0, 0xC9C2, 	 0, 0xDAEC, /* 0x50 */
+         0, 0xB6B8, 0xD4BA, 0xD5F3, 0xB3FD, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xC5E3, 	 0, 0xDAEE, 	 0, 	 0, 	 0, /* 0x60 */
+    0xD2F5, 	 0, 0xDAEF, 0xB3C2, 0xDAF0, 0xC1EA, 0xCCD5, 0xCFDD, /* 0x70 */
+    0xC2BD, 	 0, 	 0, 	 0, 	 0, 0xD1F4, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD3E7, 0xC2A1, 	 0, /* 0x80 */
+    0xDAF1, 0xDAED, 0xB6D3, 0xCBE5, 	 0, 0xDAF2, 0xBDD7, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xB8F4, 0xD4C9, 	 0, 0xDAF3, /* 0x90 */
+    0xB0AF, 0xCFB6, 	 0, 0xBCCA, 0xD5CF, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBED, /* 0xA0 */
+    0xCBE6, 	 0, 0xCFD5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xDAF4, 0xD2FE, 	 0, 0xE3C4, 0xC2A4, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xC1A5, 0xF6BF, 	 0, 0xF9A2, 0xF6C0, 0xF6C1, 	 0, 	 0, /* 0xB0 */
+    0xC8B8, 0xD1E3, 	 0, 	 0, 0xD0DB, 0xD1C5, 0xBCAF, 0xB9CD, /* 0xC0 */
+         0, 0xEFF4, 	 0, 	 0, 0xB4C6, 0xD3BA, 0xF6C2, 	 0, /* 0xC0 */
+         0, 	 0, 0xF6C3, 	 0, 	 0, 0xB5F1, 0xCBE4, 	 0, /* 0xD0 */
+         0, 0xCBAB, 	 0, 0xB3FB, 0xD4D3, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xC0EB, 0xC4D1, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xD3EA, 0xF6A7, 0xD1A9, 	 0, 	 0, 	 0, 	 0, 0xF6A9, /* 0xE0 */
+         0, 	 0, 0xD4C6, 	 0, 	 0, 	 0, 0xC1E3, 0xC0D7, /* 0xF0 */
+         0, 0xB1A2, 	 0, 0xB5E7									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_97[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD0E8,      0,      0,      0, 0xCFF6,      0, 0xF6AA, 0xD5F0, /* 0x00 */
-    0xF6AC, 0xC3B9,      0,      0,      0, 0xBBF4, 0xF6AE, 0xF6AD, /* 0x00 */
-         0,      0,      0, 0xC4DE,      0,      0, 0xC1D8,      0, /* 0x10 */
-         0,      0,      0,      0, 0xCBAA,      0, 0xCFBC,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xCEED, /* 0x20 */
-         0,      0, 0xF6AF,      0,      0,      0,      0,      0, /* 0x20 */
-    0xF6B1,      0, 0xC2B6,      0,      0,      0,      0,      0, /* 0x30 */
-    0xB0D4, 0xC5F9,      0,      0,      0, 0xF6AB, 0xF6B2,      0, /* 0x30 */
-         0,      0, 0xF6A8,      0, 0xF6B0,      0,      0,      0, /* 0x40 */
-    0xC1E9,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xC7E0,      0,      0,      0, 0xBEB8,      0, /* 0x50 */
-         0,      0, 0xF6A6, 0xB5E5, 0xBEB2,      0, 0xB7C7,      0, /* 0x50 */
-    0xBFBF, 0xC3D2, 0xC3E6,      0,      0,      0,      0,      0, /* 0x60 */
-    0xD8CC, 0xB8EF,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xBDF9, 0xD1A5,      0, 0xB0D0,      0, /* 0x70 */
-         0,      0,      0,      0, 0xF7B0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xF7B1,      0,      0, /* 0x80 */
-         0,      0,      0, 0xD0AC,      0, 0xB0B0,      0, 0xB9AE, /* 0x80 */
-         0,      0,      0,      0, 0xF7B4,      0,      0,      0, /* 0x90 */
-    0xC7CA,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xBECF,      0,      0, 0xF7B7,      0,      0, 0xF8E4,      0, /* 0xA0 */
-         0,      0,      0, 0xF7B6,      0, 0xB1DE,      0,      0, /* 0xA0 */
-         0,      0, 0xF7B8,      0, 0xF7B9,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xF7B3,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xF7B2,      0,      0, 0xF8E1,      0, /* 0xC0 */
-         0, 0xF7B5,      0, 0xCEA4, 0xC8CD,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xBAAB,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xE8B8,      0,      0, 0xE8BA,      0, 0xE8B9,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xBEC2,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xD2F4,      0, 0xD4CF, 0xC9D8,      0, /* 0xF0 */
-         0,      0,      0,      0,      0,      0,      0, 0xCFEC  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD0E8, 	 0, 	 0, 	 0, 0xCFF6, 	 0, 0xF6AA, 0xD5F0, /* 0x00 */
+    0xF6AC, 0xC3B9, 	 0, 	 0, 	 0, 0xBBF4, 0xF6AE, 0xF6AD, /* 0x00 */
+         0, 	 0, 	 0, 0xC4DE, 	 0, 	 0, 0xC1D8, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xCBAA, 	 0, 0xCFBC, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCEED, /* 0x20 */
+         0, 	 0, 0xF6AF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xF6B1, 	 0, 0xC2B6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xB0D4, 0xC5F9, 	 0, 	 0, 	 0, 0xF6AB, 0xF6B2, 	 0, /* 0x30 */
+         0, 	 0, 0xF6A8, 	 0, 0xF6B0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xC1E9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xC7E0, 	 0, 	 0, 	 0, 0xBEB8, 	 0, /* 0x50 */
+         0, 	 0, 0xF6A6, 0xB5E5, 0xBEB2, 	 0, 0xB7C7, 	 0, /* 0x50 */
+    0xBFBF, 0xC3D2, 0xC3E6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xD8CC, 0xB8EF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xBDF9, 0xD1A5, 	 0, 0xB0D0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 0xF7B0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF7B1, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xD0AC, 	 0, 0xB0B0, 	 0, 0xB9AE, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xF7B4, 	 0, 	 0, 	 0, /* 0x90 */
+    0xC7CA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xBECF, 	 0, 	 0, 0xF7B7, 	 0, 	 0, 0xF8E4, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xF7B6, 	 0, 0xB1DE, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xF7B8, 	 0, 0xF7B9, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF7B3, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xF7B2, 	 0, 	 0, 0xF8E1, 	 0, /* 0xC0 */
+         0, 0xF7B5, 	 0, 0xCEA4, 0xC8CD, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xBAAB, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xE8B8, 	 0, 	 0, 0xE8BA, 	 0, 0xE8B9, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xBEC2, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xD2F4, 	 0, 0xD4CF, 0xC9D8, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCFEC	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_98[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xD2B3, 0xB6A5, 0xC7EA,      0, 0xCFEE, 0xCBB3, 0xF1FC, /* 0x00 */
-    0xD0EB,      0, 0xE7EF,      0, 0xCBCC,      0, 0xF1FD, 0xF1FE, /* 0x00 */
-    0xD4A4, 0xCDE7, 0xB0E4, 0xB6D9,      0,      0,      0, 0xC6C4, /* 0x10 */
-    0xC1EC,      0,      0,      0, 0xF2A2,      0,      0,      0, /* 0x10 */
-         0, 0xF2A1,      0,      0, 0xD2C3,      0, 0xF2A4,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xCDB7,      0,      0, /* 0x20 */
-    0xBCD5,      0,      0,      0,      0,      0,      0, 0xF2A5, /* 0x30 */
-    0xBEB1,      0,      0, 0xC6B5,      0, 0xCDC7,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xBFC5,      0, /* 0x40 */
-         0,      0,      0,      0, 0xCCE2, 0xB6EE, 0xF2A6,      0, /* 0x40 */
-         0,      0,      0, 0xF2A7, 0xD1D5,      0,      0,      0, /* 0x50 */
-    0xD4B8, 0xF2AA,      0, 0xB5DF,      0,      0, 0xC0E0,      0, /* 0x50 */
-         0,      0, 0xF2A9,      0,      0, 0xF2AB,      0, 0xB9CB, /* 0x60 */
-         0,      0,      0, 0xB2FC, 0xF2AC,      0,      0, 0xCFD4, /* 0x60 */
-    0xF2AD, 0xC2AD,      0, 0xF2A8, 0xC8A7,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xB7E7,      0,      0,      0,      0,      0, 0xECA9, 0xECAA, /* 0xA0 */
-         0, 0xF8EC,      0, 0xF8B7,      0,      0, 0xECAB,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xECAC,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xC6AE,      0, 0xECAD,      0, /* 0xC0 */
-    0xECAE,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xB7C9,      0,      0,      0, 0xCAB3, /* 0xD0 */
-    0xE2BB,      0, 0xF8BF,      0,      0,      0,      0, 0xE2B8, /* 0xE0 */
-         0, 0xE2BD, 0xE2BF, 0xE2C0,      0, 0xE2C1,      0, 0xB7B9, /* 0xE0 */
-         0,      0, 0xD2FB,      0, 0xE2C2,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0, 0xCBC7, 0xB1A5, 0xCACE          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xD2B3, 0xB6A5, 0xC7EA, 	 0, 0xCFEE, 0xCBB3, 0xF1FC, /* 0x00 */
+    0xD0EB, 	 0, 0xE7EF, 	 0, 0xCBCC, 	 0, 0xF1FD, 0xF1FE, /* 0x00 */
+    0xD4A4, 0xCDE7, 0xB0E4, 0xB6D9, 	 0, 	 0, 	 0, 0xC6C4, /* 0x10 */
+    0xC1EC, 	 0, 	 0, 	 0, 0xF2A2, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xF2A1, 	 0, 	 0, 0xD2C3, 	 0, 0xF2A4, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCDB7, 	 0, 	 0, /* 0x20 */
+    0xBCD5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF2A5, /* 0x30 */
+    0xBEB1, 	 0, 	 0, 0xC6B5, 	 0, 0xCDC7, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBFC5, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xCCE2, 0xB6EE, 0xF2A6, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xF2A7, 0xD1D5, 	 0, 	 0, 	 0, /* 0x50 */
+    0xD4B8, 0xF2AA, 	 0, 0xB5DF, 	 0, 	 0, 0xC0E0, 	 0, /* 0x50 */
+         0, 	 0, 0xF2A9, 	 0, 	 0, 0xF2AB, 	 0, 0xB9CB, /* 0x60 */
+         0, 	 0, 	 0, 0xB2FC, 0xF2AC, 	 0, 	 0, 0xCFD4, /* 0x60 */
+    0xF2AD, 0xC2AD, 	 0, 0xF2A8, 0xC8A7, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xB7E7, 	 0, 	 0, 	 0, 	 0, 	 0, 0xECA9, 0xECAA, /* 0xA0 */
+         0, 0xF8EC, 	 0, 0xF8B7, 	 0, 	 0, 0xECAB, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xECAC, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xC6AE, 	 0, 0xECAD, 	 0, /* 0xC0 */
+    0xECAE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xB7C9, 	 0, 	 0, 	 0, 0xCAB3, /* 0xD0 */
+    0xE2BB, 	 0, 0xF8BF, 	 0, 	 0, 	 0, 	 0, 0xE2B8, /* 0xE0 */
+         0, 0xE2BD, 0xE2BF, 0xE2C0, 	 0, 0xE2C1, 	 0, 0xB7B9, /* 0xE0 */
+         0, 	 0, 0xD2FB, 	 0, 0xE2C2, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xCBC7, 0xB1A5, 0xCACE			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_99[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xBDC8,      0, 0xB1FD,      0,      0, /* 0x00 */
-         0, 0xE2C3, 0xD1F8,      0, 0xB6FC,      0,      0,      0, /* 0x00 */
-    0xB2CD, 0xE2C4, 0xC4D9, 0xB6F6,      0,      0,      0,      0, /* 0x10 */
-    0xD3E0,      0,      0, 0xE2C6,      0,      0, 0xBDA4,      0, /* 0x10 */
-         0, 0xCFDA,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xB9DD,      0,      0,      0,      0,      0, 0xF7D1,      0, /* 0x20 */
-         0,      0,      0, 0xE2BC,      0,      0,      0, 0xE2C7, /* 0x30 */
-         0,      0,      0,      0, 0xE2BE,      0, 0xC1F3, 0xE2C8, /* 0x30 */
-         0,      0,      0, 0xE2C9,      0, 0xC2F8,      0,      0, /* 0x40 */
-    0xE2CA, 0xE2CB, 0xE2CC, 0xC0A1, 0xE2CD,      0,      0,      0, /* 0x40 */
-         0, 0xBCA2, 0xC8C4,      0, 0xF7D3, 0xF7D2,      0, 0xF7CF, /* 0x50 */
-         0,      0,      0,      0, 0xF7D0,      0, 0xB2F6,      0, /* 0x50 */
-         0,      0, 0xE2CE,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xCAD7, 0xD8B8, /* 0x90 */
-    0xD9E5, 0xCFE3,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xF0A5,      0,      0, /* 0xA0 */
-    0xDCB0,      0,      0,      0, 0xC2ED, 0xD4A6, 0xB7EB,      0, /* 0xA0 */
-         0, 0xCDD4,      0, 0xB3DB, 0xD1B1,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0, 0xB2B5,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-    0xD7A4, 0xE6E5, 0xBED4,      0, 0xE6E0, 0xBCDD,      0,      0, /* 0xD0 */
-    0xE6E6, 0xE6E2,      0, 0xCABB,      0, 0xCDD5,      0, 0xE6E1, /* 0xD0 */
-         0, 0xC2EE, 0xE6E9,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xBAA7,      0,      0, /* 0xE0 */
-         0, 0xC2E6,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0,      0,      0, 0xBFA5  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xBDC8, 	 0, 0xB1FD, 	 0, 	 0, /* 0x00 */
+         0, 0xE2C3, 0xD1F8, 	 0, 0xB6FC, 	 0, 	 0, 	 0, /* 0x00 */
+    0xB2CD, 0xE2C4, 0xC4D9, 0xB6F6, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xD3E0, 	 0, 	 0, 0xE2C6, 	 0, 	 0, 0xBDA4, 	 0, /* 0x10 */
+         0, 0xCFDA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xB9DD, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF7D1, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xE2BC, 	 0, 	 0, 	 0, 0xE2C7, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xE2BE, 	 0, 0xC1F3, 0xE2C8, /* 0x30 */
+         0, 	 0, 	 0, 0xE2C9, 	 0, 0xC2F8, 	 0, 	 0, /* 0x40 */
+    0xE2CA, 0xE2CB, 0xE2CC, 0xC0A1, 0xE2CD, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xBCA2, 0xC8C4, 	 0, 0xF7D3, 0xF7D2, 	 0, 0xF7CF, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xF7D0, 	 0, 0xB2F6, 	 0, /* 0x50 */
+         0, 	 0, 0xE2CE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCAD7, 0xD8B8, /* 0x90 */
+    0xD9E5, 0xCFE3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF0A5, 	 0, 	 0, /* 0xA0 */
+    0xDCB0, 	 0, 	 0, 	 0, 0xC2ED, 0xD4A6, 0xB7EB, 	 0, /* 0xA0 */
+         0, 0xCDD4, 	 0, 0xB3DB, 0xD1B1, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xB2B5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xD7A4, 0xE6E5, 0xBED4, 	 0, 0xE6E0, 0xBCDD, 	 0, 	 0, /* 0xD0 */
+    0xE6E6, 0xE6E2, 	 0, 0xCABB, 	 0, 0xCDD5, 	 0, 0xE6E1, /* 0xD0 */
+         0, 0xC2EE, 0xE6E9, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xBAA7, 	 0, 	 0, /* 0xE0 */
+         0, 0xC2E6, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBFA5	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_9A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xB3D2,      0,      0,      0, 0xE6ED,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0xE6EC, 0xC6EF, 0xE6EB, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xE6F0,      0, /* 0x10 */
-         0, 0xC6AD,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0, 0xE5B9,      0, 0xE6EF, 0xE6F2,      0, /* 0x20 */
-    0xCCDA,      0,      0,      0,      0,      0, 0xE6E3, 0xC9A7, /* 0x30 */
-    0xE6F3,      0,      0,      0,      0,      0, 0xC2E2,      0, /* 0x30 */
-    0xDDEB, 0xE6F1, 0xE6EE, 0xE6F4, 0xE6F5, 0xC7FD,      0,      0, /* 0x40 */
-         0,      0, 0xE6E8,      0,      0, 0xE6E7,      0, 0xE6F6, /* 0x40 */
-         0,      0,      0,      0,      0, 0xBDBE,      0, 0xD1E9, /* 0x50 */
-         0,      0, 0xBEAA, 0xE6E4,      0,      0,      0, 0xD6E8, /* 0x50 */
-         0,      0, 0xC2BF,      0, 0xE6F8, 0xE6F7,      0,      0, /* 0x60 */
-         0,      0, 0xE6EA,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xB9C7,      0,      0,      0,      0,      0,      0, 0xB0B9, /* 0xA0 */
-    0xF7BB, 0xF7BA,      0,      0,      0,      0, 0xF7BE, 0xF7BC, /* 0xB0 */
-    0xBAA1,      0, 0xF7BF,      0, 0xF7C0,      0,      0,      0, /* 0xB0 */
-    0xF7C2, 0xF7C1, 0xF7C4,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xF7C3, /* 0xC0 */
-         0, 0xF7C7, 0xF8FE, 0xCBE8, 0xCCE5, 0xF7C6, 0xF7C5,      0, /* 0xD0 */
-    0xB8DF,      0,      0,      0,      0,      0,      0, 0xF7D4, /* 0xD0 */
-         0, 0xF7D5,      0,      0,      0,      0, 0xF7D6,      0, /* 0xE0 */
-         0,      0,      0, 0xF7D8,      0, 0xF7DA, 0xF8B1, 0xF7D7, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0, 0xF7DB,      0, 0xF7D9                                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xB3D2, 	 0, 	 0, 	 0, 0xE6ED, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE6EC, 0xC6EF, 0xE6EB, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6F0, 	 0, /* 0x10 */
+         0, 0xC6AD, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xE5B9, 	 0, 0xE6EF, 0xE6F2, 	 0, /* 0x20 */
+    0xCCDA, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE6E3, 0xC9A7, /* 0x30 */
+    0xE6F3, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC2E2, 	 0, /* 0x30 */
+    0xDDEB, 0xE6F1, 0xE6EE, 0xE6F4, 0xE6F5, 0xC7FD, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xE6E8, 	 0, 	 0, 0xE6E7, 	 0, 0xE6F6, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xBDBE, 	 0, 0xD1E9, /* 0x50 */
+         0, 	 0, 0xBEAA, 0xE6E4, 	 0, 	 0, 	 0, 0xD6E8, /* 0x50 */
+         0, 	 0, 0xC2BF, 	 0, 0xE6F8, 0xE6F7, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xE6EA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xB9C7, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB0B9, /* 0xA0 */
+    0xF7BB, 0xF7BA, 	 0, 	 0, 	 0, 	 0, 0xF7BE, 0xF7BC, /* 0xB0 */
+    0xBAA1, 	 0, 0xF7BF, 	 0, 0xF7C0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xF7C2, 0xF7C1, 0xF7C4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF7C3, /* 0xC0 */
+         0, 0xF7C7, 0xF8FE, 0xCBE8, 0xCCE5, 0xF7C6, 0xF7C5, 	 0, /* 0xD0 */
+    0xB8DF, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF7D4, /* 0xD0 */
+         0, 0xF7D5, 	 0, 	 0, 	 0, 	 0, 0xF7D6, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xF7D8, 	 0, 0xF7DA, 0xF8B1, 0xF7D7, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xF7DB, 	 0, 0xF7D9									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_9B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xD7D7,      0,      0, 0xCBC9,      0, /* 0x00 */
-    0xF7DC,      0,      0,      0,      0, 0xF8BA,      0, 0xF7DD, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0xF8F6,      0,      0,      0,      0, 0xF7DF, /* 0x10 */
-         0,      0, 0xF7DE, 0xF7E0,      0, 0xB6B7,      0, 0xC4D6, /* 0x20 */
-         0, 0xE3D2,      0,      0,      0,      0, 0xE3CE, 0xDBCB, /* 0x20 */
-         0, 0xD3F4, 0xD8AA,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xE5F7, 0xB9ED,      0,      0,      0, /* 0x30 */
-         0, 0xBFFD, 0xBBEA, 0xF7C9, 0xC6C7, 0xF7C8,      0,      0, /* 0x40 */
-    0xF7CC,      0,      0,      0,      0, 0xF7CD, 0xF7CB, 0xCEBA, /* 0x40 */
-         0, 0xF7CE,      0,      0, 0xC4A7,      0,      0,      0, /* 0x50 */
-    0xF7CA,      0, 0xD3E3,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0, 0xC2B3, /* 0x60 */
-         0,      0,      0,      0, 0xF6D0,      0,      0, 0xF6CF, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xF6D1,      0, 0xF6D2,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xF6D3,      0, /* 0x80 */
-    0xF6D8, 0xB1AB, 0xF6D6,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xF6DA,      0,      0, 0xF6DF, 0xF6DC,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xF6DB, 0xF6DE,      0, 0xF6D9, 0xCFCA,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xF6E7, 0xF6E1,      0,      0,      0,      0,      0, 0xF6E9, /* 0xC0 */
-         0, 0xC0F0, 0xF6E8,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xF6F6,      0, 0xF6EB,      0, /* 0xD0 */
-         0,      0,      0, 0xF6F4,      0, 0xF6F1,      0,      0, /* 0xD0 */
-         0, 0xF6EE, 0xF6F2,      0, 0xF6EF,      0,      0, 0xF6F0, /* 0xE0 */
-    0xBEA8,      0, 0xF6EC, 0xF6ED,      0,      0,      0,      0, /* 0xE0 */
-    0xF6F3,      0,      0,      0, 0xF6F5,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xF6EA,      0, 0xF6FD  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xD7D7, 	 0, 	 0, 0xCBC9, 	 0, /* 0x00 */
+    0xF7DC, 	 0, 	 0, 	 0, 	 0, 0xF8BA, 	 0, 0xF7DD, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xF8F6, 	 0, 	 0, 	 0, 	 0, 0xF7DF, /* 0x10 */
+         0, 	 0, 0xF7DE, 0xF7E0, 	 0, 0xB6B7, 	 0, 0xC4D6, /* 0x20 */
+         0, 0xE3D2, 	 0, 	 0, 	 0, 	 0, 0xE3CE, 0xDBCB, /* 0x20 */
+         0, 0xD3F4, 0xD8AA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xE5F7, 0xB9ED, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xBFFD, 0xBBEA, 0xF7C9, 0xC6C7, 0xF7C8, 	 0, 	 0, /* 0x40 */
+    0xF7CC, 	 0, 	 0, 	 0, 	 0, 0xF7CD, 0xF7CB, 0xCEBA, /* 0x40 */
+         0, 0xF7CE, 	 0, 	 0, 0xC4A7, 	 0, 	 0, 	 0, /* 0x50 */
+    0xF7CA, 	 0, 0xD3E3, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC2B3, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xF6D0, 	 0, 	 0, 0xF6CF, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xF6D1, 	 0, 0xF6D2, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF6D3, 	 0, /* 0x80 */
+    0xF6D8, 0xB1AB, 0xF6D6, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xF6DA, 	 0, 	 0, 0xF6DF, 0xF6DC, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xF6DB, 0xF6DE, 	 0, 0xF6D9, 0xCFCA, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xF6E7, 0xF6E1, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF6E9, /* 0xC0 */
+         0, 0xC0F0, 0xF6E8, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xF6F6, 	 0, 0xF6EB, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xF6F4, 	 0, 0xF6F1, 	 0, 	 0, /* 0xD0 */
+         0, 0xF6EE, 0xF6F2, 	 0, 0xF6EF, 	 0, 	 0, 0xF6F0, /* 0xE0 */
+    0xBEA8, 	 0, 0xF6EC, 0xF6ED, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xF6F3, 	 0, 	 0, 	 0, 0xF6F5, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF6EA, 	 0, 0xF6FD	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_9C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-    0xF6F8, 0xF6FC,      0,      0,      0, 0xF6FA,      0,      0, /* 0x00 */
-    0xF6F9,      0, 0xF6FB, 0xC8FA,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xF6FE,      0,      0, 0xF6E5,      0, 0xF7A4,      0,      0, /* 0x20 */
-    0xF7A3, 0xF7A5,      0,      0,      0, 0xF7A2,      0,      0, /* 0x20 */
-         0, 0xF6E3, 0xF7A1, 0xF7A6,      0, 0xF7AA,      0, 0xF6E6, /* 0x30 */
-         0, 0xF6E4,      0, 0xF7A9,      0,      0, 0xF7A7,      0, /* 0x30 */
-         0,      0,      0,      0,      0, 0xF7AB,      0,      0, /* 0x40 */
-    0xF7A8, 0xB1EE,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xF7AE,      0, 0xF7AD,      0, 0xF7AC, 0xC1DB, /* 0x50 */
-    0xF6E0,      0,      0,      0,      0, 0xF6F7,      0, 0xF6D7, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0, 0xF7AF, /* 0x60 */
-         0,      0,      0,      0,      0, 0xF6DD,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-    0xF6D4,      0, 0xF6E2,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xC4F1,      0,      0, /* 0xE0 */
-         0, 0xF0AF,      0,      0, 0xD9EC,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xB7EF, 0xC3F9,      0, 0xF0B0          /* 0xF0 */
+    0xF6F8, 0xF6FC, 	 0, 	 0, 	 0, 0xF6FA, 	 0, 	 0, /* 0x00 */
+    0xF6F9, 	 0, 0xF6FB, 0xC8FA, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xF6FE, 	 0, 	 0, 0xF6E5, 	 0, 0xF7A4, 	 0, 	 0, /* 0x20 */
+    0xF7A3, 0xF7A5, 	 0, 	 0, 	 0, 0xF7A2, 	 0, 	 0, /* 0x20 */
+         0, 0xF6E3, 0xF7A1, 0xF7A6, 	 0, 0xF7AA, 	 0, 0xF6E6, /* 0x30 */
+         0, 0xF6E4, 	 0, 0xF7A9, 	 0, 	 0, 0xF7A7, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF7AB, 	 0, 	 0, /* 0x40 */
+    0xF7A8, 0xB1EE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xF7AE, 	 0, 0xF7AD, 	 0, 0xF7AC, 0xC1DB, /* 0x50 */
+    0xF6E0, 	 0, 	 0, 	 0, 	 0, 0xF6F7, 	 0, 0xF6D7, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF7AF, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF6DD, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xF6D4, 	 0, 0xF6E2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC4F1, 	 0, 	 0, /* 0xE0 */
+         0, 0xF0AF, 	 0, 	 0, 0xD9EC, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xB7EF, 0xC3F9, 	 0, 0xF0B0			/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -3128,108 +3128,108 @@ static sal_uInt16 const aImplUniToDBCSTab_GBT_9C[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_9D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                     0xF0B2, 0xF0B1, /* 0x00 */
-         0, 0xD1BB,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0xCDD2,      0,      0, /* 0x10 */
-         0,      0,      0, 0xD4A7,      0, 0xF0B6,      0, 0xF0B7, /* 0x10 */
-         0,      0,      0, 0xF0B3,      0,      0, 0xD1EC,      0, /* 0x20 */
-    0xD1BC,      0,      0,      0,      0,      0,      0, 0xF0B9, /* 0x20 */
-    0xF0BB,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xBAE8,      0,      0,      0, 0xB8EB, /* 0x30 */
-         0,      0, 0xF0BC,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0, 0xBEE9, 0xF0C1, 0xF0BE,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xF0C3, 0xB6EC,      0,      0, /* 0x50 */
-    0xF0C0, 0xF0C4,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xF0C6,      0, 0xC5F4,      0,      0, 0xF0C7, /* 0x60 */
-         0,      0, 0xC8B5,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xF0B4, /* 0x80 */
-         0, 0xF0C8,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xF0C5,      0,      0,      0,      0, /* 0x90 */
-    0xF0C9,      0, 0xF0CA,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xF0CC,      0,      0, /* 0xA0 */
-         0, 0xF0CD,      0,      0,      0,      0,      0, 0xDDBA, /* 0xA0 */
-         0,      0,      0,      0, 0xBAD7,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xF7BD, 0xF0CF,      0,      0,      0, /* 0xB0 */
-    0xF0CB,      0, 0xF0CE,      0, 0xBCA6,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xF0D1,      0,      0,      0, 0xC5B8, /* 0xD0 */
-         0, 0xF0BA, 0xF0D2,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xF0B8, 0xF0D4,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xF0D3, /* 0xE0 */
-         0,      0, 0xF0D5, 0xF0C2,      0,      0,      0,      0, /* 0xF0 */
-    0xF0D6, 0xD3A5, 0xF0D8                                          /* 0xF0 */
+         0, 0xD1BB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCDD2, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xD4A7, 	 0, 0xF0B6, 	 0, 0xF0B7, /* 0x10 */
+         0, 	 0, 	 0, 0xF0B3, 	 0, 	 0, 0xD1EC, 	 0, /* 0x20 */
+    0xD1BC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF0B9, /* 0x20 */
+    0xF0BB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xBAE8, 	 0, 	 0, 	 0, 0xB8EB, /* 0x30 */
+         0, 	 0, 0xF0BC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xBEE9, 0xF0C1, 0xF0BE, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xF0C3, 0xB6EC, 	 0, 	 0, /* 0x50 */
+    0xF0C0, 0xF0C4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xF0C6, 	 0, 0xC5F4, 	 0, 	 0, 0xF0C7, /* 0x60 */
+         0, 	 0, 0xC8B5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF0B4, /* 0x80 */
+         0, 0xF0C8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xF0C5, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xF0C9, 	 0, 0xF0CA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF0CC, 	 0, 	 0, /* 0xA0 */
+         0, 0xF0CD, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDDBA, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xBAD7, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xF7BD, 0xF0CF, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xF0CB, 	 0, 0xF0CE, 	 0, 0xBCA6, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xF0D1, 	 0, 	 0, 	 0, 0xC5B8, /* 0xD0 */
+         0, 0xF0BA, 0xF0D2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF0B8, 0xF0D4, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF0D3, /* 0xE0 */
+         0, 	 0, 0xF0D5, 0xF0C2, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xF0D6, 0xD3A5, 0xF0D8											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_9E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-                                    0xF0D7,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0xF0B5,      0,      0, /* 0x10 */
-         0,      0, 0xF0D0, 0xF0D9,      0, 0xF0BF, 0xF0BD,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xF8D2,      0,      0, /* 0x70 */
-         0, 0xF8F4, 0xF5BA,      0, 0xBCEF, 0xD1CE,      0, 0xC2B9, /* 0x70 */
-         0,      0, 0xF7E4,      0,      0,      0,      0, 0xF7E5, /* 0x80 */
-    0xF7E6,      0,      0, 0xF7E7,      0,      0,      0,      0, /* 0x80 */
-         0,      0, 0xF7E8, 0xC2B4,      0,      0,      0, 0xC0F6, /* 0x90 */
-         0,      0,      0,      0,      0, 0xF7EA,      0, 0xF7EB, /* 0x90 */
-         0,      0,      0,      0,      0, 0xC2F3,      0,      0, /* 0xA0 */
-         0, 0xF4EF,      0,      0,      0,      0,      0, 0xF8E5, /* 0xA0 */
-         0,      0,      0,      0, 0xF4F0, 0xF8D9,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xC2E9,      0, 0xC3B4, 0xF7E2,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xBBC6,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xD9E4, 0xCAF2, 0xC0E8, 0xF0A4, /* 0xC0 */
-         0, 0xBADA,      0,      0, 0xC7AD,      0,      0,      0, /* 0xD0 */
-    0xC4AC,      0,      0, 0xF7EC, 0xF7ED, 0xF7EE, 0xB5E3, 0xF7F0, /* 0xD0 */
-    0xF7EF,      0, 0xF7F1,      0,      0, 0xF7F4,      0, 0xF7F3, /* 0xE0 */
-    0xB5B3,      0,      0,      0,      0,      0,      0, 0xF7F6, /* 0xE0 */
-         0,      0, 0xF7F5,      0, 0xF8D4,      0,      0, 0xF7F2, /* 0xF0 */
-         0, 0xEDE9,      0, 0xEDEA, 0xEDEB, 0xF6BC,      0, 0xF6BD  /* 0xF0 */
+                                    0xF0D7, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF0B5, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xF0D0, 0xF0D9, 	 0, 0xF0BF, 0xF0BD, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF8D2, 	 0, 	 0, /* 0x70 */
+         0, 0xF8F4, 0xF5BA, 	 0, 0xBCEF, 0xD1CE, 	 0, 0xC2B9, /* 0x70 */
+         0, 	 0, 0xF7E4, 	 0, 	 0, 	 0, 	 0, 0xF7E5, /* 0x80 */
+    0xF7E6, 	 0, 	 0, 0xF7E7, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xF7E8, 0xC2B4, 	 0, 	 0, 	 0, 0xC0F6, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF7EA, 	 0, 0xF7EB, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC2F3, 	 0, 	 0, /* 0xA0 */
+         0, 0xF4EF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF8E5, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xF4F0, 0xF8D9, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xC2E9, 	 0, 0xC3B4, 0xF7E2, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xBBC6, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xD9E4, 0xCAF2, 0xC0E8, 0xF0A4, /* 0xC0 */
+         0, 0xBADA, 	 0, 	 0, 0xC7AD, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xC4AC, 	 0, 	 0, 0xF7EC, 0xF7ED, 0xF7EE, 0xB5E3, 0xF7F0, /* 0xD0 */
+    0xF7EF, 	 0, 0xF7F1, 	 0, 	 0, 0xF7F4, 	 0, 0xF7F3, /* 0xE0 */
+    0xB5B3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF7F6, /* 0xE0 */
+         0, 	 0, 0xF7F5, 	 0, 0xF8D4, 	 0, 	 0, 0xF7F2, /* 0xF0 */
+         0, 0xEDE9, 	 0, 0xEDEA, 0xEDEB, 0xF6BC, 	 0, 0xF6BD	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_GBT_9F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-            0xF6BE,      0,      0,      0,      0, 0xB6A6,      0, /* 0x00 */
-    0xD8BE,      0,      0, 0xB9C4,      0, 0xF8AE,      0, 0xD8BB, /* 0x10 */
-         0, 0xDCB1,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xCAF3,      0, 0xF7F7,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xF7F8,      0,      0, 0xF7F9, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0, 0xF7FB, /* 0x30 */
-         0, 0xF7FA,      0, 0xB1C7,      0, 0xF7FC, 0xF7FD,      0, /* 0x30 */
-         0,      0,      0,      0, 0xF7FE,      0,      0,      0, /* 0x40 */
-         0,      0, 0xC6EB, 0xD5AB,      0,      0,      0, 0xECB4, /* 0x40 */
-         0,      0, 0xB3DD,      0, 0xF6B3,      0,      0,      0, /* 0x50 */
-         0, 0xF6B5,      0,      0, 0xF6B7,      0,      0, 0xF6B4, /* 0x50 */
-    0xF6B6, 0xC1E4,      0, 0xF8AA,      0,      0, 0xF6B8,      0, /* 0x60 */
-         0,      0, 0xF6BA,      0, 0xF6B9,      0,      0,      0, /* 0x60 */
-         0,      0, 0xC8A3,      0,      0,      0,      0, 0xF6BB, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xC1FA,      0,      0, /* 0x80 */
-    0xC5D3,      0,      0,      0, 0xB9A8, 0xEDE8,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xB9EA,      0,      0,      0, /* 0x90 */
-    0xD9DF                                                          /* 0xA0 */
+            0xF6BE, 	 0, 	 0, 	 0, 	 0, 0xB6A6, 	 0, /* 0x00 */
+    0xD8BE, 	 0, 	 0, 0xB9C4, 	 0, 0xF8AE, 	 0, 0xD8BB, /* 0x10 */
+         0, 0xDCB1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xCAF3, 	 0, 0xF7F7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xF7F8, 	 0, 	 0, 0xF7F9, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF7FB, /* 0x30 */
+         0, 0xF7FA, 	 0, 0xB1C7, 	 0, 0xF7FC, 0xF7FD, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xF7FE, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xC6EB, 0xD5AB, 	 0, 	 0, 	 0, 0xECB4, /* 0x40 */
+         0, 	 0, 0xB3DD, 	 0, 0xF6B3, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xF6B5, 	 0, 	 0, 0xF6B7, 	 0, 	 0, 0xF6B4, /* 0x50 */
+    0xF6B6, 0xC1E4, 	 0, 0xF8AA, 	 0, 	 0, 0xF6B8, 	 0, /* 0x60 */
+         0, 	 0, 0xF6BA, 	 0, 0xF6B9, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xC8A3, 	 0, 	 0, 	 0, 	 0, 0xF6BB, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC1FA, 	 0, 	 0, /* 0x80 */
+    0xC5D3, 	 0, 	 0, 	 0, 0xB9A8, 0xEDE8, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xB9EA, 	 0, 	 0, 	 0, /* 0x90 */
+    0xD9DF															/* 0xA0 */
                                                                     /* 0xA0 */
 };
diff --git a/sal/textenc/tcvtscn6.tab b/sal/textenc/tcvtscn6.tab
index 8a8cafc725d8..fd6ce537fe47 100644
--- a/sal/textenc/tcvtscn6.tab
+++ b/sal/textenc/tcvtscn6.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/tcvtsym1.tab b/sal/textenc/tcvtsym1.tab
index 6bbeb62ac55a..0e9bd5612b9b 100644
--- a/sal/textenc/tcvtsym1.tab
+++ b/sal/textenc/tcvtsym1.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/tcvttcn1.tab b/sal/textenc/tcvttcn1.tab
index 18d96b090393..2c59bb56f769 100644
--- a/sal/textenc/tcvttcn1.tab
+++ b/sal/textenc/tcvttcn1.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,8 +44,8 @@
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_A1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x3000, 0xFF0C, 0x3001, 0x3002, 0xFF0E, 0x2027, 0xFF1B, 0xFF1A, /* 0x40 */
     0xFF1F, 0xFF01, 0xFE30, 0x2026, 0x2025, 0xFE50, 0xFE51, 0xFE52, /* 0x40 */
     0x00B7, 0xFE54, 0xFE55, 0xFE56, 0xFE57, 0xFF5C, 0x2013, 0xFE31, /* 0x50 */
@@ -53,11 +53,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A1[] =
     0xFE36, 0xFF5B, 0xFF5D, 0xFE37, 0xFE38, 0x3014, 0x3015, 0xFE39, /* 0x60 */
     0xFE3A, 0x3010, 0x3011, 0xFE3B, 0xFE3C, 0x300A, 0x300B, 0xFE3D, /* 0x60 */
     0xFE3E, 0x3008, 0x3009, 0xFE3F, 0xFE40, 0x300C, 0x300D, 0xFE41, /* 0x70 */
-    0xFE42, 0x300E, 0x300F, 0xFE43, 0xFE44, 0xFE59, 0xFE5A,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0xFE42, 0x300E, 0x300F, 0xFE43, 0xFE44, 0xFE59, 0xFE5A, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0xFE5B, 0xFE5C, 0xFE5D, 0xFE5E, 0x2018, 0x2019, 0x201C, /* 0xA0 */
     0x201D, 0x301D, 0x301E, 0x2035, 0x2032, 0xFF03, 0xFF06, 0xFF0A, /* 0xA0 */
     0x203B, 0x00A7, 0x3003, 0x25CB, 0x25CF, 0x25B3, 0x25B2, 0x25CE, /* 0xB0 */
@@ -69,7 +69,7 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A1[] =
     0xFE64, 0xFE65, 0xFE66, 0xFF5E, 0x2229, 0x222A, 0x22A5, 0x2220, /* 0xE0 */
     0x221F, 0x22BF, 0x33D2, 0x33D1, 0x222B, 0x222E, 0x2235, 0x2234, /* 0xE0 */
     0x2640, 0x2642, 0x2295, 0x2299, 0x2191, 0x2193, 0x2190, 0x2192, /* 0xF0 */
-    0x2196, 0x2197, 0x2199, 0x2198, 0x2225, 0x2223, 0xFF0F          /* 0xF0 */
+    0x2196, 0x2197, 0x2199, 0x2198, 0x2225, 0x2223, 0xFF0F			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -85,8 +85,8 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A1[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_A2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xFF3C, 0x2215, 0xFE68, 0xFF04, 0xFFE5, 0x3012, 0xFFE0, 0xFFE1, /* 0x40 */
     0xFF05, 0xFF20, 0x2103, 0x2109, 0xFE69, 0xFE6A, 0xFE6B, 0x33D5, /* 0x40 */
     0x339C, 0x339D, 0x339E, 0x33CE, 0x33A1, 0x338E, 0x338F, 0x33C4, /* 0x50 */
@@ -94,11 +94,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A2[] =
     0x74E9, 0x7CCE, 0x2581, 0x2582, 0x2583, 0x2584, 0x2585, 0x2586, /* 0x60 */
     0x2587, 0x2588, 0x258F, 0x258E, 0x258D, 0x258C, 0x258B, 0x258A, /* 0x60 */
     0x2589, 0x253C, 0x2534, 0x252C, 0x2524, 0x251C, 0x2594, 0x2500, /* 0x70 */
-    0x2502, 0x2595, 0x250C, 0x2510, 0x2514, 0x2518, 0x256D,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x2502, 0x2595, 0x250C, 0x2510, 0x2514, 0x2518, 0x256D, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x256E, 0x2570, 0x256F, 0x2550, 0x255E, 0x256A, 0x2561, /* 0xA0 */
     0x25E2, 0x25E3, 0x25E5, 0x25E4, 0x2571, 0x2572, 0x2573, 0xFF10, /* 0xA0 */
     0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17, 0xFF18, /* 0xB0 */
@@ -110,7 +110,7 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A2[] =
     0xFF32, 0xFF33, 0xFF34, 0xFF35, 0xFF36, 0xFF37, 0xFF38, 0xFF39, /* 0xE0 */
     0xFF3A, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47, /* 0xE0 */
     0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F, /* 0xF0 */
-    0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56          /* 0xF0 */
+    0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -119,8 +119,8 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A2[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_A3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xFF57, 0xFF58, 0xFF59, 0xFF5A, 0x0391, 0x0392, 0x0393, 0x0394, /* 0x40 */
     0x0395, 0x0396, 0x0397, 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, /* 0x40 */
     0x039D, 0x039E, 0x039F, 0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5, /* 0x50 */
@@ -128,31 +128,31 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A3[] =
     0x03B5, 0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, /* 0x60 */
     0x03BD, 0x03BE, 0x03BF, 0x03C0, 0x03C1, 0x03C3, 0x03C4, 0x03C5, /* 0x60 */
     0x03C6, 0x03C7, 0x03C8, 0x03C9, 0x3105, 0x3106, 0x3107, 0x3108, /* 0x70 */
-    0x3109, 0x310A, 0x310B, 0x310C, 0x310D, 0x310E, 0x310F,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x3109, 0x310A, 0x310B, 0x310C, 0x310D, 0x310E, 0x310F, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x3110, 0x3111, 0x3112, 0x3113, 0x3114, 0x3115, 0x3116, /* 0xA0 */
     0x3117, 0x3118, 0x3119, 0x311A, 0x311B, 0x311C, 0x311D, 0x311E, /* 0xA0 */
     0x311F, 0x3120, 0x3121, 0x3122, 0x3123, 0x3124, 0x3125, 0x3126, /* 0xB0 */
     0x3127, 0x3128, 0x3129, 0x02D9, 0x02C9, 0x02CA, 0x02C7, 0x02CB, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0x20AC,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0,      0,      0          /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0x20AC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_A4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x4E00, 0x4E59, 0x4E01, 0x4E03, 0x4E43, 0x4E5D, 0x4E86, 0x4E8C, /* 0x40 */
     0x4EBA, 0x513F, 0x5165, 0x516B, 0x51E0, 0x5200, 0x5201, 0x529B, /* 0x40 */
     0x5315, 0x5341, 0x535C, 0x53C8, 0x4E09, 0x4E0B, 0x4E08, 0x4E0A, /* 0x50 */
@@ -160,11 +160,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A4[] =
     0x4EA1, 0x5140, 0x5203, 0x52FA, 0x5343, 0x53C9, 0x53E3, 0x571F, /* 0x60 */
     0x58EB, 0x5915, 0x5927, 0x5973, 0x5B50, 0x5B51, 0x5B53, 0x5BF8, /* 0x60 */
     0x5C0F, 0x5C22, 0x5C38, 0x5C71, 0x5DDD, 0x5DE5, 0x5DF1, 0x5DF2, /* 0x70 */
-    0x5DF3, 0x5DFE, 0x5E72, 0x5EFE, 0x5F0B, 0x5F13, 0x624D,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x5DF3, 0x5DFE, 0x5E72, 0x5EFE, 0x5F0B, 0x5F13, 0x624D, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x4E11, 0x4E10, 0x4E0D, 0x4E2D, 0x4E30, 0x4E39, 0x4E4B, /* 0xA0 */
     0x5C39, 0x4E88, 0x4E91, 0x4E95, 0x4E92, 0x4E94, 0x4EA2, 0x4EC1, /* 0xA0 */
     0x4EC0, 0x4EC3, 0x4EC6, 0x4EC7, 0x4ECD, 0x4ECA, 0x4ECB, 0x4EC4, /* 0xB0 */
@@ -176,15 +176,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A4[] =
     0x6208, 0x6236, 0x624B, 0x624E, 0x652F, 0x6587, 0x6597, 0x65A4, /* 0xE0 */
     0x65B9, 0x65E5, 0x66F0, 0x6708, 0x6728, 0x6B20, 0x6B62, 0x6B79, /* 0xE0 */
     0x6BCB, 0x6BD4, 0x6BDB, 0x6C0F, 0x6C34, 0x706B, 0x722A, 0x7236, /* 0xF0 */
-    0x723B, 0x7247, 0x7259, 0x725B, 0x72AC, 0x738B, 0x4E19          /* 0xF0 */
+    0x723B, 0x7247, 0x7259, 0x725B, 0x72AC, 0x738B, 0x4E19			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_A5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x4E16, 0x4E15, 0x4E14, 0x4E18, 0x4E3B, 0x4E4D, 0x4E4F, 0x4E4E, /* 0x40 */
     0x4EE5, 0x4ED8, 0x4ED4, 0x4ED5, 0x4ED6, 0x4ED7, 0x4EE3, 0x4EE4, /* 0x40 */
     0x4ED9, 0x4EDE, 0x5145, 0x5144, 0x5189, 0x518A, 0x51AC, 0x51F9, /* 0x50 */
@@ -192,11 +192,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A5[] =
     0x531D, 0x4EDF, 0x534A, 0x5349, 0x5361, 0x5360, 0x536F, 0x536E, /* 0x60 */
     0x53BB, 0x53EF, 0x53E4, 0x53F3, 0x53EC, 0x53EE, 0x53E9, 0x53E8, /* 0x60 */
     0x53FC, 0x53F8, 0x53F5, 0x53EB, 0x53E6, 0x53EA, 0x53F2, 0x53F1, /* 0x70 */
-    0x53F0, 0x53E5, 0x53ED, 0x53FB, 0x56DB, 0x56DA, 0x5916,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x53F0, 0x53E5, 0x53ED, 0x53FB, 0x56DB, 0x56DA, 0x5916, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x592E, 0x5931, 0x5974, 0x5976, 0x5B55, 0x5B83, 0x5C3C, /* 0xA0 */
     0x5DE8, 0x5DE7, 0x5DE6, 0x5E02, 0x5E03, 0x5E73, 0x5E7C, 0x5F01, /* 0xA0 */
     0x5F18, 0x5F17, 0x5FC5, 0x620A, 0x6253, 0x6254, 0x6252, 0x6251, /* 0xB0 */
@@ -208,15 +208,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A5[] =
     0x4E1E, 0x4E1F, 0x4E52, 0x4E53, 0x4E69, 0x4E99, 0x4EA4, 0x4EA6, /* 0xE0 */
     0x4EA5, 0x4EFF, 0x4F09, 0x4F19, 0x4F0A, 0x4F15, 0x4F0D, 0x4F10, /* 0xE0 */
     0x4F11, 0x4F0F, 0x4EF2, 0x4EF6, 0x4EFB, 0x4EF0, 0x4EF3, 0x4EFD, /* 0xF0 */
-    0x4F01, 0x4F0B, 0x5149, 0x5147, 0x5146, 0x5148, 0x5168          /* 0xF0 */
+    0x4F01, 0x4F0B, 0x5149, 0x5147, 0x5146, 0x5148, 0x5168			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_A6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5171, 0x518D, 0x51B0, 0x5217, 0x5211, 0x5212, 0x520E, 0x5216, /* 0x40 */
     0x52A3, 0x5308, 0x5321, 0x5320, 0x5370, 0x5371, 0x5409, 0x540F, /* 0x40 */
     0x540C, 0x540A, 0x5410, 0x5401, 0x540B, 0x5404, 0x5411, 0x540D, /* 0x50 */
@@ -224,11 +224,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A6[] =
     0x5733, 0x5730, 0x5728, 0x572D, 0x572C, 0x572F, 0x5729, 0x5919, /* 0x60 */
     0x591A, 0x5937, 0x5938, 0x5984, 0x5978, 0x5983, 0x597D, 0x5979, /* 0x60 */
     0x5982, 0x5981, 0x5B57, 0x5B58, 0x5B87, 0x5B88, 0x5B85, 0x5B89, /* 0x70 */
-    0x5BFA, 0x5C16, 0x5C79, 0x5DDE, 0x5E06, 0x5E76, 0x5E74,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x5BFA, 0x5C16, 0x5C79, 0x5DDE, 0x5E06, 0x5E76, 0x5E74, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x5F0F, 0x5F1B, 0x5FD9, 0x5FD6, 0x620E, 0x620C, 0x620D, /* 0xA0 */
     0x6210, 0x6263, 0x625B, 0x6258, 0x6536, 0x65E9, 0x65E8, 0x65EC, /* 0xA0 */
     0x65ED, 0x66F2, 0x66F3, 0x6709, 0x673D, 0x6734, 0x6731, 0x6735, /* 0xB0 */
@@ -240,15 +240,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A6[] =
     0x821F, 0x826E, 0x8272, 0x827E, 0x866B, 0x8840, 0x884C, 0x8863, /* 0xE0 */
     0x897F, 0x9621, 0x4E32, 0x4EA8, 0x4F4D, 0x4F4F, 0x4F47, 0x4F57, /* 0xE0 */
     0x4F5E, 0x4F34, 0x4F5B, 0x4F55, 0x4F30, 0x4F50, 0x4F51, 0x4F3D, /* 0xF0 */
-    0x4F3A, 0x4F38, 0x4F43, 0x4F54, 0x4F3C, 0x4F46, 0x4F63          /* 0xF0 */
+    0x4F3A, 0x4F38, 0x4F43, 0x4F54, 0x4F3C, 0x4F46, 0x4F63			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_A7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x4F5C, 0x4F60, 0x4F2F, 0x4F4E, 0x4F36, 0x4F59, 0x4F5D, 0x4F48, /* 0x40 */
     0x4F5A, 0x514C, 0x514B, 0x514D, 0x5175, 0x51B6, 0x51B7, 0x5225, /* 0x40 */
     0x5224, 0x5229, 0x522A, 0x5228, 0x52AB, 0x52A9, 0x52AA, 0x52AC, /* 0x50 */
@@ -256,11 +256,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A7[] =
     0x544E, 0x5427, 0x5446, 0x5443, 0x5433, 0x5448, 0x5442, 0x541B, /* 0x60 */
     0x5429, 0x544A, 0x5439, 0x543B, 0x5438, 0x542E, 0x5435, 0x5436, /* 0x60 */
     0x5420, 0x543C, 0x5440, 0x5431, 0x542B, 0x541F, 0x542C, 0x56EA, /* 0x70 */
-    0x56F0, 0x56E4, 0x56EB, 0x574A, 0x5751, 0x5740, 0x574D,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x56F0, 0x56E4, 0x56EB, 0x574A, 0x5751, 0x5740, 0x574D, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x5747, 0x574E, 0x573E, 0x5750, 0x574F, 0x573B, 0x58EF, /* 0xA0 */
     0x593E, 0x599D, 0x5992, 0x59A8, 0x599E, 0x59A3, 0x5999, 0x5996, /* 0xA0 */
     0x598D, 0x59A4, 0x5993, 0x598A, 0x59A5, 0x5B5D, 0x5B5C, 0x5B5A, /* 0xB0 */
@@ -272,15 +272,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A7[] =
     0x6289, 0x626D, 0x628A, 0x627C, 0x627E, 0x6279, 0x6273, 0x6292, /* 0xE0 */
     0x626F, 0x6298, 0x626E, 0x6295, 0x6293, 0x6291, 0x6286, 0x6539, /* 0xE0 */
     0x653B, 0x6538, 0x65F1, 0x66F4, 0x675F, 0x674E, 0x674F, 0x6750, /* 0xF0 */
-    0x6751, 0x675C, 0x6756, 0x675E, 0x6749, 0x6746, 0x6760          /* 0xF0 */
+    0x6751, 0x675C, 0x6756, 0x675E, 0x6749, 0x6746, 0x6760			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_A8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6753, 0x6757, 0x6B65, 0x6BCF, 0x6C42, 0x6C5E, 0x6C99, 0x6C81, /* 0x40 */
     0x6C88, 0x6C89, 0x6C85, 0x6C9B, 0x6C6A, 0x6C7A, 0x6C90, 0x6C70, /* 0x40 */
     0x6C8C, 0x6C68, 0x6C96, 0x6C92, 0x6C7D, 0x6C83, 0x6C72, 0x6C7E, /* 0x50 */
@@ -288,11 +288,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A8[] =
     0x707C, 0x707D, 0x7078, 0x7262, 0x7261, 0x7260, 0x72C4, 0x72C2, /* 0x60 */
     0x7396, 0x752C, 0x752B, 0x7537, 0x7538, 0x7682, 0x76EF, 0x77E3, /* 0x60 */
     0x79C1, 0x79C0, 0x79BF, 0x7A76, 0x7CFB, 0x7F55, 0x8096, 0x8093, /* 0x70 */
-    0x809D, 0x8098, 0x809B, 0x809A, 0x80B2, 0x826F, 0x8292,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x809D, 0x8098, 0x809B, 0x809A, 0x80B2, 0x826F, 0x8292, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x828B, 0x828D, 0x898B, 0x89D2, 0x8A00, 0x8C37, 0x8C46, /* 0xA0 */
     0x8C55, 0x8C9D, 0x8D64, 0x8D70, 0x8DB3, 0x8EAB, 0x8ECA, 0x8F9B, /* 0xA0 */
     0x8FB0, 0x8FC2, 0x8FC6, 0x8FC5, 0x8FC4, 0x5DE1, 0x9091, 0x90A2, /* 0xB0 */
@@ -304,15 +304,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A8[] =
     0x5152, 0x5155, 0x5169, 0x5177, 0x5176, 0x5178, 0x51BD, 0x51FD, /* 0xE0 */
     0x523B, 0x5238, 0x5237, 0x523A, 0x5230, 0x522E, 0x5236, 0x5241, /* 0xE0 */
     0x52BE, 0x52BB, 0x5352, 0x5354, 0x5353, 0x5351, 0x5366, 0x5377, /* 0xF0 */
-    0x5378, 0x5379, 0x53D6, 0x53D4, 0x53D7, 0x5473, 0x5475          /* 0xF0 */
+    0x5378, 0x5379, 0x53D6, 0x53D4, 0x53D7, 0x5473, 0x5475			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_A9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5496, 0x5478, 0x5495, 0x5480, 0x547B, 0x5477, 0x5484, 0x5492, /* 0x40 */
     0x5486, 0x547C, 0x5490, 0x5471, 0x5476, 0x548C, 0x549A, 0x5462, /* 0x40 */
     0x5468, 0x548B, 0x547D, 0x548E, 0x56FA, 0x5783, 0x5777, 0x576A, /* 0x50 */
@@ -320,11 +320,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A9[] =
     0x5948, 0x5944, 0x5954, 0x59BE, 0x59BB, 0x59D4, 0x59B9, 0x59AE, /* 0x60 */
     0x59D1, 0x59C6, 0x59D0, 0x59CD, 0x59CB, 0x59D3, 0x59CA, 0x59AF, /* 0x60 */
     0x59B3, 0x59D2, 0x59C5, 0x5B5F, 0x5B64, 0x5B63, 0x5B97, 0x5B9A, /* 0x70 */
-    0x5B98, 0x5B9C, 0x5B99, 0x5B9B, 0x5C1A, 0x5C48, 0x5C45,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x5B98, 0x5B9C, 0x5B99, 0x5B9B, 0x5C1A, 0x5C48, 0x5C45, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x5C46, 0x5CB7, 0x5CA1, 0x5CB8, 0x5CA9, 0x5CAB, 0x5CB1, /* 0xA0 */
     0x5CB3, 0x5E18, 0x5E1A, 0x5E16, 0x5E15, 0x5E1B, 0x5E11, 0x5E78, /* 0xA0 */
     0x5E9A, 0x5E97, 0x5E9C, 0x5E95, 0x5E96, 0x5EF6, 0x5F26, 0x5F27, /* 0xB0 */
@@ -336,15 +336,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_A9[] =
     0x62C8, 0x62A8, 0x62BD, 0x62BC, 0x62D0, 0x62D9, 0x62C7, 0x62CD, /* 0xE0 */
     0x62B5, 0x62DA, 0x62B1, 0x62D8, 0x62D6, 0x62D7, 0x62C6, 0x62AC, /* 0xE0 */
     0x62CE, 0x653E, 0x65A7, 0x65BC, 0x65FA, 0x6614, 0x6613, 0x660C, /* 0xF0 */
-    0x6606, 0x6602, 0x660E, 0x6600, 0x660F, 0x6615, 0x660A          /* 0xF0 */
+    0x6606, 0x6602, 0x660E, 0x6600, 0x660F, 0x6615, 0x660A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_AA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6607, 0x670D, 0x670B, 0x676D, 0x678B, 0x6795, 0x6771, 0x679C, /* 0x40 */
     0x6773, 0x6777, 0x6787, 0x679D, 0x6797, 0x676F, 0x6770, 0x677F, /* 0x40 */
     0x6789, 0x677E, 0x6790, 0x6775, 0x679A, 0x6793, 0x677C, 0x676A, /* 0x50 */
@@ -352,11 +352,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_AA[] =
     0x6CE8, 0x6CF3, 0x6CB1, 0x6CCC, 0x6CE5, 0x6CB3, 0x6CBD, 0x6CBE, /* 0x60 */
     0x6CBC, 0x6CE2, 0x6CAB, 0x6CD5, 0x6CD3, 0x6CB8, 0x6CC4, 0x6CB9, /* 0x60 */
     0x6CC1, 0x6CAE, 0x6CD7, 0x6CC5, 0x6CF1, 0x6CBF, 0x6CBB, 0x6CE1, /* 0x70 */
-    0x6CDB, 0x6CCA, 0x6CAC, 0x6CEF, 0x6CDC, 0x6CD6, 0x6CE0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x6CDB, 0x6CCA, 0x6CAC, 0x6CEF, 0x6CDC, 0x6CD6, 0x6CE0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x7095, 0x708E, 0x7092, 0x708A, 0x7099, 0x722C, 0x722D, /* 0xA0 */
     0x7238, 0x7248, 0x7267, 0x7269, 0x72C0, 0x72CE, 0x72D9, 0x72D7, /* 0xA0 */
     0x72D0, 0x73A9, 0x73A8, 0x739F, 0x73AB, 0x73A5, 0x753D, 0x759D, /* 0xB0 */
@@ -368,15 +368,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_AA[] =
     0x82B9, 0x82B1, 0x82AC, 0x82A5, 0x82AF, 0x82B8, 0x82A3, 0x82B0, /* 0xE0 */
     0x82BE, 0x82B7, 0x864E, 0x8671, 0x521D, 0x8868, 0x8ECB, 0x8FCE, /* 0xE0 */
     0x8FD4, 0x8FD1, 0x90B5, 0x90B8, 0x90B1, 0x90B6, 0x91C7, 0x91D1, /* 0xF0 */
-    0x9577, 0x9580, 0x961C, 0x9640, 0x963F, 0x963B, 0x9644          /* 0xF0 */
+    0x9577, 0x9580, 0x961C, 0x9640, 0x963F, 0x963B, 0x9644			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_AB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9642, 0x96B9, 0x96E8, 0x9752, 0x975E, 0x4E9F, 0x4EAD, 0x4EAE, /* 0x40 */
     0x4FE1, 0x4FB5, 0x4FAF, 0x4FBF, 0x4FE0, 0x4FD1, 0x4FCF, 0x4FDD, /* 0x40 */
     0x4FC3, 0x4FB6, 0x4FD8, 0x4FDF, 0x4FCA, 0x4FD7, 0x4FAE, 0x4FD0, /* 0x50 */
@@ -384,11 +384,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_AB[] =
     0x5191, 0x51A0, 0x524E, 0x5243, 0x524A, 0x524D, 0x524C, 0x524B, /* 0x60 */
     0x5247, 0x52C7, 0x52C9, 0x52C3, 0x52C1, 0x530D, 0x5357, 0x537B, /* 0x60 */
     0x539A, 0x53DB, 0x54AC, 0x54C0, 0x54A8, 0x54CE, 0x54C9, 0x54B8, /* 0x70 */
-    0x54A6, 0x54B3, 0x54C7, 0x54C2, 0x54BD, 0x54AA, 0x54C1,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x54A6, 0x54B3, 0x54C7, 0x54C2, 0x54BD, 0x54AA, 0x54C1, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x54C4, 0x54C8, 0x54AF, 0x54AB, 0x54B1, 0x54BB, 0x54A9, /* 0xA0 */
     0x54A7, 0x54BF, 0x56FF, 0x5782, 0x578B, 0x57A0, 0x57A3, 0x57A2, /* 0xA0 */
     0x57CE, 0x57AE, 0x5793, 0x5955, 0x5951, 0x594F, 0x594E, 0x5950, /* 0xB0 */
@@ -400,15 +400,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_AB[] =
     0x5F87, 0x5F8C, 0x5F89, 0x6012, 0x601D, 0x6020, 0x6025, 0x600E, /* 0xE0 */
     0x6028, 0x604D, 0x6070, 0x6068, 0x6062, 0x6046, 0x6043, 0x606C, /* 0xE0 */
     0x606B, 0x606A, 0x6064, 0x6241, 0x62DC, 0x6316, 0x6309, 0x62FC, /* 0xF0 */
-    0x62ED, 0x6301, 0x62EE, 0x62FD, 0x6307, 0x62F1, 0x62F7          /* 0xF0 */
+    0x62ED, 0x6301, 0x62EE, 0x62FD, 0x6307, 0x62F1, 0x62F7			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_AC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x62EF, 0x62EC, 0x62FE, 0x62F4, 0x6311, 0x6302, 0x653F, 0x6545, /* 0x40 */
     0x65AB, 0x65BD, 0x65E2, 0x6625, 0x662D, 0x6620, 0x6627, 0x662F, /* 0x40 */
     0x661F, 0x6628, 0x6631, 0x6624, 0x66F7, 0x67FF, 0x67D3, 0x67F1, /* 0x50 */
@@ -416,11 +416,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_AC[] =
     0x67C4, 0x67D1, 0x67B4, 0x67DA, 0x67E5, 0x67B8, 0x67CF, 0x67DE, /* 0x60 */
     0x67F3, 0x67B0, 0x67D9, 0x67E2, 0x67DD, 0x67D2, 0x6B6A, 0x6B83, /* 0x60 */
     0x6B86, 0x6BB5, 0x6BD2, 0x6BD7, 0x6C1F, 0x6CC9, 0x6D0B, 0x6D32, /* 0x70 */
-    0x6D2A, 0x6D41, 0x6D25, 0x6D0C, 0x6D31, 0x6D1E, 0x6D17,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x6D2A, 0x6D41, 0x6D25, 0x6D0C, 0x6D31, 0x6D1E, 0x6D17, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x6D3B, 0x6D3D, 0x6D3E, 0x6D36, 0x6D1B, 0x6CF5, 0x6D39, /* 0xA0 */
     0x6D27, 0x6D38, 0x6D29, 0x6D2E, 0x6D35, 0x6D0E, 0x6D2B, 0x70AB, /* 0xA0 */
     0x70BA, 0x70B3, 0x70AC, 0x70AF, 0x70AD, 0x70B8, 0x70AE, 0x70A4, /* 0xB0 */
@@ -432,15 +432,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_AC[] =
     0x7707, 0x77DC, 0x7802, 0x7814, 0x780C, 0x780D, 0x7946, 0x7949, /* 0xE0 */
     0x7948, 0x7947, 0x79B9, 0x79BA, 0x79D1, 0x79D2, 0x79CB, 0x7A7F, /* 0xE0 */
     0x7A81, 0x7AFF, 0x7AFD, 0x7C7D, 0x7D02, 0x7D05, 0x7D00, 0x7D09, /* 0xF0 */
-    0x7D07, 0x7D04, 0x7D06, 0x7F38, 0x7F8E, 0x7FBF, 0x8004          /* 0xF0 */
+    0x7D07, 0x7D04, 0x7D06, 0x7F38, 0x7F8E, 0x7FBF, 0x8004			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_AD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8010, 0x800D, 0x8011, 0x8036, 0x80D6, 0x80E5, 0x80DA, 0x80C3, /* 0x40 */
     0x80C4, 0x80CC, 0x80E1, 0x80DB, 0x80CE, 0x80DE, 0x80E4, 0x80DD, /* 0x40 */
     0x81F4, 0x8222, 0x82E7, 0x8303, 0x8305, 0x82E3, 0x82DB, 0x82E6, /* 0x50 */
@@ -448,11 +448,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_AD[] =
     0x82DC, 0x82D4, 0x82D1, 0x82DE, 0x82D3, 0x82DF, 0x82EF, 0x8306, /* 0x60 */
     0x8650, 0x8679, 0x867B, 0x867A, 0x884D, 0x886B, 0x8981, 0x89D4, /* 0x60 */
     0x8A08, 0x8A02, 0x8A03, 0x8C9E, 0x8CA0, 0x8D74, 0x8D73, 0x8DB4, /* 0x70 */
-    0x8ECD, 0x8ECC, 0x8FF0, 0x8FE6, 0x8FE2, 0x8FEA, 0x8FE5,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x8ECD, 0x8ECC, 0x8FF0, 0x8FE6, 0x8FE2, 0x8FEA, 0x8FE5, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x8FED, 0x8FEB, 0x8FE4, 0x8FE8, 0x90CA, 0x90CE, 0x90C1, /* 0xA0 */
     0x90C3, 0x914B, 0x914A, 0x91CD, 0x9582, 0x9650, 0x964B, 0x964C, /* 0xA0 */
     0x964D, 0x9762, 0x9769, 0x97CB, 0x97ED, 0x97F3, 0x9801, 0x98A8, /* 0xB0 */
@@ -464,15 +464,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_AD[] =
     0x51A2, 0x51CD, 0x51CC, 0x51C6, 0x51CB, 0x5256, 0x525C, 0x5254, /* 0xE0 */
     0x525B, 0x525D, 0x532A, 0x537F, 0x539F, 0x539D, 0x53DF, 0x54E8, /* 0xE0 */
     0x5510, 0x5501, 0x5537, 0x54FC, 0x54E5, 0x54F2, 0x5506, 0x54FA, /* 0xF0 */
-    0x5514, 0x54E9, 0x54ED, 0x54E1, 0x5509, 0x54EE, 0x54EA          /* 0xF0 */
+    0x5514, 0x54E9, 0x54ED, 0x54E1, 0x5509, 0x54EE, 0x54EA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_AE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x54E6, 0x5527, 0x5507, 0x54FD, 0x550F, 0x5703, 0x5704, 0x57C2, /* 0x40 */
     0x57D4, 0x57CB, 0x57C3, 0x5809, 0x590F, 0x5957, 0x5958, 0x595A, /* 0x40 */
     0x5A11, 0x5A18, 0x5A1C, 0x5A1F, 0x5A1B, 0x5A13, 0x59EC, 0x5A20, /* 0x50 */
@@ -480,11 +480,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_AE[] =
     0x5BB3, 0x5BB6, 0x5BB4, 0x5BAE, 0x5BB5, 0x5BB9, 0x5BB8, 0x5C04, /* 0x60 */
     0x5C51, 0x5C55, 0x5C50, 0x5CED, 0x5CFD, 0x5CFB, 0x5CEA, 0x5CE8, /* 0x60 */
     0x5CF0, 0x5CF6, 0x5D01, 0x5CF4, 0x5DEE, 0x5E2D, 0x5E2B, 0x5EAB, /* 0x70 */
-    0x5EAD, 0x5EA7, 0x5F31, 0x5F92, 0x5F91, 0x5F90, 0x6059,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x5EAD, 0x5EA7, 0x5F31, 0x5F92, 0x5F91, 0x5F90, 0x6059, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x6063, 0x6065, 0x6050, 0x6055, 0x606D, 0x6069, 0x606F, /* 0xA0 */
     0x6084, 0x609F, 0x609A, 0x608D, 0x6094, 0x608C, 0x6085, 0x6096, /* 0xA0 */
     0x6247, 0x62F3, 0x6308, 0x62FF, 0x634E, 0x633E, 0x632F, 0x6355, /* 0xB0 */
@@ -496,15 +496,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_AE[] =
     0x684C, 0x6851, 0x683D, 0x67F4, 0x6850, 0x6840, 0x683C, 0x6843, /* 0xE0 */
     0x682A, 0x6845, 0x6813, 0x6818, 0x6841, 0x6B8A, 0x6B89, 0x6BB7, /* 0xE0 */
     0x6C23, 0x6C27, 0x6C28, 0x6C26, 0x6C24, 0x6CF0, 0x6D6A, 0x6D95, /* 0xF0 */
-    0x6D88, 0x6D87, 0x6D66, 0x6D78, 0x6D77, 0x6D59, 0x6D93          /* 0xF0 */
+    0x6D88, 0x6D87, 0x6D66, 0x6D78, 0x6D77, 0x6D59, 0x6D93			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_AF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6D6C, 0x6D89, 0x6D6E, 0x6D5A, 0x6D74, 0x6D69, 0x6D8C, 0x6D8A, /* 0x40 */
     0x6D79, 0x6D85, 0x6D65, 0x6D94, 0x70CA, 0x70D8, 0x70E4, 0x70D9, /* 0x40 */
     0x70C8, 0x70CF, 0x7239, 0x7279, 0x72FC, 0x72F9, 0x72FD, 0x72F8, /* 0x50 */
@@ -512,11 +512,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_AF[] =
     0x7554, 0x755D, 0x755C, 0x755A, 0x7559, 0x75BE, 0x75C5, 0x75C7, /* 0x60 */
     0x75B2, 0x75B3, 0x75BD, 0x75BC, 0x75B9, 0x75C2, 0x75B8, 0x768B, /* 0x60 */
     0x76B0, 0x76CA, 0x76CD, 0x76CE, 0x7729, 0x771F, 0x7720, 0x7728, /* 0x70 */
-    0x77E9, 0x7830, 0x7827, 0x7838, 0x781D, 0x7834, 0x7837,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x77E9, 0x7830, 0x7827, 0x7838, 0x781D, 0x7834, 0x7837, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x7825, 0x782D, 0x7820, 0x781F, 0x7832, 0x7955, 0x7950, /* 0xA0 */
     0x7960, 0x795F, 0x7956, 0x795E, 0x795D, 0x7957, 0x795A, 0x79E4, /* 0xA0 */
     0x79E3, 0x79E7, 0x79DF, 0x79E6, 0x79E9, 0x79D8, 0x7A84, 0x7A88, /* 0xB0 */
@@ -528,15 +528,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_AF[] =
     0x80FD, 0x810A, 0x80FC, 0x80EF, 0x81ED, 0x81EC, 0x8200, 0x8210, /* 0xE0 */
     0x822A, 0x822B, 0x8228, 0x822C, 0x82BB, 0x832B, 0x8352, 0x8354, /* 0xE0 */
     0x834A, 0x8338, 0x8350, 0x8349, 0x8335, 0x8334, 0x834F, 0x8332, /* 0xF0 */
-    0x8339, 0x8336, 0x8317, 0x8340, 0x8331, 0x8328, 0x8343          /* 0xF0 */
+    0x8339, 0x8336, 0x8317, 0x8340, 0x8331, 0x8328, 0x8343			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_B0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8654, 0x868A, 0x86AA, 0x8693, 0x86A4, 0x86A9, 0x868C, 0x86A3, /* 0x40 */
     0x869C, 0x8870, 0x8877, 0x8881, 0x8882, 0x887D, 0x8879, 0x8A18, /* 0x40 */
     0x8A10, 0x8A0E, 0x8A0C, 0x8A15, 0x8A0A, 0x8A17, 0x8A13, 0x8A16, /* 0x50 */
@@ -544,11 +544,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B0[] =
     0x8EAC, 0x8ED2, 0x8ED4, 0x8ECF, 0x8FB1, 0x9001, 0x9006, 0x8FF7, /* 0x60 */
     0x9000, 0x8FFA, 0x8FF4, 0x9003, 0x8FFD, 0x9005, 0x8FF8, 0x9095, /* 0x60 */
     0x90E1, 0x90DD, 0x90E2, 0x9152, 0x914D, 0x914C, 0x91D8, 0x91DD, /* 0x70 */
-    0x91D7, 0x91DC, 0x91D9, 0x9583, 0x9662, 0x9663, 0x9661,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x91D7, 0x91DC, 0x91D9, 0x9583, 0x9662, 0x9663, 0x9661, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x965B, 0x965D, 0x9664, 0x9658, 0x965E, 0x96BB, 0x98E2, /* 0xA0 */
     0x99AC, 0x9AA8, 0x9AD8, 0x9B25, 0x9B32, 0x9B3C, 0x4E7E, 0x507A, /* 0xA0 */
     0x507D, 0x505C, 0x5047, 0x5043, 0x504C, 0x505A, 0x5049, 0x5065, /* 0xB0 */
@@ -560,15 +560,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B0[] =
     0x5564, 0x5538, 0x552E, 0x555C, 0x552C, 0x5563, 0x5533, 0x5541, /* 0xE0 */
     0x5557, 0x5708, 0x570B, 0x5709, 0x57DF, 0x5805, 0x580A, 0x5806, /* 0xE0 */
     0x57E0, 0x57E4, 0x57FA, 0x5802, 0x5835, 0x57F7, 0x57F9, 0x5920, /* 0xF0 */
-    0x5962, 0x5A36, 0x5A41, 0x5A49, 0x5A66, 0x5A6A, 0x5A40          /* 0xF0 */
+    0x5962, 0x5A36, 0x5A41, 0x5A49, 0x5A66, 0x5A6A, 0x5A40			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_B1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5A3C, 0x5A62, 0x5A5A, 0x5A46, 0x5A4A, 0x5B70, 0x5BC7, 0x5BC5, /* 0x40 */
     0x5BC4, 0x5BC2, 0x5BBF, 0x5BC6, 0x5C09, 0x5C08, 0x5C07, 0x5C60, /* 0x40 */
     0x5C5C, 0x5C5D, 0x5D07, 0x5D06, 0x5D0E, 0x5D1B, 0x5D16, 0x5D22, /* 0x50 */
@@ -576,11 +576,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B1[] =
     0x5E38, 0x5E36, 0x5E33, 0x5E37, 0x5EB7, 0x5EB8, 0x5EB6, 0x5EB5, /* 0x60 */
     0x5EBE, 0x5F35, 0x5F37, 0x5F57, 0x5F6C, 0x5F69, 0x5F6B, 0x5F97, /* 0x60 */
     0x5F99, 0x5F9E, 0x5F98, 0x5FA1, 0x5FA0, 0x5F9C, 0x607F, 0x60A3, /* 0x70 */
-    0x6089, 0x60A0, 0x60A8, 0x60CB, 0x60B4, 0x60E6, 0x60BD,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x6089, 0x60A0, 0x60A8, 0x60CB, 0x60B4, 0x60E6, 0x60BD, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x60C5, 0x60BB, 0x60B5, 0x60DC, 0x60BC, 0x60D8, 0x60D5, /* 0xA0 */
     0x60C6, 0x60DF, 0x60B8, 0x60DA, 0x60C7, 0x621A, 0x621B, 0x6248, /* 0xA0 */
     0x63A0, 0x63A7, 0x6372, 0x6396, 0x63A2, 0x63A5, 0x6377, 0x6367, /* 0xB0 */
@@ -592,15 +592,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B1[] =
     0x6664, 0x6668, 0x6666, 0x665E, 0x66F9, 0x52D7, 0x671B, 0x6881, /* 0xE0 */
     0x68AF, 0x68A2, 0x6893, 0x68B5, 0x687F, 0x6876, 0x68B1, 0x68A7, /* 0xE0 */
     0x6897, 0x68B0, 0x6883, 0x68C4, 0x68AD, 0x6886, 0x6885, 0x6894, /* 0xF0 */
-    0x689D, 0x68A8, 0x689F, 0x68A1, 0x6882, 0x6B32, 0x6BBA          /* 0xF0 */
+    0x689D, 0x68A8, 0x689F, 0x68A1, 0x6882, 0x6B32, 0x6BBA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_B2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6BEB, 0x6BEC, 0x6C2B, 0x6D8E, 0x6DBC, 0x6DF3, 0x6DD9, 0x6DB2, /* 0x40 */
     0x6DE1, 0x6DCC, 0x6DE4, 0x6DFB, 0x6DFA, 0x6E05, 0x6DC7, 0x6DCB, /* 0x40 */
     0x6DAF, 0x6DD1, 0x6DAE, 0x6DDE, 0x6DF9, 0x6DB8, 0x6DF7, 0x6DF5, /* 0x50 */
@@ -608,11 +608,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B2[] =
     0x6DF1, 0x6DEE, 0x6DE8, 0x6DC6, 0x6DC4, 0x6DAA, 0x6DEC, 0x6DBF, /* 0x60 */
     0x6DE6, 0x70F9, 0x7109, 0x710A, 0x70FD, 0x70EF, 0x723D, 0x727D, /* 0x60 */
     0x7281, 0x731C, 0x731B, 0x7316, 0x7313, 0x7319, 0x7387, 0x7405, /* 0x70 */
-    0x740A, 0x7403, 0x7406, 0x73FE, 0x740D, 0x74E0, 0x74F6,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x740A, 0x7403, 0x7406, 0x73FE, 0x740D, 0x74E0, 0x74F6, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x74F7, 0x751C, 0x7522, 0x7565, 0x7566, 0x7562, 0x7570, /* 0xA0 */
     0x758F, 0x75D4, 0x75D5, 0x75B5, 0x75CA, 0x75CD, 0x768E, 0x76D4, /* 0xA0 */
     0x76D2, 0x76DB, 0x7737, 0x773E, 0x773C, 0x7736, 0x7738, 0x773A, /* 0xB0 */
@@ -624,15 +624,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B2[] =
     0x801C, 0x804A, 0x8046, 0x812F, 0x8116, 0x8123, 0x812B, 0x8129, /* 0xE0 */
     0x8130, 0x8124, 0x8202, 0x8235, 0x8237, 0x8236, 0x8239, 0x838E, /* 0xE0 */
     0x839E, 0x8398, 0x8378, 0x83A2, 0x8396, 0x83BD, 0x83AB, 0x8392, /* 0xF0 */
-    0x838A, 0x8393, 0x8389, 0x83A0, 0x8377, 0x837B, 0x837C          /* 0xF0 */
+    0x838A, 0x8393, 0x8389, 0x83A0, 0x8377, 0x837B, 0x837C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_B3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8386, 0x83A7, 0x8655, 0x5F6A, 0x86C7, 0x86C0, 0x86B6, 0x86C4, /* 0x40 */
     0x86B5, 0x86C6, 0x86CB, 0x86B1, 0x86AF, 0x86C9, 0x8853, 0x889E, /* 0x40 */
     0x8888, 0x88AB, 0x8892, 0x8896, 0x888D, 0x888B, 0x8993, 0x898F, /* 0x50 */
@@ -640,11 +640,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B3[] =
     0x8A22, 0x8C49, 0x8C5A, 0x8CA9, 0x8CAC, 0x8CAB, 0x8CA8, 0x8CAA, /* 0x60 */
     0x8CA7, 0x8D67, 0x8D66, 0x8DBE, 0x8DBA, 0x8EDB, 0x8EDF, 0x9019, /* 0x60 */
     0x900D, 0x901A, 0x9017, 0x9023, 0x901F, 0x901D, 0x9010, 0x9015, /* 0x70 */
-    0x901E, 0x9020, 0x900F, 0x9022, 0x9016, 0x901B, 0x9014,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x901E, 0x9020, 0x900F, 0x9022, 0x9016, 0x901B, 0x9014, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x90E8, 0x90ED, 0x90FD, 0x9157, 0x91CE, 0x91F5, 0x91E6, /* 0xA0 */
     0x91E3, 0x91E7, 0x91ED, 0x91E9, 0x9589, 0x966A, 0x9675, 0x9673, /* 0xA0 */
     0x9678, 0x9670, 0x9674, 0x9676, 0x9677, 0x966C, 0x96C0, 0x96EA, /* 0xB0 */
@@ -656,15 +656,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B3[] =
     0x55AA, 0x5594, 0x5587, 0x558B, 0x5583, 0x55B3, 0x55AE, 0x559F, /* 0xE0 */
     0x553E, 0x55B2, 0x559A, 0x55BB, 0x55AC, 0x55B1, 0x557E, 0x5589, /* 0xE0 */
     0x55AB, 0x5599, 0x570D, 0x582F, 0x582A, 0x5834, 0x5824, 0x5830, /* 0xF0 */
-    0x5831, 0x5821, 0x581D, 0x5820, 0x58F9, 0x58FA, 0x5960          /* 0xF0 */
+    0x5831, 0x5821, 0x581D, 0x5820, 0x58F9, 0x58FA, 0x5960			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_B4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5A77, 0x5A9A, 0x5A7F, 0x5A92, 0x5A9B, 0x5AA7, 0x5B73, 0x5B71, /* 0x40 */
     0x5BD2, 0x5BCC, 0x5BD3, 0x5BD0, 0x5C0A, 0x5C0B, 0x5C31, 0x5D4C, /* 0x40 */
     0x5D50, 0x5D34, 0x5D47, 0x5DFD, 0x5E45, 0x5E3D, 0x5E40, 0x5E43, /* 0x50 */
@@ -672,11 +672,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B4[] =
     0x5FAA, 0x5FA8, 0x60D1, 0x60E1, 0x60B2, 0x60B6, 0x60E0, 0x611C, /* 0x60 */
     0x6123, 0x60FA, 0x6115, 0x60F0, 0x60FB, 0x60F4, 0x6168, 0x60F1, /* 0x60 */
     0x610E, 0x60F6, 0x6109, 0x6100, 0x6112, 0x621F, 0x6249, 0x63A3, /* 0x70 */
-    0x638C, 0x63CF, 0x63C0, 0x63E9, 0x63C9, 0x63C6, 0x63CD,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x638C, 0x63CF, 0x63C0, 0x63E9, 0x63C9, 0x63C6, 0x63CD, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x63D2, 0x63E3, 0x63D0, 0x63E1, 0x63D6, 0x63ED, 0x63EE, /* 0xA0 */
     0x6376, 0x63F4, 0x63EA, 0x63DB, 0x6452, 0x63DA, 0x63F9, 0x655E, /* 0xA0 */
     0x6566, 0x6562, 0x6563, 0x6591, 0x6590, 0x65AF, 0x666E, 0x6670, /* 0xB0 */
@@ -688,15 +688,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B4[] =
     0x6BEF, 0x6C2E, 0x6C2F, 0x6C2C, 0x6E2F, 0x6E38, 0x6E54, 0x6E21, /* 0xE0 */
     0x6E32, 0x6E67, 0x6E4A, 0x6E20, 0x6E25, 0x6E23, 0x6E1B, 0x6E5B, /* 0xE0 */
     0x6E58, 0x6E24, 0x6E56, 0x6E6E, 0x6E2D, 0x6E26, 0x6E6F, 0x6E34, /* 0xF0 */
-    0x6E4D, 0x6E3A, 0x6E2C, 0x6E43, 0x6E1D, 0x6E3E, 0x6ECB          /* 0xF0 */
+    0x6E4D, 0x6E3A, 0x6E2C, 0x6E43, 0x6E1D, 0x6E3E, 0x6ECB			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_B5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6E89, 0x6E19, 0x6E4E, 0x6E63, 0x6E44, 0x6E72, 0x6E69, 0x6E5F, /* 0x40 */
     0x7119, 0x711A, 0x7126, 0x7130, 0x7121, 0x7136, 0x716E, 0x711C, /* 0x40 */
     0x724C, 0x7284, 0x7280, 0x7336, 0x7325, 0x7334, 0x7329, 0x743A, /* 0x50 */
@@ -704,11 +704,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B5[] =
     0x741B, 0x7426, 0x7428, 0x7525, 0x7526, 0x756B, 0x756A, 0x75E2, /* 0x60 */
     0x75DB, 0x75E3, 0x75D9, 0x75D8, 0x75DE, 0x75E0, 0x767B, 0x767C, /* 0x60 */
     0x7696, 0x7693, 0x76B4, 0x76DC, 0x774F, 0x77ED, 0x785D, 0x786C, /* 0x70 */
-    0x786F, 0x7A0D, 0x7A08, 0x7A0B, 0x7A05, 0x7A00, 0x7A98,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x786F, 0x7A0D, 0x7A08, 0x7A0B, 0x7A05, 0x7A00, 0x7A98, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x7A97, 0x7A96, 0x7AE5, 0x7AE3, 0x7B49, 0x7B56, 0x7B46, /* 0xA0 */
     0x7B50, 0x7B52, 0x7B54, 0x7B4D, 0x7B4B, 0x7B4F, 0x7B51, 0x7C9F, /* 0xA0 */
     0x7CA5, 0x7D5E, 0x7D50, 0x7D68, 0x7D55, 0x7D2B, 0x7D6E, 0x7D72, /* 0xB0 */
@@ -720,15 +720,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B5[] =
     0x83FD, 0x83F2, 0x83CA, 0x8438, 0x840E, 0x8404, 0x83DC, 0x8407, /* 0xE0 */
     0x83D4, 0x83DF, 0x865B, 0x86DF, 0x86D9, 0x86ED, 0x86D4, 0x86DB, /* 0xE0 */
     0x86E4, 0x86D0, 0x86DE, 0x8857, 0x88C1, 0x88C2, 0x88B1, 0x8983, /* 0xF0 */
-    0x8996, 0x8A3B, 0x8A60, 0x8A55, 0x8A5E, 0x8A3C, 0x8A41          /* 0xF0 */
+    0x8996, 0x8A3B, 0x8A60, 0x8A55, 0x8A5E, 0x8A3C, 0x8A41			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_B6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8A54, 0x8A5B, 0x8A50, 0x8A46, 0x8A34, 0x8A3A, 0x8A36, 0x8A56, /* 0x40 */
     0x8C61, 0x8C82, 0x8CAF, 0x8CBC, 0x8CB3, 0x8CBD, 0x8CC1, 0x8CBB, /* 0x40 */
     0x8CC0, 0x8CB4, 0x8CB7, 0x8CB6, 0x8CBF, 0x8CB8, 0x8D8A, 0x8D85, /* 0x50 */
@@ -736,11 +736,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B6[] =
     0x8DC6, 0x8EFB, 0x8EF8, 0x8EFC, 0x8F9C, 0x902E, 0x9035, 0x9031, /* 0x60 */
     0x9038, 0x9032, 0x9036, 0x9102, 0x90F5, 0x9109, 0x90FE, 0x9163, /* 0x60 */
     0x9165, 0x91CF, 0x9214, 0x9215, 0x9223, 0x9209, 0x921E, 0x920D, /* 0x70 */
-    0x9210, 0x9207, 0x9211, 0x9594, 0x958F, 0x958B, 0x9591,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x9210, 0x9207, 0x9211, 0x9594, 0x958F, 0x958B, 0x9591, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x9593, 0x9592, 0x958E, 0x968A, 0x968E, 0x968B, 0x967D, /* 0xA0 */
     0x9685, 0x9686, 0x968D, 0x9672, 0x9684, 0x96C1, 0x96C5, 0x96C4, /* 0xA0 */
     0x96C6, 0x96C7, 0x96EF, 0x96F2, 0x97CC, 0x9805, 0x9806, 0x9808, /* 0xB0 */
@@ -752,15 +752,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B6[] =
     0x55E3, 0x55E4, 0x55EF, 0x55DA, 0x55E1, 0x55C5, 0x55C6, 0x55E5, /* 0xE0 */
     0x55C9, 0x5712, 0x5713, 0x585E, 0x5851, 0x5858, 0x5857, 0x585A, /* 0xE0 */
     0x5854, 0x586B, 0x584C, 0x586D, 0x584A, 0x5862, 0x5852, 0x584B, /* 0xF0 */
-    0x5967, 0x5AC1, 0x5AC9, 0x5ACC, 0x5ABE, 0x5ABD, 0x5ABC          /* 0xF0 */
+    0x5967, 0x5AC1, 0x5AC9, 0x5ACC, 0x5ABE, 0x5ABD, 0x5ABC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_B7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5AB3, 0x5AC2, 0x5AB2, 0x5D69, 0x5D6F, 0x5E4C, 0x5E79, 0x5EC9, /* 0x40 */
     0x5EC8, 0x5F12, 0x5F59, 0x5FAC, 0x5FAE, 0x611A, 0x610F, 0x6148, /* 0x40 */
     0x611F, 0x60F3, 0x611B, 0x60F9, 0x6101, 0x6108, 0x614E, 0x614C, /* 0x50 */
@@ -768,11 +768,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B7[] =
     0x6221, 0x6222, 0x6413, 0x643E, 0x641E, 0x642A, 0x642D, 0x643D, /* 0x60 */
     0x642C, 0x640F, 0x641C, 0x6414, 0x640D, 0x6436, 0x6416, 0x6417, /* 0x60 */
     0x6406, 0x656C, 0x659F, 0x65B0, 0x6697, 0x6689, 0x6687, 0x6688, /* 0x70 */
-    0x6696, 0x6684, 0x6698, 0x668D, 0x6703, 0x6994, 0x696D,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x6696, 0x6684, 0x6698, 0x668D, 0x6703, 0x6994, 0x696D, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x695A, 0x6977, 0x6960, 0x6954, 0x6975, 0x6930, 0x6982, /* 0xA0 */
     0x694A, 0x6968, 0x696B, 0x695E, 0x6953, 0x6979, 0x6986, 0x695D, /* 0xA0 */
     0x6963, 0x695B, 0x6B47, 0x6B72, 0x6BC0, 0x6BBF, 0x6BD3, 0x6BFD, /* 0xB0 */
@@ -784,15 +784,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B7[] =
     0x7345, 0x733F, 0x733E, 0x746F, 0x745A, 0x7455, 0x745F, 0x745E, /* 0xE0 */
     0x7441, 0x743F, 0x7459, 0x745B, 0x745C, 0x7576, 0x7578, 0x7600, /* 0xE0 */
     0x75F0, 0x7601, 0x75F2, 0x75F1, 0x75FA, 0x75FF, 0x75F4, 0x75F3, /* 0xF0 */
-    0x76DE, 0x76DF, 0x775B, 0x776B, 0x7766, 0x775E, 0x7763          /* 0xF0 */
+    0x76DE, 0x76DF, 0x775B, 0x776B, 0x7766, 0x775E, 0x7763			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_B8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7779, 0x776A, 0x776C, 0x775C, 0x7765, 0x7768, 0x7762, 0x77EE, /* 0x40 */
     0x788E, 0x78B0, 0x7897, 0x7898, 0x788C, 0x7889, 0x787C, 0x7891, /* 0x40 */
     0x7893, 0x787F, 0x797A, 0x797F, 0x7981, 0x842C, 0x79BD, 0x7A1C, /* 0x50 */
@@ -800,11 +800,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B8[] =
     0x7BC0, 0x7B60, 0x7B6E, 0x7B67, 0x7CB1, 0x7CB3, 0x7CB5, 0x7D93, /* 0x60 */
     0x7D79, 0x7D91, 0x7D81, 0x7D8F, 0x7D5B, 0x7F6E, 0x7F69, 0x7F6A, /* 0x60 */
     0x7F72, 0x7FA9, 0x7FA8, 0x7FA4, 0x8056, 0x8058, 0x8086, 0x8084, /* 0x70 */
-    0x8171, 0x8170, 0x8178, 0x8165, 0x816E, 0x8173, 0x816B,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x8171, 0x8170, 0x8178, 0x8165, 0x816E, 0x8173, 0x816B, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x8179, 0x817A, 0x8166, 0x8205, 0x8247, 0x8482, 0x8477, /* 0xA0 */
     0x843D, 0x8431, 0x8475, 0x8466, 0x846B, 0x8449, 0x846C, 0x845B, /* 0xA0 */
     0x843C, 0x8435, 0x8461, 0x8463, 0x8469, 0x846D, 0x8446, 0x865E, /* 0xB0 */
@@ -816,15 +816,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B8[] =
     0x8A6E, 0x8A6C, 0x8A79, 0x8A7B, 0x8A3E, 0x8A68, 0x8C62, 0x8C8A, /* 0xE0 */
     0x8C89, 0x8CCA, 0x8CC7, 0x8CC8, 0x8CC4, 0x8CB2, 0x8CC3, 0x8CC2, /* 0xE0 */
     0x8CC5, 0x8DE1, 0x8DDF, 0x8DE8, 0x8DEF, 0x8DF3, 0x8DFA, 0x8DEA, /* 0xF0 */
-    0x8DE4, 0x8DE6, 0x8EB2, 0x8F03, 0x8F09, 0x8EFE, 0x8F0A          /* 0xF0 */
+    0x8DE4, 0x8DE6, 0x8EB2, 0x8F03, 0x8F09, 0x8EFE, 0x8F0A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_B9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8F9F, 0x8FB2, 0x904B, 0x904A, 0x9053, 0x9042, 0x9054, 0x903C, /* 0x40 */
     0x9055, 0x9050, 0x9047, 0x904F, 0x904E, 0x904D, 0x9051, 0x903E, /* 0x40 */
     0x9041, 0x9112, 0x9117, 0x916C, 0x916A, 0x9169, 0x91C9, 0x9237, /* 0x50 */
@@ -832,11 +832,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B9[] =
     0x9251, 0x9234, 0x9249, 0x924D, 0x9245, 0x9239, 0x923F, 0x925A, /* 0x60 */
     0x9598, 0x9698, 0x9694, 0x9695, 0x96CD, 0x96CB, 0x96C9, 0x96CA, /* 0x60 */
     0x96F7, 0x96FB, 0x96F9, 0x96F6, 0x9756, 0x9774, 0x9776, 0x9810, /* 0x70 */
-    0x9811, 0x9813, 0x980A, 0x9812, 0x980C, 0x98FC, 0x98F4,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x9811, 0x9813, 0x980A, 0x9812, 0x980C, 0x98FC, 0x98F4, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x98FD, 0x98FE, 0x99B3, 0x99B1, 0x99B4, 0x9AE1, 0x9CE9, /* 0xA0 */
     0x9E82, 0x9F0E, 0x9F13, 0x9F20, 0x50E7, 0x50EE, 0x50E5, 0x50D6, /* 0xA0 */
     0x50ED, 0x50DA, 0x50D5, 0x50CF, 0x50D1, 0x50F1, 0x50CE, 0x50E9, /* 0xB0 */
@@ -848,15 +848,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_B9[] =
     0x5AE9, 0x5AD7, 0x5AD6, 0x5AD8, 0x5AE3, 0x5B75, 0x5BDE, 0x5BE7, /* 0xE0 */
     0x5BE1, 0x5BE5, 0x5BE6, 0x5BE8, 0x5BE2, 0x5BE4, 0x5BDF, 0x5C0D, /* 0xE0 */
     0x5C62, 0x5D84, 0x5D87, 0x5E5B, 0x5E63, 0x5E55, 0x5E57, 0x5E54, /* 0xF0 */
-    0x5ED3, 0x5ED6, 0x5F0A, 0x5F46, 0x5F70, 0x5FB9, 0x6147          /* 0xF0 */
+    0x5ED3, 0x5ED6, 0x5F0A, 0x5F46, 0x5F70, 0x5FB9, 0x6147			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_BA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x613F, 0x614B, 0x6177, 0x6162, 0x6163, 0x615F, 0x615A, 0x6158, /* 0x40 */
     0x6175, 0x622A, 0x6487, 0x6458, 0x6454, 0x64A4, 0x6478, 0x645F, /* 0x40 */
     0x647A, 0x6451, 0x6467, 0x6434, 0x646D, 0x647B, 0x6572, 0x65A1, /* 0x50 */
@@ -864,11 +864,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_BA[] =
     0x69C1, 0x69AE, 0x69D3, 0x69CB, 0x699B, 0x69B7, 0x69BB, 0x69AB, /* 0x60 */
     0x69B4, 0x69D0, 0x69CD, 0x69AD, 0x69CC, 0x69A6, 0x69C3, 0x69A3, /* 0x60 */
     0x6B49, 0x6B4C, 0x6C33, 0x6F33, 0x6F14, 0x6EFE, 0x6F13, 0x6EF4, /* 0x70 */
-    0x6F29, 0x6F3E, 0x6F20, 0x6F2C, 0x6F0F, 0x6F02, 0x6F22,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x6F29, 0x6F3E, 0x6F20, 0x6F2C, 0x6F0F, 0x6F02, 0x6F22, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x6EFF, 0x6EEF, 0x6F06, 0x6F31, 0x6F38, 0x6F32, 0x6F23, /* 0xA0 */
     0x6F15, 0x6F2B, 0x6F2F, 0x6F88, 0x6F2A, 0x6EEC, 0x6F01, 0x6EF2, /* 0xA0 */
     0x6ECC, 0x6EF7, 0x7194, 0x7199, 0x717D, 0x718A, 0x7184, 0x7192, /* 0xB0 */
@@ -880,15 +880,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_BA[] =
     0x7B8B, 0x7B75, 0x7B97, 0x7B9D, 0x7B94, 0x7B8F, 0x7BB8, 0x7B87, /* 0xE0 */
     0x7B84, 0x7CB9, 0x7CBD, 0x7CBE, 0x7DBB, 0x7DB0, 0x7D9C, 0x7DBD, /* 0xE0 */
     0x7DBE, 0x7DA0, 0x7DCA, 0x7DB4, 0x7DB2, 0x7DB1, 0x7DBA, 0x7DA2, /* 0xF0 */
-    0x7DBF, 0x7DB5, 0x7DB8, 0x7DAD, 0x7DD2, 0x7DC7, 0x7DAC          /* 0xF0 */
+    0x7DBF, 0x7DB5, 0x7DB8, 0x7DAD, 0x7DD2, 0x7DC7, 0x7DAC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_BB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7F70, 0x7FE0, 0x7FE1, 0x7FDF, 0x805E, 0x805A, 0x8087, 0x8150, /* 0x40 */
     0x8180, 0x818F, 0x8188, 0x818A, 0x817F, 0x8182, 0x81E7, 0x81FA, /* 0x40 */
     0x8207, 0x8214, 0x821E, 0x824B, 0x84C9, 0x84BF, 0x84C6, 0x84C4, /* 0x50 */
@@ -896,11 +896,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_BB[] =
     0x8490, 0x84BC, 0x84D1, 0x84CA, 0x873F, 0x871C, 0x873B, 0x8722, /* 0x60 */
     0x8725, 0x8734, 0x8718, 0x8755, 0x8737, 0x8729, 0x88F3, 0x8902, /* 0x60 */
     0x88F4, 0x88F9, 0x88F8, 0x88FD, 0x88E8, 0x891A, 0x88EF, 0x8AA6, /* 0x70 */
-    0x8A8C, 0x8A9E, 0x8AA3, 0x8A8D, 0x8AA1, 0x8A93, 0x8AA4,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x8A8C, 0x8A9E, 0x8AA3, 0x8A8D, 0x8AA1, 0x8A93, 0x8AA4, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x8AAA, 0x8AA5, 0x8AA8, 0x8A98, 0x8A91, 0x8A9A, 0x8AA7, /* 0xA0 */
     0x8C6A, 0x8C8D, 0x8C8C, 0x8CD3, 0x8CD1, 0x8CD2, 0x8D6B, 0x8D99, /* 0xA0 */
     0x8D95, 0x8DFC, 0x8F14, 0x8F12, 0x8F15, 0x8F13, 0x8FA3, 0x9060, /* 0xB0 */
@@ -912,15 +912,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_BB[] =
     0x97F6, 0x9817, 0x9818, 0x98AF, 0x98B1, 0x9903, 0x9905, 0x990C, /* 0xE0 */
     0x9909, 0x99C1, 0x9AAF, 0x9AB0, 0x9AE6, 0x9B41, 0x9B42, 0x9CF4, /* 0xE0 */
     0x9CF6, 0x9CF3, 0x9EBC, 0x9F3B, 0x9F4A, 0x5104, 0x5100, 0x50FB, /* 0xF0 */
-    0x50F5, 0x50F9, 0x5102, 0x5108, 0x5109, 0x5105, 0x51DC          /* 0xF0 */
+    0x50F5, 0x50F9, 0x5102, 0x5108, 0x5109, 0x5105, 0x51DC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_BC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5287, 0x5288, 0x5289, 0x528D, 0x528A, 0x52F0, 0x53B2, 0x562E, /* 0x40 */
     0x563B, 0x5639, 0x5632, 0x563F, 0x5634, 0x5629, 0x5653, 0x564E, /* 0x40 */
     0x5657, 0x5674, 0x5636, 0x562F, 0x5630, 0x5880, 0x589F, 0x589E, /* 0x50 */
@@ -928,11 +928,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_BC[] =
     0x5B0B, 0x5AF5, 0x5B0C, 0x5B08, 0x5BEE, 0x5BEC, 0x5BE9, 0x5BEB, /* 0x60 */
     0x5C64, 0x5C65, 0x5D9D, 0x5D94, 0x5E62, 0x5E5F, 0x5E61, 0x5EE2, /* 0x60 */
     0x5EDA, 0x5EDF, 0x5EDD, 0x5EE3, 0x5EE0, 0x5F48, 0x5F71, 0x5FB7, /* 0x70 */
-    0x5FB5, 0x6176, 0x6167, 0x616E, 0x615D, 0x6155, 0x6182,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x5FB5, 0x6176, 0x6167, 0x616E, 0x615D, 0x6155, 0x6182, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x617C, 0x6170, 0x616B, 0x617E, 0x61A7, 0x6190, 0x61AB, /* 0xA0 */
     0x618E, 0x61AC, 0x619A, 0x61A4, 0x6194, 0x61AE, 0x622E, 0x6469, /* 0xA0 */
     0x646F, 0x6479, 0x649E, 0x64B2, 0x6488, 0x6490, 0x64B0, 0x64A5, /* 0xB0 */
@@ -944,15 +944,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_BC[] =
     0x6F7C, 0x6F84, 0x6F51, 0x6F66, 0x6F54, 0x6F86, 0x6F6D, 0x6F5B, /* 0xE0 */
     0x6F78, 0x6F6E, 0x6F8E, 0x6F7A, 0x6F70, 0x6F64, 0x6F97, 0x6F58, /* 0xE0 */
     0x6ED5, 0x6F6F, 0x6F60, 0x6F5F, 0x719F, 0x71AC, 0x71B1, 0x71A8, /* 0xF0 */
-    0x7256, 0x729B, 0x734E, 0x7357, 0x7469, 0x748B, 0x7483          /* 0xF0 */
+    0x7256, 0x729B, 0x734E, 0x7357, 0x7469, 0x748B, 0x7483			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_BD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x747E, 0x7480, 0x757F, 0x7620, 0x7629, 0x761F, 0x7624, 0x7626, /* 0x40 */
     0x7621, 0x7622, 0x769A, 0x76BA, 0x76E4, 0x778E, 0x7787, 0x778C, /* 0x40 */
     0x7791, 0x778B, 0x78CB, 0x78C5, 0x78BA, 0x78CA, 0x78BE, 0x78D5, /* 0x50 */
@@ -960,11 +960,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_BD[] =
     0x7AAF, 0x7AAE, 0x7BAD, 0x7BB1, 0x7BC4, 0x7BB4, 0x7BC6, 0x7BC7, /* 0x60 */
     0x7BC1, 0x7BA0, 0x7BCC, 0x7CCA, 0x7DE0, 0x7DF4, 0x7DEF, 0x7DFB, /* 0x60 */
     0x7DD8, 0x7DEC, 0x7DDD, 0x7DE8, 0x7DE3, 0x7DDA, 0x7DDE, 0x7DE9, /* 0x70 */
-    0x7D9E, 0x7DD9, 0x7DF2, 0x7DF9, 0x7F75, 0x7F77, 0x7FAF,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x7D9E, 0x7DD9, 0x7DF2, 0x7DF9, 0x7F75, 0x7F77, 0x7FAF, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x7FE9, 0x8026, 0x819B, 0x819C, 0x819D, 0x81A0, 0x819A, /* 0xA0 */
     0x8198, 0x8517, 0x853D, 0x851A, 0x84EE, 0x852C, 0x852D, 0x8513, /* 0xA0 */
     0x8511, 0x8523, 0x8521, 0x8514, 0x84EC, 0x8525, 0x84FF, 0x8506, /* 0xB0 */
@@ -976,15 +976,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_BD[] =
     0x8CDE, 0x8CE6, 0x8CE4, 0x8CEC, 0x8CED, 0x8CE2, 0x8CE3, 0x8CDC, /* 0xE0 */
     0x8CEA, 0x8CE1, 0x8D6D, 0x8D9F, 0x8DA3, 0x8E2B, 0x8E10, 0x8E1D, /* 0xE0 */
     0x8E22, 0x8E0F, 0x8E29, 0x8E1F, 0x8E21, 0x8E1E, 0x8EBA, 0x8F1D, /* 0xF0 */
-    0x8F1B, 0x8F1F, 0x8F29, 0x8F26, 0x8F2A, 0x8F1C, 0x8F1E          /* 0xF0 */
+    0x8F1B, 0x8F1F, 0x8F29, 0x8F26, 0x8F2A, 0x8F1C, 0x8F1E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_BE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8F25, 0x9069, 0x906E, 0x9068, 0x906D, 0x9077, 0x9130, 0x912D, /* 0x40 */
     0x9127, 0x9131, 0x9187, 0x9189, 0x918B, 0x9183, 0x92C5, 0x92BB, /* 0x40 */
     0x92B7, 0x92EA, 0x92AC, 0x92E4, 0x92C1, 0x92B3, 0x92BC, 0x92D2, /* 0x50 */
@@ -992,11 +992,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_BE[] =
     0x9709, 0x9760, 0x978D, 0x978B, 0x978F, 0x9821, 0x982B, 0x981C, /* 0x60 */
     0x98B3, 0x990A, 0x9913, 0x9912, 0x9918, 0x99DD, 0x99D0, 0x99DF, /* 0x60 */
     0x99DB, 0x99D1, 0x99D5, 0x99D2, 0x99D9, 0x9AB7, 0x9AEE, 0x9AEF, /* 0x70 */
-    0x9B27, 0x9B45, 0x9B44, 0x9B77, 0x9B6F, 0x9D06, 0x9D09,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x9B27, 0x9B45, 0x9B44, 0x9B77, 0x9B6F, 0x9D06, 0x9D09, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x9D03, 0x9EA9, 0x9EBE, 0x9ECE, 0x58A8, 0x9F52, 0x5112, /* 0xA0 */
     0x5118, 0x5114, 0x5110, 0x5115, 0x5180, 0x51AA, 0x51DD, 0x5291, /* 0xA0 */
     0x5293, 0x52F3, 0x5659, 0x566B, 0x5679, 0x5669, 0x5664, 0x5678, /* 0xB0 */
@@ -1008,15 +1008,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_BE[] =
     0x64D2, 0x64D4, 0x64BE, 0x6574, 0x66C6, 0x66C9, 0x66B9, 0x66C4, /* 0xE0 */
     0x66C7, 0x66B8, 0x6A3D, 0x6A38, 0x6A3A, 0x6A59, 0x6A6B, 0x6A58, /* 0xE0 */
     0x6A39, 0x6A44, 0x6A62, 0x6A61, 0x6A4B, 0x6A47, 0x6A35, 0x6A5F, /* 0xF0 */
-    0x6A48, 0x6B59, 0x6B77, 0x6C05, 0x6FC2, 0x6FB1, 0x6FA1          /* 0xF0 */
+    0x6A48, 0x6B59, 0x6B77, 0x6C05, 0x6FC2, 0x6FB1, 0x6FA1			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_BF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6FC3, 0x6FA4, 0x6FC1, 0x6FA7, 0x6FB3, 0x6FC0, 0x6FB9, 0x6FB6, /* 0x40 */
     0x6FA6, 0x6FA0, 0x6FB4, 0x71BE, 0x71C9, 0x71D0, 0x71D2, 0x71C8, /* 0x40 */
     0x71D5, 0x71B9, 0x71CE, 0x71D9, 0x71DC, 0x71C3, 0x71C4, 0x7368, /* 0x50 */
@@ -1024,11 +1024,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_BF[] =
     0x7634, 0x7638, 0x763A, 0x76E7, 0x76E5, 0x77A0, 0x779E, 0x779F, /* 0x60 */
     0x77A5, 0x78E8, 0x78DA, 0x78EC, 0x78E7, 0x79A6, 0x7A4D, 0x7A4E, /* 0x60 */
     0x7A46, 0x7A4C, 0x7A4B, 0x7ABA, 0x7BD9, 0x7C11, 0x7BC9, 0x7BE4, /* 0x70 */
-    0x7BDB, 0x7BE1, 0x7BE9, 0x7BE6, 0x7CD5, 0x7CD6, 0x7E0A,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x7BDB, 0x7BE1, 0x7BE9, 0x7BE6, 0x7CD5, 0x7CD6, 0x7E0A, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x7E11, 0x7E08, 0x7E1B, 0x7E23, 0x7E1E, 0x7E1D, 0x7E09, /* 0xA0 */
     0x7E10, 0x7F79, 0x7FB2, 0x7FF0, 0x7FF1, 0x7FEE, 0x8028, 0x81B3, /* 0xA0 */
     0x81A9, 0x81A8, 0x81FB, 0x8208, 0x8258, 0x8259, 0x854A, 0x8559, /* 0xB0 */
@@ -1040,15 +1040,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_BF[] =
     0x8CF4, 0x8E44, 0x8E31, 0x8E34, 0x8E42, 0x8E39, 0x8E35, 0x8F3B, /* 0xE0 */
     0x8F2F, 0x8F38, 0x8F33, 0x8FA8, 0x8FA6, 0x9075, 0x9074, 0x9078, /* 0xE0 */
     0x9072, 0x907C, 0x907A, 0x9134, 0x9192, 0x9320, 0x9336, 0x92F8, /* 0xF0 */
-    0x9333, 0x932F, 0x9322, 0x92FC, 0x932B, 0x9304, 0x931A          /* 0xF0 */
+    0x9333, 0x932F, 0x9322, 0x92FC, 0x932B, 0x9304, 0x931A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_C0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9310, 0x9326, 0x9321, 0x9315, 0x932E, 0x9319, 0x95BB, 0x96A7, /* 0x40 */
     0x96A8, 0x96AA, 0x96D5, 0x970E, 0x9711, 0x9716, 0x970D, 0x9713, /* 0x40 */
     0x970F, 0x975B, 0x975C, 0x9766, 0x9798, 0x9830, 0x9838, 0x983B, /* 0x50 */
@@ -1056,11 +1056,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_C0[] =
     0x9921, 0x991A, 0x99ED, 0x99E2, 0x99F1, 0x9AB8, 0x9ABC, 0x9AFB, /* 0x60 */
     0x9AED, 0x9B28, 0x9B91, 0x9D15, 0x9D23, 0x9D26, 0x9D28, 0x9D12, /* 0x60 */
     0x9D1B, 0x9ED8, 0x9ED4, 0x9F8D, 0x9F9C, 0x512A, 0x511F, 0x5121, /* 0x70 */
-    0x5132, 0x52F5, 0x568E, 0x5680, 0x5690, 0x5685, 0x5687,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x5132, 0x52F5, 0x568E, 0x5680, 0x5690, 0x5685, 0x5687, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x568F, 0x58D5, 0x58D3, 0x58D1, 0x58CE, 0x5B30, 0x5B2A, /* 0xA0 */
     0x5B24, 0x5B7A, 0x5C37, 0x5C68, 0x5DBC, 0x5DBA, 0x5DBD, 0x5DB8, /* 0xA0 */
     0x5E6B, 0x5F4C, 0x5FBD, 0x61C9, 0x61C2, 0x61C7, 0x61E6, 0x61CB, /* 0xB0 */
@@ -1072,15 +1072,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_C0[] =
     0x6FEC, 0x6FE1, 0x6FE9, 0x6FD5, 0x6FEE, 0x6FF0, 0x71E7, 0x71DF, /* 0xE0 */
     0x71EE, 0x71E6, 0x71E5, 0x71ED, 0x71EC, 0x71F4, 0x71E0, 0x7235, /* 0xE0 */
     0x7246, 0x7370, 0x7372, 0x74A9, 0x74B0, 0x74A6, 0x74A8, 0x7646, /* 0xF0 */
-    0x7642, 0x764C, 0x76EA, 0x77B3, 0x77AA, 0x77B0, 0x77AC          /* 0xF0 */
+    0x7642, 0x764C, 0x76EA, 0x77B3, 0x77AA, 0x77B0, 0x77AC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_C1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x77A7, 0x77AD, 0x77EF, 0x78F7, 0x78FA, 0x78F4, 0x78EF, 0x7901, /* 0x40 */
     0x79A7, 0x79AA, 0x7A57, 0x7ABF, 0x7C07, 0x7C0D, 0x7BFE, 0x7BF7, /* 0x40 */
     0x7C0C, 0x7BE0, 0x7CE0, 0x7CDC, 0x7CDE, 0x7CE2, 0x7CDF, 0x7CD9, /* 0x50 */
@@ -1088,11 +1088,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_C1[] =
     0x7E3D, 0x7E31, 0x7E45, 0x7E41, 0x7E34, 0x7E39, 0x7E48, 0x7E35, /* 0x60 */
     0x7E3F, 0x7E2F, 0x7F44, 0x7FF3, 0x7FFC, 0x8071, 0x8072, 0x8070, /* 0x60 */
     0x806F, 0x8073, 0x81C6, 0x81C3, 0x81BA, 0x81C2, 0x81C0, 0x81BF, /* 0x70 */
-    0x81BD, 0x81C9, 0x81BE, 0x81E8, 0x8209, 0x8271, 0x85AA,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x81BD, 0x81C9, 0x81BE, 0x81E8, 0x8209, 0x8271, 0x85AA, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x8584, 0x857E, 0x859C, 0x8591, 0x8594, 0x85AF, 0x859B, /* 0xA0 */
     0x8587, 0x85A8, 0x858A, 0x8667, 0x87C0, 0x87D1, 0x87B3, 0x87D2, /* 0xA0 */
     0x87C6, 0x87AB, 0x87BB, 0x87BA, 0x87C8, 0x87CB, 0x893B, 0x8936, /* 0xB0 */
@@ -1104,15 +1104,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_C1[] =
     0x919C, 0x934D, 0x9382, 0x9328, 0x9375, 0x934A, 0x9365, 0x934B, /* 0xE0 */
     0x9318, 0x937E, 0x936C, 0x935B, 0x9370, 0x935A, 0x9354, 0x95CA, /* 0xE0 */
     0x95CB, 0x95CC, 0x95C8, 0x95C6, 0x96B1, 0x96B8, 0x96D6, 0x971C, /* 0xF0 */
-    0x971E, 0x97A0, 0x97D3, 0x9846, 0x98B6, 0x9935, 0x9A01          /* 0xF0 */
+    0x971E, 0x97A0, 0x97D3, 0x9846, 0x98B6, 0x9935, 0x9A01			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_C2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x99FF, 0x9BAE, 0x9BAB, 0x9BAA, 0x9BAD, 0x9D3B, 0x9D3F, 0x9E8B, /* 0x40 */
     0x9ECF, 0x9EDE, 0x9EDC, 0x9EDD, 0x9EDB, 0x9F3E, 0x9F4B, 0x53E2, /* 0x40 */
     0x5695, 0x56AE, 0x58D9, 0x58D8, 0x5B38, 0x5F5D, 0x61E3, 0x6233, /* 0x50 */
@@ -1120,11 +1120,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_C2[] =
     0x66DC, 0x6726, 0x6AB3, 0x6AAC, 0x6AC3, 0x6ABB, 0x6AB8, 0x6AC2, /* 0x60 */
     0x6AAE, 0x6AAF, 0x6B5F, 0x6B78, 0x6BAF, 0x7009, 0x700B, 0x6FFE, /* 0x60 */
     0x7006, 0x6FFA, 0x7011, 0x700F, 0x71FB, 0x71FC, 0x71FE, 0x71F8, /* 0x70 */
-    0x7377, 0x7375, 0x74A7, 0x74BF, 0x7515, 0x7656, 0x7658,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x7377, 0x7375, 0x74A7, 0x74BF, 0x7515, 0x7656, 0x7658, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x7652, 0x77BD, 0x77BF, 0x77BB, 0x77BC, 0x790E, 0x79AE, /* 0xA0 */
     0x7A61, 0x7A62, 0x7A60, 0x7AC4, 0x7AC5, 0x7C2B, 0x7C27, 0x7C2A, /* 0xA0 */
     0x7C1E, 0x7C23, 0x7C21, 0x7CE7, 0x7E54, 0x7E55, 0x7E5E, 0x7E5A, /* 0xB0 */
@@ -1136,15 +1136,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_C2[] =
     0x8F49, 0x8F4D, 0x9087, 0x9083, 0x9088, 0x91AB, 0x91AC, 0x91D0, /* 0xE0 */
     0x9394, 0x938A, 0x9396, 0x93A2, 0x93B3, 0x93AE, 0x93AC, 0x93B0, /* 0xE0 */
     0x9398, 0x939A, 0x9397, 0x95D4, 0x95D6, 0x95D0, 0x95D5, 0x96E2, /* 0xF0 */
-    0x96DC, 0x96D9, 0x96DB, 0x96DE, 0x9724, 0x97A3, 0x97A6          /* 0xF0 */
+    0x96DC, 0x96D9, 0x96DB, 0x96DE, 0x9724, 0x97A3, 0x97A6			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_C3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x97AD, 0x97F9, 0x984D, 0x984F, 0x984C, 0x984E, 0x9853, 0x98BA, /* 0x40 */
     0x993E, 0x993F, 0x993D, 0x992E, 0x99A5, 0x9A0E, 0x9AC1, 0x9B03, /* 0x40 */
     0x9B06, 0x9B4F, 0x9B4E, 0x9B4D, 0x9BCA, 0x9BC9, 0x9BFD, 0x9BC8, /* 0x50 */
@@ -1152,11 +1152,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_C3[] =
     0x56A5, 0x58DE, 0x58DF, 0x58E2, 0x5BF5, 0x9F90, 0x5EEC, 0x61F2, /* 0x60 */
     0x61F7, 0x61F6, 0x61F5, 0x6500, 0x650F, 0x66E0, 0x66DD, 0x6AE5, /* 0x60 */
     0x6ADD, 0x6ADA, 0x6AD3, 0x701B, 0x701F, 0x7028, 0x701A, 0x701D, /* 0x70 */
-    0x7015, 0x7018, 0x7206, 0x720D, 0x7258, 0x72A2, 0x7378,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x7015, 0x7018, 0x7206, 0x720D, 0x7258, 0x72A2, 0x7378, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x737A, 0x74BD, 0x74CA, 0x74E3, 0x7587, 0x7586, 0x765F, /* 0xA0 */
     0x7661, 0x77C7, 0x7919, 0x79B1, 0x7A6B, 0x7A69, 0x7C3E, 0x7C3F, /* 0xA0 */
     0x7C38, 0x7C3D, 0x7C37, 0x7C40, 0x7E6B, 0x7E6D, 0x7E79, 0x7E69, /* 0xB0 */
@@ -1168,15 +1168,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_C3[] =
     0x8E74, 0x8F54, 0x8F4E, 0x8FAD, 0x908A, 0x908B, 0x91B1, 0x91AE, /* 0xE0 */
     0x93E1, 0x93D1, 0x93DF, 0x93C3, 0x93C8, 0x93DC, 0x93DD, 0x93D6, /* 0xE0 */
     0x93E2, 0x93CD, 0x93D8, 0x93E4, 0x93D7, 0x93E8, 0x95DC, 0x96B4, /* 0xF0 */
-    0x96E3, 0x972A, 0x9727, 0x9761, 0x97DC, 0x97FB, 0x985E          /* 0xF0 */
+    0x96E3, 0x972A, 0x9727, 0x9761, 0x97DC, 0x97FB, 0x985E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_C4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x9858, 0x985B, 0x98BC, 0x9945, 0x9949, 0x9A16, 0x9A19, 0x9B0D, /* 0x40 */
     0x9BE8, 0x9BE7, 0x9BD6, 0x9BDB, 0x9D89, 0x9D61, 0x9D72, 0x9D6A, /* 0x40 */
     0x9D6C, 0x9E92, 0x9E97, 0x9E93, 0x9EB4, 0x52F8, 0x56A8, 0x56B7, /* 0x50 */
@@ -1184,11 +1184,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_C4[] =
     0x5DC9, 0x61F8, 0x61FA, 0x6518, 0x6514, 0x6519, 0x66E6, 0x6727, /* 0x60 */
     0x6AEC, 0x703E, 0x7030, 0x7032, 0x7210, 0x737B, 0x74CF, 0x7662, /* 0x60 */
     0x7665, 0x7926, 0x792A, 0x792C, 0x792B, 0x7AC7, 0x7AF6, 0x7C4C, /* 0x70 */
-    0x7C43, 0x7C4D, 0x7CEF, 0x7CF0, 0x8FAE, 0x7E7D, 0x7E7C,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x7C43, 0x7C4D, 0x7CEF, 0x7CF0, 0x8FAE, 0x7E7D, 0x7E7C, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x7E82, 0x7F4C, 0x8000, 0x81DA, 0x8266, 0x85FB, 0x85F9, /* 0xA0 */
     0x8611, 0x85FA, 0x8606, 0x860B, 0x8607, 0x860A, 0x8814, 0x8815, /* 0xA0 */
     0x8964, 0x89BA, 0x89F8, 0x8B70, 0x8B6C, 0x8B66, 0x8B6F, 0x8B5F, /* 0xB0 */
@@ -1200,15 +1200,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_C4[] =
     0x61FE, 0x651D, 0x651C, 0x6595, 0x66E9, 0x6AFB, 0x6B04, 0x6AFA, /* 0xE0 */
     0x6BB2, 0x704C, 0x721B, 0x72A7, 0x74D6, 0x74D4, 0x7669, 0x77D3, /* 0xE0 */
     0x7C50, 0x7E8F, 0x7E8C, 0x7FBC, 0x8617, 0x862D, 0x861A, 0x8823, /* 0xF0 */
-    0x8822, 0x8821, 0x881F, 0x896A, 0x896C, 0x89BD, 0x8B74          /* 0xF0 */
+    0x8822, 0x8821, 0x881F, 0x896A, 0x896C, 0x89BD, 0x8B74			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_C5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8B77, 0x8B7D, 0x8D13, 0x8E8A, 0x8E8D, 0x8E8B, 0x8F5F, 0x8FAF, /* 0x40 */
     0x91BA, 0x942E, 0x9433, 0x9435, 0x943A, 0x9438, 0x9432, 0x942B, /* 0x40 */
     0x95E2, 0x9738, 0x9739, 0x9732, 0x97FF, 0x9867, 0x9865, 0x9957, /* 0x50 */
@@ -1216,11 +1216,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_C5[] =
     0x9C25, 0x9DAF, 0x9DB4, 0x9DC2, 0x9DB8, 0x9E9D, 0x9EEF, 0x9F19, /* 0x60 */
     0x9F5C, 0x9F66, 0x9F67, 0x513C, 0x513B, 0x56C8, 0x56CA, 0x56C9, /* 0x60 */
     0x5B7F, 0x5DD4, 0x5DD2, 0x5F4E, 0x61FF, 0x6524, 0x6B0A, 0x6B61, /* 0x70 */
-    0x7051, 0x7058, 0x7380, 0x74E4, 0x758A, 0x766E, 0x766C,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x7051, 0x7058, 0x7380, 0x74E4, 0x758A, 0x766E, 0x766C, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x79B3, 0x7C60, 0x7C5F, 0x807E, 0x807D, 0x81DF, 0x8972, /* 0xA0 */
     0x896F, 0x89FC, 0x8B80, 0x8D16, 0x8D17, 0x8E91, 0x8E93, 0x8F61, /* 0xA0 */
     0x9148, 0x9444, 0x9451, 0x9452, 0x973D, 0x973E, 0x97C3, 0x97C1, /* 0xB0 */
@@ -1232,15 +1232,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_C5[] =
     0x9460, 0x9464, 0x9768, 0x986F, 0x995C, 0x9A5A, 0x9A5B, 0x9A57, /* 0xE0 */
     0x9AD3, 0x9AD4, 0x9AD1, 0x9C54, 0x9C57, 0x9C56, 0x9DE5, 0x9E9F, /* 0xE0 */
     0x9EF4, 0x56D1, 0x58E9, 0x652C, 0x705E, 0x7671, 0x7672, 0x77D7, /* 0xF0 */
-    0x7F50, 0x7F88, 0x8836, 0x8839, 0x8862, 0x8B93, 0x8B92          /* 0xF0 */
+    0x7F50, 0x7F88, 0x8836, 0x8839, 0x8862, 0x8B93, 0x8B92			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_C6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8B96, 0x8277, 0x8D1B, 0x91C0, 0x946A, 0x9742, 0x9748, 0x9744, /* 0x40 */
     0x97C6, 0x9870, 0x9A5F, 0x9B22, 0x9B58, 0x9C5F, 0x9DF9, 0x9DFA, /* 0x40 */
     0x9E7C, 0x9E7D, 0x9F07, 0x9F77, 0x9F72, 0x5EF3, 0x6B16, 0x7063, /* 0x50 */
@@ -1248,7 +1248,7 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_C6[] =
     0x9871, 0x995E, 0x9AD6, 0x9B23, 0x9ECC, 0x7064, 0x77DA, 0x8B9A, /* 0x60 */
     0x9477, 0x97C9, 0x9A62, 0x9A65, 0x7E9C, 0x8B9C, 0x8EAA, 0x91C5, /* 0x60 */
     0x947D, 0x947E, 0x947C, 0x9C77, 0x9C78, 0x9EF7, 0x8C54, 0x947F, /* 0x70 */
-    0x9E1A, 0x7228, 0x9A6A, 0x9B31, 0x9E1B, 0x9E1E, 0x7C72          /* 0x70 */
+    0x9E1A, 0x7228, 0x9A6A, 0x9B31, 0x9E1B, 0x9E1E, 0x7C72			/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -1259,8 +1259,8 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_C6[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5ONLY_C6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8B96, 0x8277, 0x8D1B, 0x91C0, 0x946A, 0x9742, 0x9748, 0x9744, /* 0x40 */
     0x97C6, 0x9870, 0x9A5F, 0x9B22, 0x9B58, 0x9C5F, 0x9DF9, 0x9DFA, /* 0x40 */
     0x9E7C, 0x9E7D, 0x9F07, 0x9F77, 0x9F72, 0x5EF3, 0x6B16, 0x7063, /* 0x50 */
@@ -1268,11 +1268,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5ONLY_C6[] =
     0x9871, 0x995E, 0x9AD6, 0x9B23, 0x9ECC, 0x7064, 0x77DA, 0x8B9A, /* 0x60 */
     0x9477, 0x97C9, 0x9A62, 0x9A65, 0x7E9C, 0x8B9C, 0x8EAA, 0x91C5, /* 0x60 */
     0x947D, 0x947E, 0x947C, 0x9C77, 0x9C78, 0x9EF7, 0x8C54, 0x947F, /* 0x70 */
-    0x9E1A, 0x7228, 0x9A6A, 0x9B31, 0x9E1B, 0x9E1E, 0x7C72,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x9E1A, 0x7228, 0x9A6A, 0x9B31, 0x9E1B, 0x9E1E, 0x7C72, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x30FE, 0x309D, 0x309E, 0x3005, 0x3041, 0x3042, 0x3043, /* 0xA0 */
     0x3044, 0x3045, 0x3046, 0x3047, 0x3048, 0x3049, 0x304A, 0x304B, /* 0xA0 */
     0x304C, 0x304D, 0x304E, 0x304F, 0x3050, 0x3051, 0x3052, 0x3053, /* 0xB0 */
@@ -1284,7 +1284,7 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5ONLY_C6[] =
     0x307C, 0x307D, 0x307E, 0x307F, 0x3080, 0x3081, 0x3082, 0x3083, /* 0xE0 */
     0x3084, 0x3085, 0x3086, 0x3087, 0x3088, 0x3089, 0x308A, 0x308B, /* 0xE0 */
     0x308C, 0x308D, 0x308E, 0x308F, 0x3090, 0x3091, 0x3092, 0x3093, /* 0xF0 */
-    0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7          /* 0xF0 */
+    0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -1295,8 +1295,8 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5ONLY_C6[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5ONLY_C7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC, 0x30AD, 0x30AE, 0x30AF, /* 0x40 */
     0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, 0x30B7, /* 0x40 */
     0x30B8, 0x30B9, 0x30BA, 0x30BB, 0x30BC, 0x30BD, 0x30BE, 0x30BF, /* 0x50 */
@@ -1304,11 +1304,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5ONLY_C7[] =
     0x30C8, 0x30C9, 0x30CA, 0x30CB, 0x30CC, 0x30CD, 0x30CE, 0x30CF, /* 0x60 */
     0x30D0, 0x30D1, 0x30D2, 0x30D3, 0x30D4, 0x30D5, 0x30D6, 0x30D7, /* 0x60 */
     0x30D8, 0x30D9, 0x30DA, 0x30DB, 0x30DC, 0x30DD, 0x30DE, 0x30DF, /* 0x70 */
-    0x30E0, 0x30E1, 0x30E2, 0x30E3, 0x30E4, 0x30E5, 0x30E6,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x30E0, 0x30E1, 0x30E2, 0x30E3, 0x30E4, 0x30E5, 0x30E6, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x30E7, 0x30E8, 0x30E9, 0x30EA, 0x30EB, 0x30EC, 0x30ED, /* 0xA0 */
     0x30EE, 0x30EF, 0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, /* 0xA0 */
     0x30F6, 0x0414, 0x0415, 0x0401, 0x0416, 0x0417, 0x0418, 0x0419, /* 0xB0 */
@@ -1320,15 +1320,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5ONLY_C7[] =
     0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, /* 0xE0 */
     0x044F, 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, /* 0xE0 */
     0x2467, 0x2468, 0x2469, 0x2474, 0x2475, 0x2476, 0x2477, 0x2478, /* 0xF0 */
-    0x2479, 0x247A, 0x247B, 0x247C, 0x247D                          /* 0xF0 */
+    0x2479, 0x247A, 0x247B, 0x247C, 0x247D							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_C9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x4E42, 0x4E5C, 0x51F5, 0x531A, 0x5382, 0x4E07, 0x4E0C, 0x4E47, /* 0x40 */
     0x4E8D, 0x56D7, 0xFA0C, 0x5C6E, 0x5F73, 0x4E0F, 0x5187, 0x4E0E, /* 0x40 */
     0x4E2E, 0x4E93, 0x4EC2, 0x4EC9, 0x4EC8, 0x5198, 0x52FC, 0x536C, /* 0x50 */
@@ -1336,11 +1336,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_C9[] =
     0x6BCC, 0x6C14, 0x723F, 0x4E31, 0x4E3C, 0x4EE8, 0x4EDC, 0x4EE9, /* 0x60 */
     0x4EE1, 0x4EDD, 0x4EDA, 0x520C, 0x531C, 0x534C, 0x5722, 0x5723, /* 0x60 */
     0x5917, 0x592F, 0x5B81, 0x5B84, 0x5C12, 0x5C3B, 0x5C74, 0x5C73, /* 0x70 */
-    0x5E04, 0x5E80, 0x5E82, 0x5FC9, 0x6209, 0x6250, 0x6C15,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x5E04, 0x5E80, 0x5E82, 0x5FC9, 0x6209, 0x6250, 0x6C15, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x6C36, 0x6C43, 0x6C3F, 0x6C3B, 0x72AE, 0x72B0, 0x738A, /* 0xA0 */
     0x79B8, 0x808A, 0x961E, 0x4F0E, 0x4F18, 0x4F2C, 0x4EF5, 0x4F14, /* 0xA0 */
     0x4EF1, 0x4F00, 0x4EF7, 0x4F08, 0x4F1D, 0x4F02, 0x4F05, 0x4F22, /* 0xB0 */
@@ -1352,15 +1352,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_C9[] =
     0x5FD5, 0x5FD4, 0x5FCF, 0x625C, 0x625E, 0x6264, 0x6261, 0x6266, /* 0xE0 */
     0x6262, 0x6259, 0x6260, 0x625A, 0x6265, 0x65EF, 0x65EE, 0x673E, /* 0xE0 */
     0x6739, 0x6738, 0x673B, 0x673A, 0x673F, 0x673C, 0x6733, 0x6C18, /* 0xF0 */
-    0x6C46, 0x6C52, 0x6C5C, 0x6C4F, 0x6C4A, 0x6C54, 0x6C4B          /* 0xF0 */
+    0x6C46, 0x6C52, 0x6C5C, 0x6C4F, 0x6C4A, 0x6C54, 0x6C4B			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_CA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6C4C, 0x7071, 0x725E, 0x72B4, 0x72B5, 0x738E, 0x752A, 0x767F, /* 0x40 */
     0x7A75, 0x7F51, 0x8278, 0x827C, 0x8280, 0x827D, 0x827F, 0x864D, /* 0x40 */
     0x897E, 0x9099, 0x9097, 0x9098, 0x909B, 0x9094, 0x9622, 0x9624, /* 0x50 */
@@ -1368,11 +1368,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_CA[] =
     0x4F3E, 0x4F67, 0x4F52, 0x4F5F, 0x4F41, 0x4F58, 0x4F2D, 0x4F33, /* 0x60 */
     0x4F3F, 0x4F61, 0x518F, 0x51B9, 0x521C, 0x521E, 0x5221, 0x52AD, /* 0x60 */
     0x52AE, 0x5309, 0x5363, 0x5372, 0x538E, 0x538F, 0x5430, 0x5437, /* 0x70 */
-    0x542A, 0x5454, 0x5445, 0x5419, 0x541C, 0x5425, 0x5418,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x542A, 0x5454, 0x5445, 0x5419, 0x541C, 0x5425, 0x5418, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x543D, 0x544F, 0x5441, 0x5428, 0x5424, 0x5447, 0x56EE, /* 0xA0 */
     0x56E7, 0x56E5, 0x5741, 0x5745, 0x574C, 0x5749, 0x574B, 0x5752, /* 0xA0 */
     0x5906, 0x5940, 0x59A6, 0x5998, 0x59A0, 0x5997, 0x598E, 0x59A2, /* 0xB0 */
@@ -1384,15 +1384,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_CA[] =
     0x5FFA, 0x5FEF, 0x5FF7, 0x5FFB, 0x6000, 0x5FF4, 0x623A, 0x6283, /* 0xE0 */
     0x628C, 0x628E, 0x628F, 0x6294, 0x6287, 0x6271, 0x627B, 0x627A, /* 0xE0 */
     0x6270, 0x6281, 0x6288, 0x6277, 0x627D, 0x6272, 0x6274, 0x6537, /* 0xF0 */
-    0x65F0, 0x65F4, 0x65F3, 0x65F2, 0x65F5, 0x6745, 0x6747          /* 0xF0 */
+    0x65F0, 0x65F4, 0x65F3, 0x65F2, 0x65F5, 0x6745, 0x6747			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_CB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6759, 0x6755, 0x674C, 0x6748, 0x675D, 0x674D, 0x675A, 0x674B, /* 0x40 */
     0x6BD0, 0x6C19, 0x6C1A, 0x6C78, 0x6C67, 0x6C6B, 0x6C84, 0x6C8B, /* 0x40 */
     0x6C8F, 0x6C71, 0x6C6F, 0x6C69, 0x6C9A, 0x6C6D, 0x6C87, 0x6C95, /* 0x50 */
@@ -1400,11 +1400,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_CB[] =
     0x7263, 0x72BF, 0x72BD, 0x72C3, 0x72C6, 0x72C1, 0x72BA, 0x72C5, /* 0x60 */
     0x7395, 0x7397, 0x7393, 0x7394, 0x7392, 0x753A, 0x7539, 0x7594, /* 0x60 */
     0x7595, 0x7681, 0x793D, 0x8034, 0x8095, 0x8099, 0x8090, 0x8092, /* 0x70 */
-    0x809C, 0x8290, 0x828F, 0x8285, 0x828E, 0x8291, 0x8293,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x809C, 0x8290, 0x828F, 0x8285, 0x828E, 0x8291, 0x8293, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x828A, 0x8283, 0x8284, 0x8C78, 0x8FC9, 0x8FBF, 0x909F, /* 0xA0 */
     0x90A1, 0x90A5, 0x909E, 0x90A7, 0x90A0, 0x9630, 0x9628, 0x962F, /* 0xA0 */
     0x962D, 0x4E33, 0x4F98, 0x4F7C, 0x4F85, 0x4F7D, 0x4F80, 0x4F87, /* 0xB0 */
@@ -1416,15 +1416,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_CB[] =
     0x5488, 0x546B, 0x547A, 0x547E, 0x5465, 0x546C, 0x5474, 0x5466, /* 0xE0 */
     0x548D, 0x546F, 0x5461, 0x5460, 0x5498, 0x5463, 0x5467, 0x5464, /* 0xE0 */
     0x56F7, 0x56F9, 0x576F, 0x5772, 0x576D, 0x576B, 0x5771, 0x5770, /* 0xF0 */
-    0x5776, 0x5780, 0x5775, 0x577B, 0x5773, 0x5774, 0x5762          /* 0xF0 */
+    0x5776, 0x5780, 0x5775, 0x577B, 0x5773, 0x5774, 0x5762			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_CC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5768, 0x577D, 0x590C, 0x5945, 0x59B5, 0x59BA, 0x59CF, 0x59CE, /* 0x40 */
     0x59B2, 0x59CC, 0x59C1, 0x59B6, 0x59BC, 0x59C3, 0x59D6, 0x59B1, /* 0x40 */
     0x59BD, 0x59C0, 0x59C8, 0x59B4, 0x59C7, 0x5B62, 0x5B65, 0x5B93, /* 0x50 */
@@ -1432,11 +1432,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_CC[] =
     0x5CA8, 0x5CAC, 0x5C9F, 0x5CA3, 0x5CAD, 0x5CA2, 0x5CAA, 0x5CA7, /* 0x60 */
     0x5C9D, 0x5CA5, 0x5CB6, 0x5CB0, 0x5CA6, 0x5E17, 0x5E14, 0x5E19, /* 0x60 */
     0x5F28, 0x5F22, 0x5F23, 0x5F24, 0x5F54, 0x5F82, 0x5F7E, 0x5F7D, /* 0x70 */
-    0x5FDE, 0x5FE5, 0x602D, 0x6026, 0x6019, 0x6032, 0x600B,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x5FDE, 0x5FE5, 0x602D, 0x6026, 0x6019, 0x6032, 0x600B, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x6034, 0x600A, 0x6017, 0x6033, 0x601A, 0x601E, 0x602C, /* 0xA0 */
     0x6022, 0x600D, 0x6010, 0x602E, 0x6013, 0x6011, 0x600C, 0x6009, /* 0xA0 */
     0x601C, 0x6214, 0x623D, 0x62AD, 0x62B4, 0x62D1, 0x62BE, 0x62AA, /* 0xB0 */
@@ -1448,15 +1448,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_CC[] =
     0x679F, 0x6791, 0x6799, 0x6783, 0x677D, 0x6781, 0x6778, 0x6779, /* 0xE0 */
     0x6794, 0x6B25, 0x6B80, 0x6B7E, 0x6BDE, 0x6C1D, 0x6C93, 0x6CEC, /* 0xE0 */
     0x6CEB, 0x6CEE, 0x6CD9, 0x6CB6, 0x6CD4, 0x6CAD, 0x6CE7, 0x6CB7, /* 0xF0 */
-    0x6CD0, 0x6CC2, 0x6CBA, 0x6CC3, 0x6CC6, 0x6CED, 0x6CF2          /* 0xF0 */
+    0x6CD0, 0x6CC2, 0x6CBA, 0x6CC3, 0x6CC6, 0x6CED, 0x6CF2			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_CD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6CD2, 0x6CDD, 0x6CB4, 0x6C8A, 0x6C9D, 0x6C80, 0x6CDE, 0x6CC0, /* 0x40 */
     0x6D30, 0x6CCD, 0x6CC7, 0x6CB0, 0x6CF9, 0x6CCF, 0x6CE9, 0x6CD1, /* 0x40 */
     0x7094, 0x7098, 0x7085, 0x7093, 0x7086, 0x7084, 0x7091, 0x7096, /* 0x50 */
@@ -1464,11 +1464,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_CD[] =
     0x72DC, 0x72D2, 0x72D4, 0x72DA, 0x72CC, 0x72D1, 0x73A4, 0x73A1, /* 0x60 */
     0x73AD, 0x73A6, 0x73A2, 0x73A0, 0x73AC, 0x739D, 0x74DD, 0x74E8, /* 0x60 */
     0x753F, 0x7540, 0x753E, 0x758C, 0x7598, 0x76AF, 0x76F3, 0x76F1, /* 0x70 */
-    0x76F0, 0x76F5, 0x77F8, 0x77FC, 0x77F9, 0x77FB, 0x77FA,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x76F0, 0x76F5, 0x77F8, 0x77FC, 0x77F9, 0x77FB, 0x77FA, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x77F7, 0x7942, 0x793F, 0x79C5, 0x7A78, 0x7A7B, 0x7AFB, /* 0xA0 */
     0x7C75, 0x7CFD, 0x8035, 0x808F, 0x80AE, 0x80A3, 0x80B8, 0x80B5, /* 0xA0 */
     0x80AD, 0x8220, 0x82A0, 0x82C0, 0x82AB, 0x829A, 0x8298, 0x829B, /* 0xB0 */
@@ -1480,15 +1480,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_CD[] =
     0x4FB2, 0x4FC9, 0x4FCB, 0x4FC1, 0x4FD4, 0x4FDC, 0x4FD9, 0x4FBB, /* 0xE0 */
     0x4FB3, 0x4FDB, 0x4FC7, 0x4FD6, 0x4FBA, 0x4FC0, 0x4FB9, 0x4FEC, /* 0xE0 */
     0x5244, 0x5249, 0x52C0, 0x52C2, 0x533D, 0x537C, 0x5397, 0x5396, /* 0xF0 */
-    0x5399, 0x5398, 0x54BA, 0x54A1, 0x54AD, 0x54A5, 0x54CF          /* 0xF0 */
+    0x5399, 0x5398, 0x54BA, 0x54A1, 0x54AD, 0x54A5, 0x54CF			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_CE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x54C3, 0x830D, 0x54B7, 0x54AE, 0x54D6, 0x54B6, 0x54C5, 0x54C6, /* 0x40 */
     0x54A0, 0x5470, 0x54BC, 0x54A2, 0x54BE, 0x5472, 0x54DE, 0x54B0, /* 0x40 */
     0x57B5, 0x579E, 0x579F, 0x57A4, 0x578C, 0x5797, 0x579D, 0x579B, /* 0x50 */
@@ -1496,11 +1496,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_CE[] =
     0x590D, 0x5953, 0x59E1, 0x59DE, 0x59EE, 0x5A00, 0x59F1, 0x59DD, /* 0x60 */
     0x59FA, 0x59FD, 0x59FC, 0x59F6, 0x59E4, 0x59F2, 0x59F7, 0x59DB, /* 0x60 */
     0x59E9, 0x59F3, 0x59F5, 0x59E0, 0x59FE, 0x59F4, 0x59ED, 0x5BA8, /* 0x70 */
-    0x5C4C, 0x5CD0, 0x5CD8, 0x5CCC, 0x5CD7, 0x5CCB, 0x5CDB,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x5C4C, 0x5CD0, 0x5CD8, 0x5CCC, 0x5CD7, 0x5CCB, 0x5CDB, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x5CDE, 0x5CDA, 0x5CC9, 0x5CC7, 0x5CCA, 0x5CD6, 0x5CD3, /* 0xA0 */
     0x5CD4, 0x5CCF, 0x5CC8, 0x5CC6, 0x5CCE, 0x5CDF, 0x5CF8, 0x5DF9, /* 0xA0 */
     0x5E21, 0x5E22, 0x5E23, 0x5E20, 0x5E24, 0x5EB0, 0x5EA4, 0x5EA2, /* 0xB0 */
@@ -1512,15 +1512,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_CE[] =
     0x6300, 0x6313, 0x6314, 0x62FA, 0x6315, 0x62FB, 0x62F0, 0x6541, /* 0xE0 */
     0x6543, 0x65AA, 0x65BF, 0x6636, 0x6621, 0x6632, 0x6635, 0x661C, /* 0xE0 */
     0x6626, 0x6622, 0x6633, 0x662B, 0x663A, 0x661D, 0x6634, 0x6639, /* 0xF0 */
-    0x662E, 0x670F, 0x6710, 0x67C1, 0x67F2, 0x67C8, 0x67BA          /* 0xF0 */
+    0x662E, 0x670F, 0x6710, 0x67C1, 0x67F2, 0x67C8, 0x67BA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_CF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x67DC, 0x67BB, 0x67F8, 0x67D8, 0x67C0, 0x67B7, 0x67C5, 0x67EB, /* 0x40 */
     0x67E4, 0x67DF, 0x67B5, 0x67CD, 0x67B3, 0x67F7, 0x67F6, 0x67EE, /* 0x40 */
     0x67E3, 0x67C2, 0x67B9, 0x67CE, 0x67E7, 0x67F0, 0x67B2, 0x67FC, /* 0x50 */
@@ -1528,11 +1528,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_CF[] =
     0x67CA, 0x67C3, 0x67EA, 0x67CB, 0x6B28, 0x6B82, 0x6B84, 0x6BB6, /* 0x60 */
     0x6BD6, 0x6BD8, 0x6BE0, 0x6C20, 0x6C21, 0x6D28, 0x6D34, 0x6D2D, /* 0x60 */
     0x6D1F, 0x6D3C, 0x6D3F, 0x6D12, 0x6D0A, 0x6CDA, 0x6D33, 0x6D04, /* 0x70 */
-    0x6D19, 0x6D3A, 0x6D1A, 0x6D11, 0x6D00, 0x6D1D, 0x6D42,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x6D19, 0x6D3A, 0x6D1A, 0x6D11, 0x6D00, 0x6D1D, 0x6D42, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x6D01, 0x6D18, 0x6D37, 0x6D03, 0x6D0F, 0x6D40, 0x6D07, /* 0xA0 */
     0x6D20, 0x6D2C, 0x6D08, 0x6D22, 0x6D09, 0x6D10, 0x70B7, 0x709F, /* 0xA0 */
     0x70BE, 0x70B1, 0x70B0, 0x70A1, 0x70B4, 0x70B5, 0x70A9, 0x7241, /* 0xB0 */
@@ -1544,15 +1544,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_CF[] =
     0x7708, 0x7703, 0x7704, 0x7705, 0x770A, 0x76F7, 0x76FB, 0x76FA, /* 0xE0 */
     0x77E7, 0x77E8, 0x7806, 0x7811, 0x7812, 0x7805, 0x7810, 0x780F, /* 0xE0 */
     0x780E, 0x7809, 0x7803, 0x7813, 0x794A, 0x794C, 0x794B, 0x7945, /* 0xF0 */
-    0x7944, 0x79D5, 0x79CD, 0x79CF, 0x79D6, 0x79CE, 0x7A80          /* 0xF0 */
+    0x7944, 0x79D5, 0x79CD, 0x79CF, 0x79D6, 0x79CE, 0x7A80			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_D0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7A7E, 0x7AD1, 0x7B00, 0x7B01, 0x7C7A, 0x7C78, 0x7C79, 0x7C7F, /* 0x40 */
     0x7C80, 0x7C81, 0x7D03, 0x7D08, 0x7D01, 0x7F58, 0x7F91, 0x7F8D, /* 0x40 */
     0x7FBE, 0x8007, 0x800E, 0x800F, 0x8014, 0x8037, 0x80D8, 0x80C7, /* 0x50 */
@@ -1560,11 +1560,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D0[] =
     0x80DC, 0x80CA, 0x80D5, 0x80C9, 0x80CF, 0x80D7, 0x80E6, 0x80CD, /* 0x60 */
     0x81FF, 0x8221, 0x8294, 0x82D9, 0x82FE, 0x82F9, 0x8307, 0x82E8, /* 0x60 */
     0x8300, 0x82D5, 0x833A, 0x82EB, 0x82D6, 0x82F4, 0x82EC, 0x82E1, /* 0x70 */
-    0x82F2, 0x82F5, 0x830C, 0x82FB, 0x82F6, 0x82F0, 0x82EA,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x82F2, 0x82F5, 0x830C, 0x82FB, 0x82F6, 0x82F0, 0x82EA, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x82E4, 0x82E0, 0x82FA, 0x82F3, 0x82ED, 0x8677, 0x8674, /* 0xA0 */
     0x867C, 0x8673, 0x8841, 0x884E, 0x8867, 0x886A, 0x8869, 0x89D3, /* 0xA0 */
     0x8A04, 0x8A07, 0x8D72, 0x8FE3, 0x8FE1, 0x8FEE, 0x8FE0, 0x90F1, /* 0xB0 */
@@ -1576,15 +1576,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D0[] =
     0x5193, 0x51CA, 0x51C4, 0x51C5, 0x51C8, 0x51CE, 0x5261, 0x525A, /* 0xE0 */
     0x5252, 0x525E, 0x525F, 0x5255, 0x5262, 0x52CD, 0x530E, 0x539E, /* 0xE0 */
     0x5526, 0x54E2, 0x5517, 0x5512, 0x54E7, 0x54F3, 0x54E4, 0x551A, /* 0xF0 */
-    0x54FF, 0x5504, 0x5508, 0x54EB, 0x5511, 0x5505, 0x54F1          /* 0xF0 */
+    0x54FF, 0x5504, 0x5508, 0x54EB, 0x5511, 0x5505, 0x54F1			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_D1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x550A, 0x54FB, 0x54F7, 0x54F8, 0x54E0, 0x550E, 0x5503, 0x550B, /* 0x40 */
     0x5701, 0x5702, 0x57CC, 0x5832, 0x57D5, 0x57D2, 0x57BA, 0x57C6, /* 0x40 */
     0x57BD, 0x57BC, 0x57B8, 0x57B6, 0x57BF, 0x57C7, 0x57D0, 0x57B9, /* 0x50 */
@@ -1592,11 +1592,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D1[] =
     0x5A0F, 0x5A17, 0x5A0A, 0x5A1E, 0x5A33, 0x5B6C, 0x5BA7, 0x5BAD, /* 0x60 */
     0x5BAC, 0x5C03, 0x5C56, 0x5C54, 0x5CEC, 0x5CFF, 0x5CEE, 0x5CF1, /* 0x60 */
     0x5CF7, 0x5D00, 0x5CF9, 0x5E29, 0x5E28, 0x5EA8, 0x5EAE, 0x5EAA, /* 0x70 */
-    0x5EAC, 0x5F33, 0x5F30, 0x5F67, 0x605D, 0x605A, 0x6067,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x5EAC, 0x5F33, 0x5F30, 0x5F67, 0x605D, 0x605A, 0x6067, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x6041, 0x60A2, 0x6088, 0x6080, 0x6092, 0x6081, 0x609D, /* 0xA0 */
     0x6083, 0x6095, 0x609B, 0x6097, 0x6087, 0x609C, 0x608E, 0x6219, /* 0xA0 */
     0x6246, 0x62F2, 0x6310, 0x6356, 0x632C, 0x6344, 0x6345, 0x6336, /* 0xB0 */
@@ -1608,15 +1608,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D1[] =
     0x684F, 0x6816, 0x6831, 0x681C, 0x6835, 0x682B, 0x682D, 0x682F, /* 0xE0 */
     0x684E, 0x6844, 0x6834, 0x681D, 0x6812, 0x6814, 0x6826, 0x6828, /* 0xE0 */
     0x682E, 0x684D, 0x683A, 0x6825, 0x6820, 0x6B2C, 0x6B2F, 0x6B2D, /* 0xF0 */
-    0x6B31, 0x6B34, 0x6B6D, 0x8082, 0x6B88, 0x6BE6, 0x6BE4          /* 0xF0 */
+    0x6B31, 0x6B34, 0x6B6D, 0x8082, 0x6B88, 0x6BE6, 0x6BE4			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_D2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6BE8, 0x6BE3, 0x6BE2, 0x6BE7, 0x6C25, 0x6D7A, 0x6D63, 0x6D64, /* 0x40 */
     0x6D76, 0x6D0D, 0x6D61, 0x6D92, 0x6D58, 0x6D62, 0x6D6D, 0x6D6F, /* 0x40 */
     0x6D91, 0x6D8D, 0x6DEF, 0x6D7F, 0x6D86, 0x6D5E, 0x6D67, 0x6D60, /* 0x50 */
@@ -1624,11 +1624,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D2[] =
     0x6D8B, 0x6D7E, 0x6D80, 0x6D84, 0x6D16, 0x6D83, 0x6D7B, 0x6D7D, /* 0x60 */
     0x6D75, 0x6D90, 0x70DC, 0x70D3, 0x70D1, 0x70DD, 0x70CB, 0x7F39, /* 0x60 */
     0x70E2, 0x70D7, 0x70D2, 0x70DE, 0x70E0, 0x70D4, 0x70CD, 0x70C5, /* 0x70 */
-    0x70C6, 0x70C7, 0x70DA, 0x70CE, 0x70E1, 0x7242, 0x7278,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x70C6, 0x70C7, 0x70DA, 0x70CE, 0x70E1, 0x7242, 0x7278, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x7277, 0x7276, 0x7300, 0x72FA, 0x72F4, 0x72FE, 0x72F6, /* 0xA0 */
     0x72F3, 0x72FB, 0x7301, 0x73D3, 0x73D9, 0x73E5, 0x73D6, 0x73BC, /* 0xA0 */
     0x73E7, 0x73E3, 0x73E9, 0x73DC, 0x73D2, 0x73DB, 0x73D4, 0x73DD, /* 0xB0 */
@@ -1640,15 +1640,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D2[] =
     0x782B, 0x7821, 0x7829, 0x7833, 0x782A, 0x7831, 0x7954, 0x795B, /* 0xE0 */
     0x794F, 0x795C, 0x7953, 0x7952, 0x7951, 0x79EB, 0x79EC, 0x79E0, /* 0xE0 */
     0x79EE, 0x79ED, 0x79EA, 0x79DC, 0x79DE, 0x79DD, 0x7A86, 0x7A89, /* 0xF0 */
-    0x7A85, 0x7A8B, 0x7A8C, 0x7A8A, 0x7A87, 0x7AD8, 0x7B10          /* 0xF0 */
+    0x7A85, 0x7A8B, 0x7A8C, 0x7A8A, 0x7A87, 0x7AD8, 0x7B10			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_D3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7B04, 0x7B13, 0x7B05, 0x7B0F, 0x7B08, 0x7B0A, 0x7B0E, 0x7B09, /* 0x40 */
     0x7B12, 0x7C84, 0x7C91, 0x7C8A, 0x7C8C, 0x7C88, 0x7C8D, 0x7C85, /* 0x40 */
     0x7D1E, 0x7D1D, 0x7D11, 0x7D0E, 0x7D18, 0x7D16, 0x7D13, 0x7D1F, /* 0x50 */
@@ -1656,11 +1656,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D3[] =
     0x7F5B, 0x7F96, 0x7F92, 0x7FC3, 0x7FC2, 0x7FC0, 0x8016, 0x803E, /* 0x60 */
     0x8039, 0x80FA, 0x80F2, 0x80F9, 0x80F5, 0x8101, 0x80FB, 0x8100, /* 0x60 */
     0x8201, 0x822F, 0x8225, 0x8333, 0x832D, 0x8344, 0x8319, 0x8351, /* 0x70 */
-    0x8325, 0x8356, 0x833F, 0x8341, 0x8326, 0x831C, 0x8322,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x8325, 0x8356, 0x833F, 0x8341, 0x8326, 0x831C, 0x8322, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x8342, 0x834E, 0x831B, 0x832A, 0x8308, 0x833C, 0x834D, /* 0xA0 */
     0x8316, 0x8324, 0x8320, 0x8337, 0x832F, 0x8329, 0x8347, 0x8345, /* 0xA0 */
     0x834C, 0x8353, 0x831E, 0x832C, 0x834B, 0x8327, 0x8348, 0x8653, /* 0xB0 */
@@ -1672,15 +1672,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D3[] =
     0x8C7B, 0x8CA4, 0x8CA3, 0x8D76, 0x8D78, 0x8DB5, 0x8DB7, 0x8DB6, /* 0xE0 */
     0x8ED1, 0x8ED3, 0x8FFE, 0x8FF5, 0x9002, 0x8FFF, 0x8FFB, 0x9004, /* 0xE0 */
     0x8FFC, 0x8FF6, 0x90D6, 0x90E0, 0x90D9, 0x90DA, 0x90E3, 0x90DF, /* 0xF0 */
-    0x90E5, 0x90D8, 0x90DB, 0x90D7, 0x90DC, 0x90E4, 0x9150          /* 0xF0 */
+    0x90E5, 0x90D8, 0x90DB, 0x90D7, 0x90DC, 0x90E4, 0x9150			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_D4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x914E, 0x914F, 0x91D5, 0x91E2, 0x91DA, 0x965C, 0x965F, 0x96BC, /* 0x40 */
     0x98E3, 0x9ADF, 0x9B2F, 0x4E7F, 0x5070, 0x506A, 0x5061, 0x505E, /* 0x40 */
     0x5060, 0x5053, 0x504B, 0x505D, 0x5072, 0x5048, 0x504D, 0x5041, /* 0x50 */
@@ -1688,11 +1688,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D4[] =
     0x5063, 0x5064, 0x5046, 0x5040, 0x506E, 0x5073, 0x5057, 0x5051, /* 0x60 */
     0x51D0, 0x526B, 0x526D, 0x526C, 0x526E, 0x52D6, 0x52D3, 0x532D, /* 0x60 */
     0x539C, 0x5575, 0x5576, 0x553C, 0x554D, 0x5550, 0x5534, 0x552A, /* 0x70 */
-    0x5551, 0x5562, 0x5536, 0x5535, 0x5530, 0x5552, 0x5545,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x5551, 0x5562, 0x5536, 0x5535, 0x5530, 0x5552, 0x5545, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x550C, 0x5532, 0x5565, 0x554E, 0x5539, 0x5548, 0x552D, /* 0xA0 */
     0x553B, 0x5540, 0x554B, 0x570A, 0x5707, 0x57FB, 0x5814, 0x57E2, /* 0xA0 */
     0x57F6, 0x57DC, 0x57F4, 0x5800, 0x57ED, 0x57FD, 0x5808, 0x57F8, /* 0xB0 */
@@ -1704,15 +1704,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D4[] =
     0x5A44, 0x5A5B, 0x5A48, 0x5A8E, 0x5A3E, 0x5A4D, 0x5A39, 0x5A4C, /* 0xE0 */
     0x5A70, 0x5A69, 0x5A47, 0x5A51, 0x5A56, 0x5A42, 0x5A5C, 0x5B72, /* 0xE0 */
     0x5B6E, 0x5BC1, 0x5BC0, 0x5C59, 0x5D1E, 0x5D0B, 0x5D1D, 0x5D1A, /* 0xF0 */
-    0x5D20, 0x5D0C, 0x5D28, 0x5D0D, 0x5D26, 0x5D25, 0x5D0F          /* 0xF0 */
+    0x5D20, 0x5D0C, 0x5D28, 0x5D0D, 0x5D26, 0x5D25, 0x5D0F			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_D5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5D30, 0x5D12, 0x5D23, 0x5D1F, 0x5D2E, 0x5E3E, 0x5E34, 0x5EB1, /* 0x40 */
     0x5EB4, 0x5EB9, 0x5EB2, 0x5EB3, 0x5F36, 0x5F38, 0x5F9B, 0x5F96, /* 0x40 */
     0x5F9F, 0x608A, 0x6090, 0x6086, 0x60BE, 0x60B0, 0x60BA, 0x60D3, /* 0x50 */
@@ -1720,11 +1720,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D5[] =
     0x60B7, 0x60CA, 0x60BF, 0x60C3, 0x60CD, 0x60C0, 0x6332, 0x6365, /* 0x60 */
     0x638A, 0x6382, 0x637D, 0x63BD, 0x639E, 0x63AD, 0x639D, 0x6397, /* 0x60 */
     0x63AB, 0x638E, 0x636F, 0x6387, 0x6390, 0x636E, 0x63AF, 0x6375, /* 0x70 */
-    0x639C, 0x636D, 0x63AE, 0x637C, 0x63A4, 0x633B, 0x639F,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x639C, 0x636D, 0x63AE, 0x637C, 0x63A4, 0x633B, 0x639F, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x6378, 0x6385, 0x6381, 0x6391, 0x638D, 0x6370, 0x6553, /* 0xA0 */
     0x65CD, 0x6665, 0x6661, 0x665B, 0x6659, 0x665C, 0x6662, 0x6718, /* 0xA0 */
     0x6879, 0x6887, 0x6890, 0x689C, 0x686D, 0x686E, 0x68AE, 0x68AB, /* 0xB0 */
@@ -1736,15 +1736,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D5[] =
     0x6DC0, 0x6DAB, 0x6DB4, 0x6DB3, 0x6E74, 0x6DAC, 0x6DE9, 0x6DE2, /* 0xE0 */
     0x6DB7, 0x6DF6, 0x6DD4, 0x6E00, 0x6DC8, 0x6DE0, 0x6DDF, 0x6DD6, /* 0xE0 */
     0x6DBE, 0x6DE5, 0x6DDC, 0x6DDD, 0x6DDB, 0x6DF4, 0x6DCA, 0x6DBD, /* 0xF0 */
-    0x6DED, 0x6DF0, 0x6DBA, 0x6DD5, 0x6DC2, 0x6DCF, 0x6DC9          /* 0xF0 */
+    0x6DED, 0x6DF0, 0x6DBA, 0x6DD5, 0x6DC2, 0x6DCF, 0x6DC9			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_D6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6DD0, 0x6DF2, 0x6DD3, 0x6DFD, 0x6DD7, 0x6DCD, 0x6DE3, 0x6DBB, /* 0x40 */
     0x70FA, 0x710D, 0x70F7, 0x7117, 0x70F4, 0x710C, 0x70F0, 0x7104, /* 0x40 */
     0x70F3, 0x7110, 0x70FC, 0x70FF, 0x7106, 0x7113, 0x7100, 0x70F8, /* 0x50 */
@@ -1752,11 +1752,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D6[] =
     0x731D, 0x7317, 0x7307, 0x7311, 0x7318, 0x730A, 0x7308, 0x72FF, /* 0x60 */
     0x730F, 0x731E, 0x7388, 0x73F6, 0x73F8, 0x73F5, 0x7404, 0x7401, /* 0x60 */
     0x73FD, 0x7407, 0x7400, 0x73FA, 0x73FC, 0x73FF, 0x740C, 0x740B, /* 0x70 */
-    0x73F4, 0x7408, 0x7564, 0x7563, 0x75CE, 0x75D2, 0x75CF,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x73F4, 0x7408, 0x7564, 0x7563, 0x75CE, 0x75D2, 0x75CF, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x75CB, 0x75CC, 0x75D1, 0x75D0, 0x768F, 0x7689, 0x76D3, /* 0xA0 */
     0x7739, 0x772F, 0x772D, 0x7731, 0x7732, 0x7734, 0x7733, 0x773D, /* 0xA0 */
     0x7725, 0x773B, 0x7735, 0x7848, 0x7852, 0x7849, 0x784D, 0x784A, /* 0xB0 */
@@ -1768,15 +1768,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D6[] =
     0x7C96, 0x7CA3, 0x7D35, 0x7D3D, 0x7D38, 0x7D36, 0x7D3A, 0x7D45, /* 0xE0 */
     0x7D2C, 0x7D29, 0x7D41, 0x7D47, 0x7D3E, 0x7D3F, 0x7D4A, 0x7D3B, /* 0xE0 */
     0x7D28, 0x7F63, 0x7F95, 0x7F9C, 0x7F9D, 0x7F9B, 0x7FCA, 0x7FCB, /* 0xF0 */
-    0x7FCD, 0x7FD0, 0x7FD1, 0x7FC7, 0x7FCF, 0x7FC9, 0x801F          /* 0xF0 */
+    0x7FCD, 0x7FD0, 0x7FD1, 0x7FC7, 0x7FCF, 0x7FC9, 0x801F			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_D7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x801E, 0x801B, 0x8047, 0x8043, 0x8048, 0x8118, 0x8125, 0x8119, /* 0x40 */
     0x811B, 0x812D, 0x811F, 0x812C, 0x811E, 0x8121, 0x8115, 0x8127, /* 0x40 */
     0x811D, 0x8122, 0x8211, 0x8238, 0x8233, 0x823A, 0x8234, 0x8232, /* 0x50 */
@@ -1784,11 +1784,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D7[] =
     0x8374, 0x838F, 0x8381, 0x8395, 0x8399, 0x8375, 0x8394, 0x83A9, /* 0x60 */
     0x837D, 0x8383, 0x838C, 0x839D, 0x839B, 0x83AA, 0x838B, 0x837E, /* 0x60 */
     0x83A5, 0x83AF, 0x8388, 0x8397, 0x83B0, 0x837F, 0x83A6, 0x8387, /* 0x70 */
-    0x83AE, 0x8376, 0x839A, 0x8659, 0x8656, 0x86BF, 0x86B7,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x83AE, 0x8376, 0x839A, 0x8659, 0x8656, 0x86BF, 0x86B7, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x86C2, 0x86C1, 0x86C5, 0x86BA, 0x86B0, 0x86C8, 0x86B9, /* 0xA0 */
     0x86B3, 0x86B8, 0x86CC, 0x86B4, 0x86BB, 0x86BC, 0x86C3, 0x86BD, /* 0xA0 */
     0x86BE, 0x8852, 0x8889, 0x8895, 0x88A8, 0x88A2, 0x88AA, 0x889A, /* 0xB0 */
@@ -1800,15 +1800,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D7[] =
     0x8EE0, 0x8EE1, 0x9024, 0x900B, 0x9011, 0x901C, 0x900C, 0x9021, /* 0xE0 */
     0x90EF, 0x90EA, 0x90F0, 0x90F4, 0x90F2, 0x90F3, 0x90D4, 0x90EB, /* 0xE0 */
     0x90EC, 0x90E9, 0x9156, 0x9158, 0x915A, 0x9153, 0x9155, 0x91EC, /* 0xF0 */
-    0x91F4, 0x91F1, 0x91F3, 0x91F8, 0x91E4, 0x91F9, 0x91EA          /* 0xF0 */
+    0x91F4, 0x91F1, 0x91F3, 0x91F8, 0x91E4, 0x91F9, 0x91EA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_D8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x91EB, 0x91F7, 0x91E8, 0x91EE, 0x957A, 0x9586, 0x9588, 0x967C, /* 0x40 */
     0x966D, 0x966B, 0x9671, 0x966F, 0x96BF, 0x976A, 0x9804, 0x98E5, /* 0x40 */
     0x9997, 0x509B, 0x5095, 0x5094, 0x509E, 0x508B, 0x50A3, 0x5083, /* 0x50 */
@@ -1816,11 +1816,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D8[] =
     0x515F, 0x51D4, 0x5312, 0x5311, 0x53A4, 0x53A7, 0x5591, 0x55A8, /* 0x60 */
     0x55A5, 0x55AD, 0x5577, 0x5645, 0x55A2, 0x5593, 0x5588, 0x558F, /* 0x60 */
     0x55B5, 0x5581, 0x55A3, 0x5592, 0x55A4, 0x557D, 0x558C, 0x55A6, /* 0x70 */
-    0x557F, 0x5595, 0x55A1, 0x558E, 0x570C, 0x5829, 0x5837,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x557F, 0x5595, 0x55A1, 0x558E, 0x570C, 0x5829, 0x5837, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x5819, 0x581E, 0x5827, 0x5823, 0x5828, 0x57F5, 0x5848, /* 0xA0 */
     0x5825, 0x581C, 0x581B, 0x5833, 0x583F, 0x5836, 0x582E, 0x5839, /* 0xA0 */
     0x5838, 0x582D, 0x582C, 0x583B, 0x5961, 0x5AAF, 0x5A94, 0x5A9F, /* 0xB0 */
@@ -1832,15 +1832,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D8[] =
     0x5D51, 0x5D4E, 0x5D55, 0x5D33, 0x5D3A, 0x5D52, 0x5D3D, 0x5D31, /* 0xE0 */
     0x5D59, 0x5D42, 0x5D39, 0x5D49, 0x5D38, 0x5D3C, 0x5D32, 0x5D36, /* 0xE0 */
     0x5D40, 0x5D45, 0x5E44, 0x5E41, 0x5F58, 0x5FA6, 0x5FA5, 0x5FAB, /* 0xF0 */
-    0x60C9, 0x60B9, 0x60CC, 0x60E2, 0x60CE, 0x60C4, 0x6114          /* 0xF0 */
+    0x60C9, 0x60B9, 0x60CC, 0x60E2, 0x60CE, 0x60C4, 0x6114			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_D9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x60F2, 0x610A, 0x6116, 0x6105, 0x60F5, 0x6113, 0x60F8, 0x60FC, /* 0x40 */
     0x60FE, 0x60C1, 0x6103, 0x6118, 0x611D, 0x6110, 0x60FF, 0x6104, /* 0x40 */
     0x610B, 0x624A, 0x6394, 0x63B1, 0x63B0, 0x63CE, 0x63E5, 0x63E8, /* 0x50 */
@@ -1848,11 +1848,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D9[] =
     0x63F2, 0x63F5, 0x6461, 0x63DF, 0x63BE, 0x63DD, 0x63DC, 0x63C4, /* 0x60 */
     0x63D8, 0x63D3, 0x63C2, 0x63C7, 0x63CC, 0x63CB, 0x63C8, 0x63F0, /* 0x60 */
     0x63D7, 0x63D9, 0x6532, 0x6567, 0x656A, 0x6564, 0x655C, 0x6568, /* 0x70 */
-    0x6565, 0x658C, 0x659D, 0x659E, 0x65AE, 0x65D0, 0x65D2,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x6565, 0x658C, 0x659D, 0x659E, 0x65AE, 0x65D0, 0x65D2, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x667C, 0x666C, 0x667B, 0x6680, 0x6671, 0x6679, 0x666A, /* 0xA0 */
     0x6672, 0x6701, 0x690C, 0x68D3, 0x6904, 0x68DC, 0x692A, 0x68EC, /* 0xA0 */
     0x68EA, 0x68F1, 0x690F, 0x68D6, 0x68F7, 0x68EB, 0x68E4, 0x68F6, /* 0xB0 */
@@ -1864,15 +1864,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_D9[] =
     0x6B99, 0x6B95, 0x6BBD, 0x6BF0, 0x6BF2, 0x6BF3, 0x6C30, 0x6DFC, /* 0xE0 */
     0x6E46, 0x6E47, 0x6E1F, 0x6E49, 0x6E88, 0x6E3C, 0x6E3D, 0x6E45, /* 0xE0 */
     0x6E62, 0x6E2B, 0x6E3F, 0x6E41, 0x6E5D, 0x6E73, 0x6E1C, 0x6E33, /* 0xF0 */
-    0x6E4B, 0x6E40, 0x6E51, 0x6E3B, 0x6E03, 0x6E2E, 0x6E5E          /* 0xF0 */
+    0x6E4B, 0x6E40, 0x6E51, 0x6E3B, 0x6E03, 0x6E2E, 0x6E5E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_DA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6E68, 0x6E5C, 0x6E61, 0x6E31, 0x6E28, 0x6E60, 0x6E71, 0x6E6B, /* 0x40 */
     0x6E39, 0x6E22, 0x6E30, 0x6E53, 0x6E65, 0x6E27, 0x6E78, 0x6E64, /* 0x40 */
     0x6E77, 0x6E55, 0x6E79, 0x6E52, 0x6E66, 0x6E35, 0x6E36, 0x6E5A, /* 0x50 */
@@ -1880,11 +1880,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_DA[] =
     0x7122, 0x7132, 0x711F, 0x7128, 0x713A, 0x711B, 0x724B, 0x725A, /* 0x60 */
     0x7288, 0x7289, 0x7286, 0x7285, 0x728B, 0x7312, 0x730B, 0x7330, /* 0x60 */
     0x7322, 0x7331, 0x7333, 0x7327, 0x7332, 0x732D, 0x7326, 0x7323, /* 0x70 */
-    0x7335, 0x730C, 0x742E, 0x742C, 0x7430, 0x742B, 0x7416,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x7335, 0x730C, 0x742E, 0x742C, 0x7430, 0x742B, 0x7416, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x741A, 0x7421, 0x742D, 0x7431, 0x7424, 0x7423, 0x741D, /* 0xA0 */
     0x7429, 0x7420, 0x7432, 0x74FB, 0x752F, 0x756F, 0x756C, 0x75E7, /* 0xA0 */
     0x75DA, 0x75E1, 0x75E6, 0x75DD, 0x75DF, 0x75E4, 0x75D7, 0x7695, /* 0xB0 */
@@ -1896,15 +1896,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_DA[] =
     0x7B44, 0x7B48, 0x7B4C, 0x7B4E, 0x7B40, 0x7B58, 0x7B45, 0x7CA2, /* 0xE0 */
     0x7C9E, 0x7CA8, 0x7CA1, 0x7D58, 0x7D6F, 0x7D63, 0x7D53, 0x7D56, /* 0xE0 */
     0x7D67, 0x7D6A, 0x7D4F, 0x7D6D, 0x7D5C, 0x7D6B, 0x7D52, 0x7D54, /* 0xF0 */
-    0x7D69, 0x7D51, 0x7D5F, 0x7D4E, 0x7F3E, 0x7F3F, 0x7F65          /* 0xF0 */
+    0x7D69, 0x7D51, 0x7D5F, 0x7D4E, 0x7F3E, 0x7F3F, 0x7F65			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_DB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7F66, 0x7FA2, 0x7FA0, 0x7FA1, 0x7FD7, 0x8051, 0x804F, 0x8050, /* 0x40 */
     0x80FE, 0x80D4, 0x8143, 0x814A, 0x8152, 0x814F, 0x8147, 0x813D, /* 0x40 */
     0x814D, 0x813A, 0x81E6, 0x81EE, 0x81F7, 0x81F8, 0x81F9, 0x8204, /* 0x50 */
@@ -1912,11 +1912,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_DB[] =
     0x83C0, 0x83E8, 0x8412, 0x83E7, 0x83E4, 0x83FC, 0x83F6, 0x8410, /* 0x60 */
     0x83C6, 0x83C8, 0x83EB, 0x83E3, 0x83BF, 0x8401, 0x83DD, 0x83E5, /* 0x60 */
     0x83D8, 0x83FF, 0x83E1, 0x83CB, 0x83CE, 0x83D6, 0x83F5, 0x83C9, /* 0x70 */
-    0x8409, 0x840F, 0x83DE, 0x8411, 0x8406, 0x83C2, 0x83F3,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x8409, 0x840F, 0x83DE, 0x8411, 0x8406, 0x83C2, 0x83F3, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x83D5, 0x83FA, 0x83C7, 0x83D1, 0x83EA, 0x8413, 0x83C3, /* 0xA0 */
     0x83EC, 0x83EE, 0x83C4, 0x83FB, 0x83D7, 0x83E2, 0x841B, 0x83DB, /* 0xA0 */
     0x83FE, 0x86D8, 0x86E2, 0x86E6, 0x86D3, 0x86E3, 0x86DA, 0x86EA, /* 0xB0 */
@@ -1928,15 +1928,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_DB[] =
     0x8A48, 0x8A51, 0x8A4A, 0x8A4C, 0x8A4F, 0x8C5F, 0x8C81, 0x8C80, /* 0xE0 */
     0x8CBA, 0x8CBE, 0x8CB0, 0x8CB9, 0x8CB5, 0x8D84, 0x8D80, 0x8D89, /* 0xE0 */
     0x8DD8, 0x8DD3, 0x8DCD, 0x8DC7, 0x8DD6, 0x8DDC, 0x8DCF, 0x8DD5, /* 0xF0 */
-    0x8DD9, 0x8DC8, 0x8DD7, 0x8DC5, 0x8EEF, 0x8EF7, 0x8EFA          /* 0xF0 */
+    0x8DD9, 0x8DC8, 0x8DD7, 0x8DC5, 0x8EEF, 0x8EF7, 0x8EFA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_DC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8EF9, 0x8EE6, 0x8EEE, 0x8EE5, 0x8EF5, 0x8EE7, 0x8EE8, 0x8EF6, /* 0x40 */
     0x8EEB, 0x8EF1, 0x8EEC, 0x8EF4, 0x8EE9, 0x902D, 0x9034, 0x902F, /* 0x40 */
     0x9106, 0x912C, 0x9104, 0x90FF, 0x90FC, 0x9108, 0x90F9, 0x90FB, /* 0x50 */
@@ -1944,11 +1944,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_DC[] =
     0x9162, 0x9160, 0x9201, 0x920A, 0x9225, 0x9203, 0x921A, 0x9226, /* 0x60 */
     0x920F, 0x920C, 0x9200, 0x9212, 0x91FF, 0x91FD, 0x9206, 0x9204, /* 0x60 */
     0x9227, 0x9202, 0x921C, 0x9224, 0x9219, 0x9217, 0x9205, 0x9216, /* 0x70 */
-    0x957B, 0x958D, 0x958C, 0x9590, 0x9687, 0x967E, 0x9688,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x957B, 0x958D, 0x958C, 0x9590, 0x9687, 0x967E, 0x9688, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x9689, 0x9683, 0x9680, 0x96C2, 0x96C8, 0x96C3, 0x96F1, /* 0xA0 */
     0x96F0, 0x976C, 0x9770, 0x976E, 0x9807, 0x98A9, 0x98EB, 0x9CE6, /* 0xA0 */
     0x9EF9, 0x4E83, 0x4E84, 0x4EB6, 0x50BD, 0x50BF, 0x50C6, 0x50AE, /* 0xB0 */
@@ -1960,15 +1960,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_DC[] =
     0x55C2, 0x5714, 0x5853, 0x5868, 0x5864, 0x584F, 0x584D, 0x5849, /* 0xE0 */
     0x586F, 0x5855, 0x584E, 0x585D, 0x5859, 0x5865, 0x585B, 0x583D, /* 0xE0 */
     0x5863, 0x5871, 0x58FC, 0x5AC7, 0x5AC4, 0x5ACB, 0x5ABA, 0x5AB8, /* 0xF0 */
-    0x5AB1, 0x5AB5, 0x5AB0, 0x5ABF, 0x5AC8, 0x5ABB, 0x5AC6          /* 0xF0 */
+    0x5AB1, 0x5AB5, 0x5AB0, 0x5ABF, 0x5AC8, 0x5ABB, 0x5AC6			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_DD[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5AB7, 0x5AC0, 0x5ACA, 0x5AB4, 0x5AB6, 0x5ACD, 0x5AB9, 0x5A90, /* 0x40 */
     0x5BD6, 0x5BD8, 0x5BD9, 0x5C1F, 0x5C33, 0x5D71, 0x5D63, 0x5D4A, /* 0x40 */
     0x5D65, 0x5D72, 0x5D6C, 0x5D5E, 0x5D68, 0x5D67, 0x5D62, 0x5DF0, /* 0x50 */
@@ -1976,11 +1976,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_DD[] =
     0x5ECB, 0x5EC7, 0x5F40, 0x5FAF, 0x5FAD, 0x60F7, 0x6149, 0x614A, /* 0x60 */
     0x612B, 0x6145, 0x6136, 0x6132, 0x612E, 0x6146, 0x612F, 0x614F, /* 0x60 */
     0x6129, 0x6140, 0x6220, 0x9168, 0x6223, 0x6225, 0x6224, 0x63C5, /* 0x70 */
-    0x63F1, 0x63EB, 0x6410, 0x6412, 0x6409, 0x6420, 0x6424,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x63F1, 0x63EB, 0x6410, 0x6412, 0x6409, 0x6420, 0x6424, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x6433, 0x6443, 0x641F, 0x6415, 0x6418, 0x6439, 0x6437, /* 0xA0 */
     0x6422, 0x6423, 0x640C, 0x6426, 0x6430, 0x6428, 0x6441, 0x6435, /* 0xA0 */
     0x642F, 0x640A, 0x641A, 0x6440, 0x6425, 0x6427, 0x640B, 0x63E7, /* 0xB0 */
@@ -1992,15 +1992,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_DD[] =
     0x6934, 0x6969, 0x6940, 0x696F, 0x6944, 0x6976, 0x6958, 0x6941, /* 0xE0 */
     0x6974, 0x694C, 0x693B, 0x694B, 0x6937, 0x695C, 0x694F, 0x6951, /* 0xE0 */
     0x6932, 0x6952, 0x692F, 0x697B, 0x693C, 0x6B46, 0x6B45, 0x6B43, /* 0xF0 */
-    0x6B42, 0x6B48, 0x6B41, 0x6B9B, 0xFA0D, 0x6BFB, 0x6BFC          /* 0xF0 */
+    0x6B42, 0x6B48, 0x6B41, 0x6B9B, 0xFA0D, 0x6BFB, 0x6BFC			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_DE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6BF9, 0x6BF7, 0x6BF8, 0x6E9B, 0x6ED6, 0x6EC8, 0x6E8F, 0x6EC0, /* 0x40 */
     0x6E9F, 0x6E93, 0x6E94, 0x6EA0, 0x6EB1, 0x6EB9, 0x6EC6, 0x6ED2, /* 0x40 */
     0x6EBD, 0x6EC1, 0x6E9E, 0x6EC9, 0x6EB7, 0x6EB0, 0x6ECD, 0x6EA6, /* 0x50 */
@@ -2008,11 +2008,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_DE[] =
     0x6E8E, 0x6E8D, 0x6EA4, 0x6EA1, 0x6EBF, 0x6EB3, 0x6ED0, 0x6ECA, /* 0x60 */
     0x6E97, 0x6EAE, 0x6EA3, 0x7147, 0x7154, 0x7152, 0x7163, 0x7160, /* 0x60 */
     0x7141, 0x715D, 0x7162, 0x7172, 0x7178, 0x716A, 0x7161, 0x7142, /* 0x70 */
-    0x7158, 0x7143, 0x714B, 0x7170, 0x715F, 0x7150, 0x7153,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x7158, 0x7143, 0x714B, 0x7170, 0x715F, 0x7150, 0x7153, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x7144, 0x714D, 0x715A, 0x724F, 0x728D, 0x728C, 0x7291, /* 0xA0 */
     0x7290, 0x728E, 0x733C, 0x7342, 0x733B, 0x733A, 0x7340, 0x734A, /* 0xA0 */
     0x7349, 0x7444, 0x744A, 0x744B, 0x7452, 0x7451, 0x7457, 0x7440, /* 0xB0 */
@@ -2024,15 +2024,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_DE[] =
     0x7754, 0x7759, 0x776D, 0x77E0, 0x7887, 0x789A, 0x7894, 0x788F, /* 0xE0 */
     0x7884, 0x7895, 0x7885, 0x7886, 0x78A1, 0x7883, 0x7879, 0x7899, /* 0xE0 */
     0x7880, 0x7896, 0x787B, 0x797C, 0x7982, 0x797D, 0x7979, 0x7A11, /* 0xF0 */
-    0x7A18, 0x7A19, 0x7A12, 0x7A17, 0x7A15, 0x7A22, 0x7A13          /* 0xF0 */
+    0x7A18, 0x7A19, 0x7A12, 0x7A17, 0x7A15, 0x7A22, 0x7A13			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_DF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7A1B, 0x7A10, 0x7AA3, 0x7AA2, 0x7A9E, 0x7AEB, 0x7B66, 0x7B64, /* 0x40 */
     0x7B6D, 0x7B74, 0x7B69, 0x7B72, 0x7B65, 0x7B73, 0x7B71, 0x7B70, /* 0x40 */
     0x7B61, 0x7B78, 0x7B76, 0x7B63, 0x7CB2, 0x7CB4, 0x7CAF, 0x7D88, /* 0x50 */
@@ -2040,11 +2040,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_DF[] =
     0x7D83, 0x7D7C, 0x7D8C, 0x7D94, 0x7D84, 0x7D7D, 0x7D92, 0x7F6D, /* 0x60 */
     0x7F6B, 0x7F67, 0x7F68, 0x7F6C, 0x7FA6, 0x7FA5, 0x7FA7, 0x7FDB, /* 0x60 */
     0x7FDC, 0x8021, 0x8164, 0x8160, 0x8177, 0x815C, 0x8169, 0x815B, /* 0x70 */
-    0x8162, 0x8172, 0x6721, 0x815E, 0x8176, 0x8167, 0x816F,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x8162, 0x8172, 0x6721, 0x815E, 0x8176, 0x8167, 0x816F, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x8144, 0x8161, 0x821D, 0x8249, 0x8244, 0x8240, 0x8242, /* 0xA0 */
     0x8245, 0x84F1, 0x843F, 0x8456, 0x8476, 0x8479, 0x848F, 0x848D, /* 0xA0 */
     0x8465, 0x8451, 0x8440, 0x8486, 0x8467, 0x8430, 0x844D, 0x847D, /* 0xB0 */
@@ -2056,15 +2056,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_DF[] =
     0x846E, 0x8450, 0x870B, 0x8704, 0x86F7, 0x870C, 0x86FA, 0x86D6, /* 0xE0 */
     0x86F5, 0x874D, 0x86F8, 0x870E, 0x8709, 0x8701, 0x86F6, 0x870D, /* 0xE0 */
     0x8705, 0x88D6, 0x88CB, 0x88CD, 0x88CE, 0x88DE, 0x88DB, 0x88DA, /* 0xF0 */
-    0x88CC, 0x88D0, 0x8985, 0x899B, 0x89DF, 0x89E5, 0x89E4          /* 0xF0 */
+    0x88CC, 0x88D0, 0x8985, 0x899B, 0x89DF, 0x89E5, 0x89E4			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_E0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x89E1, 0x89E0, 0x89E2, 0x89DC, 0x89E6, 0x8A76, 0x8A86, 0x8A7F, /* 0x40 */
     0x8A61, 0x8A3F, 0x8A77, 0x8A82, 0x8A84, 0x8A75, 0x8A83, 0x8A81, /* 0x40 */
     0x8A74, 0x8A7A, 0x8C3C, 0x8C4B, 0x8C4A, 0x8C65, 0x8C64, 0x8C66, /* 0x50 */
@@ -2072,11 +2072,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E0[] =
     0x8D8E, 0x8D8F, 0x8D8D, 0x8D93, 0x8D94, 0x8D90, 0x8D92, 0x8DF0, /* 0x60 */
     0x8DE0, 0x8DEC, 0x8DF1, 0x8DEE, 0x8DD0, 0x8DE9, 0x8DE3, 0x8DE2, /* 0x60 */
     0x8DE7, 0x8DF2, 0x8DEB, 0x8DF4, 0x8F06, 0x8EFF, 0x8F01, 0x8F00, /* 0x70 */
-    0x8F05, 0x8F07, 0x8F08, 0x8F02, 0x8F0B, 0x9052, 0x903F,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x8F05, 0x8F07, 0x8F08, 0x8F02, 0x8F0B, 0x9052, 0x903F, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x9044, 0x9049, 0x903D, 0x9110, 0x910D, 0x910F, 0x9111, /* 0xA0 */
     0x9116, 0x9114, 0x910B, 0x910E, 0x916E, 0x916F, 0x9248, 0x9252, /* 0xA0 */
     0x9230, 0x923A, 0x9266, 0x9233, 0x9265, 0x925E, 0x9283, 0x922E, /* 0xB0 */
@@ -2088,15 +2088,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E0[] =
     0x980E, 0x98AC, 0x98F6, 0x98F9, 0x99AF, 0x99B2, 0x99B0, 0x99B5, /* 0xE0 */
     0x9AAD, 0x9AAB, 0x9B5B, 0x9CEA, 0x9CED, 0x9CE7, 0x9E80, 0x9EFD, /* 0xE0 */
     0x50E6, 0x50D4, 0x50D7, 0x50E8, 0x50F3, 0x50DB, 0x50EA, 0x50DD, /* 0xF0 */
-    0x50E4, 0x50D3, 0x50EC, 0x50F0, 0x50EF, 0x50E3, 0x50E0          /* 0xF0 */
+    0x50E4, 0x50D3, 0x50EC, 0x50F0, 0x50EF, 0x50E3, 0x50E0			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_E1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x51D8, 0x5280, 0x5281, 0x52E9, 0x52EB, 0x5330, 0x53AC, 0x5627, /* 0x40 */
     0x5615, 0x560C, 0x5612, 0x55FC, 0x560F, 0x561C, 0x5601, 0x5613, /* 0x40 */
     0x5602, 0x55FA, 0x561D, 0x5604, 0x55FF, 0x55F9, 0x5889, 0x587C, /* 0x50 */
@@ -2104,11 +2104,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E1[] =
     0x5887, 0x5891, 0x588E, 0x5876, 0x5882, 0x5888, 0x587B, 0x5894, /* 0x60 */
     0x588F, 0x58FE, 0x596B, 0x5ADC, 0x5AEE, 0x5AE5, 0x5AD5, 0x5AEA, /* 0x60 */
     0x5ADA, 0x5AED, 0x5AEB, 0x5AF3, 0x5AE2, 0x5AE0, 0x5ADB, 0x5AEC, /* 0x70 */
-    0x5ADE, 0x5ADD, 0x5AD9, 0x5AE8, 0x5ADF, 0x5B77, 0x5BE0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x5ADE, 0x5ADD, 0x5AD9, 0x5AE8, 0x5ADF, 0x5B77, 0x5BE0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x5BE3, 0x5C63, 0x5D82, 0x5D80, 0x5D7D, 0x5D86, 0x5D7A, /* 0xA0 */
     0x5D81, 0x5D77, 0x5D8A, 0x5D89, 0x5D88, 0x5D7E, 0x5D7C, 0x5D8D, /* 0xA0 */
     0x5D79, 0x5D7F, 0x5E58, 0x5E59, 0x5E53, 0x5ED8, 0x5ED1, 0x5ED7, /* 0xB0 */
@@ -2120,15 +2120,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E1[] =
     0x6473, 0x647D, 0x6475, 0x6466, 0x64A6, 0x644E, 0x6482, 0x645E, /* 0xE0 */
     0x645C, 0x644B, 0x6453, 0x6460, 0x6450, 0x647F, 0x643F, 0x646C, /* 0xE0 */
     0x646B, 0x6459, 0x6465, 0x6477, 0x6573, 0x65A0, 0x66A1, 0x66A0, /* 0xF0 */
-    0x669F, 0x6705, 0x6704, 0x6722, 0x69B1, 0x69B6, 0x69C9          /* 0xF0 */
+    0x669F, 0x6705, 0x6704, 0x6722, 0x69B1, 0x69B6, 0x69C9			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_E2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x69A0, 0x69CE, 0x6996, 0x69B0, 0x69AC, 0x69BC, 0x6991, 0x6999, /* 0x40 */
     0x698E, 0x69A7, 0x698D, 0x69A9, 0x69BE, 0x69AF, 0x69BF, 0x69C4, /* 0x40 */
     0x69BD, 0x69A4, 0x69D4, 0x69B9, 0x69CA, 0x699A, 0x69CF, 0x69B3, /* 0x50 */
@@ -2136,11 +2136,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E2[] =
     0x69B5, 0x69A5, 0x69C6, 0x6B4A, 0x6B4D, 0x6B4B, 0x6B9E, 0x6B9F, /* 0x60 */
     0x6BA0, 0x6BC3, 0x6BC4, 0x6BFE, 0x6ECE, 0x6EF5, 0x6EF1, 0x6F03, /* 0x60 */
     0x6F25, 0x6EF8, 0x6F37, 0x6EFB, 0x6F2E, 0x6F09, 0x6F4E, 0x6F19, /* 0x70 */
-    0x6F1A, 0x6F27, 0x6F18, 0x6F3B, 0x6F12, 0x6EED, 0x6F0A,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x6F1A, 0x6F27, 0x6F18, 0x6F3B, 0x6F12, 0x6EED, 0x6F0A, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x6F36, 0x6F73, 0x6EF9, 0x6EEE, 0x6F2D, 0x6F40, 0x6F30, /* 0xA0 */
     0x6F3C, 0x6F35, 0x6EEB, 0x6F07, 0x6F0E, 0x6F43, 0x6F05, 0x6EFD, /* 0xA0 */
     0x6EF6, 0x6F39, 0x6F1C, 0x6EFC, 0x6F3A, 0x6F1F, 0x6F0D, 0x6F1E, /* 0xB0 */
@@ -2152,15 +2152,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E2[] =
     0x7614, 0x76B8, 0x7781, 0x777C, 0x7785, 0x7782, 0x776E, 0x7780, /* 0xE0 */
     0x776F, 0x777E, 0x7783, 0x78B2, 0x78AA, 0x78B4, 0x78AD, 0x78A8, /* 0xE0 */
     0x787E, 0x78AB, 0x789E, 0x78A5, 0x78A0, 0x78AC, 0x78A2, 0x78A4, /* 0xF0 */
-    0x7998, 0x798A, 0x798B, 0x7996, 0x7995, 0x7994, 0x7993          /* 0xF0 */
+    0x7998, 0x798A, 0x798B, 0x7996, 0x7995, 0x7994, 0x7993			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_E3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7997, 0x7988, 0x7992, 0x7990, 0x7A2B, 0x7A4A, 0x7A30, 0x7A2F, /* 0x40 */
     0x7A28, 0x7A26, 0x7AA8, 0x7AAB, 0x7AAC, 0x7AEE, 0x7B88, 0x7B9C, /* 0x40 */
     0x7B8A, 0x7B91, 0x7B90, 0x7B96, 0x7B8D, 0x7B8C, 0x7B9B, 0x7B8E, /* 0x50 */
@@ -2168,11 +2168,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E3[] =
     0x7CBC, 0x7CBA, 0x7DA7, 0x7DB7, 0x7DC2, 0x7DA3, 0x7DAA, 0x7DC1, /* 0x60 */
     0x7DC0, 0x7DC5, 0x7D9D, 0x7DCE, 0x7DC4, 0x7DC6, 0x7DCB, 0x7DCC, /* 0x60 */
     0x7DAF, 0x7DB9, 0x7D96, 0x7DBC, 0x7D9F, 0x7DA6, 0x7DAE, 0x7DA9, /* 0x70 */
-    0x7DA1, 0x7DC9, 0x7F73, 0x7FE2, 0x7FE3, 0x7FE5, 0x7FDE,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x7DA1, 0x7DC9, 0x7F73, 0x7FE2, 0x7FE3, 0x7FE5, 0x7FDE, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x8024, 0x805D, 0x805C, 0x8189, 0x8186, 0x8183, 0x8187, /* 0xA0 */
     0x818D, 0x818C, 0x818B, 0x8215, 0x8497, 0x84A4, 0x84A1, 0x849F, /* 0xA0 */
     0x84BA, 0x84CE, 0x84C2, 0x84AC, 0x84AE, 0x84AB, 0x84B9, 0x84B4, /* 0xB0 */
@@ -2184,15 +2184,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E3[] =
     0x872C, 0x8741, 0x873E, 0x8746, 0x8720, 0x8732, 0x872A, 0x872D, /* 0xE0 */
     0x873C, 0x8712, 0x873A, 0x8731, 0x8735, 0x8742, 0x8726, 0x8727, /* 0xE0 */
     0x8738, 0x8724, 0x871A, 0x8730, 0x8711, 0x88F7, 0x88E7, 0x88F1, /* 0xF0 */
-    0x88F2, 0x88FA, 0x88FE, 0x88EE, 0x88FC, 0x88F6, 0x88FB          /* 0xF0 */
+    0x88F2, 0x88FA, 0x88FE, 0x88EE, 0x88FC, 0x88F6, 0x88FB			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_E4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x88F0, 0x88EC, 0x88EB, 0x899D, 0x89A1, 0x899F, 0x899E, 0x89E9, /* 0x40 */
     0x89EB, 0x89E8, 0x8AAB, 0x8A99, 0x8A8B, 0x8A92, 0x8A8F, 0x8A96, /* 0x40 */
     0x8C3D, 0x8C68, 0x8C69, 0x8CD5, 0x8CCF, 0x8CD7, 0x8D96, 0x8E09, /* 0x50 */
@@ -2200,11 +2200,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E4[] =
     0x8E05, 0x8DFE, 0x8E00, 0x8E04, 0x8F10, 0x8F11, 0x8F0E, 0x8F0D, /* 0x60 */
     0x9123, 0x911C, 0x9120, 0x9122, 0x911F, 0x911D, 0x911A, 0x9124, /* 0x60 */
     0x9121, 0x911B, 0x917A, 0x9172, 0x9179, 0x9173, 0x92A5, 0x92A4, /* 0x70 */
-    0x9276, 0x929B, 0x927A, 0x92A0, 0x9294, 0x92AA, 0x928D,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x9276, 0x929B, 0x927A, 0x92A0, 0x9294, 0x92AA, 0x928D, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x92A6, 0x929A, 0x92AB, 0x9279, 0x9297, 0x927F, 0x92A3, /* 0xA0 */
     0x92EE, 0x928E, 0x9282, 0x9295, 0x92A2, 0x927D, 0x9288, 0x92A1, /* 0xA0 */
     0x928A, 0x9286, 0x928C, 0x9299, 0x92A7, 0x927E, 0x9287, 0x92A9, /* 0xB0 */
@@ -2216,15 +2216,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E4[] =
     0x9B61, 0x9B5F, 0x9CF1, 0x9CF2, 0x9CF5, 0x9EA7, 0x50FF, 0x5103, /* 0xE0 */
     0x5130, 0x50F8, 0x5106, 0x5107, 0x50F6, 0x50FE, 0x510B, 0x510C, /* 0xE0 */
     0x50FD, 0x510A, 0x528B, 0x528C, 0x52F1, 0x52EF, 0x5648, 0x5642, /* 0xF0 */
-    0x564C, 0x5635, 0x5641, 0x564A, 0x5649, 0x5646, 0x5658          /* 0xF0 */
+    0x564C, 0x5635, 0x5641, 0x564A, 0x5649, 0x5646, 0x5658			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_E5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x565A, 0x5640, 0x5633, 0x563D, 0x562C, 0x563E, 0x5638, 0x562A, /* 0x40 */
     0x563A, 0x571A, 0x58AB, 0x589D, 0x58B1, 0x58A0, 0x58A3, 0x58AF, /* 0x40 */
     0x58AC, 0x58A5, 0x58A1, 0x58FF, 0x5AFF, 0x5AF4, 0x5AFD, 0x5AF7, /* 0x50 */
@@ -2232,11 +2232,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E5[] =
     0x5B0F, 0x5C67, 0x5D99, 0x5D97, 0x5D9F, 0x5D92, 0x5DA2, 0x5D93, /* 0x60 */
     0x5D95, 0x5DA0, 0x5D9C, 0x5DA1, 0x5D9A, 0x5D9E, 0x5E69, 0x5E5D, /* 0x60 */
     0x5E60, 0x5E5C, 0x7DF3, 0x5EDB, 0x5EDE, 0x5EE1, 0x5F49, 0x5FB2, /* 0x70 */
-    0x618B, 0x6183, 0x6179, 0x61B1, 0x61B0, 0x61A2, 0x6189,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x618B, 0x6183, 0x6179, 0x61B1, 0x61B0, 0x61A2, 0x6189, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x619B, 0x6193, 0x61AF, 0x61AD, 0x619F, 0x6192, 0x61AA, /* 0xA0 */
     0x61A1, 0x618D, 0x6166, 0x61B3, 0x622D, 0x646E, 0x6470, 0x6496, /* 0xA0 */
     0x64A0, 0x6485, 0x6497, 0x649C, 0x648F, 0x648B, 0x648A, 0x648C, /* 0xB0 */
@@ -2248,15 +2248,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E5[] =
     0x6A08, 0x69E6, 0x69FB, 0x6A0D, 0x69FC, 0x69EB, 0x6A09, 0x6A04, /* 0xE0 */
     0x6A18, 0x6A25, 0x6A0F, 0x69F6, 0x6A26, 0x6A07, 0x69F4, 0x6A16, /* 0xE0 */
     0x6B51, 0x6BA5, 0x6BA3, 0x6BA2, 0x6BA6, 0x6C01, 0x6C00, 0x6BFF, /* 0xF0 */
-    0x6C02, 0x6F41, 0x6F26, 0x6F7E, 0x6F87, 0x6FC6, 0x6F92          /* 0xF0 */
+    0x6C02, 0x6F41, 0x6F26, 0x6F7E, 0x6F87, 0x6FC6, 0x6F92			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_E6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6F8D, 0x6F89, 0x6F8C, 0x6F62, 0x6F4F, 0x6F85, 0x6F5A, 0x6F96, /* 0x40 */
     0x6F76, 0x6F6C, 0x6F82, 0x6F55, 0x6F72, 0x6F52, 0x6F50, 0x6F57, /* 0x40 */
     0x6F94, 0x6F93, 0x6F5D, 0x6F00, 0x6F61, 0x6F6B, 0x6F7D, 0x6F67, /* 0x50 */
@@ -2264,11 +2264,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E6[] =
     0x6F6A, 0x6F7B, 0x71B2, 0x71AF, 0x719B, 0x71B0, 0x71A0, 0x719A, /* 0x60 */
     0x71A9, 0x71B5, 0x719D, 0x71A5, 0x719E, 0x71A4, 0x71A1, 0x71AA, /* 0x60 */
     0x719C, 0x71A7, 0x71B3, 0x7298, 0x729A, 0x7358, 0x7352, 0x735E, /* 0x70 */
-    0x735F, 0x7360, 0x735D, 0x735B, 0x7361, 0x735A, 0x7359,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x735F, 0x7360, 0x735D, 0x735B, 0x7361, 0x735A, 0x7359, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x7362, 0x7487, 0x7489, 0x748A, 0x7486, 0x7481, 0x747D, /* 0xA0 */
     0x7485, 0x7488, 0x747C, 0x7479, 0x7508, 0x7507, 0x757E, 0x7625, /* 0xA0 */
     0x761E, 0x7619, 0x761D, 0x761C, 0x7623, 0x761A, 0x7628, 0x761B, /* 0xB0 */
@@ -2280,15 +2280,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E6[] =
     0x7CC8, 0x7CCC, 0x7CCB, 0x7DF7, 0x7DDB, 0x7DEA, 0x7DE7, 0x7DD7, /* 0xE0 */
     0x7DE1, 0x7E03, 0x7DFA, 0x7DE6, 0x7DF6, 0x7DF1, 0x7DF0, 0x7DEE, /* 0xE0 */
     0x7DDF, 0x7F76, 0x7FAC, 0x7FB0, 0x7FAD, 0x7FED, 0x7FEB, 0x7FEA, /* 0xF0 */
-    0x7FEC, 0x7FE6, 0x7FE8, 0x8064, 0x8067, 0x81A3, 0x819F          /* 0xF0 */
+    0x7FEC, 0x7FE6, 0x7FE8, 0x8064, 0x8067, 0x81A3, 0x819F			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_E7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x819E, 0x8195, 0x81A2, 0x8199, 0x8197, 0x8216, 0x824F, 0x8253, /* 0x40 */
     0x8252, 0x8250, 0x824E, 0x8251, 0x8524, 0x853B, 0x850F, 0x8500, /* 0x40 */
     0x8529, 0x850E, 0x8509, 0x850D, 0x851F, 0x850A, 0x8527, 0x851C, /* 0x50 */
@@ -2296,11 +2296,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E7[] =
     0x8515, 0x84F7, 0x84EB, 0x84F3, 0x84FC, 0x8512, 0x84EA, 0x84E9, /* 0x60 */
     0x8516, 0x84FE, 0x8528, 0x851D, 0x852E, 0x8502, 0x84FD, 0x851E, /* 0x60 */
     0x84F6, 0x8531, 0x8526, 0x84E7, 0x84E8, 0x84F0, 0x84EF, 0x84F9, /* 0x70 */
-    0x8518, 0x8520, 0x8530, 0x850B, 0x8519, 0x852F, 0x8662,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x8518, 0x8520, 0x8530, 0x850B, 0x8519, 0x852F, 0x8662, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x8756, 0x8763, 0x8764, 0x8777, 0x87E1, 0x8773, 0x8758, /* 0xA0 */
     0x8754, 0x875B, 0x8752, 0x8761, 0x875A, 0x8751, 0x875E, 0x876D, /* 0xA0 */
     0x876A, 0x8750, 0x874E, 0x875F, 0x875D, 0x876F, 0x876C, 0x877A, /* 0xB0 */
@@ -2312,15 +2312,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E7[] =
     0x8AD8, 0x8AC3, 0x8ABA, 0x8ABD, 0x8AD9, 0x8C3E, 0x8C4D, 0x8C8F, /* 0xE0 */
     0x8CE5, 0x8CDF, 0x8CD9, 0x8CE8, 0x8CDA, 0x8CDD, 0x8CE7, 0x8DA0, /* 0xE0 */
     0x8D9C, 0x8DA1, 0x8D9B, 0x8E20, 0x8E23, 0x8E25, 0x8E24, 0x8E2E, /* 0xF0 */
-    0x8E15, 0x8E1B, 0x8E16, 0x8E11, 0x8E19, 0x8E26, 0x8E27          /* 0xF0 */
+    0x8E15, 0x8E1B, 0x8E16, 0x8E11, 0x8E19, 0x8E26, 0x8E27			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_E8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8E14, 0x8E12, 0x8E18, 0x8E13, 0x8E1C, 0x8E17, 0x8E1A, 0x8F2C, /* 0x40 */
     0x8F24, 0x8F18, 0x8F1A, 0x8F20, 0x8F23, 0x8F16, 0x8F17, 0x9073, /* 0x40 */
     0x9070, 0x906F, 0x9067, 0x906B, 0x912F, 0x912B, 0x9129, 0x912A, /* 0x50 */
@@ -2328,11 +2328,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E8[] =
     0x9184, 0x9180, 0x92D0, 0x92C3, 0x92C4, 0x92C0, 0x92D9, 0x92B6, /* 0x60 */
     0x92CF, 0x92F1, 0x92DF, 0x92D8, 0x92E9, 0x92D7, 0x92DD, 0x92CC, /* 0x60 */
     0x92EF, 0x92C2, 0x92E8, 0x92CA, 0x92C8, 0x92CE, 0x92E6, 0x92CD, /* 0x70 */
-    0x92D5, 0x92C9, 0x92E0, 0x92DE, 0x92E7, 0x92D1, 0x92D3,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x92D5, 0x92C9, 0x92E0, 0x92DE, 0x92E7, 0x92D1, 0x92D3, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x92B5, 0x92E1, 0x92C6, 0x92B4, 0x957C, 0x95AC, 0x95AB, /* 0xA0 */
     0x95AE, 0x95B0, 0x96A4, 0x96A2, 0x96D3, 0x9705, 0x9708, 0x9702, /* 0xA0 */
     0x975A, 0x978A, 0x978E, 0x9788, 0x97D0, 0x97CF, 0x981E, 0x981D, /* 0xB0 */
@@ -2344,15 +2344,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E8[] =
     0x9B70, 0x9B68, 0x9B64, 0x9B6C, 0x9CFC, 0x9CFA, 0x9CFD, 0x9CFF, /* 0xE0 */
     0x9CF7, 0x9D07, 0x9D00, 0x9CF9, 0x9CFB, 0x9D08, 0x9D05, 0x9D04, /* 0xE0 */
     0x9E83, 0x9ED3, 0x9F0F, 0x9F10, 0x511C, 0x5113, 0x5117, 0x511A, /* 0xF0 */
-    0x5111, 0x51DE, 0x5334, 0x53E1, 0x5670, 0x5660, 0x566E          /* 0xF0 */
+    0x5111, 0x51DE, 0x5334, 0x53E1, 0x5670, 0x5660, 0x566E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_E9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5673, 0x5666, 0x5663, 0x566D, 0x5672, 0x565E, 0x5677, 0x571C, /* 0x40 */
     0x571B, 0x58C8, 0x58BD, 0x58C9, 0x58BF, 0x58BA, 0x58C2, 0x58BC, /* 0x40 */
     0x58C6, 0x5B17, 0x5B19, 0x5B1B, 0x5B21, 0x5B14, 0x5B13, 0x5B10, /* 0x50 */
@@ -2360,11 +2360,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E9[] =
     0x5DA9, 0x5DA7, 0x5DB5, 0x5DB0, 0x5DAE, 0x5DAA, 0x5DA8, 0x5DB2, /* 0x60 */
     0x5DAD, 0x5DAF, 0x5DB4, 0x5E67, 0x5E68, 0x5E66, 0x5E6F, 0x5EE9, /* 0x60 */
     0x5EE7, 0x5EE6, 0x5EE8, 0x5EE5, 0x5F4B, 0x5FBC, 0x619D, 0x61A8, /* 0x70 */
-    0x6196, 0x61C5, 0x61B4, 0x61C6, 0x61C1, 0x61CC, 0x61BA,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x6196, 0x61C5, 0x61B4, 0x61C6, 0x61C1, 0x61CC, 0x61BA, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x61BF, 0x61B8, 0x618C, 0x64D7, 0x64D6, 0x64D0, 0x64CF, /* 0xA0 */
     0x64C9, 0x64BD, 0x6489, 0x64C3, 0x64DB, 0x64F3, 0x64D9, 0x6533, /* 0xA0 */
     0x657F, 0x657C, 0x65A2, 0x66C8, 0x66BE, 0x66C0, 0x66CA, 0x66CB, /* 0xB0 */
@@ -2376,15 +2376,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_E9[] =
     0x6B56, 0x6BA7, 0x6BAA, 0x6BAB, 0x6BC8, 0x6BC7, 0x6C04, 0x6C03, /* 0xE0 */
     0x6C06, 0x6FAD, 0x6FCB, 0x6FA3, 0x6FC7, 0x6FBC, 0x6FCE, 0x6FC8, /* 0xE0 */
     0x6F5E, 0x6FC4, 0x6FBD, 0x6F9E, 0x6FCA, 0x6FA8, 0x7004, 0x6FA5, /* 0xF0 */
-    0x6FAE, 0x6FBA, 0x6FAC, 0x6FAA, 0x6FCF, 0x6FBF, 0x6FB8          /* 0xF0 */
+    0x6FAE, 0x6FBA, 0x6FAC, 0x6FAA, 0x6FCF, 0x6FBF, 0x6FB8			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_EA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6FA2, 0x6FC9, 0x6FAB, 0x6FCD, 0x6FAF, 0x6FB2, 0x6FB0, 0x71C5, /* 0x40 */
     0x71C2, 0x71BF, 0x71B8, 0x71D6, 0x71C0, 0x71C1, 0x71CB, 0x71D4, /* 0x40 */
     0x71CA, 0x71C7, 0x71CF, 0x71BD, 0x71D8, 0x71BC, 0x71C6, 0x71DA, /* 0x50 */
@@ -2392,11 +2392,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_EA[] =
     0x736B, 0x736A, 0x747F, 0x749A, 0x74A0, 0x7494, 0x7492, 0x7495, /* 0x60 */
     0x74A1, 0x750B, 0x7580, 0x762F, 0x762D, 0x7631, 0x763D, 0x7633, /* 0x60 */
     0x763C, 0x7635, 0x7632, 0x7630, 0x76BB, 0x76E6, 0x779A, 0x779D, /* 0x70 */
-    0x77A1, 0x779C, 0x779B, 0x77A2, 0x77A3, 0x7795, 0x7799,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x77A1, 0x779C, 0x779B, 0x77A2, 0x77A3, 0x7795, 0x7799, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x7797, 0x78DD, 0x78E9, 0x78E5, 0x78EA, 0x78DE, 0x78E3, /* 0xA0 */
     0x78DB, 0x78E1, 0x78E2, 0x78ED, 0x78DF, 0x78E0, 0x79A4, 0x7A44, /* 0xA0 */
     0x7A48, 0x7A47, 0x7AB6, 0x7AB8, 0x7AB5, 0x7AB1, 0x7AB7, 0x7BDE, /* 0xB0 */
@@ -2408,15 +2408,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_EA[] =
     0x7F7B, 0x7F7C, 0x7F7A, 0x7FB1, 0x7FEF, 0x802A, 0x8029, 0x806C, /* 0xE0 */
     0x81B1, 0x81A6, 0x81AE, 0x81B9, 0x81B5, 0x81AB, 0x81B0, 0x81AC, /* 0xE0 */
     0x81B4, 0x81B2, 0x81B7, 0x81A7, 0x81F2, 0x8255, 0x8256, 0x8257, /* 0xF0 */
-    0x8556, 0x8545, 0x856B, 0x854D, 0x8553, 0x8561, 0x8558          /* 0xF0 */
+    0x8556, 0x8545, 0x856B, 0x854D, 0x8553, 0x8561, 0x8558			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_EB[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8540, 0x8546, 0x8564, 0x8541, 0x8562, 0x8544, 0x8551, 0x8547, /* 0x40 */
     0x8563, 0x853E, 0x855B, 0x8571, 0x854E, 0x856E, 0x8575, 0x8555, /* 0x40 */
     0x8567, 0x8560, 0x858C, 0x8566, 0x855D, 0x8554, 0x8565, 0x856C, /* 0x50 */
@@ -2424,11 +2424,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_EB[] =
     0x8788, 0x8781, 0x8796, 0x8798, 0x8779, 0x8787, 0x87A3, 0x8785, /* 0x60 */
     0x8790, 0x8791, 0x879D, 0x8784, 0x8794, 0x879C, 0x879A, 0x8789, /* 0x60 */
     0x891E, 0x8926, 0x8930, 0x892D, 0x892E, 0x8927, 0x8931, 0x8922, /* 0x70 */
-    0x8929, 0x8923, 0x892F, 0x892C, 0x891F, 0x89F1, 0x8AE0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x8929, 0x8923, 0x892F, 0x892C, 0x891F, 0x89F1, 0x8AE0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x8AE2, 0x8AF2, 0x8AF4, 0x8AF5, 0x8ADD, 0x8B14, 0x8AE4, /* 0xA0 */
     0x8ADF, 0x8AF0, 0x8AC8, 0x8ADE, 0x8AE1, 0x8AE8, 0x8AFF, 0x8AEF, /* 0xA0 */
     0x8AFB, 0x8C91, 0x8C92, 0x8C90, 0x8CF5, 0x8CEE, 0x8CF1, 0x8CF0, /* 0xB0 */
@@ -2440,15 +2440,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_EB[] =
     0x931F, 0x9306, 0x930F, 0x937A, 0x9338, 0x933C, 0x931B, 0x9323, /* 0xE0 */
     0x9312, 0x9301, 0x9346, 0x932D, 0x930E, 0x930D, 0x92CB, 0x931D, /* 0xE0 */
     0x92FA, 0x9325, 0x9313, 0x92F9, 0x92F7, 0x9334, 0x9302, 0x9324, /* 0xF0 */
-    0x92FF, 0x9329, 0x9339, 0x9335, 0x932A, 0x9314, 0x930C          /* 0xF0 */
+    0x92FF, 0x9329, 0x9339, 0x9335, 0x932A, 0x9314, 0x930C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_EC[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x930B, 0x92FE, 0x9309, 0x9300, 0x92FB, 0x9316, 0x95BC, 0x95CD, /* 0x40 */
     0x95BE, 0x95B9, 0x95BA, 0x95B6, 0x95BF, 0x95B5, 0x95BD, 0x96A9, /* 0x40 */
     0x96D4, 0x970B, 0x9712, 0x9710, 0x9799, 0x9797, 0x9794, 0x97F0, /* 0x50 */
@@ -2456,11 +2456,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_EC[] =
     0x999E, 0x99EE, 0x99EC, 0x99E5, 0x99E4, 0x99F0, 0x99E3, 0x99EA, /* 0x60 */
     0x99E9, 0x99E7, 0x9AB9, 0x9ABF, 0x9AB4, 0x9ABB, 0x9AF6, 0x9AFA, /* 0x60 */
     0x9AF9, 0x9AF7, 0x9B33, 0x9B80, 0x9B85, 0x9B87, 0x9B7C, 0x9B7E, /* 0x70 */
-    0x9B7B, 0x9B82, 0x9B93, 0x9B92, 0x9B90, 0x9B7A, 0x9B95,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x9B7B, 0x9B82, 0x9B93, 0x9B92, 0x9B90, 0x9B7A, 0x9B95, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x9B7D, 0x9B88, 0x9D25, 0x9D17, 0x9D20, 0x9D1E, 0x9D14, /* 0xA0 */
     0x9D29, 0x9D1D, 0x9D18, 0x9D22, 0x9D10, 0x9D19, 0x9D1F, 0x9E88, /* 0xA0 */
     0x9E86, 0x9E87, 0x9EAE, 0x9EAD, 0x9ED5, 0x9ED6, 0x9EFA, 0x9F12, /* 0xB0 */
@@ -2472,15 +2472,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_EC[] =
     0x61B5, 0x61BC, 0x61E7, 0x61E0, 0x61E5, 0x61E4, 0x61E8, 0x61DE, /* 0xE0 */
     0x64EF, 0x64E9, 0x64E3, 0x64EB, 0x64E4, 0x64E8, 0x6581, 0x6580, /* 0xE0 */
     0x65B6, 0x65DA, 0x66D2, 0x6A8D, 0x6A96, 0x6A81, 0x6AA5, 0x6A89, /* 0xF0 */
-    0x6A9F, 0x6A9B, 0x6AA1, 0x6A9E, 0x6A87, 0x6A93, 0x6A8E          /* 0xF0 */
+    0x6A9F, 0x6A9B, 0x6AA1, 0x6A9E, 0x6A87, 0x6A93, 0x6A8E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_ED[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x6A95, 0x6A83, 0x6AA8, 0x6AA4, 0x6A91, 0x6A7F, 0x6AA6, 0x6A9A, /* 0x40 */
     0x6A85, 0x6A8C, 0x6A92, 0x6B5B, 0x6BAD, 0x6C09, 0x6FCC, 0x6FA9, /* 0x40 */
     0x6FF4, 0x6FD4, 0x6FE3, 0x6FDC, 0x6FED, 0x6FE7, 0x6FE6, 0x6FDE, /* 0x50 */
@@ -2488,11 +2488,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_ED[] =
     0x71E4, 0x71F0, 0x71E2, 0x7373, 0x736E, 0x736F, 0x7497, 0x74B2, /* 0x60 */
     0x74AB, 0x7490, 0x74AA, 0x74AD, 0x74B1, 0x74A5, 0x74AF, 0x7510, /* 0x60 */
     0x7511, 0x7512, 0x750F, 0x7584, 0x7643, 0x7648, 0x7649, 0x7647, /* 0x70 */
-    0x76A4, 0x76E9, 0x77B5, 0x77AB, 0x77B2, 0x77B7, 0x77B6,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x76A4, 0x76E9, 0x77B5, 0x77AB, 0x77B2, 0x77B7, 0x77B6, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x77B4, 0x77B1, 0x77A8, 0x77F0, 0x78F3, 0x78FD, 0x7902, /* 0xA0 */
     0x78FB, 0x78FC, 0x78F2, 0x7905, 0x78F9, 0x78FE, 0x7904, 0x79AB, /* 0xA0 */
     0x79A8, 0x7A5C, 0x7A5B, 0x7A56, 0x7A58, 0x7A54, 0x7A5A, 0x7ABE, /* 0xB0 */
@@ -2504,15 +2504,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_ED[] =
     0x7E3A, 0x7F45, 0x7F7F, 0x7F7E, 0x7F7D, 0x7FF4, 0x7FF2, 0x802C, /* 0xE0 */
     0x81BB, 0x81C4, 0x81CC, 0x81CA, 0x81C5, 0x81C7, 0x81BC, 0x81E9, /* 0xE0 */
     0x825B, 0x825A, 0x825C, 0x8583, 0x8580, 0x858F, 0x85A7, 0x8595, /* 0xF0 */
-    0x85A0, 0x858B, 0x85A3, 0x857B, 0x85A4, 0x859A, 0x859E          /* 0xF0 */
+    0x85A0, 0x858B, 0x85A3, 0x857B, 0x85A4, 0x859A, 0x859E			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_EE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8577, 0x857C, 0x8589, 0x85A1, 0x857A, 0x8578, 0x8557, 0x858E, /* 0x40 */
     0x8596, 0x8586, 0x858D, 0x8599, 0x859D, 0x8581, 0x85A2, 0x8582, /* 0x40 */
     0x8588, 0x8585, 0x8579, 0x8576, 0x8598, 0x8590, 0x859F, 0x8668, /* 0x50 */
@@ -2520,11 +2520,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_EE[] =
     0x87BC, 0x87AE, 0x87C9, 0x87C3, 0x87C2, 0x87CC, 0x87B7, 0x87AF, /* 0x60 */
     0x87C4, 0x87CA, 0x87B4, 0x87B6, 0x87BF, 0x87B8, 0x87BD, 0x87DE, /* 0x60 */
     0x87B2, 0x8935, 0x8933, 0x893C, 0x893E, 0x8941, 0x8952, 0x8937, /* 0x70 */
-    0x8942, 0x89AD, 0x89AF, 0x89AE, 0x89F2, 0x89F3, 0x8B1E,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x8942, 0x89AD, 0x89AF, 0x89AE, 0x89F2, 0x89F3, 0x8B1E, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x8B18, 0x8B16, 0x8B11, 0x8B05, 0x8B0B, 0x8B22, 0x8B0F, /* 0xA0 */
     0x8B12, 0x8B15, 0x8B07, 0x8B0D, 0x8B08, 0x8B06, 0x8B1C, 0x8B13, /* 0xA0 */
     0x8B1A, 0x8C4F, 0x8C70, 0x8C72, 0x8C71, 0x8C6F, 0x8C95, 0x8C94, /* 0xB0 */
@@ -2536,15 +2536,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_EE[] =
     0x9357, 0x9355, 0x9352, 0x934F, 0x9371, 0x9377, 0x937B, 0x9361, /* 0xE0 */
     0x935E, 0x9363, 0x9367, 0x9380, 0x934E, 0x9359, 0x95C7, 0x95C0, /* 0xE0 */
     0x95C9, 0x95C3, 0x95C5, 0x95B7, 0x96AE, 0x96B0, 0x96AC, 0x9720, /* 0xF0 */
-    0x971F, 0x9718, 0x971D, 0x9719, 0x979A, 0x97A1, 0x979C          /* 0xF0 */
+    0x971F, 0x9718, 0x971D, 0x9719, 0x979A, 0x97A1, 0x979C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_EF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x979E, 0x979D, 0x97D5, 0x97D4, 0x97F1, 0x9841, 0x9844, 0x984A, /* 0x40 */
     0x9849, 0x9845, 0x9843, 0x9925, 0x992B, 0x992C, 0x992A, 0x9933, /* 0x40 */
     0x9932, 0x992F, 0x992D, 0x9931, 0x9930, 0x9998, 0x99A3, 0x99A1, /* 0x50 */
@@ -2552,11 +2552,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_EF[] =
     0x99FD, 0x99FE, 0x99FC, 0x9A03, 0x9ABE, 0x9AFE, 0x9AFD, 0x9B01, /* 0x60 */
     0x9AFC, 0x9B48, 0x9B9A, 0x9BA8, 0x9B9E, 0x9B9B, 0x9BA6, 0x9BA1, /* 0x60 */
     0x9BA5, 0x9BA4, 0x9B86, 0x9BA2, 0x9BA0, 0x9BAF, 0x9D33, 0x9D41, /* 0x70 */
-    0x9D67, 0x9D36, 0x9D2E, 0x9D2F, 0x9D31, 0x9D38, 0x9D30,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x9D67, 0x9D36, 0x9D2E, 0x9D2F, 0x9D31, 0x9D38, 0x9D30, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x9D45, 0x9D42, 0x9D43, 0x9D3E, 0x9D37, 0x9D40, 0x9D3D, /* 0xA0 */
     0x7FF5, 0x9D2D, 0x9E8A, 0x9E89, 0x9E8D, 0x9EB0, 0x9EC8, 0x9EDA, /* 0xA0 */
     0x9EFB, 0x9EFF, 0x9F24, 0x9F23, 0x9F22, 0x9F54, 0x9FA0, 0x5131, /* 0xB0 */
@@ -2568,15 +2568,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_EF[] =
     0x6AE1, 0x6AC6, 0x6ABA, 0x6AB6, 0x6AB7, 0x6AC7, 0x6AB4, 0x6AAD, /* 0xE0 */
     0x6B5E, 0x6BC9, 0x6C0B, 0x7007, 0x700C, 0x700D, 0x7001, 0x7005, /* 0xE0 */
     0x7014, 0x700E, 0x6FFF, 0x7000, 0x6FFB, 0x7026, 0x6FFC, 0x6FF7, /* 0xF0 */
-    0x700A, 0x7201, 0x71FF, 0x71F9, 0x7203, 0x71FD, 0x7376          /* 0xF0 */
+    0x700A, 0x7201, 0x71FF, 0x71F9, 0x7203, 0x71FD, 0x7376			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_F0[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x74B8, 0x74C0, 0x74B5, 0x74C1, 0x74BE, 0x74B6, 0x74BB, 0x74C2, /* 0x40 */
     0x7514, 0x7513, 0x765C, 0x7664, 0x7659, 0x7650, 0x7653, 0x7657, /* 0x40 */
     0x765A, 0x76A6, 0x76BD, 0x76EC, 0x77C2, 0x77BA, 0x78FF, 0x790C, /* 0x50 */
@@ -2584,11 +2584,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F0[] =
     0x7A5F, 0x7C1C, 0x7C29, 0x7C19, 0x7C20, 0x7C1F, 0x7C2D, 0x7C1D, /* 0x60 */
     0x7C26, 0x7C28, 0x7C22, 0x7C25, 0x7C30, 0x7E5C, 0x7E50, 0x7E56, /* 0x60 */
     0x7E63, 0x7E58, 0x7E62, 0x7E5F, 0x7E51, 0x7E60, 0x7E57, 0x7E53, /* 0x70 */
-    0x7FB5, 0x7FB3, 0x7FF7, 0x7FF8, 0x8075, 0x81D1, 0x81D2,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x7FB5, 0x7FB3, 0x7FF7, 0x7FF8, 0x8075, 0x81D1, 0x81D2, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x81D0, 0x825F, 0x825E, 0x85B4, 0x85C6, 0x85C0, 0x85C3, /* 0xA0 */
     0x85C2, 0x85B3, 0x85B5, 0x85BD, 0x85C7, 0x85C4, 0x85BF, 0x85CB, /* 0xA0 */
     0x85CE, 0x85C8, 0x85C5, 0x85B1, 0x85B6, 0x85D2, 0x8624, 0x85B8, /* 0xB0 */
@@ -2600,15 +2600,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F0[] =
     0x8B47, 0x8B2F, 0x8B3C, 0x8B3E, 0x8B31, 0x8B25, 0x8B37, 0x8B26, /* 0xE0 */
     0x8B36, 0x8B2E, 0x8B24, 0x8B3B, 0x8B3D, 0x8B3A, 0x8C42, 0x8C75, /* 0xE0 */
     0x8C99, 0x8C98, 0x8C97, 0x8CFE, 0x8D04, 0x8D02, 0x8D00, 0x8E5C, /* 0xF0 */
-    0x8E62, 0x8E60, 0x8E57, 0x8E56, 0x8E5E, 0x8E65, 0x8E67          /* 0xF0 */
+    0x8E62, 0x8E60, 0x8E57, 0x8E56, 0x8E5E, 0x8E65, 0x8E67			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_F1[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8E5B, 0x8E5A, 0x8E61, 0x8E5D, 0x8E69, 0x8E54, 0x8F46, 0x8F47, /* 0x40 */
     0x8F48, 0x8F4B, 0x9128, 0x913A, 0x913B, 0x913E, 0x91A8, 0x91A5, /* 0x40 */
     0x91A7, 0x91AF, 0x91AA, 0x93B5, 0x938C, 0x9392, 0x93B7, 0x939B, /* 0x50 */
@@ -2616,11 +2616,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F1[] =
     0x9388, 0x9399, 0x939F, 0x938D, 0x93B1, 0x9391, 0x93B2, 0x93A4, /* 0x60 */
     0x93A8, 0x93B4, 0x93A3, 0x93A5, 0x95D2, 0x95D3, 0x95D1, 0x96B3, /* 0x60 */
     0x96D7, 0x96DA, 0x5DC2, 0x96DF, 0x96D8, 0x96DD, 0x9723, 0x9722, /* 0x70 */
-    0x9725, 0x97AC, 0x97AE, 0x97A8, 0x97AB, 0x97A4, 0x97AA,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x9725, 0x97AC, 0x97AE, 0x97A8, 0x97AB, 0x97A4, 0x97AA, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x97A2, 0x97A5, 0x97D7, 0x97D9, 0x97D6, 0x97D8, 0x97FA, /* 0xA0 */
     0x9850, 0x9851, 0x9852, 0x98B8, 0x9941, 0x993C, 0x993A, 0x9A0F, /* 0xA0 */
     0x9A0B, 0x9A09, 0x9A0D, 0x9A04, 0x9A11, 0x9A0A, 0x9A05, 0x9A07, /* 0xB0 */
@@ -2632,15 +2632,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F1[] =
     0x9EDF, 0x9F01, 0x9F00, 0x9F16, 0x9F25, 0x9F2B, 0x9F2A, 0x9F29, /* 0xE0 */
     0x9F28, 0x9F4C, 0x9F55, 0x5134, 0x5135, 0x5296, 0x52F7, 0x53B4, /* 0xE0 */
     0x56AB, 0x56AD, 0x56A6, 0x56A7, 0x56AA, 0x56AC, 0x58DA, 0x58DD, /* 0xF0 */
-    0x58DB, 0x5912, 0x5B3D, 0x5B3E, 0x5B3F, 0x5DC3, 0x5E70          /* 0xF0 */
+    0x58DB, 0x5912, 0x5B3D, 0x5B3E, 0x5B3F, 0x5DC3, 0x5E70			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_F2[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x5FBF, 0x61FB, 0x6507, 0x6510, 0x650D, 0x6509, 0x650C, 0x650E, /* 0x40 */
     0x6584, 0x65DE, 0x65DD, 0x66DE, 0x6AE7, 0x6AE0, 0x6ACC, 0x6AD1, /* 0x40 */
     0x6AD9, 0x6ACB, 0x6ADF, 0x6ADC, 0x6AD0, 0x6AEB, 0x6ACF, 0x6ACD, /* 0x50 */
@@ -2648,11 +2648,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F2[] =
     0x702B, 0x7021, 0x7022, 0x7023, 0x7029, 0x7017, 0x7024, 0x701C, /* 0x60 */
     0x702A, 0x720C, 0x720A, 0x7207, 0x7202, 0x7205, 0x72A5, 0x72A6, /* 0x60 */
     0x72A4, 0x72A3, 0x72A1, 0x74CB, 0x74C5, 0x74B7, 0x74C3, 0x7516, /* 0x70 */
-    0x7660, 0x77C9, 0x77CA, 0x77C4, 0x77F1, 0x791D, 0x791B,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x7660, 0x77C9, 0x77CA, 0x77C4, 0x77F1, 0x791D, 0x791B, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x7921, 0x791C, 0x7917, 0x791E, 0x79B0, 0x7A67, 0x7A68, /* 0xA0 */
     0x7C33, 0x7C3C, 0x7C39, 0x7C2C, 0x7C3B, 0x7CEC, 0x7CEA, 0x7E76, /* 0xA0 */
     0x7E75, 0x7E78, 0x7E70, 0x7E77, 0x7E6F, 0x7E7A, 0x7E72, 0x7E74, /* 0xB0 */
@@ -2664,15 +2664,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F2[] =
     0x8809, 0x880C, 0x880B, 0x8806, 0x87FC, 0x8808, 0x87FF, 0x880A, /* 0xE0 */
     0x8802, 0x8962, 0x895A, 0x895B, 0x8957, 0x8961, 0x895C, 0x8958, /* 0xE0 */
     0x895D, 0x8959, 0x8988, 0x89B7, 0x89B6, 0x89F6, 0x8B50, 0x8B48, /* 0xF0 */
-    0x8B4A, 0x8B40, 0x8B53, 0x8B56, 0x8B54, 0x8B4B, 0x8B55          /* 0xF0 */
+    0x8B4A, 0x8B40, 0x8B53, 0x8B56, 0x8B54, 0x8B4B, 0x8B55			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_F3[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8B51, 0x8B42, 0x8B52, 0x8B57, 0x8C43, 0x8C77, 0x8C76, 0x8C9A, /* 0x40 */
     0x8D06, 0x8D07, 0x8D09, 0x8DAC, 0x8DAA, 0x8DAD, 0x8DAB, 0x8E6D, /* 0x40 */
     0x8E78, 0x8E73, 0x8E6A, 0x8E6F, 0x8E7B, 0x8EC2, 0x8F52, 0x8F51, /* 0x50 */
@@ -2680,11 +2680,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F3[] =
     0x93DE, 0x93C7, 0x93CF, 0x93C2, 0x93DA, 0x93D0, 0x93F9, 0x93EC, /* 0x60 */
     0x93CC, 0x93D9, 0x93A9, 0x93E6, 0x93CA, 0x93D4, 0x93EE, 0x93E3, /* 0x60 */
     0x93D5, 0x93C4, 0x93CE, 0x93C0, 0x93D2, 0x93E7, 0x957D, 0x95DA, /* 0x70 */
-    0x95DB, 0x96E1, 0x9729, 0x972B, 0x972C, 0x9728, 0x9726,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x95DB, 0x96E1, 0x9729, 0x972B, 0x972C, 0x9728, 0x9726, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x97B3, 0x97B7, 0x97B6, 0x97DD, 0x97DE, 0x97DF, 0x985C, /* 0xA0 */
     0x9859, 0x985D, 0x9857, 0x98BF, 0x98BD, 0x98BB, 0x98BE, 0x9948, /* 0xA0 */
     0x9947, 0x9943, 0x99A6, 0x99A7, 0x9A1A, 0x9A15, 0x9A25, 0x9A1D, /* 0xB0 */
@@ -2696,15 +2696,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F3[] =
     0x9D86, 0x9D8B, 0x9D8C, 0x9D7D, 0x9D6B, 0x9D74, 0x9D75, 0x9D70, /* 0xE0 */
     0x9D69, 0x9D85, 0x9D73, 0x9D7B, 0x9D82, 0x9D6F, 0x9D79, 0x9D7F, /* 0xE0 */
     0x9D87, 0x9D68, 0x9E94, 0x9E91, 0x9EC0, 0x9EFC, 0x9F2D, 0x9F40, /* 0xF0 */
-    0x9F41, 0x9F4D, 0x9F56, 0x9F57, 0x9F58, 0x5337, 0x56B2          /* 0xF0 */
+    0x9F41, 0x9F4D, 0x9F56, 0x9F57, 0x9F58, 0x5337, 0x56B2			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_F4[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x56B5, 0x56B3, 0x58E3, 0x5B45, 0x5DC6, 0x5DC7, 0x5EEE, 0x5EEF, /* 0x40 */
     0x5FC0, 0x5FC1, 0x61F9, 0x6517, 0x6516, 0x6515, 0x6513, 0x65DF, /* 0x40 */
     0x66E8, 0x66E3, 0x66E4, 0x6AF3, 0x6AF0, 0x6AEA, 0x6AE8, 0x6AF9, /* 0x50 */
@@ -2712,11 +2712,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F4[] =
     0x7031, 0x7042, 0x7038, 0x703F, 0x703A, 0x7039, 0x7040, 0x703B, /* 0x60 */
     0x7033, 0x7041, 0x7213, 0x7214, 0x72A8, 0x737D, 0x737C, 0x74BA, /* 0x60 */
     0x76AB, 0x76AA, 0x76BE, 0x76ED, 0x77CC, 0x77CE, 0x77CF, 0x77CD, /* 0x70 */
-    0x77F2, 0x7925, 0x7923, 0x7927, 0x7928, 0x7924, 0x7929,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x77F2, 0x7925, 0x7923, 0x7927, 0x7928, 0x7924, 0x7929, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x79B2, 0x7A6E, 0x7A6C, 0x7A6D, 0x7AF7, 0x7C49, 0x7C48, /* 0xA0 */
     0x7C4A, 0x7C47, 0x7C45, 0x7CEE, 0x7E7B, 0x7E7E, 0x7E81, 0x7E80, /* 0xA0 */
     0x7FBA, 0x7FFF, 0x8079, 0x81DB, 0x81D9, 0x820B, 0x8268, 0x8269, /* 0xB0 */
@@ -2728,15 +2728,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F4[] =
     0x908D, 0x9143, 0x9141, 0x91B7, 0x91B5, 0x91B2, 0x91B3, 0x940B, /* 0xE0 */
     0x9413, 0x93FB, 0x9420, 0x940F, 0x9414, 0x93FE, 0x9415, 0x9410, /* 0xE0 */
     0x9428, 0x9419, 0x940D, 0x93F5, 0x9400, 0x93F7, 0x9407, 0x940E, /* 0xF0 */
-    0x9416, 0x9412, 0x93FA, 0x9409, 0x93F8, 0x940A, 0x93FF          /* 0xF0 */
+    0x9416, 0x9412, 0x93FA, 0x9409, 0x93F8, 0x940A, 0x93FF			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_F5[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x93FC, 0x940C, 0x93F6, 0x9411, 0x9406, 0x95DE, 0x95E0, 0x95DF, /* 0x40 */
     0x972E, 0x972F, 0x97B9, 0x97BB, 0x97FD, 0x97FE, 0x9860, 0x9862, /* 0x40 */
     0x9863, 0x985F, 0x98C1, 0x98C2, 0x9950, 0x994E, 0x9959, 0x994C, /* 0x50 */
@@ -2744,11 +2744,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F5[] =
     0x9A29, 0x9A2E, 0x9A38, 0x9A2D, 0x9AC7, 0x9ACA, 0x9AC6, 0x9B10, /* 0x60 */
     0x9B12, 0x9B11, 0x9C0B, 0x9C08, 0x9BF7, 0x9C05, 0x9C12, 0x9BF8, /* 0x60 */
     0x9C40, 0x9C07, 0x9C0E, 0x9C06, 0x9C17, 0x9C14, 0x9C09, 0x9D9F, /* 0x70 */
-    0x9D99, 0x9DA4, 0x9D9D, 0x9D92, 0x9D98, 0x9D90, 0x9D9B,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x9D99, 0x9DA4, 0x9D9D, 0x9D92, 0x9D98, 0x9D90, 0x9D9B, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x9DA0, 0x9D94, 0x9D9C, 0x9DAA, 0x9D97, 0x9DA1, 0x9D9A, /* 0xA0 */
     0x9DA2, 0x9DA8, 0x9D9E, 0x9DA3, 0x9DBF, 0x9DA9, 0x9D96, 0x9DA6, /* 0xA0 */
     0x9DA7, 0x9E99, 0x9E9B, 0x9E9A, 0x9EE5, 0x9EE4, 0x9EE7, 0x9EE6, /* 0xB0 */
@@ -2760,15 +2760,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F5[] =
     0x77D0, 0x792D, 0x7931, 0x792F, 0x7C54, 0x7C53, 0x7CF2, 0x7E8A, /* 0xE0 */
     0x7E87, 0x7E88, 0x7E8B, 0x7E86, 0x7E8D, 0x7F4D, 0x7FBB, 0x8030, /* 0xE0 */
     0x81DD, 0x8618, 0x862A, 0x8626, 0x861F, 0x8623, 0x861C, 0x8619, /* 0xF0 */
-    0x8627, 0x862E, 0x8621, 0x8620, 0x8629, 0x861E, 0x8625          /* 0xF0 */
+    0x8627, 0x862E, 0x8621, 0x8620, 0x8629, 0x861E, 0x8625			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_F6[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8829, 0x881D, 0x881B, 0x8820, 0x8824, 0x881C, 0x882B, 0x884A, /* 0x40 */
     0x896D, 0x8969, 0x896E, 0x896B, 0x89FA, 0x8B79, 0x8B78, 0x8B45, /* 0x40 */
     0x8B7A, 0x8B7B, 0x8D10, 0x8D14, 0x8DAF, 0x8E8E, 0x8E8C, 0x8F5E, /* 0x50 */
@@ -2776,11 +2776,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F6[] =
     0x9436, 0x9429, 0x943D, 0x943C, 0x9430, 0x9439, 0x942A, 0x9437, /* 0x60 */
     0x942C, 0x9440, 0x9431, 0x95E5, 0x95E4, 0x95E3, 0x9735, 0x973A, /* 0x60 */
     0x97BF, 0x97E1, 0x9864, 0x98C9, 0x98C6, 0x98C0, 0x9958, 0x9956, /* 0x70 */
-    0x9A39, 0x9A3D, 0x9A46, 0x9A44, 0x9A42, 0x9A41, 0x9A3A,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x9A39, 0x9A3D, 0x9A46, 0x9A44, 0x9A42, 0x9A41, 0x9A3A, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x9A3F, 0x9ACD, 0x9B15, 0x9B17, 0x9B18, 0x9B16, 0x9B3A, /* 0xA0 */
     0x9B52, 0x9C2B, 0x9C1D, 0x9C1C, 0x9C2C, 0x9C23, 0x9C28, 0x9C29, /* 0xA0 */
     0x9C24, 0x9C21, 0x9DB7, 0x9DB6, 0x9DBC, 0x9DC1, 0x9DC7, 0x9DCA, /* 0xB0 */
@@ -2792,15 +2792,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F6[] =
     0x6521, 0x6520, 0x6526, 0x6522, 0x6B0B, 0x6B08, 0x6B09, 0x6C0D, /* 0xE0 */
     0x7055, 0x7056, 0x7057, 0x7052, 0x721E, 0x721F, 0x72A9, 0x737F, /* 0xE0 */
     0x74D8, 0x74D5, 0x74D9, 0x74D7, 0x766D, 0x76AD, 0x7935, 0x79B4, /* 0xF0 */
-    0x7A70, 0x7A71, 0x7C57, 0x7C5C, 0x7C59, 0x7C5B, 0x7C5A          /* 0xF0 */
+    0x7A70, 0x7A71, 0x7C57, 0x7C5C, 0x7C59, 0x7C5B, 0x7C5A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_F7[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7CF4, 0x7CF1, 0x7E91, 0x7F4F, 0x7F87, 0x81DE, 0x826B, 0x8634, /* 0x40 */
     0x8635, 0x8633, 0x862C, 0x8632, 0x8636, 0x882C, 0x8828, 0x8826, /* 0x40 */
     0x882A, 0x8825, 0x8971, 0x89BF, 0x89BE, 0x89FB, 0x8B7E, 0x8B84, /* 0x50 */
@@ -2808,11 +2808,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F7[] =
     0x8E92, 0x8E90, 0x8E96, 0x8E97, 0x8F60, 0x8F62, 0x9147, 0x944C, /* 0x60 */
     0x9450, 0x944A, 0x944B, 0x944F, 0x9447, 0x9445, 0x9448, 0x9449, /* 0x60 */
     0x9446, 0x973F, 0x97E3, 0x986A, 0x9869, 0x98CB, 0x9954, 0x995B, /* 0x70 */
-    0x9A4E, 0x9A53, 0x9A54, 0x9A4C, 0x9A4F, 0x9A48, 0x9A4A,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x9A4E, 0x9A53, 0x9A54, 0x9A4C, 0x9A4F, 0x9A48, 0x9A4A, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x9A49, 0x9A52, 0x9A50, 0x9AD0, 0x9B19, 0x9B2B, 0x9B3B, /* 0xA0 */
     0x9B56, 0x9B55, 0x9C46, 0x9C48, 0x9C3F, 0x9C44, 0x9C39, 0x9C33, /* 0xA0 */
     0x9C41, 0x9C3C, 0x9C37, 0x9C34, 0x9C32, 0x9C3D, 0x9C36, 0x9DDB, /* 0xB0 */
@@ -2824,15 +2824,15 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F7[] =
     0x6B11, 0x6B12, 0x6B0F, 0x6BCA, 0x705B, 0x705A, 0x7222, 0x7382, /* 0xE0 */
     0x7381, 0x7383, 0x7670, 0x77D4, 0x7C67, 0x7C66, 0x7E95, 0x826C, /* 0xE0 */
     0x863A, 0x8640, 0x8639, 0x863C, 0x8631, 0x863B, 0x863E, 0x8830, /* 0xF0 */
-    0x8832, 0x882E, 0x8833, 0x8976, 0x8974, 0x8973, 0x89FE          /* 0xF0 */
+    0x8832, 0x882E, 0x8833, 0x8976, 0x8974, 0x8973, 0x89FE			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_F8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x8B8C, 0x8B8E, 0x8B8B, 0x8B88, 0x8C45, 0x8D19, 0x8E98, 0x8F64, /* 0x40 */
     0x8F63, 0x91BC, 0x9462, 0x9455, 0x945D, 0x9457, 0x945E, 0x97C4, /* 0x40 */
     0x97C5, 0x9800, 0x9A56, 0x9A59, 0x9B1E, 0x9B1F, 0x9B20, 0x9C52, /* 0x50 */
@@ -2840,11 +2840,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F8[] =
     0x9C4E, 0x9DFB, 0x9DF7, 0x9DEF, 0x9DE3, 0x9DEB, 0x9DF8, 0x9DE4, /* 0x60 */
     0x9DF6, 0x9DE1, 0x9DEE, 0x9DE6, 0x9DF2, 0x9DF0, 0x9DE2, 0x9DEC, /* 0x60 */
     0x9DF4, 0x9DF3, 0x9DE8, 0x9DED, 0x9EC2, 0x9ED0, 0x9EF2, 0x9EF3, /* 0x70 */
-    0x9F06, 0x9F1C, 0x9F38, 0x9F37, 0x9F36, 0x9F43, 0x9F4F,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x9F06, 0x9F1C, 0x9F38, 0x9F37, 0x9F36, 0x9F43, 0x9F4F, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x9F71, 0x9F70, 0x9F6E, 0x9F6F, 0x56D3, 0x56CD, 0x5B4E, /* 0xA0 */
     0x5C6D, 0x652D, 0x66ED, 0x66EE, 0x6B13, 0x705F, 0x7061, 0x705D, /* 0xA0 */
     0x7060, 0x7223, 0x74DB, 0x74E5, 0x77D5, 0x7938, 0x79B7, 0x79B6, /* 0xB0 */
@@ -2856,7 +2856,7 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F8[] =
     0x9E06, 0x9E05, 0x9E00, 0x9E01, 0x9E09, 0x9DFF, 0x9DFD, 0x9E04, /* 0xE0 */
     0x9EA0, 0x9F1E, 0x9F46, 0x9F74, 0x9F75, 0x9F76, 0x56D4, 0x652E, /* 0xE0 */
     0x65B8, 0x6B18, 0x6B19, 0x6B17, 0x6B1A, 0x7062, 0x7226, 0x72AA, /* 0xF0 */
-    0x77D8, 0x77D9, 0x7939, 0x7C69, 0x7C6B, 0x7CF6, 0x7E9A          /* 0xF0 */
+    0x77D8, 0x77D9, 0x7939, 0x7C69, 0x7C6B, 0x7CF6, 0x7E9A			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -2865,8 +2865,8 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F8[] =
 
 static sal_uInt16 const aImplDBCSToUniTab_BIG5_F9[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x7E98, 0x7E9B, 0x7E99, 0x81E0, 0x81E1, 0x8646, 0x8647, 0x8648, /* 0x40 */
     0x8979, 0x897A, 0x897C, 0x897B, 0x89FF, 0x8B98, 0x8B99, 0x8EA5, /* 0x40 */
     0x8EA4, 0x8EA3, 0x946E, 0x946D, 0x946F, 0x9471, 0x9473, 0x9749, /* 0x50 */
@@ -2874,11 +2874,11 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F9[] =
     0x9E0F, 0x9E12, 0x9E11, 0x9EA1, 0x9EF5, 0x9F09, 0x9F47, 0x9F78, /* 0x60 */
     0x9F7B, 0x9F7A, 0x9F79, 0x571E, 0x7066, 0x7C6F, 0x883C, 0x8DB2, /* 0x60 */
     0x8EA6, 0x91C3, 0x9474, 0x9478, 0x9476, 0x9475, 0x9A60, 0x9C74, /* 0x70 */
-    0x9C73, 0x9C71, 0x9C75, 0x9E14, 0x9E13, 0x9EF6, 0x9F0A,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+    0x9C73, 0x9C71, 0x9C75, 0x9E14, 0x9E13, 0x9EF6, 0x9F0A, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0x9FA4, 0x7068, 0x7065, 0x7CF7, 0x866A, 0x883E, 0x883D, /* 0xA0 */
     0x883F, 0x8B9E, 0x8C9C, 0x8EA9, 0x8EC9, 0x974B, 0x9873, 0x9874, /* 0xA0 */
     0x98CC, 0x9961, 0x99AB, 0x9A64, 0x9A66, 0x9A67, 0x9B24, 0x9E15, /* 0xB0 */
@@ -2890,5 +2890,5 @@ static sal_uInt16 const aImplDBCSToUniTab_BIG5_F9[] =
     0x2560, 0x256C, 0x2563, 0x255A, 0x2569, 0x255D, 0x2552, 0x2564, /* 0xE0 */
     0x2555, 0x255E, 0x256A, 0x2561, 0x2558, 0x2567, 0x255B, 0x2553, /* 0xE0 */
     0x2565, 0x2556, 0x255F, 0x256B, 0x2562, 0x2559, 0x2568, 0x255C, /* 0xF0 */
-    0x2551, 0x2550, 0x256D, 0x256E, 0x2570, 0x256F, 0x2593          /* 0xF0 */
+    0x2551, 0x2550, 0x256D, 0x256E, 0x2570, 0x256F, 0x2593			/* 0xF0 */
 };
diff --git a/sal/textenc/tcvttcn2.tab b/sal/textenc/tcvttcn2.tab
index 7a372d3212ad..c44e0191923a 100644
--- a/sal/textenc/tcvttcn2.tab
+++ b/sal/textenc/tcvttcn2.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,8 +35,8 @@
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_00[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, /* 0x00 */
     0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, /* 0x00 */
     0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, /* 0x10 */
@@ -53,21 +53,21 @@ static sal_uInt16 const aImplUniToDBCSTab_BIG5_00[] =
     0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, /* 0x60 */
     0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, /* 0x70 */
     0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0, 0xA246, 0xA247,      0, 0xA244,      0, 0xA1B1, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0, 0xA1C2, /* 0xA0 */
-    0xA258, 0xA1D3,      0,      0,      0,      0,      0, 0xA150, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xA1D1, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xA1D2  /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xA246, 0xA247, 	 0, 0xA244, 	 0, 0xA1B1, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1C2, /* 0xA0 */
+    0xA258, 0xA1D3, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA150, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1D1, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1D2	/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -75,8 +75,8 @@ static sal_uInt16 const aImplUniToDBCSTab_BIG5_00[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_APPLECHINTRAD_00[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, /* 0x00 */
     0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, /* 0x00 */
     0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, /* 0x10 */
@@ -92,22 +92,22 @@ static sal_uInt16 const aImplUniToDBCSTab_APPLECHINTRAD_00[] =
     0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, /* 0x60 */
     0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, /* 0x60 */
     0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, /* 0x70 */
-    0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0x00A0,      0, 0xA246, 0xA247,      0, 0xA244,      0, 0xA1B1, /* 0xA0 */
-         0, 0x00FD,      0,      0,      0,      0,      0, 0xA1C2, /* 0xA0 */
-    0xA258, 0xA1D3,      0,      0,      0,      0,      0, 0xA145, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0, 0xA1D1, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xA1D2  /* 0xF0 */
+    0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0x00A0, 	 0, 0xA246, 0xA247, 	 0, 0xA244, 	 0, 0xA1B1, /* 0xA0 */
+         0, 0x00FD, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1C2, /* 0xA0 */
+    0xA258, 0xA1D3, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA145, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1D1, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1D2	/* 0xF0 */
                                                                     /* 0xF0 */
 };
 
@@ -115,28 +115,28 @@ static sal_uInt16 const aImplUniToDBCSTab_APPLECHINTRAD_00[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_02[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xA3BE, /* 0xC0 */
-         0, 0xA3BC, 0xA3BD, 0xA3BF,      0, 0xA1C5,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0, 0xA3BB                                                  /* 0xD0 */
+         0, 0xA3BC, 0xA3BD, 0xA3BF, 	 0, 0xA1C5, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xA3BB													/* 0xD0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_03[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xA344, 0xA345, 0xA346, 0xA347, 0xA348, 0xA349, 0xA34A, /* 0x90 */
     0xA34B, 0xA34C, 0xA34D, 0xA34E, 0xA34F, 0xA350, 0xA351, 0xA352, /* 0x90 */
-    0xA353, 0xA354,      0, 0xA355, 0xA356, 0xA357, 0xA358, 0xA359, /* 0xA0 */
-    0xA35A, 0xA35B,      0,      0,      0,      0,      0,      0, /* 0xA0 */
+    0xA353, 0xA354, 	 0, 0xA355, 0xA356, 0xA357, 0xA358, 0xA359, /* 0xA0 */
+    0xA35A, 0xA35B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
          0, 0xA35C, 0xA35D, 0xA35E, 0xA35F, 0xA360, 0xA361, 0xA362, /* 0xB0 */
     0xA363, 0xA364, 0xA365, 0xA366, 0xA367, 0xA368, 0xA369, 0xA36A, /* 0xB0 */
-    0xA36B, 0xA36C,      0, 0xA36D, 0xA36E, 0xA36F, 0xA370, 0xA371, /* 0xC0 */
-    0xA372, 0xA373                                                  /* 0xC0 */
+    0xA36B, 0xA36C, 	 0, 0xA36D, 0xA36E, 0xA36F, 0xA370, 0xA371, /* 0xC0 */
+    0xA372, 0xA373													/* 0xC0 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -145,19 +145,19 @@ static sal_uInt16 const aImplUniToDBCSTab_BIG5_03[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_04[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xC7B3,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0xC7B1, 0xC7B2, 0xC7B4, 0xC7B5, /* 0x10 */
-    0xC7B6, 0xC7B7, 0xC7B8, 0xC7B9, 0xC7BA,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xC7BB, 0xC7BC, 0xC7BD, 0xC7BE, 0xC7BF, /* 0x20 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xC7B3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xC7B1, 0xC7B2, 0xC7B4, 0xC7B5, /* 0x10 */
+    0xC7B6, 0xC7B7, 0xC7B8, 0xC7B9, 0xC7BA, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xC7BB, 0xC7BC, 0xC7BD, 0xC7BE, 0xC7BF, /* 0x20 */
     0xC7C0, 0xC7C1, 0xC7C2, 0xC7C3, 0xC7C4, 0xC7C5, 0xC7C6, 0xC7C7, /* 0x20 */
     0xC7C8, 0xC7C9, 0xC7CA, 0xC7CB, 0xC7CC, 0xC7CD, 0xC7CF, 0xC7D0, /* 0x30 */
     0xC7D1, 0xC7D2, 0xC7D3, 0xC7D4, 0xC7D5, 0xC7D6, 0xC7D7, 0xC7D8, /* 0x30 */
     0xC7D9, 0xC7DA, 0xC7DB, 0xC7DC, 0xC7DD, 0xC7DE, 0xC7DF, 0xC7E0, /* 0x40 */
     0xC7E1, 0xC7E2, 0xC7E3, 0xC7E4, 0xC7E5, 0xC7E6, 0xC7E7, 0xC7E8, /* 0x40 */
-         0, 0xC7CE                                                  /* 0x50 */
+         0, 0xC7CE													/* 0x50 */
                                                                     /* 0x50 */
 };
 
@@ -165,120 +165,120 @@ static sal_uInt16 const aImplUniToDBCSTab_BIG5_04[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_20[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xA156, 0xA158,      0,      0,      0, /* 0x10 */
-    0xA1A5, 0xA1A6,      0,      0, 0xA1A7, 0xA1A8,      0,      0, /* 0x10 */
-         0,      0, 0xA145,      0,      0, 0xA14C, 0xA14B, 0xA145, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xA1AC,      0,      0, 0xA1AB,      0,      0, /* 0x30 */
-         0,      0,      0, 0xA1B0,      0,      0, 0xA1C2,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xA3E1                          /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xA156, 0xA158, 	 0, 	 0, 	 0, /* 0x10 */
+    0xA1A5, 0xA1A6, 	 0, 	 0, 0xA1A7, 0xA1A8, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xA145, 	 0, 	 0, 0xA14C, 0xA14B, 0xA145, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xA1AC, 	 0, 	 0, 0xA1AB, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xA1B0, 	 0, 	 0, 0xA1C2, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xA3E1							/* 0xA0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_21[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xA24A,      0, 0xA1C1,      0,      0, /* 0x00 */
-         0, 0xA24B,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xA24A, 	 0, 0xA1C1, 	 0, 	 0, /* 0x00 */
+         0, 0xA24B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
     0xA2B9, 0xA2BA, 0xA2BB, 0xA2BC, 0xA2BD, 0xA2BE, 0xA2BF, 0xA2C0, /* 0x60 */
-    0xA2C1, 0xA2C2,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xA1F6, 0xA1F4, 0xA1F7, 0xA1F5,      0,      0, 0xA1F8, 0xA1F9, /* 0x90 */
-    0xA1FB, 0xA1FA                                                  /* 0x90 */
+    0xA2C1, 0xA2C2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xA1F6, 0xA1F4, 0xA1F7, 0xA1F5, 	 0, 	 0, 0xA1F8, 0xA1F9, /* 0x90 */
+    0xA1FB, 0xA1FA													/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_APPLECHINTRAD_21[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xA24A,      0, 0xA1C1,      0,      0, /* 0x00 */
-         0, 0xA24B,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x00FE,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xA24A, 	 0, 0xA1C1, 	 0, 	 0, /* 0x00 */
+         0, 0xA24B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0x00FE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
     0xA2B9, 0xA2BA, 0xA2BB, 0xA2BC, 0xA2BD, 0xA2BE, 0xA2BF, 0xA2C0, /* 0x60 */
-    0xA2C1, 0xA2C2,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xA1F6, 0xA1F4, 0xA1F7, 0xA1F5,      0,      0, 0xA1F8, 0xA1F9, /* 0x90 */
-    0xA1FB, 0xA1FA                                                  /* 0x90 */
+    0xA2C1, 0xA2C2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xA1F6, 0xA1F4, 0xA1F7, 0xA1F5, 	 0, 	 0, 0xA1F8, 0xA1F9, /* 0x90 */
+    0xA1FB, 0xA1FA													/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_22[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xA241,      0,      0, /* 0x10 */
-         0,      0, 0xA1D4,      0,      0,      0, 0xA1DB, 0xA1E8, /* 0x10 */
-    0xA1E7,      0,      0, 0xA1FD,      0, 0xA1FC,      0,      0, /* 0x20 */
-         0, 0xA1E4, 0xA1E5, 0xA1EC,      0,      0, 0xA1ED,      0, /* 0x20 */
-         0,      0,      0,      0, 0xA1EF, 0xA1EE,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xA1E3,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xA1DC,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xA1DA, 0xA1DD,      0,      0,      0,      0, 0xA1D8, 0xA1D9, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xA1F2,      0,      0, /* 0x90 */
-         0, 0xA1F3,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xA1E6,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xA1E9, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xA14B  /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xA241, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xA1D4, 	 0, 	 0, 	 0, 0xA1DB, 0xA1E8, /* 0x10 */
+    0xA1E7, 	 0, 	 0, 0xA1FD, 	 0, 0xA1FC, 	 0, 	 0, /* 0x20 */
+         0, 0xA1E4, 0xA1E5, 0xA1EC, 	 0, 	 0, 0xA1ED, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xA1EF, 0xA1EE, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xA1E3, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xA1DC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xA1DA, 0xA1DD, 	 0, 	 0, 	 0, 	 0, 0xA1D8, 0xA1D9, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xA1F2, 	 0, 	 0, /* 0x90 */
+         0, 0xA1F3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xA1E6, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1E9, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA14B	/* 0xE0 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -287,49 +287,49 @@ static sal_uInt16 const aImplUniToDBCSTab_BIG5_22[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_24[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xC7E9, 0xC7EA, 0xC7EB, 0xC7EC, 0xC7ED, 0xC7EE, 0xC7EF, 0xC7F0, /* 0x60 */
-    0xC7F1, 0xC7F2,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0, 0xC7F3, 0xC7F4, 0xC7F5, 0xC7F6, /* 0x70 */
-    0xC7F7, 0xC7F8, 0xC7F9, 0xC7FA, 0xC7FB, 0xC7FC                  /* 0x70 */
+    0xC7F1, 0xC7F2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xC7F3, 0xC7F4, 0xC7F5, 0xC7F6, /* 0x70 */
+    0xC7F7, 0xC7F8, 0xC7F9, 0xC7FA, 0xC7FB, 0xC7FC					/* 0x70 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_25[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xA277,      0, 0xA278,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0, 0xA27A,      0,      0,      0, /* 0x00 */
-    0xA27B,      0,      0,      0, 0xA27C,      0,      0,      0, /* 0x10 */
-    0xA27D,      0,      0,      0, 0xA275,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0xA274,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xA273,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xA272,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0, 0xA271,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xA277, 	 0, 0xA278, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xA27A, 	 0, 	 0, 	 0, /* 0x00 */
+    0xA27B, 	 0, 	 0, 	 0, 0xA27C, 	 0, 	 0, 	 0, /* 0x10 */
+    0xA27D, 	 0, 	 0, 	 0, 0xA275, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xA274, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xA273, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xA272, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xA271, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
     0xA2A4, 0xF9F8, 0xF9E6, 0xF9EF, 0xF9DD, 0xF9E8, 0xF9F1, 0xF9DF, /* 0x50 */
     0xF9EC, 0xF9F5, 0xF9E3, 0xF9EE, 0xF9F7, 0xF9E5, 0xA2A5, 0xF9F2, /* 0x50 */
     0xF9E0, 0xA2A7, 0xF9F4, 0xF9E2, 0xF9E7, 0xF9F0, 0xF9DE, 0xF9ED, /* 0x60 */
     0xF9F6, 0xF9E4, 0xA2A6, 0xF9F3, 0xF9E1, 0xA27E, 0xA2A1, 0xA2A3, /* 0x60 */
-    0xA2A2, 0xA2AC, 0xA2AD, 0xA2AE, 0xA15A,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
+    0xA2A2, 0xA2AC, 0xA2AD, 0xA2AE, 0xA15A, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
          0, 0xA262, 0xA263, 0xA264, 0xA265, 0xA266, 0xA267, 0xA268, /* 0x80 */
     0xA269, 0xA270, 0xA26F, 0xA26E, 0xA26D, 0xA26C, 0xA26B, 0xA26A, /* 0x80 */
-         0,      0,      0, 0xF9FE, 0xA276, 0xA279,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-    0xA1BD, 0xA1BC,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xA1B6, 0xA1B5,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xA1BF, 0xA1BE,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xA1BB, 0xA1BA, /* 0xC0 */
-         0,      0,      0, 0xA1B3,      0,      0, 0xA1B7, 0xA1B4, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xA2A8, 0xA2A9, 0xA2AB, 0xA2AA                  /* 0xE0 */
+         0, 	 0, 	 0, 0xF9FE, 0xA276, 0xA279, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xA1BD, 0xA1BC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xA1B6, 0xA1B5, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xA1BF, 0xA1BE, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA1BB, 0xA1BA, /* 0xC0 */
+         0, 	 0, 	 0, 0xA1B3, 	 0, 	 0, 0xA1B7, 0xA1B4, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xA2A8, 0xA2A9, 0xA2AB, 0xA2AA					/* 0xE0 */
                                                                     /* 0xE0 */
 };
 
@@ -337,17 +337,17 @@ static sal_uInt16 const aImplUniToDBCSTab_BIG5_25[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_26[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xA1B9, 0xA1B8,      0, /* 0x00 */
-         0, 0xA1F3,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-    0xA1F0, 0xA1F2, 0xA1F1                                          /* 0x40 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xA1B9, 0xA1B8, 	 0, /* 0x00 */
+         0, 0xA1F3, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xA1F0, 0xA1F2, 0xA1F1											/* 0x40 */
                                                                     /* 0x40 */
 };
 
@@ -358,16 +358,16 @@ static sal_uInt16 const aImplUniToDBCSTab_BIG5_26[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_30[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xA140, 0xA142, 0xA143, 0xA1B2,      0, 0xC6A4,      0,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xA140, 0xA142, 0xA143, 0xA1B2, 	 0, 0xC6A4, 	 0, 	 0, /* 0x00 */
     0xA171, 0xA172, 0xA16D, 0xA16E, 0xA175, 0xA176, 0xA179, 0xA17A, /* 0x00 */
-    0xA169, 0xA16A, 0xA245,      0, 0xA165, 0xA166,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xA1A9, 0xA1AA,      0, /* 0x10 */
+    0xA169, 0xA16A, 0xA245, 	 0, 0xA165, 0xA166, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xA1A9, 0xA1AA, 	 0, /* 0x10 */
          0, 0xA2C3, 0xA2C4, 0xA2C5, 0xA2C6, 0xA2C7, 0xA2C8, 0xA2C9, /* 0x20 */
-    0xA2CA, 0xA2CB,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
+    0xA2CA, 0xA2CB, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
          0, 0xC6A5, 0xC6A6, 0xC6A7, 0xC6A8, 0xC6A9, 0xC6AA, 0xC6AB, /* 0x40 */
     0xC6AC, 0xC6AD, 0xC6AE, 0xC6AF, 0xC6B0, 0xC6B1, 0xC6B2, 0xC6B3, /* 0x40 */
     0xC6B4, 0xC6B5, 0xC6B6, 0xC6B7, 0xC6B8, 0xC6B9, 0xC6BA, 0xC6BB, /* 0x50 */
@@ -378,8 +378,8 @@ static sal_uInt16 const aImplUniToDBCSTab_BIG5_30[] =
     0xC6DC, 0xC6DD, 0xC6DE, 0xC6DF, 0xC6E0, 0xC6E1, 0xC6E2, 0xC6E3, /* 0x70 */
     0xC6E4, 0xC6E5, 0xC6E6, 0xC6E7, 0xC6E8, 0xC6E9, 0xC6EA, 0xC6EB, /* 0x80 */
     0xC6EC, 0xC6ED, 0xC6EE, 0xC6EF, 0xC6F0, 0xC6F1, 0xC6F2, 0xC6F3, /* 0x80 */
-    0xC6F4, 0xC6F5, 0xC6F6, 0xC6F7,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xC6A2, 0xC6A3,      0, /* 0x90 */
+    0xC6F4, 0xC6F5, 0xC6F6, 0xC6F7, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC6A2, 0xC6A3, 	 0, /* 0x90 */
          0, 0xC6F8, 0xC6F9, 0xC6FA, 0xC6FB, 0xC6FC, 0xC6FD, 0xC6FE, /* 0xA0 */
     0xC740, 0xC741, 0xC742, 0xC743, 0xC744, 0xC745, 0xC746, 0xC747, /* 0xA0 */
     0xC748, 0xC749, 0xC74A, 0xC74B, 0xC74C, 0xC74D, 0xC74E, 0xC74F, /* 0xB0 */
@@ -390,31 +390,31 @@ static sal_uInt16 const aImplUniToDBCSTab_BIG5_30[] =
     0xC770, 0xC771, 0xC772, 0xC773, 0xC774, 0xC775, 0xC776, 0xC777, /* 0xD0 */
     0xC778, 0xC779, 0xC77A, 0xC77B, 0xC77C, 0xC77D, 0xC77E, 0xC7A1, /* 0xE0 */
     0xC7A2, 0xC7A3, 0xC7A4, 0xC7A5, 0xC7A6, 0xC7A7, 0xC7A8, 0xC7A9, /* 0xE0 */
-    0xC7AA, 0xC7AB, 0xC7AC, 0xC7AD, 0xC7AE, 0xC7AF, 0xC7B0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0,      0, 0xC6A1          /* 0xF0 */
+    0xC7AA, 0xC7AB, 0xC7AC, 0xC7AD, 0xC7AE, 0xC7AF, 0xC7B0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC6A1			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_31[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                             0xA374, 0xA375, 0xA376, /* 0x00 */
     0xA377, 0xA378, 0xA379, 0xA37A, 0xA37B, 0xA37C, 0xA37D, 0xA37E, /* 0x00 */
     0xA3A1, 0xA3A2, 0xA3A3, 0xA3A4, 0xA3A5, 0xA3A6, 0xA3A7, 0xA3A8, /* 0x10 */
     0xA3A9, 0xA3AA, 0xA3AB, 0xA3AC, 0xA3AD, 0xA3AE, 0xA3AF, 0xA3B0, /* 0x10 */
     0xA3B1, 0xA3B2, 0xA3B3, 0xA3B4, 0xA3B5, 0xA3B6, 0xA3B7, 0xA3B8, /* 0x20 */
-    0xA3B9, 0xA3BA                                                  /* 0x20 */
+    0xA3B9, 0xA3BA													/* 0x20 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_32[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xA1C0                                  /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xA1C0									/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -422,19 +422,19 @@ static sal_uInt16 const aImplUniToDBCSTab_BIG5_32[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_33[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x80 */
                                                     0xA255, 0xA256, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0, 0xA250, 0xA251, 0xA252,      0, /* 0x90 */
-         0, 0xA254,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xA257,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xA253,      0, /* 0xC0 */
-         0, 0xA1EB, 0xA1EA,      0,      0, 0xA24F                  /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xA250, 0xA251, 0xA252, 	 0, /* 0x90 */
+         0, 0xA254, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xA257, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA253, 	 0, /* 0xC0 */
+         0, 0xA1EB, 0xA1EA, 	 0, 	 0, 0xA24F					/* 0xD0 */
                                                                     /* 0xD0 */
 };
 
@@ -442,2787 +442,2787 @@ static sal_uInt16 const aImplUniToDBCSTab_BIG5_33[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_4E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xA440, 0xA442,      0, 0xA443,      0,      0,      0, 0xC945, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xA440, 0xA442, 	 0, 0xA443, 	 0, 	 0, 	 0, 0xC945, /* 0x00 */
     0xA456, 0xA454, 0xA457, 0xA455, 0xC946, 0xA4A3, 0xC94F, 0xC94D, /* 0x00 */
-    0xA4A2, 0xA4A1,      0,      0, 0xA542, 0xA541, 0xA540,      0, /* 0x10 */
-    0xA543, 0xA4FE,      0,      0,      0,      0, 0xA5E0, 0xA5E1, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xA8C3,      0, /* 0x20 */
-         0,      0,      0, 0xA458,      0, 0xA4A4, 0xC950,      0, /* 0x20 */
-    0xA4A5, 0xC963, 0xA6EA, 0xCBB1,      0,      0,      0,      0, /* 0x30 */
-    0xA459, 0xA4A6,      0, 0xA544, 0xC964,      0,      0,      0, /* 0x30 */
-         0,      0, 0xC940, 0xA444,      0, 0xA45B,      0, 0xC947, /* 0x40 */
-    0xA45C,      0,      0, 0xA4A7,      0, 0xA545, 0xA547, 0xA546, /* 0x40 */
-         0,      0, 0xA5E2, 0xA5E3,      0,      0, 0xA8C4,      0, /* 0x50 */
-    0xADBC, 0xA441,      0,      0, 0xC941, 0xA445, 0xA45E, 0xA45D, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0, 0xA5E4,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xA8C5,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xB0AE, 0xD44B, /* 0x70 */
-         0,      0, 0xB6C3, 0xDCB1, 0xDCB2,      0, 0xA446,      0, /* 0x80 */
-    0xA4A9,      0,      0, 0xA8C6, 0xA447, 0xC948, 0xA45F,      0, /* 0x80 */
-         0, 0xA4AA, 0xA4AC, 0xC951, 0xA4AD, 0xA4AB,      0,      0, /* 0x90 */
-         0, 0xA5E5,      0, 0xA8C7,      0,      0, 0xA8C8, 0xAB45, /* 0x90 */
-         0, 0xA460, 0xA4AE,      0, 0xA5E6, 0xA5E8, 0xA5E7,      0, /* 0xA0 */
-    0xA6EB,      0,      0, 0xA8C9, 0xA8CA, 0xAB46, 0xAB47,      0, /* 0xA0 */
-         0,      0,      0, 0xADBD,      0,      0, 0xDCB3,      0, /* 0xB0 */
-         0, 0xF6D6, 0xA448,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xA4B0, 0xA4AF, 0xC952, 0xA4B1, 0xA4B7,      0, 0xA4B2, 0xA4B3, /* 0xC0 */
-    0xC954, 0xC953, 0xA4B5, 0xA4B6,      0, 0xA4B4,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xA54A, 0xA54B, 0xA54C, 0xA54D, /* 0xD0 */
-    0xA549, 0xA550, 0xC96A,      0, 0xC966, 0xC969, 0xA551, 0xA561, /* 0xD0 */
-         0, 0xC968,      0, 0xA54E, 0xA54F, 0xA548,      0,      0, /* 0xE0 */
-    0xC965, 0xC967,      0,      0,      0,      0,      0,      0, /* 0xE0 */
+    0xA4A2, 0xA4A1, 	 0, 	 0, 0xA542, 0xA541, 0xA540, 	 0, /* 0x10 */
+    0xA543, 0xA4FE, 	 0, 	 0, 	 0, 	 0, 0xA5E0, 0xA5E1, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA8C3, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xA458, 	 0, 0xA4A4, 0xC950, 	 0, /* 0x20 */
+    0xA4A5, 0xC963, 0xA6EA, 0xCBB1, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xA459, 0xA4A6, 	 0, 0xA544, 0xC964, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xC940, 0xA444, 	 0, 0xA45B, 	 0, 0xC947, /* 0x40 */
+    0xA45C, 	 0, 	 0, 0xA4A7, 	 0, 0xA545, 0xA547, 0xA546, /* 0x40 */
+         0, 	 0, 0xA5E2, 0xA5E3, 	 0, 	 0, 0xA8C4, 	 0, /* 0x50 */
+    0xADBC, 0xA441, 	 0, 	 0, 0xC941, 0xA445, 0xA45E, 0xA45D, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 0xA5E4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xA8C5, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB0AE, 0xD44B, /* 0x70 */
+         0, 	 0, 0xB6C3, 0xDCB1, 0xDCB2, 	 0, 0xA446, 	 0, /* 0x80 */
+    0xA4A9, 	 0, 	 0, 0xA8C6, 0xA447, 0xC948, 0xA45F, 	 0, /* 0x80 */
+         0, 0xA4AA, 0xA4AC, 0xC951, 0xA4AD, 0xA4AB, 	 0, 	 0, /* 0x90 */
+         0, 0xA5E5, 	 0, 0xA8C7, 	 0, 	 0, 0xA8C8, 0xAB45, /* 0x90 */
+         0, 0xA460, 0xA4AE, 	 0, 0xA5E6, 0xA5E8, 0xA5E7, 	 0, /* 0xA0 */
+    0xA6EB, 	 0, 	 0, 0xA8C9, 0xA8CA, 0xAB46, 0xAB47, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xADBD, 	 0, 	 0, 0xDCB3, 	 0, /* 0xB0 */
+         0, 0xF6D6, 0xA448, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xA4B0, 0xA4AF, 0xC952, 0xA4B1, 0xA4B7, 	 0, 0xA4B2, 0xA4B3, /* 0xC0 */
+    0xC954, 0xC953, 0xA4B5, 0xA4B6, 	 0, 0xA4B4, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xA54A, 0xA54B, 0xA54C, 0xA54D, /* 0xD0 */
+    0xA549, 0xA550, 0xC96A, 	 0, 0xC966, 0xC969, 0xA551, 0xA561, /* 0xD0 */
+         0, 0xC968, 	 0, 0xA54E, 0xA54F, 0xA548, 	 0, 	 0, /* 0xE0 */
+    0xC965, 0xC967, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
     0xA5F5, 0xC9B0, 0xA5F2, 0xA5F6, 0xC9BA, 0xC9AE, 0xA5F3, 0xC9B2, /* 0xF0 */
-         0,      0,      0, 0xA5F4,      0, 0xA5F7,      0, 0xA5E9  /* 0xF0 */
+         0, 	 0, 	 0, 0xA5F4, 	 0, 0xA5F7, 	 0, 0xA5E9	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_4F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xC9B1, 0xA5F8, 0xC9B5,      0, 0xC9B9, 0xC9B6,      0,      0, /* 0x00 */
-    0xC9B3, 0xA5EA, 0xA5EC, 0xA5F9,      0, 0xA5EE, 0xC9AB, 0xA5F1, /* 0x00 */
-    0xA5EF, 0xA5F0, 0xC9BB, 0xC9B8, 0xC9AF, 0xA5ED,      0,      0, /* 0x10 */
-    0xC9AC, 0xA5EB,      0,      0,      0, 0xC9B4,      0,      0, /* 0x10 */
-         0,      0, 0xC9B7,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0, 0xC9AD, 0xCA66,      0, 0xA742, /* 0x20 */
-    0xA6F4,      0,      0, 0xCA67, 0xA6F1,      0, 0xA744,      0, /* 0x30 */
-    0xA6F9,      0, 0xA6F8, 0xCA5B, 0xA6FC, 0xA6F7, 0xCA60, 0xCA68, /* 0x30 */
-         0, 0xCA64,      0, 0xA6FA,      0,      0, 0xA6FD, 0xA6EE, /* 0x40 */
-    0xA747, 0xCA5D,      0,      0, 0xCBBD, 0xA6EC, 0xA743, 0xA6ED, /* 0x40 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xC9B1, 0xA5F8, 0xC9B5, 	 0, 0xC9B9, 0xC9B6, 	 0, 	 0, /* 0x00 */
+    0xC9B3, 0xA5EA, 0xA5EC, 0xA5F9, 	 0, 0xA5EE, 0xC9AB, 0xA5F1, /* 0x00 */
+    0xA5EF, 0xA5F0, 0xC9BB, 0xC9B8, 0xC9AF, 0xA5ED, 	 0, 	 0, /* 0x10 */
+    0xC9AC, 0xA5EB, 	 0, 	 0, 	 0, 0xC9B4, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 0xC9B7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 0xC9AD, 0xCA66, 	 0, 0xA742, /* 0x20 */
+    0xA6F4, 	 0, 	 0, 0xCA67, 0xA6F1, 	 0, 0xA744, 	 0, /* 0x30 */
+    0xA6F9, 	 0, 0xA6F8, 0xCA5B, 0xA6FC, 0xA6F7, 0xCA60, 0xCA68, /* 0x30 */
+         0, 0xCA64, 	 0, 0xA6FA, 	 0, 	 0, 0xA6FD, 0xA6EE, /* 0x40 */
+    0xA747, 0xCA5D, 	 0, 	 0, 0xCBBD, 0xA6EC, 0xA743, 0xA6ED, /* 0x40 */
     0xA6F5, 0xA6F6, 0xCA62, 0xCA5E, 0xA6FB, 0xA6F3, 0xCA5A, 0xA6EF, /* 0x50 */
     0xCA65, 0xA745, 0xA748, 0xA6F2, 0xA740, 0xA746, 0xA6F0, 0xCA63, /* 0x50 */
-    0xA741, 0xCA69, 0xCA5C, 0xA6FE, 0xCA5F,      0,      0, 0xCA61, /* 0x60 */
-         0, 0xA8D8, 0xCBBF, 0xCBCB, 0xA8D0,      0, 0xCBCC, 0xA8CB, /* 0x60 */
-    0xA8D5,      0,      0, 0xA8CE, 0xCBB9, 0xA8D6, 0xCBB8, 0xCBBC, /* 0x70 */
+    0xA741, 0xCA69, 0xCA5C, 0xA6FE, 0xCA5F, 	 0, 	 0, 0xCA61, /* 0x60 */
+         0, 0xA8D8, 0xCBBF, 0xCBCB, 0xA8D0, 	 0, 0xCBCC, 0xA8CB, /* 0x60 */
+    0xA8D5, 	 0, 	 0, 0xA8CE, 0xCBB9, 0xA8D6, 0xCBB8, 0xCBBC, /* 0x70 */
     0xCBC3, 0xCBC1, 0xA8DE, 0xA8D9, 0xCBB3, 0xCBB5, 0xA8DB, 0xA8CF, /* 0x70 */
     0xCBB6, 0xCBC2, 0xCBC9, 0xA8D4, 0xCBBB, 0xCBB4, 0xA8D3, 0xCBB7, /* 0x80 */
-    0xA8D7, 0xCBBA,      0, 0xA8D2,      0, 0xA8CD,      0, 0xA8DC, /* 0x80 */
-    0xCBC4, 0xA8DD, 0xCBC8,      0, 0xCBC6, 0xCBCA, 0xA8DA, 0xCBBE, /* 0x90 */
-    0xCBB2,      0, 0xCBC0, 0xA8D1, 0xCBC5, 0xA8CC, 0xCBC7,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xAB56, 0xAB4A, /* 0xA0 */
-         0,      0, 0xCDE0, 0xCDE8,      0, 0xAB49, 0xAB51, 0xAB5D, /* 0xB0 */
-         0, 0xCDEE, 0xCDEC, 0xCDE7,      0,      0,      0, 0xAB4B, /* 0xB0 */
-    0xCDED, 0xCDE3, 0xAB59, 0xAB50, 0xAB58, 0xCDDE,      0, 0xCDEA, /* 0xC0 */
-         0, 0xCDE1, 0xAB54, 0xCDE2,      0, 0xCDDD, 0xAB5B, 0xAB4E, /* 0xC0 */
-    0xAB57, 0xAB4D,      0, 0xCDDF, 0xCDE4,      0, 0xCDEB, 0xAB55, /* 0xD0 */
+    0xA8D7, 0xCBBA, 	 0, 0xA8D2, 	 0, 0xA8CD, 	 0, 0xA8DC, /* 0x80 */
+    0xCBC4, 0xA8DD, 0xCBC8, 	 0, 0xCBC6, 0xCBCA, 0xA8DA, 0xCBBE, /* 0x90 */
+    0xCBB2, 	 0, 0xCBC0, 0xA8D1, 0xCBC5, 0xA8CC, 0xCBC7, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xAB56, 0xAB4A, /* 0xA0 */
+         0, 	 0, 0xCDE0, 0xCDE8, 	 0, 0xAB49, 0xAB51, 0xAB5D, /* 0xB0 */
+         0, 0xCDEE, 0xCDEC, 0xCDE7, 	 0, 	 0, 	 0, 0xAB4B, /* 0xB0 */
+    0xCDED, 0xCDE3, 0xAB59, 0xAB50, 0xAB58, 0xCDDE, 	 0, 0xCDEA, /* 0xC0 */
+         0, 0xCDE1, 0xAB54, 0xCDE2, 	 0, 0xCDDD, 0xAB5B, 0xAB4E, /* 0xC0 */
+    0xAB57, 0xAB4D, 	 0, 0xCDDF, 0xCDE4, 	 0, 0xCDEB, 0xAB55, /* 0xD0 */
     0xAB52, 0xCDE6, 0xAB5A, 0xCDE9, 0xCDE5, 0xAB4F, 0xAB5C, 0xAB53, /* 0xD0 */
-    0xAB4C, 0xAB48,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xCDEF,      0, 0xADD7, 0xADC1, /* 0xE0 */
-         0, 0xADD1,      0, 0xADD6, 0xD0D0, 0xD0CF, 0xD0D4, 0xD0D5, /* 0xF0 */
-    0xADC4,      0, 0xADCD,      0,      0,      0, 0xADDA          /* 0xF0 */
+    0xAB4C, 0xAB48, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xCDEF, 	 0, 0xADD7, 0xADC1, /* 0xE0 */
+         0, 0xADD1, 	 0, 0xADD6, 0xD0D0, 0xD0CF, 0xD0D4, 0xD0D5, /* 0xF0 */
+    0xADC4, 	 0, 0xADCD, 	 0, 	 0, 	 0, 0xADDA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_50[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xADCE,      0,      0,      0,      0, 0xD0C9, 0xADC7, 0xD0CA, /* 0x00 */
-         0, 0xADDC,      0, 0xADD3, 0xADBE, 0xADBF, 0xD0DD, 0xB0BF, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xADCE, 	 0, 	 0, 	 0, 	 0, 0xD0C9, 0xADC7, 0xD0CA, /* 0x00 */
+         0, 0xADDC, 	 0, 0xADD3, 0xADBE, 0xADBF, 0xD0DD, 0xB0BF, /* 0x00 */
          0, 0xADCC, 0xADCB, 0xD0CB, 0xADCF, 0xD45B, 0xADC6, 0xD0D6, /* 0x10 */
-    0xADD5, 0xADD4, 0xADCA, 0xD0CE, 0xD0D7,      0, 0xD0C8, 0xADC9, /* 0x10 */
-    0xD0D8, 0xADD2, 0xD0CC, 0xADC0,      0, 0xADC3, 0xADC2, 0xD0D9, /* 0x20 */
-    0xADD0, 0xADC5, 0xADD9, 0xADDB, 0xD0D3, 0xADD8,      0, 0xD0DB, /* 0x20 */
-    0xD0CD, 0xD0DC,      0, 0xD0D1,      0, 0xD0DA,      0, 0xD0D2, /* 0x30 */
-         0,      0,      0,      0, 0xADC8,      0,      0,      0, /* 0x30 */
-    0xD463, 0xD457,      0, 0xB0B3,      0, 0xD45C, 0xD462, 0xB0B2, /* 0x40 */
+    0xADD5, 0xADD4, 0xADCA, 0xD0CE, 0xD0D7, 	 0, 0xD0C8, 0xADC9, /* 0x10 */
+    0xD0D8, 0xADD2, 0xD0CC, 0xADC0, 	 0, 0xADC3, 0xADC2, 0xD0D9, /* 0x20 */
+    0xADD0, 0xADC5, 0xADD9, 0xADDB, 0xD0D3, 0xADD8, 	 0, 0xD0DB, /* 0x20 */
+    0xD0CD, 0xD0DC, 	 0, 0xD0D1, 	 0, 0xD0DA, 	 0, 0xD0D2, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xADC8, 	 0, 	 0, 	 0, /* 0x30 */
+    0xD463, 0xD457, 	 0, 0xB0B3, 	 0, 0xD45C, 0xD462, 0xB0B2, /* 0x40 */
     0xD455, 0xB0B6, 0xD459, 0xD452, 0xB0B4, 0xD456, 0xB0B9, 0xB0BE, /* 0x40 */
-         0, 0xD467,      0, 0xD451,      0, 0xB0BA,      0, 0xD466, /* 0x50 */
-         0,      0, 0xB0B5, 0xD458, 0xB0B1, 0xD453, 0xD44F, 0xD45D, /* 0x50 */
-    0xD450, 0xD44E, 0xD45A, 0xD460, 0xD461, 0xB0B7,      0,      0, /* 0x60 */
-    0xD85B, 0xD45E, 0xD44D, 0xD45F,      0, 0xB0C1, 0xD464, 0xB0C0, /* 0x60 */
-    0xD44C,      0, 0xD454, 0xD465, 0xB0BC, 0xB0BB, 0xB0B8, 0xB0BD, /* 0x70 */
-         0,      0, 0xB0AF,      0,      0, 0xB0B0,      0,      0, /* 0x70 */
-    0xB3C8,      0, 0xD85E, 0xD857,      0, 0xB3C5,      0, 0xD85F, /* 0x80 */
-         0,      0,      0, 0xD855, 0xD858, 0xB3C4, 0xD859,      0, /* 0x80 */
-         0, 0xB3C7, 0xD85D,      0, 0xD853, 0xD852, 0xB3C9,      0, /* 0x90 */
-    0xB3CA, 0xB3C6, 0xB3CB, 0xD851, 0xD85C, 0xD85A, 0xD854,      0, /* 0x90 */
-         0,      0, 0xB3C3, 0xD856,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xB6CA, 0xB6C4, 0xDCB7, 0xB6CD, /* 0xA0 */
+         0, 0xD467, 	 0, 0xD451, 	 0, 0xB0BA, 	 0, 0xD466, /* 0x50 */
+         0, 	 0, 0xB0B5, 0xD458, 0xB0B1, 0xD453, 0xD44F, 0xD45D, /* 0x50 */
+    0xD450, 0xD44E, 0xD45A, 0xD460, 0xD461, 0xB0B7, 	 0, 	 0, /* 0x60 */
+    0xD85B, 0xD45E, 0xD44D, 0xD45F, 	 0, 0xB0C1, 0xD464, 0xB0C0, /* 0x60 */
+    0xD44C, 	 0, 0xD454, 0xD465, 0xB0BC, 0xB0BB, 0xB0B8, 0xB0BD, /* 0x70 */
+         0, 	 0, 0xB0AF, 	 0, 	 0, 0xB0B0, 	 0, 	 0, /* 0x70 */
+    0xB3C8, 	 0, 0xD85E, 0xD857, 	 0, 0xB3C5, 	 0, 0xD85F, /* 0x80 */
+         0, 	 0, 	 0, 0xD855, 0xD858, 0xB3C4, 0xD859, 	 0, /* 0x80 */
+         0, 0xB3C7, 0xD85D, 	 0, 0xD853, 0xD852, 0xB3C9, 	 0, /* 0x90 */
+    0xB3CA, 0xB3C6, 0xB3CB, 0xD851, 0xD85C, 0xD85A, 0xD854, 	 0, /* 0x90 */
+         0, 	 0, 0xB3C3, 0xD856, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xB6CA, 0xB6C4, 0xDCB7, 0xB6CD, /* 0xA0 */
     0xDCBD, 0xDCC0, 0xB6C6, 0xB6C7, 0xDCBA, 0xB6C5, 0xDCC3, 0xB6CB, /* 0xB0 */
-    0xDCC4,      0, 0xDCBF, 0xB6CC,      0, 0xDCB4, 0xB6C9, 0xDCB5, /* 0xB0 */
-         0, 0xDCBE, 0xDCBC,      0, 0xDCB8, 0xB6C8, 0xDCB6, 0xB6CE, /* 0xC0 */
-    0xDCBB, 0xDCC2, 0xDCB9, 0xDCC1,      0,      0, 0xB9B6, 0xB9B3, /* 0xC0 */
-         0, 0xB9B4,      0, 0xE0F9, 0xE0F1, 0xB9B2, 0xB9AF, 0xE0F2, /* 0xD0 */
-         0,      0, 0xB9B1, 0xE0F5,      0, 0xE0F7,      0,      0, /* 0xD0 */
-    0xE0FE,      0,      0, 0xE0FD, 0xE0F8, 0xB9AE, 0xE0F0, 0xB9AC, /* 0xE0 */
-    0xE0F3, 0xB9B7, 0xE0F6,      0, 0xE0FA, 0xB9B0, 0xB9AD, 0xE0FC, /* 0xE0 */
-    0xE0FB, 0xB9B5,      0, 0xE0F4,      0, 0xBBF8, 0xE4EC,      0, /* 0xF0 */
-    0xE4E9, 0xBBF9,      0, 0xBBF7,      0, 0xE4F0, 0xE4ED, 0xE4E6  /* 0xF0 */
+    0xDCC4, 	 0, 0xDCBF, 0xB6CC, 	 0, 0xDCB4, 0xB6C9, 0xDCB5, /* 0xB0 */
+         0, 0xDCBE, 0xDCBC, 	 0, 0xDCB8, 0xB6C8, 0xDCB6, 0xB6CE, /* 0xC0 */
+    0xDCBB, 0xDCC2, 0xDCB9, 0xDCC1, 	 0, 	 0, 0xB9B6, 0xB9B3, /* 0xC0 */
+         0, 0xB9B4, 	 0, 0xE0F9, 0xE0F1, 0xB9B2, 0xB9AF, 0xE0F2, /* 0xD0 */
+         0, 	 0, 0xB9B1, 0xE0F5, 	 0, 0xE0F7, 	 0, 	 0, /* 0xD0 */
+    0xE0FE, 	 0, 	 0, 0xE0FD, 0xE0F8, 0xB9AE, 0xE0F0, 0xB9AC, /* 0xE0 */
+    0xE0F3, 0xB9B7, 0xE0F6, 	 0, 0xE0FA, 0xB9B0, 0xB9AD, 0xE0FC, /* 0xE0 */
+    0xE0FB, 0xB9B5, 	 0, 0xE0F4, 	 0, 0xBBF8, 0xE4EC, 	 0, /* 0xF0 */
+    0xE4E9, 0xBBF9, 	 0, 0xBBF7, 	 0, 0xE4F0, 0xE4ED, 0xE4E6	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_51[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xBBF6,      0, 0xBBFA, 0xE4E7, 0xBBF5, 0xBBFD, 0xE4EA, 0xE4EB, /* 0x00 */
-    0xBBFB, 0xBBFC, 0xE4F1, 0xE4EE, 0xE4EF,      0,      0,      0, /* 0x00 */
-    0xBEAA, 0xE8F8, 0xBEA7, 0xE8F5, 0xBEA9, 0xBEAB,      0, 0xE8F6, /* 0x10 */
-    0xBEA8,      0, 0xE8F7,      0, 0xE8F4,      0,      0, 0xC076, /* 0x10 */
-    0xECBD, 0xC077, 0xECBB,      0, 0xECBC, 0xECBA, 0xECB9,      0, /* 0x20 */
-         0, 0xECBE, 0xC075,      0,      0, 0xEFB8, 0xEFB9,      0, /* 0x20 */
-    0xE4E8, 0xEFB7, 0xC078, 0xC35F, 0xF1EB, 0xF1EC,      0, 0xC4D7, /* 0x30 */
-    0xC4D8, 0xF5C1, 0xF5C0, 0xC56C, 0xC56B, 0xF7D0,      0, 0xA449, /* 0x30 */
-    0xA461, 0xA4B9,      0, 0xA4B8, 0xA553, 0xA552, 0xA5FC, 0xA5FB, /* 0x40 */
-    0xA5FD, 0xA5FA,      0, 0xA74A, 0xA749, 0xA74B,      0,      0, /* 0x40 */
-         0,      0, 0xA8E0,      0, 0xA8DF, 0xA8E1,      0, 0xAB5E, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xBBF6, 	 0, 0xBBFA, 0xE4E7, 0xBBF5, 0xBBFD, 0xE4EA, 0xE4EB, /* 0x00 */
+    0xBBFB, 0xBBFC, 0xE4F1, 0xE4EE, 0xE4EF, 	 0, 	 0, 	 0, /* 0x00 */
+    0xBEAA, 0xE8F8, 0xBEA7, 0xE8F5, 0xBEA9, 0xBEAB, 	 0, 0xE8F6, /* 0x10 */
+    0xBEA8, 	 0, 0xE8F7, 	 0, 0xE8F4, 	 0, 	 0, 0xC076, /* 0x10 */
+    0xECBD, 0xC077, 0xECBB, 	 0, 0xECBC, 0xECBA, 0xECB9, 	 0, /* 0x20 */
+         0, 0xECBE, 0xC075, 	 0, 	 0, 0xEFB8, 0xEFB9, 	 0, /* 0x20 */
+    0xE4E8, 0xEFB7, 0xC078, 0xC35F, 0xF1EB, 0xF1EC, 	 0, 0xC4D7, /* 0x30 */
+    0xC4D8, 0xF5C1, 0xF5C0, 0xC56C, 0xC56B, 0xF7D0, 	 0, 0xA449, /* 0x30 */
+    0xA461, 0xA4B9, 	 0, 0xA4B8, 0xA553, 0xA552, 0xA5FC, 0xA5FB, /* 0x40 */
+    0xA5FD, 0xA5FA, 	 0, 0xA74A, 0xA749, 0xA74B, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xA8E0, 	 0, 0xA8DF, 0xA8E1, 	 0, 0xAB5E, /* 0x50 */
          0, 0xA259, 0xD0DE, 0xA25A, 0xB0C2, 0xA25C, 0xA25B, 0xD860, /* 0x50 */
-         0, 0xA25D, 0xB9B8, 0xA25E,      0, 0xA44A,      0, 0xA4BA, /* 0x60 */
-    0xA5FE, 0xA8E2,      0, 0xA44B, 0xA4BD, 0xA4BB, 0xA4BC,      0, /* 0x60 */
-         0, 0xA640,      0,      0,      0, 0xA74C, 0xA8E4, 0xA8E3, /* 0x70 */
-    0xA8E5,      0,      0,      0, 0xADDD,      0,      0,      0, /* 0x70 */
-    0xBEAC,      0,      0,      0,      0,      0,      0, 0xC94E, /* 0x80 */
-         0, 0xA554, 0xA555,      0,      0, 0xA641,      0, 0xCA6A, /* 0x80 */
-         0, 0xAB60, 0xAB5F, 0xD0E0, 0xD0DF, 0xB0C3,      0, 0xA4BE, /* 0x90 */
-    0xC955,      0,      0,      0,      0,      0, 0xCBCD,      0, /* 0x90 */
-    0xAB61,      0, 0xADE0,      0, 0xADDE, 0xADDF,      0,      0, /* 0xA0 */
-         0,      0, 0xBEAD,      0, 0xA556,      0,      0,      0, /* 0xA0 */
-    0xA642, 0xC9BC,      0,      0,      0,      0, 0xA74D, 0xA74E, /* 0xB0 */
-         0, 0xCA6B,      0,      0, 0xCBCE, 0xA8E6, 0xCBCF,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xD0E2, 0xD0E3, 0xADE3,      0, /* 0xC0 */
-    0xD0E4,      0, 0xD0E1, 0xADE4, 0xADE2, 0xADE1, 0xD0E5,      0, /* 0xC0 */
-    0xD468,      0,      0,      0, 0xD861,      0,      0, 0xDCC5, /* 0xD0 */
-    0xE140,      0,      0,      0, 0xBBFE, 0xBEAE, 0xE8F9,      0, /* 0xD0 */
-    0xA44C, 0xA45A,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xB0C4, 0xB3CD,      0, 0xB9B9,      0, 0xC942, 0xA4BF,      0, /* 0xF0 */
-    0xA559, 0xA557, 0xA558,      0,      0, 0xA8E7                  /* 0xF0 */
+         0, 0xA25D, 0xB9B8, 0xA25E, 	 0, 0xA44A, 	 0, 0xA4BA, /* 0x60 */
+    0xA5FE, 0xA8E2, 	 0, 0xA44B, 0xA4BD, 0xA4BB, 0xA4BC, 	 0, /* 0x60 */
+         0, 0xA640, 	 0, 	 0, 	 0, 0xA74C, 0xA8E4, 0xA8E3, /* 0x70 */
+    0xA8E5, 	 0, 	 0, 	 0, 0xADDD, 	 0, 	 0, 	 0, /* 0x70 */
+    0xBEAC, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC94E, /* 0x80 */
+         0, 0xA554, 0xA555, 	 0, 	 0, 0xA641, 	 0, 0xCA6A, /* 0x80 */
+         0, 0xAB60, 0xAB5F, 0xD0E0, 0xD0DF, 0xB0C3, 	 0, 0xA4BE, /* 0x90 */
+    0xC955, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBCD, 	 0, /* 0x90 */
+    0xAB61, 	 0, 0xADE0, 	 0, 0xADDE, 0xADDF, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xBEAD, 	 0, 0xA556, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xA642, 0xC9BC, 	 0, 	 0, 	 0, 	 0, 0xA74D, 0xA74E, /* 0xB0 */
+         0, 0xCA6B, 	 0, 	 0, 0xCBCE, 0xA8E6, 0xCBCF, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xD0E2, 0xD0E3, 0xADE3, 	 0, /* 0xC0 */
+    0xD0E4, 	 0, 0xD0E1, 0xADE4, 0xADE2, 0xADE1, 0xD0E5, 	 0, /* 0xC0 */
+    0xD468, 	 0, 	 0, 	 0, 0xD861, 	 0, 	 0, 0xDCC5, /* 0xD0 */
+    0xE140, 	 0, 	 0, 	 0, 0xBBFE, 0xBEAE, 0xE8F9, 	 0, /* 0xD0 */
+    0xA44C, 0xA45A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xB0C4, 0xB3CD, 	 0, 0xB9B9, 	 0, 0xC942, 0xA4BF, 	 0, /* 0xF0 */
+    0xA559, 0xA557, 0xA558, 	 0, 	 0, 0xA8E7					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_52[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xA44D, 0xA44E,      0, 0xA462,      0,      0, 0xA4C0, 0xA4C1, /* 0x00 */
-    0xA4C2, 0xC9BE, 0xA55A,      0, 0xC96B,      0, 0xA646,      0, /* 0x00 */
-    0xC9BF, 0xA644, 0xA645, 0xC9BD,      0,      0, 0xA647, 0xA643, /* 0x10 */
-         0,      0,      0,      0, 0xCA6C, 0xAAEC, 0xCA6D,      0, /* 0x10 */
-         0, 0xCA6E,      0,      0, 0xA750, 0xA74F,      0,      0, /* 0x20 */
-    0xA753, 0xA751, 0xA752,      0,      0,      0, 0xA8ED,      0, /* 0x20 */
-    0xA8EC, 0xCBD4, 0xCBD1, 0xCBD2,      0, 0xCBD0, 0xA8EE, 0xA8EA, /* 0x30 */
-    0xA8E9,      0, 0xA8EB, 0xA8E8,      0,      0,      0,      0, /* 0x30 */
-         0, 0xA8EF,      0, 0xAB63, 0xCDF0,      0, 0xCBD3, 0xAB68, /* 0x40 */
-         0, 0xCDF1, 0xAB64, 0xAB67, 0xAB66, 0xAB65, 0xAB62,      0, /* 0x40 */
-         0,      0, 0xD0E8,      0, 0xADE7, 0xD0EB, 0xADE5,      0, /* 0x50 */
-         0,      0, 0xD0E7, 0xADE8, 0xADE6, 0xADE9, 0xD0E9, 0xD0EA, /* 0x50 */
-         0, 0xD0E6, 0xD0EC,      0,      0,      0,      0,      0, /* 0x60 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xA44D, 0xA44E, 	 0, 0xA462, 	 0, 	 0, 0xA4C0, 0xA4C1, /* 0x00 */
+    0xA4C2, 0xC9BE, 0xA55A, 	 0, 0xC96B, 	 0, 0xA646, 	 0, /* 0x00 */
+    0xC9BF, 0xA644, 0xA645, 0xC9BD, 	 0, 	 0, 0xA647, 0xA643, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xCA6C, 0xAAEC, 0xCA6D, 	 0, /* 0x10 */
+         0, 0xCA6E, 	 0, 	 0, 0xA750, 0xA74F, 	 0, 	 0, /* 0x20 */
+    0xA753, 0xA751, 0xA752, 	 0, 	 0, 	 0, 0xA8ED, 	 0, /* 0x20 */
+    0xA8EC, 0xCBD4, 0xCBD1, 0xCBD2, 	 0, 0xCBD0, 0xA8EE, 0xA8EA, /* 0x30 */
+    0xA8E9, 	 0, 0xA8EB, 0xA8E8, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xA8EF, 	 0, 0xAB63, 0xCDF0, 	 0, 0xCBD3, 0xAB68, /* 0x40 */
+         0, 0xCDF1, 0xAB64, 0xAB67, 0xAB66, 0xAB65, 0xAB62, 	 0, /* 0x40 */
+         0, 	 0, 0xD0E8, 	 0, 0xADE7, 0xD0EB, 0xADE5, 	 0, /* 0x50 */
+         0, 	 0, 0xD0E7, 0xADE8, 0xADE6, 0xADE9, 0xD0E9, 0xD0EA, /* 0x50 */
+         0, 0xD0E6, 0xD0EC, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
          0, 0xB3D1, 0xB0C5, 0xD469, 0xD46B, 0xD46A, 0xD46C, 0xB0C6, /* 0x60 */
-         0,      0, 0xB3CE,      0, 0xB3CF, 0xB3D0,      0, 0xB6D0, /* 0x70 */
-    0xDCC7,      0, 0xDCC6, 0xDCC8, 0xDCC9, 0xB6D1,      0, 0xB6CF, /* 0x70 */
-    0xE141, 0xE142, 0xB9BB, 0xB9BA, 0xE35A,      0,      0, 0xBC40, /* 0x80 */
-    0xBC41, 0xBC42, 0xBC44, 0xE4F2, 0xE4F3, 0xBC43,      0,      0, /* 0x80 */
-         0, 0xBEAF,      0, 0xBEB0,      0,      0, 0xF1ED, 0xF5C3, /* 0x90 */
-    0xF5C2, 0xF7D1,      0, 0xA44F,      0,      0,      0, 0xA55C, /* 0x90 */
-    0xA55B,      0,      0, 0xA648,      0,      0, 0xC9C0,      0, /* 0xA0 */
-         0, 0xA755, 0xA756, 0xA754, 0xA757, 0xCA6F, 0xCA70,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xA8F1, 0xCBD5,      0, 0xA8F0,      0, /* 0xB0 */
-    0xCDF2, 0xAB6C, 0xCDF3, 0xAB6B,      0,      0,      0, 0xAB69, /* 0xC0 */
-         0, 0xAB6A,      0,      0,      0, 0xD0ED,      0,      0, /* 0xC0 */
-         0,      0, 0xB0C7, 0xD46E,      0, 0xB0CA, 0xD46D, 0xB1E5, /* 0xD0 */
-    0xB0C9, 0xB0C8,      0, 0xB3D4,      0, 0xB3D3, 0xB3D2, 0xB6D2, /* 0xD0 */
-         0,      0, 0xB6D5, 0xB6D6, 0xB6D4,      0, 0xB6D3,      0, /* 0xE0 */
-         0, 0xE143,      0, 0xE144,      0,      0,      0, 0xE4F5, /* 0xE0 */
-    0xBC45, 0xE4F4,      0, 0xBEB1, 0xECBF, 0xC079,      0, 0xF1EE, /* 0xF0 */
-    0xC455,      0, 0xA463, 0xA4C3, 0xC956,      0, 0xA4C4, 0xA4C5  /* 0xF0 */
+         0, 	 0, 0xB3CE, 	 0, 0xB3CF, 0xB3D0, 	 0, 0xB6D0, /* 0x70 */
+    0xDCC7, 	 0, 0xDCC6, 0xDCC8, 0xDCC9, 0xB6D1, 	 0, 0xB6CF, /* 0x70 */
+    0xE141, 0xE142, 0xB9BB, 0xB9BA, 0xE35A, 	 0, 	 0, 0xBC40, /* 0x80 */
+    0xBC41, 0xBC42, 0xBC44, 0xE4F2, 0xE4F3, 0xBC43, 	 0, 	 0, /* 0x80 */
+         0, 0xBEAF, 	 0, 0xBEB0, 	 0, 	 0, 0xF1ED, 0xF5C3, /* 0x90 */
+    0xF5C2, 0xF7D1, 	 0, 0xA44F, 	 0, 	 0, 	 0, 0xA55C, /* 0x90 */
+    0xA55B, 	 0, 	 0, 0xA648, 	 0, 	 0, 0xC9C0, 	 0, /* 0xA0 */
+         0, 0xA755, 0xA756, 0xA754, 0xA757, 0xCA6F, 0xCA70, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xA8F1, 0xCBD5, 	 0, 0xA8F0, 	 0, /* 0xB0 */
+    0xCDF2, 0xAB6C, 0xCDF3, 0xAB6B, 	 0, 	 0, 	 0, 0xAB69, /* 0xC0 */
+         0, 0xAB6A, 	 0, 	 0, 	 0, 0xD0ED, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xB0C7, 0xD46E, 	 0, 0xB0CA, 0xD46D, 0xB1E5, /* 0xD0 */
+    0xB0C9, 0xB0C8, 	 0, 0xB3D4, 	 0, 0xB3D3, 0xB3D2, 0xB6D2, /* 0xD0 */
+         0, 	 0, 0xB6D5, 0xB6D6, 0xB6D4, 	 0, 0xB6D3, 	 0, /* 0xE0 */
+         0, 0xE143, 	 0, 0xE144, 	 0, 	 0, 	 0, 0xE4F5, /* 0xE0 */
+    0xBC45, 0xE4F4, 	 0, 0xBEB1, 0xECBF, 0xC079, 	 0, 0xF1EE, /* 0xF0 */
+    0xC455, 	 0, 0xA463, 0xA4C3, 0xC956, 	 0, 0xA4C4, 0xA4C5	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_53[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                            0xA55D, 0xA55E,      0, /* 0x00 */
-    0xA649, 0xCA71, 0xCBD6, 0xCBD7,      0, 0xAB6D, 0xD0EE, 0xB0CC, /* 0x00 */
-    0xB0CB, 0xD863, 0xD862,      0,      0, 0xA450, 0xA4C6, 0xA55F, /* 0x10 */
-         0, 0xB0CD, 0xC943,      0, 0xC96C, 0xA560,      0, 0xC9C2, /* 0x10 */
-    0xA64B, 0xA64A, 0xC9C1, 0xA758,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xADEA,      0,      0, 0xD46F,      0, 0xB6D7, /* 0x20 */
-    0xE145, 0xB9BC,      0,      0, 0xE8FA,      0,      0, 0xF3FD, /* 0x30 */
-         0, 0xA4C7,      0,      0, 0xCBD8, 0xCDF4, 0xB0D0, 0xB0CE, /* 0x30 */
-    0xB0CF, 0xA451,      0, 0xA464, 0xA2CD, 0xA4CA,      0, 0xA4C9, /* 0x40 */
-    0xA4C8, 0xA563, 0xA562,      0, 0xC96D, 0xC9C3,      0,      0, /* 0x40 */
-         0, 0xA8F5, 0xA8F2, 0xA8F4, 0xA8F3,      0,      0, 0xAB6E, /* 0x50 */
-         0,      0, 0xB3D5,      0, 0xA452,      0, 0xA4CB,      0, /* 0x50 */
-    0xA565, 0xA564,      0, 0xCA72,      0,      0, 0xA8F6,      0, /* 0x60 */
-         0,      0,      0,      0, 0xC957,      0, 0xA567, 0xA566, /* 0x60 */
-    0xA64C, 0xA64D, 0xCA73, 0xA759,      0, 0xA75A,      0, 0xA8F7, /* 0x70 */
-    0xA8F8, 0xA8F9,      0, 0xAB6F, 0xCDF5,      0,      0, 0xADEB, /* 0x70 */
-         0,      0, 0xC944,      0, 0xA4CC,      0,      0,      0, /* 0x80 */
-         0,      0, 0xC9C4,      0,      0,      0, 0xCA74, 0xCA75, /* 0x80 */
-         0,      0, 0xCBD9,      0, 0xCBDA,      0, 0xCDF7, 0xCDF6, /* 0x90 */
-    0xCDF9, 0xCDF8, 0xAB70,      0, 0xD470, 0xADED, 0xD0EF, 0xADEC, /* 0x90 */
-         0,      0,      0,      0, 0xD864, 0xB3D6,      0, 0xD865, /* 0xA0 */
-         0,      0,      0,      0, 0xE146, 0xB9BD,      0,      0, /* 0xA0 */
-         0,      0, 0xBC46,      0, 0xF1EF,      0,      0,      0, /* 0xB0 */
-         0, 0xC958,      0, 0xA568,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xB0D1,      0,      0,      0,      0, /* 0xC0 */
-    0xA453, 0xA465, 0xA4CE, 0xA4CD,      0, 0xA4CF,      0,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xA8FB,      0, 0xA8FA, 0xA8FC, /* 0xD0 */
-         0,      0,      0, 0xAB71,      0,      0,      0, 0xADEE, /* 0xD0 */
-         0, 0xE8FB, 0xC24F, 0xA466, 0xA56A, 0xA579, 0xA574,      0, /* 0xE0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                            0xA55D, 0xA55E, 	 0, /* 0x00 */
+    0xA649, 0xCA71, 0xCBD6, 0xCBD7, 	 0, 0xAB6D, 0xD0EE, 0xB0CC, /* 0x00 */
+    0xB0CB, 0xD863, 0xD862, 	 0, 	 0, 0xA450, 0xA4C6, 0xA55F, /* 0x10 */
+         0, 0xB0CD, 0xC943, 	 0, 0xC96C, 0xA560, 	 0, 0xC9C2, /* 0x10 */
+    0xA64B, 0xA64A, 0xC9C1, 0xA758, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xADEA, 	 0, 	 0, 0xD46F, 	 0, 0xB6D7, /* 0x20 */
+    0xE145, 0xB9BC, 	 0, 	 0, 0xE8FA, 	 0, 	 0, 0xF3FD, /* 0x30 */
+         0, 0xA4C7, 	 0, 	 0, 0xCBD8, 0xCDF4, 0xB0D0, 0xB0CE, /* 0x30 */
+    0xB0CF, 0xA451, 	 0, 0xA464, 0xA2CD, 0xA4CA, 	 0, 0xA4C9, /* 0x40 */
+    0xA4C8, 0xA563, 0xA562, 	 0, 0xC96D, 0xC9C3, 	 0, 	 0, /* 0x40 */
+         0, 0xA8F5, 0xA8F2, 0xA8F4, 0xA8F3, 	 0, 	 0, 0xAB6E, /* 0x50 */
+         0, 	 0, 0xB3D5, 	 0, 0xA452, 	 0, 0xA4CB, 	 0, /* 0x50 */
+    0xA565, 0xA564, 	 0, 0xCA72, 	 0, 	 0, 0xA8F6, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xC957, 	 0, 0xA567, 0xA566, /* 0x60 */
+    0xA64C, 0xA64D, 0xCA73, 0xA759, 	 0, 0xA75A, 	 0, 0xA8F7, /* 0x70 */
+    0xA8F8, 0xA8F9, 	 0, 0xAB6F, 0xCDF5, 	 0, 	 0, 0xADEB, /* 0x70 */
+         0, 	 0, 0xC944, 	 0, 0xA4CC, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xC9C4, 	 0, 	 0, 	 0, 0xCA74, 0xCA75, /* 0x80 */
+         0, 	 0, 0xCBD9, 	 0, 0xCBDA, 	 0, 0xCDF7, 0xCDF6, /* 0x90 */
+    0xCDF9, 0xCDF8, 0xAB70, 	 0, 0xD470, 0xADED, 0xD0EF, 0xADEC, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xD864, 0xB3D6, 	 0, 0xD865, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xE146, 0xB9BD, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xBC46, 	 0, 0xF1EF, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 0xC958, 	 0, 0xA568, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xB0D1, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xA453, 0xA465, 0xA4CE, 0xA4CD, 	 0, 0xA4CF, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xA8FB, 	 0, 0xA8FA, 0xA8FC, /* 0xD0 */
+         0, 	 0, 	 0, 0xAB71, 	 0, 	 0, 	 0, 0xADEE, /* 0xD0 */
+         0, 0xE8FB, 0xC24F, 0xA466, 0xA56A, 0xA579, 0xA574, 	 0, /* 0xE0 */
     0xA56F, 0xA56E, 0xA575, 0xA573, 0xA56C, 0xA57A, 0xA56D, 0xA569, /* 0xE0 */
-    0xA578, 0xA577, 0xA576, 0xA56B,      0, 0xA572,      0,      0, /* 0xF0 */
-    0xA571,      0,      0, 0xA57B, 0xA570                          /* 0xF0 */
+    0xA578, 0xA577, 0xA576, 0xA56B, 	 0, 0xA572, 	 0, 	 0, /* 0xF0 */
+    0xA571, 	 0, 	 0, 0xA57B, 0xA570							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_54[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xA653,      0, 0xA659, 0xA655,      0, 0xA65B, 0xC9C5, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xA653, 	 0, 0xA659, 0xA655, 	 0, 0xA65B, 0xC9C5, /* 0x00 */
     0xA658, 0xA64E, 0xA651, 0xA654, 0xA650, 0xA657, 0xA65A, 0xA64F, /* 0x00 */
-    0xA652, 0xA656, 0xA65C,      0,      0,      0,      0,      0, /* 0x10 */
-    0xCA7E, 0xCA7B,      0, 0xA767, 0xCA7C, 0xA75B, 0xA75D, 0xA775, /* 0x10 */
-    0xA770,      0,      0,      0, 0xCAA5, 0xCA7D, 0xA75F, 0xA761, /* 0x20 */
-    0xCAA4, 0xA768, 0xCA78, 0xA774, 0xA776, 0xA75C, 0xA76D,      0, /* 0x20 */
-    0xCA76, 0xA773,      0, 0xA764,      0, 0xA76E, 0xA76F, 0xCA77, /* 0x30 */
-    0xA76C, 0xA76A,      0, 0xA76B, 0xA771, 0xCAA1, 0xA75E,      0, /* 0x30 */
-    0xA772, 0xCAA3, 0xA766, 0xA763,      0, 0xCA7A, 0xA762, 0xCAA6, /* 0x40 */
-    0xA765,      0, 0xA769,      0,      0,      0, 0xA760, 0xCAA2, /* 0x40 */
-         0,      0,      0,      0, 0xCA79,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+    0xA652, 0xA656, 0xA65C, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xCA7E, 0xCA7B, 	 0, 0xA767, 0xCA7C, 0xA75B, 0xA75D, 0xA775, /* 0x10 */
+    0xA770, 	 0, 	 0, 	 0, 0xCAA5, 0xCA7D, 0xA75F, 0xA761, /* 0x20 */
+    0xCAA4, 0xA768, 0xCA78, 0xA774, 0xA776, 0xA75C, 0xA76D, 	 0, /* 0x20 */
+    0xCA76, 0xA773, 	 0, 0xA764, 	 0, 0xA76E, 0xA76F, 0xCA77, /* 0x30 */
+    0xA76C, 0xA76A, 	 0, 0xA76B, 0xA771, 0xCAA1, 0xA75E, 	 0, /* 0x30 */
+    0xA772, 0xCAA3, 0xA766, 0xA763, 	 0, 0xCA7A, 0xA762, 0xCAA6, /* 0x40 */
+    0xA765, 	 0, 0xA769, 	 0, 	 0, 	 0, 0xA760, 0xCAA2, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xCA79, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
     0xCBEB, 0xCBEA, 0xA94F, 0xCBED, 0xCBEF, 0xCBE4, 0xCBE7, 0xCBEE, /* 0x60 */
-    0xA950,      0,      0, 0xCBE1, 0xCBE5,      0,      0, 0xCBE9, /* 0x60 */
+    0xA950, 	 0, 	 0, 0xCBE1, 0xCBE5, 	 0, 	 0, 0xCBE9, /* 0x60 */
     0xCE49, 0xA94B, 0xCE4D, 0xA8FD, 0xCBE6, 0xA8FE, 0xA94C, 0xA945, /* 0x70 */
-    0xA941,      0, 0xCBE2, 0xA944, 0xA949, 0xA952, 0xCBE3, 0xCBDC, /* 0x70 */
-    0xA943, 0xCBDD, 0xCBDF,      0, 0xA946,      0, 0xA948, 0xCBDB, /* 0x80 */
-    0xCBE0,      0,      0, 0xA951, 0xA94D, 0xCBE8, 0xA953,      0, /* 0x80 */
-    0xA94A, 0xCBDE, 0xA947,      0,      0, 0xA942, 0xA940,      0, /* 0x90 */
-    0xCBEC,      0, 0xA94E,      0,      0,      0,      0,      0, /* 0x90 */
-    0xCE48, 0xCDFB, 0xCE4B,      0,      0, 0xCDFD, 0xAB78, 0xABA8, /* 0xA0 */
+    0xA941, 	 0, 0xCBE2, 0xA944, 0xA949, 0xA952, 0xCBE3, 0xCBDC, /* 0x70 */
+    0xA943, 0xCBDD, 0xCBDF, 	 0, 0xA946, 	 0, 0xA948, 0xCBDB, /* 0x80 */
+    0xCBE0, 	 0, 	 0, 0xA951, 0xA94D, 0xCBE8, 0xA953, 	 0, /* 0x80 */
+    0xA94A, 0xCBDE, 0xA947, 	 0, 	 0, 0xA942, 0xA940, 	 0, /* 0x90 */
+    0xCBEC, 	 0, 0xA94E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+    0xCE48, 0xCDFB, 0xCE4B, 	 0, 	 0, 0xCDFD, 0xAB78, 0xABA8, /* 0xA0 */
     0xAB74, 0xABA7, 0xAB7D, 0xABA4, 0xAB72, 0xCDFC, 0xCE43, 0xABA3, /* 0xA0 */
-    0xCE4F, 0xABA5,      0, 0xAB79,      0,      0, 0xCE45, 0xCE42, /* 0xB0 */
-    0xAB77,      0, 0xCDFA, 0xABA6, 0xCE4A, 0xAB7C, 0xCE4C, 0xABA9, /* 0xB0 */
+    0xCE4F, 0xABA5, 	 0, 0xAB79, 	 0, 	 0, 0xCE45, 0xCE42, /* 0xB0 */
+    0xAB77, 	 0, 0xCDFA, 0xABA6, 0xCE4A, 0xAB7C, 0xCE4C, 0xABA9, /* 0xB0 */
     0xAB73, 0xAB7E, 0xAB7B, 0xCE40, 0xABA1, 0xCE46, 0xCE47, 0xAB7A, /* 0xC0 */
-    0xABA2, 0xAB76,      0,      0,      0,      0, 0xAB75, 0xCDFE, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xCE44,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0, 0xCE4E,      0, /* 0xD0 */
-    0xD144, 0xADFB, 0xD0F1,      0, 0xD0F6, 0xADF4, 0xAE40, 0xD0F4, /* 0xE0 */
-    0xADEF, 0xADF9, 0xADFE, 0xD0FB,      0, 0xADFA, 0xADFD,      0, /* 0xE0 */
-         0, 0xD0FE, 0xADF5, 0xD0F5,      0,      0,      0, 0xD142, /* 0xF0 */
-    0xD143,      0, 0xADF7, 0xD141, 0xADF3, 0xAE43,      0, 0xD0F8  /* 0xF0 */
+    0xABA2, 0xAB76, 	 0, 	 0, 	 0, 	 0, 0xAB75, 0xCDFE, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCE44, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCE4E, 	 0, /* 0xD0 */
+    0xD144, 0xADFB, 0xD0F1, 	 0, 0xD0F6, 0xADF4, 0xAE40, 0xD0F4, /* 0xE0 */
+    0xADEF, 0xADF9, 0xADFE, 0xD0FB, 	 0, 0xADFA, 0xADFD, 	 0, /* 0xE0 */
+         0, 0xD0FE, 0xADF5, 0xD0F5, 	 0, 	 0, 	 0, 0xD142, /* 0xF0 */
+    0xD143, 	 0, 0xADF7, 0xD141, 0xADF3, 0xAE43, 	 0, 0xD0F8	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_55[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xADF1,      0, 0xD146, 0xD0F9, 0xD0FD, 0xADF6, 0xAE42, /* 0x00 */
-    0xD0FA, 0xADFC, 0xD140, 0xD147, 0xD4A1,      0, 0xD145, 0xAE44, /* 0x00 */
-    0xADF0, 0xD0FC, 0xD0F3,      0, 0xADF8,      0,      0, 0xD0F2, /* 0x10 */
-         0,      0, 0xD0F7,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0, 0xD0F0, 0xAE41, /* 0x20 */
-         0,      0, 0xD477,      0, 0xB0E4, 0xD4A7, 0xB0E2, 0xB0DF, /* 0x20 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xADF1, 	 0, 0xD146, 0xD0F9, 0xD0FD, 0xADF6, 0xAE42, /* 0x00 */
+    0xD0FA, 0xADFC, 0xD140, 0xD147, 0xD4A1, 	 0, 0xD145, 0xAE44, /* 0x00 */
+    0xADF0, 0xD0FC, 0xD0F3, 	 0, 0xADF8, 	 0, 	 0, 0xD0F2, /* 0x10 */
+         0, 	 0, 0xD0F7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD0F0, 0xAE41, /* 0x20 */
+         0, 	 0, 0xD477, 	 0, 0xB0E4, 0xD4A7, 0xB0E2, 0xB0DF, /* 0x20 */
     0xD47C, 0xB0DB, 0xD4A2, 0xB0E6, 0xD476, 0xD47B, 0xD47A, 0xADF2, /* 0x30 */
-    0xB0E1, 0xD4A5,      0, 0xD4A8, 0xD473,      0, 0xB3E8,      0, /* 0x30 */
-    0xD4A9, 0xB0E7,      0, 0xB0D9, 0xB0D6, 0xD47E, 0xB0D3,      0, /* 0x40 */
-    0xD4A6,      0, 0xB0DA, 0xD4AA,      0, 0xD474, 0xD4A4, 0xB0DD, /* 0x40 */
-    0xD475, 0xD478, 0xD47D,      0,      0, 0xB0DE, 0xB0DC, 0xB0E8, /* 0x50 */
-         0,      0,      0,      0, 0xB0E3,      0, 0xB0D7, 0xB1D2, /* 0x50 */
-         0, 0xB0D8, 0xD479, 0xB0E5, 0xB0E0, 0xD4A3, 0xB0D5,      0, /* 0x60 */
-         0,      0, 0xB0D4,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xD471, 0xD472, 0xD86A, /* 0x70 */
-         0,      0,      0, 0xB3D7, 0xB3DA, 0xD875, 0xB3EE, 0xD878, /* 0x70 */
-    0xB3D8, 0xD871, 0xB3DE, 0xB3E4, 0xB5BD,      0,      0, 0xB3E2, /* 0x80 */
+    0xB0E1, 0xD4A5, 	 0, 0xD4A8, 0xD473, 	 0, 0xB3E8, 	 0, /* 0x30 */
+    0xD4A9, 0xB0E7, 	 0, 0xB0D9, 0xB0D6, 0xD47E, 0xB0D3, 	 0, /* 0x40 */
+    0xD4A6, 	 0, 0xB0DA, 0xD4AA, 	 0, 0xD474, 0xD4A4, 0xB0DD, /* 0x40 */
+    0xD475, 0xD478, 0xD47D, 	 0, 	 0, 0xB0DE, 0xB0DC, 0xB0E8, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xB0E3, 	 0, 0xB0D7, 0xB1D2, /* 0x50 */
+         0, 0xB0D8, 0xD479, 0xB0E5, 0xB0E0, 0xD4A3, 0xB0D5, 	 0, /* 0x60 */
+         0, 	 0, 0xB0D4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD471, 0xD472, 0xD86A, /* 0x70 */
+         0, 	 0, 	 0, 0xB3D7, 0xB3DA, 0xD875, 0xB3EE, 0xD878, /* 0x70 */
+    0xB3D8, 0xD871, 0xB3DE, 0xB3E4, 0xB5BD, 	 0, 	 0, 0xB3E2, /* 0x80 */
     0xD86E, 0xB3EF, 0xB3DB, 0xB3E3, 0xD876, 0xDCD7, 0xD87B, 0xD86F, /* 0x80 */
-         0, 0xD866, 0xD873, 0xD86D, 0xB3E1, 0xD879,      0,      0, /* 0x90 */
-    0xB3DD, 0xB3F1, 0xB3EA,      0, 0xB3DF, 0xB3DC,      0, 0xB3E7, /* 0x90 */
+         0, 0xD866, 0xD873, 0xD86D, 0xB3E1, 0xD879, 	 0, 	 0, /* 0x90 */
+    0xB3DD, 0xB3F1, 0xB3EA, 	 0, 0xB3DF, 0xB3DC, 	 0, 0xB3E7, /* 0x90 */
          0, 0xD87A, 0xD86C, 0xD872, 0xD874, 0xD868, 0xD877, 0xB3D9, /* 0xA0 */
-    0xD867,      0, 0xB3E0, 0xB3F0, 0xB3EC, 0xD869, 0xB3E6,      0, /* 0xA0 */
-         0, 0xB3ED, 0xB3E9, 0xB3E5,      0, 0xD870,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xB3EB,      0,      0,      0, 0xDCD5, /* 0xB0 */
-    0xDCD1,      0, 0xDCE0, 0xDCCA, 0xDCD3, 0xB6E5, 0xB6E6, 0xB6DE, /* 0xC0 */
+    0xD867, 	 0, 0xB3E0, 0xB3F0, 0xB3EC, 0xD869, 0xB3E6, 	 0, /* 0xA0 */
+         0, 0xB3ED, 0xB3E9, 0xB3E5, 	 0, 0xD870, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xB3EB, 	 0, 	 0, 	 0, 0xDCD5, /* 0xB0 */
+    0xDCD1, 	 0, 0xDCE0, 0xDCCA, 0xDCD3, 0xB6E5, 0xB6E6, 0xB6DE, /* 0xC0 */
     0xDCDC, 0xB6E8, 0xDCCF, 0xDCCE, 0xDCCC, 0xDCDE, 0xB6DC, 0xDCD8, /* 0xC0 */
-    0xDCCD, 0xB6DF, 0xDCD6, 0xB6DA, 0xDCD2, 0xDCD9, 0xDCDB,      0, /* 0xD0 */
-         0, 0xDCDF, 0xB6E3, 0xDCCB, 0xB6DD, 0xDCD0,      0, 0xB6D8, /* 0xD0 */
+    0xDCCD, 0xB6DF, 0xDCD6, 0xB6DA, 0xDCD2, 0xDCD9, 0xDCDB, 	 0, /* 0xD0 */
+         0, 0xDCDF, 0xB6E3, 0xDCCB, 0xB6DD, 0xDCD0, 	 0, 0xB6D8, /* 0xD0 */
          0, 0xB6E4, 0xDCDA, 0xB6E0, 0xB6E1, 0xB6E7, 0xB6DB, 0xA25F, /* 0xE0 */
-    0xB6D9, 0xDCD4,      0,      0,      0,      0,      0, 0xB6E2, /* 0xE0 */
-         0,      0, 0xDCDD,      0,      0,      0, 0xB9CD, 0xB9C8, /* 0xF0 */
-         0, 0xE155, 0xE151,      0, 0xE14B, 0xB9C2, 0xB9BE, 0xE154  /* 0xF0 */
+    0xB6D9, 0xDCD4, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB6E2, /* 0xE0 */
+         0, 	 0, 0xDCDD, 	 0, 	 0, 	 0, 0xB9CD, 0xB9C8, /* 0xF0 */
+         0, 0xE155, 0xE151, 	 0, 0xE14B, 0xB9C2, 0xB9BE, 0xE154	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_56[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xB9BF, 0xE14E, 0xE150,      0, 0xE153,      0, 0xB9C4,      0, /* 0x00 */
-    0xB9CB, 0xB9C5,      0,      0, 0xE149, 0xB9C6, 0xB9C7, 0xE14C, /* 0x00 */
-    0xB9CC,      0, 0xE14A, 0xE14F, 0xB9C3, 0xE148, 0xB9C9, 0xB9C1, /* 0x10 */
-         0,      0,      0, 0xB9C0, 0xE14D, 0xE152,      0, 0xB9CA, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0, 0xE147, /* 0x20 */
-         0, 0xBC4D, 0xE547,      0, 0xE544,      0, 0xBC47, 0xBC53, /* 0x20 */
-    0xBC54,      0, 0xBC4A, 0xE542, 0xBC4C, 0xE4F9, 0xBC52,      0, /* 0x30 */
-    0xE546, 0xBC49, 0xE548, 0xBC48,      0, 0xE543, 0xE545, 0xBC4B, /* 0x30 */
-    0xE541, 0xE4FA, 0xE4F7,      0,      0, 0xD86B, 0xE4FD,      0, /* 0x40 */
-    0xE4F6, 0xE4FC, 0xE4FB,      0, 0xE4F8,      0, 0xBC4F,      0, /* 0x40 */
-         0,      0,      0, 0xBC4E,      0,      0,      0, 0xBC50, /* 0x50 */
-    0xE4FE, 0xBEB2, 0xE540,      0,      0,      0, 0xE945,      0, /* 0x50 */
-    0xE8FD,      0, 0xBEBE, 0xE942, 0xBEB6, 0xBEBA, 0xE941,      0, /* 0x60 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xB9BF, 0xE14E, 0xE150, 	 0, 0xE153, 	 0, 0xB9C4, 	 0, /* 0x00 */
+    0xB9CB, 0xB9C5, 	 0, 	 0, 0xE149, 0xB9C6, 0xB9C7, 0xE14C, /* 0x00 */
+    0xB9CC, 	 0, 0xE14A, 0xE14F, 0xB9C3, 0xE148, 0xB9C9, 0xB9C1, /* 0x10 */
+         0, 	 0, 	 0, 0xB9C0, 0xE14D, 0xE152, 	 0, 0xB9CA, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE147, /* 0x20 */
+         0, 0xBC4D, 0xE547, 	 0, 0xE544, 	 0, 0xBC47, 0xBC53, /* 0x20 */
+    0xBC54, 	 0, 0xBC4A, 0xE542, 0xBC4C, 0xE4F9, 0xBC52, 	 0, /* 0x30 */
+    0xE546, 0xBC49, 0xE548, 0xBC48, 	 0, 0xE543, 0xE545, 0xBC4B, /* 0x30 */
+    0xE541, 0xE4FA, 0xE4F7, 	 0, 	 0, 0xD86B, 0xE4FD, 	 0, /* 0x40 */
+    0xE4F6, 0xE4FC, 0xE4FB, 	 0, 0xE4F8, 	 0, 0xBC4F, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xBC4E, 	 0, 	 0, 	 0, 0xBC50, /* 0x50 */
+    0xE4FE, 0xBEB2, 0xE540, 	 0, 	 0, 	 0, 0xE945, 	 0, /* 0x50 */
+    0xE8FD, 	 0, 0xBEBE, 0xE942, 0xBEB6, 0xBEBA, 0xE941, 	 0, /* 0x60 */
     0xBEB9, 0xBEB5, 0xBEB8, 0xBEB3, 0xBEBD, 0xE943, 0xE8FE, 0xBEBC, /* 0x60 */
-    0xE8FC, 0xBEBB, 0xE944, 0xE940, 0xBC51,      0, 0xBEBF, 0xE946, /* 0x70 */
-    0xBEB7, 0xBEB4,      0,      0,      0,      0, 0xECC6, 0xECC8, /* 0x70 */
+    0xE8FC, 0xBEBB, 0xE944, 0xE940, 0xBC51, 	 0, 0xBEBF, 0xE946, /* 0x70 */
+    0xBEB7, 0xBEB4, 	 0, 	 0, 	 0, 	 0, 0xECC6, 0xECC8, /* 0x70 */
     0xC07B, 0xECC9, 0xECC7, 0xECC5, 0xECC4, 0xC07D, 0xECC3, 0xC07E, /* 0x80 */
-         0,      0,      0,      0, 0xECC1, 0xECC2, 0xC07A, 0xC0A1, /* 0x80 */
-    0xC07C,      0,      0, 0xECC0,      0, 0xC250,      0, 0xEFBC, /* 0x90 */
-    0xEFBA, 0xEFBF, 0xEFBD,      0, 0xEFBB, 0xEFBE,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xC360, 0xF1F2, 0xF1F3, /* 0xA0 */
-    0xC456,      0, 0xF1F4, 0xF1F0, 0xF1F5, 0xF1F1, 0xC251,      0, /* 0xA0 */
-         0,      0, 0xF3FE, 0xF441, 0xC459, 0xF440, 0xC458, 0xC457, /* 0xB0 */
-         0,      0,      0,      0, 0xC45A, 0xF5C5, 0xF5C6,      0, /* 0xB0 */
-    0xC4DA, 0xC4D9, 0xC4DB, 0xF5C4,      0, 0xF6D8, 0xF6D7,      0, /* 0xC0 */
-    0xC56D, 0xC56F, 0xC56E, 0xF6D9, 0xC5C8, 0xF8A6,      0,      0, /* 0xC0 */
-         0, 0xC5F1,      0, 0xF8A5, 0xF8EE,      0,      0, 0xC949, /* 0xD0 */
-         0,      0, 0xA57D, 0xA57C,      0, 0xA65F, 0xA65E, 0xC9C7, /* 0xD0 */
-    0xA65D, 0xC9C6,      0,      0, 0xA779, 0xCAA9,      0, 0xCAA8, /* 0xE0 */
-         0,      0, 0xA777, 0xA77A,      0,      0, 0xCAA7,      0, /* 0xE0 */
-    0xA778,      0,      0,      0,      0,      0,      0, 0xCBF0, /* 0xF0 */
-         0, 0xCBF1, 0xA954,      0,      0,      0,      0, 0xABAA  /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xECC1, 0xECC2, 0xC07A, 0xC0A1, /* 0x80 */
+    0xC07C, 	 0, 	 0, 0xECC0, 	 0, 0xC250, 	 0, 0xEFBC, /* 0x90 */
+    0xEFBA, 0xEFBF, 0xEFBD, 	 0, 0xEFBB, 0xEFBE, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC360, 0xF1F2, 0xF1F3, /* 0xA0 */
+    0xC456, 	 0, 0xF1F4, 0xF1F0, 0xF1F5, 0xF1F1, 0xC251, 	 0, /* 0xA0 */
+         0, 	 0, 0xF3FE, 0xF441, 0xC459, 0xF440, 0xC458, 0xC457, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xC45A, 0xF5C5, 0xF5C6, 	 0, /* 0xB0 */
+    0xC4DA, 0xC4D9, 0xC4DB, 0xF5C4, 	 0, 0xF6D8, 0xF6D7, 	 0, /* 0xC0 */
+    0xC56D, 0xC56F, 0xC56E, 0xF6D9, 0xC5C8, 0xF8A6, 	 0, 	 0, /* 0xC0 */
+         0, 0xC5F1, 	 0, 0xF8A5, 0xF8EE, 	 0, 	 0, 0xC949, /* 0xD0 */
+         0, 	 0, 0xA57D, 0xA57C, 	 0, 0xA65F, 0xA65E, 0xC9C7, /* 0xD0 */
+    0xA65D, 0xC9C6, 	 0, 	 0, 0xA779, 0xCAA9, 	 0, 0xCAA8, /* 0xE0 */
+         0, 	 0, 0xA777, 0xA77A, 	 0, 	 0, 0xCAA7, 	 0, /* 0xE0 */
+    0xA778, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBF0, /* 0xF0 */
+         0, 0xCBF1, 0xA954, 	 0, 	 0, 	 0, 	 0, 0xABAA	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_57[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xD148, 0xD149, 0xAE45, 0xAE46,      0,      0, 0xD4AC, /* 0x00 */
-    0xB0E9, 0xB0EB, 0xD4AB, 0xB0EA, 0xD87C, 0xB3F2,      0,      0, /* 0x00 */
-         0,      0, 0xB6E9, 0xB6EA, 0xDCE1,      0, 0xB9CF,      0, /* 0x10 */
-    0xB9CE,      0, 0xE549, 0xE948, 0xE947,      0, 0xF96B, 0xA467, /* 0x10 */
-    0xC959,      0, 0xC96E, 0xC96F,      0,      0,      0,      0, /* 0x20 */
-    0xA662, 0xA666, 0xC9C9,      0, 0xA664, 0xA663, 0xC9C8, 0xA665, /* 0x20 */
-    0xA661,      0,      0, 0xA660, 0xC9CA,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xA7A6,      0,      0, 0xA7A3,      0, /* 0x30 */
-    0xA77D, 0xCAAA,      0,      0,      0, 0xCAAB,      0, 0xA7A1, /* 0x40 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xD148, 0xD149, 0xAE45, 0xAE46, 	 0, 	 0, 0xD4AC, /* 0x00 */
+    0xB0E9, 0xB0EB, 0xD4AB, 0xB0EA, 0xD87C, 0xB3F2, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 0xB6E9, 0xB6EA, 0xDCE1, 	 0, 0xB9CF, 	 0, /* 0x10 */
+    0xB9CE, 	 0, 0xE549, 0xE948, 0xE947, 	 0, 0xF96B, 0xA467, /* 0x10 */
+    0xC959, 	 0, 0xC96E, 0xC96F, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xA662, 0xA666, 0xC9C9, 	 0, 0xA664, 0xA663, 0xC9C8, 0xA665, /* 0x20 */
+    0xA661, 	 0, 	 0, 0xA660, 0xC9CA, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xA7A6, 	 0, 	 0, 0xA7A3, 	 0, /* 0x30 */
+    0xA77D, 0xCAAA, 	 0, 	 0, 	 0, 0xCAAB, 	 0, 0xA7A1, /* 0x40 */
          0, 0xCAAD, 0xA77B, 0xCAAE, 0xCAAC, 0xA77E, 0xA7A2, 0xA7A5, /* 0x40 */
-    0xA7A4, 0xA77C, 0xCAAF,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0, 0xA959, 0xCBFE,      0, 0xA95B,      0, 0xA95A,      0, /* 0x60 */
-    0xCC40, 0xA958, 0xA957, 0xCBF5,      0, 0xCBF4,      0, 0xCBF2, /* 0x60 */
+    0xA7A4, 0xA77C, 0xCAAF, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xA959, 0xCBFE, 	 0, 0xA95B, 	 0, 0xA95A, 	 0, /* 0x60 */
+    0xCC40, 0xA958, 0xA957, 0xCBF5, 	 0, 0xCBF4, 	 0, 0xCBF2, /* 0x60 */
     0xCBF7, 0xCBF6, 0xCBF3, 0xCBFC, 0xCBFD, 0xCBFA, 0xCBF8, 0xA956, /* 0x70 */
-         0,      0,      0, 0xCBFB, 0xA95C, 0xCC41,      0,      0, /* 0x70 */
-    0xCBF9,      0, 0xABAB, 0xA955,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0, 0xABAC, 0xCE54,      0,      0, 0xCE5A, /* 0x80 */
-         0,      0,      0, 0xABB2, 0xCE58, 0xCE5E,      0, 0xCE55, /* 0x90 */
-    0xCE59, 0xCE5B, 0xCE5D, 0xCE57,      0, 0xCE56, 0xCE51, 0xCE52, /* 0x90 */
-    0xABAD,      0, 0xABAF, 0xABAE, 0xCE53, 0xCE5C,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xABB1,      0, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xCE50, 0xD153,      0, /* 0xB0 */
-    0xD152, 0xD157, 0xD14E,      0, 0xD151, 0xD150,      0, 0xD154, /* 0xB0 */
-         0, 0xD158, 0xAE47, 0xAE4A,      0,      0, 0xD14F, 0xD155, /* 0xC0 */
-         0,      0,      0, 0xAE49, 0xD14A,      0, 0xABB0, 0xD4BA, /* 0xC0 */
-    0xD156,      0, 0xD14D,      0, 0xAE48, 0xD14C,      0,      0, /* 0xD0 */
-         0,      0,      0,      0, 0xD4B1,      0,      0, 0xB0EC, /* 0xD0 */
-    0xB0F0, 0xD4C1, 0xD4AF, 0xD4BD, 0xB0F1, 0xD4BF,      0, 0xD4C5, /* 0xE0 */
-         0, 0xD4C9,      0,      0, 0xD4C0, 0xD4B4, 0xD4BC,      0, /* 0xE0 */
+         0, 	 0, 	 0, 0xCBFB, 0xA95C, 0xCC41, 	 0, 	 0, /* 0x70 */
+    0xCBF9, 	 0, 0xABAB, 0xA955, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 0xABAC, 0xCE54, 	 0, 	 0, 0xCE5A, /* 0x80 */
+         0, 	 0, 	 0, 0xABB2, 0xCE58, 0xCE5E, 	 0, 0xCE55, /* 0x90 */
+    0xCE59, 0xCE5B, 0xCE5D, 0xCE57, 	 0, 0xCE56, 0xCE51, 0xCE52, /* 0x90 */
+    0xABAD, 	 0, 0xABAF, 0xABAE, 0xCE53, 0xCE5C, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xABB1, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCE50, 0xD153, 	 0, /* 0xB0 */
+    0xD152, 0xD157, 0xD14E, 	 0, 0xD151, 0xD150, 	 0, 0xD154, /* 0xB0 */
+         0, 0xD158, 0xAE47, 0xAE4A, 	 0, 	 0, 0xD14F, 0xD155, /* 0xC0 */
+         0, 	 0, 	 0, 0xAE49, 0xD14A, 	 0, 0xABB0, 0xD4BA, /* 0xC0 */
+    0xD156, 	 0, 0xD14D, 	 0, 0xAE48, 0xD14C, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 0xD4B1, 	 0, 	 0, 0xB0EC, /* 0xD0 */
+    0xB0F0, 0xD4C1, 0xD4AF, 0xD4BD, 0xB0F1, 0xD4BF, 	 0, 0xD4C5, /* 0xE0 */
+         0, 0xD4C9, 	 0, 	 0, 0xD4C0, 0xD4B4, 0xD4BC, 	 0, /* 0xE0 */
     0xD4CA, 0xD4C8, 0xD4BE, 0xD4B9, 0xD4B2, 0xD8A6, 0xD4B0, 0xB0F5, /* 0xF0 */
-    0xD4B7, 0xB0F6, 0xB0F2, 0xD4AD, 0xD4C3, 0xD4B5                  /* 0xF0 */
+    0xD4B7, 0xB0F6, 0xB0F2, 0xD4AD, 0xD4C3, 0xD4B5					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_58[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD4B3, 0xD4C6, 0xB0F3,      0, 0xD4CC, 0xB0ED, 0xB0EF, 0xD4BB, /* 0x00 */
-    0xD4B6, 0xAE4B, 0xB0EE, 0xD4B8, 0xD4C7, 0xD4CB, 0xD4C2,      0, /* 0x00 */
-    0xD4C4,      0,      0,      0, 0xD4AE,      0,      0,      0, /* 0x10 */
-         0, 0xD8A1,      0, 0xD8AA, 0xD8A9, 0xB3FA, 0xD8A2,      0, /* 0x10 */
-    0xB3FB, 0xB3F9,      0, 0xD8A4, 0xB3F6, 0xD8A8,      0, 0xD8A3, /* 0x20 */
-    0xD8A5, 0xD87D, 0xB3F4,      0, 0xD8B2, 0xD8B1, 0xD8AE, 0xB3F3, /* 0x20 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD4B3, 0xD4C6, 0xB0F3, 	 0, 0xD4CC, 0xB0ED, 0xB0EF, 0xD4BB, /* 0x00 */
+    0xD4B6, 0xAE4B, 0xB0EE, 0xD4B8, 0xD4C7, 0xD4CB, 0xD4C2, 	 0, /* 0x00 */
+    0xD4C4, 	 0, 	 0, 	 0, 0xD4AE, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xD8A1, 	 0, 0xD8AA, 0xD8A9, 0xB3FA, 0xD8A2, 	 0, /* 0x10 */
+    0xB3FB, 0xB3F9, 	 0, 0xD8A4, 0xB3F6, 0xD8A8, 	 0, 0xD8A3, /* 0x20 */
+    0xD8A5, 0xD87D, 0xB3F4, 	 0, 0xD8B2, 0xD8B1, 0xD8AE, 0xB3F3, /* 0x20 */
     0xB3F7, 0xB3F8, 0xD14B, 0xD8AB, 0xB3F5, 0xB0F4, 0xD8AD, 0xD87E, /* 0x30 */
-    0xD8B0, 0xD8AF,      0, 0xD8B3,      0, 0xDCEF,      0, 0xD8AC, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
+    0xD8B0, 0xD8AF, 	 0, 0xD8B3, 	 0, 0xDCEF, 	 0, 0xD8AC, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
     0xD8A7, 0xDCE7, 0xB6F4, 0xB6F7, 0xB6F2, 0xDCE6, 0xDCEA, 0xDCE5, /* 0x40 */
-         0, 0xB6EC, 0xB6F6, 0xDCE2, 0xB6F0, 0xDCE9,      0, 0xB6EE, /* 0x50 */
-    0xB6ED, 0xDCEC, 0xB6EF, 0xDCEE,      0, 0xDCEB, 0xB6EB,      0, /* 0x50 */
-         0,      0, 0xB6F5, 0xDCF0, 0xDCE4, 0xDCED,      0,      0, /* 0x60 */
-    0xDCE3,      0,      0, 0xB6F1,      0, 0xB6F3,      0, 0xDCE8, /* 0x60 */
-         0, 0xDCF1,      0,      0, 0xE15D, 0xB9D0, 0xE163,      0, /* 0x70 */
+         0, 0xB6EC, 0xB6F6, 0xDCE2, 0xB6F0, 0xDCE9, 	 0, 0xB6EE, /* 0x50 */
+    0xB6ED, 0xDCEC, 0xB6EF, 0xDCEE, 	 0, 0xDCEB, 0xB6EB, 	 0, /* 0x50 */
+         0, 	 0, 0xB6F5, 0xDCF0, 0xDCE4, 0xDCED, 	 0, 	 0, /* 0x60 */
+    0xDCE3, 	 0, 	 0, 0xB6F1, 	 0, 0xB6F3, 	 0, 0xDCE8, /* 0x60 */
+         0, 0xDCF1, 	 0, 	 0, 0xE15D, 0xB9D0, 0xE163, 	 0, /* 0x70 */
          0, 0xB9D5, 0xE15F, 0xE166, 0xE157, 0xB9D7, 0xB9D1, 0xE15C, /* 0x70 */
-    0xBC55, 0xE15B, 0xE164, 0xB9D2,      0, 0xB9D6, 0xE15A, 0xE160, /* 0x80 */
-    0xE165, 0xE156, 0xB9D4, 0xE15E,      0,      0, 0xE162, 0xE168, /* 0x80 */
-    0xE158, 0xE161,      0, 0xB9D3, 0xE167,      0,      0,      0, /* 0x90 */
-    0xE159,      0,      0,      0, 0xBC59, 0xE54B, 0xBC57, 0xBC56, /* 0x90 */
-    0xE54D, 0xE552,      0, 0xE54E,      0, 0xE551, 0xBC5C,      0, /* 0xA0 */
-    0xBEA5, 0xBC5B,      0, 0xE54A, 0xE550,      0, 0xBC5A, 0xE54F, /* 0xA0 */
-         0, 0xE54C,      0, 0xBC58,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xE94D, 0xF9D9, 0xE94F, 0xE94A, 0xBEC1, 0xE94C, /* 0xB0 */
-         0, 0xBEC0, 0xE94E,      0,      0, 0xBEC3, 0xE950, 0xBEC2, /* 0xC0 */
-    0xE949, 0xE94B,      0,      0,      0,      0, 0xC0A5, 0xECCC, /* 0xC0 */
-         0, 0xC0A4, 0xECCD, 0xC0A3, 0xECCB, 0xC0A2, 0xECCA,      0, /* 0xD0 */
-    0xC253, 0xC252, 0xF1F6, 0xF1F8,      0, 0xF1F7, 0xC361, 0xC362, /* 0xD0 */
-         0,      0, 0xC363, 0xF442, 0xC45B,      0,      0, 0xF7D3, /* 0xE0 */
-    0xF7D2, 0xC5F2,      0, 0xA468, 0xA4D0,      0,      0, 0xA7A7, /* 0xE0 */
-         0,      0,      0,      0, 0xCE5F,      0,      0,      0, /* 0xF0 */
-         0, 0xB3FC, 0xB3FD,      0, 0xDCF2, 0xB9D8, 0xE169, 0xE553  /* 0xF0 */
+    0xBC55, 0xE15B, 0xE164, 0xB9D2, 	 0, 0xB9D6, 0xE15A, 0xE160, /* 0x80 */
+    0xE165, 0xE156, 0xB9D4, 0xE15E, 	 0, 	 0, 0xE162, 0xE168, /* 0x80 */
+    0xE158, 0xE161, 	 0, 0xB9D3, 0xE167, 	 0, 	 0, 	 0, /* 0x90 */
+    0xE159, 	 0, 	 0, 	 0, 0xBC59, 0xE54B, 0xBC57, 0xBC56, /* 0x90 */
+    0xE54D, 0xE552, 	 0, 0xE54E, 	 0, 0xE551, 0xBC5C, 	 0, /* 0xA0 */
+    0xBEA5, 0xBC5B, 	 0, 0xE54A, 0xE550, 	 0, 0xBC5A, 0xE54F, /* 0xA0 */
+         0, 0xE54C, 	 0, 0xBC58, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xE94D, 0xF9D9, 0xE94F, 0xE94A, 0xBEC1, 0xE94C, /* 0xB0 */
+         0, 0xBEC0, 0xE94E, 	 0, 	 0, 0xBEC3, 0xE950, 0xBEC2, /* 0xC0 */
+    0xE949, 0xE94B, 	 0, 	 0, 	 0, 	 0, 0xC0A5, 0xECCC, /* 0xC0 */
+         0, 0xC0A4, 0xECCD, 0xC0A3, 0xECCB, 0xC0A2, 0xECCA, 	 0, /* 0xD0 */
+    0xC253, 0xC252, 0xF1F6, 0xF1F8, 	 0, 0xF1F7, 0xC361, 0xC362, /* 0xD0 */
+         0, 	 0, 0xC363, 0xF442, 0xC45B, 	 0, 	 0, 0xF7D3, /* 0xE0 */
+    0xF7D2, 0xC5F2, 	 0, 0xA468, 0xA4D0, 	 0, 	 0, 0xA7A7, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xCE5F, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 0xB3FC, 0xB3FD, 	 0, 0xDCF2, 0xB9D8, 0xE169, 0xE553	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_59[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xC95A,      0,      0, 0xCAB0,      0, /* 0x00 */
-         0,      0,      0,      0, 0xCC42, 0xCE60, 0xD159, 0xAE4C, /* 0x00 */
-         0,      0, 0xF1F9,      0, 0xC4DC, 0xA469, 0xA57E, 0xC970, /* 0x10 */
-         0, 0xA667, 0xA668,      0, 0xA95D,      0,      0,      0, /* 0x10 */
-    0xB0F7,      0, 0xB9DA,      0, 0xB9DB, 0xB9D9,      0, 0xA46A, /* 0x20 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xC95A, 	 0, 	 0, 0xCAB0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 0xCC42, 0xCE60, 0xD159, 0xAE4C, /* 0x00 */
+         0, 	 0, 0xF1F9, 	 0, 0xC4DC, 0xA469, 0xA57E, 0xC970, /* 0x10 */
+         0, 0xA667, 0xA668, 	 0, 0xA95D, 	 0, 	 0, 	 0, /* 0x10 */
+    0xB0F7, 	 0, 0xB9DA, 	 0, 0xB9DB, 0xB9D9, 	 0, 0xA46A, /* 0x20 */
          0, 0xA4D1, 0xA4D3, 0xA4D2, 0xC95B, 0xA4D4, 0xA5A1, 0xC971, /* 0x20 */
-         0, 0xA5A2,      0,      0,      0,      0,      0, 0xA669, /* 0x30 */
-    0xA66A,      0,      0,      0, 0xC9CB,      0, 0xA7A8,      0, /* 0x30 */
-    0xCAB1,      0,      0,      0, 0xA961, 0xCC43,      0, 0xA95F, /* 0x40 */
-    0xA960, 0xA95E, 0xD15A,      0,      0,      0, 0xABB6, 0xABB5, /* 0x40 */
-    0xABB7, 0xABB4,      0, 0xCE61, 0xA962, 0xABB3,      0, 0xAE4D, /* 0x50 */
-    0xAE4E,      0, 0xAE4F,      0, 0xD4CD,      0,      0,      0, /* 0x50 */
-    0xB3FE, 0xD8B4, 0xB0F8,      0,      0,      0,      0, 0xB6F8, /* 0x60 */
-         0, 0xB9DD, 0xB9DC, 0xE16A,      0, 0xBC5D, 0xBEC4,      0, /* 0x60 */
-    0xEFC0, 0xF6DA, 0xF7D4, 0xA46B, 0xA5A3,      0, 0xA5A4, 0xC9D1, /* 0x70 */
-    0xA66C, 0xA66F,      0, 0xC9CF, 0xC9CD, 0xA66E, 0xC9D0, 0xC9D2, /* 0x70 */
-    0xC9CC, 0xA671, 0xA670, 0xA66D, 0xA66B, 0xC9CE,      0,      0, /* 0x80 */
-         0,      0, 0xA7B3,      0,      0, 0xA7B0, 0xCAB6, 0xCAB9, /* 0x80 */
-    0xCAB8,      0, 0xA7AA, 0xA7B2,      0,      0, 0xA7AF, 0xCAB5, /* 0x90 */
-    0xCAB3, 0xA7AE,      0,      0,      0, 0xA7A9, 0xA7AC,      0, /* 0x90 */
+         0, 0xA5A2, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA669, /* 0x30 */
+    0xA66A, 	 0, 	 0, 	 0, 0xC9CB, 	 0, 0xA7A8, 	 0, /* 0x30 */
+    0xCAB1, 	 0, 	 0, 	 0, 0xA961, 0xCC43, 	 0, 0xA95F, /* 0x40 */
+    0xA960, 0xA95E, 0xD15A, 	 0, 	 0, 	 0, 0xABB6, 0xABB5, /* 0x40 */
+    0xABB7, 0xABB4, 	 0, 0xCE61, 0xA962, 0xABB3, 	 0, 0xAE4D, /* 0x50 */
+    0xAE4E, 	 0, 0xAE4F, 	 0, 0xD4CD, 	 0, 	 0, 	 0, /* 0x50 */
+    0xB3FE, 0xD8B4, 0xB0F8, 	 0, 	 0, 	 0, 	 0, 0xB6F8, /* 0x60 */
+         0, 0xB9DD, 0xB9DC, 0xE16A, 	 0, 0xBC5D, 0xBEC4, 	 0, /* 0x60 */
+    0xEFC0, 0xF6DA, 0xF7D4, 0xA46B, 0xA5A3, 	 0, 0xA5A4, 0xC9D1, /* 0x70 */
+    0xA66C, 0xA66F, 	 0, 0xC9CF, 0xC9CD, 0xA66E, 0xC9D0, 0xC9D2, /* 0x70 */
+    0xC9CC, 0xA671, 0xA670, 0xA66D, 0xA66B, 0xC9CE, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xA7B3, 	 0, 	 0, 0xA7B0, 0xCAB6, 0xCAB9, /* 0x80 */
+    0xCAB8, 	 0, 0xA7AA, 0xA7B2, 	 0, 	 0, 0xA7AF, 0xCAB5, /* 0x90 */
+    0xCAB3, 0xA7AE, 	 0, 	 0, 	 0, 0xA7A9, 0xA7AC, 	 0, /* 0x90 */
     0xCAB4, 0xCABB, 0xCAB7, 0xA7AD, 0xA7B1, 0xA7B4, 0xCAB2, 0xCABA, /* 0xA0 */
-    0xA7AB,      0,      0,      0,      0,      0, 0xA967, 0xA96F, /* 0xA0 */
-         0, 0xCC4F, 0xCC48, 0xA970, 0xCC53, 0xCC44, 0xCC4B,      0, /* 0xB0 */
-         0, 0xA966, 0xCC45, 0xA964, 0xCC4C, 0xCC50, 0xA963,      0, /* 0xB0 */
-    0xCC51, 0xCC4A,      0, 0xCC4D,      0, 0xA972, 0xA969, 0xCC54, /* 0xC0 */
-    0xCC52,      0, 0xA96E, 0xA96C, 0xCC49, 0xA96B, 0xCC47, 0xCC46, /* 0xC0 */
-    0xA96A, 0xA968, 0xA971, 0xA96D, 0xA965,      0, 0xCC4E,      0, /* 0xD0 */
-    0xABB9,      0, 0xABC0, 0xCE6F, 0xABB8, 0xCE67, 0xCE63,      0, /* 0xD0 */
-    0xCE73, 0xCE62,      0, 0xABBB, 0xCE6C, 0xABBE, 0xABC1,      0, /* 0xE0 */
-    0xABBC, 0xCE70, 0xABBF,      0, 0xAE56, 0xCE76, 0xCE64,      0, /* 0xE0 */
+    0xA7AB, 	 0, 	 0, 	 0, 	 0, 	 0, 0xA967, 0xA96F, /* 0xA0 */
+         0, 0xCC4F, 0xCC48, 0xA970, 0xCC53, 0xCC44, 0xCC4B, 	 0, /* 0xB0 */
+         0, 0xA966, 0xCC45, 0xA964, 0xCC4C, 0xCC50, 0xA963, 	 0, /* 0xB0 */
+    0xCC51, 0xCC4A, 	 0, 0xCC4D, 	 0, 0xA972, 0xA969, 0xCC54, /* 0xC0 */
+    0xCC52, 	 0, 0xA96E, 0xA96C, 0xCC49, 0xA96B, 0xCC47, 0xCC46, /* 0xC0 */
+    0xA96A, 0xA968, 0xA971, 0xA96D, 0xA965, 	 0, 0xCC4E, 	 0, /* 0xD0 */
+    0xABB9, 	 0, 0xABC0, 0xCE6F, 0xABB8, 0xCE67, 0xCE63, 	 0, /* 0xD0 */
+    0xCE73, 0xCE62, 	 0, 0xABBB, 0xCE6C, 0xABBE, 0xABC1, 	 0, /* 0xE0 */
+    0xABBC, 0xCE70, 0xABBF, 	 0, 0xAE56, 0xCE76, 0xCE64, 	 0, /* 0xE0 */
          0, 0xCE66, 0xCE6D, 0xCE71, 0xCE75, 0xCE72, 0xCE6B, 0xCE6E, /* 0xF0 */
-         0,      0, 0xCE68, 0xABC3, 0xCE6A, 0xCE69, 0xCE74, 0xABBA  /* 0xF0 */
+         0, 	 0, 0xCE68, 0xABC3, 0xCE6A, 0xCE69, 0xCE74, 0xABBA	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_5A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xCE65, 0xABC2,      0, 0xABBD,      0,      0,      0,      0, /* 0x00 */
-         0, 0xAE5C, 0xD162,      0, 0xAE5B,      0,      0, 0xD160, /* 0x00 */
-         0, 0xAE50,      0, 0xAE55,      0, 0xD15F, 0xD15C, 0xD161, /* 0x10 */
-    0xAE51, 0xD15B,      0, 0xAE54, 0xAE52,      0, 0xD163, 0xAE53, /* 0x10 */
-    0xAE57,      0,      0, 0xAE58,      0, 0xAE5A,      0,      0, /* 0x20 */
-         0, 0xAE59,      0,      0,      0, 0xD15D, 0xD15E,      0, /* 0x20 */
-         0,      0,      0, 0xD164,      0, 0xD4D4, 0xB0F9, 0xD8C2, /* 0x30 */
-    0xD4D3, 0xD4E6,      0,      0, 0xB140,      0, 0xD4E4,      0, /* 0x30 */
-    0xB0FE, 0xB0FA, 0xD4ED, 0xD4DD, 0xD4E0,      0, 0xB143, 0xD4EA, /* 0x40 */
-    0xD4E2, 0xB0FB, 0xB144,      0, 0xD4E7, 0xD4E5,      0,      0, /* 0x40 */
-    0xD4D6, 0xD4EB, 0xD4DF, 0xD4DA,      0, 0xD4D0, 0xD4EC, 0xD4DC, /* 0x50 */
-    0xD4CF,      0, 0xB142, 0xD4E1, 0xD4EE, 0xD4DE, 0xD4D2, 0xD4D7, /* 0x50 */
-    0xD4CE,      0, 0xB141,      0, 0xD4DB, 0xD4D8, 0xB0FC, 0xD4D1, /* 0x60 */
-         0, 0xD4E9, 0xB0FD,      0, 0xD4D9, 0xD4D5,      0,      0, /* 0x60 */
-    0xD4E8,      0,      0,      0,      0,      0,      0, 0xB440, /* 0x70 */
-    0xD8BB,      0, 0xD8B8, 0xD8C9, 0xD8BD, 0xD8CA,      0, 0xB442, /* 0x70 */
-         0,      0,      0, 0xD8C6, 0xD8C3,      0,      0,      0, /* 0x80 */
-         0,      0, 0xD8C4, 0xD8C7, 0xD8CB,      0, 0xD4E3, 0xD8CD, /* 0x80 */
-    0xDD47,      0, 0xB443, 0xD8CE, 0xD8B6, 0xD8C0,      0, 0xD8C5, /* 0x90 */
-         0,      0, 0xB441, 0xB444, 0xD8CC, 0xD8CF, 0xD8BA, 0xD8B7, /* 0x90 */
-         0,      0, 0xD8B9,      0,      0, 0xD8BE, 0xD8BC, 0xB445, /* 0xA0 */
-         0, 0xD8C8,      0,      0, 0xD8BF,      0, 0xD8C1, 0xD8B5, /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xCE65, 0xABC2, 	 0, 0xABBD, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xAE5C, 0xD162, 	 0, 0xAE5B, 	 0, 	 0, 0xD160, /* 0x00 */
+         0, 0xAE50, 	 0, 0xAE55, 	 0, 0xD15F, 0xD15C, 0xD161, /* 0x10 */
+    0xAE51, 0xD15B, 	 0, 0xAE54, 0xAE52, 	 0, 0xD163, 0xAE53, /* 0x10 */
+    0xAE57, 	 0, 	 0, 0xAE58, 	 0, 0xAE5A, 	 0, 	 0, /* 0x20 */
+         0, 0xAE59, 	 0, 	 0, 	 0, 0xD15D, 0xD15E, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xD164, 	 0, 0xD4D4, 0xB0F9, 0xD8C2, /* 0x30 */
+    0xD4D3, 0xD4E6, 	 0, 	 0, 0xB140, 	 0, 0xD4E4, 	 0, /* 0x30 */
+    0xB0FE, 0xB0FA, 0xD4ED, 0xD4DD, 0xD4E0, 	 0, 0xB143, 0xD4EA, /* 0x40 */
+    0xD4E2, 0xB0FB, 0xB144, 	 0, 0xD4E7, 0xD4E5, 	 0, 	 0, /* 0x40 */
+    0xD4D6, 0xD4EB, 0xD4DF, 0xD4DA, 	 0, 0xD4D0, 0xD4EC, 0xD4DC, /* 0x50 */
+    0xD4CF, 	 0, 0xB142, 0xD4E1, 0xD4EE, 0xD4DE, 0xD4D2, 0xD4D7, /* 0x50 */
+    0xD4CE, 	 0, 0xB141, 	 0, 0xD4DB, 0xD4D8, 0xB0FC, 0xD4D1, /* 0x60 */
+         0, 0xD4E9, 0xB0FD, 	 0, 0xD4D9, 0xD4D5, 	 0, 	 0, /* 0x60 */
+    0xD4E8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB440, /* 0x70 */
+    0xD8BB, 	 0, 0xD8B8, 0xD8C9, 0xD8BD, 0xD8CA, 	 0, 0xB442, /* 0x70 */
+         0, 	 0, 	 0, 0xD8C6, 0xD8C3, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xD8C4, 0xD8C7, 0xD8CB, 	 0, 0xD4E3, 0xD8CD, /* 0x80 */
+    0xDD47, 	 0, 0xB443, 0xD8CE, 0xD8B6, 0xD8C0, 	 0, 0xD8C5, /* 0x90 */
+         0, 	 0, 0xB441, 0xB444, 0xD8CC, 0xD8CF, 0xD8BA, 0xD8B7, /* 0x90 */
+         0, 	 0, 0xD8B9, 	 0, 	 0, 0xD8BE, 0xD8BC, 0xB445, /* 0xA0 */
+         0, 0xD8C8, 	 0, 	 0, 0xD8BF, 	 0, 0xD8C1, 0xD8B5, /* 0xA0 */
     0xDCFA, 0xDCF8, 0xB742, 0xB740, 0xDD43, 0xDCF9, 0xDD44, 0xDD40, /* 0xB0 */
     0xDCF7, 0xDD46, 0xDCF6, 0xDCFD, 0xB6FE, 0xB6FD, 0xB6FC, 0xDCFB, /* 0xB0 */
-    0xDD41, 0xB6F9, 0xB741,      0, 0xDCF4,      0, 0xDCFE, 0xDCF3, /* 0xC0 */
-    0xDCFC, 0xB6FA, 0xDD42, 0xDCF5, 0xB6FB, 0xDD45,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0, 0xE16E, 0xB9E2, 0xB9E1, /* 0xD0 */
+    0xDD41, 0xB6F9, 0xB741, 	 0, 0xDCF4, 	 0, 0xDCFE, 0xDCF3, /* 0xC0 */
+    0xDCFC, 0xB6FA, 0xDD42, 0xDCF5, 0xB6FB, 0xDD45, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE16E, 0xB9E2, 0xB9E1, /* 0xD0 */
     0xB9E3, 0xE17A, 0xE170, 0xE176, 0xE16B, 0xE179, 0xE178, 0xE17C, /* 0xD0 */
-    0xE175, 0xB9DE, 0xE174, 0xB9E4,      0, 0xE16D, 0xB9DF,      0, /* 0xE0 */
-    0xE17B, 0xB9E0, 0xE16F, 0xE172, 0xE177, 0xE171, 0xE16C,      0, /* 0xE0 */
-         0,      0,      0, 0xE173, 0xE555, 0xBC61, 0xE558, 0xE557, /* 0xF0 */
-    0xE55A, 0xE55C, 0xF9DC, 0xBC5F,      0, 0xE556,      0, 0xE554  /* 0xF0 */
+    0xE175, 0xB9DE, 0xE174, 0xB9E4, 	 0, 0xE16D, 0xB9DF, 	 0, /* 0xE0 */
+    0xE17B, 0xB9E0, 0xE16F, 0xE172, 0xE177, 0xE171, 0xE16C, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xE173, 0xE555, 0xBC61, 0xE558, 0xE557, /* 0xF0 */
+    0xE55A, 0xE55C, 0xF9DC, 0xBC5F, 	 0, 0xE556, 	 0, 0xE554	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_5B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xE55D, 0xE55B, 0xE559,      0, 0xE55F,      0, 0xE55E, /* 0x00 */
-    0xBC63, 0xBC5E,      0, 0xBC60, 0xBC62,      0,      0, 0xE560, /* 0x00 */
-    0xE957,      0,      0, 0xE956, 0xE955,      0, 0xE958, 0xE951, /* 0x10 */
-         0, 0xE952, 0xE95A, 0xE953,      0, 0xBEC5, 0xE95C,      0, /* 0x10 */
-    0xE95B, 0xE954,      0, 0xECD1, 0xC0A8, 0xECCF, 0xECD4, 0xECD3, /* 0x20 */
-    0xE959,      0, 0xC0A7,      0, 0xECD2, 0xECCE, 0xECD6, 0xECD5, /* 0x20 */
-    0xC0A6,      0, 0xECD0,      0, 0xBEC6,      0,      0,      0, /* 0x30 */
-    0xC254,      0,      0,      0, 0xEFC1, 0xF1FA, 0xF1FB, 0xF1FC, /* 0x30 */
-    0xC45C,      0,      0, 0xC45D,      0, 0xF443,      0, 0xF5C8, /* 0x40 */
-    0xF5C7,      0,      0, 0xF6DB, 0xF6DC, 0xF7D5, 0xF8A7,      0, /* 0x40 */
-    0xA46C, 0xA46D,      0, 0xA46E, 0xA4D5, 0xA5A5, 0xC9D3, 0xA672, /* 0x50 */
-    0xA673,      0, 0xA7B7, 0xA7B8, 0xA7B6, 0xA7B5,      0, 0xA973, /* 0x50 */
-         0,      0, 0xCC55, 0xA975, 0xA974, 0xCC56,      0,      0, /* 0x60 */
-         0, 0xABC4,      0, 0xAE5D, 0xD165,      0, 0xD4F0,      0, /* 0x60 */
-    0xB145, 0xB447, 0xD4EF, 0xB446,      0, 0xB9E5,      0, 0xE17D, /* 0x70 */
-    0xBEC7,      0, 0xC0A9, 0xECD7,      0, 0xC45E,      0, 0xC570, /* 0x70 */
-         0, 0xC972,      0, 0xA5A6, 0xC973, 0xA676,      0, 0xA674, /* 0x80 */
-    0xA675, 0xA677,      0, 0xA7BA, 0xA7B9,      0, 0xCABC, 0xA7BB, /* 0x80 */
-         0,      0, 0xCABD, 0xCC57,      0, 0xCC58,      0, 0xA976, /* 0x90 */
-    0xA978, 0xA97A, 0xA977, 0xA97B, 0xA979,      0,      0,      0, /* 0x90 */
-         0,      0, 0xABC8, 0xABC5, 0xABC7, 0xABC9, 0xABC6, 0xD166, /* 0xA0 */
-    0xCE77,      0,      0,      0, 0xD168, 0xD167, 0xAE63,      0, /* 0xA0 */
-    0xAE5F,      0,      0, 0xAE60, 0xAE62, 0xAE64, 0xAE61,      0, /* 0xB0 */
-    0xAE66, 0xAE65,      0,      0,      0,      0,      0, 0xB14A, /* 0xB0 */
-    0xD4F2, 0xD4F1, 0xB149,      0, 0xB148, 0xB147, 0xB14B, 0xB146, /* 0xC0 */
-         0,      0, 0xD8D5, 0xD8D2, 0xB449, 0xD8D1, 0xD8D6,      0, /* 0xC0 */
-    0xB44B, 0xD8D4, 0xB448, 0xB44A, 0xD8D3,      0, 0xDD48,      0, /* 0xD0 */
-    0xDD49, 0xDD4A,      0,      0,      0,      0, 0xB9E6, 0xB9EE, /* 0xD0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xE55D, 0xE55B, 0xE559, 	 0, 0xE55F, 	 0, 0xE55E, /* 0x00 */
+    0xBC63, 0xBC5E, 	 0, 0xBC60, 0xBC62, 	 0, 	 0, 0xE560, /* 0x00 */
+    0xE957, 	 0, 	 0, 0xE956, 0xE955, 	 0, 0xE958, 0xE951, /* 0x10 */
+         0, 0xE952, 0xE95A, 0xE953, 	 0, 0xBEC5, 0xE95C, 	 0, /* 0x10 */
+    0xE95B, 0xE954, 	 0, 0xECD1, 0xC0A8, 0xECCF, 0xECD4, 0xECD3, /* 0x20 */
+    0xE959, 	 0, 0xC0A7, 	 0, 0xECD2, 0xECCE, 0xECD6, 0xECD5, /* 0x20 */
+    0xC0A6, 	 0, 0xECD0, 	 0, 0xBEC6, 	 0, 	 0, 	 0, /* 0x30 */
+    0xC254, 	 0, 	 0, 	 0, 0xEFC1, 0xF1FA, 0xF1FB, 0xF1FC, /* 0x30 */
+    0xC45C, 	 0, 	 0, 0xC45D, 	 0, 0xF443, 	 0, 0xF5C8, /* 0x40 */
+    0xF5C7, 	 0, 	 0, 0xF6DB, 0xF6DC, 0xF7D5, 0xF8A7, 	 0, /* 0x40 */
+    0xA46C, 0xA46D, 	 0, 0xA46E, 0xA4D5, 0xA5A5, 0xC9D3, 0xA672, /* 0x50 */
+    0xA673, 	 0, 0xA7B7, 0xA7B8, 0xA7B6, 0xA7B5, 	 0, 0xA973, /* 0x50 */
+         0, 	 0, 0xCC55, 0xA975, 0xA974, 0xCC56, 	 0, 	 0, /* 0x60 */
+         0, 0xABC4, 	 0, 0xAE5D, 0xD165, 	 0, 0xD4F0, 	 0, /* 0x60 */
+    0xB145, 0xB447, 0xD4EF, 0xB446, 	 0, 0xB9E5, 	 0, 0xE17D, /* 0x70 */
+    0xBEC7, 	 0, 0xC0A9, 0xECD7, 	 0, 0xC45E, 	 0, 0xC570, /* 0x70 */
+         0, 0xC972, 	 0, 0xA5A6, 0xC973, 0xA676, 	 0, 0xA674, /* 0x80 */
+    0xA675, 0xA677, 	 0, 0xA7BA, 0xA7B9, 	 0, 0xCABC, 0xA7BB, /* 0x80 */
+         0, 	 0, 0xCABD, 0xCC57, 	 0, 0xCC58, 	 0, 0xA976, /* 0x90 */
+    0xA978, 0xA97A, 0xA977, 0xA97B, 0xA979, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xABC8, 0xABC5, 0xABC7, 0xABC9, 0xABC6, 0xD166, /* 0xA0 */
+    0xCE77, 	 0, 	 0, 	 0, 0xD168, 0xD167, 0xAE63, 	 0, /* 0xA0 */
+    0xAE5F, 	 0, 	 0, 0xAE60, 0xAE62, 0xAE64, 0xAE61, 	 0, /* 0xB0 */
+    0xAE66, 0xAE65, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB14A, /* 0xB0 */
+    0xD4F2, 0xD4F1, 0xB149, 	 0, 0xB148, 0xB147, 0xB14B, 0xB146, /* 0xC0 */
+         0, 	 0, 0xD8D5, 0xD8D2, 0xB449, 0xD8D1, 0xD8D6, 	 0, /* 0xC0 */
+    0xB44B, 0xD8D4, 0xB448, 0xB44A, 0xD8D3, 	 0, 0xDD48, 	 0, /* 0xD0 */
+    0xDD49, 0xDD4A, 	 0, 	 0, 	 0, 	 0, 0xB9E6, 0xB9EE, /* 0xD0 */
     0xE17E, 0xB9E8, 0xB9EC, 0xE1A1, 0xB9ED, 0xB9E9, 0xB9EA, 0xB9E7, /* 0xE0 */
-    0xB9EB, 0xBC66, 0xD8D0, 0xBC67, 0xBC65,      0, 0xBC64, 0xE95D, /* 0xE0 */
-    0xBEC8, 0xECD8, 0xECD9,      0,      0, 0xC364, 0xC45F,      0, /* 0xF0 */
-    0xA46F,      0, 0xA678                                          /* 0xF0 */
+    0xB9EB, 0xBC66, 0xD8D0, 0xBC67, 0xBC65, 	 0, 0xBC64, 0xE95D, /* 0xE0 */
+    0xBEC8, 0xECD8, 0xECD9, 	 0, 	 0, 0xC364, 0xC45F, 	 0, /* 0xF0 */
+    0xA46F, 	 0, 0xA678											/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_5C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xABCA,      0, 0xD169, 0xAE67,      0,      0, 0xB14E, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xABCA, 	 0, 0xD169, 0xAE67, 	 0, 	 0, 0xB14E, /* 0x00 */
     0xB14D, 0xB14C, 0xB44C, 0xB44D, 0xD8D7, 0xB9EF, 0xBEC9, 0xA470, /* 0x00 */
-    0xC95C, 0xA4D6, 0xC974,      0,      0, 0xC9D4, 0xA679,      0, /* 0x10 */
-         0,      0, 0xA97C,      0,      0,      0,      0, 0xDD4B, /* 0x10 */
-         0,      0, 0xA471,      0, 0xA4D7, 0xC9D5,      0,      0, /* 0x20 */
-    0xCABE,      0, 0xCABF,      0, 0xA7BC,      0,      0,      0, /* 0x20 */
-    0xD8D8, 0xB44E,      0, 0xDD4C,      0,      0,      0, 0xC0AA, /* 0x30 */
-    0xA472, 0xA4A8, 0xA4D8, 0xC975, 0xA5A7,      0, 0xA7C0, 0xA7BF, /* 0x30 */
-    0xA7BD, 0xA7BE,      0,      0, 0xCC59, 0xA97E, 0xA9A1, 0xCC5A, /* 0x40 */
-    0xA97D,      0,      0, 0xABCE, 0xCE78, 0xABCD, 0xABCB, 0xABCC, /* 0x40 */
-    0xAE6A, 0xAE68,      0,      0, 0xD16B, 0xAE69, 0xD16A,      0, /* 0x50 */
-    0xAE5E, 0xD4F3,      0,      0, 0xB150, 0xB151,      0,      0, /* 0x50 */
-    0xB14F,      0, 0xB9F0, 0xE1A2, 0xBC68, 0xBC69,      0, 0xE561, /* 0x60 */
-    0xC0AB, 0xEFC2, 0xEFC3,      0, 0xC4DD, 0xF8A8, 0xC94B, 0xA4D9, /* 0x60 */
-         0, 0xA473,      0, 0xC977, 0xC976,      0,      0,      0, /* 0x70 */
-         0, 0xA67A, 0xC9D7, 0xC9D8, 0xC9D6,      0, 0xC9D9,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xCAC7,      0, /* 0x80 */
-    0xCAC2, 0xCAC4, 0xCAC6, 0xCAC3, 0xA7C4, 0xCAC0,      0, 0xCAC1, /* 0x80 */
-    0xA7C1, 0xA7C2, 0xCAC5, 0xCAC8, 0xA7C3, 0xCAC9,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0xCC68,      0, 0xCC62, /* 0x90 */
+    0xC95C, 0xA4D6, 0xC974, 	 0, 	 0, 0xC9D4, 0xA679, 	 0, /* 0x10 */
+         0, 	 0, 0xA97C, 	 0, 	 0, 	 0, 	 0, 0xDD4B, /* 0x10 */
+         0, 	 0, 0xA471, 	 0, 0xA4D7, 0xC9D5, 	 0, 	 0, /* 0x20 */
+    0xCABE, 	 0, 0xCABF, 	 0, 0xA7BC, 	 0, 	 0, 	 0, /* 0x20 */
+    0xD8D8, 0xB44E, 	 0, 0xDD4C, 	 0, 	 0, 	 0, 0xC0AA, /* 0x30 */
+    0xA472, 0xA4A8, 0xA4D8, 0xC975, 0xA5A7, 	 0, 0xA7C0, 0xA7BF, /* 0x30 */
+    0xA7BD, 0xA7BE, 	 0, 	 0, 0xCC59, 0xA97E, 0xA9A1, 0xCC5A, /* 0x40 */
+    0xA97D, 	 0, 	 0, 0xABCE, 0xCE78, 0xABCD, 0xABCB, 0xABCC, /* 0x40 */
+    0xAE6A, 0xAE68, 	 0, 	 0, 0xD16B, 0xAE69, 0xD16A, 	 0, /* 0x50 */
+    0xAE5E, 0xD4F3, 	 0, 	 0, 0xB150, 0xB151, 	 0, 	 0, /* 0x50 */
+    0xB14F, 	 0, 0xB9F0, 0xE1A2, 0xBC68, 0xBC69, 	 0, 0xE561, /* 0x60 */
+    0xC0AB, 0xEFC2, 0xEFC3, 	 0, 0xC4DD, 0xF8A8, 0xC94B, 0xA4D9, /* 0x60 */
+         0, 0xA473, 	 0, 0xC977, 0xC976, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xA67A, 0xC9D7, 0xC9D8, 0xC9D6, 	 0, 0xC9D9, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCAC7, 	 0, /* 0x80 */
+    0xCAC2, 0xCAC4, 0xCAC6, 0xCAC3, 0xA7C4, 0xCAC0, 	 0, 0xCAC1, /* 0x80 */
+    0xA7C1, 0xA7C2, 0xCAC5, 0xCAC8, 0xA7C3, 0xCAC9, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCC68, 	 0, 0xCC62, /* 0x90 */
     0xCC5D, 0xA9A3, 0xCC65, 0xCC63, 0xCC5C, 0xCC69, 0xCC6C, 0xCC67, /* 0xA0 */
     0xCC60, 0xA9A5, 0xCC66, 0xA9A6, 0xCC61, 0xCC64, 0xCC5B, 0xCC5F, /* 0xA0 */
-    0xCC6B, 0xA9A7,      0, 0xA9A8,      0, 0xCC5E, 0xCC6A, 0xA9A2, /* 0xB0 */
-    0xA9A4,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0, 0xCEAB, 0xCEA4, /* 0xC0 */
-    0xCEAA, 0xCEA3, 0xCEA5, 0xCE7D, 0xCE7B,      0, 0xCEAC, 0xCEA9, /* 0xC0 */
-    0xCE79,      0, 0xABD0, 0xCEA7, 0xCEA8,      0, 0xCEA6, 0xCE7C, /* 0xD0 */
-    0xCE7A, 0xABCF, 0xCEA2, 0xCE7E,      0,      0, 0xCEA1, 0xCEAD, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-    0xAE6F,      0, 0xAE6E,      0, 0xD16C, 0xAE6B, 0xD16E,      0, /* 0xE0 */
-    0xAE70, 0xD16F,      0,      0, 0xAE73,      0, 0xAE71, 0xD170, /* 0xF0 */
-    0xCEAE, 0xD172,      0, 0xAE6D,      0, 0xAE6C,      0, 0xD16D  /* 0xF0 */
+    0xCC6B, 0xA9A7, 	 0, 0xA9A8, 	 0, 0xCC5E, 0xCC6A, 0xA9A2, /* 0xB0 */
+    0xA9A4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCEAB, 0xCEA4, /* 0xC0 */
+    0xCEAA, 0xCEA3, 0xCEA5, 0xCE7D, 0xCE7B, 	 0, 0xCEAC, 0xCEA9, /* 0xC0 */
+    0xCE79, 	 0, 0xABD0, 0xCEA7, 0xCEA8, 	 0, 0xCEA6, 0xCE7C, /* 0xD0 */
+    0xCE7A, 0xABCF, 0xCEA2, 0xCE7E, 	 0, 	 0, 0xCEA1, 0xCEAD, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xAE6F, 	 0, 0xAE6E, 	 0, 0xD16C, 0xAE6B, 0xD16E, 	 0, /* 0xE0 */
+    0xAE70, 0xD16F, 	 0, 	 0, 0xAE73, 	 0, 0xAE71, 0xD170, /* 0xF0 */
+    0xCEAE, 0xD172, 	 0, 0xAE6D, 	 0, 0xAE6C, 	 0, 0xD16D	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_5D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD171, 0xAE72,      0,      0,      0,      0, 0xB153, 0xB152, /* 0x00 */
-         0,      0,      0, 0xD4F5, 0xD4F9, 0xD4FB, 0xB154, 0xD4FE, /* 0x00 */
-         0, 0xB158, 0xD541,      0, 0xB15A,      0, 0xB156, 0xB15E, /* 0x10 */
-         0, 0xB15B, 0xD4F7, 0xB155,      0, 0xD4F6, 0xD4F4, 0xD543, /* 0x10 */
-    0xD4F8,      0, 0xB157, 0xD542, 0xB15C, 0xD4FD, 0xD4FC, 0xB15D, /* 0x20 */
-    0xD4FA, 0xB159,      0,      0,      0,      0, 0xD544,      0, /* 0x20 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD171, 0xAE72, 	 0, 	 0, 	 0, 	 0, 0xB153, 0xB152, /* 0x00 */
+         0, 	 0, 	 0, 0xD4F5, 0xD4F9, 0xD4FB, 0xB154, 0xD4FE, /* 0x00 */
+         0, 0xB158, 0xD541, 	 0, 0xB15A, 	 0, 0xB156, 0xB15E, /* 0x10 */
+         0, 0xB15B, 0xD4F7, 0xB155, 	 0, 0xD4F6, 0xD4F4, 0xD543, /* 0x10 */
+    0xD4F8, 	 0, 0xB157, 0xD542, 0xB15C, 0xD4FD, 0xD4FC, 0xB15D, /* 0x20 */
+    0xD4FA, 0xB159, 	 0, 	 0, 	 0, 	 0, 0xD544, 	 0, /* 0x20 */
     0xD540, 0xD8E7, 0xD8EE, 0xD8E3, 0xB451, 0xD8DF, 0xD8EF, 0xD8D9, /* 0x30 */
-    0xD8EC, 0xD8EA, 0xD8E4,      0, 0xD8ED, 0xD8E6,      0, 0xD8DE, /* 0x30 */
-    0xD8F0, 0xD8DC, 0xD8E9, 0xD8DA,      0, 0xD8F1,      0, 0xB452, /* 0x40 */
-         0, 0xD8EB, 0xDD4F, 0xD8DD, 0xB44F,      0, 0xD8E1,      0, /* 0x40 */
-    0xB450, 0xD8E0, 0xD8E5,      0,      0, 0xD8E2,      0,      0, /* 0x50 */
-         0, 0xD8E8,      0,      0,      0,      0, 0xDD53,      0, /* 0x50 */
-         0,      0, 0xDD56, 0xDD4E,      0, 0xDD50,      0, 0xDD55, /* 0x60 */
-    0xDD54, 0xB743,      0, 0xD8DB, 0xDD52,      0,      0, 0xB744, /* 0x60 */
-         0, 0xDD4D, 0xDD51,      0,      0,      0,      0, 0xE1A9, /* 0x70 */
-         0, 0xE1B0, 0xE1A7,      0, 0xE1AE, 0xE1A5, 0xE1AD, 0xE1B1, /* 0x70 */
-    0xE1A4, 0xE1A8, 0xE1A3,      0, 0xB9F1,      0, 0xE1A6, 0xB9F2, /* 0x80 */
-    0xE1AC, 0xE1AB, 0xE1AA,      0,      0, 0xE1AF,      0,      0, /* 0x80 */
-         0,      0, 0xE565, 0xE567, 0xBC6B, 0xE568,      0, 0xE563, /* 0x90 */
-         0, 0xE562, 0xE56C,      0, 0xE56A, 0xBC6A, 0xE56D, 0xE564, /* 0x90 */
-    0xE569, 0xE56B, 0xE566,      0,      0,      0,      0, 0xE961, /* 0xA0 */
-    0xE966, 0xE960, 0xE965,      0, 0xE95E, 0xE968, 0xE964, 0xE969, /* 0xA0 */
-    0xE963, 0xE95F, 0xE967,      0, 0xE96A, 0xE962,      0, 0xECDA, /* 0xB0 */
-    0xC0AF,      0, 0xC0AD,      0, 0xC0AC, 0xC0AE,      0,      0, /* 0xB0 */
-    0xEFC4,      0, 0xF172, 0xF1FD,      0,      0, 0xF444, 0xF445, /* 0xC0 */
-         0, 0xC460,      0, 0xF5C9,      0, 0xC4DE,      0, 0xF5CA, /* 0xC0 */
-         0, 0xF6DE, 0xC572,      0, 0xC571, 0xF6DD, 0xC5C9,      0, /* 0xD0 */
-    0xF7D6,      0,      0,      0,      0, 0xA474, 0xA67B, 0xC9DA, /* 0xD0 */
-    0xCACA, 0xA8B5, 0xB15F,      0,      0, 0xA475, 0xA5AA, 0xA5A9, /* 0xE0 */
-    0xA5A8,      0,      0, 0xA7C5,      0,      0, 0xAE74,      0, /* 0xE0 */
-    0xDD57, 0xA476, 0xA477, 0xA478, 0xA4DA,      0,      0, 0xABD1, /* 0xF0 */
-         0, 0xCEAF,      0,      0,      0, 0xB453, 0xA479, 0xC95D  /* 0xF0 */
+    0xD8EC, 0xD8EA, 0xD8E4, 	 0, 0xD8ED, 0xD8E6, 	 0, 0xD8DE, /* 0x30 */
+    0xD8F0, 0xD8DC, 0xD8E9, 0xD8DA, 	 0, 0xD8F1, 	 0, 0xB452, /* 0x40 */
+         0, 0xD8EB, 0xDD4F, 0xD8DD, 0xB44F, 	 0, 0xD8E1, 	 0, /* 0x40 */
+    0xB450, 0xD8E0, 0xD8E5, 	 0, 	 0, 0xD8E2, 	 0, 	 0, /* 0x50 */
+         0, 0xD8E8, 	 0, 	 0, 	 0, 	 0, 0xDD53, 	 0, /* 0x50 */
+         0, 	 0, 0xDD56, 0xDD4E, 	 0, 0xDD50, 	 0, 0xDD55, /* 0x60 */
+    0xDD54, 0xB743, 	 0, 0xD8DB, 0xDD52, 	 0, 	 0, 0xB744, /* 0x60 */
+         0, 0xDD4D, 0xDD51, 	 0, 	 0, 	 0, 	 0, 0xE1A9, /* 0x70 */
+         0, 0xE1B0, 0xE1A7, 	 0, 0xE1AE, 0xE1A5, 0xE1AD, 0xE1B1, /* 0x70 */
+    0xE1A4, 0xE1A8, 0xE1A3, 	 0, 0xB9F1, 	 0, 0xE1A6, 0xB9F2, /* 0x80 */
+    0xE1AC, 0xE1AB, 0xE1AA, 	 0, 	 0, 0xE1AF, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xE565, 0xE567, 0xBC6B, 0xE568, 	 0, 0xE563, /* 0x90 */
+         0, 0xE562, 0xE56C, 	 0, 0xE56A, 0xBC6A, 0xE56D, 0xE564, /* 0x90 */
+    0xE569, 0xE56B, 0xE566, 	 0, 	 0, 	 0, 	 0, 0xE961, /* 0xA0 */
+    0xE966, 0xE960, 0xE965, 	 0, 0xE95E, 0xE968, 0xE964, 0xE969, /* 0xA0 */
+    0xE963, 0xE95F, 0xE967, 	 0, 0xE96A, 0xE962, 	 0, 0xECDA, /* 0xB0 */
+    0xC0AF, 	 0, 0xC0AD, 	 0, 0xC0AC, 0xC0AE, 	 0, 	 0, /* 0xB0 */
+    0xEFC4, 	 0, 0xF172, 0xF1FD, 	 0, 	 0, 0xF444, 0xF445, /* 0xC0 */
+         0, 0xC460, 	 0, 0xF5C9, 	 0, 0xC4DE, 	 0, 0xF5CA, /* 0xC0 */
+         0, 0xF6DE, 0xC572, 	 0, 0xC571, 0xF6DD, 0xC5C9, 	 0, /* 0xD0 */
+    0xF7D6, 	 0, 	 0, 	 0, 	 0, 0xA474, 0xA67B, 0xC9DA, /* 0xD0 */
+    0xCACA, 0xA8B5, 0xB15F, 	 0, 	 0, 0xA475, 0xA5AA, 0xA5A9, /* 0xE0 */
+    0xA5A8, 	 0, 	 0, 0xA7C5, 	 0, 	 0, 0xAE74, 	 0, /* 0xE0 */
+    0xDD57, 0xA476, 0xA477, 0xA478, 0xA4DA, 	 0, 	 0, 0xABD1, /* 0xF0 */
+         0, 0xCEAF, 	 0, 	 0, 	 0, 0xB453, 0xA479, 0xC95D	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_5E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xA5AB, 0xA5AC, 0xC978,      0, 0xA67C,      0, /* 0x00 */
-         0,      0, 0xCACB,      0, 0xA7C6,      0, 0xCACC,      0, /* 0x00 */
-         0, 0xA9AE,      0,      0, 0xCC6E, 0xA9AC, 0xA9AB, 0xCC6D, /* 0x10 */
-    0xA9A9, 0xCC6F, 0xA9AA, 0xA9AD,      0, 0xABD2,      0, 0xABD4, /* 0x10 */
-    0xCEB3, 0xCEB0, 0xCEB1, 0xCEB2, 0xCEB4, 0xABD3,      0,      0, /* 0x20 */
-    0xD174, 0xD173,      0, 0xAE76,      0, 0xAE75,      0,      0, /* 0x20 */
-         0,      0,      0, 0xB162, 0xD546,      0, 0xB161, 0xB163, /* 0x30 */
-    0xB160,      0,      0,      0,      0, 0xB455, 0xD545,      0, /* 0x30 */
-    0xB456, 0xD8F3,      0, 0xB457, 0xD8F2, 0xB454,      0,      0, /* 0x40 */
-         0,      0, 0xDD5A, 0xDD5C, 0xB745, 0xDD5B, 0xDD59, 0xDD58, /* 0x40 */
-         0,      0,      0, 0xE1B4, 0xB9F7, 0xB9F5,      0, 0xB9F6, /* 0x50 */
-    0xE1B2, 0xE1B3,      0, 0xB9F3, 0xE571, 0xE56F,      0, 0xBC6D, /* 0x50 */
-    0xE570, 0xBC6E, 0xBC6C, 0xB9F4,      0,      0, 0xE96D, 0xE96B, /* 0x60 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xA5AB, 0xA5AC, 0xC978, 	 0, 0xA67C, 	 0, /* 0x00 */
+         0, 	 0, 0xCACB, 	 0, 0xA7C6, 	 0, 0xCACC, 	 0, /* 0x00 */
+         0, 0xA9AE, 	 0, 	 0, 0xCC6E, 0xA9AC, 0xA9AB, 0xCC6D, /* 0x10 */
+    0xA9A9, 0xCC6F, 0xA9AA, 0xA9AD, 	 0, 0xABD2, 	 0, 0xABD4, /* 0x10 */
+    0xCEB3, 0xCEB0, 0xCEB1, 0xCEB2, 0xCEB4, 0xABD3, 	 0, 	 0, /* 0x20 */
+    0xD174, 0xD173, 	 0, 0xAE76, 	 0, 0xAE75, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 0xB162, 0xD546, 	 0, 0xB161, 0xB163, /* 0x30 */
+    0xB160, 	 0, 	 0, 	 0, 	 0, 0xB455, 0xD545, 	 0, /* 0x30 */
+    0xB456, 0xD8F3, 	 0, 0xB457, 0xD8F2, 0xB454, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xDD5A, 0xDD5C, 0xB745, 0xDD5B, 0xDD59, 0xDD58, /* 0x40 */
+         0, 	 0, 	 0, 0xE1B4, 0xB9F7, 0xB9F5, 	 0, 0xB9F6, /* 0x50 */
+    0xE1B2, 0xE1B3, 	 0, 0xB9F3, 0xE571, 0xE56F, 	 0, 0xBC6D, /* 0x50 */
+    0xE570, 0xBC6E, 0xBC6C, 0xB9F4, 	 0, 	 0, 0xE96D, 0xE96B, /* 0x60 */
     0xE96C, 0xE56E, 0xECDC, 0xC0B0, 0xECDB, 0xEFC5, 0xEFC6, 0xE96E, /* 0x60 */
-    0xF1FE,      0, 0xA47A, 0xA5AD, 0xA67E, 0xC9DB, 0xA67D,      0, /* 0x70 */
-    0xA9AF, 0xB746,      0, 0xA4DB, 0xA5AE, 0xABD5, 0xB458,      0, /* 0x70 */
-    0xC979,      0, 0xC97A,      0, 0xC9DC,      0,      0, 0xA7C8, /* 0x80 */
-    0xCAD0, 0xCACE, 0xA7C9, 0xCACD, 0xCACF, 0xCAD1,      0, 0xA7C7, /* 0x80 */
-         0,      0,      0,      0,      0, 0xA9B3, 0xA9B4, 0xA9B1, /* 0x90 */
-         0,      0, 0xA9B0, 0xCEB8, 0xA9B2,      0,      0,      0, /* 0x90 */
-    0xABD6,      0, 0xCEB7, 0xCEB9, 0xCEB6, 0xCEBA, 0xABD7, 0xAE79, /* 0xA0 */
-    0xD175,      0, 0xD177, 0xAE77, 0xD178, 0xAE78, 0xD176,      0, /* 0xA0 */
+    0xF1FE, 	 0, 0xA47A, 0xA5AD, 0xA67E, 0xC9DB, 0xA67D, 	 0, /* 0x70 */
+    0xA9AF, 0xB746, 	 0, 0xA4DB, 0xA5AE, 0xABD5, 0xB458, 	 0, /* 0x70 */
+    0xC979, 	 0, 0xC97A, 	 0, 0xC9DC, 	 0, 	 0, 0xA7C8, /* 0x80 */
+    0xCAD0, 0xCACE, 0xA7C9, 0xCACD, 0xCACF, 0xCAD1, 	 0, 0xA7C7, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xA9B3, 0xA9B4, 0xA9B1, /* 0x90 */
+         0, 	 0, 0xA9B0, 0xCEB8, 0xA9B2, 	 0, 	 0, 	 0, /* 0x90 */
+    0xABD6, 	 0, 0xCEB7, 0xCEB9, 0xCEB6, 0xCEBA, 0xABD7, 0xAE79, /* 0xA0 */
+    0xD175, 	 0, 0xD177, 0xAE77, 0xD178, 0xAE78, 0xD176, 	 0, /* 0xA0 */
     0xCEB5, 0xD547, 0xD54A, 0xD54B, 0xD548, 0xB167, 0xB166, 0xB164, /* 0xB0 */
-    0xB165, 0xD549,      0,      0,      0,      0, 0xB168,      0, /* 0xB0 */
-         0, 0xB45A, 0xB45B,      0, 0xB45C, 0xDD5D, 0xDD5F, 0xDD61, /* 0xC0 */
-    0xB748, 0xB747, 0xB459, 0xDD60, 0xDD5E,      0, 0xE1B8,      0, /* 0xC0 */
+    0xB165, 0xD549, 	 0, 	 0, 	 0, 	 0, 0xB168, 	 0, /* 0xB0 */
+         0, 0xB45A, 0xB45B, 	 0, 0xB45C, 0xDD5D, 0xDD5F, 0xDD61, /* 0xC0 */
+    0xB748, 0xB747, 0xB459, 0xDD60, 0xDD5E, 	 0, 0xE1B8, 	 0, /* 0xC0 */
          0, 0xE1B6, 0xE1BC, 0xB9F8, 0xE1BD, 0xE1BA, 0xB9F9, 0xE1B7, /* 0xD0 */
     0xE1B5, 0xE1BB, 0xBC70, 0xE573, 0xE1B9, 0xBC72, 0xE574, 0xBC71, /* 0xD0 */
-    0xBC74, 0xE575, 0xBC6F, 0xBC73,      0, 0xE973, 0xE971, 0xE970, /* 0xE0 */
-    0xE972, 0xE96F,      0,      0, 0xC366,      0, 0xF446, 0xF447, /* 0xE0 */
-         0, 0xF5CB, 0xF6DF, 0xC655,      0,      0, 0xA9B5, 0xA7CA, /* 0xF0 */
-         0,      0, 0xABD8,      0,      0,      0, 0xA47B, 0xA4DC  /* 0xF0 */
+    0xBC74, 0xE575, 0xBC6F, 0xBC73, 	 0, 0xE973, 0xE971, 0xE970, /* 0xE0 */
+    0xE972, 0xE96F, 	 0, 	 0, 0xC366, 	 0, 0xF446, 0xF447, /* 0xE0 */
+         0, 0xF5CB, 0xF6DF, 0xC655, 	 0, 	 0, 0xA9B5, 0xA7CA, /* 0xF0 */
+         0, 	 0, 0xABD8, 	 0, 	 0, 	 0, 0xA47B, 0xA4DC	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_5F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xA5AF, 0xC9DD,      0, 0xA7CB, 0xCAD2,      0, 0xCEBB, /* 0x00 */
-    0xABD9,      0, 0xB9FA, 0xA47C,      0,      0,      0, 0xA6A1, /* 0x00 */
-         0,      0, 0xB749, 0xA47D, 0xA4DD, 0xA4DE,      0, 0xA5B1, /* 0x10 */
-    0xA5B0,      0, 0xC9DE, 0xA6A2,      0, 0xCAD3,      0, 0xA7CC, /* 0x10 */
-         0,      0, 0xCC71, 0xCC72, 0xCC73,      0, 0xA9B6, 0xA9B7, /* 0x20 */
-    0xCC70, 0xA9B8,      0,      0,      0, 0xABDA, 0xCEBC,      0, /* 0x20 */
-    0xD17A, 0xAE7A,      0, 0xD179,      0, 0xB169, 0xD54C, 0xB16A, /* 0x30 */
-    0xD54D,      0,      0,      0, 0xB45D,      0,      0,      0, /* 0x30 */
-    0xDD62,      0,      0, 0xE1BF, 0xE1BE,      0, 0xB9FB,      0, /* 0x40 */
-    0xBC75, 0xE576, 0xBECA, 0xE974, 0xC0B1,      0, 0xC573, 0xF7D8, /* 0x40 */
-         0,      0,      0,      0, 0xCC74,      0, 0xCEBD, 0xB16B, /* 0x50 */
-    0xD8F4, 0xB74A,      0,      0,      0, 0xC255,      0,      0, /* 0x50 */
-         0,      0, 0xA7CE,      0, 0xA7CD, 0xABDB,      0, 0xD17B, /* 0x60 */
-         0, 0xB16D, 0xB343, 0xB16E, 0xB16C, 0xB45E,      0, 0xE1C0, /* 0x60 */
-    0xB9FC, 0xBC76,      0, 0xC94C, 0xC9DF,      0, 0xCAD5, 0xA7CF, /* 0x70 */
-    0xCAD4, 0xA7D0,      0,      0, 0xA9BC, 0xCC77, 0xCC76, 0xA9BB, /* 0x70 */
-    0xA9B9, 0xA9BA, 0xCC75,      0,      0, 0xABDD, 0xCEBE, 0xABE0, /* 0x80 */
-    0xABDC, 0xABE2, 0xABDE, 0xABDF, 0xABE1,      0,      0,      0, /* 0x80 */
-    0xAE7D, 0xAE7C, 0xAE7B,      0,      0,      0, 0xD54F, 0xB16F, /* 0x90 */
-    0xB172, 0xB170,      0, 0xD54E, 0xB175,      0, 0xB171, 0xD550, /* 0x90 */
-    0xB174, 0xB173,      0,      0,      0, 0xD8F6, 0xD8F5,      0, /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xA5AF, 0xC9DD, 	 0, 0xA7CB, 0xCAD2, 	 0, 0xCEBB, /* 0x00 */
+    0xABD9, 	 0, 0xB9FA, 0xA47C, 	 0, 	 0, 	 0, 0xA6A1, /* 0x00 */
+         0, 	 0, 0xB749, 0xA47D, 0xA4DD, 0xA4DE, 	 0, 0xA5B1, /* 0x10 */
+    0xA5B0, 	 0, 0xC9DE, 0xA6A2, 	 0, 0xCAD3, 	 0, 0xA7CC, /* 0x10 */
+         0, 	 0, 0xCC71, 0xCC72, 0xCC73, 	 0, 0xA9B6, 0xA9B7, /* 0x20 */
+    0xCC70, 0xA9B8, 	 0, 	 0, 	 0, 0xABDA, 0xCEBC, 	 0, /* 0x20 */
+    0xD17A, 0xAE7A, 	 0, 0xD179, 	 0, 0xB169, 0xD54C, 0xB16A, /* 0x30 */
+    0xD54D, 	 0, 	 0, 	 0, 0xB45D, 	 0, 	 0, 	 0, /* 0x30 */
+    0xDD62, 	 0, 	 0, 0xE1BF, 0xE1BE, 	 0, 0xB9FB, 	 0, /* 0x40 */
+    0xBC75, 0xE576, 0xBECA, 0xE974, 0xC0B1, 	 0, 0xC573, 0xF7D8, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xCC74, 	 0, 0xCEBD, 0xB16B, /* 0x50 */
+    0xD8F4, 0xB74A, 	 0, 	 0, 	 0, 0xC255, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 0xA7CE, 	 0, 0xA7CD, 0xABDB, 	 0, 0xD17B, /* 0x60 */
+         0, 0xB16D, 0xB343, 0xB16E, 0xB16C, 0xB45E, 	 0, 0xE1C0, /* 0x60 */
+    0xB9FC, 0xBC76, 	 0, 0xC94C, 0xC9DF, 	 0, 0xCAD5, 0xA7CF, /* 0x70 */
+    0xCAD4, 0xA7D0, 	 0, 	 0, 0xA9BC, 0xCC77, 0xCC76, 0xA9BB, /* 0x70 */
+    0xA9B9, 0xA9BA, 0xCC75, 	 0, 	 0, 0xABDD, 0xCEBE, 0xABE0, /* 0x80 */
+    0xABDC, 0xABE2, 0xABDE, 0xABDF, 0xABE1, 	 0, 	 0, 	 0, /* 0x80 */
+    0xAE7D, 0xAE7C, 0xAE7B, 	 0, 	 0, 	 0, 0xD54F, 0xB16F, /* 0x90 */
+    0xB172, 0xB170, 	 0, 0xD54E, 0xB175, 	 0, 0xB171, 0xD550, /* 0x90 */
+    0xB174, 0xB173, 	 0, 	 0, 	 0, 0xD8F6, 0xD8F5, 	 0, /* 0xA0 */
     0xB461, 0xB45F, 0xB460, 0xD8F7, 0xB74B, 0xDD64, 0xB74C, 0xDD63, /* 0xA0 */
-         0,      0, 0xE577,      0,      0, 0xBC78, 0xE1C1, 0xBC77, /* 0xB0 */
-         0, 0xB9FD,      0, 0xECDE, 0xE975, 0xC0B2, 0xECDD, 0xF240, /* 0xB0 */
-    0xF448, 0xF449,      0, 0xA4DF,      0, 0xA5B2,      0,      0, /* 0xC0 */
-         0, 0xC97B,      0,      0, 0xA7D2, 0xA7D4,      0, 0xC9E2, /* 0xC0 */
-    0xCAD8, 0xCAD7, 0xCAD6,      0, 0xC9E1, 0xC9E0, 0xA6A4, 0xA7D3, /* 0xD0 */
-    0xA7D1, 0xA6A3,      0,      0,      0, 0xA9BD, 0xCC78,      0, /* 0xD0 */
-    0xA9BE, 0xCADD,      0, 0xCADF, 0xCADE, 0xCC79,      0,      0, /* 0xE0 */
-    0xCADA,      0, 0xA7D8, 0xA7D6,      0, 0xCAD9, 0xCADB, 0xCAE1, /* 0xE0 */
-         0, 0xA7D5,      0, 0xCADC, 0xCAE5, 0xA9C0,      0, 0xCAE2, /* 0xF0 */
-    0xA7D7,      0, 0xCAE0, 0xCAE3,      0, 0xA9BF,      0, 0xA9C1  /* 0xF0 */
+         0, 	 0, 0xE577, 	 0, 	 0, 0xBC78, 0xE1C1, 0xBC77, /* 0xB0 */
+         0, 0xB9FD, 	 0, 0xECDE, 0xE975, 0xC0B2, 0xECDD, 0xF240, /* 0xB0 */
+    0xF448, 0xF449, 	 0, 0xA4DF, 	 0, 0xA5B2, 	 0, 	 0, /* 0xC0 */
+         0, 0xC97B, 	 0, 	 0, 0xA7D2, 0xA7D4, 	 0, 0xC9E2, /* 0xC0 */
+    0xCAD8, 0xCAD7, 0xCAD6, 	 0, 0xC9E1, 0xC9E0, 0xA6A4, 0xA7D3, /* 0xD0 */
+    0xA7D1, 0xA6A3, 	 0, 	 0, 	 0, 0xA9BD, 0xCC78, 	 0, /* 0xD0 */
+    0xA9BE, 0xCADD, 	 0, 0xCADF, 0xCADE, 0xCC79, 	 0, 	 0, /* 0xE0 */
+    0xCADA, 	 0, 0xA7D8, 0xA7D6, 	 0, 0xCAD9, 0xCADB, 0xCAE1, /* 0xE0 */
+         0, 0xA7D5, 	 0, 0xCADC, 0xCAE5, 0xA9C0, 	 0, 0xCAE2, /* 0xF0 */
+    0xA7D7, 	 0, 0xCAE0, 0xCAE3, 	 0, 0xA9BF, 	 0, 0xA9C1	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_60[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xCAE4,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xCAE4, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
          0, 0xCCAF, 0xCCA2, 0xCC7E, 0xCCAE, 0xCCA9, 0xABE7, 0xA9C2, /* 0x00 */
     0xCCAA, 0xCCAD, 0xABE3, 0xCCAC, 0xA9C3, 0xA9C8, 0xA9C6, 0xCCA3, /* 0x10 */
-         0, 0xCC7C, 0xCCA5, 0xA9CD, 0xCCB0, 0xABE4, 0xCCA6,      0, /* 0x10 */
-    0xABE5, 0xA9C9, 0xCCA8,      0, 0xCECD, 0xABE6, 0xCC7B, 0xA9CA, /* 0x20 */
+         0, 0xCC7C, 0xCCA5, 0xA9CD, 0xCCB0, 0xABE4, 0xCCA6, 	 0, /* 0x10 */
+    0xABE5, 0xA9C9, 0xCCA8, 	 0, 0xCECD, 0xABE6, 0xCC7B, 0xA9CA, /* 0x20 */
     0xABE8, 0xA9CB, 0xA9C7, 0xA9CC, 0xCCA7, 0xCC7A, 0xCCAB, 0xA9C4, /* 0x20 */
-         0,      0, 0xCC7D, 0xCCA4, 0xCCA1, 0xA9C5,      0, 0xCEBF, /* 0x30 */
-         0, 0xCEC0,      0,      0,      0,      0,      0,      0, /* 0x30 */
+         0, 	 0, 0xCC7D, 0xCCA4, 0xCCA1, 0xA9C5, 	 0, 0xCEBF, /* 0x30 */
+         0, 0xCEC0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
     0xCECA, 0xD1A1, 0xCECB, 0xABEE, 0xCECE, 0xCEC4, 0xABED, 0xCEC6, /* 0x40 */
-         0, 0xCEC7,      0,      0, 0xCEC9, 0xABE9,      0,      0, /* 0x40 */
-    0xAEA3,      0, 0xF9DA, 0xCEC5, 0xCEC1, 0xAEA4,      0,      0, /* 0x50 */
-    0xCECF, 0xAE7E, 0xD17D, 0xCEC8,      0, 0xD17C, 0xCEC3, 0xCECC, /* 0x50 */
-         0,      0, 0xABEC, 0xAEA1, 0xABF2, 0xAEA2, 0xCED0, 0xD17E, /* 0x60 */
+         0, 0xCEC7, 	 0, 	 0, 0xCEC9, 0xABE9, 	 0, 	 0, /* 0x40 */
+    0xAEA3, 	 0, 0xF9DA, 0xCEC5, 0xCEC1, 0xAEA4, 	 0, 	 0, /* 0x50 */
+    0xCECF, 0xAE7E, 0xD17D, 0xCEC8, 	 0, 0xD17C, 0xCEC3, 0xCECC, /* 0x50 */
+         0, 	 0, 0xABEC, 0xAEA1, 0xABF2, 0xAEA2, 0xCED0, 0xD17E, /* 0x60 */
     0xABEB, 0xAEA6, 0xABF1, 0xABF0, 0xABEF, 0xAEA5, 0xCED1, 0xAEA7, /* 0x60 */
-    0xABEA,      0, 0xCEC2,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0, 0xB176, /* 0x70 */
-    0xD1A4, 0xD1A6,      0, 0xD1A8, 0xAEA8, 0xAEAE, 0xD553, 0xD1AC, /* 0x80 */
-    0xD1A3, 0xB178, 0xD551,      0, 0xAEAD, 0xAEAB, 0xD1AE,      0, /* 0x80 */
-    0xD552,      0, 0xD1A5,      0, 0xAEAC, 0xD1A9, 0xAEAF, 0xD1AB, /* 0x90 */
-         0,      0, 0xAEAA, 0xD1AA, 0xD1AD, 0xD1A7,      0, 0xAEA9, /* 0x90 */
-    0xB179,      0, 0xD1A2, 0xB177,      0,      0,      0,      0, /* 0xA0 */
-    0xB17A,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xD555, 0xD55E, 0xB464,      0, 0xB17C, 0xB1A3, 0xB465, 0xD560, /* 0xB0 */
+    0xABEA, 	 0, 0xCEC2, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB176, /* 0x70 */
+    0xD1A4, 0xD1A6, 	 0, 0xD1A8, 0xAEA8, 0xAEAE, 0xD553, 0xD1AC, /* 0x80 */
+    0xD1A3, 0xB178, 0xD551, 	 0, 0xAEAD, 0xAEAB, 0xD1AE, 	 0, /* 0x80 */
+    0xD552, 	 0, 0xD1A5, 	 0, 0xAEAC, 0xD1A9, 0xAEAF, 0xD1AB, /* 0x90 */
+         0, 	 0, 0xAEAA, 0xD1AA, 0xD1AD, 0xD1A7, 	 0, 0xAEA9, /* 0x90 */
+    0xB179, 	 0, 0xD1A2, 0xB177, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xB17A, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xD555, 0xD55E, 0xB464, 	 0, 0xB17C, 0xB1A3, 0xB465, 0xD560, /* 0xB0 */
     0xB1AA, 0xD8F9, 0xD556, 0xB1A2, 0xB1A5, 0xB17E, 0xD554, 0xD562, /* 0xB0 */
-    0xD565, 0xD949,      0, 0xD563, 0xD8FD, 0xB1A1, 0xB1A8, 0xB1AC, /* 0xC0 */
+    0xD565, 0xD949, 	 0, 0xD563, 0xD8FD, 0xB1A1, 0xB1A8, 0xB1AC, /* 0xC0 */
     0xD55D, 0xD8F8, 0xD561, 0xB17B, 0xD8FA, 0xD564, 0xD8FC, 0xD559, /* 0xC0 */
-         0, 0xB462,      0, 0xD557, 0xD558, 0xB1A7,      0,      0, /* 0xD0 */
-    0xB1A6, 0xD55B, 0xB1AB, 0xD55F, 0xB1A4, 0xD55C,      0, 0xB1A9, /* 0xD0 */
-    0xB466, 0xB463, 0xD8FB,      0, 0xD55A,      0, 0xB17D,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
+         0, 0xB462, 	 0, 0xD557, 0xD558, 0xB1A7, 	 0, 	 0, /* 0xD0 */
+    0xB1A6, 0xD55B, 0xB1AB, 0xD55F, 0xB1A4, 0xD55C, 	 0, 0xB1A9, /* 0xD0 */
+    0xB466, 0xB463, 0xD8FB, 	 0, 0xD55A, 	 0, 0xB17D, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
     0xB46B, 0xB46F, 0xD940, 0xB751, 0xB46D, 0xD944, 0xB471, 0xDD65, /* 0xF0 */
-    0xD946, 0xB753, 0xB469, 0xB46C, 0xD947,      0, 0xD948, 0xD94E  /* 0xF0 */
+    0xD946, 0xB753, 0xB469, 0xB46C, 0xD947, 	 0, 0xD948, 0xD94E	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_61[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xB473, 0xB754,      0, 0xD94A, 0xD94F, 0xD943, 0xB75E,      0, /* 0x00 */
-    0xB755, 0xB472, 0xD941, 0xD950,      0, 0xB75D, 0xB470, 0xB74E, /* 0x00 */
-    0xD94D,      0, 0xB474, 0xD945, 0xD8FE, 0xB46A, 0xD942,      0, /* 0x10 */
-    0xD94B,      0, 0xB74D, 0xB752, 0xB467, 0xD94C,      0, 0xB750, /* 0x10 */
-         0,      0,      0, 0xB468,      0,      0,      0, 0xB75C, /* 0x20 */
-    0xE1C3, 0xDD70,      0, 0xDD68, 0xE1C2,      0, 0xDD6C, 0xDD6E, /* 0x20 */
-         0,      0, 0xDD6B,      0, 0xB75B,      0, 0xDD6A, 0xB75F, /* 0x30 */
-         0,      0,      0, 0xE1D2,      0,      0, 0xB75A, 0xBA40, /* 0x30 */
-    0xDD71, 0xE1C4,      0,      0, 0xB758, 0xDD69, 0xDD6D, 0xB9FE, /* 0x40 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xB473, 0xB754, 	 0, 0xD94A, 0xD94F, 0xD943, 0xB75E, 	 0, /* 0x00 */
+    0xB755, 0xB472, 0xD941, 0xD950, 	 0, 0xB75D, 0xB470, 0xB74E, /* 0x00 */
+    0xD94D, 	 0, 0xB474, 0xD945, 0xD8FE, 0xB46A, 0xD942, 	 0, /* 0x10 */
+    0xD94B, 	 0, 0xB74D, 0xB752, 0xB467, 0xD94C, 	 0, 0xB750, /* 0x10 */
+         0, 	 0, 	 0, 0xB468, 	 0, 	 0, 	 0, 0xB75C, /* 0x20 */
+    0xE1C3, 0xDD70, 	 0, 0xDD68, 0xE1C2, 	 0, 0xDD6C, 0xDD6E, /* 0x20 */
+         0, 	 0, 0xDD6B, 	 0, 0xB75B, 	 0, 0xDD6A, 0xB75F, /* 0x30 */
+         0, 	 0, 	 0, 0xE1D2, 	 0, 	 0, 0xB75A, 0xBA40, /* 0x30 */
+    0xDD71, 0xE1C4, 	 0, 	 0, 0xB758, 0xDD69, 0xDD6D, 0xB9FE, /* 0x40 */
     0xB74F, 0xDD66, 0xDD67, 0xBA41, 0xB757, 0xB759, 0xB756, 0xDD6F, /* 0x40 */
-         0,      0, 0xE1C8, 0xE1C9, 0xE1CE, 0xBC7D, 0xE1D5,      0, /* 0x50 */
-    0xBA47,      0, 0xBA46, 0xE1D0,      0, 0xBC7C, 0xE1C5, 0xBA45, /* 0x50 */
-         0, 0xE1D4, 0xBA43, 0xBA44,      0, 0xE1D1, 0xE5AA, 0xBC7A, /* 0x60 */
-    0xB46E,      0, 0xE1D3, 0xBCA3, 0xE1CB,      0, 0xBC7B,      0, /* 0x60 */
+         0, 	 0, 0xE1C8, 0xE1C9, 0xE1CE, 0xBC7D, 0xE1D5, 	 0, /* 0x50 */
+    0xBA47, 	 0, 0xBA46, 0xE1D0, 	 0, 0xBC7C, 0xE1C5, 0xBA45, /* 0x50 */
+         0, 0xE1D4, 0xBA43, 0xBA44, 	 0, 0xE1D1, 0xE5AA, 0xBC7A, /* 0x60 */
+    0xB46E, 	 0, 0xE1D3, 0xBCA3, 0xE1CB, 	 0, 0xBC7B, 	 0, /* 0x60 */
     0xBCA2, 0xE1C6, 0xE1CA, 0xE1C7, 0xE1CD, 0xBA48, 0xBC79, 0xBA42, /* 0x70 */
-         0, 0xE57A, 0xE1CF,      0, 0xBCA1,      0, 0xBCA4,      0, /* 0x70 */
-    0xE1CC,      0, 0xBC7E, 0xE579,      0,      0,      0,      0, /* 0x80 */
-         0, 0xE57E, 0xBECE, 0xE578, 0xE9A3, 0xE5A9, 0xBCA8,      0, /* 0x80 */
-    0xBCA6, 0xBECC, 0xE5A6, 0xE5A2, 0xBCAC,      0, 0xE978,      0, /* 0x90 */
-         0,      0, 0xBCAA, 0xE5A1,      0, 0xE976,      0, 0xE5A5, /* 0x90 */
-         0, 0xE5A8, 0xE57D,      0, 0xBCAB,      0,      0, 0xBCA5, /* 0xA0 */
+         0, 0xE57A, 0xE1CF, 	 0, 0xBCA1, 	 0, 0xBCA4, 	 0, /* 0x70 */
+    0xE1CC, 	 0, 0xBC7E, 0xE579, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 0xE57E, 0xBECE, 0xE578, 0xE9A3, 0xE5A9, 0xBCA8, 	 0, /* 0x80 */
+    0xBCA6, 0xBECC, 0xE5A6, 0xE5A2, 0xBCAC, 	 0, 0xE978, 	 0, /* 0x90 */
+         0, 	 0, 0xBCAA, 0xE5A1, 	 0, 0xE976, 	 0, 0xE5A5, /* 0x90 */
+         0, 0xE5A8, 0xE57D, 	 0, 0xBCAB, 	 0, 	 0, 0xBCA5, /* 0xA0 */
     0xE977, 0xBECD, 0xE5A7, 0xBCA7, 0xBCA9, 0xE5A4, 0xBCAD, 0xE5A3, /* 0xA0 */
-    0xE57C, 0xE57B, 0xBECB, 0xE5AB, 0xE97A, 0xECE0, 0xBED0,      0, /* 0xB0 */
-    0xE9A2,      0, 0xE97E,      0, 0xECE1,      0, 0xBED1, 0xE9A1, /* 0xB0 */
-         0, 0xE97C, 0xC0B4, 0xECDF,      0, 0xE979, 0xE97B, 0xC0B5, /* 0xC0 */
-    0xBED3, 0xC0B3, 0xBED2, 0xC0B7, 0xE97D, 0xBECF,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0, 0xEFCF,      0, /* 0xD0 */
-    0xEFC7,      0,      0,      0,      0,      0, 0xECE7, 0xEFC8, /* 0xD0 */
-    0xECE3,      0,      0, 0xC256, 0xECE5, 0xECE4, 0xC0B6, 0xECE2, /* 0xE0 */
-    0xECE6, 0xEFD0, 0xEFCC, 0xEFCE,      0, 0xEFC9, 0xEFCA,      0, /* 0xE0 */
-    0xEFCD, 0xEFCB, 0xC367,      0,      0, 0xC36A, 0xC369, 0xC368, /* 0xF0 */
-    0xC461, 0xF44A, 0xC462, 0xF241, 0xC4DF, 0xF5CC, 0xC4E0, 0xC574  /* 0xF0 */
+    0xE57C, 0xE57B, 0xBECB, 0xE5AB, 0xE97A, 0xECE0, 0xBED0, 	 0, /* 0xB0 */
+    0xE9A2, 	 0, 0xE97E, 	 0, 0xECE1, 	 0, 0xBED1, 0xE9A1, /* 0xB0 */
+         0, 0xE97C, 0xC0B4, 0xECDF, 	 0, 0xE979, 0xE97B, 0xC0B5, /* 0xC0 */
+    0xBED3, 0xC0B3, 0xBED2, 0xC0B7, 0xE97D, 0xBECF, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEFCF, 	 0, /* 0xD0 */
+    0xEFC7, 	 0, 	 0, 	 0, 	 0, 	 0, 0xECE7, 0xEFC8, /* 0xD0 */
+    0xECE3, 	 0, 	 0, 0xC256, 0xECE5, 0xECE4, 0xC0B6, 0xECE2, /* 0xE0 */
+    0xECE6, 0xEFD0, 0xEFCC, 0xEFCE, 	 0, 0xEFC9, 0xEFCA, 	 0, /* 0xE0 */
+    0xEFCD, 0xEFCB, 0xC367, 	 0, 	 0, 0xC36A, 0xC369, 0xC368, /* 0xF0 */
+    0xC461, 0xF44A, 0xC462, 0xF241, 0xC4DF, 0xF5CC, 0xC4E0, 0xC574	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_62[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xC5CA, 0xF7D9,      0, 0xF7DA, 0xF7DB,      0,      0, 0xF9BA, /* 0x00 */
-    0xA4E0, 0xC97C, 0xA5B3,      0, 0xA6A6, 0xA6A7, 0xA6A5,      0, /* 0x00 */
-    0xA6A8, 0xA7DA, 0xA7D9,      0, 0xCCB1, 0xA9CF, 0xA9CE,      0, /* 0x10 */
-         0, 0xD1AF, 0xB1AD, 0xB1AE,      0,      0,      0, 0xB475, /* 0x10 */
-    0xDD72, 0xB760, 0xB761, 0xDD74, 0xDD76, 0xDD75,      0, 0xE1D7, /* 0x20 */
-         0, 0xE1D6, 0xBA49, 0xE1D8,      0, 0xE5AC, 0xBCAE,      0, /* 0x20 */
-    0xBED4,      0, 0xC0B8, 0xC257, 0xC0B9,      0, 0xA4E1,      0, /* 0x30 */
-         0,      0, 0xCAE6,      0,      0, 0xCCB2, 0xA9D1, 0xA9D0, /* 0x30 */
-    0xA9D2, 0xABF3, 0xCED2, 0xCED3,      0,      0, 0xD1B0, 0xAEB0, /* 0x40 */
-    0xB1AF, 0xB476, 0xD951, 0xA4E2,      0, 0xA47E, 0xA4E3,      0, /* 0x40 */
-    0xC97D, 0xA5B7, 0xA5B6, 0xA5B4, 0xA5B5,      0,      0,      0, /* 0x50 */
-    0xA6AB, 0xC9E9, 0xC9EB, 0xA6AA, 0xC9E3,      0, 0xC9E4,      0, /* 0x50 */
-    0xC9EA, 0xC9E6, 0xC9E8, 0xA6A9, 0xC9E5, 0xC9EC, 0xC9E7,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xA7E1, 0xA7EA, 0xA7E8, /* 0x60 */
-    0xCAF0, 0xCAED, 0xCAF5, 0xA7E6, 0xCAF6,      0, 0xA7DF, 0xCAF3, /* 0x70 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xC5CA, 0xF7D9, 	 0, 0xF7DA, 0xF7DB, 	 0, 	 0, 0xF9BA, /* 0x00 */
+    0xA4E0, 0xC97C, 0xA5B3, 	 0, 0xA6A6, 0xA6A7, 0xA6A5, 	 0, /* 0x00 */
+    0xA6A8, 0xA7DA, 0xA7D9, 	 0, 0xCCB1, 0xA9CF, 0xA9CE, 	 0, /* 0x10 */
+         0, 0xD1AF, 0xB1AD, 0xB1AE, 	 0, 	 0, 	 0, 0xB475, /* 0x10 */
+    0xDD72, 0xB760, 0xB761, 0xDD74, 0xDD76, 0xDD75, 	 0, 0xE1D7, /* 0x20 */
+         0, 0xE1D6, 0xBA49, 0xE1D8, 	 0, 0xE5AC, 0xBCAE, 	 0, /* 0x20 */
+    0xBED4, 	 0, 0xC0B8, 0xC257, 0xC0B9, 	 0, 0xA4E1, 	 0, /* 0x30 */
+         0, 	 0, 0xCAE6, 	 0, 	 0, 0xCCB2, 0xA9D1, 0xA9D0, /* 0x30 */
+    0xA9D2, 0xABF3, 0xCED2, 0xCED3, 	 0, 	 0, 0xD1B0, 0xAEB0, /* 0x40 */
+    0xB1AF, 0xB476, 0xD951, 0xA4E2, 	 0, 0xA47E, 0xA4E3, 	 0, /* 0x40 */
+    0xC97D, 0xA5B7, 0xA5B6, 0xA5B4, 0xA5B5, 	 0, 	 0, 	 0, /* 0x50 */
+    0xA6AB, 0xC9E9, 0xC9EB, 0xA6AA, 0xC9E3, 	 0, 0xC9E4, 	 0, /* 0x50 */
+    0xC9EA, 0xC9E6, 0xC9E8, 0xA6A9, 0xC9E5, 0xC9EC, 0xC9E7, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xA7E1, 0xA7EA, 0xA7E8, /* 0x60 */
+    0xCAF0, 0xCAED, 0xCAF5, 0xA7E6, 0xCAF6, 	 0, 0xA7DF, 0xCAF3, /* 0x70 */
          0, 0xA7E5, 0xCAEF, 0xCAEE, 0xA7E3, 0xCAF4, 0xA7E4, 0xA9D3, /* 0x70 */
-    0xA7DE, 0xCAF1,      0, 0xCAE7, 0xA7DB,      0, 0xA7EE, 0xCAEC, /* 0x80 */
-    0xCAF2, 0xA7E0, 0xA7E2,      0, 0xCAE8,      0, 0xCAE9, 0xCAEA, /* 0x80 */
+    0xA7DE, 0xCAF1, 	 0, 0xCAE7, 0xA7DB, 	 0, 0xA7EE, 0xCAEC, /* 0x80 */
+    0xCAF2, 0xA7E0, 0xA7E2, 	 0, 0xCAE8, 	 0, 0xCAE9, 0xCAEA, /* 0x80 */
          0, 0xA7ED, 0xA7E7, 0xA7EC, 0xCAEB, 0xA7EB, 0xA7DD, 0xA7DC, /* 0x90 */
-    0xA7E9,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
+    0xA7E9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
     0xA9E1, 0xCCBE, 0xCCB7, 0xA9DC, 0xA9EF, 0xCCB3, 0xCCBA, 0xCCBC, /* 0xA0 */
-    0xCCBF, 0xA9EA,      0, 0xCCBB, 0xCCB4, 0xA9E8, 0xCCB8,      0, /* 0xB0 */
-    0xCCC0, 0xA9D9,      0, 0xCCBD, 0xA9E3, 0xA9E2, 0xCCB6, 0xA9D7, /* 0xB0 */
-         0,      0, 0xA9D8,      0, 0xA9D6,      0, 0xA9EE, 0xA9E6, /* 0xC0 */
+    0xCCBF, 0xA9EA, 	 0, 0xCCBB, 0xCCB4, 0xA9E8, 0xCCB8, 	 0, /* 0xB0 */
+    0xCCC0, 0xA9D9, 	 0, 0xCCBD, 0xA9E3, 0xA9E2, 0xCCB6, 0xA9D7, /* 0xB0 */
+         0, 	 0, 0xA9D8, 	 0, 0xA9D6, 	 0, 0xA9EE, 0xA9E6, /* 0xC0 */
     0xA9E0, 0xA9D4, 0xCCB9, 0xA9DF, 0xA9D5, 0xA9E7, 0xA9F0, 0xCED4, /* 0xC0 */
-    0xA9E4, 0xCCB5, 0xA9DA, 0xA9DD, 0xA9DE,      0, 0xA9EC, 0xA9ED, /* 0xD0 */
-    0xA9EB, 0xA9E5, 0xA9E9, 0xA9DB, 0xABF4,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xCEDA, 0xAC41, 0xABF8, 0xABFA, 0xAC40, /* 0xE0 */
+    0xA9E4, 0xCCB5, 0xA9DA, 0xA9DD, 0xA9DE, 	 0, 0xA9EC, 0xA9ED, /* 0xD0 */
+    0xA9EB, 0xA9E5, 0xA9E9, 0xA9DB, 0xABF4, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xCEDA, 0xAC41, 0xABF8, 0xABFA, 0xAC40, /* 0xE0 */
     0xCEE6, 0xABFD, 0xD1B1, 0xAEB1, 0xAC43, 0xCED7, 0xCEDF, 0xABFE, /* 0xF0 */
-    0xCEDE, 0xCEDB, 0xCEE3, 0xCEE5, 0xABF7, 0xABFB, 0xAC42, 0xAEB3  /* 0xF0 */
+    0xCEDE, 0xCEDB, 0xCEE3, 0xCEE5, 0xABF7, 0xABFB, 0xAC42, 0xAEB3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_63[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xCEE0, 0xABF9, 0xAC45, 0xCED9,      0,      0,      0, 0xABFC, /* 0x00 */
-    0xAEB2, 0xABF6,      0, 0xCED6, 0xCEDD, 0xCED5, 0xCED8, 0xCEDC, /* 0x00 */
-    0xD1B2, 0xAC44,      0, 0xCEE1, 0xCEE2, 0xCEE4, 0xABF5,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xAEC1, 0xD1BE, 0xAEBF, 0xAEC0, 0xD1B4, 0xD1C4,      0, 0xAEB6, /* 0x20 */
-         0,      0, 0xD566, 0xD1C6, 0xD1C0,      0, 0xD1B7,      0, /* 0x30 */
-    0xD1C9, 0xD1BA, 0xAEBC, 0xD57D, 0xD1BD, 0xAEBE, 0xAEB5,      0, /* 0x30 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xCEE0, 0xABF9, 0xAC45, 0xCED9, 	 0, 	 0, 	 0, 0xABFC, /* 0x00 */
+    0xAEB2, 0xABF6, 	 0, 0xCED6, 0xCEDD, 0xCED5, 0xCED8, 0xCEDC, /* 0x00 */
+    0xD1B2, 0xAC44, 	 0, 0xCEE1, 0xCEE2, 0xCEE4, 0xABF5, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xAEC1, 0xD1BE, 0xAEBF, 0xAEC0, 0xD1B4, 0xD1C4, 	 0, 0xAEB6, /* 0x20 */
+         0, 	 0, 0xD566, 0xD1C6, 0xD1C0, 	 0, 0xD1B7, 	 0, /* 0x30 */
+    0xD1C9, 0xD1BA, 0xAEBC, 0xD57D, 0xD1BD, 0xAEBE, 0xAEB5, 	 0, /* 0x30 */
     0xD1CB, 0xD1BF, 0xAEB8, 0xD1B8, 0xD1B5, 0xD1B6, 0xAEB9, 0xD1C5, /* 0x40 */
     0xD1CC, 0xAEBB, 0xD1BC, 0xD1BB, 0xAEC3, 0xAEC2, 0xAEB4, 0xAEBA, /* 0x40 */
-    0xAEBD, 0xD1C8,      0,      0, 0xD1C2, 0xAEB7, 0xD1B3, 0xD1CA, /* 0x50 */
-    0xD1C1, 0xD1C3, 0xD1C7,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0, 0xD567,      0, 0xB1B7, /* 0x60 */
-    0xB1CB, 0xB1CA,      0, 0xB1BF,      0, 0xD579, 0xD575, 0xD572, /* 0x60 */
-    0xD5A6, 0xB1BA, 0xB1B2,      0,      0, 0xD577, 0xB4A8, 0xB1B6, /* 0x70 */
-    0xD5A1,      0, 0xB1CC, 0xB1C9, 0xD57B, 0xD56A,      0,      0, /* 0x70 */
-    0xB1C8, 0xD5A3, 0xD569, 0xB1BD, 0xB1C1, 0xD5A2,      0, 0xD573, /* 0x80 */
-    0xB1C2, 0xB1BC, 0xD568,      0, 0xB478, 0xD5A5, 0xD571, 0xB1C7, /* 0x80 */
-    0xD574, 0xD5A4, 0xB1C6,      0, 0xD952,      0, 0xB1B3, 0xD56F, /* 0x90 */
-    0xB1B8, 0xB1C3,      0, 0xB1BE, 0xD578, 0xD56E, 0xD56C, 0xD57E, /* 0x90 */
-    0xB1B0, 0xB1C4, 0xB1B4, 0xB477, 0xD57C, 0xB1B5,      0, 0xB1B1, /* 0xA0 */
+    0xAEBD, 0xD1C8, 	 0, 	 0, 0xD1C2, 0xAEB7, 0xD1B3, 0xD1CA, /* 0x50 */
+    0xD1C1, 0xD1C3, 0xD1C7, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD567, 	 0, 0xB1B7, /* 0x60 */
+    0xB1CB, 0xB1CA, 	 0, 0xB1BF, 	 0, 0xD579, 0xD575, 0xD572, /* 0x60 */
+    0xD5A6, 0xB1BA, 0xB1B2, 	 0, 	 0, 0xD577, 0xB4A8, 0xB1B6, /* 0x70 */
+    0xD5A1, 	 0, 0xB1CC, 0xB1C9, 0xD57B, 0xD56A, 	 0, 	 0, /* 0x70 */
+    0xB1C8, 0xD5A3, 0xD569, 0xB1BD, 0xB1C1, 0xD5A2, 	 0, 0xD573, /* 0x80 */
+    0xB1C2, 0xB1BC, 0xD568, 	 0, 0xB478, 0xD5A5, 0xD571, 0xB1C7, /* 0x80 */
+    0xD574, 0xD5A4, 0xB1C6, 	 0, 0xD952, 	 0, 0xB1B3, 0xD56F, /* 0x90 */
+    0xB1B8, 0xB1C3, 	 0, 0xB1BE, 0xD578, 0xD56E, 0xD56C, 0xD57E, /* 0x90 */
+    0xB1B0, 0xB1C4, 0xB1B4, 0xB477, 0xD57C, 0xB1B5, 	 0, 0xB1B1, /* 0xA0 */
     0xB1C0, 0xB1BB, 0xB1B9, 0xD570, 0xB1C5, 0xD56D, 0xD57A, 0xD576, /* 0xA0 */
-    0xD954, 0xD953,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xD56B, 0xD964,      0, /* 0xB0 */
-    0xB47A,      0, 0xD96A, 0xD959, 0xD967, 0xDD77, 0xB47D, 0xD96B, /* 0xC0 */
+    0xD954, 0xD953, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD56B, 0xD964, 	 0, /* 0xB0 */
+    0xB47A, 	 0, 0xD96A, 0xD959, 0xD967, 0xDD77, 0xB47D, 0xD96B, /* 0xC0 */
     0xD96E, 0xB47C, 0xD95C, 0xD96D, 0xD96C, 0xB47E, 0xD955, 0xB479, /* 0xC0 */
-    0xB4A3,      0, 0xB4A1, 0xD969,      0, 0xD95F, 0xB4A5, 0xD970, /* 0xD0 */
-    0xD968, 0xD971, 0xB4AD, 0xB4AB, 0xD966, 0xD965,      0, 0xD963, /* 0xD0 */
-    0xD95D, 0xB4A4,      0, 0xB4A2, 0xD1B9, 0xD956,      0, 0xDDB7, /* 0xE0 */
-    0xD957, 0xB47B, 0xB4AA, 0xDD79,      0, 0xB4A6, 0xB4A7, 0xD958, /* 0xE0 */
-    0xD96F, 0xDD78, 0xD960, 0xD95B, 0xB4A9, 0xD961, 0xD95E,      0, /* 0xF0 */
-         0, 0xB4AE                                                  /* 0xF0 */
+    0xB4A3, 	 0, 0xB4A1, 0xD969, 	 0, 0xD95F, 0xB4A5, 0xD970, /* 0xD0 */
+    0xD968, 0xD971, 0xB4AD, 0xB4AB, 0xD966, 0xD965, 	 0, 0xD963, /* 0xD0 */
+    0xD95D, 0xB4A4, 	 0, 0xB4A2, 0xD1B9, 0xD956, 	 0, 0xDDB7, /* 0xE0 */
+    0xD957, 0xB47B, 0xB4AA, 0xDD79, 	 0, 0xB4A6, 0xB4A7, 0xD958, /* 0xE0 */
+    0xD96F, 0xDD78, 0xD960, 0xD95B, 0xB4A9, 0xD961, 0xD95E, 	 0, /* 0xF0 */
+         0, 0xB4AE													/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_64[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0xB770,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0xB770, 	 0, /* 0x00 */
          0, 0xDD7C, 0xDDB1, 0xDDB6, 0xDDAA, 0xB76C, 0xDDBB, 0xB769, /* 0x00 */
-    0xDD7A,      0, 0xDD7B, 0xB762, 0xB76B, 0xDDA4, 0xB76E, 0xB76F, /* 0x10 */
-    0xDDA5,      0, 0xDDB2, 0xDDB8, 0xB76A,      0, 0xB764, 0xDDA3, /* 0x10 */
+    0xDD7A, 	 0, 0xDD7B, 0xB762, 0xB76B, 0xDDA4, 0xB76E, 0xB76F, /* 0x10 */
+    0xDDA5, 	 0, 0xDDB2, 0xDDB8, 0xB76A, 	 0, 0xB764, 0xDDA3, /* 0x10 */
     0xDD7D, 0xDDBA, 0xDDA8, 0xDDA9, 0xDD7E, 0xDDB4, 0xDDAB, 0xDDB5, /* 0x20 */
-    0xDDAD,      0, 0xB765, 0xE1D9, 0xB768, 0xB766, 0xDDB9, 0xDDB0, /* 0x20 */
-    0xDDAC,      0,      0, 0xDDA1, 0xBA53, 0xDDAF, 0xB76D, 0xDDA7, /* 0x30 */
-         0, 0xDDA6,      0,      0,      0, 0xB767, 0xB763, 0xE1EE, /* 0x30 */
-    0xDDB3, 0xDDAE,      0, 0xDDA2,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0, 0xE1E9,      0, 0xE1DA, 0xE1E5,      0, /* 0x40 */
-    0xE1EC, 0xBA51, 0xB4AC, 0xE1EA, 0xBA4C,      0,      0,      0, /* 0x50 */
-    0xBA4B, 0xE1F1,      0, 0xE1DB, 0xE1E8, 0xE1DC, 0xE1E7, 0xBA4F, /* 0x50 */
-    0xE1EB, 0xD962,      0,      0,      0, 0xE1F2, 0xE1E3, 0xBA52, /* 0x60 */
-    0xE5BA, 0xBCAF,      0, 0xE1F0, 0xE1EF, 0xBA54, 0xE5AD, 0xBCB0, /* 0x60 */
-    0xE5AE,      0, 0xE1DF, 0xE1E0, 0xE1DD, 0xE1E2, 0xE1DE, 0xE1F3, /* 0x70 */
-    0xBA4E, 0xBCB1, 0xBA50, 0xBA55,      0, 0xE1E1,      0, 0xE1ED, /* 0x70 */
-         0,      0, 0xE1E6,      0,      0, 0xE5B1,      0, 0xBA4A, /* 0x80 */
-    0xBCB4, 0xE9AA, 0xE5B6, 0xE5B5, 0xE5B7,      0,      0, 0xE5B4, /* 0x80 */
-    0xBCB5,      0, 0xBCBB, 0xBCB8,      0, 0xBCB9, 0xE5AF, 0xE5B2, /* 0x90 */
-    0xE5BC, 0xBCC1, 0xBCBF,      0, 0xE5B3, 0xD95A, 0xBCB2, 0xE5B9, /* 0x90 */
-    0xE5B0,      0, 0xBCC2, 0xE5B8, 0xBA4D, 0xBCB7, 0xE1E4,      0, /* 0xA0 */
-         0, 0xBCBA,      0, 0xBCBE, 0xBCC0, 0xBCBD, 0xBCBC,      0, /* 0xA0 */
-    0xBCB6, 0xE5BB, 0xBCB3, 0xBCC3,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0, 0xBED8, 0xBED9, 0xE9A9, 0xBEE2, 0xBEDF, /* 0xB0 */
-         0, 0xBED6, 0xBEDD, 0xE9AB, 0xBEDB, 0xBED5,      0, 0xBEDC, /* 0xC0 */
-         0, 0xE9A8, 0xC0BB, 0xBED7,      0, 0xBEDE, 0xC0BA, 0xE9A7, /* 0xC0 */
-    0xE9A6,      0, 0xBEE0,      0, 0xBEE1,      0, 0xE9A5, 0xE9A4, /* 0xD0 */
-    0xC0BC, 0xE9AE, 0xBEDA, 0xE9AC,      0,      0,      0,      0, /* 0xD0 */
-    0xC0BD,      0, 0xC0C2, 0xECEA, 0xECEC,      0, 0xC0BF,      0, /* 0xE0 */
-    0xECED, 0xECE9,      0, 0xECEB, 0xC0C0, 0xC0C3,      0, 0xECE8, /* 0xE0 */
-    0xC0BE, 0xC0C1, 0xC259, 0xE9AD, 0xC258,      0,      0, 0xC25E, /* 0xF0 */
-    0xEFD4,      0, 0xC25C, 0xC25D, 0xEFD7, 0xEFD3, 0xC25A, 0xEFD1  /* 0xF0 */
+    0xDDAD, 	 0, 0xB765, 0xE1D9, 0xB768, 0xB766, 0xDDB9, 0xDDB0, /* 0x20 */
+    0xDDAC, 	 0, 	 0, 0xDDA1, 0xBA53, 0xDDAF, 0xB76D, 0xDDA7, /* 0x30 */
+         0, 0xDDA6, 	 0, 	 0, 	 0, 0xB767, 0xB763, 0xE1EE, /* 0x30 */
+    0xDDB3, 0xDDAE, 	 0, 0xDDA2, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 0xE1E9, 	 0, 0xE1DA, 0xE1E5, 	 0, /* 0x40 */
+    0xE1EC, 0xBA51, 0xB4AC, 0xE1EA, 0xBA4C, 	 0, 	 0, 	 0, /* 0x50 */
+    0xBA4B, 0xE1F1, 	 0, 0xE1DB, 0xE1E8, 0xE1DC, 0xE1E7, 0xBA4F, /* 0x50 */
+    0xE1EB, 0xD962, 	 0, 	 0, 	 0, 0xE1F2, 0xE1E3, 0xBA52, /* 0x60 */
+    0xE5BA, 0xBCAF, 	 0, 0xE1F0, 0xE1EF, 0xBA54, 0xE5AD, 0xBCB0, /* 0x60 */
+    0xE5AE, 	 0, 0xE1DF, 0xE1E0, 0xE1DD, 0xE1E2, 0xE1DE, 0xE1F3, /* 0x70 */
+    0xBA4E, 0xBCB1, 0xBA50, 0xBA55, 	 0, 0xE1E1, 	 0, 0xE1ED, /* 0x70 */
+         0, 	 0, 0xE1E6, 	 0, 	 0, 0xE5B1, 	 0, 0xBA4A, /* 0x80 */
+    0xBCB4, 0xE9AA, 0xE5B6, 0xE5B5, 0xE5B7, 	 0, 	 0, 0xE5B4, /* 0x80 */
+    0xBCB5, 	 0, 0xBCBB, 0xBCB8, 	 0, 0xBCB9, 0xE5AF, 0xE5B2, /* 0x90 */
+    0xE5BC, 0xBCC1, 0xBCBF, 	 0, 0xE5B3, 0xD95A, 0xBCB2, 0xE5B9, /* 0x90 */
+    0xE5B0, 	 0, 0xBCC2, 0xE5B8, 0xBA4D, 0xBCB7, 0xE1E4, 	 0, /* 0xA0 */
+         0, 0xBCBA, 	 0, 0xBCBE, 0xBCC0, 0xBCBD, 0xBCBC, 	 0, /* 0xA0 */
+    0xBCB6, 0xE5BB, 0xBCB3, 0xBCC3, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 0xBED8, 0xBED9, 0xE9A9, 0xBEE2, 0xBEDF, /* 0xB0 */
+         0, 0xBED6, 0xBEDD, 0xE9AB, 0xBEDB, 0xBED5, 	 0, 0xBEDC, /* 0xC0 */
+         0, 0xE9A8, 0xC0BB, 0xBED7, 	 0, 0xBEDE, 0xC0BA, 0xE9A7, /* 0xC0 */
+    0xE9A6, 	 0, 0xBEE0, 	 0, 0xBEE1, 	 0, 0xE9A5, 0xE9A4, /* 0xD0 */
+    0xC0BC, 0xE9AE, 0xBEDA, 0xE9AC, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xC0BD, 	 0, 0xC0C2, 0xECEA, 0xECEC, 	 0, 0xC0BF, 	 0, /* 0xE0 */
+    0xECED, 0xECE9, 	 0, 0xECEB, 0xC0C0, 0xC0C3, 	 0, 0xECE8, /* 0xE0 */
+    0xC0BE, 0xC0C1, 0xC259, 0xE9AD, 0xC258, 	 0, 	 0, 0xC25E, /* 0xF0 */
+    0xEFD4, 	 0, 0xC25C, 0xC25D, 0xEFD7, 0xEFD3, 0xC25A, 0xEFD1	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_65[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xC36B, 0xEFD5,      0, 0xEFD6, 0xEFD2,      0, 0xC25B, 0xF242, /* 0x00 */
-         0, 0xF245,      0,      0, 0xF246, 0xF244, 0xF247, 0xC36C, /* 0x00 */
-    0xF243,      0,      0, 0xF44E, 0xC464, 0xF44D, 0xF44C, 0xF44B, /* 0x10 */
-    0xC463, 0xC465,      0, 0xF5CD, 0xC4E2, 0xC4E1,      0,      0, /* 0x10 */
-    0xF6E1, 0xF6E0, 0xF6E3, 0xC5CB, 0xC575, 0xF7DD, 0xF6E2,      0, /* 0x20 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xC36B, 0xEFD5, 	 0, 0xEFD6, 0xEFD2, 	 0, 0xC25B, 0xF242, /* 0x00 */
+         0, 0xF245, 	 0, 	 0, 0xF246, 0xF244, 0xF247, 0xC36C, /* 0x00 */
+    0xF243, 	 0, 	 0, 0xF44E, 0xC464, 0xF44D, 0xF44C, 0xF44B, /* 0x10 */
+    0xC463, 0xC465, 	 0, 0xF5CD, 0xC4E2, 0xC4E1, 	 0, 	 0, /* 0x10 */
+    0xF6E1, 0xF6E0, 0xF6E3, 0xC5CB, 0xC575, 0xF7DD, 0xF6E2, 	 0, /* 0x20 */
          0, 0xF7DC, 0xC5CD, 0xC5CC, 0xC5F3, 0xF8A9, 0xF8EF, 0xA4E4, /* 0x20 */
-         0,      0, 0xD972, 0xE9AF,      0,      0, 0xA6AC, 0xCAF7, /* 0x30 */
-    0xA7F1, 0xA7EF,      0, 0xA7F0,      0, 0xCCC1, 0xA9F1, 0xAC46, /* 0x30 */
-         0, 0xCEE7,      0, 0xCEE8,      0, 0xAC47, 0xD1CE,      0, /* 0x40 */
-    0xAEC4, 0xAEC5, 0xD1CD,      0,      0,      0,      0, 0xB1D3, /* 0x40 */
-         0, 0xB1CF,      0, 0xD5A7, 0xB1D6, 0xB1D5, 0xB1CE, 0xB1D1, /* 0x50 */
-    0xB1D4, 0xB1D0,      0,      0, 0xD976, 0xB1CD, 0xB4AF,      0, /* 0x50 */
-         0,      0, 0xB4B1, 0xB4B2, 0xD975, 0xD978, 0xB4B0, 0xD973, /* 0x60 */
-    0xD977,      0, 0xD974,      0, 0xB771,      0,      0, 0xDDBC, /* 0x60 */
-         0,      0, 0xBA56, 0xE1F4, 0xBEE3, 0xBCC4, 0xE5BD, 0xBCC5, /* 0x70 */
-    0xBCC6, 0xE5BF, 0xE5BE, 0xE5C0, 0xE9B1,      0,      0, 0xE9B0, /* 0x70 */
-    0xECEF, 0xECEE, 0xC0C4, 0xC0C5, 0xF248,      0,      0, 0xA4E5, /* 0x80 */
-         0,      0,      0,      0, 0xD979,      0,      0,      0, /* 0x80 */
-    0xB4B4, 0xB4B3, 0xDDBD,      0, 0xEFD8, 0xC4E3, 0xF7DE, 0xA4E6, /* 0x90 */
-         0, 0xAEC6,      0, 0xB1D8, 0xB1D7, 0xD97A, 0xD97B, 0xB772, /* 0x90 */
-    0xE1F5, 0xBA57, 0xE9B2,      0, 0xA4E7, 0xA5B8,      0, 0xA9F2, /* 0xA0 */
-    0xCCC2,      0, 0xCEE9, 0xAC48, 0xB1D9,      0, 0xD97C, 0xB4B5, /* 0xA0 */
-    0xB773,      0, 0xE5C1, 0xE5C2,      0,      0, 0xECF0, 0xC25F, /* 0xB0 */
-    0xF8F0, 0xA4E8,      0, 0xCCC3, 0xA9F3, 0xAC49,      0, 0xCEEA, /* 0xB0 */
-         0, 0xAEC7, 0xD1D2, 0xD1D0, 0xD1D1, 0xAEC8, 0xD1CF,      0, /* 0xC0 */
-         0,      0,      0, 0xB1DB, 0xB1DC, 0xD5A8, 0xB1DD, 0xB1DA, /* 0xC0 */
-    0xD97D,      0, 0xD97E, 0xDDBE,      0,      0, 0xBA59, 0xBA58, /* 0xD0 */
-         0,      0, 0xECF1, 0xEFD9,      0, 0xF24A, 0xF249, 0xF44F, /* 0xD0 */
-         0, 0xC95E, 0xAC4A,      0,      0, 0xA4E9, 0xA5B9,      0, /* 0xE0 */
-    0xA6AE, 0xA6AD,      0,      0, 0xA6AF, 0xA6B0, 0xC9EE, 0xC9ED, /* 0xE0 */
-    0xCAF8, 0xA7F2, 0xCAFB, 0xCAFA, 0xCAF9, 0xCAFC,      0,      0, /* 0xF0 */
-         0,      0, 0xA9F4, 0xCCC9, 0xCCC5, 0xCCCE                  /* 0xF0 */
+         0, 	 0, 0xD972, 0xE9AF, 	 0, 	 0, 0xA6AC, 0xCAF7, /* 0x30 */
+    0xA7F1, 0xA7EF, 	 0, 0xA7F0, 	 0, 0xCCC1, 0xA9F1, 0xAC46, /* 0x30 */
+         0, 0xCEE7, 	 0, 0xCEE8, 	 0, 0xAC47, 0xD1CE, 	 0, /* 0x40 */
+    0xAEC4, 0xAEC5, 0xD1CD, 	 0, 	 0, 	 0, 	 0, 0xB1D3, /* 0x40 */
+         0, 0xB1CF, 	 0, 0xD5A7, 0xB1D6, 0xB1D5, 0xB1CE, 0xB1D1, /* 0x50 */
+    0xB1D4, 0xB1D0, 	 0, 	 0, 0xD976, 0xB1CD, 0xB4AF, 	 0, /* 0x50 */
+         0, 	 0, 0xB4B1, 0xB4B2, 0xD975, 0xD978, 0xB4B0, 0xD973, /* 0x60 */
+    0xD977, 	 0, 0xD974, 	 0, 0xB771, 	 0, 	 0, 0xDDBC, /* 0x60 */
+         0, 	 0, 0xBA56, 0xE1F4, 0xBEE3, 0xBCC4, 0xE5BD, 0xBCC5, /* 0x70 */
+    0xBCC6, 0xE5BF, 0xE5BE, 0xE5C0, 0xE9B1, 	 0, 	 0, 0xE9B0, /* 0x70 */
+    0xECEF, 0xECEE, 0xC0C4, 0xC0C5, 0xF248, 	 0, 	 0, 0xA4E5, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xD979, 	 0, 	 0, 	 0, /* 0x80 */
+    0xB4B4, 0xB4B3, 0xDDBD, 	 0, 0xEFD8, 0xC4E3, 0xF7DE, 0xA4E6, /* 0x90 */
+         0, 0xAEC6, 	 0, 0xB1D8, 0xB1D7, 0xD97A, 0xD97B, 0xB772, /* 0x90 */
+    0xE1F5, 0xBA57, 0xE9B2, 	 0, 0xA4E7, 0xA5B8, 	 0, 0xA9F2, /* 0xA0 */
+    0xCCC2, 	 0, 0xCEE9, 0xAC48, 0xB1D9, 	 0, 0xD97C, 0xB4B5, /* 0xA0 */
+    0xB773, 	 0, 0xE5C1, 0xE5C2, 	 0, 	 0, 0xECF0, 0xC25F, /* 0xB0 */
+    0xF8F0, 0xA4E8, 	 0, 0xCCC3, 0xA9F3, 0xAC49, 	 0, 0xCEEA, /* 0xB0 */
+         0, 0xAEC7, 0xD1D2, 0xD1D0, 0xD1D1, 0xAEC8, 0xD1CF, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xB1DB, 0xB1DC, 0xD5A8, 0xB1DD, 0xB1DA, /* 0xC0 */
+    0xD97D, 	 0, 0xD97E, 0xDDBE, 	 0, 	 0, 0xBA59, 0xBA58, /* 0xD0 */
+         0, 	 0, 0xECF1, 0xEFD9, 	 0, 0xF24A, 0xF249, 0xF44F, /* 0xD0 */
+         0, 0xC95E, 0xAC4A, 	 0, 	 0, 0xA4E9, 0xA5B9, 	 0, /* 0xE0 */
+    0xA6AE, 0xA6AD, 	 0, 	 0, 0xA6AF, 0xA6B0, 0xC9EE, 0xC9ED, /* 0xE0 */
+    0xCAF8, 0xA7F2, 0xCAFB, 0xCAFA, 0xCAF9, 0xCAFC, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xA9F4, 0xCCC9, 0xCCC5, 0xCCCE					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_66[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xA9FB,      0, 0xA9F9, 0xCCCA, 0xCCC6, 0xCCCD, 0xA9F8, 0xAA40, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xA9FB, 	 0, 0xA9F9, 0xCCCA, 0xCCC6, 0xCCCD, 0xA9F8, 0xAA40, /* 0x00 */
     0xCCC8, 0xCCC4, 0xA9FE, 0xCCCB, 0xA9F7, 0xCCCC, 0xA9FA, 0xA9FC, /* 0x00 */
-    0xCCD0, 0xCCCF, 0xCCC7, 0xA9F6, 0xA9F5, 0xA9FD,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0xCEEF, 0xCEF5,      0, 0xAC50, /* 0x10 */
-    0xAC4D, 0xCEEC, 0xCEF1,      0, 0xAC53, 0xAC4B, 0xCEF0, 0xAC4E, /* 0x20 */
-    0xAC51,      0,      0, 0xCEF3,      0, 0xAC4C, 0xCEF8, 0xAC4F, /* 0x20 */
-         0, 0xAC52, 0xCEED, 0xCEF2, 0xCEF6, 0xCEEE, 0xCEEB,      0, /* 0x30 */
-         0, 0xCEF7, 0xCEF4,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xAED0, 0xAEC9, 0xAECC,      0, 0xAECF,      0, 0xD1D5, /* 0x40 */
-         0, 0xAECA, 0xD1D3,      0, 0xAECE,      0,      0, 0xAECB, /* 0x40 */
-         0, 0xD1D6, 0xAECD,      0,      0,      0,      0,      0, /* 0x50 */
+    0xCCD0, 0xCCCF, 0xCCC7, 0xA9F6, 0xA9F5, 0xA9FD, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xCEEF, 0xCEF5, 	 0, 0xAC50, /* 0x10 */
+    0xAC4D, 0xCEEC, 0xCEF1, 	 0, 0xAC53, 0xAC4B, 0xCEF0, 0xAC4E, /* 0x20 */
+    0xAC51, 	 0, 	 0, 0xCEF3, 	 0, 0xAC4C, 0xCEF8, 0xAC4F, /* 0x20 */
+         0, 0xAC52, 0xCEED, 0xCEF2, 0xCEF6, 0xCEEE, 0xCEEB, 	 0, /* 0x30 */
+         0, 0xCEF7, 0xCEF4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xAED0, 0xAEC9, 0xAECC, 	 0, 0xAECF, 	 0, 0xD1D5, /* 0x40 */
+         0, 0xAECA, 0xD1D3, 	 0, 0xAECE, 	 0, 	 0, 0xAECB, /* 0x40 */
+         0, 0xD1D6, 0xAECD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
          0, 0xD5AC, 0xB1DF, 0xD5AB, 0xD5AD, 0xB1DE, 0xB1E3, 0xD1D4, /* 0x50 */
-         0, 0xD5AA, 0xD5AE,      0, 0xB1E0, 0xD5A9, 0xB1E2,      0, /* 0x60 */
-    0xB1E1,      0, 0xD9A7,      0, 0xD9A2,      0, 0xB4B6, 0xB4BA, /* 0x60 */
-    0xB4B7, 0xD9A5, 0xD9A8,      0, 0xB4B8,      0, 0xB4B9, 0xB4BE, /* 0x70 */
-    0xDDC7, 0xD9A6, 0xB4BC, 0xD9A3, 0xD9A1,      0, 0xB4BD,      0, /* 0x70 */
-    0xD9A4,      0,      0,      0, 0xB779,      0, 0xDDBF, 0xB776, /* 0x80 */
-    0xB777, 0xB775, 0xDDC4, 0xDDC3, 0xDDC0, 0xB77B,      0,      0, /* 0x80 */
-    0xDDC2, 0xB4BB,      0,      0, 0xDDC6, 0xDDC1, 0xB778, 0xB774, /* 0x90 */
-    0xB77A, 0xDDC5,      0,      0,      0, 0xBA5C,      0, 0xE1F8, /* 0x90 */
-    0xE1F7, 0xE1F6, 0xBA5A,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xBA5B, 0xE5C5, 0xE5C8, 0xBCC8,      0,      0, 0xBCC7, 0xE5C9, /* 0xA0 */
-    0xE5C4, 0xBCCA, 0xE5C6,      0, 0xBCC9, 0xE5C3,      0, 0xE5C7, /* 0xB0 */
-    0xBEE9, 0xBEE6, 0xE9BB, 0xE9BA,      0, 0xE9B9, 0xE9B4,      0, /* 0xB0 */
-    0xE9B5,      0,      0,      0, 0xBEE7,      0, 0xBEE4, 0xBEE8, /* 0xC0 */
-    0xE9B3, 0xBEE5, 0xE9B6, 0xE9B7, 0xE9BC,      0,      0, 0xE9B8, /* 0xC0 */
-         0,      0, 0xECF2,      0,      0,      0, 0xC0C7,      0, /* 0xD0 */
-    0xEFDC, 0xC0C6, 0xEFDA, 0xEFDB, 0xC260, 0xC36E, 0xF24B,      0, /* 0xD0 */
-    0xC36D,      0,      0, 0xF451, 0xF452,      0, 0xC466,      0, /* 0xE0 */
-    0xF450, 0xC4E4,      0, 0xF7DF, 0xC5CE, 0xF8AA, 0xF8AB,      0, /* 0xE0 */
-    0xA4EA,      0, 0xA6B1, 0xA6B2, 0xA7F3,      0, 0xCCD1, 0xAC54, /* 0xF0 */
-    0xAED1, 0xB1E4,      0,      0, 0xB0D2,      0, 0xB4BF, 0xB4C0  /* 0xF0 */
+         0, 0xD5AA, 0xD5AE, 	 0, 0xB1E0, 0xD5A9, 0xB1E2, 	 0, /* 0x60 */
+    0xB1E1, 	 0, 0xD9A7, 	 0, 0xD9A2, 	 0, 0xB4B6, 0xB4BA, /* 0x60 */
+    0xB4B7, 0xD9A5, 0xD9A8, 	 0, 0xB4B8, 	 0, 0xB4B9, 0xB4BE, /* 0x70 */
+    0xDDC7, 0xD9A6, 0xB4BC, 0xD9A3, 0xD9A1, 	 0, 0xB4BD, 	 0, /* 0x70 */
+    0xD9A4, 	 0, 	 0, 	 0, 0xB779, 	 0, 0xDDBF, 0xB776, /* 0x80 */
+    0xB777, 0xB775, 0xDDC4, 0xDDC3, 0xDDC0, 0xB77B, 	 0, 	 0, /* 0x80 */
+    0xDDC2, 0xB4BB, 	 0, 	 0, 0xDDC6, 0xDDC1, 0xB778, 0xB774, /* 0x90 */
+    0xB77A, 0xDDC5, 	 0, 	 0, 	 0, 0xBA5C, 	 0, 0xE1F8, /* 0x90 */
+    0xE1F7, 0xE1F6, 0xBA5A, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xBA5B, 0xE5C5, 0xE5C8, 0xBCC8, 	 0, 	 0, 0xBCC7, 0xE5C9, /* 0xA0 */
+    0xE5C4, 0xBCCA, 0xE5C6, 	 0, 0xBCC9, 0xE5C3, 	 0, 0xE5C7, /* 0xB0 */
+    0xBEE9, 0xBEE6, 0xE9BB, 0xE9BA, 	 0, 0xE9B9, 0xE9B4, 	 0, /* 0xB0 */
+    0xE9B5, 	 0, 	 0, 	 0, 0xBEE7, 	 0, 0xBEE4, 0xBEE8, /* 0xC0 */
+    0xE9B3, 0xBEE5, 0xE9B6, 0xE9B7, 0xE9BC, 	 0, 	 0, 0xE9B8, /* 0xC0 */
+         0, 	 0, 0xECF2, 	 0, 	 0, 	 0, 0xC0C7, 	 0, /* 0xD0 */
+    0xEFDC, 0xC0C6, 0xEFDA, 0xEFDB, 0xC260, 0xC36E, 0xF24B, 	 0, /* 0xD0 */
+    0xC36D, 	 0, 	 0, 0xF451, 0xF452, 	 0, 0xC466, 	 0, /* 0xE0 */
+    0xF450, 0xC4E4, 	 0, 0xF7DF, 0xC5CE, 0xF8AA, 0xF8AB, 	 0, /* 0xE0 */
+    0xA4EA, 	 0, 0xA6B1, 0xA6B2, 0xA7F3, 	 0, 0xCCD1, 0xAC54, /* 0xF0 */
+    0xAED1, 0xB1E4, 	 0, 	 0, 0xB0D2, 	 0, 0xB4BF, 0xB4C0	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_67[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xB3CC, 0xD9A9,      0, 0xB77C, 0xE1FA, 0xE1F9,      0,      0, /* 0x00 */
-    0xA4EB, 0xA6B3, 0xCCD2, 0xAA42,      0, 0xAA41,      0, 0xCEF9, /* 0x00 */
-    0xCEFA,      0, 0xD1D7, 0xD1D8, 0xAED2, 0xAED3,      0, 0xAED4, /* 0x10 */
-    0xD5AF,      0,      0, 0xB1E6,      0, 0xB4C2,      0, 0xB4C1, /* 0x10 */
-    0xDDC8, 0xDF7A, 0xE1FB, 0xE9BD,      0,      0, 0xC261, 0xC467, /* 0x20 */
-    0xA4EC,      0, 0xA5BC, 0xA5BD, 0xA5BB, 0xA5BE, 0xA5BA,      0, /* 0x20 */
-         0, 0xA6B6,      0, 0xC9F6, 0xA6B5, 0xA6B7,      0,      0, /* 0x30 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xB3CC, 0xD9A9, 	 0, 0xB77C, 0xE1FA, 0xE1F9, 	 0, 	 0, /* 0x00 */
+    0xA4EB, 0xA6B3, 0xCCD2, 0xAA42, 	 0, 0xAA41, 	 0, 0xCEF9, /* 0x00 */
+    0xCEFA, 	 0, 0xD1D7, 0xD1D8, 0xAED2, 0xAED3, 	 0, 0xAED4, /* 0x10 */
+    0xD5AF, 	 0, 	 0, 0xB1E6, 	 0, 0xB4C2, 	 0, 0xB4C1, /* 0x10 */
+    0xDDC8, 0xDF7A, 0xE1FB, 0xE9BD, 	 0, 	 0, 0xC261, 0xC467, /* 0x20 */
+    0xA4EC, 	 0, 0xA5BC, 0xA5BD, 0xA5BB, 0xA5BE, 0xA5BA, 	 0, /* 0x20 */
+         0, 0xA6B6, 	 0, 0xC9F6, 0xA6B5, 0xA6B7, 	 0, 	 0, /* 0x30 */
     0xC9F1, 0xC9F0, 0xC9F3, 0xC9F2, 0xC9F5, 0xA6B4, 0xC9EF, 0xC9F4, /* 0x30 */
-         0,      0,      0,      0,      0, 0xCAFD, 0xA7FD, 0xCAFE, /* 0x40 */
-    0xCB43, 0xA7FC,      0, 0xCB47, 0xCB42, 0xCB45, 0xA7F5, 0xA7F6, /* 0x40 */
-    0xA7F7, 0xA7F8,      0, 0xA840,      0, 0xCB41, 0xA7FA, 0xA841, /* 0x50 */
-         0, 0xCB40, 0xCB46,      0, 0xA7F9, 0xCB44, 0xA7FB, 0xA7F4, /* 0x50 */
-    0xA7FE,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0, 0xAA57,      0, 0xCCD4, 0xAA43,      0, 0xAA4D, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCAFD, 0xA7FD, 0xCAFE, /* 0x40 */
+    0xCB43, 0xA7FC, 	 0, 0xCB47, 0xCB42, 0xCB45, 0xA7F5, 0xA7F6, /* 0x40 */
+    0xA7F7, 0xA7F8, 	 0, 0xA840, 	 0, 0xCB41, 0xA7FA, 0xA841, /* 0x50 */
+         0, 0xCB40, 0xCB46, 	 0, 0xA7F9, 0xCB44, 0xA7FB, 0xA7F4, /* 0x50 */
+    0xA7FE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xAA57, 	 0, 0xCCD4, 0xAA43, 	 0, 0xAA4D, /* 0x60 */
     0xAA4E, 0xAA46, 0xAA58, 0xAA48, 0xCCDC, 0xAA53, 0xCCD7, 0xAA49, /* 0x70 */
     0xCCE6, 0xCCE7, 0xCCDF, 0xCCD8, 0xAA56, 0xCCE4, 0xAA51, 0xAA4F, /* 0x70 */
-         0, 0xCCE5,      0, 0xCCE3, 0xCCDB, 0xCCD3, 0xCCDA, 0xAA4A, /* 0x80 */
-         0, 0xAA50,      0, 0xAA44, 0xCCDE, 0xCCDD, 0xCCD5,      0, /* 0x80 */
-    0xAA52, 0xCCE1, 0xCCD6, 0xAA55, 0xCCE8, 0xAA45,      0, 0xAA4C, /* 0x90 */
-    0xCCD9, 0xCCE2, 0xAA54,      0, 0xAA47, 0xAA4B,      0, 0xCCE0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0, 0xCF5B, 0xAC5C, /* 0xA0 */
-    0xAC69,      0, 0xCF56, 0xCF4C, 0xAC62, 0xCF4A, 0xAC5B, 0xCF45, /* 0xB0 */
-    0xAC65, 0xCF52, 0xCEFE, 0xCF41,      0,      0,      0,      0, /* 0xB0 */
-    0xCF44, 0xCEFB, 0xCF51, 0xCF61, 0xAC60, 0xCF46, 0xCF58,      0, /* 0xC0 */
+         0, 0xCCE5, 	 0, 0xCCE3, 0xCCDB, 0xCCD3, 0xCCDA, 0xAA4A, /* 0x80 */
+         0, 0xAA50, 	 0, 0xAA44, 0xCCDE, 0xCCDD, 0xCCD5, 	 0, /* 0x80 */
+    0xAA52, 0xCCE1, 0xCCD6, 0xAA55, 0xCCE8, 0xAA45, 	 0, 0xAA4C, /* 0x90 */
+    0xCCD9, 0xCCE2, 0xAA54, 	 0, 0xAA47, 0xAA4B, 	 0, 0xCCE0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCF5B, 0xAC5C, /* 0xA0 */
+    0xAC69, 	 0, 0xCF56, 0xCF4C, 0xAC62, 0xCF4A, 0xAC5B, 0xCF45, /* 0xB0 */
+    0xAC65, 0xCF52, 0xCEFE, 0xCF41, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xCF44, 0xCEFB, 0xCF51, 0xCF61, 0xAC60, 0xCF46, 0xCF58, 	 0, /* 0xC0 */
     0xCEFD, 0xCF5F, 0xCF60, 0xCF63, 0xCF5A, 0xCF4B, 0xCF53, 0xAC66, /* 0xC0 */
-    0xAC59, 0xAC61, 0xAC6D, 0xAC56, 0xAC58,      0,      0,      0, /* 0xD0 */
+    0xAC59, 0xAC61, 0xAC6D, 0xAC56, 0xAC58, 	 0, 	 0, 	 0, /* 0xD0 */
     0xCF43, 0xAC6A, 0xAC63, 0xCF5D, 0xCF40, 0xAC6C, 0xAC67, 0xCF49, /* 0xD0 */
-         0,      0, 0xAC6B, 0xCF50, 0xCF48, 0xAC64, 0xCF5C, 0xCF54, /* 0xE0 */
+         0, 	 0, 0xAC6B, 0xCF50, 0xCF48, 0xAC64, 0xCF5C, 0xCF54, /* 0xE0 */
          0, 0xAC5E, 0xCF62, 0xCF47, 0xAC5A, 0xCF59, 0xCF4F, 0xAC5F, /* 0xE0 */
     0xCF55, 0xAC57, 0xCEFC, 0xAC68, 0xAEE3, 0xAC5D, 0xCF4E, 0xCF4D, /* 0xF0 */
-    0xCF42,      0, 0xCF5E,      0, 0xCF57,      0,      0, 0xAC55  /* 0xF0 */
+    0xCF42, 	 0, 0xCF5E, 	 0, 0xCF57, 	 0, 	 0, 0xAC55	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_68[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xD1EC, 0xAEEA, 0xD1ED,      0, 0xD1E1, 0xAEDF, /* 0x10 */
-    0xAEEB,      0, 0xD1DA,      0, 0xD1E3, 0xD1EB,      0, 0xD1D9, /* 0x10 */
-    0xD1F4, 0xAED5,      0,      0,      0, 0xD1F3, 0xD1EE,      0, /* 0x20 */
-    0xD1EF, 0xAEDD, 0xAEE8, 0xD1E5,      0, 0xD1E6, 0xD1F0, 0xD1E7, /* 0x20 */
-         0, 0xD1E2, 0xD1DC, 0xD1DD, 0xD1EA, 0xD1E4,      0,      0, /* 0x30 */
-    0xAED6, 0xAEDA, 0xD1F2, 0xD1DE, 0xAEE6, 0xAEE2,      0,      0, /* 0x30 */
-    0xAEE5, 0xAEEC, 0xAEDB, 0xAEE7, 0xD1E9, 0xAEE9, 0xAED8,      0, /* 0x40 */
-    0xAED7, 0xD1DB,      0, 0xD1DF, 0xAEE0, 0xD1F1, 0xD1E8, 0xD1E0, /* 0x40 */
-    0xAEE4, 0xAEE1,      0, 0xAED9, 0xAEDC,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xD5C4,      0, 0xD5B4, 0xD5B5, 0xD5B9, /* 0x60 */
-         0, 0xD5C8, 0xD5C5,      0, 0xD5BE, 0xD5BD, 0xB1ED, 0xD5C1, /* 0x70 */
-    0xD5D0, 0xD5B0,      0, 0xD5D1, 0xD5C3, 0xD5D5, 0xD5C9, 0xB1EC, /* 0x70 */
-    0xD5C7, 0xB1E7, 0xB1FC, 0xB1F2,      0, 0xB1F6, 0xB1F5, 0xD5B1, /* 0x80 */
-         0, 0xD5CE, 0xD5D4, 0xD5CC, 0xD5D3,      0,      0, 0xD5C0, /* 0x80 */
-    0xD5B2, 0xD5D2, 0xD5C2, 0xB1EA, 0xB1F7,      0, 0xD5CB, 0xB1F0, /* 0x90 */
-         0,      0,      0, 0xD5CA, 0xD5B3, 0xB1F8,      0, 0xB1FA, /* 0x90 */
-    0xD5CD, 0xB1FB, 0xB1E9, 0xD5BA, 0xD5CF,      0,      0, 0xB1EF, /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xD1EC, 0xAEEA, 0xD1ED, 	 0, 0xD1E1, 0xAEDF, /* 0x10 */
+    0xAEEB, 	 0, 0xD1DA, 	 0, 0xD1E3, 0xD1EB, 	 0, 0xD1D9, /* 0x10 */
+    0xD1F4, 0xAED5, 	 0, 	 0, 	 0, 0xD1F3, 0xD1EE, 	 0, /* 0x20 */
+    0xD1EF, 0xAEDD, 0xAEE8, 0xD1E5, 	 0, 0xD1E6, 0xD1F0, 0xD1E7, /* 0x20 */
+         0, 0xD1E2, 0xD1DC, 0xD1DD, 0xD1EA, 0xD1E4, 	 0, 	 0, /* 0x30 */
+    0xAED6, 0xAEDA, 0xD1F2, 0xD1DE, 0xAEE6, 0xAEE2, 	 0, 	 0, /* 0x30 */
+    0xAEE5, 0xAEEC, 0xAEDB, 0xAEE7, 0xD1E9, 0xAEE9, 0xAED8, 	 0, /* 0x40 */
+    0xAED7, 0xD1DB, 	 0, 0xD1DF, 0xAEE0, 0xD1F1, 0xD1E8, 0xD1E0, /* 0x40 */
+    0xAEE4, 0xAEE1, 	 0, 0xAED9, 0xAEDC, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xD5C4, 	 0, 0xD5B4, 0xD5B5, 0xD5B9, /* 0x60 */
+         0, 0xD5C8, 0xD5C5, 	 0, 0xD5BE, 0xD5BD, 0xB1ED, 0xD5C1, /* 0x70 */
+    0xD5D0, 0xD5B0, 	 0, 0xD5D1, 0xD5C3, 0xD5D5, 0xD5C9, 0xB1EC, /* 0x70 */
+    0xD5C7, 0xB1E7, 0xB1FC, 0xB1F2, 	 0, 0xB1F6, 0xB1F5, 0xD5B1, /* 0x80 */
+         0, 0xD5CE, 0xD5D4, 0xD5CC, 0xD5D3, 	 0, 	 0, 0xD5C0, /* 0x80 */
+    0xD5B2, 0xD5D2, 0xD5C2, 0xB1EA, 0xB1F7, 	 0, 0xD5CB, 0xB1F0, /* 0x90 */
+         0, 	 0, 	 0, 0xD5CA, 0xD5B3, 0xB1F8, 	 0, 0xB1FA, /* 0x90 */
+    0xD5CD, 0xB1FB, 0xB1E9, 0xD5BA, 0xD5CF, 	 0, 	 0, 0xB1EF, /* 0xA0 */
     0xB1F9, 0xD5BC, 0xD5C6, 0xD5B7, 0xD5BB, 0xB1F4, 0xD5B6, 0xB1E8, /* 0xA0 */
-    0xB1F1, 0xB1EE, 0xD5BF, 0xAEDE, 0xD9C0, 0xB1EB,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0, 0xB1F3,      0, 0xD9C3, 0xD9D9, /* 0xC0 */
-    0xD9CE, 0xB4D6,      0, 0xB4D1, 0xD9BD, 0xB4D2, 0xD9CD,      0, /* 0xC0 */
+    0xB1F1, 0xB1EE, 0xD5BF, 0xAEDE, 0xD9C0, 0xB1EB, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 0xB1F3, 	 0, 0xD9C3, 0xD9D9, /* 0xC0 */
+    0xD9CE, 0xB4D6, 	 0, 0xB4D1, 0xD9BD, 0xB4D2, 0xD9CD, 	 0, /* 0xC0 */
     0xD9C6, 0xD9D3, 0xB4CE, 0xD9AB, 0xD9D5, 0xB4C4, 0xD9B3, 0xB4C7, /* 0xD0 */
-    0xB4C6,      0, 0xB4D7,      0, 0xD9AD, 0xD9CF, 0xD9D0, 0xB4C9, /* 0xD0 */
-    0xB4C5, 0xD9BB,      0, 0xB4D0, 0xD9B6,      0, 0xD9D1, 0xB4CC, /* 0xE0 */
-    0xD9C9, 0xD9D6, 0xD9B0, 0xD9B5, 0xD9AF,      0, 0xB4CB, 0xD9C2, /* 0xE0 */
+    0xB4C6, 	 0, 0xB4D7, 	 0, 0xD9AD, 0xD9CF, 0xD9D0, 0xB4C9, /* 0xD0 */
+    0xB4C5, 0xD9BB, 	 0, 0xB4D0, 0xD9B6, 	 0, 0xD9D1, 0xB4CC, /* 0xE0 */
+    0xD9C9, 0xD9D6, 0xD9B0, 0xD9B5, 0xD9AF, 	 0, 0xB4CB, 0xD9C2, /* 0xE0 */
     0xDDDE, 0xD9B1, 0xB4CF, 0xD9BA, 0xD9D2, 0xB4CA, 0xD9B7, 0xD9B4, /* 0xF0 */
-    0xD9C5, 0xB4CD, 0xB4C3, 0xB4D9, 0xD9C8, 0xD9C7                  /* 0xF0 */
+    0xD9C5, 0xB4CD, 0xB4C3, 0xB4D9, 0xD9C8, 0xD9C7					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_69[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                     0xD9AC, 0xB4C8, 0xD9D4, 0xD9BC, /* 0x00 */
-    0xD9BE,      0, 0xD9CB, 0xD9CA, 0xD9AA, 0xB4D3, 0xB4D5, 0xD9B2, /* 0x00 */
-    0xD9B9, 0xD9C1, 0xB4D4, 0xD9B8, 0xD9C4, 0xD9D7,      0, 0xD9CC, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xD9D8,      0,      0, /* 0x20 */
-         0,      0, 0xD9AE,      0,      0,      0,      0, 0xDDF2, /* 0x20 */
-    0xB7A6,      0, 0xDDF0, 0xDDDB, 0xDDE0, 0xDDD9,      0, 0xDDEC, /* 0x30 */
-    0xDDCB, 0xDDD2,      0, 0xDDEA, 0xDDF4, 0xDDDC,      0, 0xDDCF, /* 0x30 */
-    0xDDE2, 0xDDE7, 0xDDD3,      0, 0xDDE4, 0xDDD0,      0,      0, /* 0x40 */
-    0xDDD7, 0xDDD8, 0xB7A8, 0xDDEB, 0xDDE9,      0, 0xDDCC, 0xDDEE, /* 0x40 */
-         0, 0xDDEF, 0xDDF1, 0xB7AC, 0xB7A4,      0, 0xD5B8, 0xDDD4, /* 0x50 */
+    0xD9BE, 	 0, 0xD9CB, 0xD9CA, 0xD9AA, 0xB4D3, 0xB4D5, 0xD9B2, /* 0x00 */
+    0xD9B9, 0xD9C1, 0xB4D4, 0xD9B8, 0xD9C4, 0xD9D7, 	 0, 0xD9CC, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD9D8, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xD9AE, 	 0, 	 0, 	 0, 	 0, 0xDDF2, /* 0x20 */
+    0xB7A6, 	 0, 0xDDF0, 0xDDDB, 0xDDE0, 0xDDD9, 	 0, 0xDDEC, /* 0x30 */
+    0xDDCB, 0xDDD2, 	 0, 0xDDEA, 0xDDF4, 0xDDDC, 	 0, 0xDDCF, /* 0x30 */
+    0xDDE2, 0xDDE7, 0xDDD3, 	 0, 0xDDE4, 0xDDD0, 	 0, 	 0, /* 0x40 */
+    0xDDD7, 0xDDD8, 0xB7A8, 0xDDEB, 0xDDE9, 	 0, 0xDDCC, 0xDDEE, /* 0x40 */
+         0, 0xDDEF, 0xDDF1, 0xB7AC, 0xB7A4, 	 0, 0xD5B8, 0xDDD4, /* 0x50 */
     0xDDE6, 0xDDD5, 0xB7A1, 0xB7B1, 0xDDED, 0xB7AF, 0xB7AB, 0xDDCA, /* 0x50 */
-    0xB7A3,      0, 0xDDCD, 0xB7B0,      0, 0xDDDD, 0xDDC9,      0, /* 0x60 */
+    0xB7A3, 	 0, 0xDDCD, 0xB7B0, 	 0, 0xDDDD, 0xDDC9, 	 0, /* 0x60 */
     0xB7A9, 0xDDE1, 0xDDD1, 0xB7AA, 0xDDDA, 0xB77E, 0xB4D8, 0xDDE3, /* 0x60 */
-    0xD9BF, 0xDDCE,      0,      0, 0xDDE8, 0xB7A5, 0xDDE5, 0xB7A2, /* 0x70 */
-    0xDDDF, 0xB7AD, 0xDDD6, 0xDDF3,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xB7A7, 0xDEC6,      0,      0, 0xB7AE,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xE24A, 0xE248,      0, /* 0x80 */
-    0xE25E, 0xE246,      0, 0xE258, 0xB77D, 0xBA5F, 0xE242, 0xE25D, /* 0x90 */
-         0, 0xE247, 0xE255, 0xBA64, 0xBA5D,      0, 0xE25B,      0, /* 0x90 */
-    0xE240, 0xE25A,      0, 0xBA6F, 0xE251, 0xE261, 0xBA6D, 0xE249, /* 0xA0 */
+    0xD9BF, 0xDDCE, 	 0, 	 0, 0xDDE8, 0xB7A5, 0xDDE5, 0xB7A2, /* 0x70 */
+    0xDDDF, 0xB7AD, 0xDDD6, 0xDDF3, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xB7A7, 0xDEC6, 	 0, 	 0, 0xB7AE, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE24A, 0xE248, 	 0, /* 0x80 */
+    0xE25E, 0xE246, 	 0, 0xE258, 0xB77D, 0xBA5F, 0xE242, 0xE25D, /* 0x90 */
+         0, 0xE247, 0xE255, 0xBA64, 0xBA5D, 	 0, 0xE25B, 	 0, /* 0x90 */
+    0xE240, 0xE25A, 	 0, 0xBA6F, 0xE251, 0xE261, 0xBA6D, 0xE249, /* 0xA0 */
     0xBA5E, 0xE24B, 0xE259, 0xBA67, 0xE244, 0xBA6B, 0xBA61, 0xE24D, /* 0xA0 */
-    0xE243, 0xE1FC,      0, 0xE257, 0xBA68, 0xE260, 0xE1FD, 0xBA65, /* 0xB0 */
-         0, 0xE253,      0, 0xBA66, 0xE245, 0xE250, 0xE24C, 0xE24E, /* 0xB0 */
-         0, 0xBA60, 0xE25F, 0xBA6E, 0xE24F,      0, 0xE262,      0, /* 0xC0 */
+    0xE243, 0xE1FC, 	 0, 0xE257, 0xBA68, 0xE260, 0xE1FD, 0xBA65, /* 0xB0 */
+         0, 0xE253, 	 0, 0xBA66, 0xE245, 0xE250, 0xE24C, 0xE24E, /* 0xB0 */
+         0, 0xBA60, 0xE25F, 0xBA6E, 0xE24F, 	 0, 0xE262, 	 0, /* 0xC0 */
          0, 0xE1FE, 0xE254, 0xBA63, 0xBA6C, 0xBA6A, 0xE241, 0xE256, /* 0xC0 */
-    0xBA69,      0,      0, 0xBA62, 0xE252,      0,      0,      0, /* 0xD0 */
-         0, 0xE25C,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xE5D5,      0, 0xE5D1, 0xE5CD, 0xE5E1, 0xE5DE, /* 0xE0 */
-    0xBCCD,      0,      0, 0xE5E5, 0xE5D4, 0xBCD8, 0xE5DB,      0, /* 0xE0 */
-         0, 0xE5D0, 0xE5DA, 0xBCD5, 0xE5EE,      0, 0xE5EB, 0xE5DD, /* 0xF0 */
-    0xE5CE,      0,      0, 0xE5E2, 0xE5E4, 0xBCD1, 0xE5D8, 0xE5D3  /* 0xF0 */
+    0xBA69, 	 0, 	 0, 0xBA62, 0xE252, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 0xE25C, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xE5D5, 	 0, 0xE5D1, 0xE5CD, 0xE5E1, 0xE5DE, /* 0xE0 */
+    0xBCCD, 	 0, 	 0, 0xE5E5, 0xE5D4, 0xBCD8, 0xE5DB, 	 0, /* 0xE0 */
+         0, 0xE5D0, 0xE5DA, 0xBCD5, 0xE5EE, 	 0, 0xE5EB, 0xE5DD, /* 0xF0 */
+    0xE5CE, 	 0, 	 0, 0xE5E2, 0xE5E4, 0xBCD1, 0xE5D8, 0xE5D3	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_6A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE5CA, 0xBCCE, 0xBCD6,      0, 0xE5E7, 0xBCD7, 0xE5CB, 0xE5ED, /* 0x00 */
-    0xE5E0, 0xE5E6, 0xBCD4,      0,      0, 0xE5E3,      0, 0xE5EA, /* 0x00 */
-         0, 0xBCD9,      0, 0xBCD3, 0xE5DC, 0xE5CF, 0xE5EF, 0xE5CC, /* 0x10 */
-    0xE5E8, 0xBCD0,      0, 0xE5D6,      0, 0xE5D7, 0xBCCF, 0xBCCC, /* 0x10 */
-    0xE5D2, 0xBCD2,      0, 0xBCCB,      0, 0xE5E9, 0xE5EC, 0xE5D9, /* 0x20 */
-    0xE9CA,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0, 0xE9C2,      0, 0xE9BE, 0xBEF6,      0,      0, /* 0x30 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE5CA, 0xBCCE, 0xBCD6, 	 0, 0xE5E7, 0xBCD7, 0xE5CB, 0xE5ED, /* 0x00 */
+    0xE5E0, 0xE5E6, 0xBCD4, 	 0, 	 0, 0xE5E3, 	 0, 0xE5EA, /* 0x00 */
+         0, 0xBCD9, 	 0, 0xBCD3, 0xE5DC, 0xE5CF, 0xE5EF, 0xE5CC, /* 0x10 */
+    0xE5E8, 0xBCD0, 	 0, 0xE5D6, 	 0, 0xE5D7, 0xBCCF, 0xBCCC, /* 0x10 */
+    0xE5D2, 0xBCD2, 	 0, 0xBCCB, 	 0, 0xE5E9, 0xE5EC, 0xE5D9, /* 0x20 */
+    0xE9CA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 0xE9C2, 	 0, 0xE9BE, 0xBEF6, 	 0, 	 0, /* 0x30 */
     0xBEEB, 0xBEF0, 0xBEEC, 0xE9CC, 0xE9D7, 0xBEEA, 0xE9C4, 0xE9CD, /* 0x30 */
-    0xE5DF, 0xE9CE,      0,      0, 0xBEF1,      0, 0xE9DD, 0xBEF5, /* 0x40 */
-    0xBEF8, 0xE9C0,      0, 0xBEF4,      0, 0xE9DB, 0xE9DC, 0xE9D2, /* 0x40 */
-    0xE9D1, 0xE9C9,      0,      0, 0xE9D3, 0xE9DA, 0xE9D9,      0, /* 0x50 */
-    0xBEEF, 0xBEED, 0xE9CB, 0xE9C8,      0, 0xE9C5, 0xE9D8, 0xBEF7, /* 0x50 */
-    0xE9D6, 0xBEF3, 0xBEF2,      0, 0xE9D0,      0, 0xE9BF, 0xE9C1, /* 0x60 */
-    0xE9C3, 0xE9D5, 0xE9CF, 0xBEEE,      0, 0xE9C6,      0, 0xE9D4, /* 0x60 */
-         0,      0,      0,      0,      0,      0, 0xE9C7,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0, 0xC0CF, 0xED45, /* 0x70 */
-    0xC0C8, 0xECF5,      0, 0xED41, 0xC0CA, 0xED48,      0, 0xECFC, /* 0x80 */
-         0, 0xECF7,      0,      0, 0xED49, 0xECF3, 0xECFE,      0, /* 0x80 */
+    0xE5DF, 0xE9CE, 	 0, 	 0, 0xBEF1, 	 0, 0xE9DD, 0xBEF5, /* 0x40 */
+    0xBEF8, 0xE9C0, 	 0, 0xBEF4, 	 0, 0xE9DB, 0xE9DC, 0xE9D2, /* 0x40 */
+    0xE9D1, 0xE9C9, 	 0, 	 0, 0xE9D3, 0xE9DA, 0xE9D9, 	 0, /* 0x50 */
+    0xBEEF, 0xBEED, 0xE9CB, 0xE9C8, 	 0, 0xE9C5, 0xE9D8, 0xBEF7, /* 0x50 */
+    0xE9D6, 0xBEF3, 0xBEF2, 	 0, 0xE9D0, 	 0, 0xE9BF, 0xE9C1, /* 0x60 */
+    0xE9C3, 0xE9D5, 0xE9CF, 0xBEEE, 	 0, 0xE9C6, 	 0, 0xE9D4, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9C7, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC0CF, 0xED45, /* 0x70 */
+    0xC0C8, 0xECF5, 	 0, 0xED41, 0xC0CA, 0xED48, 	 0, 0xECFC, /* 0x80 */
+         0, 0xECF7, 	 0, 	 0, 0xED49, 0xECF3, 0xECFE, 	 0, /* 0x80 */
     0xC0D1, 0xED44, 0xED4A, 0xECFD, 0xC0C9, 0xED40, 0xECF4, 0xC0D0, /* 0x90 */
-         0,      0, 0xED47, 0xECF9, 0xC0CC,      0, 0xECFB, 0xECF8, /* 0x90 */
-    0xC0D2, 0xECFA, 0xC0CB, 0xC0CE, 0xED43, 0xECF6, 0xED46,      0, /* 0xA0 */
-    0xED42,      0,      0,      0, 0xC263, 0xEFE7, 0xC268, 0xC269, /* 0xA0 */
-         0,      0,      0, 0xC262, 0xEFE6,      0, 0xEFE3, 0xEFE4, /* 0xB0 */
-    0xC266, 0xEFDE, 0xEFE2, 0xC265,      0, 0xEFDF,      0,      0, /* 0xB0 */
-         0,      0, 0xC267, 0xC264,      0, 0xEFDD, 0xEFE1, 0xEFE5, /* 0xC0 */
-         0,      0,      0, 0xF251, 0xF24E, 0xF257,      0, 0xF256, /* 0xC0 */
-    0xF254, 0xF24F,      0, 0xC372,      0,      0,      0,      0, /* 0xD0 */
+         0, 	 0, 0xED47, 0xECF9, 0xC0CC, 	 0, 0xECFB, 0xECF8, /* 0x90 */
+    0xC0D2, 0xECFA, 0xC0CB, 0xC0CE, 0xED43, 0xECF6, 0xED46, 	 0, /* 0xA0 */
+    0xED42, 	 0, 	 0, 	 0, 0xC263, 0xEFE7, 0xC268, 0xC269, /* 0xA0 */
+         0, 	 0, 	 0, 0xC262, 0xEFE6, 	 0, 0xEFE3, 0xEFE4, /* 0xB0 */
+    0xC266, 0xEFDE, 0xEFE2, 0xC265, 	 0, 0xEFDF, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xC267, 0xC264, 	 0, 0xEFDD, 0xEFE1, 0xEFE5, /* 0xC0 */
+         0, 	 0, 	 0, 0xF251, 0xF24E, 0xF257, 	 0, 0xF256, /* 0xC0 */
+    0xF254, 0xF24F, 	 0, 0xC372, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
          0, 0xF250, 0xC371, 0xC0CD, 0xF253, 0xC370, 0xF258, 0xF252, /* 0xD0 */
-    0xF24D, 0xEFE0,      0,      0,      0, 0xC36F,      0, 0xF24C, /* 0xE0 */
-    0xF456,      0, 0xF455, 0xF255, 0xC468,      0, 0xF459, 0xF45A, /* 0xE0 */
-    0xF454, 0xF458,      0, 0xF453,      0,      0,      0,      0, /* 0xF0 */
-    0xF5D1, 0xF457, 0xC4E7, 0xC4E5, 0xF5CF                          /* 0xF0 */
+    0xF24D, 0xEFE0, 	 0, 	 0, 	 0, 0xC36F, 	 0, 0xF24C, /* 0xE0 */
+    0xF456, 	 0, 0xF455, 0xF255, 0xC468, 	 0, 0xF459, 0xF45A, /* 0xE0 */
+    0xF454, 0xF458, 	 0, 0xF453, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xF5D1, 0xF457, 0xC4E7, 0xC4E5, 0xF5CF							/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_6B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF5D2,      0, 0xF5CE, 0xF5D0, 0xC4E6,      0,      0,      0, /* 0x00 */
-    0xF6E5, 0xF6E6, 0xC576, 0xF6E4,      0,      0,      0, 0xF7E2, /* 0x00 */
-    0xC5CF, 0xF7E0, 0xF7E1, 0xF8AC,      0,      0, 0xC656, 0xF8F3, /* 0x10 */
-    0xF8F1, 0xF8F2, 0xF8F4,      0,      0,      0, 0xF9BB,      0, /* 0x10 */
-    0xA4ED, 0xA6B8,      0, 0xAA59,      0, 0xCCE9,      0,      0, /* 0x20 */
-    0xCF64,      0,      0,      0, 0xD1F5, 0xD1F7,      0, 0xD1F6, /* 0x20 */
-         0, 0xD1F8, 0xB1FD, 0xD5D7, 0xD1F9,      0, 0xD5D6, 0xD5D8, /* 0x30 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF5D2, 	 0, 0xF5CE, 0xF5D0, 0xC4E6, 	 0, 	 0, 	 0, /* 0x00 */
+    0xF6E5, 0xF6E6, 0xC576, 0xF6E4, 	 0, 	 0, 	 0, 0xF7E2, /* 0x00 */
+    0xC5CF, 0xF7E0, 0xF7E1, 0xF8AC, 	 0, 	 0, 0xC656, 0xF8F3, /* 0x10 */
+    0xF8F1, 0xF8F2, 0xF8F4, 	 0, 	 0, 	 0, 0xF9BB, 	 0, /* 0x10 */
+    0xA4ED, 0xA6B8, 	 0, 0xAA59, 	 0, 0xCCE9, 	 0, 	 0, /* 0x20 */
+    0xCF64, 	 0, 	 0, 	 0, 0xD1F5, 0xD1F7, 	 0, 0xD1F6, /* 0x20 */
+         0, 0xD1F8, 0xB1FD, 0xD5D7, 0xD1F9, 	 0, 0xD5D6, 0xD5D8, /* 0x30 */
     0xD5D9, 0xD9DA, 0xB4DB, 0xD9DB, 0xD9DD, 0xB4DC, 0xB4DA, 0xD9DC, /* 0x30 */
-         0, 0xDDFA, 0xDDF8, 0xDDF7,      0, 0xDDF6, 0xDDF5, 0xB7B2, /* 0x40 */
-    0xDDF9, 0xBA70, 0xE263, 0xE265, 0xBA71, 0xE264, 0xBCDB,      0, /* 0x40 */
-    0xBCDA, 0xE5F0,      0,      0, 0xE9DF, 0xE9DE, 0xE9E0,      0, /* 0x50 */
-         0, 0xBEF9,      0, 0xED4B, 0xC0D3,      0, 0xEFE8, 0xC26A, /* 0x50 */
+         0, 0xDDFA, 0xDDF8, 0xDDF7, 	 0, 0xDDF6, 0xDDF5, 0xB7B2, /* 0x40 */
+    0xDDF9, 0xBA70, 0xE263, 0xE265, 0xBA71, 0xE264, 0xBCDB, 	 0, /* 0x40 */
+    0xBCDA, 0xE5F0, 	 0, 	 0, 0xE9DF, 0xE9DE, 0xE9E0, 	 0, /* 0x50 */
+         0, 0xBEF9, 	 0, 0xED4B, 0xC0D3, 	 0, 0xEFE8, 0xC26A, /* 0x50 */
     0xF259, 0xC577, 0xA4EE, 0xA5BF, 0xA6B9, 0xA842, 0xAA5A, 0xAA5B, /* 0x60 */
-         0,      0, 0xAC6E,      0,      0, 0xD1FA,      0,      0, /* 0x60 */
-         0,      0, 0xB7B3,      0,      0,      0, 0xE6D1, 0xBEFA, /* 0x70 */
-    0xC26B, 0xA4EF,      0, 0xA6BA,      0,      0, 0xCCEB, 0xAA5C, /* 0x70 */
-    0xCCEA,      0, 0xCF65, 0xAC6F, 0xCF66,      0, 0xAC70,      0, /* 0x80 */
-    0xD1FC, 0xAEEE, 0xAEED,      0, 0xD5DE, 0xD5DC, 0xD5DD, 0xD5DB, /* 0x80 */
-         0, 0xD5DA,      0,      0, 0xD9DE, 0xD9E1, 0xB4DE, 0xD9DF, /* 0x90 */
-    0xB4DD, 0xD9E0,      0, 0xDDFB,      0,      0, 0xE266, 0xE267, /* 0x90 */
-    0xE268,      0, 0xE5F3, 0xE5F2, 0xBCDC, 0xE5F1, 0xE5F4, 0xE9E1, /* 0xA0 */
-         0,      0, 0xE9E2, 0xE9E3,      0, 0xED4C, 0xC0D4, 0xC26C, /* 0xA0 */
-    0xF25A,      0, 0xC4E8, 0xC95F,      0, 0xAC71, 0xCF67, 0xAEEF, /* 0xB0 */
-         0,      0, 0xB1FE,      0, 0xB4DF, 0xD9E2,      0, 0xB7B5, /* 0xB0 */
-    0xB7B4,      0,      0, 0xE269, 0xE26A, 0xBCDD, 0xBCDE, 0xE9E5, /* 0xC0 */
-    0xE9E4, 0xEFE9, 0xF7E3, 0xA4F0, 0xC960, 0xA5C0,      0, 0xA843, /* 0xC0 */
-    0xCB48,      0, 0xAC72, 0xB7B6, 0xA4F1,      0, 0xCF68, 0xAC73, /* 0xD0 */
-    0xCF69,      0, 0xC0D5, 0xA4F2,      0,      0, 0xCCEC,      0, /* 0xD0 */
-    0xCF6A,      0, 0xD242, 0xD241, 0xD1FE,      0, 0xD1FD, 0xD243, /* 0xE0 */
-    0xD240,      0,      0, 0xB240, 0xB241,      0,      0, 0xB4E0, /* 0xE0 */
-    0xD9E3,      0, 0xD9E4, 0xD9E5,      0,      0,      0, 0xDE41, /* 0xF0 */
-    0xDE42, 0xDE40,      0, 0xDDFD, 0xDDFE, 0xB7B7, 0xE26B, 0xE5F7  /* 0xF0 */
+         0, 	 0, 0xAC6E, 	 0, 	 0, 0xD1FA, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xB7B3, 	 0, 	 0, 	 0, 0xE6D1, 0xBEFA, /* 0x70 */
+    0xC26B, 0xA4EF, 	 0, 0xA6BA, 	 0, 	 0, 0xCCEB, 0xAA5C, /* 0x70 */
+    0xCCEA, 	 0, 0xCF65, 0xAC6F, 0xCF66, 	 0, 0xAC70, 	 0, /* 0x80 */
+    0xD1FC, 0xAEEE, 0xAEED, 	 0, 0xD5DE, 0xD5DC, 0xD5DD, 0xD5DB, /* 0x80 */
+         0, 0xD5DA, 	 0, 	 0, 0xD9DE, 0xD9E1, 0xB4DE, 0xD9DF, /* 0x90 */
+    0xB4DD, 0xD9E0, 	 0, 0xDDFB, 	 0, 	 0, 0xE266, 0xE267, /* 0x90 */
+    0xE268, 	 0, 0xE5F3, 0xE5F2, 0xBCDC, 0xE5F1, 0xE5F4, 0xE9E1, /* 0xA0 */
+         0, 	 0, 0xE9E2, 0xE9E3, 	 0, 0xED4C, 0xC0D4, 0xC26C, /* 0xA0 */
+    0xF25A, 	 0, 0xC4E8, 0xC95F, 	 0, 0xAC71, 0xCF67, 0xAEEF, /* 0xB0 */
+         0, 	 0, 0xB1FE, 	 0, 0xB4DF, 0xD9E2, 	 0, 0xB7B5, /* 0xB0 */
+    0xB7B4, 	 0, 	 0, 0xE269, 0xE26A, 0xBCDD, 0xBCDE, 0xE9E5, /* 0xC0 */
+    0xE9E4, 0xEFE9, 0xF7E3, 0xA4F0, 0xC960, 0xA5C0, 	 0, 0xA843, /* 0xC0 */
+    0xCB48, 	 0, 0xAC72, 0xB7B6, 0xA4F1, 	 0, 0xCF68, 0xAC73, /* 0xD0 */
+    0xCF69, 	 0, 0xC0D5, 0xA4F2, 	 0, 	 0, 0xCCEC, 	 0, /* 0xD0 */
+    0xCF6A, 	 0, 0xD242, 0xD241, 0xD1FE, 	 0, 0xD1FD, 0xD243, /* 0xE0 */
+    0xD240, 	 0, 	 0, 0xB240, 0xB241, 	 0, 	 0, 0xB4E0, /* 0xE0 */
+    0xD9E3, 	 0, 0xD9E4, 0xD9E5, 	 0, 	 0, 	 0, 0xDE41, /* 0xF0 */
+    0xDE42, 0xDE40, 	 0, 0xDDFD, 0xDDFE, 0xB7B7, 0xE26B, 0xE5F7	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_6C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE5F6, 0xE5F5, 0xE5F8, 0xE9E7, 0xE9E6, 0xBEFB, 0xE9E8,      0, /* 0x00 */
-    0xC0D6, 0xED4D,      0, 0xEFEA, 0xF25B, 0xF6E7,      0, 0xA4F3, /* 0x00 */
-    0xA5C2, 0xA5C1,      0, 0xAA5D, 0xC961, 0xC97E, 0xA6BB,      0, /* 0x10 */
-    0xC9F7, 0xCB49, 0xCB4A, 0xAA5E,      0, 0xCCED,      0, 0xAC74, /* 0x10 */
-    0xCF6B, 0xCF6C,      0, 0xAEF0, 0xAEF4, 0xD244, 0xAEF3, 0xAEF1, /* 0x20 */
-    0xAEF2,      0, 0xD5DF, 0xB242, 0xB4E3,      0, 0xB4E1, 0xB4E2, /* 0x20 */
-    0xD9E6,      0,      0, 0xBA72, 0xA4F4,      0, 0xC9A1,      0, /* 0x30 */
-    0xA5C3,      0,      0, 0xC9A4,      0,      0, 0xA5C6, 0xC9A3, /* 0x30 */
-    0xA5C5, 0xA5C4, 0xA844, 0xC9A2,      0,      0, 0xC9F8,      0, /* 0x40 */
-         0,      0, 0xC9FC, 0xC9FE, 0xCA40, 0xA6C5, 0xA6C6, 0xC9FB, /* 0x40 */
-    0xA6C1,      0, 0xC9F9,      0, 0xC9FD, 0xA6C2,      0, 0xA6BD, /* 0x50 */
-         0, 0xA6BE,      0, 0xA6C4, 0xC9FA, 0xA6BC, 0xA845, 0xA6BF, /* 0x50 */
-    0xA6C0, 0xA6C3,      0,      0,      0, 0xCB5B, 0xCB59, 0xCB4C, /* 0x60 */
-    0xA851, 0xCB53, 0xA84C, 0xCB4D,      0, 0xCB55,      0, 0xCB52, /* 0x60 */
-    0xA84F, 0xCB51, 0xA856, 0xCB5A, 0xA858,      0, 0xA85A,      0, /* 0x70 */
-    0xCB4B,      0, 0xA84D, 0xCB5C,      0, 0xA854, 0xA857,      0, /* 0x70 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE5F6, 0xE5F5, 0xE5F8, 0xE9E7, 0xE9E6, 0xBEFB, 0xE9E8, 	 0, /* 0x00 */
+    0xC0D6, 0xED4D, 	 0, 0xEFEA, 0xF25B, 0xF6E7, 	 0, 0xA4F3, /* 0x00 */
+    0xA5C2, 0xA5C1, 	 0, 0xAA5D, 0xC961, 0xC97E, 0xA6BB, 	 0, /* 0x10 */
+    0xC9F7, 0xCB49, 0xCB4A, 0xAA5E, 	 0, 0xCCED, 	 0, 0xAC74, /* 0x10 */
+    0xCF6B, 0xCF6C, 	 0, 0xAEF0, 0xAEF4, 0xD244, 0xAEF3, 0xAEF1, /* 0x20 */
+    0xAEF2, 	 0, 0xD5DF, 0xB242, 0xB4E3, 	 0, 0xB4E1, 0xB4E2, /* 0x20 */
+    0xD9E6, 	 0, 	 0, 0xBA72, 0xA4F4, 	 0, 0xC9A1, 	 0, /* 0x30 */
+    0xA5C3, 	 0, 	 0, 0xC9A4, 	 0, 	 0, 0xA5C6, 0xC9A3, /* 0x30 */
+    0xA5C5, 0xA5C4, 0xA844, 0xC9A2, 	 0, 	 0, 0xC9F8, 	 0, /* 0x40 */
+         0, 	 0, 0xC9FC, 0xC9FE, 0xCA40, 0xA6C5, 0xA6C6, 0xC9FB, /* 0x40 */
+    0xA6C1, 	 0, 0xC9F9, 	 0, 0xC9FD, 0xA6C2, 	 0, 0xA6BD, /* 0x50 */
+         0, 0xA6BE, 	 0, 0xA6C4, 0xC9FA, 0xA6BC, 0xA845, 0xA6BF, /* 0x50 */
+    0xA6C0, 0xA6C3, 	 0, 	 0, 	 0, 0xCB5B, 0xCB59, 0xCB4C, /* 0x60 */
+    0xA851, 0xCB53, 0xA84C, 0xCB4D, 	 0, 0xCB55, 	 0, 0xCB52, /* 0x60 */
+    0xA84F, 0xCB51, 0xA856, 0xCB5A, 0xA858, 	 0, 0xA85A, 	 0, /* 0x70 */
+    0xCB4B, 	 0, 0xA84D, 0xCB5C, 	 0, 0xA854, 0xA857, 	 0, /* 0x70 */
     0xCD45, 0xA847, 0xA85E, 0xA855, 0xCB4E, 0xA84A, 0xA859, 0xCB56, /* 0x80 */
     0xA848, 0xA849, 0xCD43, 0xCB4F, 0xA850, 0xA85B, 0xCB5D, 0xCB50, /* 0x80 */
-    0xA84E,      0, 0xA853, 0xCCEE, 0xA85C, 0xCB57, 0xA852,      0, /* 0x90 */
-    0xA85D, 0xA846, 0xCB54, 0xA84B, 0xCB58, 0xCD44,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0, 0xAA6A, 0xAA7A, 0xCCF5, 0xAA71,      0, /* 0xA0 */
-    0xCD4B, 0xAA62,      0, 0xAA65, 0xCD42,      0, 0xCCF3, 0xCCF7, /* 0xB0 */
+    0xA84E, 	 0, 0xA853, 0xCCEE, 0xA85C, 0xCB57, 0xA852, 	 0, /* 0x90 */
+    0xA85D, 0xA846, 0xCB54, 0xA84B, 0xCB58, 0xCD44, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xAA6A, 0xAA7A, 0xCCF5, 0xAA71, 	 0, /* 0xA0 */
+    0xCD4B, 0xAA62, 	 0, 0xAA65, 0xCD42, 	 0, 0xCCF3, 0xCCF7, /* 0xB0 */
     0xAA6D, 0xAA6F, 0xCCFA, 0xAA76, 0xAA68, 0xAA66, 0xAA67, 0xAA75, /* 0xB0 */
     0xCD47, 0xAA70, 0xCCF9, 0xCCFB, 0xAA6E, 0xAA73, 0xCCFC, 0xCD4A, /* 0xC0 */
-         0, 0xAC75, 0xAA79,      0, 0xAA63, 0xCD49,      0, 0xCD4D, /* 0xC0 */
+         0, 0xAC75, 0xAA79, 	 0, 0xAA63, 0xCD49, 	 0, 0xCD4D, /* 0xC0 */
     0xCCF8, 0xCD4F, 0xCD40, 0xAA6C, 0xCCF4, 0xAA6B, 0xAA7D, 0xAA72, /* 0xD0 */
-         0, 0xCCF2, 0xCF75, 0xAA78, 0xAA7C, 0xCD41, 0xCD46,      0, /* 0xD0 */
-    0xAA7E, 0xAA77, 0xAA69, 0xAA5F,      0, 0xAA64,      0, 0xCCF6, /* 0xE0 */
-    0xAA60, 0xCD4E,      0, 0xCCF0, 0xCCEF, 0xCCFD, 0xCCF1, 0xAA7B, /* 0xE0 */
-    0xAEF5, 0xAA74, 0xCCFE, 0xAA61,      0, 0xACA6,      0,      0, /* 0xF0 */
-         0, 0xCD4C                                                  /* 0xF0 */
+         0, 0xCCF2, 0xCF75, 0xAA78, 0xAA7C, 0xCD41, 0xCD46, 	 0, /* 0xD0 */
+    0xAA7E, 0xAA77, 0xAA69, 0xAA5F, 	 0, 0xAA64, 	 0, 0xCCF6, /* 0xE0 */
+    0xAA60, 0xCD4E, 	 0, 0xCCF0, 0xCCEF, 0xCCFD, 0xCCF1, 0xAA7B, /* 0xE0 */
+    0xAEF5, 0xAA74, 0xCCFE, 0xAA61, 	 0, 0xACA6, 	 0, 	 0, /* 0xF0 */
+         0, 0xCD4C													/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_6D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xCF7C, 0xCFA1,      0, 0xCFA4, 0xCF77,      0,      0, 0xCFA7, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xCF7C, 0xCFA1, 	 0, 0xCFA4, 0xCF77, 	 0, 	 0, 0xCFA7, /* 0x00 */
     0xCFAA, 0xCFAC, 0xCF74, 0xAC76, 0xAC7B, 0xD249, 0xACAD, 0xCFA5, /* 0x00 */
-    0xCFAD, 0xCF7B, 0xCF73,      0,      0,      0, 0xD264, 0xAC7E, /* 0x10 */
-    0xCFA2, 0xCF78, 0xCF7A, 0xACA5,      0, 0xCF7D, 0xAC7D, 0xCF70, /* 0x10 */
-    0xCFA8,      0, 0xCFAB,      0,      0, 0xAC7A,      0, 0xACA8, /* 0x20 */
+    0xCFAD, 0xCF7B, 0xCF73, 	 0, 	 0, 	 0, 0xD264, 0xAC7E, /* 0x10 */
+    0xCFA2, 0xCF78, 0xCF7A, 0xACA5, 	 0, 0xCF7D, 0xAC7D, 0xCF70, /* 0x10 */
+    0xCFA8, 	 0, 0xCFAB, 	 0, 	 0, 0xAC7A, 	 0, 0xACA8, /* 0x20 */
     0xCF6D, 0xACAA, 0xAC78, 0xACAE, 0xCFA9, 0xCF6F, 0xACAB, 0xD25E, /* 0x20 */
     0xCD48, 0xAC7C, 0xAC77, 0xCF76, 0xCF6E, 0xACAC, 0xACA4, 0xCFA3, /* 0x30 */
     0xACA9, 0xACA7, 0xCF79, 0xACA1, 0xCF71, 0xACA2, 0xACA3, 0xCF72, /* 0x30 */
-    0xCFA6, 0xAC79, 0xCF7E,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xD24C, 0xAEFD, 0xAF43,      0,      0,      0, 0xD255, 0xD25B, /* 0x50 */
+    0xCFA6, 0xAC79, 0xCF7E, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xD24C, 0xAEFD, 0xAF43, 	 0, 	 0, 	 0, 0xD255, 0xD25B, /* 0x50 */
     0xD257, 0xD24A, 0xD24D, 0xD246, 0xD247, 0xAF4A, 0xAEFA, 0xD256, /* 0x60 */
-    0xD25F, 0xAF45, 0xAEF6,      0, 0xAF40, 0xD24E, 0xAF42, 0xD24F, /* 0x60 */
-    0xD259,      0,      0,      0, 0xAF44, 0xD268, 0xD248, 0xAEFC, /* 0x70 */
+    0xD25F, 0xAF45, 0xAEF6, 	 0, 0xAF40, 0xD24E, 0xAF42, 0xD24F, /* 0x60 */
+    0xD259, 	 0, 	 0, 	 0, 0xAF44, 0xD268, 0xD248, 0xAEFC, /* 0x70 */
     0xAEFB, 0xAF48, 0xD245, 0xD266, 0xD25A, 0xD267, 0xD261, 0xD253, /* 0x70 */
-    0xD262,      0, 0xD25C, 0xD265, 0xD263, 0xAF49, 0xD254, 0xAEF9, /* 0x80 */
-    0xAEF8, 0xAF41, 0xAF47, 0xD260, 0xAF46, 0xD251, 0xB243,      0, /* 0x80 */
-    0xD269, 0xD250, 0xD24B, 0xAEFE, 0xAF4B, 0xAEF7,      0, 0xD258, /* 0x90 */
-    0xD25D,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xB265, 0xD5E1, 0xD5E5,      0, 0xB252, 0xB250, /* 0xA0 */
-         0,      0, 0xB247, 0xD5E3, 0xD5E2, 0xB25B,      0, 0xD5E8, /* 0xB0 */
-    0xB255,      0, 0xD5FA, 0xD647, 0xB244, 0xD5F7, 0xD5F0, 0xB267, /* 0xB0 */
-    0xD5E0,      0, 0xD5FC,      0, 0xB264, 0xB258, 0xB263, 0xB24E, /* 0xC0 */
-    0xD5EC, 0xD5FE, 0xD5F6, 0xB24F, 0xB249, 0xD645,      0, 0xD5FD, /* 0xC0 */
+    0xD262, 	 0, 0xD25C, 0xD265, 0xD263, 0xAF49, 0xD254, 0xAEF9, /* 0x80 */
+    0xAEF8, 0xAF41, 0xAF47, 0xD260, 0xAF46, 0xD251, 0xB243, 	 0, /* 0x80 */
+    0xD269, 0xD250, 0xD24B, 0xAEFE, 0xAF4B, 0xAEF7, 	 0, 0xD258, /* 0x90 */
+    0xD25D, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xB265, 0xD5E1, 0xD5E5, 	 0, 0xB252, 0xB250, /* 0xA0 */
+         0, 	 0, 0xB247, 0xD5E3, 0xD5E2, 0xB25B, 	 0, 0xD5E8, /* 0xB0 */
+    0xB255, 	 0, 0xD5FA, 0xD647, 0xB244, 0xD5F7, 0xD5F0, 0xB267, /* 0xB0 */
+    0xD5E0, 	 0, 0xD5FC, 	 0, 0xB264, 0xB258, 0xB263, 0xB24E, /* 0xC0 */
+    0xD5EC, 0xD5FE, 0xD5F6, 0xB24F, 0xB249, 0xD645, 	 0, 0xD5FD, /* 0xC0 */
     0xD640, 0xB251, 0xB259, 0xD642, 0xD5EA, 0xD5FB, 0xD5EF, 0xD644, /* 0xD0 */
     0xB25E, 0xB246, 0xB25C, 0xD5F4, 0xD5F2, 0xD5F3, 0xB253, 0xD5EE, /* 0xD0 */
-    0xD5ED, 0xB248, 0xD5E7, 0xD646, 0xB24A, 0xD5F1, 0xB268,      0, /* 0xE0 */
+    0xD5ED, 0xB248, 0xD5E7, 0xD646, 0xB24A, 0xD5F1, 0xB268, 	 0, /* 0xE0 */
     0xB262, 0xD5E6, 0xB25F, 0xB25D, 0xB266, 0xD5F8, 0xB261, 0xD252, /* 0xE0 */
     0xD5F9, 0xB260, 0xD641, 0xB245, 0xD5F5, 0xB257, 0xD5E9, 0xB256, /* 0xF0 */
-         0, 0xB254, 0xB24C, 0xB24B, 0xD9E7, 0xD643                  /* 0xF0 */
+         0, 0xB254, 0xB24C, 0xB24B, 0xD9E7, 0xD643					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_6E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD5EB,      0,      0, 0xD9FC,      0, 0xB24D,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xB541, 0xB25A, 0xB4EE, 0xD9F6, 0xB4FC,      0, 0xD9EA, /* 0x10 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD5EB, 	 0, 	 0, 0xD9FC, 	 0, 0xB24D, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xB541, 0xB25A, 0xB4EE, 0xD9F6, 0xB4FC, 	 0, 0xD9EA, /* 0x10 */
     0xB4EB, 0xB4E7, 0xDA49, 0xB4ED, 0xB4F1, 0xB4EC, 0xB4F5, 0xDA4D, /* 0x20 */
-    0xDA44,      0,      0, 0xD9F1, 0xB4FA, 0xB4F4, 0xD9FD, 0xB4E4, /* 0x20 */
-    0xDA4A, 0xDA43, 0xB4E8, 0xD9F7, 0xB4F7, 0xDA55, 0xDA56,      0, /* 0x30 */
+    0xDA44, 	 0, 	 0, 0xD9F1, 0xB4FA, 0xB4F4, 0xD9FD, 0xB4E4, /* 0x20 */
+    0xDA4A, 0xDA43, 0xB4E8, 0xD9F7, 0xB4F7, 0xDA55, 0xDA56, 	 0, /* 0x30 */
     0xB4E5, 0xDA48, 0xB4F9, 0xD9FB, 0xD9ED, 0xD9EE, 0xB4FD, 0xD9F2, /* 0x30 */
-    0xD9F9, 0xD9F3,      0, 0xB4FB, 0xB544, 0xD9EF, 0xD9E8, 0xD9E9, /* 0x40 */
-         0, 0xD9EB, 0xB4EA, 0xD9F8,      0, 0xB4F8, 0xB542,      0, /* 0x40 */
-         0, 0xD9FA, 0xDA53, 0xDA4B, 0xB4E6, 0xDA51, 0xB4F2,      0, /* 0x50 */
-    0xB4F0,      0, 0xDA57, 0xB4EF, 0xDA41, 0xD9F4, 0xD9FE, 0xB547, /* 0x50 */
+    0xD9F9, 0xD9F3, 	 0, 0xB4FB, 0xB544, 0xD9EF, 0xD9E8, 0xD9E9, /* 0x40 */
+         0, 0xD9EB, 0xB4EA, 0xD9F8, 	 0, 0xB4F8, 0xB542, 	 0, /* 0x40 */
+         0, 0xD9FA, 0xDA53, 0xDA4B, 0xB4E6, 0xDA51, 0xB4F2, 	 0, /* 0x50 */
+    0xB4F0, 	 0, 0xDA57, 0xB4EF, 0xDA41, 0xD9F4, 0xD9FE, 0xB547, /* 0x50 */
     0xDA45, 0xDA42, 0xD9F0, 0xB543, 0xDA4F, 0xDA4C, 0xDA54, 0xB4E9, /* 0x60 */
-    0xDA40, 0xB546,      0, 0xDA47,      0,      0, 0xB4F3, 0xB4F6, /* 0x60 */
-         0, 0xDA46, 0xB545, 0xD9F5, 0xD5E4,      0,      0, 0xDA50, /* 0x70 */
-    0xDA4E, 0xDA52,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xD9EC, 0xB540,      0,      0,      0, 0xDE61, 0xDE60, 0xDE46, /* 0x80 */
-    0xB7BD,      0, 0xDE5F, 0xDE49, 0xDE4A,      0, 0xB7C7, 0xDE68, /* 0x90 */
-    0xB7C2, 0xDE5E,      0, 0xDE43, 0xB7C8, 0xB7BE, 0xDE52, 0xDE48, /* 0x90 */
+    0xDA40, 0xB546, 	 0, 0xDA47, 	 0, 	 0, 0xB4F3, 0xB4F6, /* 0x60 */
+         0, 0xDA46, 0xB545, 0xD9F5, 0xD5E4, 	 0, 	 0, 0xDA50, /* 0x70 */
+    0xDA4E, 0xDA52, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xD9EC, 0xB540, 	 0, 	 0, 	 0, 0xDE61, 0xDE60, 0xDE46, /* 0x80 */
+    0xB7BD, 	 0, 0xDE5F, 0xDE49, 0xDE4A, 	 0, 0xB7C7, 0xDE68, /* 0x90 */
+    0xB7C2, 0xDE5E, 	 0, 0xDE43, 0xB7C8, 0xB7BE, 0xDE52, 0xDE48, /* 0x90 */
     0xDE4B, 0xDE63, 0xB7B8, 0xDE6A, 0xDE62, 0xB7C1, 0xDE57, 0xB7CC, /* 0xA0 */
-         0,      0, 0xB7CB, 0xB7C5,      0,      0, 0xDE69, 0xB7B9, /* 0xA0 */
-    0xDE55, 0xDE4C, 0xDE59, 0xDE65, 0xB7CD,      0, 0xB7BB, 0xDE54, /* 0xB0 */
-         0, 0xDE4D, 0xB7C4,      0, 0xB7C3, 0xDE50, 0xDE5A, 0xDE64, /* 0xB0 */
+         0, 	 0, 0xB7CB, 0xB7C5, 	 0, 	 0, 0xDE69, 0xB7B9, /* 0xA0 */
+    0xDE55, 0xDE4C, 0xDE59, 0xDE65, 0xB7CD, 	 0, 0xB7BB, 0xDE54, /* 0xB0 */
+         0, 0xDE4D, 0xB7C4, 	 0, 0xB7C3, 0xDE50, 0xDE5A, 0xDE64, /* 0xB0 */
     0xDE47, 0xDE51, 0xB7BC, 0xDE5B, 0xB7C9, 0xB7C0, 0xDE4E, 0xB7BF, /* 0xC0 */
     0xDE45, 0xDE53, 0xDE67, 0xB4FE, 0xBAB0, 0xDE56, 0xE26C, 0xDE58, /* 0xC0 */
-    0xDE66, 0xB7C6, 0xDE4F, 0xB7BA, 0xB7CA, 0xBCF0, 0xDE44,      0, /* 0xD0 */
-    0xDE5D,      0,      0,      0, 0xDE5C,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xE2AA, 0xBAAD, 0xE27D, 0xE2A4, 0xBAA2, /* 0xE0 */
-         0, 0xE26E, 0xBAAF,      0, 0xBA77, 0xE26D, 0xE2B0, 0xBAB1, /* 0xF0 */
-    0xE271, 0xE2A3,      0, 0xE273, 0xE2B3, 0xE2AF, 0xBA75, 0xBAA1  /* 0xF0 */
+    0xDE66, 0xB7C6, 0xDE4F, 0xB7BA, 0xB7CA, 0xBCF0, 0xDE44, 	 0, /* 0xD0 */
+    0xDE5D, 	 0, 	 0, 	 0, 0xDE5C, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xE2AA, 0xBAAD, 0xE27D, 0xE2A4, 0xBAA2, /* 0xE0 */
+         0, 0xE26E, 0xBAAF, 	 0, 0xBA77, 0xE26D, 0xE2B0, 0xBAB1, /* 0xF0 */
+    0xE271, 0xE2A3, 	 0, 0xE273, 0xE2B3, 0xE2AF, 0xBA75, 0xBAA1	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_6F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE653, 0xBAAE, 0xBA7D, 0xE26F,      0, 0xE2AE, 0xBAA3, 0xE2AB, /* 0x00 */
-    0xE2B8, 0xE275, 0xE27E,      0,      0, 0xE2B6, 0xE2AC, 0xBA7C, /* 0x00 */
-         0,      0, 0xE27C, 0xBA76, 0xBA74, 0xBAA8,      0,      0, /* 0x10 */
-    0xE27A, 0xE277, 0xE278,      0, 0xE2B2,      0, 0xE2B7, 0xE2B5, /* 0x10 */
-    0xBA7A, 0xE2B9, 0xBA7E, 0xBAA7,      0, 0xE270, 0xE5FA, 0xE279, /* 0x20 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE653, 0xBAAE, 0xBA7D, 0xE26F, 	 0, 0xE2AE, 0xBAA3, 0xE2AB, /* 0x00 */
+    0xE2B8, 0xE275, 0xE27E, 	 0, 	 0, 0xE2B6, 0xE2AC, 0xBA7C, /* 0x00 */
+         0, 	 0, 0xE27C, 0xBA76, 0xBA74, 0xBAA8, 	 0, 	 0, /* 0x10 */
+    0xE27A, 0xE277, 0xE278, 	 0, 0xE2B2, 	 0, 0xE2B7, 0xE2B5, /* 0x10 */
+    0xBA7A, 0xE2B9, 0xBA7E, 0xBAA7, 	 0, 0xE270, 0xE5FA, 0xE279, /* 0x20 */
          0, 0xBA78, 0xBAAC, 0xBAA9, 0xBA7B, 0xE2A5, 0xE274, 0xBAAA, /* 0x20 */
-    0xE2A7, 0xBAA4, 0xBAA6, 0xBA73,      0, 0xE2A9, 0xE2A1, 0xE272, /* 0x30 */
-    0xBAA5, 0xE2B1, 0xE2B4, 0xE27B, 0xE2A8,      0, 0xBA79, 0xBCDF, /* 0x30 */
-    0xE2A6, 0xE5F9,      0, 0xE2AD,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0, 0xE276, 0xE644, /* 0x40 */
-    0xE64E, 0xBCE2, 0xE64D, 0xE659, 0xBCE4, 0xE64B,      0, 0xE64F, /* 0x50 */
-    0xBCEF,      0, 0xE646, 0xBCE7,      0, 0xE652, 0xE9F0, 0xBCF3, /* 0x50 */
-    0xBCF2, 0xE654, 0xE643, 0xE65E, 0xBCED,      0, 0xBCE3, 0xE657, /* 0x60 */
+    0xE2A7, 0xBAA4, 0xBAA6, 0xBA73, 	 0, 0xE2A9, 0xE2A1, 0xE272, /* 0x30 */
+    0xBAA5, 0xE2B1, 0xE2B4, 0xE27B, 0xE2A8, 	 0, 0xBA79, 0xBCDF, /* 0x30 */
+    0xE2A6, 0xE5F9, 	 0, 0xE2AD, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE276, 0xE644, /* 0x40 */
+    0xE64E, 0xBCE2, 0xE64D, 0xE659, 0xBCE4, 0xE64B, 	 0, 0xE64F, /* 0x50 */
+    0xBCEF, 	 0, 0xE646, 0xBCE7, 	 0, 0xE652, 0xE9F0, 0xBCF3, /* 0x50 */
+    0xBCF2, 0xE654, 0xE643, 0xE65E, 0xBCED, 	 0, 0xBCE3, 0xE657, /* 0x60 */
          0, 0xE65B, 0xE660, 0xE655, 0xE649, 0xBCE6, 0xBCE9, 0xBCF1, /* 0x60 */
-    0xBCEC,      0, 0xE64C, 0xE2A2,      0,      0, 0xE648, 0xE65F, /* 0x70 */
-    0xBCE8,      0, 0xBCEB, 0xE661, 0xBCE0, 0xE656, 0xE5FB, 0xE65C, /* 0x70 */
-    0xC0DF,      0, 0xE64A,      0, 0xBCE1, 0xE645, 0xBCE5, 0xE5FC, /* 0x80 */
-    0xBAAB, 0xE641,      0, 0xE65A, 0xE642, 0xE640, 0xBCEA,      0, /* 0x80 */
-    0xE658,      0, 0xE5FE, 0xE651, 0xE650, 0xE65D, 0xE647, 0xBCEE, /* 0x90 */
-         0,      0,      0,      0,      0,      0, 0xE9F3,      0, /* 0x90 */
+    0xBCEC, 	 0, 0xE64C, 0xE2A2, 	 0, 	 0, 0xE648, 0xE65F, /* 0x70 */
+    0xBCE8, 	 0, 0xBCEB, 0xE661, 0xBCE0, 0xE656, 0xE5FB, 0xE65C, /* 0x70 */
+    0xC0DF, 	 0, 0xE64A, 	 0, 0xBCE1, 0xE645, 0xBCE5, 0xE5FC, /* 0x80 */
+    0xBAAB, 0xE641, 	 0, 0xE65A, 0xE642, 0xE640, 0xBCEA, 	 0, /* 0x80 */
+    0xE658, 	 0, 0xE5FE, 0xE651, 0xE650, 0xE65D, 0xE647, 0xBCEE, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE9F3, 	 0, /* 0x90 */
     0xBF49, 0xBEFE, 0xEA40, 0xE9EB, 0xBF41, 0xE9F7, 0xBF48, 0xBF43, /* 0xA0 */
     0xE9F5, 0xED4F, 0xE9FB, 0xEA42, 0xE9FA, 0xE9E9, 0xE9F8, 0xEA44, /* 0xA0 */
-    0xEA46, 0xBEFD, 0xEA45, 0xBF44, 0xBF4A,      0, 0xBF47,      0, /* 0xB0 */
-    0xE9FE, 0xBF46, 0xE9F9,      0, 0xE9ED, 0xE9F2,      0, 0xE9FD, /* 0xB0 */
-    0xBF45, 0xBF42, 0xBEFC, 0xBF40, 0xE9F1,      0, 0xE5FD, 0xE9EC, /* 0xC0 */
+    0xEA46, 0xBEFD, 0xEA45, 0xBF44, 0xBF4A, 	 0, 0xBF47, 	 0, /* 0xB0 */
+    0xE9FE, 0xBF46, 0xE9F9, 	 0, 0xE9ED, 0xE9F2, 	 0, 0xE9FD, /* 0xB0 */
+    0xBF45, 0xBF42, 0xBEFC, 0xBF40, 0xE9F1, 	 0, 0xE5FD, 0xE9EC, /* 0xC0 */
     0xE9EF, 0xEA41, 0xE9F4, 0xE9EA, 0xED4E, 0xEA43, 0xE9EE, 0xE9FC, /* 0xC0 */
-         0,      0,      0,      0, 0xED51, 0xC0E3,      0,      0, /* 0xD0 */
-    0xC0D7,      0,      0, 0xC0DB, 0xED53, 0xED59, 0xED57, 0xC0D9, /* 0xD0 */
-    0xC0DA, 0xC0E1, 0xED5A, 0xED52, 0xC0DC,      0, 0xED56, 0xED55, /* 0xE0 */
-    0xED5B, 0xC0E2,      0, 0xC0DD, 0xC0E0, 0xED54, 0xC0E4, 0xC0DE, /* 0xE0 */
-    0xC0E5, 0xC0D8, 0xED58,      0, 0xED50,      0,      0, 0xEFF7, /* 0xF0 */
-         0,      0, 0xC271, 0xEFF4, 0xEFF6,      0, 0xC26F, 0xEFF2  /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 0xED51, 0xC0E3, 	 0, 	 0, /* 0xD0 */
+    0xC0D7, 	 0, 	 0, 0xC0DB, 0xED53, 0xED59, 0xED57, 0xC0D9, /* 0xD0 */
+    0xC0DA, 0xC0E1, 0xED5A, 0xED52, 0xC0DC, 	 0, 0xED56, 0xED55, /* 0xE0 */
+    0xED5B, 0xC0E2, 	 0, 0xC0DD, 0xC0E0, 0xED54, 0xC0E4, 0xC0DE, /* 0xE0 */
+    0xC0E5, 0xC0D8, 0xED58, 	 0, 0xED50, 	 0, 	 0, 0xEFF7, /* 0xF0 */
+         0, 	 0, 0xC271, 0xEFF4, 0xEFF6, 	 0, 0xC26F, 0xEFF2	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_70[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xEFF3, 0xEFEE,      0,      0, 0xE9F6, 0xEFEF, 0xC270, 0xEFEB, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xEFF3, 0xEFEE, 	 0, 	 0, 0xE9F6, 0xEFEF, 0xC270, 0xEFEB, /* 0x00 */
          0, 0xC26D, 0xEFF8, 0xC26E, 0xEFEC, 0xEFED, 0xEFF1, 0xC273, /* 0x00 */
-         0, 0xC272,      0,      0, 0xEFF0, 0xC378, 0xF25F, 0xF265, /* 0x10 */
-    0xC379, 0xF25C, 0xC376, 0xC373, 0xF267, 0xC377,      0, 0xC374, /* 0x10 */
-    0xF25E, 0xF261, 0xF262, 0xF263, 0xF266,      0, 0xEFF5, 0xF25D, /* 0x20 */
-    0xC375, 0xF264, 0xF268, 0xF260,      0,      0,      0, 0xF45D, /* 0x20 */
-    0xC46A, 0xF460, 0xC46B, 0xF468, 0xF45F, 0xF45C,      0, 0xF45E, /* 0x30 */
-    0xF462, 0xF465, 0xF464, 0xF467, 0xF45B,      0, 0xC469, 0xF463, /* 0x30 */
-    0xF466, 0xF469, 0xF461, 0xF5D3, 0xF5D4, 0xF5D8, 0xF5D9,      0, /* 0x40 */
-    0xF5D6, 0xF5D7, 0xF5D5,      0, 0xC4E9,      0,      0,      0, /* 0x40 */
-         0, 0xC578, 0xF6EB,      0,      0, 0xF6E8, 0xF6E9, 0xF6EA, /* 0x50 */
-    0xC579,      0, 0xF7E5, 0xF7E4,      0, 0xF8AF, 0xC5F4, 0xF8AD, /* 0x50 */
-    0xF8B0, 0xF8AE, 0xF8F5, 0xC657, 0xC665, 0xF9A3, 0xF96C,      0, /* 0x60 */
-    0xF9A2, 0xF9D0, 0xF9D1, 0xA4F5,      0,      0,      0,      0, /* 0x60 */
-    0xA6C7, 0xCA41,      0,      0, 0xCB5E,      0, 0xA85F,      0, /* 0x70 */
-    0xA862,      0, 0xCB5F,      0, 0xA860, 0xA861,      0,      0, /* 0x70 */
-         0,      0, 0xCD58, 0xCD5A, 0xCD55, 0xCD52, 0xCD54,      0, /* 0x80 */
-         0,      0, 0xAAA4,      0,      0,      0, 0xAAA2,      0, /* 0x80 */
-         0, 0xCD56, 0xAAA3, 0xCD53, 0xCD50, 0xAAA1, 0xCD57,      0, /* 0x90 */
-    0xCD51, 0xAAA5, 0xCD59,      0,      0,      0,      0, 0xCFAF, /* 0x90 */
-         0, 0xCFB3,      0,      0, 0xACB7,      0,      0,      0, /* 0xA0 */
-         0, 0xCFB6,      0, 0xACAF, 0xACB2, 0xACB4, 0xACB6, 0xACB3, /* 0xA0 */
-    0xCFB2, 0xCFB1,      0, 0xACB1, 0xCFB4, 0xCFB5,      0, 0xCFAE, /* 0xB0 */
-    0xACB5,      0, 0xACB0,      0,      0,      0, 0xCFB0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xD277, 0xD278, 0xD279, /* 0xC0 */
-    0xAF50,      0, 0xAF4C, 0xD26E,      0, 0xD276, 0xD27B, 0xAF51, /* 0xC0 */
-         0, 0xD26C, 0xD272, 0xD26B, 0xD275,      0,      0, 0xD271, /* 0xD0 */
-    0xAF4D, 0xAF4F, 0xD27A,      0, 0xD26A, 0xD26D, 0xD273,      0, /* 0xD0 */
-    0xD274, 0xD27C, 0xD270,      0, 0xAF4E,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0, 0xB26D, /* 0xE0 */
-    0xD64E,      0,      0, 0xD650, 0xD64C,      0, 0xD658, 0xD64A, /* 0xF0 */
-    0xD657, 0xB269, 0xD648, 0xDA5B, 0xD652, 0xB26C,      0, 0xD653  /* 0xF0 */
+         0, 0xC272, 	 0, 	 0, 0xEFF0, 0xC378, 0xF25F, 0xF265, /* 0x10 */
+    0xC379, 0xF25C, 0xC376, 0xC373, 0xF267, 0xC377, 	 0, 0xC374, /* 0x10 */
+    0xF25E, 0xF261, 0xF262, 0xF263, 0xF266, 	 0, 0xEFF5, 0xF25D, /* 0x20 */
+    0xC375, 0xF264, 0xF268, 0xF260, 	 0, 	 0, 	 0, 0xF45D, /* 0x20 */
+    0xC46A, 0xF460, 0xC46B, 0xF468, 0xF45F, 0xF45C, 	 0, 0xF45E, /* 0x30 */
+    0xF462, 0xF465, 0xF464, 0xF467, 0xF45B, 	 0, 0xC469, 0xF463, /* 0x30 */
+    0xF466, 0xF469, 0xF461, 0xF5D3, 0xF5D4, 0xF5D8, 0xF5D9, 	 0, /* 0x40 */
+    0xF5D6, 0xF5D7, 0xF5D5, 	 0, 0xC4E9, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 0xC578, 0xF6EB, 	 0, 	 0, 0xF6E8, 0xF6E9, 0xF6EA, /* 0x50 */
+    0xC579, 	 0, 0xF7E5, 0xF7E4, 	 0, 0xF8AF, 0xC5F4, 0xF8AD, /* 0x50 */
+    0xF8B0, 0xF8AE, 0xF8F5, 0xC657, 0xC665, 0xF9A3, 0xF96C, 	 0, /* 0x60 */
+    0xF9A2, 0xF9D0, 0xF9D1, 0xA4F5, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xA6C7, 0xCA41, 	 0, 	 0, 0xCB5E, 	 0, 0xA85F, 	 0, /* 0x70 */
+    0xA862, 	 0, 0xCB5F, 	 0, 0xA860, 0xA861, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xCD58, 0xCD5A, 0xCD55, 0xCD52, 0xCD54, 	 0, /* 0x80 */
+         0, 	 0, 0xAAA4, 	 0, 	 0, 	 0, 0xAAA2, 	 0, /* 0x80 */
+         0, 0xCD56, 0xAAA3, 0xCD53, 0xCD50, 0xAAA1, 0xCD57, 	 0, /* 0x90 */
+    0xCD51, 0xAAA5, 0xCD59, 	 0, 	 0, 	 0, 	 0, 0xCFAF, /* 0x90 */
+         0, 0xCFB3, 	 0, 	 0, 0xACB7, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xCFB6, 	 0, 0xACAF, 0xACB2, 0xACB4, 0xACB6, 0xACB3, /* 0xA0 */
+    0xCFB2, 0xCFB1, 	 0, 0xACB1, 0xCFB4, 0xCFB5, 	 0, 0xCFAE, /* 0xB0 */
+    0xACB5, 	 0, 0xACB0, 	 0, 	 0, 	 0, 0xCFB0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD277, 0xD278, 0xD279, /* 0xC0 */
+    0xAF50, 	 0, 0xAF4C, 0xD26E, 	 0, 0xD276, 0xD27B, 0xAF51, /* 0xC0 */
+         0, 0xD26C, 0xD272, 0xD26B, 0xD275, 	 0, 	 0, 0xD271, /* 0xD0 */
+    0xAF4D, 0xAF4F, 0xD27A, 	 0, 0xD26A, 0xD26D, 0xD273, 	 0, /* 0xD0 */
+    0xD274, 0xD27C, 0xD270, 	 0, 0xAF4E, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB26D, /* 0xE0 */
+    0xD64E, 	 0, 	 0, 0xD650, 0xD64C, 	 0, 0xD658, 0xD64A, /* 0xF0 */
+    0xD657, 0xB269, 0xD648, 0xDA5B, 0xD652, 0xB26C, 	 0, 0xD653	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_71[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD656,      0, 0xD65A,      0, 0xD64F,      0, 0xD654,      0, /* 0x00 */
-         0, 0xB26A, 0xB26B, 0xD659, 0xD64D, 0xD649, 0xD65B,      0, /* 0x00 */
-    0xD651,      0,      0, 0xD655,      0,      0,      0, 0xD64B, /* 0x10 */
-         0, 0xB548, 0xB549, 0xDA65, 0xB54F,      0, 0xDA59, 0xDA62, /* 0x10 */
-    0xDA58, 0xB54C, 0xDA60, 0xDA5E,      0, 0xDA5F, 0xB54A,      0, /* 0x20 */
-    0xDA63,      0,      0,      0,      0,      0, 0xDA5C, 0xDA5A, /* 0x20 */
-    0xB54B, 0xDA5D, 0xDA61,      0,      0,      0, 0xB54D,      0, /* 0x30 */
-         0,      0, 0xDA64,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xDE70, 0xDE77, 0xDE79, 0xDEA1,      0, 0xB7DA, 0xDE6B, /* 0x40 */
-         0, 0xB7D2,      0, 0xDE7A, 0xB7D7, 0xDEA2, 0xB7CE,      0, /* 0x40 */
-    0xDE7D,      0, 0xDE6D, 0xDE7E, 0xDE6C,      0, 0xB7DC,      0, /* 0x50 */
-    0xDE78, 0xB7CF, 0xDEA3,      0, 0xB7D4, 0xDE71, 0xB7D9, 0xDE7C, /* 0x50 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD656, 	 0, 0xD65A, 	 0, 0xD64F, 	 0, 0xD654, 	 0, /* 0x00 */
+         0, 0xB26A, 0xB26B, 0xD659, 0xD64D, 0xD649, 0xD65B, 	 0, /* 0x00 */
+    0xD651, 	 0, 	 0, 0xD655, 	 0, 	 0, 	 0, 0xD64B, /* 0x10 */
+         0, 0xB548, 0xB549, 0xDA65, 0xB54F, 	 0, 0xDA59, 0xDA62, /* 0x10 */
+    0xDA58, 0xB54C, 0xDA60, 0xDA5E, 	 0, 0xDA5F, 0xB54A, 	 0, /* 0x20 */
+    0xDA63, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDA5C, 0xDA5A, /* 0x20 */
+    0xB54B, 0xDA5D, 0xDA61, 	 0, 	 0, 	 0, 0xB54D, 	 0, /* 0x30 */
+         0, 	 0, 0xDA64, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xDE70, 0xDE77, 0xDE79, 0xDEA1, 	 0, 0xB7DA, 0xDE6B, /* 0x40 */
+         0, 0xB7D2, 	 0, 0xDE7A, 0xB7D7, 0xDEA2, 0xB7CE, 	 0, /* 0x40 */
+    0xDE7D, 	 0, 0xDE6D, 0xDE7E, 0xDE6C, 	 0, 0xB7DC, 	 0, /* 0x50 */
+    0xDE78, 0xB7CF, 0xDEA3, 	 0, 0xB7D4, 0xDE71, 0xB7D9, 0xDE7C, /* 0x50 */
     0xDE6F, 0xDE76, 0xDE72, 0xDE6E, 0xB7D1, 0xB7D8, 0xB7D6, 0xB7D3, /* 0x60 */
-    0xB7DB, 0xB7D0, 0xDE75,      0, 0xB7D5,      0, 0xB54E,      0, /* 0x60 */
-    0xDE7B,      0, 0xDE73,      0,      0,      0,      0,      0, /* 0x70 */
-    0xDE74,      0,      0, 0xE2C1,      0, 0xBAB4,      0,      0, /* 0x70 */
-    0xE2BD, 0xE2C3, 0xE2BF,      0, 0xBAB6, 0xE2BE, 0xE2C2, 0xE2BA, /* 0x80 */
-         0, 0xE2BC, 0xBAB5,      0,      0,      0,      0, 0xE2C0, /* 0x80 */
-    0xE2BB,      0, 0xBAB7,      0, 0xBAB2,      0,      0, 0xE2C4, /* 0x90 */
+    0xB7DB, 0xB7D0, 0xDE75, 	 0, 0xB7D5, 	 0, 0xB54E, 	 0, /* 0x60 */
+    0xDE7B, 	 0, 0xDE73, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+    0xDE74, 	 0, 	 0, 0xE2C1, 	 0, 0xBAB4, 	 0, 	 0, /* 0x70 */
+    0xE2BD, 0xE2C3, 0xE2BF, 	 0, 0xBAB6, 0xE2BE, 0xE2C2, 0xE2BA, /* 0x80 */
+         0, 0xE2BC, 0xBAB5, 	 0, 	 0, 	 0, 	 0, 0xE2C0, /* 0x80 */
+    0xE2BB, 	 0, 0xBAB7, 	 0, 0xBAB2, 	 0, 	 0, 0xE2C4, /* 0x90 */
          0, 0xBAB3, 0xE667, 0xE664, 0xE670, 0xE66A, 0xE66C, 0xBCF4, /* 0x90 */
-    0xE666, 0xE66E,      0,      0, 0xE66D, 0xE66B,      0, 0xE671, /* 0xA0 */
-    0xBCF7, 0xE668, 0xE66F,      0, 0xBCF5,      0,      0, 0xE663, /* 0xA0 */
-    0xE665, 0xBCF6, 0xE662, 0xE672,      0, 0xE669,      0,      0, /* 0xB0 */
-    0xEA4A, 0xBF51,      0,      0, 0xEA55, 0xEA53, 0xBF4B, 0xEA49, /* 0xB0 */
+    0xE666, 0xE66E, 	 0, 	 0, 0xE66D, 0xE66B, 	 0, 0xE671, /* 0xA0 */
+    0xBCF7, 0xE668, 0xE66F, 	 0, 0xBCF5, 	 0, 	 0, 0xE663, /* 0xA0 */
+    0xE665, 0xBCF6, 0xE662, 0xE672, 	 0, 0xE669, 	 0, 	 0, /* 0xB0 */
+    0xEA4A, 0xBF51, 	 0, 	 0, 0xEA55, 0xEA53, 0xBF4B, 0xEA49, /* 0xB0 */
     0xEA4C, 0xEA4D, 0xEA48, 0xBF55, 0xBF56, 0xEA47, 0xEA56, 0xEA51, /* 0xC0 */
-    0xBF4F, 0xBF4C, 0xEA50, 0xEA4E,      0,      0, 0xBF52, 0xEA52, /* 0xC0 */
-    0xBF4D,      0, 0xBF4E,      0, 0xEA4F, 0xBF50, 0xEA4B,      0, /* 0xD0 */
-    0xEA54, 0xBF53, 0xEA57, 0xEA58, 0xBF54,      0,      0, 0xC0E7, /* 0xD0 */
-    0xC0EE, 0xED5C, 0xED62,      0, 0xED60, 0xC0EA, 0xC0E9, 0xC0E6, /* 0xE0 */
-    0xED5E,      0,      0,      0, 0xC0EC, 0xC0EB, 0xC0E8,      0, /* 0xE0 */
-    0xED61, 0xED5D, 0xED5F,      0, 0xC0ED,      0,      0,      0, /* 0xF0 */
-    0xC277, 0xEFFB,      0, 0xC274, 0xC275, 0xEFFD, 0xC276, 0xEFFA  /* 0xF0 */
+    0xBF4F, 0xBF4C, 0xEA50, 0xEA4E, 	 0, 	 0, 0xBF52, 0xEA52, /* 0xC0 */
+    0xBF4D, 	 0, 0xBF4E, 	 0, 0xEA4F, 0xBF50, 0xEA4B, 	 0, /* 0xD0 */
+    0xEA54, 0xBF53, 0xEA57, 0xEA58, 0xBF54, 	 0, 	 0, 0xC0E7, /* 0xD0 */
+    0xC0EE, 0xED5C, 0xED62, 	 0, 0xED60, 0xC0EA, 0xC0E9, 0xC0E6, /* 0xE0 */
+    0xED5E, 	 0, 	 0, 	 0, 0xC0EC, 0xC0EB, 0xC0E8, 	 0, /* 0xE0 */
+    0xED61, 0xED5D, 0xED5F, 	 0, 0xC0ED, 	 0, 	 0, 	 0, /* 0xF0 */
+    0xC277, 0xEFFB, 	 0, 0xC274, 0xC275, 0xEFFD, 0xC276, 0xEFFA	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_72[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xEFF9, 0xF26C, 0xEFFC,      0, 0xF26D, 0xC37A, 0xF26B, /* 0x00 */
-         0,      0, 0xF26A,      0, 0xF269, 0xC37B,      0,      0, /* 0x00 */
-    0xC46C,      0,      0, 0xF46A, 0xF46B,      0,      0,      0, /* 0x10 */
-         0, 0xF5DC, 0xF5DB, 0xC4EA,      0, 0xF5DA, 0xF6EC, 0xF6ED, /* 0x10 */
-         0,      0, 0xF7E6, 0xF8B1,      0,      0, 0xF8F6, 0xF9BC, /* 0x20 */
-    0xC679, 0xF9C6, 0xA4F6,      0, 0xAAA6, 0xAAA7,      0,      0, /* 0x20 */
-    0xACB8,      0,      0,      0,      0, 0xC0EF, 0xA4F7,      0, /* 0x30 */
-    0xAAA8, 0xAF52, 0xB7DD, 0xA4F8,      0, 0xB26E, 0xBAB8, 0xC962, /* 0x30 */
-         0, 0xCFB7, 0xD27D,      0, 0xE2C5,      0, 0xC0F0, 0xA4F9, /* 0x40 */
-    0xAAA9, 0xCFB8, 0xCFB9, 0xDA66, 0xB550,      0,      0, 0xDEA4, /* 0x40 */
-         0,      0, 0xB7DE, 0xE2C6,      0,      0, 0xBCF8,      0, /* 0x50 */
-    0xC37C, 0xA4FA, 0xDA67, 0xA4FB,      0, 0xA6C9, 0xCA42, 0xA6C8, /* 0x50 */
-    0xA865, 0xA864, 0xA863, 0xCB60,      0,      0,      0, 0xAAAA, /* 0x60 */
-         0, 0xAAAB, 0xCD5B,      0, 0xCFBA,      0, 0xCFBD, 0xACBA, /* 0x60 */
-    0xCFBB,      0, 0xACB9, 0xCFBC, 0xACBB,      0, 0xD2A2, 0xD2A1, /* 0x70 */
-    0xD27E, 0xAF53,      0, 0xD65D, 0xD65E, 0xB26F, 0xD65C, 0xD65F, /* 0x70 */
-    0xB552, 0xB270,      0,      0, 0xB551, 0xDA6B, 0xDA6A,      0, /* 0x80 */
-    0xDA68, 0xDA69,      0, 0xDA6C, 0xDEA6, 0xDEA5, 0xDEA9,      0, /* 0x80 */
-    0xDEA8, 0xDEA7, 0xBAB9, 0xE2C9,      0, 0xE2C8, 0xBABA, 0xE2C7, /* 0x90 */
-    0xE673,      0, 0xE674, 0xBCF9,      0, 0xEA59, 0xEA5A,      0, /* 0x90 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xEFF9, 0xF26C, 0xEFFC, 	 0, 0xF26D, 0xC37A, 0xF26B, /* 0x00 */
+         0, 	 0, 0xF26A, 	 0, 0xF269, 0xC37B, 	 0, 	 0, /* 0x00 */
+    0xC46C, 	 0, 	 0, 0xF46A, 0xF46B, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xF5DC, 0xF5DB, 0xC4EA, 	 0, 0xF5DA, 0xF6EC, 0xF6ED, /* 0x10 */
+         0, 	 0, 0xF7E6, 0xF8B1, 	 0, 	 0, 0xF8F6, 0xF9BC, /* 0x20 */
+    0xC679, 0xF9C6, 0xA4F6, 	 0, 0xAAA6, 0xAAA7, 	 0, 	 0, /* 0x20 */
+    0xACB8, 	 0, 	 0, 	 0, 	 0, 0xC0EF, 0xA4F7, 	 0, /* 0x30 */
+    0xAAA8, 0xAF52, 0xB7DD, 0xA4F8, 	 0, 0xB26E, 0xBAB8, 0xC962, /* 0x30 */
+         0, 0xCFB7, 0xD27D, 	 0, 0xE2C5, 	 0, 0xC0F0, 0xA4F9, /* 0x40 */
+    0xAAA9, 0xCFB8, 0xCFB9, 0xDA66, 0xB550, 	 0, 	 0, 0xDEA4, /* 0x40 */
+         0, 	 0, 0xB7DE, 0xE2C6, 	 0, 	 0, 0xBCF8, 	 0, /* 0x50 */
+    0xC37C, 0xA4FA, 0xDA67, 0xA4FB, 	 0, 0xA6C9, 0xCA42, 0xA6C8, /* 0x50 */
+    0xA865, 0xA864, 0xA863, 0xCB60, 	 0, 	 0, 	 0, 0xAAAA, /* 0x60 */
+         0, 0xAAAB, 0xCD5B, 	 0, 0xCFBA, 	 0, 0xCFBD, 0xACBA, /* 0x60 */
+    0xCFBB, 	 0, 0xACB9, 0xCFBC, 0xACBB, 	 0, 0xD2A2, 0xD2A1, /* 0x70 */
+    0xD27E, 0xAF53, 	 0, 0xD65D, 0xD65E, 0xB26F, 0xD65C, 0xD65F, /* 0x70 */
+    0xB552, 0xB270, 	 0, 	 0, 0xB551, 0xDA6B, 0xDA6A, 	 0, /* 0x80 */
+    0xDA68, 0xDA69, 	 0, 0xDA6C, 0xDEA6, 0xDEA5, 0xDEA9, 	 0, /* 0x80 */
+    0xDEA8, 0xDEA7, 0xBAB9, 0xE2C9, 	 0, 0xE2C8, 0xBABA, 0xE2C7, /* 0x90 */
+    0xE673, 	 0, 0xE674, 0xBCF9, 	 0, 0xEA59, 0xEA5A, 	 0, /* 0x90 */
          0, 0xF272, 0xC37D, 0xF271, 0xF270, 0xF26E, 0xF26F, 0xC4EB, /* 0xA0 */
-    0xF46C, 0xF6EE, 0xF8F7,      0, 0xA4FC,      0, 0xC9A5, 0xA5C7, /* 0xA0 */
-    0xC9A6,      0,      0,      0, 0xCA43, 0xCA44,      0,      0, /* 0xB0 */
-         0,      0, 0xCB66,      0,      0, 0xCB62,      0, 0xCB61, /* 0xB0 */
-    0xAAAC, 0xCB65, 0xA867, 0xCB63, 0xA866, 0xCB67, 0xCB64,      0, /* 0xC0 */
-         0, 0xCD5F, 0xCFBE, 0xCD5D, 0xCD64,      0, 0xAAAD,      0, /* 0xC0 */
-    0xAAB0, 0xCD65, 0xCD61,      0, 0xCD62,      0, 0xCD5C, 0xAAAF, /* 0xD0 */
-    0xCD5E, 0xAAAE, 0xCD63,      0, 0xCD60,      0,      0, 0xCFC2, /* 0xD0 */
-    0xACBD, 0xACBE,      0, 0xCFC5, 0xCFBF,      0, 0xCFC4,      0, /* 0xE0 */
-    0xCFC0, 0xACBC, 0xCFC3, 0xCFC1,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0, 0xD2A8, 0xD2A5,      0, 0xD2A7, 0xAF58, /* 0xF0 */
-    0xAF57, 0xAF55, 0xD2A4, 0xD2A9, 0xAF54, 0xAF56, 0xD2A6, 0xD667  /* 0xF0 */
+    0xF46C, 0xF6EE, 0xF8F7, 	 0, 0xA4FC, 	 0, 0xC9A5, 0xA5C7, /* 0xA0 */
+    0xC9A6, 	 0, 	 0, 	 0, 0xCA43, 0xCA44, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xCB66, 	 0, 	 0, 0xCB62, 	 0, 0xCB61, /* 0xB0 */
+    0xAAAC, 0xCB65, 0xA867, 0xCB63, 0xA866, 0xCB67, 0xCB64, 	 0, /* 0xC0 */
+         0, 0xCD5F, 0xCFBE, 0xCD5D, 0xCD64, 	 0, 0xAAAD, 	 0, /* 0xC0 */
+    0xAAB0, 0xCD65, 0xCD61, 	 0, 0xCD62, 	 0, 0xCD5C, 0xAAAF, /* 0xD0 */
+    0xCD5E, 0xAAAE, 0xCD63, 	 0, 0xCD60, 	 0, 	 0, 0xCFC2, /* 0xD0 */
+    0xACBD, 0xACBE, 	 0, 0xCFC5, 0xCFBF, 	 0, 0xCFC4, 	 0, /* 0xE0 */
+    0xCFC0, 0xACBC, 0xCFC3, 0xCFC1, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xD2A8, 0xD2A5, 	 0, 0xD2A7, 0xAF58, /* 0xF0 */
+    0xAF57, 0xAF55, 0xD2A4, 0xD2A9, 0xAF54, 0xAF56, 0xD2A6, 0xD667	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_73[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD2A3, 0xD2AA,      0,      0,      0,      0,      0, 0xD662, /* 0x00 */
-    0xD666,      0, 0xD665, 0xDA6E, 0xDA79,      0,      0, 0xD668, /* 0x00 */
-         0, 0xD663, 0xDA6D, 0xB274,      0,      0, 0xB273, 0xD661, /* 0x10 */
-    0xD664, 0xB275,      0, 0xB272, 0xB271, 0xD660, 0xD669,      0, /* 0x10 */
-         0,      0, 0xDA70, 0xDA77,      0, 0xB554, 0xDA76, 0xDA73, /* 0x20 */
-         0, 0xB556,      0,      0,      0, 0xDA75,      0,      0, /* 0x20 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD2A3, 0xD2AA, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD662, /* 0x00 */
+    0xD666, 	 0, 0xD665, 0xDA6E, 0xDA79, 	 0, 	 0, 0xD668, /* 0x00 */
+         0, 0xD663, 0xDA6D, 0xB274, 	 0, 	 0, 0xB273, 0xD661, /* 0x10 */
+    0xD664, 0xB275, 	 0, 0xB272, 0xB271, 0xD660, 0xD669, 	 0, /* 0x10 */
+         0, 	 0, 0xDA70, 0xDA77, 	 0, 0xB554, 0xDA76, 0xDA73, /* 0x20 */
+         0, 0xB556, 	 0, 	 0, 	 0, 0xDA75, 	 0, 	 0, /* 0x20 */
     0xDA6F, 0xDA71, 0xDA74, 0xDA72, 0xB555, 0xDA78, 0xB553, 0xB7DF, /* 0x30 */
-         0,      0, 0xDEAD, 0xDEAC, 0xDEAA,      0, 0xB7E2, 0xB7E1, /* 0x30 */
-    0xDEAE,      0, 0xDEAB, 0xE2CA, 0xBABB, 0xB7E0,      0,      0, /* 0x40 */
-         0, 0xDEB0, 0xDEAF,      0, 0xE2CD, 0xE2CB, 0xBCFA,      0, /* 0x40 */
-    0xBABC, 0xE2CC, 0xE676,      0,      0,      0,      0, 0xBCFB, /* 0x50 */
-    0xE675, 0xE67E, 0xE67D, 0xE67B,      0, 0xE67A, 0xE677, 0xE678, /* 0x50 */
-    0xE679, 0xE67C, 0xE6A1,      0,      0, 0xEA5F, 0xEA5C, 0xEA5D, /* 0x60 */
-    0xBF57, 0xEA5B, 0xEA61, 0xEA60, 0xEA5E,      0, 0xED64, 0xED65, /* 0x60 */
-    0xC0F1,      0, 0xC0F2, 0xED63,      0, 0xC279, 0xEFFE, 0xC278, /* 0x70 */
-    0xC37E,      0, 0xC3A1, 0xC46D, 0xF46E, 0xF46D, 0xF5DD, 0xF6EF, /* 0x70 */
+         0, 	 0, 0xDEAD, 0xDEAC, 0xDEAA, 	 0, 0xB7E2, 0xB7E1, /* 0x30 */
+    0xDEAE, 	 0, 0xDEAB, 0xE2CA, 0xBABB, 0xB7E0, 	 0, 	 0, /* 0x40 */
+         0, 0xDEB0, 0xDEAF, 	 0, 0xE2CD, 0xE2CB, 0xBCFA, 	 0, /* 0x40 */
+    0xBABC, 0xE2CC, 0xE676, 	 0, 	 0, 	 0, 	 0, 0xBCFB, /* 0x50 */
+    0xE675, 0xE67E, 0xE67D, 0xE67B, 	 0, 0xE67A, 0xE677, 0xE678, /* 0x50 */
+    0xE679, 0xE67C, 0xE6A1, 	 0, 	 0, 0xEA5F, 0xEA5C, 0xEA5D, /* 0x60 */
+    0xBF57, 0xEA5B, 0xEA61, 0xEA60, 0xEA5E, 	 0, 0xED64, 0xED65, /* 0x60 */
+    0xC0F1, 	 0, 0xC0F2, 0xED63, 	 0, 0xC279, 0xEFFE, 0xC278, /* 0x70 */
+    0xC37E, 	 0, 0xC3A1, 0xC46D, 0xF46E, 0xF46D, 0xF5DD, 0xF6EF, /* 0x70 */
     0xC57A, 0xF7E8, 0xF7E7, 0xF7E9, 0xA5C8, 0xCFC6, 0xAF59, 0xB276, /* 0x80 */
-    0xD66A, 0xA5C9, 0xC9A7, 0xA4FD,      0,      0, 0xCA45,      0, /* 0x80 */
-         0,      0, 0xCB6C, 0xCB6A, 0xCB6B, 0xCB68, 0xA868, 0xCB69, /* 0x90 */
-         0,      0,      0,      0,      0, 0xCD6D,      0, 0xAAB3, /* 0x90 */
-    0xCD6B, 0xCD67, 0xCD6A,      0, 0xCD66, 0xAAB5, 0xCD69,      0, /* 0xA0 */
-    0xAAB2, 0xAAB1,      0, 0xAAB4, 0xCD6C, 0xCD68,      0,      0, /* 0xA0 */
-         0,      0, 0xACC2, 0xACC5, 0xCFCE, 0xCFCD, 0xCFCC, 0xACBF, /* 0xB0 */
-    0xCFD5, 0xCFCB,      0, 0xACC1, 0xD2AF,      0, 0xCFD2, 0xCFD0, /* 0xB0 */
-    0xACC4,      0, 0xCFC8, 0xCFD3,      0, 0xCFCA, 0xCFD4, 0xCFD1, /* 0xC0 */
-    0xCFC9,      0, 0xACC0, 0xCFD6, 0xCFC7, 0xACC3,      0,      0, /* 0xC0 */
-         0,      0, 0xD2B4, 0xD2AB, 0xD2B6,      0, 0xD2AE, 0xD2B9, /* 0xD0 */
-    0xD2BA, 0xD2AC, 0xD2B8, 0xD2B5, 0xD2B3, 0xD2B7, 0xAF5F,      0, /* 0xD0 */
-    0xAF5D,      0,      0, 0xD2B1,      0, 0xD2AD,      0, 0xD2B0, /* 0xE0 */
-    0xD2BB, 0xD2B2, 0xAF5E, 0xCFCF,      0, 0xAF5A, 0xAF5C,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xD678, 0xD66D, 0xD66B,      0, /* 0xF0 */
-    0xD66C,      0, 0xD673,      0, 0xD674, 0xD670, 0xB27B, 0xD675  /* 0xF0 */
+    0xD66A, 0xA5C9, 0xC9A7, 0xA4FD, 	 0, 	 0, 0xCA45, 	 0, /* 0x80 */
+         0, 	 0, 0xCB6C, 0xCB6A, 0xCB6B, 0xCB68, 0xA868, 0xCB69, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xCD6D, 	 0, 0xAAB3, /* 0x90 */
+    0xCD6B, 0xCD67, 0xCD6A, 	 0, 0xCD66, 0xAAB5, 0xCD69, 	 0, /* 0xA0 */
+    0xAAB2, 0xAAB1, 	 0, 0xAAB4, 0xCD6C, 0xCD68, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xACC2, 0xACC5, 0xCFCE, 0xCFCD, 0xCFCC, 0xACBF, /* 0xB0 */
+    0xCFD5, 0xCFCB, 	 0, 0xACC1, 0xD2AF, 	 0, 0xCFD2, 0xCFD0, /* 0xB0 */
+    0xACC4, 	 0, 0xCFC8, 0xCFD3, 	 0, 0xCFCA, 0xCFD4, 0xCFD1, /* 0xC0 */
+    0xCFC9, 	 0, 0xACC0, 0xCFD6, 0xCFC7, 0xACC3, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xD2B4, 0xD2AB, 0xD2B6, 	 0, 0xD2AE, 0xD2B9, /* 0xD0 */
+    0xD2BA, 0xD2AC, 0xD2B8, 0xD2B5, 0xD2B3, 0xD2B7, 0xAF5F, 	 0, /* 0xD0 */
+    0xAF5D, 	 0, 	 0, 0xD2B1, 	 0, 0xD2AD, 	 0, 0xD2B0, /* 0xE0 */
+    0xD2BB, 0xD2B2, 0xAF5E, 0xCFCF, 	 0, 0xAF5A, 0xAF5C, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xD678, 0xD66D, 0xD66B, 	 0, /* 0xF0 */
+    0xD66C, 	 0, 0xD673, 	 0, 0xD674, 0xD670, 0xB27B, 0xD675	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_74[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD672, 0xD66F,      0, 0xB279, 0xD66E, 0xB277, 0xB27A, 0xD671, /* 0x00 */
-    0xD679, 0xAF5B, 0xB278, 0xD677, 0xD676, 0xB27C,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xDA7E,      0, /* 0x10 */
-         0,      0, 0xDAA1, 0xB560,      0, 0xDAA7,      0,      0, /* 0x10 */
-    0xDAA9, 0xDAA2, 0xB55A, 0xDAA6, 0xDAA5, 0xB55B, 0xB561,      0, /* 0x20 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD672, 0xD66F, 	 0, 0xB279, 0xD66E, 0xB277, 0xB27A, 0xD671, /* 0x00 */
+    0xD679, 0xAF5B, 0xB278, 0xD677, 0xD676, 0xB27C, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDA7E, 	 0, /* 0x10 */
+         0, 	 0, 0xDAA1, 0xB560, 	 0, 0xDAA7, 	 0, 	 0, /* 0x10 */
+    0xDAA9, 0xDAA2, 0xB55A, 0xDAA6, 0xDAA5, 0xB55B, 0xB561, 	 0, /* 0x20 */
     0xB562, 0xDAA8, 0xB558, 0xDA7D, 0xDA7B, 0xDAA3, 0xDA7A, 0xB55F, /* 0x20 */
-    0xDA7C, 0xDAA4, 0xDAAA, 0xB559, 0xB55E, 0xB55C, 0xB55D,      0, /* 0x30 */
-         0,      0, 0xB557,      0,      0,      0,      0, 0xB7E9, /* 0x30 */
-    0xDEB7, 0xB7E8, 0xDEBB,      0, 0xDEB1,      0, 0xDEBC,      0, /* 0x40 */
-         0,      0, 0xDEB2, 0xDEB3,      0, 0xDEBD, 0xDEBA, 0xDEB8, /* 0x40 */
-    0xDEB9, 0xDEB5, 0xDEB4,      0, 0xDEBE, 0xB7E5,      0, 0xDEB6, /* 0x50 */
-         0, 0xB7EA, 0xB7E4, 0xB7EB, 0xB7EC,      0, 0xB7E7, 0xB7E6, /* 0x50 */
-         0,      0, 0xE2CE, 0xBABE, 0xBABD,      0,      0, 0xE2D3, /* 0x60 */
-         0, 0xBCFC, 0xBABF,      0,      0, 0xBAC1, 0xE2D4, 0xB7E3, /* 0x60 */
-    0xBAC0, 0xE2D0, 0xE2D2, 0xE2CF,      0, 0xE2D1,      0,      0, /* 0x70 */
-         0, 0xE6AB,      0,      0, 0xE6AA, 0xE6A7, 0xBD40, 0xEA62, /* 0x70 */
-    0xBD41, 0xE6A6,      0, 0xBCFE,      0, 0xE6A8, 0xE6A5, 0xE6A2, /* 0x80 */
-    0xE6A9, 0xE6A3, 0xE6A4, 0xBCFD,      0,      0,      0,      0, /* 0x80 */
-    0xED69,      0, 0xEA66,      0, 0xEA65, 0xEA67,      0, 0xED66, /* 0x90 */
-    0xBF5A,      0, 0xEA63,      0, 0xBF58,      0, 0xBF5C, 0xBF5B, /* 0x90 */
-    0xEA64, 0xEA68,      0, 0xBF59,      0, 0xED6D, 0xC0F5, 0xC27A, /* 0xA0 */
-    0xC0F6, 0xC0F3, 0xED6A, 0xED68,      0, 0xED6B,      0, 0xED6E, /* 0xA0 */
-    0xC0F4, 0xED6C, 0xED67,      0,      0, 0xF042, 0xF045, 0xF275, /* 0xB0 */
-    0xF040,      0, 0xF46F, 0xF046,      0, 0xC3A2, 0xF044, 0xC27B, /* 0xB0 */
-    0xF041, 0xF043, 0xF047, 0xF276,      0, 0xF274,      0,      0, /* 0xC0 */
-         0,      0, 0xC3A3, 0xF273,      0,      0,      0, 0xC46E, /* 0xC0 */
-         0,      0,      0,      0, 0xC4ED, 0xF6F1, 0xC4EC, 0xF6F3, /* 0xD0 */
+    0xDA7C, 0xDAA4, 0xDAAA, 0xB559, 0xB55E, 0xB55C, 0xB55D, 	 0, /* 0x30 */
+         0, 	 0, 0xB557, 	 0, 	 0, 	 0, 	 0, 0xB7E9, /* 0x30 */
+    0xDEB7, 0xB7E8, 0xDEBB, 	 0, 0xDEB1, 	 0, 0xDEBC, 	 0, /* 0x40 */
+         0, 	 0, 0xDEB2, 0xDEB3, 	 0, 0xDEBD, 0xDEBA, 0xDEB8, /* 0x40 */
+    0xDEB9, 0xDEB5, 0xDEB4, 	 0, 0xDEBE, 0xB7E5, 	 0, 0xDEB6, /* 0x50 */
+         0, 0xB7EA, 0xB7E4, 0xB7EB, 0xB7EC, 	 0, 0xB7E7, 0xB7E6, /* 0x50 */
+         0, 	 0, 0xE2CE, 0xBABE, 0xBABD, 	 0, 	 0, 0xE2D3, /* 0x60 */
+         0, 0xBCFC, 0xBABF, 	 0, 	 0, 0xBAC1, 0xE2D4, 0xB7E3, /* 0x60 */
+    0xBAC0, 0xE2D0, 0xE2D2, 0xE2CF, 	 0, 0xE2D1, 	 0, 	 0, /* 0x70 */
+         0, 0xE6AB, 	 0, 	 0, 0xE6AA, 0xE6A7, 0xBD40, 0xEA62, /* 0x70 */
+    0xBD41, 0xE6A6, 	 0, 0xBCFE, 	 0, 0xE6A8, 0xE6A5, 0xE6A2, /* 0x80 */
+    0xE6A9, 0xE6A3, 0xE6A4, 0xBCFD, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xED69, 	 0, 0xEA66, 	 0, 0xEA65, 0xEA67, 	 0, 0xED66, /* 0x90 */
+    0xBF5A, 	 0, 0xEA63, 	 0, 0xBF58, 	 0, 0xBF5C, 0xBF5B, /* 0x90 */
+    0xEA64, 0xEA68, 	 0, 0xBF59, 	 0, 0xED6D, 0xC0F5, 0xC27A, /* 0xA0 */
+    0xC0F6, 0xC0F3, 0xED6A, 0xED68, 	 0, 0xED6B, 	 0, 0xED6E, /* 0xA0 */
+    0xC0F4, 0xED6C, 0xED67, 	 0, 	 0, 0xF042, 0xF045, 0xF275, /* 0xB0 */
+    0xF040, 	 0, 0xF46F, 0xF046, 	 0, 0xC3A2, 0xF044, 0xC27B, /* 0xB0 */
+    0xF041, 0xF043, 0xF047, 0xF276, 	 0, 0xF274, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xC3A3, 0xF273, 	 0, 	 0, 	 0, 0xC46E, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xC4ED, 0xF6F1, 0xC4EC, 0xF6F3, /* 0xD0 */
     0xF6F0, 0xF6F2, 0xC5D0, 0xF8B2, 0xA5CA, 0xCD6E, 0xD2BC, 0xD2BD, /* 0xD0 */
-    0xB27D, 0xDEBF, 0xBF5D, 0xC3A4, 0xC57B, 0xF8B3, 0xA5CB,      0, /* 0xE0 */
-    0xCD6F, 0xA260,      0,      0, 0xCFD7,      0, 0xCFD8,      0, /* 0xE0 */
-         0,      0,      0,      0, 0xD2BE, 0xD2BF, 0xB27E, 0xB2A1, /* 0xF0 */
-         0,      0,      0, 0xDAAB,      0, 0xDEC2, 0xDEC1, 0xDEC0  /* 0xF0 */
+    0xB27D, 0xDEBF, 0xBF5D, 0xC3A4, 0xC57B, 0xF8B3, 0xA5CB, 	 0, /* 0xE0 */
+    0xCD6F, 0xA260, 	 0, 	 0, 0xCFD7, 	 0, 0xCFD8, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 0xD2BE, 0xD2BF, 0xB27E, 0xB2A1, /* 0xF0 */
+         0, 	 0, 	 0, 0xDAAB, 	 0, 0xDEC2, 0xDEC1, 0xDEC0	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_75[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE2D5,      0, 0xE2D6, 0xE2D7, 0xBAC2,      0,      0, 0xE6AD, /* 0x00 */
-    0xE6AC,      0,      0, 0xEA69, 0xBF5E, 0xBF5F,      0, 0xED72, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE2D5, 	 0, 0xE2D6, 0xE2D7, 0xBAC2, 	 0, 	 0, 0xE6AD, /* 0x00 */
+    0xE6AC, 	 0, 	 0, 0xEA69, 0xBF5E, 0xBF5F, 	 0, 0xED72, /* 0x00 */
     0xED6F, 0xED70, 0xED71, 0xF049, 0xF048, 0xC27C, 0xF277, 0xF5DE, /* 0x10 */
-    0xA5CC,      0, 0xACC6,      0, 0xB2A2, 0xDEC3,      0, 0xA5CD, /* 0x10 */
-         0, 0xD2C0, 0xB2A3,      0,      0, 0xB563, 0xB564,      0, /* 0x20 */
+    0xA5CC, 	 0, 0xACC6, 	 0, 0xB2A2, 0xDEC3, 	 0, 0xA5CD, /* 0x10 */
+         0, 0xD2C0, 0xB2A3, 	 0, 	 0, 0xB563, 0xB564, 	 0, /* 0x20 */
     0xA5CE, 0xA5CF, 0xCA46, 0xA86A, 0xA869, 0xACC7, 0xCFD9, 0xDAAC, /* 0x20 */
-    0xA5D0, 0xA5D1, 0xA5D2, 0xA5D3,      0,      0,      0, 0xA86B, /* 0x30 */
-    0xA86C, 0xCB6E, 0xCB6D,      0,      0, 0xAAB6, 0xCD72, 0xCD70, /* 0x30 */
-    0xCD71,      0,      0,      0,      0,      0,      0, 0xCFDA, /* 0x40 */
-    0xCFDB,      0,      0, 0xACCB, 0xACC9,      0, 0xACCA, 0xACC8, /* 0x40 */
-         0,      0,      0,      0, 0xAF60,      0,      0,      0, /* 0x50 */
-         0, 0xAF64, 0xAF63, 0xD2C1, 0xAF62, 0xAF61,      0, 0xD2C2, /* 0x50 */
-         0,      0, 0xB2A6, 0xD67B, 0xD67A, 0xB2A4, 0xB2A5,      0, /* 0x60 */
-         0,      0, 0xB566, 0xB565, 0xDAAE,      0,      0, 0xDAAD, /* 0x60 */
-    0xB2A7,      0,      0,      0,      0,      0, 0xB7ED, 0xDEC5, /* 0x70 */
-    0xB7EE, 0xDEC4,      0,      0,      0, 0xE2D8, 0xE6AE, 0xBD42, /* 0x70 */
-    0xEA6A,      0,      0,      0, 0xED73,      0, 0xC3A6, 0xC3A5, /* 0x80 */
-         0,      0, 0xC57C, 0xA5D4, 0xCD73,      0,      0, 0xB2A8, /* 0x80 */
-    0xE2D9, 0xBAC3,      0,      0, 0xCB6F, 0xCB70,      0,      0, /* 0x90 */
-    0xCD74, 0xAAB8, 0xAAB9,      0,      0, 0xAAB7,      0,      0, /* 0x90 */
-         0,      0, 0xACCF, 0xACD0, 0xACCD, 0xACCE,      0, 0xCFDC, /* 0xA0 */
-         0,      0, 0xCFDD, 0xACCC,      0,      0,      0,      0, /* 0xA0 */
-    0xD2C3,      0, 0xAF68, 0xAF69,      0, 0xB2AB, 0xD2C9,      0, /* 0xB0 */
+    0xA5D0, 0xA5D1, 0xA5D2, 0xA5D3, 	 0, 	 0, 	 0, 0xA86B, /* 0x30 */
+    0xA86C, 0xCB6E, 0xCB6D, 	 0, 	 0, 0xAAB6, 0xCD72, 0xCD70, /* 0x30 */
+    0xCD71, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCFDA, /* 0x40 */
+    0xCFDB, 	 0, 	 0, 0xACCB, 0xACC9, 	 0, 0xACCA, 0xACC8, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xAF60, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 0xAF64, 0xAF63, 0xD2C1, 0xAF62, 0xAF61, 	 0, 0xD2C2, /* 0x50 */
+         0, 	 0, 0xB2A6, 0xD67B, 0xD67A, 0xB2A4, 0xB2A5, 	 0, /* 0x60 */
+         0, 	 0, 0xB566, 0xB565, 0xDAAE, 	 0, 	 0, 0xDAAD, /* 0x60 */
+    0xB2A7, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB7ED, 0xDEC5, /* 0x70 */
+    0xB7EE, 0xDEC4, 	 0, 	 0, 	 0, 0xE2D8, 0xE6AE, 0xBD42, /* 0x70 */
+    0xEA6A, 	 0, 	 0, 	 0, 0xED73, 	 0, 0xC3A6, 0xC3A5, /* 0x80 */
+         0, 	 0, 0xC57C, 0xA5D4, 0xCD73, 	 0, 	 0, 0xB2A8, /* 0x80 */
+    0xE2D9, 0xBAC3, 	 0, 	 0, 0xCB6F, 0xCB70, 	 0, 	 0, /* 0x90 */
+    0xCD74, 0xAAB8, 0xAAB9, 	 0, 	 0, 0xAAB7, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xACCF, 0xACD0, 0xACCD, 0xACCE, 	 0, 0xCFDC, /* 0xA0 */
+         0, 	 0, 0xCFDD, 0xACCC, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xD2C3, 	 0, 0xAF68, 0xAF69, 	 0, 0xB2AB, 0xD2C9, 	 0, /* 0xB0 */
     0xAF6E, 0xAF6C, 0xD2CA, 0xD2C5, 0xAF6B, 0xAF6A, 0xAF65, 0xD2C8, /* 0xB0 */
-    0xD2C7, 0xD2C4, 0xAF6D,      0, 0xD2C6, 0xAF66,      0, 0xAF67, /* 0xC0 */
-         0,      0, 0xB2AC, 0xD6A1, 0xD6A2, 0xB2AD, 0xD67C, 0xD67E, /* 0xC0 */
-    0xD6A4, 0xD6A3, 0xD67D,      0, 0xB2A9, 0xB2AA,      0, 0xDAB6, /* 0xD0 */
-    0xB56B, 0xB56A, 0xDAB0, 0xB568,      0, 0xDAB3, 0xB56C, 0xDAB4, /* 0xD0 */
-    0xB56D, 0xDAB1, 0xB567, 0xB569, 0xDAB5,      0, 0xDAB2, 0xDAAF, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xDED2,      0, 0xDEC7, /* 0xE0 */
+    0xD2C7, 0xD2C4, 0xAF6D, 	 0, 0xD2C6, 0xAF66, 	 0, 0xAF67, /* 0xC0 */
+         0, 	 0, 0xB2AC, 0xD6A1, 0xD6A2, 0xB2AD, 0xD67C, 0xD67E, /* 0xC0 */
+    0xD6A4, 0xD6A3, 0xD67D, 	 0, 0xB2A9, 0xB2AA, 	 0, 0xDAB6, /* 0xD0 */
+    0xB56B, 0xB56A, 0xDAB0, 0xB568, 	 0, 0xDAB3, 0xB56C, 0xDAB4, /* 0xD0 */
+    0xB56D, 0xDAB1, 0xB567, 0xB569, 0xDAB5, 	 0, 0xDAB2, 0xDAAF, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDED2, 	 0, 0xDEC7, /* 0xE0 */
     0xB7F0, 0xB7F3, 0xB7F2, 0xB7F7, 0xB7F6, 0xDED3, 0xDED1, 0xDECA, /* 0xF0 */
-    0xDECE, 0xDECD, 0xB7F4, 0xDED0, 0xDECC, 0xDED4, 0xDECB, 0xB7F5  /* 0xF0 */
+    0xDECE, 0xDECD, 0xB7F4, 0xDED0, 0xDECC, 0xDED4, 0xDECB, 0xB7F5	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_76[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xB7EF, 0xB7F1,      0, 0xDEC9,      0,      0,      0,      0, /* 0x00 */
-    0xE2DB, 0xBAC7, 0xE2DF, 0xBAC6, 0xE2DC, 0xBAC5,      0, 0xDEC8, /* 0x00 */
-    0xDECF, 0xE2DE,      0, 0xBAC8, 0xE2E0, 0xE2DD, 0xE2DA,      0, /* 0x10 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xB7EF, 0xB7F1, 	 0, 0xDEC9, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xE2DB, 0xBAC7, 0xE2DF, 0xBAC6, 0xE2DC, 0xBAC5, 	 0, 0xDEC8, /* 0x00 */
+    0xDECF, 0xE2DE, 	 0, 0xBAC8, 0xE2E0, 0xE2DD, 0xE2DA, 	 0, /* 0x10 */
          0, 0xE6B1, 0xE6B5, 0xE6B7, 0xE6B3, 0xE6B2, 0xE6B0, 0xBD45, /* 0x10 */
     0xBD43, 0xBD48, 0xBD49, 0xE6B4, 0xBD46, 0xE6AF, 0xBD47, 0xBAC4, /* 0x20 */
-    0xE6B6, 0xBD44,      0,      0,      0, 0xEA6C,      0, 0xEA6B, /* 0x20 */
-    0xEA73, 0xEA6D, 0xEA72, 0xEA6F, 0xBF60, 0xEA71,      0,      0, /* 0x30 */
-    0xBF61,      0, 0xBF62,      0, 0xEA70, 0xEA6E,      0,      0, /* 0x30 */
-         0,      0, 0xC0F8, 0xED74,      0,      0, 0xC0F7, 0xED77, /* 0x40 */
-    0xED75, 0xED76,      0,      0, 0xC0F9,      0,      0,      0, /* 0x40 */
-    0xF04D,      0, 0xC2A1, 0xF04E,      0,      0, 0xC27D, 0xF04F, /* 0x50 */
-    0xC27E, 0xF04C, 0xF050,      0, 0xF04A,      0,      0, 0xC3A7, /* 0x50 */
-    0xF278, 0xC3A8, 0xC46F,      0, 0xF04B, 0xC470,      0,      0, /* 0x60 */
-         0, 0xC4EE, 0xF5DF,      0, 0xC57E, 0xF6F4, 0xC57D,      0, /* 0x60 */
-    0xF7EA, 0xC5F5, 0xC5F6,      0,      0, 0xF9CC,      0,      0, /* 0x70 */
-    0xACD1, 0xCFDE,      0, 0xB56E, 0xB56F, 0xA5D5, 0xA6CA, 0xCA47, /* 0x70 */
-         0, 0xCB71, 0xA86D,      0, 0xAABA,      0, 0xACD2, 0xACD3, /* 0x80 */
-    0xACD4, 0xD6A6, 0xD2CB, 0xAF6F,      0,      0, 0xB2AE, 0xD6A5, /* 0x80 */
-         0,      0, 0xDAB8, 0xB571,      0, 0xDAB7, 0xB570,      0, /* 0x90 */
-         0, 0xDED5, 0xBD4A, 0xE6BB, 0xE6B8, 0xE6B9, 0xE6BA,      0, /* 0x90 */
-         0,      0,      0,      0, 0xED78,      0, 0xF051,      0, /* 0xA0 */
-         0,      0, 0xF471, 0xF470,      0, 0xF6F5, 0xA5D6, 0xCD75, /* 0xA0 */
-    0xAF70,      0,      0,      0, 0xB572, 0xDED6,      0,      0, /* 0xB0 */
-    0xE2E1,      0, 0xBD4B, 0xEA74,      0, 0xF052, 0xF472, 0xA5D7, /* 0xB0 */
-         0,      0, 0xAABB, 0xACD7, 0xCFDF, 0xACD8, 0xACD6,      0, /* 0xC0 */
-    0xACD5, 0xD2CC, 0xAF71,      0,      0, 0xAF72, 0xAF73,      0, /* 0xC0 */
-         0,      0, 0xB2B0, 0xD6A7, 0xB2AF,      0,      0,      0, /* 0xD0 */
-         0,      0, 0xDAB9, 0xB2B1, 0xB573, 0xDED7, 0xB7F8, 0xB7F9, /* 0xD0 */
-         0, 0xBAC9,      0, 0xBACA, 0xBD4C, 0xBF64, 0xEA75, 0xBF63, /* 0xE0 */
-         0, 0xED79, 0xC0FA,      0, 0xF053, 0xF473, 0xA5D8, 0xA86E, /* 0xE0 */
-    0xCD78, 0xCD77, 0xAABC, 0xCD76, 0xAABD, 0xCD79,      0, 0xCFE5, /* 0xF0 */
-    0xACDB, 0xACDA, 0xCFE7, 0xCFE6, 0xACDF,      0, 0xACDE          /* 0xF0 */
+    0xE6B6, 0xBD44, 	 0, 	 0, 	 0, 0xEA6C, 	 0, 0xEA6B, /* 0x20 */
+    0xEA73, 0xEA6D, 0xEA72, 0xEA6F, 0xBF60, 0xEA71, 	 0, 	 0, /* 0x30 */
+    0xBF61, 	 0, 0xBF62, 	 0, 0xEA70, 0xEA6E, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xC0F8, 0xED74, 	 0, 	 0, 0xC0F7, 0xED77, /* 0x40 */
+    0xED75, 0xED76, 	 0, 	 0, 0xC0F9, 	 0, 	 0, 	 0, /* 0x40 */
+    0xF04D, 	 0, 0xC2A1, 0xF04E, 	 0, 	 0, 0xC27D, 0xF04F, /* 0x50 */
+    0xC27E, 0xF04C, 0xF050, 	 0, 0xF04A, 	 0, 	 0, 0xC3A7, /* 0x50 */
+    0xF278, 0xC3A8, 0xC46F, 	 0, 0xF04B, 0xC470, 	 0, 	 0, /* 0x60 */
+         0, 0xC4EE, 0xF5DF, 	 0, 0xC57E, 0xF6F4, 0xC57D, 	 0, /* 0x60 */
+    0xF7EA, 0xC5F5, 0xC5F6, 	 0, 	 0, 0xF9CC, 	 0, 	 0, /* 0x70 */
+    0xACD1, 0xCFDE, 	 0, 0xB56E, 0xB56F, 0xA5D5, 0xA6CA, 0xCA47, /* 0x70 */
+         0, 0xCB71, 0xA86D, 	 0, 0xAABA, 	 0, 0xACD2, 0xACD3, /* 0x80 */
+    0xACD4, 0xD6A6, 0xD2CB, 0xAF6F, 	 0, 	 0, 0xB2AE, 0xD6A5, /* 0x80 */
+         0, 	 0, 0xDAB8, 0xB571, 	 0, 0xDAB7, 0xB570, 	 0, /* 0x90 */
+         0, 0xDED5, 0xBD4A, 0xE6BB, 0xE6B8, 0xE6B9, 0xE6BA, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xED78, 	 0, 0xF051, 	 0, /* 0xA0 */
+         0, 	 0, 0xF471, 0xF470, 	 0, 0xF6F5, 0xA5D6, 0xCD75, /* 0xA0 */
+    0xAF70, 	 0, 	 0, 	 0, 0xB572, 0xDED6, 	 0, 	 0, /* 0xB0 */
+    0xE2E1, 	 0, 0xBD4B, 0xEA74, 	 0, 0xF052, 0xF472, 0xA5D7, /* 0xB0 */
+         0, 	 0, 0xAABB, 0xACD7, 0xCFDF, 0xACD8, 0xACD6, 	 0, /* 0xC0 */
+    0xACD5, 0xD2CC, 0xAF71, 	 0, 	 0, 0xAF72, 0xAF73, 	 0, /* 0xC0 */
+         0, 	 0, 0xB2B0, 0xD6A7, 0xB2AF, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xDAB9, 0xB2B1, 0xB573, 0xDED7, 0xB7F8, 0xB7F9, /* 0xD0 */
+         0, 0xBAC9, 	 0, 0xBACA, 0xBD4C, 0xBF64, 0xEA75, 0xBF63, /* 0xE0 */
+         0, 0xED79, 0xC0FA, 	 0, 0xF053, 0xF473, 0xA5D8, 0xA86E, /* 0xE0 */
+    0xCD78, 0xCD77, 0xAABC, 0xCD76, 0xAABD, 0xCD79, 	 0, 0xCFE5, /* 0xF0 */
+    0xACDB, 0xACDA, 0xCFE7, 0xCFE6, 0xACDF, 	 0, 0xACDE			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_77[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xACD9,      0, 0xCFE1, 0xCFE2, 0xCFE3,      0, 0xACE0, /* 0x00 */
-    0xCFE0, 0xACDC, 0xCFE4, 0xACDD,      0,      0,      0,      0, /* 0x00 */
-    0xD2CF, 0xD2D3, 0xD2D1, 0xD2D0,      0, 0xD2D4,      0,      0, /* 0x10 */
-         0, 0xD2D5, 0xD2D6, 0xD2CE,      0, 0xD2CD,      0, 0xAF75, /* 0x10 */
-    0xAF76,      0, 0xD2D7, 0xD2D2,      0, 0xD6B0,      0, 0xD2D8, /* 0x20 */
-    0xAF77, 0xAF74,      0,      0,      0, 0xD6AA,      0, 0xD6A9, /* 0x20 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xACD9, 	 0, 0xCFE1, 0xCFE2, 0xCFE3, 	 0, 0xACE0, /* 0x00 */
+    0xCFE0, 0xACDC, 0xCFE4, 0xACDD, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xD2CF, 0xD2D3, 0xD2D1, 0xD2D0, 	 0, 0xD2D4, 	 0, 	 0, /* 0x10 */
+         0, 0xD2D5, 0xD2D6, 0xD2CE, 	 0, 0xD2CD, 	 0, 0xAF75, /* 0x10 */
+    0xAF76, 	 0, 0xD2D7, 0xD2D2, 	 0, 0xD6B0, 	 0, 0xD2D8, /* 0x20 */
+    0xAF77, 0xAF74, 	 0, 	 0, 	 0, 0xD6AA, 	 0, 0xD6A9, /* 0x20 */
          0, 0xD6AB, 0xD6AC, 0xD6AE, 0xD6AD, 0xD6B2, 0xB2B5, 0xB2B2, /* 0x30 */
-    0xB2B6, 0xD6A8, 0xB2B7, 0xD6B1, 0xB2B4, 0xD6AF, 0xB2B3,      0, /* 0x30 */
-         0,      0,      0,      0, 0xDABC, 0xDABE, 0xDABA, 0xDABB, /* 0x40 */
-         0,      0, 0xDABF, 0xDAC1, 0xDAC2, 0xDABD, 0xDAC0, 0xB574, /* 0x40 */
-         0,      0, 0xDEDB,      0, 0xDEE0, 0xDED8, 0xDEDC,      0, /* 0x50 */
-         0, 0xDEE1, 0xDEDD, 0xB7FA, 0xB843,      0, 0xB7FD, 0xDED9, /* 0x50 */
-    0xDEDA, 0xBACE, 0xB846, 0xB7FE,      0, 0xB844, 0xB7FC, 0xDEDF, /* 0x60 */
+    0xB2B6, 0xD6A8, 0xB2B7, 0xD6B1, 0xB2B4, 0xD6AF, 0xB2B3, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 0xDABC, 0xDABE, 0xDABA, 0xDABB, /* 0x40 */
+         0, 	 0, 0xDABF, 0xDAC1, 0xDAC2, 0xDABD, 0xDAC0, 0xB574, /* 0x40 */
+         0, 	 0, 0xDEDB, 	 0, 0xDEE0, 0xDED8, 0xDEDC, 	 0, /* 0x50 */
+         0, 0xDEE1, 0xDEDD, 0xB7FA, 0xB843, 	 0, 0xB7FD, 0xDED9, /* 0x50 */
+    0xDEDA, 0xBACE, 0xB846, 0xB7FE, 	 0, 0xB844, 0xB7FC, 0xDEDF, /* 0x60 */
     0xB845, 0xDEDE, 0xB841, 0xB7FB, 0xB842, 0xDEE2, 0xE2E6, 0xE2E8, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xB840,      0,      0, 0xE2E3, 0xBACC, 0xE2E9, 0xBACD, /* 0x70 */
-    0xE2E7, 0xE2E2, 0xE2E5, 0xE2EA, 0xBACB, 0xE2E4,      0, 0xBD4E, /* 0x80 */
-    0xE6BF, 0xE6BE,      0, 0xBD51, 0xBD4F, 0xE6BC, 0xBD4D, 0xE6BD, /* 0x80 */
-         0, 0xBD50,      0,      0,      0, 0xEA7D,      0, 0xEAA1, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xB840, 	 0, 	 0, 0xE2E3, 0xBACC, 0xE2E9, 0xBACD, /* 0x70 */
+    0xE2E7, 0xE2E2, 0xE2E5, 0xE2EA, 0xBACB, 0xE2E4, 	 0, 0xBD4E, /* 0x80 */
+    0xE6BF, 0xE6BE, 	 0, 0xBD51, 0xBD4F, 0xE6BC, 0xBD4D, 0xE6BD, /* 0x80 */
+         0, 0xBD50, 	 0, 	 0, 	 0, 0xEA7D, 	 0, 0xEAA1, /* 0x90 */
          0, 0xEA7E, 0xEA76, 0xEA7A, 0xEA79, 0xEA77, 0xBF66, 0xBF67, /* 0x90 */
-    0xBF65, 0xEA78, 0xEA7B, 0xEA7C,      0, 0xBF68,      0, 0xC140, /* 0xA0 */
-    0xEDA3,      0, 0xC0FC, 0xED7B, 0xC0FE, 0xC141,      0,      0, /* 0xA0 */
+    0xBF65, 0xEA78, 0xEA7B, 0xEA7C, 	 0, 0xBF68, 	 0, 0xC140, /* 0xA0 */
+    0xEDA3, 	 0, 0xC0FC, 0xED7B, 0xC0FE, 0xC141, 	 0, 	 0, /* 0xA0 */
     0xC0FD, 0xEDA2, 0xED7C, 0xC0FB, 0xEDA1, 0xED7A, 0xED7E, 0xED7D, /* 0xB0 */
-         0,      0, 0xF055, 0xC2A4, 0xC2A5, 0xC2A2,      0, 0xC2A3, /* 0xB0 */
-         0,      0, 0xF054,      0, 0xF27B,      0,      0, 0xC3A9, /* 0xC0 */
-         0, 0xF279, 0xF27A,      0, 0xF474, 0xF477, 0xF475, 0xF476, /* 0xC0 */
-    0xF5E0,      0,      0, 0xC4EF, 0xF7EB, 0xF8B4,      0, 0xC5F7, /* 0xD0 */
-    0xF8F8, 0xF8F9, 0xC666, 0xA5D9, 0xACE1,      0, 0xDAC3,      0, /* 0xD0 */
-    0xDEE3,      0, 0xA5DA, 0xA86F,      0, 0xAABE,      0, 0xCFE8, /* 0xE0 */
-    0xCFE9, 0xAF78,      0,      0, 0xDAC4, 0xB575, 0xB847, 0xC142, /* 0xE0 */
-    0xEDA4, 0xF27C, 0xF478, 0xA5DB,      0,      0,      0, 0xCDA1, /* 0xF0 */
-    0xCD7A, 0xCD7C, 0xCD7E, 0xCD7D, 0xCD7B, 0xAABF                  /* 0xF0 */
+         0, 	 0, 0xF055, 0xC2A4, 0xC2A5, 0xC2A2, 	 0, 0xC2A3, /* 0xB0 */
+         0, 	 0, 0xF054, 	 0, 0xF27B, 	 0, 	 0, 0xC3A9, /* 0xC0 */
+         0, 0xF279, 0xF27A, 	 0, 0xF474, 0xF477, 0xF475, 0xF476, /* 0xC0 */
+    0xF5E0, 	 0, 	 0, 0xC4EF, 0xF7EB, 0xF8B4, 	 0, 0xC5F7, /* 0xD0 */
+    0xF8F8, 0xF8F9, 0xC666, 0xA5D9, 0xACE1, 	 0, 0xDAC3, 	 0, /* 0xD0 */
+    0xDEE3, 	 0, 0xA5DA, 0xA86F, 	 0, 0xAABE, 	 0, 0xCFE8, /* 0xE0 */
+    0xCFE9, 0xAF78, 	 0, 	 0, 0xDAC4, 0xB575, 0xB847, 0xC142, /* 0xE0 */
+    0xEDA4, 0xF27C, 0xF478, 0xA5DB, 	 0, 	 0, 	 0, 0xCDA1, /* 0xF0 */
+    0xCD7A, 0xCD7C, 0xCD7E, 0xCD7D, 0xCD7B, 0xAABF					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_78[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                    0xACE2, 0xCFF2,      0, 0xCFED, 0xCFEA,      0, /* 0x00 */
-         0, 0xCFF1,      0,      0, 0xACE4, 0xACE5, 0xCFF0, 0xCFEF, /* 0x00 */
-    0xCFEE, 0xCFEB, 0xCFEC, 0xCFF3, 0xACE3,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0, 0xAF7C,      0, 0xAFA4, /* 0x10 */
-    0xAFA3, 0xD2E1, 0xD2DB, 0xD2D9,      0, 0xAFA1, 0xD6B9, 0xAF7A, /* 0x20 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                    0xACE2, 0xCFF2, 	 0, 0xCFED, 0xCFEA, 	 0, /* 0x00 */
+         0, 0xCFF1, 	 0, 	 0, 0xACE4, 0xACE5, 0xCFF0, 0xCFEF, /* 0x00 */
+    0xCFEE, 0xCFEB, 0xCFEC, 0xCFF3, 0xACE3, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xAF7C, 	 0, 0xAFA4, /* 0x10 */
+    0xAFA3, 0xD2E1, 0xD2DB, 0xD2D9, 	 0, 0xAFA1, 0xD6B9, 0xAF7A, /* 0x20 */
     0xD2DE, 0xD2E2, 0xD2E4, 0xD2E0, 0xD2DA, 0xAFA2, 0xD2DF, 0xD2DD, /* 0x20 */
-    0xAF79, 0xD2E5, 0xAFA5, 0xD2E3, 0xAF7D, 0xD2DC,      0, 0xAF7E, /* 0x30 */
-    0xAF7B,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xB2B9,      0, 0xD6BA,      0,      0, /* 0x40 */
-    0xD6B3, 0xD6B5, 0xD6B7,      0, 0xD6B8, 0xD6B6, 0xB2BA,      0, /* 0x40 */
-    0xD6BB,      0, 0xD6B4,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xDAC8, 0xB576, 0xDAD0,      0, /* 0x50 */
-    0xDAC5,      0, 0xDAD1,      0, 0xDAC6, 0xDAC7,      0,      0, /* 0x60 */
+    0xAF79, 0xD2E5, 0xAFA5, 0xD2E3, 0xAF7D, 0xD2DC, 	 0, 0xAF7E, /* 0x30 */
+    0xAF7B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xB2B9, 	 0, 0xD6BA, 	 0, 	 0, /* 0x40 */
+    0xD6B3, 0xD6B5, 0xD6B7, 	 0, 0xD6B8, 0xD6B6, 0xB2BA, 	 0, /* 0x40 */
+    0xD6BB, 	 0, 0xD6B4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xDAC8, 0xB576, 0xDAD0, 	 0, /* 0x50 */
+    0xDAC5, 	 0, 0xDAD1, 	 0, 0xDAC6, 0xDAC7, 	 0, 	 0, /* 0x60 */
     0xDACF, 0xDACE, 0xDACB, 0xB2B8, 0xB577, 0xDAC9, 0xDACC, 0xB578, /* 0x60 */
-    0xDACD, 0xDACA,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0, 0xDEEE,      0, 0xDEF2, 0xB84E,      0, 0xE2F0, 0xB851, /* 0x70 */
-    0xDEF0, 0xF9D6,      0, 0xDEED, 0xDEE8, 0xDEEA, 0xDEEB, 0xDEE4, /* 0x80 */
-         0, 0xB84D,      0,      0, 0xB84C,      0, 0xB848, 0xDEE7, /* 0x80 */
-         0, 0xB84F,      0, 0xB850, 0xDEE6, 0xDEE9, 0xDEF1, 0xB84A, /* 0x90 */
-    0xB84B, 0xDEEF, 0xDEE5,      0,      0,      0, 0xE2F2, 0xBAD0, /* 0x90 */
-    0xE2F4, 0xDEEC, 0xE2F6, 0xBAD4, 0xE2F7, 0xE2F3,      0, 0xBAD1, /* 0xA0 */
-    0xE2EF, 0xBAD3, 0xE2EC, 0xE2F1, 0xE2F5, 0xE2EE,      0,      0, /* 0xA0 */
-    0xB849,      0, 0xE2EB, 0xBAD2, 0xE2ED,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xBD54, 0xE6C1, 0xBD58,      0, 0xBD56,      0, /* 0xB0 */
-         0, 0xBACF,      0, 0xE6C8, 0xE6C9, 0xBD53,      0,      0, /* 0xC0 */
+    0xDACD, 0xDACA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xDEEE, 	 0, 0xDEF2, 0xB84E, 	 0, 0xE2F0, 0xB851, /* 0x70 */
+    0xDEF0, 0xF9D6, 	 0, 0xDEED, 0xDEE8, 0xDEEA, 0xDEEB, 0xDEE4, /* 0x80 */
+         0, 0xB84D, 	 0, 	 0, 0xB84C, 	 0, 0xB848, 0xDEE7, /* 0x80 */
+         0, 0xB84F, 	 0, 0xB850, 0xDEE6, 0xDEE9, 0xDEF1, 0xB84A, /* 0x90 */
+    0xB84B, 0xDEEF, 0xDEE5, 	 0, 	 0, 	 0, 0xE2F2, 0xBAD0, /* 0x90 */
+    0xE2F4, 0xDEEC, 0xE2F6, 0xBAD4, 0xE2F7, 0xE2F3, 	 0, 0xBAD1, /* 0xA0 */
+    0xE2EF, 0xBAD3, 0xE2EC, 0xE2F1, 0xE2F5, 0xE2EE, 	 0, 	 0, /* 0xA0 */
+    0xB849, 	 0, 0xE2EB, 0xBAD2, 0xE2ED, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xBD54, 0xE6C1, 0xBD58, 	 0, 0xBD56, 	 0, /* 0xB0 */
+         0, 0xBACF, 	 0, 0xE6C8, 0xE6C9, 0xBD53, 	 0, 	 0, /* 0xC0 */
     0xE6C7, 0xE6CA, 0xBD55, 0xBD52, 0xE6C3, 0xE6C0, 0xE6C5, 0xE6C2, /* 0xC0 */
-    0xBD59, 0xE6C4,      0,      0, 0xE6C6, 0xBD57,      0,      0, /* 0xD0 */
-         0,      0, 0xBF6A, 0xEAA8,      0, 0xEAA2, 0xEAA6, 0xEAAC, /* 0xD0 */
-    0xEAAD, 0xEAA9, 0xEAAA, 0xEAA7,      0, 0xEAA4,      0, 0xBF6C, /* 0xE0 */
-    0xBF69, 0xEAA3, 0xEAA5,      0, 0xBF6B, 0xEAAB,      0, 0xC146, /* 0xE0 */
-         0,      0, 0xEDAA, 0xEDA5, 0xC145,      0,      0, 0xC143, /* 0xF0 */
-         0, 0xEDAC, 0xC144, 0xEDA8, 0xEDA9, 0xEDA6, 0xEDAD, 0xF056  /* 0xF0 */
+    0xBD59, 0xE6C4, 	 0, 	 0, 0xE6C6, 0xBD57, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xBF6A, 0xEAA8, 	 0, 0xEAA2, 0xEAA6, 0xEAAC, /* 0xD0 */
+    0xEAAD, 0xEAA9, 0xEAAA, 0xEAA7, 	 0, 0xEAA4, 	 0, 0xBF6C, /* 0xE0 */
+    0xBF69, 0xEAA3, 0xEAA5, 	 0, 0xBF6B, 0xEAAB, 	 0, 0xC146, /* 0xE0 */
+         0, 	 0, 0xEDAA, 0xEDA5, 0xC145, 	 0, 	 0, 0xC143, /* 0xF0 */
+         0, 0xEDAC, 0xC144, 0xEDA8, 0xEDA9, 0xEDA6, 0xEDAD, 0xF056	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_79[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xC147, 0xEDA7,      0, 0xEDAE, 0xEDAB,      0,      0, /* 0x00 */
-         0, 0xF05A,      0,      0, 0xF057,      0, 0xC2A6,      0, /* 0x00 */
-    0xF05B, 0xF05D, 0xF05C, 0xF058, 0xF059,      0,      0, 0xF2A3, /* 0x10 */
-         0, 0xC3AA,      0, 0xF27E, 0xF2A2, 0xF27D, 0xF2A4,      0, /* 0x10 */
-         0, 0xF2A1,      0, 0xF47A, 0xF47D, 0xF479, 0xC471, 0xF47B, /* 0x20 */
-    0xF47C, 0xF47E, 0xC472, 0xC474, 0xC473, 0xF5E1,      0, 0xF5E3, /* 0x20 */
-         0, 0xF5E2,      0,      0,      0, 0xF6F6,      0,      0, /* 0x30 */
-    0xF8B5, 0xF8FA, 0xA5DC,      0,      0, 0xCB72, 0xAAC0, 0xCDA3, /* 0x30 */
-    0xAAC1, 0xAAC2, 0xCDA2,      0, 0xCFF8, 0xCFF7, 0xACE6, 0xACE9, /* 0x40 */
-    0xACE8, 0xACE7, 0xCFF4, 0xCFF6, 0xCFF5,      0,      0, 0xD2E8, /* 0x40 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xC147, 0xEDA7, 	 0, 0xEDAE, 0xEDAB, 	 0, 	 0, /* 0x00 */
+         0, 0xF05A, 	 0, 	 0, 0xF057, 	 0, 0xC2A6, 	 0, /* 0x00 */
+    0xF05B, 0xF05D, 0xF05C, 0xF058, 0xF059, 	 0, 	 0, 0xF2A3, /* 0x10 */
+         0, 0xC3AA, 	 0, 0xF27E, 0xF2A2, 0xF27D, 0xF2A4, 	 0, /* 0x10 */
+         0, 0xF2A1, 	 0, 0xF47A, 0xF47D, 0xF479, 0xC471, 0xF47B, /* 0x20 */
+    0xF47C, 0xF47E, 0xC472, 0xC474, 0xC473, 0xF5E1, 	 0, 0xF5E3, /* 0x20 */
+         0, 0xF5E2, 	 0, 	 0, 	 0, 0xF6F6, 	 0, 	 0, /* 0x30 */
+    0xF8B5, 0xF8FA, 0xA5DC, 	 0, 	 0, 0xCB72, 0xAAC0, 0xCDA3, /* 0x30 */
+    0xAAC1, 0xAAC2, 0xCDA2, 	 0, 0xCFF8, 0xCFF7, 0xACE6, 0xACE9, /* 0x40 */
+    0xACE8, 0xACE7, 0xCFF4, 0xCFF6, 0xCFF5, 	 0, 	 0, 0xD2E8, /* 0x40 */
     0xAFA7, 0xD2EC, 0xD2EB, 0xD2EA, 0xD2E6, 0xAFA6, 0xAFAA, 0xAFAD, /* 0x50 */
-         0,      0, 0xAFAE, 0xD2E7, 0xD2E9, 0xAFAC, 0xAFAB, 0xAFA9, /* 0x50 */
-    0xAFA8, 0xD6C2,      0, 0xD6C0, 0xD6BC, 0xB2BB,      0, 0xD6BD, /* 0x60 */
-    0xB2BC, 0xD6BE, 0xD6BF, 0xD6C1,      0, 0xB2BD,      0,      0, /* 0x60 */
-    0xDAD5,      0, 0xDAD4, 0xDAD3, 0xDAD2,      0,      0,      0, /* 0x70 */
-         0, 0xDEF6, 0xB852,      0, 0xDEF3, 0xDEF5,      0, 0xB853, /* 0x70 */
-         0, 0xB854, 0xDEF4,      0,      0,      0,      0,      0, /* 0x80 */
-    0xE341,      0, 0xE2F9, 0xE2FA,      0, 0xBAD7, 0xBAD5, 0xBAD6, /* 0x80 */
-    0xE343,      0, 0xE342, 0xE2FE, 0xE2FD, 0xE2FC, 0xE2FB, 0xE340, /* 0x90 */
-    0xE2F8,      0, 0xE6CB, 0xE6D0, 0xE6CE,      0,      0,      0, /* 0x90 */
-    0xE6CD, 0xE6CC, 0xE6CF,      0, 0xEAAE,      0, 0xBF6D, 0xC148, /* 0xA0 */
-    0xEDB0,      0, 0xC149, 0xEDAF, 0xF05F, 0xF05E, 0xC2A7,      0, /* 0xA0 */
-    0xF2A5, 0xC3AB, 0xF4A1, 0xC5A1, 0xF6F7,      0, 0xF8B7, 0xF8B6, /* 0xB0 */
-    0xC9A8, 0xACEA, 0xACEB, 0xD6C3,      0, 0xB856, 0xA5DD, 0xA872, /* 0xB0 */
-    0xA871, 0xA870,      0,      0,      0, 0xCDA4,      0,      0, /* 0xC0 */
-    0xAAC4, 0xAAC3,      0, 0xACEE,      0, 0xCFFA, 0xCFFD, 0xCFFB, /* 0xC0 */
-         0, 0xACEC, 0xACED,      0,      0, 0xCFF9, 0xCFFC,      0, /* 0xD0 */
-    0xAFB5,      0,      0,      0, 0xD2F3, 0xD2F5, 0xD2F4, 0xAFB2, /* 0xD0 */
-    0xD2EF,      0,      0, 0xAFB0, 0xAFAF,      0, 0xAFB3, 0xAFB1, /* 0xE0 */
-         0, 0xAFB4, 0xD2F2, 0xD2ED, 0xD2EE, 0xD2F1, 0xD2F0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xD6C6, 0xD6C7, /* 0xF0 */
-    0xD6C5,      0, 0xD6C4, 0xB2BE                                  /* 0xF0 */
+         0, 	 0, 0xAFAE, 0xD2E7, 0xD2E9, 0xAFAC, 0xAFAB, 0xAFA9, /* 0x50 */
+    0xAFA8, 0xD6C2, 	 0, 0xD6C0, 0xD6BC, 0xB2BB, 	 0, 0xD6BD, /* 0x60 */
+    0xB2BC, 0xD6BE, 0xD6BF, 0xD6C1, 	 0, 0xB2BD, 	 0, 	 0, /* 0x60 */
+    0xDAD5, 	 0, 0xDAD4, 0xDAD3, 0xDAD2, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xDEF6, 0xB852, 	 0, 0xDEF3, 0xDEF5, 	 0, 0xB853, /* 0x70 */
+         0, 0xB854, 0xDEF4, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xE341, 	 0, 0xE2F9, 0xE2FA, 	 0, 0xBAD7, 0xBAD5, 0xBAD6, /* 0x80 */
+    0xE343, 	 0, 0xE342, 0xE2FE, 0xE2FD, 0xE2FC, 0xE2FB, 0xE340, /* 0x90 */
+    0xE2F8, 	 0, 0xE6CB, 0xE6D0, 0xE6CE, 	 0, 	 0, 	 0, /* 0x90 */
+    0xE6CD, 0xE6CC, 0xE6CF, 	 0, 0xEAAE, 	 0, 0xBF6D, 0xC148, /* 0xA0 */
+    0xEDB0, 	 0, 0xC149, 0xEDAF, 0xF05F, 0xF05E, 0xC2A7, 	 0, /* 0xA0 */
+    0xF2A5, 0xC3AB, 0xF4A1, 0xC5A1, 0xF6F7, 	 0, 0xF8B7, 0xF8B6, /* 0xB0 */
+    0xC9A8, 0xACEA, 0xACEB, 0xD6C3, 	 0, 0xB856, 0xA5DD, 0xA872, /* 0xB0 */
+    0xA871, 0xA870, 	 0, 	 0, 	 0, 0xCDA4, 	 0, 	 0, /* 0xC0 */
+    0xAAC4, 0xAAC3, 	 0, 0xACEE, 	 0, 0xCFFA, 0xCFFD, 0xCFFB, /* 0xC0 */
+         0, 0xACEC, 0xACED, 	 0, 	 0, 0xCFF9, 0xCFFC, 	 0, /* 0xD0 */
+    0xAFB5, 	 0, 	 0, 	 0, 0xD2F3, 0xD2F5, 0xD2F4, 0xAFB2, /* 0xD0 */
+    0xD2EF, 	 0, 	 0, 0xAFB0, 0xAFAF, 	 0, 0xAFB3, 0xAFB1, /* 0xE0 */
+         0, 0xAFB4, 0xD2F2, 0xD2ED, 0xD2EE, 0xD2F1, 0xD2F0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD6C6, 0xD6C7, /* 0xF0 */
+    0xD6C5, 	 0, 0xD6C4, 0xB2BE									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_7A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xB57D,      0, 0xDAD6, 0xDAD8, 0xDADA, 0xB57C,      0,      0, /* 0x00 */
-    0xB57A,      0, 0xDAD7, 0xB57B, 0xDAD9, 0xB579,      0,      0, /* 0x00 */
-    0xDF41, 0xDEF7, 0xDEFA, 0xDEFE, 0xB85A, 0xDEFC,      0, 0xDEFB, /* 0x10 */
-    0xDEF8, 0xDEF9, 0xB858, 0xDF40, 0xB857,      0, 0xB85C, 0xB85B, /* 0x10 */
-    0xB859,      0, 0xDEFD,      0,      0,      0, 0xE349,      0, /* 0x20 */
-    0xE348,      0,      0, 0xE344,      0,      0, 0xBAD8, 0xE347, /* 0x20 */
-    0xE346, 0xBAD9,      0,      0,      0,      0,      0, 0xBD5E, /* 0x30 */
-         0, 0xE6D2,      0, 0xBD5F, 0xBD5B, 0xBD5D,      0, 0xBD5A, /* 0x30 */
-    0xBD5C,      0,      0,      0, 0xEAAF,      0, 0xBF70, 0xEAB1, /* 0x40 */
-    0xEAB0,      0, 0xE345, 0xBF72, 0xBF71, 0xBF6E, 0xBF6F,      0, /* 0x40 */
-         0,      0,      0,      0, 0xEDB5,      0, 0xEDB3, 0xC14A, /* 0x50 */
-    0xEDB4,      0, 0xEDB6, 0xEDB2, 0xEDB1,      0,      0, 0xF060, /* 0x50 */
-    0xC2AA, 0xC2A8, 0xC2A9,      0,      0,      0,      0, 0xF2A6, /* 0x60 */
-    0xF2A7, 0xC3AD,      0, 0xC3AC, 0xF4A3, 0xF4A4, 0xF4A2,      0, /* 0x60 */
-    0xF6F8, 0xF6F9,      0,      0, 0xA5DE, 0xCA48, 0xA873,      0, /* 0x70 */
-    0xCDA5, 0xAAC6, 0xAAC5, 0xCDA6,      0,      0, 0xD040, 0xACEF, /* 0x70 */
-    0xCFFE, 0xACF0,      0,      0, 0xAFB6, 0xD2F8, 0xD2F6, 0xD2FC, /* 0x80 */
-    0xAFB7, 0xD2F7, 0xD2FB, 0xD2F9, 0xD2FA,      0,      0, 0xD6C8, /* 0x80 */
-    0xD6CA,      0, 0xB2BF,      0, 0xD6C9, 0xB2C0, 0xB5A2, 0xB5A1, /* 0x90 */
-    0xB57E, 0xDADB,      0,      0,      0,      0, 0xDF44, 0xB85D, /* 0x90 */
-    0xB85E,      0, 0xDF43, 0xDF42,      0,      0,      0,      0, /* 0xA0 */
-    0xE34A, 0xBADB, 0xBADA, 0xE34B, 0xE34C,      0, 0xBD61, 0xBD60, /* 0xA0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xB57D, 	 0, 0xDAD6, 0xDAD8, 0xDADA, 0xB57C, 	 0, 	 0, /* 0x00 */
+    0xB57A, 	 0, 0xDAD7, 0xB57B, 0xDAD9, 0xB579, 	 0, 	 0, /* 0x00 */
+    0xDF41, 0xDEF7, 0xDEFA, 0xDEFE, 0xB85A, 0xDEFC, 	 0, 0xDEFB, /* 0x10 */
+    0xDEF8, 0xDEF9, 0xB858, 0xDF40, 0xB857, 	 0, 0xB85C, 0xB85B, /* 0x10 */
+    0xB859, 	 0, 0xDEFD, 	 0, 	 0, 	 0, 0xE349, 	 0, /* 0x20 */
+    0xE348, 	 0, 	 0, 0xE344, 	 0, 	 0, 0xBAD8, 0xE347, /* 0x20 */
+    0xE346, 0xBAD9, 	 0, 	 0, 	 0, 	 0, 	 0, 0xBD5E, /* 0x30 */
+         0, 0xE6D2, 	 0, 0xBD5F, 0xBD5B, 0xBD5D, 	 0, 0xBD5A, /* 0x30 */
+    0xBD5C, 	 0, 	 0, 	 0, 0xEAAF, 	 0, 0xBF70, 0xEAB1, /* 0x40 */
+    0xEAB0, 	 0, 0xE345, 0xBF72, 0xBF71, 0xBF6E, 0xBF6F, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xEDB5, 	 0, 0xEDB3, 0xC14A, /* 0x50 */
+    0xEDB4, 	 0, 0xEDB6, 0xEDB2, 0xEDB1, 	 0, 	 0, 0xF060, /* 0x50 */
+    0xC2AA, 0xC2A8, 0xC2A9, 	 0, 	 0, 	 0, 	 0, 0xF2A6, /* 0x60 */
+    0xF2A7, 0xC3AD, 	 0, 0xC3AC, 0xF4A3, 0xF4A4, 0xF4A2, 	 0, /* 0x60 */
+    0xF6F8, 0xF6F9, 	 0, 	 0, 0xA5DE, 0xCA48, 0xA873, 	 0, /* 0x70 */
+    0xCDA5, 0xAAC6, 0xAAC5, 0xCDA6, 	 0, 	 0, 0xD040, 0xACEF, /* 0x70 */
+    0xCFFE, 0xACF0, 	 0, 	 0, 0xAFB6, 0xD2F8, 0xD2F6, 0xD2FC, /* 0x80 */
+    0xAFB7, 0xD2F7, 0xD2FB, 0xD2F9, 0xD2FA, 	 0, 	 0, 0xD6C8, /* 0x80 */
+    0xD6CA, 	 0, 0xB2BF, 	 0, 0xD6C9, 0xB2C0, 0xB5A2, 0xB5A1, /* 0x90 */
+    0xB57E, 0xDADB, 	 0, 	 0, 	 0, 	 0, 0xDF44, 0xB85D, /* 0x90 */
+    0xB85E, 	 0, 0xDF43, 0xDF42, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xE34A, 0xBADB, 0xBADA, 0xE34B, 0xE34C, 	 0, 0xBD61, 0xBD60, /* 0xA0 */
          0, 0xEAB5, 0xE6D3, 0xE6D5, 0xE6D4, 0xEAB4, 0xEAB2, 0xEAB6, /* 0xB0 */
-    0xEAB3,      0, 0xBF73,      0,      0,      0, 0xEDB7, 0xC14B, /* 0xB0 */
-    0xEDB8, 0xEDB9,      0,      0, 0xC2AB, 0xC2AC,      0, 0xC475, /* 0xC0 */
-         0,      0, 0xC5D1, 0xA5DF,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xD041,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xD2FD, 0xAFB8,      0,      0,      0,      0,      0, 0xB3BA, /* 0xD0 */
-    0xB3B9,      0,      0, 0xB5A4, 0xDADD, 0xB5A3, 0xDADC,      0, /* 0xE0 */
-         0,      0,      0, 0xDF45,      0, 0xBADC, 0xE34D, 0xBADD, /* 0xE0 */
-         0,      0,      0,      0,      0,      0, 0xC476, 0xF4A5, /* 0xF0 */
-         0, 0xA6CB, 0xAAC7, 0xCDA7,      0, 0xACF2,      0, 0xACF1  /* 0xF0 */
+    0xEAB3, 	 0, 0xBF73, 	 0, 	 0, 	 0, 0xEDB7, 0xC14B, /* 0xB0 */
+    0xEDB8, 0xEDB9, 	 0, 	 0, 0xC2AB, 0xC2AC, 	 0, 0xC475, /* 0xC0 */
+         0, 	 0, 0xC5D1, 0xA5DF, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xD041, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xD2FD, 0xAFB8, 	 0, 	 0, 	 0, 	 0, 	 0, 0xB3BA, /* 0xD0 */
+    0xB3B9, 	 0, 	 0, 0xB5A4, 0xDADD, 0xB5A3, 0xDADC, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 0xDF45, 	 0, 0xBADC, 0xE34D, 0xBADD, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC476, 0xF4A5, /* 0xF0 */
+         0, 0xA6CB, 0xAAC7, 0xCDA7, 	 0, 0xACF2, 	 0, 0xACF1	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_7B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD042, 0xD043,      0,      0, 0xD340, 0xD342, 0xAFB9,      0, /* 0x00 */
-    0xD344, 0xD347, 0xD345,      0,      0,      0, 0xD346, 0xD343, /* 0x00 */
-    0xD2FE, 0xAFBA, 0xD348, 0xD341,      0,      0,      0,      0, /* 0x10 */
-    0xD6D3, 0xB2C6, 0xD6DC, 0xB2C3,      0, 0xD6D5, 0xB2C7,      0, /* 0x10 */
-    0xB2C1,      0, 0xD6D0, 0xD6DD, 0xD6D1, 0xD6CE, 0xB2C5,      0, /* 0x20 */
-    0xB2C2,      0, 0xD6D4, 0xD6D7, 0xB2C4, 0xD6D8, 0xB2C8, 0xD6D9, /* 0x20 */
-    0xD6CF, 0xD6D6, 0xD6DA, 0xD6D2, 0xD6CD, 0xD6CB,      0,      0, /* 0x30 */
-    0xD6DB,      0,      0, 0xDADF,      0,      0,      0,      0, /* 0x30 */
-    0xDAE4,      0,      0,      0, 0xDAE0, 0xDAE6, 0xB5A7, 0xD6CC, /* 0x40 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD042, 0xD043, 	 0, 	 0, 0xD340, 0xD342, 0xAFB9, 	 0, /* 0x00 */
+    0xD344, 0xD347, 0xD345, 	 0, 	 0, 	 0, 0xD346, 0xD343, /* 0x00 */
+    0xD2FE, 0xAFBA, 0xD348, 0xD341, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xD6D3, 0xB2C6, 0xD6DC, 0xB2C3, 	 0, 0xD6D5, 0xB2C7, 	 0, /* 0x10 */
+    0xB2C1, 	 0, 0xD6D0, 0xD6DD, 0xD6D1, 0xD6CE, 0xB2C5, 	 0, /* 0x20 */
+    0xB2C2, 	 0, 0xD6D4, 0xD6D7, 0xB2C4, 0xD6D8, 0xB2C8, 0xD6D9, /* 0x20 */
+    0xD6CF, 0xD6D6, 0xD6DA, 0xD6D2, 0xD6CD, 0xD6CB, 	 0, 	 0, /* 0x30 */
+    0xD6DB, 	 0, 	 0, 0xDADF, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+    0xDAE4, 	 0, 	 0, 	 0, 0xDAE0, 0xDAE6, 0xB5A7, 0xD6CC, /* 0x40 */
     0xDAE1, 0xB5A5, 0xDADE, 0xB5AC, 0xDAE2, 0xB5AB, 0xDAE3, 0xB5AD, /* 0x40 */
-    0xB5A8, 0xB5AE, 0xB5A9,      0, 0xB5AA,      0, 0xB5A6,      0, /* 0x50 */
-    0xDAE5,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-    0xB861, 0xDF50,      0, 0xDF53, 0xDF47, 0xDF4C, 0xDF46, 0xB863, /* 0x60 */
-         0, 0xDF4A,      0,      0,      0, 0xDF48, 0xB862,      0, /* 0x60 */
+    0xB5A8, 0xB5AE, 0xB5A9, 	 0, 0xB5AA, 	 0, 0xB5A6, 	 0, /* 0x50 */
+    0xDAE5, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+    0xB861, 0xDF50, 	 0, 0xDF53, 0xDF47, 0xDF4C, 0xDF46, 0xB863, /* 0x60 */
+         0, 0xDF4A, 	 0, 	 0, 	 0, 0xDF48, 0xB862, 	 0, /* 0x60 */
     0xDF4F, 0xDF4E, 0xDF4B, 0xDF4D, 0xDF49, 0xBAE1, 0xDF52, 0xB85F, /* 0x70 */
-    0xDF51,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0, 0xE35D,      0, 0xBAE8, 0xE358,      0, 0xBAE7, /* 0x80 */
-    0xE34E,      0, 0xE350, 0xBAE0, 0xE355, 0xE354, 0xE357, 0xBAE5, /* 0x80 */
-    0xE352, 0xE351,      0,      0, 0xBAE4, 0xBADF, 0xE353, 0xBAE2, /* 0x90 */
-    0xE359, 0xE35B,      0, 0xE356, 0xE34F, 0xBAE3,      0,      0, /* 0x90 */
-    0xBD69, 0xBADE,      0,      0, 0xE35C,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0, 0xE6D9, 0xBD62,      0, 0xE6DB, /* 0xA0 */
-         0, 0xBD63,      0,      0, 0xBD65, 0xE6DE,      0, 0xE6D6, /* 0xB0 */
-    0xBAE6, 0xE6DC,      0,      0,      0,      0, 0xE6D8,      0, /* 0xB0 */
-    0xB860, 0xBD68,      0,      0, 0xBD64,      0, 0xBD66, 0xBD67, /* 0xC0 */
-         0, 0xBF76, 0xE6DD, 0xE6D7, 0xBD6A,      0, 0xE6DA,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xEAC0, 0xEABB,      0,      0, /* 0xD0 */
+    0xDF51, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 0xE35D, 	 0, 0xBAE8, 0xE358, 	 0, 0xBAE7, /* 0x80 */
+    0xE34E, 	 0, 0xE350, 0xBAE0, 0xE355, 0xE354, 0xE357, 0xBAE5, /* 0x80 */
+    0xE352, 0xE351, 	 0, 	 0, 0xBAE4, 0xBADF, 0xE353, 0xBAE2, /* 0x90 */
+    0xE359, 0xE35B, 	 0, 0xE356, 0xE34F, 0xBAE3, 	 0, 	 0, /* 0x90 */
+    0xBD69, 0xBADE, 	 0, 	 0, 0xE35C, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 0xE6D9, 0xBD62, 	 0, 0xE6DB, /* 0xA0 */
+         0, 0xBD63, 	 0, 	 0, 0xBD65, 0xE6DE, 	 0, 0xE6D6, /* 0xB0 */
+    0xBAE6, 0xE6DC, 	 0, 	 0, 	 0, 	 0, 0xE6D8, 	 0, /* 0xB0 */
+    0xB860, 0xBD68, 	 0, 	 0, 0xBD64, 	 0, 0xBD66, 0xBD67, /* 0xC0 */
+         0, 0xBF76, 0xE6DD, 0xE6D7, 0xBD6A, 	 0, 0xE6DA, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xEAC0, 0xEABB, 	 0, 	 0, /* 0xD0 */
     0xEAC5, 0xBF74, 0xEABD, 0xBF78, 0xEAC3, 0xEABA, 0xEAB7, 0xEAC6, /* 0xD0 */
     0xC151, 0xBF79, 0xEAC2, 0xEAB8, 0xBF77, 0xEABC, 0xBF7B, 0xEAB9, /* 0xE0 */
-    0xEABE, 0xBF7A, 0xEAC1, 0xEAC4,      0,      0,      0,      0, /* 0xE0 */
-    0xEDCB, 0xEDCC, 0xEDBC, 0xEDC3, 0xEDC1,      0,      0, 0xC14F, /* 0xF0 */
-    0xEDC8, 0xEABF,      0, 0xEDBF,      0, 0xEDC9, 0xC14E, 0xEDBE  /* 0xF0 */
+    0xEABE, 0xBF7A, 0xEAC1, 0xEAC4, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xEDCB, 0xEDCC, 0xEDBC, 0xEDC3, 0xEDC1, 	 0, 	 0, 0xC14F, /* 0xF0 */
+    0xEDC8, 0xEABF, 	 0, 0xEDBF, 	 0, 0xEDC9, 0xC14E, 0xEDBE	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_7C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xEDBD, 0xEDC7, 0xEDC4, 0xEDC6,      0, 0xEDBA, 0xEDCA, 0xC14C, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xEDBD, 0xEDC7, 0xEDC4, 0xEDC6, 	 0, 0xEDBA, 0xEDCA, 0xC14C, /* 0x00 */
          0, 0xEDC5, 0xEDCE, 0xEDC2, 0xC150, 0xC14D, 0xEDC0, 0xEDBB, /* 0x00 */
-    0xEDCD, 0xBF75,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0, 0xF063,      0,      0, 0xF061, 0xF067, 0xC2B0, 0xF065, /* 0x10 */
-    0xF064, 0xC2B2, 0xF06A, 0xC2B1,      0, 0xF06B, 0xF068, 0xC2AE, /* 0x20 */
-    0xF069, 0xF062, 0xC2AF, 0xC2AD, 0xF2AB, 0xF066,      0,      0, /* 0x20 */
-    0xF06C,      0,      0, 0xF2A8,      0,      0,      0, 0xC3B2, /* 0x30 */
-    0xC3B0, 0xF2AA,      0, 0xF2AC, 0xF2A9, 0xC3B1, 0xC3AE, 0xC3AF, /* 0x30 */
-    0xC3B3,      0,      0, 0xC478,      0, 0xF4AA,      0, 0xF4A9, /* 0x40 */
-    0xF4A7, 0xF4A6, 0xF4A8,      0, 0xC477, 0xC479,      0,      0, /* 0x40 */
-    0xC4F0,      0,      0, 0xF5E5, 0xF5E4,      0,      0, 0xF6FA, /* 0x50 */
-         0, 0xF6FC, 0xF6FE, 0xF6FD, 0xF6FB,      0,      0, 0xC5A3, /* 0x50 */
-    0xC5A2,      0,      0, 0xC5D3, 0xC5D2, 0xC5D4, 0xF7ED, 0xF7EC, /* 0x60 */
-         0, 0xF8FB, 0xF8B8, 0xF8FC, 0xC658,      0, 0xC659, 0xF96D, /* 0x60 */
-         0,      0, 0xC67E, 0xA6CC,      0, 0xCDA8,      0,      0, /* 0x70 */
-    0xD045, 0xD046, 0xD044,      0,      0, 0xACF3,      0, 0xD047, /* 0x70 */
-    0xD048, 0xD049,      0,      0, 0xD349, 0xD34F,      0,      0, /* 0x80 */
-    0xD34D, 0xAFBB, 0xD34B,      0, 0xD34C, 0xD34E,      0,      0, /* 0x80 */
-         0, 0xD34A, 0xB2C9,      0, 0xD6DE, 0xB2CB, 0xD6E0, 0xB2CA, /* 0x90 */
-    0xD6DF,      0,      0,      0,      0,      0, 0xDAE8, 0xB5AF, /* 0x90 */
-         0, 0xDAEA, 0xDAE7, 0xD6E1,      0, 0xB5B0,      0, 0xF9DB, /* 0xA0 */
-    0xDAE9,      0,      0,      0,      0,      0,      0, 0xDF56, /* 0xA0 */
-         0, 0xB864, 0xDF54, 0xB865, 0xDF55, 0xB866,      0,      0, /* 0xB0 */
+    0xEDCD, 0xBF75, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 0xF063, 	 0, 	 0, 0xF061, 0xF067, 0xC2B0, 0xF065, /* 0x10 */
+    0xF064, 0xC2B2, 0xF06A, 0xC2B1, 	 0, 0xF06B, 0xF068, 0xC2AE, /* 0x20 */
+    0xF069, 0xF062, 0xC2AF, 0xC2AD, 0xF2AB, 0xF066, 	 0, 	 0, /* 0x20 */
+    0xF06C, 	 0, 	 0, 0xF2A8, 	 0, 	 0, 	 0, 0xC3B2, /* 0x30 */
+    0xC3B0, 0xF2AA, 	 0, 0xF2AC, 0xF2A9, 0xC3B1, 0xC3AE, 0xC3AF, /* 0x30 */
+    0xC3B3, 	 0, 	 0, 0xC478, 	 0, 0xF4AA, 	 0, 0xF4A9, /* 0x40 */
+    0xF4A7, 0xF4A6, 0xF4A8, 	 0, 0xC477, 0xC479, 	 0, 	 0, /* 0x40 */
+    0xC4F0, 	 0, 	 0, 0xF5E5, 0xF5E4, 	 0, 	 0, 0xF6FA, /* 0x50 */
+         0, 0xF6FC, 0xF6FE, 0xF6FD, 0xF6FB, 	 0, 	 0, 0xC5A3, /* 0x50 */
+    0xC5A2, 	 0, 	 0, 0xC5D3, 0xC5D2, 0xC5D4, 0xF7ED, 0xF7EC, /* 0x60 */
+         0, 0xF8FB, 0xF8B8, 0xF8FC, 0xC658, 	 0, 0xC659, 0xF96D, /* 0x60 */
+         0, 	 0, 0xC67E, 0xA6CC, 	 0, 0xCDA8, 	 0, 	 0, /* 0x70 */
+    0xD045, 0xD046, 0xD044, 	 0, 	 0, 0xACF3, 	 0, 0xD047, /* 0x70 */
+    0xD048, 0xD049, 	 0, 	 0, 0xD349, 0xD34F, 	 0, 	 0, /* 0x80 */
+    0xD34D, 0xAFBB, 0xD34B, 	 0, 0xD34C, 0xD34E, 	 0, 	 0, /* 0x80 */
+         0, 0xD34A, 0xB2C9, 	 0, 0xD6DE, 0xB2CB, 0xD6E0, 0xB2CA, /* 0x90 */
+    0xD6DF, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDAE8, 0xB5AF, /* 0x90 */
+         0, 0xDAEA, 0xDAE7, 0xD6E1, 	 0, 0xB5B0, 	 0, 0xF9DB, /* 0xA0 */
+    0xDAE9, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xDF56, /* 0xA0 */
+         0, 0xB864, 0xDF54, 0xB865, 0xDF55, 0xB866, 	 0, 	 0, /* 0xB0 */
          0, 0xBAE9, 0xE361, 0xE35E, 0xE360, 0xBAEA, 0xBAEB, 0xE35F, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xE6DF,      0,      0, /* 0xC0 */
-    0xE6E0,      0, 0xBD6B, 0xE6E2, 0xE6E1,      0, 0xA261,      0, /* 0xC0 */
-    0xEACA, 0xEACB, 0xEAC7,      0, 0xEAC8, 0xBF7C, 0xBF7D, 0xEAC9, /* 0xD0 */
-         0, 0xC157,      0,      0, 0xC153, 0xC158, 0xC154, 0xC156, /* 0xD0 */
-    0xC152,      0, 0xC155,      0,      0,      0,      0, 0xC2B3, /* 0xE0 */
-    0xEDCF,      0, 0xF2AE,      0, 0xF2AD,      0, 0xF4AB, 0xC47A, /* 0xE0 */
-    0xC47B, 0xF741, 0xF5E6,      0, 0xF740,      0, 0xF8FD, 0xF9A4, /* 0xF0 */
-    0xA6CD,      0,      0, 0xA874,      0, 0xCDA9, 0xAAC8          /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE6DF, 	 0, 	 0, /* 0xC0 */
+    0xE6E0, 	 0, 0xBD6B, 0xE6E2, 0xE6E1, 	 0, 0xA261, 	 0, /* 0xC0 */
+    0xEACA, 0xEACB, 0xEAC7, 	 0, 0xEAC8, 0xBF7C, 0xBF7D, 0xEAC9, /* 0xD0 */
+         0, 0xC157, 	 0, 	 0, 0xC153, 0xC158, 0xC154, 0xC156, /* 0xD0 */
+    0xC152, 	 0, 0xC155, 	 0, 	 0, 	 0, 	 0, 0xC2B3, /* 0xE0 */
+    0xEDCF, 	 0, 0xF2AE, 	 0, 0xF2AD, 	 0, 0xF4AB, 0xC47A, /* 0xE0 */
+    0xC47B, 0xF741, 0xF5E6, 	 0, 0xF740, 	 0, 0xF8FD, 0xF9A4, /* 0xF0 */
+    0xA6CD, 	 0, 	 0, 0xA874, 	 0, 0xCDA9, 0xAAC8			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_7D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xACF6, 0xD04C, 0xACF4, 0xD04A, 0xACF9, 0xACF5, 0xACFA, 0xACF8, /* 0x00 */
     0xD04B, 0xACF7, 0xAFBF, 0xAFBE, 0xD35A, 0xAFC7, 0xD353, 0xD359, /* 0x00 */
     0xAFC3, 0xD352, 0xD358, 0xD356, 0xAFC2, 0xAFC4, 0xD355, 0xAFBD, /* 0x10 */
     0xD354, 0xAFC8, 0xAFC5, 0xAFC9, 0xAFC6, 0xD351, 0xD350, 0xD357, /* 0x10 */
-    0xAFC0, 0xAFBC, 0xAFC1,      0,      0,      0,      0,      0, /* 0x20 */
-    0xD6F0, 0xD6E9,      0, 0xB5B5, 0xD6E8,      0, 0xB2CF, 0xB2D6, /* 0x20 */
-    0xB2D3, 0xB2D9, 0xB2D8, 0xB2D4,      0, 0xD6E2, 0xD6E5,      0, /* 0x30 */
+    0xAFC0, 0xAFBC, 0xAFC1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xD6F0, 0xD6E9, 	 0, 0xB5B5, 0xD6E8, 	 0, 0xB2CF, 0xB2D6, /* 0x20 */
+    0xB2D3, 0xB2D9, 0xB2D8, 0xB2D4, 	 0, 0xD6E2, 0xD6E5, 	 0, /* 0x30 */
     0xD6E4, 0xB2D0, 0xD6E6, 0xD6EF, 0xB2D1, 0xD6E3, 0xD6EC, 0xD6ED, /* 0x30 */
     0xB2D2, 0xD6EA, 0xB2D7, 0xB2CD, 0xB2D5, 0xD6E7, 0xB2CC, 0xD6EB, /* 0x40 */
-         0,      0, 0xD6EE,      0,      0,      0, 0xDAFB, 0xDAF2, /* 0x40 */
-    0xB5B2, 0xDAF9, 0xDAF6, 0xDAEE, 0xDAF7, 0xB5B4, 0xDAEF,      0, /* 0x50 */
-    0xDAEB,      0,      0, 0xB86C, 0xDAF4,      0, 0xB5B1, 0xDAFA, /* 0x50 */
-         0, 0xB5B8, 0xB5BA, 0xDAED,      0,      0, 0xB5B9, 0xDAF0, /* 0x60 */
-    0xB5B3, 0xDAF8, 0xDAF1, 0xDAF5,      0, 0xDAF3, 0xB5B6, 0xDAEC, /* 0x60 */
-    0xB5BB, 0xB2CE, 0xB5B7, 0xB5BC,      0,      0,      0,      0, /* 0x70 */
-         0, 0xB868, 0xDF5D, 0xDF5F, 0xDF61, 0xDF65,      0, 0xDF5B, /* 0x70 */
-    0xDF59, 0xB86A,      0, 0xDF60, 0xDF64, 0xDF5C, 0xDF58,      0, /* 0x80 */
-    0xDF57,      0,      0,      0, 0xDF62, 0xDF5A, 0xDF5E, 0xB86B, /* 0x80 */
-         0, 0xB869, 0xDF66, 0xB867, 0xDF63,      0, 0xE372,      0, /* 0x90 */
-         0,      0,      0,      0, 0xBAEE, 0xE36A, 0xBD78, 0xE374, /* 0x90 */
-    0xBAF1, 0xE378, 0xBAF7, 0xE365,      0,      0, 0xE375, 0xE362, /* 0xA0 */
-         0, 0xE377, 0xE366,      0, 0xBAFE, 0xBAFB, 0xE376, 0xE370, /* 0xA0 */
-    0xBAED, 0xBAF5, 0xBAF4,      0, 0xBAF3, 0xBAF9,      0, 0xE363, /* 0xB0 */
+         0, 	 0, 0xD6EE, 	 0, 	 0, 	 0, 0xDAFB, 0xDAF2, /* 0x40 */
+    0xB5B2, 0xDAF9, 0xDAF6, 0xDAEE, 0xDAF7, 0xB5B4, 0xDAEF, 	 0, /* 0x50 */
+    0xDAEB, 	 0, 	 0, 0xB86C, 0xDAF4, 	 0, 0xB5B1, 0xDAFA, /* 0x50 */
+         0, 0xB5B8, 0xB5BA, 0xDAED, 	 0, 	 0, 0xB5B9, 0xDAF0, /* 0x60 */
+    0xB5B3, 0xDAF8, 0xDAF1, 0xDAF5, 	 0, 0xDAF3, 0xB5B6, 0xDAEC, /* 0x60 */
+    0xB5BB, 0xB2CE, 0xB5B7, 0xB5BC, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xB868, 0xDF5D, 0xDF5F, 0xDF61, 0xDF65, 	 0, 0xDF5B, /* 0x70 */
+    0xDF59, 0xB86A, 	 0, 0xDF60, 0xDF64, 0xDF5C, 0xDF58, 	 0, /* 0x80 */
+    0xDF57, 	 0, 	 0, 	 0, 0xDF62, 0xDF5A, 0xDF5E, 0xB86B, /* 0x80 */
+         0, 0xB869, 0xDF66, 0xB867, 0xDF63, 	 0, 0xE372, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 0xBAEE, 0xE36A, 0xBD78, 0xE374, /* 0x90 */
+    0xBAF1, 0xE378, 0xBAF7, 0xE365, 	 0, 	 0, 0xE375, 0xE362, /* 0xA0 */
+         0, 0xE377, 0xE366, 	 0, 0xBAFE, 0xBAFB, 0xE376, 0xE370, /* 0xA0 */
+    0xBAED, 0xBAF5, 0xBAF4, 	 0, 0xBAF3, 0xBAF9, 	 0, 0xE363, /* 0xB0 */
     0xBAFA, 0xE371, 0xBAF6, 0xBAEC, 0xE373, 0xBAEF, 0xBAF0, 0xBAF8, /* 0xB0 */
-    0xE368, 0xE367, 0xE364,      0, 0xE36C, 0xE369, 0xE36D, 0xBAFD, /* 0xC0 */
-         0, 0xE379, 0xBAF2, 0xE36E, 0xE36F,      0, 0xE36B,      0, /* 0xC0 */
-         0,      0, 0xBAFC,      0,      0,      0,      0, 0xE6E7, /* 0xD0 */
-    0xBD70, 0xBD79, 0xBD75, 0xE6E4,      0, 0xBD72, 0xBD76, 0xE6F0, /* 0xD0 */
-    0xBD6C, 0xE6E8,      0, 0xBD74,      0,      0, 0xE6EB, 0xE6E6, /* 0xE0 */
-    0xBD73, 0xBD77, 0xE6E5,      0, 0xBD71,      0, 0xE6EF, 0xBD6E, /* 0xE0 */
-    0xE6EE, 0xE6ED, 0xBD7A, 0xE572, 0xBD6D,      0, 0xE6EC, 0xE6E3, /* 0xF0 */
-         0, 0xBD7B, 0xE6EA, 0xBD6F                                  /* 0xF0 */
+    0xE368, 0xE367, 0xE364, 	 0, 0xE36C, 0xE369, 0xE36D, 0xBAFD, /* 0xC0 */
+         0, 0xE379, 0xBAF2, 0xE36E, 0xE36F, 	 0, 0xE36B, 	 0, /* 0xC0 */
+         0, 	 0, 0xBAFC, 	 0, 	 0, 	 0, 	 0, 0xE6E7, /* 0xD0 */
+    0xBD70, 0xBD79, 0xBD75, 0xE6E4, 	 0, 0xBD72, 0xBD76, 0xE6F0, /* 0xD0 */
+    0xBD6C, 0xE6E8, 	 0, 0xBD74, 	 0, 	 0, 0xE6EB, 0xE6E6, /* 0xE0 */
+    0xBD73, 0xBD77, 0xE6E5, 	 0, 0xBD71, 	 0, 0xE6EF, 0xBD6E, /* 0xE0 */
+    0xE6EE, 0xE6ED, 0xBD7A, 0xE572, 0xBD6D, 	 0, 0xE6EC, 0xE6E3, /* 0xF0 */
+         0, 0xBD7B, 0xE6EA, 0xBD6F									/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_7E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                            0xE6E9,      0,      0,      0,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                            0xE6E9, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
     0xBFA2, 0xBFA7, 0xBF7E, 0xEAD8, 0xEACF, 0xEADB, 0xEAD3, 0xEAD9, /* 0x00 */
     0xBFA8, 0xBFA1, 0xEACC, 0xEAD2, 0xEADC, 0xEAD5, 0xEADA, 0xEACE, /* 0x10 */
-         0,      0, 0xEAD6, 0xBFA3, 0xEAD4, 0xBFA6, 0xBFA5, 0xEAD0, /* 0x10 */
-    0xEAD1, 0xEACD, 0xEAD7, 0xBFA4, 0xEADE, 0xEADD,      0,      0, /* 0x20 */
-         0, 0xEDDA, 0xEDD6, 0xC15F,      0, 0xEDD0, 0xC159, 0xC169, /* 0x20 */
+         0, 	 0, 0xEAD6, 0xBFA3, 0xEAD4, 0xBFA6, 0xBFA5, 0xEAD0, /* 0x10 */
+    0xEAD1, 0xEACD, 0xEAD7, 0xBFA4, 0xEADE, 0xEADD, 	 0, 	 0, /* 0x20 */
+         0, 0xEDDA, 0xEDD6, 0xC15F, 	 0, 0xEDD0, 0xC159, 0xC169, /* 0x20 */
     0xEDDC, 0xC161, 0xC15D, 0xEDD3, 0xC164, 0xC167, 0xEDDE, 0xC15C, /* 0x30 */
     0xEDD5, 0xC165, 0xEDE0, 0xEDDD, 0xEDD1, 0xC160, 0xC15A, 0xC168, /* 0x30 */
     0xEDD8, 0xC163, 0xEDD2, 0xC15E, 0xEDDF, 0xC162, 0xC15B, 0xEDD9, /* 0x40 */
-    0xC166, 0xEDD7,      0,      0, 0xEDDB,      0,      0,      0, /* 0x40 */
+    0xC166, 0xEDD7, 	 0, 	 0, 0xEDDB, 	 0, 	 0, 	 0, /* 0x40 */
     0xF06E, 0xF074, 0xC2B9, 0xF077, 0xC2B4, 0xC2B5, 0xF06F, 0xF076, /* 0x50 */
-    0xF071, 0xC2BA, 0xC2B7,      0, 0xF06D,      0, 0xC2B6, 0xF073, /* 0x50 */
-    0xF075, 0xC2B8, 0xF072, 0xF070,      0,      0,      0,      0, /* 0x60 */
-    0xF2B8, 0xC3B7, 0xC3B8, 0xC3B4,      0, 0xC3B5,      0, 0xF2B4, /* 0x60 */
-    0xF2B2,      0, 0xF2B6, 0xC3BA, 0xF2B7, 0xF2B0, 0xF2AF, 0xF2B3, /* 0x70 */
-    0xF2B1, 0xC3B6, 0xF2B5, 0xF4AC, 0xC47E, 0xC47D, 0xF4AD,      0, /* 0x70 */
-    0xF4AF, 0xF4AE, 0xC4A1,      0,      0,      0, 0xF5EB, 0xF5E8, /* 0x80 */
-    0xF5E9,      0, 0xF5E7, 0xF5EA, 0xC4F2, 0xF5EC,      0, 0xC4F1, /* 0x80 */
-         0, 0xF742,      0, 0xC5D5, 0xC5D7, 0xF7EE, 0xC5D6, 0xF8B9, /* 0x90 */
-    0xF940, 0xF942, 0xF8FE, 0xF941, 0xC66C                          /* 0x90 */
+    0xF071, 0xC2BA, 0xC2B7, 	 0, 0xF06D, 	 0, 0xC2B6, 0xF073, /* 0x50 */
+    0xF075, 0xC2B8, 0xF072, 0xF070, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+    0xF2B8, 0xC3B7, 0xC3B8, 0xC3B4, 	 0, 0xC3B5, 	 0, 0xF2B4, /* 0x60 */
+    0xF2B2, 	 0, 0xF2B6, 0xC3BA, 0xF2B7, 0xF2B0, 0xF2AF, 0xF2B3, /* 0x70 */
+    0xF2B1, 0xC3B6, 0xF2B5, 0xF4AC, 0xC47E, 0xC47D, 0xF4AD, 	 0, /* 0x70 */
+    0xF4AF, 0xF4AE, 0xC4A1, 	 0, 	 0, 	 0, 0xF5EB, 0xF5E8, /* 0x80 */
+    0xF5E9, 	 0, 0xF5E7, 0xF5EA, 0xC4F2, 0xF5EC, 	 0, 0xC4F1, /* 0x80 */
+         0, 0xF742, 	 0, 0xC5D5, 0xC5D7, 0xF7EE, 0xC5D6, 0xF8B9, /* 0x90 */
+    0xF940, 0xF942, 0xF8FE, 0xF941, 0xC66C							/* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_7F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-                                                    0xA6CE,      0, /* 0x30 */
-    0xACFB, 0xD26F, 0xAFCA,      0,      0, 0xB2DA, 0xDAFC, 0xDAFD, /* 0x30 */
-         0,      0,      0, 0xEADF, 0xC16A, 0xEDE1,      0,      0, /* 0x40 */
-    0xC2BB,      0, 0xF2BA, 0xF2B9, 0xC4A2, 0xF5ED,      0, 0xF743, /* 0x40 */
-    0xC5F8, 0xCA49,      0,      0, 0xAAC9, 0xA875,      0,      0, /* 0x50 */
-    0xD04D,      0,      0, 0xD360, 0xD35B, 0xD35F, 0xD35D, 0xAFCB, /* 0x50 */
-    0xD35E, 0xD35C,      0, 0xD6F1,      0, 0xDAFE, 0xDB40, 0xDF69, /* 0x60 */
-    0xDF6A, 0xB86E, 0xB86F, 0xDF68, 0xDF6B, 0xDF67, 0xB86D,      0, /* 0x60 */
-    0xBB40,      0, 0xB870, 0xE37A,      0, 0xBD7C, 0xE6F1, 0xBD7D, /* 0x70 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+                                                    0xA6CE, 	 0, /* 0x30 */
+    0xACFB, 0xD26F, 0xAFCA, 	 0, 	 0, 0xB2DA, 0xDAFC, 0xDAFD, /* 0x30 */
+         0, 	 0, 	 0, 0xEADF, 0xC16A, 0xEDE1, 	 0, 	 0, /* 0x40 */
+    0xC2BB, 	 0, 0xF2BA, 0xF2B9, 0xC4A2, 0xF5ED, 	 0, 0xF743, /* 0x40 */
+    0xC5F8, 0xCA49, 	 0, 	 0, 0xAAC9, 0xA875, 	 0, 	 0, /* 0x50 */
+    0xD04D, 	 0, 	 0, 0xD360, 0xD35B, 0xD35F, 0xD35D, 0xAFCB, /* 0x50 */
+    0xD35E, 0xD35C, 	 0, 0xD6F1, 	 0, 0xDAFE, 0xDB40, 0xDF69, /* 0x60 */
+    0xDF6A, 0xB86E, 0xB86F, 0xDF68, 0xDF6B, 0xDF67, 0xB86D, 	 0, /* 0x60 */
+    0xBB40, 	 0, 0xB870, 0xE37A, 	 0, 0xBD7C, 0xE6F1, 0xBD7D, /* 0x70 */
          0, 0xBFA9, 0xEAE2, 0xEAE0, 0xEAE1, 0xEDE4, 0xEDE3, 0xEDE2, /* 0x70 */
-         0,      0,      0, 0xF2BB,      0, 0xC3B9, 0xF2BC, 0xF744, /* 0x80 */
-    0xC5F9, 0xF8BA, 0xA6CF, 0xAACB, 0xAACA, 0xD04F, 0xACFC,      0, /* 0x80 */
-         0, 0xD04E, 0xD362,      0, 0xAFCC, 0xD6F2, 0xD361,      0, /* 0x90 */
-         0,      0, 0xB2DC, 0xD6F5, 0xD6F3, 0xD6F4, 0xB2DB,      0, /* 0x90 */
-    0xDB42, 0xDB43, 0xDB41,      0, 0xB873, 0xDF6D, 0xDF6C, 0xDF6E, /* 0xA0 */
-    0xB872, 0xB871,      0,      0, 0xE6F2, 0xE6F4,      0, 0xBD7E, /* 0xA0 */
-    0xE6F3, 0xEAE3, 0xBFAA, 0xF079,      0, 0xF078, 0xC3BB, 0xF2BD, /* 0xB0 */
+         0, 	 0, 	 0, 0xF2BB, 	 0, 0xC3B9, 0xF2BC, 0xF744, /* 0x80 */
+    0xC5F9, 0xF8BA, 0xA6CF, 0xAACB, 0xAACA, 0xD04F, 0xACFC, 	 0, /* 0x80 */
+         0, 0xD04E, 0xD362, 	 0, 0xAFCC, 0xD6F2, 0xD361, 	 0, /* 0x90 */
+         0, 	 0, 0xB2DC, 0xD6F5, 0xD6F3, 0xD6F4, 0xB2DB, 	 0, /* 0x90 */
+    0xDB42, 0xDB43, 0xDB41, 	 0, 0xB873, 0xDF6D, 0xDF6C, 0xDF6E, /* 0xA0 */
+    0xB872, 0xB871, 	 0, 	 0, 0xE6F2, 0xE6F4, 	 0, 0xBD7E, /* 0xA0 */
+    0xE6F3, 0xEAE3, 0xBFAA, 0xF079, 	 0, 0xF078, 0xC3BB, 0xF2BD, /* 0xB0 */
     0xC3BD, 0xC3BC, 0xF4B0, 0xF5EE, 0xC4F3, 0xA6D0, 0xD050, 0xACFD, /* 0xB0 */
-    0xD365, 0xAFCE, 0xD364, 0xD363,      0, 0xAFCD,      0, 0xD6FB, /* 0xC0 */
+    0xD365, 0xAFCE, 0xD364, 0xD363, 	 0, 0xAFCD, 	 0, 0xD6FB, /* 0xC0 */
          0, 0xD6FD, 0xD6F6, 0xD6F7, 0xB2DD, 0xD6F8, 0xB2DE, 0xD6FC, /* 0xC0 */
-    0xD6F9, 0xD6FA, 0xB2DF,      0, 0xB5BE, 0xB5BF,      0, 0xDB44, /* 0xD0 */
-         0,      0,      0, 0xDF6F, 0xDF70,      0, 0xE37E, 0xBB43, /* 0xD0 */
-    0xBB41, 0xBB42, 0xE37B, 0xE37C,      0, 0xE37D, 0xE6F9,      0, /* 0xE0 */
+    0xD6F9, 0xD6FA, 0xB2DF, 	 0, 0xB5BE, 0xB5BF, 	 0, 0xDB44, /* 0xD0 */
+         0, 	 0, 	 0, 0xDF6F, 0xDF70, 	 0, 0xE37E, 0xBB43, /* 0xD0 */
+    0xBB41, 0xBB42, 0xE37B, 0xE37C, 	 0, 0xE37D, 0xE6F9, 	 0, /* 0xE0 */
     0xE6FA, 0xBDA1, 0xE6F7, 0xE6F6, 0xE6F8, 0xE6F5, 0xBFAD, 0xEAE4, /* 0xE0 */
-    0xBFAB, 0xBFAC, 0xEDE6, 0xC16B, 0xEDE5, 0xEFA8,      0, 0xF07A, /* 0xF0 */
-    0xF07B, 0xC2BC,      0, 0xC2BD, 0xC16C, 0xF2BE, 0xF2BF, 0xF4B1  /* 0xF0 */
+    0xBFAB, 0xBFAC, 0xEDE6, 0xC16B, 0xEDE5, 0xEFA8, 	 0, 0xF07A, /* 0xF0 */
+    0xF07B, 0xC2BC, 	 0, 0xC2BD, 0xC16C, 0xF2BE, 0xF2BF, 0xF4B1	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_80[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xC4A3, 0xA6D1,      0, 0xA6D2, 0xACFE, 0xAACC, 0xAFCF, 0xD051, /* 0x00 */
-         0,      0,      0, 0xB5C0, 0xA6D3, 0xAD41, 0xD052, 0xD053, /* 0x00 */
-    0xAD40, 0xAD42, 0xA6D4,      0, 0xD054, 0xAFD1, 0xD366, 0xAFD3, /* 0x10 */
-    0xAFD0, 0xAFD2,      0, 0xD741, 0xB2E0,      0, 0xD740, 0xD6FE, /* 0x10 */
-         0, 0xDF71,      0,      0, 0xE3A1,      0, 0xBDA2,      0, /* 0x20 */
-    0xBFAE, 0xEAE6, 0xEAE5,      0, 0xEDE7,      0,      0,      0, /* 0x20 */
-    0xF5EF,      0,      0, 0xA6D5, 0xCB73, 0xCDAA, 0xAD43, 0xD055, /* 0x30 */
-         0, 0xD368,      0,      0,      0, 0xAFD4, 0xD367, 0xAFD5, /* 0x30 */
-         0,      0,      0, 0xD743,      0,      0, 0xB2E2, 0xD742, /* 0x40 */
-    0xD744,      0, 0xB2E1,      0,      0,      0,      0, 0xDB46, /* 0x40 */
-    0xDB47, 0xDB45, 0xB5C1,      0,      0,      0, 0xB874,      0, /* 0x50 */
-    0xB875,      0, 0xBB45,      0, 0xE3A3, 0xE3A2, 0xBB44,      0, /* 0x50 */
-         0,      0,      0,      0, 0xE6FB,      0,      0, 0xE6FC, /* 0x60 */
-         0,      0,      0,      0, 0xEAE7,      0,      0, 0xC170, /* 0x60 */
-    0xC16F, 0xC16D, 0xC16E, 0xC171,      0, 0xF07C, 0xC2BF, 0xC2BE, /* 0x70 */
-    0xF2C0, 0xF4B2,      0,      0,      0, 0xC5A5, 0xC5A4, 0xA6D6, /* 0x70 */
-         0,      0, 0xD1FB,      0, 0xB877, 0xB5C2, 0xB876, 0xBB46, /* 0x80 */
-         0, 0xA6D7, 0xC9A9, 0xA6D8, 0xA6D9,      0,      0, 0xCDAB, /* 0x80 */
-    0xCB76,      0, 0xCB77, 0xA877,      0, 0xCB74, 0xA876,      0, /* 0x90 */
-    0xA879, 0xCB75, 0xA87B, 0xA87A, 0xCB78, 0xA878,      0,      0, /* 0x90 */
-         0, 0xAAD1, 0xAACF, 0xCDAD,      0, 0xAACE,      0,      0, /* 0xA0 */
-         0, 0xAAD3, 0xAAD5, 0xAAD2,      0, 0xCDB0, 0xCDAC, 0xAAD6, /* 0xA0 */
-         0, 0xAAD0, 0xA87C,      0, 0xAAD4, 0xCDAF,      0,      0, /* 0xB0 */
-    0xCDAE,      0, 0xAACD,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xD05B, 0xAD47, 0xAD48, 0xD05D,      0, 0xD057, /* 0xC0 */
-    0xD05A, 0xD063, 0xD061,      0, 0xAD49, 0xD067, 0xAD4C, 0xD064, /* 0xC0 */
-    0xD05C, 0xD059,      0,      0, 0xDB49, 0xD062, 0xAD44, 0xD065, /* 0xD0 */
-    0xD056, 0xD05F, 0xAD46, 0xAD4B, 0xD060, 0xAD4F, 0xAD4D,      0, /* 0xD0 */
-    0xD058, 0xAD4A,      0, 0xD05E, 0xAD4E, 0xAD45, 0xD066,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xAFDA,      0, 0xAFE3, /* 0xE0 */
-    0xAFD8, 0xAFD6, 0xD36A, 0xAFDE, 0xAFDB, 0xD36C,      0,      0, /* 0xF0 */
-    0xAFDD, 0xD36B, 0xD369, 0xD36E, 0xAFE2, 0xAFE0, 0xDB48          /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xC4A3, 0xA6D1, 	 0, 0xA6D2, 0xACFE, 0xAACC, 0xAFCF, 0xD051, /* 0x00 */
+         0, 	 0, 	 0, 0xB5C0, 0xA6D3, 0xAD41, 0xD052, 0xD053, /* 0x00 */
+    0xAD40, 0xAD42, 0xA6D4, 	 0, 0xD054, 0xAFD1, 0xD366, 0xAFD3, /* 0x10 */
+    0xAFD0, 0xAFD2, 	 0, 0xD741, 0xB2E0, 	 0, 0xD740, 0xD6FE, /* 0x10 */
+         0, 0xDF71, 	 0, 	 0, 0xE3A1, 	 0, 0xBDA2, 	 0, /* 0x20 */
+    0xBFAE, 0xEAE6, 0xEAE5, 	 0, 0xEDE7, 	 0, 	 0, 	 0, /* 0x20 */
+    0xF5EF, 	 0, 	 0, 0xA6D5, 0xCB73, 0xCDAA, 0xAD43, 0xD055, /* 0x30 */
+         0, 0xD368, 	 0, 	 0, 	 0, 0xAFD4, 0xD367, 0xAFD5, /* 0x30 */
+         0, 	 0, 	 0, 0xD743, 	 0, 	 0, 0xB2E2, 0xD742, /* 0x40 */
+    0xD744, 	 0, 0xB2E1, 	 0, 	 0, 	 0, 	 0, 0xDB46, /* 0x40 */
+    0xDB47, 0xDB45, 0xB5C1, 	 0, 	 0, 	 0, 0xB874, 	 0, /* 0x50 */
+    0xB875, 	 0, 0xBB45, 	 0, 0xE3A3, 0xE3A2, 0xBB44, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xE6FB, 	 0, 	 0, 0xE6FC, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xEAE7, 	 0, 	 0, 0xC170, /* 0x60 */
+    0xC16F, 0xC16D, 0xC16E, 0xC171, 	 0, 0xF07C, 0xC2BF, 0xC2BE, /* 0x70 */
+    0xF2C0, 0xF4B2, 	 0, 	 0, 	 0, 0xC5A5, 0xC5A4, 0xA6D6, /* 0x70 */
+         0, 	 0, 0xD1FB, 	 0, 0xB877, 0xB5C2, 0xB876, 0xBB46, /* 0x80 */
+         0, 0xA6D7, 0xC9A9, 0xA6D8, 0xA6D9, 	 0, 	 0, 0xCDAB, /* 0x80 */
+    0xCB76, 	 0, 0xCB77, 0xA877, 	 0, 0xCB74, 0xA876, 	 0, /* 0x90 */
+    0xA879, 0xCB75, 0xA87B, 0xA87A, 0xCB78, 0xA878, 	 0, 	 0, /* 0x90 */
+         0, 0xAAD1, 0xAACF, 0xCDAD, 	 0, 0xAACE, 	 0, 	 0, /* 0xA0 */
+         0, 0xAAD3, 0xAAD5, 0xAAD2, 	 0, 0xCDB0, 0xCDAC, 0xAAD6, /* 0xA0 */
+         0, 0xAAD0, 0xA87C, 	 0, 0xAAD4, 0xCDAF, 	 0, 	 0, /* 0xB0 */
+    0xCDAE, 	 0, 0xAACD, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xD05B, 0xAD47, 0xAD48, 0xD05D, 	 0, 0xD057, /* 0xC0 */
+    0xD05A, 0xD063, 0xD061, 	 0, 0xAD49, 0xD067, 0xAD4C, 0xD064, /* 0xC0 */
+    0xD05C, 0xD059, 	 0, 	 0, 0xDB49, 0xD062, 0xAD44, 0xD065, /* 0xD0 */
+    0xD056, 0xD05F, 0xAD46, 0xAD4B, 0xD060, 0xAD4F, 0xAD4D, 	 0, /* 0xD0 */
+    0xD058, 0xAD4A, 	 0, 0xD05E, 0xAD4E, 0xAD45, 0xD066, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xAFDA, 	 0, 0xAFE3, /* 0xE0 */
+    0xAFD8, 0xAFD6, 0xD36A, 0xAFDE, 0xAFDB, 0xD36C, 	 0, 	 0, /* 0xF0 */
+    0xAFDD, 0xD36B, 0xD369, 0xD36E, 0xAFE2, 0xAFE0, 0xDB48			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_81[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xD36F, 0xD36D, 0xAFD7,      0,      0, 0xAFD9, 0xAFDC,      0, /* 0x00 */
-    0xAFDF,      0, 0xAFE1,      0,      0,      0,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0, 0xD74E, 0xB2E4,      0, /* 0x10 */
-    0xD745, 0xD747,      0, 0xD748,      0, 0xD750, 0xD74C, 0xD74A, /* 0x10 */
-         0, 0xD74D, 0xD751, 0xB2E5, 0xB2E9, 0xD746,      0, 0xD74F, /* 0x20 */
-         0, 0xB2E7,      0, 0xB2E6, 0xD74B, 0xD749,      0, 0xB2E3, /* 0x20 */
-    0xB2E8,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xB5C8, 0xDB51,      0,      0, 0xDB4F, 0xB5CA,      0, /* 0x30 */
-         0,      0,      0, 0xDB4A, 0xDFA1,      0, 0xB5C9, 0xDB4E, /* 0x40 */
-         0,      0, 0xDB4B, 0xB5C5, 0xB5CB, 0xDB50, 0xB5C7, 0xDB4D, /* 0x40 */
-    0xBB47, 0xB5C6, 0xDB4C, 0xB5CC, 0xB5C4, 0xB5C3,      0,      0, /* 0x50 */
-         0,      0,      0, 0xDF77, 0xDF75,      0, 0xDF7B,      0, /* 0x50 */
-    0xDF73, 0xDFA2, 0xDF78,      0, 0xDF72, 0xB87B, 0xB8A3, 0xDF7D, /* 0x60 */
-         0, 0xDF76,      0, 0xB87E,      0,      0, 0xB87C, 0xDF7E, /* 0x60 */
-    0xB879, 0xB878, 0xDF79, 0xB87D, 0xB5CD,      0, 0xDF7C, 0xDF74, /* 0x70 */
-    0xB87A, 0xB8A1, 0xB8A2,      0,      0,      0,      0, 0xBB4C, /* 0x70 */
-    0xBB48,      0, 0xBB4D, 0xE3A6,      0,      0, 0xE3A5, 0xE3A7, /* 0x80 */
-    0xBB4A, 0xE3A4, 0xBB4B, 0xE3AA, 0xE3A9, 0xE3A8,      0, 0xBB49, /* 0x80 */
-         0,      0,      0,      0,      0, 0xE741,      0, 0xE744, /* 0x90 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xD36F, 0xD36D, 0xAFD7, 	 0, 	 0, 0xAFD9, 0xAFDC, 	 0, /* 0x00 */
+    0xAFDF, 	 0, 0xAFE1, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD74E, 0xB2E4, 	 0, /* 0x10 */
+    0xD745, 0xD747, 	 0, 0xD748, 	 0, 0xD750, 0xD74C, 0xD74A, /* 0x10 */
+         0, 0xD74D, 0xD751, 0xB2E5, 0xB2E9, 0xD746, 	 0, 0xD74F, /* 0x20 */
+         0, 0xB2E7, 	 0, 0xB2E6, 0xD74B, 0xD749, 	 0, 0xB2E3, /* 0x20 */
+    0xB2E8, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xB5C8, 0xDB51, 	 0, 	 0, 0xDB4F, 0xB5CA, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xDB4A, 0xDFA1, 	 0, 0xB5C9, 0xDB4E, /* 0x40 */
+         0, 	 0, 0xDB4B, 0xB5C5, 0xB5CB, 0xDB50, 0xB5C7, 0xDB4D, /* 0x40 */
+    0xBB47, 0xB5C6, 0xDB4C, 0xB5CC, 0xB5C4, 0xB5C3, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 0xDF77, 0xDF75, 	 0, 0xDF7B, 	 0, /* 0x50 */
+    0xDF73, 0xDFA2, 0xDF78, 	 0, 0xDF72, 0xB87B, 0xB8A3, 0xDF7D, /* 0x60 */
+         0, 0xDF76, 	 0, 0xB87E, 	 0, 	 0, 0xB87C, 0xDF7E, /* 0x60 */
+    0xB879, 0xB878, 0xDF79, 0xB87D, 0xB5CD, 	 0, 0xDF7C, 0xDF74, /* 0x70 */
+    0xB87A, 0xB8A1, 0xB8A2, 	 0, 	 0, 	 0, 	 0, 0xBB4C, /* 0x70 */
+    0xBB48, 	 0, 0xBB4D, 0xE3A6, 	 0, 	 0, 0xE3A5, 0xE3A7, /* 0x80 */
+    0xBB4A, 0xE3A4, 0xBB4B, 0xE3AA, 0xE3A9, 0xE3A8, 	 0, 0xBB49, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE741, 	 0, 0xE744, /* 0x90 */
     0xBDA8, 0xE743, 0xBDA7, 0xBDA3, 0xBDA4, 0xBDA5, 0xE740, 0xE6FE, /* 0x90 */
-    0xBDA6,      0, 0xE742, 0xE6FD,      0,      0, 0xEAE9, 0xEAF3, /* 0xA0 */
-    0xBFB1, 0xBFB0,      0, 0xEAED, 0xEAEF,      0, 0xEAEA,      0, /* 0xA0 */
-    0xEAEE, 0xEAE8, 0xEAF1, 0xBFAF, 0xEAF0, 0xEAEC,      0, 0xEAF2, /* 0xB0 */
+    0xBDA6, 	 0, 0xE742, 0xE6FD, 	 0, 	 0, 0xEAE9, 0xEAF3, /* 0xA0 */
+    0xBFB1, 0xBFB0, 	 0, 0xEAED, 0xEAEF, 	 0, 0xEAEA, 	 0, /* 0xA0 */
+    0xEAEE, 0xEAE8, 0xEAF1, 0xBFAF, 0xEAF0, 0xEAEC, 	 0, 0xEAF2, /* 0xB0 */
          0, 0xEAEB, 0xC174, 0xEDE8, 0xEDEE, 0xC178, 0xC17A, 0xC177, /* 0xB0 */
-    0xC176,      0, 0xC175, 0xC173, 0xEDE9, 0xEDEC, 0xC172, 0xEDED, /* 0xC0 */
-         0, 0xC179, 0xEDEB,      0, 0xEDEA, 0xC2C0,      0, 0xC2C1, /* 0xC0 */
-    0xF0A1, 0xF07D, 0xF07E,      0,      0, 0xF2C2,      0, 0xF2C1, /* 0xD0 */
-    0xC3BE, 0xF4B4, 0xC4A4, 0xF4B3,      0, 0xF5F0, 0xF745, 0xC5A6, /* 0xD0 */
-    0xF943, 0xF944, 0xC5D8, 0xA6DA,      0, 0xAAD7, 0xDB52, 0xBB4E, /* 0xE0 */
-    0xC17B, 0xEDEF, 0xA6DB,      0, 0xAFE5, 0xAFE4, 0xDB53,      0, /* 0xE0 */
-         0,      0, 0xEAF4, 0xA6DC, 0xAD50,      0,      0, 0xDB54, /* 0xF0 */
-    0xDB55, 0xDB56, 0xBB4F, 0xBFB2, 0xA6DD,      0, 0xAAD8, 0xD068  /* 0xF0 */
+    0xC176, 	 0, 0xC175, 0xC173, 0xEDE9, 0xEDEC, 0xC172, 0xEDED, /* 0xC0 */
+         0, 0xC179, 0xEDEB, 	 0, 0xEDEA, 0xC2C0, 	 0, 0xC2C1, /* 0xC0 */
+    0xF0A1, 0xF07D, 0xF07E, 	 0, 	 0, 0xF2C2, 	 0, 0xF2C1, /* 0xD0 */
+    0xC3BE, 0xF4B4, 0xC4A4, 0xF4B3, 	 0, 0xF5F0, 0xF745, 0xC5A6, /* 0xD0 */
+    0xF943, 0xF944, 0xC5D8, 0xA6DA, 	 0, 0xAAD7, 0xDB52, 0xBB4E, /* 0xE0 */
+    0xC17B, 0xEDEF, 0xA6DB, 	 0, 0xAFE5, 0xAFE4, 0xDB53, 	 0, /* 0xE0 */
+         0, 	 0, 0xEAF4, 0xA6DC, 0xAD50, 	 0, 	 0, 0xDB54, /* 0xF0 */
+    0xDB55, 0xDB56, 0xBB4F, 0xBFB2, 0xA6DD, 	 0, 0xAAD8, 0xD068	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_82[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xAFE6, 0xD370, 0xB2EA,      0, 0xDB57, 0xB8A4,      0, 0xBB50, /* 0x00 */
-    0xBFB3, 0xC17C, 0xC2C2, 0xF4B5, 0xA6DE, 0xAAD9,      0,      0, /* 0x00 */
-    0xAFE7, 0xD752, 0xB5CE,      0, 0xBB51, 0xE3AB, 0xE745,      0, /* 0x10 */
-         0,      0,      0, 0xA6DF, 0xB5CF, 0xDFA3, 0xBB52, 0xA6E0, /* 0x10 */
-    0xCDB1, 0xD069, 0xAD51,      0,      0, 0xD372,      0,      0, /* 0x20 */
-    0xAFEA,      0, 0xAFE8, 0xAFE9, 0xAFEB,      0,      0, 0xD371, /* 0x20 */
-         0,      0, 0xD757, 0xD754, 0xD756, 0xB2EB, 0xB2ED, 0xB2EC, /* 0x30 */
-    0xD753, 0xB2EE, 0xD755,      0, 0xDB58, 0xDB59,      0, 0xDB5A, /* 0x30 */
-    0xDFA6,      0, 0xDFA7,      0, 0xDFA5, 0xDFA8,      0, 0xB8A5, /* 0x40 */
-         0, 0xDFA4,      0, 0xBB53,      0,      0, 0xE74A, 0xE746, /* 0x40 */
-    0xE749, 0xE74B, 0xE748, 0xE747,      0, 0xEAF5, 0xEAF6, 0xEAF7, /* 0x50 */
-    0xBFB4, 0xBFB5, 0xEDF1, 0xEDF0, 0xEDF2,      0, 0xF0A3, 0xF0A2, /* 0x50 */
-         0, 0xF2C4,      0, 0xF2C5, 0xF2C3,      0, 0xC4A5,      0, /* 0x60 */
-    0xF4B6, 0xF4B7,      0, 0xF746, 0xF7EF, 0xF8BB, 0xA6E1, 0xA87D, /* 0x60 */
-         0, 0xC17D, 0xA6E2,      0, 0xD758, 0xDB5B,      0, 0xC641, /* 0x70 */
-    0xCA4A,      0,      0,      0, 0xCA4B, 0xCA4D, 0xA6E3, 0xCA4E, /* 0x70 */
-    0xCA4C,      0,      0, 0xCBA2, 0xCBA3, 0xCB7B,      0,      0, /* 0x80 */
-         0,      0, 0xCBA1, 0xA8A1,      0, 0xA8A2, 0xCB7C, 0xCB7A, /* 0x80 */
-    0xCB79, 0xCB7D, 0xA87E, 0xCB7E, 0xD06A,      0,      0,      0, /* 0x90 */
-    0xCDB6, 0xAADC, 0xCDB5, 0xCDB7,      0, 0xAADB, 0xCDBC, 0xAADF, /* 0x90 */
-    0xCDB2, 0xCDC0, 0xCDC6, 0xAAE6, 0xCDC3, 0xAAE3,      0, 0xCDB9, /* 0xA0 */
-    0xCDBF, 0xCDC1,      0, 0xCDB4, 0xAAE2, 0xAADD, 0xCDBA, 0xAAE4, /* 0xA0 */
-    0xAAE7, 0xAAE1,      0, 0xAADA, 0xCDBE, 0xCDB8, 0xCDC5, 0xAAE9, /* 0xB0 */
-    0xAAE5, 0xAAE0, 0xCDBD, 0xAFEC, 0xCDBB, 0xAADE, 0xAAE8,      0, /* 0xB0 */
-    0xCDB3,      0, 0xCDC2, 0xCDC4,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xAFE6, 0xD370, 0xB2EA, 	 0, 0xDB57, 0xB8A4, 	 0, 0xBB50, /* 0x00 */
+    0xBFB3, 0xC17C, 0xC2C2, 0xF4B5, 0xA6DE, 0xAAD9, 	 0, 	 0, /* 0x00 */
+    0xAFE7, 0xD752, 0xB5CE, 	 0, 0xBB51, 0xE3AB, 0xE745, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xA6DF, 0xB5CF, 0xDFA3, 0xBB52, 0xA6E0, /* 0x10 */
+    0xCDB1, 0xD069, 0xAD51, 	 0, 	 0, 0xD372, 	 0, 	 0, /* 0x20 */
+    0xAFEA, 	 0, 0xAFE8, 0xAFE9, 0xAFEB, 	 0, 	 0, 0xD371, /* 0x20 */
+         0, 	 0, 0xD757, 0xD754, 0xD756, 0xB2EB, 0xB2ED, 0xB2EC, /* 0x30 */
+    0xD753, 0xB2EE, 0xD755, 	 0, 0xDB58, 0xDB59, 	 0, 0xDB5A, /* 0x30 */
+    0xDFA6, 	 0, 0xDFA7, 	 0, 0xDFA5, 0xDFA8, 	 0, 0xB8A5, /* 0x40 */
+         0, 0xDFA4, 	 0, 0xBB53, 	 0, 	 0, 0xE74A, 0xE746, /* 0x40 */
+    0xE749, 0xE74B, 0xE748, 0xE747, 	 0, 0xEAF5, 0xEAF6, 0xEAF7, /* 0x50 */
+    0xBFB4, 0xBFB5, 0xEDF1, 0xEDF0, 0xEDF2, 	 0, 0xF0A3, 0xF0A2, /* 0x50 */
+         0, 0xF2C4, 	 0, 0xF2C5, 0xF2C3, 	 0, 0xC4A5, 	 0, /* 0x60 */
+    0xF4B6, 0xF4B7, 	 0, 0xF746, 0xF7EF, 0xF8BB, 0xA6E1, 0xA87D, /* 0x60 */
+         0, 0xC17D, 0xA6E2, 	 0, 0xD758, 0xDB5B, 	 0, 0xC641, /* 0x70 */
+    0xCA4A, 	 0, 	 0, 	 0, 0xCA4B, 0xCA4D, 0xA6E3, 0xCA4E, /* 0x70 */
+    0xCA4C, 	 0, 	 0, 0xCBA2, 0xCBA3, 0xCB7B, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 0xCBA1, 0xA8A1, 	 0, 0xA8A2, 0xCB7C, 0xCB7A, /* 0x80 */
+    0xCB79, 0xCB7D, 0xA87E, 0xCB7E, 0xD06A, 	 0, 	 0, 	 0, /* 0x90 */
+    0xCDB6, 0xAADC, 0xCDB5, 0xCDB7, 	 0, 0xAADB, 0xCDBC, 0xAADF, /* 0x90 */
+    0xCDB2, 0xCDC0, 0xCDC6, 0xAAE6, 0xCDC3, 0xAAE3, 	 0, 0xCDB9, /* 0xA0 */
+    0xCDBF, 0xCDC1, 	 0, 0xCDB4, 0xAAE2, 0xAADD, 0xCDBA, 0xAAE4, /* 0xA0 */
+    0xAAE7, 0xAAE1, 	 0, 0xAADA, 0xCDBE, 0xCDB8, 0xCDC5, 0xAAE9, /* 0xB0 */
+    0xAAE5, 0xAAE0, 0xCDBD, 0xAFEC, 0xCDBB, 0xAADE, 0xAAE8, 	 0, /* 0xB0 */
+    0xCDB3, 	 0, 0xCDC2, 0xCDC4, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
          0, 0xAD62, 0xAD5C, 0xAD64, 0xAD61, 0xD071, 0xD074, 0xAD5D, /* 0xD0 */
-         0, 0xD06B,      0, 0xAD56, 0xAD60,      0, 0xAD63, 0xAD65, /* 0xD0 */
-    0xD0A2, 0xD077,      0, 0xAD55, 0xD0A1, 0xAD59, 0xAD57, 0xAD52, /* 0xE0 */
-    0xD06F,      0, 0xD07E, 0xD073, 0xD076, 0xD0A5,      0, 0xAD66, /* 0xE0 */
-    0xD07D, 0xAD5E, 0xD078, 0xD0A4, 0xD075, 0xD079, 0xD07C,      0, /* 0xF0 */
-         0, 0xD06D, 0xD0A3, 0xD07B,      0,      0, 0xD06C          /* 0xF0 */
+         0, 0xD06B, 	 0, 0xAD56, 0xAD60, 	 0, 0xAD63, 0xAD65, /* 0xD0 */
+    0xD0A2, 0xD077, 	 0, 0xAD55, 0xD0A1, 0xAD59, 0xAD57, 0xAD52, /* 0xE0 */
+    0xD06F, 	 0, 0xD07E, 0xD073, 0xD076, 0xD0A5, 	 0, 0xAD66, /* 0xE0 */
+    0xD07D, 0xAD5E, 0xD078, 0xD0A4, 0xD075, 0xD079, 0xD07C, 	 0, /* 0xF0 */
+         0, 0xD06D, 0xD0A3, 0xD07B, 	 0, 	 0, 0xD06C			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_83[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xD070, 0xAD5F, 0xAD5A, 0xAD53, 0xAD58, 0xAD54, 0xAD67, 0xD06E, /* 0x00 */
-    0xD3A5, 0xAD5B,      0,      0, 0xD07A, 0xCE41,      0,      0, /* 0x00 */
-         0,      0,      0,      0,      0,      0, 0xD3A8, 0xAFFA, /* 0x10 */
-         0, 0xD376,      0, 0xD3A3, 0xD37D,      0, 0xD3B2,      0, /* 0x10 */
-    0xD3AA,      0, 0xD37E,      0, 0xD3A9, 0xD378, 0xD37C, 0xD3B5, /* 0x20 */
-    0xAFFD, 0xD3AD, 0xD3A4, 0xAFED, 0xD3B3, 0xD374,      0, 0xD3AC, /* 0x20 */
+    0xD3A5, 0xAD5B, 	 0, 	 0, 0xD07A, 0xCE41, 	 0, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xD3A8, 0xAFFA, /* 0x10 */
+         0, 0xD376, 	 0, 0xD3A3, 0xD37D, 	 0, 0xD3B2, 	 0, /* 0x10 */
+    0xD3AA, 	 0, 0xD37E, 	 0, 0xD3A9, 0xD378, 0xD37C, 0xD3B5, /* 0x20 */
+    0xAFFD, 0xD3AD, 0xD3A4, 0xAFED, 0xD3B3, 0xD374, 	 0, 0xD3AC, /* 0x20 */
          0, 0xAFFC, 0xAFF7, 0xD373, 0xAFF5, 0xAFF4, 0xAFF9, 0xD3AB, /* 0x30 */
-    0xAFF1, 0xAFF8, 0xD072, 0xDB5C, 0xD3A6,      0,      0, 0xD37A, /* 0x30 */
-    0xAFFB, 0xD37B, 0xD3A1, 0xAFFE, 0xD375, 0xD3AF,      0, 0xD3AE, /* 0x40 */
+    0xAFF1, 0xAFF8, 0xD072, 0xDB5C, 0xD3A6, 	 0, 	 0, 0xD37A, /* 0x30 */
+    0xAFFB, 0xD37B, 0xD3A1, 0xAFFE, 0xD375, 0xD3AF, 	 0, 0xD3AE, /* 0x40 */
     0xD3B6, 0xAFF3, 0xAFF0, 0xD3B4, 0xD3B0, 0xD3A7, 0xD3A2, 0xAFF6, /* 0x40 */
-    0xAFF2, 0xD377, 0xAFEE, 0xD3B1, 0xAFEF,      0, 0xD379,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0, 0xD75E, 0xD760, 0xD765, 0xD779, 0xB2FC, /* 0x70 */
-    0xB2F2,      0, 0xD75D, 0xB2FD, 0xB2FE, 0xD768, 0xD76F, 0xD775, /* 0x70 */
-         0, 0xD762,      0, 0xD769,      0,      0, 0xB340, 0xD777, /* 0x80 */
+    0xAFF2, 0xD377, 0xAFEE, 0xD3B1, 0xAFEF, 	 0, 0xD379, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 0xD75E, 0xD760, 0xD765, 0xD779, 0xB2FC, /* 0x70 */
+    0xB2F2, 	 0, 0xD75D, 0xB2FD, 0xB2FE, 0xD768, 0xD76F, 0xD775, /* 0x70 */
+         0, 0xD762, 	 0, 0xD769, 	 0, 	 0, 0xB340, 0xD777, /* 0x80 */
     0xD772, 0xB2FA, 0xB2F8, 0xD76E, 0xD76A, 0xD75C, 0xB2EF, 0xD761, /* 0x80 */
-    0xD759,      0, 0xB2F7, 0xB2F9, 0xD766, 0xD763, 0xB2F4, 0xD773, /* 0x90 */
-    0xB2F1, 0xD764, 0xD77A, 0xD76C,      0, 0xD76B, 0xB2F0,      0, /* 0x90 */
-    0xB2FB,      0, 0xB2F3, 0xD75A, 0xD75F, 0xD770, 0xD776, 0xB341, /* 0xA0 */
-    0xD75B, 0xD767, 0xD76D, 0xB2F6,      0,      0, 0xD778, 0xD771, /* 0xA0 */
-    0xD774,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0, 0xB2F5,      0, 0xDB6C, /* 0xB0 */
+    0xD759, 	 0, 0xB2F7, 0xB2F9, 0xD766, 0xD763, 0xB2F4, 0xD773, /* 0x90 */
+    0xB2F1, 0xD764, 0xD77A, 0xD76C, 	 0, 0xD76B, 0xB2F0, 	 0, /* 0x90 */
+    0xB2FB, 	 0, 0xB2F3, 0xD75A, 0xD75F, 0xD770, 0xD776, 0xB341, /* 0xA0 */
+    0xD75B, 0xD767, 0xD76D, 0xB2F6, 	 0, 	 0, 0xD778, 0xD771, /* 0xA0 */
+    0xD774, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB2F5, 	 0, 0xDB6C, /* 0xB0 */
     0xDB60, 0xB5D7, 0xDB7D, 0xDBA7, 0xDBAA, 0xB5D5, 0xDB68, 0xDBA3, /* 0xC0 */
-    0xDB69, 0xDB77, 0xB5E2, 0xDB73, 0xB5DF,      0, 0xDB74, 0xDB5D, /* 0xC0 */
-         0, 0xDBA4,      0,      0, 0xB5E8, 0xDBA1, 0xDB75, 0xDBAC, /* 0xD0 */
-    0xDB70, 0xDFC8,      0, 0xDBAF, 0xB5E6, 0xDB6E, 0xDB7A, 0xB5E9, /* 0xD0 */
-    0xB5D4, 0xDB72, 0xDBAD, 0xDB6B, 0xDB64, 0xDB6F,      0, 0xDB63, /* 0xE0 */
-    0xDB61, 0xB5D0, 0xDBA5, 0xDB6A, 0xDBA8,      0, 0xDBA9, 0xB5D8, /* 0xE0 */
-    0xB5DD, 0xB5D9, 0xB5E1, 0xDB7E, 0xB5DA, 0xDB76, 0xDB66,      0, /* 0xF0 */
-    0xB5D2, 0xDB5E, 0xDBA2, 0xDBAB, 0xDB65, 0xB5E0, 0xDBB0, 0xDB71  /* 0xF0 */
+    0xDB69, 0xDB77, 0xB5E2, 0xDB73, 0xB5DF, 	 0, 0xDB74, 0xDB5D, /* 0xC0 */
+         0, 0xDBA4, 	 0, 	 0, 0xB5E8, 0xDBA1, 0xDB75, 0xDBAC, /* 0xD0 */
+    0xDB70, 0xDFC8, 	 0, 0xDBAF, 0xB5E6, 0xDB6E, 0xDB7A, 0xB5E9, /* 0xD0 */
+    0xB5D4, 0xDB72, 0xDBAD, 0xDB6B, 0xDB64, 0xDB6F, 	 0, 0xDB63, /* 0xE0 */
+    0xDB61, 0xB5D0, 0xDBA5, 0xDB6A, 0xDBA8, 	 0, 0xDBA9, 0xB5D8, /* 0xE0 */
+    0xB5DD, 0xB5D9, 0xB5E1, 0xDB7E, 0xB5DA, 0xDB76, 0xDB66, 	 0, /* 0xF0 */
+    0xB5D2, 0xDB5E, 0xDBA2, 0xDBAB, 0xDB65, 0xB5E0, 0xDBB0, 0xDB71	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_84[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xDB6D,      0, 0xB5D1, 0xB5E5,      0, 0xDB7C, 0xB5E7, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xDB6D, 	 0, 0xB5D1, 0xB5E5, 	 0, 0xDB7C, 0xB5E7, /* 0x00 */
          0, 0xDB78, 0xB5DC, 0xB5D6, 0xB5DE, 0xB5D3, 0xB5E4, 0xDB79, /* 0x00 */
-    0xDB67, 0xDB7B, 0xDB62, 0xDBA6,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xDBAE,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0, 0xDB5F,      0,      0,      0,      0, /* 0x20 */
-         0, 0xDFC7,      0, 0xDFDD, 0xB855, 0xDFCC,      0, 0xDFCA, /* 0x20 */
+    0xDB67, 0xDB7B, 0xDB62, 0xDBA6, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xDBAE, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xDB5F, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 0xDFC7, 	 0, 0xDFDD, 0xB855, 0xDFCC, 	 0, 0xDFCA, /* 0x20 */
     0xDFB5, 0xB8A9, 0xDFC5, 0xDFD9, 0xDFC1, 0xB8B1, 0xDFD8, 0xDFBF, /* 0x30 */
-    0xB5E3, 0xDFCF, 0xDFC0, 0xDFD6, 0xB8B0, 0xB8A8,      0, 0xDFAA, /* 0x30 */
-    0xDFB2,      0, 0xDFCB, 0xDFC3, 0xDFDC, 0xDFC6, 0xB8B6, 0xDFD7, /* 0x40 */
-         0, 0xB8AD,      0, 0xDFC9, 0xDFD1, 0xDFB6, 0xDFD0,      0, /* 0x40 */
-    0xDFE1, 0xDFB1, 0xDFD2,      0, 0xDFDF,      0, 0xDFAB, 0xB5DB, /* 0x50 */
-         0, 0xDFB9, 0xDFB8, 0xB8AF,      0, 0xDFBC, 0xDFBE, 0xDFCD, /* 0x50 */
-    0xDFDE, 0xB8B2,      0, 0xB8B3,      0, 0xDFB0, 0xB8AB, 0xDFB4, /* 0x60 */
-    0xDFDA, 0xB8B4,      0, 0xB8AC, 0xB8AE, 0xB8B5, 0xDFE0, 0xDFD3, /* 0x60 */
-    0xDFCE,      0,      0, 0xDFBB, 0xDFBA, 0xB8AA, 0xDFAC, 0xB8A7, /* 0x70 */
-    0xDFC4, 0xDFAD, 0xDFC2,      0,      0, 0xDFB7, 0xDFDB,      0, /* 0x70 */
-         0,      0, 0xB8A6,      0,      0,      0, 0xDFB3,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xDFAF, 0xDFD5, 0xDFAE, /* 0x80 */
-    0xBB60, 0xE3D3,      0,      0, 0xE3C2,      0,      0, 0xE3AC, /* 0x90 */
+    0xB5E3, 0xDFCF, 0xDFC0, 0xDFD6, 0xB8B0, 0xB8A8, 	 0, 0xDFAA, /* 0x30 */
+    0xDFB2, 	 0, 0xDFCB, 0xDFC3, 0xDFDC, 0xDFC6, 0xB8B6, 0xDFD7, /* 0x40 */
+         0, 0xB8AD, 	 0, 0xDFC9, 0xDFD1, 0xDFB6, 0xDFD0, 	 0, /* 0x40 */
+    0xDFE1, 0xDFB1, 0xDFD2, 	 0, 0xDFDF, 	 0, 0xDFAB, 0xB5DB, /* 0x50 */
+         0, 0xDFB9, 0xDFB8, 0xB8AF, 	 0, 0xDFBC, 0xDFBE, 0xDFCD, /* 0x50 */
+    0xDFDE, 0xB8B2, 	 0, 0xB8B3, 	 0, 0xDFB0, 0xB8AB, 0xDFB4, /* 0x60 */
+    0xDFDA, 0xB8B4, 	 0, 0xB8AC, 0xB8AE, 0xB8B5, 0xDFE0, 0xDFD3, /* 0x60 */
+    0xDFCE, 	 0, 	 0, 0xDFBB, 0xDFBA, 0xB8AA, 0xDFAC, 0xB8A7, /* 0x70 */
+    0xDFC4, 0xDFAD, 0xDFC2, 	 0, 	 0, 0xDFB7, 0xDFDB, 	 0, /* 0x70 */
+         0, 	 0, 0xB8A6, 	 0, 	 0, 	 0, 0xDFB3, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDFAF, 0xDFD5, 0xDFAE, /* 0x80 */
+    0xBB60, 0xE3D3, 	 0, 	 0, 0xE3C2, 	 0, 	 0, 0xE3AC, /* 0x90 */
     0xE3CA, 0xBB58, 0xE3BB, 0xE3C5, 0xBB5B, 0xE3BE, 0xBB59, 0xE3AF, /* 0x90 */
-    0xE3CD, 0xE3AE, 0xE3C1,      0, 0xE3AD,      0,      0, 0xE3BF, /* 0xA0 */
-    0xE3C8, 0xE3C6, 0xE3BA, 0xE3B5, 0xE3B3,      0, 0xE3B4, 0xE3C7, /* 0xA0 */
-    0xE3D2, 0xE3BC, 0xBB5A,      0, 0xE3B7,      0, 0xE3CB,      0, /* 0xB0 */
-    0xBB5D, 0xE3B6, 0xE3B0, 0xE3C0, 0xBB61,      0,      0, 0xBB55, /* 0xB0 */
-    0xBB5E, 0xE3B8, 0xE3B2,      0, 0xBB57, 0xDFD4, 0xBB56, 0xE3C3, /* 0xC0 */
+    0xE3CD, 0xE3AE, 0xE3C1, 	 0, 0xE3AD, 	 0, 	 0, 0xE3BF, /* 0xA0 */
+    0xE3C8, 0xE3C6, 0xE3BA, 0xE3B5, 0xE3B3, 	 0, 0xE3B4, 0xE3C7, /* 0xA0 */
+    0xE3D2, 0xE3BC, 0xBB5A, 	 0, 0xE3B7, 	 0, 0xE3CB, 	 0, /* 0xB0 */
+    0xBB5D, 0xE3B6, 0xE3B0, 0xE3C0, 0xBB61, 	 0, 	 0, 0xBB55, /* 0xB0 */
+    0xBB5E, 0xE3B8, 0xE3B2, 	 0, 0xBB57, 0xDFD4, 0xBB56, 0xE3C3, /* 0xC0 */
          0, 0xBB54, 0xBB63, 0xBB5C, 0xE3C4, 0xE3B9, 0xE3B1, 0xE3CC, /* 0xC0 */
-    0xE3BD, 0xBB62, 0xE3D0, 0xBB5F, 0xE3CF,      0, 0xE3C9, 0xE3CE, /* 0xD0 */
-         0,      0,      0, 0xE3D1,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0, 0xE773, /* 0xE0 */
-    0xE774, 0xE767, 0xE766, 0xE762, 0xBDB4,      0, 0xBDAC, 0xE776, /* 0xE0 */
-    0xE775, 0xDFA9, 0xE75F, 0xE763, 0xE75D,      0, 0xE770, 0xE761, /* 0xF0 */
-         0, 0xE777, 0xE75A, 0xE758, 0xE764, 0xE76E, 0xE769, 0xBDB6  /* 0xF0 */
+    0xE3BD, 0xBB62, 0xE3D0, 0xBB5F, 0xE3CF, 	 0, 0xE3C9, 0xE3CE, /* 0xD0 */
+         0, 	 0, 	 0, 0xE3D1, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE773, /* 0xE0 */
+    0xE774, 0xE767, 0xE766, 0xE762, 0xBDB4, 	 0, 0xBDAC, 0xE776, /* 0xE0 */
+    0xE775, 0xDFA9, 0xE75F, 0xE763, 0xE75D, 	 0, 0xE770, 0xE761, /* 0xF0 */
+         0, 0xE777, 0xE75A, 0xE758, 0xE764, 0xE76E, 0xE769, 0xBDB6	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_85[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE74F,      0, 0xE76D,      0,      0,      0, 0xBDB7, 0xDFBD, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE74F, 	 0, 0xE76D, 	 0, 	 0, 	 0, 0xBDB7, 0xDFBD, /* 0x00 */
     0xE75B, 0xE752, 0xE755, 0xE77B, 0xE75C, 0xE753, 0xE751, 0xE74E, /* 0x00 */
          0, 0xBDB0, 0xE765, 0xBDAF, 0xBDB3, 0xE760, 0xE768, 0xBDA9, /* 0x10 */
-    0xE778, 0xE77C, 0xBDAB,      0, 0xE757, 0xE76B, 0xE76F, 0xE754, /* 0x10 */
-    0xE779, 0xBDB2,      0, 0xBDB1, 0xE74C, 0xBDB5, 0xE772, 0xE756, /* 0x20 */
+    0xE778, 0xE77C, 0xBDAB, 	 0, 0xE757, 0xE76B, 0xE76F, 0xE754, /* 0x10 */
+    0xE779, 0xBDB2, 	 0, 0xBDB1, 0xE74C, 0xBDB5, 0xE772, 0xE756, /* 0x20 */
     0xE76A, 0xE750, 0xE75E, 0xE759, 0xBDAD, 0xBDAE, 0xE76C, 0xE77D, /* 0x20 */
-    0xE77A, 0xE771,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0, 0xE74D,      0, 0xBDAA, 0xEB49,      0, /* 0x30 */
-    0xEB40, 0xEB43,      0, 0xBFBB, 0xEB45, 0xEAF9, 0xEB41, 0xEB47, /* 0x40 */
-    0xBFB8, 0xBFBC, 0xBFB6,      0,      0, 0xEAFB, 0xEB4C,      0, /* 0x40 */
-         0, 0xEB46,      0, 0xEAFC, 0xEB55, 0xEB4F, 0xEAF8, 0xEE46, /* 0x50 */
-    0xEAFE, 0xBFB7,      0, 0xEB4A,      0, 0xEB54, 0xBFBF,      0, /* 0x50 */
+    0xE77A, 0xE771, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 0xE74D, 	 0, 0xBDAA, 0xEB49, 	 0, /* 0x30 */
+    0xEB40, 0xEB43, 	 0, 0xBFBB, 0xEB45, 0xEAF9, 0xEB41, 0xEB47, /* 0x40 */
+    0xBFB8, 0xBFBC, 0xBFB6, 	 0, 	 0, 0xEAFB, 0xEB4C, 	 0, /* 0x40 */
+         0, 0xEB46, 	 0, 0xEAFC, 0xEB55, 0xEB4F, 0xEAF8, 0xEE46, /* 0x50 */
+    0xEAFE, 0xBFB7, 	 0, 0xEB4A, 	 0, 0xEB54, 0xBFBF, 	 0, /* 0x50 */
     0xEB51, 0xEAFD, 0xEB44, 0xEB48, 0xEB42, 0xEB56, 0xEB53, 0xEB50, /* 0x60 */
-    0xBFB9, 0xBFBA, 0xBFBE, 0xEAFA, 0xEB57, 0xBFBD, 0xEB4D,      0, /* 0x60 */
-         0, 0xEB4B,      0,      0,      0, 0xEB4E, 0xEE53, 0xEE40, /* 0x70 */
-    0xEE45, 0xEE52, 0xEE44, 0xEDFB, 0xEE41,      0, 0xC1A2,      0, /* 0x70 */
+    0xBFB9, 0xBFBA, 0xBFBE, 0xEAFA, 0xEB57, 0xBFBD, 0xEB4D, 	 0, /* 0x60 */
+         0, 0xEB4B, 	 0, 	 0, 	 0, 0xEB4E, 0xEE53, 0xEE40, /* 0x70 */
+    0xEE45, 0xEE52, 0xEE44, 0xEDFB, 0xEE41, 	 0, 0xC1A2, 	 0, /* 0x70 */
     0xEDF4, 0xEE4D, 0xEE4F, 0xEDF3, 0xC1A1, 0xEE51, 0xEE49, 0xC1A8, /* 0x80 */
     0xEE50, 0xEE42, 0xC1AA, 0xEDF9, 0xEB52, 0xEE4A, 0xEE47, 0xEDF5, /* 0x80 */
-    0xEE55, 0xC1A4,      0,      0, 0xC1A5, 0xEDF7, 0xEE48,      0, /* 0x90 */
+    0xEE55, 0xC1A4, 	 0, 	 0, 0xC1A5, 0xEDF7, 0xEE48, 	 0, /* 0x90 */
     0xEE54, 0xEE4B, 0xEDFD, 0xC1A7, 0xC1A3, 0xEE4C, 0xEDFE, 0xEE56, /* 0x90 */
-    0xEDF8, 0xEE43, 0xEE4E, 0xEDFA, 0xEDFC,      0, 0xC2CB, 0xEDF6, /* 0xA0 */
-    0xC1A9, 0xC2C4, 0xC17E,      0,      0,      0,      0, 0xC1A6, /* 0xA0 */
-    0xC2C8, 0xF0B3,      0, 0xF0A9, 0xF0A4, 0xF0AA, 0xF0B4, 0xF0B8, /* 0xB0 */
-    0xF0B7, 0xC2CA, 0xC2C9,      0,      0, 0xF0AB, 0xF0B9, 0xF0AE, /* 0xB0 */
-    0xF0A6,      0, 0xF0A8, 0xF0A7, 0xF0AD, 0xF0B2, 0xF0A5, 0xF0AC, /* 0xC0 */
-    0xF0B1, 0xC2C7,      0, 0xF0AF,      0, 0xC2C5, 0xF0B0, 0xC2C3, /* 0xC0 */
-    0xC2C6, 0xF2D5, 0xF0B5,      0,      0, 0xC3C2,      0, 0xF2CD, /* 0xD0 */
-    0xF2D1, 0xF2C9, 0xF2CC,      0, 0xF2D4, 0xC3C0, 0xF2D9, 0xF2D2, /* 0xD0 */
-         0, 0xF2CA, 0xF2DA, 0xF2D3, 0xC3C3, 0xC3C4, 0xF2D7,      0, /* 0xE0 */
-    0xF2CB, 0xC3BF, 0xC3C1, 0xF2C6, 0xF2CE, 0xF2C8,      0, 0xF2D8, /* 0xE0 */
-    0xF2D6, 0xF2C7, 0xF2CF,      0,      0,      0, 0xF4BE, 0xC3C5, /* 0xF0 */
-    0xF2D0, 0xC4A7, 0xC4A9, 0xC4A6,      0, 0xF4C3, 0xF4BB, 0xF4B9  /* 0xF0 */
+    0xEDF8, 0xEE43, 0xEE4E, 0xEDFA, 0xEDFC, 	 0, 0xC2CB, 0xEDF6, /* 0xA0 */
+    0xC1A9, 0xC2C4, 0xC17E, 	 0, 	 0, 	 0, 	 0, 0xC1A6, /* 0xA0 */
+    0xC2C8, 0xF0B3, 	 0, 0xF0A9, 0xF0A4, 0xF0AA, 0xF0B4, 0xF0B8, /* 0xB0 */
+    0xF0B7, 0xC2CA, 0xC2C9, 	 0, 	 0, 0xF0AB, 0xF0B9, 0xF0AE, /* 0xB0 */
+    0xF0A6, 	 0, 0xF0A8, 0xF0A7, 0xF0AD, 0xF0B2, 0xF0A5, 0xF0AC, /* 0xC0 */
+    0xF0B1, 0xC2C7, 	 0, 0xF0AF, 	 0, 0xC2C5, 0xF0B0, 0xC2C3, /* 0xC0 */
+    0xC2C6, 0xF2D5, 0xF0B5, 	 0, 	 0, 0xC3C2, 	 0, 0xF2CD, /* 0xD0 */
+    0xF2D1, 0xF2C9, 0xF2CC, 	 0, 0xF2D4, 0xC3C0, 0xF2D9, 0xF2D2, /* 0xD0 */
+         0, 0xF2CA, 0xF2DA, 0xF2D3, 0xC3C3, 0xC3C4, 0xF2D7, 	 0, /* 0xE0 */
+    0xF2CB, 0xC3BF, 0xC3C1, 0xF2C6, 0xF2CE, 0xF2C8, 	 0, 0xF2D8, /* 0xE0 */
+    0xF2D6, 0xF2C7, 0xF2CF, 	 0, 	 0, 	 0, 0xF4BE, 0xC3C5, /* 0xF0 */
+    0xF2D0, 0xC4A7, 0xC4A9, 0xC4A6, 	 0, 0xF4C3, 0xF4BB, 0xF4B9	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_86[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF4BD, 0xF4BA,      0,      0, 0xF4BF, 0xF4C1, 0xC4AA, 0xC4AC, /* 0x00 */
-         0, 0xF4C0, 0xC4AD, 0xC4AB, 0xF4C2,      0,      0,      0, /* 0x00 */
-         0, 0xC4A8,      0,      0,      0,      0,      0, 0xC4F4, /* 0x10 */
-    0xF5F1, 0xF5F7, 0xC4F6, 0xF4BC, 0xF5F6,      0, 0xF5FD, 0xF5F4, /* 0x10 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF4BD, 0xF4BA, 	 0, 	 0, 0xF4BF, 0xF4C1, 0xC4AA, 0xC4AC, /* 0x00 */
+         0, 0xF4C0, 0xC4AD, 0xC4AB, 0xF4C2, 	 0, 	 0, 	 0, /* 0x00 */
+         0, 0xC4A8, 	 0, 	 0, 	 0, 	 0, 	 0, 0xC4F4, /* 0x10 */
+    0xF5F1, 0xF5F7, 0xC4F6, 0xF4BC, 0xF5F6, 	 0, 0xF5FD, 0xF5F4, /* 0x10 */
     0xF5FB, 0xF5FA, 0xF4B8, 0xF5F5, 0xF0B6, 0xF5FE, 0xF5F3, 0xF5F8, /* 0x20 */
-         0, 0xF5FC, 0xF5F2,      0, 0xF74A, 0xC4F5, 0xF5F9,      0, /* 0x20 */
-         0, 0xF7F4, 0xF74B, 0xF749, 0xF747, 0xF748, 0xF74C,      0, /* 0x30 */
-    0xC5D9, 0xF7F2, 0xF7F0, 0xF7F5, 0xF7F3,      0, 0xF7F6, 0xC5DA, /* 0x30 */
-    0xF7F1,      0,      0, 0xF8BC,      0,      0, 0xF945, 0xF946, /* 0x40 */
-    0xF947,      0,      0, 0xF9C7, 0xF9BD, 0xCA4F, 0xAAEA,      0, /* 0x40 */
-    0xAD68,      0, 0xD3B8, 0xD3B7, 0xB040, 0xB342, 0xD77C,      0, /* 0x50 */
-         0, 0xD77B,      0, 0xB5EA, 0xB8B8,      0, 0xB8B7, 0xB8B9, /* 0x50 */
-         0, 0xE3D4, 0xE77E, 0xEB58, 0xEB5A, 0xEB59,      0, 0xC1AB, /* 0x60 */
-    0xEE57, 0xF0BA, 0xF9A5, 0xA6E4,      0, 0xCDC9, 0xCDCA, 0xCDC8, /* 0x60 */
-    0xCDC7, 0xAAEB,      0, 0xD0A9, 0xD0A7,      0,      0, 0xD0A6, /* 0x70 */
-         0, 0xAD69, 0xAD6B, 0xAD6A, 0xD0A8,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0, 0xD3C4, 0xD3C1, 0xD3BF, /* 0x80 */
-         0,      0, 0xB041, 0xD3C2, 0xB046, 0xD3BC, 0xD3CB,      0, /* 0x80 */
-    0xD3CD, 0xD3BD,      0, 0xB043, 0xD3CE, 0xD3C9, 0xD3BB, 0xD3C0, /* 0x90 */
-    0xD3CA, 0xD3C6, 0xD3C3,      0, 0xB048, 0xD3CC, 0xD3BE,      0, /* 0x90 */
-         0, 0xD3C7, 0xD3B9, 0xB047, 0xB044, 0xD3C5,      0, 0xD3C8, /* 0xA0 */
-    0xD3BA, 0xB045, 0xB042,      0,      0,      0,      0, 0xB34C, /* 0xA0 */
-    0xD7A5, 0xB34B,      0, 0xD7A8, 0xD7AB, 0xB348, 0xB346, 0xD77E, /* 0xB0 */
+         0, 0xF5FC, 0xF5F2, 	 0, 0xF74A, 0xC4F5, 0xF5F9, 	 0, /* 0x20 */
+         0, 0xF7F4, 0xF74B, 0xF749, 0xF747, 0xF748, 0xF74C, 	 0, /* 0x30 */
+    0xC5D9, 0xF7F2, 0xF7F0, 0xF7F5, 0xF7F3, 	 0, 0xF7F6, 0xC5DA, /* 0x30 */
+    0xF7F1, 	 0, 	 0, 0xF8BC, 	 0, 	 0, 0xF945, 0xF946, /* 0x40 */
+    0xF947, 	 0, 	 0, 0xF9C7, 0xF9BD, 0xCA4F, 0xAAEA, 	 0, /* 0x40 */
+    0xAD68, 	 0, 0xD3B8, 0xD3B7, 0xB040, 0xB342, 0xD77C, 	 0, /* 0x50 */
+         0, 0xD77B, 	 0, 0xB5EA, 0xB8B8, 	 0, 0xB8B7, 0xB8B9, /* 0x50 */
+         0, 0xE3D4, 0xE77E, 0xEB58, 0xEB5A, 0xEB59, 	 0, 0xC1AB, /* 0x60 */
+    0xEE57, 0xF0BA, 0xF9A5, 0xA6E4, 	 0, 0xCDC9, 0xCDCA, 0xCDC8, /* 0x60 */
+    0xCDC7, 0xAAEB, 	 0, 0xD0A9, 0xD0A7, 	 0, 	 0, 0xD0A6, /* 0x70 */
+         0, 0xAD69, 0xAD6B, 0xAD6A, 0xD0A8, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xD3C4, 0xD3C1, 0xD3BF, /* 0x80 */
+         0, 	 0, 0xB041, 0xD3C2, 0xB046, 0xD3BC, 0xD3CB, 	 0, /* 0x80 */
+    0xD3CD, 0xD3BD, 	 0, 0xB043, 0xD3CE, 0xD3C9, 0xD3BB, 0xD3C0, /* 0x90 */
+    0xD3CA, 0xD3C6, 0xD3C3, 	 0, 0xB048, 0xD3CC, 0xD3BE, 	 0, /* 0x90 */
+         0, 0xD3C7, 0xD3B9, 0xB047, 0xB044, 0xD3C5, 	 0, 0xD3C8, /* 0xA0 */
+    0xD3BA, 0xB045, 0xB042, 	 0, 	 0, 	 0, 	 0, 0xB34C, /* 0xA0 */
+    0xD7A5, 0xB34B, 	 0, 0xD7A8, 0xD7AB, 0xB348, 0xB346, 0xD77E, /* 0xB0 */
     0xD7A9, 0xD7A7, 0xD7A4, 0xD7AC, 0xD7AD, 0xD7AF, 0xD7B0, 0xD77D, /* 0xB0 */
     0xB345, 0xD7A2, 0xD7A1, 0xD7AE, 0xB347, 0xD7A3, 0xB349, 0xB344, /* 0xC0 */
-    0xD7A6, 0xB34D,      0, 0xB34A, 0xD7AA,      0,      0,      0, /* 0xC0 */
-    0xB5F1, 0xDBBF,      0, 0xDBB4, 0xB5EE,      0, 0xDFE7, 0xDBBD, /* 0xD0 */
+    0xD7A6, 0xB34D, 	 0, 0xB34A, 0xD7AA, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xB5F1, 0xDBBF, 	 0, 0xDBB4, 0xB5EE, 	 0, 0xDFE7, 0xDBBD, /* 0xD0 */
     0xDBB1, 0xB5EC, 0xDBB6, 0xB5EF, 0xDBBA, 0xDBB8, 0xB5F2, 0xB5EB, /* 0xD0 */
-         0,      0, 0xDBB2, 0xDBB5, 0xB5F0,      0, 0xDBB3,      0, /* 0xE0 */
-    0xDBBE, 0xDBBC, 0xDBB7, 0xDBB9, 0xDBBB, 0xB5ED,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xDFE8, 0xDFEE, 0xDFE4, /* 0xF0 */
-    0xDFEA, 0xB8BA, 0xDFE6, 0xB8C0,      0,      0, 0xB8BF          /* 0xF0 */
+         0, 	 0, 0xDBB2, 0xDBB5, 0xB5F0, 	 0, 0xDBB3, 	 0, /* 0xE0 */
+    0xDBBE, 0xDBBC, 0xDBB7, 0xDBB9, 0xDBBB, 0xB5ED, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDFE8, 0xDFEE, 0xDFE4, /* 0xF0 */
+    0xDFEA, 0xB8BA, 0xDFE6, 0xB8C0, 	 0, 	 0, 0xB8BF			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_87[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xB8BE, 0xDFED, 0xB8C1, 0xB8C2, 0xDFE3, 0xDFF0, 0xB8C3, 0xB8BD, /* 0x00 */
-    0xB8BC, 0xDFEC, 0xB8C4, 0xDFE2, 0xDFE5, 0xDFEF, 0xDFEB,      0, /* 0x00 */
-         0, 0xE3F4, 0xE3E9, 0xB8BB,      0,      0,      0,      0, /* 0x10 */
-    0xBB6A, 0xE3DD, 0xE3F2, 0xE3DE, 0xBB65,      0, 0xE3DB,      0, /* 0x10 */
+    0xB8BC, 0xDFEC, 0xB8C4, 0xDFE2, 0xDFE5, 0xDFEF, 0xDFEB, 	 0, /* 0x00 */
+         0, 0xE3F4, 0xE3E9, 0xB8BB, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xBB6A, 0xE3DD, 0xE3F2, 0xE3DE, 0xBB65, 	 0, 0xE3DB, 	 0, /* 0x10 */
     0xE3E4, 0xE3DC, 0xBB67, 0xE3D6, 0xE3F1, 0xBB68, 0xE3EE, 0xE3EF, /* 0x20 */
-    0xE3D7, 0xBB6D, 0xE3E6,      0, 0xE3E0, 0xE3E7, 0xE3DA,      0, /* 0x20 */
-    0xE3F3, 0xE3EB, 0xE3E5, 0xE3D5, 0xBB69, 0xE3EC,      0, 0xBB6C, /* 0x30 */
-    0xE3F0,      0, 0xE3EA, 0xBB66, 0xE3E8,      0, 0xE3E2, 0xBB64, /* 0x30 */
-    0xE3D9, 0xE3E1, 0xE3ED, 0xE3DF,      0,      0, 0xE3E3,      0, /* 0x40 */
-         0,      0,      0,      0, 0xBDC1, 0xDFE9, 0xE7B2, 0xE7BB, /* 0x40 */
+    0xE3D7, 0xBB6D, 0xE3E6, 	 0, 0xE3E0, 0xE3E7, 0xE3DA, 	 0, /* 0x20 */
+    0xE3F3, 0xE3EB, 0xE3E5, 0xE3D5, 0xBB69, 0xE3EC, 	 0, 0xBB6C, /* 0x30 */
+    0xE3F0, 	 0, 0xE3EA, 0xBB66, 0xE3E8, 	 0, 0xE3E2, 0xBB64, /* 0x30 */
+    0xE3D9, 0xE3E1, 0xE3ED, 0xE3DF, 	 0, 	 0, 0xE3E3, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 0xBDC1, 0xDFE9, 0xE7B2, 0xE7BB, /* 0x40 */
     0xE7B1, 0xE7AD, 0xE7AA, 0xBDC2, 0xE7A8, 0xBB6B, 0xE7A1, 0xBDC0, /* 0x50 */
     0xE7A7, 0xBDBF, 0xE7AC, 0xE7A9, 0xE7B9, 0xE7B4, 0xE7AE, 0xE7B3, /* 0x50 */
     0xBDBB, 0xE7AB, 0xE7BE, 0xE7A2, 0xE7A3, 0xE7BA, 0xBDBC, 0xE7BF, /* 0x60 */
     0xBDBE, 0xE7C0, 0xE7B0, 0xE3D8, 0xE7B6, 0xE7AF, 0xE7B8, 0xE7B5, /* 0x60 */
-         0,      0,      0, 0xE7A6, 0xBDB9, 0xE7BD, 0xBDBA, 0xE7A4, /* 0x70 */
-    0xBDBD, 0xEB64, 0xE7B7, 0xE7BC,      0,      0,      0,      0, /* 0x70 */
-         0, 0xEB61, 0xBDB8, 0xBFC0, 0xEB6B, 0xEB67,      0, 0xEB65, /* 0x80 */
-    0xEB60, 0xEB6F,      0,      0,      0, 0xBFC4,      0, 0xEB5C, /* 0x80 */
-    0xEB68, 0xEB69, 0xEB5F, 0xEB5E, 0xEB6C,      0, 0xEB62, 0xEB5D, /* 0x90 */
-    0xEB63,      0, 0xEB6E, 0xEB5B, 0xEB6D, 0xEB6A, 0xBFC2, 0xBFC1, /* 0x90 */
-         0,      0, 0xBFC3, 0xEB66, 0xF0CB,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xEE59, 0xC1B1, 0xEE5D, 0xEE5A, 0xEE61, 0xEE67, /* 0xA0 */
-    0xEE5C,      0, 0xEE70, 0xC1AE, 0xEE6A, 0xEE5F, 0xEE6B, 0xEE66, /* 0xB0 */
+         0, 	 0, 	 0, 0xE7A6, 0xBDB9, 0xE7BD, 0xBDBA, 0xE7A4, /* 0x70 */
+    0xBDBD, 0xEB64, 0xE7B7, 0xE7BC, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xEB61, 0xBDB8, 0xBFC0, 0xEB6B, 0xEB67, 	 0, 0xEB65, /* 0x80 */
+    0xEB60, 0xEB6F, 	 0, 	 0, 	 0, 0xBFC4, 	 0, 0xEB5C, /* 0x80 */
+    0xEB68, 0xEB69, 0xEB5F, 0xEB5E, 0xEB6C, 	 0, 0xEB62, 0xEB5D, /* 0x90 */
+    0xEB63, 	 0, 0xEB6E, 0xEB5B, 0xEB6D, 0xEB6A, 0xBFC2, 0xBFC1, /* 0x90 */
+         0, 	 0, 0xBFC3, 0xEB66, 0xF0CB, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xEE59, 0xC1B1, 0xEE5D, 0xEE5A, 0xEE61, 0xEE67, /* 0xA0 */
+    0xEE5C, 	 0, 0xEE70, 0xC1AE, 0xEE6A, 0xEE5F, 0xEE6B, 0xEE66, /* 0xB0 */
     0xEE6D, 0xEE5E, 0xC1B3, 0xC1B2, 0xEE60, 0xEE6E, 0xEE58, 0xEE6C, /* 0xB0 */
-    0xC1AC,      0, 0xEE64, 0xEE63, 0xEE68, 0xEE5B, 0xC1B0,      0, /* 0xC0 */
-    0xC1B4, 0xEE62, 0xEE69, 0xC1B5, 0xEE65,      0,      0,      0, /* 0xC0 */
-         0, 0xC1AD, 0xC1AF, 0xF0C7, 0xF0C5,      0,      0, 0xF0CC, /* 0xD0 */
-    0xF0C9, 0xF0CD,      0, 0xF0BE, 0xF0C6, 0xF0D1, 0xEE6F, 0xF0C2, /* 0xD0 */
+    0xC1AC, 	 0, 0xEE64, 0xEE63, 0xEE68, 0xEE5B, 0xC1B0, 	 0, /* 0xC0 */
+    0xC1B4, 0xEE62, 0xEE69, 0xC1B5, 0xEE65, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xC1AD, 0xC1AF, 0xF0C7, 0xF0C5, 	 0, 	 0, 0xF0CC, /* 0xD0 */
+    0xF0C9, 0xF0CD, 	 0, 0xF0BE, 0xF0C6, 0xF0D1, 0xEE6F, 0xF0C2, /* 0xD0 */
     0xC2CF, 0xE7A5, 0xF0BD, 0xF0CA, 0xF0C4, 0xF0C1, 0xF0BC, 0xF0BB, /* 0xE0 */
-    0xF0D0,      0, 0xF0C0, 0xF0BF, 0xC2CD, 0xF0C8,      0, 0xC2CC, /* 0xE0 */
-         0,      0, 0xC2CE, 0xF0C3, 0xF0CF,      0, 0xF2DE, 0xF2DF, /* 0xF0 */
-         0, 0xC3C9, 0xF2DC, 0xC3C6, 0xF2E4,      0, 0xC3CA, 0xF2E6  /* 0xF0 */
+    0xF0D0, 	 0, 0xF0C0, 0xF0BF, 0xC2CD, 0xF0C8, 	 0, 0xC2CC, /* 0xE0 */
+         0, 	 0, 0xC2CE, 0xF0C3, 0xF0CF, 	 0, 0xF2DE, 0xF2DF, /* 0xF0 */
+         0, 0xC3C9, 0xF2DC, 0xC3C6, 0xF2E4, 	 0, 0xC3CA, 0xF2E6	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_88[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF2DB, 0xF0CE, 0xF2E8, 0xF2DD,      0, 0xC3C7, 0xF2E3,      0, /* 0x00 */
-    0xF2E5, 0xF2E0, 0xF2E7, 0xF2E2, 0xF2E1, 0xC3C8,      0,      0, /* 0x00 */
-    0xF4C5, 0xF4C6,      0, 0xF4C8, 0xC4AE, 0xC4AF, 0xF4C9, 0xF4C7, /* 0x10 */
-         0, 0xF4C4,      0, 0xF642, 0xF645, 0xF641,      0, 0xC4FA, /* 0x10 */
-    0xF643, 0xC4F9, 0xC4F8, 0xC4F7, 0xF644, 0xF751, 0xF74F,      0, /* 0x20 */
-    0xF74E, 0xF640, 0xF750, 0xF646, 0xF74D,      0, 0xF7F9, 0xF7D7, /* 0x20 */
-    0xF7F7, 0xC5DB, 0xF7F8, 0xF7FA,      0, 0xF8BF, 0xC5FA, 0xF8BE, /* 0x30 */
-    0xF8BD, 0xC5FB,      0, 0xC65A, 0xF96E, 0xF9A7, 0xF9A6, 0xF9A8, /* 0x30 */
-    0xA6E5, 0xD0AA,      0, 0xD3CF, 0xD3D0,      0,      0,      0, /* 0x40 */
-    0xDBC0,      0, 0xF647, 0xF8C0, 0xA6E6, 0xAD6C, 0xD0AB,      0, /* 0x40 */
-         0,      0, 0xD7B1, 0xB34E,      0, 0xDBC2, 0xDBC1, 0xB5F3, /* 0x50 */
-         0, 0xB8C5, 0xE7C1, 0xBDC3,      0, 0xBDC4,      0,      0, /* 0x50 */
-         0, 0xBFC5, 0xC5FC, 0xA6E7,      0,      0,      0, 0xD0AC, /* 0x60 */
-    0xAAED, 0xD0AE, 0xD0AD, 0xAD6D,      0, 0xD3D1,      0, 0xD3D8, /* 0x60 */
-    0xB049, 0xD3D6, 0xD3D4,      0, 0xD3DB, 0xD3D2, 0xD3D3, 0xB04A, /* 0x70 */
-         0, 0xB04E,      0,      0, 0xD3DC, 0xB04D, 0xD3DA, 0xD3D7, /* 0x70 */
-    0xD3D5, 0xB04B, 0xB04C, 0xD3D9,      0,      0,      0,      0, /* 0x80 */
-    0xB350, 0xD7B2,      0, 0xB355, 0xD7C2, 0xB354, 0xD7C4,      0, /* 0x80 */
-         0, 0xD7B8, 0xB352, 0xD7C3,      0, 0xD7B3, 0xB353, 0xD7BF, /* 0x90 */
-    0xD7BB, 0xD7BD, 0xD7B7, 0xD7BE,      0,      0, 0xB34F, 0xD7BA, /* 0x90 */
-         0, 0xD7B9, 0xD7B5,      0, 0xD7C0,      0,      0, 0xD7BC, /* 0xA0 */
-    0xD7B4,      0, 0xD7B6, 0xB351, 0xD7C1,      0,      0,      0, /* 0xA0 */
-         0, 0xB5F6, 0xDBCD,      0,      0,      0, 0xDBC9, 0xDBCB, /* 0xB0 */
-    0xDBC6, 0xDBC5, 0xDBC3,      0, 0xDBCA, 0xDBCC, 0xDBC8,      0, /* 0xB0 */
-    0xDBC7, 0xB5F4, 0xB5F5,      0,      0,      0,      0,      0, /* 0xC0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF2DB, 0xF0CE, 0xF2E8, 0xF2DD, 	 0, 0xC3C7, 0xF2E3, 	 0, /* 0x00 */
+    0xF2E5, 0xF2E0, 0xF2E7, 0xF2E2, 0xF2E1, 0xC3C8, 	 0, 	 0, /* 0x00 */
+    0xF4C5, 0xF4C6, 	 0, 0xF4C8, 0xC4AE, 0xC4AF, 0xF4C9, 0xF4C7, /* 0x10 */
+         0, 0xF4C4, 	 0, 0xF642, 0xF645, 0xF641, 	 0, 0xC4FA, /* 0x10 */
+    0xF643, 0xC4F9, 0xC4F8, 0xC4F7, 0xF644, 0xF751, 0xF74F, 	 0, /* 0x20 */
+    0xF74E, 0xF640, 0xF750, 0xF646, 0xF74D, 	 0, 0xF7F9, 0xF7D7, /* 0x20 */
+    0xF7F7, 0xC5DB, 0xF7F8, 0xF7FA, 	 0, 0xF8BF, 0xC5FA, 0xF8BE, /* 0x30 */
+    0xF8BD, 0xC5FB, 	 0, 0xC65A, 0xF96E, 0xF9A7, 0xF9A6, 0xF9A8, /* 0x30 */
+    0xA6E5, 0xD0AA, 	 0, 0xD3CF, 0xD3D0, 	 0, 	 0, 	 0, /* 0x40 */
+    0xDBC0, 	 0, 0xF647, 0xF8C0, 0xA6E6, 0xAD6C, 0xD0AB, 	 0, /* 0x40 */
+         0, 	 0, 0xD7B1, 0xB34E, 	 0, 0xDBC2, 0xDBC1, 0xB5F3, /* 0x50 */
+         0, 0xB8C5, 0xE7C1, 0xBDC3, 	 0, 0xBDC4, 	 0, 	 0, /* 0x50 */
+         0, 0xBFC5, 0xC5FC, 0xA6E7, 	 0, 	 0, 	 0, 0xD0AC, /* 0x60 */
+    0xAAED, 0xD0AE, 0xD0AD, 0xAD6D, 	 0, 0xD3D1, 	 0, 0xD3D8, /* 0x60 */
+    0xB049, 0xD3D6, 0xD3D4, 	 0, 0xD3DB, 0xD3D2, 0xD3D3, 0xB04A, /* 0x70 */
+         0, 0xB04E, 	 0, 	 0, 0xD3DC, 0xB04D, 0xD3DA, 0xD3D7, /* 0x70 */
+    0xD3D5, 0xB04B, 0xB04C, 0xD3D9, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xB350, 0xD7B2, 	 0, 0xB355, 0xD7C2, 0xB354, 0xD7C4, 	 0, /* 0x80 */
+         0, 0xD7B8, 0xB352, 0xD7C3, 	 0, 0xD7B3, 0xB353, 0xD7BF, /* 0x90 */
+    0xD7BB, 0xD7BD, 0xD7B7, 0xD7BE, 	 0, 	 0, 0xB34F, 0xD7BA, /* 0x90 */
+         0, 0xD7B9, 0xD7B5, 	 0, 0xD7C0, 	 0, 	 0, 0xD7BC, /* 0xA0 */
+    0xD7B4, 	 0, 0xD7B6, 0xB351, 0xD7C1, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 0xB5F6, 0xDBCD, 	 0, 	 0, 	 0, 0xDBC9, 0xDBCB, /* 0xB0 */
+    0xDBC6, 0xDBC5, 0xDBC3, 	 0, 0xDBCA, 0xDBCC, 0xDBC8, 	 0, /* 0xB0 */
+    0xDBC7, 0xB5F4, 0xB5F5, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
          0, 0xDBCF, 0xB8CD, 0xDFF2, 0xDFF8, 0xDFF3, 0xDFF4, 0xF9D8, /* 0xC0 */
-    0xDFF9,      0, 0xB8CF,      0, 0xB8C7, 0xB8CE, 0xDFF1, 0xDBC4, /* 0xD0 */
+    0xDFF9, 	 0, 0xB8CF, 	 0, 0xB8C7, 0xB8CE, 0xDFF1, 0xDBC4, /* 0xD0 */
     0xB8CA, 0xB8C8, 0xDFF7, 0xDFF6, 0xB8C9, 0xB8CB, 0xDFF5, 0xB8C6, /* 0xD0 */
-         0, 0xB8CC,      0,      0,      0,      0,      0, 0xE3F6, /* 0xE0 */
-    0xBB74,      0,      0, 0xE442, 0xE441,      0, 0xE3FB, 0xBB76, /* 0xE0 */
-    0xE440, 0xE3F7, 0xE3F8, 0xBB6E, 0xBB70,      0, 0xE3FD, 0xE3F5, /* 0xF0 */
-    0xBB72, 0xBB71, 0xE3F9, 0xE3FE, 0xE3FC, 0xBB73, 0xE3FA          /* 0xF0 */
+         0, 0xB8CC, 	 0, 	 0, 	 0, 	 0, 	 0, 0xE3F6, /* 0xE0 */
+    0xBB74, 	 0, 	 0, 0xE442, 0xE441, 	 0, 0xE3FB, 0xBB76, /* 0xE0 */
+    0xE440, 0xE3F7, 0xE3F8, 0xBB6E, 0xBB70, 	 0, 0xE3FD, 0xE3F5, /* 0xF0 */
+    0xBB72, 0xBB71, 0xE3F9, 0xE3FE, 0xE3FC, 0xBB73, 0xE3FA			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_89[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xDBCE, 0xBB6F,      0,      0, 0xE7C2, 0xE7C9, 0xBDC6, /* 0x00 */
-         0, 0xE7CD, 0xBDCA, 0xE7C5, 0xE7C3,      0, 0xE7CC,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xDBCE, 0xBB6F, 	 0, 	 0, 0xE7C2, 0xE7C9, 0xBDC6, /* 0x00 */
+         0, 0xE7CD, 0xBDCA, 0xE7C5, 0xE7C3, 	 0, 0xE7CC, 	 0, /* 0x00 */
     0xBDC5, 0xE7CB, 0xBDC7, 0xBDC8, 0xE7C4, 0xBDC9, 0xE7CA, 0xE7C6, /* 0x10 */
-    0xE7C7, 0xE7C8, 0xBB75,      0,      0,      0, 0xEB70, 0xEB7C, /* 0x10 */
-         0, 0xBFCA, 0xEB77, 0xEB79,      0, 0xBFC8, 0xEB71, 0xEB75, /* 0x20 */
+    0xE7C7, 0xE7C8, 0xBB75, 	 0, 	 0, 	 0, 0xEB70, 0xEB7C, /* 0x10 */
+         0, 0xBFCA, 0xEB77, 0xEB79, 	 0, 0xBFC8, 0xEB71, 0xEB75, /* 0x20 */
          0, 0xEB78, 0xBFC6, 0xBFC9, 0xEB7B, 0xEB73, 0xEB74, 0xEB7A, /* 0x20 */
-    0xEB72, 0xEB76, 0xBFC7, 0xEE72,      0, 0xEE71, 0xC1B7, 0xEE77, /* 0x30 */
-    0xC1B9,      0,      0, 0xC1B6, 0xEE73, 0xC1BA, 0xEE74,      0, /* 0x30 */
-         0, 0xEE75, 0xEE78,      0, 0xC1B8,      0, 0xF0D6,      0, /* 0x40 */
-         0, 0xF0D9,      0, 0xF0D3, 0xF0D5,      0,      0, 0xF0D4, /* 0x40 */
-    0xF0D7, 0xF0D8, 0xEE76, 0xF0D2,      0,      0, 0xC3CD, 0xF2EC, /* 0x50 */
+    0xEB72, 0xEB76, 0xBFC7, 0xEE72, 	 0, 0xEE71, 0xC1B7, 0xEE77, /* 0x30 */
+    0xC1B9, 	 0, 	 0, 0xC1B6, 0xEE73, 0xC1BA, 0xEE74, 	 0, /* 0x30 */
+         0, 0xEE75, 0xEE78, 	 0, 0xC1B8, 	 0, 0xF0D6, 	 0, /* 0x40 */
+         0, 0xF0D9, 	 0, 0xF0D3, 0xF0D5, 	 0, 	 0, 0xF0D4, /* 0x40 */
+    0xF0D7, 0xF0D8, 0xEE76, 0xF0D2, 	 0, 	 0, 0xC3CD, 0xF2EC, /* 0x50 */
     0xF2EF, 0xF2F1, 0xF2EA, 0xF2EB, 0xF2EE, 0xF2F0, 0xC3CE, 0xC3CC, /* 0x50 */
-    0xC3CB, 0xF2ED, 0xF2E9, 0xF4CA, 0xC4B0,      0, 0xF4CB,      0, /* 0x60 */
+    0xC3CB, 0xF2ED, 0xF2E9, 0xF4CA, 0xC4B0, 	 0, 0xF4CB, 	 0, /* 0x60 */
          0, 0xF649, 0xC4FB, 0xF64B, 0xC4FC, 0xF648, 0xF64A, 0xC5A8, /* 0x60 */
-         0, 0xF752, 0xC5A7, 0xF7FD, 0xF7FC,      0, 0xF7FB,      0, /* 0x70 */
-         0, 0xF948, 0xF949, 0xF94B, 0xF94A,      0, 0xCA50, 0xA6E8, /* 0x70 */
-         0, 0xAD6E, 0xD7C5, 0xB5F7,      0, 0xDFFA, 0xC2D0,      0, /* 0x80 */
-    0xF2F2,      0,      0, 0xA8A3,      0,      0,      0, 0xB357, /* 0x80 */
-         0,      0,      0, 0xB356,      0, 0xDBD0, 0xB5F8, 0xDBD2, /* 0x90 */
-    0xDBD1,      0,      0, 0xDFFB, 0xB8D0, 0xE443, 0xE446, 0xE445, /* 0x90 */
-         0, 0xE444, 0xE7CE, 0xE7D0, 0xE7CF,      0, 0xBFCC,      0, /* 0xA0 */
-         0,      0, 0xBFCB,      0, 0xC1BB, 0xEE79, 0xEE7B, 0xEE7A, /* 0xA0 */
-         0,      0, 0xC2D1,      0,      0,      0, 0xF2F4, 0xF2F3, /* 0xB0 */
-         0, 0xF4CC, 0xC4B1,      0,      0, 0xC4FD, 0xF754, 0xF753, /* 0xB0 */
-    0xC65B,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0, 0xA8A4, 0xD0AF, 0xAD6F, 0xD7C8, 0xD7C6,      0, /* 0xD0 */
-         0, 0xD7C7, 0xDBD4, 0xDBD5, 0xE043, 0xDBD3,      0, 0xDFFC, /* 0xD0 */
-    0xE041, 0xE040, 0xE042, 0xB8D1, 0xDFFE, 0xDFFD, 0xE044,      0, /* 0xE0 */
-    0xE449, 0xE447,      0, 0xE448, 0xE7D3, 0xE7D1,      0,      0, /* 0xE0 */
-    0xE7D2, 0xEB7D, 0xEE7C, 0xEE7D, 0xC2D2,      0, 0xF2F5, 0xF4CD, /* 0xF0 */
-    0xC4B2,      0, 0xF64C, 0xF755, 0xC5A9,      0, 0xF7FE, 0xF94C  /* 0xF0 */
+         0, 0xF752, 0xC5A7, 0xF7FD, 0xF7FC, 	 0, 0xF7FB, 	 0, /* 0x70 */
+         0, 0xF948, 0xF949, 0xF94B, 0xF94A, 	 0, 0xCA50, 0xA6E8, /* 0x70 */
+         0, 0xAD6E, 0xD7C5, 0xB5F7, 	 0, 0xDFFA, 0xC2D0, 	 0, /* 0x80 */
+    0xF2F2, 	 0, 	 0, 0xA8A3, 	 0, 	 0, 	 0, 0xB357, /* 0x80 */
+         0, 	 0, 	 0, 0xB356, 	 0, 0xDBD0, 0xB5F8, 0xDBD2, /* 0x90 */
+    0xDBD1, 	 0, 	 0, 0xDFFB, 0xB8D0, 0xE443, 0xE446, 0xE445, /* 0x90 */
+         0, 0xE444, 0xE7CE, 0xE7D0, 0xE7CF, 	 0, 0xBFCC, 	 0, /* 0xA0 */
+         0, 	 0, 0xBFCB, 	 0, 0xC1BB, 0xEE79, 0xEE7B, 0xEE7A, /* 0xA0 */
+         0, 	 0, 0xC2D1, 	 0, 	 0, 	 0, 0xF2F4, 0xF2F3, /* 0xB0 */
+         0, 0xF4CC, 0xC4B1, 	 0, 	 0, 0xC4FD, 0xF754, 0xF753, /* 0xB0 */
+    0xC65B, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 0xA8A4, 0xD0AF, 0xAD6F, 0xD7C8, 0xD7C6, 	 0, /* 0xD0 */
+         0, 0xD7C7, 0xDBD4, 0xDBD5, 0xE043, 0xDBD3, 	 0, 0xDFFC, /* 0xD0 */
+    0xE041, 0xE040, 0xE042, 0xB8D1, 0xDFFE, 0xDFFD, 0xE044, 	 0, /* 0xE0 */
+    0xE449, 0xE447, 	 0, 0xE448, 0xE7D3, 0xE7D1, 	 0, 	 0, /* 0xE0 */
+    0xE7D2, 0xEB7D, 0xEE7C, 0xEE7D, 0xC2D2, 	 0, 0xF2F5, 0xF4CD, /* 0xF0 */
+    0xC4B2, 	 0, 0xF64C, 0xF755, 0xC5A9, 	 0, 0xF7FE, 0xF94C	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_8A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xA8A5,      0, 0xAD71, 0xAD72, 0xD0B0,      0,      0, 0xD0B1, /* 0x00 */
-    0xAD70,      0, 0xB054,      0, 0xB052,      0, 0xB051, 0xB058, /* 0x00 */
-    0xB050, 0xB059, 0xD3DD, 0xB056,      0, 0xB053, 0xB057, 0xB055, /* 0x10 */
-    0xB04F,      0,      0, 0xB35F,      0, 0xB359, 0xD7CC, 0xB35E, /* 0x10 */
-         0,      0, 0xB360, 0xB35A,      0, 0xB35B,      0, 0xD7CA, /* 0x20 */
-         0,      0, 0xB358,      0, 0xD7CB, 0xB35D,      0,      0, /* 0x20 */
-    0xD7C9, 0xB35C,      0,      0, 0xB644,      0, 0xB646,      0, /* 0x30 */
-         0, 0xDBD8, 0xB645, 0xB5F9, 0xB5FD,      0, 0xB8E4, 0xE049, /* 0x30 */
-    0xDBDA, 0xB5FE,      0,      0, 0xDBDD, 0xDBDE, 0xB643,      0, /* 0x40 */
-    0xDBE0,      0, 0xDBE2,      0, 0xDBE3, 0xDBD7, 0xDBD6, 0xDBE4, /* 0x40 */
-    0xB642, 0xDBE1, 0xDBDF,      0, 0xB640, 0xB5FB, 0xB647, 0xDBDB, /* 0x50 */
-    0xDBDC, 0xDBD9,      0, 0xB641,      0,      0, 0xB5FC,      0, /* 0x50 */
-    0xB5FA, 0xE048, 0xB8DF, 0xB8DA,      0,      0, 0xB8D5,      0, /* 0x60 */
-    0xB8E5, 0xB8D6,      0, 0xB8D2, 0xB8E1, 0xB8DE, 0xB8E0,      0, /* 0x60 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xA8A5, 	 0, 0xAD71, 0xAD72, 0xD0B0, 	 0, 	 0, 0xD0B1, /* 0x00 */
+    0xAD70, 	 0, 0xB054, 	 0, 0xB052, 	 0, 0xB051, 0xB058, /* 0x00 */
+    0xB050, 0xB059, 0xD3DD, 0xB056, 	 0, 0xB053, 0xB057, 0xB055, /* 0x10 */
+    0xB04F, 	 0, 	 0, 0xB35F, 	 0, 0xB359, 0xD7CC, 0xB35E, /* 0x10 */
+         0, 	 0, 0xB360, 0xB35A, 	 0, 0xB35B, 	 0, 0xD7CA, /* 0x20 */
+         0, 	 0, 0xB358, 	 0, 0xD7CB, 0xB35D, 	 0, 	 0, /* 0x20 */
+    0xD7C9, 0xB35C, 	 0, 	 0, 0xB644, 	 0, 0xB646, 	 0, /* 0x30 */
+         0, 0xDBD8, 0xB645, 0xB5F9, 0xB5FD, 	 0, 0xB8E4, 0xE049, /* 0x30 */
+    0xDBDA, 0xB5FE, 	 0, 	 0, 0xDBDD, 0xDBDE, 0xB643, 	 0, /* 0x40 */
+    0xDBE0, 	 0, 0xDBE2, 	 0, 0xDBE3, 0xDBD7, 0xDBD6, 0xDBE4, /* 0x40 */
+    0xB642, 0xDBE1, 0xDBDF, 	 0, 0xB640, 0xB5FB, 0xB647, 0xDBDB, /* 0x50 */
+    0xDBDC, 0xDBD9, 	 0, 0xB641, 	 0, 	 0, 0xB5FC, 	 0, /* 0x50 */
+    0xB5FA, 0xE048, 0xB8DF, 0xB8DA, 	 0, 	 0, 0xB8D5, 	 0, /* 0x60 */
+    0xB8E5, 0xB8D6, 	 0, 0xB8D2, 0xB8E1, 0xB8DE, 0xB8E0, 	 0, /* 0x60 */
     0xB8D7, 0xB8DC, 0xB8D3, 0xB8D4, 0xE050, 0xE04D, 0xE045, 0xE04A, /* 0x70 */
-         0, 0xB8E2, 0xE051, 0xB8E3, 0xB8D9,      0,      0, 0xE047, /* 0x70 */
+         0, 0xB8E2, 0xE051, 0xB8E3, 0xB8D9, 	 0, 	 0, 0xE047, /* 0x70 */
          0, 0xE04F, 0xE04B, 0xE04E, 0xE04C, 0xB8DD, 0xE046, 0xB8D8, /* 0x80 */
-         0,      0,      0, 0xE44C, 0xBB78, 0xBB7B,      0, 0xE44E, /* 0x80 */
-         0, 0xBBA5, 0xE44D, 0xBB7D,      0, 0xBDCF, 0xE44F,      0, /* 0x90 */
-    0xBBA4, 0xE44B, 0xBBA6,      0,      0,      0, 0xBB79,      0, /* 0x90 */
-    0xB8DB, 0xBB7C,      0, 0xBB7A, 0xBB7E, 0xBBA2, 0xBB77, 0xBBA7, /* 0xA0 */
-    0xBBA3,      0, 0xBBA1, 0xE44A,      0,      0,      0,      0, /* 0xA0 */
-    0xBDD6,      0, 0xBDD2,      0,      0,      0, 0xBDD9,      0, /* 0xB0 */
+         0, 	 0, 	 0, 0xE44C, 0xBB78, 0xBB7B, 	 0, 0xE44E, /* 0x80 */
+         0, 0xBBA5, 0xE44D, 0xBB7D, 	 0, 0xBDCF, 0xE44F, 	 0, /* 0x90 */
+    0xBBA4, 0xE44B, 0xBBA6, 	 0, 	 0, 	 0, 0xBB79, 	 0, /* 0x90 */
+    0xB8DB, 0xBB7C, 	 0, 0xBB7A, 0xBB7E, 0xBBA2, 0xBB77, 0xBBA7, /* 0xA0 */
+    0xBBA3, 	 0, 0xBBA1, 0xE44A, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xBDD6, 	 0, 0xBDD2, 	 0, 	 0, 	 0, 0xBDD9, 	 0, /* 0xB0 */
     0xE7D6, 0xBDDA, 0xE7E2, 0xE7DB, 0xBDCB, 0xE7E3, 0xE7DD, 0xBDD5, /* 0xB0 */
-    0xE7DE,      0, 0xBDD4, 0xE7E1, 0xBDCE, 0xE7DF, 0xE7D5, 0xBDCD, /* 0xC0 */
-    0xEBAA, 0xBDD3,      0, 0xBDD0,      0, 0xBDD8,      0, 0xE7D4, /* 0xC0 */
+    0xE7DE, 	 0, 0xBDD4, 0xE7E1, 0xBDCE, 0xE7DF, 0xE7D5, 0xBDCD, /* 0xC0 */
+    0xEBAA, 0xBDD3, 	 0, 0xBDD0, 	 0, 0xBDD8, 	 0, 0xE7D4, /* 0xC0 */
          0, 0xE7D8, 0xBDCC, 0xE7D7, 0xE7D9, 0xE7DA, 0xBDD7, 0xE7DC, /* 0xD0 */
-    0xE7E0, 0xE7E4,      0, 0xBDDB, 0xBFD2, 0xEBA5, 0xEBAB, 0xEBA8, /* 0xD0 */
-    0xEB7E, 0xEBAC, 0xEBA1,      0, 0xEBA7,      0, 0xBFCD, 0xBFD3, /* 0xE0 */
-    0xEBAD,      0,      0, 0xBFCF,      0, 0xBFD9, 0xBFD4, 0xEBAF, /* 0xE0 */
+    0xE7E0, 0xE7E4, 	 0, 0xBDDB, 0xBFD2, 0xEBA5, 0xEBAB, 0xEBA8, /* 0xD0 */
+    0xEB7E, 0xEBAC, 0xEBA1, 	 0, 0xEBA7, 	 0, 0xBFCD, 0xBFD3, /* 0xE0 */
+    0xEBAD, 	 0, 	 0, 0xBFCF, 	 0, 0xBFD9, 0xBFD4, 0xEBAF, /* 0xE0 */
     0xEBA9, 0xBFD0, 0xEBA2, 0xBFDA, 0xEBA3, 0xEBA4, 0xBFDB, 0xBFD8, /* 0xF0 */
-    0xBDD1,      0, 0xBFCE, 0xEBB0, 0xBFDC,      0, 0xBFD5, 0xEBAE  /* 0xF0 */
+    0xBDD1, 	 0, 0xBFCE, 0xEBB0, 0xBFDC, 	 0, 0xBFD5, 0xEBAE	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_8B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xBFD1, 0xBFD6, 0xBFD7,      0, 0xC1C3, 0xEEA4, 0xEEAD, 0xEEAA, /* 0x00 */
-    0xEEAC,      0, 0xC1C0, 0xEEA5,      0, 0xEEAB, 0xC1BC, 0xEEA7, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xBFD1, 0xBFD6, 0xBFD7, 	 0, 0xC1C3, 0xEEA4, 0xEEAD, 0xEEAA, /* 0x00 */
+    0xEEAC, 	 0, 0xC1C0, 0xEEA5, 	 0, 0xEEAB, 0xC1BC, 0xEEA7, /* 0x00 */
     0xC1C4, 0xEEA3, 0xEEA8, 0xEEAF, 0xEBA6, 0xEEA9, 0xEEA2, 0xC1BD, /* 0x10 */
-    0xEEA1, 0xC1BE, 0xEEB0, 0xC1BF, 0xEEAE, 0xC1C2, 0xEE7E,      0, /* 0x10 */
-    0xC1C1,      0, 0xEEA6, 0xF0DC, 0xF0EA, 0xF0E5, 0xF0E7, 0xF0DB, /* 0x20 */
-    0xC2D3,      0, 0xF0DA, 0xC2D6, 0xC2D5,      0, 0xF0E9, 0xF0E1, /* 0x20 */
-    0xF0DE, 0xF0E4,      0, 0xF0DD,      0, 0xF0DF, 0xF0E8, 0xF0E6, /* 0x30 */
-         0, 0xC2D4, 0xF0ED, 0xF0EB, 0xF0E2, 0xF0EC, 0xF0E3,      0, /* 0x30 */
-    0xF2F9, 0xC3CF, 0xF341,      0,      0, 0xF64F, 0xC3D6, 0xF0E0, /* 0x40 */
-    0xF2F7, 0xC3D2, 0xF2F8, 0xF2FD,      0,      0, 0xC3D4, 0xC3D5, /* 0x40 */
+    0xEEA1, 0xC1BE, 0xEEB0, 0xC1BF, 0xEEAE, 0xC1C2, 0xEE7E, 	 0, /* 0x10 */
+    0xC1C1, 	 0, 0xEEA6, 0xF0DC, 0xF0EA, 0xF0E5, 0xF0E7, 0xF0DB, /* 0x20 */
+    0xC2D3, 	 0, 0xF0DA, 0xC2D6, 0xC2D5, 	 0, 0xF0E9, 0xF0E1, /* 0x20 */
+    0xF0DE, 0xF0E4, 	 0, 0xF0DD, 	 0, 0xF0DF, 0xF0E8, 0xF0E6, /* 0x30 */
+         0, 0xC2D4, 0xF0ED, 0xF0EB, 0xF0E2, 0xF0EC, 0xF0E3, 	 0, /* 0x30 */
+    0xF2F9, 0xC3CF, 0xF341, 	 0, 	 0, 0xF64F, 0xC3D6, 0xF0E0, /* 0x40 */
+    0xF2F7, 0xC3D2, 0xF2F8, 0xF2FD, 	 0, 	 0, 0xC3D4, 0xC3D5, /* 0x40 */
     0xF2F6, 0xF340, 0xF342, 0xF2FA, 0xF2FC, 0xF2FE, 0xF2FB, 0xF343, /* 0x50 */
-    0xC3D1, 0xC3D7, 0xC3D3,      0, 0xC3D0, 0xF4D0,      0, 0xC4B7, /* 0x50 */
-    0xF4CE,      0,      0, 0xF4D2,      0, 0xF4D3, 0xC4B5, 0xF4D4, /* 0x60 */
-    0xF4D1,      0, 0xF4CF, 0xC4B8, 0xC4B4, 0xF4D5,      0, 0xC4B6, /* 0x60 */
-    0xC4B3,      0,      0,      0, 0xC4FE,      0,      0, 0xC540, /* 0x70 */
-    0xF64E, 0xF64D, 0xF650, 0xF651,      0, 0xC541, 0xF756, 0xF75B, /* 0x70 */
-    0xC5AA,      0, 0xF758,      0, 0xF757, 0xF75A, 0xF759,      0, /* 0x80 */
-    0xF843,      0, 0xC5DC, 0xF842, 0xF840,      0, 0xF841,      0, /* 0x80 */
-         0,      0, 0xC5FE, 0xC5FD, 0xF8C1, 0xF8C2, 0xC640,      0, /* 0x90 */
-    0xF94D, 0xF94E, 0xC667,      0, 0xC66D,      0, 0xF9A9, 0xF9C8, /* 0x90 */
+    0xC3D1, 0xC3D7, 0xC3D3, 	 0, 0xC3D0, 0xF4D0, 	 0, 0xC4B7, /* 0x50 */
+    0xF4CE, 	 0, 	 0, 0xF4D2, 	 0, 0xF4D3, 0xC4B5, 0xF4D4, /* 0x60 */
+    0xF4D1, 	 0, 0xF4CF, 0xC4B8, 0xC4B4, 0xF4D5, 	 0, 0xC4B6, /* 0x60 */
+    0xC4B3, 	 0, 	 0, 	 0, 0xC4FE, 	 0, 	 0, 0xC540, /* 0x70 */
+    0xF64E, 0xF64D, 0xF650, 0xF651, 	 0, 0xC541, 0xF756, 0xF75B, /* 0x70 */
+    0xC5AA, 	 0, 0xF758, 	 0, 0xF757, 0xF75A, 0xF759, 	 0, /* 0x80 */
+    0xF843, 	 0, 0xC5DC, 0xF842, 0xF840, 	 0, 0xF841, 	 0, /* 0x80 */
+         0, 	 0, 0xC5FE, 0xC5FD, 0xF8C1, 0xF8C2, 0xC640, 	 0, /* 0x90 */
+    0xF94D, 0xF94E, 0xC667, 	 0, 0xC66D, 	 0, 0xF9A9, 0xF9C8, /* 0x90 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_8C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xA8A6, /* 0x30 */
-         0, 0xD7CD,      0, 0xD7CE, 0xE052, 0xE450, 0xE7E5, 0xC1C6, /* 0x30 */
-         0, 0xC1C5, 0xF0EE, 0xF344,      0, 0xF844, 0xA8A7, 0xD3DE, /* 0x40 */
+         0, 0xD7CD, 	 0, 0xD7CE, 0xE052, 0xE450, 0xE7E5, 0xC1C6, /* 0x30 */
+         0, 0xC1C5, 0xF0EE, 0xF344, 	 0, 0xF844, 0xA8A7, 0xD3DE, /* 0x40 */
     0xB05A, 0xB361, 0xE054, 0xE053, 0xBDDC, 0xE7E6, 0xBDDD, 0xEEB1, /* 0x40 */
-    0xC2D7,      0,      0,      0, 0xC676, 0xA8A8, 0xCDCB, 0xD3DF, /* 0x50 */
-         0,      0, 0xB362,      0, 0xD7CF, 0xD7D0,      0, 0xDBE5, /* 0x50 */
-         0, 0xB648, 0xB8E6,      0, 0xE056, 0xE055, 0xE057,      0, /* 0x60 */
-    0xE451, 0xE452, 0xBBA8, 0xBFDD, 0xBDDE, 0xBFDE,      0, 0xEEB5, /* 0x60 */
-    0xEEB2, 0xEEB4, 0xEEB3, 0xC1C7,      0, 0xF0EF, 0xF346, 0xF345, /* 0x70 */
-    0xCBA4, 0xB05C, 0xB05B, 0xD3E0,      0, 0xD7D1,      0,      0, /* 0x70 */
-    0xDBE7, 0xDBE6, 0xB649,      0, 0xE059, 0xE05A, 0xE058,      0, /* 0x80 */
-         0, 0xB8E8, 0xB8E7,      0, 0xBBAA, 0xBBA9,      0, 0xE7E7, /* 0x80 */
-    0xEBB3, 0xEBB1, 0xEBB2, 0xBFDF, 0xEEB7, 0xEEB6,      0, 0xF0F2, /* 0x90 */
-    0xF0F1, 0xF0F0, 0xF347,      0, 0xF9AA, 0xA8A9, 0xAD73,      0, /* 0x90 */
-    0xAD74, 0xB05D, 0xB05E, 0xD3E2, 0xD3E1, 0xD7D2,      0, 0xB368, /* 0xA0 */
-    0xB366, 0xB363, 0xB367, 0xB365, 0xB364,      0,      0, 0xB64A, /* 0xA0 */
-    0xDBEA,      0, 0xB8ED, 0xB64C, 0xB651, 0xDBEC, 0xB653, 0xB652, /* 0xB0 */
+    0xC2D7, 	 0, 	 0, 	 0, 0xC676, 0xA8A8, 0xCDCB, 0xD3DF, /* 0x50 */
+         0, 	 0, 0xB362, 	 0, 0xD7CF, 0xD7D0, 	 0, 0xDBE5, /* 0x50 */
+         0, 0xB648, 0xB8E6, 	 0, 0xE056, 0xE055, 0xE057, 	 0, /* 0x60 */
+    0xE451, 0xE452, 0xBBA8, 0xBFDD, 0xBDDE, 0xBFDE, 	 0, 0xEEB5, /* 0x60 */
+    0xEEB2, 0xEEB4, 0xEEB3, 0xC1C7, 	 0, 0xF0EF, 0xF346, 0xF345, /* 0x70 */
+    0xCBA4, 0xB05C, 0xB05B, 0xD3E0, 	 0, 0xD7D1, 	 0, 	 0, /* 0x70 */
+    0xDBE7, 0xDBE6, 0xB649, 	 0, 0xE059, 0xE05A, 0xE058, 	 0, /* 0x80 */
+         0, 0xB8E8, 0xB8E7, 	 0, 0xBBAA, 0xBBA9, 	 0, 0xE7E7, /* 0x80 */
+    0xEBB3, 0xEBB1, 0xEBB2, 0xBFDF, 0xEEB7, 0xEEB6, 	 0, 0xF0F2, /* 0x90 */
+    0xF0F1, 0xF0F0, 0xF347, 	 0, 0xF9AA, 0xA8A9, 0xAD73, 	 0, /* 0x90 */
+    0xAD74, 0xB05D, 0xB05E, 0xD3E2, 0xD3E1, 0xD7D2, 	 0, 0xB368, /* 0xA0 */
+    0xB366, 0xB363, 0xB367, 0xB365, 0xB364, 	 0, 	 0, 0xB64A, /* 0xA0 */
+    0xDBEA, 	 0, 0xB8ED, 0xB64C, 0xB651, 0xDBEC, 0xB653, 0xB652, /* 0xB0 */
     0xB655, 0xDBEB, 0xDBE8, 0xB64F, 0xB64B, 0xB64D, 0xDBE9, 0xB654, /* 0xB0 */
-    0xB650, 0xB64E, 0xB8EF, 0xB8EE, 0xB8EC, 0xB8F0,      0, 0xB8EA, /* 0xC0 */
-    0xB8EB,      0, 0xB8E9,      0, 0xE05B,      0,      0, 0xE454, /* 0xC0 */
-         0, 0xBBAC, 0xBBAD, 0xBBAB,      0, 0xE453,      0, 0xE455, /* 0xD0 */
-         0, 0xE7EA, 0xE7EC,      0, 0xBDE7, 0xE7ED, 0xBDE0, 0xE7E9, /* 0xD0 */
+    0xB650, 0xB64E, 0xB8EF, 0xB8EE, 0xB8EC, 0xB8F0, 	 0, 0xB8EA, /* 0xC0 */
+    0xB8EB, 	 0, 0xB8E9, 	 0, 0xE05B, 	 0, 	 0, 0xE454, /* 0xC0 */
+         0, 0xBBAC, 0xBBAD, 0xBBAB, 	 0, 0xE453, 	 0, 0xE455, /* 0xD0 */
+         0, 0xE7EA, 0xE7EC, 	 0, 0xBDE7, 0xE7ED, 0xBDE0, 0xE7E9, /* 0xD0 */
     0xBDDF, 0xBDE9, 0xBDE5, 0xBDE6, 0xBDE2, 0xE7E8, 0xBDE1, 0xE7EE, /* 0xE0 */
-    0xE7EB,      0, 0xBDE8,      0, 0xBDE3, 0xBDE4, 0xEBB5,      0, /* 0xE0 */
-    0xEBB7, 0xEBB6,      0, 0xEBB8, 0xBFE0, 0xEBB4,      0,      0, /* 0xF0 */
-    0xC1CB, 0xEEB8, 0xC1C8, 0xC1CC, 0xC1CA, 0xC1C9, 0xF0F3          /* 0xF0 */
+    0xE7EB, 	 0, 0xBDE8, 	 0, 0xBDE3, 0xBDE4, 0xEBB5, 	 0, /* 0xE0 */
+    0xEBB7, 0xEBB6, 	 0, 0xEBB8, 0xBFE0, 0xEBB4, 	 0, 	 0, /* 0xF0 */
+    0xC1CB, 0xEEB8, 0xC1C8, 0xC1CC, 0xC1CA, 0xC1C9, 0xF0F3			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_8D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF0F6,      0, 0xF0F5,      0, 0xF0F4, 0xC2D8, 0xF348, 0xF349, /* 0x00 */
-    0xC3D8, 0xF34A, 0xC3D9,      0,      0, 0xC4BA,      0, 0xC4B9, /* 0x00 */
-    0xF652,      0,      0, 0xC542, 0xF653, 0xF75C, 0xC5AB, 0xC5AC, /* 0x10 */
-         0, 0xF845,      0, 0xC642,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0, 0xA8AA,      0, 0xB36A, 0xB369, /* 0x60 */
-    0xE05C, 0xE05D,      0, 0xBBAE, 0xEBB9, 0xBDEA, 0xEBBA, 0xEEB9, /* 0x60 */
-    0xA8AB,      0, 0xD0B2, 0xAD76, 0xAD75,      0, 0xD3E3, 0xB05F, /* 0x70 */
-    0xD3E4, 0xD7D5,      0, 0xD7D4,      0, 0xD7D3,      0,      0, /* 0x70 */
-    0xDBEE, 0xB658,      0,      0, 0xDBED, 0xB657,      0,      0, /* 0x80 */
-         0, 0xDBEF, 0xB656,      0, 0xE05F, 0xE062, 0xE060, 0xE061, /* 0x80 */
-    0xE065, 0xE05E, 0xE066, 0xE063, 0xE064, 0xBBB0, 0xE456,      0, /* 0x90 */
-         0, 0xBBAF,      0, 0xE7F2, 0xE7F0,      0,      0, 0xBDEB, /* 0x90 */
-    0xE7EF, 0xE7F1,      0, 0xBDEC,      0, 0xEBBB,      0, 0xEBBC, /* 0xA0 */
-    0xC1CD,      0, 0xF34C, 0xF34E, 0xF34B, 0xF34D, 0xF4D6, 0xF654, /* 0xA0 */
-         0,      0, 0xF96F, 0xA8AC, 0xAD77, 0xD3E5, 0xD3E7, 0xD3E6, /* 0xB0 */
-         0, 0xD7D8, 0xB36C,      0, 0xD7D6,      0, 0xB36B, 0xD7D9, /* 0xB0 */
-         0, 0xD7DA, 0xD7D7,      0,      0, 0xDBFB, 0xB660, 0xDBF3, /* 0xC0 */
-    0xDBF9,      0,      0, 0xB65B, 0xB65E, 0xDBF2, 0xB659, 0xDBF6, /* 0xC0 */
-    0xE06C, 0xB65D,      0, 0xDBF1,      0, 0xDBF7, 0xDBF4, 0xDBFA, /* 0xD0 */
-    0xDBF0, 0xDBF8, 0xB65C, 0xB65F, 0xDBF5, 0xB65A,      0, 0xB8F2, /* 0xD0 */
-    0xE068, 0xB8F1, 0xE06F, 0xE06E, 0xB8F8,      0, 0xB8F9, 0xE070, /* 0xE0 */
-    0xB8F3, 0xE06D, 0xB8F7, 0xE072, 0xE069,      0, 0xE06B, 0xB8F4, /* 0xE0 */
-    0xE067, 0xE06A, 0xE071, 0xB8F5, 0xE073,      0,      0,      0, /* 0xF0 */
-         0,      0, 0xB8F6,      0, 0xBBB1, 0xE45B, 0xE461, 0xE459  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF0F6, 	 0, 0xF0F5, 	 0, 0xF0F4, 0xC2D8, 0xF348, 0xF349, /* 0x00 */
+    0xC3D8, 0xF34A, 0xC3D9, 	 0, 	 0, 0xC4BA, 	 0, 0xC4B9, /* 0x00 */
+    0xF652, 	 0, 	 0, 0xC542, 0xF653, 0xF75C, 0xC5AB, 0xC5AC, /* 0x10 */
+         0, 0xF845, 	 0, 0xC642, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xA8AA, 	 0, 0xB36A, 0xB369, /* 0x60 */
+    0xE05C, 0xE05D, 	 0, 0xBBAE, 0xEBB9, 0xBDEA, 0xEBBA, 0xEEB9, /* 0x60 */
+    0xA8AB, 	 0, 0xD0B2, 0xAD76, 0xAD75, 	 0, 0xD3E3, 0xB05F, /* 0x70 */
+    0xD3E4, 0xD7D5, 	 0, 0xD7D4, 	 0, 0xD7D3, 	 0, 	 0, /* 0x70 */
+    0xDBEE, 0xB658, 	 0, 	 0, 0xDBED, 0xB657, 	 0, 	 0, /* 0x80 */
+         0, 0xDBEF, 0xB656, 	 0, 0xE05F, 0xE062, 0xE060, 0xE061, /* 0x80 */
+    0xE065, 0xE05E, 0xE066, 0xE063, 0xE064, 0xBBB0, 0xE456, 	 0, /* 0x90 */
+         0, 0xBBAF, 	 0, 0xE7F2, 0xE7F0, 	 0, 	 0, 0xBDEB, /* 0x90 */
+    0xE7EF, 0xE7F1, 	 0, 0xBDEC, 	 0, 0xEBBB, 	 0, 0xEBBC, /* 0xA0 */
+    0xC1CD, 	 0, 0xF34C, 0xF34E, 0xF34B, 0xF34D, 0xF4D6, 0xF654, /* 0xA0 */
+         0, 	 0, 0xF96F, 0xA8AC, 0xAD77, 0xD3E5, 0xD3E7, 0xD3E6, /* 0xB0 */
+         0, 0xD7D8, 0xB36C, 	 0, 0xD7D6, 	 0, 0xB36B, 0xD7D9, /* 0xB0 */
+         0, 0xD7DA, 0xD7D7, 	 0, 	 0, 0xDBFB, 0xB660, 0xDBF3, /* 0xC0 */
+    0xDBF9, 	 0, 	 0, 0xB65B, 0xB65E, 0xDBF2, 0xB659, 0xDBF6, /* 0xC0 */
+    0xE06C, 0xB65D, 	 0, 0xDBF1, 	 0, 0xDBF7, 0xDBF4, 0xDBFA, /* 0xD0 */
+    0xDBF0, 0xDBF8, 0xB65C, 0xB65F, 0xDBF5, 0xB65A, 	 0, 0xB8F2, /* 0xD0 */
+    0xE068, 0xB8F1, 0xE06F, 0xE06E, 0xB8F8, 	 0, 0xB8F9, 0xE070, /* 0xE0 */
+    0xB8F3, 0xE06D, 0xB8F7, 0xE072, 0xE069, 	 0, 0xE06B, 0xB8F4, /* 0xE0 */
+    0xE067, 0xE06A, 0xE071, 0xB8F5, 0xE073, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 0xB8F6, 	 0, 0xBBB1, 0xE45B, 0xE461, 0xE459	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_8E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE462,      0, 0xE458, 0xE45D, 0xE463, 0xE460, 0xE45F, 0xE45E, /* 0x00 */
-         0, 0xE457, 0xE45C,      0,      0, 0xE45A,      0, 0xBDF1, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE462, 	 0, 0xE458, 0xE45D, 0xE463, 0xE460, 0xE45F, 0xE45E, /* 0x00 */
+         0, 0xE457, 0xE45C, 	 0, 	 0, 0xE45A, 	 0, 0xBDF1, /* 0x00 */
     0xBDEE, 0xE7FB, 0xE841, 0xE843, 0xE840, 0xE7F8, 0xE7FA, 0xE845, /* 0x10 */
     0xE842, 0xE7FC, 0xE846, 0xE7F9, 0xE844, 0xBDEF, 0xBDF5, 0xBDF3, /* 0x10 */
     0xE7F3, 0xBDF4, 0xBDF0, 0xE7F4, 0xE7F6, 0xE7F5, 0xE7FD, 0xE7FE, /* 0x20 */
-         0, 0xBDF2,      0, 0xBDED,      0,      0, 0xE7F7,      0, /* 0x20 */
-    0xEBC6, 0xBFE2,      0, 0xEBBD, 0xBFE3, 0xBFE6, 0xEBC2,      0, /* 0x30 */
-    0xEBBF, 0xBFE5,      0,      0, 0xEBC3, 0xEBC4, 0xEBBE, 0xEBC7, /* 0x30 */
-    0xEBC0, 0xEBC5, 0xBFE4,      0, 0xBFE1, 0xEBC1,      0, 0xEEBF, /* 0x40 */
-    0xC1D0, 0xC1CE, 0xC1D1, 0xC1CF, 0xEEBE, 0xEEBB, 0xEEBA,      0, /* 0x40 */
-    0xEEBD,      0,      0, 0xEEBC, 0xF145, 0xC2DE, 0xF0FB, 0xF0FA, /* 0x50 */
+         0, 0xBDF2, 	 0, 0xBDED, 	 0, 	 0, 0xE7F7, 	 0, /* 0x20 */
+    0xEBC6, 0xBFE2, 	 0, 0xEBBD, 0xBFE3, 0xBFE6, 0xEBC2, 	 0, /* 0x30 */
+    0xEBBF, 0xBFE5, 	 0, 	 0, 0xEBC3, 0xEBC4, 0xEBBE, 0xEBC7, /* 0x30 */
+    0xEBC0, 0xEBC5, 0xBFE4, 	 0, 0xBFE1, 0xEBC1, 	 0, 0xEEBF, /* 0x40 */
+    0xC1D0, 0xC1CE, 0xC1D1, 0xC1CF, 0xEEBE, 0xEEBB, 0xEEBA, 	 0, /* 0x40 */
+    0xEEBD, 	 0, 	 0, 0xEEBC, 0xF145, 0xC2DE, 0xF0FB, 0xF0FA, /* 0x50 */
          0, 0xC2D9, 0xF141, 0xF140, 0xF0F7, 0xF143, 0xF0FC, 0xC2DD, /* 0x50 */
     0xF0F9, 0xF142, 0xF0F8, 0xC2DA, 0xC2DC, 0xF0FD, 0xC2DB, 0xF0FE, /* 0x60 */
-         0, 0xF144, 0xF352,      0, 0xC3DE, 0xF34F,      0, 0xF353, /* 0x60 */
-         0,      0, 0xC3DB, 0xF351, 0xC3E0,      0, 0xC3DD,      0, /* 0x70 */
-    0xF350,      0, 0xC3DF, 0xF354, 0xC3DA,      0,      0,      0, /* 0x70 */
-         0, 0xC4BC, 0xC4BE,      0, 0xF4D9, 0xC4BD, 0xF4D7, 0xC3DC, /* 0x80 */
-    0xF4D8, 0xC4BB, 0xC543, 0xC545, 0xF656, 0xC544, 0xF655,      0, /* 0x80 */
+         0, 0xF144, 0xF352, 	 0, 0xC3DE, 0xF34F, 	 0, 0xF353, /* 0x60 */
+         0, 	 0, 0xC3DB, 0xF351, 0xC3E0, 	 0, 0xC3DD, 	 0, /* 0x70 */
+    0xF350, 	 0, 0xC3DF, 0xF354, 0xC3DA, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 0xC4BC, 0xC4BE, 	 0, 0xF4D9, 0xC4BD, 0xF4D7, 0xC3DC, /* 0x80 */
+    0xF4D8, 0xC4BB, 0xC543, 0xC545, 0xF656, 0xC544, 0xF655, 	 0, /* 0x80 */
     0xF761, 0xC5AD, 0xF760, 0xC5AE, 0xF75E, 0xF75D, 0xF762, 0xF763, /* 0x90 */
-    0xF846,      0, 0xF75F,      0,      0, 0xF8C6, 0xF8C3, 0xF8C4, /* 0x90 */
-    0xF8C5, 0xC65C,      0, 0xF951, 0xF950, 0xF94F, 0xF970,      0, /* 0xA0 */
-    0xF9BE, 0xF9AB, 0xC66E, 0xA8AD, 0xB060,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xB8FA,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0, 0xBDF6,      0,      0, 0xEBC8,      0,      0, /* 0xB0 */
-    0xC2DF,      0, 0xF355,      0,      0,      0,      0,      0, /* 0xC0 */
-         0, 0xF9AC, 0xA8AE, 0xAAEE, 0xAD79, 0xAD78,      0, 0xB063, /* 0xC0 */
-         0, 0xD3E8, 0xB061, 0xD3E9, 0xB062,      0,      0, 0xD7DF, /* 0xD0 */
-    0xD7DB,      0,      0, 0xB36D, 0xD7DE, 0xD7DD, 0xD7DC, 0xB36E, /* 0xD0 */
-    0xD7E0, 0xD7E1,      0,      0,      0, 0xDC43, 0xDC41, 0xDC45, /* 0xE0 */
-    0xDC46, 0xDC4C,      0, 0xDC48, 0xDC4A,      0, 0xDC42, 0xDBFC, /* 0xE0 */
-         0, 0xDC49,      0,      0, 0xDC4B, 0xDC44, 0xDC47, 0xDBFD, /* 0xF0 */
-    0xB662, 0xDC40, 0xDBFE, 0xB661, 0xB663,      0, 0xB8FD, 0xE075  /* 0xF0 */
+    0xF846, 	 0, 0xF75F, 	 0, 	 0, 0xF8C6, 0xF8C3, 0xF8C4, /* 0x90 */
+    0xF8C5, 0xC65C, 	 0, 0xF951, 0xF950, 0xF94F, 0xF970, 	 0, /* 0xA0 */
+    0xF9BE, 0xF9AB, 0xC66E, 0xA8AD, 0xB060, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xB8FA, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 0xBDF6, 	 0, 	 0, 0xEBC8, 	 0, 	 0, /* 0xB0 */
+    0xC2DF, 	 0, 0xF355, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 0xF9AC, 0xA8AE, 0xAAEE, 0xAD79, 0xAD78, 	 0, 0xB063, /* 0xC0 */
+         0, 0xD3E8, 0xB061, 0xD3E9, 0xB062, 	 0, 	 0, 0xD7DF, /* 0xD0 */
+    0xD7DB, 	 0, 	 0, 0xB36D, 0xD7DE, 0xD7DD, 0xD7DC, 0xB36E, /* 0xD0 */
+    0xD7E0, 0xD7E1, 	 0, 	 0, 	 0, 0xDC43, 0xDC41, 0xDC45, /* 0xE0 */
+    0xDC46, 0xDC4C, 	 0, 0xDC48, 0xDC4A, 	 0, 0xDC42, 0xDBFC, /* 0xE0 */
+         0, 0xDC49, 	 0, 	 0, 0xDC4B, 0xDC44, 0xDC47, 0xDBFD, /* 0xF0 */
+    0xB662, 0xDC40, 0xDBFE, 0xB661, 0xB663, 	 0, 0xB8FD, 0xE075	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_8F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE077, 0xE076, 0xE07B, 0xB8FB,      0, 0xE078, 0xE074, 0xE079, /* 0x00 */
-    0xE07A, 0xB8FC, 0xB8FE, 0xE07C,      0, 0xE467, 0xE466,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE077, 0xE076, 0xE07B, 0xB8FB, 	 0, 0xE078, 0xE074, 0xE079, /* 0x00 */
+    0xE07A, 0xB8FC, 0xB8FE, 0xE07C, 	 0, 0xE467, 0xE466, 	 0, /* 0x00 */
     0xE464, 0xE465, 0xBBB3, 0xBBB5, 0xBBB2, 0xBBB4, 0xE84D, 0xE84E, /* 0x10 */
-    0xE849,      0, 0xE84A, 0xBDF8, 0xBDFD, 0xBDF7, 0xBDFE, 0xBDF9, /* 0x10 */
-    0xE84B,      0,      0, 0xE84C, 0xE848, 0xBE40, 0xBDFB,      0, /* 0x20 */
-         0, 0xBDFA, 0xBDFC,      0, 0xE847,      0, 0xEBCA, 0xBFE8, /* 0x20 */
-         0,      0, 0xEBCC, 0xBFEA, 0xEBCF, 0xEBCB, 0xEBC9, 0xEBCE, /* 0x30 */
-    0xBFE9, 0xEBCD,      0, 0xBFE7,      0,      0, 0xC1D3, 0xC1D6, /* 0x30 */
-    0xEEC1,      0, 0xC1D4, 0xEEC0, 0xC1D2, 0xC1D5, 0xF146, 0xF147, /* 0x40 */
-    0xF148, 0xC2E0,      0, 0xF149,      0, 0xC2E1, 0xC3E2, 0xF358, /* 0x40 */
+    0xE849, 	 0, 0xE84A, 0xBDF8, 0xBDFD, 0xBDF7, 0xBDFE, 0xBDF9, /* 0x10 */
+    0xE84B, 	 0, 	 0, 0xE84C, 0xE848, 0xBE40, 0xBDFB, 	 0, /* 0x20 */
+         0, 0xBDFA, 0xBDFC, 	 0, 0xE847, 	 0, 0xEBCA, 0xBFE8, /* 0x20 */
+         0, 	 0, 0xEBCC, 0xBFEA, 0xEBCF, 0xEBCB, 0xEBC9, 0xEBCE, /* 0x30 */
+    0xBFE9, 0xEBCD, 	 0, 0xBFE7, 	 0, 	 0, 0xC1D3, 0xC1D6, /* 0x30 */
+    0xEEC1, 	 0, 0xC1D4, 0xEEC0, 0xC1D2, 0xC1D5, 0xF146, 0xF147, /* 0x40 */
+    0xF148, 0xC2E0, 	 0, 0xF149, 	 0, 0xC2E1, 0xC3E2, 0xF358, /* 0x40 */
     0xF359, 0xF357, 0xF356, 0xF35A, 0xC3E1, 0xF4DD, 0xF4DB, 0xF4DC, /* 0x50 */
-    0xF4DE, 0xF4DA, 0xF4DF, 0xF658,      0, 0xF659, 0xF657, 0xC546, /* 0x50 */
-    0xF764, 0xC5AF, 0xF765, 0xF848, 0xF847,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0, 0xA8AF, 0xB664,      0,      0, 0xB940, /* 0x90 */
-         0,      0,      0, 0xBBB6,      0,      0, 0xBFEC,      0, /* 0xA0 */
-    0xBFEB,      0,      0,      0,      0, 0xC3E3, 0xC47C, 0xC547, /* 0xA0 */
-    0xA8B0, 0xB064, 0xB941,      0, 0xF35B,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0, 0xCBA6, /* 0xB0 */
-         0,      0, 0xA8B1,      0, 0xA8B4, 0xA8B3, 0xA8B2,      0, /* 0xC0 */
-         0, 0xCBA5,      0, 0xCDCD,      0, 0xCDCF, 0xAAEF,      0, /* 0xC0 */
+    0xF4DE, 0xF4DA, 0xF4DF, 0xF658, 	 0, 0xF659, 0xF657, 0xC546, /* 0x50 */
+    0xF764, 0xC5AF, 0xF765, 0xF848, 0xF847, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 0xA8AF, 0xB664, 	 0, 	 0, 0xB940, /* 0x90 */
+         0, 	 0, 	 0, 0xBBB6, 	 0, 	 0, 0xBFEC, 	 0, /* 0xA0 */
+    0xBFEB, 	 0, 	 0, 	 0, 	 0, 0xC3E3, 0xC47C, 0xC547, /* 0xA0 */
+    0xA8B0, 0xB064, 0xB941, 	 0, 0xF35B, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xCBA6, /* 0xB0 */
+         0, 	 0, 0xA8B1, 	 0, 0xA8B4, 0xA8B3, 0xA8B2, 	 0, /* 0xC0 */
+         0, 0xCBA5, 	 0, 0xCDCD, 	 0, 0xCDCF, 0xAAEF, 	 0, /* 0xC0 */
          0, 0xAAF1, 0xCDCC, 0xCDCE, 0xAAF0, 0xCDD1, 0xCDD0, 0xCDD2, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xD0B6, 0xD0B4, 0xAD7C, 0xD0B3, 0xADA3, 0xAD7E, 0xAD7B,      0, /* 0xE0 */
-    0xADA4,      0, 0xAD7D, 0xADA2,      0, 0xADA1, 0xD0B5,      0, /* 0xE0 */
-    0xAD7A,      0,      0,      0, 0xB06A, 0xD3EB, 0xD3F1, 0xB067, /* 0xF0 */
-    0xB06E,      0, 0xB069, 0xD3EE, 0xD3F0, 0xB06C, 0xD3EA, 0xD3ED  /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xD0B6, 0xD0B4, 0xAD7C, 0xD0B3, 0xADA3, 0xAD7E, 0xAD7B, 	 0, /* 0xE0 */
+    0xADA4, 	 0, 0xAD7D, 0xADA2, 	 0, 0xADA1, 0xD0B5, 	 0, /* 0xE0 */
+    0xAD7A, 	 0, 	 0, 	 0, 0xB06A, 0xD3EB, 0xD3F1, 0xB067, /* 0xF0 */
+    0xB06E, 	 0, 0xB069, 0xD3EE, 0xD3F0, 0xB06C, 0xD3EA, 0xD3ED	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_90[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xB068, 0xB065, 0xD3EC, 0xB06B, 0xD3EF, 0xB06D, 0xB066,      0, /* 0x00 */
-         0,      0,      0, 0xD7E3, 0xD7E6, 0xB370,      0, 0xB37A, /* 0x00 */
-    0xB376, 0xD7E4,      0,      0, 0xB37E, 0xB377, 0xB37C, 0xB372, /* 0x10 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xB068, 0xB065, 0xD3EC, 0xB06B, 0xD3EF, 0xB06D, 0xB066, 	 0, /* 0x00 */
+         0, 	 0, 	 0, 0xD7E3, 0xD7E6, 0xB370, 	 0, 0xB37A, /* 0x00 */
+    0xB376, 0xD7E4, 	 0, 	 0, 0xB37E, 0xB377, 0xB37C, 0xB372, /* 0x10 */
          0, 0xB36F, 0xB371, 0xB37D, 0xD7E5, 0xB375, 0xB378, 0xB374, /* 0x10 */
-    0xB379, 0xD7E7, 0xB37B, 0xB373, 0xD7E2,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0, 0xDC4D, 0xB665, 0xDC4F, /* 0x20 */
-         0, 0xB667, 0xB669,      0, 0xDC4E, 0xB666, 0xB66A,      0, /* 0x30 */
-    0xB668,      0,      0,      0, 0xB947, 0xE0A3, 0xB94F, 0xE07E, /* 0x30 */
-         0, 0xB950, 0xB945,      0, 0xE0A1,      0,      0, 0xB94A, /* 0x40 */
-         0, 0xE0A2, 0xB943, 0xB942,      0, 0xB94D, 0xB94C, 0xB94B, /* 0x40 */
-    0xB949, 0xB94E, 0xE07D, 0xB944, 0xB946, 0xB948,      0,      0, /* 0x50 */
-    0xBBB8, 0xBBBB,      0, 0xBBBF, 0xBBB9, 0xBBBE, 0xBBBC,      0, /* 0x50 */
-    0xBBB7,      0, 0xBBBD, 0xBBBA,      0,      0,      0, 0xE852, /* 0x60 */
-    0xBE43, 0xBE41,      0, 0xE853,      0, 0xBE44, 0xBE42, 0xE851, /* 0x60 */
-    0xE850,      0, 0xBFF0, 0xE84F, 0xBFEE, 0xBFED, 0xEBD0, 0xBE45, /* 0x70 */
+    0xB379, 0xD7E7, 0xB37B, 0xB373, 0xD7E2, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xDC4D, 0xB665, 0xDC4F, /* 0x20 */
+         0, 0xB667, 0xB669, 	 0, 0xDC4E, 0xB666, 0xB66A, 	 0, /* 0x30 */
+    0xB668, 	 0, 	 0, 	 0, 0xB947, 0xE0A3, 0xB94F, 0xE07E, /* 0x30 */
+         0, 0xB950, 0xB945, 	 0, 0xE0A1, 	 0, 	 0, 0xB94A, /* 0x40 */
+         0, 0xE0A2, 0xB943, 0xB942, 	 0, 0xB94D, 0xB94C, 0xB94B, /* 0x40 */
+    0xB949, 0xB94E, 0xE07D, 0xB944, 0xB946, 0xB948, 	 0, 	 0, /* 0x50 */
+    0xBBB8, 0xBBBB, 	 0, 0xBBBF, 0xBBB9, 0xBBBE, 0xBBBC, 	 0, /* 0x50 */
+    0xBBB7, 	 0, 0xBBBD, 0xBBBA, 	 0, 	 0, 	 0, 0xE852, /* 0x60 */
+    0xBE43, 0xBE41, 	 0, 0xE853, 	 0, 0xBE44, 0xBE42, 0xE851, /* 0x60 */
+    0xE850, 	 0, 0xBFF0, 0xE84F, 0xBFEE, 0xBFED, 0xEBD0, 0xBE45, /* 0x70 */
     0xBFEF, 0xEBD1, 0xBFF2, 0xEBD2, 0xBFF1, 0xC1D8, 0xEEC3, 0xC1D7, /* 0x70 */
     0xC1DC, 0xC1DA, 0xC1DB, 0xC2E3, 0xC1D9, 0xEEC2, 0xEBD3, 0xC2E2, /* 0x80 */
-    0xC2E4,      0, 0xC3E4, 0xC3E5,      0, 0xF4E0,      0, 0xC5DE, /* 0x80 */
-    0xC5DD, 0xA8B6,      0,      0, 0xCA55, 0xB06F,      0, 0xCA52, /* 0x90 */
-    0xCA53, 0xCA51,      0, 0xCA54,      0,      0, 0xCBAA, 0xCBA7, /* 0x90 */
-    0xCBAC, 0xCBA8, 0xA8B7, 0xA8BA,      0, 0xCBA9, 0xA8B9, 0xCBAB, /* 0xA0 */
-         0,      0, 0xA8B8,      0,      0,      0,      0, 0xCDD5, /* 0xA0 */
-    0xCDD7, 0xAAF4, 0xCDD3, 0xCDD6, 0xCDD4, 0xAAF2, 0xAAF5,      0, /* 0xB0 */
-    0xAAF3,      0,      0,      0,      0, 0xD0B8, 0xD0BC, 0xD0B9, /* 0xB0 */
-         0, 0xADA7,      0, 0xADA8,      0, 0xD0BB,      0, 0xD0BD, /* 0xC0 */
-    0xD0BF,      0, 0xADA5, 0xD0BE,      0,      0, 0xADA6,      0, /* 0xC0 */
-         0,      0,      0,      0, 0xD7EE, 0xD0BA, 0xD3F2, 0xD3FB, /* 0xD0 */
-    0xD3F9, 0xD3F4, 0xD3F5, 0xD3FA, 0xD3FC, 0xB071,      0, 0xD3F7, /* 0xD0 */
-    0xD3F3, 0xB070, 0xB072, 0xD3F6, 0xD3FD, 0xD3F8,      0,      0, /* 0xE0 */
-    0xB3A1, 0xD7F1, 0xD7E9, 0xD7EF, 0xD7F0, 0xB3A2,      0, 0xD7E8, /* 0xE0 */
-    0xD7EA, 0xD0B7, 0xD7EC, 0xD7ED, 0xD7EB, 0xB66C,      0,      0, /* 0xF0 */
-         0, 0xDC56, 0xEBD4, 0xDC57, 0xDC54, 0xB3A3, 0xB66E, 0xDC53  /* 0xF0 */
+    0xC2E4, 	 0, 0xC3E4, 0xC3E5, 	 0, 0xF4E0, 	 0, 0xC5DE, /* 0x80 */
+    0xC5DD, 0xA8B6, 	 0, 	 0, 0xCA55, 0xB06F, 	 0, 0xCA52, /* 0x90 */
+    0xCA53, 0xCA51, 	 0, 0xCA54, 	 0, 	 0, 0xCBAA, 0xCBA7, /* 0x90 */
+    0xCBAC, 0xCBA8, 0xA8B7, 0xA8BA, 	 0, 0xCBA9, 0xA8B9, 0xCBAB, /* 0xA0 */
+         0, 	 0, 0xA8B8, 	 0, 	 0, 	 0, 	 0, 0xCDD5, /* 0xA0 */
+    0xCDD7, 0xAAF4, 0xCDD3, 0xCDD6, 0xCDD4, 0xAAF2, 0xAAF5, 	 0, /* 0xB0 */
+    0xAAF3, 	 0, 	 0, 	 0, 	 0, 0xD0B8, 0xD0BC, 0xD0B9, /* 0xB0 */
+         0, 0xADA7, 	 0, 0xADA8, 	 0, 0xD0BB, 	 0, 0xD0BD, /* 0xC0 */
+    0xD0BF, 	 0, 0xADA5, 0xD0BE, 	 0, 	 0, 0xADA6, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 0xD7EE, 0xD0BA, 0xD3F2, 0xD3FB, /* 0xD0 */
+    0xD3F9, 0xD3F4, 0xD3F5, 0xD3FA, 0xD3FC, 0xB071, 	 0, 0xD3F7, /* 0xD0 */
+    0xD3F3, 0xB070, 0xB072, 0xD3F6, 0xD3FD, 0xD3F8, 	 0, 	 0, /* 0xE0 */
+    0xB3A1, 0xD7F1, 0xD7E9, 0xD7EF, 0xD7F0, 0xB3A2, 	 0, 0xD7E8, /* 0xE0 */
+    0xD7EA, 0xD0B7, 0xD7EC, 0xD7ED, 0xD7EB, 0xB66C, 	 0, 	 0, /* 0xF0 */
+         0, 0xDC56, 0xEBD4, 0xDC57, 0xDC54, 0xB3A3, 0xB66E, 0xDC53	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_91[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xDC59, 0xDC58, 0xB66B, 0xDC5C, 0xDC52, 0xDC5B, 0xDC50, 0xDC5A, /* 0x00 */
-    0xDC55, 0xB66D,      0, 0xE0AA,      0, 0xE0A5, 0xE0AB, 0xE0A6, /* 0x00 */
-    0xE0A4, 0xE0A7, 0xB951,      0, 0xE0A9,      0, 0xE0A8, 0xB952, /* 0x10 */
+    0xDC55, 0xB66D, 	 0, 0xE0AA, 	 0, 0xE0A5, 0xE0AB, 0xE0A6, /* 0x00 */
+    0xE0A4, 0xE0A7, 0xB951, 	 0, 0xE0A9, 	 0, 0xE0A8, 0xB952, /* 0x10 */
     0xBBC1, 0xBBC0, 0xE46E, 0xE471, 0xE469, 0xE46D, 0xBBC2, 0xE46C, /* 0x10 */
-    0xE46A, 0xE470, 0xE46B, 0xE468, 0xE46F,      0, 0xE859, 0xBE48, /* 0x20 */
+    0xE46A, 0xE470, 0xE46B, 0xE468, 0xE46F, 	 0, 0xE859, 0xBE48, /* 0x20 */
     0xF14A, 0xE856, 0xE857, 0xE855, 0xDC51, 0xBE47, 0xE85A, 0xE854, /* 0x20 */
-    0xBE46, 0xBE49, 0xE858, 0xEBD5, 0xBFF3, 0xEBD6, 0xEBD7,      0, /* 0x30 */
-    0xEEC4, 0xC1DD, 0xF14B, 0xF14C,      0,      0, 0xF14D, 0xF35D, /* 0x30 */
-    0xF35C, 0xF4E2,      0, 0xF4E1, 0xF65B, 0xF65C, 0xF65A, 0xF766, /* 0x40 */
+    0xBE46, 0xBE49, 0xE858, 0xEBD5, 0xBFF3, 0xEBD6, 0xEBD7, 	 0, /* 0x30 */
+    0xEEC4, 0xC1DD, 0xF14B, 0xF14C, 	 0, 	 0, 0xF14D, 0xF35D, /* 0x30 */
+    0xF35C, 0xF4E2, 	 0, 0xF4E1, 0xF65B, 0xF65C, 0xF65A, 0xF766, /* 0x40 */
     0xC5B0, 0xA8BB, 0xADAA, 0xADA9, 0xB075, 0xB074, 0xD440, 0xD441, /* 0x40 */
-    0xD3FE,      0, 0xB073, 0xD7F5,      0, 0xD7F6, 0xD7F2, 0xB3A4, /* 0x50 */
-    0xD7F3,      0, 0xD7F4,      0,      0,      0,      0, 0xDC5F, /* 0x50 */
-    0xDC61, 0xDC5D, 0xDC60, 0xB66F, 0xDC5E, 0xB670,      0,      0, /* 0x60 */
-    0xDD73, 0xB955, 0xB954,      0, 0xB953,      0, 0xE0AC, 0xE0AD, /* 0x60 */
-         0,      0, 0xE473, 0xE475, 0xBBC6, 0xBBC3,      0, 0xBBC5, /* 0x70 */
-    0xBBC4, 0xE474, 0xE472,      0,      0,      0,      0,      0, /* 0x70 */
+    0xD3FE, 	 0, 0xB073, 0xD7F5, 	 0, 0xD7F6, 0xD7F2, 0xB3A4, /* 0x50 */
+    0xD7F3, 	 0, 0xD7F4, 	 0, 	 0, 	 0, 	 0, 0xDC5F, /* 0x50 */
+    0xDC61, 0xDC5D, 0xDC60, 0xB66F, 0xDC5E, 0xB670, 	 0, 	 0, /* 0x60 */
+    0xDD73, 0xB955, 0xB954, 	 0, 0xB953, 	 0, 0xE0AC, 0xE0AD, /* 0x60 */
+         0, 	 0, 0xE473, 0xE475, 0xBBC6, 0xBBC3, 	 0, 0xBBC5, /* 0x70 */
+    0xBBC4, 0xE474, 0xE472, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
     0xE861, 0xE85E, 0xE85F, 0xBE4D, 0xE860, 0xE85B, 0xE85C, 0xBE4A, /* 0x80 */
-         0, 0xBE4B, 0xE85D, 0xBE4C,      0, 0xEBDB,      0, 0xEBDC, /* 0x80 */
-    0xEBD9, 0xEBDA, 0xBFF4, 0xEBD8,      0,      0,      0,      0, /* 0x90 */
+         0, 0xBE4B, 0xE85D, 0xBE4C, 	 0, 0xEBDB, 	 0, 0xEBDC, /* 0x80 */
+    0xEBD9, 0xEBDA, 0xBFF4, 0xEBD8, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
          0, 0xEEC8, 0xEEC5, 0xEEC7, 0xC1E0, 0xEECB, 0xC1DF, 0xEEC9, /* 0x90 */
-    0xEECC, 0xEECA, 0xEEC6, 0xC1DE,      0, 0xF14F,      0, 0xF150, /* 0xA0 */
-    0xF14E,      0, 0xF152, 0xC2E5, 0xC2E6, 0xF35F, 0xC3E7, 0xF151, /* 0xA0 */
-    0xF35E, 0xC3E6, 0xF4E5, 0xF4E6, 0xC4BF, 0xF4E4,      0, 0xF4E3, /* 0xB0 */
-         0, 0xF65D, 0xC548,      0, 0xF849, 0xF8C8, 0xF8C7,      0, /* 0xB0 */
-    0xC643, 0xC65D, 0xF8C9, 0xF971,      0, 0xC66F, 0xA8BC, 0xAAF6, /* 0xC0 */
-         0, 0xB956,      0, 0xC4C0, 0xA8BD, 0xADAB, 0xB3A5, 0xB671, /* 0xC0 */
-    0xC2E7, 0xAAF7,      0, 0xD0C1, 0xD0C0, 0xD442,      0, 0xB078, /* 0xD0 */
-    0xB076, 0xB07A, 0xD444,      0, 0xB079, 0xB077,      0,      0, /* 0xD0 */
-         0,      0, 0xD443, 0xB3A8, 0xD7FC,      0, 0xB3A7, 0xB3A9, /* 0xE0 */
-    0xD842, 0xB3AB, 0xD7FE, 0xD840, 0xD7F7, 0xB3AA, 0xD843,      0, /* 0xE0 */
-         0, 0xD7F9,      0, 0xD7FA, 0xD7F8, 0xB3A6,      0, 0xD841, /* 0xF0 */
-    0xD7FB, 0xD7FD,      0,      0,      0, 0xDC6D,      0, 0xDC6C  /* 0xF0 */
+    0xEECC, 0xEECA, 0xEEC6, 0xC1DE, 	 0, 0xF14F, 	 0, 0xF150, /* 0xA0 */
+    0xF14E, 	 0, 0xF152, 0xC2E5, 0xC2E6, 0xF35F, 0xC3E7, 0xF151, /* 0xA0 */
+    0xF35E, 0xC3E6, 0xF4E5, 0xF4E6, 0xC4BF, 0xF4E4, 	 0, 0xF4E3, /* 0xB0 */
+         0, 0xF65D, 0xC548, 	 0, 0xF849, 0xF8C8, 0xF8C7, 	 0, /* 0xB0 */
+    0xC643, 0xC65D, 0xF8C9, 0xF971, 	 0, 0xC66F, 0xA8BC, 0xAAF6, /* 0xC0 */
+         0, 0xB956, 	 0, 0xC4C0, 0xA8BD, 0xADAB, 0xB3A5, 0xB671, /* 0xC0 */
+    0xC2E7, 0xAAF7, 	 0, 0xD0C1, 0xD0C0, 0xD442, 	 0, 0xB078, /* 0xD0 */
+    0xB076, 0xB07A, 0xD444, 	 0, 0xB079, 0xB077, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 0xD443, 0xB3A8, 0xD7FC, 	 0, 0xB3A7, 0xB3A9, /* 0xE0 */
+    0xD842, 0xB3AB, 0xD7FE, 0xD840, 0xD7F7, 0xB3AA, 0xD843, 	 0, /* 0xE0 */
+         0, 0xD7F9, 	 0, 0xD7FA, 0xD7F8, 0xB3A6, 	 0, 0xD841, /* 0xF0 */
+    0xD7FB, 0xD7FD, 	 0, 	 0, 	 0, 0xDC6D, 	 0, 0xDC6C	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_92[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xDC6A, 0xDC62, 0xDC71, 0xDC65, 0xDC6F, 0xDC76, 0xDC6E, 0xB679, /* 0x00 */
-         0, 0xB675, 0xDC63,      0, 0xDC69, 0xB677,      0, 0xDC68, /* 0x00 */
-    0xB678, 0xB67A, 0xDC6B,      0, 0xB672, 0xB673, 0xDC77, 0xDC75, /* 0x10 */
-         0, 0xDC74, 0xDC66,      0, 0xDC72,      0, 0xB676,      0, /* 0x10 */
-         0,      0,      0, 0xB674, 0xDC73, 0xDC64, 0xDC67, 0xDC70, /* 0x20 */
-         0,      0,      0,      0,      0, 0xE4BA, 0xE0B7,      0, /* 0x20 */
-    0xE0B0, 0xE0C3, 0xE0CC, 0xE0B3, 0xB961,      0, 0xE0C0, 0xB957, /* 0x30 */
-    0xB959, 0xB965, 0xE0B1,      0,      0, 0xB95A, 0xB95C, 0xB966, /* 0x30 */
-    0xB95B,      0,      0,      0,      0, 0xB964, 0xE0B9,      0, /* 0x40 */
+         0, 0xB675, 0xDC63, 	 0, 0xDC69, 0xB677, 	 0, 0xDC68, /* 0x00 */
+    0xB678, 0xB67A, 0xDC6B, 	 0, 0xB672, 0xB673, 0xDC77, 0xDC75, /* 0x10 */
+         0, 0xDC74, 0xDC66, 	 0, 0xDC72, 	 0, 0xB676, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 0xB674, 0xDC73, 0xDC64, 0xDC67, 0xDC70, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xE4BA, 0xE0B7, 	 0, /* 0x20 */
+    0xE0B0, 0xE0C3, 0xE0CC, 0xE0B3, 0xB961, 	 0, 0xE0C0, 0xB957, /* 0x30 */
+    0xB959, 0xB965, 0xE0B1, 	 0, 	 0, 0xB95A, 0xB95C, 0xB966, /* 0x30 */
+    0xB95B, 	 0, 	 0, 	 0, 	 0, 0xB964, 0xE0B9, 	 0, /* 0x40 */
     0xE0AE, 0xB962, 0xE0B8, 0xB95E, 0xE0CA, 0xB963, 0xE0C8, 0xE0BC, /* 0x40 */
-    0xE0C6, 0xB960, 0xE0AF, 0xE0C9, 0xE0C4,      0, 0xE0CB, 0xB958, /* 0x50 */
-         0,      0, 0xB967, 0xB95D,      0,      0, 0xE0B5,      0, /* 0x50 */
-    0xE0BD, 0xE0C1,      0, 0xE0C5, 0xB95F, 0xE0B4, 0xE0B2, 0xE0BE, /* 0x60 */
-         0,      0,      0,      0, 0xE0BB, 0xE0BA,      0, 0xE0BF, /* 0x60 */
-    0xE0C2,      0, 0xE0C7,      0,      0,      0, 0xE478,      0, /* 0x70 */
+    0xE0C6, 0xB960, 0xE0AF, 0xE0C9, 0xE0C4, 	 0, 0xE0CB, 0xB958, /* 0x50 */
+         0, 	 0, 0xB967, 0xB95D, 	 0, 	 0, 0xE0B5, 	 0, /* 0x50 */
+    0xE0BD, 0xE0C1, 	 0, 0xE0C5, 0xB95F, 0xE0B4, 0xE0B2, 0xE0BE, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 0xE0BB, 0xE0BA, 	 0, 0xE0BF, /* 0x60 */
+    0xE0C2, 	 0, 0xE0C7, 	 0, 	 0, 	 0, 0xE478, 	 0, /* 0x70 */
     0xBBC7, 0xE4A4, 0xE47A, 0xBBCC, 0xBBD0, 0xE4AD, 0xE4B5, 0xE4A6, /* 0x70 */
-    0xBBC8,      0, 0xE4AA, 0xE0B6,      0, 0xBBC9, 0xE4B1, 0xE4B6, /* 0x80 */
-    0xE4AE,      0, 0xE4B0, 0xE4B9, 0xE4B2, 0xE47E, 0xE4A9,      0, /* 0x80 */
-         0, 0xBBD1,      0, 0xBBCD, 0xE47C, 0xE4AB, 0xBBCB, 0xE4A5, /* 0x90 */
-    0xBBCA, 0xE4B3, 0xE4A2, 0xE479, 0xBBCE, 0xE4B8,      0,      0, /* 0x90 */
+    0xBBC8, 	 0, 0xE4AA, 0xE0B6, 	 0, 0xBBC9, 0xE4B1, 0xE4B6, /* 0x80 */
+    0xE4AE, 	 0, 0xE4B0, 0xE4B9, 0xE4B2, 0xE47E, 0xE4A9, 	 0, /* 0x80 */
+         0, 0xBBD1, 	 0, 0xBBCD, 0xE47C, 0xE4AB, 0xBBCB, 0xE4A5, /* 0x90 */
+    0xBBCA, 0xE4B3, 0xE4A2, 0xE479, 0xBBCE, 0xE4B8, 	 0, 	 0, /* 0x90 */
     0xE47B, 0xE4AF, 0xE4AC, 0xE4A7, 0xE477, 0xE476, 0xE4A1, 0xE4B4, /* 0xA0 */
-    0xBBCF, 0xE4B7, 0xE47D, 0xE4A3, 0xBE52,      0,      0,      0, /* 0xA0 */
-         0,      0, 0xBE5A, 0xBE55, 0xE8A4, 0xE8A1, 0xE867, 0xBE50, /* 0xB0 */
-         0, 0xF9D7,      0, 0xBE4F, 0xBE56,      0,      0,      0, /* 0xB0 */
+    0xBBCF, 0xE4B7, 0xE47D, 0xE4A3, 0xBE52, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 0xBE5A, 0xBE55, 0xE8A4, 0xE8A1, 0xE867, 0xBE50, /* 0xB0 */
+         0, 0xF9D7, 	 0, 0xBE4F, 0xBE56, 	 0, 	 0, 	 0, /* 0xB0 */
     0xE865, 0xBE54, 0xE871, 0xE863, 0xE864, 0xBE4E, 0xE8A3, 0xBE58, /* 0xC0 */
     0xE874, 0xE879, 0xE873, 0xEBEE, 0xE86F, 0xE877, 0xE875, 0xE868, /* 0xC0 */
-    0xE862, 0xE87D, 0xBE57, 0xE87E,      0, 0xE878,      0, 0xE86D, /* 0xD0 */
-    0xE86B, 0xE866,      0,      0,      0, 0xE86E, 0xE87B, 0xE86A, /* 0xD0 */
-    0xE87A, 0xE8A2,      0,      0, 0xBE53,      0, 0xE876, 0xE87C, /* 0xE0 */
-    0xE872, 0xE86C, 0xBE51,      0,      0,      0, 0xE4A8, 0xE870, /* 0xE0 */
-    0xBE59, 0xE869,      0,      0,      0,      0,      0, 0xEBF4, /* 0xF0 */
-    0xBFF7, 0xEBF3, 0xEBF0, 0xEC44, 0xBFFB,      0, 0xEC41, 0xEBF8  /* 0xF0 */
+    0xE862, 0xE87D, 0xBE57, 0xE87E, 	 0, 0xE878, 	 0, 0xE86D, /* 0xD0 */
+    0xE86B, 0xE866, 	 0, 	 0, 	 0, 0xE86E, 0xE87B, 0xE86A, /* 0xD0 */
+    0xE87A, 0xE8A2, 	 0, 	 0, 0xBE53, 	 0, 0xE876, 0xE87C, /* 0xE0 */
+    0xE872, 0xE86C, 0xBE51, 	 0, 	 0, 	 0, 0xE4A8, 0xE870, /* 0xE0 */
+    0xBE59, 0xE869, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEBF4, /* 0xF0 */
+    0xBFF7, 0xEBF3, 0xEBF0, 0xEC44, 0xBFFB, 	 0, 0xEC41, 0xEBF8	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_93[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xEC43, 0xEBE9, 0xEBF6,      0, 0xBFFD,      0, 0xEBE1,      0, /* 0x00 */
-    0xEBDF, 0xEC42,      0, 0xEC40, 0xEBFE, 0xEBED, 0xEBEC, 0xEBE2, /* 0x00 */
-    0xC040,      0, 0xEBE8, 0xEBF2, 0xEBFD, 0xC043, 0xEC45,      0, /* 0x10 */
-    0xC1E8, 0xC045, 0xBFFE, 0xEBE6,      0, 0xEBEF, 0xEBDE, 0xEBE0, /* 0x10 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xEC43, 0xEBE9, 0xEBF6, 	 0, 0xBFFD, 	 0, 0xEBE1, 	 0, /* 0x00 */
+    0xEBDF, 0xEC42, 	 0, 0xEC40, 0xEBFE, 0xEBED, 0xEBEC, 0xEBE2, /* 0x00 */
+    0xC040, 	 0, 0xEBE8, 0xEBF2, 0xEBFD, 0xC043, 0xEC45, 	 0, /* 0x10 */
+    0xC1E8, 0xC045, 0xBFFE, 0xEBE6, 	 0, 0xEBEF, 0xEBDE, 0xEBE0, /* 0x10 */
     0xBFF5, 0xC042, 0xBFFA, 0xEBE7, 0xEBF7, 0xEBF1, 0xC041, 0xEBDD, /* 0x20 */
-    0xC1E3, 0xEBF9, 0xEBFC, 0xBFFC,      0, 0xEBEB, 0xC044, 0xBFF9, /* 0x20 */
-         0,      0,      0, 0xBFF8, 0xEBF5, 0xEBFB, 0xBFF6,      0, /* 0x30 */
-    0xEBE4, 0xEBFA,      0,      0, 0xEBE5,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0, 0xEBEA, 0xEED2, /* 0x40 */
+    0xC1E3, 0xEBF9, 0xEBFC, 0xBFFC, 	 0, 0xEBEB, 0xC044, 0xBFF9, /* 0x20 */
+         0, 	 0, 	 0, 0xBFF8, 0xEBF5, 0xEBFB, 0xBFF6, 	 0, /* 0x30 */
+    0xEBE4, 0xEBFA, 	 0, 	 0, 0xEBE5, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEBEA, 0xEED2, /* 0x40 */
          0, 0xEED7, 0xC1E5, 0xC1E7, 0xEEDD, 0xC1E1, 0xEEEC, 0xEEE3, /* 0x40 */
-    0xEED8, 0xEED9, 0xEEE2,      0, 0xC1EE, 0xEEE1, 0xEED1, 0xEEE0, /* 0x50 */
-    0xEED4, 0xEEED, 0xC1ED, 0xC1EB, 0xEED5,      0, 0xEEE8,      0, /* 0x50 */
-    0xEEDA, 0xEEE7,      0, 0xEEE9, 0xEED0, 0xC1E6,      0, 0xEEEA, /* 0x60 */
-         0,      0, 0xEEDE,      0, 0xC1EA, 0xEEDB,      0,      0, /* 0x60 */
-    0xC1EC, 0xEEE4,      0,      0,      0, 0xC1E4, 0xEED6, 0xEEE5, /* 0x70 */
-         0, 0xEEDF, 0xEBE3, 0xEEE6, 0xEED3,      0, 0xC1E9,      0, /* 0x70 */
-    0xEEEB,      0, 0xC1E2, 0xEECE,      0,      0,      0,      0, /* 0x80 */
-    0xF160, 0xF159, 0xC2E9,      0, 0xF154, 0xF163, 0xF15B, 0xEEDC, /* 0x80 */
-         0, 0xF165, 0xF155,      0, 0xC2E8, 0xF15F, 0xC2EA, 0xC2F2, /* 0x90 */
-    0xC2F0, 0xF161, 0xC2F1, 0xF157,      0, 0xF158, 0xF15D, 0xF162, /* 0x90 */
+    0xEED8, 0xEED9, 0xEEE2, 	 0, 0xC1EE, 0xEEE1, 0xEED1, 0xEEE0, /* 0x50 */
+    0xEED4, 0xEEED, 0xC1ED, 0xC1EB, 0xEED5, 	 0, 0xEEE8, 	 0, /* 0x50 */
+    0xEEDA, 0xEEE7, 	 0, 0xEEE9, 0xEED0, 0xC1E6, 	 0, 0xEEEA, /* 0x60 */
+         0, 	 0, 0xEEDE, 	 0, 0xC1EA, 0xEEDB, 	 0, 	 0, /* 0x60 */
+    0xC1EC, 0xEEE4, 	 0, 	 0, 	 0, 0xC1E4, 0xEED6, 0xEEE5, /* 0x70 */
+         0, 0xEEDF, 0xEBE3, 0xEEE6, 0xEED3, 	 0, 0xC1E9, 	 0, /* 0x70 */
+    0xEEEB, 	 0, 0xC1E2, 0xEECE, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xF160, 0xF159, 0xC2E9, 	 0, 0xF154, 0xF163, 0xF15B, 0xEEDC, /* 0x80 */
+         0, 0xF165, 0xF155, 	 0, 0xC2E8, 0xF15F, 0xC2EA, 0xC2F2, /* 0x90 */
+    0xC2F0, 0xF161, 0xC2F1, 0xF157, 	 0, 0xF158, 0xF15D, 0xF162, /* 0x90 */
          0, 0xEECD, 0xC2EB, 0xF16A, 0xF167, 0xF16B, 0xF15E, 0xF15A, /* 0xA0 */
-    0xF168, 0xF36A, 0xF15C,      0, 0xC2EE,      0, 0xC2ED, 0xEECF, /* 0xA0 */
-    0xC2EF, 0xF164, 0xF166, 0xC2EC, 0xF169, 0xF153,      0, 0xF156, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-    0xF373,      0, 0xF363, 0xC3EB, 0xF371,      0,      0, 0xF361, /* 0xC0 */
-    0xC3EC,      0, 0xF36C,      0, 0xF368, 0xC3F1, 0xF372, 0xF362, /* 0xC0 */
-    0xF365, 0xC3E9, 0xF374,      0, 0xF36D, 0xF370, 0xC3EF, 0xC3F4, /* 0xD0 */
-    0xC3F2, 0xF369, 0xF364,      0, 0xC3ED, 0xC3EE, 0xF360, 0xC3EA, /* 0xD0 */
-         0, 0xC3E8, 0xC3F0, 0xF36F, 0xC3F3,      0, 0xF36B, 0xF375, /* 0xE0 */
-    0xC3F5,      0,      0,      0, 0xF367,      0, 0xF36E,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xF4F3, 0xF542, 0xF4F5, /* 0xF0 */
-    0xF4FC, 0xF366, 0xF4FA, 0xF4E9, 0xF540, 0xC4C3, 0xF4ED, 0xF4FE  /* 0xF0 */
+    0xF168, 0xF36A, 0xF15C, 	 0, 0xC2EE, 	 0, 0xC2ED, 0xEECF, /* 0xA0 */
+    0xC2EF, 0xF164, 0xF166, 0xC2EC, 0xF169, 0xF153, 	 0, 0xF156, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xF373, 	 0, 0xF363, 0xC3EB, 0xF371, 	 0, 	 0, 0xF361, /* 0xC0 */
+    0xC3EC, 	 0, 0xF36C, 	 0, 0xF368, 0xC3F1, 0xF372, 0xF362, /* 0xC0 */
+    0xF365, 0xC3E9, 0xF374, 	 0, 0xF36D, 0xF370, 0xC3EF, 0xC3F4, /* 0xD0 */
+    0xC3F2, 0xF369, 0xF364, 	 0, 0xC3ED, 0xC3EE, 0xF360, 0xC3EA, /* 0xD0 */
+         0, 0xC3E8, 0xC3F0, 0xF36F, 0xC3F3, 	 0, 0xF36B, 0xF375, /* 0xE0 */
+    0xC3F5, 	 0, 	 0, 	 0, 0xF367, 	 0, 0xF36E, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF4F3, 0xF542, 0xF4F5, /* 0xF0 */
+    0xF4FC, 0xF366, 0xF4FA, 0xF4E9, 0xF540, 0xC4C3, 0xF4ED, 0xF4FE	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_94[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF4F4,      0,      0, 0xC4C2,      0,      0, 0xF544, 0xF4F6, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF4F4, 	 0, 	 0, 0xC4C2, 	 0, 	 0, 0xF544, 0xF4F6, /* 0x00 */
          0, 0xF4FB, 0xF4FD, 0xF4E7, 0xF541, 0xF4F2, 0xF4F7, 0xF4EB, /* 0x00 */
-    0xF4EF, 0xF543, 0xF4F9, 0xF4E8, 0xF4EC, 0xF4EE, 0xF4F8,      0, /* 0x10 */
-    0xC4C1, 0xF4F1,      0,      0,      0,      0,      0,      0, /* 0x10 */
-    0xF4EA,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-    0xF4F0, 0xF661, 0xF666, 0xC54F, 0xF668,      0, 0xC549,      0, /* 0x20 */
-    0xF664, 0xF66A, 0xC54E, 0xC54A,      0, 0xC54B, 0xF660, 0xF667, /* 0x30 */
-    0xC54D, 0xF665, 0xC54C, 0xF65F, 0xF663, 0xF662,      0, 0xF65E, /* 0x30 */
-    0xF669,      0,      0,      0, 0xC5B1, 0xF76D, 0xF770, 0xF76C, /* 0x40 */
-    0xF76E, 0xF76F, 0xF769, 0xF76A, 0xF767,      0,      0, 0xF76B, /* 0x40 */
-    0xF768, 0xC5B2, 0xC5B3,      0,      0, 0xF84B,      0, 0xF84D, /* 0x50 */
-         0,      0,      0,      0,      0, 0xF84C, 0xF84E,      0, /* 0x50 */
-    0xC5E0,      0, 0xF84A, 0xC5DF, 0xC5E1,      0,      0,      0, /* 0x60 */
-    0xF8CB, 0xF8CC, 0xC644, 0xF8CA,      0, 0xF953, 0xF952, 0xF954, /* 0x60 */
+    0xF4EF, 0xF543, 0xF4F9, 0xF4E8, 0xF4EC, 0xF4EE, 0xF4F8, 	 0, /* 0x10 */
+    0xC4C1, 0xF4F1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x10 */
+    0xF4EA, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+    0xF4F0, 0xF661, 0xF666, 0xC54F, 0xF668, 	 0, 0xC549, 	 0, /* 0x20 */
+    0xF664, 0xF66A, 0xC54E, 0xC54A, 	 0, 0xC54B, 0xF660, 0xF667, /* 0x30 */
+    0xC54D, 0xF665, 0xC54C, 0xF65F, 0xF663, 0xF662, 	 0, 0xF65E, /* 0x30 */
+    0xF669, 	 0, 	 0, 	 0, 0xC5B1, 0xF76D, 0xF770, 0xF76C, /* 0x40 */
+    0xF76E, 0xF76F, 0xF769, 0xF76A, 0xF767, 	 0, 	 0, 0xF76B, /* 0x40 */
+    0xF768, 0xC5B2, 0xC5B3, 	 0, 	 0, 0xF84B, 	 0, 0xF84D, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF84C, 0xF84E, 	 0, /* 0x50 */
+    0xC5E0, 	 0, 0xF84A, 0xC5DF, 0xC5E1, 	 0, 	 0, 	 0, /* 0x60 */
+    0xF8CB, 0xF8CC, 0xC644, 0xF8CA, 	 0, 0xF953, 0xF952, 0xF954, /* 0x60 */
     0xC65F, 0xF955, 0xC65E, 0xF956, 0xF972, 0xF975, 0xF974, 0xC668, /* 0x70 */
-    0xF973,      0,      0,      0, 0xC672, 0xC670, 0xC671, 0xC677, /* 0x70 */
-    0xF9C0, 0xF9C1, 0xF9BF, 0xF9C9                                  /* 0x80 */
+    0xF973, 	 0, 	 0, 	 0, 0xC672, 0xC670, 0xC671, 0xC677, /* 0x70 */
+    0xF9C0, 0xF9C1, 0xF9BF, 0xF9C9									/* 0x80 */
                                                                     /* 0x80 */
 };
 
@@ -3230,23 +3230,23 @@ static sal_uInt16 const aImplUniToDBCSTab_BIG5_94[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_95[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                             0xAAF8, /* 0x70 */
-         0,      0, 0xD844, 0xDC78, 0xE8A5, 0xF376,      0,      0, /* 0x70 */
-    0xAAF9,      0, 0xADAC, 0xB07B,      0,      0, 0xD845,      0, /* 0x80 */
-    0xD846, 0xB3AC,      0, 0xB67D, 0xDC7A, 0xDC79, 0xB6A3, 0xB67C, /* 0x80 */
-    0xDC7B, 0xB67E, 0xB6A2, 0xB6A1, 0xB67B,      0,      0,      0, /* 0x90 */
-    0xB968,      0,      0, 0xE0D0, 0xE0CE,      0, 0xE0CF, 0xE0CD, /* 0x90 */
-         0, 0xBBD2,      0, 0xBBD5, 0xBBD7, 0xBBD6,      0,      0, /* 0xA0 */
-    0xBBD3, 0xBBD4,      0, 0xE8A7, 0xE8A6, 0xBE5B, 0xE8A8,      0, /* 0xA0 */
-    0xE8A9, 0xBE5C,      0,      0,      0, 0xEC4D, 0xEC4B, 0xEEF3, /* 0xB0 */
+         0, 	 0, 0xD844, 0xDC78, 0xE8A5, 0xF376, 	 0, 	 0, /* 0x70 */
+    0xAAF9, 	 0, 0xADAC, 0xB07B, 	 0, 	 0, 0xD845, 	 0, /* 0x80 */
+    0xD846, 0xB3AC, 	 0, 0xB67D, 0xDC7A, 0xDC79, 0xB6A3, 0xB67C, /* 0x80 */
+    0xDC7B, 0xB67E, 0xB6A2, 0xB6A1, 0xB67B, 	 0, 	 0, 	 0, /* 0x90 */
+    0xB968, 	 0, 	 0, 0xE0D0, 0xE0CE, 	 0, 0xE0CF, 0xE0CD, /* 0x90 */
+         0, 0xBBD2, 	 0, 0xBBD5, 0xBBD7, 0xBBD6, 	 0, 	 0, /* 0xA0 */
+    0xBBD3, 0xBBD4, 	 0, 0xE8A7, 0xE8A6, 0xBE5B, 0xE8A8, 	 0, /* 0xA0 */
+    0xE8A9, 0xBE5C, 	 0, 	 0, 	 0, 0xEC4D, 0xEC4B, 0xEEF3, /* 0xB0 */
          0, 0xEC49, 0xEC4A, 0xC046, 0xEC46, 0xEC4E, 0xEC48, 0xEC4C, /* 0xB0 */
-    0xEEEF,      0,      0, 0xEEF1,      0, 0xEEF2, 0xC1F3, 0xEEEE, /* 0xC0 */
-    0xC1F2, 0xEEF0, 0xC1EF, 0xC1F0, 0xC1F1, 0xEC47,      0,      0, /* 0xC0 */
-    0xC2F5, 0xF16E, 0xF16C, 0xF16D, 0xC2F3, 0xC2F6, 0xC2F4,      0, /* 0xD0 */
-         0,      0, 0xF377, 0xF378, 0xC3F6,      0, 0xF545, 0xF547, /* 0xD0 */
-    0xF546, 0xC4C4, 0xC550, 0xF66D, 0xF66C, 0xF66B                  /* 0xE0 */
+    0xEEEF, 	 0, 	 0, 0xEEF1, 	 0, 0xEEF2, 0xC1F3, 0xEEEE, /* 0xC0 */
+    0xC1F2, 0xEEF0, 0xC1EF, 0xC1F0, 0xC1F1, 0xEC47, 	 0, 	 0, /* 0xC0 */
+    0xC2F5, 0xF16E, 0xF16C, 0xF16D, 0xC2F3, 0xC2F6, 0xC2F4, 	 0, /* 0xD0 */
+         0, 	 0, 0xF377, 0xF378, 0xC3F6, 	 0, 0xF545, 0xF547, /* 0xD0 */
+    0xF546, 0xC4C4, 0xC550, 0xF66D, 0xF66C, 0xF66B					/* 0xE0 */
                                                                     /* 0xE0 */
 };
 
@@ -3254,387 +3254,387 @@ static sal_uInt16 const aImplUniToDBCSTab_BIG5_95[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_96[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x10 */
-                                    0xAAFA,      0, 0xC9AA,      0, /* 0x10 */
-    0xCA58, 0xA6E9, 0xCA56, 0xCA59, 0xCA57,      0,      0,      0, /* 0x20 */
-    0xCBAE,      0, 0xA8C1,      0, 0xA8C2, 0xCBB0, 0xA8BF, 0xCBAF, /* 0x20 */
-    0xCBAD, 0xA8C0, 0xA8BE,      0,      0,      0,      0,      0, /* 0x30 */
-         0, 0xCDD8, 0xCDDB, 0xAAFD, 0xCDDA, 0xCDD9,      0, 0xAAFC, /* 0x30 */
-    0xAAFB,      0, 0xAB40, 0xCDDC, 0xAAFE,      0,      0,      0, /* 0x40 */
-         0,      0, 0xD0C6, 0xADAE, 0xADAF, 0xADB0, 0xD0C7, 0xD0C3, /* 0x40 */
-    0xADAD, 0xD0C4,      0, 0xD0C5, 0xD0C2,      0,      0,      0, /* 0x50 */
-    0xB0A4,      0,      0, 0xB0A1, 0xD445, 0xB0A2, 0xB0A5, 0xD446, /* 0x50 */
-         0, 0xB07E, 0xB07C, 0xB07D, 0xB0A3,      0,      0,      0, /* 0x60 */
-         0,      0, 0xB3AD, 0xD849, 0xB3B5, 0xD848,      0, 0xD84B, /* 0x60 */
+                                    0xAAFA, 	 0, 0xC9AA, 	 0, /* 0x10 */
+    0xCA58, 0xA6E9, 0xCA56, 0xCA59, 0xCA57, 	 0, 	 0, 	 0, /* 0x20 */
+    0xCBAE, 	 0, 0xA8C1, 	 0, 0xA8C2, 0xCBB0, 0xA8BF, 0xCBAF, /* 0x20 */
+    0xCBAD, 0xA8C0, 0xA8BE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xCDD8, 0xCDDB, 0xAAFD, 0xCDDA, 0xCDD9, 	 0, 0xAAFC, /* 0x30 */
+    0xAAFB, 	 0, 0xAB40, 0xCDDC, 0xAAFE, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xD0C6, 0xADAE, 0xADAF, 0xADB0, 0xD0C7, 0xD0C3, /* 0x40 */
+    0xADAD, 0xD0C4, 	 0, 0xD0C5, 0xD0C2, 	 0, 	 0, 	 0, /* 0x50 */
+    0xB0A4, 	 0, 	 0, 0xB0A1, 0xD445, 0xB0A2, 0xB0A5, 0xD446, /* 0x50 */
+         0, 0xB07E, 0xB07C, 0xB07D, 0xB0A3, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 0xB3AD, 0xD849, 0xB3B5, 0xD848, 	 0, 0xD84B, /* 0x60 */
     0xB3B1, 0xD84A, 0xB6AB, 0xB3AF, 0xB3B2, 0xB3AE, 0xB3B3, 0xB3B4, /* 0x70 */
-    0xB3B0,      0,      0,      0, 0xD847, 0xB6A7, 0xDC7D,      0, /* 0x70 */
-    0xDCA3,      0,      0, 0xDCA2, 0xB6AC, 0xB6A8, 0xB6A9, 0xDC7C, /* 0x80 */
-    0xDC7E, 0xDCA1, 0xB6A4, 0xB6A6,      0, 0xB6AA, 0xB6A5,      0, /* 0x80 */
-         0, 0xE0D3, 0xE0D1, 0xE0D2, 0xB96A, 0xB96B,      0, 0xE0D4, /* 0x90 */
-    0xB969, 0xBBD8,      0, 0xBBDA, 0xBBD9,      0, 0xE4BB,      0, /* 0x90 */
-         0, 0xE4BC, 0xE8AB,      0, 0xE8AA,      0,      0, 0xC047, /* 0xA0 */
-    0xC048, 0xEC4F, 0xC049,      0, 0xEEF6,      0, 0xEEF4,      0, /* 0xA0 */
-    0xEEF5, 0xC1F4,      0, 0xF16F, 0xC3F7,      0,      0,      0, /* 0xB0 */
-    0xC1F5, 0xAB41,      0, 0xB0A6, 0xD447,      0,      0, 0xD84C, /* 0xB0 */
+    0xB3B0, 	 0, 	 0, 	 0, 0xD847, 0xB6A7, 0xDC7D, 	 0, /* 0x70 */
+    0xDCA3, 	 0, 	 0, 0xDCA2, 0xB6AC, 0xB6A8, 0xB6A9, 0xDC7C, /* 0x80 */
+    0xDC7E, 0xDCA1, 0xB6A4, 0xB6A6, 	 0, 0xB6AA, 0xB6A5, 	 0, /* 0x80 */
+         0, 0xE0D3, 0xE0D1, 0xE0D2, 0xB96A, 0xB96B, 	 0, 0xE0D4, /* 0x90 */
+    0xB969, 0xBBD8, 	 0, 0xBBDA, 0xBBD9, 	 0, 0xE4BB, 	 0, /* 0x90 */
+         0, 0xE4BC, 0xE8AB, 	 0, 0xE8AA, 	 0, 	 0, 0xC047, /* 0xA0 */
+    0xC048, 0xEC4F, 0xC049, 	 0, 0xEEF6, 	 0, 0xEEF4, 	 0, /* 0xA0 */
+    0xEEF5, 0xC1F4, 	 0, 0xF16F, 0xC3F7, 	 0, 	 0, 	 0, /* 0xB0 */
+    0xC1F5, 0xAB41, 	 0, 0xB0A6, 0xD447, 	 0, 	 0, 0xD84C, /* 0xB0 */
     0xB3B6, 0xB6AD, 0xDCA4, 0xDCA6, 0xB6AF, 0xB6AE, 0xB6B0, 0xB6B1, /* 0xC0 */
-    0xDCA5, 0xB96E, 0xB96F, 0xB96D, 0xBBDB, 0xB96C, 0xE0D5,      0, /* 0xC0 */
-         0,      0, 0xBBDC, 0xE8AC, 0xEC50, 0xC04A, 0xC1F6, 0xF170, /* 0xD0 */
+    0xDCA5, 0xB96E, 0xB96F, 0xB96D, 0xBBDB, 0xB96C, 0xE0D5, 	 0, /* 0xC0 */
+         0, 	 0, 0xBBDC, 0xE8AC, 0xEC50, 0xC04A, 0xC1F6, 0xF170, /* 0xD0 */
     0xF174, 0xC2F9, 0xF171, 0xC2FA, 0xC2F8, 0xF175, 0xC2FB, 0xF173, /* 0xD0 */
-         0, 0xF379, 0xC2F7, 0xC3F8,      0, 0xF8CD,      0,      0, /* 0xE0 */
-    0xAB42, 0xB3B8, 0xB3B7,      0,      0,      0,      0, 0xB6B2, /* 0xE0 */
-    0xDCA8, 0xDCA7, 0xB6B3,      0,      0, 0xE0D9, 0xB973, 0xB970, /* 0xF0 */
-    0xE0D8, 0xB972, 0xE0D6, 0xB971,      0, 0xE0D7,      0, 0xE4BD  /* 0xF0 */
+         0, 0xF379, 0xC2F7, 0xC3F8, 	 0, 0xF8CD, 	 0, 	 0, /* 0xE0 */
+    0xAB42, 0xB3B8, 0xB3B7, 	 0, 	 0, 	 0, 	 0, 0xB6B2, /* 0xE0 */
+    0xDCA8, 0xDCA7, 0xB6B3, 	 0, 	 0, 0xE0D9, 0xB973, 0xB970, /* 0xF0 */
+    0xE0D8, 0xB972, 0xE0D6, 0xB971, 	 0, 0xE0D7, 	 0, 0xE4BD	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_97[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xBBDD,      0, 0xE8AF,      0, 0xBE5D, 0xE8AD, 0xBE5E, 0xBE5F, /* 0x00 */
-    0xE8AE, 0xBE60,      0, 0xEC51,      0, 0xC04E, 0xC04B, 0xC050, /* 0x00 */
-    0xEC53, 0xC04C, 0xEC52, 0xC04F,      0,      0, 0xC04D,      0, /* 0x10 */
-    0xEEF9, 0xEEFB,      0,      0, 0xC1F7, 0xEEFA, 0xC1F8, 0xEEF8, /* 0x10 */
-    0xEEF7,      0, 0xF177, 0xF176, 0xC2FC, 0xF178, 0xF37E, 0xC3FA, /* 0x20 */
-    0xF37D, 0xF37A, 0xC3F9, 0xF37B, 0xF37C,      0, 0xF548, 0xF549, /* 0x20 */
-    0xC4C5,      0, 0xC553,      0,      0, 0xF66E,      0,      0, /* 0x30 */
-    0xC551, 0xC552, 0xF66F,      0,      0, 0xC5B4, 0xC5B5, 0xF771, /* 0x30 */
-         0,      0, 0xC645, 0xF8CF, 0xC647,      0, 0xF8CE, 0xF8D0, /* 0x40 */
-    0xC646, 0xF957,      0, 0xF9AD,      0,      0,      0,      0, /* 0x40 */
-         0,      0, 0xAB43,      0,      0,      0, 0xB974,      0, /* 0x50 */
-    0xE4BE,      0, 0xE8B0, 0xC051, 0xC052,      0, 0xAB44,      0, /* 0x50 */
-    0xBE61, 0xC3FB, 0xADB1,      0,      0,      0, 0xC053,      0, /* 0x60 */
-    0xC5E2, 0xADB2, 0xD84D,      0, 0xDCA9,      0, 0xDCAB,      0, /* 0x60 */
-    0xDCAA,      0, 0xE0DD, 0xE0DA, 0xB975,      0, 0xB976, 0xE0DB, /* 0x70 */
-    0xE0DC,      0, 0xE4C0, 0xE4C5, 0xBBDE, 0xE4BF, 0xE4C1, 0xE4C8, /* 0x70 */
-    0xE4C3, 0xE4C7, 0xE4C4, 0xE4C2, 0xE4C6, 0xBBDF,      0,      0, /* 0x80 */
-    0xE8B3,      0, 0xE8B1, 0xBE63,      0, 0xBE62, 0xE8B2, 0xBE64, /* 0x80 */
-         0,      0,      0,      0, 0xEC56,      0,      0, 0xEC55, /* 0x90 */
-    0xC054, 0xEC54, 0xEEFC,      0, 0xEEFE, 0xEF41, 0xEF40,      0, /* 0x90 */
-    0xC1F9, 0xEEFD, 0xF1A1, 0xC2FD, 0xF17D, 0xF1A2, 0xC2FE,      0, /* 0xA0 */
-    0xF17B,      0, 0xF17E, 0xF17C, 0xF179, 0xC340, 0xF17A,      0, /* 0xA0 */
-         0,      0,      0, 0xF3A1,      0,      0, 0xF3A3, 0xF3A2, /* 0xB0 */
-         0, 0xF54A,      0, 0xF54B,      0,      0,      0, 0xF670, /* 0xB0 */
-         0, 0xC5B7,      0, 0xC5B6, 0xF84F, 0xF850, 0xC648, 0xF8D1, /* 0xC0 */
-         0, 0xC669,      0, 0xADB3, 0xB6B4, 0xE4CA, 0xE4C9, 0xE8B5, /* 0xC0 */
-    0xE8B4,      0,      0, 0xC1FA, 0xEF43, 0xEF42, 0xF1A5, 0xF1A3, /* 0xD0 */
-    0xF1A6, 0xF1A4,      0,      0, 0xC3FC, 0xF3A4, 0xF3A5, 0xF3A6, /* 0xD0 */
-         0, 0xF671,      0, 0xF772,      0, 0xF8D2,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0, 0xADB4,      0,      0, /* 0xE0 */
-    0xEC57, 0xEF44,      0, 0xADB5,      0,      0, 0xBBE0,      0, /* 0xF0 */
-    0xEC58, 0xC341, 0xF1A7, 0xC3FD,      0, 0xF54C, 0xF54D, 0xC554  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xBBDD, 	 0, 0xE8AF, 	 0, 0xBE5D, 0xE8AD, 0xBE5E, 0xBE5F, /* 0x00 */
+    0xE8AE, 0xBE60, 	 0, 0xEC51, 	 0, 0xC04E, 0xC04B, 0xC050, /* 0x00 */
+    0xEC53, 0xC04C, 0xEC52, 0xC04F, 	 0, 	 0, 0xC04D, 	 0, /* 0x10 */
+    0xEEF9, 0xEEFB, 	 0, 	 0, 0xC1F7, 0xEEFA, 0xC1F8, 0xEEF8, /* 0x10 */
+    0xEEF7, 	 0, 0xF177, 0xF176, 0xC2FC, 0xF178, 0xF37E, 0xC3FA, /* 0x20 */
+    0xF37D, 0xF37A, 0xC3F9, 0xF37B, 0xF37C, 	 0, 0xF548, 0xF549, /* 0x20 */
+    0xC4C5, 	 0, 0xC553, 	 0, 	 0, 0xF66E, 	 0, 	 0, /* 0x30 */
+    0xC551, 0xC552, 0xF66F, 	 0, 	 0, 0xC5B4, 0xC5B5, 0xF771, /* 0x30 */
+         0, 	 0, 0xC645, 0xF8CF, 0xC647, 	 0, 0xF8CE, 0xF8D0, /* 0x40 */
+    0xC646, 0xF957, 	 0, 0xF9AD, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xAB43, 	 0, 	 0, 	 0, 0xB974, 	 0, /* 0x50 */
+    0xE4BE, 	 0, 0xE8B0, 0xC051, 0xC052, 	 0, 0xAB44, 	 0, /* 0x50 */
+    0xBE61, 0xC3FB, 0xADB1, 	 0, 	 0, 	 0, 0xC053, 	 0, /* 0x60 */
+    0xC5E2, 0xADB2, 0xD84D, 	 0, 0xDCA9, 	 0, 0xDCAB, 	 0, /* 0x60 */
+    0xDCAA, 	 0, 0xE0DD, 0xE0DA, 0xB975, 	 0, 0xB976, 0xE0DB, /* 0x70 */
+    0xE0DC, 	 0, 0xE4C0, 0xE4C5, 0xBBDE, 0xE4BF, 0xE4C1, 0xE4C8, /* 0x70 */
+    0xE4C3, 0xE4C7, 0xE4C4, 0xE4C2, 0xE4C6, 0xBBDF, 	 0, 	 0, /* 0x80 */
+    0xE8B3, 	 0, 0xE8B1, 0xBE63, 	 0, 0xBE62, 0xE8B2, 0xBE64, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 0xEC56, 	 0, 	 0, 0xEC55, /* 0x90 */
+    0xC054, 0xEC54, 0xEEFC, 	 0, 0xEEFE, 0xEF41, 0xEF40, 	 0, /* 0x90 */
+    0xC1F9, 0xEEFD, 0xF1A1, 0xC2FD, 0xF17D, 0xF1A2, 0xC2FE, 	 0, /* 0xA0 */
+    0xF17B, 	 0, 0xF17E, 0xF17C, 0xF179, 0xC340, 0xF17A, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 0xF3A1, 	 0, 	 0, 0xF3A3, 0xF3A2, /* 0xB0 */
+         0, 0xF54A, 	 0, 0xF54B, 	 0, 	 0, 	 0, 0xF670, /* 0xB0 */
+         0, 0xC5B7, 	 0, 0xC5B6, 0xF84F, 0xF850, 0xC648, 0xF8D1, /* 0xC0 */
+         0, 0xC669, 	 0, 0xADB3, 0xB6B4, 0xE4CA, 0xE4C9, 0xE8B5, /* 0xC0 */
+    0xE8B4, 	 0, 	 0, 0xC1FA, 0xEF43, 0xEF42, 0xF1A5, 0xF1A3, /* 0xD0 */
+    0xF1A6, 0xF1A4, 	 0, 	 0, 0xC3FC, 0xF3A4, 0xF3A5, 0xF3A6, /* 0xD0 */
+         0, 0xF671, 	 0, 0xF772, 	 0, 0xF8D2, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xADB4, 	 0, 	 0, /* 0xE0 */
+    0xEC57, 0xEF44, 	 0, 0xADB5, 	 0, 	 0, 0xBBE0, 	 0, /* 0xF0 */
+    0xEC58, 0xC341, 0xF1A7, 0xC3FD, 	 0, 0xF54C, 0xF54D, 0xC554	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_98[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xF851, 0xADB6, 0xB3BB, 0xB3BC, 0xD84E, 0xB6B5, 0xB6B6, 0xDCAC, /* 0x00 */
-    0xB6B7,      0, 0xB97A,      0, 0xB97C, 0xE0DF, 0xE0E0, 0xE0DE, /* 0x00 */
-    0xB977, 0xB978, 0xB97B, 0xB979,      0,      0, 0xE4CB, 0xBBE1, /* 0x10 */
-    0xBBE2,      0,      0, 0xE8BC, 0xBE67, 0xE8B7, 0xE8B6,      0, /* 0x10 */
-    0xE8BB, 0xBE65,      0,      0, 0xC05B,      0, 0xE8B8, 0xE8BD, /* 0x20 */
-    0xE8BA, 0xE8B9,      0, 0xBE66,      0, 0xC059,      0, 0xEC5A, /* 0x20 */
-    0xC055,      0, 0xEC5B,      0,      0, 0xEC59,      0, 0xC058, /* 0x30 */
-    0xC056, 0xC05A,      0, 0xC057,      0,      0,      0,      0, /* 0x30 */
-         0, 0xEF45,      0, 0xEF4A, 0xEF46, 0xEF49, 0xC1FB,      0, /* 0x40 */
-    0xEDD4, 0xEF48, 0xEF47,      0, 0xC344, 0xC342, 0xC345, 0xC343, /* 0x40 */
-    0xF1A8, 0xF1A9, 0xF1AA, 0xC346,      0,      0,      0, 0xF3AA, /* 0x50 */
-    0xC440, 0xF3A8,      0, 0xC441, 0xF3A7, 0xF3A9, 0xC3FE, 0xF551, /* 0x50 */
-    0xF54E,      0, 0xF54F, 0xF550, 0xF672, 0xC556,      0, 0xC555, /* 0x60 */
-         0, 0xF774, 0xF773, 0xC5B8,      0,      0,      0, 0xC5E3, /* 0x60 */
-    0xC649, 0xC660, 0xF958, 0xF9AE, 0xF9AF,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xADB7, 0xDCAD,      0,      0, 0xE0E1, 0xE4CC, 0xE4CD, 0xBBE3, /* 0xA0 */
-         0, 0xBBE4, 0xE8BE, 0xBE68,      0,      0, 0xC1FC,      0, /* 0xB0 */
-    0xF1AB,      0, 0xC347, 0xF3AD, 0xC442, 0xF3AC, 0xF3AE, 0xF3AB, /* 0xB0 */
-    0xF675, 0xF552, 0xF553,      0, 0xC4C6,      0, 0xF674,      0, /* 0xC0 */
-         0, 0xF673,      0, 0xF775, 0xF9B0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0, 0xADB8,      0,      0,      0, 0xADB9, /* 0xD0 */
-         0,      0, 0xB0A7, 0xD448,      0, 0xD84F,      0, 0xB6B8, /* 0xE0 */
-         0, 0xB6BB, 0xB6B9, 0xDCAE,      0, 0xB6BD,      0, 0xB6BA, /* 0xE0 */
-         0,      0, 0xB6BC,      0, 0xB97E,      0, 0xE0E2,      0, /* 0xF0 */
-         0, 0xE0E3, 0xE8C0,      0, 0xB97D, 0xB9A1, 0xB9A2          /* 0xF0 */
+    0xB6B7, 	 0, 0xB97A, 	 0, 0xB97C, 0xE0DF, 0xE0E0, 0xE0DE, /* 0x00 */
+    0xB977, 0xB978, 0xB97B, 0xB979, 	 0, 	 0, 0xE4CB, 0xBBE1, /* 0x10 */
+    0xBBE2, 	 0, 	 0, 0xE8BC, 0xBE67, 0xE8B7, 0xE8B6, 	 0, /* 0x10 */
+    0xE8BB, 0xBE65, 	 0, 	 0, 0xC05B, 	 0, 0xE8B8, 0xE8BD, /* 0x20 */
+    0xE8BA, 0xE8B9, 	 0, 0xBE66, 	 0, 0xC059, 	 0, 0xEC5A, /* 0x20 */
+    0xC055, 	 0, 0xEC5B, 	 0, 	 0, 0xEC59, 	 0, 0xC058, /* 0x30 */
+    0xC056, 0xC05A, 	 0, 0xC057, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 0xEF45, 	 0, 0xEF4A, 0xEF46, 0xEF49, 0xC1FB, 	 0, /* 0x40 */
+    0xEDD4, 0xEF48, 0xEF47, 	 0, 0xC344, 0xC342, 0xC345, 0xC343, /* 0x40 */
+    0xF1A8, 0xF1A9, 0xF1AA, 0xC346, 	 0, 	 0, 	 0, 0xF3AA, /* 0x50 */
+    0xC440, 0xF3A8, 	 0, 0xC441, 0xF3A7, 0xF3A9, 0xC3FE, 0xF551, /* 0x50 */
+    0xF54E, 	 0, 0xF54F, 0xF550, 0xF672, 0xC556, 	 0, 0xC555, /* 0x60 */
+         0, 0xF774, 0xF773, 0xC5B8, 	 0, 	 0, 	 0, 0xC5E3, /* 0x60 */
+    0xC649, 0xC660, 0xF958, 0xF9AE, 0xF9AF, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xADB7, 0xDCAD, 	 0, 	 0, 0xE0E1, 0xE4CC, 0xE4CD, 0xBBE3, /* 0xA0 */
+         0, 0xBBE4, 0xE8BE, 0xBE68, 	 0, 	 0, 0xC1FC, 	 0, /* 0xB0 */
+    0xF1AB, 	 0, 0xC347, 0xF3AD, 0xC442, 0xF3AC, 0xF3AE, 0xF3AB, /* 0xB0 */
+    0xF675, 0xF552, 0xF553, 	 0, 0xC4C6, 	 0, 0xF674, 	 0, /* 0xC0 */
+         0, 0xF673, 	 0, 0xF775, 0xF9B0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 0xADB8, 	 0, 	 0, 	 0, 0xADB9, /* 0xD0 */
+         0, 	 0, 0xB0A7, 0xD448, 	 0, 0xD84F, 	 0, 0xB6B8, /* 0xE0 */
+         0, 0xB6BB, 0xB6B9, 0xDCAE, 	 0, 0xB6BD, 	 0, 0xB6BA, /* 0xE0 */
+         0, 	 0, 0xB6BC, 	 0, 0xB97E, 	 0, 0xE0E2, 	 0, /* 0xF0 */
+         0, 0xE0E3, 0xE8C0, 	 0, 0xB97D, 0xB9A1, 0xB9A2			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_99[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE4CF,      0, 0xE4CE, 0xBBE5,      0, 0xBBE6,      0, 0xE4D0, /* 0x00 */
-    0xE8BF, 0xBBE8, 0xBE69,      0, 0xBBE7,      0,      0,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE4CF, 	 0, 0xE4CE, 0xBBE5, 	 0, 0xBBE6, 	 0, 0xE4D0, /* 0x00 */
+    0xE8BF, 0xBBE8, 0xBE69, 	 0, 0xBBE7, 	 0, 	 0, 	 0, /* 0x00 */
     0xC05C, 0xE8C1, 0xBE6B, 0xBE6A, 0xE8C2, 0xE8C5, 0xE8C3, 0xE8C4, /* 0x10 */
-    0xBE6C,      0, 0xC061, 0xC05F,      0,      0, 0xC05E, 0xEC5D, /* 0x10 */
-         0, 0xC060,      0,      0, 0xEC5C, 0xEF4B,      0, 0xEC5E, /* 0x20 */
+    0xBE6C, 	 0, 0xC061, 0xC05F, 	 0, 	 0, 0xC05E, 0xEC5D, /* 0x10 */
+         0, 0xC060, 	 0, 	 0, 0xEC5C, 0xEF4B, 	 0, 0xEC5E, /* 0x20 */
     0xC05D, 0xEC5F, 0xEF4E, 0xEF4C, 0xEF4D, 0xEF52, 0xC34B, 0xEF51, /* 0x20 */
-    0xEF54, 0xEF53, 0xEF50, 0xEF4F,      0, 0xC1FD,      0,      0, /* 0x30 */
-         0,      0, 0xF1AE,      0, 0xF1AD, 0xC34A, 0xC348, 0xC349, /* 0x30 */
-         0, 0xF1AC,      0, 0xF3B1,      0, 0xC443,      0, 0xF3B0, /* 0x40 */
-    0xF3AF, 0xC444,      0, 0xF558, 0xF557,      0, 0xF555,      0, /* 0x40 */
+    0xEF54, 0xEF53, 0xEF50, 0xEF4F, 	 0, 0xC1FD, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 0xF1AE, 	 0, 0xF1AD, 0xC34A, 0xC348, 0xC349, /* 0x30 */
+         0, 0xF1AC, 	 0, 0xF3B1, 	 0, 0xC443, 	 0, 0xF3B0, /* 0x40 */
+    0xF3AF, 0xC444, 	 0, 0xF558, 0xF557, 	 0, 0xF555, 	 0, /* 0x40 */
     0xF554, 0xC4C8, 0xC4C7, 0xF559, 0xF776, 0xC5B9, 0xF677, 0xC557, /* 0x50 */
-    0xF676, 0xF556,      0, 0xF777, 0xC5E4,      0, 0xC661, 0xF959, /* 0x50 */
-         0, 0xF9B1,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0, 0xADBA, 0xD850, /* 0x90 */
-    0xEF55, 0xADBB,      0,      0, 0xE4D2, 0xE4D1, 0xEC60,      0, /* 0x90 */
-         0, 0xEF57,      0, 0xEF56,      0, 0xC34C, 0xF3B2, 0xF3B3, /* 0xA0 */
-    0xC4C9,      0,      0, 0xF9B2, 0xB0A8, 0xB6BF, 0xB6BE, 0xE0E4, /* 0xA0 */
-    0xE0E6, 0xB9A4, 0xE0E5, 0xB9A3, 0xB9A5, 0xE0E7,      0,      0, /* 0xB0 */
-         0, 0xE4D4, 0xE4D6, 0xE4D5,      0, 0xE4D8,      0,      0, /* 0xB0 */
-         0, 0xBBE9, 0xE4D7, 0xE4D3,      0,      0,      0, 0xE4D9, /* 0xC0 */
-         0, 0xE8CC,      0, 0xE8CF, 0xE8D1, 0xE8C7, 0xE8CB, 0xE8C8, /* 0xC0 */
+    0xF676, 0xF556, 	 0, 0xF777, 0xC5E4, 	 0, 0xC661, 0xF959, /* 0x50 */
+         0, 0xF9B1, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xADBA, 0xD850, /* 0x90 */
+    0xEF55, 0xADBB, 	 0, 	 0, 0xE4D2, 0xE4D1, 0xEC60, 	 0, /* 0x90 */
+         0, 0xEF57, 	 0, 0xEF56, 	 0, 0xC34C, 0xF3B2, 0xF3B3, /* 0xA0 */
+    0xC4C9, 	 0, 	 0, 0xF9B2, 0xB0A8, 0xB6BF, 0xB6BE, 0xE0E4, /* 0xA0 */
+    0xE0E6, 0xB9A4, 0xE0E5, 0xB9A3, 0xB9A5, 0xE0E7, 	 0, 	 0, /* 0xB0 */
+         0, 0xE4D4, 0xE4D6, 0xE4D5, 	 0, 0xE4D8, 	 0, 	 0, /* 0xB0 */
+         0, 0xBBE9, 0xE4D7, 0xE4D3, 	 0, 	 0, 	 0, 0xE4D9, /* 0xC0 */
+         0, 0xE8CC, 	 0, 0xE8CF, 0xE8D1, 0xE8C7, 0xE8CB, 0xE8C8, /* 0xC0 */
     0xBE6E, 0xBE71, 0xBE73, 0xE8C9, 0xE8CA, 0xBE72, 0xE8CD, 0xE8D0, /* 0xD0 */
-    0xE8CE, 0xBE74,      0, 0xBE70, 0xE8C6, 0xBE6D,      0, 0xBE6F, /* 0xD0 */
-         0,      0, 0xC063, 0xEC66, 0xEC64, 0xEC63,      0, 0xEC69, /* 0xE0 */
-         0, 0xEC68, 0xEC67,      0, 0xEC62, 0xC062, 0xEC61,      0, /* 0xE0 */
-    0xEC65, 0xC064,      0,      0, 0xEF5A,      0, 0xEF5E, 0xEF5B, /* 0xF0 */
-    0xEF5D, 0xEF5C, 0xEF59, 0xEF5F, 0xEF62, 0xEF60, 0xEF61, 0xC240  /* 0xF0 */
+    0xE8CE, 0xBE74, 	 0, 0xBE70, 0xE8C6, 0xBE6D, 	 0, 0xBE6F, /* 0xD0 */
+         0, 	 0, 0xC063, 0xEC66, 0xEC64, 0xEC63, 	 0, 0xEC69, /* 0xE0 */
+         0, 0xEC68, 0xEC67, 	 0, 0xEC62, 0xC062, 0xEC61, 	 0, /* 0xE0 */
+    0xEC65, 0xC064, 	 0, 	 0, 0xEF5A, 	 0, 0xEF5E, 0xEF5B, /* 0xF0 */
+    0xEF5D, 0xEF5C, 0xEF59, 0xEF5F, 0xEF62, 0xEF60, 0xEF61, 0xC240	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_9A[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
             0xC1FE, 0xEF58, 0xEF63, 0xF1B3, 0xF1B6, 0xF1B8, 0xF1B7, /* 0x00 */
-         0, 0xF1B1, 0xF1B5, 0xF1B0,      0, 0xF1B2, 0xC34D, 0xF1AF, /* 0x00 */
-         0, 0xF1B4,      0,      0, 0xF3C0, 0xF3B5, 0xC445,      0, /* 0x10 */
-         0, 0xC446, 0xF3B4, 0xF3B9, 0xF3BF, 0xF3B7, 0xF3BE,      0, /* 0x10 */
-    0xF3BB,      0, 0xF3BA, 0xF3BD, 0xF3B8, 0xF3B6,      0, 0xF3BC, /* 0x20 */
-         0, 0xF560, 0xF55E, 0xC4CA, 0xF55D, 0xF563, 0xF561,      0, /* 0x20 */
-    0xC4CB, 0xF55C, 0xF55A,      0, 0xF55B, 0xC4CD, 0xF55F, 0xC4CC, /* 0x30 */
-    0xF562, 0xF678, 0xF67E,      0,      0, 0xF679, 0xC55B, 0xF6A1, /* 0x30 */
-    0xC55A, 0xF67D, 0xF67C, 0xC559, 0xF67B, 0xC558, 0xF67A,      0, /* 0x40 */
-    0xF77D, 0xF7A1, 0xF77E,      0, 0xF77B, 0xC5BB, 0xF778, 0xF77C, /* 0x40 */
-    0xF7A3,      0, 0xF7A2, 0xF779, 0xF77A, 0xC5BA, 0xF852, 0xC5E7, /* 0x50 */
-         0, 0xF853, 0xC5E5, 0xC5E6,      0,      0, 0xF8D3, 0xC64A, /* 0x50 */
-    0xF976,      0, 0xC66A,      0, 0xF9B3, 0xC66B, 0xF9B4, 0xF9B5, /* 0x60 */
-    0xF9C3, 0xF9C2, 0xC67A, 0xF9CD,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-    0xB0A9,      0,      0, 0xE0E9,      0, 0xE0E8,      0, 0xBBEA, /* 0xA0 */
-    0xBBEB, 0xE4DA,      0, 0xE8D2, 0xEC6C,      0,      0, 0xBE75, /* 0xB0 */
-    0xC065, 0xEC6A,      0, 0xEC6D, 0xC066,      0, 0xEF64, 0xEC6B, /* 0xB0 */
-    0xF1B9, 0xC34E, 0xF3C1,      0,      0,      0, 0xF566, 0xF564, /* 0xC0 */
-         0,      0, 0xF565,      0,      0, 0xF6A2,      0, 0xC55C, /* 0xC0 */
-    0xF7A4, 0xC5EA, 0xC5BC, 0xC5E8, 0xC5E9, 0xF8D4, 0xC662,      0, /* 0xD0 */
-    0xB0AA,      0,      0,      0, 0xF1BA,      0,      0, 0xD449, /* 0xD0 */
-         0, 0xB9A6,      0, 0xE4DB,      0,      0, 0xBBEC, 0xE4DC, /* 0xE0 */
-         0,      0,      0, 0xE8D4, 0xE8D3, 0xC068, 0xBE76, 0xBE77, /* 0xE0 */
-         0, 0xE8D7, 0xE8D6, 0xE8D5,      0,      0, 0xEC6E, 0xEC71, /* 0xF0 */
-         0, 0xEC70, 0xEC6F, 0xC067, 0xEF68, 0xEF66, 0xEF65          /* 0xF0 */
+         0, 0xF1B1, 0xF1B5, 0xF1B0, 	 0, 0xF1B2, 0xC34D, 0xF1AF, /* 0x00 */
+         0, 0xF1B4, 	 0, 	 0, 0xF3C0, 0xF3B5, 0xC445, 	 0, /* 0x10 */
+         0, 0xC446, 0xF3B4, 0xF3B9, 0xF3BF, 0xF3B7, 0xF3BE, 	 0, /* 0x10 */
+    0xF3BB, 	 0, 0xF3BA, 0xF3BD, 0xF3B8, 0xF3B6, 	 0, 0xF3BC, /* 0x20 */
+         0, 0xF560, 0xF55E, 0xC4CA, 0xF55D, 0xF563, 0xF561, 	 0, /* 0x20 */
+    0xC4CB, 0xF55C, 0xF55A, 	 0, 0xF55B, 0xC4CD, 0xF55F, 0xC4CC, /* 0x30 */
+    0xF562, 0xF678, 0xF67E, 	 0, 	 0, 0xF679, 0xC55B, 0xF6A1, /* 0x30 */
+    0xC55A, 0xF67D, 0xF67C, 0xC559, 0xF67B, 0xC558, 0xF67A, 	 0, /* 0x40 */
+    0xF77D, 0xF7A1, 0xF77E, 	 0, 0xF77B, 0xC5BB, 0xF778, 0xF77C, /* 0x40 */
+    0xF7A3, 	 0, 0xF7A2, 0xF779, 0xF77A, 0xC5BA, 0xF852, 0xC5E7, /* 0x50 */
+         0, 0xF853, 0xC5E5, 0xC5E6, 	 0, 	 0, 0xF8D3, 0xC64A, /* 0x50 */
+    0xF976, 	 0, 0xC66A, 	 0, 0xF9B3, 0xC66B, 0xF9B4, 0xF9B5, /* 0x60 */
+    0xF9C3, 0xF9C2, 0xC67A, 0xF9CD, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+    0xB0A9, 	 0, 	 0, 0xE0E9, 	 0, 0xE0E8, 	 0, 0xBBEA, /* 0xA0 */
+    0xBBEB, 0xE4DA, 	 0, 0xE8D2, 0xEC6C, 	 0, 	 0, 0xBE75, /* 0xB0 */
+    0xC065, 0xEC6A, 	 0, 0xEC6D, 0xC066, 	 0, 0xEF64, 0xEC6B, /* 0xB0 */
+    0xF1B9, 0xC34E, 0xF3C1, 	 0, 	 0, 	 0, 0xF566, 0xF564, /* 0xC0 */
+         0, 	 0, 0xF565, 	 0, 	 0, 0xF6A2, 	 0, 0xC55C, /* 0xC0 */
+    0xF7A4, 0xC5EA, 0xC5BC, 0xC5E8, 0xC5E9, 0xF8D4, 0xC662, 	 0, /* 0xD0 */
+    0xB0AA, 	 0, 	 0, 	 0, 0xF1BA, 	 0, 	 0, 0xD449, /* 0xD0 */
+         0, 0xB9A6, 	 0, 0xE4DB, 	 0, 	 0, 0xBBEC, 0xE4DC, /* 0xE0 */
+         0, 	 0, 	 0, 0xE8D4, 0xE8D3, 0xC068, 0xBE76, 0xBE77, /* 0xE0 */
+         0, 0xE8D7, 0xE8D6, 0xE8D5, 	 0, 	 0, 0xEC6E, 0xEC71, /* 0xF0 */
+         0, 0xEC70, 0xEC6F, 0xC067, 0xEF68, 0xEF66, 0xEF65			/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_9B[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xEF67,      0, 0xC34F, 0xF1BC, 0xF1BD, 0xC350,      0, /* 0x00 */
-    0xF1BB,      0, 0xF3C3, 0xF3C2, 0xF3C5, 0xC447, 0xF3C4,      0, /* 0x00 */
-    0xF567, 0xF569, 0xF568,      0,      0, 0xF6A3, 0xF6A6, 0xF6A4, /* 0x10 */
-    0xF6A5, 0xF7A5, 0xC5BD,      0,      0,      0, 0xF854, 0xF855, /* 0x10 */
-    0xF856,      0, 0xC64B, 0xC663, 0xF9B6, 0xB0AB,      0, 0xBE78, /* 0x20 */
-    0xC069, 0xF1BE,      0, 0xF7A6,      0,      0, 0xF9C4, 0xD44A, /* 0x20 */
-         0, 0xC67B, 0xB0AC, 0xEC72,      0, 0xF1BF,      0, 0xF3C6, /* 0x30 */
-         0,      0, 0xF6A7, 0xF7A7, 0xB0AD,      0, 0xE4DD, 0xE4DE, /* 0x30 */
-         0, 0xBBED, 0xBBEE, 0xE8D9, 0xBE7A, 0xBE79, 0xE8D8,      0, /* 0x40 */
-    0xEF69,      0, 0xF1C0, 0xF1C2, 0xF1C1, 0xC353, 0xC352, 0xC351, /* 0x40 */
-         0, 0xC55E, 0xF6A8,      0, 0xC55D, 0xF7A9, 0xF7A8,      0, /* 0x50 */
-    0xC64C, 0xF8D5, 0xB3BD, 0xE0EA,      0,      0,      0, 0xE4E1, /* 0x50 */
-    0xE4DF, 0xE4E0,      0,      0, 0xE8E2,      0, 0xE8DD, 0xE8DA, /* 0x60 */
-    0xE8E1,      0,      0,      0, 0xE8E3,      0,      0, 0xBE7C, /* 0x60 */
-    0xE8E0, 0xE8DC,      0,      0, 0xE8DB, 0xE8DF, 0xE8DE, 0xBE7B, /* 0x70 */
-         0,      0, 0xEC7D, 0xEC78, 0xEC76, 0xECA1, 0xEC77,      0, /* 0x70 */
-    0xEC73,      0, 0xEC79,      0,      0, 0xEC74, 0xEF72, 0xEC75, /* 0x80 */
-    0xECA2,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-    0xEC7C, 0xC06A, 0xEC7B, 0xEC7A,      0, 0xEC7E,      0,      0, /* 0x90 */
-         0,      0, 0xEF6A, 0xEF6D,      0,      0, 0xEF6C,      0, /* 0x90 */
-    0xEF74, 0xEF6F, 0xEF73,      0, 0xEF71, 0xEF70, 0xEF6E,      0, /* 0xA0 */
-    0xEF6B,      0, 0xC243, 0xC242,      0, 0xC244, 0xC241, 0xEF75, /* 0xA0 */
-         0,      0,      0,      0,      0, 0xF1C8, 0xF1CB,      0, /* 0xB0 */
-    0xF1C9, 0xF1CD,      0,      0,      0, 0xF1CE,      0, 0xF1C6, /* 0xB0 */
-    0xC358, 0xF1C7,      0, 0xF1C5, 0xF1CC,      0, 0xF1C4, 0xF1C3, /* 0xC0 */
-    0xC357, 0xC355, 0xC354,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0, 0xF1CA, 0xF3CF, 0xF3D5, 0xC44A, 0xF3D0, /* 0xD0 */
-         0, 0xF3D3, 0xF3D7, 0xC44B, 0xF3D2,      0, 0xF3CA,      0, /* 0xD0 */
-    0xF3C9, 0xF3D6, 0xF3CD,      0, 0xF3CB, 0xF3D4, 0xF3CC, 0xC449, /* 0xE0 */
-    0xC448,      0, 0xF3C7, 0xF3C8, 0xF3D1,      0,      0,      0, /* 0xE0 */
-    0xF3CE,      0,      0,      0,      0,      0,      0, 0xF56C, /* 0xF0 */
-    0xF56F,      0,      0,      0,      0, 0xC356                  /* 0xF0 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xEF67, 	 0, 0xC34F, 0xF1BC, 0xF1BD, 0xC350, 	 0, /* 0x00 */
+    0xF1BB, 	 0, 0xF3C3, 0xF3C2, 0xF3C5, 0xC447, 0xF3C4, 	 0, /* 0x00 */
+    0xF567, 0xF569, 0xF568, 	 0, 	 0, 0xF6A3, 0xF6A6, 0xF6A4, /* 0x10 */
+    0xF6A5, 0xF7A5, 0xC5BD, 	 0, 	 0, 	 0, 0xF854, 0xF855, /* 0x10 */
+    0xF856, 	 0, 0xC64B, 0xC663, 0xF9B6, 0xB0AB, 	 0, 0xBE78, /* 0x20 */
+    0xC069, 0xF1BE, 	 0, 0xF7A6, 	 0, 	 0, 0xF9C4, 0xD44A, /* 0x20 */
+         0, 0xC67B, 0xB0AC, 0xEC72, 	 0, 0xF1BF, 	 0, 0xF3C6, /* 0x30 */
+         0, 	 0, 0xF6A7, 0xF7A7, 0xB0AD, 	 0, 0xE4DD, 0xE4DE, /* 0x30 */
+         0, 0xBBED, 0xBBEE, 0xE8D9, 0xBE7A, 0xBE79, 0xE8D8, 	 0, /* 0x40 */
+    0xEF69, 	 0, 0xF1C0, 0xF1C2, 0xF1C1, 0xC353, 0xC352, 0xC351, /* 0x40 */
+         0, 0xC55E, 0xF6A8, 	 0, 0xC55D, 0xF7A9, 0xF7A8, 	 0, /* 0x50 */
+    0xC64C, 0xF8D5, 0xB3BD, 0xE0EA, 	 0, 	 0, 	 0, 0xE4E1, /* 0x50 */
+    0xE4DF, 0xE4E0, 	 0, 	 0, 0xE8E2, 	 0, 0xE8DD, 0xE8DA, /* 0x60 */
+    0xE8E1, 	 0, 	 0, 	 0, 0xE8E3, 	 0, 	 0, 0xBE7C, /* 0x60 */
+    0xE8E0, 0xE8DC, 	 0, 	 0, 0xE8DB, 0xE8DF, 0xE8DE, 0xBE7B, /* 0x70 */
+         0, 	 0, 0xEC7D, 0xEC78, 0xEC76, 0xECA1, 0xEC77, 	 0, /* 0x70 */
+    0xEC73, 	 0, 0xEC79, 	 0, 	 0, 0xEC74, 0xEF72, 0xEC75, /* 0x80 */
+    0xECA2, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+    0xEC7C, 0xC06A, 0xEC7B, 0xEC7A, 	 0, 0xEC7E, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 0xEF6A, 0xEF6D, 	 0, 	 0, 0xEF6C, 	 0, /* 0x90 */
+    0xEF74, 0xEF6F, 0xEF73, 	 0, 0xEF71, 0xEF70, 0xEF6E, 	 0, /* 0xA0 */
+    0xEF6B, 	 0, 0xC243, 0xC242, 	 0, 0xC244, 0xC241, 0xEF75, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xF1C8, 0xF1CB, 	 0, /* 0xB0 */
+    0xF1C9, 0xF1CD, 	 0, 	 0, 	 0, 0xF1CE, 	 0, 0xF1C6, /* 0xB0 */
+    0xC358, 0xF1C7, 	 0, 0xF1C5, 0xF1CC, 	 0, 0xF1C4, 0xF1C3, /* 0xC0 */
+    0xC357, 0xC355, 0xC354, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 0xF1CA, 0xF3CF, 0xF3D5, 0xC44A, 0xF3D0, /* 0xD0 */
+         0, 0xF3D3, 0xF3D7, 0xC44B, 0xF3D2, 	 0, 0xF3CA, 	 0, /* 0xD0 */
+    0xF3C9, 0xF3D6, 0xF3CD, 	 0, 0xF3CB, 0xF3D4, 0xF3CC, 0xC449, /* 0xE0 */
+    0xC448, 	 0, 0xF3C7, 0xF3C8, 0xF3D1, 	 0, 	 0, 	 0, /* 0xE0 */
+    0xF3CE, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 0xF56C, /* 0xF0 */
+    0xF56F, 	 0, 	 0, 	 0, 	 0, 0xC356					/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_9C[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                             0xF56D, 0xF573, 0xF571, /* 0x00 */
-    0xF56B, 0xF576,      0, 0xF56A,      0, 0xC4CF, 0xF572,      0, /* 0x00 */
-         0,      0, 0xF56E, 0xC4CE, 0xF575,      0,      0, 0xF574, /* 0x10 */
-         0,      0,      0,      0, 0xF6AB, 0xF6AA,      0,      0, /* 0x10 */
-         0, 0xF6B1,      0, 0xF6AD, 0xF6B0, 0xC560,      0,      0, /* 0x20 */
-    0xF6AE, 0xF6AF,      0, 0xF6A9, 0xF6AC, 0xC55F,      0,      0, /* 0x20 */
-         0, 0xC5BF, 0xF7B4, 0xF7AF, 0xF7B3,      0, 0xF7B6, 0xF7B2, /* 0x30 */
-         0, 0xF7AE,      0, 0xC5C1, 0xF7B1, 0xF7B5, 0xC5C0, 0xF7AC, /* 0x30 */
-    0xF570, 0xF7B0,      0,      0, 0xF7AD,      0, 0xF7AA,      0, /* 0x40 */
-    0xF7AB, 0xC5BE, 0xF85A, 0xF85C, 0xF85F, 0xF85B, 0xF860,      0, /* 0x40 */
-    0xF859,      0, 0xF857,      0, 0xC5EB, 0xF85D, 0xC5ED, 0xC5EC, /* 0x50 */
-    0xF858, 0xF85E,      0,      0,      0,      0, 0xF8DA, 0xC64D, /* 0x50 */
-    0xF8DB,      0, 0xF8D9, 0xF8D6,      0,      0, 0xF8D8, 0xF8D7, /* 0x60 */
-    0xF95A,      0,      0,      0,      0, 0xF95C, 0xF95B,      0, /* 0x60 */
-         0, 0xF979,      0, 0xF978, 0xF977, 0xF97A,      0, 0xC673, /* 0x70 */
-    0xC674, 0xF9CA, 0xF9CE,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0, 0xB3BE, 0xDCAF, 0xE0ED, /* 0xE0 */
-         0, 0xB9A7, 0xE0EB,      0,      0, 0xE0EC,      0,      0, /* 0xE0 */
+    0xF56B, 0xF576, 	 0, 0xF56A, 	 0, 0xC4CF, 0xF572, 	 0, /* 0x00 */
+         0, 	 0, 0xF56E, 0xC4CE, 0xF575, 	 0, 	 0, 0xF574, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 0xF6AB, 0xF6AA, 	 0, 	 0, /* 0x10 */
+         0, 0xF6B1, 	 0, 0xF6AD, 0xF6B0, 0xC560, 	 0, 	 0, /* 0x20 */
+    0xF6AE, 0xF6AF, 	 0, 0xF6A9, 0xF6AC, 0xC55F, 	 0, 	 0, /* 0x20 */
+         0, 0xC5BF, 0xF7B4, 0xF7AF, 0xF7B3, 	 0, 0xF7B6, 0xF7B2, /* 0x30 */
+         0, 0xF7AE, 	 0, 0xC5C1, 0xF7B1, 0xF7B5, 0xC5C0, 0xF7AC, /* 0x30 */
+    0xF570, 0xF7B0, 	 0, 	 0, 0xF7AD, 	 0, 0xF7AA, 	 0, /* 0x40 */
+    0xF7AB, 0xC5BE, 0xF85A, 0xF85C, 0xF85F, 0xF85B, 0xF860, 	 0, /* 0x40 */
+    0xF859, 	 0, 0xF857, 	 0, 0xC5EB, 0xF85D, 0xC5ED, 0xC5EC, /* 0x50 */
+    0xF858, 0xF85E, 	 0, 	 0, 	 0, 	 0, 0xF8DA, 0xC64D, /* 0x50 */
+    0xF8DB, 	 0, 0xF8D9, 0xF8D6, 	 0, 	 0, 0xF8D8, 0xF8D7, /* 0x60 */
+    0xF95A, 	 0, 	 0, 	 0, 	 0, 0xF95C, 0xF95B, 	 0, /* 0x60 */
+         0, 0xF979, 	 0, 0xF978, 0xF977, 0xF97A, 	 0, 0xC673, /* 0x70 */
+    0xC674, 0xF9CA, 0xF9CE, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB3BE, 0xDCAF, 0xE0ED, /* 0xE0 */
+         0, 0xB9A7, 0xE0EB, 	 0, 	 0, 0xE0EC, 	 0, 	 0, /* 0xE0 */
          0, 0xE4E2, 0xE4E3, 0xBBF1, 0xBBEF, 0xE4E4, 0xBBF0, 0xE8E8, /* 0xF0 */
-         0, 0xE8EB, 0xE8E5, 0xE8EC, 0xE8E4, 0xE8E6,      0, 0xE8E7  /* 0xF0 */
+         0, 0xE8EB, 0xE8E5, 0xE8EC, 0xE8E4, 0xE8E6, 	 0, 0xE8E7	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_9D[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xE8EA,      0,      0, 0xBEA1, 0xE8EF, 0xE8EE, 0xBE7D, 0xE8E9, /* 0x00 */
-    0xE8ED, 0xBE7E,      0,      0,      0,      0,      0,      0, /* 0x00 */
-    0xECAC,      0, 0xC06F,      0, 0xECA7, 0xC06B,      0, 0xECA4, /* 0x10 */
-    0xECAA, 0xECAD,      0, 0xC070,      0, 0xECA9, 0xECA6, 0xECAE, /* 0x10 */
-    0xECA5,      0, 0xECAB, 0xC06C,      0, 0xECA3, 0xC06D,      0, /* 0x20 */
-    0xC06E, 0xECA8,      0,      0,      0, 0xEFA9, 0xEF7A, 0xEF7B, /* 0x20 */
-    0xEF7E, 0xEF7C,      0, 0xEF76,      0,      0, 0xEF79, 0xEFA5, /* 0x30 */
-    0xEF7D,      0,      0, 0xC245,      0, 0xEFA7, 0xEFA4, 0xC246, /* 0x30 */
-    0xEFA6, 0xEF77, 0xEFA2, 0xEFA3,      0, 0xEFA1,      0,      0, /* 0x40 */
-         0,      0, 0xF1D2, 0xF1D4, 0xF1D7,      0,      0, 0xF1D1, /* 0x40 */
-         0, 0xC359, 0xF1D9, 0xF1D0, 0xF1DA,      0, 0xF1D6, 0xF1D8, /* 0x50 */
-    0xF1DC, 0xF1D5, 0xF1DD, 0xF1D3, 0xF1CF, 0xC35A,      0, 0xF1DB, /* 0x50 */
-    0xC35B, 0xC44D,      0,      0,      0,      0,      0, 0xEF78, /* 0x60 */
-    0xF3F1, 0xF3E8, 0xC44F, 0xF3E4, 0xC450,      0,      0, 0xF3ED, /* 0x60 */
-    0xF3E7, 0xF3DD, 0xC44E, 0xF3EA, 0xF3E5, 0xF3E6,      0, 0xF3D8, /* 0x70 */
-    0xF3DF, 0xF3EE,      0, 0xF3EB,      0, 0xF3E3,      0, 0xF3EF, /* 0x70 */
-    0xF3DE, 0xF3D9, 0xF3EC,      0, 0xF3DB, 0xF3E9, 0xF3E0, 0xF3F0, /* 0x80 */
-    0xF3DC, 0xC44C, 0xF3DA, 0xF3E1, 0xF3E2,      0,      0,      0, /* 0x80 */
-    0xF57D,      0, 0xF57B,      0, 0xF5A2,      0, 0xF5AE, 0xF5A5, /* 0x90 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xE8EA, 	 0, 	 0, 0xBEA1, 0xE8EF, 0xE8EE, 0xBE7D, 0xE8E9, /* 0x00 */
+    0xE8ED, 0xBE7E, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x00 */
+    0xECAC, 	 0, 0xC06F, 	 0, 0xECA7, 0xC06B, 	 0, 0xECA4, /* 0x10 */
+    0xECAA, 0xECAD, 	 0, 0xC070, 	 0, 0xECA9, 0xECA6, 0xECAE, /* 0x10 */
+    0xECA5, 	 0, 0xECAB, 0xC06C, 	 0, 0xECA3, 0xC06D, 	 0, /* 0x20 */
+    0xC06E, 0xECA8, 	 0, 	 0, 	 0, 0xEFA9, 0xEF7A, 0xEF7B, /* 0x20 */
+    0xEF7E, 0xEF7C, 	 0, 0xEF76, 	 0, 	 0, 0xEF79, 0xEFA5, /* 0x30 */
+    0xEF7D, 	 0, 	 0, 0xC245, 	 0, 0xEFA7, 0xEFA4, 0xC246, /* 0x30 */
+    0xEFA6, 0xEF77, 0xEFA2, 0xEFA3, 	 0, 0xEFA1, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 0xF1D2, 0xF1D4, 0xF1D7, 	 0, 	 0, 0xF1D1, /* 0x40 */
+         0, 0xC359, 0xF1D9, 0xF1D0, 0xF1DA, 	 0, 0xF1D6, 0xF1D8, /* 0x50 */
+    0xF1DC, 0xF1D5, 0xF1DD, 0xF1D3, 0xF1CF, 0xC35A, 	 0, 0xF1DB, /* 0x50 */
+    0xC35B, 0xC44D, 	 0, 	 0, 	 0, 	 0, 	 0, 0xEF78, /* 0x60 */
+    0xF3F1, 0xF3E8, 0xC44F, 0xF3E4, 0xC450, 	 0, 	 0, 0xF3ED, /* 0x60 */
+    0xF3E7, 0xF3DD, 0xC44E, 0xF3EA, 0xF3E5, 0xF3E6, 	 0, 0xF3D8, /* 0x70 */
+    0xF3DF, 0xF3EE, 	 0, 0xF3EB, 	 0, 0xF3E3, 	 0, 0xF3EF, /* 0x70 */
+    0xF3DE, 0xF3D9, 0xF3EC, 	 0, 0xF3DB, 0xF3E9, 0xF3E0, 0xF3F0, /* 0x80 */
+    0xF3DC, 0xC44C, 0xF3DA, 0xF3E1, 0xF3E2, 	 0, 	 0, 	 0, /* 0x80 */
+    0xF57D, 	 0, 0xF57B, 	 0, 0xF5A2, 	 0, 0xF5AE, 0xF5A5, /* 0x90 */
     0xF57C, 0xF578, 0xF5A7, 0xF57E, 0xF5A3, 0xF57A, 0xF5AA, 0xF577, /* 0x90 */
-    0xF5A1, 0xF5A6, 0xF5A8, 0xF5AB, 0xF579,      0, 0xF5AF, 0xF5B0, /* 0xA0 */
-    0xF5A9, 0xF5AD, 0xF5A4,      0, 0xF6C1, 0xF6C4,      0, 0xC561, /* 0xA0 */
+    0xF5A1, 0xF5A6, 0xF5A8, 0xF5AB, 0xF579, 	 0, 0xF5AF, 0xF5B0, /* 0xA0 */
+    0xF5A9, 0xF5AD, 0xF5A4, 	 0, 0xF6C1, 0xF6C4, 	 0, 0xC561, /* 0xA0 */
          0, 0xF6C3, 0xF6C8, 0xF6C6, 0xC562, 0xF6BD, 0xF6B3, 0xF6B2, /* 0xB0 */
-    0xC564, 0xF6BF, 0xF6C0, 0xF6BC, 0xF6B4,      0, 0xF6B9, 0xF5AC, /* 0xB0 */
-         0, 0xF6B5, 0xC563, 0xF6BB,      0, 0xF6BA,      0, 0xF6B6, /* 0xC0 */
-    0xF6C2,      0, 0xF6B7, 0xF7BB, 0xF6C5, 0xF6C7, 0xF6BE, 0xF6B8, /* 0xC0 */
-    0xF7BC, 0xF7BE, 0xF7B8, 0xC5C2,      0, 0xF7C5, 0xF7C3, 0xC5C3, /* 0xD0 */
+    0xC564, 0xF6BF, 0xF6C0, 0xF6BC, 0xF6B4, 	 0, 0xF6B9, 0xF5AC, /* 0xB0 */
+         0, 0xF6B5, 0xC563, 0xF6BB, 	 0, 0xF6BA, 	 0, 0xF6B6, /* 0xC0 */
+    0xF6C2, 	 0, 0xF6B7, 0xF7BB, 0xF6C5, 0xF6C7, 0xF6BE, 0xF6B8, /* 0xC0 */
+    0xF7BC, 0xF7BE, 0xF7B8, 0xC5C2, 	 0, 0xF7C5, 0xF7C3, 0xC5C3, /* 0xD0 */
     0xF7C2, 0xF7C1, 0xF7BA, 0xF7B7, 0xF7BD, 0xF7C6, 0xF7B9, 0xF7BF, /* 0xD0 */
-         0, 0xF869, 0xF86E, 0xF864, 0xF867, 0xC5EE, 0xF86B,      0, /* 0xE0 */
-    0xF872, 0xF7C0,      0, 0xF865, 0xF86F, 0xF873, 0xF86A, 0xF863, /* 0xE0 */
-    0xF86D,      0, 0xF86C, 0xF871, 0xF870, 0xF7C4, 0xF868, 0xF862, /* 0xF0 */
-    0xF866, 0xC64E, 0xC64F, 0xF861,      0, 0xF8E6, 0xF8DD, 0xF8E5  /* 0xF0 */
+         0, 0xF869, 0xF86E, 0xF864, 0xF867, 0xC5EE, 0xF86B, 	 0, /* 0xE0 */
+    0xF872, 0xF7C0, 	 0, 0xF865, 0xF86F, 0xF873, 0xF86A, 0xF863, /* 0xE0 */
+    0xF86D, 	 0, 0xF86C, 0xF871, 0xF870, 0xF7C4, 0xF868, 0xF862, /* 0xF0 */
+    0xF866, 0xC64E, 0xC64F, 0xF861, 	 0, 0xF8E6, 0xF8DD, 0xF8E5	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_9E[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
     0xF8E2, 0xF8E3, 0xF8DC, 0xF8DF, 0xF8E7, 0xF8E1, 0xF8E0, 0xF8DE, /* 0x00 */
-         0, 0xF8E4,      0, 0xF95D,      0, 0xF95E,      0, 0xF960, /* 0x00 */
-    0xF95F, 0xF962, 0xF961, 0xF97C, 0xF97B, 0xF9B7,      0, 0xF9B8, /* 0x10 */
-         0, 0xF9C5, 0xC678, 0xC67C,      0, 0xF9CF, 0xC67D,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0, 0xB3BF,      0,      0, /* 0x70 */
-         0, 0xC4D0, 0xF6C9,      0, 0xC650, 0xC651,      0, 0xB3C0, /* 0x70 */
-    0xE0EE,      0, 0xB9A8, 0xE8F0,      0,      0, 0xECB0, 0xECB1, /* 0x80 */
-    0xECAF, 0xEFAB, 0xEFAA, 0xC247, 0xF1DF, 0xEFAC, 0xF1DE,      0, /* 0x80 */
-         0, 0xF3F3, 0xC451, 0xC453, 0xF3F2,      0,      0, 0xC452, /* 0x90 */
-         0, 0xF5B1, 0xF5B3, 0xF5B2, 0xF6CA, 0xC565,      0, 0xC5EF, /* 0x90 */
-    0xF8E8, 0xF963,      0,      0, 0xF9D2, 0xB3C1,      0, 0xE4E5, /* 0xA0 */
-         0, 0xBEA2,      0,      0,      0, 0xECB3, 0xECB2,      0, /* 0xA0 */
-    0xEFAD,      0,      0,      0, 0xC454, 0xC4D1, 0xF7C7, 0xF9CB, /* 0xB0 */
-         0,      0,      0, 0xB3C2, 0xBBF2,      0, 0xBEA3,      0, /* 0xB0 */
-    0xF3F4,      0, 0xF874, 0xB6C0,      0,      0,      0,      0, /* 0xC0 */
-    0xEFAE,      0,      0,      0, 0xC664, 0xB6C1, 0xBEA4, 0xC248, /* 0xC0 */
-    0xF875, 0xB6C2,      0, 0xE8F1, 0xC072, 0xECB4, 0xECB5,      0, /* 0xD0 */
-    0xC071,      0, 0xEFAF, 0xC24C, 0xC24A, 0xC24B, 0xC249, 0xF1E0, /* 0xD0 */
-    0xC35C,      0,      0,      0, 0xF5B5, 0xF5B4, 0xF5B7, 0xF5B6, /* 0xE0 */
-    0xC4D2,      0,      0, 0xF6CB,      0, 0xF6CD, 0xF6CC, 0xC566, /* 0xE0 */
-    0xF7C8,      0, 0xF876, 0xF877, 0xC5F0, 0xF964, 0xF97D, 0xC675, /* 0xF0 */
-         0, 0xDCB0, 0xECB6, 0xEFB0, 0xF3F5, 0xE0EF,      0, 0xEFB1  /* 0xF0 */
+         0, 0xF8E4, 	 0, 0xF95D, 	 0, 0xF95E, 	 0, 0xF960, /* 0x00 */
+    0xF95F, 0xF962, 0xF961, 0xF97C, 0xF97B, 0xF9B7, 	 0, 0xF9B8, /* 0x10 */
+         0, 0xF9C5, 0xC678, 0xC67C, 	 0, 0xF9CF, 0xC67D, 	 0, /* 0x10 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x20 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x30 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x40 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xB3BF, 	 0, 	 0, /* 0x70 */
+         0, 0xC4D0, 0xF6C9, 	 0, 0xC650, 0xC651, 	 0, 0xB3C0, /* 0x70 */
+    0xE0EE, 	 0, 0xB9A8, 0xE8F0, 	 0, 	 0, 0xECB0, 0xECB1, /* 0x80 */
+    0xECAF, 0xEFAB, 0xEFAA, 0xC247, 0xF1DF, 0xEFAC, 0xF1DE, 	 0, /* 0x80 */
+         0, 0xF3F3, 0xC451, 0xC453, 0xF3F2, 	 0, 	 0, 0xC452, /* 0x90 */
+         0, 0xF5B1, 0xF5B3, 0xF5B2, 0xF6CA, 0xC565, 	 0, 0xC5EF, /* 0x90 */
+    0xF8E8, 0xF963, 	 0, 	 0, 0xF9D2, 0xB3C1, 	 0, 0xE4E5, /* 0xA0 */
+         0, 0xBEA2, 	 0, 	 0, 	 0, 0xECB3, 0xECB2, 	 0, /* 0xA0 */
+    0xEFAD, 	 0, 	 0, 	 0, 0xC454, 0xC4D1, 0xF7C7, 0xF9CB, /* 0xB0 */
+         0, 	 0, 	 0, 0xB3C2, 0xBBF2, 	 0, 0xBEA3, 	 0, /* 0xB0 */
+    0xF3F4, 	 0, 0xF874, 0xB6C0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+    0xEFAE, 	 0, 	 0, 	 0, 0xC664, 0xB6C1, 0xBEA4, 0xC248, /* 0xC0 */
+    0xF875, 0xB6C2, 	 0, 0xE8F1, 0xC072, 0xECB4, 0xECB5, 	 0, /* 0xD0 */
+    0xC071, 	 0, 0xEFAF, 0xC24C, 0xC24A, 0xC24B, 0xC249, 0xF1E0, /* 0xD0 */
+    0xC35C, 	 0, 	 0, 	 0, 0xF5B5, 0xF5B4, 0xF5B7, 0xF5B6, /* 0xE0 */
+    0xC4D2, 	 0, 	 0, 0xF6CB, 	 0, 0xF6CD, 0xF6CC, 0xC566, /* 0xE0 */
+    0xF7C8, 	 0, 0xF876, 0xF877, 0xC5F0, 0xF964, 0xF97D, 0xC675, /* 0xF0 */
+         0, 0xDCB0, 0xECB6, 0xEFB0, 0xF3F5, 0xE0EF, 	 0, 0xEFB1	/* 0xF0 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_9F[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xF1E2, 0xF1E1,      0,      0,      0,      0, 0xF878, 0xC652, /* 0x00 */
-         0, 0xF965, 0xF97E,      0,      0,      0, 0xB9A9, 0xE8F2, /* 0x00 */
-    0xE8F3,      0, 0xECB7, 0xB9AA,      0, 0xC35D, 0xF1E3,      0, /* 0x10 */
-    0xF6CF, 0xC567, 0xF6D0, 0xF6CE, 0xF879,      0, 0xF8E9,      0, /* 0x10 */
-    0xB9AB,      0, 0xEFB4, 0xEFB3, 0xEFB2, 0xF1E4,      0,      0, /* 0x20 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xF1E2, 0xF1E1, 	 0, 	 0, 	 0, 	 0, 0xF878, 0xC652, /* 0x00 */
+         0, 0xF965, 0xF97E, 	 0, 	 0, 	 0, 0xB9A9, 0xE8F2, /* 0x00 */
+    0xE8F3, 	 0, 0xECB7, 0xB9AA, 	 0, 0xC35D, 0xF1E3, 	 0, /* 0x10 */
+    0xF6CF, 0xC567, 0xF6D0, 0xF6CE, 0xF879, 	 0, 0xF8E9, 	 0, /* 0x10 */
+    0xB9AB, 	 0, 0xEFB4, 0xEFB3, 0xEFB2, 0xF1E4, 	 0, 	 0, /* 0x20 */
     0xF1E8, 0xF1E7, 0xF1E6, 0xF1E5, 0xC35E, 0xF3F6, 0xF5B9, 0xC4D3, /* 0x20 */
     0xF5B8, 0xF6D1, 0xF7CB, 0xF7CA, 0xC5C4, 0xF7C9, 0xF87C, 0xF87B, /* 0x30 */
-    0xF87A,      0,      0, 0xBBF3,      0, 0xECB8, 0xC24D,      0, /* 0x30 */
-    0xF3F7, 0xF3F8, 0xF7CC, 0xF87D,      0,      0, 0xF8EA, 0xF966, /* 0x40 */
+    0xF87A, 	 0, 	 0, 0xBBF3, 	 0, 0xECB8, 0xC24D, 	 0, /* 0x30 */
+    0xF3F7, 0xF3F8, 0xF7CC, 0xF87D, 	 0, 	 0, 0xF8EA, 0xF966, /* 0x40 */
     0xF9B9, 0xF9D4, 0xBBF4, 0xC24E, 0xF1E9, 0xF3F9, 0xF6D2, 0xF87E, /* 0x40 */
-         0,      0, 0xBEA6,      0, 0xEFB5, 0xF1EA, 0xF3FA, 0xF3FB, /* 0x50 */
-    0xF3FC, 0xF5BE,      0, 0xF5BA, 0xC568, 0xF5BD, 0xF5BC, 0xC4D4, /* 0x50 */
-    0xF5BB, 0xC4D6,      0, 0xC4D5, 0xF6D4, 0xF6D3, 0xC569, 0xC56A, /* 0x60 */
-         0,      0, 0xC5C6, 0xF7CD, 0xC5C5,      0, 0xF8A3, 0xF8A4, /* 0x60 */
-    0xF8A2, 0xF8A1, 0xC654,      0, 0xF8EB, 0xF8EC, 0xF8ED, 0xC653, /* 0x70 */
-    0xF967, 0xF96A, 0xF969, 0xF968,      0,      0, 0xF9D3,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0, 0xC073,      0,      0, /* 0x80 */
-    0xC365, 0xF5BF, 0xF6D5,      0, 0xC5C7, 0xF7CE,      0,      0, /* 0x90 */
-    0xF9D5,      0,      0,      0, 0xC074,      0,      0,      0, /* 0x90 */
-    0xEFB6,      0, 0xF7CF,      0, 0xF9A1                          /* 0xA0 */
+         0, 	 0, 0xBEA6, 	 0, 0xEFB5, 0xF1EA, 0xF3FA, 0xF3FB, /* 0x50 */
+    0xF3FC, 0xF5BE, 	 0, 0xF5BA, 0xC568, 0xF5BD, 0xF5BC, 0xC4D4, /* 0x50 */
+    0xF5BB, 0xC4D6, 	 0, 0xC4D5, 0xF6D4, 0xF6D3, 0xC569, 0xC56A, /* 0x60 */
+         0, 	 0, 0xC5C6, 0xF7CD, 0xC5C5, 	 0, 0xF8A3, 0xF8A4, /* 0x60 */
+    0xF8A2, 0xF8A1, 0xC654, 	 0, 0xF8EB, 0xF8EC, 0xF8ED, 0xC653, /* 0x70 */
+    0xF967, 0xF96A, 0xF969, 0xF968, 	 0, 	 0, 0xF9D3, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xC073, 	 0, 	 0, /* 0x80 */
+    0xC365, 0xF5BF, 0xF6D5, 	 0, 0xC5C7, 0xF7CE, 	 0, 	 0, /* 0x90 */
+    0xF9D5, 	 0, 	 0, 	 0, 0xC074, 	 0, 	 0, 	 0, /* 0x90 */
+    0xEFB6, 	 0, 0xF7CF, 	 0, 0xF9A1							/* 0xA0 */
                                                                     /* 0xA0 */
 };
 
@@ -3642,9 +3642,9 @@ static sal_uInt16 const aImplUniToDBCSTab_BIG5_9F[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_APPLECHINTRAD_F8[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0x0081, 0x0082                                                  /* 0x80 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0x0081, 0x0082													/* 0x80 */
                                                                     /* 0x80 */
 };
 
@@ -3652,64 +3652,64 @@ static sal_uInt16 const aImplUniToDBCSTab_APPLECHINTRAD_F8[] =
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_FA[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
                                                                     /* 0x00 */
-                                    0xC94A, 0xDDFC                  /* 0x00 */
+                                    0xC94A, 0xDDFC					/* 0x00 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_FE[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-    0xA14A, 0xA157,      0, 0xA159, 0xA15B, 0xA15F, 0xA160, 0xA163, /* 0x30 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+    0xA14A, 0xA157, 	 0, 0xA159, 0xA15B, 0xA15F, 0xA160, 0xA163, /* 0x30 */
     0xA164, 0xA167, 0xA168, 0xA16B, 0xA16C, 0xA16F, 0xA170, 0xA173, /* 0x30 */
-    0xA174, 0xA177, 0xA178, 0xA17B, 0xA17C,      0,      0,      0, /* 0x40 */
+    0xA174, 0xA177, 0xA178, 0xA17B, 0xA17C, 	 0, 	 0, 	 0, /* 0x40 */
          0, 0xA1C6, 0xA1C7, 0xA1CA, 0xA1CB, 0xA1C8, 0xA1C9, 0xA15C, /* 0x40 */
-    0xA14D, 0xA14E, 0xA14F,      0, 0xA151, 0xA152, 0xA153, 0xA154, /* 0x50 */
+    0xA14D, 0xA14E, 0xA14F, 	 0, 0xA151, 0xA152, 0xA153, 0xA154, /* 0x50 */
          0, 0xA17D, 0xA17E, 0xA1A1, 0xA1A2, 0xA1A3, 0xA1A4, 0xA1CC, /* 0x50 */
-    0xA1CD, 0xA1CE, 0xA1DE, 0xA1DF, 0xA1E0, 0xA1E1, 0xA1E2,      0, /* 0x60 */
-    0xA242, 0xA24C, 0xA24D, 0xA24E                                  /* 0x60 */
+    0xA1CD, 0xA1CE, 0xA1DE, 0xA1DF, 0xA1E0, 0xA1E1, 0xA1E2, 	 0, /* 0x60 */
+    0xA242, 0xA24C, 0xA24D, 0xA24E									/* 0x60 */
 };
 
 /* ----------------------------------------------------------------------- */
 
 static sal_uInt16 const aImplUniToDBCSTab_BIG5_FF[] =
 {
-/*       0       1       2       3       4       5       6       7 */
-/*       8       9       A       B       C       D       E       F */
-            0xA149,      0, 0xA1AD, 0xA243, 0xA248, 0xA1AE,      0, /* 0x00 */
+/*		 0		 1		 2		 3		 4		 5		 6		 7 */
+/*		 8		 9		 A		 B		 C		 D		 E		 F */
+            0xA149, 	 0, 0xA1AD, 0xA243, 0xA248, 0xA1AE, 	 0, /* 0x00 */
     0xA15D, 0xA15E, 0xA1AF, 0xA1CF, 0xA141, 0xA1D0, 0xA144, 0xA1FE, /* 0x00 */
     0xA2AF, 0xA2B0, 0xA2B1, 0xA2B2, 0xA2B3, 0xA2B4, 0xA2B5, 0xA2B6, /* 0x10 */
     0xA2B7, 0xA2B8, 0xA147, 0xA146, 0xA1D5, 0xA1D7, 0xA1D6, 0xA148, /* 0x10 */
     0xA249, 0xA2CF, 0xA2D0, 0xA2D1, 0xA2D2, 0xA2D3, 0xA2D4, 0xA2D5, /* 0x20 */
     0xA2D6, 0xA2D7, 0xA2D8, 0xA2D9, 0xA2DA, 0xA2DB, 0xA2DC, 0xA2DD, /* 0x20 */
     0xA2DE, 0xA2DF, 0xA2E0, 0xA2E1, 0xA2E2, 0xA2E3, 0xA2E4, 0xA2E5, /* 0x30 */
-    0xA2E6, 0xA2E7, 0xA2E8,      0, 0xA240,      0,      0, 0xA1C4, /* 0x30 */
+    0xA2E6, 0xA2E7, 0xA2E8, 	 0, 0xA240, 	 0, 	 0, 0xA1C4, /* 0x30 */
          0, 0xA2E9, 0xA2EA, 0xA2EB, 0xA2EC, 0xA2ED, 0xA2EE, 0xA2EF, /* 0x40 */
     0xA2F0, 0xA2F1, 0xA2F2, 0xA2F3, 0xA2F4, 0xA2F5, 0xA2F6, 0xA2F7, /* 0x40 */
     0xA2F8, 0xA2F9, 0xA2FA, 0xA2FB, 0xA2FC, 0xA2FD, 0xA2FE, 0xA340, /* 0x50 */
-    0xA341, 0xA342, 0xA343, 0xA161, 0xA155, 0xA162, 0xA1E3,      0, /* 0x50 */
-         0,      0,      0,      0, 0xA14E,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xC0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xD0 */
-    0xA246, 0xA247,      0, 0xA1C3,      0, 0xA244,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xE0 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0xF0 */
-         0,      0,      0,      0,      0, 0xA1C5                  /* 0xF0 */
+    0xA341, 0xA342, 0xA343, 0xA161, 0xA155, 0xA162, 0xA1E3, 	 0, /* 0x50 */
+         0, 	 0, 	 0, 	 0, 0xA14E, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x60 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x70 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x80 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0x90 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xA0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xB0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xC0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xD0 */
+    0xA246, 0xA247, 	 0, 0xA1C3, 	 0, 0xA244, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xE0 */
+         0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, 	 0, /* 0xF0 */
+         0, 	 0, 	 0, 	 0, 	 0, 0xA1C5					/* 0xF0 */
 };
diff --git a/sal/textenc/tcvttcn6.tab b/sal/textenc/tcvttcn6.tab
index 3fbff168693a..16ea8ee6cecc 100644
--- a/sal/textenc/tcvttcn6.tab
+++ b/sal/textenc/tcvttcn6.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/tcvtuni1.tab b/sal/textenc/tcvtuni1.tab
index 4efaa1ad51ad..ebf5901da10f 100644
--- a/sal/textenc/tcvtuni1.tab
+++ b/sal/textenc/tcvtuni1.tab
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/tcvtutf7.c b/sal/textenc/tcvtutf7.c
index 8093a866f0c4..e0dfa25e3b56 100644
--- a/sal/textenc/tcvtutf7.c
+++ b/sal/textenc/tcvtutf7.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/tcvtutf8.c b/sal/textenc/tcvtutf8.c
index 3023c3e754e6..641fa248f107 100644
--- a/sal/textenc/tcvtutf8.c
+++ b/sal/textenc/tcvtutf8.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/tenchelp.c b/sal/textenc/tenchelp.c
index ed924336fa17..c812d426729b 100644
--- a/sal/textenc/tenchelp.c
+++ b/sal/textenc/tenchelp.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/tenchelp.h b/sal/textenc/tenchelp.h
index 7f6879c4bee1..83e17eea7f20 100644
--- a/sal/textenc/tenchelp.h
+++ b/sal/textenc/tenchelp.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/tencinfo.c b/sal/textenc/tencinfo.c
index 2731880c66d2..da50180761a6 100644
--- a/sal/textenc/tencinfo.c
+++ b/sal/textenc/tencinfo.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/textcvt.c b/sal/textenc/textcvt.c
index 0030590cf926..23299e33210d 100644
--- a/sal/textenc/textcvt.c
+++ b/sal/textenc/textcvt.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx
index ab98b4bfa625..fc3c38871b76 100644
--- a/sal/textenc/textenc.cxx
+++ b/sal/textenc/textenc.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/unichars.c b/sal/textenc/unichars.c
index 0d4131699732..e8b8aec23225 100644
--- a/sal/textenc/unichars.c
+++ b/sal/textenc/unichars.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/textenc/unichars.h b/sal/textenc/unichars.h
index f1e18460dfb0..856ae585f55a 100644
--- a/sal/textenc/unichars.h
+++ b/sal/textenc/unichars.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/typesconfig/typesconfig.c b/sal/typesconfig/typesconfig.c
index 10d6d1b66a59..d913c3b7544b 100644
--- a/sal/typesconfig/typesconfig.c
+++ b/sal/typesconfig/typesconfig.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,20 +39,20 @@
 #include <signal.h>
 #include <setjmp.h>
 
-#define printTypeSize(Type,Name)    printf( "sizeof(%s)\t\t= %d\n", Name, (int) sizeof (Type) )
+#define printTypeSize(Type,Name)	printf(	"sizeof(%s)\t\t= %d\n", Name, (int) sizeof (Type) )
 
-#define isSignedType(Type)  (((Type)-1) < 0)
-#define printTypeSign(Type,Name)    printf( "%s\t\t= %s %s\n", Name, ( isSignedType(Type) ? "signed" : "unsigned" ), Name )
+#define isSignedType(Type)	(((Type)-1) < 0)
+#define printTypeSign(Type,Name)	printf(	"%s\t\t= %s %s\n", Name, ( isSignedType(Type) ? "signed" : "unsigned" ), Name )
 
 
 /*************************************************************************
 |*
-|*  IsBigEndian()
+|*	IsBigEndian()
 |*
-|*  Beschreibung        True, wenn CPU BigEndian ist
+|*	Beschreibung		True, wenn CPU BigEndian ist
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 int IsBigEndian()
@@ -63,7 +63,7 @@ int IsBigEndian()
 
 /*************************************************************************
 |*
-|*  Typdeclarations for memory access test functions
+|*	Typdeclarations for memory access test functions
 |*
 *************************************************************************/
 typedef enum { t_char, t_short, t_int, t_long, t_double } Type;
@@ -72,12 +72,12 @@ typedef int (*TestFunc)( Type, void* );
 
 /*************************************************************************
 |*
-|*  PrintArgs()
+|*	PrintArgs()
 |*
-|*  Beschreibung        Testfunktion fuer variable Parameter
+|*	Beschreibung		Testfunktion fuer variable Parameter
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 void PrintArgs( int p, ... )
@@ -98,12 +98,12 @@ void PrintArgs( int p, ... )
 
 /*************************************************************************
 |*
-|*  SignalHdl()
+|*	SignalHdl()
 |*
-|*  Beschreibung        faengt SIGBUS und SIGSEGV in check() ab
+|*	Beschreibung		faengt SIGBUS und SIGSEGV in check() ab
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 
@@ -119,12 +119,12 @@ void SignalHdl( int sig )
 
 /*************************************************************************
 |*
-|*  check()
+|*	check()
 |*
-|*  Beschreibung        Testet MemoryZugriff (read/write)
+|*	Beschreibung		Testet MemoryZugriff (read/write)
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 int check( TestFunc func, Type eT, void* p )
@@ -153,12 +153,12 @@ int check( TestFunc func, Type eT, void* p )
 
 /*************************************************************************
 |*
-|*  GetAtAddress()
+|*	GetAtAddress()
 |*
-|*  Beschreibung        memory read access
+|*	Beschreibung		memory read access
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 #if defined(IA64) || defined(ARM32) || defined(HPPA) || defined(AXP)
@@ -178,11 +178,11 @@ int GetAtAddress( Type eT, void* p )
 {
   switch ( eT )
   {
-  case t_char:      return *((char*)p);
-  case t_short:     if ((long)p % sizeof(short)) return forceerror(); else return *((short*)p);
-  case t_int:       if ((long)p % sizeof(int)) return forceerror(); else return *((int*)p);
-  case t_long:      if ((long)p % sizeof(long)) return forceerror(); else return *((long*)p);
-  case t_double:    if ((long)p % sizeof(double)) return forceerror(); else return *((double*)p);
+  case t_char:		return *((char*)p);
+  case t_short:		if ((long)p % sizeof(short)) return forceerror(); else return *((short*)p);
+  case t_int:		if ((long)p % sizeof(int)) return forceerror(); else return *((int*)p);
+  case t_long:		if ((long)p % sizeof(long)) return forceerror(); else return *((long*)p);
+  case t_double:	if ((long)p % sizeof(double)) return forceerror(); else return *((double*)p);
   }
   abort();
 }
@@ -212,23 +212,23 @@ int dummy(void* unused)
 #endif
 /*************************************************************************
 |*
-|*  SetAtAddress()
+|*	SetAtAddress()
 |*
-|*  Beschreibung        memory write access
+|*	Beschreibung		memory write access
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 int SetAtAddress( Type eT, void* p )
 {
   switch ( eT )
   {
-  case t_char:      return *((char*)p)  = 0;
-  case t_short:     return *((short*)p) = 0;
-  case t_int:       return *((int*)p)   = 0;
-  case t_long:      return *((long*)p)  = 0;
-  case t_double:    return *((double*)p)= 0;
+  case t_char:		return *((char*)p)	= 0;
+  case t_short:		return *((short*)p)	= 0;
+  case t_int:		return *((int*)p)	= 0;
+  case t_long:		return *((long*)p)	= 0;
+  case t_double:	return *((double*)p)= 0;
   }
   abort();
 }
@@ -237,24 +237,24 @@ char* TypeName( Type eT )
 {
   switch ( eT )
   {
-  case t_char:      return "char";
-  case t_short:     return "short";
-  case t_int:       return "int";
-  case t_long:      return "long";
-  case t_double:    return "double";
+  case t_char:		return "char";
+  case t_short:		return "short";
+  case t_int:		return "int";
+  case t_long:		return "long";
+  case t_double:	return "double";
   }
   abort();
 }
 
 /*************************************************************************
 |*
-|*  Check(Get|Set)Access()
+|*	Check(Get|Set)Access()
 |*
-|*  Beschreibung        Testet MemoryZugriff (read/write)
-|*                      Zugriffsverletzungen werden abgefangen
+|*	Beschreibung		Testet MemoryZugriff (read/write)
+|*						Zugriffsverletzungen werden abgefangen
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 int CheckGetAccess( Type eT, void* p )
@@ -283,19 +283,19 @@ int CheckSetAccess( Type eT, void* p )
 
 /*************************************************************************
 |*
-|*  GetAlignment()
+|*	GetAlignment()
 |*
-|*  Beschreibung        Bestimmt das Alignment verschiedener Typen
+|*	Beschreibung		Bestimmt das Alignment verschiedener Typen
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 int GetAlignment( Type eT )
 {
-  char  a[ 16*8 ];
-  long  p = (long)(void*)a;
-  int   i;
+  char	a[ 16*8 ];
+  long	p = (long)(void*)a;
+  int	i;
 
   /* clear a[...] to set legal value for double access */
   for ( i = 0; i < 16*8; i++ )
@@ -310,33 +310,33 @@ int GetAlignment( Type eT )
 
 /*************************************************************************
 |*
-|*  struct Description
+|*	struct Description
 |*
-|*  Beschreibung        Beschreibt die Parameter der Architektur
+|*	Beschreibung		Beschreibt die Parameter der Architektur
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 struct Description
 {
-  int   bBigEndian;
-  int   nAlignment[3];  /* 2,4,8 */
+  int	bBigEndian;
+  int	nAlignment[3];	/* 2,4,8 */
 };
 
 /*************************************************************************
 |*
-|*  Description_Ctor()
+|*	Description_Ctor()
 |*
-|*  Beschreibung        Bestimmt die Parameter der Architektur
+|*	Beschreibung		Bestimmt die Parameter der Architektur
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 void Description_Ctor( struct Description* pThis )
 {
-  pThis->bBigEndian         = IsBigEndian();
+  pThis->bBigEndian			= IsBigEndian();
 
   if ( sizeof(short) != 2 )
     abort();
@@ -345,7 +345,7 @@ void Description_Ctor( struct Description* pThis )
     abort();
   pThis->nAlignment[1] = GetAlignment( t_int );
 
-  if      ( sizeof(long) == 8 )
+  if	  ( sizeof(long) == 8 )
     pThis->nAlignment[2] = GetAlignment( t_long );
   else if ( sizeof(double) == 8 )
     pThis->nAlignment[2] = GetAlignment( t_double );
@@ -355,12 +355,12 @@ void Description_Ctor( struct Description* pThis )
 
 /*************************************************************************
 |*
-|*  Description_Print()
+|*	Description_Print()
 |*
-|*  Beschreibung        Schreibt die Parameter der Architektur als Header
+|*	Beschreibung		Schreibt die Parameter der Architektur als Header
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 void Description_Print( struct Description* pThis, char* name )
@@ -394,12 +394,12 @@ void Description_Print( struct Description* pThis, char* name )
 
 /*************************************************************************
 |*
-|*  InfoMemoryAccess()
+|*	InfoMemoryAccess()
 |*
-|*  Beschreibung        Informeller Bytezugriffstest
+|*	Beschreibung		Informeller Bytezugriffstest
 |*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 26.06.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 void InfoMemoryAccess( char* p )
@@ -417,12 +417,12 @@ void InfoMemoryAccess( char* p )
 
 /*************************************************************************
 |*
-|*  InfoMemoryTypeAccess()
+|*	InfoMemoryTypeAccess()
 |*
-|*  Beschreibung        Informeller Zugriffstest verschiedener Typen
+|*	Beschreibung		Informeller Zugriffstest verschiedener Typen
 |*
-|*  Ersterstellung      EG 15.08.96
-|*  Letzte Aenderung
+|*	Ersterstellung		EG 15.08.96
+|*	Letzte Aenderung
 |*
 *************************************************************************/
 void InfoMemoryTypeAccess( Type eT )
@@ -444,7 +444,7 @@ void InfoMemoryTypeAccess( Type eT )
 }
 /************************************************************************
  *
- *  Use C code to determine the characteristics of the building platform.
+ * 	Use C code to determine the characteristics of the building platform.
  *
  ************************************************************************/
 int main( int argc, char* argv[] )
diff --git a/sal/workben/clipboardwben/testcopy/StdAfx.cpp b/sal/workben/clipboardwben/testcopy/StdAfx.cpp
index b39aced7f001..0c7c7953f9c9 100644
--- a/sal/workben/clipboardwben/testcopy/StdAfx.cpp
+++ b/sal/workben/clipboardwben/testcopy/StdAfx.cpp
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 // stdafx.cpp : Quelltextdatei, die nur die Standard-Includes einbindet
-//  TestWin32.pch ist die vorkompilierte Header-Datei
-//  stdafx.obj enthält die vorkompilierte Typinformation
+//	TestWin32.pch ist die vorkompilierte Header-Datei
+//	stdafx.obj enthält die vorkompilierte Typinformation
 
 #include "stdafx.h"
 
diff --git a/sal/workben/clipboardwben/testcopy/StdAfx.h b/sal/workben/clipboardwben/testcopy/StdAfx.h
index d71036003969..01bd5846af73 100644
--- a/sal/workben/clipboardwben/testcopy/StdAfx.h
+++ b/sal/workben/clipboardwben/testcopy/StdAfx.h
@@ -11,7 +11,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#define WIN32_LEAN_AND_MEAN     // Selten benutzte Teile der Windows-Header nicht einbinden
+#define WIN32_LEAN_AND_MEAN		// Selten benutzte Teile der Windows-Header nicht einbinden
 
 
 // Windows-Header-Dateien:
diff --git a/sal/workben/clipboardwben/testcopy/XTDataObject.cxx b/sal/workben/clipboardwben/testcopy/XTDataObject.cxx
index d8e80a895c27..09b75f78948e 100644
--- a/sal/workben/clipboardwben/testcopy/XTDataObject.cxx
+++ b/sal/workben/clipboardwben/testcopy/XTDataObject.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -71,7 +71,7 @@ CXTDataObject::~CXTDataObject( )
 //------------------------------------------------------------------------
 
 STDMETHODIMP CXTDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
-{
+{	
     OSL_ASSERT( NULL != ppvObject );
 
     if ( NULL == ppvObject )
@@ -112,7 +112,7 @@ STDMETHODIMP_(ULONG) CXTDataObject::Release( )
     ULONG nRefCnt = static_cast< ULONG >( InterlockedDecrement( &m_nRefCnt ) );
 
     if ( 0 == nRefCnt )
-    {
+    {		
         delete this;
     }
 
@@ -125,10 +125,10 @@ STDMETHODIMP_(ULONG) CXTDataObject::Release( )
 //------------------------------------------------------------------------
 
 STDMETHODIMP CXTDataObject::GetData(LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium )
-{
-    OSL_ASSERT( ( NULL != pFormatetc ) &&
+{	
+    OSL_ASSERT( ( NULL != pFormatetc ) && 
                 ( !IsBadReadPtr( (LPVOID)pFormatetc, sizeof( FORMATETC ) ) ) );
-    OSL_ASSERT( ( NULL != pmedium ) &&
+    OSL_ASSERT( ( NULL != pmedium ) && 
                 ( !IsBadWritePtr( (LPVOID)pmedium, sizeof( STGMEDIUM ) ) ) );
 
     if ( ( NULL == pFormatetc ) || ( NULL == pmedium ) )
@@ -142,13 +142,13 @@ STDMETHODIMP CXTDataObject::GetData(LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium
         LPSTREAM lpStream;
 
         hr = CreateStreamOnHGlobal( NULL, FALSE, &lpStream );
-        if ( SUCCEEDED( hr ) )
+        if ( SUCCEEDED( hr ) ) 
         {
             hr = lpStream->Write( buff, sizeof( buff ) * sizeof( char ), NULL );
             if ( SUCCEEDED( hr ) )
             {
                 HGLOBAL hGlob;
-
+                
                 GetHGlobalFromStream( lpStream, &hGlob );
 
                 pmedium->tymed          = TYMED_HGLOBAL;
@@ -169,13 +169,13 @@ STDMETHODIMP CXTDataObject::GetData(LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium
         LPSTREAM lpStream;
 
         hr = CreateStreamOnHGlobal( NULL, FALSE, &lpStream );
-        if ( SUCCEEDED( hr ) )
+        if ( SUCCEEDED( hr ) ) 
         {
             hr = lpStream->Write( buff, sizeof( buff ) * sizeof( WCHAR ), NULL );
             if ( SUCCEEDED( hr ) )
             {
                 HGLOBAL hGlob;
-
+                
                 GetHGlobalFromStream( lpStream, &hGlob );
 
                 pmedium->tymed          = TYMED_HGLOBAL;
@@ -202,7 +202,7 @@ STDMETHODIMP CXTDataObject::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** p
 {
     if ( ( NULL == ppenumFormatetc ) || ( DATADIR_SET == dwDirection ) )
         return E_INVALIDARG;
-
+    
     *ppenumFormatetc = NULL;
 
     HRESULT hr = E_FAIL;
@@ -346,7 +346,7 @@ STDMETHODIMP CEnumFormatEtc::QueryInterface( REFIID iid, LPVOID* ppvObject )
 STDMETHODIMP_(ULONG) CEnumFormatEtc::AddRef( )
 {
     // keep the dataobject alive
-    m_pUnkDataObj->AddRef( );
+    m_pUnkDataObj->AddRef( );		
     return InterlockedIncrement( &m_nRefCnt );
 }
 
@@ -356,7 +356,7 @@ STDMETHODIMP_(ULONG) CEnumFormatEtc::AddRef( )
 
 STDMETHODIMP_(ULONG) CEnumFormatEtc::Release( )
 {
-    // release the outer dataobject
+    // release the outer dataobject		
     m_pUnkDataObj->Release( );
 
     // we need a helper variable because it's
@@ -375,7 +375,7 @@ STDMETHODIMP_(ULONG) CEnumFormatEtc::Release( )
 
 STDMETHODIMP CEnumFormatEtc::Next( ULONG celt, LPFORMATETC rgelt, ULONG* pceltFetched )
 {
-    OSL_ASSERT( ( ( celt > 0 ) && ( NULL != rgelt ) ) ||
+    OSL_ASSERT( ( ( celt > 0 ) && ( NULL != rgelt ) ) || 
                 ( ( 0 == celt ) && ( NULL == rgelt ) ) );
 
     if ( ( 0 != celt ) && ( NULL == rgelt ) )
@@ -398,9 +398,9 @@ STDMETHODIMP CEnumFormatEtc::Next( ULONG celt, LPFORMATETC rgelt, ULONG* pceltFe
         ++m_nCurrentPos;
         ++rgelt;
         --ulToFetch;
-        ++ulFetched;
+        ++ulFetched;		
     }
-
+    
     if ( ulFetched == celt )
         hr = S_OK;
 
@@ -452,9 +452,9 @@ STDMETHODIMP CEnumFormatEtc::Clone( IEnumFORMATETC** ppenum )
         return E_INVALIDARG;
 
     HRESULT hr = E_FAIL;
-
+    
     *ppenum = NULL;
-
+    
     CEnumFormatEtc* pCEnumFEtc = new CEnumFormatEtc( m_pUnkDataObj );
     if ( NULL != pCEnumFEtc )
     {
diff --git a/sal/workben/clipboardwben/testcopy/XTDataObject.hxx b/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
index e6b68408e62a..19d6000ede94 100644
--- a/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
+++ b/sal/workben/clipboardwben/testcopy/XTDataObject.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@
 
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 class EnumFormatEtc;
@@ -62,12 +62,12 @@ public:
     // ole interface implementation
     //-----------------------------------------------------------------
 
-    //IUnknown
+    //IUnknown 
     STDMETHODIMP           QueryInterface(REFIID iid, LPVOID* ppvObject);
     STDMETHODIMP_( ULONG ) AddRef( );
     STDMETHODIMP_( ULONG ) Release( );
 
-    //IDataObject
+    //IDataObject 
     STDMETHODIMP GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium );
     STDMETHODIMP GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium );
     STDMETHODIMP QueryGetData( LPFORMATETC pFormatetc );
@@ -86,7 +86,7 @@ public:
     //sal_Int64 SAL_CALL QueryDataSize( );
 
     // retrieve the data from the source
-    // necessary so that
+    // necessary so that 
     //void SAL_CALL GetAllDataFromSource( );
 
 private:
@@ -100,7 +100,7 @@ private:
 };
 
 //------------------------------------------------------------------------
-//
+// 
 //------------------------------------------------------------------------
 
 class CEnumFormatEtc : public IEnumFORMATETC
@@ -109,21 +109,21 @@ public:
     CEnumFormatEtc( LPUNKNOWN pUnkDataObj );
     ~CEnumFormatEtc( );
 
-    // IUnknown
+    // IUnknown 
     STDMETHODIMP           QueryInterface( REFIID iid, LPVOID* ppvObject );
     STDMETHODIMP_( ULONG ) AddRef( );
     STDMETHODIMP_( ULONG ) Release( );
 
-    //IEnumFORMATETC
+    //IEnumFORMATETC 
     STDMETHODIMP Next( ULONG celt, LPFORMATETC rgelt, ULONG* pceltFetched );
     STDMETHODIMP Skip( ULONG celt );
     STDMETHODIMP Reset( );
     STDMETHODIMP Clone( IEnumFORMATETC** ppenum );
 
 private:
-    LONG        m_nRefCnt;
-    LPUNKNOWN   m_pUnkDataObj;
-    ULONG       m_nCurrentPos;
+    LONG		m_nRefCnt;
+    LPUNKNOWN	m_pUnkDataObj;
+    ULONG		m_nCurrentPos;
     CLIPFORMAT  m_cfFormats[2];
 };
 
diff --git a/sal/workben/clipboardwben/testcopy/cbcpytest.cxx b/sal/workben/clipboardwben/testcopy/cbcpytest.cxx
index b9f3b64b45b3..b8489553224a 100644
--- a/sal/workben/clipboardwben/testcopy/cbcpytest.cxx
+++ b/sal/workben/clipboardwben/testcopy/cbcpytest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,33 +57,33 @@
 #define MSG_FLUSHCLIPBOARD WM_USER + 1
 
 // Globale Variablen:
-HINSTANCE           hInst;                      // aktuelle Instanz
-TCHAR               szTitle[MAX_LOADSTRING];            // Text der Titelzeile
-TCHAR               szWindowClass[MAX_LOADSTRING];  // Text der Titelzeile
-ATOM                MyRegisterClass( HINSTANCE hInstance );
-BOOL                InitInstance( HINSTANCE, int );
-LRESULT CALLBACK    WndProc( HWND, UINT, WPARAM, LPARAM );
-LRESULT CALLBACK    About( HWND, UINT, WPARAM, LPARAM );
-void                CopyClipboardData(HWND hwndParent);
-void                FlushClipboard( );
-void                PasteData( HWND hWnd );
-void                SetLocale();
-
-
-LPSTREAM            g_pStm    = NULL;
-char*               pTextBuff = NULL;
-DWORD               lData     = 0;
+HINSTANCE			hInst;						// aktuelle Instanz
+TCHAR				szTitle[MAX_LOADSTRING];			// Text der Titelzeile
+TCHAR				szWindowClass[MAX_LOADSTRING];	// Text der Titelzeile
+ATOM				MyRegisterClass( HINSTANCE hInstance );
+BOOL				InitInstance( HINSTANCE, int );
+LRESULT CALLBACK	WndProc( HWND, UINT, WPARAM, LPARAM );
+LRESULT CALLBACK	About( HWND, UINT, WPARAM, LPARAM );
+void				CopyClipboardData(HWND hwndParent);
+void				FlushClipboard( );
+void				PasteData( HWND hWnd );
+void				SetLocale();
+
+
+LPSTREAM			g_pStm    = NULL;
+char*				pTextBuff = NULL;
+DWORD				lData     = 0;
 CXTDataObject*      g_xtDo    = NULL;
-HWND                g_hWnd;
-HANDLE              g_hEvent;
-BOOL                g_bEnd;
+HWND				g_hWnd;
+HANDLE				g_hEvent;
+BOOL				g_bEnd;
 
 //----------------------------------------------------
 // a thread function
 //----------------------------------------------------
 
 unsigned int _stdcall ThreadProc(LPVOID pParam)
-{
+{	
     while( !g_bEnd )
     {
         WaitForSingleObject( g_hEvent, INFINITE );
@@ -131,7 +131,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 #else
     hr = OleInitialize( NULL );
 #endif
-
+    
 
     // Globale Zeichenfolgen initialisieren
     LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);
@@ -139,7 +139,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     MyRegisterClass(hInstance);
 
     // Initialisierung der Anwendung durchführen:
-    if( !InitInstance( hInstance, nCmdShow ) )
+    if( !InitInstance( hInstance, nCmdShow ) ) 
     {
         return FALSE;
     }
@@ -147,9 +147,9 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     hAccelTable = LoadAccelerators(hInstance, (LPCTSTR)IDC_TESTWIN32);
 
     // Hauptnachrichtenschleife:
-    while( GetMessage(&msg, NULL, 0, 0) )
+    while( GetMessage(&msg, NULL, 0, 0) ) 
     {
-        if( !TranslateAccelerator (msg.hwnd, hAccelTable, &msg) )
+        if( !TranslateAccelerator (msg.hwnd, hAccelTable, &msg) ) 
         {
             TranslateMessage( &msg );
             DispatchMessage( &msg );
@@ -161,7 +161,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     CoUninitialize( );
 #else
     OleUninitialize( );
-#endif
+#endif	
 
     CloseHandle( g_hEvent );
 
@@ -188,19 +188,19 @@ ATOM MyRegisterClass( HINSTANCE hInstance )
 {
     WNDCLASSEX wcex;
 
-    wcex.cbSize = sizeof(WNDCLASSEX);
+    wcex.cbSize = sizeof(WNDCLASSEX); 
 
-    wcex.style          = CS_HREDRAW | CS_VREDRAW;
-    wcex.lpfnWndProc    = (WNDPROC)WndProc;
-    wcex.cbClsExtra     = 0;
-    wcex.cbWndExtra     = 0;
-    wcex.hInstance      = hInstance;
-    wcex.hIcon          = LoadIcon(hInstance, (LPCTSTR)IDI_TESTWIN32);
-    wcex.hCursor        = LoadCursor(NULL, IDC_ARROW);
-    wcex.hbrBackground  = (HBRUSH)(COLOR_WINDOW+1);
-    wcex.lpszMenuName   = (LPCTSTR)IDC_TESTWIN32;
-    wcex.lpszClassName  = _T(szWindowClass);
-    wcex.hIconSm        = LoadIcon(wcex.hInstance, (LPCTSTR)IDI_SMALL);
+    wcex.style			= CS_HREDRAW | CS_VREDRAW;
+    wcex.lpfnWndProc	= (WNDPROC)WndProc;
+    wcex.cbClsExtra		= 0;
+    wcex.cbWndExtra		= 0;
+    wcex.hInstance		= hInstance;
+    wcex.hIcon			= LoadIcon(hInstance, (LPCTSTR)IDI_TESTWIN32);
+    wcex.hCursor		= LoadCursor(NULL, IDC_ARROW);
+    wcex.hbrBackground	= (HBRUSH)(COLOR_WINDOW+1);
+    wcex.lpszMenuName	= (LPCTSTR)IDC_TESTWIN32;
+    wcex.lpszClassName	= _T(szWindowClass);
+    wcex.hIconSm		= LoadIcon(wcex.hInstance, (LPCTSTR)IDI_SMALL);
 
     return RegisterClassEx(&wcex);
 }
@@ -223,7 +223,7 @@ BOOL InitInstance( HINSTANCE hInstance, int nCmdShow )
    g_hWnd = CreateWindowEx(0, szWindowClass, szTitle, WS_OVERLAPPEDWINDOW,
       CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, hInstance, NULL);
 
-   if( !g_hWnd )
+   if( !g_hWnd ) 
    {
       return FALSE;
    }
@@ -239,9 +239,9 @@ BOOL InitInstance( HINSTANCE hInstance, int nCmdShow )
 //
 //  AUFGABE:  Verarbeitet Nachrichten für das Hauptfenster.
 //
-//  WM_COMMAND  - Anwendungsmenü verarbeiten
-//  WM_PAINT    - Hauptfenster darstellen
-//  WM_DESTROY  - Beendigungsnachricht ausgeben und zurückkehren
+//  WM_COMMAND	- Anwendungsmenü verarbeiten
+//  WM_PAINT	- Hauptfenster darstellen
+//  WM_DESTROY	- Beendigungsnachricht ausgeben und zurückkehren
 //----------------------------------------------------------------
 
 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
@@ -251,19 +251,19 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     PAINTSTRUCT ps;
     HDC         hdc;
     TCHAR       szHello[MAX_LOADSTRING];
-
-
+    
+    
     LoadString(hInst, IDS_HELLO, szHello, MAX_LOADSTRING);
 
-    switch( message )
+    switch( message ) 
     {
         case WM_COMMAND:
-            wmId    = LOWORD(wParam);
-            wmEvent = HIWORD(wParam);
+            wmId    = LOWORD(wParam); 
+            wmEvent = HIWORD(wParam); 
             // Menüauswahlen analysieren:
-            switch( wmId )
+            switch( wmId ) 
             {
-                case IDD_COPY:
+                case IDD_COPY:					
                     CopyClipboardData(hWnd);
                     break;
                 case IDD_PASTE2:
@@ -286,7 +286,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             // ZU ERLEDIGEN: Hier beliebigen Code zum Zeichnen hinzufügen...
             RECT rt;
             GetClientRect( hWnd, &rt );
-
+            
             if ( NULL != pTextBuff )
             {
                 DrawText( hdc, pTextBuff, lData, &rt, DT_CENTER );
@@ -320,7 +320,7 @@ void CopyClipboardData( HWND hWnd )
 {
     g_xtDo = new CXTDataObject( 1 );
 #ifdef USE_MTACB
-    MTASetClipboard( static_cast< IDataObject* >( g_xtDo ) );
+    MTASetClipboard( static_cast< IDataObject* >( g_xtDo ) );	
 #else
     OleSetClipboard( static_cast< IDataObject* >( g_xtDo ) );
 #endif
@@ -335,7 +335,7 @@ void FlushClipboard( )
     if ( NULL != g_xtDo )
     {
 #ifdef USE_MTACB
-        HRESULT hr = MTAIsCurrentClipboard( static_cast< IDataObject* >( g_xtDo ) );
+        HRESULT hr = MTAIsCurrentClipboard( static_cast< IDataObject* >( g_xtDo ) ); 
         if ( S_OK == hr )
             MTAFlushClipboard( );
 #else
@@ -368,14 +368,14 @@ void PasteData(HWND hWnd)
         fetc.tymed    = TYMED_HGLOBAL;
 
         hr = pDataObj->GetData( &fetc, &stgmedium );
-        if ( SUCCEEDED( hr ) )
+        if ( SUCCEEDED( hr ) ) 
         {
             LPVOID lpData = GlobalLock( stgmedium.hGlobal );
-
+            
             if ( NULL != lpData )
             {
                 LCID lcid = *( (WORD*)lpData );
-
+            
                 WORD langID = LANGIDFROMLCID( lcid );
                 WORD sublangID = SUBLANGID( langID );
 
@@ -398,7 +398,7 @@ void PasteData(HWND hWnd)
 
 void SetLocale()
 {
-    LCID threadLcid = GetThreadLocale();
+    LCID threadLcid = GetThreadLocale();			   
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/clipboardwben/testcopy/resource.h b/sal/workben/clipboardwben/testcopy/resource.h
index 49813993870a..4a3602f7fc3c 100644
--- a/sal/workben/clipboardwben/testcopy/resource.h
+++ b/sal/workben/clipboardwben/testcopy/resource.h
@@ -21,7 +21,7 @@
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
-//
+// 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        129
diff --git a/sal/workben/clipboardwben/testpaste/StdAfx.cpp b/sal/workben/clipboardwben/testpaste/StdAfx.cpp
index b39aced7f001..0c7c7953f9c9 100644
--- a/sal/workben/clipboardwben/testpaste/StdAfx.cpp
+++ b/sal/workben/clipboardwben/testpaste/StdAfx.cpp
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 // stdafx.cpp : Quelltextdatei, die nur die Standard-Includes einbindet
-//  TestWin32.pch ist die vorkompilierte Header-Datei
-//  stdafx.obj enthält die vorkompilierte Typinformation
+//	TestWin32.pch ist die vorkompilierte Header-Datei
+//	stdafx.obj enthält die vorkompilierte Typinformation
 
 #include "stdafx.h"
 
diff --git a/sal/workben/clipboardwben/testpaste/StdAfx.h b/sal/workben/clipboardwben/testpaste/StdAfx.h
index d71036003969..01bd5846af73 100644
--- a/sal/workben/clipboardwben/testpaste/StdAfx.h
+++ b/sal/workben/clipboardwben/testpaste/StdAfx.h
@@ -11,7 +11,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#define WIN32_LEAN_AND_MEAN     // Selten benutzte Teile der Windows-Header nicht einbinden
+#define WIN32_LEAN_AND_MEAN		// Selten benutzte Teile der Windows-Header nicht einbinden
 
 
 // Windows-Header-Dateien:
diff --git a/sal/workben/clipboardwben/testpaste/cbptest.cxx b/sal/workben/clipboardwben/testpaste/cbptest.cxx
index 442b3728a824..3273535c3cfb 100644
--- a/sal/workben/clipboardwben/testpaste/cbptest.cxx
+++ b/sal/workben/clipboardwben/testpaste/cbptest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,33 +52,33 @@
 #define MAX_LOADSTRING 100
 
 // Globale Variablen:
-HINSTANCE           hInst;                      // aktuelle Instanz
-WCHAR               szTitle[MAX_LOADSTRING];            // Text der Titelzeile
-WCHAR               szWindowClass[MAX_LOADSTRING];  // Text der Titelzeile
-ATOM                MyRegisterClass( HINSTANCE hInstance );
-BOOL                InitInstance( HINSTANCE, int );
-LRESULT CALLBACK    WndProc( HWND, UINT, WPARAM, LPARAM );
-LRESULT CALLBACK    About( HWND, UINT, WPARAM, LPARAM );
-void                PasteClipboardData(HWND hwndParent);
-void                PasteClipboardData2(HWND hwndParent);
-
-LPSTREAM            g_pStm    = NULL;
-char*               pTextBuff = NULL;
-DWORD               lData     = 0;
+HINSTANCE			hInst;						// aktuelle Instanz
+WCHAR				szTitle[MAX_LOADSTRING];			// Text der Titelzeile
+WCHAR				szWindowClass[MAX_LOADSTRING];	// Text der Titelzeile
+ATOM				MyRegisterClass( HINSTANCE hInstance );
+BOOL				InitInstance( HINSTANCE, int );
+LRESULT CALLBACK	WndProc( HWND, UINT, WPARAM, LPARAM );
+LRESULT CALLBACK	About( HWND, UINT, WPARAM, LPARAM );
+void				PasteClipboardData(HWND hwndParent);
+void				PasteClipboardData2(HWND hwndParent);
+
+LPSTREAM			g_pStm    = NULL;
+char*				pTextBuff = NULL;
+DWORD				lData     = 0;
 
 //----------------------------------------------------
 // a thread function
 //----------------------------------------------------
 
 unsigned int _stdcall ThreadProc(LPVOID pParam)
-{
+{	
     IDataObject* pIDataObj = NULL;
     FORMATETC    formatETC;
-    STGMEDIUM    stgMedium;
-    LPVOID       pGlobMem;
-    HWND         hwnd;
-    DWORD        sizeGlobBuff;
-    HRESULT      hr;
+    STGMEDIUM	 stgMedium;
+    LPVOID		 pGlobMem;
+    HWND		 hwnd;
+    DWORD		 sizeGlobBuff;
+    HRESULT		 hr;
 
     hwnd = (HWND)pParam;
 
@@ -87,8 +87,8 @@ unsigned int _stdcall ThreadProc(LPVOID pParam)
     hr = OleGetClipboard( &pIDataObj );
 
     hr = CoGetInterfaceAndReleaseStream(
-        g_pStm,
-        __uuidof(IDataObject),
+        g_pStm, 
+        __uuidof(IDataObject), 
         reinterpret_cast<LPVOID*>(&pIDataObj));
 
     formatETC.cfFormat = CF_TEXT;
@@ -156,7 +156,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     MyRegisterClass(hInstance);
 
     // Initialisierung der Anwendung durchführen:
-    if( !InitInstance( hInstance, nCmdShow ) )
+    if( !InitInstance( hInstance, nCmdShow ) ) 
     {
         return FALSE;
     }
@@ -164,9 +164,9 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     hAccelTable = LoadAccelerators(hInstance, (LPCTSTR)IDC_TESTWIN32);
 
     // Hauptnachrichtenschleife:
-    while( GetMessage(&msg, NULL, 0, 0) )
+    while( GetMessage(&msg, NULL, 0, 0) ) 
     {
-        if( !TranslateAccelerator (msg.hwnd, hAccelTable, &msg) )
+        if( !TranslateAccelerator (msg.hwnd, hAccelTable, &msg) ) 
         {
             TranslateMessage( &msg );
             DispatchMessage( &msg );
@@ -199,19 +199,19 @@ ATOM MyRegisterClass( HINSTANCE hInstance )
 {
     WNDCLASSEXW wcex;
 
-    wcex.cbSize = sizeof(WNDCLASSEX);
+    wcex.cbSize = sizeof(WNDCLASSEX); 
 
-    wcex.style          = CS_HREDRAW | CS_VREDRAW;
-    wcex.lpfnWndProc    = (WNDPROC)WndProc;
-    wcex.cbClsExtra     = 0;
-    wcex.cbWndExtra     = 0;
-    wcex.hInstance      = hInstance;
-    wcex.hIcon          = LoadIcon(hInstance, (LPCTSTR)IDI_TESTWIN32);
-    wcex.hCursor        = LoadCursor(NULL, IDC_ARROW);
-    wcex.hbrBackground  = (HBRUSH)(COLOR_WINDOW+1);
-    wcex.lpszMenuName   = (LPCWSTR)IDC_TESTWIN32;
-    wcex.lpszClassName  = szWindowClass;
-    wcex.hIconSm        = LoadIcon(wcex.hInstance, (LPCTSTR)IDI_SMALL);
+    wcex.style			= CS_HREDRAW | CS_VREDRAW;
+    wcex.lpfnWndProc	= (WNDPROC)WndProc;
+    wcex.cbClsExtra		= 0;
+    wcex.cbWndExtra		= 0;
+    wcex.hInstance		= hInstance;
+    wcex.hIcon			= LoadIcon(hInstance, (LPCTSTR)IDI_TESTWIN32);
+    wcex.hCursor		= LoadCursor(NULL, IDC_ARROW);
+    wcex.hbrBackground	= (HBRUSH)(COLOR_WINDOW+1);
+    wcex.lpszMenuName	= (LPCWSTR)IDC_TESTWIN32;
+    wcex.lpszClassName	= szWindowClass;
+    wcex.hIconSm		= LoadIcon(wcex.hInstance, (LPCTSTR)IDI_SMALL);
 
     return RegisterClassExW(&wcex);
 }
@@ -235,7 +235,7 @@ BOOL InitInstance( HINSTANCE hInstance, int nCmdShow )
    hWnd = CreateWindowExW(0, szWindowClass, szTitle, WS_OVERLAPPEDWINDOW,
       CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, hInstance, NULL);
 
-   if( !hWnd )
+   if( !hWnd ) 
    {
       return FALSE;
    }
@@ -251,9 +251,9 @@ BOOL InitInstance( HINSTANCE hInstance, int nCmdShow )
 //
 //  AUFGABE:  Verarbeitet Nachrichten für das Hauptfenster.
 //
-//  WM_COMMAND  - Anwendungsmenü verarbeiten
-//  WM_PAINT    - Hauptfenster darstellen
-//  WM_DESTROY  - Beendigungsnachricht ausgeben und zurückkehren
+//  WM_COMMAND	- Anwendungsmenü verarbeiten
+//  WM_PAINT	- Hauptfenster darstellen
+//  WM_DESTROY	- Beendigungsnachricht ausgeben und zurückkehren
 //
 //
 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
@@ -263,17 +263,17 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     PAINTSTRUCT ps;
     HDC         hdc;
     TCHAR       szHello[MAX_LOADSTRING];
-
-
+    
+    
     LoadString(hInst, IDS_HELLO, szHello, MAX_LOADSTRING);
 
-    switch( message )
+    switch( message ) 
     {
         case WM_COMMAND:
-            wmId    = LOWORD(wParam);
-            wmEvent = HIWORD(wParam);
+            wmId    = LOWORD(wParam); 
+            wmEvent = HIWORD(wParam); 
             // Menüauswahlen analysieren:
-            switch( wmId )
+            switch( wmId ) 
             {
                 case IDD_PASTE:
                     //PasteClipboardData(hWnd);
@@ -294,7 +294,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             // ZU ERLEDIGEN: Hier beliebigen Code zum Zeichnen hinzufügen...
             RECT rt;
             GetClientRect( hWnd, &rt );
-
+            
             if ( NULL != pTextBuff )
             {
                 DrawText( hdc, pTextBuff, lData, &rt, DT_CENTER );
@@ -320,16 +320,16 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 void PasteClipboardData2(HWND hwndParent)
 {
     IDataObject* pIDataObject;
-    HRESULT      hr;
+    HRESULT		 hr;
     FORMATETC    formatETC;
-    STGMEDIUM    stgMedium;
-    LPVOID       pGlobMem;
-    HWND         hwnd;
-    DWORD        sizeGlobBuff;
+    STGMEDIUM	 stgMedium;
+    LPVOID		 pGlobMem;
+    HWND		 hwnd;
+    DWORD		 sizeGlobBuff;
 
     hr = MTAGetClipboard( &pIDataObject );
-    if ( SUCCEEDED( hr ) )
-    {
+    if ( SUCCEEDED( hr ) ) 
+    {		
         formatETC.cfFormat = CF_TEXT;
         formatETC.ptd      = NULL;
         formatETC.dwAspect = DVASPECT_CONTENT;
@@ -381,16 +381,16 @@ void PasteClipboardData(HWND hwndParent)
         HRESULT hr = CoMarshalInterThreadInterfaceInStream(
             __uuidof(IDataObject), //The IID of inteface to be marshaled
             pIDataObj,       //The interface pointer
-            &g_pStm          //IStream pointer
+            &g_pStm          //IStream pointer 
             );
 
-        HANDLE hThread = (HANDLE)_beginthreadex(
-                NULL,       //Security
-                0,          //Stack Size
-                ThreadProc, //Start Address
-                NULL,       //Parmeter
-                (unsigned int)hwndParent,   //Creation Flag
-                &dwId       //Thread Id
+        HANDLE hThread = (HANDLE)_beginthreadex( 
+                NULL,		//Security
+                0,			//Stack Size
+                ThreadProc,	//Start Address
+                NULL,	    //Parmeter
+                (unsigned int)hwndParent,	//Creation Flag
+                &dwId		//Thread Id 
                 );
 
         //Wait for the thread to finish execution
@@ -399,13 +399,13 @@ void PasteClipboardData(HWND hwndParent)
         for(;;)
         {
             DWORD dwRet = ::MsgWaitForMultipleObjects(
-                                    1,          //Count of objects
-                                    &hThread,   //pointer to the array of objects
-                                    FALSE,      //Wait for all objects?
-                                    INFINITE,   //Wait How Long?
+                                    1,			//Count of objects
+                                    &hThread,	//pointer to the array of objects
+                                    FALSE,		//Wait for all objects?
+                                    INFINITE,	//Wait How Long?
                                     QS_ALLINPUT //Wait for all messges
                                     );
-
+        
             //This means that the object is signaled
             if ( dwRet != WAIT_OBJECT_0 + 1 )
                 break;
diff --git a/sal/workben/clipboardwben/testpaste/resource.h b/sal/workben/clipboardwben/testpaste/resource.h
index 3f0af2dc3ecc..8d396d09df85 100644
--- a/sal/workben/clipboardwben/testpaste/resource.h
+++ b/sal/workben/clipboardwben/testpaste/resource.h
@@ -18,7 +18,7 @@
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
-//
+// 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        129
diff --git a/sal/workben/clipboardwben/testviewer/StdAfx.cpp b/sal/workben/clipboardwben/testviewer/StdAfx.cpp
index b39aced7f001..0c7c7953f9c9 100644
--- a/sal/workben/clipboardwben/testviewer/StdAfx.cpp
+++ b/sal/workben/clipboardwben/testviewer/StdAfx.cpp
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 // stdafx.cpp : Quelltextdatei, die nur die Standard-Includes einbindet
-//  TestWin32.pch ist die vorkompilierte Header-Datei
-//  stdafx.obj enthält die vorkompilierte Typinformation
+//	TestWin32.pch ist die vorkompilierte Header-Datei
+//	stdafx.obj enthält die vorkompilierte Typinformation
 
 #include "stdafx.h"
 
diff --git a/sal/workben/clipboardwben/testviewer/StdAfx.h b/sal/workben/clipboardwben/testviewer/StdAfx.h
index d71036003969..01bd5846af73 100644
--- a/sal/workben/clipboardwben/testviewer/StdAfx.h
+++ b/sal/workben/clipboardwben/testviewer/StdAfx.h
@@ -11,7 +11,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#define WIN32_LEAN_AND_MEAN     // Selten benutzte Teile der Windows-Header nicht einbinden
+#define WIN32_LEAN_AND_MEAN		// Selten benutzte Teile der Windows-Header nicht einbinden
 
 
 // Windows-Header-Dateien:
diff --git a/sal/workben/clipboardwben/testviewer/cbvtest.cxx b/sal/workben/clipboardwben/testviewer/cbvtest.cxx
index 1368b34f2f1e..1c4bde613518 100644
--- a/sal/workben/clipboardwben/testviewer/cbvtest.cxx
+++ b/sal/workben/clipboardwben/testviewer/cbvtest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,14 +53,14 @@
 #define MAX_LOADSTRING 100
 
 // Globale Variablen:
-HINSTANCE           g_hInst;                        // aktuelle Instanz
-HWND                g_hwndMain;
-WCHAR               szTitle[MAX_LOADSTRING];            // Text der Titelzeile
-WCHAR               szWindowClass[MAX_LOADSTRING];  // Text der Titelzeile
-LPSTREAM            g_pStm    = NULL;
-char*               pTextBuff = NULL;
-DWORD               lData     = 0;
-UINT                g_nCBChanges = 0;
+HINSTANCE			g_hInst;						// aktuelle Instanz
+HWND			    g_hwndMain;
+WCHAR				szTitle[MAX_LOADSTRING];			// Text der Titelzeile
+WCHAR				szWindowClass[MAX_LOADSTRING];	// Text der Titelzeile
+LPSTREAM			g_pStm    = NULL;
+char*				pTextBuff = NULL;
+DWORD				lData     = 0;
+UINT				g_nCBChanges = 0;
 
 // forward declaration
 ATOM  MyRegisterClass( HINSTANCE hInstance );
@@ -89,12 +89,12 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     MSG     msg;
     HACCEL  hAccelTable;
     HRESULT hr = E_FAIL;
-
+    
     // it's important to initialize ole
     // in order to use the clipboard
     //hr = OleInitialize( NULL );
     hr = CoInitializeEx( NULL, COINIT_MULTITHREADED );
-
+    
     g_hInst = hInstance;
 
     // Globale Zeichenfolgen initialisieren
@@ -103,7 +103,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     MyRegisterClass(g_hInst);
 
     // Initialisierung der Anwendung durchführen:
-    if( !InitInstance( g_hInst, nCmdShow ) )
+    if( !InitInstance( g_hInst, nCmdShow ) ) 
     {
         return FALSE;
     }
@@ -111,9 +111,9 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     hAccelTable = LoadAccelerators(hInstance, (LPCTSTR)IDC_TESTWIN32);
 
     // Hauptnachrichtenschleife:
-    while( GetMessage(&msg, NULL, 0, 0) )
+    while( GetMessage(&msg, NULL, 0, 0) ) 
     {
-        if( !TranslateAccelerator (msg.hwnd, hAccelTable, &msg) )
+        if( !TranslateAccelerator (msg.hwnd, hAccelTable, &msg) ) 
         {
             TranslateMessage( &msg );
             DispatchMessage( &msg );
@@ -146,19 +146,19 @@ ATOM MyRegisterClass( HINSTANCE hInstance )
 {
     WNDCLASSEXW wcex;
 
-    wcex.cbSize = sizeof(WNDCLASSEX);
+    wcex.cbSize = sizeof(WNDCLASSEX); 
 
-    wcex.style          = CS_HREDRAW | CS_VREDRAW;
-    wcex.lpfnWndProc    = (WNDPROC)WndProc;
-    wcex.cbClsExtra     = 0;
-    wcex.cbWndExtra     = 0;
-    wcex.hInstance      = hInstance;
-    wcex.hIcon          = LoadIcon(hInstance, (LPCTSTR)IDI_TESTWIN32);
-    wcex.hCursor        = LoadCursor(NULL, IDC_ARROW);
-    wcex.hbrBackground  = (HBRUSH)(COLOR_WINDOW+1);
-    wcex.lpszMenuName   = (LPCWSTR)IDC_TESTWIN32;
-    wcex.lpszClassName  = szWindowClass;
-    wcex.hIconSm        = LoadIcon(wcex.hInstance, (LPCTSTR)IDI_SMALL);
+    wcex.style			= CS_HREDRAW | CS_VREDRAW;
+    wcex.lpfnWndProc	= (WNDPROC)WndProc;
+    wcex.cbClsExtra		= 0;
+    wcex.cbWndExtra		= 0;
+    wcex.hInstance		= hInstance;
+    wcex.hIcon			= LoadIcon(hInstance, (LPCTSTR)IDI_TESTWIN32);
+    wcex.hCursor		= LoadCursor(NULL, IDC_ARROW);
+    wcex.hbrBackground	= (HBRUSH)(COLOR_WINDOW+1);
+    wcex.lpszMenuName	= (LPCWSTR)IDC_TESTWIN32;
+    wcex.lpszClassName	= szWindowClass;
+    wcex.hIconSm		= LoadIcon(wcex.hInstance, (LPCTSTR)IDI_SMALL);
 
     return RegisterClassExW(&wcex);
 }
@@ -178,7 +178,7 @@ BOOL InitInstance( HINSTANCE hInstance, int nCmdShow )
    g_hwndMain = CreateWindowExW(0, szWindowClass, szTitle, WS_OVERLAPPEDWINDOW,
       CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, hInstance, NULL);
 
-   if( !IsWindow( g_hwndMain ) )
+   if( !IsWindow( g_hwndMain ) ) 
    {
       return FALSE;
    }
@@ -194,9 +194,9 @@ BOOL InitInstance( HINSTANCE hInstance, int nCmdShow )
 //
 //  AUFGABE:  Verarbeitet Nachrichten für das Hauptfenster.
 //
-//  WM_COMMAND  - Anwendungsmenü verarbeiten
-//  WM_PAINT    - Hauptfenster darstellen
-//  WM_DESTROY  - Beendigungsnachricht ausgeben und zurückkehren
+//  WM_COMMAND	- Anwendungsmenü verarbeiten
+//  WM_PAINT	- Hauptfenster darstellen
+//  WM_DESTROY	- Beendigungsnachricht ausgeben und zurückkehren
 //
 //
 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
@@ -206,21 +206,21 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     PAINTSTRUCT ps;
     HDC         hdc;
     WCHAR       szHello[MAX_LOADSTRING];
-
-
+    
+    
     LoadStringW(g_hInst, IDS_HELLO, szHello, MAX_LOADSTRING);
 
-    switch( message )
+    switch( message ) 
     {
     case WM_CREATE:
         ClearClipboardContent( hWnd );
         break;
 
         case WM_COMMAND:
-            wmId    = LOWORD(wParam);
-            wmEvent = HIWORD(wParam);
+            wmId    = LOWORD(wParam); 
+            wmEvent = HIWORD(wParam); 
             // Menüauswahlen analysieren:
-            switch( wmId )
+            switch( wmId ) 
             {
                 case IDD_CBVIEWER:
                     SwitchMenuState( hWnd );
@@ -241,7 +241,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             // ZU ERLEDIGEN: Hier beliebigen Code zum Zeichnen hinzufügen...
             RECT rt;
             GetClientRect( hWnd, &rt );
-
+            
             if ( IsClipboardViewer( g_hwndMain ) )
             {
                 ShowAvailableClipboardFormats( hWnd, hdc, ps, rt );
@@ -249,10 +249,10 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             else
             {
                 WCHAR wcString[MAX_LOADSTRING];
-                LoadStringW(g_hInst, IDS_MSG_CBVIEWER_IS_OFF, wcString, MAX_LOADSTRING);
+                LoadStringW(g_hInst, IDS_MSG_CBVIEWER_IS_OFF, wcString, MAX_LOADSTRING);	
                 DrawTextW( hdc, wcString, wcslen( wcString ), &rt, DT_CENTER );
             }
-
+            
             EndPaint( hWnd, &ps );
             break;
 
@@ -270,7 +270,7 @@ HMENU GetSubMenuHandle( HWND hwndParent, UINT uiTopLevelIndex )
 {
     HMENU hMenuMain = GetMenu( hwndParent );
     _ASSERT( IsMenu( hMenu ) );
-
+    
     HMENU hSubMenu = GetSubMenu( hMenuMain, uiTopLevelIndex );
     _ASSERT( IsMenu( hSubMenu ) );
 
@@ -291,13 +291,13 @@ void SwitchMenuState( HWND hwndParent )
 
     if ( IsClipboardViewer( hwndParent ) )
     {
-        LoadStringW(g_hInst, IDS_CBVIEWER_OFF, wcMenuString, MAX_LOADSTRING);
+        LoadStringW(g_hInst, IDS_CBVIEWER_OFF, wcMenuString, MAX_LOADSTRING);		
         ModifyMenuW( hSubMenu, 0, MF_BYPOSITION | MF_STRING, IDD_CBVIEWER, wcMenuString );
         CheckMenuItem( hSubMenu, 0, MF_BYPOSITION | MF_UNCHECKED );
     }
     else
     {
-        LoadStringW(g_hInst, IDS_CBVIEWER_ON, wcMenuString, MAX_LOADSTRING);
+        LoadStringW(g_hInst, IDS_CBVIEWER_ON, wcMenuString, MAX_LOADSTRING);		
         ModifyMenuW( hSubMenu, 0, MF_BYPOSITION | MF_STRING, IDD_CBVIEWER, wcMenuString );
         CheckMenuItem( hSubMenu, 0, MF_BYPOSITION | MF_CHECKED );
     }
@@ -306,10 +306,10 @@ void SwitchMenuState( HWND hwndParent )
 void RegisterClipboardViewer( BOOL bRegister )
 {
     if ( bRegister )
-        MTARegisterClipboardViewer( OnClipboardContentChange );
+        MTARegisterClipboardViewer( OnClipboardContentChange );		
     else // unregister
         MTARegisterClipboardViewer( NULL );
-
+    
     InvalidateRect( g_hwndMain, NULL, TRUE );
     UpdateWindow( g_hwndMain );
 }
diff --git a/sal/workben/clipboardwben/testviewer/resource.h b/sal/workben/clipboardwben/testviewer/resource.h
index 87f33704b725..38cabb29cdc8 100644
--- a/sal/workben/clipboardwben/testviewer/resource.h
+++ b/sal/workben/clipboardwben/testviewer/resource.h
@@ -22,7 +22,7 @@
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
-//
+// 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        129
diff --git a/sal/workben/getlocaleinfotest.cxx b/sal/workben/getlocaleinfotest.cxx
index da2642ca147b..f1756a2ab5b9 100644
--- a/sal/workben/getlocaleinfotest.cxx
+++ b/sal/workben/getlocaleinfotest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,11 +39,11 @@ int _cdecl main( int argc, char * argv[] )
     rtl::OUString country = rtl::OUString::createFromAscii( "DE" );
     rtl_TextEncoding rtlTextEnc;
 
-    rtl_Locale* rtlLocale =
+    rtl_Locale* rtlLocale = 
         rtl_locale_register( lang.getStr( ), country.getStr( ), NULL );
 
     if ( rtlLocale )
-        rtlTextEnc = osl_getTextEncodingFromLocale( rtlLocale );
+        rtlTextEnc = osl_getTextEncodingFromLocale( rtlLocale );    
 
     return(0);
 }
diff --git a/sal/workben/saldyntest.c b/sal/workben/saldyntest.c
index 9d6cc16b74dc..2f82c834b160 100644
--- a/sal/workben/saldyntest.c
+++ b/sal/workben/saldyntest.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/workben/salstattest.c b/sal/workben/salstattest.c
index efa2db72b3d2..8c1557118d94 100644
--- a/sal/workben/salstattest.c
+++ b/sal/workben/salstattest.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@ int _cdecl main( int argc, char * argv[] )
     bi.lParam = 0;
 
     SHBrowseForFolderW( &bi );
-
+    
     dwRet = GetLongPathNameW( L"c:\\", buff, 260 );
 
     return(0);
diff --git a/sal/workben/t_cipher.c b/sal/workben/t_cipher.c
index 38ba0b20f51f..d8133dfd0905 100644
--- a/sal/workben/t_cipher.c
+++ b/sal/workben/t_cipher.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,8 +33,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#define NUM_VARIABLE_KEY_TESTS  34
-#define NUM_SET_KEY_TESTS       24
+#define NUM_VARIABLE_KEY_TESTS	34
+#define NUM_SET_KEY_TESTS		24
 
 /* plaintext bytes -- left halves */
 unsigned long plaintext_l[NUM_VARIABLE_KEY_TESTS + NUM_SET_KEY_TESTS] = {
diff --git a/sal/workben/t_digest.c b/sal/workben/t_digest.c
index 71f3733dac84..b3e3e876fada 100644
--- a/sal/workben/t_digest.c
+++ b/sal/workben/t_digest.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/workben/t_ojp_exe.cxx b/sal/workben/t_ojp_exe.cxx
index 33fda9336135..1993474b3b7b 100644
--- a/sal/workben/t_ojp_exe.cxx
+++ b/sal/workben/t_ojp_exe.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,10 +31,10 @@
 
 
 #ifdef WNT
-#   define WIN32_LEAN_AND_MEAN
-#   include <windows.h>
+#	define WIN32_LEAN_AND_MEAN
+#	include <windows.h>
 #else
-#   include <unistd.h>
+#	include <unistd.h>
 #endif
 
 #include <stdio.h>
@@ -42,8 +42,8 @@
 int main(int argc, char* argv[])
 {
     printf("osl process test executable started:\n");
-
-#ifdef WNT
+    
+#ifdef WNT	
     Sleep(5000);
 #else
     sleep(5);
diff --git a/sal/workben/t_osl_getVolInfo.cxx b/sal/workben/t_osl_getVolInfo.cxx
index a57a414730b1..05eae5672d15 100644
--- a/sal/workben/t_osl_getVolInfo.cxx
+++ b/sal/workben/t_osl_getVolInfo.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,21 +48,21 @@
 #   define  TEST_PATH_5 "/net/athene/export/home/tra/projects"
 #   define  TEST_PATH_6 "/blah"
 #endif
-
+        
 //------------------------------
-//
+// 
 //------------------------------
-
+        
 void test_getVolumeInformation(const rtl::OUString& path_url)
     {
-        oslVolumeInfo vi;
-        memset((void*)&vi, 0, sizeof(vi));
+        oslVolumeInfo vi;        
+        memset((void*)&vi, 0, sizeof(vi));        
         vi.uStructSize   = sizeof(vi);
         vi.pDeviceHandle = NULL;
-
+                        
         oslFileError err = osl_getVolumeInformation(
-            path_url.pData,
-            &vi,
+            path_url.pData, 
+            &vi,                             
             osl_VolumeInfo_Mask_Attributes |
             osl_VolumeInfo_Mask_TotalSpace |
             osl_VolumeInfo_Mask_UsedSpace |
@@ -71,59 +71,59 @@ void test_getVolumeInformation(const rtl::OUString& path_url)
             osl_VolumeInfo_Mask_MaxPathLength |
             osl_VolumeInfo_Mask_FileSystemName |
             osl_VolumeInfo_Mask_DeviceHandle);
-
+            
         CPPUNIT_ASSERT_MESSAGE
         (
-            "osl_getVolumeInformation failed",
+            "osl_getVolumeInformation failed", 
             err == osl_File_E_None
-        );
+        );           
     }
-
+            
 //------------------------------
-//
+// 
 //------------------------------
 
 class TestClass_osl_getVolumeInformation : public CppUnit::TestFixture
 {
 public:
-
+            
     /*-------------------------------------
         Start a process and join with this
         process specify a timeout so that
-        osl_joinProcessWithTimeout returns
+        osl_joinProcessWithTimeout returns 
         osl_Process_E_TimedOut
      -------------------------------------*/
 
     void test_osl_getVolumeInformation()
-    {
+    {                                        
         rtl::OUString path = rtl::OUString::createFromAscii(TEST_PATH_1);
-        rtl::OUString path_url;
-        osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
-        test_getVolumeInformation(path_url);
-
-        path = rtl::OUString::createFromAscii(TEST_PATH_2);
-        osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
+        rtl::OUString path_url;        
+        osl_getFileURLFromSystemPath(path.pData, &path_url.pData);        
         test_getVolumeInformation(path_url);
-
-        path = rtl::OUString::createFromAscii(TEST_PATH_3);
+                          
+        path = rtl::OUString::createFromAscii(TEST_PATH_2);                
         osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
         test_getVolumeInformation(path_url);
-
-        path = rtl::OUString::createFromAscii(TEST_PATH_4);
-        osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
+                       
+        path = rtl::OUString::createFromAscii(TEST_PATH_3);                
+        osl_getFileURLFromSystemPath(path.pData, &path_url.pData);        
+        test_getVolumeInformation(path_url);         
+                
+        path = rtl::OUString::createFromAscii(TEST_PATH_4);                
+        osl_getFileURLFromSystemPath(path.pData, &path_url.pData);        
         test_getVolumeInformation(path_url);
-
-        path = rtl::OUString::createFromAscii(TEST_PATH_5);
-        osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
+        
+        path = rtl::OUString::createFromAscii(TEST_PATH_5);                
+        osl_getFileURLFromSystemPath(path.pData, &path_url.pData);        
         test_getVolumeInformation(path_url);
-
-        path = rtl::OUString::createFromAscii(TEST_PATH_6);
+        
+        path = rtl::OUString::createFromAscii(TEST_PATH_6);                
         osl_getFileURLFromSystemPath(path.pData, &path_url.pData);
-        test_getVolumeInformation(path_url);
+        test_getVolumeInformation(path_url);                                             
     }
-
+                                        
     CPPUNIT_TEST_SUITE( TestClass_osl_getVolumeInformation );
-    CPPUNIT_TEST( test_osl_getVolumeInformation );
+    CPPUNIT_TEST( test_osl_getVolumeInformation );    
     CPPUNIT_TEST_SUITE_END( );
 };
 
diff --git a/sal/workben/t_osl_joinProcess.cxx b/sal/workben/t_osl_joinProcess.cxx
index 5866bcafb98a..1476727bc6fe 100644
--- a/sal/workben/t_osl_joinProcess.cxx
+++ b/sal/workben/t_osl_joinProcess.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,25 +42,25 @@
 #endif
 
 const rtl::OUString CWD        = rtl::OUString::createFromAscii(".");
-
+        
 //------------------------------
-//
+// 
 //------------------------------
 
 class Test_osl_Process : public CppUnit::TestFixture
 {
 public:
-
+    
     /*-------------------------------------
         Start a process and join with this
         process specify a timeout so that
-        osl_joinProcessWithTimeout returns
+        osl_joinProcessWithTimeout returns 
         osl_Process_E_TimedOut
      -------------------------------------*/
 
     void test_osl_joinProcessWithTimeout_timeout_failure()
-    {
-        oslProcess process;
+    {                           
+        oslProcess process;        
         oslProcessError osl_error = osl_executeProcess(
             IMAGE_NAME.pData,
             NULL,
@@ -71,46 +71,46 @@ public:
             NULL,
             0,
             &process);
-
+                    
         CPPUNIT_ASSERT_MESSAGE
         (
-            "osl_createProcess failed",
+            "osl_createProcess failed", 
             osl_error == osl_Process_E_None
         );
-
+        
         TimeValue timeout;
         timeout.Seconds = 1;
         timeout.Nanosec = 0;
-
+        
         osl_error = osl_joinProcessWithTimeout(process, &timeout);
-
+                
         CPPUNIT_ASSERT_MESSAGE
         (
-            "osl_joinProcessWithTimeout returned without timeout failure",
+            "osl_joinProcessWithTimeout returned without timeout failure", 
             osl_Process_E_TimedOut == osl_error
-        );
-
+        );        
+        
         osl_error = osl_terminateProcess(process);
-
+        
         CPPUNIT_ASSERT_MESSAGE
         (
-            "osl_terminateProcess failed",
+            "osl_terminateProcess failed", 
             osl_error == osl_Process_E_None
         );
-
-        osl_freeProcessHandle(process);
+        
+        osl_freeProcessHandle(process);    
     }
-
+    
     /*-------------------------------------
         Start a process and join with this
         process specify a timeout so that
-        osl_joinProcessWithTimeout returns
+        osl_joinProcessWithTimeout returns 
         osl_Process_E_None
      -------------------------------------*/
 
     void test_osl_joinProcessWithTimeout_without_timeout_failure()
     {
-        oslProcess process;
+        oslProcess process;        
         oslProcessError osl_error = osl_executeProcess(
             IMAGE_NAME.pData,
             NULL,
@@ -121,36 +121,36 @@ public:
             NULL,
             0,
             &process);
-
+                    
         CPPUNIT_ASSERT_MESSAGE
         (
-            "osl_createProcess failed",
+            "osl_createProcess failed", 
             osl_error == osl_Process_E_None
         );
-
+        
         TimeValue timeout;
         timeout.Seconds = 10;
         timeout.Nanosec = 0;
-
+        
         osl_error = osl_joinProcessWithTimeout(process, &timeout);
-
+                
         CPPUNIT_ASSERT_MESSAGE
         (
-            "osl_joinProcessWithTimeout returned with failure",
+            "osl_joinProcessWithTimeout returned with failure", 
             osl_Process_E_None == osl_error
-        );
-
-        osl_freeProcessHandle(process);
+        );        
+                                       
+        osl_freeProcessHandle(process); 
     }
-
+    
      /*-------------------------------------
         Start a process and join with this
-        process specify an infinite timeout
+        process specify an infinite timeout 
      -------------------------------------*/
 
     void test_osl_joinProcessWithTimeout_infinite()
     {
-        oslProcess process;
+        oslProcess process;        
         oslProcessError osl_error = osl_executeProcess(
             IMAGE_NAME.pData,
             NULL,
@@ -161,32 +161,32 @@ public:
             NULL,
             0,
             &process);
-
+                    
         CPPUNIT_ASSERT_MESSAGE
         (
-            "osl_createProcess failed",
+            "osl_createProcess failed", 
             osl_error == osl_Process_E_None
         );
-
+                
         osl_error = osl_joinProcessWithTimeout(process, NULL);
-
+                
         CPPUNIT_ASSERT_MESSAGE
         (
-            "osl_joinProcessWithTimeout returned with failure",
+            "osl_joinProcessWithTimeout returned with failure", 
             osl_Process_E_None == osl_error
-        );
-
-        osl_freeProcessHandle(process);
+        );        
+                                        
+        osl_freeProcessHandle(process); 
     }
-
+    
      /*-------------------------------------
         Start a process and join with this
         process using osl_joinProcess
      -------------------------------------*/
-
+     
      void test_osl_joinProcess()
     {
-        oslProcess process;
+        oslProcess process;        
         oslProcessError osl_error = osl_executeProcess(
             IMAGE_NAME.pData,
             NULL,
@@ -197,24 +197,24 @@ public:
             NULL,
             0,
             &process);
-
+                    
         CPPUNIT_ASSERT_MESSAGE
         (
-            "osl_createProcess failed",
+            "osl_createProcess failed", 
             osl_error == osl_Process_E_None
         );
-
+                
         osl_error = osl_joinProcess(process);
-
+                
         CPPUNIT_ASSERT_MESSAGE
         (
-            "osl_joinProcess returned with failure",
+            "osl_joinProcess returned with failure", 
             osl_Process_E_None == osl_error
-        );
-
-        osl_freeProcessHandle(process);
+        );        
+                                        
+        osl_freeProcessHandle(process); 
     }
-
+             
     CPPUNIT_TEST_SUITE(Test_osl_Process);
     CPPUNIT_TEST(test_osl_joinProcessWithTimeout_timeout_failure);
     CPPUNIT_TEST(test_osl_joinProcessWithTimeout_without_timeout_failure);
diff --git a/sal/workben/t_random.c b/sal/workben/t_random.c
index 474442b81590..6011c835193f 100644
--- a/sal/workben/t_random.c
+++ b/sal/workben/t_random.c
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/sal/workben/test.cxx b/sal/workben/test.cxx
index c930e67e121d..37c30538d375 100644
--- a/sal/workben/test.cxx
+++ b/sal/workben/test.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,17 +46,17 @@ int _cdecl main( int argc, char * argv[] )
     void test_OString();
     test_OString();
 
-/*      void test_OWString(); */
-/*      test_OWString(); */
-
-/*      void test_OStringBuffer(); */
-/*      test_OStringBuffer(); */
+/*  	void test_OWString(); */
+/*  	test_OWString(); */
 
-/*      void test_OWStringBuffer(); */
-/*      test_OWStringBuffer(); */
+/*  	void test_OStringBuffer(); */
+/*  	test_OStringBuffer(); */
 
-/*      void test_OString2OWStringAndViceVersa(); */
-/*      test_OString2OWStringAndViceVersa(); */
+/*  	void test_OWStringBuffer(); */
+/*  	test_OWStringBuffer(); */
+    
+/*  	void test_OString2OWStringAndViceVersa(); */
+/*  	test_OString2OWStringAndViceVersa(); */
 
     void test_uuid();
     test_uuid();
diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx
index 10c48b4f0994..167b8c4609c1 100644
--- a/sal/workben/testfile.cxx
+++ b/sal/workben/testfile.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,25 +50,25 @@
 #include <windows.h>
 #endif
 
-using namespace osl;
-using namespace rtl;
+using namespace	osl; 
+using namespace	rtl; 
 
-#define MAXIMPATH   256
+#define MAXIMPATH	256
 
-rtl::OUString   root;
+rtl::OUString	root;
 
-rtl::OUString   dir1;
-rtl::OUString   dir2;
-rtl::OUString   dir_on_server;
-rtl::OUString   dir_not_exist;
-rtl::OUString   dir_not_exist_on_server;
-rtl::OUString   dir_wrong_semantic;
+rtl::OUString	dir1;
+rtl::OUString	dir2;
+rtl::OUString	dir_on_server;
+rtl::OUString	dir_not_exist;
+rtl::OUString	dir_not_exist_on_server;
+rtl::OUString	dir_wrong_semantic;
 
-rtl::OUString   file1;
-rtl::OUString   file2;
-rtl::OUString   file3;
-rtl::OUString   file_on_server;
-rtl::OUString   file_not_exist;
+rtl::OUString	file1;
+rtl::OUString	file2;
+rtl::OUString	file3;
+rtl::OUString	file_on_server;
+rtl::OUString	file_not_exist;
 
 
 
@@ -82,7 +82,7 @@ void PressKey()
 
 void printFileName(::rtl::OUString& str)
 {
-    rtl::OString        aString;
+    rtl::OString		aString;
 
     aString = rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
 
@@ -99,10 +99,10 @@ sal_Bool testLineBreak( sal_Char *pCount , sal_uInt64 nLen , sal_uInt32 *cLineBr
 {
     sal_Bool fSuccess=sal_False;
     *cLineBreak=0;
-
+    
     if (nLen==0)
         return fSuccess;
-
+    
     if ( *pCount==13 )
     {
         if (nLen>=1 && *(pCount+1)==10)
@@ -120,7 +120,7 @@ sal_Bool testLineBreak( sal_Char *pCount , sal_uInt64 nLen , sal_uInt32 *cLineBr
         *cLineBreak=1;
         fSuccess=sal_True;
     }
-
+    
     return fSuccess;
 }
 
@@ -128,24 +128,24 @@ sal_Bool testLineBreak( sal_Char *pCount , sal_uInt64 nLen , sal_uInt32 *cLineBr
 
 sal_Bool Initialize( void )
 {
-    DirectoryItem   aItem;
-    FileStatus      aStatus( FileStatusMask_All );
-    rtl_uString     *strExeFileURL=NULL;
-    oslProcessError ProcessError;
-
-    rtl::OUString   iniFileURL;
-    File            *pFile;
-    sal_Unicode     *pExeFileCount;
+    DirectoryItem	aItem;
+    FileStatus		aStatus( FileStatusMask_All );
+    rtl_uString		*strExeFileURL=NULL;
+    oslProcessError	ProcessError;
 
-    FileBase::RC    rc;
+    rtl::OUString	iniFileURL;
+    File			*pFile;
+    sal_Unicode		*pExeFileCount;
 
-    sal_uInt64      uBytesRequested;
-    sal_uInt64      uBytesRead;
-    sal_Char        *pBuffer;
-    sal_Char        *pBegin;
-    sal_Char        *pCount;
+    FileBase::RC	rc;
+    
+    sal_uInt64		uBytesRequested;
+    sal_uInt64		uBytesRead;
+    sal_Char		*pBuffer;
+    sal_Char		*pBegin;
+    sal_Char		*pCount;
 
-    rtl::OUString   dir[12];
+    rtl::OUString	dir[12];
 
     // Open to the ini-file
 
@@ -167,7 +167,7 @@ sal_Bool Initialize( void )
 
         // Open the ini-File
         pFile=new File( iniFileURL );
-        rc=pFile->open( OpenFlag_Read | OpenFlag_Write );
+        rc=pFile->open( OpenFlag_Read | OpenFlag_Write );	
         if ( rc!=FileBase::E_None )
         {
             rtl_uString_release(strExeFileURL);
@@ -196,7 +196,7 @@ sal_Bool Initialize( void )
     rc=pFile->setPos( Pos_Absolut, 0 );
     pBuffer=(sal_Char*) rtl_allocateMemory( (sal_uInt32) (uBytesRequested+1)*sizeof(sal_Char) );
     rtl_zeroMemory( pBuffer, (sal_uInt32)(uBytesRequested+1)*sizeof(sal_Char) );
-
+    
     rc=pFile->read( pBuffer , uBytesRequested , uBytesRead );
     if ( rc!=FileBase::E_None )
         return sal_False;
@@ -207,10 +207,10 @@ sal_Bool Initialize( void )
 
     for ( int i=0 ; i<12 ; i++ )
     {
-        sal_uInt32      cLineBrake=0;
+        sal_uInt32		cLineBrake=0;
         while ( (pCount-pBuffer < uBytesRead) && *pCount!='=')
             pCount++;
-
+        
         pCount++;
         pBegin=pCount;
 
@@ -222,7 +222,7 @@ sal_Bool Initialize( void )
         pCount+=cLineBrake;
         pBegin=pCount;
     }
-
+    
     root=rtl::OUString(dir[0]);
     dir1=rtl::OUString(dir[1]);
     dir2=rtl::OUString(dir[2]);
@@ -235,7 +235,7 @@ sal_Bool Initialize( void )
     file2=rtl::OUString(dir[8]);
     file3=rtl::OUString(dir[9]);
     file_on_server=rtl::OUString(dir[10]);
-    file_not_exist=rtl::OUString(dir[11]);
+    file_not_exist=rtl::OUString(dir[11]);	
 
     // close the ini-file
     rc=pFile->close();
@@ -246,32 +246,32 @@ sal_Bool Initialize( void )
     // Create directories
     rc=Directory::create( dir1 );
     if ( rc!=FileBase::E_None )
-        return sal_False;
+        return sal_False;	
 
     rc=Directory::create( dir2 );
     if ( rc!=FileBase::E_None )
-        return sal_False;
+        return sal_False;	
 
     rc=Directory::create( dir_on_server );
     if ( rc!=FileBase::E_None )
         return sal_False;
 
     pFile=new File( file1 );
-    rc=pFile->open( OpenFlag_Write | OpenFlag_Create );
+    rc=pFile->open( OpenFlag_Write | OpenFlag_Create );	
     if ( rc!=FileBase::E_None )
         return sal_False;
     rc=pFile->close();
     delete pFile;
-
+    
     pFile=new File( file2 );
-    rc=pFile->open( OpenFlag_Write | OpenFlag_Create );
+    rc=pFile->open( OpenFlag_Write | OpenFlag_Create );	
     if ( rc!=FileBase::E_None )
-        return sal_False;
+        return sal_False;	
     rc=pFile->close();
     delete pFile;
 
     pFile=new File( file_on_server );
-    rc=pFile->open( OpenFlag_Write | OpenFlag_Create );
+    rc=pFile->open( OpenFlag_Write | OpenFlag_Create );	
     if ( rc!=FileBase::E_None )
         return sal_False;
     rc=pFile->close();
@@ -286,11 +286,11 @@ sal_Bool Initialize( void )
 
 sal_Bool Shutdown( void )
 {
-    sal_Bool        fSuccess=sal_True;
-    FileBase::RC    rc;
-    File            *pFile;
-
-    // remove created files
+    sal_Bool		fSuccess=sal_True;
+    FileBase::RC	rc;
+    File			*pFile;
+    
+    // remove created files 
 
     pFile=new File( file1 );
     rc=pFile->remove( file1 );
@@ -304,7 +304,7 @@ sal_Bool Shutdown( void )
         fSuccess=sal_False;
     delete pFile;
 
-    // remove created directories
+    // remove created directories 
 
     rc=Directory::remove( dir1 );
     if ( rc!=FileBase::E_None )
@@ -323,11 +323,11 @@ sal_Bool Shutdown( void )
     delete pFile;
 
     // remove created directory on the server
-
+    
     rc=Directory::remove( dir_on_server );
     if ( rc!=FileBase::E_None )
         fSuccess=sal_False;
-
+    
     return fSuccess;
 }
 
@@ -354,19 +354,19 @@ void showAttributes( sal_uInt64 uAttributes )
 {
     if ( uAttributes==0 )
         printf( "No Attributes \n" );
-    if ( uAttributes & Attribute_ReadOnly )
+    if ( uAttributes & Attribute_ReadOnly ) 
         printf( "Attribute: ReadOnly \n" );
     if ( uAttributes & Attribute_Hidden )
         printf( "Attribute: Hidden \n" );
-    if ( uAttributes & Attribute_Executable )
+    if ( uAttributes & Attribute_Executable ) 
         printf( "Attribute: Executable \n");
     if ( uAttributes & Attribute_GrpWrite )
         printf( "Attribute: GrpWrite \n");
-    if ( uAttributes & Attribute_GrpRead )
+    if ( uAttributes & Attribute_GrpRead ) 
         printf( "Attribute: GrpRead \n" );
     if ( uAttributes & Attribute_GrpExe )
         printf( "Attribute: GrpExe \n" );
-    if ( uAttributes & Attribute_OwnWrite )
+    if ( uAttributes & Attribute_OwnWrite ) 
         printf( "Attribute: OwnWrite \n");
     if ( uAttributes & Attribute_OwnRead )
         printf( "Attribute: OwnRead \n" );
@@ -385,8 +385,8 @@ void showAttributes( sal_uInt64 uAttributes )
 // Show Time
 void showTime( TimeValue aTime )
 {
-    TimeValue   aLocalTimeVal, aSystemTimeVal , aSysTimeVal;
-    oslDateTime aDateTime, aSystemTime;
+    TimeValue	aLocalTimeVal, aSystemTimeVal , aSysTimeVal;
+    oslDateTime	aDateTime, aSystemTime;
 
     if ( osl_getLocalTimeFromSystemTime( &aTime, &aLocalTimeVal ) )
     {
@@ -394,15 +394,15 @@ void showTime( TimeValue aTime )
         {
             printf("\t%02i.%02i.%4i , %02i.%02i.%02i Uhr\n", aDateTime.Day, aDateTime.Month, aDateTime.Year, aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds);
         }
-        else
+        else 
             printf("Error !\n");
     }
-
+    
     if ( osl_getDateTimeFromTimeValue( &aTime, &aSystemTime ) )
     {
         printf("SystemTime: \t\t%02i.%02i.%4i , %02i.%02i.%02i Uhr\n", aSystemTime.Day, aSystemTime.Month, aSystemTime.Year, aSystemTime.Hours, aSystemTime.Minutes, aSystemTime.Seconds);
     }
-    else
+    else 
         printf("Error !\n");
 
     //Verify
@@ -428,7 +428,7 @@ void showTime( TimeValue aTime )
             printf ("Verify : SystemTime : ok! \n");
         else
         {
-            printf ("Verify : SystemTime : Error! \n");
+            printf ("Verify : SystemTime : Error! \n");			
             printf ("aTime : %u\n", aTime.Seconds);
             printf ("aSystemTimeVal : %u\n", aSysTimeVal.Seconds);
         }
@@ -441,11 +441,11 @@ void showTime( TimeValue aTime )
 
 TimeValue getSystemTime()
 {
-    TimeValue   aTime;
+    TimeValue	aTime;
     time_t ltime;
-
+    
     time( &ltime );
-
+    
     aTime.Seconds = ltime;
     aTime.Nanosec = 0;
 
@@ -459,9 +459,9 @@ TimeValue getSystemTime()
 
 void DirectoryOpenAndCloseTest( void )
 {
-    FileBase::RC    rc;
+    FileBase::RC	rc;
     int i=0;
-    Directory   *pDir;
+    Directory	*pDir;
 
     printf( "--------------------------------------------\n");
     printf( "Directory-Open-And-Close-Test\n");
@@ -471,11 +471,11 @@ void DirectoryOpenAndCloseTest( void )
     // open an existing directory
     //--------------------------------------------------
 
-    pDir=new Directory( dir1 );
+    pDir=new Directory( dir1 );	
     printf( "Open an existing directory: ");
     printFileName( dir1 );
     printf( "\n" );
-
+    
     rc= pDir->open();
     print_error( rtl::OString( "Open Directory" ), rc );
 
@@ -495,7 +495,7 @@ void DirectoryOpenAndCloseTest( void )
     // open a not existing directory
     //--------------------------------------------------
 
-    pDir=new Directory( dir_not_exist );
+    pDir=new Directory( dir_not_exist );	
 
     printf( "Open a not existing directory: ");
     printFileName( dir_not_exist );
@@ -507,12 +507,12 @@ void DirectoryOpenAndCloseTest( void )
 
     delete pDir;
 
-    printf( "\n" );
+    printf( "\n" );				
 
     //--------------------------------------------------
     // open a directory with a wrong semantic
     //--------------------------------------------------
-    pDir=new Directory( dir_wrong_semantic );
+    pDir=new Directory( dir_wrong_semantic );	
 
     printf( "Open a directory with a wrong semantic: ");
     printFileName( dir_wrong_semantic );
@@ -523,13 +523,13 @@ void DirectoryOpenAndCloseTest( void )
 
     delete pDir;
 
-    printf( "\n" );
+    printf( "\n" );				
 
     //--------------------------------------------------
     // open an existing directory on a server
     //--------------------------------------------------
-
-    pDir=new Directory( dir_on_server );
+    
+    pDir=new Directory( dir_on_server );	
 
     printf( "Open an existing directory on a server: ");
     printFileName( dir_on_server );
@@ -549,7 +549,7 @@ void DirectoryOpenAndCloseTest( void )
     // open a not existing directory on a server
     //--------------------------------------------------
 
-    pDir=new Directory( dir_not_exist_on_server );
+    pDir=new Directory( dir_not_exist_on_server );	
 
     printf( "Open a not existing directory on a server: ");
     printFileName( dir_not_exist_on_server );
@@ -565,7 +565,7 @@ void DirectoryOpenAndCloseTest( void )
     // Close a not existing directory
     //--------------------------------------------------
 
-    pDir=new Directory( dir_not_exist );
+    pDir=new Directory( dir_not_exist );	
     printf( "Close a not existing directory: ");
     printFileName( dir_not_exist );
     printf( "\n" );
@@ -576,7 +576,7 @@ void DirectoryOpenAndCloseTest( void )
     PressKey();
     return;
 
-}
+} 
 
 //--------------------------------------------------
 // DirectoryCreateAndRemoveTest
@@ -584,9 +584,9 @@ void DirectoryOpenAndCloseTest( void )
 
 void DirectoryCreateAndRemoveTest( void )
 {
-    FileBase::RC    rc,rc1;
+    FileBase::RC	rc,rc1;
     int i=0;
-    Directory   *pDir;
+    Directory	*pDir;
 
     printf( "--------------------------------------------\n" );
     printf( "Directory-Create-And-Remove-Test\n" );
@@ -604,12 +604,12 @@ void DirectoryCreateAndRemoveTest( void )
 
     // Verify
     pDir=new Directory( dir_not_exist );
-
+    
     rc= pDir->open();
     print_error( rtl::OString( "Verify" ), rc );
     pDir->close();
     delete pDir;
-
+    
     printf( "\n" );
 
     //--------------------------------------------------
@@ -624,7 +624,7 @@ void DirectoryCreateAndRemoveTest( void )
     print_error( rtl::OString( "Create Directory" ), rc );
 
     // Verify
-    pDir=new Directory( dir_not_exist_on_server );
+    pDir=new Directory( dir_not_exist_on_server );	
     rc= pDir->open();
     print_error( rtl::OString( "Verify" ), rc );
     pDir->close();
@@ -639,10 +639,10 @@ void DirectoryCreateAndRemoveTest( void )
     printf( "Remove the created directories: \n" );
 
     rc=Directory::remove( dir_not_exist );
-
+    
     rc1=Directory::remove( dir_not_exist_on_server );
-
-    if ( rc==FileBase::E_None && rc1==FileBase::E_None )
+    
+    if ( rc==FileBase::E_None && rc1==FileBase::E_None ) 
         print_error( rtl::OString( "Remove Directories" ), FileBase::E_None );
     else if ( rc!=FileBase::E_None )
         print_error( rtl::OString( "Remove local Directory" ),rc );
@@ -672,21 +672,21 @@ void DirectoryCreateAndRemoveTest( void )
 
 static void FileOpenAndCloseTest( void )
 {
-    FileBase::RC    rc;
+    FileBase::RC	rc;
     int i=0;
 
     printf( "--------------------------------------------\n" );
     printf( "File-Open-And-Close-Test\n" );
     printf( "--------------------------------------------\n\n" );
-
-    File    *pFile;
-
+    
+    File	*pFile;
+    
     pFile=new File( file1 );
 
     printf( "Open an existing file: ");
     printFileName( file1 );
     printf( "\n" );
-
+    
     //--------------------------------------------------
     // open an existing file (Read)
     //--------------------------------------------------
@@ -708,7 +708,7 @@ static void FileOpenAndCloseTest( void )
     //--------------------------------------------------
 
     rc=pFile->open( OpenFlag_Write );
-    print_error( rtl::OString( "Open File (Write)" ), rc );
+    print_error( rtl::OString( "Open File (Write)" ), rc ); 
 
     //--------------------------------------------------
     // close the file
@@ -736,8 +736,8 @@ static void FileOpenAndCloseTest( void )
 
 void FileCreateAndRemoveTest()
 {
-    FileBase::RC    rc;
-    File    *pFile;
+    FileBase::RC	rc;
+    File	*pFile;
 
     printf( "--------------------------------------------\n" );
     printf( "File-Create-And-Remove-Test\n" );
@@ -755,7 +755,7 @@ void FileCreateAndRemoveTest()
 
     rc = pFile->open( OpenFlag_Read | OpenFlag_Write | osl_File_OpenFlag_Create );
 
-    print_error( rtl::OString( "Create and Open File (Read & Write)" ), rc );
+    print_error( rtl::OString( "Create and Open File (Read & Write)" ), rc ); 
 
     //----------------------------------------------------
     // close the file
@@ -782,7 +782,7 @@ void FileCreateAndRemoveTest()
     //----------------------------------------------------
     // remove an open file
     //----------------------------------------------------
-
+    
     pFile->open( OpenFlag_Read | OpenFlag_Write | osl_File_OpenFlag_Create );
 
     rc=pFile->remove( file_not_exist );
@@ -790,7 +790,7 @@ void FileCreateAndRemoveTest()
 
     pFile->close();
     pFile->remove( file_not_exist );
-
+    
     PressKey();
 
     return;
@@ -802,25 +802,25 @@ void FileCreateAndRemoveTest()
 
 void FileWriteAndReadTest( void )
 {
-    FileBase::RC    rc;
+    FileBase::RC	rc;
 
     sal_uInt64 uWritten;
     sal_uInt64 uRead;
-    sal_Char    *pWriteBuffer="Hier kommt der Osterhase !";
-    sal_uInt64  nLen=strlen( pWriteBuffer );
+    sal_Char	*pWriteBuffer="Hier kommt der Osterhase !";
+    sal_uInt64	nLen=strlen( pWriteBuffer );
     sal_Char *pReadBuffer;
 
     printf( "--------------------------------------------\n" );
     printf( "File-Write-And-Read-Test\n" );
     printf( "--------------------------------------------\n\n" );
 
-    File    *pFile;
+    File	*pFile;
 
     pFile=new File( file_not_exist );
 
     printf( "Create File: ");
     printFileName( file_not_exist );
-    printf("\n");
+    printf("\n"); 
 
     //----------------------------------------------------
     // open (create) a not existing file (Read and write)
@@ -828,7 +828,7 @@ void FileWriteAndReadTest( void )
 
     rc = pFile->open( OpenFlag_Read | OpenFlag_Write | osl_File_OpenFlag_Create );
 
-    print_error( rtl::OString( "Create and Open File (Read & Write)" ), rc );
+    print_error( rtl::OString( "Create and Open File (Read & Write)" ), rc ); 
 
     printf( "\n" );
 
@@ -895,15 +895,15 @@ void FileWriteAndReadTest( void )
 
 void FileCopyAndMoveTest( void )
 {
-    FileBase::RC    rc;
+    FileBase::RC	rc;
 
     printf( "--------------------------------------------\n" );
     printf( "File-Copy-Move-Test\n" );
     printf( "--------------------------------------------\n\n" );
 
 
-    File    *pFile;
-    rtl::OUString   destPath(dir2);
+    File	*pFile;
+    rtl::OUString	destPath(dir2);
 
     //--------------------------------------------------
     // FileCopyTest
@@ -931,7 +931,7 @@ void FileCopyAndMoveTest( void )
         pFile->close();
         File::remove( destPath );
     }
-    else
+    else 
         printf( "Verify: Error!\n" );
 
     delete pFile;
@@ -945,7 +945,7 @@ void FileCopyAndMoveTest( void )
     destPath=rtl::OUString( dir_not_exist );
     destPath+=rtl::OUString::createFromAscii("/");
     destPath+=file3;
-
+    
     printf( "Copy a file to a not existing directory \n");
     printf( "Copy the file  %s to %s\n", file1.getStr(), destPath.getStr() );
 
@@ -957,7 +957,7 @@ void FileCopyAndMoveTest( void )
     //--------------------------------------------------
     // Copy a directory
     //--------------------------------------------------
-
+    
     printf( "Copy the directory: ");
     printFileName( dir1 );
     printf( " to ");
@@ -976,7 +976,7 @@ void FileCopyAndMoveTest( void )
     destPath=rtl::OUString( dir2 );
     destPath+=rtl::OUString::createFromAscii("/");
     destPath+=file3;
-
+    
     printf( "Move the file ");
     printFileName( file1 );
     printf( " to ");
@@ -1003,25 +1003,25 @@ void FileCopyAndMoveTest( void )
             printf( "Verify: OK!\n" );
             File::move( destPath, file1 );
         }
-        else
+        else 
         {
             printf( "Verify: Error!\n" );
             pFile->close();
             File::remove( destPath );
         }
     }
-    else
+    else 
         printf( "Verify: Error!\n" );
 
     delete pFile;
 
     printf( "\n" );
 
-
+    
     //--------------------------------------------------
     // Move a file to a not existing directory
     //--------------------------------------------------
-
+    
     destPath=rtl::OUString( dir_not_exist );
     destPath+=rtl::OUString::createFromAscii("/");
     destPath+=file3;
@@ -1070,23 +1070,23 @@ void FileCopyAndMoveTest( void )
 
 void FileSizeTest( void )
 {
-    FileBase::RC    rc;
-    sal_uInt64      filesize;
-    DirectoryItem   aItem;
+    FileBase::RC	rc;
+    sal_uInt64		filesize;
+    DirectoryItem	aItem;
 
     printf( "--------------------------------------------\n" );
     printf( "File-Size-Test\n" );
     printf( "--------------------------------------------\n\n" );
 
 
-    File    aFile( file_not_exist );
+    File	aFile( file_not_exist );
 
     printf( "Create File: ");
     printFileName( file_not_exist );
     printf( "\n\n");
 
     rc = aFile.open( OpenFlag_Read | OpenFlag_Write | osl_File_OpenFlag_Create );
-    print_error( rtl::OString( "Create and Open File (Read & Write)" ), rc );
+    print_error( rtl::OString( "Create and Open File (Read & Write)" ), rc ); 
     printf( "\n" );
 
     if ( rc == FileBase::E_None )
@@ -1146,20 +1146,20 @@ void FileSizeTest( void )
         rc=File::remove( file_not_exist );
         print_error( rtl::OString( "Remove File" ), rc );
     }
-
+    
     PressKey();
 
     return;
 }
 
-
+ 
 //----------------------------------------------------
 // FilePointerTest
 //----------------------------------------------------
 
 void FilePointerTest( void )
 {
-    FileBase::RC    rc;
+    FileBase::RC	rc;
     sal_uInt64 filepointer;
 
     printf( "--------------------------------------------\n" );
@@ -1167,21 +1167,21 @@ void FilePointerTest( void )
     printf( "--------------------------------------------\n\n" );
 
 
-    File    rFile( file_not_exist );
+    File	rFile( file_not_exist );
 
     printf( "Create File: ");
     printFileName( file_not_exist );
     printf( "\n\n");
 
     rc = rFile.open( OpenFlag_Read | OpenFlag_Write | osl_File_OpenFlag_Create );
-    print_error( rtl::OString( "Create and Open File (Read & Write) "), rc );
+    print_error( rtl::OString( "Create and Open File (Read & Write) "), rc ); 
     printf( "\n" );
 
     if ( rc==FileBase::E_None )
     {
 
         //----------------------------------------------------
-        // get the position of the filepointer
+        // get the position of the filepointer 
         //----------------------------------------------------
 
         rc =rFile.getPos( filepointer );
@@ -1209,13 +1209,13 @@ void FilePointerTest( void )
             printf( "\nVerify: OK !\n" );
             printf( "Filepointer-Position: %llu\n",filepointer );
         }
-        else
+        else 
         {
             print_error( rtl::OString( "GetPos" ), rc );
             printf( "\nFilePointer-Test: Error\n" );
             printf( "Filepointer-Position: %i != 5000 \n",filepointer );
         }
-
+            
         printf( "\n" );
 
         // close the file
@@ -1238,8 +1238,8 @@ void FilePointerTest( void )
 
 void verifyFileAttributes( void )
 {
-    FileBase::RC    rc;
-    DirectoryItem   aItem;
+    FileBase::RC	rc;
+    DirectoryItem	aItem;
     FileStatus rStatus( FileStatusMask_Attributes  );
 
     printf( "\nVerify:\n" );
@@ -1256,10 +1256,10 @@ void verifyFileAttributes( void )
             showAttributes(uAttributes);
             printf( "\n" );
         }
-        else
+        else 
             print_error( rtl::OString( "Get FileStatus" ), rc );
     }
-    else
+    else 
         print_error( rtl::OString( "Get DirectoryItem" ), rc );
 
     return;
@@ -1268,7 +1268,7 @@ void verifyFileAttributes( void )
 #ifdef UNX
 void FileAttributesTest( void )
 {
-    FileBase::RC    rc;
+    FileBase::RC	rc;
 
     printf( "--------------------------------------------\n" );
     printf( "File-Attributes-Test\n" );
@@ -1277,11 +1277,11 @@ void FileAttributesTest( void )
     printf( "File: ");
     printFileName( file1 );
     printf( "\n\n" );
-
+    
 
     rc=File::setAttributes( file1, Attribute_GrpWrite );
     print_error( rtl::OString( "Set Attribute: GrpWrite" ), rc );
-
+    
     verifyFileAttributes();
 
     rc=File::setAttributes( file1, 0 );
@@ -1290,7 +1290,7 @@ void FileAttributesTest( void )
 
     rc=File::setAttributes( file1, Attribute_GrpRead );
     print_error( rtl::OString( "Set Attribute: GrpRead" ), rc );
-
+    
     verifyFileAttributes();
 
     rc=File::setAttributes( file1, 0 );
@@ -1299,7 +1299,7 @@ void FileAttributesTest( void )
 
     rc=File::setAttributes( file1, Attribute_GrpExe );
     print_error( rtl::OString( "Set Attribute: GrpExe" ), rc );
-
+    
     verifyFileAttributes();
 
     rc=File::setAttributes( file1, 0 );
@@ -1308,7 +1308,7 @@ void FileAttributesTest( void )
 
     rc=File::setAttributes( file1, Attribute_OwnWrite );
     print_error( rtl::OString( "Set Attribute: OwnWrite" ), rc );
-
+    
     verifyFileAttributes();
 
     rc=File::setAttributes( file1, 0 );
@@ -1317,7 +1317,7 @@ void FileAttributesTest( void )
 
     rc=File::setAttributes( file1, Attribute_OwnRead );
     print_error( rtl::OString( "Set Attribute: OwnRead" ), rc );
-
+    
     verifyFileAttributes();
 
     rc=File::setAttributes( file1, 0 );
@@ -1326,7 +1326,7 @@ void FileAttributesTest( void )
 
     rc=File::setAttributes( file1, Attribute_OwnExe );
     print_error( rtl::OString( "Set Attribute: OwnExe" ), rc );
-
+    
     verifyFileAttributes();
 
     rc=File::setAttributes( file1, 0 );
@@ -1335,7 +1335,7 @@ void FileAttributesTest( void )
 
     rc=File::setAttributes( file1, Attribute_OthWrite );
     print_error( rtl::OString( "Set Attribute: OthWrite" ), rc );
-
+    
     verifyFileAttributes();
 
     rc=File::setAttributes( file1, 0 );
@@ -1344,7 +1344,7 @@ void FileAttributesTest( void )
 
     rc=File::setAttributes( file1, Attribute_OthRead );
     print_error( rtl::OString( "Set Attribute: OthRead" ), rc );
-
+    
     verifyFileAttributes();
 
     rc=File::setAttributes( file1, 0 );
@@ -1353,7 +1353,7 @@ void FileAttributesTest( void )
 
     rc=File::setAttributes( file1, Attribute_OthExe );
     print_error( rtl::OString( "Set Attribute: OthExe" ), rc );
-
+    
     verifyFileAttributes();
 
     rc=File::setAttributes( file1, 0 );
@@ -1365,7 +1365,7 @@ void FileAttributesTest( void )
     print_error( rtl::OString( "Set all Attributes" ), rc );
 
     verifyFileAttributes();
-
+    
     PressKey();
 
     return;
@@ -1375,7 +1375,7 @@ void FileAttributesTest( void )
 #ifdef WNT
 void FileAttributesTest( void )
 {
-    FileBase::RC    rc;
+    FileBase::RC	rc;
 
     printf( "--------------------------------------------\n" );
     printf( "File-Attributes-Test\n" );
@@ -1384,11 +1384,11 @@ void FileAttributesTest( void )
     printf( "File: ");
     printFileName( file1 );
     printf( "\n\n" );
-
+    
 
     rc=File::setAttributes( file1, Attribute_ReadOnly );
     print_error( rtl::OString( "Set Attribute: ReadOnly" ), rc );
-
+    
     verifyFileAttributes();
 
     rc=File::setAttributes( file1, 0 );
@@ -1410,9 +1410,9 @@ void FileAttributesTest( void )
     print_error( rtl::OString( "Set Attribute: Hidden & ReadOnly" ), rc );
 
     verifyFileAttributes();
-
+    
     rc=File::setAttributes( file1, 0 );
-    print_error( rtl::OString( "Reset Attributes") , rc );
+    print_error( rtl::OString( "Reset Attributes") , rc );	
 
     verifyFileAttributes();
 
@@ -1428,10 +1428,10 @@ void FileAttributesTest( void )
 
 void FileTimeTest( void )
 {
-    FileBase::RC    rc;
-
-    DirectoryItem   aItem;
+    FileBase::RC	rc;
 
+    DirectoryItem	aItem;
+    
     struct tm sSysCreationTime = { 0, 20, 12, 4, 9, 100 };
     struct tm sSysAccessTime = { 0, 40, 1, 6, 5, 98 };
     struct tm sSysModifyTime = { 0, 1, 24, 13, 11, 95 };
@@ -1440,13 +1440,13 @@ void FileTimeTest( void )
     time_t aSysAccessTime =  mktime( &sSysAccessTime );
     time_t aSysModifyTime =  mktime( &sSysModifyTime );
 
-    TimeValue       aCreationTime   = { aSysCreationTime, 0};
-    TimeValue       aAccessTime     = { aSysAccessTime, 0};
-    TimeValue       aModifyTime     = { aSysModifyTime, 0};
+    TimeValue		aCreationTime	= { aSysCreationTime, 0};
+    TimeValue		aAccessTime		= { aSysAccessTime, 0};
+    TimeValue		aModifyTime		= { aSysModifyTime, 0};
 
-    TimeValue       aCreationTimeRead;
-    TimeValue       aAccessTimeRead;
-    TimeValue       aModifyTimeRead;
+    TimeValue		aCreationTimeRead;
+    TimeValue		aAccessTimeRead;
+    TimeValue		aModifyTimeRead;
 
 
     printf( "--------------------------------------------\n" );
@@ -1477,7 +1477,7 @@ void FileTimeTest( void )
     //--------------------------------------------------
     // Verify
     //--------------------------------------------------
-
+    
     FileStatus rStatus( FileStatusMask_CreationTime | FileStatusMask_AccessTime | FileStatusMask_ModifyTime);
 
     printf( "\nVerify:\n" );
@@ -1500,8 +1500,8 @@ void FileTimeTest( void )
             aCreationTimeRead=rStatus.getCreationTime();
 #ifdef WNT
             if ( aCreationTime.Seconds == aCreationTimeRead.Seconds && aCreationTime.Nanosec == aCreationTimeRead.Nanosec )
-                printf( "GetCreationTime: ok : " );
-            else
+                printf( "GetCreationTime: ok : " );	
+            else 
                 printf( "GetCreationTime: Error : " );
 
             showTime( aCreationTimeRead );
@@ -1510,26 +1510,26 @@ void FileTimeTest( void )
             //--------------------------------------------------
             // GetAccessTime
             //--------------------------------------------------
-
+            
             aAccessTimeRead=rStatus.getAccessTime();
-
+            
             if ( aAccessTime.Seconds == aAccessTimeRead.Seconds && aAccessTime.Nanosec == aAccessTimeRead.Nanosec )
-                printf( "GetAccessTime: ok : " );
-            else
+                printf( "GetAccessTime: ok : " );	
+            else 
                 printf( "GetAccessTime: Error : " );
-
+            
             showTime( aAccessTimeRead );
             printf( "\n" );
-
+            
             //--------------------------------------------------
             // GetModifyTime
             //--------------------------------------------------
-
+            
             aModifyTimeRead=rStatus.getModifyTime();
-
+            
             if ( aModifyTime.Seconds == aModifyTimeRead.Seconds && aModifyTime.Nanosec == aModifyTimeRead.Nanosec )
-                printf( "GetModifyTime: ok : " );
-            else
+                printf( "GetModifyTime: ok : " );	
+            else 
                 printf( "GetModifyTime: Error : " );
 
             showTime( aModifyTimeRead );
@@ -1548,11 +1548,11 @@ void FileTimeTest( void )
 
 void DirectoryItemTest( void )
 {
-    FileBase::RC    rc;
-    Directory       *pDir;
-    DirectoryItem   aItem;
-    FileStatus      *pStatus;
-    File            *pFile;
+    FileBase::RC	rc;
+    Directory		*pDir;
+    DirectoryItem	aItem;
+    FileStatus		*pStatus;
+    File			*pFile;
 
     printf( "--------------------------------------------\n" );
     printf( "Directory-Item-Test\n" );
@@ -1571,7 +1571,7 @@ void DirectoryItemTest( void )
 
     pStatus=new FileStatus( FileStatusMask_All );
     rc=aItem.getFileStatus( *pStatus );
-
+    
     if ( rc==FileBase::E_None )
     {
         printf( "GetFileStatus: FileURL: ");
@@ -1582,7 +1582,7 @@ void DirectoryItemTest( void )
     delete pStatus;
 
     printf( "\n" );
-
+    
     //--------------------------------------------------
     // get DirectoryItem from a not existing directory
     //--------------------------------------------------
@@ -1609,14 +1609,14 @@ void DirectoryItemTest( void )
 
     pStatus=new FileStatus( FileStatusMask_All );
     rc=aItem.getFileStatus( *pStatus );
-
+    
     if ( rc==FileBase::E_None )
     {
         printf( "GetFileStatus: FileURL: ");
         printFileName( pStatus->getFileURL() );
         printf( "\n" );
     }
-
+    
     delete pStatus;
 
     printf( "\n" );
@@ -1665,7 +1665,7 @@ void DirectoryItemTest( void )
 
         pStatus=new FileStatus( FileStatusMask_All );
         rc=aItem.getFileStatus( *pStatus );
-
+    
         if ( rc==FileBase::E_None )
         {
             printf( "GetFileStatus: FileURL:  ");
@@ -1704,7 +1704,7 @@ void DirectoryItemTest( void )
     printf( "Get next DirectoryItem from a directory: ");
     printFileName( dir1);
     printf( "\n" );
-
+    
     rc= pDir->open();
     print_error( rtl::OString( "Open Directory" ), rc );
 
@@ -1716,16 +1716,16 @@ void DirectoryItemTest( void )
         // get all files from the directory
         //--------------------------------------------------
 
-        rtl::OUString   str;
-        rtl::OUString   str1[2];
-
+        rtl::OUString	str;
+        rtl::OUString	str1[2];
+        
         aItem=DirectoryItem();
         rc=pDir->getNextItem( aItem );
         print_error( rtl::OString( "GetNextItem" ),rc );
-
+                
         while( rc==FileBase::E_None )
         {
-
+            
             FileStatus rStatus( FileStatusMask_All );
             aItem.getFileStatus( rStatus );
 
@@ -1750,21 +1750,21 @@ void DirectoryItemTest( void )
             aItem=DirectoryItem();
             rc=pDir->reset();
             rc=pDir->getNextItem( aItem );
-
+        
             FileStatus rStatus( FileStatusMask_All );
             aItem.getFileStatus( rStatus );
 
             str1[i]=rStatus.getFileName();
-        }
+        }		
 
 
         if ( str1[0].compareTo(str1[1]) == 0 )
             print_error( rtl::OString( "Reset" ),FileBase::E_None );
         else
             print_error( rtl::OString( "Reset" ),FileBase::E_invalidError );
-
+    
         printf( "\n" );
-
+        
         // Close Directory
         rc=pDir->close();
         print_error( rtl::OString( "Close Directory" ), rc );
@@ -1779,7 +1779,7 @@ void DirectoryItemTest( void )
     printf( "Get next DirectoryItem from a closed directory: ");
     printFileName( dir1 );
     printf( "\n" );
-
+    
     aItem=DirectoryItem();
     rc=pDir->getNextItem( aItem );
     print_error( rtl::OString( "GetNextItem" ),rc );
@@ -1800,7 +1800,7 @@ void FileStatusTest( FileStatus *pStatus )
     // GetFileType of the directory
     //--------------------------------------------------
 
-    FileStatus::Type    aType;
+    FileStatus::Type	aType;
 
     printf( "\ngetFileType:\n" );
     aType=pStatus->getFileType();
@@ -1810,18 +1810,18 @@ void FileStatusTest( FileStatus *pStatus )
     // GetAttributes
     //--------------------------------------------------
 
-    sal_uInt64          uAttributes;
+    sal_uInt64			uAttributes;
 
     printf( "\ngetAttributes:\n" );
     uAttributes=pStatus->getAttributes();
     showAttributes( uAttributes );
-
+    
     //--------------------------------------------------
     // GetCreationTime
     //--------------------------------------------------
 
-    TimeValue   aCreationTime;
-
+    TimeValue	aCreationTime;
+        
     printf( "\ngetCreationTime:\n" );
     aCreationTime=pStatus->getCreationTime();
 
@@ -1832,8 +1832,8 @@ void FileStatusTest( FileStatus *pStatus )
     // GetAccessTime
     //--------------------------------------------------
 
-    TimeValue   aAccessTime;
-
+    TimeValue	aAccessTime;
+    
     printf( "\ngetAccessTime:\n" );
     aAccessTime=pStatus->getAccessTime();
 
@@ -1844,8 +1844,8 @@ void FileStatusTest( FileStatus *pStatus )
     // GetModifyTime
     //--------------------------------------------------
 
-    TimeValue   aModifyTime;
-
+    TimeValue	aModifyTime;
+    
     printf( "\ngetModifyTime:\n" );
     aModifyTime=pStatus->getModifyTime();
 
@@ -1856,10 +1856,10 @@ void FileStatusTest( FileStatus *pStatus )
     // GetFileSize
     //--------------------------------------------------
 
-    sal_uInt64          FileSize;
+    sal_uInt64			FileSize;
 
     printf( "\ngetFileSize:\n" );
-
+    
     FileSize=pStatus->getFileSize();
     printf( "FileSize: %i\n", FileSize);
 
@@ -1867,8 +1867,8 @@ void FileStatusTest( FileStatus *pStatus )
     // GetFileName
     //--------------------------------------------------
 
-    rtl::OUString           FileName;
-
+    rtl::OUString			FileName;
+    
     printf( "\ngetFileName:\n" );
 
     FileName=pStatus->getFileName();
@@ -1880,12 +1880,12 @@ void FileStatusTest( FileStatus *pStatus )
     // GetFileURL
     //--------------------------------------------------
 
-    rtl::OUString           FileURL;
-
+    rtl::OUString			FileURL;
+    
     printf( "\ngetFileURL:\n" );
-
+    
     FileURL=pStatus->getFileURL();
-    printf( "FileURL: ");
+    printf( "FileURL: "); 
     printFileName( FileURL );
     printf( "\n" );
 
@@ -1893,15 +1893,15 @@ void FileStatusTest( FileStatus *pStatus )
     // GetLinkTargetURL
     //--------------------------------------------------
 
-    rtl::OUString           LinkTargetURL;
+    rtl::OUString			LinkTargetURL;
 
     printf( "\ngetLinkTargetURL:\n");
-
+    
     LinkTargetURL=pStatus->getLinkTargetURL();
     printf( "LinkTargetURL: ");
     printFileName( LinkTargetURL );
     printf( "\n" );
-
+    
     return;
 }
 
@@ -1911,16 +1911,16 @@ void FileStatusTest( FileStatus *pStatus )
 
 void DirectoryFileStatusTest( void )
 {
-    FileBase::RC    rc;
-    DirectoryItem   aItem;
-    FileStatus      *pStatus;
+    FileBase::RC	rc;
+    DirectoryItem	aItem;
+    FileStatus		*pStatus;
 
     printf( "--------------------------------------------\n" );
     printf( "Directory-FileStatus-Test\n" );
     printf( "--------------------------------------------\n\n" );
 
     printf( "FileStatus of the directory: ");
-    printFileName( dir1 );
+    printFileName( dir1 );    
     printf( "\n" );
 
     aItem=DirectoryItem();
@@ -1929,7 +1929,7 @@ void DirectoryFileStatusTest( void )
     print_error( rtl::OString( "Get DirectoryItem" ), rc );
 
     if ( rc==FileBase::E_None )
-    {
+    {	
         pStatus=new FileStatus( FileStatusMask_All );
         rc=aItem.getFileStatus( *pStatus );
 
@@ -1950,9 +1950,9 @@ void DirectoryFileStatusTest( void )
 
 void FileFileStatusTest( void )
 {
-    FileBase::RC    rc;
-    DirectoryItem   aItem;
-    FileStatus      *pStatus;
+    FileBase::RC	rc;
+    DirectoryItem	aItem;
+    FileStatus		*pStatus;
 
     printf( "--------------------------------------------\n" );
     printf( "File-FileStatus-Test\n" );
@@ -1961,7 +1961,7 @@ void FileFileStatusTest( void )
     printf( "FileStatus of the file: ");
     printFileName( file1 );
     printf( "\n" );
-
+    
     aItem=DirectoryItem();
 
     rc=DirectoryItem::get( file1 , aItem );
@@ -1989,9 +1989,9 @@ void FileFileStatusTest( void )
 
 void VolumeFileStatusTest( void )
 {
-    FileBase::RC    rc;
-    DirectoryItem   aItem;
-    FileStatus      *pStatus;
+    FileBase::RC	rc;
+    DirectoryItem	aItem;
+    FileStatus		*pStatus;
 
     printf( "--------------------------------------------\n" );
     printf( "Volume-FileStatus-Test\n" );
@@ -2000,7 +2000,7 @@ void VolumeFileStatusTest( void )
     printf( "FileStatus of the Volume: ");
     printFileName( root );
     printf( "\n" );
-
+    
     aItem=DirectoryItem();
 
     rc=DirectoryItem::get( root , aItem );
@@ -2029,7 +2029,7 @@ void VolumeFileStatusTest( void )
 
 void VolumeInfoTest( void )
 {
-    FileBase::RC    rc;
+    FileBase::RC	rc;
 
     printf( "--------------------------------------------\n" );
     printf( "Volume-Info-Test\n" );
@@ -2037,12 +2037,12 @@ void VolumeInfoTest( void )
 
     printf( "VolumeInfo of the volume ");
     printFileName( root );
-
+    
     printf( "\n" );
 
     VolumeInfo rInfo( VolumeInfoMask_FreeSpace );
     rc=Directory::getVolumeInfo( root , rInfo );
-    print_error( rtl::OString( "GetVolumeInfo" ),rc );
+    print_error( rtl::OString( "GetVolumeInfo" ),rc );	
 
     printf( "\n" );
 
@@ -2068,7 +2068,7 @@ void VolumeInfoTest( void )
     // getTotalSpace
     //--------------------------------------------------
 
-    sal_uInt64  TotalSpace;
+    sal_uInt64	TotalSpace;
     TotalSpace=rInfo.getTotalSpace();
     printf( "Total Space: %i\n",TotalSpace );
 
@@ -2076,7 +2076,7 @@ void VolumeInfoTest( void )
     // getFreeSpace
     //--------------------------------------------------
 
-    sal_uInt64  FreeSpace;
+    sal_uInt64	FreeSpace;
     FreeSpace=rInfo.getFreeSpace();
     printf( "Free Space: %i\n",FreeSpace );
 
@@ -2084,7 +2084,7 @@ void VolumeInfoTest( void )
     // getUsedSpace
     //--------------------------------------------------
 
-    sal_uInt64  UsedSpace;
+    sal_uInt64	UsedSpace;
     UsedSpace=rInfo.getUsedSpace();
     printf( "Used Space: %i\n",UsedSpace );
 
@@ -2092,7 +2092,7 @@ void VolumeInfoTest( void )
     // getMaxNameLength
     //--------------------------------------------------
 
-    sal_uInt32  MaxNameLength;
+    sal_uInt32	MaxNameLength;
     MaxNameLength=rInfo.getMaxNameLength();
     printf( "MaxNameLength: %i\n",MaxNameLength );
 
@@ -2100,7 +2100,7 @@ void VolumeInfoTest( void )
     // getMaxPathLength
     //--------------------------------------------------
 
-    sal_uInt32  MaxPathLength;
+    sal_uInt32	MaxPathLength;
     MaxPathLength=rInfo.getMaxPathLength();
     printf( "MaxPathLength: %i\n",MaxPathLength );
 
@@ -2108,7 +2108,7 @@ void VolumeInfoTest( void )
     // getFileSystemName
     //--------------------------------------------------
 
-    rtl::OUString   FileSystemName;
+    rtl::OUString	FileSystemName;
     FileSystemName=rInfo.getFileSystemName();
     printf( "File-System-Name: ");
     printFileName( FileSystemName );
@@ -2124,12 +2124,12 @@ void VolumeInfoTest( void )
 
 void ConvertPathTest(rtl::OUString& strPath)
 {
-    FileBase::RC    rc;
+    FileBase::RC	rc;
 
-    rtl::OUString       strNormPath;
-    rtl::OUString       strFileURL;
-    rtl::OUString       strNormPathFromFileURL;
-    rtl::OUString       strSystemPath;
+    rtl::OUString		strNormPath;
+    rtl::OUString		strFileURL;
+    rtl::OUString		strNormPathFromFileURL;
+    rtl::OUString		strSystemPath;
 
     //--------------------------------------------------
     // normalizePath
@@ -2143,7 +2143,7 @@ void ConvertPathTest(rtl::OUString& strPath)
         printFileName( strNormPath );
         printf( "\n" );
     }
-    else
+    else 
         printf( "normalizePath: Error \n" );
 
     //--------------------------------------------------
@@ -2160,10 +2160,10 @@ void ConvertPathTest(rtl::OUString& strPath)
             printFileName( strFileURL );
             printf( "\n" );
         }
-        else
+        else 
             printf( "getFileURLFromSystemPath: Error \n" );
     }
-    else
+    else 
         printf( "getFileURLFromSystemPath: not tested \n" );
 
     //--------------------------------------------------
@@ -2180,13 +2180,13 @@ void ConvertPathTest(rtl::OUString& strPath)
             printFileName( strNormPathFromFileURL );
             printf( "\n" );
         }
-        else
+        else 
             printf( "getNormalizedPathFromFileURL: Error \n" );
     }
-    else
+    else 
         printf( "getNormalizedPathFromFileURL: not tested \n" );
 
-
+    
     //--------------------------------------------------
     // getSystemPathFromFileURL
     //--------------------------------------------------
@@ -2201,16 +2201,16 @@ void ConvertPathTest(rtl::OUString& strPath)
             printFileName( strSystemPath );
             printf( "\n");
         }
-        else
+        else 
             printf( "getSystemPathFromFileURL: Error \n" );
     }
-    else
+    else 
         printf( "getSystemPathFromFileURL: not tested \n" );
 
     //--------------------------------------------------
     // Verify
     //--------------------------------------------------
-
+    
     if ( strNormPathFromFileURL == strNormPath )
         printf( "\nVerify: OK ! ( Normalized-Path == Normalized-Path-From-File-URL )\n" );
     else
@@ -2244,7 +2244,7 @@ void FileBaseTest()
     printf( "\n\n" );
     ConvertPathTest(file_on_server);
 
-    PressKey();
+    PressKey(); 
 
     return;
 }
@@ -2253,25 +2253,25 @@ void FileBaseTest()
 //--------------------------------------------------
 // AbsolutePathTest
 //--------------------------------------------------
-void DoAbsolutePathTest(rtl::OUString strDirBase, rtl::OUString strRelative)
+void DoAbsolutePathTest(rtl::OUString strDirBase, rtl::OUString	strRelative)
 {
-    FileBase::RC    rc;
-
-    rtl::OUString       strAbsolute;
-
+    FileBase::RC	rc;
+    
+    rtl::OUString		strAbsolute;
+        
     printf( "Base-Directory: \t");
     printFileName( strDirBase );
     printf( "\n" );
     printf( "Relative-Path: \t\t");
     printFileName ( strRelative );
     printf( "\n" );
-
+    
     rc=FileBase::getAbsoluteFileURL( strDirBase, strRelative, strAbsolute );
 
     if ( rc == FileBase::E_None )
     {
         printf( "Absolute-Path: \t\t");
-        printFileName ( strAbsolute );
+        printFileName ( strAbsolute );	
         printf( "\n" );
     }
     else
@@ -2308,23 +2308,23 @@ void AbsolutePathTest(void)
 
 void SearchPathTest(void)
 {
-    FileBase::RC    rc;
+    FileBase::RC	rc;
 
-    rtl::OUString       strNormPath(file1);
-    rtl::OUString       strFileURL;
-    rtl::OUString       strSystemPath;
-    rtl::OUString       strResultPath;
+    rtl::OUString		strNormPath(file1);
+    rtl::OUString		strFileURL;
+    rtl::OUString		strSystemPath;
+    rtl::OUString		strResultPath;
 
     printf( "--------------------------------------------\n" );
     printf( "SearchPath-Test\n" );
     printf( "--------------------------------------------\n\n" );
-
+    
 
     rc=FileBase::getFileURLFromSystemPath( strNormPath, strFileURL );
     print_error( rtl::OString( "getFileURLFromSystemPath" ), rc );
     rc=FileBase::getSystemPathFromFileURL( strNormPath, strSystemPath );
     print_error( rtl::OString( "getSystemPathFromFileURL" ), rc );
-
+    
     //--------------------------------------------------
     // searchFileURL (with a normalized path)
     //--------------------------------------------------
@@ -2343,10 +2343,10 @@ void SearchPathTest(void)
             printFileName ( strResultPath );
             printf( "\n" );
         }
-        else
+        else 
             printf( "searchFileURL (with a normalized path): Error\n" );
     }
-    else
+    else 
         printf( "searchFileURL (with a normalized path): not tested\n" );
 
     //--------------------------------------------------
@@ -2367,12 +2367,12 @@ void SearchPathTest(void)
             printFileName ( strResultPath );
             printf( "\n" );
         }
-        else
+        else 
             printf( "searchFileURL (with a FileURL path): Error\n" );
     }
-    else
+    else 
         printf( "searchFileURL (with a FileURL path): not tested\n" );
-
+    
     //--------------------------------------------------
     // searchFileURL (with a systempath)
     //--------------------------------------------------
@@ -2391,10 +2391,10 @@ void SearchPathTest(void)
             printFileName( strResultPath );
             printf( "\n" );
         }
-        else
+        else 
             printf( "searchFileURL (with a systempath): Error\n" );
     }
-    else
+    else 
         printf( "searchFileURL (with a systempath): not tested\n" );
 
     //--------------------------------------------------
@@ -2413,7 +2413,7 @@ void SearchPathTest(void)
         printFileName( strResultPath );
         printf( "\n" );
     }
-    else
+    else 
         printf( "searchFileURL:  File not found: OK ! \n" );
 
     //--------------------------------------------------
@@ -2434,14 +2434,14 @@ void SearchPathTest(void)
         printFileName( strResultPath );
         printf( "\n");
     }
-    else
+    else 
         printf( "searchFileURL:  File not found: Error\n" );
-
+    
     //------------------------------------------------------------
     // searchFileURL (File and searchpath with two entries)
     //------------------------------------------------------------
 
-    rtl::OUString       strSearchPath( dir_not_exist );
+    rtl::OUString		strSearchPath( dir_not_exist );
     strSearchPath+=rtl::OUString::createFromAscii(";");
     strSearchPath+=dir_on_server;
 
@@ -2459,7 +2459,7 @@ void SearchPathTest(void)
         printFileName( strResultPath );
         printf( "\n" );
     }
-    else
+    else 
         printf( "searchFileURL:  File not found: Error\n" );
 
     //-------------------------------------------------------------------
@@ -2473,12 +2473,12 @@ void SearchPathTest(void)
     printf( "SearchPath ");
     printFileName( strSearchPath );
     printf( "\n");
-
+    
     rc=FileBase::searchFileURL( file3 , strSearchPath , strResultPath );
 
     if ( rc == FileBase::E_None )
         printf( "Error: Wrong Semantich but no error occurs !\n" );
-    else
+    else 
         printf( "searchFileURL:  File not found: OK !\n" );
 
     return;
@@ -2490,9 +2490,9 @@ void SearchPathTest(void)
 
 void getCanonicalNameTest(rtl::OUString strPath)
 {
-    FileBase::RC    rc;
+    FileBase::RC	rc;
 
-    rtl::OUString   strValid;
+    rtl::OUString	strValid;	
 
     printf( "Original-Name: \t\t");
     printFileName( strPath );
@@ -2507,7 +2507,7 @@ void getCanonicalNameTest(rtl::OUString strPath)
         printf( "\n");
 
     }
-    else
+    else 
         printf( "Canonical-Name: Error \n" );
 
     printf( "\n" );
@@ -2538,7 +2538,7 @@ void print_error( ::rtl::OString& str, FileBase::RC rc )
 
     printf( "%s : ",str.getStr() );
     switch(rc)
-    {
+    {	
     case FileBase::E_None:
         printf("OK !\n");
         break;
@@ -2675,7 +2675,7 @@ void print_error( ::rtl::OString& str, FileBase::RC rc )
         printf("E_Unknown\n");
         break;
     }
-    return;
+    return;	
 }
 
 //--------------------------------------------------
@@ -2690,7 +2690,7 @@ void print_error( ::rtl::OString& str, FileBase::RC rc )
 int MAIN( int argc, char* argv[] )
 {
     sal_Bool fSuccess=sal_False;
-
+    
     //Initialization
     fSuccess=Initialize();
     if ( !fSuccess )
@@ -2698,8 +2698,8 @@ int MAIN( int argc, char* argv[] )
         printf("Error during Initialization");
         return -1;
     }
-
-
+    
+    
     if (argc==1)
     {
         DirectoryOpenAndCloseTest();
diff --git a/sal/workben/testpip2.cxx b/sal/workben/testpip2.cxx
index 9199099c86a2..c9b98b8a4790 100644
--- a/sal/workben/testpip2.cxx
+++ b/sal/workben/testpip2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,7 +48,7 @@ void fail( const char * pszText, int retval )
     fprintf( stderr, "TestPipe Client: test failed, ErrNo: %d.\n", retval );
     exit( retval );
 }
-
+    
 
 
 /*
@@ -59,13 +59,13 @@ int main (void)
 {
     char    szBuffer[ 256 ];
     sSize_t nChars;
-
+    
     // gib dem Server die Chance, die Pipe zu ”ffnen
     DosSleep( 1000 );
-
+    
     // erzeuge die Pipe
     Pipe = osl_createPipe( pszPipeName, osl_Pipe_OPEN, 0 );
-
+    
     if( !Pipe )
         fail( "unable to open pipe.\n",
               osl_getLastPipeError(NULL));
@@ -82,11 +82,11 @@ int main (void)
 
     // Sende die Daten wieder zur�ck.
     nChars = osl_sendPipe( Pipe, szBuffer, nChars );
-
+    
     if( nChars < 0 )
         fail( "unable to write on pipe.\n",
               osl_getLastPipeError( Pipe ) );
-
+              
     // schliesse die Pipe
     osl_destroyPipe( Pipe );
 
diff --git a/sal/workben/testpipe.cxx b/sal/workben/testpipe.cxx
index cd4671da714c..225305260b52 100644
--- a/sal/workben/testpipe.cxx
+++ b/sal/workben/testpipe.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,7 +62,7 @@ void fail( const char * pszText, int retval )
     if( Process ) osl_freeProcessHandle( Process );
     exit( retval );
 }
-
+    
 
 
 /*
@@ -74,13 +74,13 @@ int main (int argc, const char *argv[])
     // erzeuge die Pipe
     rtl_uString* ustrPipeName=0;
     rtl_uString* ustrExeName=0;
-
+    
 
     rtl_uString_newFromAscii(&ustrPipeName,pszPipeName);
     rtl_uString_newFromAscii(&ustrExeName, "//./tmp/testpip2.exe");
-
+    
     Pipe = osl_createPipe( ustrPipeName, osl_Pipe_CREATE, 0 );
-
+    
     if( !Pipe )
         fail( "unable to create Pipe.\n",
               osl_getLastPipeError(NULL));
@@ -107,7 +107,7 @@ int main (int argc, const char *argv[])
         fail( "unable to connect to client.\n",
             osl_getLastPipeError( Pipe ));
 
-
+    
     if( argc > 1 )
     {
         cp = argv[1];
@@ -118,14 +118,14 @@ int main (int argc, const char *argv[])
         cp = szTestString;
         n  = sizeof(szTestString);
     }
-
+        
     // sende TestString zum Client
     nChars = osl_sendPipe( C1Pipe, cp, n );
-
+    
     if( nChars < 0 )
         fail( "unable to write on pipe.\n",
               osl_getLastPipeError( Pipe ) );
-
+              
     // empfange Daten vom Server
     nChars = osl_receivePipe( C1Pipe, szBuffer, 256 );
 
@@ -137,23 +137,23 @@ int main (int argc, const char *argv[])
 
     // warte bis das Client-Programm sich beendet
     ProcessError = osl_joinProcess( Process );
-
+    
     if( ProcessError != osl_Process_E_None )
         fail( "unable to wait for client.\n",
               ProcessError );
 
     // ermittle den R�ckgabewert des Client-Programms
     ProcessInfo.Size = sizeof( ProcessInfo );
-
+    
     ProcessError = osl_getProcessInfo( Process, osl_Process_EXITCODE, &ProcessInfo );
-
+    
     if( ProcessError != osl_Process_E_None )
         fail( "unable to receive return value of client process.\n",
               ProcessError );
 
     if( ProcessInfo.Code != 0 )
         fail( "client aborted.\n", ProcessInfo.Code );
-
+    
     // gib das Handle fuer den Client-Prozess frei
     osl_freeProcessHandle( Process );
 
@@ -165,6 +165,6 @@ int main (int argc, const char *argv[])
     return 0;
 }
 
-
+  
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/testproc.cxx b/sal/workben/testproc.cxx
index f02af116c36f..71cd13742791 100644
--- a/sal/workben/testproc.cxx
+++ b/sal/workben/testproc.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,23 +48,23 @@ void MAIN (void)
     sal_uInt32 index;
     rtl_uString* ustrExeFile=0;
     rtl_uString* ustrArg=0;
-
+  
     nArgCount=osl_getCommandArgCount();
-
+    
     fprintf(stderr,"Arg Count == %i\n\n",nArgCount);
 
     for ( index = 0 ; index <= nArgCount+1 ; index++ )
     {
         fprintf(stderr,"Getting Arg No . %i\n",index);
-
+        
         osl_getCommandArg(index,&ustrArg);
-
+        
         fprintf(stderr,"done ...\n\n",index);
     }
 
     ProcessError = osl_getExecutableFile(&ustrExeFile);
-
-/*
+    
+/*    
     osl_executeProcess( "e:\\test\\os2de202.exe",
                         NULL,
                         osl_Process_NORMAL,
diff --git a/sal/workben/tgetpwnam.cxx b/sal/workben/tgetpwnam.cxx
index c6fe6f917a93..844aedee343c 100644
--- a/sal/workben/tgetpwnam.cxx
+++ b/sal/workben/tgetpwnam.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@
 extern "C"
 {
     struct tm *localtime_r(const time_t *timep, struct tm *buffer);
-    struct passwd* getpwnam_r(char*, struct passwd*, char *, int);
+    struct passwd* getpwnam_r(char*, struct passwd*, char *, int); 
     struct spwd* getspnam_r(char*, struct spwd*, char *, int);
     struct hostent *gethostbyname_r(const char *name, struct hostent *result,
                                     char *buffer, int buflen, int *h_errnop);
@@ -60,11 +60,11 @@ static int go;
 extern "C" void *workfunc1(void*)
 {
     char buffer[256];
-    struct tm       sttm;
-    time_t          nepoch;
-    struct passwd   stpwd;
-    struct hostent  sthostent;
-    int             nerr;
+    struct tm		sttm;
+    time_t			nepoch;
+    struct passwd 	stpwd;
+    struct hostent	sthostent;
+    int 			nerr;
 
     printf("starting thread 1 ...\n");
     while (go) {
@@ -75,15 +75,15 @@ extern "C" void *workfunc1(void*)
     }
     return 0;
 }
-
+    
 extern "C" void *workfunc2(void*)
 {
     char buffer[256];
-    struct tm       sttm;
-    time_t          nepoch;
-    struct passwd   stpwd;
-    struct hostent  sthostent;
-    int             nerr;
+    struct tm		sttm;
+    time_t			nepoch;
+    struct passwd 	stpwd;
+    struct hostent	sthostent;
+    int 			nerr;
 
     printf("starting thread 2 ...\n");
     while(go) {
@@ -101,18 +101,18 @@ extern int h_errno;
 int main(int argc, char *argv[])
 {
     char buffer[256];
-    struct tm       *ptm;
-    time_t          nepoch;
-    struct passwd   *pwd, *pres1;
-#ifndef NETBSD
-    struct spwd     *spwd, *pres2;
+    struct tm		*ptm;
+    time_t			nepoch;
+    struct passwd 	*pwd, *pres1;
+#ifndef NETBSD	
+    struct spwd 	*spwd, *pres2;
 #endif
-    struct hostent  *phostent, *pres3;
+    struct hostent	*phostent, *pres3;
     char **p;
 
-    pthread_t       tid1,tid2;
-    int             res1,res2;
-
+    pthread_t 		tid1,tid2;
+    int 			res1,res2;
+    
     go = 1;
 
     pthread_create(&tid1, NULL, workfunc1, &res1);
@@ -147,7 +147,7 @@ int main(int argc, char *argv[])
 
 #ifndef NETBSD
     spwd = (struct spwd*)malloc(sizeof(struct spwd));
-
+    
     pres2 = getspnam_r("hr", spwd, buffer, sizeof(buffer));
 
     if (pres2) {
@@ -168,16 +168,16 @@ int main(int argc, char *argv[])
     time(&nepoch);
     localtime_r(&nepoch, ptm);
 
-    printf("Seconds: %d\n", ptm->tm_sec);
-    printf("Minutes: %d\n", ptm->tm_min);
-    printf("Hour: %d\n", ptm->tm_hour);
-    printf("Day of Month: %d\n", ptm->tm_mday);
-    printf("Month: %d\n", ptm->tm_mon);
-    printf("Year: %d\n", ptm->tm_year);
-    printf("Day of week: %d\n", ptm->tm_wday);
-    printf("Day in the year: %d\n", ptm->tm_yday);
+    printf("Seconds: %d\n", ptm->tm_sec); 
+    printf("Minutes: %d\n", ptm->tm_min); 
+    printf("Hour: %d\n", ptm->tm_hour); 
+    printf("Day of Month: %d\n", ptm->tm_mday); 
+    printf("Month: %d\n", ptm->tm_mon); 
+    printf("Year: %d\n", ptm->tm_year); 
+    printf("Day of week: %d\n", ptm->tm_wday); 
+    printf("Day in the year: %d\n", ptm->tm_yday); 
     printf("Daylight saving time: %d\n", ptm->tm_isdst);
-#ifdef NETBSD
+#ifdef NETBSD	
     printf("Timezone: %s\n", ptm->tm_zone);
 #else
     printf("Timezone: %s\n", ptm->tm_name);
@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
                 printf("Address: %s\n", inet_ntoa(**((in_addr**)p)));
         }
     }
-
+    
 
     /* test boundary conditions */
     char smallbuf[23]; /* buffer to small */
@@ -232,10 +232,10 @@ int main(int argc, char *argv[])
     if (!pres3) {
         herror("Expect HOST_NOT_FOUND");
     }
-    else
+    else 
     {
         printf("failed to detect non existant host\n");
-    }
+    } 
 
     free(phostent);
     go = 0; /* atomic enough for our purposes */
diff --git a/salhelper/inc/salhelper/condition.hxx b/salhelper/inc/salhelper/condition.hxx
index efc042ca6156..c750b72a080d 100644
--- a/salhelper/inc/salhelper/condition.hxx
+++ b/salhelper/inc/salhelper/condition.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,44 +39,44 @@ namespace salhelper
 {
     class ConditionModifier;
     class ConditionWaiter;
-
-
+    
+    
     class Condition
     {
         friend class ConditionModifier;
-        friend class ConditionWaiter;
-
+        friend class ConditionWaiter;		
+        
     public:
-
+        
         Condition(osl::Mutex& aMutex);
-
+        
         virtual ~Condition();
-
-
+        
+        
     protected:
-
+        
         virtual bool applies() const = 0;
-
-
+        
+        
     private:
         Condition(Condition &); // not defined
         void operator =(Condition &); // not defined
-
+        
         osl::Mutex&  m_aMutex;
         oslCondition m_aCondition;
     };
 
 
-
+    
     class ConditionModifier
     {
     public:
-
+        
         ConditionModifier(Condition& aCond);
-
+        
         ~ConditionModifier();
 
-
+        
     private:
         ConditionModifier(ConditionModifier &); // not defined
         void operator =(ConditionModifier &); // not defined
@@ -85,13 +85,13 @@ namespace salhelper
     };
 
 
-
+    
     class ConditionWaiter
     {
     public:
 
         ConditionWaiter(Condition& aCond);
-
+        
         struct timedout {
             timedout();
 
@@ -106,10 +106,10 @@ namespace salhelper
             throw(
                 timedout
             );
-
-
+        
+        
         ~ConditionWaiter();
-
+        
 
     private:
         ConditionWaiter(ConditionWaiter &); // not defined
diff --git a/salhelper/inc/salhelper/dynload.hxx b/salhelper/inc/salhelper/dynload.hxx
index 8f0325162455..45ac6313f60c 100644
--- a/salhelper/inc/salhelper/dynload.hxx
+++ b/salhelper/inc/salhelper/dynload.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@ namespace salhelper
 {
 
 /** The ORealDynamicLoader is an implementation helper class for the template loader ODynamicLoader.
- */
+ */   
 class ORealDynamicLoader
 {
 public:
@@ -47,8 +47,8 @@ public:
                                        if the loader will be destroyed.
         @param strModuleName specifies the library name.
         @param strInitFunction specifies the name of the initialization function.
-     */
-    static ORealDynamicLoader* SAL_CALL newInstance(
+     */   
+    static ORealDynamicLoader* SAL_CALL newInstance( 
             ORealDynamicLoader ** ppSetToZeroInDestructor,
             const ::rtl::OUString& strModuleName,
             const ::rtl::OUString& strInitFunction );
@@ -70,7 +70,7 @@ protected:
         @param strInitFunction specifies the name of the initialization function.
         @param pApi points to a structure with the initialized API function pointers.
         @param pModule points to the loaded library handle.
-     */
+     */   
     ORealDynamicLoader( ORealDynamicLoader ** ppSetToZeroInDestructor,
                         const ::rtl::OUString& strModuleName,
                         const ::rtl::OUString& strInitFunction,
@@ -79,24 +79,24 @@ protected:
 
     /// Destructor, try to unload the library.
     virtual ~ORealDynamicLoader();
-
+    
     /// points to  the structure with the initialzed API function pointers.
-    void*                   m_pApi;
-    /// stores the reference count.
-    sal_uInt32              m_refCount;
+    void* 					m_pApi;
+    /// stores the reference count. 
+    sal_uInt32 				m_refCount;
     /// stores the library handle.
-    oslModule               m_pModule;
+    oslModule 				m_pModule;	
     /// stores the library name.
-    ::rtl::OUString         m_strModuleName;
+    ::rtl::OUString 		m_strModuleName;
     /// stores the name of the initialization function.
-    ::rtl::OUString         m_strInitFunction;
+    ::rtl::OUString 		m_strInitFunction;
     /** stores a pointer to itself, which must be reset in the destructor to signal
         that the loader is invalid.
     */
-    ORealDynamicLoader **   ppSetToZeroInDestructor;
+    ORealDynamicLoader **  	ppSetToZeroInDestructor;
 };
 
-
+    
 /** The ODynmaicLoader provides a special load on call mechanism for dynamic libraries
     which support a C-API.
 
@@ -108,14 +108,14 @@ protected:
 
     @deprecated
     Do not use.
- */
+ */ 
 template<class API>
 class ODynamicLoader
 {
 public:
     /// Default constructor
     ODynamicLoader() SAL_THROW(())
-    {
+    { 
         m_pLoader = 0;
     }
 
@@ -124,7 +124,7 @@ public:
 
         @param strModuleName specifies the library name.
         @param strInitFunction specifies the name of the initialization function.
-     */
+     */   
     ODynamicLoader( const ::rtl::OUString& strModuleName,
                        const ::rtl::OUString& strInitFunction ) SAL_THROW(())
     {
@@ -133,13 +133,13 @@ public:
             m_pStaticLoader = ORealDynamicLoader::newInstance(
                &m_pStaticLoader,
                strModuleName,
-               strInitFunction);
-        }
+               strInitFunction);								 
+        } 
         else
         {
             m_pStaticLoader->acquire();
         }
-
+    
         m_pLoader = m_pStaticLoader;
     }
 
@@ -175,26 +175,26 @@ public:
 
     /// returns a poiner to the initialized API function structure.
     API* SAL_CALL getApi() const SAL_THROW(())
-    {
-        return (API*)m_pLoader->getApi();
+    { 
+        return (API*)m_pLoader->getApi(); 
     }
 
     /// cast operator, which cast to a poiner with the initialized API function structure.
     API* SAL_CALL operator->() const SAL_THROW(())
     {
-        return (API*)m_pLoader->getApi();
+        return (API*)m_pLoader->getApi(); 
     }
 
     /// checks if the loader works on a loaded and initialized library.
     sal_Bool SAL_CALL isLoaded() const SAL_THROW(())
-    {
-        return (m_pLoader != NULL);
+    { 
+        return (m_pLoader != NULL); 
     }
 
 protected:
     /// stores the real loader helper instance
-    static ORealDynamicLoader*  m_pStaticLoader;
-    ORealDynamicLoader*         m_pLoader;
+    static ORealDynamicLoader* 	m_pStaticLoader;
+    ORealDynamicLoader* 		m_pLoader;
 };
 
 
diff --git a/salhelper/inc/salhelper/future.hxx b/salhelper/inc/salhelper/future.hxx
index 96159b649cf1..a4a2e0ddae20 100644
--- a/salhelper/inc/salhelper/future.hxx
+++ b/salhelper/inc/salhelper/future.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/salhelper/inc/salhelper/futurequeue.hxx b/salhelper/inc/salhelper/futurequeue.hxx
index 6b4214825fe1..1e7dd0876796 100644
--- a/salhelper/inc/salhelper/futurequeue.hxx
+++ b/salhelper/inc/salhelper/futurequeue.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/salhelper/inc/salhelper/monitor.hxx b/salhelper/inc/salhelper/monitor.hxx
index b7c0ceec9d3c..31191bd083c8 100644
--- a/salhelper/inc/salhelper/monitor.hxx
+++ b/salhelper/inc/salhelper/monitor.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -101,7 +101,7 @@ public:
         Condition::wait();
     }
 };
-
+    
 //----------------------------------------------------------------------------
 
 class QueuedReaderWriterMonitor : public salhelper::ReferenceObject
diff --git a/salhelper/inc/salhelper/queue.hxx b/salhelper/inc/salhelper/queue.hxx
index f32fbcf73f93..66b990759fa6 100644
--- a/salhelper/inc/salhelper/queue.hxx
+++ b/salhelper/inc/salhelper/queue.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/salhelper/inc/salhelper/refobj.hxx b/salhelper/inc/salhelper/refobj.hxx
index 07ddfc90e0e9..0764d8013e01 100644
--- a/salhelper/inc/salhelper/refobj.hxx
+++ b/salhelper/inc/salhelper/refobj.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -103,7 +103,7 @@ protected:
         OSL_ASSERT(m_nReferenceCount == 0);
     }
 };
-
+    
 //----------------------------------------------------------------------------
 
 } // namespace salhelper
diff --git a/salhelper/inc/salhelper/simplereferenceobject.hxx b/salhelper/inc/salhelper/simplereferenceobject.hxx
index c5ef6dbbd070..865eff5a3382 100644
--- a/salhelper/inc/salhelper/simplereferenceobject.hxx
+++ b/salhelper/inc/salhelper/simplereferenceobject.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/salhelper/inc/salhelper/singletonref.hxx b/salhelper/inc/salhelper/singletonref.hxx
index bf9dc69f7f87..c85da50e0b14 100644
--- a/salhelper/inc/salhelper/singletonref.hxx
+++ b/salhelper/inc/salhelper/singletonref.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -72,7 +72,7 @@ namespace salhelper{
                     <li>b) The singleton class can call a special impl_init()
                            method implicit for every called interface method.</li>
                 </ul>
-
+                
                 Note further that this singleton pattern can work only, if
                 all user of such singleton are located inside the same library!
                 Because static values cant be exported - e.g. from windows libraries.
diff --git a/salhelper/qa/test_api.cxx b/salhelper/qa/test_api.cxx
index dfdbee59aa71..94608f498e15 100644
--- a/salhelper/qa/test_api.cxx
+++ b/salhelper/qa/test_api.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/salhelper/source/condition.cxx b/salhelper/source/condition.cxx
index 42e0676fbb96..9ef2453ee671 100644
--- a/salhelper/source/condition.cxx
+++ b/salhelper/source/condition.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -70,7 +70,7 @@ ConditionModifier::~ConditionModifier()
 {
     if(m_aCond.applies())
         osl_setCondition(m_aCond.m_aCondition);
-
+    
     m_aCond.m_aMutex.release();
 }
 
@@ -97,7 +97,7 @@ ConditionWaiter::ConditionWaiter(Condition& aCond)
     while(true) {
         osl_waitCondition(m_aCond.m_aCondition,0);
         m_aCond.m_aMutex.acquire();
-
+        
         if(m_aCond.applies())
             break;
         else {
@@ -117,14 +117,14 @@ ConditionWaiter::ConditionWaiter(Condition& aCond,sal_uInt32 milliSec)
     TimeValue aTime;
     aTime.Seconds = milliSec / 1000;
     aTime.Nanosec = 1000000 * ( milliSec % 1000 );
-
+    
     while(true) {
         if( osl_waitCondition(m_aCond.m_aCondition,&aTime) ==
             osl_cond_result_timeout )
             throw timedout();
-
+        
         m_aCond.m_aMutex.acquire();
-
+        
         if(m_aCond.applies())
             break;
         else {
diff --git a/salhelper/source/dynload.cxx b/salhelper/source/dynload.cxx
index 6db64f002de8..9e0ba96c2f69 100644
--- a/salhelper/source/dynload.cxx
+++ b/salhelper/source/dynload.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,9 +30,9 @@
 #include <rtl/ustrbuf.hxx>
 
 namespace salhelper
-{
+{     
 
-typedef void*   (SAL_CALL *ApiInitFunction) (void);
+typedef	void*	(SAL_CALL *ApiInitFunction) (void);
 
 ORealDynamicLoader::ORealDynamicLoader(ORealDynamicLoader ** ppSetToZeroInDestructor_,
                        const rtl::OUString& moduleName,
@@ -53,13 +53,13 @@ ORealDynamicLoader* ORealDynamicLoader::newInstance(ORealDynamicLoader ** ppSetT
                                   const rtl::OUString& initFunction)
 {
     ApiInitFunction initFunc;
-    oslModule pModule = osl_loadModule(moduleName.pData, SAL_LOADMODULE_DEFAULT);
-
+    oslModule pModule = osl_loadModule(moduleName.pData, SAL_LOADMODULE_DEFAULT);	
+    
     if ( !pModule )
     {
         return NULL;
     }
-
+    
     initFunc = (ApiInitFunction)osl_getFunctionSymbol(
         pModule, initFunction.pData);
 
@@ -69,7 +69,7 @@ ORealDynamicLoader* ORealDynamicLoader::newInstance(ORealDynamicLoader ** ppSetT
         return NULL;
     }
 
-    return(new ORealDynamicLoader(ppSetToZeroInDestructor, moduleName,
+    return(new ORealDynamicLoader(ppSetToZeroInDestructor, moduleName, 
                                  initFunction,
                                  initFunc(),
                                  pModule));
@@ -81,30 +81,30 @@ ORealDynamicLoader::~ORealDynamicLoader()
     if( ppSetToZeroInDestructor )
         *ppSetToZeroInDestructor = 0;
 
-    if (m_pModule)
+    if (m_pModule) 
     {
-        osl_unloadModule(m_pModule);
+        osl_unloadModule(m_pModule);	
         m_pModule = NULL;
     }
-}
+}	
 
 sal_uInt32 ORealDynamicLoader::acquire()
-{
-    return ++m_refCount;
+{ 
+    return ++m_refCount; 
 }
 
 sal_uInt32 ORealDynamicLoader::release()
-{
-    sal_uInt32 nRet = --m_refCount;
+{ 
+    sal_uInt32 nRet = --m_refCount; 
     if( nRet == 0 )
         delete this;
-    return nRet;
+    return nRet; 
 }
 
 
 void* ORealDynamicLoader::getApi() const
-{
-    return m_pApi;
+{ 
+    return m_pApi;		
 }
 
 } // namespace salhelper
diff --git a/salhelper/source/gcc3.map b/salhelper/source/gcc3.map
index 7c63d5d9ee24..cbbdc5f87a85 100644
--- a/salhelper/source/gcc3.map
+++ b/salhelper/source/gcc3.map
@@ -35,11 +35,11 @@ UDK_3.1 {
     global:
         _ZN9salhelper21SimpleReferenceObjectdlEPvRKSt9nothrow_t;
 
-    # Introducing a wildcard right in the middle because due to
-    # marginal type discrepancy there is a difference in the
+    # Introducing a wildcard right in the middle because due to 
+    # marginal type discrepancy there is a difference in the 
     # mangled name between Linux and Mac OS X see #i69351#
     _ZN9salhelper21SimpleReferenceObjectnwE?RKSt9nothrow_t; # salhelper::SimpleReferenceObject::operator new (std::size_t, std::nothrow_t const&)
-
+ 
         _ZN9salhelper9ConditionC1ERN3osl5MutexE;
         _ZN9salhelper9ConditionC2ERN3osl5MutexE;
         _ZN9salhelper9ConditionD0Ev;
diff --git a/salhelper/source/gcc3os2.map b/salhelper/source/gcc3os2.map
index b3fec5d45a21..ae301da83927 100644
--- a/salhelper/source/gcc3os2.map
+++ b/salhelper/source/gcc3os2.map
@@ -35,11 +35,11 @@ UDK_3.1 {
     global:
         _ZN9salhelper21SimpleReferenceObjectdlEPvRKSt9nothrow_t;
 
-    # Introducing a wildcard right in the middle because due to
-    # marginal type discrepancy there is a difference in the
+    # Introducing a wildcard right in the middle because due to 
+    # marginal type discrepancy there is a difference in the 
     # mangled name between Linux and Mac OS X see #i69351#
     _ZN9salhelper21SimpleReferenceObjectnwEjRKSt9nothrow_t; # salhelper::SimpleReferenceObject::operator new (std::size_t, std::nothrow_t const&)
-
+ 
         _ZN9salhelper9ConditionC1ERN3osl5MutexE;
         _ZN9salhelper9ConditionC2ERN3osl5MutexE;
         _ZN9salhelper9ConditionD0Ev;
diff --git a/salhelper/source/msci.map b/salhelper/source/msci.map
index b0359e0c7166..62352a8371bf 100644
--- a/salhelper/source/msci.map
+++ b/salhelper/source/msci.map
@@ -3,7 +3,7 @@ UDK_3_0_0 {
 GetVersionInfo
 ??0ORealDynamicLoader@salhelper@@IAE@PAPAV01@ABVOUString@rtl@@1PAX2@Z
 ??1ORealDynamicLoader@salhelper@@MAE@XZ
-??_7ORealDynamicLoader@salhelper@@6B@
+??_7ORealDynamicLoader@salhelper@@6B@ 
 ?acquire@ORealDynamicLoader@salhelper@@QAAKXZ
 ?getApi@ORealDynamicLoader@salhelper@@QBAPAXXZ
 ?newInstance@ORealDynamicLoader@salhelper@@SAPAV12@PAPAV12@ABVOUString@rtl@@1@Z
diff --git a/salhelper/source/simplereferenceobject.cxx b/salhelper/source/simplereferenceobject.cxx
index 6df42cc1c930..f31089177dc7 100644
--- a/salhelper/source/simplereferenceobject.cxx
+++ b/salhelper/source/simplereferenceobject.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/salhelper/test/Symbols/loader.cxx b/salhelper/test/Symbols/loader.cxx
index 6bd95be4838f..97e4a2280099 100644
--- a/salhelper/test/Symbols/loader.cxx
+++ b/salhelper/test/Symbols/loader.cxx
@@ -10,14 +10,14 @@ using namespace salhelper;
 using namespace rtl;
 
 
-class SampleLibLoader
+class SampleLibLoader 
     : public ::salhelper::ODynamicLoader<SampleLib_Api>
 {
 public:
     SampleLibLoader():
         ::salhelper::ODynamicLoader<SampleLib_Api>
-            (::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SAL_MODULENAME( "samplelib") ) ),
-             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(SAMPLELIB_INIT_FUNCTION_NAME) ))
+            (::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SAL_MODULENAME( "samplelib") ) ), 
+             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(SAMPLELIB_INIT_FUNCTION_NAME) ))  
         {}
 
 };
diff --git a/salhelper/test/Symbols/samplelib.cxx b/salhelper/test/Symbols/samplelib.cxx
index 6f66aa73f324..edc76fa5a6cd 100644
--- a/salhelper/test/Symbols/samplelib.cxx
+++ b/salhelper/test/Symbols/samplelib.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include "samplelib.hxx"
 #include <sal/types.h>
-/*
+/* 
 
 
 */
@@ -23,7 +23,7 @@ SampleLib_Api* SAL_CALL initSampleLibApi(void)
 
 }
 
-
+    
 sal_Int32 SAL_CALL funcA( sal_Int32 a)
 {
     return a;
diff --git a/salhelper/test/dynamicloader/loader.cxx b/salhelper/test/dynamicloader/loader.cxx
index 6bd95be4838f..97e4a2280099 100644
--- a/salhelper/test/dynamicloader/loader.cxx
+++ b/salhelper/test/dynamicloader/loader.cxx
@@ -10,14 +10,14 @@ using namespace salhelper;
 using namespace rtl;
 
 
-class SampleLibLoader
+class SampleLibLoader 
     : public ::salhelper::ODynamicLoader<SampleLib_Api>
 {
 public:
     SampleLibLoader():
         ::salhelper::ODynamicLoader<SampleLib_Api>
-            (::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SAL_MODULENAME( "samplelib") ) ),
-             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(SAMPLELIB_INIT_FUNCTION_NAME) ))
+            (::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SAL_MODULENAME( "samplelib") ) ), 
+             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(SAMPLELIB_INIT_FUNCTION_NAME) ))  
         {}
 
 };
diff --git a/salhelper/test/dynamicloader/samplelib.cxx b/salhelper/test/dynamicloader/samplelib.cxx
index 6f66aa73f324..edc76fa5a6cd 100644
--- a/salhelper/test/dynamicloader/samplelib.cxx
+++ b/salhelper/test/dynamicloader/samplelib.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include "samplelib.hxx"
 #include <sal/types.h>
-/*
+/* 
 
 
 */
@@ -23,7 +23,7 @@ SampleLib_Api* SAL_CALL initSampleLibApi(void)
 
 }
 
-
+    
 sal_Int32 SAL_CALL funcA( sal_Int32 a)
 {
     return a;
diff --git a/salhelper/test/rtti/rttitest.cxx b/salhelper/test/rtti/rttitest.cxx
index a39a7e1760f8..5e5ea2c911db 100644
--- a/salhelper/test/rtti/rttitest.cxx
+++ b/salhelper/test/rtti/rttitest.cxx
@@ -17,13 +17,13 @@ int main( int argc, char *argv[ ], char *envp[ ] )
     // test the virtual function
     pA->funcA();
 
-//  const type_info& i1= typeid ( b);
-//  const type_info& i2= typeid( pA);
+//	const type_info& i1= typeid ( b);
+//	const type_info& i2= typeid( pA);
 
     if( typeid( b) == typeid( pA))
         printf("\nsame types");
 
-
+    
     MyClassB* pB= dynamic_cast<MyClassB* >( pA);
         pB->funcA();
     return 0;
diff --git a/stoc/inc/bootstrapservices.hxx b/stoc/inc/bootstrapservices.hxx
index e504b164f89a..95bec4fe7334 100644
--- a/stoc/inc/bootstrapservices.hxx
+++ b/stoc/inc/bootstrapservices.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -72,13 +72,13 @@ namespace stoc_bootstrap
 
     //defaultregistry
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL NestedRegistry_CreateInstance(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& )
+        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ) 
     throw( ::com::sun::star::uno::Exception);
     ::com::sun::star::uno::Sequence< ::rtl::OUString > defreg_getSupportedServiceNames();
     ::rtl::OUString defreg_getImplementationName();
 
     //simpleregistry
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SimpleRegistry_CreateInstance(
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SimpleRegistry_CreateInstance( 
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& );
     ::com::sun::star::uno::Sequence< ::rtl::OUString > simreg_getSupportedServiceNames();
     ::rtl::OUString simreg_getImplementationName();
@@ -90,8 +90,8 @@ namespace stoc_bootstrap
     ::rtl::OUString impreg_getImplementationName();
 
     //loader
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL DllComponentLoader_CreateInstance(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& )
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL DllComponentLoader_CreateInstance( 
+        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ) 
     throw(::com::sun::star::uno::Exception);
     ::com::sun::star::uno::Sequence< ::rtl::OUString > loader_getSupportedServiceNames();
     ::rtl::OUString loader_getImplementationName();
diff --git a/stoc/inc/pch/precompiled_stoc.cxx b/stoc/inc/pch/precompiled_stoc.cxx
index 9e1e04a932b9..64e03480bdf7 100644
--- a/stoc/inc/pch/precompiled_stoc.cxx
+++ b/stoc/inc/pch/precompiled_stoc.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/inc/pch/precompiled_stoc.hxx b/stoc/inc/pch/precompiled_stoc.hxx
index 3e0b4d6dee3f..efcbaa1ea210 100644
--- a/stoc/inc/pch/precompiled_stoc.hxx
+++ b/stoc/inc/pch/precompiled_stoc.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/inc/stocservices.hxx b/stoc/inc/stocservices.hxx
index e27124758f41..070b0ea72aa7 100644
--- a/stoc/inc/stocservices.hxx
+++ b/stoc/inc/stocservices.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,12 +43,12 @@ namespace stoc_services
 {
     // typeconv
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL TypeConverter_Impl_CreateInstance(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & )
+        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & ) 
     throw( ::com::sun::star::uno::RuntimeException );
     ::com::sun::star::uno::Sequence< ::rtl::OUString > tcv_getSupportedServiceNames();
     ::rtl::OUString tcv_getImplementationName();
 
-    namespace ExternalUriReferenceTranslator
+    namespace ExternalUriReferenceTranslator 
     {
     com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL create(
         com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context)
@@ -57,7 +57,7 @@ namespace stoc_services
     com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames();
     }
 
-    namespace UriReferenceFactory
+    namespace UriReferenceFactory 
     {
     com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL create(
         com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >  const & context)
@@ -66,7 +66,7 @@ namespace stoc_services
     com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames();
     }
 
-    namespace UriSchemeParser_vndDOTsunDOTstarDOTexpand
+    namespace UriSchemeParser_vndDOTsunDOTstarDOTexpand 
     {
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const &)
@@ -75,7 +75,7 @@ namespace stoc_services
     ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames();
     }
 
-    namespace UriSchemeParser_vndDOTsunDOTstarDOTscript
+    namespace UriSchemeParser_vndDOTsunDOTstarDOTscript 
     {
     com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL create(
         com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &)
@@ -84,7 +84,7 @@ namespace stoc_services
     com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames();
     }
 
-    namespace VndSunStarPkgUrlReferenceFactory
+    namespace VndSunStarPkgUrlReferenceFactory 
     {
     com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL create(
         com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context)
diff --git a/stoc/source/bootstrap/bootstrap.xml b/stoc/source/bootstrap/bootstrap.xml
index 3a90bbdccf71..ac5fb2db1c9a 100644
--- a/stoc/source/bootstrap/bootstrap.xml
+++ b/stoc/source/bootstrap/bootstrap.xml
@@ -1,148 +1,148 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   bootstrap.uno   </module-name>
+    <module-name>	bootstrap.uno	</module-name>
     <component-description>
         <author> Juergen Schmidt </author>
-        <name>  com.sun.star.comp.stoc.DLLComponentLoader   </name>
+        <name>	com.sun.star.comp.stoc.DLLComponentLoader	</name>
         <description>
-    This component provides a mechanism to load an external compoment implemented as
+    This component provides a mechanism to load an external compoment implemented as 
     a shared library.
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.loader.SharedLibrary   </supported-service>
-        <type>  com.sun.star.util.XMacroExpander            </type>
-        <type>  com.sun.star.loader.XImplementationLoader           </type>
-        <type>  com.sun.star.lang.IllegalArgumentException          </type>
-        <type>  com.sun.star.lang.XInitialization                   </type>
-        <type>  com.sun.star.lang.XTypeProvider                     </type>
-        <type>  com.sun.star.lang.XServiceInfo                      </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory                 </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory                  </type>
-        <type>  com.sun.star.registry.XRegistryKey                  </type>
-        <type>  com.sun.star.beans.XPropertySet                     </type>
-        <type>  com.sun.star.container.XSet                     </type>
-        <type>  com.sun.star.uno.XAggregation                       </type>
-        <type>  com.sun.star.uno.XComponentContext          </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory       </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </type>
-        <type>  com.sun.star.uno.DeploymentException                    </type>
+        <supported-service>	com.sun.star.loader.SharedLibrary	</supported-service>
+        <type>	com.sun.star.util.XMacroExpander			</type>
+        <type>	com.sun.star.loader.XImplementationLoader			</type>
+        <type>	com.sun.star.lang.IllegalArgumentException			</type>
+        <type>	com.sun.star.lang.XInitialization 		 			</type>
+        <type>	com.sun.star.lang.XTypeProvider						</type>
+        <type>	com.sun.star.lang.XServiceInfo						</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory					</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory					</type>
+        <type>	com.sun.star.registry.XRegistryKey					</type>
+        <type>	com.sun.star.beans.XPropertySet 					</type>
+        <type>	com.sun.star.container.XSet						</type>
+        <type>	com.sun.star.uno.XAggregation						</type>
+        <type>	com.sun.star.uno.XComponentContext			</type>
+        <type>	com.sun.star.lang.XSingleComponentFactory		</type>
+        <type>	com.sun.star.uno.XWeak							</type>
+        <type>	com.sun.star.uno.TypeClass						</type>
+        <type>	com.sun.star.uno.DeploymentException					</type>
     </component-description>
     <component-description>
         <author> Juergen Schmidt </author>
-        <name>  com.sun.star.comp.stoc.NestedRegistry   </name>
+        <name>	com.sun.star.comp.stoc.NestedRegistry	</name>
         <description>
     This component provides access to a simple hierachical registry. The registry based on
-    two registry file.
+    two registry file. 
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.registry.NestedRegistry    </supported-service>
+        <supported-service>	com.sun.star.registry.NestedRegistry	</supported-service>
         <reference-docu xlink:href="http://www.sun.com" xlink:type="simple"/>
-        <service-dependency>    com.sun.star.registry.SimpleRegistry    </service-dependency>
-        <type>  com.sun.star.lang.XInitialization               </type>
-        <type>  com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
-        <type>  com.sun.star.registry.XSimpleRegistry           </type>
-        <type>  com.sun.star.registry.XRegistryKey              </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory                   </type>
-        <type>  com.sun.star.uno.XComponentContext                  </type>
-        <type>  com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </type>
-        <type>  com.sun.star.container.XEnumerationAccess           </type>
+        <service-dependency>	com.sun.star.registry.SimpleRegistry	</service-dependency>
+        <type>	com.sun.star.lang.XInitialization				</type>
+        <type>	com.sun.star.lang.XTypeProvider					</type>
+        <type>	com.sun.star.lang.XServiceInfo					</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory			</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory			</type>
+        <type>	com.sun.star.registry.XSimpleRegistry			</type>
+        <type>	com.sun.star.registry.XRegistryKey				</type>
+        <type>	com.sun.star.lang.XSingleComponentFactory					</type>
+        <type>	com.sun.star.uno.XComponentContext					</type>
+        <type>	com.sun.star.uno.XAggregation					</type>
+        <type>	com.sun.star.uno.XWeak							</type>
+        <type>	com.sun.star.uno.TypeClass						</type>
+        <type>	com.sun.star.container.XEnumerationAccess			</type>
     </component-description>
     <component-description>
         <author> Juergen Schmidt </author>
-        <name>  com.sun.star.comp.stoc.ImplementationRegistration   </name>
+        <name>	com.sun.star.comp.stoc.ImplementationRegistration	</name>
         <description>
     This component provides a mechanism to register or deregister an external component
     to the current uno environment or better to the current service manager.
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.registry.ImplementationRegistration    </supported-service>
-        <service-dependency>    com.sun.star.registry.SimpleRegistry    </service-dependency>
-        <service-dependency>    com.sun.star.loader.SharedLibrary       </service-dependency>
-        <service-dependency>    com.sun.star.loader.Java                </service-dependency>
-        <type>  com.sun.star.loader.XImplementationLoader           </type>
-        <type>  com.sun.star.lang.XInitialization                   </type>
-        <type>  com.sun.star.lang.XTypeProvider                     </type>
-        <type>  com.sun.star.lang.XServiceInfo                      </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory             </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory               </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory              </type>
-        <type>  com.sun.star.registry.XSimpleRegistry               </type>
-        <type>  com.sun.star.registry.XRegistryKey                  </type>
-        <type>  com.sun.star.registry.XImplementationRegistration2  </type>
-        <type>  com.sun.star.beans.XPropertySet                     </type>
-        <type>  com.sun.star.container.XSet                         </type>
-        <type>  com.sun.star.container.XHierarchicalNameAccess                          </type>
-        <type>  com.sun.star.reflection.XServiceTypeDescription                         </type>
-        <type>  com.sun.star.uno.XAggregation                       </type>
-        <type>  com.sun.star.uno.XWeak                              </type>
-        <type>  com.sun.star.uno.TypeClass                          </type>
-        <type>  com.sun.star.uno.XComponentContext  </type>
+        <supported-service>	com.sun.star.registry.ImplementationRegistration	</supported-service>
+        <service-dependency>	com.sun.star.registry.SimpleRegistry	</service-dependency>
+        <service-dependency>	com.sun.star.loader.SharedLibrary		</service-dependency>
+        <service-dependency>	com.sun.star.loader.Java				</service-dependency>
+        <type>	com.sun.star.loader.XImplementationLoader			</type>
+        <type>	com.sun.star.lang.XInitialization 		 			</type>
+        <type>	com.sun.star.lang.XTypeProvider						</type>
+        <type>	com.sun.star.lang.XServiceInfo						</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory				</type>
+        <type>	com.sun.star.lang.XSingleComponentFactory				</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory				</type>
+        <type>	com.sun.star.registry.XSimpleRegistry				</type>
+        <type>	com.sun.star.registry.XRegistryKey					</type>
+        <type>	com.sun.star.registry.XImplementationRegistration2	</type>
+        <type>	com.sun.star.beans.XPropertySet 					</type>
+        <type>	com.sun.star.container.XSet							</type>
+        <type>	com.sun.star.container.XHierarchicalNameAccess							</type>
+        <type>	com.sun.star.reflection.XServiceTypeDescription							</type>
+        <type>	com.sun.star.uno.XAggregation						</type>
+        <type>	com.sun.star.uno.XWeak								</type>
+        <type>	com.sun.star.uno.TypeClass							</type>
+        <type>	com.sun.star.uno.XComponentContext	</type>
     </component-description>
     <component-description>
         <author> Daniel Boelzle </author>
-        <name>  com.sun.star.comp.stoc.RegistryTypeDescriptionProvider  </name>
+        <name>	com.sun.star.comp.stoc.RegistryTypeDescriptionProvider	</name>
         <description>
 This provider service supports the XHierarchicalNameAccess interface to read type descriptions
 and constants from a registry source.
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  C++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	C++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.reflection.TypeDescriptionProvider </supported-service>
+        <supported-service>	com.sun.star.reflection.TypeDescriptionProvider	</supported-service>
         <service-dependency>com.sun.star.reflection.TypeDescriptionManager</service-dependency>
-        <type>  com.sun.star.reflection.XTypeDescription                    </type>
+        <type>	com.sun.star.reflection.XTypeDescription					</type>
         <type>  com.sun.star.reflection.XConstantsTypeDescription           </type>
-        <type>  com.sun.star.reflection.XEnumTypeDescription                </type>
-        <type>  com.sun.star.reflection.XIndirectTypeDescription            </type>
-        <type>  com.sun.star.reflection.XInterfaceMemberTypeDescription     </type>
-        <type>  com.sun.star.reflection.XInterfaceAttributeTypeDescription2 </type>
-        <type>  com.sun.star.reflection.XMethodParameter                    </type>
+        <type>	com.sun.star.reflection.XEnumTypeDescription				</type>
+        <type>	com.sun.star.reflection.XIndirectTypeDescription			</type>
+        <type>	com.sun.star.reflection.XInterfaceMemberTypeDescription		</type>
+        <type>	com.sun.star.reflection.XInterfaceAttributeTypeDescription2 </type>
+        <type>	com.sun.star.reflection.XMethodParameter					</type>
         <type>  com.sun.star.reflection.XModuleTypeDescription              </type>
-        <type>  com.sun.star.reflection.XInterfaceMethodTypeDescription     </type>
-        <type>  com.sun.star.reflection.XInterfaceTypeDescription           </type>
-        <type>  com.sun.star.reflection.XInterfaceTypeDescription2          </type>
-        <type>  com.sun.star.reflection.XCompoundTypeDescription            </type>
+        <type>	com.sun.star.reflection.XInterfaceMethodTypeDescription		</type>
+        <type>	com.sun.star.reflection.XInterfaceTypeDescription			</type>
+        <type>	com.sun.star.reflection.XInterfaceTypeDescription2			</type>
+        <type>	com.sun.star.reflection.XCompoundTypeDescription			</type>
         <type>  com.sun.star.reflection.XServiceConstructorDescription </type>
         <type>  com.sun.star.reflection.XServiceTypeDescription             </type>
         <type>  com.sun.star.reflection.XServiceTypeDescription2            </type>
         <type>  com.sun.star.reflection.XSingletonTypeDescription2          </type>
         <type>  com.sun.star.reflection.XTypeDescriptionEnumerationAccess   </type>
         <type>  com.sun.star.reflection.XParameter </type>
-        <type>  com.sun.star.reflection.XPublished</type>
-        <type>  com.sun.star.reflection.XStructTypeDescription</type>
-        <type>  com.sun.star.lang.DisposedException                         </type>
-        <type>  com.sun.star.lang.XComponent                                </type>
-        <type>  com.sun.star.lang.XTypeProvider                             </type>
-        <type>  com.sun.star.lang.XServiceInfo                              </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory                   </type>
-        <type>  com.sun.star.lang.XMultiComponentFactory                    </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory                     </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory                      </type>
-        <type>  com.sun.star.lang.XInitialization                           </type>
-        <type>  com.sun.star.registry.XSimpleRegistry                       </type>
-        <type>  com.sun.star.beans.PropertyAttribute                        </type>
-        <type>  com.sun.star.beans.XPropertySet                             </type>
+        <type>	com.sun.star.reflection.XPublished</type>
+        <type>	com.sun.star.reflection.XStructTypeDescription</type>
+        <type>	com.sun.star.lang.DisposedException     					</type>
+        <type>	com.sun.star.lang.XComponent								</type>
+        <type>	com.sun.star.lang.XTypeProvider								</type>
+        <type>	com.sun.star.lang.XServiceInfo								</type>
+        <type>	com.sun.star.lang.XSingleComponentFactory					</type>
+        <type>	com.sun.star.lang.XMultiComponentFactory					</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory						</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory						</type>
+        <type>	com.sun.star.lang.XInitialization						    </type>
+        <type>	com.sun.star.registry.XSimpleRegistry						</type>
+        <type>	com.sun.star.beans.PropertyAttribute				        </type>
+        <type>	com.sun.star.beans.XPropertySet 							</type>
         <type>  com.sun.star.container.NoSuchElementException </type>
-        <type>  com.sun.star.container.XHierarchicalNameAccess              </type>
-        <type>  com.sun.star.container.XSet                                 </type>
-        <type>  com.sun.star.uno.XAggregation                               </type>
-        <type>  com.sun.star.uno.XComponentContext                          </type>
-        <type>  com.sun.star.uno.XWeak                                      </type>
+        <type>	com.sun.star.container.XHierarchicalNameAccess				</type>
+        <type>	com.sun.star.container.XSet									</type>
+        <type>	com.sun.star.uno.XAggregation								</type>
+        <type>	com.sun.star.uno.XComponentContext							</type>
+        <type>	com.sun.star.uno.XWeak										</type>
         <type>  com.sun.star.uno.XInterface </type>
-        <type>  com.sun.star.uno.TypeClass                                  </type>
+        <type>	com.sun.star.uno.TypeClass									</type>
         <type>  com.sun.star.uno.RuntimeException </type>
     </component-description>
     <component-description>
@@ -211,31 +211,31 @@ This service is an implementation of the com.sun.star.security.Policy service.
     </component-description>
     <component-description>
         <author> Juergen Schmidt </author>
-        <name>  com.sun.star.comp.stoc.SimpleRegistry   </name>
+        <name>	com.sun.star.comp.stoc.SimpleRegistry	</name>
         <description>
     This component provides access to a simple hierachical registry. The registry based on
-    one registry file.
+    one registry file. 
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.registry.SimpleRegistry    </supported-service>
-        <type>  com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory           </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
-        <type>  com.sun.star.lang.XMultiComponentFactory            </type>
-        <type>  com.sun.star.registry.XSimpleRegistry           </type>
-        <type>  com.sun.star.registry.XRegistryKey              </type>
-        <type>  com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </type>
-        <type>  com.sun.star.uno.XComponentContext          </type>
+        <supported-service>	com.sun.star.registry.SimpleRegistry	</supported-service>
+        <type>	com.sun.star.lang.XTypeProvider					</type>
+        <type>	com.sun.star.lang.XServiceInfo					</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory			</type>
+        <type>	com.sun.star.lang.XSingleComponentFactory			</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory			</type>
+        <type>	com.sun.star.lang.XMultiComponentFactory			</type>
+        <type>	com.sun.star.registry.XSimpleRegistry			</type>
+        <type>	com.sun.star.registry.XRegistryKey				</type>
+        <type>	com.sun.star.uno.XAggregation					</type>
+        <type>	com.sun.star.uno.XWeak							</type>
+        <type>	com.sun.star.uno.TypeClass						</type>
+        <type>	com.sun.star.uno.XComponentContext			</type>
     </component-description>
     <component-description>
         <author> Juergen Schmidt </author>
-        <name>  com.sun.star.comp.stoc.OServiceManager  </name>
+        <name>	com.sun.star.comp.stoc.OServiceManager	</name>
         <description>
     This component provides an administration object which manages
     factories for many services. The services could be accessed with
@@ -245,47 +245,47 @@ This service is an implementation of the com.sun.star.security.Policy service.
     two ways are possible:
     - register a component persistent in a registry on which the servicemanager
       works, using the com.sun.star.registry.ImplementationRegistration service.
-    - insert a corresponding factory for the service directly using the
+    - insert a corresponding factory for the service directly using the 
       interface XSet.
 
-    For creating an object of a requested service the service manager checks
-    if a factory for this service is avaible, if not the registry will be
+    For creating an object of a requested service the service manager checks 
+    if a factory for this service is avaible, if not the registry will be 
     searched for information about this service. If there is an appropriate
-    entry, the component is loaded, a factory is created and announced to the
-    service manager. Finding a factory the service manager calls the factory
+    entry, the component is loaded, a factory is created and announced to the 
+    service manager. Finding a factory the service manager calls the factory 
     for creating new objects.
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.lang.MultiServiceFactory   </supported-service>
-        <supported-service> com.sun.star.lang.ServiceManager        </supported-service>
-        <type>  com.sun.star.lang.XUnoTunnel                </type>
-        <type>  com.sun.star.lang.XComponent                        </type>
-        <type>  com.sun.star.lang.XEventListener                    </type>
-        <type>  com.sun.star.lang.XInitialization                   </type>
-        <type>  com.sun.star.lang.XTypeProvider                     </type>
-        <type>  com.sun.star.lang.XServiceInfo                      </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory             </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory           </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory              </type>
-        <type>  com.sun.star.lang.DisposedException             </type>
-        <type>  com.sun.star.registry.XSimpleRegistry               </type>
-        <type>  com.sun.star.beans.XPropertySet                     </type>
-        <type>  com.sun.star.container.XSet                         </type>
-        <type>  com.sun.star.container.XEnumeration                 </type>
-        <type>  com.sun.star.container.XContentEnumerationAccess    </type>
-        <type>  com.sun.star.container.XHierarchicalNameAccess  </type>
-        <type>  com.sun.star.uno.XComponentContext                      </type>
-        <type>  com.sun.star.uno.XAggregation                       </type>
-        <type>  com.sun.star.uno.XWeak                              </type>
-        <type>  com.sun.star.uno.TypeClass                          </type>
-        <type>  com.sun.star.uno.XUnloadingPreference               </type>
+        <supported-service>	com.sun.star.lang.MultiServiceFactory	</supported-service>
+        <supported-service>	com.sun.star.lang.ServiceManager		</supported-service>
+        <type>	com.sun.star.lang.XUnoTunnel				</type>
+        <type>	com.sun.star.lang.XComponent	 		 			</type>
+        <type>	com.sun.star.lang.XEventListener 		 			</type>
+        <type>	com.sun.star.lang.XInitialization 		 			</type>
+        <type>	com.sun.star.lang.XTypeProvider						</type>
+        <type>	com.sun.star.lang.XServiceInfo						</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory				</type>
+        <type>	com.sun.star.lang.XSingleComponentFactory			</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory				</type>
+        <type>	com.sun.star.lang.DisposedException				</type>
+        <type>	com.sun.star.registry.XSimpleRegistry				</type>
+        <type>	com.sun.star.beans.XPropertySet 					</type>
+        <type>	com.sun.star.container.XSet							</type>
+        <type>	com.sun.star.container.XEnumeration					</type>
+        <type>	com.sun.star.container.XContentEnumerationAccess	</type>
+        <type>	com.sun.star.container.XHierarchicalNameAccess	</type>
+        <type>	com.sun.star.uno.XComponentContext						</type>
+        <type>	com.sun.star.uno.XAggregation						</type>
+        <type>	com.sun.star.uno.XWeak								</type>
+        <type>	com.sun.star.uno.TypeClass							</type>
+        <type>	com.sun.star.uno.XUnloadingPreference				</type>
         <type>  com.sun.star.beans.PropertyAttribute                </type>
    </component-description>
     <component-description>
         <author> Daniel Boelzle </author>
-        <name>  com.sun.star.comp.stoc.TypeDescriptionManager   </name>
+        <name>	com.sun.star.comp.stoc.TypeDescriptionManager	</name>
         <description>
 This service is the central manager supporting the XHierarchicalNameAccess interface.
 At runtime there will only be at most a single instance of the service.
@@ -295,64 +295,64 @@ You can manually add a provider by inserting it via the XSet interface.
 At startup of this service, you must call an initialization, adding all known
 providers.
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  C++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	C++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.reflection.TypeDescriptionManager  </supported-service>
+        <supported-service>	com.sun.star.reflection.TypeDescriptionManager	</supported-service>
         <service-dependency> ... </service-dependency>
-        <type>  com.sun.star.beans.PropertyAttribute                        </type>
-        <type>  com.sun.star.reflection.XTypeDescription                    </type>
-        <type>  com.sun.star.reflection.XEnumTypeDescription                </type>
-        <type>  com.sun.star.reflection.XArrayTypeDescription               </type>
-        <type>  com.sun.star.reflection.XIndirectTypeDescription            </type>
-        <type>  com.sun.star.reflection.XInterfaceMemberTypeDescription     </type>
-        <type>  com.sun.star.reflection.XInterfaceAttributeTypeDescription  </type>
-        <type>  com.sun.star.reflection.XInterfaceAttributeTypeDescription2 </type>
-        <type>  com.sun.star.reflection.XMethodParameter                    </type>
-        <type>  com.sun.star.reflection.XInterfaceMethodTypeDescription     </type>
-        <type>  com.sun.star.reflection.XInterfaceTypeDescription2          </type>
-        <type>  com.sun.star.reflection.XStructTypeDescription              </type>
-        <type>  com.sun.star.reflection.XServiceTypeDescription             </type>
-        <type>  com.sun.star.reflection.XServiceTypeDescription2            </type>
-        <type>  com.sun.star.reflection.XPropertyTypeDescription            </type>
-        <type>  com.sun.star.reflection.XConstantTypeDescription            </type>
-        <type>  com.sun.star.reflection.XConstantsTypeDescription           </type>
-        <type>  com.sun.star.reflection.XSingletonTypeDescription           </type>
-        <type>  com.sun.star.reflection.XSingletonTypeDescription2          </type>
-        <type>  com.sun.star.reflection.XUnionTypeDescription               </type>
+        <type>	com.sun.star.beans.PropertyAttribute						</type>
+        <type>	com.sun.star.reflection.XTypeDescription					</type>
+        <type>	com.sun.star.reflection.XEnumTypeDescription				</type>
+        <type>	com.sun.star.reflection.XArrayTypeDescription				</type>
+        <type>	com.sun.star.reflection.XIndirectTypeDescription			</type>
+        <type>	com.sun.star.reflection.XInterfaceMemberTypeDescription		</type>
+        <type>	com.sun.star.reflection.XInterfaceAttributeTypeDescription	</type>
+        <type>	com.sun.star.reflection.XInterfaceAttributeTypeDescription2	</type>
+        <type>	com.sun.star.reflection.XMethodParameter					</type>
+        <type>	com.sun.star.reflection.XInterfaceMethodTypeDescription		</type>
+        <type>	com.sun.star.reflection.XInterfaceTypeDescription2			</type>
+        <type>	com.sun.star.reflection.XStructTypeDescription				</type>
+        <type>	com.sun.star.reflection.XServiceTypeDescription	 			</type>
+        <type>	com.sun.star.reflection.XServiceTypeDescription2			</type>
+        <type>	com.sun.star.reflection.XPropertyTypeDescription			</type>
+        <type>	com.sun.star.reflection.XConstantTypeDescription			</type>
+        <type>	com.sun.star.reflection.XConstantsTypeDescription			</type>
+        <type>	com.sun.star.reflection.XSingletonTypeDescription			</type>
+        <type>	com.sun.star.reflection.XSingletonTypeDescription2			</type>
+        <type>	com.sun.star.reflection.XUnionTypeDescription				</type>
         <type>  com.sun.star.reflection.XTypeDescriptionEnumerationAccess   </type>
-        <type>  com.sun.star.lang.DisposedException                         </type>
-        <type>  com.sun.star.lang.XComponent                                </type>
-        <type>  com.sun.star.lang.XEventListener                            </type>
-        <type>  com.sun.star.lang.XInitialization                           </type>
-        <type>  com.sun.star.lang.XTypeProvider                             </type>
-        <type>  com.sun.star.lang.XServiceInfo                              </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory                     </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory                   </type>
-        <type>  com.sun.star.lang.XMultiComponentFactory                    </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory                      </type>
-        <type>  com.sun.star.registry.XRegistryKey                          </type>
-        <type>  com.sun.star.container.XSet                                 </type>
-        <type>  com.sun.star.container.XHierarchicalNameAccess              </type>
-        <type>  com.sun.star.container.XContentEnumerationAccess            </type>
-        <type>  com.sun.star.uno.XAggregation                               </type>
-        <type>  com.sun.star.uno.XWeak                                      </type>
-        <type>  com.sun.star.uno.XComponentContext                                      </type>
-        <type>  com.sun.star.uno.TypeClass                                  </type>
+        <type>	com.sun.star.lang.DisposedException     					</type>
+        <type>	com.sun.star.lang.XComponent								</type>
+        <type>	com.sun.star.lang.XEventListener							</type>
+        <type>	com.sun.star.lang.XInitialization 		 					</type>
+        <type>	com.sun.star.lang.XTypeProvider								</type>
+        <type>	com.sun.star.lang.XServiceInfo								</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory						</type>
+        <type>	com.sun.star.lang.XSingleComponentFactory					</type>
+        <type>	com.sun.star.lang.XMultiComponentFactory					</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory						</type>
+        <type>	com.sun.star.registry.XRegistryKey							</type>
+        <type>	com.sun.star.container.XSet									</type>
+        <type>	com.sun.star.container.XHierarchicalNameAccess				</type>
+        <type>	com.sun.star.container.XContentEnumerationAccess			</type>
+        <type>	com.sun.star.uno.XAggregation								</type>
+        <type>	com.sun.star.uno.XWeak										</type>
+        <type>	com.sun.star.uno.XComponentContext										</type>
+        <type>	com.sun.star.uno.TypeClass									</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <project-build-dependency>  registry    </project-build-dependency>
-    <project-build-dependency>  store       </project-build-dependency>
-    <project-build-dependency>  salhelper   </project-build-dependency>
-    <runtime-module-dependency> cppuhelper3$(COM)   </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
-    <runtime-module-dependency> reg3        </runtime-module-dependency>
-    <runtime-module-dependency> store3      </runtime-module-dependency>
-    <runtime-module-dependency> reg3        </runtime-module-dependency>
-    <runtime-module-dependency> store3      </runtime-module-dependency>
-    <runtime-module-dependency> salhelper3(COM)     </runtime-module-dependency>
-    <runtime-module-dependency> salhelper3(COM)     </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <project-build-dependency>	registry	</project-build-dependency>
+    <project-build-dependency>	store		</project-build-dependency>
+    <project-build-dependency>	salhelper	</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper3$(COM)	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu3		</runtime-module-dependency>
+    <runtime-module-dependency>	sal3		</runtime-module-dependency>
+    <runtime-module-dependency>	reg3		</runtime-module-dependency>
+    <runtime-module-dependency>	store3		</runtime-module-dependency>
+    <runtime-module-dependency>	reg3		</runtime-module-dependency>
+    <runtime-module-dependency>	store3		</runtime-module-dependency>
+    <runtime-module-dependency>	salhelper3(COM)		</runtime-module-dependency>
+    <runtime-module-dependency>	salhelper3(COM)		</runtime-module-dependency>
 </module-description>
diff --git a/stoc/source/bootstrap/services.cxx b/stoc/source/bootstrap/services.cxx
index fc546af4d88b..daf1d105ab8a 100644
--- a/stoc/source/bootstrap/services.cxx
+++ b/stoc/source/bootstrap/services.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx
index 64e7b5bfc13c..93f99113601c 100644
--- a/stoc/source/corereflection/base.hxx
+++ b/stoc/source/corereflection/base.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -109,15 +109,15 @@ class IdlReflectionServiceImpl
     , public XHierarchicalNameAccess
     , public XServiceInfo
 {
-    Mutex                                   _aComponentMutex;
-    Reference< XMultiServiceFactory >       _xMgr;
-    Reference< XHierarchicalNameAccess >    _xTDMgr;
-
+    Mutex									_aComponentMutex;
+    Reference< XMultiServiceFactory >		_xMgr;
+    Reference< XHierarchicalNameAccess >	_xTDMgr;
+    
     // caching
-    LRU_CacheAnyByOUString                  _aElements;
+    LRU_CacheAnyByOUString					_aElements;
 
-    Mapping                     _aCpp2Uno;
-    Mapping                     _aUno2Cpp;
+    Mapping						_aCpp2Uno;
+    Mapping						_aUno2Cpp;
 
     inline Reference< XIdlClass > constructClass( typelib_TypeDescription * pTypeDescr );
 public:
@@ -133,32 +133,32 @@ public:
     // ctor/ dtor
     IdlReflectionServiceImpl( const Reference< XComponentContext > & xContext );
     virtual ~IdlReflectionServiceImpl();
-
+    
     // XInterface
     virtual Any SAL_CALL queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL acquire() throw();
     virtual void SAL_CALL release() throw();
-
+    
     // some XComponent part from OComponentHelper
     virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
-
+    
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw(::com::sun::star::uno::RuntimeException);
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
-
+    
     // XTypeProvider
     virtual Sequence< Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException);
     virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException);
-
+    
     // XIdlReflection
     virtual Reference< XIdlClass > SAL_CALL forName( const OUString & rTypeName ) throw(::com::sun::star::uno::RuntimeException);
     virtual Reference< XIdlClass > SAL_CALL getType( const Any & rObj ) throw(::com::sun::star::uno::RuntimeException);
-
+    
     // XHierarchicalNameAccess
     virtual Any SAL_CALL getByHierarchicalName( const OUString & rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException);
-
+    
     Reference< XIdlClass > forType( typelib_TypeDescription * pTypeDescr ) throw(::com::sun::star::uno::RuntimeException);
     Reference< XIdlClass > forType( typelib_TypeDescriptionReference * pRef ) throw(::com::sun::star::uno::RuntimeException);
 };
@@ -167,42 +167,42 @@ public:
 class IdlClassImpl
     : public WeakImplHelper1< XIdlClass >
 {
-    IdlReflectionServiceImpl *  _pReflection;
-
-    OUString                    _aName;
-    TypeClass                   _eTypeClass;
-
-    typelib_TypeDescription *   _pTypeDescr;
-
+    IdlReflectionServiceImpl *	_pReflection;
+    
+    OUString					_aName;
+    TypeClass					_eTypeClass;
+    
+    typelib_TypeDescription *	_pTypeDescr;
+    
 public:
-    typelib_TypeDescription *   getTypeDescr() const
+    typelib_TypeDescription *	getTypeDescr() const
         { return _pTypeDescr; }
-    IdlReflectionServiceImpl *  getReflection() const
+    IdlReflectionServiceImpl *	getReflection() const
         { return _pReflection; }
     Reference< XMultiServiceFactory > getSMgr() const
         { return _pReflection->getSMgr(); }
     Reference< XHierarchicalNameAccess > getTDMgr() const
         { return getReflection()->getTDMgr(); }
-
+    
     // Ctor
     IdlClassImpl( IdlReflectionServiceImpl * pReflection,
                   const OUString & rName, typelib_TypeClass eTypeClass,
                   typelib_TypeDescription * pTypeDescr );
     virtual ~IdlClassImpl();
-
+    
     // XIdlClassImpl default implementation
     virtual TypeClass SAL_CALL getTypeClass() throw(::com::sun::star::uno::RuntimeException);
     virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL equals( const Reference< XIdlClass >& xType ) throw(::com::sun::star::uno::RuntimeException);
-
+    
     virtual sal_Bool SAL_CALL isAssignableFrom( const Reference< XIdlClass > & xType ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL createObject( Any & rObj ) throw(::com::sun::star::uno::RuntimeException);
-
+    
     // def impl ????
     virtual Sequence< Reference< XIdlClass > > SAL_CALL getClasses() throw(::com::sun::star::uno::RuntimeException);
     virtual Reference< XIdlClass > SAL_CALL getClass( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException);
     virtual Sequence< Reference< XIdlClass > > SAL_CALL getInterfaces() throw(::com::sun::star::uno::RuntimeException);
-
+    
     // structs, interfaces
     virtual Sequence< Reference< XIdlClass > > SAL_CALL getSuperclasses() throw(::com::sun::star::uno::RuntimeException);
     // structs
@@ -222,21 +222,21 @@ class InterfaceIdlClassImpl
     : public IdlClassImpl
 {
     typedef pair< OUString, typelib_TypeDescription * > MemberInit;
-
-    Sequence< Reference< XIdlClass > >      _xSuperClasses;
-
-    MemberInit *                            _pSortedMemberInit; // first methods, then attributes
-    OUString2Field                          _aName2Field;
-    OUString2Method                         _aName2Method;
-    sal_Int32                               _nMethods;
-    sal_Int32                               _nAttributes;
-
+    
+    Sequence< Reference< XIdlClass > >		_xSuperClasses;
+    
+    MemberInit *							_pSortedMemberInit; // first methods, then attributes
+    OUString2Field							_aName2Field;
+    OUString2Method							_aName2Method;
+    sal_Int32								_nMethods;
+    sal_Int32								_nAttributes;
+    
     void initMembers();
-
+    
 public:
     typelib_InterfaceTypeDescription * getTypeDescr() const
         { return (typelib_InterfaceTypeDescription *)IdlClassImpl::getTypeDescr(); }
-
+    
     // ctor/ dtor
     InterfaceIdlClassImpl( IdlReflectionServiceImpl * pReflection,
                            const OUString & rName, typelib_TypeClass eTypeClass,
@@ -247,7 +247,7 @@ public:
         , _nAttributes( 0 )
         {}
     virtual ~InterfaceIdlClassImpl();
-
+    
     // IdlClassImpl modifications
     virtual sal_Bool SAL_CALL isAssignableFrom( const Reference< XIdlClass > & xType ) throw(::com::sun::star::uno::RuntimeException);
     virtual Sequence< Reference< XIdlClass > > SAL_CALL getSuperclasses() throw(::com::sun::star::uno::RuntimeException);
@@ -263,15 +263,15 @@ public:
 class CompoundIdlClassImpl
     : public IdlClassImpl
 {
-    Reference< XIdlClass >                  _xSuperClass;
-
-    Sequence< Reference< XIdlField > > *    _pFields;
-    OUString2Field                          _aName2Field;
-
+    Reference< XIdlClass >					_xSuperClass;
+    
+    Sequence< Reference< XIdlField > > *	_pFields;
+    OUString2Field							_aName2Field;
+    
 public:
     typelib_CompoundTypeDescription * getTypeDescr() const
         { return (typelib_CompoundTypeDescription *)IdlClassImpl::getTypeDescr(); }
-
+    
     // ctor/ dtor
     CompoundIdlClassImpl( IdlReflectionServiceImpl * pReflection,
                           const OUString & rName, typelib_TypeClass eTypeClass,
@@ -280,7 +280,7 @@ public:
         , _pFields( 0 )
         {}
     virtual ~CompoundIdlClassImpl();
-
+    
     // IdlClassImpl modifications
     virtual sal_Bool SAL_CALL isAssignableFrom( const Reference< XIdlClass > & xType ) throw(::com::sun::star::uno::RuntimeException);
     virtual Sequence< Reference< XIdlClass > > SAL_CALL getSuperclasses() throw(::com::sun::star::uno::RuntimeException);
@@ -296,27 +296,27 @@ class ArrayIdlClassImpl
 public:
     typelib_IndirectTypeDescription * getTypeDescr() const
         { return (typelib_IndirectTypeDescription *)IdlClassImpl::getTypeDescr(); }
-
+    
     // ctor
     ArrayIdlClassImpl( IdlReflectionServiceImpl * pReflection,
                        const OUString & rName, typelib_TypeClass eTypeClass,
                        typelib_TypeDescription * pTypeDescr )
         : IdlClassImpl( pReflection, rName, eTypeClass, pTypeDescr )
         {}
-
+    
     virtual Any SAL_CALL queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL acquire() throw();
     virtual void SAL_CALL release() throw();
-
+    
     // XTypeProvider
     virtual Sequence< Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException);
     virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException);
-
+    
     // IdlClassImpl modifications
     virtual sal_Bool SAL_CALL isAssignableFrom( const Reference< XIdlClass > & xType ) throw(::com::sun::star::uno::RuntimeException);
     virtual Reference< XIdlClass > SAL_CALL getComponentType() throw(::com::sun::star::uno::RuntimeException);
     virtual Reference< XIdlArray > SAL_CALL getArray() throw(::com::sun::star::uno::RuntimeException);
-
+    
     // XIdlArray
     virtual void SAL_CALL realloc( Any & rArray, sal_Int32 nLen ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
     virtual sal_Int32 SAL_CALL getLen( const Any & rArray ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
@@ -329,12 +329,12 @@ class EnumIdlClassImpl
     : public IdlClassImpl
 {
     Sequence< Reference< XIdlField > > * _pFields;
-    OUString2Field                       _aName2Field;
-
+    OUString2Field						 _aName2Field;
+    
 public:
     typelib_EnumTypeDescription * getTypeDescr() const
         { return (typelib_EnumTypeDescription *)IdlClassImpl::getTypeDescr(); }
-
+    
     // ctor/ dtor
     EnumIdlClassImpl( IdlReflectionServiceImpl * pReflection,
                       const OUString & rName, typelib_TypeClass eTypeClass,
@@ -343,7 +343,7 @@ public:
         , _pFields( 0 )
         {}
     virtual ~EnumIdlClassImpl();
-
+    
     // IdlClassImpl modifications
     virtual Reference< XIdlField > SAL_CALL getField( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException);
     virtual Sequence< Reference< XIdlField > > SAL_CALL getFields() throw(::com::sun::star::uno::RuntimeException);
@@ -354,30 +354,30 @@ public:
 class IdlMemberImpl
     : public WeakImplHelper1< XIdlMember >
 {
-    IdlReflectionServiceImpl *  _pReflection;
-    OUString                    _aName;
-
-    typelib_TypeDescription *   _pTypeDescr;
-    typelib_TypeDescription *   _pDeclTypeDescr;
-
+    IdlReflectionServiceImpl *	_pReflection;
+    OUString					_aName;
+    
+    typelib_TypeDescription *	_pTypeDescr;
+    typelib_TypeDescription *	_pDeclTypeDescr;
+    
 protected:
-    Reference< XIdlClass >      _xDeclClass;
-
+    Reference< XIdlClass >		_xDeclClass;
+    
 public:
-    IdlReflectionServiceImpl *  getReflection() const
+    IdlReflectionServiceImpl *	getReflection() const
         { return _pReflection; }
     Reference< XMultiServiceFactory > getSMgr() const
         { return _pReflection->getSMgr(); }
-    typelib_TypeDescription *   getTypeDescr() const
+    typelib_TypeDescription *	getTypeDescr() const
         { return _pTypeDescr; }
-    typelib_TypeDescription *   getDeclTypeDescr() const
+    typelib_TypeDescription *	getDeclTypeDescr() const
         { return _pDeclTypeDescr; }
-
+    
     // ctor/ dtor
     IdlMemberImpl( IdlReflectionServiceImpl * pReflection, const OUString & rName,
                    typelib_TypeDescription * pTypeDescr, typelib_TypeDescription * pDeclTypeDescr );
     virtual ~IdlMemberImpl();
-
+    
     // XIdlMember
     virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() throw(::com::sun::star::uno::RuntimeException);
     virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
diff --git a/stoc/source/corereflection/corefl.xml b/stoc/source/corereflection/corefl.xml
index 5dba80b6abff..2d06b2b7f60f 100644
--- a/stoc/source/corereflection/corefl.xml
+++ b/stoc/source/corereflection/corefl.xml
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   corereflection.uno  </module-name>
+    <module-name>	corereflection.uno	</module-name>
     <component-description>
         <author> Daniel Boelzle </author>
-        <name>  com.sun.star.comp.stoc.CoreReflection   </name>
+        <name>	com.sun.star.comp.stoc.CoreReflection	</name>
         <description>
 This service is the implementation of XIdlClassProvider.
 The service provides reflection and access to all uno types
 (interfaces, structs, enums, ...).
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  C++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	C++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.reflection.CoreReflection  </supported-service>
+        <supported-service>	com.sun.star.reflection.CoreReflection	</supported-service>
         <service-dependency> ... </service-dependency>
         <type>com.sun.star.lang.DisposedException</type>
-        <type>  com.sun.star.reflection.XTypeDescription        </type>
-        <type>  com.sun.star.reflection.XIdlReflection          </type>
-        <type>  com.sun.star.reflection.XIdlClass               </type>
-        <type>  com.sun.star.reflection.XIdlField2              </type>
-        <type>  com.sun.star.container.XHierarchicalNameAccess  </type>
-        <type>  com.sun.star.lang.XComponent                    </type>
-        <type>  com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory                       </type>
-        <type>  com.sun.star.lang.XMultiComponentFactory                        </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
+        <type>	com.sun.star.reflection.XTypeDescription		</type>
+        <type>	com.sun.star.reflection.XIdlReflection			</type>
+        <type>	com.sun.star.reflection.XIdlClass				</type>
+        <type>	com.sun.star.reflection.XIdlField2				</type>
+        <type>	com.sun.star.container.XHierarchicalNameAccess	</type>
+        <type>	com.sun.star.lang.XComponent					</type>
+        <type>	com.sun.star.lang.XTypeProvider					</type>
+        <type>	com.sun.star.lang.XServiceInfo					</type>
+        <type>	com.sun.star.lang.XSingleComponentFactory						</type>
+        <type>	com.sun.star.lang.XMultiComponentFactory						</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory			</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory			</type>
         <type>  com.sun.star.lang.WrappedTargetRuntimeException </type>
-        <type>  com.sun.star.registry.XRegistryKey              </type>
-        <type>  com.sun.star.uno.XComponentContext              </type>
-        <type>  com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </type>
+        <type>	com.sun.star.registry.XRegistryKey				</type>
+        <type>	com.sun.star.uno.XComponentContext				</type>
+        <type>	com.sun.star.uno.XAggregation					</type>
+        <type>	com.sun.star.uno.XWeak							</type>
+        <type>	com.sun.star.uno.TypeClass						</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper3$(COM)   </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper3$(COM)	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu3		</runtime-module-dependency>
+    <runtime-module-dependency>	sal3		</runtime-module-dependency>
 </module-description>
diff --git a/stoc/source/corereflection/crarray.cxx b/stoc/source/corereflection/crarray.cxx
index 5e3c6df2fd3f..bec266ebd579 100644
--- a/stoc/source/corereflection/crarray.cxx
+++ b/stoc/source/corereflection/crarray.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -110,7 +110,7 @@ void ArrayIdlClassImpl::realloc( Any & rArray, sal_Int32 nLen )
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal length given!") ),
             (XWeak *)(OWeakObject *)this, 1 );
     }
-
+    
     uno_Sequence ** ppSeq = (uno_Sequence **)rArray.getValue();
     uno_sequence_realloc( ppSeq, (typelib_TypeDescription *)getTypeDescr(),
                           nLen,
@@ -129,7 +129,7 @@ sal_Int32 ArrayIdlClassImpl::getLen( const Any & rArray )
             OUString( RTL_CONSTASCII_USTRINGPARAM("no sequence given!") ),
             (XWeak *)(OWeakObject *)this, 0 );
     }
-
+    
     return (*(uno_Sequence **)rArray.getValue())->nElements;
 }
 //__________________________________________________________________________________________________
@@ -143,7 +143,7 @@ Any ArrayIdlClassImpl::get( const Any & rArray, sal_Int32 nIndex )
             OUString( RTL_CONSTASCII_USTRINGPARAM("no sequence given!") ),
             (XWeak *)(OWeakObject *)this, 0 );
     }
-
+    
     uno_Sequence * pSeq = *(uno_Sequence **)rArray.getValue();
     if (pSeq->nElements <= nIndex)
     {
@@ -151,7 +151,7 @@ Any ArrayIdlClassImpl::get( const Any & rArray, sal_Int32 nIndex )
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal index given!") ),
             (XWeak *)(OWeakObject *)this );
     }
-
+    
     Any aRet;
     typelib_TypeDescription * pElemTypeDescr = 0;
     TYPELIB_DANGER_GET( &pElemTypeDescr, getTypeDescr()->pType );
@@ -174,7 +174,7 @@ void ArrayIdlClassImpl::set( Any & rArray, sal_Int32 nIndex, const Any & rNewVal
             OUString( RTL_CONSTASCII_USTRINGPARAM("no sequence given!") ),
             (XWeak *)(OWeakObject *)this, 0 );
     }
-
+    
     uno_Sequence * pSeq = *(uno_Sequence **)rArray.getValue();
     if (pSeq->nElements <= nIndex)
     {
@@ -182,7 +182,7 @@ void ArrayIdlClassImpl::set( Any & rArray, sal_Int32 nIndex, const Any & rNewVal
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal index given!") ),
             (XWeak *)(OWeakObject *)this );
     }
-
+    
     uno_Sequence ** ppSeq = (uno_Sequence **)rArray.getValue();
     uno_sequence_reference2One(
         ppSeq, (typelib_TypeDescription *)getTypeDescr(),
@@ -190,10 +190,10 @@ void ArrayIdlClassImpl::set( Any & rArray, sal_Int32 nIndex, const Any & rNewVal
         reinterpret_cast< uno_ReleaseFunc >(cpp_release) );
     rArray.pData = ppSeq;
     pSeq = *ppSeq;
-
+    
     typelib_TypeDescription * pElemTypeDescr = 0;
     TYPELIB_DANGER_GET( &pElemTypeDescr, getTypeDescr()->pType );
-
+    
     if (! coerce_assign( &pSeq->elements[nIndex * pElemTypeDescr->nSize],
                          pElemTypeDescr, rNewValue, getReflection() ))
     {
diff --git a/stoc/source/corereflection/crbase.cxx b/stoc/source/corereflection/crbase.cxx
index c88b2be1d0d9..adb1b626bf06 100644
--- a/stoc/source/corereflection/crbase.cxx
+++ b/stoc/source/corereflection/crbase.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -73,7 +73,7 @@ IdlClassImpl::IdlClassImpl( IdlReflectionServiceImpl * pReflection,
         if (! _pTypeDescr->bComplete)
             typelib_typedescription_complete( &_pTypeDescr );
     }
-
+    
 #ifdef TEST_LIST_CLASSES
     ClassNameList::const_iterator iFind( find( g_aClassNames.begin(), g_aClassNames.end(), _aName ) );
     OSL_ENSURE( iFind == g_aClassNames.end(), "### idl class already exists!" );
@@ -87,7 +87,7 @@ IdlClassImpl::~IdlClassImpl()
         typelib_typedescription_release( _pTypeDescr );
     if (_pReflection)
         _pReflection->release();
-
+    
 #ifdef TEST_LIST_CLASSES
     ClassNameList::iterator iFind( find( g_aClassNames.begin(), g_aClassNames.end(), _aName ) );
     OSL_ENSURE( iFind != g_aClassNames.end(), "### idl class does not exist!" );
@@ -119,17 +119,17 @@ sal_Bool IdlClassImpl::equals( const Reference< XIdlClass >& xType )
 static sal_Bool s_aAssignableFromTab[11][11] =
 {
                          /* from CH,BO,BY,SH,US,LO,UL,HY,UH,FL,DO */
-/* TypeClass_CHAR */            { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-/* TypeClass_BOOLEAN */         { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-/* TypeClass_BYTE */            { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
-/* TypeClass_SHORT */           { 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0 },
-/* TypeClass_UNSIGNED_SHORT */  { 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0 },
-/* TypeClass_LONG */            { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0 },
-/* TypeClass_UNSIGNED_LONG */   { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0 },
-/* TypeClass_HYPER */           { 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0 },
-/* TypeClass_UNSIGNED_HYPER */  { 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0 },
-/* TypeClass_FLOAT */           { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0 },
-/* TypeClass_DOUBLE */          { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1 }
+/* TypeClass_CHAR */			{ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+/* TypeClass_BOOLEAN */			{ 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+/* TypeClass_BYTE */			{ 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+/* TypeClass_SHORT */			{ 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0 },
+/* TypeClass_UNSIGNED_SHORT */	{ 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0 },
+/* TypeClass_LONG */			{ 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0 },
+/* TypeClass_UNSIGNED_LONG */	{ 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0 },
+/* TypeClass_HYPER */			{ 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0 },
+/* TypeClass_UNSIGNED_HYPER */	{ 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0 },
+/* TypeClass_FLOAT */			{ 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0 },
+/* TypeClass_DOUBLE */			{ 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1 }
 };
 //__________________________________________________________________________________________________
 sal_Bool IdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType )
@@ -142,7 +142,7 @@ sal_Bool IdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType )
     }
     else
     {
-        TypeClass eFrom   = xType->getTypeClass();
+        TypeClass eFrom	  = xType->getTypeClass();
         if (eAssign > TypeClass_VOID && eAssign < TypeClass_STRING &&
             eFrom > TypeClass_VOID && eFrom < TypeClass_STRING)
         {
@@ -179,7 +179,7 @@ Reference< XIdlClass > IdlClassImpl::getClass( const OUString & )
 Sequence< Reference< XIdlClass > > IdlClassImpl::getInterfaces()
     throw(::com::sun::star::uno::RuntimeException)
 {
-//      OSL_ENSURE( sal_False, "### unexpected use!" );
+//  	OSL_ENSURE( sal_False, "### unexpected use!" );
     return Sequence< Reference< XIdlClass > >();
 }
 
diff --git a/stoc/source/corereflection/crcomp.cxx b/stoc/source/corereflection/crcomp.cxx
index ea62dc55105b..c44c50537f9e 100644
--- a/stoc/source/corereflection/crcomp.cxx
+++ b/stoc/source/corereflection/crcomp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,8 +46,8 @@ class IdlCompFieldImpl
     , public XIdlField
     , public XIdlField2
 {
-    sal_Int32                   _nOffset;
-
+    sal_Int32					_nOffset;
+    
 public:
     IdlCompFieldImpl( IdlReflectionServiceImpl * pReflection, const OUString & rName,
                       typelib_TypeDescription * pTypeDescr, typelib_TypeDescription * pDeclTypeDescr,
@@ -55,16 +55,16 @@ public:
         : IdlMemberImpl( pReflection, rName, pTypeDescr, pDeclTypeDescr )
         , _nOffset( nOffset )
         {}
-
+    
     // XInterface
     virtual Any SAL_CALL queryInterface( const Type & rType ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL acquire() throw ();
     virtual void SAL_CALL release() throw ();
-
+    
     // XTypeProvider
     virtual Sequence< Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException);
     virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException);
-
+    
     // XIdlMember
     virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() throw(::com::sun::star::uno::RuntimeException);
     virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
@@ -82,8 +82,8 @@ public:
 Any IdlCompFieldImpl::queryInterface( const Type & rType )
     throw(::com::sun::star::uno::RuntimeException)
 {
-    Any aRet( ::cppu::queryInterface( rType,
-                                      static_cast< XIdlField * >( this ),
+    Any aRet( ::cppu::queryInterface( rType, 
+                                      static_cast< XIdlField * >( this ), 
                                       static_cast< XIdlField2 * >( this ) ) );
     return (aRet.hasValue() ? aRet : IdlMemberImpl::queryInterface( rType ));
 }
@@ -193,12 +193,12 @@ Any IdlCompFieldImpl::get( const Any & rObj )
     {
         typelib_TypeDescription * pObjTD = 0;
         TYPELIB_DANGER_GET( &pObjTD, rObj.getValueTypeRef() );
-
+        
         typelib_TypeDescription * pTD = pObjTD;
         typelib_TypeDescription * pDeclTD = getDeclTypeDescr();
         while (pTD && !typelib_typedescription_equals( pTD, pDeclTD ))
             pTD = (typelib_TypeDescription *)((typelib_CompoundTypeDescription *)pTD)->pBaseTypeDescription;
-
+        
         OSL_ENSURE( pTD, "### illegal object type!" );
         if (pTD)
         {
@@ -226,12 +226,12 @@ void IdlCompFieldImpl::set( const Any & rObj, const Any & rValue )
     {
         typelib_TypeDescription * pObjTD = 0;
         TYPELIB_DANGER_GET( &pObjTD, rObj.getValueTypeRef() );
-
+        
         typelib_TypeDescription * pTD = pObjTD;
         typelib_TypeDescription * pDeclTD = getDeclTypeDescr();
         while (pTD && !typelib_typedescription_equals( pTD, pDeclTD ))
             pTD = (typelib_TypeDescription *)((typelib_CompoundTypeDescription *)pTD)->pBaseTypeDescription;
-
+        
         OSL_ENSURE( pTD, "### illegal object type!" );
         if (pTD)
         {
@@ -263,12 +263,12 @@ void IdlCompFieldImpl::set( Any & rObj, const Any & rValue )
     {
         typelib_TypeDescription * pObjTD = 0;
         TYPELIB_DANGER_GET( &pObjTD, rObj.getValueTypeRef() );
-
+        
         typelib_TypeDescription * pTD = pObjTD;
         typelib_TypeDescription * pDeclTD = getDeclTypeDescr();
         while (pTD && !typelib_typedescription_equals( pTD, pDeclTD ))
             pTD = (typelib_TypeDescription *)((typelib_CompoundTypeDescription *)pTD)->pBaseTypeDescription;
-
+        
         OSL_ENSURE( pTD, "### illegal object type!" );
         if (pTD)
         {
@@ -351,7 +351,7 @@ Reference< XIdlField > CompoundIdlClassImpl::getField( const OUString & rName )
 {
     if (! _pFields)
         getFields(); // init fields
-
+    
     const OUString2Field::const_iterator iFind( _aName2Field.find( rName ) );
     if (iFind != _aName2Field.end())
         return Reference< XIdlField >( (*iFind).second );
@@ -369,18 +369,18 @@ Sequence< Reference< XIdlField > > CompoundIdlClassImpl::getFields()
         typelib_CompoundTypeDescription * pCompTypeDescr = getTypeDescr();
         for ( ; pCompTypeDescr; pCompTypeDescr = pCompTypeDescr->pBaseTypeDescription )
             nAll += pCompTypeDescr->nMembers;
-
+        
         Sequence< Reference< XIdlField > > * pFields =
             new Sequence< Reference< XIdlField > >( nAll );
         Reference< XIdlField > * pSeq = pFields->getArray();
-
+        
         for ( pCompTypeDescr = getTypeDescr(); pCompTypeDescr;
               pCompTypeDescr = pCompTypeDescr->pBaseTypeDescription )
         {
             typelib_TypeDescriptionReference ** ppTypeRefs = pCompTypeDescr->ppTypeRefs;
-            rtl_uString ** ppNames                         = pCompTypeDescr->ppMemberNames;
-            sal_Int32 * pMemberOffsets                     = pCompTypeDescr->pMemberOffsets;
-
+            rtl_uString ** ppNames						   = pCompTypeDescr->ppMemberNames;
+            sal_Int32 * pMemberOffsets					   = pCompTypeDescr->pMemberOffsets;
+            
             for ( sal_Int32 nPos = pCompTypeDescr->nMembers; nPos--; )
             {
                 typelib_TypeDescription * pTD = 0;
@@ -395,7 +395,7 @@ Sequence< Reference< XIdlField > > CompoundIdlClassImpl::getFields()
                 }
             }
         }
-
+        
         _pFields = pFields;
     }
     return *_pFields;
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index fdd33fc7645b..b56a25566792 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,7 +52,7 @@ namespace stoc_corefl
 static const sal_Int32 CACHE_SIZE = 256;
 
 #define SERVICENAME "com.sun.star.reflection.CoreReflection"
-#define IMPLNAME    "com.sun.star.comp.stoc.CoreReflection"
+#define IMPLNAME	"com.sun.star.comp.stoc.CoreReflection"
 
 // can be static, as every client of the core reflection keeps a reference to the
 // core reflection, so refcounting can be done here.
diff --git a/stoc/source/corereflection/crenum.cxx b/stoc/source/corereflection/crenum.cxx
index c94bf65769b7..319b2cbf9fe0 100644
--- a/stoc/source/corereflection/crenum.cxx
+++ b/stoc/source/corereflection/crenum.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,8 +40,8 @@ class IdlEnumFieldImpl
     , public XIdlField
     , public XIdlField2
 {
-    sal_Int32               _nValue;
-
+    sal_Int32				_nValue;
+    
 public:
     IdlEnumFieldImpl( IdlReflectionServiceImpl * pReflection, const OUString & rName,
                       typelib_TypeDescription * pTypeDescr, sal_Int32 nValue )
@@ -49,16 +49,16 @@ public:
         , _nValue( nValue )
         {}
     virtual ~IdlEnumFieldImpl();
-
+    
     // XInterface
     virtual Any SAL_CALL queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL acquire() throw();
     virtual void SAL_CALL release() throw();
-
+    
     // XTypeProvider
     virtual Sequence< Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException);
     virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException);
-
+    
     // XIdlMember
     virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() throw(::com::sun::star::uno::RuntimeException);
     virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
@@ -201,7 +201,7 @@ Reference< XIdlField > EnumIdlClassImpl::getField( const OUString & rName )
 {
     if (! _pFields)
         getFields(); // init members
-
+    
     const OUString2Field::const_iterator iFind( _aName2Field.find( rName ) );
     if (iFind != _aName2Field.end())
         return (*iFind).second;
@@ -221,14 +221,14 @@ Sequence< Reference< XIdlField > > EnumIdlClassImpl::getFields()
             Sequence< Reference< XIdlField > > * pFields =
                 new Sequence< Reference< XIdlField > >( nFields );
             Reference< XIdlField > * pSeq = pFields->getArray();
-
+            
             while (nFields--)
             {
                 OUString aName( getTypeDescr()->ppEnumNames[nFields] );
                 _aName2Field[aName] = pSeq[nFields] = new IdlEnumFieldImpl(
                     getReflection(), aName, IdlClassImpl::getTypeDescr(), getTypeDescr()->pEnumValues[nFields] );
             }
-
+            
             _pFields = pFields;
         }
     }
diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx
index e1404dcff058..8404a6afa00f 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -58,28 +58,28 @@ class IdlAttributeFieldImpl
 public:
     typelib_InterfaceAttributeTypeDescription * getAttributeTypeDescr()
         { return (typelib_InterfaceAttributeTypeDescription *)getTypeDescr(); }
-
+    
     IdlAttributeFieldImpl( IdlReflectionServiceImpl * pReflection, const OUString & rName,
                            typelib_TypeDescription * pTypeDescr, typelib_TypeDescription * pDeclTypeDescr )
         : IdlMemberImpl( pReflection, rName, pTypeDescr, pDeclTypeDescr )
         {}
-
+    
     // XInterface
     virtual Any SAL_CALL queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL acquire() throw();
     virtual void SAL_CALL release() throw();
-
+    
     // XTypeProvider
     virtual Sequence< Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException);
     virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException);
-
+    
     // XIdlMember
     virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() throw(::com::sun::star::uno::RuntimeException);
     virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
     // XIdlField
     virtual Reference< XIdlClass > SAL_CALL getType() throw(::com::sun::star::uno::RuntimeException);
     virtual FieldAccessMode SAL_CALL getAccessMode() throw(::com::sun::star::uno::RuntimeException);
-    virtual Any SAL_CALL get( const Any & rObj ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual Any SAL_CALL get( const Any & rObj ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);    
     virtual void SAL_CALL set( const Any & rObj, const Any & rValue ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
     // XIdlField2: getType, getAccessMode and get are equal to XIdlField
     virtual void SAL_CALL set( Any & rObj, const Any & rValue ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
@@ -198,14 +198,14 @@ Any IdlAttributeFieldImpl::get( const Any & rObj )
     {
         TypeDescription aTD( getAttributeTypeDescr()->pAttributeTypeRef );
         typelib_TypeDescription * pTD = aTD.get();
-
+        
         uno_Any aExc;
         uno_Any * pExc = &aExc;
         void * pReturn = alloca( pTD->nSize );
-
+        
         (*pUnoI->pDispatcher)( pUnoI, getTypeDescr(), pReturn, 0, &pExc );
         (*pUnoI->release)( pUnoI );
-
+        
         checkException(
             pExc,
             *static_cast< Reference< XInterface > const * >(rObj.getValue()));
@@ -230,7 +230,7 @@ void IdlAttributeFieldImpl::set( Any & rObj, const Any & rValue )
             OUString( RTL_CONSTASCII_USTRINGPARAM("cannot set readonly attribute!") ),
             (XWeak *)(OWeakObject *)this );
     }
-
+    
     uno_Interface * pUnoI = getReflection()->mapToUno(
         rObj, (typelib_InterfaceTypeDescription *)getDeclTypeDescr() );
     OSL_ENSURE( pUnoI, "### illegal destination object given!" );
@@ -238,11 +238,11 @@ void IdlAttributeFieldImpl::set( Any & rObj, const Any & rValue )
     {
         TypeDescription aTD( getAttributeTypeDescr()->pAttributeTypeRef );
         typelib_TypeDescription * pTD = aTD.get();
-
+        
         // construct uno value to be set
         void * pArgs[1];
         void * pArg = pArgs[0] = alloca( pTD->nSize );
-
+        
         sal_Bool bAssign;
         if (pTD->eTypeClass == typelib_TypeClass_ANY)
         {
@@ -285,14 +285,14 @@ void IdlAttributeFieldImpl::set( Any & rObj, const Any & rValue )
                 pTemp, pValueTD, 0 );
             TYPELIB_DANGER_RELEASE( pValueTD );
         }
-
+        
         if (bAssign)
         {
             uno_Any aExc;
             uno_Any * pExc = &aExc;
             (*pUnoI->pDispatcher)( pUnoI, getTypeDescr(), 0, pArgs, &pExc );
             (*pUnoI->release)( pUnoI );
-
+            
             uno_destructData( pArg, pTD, 0 );
             checkException(
                 pExc,
@@ -301,7 +301,7 @@ void IdlAttributeFieldImpl::set( Any & rObj, const Any & rValue )
             return;
         }
         (*pUnoI->release)( pUnoI );
-
+        
         throw IllegalArgumentException(
             OUString( RTL_CONSTASCII_USTRINGPARAM("illegal value given!") ),
             *(const Reference< XInterface > *)rObj.getValue(), 1 );
@@ -354,12 +354,12 @@ class IdlInterfaceMethodImpl
 {
     Sequence< Reference< XIdlClass > > * _pExceptionTypes;
     Sequence< Reference< XIdlClass > > * _pParamTypes;
-    Sequence< ParamInfo > *              _pParamInfos;
-
+    Sequence< ParamInfo > *				 _pParamInfos;
+    
 public:
     typelib_InterfaceMethodTypeDescription * getMethodTypeDescr()
         { return (typelib_InterfaceMethodTypeDescription *)getTypeDescr(); }
-
+    
     IdlInterfaceMethodImpl( IdlReflectionServiceImpl * pReflection, const OUString & rName,
                             typelib_TypeDescription * pTypeDescr, typelib_TypeDescription * pDeclTypeDescr )
         : IdlMemberImpl( pReflection, rName, pTypeDescr, pDeclTypeDescr )
@@ -368,16 +368,16 @@ public:
         , _pParamInfos( 0 )
         {}
     virtual ~IdlInterfaceMethodImpl();
-
+    
     // XInterface
     virtual Any SAL_CALL queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL acquire() throw();
     virtual void SAL_CALL release() throw();
-
+    
     // XTypeProvider
     virtual Sequence< Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException);
     virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException);
-
+    
     // XIdlMember
     virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() throw(::com::sun::star::uno::RuntimeException);
     virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
@@ -497,11 +497,11 @@ Sequence< Reference< XIdlClass > > IdlInterfaceMethodImpl::getExceptionTypes()
             Sequence< Reference< XIdlClass > > * pTempExceptionTypes =
                 new Sequence< Reference< XIdlClass > >( nExc );
             Reference< XIdlClass > * pExceptionTypes = pTempExceptionTypes->getArray();
-
+            
             typelib_TypeDescriptionReference ** ppExc =
                 getMethodTypeDescr()->ppExceptions;
             IdlReflectionServiceImpl * pRefl = getReflection();
-
+            
             while (nExc--)
                 pExceptionTypes[nExc] = pRefl->forType( ppExc[nExc] );
 
@@ -523,11 +523,11 @@ Sequence< Reference< XIdlClass > > IdlInterfaceMethodImpl::getParameterTypes()
             Sequence< Reference< XIdlClass > > * pTempParamTypes =
                 new Sequence< Reference< XIdlClass > >( nParams );
             Reference< XIdlClass > * pParamTypes = pTempParamTypes->getArray();
-
+            
             typelib_MethodParameter * pTypelibParams =
                 getMethodTypeDescr()->pParams;
             IdlReflectionServiceImpl * pRefl = getReflection();
-
+            
             while (nParams--)
                 pParamTypes[nParams] = pRefl->forType( pTypelibParams[nParams].pTypeRef );
 
@@ -548,14 +548,14 @@ Sequence< ParamInfo > IdlInterfaceMethodImpl::getParameterInfos()
             sal_Int32 nParams = getMethodTypeDescr()->nParams;
             Sequence< ParamInfo > * pTempParamInfos = new Sequence< ParamInfo >( nParams );
             ParamInfo * pParamInfos = pTempParamInfos->getArray();
-
+            
             typelib_MethodParameter * pTypelibParams =
                 getMethodTypeDescr()->pParams;
-
+            
             if (_pParamTypes) // use param types
             {
                 const Reference< XIdlClass > * pParamTypes = _pParamTypes->getConstArray();
-
+                
                 while (nParams--)
                 {
                     const typelib_MethodParameter & rParam = pTypelibParams[nParams];
@@ -573,9 +573,9 @@ Sequence< ParamInfo > IdlInterfaceMethodImpl::getParameterInfos()
                 Sequence< Reference< XIdlClass > > * pTempParamTypes =
                     new Sequence< Reference< XIdlClass > >( nParams );
                 Reference< XIdlClass > * pParamTypes = pTempParamTypes->getArray();
-
+                
                 IdlReflectionServiceImpl * pRefl = getReflection();
-
+                
                 while (nParams--)
                 {
                     const typelib_MethodParameter & rParam = pTypelibParams[nParams];
@@ -587,10 +587,10 @@ Sequence< ParamInfo > IdlInterfaceMethodImpl::getParameterInfos()
                         rInfo.aMode = ParamMode_OUT;
                     rInfo.aType = pParamTypes[nParams] = pRefl->forType( rParam.pTypeRef );
                 }
-
+                
                 _pParamTypes = pTempParamTypes;
             }
-
+            
             _pParamInfos = pTempParamInfos;
         }
     }
@@ -625,7 +625,7 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > &
             return Any();
         }
     }
-
+    
     uno_Interface * pUnoI = getReflection()->mapToUno(
         rObj, (typelib_InterfaceTypeDescription *)getDeclTypeDescr() );
     OSL_ENSURE( pUnoI, "### illegal destination object given!" );
@@ -639,13 +639,13 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > &
                 OUString( RTL_CONSTASCII_USTRINGPARAM("arguments len differ!") ),
                 *(const Reference< XInterface > *)rObj.getValue(), 1 );
         }
-
+        
         Any * pCppArgs = rArgs.getArray();
         typelib_MethodParameter * pParams = getMethodTypeDescr()->pParams;
         typelib_TypeDescription * pReturnType = 0;
         TYPELIB_DANGER_GET(
             &pReturnType, getMethodTypeDescr()->pReturnTypeRef );
-
+        
         void * pUnoReturn = alloca( pReturnType->nSize );
         void ** ppUnoArgs = (void **)alloca( sizeof(void *) * nParams *2 );
         typelib_TypeDescription ** ppParamTypes = (typelib_TypeDescription **)(ppUnoArgs + nParams);
@@ -656,7 +656,7 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > &
             ppParamTypes[nPos] = 0;
             TYPELIB_DANGER_GET( ppParamTypes + nPos, pParams[nPos].pTypeRef );
             typelib_TypeDescription * pTD = ppParamTypes[nPos];
-
+            
             ppUnoArgs[nPos] = alloca( pTD->nSize );
             if (pParams[nPos].bIn)
             {
@@ -706,13 +706,13 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > &
                         pTemp, pValueTD, 0 );
                     TYPELIB_DANGER_RELEASE( pValueTD );
                 }
-
+                
                 if (! bAssign)
                 {
                     IllegalArgumentException aExc(
                         OUString( RTL_CONSTASCII_USTRINGPARAM("cannot coerce argument type during corereflection call!") ),
                         *(const Reference< XInterface > *)rObj.getValue(), (sal_Int16)nPos );
-
+                    
                     // cleanup
                     while (nPos--)
                     {
@@ -722,19 +722,19 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > &
                     }
                     TYPELIB_DANGER_RELEASE( pReturnType );
                     (*pUnoI->release)( pUnoI );
-
+                    
                     throw aExc;
                 }
             }
         }
-
+        
         uno_Any aUnoExc;
         uno_Any * pUnoExc = &aUnoExc;
-
+        
         (*pUnoI->pDispatcher)(
             pUnoI, getTypeDescr(), pUnoReturn, ppUnoArgs, &pUnoExc );
         (*pUnoI->release)( pUnoI );
-
+        
         Any aRet;
         if (pUnoExc)
         {
@@ -746,7 +746,7 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > &
                 TYPELIB_DANGER_RELEASE( ppParamTypes[nParams] );
             }
             TYPELIB_DANGER_RELEASE( pReturnType );
-
+            
             InvocationTargetException aExc;
             aExc.Context = *(const Reference< XInterface > *)rObj.getValue();
             aExc.Message = OUString( RTL_CONSTASCII_USTRINGPARAM("exception occured during invocation!") );
@@ -802,7 +802,7 @@ InterfaceIdlClassImpl::~InterfaceIdlClassImpl()
 {
     for ( sal_Int32 nPos = _nMethods + _nAttributes; nPos--; )
         typelib_typedescription_release( _pSortedMemberInit[nPos].second );
-
+    
     delete [] _pSortedMemberInit;
 }
 
@@ -828,7 +828,7 @@ void InterfaceIdlClassImpl::initMembers()
     sal_Int32 nAll = getTypeDescr()->nAllMembers;
     MemberInit * pSortedMemberInit = new MemberInit[nAll];
     typelib_TypeDescriptionReference ** ppAllMembers = getTypeDescr()->ppAllMembers;
-
+    
     for ( sal_Int32 nPos = 0; nPos < nAll; ++nPos )
     {
         sal_Int32 nIndex;
@@ -844,14 +844,14 @@ void InterfaceIdlClassImpl::initMembers()
             nIndex = (nAll - _nAttributes);
             // attributes at the back
         }
-
+        
         typelib_TypeDescription * pTD = 0;
         typelib_typedescriptionreference_getDescription( &pTD, ppAllMembers[nPos] );
         OSL_ENSURE( pTD, "### cannot get type description!" );
         pSortedMemberInit[nIndex].first = ((typelib_InterfaceMemberTypeDescription *)pTD)->pMemberName;
         pSortedMemberInit[nIndex].second = pTD;
     }
-
+    
     _pSortedMemberInit = pSortedMemberInit;
 }
 //__________________________________________________________________________________________________
@@ -888,13 +888,13 @@ Sequence< Reference< XIdlMethod > > InterfaceIdlClassImpl::getMethods()
     MutexGuard aGuard( getMutexAccess() );
     if (! _pSortedMemberInit)
         initMembers();
-
+    
     // create methods sequence
     Sequence< Reference< XIdlMethod > > aRet( _nMethods );
     Reference< XIdlMethod > * pRet = aRet.getArray();
     for ( sal_Int32 nPos = _nMethods; nPos--; )
     {
-
+        
         /*_aName2Method[_pSortedMemberInit[nPos].first] = */pRet[nPos] = new IdlInterfaceMethodImpl(
             getReflection(), _pSortedMemberInit[nPos].first,
             _pSortedMemberInit[nPos].second, IdlClassImpl::getTypeDescr() );
@@ -908,7 +908,7 @@ Sequence< Reference< XIdlField > > InterfaceIdlClassImpl::getFields()
     MutexGuard aGuard( getMutexAccess() );
     if (! _pSortedMemberInit)
         initMembers();
-
+    
     // create fields sequence
     Sequence< Reference< XIdlField > > aRet( _nAttributes );
     Reference< XIdlField > * pRet = aRet.getArray();
@@ -928,14 +928,14 @@ Reference< XIdlMethod > InterfaceIdlClassImpl::getMethod( const OUString & rName
     MutexGuard aGuard( getMutexAccess() );
     if (! _pSortedMemberInit)
         initMembers();
-
+    
     Reference< XIdlMethod > xRet;
-
+    
     // try weak map
     const OUString2Method::const_iterator iFind( _aName2Method.find( rName ) );
     if (iFind != _aName2Method.end())
         xRet = (*iFind).second; // harden ref
-
+    
     if (! xRet.is())
     {
         for ( sal_Int32 nPos = _nMethods; nPos--; )
@@ -958,14 +958,14 @@ Reference< XIdlField > InterfaceIdlClassImpl::getField( const OUString & rName )
     MutexGuard aGuard( getMutexAccess() );
     if (! _pSortedMemberInit)
         initMembers();
-
+    
     Reference< XIdlField > xRet;
-
+    
     // try weak map
     const OUString2Field::const_iterator iFind( _aName2Field.find( rName ) );
     if (iFind != _aName2Field.end())
         xRet = (*iFind).second; // harden ref
-
+    
     if (! xRet.is())
     {
         for ( sal_Int32 nPos = _nAttributes; nPos--; )
diff --git a/stoc/source/corereflection/lrucache.hxx b/stoc/source/corereflection/lrucache.hxx
index 8aab901c349a..9703fbbe4c22 100644
--- a/stoc/source/corereflection/lrucache.hxx
+++ b/stoc/source/corereflection/lrucache.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,22 +45,22 @@ class LRU_Cache
 {
     struct CacheEntry
     {
-        t_Key               aKey;
-        t_Val               aVal;
-        CacheEntry *        pPred;
-        CacheEntry *        pSucc;
+        t_Key				aKey;
+        t_Val				aVal;
+        CacheEntry *		pPred;
+        CacheEntry *		pSucc;
     };
     typedef ::std::hash_map< t_Key, CacheEntry *, t_KeyHash, t_KeyEqual > t_Key2Element;
-
-    mutable ::osl::Mutex        _aCacheMutex;
-    sal_Int32                   _nCachedElements;
-    t_Key2Element               _aKey2Element;
-
-    CacheEntry *                _pBlock;
-    mutable CacheEntry *        _pHead;
-    mutable CacheEntry *        _pTail;
+    
+    mutable ::osl::Mutex		_aCacheMutex;
+    sal_Int32					_nCachedElements;
+    t_Key2Element				_aKey2Element;
+    
+    CacheEntry *				_pBlock;
+    mutable CacheEntry *		_pHead;
+    mutable CacheEntry *		_pTail;
     inline void toFront( CacheEntry * pEntry ) const;
-
+    
 public:
     /** Constructor:
         <br>
@@ -71,7 +71,7 @@ public:
         <br>
     */
     inline ~LRU_Cache();
-
+    
     /** Retrieves a value from the cache. Returns default constructed value,
         if none was found.
         <br>
@@ -109,8 +109,8 @@ inline LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::LRU_Cache( sal_Int32 nC
     if (_nCachedElements > 0)
     {
         _pBlock = new CacheEntry[_nCachedElements];
-        _pHead  = _pBlock;
-        _pTail  = _pBlock + _nCachedElements -1;
+        _pHead	= _pBlock;
+        _pTail	= _pBlock + _nCachedElements -1;
         for ( sal_Int32 nPos = _nCachedElements; nPos--; )
         {
             _pBlock[nPos].pPred = _pBlock + nPos -1;
@@ -143,7 +143,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::toFront( CacheEntr
         // push to front
         _pHead->pPred = pEntry;
         pEntry->pSucc = _pHead;
-        _pHead        = pEntry;
+        _pHead		  = pEntry;
     }
 }
 //__________________________________________________________________________________________________
@@ -182,7 +182,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue(
     {
         ::osl::MutexGuard aGuard( _aCacheMutex );
         const typename t_Key2Element::const_iterator iFind( _aKey2Element.find( rKey ) );
-
+        
         CacheEntry * pEntry;
         if (iFind == _aKey2Element.end())
         {
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index 5bf2e3abb34d..6b78d55b529b 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,7 +59,7 @@ using namespace rtl;
 
 
 #define SERVICENAME "com.sun.star.registry.NestedRegistry"
-#define IMPLNAME       "com.sun.star.comp.stoc.NestedRegistry"
+#define IMPLNAME	   "com.sun.star.comp.stoc.NestedRegistry"
 
 extern rtl_StandardModuleCount g_moduleCount;
 
@@ -97,14 +97,14 @@ OUString defreg_getImplementationName()
 }
 }
 
-namespace stoc_defreg
+namespace stoc_defreg 
 {
 //*************************************************************************
 // NestedRegistryImpl
 //*************************************************************************
 class NestedKeyImpl;
 
-class NestedRegistryImpl    : public WeakAggImplHelper4 < XSimpleRegistry, XInitialization, XServiceInfo, XEnumerationAccess >
+class NestedRegistryImpl	: public WeakAggImplHelper4 < XSimpleRegistry, XInitialization, XServiceInfo, XEnumerationAccess >
 {
 public:
     NestedRegistryImpl( );
@@ -117,7 +117,7 @@ public:
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(RuntimeException);
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments )
+    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) 
         throw(Exception, RuntimeException);
 
     // XSimpleRegistry
@@ -137,10 +137,10 @@ public:
 
     friend class NestedKeyImpl;
 protected:
-    Mutex                       m_mutex;
-    sal_uInt32                  m_state;
-    Reference<XSimpleRegistry>  m_localReg;
-    Reference<XSimpleRegistry>  m_defaultReg;
+    Mutex						m_mutex;
+    sal_uInt32					m_state;
+    Reference<XSimpleRegistry>	m_localReg;
+    Reference<XSimpleRegistry>	m_defaultReg;
 
 };
 
@@ -154,12 +154,12 @@ public:
                    Reference<XRegistryKey>& localKey,
                    Reference<XRegistryKey>& defaultKey);
 
-    NestedKeyImpl( const OUString& aKeyName,
+    NestedKeyImpl( const OUString& aKeyName, 
                     NestedKeyImpl* pKey);
 
     ~NestedKeyImpl();
 
-    // XRegistryKey
+    // XRegistryKey	
     virtual OUString SAL_CALL getKeyName() throw(RuntimeException);
     virtual sal_Bool SAL_CALL isReadOnly(  ) throw(InvalidRegistryException, RuntimeException);
     virtual sal_Bool SAL_CALL isValid(  ) throw(RuntimeException);
@@ -191,15 +191,15 @@ public:
     virtual OUString SAL_CALL getResolvedName( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException);
 
 protected:
-    void        computeChanges();
-    OUString    computeName(const OUString& name);
-
-    OUString                    m_name;
-    sal_uInt32                  m_state;
-    NestedRegistryImpl*         m_pRegistry;
-    Reference<XRegistryKey>     m_localKey;
-    Reference<XRegistryKey>     m_defaultKey;
-};
+    void 		computeChanges();
+    OUString 	computeName(const OUString& name);
+
+    OUString 					m_name;
+    sal_uInt32					m_state;
+    NestedRegistryImpl*			m_pRegistry;
+    Reference<XRegistryKey>	  	m_localKey;
+    Reference<XRegistryKey>	  	m_defaultKey;
+};	
 
 
 //*************************************************************************
@@ -209,8 +209,8 @@ NestedKeyImpl::NestedKeyImpl( NestedRegistryImpl* pDefaultRegistry,
     : m_pRegistry(pDefaultRegistry)
 {
     m_pRegistry->acquire();
-
-    m_localKey = localKey;
+    
+    m_localKey = localKey;	
     m_defaultKey = defaultKey;
 
     if (m_localKey.is())
@@ -221,12 +221,12 @@ NestedKeyImpl::NestedKeyImpl( NestedRegistryImpl* pDefaultRegistry,
     {
         m_name = m_defaultKey->getKeyName();
     }
-
-    m_state = m_pRegistry->m_state;
-}
+        
+    m_state = m_pRegistry->m_state;		
+}	
 
 //*************************************************************************
-NestedKeyImpl::NestedKeyImpl( const OUString& rKeyName,
+NestedKeyImpl::NestedKeyImpl( const OUString& rKeyName, 
                               NestedKeyImpl* pKey)
     : m_pRegistry(pKey->m_pRegistry)
 {
@@ -235,7 +235,7 @@ NestedKeyImpl::NestedKeyImpl( const OUString& rKeyName,
     if (pKey->m_localKey.is() && pKey->m_localKey->isValid())
     {
         m_localKey = pKey->m_localKey->openKey(rKeyName);
-    }
+    } 
     if (pKey->m_defaultKey.is() && pKey->m_defaultKey->isValid())
     {
         m_defaultKey = pKey->m_defaultKey->openKey(rKeyName);
@@ -249,7 +249,7 @@ NestedKeyImpl::NestedKeyImpl( const OUString& rKeyName,
     {
         m_name = m_defaultKey->getKeyName();
     }
-
+        
     m_state = m_pRegistry->m_state;
 }
 
@@ -274,10 +274,10 @@ void NestedKeyImpl::computeChanges()
         {
             m_localKey = rootKey->openKey(m_name);
         }
-
+        
         m_state = m_pRegistry->m_state;
     }
-}
+}	
 
 //*************************************************************************
 // NestedKey_Impl::computeName()
@@ -295,67 +295,67 @@ OUString NestedKeyImpl::computeName(const OUString& name)
         } else
         {
             if ( m_defaultKey.is() && m_defaultKey->isValid() )
-                return m_defaultKey->getResolvedName(name);
+                return m_defaultKey->getResolvedName(name);		
         }
-
+        
         if ( resLocalName.getLength() > 0 && m_pRegistry->m_defaultReg->isValid() )
         {
             Reference<XRegistryKey> localRoot(m_pRegistry->m_localReg->getRootKey());
             Reference<XRegistryKey> defaultRoot(m_pRegistry->m_defaultReg->getRootKey());
 
             resDefaultName = defaultRoot->getResolvedName(resLocalName);
-
+            
             sal_uInt32 count = 100;
-
+            
             while (resLocalName != resDefaultName && count > 0)
             {
                 count--;
-
+                
                 if (resLocalName.getLength() == 0 || resDefaultName.getLength() == 0)
                     throw InvalidRegistryException();
 
                 resLocalName = localRoot->getResolvedName(resDefaultName);
                 resDefaultName = defaultRoot->getResolvedName(resLocalName);
-            }
+            }			
         }
     }
     catch(InvalidRegistryException& )
     {
     }
-
+    
     return resLocalName;
-}
+}	
 
 //*************************************************************************
 OUString SAL_CALL NestedKeyImpl::getKeyName() throw(RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
     return m_name;
-}
+}	
 
 //*************************************************************************
-sal_Bool SAL_CALL NestedKeyImpl::isReadOnly(  )
+sal_Bool SAL_CALL NestedKeyImpl::isReadOnly(  ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
     computeChanges();
-
+    
     if ( m_localKey.is() && m_localKey->isValid() )
            return m_localKey->isReadOnly();
     else
         throw InvalidRegistryException();
-}
+}	
 
 //*************************************************************************
 sal_Bool SAL_CALL NestedKeyImpl::isValid(  ) throw(RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
-    return ((m_localKey.is() && m_localKey->isValid()) ||
-            (m_defaultKey.is() && m_defaultKey->isValid()) );
-}
+    return ((m_localKey.is() && m_localKey->isValid()) || 
+            (m_defaultKey.is() && m_defaultKey->isValid()) ); 
+}	
 
 //*************************************************************************
-RegistryKeyType SAL_CALL NestedKeyImpl::getKeyType( const OUString& rKeyName )
+RegistryKeyType SAL_CALL NestedKeyImpl::getKeyType( const OUString& rKeyName ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -369,12 +369,12 @@ RegistryKeyType SAL_CALL NestedKeyImpl::getKeyType( const OUString& rKeyName )
     {
         return m_defaultKey->getKeyType(rKeyName);
     }
-
+    
     return RegistryKeyType_KEY;
-}
+}	
 
 //*************************************************************************
-RegistryValueType SAL_CALL NestedKeyImpl::getValueType(  )
+RegistryValueType SAL_CALL NestedKeyImpl::getValueType(  ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -390,10 +390,10 @@ RegistryValueType SAL_CALL NestedKeyImpl::getValueType(  )
     }
 
     return RegistryValueType_NOT_DEFINED;
-}
+}	
 
 //*************************************************************************
-sal_Int32 SAL_CALL NestedKeyImpl::getLongValue(  )
+sal_Int32 SAL_CALL NestedKeyImpl::getLongValue(  ) 
     throw(InvalidRegistryException, InvalidValueException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -410,10 +410,10 @@ sal_Int32 SAL_CALL NestedKeyImpl::getLongValue(  )
     {
         throw InvalidRegistryException();
     }
-}
+}	
 
 //*************************************************************************
-void SAL_CALL NestedKeyImpl::setLongValue( sal_Int32 value )
+void SAL_CALL NestedKeyImpl::setLongValue( sal_Int32 value ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -433,10 +433,10 @@ void SAL_CALL NestedKeyImpl::setLongValue( sal_Int32 value )
     {
         throw InvalidRegistryException();
     }
-}
+}	
 
 //*************************************************************************
-Sequence< sal_Int32 > SAL_CALL NestedKeyImpl::getLongListValue(  )
+Sequence< sal_Int32 > SAL_CALL NestedKeyImpl::getLongListValue(  ) 
     throw(InvalidRegistryException, InvalidValueException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -454,9 +454,9 @@ Sequence< sal_Int32 > SAL_CALL NestedKeyImpl::getLongListValue(  )
         throw InvalidRegistryException();
     }
 }
-
+    
 //*************************************************************************
-void SAL_CALL NestedKeyImpl::setLongListValue( const Sequence< sal_Int32 >& seqValue )
+void SAL_CALL NestedKeyImpl::setLongListValue( const Sequence< sal_Int32 >& seqValue ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -476,10 +476,10 @@ void SAL_CALL NestedKeyImpl::setLongListValue( const Sequence< sal_Int32 >& seqV
     {
         throw InvalidRegistryException();
     }
-}
+}	
 
 //*************************************************************************
-OUString SAL_CALL NestedKeyImpl::getAsciiValue(  )
+OUString SAL_CALL NestedKeyImpl::getAsciiValue(  ) 
     throw(InvalidRegistryException, InvalidValueException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -496,10 +496,10 @@ OUString SAL_CALL NestedKeyImpl::getAsciiValue(  )
     {
         throw InvalidRegistryException();
     }
-}
+}	
 
 //*************************************************************************
-void SAL_CALL NestedKeyImpl::setAsciiValue( const OUString& value )
+void SAL_CALL NestedKeyImpl::setAsciiValue( const OUString& value ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -519,10 +519,10 @@ void SAL_CALL NestedKeyImpl::setAsciiValue( const OUString& value )
     {
         throw InvalidRegistryException();
     }
-}
+}	
 
 //*************************************************************************
-Sequence< OUString > SAL_CALL NestedKeyImpl::getAsciiListValue(  )
+Sequence< OUString > SAL_CALL NestedKeyImpl::getAsciiListValue(  ) 
     throw(InvalidRegistryException, InvalidValueException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -540,9 +540,9 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getAsciiListValue(  )
         throw InvalidRegistryException();
     }
 }
-
+    
 //*************************************************************************
-void SAL_CALL NestedKeyImpl::setAsciiListValue( const Sequence< OUString >& seqValue )
+void SAL_CALL NestedKeyImpl::setAsciiListValue( const Sequence< OUString >& seqValue ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -562,10 +562,10 @@ void SAL_CALL NestedKeyImpl::setAsciiListValue( const Sequence< OUString >& seqV
     {
         throw InvalidRegistryException();
     }
-}
+}	
 
 //*************************************************************************
-OUString SAL_CALL NestedKeyImpl::getStringValue(  )
+OUString SAL_CALL NestedKeyImpl::getStringValue(  ) 
     throw(InvalidRegistryException, InvalidValueException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -582,10 +582,10 @@ OUString SAL_CALL NestedKeyImpl::getStringValue(  )
     {
         throw InvalidRegistryException();
     }
-}
+}	
 
 //*************************************************************************
-void SAL_CALL NestedKeyImpl::setStringValue( const OUString& value )
+void SAL_CALL NestedKeyImpl::setStringValue( const OUString& value ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -605,10 +605,10 @@ void SAL_CALL NestedKeyImpl::setStringValue( const OUString& value )
     {
         throw InvalidRegistryException();
     }
-}
+}	
 
 //*************************************************************************
-Sequence< OUString > SAL_CALL NestedKeyImpl::getStringListValue(  )
+Sequence< OUString > SAL_CALL NestedKeyImpl::getStringListValue(  ) 
     throw(InvalidRegistryException, InvalidValueException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -626,9 +626,9 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getStringListValue(  )
         throw InvalidRegistryException();
     }
 }
-
+    
 //*************************************************************************
-void SAL_CALL NestedKeyImpl::setStringListValue( const Sequence< OUString >& seqValue )
+void SAL_CALL NestedKeyImpl::setStringListValue( const Sequence< OUString >& seqValue ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -648,10 +648,10 @@ void SAL_CALL NestedKeyImpl::setStringListValue( const Sequence< OUString >& seq
     {
         throw InvalidRegistryException();
     }
-}
+}	
 
 //*************************************************************************
-Sequence< sal_Int8 > SAL_CALL NestedKeyImpl::getBinaryValue(  )
+Sequence< sal_Int8 > SAL_CALL NestedKeyImpl::getBinaryValue(  ) 
     throw(InvalidRegistryException, InvalidValueException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -668,10 +668,10 @@ Sequence< sal_Int8 > SAL_CALL NestedKeyImpl::getBinaryValue(  )
     {
         throw InvalidRegistryException();
     }
-}
+}	
 
 //*************************************************************************
-void SAL_CALL NestedKeyImpl::setBinaryValue( const Sequence< sal_Int8 >& value )
+void SAL_CALL NestedKeyImpl::setBinaryValue( const Sequence< sal_Int8 >& value ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -691,10 +691,10 @@ void SAL_CALL NestedKeyImpl::setBinaryValue( const Sequence< sal_Int8 >& value )
     {
         throw InvalidRegistryException();
     }
-}
+}	
 
 //*************************************************************************
-Reference< XRegistryKey > SAL_CALL NestedKeyImpl::openKey( const OUString& aKeyName )
+Reference< XRegistryKey > SAL_CALL NestedKeyImpl::openKey( const OUString& aKeyName ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -709,11 +709,11 @@ Reference< XRegistryKey > SAL_CALL NestedKeyImpl::openKey( const OUString& aKeyN
         throw InvalidRegistryException();
 
     Reference<XRegistryKey> localKey, defaultKey;
-
+    
     if ( m_localKey.is() && m_localKey->isValid() )
     {
         localKey = m_pRegistry->m_localReg->getRootKey()->openKey(resolvedName);
-    }
+    } 
     if ( m_defaultKey.is() && m_defaultKey->isValid() )
     {
         defaultKey = m_pRegistry->m_defaultReg->getRootKey()->openKey(resolvedName);
@@ -724,12 +724,12 @@ Reference< XRegistryKey > SAL_CALL NestedKeyImpl::openKey( const OUString& aKeyN
         return ((XRegistryKey*)new NestedKeyImpl(m_pRegistry, localKey, defaultKey));
     } else
     {
-        return Reference<XRegistryKey>();
+        return Reference<XRegistryKey>();		
     }
-}
+}	
 
 //*************************************************************************
-Reference< XRegistryKey > SAL_CALL NestedKeyImpl::createKey( const OUString& aKeyName )
+Reference< XRegistryKey > SAL_CALL NestedKeyImpl::createKey( const OUString& aKeyName ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -754,11 +754,11 @@ Reference< XRegistryKey > SAL_CALL NestedKeyImpl::createKey( const OUString& aKe
             if ( m_defaultKey.is() && m_defaultKey->isValid() )
             {
                 defaultKey = m_pRegistry->m_defaultReg->getRootKey()->openKey(resolvedName);
-            }
+            } 
 
             m_state = m_pRegistry->m_state++;
 
-            return ((XRegistryKey*)new NestedKeyImpl(m_pRegistry, localKey, defaultKey));
+            return ((XRegistryKey*)new NestedKeyImpl(m_pRegistry, localKey, defaultKey));	
         }
     } else
     {
@@ -768,7 +768,7 @@ Reference< XRegistryKey > SAL_CALL NestedKeyImpl::createKey( const OUString& aKe
         {
             Reference<XRegistryKey> rootKey(m_pRegistry->m_localReg->getRootKey());
             m_localKey = rootKey->createKey(m_name);
-
+            
             localKey = m_pRegistry->m_localReg->getRootKey()->createKey(resolvedName);
 
             if ( localKey.is() )
@@ -777,31 +777,31 @@ Reference< XRegistryKey > SAL_CALL NestedKeyImpl::createKey( const OUString& aKe
 
                 m_state = m_pRegistry->m_state++;
 
-                return ((XRegistryKey*)new NestedKeyImpl(m_pRegistry, localKey, defaultKey));
+                return ((XRegistryKey*)new NestedKeyImpl(m_pRegistry, localKey, defaultKey));	
             }
         }
     }
-
-    return Reference<XRegistryKey>();
-}
+    
+    return Reference<XRegistryKey>();		
+}	
 
 //*************************************************************************
-void SAL_CALL NestedKeyImpl::closeKey(  )
+void SAL_CALL NestedKeyImpl::closeKey(  ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
     if ( m_localKey.is() && m_localKey->isValid() )
     {
         m_localKey->closeKey();
-    }
+    } 
     if ( m_defaultKey.is() && m_defaultKey->isValid() )
     {
         m_defaultKey->closeKey();
     }
-}
+}	
 
 //*************************************************************************
-void SAL_CALL NestedKeyImpl::deleteKey( const OUString& rKeyName )
+void SAL_CALL NestedKeyImpl::deleteKey( const OUString& rKeyName ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -820,10 +820,10 @@ void SAL_CALL NestedKeyImpl::deleteKey( const OUString& rKeyName )
     {
         throw InvalidRegistryException();
     }
-}
+}	
 
 //*************************************************************************
-Sequence< Reference< XRegistryKey > > SAL_CALL NestedKeyImpl::openKeys(  )
+Sequence< Reference< XRegistryKey > > SAL_CALL NestedKeyImpl::openKeys(  ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -836,17 +836,17 @@ Sequence< Reference< XRegistryKey > > SAL_CALL NestedKeyImpl::openKeys(  )
 
     if ( m_localKey.is() && m_localKey->isValid() )
     {
-        localSeq = m_localKey->getKeyNames();
+        localSeq = m_localKey->getKeyNames();	
     }
     if ( m_defaultKey.is() && m_defaultKey->isValid() )
     {
-        defaultSeq = m_defaultKey->getKeyNames();
+        defaultSeq = m_defaultKey->getKeyNames();	
     }
 
     sal_uInt32 local = localSeq.getLength();
     sal_uInt32 def = defaultSeq.getLength();
     sal_uInt32 len = 0;
-
+    
     sal_uInt32 i, j;
     for (i=0; i < local; i++)
     {
@@ -859,18 +859,18 @@ Sequence< Reference< XRegistryKey > > SAL_CALL NestedKeyImpl::openKeys(  )
             }
         }
     }
-
+    
     Sequence< Reference<XRegistryKey> > retSeq(local + def - len);
-    sal_Bool                            insert = sal_True;
-    OUString                            name;
-    sal_Int32                           lastIndex;
-
+    sal_Bool 							insert = sal_True;
+    OUString	 						name;
+    sal_Int32							lastIndex;
+    
     for (i=0; i < local; i++)
     {
         name = localSeq.getConstArray()[i];
         lastIndex = name.lastIndexOf('/');
         name = name.copy(lastIndex);
-        retSeq.getArray()[i] =
+        retSeq.getArray()[i] = 
             (XRegistryKey*)new NestedKeyImpl(name, this);
     }
 
@@ -878,32 +878,32 @@ Sequence< Reference< XRegistryKey > > SAL_CALL NestedKeyImpl::openKeys(  )
     for (i=0; i < def; i++)
     {
         insert = sal_True;
-
+        
         for (j=0 ; j < local; j++)
         {
-            if ( retSeq.getConstArray()[j]->getKeyName()
+            if ( retSeq.getConstArray()[j]->getKeyName() 
                     == defaultSeq.getConstArray()[i] )
             {
                 insert = sal_False;
                 break;
             }
         }
-
+        
         if ( insert )
         {
             name = defaultSeq.getConstArray()[i];
             lastIndex = name.lastIndexOf('/');
             name = name.copy(lastIndex);
-            retSeq.getArray()[k++] =
+            retSeq.getArray()[k++] = 
                 (XRegistryKey*)new NestedKeyImpl(name, this);
         }
     }
 
     return retSeq;
-}
+}	
 
 //*************************************************************************
-Sequence< OUString > SAL_CALL NestedKeyImpl::getKeyNames(  )
+Sequence< OUString > SAL_CALL NestedKeyImpl::getKeyNames(  ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -916,17 +916,17 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getKeyNames(  )
 
     if ( m_localKey.is() && m_localKey->isValid() )
     {
-        localSeq = m_localKey->getKeyNames();
+        localSeq = m_localKey->getKeyNames();	
     }
     if ( m_defaultKey.is() && m_defaultKey->isValid() )
     {
-        defaultSeq = m_defaultKey->getKeyNames();
+        defaultSeq = m_defaultKey->getKeyNames();	
     }
 
     sal_uInt32 local = localSeq.getLength();
     sal_uInt32 def = defaultSeq.getLength();
     sal_uInt32 len = 0;
-
+    
     sal_uInt32 i, j;
     for (i=0; i < local; i++)
     {
@@ -939,10 +939,10 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getKeyNames(  )
             }
         }
     }
-
-    Sequence<OUString>  retSeq(local + def - len);
-    sal_Bool            insert = sal_True;
-
+    
+    Sequence<OUString> 	retSeq(local + def - len);
+    sal_Bool 			insert = sal_True;
+    
     for (i=0; i < local; i++)
     {
         retSeq.getArray()[i] = localSeq.getConstArray()[i];
@@ -952,7 +952,7 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getKeyNames(  )
     for (i=0; i < def; i++)
     {
         insert = sal_True;
-
+        
         for (j=0 ; j < local; j++)
         {
             if ( retSeq.getConstArray()[j] == defaultSeq.getConstArray()[i] )
@@ -961,16 +961,16 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getKeyNames(  )
                 break;
             }
         }
-
+        
         if ( insert )
             retSeq.getArray()[k++] = defaultSeq.getConstArray()[i];
     }
 
     return retSeq;
-}
+}	
 
 //*************************************************************************
-sal_Bool SAL_CALL NestedKeyImpl::createLink( const OUString& aLinkName, const OUString& aLinkTarget )
+sal_Bool SAL_CALL NestedKeyImpl::createLink( const OUString& aLinkName, const OUString& aLinkTarget ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -981,10 +981,10 @@ sal_Bool SAL_CALL NestedKeyImpl::createLink( const OUString& aLinkName, const OU
         throw InvalidRegistryException();
     }
 
-    OUString    linkName;
-    OUString    resolvedName;
-    sal_Int32   lastIndex = aLinkName.lastIndexOf('/');
-
+    OUString 	linkName;
+    OUString 	resolvedName;
+    sal_Int32 	lastIndex = aLinkName.lastIndexOf('/');
+    
     if ( lastIndex > 0 )
     {
         linkName = aLinkName.copy(0, lastIndex);
@@ -995,7 +995,7 @@ sal_Bool SAL_CALL NestedKeyImpl::createLink( const OUString& aLinkName, const OU
         {
             throw InvalidRegistryException();
         }
-
+        
         resolvedName = resolvedName + aLinkName.copy(lastIndex);
     } else
     {
@@ -1026,7 +1026,7 @@ sal_Bool SAL_CALL NestedKeyImpl::createLink( const OUString& aLinkName, const OU
 }
 
 //*************************************************************************
-void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName )
+void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -1035,10 +1035,10 @@ void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName )
         throw InvalidRegistryException();
     }
 
-    OUString    linkName;
-    OUString    resolvedName;
-    sal_Int32   lastIndex = rLinkName.lastIndexOf('/');
-
+    OUString 	linkName;
+    OUString 	resolvedName;
+    sal_Int32 	lastIndex = rLinkName.lastIndexOf('/');
+    
     if ( lastIndex > 0 )
     {
         linkName = rLinkName.copy(0, lastIndex);
@@ -1049,7 +1049,7 @@ void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName )
         {
             throw InvalidRegistryException();
         }
-
+        
         resolvedName = resolvedName + rLinkName.copy(lastIndex);
     } else
     {
@@ -1058,7 +1058,7 @@ void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName )
         else
             resolvedName = m_name + OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rLinkName;
     }
-
+    
     if ( m_localKey.is() && m_localKey->isValid() &&
          !m_localKey->isReadOnly() )
     {
@@ -1068,9 +1068,9 @@ void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName )
         throw InvalidRegistryException();
     }
 }
-
+    
 //*************************************************************************
-OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName )
+OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -1079,10 +1079,10 @@ OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName )
         throw InvalidRegistryException();
     }
 
-    OUString    linkName;
-    OUString    resolvedName;
-    sal_Int32   lastIndex = rLinkName.lastIndexOf('/');
-
+    OUString 	linkName;
+    OUString 	resolvedName;
+    sal_Int32 	lastIndex = rLinkName.lastIndexOf('/');
+    
     if ( lastIndex > 0 )
     {
         linkName = rLinkName.copy(0, lastIndex);
@@ -1093,7 +1093,7 @@ OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName )
         {
             throw InvalidRegistryException();
         }
-
+        
         resolvedName = resolvedName + rLinkName.copy(lastIndex);
     } else
     {
@@ -1102,7 +1102,7 @@ OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName )
         else
             resolvedName = m_name + OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rLinkName;
     }
-
+    
     OUString linkTarget;
     if ( m_localKey.is() && m_localKey->isValid() )
     {
@@ -1115,15 +1115,15 @@ OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName )
         {
         }
     }
-
+    
     if ( m_defaultKey.is() && m_defaultKey->isValid() )
         linkTarget = m_pRegistry->m_defaultReg->getRootKey()->getLinkTarget(resolvedName);
 
     return linkTarget;
-}
+}	
 
 //*************************************************************************
-OUString SAL_CALL NestedKeyImpl::getResolvedName( const OUString& aKeyName )
+OUString SAL_CALL NestedKeyImpl::getResolvedName( const OUString& aKeyName ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -1140,7 +1140,7 @@ OUString SAL_CALL NestedKeyImpl::getResolvedName( const OUString& aKeyName )
     }
 
     return resolvedName;
-}
+}	
 
 //*************************************************************************
 //
@@ -1151,7 +1151,7 @@ NestedRegistryImpl::NestedRegistryImpl( )
     : m_state(0)
 {
     g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
-}
+}	
 
 //*************************************************************************
 NestedRegistryImpl::~NestedRegistryImpl()
@@ -1225,14 +1225,14 @@ sal_Bool SAL_CALL NestedRegistryImpl::hasElements(  ) throw (RuntimeException)
 
 
 //*************************************************************************
-OUString SAL_CALL NestedRegistryImpl::getImplementationName(  )
+OUString SAL_CALL NestedRegistryImpl::getImplementationName(  ) 
     throw(RuntimeException)
 {
     return stoc_bootstrap::defreg_getImplementationName();
-}
+}	
 
 //*************************************************************************
-sal_Bool SAL_CALL NestedRegistryImpl::supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL NestedRegistryImpl::supportsService( const OUString& ServiceName ) 
     throw(RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
@@ -1242,17 +1242,17 @@ sal_Bool SAL_CALL NestedRegistryImpl::supportsService( const OUString& ServiceNa
         if( pArray[i] == ServiceName )
             return sal_True;
     return sal_False;
-}
+}	
 
 //*************************************************************************
-Sequence<OUString> SAL_CALL NestedRegistryImpl::getSupportedServiceNames(  )
+Sequence<OUString> SAL_CALL NestedRegistryImpl::getSupportedServiceNames(  ) 
     throw(RuntimeException)
 {
     return stoc_bootstrap::defreg_getSupportedServiceNames();
-}
+}	
 
 //*************************************************************************
-void SAL_CALL NestedRegistryImpl::initialize( const Sequence< Any >& aArguments )
+void SAL_CALL NestedRegistryImpl::initialize( const Sequence< Any >& aArguments ) 
     throw( Exception, RuntimeException )
 {
     Guard< Mutex > aGuard( m_mutex );
@@ -1279,18 +1279,18 @@ OUString SAL_CALL NestedRegistryImpl::getURL() throw(RuntimeException)
     catch(InvalidRegistryException& )
     {
     }
-
+    
     return OUString();
-}
+}	
 
 //*************************************************************************
-void SAL_CALL NestedRegistryImpl::open( const OUString&, sal_Bool, sal_Bool )
+void SAL_CALL NestedRegistryImpl::open( const OUString&, sal_Bool, sal_Bool ) 
     throw(InvalidRegistryException, RuntimeException)
 {
-    throw InvalidRegistryException(
+    throw InvalidRegistryException( 
             OUString(RTL_CONSTASCII_USTRINGPARAM("the 'open' method is not specified for a nested registry")),
             Reference< XInterface >() );
-}
+}	
 
 //*************************************************************************
 sal_Bool SAL_CALL NestedRegistryImpl::isValid(  ) throw(RuntimeException)
@@ -1305,45 +1305,45 @@ sal_Bool SAL_CALL NestedRegistryImpl::isValid(  ) throw(RuntimeException)
     catch(InvalidRegistryException& )
     {
     }
-
+    
     return sal_False;
-}
+}	
 
 //*************************************************************************
-void SAL_CALL NestedRegistryImpl::close(  )
+void SAL_CALL NestedRegistryImpl::close(  ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
     if ( m_localReg.is() && m_localReg->isValid() )
     {
         m_localReg->close();
-    }
+    } 
     if ( m_defaultReg.is() && m_defaultReg->isValid() )
     {
         m_defaultReg->close();
     }
 /*
-    throw InvalidRegistryException(
-            OUString::createFromAscii("the 'close' method is not specified for a nested registry"),
+    throw InvalidRegistryException( 
+            OUString::createFromAscii("the 'close' method is not specified for a nested registry"), 
             Reference< XInterface >() );
 */
-}
+}	
 
 //*************************************************************************
-void SAL_CALL NestedRegistryImpl::destroy(  )
+void SAL_CALL NestedRegistryImpl::destroy(  ) 
     throw(InvalidRegistryException, RuntimeException)
 {
-    throw InvalidRegistryException(
+    throw InvalidRegistryException( 
             OUString(RTL_CONSTASCII_USTRINGPARAM("the 'destroy' method is not specified for a nested registry")),
             Reference< XInterface >() );
-}
+}	
 
 //*************************************************************************
-Reference< XRegistryKey > SAL_CALL NestedRegistryImpl::getRootKey(  )
+Reference< XRegistryKey > SAL_CALL NestedRegistryImpl::getRootKey(  ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Reference<XRegistryKey> tmpKey;
-
+    
     Guard< Mutex > aGuard( m_mutex );
     if ( m_localReg.is() && m_localReg->isValid() )
     {
@@ -1364,12 +1364,12 @@ Reference< XRegistryKey > SAL_CALL NestedRegistryImpl::getRootKey(  )
     {
         throw InvalidRegistryException();
     }
-
+    
     return Reference<XRegistryKey>();
-}
+}	
 
 //*************************************************************************
-sal_Bool SAL_CALL NestedRegistryImpl::isReadOnly(  )
+sal_Bool SAL_CALL NestedRegistryImpl::isReadOnly(  ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
@@ -1381,37 +1381,37 @@ sal_Bool SAL_CALL NestedRegistryImpl::isReadOnly(  )
     catch(InvalidRegistryException& )
     {
     }
-
+    
     return sal_False;
-}
+}	
 
 //*************************************************************************
-void SAL_CALL NestedRegistryImpl::mergeKey( const OUString& aKeyName, const OUString& aUrl )
+void SAL_CALL NestedRegistryImpl::mergeKey( const OUString& aKeyName, const OUString& aUrl ) 
     throw(InvalidRegistryException, MergeConflictException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
     if ( m_localReg.is() && m_localReg->isValid() )
     {
         m_localReg->mergeKey(aKeyName, aUrl);
-
+        
         m_state++;
     }
-}
+}	
 } // namespace stco_defreg
 
 namespace stoc_bootstrap
 {
 //*************************************************************************
-Reference<XInterface> SAL_CALL NestedRegistry_CreateInstance( const Reference<XComponentContext>& )
+Reference<XInterface> SAL_CALL NestedRegistry_CreateInstance( const Reference<XComponentContext>& ) 
     throw(Exception)
 {
-    Reference<XInterface>   xRet;
+    Reference<XInterface>	xRet;
     XSimpleRegistry *pRegistry = (XSimpleRegistry*) new stoc_defreg::NestedRegistryImpl;
 
     if (pRegistry)
     {
         xRet = Reference<XInterface>::query(pRegistry);
-    }
+    }	
 
     return xRet;
 }
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 6741ccfcb29b..0744e1710b32 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -61,7 +61,7 @@
 
 #if defined(SAL_W32) || defined(SAL_OS2)
 #include <io.h>
-#endif
+#endif 
 
 #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 
@@ -76,9 +76,9 @@ using namespace cppu;
 using namespace rtl;
 using namespace osl;
 
-
+    
 #define IMPLNAME "com.sun.star.comp.stoc.ImplementationRegistration"
-#define SERVICENAME         "com.sun.star.registry.ImplementationRegistration"
+#define SERVICENAME 		"com.sun.star.registry.ImplementationRegistration"
 namespace stoc_impreg
 {
 struct StringPool
@@ -118,7 +118,7 @@ struct StringPool
 private:
     StringPool( const StringPool & );
 };
-
+    
 const StringPool &spool()
 {
     static StringPool *pPool = 0;
@@ -160,33 +160,33 @@ OUString impreg_getImplementationName()
     return stoc_impreg::spool().sImplementationName;
 }
 }
-
+    
 namespace stoc_impreg
 {
 //*************************************************************************
-//  static deleteAllLinkReferences()
+//	static deleteAllLinkReferences()
 //
-static void deleteAllLinkReferences(const Reference < XSimpleRegistry >& xReg,
+static void deleteAllLinkReferences(const Reference < XSimpleRegistry >& xReg, 
                                     const Reference < XRegistryKey >& xSource)
     // throw ( InvalidRegistryException, RuntimeException )
 {
     Reference < XRegistryKey > xKey = xSource->openKey(
         spool().slash_UNO_slash_REGISTRY_LINKS );
-
+    
     if (xKey.is() && (xKey->getValueType() == RegistryValueType_ASCIILIST))
     {
         Sequence<OUString> linkNames = xKey->getAsciiListValue();
-
+                
         if (linkNames.getLength())
         {
             const OUString* pLinkNames = linkNames.getConstArray();
-
-            OUString            aLinkName;
-            OUString            aLinkParent;
-            Reference < XRegistryKey >  xLinkParent;
-            const sal_Unicode*  pTmpName = NULL;
-            const sal_Unicode*  pShortName = NULL;
-            sal_Int32           sEnd = 0;
+            
+            OUString			aLinkName;
+            OUString			aLinkParent;
+            Reference < XRegistryKey >	xLinkParent;
+            const sal_Unicode*	pTmpName = NULL;
+            const sal_Unicode*	pShortName = NULL;
+            sal_Int32		   	sEnd = 0;
 
             for (sal_Int32 i = 0; i < linkNames.getLength(); i++)
             {
@@ -232,7 +232,7 @@ static void deleteAllLinkReferences(const Reference < XSimpleRegistry >& xReg,
                         aLinkName = aLinkParent;
 
                         xReg->getRootKey()->deleteKey(aLinkParent);
-
+                            
                         sEnd = rtl_ustr_lastIndexOfChar( aLinkName.getStr(), '/' );
 
                         aLinkParent = aLinkName.copy(0, sEnd);
@@ -247,19 +247,19 @@ static void deleteAllLinkReferences(const Reference < XSimpleRegistry >& xReg,
 }
 
 //*************************************************************************
-//  static prepareLink
+//	static prepareLink
 //
-static void prepareLink( const Reference < XSimpleRegistry > & xDest,
-                         const Reference < XRegistryKey > & xSource,
+static void prepareLink( const Reference < XSimpleRegistry > & xDest, 
+                         const Reference < XRegistryKey > & xSource, 
                          const OUString& link)
     // throw ( InvalidRegistryException, RuntimeException )
 {
     OUString linkRefName = xSource->getKeyName();
     OUString linkName(link);
-    sal_Bool    isRelativ = sal_False;
+    sal_Bool	isRelativ = sal_False;
 
-    const sal_Unicode*  pTmpName = link.getStr();
-    const sal_Unicode*  pShortName;
+    const sal_Unicode*	pTmpName = link.getStr();
+    const sal_Unicode*	pShortName;
     sal_Int32           nIndex = rtl_ustr_indexOfChar( pTmpName, '%' );
     if ( nIndex == -1 )
         pShortName = 0;
@@ -283,19 +283,19 @@ static void prepareLink( const Reference < XSimpleRegistry > & xDest,
         linkRefName = linkRefName + link.copy(pShortName - pTmpName + 1);
         linkName = link.copy(0, pShortName - pTmpName);
     }
-
+        
     if (isRelativ)
-        xSource->createLink(linkName, linkRefName);
+        xSource->createLink(linkName, linkRefName);						
     else
-        xDest->getRootKey()->createLink(linkName, linkRefName);
+        xDest->getRootKey()->createLink(linkName, linkRefName);						
 }
 
 //*************************************************************************
-//  static searchImplForLink
+//	static searchImplForLink
 //
 static OUString searchImplForLink(
     const Reference < XRegistryKey > & xRootKey,
-    const OUString& linkName,
+    const OUString& linkName, 
     const OUString& implName )
     // throw ( InvalidRegistryException, RuntimeException )
 {
@@ -306,7 +306,7 @@ static OUString searchImplForLink(
         Sequence< Reference < XRegistryKey > > subKeys( xKey->openKeys() );
         const Reference < XRegistryKey > * pSubKeys = subKeys.getConstArray();
         OUString key_name( pool.slash_UNO + linkName );
-
+        
         for (sal_Int32 i = 0; i < subKeys.getLength(); i++)
         {
             try
@@ -331,28 +331,28 @@ static OUString searchImplForLink(
 }
 
 //*************************************************************************
-//  static searchLinkTargetForImpl
+//	static searchLinkTargetForImpl
 //
 static OUString searchLinkTargetForImpl(const Reference < XRegistryKey >& xRootKey,
-                                        const OUString& linkName,
+                                        const OUString& linkName, 
                                         const OUString& implName)
     // throw ( InvalidRegistryException, RuntimeException )
 {
     OUString ret;
 
-//      try
-//      {
+//  	try
+//  	{
         const StringPool & pool = spool();
         Reference < XRegistryKey > xKey = xRootKey->openKey( pool.slash_IMPLEMENTATIONS );
-
+        
         if (xKey.is())
         {
             Sequence< Reference < XRegistryKey > > subKeys = xKey->openKeys();
 
             const Reference < XRegistryKey >* pSubKeys = subKeys.getConstArray();
             Reference < XRegistryKey > xImplKey;
-
-            for (sal_Int32 i = 0; i < subKeys.getLength(); i++)
+                    
+            for (sal_Int32 i = 0; i < subKeys.getLength(); i++)			
             {
                 xImplKey = pSubKeys[i];
 
@@ -366,25 +366,25 @@ static OUString searchLinkTargetForImpl(const Reference < XRegistryKey >& xRootK
                 }
             }
         }
-//      }
-//      catch(InvalidRegistryException&)
-//      {
-//      }
+//  	}
+//  	catch(InvalidRegistryException&)
+//  	{
+//  	}
 
     return ret;
 }
 
 //*************************************************************************
-//  static createUniqueSubEntry
+//	static createUniqueSubEntry
 //
-static void createUniqueSubEntry(const Reference < XRegistryKey > & xSuperKey,
+static void createUniqueSubEntry(const Reference < XRegistryKey > & xSuperKey, 
                                  const OUString& value)
     // throw ( InvalidRegistryException, RuntimeException )
 {
     if (xSuperKey.is())
-    {
-//          try
-//          {
+    {	
+//  		try
+//  		{
         if (xSuperKey->getValueType() == RegistryValueType_ASCIILIST)
         {
             sal_Int32 length = 0;
@@ -397,7 +397,7 @@ static void createUniqueSubEntry(const Reference < XRegistryKey > & xSuperKey,
             {
                 bReady = (implEntries.getConstArray()[i] == value);
             }
-
+                
             if (bReady)
             {
                 Sequence<OUString> implEntriesNew(length);
@@ -405,7 +405,7 @@ static void createUniqueSubEntry(const Reference < XRegistryKey > & xSuperKey,
 
                 for (sal_Int32 i=0, j=1; i < length; i++)
                 {
-                    if (implEntries.getConstArray()[i] != value)
+                    if (implEntries.getConstArray()[i] != value) 
                         implEntriesNew.getArray()[j++] = implEntries.getConstArray()[i];
                 }
                 xSuperKey->setAsciiListValue(implEntriesNew);
@@ -413,7 +413,7 @@ static void createUniqueSubEntry(const Reference < XRegistryKey > & xSuperKey,
             {
                 Sequence<OUString> implEntriesNew(length+1);
                 implEntriesNew.getArray()[0] = value;
-
+                    
                 for (sal_Int32 i = 0; i < length; i++)
                 {
                     implEntriesNew.getArray()[i+1] = implEntries.getConstArray()[i];
@@ -425,18 +425,18 @@ static void createUniqueSubEntry(const Reference < XRegistryKey > & xSuperKey,
             Sequence<OUString> implEntriesNew(1);
 
             implEntriesNew.getArray()[0] = value;
-
+                
             xSuperKey->setAsciiListValue(implEntriesNew);
         }
-//          }
-//          catch(InvalidRegistryException&)
-//          {
-//          }
+//  		}
+//  		catch(InvalidRegistryException&)
+//  		{
+//  		}
     }
 }
 
 //*************************************************************************
-//  static deleteSubEntry
+//	static deleteSubEntry
 //
 static sal_Bool deleteSubEntry(const Reference < XRegistryKey >& xSuperKey, const OUString& value)
     // throw ( InvalidRegistryException, RuntimeException )
@@ -447,20 +447,20 @@ static sal_Bool deleteSubEntry(const Reference < XRegistryKey >& xSuperKey, cons
         sal_Int32 length = implEntries.getLength();
         sal_Int32 equals = 0;
         sal_Bool hasNoImplementations = sal_False;
-
+                
         for (sal_Int32 i = 0; i < length; i++)
         {
             if (implEntries.getConstArray()[i] == value)
                 equals++;
         }
-
+        
         if (equals == length)
         {
             hasNoImplementations = sal_True;
         } else
         {
             Sequence<OUString> implEntriesNew(length - equals);
-
+            
             sal_Int32 j = 0;
             for (sal_Int32 i = 0; i < length; i++)
             {
@@ -471,7 +471,7 @@ static sal_Bool deleteSubEntry(const Reference < XRegistryKey >& xSuperKey, cons
             }
             xSuperKey->setAsciiListValue(implEntriesNew);
         }
-
+        
         if (hasNoImplementations)
         {
             return sal_True;
@@ -481,9 +481,9 @@ static sal_Bool deleteSubEntry(const Reference < XRegistryKey >& xSuperKey, cons
 }
 
 //*************************************************************************
-//  static prepareUserLink
+//	static prepareUserLink
 //
-static void prepareUserLink(const Reference < XSimpleRegistry >& xDest,
+static void	prepareUserLink(const Reference < XSimpleRegistry >& xDest,
                                 const OUString& linkName,
                                 const OUString& linkTarget,
                                 const OUString& implName)
@@ -493,54 +493,54 @@ static void prepareUserLink(const Reference < XSimpleRegistry >& xDest,
 
     Reference < XRegistryKey > xRootKey;
 
-//      try
-//      {
+//  	try
+//  	{
     xRootKey = xDest->getRootKey();
-
+    
     if (xRootKey->getKeyType(linkName) == RegistryKeyType_LINK)
     {
         OUString oldImplName(searchImplForLink(xRootKey, linkName, implName));
-
+        
         if (oldImplName.getLength())
         {
             createUniqueSubEntry(xDest->getRootKey()->createKey(
                 linkName + spool().colon_old ), oldImplName);
         }
     }
-//      }
-//      catch (InvalidRegistryException&)
-//      {
-//      }
+//  	}
+//  	catch (InvalidRegistryException&)
+//  	{
+//  	}
 
-//      try
-//      {
+//  	try
+//  	{
     if (xRootKey->isValid())
     {
         ret = xRootKey->createLink(linkName, linkTarget);
     }
-//      }
-//      catch(InvalidRegistryException&)
-//      {
-//      }
+//  	}
+//  	catch(InvalidRegistryException&)
+//  	{
+//  	}
 
-//      return ret;
+//  	return ret;
 }
 
 //*************************************************************************
-//  static deleteUserLink
+//	static deleteUserLink
 //
-static void deletePathIfPossible(const Reference < XRegistryKey >& xRootKey,
+static void	deletePathIfPossible(const Reference < XRegistryKey >& xRootKey,
                                  const OUString& path)
 {
     try
     {
         Sequence<OUString> keyNames(xRootKey->openKey(path)->getKeyNames());
-
+        
         if (keyNames.getLength() == 0 &&
             xRootKey->openKey(path)->getValueType() == RegistryValueType_NOT_DEFINED)
         {
             xRootKey->deleteKey(path);
-
+            
             OUString tmpPath(path);
             OUString newPath = tmpPath.copy(0, tmpPath.lastIndexOf('/'));
 
@@ -555,55 +555,55 @@ static void deletePathIfPossible(const Reference < XRegistryKey >& xRootKey,
 
 
 //*************************************************************************
-//  static deleteUserLink
+//	static deleteUserLink
 //
-static void deleteUserLink(const Reference < XRegistryKey >& xRootKey,
+static void	deleteUserLink(const Reference < XRegistryKey >& xRootKey,
                                const OUString& linkName,
                                const OUString& linkTarget,
                                const OUString& implName)
     // throw ( InvalidRegistryException, RuntimeException )
 {
     sal_Bool bClean = sal_False;
-
+    
     if (xRootKey->getKeyType(linkName) == RegistryKeyType_LINK)
     {
         OUString tmpTarget = xRootKey->getLinkTarget(linkName);
-
+            
         if (tmpTarget == linkTarget)
         {
-            xRootKey->deleteLink(linkName);
+            xRootKey->deleteLink(linkName);			
         }
-    }
-
+    }			
+    
     Reference < XRegistryKey > xOldKey = xRootKey->openKey(
         linkName + spool().colon_old );
     if (xOldKey.is())
     {
         sal_Bool hasNoImplementations = sal_False;
-
+        
         if (xOldKey->getValueType() == RegistryValueType_ASCIILIST)
         {
             Sequence<OUString> implEntries = xOldKey->getAsciiListValue();
             sal_Int32 length = implEntries.getLength();
             sal_Int32 equals = 0;
-
+            
             for (sal_Int32 i = 0; i < length; i++)
             {
                 if (implEntries.getConstArray()[i] == implName)
                     equals++;
             }
-
+            
             if (equals == length)
             {
                 hasNoImplementations = sal_True;
             } else
             {
                 OUString oldImpl;
-
+                
                 if (length > equals + 1)
                 {
                     Sequence<OUString> implEntriesNew(length - equals - 1);
-
+                    
                     sal_Int32 j = 0;
                     sal_Bool first = sal_True;
                     for (sal_Int32 i = 0; i < length; i++)
@@ -620,23 +620,23 @@ static void deleteUserLink(const Reference < XRegistryKey >& xRootKey,
                             }
                         }
                     }
-
+                    
                     xOldKey->setAsciiListValue(implEntriesNew);
                 } else
                 {
                     oldImpl = implEntries.getConstArray()[0];
-
+                    
                     xOldKey->closeKey();
                     xRootKey->deleteKey(xOldKey->getKeyName());
                 }
-
+                
                 OUString oldTarget = searchLinkTargetForImpl(xRootKey, linkName, oldImpl);
                 if (oldTarget.getLength())
                 {
                     xRootKey->createLink(linkName, oldTarget);
                 }
             }
-
+            
             if (hasNoImplementations)
             {
                 bClean = sal_True;
@@ -649,7 +649,7 @@ static void deleteUserLink(const Reference < XRegistryKey >& xRootKey,
     {
         bClean = sal_True;
     }
-
+    
     if (bClean)
     {
         OUString tmpName(linkName);
@@ -659,9 +659,9 @@ static void deleteUserLink(const Reference < XRegistryKey >& xRootKey,
 }
 
 //*************************************************************************
-//  static prepareUserKeys
+//	static prepareUserKeys
 //
-static void prepareUserKeys(const Reference < XSimpleRegistry >& xDest,
+static void	prepareUserKeys(const Reference < XSimpleRegistry >& xDest,
                                 const Reference < XRegistryKey >& xUnoKey,
                                 const Reference < XRegistryKey >& xKey,
                                 const OUString& implName,
@@ -671,12 +671,12 @@ static void prepareUserKeys(const Reference < XSimpleRegistry >& xDest,
     sal_Bool hasSubKeys = sal_False;
 
     Sequence<OUString> keyNames = xKey->getKeyNames();
-
+        
     OUString relativKey;
     if (keyNames.getLength())
         relativKey = keyNames.getConstArray()[0].copy(xKey->getKeyName().getLength()+1);
 
-    if (keyNames.getLength() == 1 &&
+    if (keyNames.getLength() == 1 && 
         xKey->getKeyType(relativKey) == RegistryKeyType_LINK)
     {
         hasSubKeys = sal_True;
@@ -701,7 +701,7 @@ static void prepareUserKeys(const Reference < XSimpleRegistry >& xDest,
         {
             hasSubKeys = sal_True;
             const Reference < XRegistryKey > * pSubKeys = subKeys.getConstArray();
-
+                
             for (sal_Int32 i = 0; i < subKeys.getLength(); i++)
             {
                 prepareUserKeys(xDest, xUnoKey, pSubKeys[i], implName, bRegister);
@@ -712,7 +712,7 @@ static void prepareUserKeys(const Reference < XSimpleRegistry >& xDest,
     if (! hasSubKeys)
     {
         OUString keyName(xKey->getKeyName().copy(xUnoKey->getKeyName().getLength()));
-
+        
         Reference < XRegistryKey > xRootKey = xDest->getRootKey();
         if (bRegister)
         {
@@ -726,7 +726,7 @@ static void prepareUserKeys(const Reference < XSimpleRegistry >& xDest,
                 deleteSubEntry(rKey, implName);
                 xRootKey->deleteKey(keyName);
             }
-
+            
             OUString path = keyName.copy(0, keyName.lastIndexOf('/'));
             if( path.getLength() )
             {
@@ -734,23 +734,23 @@ static void prepareUserKeys(const Reference < XSimpleRegistry >& xDest,
             }
         }
     }
-    return;
+    return;	
 }
 
 //*************************************************************************
-//  static deleteAllImplementations
+//	static deleteAllImplementations
 //
-static void deleteAllImplementations(   const Reference < XSimpleRegistry >& xReg,
-                                        const Reference < XRegistryKey >& xSource,
-                                        const OUString& locationUrl,
+static void deleteAllImplementations(	const Reference < XSimpleRegistry >& xReg, 
+                                        const Reference < XRegistryKey >& xSource, 
+                                        const OUString& locationUrl, 
                                         std::list<OUString> & implNames)
     // throw (InvalidRegistryException, RuntimeException)
 {
     Sequence < Reference < XRegistryKey > > subKeys = xSource->openKeys();
-
+        
     if (subKeys.getLength() > 0)
     {
-        const Reference < XRegistryKey> * pSubKeys = subKeys.getConstArray();
+        const Reference < XRegistryKey> * pSubKeys = subKeys.getConstArray();			
         Reference < XRegistryKey > xImplKey;
         sal_Bool hasLocationUrl = sal_False;
 
@@ -769,7 +769,7 @@ static void deleteAllImplementations(   const Reference < XSimpleRegistry >& xRe
 
                     OUString implName(xImplKey->getKeyName().getStr() + 1);
                     sal_Int32 firstDot = implName.indexOf('/');
-
+                        
                     if (firstDot >= 0)
                         implName = implName.copy(firstDot + 1);
 
@@ -785,7 +785,7 @@ static void deleteAllImplementations(   const Reference < XSimpleRegistry >& xRe
                         if (subKeys2.getLength())
                         {
                             const Reference < XRegistryKey > * pSubKeys2 = subKeys2.getConstArray();
-
+                                
                             for (sal_Int32 j = 0; j < subKeys2.getLength(); j++)
                             {
                                 if (pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + pool.slash_UNO_slash_SERVICES ) &&
@@ -809,7 +809,7 @@ static void deleteAllImplementations(   const Reference < XSimpleRegistry >& xRe
                 xReg->getRootKey()->deleteKey(xImplKey->getKeyName());
             }
         }
-
+            
         subKeys = xSource->openKeys();
         if (subKeys.getLength() == 0)
         {
@@ -852,7 +852,7 @@ static void delete_all_singleton_entries(
             for ( sal_Int32 n = nOrigRegLength; n--; )
             {
                 OUString const & registered_implname = p[ n ];
-
+                
                 ::std::list< OUString >::const_iterator iPos( impl_names.begin() );
                 ::std::list< OUString >::const_iterator const iEnd( impl_names.end() );
                 for ( ; iPos != iEnd; ++iPos )
@@ -864,7 +864,7 @@ static void delete_all_singleton_entries(
                     }
                 }
             }
-
+            
             if (nNewLength != nOrigRegLength)
             {
                 if (0 == nNewLength)
@@ -887,10 +887,10 @@ static void delete_all_singleton_entries(
 }
 
 //*************************************************************************
-//  static deleteAllServiceEntries
+//	static deleteAllServiceEntries
 //
-static void deleteAllServiceEntries(    const Reference < XSimpleRegistry >& xReg,
-                                        const Reference < XRegistryKey >& xSource,
+static void deleteAllServiceEntries(	const Reference < XSimpleRegistry >& xReg, 
+                                        const Reference < XRegistryKey >& xSource, 
                                         const OUString& implName)
     // throw ( InvalidRegistryException, RuntimeException )
 {
@@ -898,14 +898,14 @@ static void deleteAllServiceEntries(    const Reference < XSimpleRegistry >& xRe
 
     if (subKeys.getLength() > 0)
     {
-        const Reference < XRegistryKey > * pSubKeys = subKeys.getConstArray();
+        const Reference < XRegistryKey > * pSubKeys = subKeys.getConstArray();			
         Reference < XRegistryKey > xServiceKey;
         sal_Bool hasNoImplementations = sal_False;
-
+            
         for (sal_Int32 i = 0; i < subKeys.getLength(); i++)
         {
             xServiceKey = pSubKeys[i];
-
+                
             if (xServiceKey->getValueType() == RegistryValueType_ASCIILIST)
             {
                 Sequence<OUString> implEntries = xServiceKey->getAsciiListValue();
@@ -926,7 +926,7 @@ static void deleteAllServiceEntries(    const Reference < XSimpleRegistry >& xRe
                     if (equals > 0)
                     {
                         Sequence<OUString> implEntriesNew(length-equals);
-
+                        
                         sal_Int32 j = 0;
                         for (sal_Int32 k = 0; k < length; k++)
                         {
@@ -940,7 +940,7 @@ static void deleteAllServiceEntries(    const Reference < XSimpleRegistry >& xRe
                     }
                 }
             }
-
+                
             if (hasNoImplementations)
             {
                 hasNoImplementations = sal_False;
@@ -1002,7 +1002,7 @@ static void insert_singletons(
                 xSingleton->getKeyName().copy(
                     implname.getLength() + sizeof ("/IMPLEMENTATIONS//UNO/SINGLETONS/") -1 ) );
             OUString service_name( xSingleton->getStringValue() );
-
+            
             OUString keyname( OUSTR("/SINGLETONS/") + singleton_name );
             Reference< registry::XRegistryKey > xKey2( xDest->getRootKey()->openKey( keyname ) );
             if (xKey2.is() && xKey2->isValid())
@@ -1032,7 +1032,7 @@ static void insert_singletons(
                                     OUSTR("cannot get service type description: ") + existing_name,
                                     Reference< XInterface >() );
                             }
-
+                            
                             // everything's fine if existing service entry supports the one
                             // to be registered
                             if (! is_supported_service( service_name, xExistingService_td ))
@@ -1070,7 +1070,7 @@ static void insert_singletons(
                 xKey2 = xDest->getRootKey()->createKey( keyname );
                 xKey2->setStringValue( service_name );
             }
-
+            
             Reference< registry::XRegistryKey > xRegisteredImplNames(
                 xKey2->openKey( OUSTR("REGISTERED_BY") ) );
             if (!xRegisteredImplNames.is() || !xRegisteredImplNames->isValid())
@@ -1108,12 +1108,12 @@ static void insert_singletons(
 
 
 //*************************************************************************
-//  static prepareRegistry
+//	static prepareRegistry
 //
 static void prepareRegistry(
-    const Reference < XSimpleRegistry >& xDest,
+    const Reference < XSimpleRegistry >& xDest, 
     const Reference < XRegistryKey >& xSource,
-    const OUString& implementationLoaderUrl,
+    const OUString& implementationLoaderUrl, 
     const OUString& locationUrl,
     Reference< XComponentContext > const & xContext )
     // throw ( InvalidRegistryException, CannotRegisterImplementationException, RuntimeException )
@@ -1128,11 +1128,11 @@ static void prepareRegistry(
     }
 
     const StringPool & pool = spool();
-
+        
     const Reference < XRegistryKey >* pSubKeys = subKeys.getConstArray();
     Reference < XRegistryKey > xImplKey;
-
-    for (sal_Int32 i = 0; i < subKeys.getLength(); i++)
+            
+    for (sal_Int32 i = 0; i < subKeys.getLength(); i++)			
     {
         xImplKey = pSubKeys[i];
 
@@ -1151,13 +1151,13 @@ static void prepareRegistry(
 
                 implName = OUString(xImplKey->getKeyName().getStr() + 1);
                 sal_Int32 firstDot = implName.indexOf('/');
-
+                    
                 if (firstDot >= 0)
                     implName = implName.copy(firstDot + 1);
 
                 sal_Int32 offset = xKey->getKeyName().getLength() + 1;
-
-                for (sal_Int32 j = 0; j < serviceKeys.getLength(); j++)
+                    
+                for (sal_Int32 j = 0; j < serviceKeys.getLength(); j++)			
                 {
                     OUString serviceName = pServiceKeys[j]->getKeyName().copy(offset);
 
@@ -1183,7 +1183,7 @@ static void prepareRegistry(
                 if (subKeys2.getLength())
                 {
                     const Reference < XRegistryKey > * pSubKeys2 = subKeys2.getConstArray();
-
+                        
                     for (sal_Int32 j = 0; j < subKeys2.getLength(); j++)
                     {
                         if (pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + pool.slash_UNO_slash_SERVICES) &&
@@ -1191,7 +1191,7 @@ static void prepareRegistry(
                             pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + pool.slash_UNO_slash_SINGLETONS ))
                         {
                             prepareUserKeys(xDest, xKey, pSubKeys2[j], implName, sal_True);
-                        }
+                        }			
                     }
                 }
             }
@@ -1218,7 +1218,7 @@ static void prepareRegistry(
             {
                 // update link entries in REGISTRY_LINKS section
                 Sequence<OUString> linkNames = xKey->getAsciiListValue();
-
+                    
                 if (linkNames.getLength())
                 {
                     const OUString* pLinkNames = linkNames.getConstArray();
@@ -1227,17 +1227,17 @@ static void prepareRegistry(
                     {
                         prepareLink(xDest, xImplKey, pLinkNames[j]);
                     }
-                }
-            }
+                }				
+            }				
         }
-
+        
         insert_singletons( xDest, xImplKey, xContext );
     }
 }
 
 
-static void findImplementations(    const Reference < XRegistryKey > & xSource,
-                                    std::list <OUString>& implNames)
+static void findImplementations(	const Reference < XRegistryKey > & xSource, 
+                                    std::list <OUString>& implNames) 
 {
     sal_Bool isImplKey = sal_False;
 
@@ -1271,7 +1271,7 @@ static void findImplementations(    const Reference < XRegistryKey > & xSource,
 
         if (subKeys.getLength() > 0)
         {
-            const Reference < XRegistryKey >* pSubKeys = subKeys.getConstArray();
+            const Reference < XRegistryKey >* pSubKeys = subKeys.getConstArray();			
 
             for (sal_Int32 i = 0; i < subKeys.getLength(); i++)
             {
@@ -1283,7 +1283,7 @@ static void findImplementations(    const Reference < XRegistryKey > & xSource,
     catch(InvalidRegistryException&)
     {
     }
-}
+}	
 
 
 class ImplementationRegistration
@@ -1294,73 +1294,73 @@ public:
     ~ImplementationRegistration();
 
     // XServiceInfo
-    OUString                        SAL_CALL getImplementationName() throw(RuntimeException);
-    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException);
-    Sequence< OUString >            SAL_CALL getSupportedServiceNames(void) throw(RuntimeException);
+    OUString 						SAL_CALL getImplementationName() throw(RuntimeException);
+    sal_Bool 						SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException);
+    Sequence< OUString > 			SAL_CALL getSupportedServiceNames(void) throw(RuntimeException);
 
     // XImplementationRegistration
     virtual void SAL_CALL registerImplementation(
-        const OUString& implementationLoader,
-        const OUString& location,
-        const Reference < XSimpleRegistry > & xReg)
-        throw(  CannotRegisterImplementationException, RuntimeException );
+        const OUString& implementationLoader, 
+        const OUString& location, 
+        const Reference < XSimpleRegistry > & xReg) 
+        throw(	CannotRegisterImplementationException, RuntimeException );
 
     virtual sal_Bool SAL_CALL revokeImplementation(
-        const OUString& location,
+        const OUString& location, 
         const Reference < XSimpleRegistry >& xReg)
         throw( RuntimeException );
-
+    
     virtual Sequence< OUString > SAL_CALL getImplementations(
         const OUString& implementationLoader,
-        const OUString& location)
+        const OUString& location) 
         throw( RuntimeException );
     virtual Sequence< OUString > SAL_CALL checkInstantiation(
-        const OUString& implementationName)
+        const OUString& implementationName) 
         throw( RuntimeException );
 
     // XImplementationRegistration2
     virtual void SAL_CALL registerImplementationWithLocation(
-        const OUString& implementationLoader,
+        const OUString& implementationLoader, 
         const OUString& location,
         const OUString& registeredLocation,
-        const Reference < XSimpleRegistry > & xReg)
-        throw(  CannotRegisterImplementationException, RuntimeException );
-
+        const Reference < XSimpleRegistry > & xReg) 
+        throw(	CannotRegisterImplementationException, RuntimeException );
+    
     // XInitialization
     virtual void SAL_CALL initialize(
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
-        throw(  ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) 
+        throw(	::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
 private: // helper methods
     void prepareRegister(
-        const OUString& implementationLoader,
+        const OUString& implementationLoader, 
         const OUString& location,
         const OUString& registeredLocation,
         const Reference < XSimpleRegistry > & xReg);
     // throw( CannotRegisterImplementationException, RuntimeException )
 
-    static void doRegister( const Reference < XMultiComponentFactory >& xSMgr,
+    static void doRegister(	const Reference < XMultiComponentFactory >& xSMgr,
                             const Reference < XComponentContext > &xCtx,
                             const Reference < XImplementationLoader >& xAct,
-                            const Reference < XSimpleRegistry >& xDest,
-                            const OUString& implementationLoaderUrl,
+                            const Reference < XSimpleRegistry >& xDest, 
+                            const OUString& implementationLoaderUrl, 
                             const OUString& locationUrl,
                             const OUString& registeredLocationUrl);
         /* throw ( InvalidRegistryException,
                    MergeConflictException,
                    CannotRegisterImplementationException, RuntimeException ) */
 
-    static void doRevoke( const Reference < XSimpleRegistry >& xDest,
+    static void doRevoke( const Reference < XSimpleRegistry >& xDest, 
                           const OUString& locationUrl );
         // throw( InvalidRegistryException, RuntimeException )
     Reference< XSimpleRegistry > getRegistryFromServiceManager();
-
+    
     static Reference< XSimpleRegistry > createTemporarySimpleRegistry(
         const Reference< XMultiComponentFactory > &rSMgr,
         const Reference < XComponentContext > & rCtx );
 
 private: // members
-    Reference < XMultiComponentFactory >    m_xSMgr;
+    Reference < XMultiComponentFactory >	m_xSMgr;
     Reference < XComponentContext >         m_xCtx;
 };
 
@@ -1384,7 +1384,7 @@ ImplementationRegistration::~ImplementationRegistration()
 
 
 // XServiceInfo
-OUString ImplementationRegistration::getImplementationName() throw(RuntimeException)
+OUString ImplementationRegistration::getImplementationName() throw(RuntimeException) 
 {
     return stoc_bootstrap::impreg_getImplementationName();
 }
@@ -1410,14 +1410,14 @@ Reference< XSimpleRegistry > ImplementationRegistration::getRegistryFromServiceM
 {
     Reference < XPropertySet > xPropSet( m_xSMgr, UNO_QUERY );
     Reference < XSimpleRegistry > xRegistry;
-
+                            
     if( xPropSet.is() ) {
 
         try {  // the implementation does not support XIntrospectionAccess !
 
             Any aAny = xPropSet->getPropertyValue( spool().Registry );
 
-            if( aAny.getValueType().getTypeClass() == TypeClass_INTERFACE ) {
+            if( aAny.getValueType().getTypeClass() == TypeClass_INTERFACE )	{
                 aAny >>= xRegistry;
             }
          }
@@ -1425,19 +1425,19 @@ Reference< XSimpleRegistry > ImplementationRegistration::getRegistryFromServiceM
              // empty reference is error signal !
         }
     }
-
+    
     return xRegistry;
 }
 
 
 //************************************************************************
 // XInitialization
-//
+// 
 void ImplementationRegistration::initialize(
-    const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArgs )
-    throw(  ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+    const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArgs ) 
+    throw(	::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
 {
-
+        
     if( aArgs.getLength() != 4 ) {
         OUStringBuffer buf;
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
@@ -1445,14 +1445,14 @@ void ImplementationRegistration::initialize(
         buf.append( (sal_Int32) aArgs.getLength() );
         throw IllegalArgumentException( buf.makeStringAndClear(),
                                         Reference<XInterface > (),
-                                        0 );
+                                        0 );	
     }
-
+    
     Reference< XImplementationLoader > rLoader;
     OUString loaderServiceName;
     OUString locationUrl;
     Reference< XSimpleRegistry > rReg;
-
+        
     // 1st argument : An instance of an implementation loader
     if( aArgs.getConstArray()[0].getValueType().getTypeClass() == TypeClass_INTERFACE ) {
         aArgs.getConstArray()[0] >>= rLoader;
@@ -1469,7 +1469,7 @@ void ImplementationRegistration::initialize(
                                         Reference< XInterface > (),
                                         0 );
     }
-
+        
     // 2nd argument : The service name of the loader. This name is written into the registry
     if( aArgs.getConstArray()[1].getValueType().getTypeClass() == TypeClass_STRING ) {
         aArgs.getConstArray()[1] >>= loaderServiceName;
@@ -1484,10 +1484,10 @@ void ImplementationRegistration::initialize(
                                         Reference< XInterface > (),
                                         0 );
     }
-
-    // 3rd argument : The file name of the dll, that contains the loader
+    
+    // 3rd argument : The file name of the dll, that contains the loader 
     if( aArgs.getConstArray()[2].getValueType().getTypeClass() == TypeClass_STRING ) {
-        aArgs.getConstArray()[2] >>= locationUrl;
+        aArgs.getConstArray()[2] >>= locationUrl;	
     }
     if( ! locationUrl.getLength() ) {
         OUStringBuffer buf;
@@ -1499,14 +1499,14 @@ void ImplementationRegistration::initialize(
                                         Reference< XInterface > (),
                                         0 );
     }
-
-    // 4th argument : The registry, the service should be written to
+    
+    // 4th argument : The registry, the service should be written to 
     if( aArgs.getConstArray()[3].getValueType().getTypeClass() == TypeClass_INTERFACE ) {
-        aArgs.getConstArray()[3] >>= rReg;
+        aArgs.getConstArray()[3] >>= rReg;			
     }
-
+    
     if( !rReg.is() ) {
-        rReg = getRegistryFromServiceManager();
+        rReg = getRegistryFromServiceManager();		
         if( !rReg.is() ) {
             OUStringBuffer buf;
             buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
@@ -1530,10 +1530,10 @@ void ImplementationRegistration::initialize(
 // virtual function registerImplementationWithLocation of XImplementationRegistration2
 //
 void ImplementationRegistration::registerImplementationWithLocation(
-    const OUString& implementationLoaderUrl,
+    const OUString& implementationLoaderUrl, 
     const OUString& locationUrl,
     const OUString& registeredLocationUrl,
-    const Reference < XSimpleRegistry > & xReg)
+    const Reference < XSimpleRegistry > & xReg) 
     throw( CannotRegisterImplementationException, RuntimeException )
 {
     prepareRegister(
@@ -1542,14 +1542,14 @@ void ImplementationRegistration::registerImplementationWithLocation(
 
 // helper function
 void ImplementationRegistration::prepareRegister(
-    const OUString& implementationLoaderUrl,
+    const OUString& implementationLoaderUrl, 
     const OUString& locationUrl,
     const OUString& registeredLocationUrl,
-    const Reference < XSimpleRegistry > & xReg)
+    const Reference < XSimpleRegistry > & xReg) 
     // throw( CannotRegisterImplementationException, RuntimeException )
 {
-    OUString implLoaderUrl(implementationLoaderUrl);
-    OUString activatorName;
+    OUString implLoaderUrl(implementationLoaderUrl);	
+    OUString activatorName;	
 
     if (implementationLoaderUrl.getLength() > 0)
     {
@@ -1559,7 +1559,7 @@ void ImplementationRegistration::prepareRegister(
     } else
     {
         // check locationUrl to find out what kind of loader is needed
-        // set iimplLoaderUrl
+        // set iimplLoaderUrl 
     }
 
     if( m_xSMgr.is() ) {
@@ -1570,17 +1570,17 @@ void ImplementationRegistration::prepareRegister(
             if (xAct.is())
             {
                 Reference < XSimpleRegistry > xRegistry;
-
+                
                 if (xReg.is())
                 {
                     // registry supplied by user
                     xRegistry = xReg;
-                }
+                } 
                 else
                 {
                     xRegistry = getRegistryFromServiceManager();
                 }
-
+                
                 if ( xRegistry.is())
                 {
                     doRegister(m_xSMgr, m_xCtx, xAct, xRegistry, implLoaderUrl,
@@ -1638,9 +1638,9 @@ void ImplementationRegistration::prepareRegister(
 // virtual function registerImplementation of XImplementationRegistration
 //
 void ImplementationRegistration::registerImplementation(
-    const OUString& implementationLoaderUrl,
+    const OUString& implementationLoaderUrl, 
     const OUString& locationUrl,
-    const Reference < XSimpleRegistry > & xReg)
+    const Reference < XSimpleRegistry > & xReg) 
     throw( CannotRegisterImplementationException, RuntimeException )
 {
     prepareRegister(implementationLoaderUrl, locationUrl, locationUrl, xReg);
@@ -1651,22 +1651,22 @@ void ImplementationRegistration::registerImplementation(
 // virtual function revokeImplementation of XImplementationRegistration
 //
 sal_Bool ImplementationRegistration::revokeImplementation(const OUString& location,
-                                                      const Reference < XSimpleRegistry >& xReg)
+                                                      const Reference < XSimpleRegistry >& xReg) 
     throw ( RuntimeException )
 {
     sal_Bool ret = sal_False;
 
     Reference < XSimpleRegistry > xRegistry;
-
+    
     if (xReg.is()) {
         xRegistry = xReg;
-    }
+    } 
     else {
         Reference < XPropertySet > xPropSet = Reference< XPropertySet >::query( m_xSMgr );
         if( xPropSet.is() ) {
             try {
                 Any aAny = xPropSet->getPropertyValue( spool().Registry );
-
+    
                 if( aAny.getValueType().getTypeClass() == TypeClass_INTERFACE )
                 {
                     aAny >>= xRegistry;
@@ -1694,18 +1694,18 @@ sal_Bool ImplementationRegistration::revokeImplementation(const OUString& locati
 
     return ret;
 }
-
+    
 //*************************************************************************
 // virtual function getImplementations of XImplementationRegistration
 //
 Sequence< OUString > ImplementationRegistration::getImplementations(
     const OUString & implementationLoaderUrl,
-    const OUString & locationUrl)
+    const OUString & locationUrl) 
     throw ( RuntimeException )
 {
-    OUString implLoaderUrl(implementationLoaderUrl);
-    OUString activatorName;
-
+    OUString implLoaderUrl(implementationLoaderUrl);	
+    OUString activatorName;	
+    
     if (implementationLoaderUrl.getLength() > 0)
     {
         OUString tmpActivator(implementationLoaderUrl);
@@ -1714,20 +1714,20 @@ Sequence< OUString > ImplementationRegistration::getImplementations(
     } else
     {
         // check locationUrl to find out what kind of loader is needed
-        // set implLoaderUrl
+        // set implLoaderUrl 
     }
 
     if( m_xSMgr.is() ) {
 
         Reference < XImplementationLoader > xAct(
             m_xSMgr->createInstanceWithContext( activatorName, m_xCtx ), UNO_QUERY );
-
+    
         if (xAct.is())
         {
-
+            
             Reference < XSimpleRegistry > xReg =
                 createTemporarySimpleRegistry( m_xSMgr, m_xCtx);
-
+    
             if (xReg.is())
             {
                 try
@@ -1735,22 +1735,22 @@ Sequence< OUString > ImplementationRegistration::getImplementations(
                     xReg->open(OUString() /* in mem */, sal_False, sal_True);
                     Reference < XRegistryKey > xImpl;
 
-                    { // only necessary for deleting the temporary variable of rootkey
+                    { // only necessary	for deleting the temporary variable of rootkey
                         xImpl = xReg->getRootKey()->createKey( spool().slash_IMPLEMENTATIONS );
                     }
                     if (xAct->writeRegistryInfo(xImpl, implementationLoaderUrl, locationUrl))
                     {
                         std::list <OUString> implNames;
-
+    
                         findImplementations(xImpl, implNames);
-
+    
                         if (!implNames.empty())
                         {
                             std::list<OUString>::const_iterator iter = implNames.begin();
-
+    
                             Sequence<OUString> seqImpl(implNames.size());
                             OUString *pImplNames = seqImpl.getArray();
-
+                
                             sal_Int32 index = 0;
                             while (iter != implNames.end())
                             {
@@ -1758,12 +1758,12 @@ Sequence< OUString > ImplementationRegistration::getImplementations(
                                 index++;
                                 ++iter;
                             }
-
+    
                             xImpl->closeKey();
                             return seqImpl;
                         }
                     }
-
+                    
                     xImpl->closeKey();
                 }
                 catch(MergeConflictException&)
@@ -1776,17 +1776,17 @@ Sequence< OUString > ImplementationRegistration::getImplementations(
         }
     }
 
-    return Sequence<OUString>();
+    return Sequence<OUString>();	
 }
 
 //*************************************************************************
 // virtual function checkInstantiation of XImplementationRegistration
 //
-Sequence< OUString > ImplementationRegistration::checkInstantiation(const OUString&)
+Sequence< OUString > ImplementationRegistration::checkInstantiation(const OUString&) 
     throw ( RuntimeException )
 {
     OSL_ENSURE( sal_False, "ImplementationRegistration::checkInstantiation not implemented" );
-    return Sequence<OUString>();
+    return Sequence<OUString>();	
 }
 
 //*************************************************************************
@@ -1798,40 +1798,40 @@ void ImplementationRegistration::doRevoke(
     const OUString& locationUrl)
     // throw ( InvalidRegistryException, RuntimeException )
 {
-    if( xDest.is() )
+    if( xDest.is() ) 
     {
         std::list<OUString> aNames;
 
         const StringPool &pool = spool();
         Reference < XRegistryKey > xRootKey( xDest->getRootKey() );
-
+        
         Reference < XRegistryKey > xKey =
             xRootKey->openKey( pool.slash_IMPLEMENTATIONS );
         if (xKey.is() && xKey->isValid())
         {
             deleteAllImplementations(xDest, xKey, locationUrl, aNames);
-        }
-
+        }        
+        
         xKey = xRootKey->openKey( pool.slash_SERVICES );
-        if (xKey.is())
+        if (xKey.is())	
         {
             std::list<OUString>::const_iterator iter = aNames.begin();
-
-            while (iter != aNames.end())
+            
+            while (iter != aNames.end()) 
             {
                 deleteAllServiceEntries(xDest, xKey, *iter);
                 ++iter;
             }
         }
-
+        
         xKey = xRootKey->openKey( OUSTR("/SINGLETONS") );
         if (xKey.is() && xKey->isValid())
         {
             delete_all_singleton_entries( xKey, aNames );
         }
-
+        
         if (xRootKey.is())
-            xRootKey->closeKey();
+            xRootKey->closeKey();		
         if (xKey.is() && xKey->isValid() )
             xKey->closeKey();
     }
@@ -1839,27 +1839,27 @@ void ImplementationRegistration::doRevoke(
 
 void ImplementationRegistration::doRegister(
     const Reference< XMultiComponentFactory > & xSMgr,
-    const Reference< XComponentContext > &xCtx,
+    const Reference< XComponentContext > &xCtx, 
     const Reference < XImplementationLoader > & xAct,
     const Reference < XSimpleRegistry >& xDest,
-    const OUString& implementationLoaderUrl,
+    const OUString& implementationLoaderUrl, 
     const OUString& locationUrl,
     const OUString& registeredLocationUrl)
     /* throw ( InvalidRegistryException,
                MergeConflictException,
                CannotRegisterImplementationException, RuntimeException ) */
 {
-    Reference < XSimpleRegistry >   xReg =
+    Reference < XSimpleRegistry > 	xReg =
         createTemporarySimpleRegistry( xSMgr, xCtx );
-    Reference < XRegistryKey >      xSourceKey;
+    Reference < XRegistryKey > 		xSourceKey;
 
     if (xAct.is() && xReg.is() && xDest.is())
     {
         try
         {
             xReg->open(OUString() /* in mem */, sal_False, sal_True);
-
-            { // only necessary for deleting the temporary variable of rootkey
+            
+            { // only necessary	for deleting the temporary variable of rootkey
                 xSourceKey = xReg->getRootKey()->createKey( spool().slash_IMPLEMENTATIONS );
             }
 
@@ -1870,7 +1870,7 @@ void ImplementationRegistration::doRegister(
                 prepareRegistry(xDest, xSourceKey, implementationLoaderUrl, registeredLocationUrl, xCtx);
 
                 xSourceKey->closeKey();
-
+                    
                 xSourceKey = xReg->getRootKey();
                 Reference < XRegistryKey > xDestKey = xDest->getRootKey();
                 mergeKeys( xDestKey, xSourceKey );
@@ -1883,16 +1883,16 @@ void ImplementationRegistration::doRegister(
                     OUString( RTL_CONSTASCII_USTRINGPARAM( "ImplementationRegistration::doRegistration() component registration signaled failure" ) ),
                     Reference< XInterface > () );
             }
-
+                
             // Cleanup Source registry.
             if ( xSourceKey->isValid() )
                 xSourceKey->closeKey();
         }
-        catch(CannotRegisterImplementationException&)
+        catch(CannotRegisterImplementationException&)							
         {
             if ( xSourceKey->isValid() )
                 xSourceKey->closeKey();
-            // and throw again
+            // and throw again 
             throw;
         }
     }
@@ -1905,12 +1905,12 @@ Reference< XSimpleRegistry > ImplementationRegistration::createTemporarySimpleRe
     const Reference < XComponentContext > & xCtx)
 {
 
-    Reference < XSimpleRegistry > xReg(
+    Reference < XSimpleRegistry > xReg( 
         rSMgr->createInstanceWithContext(
-            spool().com_sun_star_registry_SimpleRegistry,   xCtx ),
+            spool().com_sun_star_registry_SimpleRegistry,	xCtx ),
         UNO_QUERY);
     OSL_ASSERT( xReg.is() );
-    return xReg;
+    return xReg;	
 }
 }
 
diff --git a/stoc/source/implementationregistration/mergekeys.cxx b/stoc/source/implementationregistration/mergekeys.cxx
index d5200719664a..6c76e1b0e216 100644
--- a/stoc/source/implementationregistration/mergekeys.cxx
+++ b/stoc/source/implementationregistration/mergekeys.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ struct Link
 {
     OUString m_name;
     OUString m_target;
-
+    
     inline Link( OUString const & name, OUString const & target )
         : m_name( name )
         , m_target( target )
@@ -75,7 +75,7 @@ static void mergeKeys(
             OUSTR("destination key is null or invalid!"),
             Reference<XInterface>() );
     }
-
+    
     // write value
     switch (xSource->getValueType())
     {
@@ -106,7 +106,7 @@ static void mergeKeys(
         OSL_ASSERT(false);
         break;
     }
-
+    
     // sub keys
     Sequence< OUString > sourceKeys( xSource->getKeyNames() );
     OUString const * pSourceKeys = sourceKeys.getConstArray();
@@ -119,7 +119,7 @@ static void mergeKeys(
         {
             name = name.copy( nSlash +1 );
         }
-
+        
         if (xSource->getKeyType( name ) == registry::RegistryKeyType_KEY)
         {
             // try to open exisiting dest key or create new one
@@ -145,7 +145,7 @@ static void mergeKeys(
                     xDest->deleteKey( name );
                 }
             }
-
+            
             links.push_back( Link(
                 pSourceKeys[ nPos ], // abs path
                 xSource->getResolvedName( name ) // abs resolved name
@@ -172,11 +172,11 @@ void mergeKeys(
                           "destination registry is read-only!  cannot merge!") ),
             Reference< XInterface >() );
     }
-
+    
     t_links links;
     links.reserve( 16 );
     mergeKeys( xDest, xSource, links );
-
+    
     for ( size_t nPos = links.size(); nPos--; )
     {
         Link const & r = links[ nPos ];
diff --git a/stoc/source/implementationregistration/mergekeys.hxx b/stoc/source/implementationregistration/mergekeys.hxx
index 745403af3f6b..e99e9a79cb3f 100644
--- a/stoc/source/implementationregistration/mergekeys.hxx
+++ b/stoc/source/implementationregistration/mergekeys.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/inspect/insp.xml b/stoc/source/inspect/insp.xml
index 48b46d273cb1..5bb64882e747 100644
--- a/stoc/source/inspect/insp.xml
+++ b/stoc/source/inspect/insp.xml
@@ -1,59 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   introspection.uno   </module-name>
+    <module-name>	introspection.uno	</module-name>
     <component-description>
         <author> Juergen Schmidt </author>
-        <name>  com.sun.star.comp.stoc.Introspection    </name>
+        <name>	com.sun.star.comp.stoc.Introspection	</name>
         <description>
     This component implements XIntrospection. The method XIntrospection::inspect(any object)
     returns an XIntrospectionAccess that provides information about the methods, properties
     and listeners supported by the inspected object. Matching pairs of getName/setName()
     methods will also be offered as property "Name".
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.beans.Introspection    </supported-service>
-        <service-dependency>    com.sun.star.reflection.CoreReflection  </service-dependency>
+        <supported-service>	com.sun.star.beans.Introspection	</supported-service>
+        <service-dependency>	com.sun.star.reflection.CoreReflection	</service-dependency>
         <type>com.sun.star.lang.DisposedException</type>
-        <type>  com.sun.star.beans.XIntrospection               </type>
-        <type>  com.sun.star.beans.XIntrospectionAccess         </type>
-        <type>  com.sun.star.beans.XPropertySet                 </type>
-        <type>  com.sun.star.beans.XFastPropertySet             </type>
-        <type>  com.sun.star.beans.XMaterialHolder              </type>
-        <type>  com.sun.star.beans.XExactName                   </type>
-        <type>  com.sun.star.beans.PropertyAttribute            </type>
-        <type>  com.sun.star.beans.PropertyConcept              </type>
-        <type>  com.sun.star.beans.MethodConcept                </type>
-        <type>  com.sun.star.lang.XEventListener                </type>
-        <type>  com.sun.star.lang.XInitialization               </type>
-        <type>  com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XComponent                </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory       </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
-        <type>  com.sun.star.registry.XRegistryKey              </type>
-        <type>  com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </type>
-        <type>  com.sun.star.uno.DeploymentException                    </type>
-        <type>  com.sun.star.uno.XComponentContext          </type>
-        <type>  com.sun.star.container.XEnumerationAccess       </type>
-        <type>  com.sun.star.container.XNameContainer           </type>
-        <type>  com.sun.star.container.XIndexContainer          </type>
-        <type>  com.sun.star.reflection.XIdlReflection          </type>
-        <type>  com.sun.star.reflection.XIdlClassProvider       </type>
-        <type>  com.sun.star.reflection.XIdlClass               </type>
-        <type>  com.sun.star.reflection.XIdlField2              </type>
-        <type>  com.sun.star.reflection.XIdlArray               </type>
-        <type>  com.sun.star.reflection.FieldAccessMode         </type>
+        <type>	com.sun.star.beans.XIntrospection				</type>
+        <type>	com.sun.star.beans.XIntrospectionAccess			</type>
+        <type>	com.sun.star.beans.XPropertySet					</type>
+        <type>	com.sun.star.beans.XFastPropertySet				</type>
+        <type>	com.sun.star.beans.XMaterialHolder				</type>
+        <type>	com.sun.star.beans.XExactName					</type>
+        <type>	com.sun.star.beans.PropertyAttribute			</type>
+        <type>	com.sun.star.beans.PropertyConcept				</type>
+        <type>	com.sun.star.beans.MethodConcept				</type>
+        <type>	com.sun.star.lang.XEventListener 		 		</type>
+        <type>	com.sun.star.lang.XInitialization 		 		</type>
+        <type>	com.sun.star.lang.XTypeProvider					</type>
+        <type>	com.sun.star.lang.XServiceInfo					</type>
+        <type>	com.sun.star.lang.XComponent				</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory			</type>
+        <type>	com.sun.star.lang.XSingleComponentFactory		</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory			</type>
+        <type>	com.sun.star.registry.XRegistryKey				</type>
+        <type>	com.sun.star.uno.XAggregation					</type>
+        <type>	com.sun.star.uno.XWeak							</type>
+        <type>	com.sun.star.uno.TypeClass						</type>
+        <type>	com.sun.star.uno.DeploymentException					</type>
+        <type>	com.sun.star.uno.XComponentContext			</type>
+        <type>	com.sun.star.container.XEnumerationAccess		</type>
+        <type>	com.sun.star.container.XNameContainer			</type>
+        <type>	com.sun.star.container.XIndexContainer			</type>
+        <type>	com.sun.star.reflection.XIdlReflection			</type>
+        <type>	com.sun.star.reflection.XIdlClassProvider		</type>
+        <type>	com.sun.star.reflection.XIdlClass				</type>
+        <type>	com.sun.star.reflection.XIdlField2				</type>
+        <type>	com.sun.star.reflection.XIdlArray				</type>
+        <type>	com.sun.star.reflection.FieldAccessMode			</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper3$(COM)   </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper3$(COM)	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu3		</runtime-module-dependency>
+    <runtime-module-dependency>	sal3		</runtime-module-dependency>
 </module-description>
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index cf0b40c974ca..e41ef825a705 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -92,7 +92,7 @@ using namespace osl;
 using namespace rtl;
 
 #define IMPLEMENTATION_NAME "com.sun.star.comp.stoc.Introspection"
-#define SERVICE_NAME        "com.sun.star.beans.Introspection"
+#define SERVICE_NAME		"com.sun.star.beans.Introspection"
 
 namespace stoc_inspect
 {
@@ -103,7 +103,7 @@ typedef WeakImplHelper3< XIntrospectionAccess, XMaterialHolder, XExactName > Int
 //==================================================================================================
 
 // Spezial-Wert fuer Method-Concept, um "normale" Funktionen kennzeichnen zu koennen
-#define  MethodConcept_NORMAL_IMPL      0x80000000
+#define  MethodConcept_NORMAL_IMPL		0x80000000
 
 
 // Methode zur Feststellung, ob eine Klasse von einer anderen abgeleitet ist
@@ -134,24 +134,24 @@ sal_Bool isDerivedFrom( Reference<XIdlClass> xToTestClass, Reference<XIdlClass>
 
 // *** Klassifizierung der Properties (kein enum, um Sequence verwenden zu koennen) ***
 // Properties aus einem PropertySet-Interface
-#define MAP_PROPERTY_SET    0
+#define MAP_PROPERTY_SET	0
 // Properties aus Fields
-#define MAP_FIELD           1
+#define MAP_FIELD			1
 // Properties, die durch get/set-Methoden beschrieben werden
-#define MAP_GETSET          2
+#define MAP_GETSET			2
 // Properties, die nur eine set-Methode haben
-#define MAP_SETONLY         3
+#define MAP_SETONLY			3
 
 
 // Schrittweite, in der die Groesse der Sequences angepasst wird
-#define ARRAY_SIZE_STEP     20
+#define ARRAY_SIZE_STEP		20
 
 
 
 //**************************************
 //*** IntrospectionAccessStatic_Impl ***
 //**************************************
-// Entspricht dem alten IntrospectionAccessImpl, bildet jetzt den statischen
+// Entspricht dem alten IntrospectionAccessImpl, bildet jetzt den statischen 
 // Anteil des neuen Instanz-bezogenen ImplIntrospectionAccess
 
 // ACHTUNG !!! Von Hand refcounten !!!
@@ -223,7 +223,7 @@ class IntrospectionAccessStatic_Impl
 
     // Klassifizierung der gefundenen Methoden
     Sequence<sal_Int32> maPropertyConceptSeq;
-
+    
     // Anzahl der Properties
     sal_Int32 mnPropCount;
 
@@ -244,7 +244,7 @@ class IntrospectionAccessStatic_Impl
 
     // Klassifizierung der gefundenen Methoden
     Sequence<sal_Int32> maMethodConceptSeq;
-
+    
     // Anzahl der Methoden
     sal_Int32 mnMethCount;
 
@@ -256,13 +256,13 @@ class IntrospectionAccessStatic_Impl
 
     // Hilfs-Methoden zur Groessen-Anpassung der Sequences
     void checkPropertyArraysSize
-    (
-        Property*& rpAllPropArray,
+    ( 
+        Property*& rpAllPropArray, 
         sal_Int16*& rpMapTypeArray,
         sal_Int32*& rpPropertyConceptArray,
         sal_Int32 iNextIndex
     );
-    void checkInterfaceArraySize( Sequence< Reference<XInterface> >& rSeq, Reference<XInterface>*& rpInterfaceArray,
+    void checkInterfaceArraySize( Sequence< Reference<XInterface> >& rSeq, Reference<XInterface>*& rpInterfaceArray, 
         sal_Int32 iNextIndex );
 
     // RefCount
@@ -280,25 +280,25 @@ public:
 
     void acquire() { nRefCount++; }
     void release()
-    {
-        nRefCount--;
+    { 
+        nRefCount--; 
         if( nRefCount <= 0 )
             delete this;
     }
 
     // Methoden von XIntrospectionAccess (ALT, jetzt nur Impl)
     void setPropertyValue(const Any& obj, const OUString& aPropertyName, const Any& aValue) const;
-//  void setPropertyValue(Any& obj, const OUString& aPropertyName, const Any& aValue) const;
+//	void setPropertyValue(Any& obj, const OUString& aPropertyName, const Any& aValue) const;
     Any getPropertyValue(const Any& obj, const OUString& aPropertyName) const;
     void setPropertyValueByIndex(const Any& obj, sal_Int32 nIndex, const Any& aValue) const;
-//  void setPropertyValueByIndex(Any& obj, sal_Int32 nIndex, const Any& aValue) const;
+//	void setPropertyValueByIndex(Any& obj, sal_Int32 nIndex, const Any& aValue) const;
     Any getPropertyValueByIndex(const Any& obj, sal_Int32 nIndex) const;
 
-    Sequence<Property> getProperties(void) const                        { return maAllPropertySeq; }
-    Sequence< Reference<XIdlMethod> > getMethods(void) const            { return maAllMethodSeq; }
-    Sequence< Type > getSupportedListeners(void) const                  { return maSupportedListenerSeq; }
-    Sequence<sal_Int32> getPropertyConcepts(void) const                 { return maPropertyConceptSeq; }
-    Sequence<sal_Int32> getMethodConcepts(void) const                   { return maMethodConceptSeq; }
+    Sequence<Property> getProperties(void) const						{ return maAllPropertySeq; }
+    Sequence< Reference<XIdlMethod> > getMethods(void) const			{ return maAllMethodSeq; }
+    Sequence< Type > getSupportedListeners(void) const					{ return maSupportedListenerSeq; }
+    Sequence<sal_Int32> getPropertyConcepts(void) const					{ return maPropertyConceptSeq; }
+    Sequence<sal_Int32> getMethodConcepts(void) const					{ return maMethodConceptSeq; }
 };
 
 
@@ -501,7 +501,7 @@ void IntrospectionAccessStatic_Impl::setPropertyValueByIndex(const Any& obj, sal
             if( mbFastPropSet && ( nOrgHandle = mpOrgPropertyHandleArray[ nSequenceIndex ] ) != -1 )
             {
                 // PropertySet-Interface holen
-                Reference<XFastPropertySet> xFastPropSet =
+                Reference<XFastPropertySet> xFastPropSet = 
                     Reference<XFastPropertySet>::query( xInterface );
                 if( xFastPropSet.is() )
                 {
@@ -516,7 +516,7 @@ void IntrospectionAccessStatic_Impl::setPropertyValueByIndex(const Any& obj, sal
             else
             {
                 // PropertySet-Interface holen
-                Reference<XPropertySet> xPropSet =
+                Reference<XPropertySet> xPropSet = 
                     Reference<XPropertySet>::query( xInterface );
                 if( xPropSet.is() )
                 {
@@ -615,7 +615,7 @@ Any IntrospectionAccessStatic_Impl::getPropertyValueByIndex(const Any& obj, sal_
             if( mbFastPropSet && ( nOrgHandle = mpOrgPropertyHandleArray[ nSequenceIndex ] ) != -1 )
             {
                 // PropertySet-Interface holen
-                Reference<XFastPropertySet> xFastPropSet =
+                Reference<XFastPropertySet> xFastPropSet = 
                     Reference<XFastPropertySet>::query( xInterface );
                 if( xFastPropSet.is() )
                 {
@@ -631,7 +631,7 @@ Any IntrospectionAccessStatic_Impl::getPropertyValueByIndex(const Any& obj, sal_
             else
             {
                 // PropertySet-Interface holen
-                Reference<XPropertySet> xPropSet =
+                Reference<XPropertySet> xPropSet = 
                     Reference<XPropertySet>::query( xInterface );
                 if( xPropSet.is() )
                 {
@@ -691,8 +691,8 @@ Any IntrospectionAccessStatic_Impl::getPropertyValueByIndex(const Any& obj, sal_
 
 // Hilfs-Methoden zur Groessen-Anpassung der Sequences
 void IntrospectionAccessStatic_Impl::checkPropertyArraysSize
-(
-    Property*& rpAllPropArray,
+( 
+    Property*& rpAllPropArray, 
     sal_Int16*& rpMapTypeArray,
     sal_Int32*& rpPropertyConceptArray,
     sal_Int32 iNextIndex
@@ -736,8 +736,8 @@ void IntrospectionAccessStatic_Impl::checkInterfaceArraySize( Sequence< Referenc
 // Neue Impl-Klasse im Rahmen der Introspection-Umstellung auf Instanz-gebundene
 // Introspection mit Property-Zugriff ueber XPropertySet. Die alte Klasse
 // ImplIntrospectionAccess lebt als IntrospectionAccessStatic_Impl
-class ImplIntrospectionAdapter :
-    public XPropertySet, public XFastPropertySet, public XPropertySetInfo,
+class ImplIntrospectionAdapter : 
+    public XPropertySet, public XFastPropertySet, public XPropertySetInfo, 
     public XNameContainer, public XIndexContainer,
     public XEnumerationAccess, public  XIdlArray,
     public OWeakObject
@@ -747,7 +747,7 @@ class ImplIntrospectionAdapter :
 
     // Untersuchtes Objekt
     const Any& mrInspectedObject;
-
+    
     // Statische Daten der Introspection
     IntrospectionAccessStatic_Impl* mpStaticImpl;
 
@@ -755,23 +755,23 @@ class ImplIntrospectionAdapter :
     Reference<XInterface> mxIface;
 
     // Original-Interfaces des Objekts
-    Reference<XElementAccess>       mxObjElementAccess;
-    Reference<XNameContainer>       mxObjNameContainer;
-    Reference<XNameAccess>          mxObjNameAccess;
-    Reference<XIndexAccess>         mxObjIndexAccess;
-    Reference<XIndexContainer>      mxObjIndexContainer;
-    Reference<XEnumerationAccess>   mxObjEnumerationAccess;
-    Reference<XIdlArray>            mxObjIdlArray;
+    Reference<XElementAccess>		mxObjElementAccess;
+    Reference<XNameContainer>		mxObjNameContainer;
+    Reference<XNameAccess>			mxObjNameAccess;
+    Reference<XIndexAccess>			mxObjIndexAccess;
+    Reference<XIndexContainer>		mxObjIndexContainer;
+    Reference<XEnumerationAccess>	mxObjEnumerationAccess;
+    Reference<XIdlArray>			mxObjIdlArray;
 
 public:
-    ImplIntrospectionAdapter( ImplIntrospectionAccess* pAccess_,
+    ImplIntrospectionAdapter( ImplIntrospectionAccess* pAccess_, 
         const Any& obj, IntrospectionAccessStatic_Impl* pStaticImpl_ );
     ~ImplIntrospectionAdapter();
 
     // Methoden von XInterface
     virtual Any SAL_CALL queryInterface( const Type& rType ) throw( RuntimeException );
-    virtual void        SAL_CALL acquire() throw() { OWeakObject::acquire(); }
-    virtual void        SAL_CALL release() throw() { OWeakObject::release(); }
+    virtual void		SAL_CALL acquire() throw() { OWeakObject::acquire(); }
+    virtual void		SAL_CALL release() throw() { OWeakObject::release(); }
 
     // Methoden von XPropertySet
     virtual Reference<XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( RuntimeException );
@@ -779,13 +779,13 @@ public:
         throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException );
     virtual Any SAL_CALL getPropertyValue(const OUString& aPropertyName)
         throw( UnknownPropertyException, WrappedTargetException, RuntimeException );
-    virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener)
+    virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener) 
         throw( UnknownPropertyException, WrappedTargetException, RuntimeException );
-    virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener)
+    virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener) 
         throw( UnknownPropertyException, WrappedTargetException, RuntimeException );
-    virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const Reference<XVetoableChangeListener>& aListener)
+    virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const Reference<XVetoableChangeListener>& aListener) 
         throw( UnknownPropertyException, WrappedTargetException, RuntimeException );
-    virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const Reference<XVetoableChangeListener>& aListener)
+    virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const Reference<XVetoableChangeListener>& aListener) 
         throw( UnknownPropertyException, WrappedTargetException, RuntimeException );
 
     // Methoden von XFastPropertySet
@@ -823,7 +823,7 @@ public:
         throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException );
 
     // Methoden von XIndexContainer
-    virtual void SAL_CALL insertByIndex(sal_Int32 Index, const Any& Element)
+    virtual void SAL_CALL insertByIndex(sal_Int32 Index, const Any& Element) 
         throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException );
     virtual void SAL_CALL replaceByIndex(sal_Int32 Index, const Any& Element)
         throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException );
@@ -843,7 +843,7 @@ public:
         throw( IllegalArgumentException, ArrayIndexOutOfBoundsException, RuntimeException );
 };
 
-ImplIntrospectionAdapter::ImplIntrospectionAdapter( ImplIntrospectionAccess* pAccess_,
+ImplIntrospectionAdapter::ImplIntrospectionAdapter( ImplIntrospectionAccess* pAccess_, 
     const Any& obj, IntrospectionAccessStatic_Impl* pStaticImpl_ )
         : mpAccess( pAccess_), mrInspectedObject( obj ), mpStaticImpl( pStaticImpl_ )
 {
@@ -871,7 +871,7 @@ ImplIntrospectionAdapter::~ImplIntrospectionAdapter()
 }
 
 // Methoden von XInterface
-Any SAL_CALL ImplIntrospectionAdapter::queryInterface( const Type& rType )
+Any SAL_CALL ImplIntrospectionAdapter::queryInterface( const Type& rType ) 
     throw( RuntimeException )
 {
     Any aRet( ::cppu::queryInterface(
@@ -891,8 +891,8 @@ Any SAL_CALL ImplIntrospectionAdapter::queryInterface( const Type& rType )
             || ( mxObjNameContainer.is() && (aRet = ::cppu::queryInterface( rType, static_cast< XNameContainer* >( this ) ) ).hasValue() )
             || ( mxObjIndexAccess.is() && (aRet = ::cppu::queryInterface( rType, static_cast< XIndexAccess* >( this ) ) ).hasValue() )
             || ( mxObjIndexContainer.is() && (aRet = ::cppu::queryInterface( rType, static_cast< XIndexContainer* >( this ) ) ).hasValue() )
-            || ( mxObjEnumerationAccess .is() && (aRet = ::cppu::queryInterface( rType, static_cast< XEnumerationAccess* >( this ) ) ).hasValue() )
-            || ( mxObjIdlArray.is() && (aRet = ::cppu::queryInterface( rType, static_cast< XIdlArray* >( this ) ) ).hasValue() )
+            || ( mxObjEnumerationAccess	.is() && (aRet = ::cppu::queryInterface( rType, static_cast< XEnumerationAccess* >( this ) ) ).hasValue() )
+            || ( mxObjIdlArray.is() && (aRet = ::cppu::queryInterface( rType, static_cast< XIdlArray* >( this ) ) ).hasValue() ) 
           )
         {
         }
@@ -1019,7 +1019,7 @@ void ImplIntrospectionAdapter::addPropertyChangeListener(const OUString& aProper
 {
     if( mxIface.is() )
     {
-        Reference<XPropertySet> xPropSet =
+        Reference<XPropertySet> xPropSet = 
             Reference<XPropertySet>::query( mxIface );
         //Reference<XPropertySet> xPropSet( mxIface, USR_QUERY );
         if( xPropSet.is() )
@@ -1032,7 +1032,7 @@ void ImplIntrospectionAdapter::removePropertyChangeListener(const OUString& aPro
 {
     if( mxIface.is() )
     {
-        Reference<XPropertySet> xPropSet =
+        Reference<XPropertySet> xPropSet = 
             Reference<XPropertySet>::query( mxIface );
         //Reference<XPropertySet> xPropSet( mxIface, USR_QUERY );
         if( xPropSet.is() )
@@ -1045,7 +1045,7 @@ void ImplIntrospectionAdapter::addVetoableChangeListener(const OUString& aProper
 {
     if( mxIface.is() )
     {
-        Reference<XPropertySet> xPropSet =
+        Reference<XPropertySet> xPropSet = 
             Reference<XPropertySet>::query( mxIface );
         //Reference<XPropertySet> xPropSet( mxIface, USR_QUERY );
         if( xPropSet.is() )
@@ -1058,7 +1058,7 @@ void ImplIntrospectionAdapter::removeVetoableChangeListener(const OUString& aPro
 {
     if( mxIface.is() )
     {
-        Reference<XPropertySet> xPropSet =
+        Reference<XPropertySet> xPropSet = 
             Reference<XPropertySet>::query( mxIface );
         if( xPropSet.is() )
             xPropSet->removeVetoableChangeListener(aPropertyName, aListener);
@@ -1218,7 +1218,7 @@ void ImplIntrospectionAdapter::set(Any& array, sal_Int32 index, const Any& value
 sal_Int32 ImplIntrospectionAccess::getSuppliedMethodConcepts(void)
     throw( RuntimeException )
 {
-    return  MethodConcept::DANGEROUS |
+    return	MethodConcept::DANGEROUS |
             PROPERTY |
             LISTENER |
             ENUMERATION |
@@ -1229,7 +1229,7 @@ sal_Int32 ImplIntrospectionAccess::getSuppliedMethodConcepts(void)
 sal_Int32 ImplIntrospectionAccess::getSuppliedPropertyConcepts(void)
     throw( RuntimeException )
 {
-    return  PropertyConcept::DANGEROUS |
+    return	PropertyConcept::DANGEROUS |
             PROPERTYSET |
             ATTRIBUTES |
             METHODS;
@@ -1274,8 +1274,8 @@ Sequence< Property > ImplIntrospectionAccess::getProperties(sal_Int32 PropertyCo
     throw( RuntimeException )
 {
     // Wenn alle unterstuetzten Konzepte gefordert werden, Sequence einfach durchreichen
-    sal_Int32 nAllSupportedMask =   PROPERTYSET |
-                                    ATTRIBUTES |
+    sal_Int32 nAllSupportedMask =	PROPERTYSET | 
+                                    ATTRIBUTES | 
                                     METHODS;
     if( ( PropertyConcepts & nAllSupportedMask ) == nAllSupportedMask )
     {
@@ -1293,7 +1293,7 @@ Sequence< Property > ImplIntrospectionAccess::getProperties(sal_Int32 PropertyCo
 
     // Es gibt zur Zeit keine DANGEROUS-Properties
     // if( PropertyConcepts & DANGEROUS )
-    //  nCount += mpStaticImpl->mnDangerousPropCount;
+    //	nCount += mpStaticImpl->mnDangerousPropCount;
     if( PropertyConcepts & PROPERTYSET )
         nCount += mpStaticImpl->mnPropertySetPropCount;
     if( PropertyConcepts & ATTRIBUTES )
@@ -1302,7 +1302,7 @@ Sequence< Property > ImplIntrospectionAccess::getProperties(sal_Int32 PropertyCo
         nCount += mpStaticImpl->mnMethodPropCount;
 
     // Sequence entsprechend der geforderten Anzahl reallocieren
-    ImplIntrospectionAccess* pThis = (ImplIntrospectionAccess*)this;    // const umgehen
+    ImplIntrospectionAccess* pThis = (ImplIntrospectionAccess*)this;	// const umgehen
     pThis->maLastPropertySeq.realloc( nCount );
     Property* pDestProps = pThis->maLastPropertySeq.getArray();
 
@@ -1378,10 +1378,10 @@ sal_Bool ImplIntrospectionAccess::hasMethod(const OUString& Name, sal_Int32 Meth
 Sequence< Reference<XIdlMethod> > ImplIntrospectionAccess::getMethods(sal_Int32 MethodConcepts)
     throw( RuntimeException )
 {
-    ImplIntrospectionAccess* pThis = (ImplIntrospectionAccess*)this;    // const umgehen
+    ImplIntrospectionAccess* pThis = (ImplIntrospectionAccess*)this;	// const umgehen
 
     // Wenn alle unterstuetzten Konzepte gefordert werden, Sequence einfach durchreichen
-    sal_Int32 nAllSupportedMask =   MethodConcept::DANGEROUS |
+    sal_Int32 nAllSupportedMask = 	MethodConcept::DANGEROUS |
                                     PROPERTY |
                                     LISTENER |
                                     ENUMERATION |
@@ -1407,7 +1407,7 @@ Sequence< Reference<XIdlMethod> > ImplIntrospectionAccess::getMethods(sal_Int32
 
     // Sequence entsprechend der geforderten Anzahl reallocieren
     // Anders als bei den Properties kann die Anzahl nicht durch
-    // Zaehler in inspect() vorher ermittelt werden, da Methoden
+    // Zaehler in inspect() vorher ermittelt werden, da Methoden 
     // mehreren Konzepten angehoeren koennen
     pThis->maLastMethodSeq.realloc( nLen );
     Reference<XIdlMethod>* pDestMethods = pThis->maLastMethodSeq.getArray();
@@ -1467,7 +1467,7 @@ Reference<XInterface> SAL_CALL ImplIntrospectionAccess::queryAdapter( const Type
     // Gibt es schon einen Adapter?
     if( !mpAdapter )
     {
-        ((ImplIntrospectionAccess*)this)->mpAdapter =
+        ((ImplIntrospectionAccess*)this)->mpAdapter = 
             new ImplIntrospectionAdapter( this, maInspectedObject, mpStaticImpl );
 
         // Selbst eine Referenz halten
@@ -1502,7 +1502,7 @@ OUString toLower( OUString aUStr )
 OUString ImplIntrospectionAccess::getExactName( const OUString& rApproximateName ) throw( RuntimeException )
 {
     OUString aRetStr;
-    LowerToExactNameMap::iterator aIt =
+    LowerToExactNameMap::iterator aIt = 
         mpStaticImpl->maLowerToExactNameMap.find( toLower( rApproximateName ) );
     if( !( aIt == mpStaticImpl->maLowerToExactNameMap.end() ) )
         aRetStr = (*aIt).second;
@@ -1516,23 +1516,23 @@ OUString ImplIntrospectionAccess::getExactName( const OUString& rApproximateName
 
 struct hashIntrospectionKey_Impl
 {
-    Sequence< Reference<XIdlClass> >    aIdlClasses;
-    Reference<XPropertySetInfo>         xPropInfo;
-    Reference<XIdlClass>                xImplClass;
-    sal_Int32                           nHitCount;
+    Sequence< Reference<XIdlClass> >	aIdlClasses;
+    Reference<XPropertySetInfo>			xPropInfo;
+    Reference<XIdlClass>				xImplClass;
+    sal_Int32							nHitCount;
 
-    void    IncHitCount() const { ((hashIntrospectionKey_Impl*)this)->nHitCount++; }
+    void	IncHitCount() const { ((hashIntrospectionKey_Impl*)this)->nHitCount++; }
     hashIntrospectionKey_Impl() : nHitCount( 0 ) {}
-    hashIntrospectionKey_Impl( const Sequence< Reference<XIdlClass> > & rIdlClasses,
+    hashIntrospectionKey_Impl( const Sequence< Reference<XIdlClass> > & rIdlClasses, 
                                         const Reference<XPropertySetInfo> & rxPropInfo,
                                         const Reference<XIdlClass> & rxImplClass );
 };
 
 hashIntrospectionKey_Impl::hashIntrospectionKey_Impl
 (
-    const Sequence< Reference<XIdlClass> > & rIdlClasses,
+    const Sequence< Reference<XIdlClass> > & rIdlClasses, 
     const Reference<XPropertySetInfo> & rxPropInfo,
-    const Reference<XIdlClass> & rxImplClass
+    const Reference<XIdlClass> & rxImplClass 
 )
         : aIdlClasses( rIdlClasses )
         , xPropInfo( rxPropInfo )
@@ -1585,7 +1585,7 @@ public:
          IntrospectionAccessCacheMap::iterator stop = this->end();
          while( iter != stop )
          {
-
+    
             (*iter).second->release();
             (*iter).second = NULL;
             iter++;
@@ -1597,18 +1597,18 @@ public:
 // For XTypeProvider
 struct hashTypeProviderKey_Impl
 {
-    Reference<XPropertySetInfo>         xPropInfo;
-    Sequence< sal_Int8 >                maImpIdSeq;
-    sal_Int32                           nHitCount;
+    Reference<XPropertySetInfo>			xPropInfo;
+    Sequence< sal_Int8 >				maImpIdSeq;
+    sal_Int32							nHitCount;
 
-    void    IncHitCount() const { ((hashTypeProviderKey_Impl*)this)->nHitCount++; }
+    void	IncHitCount() const { ((hashTypeProviderKey_Impl*)this)->nHitCount++; }
     hashTypeProviderKey_Impl() : nHitCount( 0 ) {}
     hashTypeProviderKey_Impl( const Reference<XPropertySetInfo> & rxPropInfo, const Sequence< sal_Int8 > & aImpIdSeq_ );
 };
 
 hashTypeProviderKey_Impl::hashTypeProviderKey_Impl
-(
-    const Reference<XPropertySetInfo> & rxPropInfo,
+( 
+    const Reference<XPropertySetInfo> & rxPropInfo, 
     const Sequence< sal_Int8 > & aImpIdSeq_
 )
     : xPropInfo( rxPropInfo )
@@ -1700,14 +1700,14 @@ public:
 
 struct OIntrospectionMutex
 {
-    Mutex                           m_mutex;
+    Mutex							m_mutex;
 };
 
 class ImplIntrospection : public XIntrospection
                         , public XServiceInfo
                         , public OIntrospectionMutex
                         , public OComponentHelper
-{
+{	
     friend class ImplMergeIntrospection;
     friend class ImplMVCIntrospection;
 
@@ -1743,19 +1743,19 @@ public:
     ImplIntrospection( const Reference<XMultiServiceFactory> & rXSMgr );
 
     // Methoden von XInterface
-    virtual Any         SAL_CALL queryInterface( const Type& rType ) throw( RuntimeException );
-    virtual void        SAL_CALL acquire() throw() { OComponentHelper::acquire(); }
-    virtual void        SAL_CALL release() throw() { OComponentHelper::release(); }
+    virtual Any			SAL_CALL queryInterface( const Type& rType ) throw( RuntimeException );
+    virtual void		SAL_CALL acquire() throw() { OComponentHelper::acquire(); }
+    virtual void		SAL_CALL release() throw() { OComponentHelper::release(); }
 
     // XTypeProvider
-    Sequence< Type >    SAL_CALL getTypes(  ) throw( RuntimeException );
-    Sequence<sal_Int8>  SAL_CALL getImplementationId(  ) throw( RuntimeException );
+    Sequence< Type >	SAL_CALL getTypes(  ) throw( RuntimeException );
+    Sequence<sal_Int8>	SAL_CALL getImplementationId(  ) throw( RuntimeException );
 
     // XServiceInfo
-    OUString                    SAL_CALL getImplementationName() throw();
-    sal_Bool                    SAL_CALL supportsService(const OUString& ServiceName) throw();
-    Sequence< OUString >        SAL_CALL getSupportedServiceNames(void) throw();
-    static OUString SAL_CALL    getImplementationName_Static(  );
+    OUString 					SAL_CALL getImplementationName() throw();
+    sal_Bool					SAL_CALL supportsService(const OUString& ServiceName) throw();
+    Sequence< OUString > 		SAL_CALL getSupportedServiceNames(void) throw();
+    static OUString SAL_CALL	getImplementationName_Static(  );
     static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(void) throw();
 
     // Methoden von XIntrospection
@@ -1769,11 +1769,11 @@ protected:
 
 enum MethodType
 {
-    STANDARD_METHOD,            // normale Methode, kein Bezug zu Properties oder Listenern
-    GETSET_METHOD,              // gehoert zu einer get/set-Property
-    ADD_LISTENER_METHOD,        // add-Methode einer Listener-Schnittstelle
-    REMOVE_LISTENER_METHOD,     // remove-Methode einer Listener-Schnittstelle
-    INVALID_METHOD              // Methode, deren Klasse nicht beruecksichtigt wird, z.B. XPropertySet
+    STANDARD_METHOD,			// normale Methode, kein Bezug zu Properties oder Listenern
+    GETSET_METHOD,				// gehoert zu einer get/set-Property
+    ADD_LISTENER_METHOD,		// add-Methode einer Listener-Schnittstelle
+    REMOVE_LISTENER_METHOD,		// remove-Methode einer Listener-Schnittstelle
+    INVALID_METHOD				// Methode, deren Klasse nicht beruecksichtigt wird, z.B. XPropertySet
 };
 
 // Ctor
@@ -1789,9 +1789,9 @@ ImplIntrospection::ImplIntrospection( const Reference<XMultiServiceFactory> & rX
 #endif
 
     // Spezielle Klassen holen
-//  Reference< XInterface > xServiceIface = m_xSMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.CoreReflection")) );
-//  if( xServiceIface.is() )
-//      mxCoreReflection = Reference< XIdlReflection >::query( xServiceIface );
+// 	Reference< XInterface > xServiceIface = m_xSMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.CoreReflection")) );
+// 	if( xServiceIface.is() )
+// 		mxCoreReflection = Reference< XIdlReflection >::query( xServiceIface );
     Reference< XPropertySet > xProps( rXSMgr, UNO_QUERY );
     OSL_ASSERT( xProps.is() );
     if (xProps.is())
@@ -1813,7 +1813,7 @@ ImplIntrospection::ImplIntrospection( const Reference<XMultiServiceFactory> & rX
             OUString( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.reflection.theCoreReflection singleton not accessible") ),
             Reference< XInterface >() );
     }
-
+    
     mxElementAccessClass = mxCoreReflection->forName( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.container.XElementAccess")) );
     mxNameContainerClass = mxCoreReflection->forName( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.container.XNameContainer")) );
     mxNameAccessClass = mxCoreReflection->forName( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.container.XNameAccess")) );
@@ -1860,7 +1860,7 @@ Any ImplIntrospection::queryInterface( const Type & rType )
         rType,
         static_cast< XIntrospection * >( this ),
         static_cast< XServiceInfo * >( this ) ) );
-
+    
     return (aRet.hasValue() ? aRet : OComponentHelper::queryInterface( rType ));
 }
 
@@ -1904,7 +1904,7 @@ Sequence< sal_Int8 > ImplIntrospection::getImplementationId()
 // XServiceInfo
 OUString ImplIntrospection::getImplementationName() throw()
 {
-    return getImplementationName_Static();
+    return getImplementationName_Static();	
 }
 
 // XServiceInfo
@@ -1926,7 +1926,7 @@ Sequence< OUString > ImplIntrospection::getSupportedServiceNames(void) throw()
 
 //*************************************************************************
 // Helper XServiceInfo
-OUString ImplIntrospection::getImplementationName_Static(  )
+OUString ImplIntrospection::getImplementationName_Static(  ) 
 {
     return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLEMENTATION_NAME));
 }
@@ -1953,16 +1953,16 @@ Reference<XIntrospectionAccess> ImplIntrospection::inspect(const Any& aToInspect
         aToInspectObj >>= aType;
 
         Reference< XIdlClass > xIdlClass = mxCoreReflection->forName(((Type*)(aToInspectObj.getValue()))->getTypeName());
-
+        
         if ( xIdlClass.is() )
-        {
+        { 
             Any aRealInspectObj;
             aRealInspectObj <<= xIdlClass;
 
             IntrospectionAccessStatic_Impl* pStaticImpl = implInspect( aRealInspectObj );
             if( pStaticImpl )
                 xAccess = new ImplIntrospectionAccess( aRealInspectObj, pStaticImpl );
-        }
+        } 
     }
     else
     {
@@ -1970,7 +1970,7 @@ Reference<XIntrospectionAccess> ImplIntrospection::inspect(const Any& aToInspect
         if( pStaticImpl )
             xAccess = new ImplIntrospectionAccess( aToInspectObj, pStaticImpl );
     }
-
+        
     return xAccess;
 }
 
@@ -2051,9 +2051,9 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
 
 #ifdef USE_INTROSPECTION_CACHE
     // Haben wir schon eine Cache-Instanz
-    if( !mpCache )
+    if( !mpCache ) 
         mpCache = new IntrospectionAccessCacheMap;
-    if( !mpTypeProviderCache )
+    if( !mpTypeProviderCache ) 
         mpTypeProviderCache = new TypeProviderAccessCacheMap;
     IntrospectionAccessCacheMap& aCache = *mpCache;
     TypeProviderAccessCacheMap& aTPCache = *mpTypeProviderCache;
@@ -2066,13 +2066,13 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
 #endif
 
     // Pruefen: Ist schon ein passendes Access-Objekt gecached?
-    Sequence< Reference<XIdlClass> >    SupportedClassSeq;
-    Sequence< Type >                    SupportedTypesSeq;
-    Reference<XIdlClassProvider>        xClassProvider;
-    Reference<XTypeProvider>            xTypeProvider;
-    Reference<XIdlClass>                xImplClass;
-    Reference<XPropertySetInfo>         xPropSetInfo;
-    Reference<XPropertySet>             xPropSet;
+    Sequence< Reference<XIdlClass> >	SupportedClassSeq;
+    Sequence< Type >					SupportedTypesSeq;
+    Reference<XIdlClassProvider>		xClassProvider;
+    Reference<XTypeProvider>			xTypeProvider;
+    Reference<XIdlClass>				xImplClass;
+    Reference<XPropertySetInfo>			xPropSetInfo;
+    Reference<XPropertySet>				xPropSet;
 
     // Bei Interfaces XTypeProvider / XIdlClassProvider- und PropertySet-Interface anfordern
     if( eType == TypeClass_INTERFACE )
@@ -2107,7 +2107,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                     xImplClass = SupportedClassSeq.getConstArray()[0];
             }
         }
-        // #70197, fuer InvocationAdapter: Interface-Typ im Any auch ohne
+        // #70197, fuer InvocationAdapter: Interface-Typ im Any auch ohne 
         // ClassProvider unterstuetzen
         if( !xClassProvider.is() && !xTypeProvider.is() )
         {
@@ -2187,7 +2187,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
     else if( xImplClass.is() )
     {
         // cache only, if the descriptor class is set
-        hashIntrospectionKey_Impl   aKeySeq( SupportedClassSeq, xPropSetInfo, xImplClass );
+        hashIntrospectionKey_Impl	aKeySeq( SupportedClassSeq, xPropSetInfo, xImplClass );
 
         IntrospectionAccessCacheMap::iterator aIt = aCache.find( aKeySeq );
         if( aIt == aCache.end() )
@@ -2318,8 +2318,8 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                 }
                 else
                 {
-                    OSL_ENSURE( sal_False,
-                        OString( "Introspection: Property \"" ) +
+                    OSL_ENSURE( sal_False, 
+                        OString( "Introspection: Property \"" ) + 
                         OUStringToOString( aPropName, RTL_TEXTENCODING_ASCII_US ) +
                         OString( "\" found more than once in PropertySet" ) );
                 }
@@ -2332,7 +2332,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
 
         // Jetzt alle weiteren implementierten Interfaces durchgehen
         // Diese muessen durch das XIdlClassProvider-Interface geliefert werden.
-        // #70197, fuer InvocationAdapter: Interface-Typ im Any auch ohne
+        // #70197, fuer InvocationAdapter: Interface-Typ im Any auch ohne 
         // ClassProvider unterstuetzen
         //if( xClassProvider.is() )
         {
@@ -2347,8 +2347,8 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
             // (das darf nur einmal erfolgen, initial zulassen)
             sal_Bool bXInterfaceIsInvalid = sal_False;
 
-            // Flag, ob die XInterface-Methoden schon erfasst wurden. Wenn sal_True,
-            // wird bXInterfaceIsInvalid am Ende der Iface-Schleife aktiviert und
+            // Flag, ob die XInterface-Methoden schon erfasst wurden. Wenn sal_True, 
+            // wird bXInterfaceIsInvalid am Ende der Iface-Schleife aktiviert und 
             // XInterface-Methoden werden danach abgeklemmt.
             sal_Bool bFoundXInterface = sal_False;
 
@@ -2373,7 +2373,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                     {
                         const Reference<XIdlClass>& rxIfaceClass = pParamArray[j];
 
-                        // Pruefen, ob das Interface schon beruecksichtigt wurde.
+                        // Pruefen, ob das Interface schon beruecksichtigt wurde. 
                         XInterface* pIface = SAL_STATIC_CAST( XInterface*, rxIfaceClass.get() );
                         if( aCheckedInterfacesMap.count( pIface ) > 0 )
                         {
@@ -2412,8 +2412,8 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                             Type aFieldType( xPropType->getTypeClass(), xPropType->getName() );
                             rProp.Type = aFieldType;
                             FieldAccessMode eAccessMode = xField->getAccessMode();
-                            rProp.Attributes = (eAccessMode == FieldAccessMode_READONLY ||
-                                                eAccessMode == FieldAccessMode_CONST)
+                            rProp.Attributes = (eAccessMode == FieldAccessMode_READONLY || 
+                                                eAccessMode == FieldAccessMode_CONST) 
                                                 ? READONLY : 0;
 
                             // Namen in Hashtable eintragen
@@ -2424,8 +2424,8 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                             if( !( aIt == rPropNameMap.end() ) )
                             {
                                 /* TODO
-                                OSL_TRACE(
-                                    String( "Introspection: Property \"" ) +
+                                OSL_TRACE( 
+                                    String( "Introspection: Property \"" ) + 
                                     OOUStringToString( aPropName, CHARSET_SYSTEM ) +
                                     String( "\" found more than once" ) );
                                     */
@@ -2439,10 +2439,10 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                             rLowerToExactNameMap[ toLower( aPropName ) ] = aPropName;
 
                             // Field merken
-                            pAccess->checkInterfaceArraySize( pAccess->aInterfaceSeq1,
+                            pAccess->checkInterfaceArraySize( pAccess->aInterfaceSeq1, 
                                 pInterfaces1, rPropCount );
                             pInterfaces1[ rPropCount ] = xField;
-
+                        
                             // Art der Property merken
                             pMapTypeArray[ rPropCount ] = MAP_FIELD;
                             pPropertyConceptArray[ rPropCount ] = ATTRIBUTES;
@@ -2466,8 +2466,8 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
 
                         // 3. a) get/set- und Listener-Methoden suchen
 
-                        // Feld fuer Infos ueber die Methoden anlegen, damit spaeter leicht die Methoden
-                        // gefunden werden koennen, die nicht im Zusammenhang mit Properties oder Listenern
+                        // Feld fuer Infos ueber die Methoden anlegen, damit spaeter leicht die Methoden 
+                        // gefunden werden koennen, die nicht im Zusammenhang mit Properties oder Listenern 
                         // stehen. NEU: auch MethodConceptArray initialisieren
                         MethodType* pMethodTypes = new MethodType[ nSourceMethodCount ];
                         sal_Int32* pLocalMethodConcepts = new sal_Int32[ nSourceMethodCount ];
@@ -2490,7 +2490,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                             aMethName = rxMethod_i->getName();
 
                             // Methoden katalogisieren
-                            // Alle (?) Methoden von XInterface filtern, damit z.B. nicht
+                            // Alle (?) Methoden von XInterface filtern, damit z.B. nicht 
                             // vom Scripting aus aquire oder release gerufen werden kann
                             if( rxMethod_i->getDeclaringClass()->equals( mxInterfaceClass ) )
                             {
@@ -2563,8 +2563,8 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                                 if( !( aIt == rPropNameMap.end() ) )
                                 {
                                     /* TODO
-                                    OSL_TRACE(
-                                        String( "Introspection: Property \"" ) +
+                                    OSL_TRACE( 
+                                        String( "Introspection: Property \"" ) + 
                                         OOUStringToString( aPropName, CHARSET_SYSTEM ) +
                                         String( "\" found more than once" ) );
                                         */
@@ -2595,10 +2595,10 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                                 rLowerToExactNameMap[ toLower( aPropName ) ] = aPropName;
 
                                 // get-Methode merken
-                                pAccess->checkInterfaceArraySize( pAccess->aInterfaceSeq1,
+                                pAccess->checkInterfaceArraySize( pAccess->aInterfaceSeq1, 
                                     pInterfaces1, rPropCount );
                                 pInterfaces1[ rPropCount ] = rxMethod_i;
-
+                            
                                 // Art der Property merken
                                 pMapTypeArray[ rPropCount ] = MAP_GETSET;
                                 pPropertyConceptArray[ rPropCount ] = METHODS;
@@ -2656,7 +2656,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                                         rProp.Attributes &= ~READONLY;
 
                                         // set-Methode merken
-                                        pAccess->checkInterfaceArraySize( pAccess->aInterfaceSeq2,
+                                        pAccess->checkInterfaceArraySize( pAccess->aInterfaceSeq2, 
                                             pInterfaces2, rPropCount );
                                         pInterfaces2[ rPropCount ] = rxMethod_k;
                                     }
@@ -2749,7 +2749,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
 
                             // Namen besorgen
                             aMethName = rxMethod_i->getName();
-
+                            
                             // Wenn der Name zu kurz ist, wird's sowieso nichts
                             if( aMethName.getLength() <= 3 )
                                 continue;
@@ -2781,8 +2781,8 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                                 if( !( aIt == rPropNameMap.end() ) )
                                 {
                                     /* TODO:
-                                    OSL_TRACE(
-                                        String( "Introspection: Property \"" ) +
+                                    OSL_TRACE( 
+                                        String( "Introspection: Property \"" ) + 
                                         OOUStringToString( aPropName, CHARSET_SYSTEM ) +
                                         String( "\" found more than once" ) );
                                         */
@@ -2804,7 +2804,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                                 rProp.Name = aPropName;
                                 rProp.Handle = rPropCount;
                                 rProp.Type = Type( xGetRetType->getTypeClass(), xGetRetType->getName() );
-                                rProp.Attributes = 0;   // PROPERTY_WRITEONLY ???
+                                rProp.Attributes = 0;	// PROPERTY_WRITEONLY ???
 
                                 // Neuer Eintrag in die Hashtable
                                 rPropNameMap[ aPropName ] = rPropCount;
@@ -2813,7 +2813,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                                 rLowerToExactNameMap[ toLower( aPropName ) ] = aPropName;
 
                                 // set-Methode merken
-                                pAccess->checkInterfaceArraySize( pAccess->aInterfaceSeq2,
+                                pAccess->checkInterfaceArraySize( pAccess->aInterfaceSeq2, 
                                     pInterfaces2, rPropCount );
                                 pInterfaces2[ rPropCount ] = rxMethod_i;
 
@@ -2845,7 +2845,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                             {
                                 nSupportedListenerCount++;
                             }
-                        }
+                        }				
 
                         // Sequences im Access-Objekt entsprechend aufbohren
                         pAccess->maAllMethodSeq.realloc( nExportedMethodCount + iAllExportedMethod );
@@ -2880,7 +2880,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
 
                                     Reference<XIdlMethod> xExistingMethod = pDestMethods[ iHashResult ];
 
-                                    Reference< XIdlClass > xExistingMethClass =
+                                    Reference< XIdlClass > xExistingMethClass = 
                                         xExistingMethod->getDeclaringClass();
                                     Reference< XIdlClass > xNewMethClass = rxMethod->getDeclaringClass();
                                     if( xExistingMethClass->equals( xNewMethClass ) )
@@ -2919,7 +2919,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                                     const Reference<XIdlClass>& rxClass = pParamArray2[k];
 
                                     // Sind wir von einem Listener abgeleitet?
-                                    if( rxClass->equals( xEventListenerClass ) ||
+                                    if( rxClass->equals( xEventListenerClass ) || 
                                         isDerivedFrom( rxClass, xEventListenerClass ) )
                                     {
                                         xListenerClass = rxClass;
@@ -2938,7 +2938,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                             }
                         }
 
-                        // Wenn in diesem Durchlauf XInterface-Methoden
+                        // Wenn in diesem Durchlauf XInterface-Methoden 
                         // dabei waren, diese zukuenftig ignorieren
                         if( bFoundXInterface )
                             bXInterfaceIsInvalid = sal_True;
@@ -3012,12 +3012,12 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
             rProp.Handle = rPropCount;
             rProp.Type = Type( xPropType->getTypeClass(), xPropType->getName() );
             FieldAccessMode eAccessMode = xField->getAccessMode();
-            rProp.Attributes = (eAccessMode == FieldAccessMode_READONLY ||
-                                eAccessMode == FieldAccessMode_CONST)
+            rProp.Attributes = (eAccessMode == FieldAccessMode_READONLY || 
+                                eAccessMode == FieldAccessMode_CONST) 
                                 ? READONLY : 0;
 
             //FieldAccessMode eAccessMode = xField->getAccessMode();
-            //rProp.Attributes = (eAccessMode == FieldAccessMode::READONLY || eAccessMode == CONST)
+            //rProp.Attributes = (eAccessMode == FieldAccessMode::READONLY || eAccessMode == CONST) 
                 //? PropertyAttribute::READONLY : 0;
 
             // Namen in Hashtable eintragen
@@ -3027,10 +3027,10 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
             rLowerToExactNameMap[ toLower( aPropName ) ] = aPropName;
 
             // Field merken
-            pAccess->checkInterfaceArraySize( pAccess->aInterfaceSeq1,
+            pAccess->checkInterfaceArraySize( pAccess->aInterfaceSeq1, 
                 pInterfaces1, rPropCount );
             pInterfaces1[ rPropCount ] = xField;
-
+        
             // Art der Property merken
             pMapTypeArray[ rPropCount ] = MAP_FIELD;
             pPropertyConceptArray[ rPropCount ] = ATTRIBUTES;
@@ -3048,7 +3048,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
 }
 
 //*************************************************************************
-Reference< XInterface > SAL_CALL ImplIntrospection_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr )
+Reference< XInterface > SAL_CALL ImplIntrospection_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) 
     throw( RuntimeException )
 {
     Reference< XInterface > xService = (OWeakObject*)(OComponentHelper*)new ImplIntrospection( rSMgr );
@@ -3081,7 +3081,7 @@ sal_Bool SAL_CALL component_writeInfo( void *, void * pRegistryKey )
             const OUString * pArray = rSNL.getConstArray();
             for ( sal_Int32 nPos = rSNL.getLength(); nPos--; )
                 xNewKey->createKey( pArray[nPos] );
-
+            
             return sal_True;
         }
         catch (InvalidRegistryException &)
@@ -3096,7 +3096,7 @@ void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
     void * pRet = 0;
-
+    
     if (pServiceManager && rtl_str_compare( pImplName, IMPLEMENTATION_NAME ) == 0)
     {
         Reference< XSingleServiceFactory > xFactory( createOneInstanceFactory(
@@ -3104,14 +3104,14 @@ void * SAL_CALL component_getFactory(
             OUString::createFromAscii( pImplName ),
             stoc_inspect::ImplIntrospection_CreateInstance,
             stoc_inspect::ImplIntrospection::getSupportedServiceNames_Static() ) );
-
+        
         if (xFactory.is())
         {
             xFactory->acquire();
             pRet = xFactory.get();
         }
     }
-
+    
     return pRet;
 }
 }
diff --git a/stoc/source/invocation/inv.xml b/stoc/source/invocation/inv.xml
index a7b71d028f99..495b092d26f2 100644
--- a/stoc/source/invocation/inv.xml
+++ b/stoc/source/invocation/inv.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   invocation.uno  </module-name>
+    <module-name>	invocation.uno	</module-name>
     <component-description>
         <author> Daniel Boelzle </author>
-        <name>  com.sun.star.comp.stoc.Invocation   </name>
+        <name>	com.sun.star.comp.stoc.Invocation	</name>
         <description>
 You can construct Invocation objects through this factory service.
 Invoke createInstanceWithArguments() of XSingleServiceFactory
@@ -15,63 +15,63 @@ which corresponds with the object which implements this interface.
 
 There are two ways to get information about this object. First you
 can get the implemented method with XInvocation::getMethodNames()
-and the properties with XInvocation::getPropertyNames().
+and the properties with XInvocation::getPropertyNames(). 
 Second you can get, if provided, all information about the methods and the
-properties with XInvocation::getIntrospection().
-Container access is available through the XIndexContainer,
-XNameContainer and XEnumerationContainer
+properties with XInvocation::getIntrospection().  
+Container access is available through the XIndexContainer, 
+XNameContainer and XEnumerationContainer 
 (use XInterface::queryInterface).
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  C++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	C++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.script.Invocation </supported-service>
+        <supported-service>	com.sun.star.script.Invocation </supported-service>
         <service-dependency>com.sun.star.script.Converter</service-dependency>
         <service-dependency>com.sun.star.beans.Introspection</service-dependency>
         <service-dependency>com.sun.star.reflection.CoreReflection</service-dependency>
-        <type>  com.sun.star.script.XInvocation                 </type>
-        <type>  com.sun.star.script.XInvocation2                </type>
-        <type>  com.sun.star.script.InvocationInfo              </type>
-        <type>  com.sun.star.script.MemberType                  </type>
-        <type>  com.sun.star.script.XTypeConverter              </type>
-        <type>  com.sun.star.script.FailReason                  </type>
-        <type>  com.sun.star.beans.XIntrospection               </type>
-        <type>  com.sun.star.beans.XIntrospectionAccess         </type>
-        <type>  com.sun.star.beans.XPropertySet                 </type>
-        <type>  com.sun.star.beans.XFastPropertySet             </type>
-        <type>  com.sun.star.beans.XMaterialHolder              </type>
-        <type>  com.sun.star.beans.XExactName                   </type>
-        <type>  com.sun.star.beans.PropertyAttribute            </type>
-        <type>  com.sun.star.beans.PropertyConcept              </type>
-        <type>  com.sun.star.beans.MethodConcept                </type>
-        <type>  com.sun.star.lang.XEventListener                </type>
-        <type>  com.sun.star.lang.XInitialization               </type>
-        <type>  com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
-        <type>  com.sun.star.lang.XMultiComponentFactory        </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory       </type>
-        <type>  com.sun.star.registry.XRegistryKey              </type>
-        <type>  com.sun.star.uno.DeploymentException                    </type>
-        <type>  com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.XComponentContext              </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </type>
-        <type>  com.sun.star.container.XEnumerationAccess       </type>
-        <type>  com.sun.star.container.XNameContainer           </type>
-        <type>  com.sun.star.container.XIndexContainer          </type>
-        <type>  com.sun.star.reflection.XIdlReflection          </type>
-        <type>  com.sun.star.reflection.XIdlClassProvider       </type>
-        <type>  com.sun.star.reflection.XIdlClass               </type>
-        <type>  com.sun.star.reflection.XIdlArray               </type>
-        <type>  com.sun.star.reflection.FieldAccessMode         </type>
+        <type>	com.sun.star.script.XInvocation					</type>
+        <type>	com.sun.star.script.XInvocation2				</type>
+        <type>	com.sun.star.script.InvocationInfo				</type>
+        <type>	com.sun.star.script.MemberType					</type>
+        <type>	com.sun.star.script.XTypeConverter				</type>
+        <type>	com.sun.star.script.FailReason					</type>
+        <type>	com.sun.star.beans.XIntrospection				</type>
+        <type>	com.sun.star.beans.XIntrospectionAccess			</type>
+        <type>	com.sun.star.beans.XPropertySet					</type>
+        <type>	com.sun.star.beans.XFastPropertySet				</type>
+        <type>	com.sun.star.beans.XMaterialHolder				</type>
+        <type>	com.sun.star.beans.XExactName					</type>
+        <type>	com.sun.star.beans.PropertyAttribute			</type>
+        <type>	com.sun.star.beans.PropertyConcept				</type>
+        <type>	com.sun.star.beans.MethodConcept				</type>
+        <type>	com.sun.star.lang.XEventListener 		 		</type>
+        <type>	com.sun.star.lang.XInitialization 		 		</type>
+        <type>	com.sun.star.lang.XTypeProvider					</type>
+        <type>	com.sun.star.lang.XServiceInfo					</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory			</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory			</type>
+        <type>	com.sun.star.lang.XMultiComponentFactory		</type>
+        <type>	com.sun.star.lang.XSingleComponentFactory		</type>
+        <type>	com.sun.star.registry.XRegistryKey				</type>
+        <type>	com.sun.star.uno.DeploymentException					</type>
+        <type>	com.sun.star.uno.XAggregation					</type>
+        <type>	com.sun.star.uno.XWeak							</type>
+        <type>	com.sun.star.uno.XComponentContext				</type>
+        <type>	com.sun.star.uno.XWeak							</type>
+        <type>	com.sun.star.uno.TypeClass						</type>
+        <type>	com.sun.star.container.XEnumerationAccess		</type>
+        <type>	com.sun.star.container.XNameContainer			</type>
+        <type>	com.sun.star.container.XIndexContainer			</type>
+        <type>	com.sun.star.reflection.XIdlReflection			</type>
+        <type>	com.sun.star.reflection.XIdlClassProvider		</type>
+        <type>	com.sun.star.reflection.XIdlClass				</type>
+        <type>	com.sun.star.reflection.XIdlArray				</type>
+        <type>	com.sun.star.reflection.FieldAccessMode			</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper3$(COM)   </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper3$(COM)	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu3		</runtime-module-dependency>
+    <runtime-module-dependency>	sal3		</runtime-module-dependency>
 </module-description>
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index dd6779c17a5e..6218d2a2dad7 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -63,7 +63,7 @@
 #include <rtl/strbuf.hxx>
 
 #define SERVICENAME "com.sun.star.script.Invocation"
-#define IMPLNAME     "com.sun.star.comp.stoc.Invocation"
+#define IMPLNAME	 "com.sun.star.comp.stoc.Invocation"
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -131,17 +131,17 @@ class Invocation_Impl
     , public XTypeProvider
 {
 public:
-    Invocation_Impl( const Any & rAdapted, const Reference<XTypeConverter> &,
+    Invocation_Impl( const Any & rAdapted, const Reference<XTypeConverter> &, 
                                            const Reference<XIntrospection> &,
                                            const Reference<XIdlReflection> & );
     virtual ~Invocation_Impl();
 
     // XInterface
-    virtual Any         SAL_CALL queryInterface( const Type & aType) throw( RuntimeException );
-    virtual void        SAL_CALL acquire() throw() { OWeakObject::acquire(); }
-    virtual void        SAL_CALL release() throw() { OWeakObject::release(); }
-
+    virtual Any	        SAL_CALL queryInterface( const Type & aType) throw( RuntimeException );
+    virtual void		SAL_CALL acquire() throw() { OWeakObject::acquire(); }
+    virtual void		SAL_CALL release() throw() { OWeakObject::release(); }
 
+    
     // XTypeProvider
     virtual Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  )
        throw(RuntimeException);
@@ -149,59 +149,59 @@ public:
        throw( RuntimeException);
 
     // Methoden von XMaterialHolder
-    virtual Any         SAL_CALL getMaterial(void) throw(RuntimeException);
+    virtual Any			SAL_CALL getMaterial(void) throw(RuntimeException);
 
     // ? XTool
-    virtual void        SAL_CALL setMaterial( const Any& rMaterial );
-
+    virtual void		SAL_CALL setMaterial( const Any& rMaterial );
+    
     // XInvocation
     virtual Reference<XIntrospectionAccess> SAL_CALL getIntrospection(void) throw( RuntimeException );
-    virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam)
+    virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) 
         throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException );
-    virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value)
+    virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) 
         throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException );
-    virtual Any SAL_CALL getValue(const OUString& PropertyName)
+    virtual Any SAL_CALL getValue(const OUString& PropertyName) 
         throw( UnknownPropertyException, RuntimeException );
     virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw( RuntimeException );
     virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException );
 
     // XInvocation2
-    virtual Sequence< OUString > SAL_CALL getMemberNames(  )
+    virtual Sequence< OUString > SAL_CALL getMemberNames(  ) 
         throw( RuntimeException );
-    virtual Sequence< InvocationInfo > SAL_CALL getInfo(  )
+    virtual Sequence< InvocationInfo > SAL_CALL getInfo(  ) 
         throw( RuntimeException );
-    virtual InvocationInfo SAL_CALL getInfoForName( const OUString& aName, sal_Bool bExact )
+    virtual InvocationInfo SAL_CALL getInfoForName( const OUString& aName, sal_Bool bExact ) 
         throw( IllegalArgumentException, RuntimeException );
 
     // All Access and Container methods are not thread save
     // XElementAccess
     virtual Type SAL_CALL getElementType(void) throw( RuntimeException )
         { return _xElementAccess->getElementType(); }
-
+    
     virtual sal_Bool SAL_CALL hasElements(void) throw( RuntimeException )
         { return _xElementAccess->hasElements(); }
-
+    
     // XNameContainer
     virtual void SAL_CALL insertByName( const OUString& Name, const Any& Element )
         throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException )
         { _xNameContainer->insertByName( Name, Element ); }
-
+    
     virtual void SAL_CALL replaceByName( const OUString& Name, const Any& Element )
         throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException )
         { _xNameContainer->replaceByName( Name, Element ); }
-
+    
     virtual void SAL_CALL removeByName( const OUString& Name )
         throw( NoSuchElementException, WrappedTargetException, RuntimeException )
         { _xNameContainer->removeByName( Name ); }
-
+    
     // XNameAccess
     virtual Any SAL_CALL getByName( const OUString& Name )
         throw( NoSuchElementException, WrappedTargetException, RuntimeException )
         { return _xNameAccess->getByName( Name ); }
-
+    
     virtual Sequence<OUString> SAL_CALL getElementNames(void) throw( RuntimeException )
         { return _xNameAccess->getElementNames(); }
-
+    
     virtual sal_Bool SAL_CALL hasByName( const OUString& Name ) throw( RuntimeException )
         { return _xNameAccess->hasByName( Name ); }
 
@@ -209,31 +209,31 @@ public:
     virtual void SAL_CALL insertByIndex( sal_Int32 Index, const Any& Element )
         throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
         { _xIndexContainer->insertByIndex( Index, Element ); }
-
+    
     virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const Any& Element )
         throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
         { _xIndexContainer->replaceByIndex( Index, Element ); }
-
+    
     virtual void SAL_CALL removeByIndex( sal_Int32 Index )
         throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
         { _xIndexContainer->removeByIndex( Index ); }
-
+    
     // XIndexAccess
     virtual sal_Int32 SAL_CALL getCount(void) throw( RuntimeException )
         { return _xIndexAccess->getCount(); }
-
-    virtual Any SAL_CALL getByIndex( sal_Int32 Index )
+    
+    virtual Any SAL_CALL getByIndex( sal_Int32 Index ) 
         throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
         { return _xIndexAccess->getByIndex( Index ); }
-
+    
     // XEnumerationAccess
     virtual Reference<XEnumeration> SAL_CALL createEnumeration(void) throw( RuntimeException )
         { return _xEnumerationAccess->createEnumeration(); }
 
     // XExactName
     virtual OUString SAL_CALL getExactName( const OUString& rApproximateName ) throw( RuntimeException );
-
-
+        
+    
     //=====================================================================================================
 private:
     void getInfoSequenceImpl( Sequence< OUString >* pStringSeq, Sequence< InvocationInfo >* pInfoSeq );
@@ -241,27 +241,27 @@ private:
     void fillInfoForProperty( InvocationInfo& rInfo, const Property& rProp );
     void fillInfoForMethod( InvocationInfo& rInfo, const Reference< XIdlMethod > xMethod );
 
-    Reference<XTypeConverter>           xTypeConverter;
-    Reference<XIntrospection>           xIntrospection;
-    Reference<XIdlReflection>           xCoreReflection;
-
-    Any                             _aMaterial;
+    Reference<XTypeConverter>			xTypeConverter;
+    Reference<XIntrospection>			xIntrospection;
+    Reference<XIdlReflection>			xCoreReflection;
+    
+    Any								_aMaterial;
     // _xDirect and (_xIntrospectionAccess, xPropertySet) are exclusive
-    Reference<XInvocation>              _xDirect;
-    Reference<XInvocation2>             _xDirect2;
-    Reference<XPropertySet>             _xPropertySet;
-    Reference<XIntrospectionAccess>     _xIntrospectionAccess;
+    Reference<XInvocation>				_xDirect;
+    Reference<XInvocation2>				_xDirect2;
+    Reference<XPropertySet>				_xPropertySet;
+    Reference<XIntrospectionAccess>		_xIntrospectionAccess;
 
     // supplied Interfaces
-    Reference<XNameContainer>           _xNameContainer;
-    Reference<XNameAccess>              _xNameAccess;
-    Reference<XIndexContainer>          _xIndexContainer;
-    Reference<XIndexAccess>             _xIndexAccess;
-    Reference<XEnumerationAccess>       _xEnumerationAccess;
-    Reference<XElementAccess>           _xElementAccess;
+    Reference<XNameContainer>			_xNameContainer;
+    Reference<XNameAccess>				_xNameAccess;
+    Reference<XIndexContainer>			_xIndexContainer;
+    Reference<XIndexAccess>				_xIndexAccess;
+    Reference<XEnumerationAccess>		_xEnumerationAccess;
+    Reference<XElementAccess>			_xElementAccess;
 
     //
-    Reference<XExactName>               _xENDirect, _xENIntrospection, _xENNameAccess;
+    Reference<XExactName>				_xENDirect, _xENIntrospection, _xENNameAccess;
 };
 
 
@@ -272,9 +272,9 @@ private:
 //--------------------------------------------------------------------------------------------------
 Invocation_Impl::Invocation_Impl
 (
-    const Any & rAdapted,
-    const Reference<XTypeConverter> & rTC,
-    const Reference<XIntrospection> & rI,
+    const Any & rAdapted, 
+    const Reference<XTypeConverter> & rTC, 
+    const Reference<XIntrospection>	& rI,
     const Reference<XIdlReflection> & rCR
 )
     : xTypeConverter( rTC )
@@ -295,14 +295,14 @@ Invocation_Impl::~Invocation_Impl()
 //##################################################################################################
 
 
-Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType )
+Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType ) 
     throw( RuntimeException )
 {
     // PropertySet-Implementation
-    Any a = ::cppu::queryInterface( aType,
+    Any a = ::cppu::queryInterface( aType, 
                                    SAL_STATIC_CAST(XInvocation*, this),
                                    SAL_STATIC_CAST(XMaterialHolder*, this),
-                                   SAL_STATIC_CAST(XTypeProvider *,this)    );
+                                   SAL_STATIC_CAST(XTypeProvider *,this)	);
     if( a.hasValue() )
     {
         return a;
@@ -323,7 +323,7 @@ Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType )
         if( _xNameContainer.is() )
             return makeAny( Reference< XNameContainer >( SAL_STATIC_CAST(XNameContainer*, this) ) );
     }
-    else if ( aType == getCppuType( (Reference<XNameAccess>*) NULL ) )
+    else if ( aType == getCppuType( (Reference<XNameAccess>*) NULL ) ) 
     {
         if( _xNameAccess.is() )
             return makeAny( Reference< XNameAccess >( SAL_STATIC_CAST(XNameAccess*, this) ) );
@@ -406,18 +406,18 @@ void Invocation_Impl::setMaterial( const Any& rMaterial )
     if( _xDirect.is() )
     {
         // Objekt direkt befragen
-        _xElementAccess     = Reference<XElementAccess>::query( _xDirect );
+        _xElementAccess		= Reference<XElementAccess>::query( _xDirect );
         _xEnumerationAccess = Reference<XEnumerationAccess>::query( _xDirect );
-        _xIndexAccess       = Reference<XIndexAccess>::query( _xDirect );
-        _xIndexContainer    = Reference<XIndexContainer>::query( _xDirect );
-        _xNameAccess        = Reference<XNameAccess>::query( _xDirect );
-        _xNameContainer     = Reference<XNameContainer>::query( _xDirect );
-        _xENDirect          = Reference<XExactName>::query( _xDirect );
-        _xDirect2           = Reference<XInvocation2>::query( _xDirect );
-
+        _xIndexAccess		= Reference<XIndexAccess>::query( _xDirect );
+        _xIndexContainer	= Reference<XIndexContainer>::query( _xDirect );
+        _xNameAccess		= Reference<XNameAccess>::query( _xDirect );
+        _xNameContainer		= Reference<XNameContainer>::query( _xDirect );
+        _xENDirect			= Reference<XExactName>::query( _xDirect );
+        _xDirect2			= Reference<XInvocation2>::query( _xDirect );
+        
         // only once!!!
         //_xIntrospectionAccess = XIntrospectionAccessRef();
-        //_xPropertySet         = XPropertySetRef();
+        //_xPropertySet			= XPropertySetRef();
     }
     else
     {
@@ -466,13 +466,13 @@ void Invocation_Impl::setMaterial( const Any& rMaterial )
         if( !_xIntrospectionAccess.is() )
         {
             // reset
-            _xElementAccess     = XElementAccessRef();
+            _xElementAccess		= XElementAccessRef();
             _xEnumerationAccess = XEnumerationAccessRef();
-            _xIndexAccess       = XIndexAccessRef();
-            _xIndexContainer    = XIndexContainerRef();
-            _xNameAccess        = XNameAccessRef();
-            _xNameContainer     = XNameContainerRef();
-            _xPropertySet       = XPropertySetRef();
+            _xIndexAccess		= XIndexAccessRef();
+            _xIndexContainer	= XIndexContainerRef();
+            _xNameAccess		= XNameAccessRef();
+            _xNameContainer		= XNameContainerRef();
+            _xPropertySet		= XPropertySetRef();
         }
         */
     }
@@ -494,7 +494,7 @@ OUString Invocation_Impl::getExactName( const OUString& rApproximateName )
 }
 
 //--------------------------------------------------------------------------------------------------
-Reference<XIntrospectionAccess> Invocation_Impl::getIntrospection(void)
+Reference<XIntrospectionAccess>	Invocation_Impl::getIntrospection(void)
     throw( RuntimeException )
 {
     if( _xDirect.is() )
@@ -560,7 +560,7 @@ Any Invocation_Impl::getValue( const OUString& PropertyName )
     catch (Exception &)
     {
     }
-
+    
     throw UnknownPropertyException(
         OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get value ") ) + PropertyName,
         Reference< XInterface >() );
@@ -608,7 +608,7 @@ void Invocation_Impl::setValue( const OUString& PropertyName, const Any& Value )
                     throw RuntimeException(
                         OUString( RTL_CONSTASCII_USTRINGPARAM("no type converter service!") ),
                         Reference< XInterface >() );
-
+            
                 // bei Vorhandensein ersetzen, ansonsten einfuegen
                 if (_xNameContainer->hasByName( PropertyName ))
                     _xNameContainer->replaceByName( PropertyName, aConv );
@@ -652,35 +652,35 @@ Any Invocation_Impl::invoke( const OUString& FunctionName, const Sequence<Any>&
 {
     if (_xDirect.is())
         return _xDirect->invoke( FunctionName, InParams, OutIndizes, OutParams );
-
+    
     if (_xIntrospectionAccess.is())
     {
         // throw NoSuchMethodException if not exist
         Reference<XIdlMethod> xMethod = _xIntrospectionAccess->getMethod(
             FunctionName, MethodConcept::ALL ^ MethodConcept::DANGEROUS );
-
+        
         // ParameterInfos
-        Sequence<ParamInfo> aFParams        = xMethod->getParameterInfos();
-        const ParamInfo* pFParams           = aFParams.getConstArray();
-        sal_Int32 nFParamsLen               = aFParams.getLength();
+        Sequence<ParamInfo> aFParams		= xMethod->getParameterInfos();
+        const ParamInfo* pFParams			= aFParams.getConstArray();
+        sal_Int32 nFParamsLen				= aFParams.getLength();
         if (nFParamsLen != InParams.getLength())
         {
             throw IllegalArgumentException(
                 OUString( RTL_CONSTASCII_USTRINGPARAM("incorrect number of parameters passed invoking function ") ) + FunctionName,
                 (OWeakObject *) this, (sal_Int16) 1 );
         }
-
+        
         // IN Parameter
-        const Any* pInParams                = InParams.getConstArray();
-
+        const Any* pInParams				= InParams.getConstArray();
+        
         // Introspection Invoke Parameter
         Sequence<Any> aInvokeParams( nFParamsLen );
-        Any* pInvokeParams                  = aInvokeParams.getArray();
-
+        Any* pInvokeParams					= aInvokeParams.getArray();
+        
         // OUT Indizes
         OutIndizes.realloc( nFParamsLen );
-        sal_Int16* pOutIndizes              = OutIndizes.getArray();
-        sal_uInt32 nOutIndex                = 0;
+        sal_Int16* pOutIndizes				= OutIndizes.getArray();
+        sal_uInt32 nOutIndex				= 0;
 
         for ( sal_Int32 nPos = 0; nPos < nFParamsLen; ++nPos )
         {
@@ -688,18 +688,18 @@ Any Invocation_Impl::invoke( const OUString& FunctionName, const Sequence<Any>&
             {
                 const ParamInfo& rFParam = pFParams[nPos];
                 const Reference<XIdlClass>& rDestType = rFParam.aType;
-
+                
                 // is IN/INOUT parameter?
                 if (rFParam.aMode != ParamMode_OUT)
                 {
                     if (rDestType->isAssignableFrom( TypeToIdlClass( pInParams[nPos].getValueType(), xCoreReflection ) ))
                     {
-                        pInvokeParams[nPos] = pInParams[nPos];
+                        pInvokeParams[nPos]	= pInParams[nPos];
                     }
                     else if (xTypeConverter.is())
                     {
                         Type aDestType( rDestType->getTypeClass(), rDestType->getName() );
-                        pInvokeParams[nPos] = xTypeConverter->convertTo( pInParams[nPos], aDestType );
+                        pInvokeParams[nPos]	= xTypeConverter->convertTo( pInParams[nPos], aDestType );
                     }
                     else
                     {
@@ -709,19 +709,19 @@ Any Invocation_Impl::invoke( const OUString& FunctionName, const Sequence<Any>&
                         throw aExc;
                     }
                 }
-
+                
                 // is OUT/INOUT parameter?
                 if (rFParam.aMode != ParamMode_IN)
                 {
                     pOutIndizes[nOutIndex] = (sal_Int16)nPos;
                     if (rFParam.aMode == ParamMode_OUT)
-                        rDestType->createObject( pInvokeParams[nPos] );     // default init
+                        rDestType->createObject( pInvokeParams[nPos] );		// default init
                     ++nOutIndex;
                 }
             }
             catch( CannotConvertException& rExc )
             {
-                rExc.ArgumentIndex = nPos;  // optionalen Parameter Index hinzufuegen
+                rExc.ArgumentIndex = nPos;	// optionalen Parameter Index hinzufuegen
                 throw rExc;
             }
         }
@@ -731,18 +731,18 @@ Any Invocation_Impl::invoke( const OUString& FunctionName, const Sequence<Any>&
 
         // OUT Params
         OutIndizes.realloc( nOutIndex );
-        pOutIndizes        = OutIndizes.getArray();
+        pOutIndizes		   = OutIndizes.getArray();
         OutParams.realloc( nOutIndex );
         Any* pOutParams = OutParams.getArray();
-
+            
         while (nOutIndex--)
         {
             pOutParams[nOutIndex] = pInvokeParams[ pOutIndizes[nOutIndex] ];
         }
-
+            
         return aRet;
     }
-
+    
     RuntimeException aExc;
     aExc.Context = *this;
     aExc.Message = OUString( RTL_CONSTASCII_USTRINGPARAM("invocation lacking of introspection access!") );
@@ -759,7 +759,7 @@ struct MemberItem
     // Defines where the member comes from
     enum Mode { NAMEACCESS, PROPERTYSET, METHOD } eMode;
 
-    // Index to respective sequence
+    // Index to respective sequence 
     // (Index to NameAccess sequence for eMode==NAMEACCESS etc.)
     sal_Int32 nIndex;
 };
@@ -776,7 +776,7 @@ void Invocation_Impl::getInfoSequenceImpl
     //Sequence< OUString > aStrSeq;
     //if( !pStringSeq )
         //pStringSeq = &aStrSeq;
-
+    
 
     // Get all needed sequences
     Sequence<OUString> aNameAccessNames;
@@ -792,7 +792,7 @@ void Invocation_Impl::getInfoSequenceImpl
     {
         aPropertySeq = _xIntrospectionAccess->getProperties
             ( PropertyConcept::ALL - PropertyConcept::DANGEROUS );
-
+        
         aMethodSeq = _xIntrospectionAccess->getMethods
             ( MethodConcept::ALL - MethodConcept::DANGEROUS );
     }
@@ -839,7 +839,7 @@ void Invocation_Impl::getInfoSequenceImpl
         rItem.nIndex = i;
     }
 
-    // Setting up result sequences
+    // Setting up result sequences 
     OUString* pRetStrings = NULL;
     if( pStringSeq )
     {
@@ -882,7 +882,7 @@ void Invocation_Impl::getInfoSequenceImpl
 }
 
 // XInvocation2
-Sequence< OUString > SAL_CALL Invocation_Impl::getMemberNames(  )
+Sequence< OUString > SAL_CALL Invocation_Impl::getMemberNames(  ) 
     throw( RuntimeException )
 {
     if( _xDirect2.is() )
@@ -894,7 +894,7 @@ Sequence< OUString > SAL_CALL Invocation_Impl::getMemberNames(  )
     return aRetSeq;
 }
 
-Sequence< InvocationInfo > SAL_CALL Invocation_Impl::getInfo(  )
+Sequence< InvocationInfo > SAL_CALL Invocation_Impl::getInfo(  ) 
     throw( RuntimeException )
 {
     if( _xDirect2.is() )
@@ -906,7 +906,7 @@ Sequence< InvocationInfo > SAL_CALL Invocation_Impl::getInfo(  )
     return aRetSeq;
 }
 
-InvocationInfo SAL_CALL Invocation_Impl::getInfoForName( const OUString& aName, sal_Bool bExact )
+InvocationInfo SAL_CALL Invocation_Impl::getInfoForName( const OUString& aName, sal_Bool bExact ) 
     throw( IllegalArgumentException, RuntimeException )
 {
     if( _xDirect2.is() )
@@ -959,7 +959,7 @@ InvocationInfo SAL_CALL Invocation_Impl::getInfoForName( const OUString& aName,
 // Helper functions to fill InvocationInfo for XNameAccess
 void Invocation_Impl::fillInfoForNameAccess
 (
-    InvocationInfo& rInfo,
+    InvocationInfo& rInfo, 
     const OUString& aName
 )
 {
@@ -974,9 +974,9 @@ void Invocation_Impl::fillInfoForNameAccess
 }
 
 void Invocation_Impl::fillInfoForProperty
-(
-    InvocationInfo& rInfo,
-    const Property& rProp
+( 
+    InvocationInfo& rInfo, 
+    const Property& rProp 
 )
 {
     rInfo.aName = rProp.Name;
@@ -987,7 +987,7 @@ void Invocation_Impl::fillInfoForProperty
 
 void Invocation_Impl::fillInfoForMethod
 (
-    InvocationInfo& rInfo,
+    InvocationInfo& rInfo, 
     const Reference< XIdlMethod > xMethod
 )
 {
@@ -1027,12 +1027,12 @@ Sequence< Type > SAL_CALL Invocation_Impl::getTypes(void) throw( RuntimeExceptio
         Sequence< Type > types( 4 +8 );
         Type * pTypes = types.getArray();
         sal_Int32 n = 0;
-
+        
         pTypes[ n++ ] = ::getCppuType( (Reference< XTypeProvider > const *)0 );
         pTypes[ n++ ] = ::getCppuType( (Reference< XWeak > const *)0 );
         pTypes[ n++ ] = ::getCppuType( (Reference< XInvocation > const *)0 );
         pTypes[ n++ ] = ::getCppuType( (Reference< XMaterialHolder > const *)0 );
-
+        
         // Ivocation does not support XExactName, if direct object supports
         // XInvocation, but not XExactName.
         if ((_xDirect.is() && _xENDirect.is()) ||
@@ -1071,9 +1071,9 @@ Sequence< Type > SAL_CALL Invocation_Impl::getTypes(void) throw( RuntimeExceptio
         {
             pTypes[ n++ ] = ::getCppuType( (Reference< XInvocation2 > const *)0 );
         }
-
+        
         types.realloc( n );
-
+        
         // store types
         MutexGuard guard( Mutex::getGlobalMutex() );
         if (! s_pTypes)
@@ -1109,15 +1109,15 @@ class InvocationService
 public:
     InvocationService( const Reference<XComponentContext> & xCtx );
     virtual ~InvocationService();
-
+    
     // XServiceInfo
-    OUString                    SAL_CALL getImplementationName() throw( RuntimeException );
-    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw( RuntimeException );
-    Sequence< OUString >        SAL_CALL getSupportedServiceNames(void) throw( RuntimeException );
+    OUString 					SAL_CALL getImplementationName() throw( RuntimeException );
+    sal_Bool 						SAL_CALL supportsService(const OUString& ServiceName) throw( RuntimeException );
+    Sequence< OUString > 		SAL_CALL getSupportedServiceNames(void) throw( RuntimeException );
 
     // XSingleServiceFactory
-    Reference<XInterface>       SAL_CALL createInstance(void) throw( Exception, RuntimeException );
-    Reference<XInterface>       SAL_CALL createInstanceWithArguments(
+    Reference<XInterface>		SAL_CALL createInstance(void) throw( Exception, RuntimeException );
+    Reference<XInterface>		SAL_CALL createInstanceWithArguments(
         const Sequence<Any>& rArguments ) throw( Exception, RuntimeException );
 private:
     Reference<XComponentContext> mxCtx;
@@ -1154,10 +1154,10 @@ InvocationService::InvocationService( const Reference<XComponentContext> & xCtx
             Reference< XInterface >() );
     }
 //         xCoreReflection = Reference<XIdlReflection>(
-//      mxSMgr->createInstanceWithContext(
-//          OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.CoreReflection")),
-//          xCtx),
-//      UNO_QUERY);
+// 		mxSMgr->createInstanceWithContext(
+// 			OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.CoreReflection")),
+// 			xCtx),
+// 		UNO_QUERY);
 }
 
 InvocationService::~InvocationService()
@@ -1201,8 +1201,8 @@ Reference<XInterface> InvocationService::createInstanceWithArguments(
 {
     if (rArguments.getLength() == 1)
     {
-        return Reference< XInterface >
-            ( *new Invocation_Impl( *rArguments.getConstArray(),
+        return Reference< XInterface > 
+            ( *new Invocation_Impl( *rArguments.getConstArray(), 
               xTypeConverter, xIntrospection, xCoreReflection ) );
     }
     else
@@ -1214,7 +1214,7 @@ Reference<XInterface> InvocationService::createInstanceWithArguments(
 
 
 //*************************************************************************
-Reference<XInterface> SAL_CALL InvocationService_CreateInstance( const Reference<XComponentContext> & xCtx )
+Reference<XInterface> SAL_CALL InvocationService_CreateInstance( const Reference<XComponentContext> & xCtx ) 
     throw( RuntimeException )
 {
     Reference<XInterface> xService = Reference< XInterface > ( *new InvocationService( xCtx ) );
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index ecea87911b20..1bf1a6699f6e 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -185,7 +185,7 @@ struct AdapterImpl
     void invoke(
         const typelib_TypeDescription * pMemberType,
         void * pReturn, void * pArgs[], uno_Any ** ppException );
-
+    
     bool coerce_assign(
         void * pDest, typelib_TypeDescriptionReference * pType,
         uno_Any * pSource, uno_Any * pExc );
@@ -303,7 +303,7 @@ bool AdapterImpl::coerce_assign(
         (*m_pFactory->m_pConverter->pDispatcher)(
             m_pFactory->m_pConverter,
             m_pFactory->m_pConvertToTD, &ret, args, &p_exc );
-
+        
         if (p_exc) // exception occured
         {
             OSL_ASSERT(
diff --git a/stoc/source/invocation_adapterfactory/invadp.xml b/stoc/source/invocation_adapterfactory/invadp.xml
index e0585b88efe4..446389a1f29d 100644
--- a/stoc/source/invocation_adapterfactory/invadp.xml
+++ b/stoc/source/invocation_adapterfactory/invadp.xml
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   invocadapt.uno  </module-name>
+    <module-name>	invocadapt.uno	</module-name>
     <component-description>
         <author> Daniel Boelzle </author>
-        <name>  com.sun.star.comp.stoc.InvocationAdapterFactory </name>
+        <name>	com.sun.star.comp.stoc.InvocationAdapterFactory	</name>
         <description>
 You can create adapter interfaces of any given type for an invocation
 interface by using an adapter factory instance.
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  C++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	C++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.script.InvocationAdapterFactory    </supported-service>
-        <type>  com.sun.star.script.XTypeConverter      </type>
-        <type>  com.sun.star.script.XInvocationAdapterFactory       </type>
-        <type>  com.sun.star.script.XInvocationAdapterFactory2      </type>
-        <type>  com.sun.star.lang.XTypeProvider                     </type>
-        <type>  com.sun.star.lang.XServiceInfo                      </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory             </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory              </type>
-        <type>  com.sun.star.registry.XSimpleRegistry               </type>
-        <type>  com.sun.star.registry.XRegistryKey                  </type>
-        <type>  com.sun.star.uno.XAggregation                       </type>
-        <type>  com.sun.star.uno.XComponentContext          </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory       </type>
-        <type>  com.sun.star.uno.XWeak                              </type>
-        <type>  com.sun.star.uno.TypeClass                          </type>
-        <type>  com.sun.star.container.XEnumerationAccess           </type>
-        <type>  com.sun.star.container.XNameContainer               </type>
-        <type>  com.sun.star.container.XIndexContainer              </type>
-        <type>  com.sun.star.reflection.InvocationTargetException   </type>
+        <supported-service>	com.sun.star.script.InvocationAdapterFactory	</supported-service>
+        <type>	com.sun.star.script.XTypeConverter		</type>
+        <type>	com.sun.star.script.XInvocationAdapterFactory		</type>
+        <type>	com.sun.star.script.XInvocationAdapterFactory2		</type>
+        <type>	com.sun.star.lang.XTypeProvider						</type>
+        <type>	com.sun.star.lang.XServiceInfo						</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory				</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory				</type>
+        <type>	com.sun.star.registry.XSimpleRegistry				</type>
+        <type>	com.sun.star.registry.XRegistryKey					</type>
+        <type>	com.sun.star.uno.XAggregation						</type>
+        <type>	com.sun.star.uno.XComponentContext			</type>
+        <type>	com.sun.star.lang.XSingleComponentFactory		</type>
+        <type>	com.sun.star.uno.XWeak								</type>
+        <type>	com.sun.star.uno.TypeClass							</type>
+        <type>	com.sun.star.container.XEnumerationAccess			</type>
+        <type>	com.sun.star.container.XNameContainer				</type>
+        <type>	com.sun.star.container.XIndexContainer				</type>
+        <type>	com.sun.star.reflection.InvocationTargetException	</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper3$(COM)   </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper3$(COM)	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu3		</runtime-module-dependency>
+    <runtime-module-dependency>	sal3		</runtime-module-dependency>
 </module-description>
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index a68538fa63d3..b575887fd28f 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -102,7 +102,7 @@ static Sequence< OUString > loader_getSupportedServiceNames()
     }
     return *pNames;
 }
-
+    
 static OUString loader_getImplementationName()
 {
     static OUString *pImplName = 0;
@@ -123,18 +123,18 @@ class JavaComponentLoader : public WeakImplHelper2<XImplementationLoader, XServi
 {
     css::uno::Reference<XComponentContext> m_xComponentContext;
     /** Do not use m_javaLoader directly. Instead use getJavaLoader.
-     */
+     */ 
     css::uno::Reference<XImplementationLoader> m_javaLoader;
     /** The retured Reference contains a null pointer if the office is not configured
         to run java.
-
+        
         @exception com::sun::star::uno::RuntimeException
         If the Java implementation of the loader could not be obtained, for reasons other
         then that java was not configured the RuntimeException is thrown.
      */
     const css::uno::Reference<XImplementationLoader> & getJavaLoader();
-
-
+    
+    
 public:
     JavaComponentLoader(const css::uno::Reference<XComponentContext> & xCtx)
         throw(RuntimeException);
@@ -165,7 +165,7 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL
 
     if (m_javaLoader.is())
         return m_javaLoader;
-
+    
     uno_Environment * pJava_environment = NULL;
     uno_Environment * pUno_environment = NULL;
     typelib_InterfaceTypeDescription * pType_XImplementationLoader = 0;
@@ -339,7 +339,7 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL
 
 JavaComponentLoader::JavaComponentLoader(const css::uno::Reference<XComponentContext> & xCtx) throw(RuntimeException) :
     m_xComponentContext(xCtx)
-
+    
 {
 
 }
@@ -352,8 +352,8 @@ JavaComponentLoader::~JavaComponentLoader() throw()
 OUString SAL_CALL JavaComponentLoader::getImplementationName()
     throw(::com::sun::star::uno::RuntimeException)
 {
-    return loader_getImplementationName();
-}
+    return loader_getImplementationName();	
+}	
 
 sal_Bool SAL_CALL JavaComponentLoader::supportsService(const OUString & ServiceName)
     throw(::com::sun::star::uno::RuntimeException)
@@ -366,7 +366,7 @@ sal_Bool SAL_CALL JavaComponentLoader::supportsService(const OUString & ServiceN
         bSupport = pArray[i] == ServiceName;
 
     return bSupport;
-}
+}	
 
 Sequence<OUString> SAL_CALL JavaComponentLoader::getSupportedServiceNames()
     throw(::com::sun::star::uno::RuntimeException)
@@ -422,7 +422,7 @@ static Mutex & getInitMutex()
 css::uno::Reference<XInterface> SAL_CALL JavaComponentLoader_CreateInstance(const css::uno::Reference<XComponentContext> & xCtx) throw(Exception)
 {
     css::uno::Reference<XInterface> xRet;
-
+    
     try {
         MutexGuard guard( getInitMutex() );
         // The javaloader is never destroyed and there can be only one!
@@ -443,7 +443,7 @@ css::uno::Reference<XInterface> SAL_CALL JavaComponentLoader_CreateInstance(cons
         osl_trace("javaloader - could not init javaloader cause of %s", message.getStr());
         throw;
     }
-
+    
     return xRet;
 }
 
diff --git a/stoc/source/javaloader/javaloader.xml b/stoc/source/javaloader/javaloader.xml
index fffddb4459c4..eb632f59edba 100644
--- a/stoc/source/javaloader/javaloader.xml
+++ b/stoc/source/javaloader/javaloader.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   javaloader.uno  </module-name>
+    <module-name>	javaloader.uno	</module-name>
     <component-description>
         <author> Kay Ramme </author>
-        <name>  com.sun.star.comp.stoc.JavaComponentLoader  </name>
+        <name>	com.sun.star.comp.stoc.JavaComponentLoader	</name>
         <description> ... </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.loader.Java    </supported-service>
-        <supported-service> com.sun.star.loader.Java2   </supported-service>
+        <supported-service>	com.sun.star.loader.Java	</supported-service>
+        <supported-service>	com.sun.star.loader.Java2	</supported-service>
         <service-dependency> ... </service-dependency>
 
-        <type>  com.sun.star.java.XJavaVM                   </type>
-        <type>  com.sun.star.lang.IllegalArgumentException  </type>
-        <type>  com.sun.star.lang.XInitialization           </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory      </type>
-        <type>  com.sun.star.lang.XServiceInfo              </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory     </type>
-        <type>  com.sun.star.lang.XTypeProvider             </type>
+        <type>	com.sun.star.java.XJavaVM					</type>
+        <type>	com.sun.star.lang.IllegalArgumentException	</type>
+        <type>	com.sun.star.lang.XInitialization			</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory		</type>
+        <type>	com.sun.star.lang.XServiceInfo				</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory		</type>
+        <type>	com.sun.star.lang.XTypeProvider				</type>
         <type>  com.sun.star.lang.XMultiComponentFactory    </type>
         <type>  com.sun.star.lang.XSingleComponentFactory   </type>
-        <type>  com.sun.star.loader.XImplementationLoader   </type>
-        <type>  com.sun.star.registry.XRegistryKey          </type>
-        <type>  com.sun.star.uno.TypeClass                  </type>
-        <type>  com.sun.star.uno.XAggregation               </type>
-        <type>  com.sun.star.uno.XWeak                      </type>
+        <type>	com.sun.star.loader.XImplementationLoader	</type>
+        <type>	com.sun.star.registry.XRegistryKey			</type>
+        <type>	com.sun.star.uno.TypeClass					</type>
+        <type>	com.sun.star.uno.XAggregation				</type>
+        <type>	com.sun.star.uno.XWeak						</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <project-build-dependency>  jvmaccess   </project-build-dependency>
-    <runtime-module-dependency> cppuhelper3$(COM)   </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
-    <runtime-module-dependency> jvmaccess3$(COM) </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <project-build-dependency>	jvmaccess	</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper3$(COM)	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu3		</runtime-module-dependency>
+    <runtime-module-dependency>	sal3		</runtime-module-dependency>
+    <runtime-module-dependency>	jvmaccess3$(COM) </runtime-module-dependency>
 </module-description>
diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx
index 4aac812a1b00..b8992cd85878 100644
--- a/stoc/source/javavm/interact.cxx
+++ b/stoc/source/javavm/interact.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/javavm/interact.hxx b/stoc/source/javavm/interact.hxx
index 7acd68f9c28d..fe9f79672a1f 100644
--- a/stoc/source/javavm/interact.hxx
+++ b/stoc/source/javavm/interact.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 2822dbc2a812..c19f2868d2cf 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -105,7 +105,7 @@
 #endif
 #define TIMEZONE "MEZ"
 #else
-#define INI_FILE "java.ini"
+#define	INI_FILE "java.ini"
 #define DEF_JAVALIB "jvm.dll"
 #define TIMEZONE "MET"
 #endif
@@ -317,7 +317,7 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm,
     xConfRegistry_simple->open(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Inet")), sal_True, sal_False);
     css::uno::Reference<css::registry::XRegistryKey> xRegistryRootKey = xConfRegistry_simple->getRootKey();
 
-//  if ooInetProxyType is not 0 then read the settings
+//	if ooInetProxyType is not 0 then read the settings
     css::uno::Reference<css::registry::XRegistryKey> proxyEnable= xRegistryRootKey->openKey(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Settings/ooInetProxyType")));
     if( proxyEnable.is() && 0 != proxyEnable->getLongValue())
     {
@@ -389,7 +389,7 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm,
         }
 
         // read socks settings
-/*      Reference<XRegistryKey> socksProxy_name = xRegistryRootKey->openKey(OUSTR("Settings/ooInetSOCKSProxyName"));
+/*		Reference<XRegistryKey> socksProxy_name = xRegistryRootKey->openKey(OUSTR("Settings/ooInetSOCKSProxyName"));
         if (socksProxy_name.is() && httpProxy_name->getStringValue().getLength()) {
             OUString socksHost = OUSTR("socksProxyHost=");
             socksHost += socksProxy_name->getStringValue();
@@ -404,7 +404,7 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm,
                 pjvm->pushProp(socksPort);
             }
         }
-*/  }
+*/	}
     xConfRegistry_simple->close();
 }
 
@@ -575,7 +575,7 @@ void initVMConfiguration(
         (void) exception; // unused
 #endif
     }
-
+    
     try
     {
         getJavaPropsFromSafetySettings(&jvm, xSMgr, xCtx);
@@ -810,7 +810,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
         {
             rtl::OString sOption = rtl::OUStringToOString(
                 *i, osl_getThreadTextEncoding());
-
+            
             if (!sOption.matchIgnoreAsciiCase(sJavaOption, 0))
                 arPropStrings[index]= rtl::OString("-D") + sOption;
             else
@@ -841,8 +841,8 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
             }
             else if (errFind == JFW_E_NO_JAVA_FOUND)
             {
-
-                //Warning MessageBox:
+                
+                //Warning MessageBox: 
                 //%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task.
                 //Please install a JRE and restart %PRODUCTNAME.
                 css::java::JavaNotFoundException exc(
@@ -865,7 +865,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
         }
         case JFW_E_INVALID_SETTINGS:
         {
-            //Warning MessageBox:
+            //Warning MessageBox: 
             // The %PRODUCTNAME configuration has been changed. Under Tools
             // - Options - %PRODUCTNAME - Java, select the Java runtime environment
             // you want to have used by %PRODUCTNAME.
@@ -976,7 +976,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
             // TODO this is done too late; changes to the configuration done
             // after the above call to initVMConfiguration are lost
             registerConfigChangesListener();
-
+            
             break;
         }
     }
diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx
index 0a2df2442f1f..78782c2d7bf0 100644
--- a/stoc/source/javavm/javavm.hxx
+++ b/stoc/source/javavm/javavm.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/javavm/jen.xml b/stoc/source/javavm/jen.xml
index 29ceb09db110..42d8db92fd5c 100644
--- a/stoc/source/javavm/jen.xml
+++ b/stoc/source/javavm/jen.xml
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   javavm.uno  </module-name>
+    <module-name>	javavm.uno	</module-name>
     <component-description>
         <author> Kay Ramme </author>
-        <name>  com.sun.star.comp.stoc.JavaVirtualMachine   </name>
+        <name>	com.sun.star.comp.stoc.JavaVirtualMachine	</name>
         <description>
 The Java VM service manages the creation of java vms.
 It takes a look at the UNO runtime and tries to find a java environment.
 If an java environment already exists, no new vm is created, instead
 the existing vm given back.
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.java.JavaVirtualMachine    </supported-service>
+        <supported-service>	com.sun.star.java.JavaVirtualMachine	</supported-service>
         <service-dependency> ... </service-dependency>
         <type>com.sun.star.beans.NamedValue</type>
         <type>com.sun.star.java.XJavaThreadRegister_11</type>
         <type>com.sun.star.uri/ExternalUriReferenceTranslator</type>
         <type>com.sun.star.util.XMacroExpander</type>
-        <type>  com.sun.star.java.XJavaVM                       </type>
-        <type>  com.sun.star.java.XJavaVM                       </type>
-        <type>  com.sun.star.container.XNameAccess              </type>
+        <type>	com.sun.star.java.XJavaVM	 		 			</type>
+        <type>	com.sun.star.java.XJavaVM	 		 			</type>
+        <type>	com.sun.star.container.XNameAccess	 			</type>
     <type>  com.sun.star.container.XContainer  </type>
     <type>  com.sun.star.container.XContainerListener  </type>
-        <type>  com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
+        <type>	com.sun.star.lang.XTypeProvider					</type>
+        <type>	com.sun.star.lang.XServiceInfo					</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory			</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory			</type>
     <type>  com.sun.star.lang.XComponent  </type>
     <type>  com.sun.star.lang.WrappedTargetRuntimeException  </type>
     <type>  com.sun.star.lang.DisposedException  </type>
     <type>  com.sun.star.lang.IllegalArgumentException  </type>
     <type>  com.sun.star.lang.XInitialization  </type>
-        <type>  com.sun.star.registry.XSimpleRegistry           </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory                   </type>
-        <type>  com.sun.star.uno.XComponentContext                  </type>
-        <type>  com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </type>
-        <type>  com.sun.star.uno.XCurrentContext </type>
+        <type>	com.sun.star.registry.XSimpleRegistry			</type>
+        <type>	com.sun.star.lang.XSingleComponentFactory					</type>
+        <type>	com.sun.star.uno.XComponentContext					</type>
+        <type>	com.sun.star.uno.XAggregation					</type>
+        <type>	com.sun.star.uno.XWeak							</type>
+        <type>	com.sun.star.uno.TypeClass						</type>
+        <type>	com.sun.star.uno.XCurrentContext </type>
     <type>  com.sun.star.beans.PropertyValue  </type>
     <type>  com.sun.star.task.XInteractionHandler  </type>
     <type>  com.sun.star.task.XInteractionRequest  </type>
@@ -55,16 +55,16 @@ the existing vm given back.
     <type>  com.sun.star.java.JavaVMCreationFailureException  </type>
     <type>  com.sun.star.container.XNameAccess </type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  tools       </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	tools		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
     <project-build-dependency>  jvmaccess   </project-build-dependency>
     <project-build-dependency>  salhelper   </project-build-dependency>
-    <runtime-module-dependency> cppuhelper3$(COM)   </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> tl(COM)     </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
+    <runtime-module-dependency>	cppuhelper3$(COM)	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu3		</runtime-module-dependency>
+    <runtime-module-dependency>	tl(COM)		</runtime-module-dependency>
+    <runtime-module-dependency>	sal3		</runtime-module-dependency>
     <runtime-module-dependency> jvmaccess3$(COM) </runtime-module-dependency>
     <runtime-module-dependency> salhelper3$(COM) </runtime-module-dependency>
 </module-description>
diff --git a/stoc/source/javavm/jvmargs.cxx b/stoc/source/javavm/jvmargs.cxx
index 072c97f5c736..88000f2ff6d8 100644
--- a/stoc/source/javavm/jvmargs.cxx
+++ b/stoc/source/javavm/jvmargs.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@ using namespace rtl;
 
 namespace stoc_javavm {
 
-JVM::JVM() throw()//: _enabled(sal_False)
+JVM::JVM() throw()//: _enabled(sal_False)    
 {
 }
 
@@ -55,7 +55,7 @@ void JVM::pushProp(const OUString & property)
     else
     { // no '=', could be -X
         _props.push_back(property);
-    }
+    }    
 }
 
 
diff --git a/stoc/source/javavm/jvmargs.hxx b/stoc/source/javavm/jvmargs.hxx
index 36d4449f19f2..ebd1aa170597 100644
--- a/stoc/source/javavm/jvmargs.hxx
+++ b/stoc/source/javavm/jvmargs.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index 906eb63beec2..944f0cc11baa 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@
 #include <com/sun/star/registry/XRegistryKey.hpp>
 
 #define SERVICENAME "com.sun.star.loader.SharedLibrary"
-#define IMPLNAME    "com.sun.star.comp.stoc.DLLComponentLoader"
+#define IMPLNAME	"com.sun.star.comp.stoc.DLLComponentLoader"
 
 #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 
@@ -181,24 +181,24 @@ void DllComponentLoader::initialize( const ::com::sun::star::uno::Sequence< ::co
     throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
 {
     OSL_ENSURE( 0, "dllcomponentloader::initialize should not be called !" );
-//      if( aArgs.getLength() != 1 )
-//      {
-//          throw IllegalArgumentException();
-//      }
+//  	if( aArgs.getLength() != 1 )
+//  	{
+//  		throw IllegalArgumentException();
+//  	}
 
-//      Reference< XMultiServiceFactory > rServiceManager;
+//  	Reference< XMultiServiceFactory > rServiceManager;
 
-//      if( aArgs.getConstArray()[0].getValueType().getTypeClass() == TypeClass_INTERFACE )
-//      {
-//          aArgs.getConstArray()[0] >>= rServiceManager;
-//      }
+//  	if( aArgs.getConstArray()[0].getValueType().getTypeClass() == TypeClass_INTERFACE )
+//  	{
+//  		aArgs.getConstArray()[0] >>= rServiceManager;
+//  	}
 
-//      if( !rServiceManager.is() )
-//      {
-//          throw IllegalArgumentException();
-//      }
+//  	if( !rServiceManager.is() )
+//  	{
+//  		throw IllegalArgumentException();
+//  	}
 
-//      m_xSMgr = rServiceManager;
+//  	m_xSMgr = rServiceManager;
 }
 
 //==================================================================================================
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index 215e7c9180ae..34449785a652 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 
 #define SERVICENAME "com.sun.star.uno.NamingService"
-#define IMPLNAME    "com.sun.star.comp.stoc.NamingService"
+#define IMPLNAME	"com.sun.star.comp.stoc.NamingService"
 
 namespace stoc_namingservice
 {
@@ -115,8 +115,8 @@ typedef hash_map
 class NamingService_Impl
     : public WeakImplHelper2 < XServiceInfo, XNamingService >
 {
-    Mutex                               aMutex;
-    HashMap_OWString_Interface          aMap;
+    Mutex								aMutex;
+    HashMap_OWString_Interface			aMap;
 public:
     NamingService_Impl();
     ~NamingService_Impl();
diff --git a/stoc/source/namingservice/namingservice.xml b/stoc/source/namingservice/namingservice.xml
index 2b9d9365ea62..5c5fc9b77a18 100644
--- a/stoc/source/namingservice/namingservice.xml
+++ b/stoc/source/namingservice/namingservice.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   namingservice.uno   </module-name>
+    <module-name>	namingservice.uno	</module-name>
     <component-description>
         <author> Juergen Schmidt </author>
-        <name>  com.sun.star.comp.stoc.NamingService    </name>
+        <name>	com.sun.star.comp.stoc.NamingService	</name>
         <description>
 The naming service allows the registration and retrieval of objects.
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.uno.NamingService  </supported-service>
+        <supported-service>	com.sun.star.uno.NamingService	</supported-service>
         <type>com.sun.star.lang.DisposedException</type>
-        <type>  com.sun.star.lang.XComponent                    </type>
-        <type>  com.sun.star.lang.IllegalArgumentException      </type>
-        <type>  com.sun.star.lang.XInitialization               </type>
-        <type>  com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory       </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
-        <type>  com.sun.star.registry.XRegistryKey              </type>
-        <type>  com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XComponentContext          </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </type>
-        <type>  com.sun.star.uno.XNamingService                 </type>
+        <type>	com.sun.star.lang.XComponent					</type>
+        <type>	com.sun.star.lang.IllegalArgumentException		</type>
+        <type>	com.sun.star.lang.XInitialization 		  		</type>
+        <type>	com.sun.star.lang.XTypeProvider			  		</type>
+        <type>	com.sun.star.lang.XServiceInfo			  		</type>
+        <type>	com.sun.star.lang.XSingleComponentFactory  		</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory	  		</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory	  		</type>
+        <type>	com.sun.star.registry.XRegistryKey		  		</type>
+        <type>	com.sun.star.uno.XAggregation			  		</type>
+        <type>	com.sun.star.uno.XComponentContext	  		</type>
+        <type>	com.sun.star.uno.XWeak					  		</type>
+        <type>	com.sun.star.uno.TypeClass				  		</type>
+        <type>	com.sun.star.uno.XNamingService			  		</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper3$(COM)   </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper3$(COM)	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu3		</runtime-module-dependency>
+    <runtime-module-dependency>	sal3		</runtime-module-dependency>
 </module-description>
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index a0840a82c848..09e9360e59d3 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -82,14 +82,14 @@ struct FactoryImpl : public ::cppu::WeakImplHelper2< lang::XServiceInfo,
     Environment m_cpp_env;
     Mapping m_uno2cpp;
     Mapping m_cpp2uno;
-
+    
     UnoInterfaceReference binuno_queryInterface(
         UnoInterfaceReference const & unoI,
         typelib_InterfaceTypeDescription * pTypeDescr );
-
+    
     FactoryImpl();
     virtual ~FactoryImpl();
-
+    
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName()
         throw (RuntimeException);
@@ -97,7 +97,7 @@ struct FactoryImpl : public ::cppu::WeakImplHelper2< lang::XServiceInfo,
         throw (RuntimeException);
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()
         throw (RuntimeException);
-
+    
     // XProxyFactory
     virtual Reference< XAggregation > SAL_CALL createProxy(
         Reference< XInterface > const & xTarget )
@@ -134,13 +134,13 @@ UnoInterfaceReference FactoryImpl::binuno_queryInterface(
     {
         OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
     }
-
+    
     void * args[ 1 ];
     args[ 0 ] = &reinterpret_cast< typelib_TypeDescription * >(
         pTypeDescr )->pWeakRef;
     uno_Any ret_val, exc_space;
     uno_Any * exc = &exc_space;
-
+    
     unoI.dispatch( s_pQITD, &ret_val, args, &exc );
 
     if (exc == 0)
@@ -184,13 +184,13 @@ struct ProxyRoot : public ::cppu::OWeakAggObject
     // XAggregation
     virtual Any SAL_CALL queryAggregation( Type const & rType )
         throw (RuntimeException);
-
+    
     virtual ~ProxyRoot();
     inline ProxyRoot( ::rtl::Reference< FactoryImpl > const & factory,
                       Reference< XInterface > const & xTarget );
-
+    
     ::rtl::Reference< FactoryImpl > m_factory;
-
+    
 private:
     UnoInterfaceReference m_target;
 };
@@ -203,7 +203,7 @@ struct binuno_Proxy : public uno_Interface
     UnoInterfaceReference m_target;
     OUString m_oid;
     TypeDescription m_typeDescr;
-
+    
     inline binuno_Proxy(
         ::rtl::Reference< ProxyRoot > const & root,
         UnoInterfaceReference const & target,
@@ -357,7 +357,7 @@ Any ProxyRoot::queryAggregation( Type const & rType )
             OUString oid;
             (*cpp_env->getObjectIdentifier)( cpp_env, &oid.pData, xRoot.get() );
             OSL_ASSERT( oid.getLength() > 0 );
-
+            
             (*cpp_env->getRegisteredInterface)(
                 cpp_env, reinterpret_cast< void ** >( &xProxy ),
                 oid.pData, reinterpret_cast<
@@ -376,7 +376,7 @@ Any ProxyRoot::queryAggregation( Type const & rType )
                     m_factory->m_cpp2uno.mapInterface(
                         reinterpret_cast< void ** >( &root.m_pUnoI ),
                         xRoot.get(), ::getCppuType( &xRoot ) );
-
+                    
                     UnoInterfaceReference proxy(
                         // ref count initially 1:
                         new binuno_Proxy( this, proxy_target, oid, pTypeDescr ),
@@ -389,7 +389,7 @@ Any ProxyRoot::queryAggregation( Type const & rType )
                         binuno_proxy_free, oid.pData,
                         reinterpret_cast< typelib_InterfaceTypeDescription * >(
                             pTypeDescr ) );
-
+                    
                     m_factory->m_uno2cpp.mapInterface(
                         reinterpret_cast< void ** >( &xProxy ),
                         proxy.get(), pTypeDescr );
@@ -415,25 +415,25 @@ FactoryImpl::FactoryImpl()
 {
     OUString uno = OUSTR(UNO_LB_UNO);
     OUString cpp = OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
-
+    
     uno_getEnvironment(
         reinterpret_cast< uno_Environment ** >( &m_uno_env ), uno.pData, 0 );
     OSL_ENSURE( m_uno_env.is(), "### cannot get binary uno env!" );
-
+    
     uno_getEnvironment(
         reinterpret_cast< uno_Environment ** >( &m_cpp_env ), cpp.pData, 0 );
     OSL_ENSURE( m_cpp_env.is(), "### cannot get C++ uno env!" );
-
+    
     uno_getMapping(
         reinterpret_cast< uno_Mapping ** >( &m_uno2cpp ),
         m_uno_env.get(), m_cpp_env.get(), 0 );
     OSL_ENSURE( m_uno2cpp.is(), "### cannot get bridge uno <-> C++!" );
-
+    
     uno_getMapping(
         reinterpret_cast< uno_Mapping ** >( &m_cpp2uno ),
         m_cpp_env.get(), m_uno_env.get(), 0 );
     OSL_ENSURE( m_cpp2uno.is(), "### cannot get bridge C++ <-> uno!" );
-
+    
     g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
 }
 
@@ -491,7 +491,7 @@ static Reference< XInterface > SAL_CALL proxyfac_create(
     ::osl::MutexGuard guard( ::osl::Mutex::getGlobalMutex() );
     static WeakReference < XInterface > rwInstance;
     xRet = rwInstance;
-
+    
     if (! xRet.is())
     {
         xRet = static_cast< ::cppu::OWeakObject * >(new FactoryImpl);
diff --git a/stoc/source/proxy_factory/proxyfac.xml b/stoc/source/proxy_factory/proxyfac.xml
index 57f175b70d34..0bad02b304a7 100644
--- a/stoc/source/proxy_factory/proxyfac.xml
+++ b/stoc/source/proxy_factory/proxyfac.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   proxyfac.uno    </module-name>
+    <module-name>	proxyfac.uno	</module-name>
     <component-description>
         <author> Daniel Boelzle </author>
-        <name>  com.sun.star.comp.stoc.ProxyFactory </name>
+        <name>	com.sun.star.comp.stoc.ProxyFactory	</name>
         <description>
 Specifies a factory object to create proxy objects.
 These proxy object represent a given target object and can be
 be aggregated. The proxy objects act UNO conform and do NOT provide
 original target interfaces on queryInterface() calls.
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  C++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	C++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.reflection.ProxyFactory    </supported-service>
+        <supported-service>	com.sun.star.reflection.ProxyFactory	</supported-service>
         <service-dependency> ... </service-dependency>
-        <type>  com.sun.star.lang.XTypeProvider                     </type>
-        <type>  com.sun.star.lang.XServiceInfo                      </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory             </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory              </type>
-        <type>  com.sun.star.registry.XSimpleRegistry               </type>
-        <type>  com.sun.star.registry.XRegistryKey                  </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory </type>
-        <type>  com.sun.star.uno.XComponentContext        </type>
-        <type>  com.sun.star.uno.XAggregation                       </type>
-        <type>  com.sun.star.uno.XWeak                              </type>
-        <type>  com.sun.star.reflection.XProxyFactory   </type>
+        <type>	com.sun.star.lang.XTypeProvider						</type>
+        <type>	com.sun.star.lang.XServiceInfo						</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory				</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory				</type>
+        <type>	com.sun.star.registry.XSimpleRegistry				</type>
+        <type>	com.sun.star.registry.XRegistryKey					</type>
+        <type>	com.sun.star.lang.XSingleComponentFactory </type>
+        <type>	com.sun.star.uno.XComponentContext        </type>
+        <type>	com.sun.star.uno.XAggregation						</type>
+        <type>	com.sun.star.uno.XWeak								</type>
+        <type>	com.sun.star.reflection.XProxyFactory	</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper2$(COM)   </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper2$(COM)	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu2		</runtime-module-dependency>
+    <runtime-module-dependency>	sal2		</runtime-module-dependency>
 </module-description>
diff --git a/stoc/source/registry_tdprovider/base.hxx b/stoc/source/registry_tdprovider/base.hxx
index 669bae858d10..23c420bb3e43 100644
--- a/stoc/source/registry_tdprovider/base.hxx
+++ b/stoc/source/registry_tdprovider/base.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -177,8 +177,8 @@ inline Any getRTValue( const RTConstValue & rVal )
 //==================================================================================================
 class TypeDescriptionImpl : public WeakImplHelper1< XTypeDescription >
 {
-    TypeClass           _eTypeClass;
-    OUString            _aName;
+    TypeClass			_eTypeClass;
+    OUString			_aName;
 
 public:
     TypeDescriptionImpl( TypeClass eTypeClass, const OUString & rName )
@@ -199,17 +199,17 @@ class InterfaceTypeDescriptionImpl:
     public WeakImplHelper2< XInterfaceTypeDescription2, XPublished >
 {
     com::sun::star::uno::Reference< XHierarchicalNameAccess >  _xTDMgr;
-    Sequence< sal_Int8 >                  _aBytes;
+    Sequence< sal_Int8 >				  _aBytes;
 
-    OUString                              _aName;
+    OUString							  _aName;
 
-    Sequence< OUString >                  _aBaseTypes;
+    Sequence< OUString >				  _aBaseTypes;
     Sequence< com::sun::star::uno::Reference< XTypeDescription > > _xBaseTDs;
-    Sequence< OUString >                  _aOptionalBaseTypes;
+    Sequence< OUString >				  _aOptionalBaseTypes;
     Sequence< com::sun::star::uno::Reference< XTypeDescription > >
     _xOptionalBaseTDs;
 
-    sal_Int32                             _nBaseOffset;
+    sal_Int32							  _nBaseOffset;
     Sequence<
         com::sun::star::uno::Reference< XInterfaceMemberTypeDescription > >
     _members;
@@ -258,15 +258,15 @@ class CompoundTypeDescriptionImpl:
     public WeakImplHelper2< XCompoundTypeDescription, XPublished >
 {
     com::sun::star::uno::Reference< XHierarchicalNameAccess >  _xTDMgr;
-    TypeClass                             _eTypeClass;
-    Sequence< sal_Int8 >                  _aBytes;
-    OUString                              _aName;
+    TypeClass							  _eTypeClass;
+    Sequence< sal_Int8 >				  _aBytes;
+    OUString							  _aName;
 
-    OUString                              _aBaseType;
-    com::sun::star::uno::Reference< XTypeDescription >        _xBaseTD;
+    OUString							  _aBaseType;
+    com::sun::star::uno::Reference< XTypeDescription >		  _xBaseTD;
 
     Sequence< com::sun::star::uno::Reference< XTypeDescription > > * _pMembers;
-    Sequence< OUString > *                _pMemberNames;
+    Sequence< OUString > *				  _pMemberNames;
 
     bool _published;
 
@@ -312,13 +312,13 @@ class EnumTypeDescriptionImpl:
     public WeakImplHelper2< XEnumTypeDescription, XPublished >
 {
     com::sun::star::uno::Reference< XHierarchicalNameAccess >  _xTDMgr;
-    Sequence< sal_Int8 >                  _aBytes;
+    Sequence< sal_Int8 >				  _aBytes;
 
-    OUString                              _aName;
-    sal_Int32                             _nDefaultValue;
+    OUString							  _aName;
+    sal_Int32							  _nDefaultValue;
 
-    Sequence< OUString > *                _pEnumNames;
-    Sequence< sal_Int32 > *               _pEnumValues;
+    Sequence< OUString > *				  _pEnumNames;
+    Sequence< sal_Int32 > *				  _pEnumValues;
 
     bool _published;
 
@@ -359,9 +359,9 @@ class TypedefTypeDescriptionImpl:
     public WeakImplHelper2< XIndirectTypeDescription, XPublished >
 {
     com::sun::star::uno::Reference< XHierarchicalNameAccess > _xTDMgr;
-    OUString                              _aName;
+    OUString							  _aName;
 
-    OUString                              _aRefName;
+    OUString							  _aRefName;
     com::sun::star::uno::Reference< XTypeDescription > _xRefTD;
 
     bool _published;
diff --git a/stoc/source/registry_tdprovider/functiondescription.cxx b/stoc/source/registry_tdprovider/functiondescription.cxx
index 01af60d9b988..99a070f77328 100644
--- a/stoc/source/registry_tdprovider/functiondescription.cxx
+++ b/stoc/source/registry_tdprovider/functiondescription.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/registry_tdprovider/functiondescription.hxx b/stoc/source/registry_tdprovider/functiondescription.hxx
index 1ecb88b945c0..6b7d890af399 100644
--- a/stoc/source/registry_tdprovider/functiondescription.hxx
+++ b/stoc/source/registry_tdprovider/functiondescription.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/registry_tdprovider/methoddescription.cxx b/stoc/source/registry_tdprovider/methoddescription.cxx
index 7914a82a6781..9852d86d75e3 100644
--- a/stoc/source/registry_tdprovider/methoddescription.cxx
+++ b/stoc/source/registry_tdprovider/methoddescription.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/registry_tdprovider/methoddescription.hxx b/stoc/source/registry_tdprovider/methoddescription.hxx
index c2f5b452901d..f8f7c9d50fd2 100644
--- a/stoc/source/registry_tdprovider/methoddescription.hxx
+++ b/stoc/source/registry_tdprovider/methoddescription.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx
index 3cb4ebbf82dc..ab0c58625237 100644
--- a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx
+++ b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx
index b255e5ef06d7..1d489ba7e43b 100644
--- a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx
+++ b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/registry_tdprovider/structtypedescription.cxx b/stoc/source/registry_tdprovider/structtypedescription.cxx
index 1da060386245..b553ca4720c7 100644
--- a/stoc/source/registry_tdprovider/structtypedescription.cxx
+++ b/stoc/source/registry_tdprovider/structtypedescription.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/registry_tdprovider/structtypedescription.hxx b/stoc/source/registry_tdprovider/structtypedescription.hxx
index 268f67a8fdb1..a0c91bd81d7e 100644
--- a/stoc/source/registry_tdprovider/structtypedescription.hxx
+++ b/stoc/source/registry_tdprovider/structtypedescription.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/registry_tdprovider/td.cxx b/stoc/source/registry_tdprovider/td.cxx
index b532cbeb1282..1adb6d6d768d 100644
--- a/stoc/source/registry_tdprovider/td.cxx
+++ b/stoc/source/registry_tdprovider/td.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -61,7 +61,7 @@ TypeDescriptionImpl::~TypeDescriptionImpl()
 {
     g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
 }
-
+    
 // XTypeDescription
 //__________________________________________________________________________________________________
 TypeClass TypeDescriptionImpl::getTypeClass()
diff --git a/stoc/source/registry_tdprovider/tdcomp.cxx b/stoc/source/registry_tdprovider/tdcomp.cxx
index 1ab3dda91334..f0b8cec96922 100644
--- a/stoc/source/registry_tdprovider/tdcomp.cxx
+++ b/stoc/source/registry_tdprovider/tdcomp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -80,7 +80,7 @@ Reference< XTypeDescription > CompoundTypeDescriptionImpl::getBaseType()
         {
         }
         // never try again, if no base td was found
-        _aBaseType = OUString();
+        _aBaseType = OUString();        
     }
     return _xBaseTD;
 }
@@ -112,12 +112,12 @@ Sequence< Reference< XTypeDescription > > CompoundTypeDescriptionImpl::getMember
         typereg::Reader aReader(
             _aBytes.getConstArray(), _aBytes.getLength(), false,
             TYPEREG_VERSION_1);
-
+        
         sal_uInt16 nFields = aReader.getFieldCount();
         Sequence< Reference< XTypeDescription > > * pTempMembers =
             new Sequence< Reference< XTypeDescription > >( nFields );
         Reference< XTypeDescription > * pMembers = pTempMembers->getArray();
-
+        
         while (nFields--)
         {
             if ((aReader.getFieldFlags(nFields) & RT_ACCESS_PARAMETERIZED_TYPE)
@@ -135,7 +135,7 @@ Sequence< Reference< XTypeDescription > > CompoundTypeDescriptionImpl::getMember
                     pMembers[nFields].is(), "### compound member unknown!");
             }
         }
-
+        
         ClearableMutexGuard aGuard( getMutex() );
         if (_pMembers)
         {
@@ -147,7 +147,7 @@ Sequence< Reference< XTypeDescription > > CompoundTypeDescriptionImpl::getMember
             _pMembers = pTempMembers;
         }
     }
-
+    
     return *_pMembers;
 }
 //__________________________________________________________________________________________________
@@ -159,16 +159,16 @@ Sequence< OUString > CompoundTypeDescriptionImpl::getMemberNames()
         typereg::Reader aReader(
             _aBytes.getConstArray(), _aBytes.getLength(), false,
             TYPEREG_VERSION_1);
-
+        
         sal_uInt16 nFields = aReader.getFieldCount();
         Sequence< OUString > * pTempMemberNames = new Sequence< OUString >( nFields );
         OUString * pMemberNames = pTempMemberNames->getArray();
-
+        
         while (nFields--)
         {
             pMemberNames[nFields] = aReader.getFieldName( nFields );
         }
-
+        
         ClearableMutexGuard aGuard( getMutex() );
         if (_pMemberNames)
         {
diff --git a/stoc/source/registry_tdprovider/tdconsts.cxx b/stoc/source/registry_tdprovider/tdconsts.cxx
index aef656417ead..55eb066c6d1c 100644
--- a/stoc/source/registry_tdprovider/tdconsts.cxx
+++ b/stoc/source/registry_tdprovider/tdconsts.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/registry_tdprovider/tdef.cxx b/stoc/source/registry_tdprovider/tdef.cxx
index c4f7f865de31..3b537e547cc5 100644
--- a/stoc/source/registry_tdprovider/tdef.cxx
+++ b/stoc/source/registry_tdprovider/tdef.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ TypedefTypeDescriptionImpl::~TypedefTypeDescriptionImpl()
 {
     g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
 }
-
+    
 // XTypeDescription
 //__________________________________________________________________________________________________
 TypeClass TypedefTypeDescriptionImpl::getTypeClass()
diff --git a/stoc/source/registry_tdprovider/tdenum.cxx b/stoc/source/registry_tdprovider/tdenum.cxx
index 22ad592f5d8c..87500fee3405 100644
--- a/stoc/source/registry_tdprovider/tdenum.cxx
+++ b/stoc/source/registry_tdprovider/tdenum.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -74,16 +74,16 @@ Sequence< OUString > EnumTypeDescriptionImpl::getEnumNames()
         typereg::Reader aReader(
             _aBytes.getConstArray(), _aBytes.getLength(), false,
             TYPEREG_VERSION_1);
-
+        
         sal_uInt16 nFields = aReader.getFieldCount();
         Sequence< OUString > * pTempEnumNames = new Sequence< OUString >( nFields );
         OUString * pEnumNames = pTempEnumNames->getArray();
-
+        
         while (nFields--)
         {
             pEnumNames[nFields] = aReader.getFieldName( nFields );
         }
-
+        
         ClearableMutexGuard aGuard( getMutex() );
         if (_pEnumNames)
         {
@@ -106,17 +106,17 @@ Sequence< sal_Int32 > EnumTypeDescriptionImpl::getEnumValues()
         typereg::Reader aReader(
             _aBytes.getConstArray(), _aBytes.getLength(), false,
             TYPEREG_VERSION_1);
-
+        
         sal_uInt16 nFields = aReader.getFieldCount();
         Sequence< sal_Int32 > * pTempEnumValues = new Sequence< sal_Int32 >( nFields );
         sal_Int32 * pEnumValues = pTempEnumValues->getArray();
-
+        
         while (nFields--)
         {
             pEnumValues[nFields] = getRTValueAsInt32(
                 aReader.getFieldValue( nFields ) );
         }
-
+        
         ClearableMutexGuard aGuard( getMutex() );
         if (_pEnumValues)
         {
diff --git a/stoc/source/registry_tdprovider/tdiface.cxx b/stoc/source/registry_tdprovider/tdiface.cxx
index 9018867b281a..3a9d89173bde 100644
--- a/stoc/source/registry_tdprovider/tdiface.cxx
+++ b/stoc/source/registry_tdprovider/tdiface.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,15 +55,15 @@ class InterfaceMethodImpl : public WeakImplHelper1< XInterfaceMethodTypeDescript
     stoc::registry_tdprovider::MethodDescription _desc;
 
     Reference< XHierarchicalNameAccess >  _xTDMgr;
-
-    OUString                              _aTypeName;
-
-    OUString                              _aReturnType;
-    Reference< XTypeDescription >         _xReturnTD;
-
-    sal_Bool                              _bIsOneWay;
-    sal_Int32                             _nPosition;
-
+    
+    OUString							  _aTypeName;
+    
+    OUString							  _aReturnType;
+    Reference< XTypeDescription >		  _xReturnTD;
+    
+    sal_Bool							  _bIsOneWay;
+    sal_Int32							  _nPosition;
+    
 public:
     InterfaceMethodImpl( const Reference< XHierarchicalNameAccess > & xTDMgr,
                          const OUString & rTypeName,
@@ -83,11 +83,11 @@ public:
             g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
         }
     virtual ~InterfaceMethodImpl();
-
+    
     // XTypeDescription
     virtual TypeClass SAL_CALL getTypeClass() throw(::com::sun::star::uno::RuntimeException);
     virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
-
+    
     // XInterfaceMemberTypeDescription
     virtual OUString SAL_CALL getMemberName() throw(::com::sun::star::uno::RuntimeException)
     { return _desc.getName(); }
@@ -193,20 +193,20 @@ Sequence<Reference<XTypeDescription > > InterfaceMethodImpl::getExceptions()
 class InterfaceAttributeImpl : public WeakImplHelper1< XInterfaceAttributeTypeDescription2 >
 {
     Reference< XHierarchicalNameAccess >  _xTDMgr;
-
-    OUString                              _aTypeName;
-    OUString                              _aMemberName;
-
-    OUString                              _aMemberTypeName;
-    Reference< XTypeDescription >         _xMemberTD;
-
-    sal_Bool                              _bReadOnly;
-    sal_Bool                              _bBound;
-    sal_Int32                             _nPosition;
+    
+    OUString							  _aTypeName;
+    OUString							  _aMemberName;
+    
+    OUString							  _aMemberTypeName;
+    Reference< XTypeDescription >		  _xMemberTD;
+    
+    sal_Bool							  _bReadOnly;
+    sal_Bool							  _bBound;
+    sal_Int32							  _nPosition;
 
     std::auto_ptr< stoc::registry_tdprovider::FunctionDescription > _getter;
     std::auto_ptr< stoc::registry_tdprovider::FunctionDescription > _setter;
-
+    
 public:
     InterfaceAttributeImpl(
         const Reference< XHierarchicalNameAccess > & xTDMgr,
@@ -233,15 +233,15 @@ public:
             g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
         }
     virtual ~InterfaceAttributeImpl();
-
+    
     // XTypeDescription
     virtual TypeClass SAL_CALL getTypeClass() throw(::com::sun::star::uno::RuntimeException);
     virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
-
+    
     // XInterfaceMemberTypeDescription
     virtual OUString SAL_CALL getMemberName() throw(::com::sun::star::uno::RuntimeException);
     virtual sal_Int32 SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException);
-
+    
     // XInterfaceAttributeTypeDescription2
     virtual sal_Bool SAL_CALL isReadOnly() throw(::com::sun::star::uno::RuntimeException);
     virtual Reference< XTypeDescription > SAL_CALL getType() throw(::com::sun::star::uno::RuntimeException);
diff --git a/stoc/source/registry_tdprovider/tdmodule.cxx b/stoc/source/registry_tdprovider/tdmodule.cxx
index f187c8853415..2335df955273 100644
--- a/stoc/source/registry_tdprovider/tdmodule.cxx
+++ b/stoc/source/registry_tdprovider/tdmodule.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/registry_tdprovider/tdprop.cxx b/stoc/source/registry_tdprovider/tdprop.cxx
index c022b88fe804..c5bea55c140d 100644
--- a/stoc/source/registry_tdprovider/tdprop.cxx
+++ b/stoc/source/registry_tdprovider/tdprop.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/registry_tdprovider/tdprovider.cxx b/stoc/source/registry_tdprovider/tdprovider.cxx
index 43802388a910..fd259d3589be 100644
--- a/stoc/source/registry_tdprovider/tdprovider.cxx
+++ b/stoc/source/registry_tdprovider/tdprovider.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,7 +56,7 @@
 #include "structtypedescription.hxx"
 
 #define SERVICENAME "com.sun.star.reflection.TypeDescriptionProvider"
-#define IMPLNAME    "com.sun.star.comp.stoc.RegistryTypeDescriptionProvider"
+#define IMPLNAME	"com.sun.star.comp.stoc.RegistryTypeDescriptionProvider"
 
 using namespace com::sun::star;
 using namespace com::sun::star::beans;
diff --git a/stoc/source/registry_tdprovider/tdservice.cxx b/stoc/source/registry_tdprovider/tdservice.cxx
index bb86623280b4..3aa93d180b78 100644
--- a/stoc/source/registry_tdprovider/tdservice.cxx
+++ b/stoc/source/registry_tdprovider/tdservice.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/registry_tdprovider/tdsingleton.cxx b/stoc/source/registry_tdprovider/tdsingleton.cxx
index cda20dd67232..3e70d06b7787 100644
--- a/stoc/source/registry_tdprovider/tdsingleton.cxx
+++ b/stoc/source/registry_tdprovider/tdsingleton.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index e6da746cb837..a63510deeb39 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -92,21 +92,21 @@ class acc_Intersection
     : public WeakImplHelper1< security::XAccessControlContext >
 {
     Reference< security::XAccessControlContext > m_x1, m_x2;
-
+    
     inline acc_Intersection(
         Reference< security::XAccessControlContext > const & x1,
         Reference< security::XAccessControlContext > const & x2 )
         SAL_THROW( () );
-
+    
 public:
     virtual ~acc_Intersection()
         SAL_THROW( () );
-
+    
     static inline Reference< security::XAccessControlContext > create(
         Reference< security::XAccessControlContext > const & x1,
         Reference< security::XAccessControlContext > const & x2 )
         SAL_THROW( () );
-
+    
     // XAccessControlContext impl
     virtual void SAL_CALL checkPermission(
         Any const & perm )
@@ -155,21 +155,21 @@ class acc_Union
     : public WeakImplHelper1< security::XAccessControlContext >
 {
     Reference< security::XAccessControlContext > m_x1, m_x2;
-
+    
     inline acc_Union(
         Reference< security::XAccessControlContext > const & x1,
         Reference< security::XAccessControlContext > const & x2 )
         SAL_THROW( () );
-
+    
 public:
     virtual ~acc_Union()
         SAL_THROW( () );
-
+    
     static inline Reference< security::XAccessControlContext > create(
         Reference< security::XAccessControlContext > const & x1,
         Reference< security::XAccessControlContext > const & x2 )
         SAL_THROW( () );
-
+    
     // XAccessControlContext impl
     virtual void SAL_CALL checkPermission(
         Any const & perm )
@@ -224,14 +224,14 @@ class acc_Policy
     : public WeakImplHelper1< security::XAccessControlContext >
 {
     PermissionCollection m_permissions;
-
+    
 public:
     inline acc_Policy(
         PermissionCollection const & permissions )
         SAL_THROW( () );
     virtual ~acc_Policy()
         SAL_THROW( () );
-
+    
     // XAccessControlContext impl
     virtual void SAL_CALL checkPermission(
         Any const & perm )
@@ -265,23 +265,23 @@ class acc_CurrentContext
     : public ImplHelper1< XCurrentContext >
 {
     oslInterlockedCount m_refcount;
-
+    
     Reference< XCurrentContext > m_xDelegate;
     Any m_restriction;
-
+    
 public:
     inline acc_CurrentContext(
         Reference< XCurrentContext > const & xDelegate,
         Reference< security::XAccessControlContext > const & xRestriction )
         SAL_THROW( () );
     virtual ~acc_CurrentContext() SAL_THROW( () );
-
+    
     // XInterface impl
     virtual void SAL_CALL acquire()
         throw ();
     virtual void SAL_CALL release()
         throw ();
-
+    
     // XCurrentContext impl
     virtual Any SAL_CALL getValueByName( OUString const & name )
         throw (RuntimeException);
@@ -295,7 +295,7 @@ inline acc_CurrentContext::acc_CurrentContext(
     , m_xDelegate( xDelegate )
 {
     g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
-
+    
     if (xRestriction.is())
     {
         m_restriction = makeAny( xRestriction );
@@ -407,14 +407,14 @@ class AccessController
     , public t_helper
 {
     Reference< XComponentContext > m_xComponentContext;
-
+    
     Reference< security::XPolicy > m_xPolicy;
     Reference< security::XPolicy > const & getPolicy()
         SAL_THROW( (RuntimeException) );
-
+    
     // mode
     enum Mode { OFF, ON, DYNAMIC_ONLY, SINGLE_USER, SINGLE_DEFAULT_USER } m_mode;
-
+    
     PermissionCollection m_defaultPermissions;
     // for single-user mode
     PermissionCollection m_singleUserPermissions;
@@ -424,31 +424,31 @@ class AccessController
     // for multi-user mode
     lru_cache< OUString, PermissionCollection, ::rtl::OUStringHash, equal_to< OUString > >
         m_user2permissions;
-
+    
     ThreadData m_rec;
     typedef vector< pair< OUString, Any > > t_rec_vec;
     inline void clearPostPoned() SAL_THROW( () );
     void checkAndClearPostPoned() SAL_THROW( (RuntimeException) );
-
+    
     PermissionCollection getEffectivePermissions(
         Reference< XCurrentContext > const & xContext,
         Any const & demanded_perm )
         SAL_THROW( (RuntimeException) );
-
+    
 protected:
     virtual void SAL_CALL disposing();
-
+    
 public:
     AccessController( Reference< XComponentContext > const & xComponentContext )
         SAL_THROW( (RuntimeException) );
     virtual ~AccessController()
         SAL_THROW( () );
-
+    
     //  XInitialization impl
     virtual void SAL_CALL initialize(
         Sequence< Any > const & arguments )
         throw (Exception);
-
+    
     // XAccessController impl
     virtual void SAL_CALL checkPermission(
         Any const & perm )
@@ -463,7 +463,7 @@ public:
         throw (Exception);
     virtual Reference< security::XAccessControlContext > SAL_CALL getContext()
         throw (RuntimeException);
-
+    
     // XServiceInfo impl
     virtual OUString SAL_CALL getImplementationName()
         throw (RuntimeException);
@@ -483,7 +483,7 @@ AccessController::AccessController( Reference< XComponentContext > const & xComp
     , m_rec( 0 )
 {
     g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
-
+    
     OUString mode;
     if (m_xComponentContext->getValueByName( OUSTR("/services/" SERVICE_NAME "/mode") ) >>= mode)
     {
@@ -517,7 +517,7 @@ AccessController::AccessController( Reference< XComponentContext > const & xComp
             m_mode = SINGLE_DEFAULT_USER;
         }
     }
-
+    
     // switch on caching for DYNAMIC_ONLY and ON (sharable multi-user process)
     if (ON == m_mode || DYNAMIC_ONLY == m_mode)
     {
@@ -559,7 +559,7 @@ void AccessController::initialize(
     {
         throw RuntimeException(
             OUSTR("invalid call: ac must be in \"single-user\" mode!"), (OWeakObject *)this );
-    }
+    }    
     OUString userId;
     arguments[ 0 ] >>= userId;
     if (! userId.getLength())
@@ -707,7 +707,7 @@ PermissionCollection AccessController::getEffectivePermissions(
     SAL_THROW( (RuntimeException) )
 {
     OUString userId;
-
+    
     switch (m_mode)
     {
     case SINGLE_USER:
@@ -734,7 +734,7 @@ PermissionCollection AccessController::getEffectivePermissions(
             throw SecurityException(
                 OUSTR("cannot determine current user in multi-user ac!"), (OWeakObject *)this );
         }
-
+        
         // lookup policy for user
         MutexGuard guard( m_mutex );
         PermissionCollection const * pPermissions = m_user2permissions.lookup( userId );
@@ -746,7 +746,7 @@ PermissionCollection AccessController::getEffectivePermissions(
         OSL_ENSURE( 0, "### this should never be called in this ac mode!" );
         return PermissionCollection();
     }
-
+    
     // call on policy
     // iff this is a recurring call for the default user, then grant all permissions
     t_rec_vec * rec = reinterpret_cast< t_rec_vec * >( m_rec.getData() );
@@ -773,7 +773,7 @@ PermissionCollection AccessController::getEffectivePermissions(
         rec = new t_rec_vec;
         m_rec.setData( rec );
     }
-
+    
     try // calls on API
     {
         // init default permissions
@@ -792,9 +792,9 @@ PermissionCollection AccessController::getEffectivePermissions(
             dumpPermissions( m_defaultPermissions );
 #endif
         }
-
+        
         PermissionCollection ret;
-
+        
         // init user permissions
         switch (m_mode)
         {
@@ -842,7 +842,7 @@ PermissionCollection AccessController::getEffectivePermissions(
         default:
             break;
         }
-
+        
         // check postponed
         checkAndClearPostPoned();
         return ret;
@@ -890,10 +890,10 @@ void AccessController::checkPermission(
         throw lang::DisposedException(
             OUSTR("checkPermission() call on disposed AccessController!"), (OWeakObject *)this );
     }
-
+    
     if (OFF == m_mode)
         return;
-
+    
     // first dynamic check of ac contexts
     Reference< XCurrentContext > xContext;
     ::uno_getCurrentContext( (void **)&xContext, s_envType.pData, 0 );
@@ -902,10 +902,10 @@ void AccessController::checkPermission(
     {
         xACC->checkPermission( perm );
     }
-
+    
     if (DYNAMIC_ONLY == m_mode)
         return;
-
+    
     // then static check
     getEffectivePermissions( xContext, perm ).checkPermission( perm );
 }
@@ -920,15 +920,15 @@ Any AccessController::doRestricted(
         throw lang::DisposedException(
             OUSTR("doRestricted() call on disposed AccessController!"), (OWeakObject *)this );
     }
-
+    
     if (OFF == m_mode) // optimize this way, because no dynamic check will be performed
         return xAction->run();
-
+    
     if (xRestriction.is())
     {
         Reference< XCurrentContext > xContext;
         ::uno_getCurrentContext( (void **)&xContext, s_envType.pData, 0 );
-
+        
         // override restriction
         Reference< XCurrentContext > xNewContext(
             new acc_CurrentContext( xContext, acc_Intersection::create(
@@ -953,18 +953,18 @@ Any AccessController::doPrivileged(
         throw lang::DisposedException(
             OUSTR("doPrivileged() call on disposed AccessController!"), (OWeakObject *)this );
     }
-
+    
     if (OFF == m_mode) // no dynamic check will be performed
     {
         return xAction->run();
     }
-
+    
     Reference< XCurrentContext > xContext;
     ::uno_getCurrentContext( (void **)&xContext, s_envType.pData, 0 );
-
+    
     Reference< security::XAccessControlContext > xOldRestr(
         getDynamicRestriction( xContext ) );
-
+    
     if (xOldRestr.is()) // previous restriction
     {
         // override restriction
@@ -988,15 +988,15 @@ Reference< security::XAccessControlContext > AccessController::getContext()
         throw lang::DisposedException(
             OUSTR("getContext() call on disposed AccessController!"), (OWeakObject *)this );
     }
-
+    
     if (OFF == m_mode) // optimize this way, because no dynamic check will be performed
     {
         return new acc_Policy( PermissionCollection( new AllPermission() ) );
     }
-
+    
     Reference< XCurrentContext > xContext;
     ::uno_getCurrentContext( (void **)&xContext, s_envType.pData, 0 );
-
+    
     return acc_Intersection::create(
         getDynamicRestriction( xContext ),
         new acc_Policy( getEffectivePermissions( xContext, Any() ) ) );
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index 8639b10ff23b..ce669b622b20 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -91,21 +91,21 @@ class FilePolicy
 {
     Reference< XComponentContext > m_xComponentContext;
     AccessControl m_ac;
-
+    
     Sequence< Any > m_defaultPermissions;
     typedef std::hash_map< OUString, Sequence< Any >, OUStringHash > t_permissions;
     t_permissions m_userPermissions;
     bool m_init;
-
+    
 protected:
     virtual void SAL_CALL disposing();
-
+    
 public:
     FilePolicy( Reference< XComponentContext > const & xComponentContext )
         SAL_THROW( () );
     virtual ~FilePolicy()
         SAL_THROW( () );
-
+    
     // XPolicy impl
     virtual Sequence< Any > SAL_CALL getPermissions(
         OUString const & userId )
@@ -114,7 +114,7 @@ public:
         throw (RuntimeException);
     virtual void SAL_CALL refresh()
         throw (RuntimeException);
-
+    
     // XServiceInfo impl
     virtual OUString SAL_CALL getImplementationName()
         throw (RuntimeException);
@@ -157,7 +157,7 @@ Sequence< Any > FilePolicy::getPermissions(
         refresh();
         m_init = true;
     }
-
+    
     MutexGuard guard( m_mutex );
     t_permissions::iterator iFind( m_userPermissions.find( userId ) );
     if (m_userPermissions.end() == iFind)
@@ -178,7 +178,7 @@ Sequence< Any > FilePolicy::getDefaultPermissions()
         refresh();
         m_init = true;
     }
-
+    
     MutexGuard guard( m_mutex );
     return m_defaultPermissions;
 }
@@ -188,34 +188,34 @@ class PolicyReader
 {
     OUString m_fileName;
     oslFileHandle m_file;
-
+    
     sal_Int32 m_linepos;
     ByteSequence m_line;
     sal_Int32 m_pos;
     sal_Unicode m_back;
-
+    
     sal_Unicode get()
         SAL_THROW( (RuntimeException) );
     inline void back( sal_Unicode c ) SAL_THROW( () )
         { m_back = c; }
-
+    
     inline bool isWhiteSpace( sal_Unicode c ) SAL_THROW( () )
         { return (' ' == c || '\t' == c || '\n' == c || '\r' == c); }
     void skipWhiteSpace()
         SAL_THROW( (RuntimeException) );
-
+    
     inline bool isCharToken( sal_Unicode c ) SAL_THROW( () )
         { return (';' == c || ',' == c || '{' == c || '}' == c); }
-
+    
 public:
     PolicyReader( OUString const & file, AccessControl & ac )
         SAL_THROW( (RuntimeException) );
     ~PolicyReader()
         SAL_THROW( () );
-
+    
     void error( OUString const & msg )
         SAL_THROW( (RuntimeException) );
-
+    
     OUString getToken()
         SAL_THROW( (RuntimeException) );
     OUString assureToken()
@@ -303,7 +303,7 @@ void PolicyReader::skipWhiteSpace()
         c = get();
     }
     while (isWhiteSpace( c )); // seeking next non-whitespace char
-
+    
     if ('/' == c) // C/C++ like comment
     {
         c = get();
@@ -349,7 +349,7 @@ void PolicyReader::skipWhiteSpace()
         while ('\n' != c && '\0' != c); // seek eol/eof
         skipWhiteSpace(); // cont skip on next line
     }
-
+    
     else // is token char
     {
         back( c );
@@ -378,7 +378,7 @@ sal_Unicode PolicyReader::get()
             error( OUSTR("checking eof failed!") );
         if (eof)
             return '\0';
-
+        
         rc = ::osl_readLine( m_file, reinterpret_cast< sal_Sequence ** >( &m_line ) );
         if (osl_File_E_None != rc)
             error( OUSTR("read line failed!") );
@@ -460,13 +460,13 @@ void FilePolicy::refresh()
             OUSTR("name of policy file unknown!"),
             (OWeakObject *)this );
     }
-
+    
     PolicyReader reader( fileName, m_ac );
-
+    
     // fill these two
     Sequence< Any > defaultPermissions;
     t_permissions userPermissions;
-
+    
     OUString token( reader.getToken() );
     while (token.getLength())
     {
@@ -487,7 +487,7 @@ void FilePolicy::refresh()
         {
             if (! token.equals( s_permission ))
                 reader.error( OUSTR("expected >permission< or closing brace >}<!") );
-
+            
             token = reader.assureToken(); // permission type
             Any perm;
             if (token.equals( s_filePermission )) // FilePermission
@@ -496,7 +496,7 @@ void FilePolicy::refresh()
                 reader.assureToken( ',' );
                 OUString actions( reader.assureQuotedToken() );
                 perm <<= io::FilePermission( url, actions );
-            }
+            }            
             else if (token.equals( s_socketPermission )) // SocketPermission
             {
                 OUString host( reader.assureQuotedToken() );
@@ -517,9 +517,9 @@ void FilePolicy::refresh()
             {
                 reader.error( OUSTR("expected permission type!") );
             }
-
+            
             reader.assureToken( ';' );
-
+            
             // insert
             if (userId.getLength())
             {
@@ -535,14 +535,14 @@ void FilePolicy::refresh()
                 defaultPermissions.realloc( len +1 );
                 defaultPermissions[ len ] = perm;
             }
-
+            
             token = reader.assureToken(); // next permissions token
         }
-
+        
         reader.assureToken( ';' ); // semi
         token = reader.getToken(); // next grant token
     }
-
+    
     // assign new ones
     MutexGuard guard( m_mutex );
     m_defaultPermissions = defaultPermissions;
diff --git a/stoc/source/security/lru_cache.h b/stoc/source/security/lru_cache.h
index a03a1a3e50f3..3e2269cb04bb 100644
--- a/stoc/source/security/lru_cache.h
+++ b/stoc/source/security/lru_cache.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,53 +57,53 @@ class lru_cache
     typedef ::std::hash_map< t_key, Entry *, t_hashKey, t_equalKey > t_key2element;
     t_key2element m_key2element;
     ::std::size_t m_size;
-
+    
     Entry * m_block;
     mutable Entry * m_head;
     mutable Entry * m_tail;
     inline void toFront( Entry * entry ) const SAL_THROW( () );
-
+    
 public:
     /** Default Ctor.  Does not cache.
     */
     inline lru_cache() SAL_THROW( () );
     /** Ctor.
-
+        
         @param size number of elements to be cached; default param set to 128
     */
     inline lru_cache( ::std::size_t size ) SAL_THROW( () );
-
+    
     /** Destructor: releases all cached elements and keys.
     */
     inline ~lru_cache() SAL_THROW( () );
-
+    
     /** Retrieves a pointer to value in cache.  Returns 0, if none was found.
-
+        
         @param key a key
         @return pointer to value or 0
     */
     inline t_val const * lookup( t_key const & key ) const SAL_THROW( () );
-
+    
     /** Sets a value to be cached for given key.
-
+        
         @param key a key
         @param val a value
     */
     inline void set( t_key const & key, t_val const & val ) SAL_THROW( () );
-
+    
     /** Tests whether a value is cached for given key.
-
+        
         @param key a key
         @return true, if value is cached
     */
     inline bool has( t_key const & key ) const SAL_THROW( () );
-
+    
     /** Clears the cache, releasing all cached elements and keys.
     */
     inline void clear() SAL_THROW( () );
-
+    
     /** Sets the number of elements to be cached.  This will clear previous entries.
-
+        
         @param cacheSize number of elements to be cached
     */
     inline void setSize( ::std::size_t size ) SAL_THROW( () );
@@ -117,7 +117,7 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::setSize(
     delete [] m_block;
     m_block = 0;
     m_size = size;
-
+    
     if (0 < m_size)
     {
         m_block = new Entry[ m_size ];
@@ -218,7 +218,7 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::set(
     if (0 < m_size)
     {
         typename t_key2element::const_iterator const iFind( m_key2element.find( key ) );
-
+        
         Entry * entry;
         if (iFind == m_key2element.end())
         {
diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx
index 23a99a1fd0da..6687dcb36aa7 100644
--- a/stoc/source/security/permissions.cxx
+++ b/stoc/source/security/permissions.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/security/permissions.h b/stoc/source/security/permissions.h
index 898759482a6e..261a854d3e6e 100644
--- a/stoc/source/security/permissions.h
+++ b/stoc/source/security/permissions.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,11 +44,11 @@ namespace stoc_sec
 //==================================================================================================
 class Permission : public ::salhelper::SimpleReferenceObject
 {
-public:
+public:    
     ::rtl::Reference< Permission > m_next;
     // mode
     enum t_type { ALL, RUNTIME, SOCKET, FILE } m_type;
-
+    
     inline Permission(
         t_type type,
         ::rtl::Reference< Permission > const & next = ::rtl::Reference< Permission >() )
@@ -56,7 +56,7 @@ public:
         : m_next( next )
         , m_type( type )
         {}
-
+    
     virtual bool implies( Permission const & perm ) const SAL_THROW( () ) = 0;
     virtual ::rtl::OUString toString() const SAL_THROW( () ) = 0;
 };
@@ -69,7 +69,7 @@ public:
         SAL_THROW( () )
         : Permission( ALL, next )
         {}
-
+    
     virtual bool implies( Permission const & ) const SAL_THROW( () );
     virtual ::rtl::OUString toString() const SAL_THROW( () );
 };
@@ -93,7 +93,7 @@ public:
         SAL_THROW( (::com::sun::star::uno::RuntimeException) );
 #ifdef __DIAGNOSE
     ::com::sun::star::uno::Sequence< ::rtl::OUString > toStrings() const SAL_THROW( () );
-#endif
+#endif    
     void checkPermission( ::com::sun::star::uno::Any const & perm ) const
         SAL_THROW( (::com::sun::star::uno::RuntimeException) );
 };
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 4d35bbd87fd0..a440c46c2625 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -307,9 +307,9 @@ public:
     Any SAL_CALL nextElement()
         throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 private:
-    Mutex                               aMutex;
-    Sequence< Reference<XInterface > >  aFactories;
-    sal_Int32                           nIt;
+    Mutex								aMutex;
+    Sequence< Reference<XInterface > >	aFactories;
+    sal_Int32							nIt;
 };
 
 // XEnumeration
@@ -402,11 +402,11 @@ public:
         throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
 private:
-    Mutex                           aMutex;
-    HashSet_Ref                     aImplementationMap;
-    HashSet_Ref::iterator           aIt;
-    sal_Int32                       nNext;
-    Reference<XInterface >          xNext;
+    Mutex							aMutex;
+    HashSet_Ref						aImplementationMap;
+    HashSet_Ref::iterator			aIt;
+    sal_Int32						nNext;
+    Reference<XInterface >			xNext;
 };
 
 ImplementationEnumeration_Impl::~ImplementationEnumeration_Impl()
@@ -587,7 +587,7 @@ public:
     virtual void SAL_CALL remove( const Any & Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
 
     // XContentEnumerationAccess
-    //Sequence< OUString >          getAvailableServiceNames() throw( (Exception) );
+    //Sequence< OUString >			getAvailableServiceNames() throw( (Exception) );
     virtual Reference<XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw(::com::sun::star::uno::RuntimeException);
     virtual Reference<XEnumeration > SAL_CALL createContentEnumeration(
         const OUString& aServiceName, Reference< XComponentContext > const & xContext )
@@ -637,13 +637,13 @@ protected:
     HashSet_Ref m_SetLoadedFactories;
 private:
 
-    Reference<XEventListener >      getFactoryListener();
+    Reference<XEventListener >		getFactoryListener();
 
 
-    HashMultimap_OWString_Interface m_ServiceMap;
-    HashSet_Ref                     m_ImplementationMap;
-    HashMap_OWString_Interface      m_ImplementationNameMap;
-    Reference<XEventListener >      xFactoryListener;
+    HashMultimap_OWString_Interface	m_ServiceMap;
+    HashSet_Ref						m_ImplementationMap;
+    HashMap_OWString_Interface		m_ImplementationNameMap;
+    Reference<XEventListener >		xFactoryListener;
     bool                            m_bInDisposing;
 };
 
@@ -753,7 +753,7 @@ public:
         { getRoot()->remove( Element ); }
 
     // XContentEnumerationAccess
-    //Sequence< OUString >          getAvailableServiceNames() throw( (Exception) );
+    //Sequence< OUString >			getAvailableServiceNames() throw( (Exception) );
     virtual Reference<XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw (RuntimeException)
         { return getRoot()->createContentEnumeration( aServiceName, m_xContext ); }
 
@@ -1194,7 +1194,7 @@ Sequence< OUString > OServiceManager::getUniqueAvailableServiceNames(
         aNameSet.insert( (*aSIt++).first );
 
     /* do not return the implementation names
-    HashMap_OWString_Interface      m_ImplementationNameMap;
+    HashMap_OWString_Interface		m_ImplementationNameMap;
     HashMap_OWString_Interface::iterator aIt = m_ImplementationNameMap.begin();
     while( aIt != m_ImplementationNameMap.end() )
         aNameSet.insert( (*aIt++).first );
@@ -1544,7 +1544,7 @@ void OServiceManager::insert( const Any & Element )
         OUString aImplName = xInfo->getImplementationName();
         if( aImplName.getLength() )
             m_ImplementationNameMap[ aImplName ] = xEle;
-
+        
         //put into the service map
         Sequence< OUString > aServiceNames = xInfo->getSupportedServiceNames();
         const OUString * pArray = aServiceNames.getConstArray();
@@ -1575,7 +1575,7 @@ void OServiceManager::remove( const Any & Element )
 {
     if (is_disposed())
         return;
-
+    
     Reference<XInterface > xEle;
     if (Element.getValueTypeClass() == TypeClass_INTERFACE)
     {
@@ -1679,7 +1679,7 @@ public:
     Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(::com::sun::star::uno::RuntimeException);
 
     // XContentEnumerationAccess
-    //Sequence< OUString >          getAvailableServiceNames() throw( (Exception) );
+    //Sequence< OUString >			getAvailableServiceNames() throw( (Exception) );
     Reference<XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw(::com::sun::star::uno::RuntimeException);
     virtual Reference<XEnumeration > SAL_CALL createContentEnumeration(
         const OUString& aServiceName, Reference< XComponentContext > const & xContext )
@@ -1699,17 +1699,17 @@ protected:
     Sequence< Reference< XInterface > > queryServiceFactories(
         const OUString& aServiceName, Reference< XComponentContext > const & xContext );
 private:
-    Reference<XRegistryKey >        getRootKey();
+    Reference<XRegistryKey >		getRootKey();
     Reference<XInterface > loadWithImplementationName(
         const OUString & rImplName, Reference< XComponentContext > const & xContext );
-    Sequence<OUString>          getFromServiceName(const OUString& serviceName);
+    Sequence<OUString>			getFromServiceName(const OUString& serviceName);
     Reference<XInterface > loadWithServiceName(
         const OUString & rImplName, Reference< XComponentContext > const & xContext );
-    void                        fillAllNamesFromRegistry( HashSet_OWString & );
+    void						fillAllNamesFromRegistry( HashSet_OWString & );
 
-    sal_Bool                    m_searchedRegistry;
-    Reference<XSimpleRegistry > m_xRegistry;    // readonly property Registry
-    Reference<XRegistryKey >    m_xRootKey;
+    sal_Bool					m_searchedRegistry;
+    Reference<XSimpleRegistry > m_xRegistry;	// readonly property Registry
+    Reference<XRegistryKey >	m_xRootKey;
 
 #if OSL_DEBUG_LEVEL > 0
     bool m_init;
@@ -1760,7 +1760,7 @@ Reference<XRegistryKey > ORegistryServiceManager::getRootKey()
     if( !m_xRootKey.is() )
     {
         MutexGuard aGuard( m_mutex );
-        //  DefaultRegistry suchen !!!!
+        //	DefaultRegistry suchen !!!!
         if( !m_xRegistry.is() && !m_searchedRegistry )
         {
             // merken, es wird nur einmal gesucht
diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx
index 6a4ec3c9d438..492547806ba9 100644
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ using namespace osl;
 using namespace rtl;
 
 #define SERVICENAME "com.sun.star.registry.SimpleRegistry"
-#define IMPLNAME    "com.sun.star.comp.stoc.SimpleRegistry"
+#define IMPLNAME	"com.sun.star.comp.stoc.SimpleRegistry"
 
 extern rtl_StandardModuleCount g_moduleCount;
 
@@ -90,7 +90,7 @@ OUString simreg_getImplementationName()
     return *pImplName;
 }
 }
-
+    
 namespace stoc_simreg {
 
 //*************************************************************************
@@ -101,10 +101,10 @@ class RegistryKeyImpl;
 //*************************************************************************
 // SimpleRegistryImpl
 //*************************************************************************
-class SimpleRegistryImpl    : public WeakImplHelper2< XSimpleRegistry, XServiceInfo >
+class SimpleRegistryImpl	: public WeakImplHelper2< XSimpleRegistry, XServiceInfo >
 {
 public:
-    SimpleRegistryImpl( const Registry& rRegistry );
+    SimpleRegistryImpl(	const Registry& rRegistry );
 
     ~SimpleRegistryImpl();
 
@@ -125,9 +125,9 @@ public:
 
     friend class RegistryKeyImpl;
 protected:
-    Mutex       m_mutex;
-    OUString    m_url;
-    Registry    m_registry;
+    Mutex		m_mutex;
+    OUString 	m_url;
+    Registry	m_registry;
 };
 
 
@@ -140,7 +140,7 @@ public:
 
     ~RegistryKeyImpl();
 
-    // XRegistryKey
+    // XRegistryKey	
     virtual OUString SAL_CALL getKeyName() throw(RuntimeException);
     virtual sal_Bool SAL_CALL isReadOnly(  ) throw(InvalidRegistryException, RuntimeException);
     virtual sal_Bool SAL_CALL isValid(  ) throw(RuntimeException);
@@ -172,10 +172,10 @@ public:
     virtual OUString SAL_CALL getResolvedName( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException);
 
 protected:
-    OUString            m_name;
-    RegistryKey         m_key;
-    SimpleRegistryImpl* m_pRegistry;
-};
+    OUString 			m_name;
+    RegistryKey			m_key;
+    SimpleRegistryImpl*	m_pRegistry;
+};	
 
 //*************************************************************************
 RegistryKeyImpl::RegistryKeyImpl( const RegistryKey& key, SimpleRegistryImpl* pRegistry )
@@ -187,7 +187,7 @@ RegistryKeyImpl::RegistryKeyImpl( const RegistryKey& key, SimpleRegistryImpl* pR
 }
 
 //*************************************************************************
-RegistryKeyImpl::RegistryKeyImpl( const OUString& rKeyName,
+RegistryKeyImpl::RegistryKeyImpl( const OUString& rKeyName, 
                                   SimpleRegistryImpl* pRegistry )
     : m_pRegistry(pRegistry)
 {
@@ -211,7 +211,7 @@ RegistryKeyImpl::RegistryKeyImpl( const OUString& rKeyName,
         {
             m_name = rKeyName;
         }
-    }
+    }		
 }
 
 //*************************************************************************
@@ -225,10 +225,10 @@ OUString SAL_CALL RegistryKeyImpl::getKeyName() throw(RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
     return m_name;
-}
+}	
 
 //*************************************************************************
-sal_Bool SAL_CALL RegistryKeyImpl::isReadOnly(  )
+sal_Bool SAL_CALL RegistryKeyImpl::isReadOnly(  ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -241,17 +241,17 @@ sal_Bool SAL_CALL RegistryKeyImpl::isReadOnly(  )
             OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
             (OWeakObject *)this );
     }
-}
+}	
 
 //*************************************************************************
 sal_Bool SAL_CALL RegistryKeyImpl::isValid(  ) throw(RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
     return m_key.isValid();
-}
+}	
 
 //*************************************************************************
-RegistryKeyType SAL_CALL RegistryKeyImpl::getKeyType( const OUString& rKeyName )
+RegistryKeyType SAL_CALL RegistryKeyImpl::getKeyType( const OUString& rKeyName ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -279,12 +279,12 @@ RegistryKeyType SAL_CALL RegistryKeyImpl::getKeyType( const OUString& rKeyName )
             OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
             (OWeakObject *)this );
     }
-
+    
     return RegistryKeyType_KEY;
-}
+}	
 
 //*************************************************************************
-RegistryValueType SAL_CALL RegistryKeyImpl::getValueType(  )
+RegistryValueType SAL_CALL RegistryKeyImpl::getValueType(  ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -295,9 +295,9 @@ RegistryValueType SAL_CALL RegistryKeyImpl::getValueType(  )
             (OWeakObject *)this );
     } else
     {
-        RegValueType    type;
-        sal_uInt32      size;
-
+        RegValueType 	type;
+        sal_uInt32		size;
+        
         if (m_key.getValueInfo(OUString(), &type, &size))
         {
             return RegistryValueType_NOT_DEFINED;
@@ -305,23 +305,23 @@ RegistryValueType SAL_CALL RegistryKeyImpl::getValueType(  )
         {
             switch (type)
             {
-                case RG_VALUETYPE_LONG:         return RegistryValueType_LONG;
-                case RG_VALUETYPE_STRING:       return RegistryValueType_ASCII;
-                case RG_VALUETYPE_UNICODE:      return RegistryValueType_STRING;
-                case RG_VALUETYPE_BINARY:       return RegistryValueType_BINARY;
-                case RG_VALUETYPE_LONGLIST:     return RegistryValueType_LONGLIST;
-                case RG_VALUETYPE_STRINGLIST:   return RegistryValueType_ASCIILIST;
-                case RG_VALUETYPE_UNICODELIST:  return RegistryValueType_STRINGLIST;
-                default:                        return RegistryValueType_NOT_DEFINED;
+                case RG_VALUETYPE_LONG:			return RegistryValueType_LONG;
+                case RG_VALUETYPE_STRING: 		return RegistryValueType_ASCII;
+                case RG_VALUETYPE_UNICODE: 		return RegistryValueType_STRING;
+                case RG_VALUETYPE_BINARY: 		return RegistryValueType_BINARY;
+                case RG_VALUETYPE_LONGLIST:		return RegistryValueType_LONGLIST;
+                case RG_VALUETYPE_STRINGLIST: 	return RegistryValueType_ASCIILIST;
+                case RG_VALUETYPE_UNICODELIST: 	return RegistryValueType_STRINGLIST;
+                default:						return RegistryValueType_NOT_DEFINED;
             }
         }
     }
-
+    
     return RegistryValueType_NOT_DEFINED;
-}
+}	
 
 //*************************************************************************
-sal_Int32 SAL_CALL RegistryKeyImpl::getLongValue(  )
+sal_Int32 SAL_CALL RegistryKeyImpl::getLongValue(  ) 
     throw(InvalidRegistryException, InvalidValueException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -332,9 +332,9 @@ sal_Int32 SAL_CALL RegistryKeyImpl::getLongValue(  )
             (OWeakObject *)this );
     } else
     {
-        RegValueType    type;
-        sal_uInt32      size;
-
+        RegValueType 	type;
+        sal_uInt32		size;
+        
         if ( !m_key.getValueInfo(OUString(), &type, &size) )
         {
             if (type == RG_VALUETYPE_LONG)
@@ -351,10 +351,10 @@ sal_Int32 SAL_CALL RegistryKeyImpl::getLongValue(  )
             OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidValueException") ),
             (OWeakObject *)this );
     }
-}
+}	
 
 //*************************************************************************
-void SAL_CALL RegistryKeyImpl::setLongValue( sal_Int32 value )
+void SAL_CALL RegistryKeyImpl::setLongValue( sal_Int32 value ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -372,10 +372,10 @@ void SAL_CALL RegistryKeyImpl::setLongValue( sal_Int32 value )
                 (OWeakObject *)this );
         }
     }
-}
+}	
 
 //*************************************************************************
-Sequence< sal_Int32 > SAL_CALL RegistryKeyImpl::getLongListValue(  )
+Sequence< sal_Int32 > SAL_CALL RegistryKeyImpl::getLongListValue(  ) 
     throw(InvalidRegistryException, InvalidValueException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -386,9 +386,9 @@ Sequence< sal_Int32 > SAL_CALL RegistryKeyImpl::getLongListValue(  )
             (OWeakObject *)this );
     } else
     {
-        RegValueType    type;
-        sal_uInt32      size;
-
+        RegValueType 	type;
+        sal_uInt32		size;
+        
         if ( !m_key.getValueInfo(OUString(), &type, &size) )
         {
             if (type == RG_VALUETYPE_LONGLIST)
@@ -397,10 +397,10 @@ Sequence< sal_Int32 > SAL_CALL RegistryKeyImpl::getLongListValue(  )
                 if ( !m_key.getLongListValue(OUString(), tmpValue) )
                 {
                     Sequence<sal_Int32> seqValue(size);
-
+                    
                     for (sal_uInt32 i=0; i < size; i++)
                     {
-                        seqValue.getArray()[i] = tmpValue.getElement(i);
+                        seqValue.getArray()[i] = tmpValue.getElement(i); 
                     }
 
                     return seqValue;
@@ -413,9 +413,9 @@ Sequence< sal_Int32 > SAL_CALL RegistryKeyImpl::getLongListValue(  )
             (OWeakObject *)this );
     }
 }
-
+    
 //*************************************************************************
-void SAL_CALL RegistryKeyImpl::setLongListValue( const Sequence< sal_Int32 >& seqValue )
+void SAL_CALL RegistryKeyImpl::setLongListValue( const Sequence< sal_Int32 >& seqValue ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -426,12 +426,12 @@ void SAL_CALL RegistryKeyImpl::setLongListValue( const Sequence< sal_Int32 >& se
             (OWeakObject *)this );
     } else
     {
-        sal_uInt32 length = seqValue.getLength();
+        sal_uInt32 length = seqValue.getLength(); 
         sal_Int32* tmpValue = new sal_Int32[length];
 
         for (sal_uInt32 i=0; i < length; i++)
         {
-            tmpValue[i] = seqValue.getConstArray()[i];
+            tmpValue[i] = seqValue.getConstArray()[i]; 
         }
 
         if ( m_key.setLongListValue(OUString(), tmpValue, length) )
@@ -443,11 +443,11 @@ void SAL_CALL RegistryKeyImpl::setLongListValue( const Sequence< sal_Int32 >& se
         }
 
         delete[] tmpValue;
-    }
-}
+    }	
+}	
 
 //*************************************************************************
-OUString SAL_CALL RegistryKeyImpl::getAsciiValue(  )
+OUString SAL_CALL RegistryKeyImpl::getAsciiValue(  ) 
     throw(InvalidRegistryException, InvalidValueException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -458,9 +458,9 @@ OUString SAL_CALL RegistryKeyImpl::getAsciiValue(  )
             (OWeakObject *)this );
     } else
     {
-        RegValueType    type;
-        sal_uInt32      size;
-
+        RegValueType 	type;
+        sal_uInt32		size;
+        
         if ( !m_key.getValueInfo(OUString(), &type, &size) )
         {
             if ( type == RG_VALUETYPE_STRING )
@@ -485,10 +485,10 @@ OUString SAL_CALL RegistryKeyImpl::getAsciiValue(  )
             OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidValueException") ),
             (OWeakObject *)this );
     }
-}
+}	
 
 //*************************************************************************
-void SAL_CALL RegistryKeyImpl::setAsciiValue( const OUString& value )
+void SAL_CALL RegistryKeyImpl::setAsciiValue( const OUString& value ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -499,9 +499,9 @@ void SAL_CALL RegistryKeyImpl::setAsciiValue( const OUString& value )
             (OWeakObject *)this );
     } else
     {
-        OString         sValue = OUStringToOString(value, RTL_TEXTENCODING_UTF8);
-        sal_uInt32  size = sValue.getLength()+1;
-        if ( m_key.setValue(OUString(), RG_VALUETYPE_STRING,
+        OString 		sValue = OUStringToOString(value, RTL_TEXTENCODING_UTF8);
+        sal_uInt32 	size = sValue.getLength()+1;
+        if ( m_key.setValue(OUString(), RG_VALUETYPE_STRING, 
                             (RegValue)(sValue.getStr()), size) )
         {
             throw InvalidValueException(
@@ -509,10 +509,10 @@ void SAL_CALL RegistryKeyImpl::setAsciiValue( const OUString& value )
                 (OWeakObject *)this );
         }
     }
-}
+}	
 
 //*************************************************************************
-Sequence< OUString > SAL_CALL RegistryKeyImpl::getAsciiListValue(  )
+Sequence< OUString > SAL_CALL RegistryKeyImpl::getAsciiListValue(  ) 
     throw(InvalidRegistryException, InvalidValueException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -523,9 +523,9 @@ Sequence< OUString > SAL_CALL RegistryKeyImpl::getAsciiListValue(  )
             (OWeakObject *)this );
     } else
     {
-        RegValueType    type;
-        sal_uInt32      size;
-
+        RegValueType 	type;
+        sal_uInt32		size;
+        
         if ( !m_key.getValueInfo(OUString(), &type, &size) )
         {
             if (type == RG_VALUETYPE_STRINGLIST)
@@ -534,26 +534,26 @@ Sequence< OUString > SAL_CALL RegistryKeyImpl::getAsciiListValue(  )
                 if ( !m_key.getStringListValue(OUString(), tmpValue) )
                 {
                     Sequence<OUString> seqValue(size);
-
+                    
                     for (sal_uInt32 i=0; i < size; i++)
                     {
-                        seqValue.getArray()[i] =
-                            OStringToOUString(tmpValue.getElement(i), RTL_TEXTENCODING_UTF8);
+                        seqValue.getArray()[i] = 
+                            OStringToOUString(tmpValue.getElement(i), RTL_TEXTENCODING_UTF8); 
                     }
 
                     return seqValue;
                 }
-            }
+            } 
         }
-
+        
         throw InvalidValueException(
             OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidValueException") ),
             (OWeakObject *)this );
     }
 }
-
+    
 //*************************************************************************
-void SAL_CALL RegistryKeyImpl::setAsciiListValue( const Sequence< OUString >& seqValue )
+void SAL_CALL RegistryKeyImpl::setAsciiListValue( const Sequence< OUString >& seqValue ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -564,14 +564,14 @@ void SAL_CALL RegistryKeyImpl::setAsciiListValue( const Sequence< OUString >& se
             (OWeakObject *)this );
     } else
     {
-        sal_uInt32  length = seqValue.getLength();
-        OString*    pSValue = new OString[length];
-        char**      tmpValue = new char*[length];
+        sal_uInt32 	length = seqValue.getLength(); 
+        OString* 	pSValue = new OString[length];
+        char** 		tmpValue = new char*[length];
 
         for (sal_uInt32 i=0; i < length; i++)
         {
             pSValue[i] = OUStringToOString(seqValue.getConstArray()[i], RTL_TEXTENCODING_UTF8);
-            tmpValue[i] = (char*)pSValue[i].getStr();
+            tmpValue[i] = (char*)pSValue[i].getStr(); 
         }
 
         if ( m_key.setStringListValue(OUString(), tmpValue, length) )
@@ -586,10 +586,10 @@ void SAL_CALL RegistryKeyImpl::setAsciiListValue( const Sequence< OUString >& se
         delete[] pSValue;
         delete[] tmpValue;
     }
-}
+}	
 
 //*************************************************************************
-OUString SAL_CALL RegistryKeyImpl::getStringValue(  )
+OUString SAL_CALL RegistryKeyImpl::getStringValue(  ) 
     throw(InvalidRegistryException, InvalidValueException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -600,9 +600,9 @@ OUString SAL_CALL RegistryKeyImpl::getStringValue(  )
             (OWeakObject *)this );
     } else
     {
-        RegValueType    type;
-        sal_uInt32      size;
-
+        RegValueType 	type;
+        sal_uInt32		size;
+        
         if ( !m_key.getValueInfo(OUString(), &type, &size) )
         {
             if (type == RG_VALUETYPE_UNICODE)
@@ -622,15 +622,15 @@ OUString SAL_CALL RegistryKeyImpl::getStringValue(  )
                 }
             }
         }
-
+        
         throw InvalidValueException(
             OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidValueException") ),
             (OWeakObject *)this );
     }
-}
+}	
 
 //*************************************************************************
-void SAL_CALL RegistryKeyImpl::setStringValue( const OUString& value )
+void SAL_CALL RegistryKeyImpl::setStringValue( const OUString& value ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -642,18 +642,18 @@ void SAL_CALL RegistryKeyImpl::setStringValue( const OUString& value )
     } else
     {
         sal_uInt32 size = (value.getLength() + 1) * sizeof(sal_Unicode);
-        if ( m_key.setValue(OUString(), RG_VALUETYPE_UNICODE,
+        if ( m_key.setValue(OUString(), RG_VALUETYPE_UNICODE, 
                             (RegValue)(value.getStr()), size) )
         {
             throw InvalidValueException(
                 OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidValueException") ),
                 (OWeakObject *)this );
         }
-    }
-}
+    }	
+}	
 
 //*************************************************************************
-Sequence< OUString > SAL_CALL RegistryKeyImpl::getStringListValue(  )
+Sequence< OUString > SAL_CALL RegistryKeyImpl::getStringListValue(  ) 
     throw(InvalidRegistryException, InvalidValueException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -664,9 +664,9 @@ Sequence< OUString > SAL_CALL RegistryKeyImpl::getStringListValue(  )
             (OWeakObject *)this );
     } else
     {
-        RegValueType    type;
-        sal_uInt32      size;
-
+        RegValueType 	type;
+        sal_uInt32		size;
+        
         if ( !m_key.getValueInfo(OUString(), &type, &size) )
         {
             if (type == RG_VALUETYPE_UNICODELIST)
@@ -675,10 +675,10 @@ Sequence< OUString > SAL_CALL RegistryKeyImpl::getStringListValue(  )
                 if ( !m_key.getUnicodeListValue(OUString(), tmpValue) )
                 {
                     Sequence<OUString> seqValue(size);
-
+                    
                     for (sal_uInt32 i=0; i < size; i++)
                     {
-                        seqValue.getArray()[i] = OUString(tmpValue.getElement(i));
+                        seqValue.getArray()[i] = OUString(tmpValue.getElement(i)); 
                     }
 
                     return seqValue;
@@ -691,9 +691,9 @@ Sequence< OUString > SAL_CALL RegistryKeyImpl::getStringListValue(  )
             (OWeakObject *)this );
     }
 }
-
+    
 //*************************************************************************
-void SAL_CALL RegistryKeyImpl::setStringListValue( const Sequence< OUString >& seqValue )
+void SAL_CALL RegistryKeyImpl::setStringListValue( const Sequence< OUString >& seqValue ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -704,12 +704,12 @@ void SAL_CALL RegistryKeyImpl::setStringListValue( const Sequence< OUString >& s
             (OWeakObject *)this );
     } else
     {
-        sal_uInt32  length = seqValue.getLength();
-        sal_Unicode**   tmpValue = new sal_Unicode*[length];
+        sal_uInt32	length = seqValue.getLength(); 
+        sal_Unicode** 	tmpValue = new sal_Unicode*[length];
 
         for (sal_uInt32 i=0; i < length; i++)
         {
-            tmpValue[i] = (sal_Unicode*)seqValue.getConstArray()[i].getStr();
+            tmpValue[i] = (sal_Unicode*)seqValue.getConstArray()[i].getStr(); 
         }
 
         if (m_key.setUnicodeListValue(OUString(), tmpValue, length))
@@ -721,11 +721,11 @@ void SAL_CALL RegistryKeyImpl::setStringListValue( const Sequence< OUString >& s
         }
 
         delete[] tmpValue;
-    }
-}
+    }	
+}	
 
 //*************************************************************************
-Sequence< sal_Int8 > SAL_CALL RegistryKeyImpl::getBinaryValue(  )
+Sequence< sal_Int8 > SAL_CALL RegistryKeyImpl::getBinaryValue(  ) 
     throw(InvalidRegistryException, InvalidValueException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -736,9 +736,9 @@ Sequence< sal_Int8 > SAL_CALL RegistryKeyImpl::getBinaryValue(  )
             (OWeakObject *)this );
     } else
     {
-        RegValueType    type;
-        sal_uInt32      size;
-
+        RegValueType 	type;
+        sal_uInt32		size;
+        
         if ( !m_key.getValueInfo(OUString(), &type, &size) )
         {
             if (type == RG_VALUETYPE_BINARY)
@@ -754,7 +754,7 @@ Sequence< sal_Int8 > SAL_CALL RegistryKeyImpl::getBinaryValue(  )
                 {
                     Sequence<sal_Int8> seqBytes(value, size);
                     delete [] value;
-                    return seqBytes;
+                    return seqBytes;				
                 }
             }
         }
@@ -763,10 +763,10 @@ Sequence< sal_Int8 > SAL_CALL RegistryKeyImpl::getBinaryValue(  )
             OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidValueException") ),
             (OWeakObject *)this );
     }
-}
+}	
 
 //*************************************************************************
-void SAL_CALL RegistryKeyImpl::setBinaryValue( const Sequence< sal_Int8 >& value )
+void SAL_CALL RegistryKeyImpl::setBinaryValue( const Sequence< sal_Int8 >& value ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -778,22 +778,22 @@ void SAL_CALL RegistryKeyImpl::setBinaryValue( const Sequence< sal_Int8 >& value
     } else
     {
         sal_uInt32 size = value.getLength();
-        if ( m_key.setValue(OUString(), RG_VALUETYPE_BINARY,
+        if ( m_key.setValue(OUString(), RG_VALUETYPE_BINARY, 
                             (RegValue)(value.getConstArray()), size) )
         {
             throw InvalidValueException(
                 OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidValueException") ),
                 (OWeakObject *)this );
         }
-    }
-}
+    }	
+}	
 
 //*************************************************************************
-Reference< XRegistryKey > SAL_CALL RegistryKeyImpl::openKey( const OUString& aKeyName )
+Reference< XRegistryKey > SAL_CALL RegistryKeyImpl::openKey( const OUString& aKeyName ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     RegistryKey newKey;
-
+    
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
     if ( !m_key.isValid() )
     {
@@ -817,15 +817,15 @@ Reference< XRegistryKey > SAL_CALL RegistryKeyImpl::openKey( const OUString& aKe
         {
             return ((XRegistryKey*)new RegistryKeyImpl(newKey, m_pRegistry));
         }
-    }
-}
+    }		
+}	
 
 //*************************************************************************
-Reference< XRegistryKey > SAL_CALL RegistryKeyImpl::createKey( const OUString& aKeyName )
+Reference< XRegistryKey > SAL_CALL RegistryKeyImpl::createKey( const OUString& aKeyName ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     RegistryKey newKey;
-
+    
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
     if ( !m_key.isValid() )
     {
@@ -843,17 +843,17 @@ Reference< XRegistryKey > SAL_CALL RegistryKeyImpl::createKey( const OUString& a
                     OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
                     (OWeakObject *)this );
             }
-
+            
             return Reference<XRegistryKey>();
         } else
         {
             return ((XRegistryKey*)new RegistryKeyImpl(newKey, m_pRegistry));
         }
-    }
-}
+    }		
+}	
 
 //*************************************************************************
-void SAL_CALL RegistryKeyImpl::closeKey(  )
+void SAL_CALL RegistryKeyImpl::closeKey(  ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -862,14 +862,14 @@ void SAL_CALL RegistryKeyImpl::closeKey(  )
         if ( !m_key.closeKey() )
             return;
     }
-
+    
     throw InvalidRegistryException(
         OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
         (OWeakObject *)this );
-}
+}	
 
 //*************************************************************************
-void SAL_CALL RegistryKeyImpl::deleteKey( const OUString& rKeyName )
+void SAL_CALL RegistryKeyImpl::deleteKey( const OUString& rKeyName ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -877,15 +877,15 @@ void SAL_CALL RegistryKeyImpl::deleteKey( const OUString& rKeyName )
     {
         if ( !m_key.deleteKey(rKeyName) )
             return;
-    }
+    }		
 
     throw InvalidRegistryException(
         OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
         (OWeakObject *)this );
-}
+}	
 
 //*************************************************************************
-Sequence< Reference< XRegistryKey > > SAL_CALL RegistryKeyImpl::openKeys(  )
+Sequence< Reference< XRegistryKey > > SAL_CALL RegistryKeyImpl::openKeys(  ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -896,8 +896,8 @@ Sequence< Reference< XRegistryKey > > SAL_CALL RegistryKeyImpl::openKeys(  )
             (OWeakObject *)this );
     } else
     {
-        RegistryKeyArray    subKeys;
-        RegError            _ret = REG_NO_ERROR;
+        RegistryKeyArray 	subKeys;
+        RegError 			_ret = REG_NO_ERROR;
         if ( (_ret = m_key.openSubKeys(OUString(), subKeys)) )
         {
             if ( _ret == REG_INVALID_KEY )
@@ -906,25 +906,25 @@ Sequence< Reference< XRegistryKey > > SAL_CALL RegistryKeyImpl::openKeys(  )
                     OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
                     (OWeakObject *)this );
             }
-
+            
             return Sequence< Reference<XRegistryKey> >();
         } else
         {
-            sal_uInt32                          length = subKeys.getLength();
+            sal_uInt32 							length = subKeys.getLength();
             Sequence< Reference<XRegistryKey> > seqKeys(length);
-
+            
             for (sal_uInt32 i=0; i < length; i++)
             {
-                seqKeys.getArray()[i] =
-                    (XRegistryKey*) new RegistryKeyImpl(subKeys.getElement(i), m_pRegistry);
+                seqKeys.getArray()[i] = 
+                    (XRegistryKey*)	new RegistryKeyImpl(subKeys.getElement(i), m_pRegistry);
             }
             return seqKeys;
         }
-    }
-}
+    }		
+}	
 
 //*************************************************************************
-Sequence< OUString > SAL_CALL RegistryKeyImpl::getKeyNames(  )
+Sequence< OUString > SAL_CALL RegistryKeyImpl::getKeyNames(  ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -935,8 +935,8 @@ Sequence< OUString > SAL_CALL RegistryKeyImpl::getKeyNames(  )
             (OWeakObject *)this );
     } else
     {
-        RegistryKeyNames    subKeys;
-        RegError            _ret = REG_NO_ERROR;
+        RegistryKeyNames 	subKeys;
+        RegError 			_ret = REG_NO_ERROR;
         if ( (_ret = m_key.getKeyNames(OUString(), subKeys)) )
         {
             if ( _ret == REG_INVALID_KEY )
@@ -945,24 +945,24 @@ Sequence< OUString > SAL_CALL RegistryKeyImpl::getKeyNames(  )
                     OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
                     (OWeakObject *)this );
             }
-
+            
             return Sequence<OUString>();
         } else
         {
-            sal_uInt32          length = subKeys.getLength();
-            Sequence<OUString>  seqKeys(length);
-
+            sal_uInt32 			length = subKeys.getLength();
+            Sequence<OUString> 	seqKeys(length);
+            
             for (sal_uInt32 i=0; i < length; i++)
             {
                 seqKeys.getArray()[i] = subKeys.getElement(i);
             }
             return seqKeys;
         }
-    }
-}
+    }		
+}	
 
 //*************************************************************************
-sal_Bool SAL_CALL RegistryKeyImpl::createLink( const OUString& aLinkName, const OUString& aLinkTarget )
+sal_Bool SAL_CALL RegistryKeyImpl::createLink( const OUString& aLinkName, const OUString& aLinkTarget ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -982,7 +982,7 @@ sal_Bool SAL_CALL RegistryKeyImpl::createLink( const OUString& aLinkName, const
                 throw InvalidRegistryException(
                     OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
                     (OWeakObject *)this );
-            } else
+            } else 
             {
                 return sal_False;
             }
@@ -992,7 +992,7 @@ sal_Bool SAL_CALL RegistryKeyImpl::createLink( const OUString& aLinkName, const
 }
 
 //*************************************************************************
-void SAL_CALL RegistryKeyImpl::deleteLink( const OUString& rLinkName )
+void SAL_CALL RegistryKeyImpl::deleteLink( const OUString& rLinkName ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
@@ -1003,21 +1003,21 @@ void SAL_CALL RegistryKeyImpl::deleteLink( const OUString& rLinkName )
             (OWeakObject *)this );
     } else
     {
-        if ( m_key.deleteLink(rLinkName) )
+        if ( m_key.deleteLink(rLinkName) )  
         {
             throw InvalidRegistryException(
                 OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
                 (OWeakObject *)this );
         }
-    }
+    }		
 }
-
+    
 //*************************************************************************
-OUString SAL_CALL RegistryKeyImpl::getLinkTarget( const OUString& rLinkName )
+OUString SAL_CALL RegistryKeyImpl::getLinkTarget( const OUString& rLinkName ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     OUString linkTarget;
-
+    
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
     if ( !m_key.isValid() )
     {
@@ -1027,23 +1027,23 @@ OUString SAL_CALL RegistryKeyImpl::getLinkTarget( const OUString& rLinkName )
     } else
     {
         RegError ret = m_key.getLinkTarget(rLinkName, linkTarget);
-        if ( ret )
+        if ( ret ) 
         {
             throw InvalidRegistryException(
                 OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
                 (OWeakObject *)this );
         }
-    }
+    }		
 
     return linkTarget;
-}
+}	
 
 //*************************************************************************
-OUString SAL_CALL RegistryKeyImpl::getResolvedName( const OUString& aKeyName )
+OUString SAL_CALL RegistryKeyImpl::getResolvedName( const OUString& aKeyName ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     OUString resolvedName;
-
+    
     Guard< Mutex > aGuard( m_pRegistry->m_mutex );
     if ( !m_key.isValid() )
     {
@@ -1054,23 +1054,23 @@ OUString SAL_CALL RegistryKeyImpl::getResolvedName( const OUString& aKeyName )
     {
         RegError ret = m_key.getResolvedKeyName(
             aKeyName, sal_True, resolvedName);
-        if ( ret )
+        if ( ret ) 
         {
             throw InvalidRegistryException(
                 OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
                 (OWeakObject *)this );
-        }
-    }
+        } 
+    }		
 
     return resolvedName;
-}
+}	
 
 //*************************************************************************
-SimpleRegistryImpl::SimpleRegistryImpl( const Registry& rRegistry )
+SimpleRegistryImpl::SimpleRegistryImpl(	const Registry& rRegistry )
     : m_registry(rRegistry)
 {
     g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
-}
+}	
 
 //*************************************************************************
 SimpleRegistryImpl::~SimpleRegistryImpl()
@@ -1079,14 +1079,14 @@ SimpleRegistryImpl::~SimpleRegistryImpl()
 }
 
 //*************************************************************************
-OUString SAL_CALL SimpleRegistryImpl::getImplementationName(  )
+OUString SAL_CALL SimpleRegistryImpl::getImplementationName(  ) 
     throw(RuntimeException)
 {
     return stoc_bootstrap::simreg_getImplementationName();
-}
+}	
 
 //*************************************************************************
-sal_Bool SAL_CALL SimpleRegistryImpl::supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL SimpleRegistryImpl::supportsService( const OUString& ServiceName ) 
     throw(RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
@@ -1096,24 +1096,24 @@ sal_Bool SAL_CALL SimpleRegistryImpl::supportsService( const OUString& ServiceNa
         if( pArray[i] == ServiceName )
             return sal_True;
     return sal_False;
-}
+}	
 
 //*************************************************************************
-Sequence<OUString> SAL_CALL SimpleRegistryImpl::getSupportedServiceNames(  )
+Sequence<OUString> SAL_CALL SimpleRegistryImpl::getSupportedServiceNames(  ) 
     throw(RuntimeException)
 {
     return stoc_bootstrap::simreg_getSupportedServiceNames();
-}
+}	
 
 //*************************************************************************
 OUString SAL_CALL SimpleRegistryImpl::getURL() throw(RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
     return m_url;
-}
+}	
 
 //*************************************************************************
-void SAL_CALL SimpleRegistryImpl::open( const OUString& rURL, sal_Bool bReadOnly, sal_Bool bCreate )
+void SAL_CALL SimpleRegistryImpl::open( const OUString& rURL, sal_Bool bReadOnly, sal_Bool bCreate ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
@@ -1123,16 +1123,16 @@ void SAL_CALL SimpleRegistryImpl::open( const OUString& rURL, sal_Bool bReadOnly
     }
 
     RegAccessMode accessMode = REG_READWRITE;
-
+    
     if ( bReadOnly )
         accessMode = REG_READONLY;
-
+        
     if ( !m_registry.open(rURL, accessMode) )
     {
         m_url = rURL;
         return;
     }
-
+    
     if ( bCreate )
     {
         if ( !m_registry.create(rURL) )
@@ -1141,7 +1141,7 @@ void SAL_CALL SimpleRegistryImpl::open( const OUString& rURL, sal_Bool bReadOnly
             return;
         }
     }
-
+    
     m_url = OUString();
 
     OUStringBuffer reason( 128 );
@@ -1165,17 +1165,17 @@ void SAL_CALL SimpleRegistryImpl::open( const OUString& rURL, sal_Bool bReadOnly
         reason.appendAscii( RTL_CONSTASCII_STRINGPARAM(" for writing" ) );
     }
     throw InvalidRegistryException( reason.makeStringAndClear() , Reference< XInterface >() );
-}
+}	
 
 //*************************************************************************
 sal_Bool SAL_CALL SimpleRegistryImpl::isValid(  ) throw(RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
     return m_registry.isValid();
-}
+}	
 
 //*************************************************************************
-void SAL_CALL SimpleRegistryImpl::close(  )
+void SAL_CALL SimpleRegistryImpl::close(  ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
@@ -1187,14 +1187,14 @@ void SAL_CALL SimpleRegistryImpl::close(  )
             return;
         }
     }
-
+    
     throw InvalidRegistryException(
         OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
         (OWeakObject *)this );
-}
+}	
 
 //*************************************************************************
-void SAL_CALL SimpleRegistryImpl::destroy(  )
+void SAL_CALL SimpleRegistryImpl::destroy(  ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
@@ -1210,10 +1210,10 @@ void SAL_CALL SimpleRegistryImpl::destroy(  )
     throw InvalidRegistryException(
         OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
         (OWeakObject *)this );
-}
+}	
 
 //*************************************************************************
-Reference< XRegistryKey > SAL_CALL SimpleRegistryImpl::getRootKey(  )
+Reference< XRegistryKey > SAL_CALL SimpleRegistryImpl::getRootKey(  ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
@@ -1225,25 +1225,25 @@ Reference< XRegistryKey > SAL_CALL SimpleRegistryImpl::getRootKey(  )
             OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
             (OWeakObject *)this );
     }
-}
+}	
 
 //*************************************************************************
-sal_Bool SAL_CALL SimpleRegistryImpl::isReadOnly(  )
+sal_Bool SAL_CALL SimpleRegistryImpl::isReadOnly(  ) 
     throw(InvalidRegistryException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
     if ( m_registry.isValid() )
-        return m_registry.isReadOnly();
+        return m_registry.isReadOnly();		
     else
     {
         throw InvalidRegistryException(
             OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
             (OWeakObject *)this );
     }
-}
+}	
 
 //*************************************************************************
-void SAL_CALL SimpleRegistryImpl::mergeKey( const OUString& aKeyName, const OUString& aUrl )
+void SAL_CALL SimpleRegistryImpl::mergeKey( const OUString& aKeyName, const OUString& aUrl ) 
     throw(InvalidRegistryException, MergeConflictException, RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
@@ -1270,7 +1270,7 @@ void SAL_CALL SimpleRegistryImpl::mergeKey( const OUString& aKeyName, const OUSt
                         (OWeakObject *)this );
                 }
             }
-
+            
             return;
         }
     }
@@ -1278,7 +1278,7 @@ void SAL_CALL SimpleRegistryImpl::mergeKey( const OUString& aKeyName, const OUSt
     throw InvalidRegistryException(
         OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
         (OWeakObject *)this );
-}
+}	
 }
 
 namespace stoc_bootstrap
@@ -1286,17 +1286,17 @@ namespace stoc_bootstrap
 //*************************************************************************
 Reference<XInterface> SAL_CALL SimpleRegistry_CreateInstance( const Reference<XComponentContext>& )
 {
-    Reference<XInterface>   xRet;
+    Reference<XInterface>	xRet;
 
     Registry reg;
-
+    
     XSimpleRegistry *pRegistry = (XSimpleRegistry*) new stoc_simreg::SimpleRegistryImpl(reg);
 
     if (pRegistry)
     {
         xRet = Reference<XInterface>::query(pRegistry);
-    }
-
+    }	
+    
     return xRet;
 }
 }
diff --git a/stoc/source/stocservices/stocserv.xml b/stoc/source/stocservices/stocserv.xml
index 73de7da1bd54..b45203f72d5a 100644
--- a/stoc/source/stocservices/stocserv.xml
+++ b/stoc/source/stocservices/stocserv.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   stocservices.uno    </module-name>
+    <module-name>	stocservices.uno	</module-name>
     <component-description>
         <author> Daniel Boelzle </author>
-        <name>  com.sun.star.comp.stoc.TypeConverter    </name>
+        <name>	com.sun.star.comp.stoc.TypeConverter	</name>
         <description>
 This service provide a widening converter. This means it can convert
 from one type to another if possible.
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  C++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	C++	</language>
         <status value="final"/>
-        <supported-service> com.sun.star.script.Converter   </supported-service>
-        <type>  com.sun.star.reflection.FieldAccessMode         </type>
-        <type>  com.sun.star.lang.IllegalArgumentException      </type>
-        <type>  com.sun.star.lang.XEventListener                </type>
-        <type>  com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory           </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
-        <type>  com.sun.star.registry.XRegistryKey              </type>
-        <type>  com.sun.star.script.XTypeConverter              </type>
-        <type>  com.sun.star.script.FailReason                  </type>
-        <type>  com.sun.star.container.XSet                     </type>
-        <type>  com.sun.star.container.XNameContainer           </type>
-        <type>  com.sun.star.container.XIndexContainer          </type>
-        <type>  com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </type>
-        <type>  com.sun.star.uno.XComponentContext              </type>
+        <supported-service>	com.sun.star.script.Converter	</supported-service>
+        <type>	com.sun.star.reflection.FieldAccessMode		  	</type>
+        <type>	com.sun.star.lang.IllegalArgumentException	  	</type>
+        <type>	com.sun.star.lang.XEventListener 		 	  	</type>
+        <type>	com.sun.star.lang.XTypeProvider				  	</type>
+        <type>	com.sun.star.lang.XServiceInfo				  	</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory		  	</type>
+        <type>	com.sun.star.lang.XSingleComponentFactory		  	</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory		  	</type>
+        <type>	com.sun.star.registry.XRegistryKey			  	</type>
+        <type>	com.sun.star.script.XTypeConverter 			  	</type>
+        <type>	com.sun.star.script.FailReason					</type>
+        <type>	com.sun.star.container.XSet					  	</type>
+        <type>	com.sun.star.container.XNameContainer 		  	</type>
+        <type>	com.sun.star.container.XIndexContainer		  	</type>
+        <type>	com.sun.star.uno.XAggregation				  	</type>
+        <type>	com.sun.star.uno.XWeak						  	</type>
+        <type>	com.sun.star.uno.TypeClass					  	</type>
+        <type>	com.sun.star.uno.XComponentContext			  	</type>
     </component-description>
     <component-description>
         <author>Stephan Bergmann</author>
@@ -89,10 +89,10 @@ from one type to another if possible.
             com.sun.star.uri.VndSunStarPkgUrlReferenceFactory
         </supported-service>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper2(COM)    </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper2(COM)	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu2		</runtime-module-dependency>
+    <runtime-module-dependency>	sal2		</runtime-module-dependency>
 </module-description>
diff --git a/stoc/source/stocservices/stocservices.cxx b/stoc/source/stocservices/stocservices.cxx
index 28cf4527b327..ccb80fba9f47 100644
--- a/stoc/source/stocservices/stocservices.cxx
+++ b/stoc/source/stocservices/stocservices.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,35 +55,35 @@ static struct ImplementationEntry g_entries[] =
     &g_moduleCount.modCnt , 0
     },
     // uriproc
-    {
+    { 
     ExternalUriReferenceTranslator::create,
     ExternalUriReferenceTranslator::getImplementationName,
     ExternalUriReferenceTranslator::getSupportedServiceNames,
-    createSingleComponentFactory, 0, 0
+    createSingleComponentFactory, 0, 0 
     },
-    {
+    { 
     UriReferenceFactory::create,
     UriReferenceFactory::getImplementationName,
     UriReferenceFactory::getSupportedServiceNames,
-    createSingleComponentFactory, 0, 0
+    createSingleComponentFactory, 0, 0 
     },
-    {
+    { 
     UriSchemeParser_vndDOTsunDOTstarDOTexpand::create,
     UriSchemeParser_vndDOTsunDOTstarDOTexpand::getImplementationName,
     UriSchemeParser_vndDOTsunDOTstarDOTexpand::getSupportedServiceNames,
-    createSingleComponentFactory, 0, 0
+    createSingleComponentFactory, 0, 0 
     },
-    {
+    { 
     UriSchemeParser_vndDOTsunDOTstarDOTscript::create,
     UriSchemeParser_vndDOTsunDOTstarDOTscript::getImplementationName,
     UriSchemeParser_vndDOTsunDOTstarDOTscript::getSupportedServiceNames,
-    createSingleComponentFactory, 0, 0
+    createSingleComponentFactory, 0, 0 
     },
-    {
+    { 
     VndSunStarPkgUrlReferenceFactory::create,
     VndSunStarPkgUrlReferenceFactory::getImplementationName,
     VndSunStarPkgUrlReferenceFactory::getSupportedServiceNames,
-    createSingleComponentFactory, 0, 0
+    createSingleComponentFactory, 0, 0 
     },
     { 0, 0, 0, 0, 0, 0 }
 };
diff --git a/stoc/source/tdmanager/lrucache.hxx b/stoc/source/tdmanager/lrucache.hxx
index 6f74a9b9a1d7..2309f61e9c96 100644
--- a/stoc/source/tdmanager/lrucache.hxx
+++ b/stoc/source/tdmanager/lrucache.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,22 +46,22 @@ class LRU_Cache
 {
     struct CacheEntry
     {
-        t_Key               aKey;
-        t_Val               aVal;
-        CacheEntry *        pPred;
-        CacheEntry *        pSucc;
+        t_Key				aKey;
+        t_Val				aVal;
+        CacheEntry *		pPred;
+        CacheEntry *		pSucc;
     };
     typedef ::std::hash_map< t_Key, CacheEntry *, t_KeyHash, t_KeyEqual > t_Key2Element;
-
-    mutable ::osl::Mutex        _aCacheMutex;
-    sal_Int32                   _nCachedElements;
-    t_Key2Element               _aKey2Element;
-
-    CacheEntry *                _pBlock;
-    mutable CacheEntry *        _pHead;
-    mutable CacheEntry *        _pTail;
+    
+    mutable ::osl::Mutex		_aCacheMutex;
+    sal_Int32					_nCachedElements;
+    t_Key2Element				_aKey2Element;
+    
+    CacheEntry *				_pBlock;
+    mutable CacheEntry *		_pHead;
+    mutable CacheEntry *		_pTail;
     inline void toFront( CacheEntry * pEntry ) const;
-
+    
 public:
     /** Constructor:
         <br>
@@ -72,7 +72,7 @@ public:
         <br>
     */
     inline ~LRU_Cache();
-
+    
     /** Retrieves a value from the cache. Returns default constructed value,
         if none was found.
         <br>
@@ -110,8 +110,8 @@ inline LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::LRU_Cache( sal_Int32 nC
     if (_nCachedElements > 0)
     {
         _pBlock = new CacheEntry[_nCachedElements];
-        _pHead  = _pBlock;
-        _pTail  = _pBlock + _nCachedElements -1;
+        _pHead	= _pBlock;
+        _pTail	= _pBlock + _nCachedElements -1;
         for ( sal_Int32 nPos = _nCachedElements; nPos--; )
         {
             _pBlock[nPos].pPred = _pBlock + nPos -1;
@@ -145,7 +145,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::toFront(
         // push to front
         _pHead->pPred = pEntry;
         pEntry->pSucc = _pHead;
-        _pHead        = pEntry;
+        _pHead		  = pEntry;
     }
 }
 //__________________________________________________________________________________________________
@@ -186,7 +186,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue(
     {
         ::osl::MutexGuard aGuard( _aCacheMutex );
         typename t_Key2Element::const_iterator const iFind( _aKey2Element.find( rKey ) );
-
+        
         CacheEntry * pEntry;
         if (iFind == _aKey2Element.end())
         {
diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx
index 2632b5a054f2..f37a36eddf0c 100644
--- a/stoc/source/tdmanager/tdmgr.cxx
+++ b/stoc/source/tdmanager/tdmgr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -76,7 +76,7 @@ using namespace com::sun::star::registry;
 static const sal_Int32 CACHE_SIZE = 512;
 
 #define SERVICENAME "com.sun.star.reflection.TypeDescriptionManager"
-#define IMPLNAME    "com.sun.star.comp.stoc.TypeDescriptionManager"
+#define IMPLNAME	"com.sun.star.comp.stoc.TypeDescriptionManager"
 
 //--------------------------------------------------------------------------------------------------
 // exported via tdmgr_common.hxx
@@ -126,7 +126,7 @@ class ManagerImpl;
 //==================================================================================================
 class EventListenerImpl : public ImplHelper1< XEventListener >
 {
-    ManagerImpl *       _pMgr;
+    ManagerImpl *		_pMgr;
 
 public:
     EventListenerImpl( ManagerImpl * pMgr )
@@ -160,15 +160,15 @@ class ManagerImpl
     friend class EnumerationImpl;
     friend class EventListenerImpl;
 
-    Mutex                               _aComponentMutex;
+    Mutex								_aComponentMutex;
     Reference< XComponentContext >      _xContext;
-    EventListenerImpl                   _aEventListener;
+    EventListenerImpl					_aEventListener;
 
     // elements
-    sal_Bool                            _bCaching;
-    LRU_CacheAnyByOUString              _aElements;
+    sal_Bool							_bCaching;
+    LRU_CacheAnyByOUString				_aElements;
     // provider chain
-    ProviderVector                      _aProviders;
+    ProviderVector						_aProviders;
 
     inline Any getSimpleType( const OUString & rName );
 
@@ -222,8 +222,8 @@ public:
 class EnumerationImpl
     : public WeakImplHelper1< XEnumeration >
 {
-    ManagerImpl *       _pMgr;
-    size_t              _nPos;
+    ManagerImpl *		_pMgr;
+    size_t				_nPos;
 
 public:
     EnumerationImpl( ManagerImpl * pManager );
@@ -480,7 +480,7 @@ void SAL_CALL ManagerImpl::insert( const Any & rElement )
                             exc.Message, static_cast<OWeakObject *>(this),
                             -1 /* unknown */ );
                     }
-
+                    
                     try
                     {
                         OUString newName( xNewTD->getName() );
@@ -523,7 +523,7 @@ void SAL_CALL ManagerImpl::insert( const Any & rElement )
             }
         }
     }
-
+    
     _aProviders.push_back( xElem );
     Reference< XComponent > xComp( xElem, UNO_QUERY );
     if (xComp.is())
@@ -679,10 +679,10 @@ class ArrayTypeDescriptionImpl
     : public WeakImplHelper1< XArrayTypeDescription >
 {
     Reference< XTypeDescription > _xElementTD;
-    Mutex                         _aDimensionMutex;
-    sal_Int32                     _nDimensions;
-    Sequence< sal_Int32 >         _seqDimensions;
-    OUString                      _sDimensions;
+    Mutex	 					  _aDimensionMutex;
+    sal_Int32					  _nDimensions;
+    Sequence< sal_Int32 >		  _seqDimensions;
+    OUString					  _sDimensions;
 
     void initDimensions(const OUString& rSDimensions);
 public:
@@ -741,7 +741,7 @@ void ArrayTypeDescriptionImpl::initDimensions(const OUString& rSDimensions)
 {
     MutexGuard aGuard( _aDimensionMutex );
 
-    sal_Int32 *  pDimensions = _seqDimensions.getArray();
+    sal_Int32 *	 pDimensions = _seqDimensions.getArray();
     OUString tmp(rSDimensions);
     sal_Unicode* p = (sal_Unicode*)tmp.getStr()+1;
     sal_Unicode* pOffset = p;
@@ -1063,7 +1063,7 @@ Any ManagerImpl::getByHierarchicalName( const OUString & rName )
                 rMembers = xIfaceTD->getMembers();
             const Reference< XInterfaceMemberTypeDescription > * pMembers =
                 rMembers.getConstArray();
-
+            
             for ( sal_Int32 nPos = rMembers.getLength(); nPos--; )
             {
                 if (rName == pMembers[nPos]->getName())
diff --git a/stoc/source/tdmanager/tdmgr_check.cxx b/stoc/source/tdmanager/tdmgr_check.cxx
index 0d1fad28f0e8..0197c578c6e2 100644
--- a/stoc/source/tdmanager/tdmgr_check.cxx
+++ b/stoc/source/tdmanager/tdmgr_check.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -63,7 +63,7 @@ OUString getTypeClassName( TypeClass tc )
         return OUSTR("Cannot get type description of ") + name;
     typelib_typedescription_complete(
         reinterpret_cast<typelib_TypeDescription **>(&typeDescr) );
-
+    
     sal_Int32 const * pValues = typeDescr->pEnumValues;
     sal_Int32 nPos = typeDescr->nEnumValues;
     while (nPos--)
@@ -76,7 +76,7 @@ OUString getTypeClassName( TypeClass tc )
     else
         name = OUSTR("unknown TypeClass value: ") +
             OUString::valueOf( (sal_Int32) tc );
-
+    
     typelib_typedescription_release(
         reinterpret_cast<typelib_TypeDescription *>(typeDescr) );
     return name;
@@ -133,7 +133,7 @@ void checkSeq( Sequence< Reference<T> > const & newTypes,
             typeError( OUSTR("Different number of types!"), context );
         len = existingTypes.getLength();
     }
-
+    
     Reference<T> const * pNewTypes = newTypes.getConstArray();
     Reference<T> const * pExistingTypes = existingTypes.getConstArray();
     for ( sal_Int32 pos = 0; pos < len; ++pos )
@@ -165,10 +165,10 @@ void checkStruct(
            xNewTD->getName() + OUSTR(", base type") );
     checkSeq( xNewTD->getMemberTypes(), xExistingTD->getMemberTypes(),
               xNewTD->getName() + OUSTR(", member types") );
-
+    
     if (xNewTD->getMemberNames() != xExistingTD->getMemberNames())
         typeError( OUSTR("Different member names!"), xNewTD->getName() );
-
+    
     if (xNewTD->getTypeClass() == TypeClass_STRUCT)
     {
         Reference<reflection::XStructTypeDescription> xNewStructTD(
@@ -231,7 +231,7 @@ void checkParameters( Sequence< Reference<T> > const & newParams,
     {
         Reference<T> const & xNewParam = pNewParams[pos];
         Reference<T> const & xExistingParam = pExistingParams[pos];
-
+        
         OUStringBuffer buf;
         buf.append( context_ );
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(", parameter ") );
@@ -239,7 +239,7 @@ void checkParameters( Sequence< Reference<T> > const & newParams,
         OSL_ASSERT( pos == xNewParam->getPosition() &&
                     pos == xExistingParam->getPosition() );
         OUString context( buf.makeStringAndClear() );
-
+        
         if (xNewParam->getName() != xExistingParam->getName())
         {
             buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("Name differs: ") );
@@ -249,7 +249,7 @@ void checkParameters( Sequence< Reference<T> > const & newParams,
             typeError( buf.makeStringAndClear(), context );
         }
         check( xNewParam->getType(), xExistingParam->getType(), context );
-
+        
         if (xNewParam->isIn() != xExistingParam->isIn())
             typeError( OUSTR("IN attribute differs!"), context );
         if (xNewParam->isOut() != xExistingParam->isOut())
@@ -264,14 +264,14 @@ static void checkMethod(
 {
     check( xNewTD->getReturnType(), xExistingTD->getReturnType(),
            xNewTD->getName() );
-
+    
     if (xNewTD->isOneway() != xExistingTD->isOneway())
         typeError( OUSTR("Methods have differing OneWay attribute!"),
                    xNewTD->getName() );
-
+    
     checkParameters( xNewTD->getParameters(), xExistingTD->getParameters(),
                      xNewTD->getName() );
-
+    
     checkSeq( xNewTD->getExceptions(), xExistingTD->getExceptions(),
               xNewTD->getName() + OUSTR(", declared exceptions") );
 }
@@ -283,13 +283,13 @@ void checkAttribute(
 {
     if (xNewTD->isReadOnly() != xExistingTD->isReadOnly())
         typeError( OUSTR("ReadOnly attribute differs!"), xNewTD->getName() );
-
+    
     check( xNewTD->getType(), xExistingTD->getType(),
            xNewTD->getName() + OUSTR(", attribute type") );
-
+    
     if (xNewTD->isBound() != xExistingTD->isBound())
         typeError( OUSTR("Bound attribute differs!"), xNewTD->getName() );
-
+    
     checkSeq( xNewTD->getGetExceptions(), xExistingTD->getGetExceptions(),
               xNewTD->getName() + OUSTR(", getter exceptions") );
     checkSeq( xNewTD->getSetExceptions(), xExistingTD->getSetExceptions(),
@@ -313,7 +313,7 @@ void checkProperty(
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" } (existing)!") );
         typeError( buf.makeStringAndClear(), xNewTD->getName() );
     }
-
+    
     check( xNewTD->getPropertyTypeDescription(),
            xExistingTD->getPropertyTypeDescription(),
            xNewTD->getName() );
@@ -366,7 +366,7 @@ void checkService(
                 xNewCtor = pNewCtors[pos];
             Reference<reflection::XServiceConstructorDescription> const &
                 xExistingCtor = pExistingCtors[pos];
-
+            
             if (xNewCtor->getName() != xExistingCtor->getName())
             {
                 OUStringBuffer buf;
@@ -378,7 +378,7 @@ void checkService(
                 buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" (existing)!") );
                 typeError( buf.makeStringAndClear(), xNewTD->getName() );
             }
-
+            
             OUStringBuffer buf;
             buf.append( xNewTD->getName() );
             buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(", constructor ") );
@@ -407,7 +407,7 @@ void checkService(
                   xExistingTD->getOptionalInterfaces(),
                   xNewTD->getName() + OUSTR(", optional interfaces"),
                   true /* optionalMode */ );
-
+        
         Sequence< Reference<reflection::XPropertyTypeDescription> >
             newProperties( xNewTD->getProperties() );
         Sequence< Reference<reflection::XPropertyTypeDescription> >
@@ -452,7 +452,7 @@ void check( Reference<reflection::XTypeDescription> const & xNewTD,
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" (existing)!") );
         typeError( buf.makeStringAndClear(), context );
     }
-
+    
     TypeClass tc = xNewTD->getTypeClass();
     if (tc != xExistingTD->getTypeClass())
     {
@@ -466,7 +466,7 @@ void check( Reference<reflection::XTypeDescription> const & xNewTD,
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" (existing)!") );
         typeError( buf.makeStringAndClear(), context );
     }
-
+    
     switch (tc)
     {
     case TypeClass_ENUM:
@@ -475,7 +475,7 @@ void check( Reference<reflection::XTypeDescription> const & xNewTD,
                    Reference<reflection::XEnumTypeDescription>(
                        xExistingTD, UNO_QUERY_THROW ) );
         break;
-
+        
     case TypeClass_TYPEDEF:
     case TypeClass_SEQUENCE:
         check( Reference<reflection::XIndirectTypeDescription>(
@@ -483,7 +483,7 @@ void check( Reference<reflection::XTypeDescription> const & xNewTD,
                Reference<reflection::XIndirectTypeDescription>(
                    xExistingTD, UNO_QUERY_THROW )->getReferencedType() );
         break;
-
+        
     case TypeClass_STRUCT:
     case TypeClass_EXCEPTION:
         checkStruct( Reference<reflection::XCompoundTypeDescription>(
@@ -491,21 +491,21 @@ void check( Reference<reflection::XTypeDescription> const & xNewTD,
                      Reference<reflection::XCompoundTypeDescription>(
                          xExistingTD, UNO_QUERY_THROW ) );
         break;
-
+        
     case TypeClass_INTERFACE:
         checkInterface( Reference<reflection::XInterfaceTypeDescription2>(
                             xNewTD, UNO_QUERY_THROW ),
                         Reference<reflection::XInterfaceTypeDescription2>(
                             xExistingTD, UNO_QUERY_THROW ) );
         break;
-
+        
     case TypeClass_SERVICE:
         checkService( Reference<reflection::XServiceTypeDescription2>(
                           xNewTD, UNO_QUERY_THROW ),
                       Reference<reflection::XServiceTypeDescription2>(
                           xExistingTD, UNO_QUERY_THROW ) );
         break;
-
+        
     case TypeClass_INTERFACE_METHOD:
         checkMethod( Reference<reflection::XInterfaceMethodTypeDescription>(
                          xNewTD, UNO_QUERY_THROW ),
@@ -519,14 +519,14 @@ void check( Reference<reflection::XTypeDescription> const & xNewTD,
             Reference<reflection::XInterfaceAttributeTypeDescription2>(
                 xExistingTD, UNO_QUERY_THROW ) );
         break;
-
+        
     case TypeClass_PROPERTY:
         checkProperty( Reference<reflection::XPropertyTypeDescription>(
                            xNewTD, UNO_QUERY_THROW ),
                        Reference<reflection::XPropertyTypeDescription>(
                            xExistingTD, UNO_QUERY_THROW ) );
         break;
-
+        
     case TypeClass_CONSTANT:
         if (Reference<reflection::XConstantTypeDescription>(
                 xNewTD, UNO_QUERY_THROW )->getConstantValue() !=
@@ -541,7 +541,7 @@ void check( Reference<reflection::XTypeDescription> const & xNewTD,
                       xExistingTD, UNO_QUERY_THROW )->getConstants(),
                   xNewTD->getName() );
         break;
-
+        
     case TypeClass_SINGLETON:
         checkSingleton( Reference<reflection::XSingletonTypeDescription2>(
                             xNewTD, UNO_QUERY_THROW ),
diff --git a/stoc/source/tdmanager/tdmgr_common.hxx b/stoc/source/tdmanager/tdmgr_common.hxx
index e6d6dff352f3..cf859e4aee0c 100644
--- a/stoc/source/tdmanager/tdmgr_common.hxx
+++ b/stoc/source/tdmanager/tdmgr_common.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/tdmanager/tdmgr_tdenumeration.cxx b/stoc/source/tdmanager/tdmgr_tdenumeration.cxx
index a73625cf058c..39f1045bb45b 100644
--- a/stoc/source/tdmanager/tdmgr_tdenumeration.cxx
+++ b/stoc/source/tdmanager/tdmgr_tdenumeration.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/tdmanager/tdmgr_tdenumeration.hxx b/stoc/source/tdmanager/tdmgr_tdenumeration.hxx
index 32268f3be988..f890d39c5f6f 100644
--- a/stoc/source/tdmanager/tdmgr_tdenumeration.hxx
+++ b/stoc/source/tdmanager/tdmgr_tdenumeration.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 30371be9046d..ce4dc227265f 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -60,7 +60,7 @@ using namespace rtl;
 using namespace osl;
 
 #define SERVICENAME "com.sun.star.script.Converter"
-#define IMPLNAME    "com.sun.star.comp.stoc.TypeConverter"
+#define IMPLNAME	"com.sun.star.comp.stoc.TypeConverter"
 
 
 extern rtl_StandardModuleCount g_moduleCount;
@@ -133,11 +133,11 @@ static inline double unsigned_int64_to_double( sal_uInt64 n ) SAL_THROW( () )
 //--------------------------------------------------------------------------------------------------
 static inline double round( double aVal )
 {
-    sal_Bool bPos   = (aVal >= 0.0);    //
-    aVal            = ::fabs( aVal );
-    double aUpper   = ::ceil( aVal );
-
-    aVal            = ((aUpper-aVal) <= 0.5) ? aUpper : (aUpper - 1.0);
+    sal_Bool bPos	= (aVal >= 0.0);	//
+    aVal			= ::fabs( aVal );
+    double aUpper	= ::ceil( aVal );
+    
+    aVal			= ((aUpper-aVal) <= 0.5) ? aUpper : (aUpper - 1.0);
     return (bPos ? aVal : -aVal);
 }
 
@@ -153,14 +153,14 @@ static sal_Bool getNumericValue( double & rfVal, const OUString & rStr )
             rfVal = 0.0;
             return sal_True;
         }
-
+        
         OUString trim( rStr.trim() );
-
+        
         // try hex
         sal_Int32 nX = trim.indexOf( 'x' );
         if (nX < 0)
             nX = trim.indexOf( 'X' );
-
+        
         if (nX > 0 && trim[nX-1] == '0') // 0x
         {
             sal_Bool bNeg = sal_False;
@@ -176,10 +176,10 @@ static sal_Bool getNumericValue( double & rfVal, const OUString & rStr )
             default:
                 return sal_False;
             }
-
+            
             OUString aHexRest( trim.copy( nX+1 ) );
             sal_Int64 nRet = aHexRest.toInt64( 16 );
-
+            
             if (nRet == 0)
             {
                 for ( sal_Int32 nPos = aHexRest.getLength(); nPos--; )
@@ -188,18 +188,18 @@ static sal_Bool getNumericValue( double & rfVal, const OUString & rStr )
                         return sal_False;
                 }
             }
-
+            
             rfVal = (bNeg ? -(double)nRet : (double)nRet);
             return sal_True;
         }
 
         nLen = trim.getLength();
         sal_Int32 nPos = 0;
-
+        
         // skip +/-
         if (nLen && (trim[0] == '-' || trim[0] == '+'))
             ++nPos;
-
+        
         while (nPos < nLen) // skip leading zeros
         {
             if (trim[nPos] != '0')
@@ -231,9 +231,9 @@ static sal_Bool getHyperValue( sal_Int64 & rnVal, const OUString & rStr )
         rnVal = 0;
         return sal_True;
     }
-
+    
     OUString trim( rStr.trim() );
-
+    
     // try hex
     sal_Int32 nX = trim.indexOf( 'x' );
     if (nX < 0)
@@ -256,10 +256,10 @@ static sal_Bool getHyperValue( sal_Int64 & rnVal, const OUString & rStr )
             default:
                 return sal_False;
             }
-
+            
             OUString aHexRest( trim.copy( nX+1 ) );
             sal_Int64 nRet = aHexRest.toInt64( 16 );
-
+            
             if (nRet == 0)
             {
                 for ( sal_Int32 nPos = aHexRest.getLength(); nPos--; )
@@ -268,13 +268,13 @@ static sal_Bool getHyperValue( sal_Int64 & rnVal, const OUString & rStr )
                         return sal_False;
                 }
             }
-
+            
             rnVal = (bNeg ? -nRet : nRet);
             return sal_True;
         }
         return sal_False;
     }
-
+    
     double fVal;
     if (getNumericValue( fVal, rStr ) &&
         fVal >= (double)SAL_INT64_MIN &&
@@ -295,18 +295,18 @@ class TypeConverter_Impl : public WeakImplHelper2< XTypeConverter, XServiceInfo
         throw( CannotConvertException );
     double toDouble( const Any& rAny, double min = -DBL_MAX, double max = DBL_MAX ) const
         throw( CannotConvertException );
-
+    
 public:
     TypeConverter_Impl();
     virtual ~TypeConverter_Impl();
-
+    
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() throw( RuntimeException );
     virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
         throw( RuntimeException );
     virtual  Sequence< OUString > SAL_CALL getSupportedServiceNames(void)
         throw( RuntimeException );
-
+    
     // XTypeConverter
     virtual Any SAL_CALL convertTo( const Any& aFrom, const Type& DestinationType )
         throw( IllegalArgumentException, CannotConvertException, RuntimeException);
@@ -327,7 +327,7 @@ TypeConverter_Impl::~TypeConverter_Impl()
 // XServiceInfo
 OUString TypeConverter_Impl::getImplementationName() throw( RuntimeException )
 {
-    return stoc_services::tcv_getImplementationName();
+    return stoc_services::tcv_getImplementationName();	
 }
 
 // XServiceInfo
@@ -396,7 +396,7 @@ sal_Int64 TypeConverter_Impl::toHyper( const Any& rAny, sal_Int64 min, sal_uInt6
     {
         nRet = *(sal_Int64 *)rAny.getValue();
         if ((min < 0 || (sal_uInt64)nRet >= (sal_uInt64)min) && // lower bound
-            (sal_uInt64)nRet <= max)                            // upper bound
+            (sal_uInt64)nRet <= max)							// upper bound
         {
             return nRet;
         }
@@ -404,7 +404,7 @@ sal_Int64 TypeConverter_Impl::toHyper( const Any& rAny, sal_Int64 min, sal_uInt6
             OUString( RTL_CONSTASCII_USTRINGPARAM("UNSIGNED HYPER out of range!") ),
             Reference<XInterface>(), aDestinationClass, FailReason::OUT_OF_RANGE, 0 );
     }
-
+    
     // FLOAT, DOUBLE
     case TypeClass_FLOAT:
     {
@@ -430,7 +430,7 @@ sal_Int64 TypeConverter_Impl::toHyper( const Any& rAny, sal_Int64 min, sal_uInt6
             OUString( RTL_CONSTASCII_USTRINGPARAM("DOUBLE out of range!") ),
             Reference<XInterface>(), aDestinationClass, FailReason::OUT_OF_RANGE, 0 );
     }
-
+    
     // STRING
     case TypeClass_STRING:
     {
@@ -448,13 +448,13 @@ sal_Int64 TypeConverter_Impl::toHyper( const Any& rAny, sal_Int64 min, sal_uInt6
             OUString( RTL_CONSTASCII_USTRINGPARAM("STRING value out of range!") ),
             Reference<XInterface>(), aDestinationClass, FailReason::OUT_OF_RANGE, 0 );
     }
-
+    
     default:
         throw CannotConvertException(
             OUString( RTL_CONSTASCII_USTRINGPARAM("TYPE is not supported!") ),
             Reference<XInterface>(), aDestinationClass, FailReason::TYPE_NOT_SUPPORTED, 0 );
     }
-
+    
     if (nRet >= min && (nRet < 0 || (sal_uInt64)nRet <= max))
         return nRet;
     throw CannotConvertException(
@@ -468,7 +468,7 @@ double TypeConverter_Impl::toDouble( const Any& rAny, double min, double max ) c
 {
     double fRet;
     TypeClass aDestinationClass = rAny.getValueTypeClass();
-
+    
     switch (aDestinationClass)
     {
     // ENUM
@@ -517,7 +517,7 @@ double TypeConverter_Impl::toDouble( const Any& rAny, double min, double max ) c
     case TypeClass_DOUBLE:
         fRet = *(double *)rAny.getValue();
         break;
-
+        
     // STRING
     case TypeClass_STRING:
     {
@@ -529,13 +529,13 @@ double TypeConverter_Impl::toDouble( const Any& rAny, double min, double max ) c
         }
         break;
     }
-
+    
     default:
         throw CannotConvertException(
             OUString( RTL_CONSTASCII_USTRINGPARAM("TYPE is not supported!") ),
             Reference< XInterface >(), aDestinationClass, FailReason::TYPE_NOT_SUPPORTED, 0 );
     }
-
+    
     if (fRet >= min && fRet <= max)
         return fRet;
     throw CannotConvertException(
@@ -544,7 +544,7 @@ double TypeConverter_Impl::toDouble( const Any& rAny, double min, double max ) c
 }
 
 //--------------------------------------------------------------------------------------------------
-Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestType )
+Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestType ) 
     throw( IllegalArgumentException, CannotConvertException, RuntimeException)
 {
     Type aSourceType = rVal.getValueType();
@@ -553,9 +553,9 @@ Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestTy
 
     TypeClass aSourceClass = aSourceType.getTypeClass();
     TypeClass aDestinationClass = aDestType.getTypeClass();
-
+    
     Any aRet;
-
+    
     // convert to...
     switch (aDestinationClass)
     {
@@ -565,10 +565,10 @@ Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestTy
     // --- to ANY -------------------------------------------------------------------------------
     case TypeClass_ANY:
         return rVal;
-
+        
     // --- to STRUCT, UNION, EXCEPTION ----------------------------------------------------------
     case TypeClass_STRUCT:
-//      case TypeClass_UNION: // xxx todo
+//  	case TypeClass_UNION: // xxx todo
     case TypeClass_EXCEPTION:
     {
         // same types or destination type is derived source type?
@@ -597,7 +597,7 @@ Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestTy
             aRet.setValue( &null_ref, aDestType );
             break;
         }
-
+        
         if (rVal.getValueTypeClass() != TypeClass_INTERFACE ||
             !*(XInterface * const *)rVal.getValue())
         {
@@ -621,7 +621,7 @@ Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestTy
         {
             if( aSourceType == aDestType )
                 return rVal;
-
+            
             TypeDescription aSourceTD( aSourceType );
             TypeDescription aDestTD( aDestType );
             typelib_TypeDescription * pSourceElementTD = 0;
@@ -632,7 +632,7 @@ Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestTy
             TYPELIB_DANGER_GET(
                 &pDestElementTD,
                 ((typelib_IndirectTypeDescription *)aDestTD.get())->pType );
-
+            
             sal_uInt32 nPos = (*(const uno_Sequence * const *)rVal.getValue())->nElements;
             uno_Sequence * pRet = 0;
             uno_sequence_construct(
@@ -643,19 +643,19 @@ Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestTy
                 &pRet, aDestTD.get(),
                 reinterpret_cast< uno_ReleaseFunc >(cpp_release) );
                 // decr ref count
-
+            
             char * pDestElements = (*(uno_Sequence * const *)aRet.getValue())->elements;
             const char * pSourceElements =
                 (*(const uno_Sequence * const *)rVal.getValue())->elements;
-
+            
             while (nPos--)
             {
                 char * pDestPos = pDestElements + (nPos * pDestElementTD->nSize);
                 const char * pSourcePos = pSourceElements + (nPos * pSourceElementTD->nSize);
-
+                
                 Any aElement(
                     convertTo( Any( pSourcePos, pSourceElementTD ), pDestElementTD->pWeakRef ) );
-
+                
                 if (!uno_assignData(
                         pDestPos, pDestElementTD,
                         (pDestElementTD->eTypeClass == typelib_TypeClass_ANY
@@ -681,7 +681,7 @@ Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestTy
         TypeDescription aEnumTD( aDestType );
         aEnumTD.makeComplete();
         sal_Int32 nPos = -1;
-
+        
         if (aSourceClass==TypeClass_STRING)
         {
             for ( nPos = ((typelib_EnumTypeDescription *)aEnumTD.get())->nEnumValues; nPos--; )
@@ -702,7 +702,7 @@ Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestTy
                     break;
             }
         }
-
+        
         if (nPos >= 0)
         {
             aRet.setValue(
@@ -718,7 +718,7 @@ Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestTy
         }
         break;
     }
-
+    
     default:
         // else simple type conversion possible?
         try
@@ -730,10 +730,10 @@ Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestTy
             // ...FailReason::INVALID is thrown
         }
     }
-
+    
     if (aRet.hasValue())
         return aRet;
-
+    
     throw CannotConvertException(
         OUString( RTL_CONSTASCII_USTRINGPARAM("conversion not possible!") ),
         Reference< XInterface >(), aDestinationClass, FailReason::INVALID, 0 );
@@ -763,7 +763,7 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
     default:
         break;
     }
-
+    
     Type aSourceType = rVal.getValueType();
     TypeClass aSourceClass = aSourceType.getTypeClass();
     if (aDestinationClass == aSourceClass)
@@ -777,11 +777,11 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
     // --- to VOID ------------------------------------------------------------------------------
     case TypeClass_VOID:
         return Any();
-
+        
     // --- to ANY -------------------------------------------------------------------------------
     case TypeClass_ANY:
         return rVal;
-
+        
     // --- to BOOL ------------------------------------------------------------------------------
     case TypeClass_BOOLEAN:
         switch (aSourceClass)
@@ -793,7 +793,7 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
         }
         case TypeClass_ENUM:  // exclude enums
             break;
-
+            
         case TypeClass_STRING:
         {
             const OUString & aStr = *(const OUString *)rVal.getValue();
@@ -818,19 +818,19 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
         }
         }
         break;
-
+        
     // --- to CHAR, BYTE ------------------------------------------------------------------------
     case TypeClass_CHAR:
     {
         if (aSourceClass==TypeClass_STRING)
         {
-            if ((*(const OUString *)rVal.getValue()).getLength() == 1)      // single char
+            if ((*(const OUString *)rVal.getValue()).getLength() == 1)		// single char
                 aRet.setValue( (*(const OUString *)rVal.getValue()).getStr(), ::getCharCppuType() );
         }
-        else if (aSourceClass!=TypeClass_ENUM &&        // exclude enums, chars
+        else if (aSourceClass!=TypeClass_ENUM &&		// exclude enums, chars
                  aSourceClass!=TypeClass_CHAR)
         {
-             sal_Unicode cRet = (sal_Unicode)toHyper( rVal, 0, 0xffff );    // range
+             sal_Unicode cRet = (sal_Unicode)toHyper( rVal, 0, 0xffff );	// range
             aRet.setValue( &cRet, ::getCharCppuType() );
         }
         break;
@@ -838,7 +838,7 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
     case TypeClass_BYTE:
         aRet <<= (sal_Int8)( toHyper( rVal, -(sal_Int64)0x80, 0x7f ) );
         break;
-
+        
     // --- to SHORT, UNSIGNED SHORT -------------------------------------------------------------
     case TypeClass_SHORT:
         aRet <<= (sal_Int16)( toHyper( rVal, -(sal_Int64)0x8000, 0x7fff ) );
@@ -846,7 +846,7 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
     case TypeClass_UNSIGNED_SHORT:
         aRet <<= (sal_uInt16)( toHyper( rVal, 0, 0xffff ) );
         break;
-
+        
     // --- to LONG, UNSIGNED LONG ---------------------------------------------------------------
     case TypeClass_LONG:
         aRet <<= (sal_Int32)( toHyper( rVal, -(sal_Int64)0x80000000, 0x7fffffff ) );
@@ -854,7 +854,7 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
     case TypeClass_UNSIGNED_LONG:
         aRet <<= (sal_uInt32)( toHyper( rVal, 0, 0xffffffff ) );
         break;
-
+        
     // --- to HYPER, UNSIGNED HYPER--------------------------------------------
     case TypeClass_HYPER:
         aRet <<= toHyper( rVal, SAL_INT64_MIN, SAL_INT64_MAX );
@@ -862,7 +862,7 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
     case TypeClass_UNSIGNED_HYPER:
         aRet <<= (sal_uInt64)( toHyper( rVal, 0, SAL_UINT64_MAX ) );
         break;
-
+        
     // --- to FLOAT, DOUBLE ---------------------------------------------------------------------
     case TypeClass_FLOAT:
         aRet <<= (float)( toDouble( rVal, -FLT_MAX, FLT_MAX ) );
@@ -870,7 +870,7 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
     case TypeClass_DOUBLE:
         aRet <<= (double)( toDouble( rVal, -DBL_MAX, DBL_MAX ) );
         break;
-
+        
     // --- to STRING ----------------------------------------------------------------------------
     case TypeClass_STRING:
         switch (aSourceClass)
@@ -900,14 +900,14 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
             }
             break;
         }
-
+        
         case TypeClass_BOOLEAN:
             aRet <<= OUString::createFromAscii( (*(sal_Bool *)rVal.getValue() ? "true" : "false") );
             break;
         case TypeClass_CHAR:
             aRet <<= OUString( (sal_Unicode *)rVal.getValue(), 1 );
             break;
-
+            
         case TypeClass_BYTE:
             aRet <<= OUString::valueOf( (sal_Int32)*(sal_Int8 const *)rVal.getValue() );
             break;
@@ -926,11 +926,11 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
         case TypeClass_HYPER:
             aRet <<= OUString::valueOf( *(sal_Int64 const *)rVal.getValue() );
             break;
-//      case TypeClass_UNSIGNED_HYPER:
+// 		case TypeClass_UNSIGNED_HYPER:
 //             aRet <<= OUString::valueOf( (sal_Int64)*(sal_uInt64 const *)rVal.getValue() );
-//          break;
+// 			break;
             // handle unsigned hyper like double
-
+            
         default:
             aRet <<= OUString::valueOf( toDouble( rVal ) );
         }
@@ -940,10 +940,10 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
         OSL_ASSERT(false);
         break;
     }
-
+    
     if (aRet.hasValue())
         return aRet;
-
+    
     throw CannotConvertException(
         OUString( RTL_CONSTASCII_USTRINGPARAM("conversion not possible!") ),
         Reference< XInterface >(), aDestinationClass, FailReason::INVALID, 0 );
@@ -954,7 +954,7 @@ namespace stoc_services
 {
 //*************************************************************************
 Reference< XInterface > SAL_CALL TypeConverter_Impl_CreateInstance(
-    const Reference< XComponentContext > & )
+    const Reference< XComponentContext > & ) 
     throw( RuntimeException )
 {
     static Reference< XInterface > s_ref( (OWeakObject *) new stoc_tcv::TypeConverter_Impl() );
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index 1a9f65e641e1..08722a9f5d94 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx
index f3eb93a2219c..d4e1dd8bd0e9 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/uriproc/UriReference.cxx b/stoc/source/uriproc/UriReference.cxx
index 88f312addc4b..58737352d851 100644
--- a/stoc/source/uriproc/UriReference.cxx
+++ b/stoc/source/uriproc/UriReference.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/uriproc/UriReference.hxx b/stoc/source/uriproc/UriReference.hxx
index efd187977b7e..520c1763a91e 100644
--- a/stoc/source/uriproc/UriReference.hxx
+++ b/stoc/source/uriproc/UriReference.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index 1d87c69ab07c..bbcfa1757f9b 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/uriproc/UriReferenceFactory.hxx b/stoc/source/uriproc/UriReferenceFactory.hxx
index 8acc8e46662e..38278b6bf542 100644
--- a/stoc/source/uriproc/UriReferenceFactory.hxx
+++ b/stoc/source/uriproc/UriReferenceFactory.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index 999bde852429..18a576012132 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.hxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.hxx
index fa3501d83bb3..b531c81a3180 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.hxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index 310f3aa318b6..581358b5b1df 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx
index e2340154d09e..f2abe47a7b07 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index 1ac83724614a..f117b5b007b5 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx
index f515e8264a19..48f2c63d5715 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/uriproc/supportsService.cxx b/stoc/source/uriproc/supportsService.cxx
index 464714f2c6a8..1bf136ac8258 100644
--- a/stoc/source/uriproc/supportsService.cxx
+++ b/stoc/source/uriproc/supportsService.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/source/uriproc/supportsService.hxx b/stoc/source/uriproc/supportsService.hxx
index 1ec83bb6cd75..5103bec31c6f 100644
--- a/stoc/source/uriproc/supportsService.hxx
+++ b/stoc/source/uriproc/supportsService.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/test/excomp/example/ExampleComponent1.idl b/stoc/test/excomp/example/ExampleComponent1.idl
index 6ebf2a7e4eb7..729872e9d867 100644
--- a/stoc/test/excomp/example/ExampleComponent1.idl
+++ b/stoc/test/excomp/example/ExampleComponent1.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/test/excomp/example/ExampleComponent2.idl b/stoc/test/excomp/example/ExampleComponent2.idl
index ff2b3b28c5d0..9ab69314ee20 100644
--- a/stoc/test/excomp/example/ExampleComponent2.idl
+++ b/stoc/test/excomp/example/ExampleComponent2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/test/excomp/example/XTest.idl b/stoc/test/excomp/example/XTest.idl
index 8bf578b10d29..eaa59b4d4004 100644
--- a/stoc/test/excomp/example/XTest.idl
+++ b/stoc/test/excomp/example/XTest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 
 module example
 {
-/**
+/** 
  * Simple test interface.
  *
  * @author Juergen Schmidt
diff --git a/stoc/test/excomp/excomp.cxx b/stoc/test/excomp/excomp.cxx
index 91d04623c0ec..7d462c2f0d56 100644
--- a/stoc/test/excomp/excomp.cxx
+++ b/stoc/test/excomp/excomp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -61,7 +61,7 @@ using namespace rtl;
 
 OUString getExePath()
 {
-    OUString        exe;
+    OUString 		exe;
 
     OSL_VERIFY(osl_getExecutableFile( &exe.pData) == osl_Process_E_None);
 
@@ -94,7 +94,7 @@ SAL_IMPLEMENT_MAIN()
     typelib_TypeDescription* pTypeDesc = NULL;
     OUString sType = OUString::createFromAscii("com.sun.star.text.XTextDocument");
     typelib_typedescription_getByName( &pTypeDesc, sType.pData);
-//  typelib_InterfaceTypeDescription* pInterDesc = (typelib_InterfaceTypeDescription*)pTypeDesc;
+//	typelib_InterfaceTypeDescription* pInterDesc = (typelib_InterfaceTypeDescription*)pTypeDesc;
 
     Reference< XInterface > xIFace = xSMgr->createInstance(OUString::createFromAscii("com.sun.star.registry.ImplementationRegistration"));
     Reference< XImplementationRegistration > xImpReg( xIFace, UNO_QUERY);
diff --git a/stoc/test/excomp/excomp1.cxx b/stoc/test/excomp/excomp1.cxx
index cb71cdc83203..f26bebad7204 100644
--- a/stoc/test/excomp/excomp1.cxx
+++ b/stoc/test/excomp/excomp1.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,14 +49,14 @@ using namespace osl;
 using namespace rtl;
 
 #define SERVICENAME1 "example.ExampleComponent1"
-#define IMPLNAME1   "example.ExampleComponent1.Impl"
+#define IMPLNAME1	"example.ExampleComponent1.Impl"
 
 namespace excomp_impl {
 
 //*************************************************************************
 // ExampleComponent1Impl
 //*************************************************************************
-class ExampleComponent1Impl : public WeakImplHelper2< XTest, XServiceInfo >
+class ExampleComponent1Impl	: public WeakImplHelper2< XTest, XServiceInfo >
 {
 public:
     ExampleComponent1Impl( const Reference<XMultiServiceFactory> & rXSMgr );
@@ -73,7 +73,7 @@ public:
     virtual OUString SAL_CALL getMessage() throw(RuntimeException);
 
 protected:
-    Mutex       m_mutex;
+    Mutex		m_mutex;
 
     Reference<XMultiServiceFactory> m_xSMgr;
 };
@@ -82,7 +82,7 @@ protected:
 ExampleComponent1Impl::ExampleComponent1Impl( const Reference<XMultiServiceFactory> & rXSMgr )
     : m_xSMgr(rXSMgr)
 {
-}
+}	
 
 //*************************************************************************
 ExampleComponent1Impl::~ExampleComponent1Impl()
@@ -90,15 +90,15 @@ ExampleComponent1Impl::~ExampleComponent1Impl()
 }
 
 //*************************************************************************
-OUString SAL_CALL ExampleComponent1Impl::getImplementationName(  )
+OUString SAL_CALL ExampleComponent1Impl::getImplementationName(  ) 
     throw(RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
     return OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME1) );
-}
+}	
 
 //*************************************************************************
-sal_Bool SAL_CALL ExampleComponent1Impl::supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL ExampleComponent1Impl::supportsService( const OUString& ServiceName ) 
     throw(RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
@@ -108,29 +108,29 @@ sal_Bool SAL_CALL ExampleComponent1Impl::supportsService( const OUString& Servic
         if( pArray[i] == ServiceName )
             return sal_True;
     return sal_False;
-}
+}	
 
 //*************************************************************************
-Sequence<OUString> SAL_CALL ExampleComponent1Impl::getSupportedServiceNames(  )
+Sequence<OUString> SAL_CALL ExampleComponent1Impl::getSupportedServiceNames(  ) 
     throw(RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
     return getSupportedServiceNames_Static();
-}
+}	
 
 //*************************************************************************
-Sequence<OUString> SAL_CALL ExampleComponent1Impl::getSupportedServiceNames_Static(  )
+Sequence<OUString> SAL_CALL ExampleComponent1Impl::getSupportedServiceNames_Static(  ) 
 {
     OUString aName( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1) );
     return Sequence< OUString >( &aName, 1 );
-}
+}	
 
 //*************************************************************************
 OUString SAL_CALL ExampleComponent1Impl::getMessage() throw(RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
     return OUString::createFromAscii("Lalelu nur der Mann im Mond schaut zu ...");
-}
+}	
 
 
 //*************************************************************************
@@ -143,8 +143,8 @@ Reference<XInterface> SAL_CALL ExampleComponent1_CreateInstance( const Reference
     if (pXTest)
     {
         xRet = Reference< XInterface >::query(pXTest);
-    }
-
+    }	
+    
     return xRet;
 }
 
@@ -171,7 +171,7 @@ sal_Bool SAL_CALL component_writeInfo(
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
                     OUString( RTL_CONSTASCII_USTRINGPARAM("/" IMPLNAME1 "/UNO/SERVICES") ) ) );
-
+            
             const Sequence< OUString > & rSNL =
                 ::excomp_impl::ExampleComponent1Impl::getSupportedServiceNames_Static();
             const OUString * pArray = rSNL.getConstArray();
@@ -192,7 +192,7 @@ void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
 {
     void * pRet = 0;
-
+    
     if (rtl_str_compare( pImplName, IMPLNAME1 ) == 0)
     {
         Reference< XSingleServiceFactory > xFactory( createSingleFactory(
@@ -200,14 +200,14 @@ void * SAL_CALL component_getFactory(
             OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME1) ),
             ::excomp_impl::ExampleComponent1_CreateInstance,
             ::excomp_impl::ExampleComponent1Impl::getSupportedServiceNames_Static() ) );
-
+        
         if (xFactory.is())
         {
             xFactory->acquire();
             pRet = xFactory.get();
         }
     }
-
+    
     return pRet;
 }
 }
diff --git a/stoc/test/excomp/excomp1.xml b/stoc/test/excomp/excomp1.xml
index f7abad04302c..b54b71d4320e 100644
--- a/stoc/test/excomp/excomp1.xml
+++ b/stoc/test/excomp/excomp1.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   excomp1 </module-name>
+    <module-name>	excomp1	</module-name>
     <component-description>
         <author> Juergen Schmidt </author>
-        <name>  example.ExampleComponent1.Impl  </name>
+        <name>	example.ExampleComponent1.Impl	</name>
         <description>
-    This component provides a simple demo component.
+    This component provides a simple demo component. 
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="final"/>
-        <supported-service> example.ExampleComponent1   </supported-service>
-        <type>  com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
-        <type>  com.sun.star.registry.XRegistryKey              </type>
-        <type>  com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </type>
-        <type>  example.XTest                                   </type>
+        <supported-service>	example.ExampleComponent1	</supported-service>
+        <type>	com.sun.star.lang.XTypeProvider					</type>
+        <type>	com.sun.star.lang.XServiceInfo					</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory			</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory			</type>
+        <type>	com.sun.star.registry.XRegistryKey				</type>
+        <type>	com.sun.star.uno.XAggregation					</type>
+        <type>	com.sun.star.uno.XWeak							</type>
+        <type>	com.sun.star.uno.TypeClass						</type>
+        <type>	example.XTest									</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu        </runtime-module-dependency>
-    <runtime-module-dependency> sal         </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu		</runtime-module-dependency>
+    <runtime-module-dependency>	sal			</runtime-module-dependency>
 </module-description>
diff --git a/stoc/test/excomp/excomp2.cxx b/stoc/test/excomp/excomp2.cxx
index 6439296f703a..801f4ce68022 100644
--- a/stoc/test/excomp/excomp2.cxx
+++ b/stoc/test/excomp/excomp2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,14 +52,14 @@ using namespace osl;
 using namespace rtl;
 
 #define SERVICENAME2 "example.ExampleComponent2"
-#define IMPLNAME2   "example.ExampleComponent2.Impl"
+#define IMPLNAME2	"example.ExampleComponent2.Impl"
 
 namespace excomp2_impl {
 
 //*************************************************************************
 // ExampleComponent2Impl
 //*************************************************************************
-class ExampleComponent2Impl : public OWeakObject
+class ExampleComponent2Impl	: public OWeakObject
                             , public XTypeProvider
                             , public XServiceInfo
                             , public XTest
@@ -71,7 +71,7 @@ public:
 
     // XInterface
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire() throw()
+    virtual void SAL_CALL acquire() throw() 
         { OWeakObject::acquire(); }
     virtual void SAL_CALL release() throw()
         { OWeakObject::release(); }
@@ -79,7 +79,7 @@ public:
     // XTypeProvider
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException);
-
+    
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName(  ) throw(RuntimeException);
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException);
@@ -90,7 +90,7 @@ public:
     virtual OUString SAL_CALL getMessage() throw(RuntimeException);
 
 protected:
-    Mutex       m_mutex;
+    Mutex		m_mutex;
 
     Reference<XMultiServiceFactory> m_xSMgr;
 };
@@ -99,7 +99,7 @@ protected:
 ExampleComponent2Impl::ExampleComponent2Impl( const Reference<XMultiServiceFactory> & rXSMgr )
     : m_xSMgr(rXSMgr)
 {
-}
+}	
 
 //*************************************************************************
 ExampleComponent2Impl::~ExampleComponent2Impl()
@@ -107,21 +107,21 @@ ExampleComponent2Impl::~ExampleComponent2Impl()
 }
 
 //*************************************************************************
-Any SAL_CALL ExampleComponent2Impl::queryInterface( const ::com::sun::star::uno::Type & rType )
+Any SAL_CALL ExampleComponent2Impl::queryInterface( const ::com::sun::star::uno::Type & rType ) 
     throw(::com::sun::star::uno::RuntimeException)
 {
-    Any aRet = ::cppu::queryInterface(rType,
-                                      static_cast< XTypeProvider * >( this ),
-                                      static_cast< XServiceInfo * >( this ),
+    Any aRet = ::cppu::queryInterface(rType, 
+                                      static_cast< XTypeProvider * >( this ), 
+                                      static_cast< XServiceInfo * >( this ), 
                                         static_cast< XTest * >( this ) );
     if ( aRet.hasValue() )
         return aRet;
-
+    
     return OWeakObject::queryInterface( rType );
 }
 
 //*************************************************************************
-Sequence< Type > SAL_CALL ExampleComponent2Impl::getTypes()
+Sequence< Type > SAL_CALL ExampleComponent2Impl::getTypes() 
     throw (::com::sun::star::uno::RuntimeException)
 {
     static OTypeCollection * pTypes = 0;
@@ -143,7 +143,7 @@ Sequence< Type > SAL_CALL ExampleComponent2Impl::getTypes()
 }
 
 //*************************************************************************
-Sequence< sal_Int8 > SAL_CALL ExampleComponent2Impl::getImplementationId()
+Sequence< sal_Int8 > SAL_CALL ExampleComponent2Impl::getImplementationId() 
     throw (::com::sun::star::uno::RuntimeException)
 {
     static OImplementationId * pId = 0;
@@ -160,15 +160,15 @@ Sequence< sal_Int8 > SAL_CALL ExampleComponent2Impl::getImplementationId()
 }
 
 //*************************************************************************
-OUString SAL_CALL ExampleComponent2Impl::getImplementationName(  )
+OUString SAL_CALL ExampleComponent2Impl::getImplementationName(  ) 
     throw(RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
     return OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME2) );
-}
+}	
 
 //*************************************************************************
-sal_Bool SAL_CALL ExampleComponent2Impl::supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL ExampleComponent2Impl::supportsService( const OUString& ServiceName ) 
     throw(RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
@@ -178,29 +178,29 @@ sal_Bool SAL_CALL ExampleComponent2Impl::supportsService( const OUString& Servic
         if( pArray[i] == ServiceName )
             return sal_True;
     return sal_False;
-}
+}	
 
 //*************************************************************************
-Sequence<OUString> SAL_CALL ExampleComponent2Impl::getSupportedServiceNames(  )
+Sequence<OUString> SAL_CALL ExampleComponent2Impl::getSupportedServiceNames(  ) 
     throw(RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
     return getSupportedServiceNames_Static();
-}
+}	
 
 //*************************************************************************
-Sequence<OUString> SAL_CALL ExampleComponent2Impl::getSupportedServiceNames_Static(  )
+Sequence<OUString> SAL_CALL ExampleComponent2Impl::getSupportedServiceNames_Static(  ) 
 {
     OUString aName( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME2) );
     return Sequence< OUString >( &aName, 1 );
-}
+}	
 
 //*************************************************************************
 OUString SAL_CALL ExampleComponent2Impl::getMessage() throw(RuntimeException)
 {
     Guard< Mutex > aGuard( m_mutex );
     return OUString::createFromAscii("Alle meine Entchen schwimmen auf dem See, schwimmen auf dem See ...");
-}
+}	
 
 
 //*************************************************************************
@@ -213,8 +213,8 @@ Reference<XInterface> SAL_CALL ExampleComponent2_CreateInstance( const Reference
     if (pXTest)
     {
         xRet = Reference< XInterface >::query(pXTest);
-    }
-
+    }	
+    
     return xRet;
 }
 
@@ -242,7 +242,7 @@ sal_Bool SAL_CALL component_writeInfo(
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
                     OUString( RTL_CONSTASCII_USTRINGPARAM("/" IMPLNAME2 "/UNO/SERVICES") ) ) );
-
+            
             const Sequence< OUString > & rSNL =
                 ::excomp2_impl::ExampleComponent2Impl::getSupportedServiceNames_Static();
             const OUString * pArray = rSNL.getConstArray();
@@ -263,7 +263,7 @@ void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
 {
     void * pRet = 0;
-
+    
     if (rtl_str_compare( pImplName, IMPLNAME2 ) == 0)
     {
         Reference< XSingleServiceFactory > xFactory( createSingleFactory(
@@ -271,14 +271,14 @@ void * SAL_CALL component_getFactory(
             OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME2) ),
             ::excomp2_impl::ExampleComponent2_CreateInstance,
             ::excomp2_impl::ExampleComponent2Impl::getSupportedServiceNames_Static() ) );
-
+        
         if (xFactory.is())
         {
             xFactory->acquire();
             pRet = xFactory.get();
         }
     }
-
+    
     return pRet;
 }
 }
diff --git a/stoc/test/excomp/excomp2.xml b/stoc/test/excomp/excomp2.xml
index 4801cf240135..40aec6d96724 100644
--- a/stoc/test/excomp/excomp2.xml
+++ b/stoc/test/excomp/excomp2.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   excomp2 </module-name>
+    <module-name>	excomp2	</module-name>
     <component-description>
         <author> Juergen Schmidt </author>
-        <name>  example.ExampleComponent2.Impl  </name>
+        <name>	example.ExampleComponent2.Impl	</name>
         <description>
-    This component provides a simple demo component.
+    This component provides a simple demo component. 
 </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
+        <loader-name>	com.sun.star.loader.SharedLibrary	</loader-name>
+        <language>	c++	</language>
         <status value="final"/>
-        <supported-service> example.ExampleComponent2   </supported-service>
-        <type>  com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
-        <type>  com.sun.star.registry.XRegistryKey              </type>
-        <type>  com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </type>
-        <type>  example.XTest                                   </type>
+        <supported-service>	example.ExampleComponent2	</supported-service>
+        <type>	com.sun.star.lang.XTypeProvider					</type>
+        <type>	com.sun.star.lang.XServiceInfo					</type>
+        <type>	com.sun.star.lang.XSingleServiceFactory			</type>
+        <type>	com.sun.star.lang.XMultiServiceFactory			</type>
+        <type>	com.sun.star.registry.XRegistryKey				</type>
+        <type>	com.sun.star.uno.XAggregation					</type>
+        <type>	com.sun.star.uno.XWeak							</type>
+        <type>	com.sun.star.uno.TypeClass						</type>
+        <type>	example.XTest									</type>
     </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu        </runtime-module-dependency>
-    <runtime-module-dependency> sal         </runtime-module-dependency>
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
+    <runtime-module-dependency>	cppuhelper	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu		</runtime-module-dependency>
+    <runtime-module-dependency>	sal			</runtime-module-dependency>
 </module-description>
diff --git a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx
index c45fc9a12b6e..9ea87b86f98f 100644
--- a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx
+++ b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -118,7 +118,7 @@ void SAL_CALL InteractionHandler::handle( const Reference< XInteractionRequest >
         if(retry.is())
             break;
     }
-
+    
 //     if( abort.is())
 //         abort->select();
 
@@ -137,14 +137,14 @@ void SAL_CALL InteractionHandler::handle( const Reference< XInteractionRequest >
 sal_Bool test1(const Reference< XMultiServiceFactory > & xMgr )
 {
     sal_Bool retVal= sal_True;
-    setCurrentContext( Reference<XCurrentContext>( static_cast<XWeak*>(new Context()), UNO_QUERY));
+    setCurrentContext( Reference<XCurrentContext>( static_cast<XWeak*>(new Context()), UNO_QUERY)); 
 
       OUString sVMService( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.java.JavaVirtualMachine"));
     Reference<XInterface> xXInt= xMgr->createInstance(sVMService);
     if( ! xXInt.is())
         return sal_False;
     Reference<XJavaVM> xVM( xXInt, UNO_QUERY);
-    if( ! xVM.is())
+    if( ! xVM.is()) 
         return sal_False;
 
 
@@ -158,27 +158,27 @@ sal_Bool test1(const Reference< XMultiServiceFactory > & xMgr )
     }
     catch (JavaNotConfiguredException& e)
     {
-        OString msg= OUStringToOString(e.Message, osl_getThreadTextEncoding());
+        OString msg= OUStringToOString(e.Message, osl_getThreadTextEncoding()); 
         printf("JavaNotConfiguredException: %s\n", msg.getStr());
     }
     catch (JavaVMCreationFailureException& e)
     {
-        OString msg= OUStringToOString(e.Message, osl_getThreadTextEncoding());
+        OString msg= OUStringToOString(e.Message, osl_getThreadTextEncoding()); 
         printf("JavaVMCreationFailureException: %s\n", msg.getStr());
     }
     catch (MissingJavaRuntimeException& e)
     {
-        OString msg= OUStringToOString(e.Message, osl_getThreadTextEncoding());
+        OString msg= OUStringToOString(e.Message, osl_getThreadTextEncoding()); 
         printf("MissingJavaRuntimeException: %s\n", msg.getStr());
     }
     catch (JavaDisabledException& e)
     {
-        OString msg= OUStringToOString(e.Message, osl_getThreadTextEncoding());
+        OString msg= OUStringToOString(e.Message, osl_getThreadTextEncoding()); 
         printf("JavaDisabledException: %s\n", msg.getStr());
     }
     catch (RuntimeException & e)
     {
-        OString msg= OUStringToOString(e.Message, osl_getThreadTextEncoding());
+        OString msg= OUStringToOString(e.Message, osl_getThreadTextEncoding()); 
         printf("###RuntimeException: %s\n", msg.getStr());
         retVal= sal_False;
     }
@@ -194,7 +194,7 @@ SAL_IMPLEMENT_MAIN()
     Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg);
     Reference<XMultiComponentFactory> fac= context->getServiceManager();
     Reference<XMultiServiceFactory> xMgr( fac, UNO_QUERY);
-
+    
     sal_Bool bSucc = sal_False;
     bSucc= test1(xMgr);
     Reference< XComponent > xCompContext( context, UNO_QUERY );
diff --git a/stoc/test/javavm/testapplet/TestApplet.java b/stoc/test/javavm/testapplet/TestApplet.java
index 55916cff784b..88abddb91164 100644
--- a/stoc/test/javavm/testapplet/TestApplet.java
+++ b/stoc/test/javavm/testapplet/TestApplet.java
@@ -14,7 +14,7 @@ import java.net.MalformedURLException;
 /**
  *
  * @author  jl97489
- * @version
+ * @version 
  */
 public class TestApplet extends java.applet.Applet {
 
@@ -24,13 +24,13 @@ public class TestApplet extends java.applet.Applet {
     public void init () {
         setBackground( Color.green);
         resize( 300, 300);
-
+        
         // Security tests.
         File f= new File("d:\\temp\\javasecurity.txt");
         SecurityManager mgr= System.getSecurityManager();
         try {
             f.createNewFile();
-
+        
         // local connection
         URL url= new URL("http://localhost:8080/index.html");
         InputStream is= url.openStream();
diff --git a/stoc/test/javavm/testcomponent/TestComponent.java b/stoc/test/javavm/testcomponent/TestComponent.java
index 5622ba087d7a..9a6c2a34e30a 100644
--- a/stoc/test/javavm/testcomponent/TestComponent.java
+++ b/stoc/test/javavm/testcomponent/TestComponent.java
@@ -8,14 +8,14 @@ import java.net.*;
 
 
 /** This component implements XTypeProvider for use with StarBasic.
- *  The XServiceInfo is implemented to have an interface in which we can put some
+ *  The XServiceInfo is implemented to have an interface in which we can put some 
  *  code just for the sake of debugging.
  *
  *  To debug with JPDA (jdk 1.3), put these lines in the java.ini within the  [Java] section:
  *  -Xdebug
  *  -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y
- *
- *  When the Virtual Machine service is instantiated it will block until the debugger
+ *  
+ *  When the Virtual Machine service is instantiated it will block until the debugger 
  *  attaches to it on port 8000. You can chose a different port. You attach to the VM using
  *  jdb by
  *
@@ -26,7 +26,7 @@ import java.net.*;
 public class TestComponent implements XServiceInfo, XTypeProvider
 {
     public static final String __serviceName="JavaTestComponent";
-
+    
     // XTypeProvider
     public com.sun.star.uno.Type[] getTypes(  )
     {
@@ -41,7 +41,7 @@ public class TestComponent implements XServiceInfo, XTypeProvider
         return TestComponent.class.getName().getBytes();
     }
 
-
+    
     // XServiceName
     public String getImplementationName(  )
     {
@@ -58,12 +58,12 @@ public class TestComponent implements XServiceInfo, XTypeProvider
 
         prop= System.getProperty("stardiv.security.disableSecurity");
         prop= System.getProperty("appletviewer.security.mode");
-
+        
         // Test security settings
         File f= new File("c:/temp/javasecurity.txt");
         try {
             f.createNewFile();
-
+        
                // local connection
         URL url= new URL("http://localhost:8080/index.html");
         InputStream is= url.openStream();
@@ -85,10 +85,10 @@ public class TestComponent implements XServiceInfo, XTypeProvider
     // XServiceName
     public boolean supportsService( /*IN*/String ServiceName )
     {
-
+        
         return false;
     }
-
+    
     //XServiceName
     public String[] getSupportedServiceNames(  )
     {
@@ -119,7 +119,7 @@ public class TestComponent implements XServiceInfo, XTypeProvider
    * @param   regKey       the registryKey
    * @see                  com.sun.star.comp.loader.JavaLoader
    */
-    public static boolean __writeRegistryServiceInfo(XRegistryKey regKey)
+    public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) 
     {
         return FactoryHelper.writeRegistryServiceInfo( TestComponent.class.getName(),
         TestComponent.__serviceName, regKey);
diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx
index a873cb0cfd95..6bab261c09e7 100644
--- a/stoc/test/javavm/testjavavm.cxx
+++ b/stoc/test/javavm/testjavavm.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -66,7 +66,7 @@ sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr )
     if( ! xXInt.is())
         return sal_False;
     Reference<XJavaVM> xVM( xXInt, UNO_QUERY);
-    if( ! xVM.is())
+    if( ! xVM.is()) 
         return sal_False;
     Reference<XJavaThreadRegister_11> xreg11(xVM, UNO_QUERY);
     if( ! xreg11.is())
@@ -99,23 +99,23 @@ sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr )
 
     JavaVM* _jvm= *(JavaVM**) anyVM.getValue();
     JNIEnv *p_env;
-    if( _jvm->AttachCurrentThread((void**) &p_env, 0))
+    if( _jvm->AttachCurrentThread((void**) &p_env, 0)) 
         return sal_False;
 
-//  jclass aJProg = p_env->FindClass("TestJavaVM");
-//  if( p_env->ExceptionOccurred()){
-//      p_env->ExceptionDescribe();
-//      p_env->ExceptionClear();
-//  }
+//	jclass aJProg = p_env->FindClass("TestJavaVM");
+//	if( p_env->ExceptionOccurred()){
+//		p_env->ExceptionDescribe();
+//		p_env->ExceptionClear();
+//	}
 //
-//  jmethodID mid= p_env->GetStaticMethodID( aJProg,"main", "([Ljava/lang/String;)V");
+//	jmethodID mid= p_env->GetStaticMethodID( aJProg,"main", "([Ljava/lang/String;)V");
 
     jclass cls = p_env->FindClass( "TestJavaVM");
     if (cls == 0) {
         OSL_TRACE( "Can't find Prog class\n");
         exit(1);
     }
-
+ 
 //   jmethodID methid = p_env->GetStaticMethodID( cls, "main", "([Ljava/lang/String;)V");
 //    if (methid == 0) {
 //        OSL_TRACE("Can't find Prog.main\n");
@@ -127,7 +127,7 @@ sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr )
 //        OSL_TRACE("Out of memory\n");
 //        exit(1);
 //    }
-//    jobjectArray args = p_env->NewObjectArray( 1,
+//    jobjectArray args = p_env->NewObjectArray( 1, 
 //                        p_env->FindClass("java/lang/String"), jstr);
 //    if (args == 0) {
 //        OSL_TRACE( "Out of memory\n");
@@ -139,10 +139,10 @@ sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr )
     jmethodID id = p_env->GetStaticMethodID( cls, "getInt", "()I");
     if( id)
     {
-//      jint _i= p_env->CallStaticIntMethod(cls, id);
-        p_env->CallStaticIntMethod(cls, id);
+//		jint _i= p_env->CallStaticIntMethod(cls, id);
+        p_env->CallStaticIntMethod(cls, id);        
     }
-
+        
     if( p_env->ExceptionOccurred()){
         p_env->ExceptionDescribe();
         p_env->ExceptionClear();
@@ -162,7 +162,7 @@ SAL_IMPLEMENT_MAIN()
     Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg);
     Reference<XMultiComponentFactory> fac= context->getServiceManager();
     Reference<XMultiServiceFactory> xMgr( fac, UNO_QUERY);
-
+    
     sal_Bool bSucc = sal_False;
     try
     {
@@ -178,7 +178,7 @@ SAL_IMPLEMENT_MAIN()
             RTL_CONSTASCII_USTRINGPARAM( "javavm.uno" SAL_DLLEXTENSION ) );
         xImplReg->registerImplementation(
             sLibLoader, sJenLib, Reference< XSimpleRegistry >() );
-
+        
         bSucc = testJavaVM( xMgr );
     }
     catch (Exception & rExc)
@@ -193,7 +193,7 @@ SAL_IMPLEMENT_MAIN()
     Reference< XComponent > xCompContext( context, UNO_QUERY );
     xCompContext->dispose();
     printf("javavm %s", bSucc ? "succeeded" : "failed");
-//  cout << "javavm " << (bSucc ? "succeeded" : "failed") << " !" << endl;
+//	cout << "javavm " << (bSucc ? "succeeded" : "failed") << " !" << endl;
     return (bSucc ? 0 : -1);
 }
 
diff --git a/stoc/test/javavm/testjavavm.java b/stoc/test/javavm/testjavavm.java
index 3de93cfc690f..7f866bec89a2 100644
--- a/stoc/test/javavm/testjavavm.java
+++ b/stoc/test/javavm/testjavavm.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,4 +36,4 @@ class TestJavaVM
     {
         System.out.println("Hello World");
     }
-}
+}	
diff --git a/stoc/test/language_binding.idl b/stoc/test/language_binding.idl
index 705ef1c2825a..7b4a7a64cac7 100644
--- a/stoc/test/language_binding.idl
+++ b/stoc/test/language_binding.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,27 +50,27 @@ enum TestEnum
  */
 struct TestSimple
 {
-    boolean                    Bool;
-    char                       Char;
-    byte                       Byte;
-    short                      Short;
-    unsigned short             UShort;
-    long                       Long;
-    unsigned long              ULong;
-    hyper                      Hyper;
-    unsigned hyper             UHyper;
-    float                      Float;
-    double                     Double;
-    test::TestEnum             Enum;
+    boolean					   Bool;
+    char					   Char;
+    byte					   Byte;
+    short					   Short;
+    unsigned short			   UShort;
+    long					   Long;
+    unsigned long			   ULong;
+    hyper					   Hyper;
+    unsigned hyper			   UHyper;
+    float					   Float;
+    double					   Double;
+    test::TestEnum			   Enum;
 };
 /**
  * complex c++ types
  */
 struct TestElement : test::TestSimple
 {
-    string                     String;
+    string					   String;
     com::sun::star::uno::XInterface   Interface;
-    any                        Any;
+    any						   Any;
 };
 struct TestDataElements : test::TestElement
 {
@@ -78,8 +78,8 @@ struct TestDataElements : test::TestElement
 };
 
 typedef TestDataElements TestData;
-
-/**
+ 
+/** 
  * Monster test interface to test language binding calls.
  *
  * @author Daniel Boelzle
@@ -110,7 +110,7 @@ interface XLBTestBase : com::sun::star::uno::XInterface
                                [inout] com::sun::star::uno::XInterface xInterface, [inout] any aAny,
                                [inout] sequence<test::TestElement > aSequence,
                                [inout] test::TestData aStruct );
-
+    
     /**
      * out parameter test
      */
@@ -123,28 +123,28 @@ interface XLBTestBase : com::sun::star::uno::XInterface
                               [out] com::sun::star::uno::XInterface xInterface, [out] any aAny,
                               [out] sequence<test::TestElement > aSequence,
                               [out] test::TestData aStruct );
-
-    [attribute] boolean                  Bool;
-    [attribute] byte                     Byte;
-    [attribute] char                     Char;
-    [attribute] short                    Short;
-    [attribute] unsigned short           UShort;
-    [attribute] long                     Long;
-    [attribute] unsigned long            ULong;
-    [attribute] hyper                    Hyper;
-    [attribute] unsigned hyper           UHyper;
-    [attribute] float                    Float;
-    [attribute] double                   Double;
-    [attribute] test::TestEnum           Enum;
-    [attribute] string                   String;
+    
+    [attribute] boolean					 Bool;
+    [attribute] byte					 Byte;
+    [attribute] char					 Char;
+    [attribute] short					 Short;
+    [attribute] unsigned short			 UShort;
+    [attribute] long					 Long;
+    [attribute] unsigned long			 ULong;
+    [attribute] hyper					 Hyper;
+    [attribute] unsigned hyper			 UHyper;
+    [attribute] float					 Float;
+    [attribute] double					 Double;
+    [attribute] test::TestEnum			 Enum;
+    [attribute] string					 String;
     [attribute] com::sun::star::uno::XInterface Interface;
-    [attribute] any                      Any;
+    [attribute] any						 Any;
     [attribute] sequence<test::TestElement > Sequence;
-    [attribute] test::TestData           Struct;
+    [attribute] test::TestData			 Struct;
 };
 
 
-/**
+/** 
  * Inherting from monster; adds raiseException().
  *
  * @author Daniel Boelzle
@@ -168,7 +168,7 @@ interface XLanguageBindingTest : test::XLBTestBase
     /**
      * raises runtime exception
      */
-    [attribute] long                     RuntimeException;
+    [attribute] long					 RuntimeException;
 };
 
 }; // test
diff --git a/stoc/test/mergekeys_.cxx b/stoc/test/mergekeys_.cxx
index e47de6cfbc00..defe2760b98a 100644
--- a/stoc/test/mergekeys_.cxx
+++ b/stoc/test/mergekeys_.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
index 02471d1c5d87..2ecdfbd5dd73 100644
--- a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
+++ b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/test/registry_tdprovider/types.idl b/stoc/test/registry_tdprovider/types.idl
index 636b272226be..5e74a9c09c6a 100644
--- a/stoc/test/registry_tdprovider/types.idl
+++ b/stoc/test/registry_tdprovider/types.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/test/security/test_security.cxx b/stoc/test/security/test_security.cxx
index 510f832b09b1..9a1e9488cd40 100644
--- a/stoc/test/security/test_security.cxx
+++ b/stoc/test/security/test_security.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -91,10 +91,10 @@ class user_CurrentContext
     : public ImplHelper1< XCurrentContext >
 {
     oslInterlockedCount m_refcount;
-
+    
     Reference< XCurrentContext > m_xDelegate;
     Any m_userId;
-
+    
 public:
     inline user_CurrentContext(
         Reference< XCurrentContext > const & xDelegate,
@@ -104,13 +104,13 @@ public:
         , m_xDelegate( xDelegate )
         , m_userId( makeAny( userId ) )
         {}
-
+    
     // XInterface impl
     virtual void SAL_CALL acquire()
         throw ();
     virtual void SAL_CALL release()
         throw ();
-
+    
     // XCurrentContext impl
     virtual Any SAL_CALL getValueByName( OUString const & name )
         throw (RuntimeException);
@@ -248,7 +248,7 @@ grant user "dbo"
 permission com.sun.star.io.FilePermission "file:///home/dbo/-", "read,write";
 permission com.sun.star.io.FilePermission "-", "read,write";
 permission com.sun.star.io.FilePermission "file:///usr/local/dbo/ *", "read";
-
+                                                                  
 permission com.sun.star.security.RuntimePermission "DBO";
 
 permission com.sun.star.connection.SocketPermission "dbo-1:1024-", "listen";
@@ -371,12 +371,12 @@ class acc_Restr
     : public WeakImplHelper1< security::XAccessControlContext >
 {
     Any m_perm;
-
+    
 public:
     inline acc_Restr( Any const & perm = Any() ) SAL_THROW( () )
         : m_perm( perm )
         {}
-
+    
     // XAccessControlContext impl
     virtual void SAL_CALL checkPermission( Any const & perm )
         throw (RuntimeException);
@@ -408,7 +408,7 @@ public:
         , m_ac( ac )
         , m_arg( arg )
         {}
-
+    
     // XAction impl
     virtual Any SAL_CALL run()
         throw (Exception);
@@ -471,13 +471,13 @@ SAL_IMPLEMENT_MAIN()
         check_dbo_dynamic( ac );
         ::fprintf( stderr, "dbo checked.\n" );
         }
-
+        
         // multi-user test
         dispose( xContext );
         xContext = defaultBootstrap_InitialComponentContext(
             OUSTR("../../test/security/test_security.ini") ); // UNO_AC=on
         AccessControl ac( xContext );
-
+        
         {
         // set up dbo current context
         ContextLayer layer( new user_CurrentContext( getCurrentContext(), OUSTR("dbo") ) );
@@ -510,7 +510,7 @@ SAL_IMPLEMENT_MAIN()
         check_defaults_neg( ac );
         ::fprintf( stderr, "guest checked.\n" );
         }
-
+        
         dispose( xContext );
         ::fprintf( stderr, "security test succeeded.\n" );
         return 0;
diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx
index 0901ae6522e7..f676a20a6c49 100644
--- a/stoc/test/tdmanager/testtdmanager.cxx
+++ b/stoc/test/tdmanager/testtdmanager.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -154,7 +154,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments)
                         arguments[argPos].pData, &url.pData ) );
         bool supposedToBeCompatible = ! url.endsWithIgnoreAsciiCaseAsciiL(
             RTL_CONSTASCII_STRINGPARAM("_incomp.rdb") );
-
+        
         css::uno::Reference<css::registry::XSimpleRegistry> xReg(
             m_context->getServiceManager()->createInstanceWithContext(
                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
@@ -183,9 +183,9 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments)
             assertFalse(supposedToBeCompatible);
         }
     }
-
+    
     ///////
-
+    
     css::uno::Reference< css::reflection::XIndirectTypeDescription > sequence(
         manager->getByHierarchicalName(
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[][]boolean"))),
diff --git a/stoc/test/tdmanager/types.idl b/stoc/test/tdmanager/types.idl
index 68644509639c..622047e9b79f 100644
--- a/stoc/test/tdmanager/types.idl
+++ b/stoc/test/tdmanager/types.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@ struct Struct<T, U> { U s; };
 published interface XAnother {
     void f();
 };
-
+ 
 service MyService {
     [optional] interface XAnother;
     [property, optional] boolean b;
diff --git a/stoc/test/tdmanager/types2_incomp.idl b/stoc/test/tdmanager/types2_incomp.idl
index 8caec558c4bf..dcac9ef4e6f3 100644
--- a/stoc/test/tdmanager/types2_incomp.idl
+++ b/stoc/test/tdmanager/types2_incomp.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/test/tdmanager/types3_incomp.idl b/stoc/test/tdmanager/types3_incomp.idl
index 3cb7436f471a..8838700904da 100644
--- a/stoc/test/tdmanager/types3_incomp.idl
+++ b/stoc/test/tdmanager/types3_incomp.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/test/tdmanager/types4_incomp.idl b/stoc/test/tdmanager/types4_incomp.idl
index 127a90647824..742b48cf2d1d 100644
--- a/stoc/test/tdmanager/types4_incomp.idl
+++ b/stoc/test/tdmanager/types4_incomp.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@ published interface XAnother {
     // wrong name:
     void f2();
 };
-
+ 
 service MyService {
     [optional] interface XAnother;
     [property, optional] boolean b;
diff --git a/stoc/test/tdmanager/types5.idl b/stoc/test/tdmanager/types5.idl
index 9c09f24015de..1474c2929b95 100644
--- a/stoc/test/tdmanager/types5.idl
+++ b/stoc/test/tdmanager/types5.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@ module test { module tdmanager {
 published interface XAnother {
     void f();
 };
-
+ 
 service MyService {
     [optional] interface XAnother;
     // correct order:
@@ -41,5 +41,5 @@ service MyService {
 };
 
 const long CCC = 5;
-
+ 
 }; };
diff --git a/stoc/test/tdmanager/types5_incomp.idl b/stoc/test/tdmanager/types5_incomp.idl
index 86d94f3b86f8..337c76c7c9ca 100644
--- a/stoc/test/tdmanager/types5_incomp.idl
+++ b/stoc/test/tdmanager/types5_incomp.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@ module test { module tdmanager {
 published interface XAnother {
     void f();
 };
-
+ 
 service MyService {
     [optional] interface XAnother;
     // wrong order:
diff --git a/stoc/test/tdmanager/types6_incomp.idl b/stoc/test/tdmanager/types6_incomp.idl
index 98ab905e2f76..cadd0be19c66 100644
--- a/stoc/test/tdmanager/types6_incomp.idl
+++ b/stoc/test/tdmanager/types6_incomp.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@ module test { module tdmanager {
 published interface XAnother {
     void f();
 };
-
+ 
 service MyService {
     // made non-optional:
     interface XAnother;
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index 35733dc771a6..eb058a73e9a1 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,10 +53,10 @@ using namespace com::sun::star::script;
 using namespace com::sun::star::reflection;
 using namespace com::sun::star::registry;
 
-const double MIN_DOUBLE     = -DBL_MAX;
-const double MAX_DOUBLE     = DBL_MAX;
-const double MIN_FLOAT      = -FLT_MAX;
-const double MAX_FLOAT      = FLT_MAX;
+const double MIN_DOUBLE		= -DBL_MAX;
+const double MAX_DOUBLE		= DBL_MAX;
+const double MIN_FLOAT		= -FLT_MAX;
+const double MAX_FLOAT		= FLT_MAX;
 
 //==================================================================================================
 static void printValue( const Any & rVal )
@@ -275,10 +275,10 @@ static sal_Bool convertTo( const Type & rDestType, const Any & rVal, sal_Bool bE
 //==================================================================================================
 typedef struct _ConvBlock
 {
-    Any         _value;
-    sal_Bool    _toString, _toDouble, _toFloat;
-    sal_Bool    _toUINT32, _toINT32, _toUINT16, _toINT16, _toBYTE, _toBOOL, _toChar;
-    sal_Bool    _toTypeClass, _toSeqINT16, _toSeqAny;
+    Any			_value;
+    sal_Bool	_toString, _toDouble, _toFloat;
+    sal_Bool	_toUINT32, _toINT32, _toUINT16, _toINT16, _toBYTE, _toBOOL, _toChar;
+    sal_Bool	_toTypeClass, _toSeqINT16, _toSeqAny;
 
     _ConvBlock()
     {
@@ -584,36 +584,36 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks )
     // ==SEQ of INT==
     Sequence< sal_Int32 > aINT32Seq( 3 ), aINT32Seq2( 3 );
     sal_Int32 * pINT32Seq = aINT32Seq.getArray();
-    pINT32Seq[0]     = -32768;
-    pINT32Seq[1]     = 0;
-    pINT32Seq[2]     = 32767;
+    pINT32Seq[0]	 = -32768;
+    pINT32Seq[1]	 = 0;
+    pINT32Seq[2]	 = 32767;
     aVal <<= aINT32Seq;
     pTestBlocks[nElems++] = ConvBlock( aVal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     pINT32Seq = aINT32Seq2.getArray();
-    pINT32Seq[0]     = -32768;
-    pINT32Seq[1]     = -32769;
-    pINT32Seq[2]     = 32767;
+    pINT32Seq[0]	 = -32768;
+    pINT32Seq[1]	 = -32769;
+    pINT32Seq[2]	 = 32767;
     aVal <<= aINT32Seq2;
     pTestBlocks[nElems++] = ConvBlock( aVal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     // ==SEQ of ANY==
     Sequence< Any > aAnySeq( 2 ), aAnySeq2( 2 ), aAnySeq3( 2 );
-    Any * pAnySeq    = aAnySeq.getArray();
-    pAnySeq[0]       = makeAny( aINT32Seq );
-    pAnySeq[1]       = makeAny( OUString::createFromAscii("lala") );
+    Any * pAnySeq	 = aAnySeq.getArray();
+    pAnySeq[0]		 = makeAny( aINT32Seq );
+    pAnySeq[1]		 = makeAny( OUString::createFromAscii("lala") );
     aVal <<= aAnySeq;
     pTestBlocks[nElems++] = ConvBlock( aVal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     pAnySeq = aAnySeq2.getArray();
-    pAnySeq[0]       <<= (sal_Int32)4711;
-    pAnySeq[1]       <<= OUString::createFromAscii("0815");
+    pAnySeq[0]		 <<= (sal_Int32)4711;
+    pAnySeq[1]		 <<= OUString::createFromAscii("0815");
     aVal <<= aAnySeq2;
     pTestBlocks[nElems++] = ConvBlock( aVal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
     pAnySeq = aAnySeq3.getArray();
-    pAnySeq[0]       <<= OUString::createFromAscii("TypeClass_UNION");
-    pAnySeq[1]       <<= OUString::createFromAscii("TypeClass_ENUM");
+    pAnySeq[0]		 <<= OUString::createFromAscii("TypeClass_UNION");
+    pAnySeq[1]		 <<= OUString::createFromAscii("TypeClass_ENUM");
     aVal <<= aAnySeq3;
     pTestBlocks[nElems++] = ConvBlock( aVal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 );
                                          // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa
@@ -635,7 +635,7 @@ static void test_Conversion( const Reference< XMultiServiceFactory > & xMgr )
     while (nPos--)
     {
         const ConvBlock& rBlock = pTestBlocks[nPos];
-        const Any & rVal        = rBlock._value;
+        const Any & rVal		= rBlock._value;
 
         convertTo( ::getCppuType( (const OUString *)0 ), rVal, rBlock._toString );
         convertTo( ::getCppuType( (const float *)0 ), rVal, rBlock._toFloat );
@@ -683,7 +683,7 @@ SAL_IMPLEMENT_MAIN()
         Reference< XImplementationRegistration > xImplReg(
             xMgr->createInstance( OUString::createFromAscii("com.sun.star.registry.ImplementationRegistration") ), UNO_QUERY );
         OSL_ENSURE( xImplReg.is(), "### no impl reg!" );
-
+        
         OUString aLibName(
             RTL_CONSTASCII_USTRINGPARAM("stocservices.uno" SAL_DLLEXTENSION) );
         xImplReg->registerImplementation(
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index 34faf2f7c4b5..c9d06cdc255d 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -117,8 +117,8 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
     TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstUShort")) == aConstUShort, "test_RegCoreReflection(): error 4i");
     TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstLong")) == aConstLong, "test_RegCoreReflection(): error 4k");
     TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstULong")) == aConstULong, "test_RegCoreReflection(): error 4m");
-//      TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstFloat")) == aConstFloat, "test_RegCoreReflection(): error 4o");
-//      TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstDouble")) == aConstDouble, "test_RegCoreReflection(): error 4q");
+//  	TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstFloat")) == aConstFloat, "test_RegCoreReflection(): error 4o");
+//  	TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstDouble")) == aConstDouble, "test_RegCoreReflection(): error 4q");
 
     // Enums
 
@@ -246,14 +246,14 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
 
     TEST_ENSHURE(aAny.getValueTypeName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("[][]ModuleA.StructA") ), "test_RegCoreReflection(): error 56");
 
-//      xClass = xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.XIntroTest") ));
+//  	xClass = xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.XIntroTest") ));
 
-//      TEST_ENSHURE(xClass.is(), "test_RegCoreReflection(): error 58");
-//      TEST_ENSHURE(xClass->getMethod(OUString::createFromAscii("getStrings"))->getReturnType()->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 59");
-//      TEST_ENSHURE(xClass->getMethod(OUString::createFromAscii("getStrings"))->getReturnType()->getComponentType()->getName() == OUString::createFromAscii("string"), "test_RegCoreReflection(): error 60");
+//  	TEST_ENSHURE(xClass.is(), "test_RegCoreReflection(): error 58");
+//  	TEST_ENSHURE(xClass->getMethod(OUString::createFromAscii("getStrings"))->getReturnType()->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 59");
+//  	TEST_ENSHURE(xClass->getMethod(OUString::createFromAscii("getStrings"))->getReturnType()->getComponentType()->getName() == OUString::createFromAscii("string"), "test_RegCoreReflection(): error 60");
 
-//      xClass->getMethod(OUString::createFromAscii("getStrings"))->getReturnType()->createObject(aAny);
-//      TEST_ENSHURE(aAny.getValueTypeName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("[]string") ),  "test_RegCoreReflection(): error 61");
+//  	xClass->getMethod(OUString::createFromAscii("getStrings"))->getReturnType()->createObject(aAny);
+//  	TEST_ENSHURE(aAny.getValueTypeName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("[]string") ),  "test_RegCoreReflection(): error 61");
 
     TEST_ENSHURE(xRefl->forName(OUString::createFromAscii("[][][]unsigned long"))->getComponentType()->getComponentType()->getComponentType()->getTypeClass() == TypeClass_UNSIGNED_LONG, "test_RegCoreReflection(): error 62");
 
@@ -276,7 +276,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
         Any gulp;
         rField = Reference< XIdlField2 > ( xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString")) , UNO_QUERY);
         rField->set( blup, gulp);
-//          xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString"))->set(blup, gulp);
+//  		xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString"))->set(blup, gulp);
         TEST_ENSHURE(sal_False, "test_RegCoreReflection(): error 64");
         return sal_False;
     }
@@ -373,7 +373,7 @@ SAL_IMPLEMENT_MAIN()
     {
         OUString aLibName( RTL_CONSTASCII_USTRINGPARAM(
                                "reflection.uno" SAL_DLLEXTENSION) );
-
+        
         Reference< XMultiServiceFactory > xMgr(
             createRegistryServiceFactory(
                 OUString( RTL_CONSTASCII_USTRINGPARAM("stoctest.rdb") ) ) );
@@ -393,7 +393,7 @@ SAL_IMPLEMENT_MAIN()
                         >>= xRefl;
         OSL_ENSURE(
             xRefl.is(), "### CoreReflection singleton not accessable!?" );
-
+        
         bSucc = test_corefl( xRefl );
 
         Reference< XComponent >( xContext, UNO_QUERY )->dispose();
diff --git a/stoc/test/testcorefl.idl b/stoc/test/testcorefl.idl
index 1ae37a6f45e9..5d28f334514c 100644
--- a/stoc/test/testcorefl.idl
+++ b/stoc/test/testcorefl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,16 +39,16 @@ module ModuleA
         short aShort;
     };
 
-    struct StructB : StructA
+    struct StructB : StructA								
     {
         double aDouble;
-        float   aFloat;
+        float 	aFloat;
     };
 
     struct StructC : StructB
     {
-        string                              aString;
-        sequence<com::sun::star::uno::XInterface>   aInterfaceSeq;
+        string 			   					aString;
+        sequence<com::sun::star::uno::XInterface> 	aInterfaceSeq; 
     };
 
     exception ExceptionB : ExceptionA
@@ -59,7 +59,7 @@ module ModuleA
     interface XInterface1 : com::sun::star::uno::XInterface
     {
     };
-
+    
     exception ExceptionC : ExceptionB
     {
         XInterface1 aInterface1;
@@ -74,16 +74,16 @@ module ModuleA
 
 module ModuleC
 {
-    const boolean           aConstBoolean   = True;
-    const byte              aConstByte      = 0;
-    const short             aConstShort     = -1;
-    const unsigned short    aConstUShort    = 1;
-    const long              aConstLong      = -2;
-    const unsigned long     aConstULong     = 2;
-//      const hyper             aConstHyper     = -3;
-//      const unsigned hyper    aConstUHyper    = 3;
-    const float             aConstFloat     = 3.14;
-    const double            aConstDouble    = 3.14e-10;
+    const boolean 			aConstBoolean 	= True;
+    const byte 				aConstByte 		= 0;
+    const short 			aConstShort 	= -1;
+    const unsigned short 	aConstUShort 	= 1;
+    const long 				aConstLong 		= -2;
+    const unsigned long 	aConstULong 	= 2;
+//  	const hyper				aConstHyper 	= -3;
+//  	const unsigned hyper	aConstUHyper	= 3;
+    const float				aConstFloat 	= 3.14;
+    const double			aConstDouble	= 3.14e-10;
 
 
     interface XInterfaceA : com::sun::star::uno::XInterface
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index a38612a629bb..133fd138ab7b 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -80,7 +80,7 @@ sal_Bool equals( const test::TestElement & rData1, const test::TestElement & rDa
     OSL_ENSURE( rData1.String == rData2.String, "### string does not match!" );
     OSL_ENSURE( rData1.Interface == rData2.Interface, "### interface does not match!" );
     OSL_ENSURE( rData1.Any == rData2.Any, "### any does not match!" );
-
+    
     return (rData1.Bool == rData2.Bool &&
             rData1.Char == rData2.Char &&
             rData1.Byte == rData2.Byte &&
@@ -101,7 +101,7 @@ sal_Bool equals( const test::TestElement & rData1, const test::TestElement & rDa
 sal_Bool equals( const test::TestData & rData1, const test::TestData & rData2 )
 {
     sal_Int32 nLen;
-
+    
     if ((rData1.Sequence == rData2.Sequence) &&
         equals( (const test::TestElement &)rData1, (const test::TestElement &)rData2 ) &&
         (nLen = rData1.Sequence.getLength()) == rData2.Sequence.getLength())
@@ -170,11 +170,11 @@ void assign( test::TestData & rData,
 class Test_Impl : public WeakImplHelper1< XLanguageBindingTest >
 {
     test::TestData _aData, _aStructData;
-
+    
 public:
     virtual ~Test_Impl()
         { OSL_TRACE( "> scalar Test_Impl dtor <\n" ); }
-
+    
     // XLBTestBase
     virtual void SAL_CALL setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
                                      sal_Int16 nShort, sal_uInt16 nUShort,
@@ -187,7 +187,7 @@ public:
                                      const ::com::sun::star::uno::Sequence<test::TestElement >& rSequence,
                                      const test::TestData& rStruct )
         throw(com::sun::star::uno::RuntimeException);
-
+    
     virtual test::TestData SAL_CALL setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte,
                                                 sal_Int16& nShort, sal_uInt16& nUShort,
                                                 sal_Int32& nLong, sal_uInt32& nULong,
@@ -199,7 +199,7 @@ public:
                                                 ::com::sun::star::uno::Sequence<test::TestElement >& rSequence,
                                                 test::TestData& rStruct )
         throw(com::sun::star::uno::RuntimeException);
-
+    
     virtual test::TestData SAL_CALL getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte,
                                                sal_Int16& nShort, sal_uInt16& nUShort,
                                                sal_Int32& nLong, sal_uInt32& nULong,
@@ -211,7 +211,7 @@ public:
                                                ::com::sun::star::uno::Sequence< test::TestElement >& rSequence,
                                                test::TestData& rStruct )
         throw(com::sun::star::uno::RuntimeException);
-
+    
     virtual sal_Bool SAL_CALL getBool() throw(com::sun::star::uno::RuntimeException)
         { return _aData.Bool; }
     virtual sal_Int8 SAL_CALL getByte() throw(com::sun::star::uno::RuntimeException)
@@ -285,7 +285,7 @@ public:
     // XLanguageBindingTest
     virtual test::TestData SAL_CALL raiseException( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte, sal_Int16& nShort, sal_uInt16& nUShort, sal_Int32& nLong, sal_uInt32& nULong, sal_Int64& nHyper, sal_uInt64& nUHyper, float& fFloat, double& fDouble, test::TestEnum& eEnum, ::rtl::OUString& aString, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInterface, ::com::sun::star::uno::Any& aAny, ::com::sun::star::uno::Sequence<test::TestElement >& aSequence,test::TestData& aStruct )
         throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-
+    
     virtual sal_Int32 SAL_CALL getRuntimeException() throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setRuntimeException( sal_Int32 _runtimeexception ) throw(::com::sun::star::uno::RuntimeException);
 };
@@ -293,13 +293,13 @@ public:
 class XLB_Invocation : public WeakImplHelper1< XInvocation >
 {
     Reference< XLanguageBindingTest > _xLBT;
-
+    
 public:
     XLB_Invocation( const Reference< XMultiServiceFactory > & /*xMgr*/,
                     const Reference< XLanguageBindingTest > & xLBT )
         : _xLBT( xLBT )
         {}
-
+    
     // XInvocation
     virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw(::com::sun::star::uno::RuntimeException)
         { return Reference< XIntrospectionAccess >(); }
@@ -320,12 +320,12 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException)
 {
     bool bImplementedMethod = true;
-
+    
     Any aRet;
-
+    
     OSL_ASSERT( rOutParam.getLength() == 0 );
     OSL_ASSERT( rOutParamIndex.getLength() == 0 );
-
+    
     try
     {
         sal_Bool aBool;
@@ -345,7 +345,7 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
         Any aAny;
         Sequence< TestElement > aSeq;
         TestData aData;
-
+        
         if (rFunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("setValues") ))
         {
             OSL_ASSERT( rParams.getLength() == 17 );
@@ -366,11 +366,11 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
             rParams[14] >>= aAny;
             rParams[15] >>= aSeq;
             rParams[16] >>= aData;
-
+            
             _xLBT->setValues( aBool, aChar, nByte, nShort, nUShort, nLong, nULong,
                               nHyper, nUHyper, fFloat, fDouble, eEnum, aString, xInterface,
                               aAny, aSeq, aData );
-
+            
             rOutParamIndex.realloc( 0 );
             rOutParam.realloc( 0 );
         }
@@ -393,11 +393,11 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
             rParams[14] >>= aAny;
             rParams[15] >>= aSeq;
             rParams[16] >>= aData;
-
+            
             aRet <<= _xLBT->setValues2( aBool, aChar, nByte, nShort, nUShort, nLong, nULong,
                                         nHyper, nUHyper, fFloat, fDouble, eEnum, aString, xInterface,
                                         aAny, aSeq, aData );
-
+            
             rOutParamIndex.realloc( 17 );
             rOutParamIndex[0] = 0;
             rOutParamIndex[1] = 1;
@@ -416,7 +416,7 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
             rOutParamIndex[14] = 14;
             rOutParamIndex[15] = 15;
             rOutParamIndex[16] = 16;
-
+            
             rOutParam.realloc( 17 );
             rOutParam[0].setValue( &aBool, ::getCppuBooleanType() );
             rOutParam[1].setValue( &aChar, ::getCppuCharType() );
@@ -441,7 +441,7 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
             aRet <<= _xLBT->getValues( aBool, aChar, nByte, nShort, nUShort, nLong, nULong,
                                        nHyper, nUHyper, fFloat, fDouble, eEnum, aString, xInterface,
                                        aAny, aSeq, aData );
-
+            
             rOutParamIndex.realloc( 17 );
             rOutParamIndex[0] = 0;
             rOutParamIndex[1] = 1;
@@ -460,7 +460,7 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
             rOutParamIndex[14] = 14;
             rOutParamIndex[15] = 15;
             rOutParamIndex[16] = 16;
-
+            
             rOutParam.realloc( 17 );
             rOutParam[0].setValue( &aBool, ::getCppuBooleanType() );
             rOutParam[1].setValue( &aChar, ::getCppuCharType() );
@@ -485,7 +485,7 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
             aRet <<= _xLBT->raiseException( aBool, aChar, nByte, nShort, nUShort, nLong, nULong,
                                             nHyper, nUHyper, fFloat, fDouble, eEnum, aString, xInterface,
                                             aAny, aSeq, aData );
-
+            
             rOutParamIndex.realloc( 17 );
             rOutParamIndex[0] = 0;
             rOutParamIndex[1] = 1;
@@ -504,7 +504,7 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
             rOutParamIndex[14] = 14;
             rOutParamIndex[15] = 15;
             rOutParamIndex[16] = 16;
-
+            
             rOutParam.realloc( 17 );
             rOutParam[0].setValue( &aBool, ::getCppuBooleanType() );
             rOutParam[1].setValue( &aChar, ::getCppuCharType() );
@@ -548,7 +548,7 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
             OUString( RTL_CONSTASCII_USTRINGPARAM("not an implemented method!") ),
             (OWeakObject *)this, 0 );
     }
-
+    
     return aRet;
 }
 //__________________________________________________________________________________________________
@@ -757,9 +757,9 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
     {
         // this data is never ever granted access to by calls other than equals(), assign()!
         test::TestData aData; // test against this data
-
+        
         Reference<XInterface > xI( *new OWeakObject() );
-
+        
         assign( (test::TestElement &)aData,
                 sal_True, '@', 17, 0x1234, 0xfedc, 0x12345678, 0xfedcba98,
                 SAL_CONST_INT64(0x123456789abcdef0),
@@ -769,22 +769,22 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
 
         OSL_ENSURE( aData.Any == xI, "### unexpected any!" );
         OSL_ENSURE( !(aData.Any != xI), "### unexpected any!" );
-
+        
         aData.Sequence = Sequence<test::TestElement >( (const test::TestElement *)&aData, 1 );
         // aData complete
         //================================================================================
 
         // this is a manually copy of aData for first setting...
         test::TestData aSetData;
-
+        
         assign( (test::TestElement &)aSetData,
                 aData.Bool, aData.Char, aData.Byte, aData.Short, aData.UShort,
                 aData.Long, aData.ULong, aData.Hyper, aData.UHyper, aData.Float, aData.Double,
                 aData.Enum, aData.String, xI,
                 Any( &xI, ::getCppuType( (const Reference<XInterface > *)0 ) ) );
-
+        
         aSetData.Sequence = Sequence<test::TestElement >( (const test::TestElement *)&aSetData, 1 );
-
+        
         xLBT->setValues(
             aSetData.Bool, aSetData.Char, aSetData.Byte, aSetData.Short, aSetData.UShort,
             aSetData.Long, aSetData.ULong, aSetData.Hyper, aSetData.UHyper, aSetData.Float, aSetData.Double,
@@ -796,15 +796,15 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
             aRet.Bool, aRet.Char, aRet.Byte, aRet.Short, aRet.UShort,
             aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float, aRet.Double,
             aRet.Enum, aRet.String, aRet.Interface, aRet.Any, aRet.Sequence, aRet2 );
-
+        
         OSL_ASSERT( equals( aData, aRet ) && equals( aData, aRet2 ) );
-
+        
         // set last retrieved values
         test::TestData aSV2ret = xLBT->setValues2(
             aRet.Bool, aRet.Char, aRet.Byte, aRet.Short, aRet.UShort,
             aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float, aRet.Double,
             aRet.Enum, aRet.String, aRet.Interface, aRet.Any, aRet.Sequence, aRet2 );
-
+        
         OSL_ASSERT( equals( aData, aSV2ret ) && equals( aData, aRet2 ) );
         }
         {
@@ -813,9 +813,9 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
             aRet.Bool, aRet.Char, aRet.Byte, aRet.Short, aRet.UShort,
             aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float, aRet.Double,
             aRet.Enum, aRet.String, aRet.Interface, aRet.Any, aRet.Sequence, aRet2 );
-
+        
         OSL_ASSERT( equals( aData, aRet ) && equals( aData, aRet2 ) && equals( aData, aGVret ) );
-
+        
         // set last retrieved values
         xLBT->setBool( aRet.Bool );
         xLBT->setChar( aRet.Char );
@@ -854,7 +854,7 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
         aRet.Any = xLBT->getAny();
         aRet.Sequence = xLBT->getSequence();
         aRet2 = xLBT->getStruct();
-
+        
         return (equals( aData, aRet ) && equals( aData, aRet2 ));
         }
     }
@@ -867,24 +867,24 @@ test::TestData Test_Impl::raiseException( sal_Bool& /*bBool*/, sal_Unicode& /*cC
 {
     IllegalArgumentException aExc;
     aExc.ArgumentPosition = 5;
-    aExc.Message          = OUString::createFromAscii("dum dum dum ich tanz im kreis herum...");
-    aExc.Context          = *this;
+    aExc.Message		  = OUString::createFromAscii("dum dum dum ich tanz im kreis herum...");
+    aExc.Context		  = *this;
     throw aExc;
 }
 //__________________________________________________________________________________________________
 sal_Int32 Test_Impl::getRuntimeException() throw(::com::sun::star::uno::RuntimeException)
 {
     RuntimeException aExc;
-    aExc.Message          = OUString::createFromAscii("dum dum dum ich tanz im kreis herum...");
-    aExc.Context          = *this;
+    aExc.Message		  = OUString::createFromAscii("dum dum dum ich tanz im kreis herum...");
+    aExc.Context		  = *this;
     throw aExc;
 }
 //__________________________________________________________________________________________________
 void Test_Impl::setRuntimeException( sal_Int32 /*_runtimeexception*/ ) throw(::com::sun::star::uno::RuntimeException)
 {
     RuntimeException aExc;
-    aExc.Message          = OUString::createFromAscii("dum dum dum ich tanz im kreis herum...");
-    aExc.Context          = *this;
+    aExc.Message		  = OUString::createFromAscii("dum dum dum ich tanz im kreis herum...");
+    aExc.Context		  = *this;
     throw aExc;
 }
 
@@ -907,13 +907,13 @@ sal_Bool raiseException( const Reference<XLanguageBindingTest > & xLBT )
             catch (IllegalArgumentException aExc)
             {
                 OSL_ENSURE( aExc.ArgumentPosition == 5 &&
-//                               aExc.Context == xLBT &&
+//  							 aExc.Context == xLBT &&
                              aExc.Message.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...")),
                              "### unexpected exception content!" );
-
+                
                 Reference<XLanguageBindingTest > xLBT2(
                     Reference<XLanguageBindingTest >::query( aExc.Context ) );
-
+                
                 OSL_ENSURE( xLBT2.is(), "### unexpected source of exception!" );
                 if (xLBT2.is())
                     xLBT2->getRuntimeException();
@@ -926,10 +926,10 @@ sal_Bool raiseException( const Reference<XLanguageBindingTest > & xLBT )
             OSL_ENSURE(//rExc.Context == xLBT &&
                         rExc.Message.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...")),
                         "### unexpected exception content!" );
-
+            
             Reference<XLanguageBindingTest > xLBT2(
                 Reference<XLanguageBindingTest >::query( rExc.Context ) );
-
+            
             OSL_ENSURE( xLBT2.is(), "### unexpected source of exception!" );
             if (xLBT2.is())
                 xLBT2->setRuntimeException( 0xcafebabe );
@@ -954,7 +954,7 @@ static sal_Bool test_adapter( const Reference< XMultiServiceFactory > & xMgr )
     Reference< XInvocationAdapterFactory > xAdapFac(
         xMgr->createInstance( OUString::createFromAscii("com.sun.star.script.InvocationAdapterFactory") ), UNO_QUERY );
     Reference< XInvocationAdapterFactory2 > xAdapFac2( xAdapFac, UNO_QUERY_THROW );
-
+    
     Reference< XLanguageBindingTest > xOriginal( (XLanguageBindingTest *)new Test_Impl() );
     Reference< XInvocation > xInvok( new XLB_Invocation( xMgr, xOriginal ) );
     Reference< XLanguageBindingTest > xLBT( xAdapFac->createAdapter(
@@ -981,7 +981,7 @@ static sal_Bool test_adapter( const Reference< XMultiServiceFactory > & xMgr )
             xInvok, ::getCppuType( (const Reference< XSimpleRegistry > *)0 ) ), UNO_QUERY );
     if (xLBT == xInvalidAdapter)
         return sal_False;
-
+    
     try
     {
         xInvalidAdapter->isValid();
@@ -990,7 +990,7 @@ static sal_Bool test_adapter( const Reference< XMultiServiceFactory > & xMgr )
     catch (RuntimeException &)
     {
     }
-
+    
     return (performTest( xLBT ) && raiseException( xLBT ));
 }
 //==================================================================================================
@@ -1005,7 +1005,7 @@ static sal_Bool test_invocation( const Reference< XMultiServiceFactory > & xMgr
     Any aOriginal( &xOriginal, ::getCppuType( &xOriginal ) );
     Reference< XInvocation > xInvok(
         xInvocFac->createInstanceWithArguments( Sequence< Any >( &aOriginal, 1 ) ), UNO_REF_QUERY );
-
+    
     Reference< XLanguageBindingTest > xLBT( xAdapFac->createAdapter(
         xInvok, ::getCppuType( (const Reference< XLanguageBindingTest > *)0 ) ), UNO_QUERY );
 
@@ -1016,7 +1016,7 @@ SAL_IMPLEMENT_MAIN()
 {
     Reference< XMultiServiceFactory > xMgr( createRegistryServiceFactory(
         OUString( RTL_CONSTASCII_USTRINGPARAM("stoctest.rdb") ) ) );
-
+    
     try
     {
         Reference< XImplementationRegistration > xImplReg(
@@ -1026,7 +1026,7 @@ SAL_IMPLEMENT_MAIN()
                         "com.sun.star.registry.ImplementationRegistration") ) ),
             UNO_QUERY );
         OSL_ENSURE( xImplReg.is(), "### no impl reg!" );
-
+        
         xImplReg->registerImplementation(
             OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
             OUString::createFromAscii("invocadapt.uno" SAL_DLLEXTENSION),
@@ -1047,7 +1047,7 @@ SAL_IMPLEMENT_MAIN()
             OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
             OUString::createFromAscii("introspection.uno" SAL_DLLEXTENSION),
             Reference< XSimpleRegistry >() );
-
+        
         if (test_adapter( xMgr ))
         {
             fprintf( stderr, "> test_iadapter() succeeded.\n" );
@@ -1063,7 +1063,7 @@ SAL_IMPLEMENT_MAIN()
         OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
         fprintf( stderr, "%s\n", aMsg.getStr() );
     }
-
+    
     Reference< XComponent >( xMgr, UNO_QUERY )->dispose();
 
     return 0;
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index c27fae201b6f..abe3ac44f8d5 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -73,8 +73,8 @@ typedef WeakImplHelper4< XIntroTest, XPropertySet, XNameAccess, XIndexAccess > I
 typedef WeakImplHelper1< XPropertySetInfo > ImplPropertySetInfoHelper;
 
 
-#define DEFAULT_INDEX_ACCESS_COUNT  10
-#define DEFAULT_NAME_ACCESS_COUNT   5
+#define DEFAULT_INDEX_ACCESS_COUNT	10
+#define DEFAULT_NAME_ACCESS_COUNT	5
 
 #if OSL_DEBUG_LEVEL > 0
 #define TEST_ENSHURE(c, m)   OSL_ENSURE(c, m)
@@ -127,19 +127,19 @@ OUString AnyToString( const Any& aValue, sal_Bool bIncludeType, const Reference<
     OUString aRetStr;
     switch( eType )
     {
-        case TypeClass_TYPE:            aRetStr = OUString::createFromAscii("TYPE TYPE");               break;
-        case TypeClass_INTERFACE:       aRetStr = OUString::createFromAscii("TYPE INTERFACE");      break;
-        case TypeClass_SERVICE:         aRetStr = OUString::createFromAscii("TYPE SERVICE");            break;
-        case TypeClass_STRUCT:          aRetStr = OUString::createFromAscii("TYPE STRUCT");         break;
-        case TypeClass_TYPEDEF:         aRetStr = OUString::createFromAscii("TYPE TYPEDEF");            break;
-        case TypeClass_UNION:           aRetStr = OUString::createFromAscii("TYPE UNION");          break;
-        case TypeClass_ENUM:            aRetStr = OUString::createFromAscii("TYPE ENUM");               break;
-        case TypeClass_EXCEPTION:       aRetStr = OUString::createFromAscii("TYPE EXCEPTION");      break;
-        case TypeClass_ARRAY:           aRetStr = OUString::createFromAscii("TYPE ARRAY");          break;
-        case TypeClass_SEQUENCE:        aRetStr = OUString::createFromAscii("TYPE SEQUENCE");           break;
-        case TypeClass_VOID:            aRetStr = OUString::createFromAscii("TYPE void");               break;
-        case TypeClass_ANY:             aRetStr = OUString::createFromAscii("TYPE any");                break;
-        case TypeClass_UNKNOWN:         aRetStr = OUString::createFromAscii("TYPE unknown");            break;
+        case TypeClass_TYPE:			aRetStr = OUString::createFromAscii("TYPE TYPE");				break;
+        case TypeClass_INTERFACE:		aRetStr = OUString::createFromAscii("TYPE INTERFACE");		break;
+        case TypeClass_SERVICE:			aRetStr = OUString::createFromAscii("TYPE SERVICE");			break;
+        case TypeClass_STRUCT:			aRetStr = OUString::createFromAscii("TYPE STRUCT");			break;
+        case TypeClass_TYPEDEF:			aRetStr = OUString::createFromAscii("TYPE TYPEDEF");			break;
+        case TypeClass_UNION:			aRetStr = OUString::createFromAscii("TYPE UNION");			break;
+        case TypeClass_ENUM:			aRetStr = OUString::createFromAscii("TYPE ENUM");				break;
+        case TypeClass_EXCEPTION:		aRetStr = OUString::createFromAscii("TYPE EXCEPTION");		break;
+        case TypeClass_ARRAY:			aRetStr = OUString::createFromAscii("TYPE ARRAY");			break;
+        case TypeClass_SEQUENCE:		aRetStr = OUString::createFromAscii("TYPE SEQUENCE");			break;
+        case TypeClass_VOID:			aRetStr = OUString::createFromAscii("TYPE void");				break;
+        case TypeClass_ANY:				aRetStr = OUString::createFromAscii("TYPE any");				break;
+        case TypeClass_UNKNOWN:			aRetStr = OUString::createFromAscii("TYPE unknown");			break;
         case TypeClass_BOOLEAN:
         {
             sal_Bool b = *(sal_Bool*)aValue.getValue();
@@ -238,30 +238,30 @@ UsrAny StringToAny( UString aStr, TypeClass eTargetType )
     UsrAny aRetAny;
     switch( eTargetType )
     {
-        case TypeClass_INTERFACE:       break;
-        case TypeClass_SERVICE:         break;
-        case TypeClass_STRUCT:          break;
-        case TypeClass_TYPEDEF:         break;
-        case TypeClass_UNION:           break;
-        case TypeClass_ENUM:            break;
-        case TypeClass_EXCEPTION:       break;
-        case TypeClass_ARRAY:           break;
-        case TypeClass_SEQUENCE:        break;
-        case TypeClass_VOID:            break;
-        case TypeClass_ANY:             break;
-        case TypeClass_UNKNOWN:         break;
-        case TypeClass_BOOLEAN:         aRetAny.setBOOL( short(aStr)!=0 );  break;
-        case TypeClass_CHAR:            aRetAny.setChar( char(aStr) );      break;
-        case TypeClass_STRING:          aRetAny.setString( aStr );          break;
-        case TypeClass_FLOAT:           aRetAny.setFloat( (float)strtod( aStr.GetStr(), NULL ) );   break;
-        case TypeClass_DOUBLE:          aRetAny.setDouble( strtod( aStr.GetStr(), NULL ) ); break;
-        case TypeClass_BYTE:            aRetAny.setBYTE( BYTE(short(aStr)) );   break;
-        case TypeClass_SHORT:           aRetAny.setINT16( short(aStr) );    break;
-        case TypeClass_LONG:            aRetAny.setINT32( long(aStr) );     break;
-        case TypeClass_HYPER:           break;
-        case TypeClass_UNSIGNED_SHORT:  aRetAny.setUINT16( USHORT(aStr) );  break;
-        case TypeClass_UNSIGNED_LONG:   aRetAny.setUINT32( ULONG(aStr) );   break;
-        case TypeClass_UNSIGNED_HYPER:  break;
+        case TypeClass_INTERFACE:		break;
+        case TypeClass_SERVICE:			break;
+        case TypeClass_STRUCT:			break;
+        case TypeClass_TYPEDEF:			break;
+        case TypeClass_UNION:			break;
+        case TypeClass_ENUM:			break;
+        case TypeClass_EXCEPTION:		break;
+        case TypeClass_ARRAY:			break;
+        case TypeClass_SEQUENCE:		break;
+        case TypeClass_VOID:			break;
+        case TypeClass_ANY:				break;
+        case TypeClass_UNKNOWN:			break;
+        case TypeClass_BOOLEAN:			aRetAny.setBOOL( short(aStr)!=0 );	break;
+        case TypeClass_CHAR:			aRetAny.setChar( char(aStr) );		break;
+        case TypeClass_STRING:			aRetAny.setString( aStr );			break;
+        case TypeClass_FLOAT:			aRetAny.setFloat( (float)strtod( aStr.GetStr(), NULL ) );	break;
+        case TypeClass_DOUBLE:			aRetAny.setDouble( strtod( aStr.GetStr(), NULL ) );	break;
+        case TypeClass_BYTE:			aRetAny.setBYTE( BYTE(short(aStr)) );	break;
+        case TypeClass_SHORT:			aRetAny.setINT16( short(aStr) );	break;
+        case TypeClass_LONG:			aRetAny.setINT32( long(aStr) );		break;
+        case TypeClass_HYPER:			break;
+        case TypeClass_UNSIGNED_SHORT:	aRetAny.setUINT16( USHORT(aStr) );	break;
+        case TypeClass_UNSIGNED_LONG:	aRetAny.setUINT32( ULONG(aStr) );	break;
+        case TypeClass_UNSIGNED_HYPER:	break;
     }
     return aRetAny;
 }
@@ -285,9 +285,9 @@ public:
 
 /*
     // Methoden von XInterface
-    virtual sal_Bool    SAL_CALL queryInterface( const Uik & rUik, Any & ifc ) throw( RuntimeException );
-    virtual void        SAL_CALL acquire() throw() { OWeakObject::acquire(); }
-    virtual void        SAL_CALL release() throw() { OWeakObject::release(); }
+    virtual sal_Bool	SAL_CALL queryInterface( const Uik & rUik, Any & ifc ) throw( RuntimeException );
+    virtual void		SAL_CALL acquire() throw() { OWeakObject::acquire(); }
+    virtual void		SAL_CALL release() throw() { OWeakObject::release(); }
     //ALT: sal_Bool queryInterface( Uik aUik, Reference<XInterface> & rOut );
 */
 
@@ -622,7 +622,7 @@ void ImplIntroTest::Init( void )
 
     // Einmal fuer den internen Gebrauch die PropertySetInfo abholen
     m_xMyInfo = getPropertySetInfo();
-    m_xMyInfo->acquire();       // sonst raucht es am Programm-Ende ab
+    m_xMyInfo->acquire();		// sonst raucht es am Programm-Ende ab
 
     m_nMarkusAge = 33;
     m_nMarkusChildrenCount = 2;
@@ -699,14 +699,14 @@ Reference< XPropertySetInfo > ImplIntroTest::getPropertySetInfo()
     return &aInfo;
 
     //if( m_xMyInfo == NULL )
-    //  ((ImplIntroTest*)this)->m_xMyInfo = new ImplPropertySetInfo( this );
+    //	((ImplIntroTest*)this)->m_xMyInfo = new ImplPropertySetInfo( this );
     //return m_xMyInfo;
 }
 
 void ImplIntroTest::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
     throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 //void ImplIntroTest::setPropertyValue( const UString& aPropertyName, const Any& aValue )
-//  THROWS( (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, UsrSystemException) )
+//	THROWS( (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, UsrSystemException) )
 {
     if( aPropChangeListener.is() && aPropertyName == aPropChangeListenerStr )
     {
@@ -940,7 +940,7 @@ struct DefItem
 };
 
 // Spezial-Wert fuer Method-Concept, um "normale" Funktionen kennzeichnen zu koennen
-#define  MethodConcept_NORMAL_IMPL      0x80000000
+#define  MethodConcept_NORMAL_IMPL		0x80000000
 
 
 // Test-Objekt liefern
@@ -984,32 +984,32 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
     };
 
     // Tabelle der Property-Namen, die gefunden werden muessen
-//  char* pDemandedPropNames[] =
-//  {
-//      "Factor",
-//      "MyCount",
-//      "Info",
-//      "ObjectName",
-//      "FirstName",
-//      "LastName",
-//      "Age",
-//      "ChildrenCount",
-//      "FirstStruct",
-//      "SecondStruct",
-//      "Droenk",
-//      "IntroTest",
-//      "Bla",
-//      "Blub",
-//      "Gulp",
-//      "Strings",
-//      "MultiSequence",
-//      "PropertySetInfo",
-//      "ElementType",
-//      "ElementNames",
-//      "Count",
-//      "Types"
-//      "ImplementationId"
-//  };
+// 	char* pDemandedPropNames[] =
+// 	{
+// 		"Factor",
+// 		"MyCount",
+// 		"Info",
+// 		"ObjectName",
+// 		"FirstName",
+// 		"LastName",
+// 		"Age",
+// 		"ChildrenCount",
+// 		"FirstStruct",
+// 		"SecondStruct",
+// 		"Droenk",
+// 		"IntroTest",
+// 		"Bla",
+// 		"Blub",
+// 		"Gulp",
+// 		"Strings",
+// 		"MultiSequence",
+// 		"PropertySetInfo",
+// 		"ElementType",
+// 		"ElementNames",
+// 		"Count",
+// 		"Types"
+// 		"ImplementationId"
+// 	};
 
     char const * pDemandedPropVals[] =
     {
@@ -1174,7 +1174,7 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
     //Reference< XInterface > xPropSetIface = xAccess->queryAdapter( aPropertySetUik );
     Reference< XPropertySet > xPropSet( xPropSetIface, UNO_QUERY );
     //XPropertySetRef xPropSet = (XPropertySet*)xPropSetIface->
-    //  queryInterface( XPropertySet::getSmartUik() );
+    //	queryInterface( XPropertySet::getSmartUik() );
     TEST_ENSHURE( xPropSet.is(), "Could not get XPropertySet by queryAdapter()" );
 
     // XExactName
@@ -1437,7 +1437,7 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
         //aMethodSeq = xAccess->getMethods
         Sequence< Reference< XIdlMethod > > aMethodSeq = xAccess->getMethods( nRealConcepts );
         //Sequence<XIdlMethodRef> aMethodSeq = xAccess->getMethods
-        //  ( MethodConcept::ALL - MethodConcept::DANGEROUS - MethodConcept::PROPERTY );
+        //	( MethodConcept::ALL - MethodConcept::DANGEROUS - MethodConcept::PROPERTY );
         sal_Int32 nLen = aMethodSeq.getLength();
         // cout << "\n\n*** Methoden ***\n";
         // cout << "Introspection hat " << nLen << " Methoden gefunden:\n";
@@ -1481,7 +1481,7 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
             aErrorStr += "\"";
             TEST_ENSHURE( aNameStr == aDemandedName, aErrorStr.getStr() );
             // cout << "Methode " << (i+1) << ": " << (const char*) UStringToString(rxMethod->getReturnType()->getName(), CHARSET_SYSTEM)
-            //   << " " << (const char*) UStringToString(rxMethod->getName(), CHARSET_SYSTEM) << "( ";
+            //	 << " " << (const char*) UStringToString(rxMethod->getName(), CHARSET_SYSTEM) << "( ";
 
             // Checken, ob alle Methoden auch einzeln gefunden werden
             aErrorStr  = "method \"";
@@ -1556,7 +1556,7 @@ SAL_IMPLEMENT_MAIN()
         // Register services
         OUString libName( RTL_CONSTASCII_USTRINGPARAM(
                               "reflection.uno" SAL_DLLEXTENSION) );
-//          ORealDynamicLoader::computeLibraryName( OUString::createFromAscii("corefl"), libName);
+//  		ORealDynamicLoader::computeLibraryName( OUString::createFromAscii("corefl"), libName);
         fprintf(stderr, "1\n" );
         xImplReg->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
                                          libName, Reference< XSimpleRegistry >() );
@@ -1567,7 +1567,7 @@ SAL_IMPLEMENT_MAIN()
         // Introspection
         libName = OUString::createFromAscii(
             "introspection.uno" SAL_DLLEXTENSION);
-//          ORealDynamicLoader::computeLibraryName( OUString::createFromAscii("insp"), libName);
+//  		ORealDynamicLoader::computeLibraryName( OUString::createFromAscii("insp"), libName);
         fprintf(stderr, "3\n" );
         xImplReg->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
                                          libName, Reference< XSimpleRegistry >() );
diff --git a/stoc/test/testintrosp.idl b/stoc/test/testintrosp.idl
index d2d01cbb692d..a23013a25dbf 100644
--- a/stoc/test/testintrosp.idl
+++ b/stoc/test/testintrosp.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,58 +52,58 @@
 
 module ModuleA
 {
-//module com { module sun { module star { module beans {
+//module com { module sun { module star { module beans { 
 
 //interface XPropertyChangeListener;
 //interface XPropertiesChangeListener;
 
 //=============================================================================
 /** This is a test interface for introspection.
-
+    
     <p>IMPORTANT: FOR TEST ONLY!
-
-    <p>The following interface is just for testing purposes. It will not
+    
+    <p>The following interface is just for testing purposes. It will not 
     stay in the product. It is only used as an exportable test class,
     i.e. for BASIC integration.
-
+    
     @deprecated
 */
 interface XIntroTest: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** contains the ID-String of the implementation.
+    /**	contains the ID-String of the implementation.
      */
-    [attribute] string  ObjectName;
+    [attribute] string	ObjectName;
 
     //-------------------------------------------------------------------------
-    /** contains the first name of a person.
+    /**	contains the first name of a person.
      */
-    [readonly, attribute] string    FirstName;
+    [readonly, attribute] string	FirstName;
 
     //-------------------------------------------------------------------------
-    /** contains the last name of a person.
+    /**	contains the last name of a person.
      */
-    [readonly, attribute] string    LastName;
+    [readonly, attribute] string	LastName;
 
     //-------------------------------------------------------------------------
-    /** contains the age of a person.
+    /**	contains the age of a person.
      */
-    [readonly, attribute] short     Age;
+    [readonly, attribute] short		Age;
 
     //-------------------------------------------------------------------------
-    /** contains the number of children person has.
+    /**	contains the number of children person has.
      */
-    [attribute] short               ChildrenCount;
+    [attribute] short				ChildrenCount;
 
     //-------------------------------------------------------------------------
-    /** contains a struct of type Property.
+    /**	contains a struct of type Property.
      */
-    [attribute] com::sun::star::beans::Property         FirstStruct;
+    [attribute] com::sun::star::beans::Property			FirstStruct;
 
     //-------------------------------------------------------------------------
-    /** contains a struct of type PropertyValue.
+    /**	contains a struct of type PropertyValue.
      */
-    [attribute] com::sun::star::beans::PropertyValue    SecondStruct;
+    [attribute] com::sun::star::beans::PropertyValue	SecondStruct;
 
     //-------------------------------------------------------------------------
     /** Ausgabe-Methode
@@ -111,7 +111,7 @@ interface XIntroTest: com::sun::star::uno::XInterface
     void writeln( [in] string Text );
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     long getDroenk();
 
@@ -127,12 +127,12 @@ interface XIntroTest: com::sun::star::uno::XInterface
     long getUps( [in] long l );
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     void setDroenk( [in] long l );
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     short getBla();
 
@@ -142,17 +142,17 @@ interface XIntroTest: com::sun::star::uno::XInterface
     void setBla( [in] long n );
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     short getBlub();
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     void setBlub( [in] short n );
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     short getGulp();
 
@@ -162,12 +162,12 @@ interface XIntroTest: com::sun::star::uno::XInterface
     short setGulp( [in] short n );
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     com::sun::star::uno::TypeClass getTypeClass( [in] short n );
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     void setTypeClass( [in] com::sun::star::uno::TypeClass t,
              [in] double d1,
@@ -179,12 +179,12 @@ interface XIntroTest: com::sun::star::uno::XInterface
     sequence<string> getStrings();
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     void setStrings( [in] sequence<string> Strings );
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     void setStringsPerMethod( [in] sequence<string> Strings,
              [in] short n );
@@ -195,7 +195,7 @@ interface XIntroTest: com::sun::star::uno::XInterface
     sequence< sequence< sequence< short > > > getMultiSequence();
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     void setMultiSequence( [in] sequence< sequence< sequence< short > > > Seq );
 
@@ -214,7 +214,7 @@ interface XIntroTest: com::sun::star::uno::XInterface
 
 //=============================================================================
 
-};
-//}; }; }; };
+}; 
+//}; }; }; }; 
 
 #endif
diff --git a/stoc/test/testloader.cxx b/stoc/test/testloader.cxx
index b2b23afc82e7..fa7c6bc1d4fb 100644
--- a/stoc/test/testloader.cxx
+++ b/stoc/test/testloader.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -86,7 +86,7 @@ SAL_IMPLEMENT_MAIN()
 
     OUString dllName(
         RTL_CONSTASCII_USTRINGPARAM("bootstrap.uno" SAL_DLLEXTENSION) );
-
+    
     if (module.load(dllName))
     {
         // try to get provider from module
diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx
index 0a2377c53736..661c77a7c0ed 100644
--- a/stoc/test/testproxyfac.cxx
+++ b/stoc/test/testproxyfac.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,7 +64,7 @@ class TargetObject : public t_impl
 {
 public:
     static int s_obj;
-
+    
     virtual ~TargetObject() {
         --s_obj;
         OSL_TRACE( "~TargetObject()" );
@@ -74,7 +74,7 @@ public:
 
     Any SAL_CALL queryInterface( Type const & type )
         throw (RuntimeException);
-
+    
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() throw (RuntimeException)
         { return OUString::createFromAscii( "target" ); }
@@ -123,12 +123,12 @@ public:
     static Reference< XInterface > create(
         Reference< XInterface > const & xTarget,
         Reference< reflection::XProxyFactory > const & xProxyFac );
-
+    
     virtual ~TestMaster() {
         --s_obj;
         OSL_TRACE( "~TestMaster()" );
     }
-
+    
     virtual Any SAL_CALL queryInterface( const Type & rType )
         throw (RuntimeException)
     {
@@ -138,7 +138,7 @@ public:
             return aRet;
         return m_xProxyTarget->queryAggregation( rType );
     }
-
+    
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() throw (RuntimeException)
         { return OUString::createFromAscii( "master" ); }
@@ -186,25 +186,25 @@ static void test_proxyfac_(
     Reference< lang::XServiceInfo > xMaster_XServiceInfo(
         xMaster, UNO_QUERY_THROW );
     OSL_ASSERT( xMaster_XServiceInfo->getImplementationName().equals( test ) );
-
+    
     Reference< reflection::XProxyFactory > xTarget( xMaster, UNO_QUERY_THROW );
     Reference< XCurrentContext > xTarget_XCurrentContext(
         xTarget, UNO_QUERY_THROW );
     Reference< XCurrentContext > xMaster_XCurrentContext(
         xMaster, UNO_QUERY_THROW );
-
+    
     OSL_ASSERT(
         xTarget_XCurrentContext->getValueByName( test ) == makeAny( test ) );
     OSL_ASSERT(
         xMaster_XCurrentContext->getValueByName( test ) == makeAny( test ) );
-
+    
     Reference< XAggregation > xFakeAgg( xTarget->createProxy( xTarget ) );
     if (xFakeAgg.is())
     {
         OSL_ASSERT( xTarget == xFakeAgg );
         OSL_ASSERT( xMaster == xFakeAgg );
     }
-
+    
     Reference< lang::XServiceInfo > xTarget_XServiceInfo(
         xTarget, UNO_QUERY_THROW );
     OSL_ASSERT( xTarget_XServiceInfo->getImplementationName().equals( test ) );
@@ -249,7 +249,7 @@ static void test_proxyfac(
 SAL_IMPLEMENT_MAIN()
 {
     bool success = true;
-
+    
     Environment cpp_env;
     OUString cpp( RTL_CONSTASCII_USTRINGPARAM(
                       CPPU_CURRENT_LANGUAGE_BINDING_NAME) );
@@ -257,12 +257,12 @@ SAL_IMPLEMENT_MAIN()
         reinterpret_cast< uno_Environment ** >( &cpp_env ),
         cpp.pData, 0 );
     OSL_ENSURE( cpp_env.is(), "### cannot get C++ uno env!" );
-
+    
     {
         Reference< lang::XMultiServiceFactory > xMgr(
             createRegistryServiceFactory(
                 OUString( RTL_CONSTASCII_USTRINGPARAM("stoctest.rdb") ) ) );
-
+        
         try
         {
             Reference< registry::XImplementationRegistration > xImplReg(
@@ -273,7 +273,7 @@ SAL_IMPLEMENT_MAIN()
                         ) ),
                 UNO_QUERY );
             OSL_ENSURE( xImplReg.is(), "### no impl reg!" );
-
+            
             OUString aLibName(
                 RTL_CONSTASCII_USTRINGPARAM("proxyfac.uno" SAL_DLLEXTENSION) );
             xImplReg->registerImplementation(
@@ -281,7 +281,7 @@ SAL_IMPLEMENT_MAIN()
                     RTL_CONSTASCII_USTRINGPARAM(
                         "com.sun.star.loader.SharedLibrary") ),
                 aLibName, Reference< registry::XSimpleRegistry >() );
-
+            
             Reference< reflection::XProxyFactory > xProxyFac(
                 xMgr->createInstance(
                     OUString::createFromAscii(
@@ -292,7 +292,7 @@ SAL_IMPLEMENT_MAIN()
                 xProxyFac->createProxy(
                     static_cast< OWeakObject * >( new TargetObject ) ) );
             // no call
-
+            
             {
             Reference< XInterface > xMaster( TestMaster::create( xProxyFac ) );
             test_proxyfac(
@@ -304,7 +304,7 @@ SAL_IMPLEMENT_MAIN()
             Reference< XInterface > xMaster( TestMaster::create( xProxyFac ) );
             // no call
             }
-
+            
             {
             Reference< XInterface > xMaster( TestMaster::create( xProxyFac ) );
             Reference< reflection::XProxyFactory > xSlave_lives_alone(
@@ -322,7 +322,7 @@ SAL_IMPLEMENT_MAIN()
                 xMaster, UNO_QUERY_THROW );
             // no call
             }
-
+            
             test_proxyfac(
                 xProxyFac->createProxy(
                     static_cast< OWeakObject * >( new TargetObject ) ),
@@ -340,7 +340,7 @@ SAL_IMPLEMENT_MAIN()
             success = false;
         }
 
-
+        
         Reference< lang::XComponent > xComp;
         Reference< beans::XPropertySet >(
             xMgr, UNO_QUERY_THROW )->getPropertyValue(
@@ -348,7 +348,7 @@ SAL_IMPLEMENT_MAIN()
                     >>= xComp;
         xComp->dispose();
     }
-
+    
     if (TestMaster::s_obj != 0)
         fprintf( stderr, "TestMaster objects: %d\n", TestMaster::s_obj );
     if (TargetObject::s_obj != 0)
@@ -362,7 +362,7 @@ SAL_IMPLEMENT_MAIN()
         env, &ppInterfaces, &len, rtl_allocateMemory );
     if (len != 0)
         fprintf( stderr, "%d registered C++ interfaces left!\n", len );
-
+    
     success &= (TestMaster::s_obj == 0 &&
                 TargetObject::s_obj == 0 &&
                 len == 0);
diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx
index b3d9bb2d5316..432578bc7eda 100644
--- a/stoc/test/testregistry.cxx
+++ b/stoc/test/testregistry.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -108,7 +108,7 @@ OString userRegEnv("STAR_USER_REGISTRY=");
 
 OUString getExePath()
 {
-    OUString        exe;
+    OUString 		exe;
     OSL_VERIFY( osl_getExecutableFile( &exe.pData ) == osl_Process_E_None);
 #if defined(WIN32) || defined(__OS2__) || defined(WNT)
     exe = exe.copy(0, exe.getLength() - 16);
@@ -146,7 +146,7 @@ void setLinkInDefaultRegistry(const OUString& linkName, const OUString& linkTarg
 
     OUString appReg = getExePath();
     appReg += OUString::createFromAscii("stoctest.rdb");
-
+    
     TEST_ENSHURE(!myRegistry->open(appReg, REG_READWRITE), "setLinkInDefaultRegistry error 1");
     TEST_ENSHURE(!myRegistry->openRootKey(rootKey), "setLinkInDefaultRegistry error 2");
 
@@ -156,7 +156,7 @@ void setLinkInDefaultRegistry(const OUString& linkName, const OUString& linkTarg
     TEST_ENSHURE(!myRegistry->close(), "setLinkInDefaultRegistry error 5");
 
     delete myRegistry;
-}
+}	
 
 
 void test_SimpleRegistry(
@@ -169,13 +169,13 @@ void test_SimpleRegistry(
 
     OUString dllName(
         RTL_CONSTASCII_USTRINGPARAM("simplereg.uno" SAL_DLLEXTENSION) );
-
+    
     if (module.load(dllName))
     {
         // try to get provider from module
         component_getFactoryFunc pCompFactoryFunc = (component_getFactoryFunc)
             module.getFunctionSymbol( OUString::createFromAscii(COMPONENT_GETFACTORY) );
-
+        
         if (pCompFactoryFunc)
         {
             XSingleServiceFactory * pRet = (XSingleServiceFactory *)
@@ -196,7 +196,7 @@ void test_SimpleRegistry(
 
     TEST_ENSHURE( xFactory.is(), "testloader error11");
 
-    Reference<XInterface> xIFace2 = xFactory->createInstance();
+    Reference<XInterface> xIFace2 = xFactory->createInstance();	
     xFactory.clear();
 
     TEST_ENSHURE( xIFace2.is(), "testloader error12");
@@ -218,7 +218,7 @@ void test_SimpleRegistry(
     try
     {
         xReg->open(testreg, sal_False, sal_True);
-
+        
         TEST_ENSHURE( xReg->isValid() != sal_False, "test_SimpleRegistry error 7" );
         TEST_ENSHURE( xReg->isReadOnly() == sal_False, "test_SimpleRegistry error 8" );
 
@@ -229,10 +229,10 @@ void test_SimpleRegistry(
 
         Reference<XRegistryKey> xSubKey = xKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM("FirstSubKey") ));
         xSubKey->setLongValue(123456789);
-
+        
         xSubKey = xKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM("SecondSubKey") ));
         xSubKey->setAsciiValue(OUString( RTL_CONSTASCII_USTRINGPARAM("ich bin ein acsii value") ));
-
+        
         xSubKey = xKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM("ThirdSubKey") ));
         xSubKey->setStringValue(OUString( RTL_CONSTASCII_USTRINGPARAM("ich bin ein unicode value") ));
 
@@ -240,7 +240,7 @@ void test_SimpleRegistry(
         Sequence<sal_Int8> aSeq((sal_Int8*)"ich bin ein binary value", 25);
         xSubKey->setBinaryValue(aSeq);
 
-        Sequence<OUString> seqNames = xKey->getKeyNames();
+        Sequence<OUString> seqNames = xKey->getKeyNames(); 
         Sequence< Reference<XRegistryKey> > seqKeys = xKey->openKeys();
 
         OUString name;
@@ -248,20 +248,20 @@ void test_SimpleRegistry(
         {
             name = seqNames.getArray()[i];
             xSubKey = seqKeys.getArray()[i];
-
+            
             if (name == OUString( RTL_CONSTASCII_USTRINGPARAM("/FirstKey/FirstSubKey") ))
             {
-                TEST_ENSHURE( xSubKey->getLongValue() == 123456789,
+                TEST_ENSHURE( xSubKey->getLongValue() == 123456789, 
                             "test_SimpleRegistry error 10" );
             } else
             if (name == OUString( RTL_CONSTASCII_USTRINGPARAM("/FirstKey/SecondSubKey") ))
             {
-                TEST_ENSHURE( xSubKey->getAsciiValue() == OUString( RTL_CONSTASCII_USTRINGPARAM("ich bin ein acsii value") ),
+                TEST_ENSHURE( xSubKey->getAsciiValue() == OUString( RTL_CONSTASCII_USTRINGPARAM("ich bin ein acsii value") ), 
                             "test_SimpleRegistry error 11" );
             } else
             if (name == OUString( RTL_CONSTASCII_USTRINGPARAM("/FirstKey/ThirdSubKey") ))
             {
-                TEST_ENSHURE( xSubKey->getStringValue() == OUString( RTL_CONSTASCII_USTRINGPARAM("ich bin ein unicode value") ),
+                TEST_ENSHURE( xSubKey->getStringValue() == OUString( RTL_CONSTASCII_USTRINGPARAM("ich bin ein unicode value") ), 
                             "test_SimpleRegistry error 12" );
             } else
             if (name == OUString( RTL_CONSTASCII_USTRINGPARAM("/FirstKey/FourthSubKey") ))
@@ -364,7 +364,7 @@ void test_SimpleRegistry(
             xRootKey->getKeyType( OUString( RTL_CONSTASCII_USTRINGPARAM("LinkTest") ) ) ==
             registry::RegistryKeyType_LINK,
             "test_SimpleRegistry error 1214" );
-
+        
         xKey = xRootKey->openKey(OUString( RTL_CONSTASCII_USTRINGPARAM("FirstKey/SecondSubKey") ));
         TEST_ENSHURE( !xKey.is(), "test_SimpleRegistry error 27" );
 
@@ -380,12 +380,12 @@ void test_SimpleRegistry(
         xKey->createLink(OUString( RTL_CONSTASCII_USTRINGPARAM("/WithSubSubKey/MyFourthLink") ),
                          OUString( RTL_CONSTASCII_USTRINGPARAM("/FourthKey/MySecondLink") ));
 
-        TEST_ENSHURE( xKey->getLinkTarget(OUString( RTL_CONSTASCII_USTRINGPARAM("/WithSubSubKey/MyFourthLink") ))
+        TEST_ENSHURE( xKey->getLinkTarget(OUString( RTL_CONSTASCII_USTRINGPARAM("/WithSubSubKey/MyFourthLink") )) 
                      == OUString( RTL_CONSTASCII_USTRINGPARAM("/FourthKey/MySecondLink") ), "test_SimpleRegistry error 29" );
 
         try
         {
-            TEST_ENSHURE( xKey->getResolvedName(OUString( RTL_CONSTASCII_USTRINGPARAM("/WithSubSubKey/MyFourthLink/BlaBlaBla") ))
+            TEST_ENSHURE( xKey->getResolvedName(OUString( RTL_CONSTASCII_USTRINGPARAM("/WithSubSubKey/MyFourthLink/BlaBlaBla") )) 
                          == OUString( RTL_CONSTASCII_USTRINGPARAM("/FourthKey/MySecondLink/BlaBlaBla") ), "test_SimpleRegistry error 30" );
         }
         catch(InvalidRegistryException&)
@@ -399,7 +399,7 @@ void test_SimpleRegistry(
                          OUString( RTL_CONSTASCII_USTRINGPARAM("/FourthKey/MySecondLink") ));
 
         xKey = xRootKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM("/SixthKey/SixthSubKey") ));
-
+        
         try
         {
             xRootKey->openKey(OUString( RTL_CONSTASCII_USTRINGPARAM("/FifthKey/MyFirstLink/WithSubSubKey/MyFourthLink") ));
@@ -408,7 +408,7 @@ void test_SimpleRegistry(
         {
         }
 
-        TEST_ENSHURE( xRootKey->getLinkTarget(OUString( RTL_CONSTASCII_USTRINGPARAM("/FifthKey/MyFirstLink/WithSubSubKey/MyFourthLink") ))
+        TEST_ENSHURE( xRootKey->getLinkTarget(OUString( RTL_CONSTASCII_USTRINGPARAM("/FifthKey/MyFirstLink/WithSubSubKey/MyFourthLink") )) 
                      == OUString( RTL_CONSTASCII_USTRINGPARAM("/FourthKey/MySecondLink") ), "test_SimpleRegistry error 31" );
 
         xRootKey->deleteLink(OUString( RTL_CONSTASCII_USTRINGPARAM("/FifthKey/MyFirstLink/WithSubSubKey/MyFourthLink") ));
@@ -417,7 +417,7 @@ void test_SimpleRegistry(
                              OUString( RTL_CONSTASCII_USTRINGPARAM("/ThirdKey/FirstSubKey/WithSubSubKey") ));
 
         xKey = xRootKey->openKey(OUString( RTL_CONSTASCII_USTRINGPARAM("SixthKey") ));
-        seqNames = xKey->getKeyNames();
+        seqNames = xKey->getKeyNames(); 
         seqKeys = xKey->openKeys();
 
         TEST_ENSHURE( seqNames.getArray()[0] == OUString( RTL_CONSTASCII_USTRINGPARAM("/SixthKey/SixthSubKey") ),
@@ -444,8 +444,8 @@ void test_SimpleRegistry(
 
     xReg.clear();
 
-    printf("Test SimpleRegistry, OK!\n");
-}
+    printf("Test SimpleRegistry, OK!\n");	
+}	
 
 
 void test_DefaultRegistry(
@@ -467,7 +467,7 @@ void test_DefaultRegistry(
     Reference< XPropertySet > xPropSet( rSMgr, UNO_QUERY);
     TEST_ENSHURE( xPropSet.is(), "test_DefaultRegistry error0");
 
-    Any aPropertyAny( xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Registry")) ) );
+    Any	aPropertyAny( xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Registry")) ) ); 
     TEST_ENSHURE( aPropertyAny.hasValue(), "test_DefaultRegistry error1");
 
     Reference<XSimpleRegistry> xReg;
@@ -491,7 +491,7 @@ void test_DefaultRegistry(
 
         Reference<XRegistryKey> xKey = xRootKey->openKey(OUString( RTL_CONSTASCII_USTRINGPARAM("/UCR/com/sun/star/registry/XSimpleRegistry") ));
 
-        TEST_ENSHURE( xKey->getKeyName() == OUString( RTL_CONSTASCII_USTRINGPARAM("/UCR/com/sun/star/registry/XSimpleRegistry") ),
+        TEST_ENSHURE( xKey->getKeyName() == OUString( RTL_CONSTASCII_USTRINGPARAM("/UCR/com/sun/star/registry/XSimpleRegistry") ), 
                      "test_DefaultRegistry error 7" );
 
         if (bMergeDifferently)
@@ -514,7 +514,7 @@ void test_DefaultRegistry(
         if (xKey.is())
         {
             xKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM("SecondSubSubKey") ));
-
+        
             Sequence<OUString> seqNames = xKey->getKeyNames();
 
             TEST_ENSHURE( seqNames.getLength() == 2, "test_DefaultRegistry error 8" );
@@ -550,7 +550,7 @@ void test_DefaultRegistry(
             TEST_ENSHURE( seqLongValue.getArray()[1] == 4567, "test_DefaultRegistry error 16" );
             TEST_ENSHURE( seqLongValue.getArray()[2] == 7890, "test_DefaultRegistry error 17" );
         }
-
+        
         // Test Links
         xKey = xRootKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM("/Test/FifthKey") ));
         xKey->createLink(OUString( RTL_CONSTASCII_USTRINGPARAM("MyFirstLink") ),
@@ -564,13 +564,13 @@ void test_DefaultRegistry(
         xKey->createLink(OUString( RTL_CONSTASCII_USTRINGPARAM("/WithSubSubKey/MyFourthLink") ),
                          OUString( RTL_CONSTASCII_USTRINGPARAM("/Test/FourthKey/MySecondLink") ));
 
-        TEST_ENSHURE( xKey->getLinkTarget(OUString( RTL_CONSTASCII_USTRINGPARAM("/WithSubSubKey/MyFourthLink") ))
+        TEST_ENSHURE( xKey->getLinkTarget(OUString( RTL_CONSTASCII_USTRINGPARAM("/WithSubSubKey/MyFourthLink") )) 
                      == OUString( RTL_CONSTASCII_USTRINGPARAM("/Test/FourthKey/MySecondLink") ),
                       "test_DefaultRegistry error 20" );
 
         try
         {
-            TEST_ENSHURE( xKey->getResolvedName(OUString( RTL_CONSTASCII_USTRINGPARAM("/WithSubSubKey/MyFourthLink/BlaBlaBla") ))
+            TEST_ENSHURE( xKey->getResolvedName(OUString( RTL_CONSTASCII_USTRINGPARAM("/WithSubSubKey/MyFourthLink/BlaBlaBla") )) 
                           == OUString( RTL_CONSTASCII_USTRINGPARAM("/Test/FourthKey/MySecondLink/BlaBlaBla") ),
                           "test_DefaultRegistry error 21" );
         }
@@ -593,7 +593,7 @@ void test_DefaultRegistry(
             printf("test InvalidRegistryExcption OK!\n");
         }
 
-        TEST_ENSHURE( xRootKey->getLinkTarget(OUString( RTL_CONSTASCII_USTRINGPARAM("/Test/FifthKey/MyFirstLink/WithSubSubKey/MyFourthLink") ))
+        TEST_ENSHURE( xRootKey->getLinkTarget(OUString( RTL_CONSTASCII_USTRINGPARAM("/Test/FifthKey/MyFirstLink/WithSubSubKey/MyFourthLink") )) 
                      == OUString( RTL_CONSTASCII_USTRINGPARAM("/Test/FourthKey/MySecondLink") ),
                       "test_DefaultRegistry error 22" );
 
@@ -608,11 +608,11 @@ void test_DefaultRegistry(
         if (xKey.is())
         {
             TEST_ENSHURE( xKey->getKeyName() == OUString( RTL_CONSTASCII_USTRINGPARAM("/Test/ThirdKey/FirstSubKey/ThirdSubSubKey") ),
-                          "test_DefaultRegistry error 24" );
+                          "test_DefaultRegistry error 24" );		
         }
 
         xKey = xRootKey->openKey(OUString( RTL_CONSTASCII_USTRINGPARAM("Test") ));
-        TEST_ENSHURE( xKey->isValid(), "test_DefaultRegistry error 25" );
+        TEST_ENSHURE( xKey->isValid(), "test_DefaultRegistry error 25" );		
 
         xRootKey->deleteKey(OUString( RTL_CONSTASCII_USTRINGPARAM("Test") ));
 
@@ -653,7 +653,7 @@ void test_DefaultRegistry(
         (void)e;
         TEST_ENSHURE(0, OUStringToOString(e.Message,RTL_TEXTENCODING_ASCII_US).getStr());
     }
-
+    
 
     xReg.clear();
 
@@ -661,22 +661,22 @@ void test_DefaultRegistry(
     Reference< ::com::sun::star::lang::XComponent > xComp( rSMgr, UNO_QUERY );
     OSL_ENSURE( xComp.is(), "### serivce manager has to implement XComponent!" );
     xComp->dispose();
-
-    printf("Test DefaultRegistry, OK!\n");
-}
+    
+    printf("Test DefaultRegistry, OK!\n");	
+}	
 
 
 SAL_IMPLEMENT_MAIN()
 {
-//  setStarUserRegistry();
-     setLinkInDefaultRegistry(OUString::createFromAscii("/Test/DefaultLink"),
+//	setStarUserRegistry();
+     setLinkInDefaultRegistry(OUString::createFromAscii("/Test/DefaultLink"), 
                               OUString::createFromAscii("/Test/FifthKey/MyFirstLink"));
 
     OUString reg1( RTL_CONSTASCII_USTRINGPARAM("testreg1.rdb") );
     OUString reg2( RTL_CONSTASCII_USTRINGPARAM("testreg2.rdb") );
     OUString areg1( RTL_CONSTASCII_USTRINGPARAM("atestreg1.rdb") );
     OUString areg2( RTL_CONSTASCII_USTRINGPARAM("atestreg2.rdb") );
-
+    
       test_SimpleRegistry( reg1, reg2 );
       test_DefaultRegistry( reg1, reg2 );
       test_SimpleRegistry( areg1, areg2, true ); // use different merge
diff --git a/stoc/test/testsmgr.cxx b/stoc/test/testsmgr.cxx
index a609632bcb55..1cce1d4bef40 100644
--- a/stoc/test/testsmgr.cxx
+++ b/stoc/test/testsmgr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -61,7 +61,7 @@ OString userRegEnv("STAR_USER_REGISTRY=");
 
 OUString getExePath()
 {
-    OUString        exe;
+    OUString 		exe;
 
     OSL_VERIFY( osl_getExecutableFile( &exe.pData) == osl_Process_E_None);
 
diff --git a/stoc/test/testsmgr2.cxx b/stoc/test/testsmgr2.cxx
index f3027ed84cd7..b918c721a84c 100644
--- a/stoc/test/testsmgr2.cxx
+++ b/stoc/test/testsmgr2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ SAL_IMPLEMENT_MAIN()
 {
     try
     {
-
+        
         Reference< XSimpleRegistry > r1 =  createSimpleRegistry();
         Reference< XSimpleRegistry > r2 =  createSimpleRegistry();
         r1->open( OUString( RTL_CONSTASCII_USTRINGPARAM( "test1.rdb" ) ), sal_True, sal_False );
@@ -66,9 +66,9 @@ SAL_IMPLEMENT_MAIN()
         rInit->initialize( seq );
 
         Reference< XComponentContext > rComp = bootstrap_InitialComponentContext( r );
-
+        
         Reference< XContentEnumerationAccess > xCtAccess( rComp->getServiceManager(), UNO_QUERY );
-
+        
         Reference< XEnumeration > rEnum =
             xCtAccess->createContentEnumeration( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.bridge.Bridge" ) ) );
 
diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx
index 751459e004b9..8ae52a2f72d7 100644
--- a/stoc/test/testsmgr_cpnt.cxx
+++ b/stoc/test/testsmgr_cpnt.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -111,13 +111,13 @@ public:
     ~Test_Manager_Impl();
 
     // XServiceInfo
-    OUString                    SAL_CALL getImplementationName() throw();
-    sal_Bool                    SAL_CALL supportsService(const OUString& ServiceName) throw();
-    Sequence< OUString >        SAL_CALL getSupportedServiceNames(void) throw();
-    static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(void) throw();
+    OUString 					SAL_CALL getImplementationName() throw();
+    sal_Bool 					SAL_CALL supportsService(const OUString& ServiceName) throw();
+    Sequence< OUString > 		SAL_CALL getSupportedServiceNames(void) throw();
+    static Sequence< OUString >	SAL_CALL getSupportedServiceNames_Static(void) throw();
 
 private:
-//  static XIdlClassRef     getStaticIdlClass();
+//	static XIdlClassRef		getStaticIdlClass();
 };
 
 Test_Manager_Impl::~Test_Manager_Impl()
@@ -207,7 +207,7 @@ extern "C" void SAL_CALL test_ServiceManager()
      OUString atUModule2 = OUString(
         RTL_CONSTASCII_USTRINGPARAM(
             SAL_DLLPREFIX "testsmgr_component" SAL_DLLEXTENSION ) );
-
+    
     // expand shared library name
     OString  atModule2( OUStringToOString(atUModule2, RTL_TEXTENCODING_ASCII_US) );
 
@@ -253,7 +253,7 @@ extern "C" void SAL_CALL test_ServiceManager()
             xInst( xSMgr->createInstance(OUString::createFromAscii("com.sun.star.registry.ImplementationRegistration")), UNO_QUERY );
         TEST_ENSHURE( xInst.is(), "no ImplementationRegistration" );
 
-        try {
+        try	{
             // register the services via writeComponentRegInfo (see at end of this file)
             xInst->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), atUModule2, Reference< XSimpleRegistry >() );
         }
@@ -273,48 +273,48 @@ extern "C" void SAL_CALL test_ServiceManager()
         TEST_ENSHURE( xIFace.is(), "loadable service not found" );
 
         // remove the service
-        TEST_ENSHURE(   xInst->revokeImplementation(atUModule2, Reference< XSimpleRegistry > ()),
+        TEST_ENSHURE( 	xInst->revokeImplementation(atUModule2, Reference< XSimpleRegistry > ()),
                         "revoke implementation failed" );
     }
 
 
-//  Reference < XSimpleRegistry > xSReg(  xSMgr->createInstance(OUString::createFromAscii("com::sun::star.uno.repos.SimpleRegistry")), UNO_QUERY );
-//  TEST_ENSHURE( xSReg.is() , "Simple registry couldn't be instantiated" );
+//	Reference < XSimpleRegistry > xSReg(  xSMgr->createInstance(OUString::createFromAscii("com::sun::star.uno.repos.SimpleRegistry")), UNO_QUERY );
+//	TEST_ENSHURE( xSReg.is() , "Simple registry couldn't be instantiated" );
 
-//  xSReg->open(OUString::createFromAscii("dummy.reg"), sal_False, sal_True);
-//  xSReg->close();
+//	xSReg->open(OUString::createFromAscii("dummy.reg"), sal_False, sal_True);
+//	xSReg->close();
 
     // laut dbo : C-API muss nicht mehr unterstuezt werden
     //TEST_ENSHURE( registerExternService(atModule, "dummy.reg"), "install failed" );
     //TEST_ENSHURE( deregisterExternService(atModule, "dummy.reg"), "deinstall failed" );
 
 
-//  UNO_INTERFACE(XMultiServiceFactory) xUnoSMgr = {0,0};
-//  smart2uno(xSMgr, xUnoSMgr);
+//	UNO_INTERFACE(XMultiServiceFactory) xUnoSMgr = {0,0};
+//	smart2uno(xSMgr, xUnoSMgr);
 
-//  TEST_ENSHURE(registerExternImplementation(xUnoSMgr, "com::sun::star.loader.SharedLibrary", atModule2, "dummy.reg"), "install failed" );
-//  TEST_ENSHURE(revokeExternImplementation(xUnoSMgr, atModule2, "dummy.reg"), "deinstall failed" );
+//	TEST_ENSHURE(registerExternImplementation(xUnoSMgr, "com::sun::star.loader.SharedLibrary", atModule2, "dummy.reg"), "install failed" );
+//	TEST_ENSHURE(revokeExternImplementation(xUnoSMgr, atModule2, "dummy.reg"), "deinstall failed" );
 
-//  TEST_ENSHURE(registerExternImplementation(xUnoSMgr, "com::sun::star.loader.SharedLibrary", atModule2, "dummy2.reg"), "install failed" );
+//	TEST_ENSHURE(registerExternImplementation(xUnoSMgr, "com::sun::star.loader.SharedLibrary", atModule2, "dummy2.reg"), "install failed" );
 
 //TODO : Java loader test
-//  String testUrl(getTestJarUrl());
-//  TEST_ENSHURE(registerExternImplementation(xUnoSMgr, "com::sun::star.loader.Java", testUrl, "dummy.reg"), "install failed" );
-//  TEST_ENSHURE(revokeExternImplementation(xUnoSMgr, testUrl, "dummy.reg"), "deinstall failed" );
+//	String testUrl(getTestJarUrl());
+//	TEST_ENSHURE(registerExternImplementation(xUnoSMgr, "com::sun::star.loader.Java", testUrl, "dummy.reg"), "install failed" );
+//	TEST_ENSHURE(revokeExternImplementation(xUnoSMgr, testUrl, "dummy.reg"), "deinstall failed" );
 
-//  if (!UNO_isNull((UNO_Ifc*)&xUnoSMgr))
-//      xUnoSMgr.m_pVmt->release(xUnoSMgr.m_pCtx);
+//	if (!UNO_isNull((UNO_Ifc*)&xUnoSMgr))
+//		xUnoSMgr.m_pVmt->release(xUnoSMgr.m_pCtx);
 
-//  xSReg->open(OUString::createFromAscii("dummy.reg"), sal_True, sal_False);
-//  TEST_ENSHURE(!xSReg->getRootKey()->openKey(OUString::createFromAscii("/SERVICES/com::sun::star/ts/TestManagerImpl/URL")).is(),
-//              "deinstall failed" );
+//	xSReg->open(OUString::createFromAscii("dummy.reg"), sal_True, sal_False);
+//	TEST_ENSHURE(!xSReg->getRootKey()->openKey(OUString::createFromAscii("/SERVICES/com::sun::star/ts/TestManagerImpl/URL")).is(),
+//				"deinstall failed" );
 
-//  xSReg->close();
+//	xSReg->close();
 
-//  xSReg->open(OUString::createFromAscii("dummy.reg"), sal_False, sal_False);
-//  xSReg->destroy();
-//  xSReg->open(OUString::createFromAscii("dummy2.reg"), sal_False, sal_False);
-//  xSReg->destroy();
+//	xSReg->open(OUString::createFromAscii("dummy.reg"), sal_False, sal_False);
+//	xSReg->destroy();
+//	xSReg->open(OUString::createFromAscii("dummy2.reg"), sal_False, sal_False);
+//	xSReg->destroy();
 
 
     // Test initialisieren
diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx
index a835a37f6b69..fb6fb1b09b08 100644
--- a/stoc/test/uriproc/test_uriproc.cxx
+++ b/stoc/test/uriproc/test_uriproc.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/stoc/test/uriproc/version.map b/stoc/test/uriproc/version.map
index 3308588ef6f8..0dbbcc5a7372 100644
--- a/stoc/test/uriproc/version.map
+++ b/stoc/test/uriproc/version.map
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/inc/pch/precompiled_store.cxx b/store/inc/pch/precompiled_store.cxx
index 7fe9c284c5a6..9282f156de75 100644
--- a/store/inc/pch/precompiled_store.cxx
+++ b/store/inc/pch/precompiled_store.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/inc/pch/precompiled_store.hxx b/store/inc/pch/precompiled_store.hxx
index fe00b2bb716b..7de7d6fe174b 100644
--- a/store/inc/pch/precompiled_store.hxx
+++ b/store/inc/pch/precompiled_store.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/inc/store/store.h b/store/inc/store/store.h
index 5589035e169f..6f4b5446ae69 100644
--- a/store/inc/store/store.h
+++ b/store/inc/store/store.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/inc/store/store.hxx b/store/inc/store/store.hxx
index e4970845d38b..f053e8fc9c51 100644
--- a/store/inc/store/store.hxx
+++ b/store/inc/store/store.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -460,7 +460,7 @@ public:
         }
         return store_createMemoryFile (nPageSize, &m_hImpl);
     }
-
+    
     /** Close the file.
         @see store_closeFile()
      */
diff --git a/store/inc/store/types.h b/store/inc/store/types.h
index 2d791ddbfecb..dd67cc5579c0 100644
--- a/store/inc/store/types.h
+++ b/store/inc/store/types.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index 40c098f52ac4..02e4607bd7aa 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/source/lockbyte.hxx b/store/source/lockbyte.hxx
index a1fa369e9bcb..f41dbae31862 100644
--- a/store/source/lockbyte.hxx
+++ b/store/source/lockbyte.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/source/object.cxx b/store/source/object.cxx
index bebb5f0a170c..3e818efc70c6 100644
--- a/store/source/object.cxx
+++ b/store/source/object.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/source/object.hxx b/store/source/object.hxx
index 4468e63a5d69..0d71ffa786bb 100644
--- a/store/source/object.hxx
+++ b/store/source/object.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/source/storbase.cxx b/store/source/storbase.cxx
index 78e311b28fa0..8db623e59c19 100644
--- a/store/source/storbase.cxx
+++ b/store/source/storbase.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
index 24a2cc71bab6..c937ab937837 100644
--- a/store/source/storbase.hxx
+++ b/store/source/storbase.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx
index b5f247bf4a99..47d947c87481 100644
--- a/store/source/storbios.cxx
+++ b/store/source/storbios.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx
index 74cfdc131584..a74304660863 100644
--- a/store/source/storbios.hxx
+++ b/store/source/storbios.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index 79c34492e978..81863fc137db 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -152,25 +152,25 @@ struct Entry
  *======================================================================*/
 namespace
 {
-
+ 
 class EntryCache
 {
     rtl_cache_type * m_entry_cache;
-
+ 
 public:
     static EntryCache & get();
-
+ 
     Entry * create (PageHolder const & rxPage, sal_uInt32 nOffset);
-
+ 
     void destroy (Entry * entry);
-
+ 
 protected:
     EntryCache();
     ~EntryCache();
 };
-
+ 
 } // namespace
-
+ 
 /*========================================================================
  *
  * EntryCache implementation.
@@ -220,7 +220,7 @@ void EntryCache::destroy (Entry * entry)
     {
         // destruct.
         entry->~Entry();
-
+    
         // return to cache.
         rtl_cache_free (m_entry_cache, entry);
     }
diff --git a/store/source/storcach.hxx b/store/source/storcach.hxx
index 1b8af30496bb..feee20974028 100644
--- a/store/source/storcach.hxx
+++ b/store/source/storcach.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/source/stordata.cxx b/store/source/stordata.cxx
index db85ce0eff13..4133695a7543 100644
--- a/store/source/stordata.cxx
+++ b/store/source/stordata.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -130,7 +130,7 @@ static storeError store_truncate_Impl (
             if (eErrCode != store_E_InvalidChecksum)
                 return eErrCode;
         }
-
+  
         // Check for complete truncation.
         if ((nDouble + nSingle) == 0)
         {
@@ -160,7 +160,7 @@ static storeError store_truncate_Impl (
         storeError eErrCode = rBIOS.loadObjectAt (aTriple, nAddr);
         if (eErrCode != store_E_None)
             return eErrCode;
-
+  
         // Truncate to 'nTriple', 'nDouble', 'nSingle' pages.
         eErrCode = aTriple.truncate (nTriple, nDouble, nSingle, rBIOS);
         if (eErrCode != store_E_None)
diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx
index 61625c32c046..f1b806bdead2 100644
--- a/store/source/stordata.hxx
+++ b/store/source/stordata.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/source/stordir.cxx b/store/source/stordir.cxx
index 01d4357a2a46..a700e6baa2d3 100644
--- a/store/source/stordir.cxx
+++ b/store/source/stordir.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx
index 749fa6baa850..b4903e38b92e 100644
--- a/store/source/stordir.hxx
+++ b/store/source/stordir.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/source/store.cxx b/store/source/store.cxx
index a77b34acc9ca..d0316c4b7d84 100644
--- a/store/source/store.cxx
+++ b/store/source/store.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -615,7 +615,7 @@ storeError SAL_CALL store_link (
 
     if (!(pSrcPath && pSrcName))
         return store_E_InvalidParameter;
-
+    
     if (!(pDstPath && pDstName))
         return store_E_InvalidParameter;
 
diff --git a/store/source/storlckb.cxx b/store/source/storlckb.cxx
index 658ec52646b6..31035208a93e 100644
--- a/store/source/storlckb.cxx
+++ b/store/source/storlckb.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx
index 9902863581f6..e44d87b6ec12 100644
--- a/store/source/storlckb.hxx
+++ b/store/source/storlckb.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/source/storpage.cxx b/store/source/storpage.cxx
index b91528a615df..47495124448d 100644
--- a/store/source/storpage.cxx
+++ b/store/source/storpage.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -913,7 +913,7 @@ storeError OStorePageManager::rebuild (
                 // Determine data page count.
                 inode::ChunkDescriptor aDescr (
                     nDataLen - xDstDir->capacity(), xData->capacity());
-
+                
                 sal_uInt32 i, n = aDescr.m_nPage;
                 if (aDescr.m_nOffset) n += 1;
 
diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx
index 58e6b15356b6..1d7743ac7fff 100644
--- a/store/source/storpage.hxx
+++ b/store/source/storpage.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/source/stortree.cxx b/store/source/stortree.cxx
index 508748c3b285..4f8766cd2380 100644
--- a/store/source/stortree.cxx
+++ b/store/source/stortree.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -477,7 +477,7 @@ storeError OStoreBTreeRootObject::find_insert (
         PageHolder tmp (m_xPage);
         tmp.swap (rNode.get());
     }
-
+    
     // Setup BTree entry.
     T const entry (rKey);
 
diff --git a/store/source/stortree.hxx b/store/source/stortree.hxx
index 7b9c302b5643..4152a5bb5a47 100644
--- a/store/source/stortree.hxx
+++ b/store/source/stortree.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/util/store.xml b/store/util/store.xml
index 0cd8cbef9d2c..9dc042f33dde 100644
--- a/store/util/store.xml
+++ b/store/util/store.xml
@@ -3,5 +3,5 @@
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
     <module-name> store </module-name>
     <project-build-dependency>  sal </project-build-dependency>
-    <runtime-module-dependency> sal </runtime-module-dependency>
+    <runtime-module-dependency>	sal </runtime-module-dependency>
 </module-description>
diff --git a/store/workben/t_base.cxx b/store/workben/t_base.cxx
index 6a96b7c15bb1..80966f4bf4d2 100644
--- a/store/workben/t_base.cxx
+++ b/store/workben/t_base.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -111,7 +111,7 @@ public:
 protected:
     virtual ~OTestBIOS (void);
 };
-
+ 
 } // namespace store
 
 OTestBIOS::OTestBIOS (void)
diff --git a/store/workben/t_file.cxx b/store/workben/t_file.cxx
index 6357e7b8a5a6..3bd81c262e79 100644
--- a/store/workben/t_file.cxx
+++ b/store/workben/t_file.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/store/workben/t_store.cxx b/store/workben/t_store.cxx
index 9f4e83931e52..faf343bbb67d 100644
--- a/store/workben/t_store.cxx
+++ b/store/workben/t_store.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/beans/Ambiguous.idl b/udkapi/com/sun/star/beans/Ambiguous.idl
index 919c7250f462..2a54fc229a1d 100644
--- a/udkapi/com/sun/star/beans/Ambiguous.idl
+++ b/udkapi/com/sun/star/beans/Ambiguous.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/beans/Defaulted.idl b/udkapi/com/sun/star/beans/Defaulted.idl
index d67f1aacf055..66f5ccb6c1b4 100644
--- a/udkapi/com/sun/star/beans/Defaulted.idl
+++ b/udkapi/com/sun/star/beans/Defaulted.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/beans/GetDirectPropertyTolerantResult.idl b/udkapi/com/sun/star/beans/GetDirectPropertyTolerantResult.idl
index 5c1ffe05beb0..f12e8d475e9a 100644
--- a/udkapi/com/sun/star/beans/GetDirectPropertyTolerantResult.idl
+++ b/udkapi/com/sun/star/beans/GetDirectPropertyTolerantResult.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_GetDirectPropertyTolerantResult_idl__
-#define __com_sun_star_beans_GetDirectPropertyTolerantResult_idl__
-
-#ifndef __com_sun_star_beans_TolerantPropertySetResultType_idl__
-#include <com/sun/star/beans/TolerantPropertySetResultType.idl>
-#endif
-
-#ifndef __com_sun_star_beans_GetPropertyTolerantResult_idl__
-#include <com/sun/star/beans/GetPropertyTolerantResult.idl>
-#endif
-
-
-//=============================================================================
+#ifndef __com_sun_star_beans_GetDirectPropertyTolerantResult_idl__ 
+#define __com_sun_star_beans_GetDirectPropertyTolerantResult_idl__ 
+ 
+#ifndef __com_sun_star_beans_TolerantPropertySetResultType_idl__ 
+#include <com/sun/star/beans/TolerantPropertySetResultType.idl> 
+#endif 
 
-module com {  module sun {  module star {  module beans {
+#ifndef __com_sun_star_beans_GetPropertyTolerantResult_idl__ 
+#include <com/sun/star/beans/GetPropertyTolerantResult.idl> 
+#endif 
 
-//=============================================================================
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
 
 /** specifies information being retrieved about a single property.
 
-     This type is used for the elements in the sequence returned by
+     This type is used for the elements in the sequence returned by 
      <member scope="com::sun::star::beans::XTolerantMultiPropertySet">GetDirectPropertyTolerantResult</member>.
 
     @see com::sun::star::beans::XTolerantMultiPropertySet
@@ -54,12 +54,12 @@ published struct GetDirectPropertyTolerantResult : com::sun::star::beans::GetPro
     /** specifies the name of the property.
      */
 
-    string Name;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string Name; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/GetPropertyTolerantResult.idl b/udkapi/com/sun/star/beans/GetPropertyTolerantResult.idl
index bcde3011b5ab..8be3c312434b 100644
--- a/udkapi/com/sun/star/beans/GetPropertyTolerantResult.idl
+++ b/udkapi/com/sun/star/beans/GetPropertyTolerantResult.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,59 +24,59 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_GetPropertyTolerantResult_idl__
-#define __com_sun_star_beans_GetPropertyTolerantResult_idl__
-
-#ifndef __com_sun_star_beans_TolerantPropertySetResultType_idl__
-#include <com/sun/star/beans/TolerantPropertySetResultType.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyState_idl__
-#include <com/sun/star/beans/PropertyState.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
+#ifndef __com_sun_star_beans_GetPropertyTolerantResult_idl__ 
+#define __com_sun_star_beans_GetPropertyTolerantResult_idl__ 
+ 
+#ifndef __com_sun_star_beans_TolerantPropertySetResultType_idl__ 
+#include <com/sun/star/beans/TolerantPropertySetResultType.idl> 
+#endif 
+
+#ifndef __com_sun_star_beans_PropertyState_idl__ 
+#include <com/sun/star/beans/PropertyState.idl> 
+#endif 
+
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
 
 /** specifies information being retrieved about a single property.
-
+    
     @see com::sun::star::beans::XTolerantMultiPropertySet
  */
 published struct GetPropertyTolerantResult
 {
     /** specifies a success or error code for the retrieval operation.
-
+    
         @see    com::sun::star::beans::TolerantPropertySetResultType
      */
 
-    short   Result;
-
-    //-------------------------------------------------------------------------
+    short   Result; 
+ 
+    //------------------------------------------------------------------------- 
 
     /** contains the state of the property.
 
-        <p>The value is undefined if <var>Result</var> is not
+        <p>The value is undefined if <var>Result</var> is not 
         <member scope="com::sun::star::beans::TolerantPropertySetResultType">SUCCESS</member>.</p>
      */
-    com::sun::star::beans::PropertyState    State;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::beans::PropertyState    State; 
+ 
+    //------------------------------------------------------------------------- 
+    
     /** contains the value of the property.
 
-        <p>The value is undefined if <var>Result</var> is not
+        <p>The value is undefined if <var>Result</var> is not 
         <member scope="com::sun::star::beans::TolerantPropertySetResultType">SUCCESS</member>.</p>
      */
-    any     Value;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    any     Value; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/IllegalTypeException.idl b/udkapi/com/sun/star/beans/IllegalTypeException.idl
index 72fca7c45076..949b92f2746a 100644
--- a/udkapi/com/sun/star/beans/IllegalTypeException.idl
+++ b/udkapi/com/sun/star/beans/IllegalTypeException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_IllegalTypeException_idl__
-#define __com_sun_star_beans_IllegalTypeException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
-/** This exception is thrown to indicate the use of a type which is
+#ifndef __com_sun_star_beans_IllegalTypeException_idl__ 
+#define __com_sun_star_beans_IllegalTypeException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
+/** This exception is thrown to indicate the use of a type which is 
     not appropriate.
-
+    
     <p>This problem can occur, if you use an <atom>any</atom>.  </p>
     @see PropertyContainer
  */
 published exception IllegalTypeException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/Introspection.idl b/udkapi/com/sun/star/beans/Introspection.idl
index 517c402d6efa..7aad051c81ff 100644
--- a/udkapi/com/sun/star/beans/Introspection.idl
+++ b/udkapi/com/sun/star/beans/Introspection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_Introspection_idl__
-#define __com_sun_star_beans_Introspection_idl__
-
-#ifndef __com_sun_star_beans_XIntrospection_idl__
-#include <com/sun/star/beans/XIntrospection.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module beans {
-
-//=============================================================================
+#ifndef __com_sun_star_beans_Introspection_idl__ 
+#define __com_sun_star_beans_Introspection_idl__ 
+ 
+#ifndef __com_sun_star_beans_XIntrospection_idl__ 
+#include <com/sun/star/beans/XIntrospection.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
 /** provides functionality to get information about an object's
     properties and methods.
     <p><strong>Important note:</strong>An object can only be
     inspected completely if it supports the <type scope=
     "com::sun::star::lang">XTypeProvider</type> interface.</p>
-
+    
     <p>For details see method <member>XIntrospection::inspect
     </member>.</p>
  */
 published service Introspection
-{
+{ 
     /// The only interface of this service
-    interface com::sun::star::beans::XIntrospection;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::beans::XIntrospection; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/IntrospectionException.idl b/udkapi/com/sun/star/beans/IntrospectionException.idl
index 2f8e62589d24..3a9855bec53e 100644
--- a/udkapi/com/sun/star/beans/IntrospectionException.idl
+++ b/udkapi/com/sun/star/beans/IntrospectionException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_IntrospectionException_idl__
-#define __com_sun_star_beans_IntrospectionException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-/** This exception is thrown when an exception happens during
+#ifndef __com_sun_star_beans_IntrospectionException_idl__ 
+#define __com_sun_star_beans_IntrospectionException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+/** This exception is thrown when an exception happens during 
     introspection.
     @deprecated
-
+        
     <p>This exception isn't specified and used anywhere</p>
  */
 published exception IntrospectionException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/MethodConcept.idl b/udkapi/com/sun/star/beans/MethodConcept.idl
index 241902cd859e..d3e74bc2df7a 100644
--- a/udkapi/com/sun/star/beans/MethodConcept.idl
+++ b/udkapi/com/sun/star/beans/MethodConcept.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,19 +24,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_MethodConcept_idl__
-#define __com_sun_star_beans_MethodConcept_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-/** These constants are used to specify concepts of the
-    introspection which apply to methods.
-
-    <p>This list is not necessarily complete; new constants
+#ifndef __com_sun_star_beans_MethodConcept_idl__ 
+#define __com_sun_star_beans_MethodConcept_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+/** These constants are used to specify concepts of the 
+    introspection which apply to methods. 
+         
+    <p>This list is not necessarily complete; new constants 
     may be added.</p>
     @see Introspection
     @see XIntrospection
@@ -44,84 +44,84 @@
 
 */
 published constants MethodConcept
-{
-    //-------------------------------------------------------------------------
-    /** This value is used to query for all methods, see
+{ 
+    //------------------------------------------------------------------------- 
+    /** This value is used to query for all methods, see 
         <member>XIntrospectionAccess::getMethod()</member> and
         <member>XIntrospectionAccess::getMethods()</member>
      */
-    const long ALL = -1;
-
-    //-------------------------------------------------------------------------
-    /** specifies methods which can result in an unstable state
-        (i.e. deadlock, application crash, security hole, etc.)
+    const long ALL = -1; 
+ 
+    //------------------------------------------------------------------------- 
+    /** specifies methods which can result in an unstable state 
+        (i.e. deadlock, application crash, security hole, etc.) 
         when called directly by the user.
      */
-    const long DANGEROUS = 1;
-
-    //-------------------------------------------------------------------------
-    /** specifies methods which are used to set and get the
-        value of properties/attributes.
-
+    const long DANGEROUS = 1; 
+ 
+    //------------------------------------------------------------------------- 
+    /** specifies methods which are used to set and get the 
+        value of properties/attributes. 
+                 
         <p>These methods have the signature <code>type get...()
         </code>, <code>void set...()</code> or <code>boolean is...()
         </code>. </p>
      */
-    const long PROPERTY = 2;
-
-    //-------------------------------------------------------------------------
+    const long PROPERTY = 2; 
+ 
+    //------------------------------------------------------------------------- 
     /** specifies methods of the <em>listener concept</em>.
-
+                 
         <p>These methods have the signature <code>add...Listener()
         </code> or <code>remove...Listener()</code>. </p>
      */
-    const long LISTENER = 4;
-
-    //-------------------------------------------------------------------------
-    /** specifies methods of the <em>enumeration concept</em>.
-
-        <p>These methods have the signature
-        <code>create...Enumeration</code> and return an interface
+    const long LISTENER = 4; 
+ 
+    //------------------------------------------------------------------------- 
+    /** specifies methods of the <em>enumeration concept</em>. 
+                 
+        <p>These methods have the signature  
+        <code>create...Enumeration</code> and return an interface 
         that is derived from <type scope="com::sun::star::container">
-        XEnumeration</type> Additionally, the method
-        <method scope="com::sun::star::container">XEnumerationAccess::getElementType</method>
+        XEnumeration</type>	Additionally, the method 
+        <method scope="com::sun::star::container">XEnumerationAccess::getElementType</method> 
         belongs to this concept.</p>
      */
-    const long ENUMERATION = 8;
-
-    //-------------------------------------------------------------------------
-    /** specifies methods of the <em>name container concept</em>.
-
-        <p>These methods have the signature
-        <code>get...ByName()</code>,
-        <code>set...ByName()</code>,
-        <code>replace...ByName()</code>,
-        <code>remove...ByName()</code>,
-        <code>has...ByName()</code>, or
-        <code>get...Names</code>.  In addition, the method
-        <method scope="com::sun::star::container">XEnumerationAccess::getElementType</method>
+    const long ENUMERATION = 8; 
+ 
+    //------------------------------------------------------------------------- 
+    /** specifies methods of the <em>name container concept</em>. 
+                 
+        <p>These methods have the signature 
+        <code>get...ByName()</code>, 
+        <code>set...ByName()</code>, 
+        <code>replace...ByName()</code>, 
+        <code>remove...ByName()</code>, 
+        <code>has...ByName()</code>, or 
+        <code>get...Names</code>.  In addition, the method 
+        <method scope="com::sun::star::container">XEnumerationAccess::getElementType</method> 
         belongs to this concept. </p>
-     */
-    const long NAMECONTAINER = 16;
-
-    //-------------------------------------------------------------------------
-    /** specifies methods of the <em>index container concept</em>.
-
-        <p>These methods have the signature
-        <code>get...ByIndex()</code>,
-        <code>insert...ByIndex()</code>,
-        <code>replace...ByIndex()</code>, or
-        <code>remove...ByIndex()</code>.
+     */ 
+    const long NAMECONTAINER = 16; 
+ 
+    //------------------------------------------------------------------------- 
+    /** specifies methods of the <em>index container concept</em>. 
+                 
+        <p>These methods have the signature 
+        <code>get...ByIndex()</code>, 
+        <code>insert...ByIndex()</code>, 
+        <code>replace...ByIndex()</code>, or 
+        <code>remove...ByIndex()</code>.  
         The method <member scope="com::sun::star::container">
-        XIndexAccess::getCount()</member>
+        XIndexAccess::getCount()</member> 
         also belongs to this concept. </p>
      */
-    const long INDEXCONTAINER = 32;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const long INDEXCONTAINER = 32; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/NamedValue.idl b/udkapi/com/sun/star/beans/NamedValue.idl
index dcaee0cd9e34..4c1d15d74f34 100644
--- a/udkapi/com/sun/star/beans/NamedValue.idl
+++ b/udkapi/com/sun/star/beans/NamedValue.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/beans/NotRemoveableException.idl b/udkapi/com/sun/star/beans/NotRemoveableException.idl
index bdda8ed44fba..096e629802e9 100644
--- a/udkapi/com/sun/star/beans/NotRemoveableException.idl
+++ b/udkapi/com/sun/star/beans/NotRemoveableException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_NotRemoveableException_idl__
-#define __com_sun_star_beans_NotRemoveableException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
-/** This exception is thrown to indicate that removing a property from an
+#ifndef __com_sun_star_beans_NotRemoveableException_idl__ 
+#define __com_sun_star_beans_NotRemoveableException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans { 
+ 
+//============================================================================= 
+ 
+/** This exception is thrown to indicate that removing a property from an 
     <type>XPropertyContainer</type> is not allowed.
  */
 published exception NotRemoveableException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/Optional.idl b/udkapi/com/sun/star/beans/Optional.idl
index fbf58b667c16..00ce5deba812 100644
--- a/udkapi/com/sun/star/beans/Optional.idl
+++ b/udkapi/com/sun/star/beans/Optional.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/beans/Pair.idl b/udkapi/com/sun/star/beans/Pair.idl
index 0bb214fb87bb..39d3653f6aed 100644
--- a/udkapi/com/sun/star/beans/Pair.idl
+++ b/udkapi/com/sun/star/beans/Pair.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/beans/Property.idl b/udkapi/com/sun/star/beans/Property.idl
index bd633f9a448a..e28989d20ef1 100644
--- a/udkapi/com/sun/star/beans/Property.idl
+++ b/udkapi/com/sun/star/beans/Property.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_Property_idl__
-#define __com_sun_star_beans_Property_idl__
-
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
-#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_Property_idl__ 
+#define __com_sun_star_beans_Property_idl__ 
+ 
+#ifndef __com_sun_star_reflection_XIdlClass_idl__ 
+#include <com/sun/star/reflection/XIdlClass.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** This structure describes a property.
-
-
+    
+    
     <dl>There are three types of properties:
         <dt>- bound properties</dt>
         <dt>- constrained properties</dt>
@@ -50,43 +50,43 @@ module com {  module sun {  module star {  module beans {
 published struct Property
 {
     /** specifies the name of the property.
-
+        
         <p>The name is unique within an <type>XPropertySet</type>.
         Upper and lower case are distinguished.</p>
      */
-    string Name;
-
-    //-------------------------------------------------------------------------
-
+    string Name; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains an implementation-specific handle for the property.
-
-        <p>It may be -1 if the implementation has no handle. You can use
+        
+        <p>It may be -1 if the implementation has no handle. You can use 
         this handle to get values from the <type>XFastPropertySet</type>.</p>
      */
-    long Handle;
-
-    //-------------------------------------------------------------------------
-
+    long Handle; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains an object that identifies the declared type for
-        the property.
-
-        <p>If the property has multiple types or the type is not
-        known, <strong>but not an <atom>any</atom></strong>, then
+        the property. 
+        
+        <p>If the property has multiple types or the type is not 
+        known, <strong>but not an <atom>any</atom></strong>, then 
         <const>void</const> must be returned.</p>
      */
-    type Type;
-
-    //-------------------------------------------------------------------------
-
+    type Type; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This field may contain zero or more constants of the
         <type>PropertyAttribute</type> constants group.
      */
-    short Attributes;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    short Attributes; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/PropertyAttribute.idl b/udkapi/com/sun/star/beans/PropertyAttribute.idl
index 23eeefba497a..b945aa9a59b2 100644
--- a/udkapi/com/sun/star/beans/PropertyAttribute.idl
+++ b/udkapi/com/sun/star/beans/PropertyAttribute.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/beans/PropertyBag.idl b/udkapi/com/sun/star/beans/PropertyBag.idl
index c0026af4b81a..5ea8f77c7551 100644
--- a/udkapi/com/sun/star/beans/PropertyBag.idl
+++ b/udkapi/com/sun/star/beans/PropertyBag.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_PropertyBag_idl__
-#define __com_sun_star_beans_PropertyBag_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
-#include <com/sun/star/beans/XPropertyContainer.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyAccess_idl__
-#include <com/sun/star/beans/XPropertyAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_PropertyBag_idl__ 
+#define __com_sun_star_beans_PropertyBag_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertyContainer_idl__ 
+#include <com/sun/star/beans/XPropertyContainer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertyAccess_idl__ 
+#include <com/sun/star/beans/XPropertyAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** Implementation of this service can keep any properties and is useful
     when an <type>XPropertySet</type> is to be used, for example, as parameters for a method call.
 
     <p>Scripting engines might not be able to use such objects as normal
-    property sets, giving direct access to the properties.  In this case,
+    property sets, giving direct access to the properties.  In this case, 
     use the methods like <member>XPropertySet::getPropertyValue</member>.
  */
 published service PropertyBag
-{
-    interface com::sun::star::beans::XPropertySet;
-
-    interface com::sun::star::beans::XPropertyContainer;
-
-    interface com::sun::star::beans::XPropertyAccess;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    interface com::sun::star::beans::XPropertySet; 
+    
+    interface com::sun::star::beans::XPropertyContainer; 
+    
+    interface com::sun::star::beans::XPropertyAccess; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/PropertyChangeEvent.idl b/udkapi/com/sun/star/beans/PropertyChangeEvent.idl
index 874373a2b1c1..717857667b84 100644
--- a/udkapi/com/sun/star/beans/PropertyChangeEvent.idl
+++ b/udkapi/com/sun/star/beans/PropertyChangeEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,71 +24,71 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_PropertyChangeEvent_idl__
-#define __com_sun_star_beans_PropertyChangeEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
-/** gets delivered whenever a "bound" or "constrained" property is changed.
-
+#ifndef __com_sun_star_beans_PropertyChangeEvent_idl__ 
+#define __com_sun_star_beans_PropertyChangeEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
+/** gets delivered whenever a "bound" or "constrained" property is changed.  
+    
     <p>A <type>PropertyChangeEvent</type> object is sent as an
-    argument to the methods of <type>XPropertyChangeListener</type>
+    argument to the methods of <type>XPropertyChangeListener</type> 
     and <type>XVetoableChangeListener</type>. </p>
-
-    <p>Normally such events contain the name and the old and new
+    
+    <p>Normally such events contain the name and the old and new 
     value of the changed property.  </p>
 
     <p>Void values may be provided for the old and new values if their
     true values are not known. </p>
  */
 published struct PropertyChangeEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the unique name of the property which changes its value.
      */
-    string PropertyName;
-
-    //-------------------------------------------------------------------------
-
+    string PropertyName; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains <true/> if further events in the same transaction occur.
      */
-    boolean Further;
-
-    //-------------------------------------------------------------------------
-
+    boolean Further; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the implementation handle for the property.
-
-        <p>May be -1 if the implementation has no handle. You can use
+        
+        <p>May be -1 if the implementation has no handle. You can use 
         this handle to get values from the <type>XFastPropertySet</type>.</p>
      */
-    long PropertyHandle;
-
-    //-------------------------------------------------------------------------
-
+    long PropertyHandle; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the old value of the property.
      */
-    any OldValue;
-
-    //-------------------------------------------------------------------------
-
+    any OldValue; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the new value of the property.
      */
-    any NewValue;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    any NewValue; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/PropertyConcept.idl b/udkapi/com/sun/star/beans/PropertyConcept.idl
index 46d95a8da78b..cb5924d6b7cb 100644
--- a/udkapi/com/sun/star/beans/PropertyConcept.idl
+++ b/udkapi/com/sun/star/beans/PropertyConcept.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_PropertyConcept_idl__
-#define __com_sun_star_beans_PropertyConcept_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-/** These constants are used to specify concepts of the
-    introspection which apply to properties and to the
+#ifndef __com_sun_star_beans_PropertyConcept_idl__ 
+#define __com_sun_star_beans_PropertyConcept_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+/** These constants are used to specify concepts of the 
+    introspection which apply to properties and to the 
     methods which represent attributes.
-
-    <p>This list is not necessarily complete; new constants
+         
+    <p>This list is not necessarily complete; new constants 
     may be added.</p>
 
     @see Introspection
@@ -45,49 +45,49 @@ module com {  module sun {  module star {  module beans {
     @see XIntrospectionAccess
  */
 published constants PropertyConcept
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** This value is used to query for all properties.
 
-        See
+        See 
         <member>XIntrospectionAccess::getProperty()</member> and
         <member>XIntrospectionAccess::getProperties()</member>
      */
-    const long ALL = -1;
-
-    //-------------------------------------------------------------------------
-    /** specifies that the change or retrieval of this
-        property directly by the user can result in an unstable
+    const long ALL = -1; 
+ 
+    //------------------------------------------------------------------------- 
+    /** specifies that the change or retrieval of this  
+        property directly by the user can result in an unstable 
         state (deadlock, application crash, security hole, etc.)
      */
-    const long DANGEROUS = 1;
-
-    //-------------------------------------------------------------------------
-    /** specifies all properties which are reachable by
-        <type>XPropertySet</type>, <type>XFastPropertySet</type> or
+    const long DANGEROUS = 1; 
+ 
+    //------------------------------------------------------------------------- 
+    /** specifies all properties which are reachable by  
+        <type>XPropertySet</type>, <type>XFastPropertySet</type> or 
         <type>XMultiPropertySet</type>.
      */
-    const long PROPERTYSET = 2;
-
-    //-------------------------------------------------------------------------
-
+    const long PROPERTYSET = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies all properties which are actually attributes of interfaces.
      */
     const long ATTRIBUTES = 4;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies all properties which are represented by getter or setter methods.
-
-        <p>These methods have the signature <code>type get...()</code>,
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies all properties which are represented by getter or setter methods. 
+                 
+        <p>These methods have the signature <code>type get...()</code>, 
         <code>void set...()</code> or <code>boolean is...()</code>.</p>
      */
-    const long METHODS = 8;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const long METHODS = 8; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/PropertyExistException.idl b/udkapi/com/sun/star/beans/PropertyExistException.idl
index 4013e3b092fc..9340451e384b 100644
--- a/udkapi/com/sun/star/beans/PropertyExistException.idl
+++ b/udkapi/com/sun/star/beans/PropertyExistException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_PropertyExistException_idl__
-#define __com_sun_star_beans_PropertyExistException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_PropertyExistException_idl__ 
+#define __com_sun_star_beans_PropertyExistException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** This exception is thrown to indicate that a property with this name already
     exists in the object.
 
     @see PropertyContainer
  */
 published exception PropertyExistException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/PropertySet.idl b/udkapi/com/sun/star/beans/PropertySet.idl
index 3be077a2ca9e..90e6e09cdbb1 100644
--- a/udkapi/com/sun/star/beans/PropertySet.idl
+++ b/udkapi/com/sun/star/beans/PropertySet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_PropertySet_idl__
-#define __com_sun_star_beans_PropertySet_idl__
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyAccess_idl__
-#include <com/sun/star/beans/XPropertyAccess.idl>
-#endif
-
+#ifndef __com_sun_star_beans_PropertySet_idl__ 
+#define __com_sun_star_beans_PropertySet_idl__ 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertyAccess_idl__ 
+#include <com/sun/star/beans/XPropertyAccess.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_beans_XPropertyState_idl__
-#include <com/sun/star/beans/XPropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
-#include <com/sun/star/beans/XFastPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
-#include <com/sun/star/beans/XMultiPropertySet.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#include <com/sun/star/beans/XPropertyState.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XFastPropertySet_idl__ 
+#include <com/sun/star/beans/XFastPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XMultiPropertySet_idl__ 
+#include <com/sun/star/beans/XMultiPropertySet.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** This is a generic service which should be supported by all servies
     which have properties.
 
     <p>It specifies several, mostly optional ways to access properties.
  */
 published service PropertySet
-{
-    interface com::sun::star::beans::XPropertySet;
-
-    [optional] interface com::sun::star::beans::XFastPropertySet;
-    [optional] interface com::sun::star::beans::XMultiPropertySet;
-    [optional] interface com::sun::star::beans::XPropertyAccess;
-    [optional] interface com::sun::star::beans::XPropertyState;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+    interface com::sun::star::beans::XPropertySet; 
+    
+    [optional] interface com::sun::star::beans::XFastPropertySet; 
+    [optional] interface com::sun::star::beans::XMultiPropertySet; 
+    [optional] interface com::sun::star::beans::XPropertyAccess; 
+    [optional] interface com::sun::star::beans::XPropertyState; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/PropertySetInfoChange.idl b/udkapi/com/sun/star/beans/PropertySetInfoChange.idl
index efb1b9c03a07..49264edbdcc8 100644
--- a/udkapi/com/sun/star/beans/PropertySetInfoChange.idl
+++ b/udkapi/com/sun/star/beans/PropertySetInfoChange.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_PropertySetInfoChange_idl__
-#define __com_sun_star_beans_PropertySetInfoChange_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
-/** specifies reasons for sending <type>PropertySetInfoChangeEvent</type>s.
-
-    @see PropertySetInfoChangeEvent
+#ifndef __com_sun_star_beans_PropertySetInfoChange_idl__ 
+#define __com_sun_star_beans_PropertySetInfoChange_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module beans { 
+ 
+//============================================================================= 
+ 
+/** specifies reasons for sending <type>PropertySetInfoChangeEvent</type>s. 
+     
+    @see PropertySetInfoChangeEvent 
     @see XPropertySetInfo
  */
 published constants PropertySetInfoChange
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** A property was inserted into a <type>XPropertySetInfo</type>.
      */
-    const long PROPERTY_INSERTED = 0;
-
-    //-------------------------------------------------------------------------
-
+    const long PROPERTY_INSERTED = 0; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** A property was removed from a <type>XPropertySetInfo</type>.
      */
-    const long PROPERTY_REMOVED = 1;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    const long PROPERTY_REMOVED = 1; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/PropertySetInfoChangeEvent.idl b/udkapi/com/sun/star/beans/PropertySetInfoChangeEvent.idl
index d0ccd39e9c63..6e9bc6b2f24b 100644
--- a/udkapi/com/sun/star/beans/PropertySetInfoChangeEvent.idl
+++ b/udkapi/com/sun/star/beans/PropertySetInfoChangeEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_PropertySetInfoChangeEvent_idl__
-#define __com_sun_star_beans_PropertySetInfoChangeEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_PropertySetInfoChangeEvent_idl__ 
+#define __com_sun_star_beans_PropertySetInfoChangeEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans { 
+ 
+//============================================================================= 
+ 
 /** gets delivered whenever an <type>XPropertySetInfo</type> is
     changed.
-
+    
     <p>A <type>PropertySetInfoChangeEvent</type> object is sent
     to <type>XPropertySetInfoChangeListener</type>s.</p>
  */
 published struct PropertySetInfoChangeEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the name of the property.
      */
-    string Name;
-
-    //-------------------------------------------------------------------------
-
+    string Name; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the implementation handle for the property.
-
+        
         <p>May be -1 if the implementation has no handle.</p>
      */
-    long   Handle;
-
-    //-------------------------------------------------------------------------
-
+    long   Handle; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the reason for the event.
 
         @see PropertySetInfoChange
      */
-    long   Reason;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    long   Reason; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/PropertyState.idl b/udkapi/com/sun/star/beans/PropertyState.idl
index cebca6913b4e..395e29dfabf8 100644
--- a/udkapi/com/sun/star/beans/PropertyState.idl
+++ b/udkapi/com/sun/star/beans/PropertyState.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,74 +24,74 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_PropertyState_idl__
-#define __com_sun_star_beans_PropertyState_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_PropertyState_idl__ 
+#define __com_sun_star_beans_PropertyState_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** This enumeration lists the states that a property value can have.
-
+    
     <p>The state consists of two aspects: </p>
     <ol>
         <li>whether a value is available or void, </li>
         <li>whether the value is stored in the property set itself or is a
             default, or ambiguous.  </li>
     </ol>
-
-    @see XPropertyState
+    
+    @see XPropertyState 
     @see Property
  */
 published enum PropertyState
-{
-    //-------------------------------------------------------------------------
-
-    /** The value of the property is stored in the PropertySet itself.
-
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** The value of the property is stored in the PropertySet itself. 
+        
         <p>The property value must be available and of the specified type.
-        If the <member>PropertyAttribute</member> field in the struct
-        <type>Property</type> contains <const>PropertyAttribute::MAYBEVOID</const>,
+        If the <member>PropertyAttribute</member> field in the struct 
+        <type>Property</type> contains <const>PropertyAttribute::MAYBEVOID</const>, 
         then the value may be void. </p>
      */
-    DIRECT_VALUE,
-
-    //-------------------------------------------------------------------------
-
-    /** The value of the property is available from a master (e.g., template).
-
-        <p>The <member>PropertyAttribute</member> field in the struct
-        <type>Property</type> must contain the
+    DIRECT_VALUE, 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** The value of the property is available from a master (e.g., template). 
+        
+        <p>The <member>PropertyAttribute</member> field in the struct 
+        <type>Property</type> must contain the 
         <const>PropertyAttribute::MAYBEDEFAULT</const> flag. The property
-        value must be available and of the specified type. If the
-        <member>PropertyAttribute</member> field in the struct <type>Property</type>
-        contains <const>PropertyAttribute::MAYBEVOID</const>, then the
+        value must be available and of the specified type. If the 
+        <member>PropertyAttribute</member> field in the struct <type>Property</type> 
+        contains <const>PropertyAttribute::MAYBEVOID</const>, then the 
         value may be void. </p>
      */
-    DEFAULT_VALUE,
-
-    //-------------------------------------------------------------------------
-
+    DEFAULT_VALUE, 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** The value of the property is only a recommendation because there
-        are multiple values for this property (e.g., from a multi selection).
-
-        <p>The <member>PropertyAttribute</member> field in the struct
-        <type>Property</type> must contain the
-        <const>PropertyAttribute::MAYBEAMBIGUOUS</const> flag. The
+        are multiple values for this property (e.g., from a multi selection). 
+        
+        <p>The <member>PropertyAttribute</member> field in the struct 
+        <type>Property</type> must contain the 
+        <const>PropertyAttribute::MAYBEAMBIGUOUS</const> flag. The 
         property value must be available and of the specified type.
-        If the Attribute field in the struct Property contains
-        <const>PropertyAttribute::MAYBEVOID</const>, then the value
+        If the Attribute field in the struct Property contains 
+        <const>PropertyAttribute::MAYBEVOID</const>, then the value 
         may be void. </p>
      */
-    AMBIGUOUS_VALUE
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    AMBIGUOUS_VALUE 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/PropertyStateChangeEvent.idl b/udkapi/com/sun/star/beans/PropertyStateChangeEvent.idl
index 1de67bb152c9..0e02d0fa2c52 100644
--- a/udkapi/com/sun/star/beans/PropertyStateChangeEvent.idl
+++ b/udkapi/com/sun/star/beans/PropertyStateChangeEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_PropertyStateChangeEvent_idl__
-#define __com_sun_star_beans_PropertyStateChangeEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyState_idl__
-#include <com/sun/star/beans/PropertyState.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
-/** is delivered whenever the state of a "bound" property is changed.
-
-    <p>It is sent as an argument to the method of
+#ifndef __com_sun_star_beans_PropertyStateChangeEvent_idl__ 
+#define __com_sun_star_beans_PropertyStateChangeEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyState_idl__ 
+#include <com/sun/star/beans/PropertyState.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
+/** is delivered whenever the state of a "bound" property is changed.  
+    
+    <p>It is sent as an argument to the method of 
     <type>XPropertyStateChangeListener</type>.  </p>
 
     <p>Normally these events are accompanied by the name, and the old
@@ -54,42 +54,42 @@ module com {  module sun {  module star {  module beans {
     true values are not known. </p>
  */
 published struct PropertyStateChangeEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies the name of the property which changes its value.
-
-        <p>This name identifies the property uniquely within an
+        
+        <p>This name identifies the property uniquely within an 
         <type>XPropertySet</type>. Upper and lower case are distinguished.</p>
      */
-    string PropertyName;
-
-    //-------------------------------------------------------------------------
-
+    string PropertyName; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the implementation handle for the property.
-
-        <p>It may be -1 if the implementation has no handle. You can use this
+        
+        <p>It may be -1 if the implementation has no handle. You can use this 
         handle to get values from the <type>XFastPropertySet</type>
         interface.</p>
      */
-    long PropertyHandle;
-
-    //-------------------------------------------------------------------------
-
+    long PropertyHandle; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the old value of the property.
      */
-    com::sun::star::beans::PropertyState OldValue;
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::beans::PropertyState OldValue; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the new value of the property.
      */
-    com::sun::star::beans::PropertyState NewValue;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::beans::PropertyState NewValue; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/PropertyValue.idl b/udkapi/com/sun/star/beans/PropertyValue.idl
index 4f53b7f4334f..d473d335c6d1 100644
--- a/udkapi/com/sun/star/beans/PropertyValue.idl
+++ b/udkapi/com/sun/star/beans/PropertyValue.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,62 +24,62 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#define __com_sun_star_beans_PropertyValue_idl__
-
-#ifndef __com_sun_star_beans_Property_idl__
-#include <com/sun/star/beans/Property.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyState_idl__
-#include <com/sun/star/beans/PropertyState.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#define __com_sun_star_beans_PropertyValue_idl__ 
+ 
+#ifndef __com_sun_star_beans_Property_idl__ 
+#include <com/sun/star/beans/Property.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyState_idl__ 
+#include <com/sun/star/beans/PropertyState.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** specifies a property value.
  */
 published struct PropertyValue
 {
     /** specifies the name of the property.
-
+        
         <p>The name is unique within a sequence of <type>PropertyValue</type>s.
         Upper and lower case are distinguished.</p>
      */
-    string Name;
-
-    //-------------------------------------------------------------------------
-
+    string Name; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains an implementation-specific handle for the property.
-
+        
         <p>It may be -1 if the implementation has no handle. If available
         it can be used for fast lookups.</p>
      */
-    long Handle;
-
-    //-------------------------------------------------------------------------
-
+    long Handle; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the value of the property or <void/>,
         if no value is available.
      */
-    any Value;
-
-    //-------------------------------------------------------------------------
-
+    any Value; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** determines if the value comes from the object itself or from
         a default and if the value cannot be determined exactly.
      */
-    com::sun::star::beans::PropertyState State;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::beans::PropertyState State; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/PropertyValues.idl b/udkapi/com/sun/star/beans/PropertyValues.idl
index f3fe17efc07a..1f22c82751c9 100644
--- a/udkapi/com/sun/star/beans/PropertyValues.idl
+++ b/udkapi/com/sun/star/beans/PropertyValues.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,10 +33,10 @@
 
 //=============================================================================
 
-module com { module sun { module star { module beans {
+module com { module sun { module star { module beans { 
 
 //=============================================================================
-/** specifies a sequence of <type>PropertyValue</type> instances.
+/**	specifies a sequence of <type>PropertyValue</type> instances.
 
     <p>Such sequences are especially useful for remote interfaces. </p>
 */
@@ -44,6 +44,6 @@ published typedef sequence<PropertyValue> PropertyValues;
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/udkapi/com/sun/star/beans/PropertyVetoException.idl b/udkapi/com/sun/star/beans/PropertyVetoException.idl
index c8abf8e95b45..0212eb299d96 100644
--- a/udkapi/com/sun/star/beans/PropertyVetoException.idl
+++ b/udkapi/com/sun/star/beans/PropertyVetoException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
-#define __com_sun_star_beans_PropertyVetoException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
+#define __com_sun_star_beans_PropertyVetoException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** This exception is thrown when a proposed change to a
     property represents an unacceptable value.
 
     @see XPropertySet
  */
 published exception PropertyVetoException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/SetPropertyTolerantFailed.idl b/udkapi/com/sun/star/beans/SetPropertyTolerantFailed.idl
index a1637026c710..851c1bcf7c1e 100644
--- a/udkapi/com/sun/star/beans/SetPropertyTolerantFailed.idl
+++ b/udkapi/com/sun/star/beans/SetPropertyTolerantFailed.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_SetPropertyTolerantFailed_idl__
-#define __com_sun_star_beans_SetPropertyTolerantFailed_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_SetPropertyTolerantFailed_idl__ 
+#define __com_sun_star_beans_SetPropertyTolerantFailed_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** specifies information about a single property failed to be set.
 
     @see com::sun::star::beans::XTolerantMultiPropertySet
@@ -42,25 +42,25 @@ published struct SetPropertyTolerantFailed
 {
     /** specifies the name of the property.
      */
-    string  Name;
-
-    //-------------------------------------------------------------------------
-
-    /** specifies the success or error code for setting the
+    string  Name; 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** specifies the success or error code for setting the 
         properties value.
 
-        <p>Since the property was not successful set the result will never be
+        <p>Since the property was not successful set the result will never be 
         <member scope="com::sun::star::beans::TolerantPropertySetResultType">SUCCESS</member>.
         </p>
 
         @see com::sun::star::beans::TolerantPropertySetResultType
      */
-    short   Result;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    short   Result; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/StringPair.idl b/udkapi/com/sun/star/beans/StringPair.idl
index 86fd955b9b07..39871793d415 100644
--- a/udkapi/com/sun/star/beans/StringPair.idl
+++ b/udkapi/com/sun/star/beans/StringPair.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/beans/TolerantPropertySetResultType.idl b/udkapi/com/sun/star/beans/TolerantPropertySetResultType.idl
index 9a28031b5286..349e56dc2c52 100644
--- a/udkapi/com/sun/star/beans/TolerantPropertySetResultType.idl
+++ b/udkapi/com/sun/star/beans/TolerantPropertySetResultType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,14 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_TolerantPropertySetResultType_idl__
-#define __com_sun_star_beans_TolerantPropertySetResultType_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
+#ifndef __com_sun_star_beans_TolerantPropertySetResultType_idl__ 
+#define __com_sun_star_beans_TolerantPropertySetResultType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
 //=============================================================================
 
 /** specifies the possible failure types when using the
@@ -39,10 +39,10 @@ module com {  module sun {  module star {  module beans {
     interface.
 
     <p>It usually matches one of the exception types that may occur when
-    using the
+    using the 
     <type scope="com::sun::star::beans">XPropertySet</type> or
     <type scope="com::sun::star::beans">XMultiPropertySet</type> interfaces.</p>
-*/
+*/  
 constants TolerantPropertySetResultType
 {
     /** the property has been successfully set or retrieved.
@@ -50,25 +50,25 @@ constants TolerantPropertySetResultType
     const short SUCCESS             = 0;
 
     /** the property is not available.
-
-        <p>For example if a
-        <type scope="com::sun::star::beans" >UnknownPropertyException</type>
+        
+        <p>For example if a 
+        <type scope="com::sun::star::beans" >UnknownPropertyException</type> 
         was catched.</p>
     */
     const short UNKNOWN_PROPERTY    = 1;
 
     /** the value used with the property is not valid.
 
-        <p>For example if a
-        <type scope="com::sun::star::lang" >IllegalArgumentException</type>
+        <p>For example if a 
+        <type scope="com::sun::star::lang" >IllegalArgumentException</type> 
         was catched.</p>
     */
     const short ILLEGAL_ARGUMENT    = 2;
 
     /** the property could not be changed at that time.
 
-        <p>For example if a
-        <type scope="com::sun::star::beans" >PropertyVetoException</type>
+        <p>For example if a 
+        <type scope="com::sun::star::beans" >PropertyVetoException</type> 
         was catched.</p>
     */
     const short PROPERTY_VETO       = 3;
@@ -84,7 +84,7 @@ constants TolerantPropertySetResultType
 };
 
 //=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/UnknownPropertyException.idl b/udkapi/com/sun/star/beans/UnknownPropertyException.idl
index 5d216743e1af..b2cd16154089 100644
--- a/udkapi/com/sun/star/beans/UnknownPropertyException.idl
+++ b/udkapi/com/sun/star/beans/UnknownPropertyException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
-#define __com_sun_star_beans_UnknownPropertyException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
+#define __com_sun_star_beans_UnknownPropertyException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** This exception is thrown to indicate that the property name is unknown to
     the implementation.
 
     @see XPropertySet
  */
 published exception UnknownPropertyException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+
+#endif 
diff --git a/udkapi/com/sun/star/beans/XExactName.idl b/udkapi/com/sun/star/beans/XExactName.idl
index 716e33651302..8999245998c1 100644
--- a/udkapi/com/sun/star/beans/XExactName.idl
+++ b/udkapi/com/sun/star/beans/XExactName.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XExactName_idl__
-#define __com_sun_star_beans_XExactName_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
-/** provides a method of changing names for converting
-    an approximate name to an existing name.
-
+#ifndef __com_sun_star_beans_XExactName_idl__ 
+#define __com_sun_star_beans_XExactName_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
+/** provides a method of changing names for converting 
+    an approximate name to an existing name. 
+    
     <p> One field of application is the conversion of case-insensitive
     names to the existing names.  </p>
 
     <p>Example: A basic interpreter ignores the case of the names. So
-    it must query the <type>XExactName</type> interface and then call
+    it must query the <type>XExactName</type> interface and then call 
     the method. </p>
 
-    @see com::sun::star::beans::XPropertySet
-    @see com::sun::star::beans::XIntrospectionAccess
+    @see com::sun::star::beans::XPropertySet 
+    @see com::sun::star::beans::XIntrospectionAccess 
     @see com::sun::star::container::XNameAccess
  */
 published interface XExactName: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the exact name for a given aprroximate name.
-
-        <p>For example "getExactName" could be returned for "GETEXACTNAME"
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            the exact name for a given aprroximate name. 
+         
+        <p>For example "getExactName" could be returned for "GETEXACTNAME" 
         when "GETEXACTNAME" was used by a case insesitive scripting language. </p>
      */
-    string getExactName( [in] string aApproximateName );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string getExactName( [in] string aApproximateName ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XFastPropertySet.idl b/udkapi/com/sun/star/beans/XFastPropertySet.idl
index 89ffd4a4288d..1534e674ae60 100644
--- a/udkapi/com/sun/star/beans/XFastPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XFastPropertySet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,103 +24,103 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XFastPropertySet_idl__
-#define __com_sun_star_beans_XFastPropertySet_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
-#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
-#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_XFastPropertySet_idl__ 
+#define __com_sun_star_beans_XFastPropertySet_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
+#include <com/sun/star/beans/UnknownPropertyException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
+#include <com/sun/star/beans/PropertyVetoException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** provides a fast way of accessing and changing property values.
-
+    
     <p>This interface is an extension to the <type>XPropertySet</type>
-    interface. The get and set methods use handles to access the
+    interface. The get and set methods use handles to access the 
     property values instead of character strings.</p>
  */
 published interface XFastPropertySet: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the value to the property with the specified name.
 
-        @param nHandle
-            contains the implementation handle of the
+        @param nHandle			
+            contains the implementation handle of the 
             implementation for the property.
 
-        @param aValue
+        @param aValue			
             contains the new value of the property.
 
-        @throws UnknownPropertyException
+        @throws UnknownPropertyException	
             if the property does not exist.
 
-        @throws PropertyVetoException
-            if a vetoable listener does not approve the change of
+        @throws PropertyVetoException		
+            if a vetoable listener does not approve the change of 
             a property value.
 
-        @throws IllegalArgumentException
-            if the new value cannot be converted to the type of the
+        @throws IllegalArgumentException  
+            if the new value cannot be converted to the type of the 
             underlying property by an identity or widening conversion.
 
-        @throws  stardiv::uno::lang::WrappedTargetException
+        @throws  stardiv::uno::lang::WrappedTargetException 
             if the implementation has an internal reason for the exception.
             In this case the original exception is wrapped into this
             <type scope="com::sun::star::lang">WrappedTargetException</type>.
 
      */
-    void setFastPropertyValue( [in] long nHandle,
-             [in] any aValue )
-            raises( com::sun::star::beans::UnknownPropertyException,
-                    com::sun::star::beans::PropertyVetoException,
-                    com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the value of the property with the name PropertyName.
-
-        @param nHandle
-            contains the implementation handle of the implementation for the property.
-
-        @throws UnknownPropertyException
-            if the property does not exist.
-
-        @throws  com::sun::star::lang::WrappedTargetException
-            if the implementation has an internal reason for the exception.
-            In this case the original exception is wrapped into that
+    void setFastPropertyValue( [in] long nHandle, 
+             [in] any aValue ) 
+            raises( com::sun::star::beans::UnknownPropertyException, 
+                    com::sun::star::beans::PropertyVetoException, 
+                    com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
+            the value of the property with the name PropertyName. 
+                 
+        @param nHandle			 
+            contains the implementation handle of the implementation for the property. 
+                 
+        @throws UnknownPropertyException	 
+            if the property does not exist. 
+                 
+        @throws  com::sun::star::lang::WrappedTargetException  
+            if the implementation has an internal reason for the exception. 
+            In this case the original exception is wrapped into that 
             <type scope="com::sun::star::lang">WrappedTargetException</type>.
      */
-    any getFastPropertyValue( [in] long nHandle )
-            raises( com::sun::star::beans::UnknownPropertyException,
-                    com::sun::star::lang::WrappedTargetException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    any getFastPropertyValue( [in] long nHandle ) 
+            raises( com::sun::star::beans::UnknownPropertyException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl b/udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl
index 31991a335b98..52e1f13d18ea 100644
--- a/udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,152 +24,152 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XHierarchicalPropertySet_idl__
-#define __com_sun_star_beans_XHierarchicalPropertySet_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XHierarchicalPropertySetInfo_idl__
-#include <com/sun/star/beans/XHierarchicalPropertySetInfo.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
-#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
-#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_XHierarchicalPropertySet_idl__ 
+#define __com_sun_star_beans_XHierarchicalPropertySet_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XHierarchicalPropertySetInfo_idl__ 
+#include <com/sun/star/beans/XHierarchicalPropertySetInfo.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
+#include <com/sun/star/beans/UnknownPropertyException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
+#include <com/sun/star/beans/PropertyVetoException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** provides information about and access to the
-    a hierarchy of properties from an implementation.
-
+    a hierarchy of properties from an implementation. 
+    
     <p> Usually an object that implements this interface
-        also implements <type>XPropertySet</type> and at
+        also implements <type>XPropertySet</type> and at 
         least some of the properties have subproperties.  </p>
 
     <p> This interface allows direct access to subsubproperties, ...
-        up to an arbitrary nesting depth. Often the intermediate
+        up to an arbitrary nesting depth. Often the intermediate 
         elements of the hierarchy implement <type>XProperty</type>.  </p>
 
-    <p> Each implementation specifies how the
-        hierarchical property names, that are
-        used to access the elements of the hierarchy,
+    <p> Each implementation specifies how the 
+        hierarchical property names, that are 
+        used to access the elements of the hierarchy, 
         are formed.  </p>
 
     <p> Commonly a notation similar to filesystem pathes
         (separated by '/' slashes) or nested module names
         (separated by dots '.' or '::') is used.  </p>
-
+    
  */
 published interface XHierarchicalPropertySet: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** retrieve information about the hierarchy of properties
 
-        @returns
-                the <type>XHierarchicalPropertySetInfo</type> interface,
-                which describes the property hierarchy of the object which
-                supplies this interface.
-
-        @returns
-                <NULL/> if the implementation cannot or will
-                not provide information about the properties; otherwise the
+        @returns  
+                the <type>XHierarchicalPropertySetInfo</type> interface, 
+                which describes the property hierarchy of the object which 
+                supplies this interface. 
+                 
+        @returns	 
+                <NULL/> if the implementation cannot or will  
+                not provide information about the properties; otherwise the  
                 interface <type>XHierarchicalPropertySetInfo</type> is returned.
      */
-    com::sun::star::beans::XHierarchicalPropertySetInfo
-                getHierarchicalPropertySetInfo();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::beans::XHierarchicalPropertySetInfo 
+                getHierarchicalPropertySetInfo(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the value of the property with the specified nested name.
-
-        @param  aHierarchicalPropertyName
-                This parameter specifies the name of the property.
-
-        @param  aValue
-                This parameter specifies the new value for the property.
-
-        @throws UnknownPropertyException
-                if the property does not exist.
-
-        @throws PropertyVetoException
-                if the property is constrained and the change is vetoed by a
+        
+        @param	aHierarchicalPropertyName	 
+                This parameter specifies the name of the property. 
+         
+        @param	aValue	 
+                This parameter specifies the new value for the property. 
+         
+        @throws UnknownPropertyException	 
+                if the property does not exist. 
+         
+        @throws PropertyVetoException  
+                if the property is constrained and the change is vetoed by a 
                 <type>XVetoableChangeListener</type>.
-
-        @throws com::sun::star::uno::lang::IllegalArgumentException
-                if <var>aValue</var> is not a legal value for this property or
-                if <var>aHierarchicalPropertyName</var> is not a well-formed
-                nested name for this hierarchy.
+                
+        @throws com::sun::star::uno::lang::IllegalArgumentException  
+                if <var>aValue</var> is not a legal value for this property or 
+                if <var>aHierarchicalPropertyName</var> is not a well-formed 
+                nested name for this hierarchy.  
                 An implementation is not required to detect the latter condition.
 
-        @throws com::sun::star::lang::WrappedTargetException
-                if the implementation has an internal reason for the exception.
-                In this case the original exception is wrapped into that
+        @throws com::sun::star::lang::WrappedTargetException  
+                if the implementation has an internal reason for the exception. 
+                In this case the original exception is wrapped into that 
                 <type scope="com::sun::star::lang">WrappedTargetException</type>.
-
+                
         @see XPropertySet::setPropertyValue
      */
-    void setHierarchicalPropertyValue( [in] string aHierarchicalPropertyName,
-             [in] any aValue )
-            raises( com::sun::star::beans::UnknownPropertyException,
-                    com::sun::star::beans::PropertyVetoException,
-                    com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-                the value of the property with the specified nested name.
-
-        @param  aHierarchicalPropertyName
-                This parameter specifies the name of the property.
-
-        @throws UnknownPropertyException
-                if the property does not exist.
-
-        @throws com::sun::star::uno::lang::IllegalArgumentException
-                if <var>aHierarchicalPropertyName</var> is not a well-formed
+    void setHierarchicalPropertyValue( [in] string aHierarchicalPropertyName, 
+             [in] any aValue ) 
+            raises( com::sun::star::beans::UnknownPropertyException, 
+                    com::sun::star::beans::PropertyVetoException, 
+                    com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+                the value of the property with the specified nested name. 
+                 
+        @param	aHierarchicalPropertyName	 
+                This parameter specifies the name of the property. 
+         
+        @throws UnknownPropertyException	 
+                if the property does not exist. 
+         
+        @throws com::sun::star::uno::lang::IllegalArgumentException  
+                if <var>aHierarchicalPropertyName</var> is not a well-formed 
                 nested name for this hierarchy.
                    An implementation is not required to detect this
                 condition.
 
-        @throws com::sun::star::lang::WrappedTargetException
-                if the implementation has an internal reason for the exception.
-                In this case the original exception is wrapped into that
+        @throws com::sun::star::lang::WrappedTargetException  
+                if the implementation has an internal reason for the exception. 
+                In this case the original exception is wrapped into that 
                 <type scope="com::sun::star::lang">WrappedTargetException</type>.
-
+                
         @see XPropertySet::getPropertyValue
      */
-    any getHierarchicalPropertyValue( [in] string aHierarchicalPropertyName )
-            raises( com::sun::star::beans::UnknownPropertyException,
-                    com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    any getHierarchicalPropertyValue( [in] string aHierarchicalPropertyName ) 
+            raises( com::sun::star::beans::UnknownPropertyException, 
+                    com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XHierarchicalPropertySetInfo.idl b/udkapi/com/sun/star/beans/XHierarchicalPropertySetInfo.idl
index 8d2f2aac3ec9..faf9c1112f58 100644
--- a/udkapi/com/sun/star/beans/XHierarchicalPropertySetInfo.idl
+++ b/udkapi/com/sun/star/beans/XHierarchicalPropertySetInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,81 +24,81 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XHierarchicalPropertySetInfo_idl__
-#define __com_sun_star_beans_XHierarchicalPropertySetInfo_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Property_idl__
-#include <com/sun/star/beans/Property.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
-#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_XHierarchicalPropertySetInfo_idl__ 
+#define __com_sun_star_beans_XHierarchicalPropertySetInfo_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_Property_idl__ 
+#include <com/sun/star/beans/Property.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
+#include <com/sun/star/beans/UnknownPropertyException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** specifies a hierarchy of properties.
-
+    
     <p>The specification only describes the properties, it does not contain
     any values.</p>
  */
 published interface XHierarchicalPropertySetInfo: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
-                the property with the specified name from the hierarchy.
-
-        @param aHierarchicalName
-                specifies the nested name of the property.
-
-        @throws UnknownPropertyException
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+                the property with the specified name from the hierarchy. 
+                 
+        @param aHierarchicalName  
+                specifies the nested name of the property. 
+             
+        @throws UnknownPropertyException	 
                 if the property does not exist.
 
-        @throws com::sun::star::lang::IllegalArgumentException
-                if <var>aHierarchicalName</var> is not a well-formed
+        @throws com::sun::star::lang::IllegalArgumentException  
+                if <var>aHierarchicalName</var> is not a well-formed 
                 nested name for this hierarchy.
                    An implementation is not required to detect this
                 condition.
 
      */
-    com::sun::star::beans::Property getPropertyByHierarchicalName( [in] string aHierarchicalName )
-            raises( com::sun::star::beans::UnknownPropertyException );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-                <TRUE/> if a property with the specified name exists;
-                otherwise <FALSE/> is returned.
-
-        @param  aHierarchicalName
+    com::sun::star::beans::Property getPropertyByHierarchicalName( [in] string aHierarchicalName ) 
+            raises( com::sun::star::beans::UnknownPropertyException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+                <TRUE/> if a property with the specified name exists; 
+                otherwise <FALSE/> is returned. 
+                 
+        @param	aHierarchicalName  
                 specifies the name of the property.
 
-        @throws com::sun::star::lang::IllegalArgumentException
-                if <var>aHierarchicalName</var> is not a well-formed
+        @throws com::sun::star::lang::IllegalArgumentException  
+                if <var>aHierarchicalName</var> is not a well-formed 
                 nested name for this hierarchy.
                    An implementation is not required to detect this
                 condition.
      */
-    boolean hasPropertyByHierarchicalName( [in] string aHierarchicalName );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean hasPropertyByHierarchicalName( [in] string aHierarchicalName ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XIntroTest.idl b/udkapi/com/sun/star/beans/XIntroTest.idl
index 34b799cc1330..a48b9839bd1c 100644
--- a/udkapi/com/sun/star/beans/XIntroTest.idl
+++ b/udkapi/com/sun/star/beans/XIntroTest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,52 +45,52 @@
 
 //=============================================================================
 
-module com { module sun { module star { module beans {
+module com { module sun { module star { module beans { 
 
  published interface XPropertyChangeListener;
  published interface XPropertiesChangeListener;
 
 //=============================================================================
 /** This is a test interface for introspection.
-
+    
     @deprecated
 */
 published interface XIntroTest: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** contains the ID-String of the implementation.
+    /**	contains the ID-String of the implementation.
      */
-    [attribute] string  ObjectName;
+    [attribute] string	ObjectName;
 
     //-------------------------------------------------------------------------
-    /** contains the first name of a person.
+    /**	contains the first name of a person.
      */
-    [readonly, attribute] string    FirstName;
+    [readonly, attribute] string	FirstName;
 
     //-------------------------------------------------------------------------
-    /** contains the last name of a person.
+    /**	contains the last name of a person.
      */
-    [readonly, attribute] string    LastName;
+    [readonly, attribute] string	LastName;
 
     //-------------------------------------------------------------------------
-    /** contains the age of a person.
+    /**	contains the age of a person.
      */
-    [readonly, attribute] short     Age;
+    [readonly, attribute] short		Age;
 
     //-------------------------------------------------------------------------
-    /** contains the number of children person has.
+    /**	contains the number of children person has.
      */
-    [attribute] short               ChildrenCount;
+    [attribute] short				ChildrenCount;
 
     //-------------------------------------------------------------------------
-    /** contains a struct of type <type>Property</type>.
+    /**	contains a struct of type <type>Property</type>.
      */
-    [attribute] com::sun::star::beans::Property         FirstStruct;
+    [attribute] com::sun::star::beans::Property			FirstStruct;
 
     //-------------------------------------------------------------------------
-    /** contains a struct of type <type>PropertyValue</type>.
+    /**	contains a struct of type <type>PropertyValue</type>.
      */
-    [attribute] com::sun::star::beans::PropertyValue    SecondStruct;
+    [attribute] com::sun::star::beans::PropertyValue	SecondStruct;
 
     //-------------------------------------------------------------------------
     /** output method.
@@ -98,7 +98,7 @@ published interface XIntroTest: com::sun::star::uno::XInterface
     void writeln( [in] string Text );
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     long getDroenk();
 
@@ -113,12 +113,12 @@ published interface XIntroTest: com::sun::star::uno::XInterface
     long getUps( [in] long l );
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     void setDroenk( [in] long l );
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     short getBla();
 
@@ -128,17 +128,17 @@ published interface XIntroTest: com::sun::star::uno::XInterface
     void setBla( [in] long n );
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     short getBlub();
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     void setBlub( [in] short n );
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     short getGulp();
 
@@ -148,12 +148,12 @@ published interface XIntroTest: com::sun::star::uno::XInterface
     short setGulp( [in] short n );
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     com::sun::star::uno::TypeClass getTypeClass( [in] short n );
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     void setTypeClass( [in] com::sun::star::uno::TypeClass t,
              [in] double d1,
@@ -163,12 +163,12 @@ published interface XIntroTest: com::sun::star::uno::XInterface
     sequence<string> getStrings();
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     void setStrings( [in] sequence<string> Strings );
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     void setStringsPerMethod( [in] sequence<string> Strings,
              [in] short n );
@@ -177,7 +177,7 @@ published interface XIntroTest: com::sun::star::uno::XInterface
     sequence< sequence< sequence< short > > > getMultiSequence();
 
     //-------------------------------------------------------------------------
-    /** ...
+    /** ... 
     */
     void setMultiSequence( [in] sequence< sequence< sequence< short > > > Seq );
 
@@ -203,6 +203,6 @@ published interface XIntroTest: com::sun::star::uno::XInterface
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/udkapi/com/sun/star/beans/XIntrospection.idl b/udkapi/com/sun/star/beans/XIntrospection.idl
index 5c7d6ed02cc2..433e16a32d69 100644
--- a/udkapi/com/sun/star/beans/XIntrospection.idl
+++ b/udkapi/com/sun/star/beans/XIntrospection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,98 +24,98 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XIntrospection_idl__
-#define __com_sun_star_beans_XIntrospection_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XIntrospectionAccess_idl__
-#include <com/sun/star/beans/XIntrospectionAccess.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_XIntrospection_idl__ 
+#define __com_sun_star_beans_XIntrospection_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XIntrospectionAccess_idl__ 
+#include <com/sun/star/beans/XIntrospectionAccess.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::beans::XIntrospection
-/** allows the inspection of an object's properties and methods.
-
+/** allows the inspection of an object's properties and methods. 
+    
     <p><strong>Important note:</strong>An object can only be
     inspected completely if it supports the <type scope=
     "com::sun::star::lang">XTypeProvider</type> interface.</p>
-
+    
     <p>For details see method <member>XIntrospection::inspect</member>. </p>
-
+    
     @see XIntrospectionAccess
  */
 published interface XIntrospection: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::beans::XIntrospection::inspect
     /** inspects the given object.
-
+        
         <p>It identifies all properties supported by the object
         if they are represented in one of the following ways: </p>
-
+        
         <dl>
             <dt>property set </dt>
-            <dd>If the object supports an <type>XPropertySet</type>
-                interface, all its properties are adopted.
-            </dd>
+            <dd>If the object supports an <type>XPropertySet</type> 
+                interface, all its properties are adopted.  
+            </dd> 
 
             <dt>attributes </dt>
-            <dd>All of an object's attributes are considered as properties
-                with same name. If an attribute is read-only, the property
+            <dd>All of an object's attributes are considered as properties 
+                with same name. If an attribute is read-only, the property 
                 also is read-only.
             </dd>
 
             <dt>get/set methods </dt>
-            <dd>Every method <code>RetType getX()</code> defines a
-                property where "X" stands for the property name and
-                "RetType" for its type. The method must not have any
-                parameters, or there is no property access method
-                and "X" has no property.  If there is also a method
+            <dd>Every method <code>RetType getX()</code> defines a 
+                property where "X" stands for the property name and 
+                "RetType" for its type. The method must not have any 
+                parameters, or there is no property access method 
+                and "X" has no property.  If there is also a method 
                 <code>void setX( [in] RetType )</code>, the property
                 "X" also allows write access; otherwise it is read-only.
             </dd>
 
             <dt> <strong>Important note:</strong></dt>
-            <dd>If an object implements <type scope="com::sun::star::container">XNameAccess</type>,
-                the items that can be accessed are not considered as properties
-                of the object and so are not included in the property list offered by
-                <member scope="com::sun::star::beans">XIntrospectionAccess::getProperties()</member>.
-                <type scope="com::sun::star::container">XNameAccess</type> items have to be
+            <dd>If an object implements <type scope="com::sun::star::container">XNameAccess</type>, 
+                the items that can be accessed are not considered as properties 
+                of the object and so are not included in the property list offered by 
+                <member scope="com::sun::star::beans">XIntrospectionAccess::getProperties()</member>. 
+                <type scope="com::sun::star::container">XNameAccess</type> items have to be 
                 accessed separately by <member scope="com::sun::star::beans">XIntrospectionAccess::getNameAccess()</member>.
             </dd>
         </dl>
-
-        <p>In addition, the inspect method identifies all listener
+        
+        <p>In addition, the inspect method identifies all listener 
         access methods in the form <code>add...Listener</code>/
         <code>remove...Listener</code> (except methods of interface
-        <type>XPropertySet</type>) where "..." stands for the listener type.
+        <type>XPropertySet</type>) where "..." stands for the listener type.  
         </p>
 
-        <p>Methods which do not belong to a property nor which represent
-        a listener access nor which are methods of <type>XPropertySet</type>,
-        <type scope="com::sun::star::container">XNameAccess</type>,
+        <p>Methods which do not belong to a property nor which represent 
+        a listener access nor which are methods of <type>XPropertySet</type>, 
+        <type scope="com::sun::star::container">XNameAccess</type>, 
         <type scope="com::sun::star::container">XIndexAccess</type>, or
-        <type scope="com::sun::star::container">XEnumerationAccess</type>, are considered to be normal
+        <type scope="com::sun::star::container">XEnumerationAccess</type>, are considered to be normal 
         methods. </p>
 
         @see XIntrospectionAccess
      */
-    com::sun::star::beans::XIntrospectionAccess inspect( [in] any aObject );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::beans::XIntrospectionAccess inspect( [in] any aObject ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XIntrospectionAccess.idl b/udkapi/com/sun/star/beans/XIntrospectionAccess.idl
index efd340916857..e03b4c77afd9 100644
--- a/udkapi/com/sun/star/beans/XIntrospectionAccess.idl
+++ b/udkapi/com/sun/star/beans/XIntrospectionAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,69 +24,69 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XIntrospectionAccess_idl__
-#define __com_sun_star_beans_XIntrospectionAccess_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Property_idl__
-#include <com/sun/star/beans/Property.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XIdlMethod_idl__
-#include <com/sun/star/reflection/XIdlMethod.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSuchMethodException_idl__
-#include <com/sun/star/lang/NoSuchMethodException.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
-#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-
-#ifndef __com_sun_star_beans_IllegalTypeException_idl__
-#include <com/sun/star/beans/IllegalTypeException.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
-/** represents the result of an introspection operation done by
-    the inspect method of <type scope="com::sun::star::beans">
+#ifndef __com_sun_star_beans_XIntrospectionAccess_idl__ 
+#define __com_sun_star_beans_XIntrospectionAccess_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_Property_idl__ 
+#include <com/sun/star/beans/Property.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_XIdlMethod_idl__ 
+#include <com/sun/star/reflection/XIdlMethod.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_NoSuchMethodException_idl__ 
+#include <com/sun/star/lang/NoSuchMethodException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_XIdlClass_idl__ 
+#include <com/sun/star/reflection/XIdlClass.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_IllegalTypeException_idl__ 
+#include <com/sun/star/beans/IllegalTypeException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
+/** represents the result of an introspection operation done by 
+    the	inspect method of <type scope="com::sun::star::beans">
     XIntrospection</type>.
 
-    <p>This interface gives information about an object's
-    properties and methods as detected in the introspection
-    process. It's not possible to access properties or call
-    methods directly using this interface but it provides
-    access to other interfaces to do so.
+    <p>This interface gives information about an object's 
+    properties and methods as detected in the introspection 
+    process. It's not possible to access properties	or call 
+    methods directly using this interface but it provides 
+    access to other interfaces to do so. 
     See <member scope="com::sun::star::beans">
     XIntrospectionAccess::queryAdapter()</member></p>
 
-    <p>The <type>XExactName</type> interface has to be supported
-    in order to implement inaccurate name access for all objects
+    <p>The <type>XExactName</type> interface has to be supported 
+    in order to implement inaccurate name access for all objects 
     which implement the <type scope="com::sun::star::container">
     XNameAccess</type> interface or <type>XPropertySet</type>.</p>
 
-    <p>The <type>XMaterialHolder</type> interface has to be
+    <p>The <type>XMaterialHolder</type> interface has to be 
     supported to give access to the inspected object.</p>
 
-        @see XPropertySet
+        @see XPropertySet 
         @see com::sun::star::beans::XExactName
  */
 published interface XIntrospectionAccess: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** returns information about which method concepts described in
         the <type>MethodConcept</type> constants group are supported
         by this <type>XIntrospectionAccess</type> implementation.
@@ -99,15 +99,15 @@ published interface XIntrospectionAccess: com::sun::star::uno::XInterface
             <li> <const>MethodConcept::ENUMERATION</const>, </li>
             <li> <const>MethodConcept::NAMECONTAINER</const></li>
             <li> <const>MethodConcept::INDEXCONTAINER</const>; </li>
-        </ul>
+        </ul> 
 
-        @returns
+        @returns 
             zero or more constants of the <type>MethodConcept</type>
             constants group combined by an arithmetical or-operation.
      */
-    long getSuppliedMethodConcepts();
-
-    //-------------------------------------------------------------------------
+    long getSuppliedMethodConcepts(); 
+ 
+    //------------------------------------------------------------------------- 
     /** returns information about which property concepts described in
         the <type>PropertyConcept</type> constants group are supported
         by this <type>XIntrospectionAccess</type> implementation.
@@ -120,202 +120,202 @@ published interface XIntrospectionAccess: com::sun::star::uno::XInterface
             <li> <const>PropertyConcept::METHODS</const>.  </li>
         </ul>
 
-        @returns
+        @returns 
             zero or more constants of the <type>PropertyConcept</type>
             constants group.combined by an arithmetical or-operation.
      */
-    long getSuppliedPropertyConcepts();
-
-    //-------------------------------------------------------------------------
-    /** returns information about a property if a property with
-        the demanded name exists and if it accords to one of the
-        demanded <type>PropertyConcept</type>s. The information
+    long getSuppliedPropertyConcepts(); 
+ 
+    //------------------------------------------------------------------------- 
+    /** returns information about a property if a property with 
+        the demanded name exists and if it accords to one of the 
+        demanded <type>PropertyConcept</type>s. The information 
         is provided as <type>Property</type> struct.
-
-        @returns
+    
+        @returns 
             A <type>Property</type> struct providing
             information about the demanded property,
             if a corresponding property exists.
-
-        @param aName
+                 
+        @param aName  
             the name of the property.
-
-        @param nPropertyConcepts
+                 
+        @param nPropertyConcepts	 
             zero or more constants of the <type>PropertyConcept
-            </type> constants group combined by an arithmetical
+            </type> constants group combined by an arithmetical 
             or-operation.
 
-        @throws NoSuchElementException
+        @throws NoSuchElementException  
             when a property with the demanded name doesn't exist
             or if it accords to a wrong <type>PropertyConcept
             </type>.
      */
-    com::sun::star::beans::Property getProperty( [in] string aName,
-             [in] long nPropertyConcepts )
-            raises( com::sun::star::container::NoSuchElementException );
-
-    //-------------------------------------------------------------------------
-    /** allows to ask if a property with the demanded name exists
+    com::sun::star::beans::Property getProperty( [in] string aName, 
+             [in] long nPropertyConcepts ) 
+            raises( com::sun::star::container::NoSuchElementException ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** allows to ask if a property with the demanded name exists 
         and if it accords to one of the demanded <type>
-        PropertyConcept</type>s.
-
-        @returns
-            <TRUE/> if the property exists and accords to one of
-            the demanded <type>PropertyConcept</type>s, otherwise
-            <FALSE/> is returned.
-
-        @param aName
-            the name of the property.
-
+        PropertyConcept</type>s. 
+    
+        @returns 
+            <TRUE/> if the property exists and accords to one of 
+            the demanded <type>PropertyConcept</type>s, otherwise 
+            <FALSE/> is returned. 
+                 
+        @param aName  
+            the name of the property. 
+                 
         @param nPropertyConcepts
             zero or more constants of the <type>PropertyConcept
-            </type> constants group combined by an arithmetical
+            </type> constants group combined by an arithmetical 
             or-operation.
      */
-    boolean hasProperty( [in] string aName,
-             [in] long nPropertyConcepts );
-
-    //-------------------------------------------------------------------------
+    boolean hasProperty( [in] string aName, 
+             [in] long nPropertyConcepts ); 
+ 
+    //------------------------------------------------------------------------- 
     /** returns a sequence of properties of the introspected object
 
-        @returns
-            all properties of the introspected object which accord
+        @returns 
+            all properties of the introspected object which accord 
             to the demanded <type>PropertyConcept</type>s.
-
+                 
         @param nPropertyConcepts
             zero or more constants of the <type>PropertyConcept
-            </type> constants group combined by an arithmetical
+            </type> constants group combined by an arithmetical 
             or-operation.
      */
-    sequence<com::sun::star::beans::Property> getProperties(
-                [in] long nPropertyConcepts );
+    sequence<com::sun::star::beans::Property> getProperties(  
+                [in] long nPropertyConcepts ); 
 
-    //-------------------------------------------------------------------------
-    /** returns information about a method if a method with
+    //------------------------------------------------------------------------- 
+    /** returns information about a method if a method with 
         the demanded name exists and if it accords to one of
-        the demanded MethodConcepts. The information is
+        the demanded MethodConcepts. The information is 
         provided as <type scope="com::sun::star::reflection">
         XIdlMethod</type>.
-
-        @returns
+    
+        @returns 
             A <type scope="com::sun::star::reflection">
             XIdlMethod</type> providing information about and
-            access to the demanded method if a corresponding
+            access to the demanded method if a corresponding 
             method exists.
-
-        @param aName
+                 
+        @param aName  
             the name of the method.
-
-        @param nMethodConcepts
+                 
+        @param nMethodConcepts	 
             zero or more constants of the <type>MethodConcept
-            </type> constants group combined by an arithmetical
+            </type> constants group combined by an arithmetical 
             or-operation.
 
-        @throws NoSuchElementException
+        @throws NoSuchElementException  
             when a method with the demanded name doesn't exist
             or if it accords to a wrong <type>MethodConcept</type>.
      */
-    com::sun::star::reflection::XIdlMethod getMethod( [in] string aName,
-             [in] long nMethodConcepts )
-            raises( com::sun::star::lang::NoSuchMethodException );
+    com::sun::star::reflection::XIdlMethod getMethod( [in] string aName, 
+             [in] long nMethodConcepts ) 
+            raises( com::sun::star::lang::NoSuchMethodException ); 
 
-    //-------------------------------------------------------------------------
-    /** allows to ask if a method with the demanded name exists
+    //------------------------------------------------------------------------- 
+    /** allows to ask if a method with the demanded name exists 
         and if it accords to one of the demanded <type>MethodConcept
-        </type>s.
-
-        @returns
-            <TRUE/> if the method exists and accords to one of
-            the demanded <type>MethodConcept</type>s, otherwise
-            <FALSE/> is returned.
-
-        @param aName
+        </type>s. 
+    
+        @returns 
+            <TRUE/> if the method exists and accords to one of 
+            the demanded <type>MethodConcept</type>s, otherwise 
+            <FALSE/> is returned. 
+                 
+        @param aName  
             the name of the method.
-
+                 
         @param nMethodConcepts
             zero or more constants of the <type>MethodConcept
-            </type> constants group combined by an arithmetical
+            </type> constants group combined by an arithmetical 
             or-operation.
      */
-    boolean hasMethod( [in] string aName,
-             [in] long nMethodConcepts );
+    boolean hasMethod( [in] string aName, 
+             [in] long nMethodConcepts ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /** returns a sequence of methods of the introspected object.
 
-        @returns
-            all methods of the introspected object which accord
+        @returns 
+            all methods of the introspected object which accord 
             to the demanded <type>MethodConcept</type>s.
-
+                 
         @param nMethodConcepts
             zero or more constants of the <type>MethodConcept
-            </type> constants group combined by an arithmetical
+            </type> constants group combined by an arithmetical 
             or-operation.
      */
-    sequence<com::sun::star::reflection::XIdlMethod> getMethods(
-            [in] long nMethodConcepts );
+    sequence<com::sun::star::reflection::XIdlMethod> getMethods(  
+            [in] long nMethodConcepts ); 
 
-    //-------------------------------------------------------------------------
-    /** returns the listener types supported by the introspected
+    //------------------------------------------------------------------------- 
+    /** returns the listener types supported by the introspected 
         object.
 
         <p>If the introspected object has the methods
         <code>addFooListener( XFooListener xFoo )</code> and
         <code>removeFooListener( XFooListener xFoo )</code>
-        the type of XFooListener will be one of the elements
+        the type of XFooListener will be one of the elements 
         in the returned sequence.
-
-        @returns
-            a sequence of the types of listener interfaces
+    
+        @returns 
+            a sequence of the types of listener interfaces 
             which are supported by the introspected object.
      */
-    sequence<type> getSupportedListeners();
-
-    //-------------------------------------------------------------------------
-    /** creates an adapter that implements an interface with the
+    sequence<type> getSupportedListeners(); 
+ 
+    //------------------------------------------------------------------------- 
+    /** creates an adapter that implements an interface with the 
         specified type.
-
+        
         <p>To access properties, query for the <type>XPropertySet
-        </type> interface. If the <type>XPropertySet</type> can
-        be queried, the <type>XFastPropertySet</type> interface
+        </type> interface. If the <type>XPropertySet</type> can 
+        be queried,	the <type>XFastPropertySet</type> interface 
         must be supported too.  </p>
 
-        <p>If the introspected object implements a name container,
+        <p>If the introspected object implements a name container, 
         the introspection should return the <type scope=
-        "com::sun::star::container">XNameAccess</type> and <type
-        scope="com::sun::star::container">XNameContainer</type>
+        "com::sun::star::container">XNameAccess</type> and <type 
+        scope="com::sun::star::container">XNameContainer</type> 
         interfaces.</p>
 
         <p>If the introspected object implements an index container,
         the introspection should return the <type scope=
-        "com::sun::star::container">XIndexAccess</type> and <type
-        scope="com::sun::star::container">XIndexContainer</type>
+        "com::sun::star::container">XIndexAccess</type> and <type 
+        scope="com::sun::star::container">XIndexContainer</type> 
         interfaces.</p>
 
-        <p>If the introspected object implements an enumeration
+        <p>If the introspected object implements an enumeration 
         container, the introspection should return the <type scope=
         "com::sun::star::container">XEnumerationAccess</type>
         interface.</p>
 
         <p>If the introspected object implements the <type scope=
-        "com::sun::star::reflection">XIdlArray</type> interface,
+        "com::sun::star::reflection">XIdlArray</type> interface, 
         the introspection should return this.</p>
 
-        <p>To implement inaccurate name access, at all objects,
+        <p>To implement inaccurate name access, at all objects, 
         which implement the <type scope="com::sun::star::container">
-        XNameAccess</type> or <type>XPropertySet</type> interface,
+        XNameAccess</type> or <type>XPropertySet</type> interface, 
         the <type>XExactName</type> interface has to be supported.
         </p>
 
         @see com::sun::star::beans::XExactName
      */
-    com::sun::star::uno::XInterface queryAdapter( [in] type aInterfaceType )
-            raises( com::sun::star::beans::IllegalTypeException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::uno::XInterface queryAdapter( [in] type aInterfaceType ) 
+            raises( com::sun::star::beans::IllegalTypeException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XMaterialHolder.idl b/udkapi/com/sun/star/beans/XMaterialHolder.idl
index b89a84ce15a9..cdfc1fc50373 100644
--- a/udkapi/com/sun/star/beans/XMaterialHolder.idl
+++ b/udkapi/com/sun/star/beans/XMaterialHolder.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,22 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XMaterialHolder_idl__
-#define __com_sun_star_beans_XMaterialHolder_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module beans {
-
-//=============================================================================
+#ifndef __com_sun_star_beans_XMaterialHolder_idl__ 
+#define __com_sun_star_beans_XMaterialHolder_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
 /** gives access to the material a (tool-) object is working on.
 
-    <p>Example: The introspection service allows the inspection of an
+    <p>Example: The introspection service allows the inspection of an 
     object's properties and methods. The result is represented as
     XIntrospectionAccess interface. The inspected object then is the
     material attached to the introspection tool and an implementation
@@ -49,19 +49,19 @@
     @see XIntrospectionAccess
  */
 published interface XMaterialHolder: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** returns the material that is connected to this (tool-) object
-
-        @returns
+    
+        @returns 
             the material that is connected to this (tool-) object.
      */
-    any getMaterial();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    any getMaterial(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl b/udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl
index cfd1950cdcbe..c7ba2c065dfc 100644
--- a/udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,138 +24,138 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XMultiHierarchicalPropertySet_idl__
-#define __com_sun_star_beans_XMultiHierarchicalPropertySet_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XHierarchicalPropertySetInfo_idl__
-#include <com/sun/star/beans/XHierarchicalPropertySetInfo.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
-#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_XMultiHierarchicalPropertySet_idl__ 
+#define __com_sun_star_beans_XMultiHierarchicalPropertySet_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XHierarchicalPropertySetInfo_idl__ 
+#include <com/sun/star/beans/XHierarchicalPropertySetInfo.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
+#include <com/sun/star/beans/PropertyVetoException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+  
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** provides access to multiple properties which form a hierarchy.
 
     @see XHierarchicalPropertySet
  */
 published interface XMultiHierarchicalPropertySet: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** retrieve information about the hierarchy of properties
 
-        @returns
-                the <type>XHierarchicalPropertySetInfo</type> interface,
-                which describes the property hierarchy of the object which
-                supplies this interface.
-
-        @returns
-                <NULL/> if the implementation cannot or will
-                not provide information about the properties; otherwise the
+        @returns  
+                the <type>XHierarchicalPropertySetInfo</type> interface, 
+                which describes the property hierarchy of the object which 
+                supplies this interface. 
+                 
+        @returns	 
+                <NULL/> if the implementation cannot or will  
+                not provide information about the properties; otherwise the  
                 interface <type>XHierarchicalPropertySetInfo</type> is returned.
-
+                
         @see XHierarchicalPropertySet::getHierarchicalPropertySetInfo
      */
-    com::sun::star::beans::XHierarchicalPropertySetInfo getHierarchicalPropertySetInfo();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::beans::XHierarchicalPropertySetInfo getHierarchicalPropertySetInfo(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the values of the properties with the specified nested names.
-
-        <p> The values of the properties must change before bound
-            events are fired. The values of constrained properties
-            should change after the vetoable events are fired, if no
+        
+        <p>	The values of the properties must change before bound 
+            events are fired. The values of constrained properties 
+            should change after the vetoable events are fired, if no 
             exception occurs.  </p>
 
         <p> Unknown properties are ignored.  </p>
 
-        @param  aHierarchicalPropertyNames
-                This parameter specifies the names of the properties.
-
-        @param  aValues
-                This parameter specifies the new values for the properties.
-
-        @throws PropertyVetoException
-                if one of the properties is constrained and the change is
+        @param	aHierarchicalPropertyNames	 
+                This parameter specifies the names of the properties. 
+         
+        @param	aValues	 
+                This parameter specifies the new values for the properties. 
+         
+        @throws PropertyVetoException  
+                if one of the properties is constrained and the change is 
                 vetoed by a <type>XVetoableChangeListener</type>.
-
-        @throws com::sun::star::lang::IllegalArgumentException
+                
+        @throws com::sun::star::lang::IllegalArgumentException  
                 if one of the values is not a legal value for the
                 corresponding property or if one of the names
                 is not a well-formed nested name for this hierarchy.
                 An implementation is not required to detect the latter
                 condition.
 
-        @throws com::sun::star::lang::WrappedTargetException
-                if the implementation has an internal reason for the exception.
-                In this case the original exception is wrapped into that
+        @throws com::sun::star::lang::WrappedTargetException  
+                if the implementation has an internal reason for the exception. 
+                In this case the original exception is wrapped into that 
                 <type scope="com::sun::star::lang">WrappedTargetException</type>.
-
+                
         @see XHierarchicalPropertySet::setHierarchicalPropertyValue
         @see XMultiPropertySet::setPropertyValues
      */
-
-
-    void setHierarchicalPropertyValues( [in] sequence<string> aHierarchicalPropertyNames,
-             [in] sequence<any> Values )
-            raises( com::sun::star::beans::PropertyVetoException,
-                    com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            a sequence of all values of the properties which are specified
-            by their nested names.
-
-        <p> The order of the values in the returned sequence will be the same
+        
+        
+    void setHierarchicalPropertyValues( [in] sequence<string> aHierarchicalPropertyNames, 
+             [in] sequence<any> Values ) 
+            raises( com::sun::star::beans::PropertyVetoException, 
+                    com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            a sequence of all values of the properties which are specified 
+            by their nested names. 
+         
+        <p>	The order of the values in the returned sequence will be the same  
             as the order of the names in the argument.  </p>
 
-        <p> Unknown properties are ignored, in their place <NULL/> will be returned.  </p>
+        <p>	Unknown properties are ignored, in their place <NULL/> will be returned.  </p>
 
-        @throws com::sun::star::lang::IllegalArgumentException
-                if one of the names is not a well-formed
+        @throws com::sun::star::lang::IllegalArgumentException  
+                if one of the names is not a well-formed 
                 nested name for this hierarchy.
                 An implementation is not required to detect this
                 condition.
 
-        @throws com::sun::star::lang::WrappedTargetException
-                if the implementation has an internal reason for the exception.
-                In this case the original exception is wrapped into that
+        @throws com::sun::star::lang::WrappedTargetException  
+                if the implementation has an internal reason for the exception. 
+                In this case the original exception is wrapped into that 
                 <type scope="com::sun::star::lang">WrappedTargetException</type>.
-
+                
         @see XHierarchicalPropertySet::getHierarchicalPropertyValue
         @see XMultiPropertySet::setPropertyValues
      */
     sequence<any> getHierarchicalPropertyValues( [in] sequence<string> aPropertyNames )
-            raises( com::sun::star::lang::IllegalArgumentException ,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+            raises( com::sun::star::lang::IllegalArgumentException , 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+      
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XMultiPropertySet.idl b/udkapi/com/sun/star/beans/XMultiPropertySet.idl
index 1388c5d672af..abcf6cac1ca6 100644
--- a/udkapi/com/sun/star/beans/XMultiPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XMultiPropertySet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,63 +24,63 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XMultiPropertySet_idl__
-#define __com_sun_star_beans_XMultiPropertySet_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfo_idl__
-#include <com/sun/star/beans/XPropertySetInfo.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
-#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeListener_idl__
-#include <com/sun/star/beans/XPropertiesChangeListener.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_XMultiPropertySet_idl__ 
+#define __com_sun_star_beans_XMultiPropertySet_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySetInfo_idl__ 
+#include <com/sun/star/beans/XPropertySetInfo.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
+#include <com/sun/star/beans/PropertyVetoException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertiesChangeListener_idl__ 
+#include <com/sun/star/beans/XPropertiesChangeListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** provides access to multiple properties with a single call.
  */
 published interface XMultiPropertySet: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the <type>XPropertySetInfo</type> interface, which describes
-            all properties of the object to which this interface belongs.
-            <const>NULL</const> is returned if the object cannot or will
-            not provide information about the properties.
-
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            the <type>XPropertySetInfo</type> interface, which describes  
+            all properties of the object to which this interface belongs.  
+            <const>NULL</const> is returned if the object cannot or will 
+            not provide information about the properties. 
+                 
         @see XPropertySet::getPropertySetInfo
      */
-    com::sun::star::beans::XPropertySetInfo getPropertySetInfo();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::beans::XPropertySetInfo getPropertySetInfo(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the values to the properties with the specified names.
-
-        <p>The values of the properties must change before the bound
-        events are fired. The values of the constrained properties
-        should change after the vetoable events are fired and only if no
+        
+        <p>The values of the properties must change before the bound 
+        events are fired. The values of the constrained properties 
+        should change after the vetoable events are fired and only if no 
         exception occured. Unknown properties are ignored.  </p>
 
         @param aPropertyNames
@@ -99,31 +99,31 @@ published interface XMultiPropertySet: com::sun::star::uno::XInterface
             if the implementation has an internal reason for the exception.
             In this case the original exception is wrapped.
      */
-    void setPropertyValues( [in] sequence<string> aPropertyNames,
-             [in] sequence<any> aValues )
-            raises( com::sun::star::beans::PropertyVetoException,
-                    com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            a sequence of all values of the properties which are specified by their names.
-
-        <p>The order of the values in the returned sequence will be the same
+    void setPropertyValues( [in] sequence<string> aPropertyNames, 
+             [in] sequence<any> aValues ) 
+            raises( com::sun::star::beans::PropertyVetoException, 
+                    com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            a sequence of all values of the properties which are specified by their names. 
+         
+        <p>The order of the values in the returned sequence will be the same  
         as the order of the names in the argument. </p>
 
         @param aPropertyNames
-            specifies the names of the properties.
+            specifies the names of the properties. 
             This sequence must be alphabetically sorted.
      */
-    sequence<any> getPropertyValues( [in] sequence<string> aPropertyNames );
-
-    //-------------------------------------------------------------------------
-
-    /** adds an <type>XPropertiesChangeListener</type> to the
+    sequence<any> getPropertyValues( [in] sequence<string> aPropertyNames ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** adds an <type>XPropertiesChangeListener</type> to the 
         specified property with the specified names.
-
+        
         <p>The implementation can ignore the names of the properties
         and fire the event on all properties. </p>
 
@@ -136,15 +136,15 @@ published interface XMultiPropertySet: com::sun::star::uno::XInterface
         @param xListener
             contains the listener for the property change events.
 
-        @see removePropertiesChangeListener
+        @see removePropertiesChangeListener 
      */
-    [oneway] void addPropertiesChangeListener( [in] sequence<string> aPropertyNames,
-             [in] com::sun::star::beans::XPropertiesChangeListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addPropertiesChangeListener( [in] sequence<string> aPropertyNames, 
+             [in] com::sun::star::beans::XPropertiesChangeListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes an <type>XPropertiesChangeListener</type> from the listener list.
-
+        
         <p>It is a "noop" if the listener is not registered.  </p>
 
         <p>It is suggested to allow multiple registration of the same listener,
@@ -155,11 +155,11 @@ published interface XMultiPropertySet: com::sun::star::uno::XInterface
 
         @see addPropertiesChangeListener
      */
-    [oneway] void removePropertiesChangeListener( [in] com::sun::star::beans::XPropertiesChangeListener xListener );
-
-    //-------------------------------------------------------------------------
-
-    /** fires a sequence of <type>PropertyChangeEvent</type>s to the specified
+    [oneway] void removePropertiesChangeListener( [in] com::sun::star::beans::XPropertiesChangeListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** fires a sequence of <type>PropertyChangeEvent</type>s to the specified 
         listener.
 
         @param aPropertynames
@@ -168,13 +168,13 @@ published interface XMultiPropertySet: com::sun::star::uno::XInterface
         @param xListener
             contains the listener for the property change events.
      */
-    [oneway] void firePropertiesChangeEvent( [in] sequence<string> aPropertyNames,
-             [in] com::sun::star::beans::XPropertiesChangeListener xListener );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void firePropertiesChangeEvent( [in] sequence<string> aPropertyNames, 
+             [in] com::sun::star::beans::XPropertiesChangeListener xListener ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XMultiPropertyStates.idl b/udkapi/com/sun/star/beans/XMultiPropertyStates.idl
index 340d627f93a6..decc9a766ab1 100644
--- a/udkapi/com/sun/star/beans/XMultiPropertyStates.idl
+++ b/udkapi/com/sun/star/beans/XMultiPropertyStates.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,10 +50,10 @@
 
 //=============================================================================
 
-module com { module sun { module star { module beans {
+module com { module sun { module star { module beans { 
 
 //=============================================================================
-/** makes it possible to query information about the state of
+/** makes it possible to query information about the state of 
     one or more properties.
 
     <p>The state of a property contains information about the source of
@@ -67,41 +67,41 @@ published interface XMultiPropertyStates: com::sun::star::uno::XInterface
             a sequence of the states of the properties which are specified
             by their names.
 
-        <p>The order of the states is correlating to the order of the
-        given property names.
+        <p>The order of the states is correlating to the order of the 
+        given property names.  
 
         @param aPropertyName
             specifies the names of the properties. All names must be unique.
             This sequence must be alphabetically sorted.
     */
-    sequence<com::sun::star::beans::PropertyState> getPropertyStates(
+    sequence<com::sun::star::beans::PropertyState> getPropertyStates( 
             [in] sequence<string> aPropertyName )
         raises( com::sun::star::beans::UnknownPropertyException );
 
     //-------------------------------------------------------------------------
-    /** sets all properties to their default values.
-
-        <p>Each value depends on the implementation of this interface.
-        If it is a bound property, you must change the value before
-        the change events are fired.  If it is a constrained property, you
+    /** sets all properties to their default values. 
+        
+        <p>Each value depends on the implementation of this interface. 
+        If it is a bound property, you must change the value before 
+        the change events are fired.  If it is a constrained property, you 
         must fire the vetoable event before you change the property value.
         </p>
     */
     void setAllPropertiesToDefault();
 
     //-------------------------------------------------------------------------
-    /** sets the specified properties to their default values.
-
-        <p>Each value depends on the implementation of this interface.
-        If it is a bound property, you must change the value before
-        the change events are fired.  If it is a constrained property, you
+    /** sets the specified properties to their default values. 
+        
+        <p>Each value depends on the implementation of this interface. 
+        If it is a bound property, you must change the value before 
+        the change events are fired.  If it is a constrained property, you 
         must fire the vetoable event before you change the property value. </p>
-
+        
         @param aPropertyName
             specifies the names of the properties. All names must be unique.
             This sequence must be alphabetically sorted.
-
-        @throws UnknownPropertyException
+        
+        @throws UnknownPropertyException	
             if one of the properties does not exist.
     */
     void setPropertiesToDefault( [in] sequence<string> aPropertyNames )
@@ -110,24 +110,24 @@ published interface XMultiPropertyStates: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /** @returns
             the default values of the propertes with the specified names.
-
+        
         <p>If no default exists, is not known, or is void,
         then the return type at the corresponding position in the
         sequence returned is <atom>void</atom>. </p>
-
+        
         @param aPropertyName
             specifies the names of the properties. All names must be unique.
             This sequence must be alphabetically sorted.
-
-        @throws UnknownPropertyException
+        
+        @throws UnknownPropertyException	
             if one of the propertes does not exist.
-
-        @throws  com::sun::star::lang::WrappedTargetException
+        
+        @throws  com::sun::star::lang::WrappedTargetException 
             if the implementation has an internal reason for the exception.
             In this case the original exception is wrapped into that
             <type scope="com::sun::star::lang">WrappedTargetException</type>.
     */
-    sequence<any> getPropertyDefaults(
+    sequence<any> getPropertyDefaults( 
                 [in] sequence<string> aPropertyNames )
             raises( com::sun::star::beans::UnknownPropertyException,
                     com::sun::star::lang::WrappedTargetException );
@@ -135,6 +135,6 @@ published interface XMultiPropertyStates: com::sun::star::uno::XInterface
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/udkapi/com/sun/star/beans/XPropertiesChangeListener.idl b/udkapi/com/sun/star/beans/XPropertiesChangeListener.idl
index 15cc7ec68c69..7988c1403449 100644
--- a/udkapi/com/sun/star/beans/XPropertiesChangeListener.idl
+++ b/udkapi/com/sun/star/beans/XPropertiesChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XPropertiesChangeListener_idl__
-#define __com_sun_star_beans_XPropertiesChangeListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyChangeEvent_idl__
-#include <com/sun/star/beans/PropertyChangeEvent.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_XPropertiesChangeListener_idl__ 
+#define __com_sun_star_beans_XPropertiesChangeListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyChangeEvent_idl__ 
+#include <com/sun/star/beans/PropertyChangeEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** receives events which get fired whenever a bound property is changed.
  */
 published interface XPropertiesChangeListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** gets called when bound properties are changed.
 
         @param aEvent
             contains a sequence of <type>PropertyChangeEvent</type> objects
-            which describe the event source and the properites wich have
+            which describe the event source and the properites wich have 
             changed.
      */
-    void propertiesChange( [in] sequence<com::sun::star::beans::PropertyChangeEvent> aEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
+    void propertiesChange( [in] sequence<com::sun::star::beans::PropertyChangeEvent> aEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
 
-#endif
+#endif 
diff --git a/udkapi/com/sun/star/beans/XPropertiesChangeNotifier.idl b/udkapi/com/sun/star/beans/XPropertiesChangeNotifier.idl
index b2e1096525a2..d7ff520c0e4b 100644
--- a/udkapi/com/sun/star/beans/XPropertiesChangeNotifier.idl
+++ b/udkapi/com/sun/star/beans/XPropertiesChangeNotifier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
-#define __com_sun_star_beans_XPropertiesChangeNotifier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertiesChangeListener_idl__
-#include <com/sun/star/beans/XPropertiesChangeListener.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__ 
+#define __com_sun_star_beans_XPropertiesChangeNotifier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertiesChangeListener_idl__ 
+#include <com/sun/star/beans/XPropertiesChangeListener.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans { 
+ 
+//============================================================================= 
+ 
 /** specifies a notifier for changed property values@see      XPropertiesChangeListener
  */
 published interface XPropertiesChangeNotifier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** adds an <type>XPropertiesChangeListener</type> to the
         specified properties with the specified names.
      */
-    [oneway] void addPropertiesChangeListener(
-            [in] sequence<string> PropertyNames,
-            [in] com::sun::star::beans::XPropertiesChangeListener Listener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addPropertiesChangeListener( 
+            [in] sequence<string> PropertyNames, 
+            [in] com::sun::star::beans::XPropertiesChangeListener Listener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes an <type>XPropertiesChangeListener</type> from the
         listener list.
      */
-    [oneway] void removePropertiesChangeListener(
-            [in] sequence<string> PropertyNames,
-            [in] com::sun::star::beans::XPropertiesChangeListener Listener );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void removePropertiesChangeListener( 
+            [in] sequence<string> PropertyNames, 
+            [in] com::sun::star::beans::XPropertiesChangeListener Listener ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XProperty.idl b/udkapi/com/sun/star/beans/XProperty.idl
index 789e2f7e48dd..5925d471a649 100644
--- a/udkapi/com/sun/star/beans/XProperty.idl
+++ b/udkapi/com/sun/star/beans/XProperty.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XProperty_idl__
-#define __com_sun_star_beans_XProperty_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Property_idl__
-#include <com/sun/star/beans/Property.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_XProperty_idl__ 
+#define __com_sun_star_beans_XProperty_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_Property_idl__ 
+#include <com/sun/star/beans/Property.idl> 
+#endif 
+  
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** Is implemented by objects that also are a property of
     some other object.
-
-    <p> Provides access to traits of this object that would
+    
+    <p> Provides access to traits of this object that would 
         otherwise only be available from a containing
         <type>XPropertySet</type> via its
         <type>XPropertySetInfo</type>.
     </p>
-
+    
  */
 published interface XProperty: com::sun::star::uno::XInterface
 {
@@ -57,13 +57,13 @@ published interface XProperty: com::sun::star::uno::XInterface
                 the specification of this object as <type>Property</type>.
 
      */
-    com::sun::star::beans::Property getAsProperty();
-
-    //-------------------------------------------------------------------------
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::beans::Property getAsProperty(); 
+ 
+    //------------------------------------------------------------------------- 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XPropertyAccess.idl b/udkapi/com/sun/star/beans/XPropertyAccess.idl
index 993507cb17ab..aabc1085cce5 100644
--- a/udkapi/com/sun/star/beans/XPropertyAccess.idl
+++ b/udkapi/com/sun/star/beans/XPropertyAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,77 +24,77 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XPropertyAccess_idl__
-#define __com_sun_star_beans_XPropertyAccess_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
-#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
-#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
-#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_XPropertyAccess_idl__ 
+#define __com_sun_star_beans_XPropertyAccess_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyValue_idl__ 
+#include <com/sun/star/beans/PropertyValue.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
+#include <com/sun/star/beans/UnknownPropertyException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
+#include <com/sun/star/beans/PropertyVetoException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to access all property values and to set them at once.
-
+    
     <p>In most cases this interface will be in addition to
-    <type>XPropertySet</type>. It is especially useful for remote
+    <type>XPropertySet</type>. It is especially useful for remote 
     communication because it lessens the number of calls for getting
-    property values; that is especially important because these calls
+    property values; that is especially important because these calls 
     are necessarily synchronous.  </p>
 
-    <p>Another advantage of this method is that conflicts are avoided
+    <p>Another advantage of this method is that conflicts are avoided 
     if property value restrictions depend on the value of other properties.</p>
  */
 published interface XPropertyAccess: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
             a sequence of all property values within the object in a single call.
      */
-    sequence<com::sun::star::beans::PropertyValue> getPropertyValues();
-
-    //-------------------------------------------------------------------------
-
+    sequence<com::sun::star::beans::PropertyValue> getPropertyValues(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the values of given properties.
-
-        <p>All properties which are not contained in the sequence
+        
+        <p>All properties which are not contained in the sequence 
         <var>aProps</var> will be left unchanged.</p>
      */
-    void setPropertyValues( [in] sequence<com::sun::star::beans::PropertyValue> aProps )
-            raises( com::sun::star::beans::UnknownPropertyException,
-                    com::sun::star::beans::PropertyVetoException,
-                    com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::lang::WrappedTargetException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void setPropertyValues( [in] sequence<com::sun::star::beans::PropertyValue> aProps ) 
+            raises( com::sun::star::beans::UnknownPropertyException, 
+                    com::sun::star::beans::PropertyVetoException, 
+                    com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XPropertyChangeListener.idl b/udkapi/com/sun/star/beans/XPropertyChangeListener.idl
index 0c54cf39dcef..760389aee192 100644
--- a/udkapi/com/sun/star/beans/XPropertyChangeListener.idl
+++ b/udkapi/com/sun/star/beans/XPropertyChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
-#define __com_sun_star_beans_XPropertyChangeListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyChangeEvent_idl__
-#include <com/sun/star/beans/PropertyChangeEvent.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
-/** is used to receive <type>PropertyChangeEvent</type>s
+#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__ 
+#define __com_sun_star_beans_XPropertyChangeListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyChangeEvent_idl__ 
+#include <com/sun/star/beans/PropertyChangeEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
+/** is used to receive <type>PropertyChangeEvent</type>s 
     whenever a bound property is changed.
  */
 published interface XPropertyChangeListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is called when a bound property is changed.
      */
-    void propertyChange( [in] com::sun::star::beans::PropertyChangeEvent evt );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void propertyChange( [in] com::sun::star::beans::PropertyChangeEvent evt ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XPropertyContainer.idl b/udkapi/com/sun/star/beans/XPropertyContainer.idl
index eb70ba48c068..91e45bd75839 100644
--- a/udkapi/com/sun/star/beans/XPropertyContainer.idl
+++ b/udkapi/com/sun/star/beans/XPropertyContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XPropertyContainer_idl__
-#define __com_sun_star_beans_XPropertyContainer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
-#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyExistException_idl__
-#include <com/sun/star/beans/PropertyExistException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_IllegalTypeException_idl__
-#include <com/sun/star/beans/IllegalTypeException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
-#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_NotRemoveableException_idl__
-#include <com/sun/star/beans/NotRemoveableException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_XPropertyContainer_idl__ 
+#define __com_sun_star_beans_XPropertyContainer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_XIdlClass_idl__ 
+#include <com/sun/star/reflection/XIdlClass.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyExistException_idl__ 
+#include <com/sun/star/beans/PropertyExistException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_IllegalTypeException_idl__ 
+#include <com/sun/star/beans/IllegalTypeException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
+#include <com/sun/star/beans/UnknownPropertyException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_NotRemoveableException_idl__ 
+#include <com/sun/star/beans/NotRemoveableException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans { 
+ 
+//============================================================================= 
+ 
 /** makes it possible to add and remove properties to or from an object.
 
     <p>Some scripting engines cannot access properties directly when the
@@ -68,9 +68,9 @@ module com {  module sun {  module star {  module beans {
     etc. in this case. </p>
  */
 published interface XPropertyContainer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** adds a property to the object.
 
         @param aName
@@ -81,7 +81,7 @@ published interface XPropertyContainer: com::sun::star::uno::XInterface
 
         @param DefaultValue
             specifies the type of the new property and a potential default value.
-
+            
         @throws PropertyExistException
             if a property with the same name already exists.
 
@@ -89,15 +89,15 @@ published interface XPropertyContainer: com::sun::star::uno::XInterface
             if the specified type is not allowed.
 
      */
-    void addProperty( [in] string Name,
-                       [in] short Attributes,
-                      [in] any DefaultValue )
-            raises( com::sun::star::beans::PropertyExistException,
-                    com::sun::star::beans::IllegalTypeException,
-                    com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-
+    void addProperty( [in] string Name, 
+                       [in] short Attributes, 
+                      [in] any DefaultValue ) 
+            raises( com::sun::star::beans::PropertyExistException, 
+                    com::sun::star::beans::IllegalTypeException, 
+                    com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes a property from the object.
 
         @param aName
@@ -106,13 +106,13 @@ published interface XPropertyContainer: com::sun::star::uno::XInterface
         @throws UnknownPropertyException
             if the property does not exist.
      */
-    void removeProperty( [in] string Name )
-            raises( com::sun::star::beans::UnknownPropertyException,
-                    com::sun::star::beans::NotRemoveableException );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void removeProperty( [in] string Name ) 
+            raises( com::sun::star::beans::UnknownPropertyException, 
+                    com::sun::star::beans::NotRemoveableException ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XPropertySet.idl b/udkapi/com/sun/star/beans/XPropertySet.idl
index 3e9410506e5a..f8337bba85e4 100644
--- a/udkapi/com/sun/star/beans/XPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XPropertySet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#define __com_sun_star_beans_XPropertySet_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySetInfo_idl__
-#include <com/sun/star/beans/XPropertySetInfo.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
-#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
-#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__
-#include <com/sun/star/beans/XPropertyChangeListener.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XVetoableChangeListener_idl__
-#include <com/sun/star/beans/XVetoableChangeListener.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
-/** provides information about and access to the
-    properties from an implementation.
-
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#define __com_sun_star_beans_XPropertySet_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySetInfo_idl__ 
+#include <com/sun/star/beans/XPropertySetInfo.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
+#include <com/sun/star/beans/UnknownPropertyException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
+#include <com/sun/star/beans/PropertyVetoException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertyChangeListener_idl__ 
+#include <com/sun/star/beans/XPropertyChangeListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XVetoableChangeListener_idl__ 
+#include <com/sun/star/beans/XVetoableChangeListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
+/** provides information about and access to the 
+    properties from an implementation. 
+    
     <p>There are three types of properties: </p>
 
     <ul>
@@ -76,38 +76,38 @@ module com {  module sun {  module star {  module beans {
         <li>constrained properties </li>
         <li>free properties </li>
     </ul>
-
-    <p>You can listen to changes of bound properties with the
-    <type>XPropertyChangeListener</type> and you can veto changes
+    
+    <p>You can listen to changes of bound properties with the 
+    <type>XPropertyChangeListener</type> and you can veto changes 
     of constrained properties with the <type>XVetoableChangeListener</type>.  </p>
 
-    <p>To implement inaccurate name access, you must support the
+    <p>To implement inaccurate name access, you must support the 
     interface <type>XExactName</type>. </p>
 
     @see com::sun::star::beans::XExactName
  */
 published interface XPropertySet: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the <type>XPropertySetInfo</type> interface, which
-            describes all properties of the object which supplies this
-            interface.
-
-        @returns
-            <const>NULL</const> if the implementation cannot or will
-            not provide information about the properties; otherwise the
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
+            the <type>XPropertySetInfo</type> interface, which  
+            describes all properties of the object which supplies this 
+            interface. 
+             
+        @returns	 
+            <const>NULL</const> if the implementation cannot or will  
+            not provide information about the properties; otherwise the  
             interface <type>XPropertySetInfo</type> is returned.
      */
-    com::sun::star::beans::XPropertySetInfo getPropertySetInfo();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::beans::XPropertySetInfo getPropertySetInfo(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the value of the property with the specified name.
-
-        <p>If it is a bound property the value will be changed before
-        the change event is fired.  If it is a constrained property
+        
+        <p>If it is a bound property the value will be changed before 
+        the change event is fired.  If it is a constrained property 
         a vetoable event is fired before the property value can be
         changed.  </p>
 
@@ -116,39 +116,39 @@ published interface XPropertySet: com::sun::star::uno::XInterface
             and one of the listeners throws this exception
             because of an unaccepted new value.
      */
-    void setPropertyValue( [in] string aPropertyName,
-             [in] any aValue )
-            raises( com::sun::star::beans::UnknownPropertyException,
-                    com::sun::star::beans::PropertyVetoException,
-                    com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the value of the property with the specified name.
-
-        @param PropertyName
-            This parameter specifies the name of the property.
-
-        @throws UnknownPropertyException
-            if the property does not exist.
-
-        @throws com::sun::star::lang::WrappedTargetException
-            if the implementation has an internal reason for the exception.
-            In this case the original exception is wrapped into that
+    void setPropertyValue( [in] string aPropertyName, 
+             [in] any aValue ) 
+            raises( com::sun::star::beans::UnknownPropertyException, 
+                    com::sun::star::beans::PropertyVetoException, 
+                    com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            the value of the property with the specified name. 
+                 
+        @param PropertyName	 
+            This parameter specifies the name of the property. 
+         
+        @throws UnknownPropertyException	 
+            if the property does not exist. 
+                 
+        @throws com::sun::star::lang::WrappedTargetException  
+            if the implementation has an internal reason for the exception. 
+            In this case the original exception is wrapped into that 
             <type scope="com::sun::star::lang">WrappedTargetException</type>.
      */
-    any getPropertyValue( [in] string PropertyName )
-            raises( com::sun::star::beans::UnknownPropertyException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
+    any getPropertyValue( [in] string PropertyName ) 
+            raises( com::sun::star::beans::UnknownPropertyException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** adds an <type>XPropertyChangeListener</type> to the specified property.
-
-        <p>An empty name ("") registers the listener to all bound
-        properties. If the property is not bound, the behavior is
+        
+        <p>An empty name ("") registers the listener to all bound 
+        properties. If the property is not bound, the behavior is 
         not specified.  </p>
 
         <p>It is suggested to allow multiple registration of the same listener,
@@ -156,16 +156,16 @@ published interface XPropertySet: com::sun::star::uno::XInterface
 
         @see removePropertyChangeListener
      */
-    void addPropertyChangeListener( [in] string aPropertyName,
-             [in] com::sun::star::beans::XPropertyChangeListener xListener )
-            raises( com::sun::star::beans::UnknownPropertyException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-    /** removes an <type>XPropertyChangeListener</type> from
-        the listener list.
-
+    void addPropertyChangeListener( [in] string aPropertyName, 
+             [in] com::sun::star::beans::XPropertyChangeListener xListener ) 
+            raises( com::sun::star::beans::UnknownPropertyException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** removes an <type>XPropertyChangeListener</type> from 
+        the listener list.  
+        
         <p>It is a "noop" if the listener is not registered.  </p>
 
         <p>It is suggested to allow multiple registration of the same listener,
@@ -173,45 +173,45 @@ published interface XPropertySet: com::sun::star::uno::XInterface
 
         @see addPropertyChangeListener
      */
-    void removePropertyChangeListener( [in] string aPropertyName,
-             [in] com::sun::star::beans::XPropertyChangeListener aListener )
-            raises( com::sun::star::beans::UnknownPropertyException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-    /** adds an <type>XVetoableChangeListener</type> to the specified
+    void removePropertyChangeListener( [in] string aPropertyName, 
+             [in] com::sun::star::beans::XPropertyChangeListener aListener ) 
+            raises( com::sun::star::beans::UnknownPropertyException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** adds an <type>XVetoableChangeListener</type> to the specified 
         property with the name PropertyName.
-
-        <p>An empty name ("") registers the listener to all
-        constrained properties. If the property is not constrained,
+        
+        <p>An empty name ("") registers the listener to all 
+        constrained properties. If the property is not constrained, 
         the behavior is not specified.  </p>
 
         @see removeVetoableChangeListener
      */
-    void addVetoableChangeListener( [in] string PropertyName,
-             [in] com::sun::star::beans::XVetoableChangeListener aListener )
-            raises( com::sun::star::beans::UnknownPropertyException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-    /** removes an <type>XVetoableChangeListener</type> from the
+    void addVetoableChangeListener( [in] string PropertyName, 
+             [in] com::sun::star::beans::XVetoableChangeListener aListener ) 
+            raises( com::sun::star::beans::UnknownPropertyException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** removes an <type>XVetoableChangeListener</type> from the 
         listener list.
-
+        
         <p>It is a "noop" if the listener is not registered.  </p>
 
         @see addVetoableChangeListener
      */
-    void removeVetoableChangeListener( [in] string PropertyName,
-             [in] com::sun::star::beans::XVetoableChangeListener aListener )
-            raises( com::sun::star::beans::UnknownPropertyException,
-                    com::sun::star::lang::WrappedTargetException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void removeVetoableChangeListener( [in] string PropertyName, 
+             [in] com::sun::star::beans::XVetoableChangeListener aListener ) 
+            raises( com::sun::star::beans::UnknownPropertyException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XPropertySetInfo.idl b/udkapi/com/sun/star/beans/XPropertySetInfo.idl
index 09484a462cc6..d9e0d5aec9eb 100644
--- a/udkapi/com/sun/star/beans/XPropertySetInfo.idl
+++ b/udkapi/com/sun/star/beans/XPropertySetInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XPropertySetInfo_idl__
-#define __com_sun_star_beans_XPropertySetInfo_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Property_idl__
-#include <com/sun/star/beans/Property.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
-#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_XPropertySetInfo_idl__ 
+#define __com_sun_star_beans_XPropertySetInfo_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_Property_idl__ 
+#include <com/sun/star/beans/Property.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
+#include <com/sun/star/beans/UnknownPropertyException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** specifies a set of properties.
 
     <p>There are three kinds of properties:
@@ -54,49 +54,49 @@ module com {  module sun {  module star {  module beans {
         <li>constrained properties</li>
         <li>free properties</li>
     </ul>
-
+    
     <p>The specification only describes the properties, it does not contain
     any values.</p>
  */
 published interface XPropertySetInfo: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            a sequence with all property descriptors which are specified
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            a sequence with all property descriptors which are specified 
             within this <type>XPropertySetInfo</type>.
      */
-    sequence<com::sun::star::beans::Property> getProperties();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the property with the specified name from the object.
-
-        @param aName
-            specifies the name of the property.
-
-        @throws UnknownPropertyException
+    sequence<com::sun::star::beans::Property> getProperties(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            the property with the specified name from the object. 
+                 
+        @param aName  
+            specifies the name of the property. 
+                 
+        @throws UnknownPropertyException	 
             if the property does not exist.
      */
-    com::sun::star::beans::Property getPropertyByName( [in] string aName )
-            raises( com::sun::star::beans::UnknownPropertyException );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            <TRUE/> if a property with the specified name exist;
-            otherwise <FALSE/> is returned.
-
-        @param aName
+    com::sun::star::beans::Property getPropertyByName( [in] string aName ) 
+            raises( com::sun::star::beans::UnknownPropertyException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            <TRUE/> if a property with the specified name exist; 
+            otherwise <FALSE/> is returned. 
+                 
+        @param aName  
             specifies the name of the property.
      */
-    boolean hasPropertyByName( [in] string Name );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean hasPropertyByName( [in] string Name ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XPropertySetInfoChangeListener.idl b/udkapi/com/sun/star/beans/XPropertySetInfoChangeListener.idl
index d740adabf256..6d2207bd7e46 100644
--- a/udkapi/com/sun/star/beans/XPropertySetInfoChangeListener.idl
+++ b/udkapi/com/sun/star/beans/XPropertySetInfoChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeListener_idl__
-#define __com_sun_star_beans_XPropertySetInfoChangeListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertySetInfoChangeEvent_idl__
-#include <com/sun/star/beans/PropertySetInfoChangeEvent.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_XPropertySetInfoChangeListener_idl__ 
+#define __com_sun_star_beans_XPropertySetInfoChangeListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertySetInfoChangeEvent_idl__ 
+#include <com/sun/star/beans/PropertySetInfoChangeEvent.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans { 
+ 
+//============================================================================= 
+ 
 /** a listener for events related to <type>XPropertySetInfo</type>s.
 
     @see    PropertySetInfoChangeEvent
-    @see    XPropertySetInfoChangeNotifier
+    @see	XPropertySetInfoChangeNotifier
  */
 published interface XPropertySetInfoChangeListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is called whenever changes of a <type>XPropertySetInfo</type> shall
         be propagated.
      */
-    void propertySetInfoChange( [in] PropertySetInfoChangeEvent evt );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void propertySetInfoChange( [in] PropertySetInfoChangeEvent evt ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XPropertySetInfoChangeNotifier.idl b/udkapi/com/sun/star/beans/XPropertySetInfoChangeNotifier.idl
index dbad0258eef1..f084469957f5 100644
--- a/udkapi/com/sun/star/beans/XPropertySetInfoChangeNotifier.idl
+++ b/udkapi/com/sun/star/beans/XPropertySetInfoChangeNotifier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,52 +24,52 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
-#define __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySetInfoChangeListener_idl__
-#include <com/sun/star/beans/XPropertySetInfoChangeListener.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__ 
+#define __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+#ifndef __com_sun_star_beans_XPropertySetInfoChangeListener_idl__ 
+#include <com/sun/star/beans/XPropertySetInfoChangeListener.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans { 
+ 
+//============================================================================= 
+ 
 /** a notifier for changes of <type>XPropertySetInfo</type>s.
 
     @see    PropertySetInfoChangeEvent
-    @see    XPropertySetInfoChangeListener
+    @see	XPropertySetInfoChangeListener
  */
 published interface XPropertySetInfoChangeNotifier: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** registers a listener for <type>PropertySetInfoChangeEvent</type>s.
 
         <p>It is suggested to allow multiple registration of the same listener,
         thus for each time a listener is added, it has to be removed.
      */
-    void addPropertySetInfoChangeListener(
-                            [in] XPropertySetInfoChangeListener Listener );
-
-    //-------------------------------------------------------------------------
-
+    void addPropertySetInfoChangeListener( 
+                            [in] XPropertySetInfoChangeListener Listener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes a listener for <type>PropertySetInfoChangeEvent</type>s.
 
         <p>It is suggested to allow multiple registration of the same listener,
         thus for each time a listener is added, it has to be removed.
      */
-    void removePropertySetInfoChangeListener(
-                            [in] XPropertySetInfoChangeListener Listener );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void removePropertySetInfoChangeListener( 
+                            [in] XPropertySetInfoChangeListener Listener ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XPropertyState.idl b/udkapi/com/sun/star/beans/XPropertyState.idl
index 9ac89996aef1..a6aea62f42ee 100644
--- a/udkapi/com/sun/star/beans/XPropertyState.idl
+++ b/udkapi/com/sun/star/beans/XPropertyState.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,70 +24,70 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XPropertyState_idl__
-#define __com_sun_star_beans_XPropertyState_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyState_idl__
-#include <com/sun/star/beans/PropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
-#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertyStateChangeListener_idl__
-#include <com/sun/star/beans/XPropertyStateChangeListener.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
-/** makes it possible to query information about the state of
+#ifndef __com_sun_star_beans_XPropertyState_idl__ 
+#define __com_sun_star_beans_XPropertyState_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyState_idl__ 
+#include <com/sun/star/beans/PropertyState.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
+#include <com/sun/star/beans/UnknownPropertyException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertyStateChangeListener_idl__ 
+#include <com/sun/star/beans/XPropertyStateChangeListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
+/** makes it possible to query information about the state of 
     one or more properties.
-
+    
     <p>The state contains the information if:</p>
     <ul>
-        <li>a value is available or void</li>
+        <li>a value is available or void</li> 
         <li>the value is stored in the object itself, or if a default value is to be used</li>
         <li>and if the value cannot be determined, due to ambiguity
             (multi selection with multiple values).</li>
     </ul>
  */
 published interface XPropertyState: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
-                the state of the property.
-
-        @param  aPropertyName
-            specifies the name of the property.
-
-        @throws UnknownPropertyException
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
+                the state of the property. 
+                 
+        @param	aPropertyName  
+            specifies the name of the property. 
+                 
+        @throws UnknownPropertyException	 
             if the property does not exist.
      */
-    com::sun::star::beans::PropertyState getPropertyState( [in] string PropertyName )
-            raises( com::sun::star::beans::UnknownPropertyException );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            a sequence of the states of the properties which are specified
-                by their names.
-
-        <p>The order of the states is correlating to the order of the
+    com::sun::star::beans::PropertyState getPropertyState( [in] string PropertyName ) 
+            raises( com::sun::star::beans::UnknownPropertyException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            a sequence of the states of the properties which are specified 
+                by their names. 
+         
+        <p>The order of the states is correlating to the order of the  
         given property names. </p>
 
         @param aPropertyNames
@@ -96,17 +96,17 @@ published interface XPropertyState: com::sun::star::uno::XInterface
         @throws UnknownPropertyException
             if one property does not exist.
      */
-    sequence<com::sun::star::beans::PropertyState> getPropertyStates(
-            [in] sequence<string> aPropertyName )
-        raises( com::sun::star::beans::UnknownPropertyException );
-
-    //-------------------------------------------------------------------------
-
-    /** Sets the property to default value.
-
-        <p>The value depends on the implementation of this interface.
-        If it is a bound property, you must change the value before
-        the change events are fired.  If it is a constrained property, you
+    sequence<com::sun::star::beans::PropertyState> getPropertyStates(  
+            [in] sequence<string> aPropertyName ) 
+        raises( com::sun::star::beans::UnknownPropertyException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** Sets the property to default value. 
+        
+        <p>The value depends on the implementation of this interface. 
+        If it is a bound property, you must change the value before 
+        the change events are fired.  If it is a constrained property, you 
         must fire the vetoable event before you change the property value.
         </p>
 
@@ -116,35 +116,35 @@ published interface XPropertyState: com::sun::star::uno::XInterface
         @throws UnknownPropertyException
             if the property does not exist.
      */
-    void setPropertyToDefault( [in] string PropertyName )
-            raises( com::sun::star::beans::UnknownPropertyException );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the default value of the property with the name PropertyName.
-
-        <p>If no default exists, is not known or is void,
-        then the return type is <atom>void</atom>.
-
-        @param aPropertyName
-            specifies the name of the property.
-
-        @throws UnknownPropertyException
-            if the property does not exist.
-
-        @throws  com::sun::star::lang::WrappedTargetException
-            if the implementation has an internal reason for the exception.
-            In this case the original exception is wrapped into that
+    void setPropertyToDefault( [in] string PropertyName ) 
+            raises( com::sun::star::beans::UnknownPropertyException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            the default value of the property with the name PropertyName.  
+                 
+        <p>If no default exists, is not known or is void, 
+        then the return type is <atom>void</atom>. 
+                 
+        @param aPropertyName	 
+            specifies the name of the property. 
+             
+        @throws UnknownPropertyException	 
+            if the property does not exist. 
+             
+        @throws  com::sun::star::lang::WrappedTargetException  
+            if the implementation has an internal reason for the exception. 
+            In this case the original exception is wrapped into that 
             <type scope="com::sun::star::lang">WrappedTargetException</type>.
      */
-    any getPropertyDefault( [in] string aPropertyName )
-            raises( com::sun::star::beans::UnknownPropertyException,
-                    com::sun::star::lang::WrappedTargetException );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    any getPropertyDefault( [in] string aPropertyName ) 
+            raises( com::sun::star::beans::UnknownPropertyException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XPropertyStateChangeListener.idl b/udkapi/com/sun/star/beans/XPropertyStateChangeListener.idl
index a3d56571c978..612a1a5d70f5 100644
--- a/udkapi/com/sun/star/beans/XPropertyStateChangeListener.idl
+++ b/udkapi/com/sun/star/beans/XPropertyStateChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XPropertyStateChangeListener_idl__
-#define __com_sun_star_beans_XPropertyStateChangeListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyStateChangeEvent_idl__
-#include <com/sun/star/beans/PropertyStateChangeEvent.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
-/** receives events which get fired whenever the state of a bound
+#ifndef __com_sun_star_beans_XPropertyStateChangeListener_idl__ 
+#define __com_sun_star_beans_XPropertyStateChangeListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyStateChangeEvent_idl__ 
+#include <com/sun/star/beans/PropertyStateChangeEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
+/** receives events which get fired whenever the state of a bound 
     property is changed.
  */
 published interface XPropertyStateChangeListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is called when a bound property's state is changed.
 
         @param aEvent
             describes the event source and the property that has changed.
      */
-    void propertyStateChange( [in] com::sun::star::beans::PropertyStateChangeEvent aEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void propertyStateChange( [in] com::sun::star::beans::PropertyStateChangeEvent aEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XPropertyWithState.idl b/udkapi/com/sun/star/beans/XPropertyWithState.idl
index bdf87545468d..7beb771d8ad6 100644
--- a/udkapi/com/sun/star/beans/XPropertyWithState.idl
+++ b/udkapi/com/sun/star/beans/XPropertyWithState.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,94 +24,94 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XPropertyWithState_idl__
-#define __com_sun_star_beans_XPropertyWithState_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyState_idl__
-#include <com/sun/star/beans/PropertyState.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
-/** makes it possible to query information about the state of
+#ifndef __com_sun_star_beans_XPropertyWithState_idl__ 
+#define __com_sun_star_beans_XPropertyWithState_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyState_idl__ 
+#include <com/sun/star/beans/PropertyState.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
+/** makes it possible to query information about the state of 
     this object, seen as a property contained in a property set.
-
-    <p> This interface provides direct access to operations
-        that are available if the containing property set
+    
+    <p> This interface provides direct access to operations 
+        that are available if the containing property set 
         implements <type>XPropertyState</type>.
     </p>
-
+         
     <p>The state contains the information if:</p>
     <ul>
-        <li>a value is available or void</li>
+        <li>a value is available or void</li> 
         <li>the value is stored in the object itself, or if a default value is being used</li>
         <li>or if the value cannot be determined, due to ambiguity
             (multi selection with multiple values).</li>
     </ul>
 
-    <p> Generally objects that implement this interface
+    <p>	Generally objects that implement this interface
         also implement <type>XProperty</type>.
     </p>
  */
 published interface XPropertyWithState: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
-                the state of this as a property.
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
+                the state of this as a property. 
      */
-    com::sun::star::beans::PropertyState getStateAsProperty( );
-
-    //-------------------------------------------------------------------------
-
-    /** sets this to its default value.
-
-        <p> The value depends on the implementation of this interface.
-            If this is a bound property, the value changes before
-            the change events are fired.  If this is a constrained property,
+    com::sun::star::beans::PropertyState getStateAsProperty( ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** sets this to its default value. 
+        
+        <p>	The value depends on the implementation of this interface. 
+            If this is a bound property, the value changes before 
+            the change events are fired.  If this is a constrained property, 
             the vetoable event is fired before the property value changes.
         </p>
-
-            @throws  com::sun::star::lang::WrappedTargetException
-                if the implementation has an internal reason for the exception.
-                In this case the original exception is wrapped into that
+        
+            @throws  com::sun::star::lang::WrappedTargetException  
+                if the implementation has an internal reason for the exception. 
+                In this case the original exception is wrapped into that 
                 <type scope="com::sun::star::lang">WrappedTargetException</type>.
      */
-    void setToDefaultAsProperty( )
-            raises( com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-    /**     @returns
-                an object representing the default state of this object (as a property).
-
-            <p> If no default exists, is not known or is void,
-                then the return value is <NULL/>.
+    void setToDefaultAsProperty( ) 
+            raises( com::sun::star::lang::WrappedTargetException ); 
+
+    //------------------------------------------------------------------------- 
+     
+    /**		@returns 
+                an object representing the default state of this object (as a property).  
+                 
+            <p>	If no default exists, is not known or is void, 
+                then the return value is <NULL/>. 
             </p>
 
-            @throws  com::sun::star::lang::WrappedTargetException
-                if the implementation has an internal reason for the exception.
-                In this case the original exception is wrapped into that
+            @throws  com::sun::star::lang::WrappedTargetException  
+                if the implementation has an internal reason for the exception. 
+                In this case the original exception is wrapped into that 
                 <type scope="com::sun::star::lang">WrappedTargetException</type>.
      */
-    com::sun::star::uno::XInterface getDefaultAsProperty( )
-            raises( com::sun::star::lang::WrappedTargetException );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::uno::XInterface getDefaultAsProperty( ) 
+            raises( com::sun::star::lang::WrappedTargetException ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/beans/XTolerantMultiPropertySet.idl b/udkapi/com/sun/star/beans/XTolerantMultiPropertySet.idl
index 6f17b8cc748c..c55964040ab2 100644
--- a/udkapi/com/sun/star/beans/XTolerantMultiPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XTolerantMultiPropertySet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__
-#define __com_sun_star_beans_XTolerantMultiPropertySet_idl__
-
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_GetDirectPropertyTolerantResult_idl__
-#include <com/sun/star/beans/GetDirectPropertyTolerantResult.idl>
-#endif
-
-#ifndef __com_sun_star_beans_GetPropertyTolerantResult_idl__
-#include <com/sun/star/beans/GetPropertyTolerantResult.idl>
-#endif
-
-#ifndef __com_sun_star_beans_SetPropertyTolerantFailed_idl__
-#include <com/sun/star/beans/SetPropertyTolerantFailed.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
+#ifndef __com_sun_star_beans_XTolerantMultiPropertySet_idl__ 
+#define __com_sun_star_beans_XTolerantMultiPropertySet_idl__ 
+ 
+
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+
+#ifndef __com_sun_star_beans_GetDirectPropertyTolerantResult_idl__ 
+#include <com/sun/star/beans/GetDirectPropertyTolerantResult.idl> 
+#endif 
+
+#ifndef __com_sun_star_beans_GetPropertyTolerantResult_idl__ 
+#include <com/sun/star/beans/GetPropertyTolerantResult.idl> 
+#endif 
+
+#ifndef __com_sun_star_beans_SetPropertyTolerantFailed_idl__ 
+#include <com/sun/star/beans/SetPropertyTolerantFailed.idl> 
+#endif 
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
 /** provides access to multiple iformation of
     a set of properties with a single call.
 
@@ -70,20 +70,20 @@ module com {  module sun {  module star {  module beans {
     @see com::sun::star::beans::XMultiPropertySet
  */
 published interface XTolerantMultiPropertySet : com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the values to the properties with the specified names.
-
+        
         @param aPropertyNames
-            specifies the names of the properties.
+            specifies the names of the properties. 
             The property names must be sorted ascending.
 
             <p>If the names are not sorted the behaviour of the method
             is undefined!</p>
 
         @param aPropertyValues
-            specifies the values of the properties.
+            specifies the values of the properties. 
             The order of the values has to be the same as in the
             <var>aPropertyNames</var> parameter int order to match
             the property name with its value.
@@ -91,30 +91,30 @@ published interface XTolerantMultiPropertySet : com::sun::star::uno::XInterface
         @returns
             An empty sequence if all properties are successfull set.
 
-            Otherwise for every property value that could not successfully
-            be set an entry of the
+            Otherwise for every property value that could not successfully 
+            be set an entry of the 
             <type scope="com::sun::star::beans">SetPropertyTolerantFailed</type>
             will be present in this sequence.
             The order of the properties is also alphabetically ascending.
-
+        
         @throws IllegalArgumentException
             if the number of property names and values do not match.
 
      */
-    sequence< com::sun::star::beans::SetPropertyTolerantFailed > setPropertyValuesTolerant(
-                [in] sequence< string > aPropertyNames,
+    sequence< com::sun::star::beans::SetPropertyTolerantFailed > setPropertyValuesTolerant( 
+                [in] sequence< string > aPropertyNames, 
                 [in] sequence< any >    aValues )
         raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-
+ 
+    //------------------------------------------------------------------------- 
+     
     /** retrieve the values of the specified properties
-
-        <p>The count and order of the values in the returned sequence
+         
+        <p>The count and order of the values in the returned sequence 
             will be the same as the order of the names in the argument.</p>
 
         @param aPropertyNames
-            specifies the names of the properties.
+            specifies the names of the properties. 
             The property names must be sorted ascending.
 
             <p>If the names are not sorted the behaviour of the method
@@ -122,14 +122,14 @@ published interface XTolerantMultiPropertySet : com::sun::star::uno::XInterface
 
         @returns
             a sequence of type
-            <type scope="com::sun::star::beans">GetPropertyTolerantResult</type>
+            <type scope="com::sun::star::beans">GetPropertyTolerantResult</type> 
             for each of the properties listed in <var>aPropertyNames</var>.
      */
-    sequence< com::sun::star::beans::GetPropertyTolerantResult > getPropertyValuesTolerant(
+    sequence< com::sun::star::beans::GetPropertyTolerantResult > getPropertyValuesTolerant( 
                 [in] sequence< string > aPropertyNames );
+ 
 
-
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** retrieve only those values of the specified properties which
         are direct values.
@@ -139,7 +139,7 @@ published interface XTolerantMultiPropertySet : com::sun::star::uno::XInterface
         will also state the name of the property.</p>
 
         @param aPropertyNames
-            specifies the names of the properties.
+            specifies the names of the properties. 
             The property names must be sorted ascending.
 
             <p>If the names are not sorted the behaviour of the method
@@ -147,18 +147,18 @@ published interface XTolerantMultiPropertySet : com::sun::star::uno::XInterface
 
         @returns
             a sequence of type
-            <type scope="com::sun::star::beans">GetDirectPropertyTolerantResult</type>
+            <type scope="com::sun::star::beans">GetDirectPropertyTolerantResult</type> 
             but only for those properties supplied whoms state is
             <member scope="com::sun::star::beans::PropertyState">DIRECT_VALUE</member>.
      */
-    sequence< com::sun::star::beans::GetDirectPropertyTolerantResult > getDirectPropertyValuesTolerant(
+    sequence< com::sun::star::beans::GetDirectPropertyTolerantResult > getDirectPropertyValuesTolerant( 
                 [in] sequence< string > aPropertyNames );
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/udkapi/com/sun/star/beans/XVetoableChangeListener.idl b/udkapi/com/sun/star/beans/XVetoableChangeListener.idl
index 674cbc3c9496..f2da84b9a820 100644
--- a/udkapi/com/sun/star/beans/XVetoableChangeListener.idl
+++ b/udkapi/com/sun/star/beans/XVetoableChangeListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_beans_XVetoableChangeListener_idl__
-#define __com_sun_star_beans_XVetoableChangeListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyChangeEvent_idl__
-#include <com/sun/star/beans/PropertyChangeEvent.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__
-#include <com/sun/star/beans/PropertyVetoException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module beans {
-
-//=============================================================================
-
-/** is used to receive <type>PropertyChangeEvent</type>s
-    whenever a "constrained" property is changed.
-
-    <p>You can register an <type>XVetoableChangeListener</type> with
+#ifndef __com_sun_star_beans_XVetoableChangeListener_idl__ 
+#define __com_sun_star_beans_XVetoableChangeListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyChangeEvent_idl__ 
+#include <com/sun/star/beans/PropertyChangeEvent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
+#include <com/sun/star/beans/PropertyVetoException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module beans {  
+ 
+//============================================================================= 
+ 
+/** is used to receive <type>PropertyChangeEvent</type>s 
+    whenever a "constrained" property is changed. 
+    
+    <p>You can register an <type>XVetoableChangeListener</type> with 
     a source object so as to be notified of any constrained property updates.</p>
  */
 published interface XVetoableChangeListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** gets called when a constrained property is changed.
      */
-    void vetoableChange( [in] com::sun::star::beans::PropertyChangeEvent aEvent )
-            raises( com::sun::star::beans::PropertyVetoException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void vetoableChange( [in] com::sun::star::beans::PropertyChangeEvent aEvent ) 
+            raises( com::sun::star::beans::PropertyVetoException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/bridge/Bridge.idl b/udkapi/com/sun/star/bridge/Bridge.idl
index 90b53687ea5d..5764583dbeef 100644
--- a/udkapi/com/sun/star/bridge/Bridge.idl
+++ b/udkapi/com/sun/star/bridge/Bridge.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_Bridge_idl__
-#define __com_sun_star_bridge_Bridge_idl__
+#ifndef __com_sun_star_bridge_Bridge_idl__ 
+#define __com_sun_star_bridge_Bridge_idl__ 
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
+#ifndef __com_sun_star_lang_XInitialization_idl__ 
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
+#endif 
 
-#ifndef __com_sun_star_lang_XComponent_idl__
+#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl>
-#endif
+#endif 
 
-#ifndef __com_sun_star_bridge_XBridge_idl__
+#ifndef __com_sun_star_bridge_XBridge_idl__ 
 #include <com/sun/star/bridge/XBridge.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module bridge {
-
-//=============================================================================
-
-/** This meta service allows the bridgefactory service to instantiate an
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module bridge {  
+ 
+//============================================================================= 
+ 
+/** This meta service allows the bridgefactory service to instantiate an 
     interprocess bridge using a certain transfer protocol.
 
     <p> Components, that support a certain protocol, must have at least two
@@ -58,26 +58,26 @@ module com {  module sun {  module star {  module bridge {
 
     <p>The protocol name should be written as common servicenames, first letter is a
     capital letter, the rest in small letters postfixed by Bridge (e.g.:
-    <code>com.sun.star.bridge.UrpBridge</code> would be correct servicename for the
+    <code>com.sun.star.bridge.UrpBridge</code> would be correct servicename for the 
     "urp" protocol).  However, the protocol names are compared case insensitive.
     If there exist two services supporting the same protocol, it is arbitrary
     which one is chosen, so this should be omitted. </p>
  */
 published service Bridge
-{
+{ 
     /** allows to initialize the bridge service with the necessary
          arguments. The sequence&lt;any&gt; must have 4 members.
-
+         
          <ol>
              <li> String: The unique name of the bridge or an empty string</li>
              <li> String: The protocol, that shall be instantiated</li>
              <li> XConnection: The bidirectional connection, the bridge should work on</li>
-             <li> XInstanceProvider:
+             <li> XInstanceProvider: 
                 The instance provider, that shall be called to access the initial object.</li>
          </ol>
      */
     interface com::sun::star::lang::XInitialization;
-
+    
     /** The main interface of the service
      */
     interface com::sun::star::bridge::XBridge;
@@ -86,9 +86,9 @@ published service Bridge
      */
     interface com::sun::star::lang::XComponent;
 
-};
-
-//=============================================================================
-
-}; }; }; };
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+#endif 
diff --git a/udkapi/com/sun/star/bridge/BridgeExistsException.idl b/udkapi/com/sun/star/bridge/BridgeExistsException.idl
index 565322cf1c44..a492a1eae8d4 100644
--- a/udkapi/com/sun/star/bridge/BridgeExistsException.idl
+++ b/udkapi/com/sun/star/bridge/BridgeExistsException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,21 +24,21 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _COM_SUN_STAR_CONNECTION_BRIDGEEXISTSEXCEPTION_IDL_
-#define _COM_SUN_STAR_CONNECTION_BRIDGEEXISTSEXCEPTION_IDL_
-
-#include <com/sun/star/uno/Exception.idl>
-
-module com {  module sun {  module star {  module bridge {
-
+#ifndef _COM_SUN_STAR_CONNECTION_BRIDGEEXISTSEXCEPTION_IDL_ 
+#define _COM_SUN_STAR_CONNECTION_BRIDGEEXISTSEXCEPTION_IDL_ 
+ 
+#include <com/sun/star/uno/Exception.idl> 
+ 
+module com {  module sun {  module star {  module bridge { 
+        
 /** Indicates, that it was tried to create a remote bridge with a name,
     which already existed.
  */
 published exception BridgeExistsException: com::sun::star::uno::Exception
-{
-};
-
-
-};};};};
-
-#endif
+{ 
+}; 
+ 
+ 
+};};};};  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/bridge/BridgeFactory.idl b/udkapi/com/sun/star/bridge/BridgeFactory.idl
index 8bf10c381504..48eed7078b5c 100644
--- a/udkapi/com/sun/star/bridge/BridgeFactory.idl
+++ b/udkapi/com/sun/star/bridge/BridgeFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_BridgeFactory_idl__
-#define __com_sun_star_bridge_BridgeFactory_idl__
+#ifndef __com_sun_star_bridge_BridgeFactory_idl__ 
+#define __com_sun_star_bridge_BridgeFactory_idl__ 
 
-#ifndef __com_sun_star_lang_XComponent_idl__
+#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl>
-#endif
+#endif 
 
-#ifndef __com_sun_star_bridge_XBridgeFactory_idl__
+#ifndef __com_sun_star_bridge_XBridgeFactory_idl__ 
 #include <com/sun/star/bridge/XBridgeFactory.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module bridge {
-
-//=============================================================================
-
-/** allows to create new or access existing interprocess bridges.
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module bridge {  
+ 
+//============================================================================= 
+ 
+/**	allows to create new or access existing interprocess bridges.
 
     <p> It enumerates at the servicemanager all services supporting
     the meta service com.sun.star.bridge.Bridge to get all known, possible
     protocols.
 
-    @see com::sun::star::bridge::Bridge
+    @see com::sun::star::bridge::Bridge 
  */
 published service BridgeFactory
-{
+{ 
     /** The main interface of the service
      */
     interface com::sun::star::bridge::XBridgeFactory;
@@ -58,9 +58,9 @@ published service BridgeFactory
     /** This interface allows to break possible cyclic references.
      */
     interface com::sun::star::lang::XComponent;
-};
-
-//=============================================================================
-
-}; }; }; };
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+#endif 
diff --git a/udkapi/com/sun/star/bridge/IiopBridge.idl b/udkapi/com/sun/star/bridge/IiopBridge.idl
index 7b38e2052ca0..21381f64d98b 100644
--- a/udkapi/com/sun/star/bridge/IiopBridge.idl
+++ b/udkapi/com/sun/star/bridge/IiopBridge.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_Iiop_idl__
-#define __com_sun_star_bridge_Iiop_idl__
+#ifndef __com_sun_star_bridge_Iiop_idl__ 
+#define __com_sun_star_bridge_Iiop_idl__ 
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
+#ifndef __com_sun_star_lang_XInitialization_idl__ 
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
+#endif 
 
-#ifndef __com_sun_star_lang_XComponent_idl__
+#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl>
-#endif
+#endif 
 
-#ifndef __com_sun_star_bridge_XBridge_idl__
+#ifndef __com_sun_star_bridge_XBridge_idl__ 
 #include <com/sun/star/bridge/XBridge.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module bridge {
-
-//=============================================================================
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module bridge {  
+ 
+//============================================================================= 
 /** Concrete service of the meta service Bridge for iiop.
 
     <p> This bridge works with the iiop protocol. </p>
@@ -51,20 +51,20 @@
     @see com.sun.star.bridge.Bridge
  */
 published service IiopBridge
-{
+{ 
     /** This interface allows to initialize the bridge service with the necessary
         arguments. The sequence&lt;any&gt; must have 4 members.
-
+        
         <ol>
             <li> String: The unique name of the bridge or an empty string</li>
             <li> String: iiop</li>
             <li> XConnection: The bidirectional connection, the bridge should work on</li>
-            <li> XInstanceProvider:
+            <li> XInstanceProvider: 
                 The instance provider, that shall be called to access the initial object.</li>
         </ol>
      */
     interface com::sun::star::lang::XInitialization;
-
+    
     /** The main interface of the service.
      */
     interface com::sun::star::bridge::XBridge;
@@ -73,8 +73,8 @@ published service IiopBridge
      */
     interface com::sun::star::lang::XComponent;
 
-};
-//=============================================================================
-
-}; }; }; };
-#endif
+}; 
+//============================================================================= 
+ 
+}; }; }; };  
+#endif 
diff --git a/udkapi/com/sun/star/bridge/InvalidProtocolChangeException.idl b/udkapi/com/sun/star/bridge/InvalidProtocolChangeException.idl
index 3f52050126ba..eeb8fed40855 100644
--- a/udkapi/com/sun/star/bridge/InvalidProtocolChangeException.idl
+++ b/udkapi/com/sun/star/bridge/InvalidProtocolChangeException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ published exception InvalidProtocolChangeException : com::sun::star::uno::Except
      */
     ProtocolProperty invalidProperty;
 
-    /** Contains 1, if the property name is unknown to the thrower;
+    /** Contains 1, if the property name is unknown to the thrower; 
         or contains 2, if the property's value can't be accepted by the thrower.
      */
     long             reason;
diff --git a/udkapi/com/sun/star/bridge/ModelDependent.idl b/udkapi/com/sun/star/bridge/ModelDependent.idl
index d85a2dbb886b..9f8abe1e68c6 100644
--- a/udkapi/com/sun/star/bridge/ModelDependent.idl
+++ b/udkapi/com/sun/star/bridge/ModelDependent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,56 +24,56 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_ModelDependent_idl__
-#define __com_sun_star_bridge_ModelDependent_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module bridge {
-
-//=============================================================================
-
+#ifndef __com_sun_star_bridge_ModelDependent_idl__ 
+#define __com_sun_star_bridge_ModelDependent_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module bridge {  
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::bridge::ModelDependent
-/** These constants are used to specify model-dependant representations.
-
-    <p>They are only used for creating bridges to other component models.
-
+/** These constants are used to specify model-dependant representations. 
+         
+    <p>They are only used for creating bridges to other component models. 
+     
     @see com::sun::star::bridge::XBridgeSupplier2
  */
 published constants ModelDependent
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR constants::1
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR constants::1 
+    
     // DocMerge: empty anyway
-    const short UNO = 1;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR constants::2
-
+    const short UNO = 1; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR constants::2 
+    
     // DocMerge: empty anyway
-    const short OLE = 2;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR constants::3
-
+    const short OLE = 2; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR constants::3 
+    
     // DocMerge: empty anyway
-    const short JAVA = 3;
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR constants::4
-
+    const short JAVA = 3; 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR constants::4 
+    
     // DocMerge: empty anyway
-    const short CORBA = 4;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    const short CORBA = 4; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/bridge/OleApplicationRegistration.idl b/udkapi/com/sun/star/bridge/OleApplicationRegistration.idl
index 7ad209982130..cb1505cf26b2 100644
--- a/udkapi/com/sun/star/bridge/OleApplicationRegistration.idl
+++ b/udkapi/com/sun/star/bridge/OleApplicationRegistration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_OleApplicationRegistration_idl__
-#define __com_sun_star_bridge_OleApplicationRegistration_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module bridge {
-
-//=============================================================================
-
+#ifndef __com_sun_star_bridge_OleApplicationRegistration_idl__ 
+#define __com_sun_star_bridge_OleApplicationRegistration_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module bridge {  
+ 
+//============================================================================= 
+ 
 /** registers UNO objects as COM objects.
     <p />
     That is, COM class factories are registered with COM at runtime. The required
@@ -51,25 +51,25 @@
     Currently only a factory for the service com.sun.star.long.MultiServiceFactory is registered
     by this service. The CLSID is {82154420-0FBF-11d4-8313-005004526AB4} and the ProgId is
     com.sun.star.ServiceManager.
-
-    <p>OleApplicationRegistration does not provide any particular interface because the UNO objects
-    are registered while instantiating this service and deregistered
+    
+    <p>OleApplicationRegistration does not provide any particular interface because the UNO objects 
+    are registered while instantiating this service and deregistered 
     if the implementation, which makes use of this service, is being released.</p>
     <p>
     @deprecated
  */
 published service OleApplicationRegistration
-{
-
-    interface com::sun::star::uno::XInterface;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
+{ 
 
-=============================================================================*/
-#endif
+    interface com::sun::star::uno::XInterface; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/bridge/OleBridgeSupplier.idl b/udkapi/com/sun/star/bridge/OleBridgeSupplier.idl
index 3d1b9a655717..9990476d8a22 100644
--- a/udkapi/com/sun/star/bridge/OleBridgeSupplier.idl
+++ b/udkapi/com/sun/star/bridge/OleBridgeSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_OleBridgeSupplier_idl__
-#define __com_sun_star_bridge_OleBridgeSupplier_idl__
-
-#ifndef __com_sun_star_bridge_XBridgeSupplier_idl__
-#include <com/sun/star/bridge/XBridgeSupplier.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module bridge {
-
-//=============================================================================
-
+#ifndef __com_sun_star_bridge_OleBridgeSupplier_idl__ 
+#define __com_sun_star_bridge_OleBridgeSupplier_idl__ 
+ 
+#ifndef __com_sun_star_bridge_XBridgeSupplier_idl__ 
+#include <com/sun/star/bridge/XBridgeSupplier.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module bridge {  
+ 
+//============================================================================= 
+ 
 
 /** makes it possible to generate OLE bridges to UNO objects and vice versa.
-
-    <p>The service implements the <type>XBridgeSupplier</type> interface
-    and handles the model types <const>ModelDependent::UNO</const> and
+    
+    <p>The service implements the <type>XBridgeSupplier</type> interface 
+    and handles the model types <const>ModelDependent::UNO</const> and 
     <const>ModelDependent::OLE</const>.  The service does not specify any
     requirements on registering OLE objects and class factories.  </p>
-    @deprecated
+    @deprecated 	
  */
 published service OleBridgeSupplier
 {
-    interface com::sun::star::bridge::XBridgeSupplier;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    interface com::sun::star::bridge::XBridgeSupplier; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/bridge/OleBridgeSupplier2.idl b/udkapi/com/sun/star/bridge/OleBridgeSupplier2.idl
index e9bf3d696ff0..c14fb0473b6a 100644
--- a/udkapi/com/sun/star/bridge/OleBridgeSupplier2.idl
+++ b/udkapi/com/sun/star/bridge/OleBridgeSupplier2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module bridge {
+module com { module sun { module star { module bridge { 
 
 //=============================================================================
 /** maps UNO types to oleautomation types and vice versa.<p>
@@ -46,21 +46,21 @@ module com { module sun { module star { module bridge {
     are obtained from that Automation object are automatically mapped to the corresponding
      Automation types. Hence, if one provides an initial object which forms the root of all
      other objects, such as a service manager, then only that object needs to be explicitly
-     mapped by a call to <code>createBridge</code>. The same holds true if an automation
+     mapped by a call to <code>createBridge</code>. The same holds true if an automation 
      object is mapped to an UNO interface.<br>
     <p>The Automation types <code>VT_CY</code> and <code>VT_DATE</code> are not supported.
     For Automation objects to be mapped they have to implement IDispatch interface. Other
     COM interfaces,
     except for IUnknown, are not supported.UNO interfaces and structs are mapped to IDispatch.
-
-    <p>The service implements the <type>XBridgeSupplier2</type> interface
-    and handles the model types
-    <const>com::sun::star::bridge::ModelDependent::UNO</const> and
-    <const>com::sun::star::bridge::ModelDependent::OLE</const>.
+    
+    <p>The service implements the <type>XBridgeSupplier2</type> interface 
+    and handles the model types 
+    <const>com::sun::star::bridge::ModelDependent::UNO</const> and 
+    <const>com::sun::star::bridge::ModelDependent::OLE</const>.  
     The service does not specify any
     requirements for registering OLE objects and class factories. </p>
-
-    @deprecated
+    
+    @deprecated 
 */
 published service OleBridgeSupplier2
 {
@@ -70,6 +70,6 @@ published service OleBridgeSupplier2
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/udkapi/com/sun/star/bridge/OleBridgeSupplierVar1.idl b/udkapi/com/sun/star/bridge/OleBridgeSupplierVar1.idl
index 6a237efb3185..026656eb9a56 100644
--- a/udkapi/com/sun/star/bridge/OleBridgeSupplierVar1.idl
+++ b/udkapi/com/sun/star/bridge/OleBridgeSupplierVar1.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,19 +24,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_OleBridgeSupplierVar1_idl__
-#define __com_sun_star_bridge_OleBridgeSupplierVar1_idl__
-
-#ifndef __com_sun_star_bridge_OBridgeSupplier2_idl__
-#include <com/sun/star/bridge/OleBridgeSupplier2.idl>
+#ifndef __com_sun_star_bridge_OleBridgeSupplierVar1_idl__ 
+#define __com_sun_star_bridge_OleBridgeSupplierVar1_idl__ 
+ 
+#ifndef __com_sun_star_bridge_OBridgeSupplier2_idl__ 
+#include <com/sun/star/bridge/OleBridgeSupplier2.idl> 
 #endif
 
 
- module com {  module sun {  module star {  module bridge {
-
+ module com {  module sun {  module star {  module bridge {  
+ 
 
 /** maps UNO types to COM types and vice versa. It is optimized for use in a
-     remote szenario. <p>
+     remote szenario. <p> 
 The functionality is basically the same as
 <type scope="com::sun::star::bridge">OleBridgeSupplier2</type>.
 However, the implementation should be optimized for remote access. For example, it could
@@ -49,10 +49,10 @@ published service OleBridgeSupplierVar1
     service OleBridgeSupplier2;
 
 };
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
 
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
+#endif 
diff --git a/udkapi/com/sun/star/bridge/OleObjectFactory.idl b/udkapi/com/sun/star/bridge/OleObjectFactory.idl
index 3bc0ab7d5d3f..dd388d2338a9 100644
--- a/udkapi/com/sun/star/bridge/OleObjectFactory.idl
+++ b/udkapi/com/sun/star/bridge/OleObjectFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_OleObjectFactory_idl__
-#define __com_sun_star_bridge_OleObjectFactory_idl__
-
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
-#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module bridge {
-
-//=============================================================================
-
+#ifndef __com_sun_star_bridge_OleObjectFactory_idl__ 
+#define __com_sun_star_bridge_OleObjectFactory_idl__ 
+ 
+#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__ 
+#include <com/sun/star/lang/XMultiServiceFactory.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module bridge {  
+ 
+//============================================================================= 
+ 
 /** makes it possible to create COM objects as UNO objects.
-
+    
     <p>A COM object must have a ProgId since the ProgId is used as argument for
     XMultiServiceFactory::createInstance. The only interfaces which are mapped
     are <code>IUnknown</code> and <code>IDispatch</code>.
-    The created UNO objects support <type scope="com::sun::star::script">XInvocation</type>
+    The created UNO objects support <type scope="com::sun::star::script">XInvocation</type> 
     if the original COM objects support IDispatch. </p>
-
+    
     <p>The optional parameters of the method
     <member scope="com::sun::star::lang">XMultiServiceFactory::createInstanceWithArguments()</member>
     are reserved for future use; at this time they are ignored.  </p>
@@ -55,13 +55,13 @@
 published service OleObjectFactory
 {
     interface com::sun::star::lang::XMultiServiceFactory;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/bridge/ProtocolProperty.idl b/udkapi/com/sun/star/bridge/ProtocolProperty.idl
index 8a9e1f7635a0..3b2a03dc77ff 100644
--- a/udkapi/com/sun/star/bridge/ProtocolProperty.idl
+++ b/udkapi/com/sun/star/bridge/ProtocolProperty.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
 
 module com { module sun { module star { module bridge {
 
-/**  string/value pair
+/**  string/value pair 
  */
 published struct ProtocolProperty
 {
@@ -38,7 +38,7 @@ published struct ProtocolProperty
     string Name;
 
     /** @missing
-    */
+    */ 
     any    Value;
 };
 
diff --git a/udkapi/com/sun/star/bridge/UnoUrlResolver.idl b/udkapi/com/sun/star/bridge/UnoUrlResolver.idl
index 55eb1e28a3ac..0ead0f2edba9 100644
--- a/udkapi/com/sun/star/bridge/UnoUrlResolver.idl
+++ b/udkapi/com/sun/star/bridge/UnoUrlResolver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_UnoUrlResolver_idl__
-#define __com_sun_star_bridge_UnoUrlResolver_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module bridge {
+#ifndef __com_sun_star_bridge_UnoUrlResolver_idl__ 
+#define __com_sun_star_bridge_UnoUrlResolver_idl__ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module bridge {  
 
 published interface XUnoUrlResolver;
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** provides the ability to access remote processes,
     resolving them by an UNO url.
     <br>
  */
 published service UnoUrlResolver: XUnoUrlResolver;
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/bridge/UrpBridge.idl b/udkapi/com/sun/star/bridge/UrpBridge.idl
index 15326e5dd8b4..e9e8ab6514ae 100644
--- a/udkapi/com/sun/star/bridge/UrpBridge.idl
+++ b/udkapi/com/sun/star/bridge/UrpBridge.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_Urp_idl__
-#define __com_sun_star_bridge_Urp_idl__
+#ifndef __com_sun_star_bridge_Urp_idl__ 
+#define __com_sun_star_bridge_Urp_idl__ 
 
-#ifndef __com_sun_star_lang_XInitialization_idl__
+#ifndef __com_sun_star_lang_XInitialization_idl__ 
 #include <com/sun/star/lang/XInitialization.idl>
-#endif
+#endif 
 
-#ifndef __com_sun_star_lang_XComponent_idl__
+#ifndef __com_sun_star_lang_XComponent_idl__ 
 #include <com/sun/star/lang/XComponent.idl>
-#endif
+#endif 
 
-#ifndef __com_sun_star_bridge_XBridge_idl__
+#ifndef __com_sun_star_bridge_XBridge_idl__ 
 #include <com/sun/star/bridge/XBridge.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module bridge {
-
-//=============================================================================
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module bridge {  
+ 
+//============================================================================= 
 /** Concrete service of the meta service Bridge for the urp protocol.
 
     <p>This bridge works with the urp protocol.
@@ -51,20 +51,20 @@
    @see com.sun.star.bridge.Bridge
  */
 published service UrpBridge
-{
+{ 
     /** This interface allows to initialize the bridge service with the necessary
         arguments. The sequence&lt;any&gt; must have 4 members.
-
+    
         <ol>
             <li> String: The unique name of the bridge or an empty string</li>
             <li> String: urp</li>
             <li> XConnection: The bidirectional connection, the bridge should work on</li>
-            <li> XInstanceProvider:
+            <li> XInstanceProvider: 
                 The instance provider, that shall be called to access the initial object.</li>
         </ol>
      */
     interface com::sun::star::lang::XInitialization;
-
+    
     /** The main interface of the service.
      */
     interface com::sun::star::bridge::XBridge;
@@ -73,8 +73,8 @@ published service UrpBridge
      */
     interface com::sun::star::lang::XComponent;
 
-};
-//=============================================================================
-
-}; }; }; };
-#endif
+}; 
+//============================================================================= 
+ 
+}; }; }; };  
+#endif 
diff --git a/udkapi/com/sun/star/bridge/XBridge.idl b/udkapi/com/sun/star/bridge/XBridge.idl
index baebaefceefc..45995d6bb746 100644
--- a/udkapi/com/sun/star/bridge/XBridge.idl
+++ b/udkapi/com/sun/star/bridge/XBridge.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _COM_SUN_STAR_BRIDGE_XBRIDGE_IDL_
-#define _COM_SUN_STAR_BRIDGE_XBRIDGE_IDL_
-
-#include <com/sun/star/uno/XInterface.idl>
-
-module com {  module sun {  module star {  module bridge {
-
+#ifndef _COM_SUN_STAR_BRIDGE_XBRIDGE_IDL_ 
+#define _COM_SUN_STAR_BRIDGE_XBRIDGE_IDL_ 
+ 
+#include <com/sun/star/uno/XInterface.idl> 
+ 
+module com {  module sun {  module star {  module bridge { 
+ 
 /** main interface for an interprocess bridge.
  */
 published interface XBridge: com::sun::star::uno::XInterface
-{
+{ 
     /** tries to get an interface from the remote that is known by this name.
 
-        <p>In general, this method is called once to get the initial object from the
+        <p>In general, this method is called once to get the initial object from the 
         remote, but it is allowed to call the method multiple times. </p>
 
         @param sInstanceName The name of the object, that shall be retrieved from the
                              remote process. The call is delegated to
                              com.sun.star.bridge.XInstanceProvider.getInstance() in the
                              remote process.
-        @see com.sun.star.bridge.XInstanceProvider
+        @see com.sun.star.bridge.XInstanceProvider					 
      */
-    com::sun::star::uno::XInterface getInstance( [in] string sInstanceName );
-
-
+    com::sun::star::uno::XInterface getInstance( [in] string sInstanceName ); 
+ 
+     
     /** name that the bridge got when it was created.
      */
-    string getName();
-
-
+    string getName(); 
+     
+              
     /** a unique descriptive string: protocol + ":" + XConnection.getDescription()
      */
-    string getDescription();
-};
-
-};};};};
-
-#endif
+    string getDescription(); 
+}; 
+ 
+};};};};  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/bridge/XBridgeFactory.idl b/udkapi/com/sun/star/bridge/XBridgeFactory.idl
index fb6db1a0c339..3722e3e3974d 100644
--- a/udkapi/com/sun/star/bridge/XBridgeFactory.idl
+++ b/udkapi/com/sun/star/bridge/XBridgeFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,72 +24,72 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _COM_SUN_STAR_BRIDGE_XBRIDGEFACTORY_IDL_
-#define _COM_SUN_STAR_BRIDGE_XBRIDGEFACTORY_IDL_
-
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-
-#include <com/sun/star/connection/XConnection.idl>
-#include <com/sun/star/bridge/XBridge.idl>
-#include <com/sun/star/bridge/BridgeExistsException.idl>
-#include <com/sun/star/bridge/XInstanceProvider.idl>
-
- module com {  module sun {  module star {  module bridge {
-
+#ifndef _COM_SUN_STAR_BRIDGE_XBRIDGEFACTORY_IDL_ 
+#define _COM_SUN_STAR_BRIDGE_XBRIDGEFACTORY_IDL_ 
+ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+ 
+#include <com/sun/star/connection/XConnection.idl> 
+#include <com/sun/star/bridge/XBridge.idl> 
+#include <com/sun/star/bridge/BridgeExistsException.idl> 
+#include <com/sun/star/bridge/XInstanceProvider.idl> 
+ 
+ module com {  module sun {  module star {  module bridge { 
+     
 /** factory to create interprocess bridges.
  */
 published interface XBridgeFactory: com::sun::star::uno::XInterface
-{
+{ 
     /** tries to create a UNO interprocess bridge.
 
-        @param sName
-            The name of the bridge. This allows other components to reuse
+        @param sName 
+            The name of the bridge. This allows other components to reuse 
              an already created bridge (using getBridge).
              <p>
              If empty, an anonymous bridge is created, which cannot be retrieved with
              getBridge(). No BridgeExistsException can be thrown in this case.
 
-        @param sProtocol
+        @param sProtocol   
             The protocol, that will be used on the connection (e.g., urp) plus additional
             comma separated name=value protocol properties.
 
-        @param aConnection
+        @param aConnection 
             The connection, which is used to transfer the calls. The bridge expects to
             own the connection, thus it will close the connection, in case it does not
             need it anymore.
 
-        @param anInstanceProvider
+        @param anInstanceProvider 
             gets called, when a request from remote comes in. You can pass a null reference
             in case you don't want to export any objects.
+        
+        @throws BridgeExistsException 
+            There is already a bridge registered with this name.  Use getBridge instead. 
 
-        @throws BridgeExistsException
-            There is already a bridge registered with this name.  Use getBridge instead.
-
-        @throws IllegalArgumentException
+        @throws IllegalArgumentException 
             The protocol is unknown or the connection is null.
      */
-    XBridge createBridge(
-        [in] string sName,
-        [in] string sProtocol ,
-        [in] com::sun::star::connection::XConnection aConnection ,
-        [in] XInstanceProvider anInstanceProvider )
-        raises ( BridgeExistsException , com::sun::star::lang::IllegalArgumentException );
-
-
+    XBridge createBridge( 
+        [in] string sName, 
+        [in] string sProtocol , 
+        [in] com::sun::star::connection::XConnection aConnection , 
+        [in] XInstanceProvider anInstanceProvider ) 
+        raises ( BridgeExistsException , com::sun::star::lang::IllegalArgumentException ); 
+ 
+     
     /** tries to get a bridge by this name.
         <p> Cannot be retrieved, when the bridge got disposed before.
 
         @return An existing remote bridge or a null reference.
      */
-    XBridge getBridge( [in] string  sName );
-
+    XBridge getBridge( [in] string  sName ); 
+ 
     /** returns the sequence of all named and unnamed UNO interprocess
-        bridges that are instantiated at the time the call is made.
+        bridges that are instantiated at the time the call is made. 
      */
-    sequence < XBridge > getExistingBridges( );
-};
-
-
-};};};};
-
-#endif
+    sequence < XBridge > getExistingBridges( ); 
+}; 
+ 
+  
+};};};};  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/bridge/XBridgeSupplier.idl b/udkapi/com/sun/star/bridge/XBridgeSupplier.idl
index d0597be94ce5..0bd279e4d5e5 100644
--- a/udkapi/com/sun/star/bridge/XBridgeSupplier.idl
+++ b/udkapi/com/sun/star/bridge/XBridgeSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,84 +24,84 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_XBridgeSupplier_idl__
-#define __com_sun_star_bridge_XBridgeSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Uik_idl__
-#include <com/sun/star/uno/Uik.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module bridge {
-
-//=============================================================================
-
+#ifndef __com_sun_star_bridge_XBridgeSupplier_idl__ 
+#define __com_sun_star_bridge_XBridgeSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_Uik_idl__ 
+#include <com/sun/star/uno/Uik.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module bridge {  
+ 
+//============================================================================= 
+ 
 
 /** defines the interface for creating bridges to other object models.
-
-    <p>Because bridges sometimes can not be generated in an address space,
-    the implementation needs to check the address space of the caller by
-    comparing the machine and process ID against its own. These IDs are
+    
+    <p>Because bridges sometimes can not be generated in an address space, 
+    the implementation needs to check the address space of the caller by 
+    comparing the machine and process ID against its own. These IDs are 
     provided by the UNO runtime.  </p>
 
-    <p>All objects, whether they are part of the UNO object model or not,
-    are carried in an <atom>any</atom>.  The representation of this object
+    <p>All objects, whether they are part of the UNO object model or not, 
+    are carried in an <atom>any</atom>.  The representation of this object 
     is heavily model-dependent and has to be specified in the following list: </p>
-
+    
     <dl>
         <dt>UNO: </dt>
         <dd>The any carries normal UNO types, which can be any base type,
         struct, sequence, enum, or interface.  </dd>
 
-        <dt>OLE:    </dt>
+        <dt>OLE: 	</dt>
         <dd>The any carries an <atom>unsigned long</atom> (on 32-bit systems)
-        or an <atom>unsigned hyper</atom> (on 64-bit systems), which is
-        interpreted as a variant pointer. The any does not control the
-        lifetime of the represented variant. That implies that the caller
-        has the responsibility of freeing the OLE resources represented
+        or an <atom>unsigned hyper</atom> (on 64-bit systems), which is 
+        interpreted as a variant pointer. The any does not control the 
+        lifetime of the represented variant. That implies that the caller 
+        has the responsibility of freeing the OLE resources represented 
         by the any value.  </dd>
 
-        <dt>JAVA:   </dt>
+        <dt>JAVA: 	</dt>
         <dd>not yet specified.  </dd>
 
-        <dt>CORBA: </dt>
+        <dt>CORBA: </dt> 
         <dd>not yet specified.  </dd>
     </dl>
-
-    <p>Any implementation can supply its own bridges to other object
-    models by implementing this interface and returning the bridge
+    
+    <p>Any implementation can supply its own bridges to other object 
+    models by implementing this interface and returning the bridge 
     when the method is called with itself as the first parameter. </p>
 
     @see com::sun::star::bridge::OleBridgeSupplier
     @deprecated
  */
 published interface XBridgeSupplier: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** creates a bridge to provide an object of one object model with another.
      */
-    any createBridge( [in] any modelDepObject,
-             [in] com::sun::star::uno::Uik MachineId,
-             [in] long ProcessId,
-             [in] short sourceModelType,
-             [in] short destModelType )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-};
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    any createBridge( [in] any modelDepObject, 
+             [in] com::sun::star::uno::Uik MachineId, 
+             [in] long ProcessId, 
+             [in] short sourceModelType, 
+             [in] short destModelType ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+}; 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl b/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl
index 5dbbbff5487d..d0b7380ab7fa 100644
--- a/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl
+++ b/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_XBridgeSupplier2_idl__
-#define __com_sun_star_bridge_XBridgeSupplier2_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module bridge {
-
-//=============================================================================
-
+#ifndef __com_sun_star_bridge_XBridgeSupplier2_idl__ 
+#define __com_sun_star_bridge_XBridgeSupplier2_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module bridge {  
+ 
+//============================================================================= 
+ 
 /** defines the interface for creating bridges to other object models.
     <p />
     <p>
@@ -49,14 +49,14 @@
     an interface into the target model, then the resulting target interface
     is a bridge implementation, that is not being noticed by an user. During
     a call on that interface, the bridge is invoked to convert the arguments
-    and carry out a call according to the rules of the source model.
+    and carry out a call according to the rules of the source model. 
     Return values are automatically mapped to the types of the target model.
     </p>
     <p>
     Simple types are mapped to simple target types. That is, there is no additional
     bridging code involved when those types are being used.
     </p>
-
+    
     <p>Sometimes a bridge cannot be created, depending on whether a programm uses
     the XBridgeSupplier2 interface remotely. Assuming one wants to bridge an
     OLE Automation object to UNO by calling createBridge on a proxy, then the UNO remote
@@ -67,55 +67,55 @@
     function represents the calling process and may be used by the implementation to determine
     if it is being accessed remotely.
     </p>
-    <p>All objects, whether they are part of the UNO object model or not,
-    are carried in an <atom>any</atom>.  The representation of this object
+    <p>All objects, whether they are part of the UNO object model or not, 
+    are carried in an <atom>any</atom>.  The representation of this object 
     is heavily model-dependent and has to be specified in the following list: </p>
-
+    
     <dl>
         <dt>UNO: </dt>
         <dd>The any carries normal UNO types, which can be any base type,
         struct, sequence, enum or interface.  </dd>
 
-        <dt>OLE:    </dt>
+        <dt>OLE: 	</dt>
         <dd>The any carries an <atom>unsigned long</atom> (on 32-bit systems)
-        or an <atom>unsigned hyper</atom> (on 64-bit systems), which is
-        interpreted as a variant pointer. The any does not control the
-        lifetime of the represented variant. That implies that the caller
-        has the responsibility of freeing the OLE resources represented
+        or an <atom>unsigned hyper</atom> (on 64-bit systems), which is 
+        interpreted as a variant pointer. The any does not control the 
+        lifetime of the represented variant. That implies that the caller 
+        has the responsibility of freeing the OLE resources represented 
         by the any value.  </dd>
 
-        <dt>JAVA:   </dt>
+        <dt>JAVA: 	</dt>
         <dd>not specified yet.  </dd>
 
         <dt>CORBA: </dt>
         <dd>not specified yet.  </dd>
     </dl>
-
+    
     </p>
-    <p>Any implementation can supply its own bridges to other object
-    models by implementing this interface and returning the bridge
+    <p>Any implementation can supply its own bridges to other object 
+    models by implementing this interface and returning the bridge 
     when the method <member>XBridgeSupplier2::createBridge()</member>
     is called with itself as the first parameter.  </p>
 
     @see com::sun::star::bridge::OleBridgeSupplier2
  */
 published interface XBridgeSupplier2: com::sun::star::uno::XInterface
-{
+{ 
     /** creates a bridge to provide an object of one object model with another.
      */
-    any createBridge( [in] any aModelDepObject,
-             [in] sequence< byte > aProcessId,
-             [in] short nSourceModelType,
-             [in] short nDestModelType )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    any createBridge( [in] any aModelDepObject, 
+             [in] sequence< byte > aProcessId, 
+             [in] short nSourceModelType, 
+             [in] short nDestModelType ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/bridge/XInstanceProvider.idl b/udkapi/com/sun/star/bridge/XInstanceProvider.idl
index 8555020650dd..5fb0777793c7 100644
--- a/udkapi/com/sun/star/bridge/XInstanceProvider.idl
+++ b/udkapi/com/sun/star/bridge/XInstanceProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _COM_SUN_STAR_BRIDGE_XINSTANCEPROVIDER_IDL_
-#define _COM_SUN_STAR_BRIDGE_XINSTANCEPROVIDER_IDL_
-
-#include <com/sun/star/container/NoSuchElementException.idl>
-
- module com {  module sun {  module star {  module bridge {
-
-
+#ifndef _COM_SUN_STAR_BRIDGE_XINSTANCEPROVIDER_IDL_ 
+#define _COM_SUN_STAR_BRIDGE_XINSTANCEPROVIDER_IDL_ 
+ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+ 
+ module com {  module sun {  module star {  module bridge { 
+ 
+ 
 /** allows to export UNO objects to other processes.
 
     @see XBridge
  */
 published interface XInstanceProvider: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** gets called, when an initial object is requested from a remote process.
         You may either create a  new instance or return an existing object.
 
        @param sInstanceName
             The name of the requested object.
-
-       @returns
+            
+       @returns 
             the object associated with the name. The return value may be null in case
             there is no object to offer for this string. In this case, XBridge.getInstance()
             (in the other process) will also return a null reference.
-
+            
        @throws NoSuchElementException
-            You may throw this exception to indicate, that there is no object for this
+            You may throw this exception to indicate, that there is no object for this 
             name. Due to a specification bug, this exception will appear as a RuntimeException
             at the XBridge.getInstance() method.
      */
-    com::sun::star::uno::XInterface getInstance( [in] string sInstanceName )
-            raises ( com::sun::star::container::NoSuchElementException );
-};
-
-};};};};
-
-#endif
+    com::sun::star::uno::XInterface getInstance( [in] string sInstanceName ) 
+            raises ( com::sun::star::container::NoSuchElementException ); 
+}; 
+  
+};};};};  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/bridge/XProtocolProperties.idl b/udkapi/com/sun/star/bridge/XProtocolProperties.idl
index c3ff6d4c8e92..18cd892bdf5c 100644
--- a/udkapi/com/sun/star/bridge/XProtocolProperties.idl
+++ b/udkapi/com/sun/star/bridge/XProtocolProperties.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@ module com { module sun { module star { module bridge {
 
 
 /** Bridge internal interface, that allows to change protocol settings of the remote
-    counter part.
+    counter part. 
 
     <p>In general, this interface is implemented by the bridge itself. It must not
     be called from outside the bridge.</p>
@@ -42,25 +42,25 @@ module com { module sun { module star { module bridge {
 */
 published interface XProtocolProperties : com::sun::star::uno::XInterface
 {
-    /** called to get a list of bridge internal properties. Which properties can be retrieved,
+    /** called to get a list of bridge internal properties. Which properties can be retrieved, 
         is protocol dependent.
-
+    
         <p> The properties MUST NOT change between a requestChange and a commit change call.</p>
      */
     sequence< ProtocolProperty > getProperties( );
 
-    /** called to initiate a protocol change.
+    /** called to initiate a protocol change. 
 
-        <p>This method should always be called in the scope of the local bridge setting object,
-        because the remote counter part may do such a call at the same time
+        <p>This method should always be called in the scope of the local bridge setting object, 
+        because the remote counter part may do such a call at the same time 
         (typically at startup time). </p>
-
-        @param nRandomNumber
+        
+        @param nRandomNumber 
             In case both processes call requestChange at the same time,
              the caller with the higher nRandomNumber is allowed to call
              commitChange.
 
-        @returns
+        @returns 
             1, if the caller may ( and MUST !!!) call commitChange.
             0, if the caller is not allowed to call commitChange. This can only happen,
                if the other bridge has called requestChange at the same time and
@@ -74,10 +74,10 @@ published interface XProtocolProperties : com::sun::star::uno::XInterface
      */
     long requestChange( [in] long nRandomNumber );
 
-    /** called to commit a protocol change.
+    /** called to commit a protocol change. 
 
-        <p>It is only allowed to call commitChange, if requestChange
-        has been called previously and the return value was true.  The new properties are
+        <p>It is only allowed to call commitChange, if requestChange 
+        has been called previously and the return value was true.  The new properties are 
         valid after the reply of commitChange has been received.
         Note, that this is difficult for the callee, because it must marshal the reply
         with the old settings. </p>
@@ -86,9 +86,9 @@ published interface XProtocolProperties : com::sun::star::uno::XInterface
         Note that the bridge must be blocked for other threads,
         before commitChange is sent and unblocked
         after the reply has been received. This blocks the bridge.</p>
-
+        
         @throws InvalidProtocolChangeException
-                when the remote counterpart could not change at least one of the properties.
+                when the remote counterpart could not change at least one of the properties. 
                 No property has been changed. requestChange must be called
                 again to initiate a new change of the protocol.
      */
diff --git a/udkapi/com/sun/star/bridge/XUnoUrlResolver.idl b/udkapi/com/sun/star/bridge/XUnoUrlResolver.idl
index 597d3b66ce03..b6da9c3c9f1c 100644
--- a/udkapi/com/sun/star/bridge/XUnoUrlResolver.idl
+++ b/udkapi/com/sun/star/bridge/XUnoUrlResolver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_XUnoUrlResolver_idl__
-#define __com_sun_star_bridge_XUnoUrlResolver_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#include <com/sun/star/connection/ConnectionSetupException.idl>
-#include <com/sun/star/connection/NoConnectException.idl>
-
-//=============================================================================
-
- module com {  module sun {  module star {  module bridge {
-
-//=============================================================================
-
+#ifndef __com_sun_star_bridge_XUnoUrlResolver_idl__ 
+#define __com_sun_star_bridge_XUnoUrlResolver_idl__ 
+ 
+#include <com/sun/star/uno/XInterface.idl> 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#include <com/sun/star/connection/ConnectionSetupException.idl> 
+#include <com/sun/star/connection/NoConnectException.idl> 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module bridge {  
+ 
+//============================================================================= 
+ 
 /** allows to resolve an object using the uno-url.
  */
 published interface XUnoUrlResolver: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** resolves an object using the given uno-url.
-        @param sUnoUrl the uno-url. The uno-url is specified
+        @param sUnoUrl the uno-url. The uno-url is specified 
         <a href="http://udk.openoffice.org/common/man/spec/uno-url.html">here</a>.
-
+        
         @returns the resolved object, in general a proxy for a remote object.
                  You can use it the same way as you use local references.
      */
-    com::sun::star::uno::XInterface resolve( [in] string sUnoUrl )
-        raises (com::sun::star::connection::NoConnectException,
-                com::sun::star::connection::ConnectionSetupException,
-                com::sun::star::lang::IllegalArgumentException);
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::uno::XInterface resolve( [in] string sUnoUrl ) 
+        raises (com::sun::star::connection::NoConnectException, 
+                com::sun::star::connection::ConnectionSetupException, 
+                com::sun::star::lang::IllegalArgumentException); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/bridge/oleautomation/ApplicationRegistration.idl b/udkapi/com/sun/star/bridge/oleautomation/ApplicationRegistration.idl
index 8abd2d8068a1..8f6ddb949072 100644
--- a/udkapi/com/sun/star/bridge/oleautomation/ApplicationRegistration.idl
+++ b/udkapi/com/sun/star/bridge/oleautomation/ApplicationRegistration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,25 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_oleautomation_ApplicationRegistration_idl__
-#define __com_sun_star_bridge_oleautomation_ApplicationRegistration_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module bridge { module oleautomation {
-
-//=============================================================================
-
+#ifndef __com_sun_star_bridge_oleautomation_ApplicationRegistration_idl__ 
+#define __com_sun_star_bridge_oleautomation_ApplicationRegistration_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module bridge { module oleautomation {  
+ 
+//============================================================================= 
+ 
 /** registers UNO objects as COM objects.
     <p>
     That is, COM class factories are registered with COM at runtime. The required
     EXE server is the application which deploys this service. In order to access
-    the factories by COM API functions, there need to be proper registry entries.
+    the	factories by COM API functions, there need to be proper registry entries.
     This service does not provide for writing those entries.
     </p>
     <p>
@@ -65,17 +65,17 @@ module com {  module sun {  module star {  module bridge { module oleautomation
     </p>
  */
 service ApplicationRegistration
-{
-
-    interface com::sun::star::uno::XInterface;
-
-};
-
-//=============================================================================
+{ 
 
+    interface com::sun::star::uno::XInterface; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
 }; }; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/bridge/oleautomation/BridgeSupplier.idl b/udkapi/com/sun/star/bridge/oleautomation/BridgeSupplier.idl
index 508b8831c994..06e1c5233cf2 100644
--- a/udkapi/com/sun/star/bridge/oleautomation/BridgeSupplier.idl
+++ b/udkapi/com/sun/star/bridge/oleautomation/BridgeSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ module com { module sun { module star { module bridge { module oleautomation {
     <member scope="com::sun::star::bridge">XBridgeSupplier2::createBridge</member>
     maps a value of a UNO or Automation type to the desired target type. If a UNO
     interface was mapped  to <code>IDispatch</code>, then all objects
-    (interfaces, structs) and other types which are obtained from that Automation
+    (interfaces, structs) and other types which	are obtained from that Automation
     object are automatically mapped to the corresponding Automation types. Hence,
     if one provides an initial object which forms the root of all other objects,
     such as a service manager, then only that object needs to be explicitly
@@ -53,16 +53,16 @@ module com { module sun { module star { module bridge { module oleautomation {
     </p>
     <p>
     For Automation objects to be mapped they have to implement
-    <code>IDispatch</code> interface. Other COM interfaces, except for
+    <code>IDispatch</code> interface. Other COM interfaces,	except for
     <code>IUnknown</code>, are not supported. UNO interfaces and structs are
     mapped to <code>IDispatch</code>.
     </p>
     <p>
     The service implements the
     <type scope="com::sun::star::bridge">XBridgeSupplier2</type> interface and
-    handles the model types
-    <const>com::sun::star::bridge::ModelDependent::UNO</const> and
-    <const>com::sun::star::bridge::ModelDependent::OLE</const>.
+    handles the model types 
+    <const>com::sun::star::bridge::ModelDependent::UNO</const> and 
+    <const>com::sun::star::bridge::ModelDependent::OLE</const>.  
     The service does not specify any requirements for registering OLE objects and
     class factories.
     </p>
diff --git a/udkapi/com/sun/star/bridge/oleautomation/Currency.idl b/udkapi/com/sun/star/bridge/oleautomation/Currency.idl
index 6441e3daa9ed..3d4e87da8d83 100644
--- a/udkapi/com/sun/star/bridge/oleautomation/Currency.idl
+++ b/udkapi/com/sun/star/bridge/oleautomation/Currency.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,12 +24,12 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_oleautomation_Currency_idl__
-#define __com_sun_star_bridge_oleautomation_Currency_idl__
-
-
+#ifndef __com_sun_star_bridge_oleautomation_Currency_idl__ 
+#define __com_sun_star_bridge_oleautomation_Currency_idl__ 
+ 
+ 
 module com {  module sun {  module star {  module bridge {  module oleautomation {
-
+ 
 /** is the UNO representation of the Automation type <code>CY</code>, also know
     as <code>CURRENCY</code>.
     <p>
@@ -38,14 +38,14 @@ module com {  module sun {  module star {  module bridge {  module oleautomation
     But a typedef cannot be expressed in all language bindings. In the case
     where no typedefs are supported the actual type is used. That is, a
     typedef'd currency type would be represented as <code>long</code> in Java.
-    The information that the <code>long</code> is a currency type is lost.
+    The information that the <code>long</code> is a currency type is lost. 
     </p>
     <p>
     When calling Automation objects from UNO the distinction between
     <atom>hyper</atom> and a currency type is important. Therefore
     <type>Currency</type> is declared as struct.
     </p>
-
+    
     @since OOo 1.1.2
  */
 struct Currency
@@ -53,9 +53,9 @@ struct Currency
     /** corresponds to the Automation type <code>CY</code>.
      */
     hyper Value;
-};
-
-}; }; }; }; };
-
+}; 
+ 
+}; }; }; }; }; 
+ 
 
-#endif
+#endif 
diff --git a/udkapi/com/sun/star/bridge/oleautomation/Date.idl b/udkapi/com/sun/star/bridge/oleautomation/Date.idl
index baac640171cb..5a9734bf6ec4 100644
--- a/udkapi/com/sun/star/bridge/oleautomation/Date.idl
+++ b/udkapi/com/sun/star/bridge/oleautomation/Date.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,12 +24,12 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_oleautomation_Date_idl__
-#define __com_sun_star_bridge_oleautomation_Date_idl__
-
-
+#ifndef __com_sun_star_bridge_oleautomation_Date_idl__ 
+#define __com_sun_star_bridge_oleautomation_Date_idl__ 
+ 
+ 
 module com {  module sun {  module star {  module bridge {  module oleautomation {
-
+ 
 /** is the UNO representation of the Automation type <code>DATE</code>.
     <p>
     A <code>DATE</code> could actually be representd as<atom>double</atom> in
@@ -44,7 +44,7 @@ module com {  module sun {  module star {  module bridge {  module oleautomation
     <atom>double</atom> and date type is important. Therefore <type>Date</type>
     is declared as struct.
     </p>
-
+    
     @since OOo 1.1.2
  */
 struct Date
@@ -52,9 +52,9 @@ struct Date
     /** corresponds to the Automation type <code>DATE</code>.
      */
     double Value;
-};
-
-}; }; }; }; };
-
+}; 
+ 
+}; }; }; }; }; 
+ 
 
-#endif
+#endif 
diff --git a/udkapi/com/sun/star/bridge/oleautomation/Decimal.idl b/udkapi/com/sun/star/bridge/oleautomation/Decimal.idl
index fe8a58779fdc..a3039de6f351 100644
--- a/udkapi/com/sun/star/bridge/oleautomation/Decimal.idl
+++ b/udkapi/com/sun/star/bridge/oleautomation/Decimal.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_oleautomation_Decimal_idl__
-#define __com_sun_star_bridge_oleautomation_Decimal_idl__
-
-
+#ifndef __com_sun_star_bridge_oleautomation_Decimal_idl__ 
+#define __com_sun_star_bridge_oleautomation_Decimal_idl__ 
+ 
+ 
 module com {  module sun {  module star {  module bridge {  module oleautomation {
-
+ 
 /** is the UNO representation of the Automation type <code>DECIMAL</code>.
-
+    
 
     @since OOo 1.1.2
  */
 struct Decimal
 {
     /** corresponds to <code>DECIMAL.scale</code>.
-     */
+     */ 
     byte Scale;
-
+    
     /** corresponds to <code>DECIMAL.sign</code>.
      */
     byte Sign;
-
+    
     /** corresponds to <code>DECIMAL.Lo32</code>.
      */
     unsigned long LowValue;
@@ -56,9 +56,9 @@ struct Decimal
     /** corresponds to <code>DECIMAL.Hi32</code>.
      */
     unsigned long HighValue;
-};
-
-}; }; }; }; };
-
+}; 
+ 
+}; }; }; }; }; 
+ 
 
-#endif
+#endif 
diff --git a/udkapi/com/sun/star/bridge/oleautomation/Factory.idl b/udkapi/com/sun/star/bridge/oleautomation/Factory.idl
index 3863e0f11a5f..084d05d062c2 100644
--- a/udkapi/com/sun/star/bridge/oleautomation/Factory.idl
+++ b/udkapi/com/sun/star/bridge/oleautomation/Factory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,22 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_oleautomation_Factory_idl__
-#define __com_sun_star_bridge_oleautomation_Factory_idl__
-
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
-#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-
-//=============================================================================
-
+#ifndef __com_sun_star_bridge_oleautomation_Factory_idl__ 
+#define __com_sun_star_bridge_oleautomation_Factory_idl__ 
+ 
+#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__ 
+#include <com/sun/star/lang/XMultiServiceFactory.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module bridge {  module oleautomation {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** makes it possible to create COM objects as UNO objects.
-
+    
     <p>
     A COM object must have a ProgId since the ProgId is used as argument for
     <method scope="com::sun::star::lang">XMultiServiceFactory::createInstance</method>.
@@ -57,13 +57,13 @@ module com {  module sun {  module star {  module bridge {  module oleautomation
 service Factory
 {
     interface com::sun::star::lang::XMultiServiceFactory;
-};
-
-//=============================================================================
-
-}; }; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/bridge/oleautomation/NamedArgument.idl b/udkapi/com/sun/star/bridge/oleautomation/NamedArgument.idl
index cd4e77d3f691..4355ccc29ff8 100644
--- a/udkapi/com/sun/star/bridge/oleautomation/NamedArgument.idl
+++ b/udkapi/com/sun/star/bridge/oleautomation/NamedArgument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,12 +24,12 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_oleautomation_NamedArgument_idl__
-#define __com_sun_star_bridge_oleautomation_NamedArgument_idl__
-
-
+#ifndef __com_sun_star_bridge_oleautomation_NamedArgument_idl__ 
+#define __com_sun_star_bridge_oleautomation_NamedArgument_idl__ 
+ 
+ 
 module com {  module sun {  module star {  module bridge {  module oleautomation {
-
+ 
 /** represents a named argument in a call to a method of an Automation object.
     <p>
     The Automation bridge accepts values of <type>NamedArgument</type> when a
@@ -41,7 +41,7 @@ module com {  module sun {  module star {  module bridge {  module oleautomation
     sequence can be unordered. The Automation object being called must support
     named arguments, otherwise the call fails.
     </p>
-
+    
     @since OOo 1.1.2
  */
 struct NamedArgument
@@ -55,9 +55,9 @@ struct NamedArgument
         member <member>Name</member>.
      */
     any Value;
-};
-
-}; }; }; }; };
-
+}; 
+ 
+}; }; }; }; }; 
+ 
 
-#endif
+#endif 
diff --git a/udkapi/com/sun/star/bridge/oleautomation/PropertyPutArgument.idl b/udkapi/com/sun/star/bridge/oleautomation/PropertyPutArgument.idl
index 9cb268d7d9a6..627eedab8758 100644
--- a/udkapi/com/sun/star/bridge/oleautomation/PropertyPutArgument.idl
+++ b/udkapi/com/sun/star/bridge/oleautomation/PropertyPutArgument.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,19 +24,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_oleautomation_PropertyPutArgument_idl__
-#define __com_sun_star_bridge_oleautomation_PropertyPutArgument_idl__
-
-
+#ifndef __com_sun_star_bridge_oleautomation_PropertyPutArgument_idl__ 
+#define __com_sun_star_bridge_oleautomation_PropertyPutArgument_idl__ 
+ 
+ 
 module com {  module sun {  module star {  module bridge {  module oleautomation {
-
+ 
 /** contains a value that is used as argument in a &quot;property put&quot
     operation on a Automation object.
     <p>
     If a Automation object is converted into a UNO object by a scripting
     bridge, such as
     <type scope="com::sun::star::bridge::oleautomation">BridgeSupplier</type>,
-    then it is accessed through the
+    then it is accessed through the 
     <type scope="com::sun::star::script">XInvocation</type> interface.
     The methods
     <member scope="com::sun::star::script">XInvocation::setValue</member>
@@ -53,7 +53,7 @@ module com {  module sun {  module star {  module bridge {  module oleautomation
     intended to be a write or read operation. This is done by
     providing either instances of <type>PropertyPutArgument</type> or
     <type>PropertyGetArgument</type> as arguments to
-    <member scope="com::sun::star::script">XInvocation::Invoke</member>.
+    <member scope="com::sun::star::script">XInvocation::Invoke</member>. 
 
     @since OOo 1.1.2
 */
@@ -62,9 +62,9 @@ struct PropertyPutArgument
     /** contains the actual argument.
      */
     any Value;
-};
-
-}; }; }; }; };
-
+}; 
+ 
+}; }; }; }; }; 
+ 
 
-#endif
+#endif 
diff --git a/udkapi/com/sun/star/bridge/oleautomation/SCode.idl b/udkapi/com/sun/star/bridge/oleautomation/SCode.idl
index 06e636228af7..350d032ecfcf 100644
--- a/udkapi/com/sun/star/bridge/oleautomation/SCode.idl
+++ b/udkapi/com/sun/star/bridge/oleautomation/SCode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,10 +24,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_oleautomation_SCode_idl__
-#define __com_sun_star_bridge_oleautomation_SCode_idl__
-
-
+#ifndef __com_sun_star_bridge_oleautomation_SCode_idl__ 
+#define __com_sun_star_bridge_oleautomation_SCode_idl__ 
+ 
+ 
 module com {  module sun {  module star {  module bridge {  module oleautomation {
 
 /** <p>is the UNO representation of the Automation type SCODE.
@@ -46,17 +46,17 @@ module com {  module sun {  module star {  module bridge {  module oleautomation
     and <atom>long</atom> is important. Therefore the <type>Scode</type> is
     declared as struct.
     </p>
-
+    
     @since OOo 1.1.2
  */
 
-
+    
 struct SCode
 {
     long Value;
-};
-
-}; }; }; }; };
-
+}; 
+ 
+}; }; }; }; }; 
+ 
 
-#endif
+#endif 
diff --git a/udkapi/com/sun/star/bridge/oleautomation/XAutomationObject.idl b/udkapi/com/sun/star/bridge/oleautomation/XAutomationObject.idl
index 6c165693bcdc..4f041bffa68b 100644
--- a/udkapi/com/sun/star/bridge/oleautomation/XAutomationObject.idl
+++ b/udkapi/com/sun/star/bridge/oleautomation/XAutomationObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_bridge_oleautomation_XAutomationObject_idl__
-#define __com_sun_star_bridge_oleautomation_XAutomationObject_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
+#ifndef __com_sun_star_bridge_oleautomation_XAutomationObject_idl__ 
+#define __com_sun_star_bridge_oleautomation_XAutomationObject_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
 module com {  module sun {  module star {  module bridge { module oleautomation {
-
-
+ 
+ 
 /** a tagging interface for UNO objects which represent Automation
     objects.
     <p>
@@ -48,11 +48,11 @@ module com {  module sun {  module star {  module bridge { module oleautomation
     @since OOo 1.1.2
  */
 interface XAutomationObject: com::sun::star::uno::XInterface
-{
-
-};
-
-}; }; }; }; };
-
-
-#endif
+{ 
+ 
+}; 
+ 
+}; }; }; }; };  
+ 
+
+#endif 
diff --git a/udkapi/com/sun/star/connection/Acceptor.idl b/udkapi/com/sun/star/connection/Acceptor.idl
index f2d47c5db65f..f2fbd84b6e39 100644
--- a/udkapi/com/sun/star/connection/Acceptor.idl
+++ b/udkapi/com/sun/star/connection/Acceptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_connection_Acceptor_idl__
-#define __com_sun_star_connection_Acceptor_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module connection {
+#ifndef __com_sun_star_connection_Acceptor_idl__ 
+#define __com_sun_star_connection_Acceptor_idl__ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module connection {  
 
 published interface XAcceptor;
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** allows to accept connection attempts from another process.
     <p>
     Acceptor is a delegating service. You can add further acceptors by giving
     them a service name com.sun.star.connection.Acceptor.xxx, where xxx is the
     connection type used in the connection string during accept()/connect() call.
-
+    
  */
 published service Acceptor: XAcceptor;
-
-//=============================================================================
-
-}; }; }; };
-#endif
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+#endif 
diff --git a/udkapi/com/sun/star/connection/AlreadyAcceptingException.idl b/udkapi/com/sun/star/connection/AlreadyAcceptingException.idl
index 1ee79693397e..8d1ecc3eaa54 100644
--- a/udkapi/com/sun/star/connection/AlreadyAcceptingException.idl
+++ b/udkapi/com/sun/star/connection/AlreadyAcceptingException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,19 +24,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _COM_SUN_STAR_CONNECTION_ALREADYACCEPTINGEXCEPTION_IDL_
-#define _COM_SUN_STAR_CONNECTION_ALREADYACCEPTINGEXCEPTION_IDL_
-#include <com/sun/star/uno/Exception.idl>
-
- module com {  module sun {  module star {  module connection {
-
+#ifndef _COM_SUN_STAR_CONNECTION_ALREADYACCEPTINGEXCEPTION_IDL_ 
+#define _COM_SUN_STAR_CONNECTION_ALREADYACCEPTINGEXCEPTION_IDL_ 
+#include <com/sun/star/uno/Exception.idl> 
+ 
+ module com {  module sun {  module star {  module connection { 
+        
 /** Is thrown, when there is another thread already accepting on this instance.
  */
 published exception AlreadyAcceptingException: com::sun::star::uno::Exception
-{
-};
-
-
-};};};};
-
-#endif
+{ 
+}; 
+ 
+ 
+};};};};  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/connection/ConnectionSetupException.idl b/udkapi/com/sun/star/connection/ConnectionSetupException.idl
index f413354893dc..7f83a424c542 100644
--- a/udkapi/com/sun/star/connection/ConnectionSetupException.idl
+++ b/udkapi/com/sun/star/connection/ConnectionSetupException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,19 +24,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _COM_SUN_STAR_CONNECTION_CONNECTIONSETUPEXCEPTION_IDL_
-#define _COM_SUN_STAR_CONNECTION_CONNECTIONSETUPEXCEPTION_IDL_
-#include <com/sun/star/uno/Exception.idl>
-
- module com {  module sun {  module star {  module connection {
-
+#ifndef _COM_SUN_STAR_CONNECTION_CONNECTIONSETUPEXCEPTION_IDL_ 
+#define _COM_SUN_STAR_CONNECTION_CONNECTIONSETUPEXCEPTION_IDL_ 
+#include <com/sun/star/uno/Exception.idl> 
+ 
+ module com {  module sun {  module star {  module connection { 
+        
 /** Is thrown, when it is not possible to accept on a local resource.
  */
 published exception ConnectionSetupException: com::sun::star::uno::Exception
-{
-};
-
-
-};};};};
-
-#endif
+{ 
+}; 
+ 
+ 
+};};};};  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/connection/Connector.idl b/udkapi/com/sun/star/connection/Connector.idl
index 16bbbcd7163b..1908ecca5140 100644
--- a/udkapi/com/sun/star/connection/Connector.idl
+++ b/udkapi/com/sun/star/connection/Connector.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,17 +24,17 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_connection_Connector_idl__
-#define __com_sun_star_connection_Connector_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module connection {
+#ifndef __com_sun_star_connection_Connector_idl__ 
+#define __com_sun_star_connection_Connector_idl__ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module connection {  
 
 published interface XConnector;
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** allows to establish a connection to another process.
     <p>
     Connector is a delegating service. You can add further connectors by giving
@@ -42,8 +42,8 @@ published interface XConnector;
     connection type used in the connection string during accept()/connect() call.
  */
 published service Connector: XConnector;
-
-//=============================================================================
-
-}; }; }; };
-#endif
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+#endif 
diff --git a/udkapi/com/sun/star/connection/NoConnectException.idl b/udkapi/com/sun/star/connection/NoConnectException.idl
index 09aeb48d082b..3a4362f1bdac 100644
--- a/udkapi/com/sun/star/connection/NoConnectException.idl
+++ b/udkapi/com/sun/star/connection/NoConnectException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,19 +24,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _COM_SUN_STAR_CONNECTION_NOCONNECTEXCEPTION_IDL_
-#define _COM_SUN_STAR_CONNECTION_NOCONNECTEXCEPTION_IDL_
-#include <com/sun/star/uno/Exception.idl>
-
-module com {  module sun {  module star {  module connection {
-
+#ifndef _COM_SUN_STAR_CONNECTION_NOCONNECTEXCEPTION_IDL_ 
+#define _COM_SUN_STAR_CONNECTION_NOCONNECTEXCEPTION_IDL_ 
+#include <com/sun/star/uno/Exception.idl> 
+ 
+module com {  module sun {  module star {  module connection { 
+        
 /** Is thrown in case no one is accepting on the specified resource.
  */
 published exception NoConnectException: com::sun::star::uno::Exception
-{
-};
-
-
-};};};};
-
-#endif
+{ 
+}; 
+ 
+ 
+};};};};  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/connection/SocketPermission.idl b/udkapi/com/sun/star/connection/SocketPermission.idl
index b53b0678ba80..2db65325bbe9 100644
--- a/udkapi/com/sun/star/connection/SocketPermission.idl
+++ b/udkapi/com/sun/star/connection/SocketPermission.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,11 +28,11 @@
 #define __com_sun_star_connection_SocketPermission_idl__
 
 //=============================================================================
-
+ 
 module com {  module sun {  module star {  module connection {
-
+ 
 //=============================================================================
-
+ 
 /** This permission represents access to a network via sockets.
     A SocketPermission consists of a host specification and a set of actions
     specifying ways to connect to that host.  The host is specified as
@@ -50,7 +50,7 @@ module com {  module sun {  module star {  module connection {
     where <code>N</code> is a port number, signifies all ports numbered <code>N</code> and above,
     while a specification of the form <code>"-N"</code> indicates all ports numbered
     <code>N</code> and below.
-
+    
     <p>
     The possible ways to connect to the host are
     <ul>
@@ -78,7 +78,7 @@ SocketPermission("localhost:1024-", "accept,connect,listen");
     is granted, it allows that code to accept connections on, connect to, or listen
     on any port between 1024 and 65535 on the local host.
     </p>
-
+    
     @attention
     Granting code permission to accept or make connections to remote hosts may be
     dangerous because malevolent code can then more easily transfer and share
diff --git a/udkapi/com/sun/star/connection/XAcceptor.idl b/udkapi/com/sun/star/connection/XAcceptor.idl
index e601b94b79b3..facec98fe1e4 100644
--- a/udkapi/com/sun/star/connection/XAcceptor.idl
+++ b/udkapi/com/sun/star/connection/XAcceptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _COM_SUN_STAR_CONNECTION_XACCEPTOR_IDL_
-#define _COM_SUN_STAR_CONNECTION_XACCEPTOR_IDL_
-
-#include <com/sun/star/connection/ConnectionSetupException.idl>
-#include <com/sun/star/connection/AlreadyAcceptingException.idl>
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#include <com/sun/star/connection/XConnection.idl>
-
-
-module com {  module sun {  module star {  module connection {
-
+#ifndef _COM_SUN_STAR_CONNECTION_XACCEPTOR_IDL_ 
+#define _COM_SUN_STAR_CONNECTION_XACCEPTOR_IDL_ 
+ 
+#include <com/sun/star/connection/ConnectionSetupException.idl> 
+#include <com/sun/star/connection/AlreadyAcceptingException.idl> 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#include <com/sun/star/connection/XConnection.idl> 
+ 
+ 
+module com {  module sun {  module star {  module connection { 
+ 
 /** allows to passively accept connection attempts from other processes.
 
     <p>
     This is the counterpart to the XConnector interface.
  */
 published interface XAcceptor: com::sun::star::uno::XInterface
-{
+{ 
     // DocMerge from xml: method com::sun::star::connection::XAcceptor::accept
     /** accepts an interprocess connection. Waits until someone connects to the resource.
         <p>
@@ -49,35 +49,35 @@ published interface XAcceptor: com::sun::star::uno::XInterface
         further connections, but the parameter string MUST be left unchanged.
 
 
-       @param sConnectionDescription
+       @param sConnectionDescription 
                 contains the kind of the connection plus a
               comma seperated list of attributes,
                e.g., <em>socket,host=localhost,port=2345</em> for a tcpip connection.
-
-       @return null reference,
-            stopAccepting was called.
+               
+       @return null reference, 
+            stopAccepting was called. 
             Otherwise a valid XConnection reference.
 
-       @throws AlreadyAcceptingException
+       @throws AlreadyAcceptingException 
                 Only one acceptor-thread per instance allowed.
-       @throws ConnectionSetupException
+       @throws ConnectionSetupException  
             Problems during setting up the acceptor.
           (e.g., Security-reasons, socket already busy, etc.)
        @throws com::sun::star::lang::IllegalArgumentException
                   sConnectionDescription could not be interpreted
-
+               
      */
-    XConnection accept( [in] string sConnectionDescription )
-        raises( AlreadyAcceptingException,
-                ConnectionSetupException,
-                com::sun::star::lang::IllegalArgumentException);
-
-
+    XConnection accept( [in] string sConnectionDescription ) 
+        raises( AlreadyAcceptingException, 
+                ConnectionSetupException, 
+                com::sun::star::lang::IllegalArgumentException); 
+ 
+     
     /** pushes acceptor out of the accept-call.
      */
-    void stopAccepting();
-};
-
-};};};};
-
-#endif
+    void stopAccepting(); 
+}; 
+ 
+};};};}; 
+ 
+#endif 
diff --git a/udkapi/com/sun/star/connection/XConnection.idl b/udkapi/com/sun/star/connection/XConnection.idl
index c068614a6610..17dc4b4f77b9 100644
--- a/udkapi/com/sun/star/connection/XConnection.idl
+++ b/udkapi/com/sun/star/connection/XConnection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _COM_SUN_STAR_CONNECTION_XCONNECTION_IDL_
-#define _COM_SUN_STAR_CONNECTION_XCONNECTION_IDL_
-
-#include <com/sun/star/io/IOException.idl>
-
-
-module com {  module sun {  module star {  module connection {
-
+#ifndef _COM_SUN_STAR_CONNECTION_XCONNECTION_IDL_ 
+#define _COM_SUN_STAR_CONNECTION_XCONNECTION_IDL_ 
+ 
+#include <com/sun/star/io/IOException.idl> 
+ 
+ 
+module com {  module sun {  module star {  module connection { 
+ 
 /** A bidirectional bytestream.
-
+    
     <p> You should additionally implement XConnection2.
 
     @see XConnection2
  */
 published interface XConnection: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** reads a requested number of bytes from the connection.
         <p> This method is blocking, meaning that it always returns a bytesequence
         with the requested number of bytes, unless it has reached end of file (which
         often means, that close() has been called).
-
+        
         <p> please see also the readSomeBytes() method of XConnection2.
-
-        @return The read number of bytes.
+        
+        @return The read number of bytes. 
                 The return value and the length of the
                 returned sequence must be identical.
         @param nBytesToRead
@@ -57,10 +57,10 @@ published interface XConnection: com::sun::star::uno::XInterface
         @throws com::sun::star::io::IOException
                in case an error occurred during reading from the stream.
      */
-    long read( [out] sequence < byte > aReadBytes , [in] long nBytesToRead )
-            raises( com::sun::star::io::IOException );
-
-
+    long read( [out] sequence < byte > aReadBytes , [in] long nBytesToRead ) 
+            raises( com::sun::star::io::IOException ); 
+ 
+     
     // DocMerge from xml: method com::sun::star::connection::XConnection::write
     /** writes the given bytesequence to the stream.
         <p>The method blocks until the whole sequence is written.
@@ -68,31 +68,31 @@ published interface XConnection: com::sun::star::uno::XInterface
         @throws com::sun::star::io::IOException
                in case an error occurred during writing to the stream.
      */
-    void write( [in] sequence < byte > aData )
-        raises( com::sun::star::io::IOException );
-
-
+    void write( [in] sequence < byte > aData ) 
+        raises( com::sun::star::io::IOException ); 
+ 
+ 
     /** Empties all internal buffers.
      */
-    void flush( )
-            raises( com::sun::star::io::IOException );
-
+    void flush( ) 
+            raises( com::sun::star::io::IOException ); 
+ 
     /** Immediately terminates any ongoing read or write calls.
         All subsequent read or write calls()
      */
-    void close( )
-            raises( com::sun::star::io::IOException );
-
-
-    /** A unique string describing the connection.
+    void close( ) 
+            raises( com::sun::star::io::IOException ); 
+     
+     
+    /** A unique string describing the connection. 
 
         <p>This string is different from the arguments to <member>XConnection::accept</member>
-        and <member>XConnector::connect</member>. In general, the string contains an additional
+        and <member>XConnector::connect</member>. In general, the string contains an additional 
         handle value.  For example, "socket,host=localhost,port=2002,uniqueValue=2324". </p>
      */
-    string getDescription();
-};
-
-};};};};
-
-#endif
+    string getDescription(); 
+}; 
+ 
+};};};};  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/connection/XConnection2.idl b/udkapi/com/sun/star/connection/XConnection2.idl
index 29a939fe106d..4d05ea96afd3 100644
--- a/udkapi/com/sun/star/connection/XConnection2.idl
+++ b/udkapi/com/sun/star/connection/XConnection2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _COM_SUN_STAR_CONNECTION_XCONNECTION2_IDL_
-#define _COM_SUN_STAR_CONNECTION_XCONNECTION2_IDL_
-
-#include <com/sun/star/io/IOException.idl>
-#include <com/sun/star/io/BufferSizeExceededException.idl>
-#include <com/sun/star/io/NotConnectedException.idl>
-
-#include <com/sun/star/connection/XConnection.idl>
-
-
-module com {  module sun {  module star {  module connection {
-
-
-
+#ifndef _COM_SUN_STAR_CONNECTION_XCONNECTION2_IDL_ 
+#define _COM_SUN_STAR_CONNECTION_XCONNECTION2_IDL_ 
+ 
+#include <com/sun/star/io/IOException.idl> 
+#include <com/sun/star/io/BufferSizeExceededException.idl> 
+#include <com/sun/star/io/NotConnectedException.idl> 
 
+#include <com/sun/star/connection/XConnection.idl> 
+ 
+ 
+module com {  module sun {  module star {  module connection { 
+ 
+ 
+ 
+ 
 /**
    XConnection2 extends the <code>XConnection</code> interface
    with <code>available</code> and <code>readSomeBytes</code>
 */
 published interface XConnection2: com::sun::star::connection::XConnection
-{
-
-    /** Gives the number of bytes available via <code>read</code>
+{ 
+     
+    /** Gives the number of bytes available via <code>read</code> 
         without blocking.
      */
-    long available() raises(com::sun::star::io::IOException);
+    long available() raises(com::sun::star::io::IOException); 
 
-    /** Blocks if no data is available otherwise reads at
+    /** Blocks if no data is available otherwise reads at 
         max <var>nMaxBytesToRead</var> but at least 1 byte.
         </p>
      */
-    long readSomeBytes([out] sequence<byte> aData, [in] long nMaxBytesToRead)
-        raises(com::sun::star::io::IOException);
-};
-
-};};};};
-
-#endif
+    long readSomeBytes([out] sequence<byte> aData, [in] long nMaxBytesToRead) 
+        raises(com::sun::star::io::IOException); 
+}; 
+ 
+};};};};  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/connection/XConnectionBroadcaster.idl b/udkapi/com/sun/star/connection/XConnectionBroadcaster.idl
index 44f4ac694cdd..3e026d1424a3 100644
--- a/udkapi/com/sun/star/connection/XConnectionBroadcaster.idl
+++ b/udkapi/com/sun/star/connection/XConnectionBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _COM_SUN_STAR_CONNECTION_XCONNECTIONBROADCASTER_IDL__
-#define _COM_SUN_STAR_CONNECTION_XCONNECTIONBROADCASTER_IDL_
-
-#include <com/sun/star/io/XStreamListener.idl>
-
-
- module com {  module sun {  module star {  module connection {
-
-
-
-
+#ifndef _COM_SUN_STAR_CONNECTION_XCONNECTIONBROADCASTER_IDL__ 
+#define _COM_SUN_STAR_CONNECTION_XCONNECTIONBROADCASTER_IDL_ 
+ 
+#include <com/sun/star/io/XStreamListener.idl> 
+ 
+ 
+ module com {  module sun {  module star {  module connection { 
+ 
+ 
+ 
+ 
 /** allows to add listeners to a connection.
     <p> Maybe supported by connections returned from <member>XAcceptor::accept</member>
     or <member>XConnector::connect</member>.
  */
 published interface XConnectionBroadcaster: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** registers an object to receive events from this connection.
 
        <p>It is suggested to allow multiple registration of the same listener,
         thus for each time a listener is added, it has to be removed.
      */
-    void addStreamListener( [in] com::sun::star::io::XStreamListener aListener );
-
-    //-------------------------------------------------------------------------
-
+    void addStreamListener( [in] com::sun::star::io::XStreamListener aListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** unregisters an object to receive events from this connection.
 
        <p>It is suggested to allow multiple registration of the same listener,
         thus for each time a listener is added, it has to be removed.
      */
-    void removeStreamListener( [in] com::sun::star::io::XStreamListener aListener );
-};
-
-};};};};
-
-#endif
+    void removeStreamListener( [in] com::sun::star::io::XStreamListener aListener ); 
+}; 
+ 
+};};};}; 
+ 
+#endif 
diff --git a/udkapi/com/sun/star/connection/XConnector.idl b/udkapi/com/sun/star/connection/XConnector.idl
index cfe16476dbdc..9722ca500afe 100644
--- a/udkapi/com/sun/star/connection/XConnector.idl
+++ b/udkapi/com/sun/star/connection/XConnector.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _COM_SUN_STAR_CONNECTION_XCONNECTOR_IDL_
-#define _COM_SUN_STAR_CONNECTION_XCONNECTOR_IDL_
-
-#include <com/sun/star/connection/ConnectionSetupException.idl>
-#include <com/sun/star/connection/NoConnectException.idl>
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#include <com/sun/star/connection/XConnection.idl>
-
-
-module com {  module sun {  module star {  module connection {
-
+#ifndef _COM_SUN_STAR_CONNECTION_XCONNECTOR_IDL_ 
+#define _COM_SUN_STAR_CONNECTION_XCONNECTOR_IDL_ 
+ 
+#include <com/sun/star/connection/ConnectionSetupException.idl> 
+#include <com/sun/star/connection/NoConnectException.idl> 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#include <com/sun/star/connection/XConnection.idl> 
+ 
+ 
+module com {  module sun {  module star {  module connection { 
+ 
 /**
    allows to actively establish an interprocess connection.
  */
 published interface XConnector: com::sun::star::uno::XInterface
-{
-
+{ 
+              
     // DocMerge from xml: method com::sun::star::connection::XConnector::connect
     /** creates a new connection interprocess connection.
         <p>
@@ -48,25 +48,25 @@ published interface XConnector: com::sun::star::uno::XInterface
         if a call to connect is made when another call to connect either has not
         yet returned or has returned successfully without raising an exception.
 
-        @param sConnectionDescription
+        @param sConnectionDescription 
                 contains the kind of the connection plus a
                 comma seperated list of attributes,
                e.g., <em>socket,host=locahost,port=2345</em> for a tcpip connection.
 
-        @throws ConnectionSetupException
+        @throws ConnectionSetupException  
                 Problems during setting up the connector
-              on client side, (e.g., Security-reasons, socket already busy .. ),
+              on client side, (e.g., Security-reasons, socket already busy .. ), 
                 or the string could not be interpreted correctly.
-
-        @throws NoConnectException
-                Couldn't reach a server (e.g. network failure),
+     
+        @throws NoConnectException     
+                Couldn't reach a server (e.g. network failure), 
                 no server is listening
      */
-    XConnection connect( [in] string sConnectionDescription )
-        raises( NoConnectException,ConnectionSetupException );
-};
-
-
-};};};};
-
-#endif
+    XConnection connect( [in] string sConnectionDescription ) 
+        raises( NoConnectException,ConnectionSetupException ); 
+}; 
+ 
+ 
+};};};}; 
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/ContainerEvent.idl b/udkapi/com/sun/star/container/ContainerEvent.idl
index 76b7cb07cc70..07b7accbcfeb 100644
--- a/udkapi/com/sun/star/container/ContainerEvent.idl
+++ b/udkapi/com/sun/star/container/ContainerEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_ContainerEvent_idl__
-#define __com_sun_star_container_ContainerEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_ContainerEvent_idl__ 
+#define __com_sun_star_container_ContainerEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** This event is fired when an element is inserted in a container.
 
     @see XContainerListener
  */
 published struct ContainerEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** It contains the accessor to the element which is inserted or removed.
-
+        
         <p>The type and the value of the accessor depends on the service.</p>
      */
-    any Accessor;
-
-    //-------------------------------------------------------------------------
-
+    any Accessor; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This contains the element that was inserted or removed.
      */
-    any Element;
-
-    //-------------------------------------------------------------------------
-
+    any Element; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** This contains the replaced element.
      */
-    any ReplacedElement;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    any ReplacedElement; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/ElementExistException.idl b/udkapi/com/sun/star/container/ElementExistException.idl
index 34dcb52d3dc0..73fb2b1e8007 100644
--- a/udkapi/com/sun/star/container/ElementExistException.idl
+++ b/udkapi/com/sun/star/container/ElementExistException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_ElementExistException_idl__
-#define __com_sun_star_container_ElementExistException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_ElementExistException_idl__ 
+#define __com_sun_star_container_ElementExistException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** is thrown by container methods, if an element is added which is already
     a child of the container.
 
     <p>Probably not the same element is already a member, when this exception
     is thrown, but a member with the same id or name. </p>
 
-    @see     XNameContainer
+    @see     XNameContainer 
     @see     XNameContainer::insertByName
  */
 published exception ElementExistException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/EnumerableMap.idl b/udkapi/com/sun/star/container/EnumerableMap.idl
index 12b04a7ed04b..18b9f74a1cff 100644
--- a/udkapi/com/sun/star/container/EnumerableMap.idl
+++ b/udkapi/com/sun/star/container/EnumerableMap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module container {
+module com { module sun { module star { module container { 
 
 //=============================================================================
 
@@ -134,7 +134,7 @@ service EnumerableMap : XEnumerableMap
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/NoSuchElementException.idl b/udkapi/com/sun/star/container/NoSuchElementException.idl
index b5343a33d064..7cf794e93b1e 100644
--- a/udkapi/com/sun/star/container/NoSuchElementException.idl
+++ b/udkapi/com/sun/star/container/NoSuchElementException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#define __com_sun_star_container_NoSuchElementException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#define __com_sun_star_container_NoSuchElementException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** is thrown by child access methods of collections, if the addressed child
     does not exist.
 
-    @see     XEnumeration
+    @see     XEnumeration 
     @see     XEnumeration::nextElement
  */
 published exception NoSuchElementException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XChild.idl b/udkapi/com/sun/star/container/XChild.idl
index bb1cff98b99b..c7d7054066ca 100644
--- a/udkapi/com/sun/star/container/XChild.idl
+++ b/udkapi/com/sun/star/container/XChild.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XChild_idl__
-#define __com_sun_star_container_XChild_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
-#include <com/sun/star/lang/NoSupportException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_XChild_idl__ 
+#define __com_sun_star_container_XChild_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_NoSupportException_idl__ 
+#include <com/sun/star/lang/NoSupportException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** provides access to the parent of the object.
-
+    
     <p>This interface normally is only supported if the objects all have
     exactly one dedicated parent container.</p>
  */
 published interface XChild: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** grants access to the object containing this content.
      */
-    com::sun::star::uno::XInterface getParent();
-
-    //-------------------------------------------------------------------------
-
-    /** sets the parent to this object.
+    com::sun::star::uno::XInterface getParent(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** sets the parent to this object. 
 
         @throws com::sun::star::lang::NoSupportException
             if the name of this object cannot be changed.
      */
-    void setParent( [in] com::sun::star::uno::XInterface Parent )
-            raises( com::sun::star::lang::NoSupportException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void setParent( [in] com::sun::star::uno::XInterface Parent ) 
+            raises( com::sun::star::lang::NoSupportException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XComponentEnumeration.idl b/udkapi/com/sun/star/container/XComponentEnumeration.idl
index 1cc0f5597e84..428d15230ce2 100644
--- a/udkapi/com/sun/star/container/XComponentEnumeration.idl
+++ b/udkapi/com/sun/star/container/XComponentEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XComponentEnumeration_idl__
-#define __com_sun_star_container_XComponentEnumeration_idl__
-
-#ifndef __com_sun_star_container_XEnumeration_idl__
-#include <com/sun/star/container/XEnumeration.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_XComponentEnumeration_idl__ 
+#define __com_sun_star_container_XComponentEnumeration_idl__ 
+ 
+#ifndef __com_sun_star_container_XEnumeration_idl__ 
+#include <com/sun/star/container/XEnumeration.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** provides a typified enumeration through components.
  */
 published interface XComponentEnumeration: com::sun::star::container::XEnumeration
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the next component of this enumeration.
-
-        @throws  NoSuchElementException
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
+            the next component of this enumeration. 
+                 
+        @throws  NoSuchElementException   
             if no more elements exist.
      */
-    com::sun::star::lang::XComponent nextComponent()
-            raises( com::sun::star::container::NoSuchElementException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::lang::XComponent nextComponent() 
+            raises( com::sun::star::container::NoSuchElementException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XComponentEnumerationAccess.idl b/udkapi/com/sun/star/container/XComponentEnumerationAccess.idl
index e8fcb33f4730..d572b46a56ce 100644
--- a/udkapi/com/sun/star/container/XComponentEnumerationAccess.idl
+++ b/udkapi/com/sun/star/container/XComponentEnumerationAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XComponentEnumerationAccess_idl__
-#define __com_sun_star_container_XComponentEnumerationAccess_idl__
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
-#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XComponentEnumeration_idl__
-#include <com/sun/star/container/XComponentEnumeration.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
-/** provides a factory for a typified enumeration through
+#ifndef __com_sun_star_container_XComponentEnumerationAccess_idl__ 
+#define __com_sun_star_container_XComponentEnumerationAccess_idl__ 
+ 
+#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
+#include <com/sun/star/container/XEnumerationAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XComponentEnumeration_idl__ 
+#include <com/sun/star/container/XComponentEnumeration.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
+/** provides a factory for a typified enumeration through 
     a collection of components.
  */
 published interface XComponentEnumerationAccess: com::sun::star::container::XEnumerationAccess
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** creates a new instance of enumeration through components.
      */
-    com::sun::star::container::XComponentEnumeration createComponentEnumeration();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::container::XComponentEnumeration createComponentEnumeration(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XContainer.idl b/udkapi/com/sun/star/container/XContainer.idl
index 686f0b1ea4c4..c55c8a18bbc2 100644
--- a/udkapi/com/sun/star/container/XContainer.idl
+++ b/udkapi/com/sun/star/container/XContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XContainer_idl__
-#define __com_sun_star_container_XContainer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContainerListener_idl__
-#include <com/sun/star/container/XContainerListener.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
-/** supports quick access to the information if a container currently
+#ifndef __com_sun_star_container_XContainer_idl__ 
+#define __com_sun_star_container_XContainer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XContainerListener_idl__ 
+#include <com/sun/star/container/XContainerListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
+/** supports quick access to the information if a container currently 
     contains elements.
-
+    
     <p>The <type>XContainer</type> interface is provided for containers
-    which need to broadcast changes within the container; that means
-    the actions of adding or removing elements are broadcast to the
+    which need to broadcast changes within the container; that means 
+    the actions of adding or removing elements are broadcast to the 
     listeners.  </p>
 
     <p>This can be useful for UI to enable/disable some functions
@@ -59,9 +59,9 @@ module com {  module sun {  module star {  module container {
     @see XEnumerationAccess
  */
 published interface XContainer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** adds the specified listener to receive events when
         elements are inserted or removed.
 
@@ -70,24 +70,24 @@ published interface XContainer: com::sun::star::uno::XInterface
 
         @see XContainerListener
      */
-    [oneway] void addContainerListener( [in] com::sun::star::container::XContainerListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void addContainerListener( [in] com::sun::star::container::XContainerListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the specified listener so it does not receive
         any events from this container.
 
        <p>It is suggested to allow multiple registration of the same listener,
         thus for each time a listener is added, it has to be removed.
-
+        
         @see XContainerListener
      */
-    [oneway] void removeContainerListener( [in] com::sun::star::container::XContainerListener xListener );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void removeContainerListener( [in] com::sun::star::container::XContainerListener xListener ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XContainerApproveBroadcaster.idl b/udkapi/com/sun/star/container/XContainerApproveBroadcaster.idl
index 0b1c7f2a6926..078aaa94b219 100644
--- a/udkapi/com/sun/star/container/XContainerApproveBroadcaster.idl
+++ b/udkapi/com/sun/star/container/XContainerApproveBroadcaster.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,13 @@
 #ifndef __com_sun_star_container_XContainerApproveBroadcaster_idl__
 #define __com_sun_star_container_XContainerApproveBroadcaster_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
+#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
 //=============================================================================
 
-module com { module sun { module star { module container {
+module com { module sun { module star { module container { 
 
 //=============================================================================
 
@@ -58,7 +58,7 @@ interface XContainerApproveBroadcaster
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XContainerApproveListener.idl b/udkapi/com/sun/star/container/XContainerApproveListener.idl
index 323e4038e13a..41692dc16e36 100644
--- a/udkapi/com/sun/star/container/XContainerApproveListener.idl
+++ b/udkapi/com/sun/star/container/XContainerApproveListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,11 +28,11 @@
 #ifndef __com_sun_star_container_XContainerApproveListener_idl
 #define __com_sun_star_container_XContainerApproveListener_idl
 
-#ifndef __com_sun_star_container_ContainerEvent_idl__
+#ifndef __com_sun_star_container_ContainerEvent_idl__ 
 #include <com/sun/star/container/ContainerEvent.idl>
 #endif
 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
 #include <com/sun/star/lang/WrappedTargetException.idl>
 #endif
 
@@ -42,12 +42,12 @@
 
 //=============================================================================
 
-module com { module sun { module star { module container {
+module com { module sun { module star { module container { 
 
 //=============================================================================
 
 /** is notified to approve changes which happen to the content of a generic container
-
+    
     @see XContainerApproveBroadcaster
  */
 interface XContainerApproveListener
@@ -82,7 +82,7 @@ interface XContainerApproveListener
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XContainerListener.idl b/udkapi/com/sun/star/container/XContainerListener.idl
index 5c1367ff11e5..556991fe0537 100644
--- a/udkapi/com/sun/star/container/XContainerListener.idl
+++ b/udkapi/com/sun/star/container/XContainerListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XContainerListener_idl__
-#define __com_sun_star_container_XContainerListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_container_ContainerEvent_idl__
-#include <com/sun/star/container/ContainerEvent.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_XContainerListener_idl__ 
+#define __com_sun_star_container_XContainerListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_ContainerEvent_idl__ 
+#include <com/sun/star/container/ContainerEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** receives events when the content of the related container changes.
  */
 published interface XContainerListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a container has inserted an element.
      */
-    [oneway] void elementInserted( [in] com::sun::star::container::ContainerEvent Event );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void elementInserted( [in] com::sun::star::container::ContainerEvent Event ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a container has removed an element.
      */
-    [oneway] void elementRemoved( [in] com::sun::star::container::ContainerEvent Event );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void elementRemoved( [in] com::sun::star::container::ContainerEvent Event ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** is invoked when a container has replaced an element.
      */
-    [oneway] void elementReplaced( [in] com::sun::star::container::ContainerEvent Event );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void elementReplaced( [in] com::sun::star::container::ContainerEvent Event ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XContainerQuery.idl b/udkapi/com/sun/star/container/XContainerQuery.idl
index 611138365dbe..1210310a4f23 100644
--- a/udkapi/com/sun/star/container/XContainerQuery.idl
+++ b/udkapi/com/sun/star/container/XContainerQuery.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/container/XContentEnumerationAccess.idl b/udkapi/com/sun/star/container/XContentEnumerationAccess.idl
index 37f2bc34b372..496b99cf813b 100644
--- a/udkapi/com/sun/star/container/XContentEnumerationAccess.idl
+++ b/udkapi/com/sun/star/container/XContentEnumerationAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XContentEnumerationAccess_idl__
-#define __com_sun_star_container_XContentEnumerationAccess_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumeration_idl__
-#include <com/sun/star/container/XEnumeration.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_XContentEnumerationAccess_idl__ 
+#define __com_sun_star_container_XContentEnumerationAccess_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XEnumeration_idl__ 
+#include <com/sun/star/container/XEnumeration.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** allows access to the collections of all content types within the object.
-
-    @example
+    
+    @example 
         <p>This example prints the names of all tables: </p>
 
     <listing>
@@ -55,30 +55,30 @@ module com {  module sun {  module star {  module container {
     </listing>
  */
 published interface XContentEnumerationAccess: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
             a new enumeration object for the contents of the specified service type.
      */
-    com::sun::star::container::XEnumeration createContentEnumeration( [in] string aServiceName );
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::container::XEnumeration createContentEnumeration( [in] string aServiceName ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::container::XContentEnumerationAccess::getAvailableServiceNames
-    /** @returns
-                all names of services of which instances exist in this object.
-
-        <p><member>XContentEnumerationAccess::createContentEnumeration</member>
-        creates an enumeration for all the service names which are
+    /** @returns 
+                all names of services of which instances exist in this object. 
+         
+        <p><member>XContentEnumerationAccess::createContentEnumeration</member> 
+        creates an enumeration for all the service names which are  
         listed here. For all others it creates no enumeration. </p>
      */
-    sequence<string> getAvailableServiceNames();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    sequence<string> getAvailableServiceNames(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XElementAccess.idl b/udkapi/com/sun/star/container/XElementAccess.idl
index 754c01e53ee7..229513348bc8 100644
--- a/udkapi/com/sun/star/container/XElementAccess.idl
+++ b/udkapi/com/sun/star/container/XElementAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XElementAccess_idl__
-#define __com_sun_star_container_XElementAccess_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
-#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_XElementAccess_idl__ 
+#define __com_sun_star_container_XElementAccess_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_XIdlClass_idl__ 
+#include <com/sun/star/reflection/XIdlClass.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** This is the base interface of all collection interfaces.
  */
 published interface XElementAccess: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the type of the elements. <atom>void</atom> means that it is a
-            multi-type container and you cannot determine the exact types
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
+            the type of the elements. <atom>void</atom> means that it is a 
+            multi-type container and you cannot determine the exact types 
             with this interface.
      */
-    type getElementType();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            <TRUE/> if the object contain elements,
+    type getElementType(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns		 
+            <TRUE/> if the object contain elements,  
             otherwise <FALSE/>.
      */
-    boolean hasElements();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean hasElements(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XEnumerableMap.idl b/udkapi/com/sun/star/container/XEnumerableMap.idl
index 6e9b60d47361..b0b5d103ed6e 100644
--- a/udkapi/com/sun/star/container/XEnumerableMap.idl
+++ b/udkapi/com/sun/star/container/XEnumerableMap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module container {
+module com { module sun { module star { module container { 
 
 //=============================================================================
 
@@ -103,7 +103,7 @@ interface XEnumerableMap : XMap
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XEnumeration.idl b/udkapi/com/sun/star/container/XEnumeration.idl
index 7da0c79f4d0f..b7bd0dbc67f7 100644
--- a/udkapi/com/sun/star/container/XEnumeration.idl
+++ b/udkapi/com/sun/star/container/XEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,79 +24,79 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XEnumeration_idl__
-#define __com_sun_star_container_XEnumeration_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_XEnumeration_idl__ 
+#define __com_sun_star_container_XEnumeration_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** provides functionality to enumerate the contents of a container.
-
+    
     <p>An object that implements the <type>XEnumeration</type> interface
     generates a series of elements, one at a time. Successive calls to
-    the <code>XEnumeration::nextElement</code> method return successive
+    the <code>XEnumeration::nextElement</code> method return successive 
     elements of the series.  </p>
 
-    <p>For example (Java), to print all elements of a vector <var>aVect</var>:
+    <p>For example (Java), to print all elements of a vector <var>aVect</var>: 
     </p>
 
     <listing>
-    for ( XEnumeration xEnum = aVect.elements() ;
-    xEnum.hasMoreElements() ; )
+    for ( XEnumeration xEnum = aVect.elements() ; 
+    xEnum.hasMoreElements() ; ) 
     {
     System.out.println( xEnum.nextElement() );
     }
     </listing>
-
-
-    <p> If the object changed, the behavior of the enumeration is
+    
+    
+    <p> If the object changed, the behavior of the enumeration is 
     not specified. This is not a remote interface.  </p>
  */
 published interface XEnumeration: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** tests whether this enumeration contains more elements.
      */
-    boolean hasMoreElements();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            the next element of this enumeration.
-
-        @throws  NoSuchElementException
-            if no more elements exist.
-
-        @throws  com::sun::star::lang::WrappedTargetException
-            If the implementation has internal reasons for exceptions,
-            then wrap these in a <type scope="com::sun::star::lang">WrappedTargetException</type>
+    boolean hasMoreElements(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns      
+            the next element of this enumeration.  
+                 
+        @throws  NoSuchElementException   
+            if no more elements exist. 
+                 
+        @throws  com::sun::star::lang::WrappedTargetException  
+            If the implementation has internal reasons for exceptions,  
+            then wrap these in a <type scope="com::sun::star::lang">WrappedTargetException</type> 
             exception.
      */
-    any nextElement()
-            raises( com::sun::star::container::NoSuchElementException,
-                    com::sun::star::lang::WrappedTargetException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    any nextElement() 
+            raises( com::sun::star::container::NoSuchElementException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XEnumerationAccess.idl b/udkapi/com/sun/star/container/XEnumerationAccess.idl
index 0282a7cd3592..7e9dc57b2709 100644
--- a/udkapi/com/sun/star/container/XEnumerationAccess.idl
+++ b/udkapi/com/sun/star/container/XEnumerationAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
-#define __com_sun_star_container_XEnumerationAccess_idl__
-
-#ifndef __com_sun_star_container_XElementAccess_idl__
-#include <com/sun/star/container/XElementAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_XEnumeration_idl__
-#include <com/sun/star/container/XEnumeration.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
+#define __com_sun_star_container_XEnumerationAccess_idl__ 
+ 
+#ifndef __com_sun_star_container_XElementAccess_idl__ 
+#include <com/sun/star/container/XElementAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XEnumeration_idl__ 
+#include <com/sun/star/container/XEnumeration.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** used to enumerate objects in a container which contains objects.
  */
 published interface XEnumerationAccess: com::sun::star::container::XElementAccess
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns		 
             a new enumeration object for this container.
             It returns NULL if there are no objects in this container.
      */
-    com::sun::star::container::XEnumeration createEnumeration();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::container::XEnumeration createEnumeration(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XHierarchicalName.idl b/udkapi/com/sun/star/container/XHierarchicalName.idl
index 5913390249c9..8279280a5b52 100644
--- a/udkapi/com/sun/star/container/XHierarchicalName.idl
+++ b/udkapi/com/sun/star/container/XHierarchicalName.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,59 +24,59 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XHierarchicalName_idl__
-#define __com_sun_star_container_XHierarchicalName_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_NoSupportException_idl__
-#include <com/sun/star/lang/NoSupportException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_XHierarchicalName_idl__ 
+#define __com_sun_star_container_XHierarchicalName_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_NoSupportException_idl__ 
+#include <com/sun/star/lang/NoSupportException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** specifies the fully qualified name of the object within a hierarchy.
-
+    
     <p>The name is generally globally unique in the hierarchy.  </p>
 
-    @see com::sun::star::container::XHierarchicalNameAccess
+    @see com::sun::star::container::XHierarchicalNameAccess 
     @see com::sun::star::container::XNamed
  */
 published interface XHierarchicalName: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
                 the fully qualified hierarchical name of the object.
      */
-    string getHierarchicalName();
-
-    //-------------------------------------------------------------------------
-
+    string getHierarchicalName(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** builds the hierarchical name of an object, given a relative name
-
+        
         <p>Can be used to find the name of a descendant object in the hierarchy
         without actually accessing it.  </p>
 
         @see XHierarchicalNameAccess::hasByHierarchicalName
      */
-    string composeHierarchicalName( [in] string aRelativeName )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::lang::NoSupportException );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string composeHierarchicalName( [in] string aRelativeName ) 
+            raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::lang::NoSupportException ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XHierarchicalNameAccess.idl b/udkapi/com/sun/star/container/XHierarchicalNameAccess.idl
index b19e6ad1dcb5..4d93ce7aefd9 100644
--- a/udkapi/com/sun/star/container/XHierarchicalNameAccess.idl
+++ b/udkapi/com/sun/star/container/XHierarchicalNameAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,67 +24,67 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
-#define __com_sun_star_container_XHierarchicalNameAccess_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__ 
+#define __com_sun_star_container_XHierarchicalNameAccess_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** is used to have hierarchical access to elements within a container.
 
     <p>You address an object of a specific level in the hierarchy by giving its
     fully qualified name, e.g., "com.sun.star.uno.XInterface". </p>
-
-    <p>To implement inaccurate name access, support the
+    
+    <p>To implement inaccurate name access, support the 
     <type scope="com::sun::star::beans">XExactName</type> interface.  </p>
 
     @see com::sun::star::beans::XExactName
  */
 published interface XHierarchicalNameAccess: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
-                the object with the specified name.
-
-        @param aName
-            the name of the object.
-
-        @throws NoSuchElementException
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns		 
+                the object with the specified name. 
+                 
+        @param aName 
+            the name of the object. 
+                 
+        @throws NoSuchElementException  
             if an element under Name does not exist.
      */
-    any getByHierarchicalName( [in] string aName )
-            raises( com::sun::star::container::NoSuchElementException );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            <TRUE/> if an element with this name is in
-            the container, <FALSE/> otherwise.
-
-        <p>In many cases, the next call is <member>XNameAccess::getByName</member>.
-        You should optimize this case.
-
-        @param aName
+    any getByHierarchicalName( [in] string aName ) 
+            raises( com::sun::star::container::NoSuchElementException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
+            <TRUE/> if an element with this name is in 
+            the container, <FALSE/> otherwise. 
+                 
+        <p>In many cases, the next call is <member>XNameAccess::getByName</member>. 
+        You should optimize this case. 
+                 
+        @param aName 
             the name of the object.
      */
-    boolean hasByHierarchicalName( [in] string aName );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean hasByHierarchicalName( [in] string aName ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XHierarchicalNameContainer.idl b/udkapi/com/sun/star/container/XHierarchicalNameContainer.idl
index ae6de0e81ef2..51bbf4fde2a3 100644
--- a/udkapi/com/sun/star/container/XHierarchicalNameContainer.idl
+++ b/udkapi/com/sun/star/container/XHierarchicalNameContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XHierarchicalNameContainer_idl__
-#define __com_sun_star_container_XHierarchicalNameContainer_idl__
-
-#ifndef __com_sun_star_container_XHierarchicalNameReplace_idl__
-#include <com/sun/star/container/XHierarchicalNameReplace.idl>
-#endif
-
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
-#include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
-#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
+#ifndef __com_sun_star_container_XHierarchicalNameContainer_idl__ 
+#define __com_sun_star_container_XHierarchicalNameContainer_idl__ 
+
+#ifndef __com_sun_star_container_XHierarchicalNameReplace_idl__ 
+#include <com/sun/star/container/XHierarchicalNameReplace.idl> 
+#endif 
+
+#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__ 
+#include <com/sun/star/container/XHierarchicalNameAccess.idl> 
+#endif 
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_ElementExistException_idl__ 
+#include <com/sun/star/container/ElementExistException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
 
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+ module com {  module sun {  module star {  module container {  
 
 //=============================================================================
 
@@ -64,29 +64,29 @@
 published interface XHierarchicalNameContainer : com::sun::star::container::XHierarchicalNameReplace
 {
 
-    /** inserts the element at the specified name.
+    /** inserts the element at the specified name. 
      */
-    void insertByHierarchicalName( [in] string aName,
-             [in] any aElement )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::container::ElementExistException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
+    void insertByHierarchicalName( [in] string aName, 
+             [in] any aElement ) 
+            raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::container::ElementExistException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the element at the specified name.
      */
-    void removeByHierarchicalName( [in] string Name )
-            raises( com::sun::star::container::NoSuchElementException,
-                    com::sun::star::lang::WrappedTargetException );
+    void removeByHierarchicalName( [in] string Name ) 
+            raises( com::sun::star::container::NoSuchElementException, 
+                    com::sun::star::lang::WrappedTargetException ); 
 
 };
 
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 #endif
diff --git a/udkapi/com/sun/star/container/XHierarchicalNameReplace.idl b/udkapi/com/sun/star/container/XHierarchicalNameReplace.idl
index ac8110d4e7b6..55e7547ecb18 100644
--- a/udkapi/com/sun/star/container/XHierarchicalNameReplace.idl
+++ b/udkapi/com/sun/star/container/XHierarchicalNameReplace.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XHierarchicalNameReplace_idl__
-#define __com_sun_star_container_XHierarchicalNameReplace_idl__
-
-#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__
-#include <com/sun/star/container/XHierarchicalNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
-#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
+#ifndef __com_sun_star_container_XHierarchicalNameReplace_idl__ 
+#define __com_sun_star_container_XHierarchicalNameReplace_idl__ 
+
+#ifndef __com_sun_star_container_XHierarchicalNameAccess_idl__ 
+#include <com/sun/star/container/XHierarchicalNameAccess.idl> 
+#endif 
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_ElementExistException_idl__ 
+#include <com/sun/star/container/ElementExistException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
 
 //=============================================================================
 
-module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {  
 
 //=============================================================================
 
@@ -62,20 +62,20 @@ published interface XHierarchicalNameReplace : com::sun::star::container::XHiera
 
     /** replaces the element at the specified name.
      */
-    void replaceByHierarchicalName( [in] string aName,
-             [in] any aElement )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::container::NoSuchElementException,
-                    com::sun::star::lang::WrappedTargetException );
+    void replaceByHierarchicalName( [in] string aName, 
+             [in] any aElement ) 
+            raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::container::NoSuchElementException, 
+                    com::sun::star::lang::WrappedTargetException ); 
 };
 
 
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
 #endif
 
diff --git a/udkapi/com/sun/star/container/XIdentifierAccess.idl b/udkapi/com/sun/star/container/XIdentifierAccess.idl
index a13b4761ae00..d426ea227e23 100644
--- a/udkapi/com/sun/star/container/XIdentifierAccess.idl
+++ b/udkapi/com/sun/star/container/XIdentifierAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,61 +24,61 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XIdentifierAccess_idl__
-#define __com_sun_star_container_XIdentifierAccess_idl__
-
-#ifndef __com_sun_star_container_XElementAccess_idl__
-#include <com/sun/star/container/XElementAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_XIdentifierAccess_idl__ 
+#define __com_sun_star_container_XIdentifierAccess_idl__ 
+ 
+#ifndef __com_sun_star_container_XElementAccess_idl__ 
+#include <com/sun/star/container/XElementAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** provides access to the elements of a collection through a unique identifier.
  */
 published interface XIdentifierAccess: com::sun::star::container::XElementAccess
-{
-    /** @returns
+{ 
+    /** @returns  
             the element with the specified identifier
-
-        @param Identifier
-            specifies the identifier of the element that should be retrieved.
-
-        @throws com::sun::star::lang::NoSuchElementException
+                 
+        @param Identifier	 
+            specifies the identifier of the element that should be retrieved. 
+                 
+        @throws com::sun::star::lang::NoSuchElementException 
             If the identifier is not existing.
-
-        @throws  com::sun::star::lang::WrappedTargetException
-            If the implementation has internal reasons for exceptions,
-            then wrap these in a <typee scope="com::sun::star::lang">WrappedTargetException</type>
+                 
+        @throws  com::sun::star::lang::WrappedTargetException  
+            If the implementation has internal reasons for exceptions,  
+            then wrap these in a <typee scope="com::sun::star::lang">WrappedTargetException</type> 
             exception.
      */
-    any getByIdentifier( [in] long Identifierr )
-            raises( com::sun::star::container::NoSuchElementException,
-                    com::sun::star::lang::WrappedTargetException );
+    any getByIdentifier( [in] long Identifierr ) 
+            raises( com::sun::star::container::NoSuchElementException, 
+                    com::sun::star::lang::WrappedTargetException ); 
 
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    /** @returns
-            a sequence of all identifiers in this container.
-
+    /** @returns 
+            a sequence of all identifiers in this container. 
+         
         <p>The order of the identifiers is not specified. </p>
      */
     sequence<long> getIdentifiers();
 }
-;
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XIdentifierContainer.idl b/udkapi/com/sun/star/container/XIdentifierContainer.idl
index 138db504bd51..70c49342db58 100644
--- a/udkapi/com/sun/star/container/XIdentifierContainer.idl
+++ b/udkapi/com/sun/star/container/XIdentifierContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,88 +24,88 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XIdentifierContainer_idl__
-#define __com_sun_star_container_XIdentifierContainer_idl__
-
-#ifndef __com_sun_star_container_XIdentifierReplace_idl__
-#include <com/sun/star/container/XIdentifierReplace.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
-#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
-/** This is the generic interface for supporting the creation and removal of
+#ifndef __com_sun_star_container_XIdentifierContainer_idl__ 
+#define __com_sun_star_container_XIdentifierContainer_idl__ 
+ 
+#ifndef __com_sun_star_container_XIdentifierReplace_idl__ 
+#include <com/sun/star/container/XIdentifierReplace.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_ElementExistException_idl__ 
+#include <com/sun/star/container/ElementExistException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
+/** This is the generic interface for supporting the creation and removal of 
     elements with unique identifiers.
 
     @see XContainer
  */
 published interface XIdentifierContainer: com::sun::star::container::XIdentifierReplace
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** inserts an element and creates a new unique identifier for it.
-
+        
         @returns
             the newly created identifier under which the element is inserted.
 
         @param aElement
             The new element that will be inserted.
 
-        @throws com::sun::star::lang::IllegalArgumentException
+        @throws com::sun::star::lang::IllegalArgumentException 
             if the argument is not vailid for this container.
 
-        @throws  com::sun::star::lang::WrappedTargetException
-            If the implementation has internal reasons for exceptions,
-            then wrap these in a <type scope="com::sun::star::lang">WrappedTargetException</type>
+        @throws  com::sun::star::lang::WrappedTargetException  
+            If the implementation has internal reasons for exceptions,  
+            then wrap these in a <type scope="com::sun::star::lang">WrappedTargetException</type> 
             exception.
 
      */
-    long insert( [in] any aElement )
+    long insert( [in] any aElement ) 
             raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the element with the specified identifier.
 
         @param Identifier
             The identifier that should be removed.
 
-        @throws com::sun::star::lang::NoSuchElementException
+        @throws com::sun::star::lang::NoSuchElementException 
             If the identifier does not exist.
 
-        @throws  com::sun::star::lang::WrappedTargetException
-            If the implementation has internal reasons for exceptions,
-            then wrap these in a <type scope="com::sun::star::lang">WrappedTargetException</type>
+        @throws  com::sun::star::lang::WrappedTargetException  
+            If the implementation has internal reasons for exceptions,  
+            then wrap these in a <type scope="com::sun::star::lang">WrappedTargetException</type> 
             exception.
      */
-    void removeByIdentifier( [in] long Identifier )
-            raises( com::sun::star::container::NoSuchElementException,
-                    com::sun::star::lang::WrappedTargetException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void removeByIdentifier( [in] long Identifier ) 
+            raises( com::sun::star::container::NoSuchElementException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XIdentifierReplace.idl b/udkapi/com/sun/star/container/XIdentifierReplace.idl
index 6b5fda44eb66..6d305764b892 100644
--- a/udkapi/com/sun/star/container/XIdentifierReplace.idl
+++ b/udkapi/com/sun/star/container/XIdentifierReplace.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XIdentifierReplace_idl__
-#define __com_sun_star_container_XIdentifierReplace_idl__
-
-#ifndef __com_sun_star_container_XIdentifierAccess_idl__
-#include <com/sun/star/container/XIdentifierAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_XIdentifierReplace_idl__ 
+#define __com_sun_star_container_XIdentifierReplace_idl__ 
+ 
+#ifndef __com_sun_star_container_XIdentifierAccess_idl__ 
+#include <com/sun/star/container/XIdentifierAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** This is the generic interface for supporting the replacement of elements
     with unique identifiers.
 */
@@ -57,33 +57,33 @@ published interface XIdentifierReplace: com::sun::star::container::XIdentifierAc
 {
     /** replaces the element with the specified identifier.
 
-        @param Identifier
-            specifies the identifier of the element that should be retrieved.
-
+        @param Identifier	 
+            specifies the identifier of the element that should be retrieved. 
+                 
         @param aElement
             the new element that replaces the old element for the specified identifier.
 
-        @throws com::sun::star::lang::IllegalArgumentException
+        @throws com::sun::star::lang::IllegalArgumentException 
             If the argument is not valid for this container.
 
-        @throws com::sun::star::lang::NoSuchElementException
+        @throws com::sun::star::lang::NoSuchElementException 
             If the identifier is not existing.
 
-        @throws  com::sun::star::lang::WrappedTargetException
-            If the implementation has internal reasons for exceptions,
-            then wrap these in a <type scope="com::sun::star::lang">WrappedTargetException</type>
+        @throws  com::sun::star::lang::WrappedTargetException  
+            If the implementation has internal reasons for exceptions,  
+            then wrap these in a <type scope="com::sun::star::lang">WrappedTargetException</type> 
             exception.
      */
-    void replaceByIdentifer( [in] long Identifier,
-             [in] any aElement )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::container::NoSuchElementException,
-                    com::sun::star::lang::WrappedTargetException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void replaceByIdentifer( [in] long Identifier, 
+             [in] any aElement ) 
+            raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::container::NoSuchElementException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XImplicitIDAccess.idl b/udkapi/com/sun/star/container/XImplicitIDAccess.idl
index 4c108918a724..1b4f77fee611 100644
--- a/udkapi/com/sun/star/container/XImplicitIDAccess.idl
+++ b/udkapi/com/sun/star/container/XImplicitIDAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,45 +24,45 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XImplicitIDAccess_idl__
-#define __com_sun_star_container_XImplicitIDAccess_idl__
-
-#ifndef __com_sun_star_container_XElementAccess_idl__
-#include <com/sun/star/container/XElementAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
+#ifndef __com_sun_star_container_XImplicitIDAccess_idl__ 
+#define __com_sun_star_container_XImplicitIDAccess_idl__ 
+ 
+#ifndef __com_sun_star_container_XElementAccess_idl__ 
+#include <com/sun/star/container/XElementAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
 /** makes it possible to access contents through an implicit (unique) ID.
  */
 published interface XImplicitIDAccess: com::sun::star::container::XElementAccess
-{
-    /** @returns
+{  
+    /** @returns 
             the element with the specified implicit ID.
      */
-    any getByImplicitID( [in] string ID ) raises( com::sun::star::container::NoSuchElementException );
-
+    any getByImplicitID( [in] string ID ) raises( com::sun::star::container::NoSuchElementException ); 
+    
     /** @returns
             a sequence with all existing implicit IDs.
      */
     sequence<string> getImplicitIDs();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XImplicitIDContainer.idl b/udkapi/com/sun/star/container/XImplicitIDContainer.idl
index c7cfb4ba828a..768823c9de83 100644
--- a/udkapi/com/sun/star/container/XImplicitIDContainer.idl
+++ b/udkapi/com/sun/star/container/XImplicitIDContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XImplicitIDContainer_idl__
-#define __com_sun_star_container_XImplicitIDContainer_idl__
-
-#ifndef __com_sun_star_container_XImplicitIDReplace_idl__
-#include <com/sun/star/container/XImplicitIDReplace.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-/** makes it possible to insert and remove elements in/from a container
+#ifndef __com_sun_star_container_XImplicitIDContainer_idl__ 
+#define __com_sun_star_container_XImplicitIDContainer_idl__ 
+ 
+#ifndef __com_sun_star_container_XImplicitIDReplace_idl__ 
+#include <com/sun/star/container/XImplicitIDReplace.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+/** makes it possible to insert and remove elements in/from a container 
     using an implicit (unique) ID.
  */
 published interface XImplicitIDContainer: com::sun::star::container::XImplicitIDReplace
-{
+{  
     /** adds a new object to the container and generates an implicit (unique)
         ID for this object.
 
@@ -56,19 +56,19 @@ published interface XImplicitIDContainer: com::sun::star::container::XImplicitID
             the implicit ID for the new object.
      */
     string addWithImplicitID( [in] any aElement );
-
+    
     /** removes an object from the container which is specified by
         an implicit (unique) identifier.
      */
-    void removeByImplicitID( [in] string ID )
-        raises( com::sun::star::container::NoSuchElementException );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void removeByImplicitID( [in] string ID ) 
+        raises( com::sun::star::container::NoSuchElementException ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XImplicitIDReplace.idl b/udkapi/com/sun/star/container/XImplicitIDReplace.idl
index df0a0d739f84..f56a59408e6e 100644
--- a/udkapi/com/sun/star/container/XImplicitIDReplace.idl
+++ b/udkapi/com/sun/star/container/XImplicitIDReplace.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XImplicitIDReplace_idl__
-#define __com_sun_star_container_XImplicitIDReplace_idl__
-
-#ifndef __com_sun_star_container_XImplicitIDAccess_idl__
-#include <com/sun/star/container/XImplicitIDAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
+#ifndef __com_sun_star_container_XImplicitIDReplace_idl__ 
+#define __com_sun_star_container_XImplicitIDReplace_idl__ 
+ 
+#ifndef __com_sun_star_container_XImplicitIDAccess_idl__ 
+#include <com/sun/star/container/XImplicitIDAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
 /** makes it possible to replace contents in a collection by
     an implicit (unique) ID:
  */
 published interface XImplicitIDReplace: com::sun::star::uno::XInterface
-{
+{  
     /** replaces the content which is specified by its implicit (unique)
         ID with a new content.
      */
-    void replaceByUniqueID( [in] string ID, [in] any aNewElement )
-        raises( com::sun::star::container::NoSuchElementException );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void replaceByUniqueID( [in] string ID, [in] any aNewElement ) 
+        raises( com::sun::star::container::NoSuchElementException ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XIndexAccess.idl b/udkapi/com/sun/star/container/XIndexAccess.idl
index 6cac3654f362..a8e205ef281d 100644
--- a/udkapi/com/sun/star/container/XIndexAccess.idl
+++ b/udkapi/com/sun/star/container/XIndexAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,68 +24,68 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#define __com_sun_star_container_XIndexAccess_idl__
-
-#ifndef __com_sun_star_container_XElementAccess_idl__
-#include <com/sun/star/container/XElementAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
-#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#define __com_sun_star_container_XIndexAccess_idl__ 
+ 
+#ifndef __com_sun_star_container_XElementAccess_idl__ 
+#include <com/sun/star/container/XElementAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ 
+#include <com/sun/star/lang/IndexOutOfBoundsException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** provides access to the elements of a collection through an
     index.
-
+    
     <p>This interface should only be used if the data structure, itself,
     is indexed.</p>
  */
 published interface XIndexAccess: com::sun::star::container::XElementAccess
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
                 the number of elements in this container.
      */
-    long getCount();
-
-    //-------------------------------------------------------------------------
-
+    long getCount(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::container::XIndexAccess::getByIndex
-    /** @returns
+    /** @returns  
             the element at the specified index.
-
-        @param Index
-            specifies the position in the array. The first index is 0.
-
-        @throws com::sun::star::lang::IndexOutOfBoundException
-            if the index is not valid.
-
-        @throws  com::sun::star::lang::WrappedTargetException
-            If the implementation has internal reasons for exceptions,
-            then wrap these in a <type scope="com::sun::star::lang">WrappedTargetException</type>
+                 
+        @param Index	 
+            specifies the position in the array. The first index is 0. 
+                 
+        @throws com::sun::star::lang::IndexOutOfBoundException 
+            if the index is not valid. 
+                 
+        @throws  com::sun::star::lang::WrappedTargetException  
+            If the implementation has internal reasons for exceptions,  
+            then wrap these in a <type scope="com::sun::star::lang">WrappedTargetException</type> 
             exception.
      */
-    any getByIndex( [in] long Index )
-            raises( com::sun::star::lang::IndexOutOfBoundsException,
-                    com::sun::star::lang::WrappedTargetException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    any getByIndex( [in] long Index ) 
+            raises( com::sun::star::lang::IndexOutOfBoundsException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XIndexContainer.idl b/udkapi/com/sun/star/container/XIndexContainer.idl
index 6af5913ffc69..61b3a1ce6d33 100644
--- a/udkapi/com/sun/star/container/XIndexContainer.idl
+++ b/udkapi/com/sun/star/container/XIndexContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XIndexContainer_idl__
-#define __com_sun_star_container_XIndexContainer_idl__
-
-#ifndef __com_sun_star_container_XIndexReplace_idl__
-#include <com/sun/star/container/XIndexReplace.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
-#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
-/** This is the generic interface for supporting the insertion and removal of
+#ifndef __com_sun_star_container_XIndexContainer_idl__ 
+#define __com_sun_star_container_XIndexContainer_idl__ 
+ 
+#ifndef __com_sun_star_container_XIndexReplace_idl__ 
+#include <com/sun/star/container/XIndexReplace.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ 
+#include <com/sun/star/lang/IndexOutOfBoundsException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
+/** This is the generic interface for supporting the insertion and removal of 
     indexed elements.@see XContainer
  */
 published interface XIndexContainer: com::sun::star::container::XIndexReplace
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** inserts the given element at the specified index.
-
+        
         <p>To append an element, use the index "last index +1".  </p>
      */
-    void insertByIndex( [in] long Index,
-             [in] any Element )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::lang::IndexOutOfBoundsException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
+    void insertByIndex( [in] long Index, 
+             [in] any Element ) 
+            raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::lang::IndexOutOfBoundsException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the element at the specified index.
      */
-    void removeByIndex( [in] long Index )
-            raises( com::sun::star::lang::IndexOutOfBoundsException,
-                    com::sun::star::lang::WrappedTargetException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void removeByIndex( [in] long Index ) 
+            raises( com::sun::star::lang::IndexOutOfBoundsException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XIndexReplace.idl b/udkapi/com/sun/star/container/XIndexReplace.idl
index 915063dbadb0..eba1d32e8cb7 100644
--- a/udkapi/com/sun/star/container/XIndexReplace.idl
+++ b/udkapi/com/sun/star/container/XIndexReplace.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XIndexReplace_idl__
-#define __com_sun_star_container_XIndexReplace_idl__
-
-#ifndef __com_sun_star_container_XIndexAccess_idl__
-#include <com/sun/star/container/XIndexAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
-#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_XIndexReplace_idl__ 
+#define __com_sun_star_container_XIndexReplace_idl__ 
+ 
+#ifndef __com_sun_star_container_XIndexAccess_idl__ 
+#include <com/sun/star/container/XIndexAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ 
+#include <com/sun/star/lang/IndexOutOfBoundsException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** This is the generic interface for supporting the replacement of indexed
     elements.
     @see XContainer
  */
 published interface XIndexReplace: com::sun::star::container::XIndexAccess
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** replaces the element at the specified index with the given element.
      */
-    void replaceByIndex( [in] long Index,
-             [in] any Element )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::lang::IndexOutOfBoundsException,
-                    com::sun::star::lang::WrappedTargetException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void replaceByIndex( [in] long Index, 
+             [in] any Element ) 
+            raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::lang::IndexOutOfBoundsException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XMap.idl b/udkapi/com/sun/star/container/XMap.idl
index b9a5bd24b97c..5749a244d742 100644
--- a/udkapi/com/sun/star/container/XMap.idl
+++ b/udkapi/com/sun/star/container/XMap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module container {
+module com { module sun { module star { module container { 
 
 //=============================================================================
 
@@ -196,7 +196,7 @@ interface XMap
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XNameAccess.idl b/udkapi/com/sun/star/container/XNameAccess.idl
index a845f1085bbe..8e70c34ddbc4 100644
--- a/udkapi/com/sun/star/container/XNameAccess.idl
+++ b/udkapi/com/sun/star/container/XNameAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,83 +24,83 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#define __com_sun_star_container_XNameAccess_idl__
-
-#ifndef __com_sun_star_container_XElementAccess_idl__
-#include <com/sun/star/container/XElementAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#define __com_sun_star_container_XNameAccess_idl__ 
+ 
+#ifndef __com_sun_star_container_XElementAccess_idl__ 
+#include <com/sun/star/container/XElementAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** is used to access named objects within a container.
-
-    <p>To implement inaccurate name access, support the
-    <type scope="com::sun::star::beans">XExactName</type>
+    
+    <p>To implement inaccurate name access, support the 
+    <type scope="com::sun::star::beans">XExactName</type> 
     interface.  </p>
     @see com::sun::star::beans::XExactName
  */
 published interface XNameAccess: com::sun::star::container::XElementAccess
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
-        the object with the specified name.
-
-        @param aName
-            the name of the object.
-
-        @throws NoSuchElementException
-            if an element under Name does not exist.
-
-        @throws  com::sun::star::lang::WrappedTargetException
-            If the implementation has internal reasons for exceptions,
-            then wrap these in a <type scope="com::sun::star::lang">WrappedTargetException</type>
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns		 
+        the object with the specified name. 
+                 
+        @param aName 
+            the name of the object. 
+                 
+        @throws NoSuchElementException  
+            if an element under Name does not exist. 
+                 
+        @throws  com::sun::star::lang::WrappedTargetException  
+            If the implementation has internal reasons for exceptions,  
+            then wrap these in a <type scope="com::sun::star::lang">WrappedTargetException</type> 
             exception.
      */
-    any getByName( [in] string aName )
-            raises( com::sun::star::container::NoSuchElementException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            a sequence of all element names in this container.
-
+    any getByName( [in] string aName ) 
+            raises( com::sun::star::container::NoSuchElementException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+            a sequence of all element names in this container. 
+         
         <p>The order of the names is not specified. </p>
      */
-    sequence<string> getElementNames();
-
-    //-------------------------------------------------------------------------
-
-    /** @returns
-            <TRUE/> if an element with this name is in
-            the container, <FALSE/> otherwise.
-
-        <p>In many cases the next call is <member>XNameAccess::getByName</member>.
+    sequence<string> getElementNames(); 
+ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns  
+            <TRUE/> if an element with this name is in 
+            the container, <FALSE/> otherwise. 
+                 
+        <p>In many cases the next call is <member>XNameAccess::getByName</member>. 
         You should optimize this case.  </p>
-
-        @param aName
+                 
+        @param aName 
             the name of the object.
      */
-    boolean hasByName( [in] string aName );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean hasByName( [in] string aName ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XNameContainer.idl b/udkapi/com/sun/star/container/XNameContainer.idl
index b11763f8649e..4e222d3a594a 100644
--- a/udkapi/com/sun/star/container/XNameContainer.idl
+++ b/udkapi/com/sun/star/container/XNameContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,63 +24,63 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#define __com_sun_star_container_XNameContainer_idl__
-
-#ifndef __com_sun_star_container_XNameReplace_idl__
-#include <com/sun/star/container/XNameReplace.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
-#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
-/** This is the generic interface for supporting the insertion and removal of
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#define __com_sun_star_container_XNameContainer_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameReplace_idl__ 
+#include <com/sun/star/container/XNameReplace.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_ElementExistException_idl__ 
+#include <com/sun/star/container/ElementExistException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
+/** This is the generic interface for supporting the insertion and removal of 
     named elements.
     @see XContainer
  */
 published interface XNameContainer: com::sun::star::container::XNameReplace
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** inserts the given element at the specified name.
      */
-    void insertByName( [in] string aName,
-             [in] any aElement )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::container::ElementExistException,
-                    com::sun::star::lang::WrappedTargetException );
-
-    //-------------------------------------------------------------------------
-
+    void insertByName( [in] string aName, 
+             [in] any aElement ) 
+            raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::container::ElementExistException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the element with the specified name.
      */
-    void removeByName( [in] string Name )
-            raises( com::sun::star::container::NoSuchElementException,
-                    com::sun::star::lang::WrappedTargetException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void removeByName( [in] string Name ) 
+            raises( com::sun::star::container::NoSuchElementException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XNameReplace.idl b/udkapi/com/sun/star/container/XNameReplace.idl
index 286f2241cc78..550036a28b40 100644
--- a/udkapi/com/sun/star/container/XNameReplace.idl
+++ b/udkapi/com/sun/star/container/XNameReplace.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XNameReplace_idl__
-#define __com_sun_star_container_XNameReplace_idl__
-
-#ifndef __com_sun_star_container_XNameAccess_idl__
-#include <com/sun/star/container/XNameAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_XNameReplace_idl__ 
+#define __com_sun_star_container_XNameReplace_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameAccess_idl__ 
+#include <com/sun/star/container/XNameAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** This is the generic interface for supporting the replacement of named
     elements.
     @see XContainer
  */
 published interface XNameReplace: com::sun::star::container::XNameAccess
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** replaces the element with the specified name with the given element.
      */
-    void replaceByName( [in] string aName,
-             [in] any aElement )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::container::NoSuchElementException,
-                    com::sun::star::lang::WrappedTargetException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void replaceByName( [in] string aName, 
+             [in] any aElement ) 
+            raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::container::NoSuchElementException, 
+                    com::sun::star::lang::WrappedTargetException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XNamed.idl b/udkapi/com/sun/star/container/XNamed.idl
index b503514ee539..a238a739e5d6 100644
--- a/udkapi/com/sun/star/container/XNamed.idl
+++ b/udkapi/com/sun/star/container/XNamed.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XNamed_idl__
-#define __com_sun_star_container_XNamed_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_XNamed_idl__ 
+#define __com_sun_star_container_XNamed_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** specifies the name of the object.
-
+    
     <p>The name is generally unique in the container of the object.</p>
  */
 published interface XNamed: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
         the programmatic name of the object.
      */
-    string getName();
-
-    //-------------------------------------------------------------------------
-
+    string getName(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** sets the programmatic name of the object.
      */
-    [oneway] void setName( [in] string aName );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    [oneway] void setName( [in] string aName ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XSet.idl b/udkapi/com/sun/star/container/XSet.idl
index 5377c2a0785a..9983f37d0ff6 100644
--- a/udkapi/com/sun/star/container/XSet.idl
+++ b/udkapi/com/sun/star/container/XSet.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,64 +24,64 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XSet_idl__
-#define __com_sun_star_container_XSet_idl__
-
-#ifndef __com_sun_star_container_XEnumerationAccess_idl__
-#include <com/sun/star/container/XEnumerationAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_container_ElementExistException_idl__
-#include <com/sun/star/container/ElementExistException.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
-//=============================================================================
-
+#ifndef __com_sun_star_container_XSet_idl__ 
+#define __com_sun_star_container_XSet_idl__ 
+ 
+#ifndef __com_sun_star_container_XEnumerationAccess_idl__ 
+#include <com/sun/star/container/XEnumerationAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_ElementExistException_idl__ 
+#include <com/sun/star/container/ElementExistException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
+//============================================================================= 
+ 
 /** This is the generic interface for supporting the insertion and removal of
     elements.@see XContainer
  */
 published interface XSet: com::sun::star::container::XEnumerationAccess
-{
-    //-------------------------------------------------------------------------
-
-    /** @returns
-        <TRUE/> if the given element is a member of this container,
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** @returns 
+        <TRUE/> if the given element is a member of this container, 
         otherwise <FALSE/>.
      */
-    boolean has( [in] any aElement );
-
-    //-------------------------------------------------------------------------
-
+    boolean has( [in] any aElement ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** inserts the given element into this container.
      */
-    void insert( [in] any aElement )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::container::ElementExistException );
-
-    //-------------------------------------------------------------------------
-
+    void insert( [in] any aElement ) 
+            raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::container::ElementExistException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** removes the given element from this container.
      */
-    void remove( [in] any aElement )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::container::NoSuchElementException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void remove( [in] any aElement ) 
+            raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::container::NoSuchElementException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/container/XStringKeyMap.idl b/udkapi/com/sun/star/container/XStringKeyMap.idl
index cf2b87d49b49..a97e310d660b 100644
--- a/udkapi/com/sun/star/container/XStringKeyMap.idl
+++ b/udkapi/com/sun/star/container/XStringKeyMap.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/container/XUniqueIDAccess.idl b/udkapi/com/sun/star/container/XUniqueIDAccess.idl
index 28e19afc726e..03f32a4ba23c 100644
--- a/udkapi/com/sun/star/container/XUniqueIDAccess.idl
+++ b/udkapi/com/sun/star/container/XUniqueIDAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_container_XUniqueIDAccess_idl__
-#define __com_sun_star_container_XUniqueIDAccess_idl__
-
-#ifndef __com_sun_star_container_XElementAccess_idl__
-#include <com/sun/star/container/XElementAccess.idl>
-#endif
-
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module container {
-
+#ifndef __com_sun_star_container_XUniqueIDAccess_idl__ 
+#define __com_sun_star_container_XUniqueIDAccess_idl__ 
+ 
+#ifndef __com_sun_star_container_XElementAccess_idl__ 
+#include <com/sun/star/container/XElementAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
+#include <com/sun/star/container/NoSuchElementException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module container {  
+ 
 /** makes it possible to access contents via a unique ID.
  */
 published interface XUniqueIDAccess: com::sun::star::uno::XInterface
-{
-    /** @returns
+{  
+    /** @returns 
         the element with the specified unique ID.
      */
-    any getByUniqueID( [in] string ID ) raises( com::sun::star::container::NoSuchElementException );
-
+    any getByUniqueID( [in] string ID ) raises( com::sun::star::container::NoSuchElementException ); 
+    
     /** removes the element with the specified unique ID from this
         container.
      */
-    void removeByUniqueID( [in] string ID ) raises( com::sun::star::container::NoSuchElementException );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void removeByUniqueID( [in] string ID ) raises( com::sun::star::container::NoSuchElementException ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/corba/corba.idl b/udkapi/com/sun/star/corba/corba.idl
index d7e6bdea4c07..19901d5527ab 100644
--- a/udkapi/com/sun/star/corba/corba.idl
+++ b/udkapi/com/sun/star/corba/corba.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,7 +56,7 @@ module com { module sun { module star { module corba
     {
         ThreadIDs IDs;
     };
-
+    
     /**
       @deprecated
      */
@@ -98,6 +98,6 @@ module com { module sun { module star { module corba
         tk_value, tk_value_box,
         tk_native,
         tk_abstract_interface
-    };
+    };	
 
-}; }; }; };
+}; }; }; }; 
diff --git a/udkapi/com/sun/star/corba/giop/giop.idl b/udkapi/com/sun/star/corba/giop/giop.idl
index 56e6fe67eda4..5710ec9eb650 100644
--- a/udkapi/com/sun/star/corba/giop/giop.idl
+++ b/udkapi/com/sun/star/corba/giop/giop.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@ module com { module sun { module star { module corba { module giop
     /**
       @deprecated
      */
-published   struct Version
+published  	struct Version
     {
         byte major;
         byte minor;
@@ -51,7 +51,7 @@ published enum MsgType_1_1
     /**
       @deprecated
      */
-published   struct MessageHeader_1_0
+published  	struct MessageHeader_1_0
     {// Renamed from MessageHeader
         byte magic_1;
         byte magic_2;
@@ -62,11 +62,11 @@ published   struct MessageHeader_1_0
         byte message_type;
         unsigned long message_size;
     };
-
+    
     /**
       @deprecated
      */
-published   struct MessageHeader_1_1
+published  	struct MessageHeader_1_1
     {
         byte magic_1;
         byte magic_2;
@@ -77,7 +77,7 @@ published   struct MessageHeader_1_1
         byte message_type;
         unsigned long message_size;
     };
-
+    
     /**
       @deprecated
      */
@@ -86,7 +86,7 @@ published typedef MessageHeader_1_1 MessageHeader_1_2;
     /**
       @deprecated
      */
-published   struct RequestHeader_1_0
+published  	struct RequestHeader_1_0
     {
         com::sun::star::corba::iop::ServiceContextList service_context;
         unsigned long request_id;
@@ -95,11 +95,11 @@ published   struct RequestHeader_1_0
         CorbaString8 operation;
         sequence < byte > requesting_principal;
     };
-
+    
     /**
       @deprecated
      */
-published   struct RequestHeader_1_1
+published  	struct RequestHeader_1_1
     {
         com::sun::star::corba::iop::ServiceContextList service_context;
         unsigned long request_id;
@@ -111,11 +111,11 @@ published   struct RequestHeader_1_1
         CorbaString8 operation;
         sequence <byte> requesting_principal; // binary compatible
     };
-
+    
     /**
       @deprecated
      */
-published   struct IORAddressingInfo
+published  	struct IORAddressingInfo
     {
         unsigned long selected_profile_index;
         com::sun::star::corba::iop::IOR ior;
@@ -130,7 +130,7 @@ published constants TargetAddressGroup
             const short ProfileAddr = 1;
             const short ReferenceAddr = 2;
         };
-
+    
     /**
       @deprecated
      */
@@ -146,7 +146,7 @@ published struct TargetAddress : CorbaUnion
     /**
       @deprecated
      */
-published   struct RequestHeader_1_2
+published  	struct RequestHeader_1_2
     {
         unsigned long request_id;
         byte response_flags;
@@ -173,31 +173,31 @@ published enum ReplyStatusType_1_2
         NEEDS_ADDRESSING_MODE // new value for 1.2
     };
 
-
+    
     /**
       @deprecated
      */
-published   struct ReplyHeader_1_2
+published  	struct ReplyHeader_1_2
     {
         unsigned long request_id;
         ReplyStatusType_1_2 reply_status;
         com::sun::star::corba::iop::ServiceContextList service_context; // 1.2 change
     };
-
+    
     /**
       @deprecated
      */
-published   struct SystemExceptionReplyBody
+published  	struct SystemExceptionReplyBody
     {
         CorbaString8 exception_id;
         unsigned long minor_code_value;
         unsigned long completion_status;
     };
-
+    
     /**
       @deprecated
      */
-published   struct CancelRequestHeader
+published  	struct CancelRequestHeader
     {
         unsigned long request_id;
     };
@@ -205,13 +205,13 @@ published   struct CancelRequestHeader
     /**
       @deprecated
      */
-published   struct LocateRequestHeader_1_0
+published  	struct LocateRequestHeader_1_0
     {
 // Renamed LocationRequestHeader
         unsigned long request_id;
         sequence <byte> object_key;
     };
-
+    
     /**
       @deprecated
      */
@@ -228,11 +228,11 @@ published enum LocateStatusType_1_2 {
         LOC_SYSTEM_EXCEPTION, // new value for GIOP 1.2
         LOC_NEEDS_ADDRESSING_MODE // new value for GIOP 1.2
     };
-
+    
     /**
       @deprecated
      */
-published   struct LocateReplyHeader_1_2
+published  	struct LocateReplyHeader_1_2
     {
         unsigned long request_id;
         LocateStatusType_1_2 locate_status;
@@ -241,7 +241,7 @@ published   struct LocateReplyHeader_1_2
     /**
       @deprecated
      */
-published   struct FragmentHeader_1_2
+published  	struct FragmentHeader_1_2
     {
         unsigned long request_id;
     };
diff --git a/udkapi/com/sun/star/corba/iiop/iiop.idl b/udkapi/com/sun/star/corba/iiop/iiop.idl
index 055b4c8506bb..6b13f6af12e8 100644
--- a/udkapi/com/sun/star/corba/iiop/iiop.idl
+++ b/udkapi/com/sun/star/corba/iiop/iiop.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,28 +30,28 @@ module com { module sun { module star { module corba { module iiop
     /**
        @deprecated
     */
-published   struct Version
+published 	struct Version
     {
         byte major;
         byte minor;
     };
 
-
+    
     /**
        @deprecated
     */
-published   struct ProfileBody_1_0
+published 	struct ProfileBody_1_0
     {// renamed from ProfileBody
         Version iiop_version;
         CorbaString8 host;
         unsigned short port;
         sequence <byte> object_key;
     };
-
+    
     /**
        @deprecated
     */
-published   struct ProfileBody_1_1
+published 	struct ProfileBody_1_1
     {// also used for 1.2
         Version iiop_version;
         CorbaString8 host;
@@ -60,25 +60,25 @@ published   struct ProfileBody_1_1
 // Added in 1.1 unchanged for 1.2
         sequence <com::sun::star::corba::iop::TaggedComponent> components;
     };
-
+    
     /**
        @deprecated
     */
-published   struct ListenPoint
+published 	struct ListenPoint
     {
         CorbaString8 host;
         unsigned short port;
     };
-
+    
     /**
        @deprecated
     */
 published typedef sequence<ListenPoint> ListenPointList;
-
+    
     /**
        @deprecated
     */
-published   struct BiDirIIOPServiceContext
+published 	struct BiDirIIOPServiceContext
     {// BI_DIR_IIOP Service Context
         ListenPointList listen_points;
     };
diff --git a/udkapi/com/sun/star/corba/iop/iop.idl b/udkapi/com/sun/star/corba/iop/iop.idl
index 85be91f3ae47..77ef198be60f 100644
--- a/udkapi/com/sun/star/corba/iop/iop.idl
+++ b/udkapi/com/sun/star/corba/iop/iop.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
 #include <com/sun/star/corba/corba.idl>
 module com { module sun { module star { module corba { module iop
 { // IDL
-
+    
     /**
       @deprecated
      */
@@ -96,7 +96,7 @@ module com { module sun { module star { module corba { module iop
         ServiceId context_id;
         sequence < byte > context_data;
     };
-
+    
     /**
       @deprecated
      */
diff --git a/udkapi/com/sun/star/io/AlreadyConnectedException.idl b/udkapi/com/sun/star/io/AlreadyConnectedException.idl
index 4430eacda8ad..f07e99e8dbaa 100644
--- a/udkapi/com/sun/star/io/AlreadyConnectedException.idl
+++ b/udkapi/com/sun/star/io/AlreadyConnectedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_AlreadyConnectedException_idl__
-#define __com_sun_star_io_AlreadyConnectedException_idl__
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_AlreadyConnectedException_idl__ 
+#define __com_sun_star_io_AlreadyConnectedException_idl__ 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::io::AlreadyConnectedException
-/** is thrown when a client tries to connect to a resource to which he is
+/** is thrown when a client tries to connect to a resource to which he is 
     already connected.
  */
 exception AlreadyConnectedException: com::sun::star::io::IOException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/BufferSizeExceededException.idl b/udkapi/com/sun/star/io/BufferSizeExceededException.idl
index 881ae786b1cc..dd6dff849169 100644
--- a/udkapi/com/sun/star/io/BufferSizeExceededException.idl
+++ b/udkapi/com/sun/star/io/BufferSizeExceededException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,22 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_BufferSizeExceededException_idl__
-#define __com_sun_star_io_BufferSizeExceededException_idl__
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_BufferSizeExceededException_idl__ 
+#define __com_sun_star_io_BufferSizeExceededException_idl__ 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::io::BufferSizeExceededException
-/** is thrown by instances which need to buffer data.
+/** is thrown by instances which need to buffer data. 
     <p>It indicates that not enough system resources are available for
     extending the buffer. (May also indicate that the internal buffer
     has grown to a larger size than 2G. Some current implementations do
@@ -47,14 +47,14 @@ module com {  module sun {  module star {  module io {
     </p>
  */
 published exception BufferSizeExceededException: com::sun::star::io::IOException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/ConnectException.idl b/udkapi/com/sun/star/io/ConnectException.idl
index f67ae57a0e78..4b4c9fddf377 100644
--- a/udkapi/com/sun/star/io/ConnectException.idl
+++ b/udkapi/com/sun/star/io/ConnectException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_ConnectException_idl__
-#define __com_sun_star_io_ConnectException_idl__
-
-#ifndef __com_sun_star_io_SocketException_idl__
-#include <com/sun/star/io/SocketException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_ConnectException_idl__ 
+#define __com_sun_star_io_ConnectException_idl__ 
+ 
+#ifndef __com_sun_star_io_SocketException_idl__ 
+#include <com/sun/star/io/SocketException.idl> 
+#endif 
+  
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::io::ConnectException
-/** Signals that an error occurred while attempting to connect a
-    socket to a remote address and port. Typically, the connection
-    was refused remotely (e.g., no process is listening on the remote
+/** Signals that an error occurred while attempting to connect a 
+    socket to a remote address and port. Typically, the connection 
+    was refused remotely (e.g., no process is listening on the remote 
     address/port).
  */
 exception ConnectException: com::sun::star::io::SocketException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/DataInputStream.idl b/udkapi/com/sun/star/io/DataInputStream.idl
index df11692395e0..d35a26b60b78 100644
--- a/udkapi/com/sun/star/io/DataInputStream.idl
+++ b/udkapi/com/sun/star/io/DataInputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,58 +24,58 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_DataInputStream_idl__
-#define __com_sun_star_io_DataInputStream_idl__
-
-#ifndef __com_sun_star_io_XDataInputStream_idl__
-#include <com/sun/star/io/XDataInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
-#include <com/sun/star/io/XActiveDataSink.idl>
-#endif
-
-#ifndef __com_sun_star_io_XConnectable_idl__
-#include <com/sun/star/io/XConnectable.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star { module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_DataInputStream_idl__ 
+#define __com_sun_star_io_DataInputStream_idl__ 
+ 
+#ifndef __com_sun_star_io_XDataInputStream_idl__ 
+#include <com/sun/star/io/XDataInputStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XActiveDataSink_idl__ 
+#include <com/sun/star/io/XActiveDataSink.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XConnectable_idl__ 
+#include <com/sun/star/io/XConnectable.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star { module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::io::DataInputStream
-/** reads structured data from a chained <type>XInputStream</type>.
-    <p>
+/** reads structured data from a chained <type>XInputStream</type>. 
+    <p> 
     An implementation of this service in general does not need
     to buffer data itself.
 
     @see com::sun::star::io::ObjectInputStream
  */
 published service DataInputStream
-{
+{ 
     /** allows to read structured data.
      */
-    interface com::sun::star::io::XDataInputStream;
-
+    interface com::sun::star::io::XDataInputStream; 
+    
     /** used to plug the inputstream-data-source.
         A plain input stream is sufficient.
      */
-    interface com::sun::star::io::XActiveDataSink;
-
+    interface com::sun::star::io::XActiveDataSink; 
+    
     /** Allows to chain the DataInputStream, so that
      */
-    interface com::sun::star::io::XConnectable;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    interface com::sun::star::io::XConnectable; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/DataOutputStream.idl b/udkapi/com/sun/star/io/DataOutputStream.idl
index 9bfe73312192..03520390b4c9 100644
--- a/udkapi/com/sun/star/io/DataOutputStream.idl
+++ b/udkapi/com/sun/star/io/DataOutputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_DataOutputStream_idl__
-#define __com_sun_star_io_DataOutputStream_idl__
-
-#ifndef __com_sun_star_io_XDataOutputStream_idl__
-#include <com/sun/star/io/XDataOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
-#include <com/sun/star/io/XActiveDataSource.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_DataOutputStream_idl__ 
+#define __com_sun_star_io_DataOutputStream_idl__ 
+ 
+#ifndef __com_sun_star_io_XDataOutputStream_idl__ 
+#include <com/sun/star/io/XDataOutputStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XActiveDataSource_idl__ 
+#include <com/sun/star/io/XActiveDataSource.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::io::DataOutputStream
-/** writes structured data to a chained <type>XOutputStream</type>.
-
-    <p>
+/** writes structured data to a chained <type>XOutputStream</type>. 
+    
+    <p> 
     An implementation of this service in general does not need
     to buffer data itself.
  */
 published service DataOutputStream
-{
+{ 
     /** allows to write structured data.
      */
-    interface com::sun::star::io::XDataOutputStream;
-
+    interface com::sun::star::io::XDataOutputStream; 
+    
     /** used to plug the outputstream-data-sink.
         <p>A plain output stream is sufficient.
      */
-    interface com::sun::star::io::XActiveDataSource;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    interface com::sun::star::io::XActiveDataSource; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/DataTransferEvent.idl b/udkapi/com/sun/star/io/DataTransferEvent.idl
index d78f6eb4d64c..0edc1050c86c 100644
--- a/udkapi/com/sun/star/io/DataTransferEvent.idl
+++ b/udkapi/com/sun/star/io/DataTransferEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_DataTransferEvent_idl__
-#define __com_sun_star_io_DataTransferEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_DataTransferEvent_idl__ 
+#define __com_sun_star_io_DataTransferEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::io::DataTransferEvent
 /** is broadcast by a filter.
     @see XDataTransferEventListener
  */
 published struct DataTransferEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     // DocMerge from xml: field com::sun::star::io::DataTransferEvent::aException
     /** specifies an occurred exception.
      */
-    any aException;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    any aException; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/FilePermission.idl b/udkapi/com/sun/star/io/FilePermission.idl
index 3511e2c7e2a5..6dc4f4478670 100644
--- a/udkapi/com/sun/star/io/FilePermission.idl
+++ b/udkapi/com/sun/star/io/FilePermission.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,11 +27,11 @@
 #ifndef __com_sun_star_io_FilePermission_idl__
 #define __com_sun_star_io_FilePermission_idl__
 //=============================================================================
-
-module com {  module sun {  module star {  module io {
-
+ 
+module com {  module sun {  module star {  module io {  
+ 
 //=============================================================================
-
+ 
 /** This permission represents access to a file or directory.
     A FilePermission consists of a file url and a set of actions valid for that url.
     <p>
@@ -58,7 +58,7 @@ module com {  module sun {  module star {  module io {
     </ul><br>
     The actions string is processed case-insensitive.
     </p>
-
+    
     @attention
     Be careful when granting FilePermissions.  Think about the implications of
     granting read and especially write access to various files and directories.
diff --git a/udkapi/com/sun/star/io/IOException.idl b/udkapi/com/sun/star/io/IOException.idl
index 6b2da1b6351d..bcd2a7f2ce19 100644
--- a/udkapi/com/sun/star/io/IOException.idl
+++ b/udkapi/com/sun/star/io/IOException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_IOException_idl__
-#define __com_sun_star_io_IOException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_IOException_idl__ 
+#define __com_sun_star_io_IOException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::io::IOException
 /** is thrown when an input or output error has occurred.
  */
 published exception IOException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/MarkableInputStream.idl b/udkapi/com/sun/star/io/MarkableInputStream.idl
index 65058592cc06..b8359260caf8 100644
--- a/udkapi/com/sun/star/io/MarkableInputStream.idl
+++ b/udkapi/com/sun/star/io/MarkableInputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,55 +24,55 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_DataInputStream_idl__
-#define __com_sun_star_io_DataInputStream_idl__
-
-#ifndef __com_sun_star_io_XMarkableStream_idl__
-#include <com/sun/star/io/XMarkableStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
-#include <com/sun/star/io/XActiveDataSink.idl>
-#endif
-
-#ifndef __com_sun_star_io_XConnectable_idl__
-#include <com/sun/star/io/XConnectable.idl>
-#endif
-
-
-module com {  module sun {  module star {  module io {
-
+#ifndef __com_sun_star_io_DataInputStream_idl__ 
+#define __com_sun_star_io_DataInputStream_idl__ 
+ 
+#ifndef __com_sun_star_io_XMarkableStream_idl__ 
+#include <com/sun/star/io/XMarkableStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XActiveDataSink_idl__ 
+#include <com/sun/star/io/XActiveDataSink.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XConnectable_idl__ 
+#include <com/sun/star/io/XConnectable.idl> 
+#endif 
+ 
+ 
+module com {  module sun {  module star {  module io {  
+ 
 //==========================================================================
 /** allows to set marks in an inputstream and to later jump back to these
     marks.
     <p>The implementation reads the original data from the input stream,
-    that has been set previously at the <type>XActiveDataSink</type>
+    that has been set previously at the <type>XActiveDataSink</type> 
     interface. In general the implementation must buffer the data. </p>
  */
 published service MarkableInputStream
-{
+{ 
     /** allows to access the data of this stream
      */
-    interface com::sun::star::io::XInputStream;
+    interface com::sun::star::io::XInputStream; 
 
     /** allows to create marks at the current position
         and to set the current position.
      */
-    interface com::sun::star::io::XMarkableStream;
+    interface com::sun::star::io::XMarkableStream; 
 
     /** allows to access to the underlying source
         of this stream.
      */
-    interface com::sun::star::io::XActiveDataSink;
-
+    interface com::sun::star::io::XActiveDataSink; 
+    
     /** allows to navigate via a chain of streams */
-    interface com::sun::star::io::XConnectable;
-
-};
-
-
-}; }; }; };
-
-
-
-#endif
+    interface com::sun::star::io::XConnectable; 
+ 
+}; 
+ 
+ 
+}; }; }; };  
+ 
+     
+ 
+#endif 
diff --git a/udkapi/com/sun/star/io/MarkableOutputStream.idl b/udkapi/com/sun/star/io/MarkableOutputStream.idl
index 576f7f56452a..592ee57e4f14 100644
--- a/udkapi/com/sun/star/io/MarkableOutputStream.idl
+++ b/udkapi/com/sun/star/io/MarkableOutputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_DataInputStream_idl__
-#define __com_sun_star_io_DataInputStream_idl__
-
-#ifndef __com_sun_star_io_XMarkableStream_idl__
-#include <com/sun/star/io/XMarkableStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
-#include <com/sun/star/io/XActiveDataSource.idl>
-#endif
-
-#ifndef __com_sun_star_io_XConnectable_idl__
-#include <com/sun/star/io/XConnectable.idl>
-#endif
-
-
-module com {  module sun {  module star {  module io {
-
+#ifndef __com_sun_star_io_DataInputStream_idl__ 
+#define __com_sun_star_io_DataInputStream_idl__ 
+ 
+#ifndef __com_sun_star_io_XMarkableStream_idl__ 
+#include <com/sun/star/io/XMarkableStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XActiveDataSink_idl__ 
+#include <com/sun/star/io/XActiveDataSource.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XConnectable_idl__ 
+#include <com/sun/star/io/XConnectable.idl> 
+#endif 
+ 
+ 
+module com {  module sun {  module star {  module io {  
+ 
 //==========================================================================
 /** allows to set marks in an outputstream and to later jump back to these
     marks.
     <p>The implementation stores the data as long as marks exists
-    and later writes these data into the output stream,
-    that has been set previously at the <type>XActiveDataSource</type>
+    and later writes these data into the output stream, 
+    that has been set previously at the <type>XActiveDataSource</type> 
     interface. </p>
  */
 published service MarkableOutputStream
-{
+{ 
     /** allows to write data at the current position.
         <p> Flushing the outputstream will only flush data,
             which was written before the first non-deleted mark,
             because data after the first non-deleted mark
             may be modified by later jumpToMark()/writeBytes() calls.
      */
-    interface com::sun::star::io::XOutputStream;
+    interface com::sun::star::io::XOutputStream; 
 
     /** allows to create marks at the current position
         and to set the current position.
      */
-    interface com::sun::star::io::XMarkableStream;
-
+    interface com::sun::star::io::XMarkableStream; 
+    
     /** allows to access to the underlying sink
         of this stream.
      */
-    interface com::sun::star::io::XActiveDataSource;
+    interface com::sun::star::io::XActiveDataSource; 
 
     /** allows to navigate via a chain of streams */
-    interface com::sun::star::io::XConnectable;
-
-};
-
-
-}; }; }; };
-
-
-
-#endif
+    interface com::sun::star::io::XConnectable; 
+ 
+}; 
+ 
+ 
+}; }; }; };  
+ 
+     
+ 
+#endif 
diff --git a/udkapi/com/sun/star/io/NoRouteToHostException.idl b/udkapi/com/sun/star/io/NoRouteToHostException.idl
index c37663eaf55d..68ca5f2db7c5 100644
--- a/udkapi/com/sun/star/io/NoRouteToHostException.idl
+++ b/udkapi/com/sun/star/io/NoRouteToHostException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_NoRouteToHostException_idl__
-#define __com_sun_star_io_NoRouteToHostException_idl__
-
-#ifndef __com_sun_star_io_SocketException_idl__
-#include <com/sun/star/io/SocketException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_NoRouteToHostException_idl__ 
+#define __com_sun_star_io_NoRouteToHostException_idl__ 
+ 
+#ifndef __com_sun_star_io_SocketException_idl__ 
+#include <com/sun/star/io/SocketException.idl> 
+#endif 
+  
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::io::NoRouteToHostException
-/** Signals that an error occurred while attempting to connect a socket to
-    a remote address and port. Typically, the remote host cannot be reached
+/** Signals that an error occurred while attempting to connect a socket to 
+    a remote address and port. Typically, the remote host cannot be reached 
     because of an intervening firewall, or if an intermediate router is down.
  */
 exception NoRouteToHostException: com::sun::star::io::SocketException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/NotConnectedException.idl b/udkapi/com/sun/star/io/NotConnectedException.idl
index 956e10896f96..0143b7c689f6 100644
--- a/udkapi/com/sun/star/io/NotConnectedException.idl
+++ b/udkapi/com/sun/star/io/NotConnectedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_NotConnectedException_idl__
-#define __com_sun_star_io_NotConnectedException_idl__
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_NotConnectedException_idl__ 
+#define __com_sun_star_io_NotConnectedException_idl__ 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::io::NotConnectedException
 /** is thrown when a read/write operation is tried on an instance that has
     not been chained properly.
  */
 published exception NotConnectedException: com::sun::star::io::IOException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/ObjectInputStream.idl b/udkapi/com/sun/star/io/ObjectInputStream.idl
index 69e98d3a1d6e..5784a5436022 100644
--- a/udkapi/com/sun/star/io/ObjectInputStream.idl
+++ b/udkapi/com/sun/star/io/ObjectInputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_ObjectInputStream_idl__
-#define __com_sun_star_io_ObjectInputStream_idl__
-
-#ifndef __com_sun_star_io_XObjectInputStream_idl__
-#include <com/sun/star/io/XObjectInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
-#include <com/sun/star/io/XActiveDataSink.idl>
-#endif
-
-#ifndef __com_sun_star_io_XConnectable_idl__
-#include <com/sun/star/io/XConnectable.idl>
-#endif
-
-#ifndef __com_sun_star_io_XMarkableStream_idl__
-#include <com/sun/star/io/XMarkableStream.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_ObjectInputStream_idl__ 
+#define __com_sun_star_io_ObjectInputStream_idl__ 
+ 
+#ifndef __com_sun_star_io_XObjectInputStream_idl__ 
+#include <com/sun/star/io/XObjectInputStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XActiveDataSink_idl__ 
+#include <com/sun/star/io/XActiveDataSink.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XConnectable_idl__ 
+#include <com/sun/star/io/XConnectable.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XMarkableStream_idl__ 
+#include <com/sun/star/io/XMarkableStream.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::io::ObjectInputStream
 /** is a stream which allows reading the data of persistent objects.
-
-    <p>Implementations of this service must fulfill the specifications of the
-    <type>DataInputStream</type> service. It must be chained to an
-    <type>XMarkableStream</type>. Therefore, it provides the
-    <type>XMarkableStream</type> interface, and delegates the calls to the
+    
+    <p>Implementations of this service must fulfill the specifications of the 
+    <type>DataInputStream</type> service. It must be chained to an 
+    <type>XMarkableStream</type>. Therefore, it provides the 
+    <type>XMarkableStream</type> interface, and delegates the calls to the 
     chained object.  </p>
     <p>The written objects are held until this instance is destroyed.
     The references to the objects are read as four-byte integers.
@@ -70,7 +70,7 @@
     Object  ObjectData       // the data of the object
     ...                      // skipping additional data
     </pre>
-
+    
     @guarantees
     <ul>
         <li>-thread safe</li>
@@ -82,28 +82,28 @@
     </ul>
  */
 published service ObjectInputStream
-{
+{ 
     /** allows to read the data from the stream.
      */
-    interface com::sun::star::io::XObjectInputStream;
-
+    interface com::sun::star::io::XObjectInputStream; 
+    
     /** allows to set the underlying inputstream */
-    interface com::sun::star::io::XActiveDataSink;
-
+    interface com::sun::star::io::XActiveDataSink; 
+    
     /** allows to navigate via a chain of streams */
-    interface com::sun::star::io::XConnectable;
-
+    interface com::sun::star::io::XConnectable; 
+    
     /** allows to set marks within the stream. The implementation
      may forward calls to this interface to a chained markablestream. */
-    interface com::sun::star::io::XMarkableStream;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    interface com::sun::star::io::XMarkableStream; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/ObjectOutputStream.idl b/udkapi/com/sun/star/io/ObjectOutputStream.idl
index 3669db12b723..7f7cea2f7ad9 100644
--- a/udkapi/com/sun/star/io/ObjectOutputStream.idl
+++ b/udkapi/com/sun/star/io/ObjectOutputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_ObjectOutputStream_idl__
-#define __com_sun_star_io_ObjectOutputStream_idl__
-
-#ifndef __com_sun_star_io_XObjectOutputStream_idl__
-#include <com/sun/star/io/XObjectOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
-#include <com/sun/star/io/XActiveDataSource.idl>
-#endif
-
-#ifndef __com_sun_star_io_XConnectable_idl__
-#include <com/sun/star/io/XConnectable.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_ObjectOutputStream_idl__ 
+#define __com_sun_star_io_ObjectOutputStream_idl__ 
+ 
+#ifndef __com_sun_star_io_XObjectOutputStream_idl__ 
+#include <com/sun/star/io/XObjectOutputStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XActiveDataSource_idl__ 
+#include <com/sun/star/io/XActiveDataSource.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XConnectable_idl__ 
+#include <com/sun/star/io/XConnectable.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::io::ObjectOutputStream
 /** is a stream which allows writing the data of persistent objects.
-
-    <p>Implementations of this service must fulfill the specifications of the
-    <type>DataOutputStream</type> service; futhermore, the stream needs to be chained to a
+    
+    <p>Implementations of this service must fulfill the specifications of the 
+    <type>DataOutputStream</type> service; futhermore, the stream needs to be chained to a 
     <type>XMarkableStream</type>. Therefore, it also provides the <type>XMarkableStream</type>
     interface, but it delegates the calls to the chained object.
     The written objects are held until this instance is destroyed.
-    The references to the objects are written as four-byte integers
+    The references to the objects are written as four-byte integers 
     and begin at 1. Data format is written: </p>
     <pre>
     short   InfoLength
@@ -63,34 +63,34 @@ module com {  module sun {  module star {  module io {
     long    ObjectLength    // 0 if it is a reference or no object, otherwise the len of the object data
     Object  ObjectData      // the data of the object
     </pre>
-
+    
     @garantees
     <ul>
         <li>-thread safe </li>
-        <li>-allow buffer size is 2 ^ 31 -1 </li>
-        <li>-maximum object reference identifier is the number of objects.  </li>
+        <li>-allow buffer size is 2 ^ 31 -1 </li> 
+        <li>-maximum object reference identifier is the number of objects.  </li> 
         <li>-object reference identifier 0 indicates no object </li>
     </ul>
  */
 published service ObjectOutputStream
-{
+{ 
     /** allows to write the data to the stream.
      */
-    interface com::sun::star::io::XObjectOutputStream;
-
+    interface com::sun::star::io::XObjectOutputStream; 
+    
     /** allows to set the underlying outputstream */
-    interface com::sun::star::io::XActiveDataSource;
-
+    interface com::sun::star::io::XActiveDataSource; 
+    
     /** allows to navigate via a chain of streams */
-    interface com::sun::star::io::XConnectable;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    interface com::sun::star::io::XConnectable; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/Pipe.idl b/udkapi/com/sun/star/io/Pipe.idl
index 256f6357a447..fa67dd98912e 100644
--- a/udkapi/com/sun/star/io/Pipe.idl
+++ b/udkapi/com/sun/star/io/Pipe.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_Pipe_idl__
-#define __com_sun_star_io_Pipe_idl__
-
-#ifndef __com_sun_star_io_XOutputStream_idl__
-#include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
-#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_Pipe_idl__ 
+#define __com_sun_star_io_Pipe_idl__ 
+ 
+#ifndef __com_sun_star_io_XOutputStream_idl__ 
+#include <com/sun/star/io/XOutputStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XInputStream_idl__ 
+#include <com/sun/star/io/XInputStream.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::io::Pipe
-/** the implementation of an output stream and an input stream.
+/** the implementation of an output stream and an input stream. 
     <p>
-    All data written through the outputstream is buffered until it is
+    All data written through the outputstream is buffered until it is 
     read again from the input stream. Often two different threads access
     input and outputstream.
 
@@ -53,20 +53,20 @@ module com {  module sun {  module star {  module io {
     input stream at the cost of an additional buffer.
  */
 published service Pipe
-{
+{ 
     // DocMerge: empty anyway
-    interface com::sun::star::io::XOutputStream;
-
+    interface com::sun::star::io::XOutputStream; 
+    
     // DocMerge: empty anyway
-    interface com::sun::star::io::XInputStream;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    interface com::sun::star::io::XInputStream; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/Pump.idl b/udkapi/com/sun/star/io/Pump.idl
index 7e52e917d979..9b935cf34306 100644
--- a/udkapi/com/sun/star/io/Pump.idl
+++ b/udkapi/com/sun/star/io/Pump.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,55 +24,55 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_Pipe_idl__
-#define __com_sun_star_io_Pipe_idl__
-
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
-#include <com/sun/star/io/XActiveDataSource.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
-#include <com/sun/star/io/XActiveDataSink.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataControl_idl__
-#include <com/sun/star/io/XActiveDataControl.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_Pipe_idl__ 
+#define __com_sun_star_io_Pipe_idl__ 
+ 
+#ifndef __com_sun_star_io_XActiveDataSource_idl__ 
+#include <com/sun/star/io/XActiveDataSource.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XActiveDataSink_idl__ 
+#include <com/sun/star/io/XActiveDataSink.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XActiveDataControl_idl__ 
+#include <com/sun/star/io/XActiveDataControl.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::io::Pump
 /** the implementation of a data source and a data sink.
     <p>A thread will be created that reads from the input stream and writes
     the data to the connected output stream. Data will not be buffered by
     this service. </p>
-
+    
  */
 published service Pump
-{
+{ 
     /** allows to set the outputstream
      */
-    interface com::sun::star::io::XActiveDataSource;
-
+    interface com::sun::star::io::XActiveDataSource; 
+    
     /** allows to set the inputstream
      */
-    interface com::sun::star::io::XActiveDataSink;
+    interface com::sun::star::io::XActiveDataSink; 
 
     /** allows listener administration and starting/stopping the pump */
-    interface com::sun::star::io::XActiveDataControl;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    interface com::sun::star::io::XActiveDataControl; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/SequenceInputStream.idl b/udkapi/com/sun/star/io/SequenceInputStream.idl
index e480b280c0bd..915e94fd335a 100644
--- a/udkapi/com/sun/star/io/SequenceInputStream.idl
+++ b/udkapi/com/sun/star/io/SequenceInputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_SequenceInputStream_idl__
-#define __com_sun_star_io_SequenceInputStream_idl__
-
-#ifndef __com_sun_star_io_XSeekableInputStream_idl__
-#include <com/sun/star/io/XSeekableInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_SequenceInputStream_idl__ 
+#define __com_sun_star_io_SequenceInputStream_idl__ 
+ 
+#ifndef __com_sun_star_io_XSeekableInputStream_idl__ 
+#include <com/sun/star/io/XSeekableInputStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::io::SequenceInputStream
 /** This service allows to wrap a sequence of bytes with a stream object.
  */
 published service SequenceInputStream : XSeekableInputStream
-{
+{ 
     /** allows to create a stream based on the sequence.
      */
     createStreamFromSequence( [in] sequence<byte> aData );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/SequenceOutputStream.idl b/udkapi/com/sun/star/io/SequenceOutputStream.idl
index 7822ac991004..8e3959b4fe7d 100644
--- a/udkapi/com/sun/star/io/SequenceOutputStream.idl
+++ b/udkapi/com/sun/star/io/SequenceOutputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,17 +32,17 @@
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module io {
 
-//=============================================================================
+//============================================================================= 
 /** This service allows to wrap a sequence of bytes with a output stream object.
  */
 service SequenceOutputStream : XSequenceOutputStream;
-
-//=============================================================================
+ 
+//============================================================================= 
 
 }; }; }; };
 
-#endif
+#endif 
diff --git a/udkapi/com/sun/star/io/SocketException.idl b/udkapi/com/sun/star/io/SocketException.idl
index 2d53f43c0579..7bc42bd74239 100644
--- a/udkapi/com/sun/star/io/SocketException.idl
+++ b/udkapi/com/sun/star/io/SocketException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_SocketException_idl__
-#define __com_sun_star_io_SocketException_idl__
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_SocketException_idl__ 
+#define __com_sun_star_io_SocketException_idl__ 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+  
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::io::SocketException
-/** Thrown to indicate that there is an error in the underlying
+/** Thrown to indicate that there is an error in the underlying 
     protocol, such as a TCP error.
  */
 exception SocketException: com::sun::star::io::IOException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/TempFile.idl b/udkapi/com/sun/star/io/TempFile.idl
index 84d16e362db0..5c8306708d63 100644
--- a/udkapi/com/sun/star/io/TempFile.idl
+++ b/udkapi/com/sun/star/io/TempFile.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/io/TextInputStream.idl b/udkapi/com/sun/star/io/TextInputStream.idl
index 6f5e8dd00ac5..1fe30d1daefe 100644
--- a/udkapi/com/sun/star/io/TextInputStream.idl
+++ b/udkapi/com/sun/star/io/TextInputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_TextInputStream_idl__
-#define __com_sun_star_io_TextInputStream_idl__
-
-#ifndef __com_sun_star_io_XTextInputStream_idl__
-#include <com/sun/star/io/XTextInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
-#include <com/sun/star/io/XActiveDataSink.idl>
-#endif
-
-#ifndef __com_sun_star_io_XConnectable_idl__
-#include <com/sun/star/io/XConnectable.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-/** provides functionality to read text data from a
-    <type scope="com::sun::star::io">XInputStream</type>
+#ifndef __com_sun_star_io_TextInputStream_idl__ 
+#define __com_sun_star_io_TextInputStream_idl__ 
+ 
+#ifndef __com_sun_star_io_XTextInputStream_idl__ 
+#include <com/sun/star/io/XTextInputStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XActiveDataSink_idl__ 
+#include <com/sun/star/io/XActiveDataSink.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XConnectable_idl__ 
+#include <com/sun/star/io/XConnectable.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+/** provides functionality to read text data from a 
+    <type scope="com::sun::star::io">XInputStream</type> 
     that initially has to be passed to the method
     <member>XActiveDataSink::setInputStream()</member>.
-
-    <p>For details about the text functionality see
+    
+    <p>For details about the text functionality see 
     <type scope="com::sun::star::io">XTextInputStream</type>.
  */
 published service TextInputStream
-{
+{ 
     /// Interface to read text data
-    interface com::sun::star::io::XTextInputStream;
-
-    /// Interface to specify the used <type scope="com::sun::star::io">XInputStream</type>
-    interface com::sun::star::io::XActiveDataSink;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::io::XTextInputStream; 
+    
+    /// Interface to specify the used <type scope="com::sun::star::io">XInputStream</type> 
+    interface com::sun::star::io::XActiveDataSink; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/io/TextOutputStream.idl b/udkapi/com/sun/star/io/TextOutputStream.idl
index 879b58070580..93437070c561 100644
--- a/udkapi/com/sun/star/io/TextOutputStream.idl
+++ b/udkapi/com/sun/star/io/TextOutputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_TextOutputStream_idl__
-#define __com_sun_star_io_TextOutputStream_idl__
-
-#ifndef __com_sun_star_io_XTextOutputStream_idl__
-#include <com/sun/star/io/XTextOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
-#include <com/sun/star/io/XActiveDataSource.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
+#ifndef __com_sun_star_io_TextOutputStream_idl__ 
+#define __com_sun_star_io_TextOutputStream_idl__ 
+ 
+#ifndef __com_sun_star_io_XTextOutputStream_idl__ 
+#include <com/sun/star/io/XTextOutputStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XActiveDataSource_idl__ 
+#include <com/sun/star/io/XActiveDataSource.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
 /** provides functionality to write text data to a
-    <type scope="com::sun::star::io">XOutputStream</type>
+    <type scope="com::sun::star::io">XOutputStream</type> 
     that initially has to be passed to the method
     <member>XActiveDataSource::setOutputStream()</member>.
-
-    <p>For details about the text functionality see
+    
+    <p>For details about the text functionality see 
     <type scope="com::sun::star::io">XTextOutputStream</type>.
  */
 published service TextOutputStream
-{
+{ 
     /// Interface to write text data
-    interface com::sun::star::io::XTextOutputStream;
-
-    /// Interface to specify the used <type scope="com::sun::star::io">XOutputStream</type>
-    interface com::sun::star::io::XActiveDataSource;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::io::XTextOutputStream; 
+    
+    /// Interface to specify the used <type scope="com::sun::star::io">XOutputStream</type> 
+    interface com::sun::star::io::XActiveDataSource; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/io/UnexpectedEOFException.idl b/udkapi/com/sun/star/io/UnexpectedEOFException.idl
index 234174a69c32..f26763934813 100644
--- a/udkapi/com/sun/star/io/UnexpectedEOFException.idl
+++ b/udkapi/com/sun/star/io/UnexpectedEOFException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_UnexpectedEOFException_idl__
-#define __com_sun_star_io_UnexpectedEOFException_idl__
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_UnexpectedEOFException_idl__ 
+#define __com_sun_star_io_UnexpectedEOFException_idl__ 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::io::UnexpectedEOFException
-/** is thrown when the <code>EOF/code> is reached during reading a datatype
+/** is thrown when the <code>EOF/code> is reached during reading a datatype 
     (<code>long</code>, <code>string</code>, etc.).
  */
 published exception UnexpectedEOFException: com::sun::star::io::IOException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/UnknownHostException.idl b/udkapi/com/sun/star/io/UnknownHostException.idl
index 6cb2cf423b5c..3b25f3f5a265 100644
--- a/udkapi/com/sun/star/io/UnknownHostException.idl
+++ b/udkapi/com/sun/star/io/UnknownHostException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_UnknownHostException_idl__
-#define __com_sun_star_io_UnknownHostException_idl__
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_UnknownHostException_idl__ 
+#define __com_sun_star_io_UnknownHostException_idl__ 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::io::UnknownHostException
 /** is thrown when the IP address of a host could not be determined.
  */
 exception UnknownHostException: com::sun::star::io::IOException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/WrongFormatException.idl b/udkapi/com/sun/star/io/WrongFormatException.idl
index 8be8f31c2c1c..00ee9dd3dbde 100644
--- a/udkapi/com/sun/star/io/WrongFormatException.idl
+++ b/udkapi/com/sun/star/io/WrongFormatException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_WrongFormatException_idl__
-#define __com_sun_star_io_WrongFormatException_idl__
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_WrongFormatException_idl__ 
+#define __com_sun_star_io_WrongFormatException_idl__ 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::io::WrongFormatException
 /** is thrown when inconsistent data comes up while reading a complex
     data type (<code>string</code> or object).
  */
 published exception WrongFormatException: com::sun::star::io::IOException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XActiveDataControl.idl b/udkapi/com/sun/star/io/XActiveDataControl.idl
index 9e53a38b3d44..f8726c2b99cf 100644
--- a/udkapi/com/sun/star/io/XActiveDataControl.idl
+++ b/udkapi/com/sun/star/io/XActiveDataControl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,56 +24,56 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XActiveDataControl_idl__
-#define __com_sun_star_io_XActiveDataControl_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStreamListener_idl__
-#include <com/sun/star/io/XStreamListener.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XActiveDataControl_idl__ 
+#define __com_sun_star_io_XActiveDataControl_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XStreamListener_idl__ 
+#include <com/sun/star/io/XStreamListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::io::XActiveDataControl
 /** makes it possible to control an active data source.
-
+    
     <p>This interface should be supported by objects which implement
     <type>XActiveDataSource</type> or <type>XActiveDataSink</type>.</p>
  */
 published interface XActiveDataControl: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XActiveDataControl::addListener
     /** registers an object to receive events from this data source.
        <p>It is suggested to allow multiple registration of the same listener,
         thus for each time a listener is added, it has to be removed.
      */
-    void addListener( [in] com::sun::star::io::XStreamListener aListener );
-
-    //-------------------------------------------------------------------------
-
+    void addListener( [in] com::sun::star::io::XStreamListener aListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XActiveDataControl::removeListener
     /** unregisters an object to receive events from this data source.
 
        <p>It is suggested to allow multiple registration of the same listener,
         thus for each time a listener is added, it has to be removed.
      */
-    void removeListener( [in] com::sun::star::io::XStreamListener aListener );
-
-    //-------------------------------------------------------------------------
-
+    void removeListener( [in] com::sun::star::io::XStreamListener aListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XActiveDataControl::start
     /** starts I/O.
-
+        
         <p>Either <member>XActiveDataControl::setInputStream()</member> or
         <member>XActiveDataControl::setOutputStream()</member> must be called beforehand.
         </p>
@@ -81,27 +81,27 @@ published interface XActiveDataControl: com::sun::star::uno::XInterface
         <p>This method does not block the thread, so reading is
         generally not finished when the method returns. </p>
      */
-    void start();
-
-    //-------------------------------------------------------------------------
-
+    void start(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XActiveDataControl::terminate
-    /** does a weak abort.
-
+    /** does a weak abort. 
+        
         <p>It closes all connected resources and calls
         <member>XInputStream::close</member> or
-        <member>XOutputStream::close</member> and fires the
+        <member>XOutputStream::close</member> and fires the 
         <member>XStreamListener::terminated</member>-event.</p>
      */
-    void terminate();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void terminate(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XActiveDataSink.idl b/udkapi/com/sun/star/io/XActiveDataSink.idl
index 3602e4d7c538..06c8b43d6712 100644
--- a/udkapi/com/sun/star/io/XActiveDataSink.idl
+++ b/udkapi/com/sun/star/io/XActiveDataSink.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,58 +24,58 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XActiveDataSink_idl__
-#define __com_sun_star_io_XActiveDataSink_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XInputStream_idl__
-#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XActiveDataSink_idl__ 
+#define __com_sun_star_io_XActiveDataSink_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XInputStream_idl__ 
+#include <com/sun/star/io/XInputStream.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::io::XActiveDataSink
 /** makes it possible to read the corresponding object from an input stream.
-
-    <p>If you want to allow control from outside, also implement the
+    
+    <p>If you want to allow control from outside, also implement the 
     <type>XActiveDataControl</type> interface. </p>
  */
 published interface XActiveDataSink: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XActiveDataSink::setInputStream
-    /** plugs the input stream.
-
+    /** plugs the input stream. 
+        
         <p>If <type>XConnectable</type> is also implemented, this
         method should query <var>aStream</var> for an
         <type>XConnectable</type> and connect both.</p>
      */
-    void setInputStream( [in] com::sun::star::io::XInputStream aStream );
-
-    //-------------------------------------------------------------------------
-
+    void setInputStream( [in] com::sun::star::io::XInputStream aStream ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::io::XActiveDataSink::getInputStream
-    /** @returns
+    /** @returns  
                 the plugged stream.
      */
-    com::sun::star::io::XInputStream getInputStream();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::io::XInputStream getInputStream(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XActiveDataSource.idl b/udkapi/com/sun/star/io/XActiveDataSource.idl
index 441dedf5f371..7d00e2ec2653 100644
--- a/udkapi/com/sun/star/io/XActiveDataSource.idl
+++ b/udkapi/com/sun/star/io/XActiveDataSource.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,58 +24,58 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
-#define __com_sun_star_io_XActiveDataSource_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XOutputStream_idl__
-#include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XActiveDataSource_idl__ 
+#define __com_sun_star_io_XActiveDataSource_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XOutputStream_idl__ 
+#include <com/sun/star/io/XOutputStream.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::io::XActiveDataSource
 /** has to be implemented if the class should be able to write into an output
     stream.
     @see XActiveDataControl.
  */
 published interface XActiveDataSource: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XActiveDataSource::setOutputStream
-    /** plugs the output stream.
-
+    /** plugs the output stream. 
+        
         <p>If <type>XConnectable</type> is also implemented, this
         method should query <var>aStream</var> for a
         <type>XConnectable</type> and connect both.
         </p>
      */
-    void setOutputStream( [in] com::sun::star::io::XOutputStream aStream );
-
-    //-------------------------------------------------------------------------
-
+    void setOutputStream( [in] com::sun::star::io::XOutputStream aStream ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::io::XActiveDataSource::getOutputStream
-    /** @returns
+    /** @returns  
                 the plugged stream.
      */
-    com::sun::star::io::XOutputStream getOutputStream();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::io::XOutputStream getOutputStream(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XActiveDataStreamer.idl b/udkapi/com/sun/star/io/XActiveDataStreamer.idl
index 686981525d90..55b7ff103bb0 100644
--- a/udkapi/com/sun/star/io/XActiveDataStreamer.idl
+++ b/udkapi/com/sun/star/io/XActiveDataStreamer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,59 +24,59 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XActiveDataStreamer_idl__
-#define __com_sun_star_io_XActiveDataStreamer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XStream_idl__
-#include <com/sun/star/io/XStream.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XActiveDataStreamer_idl__ 
+#define __com_sun_star_io_XActiveDataStreamer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XStream_idl__ 
+#include <com/sun/star/io/XStream.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::io::XActiveDataStreamer
 /** makes it possible to read and write the corresponding stream.
-
-
-    <p>If you want to allow control from outside, also implement the
+    
+    
+    <p>If you want to allow control from outside, also implement the 
     <type>XActiveDataControl</type> interface. </p>
  */
 published interface XActiveDataStreamer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XActiveDataStreamer::setStream
-    /** plugs the input/output stream.
-
+    /** plugs the input/output stream. 
+        
         <p>If <type>XConnectable</type> is also implemented, this
         method should query <var>aStream</var> for a
         <type>XConnectable</type> and connect both.</p>
      */
-    void setStream( [in] com::sun::star::io::XStream aStream );
-
-    //-------------------------------------------------------------------------
-
+    void setStream( [in] com::sun::star::io::XStream aStream ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::io::XActiveDataStreamer::getStream
-    /** @returns
+    /** @returns  
                 the plugged stream.
      */
-    com::sun::star::io::XStream getStream();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::io::XStream getStream(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl b/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl
index aa5a0ba1802c..ca064817c846 100644
--- a/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl
+++ b/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/io/XConnectable.idl b/udkapi/com/sun/star/io/XConnectable.idl
index 8286e5add4af..0570d1d19e34 100644
--- a/udkapi/com/sun/star/io/XConnectable.idl
+++ b/udkapi/com/sun/star/io/XConnectable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XConnectable_idl__
-#define __com_sun_star_io_XConnectable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XConnectable_idl__ 
+#define __com_sun_star_io_XConnectable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::io::XConnectable
 /** makes it possible to connect data sinks and sources.
-
+    
     <p>The predecessor-member is the element in the connection that is
     nearer to the source of the data. The successor-member is the element
     that is further away from the source of the data. (Note that this
@@ -51,44 +51,44 @@
     arbitrary elements of a connection.</p>
  */
 published interface XConnectable: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XConnectable::setPredecessor
     /** sets the source of the data flow for this object.
      */
-    void setPredecessor( [in] com::sun::star::io::XConnectable aPredecessor );
-
-    //-------------------------------------------------------------------------
-
+    void setPredecessor( [in] com::sun::star::io::XConnectable aPredecessor ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::io::XConnectable::getPredecessor
-    /** @returns
+    /** @returns  
             the predecessor of this object.
      */
-    com::sun::star::io::XConnectable getPredecessor();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::io::XConnectable getPredecessor(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XConnectable::setSuccessor
     /** sets the sink of the data flow for this object.
      */
-    void setSuccessor( [in] com::sun::star::io::XConnectable aSuccessor );
-
-    //-------------------------------------------------------------------------
-
+    void setSuccessor( [in] com::sun::star::io::XConnectable aSuccessor ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::io::XConnectable::getSuccessor
-    /** @returns
+    /** @returns  
             the successor of this object.
      */
-    com::sun::star::io::XConnectable getSuccessor();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::io::XConnectable getSuccessor(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XDataExporter.idl b/udkapi/com/sun/star/io/XDataExporter.idl
index 672342a8a7a9..83967f5ccad2 100644
--- a/udkapi/com/sun/star/io/XDataExporter.idl
+++ b/udkapi/com/sun/star/io/XDataExporter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,63 +24,63 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XDataExporter_idl__
-#define __com_sun_star_io_XDataExporter_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XOutputStream_idl__
-#include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_io_XDataTransferEventListener_idl__
-#include <com/sun/star/io/XDataTransferEventListener.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XDataExporter_idl__ 
+#define __com_sun_star_io_XDataExporter_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XOutputStream_idl__ 
+#include <com/sun/star/io/XOutputStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XDataTransferEventListener_idl__ 
+#include <com/sun/star/io/XDataTransferEventListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::io::XDataExporter
 /** makes it possible to export data from a component into a data sink.
-
+    
     <p>Exporter objects are registered for specific components and data types.
     </p>
  */
 published interface XDataExporter: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataExporter::exportData
     /** exports data for a component into an output stream.
      */
-    [oneway] void exportData( [in] com::sun::star::io::XOutputStream aOutputStream,
-             [in] com::sun::star::lang::XComponent Component,
-             [in] com::sun::star::io::XDataTransferEventListener aListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void exportData( [in] com::sun::star::io::XOutputStream aOutputStream, 
+             [in] com::sun::star::lang::XComponent Component, 
+             [in] com::sun::star::io::XDataTransferEventListener aListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataExporter::cancel
     /** cancels the export process.
      */
-    [oneway] void cancel();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void cancel(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XDataImporter.idl b/udkapi/com/sun/star/io/XDataImporter.idl
index b395ad91ceb1..e22d2a7c2cda 100644
--- a/udkapi/com/sun/star/io/XDataImporter.idl
+++ b/udkapi/com/sun/star/io/XDataImporter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,62 +24,62 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XDataImporter_idl__
-#define __com_sun_star_io_XDataImporter_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_XActiveDataSource_idl__
-#include <com/sun/star/io/XActiveDataSource.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_io_XDataTransferEventListener_idl__
-#include <com/sun/star/io/XDataTransferEventListener.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XDataImporter_idl__ 
+#define __com_sun_star_io_XDataImporter_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XActiveDataSource_idl__ 
+#include <com/sun/star/io/XActiveDataSource.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XDataTransferEventListener_idl__ 
+#include <com/sun/star/io/XDataTransferEventListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::io::XDataImporter
 /** makes it possible to import data from a data source into a component.
-
+    
     <p>Importer objects are registered for specific components and data types.</p>
  */
 published interface XDataImporter: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataImporter::importData
     /** imports data for a component from an active data source.
      */
-    [oneway] void importData( [in] com::sun::star::io::XActiveDataSource aActiveSource,
-             [in] com::sun::star::lang::XComponent Component,
-             [in] com::sun::star::io::XDataTransferEventListener aListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void importData( [in] com::sun::star::io::XActiveDataSource aActiveSource, 
+             [in] com::sun::star::lang::XComponent Component, 
+             [in] com::sun::star::io::XDataTransferEventListener aListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataImporter::cancel
     /** cancels the import process.
      */
-    [oneway] void cancel();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void cancel(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XDataInputStream.idl b/udkapi/com/sun/star/io/XDataInputStream.idl
index fc5183e89acc..a33e1180a44c 100644
--- a/udkapi/com/sun/star/io/XDataInputStream.idl
+++ b/udkapi/com/sun/star/io/XDataInputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,111 +24,111 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XDataInputStream_idl__
-#define __com_sun_star_io_XDataInputStream_idl__
-
-#ifndef __com_sun_star_io_XInputStream_idl__
-#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XDataInputStream_idl__ 
+#define __com_sun_star_io_XDataInputStream_idl__ 
+ 
+#ifndef __com_sun_star_io_XInputStream_idl__ 
+#include <com/sun/star/io/XInputStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::io::XDataInputStream
 /** makes it possible to read machine-independent simple data types from a
     stream.
     @see com::sun::star::io::XDataOutputStream
  */
 published interface XDataInputStream: com::sun::star::io::XInputStream
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataInputStream::readBoolean
     /** reads in a boolean. It is an 8-bit value. 0 means FALSE; all
         other values mean TRUE.
      */
-    byte readBoolean()
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    byte readBoolean() 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataInputStream::readByte
     /** reads an 8-bit byte.
      */
-    byte readByte()
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    byte readByte() 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataInputStream::readChar
     /** reads a 16-bit unicode character.
      */
-    char readChar()
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    char readChar() 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataInputStream::readShort
     /** reads a 16-bit big endian integer.
      */
-    short readShort()
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    short readShort() 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataInputStream::readLong
     /** reads a 32-bit big endian integer.
      */
-    long readLong()
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    long readLong() 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataInputStream::readHyper
     /** reads a 64-bit big endian integer.
      */
-    hyper readHyper()
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    hyper readHyper() 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataInputStream::readFloat
     /** reads a 32-bit IEEE float.
      */
-    float readFloat()
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    float readFloat() 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataInputStream::readDouble
     /** reads a 64-bit IEEE double.
      */
-    double readDouble()
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    double readDouble() 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataInputStream::readUTF
     /** reads a string of UTF encoded characters.
      */
-    string readUTF()
-            raises( com::sun::star::io::IOException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    string readUTF() 
+            raises( com::sun::star::io::IOException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XDataOutputStream.idl b/udkapi/com/sun/star/io/XDataOutputStream.idl
index ab64c9920257..0cba07c0bd1d 100644
--- a/udkapi/com/sun/star/io/XDataOutputStream.idl
+++ b/udkapi/com/sun/star/io/XDataOutputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,111 +24,111 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XDataOutputStream_idl__
-#define __com_sun_star_io_XDataOutputStream_idl__
-
-#ifndef __com_sun_star_io_XOutputStream_idl__
-#include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XDataOutputStream_idl__ 
+#define __com_sun_star_io_XDataOutputStream_idl__ 
+ 
+#ifndef __com_sun_star_io_XOutputStream_idl__ 
+#include <com/sun/star/io/XOutputStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::io::XDataOutputStream
 /** makes it possible to write machine-independent simple data types to a
     stream.
     @see com::sun::star::io::XDataInputStream
  */
 published interface XDataOutputStream: com::sun::star::io::XOutputStream
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataOutputStream::writeBoolean
     /** writes a boolean. It is an 8-bit value. 0 means FALSE; all other
         values mean TRUE.
      */
-    void writeBoolean( [in] boolean Value )
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    void writeBoolean( [in] boolean Value ) 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataOutputStream::writeByte
     /** writes an 8-bit byte.
      */
-    void writeByte( [in] byte Value )
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    void writeByte( [in] byte Value ) 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataOutputStream::writeChar
     /** writes a 16-bit character.
      */
-    void writeChar( [in] char Value )
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    void writeChar( [in] char Value ) 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataOutputStream::writeShort
     /** writes a 16-bit big endian integer.
      */
-    void writeShort( [in] short Value )
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    void writeShort( [in] short Value ) 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataOutputStream::writeLong
     /** writes a 32-bit big endian integer.
      */
-    void writeLong( [in] long Value )
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    void writeLong( [in] long Value ) 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataOutputStream::writeHyper
     /** writes a 64-bit big endian integer.
      */
-    void writeHyper( [in] hyper Value )
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    void writeHyper( [in] hyper Value ) 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataOutputStream::writeFloat
     /** writes a 32-bit IEEE float.
      */
-    void writeFloat( [in] float Value )
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    void writeFloat( [in] float Value ) 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataOutputStream::writeDouble
     /** writes a 64-bit IEEE double.
      */
-    void writeDouble( [in] double Value )
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    void writeDouble( [in] double Value ) 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataOutputStream::writeUTF
     /** writes a string in UTF format.
      */
-    void writeUTF( [in] string Value )
-            raises( com::sun::star::io::IOException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void writeUTF( [in] string Value ) 
+            raises( com::sun::star::io::IOException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XDataTransferEventListener.idl b/udkapi/com/sun/star/io/XDataTransferEventListener.idl
index 2cc7d83a9e73..7d805211cd52 100644
--- a/udkapi/com/sun/star/io/XDataTransferEventListener.idl
+++ b/udkapi/com/sun/star/io/XDataTransferEventListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,50 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XDataTransferEventListener_idl__
-#define __com_sun_star_io_XDataTransferEventListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_io_DataTransferEvent_idl__
-#include <com/sun/star/io/DataTransferEvent.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XDataTransferEventListener_idl__ 
+#define __com_sun_star_io_XDataTransferEventListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_DataTransferEvent_idl__ 
+#include <com/sun/star/io/DataTransferEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::io::XDataTransferEventListener
 /** is used to receive callbacks from an importer or exporter.
  */
 published interface XDataTransferEventListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataTransferEventListener::finished
     /** is called when an import or export process has finished.
      */
-    [oneway] void finished( [in] com::sun::star::io::DataTransferEvent aEvent );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void finished( [in] com::sun::star::io::DataTransferEvent aEvent ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XDataTransferEventListener::cancelled
     /** is called when an import or export process has been cancelled.
      */
-    [oneway] void cancelled( [in] com::sun::star::io::DataTransferEvent aEvent );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void cancelled( [in] com::sun::star::io::DataTransferEvent aEvent ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XInputStream.idl b/udkapi/com/sun/star/io/XInputStream.idl
index 2ebbde5d61b1..370c47497343 100644
--- a/udkapi/com/sun/star/io/XInputStream.idl
+++ b/udkapi/com/sun/star/io/XInputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XInputStream_idl__
-#define __com_sun_star_io_XInputStream_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_NotConnectedException_idl__
-#include <com/sun/star/io/NotConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_BufferSizeExceededException_idl__
-#include <com/sun/star/io/BufferSizeExceededException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XInputStream_idl__ 
+#define __com_sun_star_io_XInputStream_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_NotConnectedException_idl__ 
+#include <com/sun/star/io/NotConnectedException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_BufferSizeExceededException_idl__ 
+#include <com/sun/star/io/BufferSizeExceededException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::io::XInputStream
 /** This is the basic interface to read data from a stream.
     <p>
@@ -53,15 +53,15 @@ module com {  module sun {  module star {  module io {
     streaming document</a> for further information on chaining and piping streams.
  */
 published interface XInputStream: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XInputStream::readBytes
-    /** reads the specified number of bytes in the given sequence.
-
-        <p>The return value specifies the number of bytes which have been
-        put into the sequence. A difference between <var>nBytesToRead</var>
-        and the return value indicates that EOF has been reached. This means
+    /** reads the specified number of bytes in the given sequence. 
+        
+        <p>The return value specifies the number of bytes which have been 
+        put into the sequence. A difference between <var>nBytesToRead</var> 
+        and the return value indicates that EOF has been reached. This means 
         that the method blocks until the specified number of bytes are
         available or the EOF is reached.  </p>
        @param aData
@@ -69,7 +69,7 @@ published interface XInputStream: com::sun::star::uno::XInterface
              of bytes (or less as a sign of EOF).
 
              <p>
-             C++ only : Note that for unbridged (e.g., in-process)
+             C++ only : Note that for unbridged (e.g., in-process) 
              calls, using the same sequence for repetive readBytes()-calls
              can bear a performance advantage. The callee can put the data
              directly into the sequence so that no buffer reallocation is
@@ -92,18 +92,18 @@ published interface XInputStream: com::sun::star::uno::XInterface
          @param nBytesToRead
         the total number of bytes to read
      */
-    long readBytes( [out] sequence<byte> aData,
-             [in] long nBytesToRead )
-            raises( com::sun::star::io::NotConnectedException,
-                    com::sun::star::io::BufferSizeExceededException,
-                    com::sun::star::io::IOException);
-
-    //-------------------------------------------------------------------------
-
+    long readBytes( [out] sequence<byte> aData, 
+             [in] long nBytesToRead ) 
+            raises( com::sun::star::io::NotConnectedException, 
+                    com::sun::star::io::BufferSizeExceededException, 
+                    com::sun::star::io::IOException); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XInputStream::readSomeBytes
     /** reads the available number of bytes, at maximum
-        <var>nMaxBytesToRead</var>.
-
+        <var>nMaxBytesToRead</var>. 
+        
         <p>This method is very similar to the readBytes method, except that
            it has different blocking behaviour.
            The method blocks as long as at least 1 byte is available or
@@ -116,62 +116,62 @@ published interface XInputStream: com::sun::star::uno::XInterface
                                stream during the call.
         @see com::sun::star::io::XInputStream::readBytes
      */
-    long readSomeBytes( [out] sequence<byte> aData,
-             [in] long nMaxBytesToRead )
-            raises( com::sun::star::io::NotConnectedException,
-                    com::sun::star::io::BufferSizeExceededException,
-                    com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    long readSomeBytes( [out] sequence<byte> aData, 
+             [in] long nMaxBytesToRead ) 
+            raises( com::sun::star::io::NotConnectedException, 
+                    com::sun::star::io::BufferSizeExceededException, 
+                    com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XInputStream::skipBytes
-    /** skips the next <var>nBytesToSkip</var> bytes (must be positive).
-
+    /** skips the next <var>nBytesToSkip</var> bytes (must be positive). 
+        
         <p>It is up to the implementation whether this method is
         blocking the thread or not.  </p>
       @param nBytesToSkip
         number of bytes to skip
      */
-    void skipBytes( [in] long nBytesToSkip )
-            raises( com::sun::star::io::NotConnectedException,
-                    com::sun::star::io::BufferSizeExceededException,
-                    com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    void skipBytes( [in] long nBytesToSkip ) 
+            raises( com::sun::star::io::NotConnectedException, 
+                    com::sun::star::io::BufferSizeExceededException, 
+                    com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XInputStream::available
-    /** states how many bytes can be read or skipped without blocking.
-
+    /** states how many bytes can be read or skipped without blocking. 
+        
         <p>Note: This method offers no information on whether the EOF
         has been reached.  </p>
      */
-    long available()
-            raises( com::sun::star::io::NotConnectedException,
-                    com::sun::star::io::IOException
-                    );
-
-    //-------------------------------------------------------------------------
-
+    long available() 
+            raises( com::sun::star::io::NotConnectedException, 
+                    com::sun::star::io::IOException  
+                    ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XInputStream::closeInput
-    /** closes the stream.
-
+    /** closes the stream. 
+        
         <p>Users must close the stream explicitly when no further
         reading should be done. (There may exist ring references to
         chained objects that can only be released during this call.
         Thus not calling this method would result in a leak of memory or
         external resources.) </p>
      */
-    void closeInput()
-            raises( com::sun::star::io::NotConnectedException,
-                    com::sun::star::io::IOException);
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void closeInput() 
+            raises( com::sun::star::io::NotConnectedException, 
+                    com::sun::star::io::IOException); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XInputStreamProvider.idl b/udkapi/com/sun/star/io/XInputStreamProvider.idl
index f45aae34fb06..16495296d5a6 100644
--- a/udkapi/com/sun/star/io/XInputStreamProvider.idl
+++ b/udkapi/com/sun/star/io/XInputStreamProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XInputStreamProvider_idl__
-#define __com_sun_star_io_XInputStreamProvider_idl__
-
-#ifndef __com_sun_star_io_XInputStream_idl__
-#include <com/sun/star/io/XInputStream.idl>
+#ifndef __com_sun_star_io_XInputStreamProvider_idl__ 
+#define __com_sun_star_io_XInputStreamProvider_idl__ 
+ 
+#ifndef __com_sun_star_io_XInputStream_idl__ 
+#include <com/sun/star/io/XInputStream.idl> 
 #endif
 
-//=============================================================================
-
+//============================================================================= 
+ 
 module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
 /** Interface for providing an input stream.
 
-    <p>Every time createInputStream() is called a new input stream
+    <p>Every time createInputStream() is called a new input stream 
     is returned, always pointing to the begin of the same data. All
     input streams returned by <member>createInputStream()</member>
     are completely independend from each other.</p>
 */
 published interface XInputStreamProvider : com::sun::star::uno::XInterface
 {
-    /** Creates a new input stream, every time providing
+    /** Creates a new input stream, every time providing 
         the same data.
-
+        
         @return
                 a new input stream
     */
-    com::sun::star::io::XInputStream createInputStream();
+    com::sun::star::io::XInputStream createInputStream(); 
 };
-
+ 
 }; }; }; };
 
-#endif
+#endif 
diff --git a/udkapi/com/sun/star/io/XMarkableStream.idl b/udkapi/com/sun/star/io/XMarkableStream.idl
index 856b01cef2bf..331b3dcca854 100644
--- a/udkapi/com/sun/star/io/XMarkableStream.idl
+++ b/udkapi/com/sun/star/io/XMarkableStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,104 +24,104 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XMarkableStream_idl__
-#define __com_sun_star_io_XMarkableStream_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XMarkableStream_idl__ 
+#define __com_sun_star_io_XMarkableStream_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::io::XMarkableStream
 /** makes it possible to set and remove seekable marks to a stream.
  */
 published interface XMarkableStream: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XMarkableStream::createMark
     /** creates a mark of the current postion and returns an identifier to it.
      */
-    long createMark()
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    long createMark() 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XMarkableStream::deleteMark
-    /** deletes the mark that you previously created with
+    /** deletes the mark that you previously created with 
         <member>XMarkableStream::createMark</member>.
-
+        
         <p>It is an error to delete a mark if other marks after this
         exist.  In this case, for reasons of robustness, the
         implementation must delete this mark and all others after
         this mark.  </p>
      */
-    void deleteMark( [in] long Mark )
-            raises( com::sun::star::io::IOException,
-                    com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-
+    void deleteMark( [in] long Mark ) 
+            raises( com::sun::star::io::IOException, 
+                    com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XMarkableStream::jumpToMark
     /** jumps to a previously created mark.
      */
-    void jumpToMark( [in] long nMark )
-            raises( com::sun::star::io::IOException,
-                    com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-
+    void jumpToMark( [in] long nMark ) 
+            raises( com::sun::star::io::IOException, 
+                    com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** jumps to the furthest position of the stream.
         <p> In the inputstream case, a subsequent read call returns
-        data, that was never read or skipped over before. In the
+        data, that was never read or skipped over before. In the 
         outputstream case, a subsequent write call will add
         new data at the end of the stream without overwriting existing data.
      */
-    void jumpToFurthest()
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    void jumpToFurthest() 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::io::XMarkableStream::offsetToMark
-    /** @returns
-            the offset from the current stream position to the
-            mark ("current position" - "mark position").
-
-        @param nMark
-            identifies the mark which is used as a base
-            to calculate the offset of the current position.
-
-        @throws IllegalArgumentException
-            if the mark does not exist or is deleted.
-
-        @throws IOException
+    /** @returns  
+            the offset from the current stream position to the 
+            mark ("current position" - "mark position"). 
+                 
+        @param nMark	 
+            identifies the mark which is used as a base  
+            to calculate the offset of the current position. 
+                 
+        @throws IllegalArgumentException	 
+            if the mark does not exist or is deleted. 
+                 
+        @throws IOException		 
             if an I/O error has occurred.
      */
-    long offsetToMark( [in] long nMark )
-            raises( com::sun::star::io::IOException,
-                    com::sun::star::lang::IllegalArgumentException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    long offsetToMark( [in] long nMark ) 
+            raises( com::sun::star::io::IOException, 
+                    com::sun::star::lang::IllegalArgumentException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XObjectInputStream.idl b/udkapi/com/sun/star/io/XObjectInputStream.idl
index 565cf5f4e9a5..e4242196241f 100644
--- a/udkapi/com/sun/star/io/XObjectInputStream.idl
+++ b/udkapi/com/sun/star/io/XObjectInputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XObjectInputStream_idl__
-#define __com_sun_star_io_XObjectInputStream_idl__
-
-#ifndef __com_sun_star_io_XDataInputStream_idl__
-#include <com/sun/star/io/XDataInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XPersistObject_idl__
-#include <com/sun/star/io/XPersistObject.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XObjectInputStream_idl__ 
+#define __com_sun_star_io_XObjectInputStream_idl__ 
+ 
+#ifndef __com_sun_star_io_XDataInputStream_idl__ 
+#include <com/sun/star/io/XDataInputStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XPersistObject_idl__ 
+#include <com/sun/star/io/XPersistObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 /** reads XPersistObject implementations from a stream
  */
 published interface XObjectInputStream: com::sun::star::io::XDataInputStream
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** reads an object from the stream. In general, it
         reads the service name, instantiaties the object and
         calls read on the XPersistObject interface with itself
         as argument.
      */
-    com::sun::star::io::XPersistObject readObject()
-            raises( com::sun::star::io::IOException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::io::XPersistObject readObject() 
+            raises( com::sun::star::io::IOException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XObjectOutputStream.idl b/udkapi/com/sun/star/io/XObjectOutputStream.idl
index 31d34a96bda0..c043ff0ea3c0 100644
--- a/udkapi/com/sun/star/io/XObjectOutputStream.idl
+++ b/udkapi/com/sun/star/io/XObjectOutputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XObjectOutputStream_idl__
-#define __com_sun_star_io_XObjectOutputStream_idl__
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-#ifndef __com_sun_star_io_XDataOutputStream_idl__
-#include <com/sun/star/io/XDataOutputStream.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
- published interface XPersistObject;
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XObjectOutputStream_idl__ 
+#define __com_sun_star_io_XObjectOutputStream_idl__ 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XDataOutputStream_idl__ 
+#include <com/sun/star/io/XDataOutputStream.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+ published interface XPersistObject; 
+ 
+//============================================================================= 
+ 
 /** stores XPersistObject implementations into the stream
-
+    
     <p>An implementation of the type <type>XPersistObject</type>
     uses this interface to write its internal state into a stream.
     Have a look there for the explanation of the concept.
-
+    
     @see com::sun::star::io::XPersistObject
  */
 published interface XObjectOutputStream: XDataOutputStream
-{
+{ 
     /** writes an object to the stream.
         @param Object the object, which shall serialize itself into the stream.
      */
-    void writeObject( [in] XPersistObject Object )
-            raises( IOException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void writeObject( [in] XPersistObject Object ) 
+            raises( IOException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XOutputStream.idl b/udkapi/com/sun/star/io/XOutputStream.idl
index cc2cd61bd963..6560c924702a 100644
--- a/udkapi/com/sun/star/io/XOutputStream.idl
+++ b/udkapi/com/sun/star/io/XOutputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XOutputStream_idl__
-#define __com_sun_star_io_XOutputStream_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_NotConnectedException_idl__
-#include <com/sun/star/io/NotConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_BufferSizeExceededException_idl__
-#include <com/sun/star/io/BufferSizeExceededException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XOutputStream_idl__ 
+#define __com_sun_star_io_XOutputStream_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_NotConnectedException_idl__ 
+#include <com/sun/star/io/NotConnectedException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_BufferSizeExceededException_idl__ 
+#include <com/sun/star/io/BufferSizeExceededException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::io::XOutputStream
 /** This is the basic interface to write data to a stream.
     <p>
@@ -53,19 +53,19 @@ module com {  module sun {  module star {  module io {
     streaming document</a> for further information on chaining and piping streams.
  */
 published interface XOutputStream: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XOutputStream::writeBytes
     /** writes the whole sequence to the stream. (blocking call)
      */
-    void writeBytes( [in] sequence<byte> aData )
-            raises( com::sun::star::io::NotConnectedException,
-                    com::sun::star::io::BufferSizeExceededException,
-                    com::sun::star::io::IOException);
-
-    //-------------------------------------------------------------------------
-
+    void writeBytes( [in] sequence<byte> aData ) 
+            raises( com::sun::star::io::NotConnectedException, 
+                    com::sun::star::io::BufferSizeExceededException, 
+                    com::sun::star::io::IOException); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XOutputStream::flush
     /** flushes out of the stream any data that may exist in buffers.
 
@@ -74,32 +74,32 @@ published interface XOutputStream: com::sun::star::uno::XInterface
         XAsyncOutputMonitor::waitForCompletion</member> for a similar method
         with very specific semantics, that is useful in certain scenarios.</p>
      */
-    void flush()
-            raises( com::sun::star::io::NotConnectedException,
-                    com::sun::star::io::BufferSizeExceededException,
-                    com::sun::star::io::IOException);
-
-    //-------------------------------------------------------------------------
-
+    void flush() 
+            raises( com::sun::star::io::NotConnectedException, 
+                    com::sun::star::io::BufferSizeExceededException, 
+                    com::sun::star::io::IOException); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XOutputStream::closeOutput
-    /** gets called to indicate that all data has been written.
-
-        <p>If this method has not yet been called, no attached
+    /** gets called to indicate that all data has been written. 
+        
+        <p>If this method has not yet been called, no attached 
         <type>XInputStream</type> receives an EOF signal. No further
         bytes may be written after this method has been called.</p>
      */
-    void closeOutput()
-            raises( com::sun::star::io::NotConnectedException,
-                    com::sun::star::io::BufferSizeExceededException,
-                    com::sun::star::io::IOException);
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void closeOutput() 
+            raises( com::sun::star::io::NotConnectedException, 
+                    com::sun::star::io::BufferSizeExceededException, 
+                    com::sun::star::io::IOException); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XPersist.idl b/udkapi/com/sun/star/io/XPersist.idl
index 77f750c6599d..67fb03bff9b0 100644
--- a/udkapi/com/sun/star/io/XPersist.idl
+++ b/udkapi/com/sun/star/io/XPersist.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XPersist_idl__
-#define __com_sun_star_io_XPersist_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XPersist_idl__ 
+#define __com_sun_star_io_XPersist_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::io::XPersist
 /** makes it possible to write this object to an URL or read it from an URL.
  */
 published interface XPersist: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XPersist::write
     /** writes all the persistent data of the object to the URL.
      */
-    void write ( [in] string URL ) raises ( com::sun::star::io::IOException ) ;
-
-    //-------------------------------------------------------------------------
-
+    void write ( [in] string URL ) raises ( com::sun::star::io::IOException ) ; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XPersist::read
     /** reads all the persistent data of the object from the URL.
      */
-    void read ( [in] string URL ) raises ( com::sun::star::io::IOException ) ;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-=============================================================================*/
-#endif
+    void read ( [in] string URL ) raises ( com::sun::star::io::IOException ) ; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XPersistObject.idl b/udkapi/com/sun/star/io/XPersistObject.idl
index 53da2b9a2e64..d96267af7f1a 100644
--- a/udkapi/com/sun/star/io/XPersistObject.idl
+++ b/udkapi/com/sun/star/io/XPersistObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XPersistObject_idl__
-#define __com_sun_star_io_XPersistObject_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
- published interface XObjectInputStream;
- published interface XObjectOutputStream;
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XPersistObject_idl__ 
+#define __com_sun_star_io_XPersistObject_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+ published interface XObjectInputStream; 
+ published interface XObjectOutputStream; 
+ 
+//============================================================================= 
+ 
 /** allows to make UNO objects persistent
 
   <p>Every UNO object, that wants to be serializable, should implement
@@ -66,24 +66,24 @@ module com {  module sun {  module star {  module io {
      @see com::sun::star::io::XObjectInputStream
  */
 published interface XPersistObject: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** gives the service name of the object
 
-      @returns
-            the service name that specifies the behavior and the
-            persistent data format of this implementation.
-
+      @returns  
+            the service name that specifies the behavior and the  
+            persistent data format of this implementation.  
+         
         <p>This name is used to create such an object by a factory
         during deserialization. </p>
-
+         
         @see com::sun::star::lang::XServiceInfo::getAvailableServiceNames
      */
-    string getServiceName();
-
-    //-------------------------------------------------------------------------
-
+    string getServiceName(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XPersistObject::write
     /** writes all the persistent data of the object to the stream.
         <p>The implementation
@@ -91,11 +91,11 @@ published interface XPersistObject: com::sun::star::uno::XInterface
         @param OutStream the stream, the data shall be written to. The stream
                supports simple types and other XPersistObject implementations.
      */
-    void write( [in] com::sun::star::io::XObjectOutputStream OutStream )
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-
+    void write( [in] com::sun::star::io::XObjectOutputStream OutStream ) 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XPersistObject::read
     /** reads all the persistent data of the object from the stream.
         <p>In case
@@ -103,15 +103,15 @@ published interface XPersistObject: com::sun::star::uno::XInterface
         to create these objects (in general the global service manager).
         <p> The implementation must read the data in the order documented at
         the service specification.
-        @param InStream the stream, the data shall be read from.
+        @param InStream the stream, the data shall be read from. 
      */
-    void read( [in] com::sun::star::io::XObjectInputStream InStream )
-            raises( com::sun::star::io::IOException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void read( [in] com::sun::star::io::XObjectInputStream InStream ) 
+            raises( com::sun::star::io::IOException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XSeekable.idl b/udkapi/com/sun/star/io/XSeekable.idl
index f22dbdb875ca..50bef42f5f8c 100644
--- a/udkapi/com/sun/star/io/XSeekable.idl
+++ b/udkapi/com/sun/star/io/XSeekable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,70 +24,70 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XSeekable_idl__
-#define __com_sun_star_io_XSeekable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XSeekable_idl__ 
+#define __com_sun_star_io_XSeekable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::io::XSeekable
 /** makes it possible to seek to a certain position within a stream.
-
+    
     <p>This interface should be supported, if it is possible to access the
-    data at the new position quickly.
-    You should not support this interface, if you have a continuous
+    data at the new position quickly.  
+    You should not support this interface, if you have a continuous 
     stream, for example, a video stream.
  */
 published interface XSeekable: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     // DocMerge from xml: method com::sun::star::io::XSeekable::seek
     /** changes the seek pointer to a new location relative to the beginning of the stream.
+        
 
-
-        <p> This method changes the seek pointer so subsequent reads and writes can take place at a different
+        <p> This method changes the seek pointer so subsequent reads and writes can take place at a different 
         location in the stream object. It is an error to seek before the beginning of the stream or after the
         end of the stream. </p>
 
         @throws com::sun::star::lang::IllegalArgumentException in case location is negative or greater than <member>XSeekable::getLength</member>.
      */
-    void seek( [in] hyper location )
-        raises( com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException );
-
-
+    void seek( [in] hyper location )  
+        raises( com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException ); 
+ 
+     
     // DocMerge from xml: method com::sun::star::io::XSeekable::getPosition
     /** returns the current offset of the stream.
        @returns
              the current offset in this stream.
      */
-    hyper getPosition()
-        raises( com::sun::star::io::IOException );
-
-
+    hyper getPosition() 
+        raises( com::sun::star::io::IOException ); 
+ 
+     
     // DocMerge from xml: method com::sun::star::io::XSeekable::getLength
     /** returns the length of the stream.
-       @returns
+       @returns 
             the length of the storage medium on which the stream works.
      */
-    hyper getLength()
-        raises( com::sun::star::io::IOException );
-};
-
-//=============================================================================
-
-}; }; }; };
-#endif
+    hyper getLength() 
+        raises( com::sun::star::io::IOException ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+#endif 
diff --git a/udkapi/com/sun/star/io/XSeekableInputStream.idl b/udkapi/com/sun/star/io/XSeekableInputStream.idl
index 63cbf0a6d306..abc6f31906ab 100644
--- a/udkapi/com/sun/star/io/XSeekableInputStream.idl
+++ b/udkapi/com/sun/star/io/XSeekableInputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XSeekableInputStream_idl__
-#define __com_sun_star_io_XSeekableInputStream_idl__
-
-#ifndef __com_sun_star_io_XInputStream_idl__
-#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_XSeekable_idl__
-#include <com/sun/star/io/XSeekable.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
+#ifndef __com_sun_star_io_XSeekableInputStream_idl__ 
+#define __com_sun_star_io_XSeekableInputStream_idl__ 
+ 
+#ifndef __com_sun_star_io_XInputStream_idl__ 
+#include <com/sun/star/io/XInputStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_XSeekable_idl__ 
+#include <com/sun/star/io/XSeekable.idl> 
+#endif 
+
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
 /** This interface can be used to represent a seekable input stream.
  */
 published interface XSeekableInputStream
-{
+{ 
     interface XInputStream;
     interface XSeekable;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/udkapi/com/sun/star/io/XSequenceOutputStream.idl b/udkapi/com/sun/star/io/XSequenceOutputStream.idl
index 43539f82c647..cc73365cdd96 100644
--- a/udkapi/com/sun/star/io/XSequenceOutputStream.idl
+++ b/udkapi/com/sun/star/io/XSequenceOutputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
 module com { module sun { module star { module io {
 
@@ -54,7 +54,7 @@ interface XSequenceOutputStream
     /** allows to get access to the written data
      */
     sequence< byte > getWrittenBytes()
-        raises( com::sun::star::io::NotConnectedException,
+        raises( com::sun::star::io::NotConnectedException, 
         com::sun::star::io::IOException );
 };
 
diff --git a/udkapi/com/sun/star/io/XStream.idl b/udkapi/com/sun/star/io/XStream.idl
index c24dfd020e0c..daf6d8f18bf4 100644
--- a/udkapi/com/sun/star/io/XStream.idl
+++ b/udkapi/com/sun/star/io/XStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,57 +24,57 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XStream_idl__
-#define __com_sun_star_io_XStream_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_io_XStream_idl__ 
+#define __com_sun_star_io_XStream_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
-#ifndef __com_sun_star_io_XInputStream_idl__
+#ifndef __com_sun_star_io_XInputStream_idl__ 
 #include <com/sun/star/io/XInputStream.idl>
 #endif
-#ifndef __com_sun_star_io_XOutputStream_idl__
+#ifndef __com_sun_star_io_XOutputStream_idl__ 
 #include <com/sun/star/io/XOutputStream.idl>
 #endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+    
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::io::XStream
 /** offers read and write access to the same stream.
  */
 published interface XStream: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+    
     // DocMerge from xml: method com::sun::star::io::XStream::getInputStream
-    /** @returns
-            the <type>XInputStream</type> part of the stream.  Closing the returned
+    /** @returns 
+            the <type>XInputStream</type> part of the stream.  Closing the returned 
             <type>XInputStream</type> also closes any <type>XOutputStream</type> part.
     */
     XInputStream getInputStream();
 
 
-    //-------------------------------------------------------------------------
-
+    //------------------------------------------------------------------------- 
+    
     // DocMerge from xml: method com::sun::star::io::XStream::getOutputStream
-    /** @returns
-            the <type>XInputStream</type> part of the stream. Closing the returned
+    /** @returns 
+            the <type>XInputStream</type> part of the stream. Closing the returned 
             <type>XOutputStream</type> also closes the <type>XInputStream</type> part.
     */
     XOutputStream getOutputStream();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XStreamListener.idl b/udkapi/com/sun/star/io/XStreamListener.idl
index 5fc5d0b15edc..9608c560c573 100644
--- a/udkapi/com/sun/star/io/XStreamListener.idl
+++ b/udkapi/com/sun/star/io/XStreamListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,67 +24,67 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XStreamListener_idl__
-#define __com_sun_star_io_XStreamListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
-
+#ifndef __com_sun_star_io_XStreamListener_idl__ 
+#define __com_sun_star_io_XStreamListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::io::XStreamListener
 /** makes it possible to receive events from an active data control.
  */
 published interface XStreamListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XStreamListener::started
     /** gets called as soon as data transfer has started.
      */
-    void started();
-
-    //-------------------------------------------------------------------------
-
+    void started(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XStreamListener::closed
     /** gets called when data transfer terminates normally or when data
         transfer is terminated from outside.
-
+        
         <p>The termination could be done using the method
         <member>XActiveDataControl::terminate()</member>.</p>
      */
-    void closed();
-
-    //-------------------------------------------------------------------------
-
+    void closed(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XStreamListener::terminated
     /** gets called when <member>XActiveDataControl::terminate()</member> is called.
      */
-    void terminated();
-
-    //-------------------------------------------------------------------------
-
+    void terminated(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::io::XStreamListener::error
     /** gets called when an internal error in source or sink has occurred.
-
+        
         <p>After the method is called, the close is called on the
         connected streams.</p>
      */
-    void error( [in] any aException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void error( [in] any aException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XTempFile.idl b/udkapi/com/sun/star/io/XTempFile.idl
index 94b7daaac85c..1263e8ccf490 100644
--- a/udkapi/com/sun/star/io/XTempFile.idl
+++ b/udkapi/com/sun/star/io/XTempFile.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,7 +51,7 @@ interface XTempFile
     // INTERFACES
     //
     // -------------------------------------------------------------------
-    /** interface <type>XStream</type> offers read and write access to
+    /** interface <type>XStream</type> offers read and write access to 
         the same stream.
     */
     interface XStream;
diff --git a/udkapi/com/sun/star/io/XTextInputStream.idl b/udkapi/com/sun/star/io/XTextInputStream.idl
index 73b79218001f..e2a9275a3b02 100644
--- a/udkapi/com/sun/star/io/XTextInputStream.idl
+++ b/udkapi/com/sun/star/io/XTextInputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XTextInputStream_idl__
-#define __com_sun_star_io_XTextInputStream_idl__
-
-#ifndef __com_sun_star_io_XInputStream_idl__
-#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
+#ifndef __com_sun_star_io_XTextInputStream_idl__ 
+#define __com_sun_star_io_XTextInputStream_idl__ 
+ 
+#ifndef __com_sun_star_io_XInputStream_idl__ 
+#include <com/sun/star/io/XInputStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
 /** Interface to read strings from a stream.
 
-    <p>This interfaces allows to read strings seperated by
+    <p>This interfaces allows to read strings seperated by 
     delimiters and to read lines. The character encoding
     to be used can be set by <member>setEncoding()</member>.
     Default encoding is "utf8".</p>
  */
 published interface XTextInputStream: com::sun::star::io::XInputStream
-{
-    //-------------------------------------------------------------------------
-    /** reads text until a line break (CR, LF, or CR/LF) or
-        EOF is found and returns it as string (without CR, LF).
+{ 
+    //------------------------------------------------------------------------- 
+    /** reads text until a line break (CR, LF, or CR/LF) or 
+        EOF is found and returns it as string (without CR, LF). 
 
-        <p>The read characters are converted according to the
+        <p>The read characters are converted according to the 
         encoding defined by <member>setEncoding</member>. If
         EOF is already reached before calling this method
         an empty string is returned.<p>
@@ -62,46 +62,46 @@ published interface XTextInputStream: com::sun::star::io::XInputStream
         @see setEncoding
         @see isEOF
      */
-    string readLine()
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
-    /** reads text until one of the given delimiter characters
+    string readLine() 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** reads text until one of the given delimiter characters 
         or EOF is found and returns it as string (without delimiter).
 
-        <p><strong>Important:</strong> CR/LF is not used as default
-        delimiter! So if no delimiter is defined or none of the
-        delimiters is found, the stream will be read to EOF. The
+        <p><strong>Important:</strong> CR/LF is not used as default 
+        delimiter! So if no delimiter is defined or none of the 
+        delimiters is found, the stream will be read to EOF. The 
         read characters are converted according to the encoding
-        defined by <member>setEncoding</member>. If EOF is already
+        defined by <member>setEncoding</member>. If EOF is already 
         reached before calling this method an empty string is returned.</p>
 
         @see setEncoding
         @see isEOF
      */
-    string readString( [in] sequence<char> Delimiters, [in] boolean bRemoveDelimiter )
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
+    string readString( [in] sequence<char> Delimiters, [in] boolean bRemoveDelimiter ) 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** Returns the EOF status.
 
         <p>This method has to be used to detect if the end
-        of the stream is reached.</p>
+        of the stream is reached.</p> 
         <p><strong>Important:</strong>
         This cannot be detected by asking for an empty string
         because that can be a valid return value of <member>
         readLine()</member> (if the line is empty) and
         readString() (if a delimiter is directly followed
         by the next one).</p>
-
-        @returns
-            <TRUE/>, if the end of file is reached, so that
+    
+        @returns 
+            <TRUE/>, if the end of file is reached, so that 
             no next string can be read. <FALSE/> otherwise
      */
-    boolean isEOF()
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
+    boolean isEOF() 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** sets character encoding.
 
         @param Encoding
@@ -111,11 +111,11 @@ published interface XTextInputStream: com::sun::star::io::XInputStream
             Which character sets are supported depends on
             the implementation.
      */
-    void setEncoding( [in] string Encoding );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void setEncoding( [in] string Encoding ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XTextOutputStream.idl b/udkapi/com/sun/star/io/XTextOutputStream.idl
index 423d18682abc..ecf30ab396a5 100644
--- a/udkapi/com/sun/star/io/XTextOutputStream.idl
+++ b/udkapi/com/sun/star/io/XTextOutputStream.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XTextOutputStream_idl__
-#define __com_sun_star_io_XTextOutputStream_idl__
-
-#ifndef __com_sun_star_io_XOutputStream_idl__
-#include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_io_IOException_idl__
-#include <com/sun/star/io/IOException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-//=============================================================================
+#ifndef __com_sun_star_io_XTextOutputStream_idl__ 
+#define __com_sun_star_io_XTextOutputStream_idl__ 
+ 
+#ifndef __com_sun_star_io_XOutputStream_idl__ 
+#include <com/sun/star/io/XOutputStream.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_io_IOException_idl__ 
+#include <com/sun/star/io/IOException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+ 
+//============================================================================= 
 /** Interface to write strings to a stream using a special
     character encoding.
 
@@ -49,24 +49,24 @@ module com {  module sun {  module star {  module io {
     setEncoding()</member>. Default encoding is "utf8".</p>
  */
 published interface XTextOutputStream: com::sun::star::io::XOutputStream
-{
-    //-------------------------------------------------------------------------
-    /** writes a string to the stream using the encoding
+{ 
+    //------------------------------------------------------------------------- 
+    /** writes a string to the stream using the encoding 
         defined by <member>setEncoding</member>.
 
-        <p>Line breaks or delimiters that may be neccessary
-        to support <member>XTextInputStream::readLine</member>
+        <p>Line breaks or delimiters that may be neccessary 
+        to support <member>XTextInputStream::readLine</member> 
         and <member>XTextInputStream::readString</member>
         have to be added manually to the parameter string.</p>
 
-        @see setEncoding
-        @see XTextInputStream::readLine
+        @see setEncoding 
+        @see XTextInputStream::readLine 
         @see XTextInputStream::readString
      */
-    void writeString( [in] string aString )
-            raises( com::sun::star::io::IOException );
-
-    //-------------------------------------------------------------------------
+    void writeString( [in] string aString ) 
+            raises( com::sun::star::io::IOException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** sets character encoding.
 
         @param Encoding
@@ -76,11 +76,11 @@ published interface XTextOutputStream: com::sun::star::io::XOutputStream
             Which character sets are supported depends on
             the implementation.
      */
-    void setEncoding( [in] string Encoding );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void setEncoding( [in] string Encoding ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XTruncate.idl b/udkapi/com/sun/star/io/XTruncate.idl
index 719922b198eb..573c900748dd 100644
--- a/udkapi/com/sun/star/io/XTruncate.idl
+++ b/udkapi/com/sun/star/io/XTruncate.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_io_XTruncate_idl__
-#define __com_sun_star_io_XTruncate_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#ifndef __com_sun_star_io_XTruncate_idl__ 
+#define __com_sun_star_io_XTruncate_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
 
-#ifndef __com_sun_star_io_IOException_idl__
+#ifndef __com_sun_star_io_IOException_idl__ 
 #include <com/sun/star/io/IOException.idl>
 #endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module io {
-
-
-//=============================================================================
-
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module io {  
+    
+ 
+//============================================================================= 
+ 
 /** makes it possible to set the size of the underlying data of a stream
     to zero.
  */
 published interface XTruncate: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+    
     /** sets the size of the underlying data of the stream to zero.
     */
     void truncate()
         raises( IOException );
 
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/io/XXMLExtractor.idl b/udkapi/com/sun/star/io/XXMLExtractor.idl
index 12ee0f23083b..9c8e9a95d917 100644
--- a/udkapi/com/sun/star/io/XXMLExtractor.idl
+++ b/udkapi/com/sun/star/io/XXMLExtractor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,19 +38,19 @@
 
 //=============================================================================
 
-module com { module sun { module star { module io {
+module com { module sun { module star { module io { 
 
 //=============================================================================
-/** offers the capability to extract the XML document stream from a document
+/** offers the capability to extract the XML document stream from a document 
     storage.
 */
-
+      
 published interface XXMLExtractor : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** extracts the XML stream from the document storage.
-
-        @returns
+        
+        @returns 
         the extracted XML stream.
     */
     com::sun::star::io::XInputStream extract( [in] com::sun::star::io::XInputStream aStream );
@@ -58,7 +58,7 @@ published interface XXMLExtractor : com::sun::star::uno::XInterface
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 
 #endif
diff --git a/udkapi/com/sun/star/java/InvalidJavaSettingsException.idl b/udkapi/com/sun/star/java/InvalidJavaSettingsException.idl
index 588ac4933b05..17859f243fd3 100755
--- a/udkapi/com/sun/star/java/InvalidJavaSettingsException.idl
+++ b/udkapi/com/sun/star/java/InvalidJavaSettingsException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/java/JavaDisabledException.idl b/udkapi/com/sun/star/java/JavaDisabledException.idl
index ef226072c13f..ef3601a7e847 100644
--- a/udkapi/com/sun/star/java/JavaDisabledException.idl
+++ b/udkapi/com/sun/star/java/JavaDisabledException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/java/JavaInitializationException.idl b/udkapi/com/sun/star/java/JavaInitializationException.idl
index c43ea40709b5..93ac0d0e0866 100644
--- a/udkapi/com/sun/star/java/JavaInitializationException.idl
+++ b/udkapi/com/sun/star/java/JavaInitializationException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ module com { module sun { module star { module java {
     <type scope:"com::sun::star::java">JavaDisabledException</type> <br>
     <type scope:"com::sun::star::java">JavaNotConfiguredException</type> <br>
     <type scope:"com::sun::star::java">MissingJavaRuntimeException</type> <br>
-    <type scope:"com::sun::star::java">JavaVMCreationFailureException</type> <br>
+    <type scope:"com::sun::star::java">JavaVMCreationFailureException</type> <br>    
 
     @since OOo 1.1.2
  */
diff --git a/udkapi/com/sun/star/java/JavaNotConfiguredException.idl b/udkapi/com/sun/star/java/JavaNotConfiguredException.idl
index db69e409811f..2643a927478c 100644
--- a/udkapi/com/sun/star/java/JavaNotConfiguredException.idl
+++ b/udkapi/com/sun/star/java/JavaNotConfiguredException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/java/JavaNotFoundException.idl b/udkapi/com/sun/star/java/JavaNotFoundException.idl
index 3f8a994decc1..dfd34e2759b8 100644
--- a/udkapi/com/sun/star/java/JavaNotFoundException.idl
+++ b/udkapi/com/sun/star/java/JavaNotFoundException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/java/JavaVMCreationFailureException.idl b/udkapi/com/sun/star/java/JavaVMCreationFailureException.idl
index 6f027e9556fc..e6d27d2cbcca 100644
--- a/udkapi/com/sun/star/java/JavaVMCreationFailureException.idl
+++ b/udkapi/com/sun/star/java/JavaVMCreationFailureException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ module com { module sun { module star { module java {
     Machine failed, even if the runtime library could be loaded.
     Possible reasons for a failure are that JNI_CreateJavaVM returns
     an error code that reflects a failure, JNI_CreateJavaVM does not
-    return because it tries to quit the process ( _exit), the shared
+    return because it tries to quit the process ( _exit), the shared 
     library is corrupted, so that the symbols for JNI_GetDefaultVMInitArgs
     or JNI_CreateJavaVM cannot be found, etc.
 
@@ -49,8 +49,8 @@ module com { module sun { module star { module java {
 published exception JavaVMCreationFailureException: JavaInitializationException
 {
     /** contains an error code that reflects the returned error code of
-        JNI_CreateJavaVM or other errors. A negative value represents
-        the returned error code of JNI_CreateJavaVM. All other values
+        JNI_CreateJavaVM or other errors. A negative value represents 
+        the returned error code of JNI_CreateJavaVM. All other values 
         indicate a different cause.
     */
     long ErrorCode;
diff --git a/udkapi/com/sun/star/java/JavaVirtualMachine.idl b/udkapi/com/sun/star/java/JavaVirtualMachine.idl
index e7d80865a432..a7a8de71adfa 100644
--- a/udkapi/com/sun/star/java/JavaVirtualMachine.idl
+++ b/udkapi/com/sun/star/java/JavaVirtualMachine.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_java_JavaVirtualMachine_idl__
-#define __com_sun_star_java_JavaVirtualMachine_idl__
-
-//=============================================================================
-
-module com {  module sun {  module star {  module java {
-
- published interface XJavaVM;
- published interface XJavaThreadRegister_11;
-
-//=============================================================================
-
+#ifndef __com_sun_star_java_JavaVirtualMachine_idl__ 
+#define __com_sun_star_java_JavaVirtualMachine_idl__ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module java {  
+ 
+ published interface XJavaVM; 
+ published interface XJavaThreadRegister_11; 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::java::JavaVirtualMachine
 /** exports interfaces to handle a JavaVM and Java threads.
 
@@ -45,20 +45,20 @@ module com {  module sun {  module star {  module java {
     API.
  */
 published service JavaVirtualMachine
-{
+{ 
     // DocMerge: empty anyway
-    interface XJavaVM;
-
+    interface XJavaVM; 
+    
     // DocMerge: empty anyway
-    interface XJavaThreadRegister_11;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    interface XJavaThreadRegister_11; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/java/MissingJavaRuntimeException.idl b/udkapi/com/sun/star/java/MissingJavaRuntimeException.idl
index dd98d8eeaa3e..b17897f5f205 100644
--- a/udkapi/com/sun/star/java/MissingJavaRuntimeException.idl
+++ b/udkapi/com/sun/star/java/MissingJavaRuntimeException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/java/RestartRequiredException.idl b/udkapi/com/sun/star/java/RestartRequiredException.idl
index a41b7de14b6a..4f3e1f648816 100755
--- a/udkapi/com/sun/star/java/RestartRequiredException.idl
+++ b/udkapi/com/sun/star/java/RestartRequiredException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/java/WrongJavaVersionException.idl b/udkapi/com/sun/star/java/WrongJavaVersionException.idl
index 5cf1840bbc61..18780a6c5b6a 100644
--- a/udkapi/com/sun/star/java/WrongJavaVersionException.idl
+++ b/udkapi/com/sun/star/java/WrongJavaVersionException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl b/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl
index 788ecfec33f6..710b067f3daa 100644
--- a/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl
+++ b/udkapi/com/sun/star/java/XJavaThreadRegister_11.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_java_XJavaThreadRegister_11_idl__
-#define __com_sun_star_java_XJavaThreadRegister_11_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module java {
-
-//=============================================================================
-
+#ifndef __com_sun_star_java_XJavaThreadRegister_11_idl__ 
+#define __com_sun_star_java_XJavaThreadRegister_11_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module java { 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::java::XJavaThreadRegister_11
 /** must be implemented by the user of the XJavaThreadRegister_11.
 
@@ -45,39 +45,39 @@ module com {  module sun {  module star {  module java {
     @deprecated
  */
 published interface XJavaThreadRegister_11: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::java::XJavaThreadRegister_11::isThreadAttached
     /** returns <true/> if the current thread is already attached to the VM otherwise <false/>.
      */
-    boolean isThreadAttached();
-
-    //-------------------------------------------------------------------------
-
+    boolean isThreadAttached(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::java::XJavaThreadRegister_11::registerThread
-    /** registers the current thread.
+    /** registers the current thread. 
 
         <p>This method should be called every time a JNI function is called from Java. </p>
      */
-    void registerThread();
-
-
-    //-------------------------------------------------------------------------
-
+    void registerThread(); 
+     
+ 
+    //------------------------------------------------------------------------- 
+      
     // DocMerge from xml: method com::sun::star::java::XJavaThreadRegister_11::revokeThread
-    /** revokes the current thread from the list of registerd threads.
+    /** revokes the current thread from the list of registerd threads. 
 
         <p>This method should be called at the end of every JNI call from Java. </p>
      */
-    void revokeThread();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void revokeThread(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/java/XJavaVM.idl b/udkapi/com/sun/star/java/XJavaVM.idl
index 4f31f3994ef1..5cca4dc32c48 100644
--- a/udkapi/com/sun/star/java/XJavaVM.idl
+++ b/udkapi/com/sun/star/java/XJavaVM.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,19 +24,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_java_XJavaVM_idl__
-#define __com_sun_star_java_XJavaVM_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module java {
-
-//=============================================================================
-
+#ifndef __com_sun_star_java_XJavaVM_idl__ 
+#define __com_sun_star_java_XJavaVM_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module java {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::java::XJavaVM
 /** must be implemented by the user of the XJavaVM.
 
@@ -49,11 +49,11 @@ module com {  module sun {  module star {  module java {
     by an appropriate C/C++ API.
  */
 published interface XJavaVM: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::java::XJavaVM::getJavaVM
-    /** returns the address of the Java Virtual Machine.
+    /** returns the address of the Java Virtual Machine. 
 
         <p>If the VM is not already instantiated, it will be now.</p>
 
@@ -111,31 +111,31 @@ published interface XJavaVM: com::sun::star::uno::XInterface
         <atom>long</atom> or <atom>hyper</atom>, otherwise the <atom>any</atom>
         is <void/>.
      */
-    any getJavaVM( [in] sequence<byte> processID );
-
-    //-------------------------------------------------------------------------
-
+    any getJavaVM( [in] sequence<byte> processID ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::java::XJavaVM::isVMStarted
     /** returns <true/> if the VM is started successfully, otherwise <false/>.
      */
-    boolean isVMStarted();
-
-    //-------------------------------------------------------------------------
-
+    boolean isVMStarted(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::java::XJavaVM::isVMEnabled
-    /** Returns <true/> if the VM is enabled.
+    /** Returns <true/> if the VM is enabled. 
 
         <p>It is only possible to get the VM, if this method return 0. </p>
      */
-    boolean isVMEnabled();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    boolean isVMEnabled(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl b/udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl
index b491f06eb41a..c6e54eb17d6e 100644
--- a/udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl
+++ b/udkapi/com/sun/star/lang/ArrayIndexOutOfBoundsException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_ArrayIndexOutOfBoundsException_idl__
-#define __com_sun_star_lang_ArrayIndexOutOfBoundsException_idl__
-
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
-#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_ArrayIndexOutOfBoundsException_idl__ 
+#define __com_sun_star_lang_ArrayIndexOutOfBoundsException_idl__ 
+ 
+#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ 
+#include <com/sun/star/lang/IndexOutOfBoundsException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::lang::ArrayIndexOutOfBoundsException
 /** This exception is thrown to indicate that an array has been
-    accessed with an illegal index.
-
-    <p>The index is either negative or greater than or equal to
+    accessed with an illegal index. 
+    
+    <p>The index is either negative or greater than or equal to 
     the size of the array. </p>
  */
 published exception ArrayIndexOutOfBoundsException: com::sun::star::lang::IndexOutOfBoundsException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/ClassNotFoundException.idl b/udkapi/com/sun/star/lang/ClassNotFoundException.idl
index 4b2d3e3ed415..42d55ffd7fe8 100644
--- a/udkapi/com/sun/star/lang/ClassNotFoundException.idl
+++ b/udkapi/com/sun/star/lang/ClassNotFoundException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_ClassNotFoundException_idl__
-#define __com_sun_star_lang_ClassNotFoundException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_ClassNotFoundException_idl__ 
+#define __com_sun_star_lang_ClassNotFoundException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::lang::ClassNotFoundException
-/** This exception is thrown when an application tries to load
-    the information on the type through its string name.
+/** This exception is thrown when an application tries to load 
+    the information on the type through its string name. 
  */
 published exception ClassNotFoundException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/DisposedException.idl b/udkapi/com/sun/star/lang/DisposedException.idl
index 5e404c6b1def..2d6a90e4dd6a 100644
--- a/udkapi/com/sun/star/lang/DisposedException.idl
+++ b/udkapi/com/sun/star/lang/DisposedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_DisposedException_idl__
-#define __com_sun_star_lang_DisposedException_idl__
-
-#ifndef __com_sun_star_uno_RuntimeException_idl__
-#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_DisposedException_idl__ 
+#define __com_sun_star_lang_DisposedException_idl__ 
+ 
+#ifndef __com_sun_star_uno_RuntimeException_idl__ 
+#include <com/sun/star/uno/RuntimeException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::lang::DisposedException
 /** This exception occurs if the object behind this interface has been
     disposed before and can't uphold its method specification anymore.
-
-    <p>The implementation normally should implement the
-    <type scope="com::sun::star::lang">XComponent</type> interface
+    
+    <p>The implementation normally should implement the 
+    <type scope="com::sun::star::lang">XComponent</type> interface 
     to indicate this possibility. </p>
  */
 published exception DisposedException: com::sun::star::uno::RuntimeException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/EventObject.idl b/udkapi/com/sun/star/lang/EventObject.idl
index 4cab388aafbf..73f5e08ac542 100644
--- a/udkapi/com/sun/star/lang/EventObject.idl
+++ b/udkapi/com/sun/star/lang/EventObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_EventObject_idl__
-#define __com_sun_star_lang_EventObject_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#define __com_sun_star_lang_EventObject_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: struct com::sun::star::lang::EventObject
 /** specifies the base for all event objects and identifies the
     source of the event.
@@ -47,15 +47,15 @@ published struct EventObject
     // DocMerge from xml: field com::sun::star::lang::EventObject::Source
     /** refers to the object that fired the event.
      */
-    com::sun::star::uno::XInterface Source;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::uno::XInterface Source; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/IllegalAccessException.idl b/udkapi/com/sun/star/lang/IllegalAccessException.idl
index 0e9332b43019..0049c4cb2a5a 100644
--- a/udkapi/com/sun/star/lang/IllegalAccessException.idl
+++ b/udkapi/com/sun/star/lang/IllegalAccessException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
-#define __com_sun_star_lang_IllegalAccessException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_IllegalAccessException_idl__ 
+#define __com_sun_star_lang_IllegalAccessException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::lang::IllegalAccessException
-/** This exception is thrown when an application tries to change
+/** This exception is thrown when an application tries to change 
     a constant property.
  */
 published exception IllegalAccessException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/IllegalArgumentException.idl b/udkapi/com/sun/star/lang/IllegalArgumentException.idl
index 4aafc1f08648..cd44a816ab20 100644
--- a/udkapi/com/sun/star/lang/IllegalArgumentException.idl
+++ b/udkapi/com/sun/star/lang/IllegalArgumentException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#define __com_sun_star_lang_IllegalArgumentException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#define __com_sun_star_lang_IllegalArgumentException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::lang::IllegalArgumentException
-/** This exception is thrown to indicate that a method has
+/** This exception is thrown to indicate that a method has 
     passed an illegal or inappropriate argument.
  */
 published exception IllegalArgumentException: com::sun::star::uno::Exception
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::lang::IllegalArgumentException::ArgumentPosition
-    /** identifies the position of the illegal argument.
-
+    /** identifies the position of the illegal argument. 
+        
         <p>This field is -1 if the position is not known.</p>
      */
-    short ArgumentPosition;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    short ArgumentPosition; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl b/udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl
index 33747c07b9a6..cf0beec402f3 100644
--- a/udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl
+++ b/udkapi/com/sun/star/lang/IndexOutOfBoundsException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__
-#define __com_sun_star_lang_IndexOutOfBoundsException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ 
+#define __com_sun_star_lang_IndexOutOfBoundsException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::lang::IndexOutOfBoundsException
-/** This exception is thrown to indicate that a container has been
+/** This exception is thrown to indicate that a container has been 
     accessed with an illegal index.
-
-    <p>The index is either negative or greater than or equal to
+    
+    <p>The index is either negative or greater than or equal to 
     the count of the elements. </p>
  */
 published exception IndexOutOfBoundsException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/InvalidListenerException.idl b/udkapi/com/sun/star/lang/InvalidListenerException.idl
index 24460b32a607..5c5d18448d7f 100644
--- a/udkapi/com/sun/star/lang/InvalidListenerException.idl
+++ b/udkapi/com/sun/star/lang/InvalidListenerException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_InvalidListenerException_idl__
-#define __com_sun_star_lang_InvalidListenerException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_InvalidListenerException_idl__ 
+#define __com_sun_star_lang_InvalidListenerException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::lang::InvalidListenerException
-/** is thrown by the <member>XConnectionPoint::advice</member> method
+/** is thrown by the <member>XConnectionPoint::advice</member> method 
     to indicate that the listener has not supplied the necessary
     interface.
 
     @see  XConnectionPoint
  */
 published exception InvalidListenerException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/ListenerExistException.idl b/udkapi/com/sun/star/lang/ListenerExistException.idl
index 5505426b468e..bc37d058313b 100644
--- a/udkapi/com/sun/star/lang/ListenerExistException.idl
+++ b/udkapi/com/sun/star/lang/ListenerExistException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_ListenerExistException_idl__
-#define __com_sun_star_lang_ListenerExistException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_ListenerExistException_idl__ 
+#define __com_sun_star_lang_ListenerExistException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::lang::ListenerExistException
-/** is thrown by the <member>XConnectionPoint::advise</member> method
+/** is thrown by the <member>XConnectionPoint::advise</member> method 
     to indicate that there is only one listener allowed.
 
     @see     XConnectionPoint
  */
 published exception ListenerExistException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/Locale.idl b/udkapi/com/sun/star/lang/Locale.idl
index 40c43748b2d7..fbe14108511c 100644
--- a/udkapi/com/sun/star/lang/Locale.idl
+++ b/udkapi/com/sun/star/lang/Locale.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/lang/MultiServiceFactory.idl b/udkapi/com/sun/star/lang/MultiServiceFactory.idl
index d55199784370..02913c6eb788 100644
--- a/udkapi/com/sun/star/lang/MultiServiceFactory.idl
+++ b/udkapi/com/sun/star/lang/MultiServiceFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_MultiServiceFactory_idl__
-#define __com_sun_star_lang_MultiServiceFactory_idl__
-
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
-#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
-#include <com/sun/star/lang/XMultiComponentFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_MultiServiceFactory_idl__ 
+#define __com_sun_star_lang_MultiServiceFactory_idl__ 
+ 
+#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__ 
+#include <com/sun/star/lang/XMultiServiceFactory.idl> 
+#endif 
+#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__ 
+#include <com/sun/star/lang/XMultiComponentFactory.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XServiceInfo_idl__ 
+#include <com/sun/star/lang/XServiceInfo.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 /** Provides a collection of implementations of services.
-
-    <p>The factories for instantiating objects of implemetations
+    
+    <p>The factories for instantiating objects of implemetations 
     are accessed via a service name.</p>
-
+    
     <p>The <type scope="com::sun::star::container">XContentEnumerationAccess</type>
     interface can be supported optionally.
     If it is suported, it is possible to  enumerate all implementations that
@@ -59,28 +59,28 @@ module com {  module sun {  module star {  module lang {
     Commonly this is <type>XSingleComponentFactory</type>.</p>
 */
 published service MultiServiceFactory
-{
+{ 
     /** This interface uses a service name to instantiate a component
         which supports the specified service.
     */
     interface com::sun::star::lang::XMultiServiceFactory;
-
+    
     /** This interface uses a service name and a component context to instantiate
         a component which supports the specified service.
     */
-    interface com::sun::star::lang::XMultiComponentFactory;
-
-    /** Factories, as well as all other services, should always support
+    interface com::sun::star::lang::XMultiComponentFactory; 
+    
+    /** Factories, as well as all other services, should always support 
         this interface.
     */
     interface com::sun::star::lang::XServiceInfo;
 };
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/NoSuchFieldException.idl b/udkapi/com/sun/star/lang/NoSuchFieldException.idl
index 2ae3045275f3..97fe891d6b2b 100644
--- a/udkapi/com/sun/star/lang/NoSuchFieldException.idl
+++ b/udkapi/com/sun/star/lang/NoSuchFieldException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_NoSuchFieldException_idl__
-#define __com_sun_star_lang_NoSuchFieldException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_NoSuchFieldException_idl__ 
+#define __com_sun_star_lang_NoSuchFieldException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::lang::NoSuchFieldException
 /** signals that the class does not have a field of a specified name.
  */
 published exception NoSuchFieldException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/NoSuchMethodException.idl b/udkapi/com/sun/star/lang/NoSuchMethodException.idl
index dfaab8937843..d77916ccee37 100644
--- a/udkapi/com/sun/star/lang/NoSuchMethodException.idl
+++ b/udkapi/com/sun/star/lang/NoSuchMethodException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_NoSuchMethodException_idl__
-#define __com_sun_star_lang_NoSuchMethodException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_NoSuchMethodException_idl__ 
+#define __com_sun_star_lang_NoSuchMethodException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::lang::NoSuchMethodException
 /** signals that the interface does not have a method of a specified name.
  */
 published exception NoSuchMethodException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/NoSupportException.idl b/udkapi/com/sun/star/lang/NoSupportException.idl
index 0048e2faf0a0..7056be73233d 100644
--- a/udkapi/com/sun/star/lang/NoSupportException.idl
+++ b/udkapi/com/sun/star/lang/NoSupportException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_NoSupportException_idl__
-#define __com_sun_star_lang_NoSupportException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_NoSupportException_idl__ 
+#define __com_sun_star_lang_NoSupportException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 /** This exception is thrown when a feature of an interface is not
-    supported.
-
+    supported. 
+    
     <p>An example is a <code>setParent(...)</code> method and the object
     does not allow the change.  </p>
 
-    @see     XEnumeration
+    @see     XEnumeration 
     @see     com::sun::star::container::XChild::setParent
  */
 published exception NoSupportException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/NotInitializedException.idl b/udkapi/com/sun/star/lang/NotInitializedException.idl
index b876d4180d27..3993031a29e9 100644
--- a/udkapi/com/sun/star/lang/NotInitializedException.idl
+++ b/udkapi/com/sun/star/lang/NotInitializedException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,13 @@
 #ifndef __com_sun_star_lang_NotInitializedException_idl__
 #define __com_sun_star_lang_NotInitializedException_idl__
 
-#ifndef __com_sun_star_uno_RuntimeException_idl__
-#include <com/sun/star/uno/RuntimeException.idl>
-#endif
+#ifndef __com_sun_star_uno_RuntimeException_idl__ 
+#include <com/sun/star/uno/RuntimeException.idl> 
+#endif 
 
 //=============================================================================
 
-module com { module sun { module star { module lang {
+module com { module sun { module star { module lang { 
 
 //=============================================================================
 
@@ -49,7 +49,7 @@ published exception NotInitializedException : com::sun::star::uno::RuntimeExcept
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/lang/NullPointerException.idl b/udkapi/com/sun/star/lang/NullPointerException.idl
index 939c278ba797..41d56941b7aa 100644
--- a/udkapi/com/sun/star/lang/NullPointerException.idl
+++ b/udkapi/com/sun/star/lang/NullPointerException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_NullPointerException_idl__
-#define __com_sun_star_lang_NullPointerException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_NullPointerException_idl__ 
+#define __com_sun_star_lang_NullPointerException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::lang::NullPointerException
-/** This exception is thrown when an application attempts to use
+/** This exception is thrown when an application attempts to use 
     <NULL/> in a case where an object is required.
-
-    <p>Applications should throw instances of this class to indicate
+    
+    <p>Applications should throw instances of this class to indicate 
     other illegal uses of the <NULL/> object.  </p>
 
     @see com::sun::star::reflection::XIdlReflection::forName
  */
 published exception NullPointerException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/RegistryServiceManager.idl b/udkapi/com/sun/star/lang/RegistryServiceManager.idl
index 78cd1b018ac0..7fe99e8973c5 100644
--- a/udkapi/com/sun/star/lang/RegistryServiceManager.idl
+++ b/udkapi/com/sun/star/lang/RegistryServiceManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_RegistryServiceManager_idl__
-#define __com_sun_star_lang_RegistryServiceManager_idl__
-
-#ifndef __com_sun_star_lang_ServiceManager_idl__
-#include <com/sun/star/lang/ServiceManager.idl>
-#endif
-
-#ifndef __com_sun_star_lang_MultiServiceFactory_idl__
-#include <com/sun/star/lang/MultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XInitialization_idl__
-#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
-#include <com/sun/star/registry/XSimpleRegistry.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_RegistryServiceManager_idl__ 
+#define __com_sun_star_lang_RegistryServiceManager_idl__ 
+ 
+#ifndef __com_sun_star_lang_ServiceManager_idl__ 
+#include <com/sun/star/lang/ServiceManager.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_MultiServiceFactory_idl__ 
+#include <com/sun/star/lang/MultiServiceFactory.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XInitialization_idl__ 
+#include <com/sun/star/lang/XInitialization.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_registry_XSimpleRegistry_idl__ 
+#include <com/sun/star/registry/XSimpleRegistry.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 /** Provides a collection of implementations for services reading from a
     persistent registry storage.
 
     For usage of the service manager have a look at service description
     of <type>ServiceManager</type>.
-
+    
     @see ServiceManager
 */
 published service RegistryServiceManager
-{
+{ 
     /** This is a derived ServiceManager service.
     */
-    service com::sun::star::lang::ServiceManager;
-
+    service com::sun::star::lang::ServiceManager; 
+    
     /** The first two arguments of the intitialization arguments reference:
         <ol>
-        <li>a simple registry
-        (<type scope="com::sun::star::registry">XSimpleRegistry</type>),
+        <li>a simple registry 
+        (<type scope="com::sun::star::registry">XSimpleRegistry</type>), 
         i.e. the registry to be read from</li>
         <li>a component context
         (<type scope="com::sun::star::uno">XComponentContext</type>)
@@ -81,20 +81,20 @@ published service RegistryServiceManager
         </ol>
     */
     interface com::sun::star::lang::XInitialization;
-
+    
     /** Property access.
     */
-    interface com::sun::star::beans::XPropertySet;
+    interface com::sun::star::beans::XPropertySet;    
     /** Specifies the current registry to be read from.
     */
-    [readonly, property] com::sun::star::registry::XSimpleRegistry Registry;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [readonly, property] com::sun::star::registry::XSimpleRegistry Registry; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/ServiceManager.idl b/udkapi/com/sun/star/lang/ServiceManager.idl
index e49e21e8a648..7ad6a7326d8e 100644
--- a/udkapi/com/sun/star/lang/ServiceManager.idl
+++ b/udkapi/com/sun/star/lang/ServiceManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,73 +24,73 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_ServiceManager_idl__
-#define __com_sun_star_lang_ServiceManager_idl__
-
-#ifndef __com_sun_star_lang_MultiServiceFactory_idl__
-#include <com/sun/star/lang/MultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-#ifndef __com_sun_star_container_XSet_idl__
-#include <com/sun/star/container/XSet.idl>
-#endif
-
-#ifndef __com_sun_star_container_XContentEnumerationAccess_idl__
-#include <com/sun/star/container/XContentEnumerationAccess.idl>
+#ifndef __com_sun_star_lang_ServiceManager_idl__ 
+#define __com_sun_star_lang_ServiceManager_idl__ 
+ 
+#ifndef __com_sun_star_lang_MultiServiceFactory_idl__ 
+#include <com/sun/star/lang/MultiServiceFactory.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XSet_idl__ 
+#include <com/sun/star/container/XSet.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XContentEnumerationAccess_idl__ 
+#include <com/sun/star/container/XContentEnumerationAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__ 
+#include <com/sun/star/lang/XMultiServiceFactory.idl> 
 #endif
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
-#include <com/sun/star/lang/XMultiServiceFactory.idl>
+#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__ 
+#include <com/sun/star/lang/XMultiComponentFactory.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XServiceInfo_idl__ 
+#include <com/sun/star/lang/XServiceInfo.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XPropertySet_idl__ 
+#include <com/sun/star/beans/XPropertySet.idl> 
 #endif
 
-#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
-#include <com/sun/star/lang/XMultiComponentFactory.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 /** Provides a collection of implementations for services.  This is a singleton
     you commonly find in your component context under key
     <code>/singletons/com.sun.star.lang.theServiceManager</code>.
-
+    
     <p>
     The factories are accessed with a service name. It is possible to
     access the factories with their implementation names, but you should
     avoid this.
     </p>
-
-    <p>Service factories added via <type scope="com::sun::star::container">XSet</type>
+    
+    <p>Service factories added via <type scope="com::sun::star::container">XSet</type> 
     should support the following interfaces: </p>
-
+    
     <dl>
     <dt><type>XServiceInfo</type></dt>
     <dd>supported interfaces/ implementation name</dd>
-
+    
     <dt><type>XSingleComponentFactory</type>(optional)</dt>
     <dd>is used to create instances of the implementation.</dd>
-
+    
     <dt><type>XComponent</type> (optional)</dt>
     <dd>The service manager calls the method
     <member scope="com::sun::star::lang">XComponent::dispose</member>
     on the factory when going down (i.e. it is commonly disposed by the component context).</dd>
     </dl>
-
+    
     @see com::sun::star::uno::XComponentContext
 */
 published service ServiceManager
@@ -98,44 +98,44 @@ published service ServiceManager
     /** This is a derived MultiServiceFactory service.
     */
     service com::sun::star::lang::MultiServiceFactory;
-
+    
     /** Disposing of service manager.
         <p>
         The component context disposes its service manager singleton when going down
         (i.e. when the component context is disposed).
         </p>
     */
-    interface com::sun::star::lang::XComponent;
-
+    interface com::sun::star::lang::XComponent; 
+    
     /** Management of service factories.
     */
-    interface com::sun::star::container::XSet;
-
+    interface com::sun::star::container::XSet; 
+    
     /** Enumeration of all service factories.
         <p>
-        It is possible to enumerate all implementations that support the
-        service specified with the argument of the
-        <member scope="com::sun::star::container">XContentEnumerationAccess::createContentEnumeration</member> method.
+        It is possible to enumerate all implementations that support the 
+        service specified with the argument of the 
+        <member scope="com::sun::star::container">XContentEnumerationAccess::createContentEnumeration</member> method. 
         The enumerator commonly returns <type>XSingleComponentFactory</type>
         interfaces.
         </p>
     */
-    interface com::sun::star::container::XContentEnumerationAccess;
-
+    interface com::sun::star::container::XContentEnumerationAccess; 
+    
     /** Property access.
     */
-    [optional] interface com::sun::star::beans::XPropertySet;
+    [optional] interface com::sun::star::beans::XPropertySet; 
     /** specifies the default component context to be used, if instanciating services
         via <type>XMultiServiceFactory</type>
     */
-    [optional, property] com::sun::star::uno::XComponentContext DefaultContext;
+    [optional, property] com::sun::star::uno::XComponentContext DefaultContext; 
 };
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl b/udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl
index c75835b90194..563c6c1fd94b 100644
--- a/udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl
+++ b/udkapi/com/sun/star/lang/ServiceNotRegisteredException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_ServiceNotRegisteredException_idl__
-#define __com_sun_star_lang_ServiceNotRegisteredException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_ServiceNotRegisteredException_idl__ 
+#define __com_sun_star_lang_ServiceNotRegisteredException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::lang::ServiceNotRegisteredException
 /** This exception is thrown when a needed service is not found.
 
-    <p>Applications should throw instances of this class to indicate
+    <p>Applications should throw instances of this class to indicate 
     that a needed service is not registered.  </p>
  */
 published exception ServiceNotRegisteredException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/SystemDependent.idl b/udkapi/com/sun/star/lang/SystemDependent.idl
index 5d4bf69be0e6..7f6d44bf7373 100644
--- a/udkapi/com/sun/star/lang/SystemDependent.idl
+++ b/udkapi/com/sun/star/lang/SystemDependent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,102 +24,102 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_SystemDependent_idl__
-#define __com_sun_star_lang_SystemDependent_idl__
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_SystemDependent_idl__ 
+#define __com_sun_star_lang_SystemDependent_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: constants com::sun::star::lang::SystemDependent
-/** These constants are used to specify systems which depend on return values.
-
-    <p> You should avoid system-dependent methods if possible.
-
-    @example:C++
-
-    <listing>
-    #ifdef __WINDOW // Microsoft Windows
-    HWND    hWin = (HWND)xInterface->getWindowHandle(SystemDependentWIN32);
-    if( hWin ) ...
-    #elif( ... ) // other systems
-    ...
-    #endif
-    </listing>
-
-    <p>The Symbols are now prepended with SYSTEM_ thus we avoid collisions
+/** These constants are used to specify systems which depend on return values.  
+         
+    <p> You should avoid system-dependent methods if possible. 
+     
+    @example:C++ 
+     
+    <listing> 
+    #ifdef __WINDOW	// Microsoft Windows 
+    HWND	hWin = (HWND)xInterface->getWindowHandle(SystemDependentWIN32); 
+    if( hWin ) ... 
+    #elif( ... ) // other systems 
+    ... 
+    #endif 
+    </listing> 
+
+    <p>The Symbols are now prepended with SYSTEM_ thus we avoid collisions 
     with system headers.  </p>
 
     @see com::sun::star::awt::XSystemDependentWindowPeer
     @deprecated
  */
 published constants SystemDependent
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_WIN32
-    /** The called interface method returns a value specified for the
-        32-bit Windows systems.
+    /** The called interface method returns a value specified for the  
+        32-bit Windows systems. 	 
 
         <p>These are Windows NT, Windows 95, Windows 98 or higher. </p>
      */
-    const short SYSTEM_WIN32 = 1;
-
-    //-------------------------------------------------------------------------
-
+    const short SYSTEM_WIN32 = 1; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_WIN16
-    /** The called interface method returns a value specified for
-        the 16-bit Windows system.
-
+    /** The called interface method returns a value specified for  
+        the 16-bit Windows system.  
+                 
         <p>This is Windows 3.11. </p>
      */
-    const short SYSTEM_WIN16 = 2;
-
-    //-------------------------------------------------------------------------
-
+    const short SYSTEM_WIN16 = 2; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_JAVA
-    /** The called interface method returns a value specified for  the system java.
-
-        <p>These are <em>JRE 1.1</em>, <em>JRE 1.2</em>, <em>JDK 1.1</em>,
+    /** The called interface method returns a value specified for  the system java.  
+                 
+        <p>These are <em>JRE 1.1</em>, <em>JRE 1.2</em>, <em>JDK 1.1</em>,  
         <em>JDK 1.2</em> or higher.   </p>
-
-        <p>The return should be a handle to a java object locked with
-        the call <code>JavaEnvironment->NewGlobalRef( ... )</code>
+         
+        <p>The return should be a handle to a java object locked with 
+        the call <code>JavaEnvironment->NewGlobalRef( ... )</code>  
         by the callee. </p>
      */
-    const short SYSTEM_JAVA = 3;
-
-    //-------------------------------------------------------------------------
-
+    const short SYSTEM_JAVA = 3; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_OS2
     /** The called interface method returns a value specified for  the <em>OS/2</em> system.
      */
-    const short SYSTEM_OS2 = 4;
-
-    //-------------------------------------------------------------------------
-
+    const short SYSTEM_OS2 = 4; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_MAC
     /** The called interface method returns a value specified for the <em>MAC-OS</em> system.
      */
-    const short SYSTEM_MAC = 5;
-
-    //-------------------------------------------------------------------------
-
+    const short SYSTEM_MAC = 5; 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW
     /** The called interface method returns a value specified for the <em>X Window System</em>.
      */
-    const short SYSTEM_XWINDOW = 6;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    const short SYSTEM_XWINDOW = 6; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/WrappedTargetException.idl b/udkapi/com/sun/star/lang/WrappedTargetException.idl
index 169b0073f9a7..4dd9322582ff 100644
--- a/udkapi/com/sun/star/lang/WrappedTargetException.idl
+++ b/udkapi/com/sun/star/lang/WrappedTargetException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#define __com_sun_star_lang_WrappedTargetException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#define __com_sun_star_lang_WrappedTargetException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::lang::WrappedTargetException
-/** This is a checked exception that wraps an exception thrown
-    by the original target.
+/** This is a checked exception that wraps an exception thrown 
+    by the original target. 
 
     <p>Normally this exception is declared for generic methods.  </p>
 
-    @see com::sun::star::container::XIndexAccess
-    @see com::sun::star::container::XNameAccess
+    @see com::sun::star::container::XIndexAccess 
+    @see com::sun::star::container::XNameAccess 
     @see com::sun::star::beans::XPropertySet
  */
 published exception WrappedTargetException: com::sun::star::uno::Exception
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: field com::sun::star::lang::WrappedTargetException::TargetException
     /** The exception is thrown by the target.
      */
-    any TargetException;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    any TargetException; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/WrappedTargetRuntimeException.idl b/udkapi/com/sun/star/lang/WrappedTargetRuntimeException.idl
index 0a48f02d672a..44717f4f3d66 100644
--- a/udkapi/com/sun/star/lang/WrappedTargetRuntimeException.idl
+++ b/udkapi/com/sun/star/lang/WrappedTargetRuntimeException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/lang/XComponent.idl b/udkapi/com/sun/star/lang/XComponent.idl
index 250842aebd40..cbf70b70624a 100644
--- a/udkapi/com/sun/star/lang/XComponent.idl
+++ b/udkapi/com/sun/star/lang/XComponent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,29 +24,29 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_XComponent_idl__
-#define __com_sun_star_lang_XComponent_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
- published interface XEventListener;
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_XComponent_idl__ 
+#define __com_sun_star_lang_XComponent_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+ published interface XEventListener; 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::lang::XComponent
 /** allows to exclicitly free resources and break cyclic references.
-
-    <p>Actually the real lifetime of an UNO object is controlled by
+    
+    <p>Actually the real lifetime of an UNO object is controlled by 
     references kept on interfaces of this object. But there are two
     distinct meanings in keeping a reference to an interface:
     1st to own the object and 2nd to know the object.
-
+    
     <p>You are only allowed to keep references of interfaces
     to UNO objects if you are by definition the owner of that object or
     your reference is very temporary or you have registered an
@@ -54,9 +54,9 @@ module com {  module sun {  module star {  module lang {
     "disposing" is called.</p>
  */
 published interface XComponent: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::lang::XComponent::dispose
     /** The owner of an object calls this method to explicitly free all
         resources kept by this object and thus break cyclic references.
@@ -75,11 +75,11 @@ published interface XComponent: com::sun::star::uno::XInterface
         </p>
 
         <p>After this method has been called, the object should behave as passive
-        as possible, thus it should ignore all calls
+        as possible, thus it should ignore all calls 
         in case it can comply with its specification (for instance addEventListener()).
         Often the object can't fulfill its specification anymore,
         in this case it must throw the <type>DisposedException</type>
-        (which is derived from <type scope="com::sun::star::uno">RuntimeException</type>)
+        (which is derived from <type scope="com::sun::star::uno">RuntimeException</type>) 
     when it gets called.</p>
 
         <p>For some objects no real owner can be identified, thus it can be
@@ -87,14 +87,14 @@ published interface XComponent: com::sun::star::uno::XInterface
         the object should be able to cope with multiple dispose()-calls (which
         are inevitable in a multithreaded environment).
      */
-    void dispose();
-
-    //-------------------------------------------------------------------------
-
+    void dispose(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::lang::XComponent::addEventListener
-    /** adds an event listener to the object.
-
-        <p>The broadcaster fires the disposing method of this listener
+    /** adds an event listener to the object. 
+        
+        <p>The broadcaster fires the disposing method of this listener 
         if the <member>XComponent::dispose</member> method is called.</p>
 
         <p>It is suggested to allow multiple registration of the same listener,
@@ -112,10 +112,10 @@ published interface XComponent: com::sun::star::uno::XInterface
 
         @see XComponent::removeEventListener
      */
-    void addEventListener( [in] XEventListener xListener );
-
-    //-------------------------------------------------------------------------
-
+    void addEventListener( [in] XEventListener xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::lang::XComponent::removeEventListener
     /** removes an event listener from the listener list.
 
@@ -132,12 +132,12 @@ published interface XComponent: com::sun::star::uno::XInterface
 
         @see XComponent::addEventListener
      */
-    void removeEventListener( [in] XEventListener aListener );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void removeEventListener( [in] XEventListener aListener ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/XConnectionPoint.idl b/udkapi/com/sun/star/lang/XConnectionPoint.idl
index 7d20e9703465..95cbe3bf3b5a 100644
--- a/udkapi/com/sun/star/lang/XConnectionPoint.idl
+++ b/udkapi/com/sun/star/lang/XConnectionPoint.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,181 +24,181 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_XConnectionPoint_idl__
-#define __com_sun_star_lang_XConnectionPoint_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XConnectionPointContainer_idl__
-#include <com/sun/star/lang/XConnectionPointContainer.idl>
-#endif
-
-#ifndef __com_sun_star_lang_ListenerExistException_idl__
-#include <com/sun/star/lang/ListenerExistException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_InvalidListenerException_idl__
-#include <com/sun/star/lang/InvalidListenerException.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_XConnectionPoint_idl__ 
+#define __com_sun_star_lang_XConnectionPoint_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+
+#ifndef __com_sun_star_lang_XConnectionPointContainer_idl__ 
+#include <com/sun/star/lang/XConnectionPointContainer.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_ListenerExistException_idl__ 
+#include <com/sun/star/lang/ListenerExistException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_InvalidListenerException_idl__ 
+#include <com/sun/star/lang/InvalidListenerException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from idl: interface com::sun::star::lang::XConnectionPoint
-/** supports connection points for connectable objects.
-
+/** supports connection points for connectable objects. 
+         
     <p>Connectable objects support the following features: </p>
 
-    <ul>
+    <ul> 
         <li>outgoing interfaces, such as event sets; </li>
-        <li>the ability to enumerate the types of the outgoing interfaces;
-        <li>the ability to connect and disconnect sinks to the object
+        <li>the ability to enumerate the types of the outgoing interfaces; 
+        <li>the ability to connect and disconnect sinks to the object 
             for those outgoing types; </li>
-        <li>the ability to enumerate the connections that exist to a
+        <li>the ability to enumerate the connections that exist to a 
             particular outgoing interface.  </li>
-    </ul>
-
-    <h4>When to Implement?<h4>
-
-    <p>To create a connectable object, you need to implement objects
+    </ul> 
+     
+    <h4>When to Implement?<h4> 
+     
+    <p>To create a connectable object, you need to implement objects  
     that provide two related interfaces: </p>
 
-    <ul>
+    <ul> 
         <li><type>XConnectionPointContainer</type> </li>
         <li><type>XConnectionPoint</type> </li>
-    </ul>
-
-    <p>The <type>XConnectionPointContainer</type> interface is implemented
-    on the connectable object to indicate the existence of the outgoing
-    interfaces. It provides a sequence of sub-objects.  It also provides
-    access to all the connection point sub-objects, each of which
-    implements the <type>XConnectionPoint</type> interface. The
-    <type>XConnectionPoint</type> interface provides a sequence of
+    </ul> 
+     
+    <p>The <type>XConnectionPointContainer</type> interface is implemented  
+    on the connectable object to indicate the existence of the outgoing 
+    interfaces. It provides a sequence of sub-objects.  It also provides  
+    access to all the connection point sub-objects, each of which  
+    implements the <type>XConnectionPoint</type> interface. The  
+    <type>XConnectionPoint</type> interface provides a sequence of  
     sub-objects.  </p>
-
-    <p>Each connection point is a separate sub-object to avoid circular
-    reference counting problems.  A connection point controls how many
-    connections (one or more) it will allow in its implementation of
+     
+    <p>Each connection point is a separate sub-object to avoid circular  
+    reference counting problems.  A connection point controls how many  
+    connections (one or more) it will allow in its implementation of  
     <member>XConnectionPoint::advise()</member>.  </p>
-
-    <h4>When to use?</h4>
-
+     
+    <h4>When to use?</h4> 
+     
     <p>A client can use the <type>XConnectionPointContainer</type> interface: </p>
 
-    <UL>
+    <UL> 
 
         <LI>to get a sequence of connection points for each outgoing type. </LI>
-
-        <LI>to obtain access to connection point sub-objects with the
-            <type>XConnectionPoint</type> interface for each
-            outgoing type. Through the XConnectionPoint interface,
-            a client starts or terminates an advisory loop with the
-            connectable object and the client's own sink.  The
-            client can also use the <type>XConnectionPoint</type>
-            interface to get a sequence of the connections that it
+         
+        <LI>to obtain access to connection point sub-objects with the  
+            <type>XConnectionPoint</type> interface for each 
+            outgoing type. Through the XConnectionPoint interface, 
+            a client starts or terminates an advisory loop with the 
+            connectable object and the client's own sink.  The 
+            client can also use the <type>XConnectionPoint</type> 
+            interface to get a sequence of the connections that it 
             knows about. </LI>
-    </UL>
-
-    @see        XConnectionPointContainer
+    </UL> 
+     
+    @see		XConnectionPointContainer
  */
 published interface XConnectionPoint: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::lang::XConnectionPoint::getConnectionType
-    /** @returns
-                the type of the outgoing interface managed by this
-                connection point.
-
-        <p>Using the <member>XConnectionPointContainer::getConnectionPoints</member>
-        method, a client can obtain an <type>XConnectionPoint</type>
-        interface.  Using that interface and this method, the client
-        can determine the type of each connection point enumerated. The
-        type returned from this method must enable the caller to access
-        this same connection point through
-        <member>XConnectionPointContainer::findConnectionPoint</member>.
-
+    /** @returns  
+                the type of the outgoing interface managed by this 
+                connection point. 
+                 
+        <p>Using the <member>XConnectionPointContainer::getConnectionPoints</member>  
+        method, a client can obtain an <type>XConnectionPoint</type> 
+        interface.  Using that interface and this method, the client 
+        can determine the type of each connection point enumerated. The 
+        type returned from this method must enable the caller to access 
+        this same connection point through 
+        <member>XConnectionPointContainer::findConnectionPoint</member>. 
+         
         @see XConnectionPointContainer::findConnectionPoint
      */
-    type getConnectionType();
-
-    //-------------------------------------------------------------------------
-
+    type getConnectionType(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::lang::XConnectionPoint::getConnectionPointContainer
-    /** @returns
-            the <type>XConnectionPointContainer</type> interface on
-            the parent connectable object.
-
+    /** @returns  
+            the <type>XConnectionPointContainer</type> interface on  
+            the parent connectable object. 
+             
         @see XConnectionPointContainer
      */
-    com::sun::star::lang::XConnectionPointContainer getConnectionPointContainer();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::lang::XConnectionPointContainer getConnectionPointContainer(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::lang::XConnectionPoint::advise
-    /** creates a connection between a connection point and a
-        client's sink, where the sink implements the outgoing interface
-        supported by this connection point.
-
-        <p>A few <code>add...Listener</code> methods need additional parameters
-        to add listeners or throw exceptions. One of these methods is
-        <member scope="com::sun::star::beans">XPropertySet::addPropertyChangeListener</member>.
-        We ignore the problem in this interface. A solution must be provided
+    /** creates a connection between a connection point and a 
+        client's sink, where the sink implements the outgoing interface 
+        supported by this connection point. 
+                 
+        <p>A few <code>add...Listener</code> methods need additional parameters 
+        to add listeners or throw exceptions. One of these methods is  
+        <member scope="com::sun::star::beans">XPropertySet::addPropertyChangeListener</member>. 
+        We ignore the problem in this interface. A solution must be provided  
         in an additional <type>XConnectionPoint</type> interface.  </p>
-
-        @param xListener
-            specifies the listener interface on the client's advise sink.
-            The client's sink receives outgoing calls from the
-            connection point container.
-
-        @throws ListenerExistException
-            if it is a unicast broadcaster and a listener is already set.
-
-        @throws InvalidListenerException
-            if the listener does not supply the needed interfaces.
-
+         
+        @param xListener	 
+            specifies the listener interface on the client's advise sink.  
+            The client's sink receives outgoing calls from the  
+            connection point container. 
+             
+        @throws ListenerExistException	 
+            if it is a unicast broadcaster and a listener is already set. 
+             
+        @throws InvalidListenerException	 
+            if the listener does not supply the needed interfaces. 
+             
         @see com::sun::star::beans::XPropertySet::addPropertyChangeListener
      */
-    void advise( [in] com::sun::star::uno::XInterface xListener )
-            raises( com::sun::star::lang::ListenerExistException,
-                    com::sun::star::lang::InvalidListenerException );
-
-    //-------------------------------------------------------------------------
-
+    void advise( [in] com::sun::star::uno::XInterface xListener ) 
+            raises( com::sun::star::lang::ListenerExistException, 
+                    com::sun::star::lang::InvalidListenerException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::lang::XConnectionPoint::unadvise
-    /** terminates a notification previously set up with advise.
-
-        <p>A few <code>remove...Listener</code> methods need additional
-        parameters to add listeners or throw exceptions. One of these methods
-        is <member scope="com::sun::star::beans">XPropertySet::removePropertyChangeListener</member>.
-        We ignore the problem in this interface. A solution must be
+    /** terminates a notification previously set up with advise. 
+                 
+        <p>A few <code>remove...Listener</code> methods need additional  
+        parameters to add listeners or throw exceptions. One of these methods  
+        is <member scope="com::sun::star::beans">XPropertySet::removePropertyChangeListener</member>. 
+        We ignore the problem in this interface. A solution must be  
         provided in an additional <type>XConnectionPoint</type> interface.  </p>
-
-        @param listener
-            specifies the listener interface on the client's advise sink.
-
+         
+        @param listener 
+            specifies the listener interface on the client's advise sink. 
+         
         @see com::sun::star::beans::XPropertySet::removePropertyChangeListener
      */
-    void unadvise( [in] com::sun::star::uno::XInterface xListener );
-
-    //-------------------------------------------------------------------------
-
+    void unadvise( [in] com::sun::star::uno::XInterface xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::lang::XConnectionPoint::getConnections
-    /** @returns
+    /** @returns 
                 a sequence of all currently advised connections.
      */
-    sequence<com::sun::star::uno::XInterface> getConnections();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    sequence<com::sun::star::uno::XInterface> getConnections(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/XConnectionPointContainer.idl b/udkapi/com/sun/star/lang/XConnectionPointContainer.idl
index d21f97161ac1..33a6c1fa0af4 100644
--- a/udkapi/com/sun/star/lang/XConnectionPointContainer.idl
+++ b/udkapi/com/sun/star/lang/XConnectionPointContainer.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,64 +24,64 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_XConnectionPointContainer_idl__
-#define __com_sun_star_lang_XConnectionPointContainer_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
- published interface XConnectionPoint;
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_XConnectionPointContainer_idl__ 
+#define __com_sun_star_lang_XConnectionPointContainer_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+ published interface XConnectionPoint; 
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::lang::XConnectionPointContainer
 /** makes it possible to locate a specific connection point
     for a specified UIK and manages a sequence of connections points.
-
+    
     <p>An implementation of this interface <strong>must</strong>
-    support the <type scope="com::sun::star::uno">XWeak</type> interface.
+    support the <type scope="com::sun::star::uno">XWeak</type> interface. 
     Look at the language binding for a superclass or something else.  </p>
 
-    @see XConnectionPoint
+    @see XConnectionPoint 
     @see com::sun::star::uno::XWeak
  */
 published interface XConnectionPointContainer: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::lang::XConnectionPointContainer::getConnectionPointTypes
-    /** @returns
-            a sequence of all outgoing types; specifies which are supported
+    /** @returns 
+            a sequence of all outgoing types; specifies which are supported 
             by this connectable object.
      */
-    sequence<type> getConnectionPointTypes();
-
-    //-------------------------------------------------------------------------
-
+    sequence<type> getConnectionPointTypes(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::lang::XConnectionPointContainer::queryConnectionPoint
-    /** @returns
-            an <type>XConnectionPoint</type> interface of a
-            connection point for a specified type if that type
-            describes a supported outgoing interface. It is
-            <const>NULL</const> on failure of the call.
-
-        @param aType
+    /** @returns  
+            an <type>XConnectionPoint</type> interface of a 
+            connection point for a specified type if that type 
+            describes a supported outgoing interface. It is 
+            <const>NULL</const> on failure of the call. 
+                 
+        @param aType 
             specifies the connection point's type.
      */
-    XConnectionPoint queryConnectionPoint( [in] type aType );
-
-    //-------------------------------------------------------------------------
-
+    XConnectionPoint queryConnectionPoint( [in] type aType ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::lang::XConnectionPointContainer::advise
     /** creates a connection between this object and a
         client's sink, where the sink implements the outgoing
         interface specified with ID.
-
+        
         <p>The interface is advised under the connection point you
         get with <code>queryConnectionPoint( id )</code>.  </p>
 
@@ -92,27 +92,27 @@ published interface XConnectionPointContainer: com::sun::star::uno::XInterface
 
         @see XConnectionPoint::advise
      */
-    [oneway] void advise( [in] type aType,
-             [in] com::sun::star::uno::XInterface xListener );
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void advise( [in] type aType, 
+             [in] com::sun::star::uno::XInterface xListener ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::lang::XConnectionPointContainer::unadvise
     /** terminates a notification previously set up with
         advise at the container or at the suitable connection point.
 
         @see XConnectionPoint::unadvise
      */
-    [oneway] void unadvise( [in] type aType,
-             [in] com::sun::star::uno::XInterface xListener );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void unadvise( [in] type aType, 
+             [in] com::sun::star::uno::XInterface xListener ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/XEventListener.idl b/udkapi/com/sun/star/lang/XEventListener.idl
index 95128a6a78c6..af4e505c12ac 100644
--- a/udkapi/com/sun/star/lang/XEventListener.idl
+++ b/udkapi/com/sun/star/lang/XEventListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#define __com_sun_star_lang_XEventListener_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#define __com_sun_star_lang_XEventListener_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::lang::XEventListener
 /** base interface for all event listeners interfaces.
  */
 published interface XEventListener: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::lang::XEventListener::disposing
     /** gets called when the broadcaster is about to be disposed.
-
-        <p>All listeners and all other objects, which reference the
+        
+        <p>All listeners and all other objects, which reference the 
         broadcaster should release the reference to the source.
         No method should be invoked anymore on this object (
         including <member>XComponent::removeEventListener</member> ).
@@ -62,15 +62,15 @@ published interface XEventListener: com::sun::star::uno::XInterface
         of derived listener interfaced, not only for registrations
         at <type>XComponent</type>. </p>
      */
-    void disposing( [in] com::sun::star::lang::EventObject Source );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void disposing( [in] com::sun::star::lang::EventObject Source ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/XInitialization.idl b/udkapi/com/sun/star/lang/XInitialization.idl
index 26a7b5e7a5bf..0f5c8946b830 100644
--- a/udkapi/com/sun/star/lang/XInitialization.idl
+++ b/udkapi/com/sun/star/lang/XInitialization.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_XInitialization_idl__
-#define __com_sun_star_lang_XInitialization_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_XInitialization_idl__ 
+#define __com_sun_star_lang_XInitialization_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::lang::XInitialization
 /** initializes an object directly after its creation.
-
-    <p>This interface works together with factories. If you want to
+    
+    <p>This interface works together with factories. If you want to 
     initialize the object after creation, you should
-    support this interface and you may support other interfaces
+    support this interface and you may support other interfaces 
     which offer type-safe initialization methods.  </p>
 
     <p>Instead of calling <member>XSingleComponentFactory::createInstanceWithContext</member>
-    and later initialize(), you should call
+    and later initialize(), you should call 
     <member>XSingleComponentFactory::createInstanceWithArgumentsAndContext</member>
     to pass the arguments to the instance. The reason is, that a component may want to
     return the same instance for the same set of parameters, and it can do so by implementing
@@ -60,24 +60,24 @@ module com {  module sun {  module star {  module lang {
 
  */
 published interface XInitialization: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::lang::XInitialization::initialize
-    /** initializes the object.
-
+    /** initializes the object. 
+        
         <p>It should be called directly after the object is created.
      */
-    void initialize( [in] sequence<any> aArguments )
-            raises( com::sun::star::uno::Exception );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void initialize( [in] sequence<any> aArguments ) 
+            raises( com::sun::star::uno::Exception ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/XLocalizable.idl b/udkapi/com/sun/star/lang/XLocalizable.idl
index b270d9ecdc73..30dc0fcb488e 100644
--- a/udkapi/com/sun/star/lang/XLocalizable.idl
+++ b/udkapi/com/sun/star/lang/XLocalizable.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_XLocalizable_idl__
-#define __com_sun_star_lang_XLocalizable_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
-#include <com/sun/star/lang/Locale.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_XLocalizable_idl__ 
+#define __com_sun_star_lang_XLocalizable_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_Locale_idl__ 
+#include <com/sun/star/lang/Locale.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::lang::XLocalizable
 /** makes it possible to set a <type>Locale</type> to be used by the object.
  */
 published interface XLocalizable: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     // DocMerge from xml: method com::sun::star::lang::XLocalizable::setLocale
     /** sets the locale to be used by this object.
      */
-    void setLocale( [in] Locale eLocale );
-
-
+    void setLocale( [in] Locale eLocale ); 
+ 
+     
     // DocMerge from idl: method com::sun::star::lang::XLocalizable::getLocale
-    /** @returns
+    /** @returns 
                 the locale, which is used by this object.
      */
-    Locale getLocale();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    Locale getLocale(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/XMain.idl b/udkapi/com/sun/star/lang/XMain.idl
index 85ce9b9e48ba..70b000349d5f 100644
--- a/udkapi/com/sun/star/lang/XMain.idl
+++ b/udkapi/com/sun/star/lang/XMain.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_XMain_idl__
-#define __com_sun_star_lang_XMain_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_XMain_idl__ 
+#define __com_sun_star_lang_XMain_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 /** Executing interface for executable components run by the uno executable
     loader.  This is an application to run components passing the command
     line arguments.
@@ -56,14 +56,14 @@ published interface XMain: com::sun::star::uno::XInterface
         @return
                return value passed to be returned by main()
     */
-    long run( [in] sequence< string > aArguments );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    long run( [in] sequence< string > aArguments ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/XMultiComponentFactory.idl b/udkapi/com/sun/star/lang/XMultiComponentFactory.idl
index 826b46257ce9..5b72549ac2e9 100644
--- a/udkapi/com/sun/star/lang/XMultiComponentFactory.idl
+++ b/udkapi/com/sun/star/lang/XMultiComponentFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
-#define __com_sun_star_lang_XMultiComponentFactory_idl__
-
+#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__ 
+#define __com_sun_star_lang_XMultiComponentFactory_idl__ 
+ 
 #ifndef __com_sun_star_uno_XComponentContext_idl__
-#include <com/sun/star/uno/XComponentContext.idl>
-#endif
+#include <com/sun/star/uno/XComponentContext.idl> 
+#endif 
 
 
 //=============================================================================
 
 module com {  module sun {  module star {  module lang {
 
-/** Factory interface for creating component instances giving a context from
+/** Factory interface for creating component instances giving a context from 
     which to retrieve deployment values.
-
-    @see XInitialization
+    
+    @see XInitialization 
 */
 published interface XMultiComponentFactory : com::sun::star::uno::XInterface
-{
+{ 
     /** Creates an instance of a component which supports the
         services specified by the factory.
-
+        
         @param aServiceSpecifier
                service name
         @param Context
@@ -57,11 +57,11 @@ published interface XMultiComponentFactory : com::sun::star::uno::XInterface
         [in] string aServiceSpecifier,
         [in] com::sun::star::uno::XComponentContext Context )
         raises (com::sun::star::uno::Exception);
-
+    
     /** Creates an instance of a component which supports the
         services specified by the factory, and initializes the new instance
         with the given arguments and context.
-
+        
         @param ServiceSpecifier
                service name
         @param Arguments
@@ -72,19 +72,19 @@ published interface XMultiComponentFactory : com::sun::star::uno::XInterface
                 component instance
     */
     com::sun::star::uno::XInterface createInstanceWithArgumentsAndContext(
-        [in] string ServiceSpecifier,
+        [in] string ServiceSpecifier, 
         [in] sequence<any> Arguments,
         [in] com::sun::star::uno::XComponentContext Context )
         raises (com::sun::star::uno::Exception);
-
+    
     /** Gets the names of all supported services.
-
-        @returns
+        
+        @returns 
                  sequence of all service names
     */
     sequence< string > getAvailableServiceNames();
-};
-
-}; }; }; };
-
-#endif
+}; 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/XMultiServiceFactory.idl b/udkapi/com/sun/star/lang/XMultiServiceFactory.idl
index 73ed89b21b4c..7278defb15da 100644
--- a/udkapi/com/sun/star/lang/XMultiServiceFactory.idl
+++ b/udkapi/com/sun/star/lang/XMultiServiceFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
-#define __com_sun_star_lang_XMultiServiceFactory_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__ 
+#define __com_sun_star_lang_XMultiServiceFactory_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 /** Factories support this interface creating instances giving a name,
     e.g. a service name.
-
+    
     <p>
     Note:
     Although this interface deals with the notion of "services", this is not
@@ -53,20 +53,20 @@ module com {  module sun {  module star {  module lang {
     </p>
 */
 published interface XMultiServiceFactory: com::sun::star::uno::XInterface
-{
+{ 
     /** Creates an instance classified by the specified name.
-
+        
         @param aServiceSpecifier
                classified name of instance
         @return
                 instance
     */
-    com::sun::star::uno::XInterface createInstance( [in] string aServiceSpecifier )
-        raises( com::sun::star::uno::Exception );
-
+    com::sun::star::uno::XInterface createInstance( [in] string aServiceSpecifier ) 
+        raises( com::sun::star::uno::Exception ); 
+    
     /** Creates an instance classified by the specified name and passes the arguments
         to that instance.
-
+        
         @param ServiceSpecifier
                classified name of instance
         @param Arguments
@@ -75,23 +75,23 @@ published interface XMultiServiceFactory: com::sun::star::uno::XInterface
                 instance
     */
     com::sun::star::uno::XInterface createInstanceWithArguments(
-        [in] string ServiceSpecifier,
-        [in] sequence<any> Arguments )
-        raises( com::sun::star::uno::Exception );
-
+        [in] string ServiceSpecifier, 
+        [in] sequence<any> Arguments ) 
+        raises( com::sun::star::uno::Exception ); 
+    
     /** Provides the available names of the factory to be used to create instances.
-
-        @returns
+        
+        @returns 
                  sequence of all names
     */
     sequence<string> getAvailableServiceNames();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/XServiceDisplayName.idl b/udkapi/com/sun/star/lang/XServiceDisplayName.idl
index 6715bc7e1212..2331393a7b24 100644
--- a/udkapi/com/sun/star/lang/XServiceDisplayName.idl
+++ b/udkapi/com/sun/star/lang/XServiceDisplayName.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_XServiceDisplayName_idl__
-#define __com_sun_star_lang_XServiceDisplayName_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_Locale_idl__
-#include <com/sun/star/lang/Locale.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
+#ifndef __com_sun_star_lang_XServiceDisplayName_idl__ 
+#define __com_sun_star_lang_XServiceDisplayName_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_Locale_idl__ 
+#include <com/sun/star/lang/Locale.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
 /** provides a name for the service to be used in displays.
 
      <p>This name can be used in displays (dialogs, menus, etc.) to provide
-     a more memorable / meaningful name than the service name or its
-     implementation name. It should not be used to identify / select a
+     a more memorable / meaningful name than the service name or its 
+     implementation name. It should not be used to identify / select a 
      specific service / implementation.</p>
  */
 published interface XServiceDisplayName : ::com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** returns the display name of the service for a given language.
 
-         <p>The caller may specify a
+         <p>The caller may specify a 
          <type scope="com::sun::star::lang">Locale</type> for the preferred
-         language of the resulting string.
+         language of the resulting string. 
          However, if that locale is not supported the resulting string may
          be given in a different language. Usually this should be English.</p>
 
@@ -64,13 +64,13 @@ published interface XServiceDisplayName : ::com::sun::star::uno::XInterface
          @returns
              the string to be used for the service in displays.
      */
-    string  getServiceDisplayName(
-            [in] ::com::sun::star::lang::Locale aLocale );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string	getServiceDisplayName( 
+            [in] ::com::sun::star::lang::Locale aLocale ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/udkapi/com/sun/star/lang/XServiceInfo.idl b/udkapi/com/sun/star/lang/XServiceInfo.idl
index 42f09f85e666..bd0acdb07cdb 100644
--- a/udkapi/com/sun/star/lang/XServiceInfo.idl
+++ b/udkapi/com/sun/star/lang/XServiceInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,56 +24,56 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_XServiceInfo_idl__
-#define __com_sun_star_lang_XServiceInfo_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_XServiceInfo_idl__ 
+#define __com_sun_star_lang_XServiceInfo_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 /** Provides information regarding the implementation, i.e. which services
     are implemented and the name of the implementation.
 */
 published interface XServiceInfo: com::sun::star::uno::XInterface
-{
+{ 
     /** Provides the implementation name of the service implementation.
-
-        @returns
+        
+        @returns 
                  unique name of the implementation
     */
-    string getImplementationName();
-
+    string getImplementationName(); 
+    
     /** Tests whether the specified service is supported, i.e. implemented
         by the implementation.
-
+        
         @param ServiceName
                name of service to be tested
         @return
                 true, if service is supported, false otherwise
     */
-    boolean supportsService( [in] string ServiceName );
-
+    boolean supportsService( [in] string ServiceName ); 
+    
     /** Provides the supported service names of the implementation, including
         also indirect service names.
-
+        
         @return
                 sequence of service names that are supported
     */
     sequence<string> getSupportedServiceNames();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
 
-=============================================================================*/
-#endif
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/XServiceName.idl b/udkapi/com/sun/star/lang/XServiceName.idl
index ec4910e2a97f..5c55c363e740 100644
--- a/udkapi/com/sun/star/lang/XServiceName.idl
+++ b/udkapi/com/sun/star/lang/XServiceName.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_XServiceName_idl__
-#define __com_sun_star_lang_XServiceName_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_XServiceName_idl__ 
+#define __com_sun_star_lang_XServiceName_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::lang::XServiceName
 /** identifies the object with a service name which can be used to create
     such an object by a factory.
  */
 published interface XServiceName: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from idl: method com::sun::star::lang::XServiceName::getServiceName
-    /** @returns
-            the service name that can be used to create such an object
-            by a factory.
-
+    /** @returns  
+            the service name that can be used to create such an object  
+            by a factory.  
+         
         @see com::sun::star::io::XPersistObject::getServiceName
      */
-    string getServiceName();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string getServiceName(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/XSingleComponentFactory.idl b/udkapi/com/sun/star/lang/XSingleComponentFactory.idl
index 776003591d93..580ec8f599e0 100644
--- a/udkapi/com/sun/star/lang/XSingleComponentFactory.idl
+++ b/udkapi/com/sun/star/lang/XSingleComponentFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,27 +24,27 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_XSingleComponentFactory_idl__
-#define __com_sun_star_lang_XSingleComponentFactory_idl__
-
-#ifndef __com_sun_star_uno_XComponentContext_idl__
-#include <com/sun/star/uno/XComponentContext.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
+#ifndef __com_sun_star_lang_XSingleComponentFactory_idl__ 
+#define __com_sun_star_lang_XSingleComponentFactory_idl__ 
+ 
+#ifndef __com_sun_star_uno_XComponentContext_idl__ 
+#include <com/sun/star/uno/XComponentContext.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
 /** Factory interface to create instances of an implementation of a service
     specification.
-
-    @see XInitialization
+    
+    @see XInitialization 
 */
 published interface XSingleComponentFactory : com::sun::star::uno::XInterface
-{
+{ 
     /** Creates an instance of a service implementation.
-
+        
         @param Context
                the instance gets its deployment values from this
         @return
@@ -53,10 +53,10 @@ published interface XSingleComponentFactory : com::sun::star::uno::XInterface
     com::sun::star::uno::XInterface createInstanceWithContext(
         [in] com::sun::star::uno::XComponentContext Context )
         raises (com::sun::star::uno::Exception);
-
+    
     /** Creates an instance of a component and initializes the new instance
         with the given arguments and context.
-
+        
         @param Arguments
                arguments passed to implementation
         @param Context
@@ -68,8 +68,8 @@ published interface XSingleComponentFactory : com::sun::star::uno::XInterface
         [in] sequence<any> Arguments,
         [in] com::sun::star::uno::XComponentContext Context )
         raises( com::sun::star::uno::Exception );
-};
-
+}; 
+ 
 }; }; }; };
 
-#endif
+#endif 
diff --git a/udkapi/com/sun/star/lang/XSingleServiceFactory.idl b/udkapi/com/sun/star/lang/XSingleServiceFactory.idl
index e8b246394ce1..74bdd4ee4d75 100644
--- a/udkapi/com/sun/star/lang/XSingleServiceFactory.idl
+++ b/udkapi/com/sun/star/lang/XSingleServiceFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
-#define __com_sun_star_lang_XSingleServiceFactory_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__ 
+#define __com_sun_star_lang_XSingleServiceFactory_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 /** Factory interface to produce instances of an implementation
     of a service specification.
-
+    
     This interface is deprecated.  Please use <type>XSingleComponentFactory</type>.
-
-    @see XInitialization
+    
+    @see XInitialization 
     @deprecated
 */
 published interface XSingleServiceFactory: com::sun::star::uno::XInterface
-{
+{ 
     /** Creates an instance of a service implementation.
 
         @return
                 service instance
     */
-    com::sun::star::uno::XInterface createInstance()
-        raises( com::sun::star::uno::Exception );
-
+    com::sun::star::uno::XInterface createInstance() 
+        raises( com::sun::star::uno::Exception ); 
+ 
     /** Creates an instance of a service implementation initialized with
         some arguments.
 
@@ -68,15 +68,15 @@ published interface XSingleServiceFactory: com::sun::star::uno::XInterface
         @return
                 service instance
     */
-    com::sun::star::uno::XInterface createInstanceWithArguments( [in] sequence<any> aArguments )
+    com::sun::star::uno::XInterface createInstanceWithArguments( [in] sequence<any> aArguments ) 
         raises( com::sun::star::uno::Exception );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/lang/XTypeProvider.idl b/udkapi/com/sun/star/lang/XTypeProvider.idl
index 95b70e4febaf..4ec3d75cc2be 100644
--- a/udkapi/com/sun/star/lang/XTypeProvider.idl
+++ b/udkapi/com/sun/star/lang/XTypeProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,56 +24,56 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_XTypeProvider_idl__
-#define __com_sun_star_lang_XTypeProvider_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
-#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
-/** interface to get information about the types
+#ifndef __com_sun_star_lang_XTypeProvider_idl__ 
+#define __com_sun_star_lang_XTypeProvider_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_XIdlClass_idl__ 
+#include <com/sun/star/reflection/XIdlClass.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
+/** interface to get information about the types 
     (usually interface types) supported by an object.
  */
 published interface XTypeProvider: com::sun::star::uno::XInterface
-{
+{ 
 
-    /** returns
-        a sequence of all types (usually interface types) provided by the object.
-        Important: If the object aggregates other objects the sequence also has
+    /** returns 
+        a sequence of all types (usually interface types) provided by the object. 
+        Important: If the object aggregates other objects the sequence also has  
         to contain all types supported by the aggregated objects.
      */
-    sequence<type> getTypes();
-
-
-    /** returns
+    sequence<type> getTypes(); 
+ 
+     
+    /** returns 
         a sequence of bytes with length > 0 that is used as an Id to distinguish
-        unambiguously between two sets of types, e.g. to realise hashing
-        functionality when the object is introspected. Two objects that return
-        the same UUID also have to return the same set of types in getTypes().
-
-        If a unique implementation Id cannot be provided this method has to return
+        unambiguously between two sets of types, e.g. to realise hashing 
+        functionality when the object is introspected. Two objects that return 
+        the same UUID also have to return the same set of types in getTypes(). 
+        
+        If a unique implementation Id cannot be provided this method has to return 
         an empty sequence.
 
-        Important: If the object aggregates other objects the UUID has to be unique
+        Important: If the object aggregates other objects the UUID has to be unique 
         for the whole combination of objects.
      */
-    sequence<byte> getImplementationId();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
-
-
+    sequence<byte> getImplementationId(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
+ 
+ 
diff --git a/udkapi/com/sun/star/lang/XUnoTunnel.idl b/udkapi/com/sun/star/lang/XUnoTunnel.idl
index c3fc7522a968..3b4ecfd6113f 100644
--- a/udkapi/com/sun/star/lang/XUnoTunnel.idl
+++ b/udkapi/com/sun/star/lang/XUnoTunnel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_lang_XUnoTunnel_idl__
-#define __com_sun_star_lang_XUnoTunnel_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module lang {
-
-//=============================================================================
-
+#ifndef __com_sun_star_lang_XUnoTunnel_idl__ 
+#define __com_sun_star_lang_XUnoTunnel_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module lang {  
+ 
+//============================================================================= 
+ 
 /** An interface to tunnel UNO. This means providing access to data or
     something else, which is not specified by UNO-IDL.
 
     @attention
     Restrictive useage.  Use only, if there is no better possibility left.
     It is definitely a hack.
-
+    
     <p>
     Common usage:
     Getting a C++ object pointer in the same process, thus to use an
@@ -53,7 +53,7 @@ module com {  module sun {  module star {  module lang {
     </p>
 */
 published interface XUnoTunnel: com::sun::star::uno::XInterface
-{
+{ 
     /** Call this method to get something which is not specified in UNO, e.g.
         an address to some C++ object.
 
@@ -68,13 +68,13 @@ published interface XUnoTunnel: com::sun::star::uno::XInterface
                 something
     */
     hyper getSomething( [in] sequence< byte > aIdentifier );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/loader/CannotActivateFactoryException.idl b/udkapi/com/sun/star/loader/CannotActivateFactoryException.idl
index aaae21e4234f..1169c29e1ebf 100644
--- a/udkapi/com/sun/star/loader/CannotActivateFactoryException.idl
+++ b/udkapi/com/sun/star/loader/CannotActivateFactoryException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_loader_CannotActivateFactoryException_idl__
-#define __com_sun_star_loader_CannotActivateFactoryException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module loader {
-
-//=============================================================================
-
+#ifndef __com_sun_star_loader_CannotActivateFactoryException_idl__ 
+#define __com_sun_star_loader_CannotActivateFactoryException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module loader {  
+ 
+//============================================================================= 
+ 
 /** indicates an error during component activation
     <p> This exception is thrown when an application tries to
     activate a component factory using the
-    <member>XImplementationLoader::activate()</member>
+    <member>XImplementationLoader::activate()</member> 
     method, but the component factory can not be activated.
     <p>
     Possible reasons for this error is a missing shared library or .jar file,
@@ -49,14 +49,14 @@
     contain some more detailed explanations.
  */
 published exception CannotActivateFactoryException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/loader/Dynamic.idl b/udkapi/com/sun/star/loader/Dynamic.idl
index 800064c3050b..821d9328c518 100644
--- a/udkapi/com/sun/star/loader/Dynamic.idl
+++ b/udkapi/com/sun/star/loader/Dynamic.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_loader_SharedLibrary_idl__
-#define __com_sun_star_loader_SharedLibrary_idl__
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
-module com {  module sun {  module star {  module loader {
-
- published interface XImplementationLoader;
-
-
+#ifndef __com_sun_star_loader_SharedLibrary_idl__ 
+#define __com_sun_star_loader_SharedLibrary_idl__ 
+ 
+#ifndef __com_sun_star_lang_XServiceInfo_idl_idl__ 
+#include <com/sun/star/lang/XServiceInfo.idl> 
+#endif 
+ 
+module com {  module sun {  module star {  module loader { 
+ 
+ published interface XImplementationLoader; 
+ 
+ 
 /** makes it possible to access services accessible via a <code>UnoUrlResolver</code>
     E.g., instantiation of services in another process. This service is still in an
     experimental state and should not be used in a production environment.
  */
 published service Dynamic
-{
+{ 
     /** is used to write persistent information into the given registry
-        for accessing a <code>SingleServiceFactory</code> and for activating this
+        for accessing a <code>SingleServiceFactory</code> and for activating this 
                 implementation.
      */
     /** allows registration and activation of described service.
@@ -53,15 +53,15 @@ published service Dynamic
         link        = a parameter given to a resolver to get a <code>SingleServiceFactory</code>
         resolver    = a <code>UnoUrlResolver</code> service, which is used to resolve the link
     */
-    interface XImplementationLoader;
-
-
+    interface XImplementationLoader; 
+ 
+     
     /** gives information about other supported services
      */
-    interface com::sun::star::lang::XServiceInfo;
-};
-
+    interface com::sun::star::lang::XServiceInfo; 
+}; 
+ 
 }; }; }; };
-
-#endif
-
+ 
+#endif 
+ 
diff --git a/udkapi/com/sun/star/loader/Java.idl b/udkapi/com/sun/star/loader/Java.idl
index 43ca17300bfe..77c8b1931b4e 100644
--- a/udkapi/com/sun/star/loader/Java.idl
+++ b/udkapi/com/sun/star/loader/Java.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_loader_Java_idl__
-#define __com_sun_star_loader_Java_idl__
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
- module com {  module sun {  module star {  module loader {
-
- published interface XImplementationLoader;
-
-
+#ifndef __com_sun_star_loader_Java_idl__ 
+#define __com_sun_star_loader_Java_idl__ 
+ 
+#ifndef __com_sun_star_lang_XServiceInfo_idl_idl__ 
+#include <com/sun/star/lang/XServiceInfo.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module loader { 
+ 
+ published interface XImplementationLoader; 
+ 
+ 
 // DocMerge from xml: service com::sun::star::loader::Java
 /** allows to access a java component stored with a .jar file
  */
 published service Java
-{
-
-    /** is used for writing persistent information in the registry for
+{ 
+     
+    /** is used for writing persistent information in the registry for  
                 external implementation and for activating this implementation. The
                 locationUrls must be absolute file urls.
      */
-    interface XImplementationLoader;
-
-
+    interface XImplementationLoader; 
+ 
+     
     /** gives information about other supported services
      */
-    interface com::sun::star::lang::XServiceInfo;
-};
-
-
-}; }; }; };
-
-/*=====================================================================
-
-      Source Code Control System - Update
-
-=====================================================================*/
-#endif
-
+    interface com::sun::star::lang::XServiceInfo; 
+}; 
+ 
+ 
+}; }; }; };  
+ 
+/*===================================================================== 
+ 
+      Source Code Control System - Update 
+ 
+=====================================================================*/ 
+#endif 
+ 
diff --git a/udkapi/com/sun/star/loader/Java2.idl b/udkapi/com/sun/star/loader/Java2.idl
index 4e0c2ff2546a..9238d70cb800 100644
--- a/udkapi/com/sun/star/loader/Java2.idl
+++ b/udkapi/com/sun/star/loader/Java2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,12 +24,12 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_loader_Java2_idl__
-#define __com_sun_star_loader_Java2_idl__
-
-#ifndef __com_sun_star_loader_Java_idl__
-#include <com/sun/star/loader/Java.idl>
-#endif
+#ifndef __com_sun_star_loader_Java2_idl__ 
+#define __com_sun_star_loader_Java2_idl__ 
+ 
+#ifndef __com_sun_star_loader_Java_idl__  
+#include <com/sun/star/loader/Java.idl> 
+#endif 
 
 
 module com {  module sun {  module star {  module loader {
@@ -40,12 +40,12 @@ UNO 2 components. Since UNO 2 is not supported anymore, the service
 name is reused again.
 */
 published service Java2
-{
+{ 
     service Java;
 
-};
-
-
+}; 
+ 
+ 
 }; }; }; };
-#endif
-
+#endif 
+ 
diff --git a/udkapi/com/sun/star/loader/SharedLibrary.idl b/udkapi/com/sun/star/loader/SharedLibrary.idl
index 29362851cba6..3e48ca936fdc 100644
--- a/udkapi/com/sun/star/loader/SharedLibrary.idl
+++ b/udkapi/com/sun/star/loader/SharedLibrary.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_loader_SharedLibrary_idl__
-#define __com_sun_star_loader_SharedLibrary_idl__
-
-#ifndef __com_sun_star_lang_XServiceInfo_idl_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
-#endif
-
- module com {  module sun {  module star {  module loader {
-
- published interface XImplementationLoader;
-
-
+#ifndef __com_sun_star_loader_SharedLibrary_idl__ 
+#define __com_sun_star_loader_SharedLibrary_idl__ 
+ 
+#ifndef __com_sun_star_lang_XServiceInfo_idl_idl__ 
+#include <com/sun/star/lang/XServiceInfo.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module loader { 
+ 
+ published interface XImplementationLoader; 
+ 
+ 
 /** allows to access a native component stored in a shared library.
  */
 published service SharedLibrary
-{
-
-    /** is used for writing persistent information in the registry for
-                an external implementation and for activating this
+{ 
+     
+    /** is used for writing persistent information in the registry for  
+                an external implementation and for activating this 
                 implementation.
      */
-    interface XImplementationLoader;
-
-
+    interface XImplementationLoader; 
+ 
+     
     /** gives information about other supported services
      */
-    interface com::sun::star::lang::XServiceInfo;
-};
-
-}; }; }; }; //module com.sun.star.loader
-
-/*=====================================================================
-
-      Source Code Control System - Update
-
-=====================================================================*/
-#endif
-
+    interface com::sun::star::lang::XServiceInfo; 
+}; 
+ 
+}; }; }; }; //module com.sun.star.loader 
+ 
+/*===================================================================== 
+ 
+      Source Code Control System - Update 
+ 
+=====================================================================*/ 
+#endif 
+ 
diff --git a/udkapi/com/sun/star/loader/XImplementationLoader.idl b/udkapi/com/sun/star/loader/XImplementationLoader.idl
index 837c31867895..2670c682c95b 100644
--- a/udkapi/com/sun/star/loader/XImplementationLoader.idl
+++ b/udkapi/com/sun/star/loader/XImplementationLoader.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_loader_XImplementationLoader_idl__
-#define __com_sun_star_loader_XImplementationLoader_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_registry_XRegistryKey_idl__
-#include <com/sun/star/registry/XRegistryKey.idl>
-#endif
-
-#ifndef __com_sun_star_registry_CannotRegisterImplementationException_idl__
-#include <com/sun/star/registry/CannotRegisterImplementationException.idl>
-#endif
-
-#ifndef __com_sun_star_loader_CannotActivateFactoryException_idl__
-#include <com/sun/star/loader/CannotActivateFactoryException.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module loader {
-
-//=============================================================================
-
+#ifndef __com_sun_star_loader_XImplementationLoader_idl__ 
+#define __com_sun_star_loader_XImplementationLoader_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_registry_XRegistryKey_idl__ 
+#include <com/sun/star/registry/XRegistryKey.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_registry_CannotRegisterImplementationException_idl__ 
+#include <com/sun/star/registry/CannotRegisterImplementationException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_loader_CannotActivateFactoryException_idl__ 
+#include <com/sun/star/loader/CannotActivateFactoryException.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module loader {  
+ 
+//============================================================================= 
+ 
 /** handles activation (loading) of a UNO component.
-    @see        com::sun::star::registry::XImplementationRegistration
+    @see		com::sun::star::registry::XImplementationRegistration
  */
 published interface XImplementationLoader: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** activates a concrete implementation within a component.
         @param implementationName The name of the implementation,
                which shall be instantiated. The method
@@ -72,25 +72,25 @@ published interface XImplementationLoader: com::sun::star::uno::XInterface
                that it is a relative file url. <p>Special loaders may define
                their own protocol (for instance an executable loader may need
                more than only one file url).
-
+               
         @param xKey A registry which may be used to read static data previously
                written via <method>XImplementationLoader::writeRegistryInfo()</method>.
                The use of this parameter is deprecated.
-
+               
         @return returns a factory interface, which allows to create an instance of
                 the concrete implementation. In general, the object supports a
                 <type scope="com::sun::star::lang">XSingleComponentFactory</type>
                 and the <type scope="com::sun::star::lang">XServiceInfo</type> interface. The
                 XServiceInfo interface informs about the capabilities of the
-                service implementation, not the factory itself.
+                service implementation, not the factory itself.            
      */
-    com::sun::star::uno::XInterface activate( [in] string implementationName,
-             [in] string implementationLoaderUrl,
-             [in] string locationUrl,
-             [in] com::sun::star::registry::XRegistryKey xKey )
-            raises( com::sun::star::loader::CannotActivateFactoryException );
-
-    //-------------------------------------------------------------------------
+    com::sun::star::uno::XInterface activate( [in] string implementationName, 
+             [in] string implementationLoaderUrl, 
+             [in] string locationUrl, 
+             [in] com::sun::star::registry::XRegistryKey xKey ) 
+            raises( com::sun::star::loader::CannotActivateFactoryException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** writes a list of all implementations hosted by this component into a registry key.
         <p>This method is called during registering a component.
         @param xKey The registry key, which shall be used to write for each
@@ -109,15 +109,15 @@ published interface XImplementationLoader: com::sun::star::uno::XInterface
                more than only one file url).
         @see com::sun::star::registry::XImplementationRegistration
      */
-    boolean writeRegistryInfo( [in] com::sun::star::registry::XRegistryKey xKey,
-             [in] string implementationLoaderUrl,
-             [in] string locationUrl )
-            raises( com::sun::star::registry::CannotRegisterImplementationException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean writeRegistryInfo( [in] com::sun::star::registry::XRegistryKey xKey, 
+             [in] string implementationLoaderUrl, 
+             [in] string locationUrl ) 
+            raises( com::sun::star::registry::CannotRegisterImplementationException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/CoreReflection.idl b/udkapi/com/sun/star/reflection/CoreReflection.idl
index 3398897c1984..ec07542fc5ae 100644
--- a/udkapi/com/sun/star/reflection/CoreReflection.idl
+++ b/udkapi/com/sun/star/reflection/CoreReflection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_CoreReflection_idl__
-#define __com_sun_star_reflection_CoreReflection_idl__
-
+#ifndef __com_sun_star_reflection_CoreReflection_idl__ 
+#define __com_sun_star_reflection_CoreReflection_idl__ 
+ 
 #ifndef __com_sun_star_reflection_XIdlReflection_idl__
-#include <com/sun/star/reflection/XIdlReflection.idl>
+#include <com/sun/star/reflection/XIdlReflection.idl> 
 #endif
 
 #ifndef __com_sun_star_lang_XComponent_idl__
-#include <com/sun/star/lang/XComponent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#include <com/sun/star/lang/XComponent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** This service is the implementation of the reflection API.
     You can obtain information about types, modify values of reflected types
     and call on objects.
@@ -64,11 +64,11 @@ singleton theCoreReflection
 };
 */
 
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/FieldAccessMode.idl b/udkapi/com/sun/star/reflection/FieldAccessMode.idl
index 233c6c74b5d4..cba4e5fdbf00 100644
--- a/udkapi/com/sun/star/reflection/FieldAccessMode.idl
+++ b/udkapi/com/sun/star/reflection/FieldAccessMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_FieldAccessMode_idl__
-#define __com_sun_star_reflection_FieldAccessMode_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_FieldAccessMode_idl__ 
+#define __com_sun_star_reflection_FieldAccessMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+  
 /** Denotes the access possibilities via <type>XIdlField2</type> to an
     interface attribute, enum or compound type (struct/exception).
 */
 published enum FieldAccessMode
-{
+{ 
     /** readable and writeable
     */
-    READWRITE,
+    READWRITE,    
     /** readable only
     */
-    READONLY,
+    READONLY, 
     /** writeable only
     */
-    WRITEONLY,
+    WRITEONLY, 
     /** Deprecated.  Not used anymore.
         @deprecated
     */
     CONST
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl b/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
index 783763254a98..80bf701c81ab 100644
--- a/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
+++ b/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/InvocationTargetException.idl b/udkapi/com/sun/star/reflection/InvocationTargetException.idl
index cbc3e9aec5be..6713d80f9289 100644
--- a/udkapi/com/sun/star/reflection/InvocationTargetException.idl
+++ b/udkapi/com/sun/star/reflection/InvocationTargetException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
-#define __com_sun_star_reflection_InvocationTargetException_idl__
-
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__
-#include <com/sun/star/lang/WrappedTargetException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_InvocationTargetException_idl__ 
+#define __com_sun_star_reflection_InvocationTargetException_idl__ 
+ 
+#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
+#include <com/sun/star/lang/WrappedTargetException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** This exception denotes a checked exception (wrapping an originating exception)
     and may be thrown upon using invocation API.
-
+    
     @see XIdlMethod
 */
 published exception InvocationTargetException: com::sun::star::lang::WrappedTargetException
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/MethodMode.idl b/udkapi/com/sun/star/reflection/MethodMode.idl
index c5b2afe2c0de..c33ec7c82c82 100644
--- a/udkapi/com/sun/star/reflection/MethodMode.idl
+++ b/udkapi/com/sun/star/reflection/MethodMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,36 +24,36 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_MethodMode_idl__
-#define __com_sun_star_reflection_MethodMode_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_MethodMode_idl__ 
+#define __com_sun_star_reflection_MethodMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** MethodMode denotes the mode in which method calls are run, i.e. either oneway or
     twoway.  Mode oneway denotes that a call may be run asynchronously
     (thus having no out parameters or return value)
 */
 published enum MethodMode
-{
+{ 
     /** method may be run asynchronously
      */
-    ONEWAY,
-
-    /** method is run The
+    ONEWAY, 
+    
+    /** method is run The 
      */
     TWOWAY
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/NoSuchTypeNameException.idl b/udkapi/com/sun/star/reflection/NoSuchTypeNameException.idl
index b553d4d0aedc..60db1efcd054 100644
--- a/udkapi/com/sun/star/reflection/NoSuchTypeNameException.idl
+++ b/udkapi/com/sun/star/reflection/NoSuchTypeNameException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/ParamInfo.idl b/udkapi/com/sun/star/reflection/ParamInfo.idl
index e3510a7502ea..bac6fd1db581 100644
--- a/udkapi/com/sun/star/reflection/ParamInfo.idl
+++ b/udkapi/com/sun/star/reflection/ParamInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_ParamInfo_idl__
-#define __com_sun_star_reflection_ParamInfo_idl__
-
-#ifndef __com_sun_star_reflection_ParamMode_idl__
-#include <com/sun/star/reflection/ParamMode.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
- published interface XIdlClass;
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_ParamInfo_idl__ 
+#define __com_sun_star_reflection_ParamInfo_idl__ 
+ 
+#ifndef __com_sun_star_reflection_ParamMode_idl__ 
+#include <com/sun/star/reflection/ParamMode.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+ published interface XIdlClass; 
+ 
+//============================================================================= 
+ 
 /** Provides information about a formal parameter of a method.
 */
 published struct ParamInfo
 {
     /** name of the parameter
     */
-    string aName;
-
+    string aName; 
+    
     /** parameter mode: in, out, inout
     */
-    ParamMode aMode;
-
+    ParamMode aMode; 
+    
     /** formal type of the parameter
     */
     XIdlClass aType;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/ParamMode.idl b/udkapi/com/sun/star/reflection/ParamMode.idl
index a14157eb603c..d0f8685d7e6a 100644
--- a/udkapi/com/sun/star/reflection/ParamMode.idl
+++ b/udkapi/com/sun/star/reflection/ParamMode.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_ParamMode_idl__
-#define __com_sun_star_reflection_ParamMode_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_ParamMode_idl__ 
+#define __com_sun_star_reflection_ParamMode_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** The parameter mode denotes the transfer between caller and callee
     of a method.
 */
 published enum ParamMode
-{
+{ 
     /** parameter serves as pure input for a called method
     */
-    IN,
-
+    IN, 
+    
     /** parameter serves as pure output for the callee (in addition to the return value)
     */
-    OUT,
-
+    OUT, 
+    
     /** parameter serves as input as well as output; data can transferred in both directions
     */
-    INOUT
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    INOUT 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/ProxyFactory.idl b/udkapi/com/sun/star/reflection/ProxyFactory.idl
index 872a9b8529b3..99ab2912ad83 100644
--- a/udkapi/com/sun/star/reflection/ProxyFactory.idl
+++ b/udkapi/com/sun/star/reflection/ProxyFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_ProxyFactory_idl__
-#define __com_sun_star_reflection_ProxyFactory_idl__
-
-#ifndef __com_sun_star_reflection_XProxyFactory_idl__
-#include <com/sun/star/reflection/XProxyFactory.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_ProxyFactory_idl__ 
+#define __com_sun_star_reflection_ProxyFactory_idl__ 
+ 
+#ifndef __com_sun_star_reflection_XProxyFactory_idl__ 
+#include <com/sun/star/reflection/XProxyFactory.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** Service to create proxy objects acting on behalf of a given
     target object.<br>
     A proxy delegates calls to a given target object.
     In addition, it is aggregatable, thus it is possible to
     intercept calls on the proxy's interfaces.
-
+    
     @attention
     A proxy object is UNO conform, but does NOT provide original target
     interfaces on queryInterface() calls.  This may lead to problems
@@ -60,14 +60,14 @@ published service ProxyFactory
 {
     /** Factory interface to produce proxies
     */
-    interface com::sun::star::reflection::XProxyFactory;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    interface com::sun::star::reflection::XProxyFactory; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl b/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl
index 77dd99f6b2a5..7741da961750 100644
--- a/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl
+++ b/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/TypeDescriptionProvider.idl b/udkapi/com/sun/star/reflection/TypeDescriptionProvider.idl
index c99217a807fb..25f1c77ffac0 100644
--- a/udkapi/com/sun/star/reflection/TypeDescriptionProvider.idl
+++ b/udkapi/com/sun/star/reflection/TypeDescriptionProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/TypeDescriptionSearchDepth.idl b/udkapi/com/sun/star/reflection/TypeDescriptionSearchDepth.idl
index b49d7ba3c019..12ef4ec2087d 100644
--- a/udkapi/com/sun/star/reflection/TypeDescriptionSearchDepth.idl
+++ b/udkapi/com/sun/star/reflection/TypeDescriptionSearchDepth.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/XArrayTypeDescription.idl b/udkapi/com/sun/star/reflection/XArrayTypeDescription.idl
index 9719376f16ac..0529e627e397 100644
--- a/udkapi/com/sun/star/reflection/XArrayTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XArrayTypeDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XArrayTypeDescription_idl__
-#define __com_sun_star_reflection_XArrayTypeDescription_idl__
-
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
-#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_XArrayTypeDescription_idl__ 
+#define __com_sun_star_reflection_XArrayTypeDescription_idl__ 
+ 
+#ifndef __com_sun_star_reflection_XTypeDescription_idl__ 
+#include <com/sun/star/reflection/XTypeDescription.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** Deprecated.  Arrays are not supported.
     Reflects a fixed-size array type.
     The type class of this description is TypeClass_ARRAY.
@@ -45,34 +45,34 @@
     @deprecated
 */
 published interface XArrayTypeDescription: com::sun::star::reflection::XTypeDescription
-{
+{ 
     /** Returns the element type of the array.
-
+        
         @return
                 element type of the array
     */
-    com::sun::star::reflection::XTypeDescription getType();
-
+    com::sun::star::reflection::XTypeDescription getType(); 
+    
     /** Returns the number of dimensions of the array.
-
+        
         @return
                 dimension of the array
     */
-    long getNumberOfDimensions();
-
+    long getNumberOfDimensions(); 
+    
     /** Returns dimensions of array (same length as getNumberOfDimensions()).
-
+        
         @return
                 dimensions of array
     */
     sequence< long > getDimensions();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XCompoundTypeDescription.idl b/udkapi/com/sun/star/reflection/XCompoundTypeDescription.idl
index 4ac232067452..8554d7dbb987 100644
--- a/udkapi/com/sun/star/reflection/XCompoundTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XCompoundTypeDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XCompoundTypeDescription_idl__
-#define __com_sun_star_reflection_XCompoundTypeDescription_idl__
-
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
-#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_XCompoundTypeDescription_idl__ 
+#define __com_sun_star_reflection_XCompoundTypeDescription_idl__ 
+ 
+#ifndef __com_sun_star_reflection_XTypeDescription_idl__ 
+#include <com/sun/star/reflection/XTypeDescription.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** Reflects a compound type, i.e. a struct or exception.
 
     <p>For struct types, this type is superseded by
@@ -45,15 +45,15 @@
     types.</p>
 */
 published interface XCompoundTypeDescription: com::sun::star::reflection::XTypeDescription
-{
+{ 
     /** Returns the type of the base type of the compound type.
         If the compound does not have a base type, the method returns a null interface.
-
+        
         @return
                 base interface or null
     */
-    com::sun::star::reflection::XTypeDescription getBaseType();
-
+    com::sun::star::reflection::XTypeDescription getBaseType(); 
+    
     /** Returns the member types of the struct/exception in IDL declaration order.
 
         <p>For a polymorphic struct type template, a member of parameterized
@@ -65,21 +65,21 @@ published interface XCompoundTypeDescription: com::sun::star::reflection::XTypeD
         @return
                 members of struct/exception
     */
-    sequence<com::sun::star::reflection::XTypeDescription> getMemberTypes();
-
+    sequence<com::sun::star::reflection::XTypeDescription> getMemberTypes(); 
+    
     /** Returns the member names of the struct/exception in IDL declaration order.
 
         @return
                 members names of struct/exception
     */
-    sequence<string> getMemberNames();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    sequence<string> getMemberNames(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XConstantTypeDescription.idl b/udkapi/com/sun/star/reflection/XConstantTypeDescription.idl
index e830a191bb6e..c960c9f6ef9d 100644
--- a/udkapi/com/sun/star/reflection/XConstantTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XConstantTypeDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/XConstantsTypeDescription.idl b/udkapi/com/sun/star/reflection/XConstantsTypeDescription.idl
index 438413614d98..181d2528b16b 100644
--- a/udkapi/com/sun/star/reflection/XConstantsTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XConstantsTypeDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/XEnumTypeDescription.idl b/udkapi/com/sun/star/reflection/XEnumTypeDescription.idl
index 8226b9e21361..67219dcb31d5 100644
--- a/udkapi/com/sun/star/reflection/XEnumTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XEnumTypeDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XEnumTypeDescription_idl__
-#define __com_sun_star_reflection_XEnumTypeDescription_idl__
-
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
-#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_XEnumTypeDescription_idl__ 
+#define __com_sun_star_reflection_XEnumTypeDescription_idl__ 
+ 
+#ifndef __com_sun_star_reflection_XTypeDescription_idl__ 
+#include <com/sun/star/reflection/XTypeDescription.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** Reflects an enum type.
 */
 published interface XEnumTypeDescription: com::sun::star::reflection::XTypeDescription
-{
+{ 
     /** Returns the default enum value.
 
         @return
                 default enum value
     */
-    long getDefaultEnumValue();
-
+    long getDefaultEnumValue(); 
+    
     /** Returns the enum member values.
 
         @return
                 enum member values
     */
-    sequence<string> getEnumNames();
-
+    sequence<string> getEnumNames(); 
+    
     /** Returns the enum member names.
 
         @return
                 enum member names
     */
     sequence<long> getEnumValues();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XIdlArray.idl b/udkapi/com/sun/star/reflection/XIdlArray.idl
index 702201642d2e..8bd0630624e8 100644
--- a/udkapi/com/sun/star/reflection/XIdlArray.idl
+++ b/udkapi/com/sun/star/reflection/XIdlArray.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XIdlArray_idl__
-#define __com_sun_star_reflection_XIdlArray_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_ArrayIndexOutOfBoundsException_idl__
-#include <com/sun/star/lang/ArrayIndexOutOfBoundsException.idl>
-#endif
-
-
+#ifndef __com_sun_star_reflection_XIdlArray_idl__ 
+#define __com_sun_star_reflection_XIdlArray_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_ArrayIndexOutOfBoundsException_idl__ 
+#include <com/sun/star/lang/ArrayIndexOutOfBoundsException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
 //=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+     
 /** Reflects an IDL sequence and provides dynamic access to instances of
     that sequence.
     This interface supports widening conversion when getting or setting elements.
-
+    
     @attention
     Although the name of this interface denotes arrays,
     sequences are meant. Don't be obfuscated, arrays are not supported by UNO!
 */
 published interface XIdlArray: com::sun::star::uno::XInterface
-{
+{ 
     /** Rellocates the length of the sequence instance.
-
+        
         @param array
                sequence instance
         @length
@@ -65,19 +65,19 @@ published interface XIdlArray: com::sun::star::uno::XInterface
      */
     void realloc(
         [inout] any array,
-        [in] long length )
-        raises( com::sun::star::lang::IllegalArgumentException );
-
+        [in] long length ) 
+        raises( com::sun::star::lang::IllegalArgumentException ); 
+    
     /** Returns the length of the given sequence.
-
+        
         @param array
                sequence instance
         @return
                 length of sequence
     */
-    long getLen( [in] any array )
-        raises( com::sun::star::lang::IllegalArgumentException );
-
+    long getLen( [in] any array ) 
+        raises( com::sun::star::lang::IllegalArgumentException ); 
+    
     /** Returns element at given index.
 
         @param aArray
@@ -87,19 +87,19 @@ published interface XIdlArray: com::sun::star::uno::XInterface
         @return
                 value
 
-        @throws IllegalArgumentException
+        @throws IllegalArgumentException  
         if the specified object is not a sequence or if the specified object is null
-
-        @throws ArrayIndexOutOfBoundsException
-        if the specified index argument is negative, or if it is greater than or equal to the
+        
+        @throws ArrayIndexOutOfBoundsException  
+        if the specified index argument is negative, or if it is greater than or equal to the 
         length of the specified sequence.
     */
     any get(
-        [in] any aArray,
-        [in] long nIndex )
-        raises( com::sun::star::lang::IllegalArgumentException,
-                com::sun::star::lang::ArrayIndexOutOfBoundsException );
-
+        [in] any aArray, 
+        [in] long nIndex ) 
+        raises( com::sun::star::lang::IllegalArgumentException, 
+                com::sun::star::lang::ArrayIndexOutOfBoundsException ); 
+    
     /** Sets a new value at given index.
 
         @param aArray
@@ -108,27 +108,27 @@ published interface XIdlArray: com::sun::star::uno::XInterface
                index
         @param aNewValue
                new value to be set
-
-        @throws IllegalArgumentException
+        
+        @throws IllegalArgumentException  
         if the specified object is not a sequence or if the specified object is null
-
-        @throws ArrayIndexOutOfBoundsException
-        if the specified index argument is negative, or if it is greater than or equal to the
+        
+        @throws ArrayIndexOutOfBoundsException  
+        if the specified index argument is negative, or if it is greater than or equal to the 
         length of the specified sequence.
     */
     void set(
-        [inout] any aArray,
-        [in] long nIndex,
-        [in] any aNewValue )
-        raises( com::sun::star::lang::IllegalArgumentException,
+        [inout] any aArray, 
+        [in] long nIndex, 
+        [in] any aNewValue ) 
+        raises( com::sun::star::lang::IllegalArgumentException, 
                 com::sun::star::lang::ArrayIndexOutOfBoundsException );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XIdlClass.idl b/udkapi/com/sun/star/reflection/XIdlClass.idl
index fd9048ce111c..7c29f0bb03e9 100644
--- a/udkapi/com/sun/star/reflection/XIdlClass.idl
+++ b/udkapi/com/sun/star/reflection/XIdlClass.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
-#define __com_sun_star_reflection_XIdlClass_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_TypeClass_idl__
-#include <com/sun/star/uno/TypeClass.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Uik_idl__
-#include <com/sun/star/uno/Uik.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module reflection {
-
- published interface XIdlField;
- published interface XIdlMethod;
- published interface XIdlArray;
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_XIdlClass_idl__ 
+#define __com_sun_star_reflection_XIdlClass_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_TypeClass_idl__ 
+#include <com/sun/star/uno/TypeClass.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_Uik_idl__ 
+#include <com/sun/star/uno/Uik.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module reflection {  
+ 
+ published interface XIdlField; 
+ published interface XIdlMethod; 
+ published interface XIdlArray; 
+ 
+//============================================================================= 
+ 
 /** Provides information reflecting an UNO type.
 */
 published interface XIdlClass: com::sun::star::uno::XInterface
-{
+{ 
     /** Deprecated.  Do not call.
         @deprecated
     */
-    sequence<XIdlClass> getClasses();
+    sequence<XIdlClass> getClasses(); 
     /** Deprecated.  Do not call.
         @deprecated
     */
-    XIdlClass getClass( [in] string aName );
-
+    XIdlClass getClass( [in] string aName ); 
+    
     /** Tests whether two reflecting objects reflect the same type.
 
         @returns
                 true, if the objects reflect the same type, false otherwise.
     */
-    boolean equals( [in] XIdlClass Type );
-
+    boolean equals( [in] XIdlClass Type ); 
+ 
     /** Tests whether values of this reflected type are assignable from values
         of a second one (<code>xType</code>).
 
@@ -78,55 +78,55 @@ published interface XIdlClass: com::sun::star::uno::XInterface
                 true, if values of this reflected type are assignable
                 from values of <code>xType</code>.
     */
-    boolean isAssignableFrom( [in] XIdlClass xType );
-
+    boolean isAssignableFrom( [in] XIdlClass xType ); 
+ 
     /** Returns the <type scope="com::sun::star::uno">TypeClass</type>
         of the reflected type.
-
-        @returns
+        
+        @returns  
                   type class of the reflected type.
     */
-    com::sun::star::uno::TypeClass getTypeClass();
-
+    com::sun::star::uno::TypeClass getTypeClass(); 
+ 
     /** Returns the fully-qualified name of the reflected type.
-
-        @returns
+        
+        @returns  
                   the fully-qualified name of the type
     */
-    string getName();
-
+    string getName(); 
+ 
     /** Deprecated.  Do not call.
 
         @deprecated
     */
-    com::sun::star::uno::Uik getUik();
-
+    com::sun::star::uno::Uik getUik(); 
+ 
     /** If the reflected type is an interface, then the returned
         sequence of <type>XIdlClass</type> reflect the base interfaces.
         <br>
         If the reflected type is not an interface or an interface that is
         not derived from another, then an empty sequence is returned.
-
+        
         @return
                 all base interfaces of an interface type or an empty sequence.
     */
-    sequence<XIdlClass> getSuperclasses();
-
+    sequence<XIdlClass> getSuperclasses(); 
+    
     /** Deprecated.  Do not call.
         @deprecated
     */
-    sequence<XIdlClass> getInterfaces();
-
+    sequence<XIdlClass> getInterfaces(); 
+ 
     /** If the reflected type is an array or sequence, then this method
         returns a <type>XIdlClass</type> interface reflecting
         the element.
-
+        
         @return
                 reflection interface of the element type of an array or
                 sequence type (null-reference otherwise).
     */
-    XIdlClass getComponentType();
-
+    XIdlClass getComponentType(); 
+    
     /** If the reflected type is an interface, struct or union, then you
         get a <type>XIdlField</type> interface reflecting the demanded
         field (/interface attribute) by name.
@@ -134,14 +134,14 @@ published interface XIdlClass: com::sun::star::uno::XInterface
         If the reflected type is not an interface, struct or union or the
         interace, struct or union does not have a field (/interface attribute)
         with the demanded name, then a null-reference is returned.
-
+        
         @param aName
                name of the demanded field reflection
         @return
                 demanded field (/interface attribute) reflection (or null-reference)
     */
-    XIdlField getField( [in] string aName );
-
+    XIdlField getField( [in] string aName ); 
+ 
     /** If the reflected type is an interface, struct or union, then you
         get a sequence of <type>XIdlField</type> interfaces reflecting all fields
         (/interface attributes).  This also includes all inherited
@@ -150,48 +150,48 @@ published interface XIdlClass: com::sun::star::uno::XInterface
         If the reflected type is not an interface, struct or union or the
         interface, struct or union does not have any field (/interface attribute),
         then an empty sequence is returned.
-
+        
         @return
                 all field (/interface attribute) reflections (or empty sequence)
     */
-    sequence<XIdlField> getFields();
-
+    sequence<XIdlField> getFields(); 
+ 
     /** If the reflected type is an interface, then you get
         a <type>XIdlMethod</type> interface reflecting the demanded method by name.
         <br>
         If the reflected type is not an interface or the interface does not have
         a method with the demanded name (including inherited methods),
         then a null-reference is returned.
-
-        @param aName
+        
+        @param aName 
                name of demanded method reflection
         @return
                 demanded method reflection (or null-reference)
     */
-    XIdlMethod getMethod( [in] string aName );
-
+    XIdlMethod getMethod( [in] string aName ); 
+ 
     /** If the reflected type is an interface, then you get
         a sequence of <type>XIdlMethod</type> interfaces reflecting all methods
         of the interface.  This also includes the inherited methods of the interface.
         <br>
         If the reflected type is not an interface or the interface
         does not have any methods, then a null-reference is returned.
-
+        
         @return
                 all method reflections (or empty sequence)
     */
-    sequence<XIdlMethod> getMethods();
-
+    sequence<XIdlMethod> getMethods(); 
+ 
     /** If the reflected type is an array, then you get
         a <type>XIdlArray</type> interface to modify instances of the array type.
         <br>
         If the reflected type is not an array, then a null-reference is returned.
-
+        
         @return
                 inteface to modify array instances (or null-reference)
     */
-    XIdlArray getArray();
-
+    XIdlArray getArray(); 
+    
     /** This method creates instances of the reflected type.
 
         @attention
@@ -203,13 +203,13 @@ published interface XIdlClass: com::sun::star::uno::XInterface
                pure out parameter to pass the created instance
     */
     void createObject( [out] any obj );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XIdlClassProvider.idl b/udkapi/com/sun/star/reflection/XIdlClassProvider.idl
index 0b61cdd68bd8..0eb83d7a925f 100644
--- a/udkapi/com/sun/star/reflection/XIdlClassProvider.idl
+++ b/udkapi/com/sun/star/reflection/XIdlClassProvider.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XIdlClassProvider_idl__
-#define __com_sun_star_reflection_XIdlClassProvider_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
-#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_XIdlClassProvider_idl__ 
+#define __com_sun_star_reflection_XIdlClassProvider_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_XIdlClass_idl__ 
+#include <com/sun/star/reflection/XIdlClass.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** Deprecated interface.  Do not use anymore.
 
     @deprecated
 */
 published interface XIdlClassProvider: com::sun::star::uno::XInterface
-{
-    sequence<com::sun::star::reflection::XIdlClass> getIdlClasses();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+    sequence<com::sun::star::reflection::XIdlClass> getIdlClasses(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XIdlField.idl b/udkapi/com/sun/star/reflection/XIdlField.idl
index 76daf3a1d83e..d03e8b54801b 100644
--- a/udkapi/com/sun/star/reflection/XIdlField.idl
+++ b/udkapi/com/sun/star/reflection/XIdlField.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XIdlField_idl__
-#define __com_sun_star_reflection_XIdlField_idl__
-
-#ifndef __com_sun_star_reflection_XIdlMember_idl__
-#include <com/sun/star/reflection/XIdlMember.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
-#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_FieldAccessMode_idl__
-#include <com/sun/star/reflection/FieldAccessMode.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
-#include <com/sun/star/lang/IllegalAccessException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_XIdlField_idl__ 
+#define __com_sun_star_reflection_XIdlField_idl__ 
+ 
+#ifndef __com_sun_star_reflection_XIdlMember_idl__ 
+#include <com/sun/star/reflection/XIdlMember.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_XIdlClass_idl__ 
+#include <com/sun/star/reflection/XIdlClass.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_FieldAccessMode_idl__ 
+#include <com/sun/star/reflection/FieldAccessMode.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalAccessException_idl__ 
+#include <com/sun/star/lang/IllegalAccessException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** Deprecated.  Use <type scope="com::sun::star::reflection">XIdlField2</type>
     instead.
-
+    
     @deprecated
 */
 published interface XIdlField: com::sun::star::reflection::XIdlMember
-{
-    com::sun::star::reflection::XIdlClass getType();
-    com::sun::star::reflection::FieldAccessMode getAccessMode();
+{ 
+    com::sun::star::reflection::XIdlClass getType(); 
+    com::sun::star::reflection::FieldAccessMode getAccessMode(); 
     any get(
-        [in] any obj )
-        raises( com::sun::star::lang::IllegalArgumentException );
+        [in] any obj ) 
+        raises( com::sun::star::lang::IllegalArgumentException ); 
     void set(
-        [in] any obj,
-        [in] any value )
-        raises( com::sun::star::lang::IllegalArgumentException,
+        [in] any obj, 
+        [in] any value ) 
+        raises( com::sun::star::lang::IllegalArgumentException, 
                 com::sun::star::lang::IllegalAccessException );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XIdlField2.idl b/udkapi/com/sun/star/reflection/XIdlField2.idl
index 87e516c906dd..c134419476d2 100644
--- a/udkapi/com/sun/star/reflection/XIdlField2.idl
+++ b/udkapi/com/sun/star/reflection/XIdlField2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,80 +24,80 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XIdlField2_idl__
-#define __com_sun_star_reflection_XIdlField2_idl__
-
-#ifndef __com_sun_star_reflection_XIdlMember_idl__
-#include <com/sun/star/reflection/XIdlMember.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
-#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_FieldAccessMode_idl__
-#include <com/sun/star/reflection/FieldAccessMode.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalAccessException_idl__
-#include <com/sun/star/lang/IllegalAccessException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_XIdlField2_idl__ 
+#define __com_sun_star_reflection_XIdlField2_idl__ 
+ 
+#ifndef __com_sun_star_reflection_XIdlMember_idl__ 
+#include <com/sun/star/reflection/XIdlMember.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_XIdlClass_idl__ 
+#include <com/sun/star/reflection/XIdlClass.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_FieldAccessMode_idl__ 
+#include <com/sun/star/reflection/FieldAccessMode.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalAccessException_idl__ 
+#include <com/sun/star/lang/IllegalAccessException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** Reflects an IDL interface attribute, enum or compound type
     (i.e. struct/exception) member.
 */
 published interface XIdlField2: com::sun::star::reflection::XIdlMember
-{
+{ 
     /** Returns the type of the field.
 
         @return
                 type of the field
     */
-    com::sun::star::reflection::XIdlClass getType();
-
+    com::sun::star::reflection::XIdlClass getType(); 
+    
     /** Returns the access mode of the field, i.e. read-write, read-only or
         write-only (access mode "const" is deprecated).
-
+        
         @return
                 access mode of the field
     */
-    com::sun::star::reflection::FieldAccessMode getAccessMode();
-
+    com::sun::star::reflection::FieldAccessMode getAccessMode(); 
+    
     /** Gets the value of the reflected field from the given object,
         i.e. an interface, enum or compound type (struct/exception).
         For enums, the given object is ignored; the returned value
         reflects the constant enum 32-bit value.
-
+        
         <p>When setting an interface attribute raises a
         non-<type scope="com::sun::star::uno">RuntimeException</type>, it is
         wrapped in a <type
         scope="com::sun::star::lang">WrappedTargetRuntimeException</type>.</p>
-
+        
         @param obj
                object instance having member of reflected type
         @return
                 value of field
-
+                
         @throws IllegalAccessException
         An <type scope="com::sun::star::lang">IllegalAccessException</type>
         is thrown if the given object is no interface, enum or compound type;
         or the given object does not have the reflected field.
     */
     any get(
-        [in] any obj )
-        raises( com::sun::star::lang::IllegalArgumentException );
-
+        [in] any obj ) 
+        raises( com::sun::star::lang::IllegalArgumentException ); 
+    
     /** Sets the value of the reflected field of the given object,
         i.e. an interface or compound type (struct/exception).
 
@@ -105,29 +105,29 @@ published interface XIdlField2: com::sun::star::reflection::XIdlMember
         non-<type scope="com::sun::star::uno">RuntimeException</type>, it is
         wrapped in a <type
         scope="com::sun::star::lang">WrappedTargetRuntimeException</type>.</p>
-
+        
         @param obj
                object instance having member of reflected type
         @param value
                value to be set
-
+               
         @throws IllegalAccessException
         An <type scope="com::sun::star::lang">IllegalAccessException</type>
         is thrown if the given object is no interface or compound type;
         or the given object does not have the reflected field.
     */
     void set(
-        [inout] any obj,
-        [in] any value )
-        raises( com::sun::star::lang::IllegalArgumentException,
+        [inout] any obj, 
+        [in] any value ) 
+        raises( com::sun::star::lang::IllegalArgumentException, 
                 com::sun::star::lang::IllegalAccessException );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XIdlMember.idl b/udkapi/com/sun/star/reflection/XIdlMember.idl
index b806b81652bf..72d518f2c956 100644
--- a/udkapi/com/sun/star/reflection/XIdlMember.idl
+++ b/udkapi/com/sun/star/reflection/XIdlMember.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,44 +24,44 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XIdlMember_idl__
-#define __com_sun_star_reflection_XIdlMember_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
- published interface XIdlClass;
-
+#ifndef __com_sun_star_reflection_XIdlMember_idl__ 
+#define __com_sun_star_reflection_XIdlMember_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+ published interface XIdlClass; 
+ 
 /** Base interface for <type>XIdlField2</type>s and <type>XIdlMethod</type>s.
 */
 published interface XIdlMember: com::sun::star::uno::XInterface
-{
+{ 
     /** Returns the declaring type of this field, i.e. the type having
         the member declared (interface, enum, struct, exception).
-
+        
         @returns
                 declaring type
     */
-    XIdlClass getDeclaringClass();
-
+    XIdlClass getDeclaringClass(); 
+    
     /** Returns the fully-qualified name of the member.
 
         @return fully-qualified name of the member
     */
     string getName();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XIdlMethod.idl b/udkapi/com/sun/star/reflection/XIdlMethod.idl
index 8a9f106ce66a..07ac4677ffcc 100644
--- a/udkapi/com/sun/star/reflection/XIdlMethod.idl
+++ b/udkapi/com/sun/star/reflection/XIdlMethod.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XIdlMethod_idl__
-#define __com_sun_star_reflection_XIdlMethod_idl__
-
-#ifndef __com_sun_star_reflection_XIdlMember_idl__
-#include <com/sun/star/reflection/XIdlMember.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_ParamInfo_idl__
-#include <com/sun/star/reflection/ParamInfo.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_MethodMode_idl__
-#include <com/sun/star/reflection/MethodMode.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
-#include <com/sun/star/reflection/InvocationTargetException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
- published interface XIdlClass;
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_XIdlMethod_idl__ 
+#define __com_sun_star_reflection_XIdlMethod_idl__ 
+ 
+#ifndef __com_sun_star_reflection_XIdlMember_idl__ 
+#include <com/sun/star/reflection/XIdlMember.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_ParamInfo_idl__ 
+#include <com/sun/star/reflection/ParamInfo.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_MethodMode_idl__ 
+#include <com/sun/star/reflection/MethodMode.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_InvocationTargetException_idl__ 
+#include <com/sun/star/reflection/InvocationTargetException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+ published interface XIdlClass; 
+ 
+//============================================================================= 
+ 
 /** Reflects an IDL interface method.
 */
 published interface XIdlMethod: com::sun::star::reflection::XIdlMember
-{
+{ 
     /** Returns the return type of the reflected method.
 
         @return
                 return type of reflected method
     */
-    XIdlClass getReturnType();
-
+    XIdlClass getReturnType(); 
+    
     /** Returns the formal parameter types of the reflected method in order of IDL
         declaration.
 
@@ -74,44 +74,44 @@ published interface XIdlMethod: com::sun::star::reflection::XIdlMember
                 formal parameter types of reflected method
     */
     sequence<XIdlClass> getParameterTypes();
-
+    
     /** Returns formal parameter informations of the reflected method
         in order of IDL declaration.
         Parameter information reflects the parameter's access mode (in, out, inout),
         the parameter's name and formal type.
-
+        
         @return
                 parameter informations of reflected method
     */
-    sequence<ParamInfo> getParameterInfos();
-
+    sequence<ParamInfo> getParameterInfos(); 
+    
     /** Returns the declared exceptions types of the reflected method.
 
         @return
                 declared exception types of reflected method
     */
-    sequence<com::sun::star::reflection::XIdlClass> getExceptionTypes();
-
+    sequence<com::sun::star::reflection::XIdlClass> getExceptionTypes(); 
+    
     /** Returns the method mode in which calls are run, i.e. either oneway or
         twoway.  Method mode oneway denotes that a call may be run asynchronously
         (thus having no out parameters or return value)
-
+        
         @return
                 method mode of reflected method
     */
-    com::sun::star::reflection::MethodMode getMode();
-
+    com::sun::star::reflection::MethodMode getMode(); 
+    
     /** Invokes the reflected method on a given object with the given parameters.
         The parameters may be widening converted to fit their exact IDL type,
         meaning no loss of information.
-
+        
         @param obj
                object to call on
         @param args
                arguments passed to the method
         @return
                 return value of the method call (may be empty for methods returning void)
-
+                
         @throws IllegalArgumentException
         if the given object is a nuull reference or does not support the reflected
         method's interface
@@ -125,17 +125,17 @@ published interface XIdlMethod: com::sun::star::reflection::XIdlMember
         InvocationTargetException
     */
     any invoke(
-        [in] any obj,
-        [inout] sequence<any> args )
-        raises( com::sun::star::lang::IllegalArgumentException,
+        [in] any obj, 
+        [inout] sequence<any> args ) 
+        raises( com::sun::star::lang::IllegalArgumentException, 
                 com::sun::star::reflection::InvocationTargetException );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XIdlReflection.idl b/udkapi/com/sun/star/reflection/XIdlReflection.idl
index 9455430eabf1..3eb826760143 100644
--- a/udkapi/com/sun/star/reflection/XIdlReflection.idl
+++ b/udkapi/com/sun/star/reflection/XIdlReflection.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XIdlReflection_idl__
-#define __com_sun_star_reflection_XIdlReflection_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
-#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_XIdlReflection_idl__ 
+#define __com_sun_star_reflection_XIdlReflection_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_XIdlClass_idl__ 
+#include <com/sun/star/reflection/XIdlClass.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** Interface to reflect types.
-
+    
     @see CoreReflection
     @see XIdlClass
 */
 published interface XIdlReflection: com::sun::star::uno::XInterface
-{
+{ 
     /** Obtaining a reflection interface for a type.  You specify the type by
         its name.
         If the given type name can not be reflected, then a null-reference
         is returned.
-
+        
         @param aTypeName
                the type's name
         @return
                 reflection interface for the demanded type (or null)
     */
-    com::sun::star::reflection::XIdlClass forName( [in] string aTypeName );
-
+    com::sun::star::reflection::XIdlClass forName( [in] string aTypeName ); 
+ 
     /** Obtaining a reflection interface for an object.  This method takes
         the type of the object the any contains into account.  If the any
         contains no object, then a null-reference is returned.
-
+        
         @param aObj
                an object
         @return
                 reflection interface of the type of the demanded object (or null)
     */
     com::sun::star::reflection::XIdlClass getType( [in] any aObj );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XIndirectTypeDescription.idl b/udkapi/com/sun/star/reflection/XIndirectTypeDescription.idl
index ef80d722d55e..20bb33177adc 100644
--- a/udkapi/com/sun/star/reflection/XIndirectTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XIndirectTypeDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XIndirectTypeDescription_idl__
-#define __com_sun_star_reflection_XIndirectTypeDescription_idl__
-
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
-#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_XIndirectTypeDescription_idl__ 
+#define __com_sun_star_reflection_XIndirectTypeDescription_idl__ 
+ 
+#ifndef __com_sun_star_reflection_XTypeDescription_idl__ 
+#include <com/sun/star/reflection/XTypeDescription.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** Reflects a typedef or sequence type.
-    The type class of this description is TypeClass_TYPEDEF or
+    The type class of this description is TypeClass_TYPEDEF or 
     TypeClass_SEQUENCE.
 */
 published interface XIndirectTypeDescription: com::sun::star::reflection::XTypeDescription
-{
-    /** Returns the typedefed type, if the type is a typedef,
+{ 
+    /** Returns the typedefed type, if the type is a typedef, 
         or the element type, if the type is a sequence.
 
         @return
                 referenced type
     */
     com::sun::star::reflection::XTypeDescription getReferencedType();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription.idl b/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription.idl
index c16d620d6f0d..2e48f2125af3 100644
--- a/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XInterfaceAttributeTypeDescription_idl__
-#define __com_sun_star_reflection_XInterfaceAttributeTypeDescription_idl__
-
-#ifndef __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__
-#include <com/sun/star/reflection/XInterfaceMemberTypeDescription.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
-#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_XInterfaceAttributeTypeDescription_idl__ 
+#define __com_sun_star_reflection_XInterfaceAttributeTypeDescription_idl__ 
+ 
+#ifndef __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__ 
+#include <com/sun/star/reflection/XInterfaceMemberTypeDescription.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_XTypeDescription_idl__ 
+#include <com/sun/star/reflection/XTypeDescription.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** Reflects an interface attribute type.
 
     <p>This type is superseded by
@@ -51,27 +51,27 @@
     The type class of this type is TypeClass_INTERFACE_ATTRIBUTE.
 */
 published interface XInterfaceAttributeTypeDescription: com::sun::star::reflection::XInterfaceMemberTypeDescription
-{
+{ 
     /** Returns true, if this attribute is read-only.
 
         @return
                 true, if attribute is read-only
     */
-    boolean isReadOnly();
-
+    boolean isReadOnly(); 
+    
     /** Returns the type of the attribute.
 
         @return
                 type of attribute
     */
     com::sun::star::reflection::XTypeDescription getType();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2.idl b/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2.idl
index 96b8957683ff..36f6a63fc883 100644
--- a/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2.idl
+++ b/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/XInterfaceMemberTypeDescription.idl b/udkapi/com/sun/star/reflection/XInterfaceMemberTypeDescription.idl
index bbc57be77c8e..8654ac4801f4 100644
--- a/udkapi/com/sun/star/reflection/XInterfaceMemberTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XInterfaceMemberTypeDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__
-#define __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__
-
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
-#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__ 
+#define __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__ 
+ 
+#ifndef __com_sun_star_reflection_XTypeDescription_idl__ 
+#include <com/sun/star/reflection/XTypeDescription.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** Base interface for reflected interface members.
 
     @see XInterfaceAttributeTypeDescription
     @see XInterfaceMethodTypeDescription
 */
 published interface XInterfaceMemberTypeDescription: com::sun::star::reflection::XTypeDescription
-{
+{ 
     /** Returns name of member
 
         @return
                 member name
     */
-    string getMemberName();
-
+    string getMemberName(); 
+    
     /** Returns the position the member including all inherited members of base
         interfaces.
-
+        
         @return
                 position of member
     */
     long getPosition();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XInterfaceMethodTypeDescription.idl b/udkapi/com/sun/star/reflection/XInterfaceMethodTypeDescription.idl
index c51af484f950..f2a6b118fc46 100644
--- a/udkapi/com/sun/star/reflection/XInterfaceMethodTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XInterfaceMethodTypeDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,67 +24,67 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XInterfaceMethodTypeDescription_idl__
-#define __com_sun_star_reflection_XInterfaceMethodTypeDescription_idl__
-
-#ifndef __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__
-#include <com/sun/star/reflection/XInterfaceMemberTypeDescription.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
-#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XMethodParameter_idl__
-#include <com/sun/star/reflection/XMethodParameter.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_XInterfaceMethodTypeDescription_idl__ 
+#define __com_sun_star_reflection_XInterfaceMethodTypeDescription_idl__ 
+ 
+#ifndef __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__ 
+#include <com/sun/star/reflection/XInterfaceMemberTypeDescription.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_XTypeDescription_idl__ 
+#include <com/sun/star/reflection/XTypeDescription.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_XMethodParameter_idl__ 
+#include <com/sun/star/reflection/XMethodParameter.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** Reflects an interface method type.
     The type class of this type is TypeClass_INTERFACE_METHOD.
 */
 published interface XInterfaceMethodTypeDescription: com::sun::star::reflection::XInterfaceMemberTypeDescription
-{
+{ 
     /** Returns the method's return type.
 
         @return
                 method's return type
     */
-    com::sun::star::reflection::XTypeDescription getReturnType();
-
+    com::sun::star::reflection::XTypeDescription getReturnType(); 
+    
     /** Returns true, if this method is declared oneway.
 
         @return
                 true, if this method is declared oneway
     */
-    boolean isOneway();
-
+    boolean isOneway(); 
+    
     /** Returns all parameters of the method in order of IDL declaration.
 
         @return
                 method parameters
     */
-    sequence<com::sun::star::reflection::XMethodParameter> getParameters();
-
+    sequence<com::sun::star::reflection::XMethodParameter> getParameters(); 
+    
     /** Returns declared exceptions that may occur upon invocations of the method.
 
         @return
                 declared exceptions of method
     */
     sequence<com::sun::star::reflection::XTypeDescription> getExceptions();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XInterfaceTypeDescription.idl b/udkapi/com/sun/star/reflection/XInterfaceTypeDescription.idl
index d47dd7c3dd47..1aad8f5be38a 100644
--- a/udkapi/com/sun/star/reflection/XInterfaceTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XInterfaceTypeDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XInterfaceTypeDescription_idl__
-#define __com_sun_star_reflection_XInterfaceTypeDescription_idl__
-
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
-#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Uik_idl__
-#include <com/sun/star/uno/Uik.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__
-#include <com/sun/star/reflection/XInterfaceMemberTypeDescription.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_XInterfaceTypeDescription_idl__ 
+#define __com_sun_star_reflection_XInterfaceTypeDescription_idl__ 
+ 
+#ifndef __com_sun_star_reflection_XTypeDescription_idl__ 
+#include <com/sun/star/reflection/XTypeDescription.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_Uik_idl__ 
+#include <com/sun/star/uno/Uik.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_XInterfaceMemberTypeDescription_idl__ 
+#include <com/sun/star/reflection/XInterfaceMemberTypeDescription.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** Reflects an interface type.
 
     <p>This type is superseded by <type>XInterfaceTypeDescription2</type>, which
@@ -54,7 +54,7 @@
     @see XInterfaceMemberTypeDescription
 */
 published interface XInterfaceTypeDescription: com::sun::star::reflection::XTypeDescription
-{
+{ 
     /** Returns the base interface or null, if the reflected interface is not
         inherited from another.
 
@@ -67,30 +67,30 @@ published interface XInterfaceTypeDescription: com::sun::star::reflection::XType
         @deprecated
     */
     com::sun::star::reflection::XTypeDescription getBaseType();
-
+    
     /** Deprecated.  UIK are not used anymore, a type is uniquely identified by
         its name.<br>
         Returns the UIK, i.e. the unique identifier of the interface.
-
+        
         @return
                 uik of the interface
         @deprecated
     */
-    com::sun::star::uno::Uik getUik();
-
+    com::sun::star::uno::Uik getUik(); 
+    
     /** Returns the members of the interfaces, i.e. attributes and methods.
 
         @returns
                 interface members
     */
     sequence<com::sun::star::reflection::XInterfaceMemberTypeDescription> getMembers();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XInterfaceTypeDescription2.idl b/udkapi/com/sun/star/reflection/XInterfaceTypeDescription2.idl
index 31ab93e4ecac..44356aafd47f 100644
--- a/udkapi/com/sun/star/reflection/XInterfaceTypeDescription2.idl
+++ b/udkapi/com/sun/star/reflection/XInterfaceTypeDescription2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/XMethodParameter.idl b/udkapi/com/sun/star/reflection/XMethodParameter.idl
index c089f79336ac..4a9d167ac00c 100644
--- a/udkapi/com/sun/star/reflection/XMethodParameter.idl
+++ b/udkapi/com/sun/star/reflection/XMethodParameter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XMethodParameter_idl__
-#define __com_sun_star_reflection_XMethodParameter_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
-#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_XMethodParameter_idl__ 
+#define __com_sun_star_reflection_XMethodParameter_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_XTypeDescription_idl__ 
+#include <com/sun/star/reflection/XTypeDescription.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** Reflects a method parameter.
 
     <p>This type is superseded by <type>XParameter</type>, which supports
@@ -51,48 +51,48 @@
     @see XInterfaceMethodTypeDescription
 */
 published interface XMethodParameter: com::sun::star::uno::XInterface
-{
+{ 
     /** Returns the name of the parameter
 
         @return
                 name of parameter
     */
-    string getName();
-
+    string getName(); 
+    
     /** Returns the type of the parameter.
 
         @return
                 type of parameter
     */
-    com::sun::star::reflection::XTypeDescription getType();
-
+    com::sun::star::reflection::XTypeDescription getType(); 
+    
     /** Returns true, if the parameter is declared as [in] or [inout] in IDL.
 
         @return
                 true, if declared [in] or [inout] parameter
     */
-    boolean isIn();
-
+    boolean isIn(); 
+    
     /** Returns true, if the parameter is declared as [out] or [inout] in IDL.
-
+        
         @return
                 true, if declared [out] or [inout] parameter
     */
-    boolean isOut();
-
+    boolean isOut(); 
+    
     /** Returns the position of the parameter regarding the IDL method declaration.
-
+        
         @return
                 position of the parameter
     */
     long getPosition();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XModuleTypeDescription.idl b/udkapi/com/sun/star/reflection/XModuleTypeDescription.idl
index d102f246dc76..d274e37c861a 100644
--- a/udkapi/com/sun/star/reflection/XModuleTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XModuleTypeDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/XParameter.idl b/udkapi/com/sun/star/reflection/XParameter.idl
index d7b8aaa16cbb..3298432c6c50 100644
--- a/udkapi/com/sun/star/reflection/XParameter.idl
+++ b/udkapi/com/sun/star/reflection/XParameter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/XPropertyTypeDescription.idl b/udkapi/com/sun/star/reflection/XPropertyTypeDescription.idl
index f280998221e9..0f6ad98875e0 100644
--- a/udkapi/com/sun/star/reflection/XPropertyTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XPropertyTypeDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/XProxyFactory.idl b/udkapi/com/sun/star/reflection/XProxyFactory.idl
index 9b592e594031..fea53034f274 100644
--- a/udkapi/com/sun/star/reflection/XProxyFactory.idl
+++ b/udkapi/com/sun/star/reflection/XProxyFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,24 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XProxyFactory_idl__
-#define __com_sun_star_reflection_XProxyFactory_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_uno_XAggregation_idl__
-#include <com/sun/star/uno/XAggregation.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_XProxyFactory_idl__ 
+#define __com_sun_star_reflection_XProxyFactory_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+#ifndef __com_sun_star_uno_XAggregation_idl__ 
+#include <com/sun/star/uno/XAggregation.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** Factory interface to produce proxy objects.
-
+    
     @deprecated
     Aggregation will no longer be supported as a high-level concept of UNO.
     You may still have the option to implement an UNO object consisting of
@@ -50,13 +50,13 @@
     Thus this interface is deprecated, too.
 */
 published interface XProxyFactory: com::sun::star::uno::XInterface
-{
+{ 
     /** This method creates a new proxy object that acts on behalf of the given
         target object.<br>
         The proxy delegates calls to the given target object.
         In addition, it is aggregatable, thus it is possible to
         intercept calls on the proxy's interfaces.
-
+        
         @attention
         The proxy object is UNO conform, but does NOT provide original target
         interfaces on queryInterface() calls.  This may lead to problems
@@ -67,15 +67,15 @@ published interface XProxyFactory: com::sun::star::uno::XInterface
         @return
                 proxy object
     */
-    com::sun::star::uno::XAggregation createProxy(
+    com::sun::star::uno::XAggregation createProxy( 
         [in] com::sun::star::uno::XInterface xTarget );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XPublished.idl b/udkapi/com/sun/star/reflection/XPublished.idl
index afb7cefa8a9a..87c3078f0fb2 100644
--- a/udkapi/com/sun/star/reflection/XPublished.idl
+++ b/udkapi/com/sun/star/reflection/XPublished.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/XServiceConstructorDescription.idl b/udkapi/com/sun/star/reflection/XServiceConstructorDescription.idl
index 2f8f05ba82cc..c6c9d587c338 100644
--- a/udkapi/com/sun/star/reflection/XServiceConstructorDescription.idl
+++ b/udkapi/com/sun/star/reflection/XServiceConstructorDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/XServiceTypeDescription.idl b/udkapi/com/sun/star/reflection/XServiceTypeDescription.idl
index 8fcd27642e2b..0aabca39cd20 100644
--- a/udkapi/com/sun/star/reflection/XServiceTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XServiceTypeDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/XServiceTypeDescription2.idl b/udkapi/com/sun/star/reflection/XServiceTypeDescription2.idl
index 2536a2d2fe16..542c5e9d8786 100644
--- a/udkapi/com/sun/star/reflection/XServiceTypeDescription2.idl
+++ b/udkapi/com/sun/star/reflection/XServiceTypeDescription2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/XSingletonTypeDescription.idl b/udkapi/com/sun/star/reflection/XSingletonTypeDescription.idl
index e77382730511..047cb52f91b4 100644
--- a/udkapi/com/sun/star/reflection/XSingletonTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XSingletonTypeDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/XSingletonTypeDescription2.idl b/udkapi/com/sun/star/reflection/XSingletonTypeDescription2.idl
index c4b42d786b00..c08889f1d38a 100644
--- a/udkapi/com/sun/star/reflection/XSingletonTypeDescription2.idl
+++ b/udkapi/com/sun/star/reflection/XSingletonTypeDescription2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/XStructTypeDescription.idl b/udkapi/com/sun/star/reflection/XStructTypeDescription.idl
index 69063323874c..5ca1f044c9c6 100644
--- a/udkapi/com/sun/star/reflection/XStructTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XStructTypeDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/XTypeDescription.idl b/udkapi/com/sun/star/reflection/XTypeDescription.idl
index 34ce721d2f33..98edb32ad02e 100644
--- a/udkapi/com/sun/star/reflection/XTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XTypeDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
-#define __com_sun_star_reflection_XTypeDescription_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_TypeClass_idl__
-#include <com/sun/star/uno/TypeClass.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_XTypeDescription_idl__ 
+#define __com_sun_star_reflection_XTypeDescription_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_TypeClass_idl__ 
+#include <com/sun/star/uno/TypeClass.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** Reflects a UNOIDL entity.
-
+    
     @see XPublished
     @see XIndirectTypeDescription
     @see XEnumTypeDescription
@@ -59,27 +59,27 @@
     @see XSingletonTypeDescription2
 */
 published interface XTypeDescription : com::sun::star::uno::XInterface
-{
+{ 
     /** Returns the type class of the reflected UNOIDL entity.
 
         @return
                 type class of the entity
     */
-    com::sun::star::uno::TypeClass getTypeClass();
-
+    com::sun::star::uno::TypeClass getTypeClass(); 
+    
     /** Returns the fully qualified name of the UNOIDL entity.
-
+        
         @return
                 fully qualified name of the entity
     */
     string getName();
 };
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration.idl b/udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration.idl
index bc47bdfc26d5..4a45de3deb02 100644
--- a/udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration.idl
+++ b/udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl b/udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl
index 5a7e129919b7..7617b1f114b3 100644
--- a/udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl
+++ b/udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/reflection/XUnionTypeDescription.idl b/udkapi/com/sun/star/reflection/XUnionTypeDescription.idl
index d02d6d53fd2d..03e949bedfca 100644
--- a/udkapi/com/sun/star/reflection/XUnionTypeDescription.idl
+++ b/udkapi/com/sun/star/reflection/XUnionTypeDescription.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_reflection_XUnionTypeDescription_idl__
-#define __com_sun_star_reflection_XUnionTypeDescription_idl__
-
-#ifndef __com_sun_star_reflection_XTypeDescription_idl__
-#include <com/sun/star/reflection/XTypeDescription.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module reflection {
-
-//=============================================================================
-
+#ifndef __com_sun_star_reflection_XUnionTypeDescription_idl__ 
+#define __com_sun_star_reflection_XUnionTypeDescription_idl__ 
+ 
+#ifndef __com_sun_star_reflection_XTypeDescription_idl__ 
+#include <com/sun/star/reflection/XTypeDescription.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module reflection {  
+ 
+//============================================================================= 
+ 
 /** Deprecated.  Unions are not supported.
     Reflects a union type.
     The discriminant of a union switches between the current value types.
@@ -46,55 +46,55 @@
     @deprecated
 */
 published interface XUnionTypeDescription: com::sun::star::reflection::XTypeDescription
-{
+{ 
     /** Returns the (ordinal) discriminant type.
-
+        
         @return
                 type of the discriminant
     */
-    com::sun::star::reflection::XTypeDescription getDiscriminantType();
-
+    com::sun::star::reflection::XTypeDescription getDiscriminantType(); 
+    
     /** Returns the default discriminant value.
-
+        
         @return
                 default discriminant value
     */
-    any getDefaultDiscriminant();
-
+    any getDefaultDiscriminant(); 
+    
     /** Returns the type of the default value.
-
+        
         @return
                 type of the default value
     */
-    com::sun::star::reflection::XTypeDescription getDefaultMemberType();
-
+    com::sun::star::reflection::XTypeDescription getDefaultMemberType(); 
+    
     /** Returns discriminants of all members in order of IDL declaration.
 
         @return
                 discriminants of all members
     */
-    sequence< any > getDiscriminants();
-
+    sequence< any > getDiscriminants(); 
+    
     /** Returns types of all members in order of IDL declaration.
 
         @return
                 types of all members
     */
-    sequence< com::sun::star::reflection::XTypeDescription > getMemberTypes();
-
+    sequence< com::sun::star::reflection::XTypeDescription > getMemberTypes(); 
+    
     /** Returns names of all members in order of IDL declaration.
 
         @return
                 names of all members
     */
-    sequence< string > getMemberNames();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    sequence< string > getMemberNames();	 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl b/udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl
index bcdea4f072b9..7d1106d25841 100644
--- a/udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl
+++ b/udkapi/com/sun/star/registry/CannotRegisterImplementationException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_registry_CannotRegisterImplementationException_idl__
-#define __com_sun_star_registry_CannotRegisterImplementationException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module registry {
-
-//=============================================================================
-
+#ifndef __com_sun_star_registry_CannotRegisterImplementationException_idl__ 
+#define __com_sun_star_registry_CannotRegisterImplementationException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module registry {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::registry::CannotRegisterImplementationException
 /** is thrown when an application tries to register a new component (implementation) using the
-    <member>XImplementationRegistration::registerImplementation()</member>
+    <member>XImplementationRegistration::registerImplementation()</member> 
     method, but the component cannot be registered. The reason for this exception could be:<br>
     <br><ul>
     <li>the component cannot be found or cannot be loaded (missing path or classpath)
@@ -48,17 +48,17 @@
     C++ component (shared library) or a named registration class with the appropriate methods for
     a Java component (normally a jar file)).
     </ul><br>
-
+    
  */
 published exception CannotRegisterImplementationException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/registry/DefaultRegistry.idl b/udkapi/com/sun/star/registry/DefaultRegistry.idl
index 4de5566cf0f1..32fa53fcc170 100644
--- a/udkapi/com/sun/star/registry/DefaultRegistry.idl
+++ b/udkapi/com/sun/star/registry/DefaultRegistry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,81 +24,81 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_registry_DefaultRegistry_idl__
-#define __com_sun_star_registry_DefaultRegistry_idl__
-
-#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
-#include <com/sun/star/registry/XSimpleRegistry.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module registry {
-
-//=============================================================================
-
+#ifndef __com_sun_star_registry_DefaultRegistry_idl__ 
+#define __com_sun_star_registry_DefaultRegistry_idl__ 
+ 
+#ifndef __com_sun_star_registry_XSimpleRegistry_idl__ 
+#include <com/sun/star/registry/XSimpleRegistry.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module registry {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::registry::DefaultRegistry
-/** implicitly supports a local registry and a read-only
-    system registry for global information.
-    In the context of this service,
-    the functions <code>open</code>, <code>close</code>, and <code>destroy</code>
-    from <type>XSimpleRegistry</type> are not supported and throw an exception
-    if they are used.
+/** implicitly supports a local registry and a read-only 
+    system registry for global information. 
+    In the context of this service, 
+    the functions <code>open</code>, <code>close</code>, and <code>destroy</code> 
+    from <type>XSimpleRegistry</type> are not supported and throw an exception 
+    if they are used. 
     <dl>
     <dt>Functions of <type>XSimpleRegistry</type>:
     <dl>
-    <dt>    <b>getURL</b>
+    <dt>	<b>getURL</b>
     </dt>
     <dd> returns the name of the local registry.
     </dd>
-    <dt>    <b>isValid</b>
+    <dt>	<b>isValid</b> 
     </dt>
     <dd> checks if the local registry is valid. If the interface is not <NULL/>
-    the local registry should always be valid.
+    the local registry should always be valid. 
     </dd>
-    <dt>    <b>isReadOnly</b>  </dt>
+    <dt>	<b>isReadOnly</b>  </dt>
     <dd> checks if the local registry has write protection.
     </dd>
-    <dt>    <b>mergeKey</b>
+    <dt>	<b>mergeKey</b> 
     </dt>
     <dd> merges all information from the specified registry in the local registry.
     </dd>
-    <dt>    <b>getRootKey</b>
+    <dt>	<b>getRootKey</b> 
     </dt>
     <dd> returns a virtual rootkey of both registries.
     </dd>
-    </dl>
-
+    </dl>   
+    
     <br>
-
+    
     </dt>
     <dt>Functions of XRegistryKey:
     <dl>
-    <dt> <b>openKey</b>
+    <dt> <b>openKey</b> 
     </dt>
     <dd> returns a virtual key which is specified in the local or the sytem
     registry.
     </dd>
-    <dt> <b>deleteKey</b>
+    <dt> <b>deleteKey</b> 
     </dt>
     <dd> deletes the key only if it is present in the local registry.
     </dd>
-    <dt> <b>setLongValue, setAsciiValue, setStringValue, setBinaryValue</b>
+    <dt> <b>setLongValue, setAsciiValue, setStringValue, setBinaryValue</b> 
     </dt>
     <dd> sets the value at the specified key in the local registry.
     </dd>
-    <dt> <b>getLongValue, getAsciiValue, getStringValue, getBinaryValue</b>
+    <dt> <b>getLongValue, getAsciiValue, getStringValue, getBinaryValue</b> 
     </dt>
-    <dd> returns the value at the specified key in the local registry, or if
+    <dd> returns the value at the specified key in the local registry, or if 
     the value is not present in the local registry, it will return the value of the
     system registry.
     </dd>
-    <dt> <b>openKeys</b>
+    <dt> <b>openKeys</b> 
     </dt>
     <dd> returns a sequence of all subkeys in both registries.
     </dd>
-    <dt> <b>getKeyNames</b>
+    <dt> <b>getKeyNames</b> 
     </dt>
     <dd> returns a sequence with the names of all subkeys in both registries.
     </dd>
@@ -107,33 +107,33 @@
     <b>Note: all write functions only work on the local registry.</b>
     </dt>
     </dl>
-
+    
     <br>
-
+    
     </dt>
     <dt>How to find the registries:
     <dl>
     <dt> search for the system registry:
     </dt>
     <dd> The system registry will always be searched in the same directory as the
-    executable. The name of the system registry is "applicat.rdb". If the system
+    executable. The name of the system registry is "applicat.rdb". If the system 
     registry was not found, then the environment variable STAR_REGISTRY will be checked.
     If this variable was set, it must contain a full path to a valid system registry.
     </dd>
-    <dt>    Search for the user registry using the following rules:
+    <dt>	Search for the user registry using the following rules:
     </dt>
     <dd>
     <dl>
     <dt> 1. (for further use) search in sversion.ini (.sversionrc) for an entry
-    REGISTRY_VERSION_STRING (example: UserRegistry 5.0/505=test.rdb) in the section
+    REGISTRY_VERSION_STRING (example: UserRegistry 5.0/505=test.rdb) in the section 
     [Registry]. If found, then take this value instead of "user.rdb" as "REGISTRY NAME".
     </dt>
-    <dt> 2. Search in the config directory of the user for a file "REGISTRY NAME". If
-    found, return the full path and name of the file. If not found, retry this
+    <dt> 2. Search in the config directory of the user for a file "REGISTRY NAME". If 
+    found, return the full path and name of the file. If not found, retry this 
     step with a dot before "REGISTRY NAME".
     </dt>
-    <dt> 3. If not found, a new user registry with name user.rdb will be created in the user
-    config directory.
+    <dt> 3. If not found, a new user registry with name user.rdb will be created in the user 
+    config directory. 
     </dt>
     </dl>
     </dd>
@@ -141,23 +141,23 @@
     </dt>
     </dl>
     <h4>Guarantees:</h4>
-
+    
     <ul>
     <li>-thread safe</li>
     </ul>
  */
 published service DefaultRegistry
-{
+{ 
     // DocMerge: empty anyway
-    interface com::sun::star::registry::XSimpleRegistry;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    interface com::sun::star::registry::XSimpleRegistry; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/registry/ImplementationRegistration.idl b/udkapi/com/sun/star/registry/ImplementationRegistration.idl
index 5e2dd27408b3..51e768f74c80 100644
--- a/udkapi/com/sun/star/registry/ImplementationRegistration.idl
+++ b/udkapi/com/sun/star/registry/ImplementationRegistration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_registry_ImplementationRegistration_idl__
-#define __com_sun_star_registry_ImplementationRegistration_idl__
-
-#ifndef __com_sun_star_registry_XImplementationRegistration_idl__
-#include <com/sun/star/registry/XImplementationRegistration.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module registry {
-
-//=============================================================================
-
+#ifndef __com_sun_star_registry_ImplementationRegistration_idl__ 
+#define __com_sun_star_registry_ImplementationRegistration_idl__ 
+ 
+#ifndef __com_sun_star_registry_XImplementationRegistration_idl__ 
+#include <com/sun/star/registry/XImplementationRegistration.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module registry {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::registry::ImplementationRegistration
 /** is the implementation of the interface <type>XImplementationRegistration</type>.
     This service can be used to install or uninstall components (implementations).
     Further, it is possible to check if all runtime dependencies (needed services) are
     available to use a specified component.
-
+    
     Guarantees:
     <ul>
     <li>-thread safe</li>
     </ul>
  */
 published service ImplementationRegistration
-{
+{ 
     // DocMerge: empty anyway
-    interface com::sun::star::registry::XImplementationRegistration;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    interface com::sun::star::registry::XImplementationRegistration; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/registry/InvalidRegistryException.idl b/udkapi/com/sun/star/registry/InvalidRegistryException.idl
index b9a3a1ef9aab..43e78cb71913 100644
--- a/udkapi/com/sun/star/registry/InvalidRegistryException.idl
+++ b/udkapi/com/sun/star/registry/InvalidRegistryException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_registry_InvalidRegistryException_idl__
-#define __com_sun_star_registry_InvalidRegistryException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module registry {
-
-//=============================================================================
-
+#ifndef __com_sun_star_registry_InvalidRegistryException_idl__ 
+#define __com_sun_star_registry_InvalidRegistryException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module registry {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::registry::InvalidRegistryException
 /** signals that the registry is invalid or an operation on the registry
     failed.
  */
 published exception InvalidRegistryException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/registry/InvalidValueException.idl b/udkapi/com/sun/star/registry/InvalidValueException.idl
index 013fca9d8b49..177eb8f89b37 100644
--- a/udkapi/com/sun/star/registry/InvalidValueException.idl
+++ b/udkapi/com/sun/star/registry/InvalidValueException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_registry_InvalidValueException_idl__
-#define __com_sun_star_registry_InvalidValueException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module registry {
-
-//=============================================================================
-
+#ifndef __com_sun_star_registry_InvalidValueException_idl__ 
+#define __com_sun_star_registry_InvalidValueException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module registry {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::registry::InvalidValueException
-/** signals that the value of the key is invalid or does not have the
+/** signals that the value of the key is invalid or does not have the 
     appropriate key type.
  */
 published exception InvalidValueException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/registry/MergeConflictException.idl b/udkapi/com/sun/star/registry/MergeConflictException.idl
index 67973f693af2..f70926ac4ae0 100644
--- a/udkapi/com/sun/star/registry/MergeConflictException.idl
+++ b/udkapi/com/sun/star/registry/MergeConflictException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_registry_MergeConflictException_idl__
-#define __com_sun_star_registry_MergeConflictException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module registry {
-
-//=============================================================================
-
+#ifndef __com_sun_star_registry_MergeConflictException_idl__ 
+#define __com_sun_star_registry_MergeConflictException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module registry {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::registry::MergeConflictException
 /** is thrown if entries of two registries are contradictory in the context of
     <member>XSimpleRegistry::mergeKey()e</member> method.
  */
 published exception MergeConflictException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/registry/NestedRegistry.idl b/udkapi/com/sun/star/registry/NestedRegistry.idl
index e10f9e7c8dc2..c73876257947 100644
--- a/udkapi/com/sun/star/registry/NestedRegistry.idl
+++ b/udkapi/com/sun/star/registry/NestedRegistry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,95 +24,95 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_registry_DefaultRegistry_idl__
-#define __com_sun_star_registry_DefaultRegistry_idl__
-
-#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
-#include <com/sun/star/registry/XSimpleRegistry.idl>
-#endif
-#ifndef __com_sun_star_lang_XInitialization_idl__
-#include <com/sun/star/lang/XInitialization.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module registry {
-
-//=============================================================================
-
+#ifndef __com_sun_star_registry_DefaultRegistry_idl__ 
+#define __com_sun_star_registry_DefaultRegistry_idl__ 
+ 
+#ifndef __com_sun_star_registry_XSimpleRegistry_idl__ 
+#include <com/sun/star/registry/XSimpleRegistry.idl> 
+#endif 
+#ifndef __com_sun_star_lang_XInitialization_idl__ 
+#include <com/sun/star/lang/XInitialization.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module registry {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::registry::NestedRegistry
-/** supports a shared view on two different registries. The registry
-    files will be opened in two different modes, registry1 will be opened with read/write
+/** supports a shared view on two different registries. The registry 
+    files will be opened in two different modes, registry1 will be opened with read/write 
     rights and registry2 will be opened read-only.
-    In the context of this service, the functions <code>open</code>, <code>close</code>,
-    and <code>destroy</code> from <type>XSimpleRegistry</type> are not supported and
-    throw an exception if they are used.
+    In the context of this service, the functions <code>open</code>, <code>close</code>, 
+    and <code>destroy</code> from <type>XSimpleRegistry</type> are not supported and 
+    throw an exception if they are used. 
     <dl>
     <dt>Functions of <type>XSimpleRegistry</type>:
     <dl>
-    <dt>    <b>getURL</b>
+    <dt>	<b>getURL</b> 
     </dt>
     <dd> returns the name of registry1.
-
+    
     </dd>
-    <dt>    <b>isValid</b>
+    <dt>	<b>isValid</b> 
     </dt>
     <dd> checks if registry1 is valid. If the interface is not <NULL/>
-    then registry1 should always be valid.
-
+    then registry1 should always be valid. 
+    
     </dd>
-    <dt>    <b>isReadOnly</b>
+    <dt>	<b>isReadOnly</b> 
     </dt>
     <dd> checks if registry1 has write protection.
     </dd>
-    <dt>    <b>mergeKey</b>
+    <dt>	<b>mergeKey</b> 
     </dt>
     <dd> merges all information from the specified registry in registry1.
-
+    
     </dd>
-    <dt>    <b>getRootKey</b>
+    <dt>	<b>getRootKey</b> 
     </dt>
     <dd> returns a virtual rootkey of both registries.
     </dd>
-    </dl>
-
+    </dl>   
+    
     <br>
-
+    
     </dt>
     <dt>Functions of <type>XRegistryKey</type>:
     <dl>
-    <dt> <b>openKey</b>
+    <dt> <b>openKey</b> 
     </dt>
     <dd> returns a virtual key which is specified in registy1 or registry2.
-
+    
     </dd>
-    <dt> <b>deleteKey</b>
+    <dt> <b>deleteKey</b> 
     </dt>
     <dd> deletes the key only if it is present in registry1.
-
+    
     </dd>
-    <dt> <b>setLongValue, setAsciiValue, setStringValue, setBinaryValue</b>
+    <dt> <b>setLongValue, setAsciiValue, setStringValue, setBinaryValue</b> 
     </dt>
     <dd> sets the value at the specified key in registry1.
-
+    
     </dd>
-    <dt> <b>getLongValue, getAsciiValue, getStringValue, getBinaryValue</b>
+    <dt> <b>getLongValue, getAsciiValue, getStringValue, getBinaryValue</b> 
     </dt>
-    <dd> returns the value at the specified key in registry1, or if
+    <dd> returns the value at the specified key in registry1, or if 
     the value is not present in registry1, it will return the value of registry2.
-
+    
     </dd>
-    <dt> <b>openKeys</b>
+    <dt> <b>openKeys</b> 
     </dt>
     <dd> returns a sequence of all subkeys in both registries.
-
+    
     </dd>
-    <dt> <b>getKeyNames</b>
+    <dt> <b>getKeyNames</b> 
     </dt>
-    <dd> returns a sequence with the names of all subkeys in both
+    <dd> returns a sequence with the names of all subkeys in both 
     registries.
-
+    
     </dd>
     <dt>
     <br>
@@ -123,39 +123,39 @@
     </dl>
     <br>
     How to initialize the registries:<br>
-    Use a sequence of <type>XSimpleRegistry</type> with two elements. The first element must be
-    the registry which is opened with read/write rights and the second element must be
+    Use a sequence of <type>XSimpleRegistry</type> with two elements. The first element must be 
+    the registry which is opened with read/write rights and the second element must be 
     the read-only one.<br>
     Two different ways are possible:<br>
     <ul>
     <li> use <method scope="com::sun::star::lang">XMultiServiceFactory::createInstanceWithArguments()</method> to
     create an instance of this service where the value of the any parameter must be the sequence with
     the two open registries.
-    <li> use the initialize function of the <type scope="com::sun::star::lang">XInitialization</type> interface where the value of the
+    <li> use the initialize function of the <type scope="com::sun::star::lang">XInitialization</type> interface where the value of the 
     any parameter must be the sequence with the two open registries.
     </ul>
     <br>
-
-
+    
+    
     Guarantees:
     <ul>
     <li>-thread safe</li>
     </ul>
  */
 published service NestedRegistry
-{
+{ 
     // DocMerge: empty anyway
-    interface com::sun::star::registry::XSimpleRegistry;
-
+    interface com::sun::star::registry::XSimpleRegistry; 
+    
     // DocMerge: empty anyway
-    interface com::sun::star::lang::XInitialization;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    interface com::sun::star::lang::XInitialization; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/registry/RegistryKeyType.idl b/udkapi/com/sun/star/registry/RegistryKeyType.idl
index b753b8abe327..e67e00361c91 100644
--- a/udkapi/com/sun/star/registry/RegistryKeyType.idl
+++ b/udkapi/com/sun/star/registry/RegistryKeyType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_registry_RegistryKeyType_idl__
-#define __com_sun_star_registry_RegistryKeyType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module registry {
-
-//=============================================================================
-
+#ifndef __com_sun_star_registry_RegistryKeyType_idl__ 
+#define __com_sun_star_registry_RegistryKeyType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module registry {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::registry::RegistryKeyType
 /** represents all possible types of a key.
-
+    
     <p>A key can be a normal key with a value and subkeys, or it can be a
     link which references another key.</p>
  */
 published enum RegistryKeyType
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RegistryKeyType::  KEY,
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RegistryKeyType::	KEY, 
+    
     // DocMerge: empty anyway
-    KEY,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RegistryKeyType::  LINK
-
+    KEY, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RegistryKeyType::	LINK 
+    
     // DocMerge: empty anyway
-    LINK
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    LINK 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/registry/RegistryValueType.idl b/udkapi/com/sun/star/registry/RegistryValueType.idl
index 9d98fee12da9..459dd108bec7 100644
--- a/udkapi/com/sun/star/registry/RegistryValueType.idl
+++ b/udkapi/com/sun/star/registry/RegistryValueType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,96 +24,96 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_registry_RegistryValueType_idl__
-#define __com_sun_star_registry_RegistryValueType_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module registry {
-
-//=============================================================================
-
+#ifndef __com_sun_star_registry_RegistryValueType_idl__ 
+#define __com_sun_star_registry_RegistryValueType_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module registry {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: enum com::sun::star::registry::RegistryValueType
 /** represents all possible types of a key value.
-
+    
     <p>An ASCII value and a string value will both be handled with type
     string. But interns will be handled differently. Normally the idl
     string represents a unicode string. </p>
  */
 published enum RegistryValueType
-{
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RegistryValueType::    NOT_DEFINED,
-
+{ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RegistryValueType::	NOT_DEFINED, 
+    
     // DocMerge from xml: value com::sun::star::registry::RegistryValueType::NOT_DEFINED
     /** the type of the key is not defined.
      */
-    NOT_DEFINED,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RegistryValueType::    LONG,
-
+    NOT_DEFINED, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RegistryValueType::	LONG, 
+    
     // DocMerge from xml: value com::sun::star::registry::RegistryValueType::LONG
     /** the type of the key is long.
      */
-    LONG,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RegistryValueType::    ASCII,
-
+    LONG, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RegistryValueType::	ASCII, 
+    
     // DocMerge from xml: value com::sun::star::registry::RegistryValueType::ASCII
     /** the type of the key is ASCII.
      */
-    ASCII,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RegistryValueType::    STRING,
-
+    ASCII, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RegistryValueType::	STRING, 
+    
     // DocMerge from xml: value com::sun::star::registry::RegistryValueType::STRING
     /** the type of the key is a string.
      */
-    STRING,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RegistryValueType::    BINARY,
-
+    STRING, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RegistryValueType::	BINARY, 
+    
     // DocMerge from xml: value com::sun::star::registry::RegistryValueType::BINARY
     /** the type of the key is binary.
      */
-    BINARY,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RegistryValueType::    LONGLIST,
-
+    BINARY, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RegistryValueType::	LONGLIST, 
+    
     // DocMerge from xml: value com::sun::star::registry::RegistryValueType::LONGLIST
     /** the type of the key is LONGLIST.
      */
-    LONGLIST,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RegistryValueType::    ASCIILIST,
-
+    LONGLIST, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RegistryValueType::	ASCIILIST, 
+    
     // DocMerge from xml: value com::sun::star::registry::RegistryValueType::ASCIILIST
     /** the type of the key is a ASCIILIST.
      */
-    ASCIILIST,
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR RegistryValueType::    STRINGLIST
-
+    ASCIILIST, 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION OMITTED FOR RegistryValueType::	STRINGLIST 
+    
     // DocMerge from xml: value com::sun::star::registry::RegistryValueType::STRINGLIST
     /** the type of the key is a STRINGLIST.
      */
-    STRINGLIST
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    STRINGLIST 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/registry/SimpleRegistry.idl b/udkapi/com/sun/star/registry/SimpleRegistry.idl
index 122b707cd3bb..6110ad16b989 100644
--- a/udkapi/com/sun/star/registry/SimpleRegistry.idl
+++ b/udkapi/com/sun/star/registry/SimpleRegistry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,41 +24,41 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_registry_SimpleRegistry_idl__
-#define __com_sun_star_registry_SimpleRegistry_idl__
-
-#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
-#include <com/sun/star/registry/XSimpleRegistry.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module registry {
-
-//=============================================================================
-
+#ifndef __com_sun_star_registry_SimpleRegistry_idl__ 
+#define __com_sun_star_registry_SimpleRegistry_idl__ 
+ 
+#ifndef __com_sun_star_registry_XSimpleRegistry_idl__ 
+#include <com/sun/star/registry/XSimpleRegistry.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module registry {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::registry::SimpleRegistry
-/** makes it possible to create, open, or close a registry. Further, it is
+/** makes it possible to create, open, or close a registry. Further, it is 
     possible to merge a registry under a specified key in the open registry.
-
+    
     Guarantees:
     <ul>
     <li>-thread safe</li>
     </ul>
  */
 published service SimpleRegistry
-{
+{ 
     // DocMerge: empty anyway
-    interface com::sun::star::registry::XSimpleRegistry;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    interface com::sun::star::registry::XSimpleRegistry; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/registry/XImplementationRegistration.idl b/udkapi/com/sun/star/registry/XImplementationRegistration.idl
index 50ea2f8fd966..9577a0597fc7 100644
--- a/udkapi/com/sun/star/registry/XImplementationRegistration.idl
+++ b/udkapi/com/sun/star/registry/XImplementationRegistration.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,105 +24,105 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_registry_XImplementationRegistration_idl__
-#define __com_sun_star_registry_XImplementationRegistration_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_registry_XSimpleRegistry_idl__
-#include <com/sun/star/registry/XSimpleRegistry.idl>
-#endif
-
-#ifndef __com_sun_star_registry_CannotRegisterImplementationException_idl__
-#include <com/sun/star/registry/CannotRegisterImplementationException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module registry {
-
-//=============================================================================
-
+#ifndef __com_sun_star_registry_XImplementationRegistration_idl__ 
+#define __com_sun_star_registry_XImplementationRegistration_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_registry_XSimpleRegistry_idl__ 
+#include <com/sun/star/registry/XSimpleRegistry.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_registry_CannotRegisterImplementationException_idl__ 
+#include <com/sun/star/registry/CannotRegisterImplementationException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module registry {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::registry::XImplementationRegistration
 /** offers a registry for implementation objects and provides information
     about the registered implementations.
  */
 published interface XImplementationRegistration: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::registry::XImplementationRegistration::registerImplementation
-    /** registers a component which provides one or more implementations.
-
-        @param aLocation
-            specifies the location of the component with the URL.
-
-        @param xReg
+    /** registers a component which provides one or more implementations. 
+        
+        @param aLocation 
+            specifies the location of the component with the URL.  
+              
+        @param xReg 
             specifies the registry where the component should be installed.
             If it is a NULL interface, then the component will be installed
             in the system registry (if this feature is supported).
      */
-    void registerImplementation( [in] string aImplementationLoader,
-             [in] string aLocation,
-             [in] com::sun::star::registry::XSimpleRegistry xReg )
-            raises( com::sun::star::registry::CannotRegisterImplementationException );
-
-    //-------------------------------------------------------------------------
-
+    void registerImplementation( [in] string aImplementationLoader, 
+             [in] string aLocation, 
+             [in] com::sun::star::registry::XSimpleRegistry xReg ) 
+            raises( com::sun::star::registry::CannotRegisterImplementationException ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::registry::XImplementationRegistration::revokeImplementation
-    /** revokes a component and all their provided implementations from the registry.
-
-        @param aLocation
-            specifies the location of the component with the URL.
-
-        @param xReg
+    /** revokes a component and all their provided implementations from the registry. 
+        
+        @param aLocation 
+            specifies the location of the component with the URL.  
+              
+        @param xReg 
             specifies the registry where the component should be installed.
             If it is a NULL interface, then the component will be revoked
             from the system registry (if this feature is supported).
      */
-    boolean revokeImplementation( [in] string aLocation,
-             [in] com::sun::star::registry::XSimpleRegistry xReg );
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION CHANGED FOR XImplementationRegistration::getImplementations
-
+    boolean revokeImplementation( [in] string aLocation, 
+             [in] com::sun::star::registry::XSimpleRegistry xReg ); 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION CHANGED FOR XImplementationRegistration::getImplementations 
+     
     // DocMerge from idl: method com::sun::star::registry::XImplementationRegistration::getImplementations
-    /** @returns
-            the names of the implementations registered by the url location.
-
-        @param aImplementationLoader
-            specifies the name of the needed loader for this type of implementation. For
-            example, the loader "com.sun.star.loader.SharedLibrary" for implementations
-            that are realized as an SharedLibrary.
-
-        @param aLocation
-            specifies the location of the component with the URL.
+    /** @returns 
+            the names of the implementations registered by the url location. 
+              
+        @param aImplementationLoader 
+            specifies the name of the needed loader for this type of implementation. For  
+            example, the loader "com.sun.star.loader.SharedLibrary" for implementations  
+            that are realized as an SharedLibrary.  
+              
+        @param aLocation 
+            specifies the location of the component with the URL.  
      */
-    sequence<string> getImplementations( [in] string aImplementationLoader,
-             [in] string aLocation );
-
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION CHANGED FOR XImplementationRegistration::checkInstantiation
-
+    sequence<string> getImplementations( [in] string aImplementationLoader, 
+             [in] string aLocation ); 
+ 
+    //------------------------------------------------------------------------- 
+    // DOCUMENTATION CHANGED FOR XImplementationRegistration::checkInstantiation 
+     
     // DocMerge from idl: method com::sun::star::registry::XImplementationRegistration::checkInstantiation
-    /** @returns
+    /** @returns 
              a sequence with names of the missing services to create an instance of this implementation.
 
         @param implementationName
-            specifies the name of the checked implementation.
+            specifies the name of the checked implementation. 
      */
-    sequence<string> checkInstantiation( [in] string implementationName );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    sequence<string> checkInstantiation( [in] string implementationName ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/registry/XImplementationRegistration2.idl b/udkapi/com/sun/star/registry/XImplementationRegistration2.idl
index 01c97b8274ab..f570a0e1ef75 100644
--- a/udkapi/com/sun/star/registry/XImplementationRegistration2.idl
+++ b/udkapi/com/sun/star/registry/XImplementationRegistration2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,51 +24,51 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_registry_XImplementationRegistration2_idl__
-#define __com_sun_star_registry_XImplementationRegistration2_idl__
-
-#ifndef __com_sun_star_registry_XImplementationRegistration_idl__
-#include <com/sun/star/registry/XImplementationRegistration.idl>
-#endif
-//=============================================================================
-
- module com {  module sun {  module star {  module registry {
-
-//=============================================================================
-
+#ifndef __com_sun_star_registry_XImplementationRegistration2_idl__ 
+#define __com_sun_star_registry_XImplementationRegistration2_idl__ 
+ 
+#ifndef __com_sun_star_registry_XImplementationRegistration_idl__ 
+#include <com/sun/star/registry/XImplementationRegistration.idl> 
+#endif 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module registry {  
+ 
+//============================================================================= 
+ 
 /** extends the functionality of <type scope="com::sun::star::registry">XImplementationRegistration</type>. It can be useful to specify a complete Url to a component but register the components name only (library or jar name).
 
     @since OOo 2.4
  */
 interface XImplementationRegistration2: com::sun::star::registry::XImplementationRegistration
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     /** registers a component which provides one or more implementations.
-
-        @param aLocation
-            specifies the location of the component with the URL.
+        
+        @param aLocation 
+            specifies the location of the component with the URL.  
 
         @param aRegisteredLocation
             the URL with which the component is actually registered.
-
-        @param xReg
+              
+        @param xReg 
             specifies the registry where the component should be installed.
             If it is a NULL interface, then the component will be installed
             in the system registry (if this feature is supported).
      */
-    void registerImplementationWithLocation( [in] string aImplementationLoader,
+    void registerImplementationWithLocation( [in] string aImplementationLoader, 
              [in] string aLocation, [in] string aRegisteredLocation,
-             [in] com::sun::star::registry::XSimpleRegistry xReg )
-            raises( com::sun::star::registry::CannotRegisterImplementationException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+             [in] com::sun::star::registry::XSimpleRegistry xReg ) 
+            raises( com::sun::star::registry::CannotRegisterImplementationException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/registry/XRegistryKey.idl b/udkapi/com/sun/star/registry/XRegistryKey.idl
index 7920ca6945c0..5b31ebb7ea1a 100644
--- a/udkapi/com/sun/star/registry/XRegistryKey.idl
+++ b/udkapi/com/sun/star/registry/XRegistryKey.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,14 +50,14 @@
 
 //=============================================================================
 
-module com { module sun { module star { module registry {
+module com { module sun { module star { module registry { 
 
 //=============================================================================
 /** makes structural information (except regarding tree structures)
     of a single registry key accessible.
-
+    
     <p>This is the main interface for registry keys.<p>
-
+    
     @see XSimpleRegistry
 */
 published interface XRegistryKey: com::sun::star::uno::XInterface
@@ -71,12 +71,12 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
         are represented as hexadecimals preceded with a "%" like in
         URL syntax.
      */
-    [readonly, attribute] string    KeyName;
+    [readonly, attribute] string	KeyName;
 
     //-------------------------------------------------------------------------
     /** checks if the key can be overwritten.
-
-        @throws InvalidRegistryException
+        
+        @throws InvalidRegistryException	 
         if the registry is not open.
     */
     boolean isReadOnly()
@@ -90,36 +90,36 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /** @returns
         the type of the specified key.
-
+        
         @param rKeyName
         specifies the relative path from the current key to
-        the key of the type which will be returned.
-
-        @throws InvalidRegistryException
+        the key of the type which will be returned. 
+        
+        @throws InvalidRegistryException	 
         if the registry is not open.
     */
     com::sun::star::registry::RegistryKeyType getKeyType( [in] string rKeyName )
             raises( com::sun::star::registry::InvalidRegistryException );
 
     //-------------------------------------------------------------------------
-    /** @returns
+    /** @returns 
         the type of the key value or NOT_DEFINED if the key has no value.
-
-        @throws InvalidRegistryException
+        
+        @throws InvalidRegistryException	 
         if the registry is not open.
     */
     com::sun::star::registry::RegistryValueType getValueType()
             raises( com::sun::star::registry::InvalidRegistryException );
 
     //-------------------------------------------------------------------------
-    /** @returns
+    /** @returns 
         a long value if the key contains one.
-
-        @throws InvalidRegistryException
+        
+        @throws InvalidRegistryException	 
         if the registry is not open.
-
-        @throws InvalidValueException
-        if the value is not of type long.
+        
+        @throws InvalidValueException	 
+        if the value is not of type long.  
     */
     long getLongValue()
             raises( com::sun::star::registry::InvalidRegistryException,
@@ -127,11 +127,11 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /** sets a long value to the key.
-
+        
         <p>If the key already has a value, the value will be
-        overridden.
-
-        @throws InvalidRegistryException
+        overridden. 
+        
+        @throws InvalidRegistryException	 
         if the registry is not open.
     */
     void setLongValue( [in] long value )
@@ -141,10 +141,10 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
     // DOCUMENTATION CHANGED FOR XRegistryKey::getLongListValue
     /** @returns
         a sequence of longs if the key contains a long list value.
-
+          
          @throws InvalidRegistryException
          if the registry is not open.
-
+         
          @throws InvalidValueException
          if the actual value is not of type long list.
     */
@@ -154,11 +154,11 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /** sets a long list value to the key.
-
+        
         <p>If the key already has a value, the value will be
-        overridden.
-
-        @throws InvalidRegistryException
+        overridden. 
+        
+        @throws InvalidRegistryException	 
         if the registry is not open.
     */
     void setLongListValue( [in] sequence<long> seqValue )
@@ -168,7 +168,7 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
     // DOCUMENTATION CHANGED FOR XRegistryKey::getAsciiValue
     /** @returns
         an ascii string value if the key contains one.
-
+     
          @throws InvalidRegistryException
          if the registry is not open.
 
@@ -181,12 +181,12 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /** sets an ASCII string value to the key.
-
+        
         <p>The high byte of the string should be NULL.  If not, there
         is no guarantee that the string will be correctly transported.
-        If the key already has a value, the value will be overridden.
-
-        @throws InvalidRegistryException
+        If the key already has a value, the value will be overridden. 
+        
+        @throws InvalidRegistryException	 
         if the registry is not open.
     */
     void setAsciiValue( [in] string value )
@@ -196,10 +196,10 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
     // DOCUMENTATION CHANGED FOR XRegistryKey::getAsciiListValue
     /** @returns
         a sequence of ascii strings if the key contains an asci list value.
-
+     
          @throws InvalidRegistryException
          if the registry is not open.
-
+         
          @throws InvalidValueException
          if the actual value is not of type ascii list.
     */
@@ -209,12 +209,12 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /** sets an ASCII string list value to the key.
-
+        
         <p>The high byte of the string should be NULL. If not, there
         is no guarantee that the string will be correctly transported.
-        If the key already has a value, the value will be overridden.
-
-        @throws InvalidRegistryException
+        If the key already has a value, the value will be overridden. 
+        
+        @throws InvalidRegistryException	 
         if the registry is not open.
     */
     void setAsciiListValue( [in] sequence<string> seqValue )
@@ -224,10 +224,10 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
     // DOCUMENTATION CHANGED FOR XRegistryKey::getStringValue
     /** @returns
         a unicode string value if the key contains one.
-
+     
          @throws InvalidRegistryException
          if the registry is not open.
-
+         
          @throws InvalidValueException
          if the actual value is not of type string.
     */
@@ -237,11 +237,11 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /** sets a unicode string value to the key.
-
+        
         <p> If the key already has a value, the value will be
-        overridden.
-
-        @throws InvalidRegistryException
+        overridden. 
+        
+        @throws InvalidRegistryException	 
         if the registry is not open.
     */
     void setStringValue( [in] string value )
@@ -249,12 +249,12 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     // DOCUMENTATION CHANGED FOR XRegistryKey::getStringListValue
-    /** @returns
+    /** @returns 
         a sequence of unicode strings if the key contains an unicode string list value.
-
+     
          @throws InvalidRegistryException
          if the registry is not open.
-
+         
          @throws InvalidValueException
          if the actual value is not of type string list.
     */
@@ -264,9 +264,9 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /** sets a unicode string value to the key.
-
-        <p>If the key already has a value, the value will be overridden.
-
+        
+        <p>If the key already has a value, the value will be overridden. 
+        
         @throws InvalidRegistryException
         if the registry is not open.
     */
@@ -275,12 +275,12 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     // DOCUMENTATION CHANGED FOR XRegistryKey::getBinaryValue
-    /** @returns
+    /** @returns 
         a binary value if the key contains one.
-
+     
          @throws InvalidRegistryException
          if the registry is not open.
-
+         
          @throws InvalidValueException
          if the actual value is not of type binary.
     */
@@ -290,11 +290,11 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /** sets a binary value to the key.
-
+        
         <p>If the key already has a value, the value will be
-        overridden.
-
-        @throws InvalidRegistryException
+        overridden. 
+        
+        @throws InvalidRegistryException	 
         if the registry is not open.
     */
     void setBinaryValue( [in] sequence<byte> value )
@@ -302,17 +302,17 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /** opens a sub key of the key.
-
+        
         <p>If the sub key does not exist, the function returns a
-        NULL-interface.
-
+        NULL-interface. 
+        
         @param aKeyName
         the relative path from the current key to the key
-        which will be created.
-
-        @returns
-        a NULL interface if the key does not exist.
-
+        which will be created. 
+        
+        @returns 
+        a NULL interface if the key does not exist. 
+        
         @throws InvalidRegistryException
         if the registry is not open.
     */
@@ -321,17 +321,17 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /** creates a new key in the registry.<p>
-
+        
         <p>If the key already exists, the function will open the key.
-
+        
         @param aKeyName
         specifies the relative path from the current key to
-        the key which will be created.
-
-        @returns
-        a NULL interface if the key could not be created.
-
-        @throws InvalidRegistryException
+        the key which will be created. 
+        
+        @returns 
+        a NULL interface if the key could not be created. 
+        
+        @throws InvalidRegistryException	 
         if the registry is not open, the registry is readonly
         or if the key exists and is of type LINK.
     */
@@ -340,8 +340,8 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /** closes a key in the registry.
-
-        @throws InvalidRegistryException
+        
+        @throws InvalidRegistryException	 
         if the registry is not open.
     */
     void closeKey()
@@ -349,12 +349,12 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /** deletes a key from the registry.
-
+        
         @param aKeyName
         specifies the relative path from the current key to
-        the key which will be deleted.
-
-        @throws InvalidRegistryException
+        the key which will be deleted. 
+        
+        @throws InvalidRegistryException	 
         if the registry is not open, the registry is readonly,
         the key does not exists or if the key is of type LINK.
     */
@@ -363,12 +363,12 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     // DOCUMENTATION CHANGED FOR XRegistryKey::openKeys
-    /** opens all subkeys of the key. If a subkey is a link, the link will be
+    /** opens all subkeys of the key. If a subkey is a link, the link will be 
         resolved and the appropriate key will be opened.
-
+     
            @returns
-           an empty sequence if the key has no subkeys.
-
+           an empty sequence if the key has no subkeys. 
+     
            @throws InvalidRegistryException
            if the registry is not open.
     */
@@ -378,9 +378,9 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     // DOCUMENTATION CHANGED FOR XRegistryKey::getKeyNames
     /** @returns a sequence with the names of all subkeys of the key.
-          If the key has no subkeys, the function returns an empty sequence. If a subkey is
+          If the key has no subkeys, the function returns an empty sequence. If a subkey is 
            a link, the name of the link will be returned.
-
+     
          @throws InvalidRegistryException
          if the registry is not open.
      */
@@ -389,24 +389,24 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /** creates a new link in the registry.
-
-        @returns
+        
+        @returns 
         <TRUE/> if the link was created. If the link already
         exists or the link target does not exist, the
         function returns <FALSE/>.
-
+        
         @param aLinkName
         specifies the relative path from the current key to
-        the link which will be created.
-
+        the link which will be created. 
+        
         @param aLinkTarget
         specifies the full path of the key which will be
-        referenced by the link.
-
-        @throws InvalidRegistryException
+        referenced by the link. 
+        
+        @throws InvalidRegistryException	 
         if the registry is not open or the registry is
         readonly.
-
+        
     */
     boolean createLink( [in] string aLinkName,
              [in] string aLinkTarget )
@@ -414,12 +414,12 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /** deletes a link from the registry.
-
+        
         @param aLinkName
         specifies the relative path from the current key to
-        the link which will be deleted.
-
-        @throws InvalidRegistryException
+        the link which will be deleted. 
+        
+        @throws InvalidRegistryException	
         if the registry is not open, the registry is readonly,
         or if the link does not exist.
     */
@@ -430,11 +430,11 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
     // DOCUMENTATION CHANGED FOR XRegistryKey::getLinkTarget
     /** @returns
         the target (complete path of a key) of the link specified by rLinkName.
-
+     
          @param rLinKName
-        specifies the relative path from the current key to
-        the link which target will be returned.
-
+        specifies the relative path from the current key to 
+        the link which target will be returned. 
+     
          @throws InvalidRegistryException
          if the registry is not open or the link does not exists.
     */
@@ -443,16 +443,16 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     // DOCUMENTATION CHANGED FOR XRegistryKey::getResolvedName
-    /** @returns
-        the resolved name of a key. The function resolve the complete name of the key.
-        If a link could not be resolved, the linktarget concatenated with the unresolved rest
-        of the name, will be returned.
-
+    /** @returns 
+        the resolved name of a key. The function resolve the complete name of the key. 
+        If a link could not be resolved, the linktarget concatenated with the unresolved rest 
+        of the name, will be returned. 
+     
          @param rKeyName
-         specifies a relative path from the current key which will be resolved from all links.
-
+         specifies a relative path from the current key which will be resolved from all links. 
+     
          @throws InvalidRegistryException
-         if the registry is not open or a recursion was detected.
+         if the registry is not open or a recursion was detected. 
     */
     string getResolvedName( [in] string aKeyName )
             raises( com::sun::star::registry::InvalidRegistryException );
@@ -461,6 +461,6 @@ published interface XRegistryKey: com::sun::star::uno::XInterface
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/udkapi/com/sun/star/registry/XSimpleRegistry.idl b/udkapi/com/sun/star/registry/XSimpleRegistry.idl
index 4ebd9f4cd7c1..8dc83b2a919b 100644
--- a/udkapi/com/sun/star/registry/XSimpleRegistry.idl
+++ b/udkapi/com/sun/star/registry/XSimpleRegistry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,9 +44,9 @@
 #endif
 
 
-//=============================================================================
+//============================================================================= 
 
-module com { module sun { module star { module registry {
+module com { module sun { module star { module registry { 
 
 //=============================================================================
 /** allows access to a registry (a persistent data source).
@@ -60,27 +60,27 @@ published interface XSimpleRegistry: com::sun::star::uno::XInterface
     //---------------------------------------------------------------------
     /** returns the URL of the current data source of the registry.
      */
-    string  getURL();
+    string	getURL();
 
     //-------------------------------------------------------------------------
     /** connects the registry to a persistent data source represented by
         an URL.
-
-        <p>If a local registry is already open, this function
+        
+        <p>If a local registry is already open, this function 
         will close the currently open registry.
-
+        
         @param aURL
-        specifies the complete URL to access the data source.
-
+        specifies the complete URL to access the data source. 
+        
         @param bReadOnly
         specifies if the data source should be opened for
         read only.
-
+        
         @param bCreate
         specifies if the data source should be created if it
         does not already exist.
-
-        @throws InvalidRegistryException
+        
+        @throws InvalidRegistryException	 
         if the registry does not exist.
     */
     void open( [in] string rURL,
@@ -95,7 +95,7 @@ published interface XSimpleRegistry: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /** disconnects the registry from the data-source.
-
+        
         @throws InvalidRegistryException
         if the registry is not open.
     */
@@ -104,18 +104,18 @@ published interface XSimpleRegistry: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /** destroys the registry and the data source.
-
-        @throws InvalidRegistryException
+        
+        @throws InvalidRegistryException	 
         if the registry is not open.
     */
     void destroy()
             raises( com::sun::star::registry::InvalidRegistryException );
 
     //-------------------------------------------------------------------------
-    /** @returns
+    /**	@returns 
         the root key of the registry.
-
-        @throws InvalidRegistryException
+        
+        @throws InvalidRegistryException	 
         if no registry is open
     */
     com::sun::star::registry::XRegistryKey getRootKey()
@@ -123,8 +123,8 @@ published interface XSimpleRegistry: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
     /** checks if the registry is readonly.
-
-        @throws InvalidRegistryException
+        
+        @throws InvalidRegistryException	 
         if the registry is not open.
     */
     boolean isReadOnly()
@@ -134,15 +134,15 @@ published interface XSimpleRegistry: com::sun::star::uno::XInterface
     /** DEPRECATED: this method lacks a registry key (better than a URL).
 
         merges a registry under the specified key.
-
+        
         <p>If the key does not exist it will be created. Existing
         keys will be overridden from keys of registry specified by
         <var>aUrl</var>.
-
-        @throws InvalidRegistryException
+        
+        @throws InvalidRegistryException	 
         if the registry is not open.
-
-        @throws MergeConflictException
+        
+        @throws MergeConflictException	
         if any differences occur during merging
     */
     void mergeKey( [in] string aKeyName,
@@ -154,6 +154,6 @@ published interface XSimpleRegistry: com::sun::star::uno::XInterface
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/udkapi/com/sun/star/script/AllEventObject.idl b/udkapi/com/sun/star/script/AllEventObject.idl
index 3ecaf84896ff..2971baadc283 100644
--- a/udkapi/com/sun/star/script/AllEventObject.idl
+++ b/udkapi/com/sun/star/script/AllEventObject.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,57 +24,57 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_AllEventObject_idl__
-#define __com_sun_star_script_AllEventObject_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
-#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
+#ifndef __com_sun_star_script_AllEventObject_idl__ 
+#define __com_sun_star_script_AllEventObject_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_XIdlClass_idl__ 
+#include <com/sun/star/reflection/XIdlClass.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
 /** This event is a wrapper for an original event in a forwarding event.
-
-    <p> Usually the original event is the first argument in the
+    
+    <p> Usually the original event is the first argument in the 
     array of arguments. </p>
  */
 published struct AllEventObject: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** A helper value for the implementation that can be used arbitrarily.
-
-        <p>This field reflects the third parameter of the method
+        
+        <p>This field reflects the third parameter of the method 
         <member>XAllListenerAdapterService::createAllListerAdapter</member>.
         </p>
      */
-    any Helper;
-
-    //-------------------------------------------------------------------------
+    any Helper; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the type of the original listener.
      */
-    type ListenerType;
-
-    //-------------------------------------------------------------------------
+    type ListenerType; 
+ 
+    //------------------------------------------------------------------------- 
     /** The original method name on which the event was fired.
      */
-    string MethodName;
-
-    //-------------------------------------------------------------------------
+    string MethodName; 
+ 
+    //------------------------------------------------------------------------- 
     /** The arguments of the original method.
      */
-    sequence<any> Arguments;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    sequence<any> Arguments; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/AllListenerAdapter.idl b/udkapi/com/sun/star/script/AllListenerAdapter.idl
index 49e466108e53..439e1e24973b 100644
--- a/udkapi/com/sun/star/script/AllListenerAdapter.idl
+++ b/udkapi/com/sun/star/script/AllListenerAdapter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,30 +24,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_AllListenerAdapter_idl__
-#define __com_sun_star_script_AllListenerAdapter_idl__
-
-#ifndef __com_sun_star_script_XAllListenerAdapterService_idl__
-#include <com/sun/star/script/XAllListenerAdapterService.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
+#ifndef __com_sun_star_script_AllListenerAdapter_idl__ 
+#define __com_sun_star_script_AllListenerAdapter_idl__ 
+ 
+#ifndef __com_sun_star_script_XAllListenerAdapterService_idl__ 
+#include <com/sun/star/script/XAllListenerAdapterService.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
 /** makes it possible to generate the adapters from specific
     interfaces to the interface <type>XAllListener</type>.
  */
 published service AllListenerAdapter
-{
+{ 
     /// interface to create adapters for listener types
-    interface com::sun::star::script::XAllListenerAdapterService;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::script::XAllListenerAdapterService; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/ArrayWrapper.idl b/udkapi/com/sun/star/script/ArrayWrapper.idl
index 8f60780229c7..32c361c58019 100644
--- a/udkapi/com/sun/star/script/ArrayWrapper.idl
+++ b/udkapi/com/sun/star/script/ArrayWrapper.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,27 +36,27 @@
 module com {  module sun {  module star { module script {
 
 //=============================================================================
-/** Allows an UNO sequence that is passed between different language
-    boundries to indicate it prefers to be represented as a multidimensional
-    array with 0 or 1 based indices. UNO does not natively represent
-    Multi-Dimensional arrays, instead a sequence can have elements that are
-    themselves sequences (an array of arrays ). <p>Some languages ( example
-    BASIC ) can natively represent both Multi-Dimentional arrays and array of
-    arrays.
-    Those languages could represent a sequence of sequences as either a
-    Multi-Dimentional array or array of arrays. This structure allows a
+/** Allows an UNO sequence that is passed between different language 
+    boundries to indicate it prefers to be represented as a multidimensional 
+    array with 0 or 1 based indices. UNO does not natively represent 
+    Multi-Dimensional arrays, instead a sequence can have elements that are 
+    themselves sequences (an array of arrays ). <p>Some languages ( example 
+    BASIC ) can natively represent both Multi-Dimentional arrays and array of 
+    arrays. 
+    Those languages could represent a sequence of sequences as either a 
+    Multi-Dimentional array or array of arrays. This structure allows a 
     preference for a Multi-Dimensional array representation to be specified.</p>
 */
 
 struct ArrayWrapper
 {
-    /** Indicates whether the Array should be have 1 or 0 based indexing.
+    /** Indicates whether the Array should be have 1 or 0 based indexing. 
     */
-    boolean IsZeroIndex;
+    boolean IsZeroIndex; 
     /** Contains the Array to be passed.
         <p> Multi-dimensional arrays can only be represented as a sequence where the elements of the sequence are themselves sequences. N-Levels of indirection are possible, where N is the number of dimensions. Note: its perfectly legal to use this structure with a single dimensioned array just to indicate the array indexing.</p>
     */
-    any Array;
+    any Array; 
 };
 
 //=============================================================================
diff --git a/udkapi/com/sun/star/script/BasicErrorException.idl b/udkapi/com/sun/star/script/BasicErrorException.idl
index 63a91b8e6373..bb219cab0166 100644
--- a/udkapi/com/sun/star/script/BasicErrorException.idl
+++ b/udkapi/com/sun/star/script/BasicErrorException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,46 +24,46 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_BasicErrorException_idl__
-#define __com_sun_star_script_BasicErrorException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
+#ifndef __com_sun_star_script_BasicErrorException_idl__ 
+#define __com_sun_star_script_BasicErrorException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
 /** is thrown in order to transport an error to Basic.
 
     @since OOo 2.0.0
  */
 published exception BasicErrorException: com::sun::star::uno::Exception
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+        
     /** The error code.
      */
     long ErrorCode;
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
 
     /** Specifies the argument which is used in the localized error message for
         the placeholder.
      */
     string ErrorMessageArgument;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/script/CannotConvertException.idl b/udkapi/com/sun/star/script/CannotConvertException.idl
index 1d2ba4e2c910..d84bef12a89c 100644
--- a/udkapi/com/sun/star/script/CannotConvertException.idl
+++ b/udkapi/com/sun/star/script/CannotConvertException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_CannotConvertException_idl__
-#define __com_sun_star_script_CannotConvertException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-#ifndef __com_sun_star_uno_TypeClass_idl__
-#include <com/sun/star/uno/TypeClass.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
+#ifndef __com_sun_star_script_CannotConvertException_idl__ 
+#define __com_sun_star_script_CannotConvertException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_TypeClass_idl__ 
+#include <com/sun/star/uno/TypeClass.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
 /** This exception is thrown to indicate that a type conversion can not be performed.
 */
 published exception CannotConvertException: com::sun::star::uno::Exception
-{
+{ 
     /** This member contains the class of the type to which the value should be
         converted.
     */
-    com::sun::star::uno::TypeClass DestinationTypeClass;
-
+    com::sun::star::uno::TypeClass DestinationTypeClass; 
+    
     /** This member contains the reason that the conversion failed.
         Have a look at <type>FailReason</type>.
     */
-    long Reason;
-
+    long Reason; 
+    
     /** If the conversion of a method argument fails, this is the index
         of the value in the "IN" argument list. [optional]
     */
     long ArgumentIndex;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/script/CannotCreateAdapterException.idl b/udkapi/com/sun/star/script/CannotCreateAdapterException.idl
index 6b7d33d1873e..ea52c590baca 100644
--- a/udkapi/com/sun/star/script/CannotCreateAdapterException.idl
+++ b/udkapi/com/sun/star/script/CannotCreateAdapterException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_CannotCreateAdapterException_idl__
-#define __com_sun_star_script_CannotCreateAdapterException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
+#ifndef __com_sun_star_script_CannotCreateAdapterException_idl__ 
+#define __com_sun_star_script_CannotCreateAdapterException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
 /** is thrown by an attacher if an adapter service cannot create the
     appropriate adapter.
 
-    @see com::sun::star::script::XAllListenerAdapterService
-    @see com::sun::star::script::XEventAttacher
+    @see com::sun::star::script::XAllListenerAdapterService 
+    @see com::sun::star::script::XEventAttacher 
     @see com::sun::star::script::XEventAttacherManager
  */
 published exception CannotCreateAdapterException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/ContextInformation.idl b/udkapi/com/sun/star/script/ContextInformation.idl
index 9863017b90a2..0fadbe8fbf9c 100644
--- a/udkapi/com/sun/star/script/ContextInformation.idl
+++ b/udkapi/com/sun/star/script/ContextInformation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,15 +24,15 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_ContextInformation_idl__
-#define __com_sun_star_script_ContextInformation_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
+#ifndef __com_sun_star_script_ContextInformation_idl__ 
+#define __com_sun_star_script_ContextInformation_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
 /** provides information about a certain stack frame.
 
     @deprecated
@@ -40,22 +40,22 @@
 published struct ContextInformation
 {
     /** Full qualified name to adress the module or function associated with the context.
-        If the module or function can't be adressed by name, e.g., in case that a runtime
+        If the module or function can't be adressed by name, e.g., in case that a runtime 
         generated eval-module is executed, this string is empty
      */
-    string Name;
-
-    //-------------------------------------------------------------------------
-    /** Source code of the Module, that is associated with the context. If the source can
-        be accessed using the ModuleName or if the source is unknown (executing compiled
+    string Name; 
+ 
+    //------------------------------------------------------------------------- 
+    /** Source code of the Module, that is associated with the context. If the source can 
+        be accessed using the ModuleName or if the source is unknown (executing compiled 
         code) this string can be empty.
      */
-    string SourceCode;
-
-    //-------------------------------------------------------------------------
+    string SourceCode; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the first line in the module's source code associated with
         the context.
-
+        
         <p>If "name" addresses a function, all line and column values
         are nevertheless given relative to the module's source. If
         source code is not available, this value addresses a binary
@@ -64,36 +64,36 @@ published struct ContextInformation
         @see XLibraryAccess::getModuleCode
         @see XLibraryAccess::getFunctionCode
      */
-    long StartLine;
-
-    //-------------------------------------------------------------------------
+    long StartLine; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the first column in the <var>StartLine</var> associated with
         the context.
      */
-    long StartColumn;
-
-    //-------------------------------------------------------------------------
-
+    long StartColumn; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** contains the last line in the module's source code associated with
         the context.
      */
-    long EndLine;
-
-    //-------------------------------------------------------------------------
+    long EndLine; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the first column in the <var>EndLine</var> that is NOT
         associated with the context.
      */
-    long EndColumn;
-
-    //-------------------------------------------------------------------------
+    long EndColumn; 
+ 
+    //------------------------------------------------------------------------- 
     /** Get all names of the local variable in this context.
      */
-    sequence<string> LocalVariableNames;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    sequence<string> LocalVariableNames; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/Converter.idl b/udkapi/com/sun/star/script/Converter.idl
index f0a9167ab074..11d2aa6f6b0b 100644
--- a/udkapi/com/sun/star/script/Converter.idl
+++ b/udkapi/com/sun/star/script/Converter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_Converter_idl__
-#define __com_sun_star_script_Converter_idl__
-
-#ifndef __com_sun_star_script_XTypeConverter_idl__
-#include <com/sun/star/script/XTypeConverter.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
+#ifndef __com_sun_star_script_Converter_idl__ 
+#define __com_sun_star_script_Converter_idl__ 
+ 
+#ifndef __com_sun_star_script_XTypeConverter_idl__ 
+#include <com/sun/star/script/XTypeConverter.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
 /** This service provides a widening converter converting from one type to another,
     if possible.
-
+    
     <p>What is possible?
     <ul>
     <li>byte: byte, (short *1), (long *1), (hyper *1), (float *1), (double *1), (enum *2), (any *3), boolean, (char *4), (string *5)</li>
@@ -72,10 +72,10 @@
     <li>7: only converts if the value is in the range of the target type.
     The value is rounded to an integer.</li>
     <li>8: only converts if the float can be converted back to the same enum value.</li>
-    <li>9: only converts if the number is one of the enumeration type values. Normally you need
+    <li>9: only converts if the number is one of the enumeration type values. Normally you need 
     reflection information of the enum type.</li>
     <li>10: only converts if it is the same enumeration type.</li>
-    <li>11: only converts if the string contains the name of an enumeration type value. Normally you need
+    <li>11: only converts if the string contains the name of an enumeration type value. Normally you need 
     core reflection information of the enum type.</li>
     <li>12: only converts if the value of the string is "1", "true" or "0", "false". The comparision
     is case insensitive.</li>
@@ -90,15 +90,15 @@ published service Converter
 {
     /** Conversion interface.
     */
-    interface com::sun::star::script::XTypeConverter;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    interface com::sun::star::script::XTypeConverter; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/script/Engine.idl b/udkapi/com/sun/star/script/Engine.idl
index 5e193a7fe679..1a5ec2811b2c 100644
--- a/udkapi/com/sun/star/script/Engine.idl
+++ b/udkapi/com/sun/star/script/Engine.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,37 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_Engine_idl__
-#define __com_sun_star_script_Engine_idl__
-
-#ifndef __com_sun_star_script_XEngine_idl__
-#include <com/sun/star/script/XEngine.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
+#ifndef __com_sun_star_script_Engine_idl__ 
+#define __com_sun_star_script_Engine_idl__ 
+ 
+#ifndef __com_sun_star_script_XEngine_idl__ 
+#include <com/sun/star/script/XEngine.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: service com::sun::star::script::Engine
-/** service that any scripting engine must implement.
-
+/** service that any scripting engine must implement. 
+    
     <p>The implementation of this
     interface should supply the interfaces com.sun.star.script.XDebugging2 and
     interface com.sun.star.script.XInvocation.</p>
     @deprecated
  */
 published service Engine
-{
+{ 
     /// The only interface of this service
-    interface com::sun::star::script::XEngine;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::script::XEngine; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/FailReason.idl b/udkapi/com/sun/star/script/FailReason.idl
index a8f02fe3a19a..316076e26e81 100644
--- a/udkapi/com/sun/star/script/FailReason.idl
+++ b/udkapi/com/sun/star/script/FailReason.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,68 +24,68 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_FailReason_idl__
-#define __com_sun_star_script_FailReason_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
+#ifndef __com_sun_star_script_FailReason_idl__ 
+#define __com_sun_star_script_FailReason_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
 /** These values specify the reason why a type conversion failed.
 */
 published constants FailReason
-{
+{ 
     /** The given value does not fit in the range of the destination type.
     */
-    const long OUT_OF_RANGE = 1;
-
+    const long OUT_OF_RANGE = 1; 
+ 
     /** The given value cannot be converted to a number.
     */
-    const long IS_NOT_NUMBER = 2;
-
+    const long IS_NOT_NUMBER = 2; 
+ 
     /** The given value cannot be converted to an enumeration.
     */
-    const long IS_NOT_ENUM = 3;
-
+    const long IS_NOT_ENUM = 3; 
+ 
     /** The given value cannot be converted to a boolean.
     */
-    const long IS_NOT_BOOL = 4;
-
+    const long IS_NOT_BOOL = 4; 
+ 
     /** The given value is not an interface or cannot queried to the right interface.
     */
-    const long NO_SUCH_INTERFACE = 5;
-
+    const long NO_SUCH_INTERFACE = 5; 
+ 
     /** The given value cannot be converted to right structure or exception type.
     */
-    const long SOURCE_IS_NO_DERIVED_TYPE = 6;
-
+    const long SOURCE_IS_NO_DERIVED_TYPE = 6; 
+ 
     /** The type class of the given value is not supported.
     */
-    const long TYPE_NOT_SUPPORTED = 7;
-
+    const long TYPE_NOT_SUPPORTED = 7; 
+ 
     /** The given value cannot be converted and none of the other reasons match.
     */
-    const long INVALID = 8;
-
+    const long INVALID = 8; 
+ 
     /** This value is deprecated.  Do not use.
         @deprecated
     */
-    const long NO_DEFAULT_AVAILABLE = 9;
-
+    const long NO_DEFAULT_AVAILABLE = 9; 
+ 
     /** This value is deprecated.  Do not use.
         @deprecated
     */
     const long UNKNOWN = 10;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/script/FinishEngineEvent.idl b/udkapi/com/sun/star/script/FinishEngineEvent.idl
index 7ec3d6818657..2481bbcf9e30 100644
--- a/udkapi/com/sun/star/script/FinishEngineEvent.idl
+++ b/udkapi/com/sun/star/script/FinishEngineEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_FinishEngineEvent_idl__
-#define __com_sun_star_script_FinishEngineEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_script_FinishReason_idl__
-#include <com/sun/star/script/FinishReason.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-/** event contains the reasons and the data for the
+#ifndef __com_sun_star_script_FinishEngineEvent_idl__ 
+#define __com_sun_star_script_FinishEngineEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_FinishReason_idl__ 
+#include <com/sun/star/script/FinishReason.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+/** event contains the reasons and the data for the 
     <member>XEngineListener::finished()</member> method.
     @deprecated
  */
 published struct FinishEngineEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** specifies why the script terminates.
      */
-    com::sun::star::script::FinishReason Finish;
-
-    //-------------------------------------------------------------------------
-    /** error message.
-
+    com::sun::star::script::FinishReason Finish; 
+ 
+    //------------------------------------------------------------------------- 
+    /** error message. 
+        
         <p>Only valid if Reason is RuntimeError or CompileError.</p>
      */
-    string ErrorMessage;
-
-    //-------------------------------------------------------------------------
-    /** contains the return value.
-
-        <p>This field is only valid if <member>FinishEngineEvent::Finish</member> is
+    string ErrorMessage; 
+ 
+    //------------------------------------------------------------------------- 
+    /** contains the return value. 
+        
+        <p>This field is only valid if <member>FinishEngineEvent::Finish</member> is 
         <const>FinishReason::OK</const>.</p>
      */
-    any Return;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    any Return; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/FinishReason.idl b/udkapi/com/sun/star/script/FinishReason.idl
index 068769e59130..628f7cc661da 100644
--- a/udkapi/com/sun/star/script/FinishReason.idl
+++ b/udkapi/com/sun/star/script/FinishReason.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_FinishReason_idl__
-#define __com_sun_star_script_FinishReason_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
+#ifndef __com_sun_star_script_FinishReason_idl__ 
+#define __com_sun_star_script_FinishReason_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
 /** contains the response for a scripting engine termination.
     @deprecated
  */
 published enum FinishReason
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** script in the engine terminated normally.
      */
-    OK,
-
-    //-------------------------------------------------------------------------
+    OK, 
+ 
+    //------------------------------------------------------------------------- 
     /** script in the engine was cancelled.
      */
-    Cancel,
-
-    //-------------------------------------------------------------------------
+    Cancel, 
+ 
+    //------------------------------------------------------------------------- 
     /** error occurred during script execution or compiling.
      */
-    Error
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    Error 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/InterruptEngineEvent.idl b/udkapi/com/sun/star/script/InterruptEngineEvent.idl
index b89fcf74503d..0458adf2a280 100644
--- a/udkapi/com/sun/star/script/InterruptEngineEvent.idl
+++ b/udkapi/com/sun/star/script/InterruptEngineEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,52 +24,52 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_InterruptEngineEvent_idl__
-#define __com_sun_star_script_InterruptEngineEvent_idl__
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_script_InterruptReason_idl__
-#include <com/sun/star/script/InterruptReason.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
+#ifndef __com_sun_star_script_InterruptEngineEvent_idl__ 
+#define __com_sun_star_script_InterruptEngineEvent_idl__ 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_InterruptReason_idl__ 
+#include <com/sun/star/script/InterruptReason.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
 /** describes an interrupt which occurs in the scripting engine.
     @deprecated
  */
 published struct InterruptEngineEvent: com::sun::star::lang::EventObject
-{
-    //-------------------------------------------------------------------------
-    /** fully qualified name to address the module or function affected by the event that
-        took place.
-
-        <p>If the module or function can't be addressed by name (for example, in case
+{ 
+    //------------------------------------------------------------------------- 
+    /** fully qualified name to address the module or function affected by the event that 
+        took place. 
+        
+        <p>If the module or function can't be addressed by name (for example, in case 
         that a runtime-generated eval-module is executed), this string is empty.</p>
      */
-    string Name;
-
-    //-------------------------------------------------------------------------
-    /** source code of the Module affected by the event that took place.
-
-        <p>If the source can
-        be accessed using the ModuleName, or if the source is unknown (executing compiled
+    string Name; 
+ 
+    //------------------------------------------------------------------------- 
+    /** source code of the Module affected by the event that took place. 
+        
+        <p>If the source can 
+        be accessed using the ModuleName, or if the source is unknown (executing compiled 
         code), this string can be empty.</p>
      */
-    string SourceCode;
-
-    //-------------------------------------------------------------------------
+    string SourceCode; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the first line in the module's source code that is affected
         by the event that took place.
-
-
-
+        
+        
+        
         <p>If "name" addresses a function, all line and column values
         are nevertheless given relative to the module's source. If
         source code is not available, this value addresses a binary
@@ -78,41 +78,41 @@ published struct InterruptEngineEvent: com::sun::star::lang::EventObject
         @see XLibraryAccess::getModuleCode
         @see XLibraryAccess::getFunctionCode
      */
-    long StartLine;
-
-    //-------------------------------------------------------------------------
+    long StartLine; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the first column in the "StartLine" that is affected by the
         event that took place.
      */
-    long StartColumn;
-
-    //-------------------------------------------------------------------------
+    long StartColumn; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the last line in the module's source code that is affected
         by the event that took place.
      */
-    long EndLine;
-
-    //-------------------------------------------------------------------------
-    /** contains the first column in the "EndLine" which is NOT affected by
+    long EndLine; 
+ 
+    //------------------------------------------------------------------------- 
+    /** contains the first column in the "EndLine" which is NOT affected by 
         the event that took place.
      */
-    long EndColumn;
-
-    //-------------------------------------------------------------------------
-    /** error message.
+    long EndColumn; 
+ 
+    //------------------------------------------------------------------------- 
+    /** error message. 
         <p>Only valid if Reason is RuntimeError or CompileError.</p>
      */
-    string ErrorMessage;
-
-    //-------------------------------------------------------------------------
+    string ErrorMessage; 
+ 
+    //------------------------------------------------------------------------- 
     /** contains the interrupt reason.
      */
-    com::sun::star::script::InterruptReason Reason;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::script::InterruptReason Reason; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/InterruptReason.idl b/udkapi/com/sun/star/script/InterruptReason.idl
index c0e46a2b7f8d..6db2e60d75f4 100644
--- a/udkapi/com/sun/star/script/InterruptReason.idl
+++ b/udkapi/com/sun/star/script/InterruptReason.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,65 +24,65 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_InterruptReason_idl__
-#define __com_sun_star_script_InterruptReason_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
+#ifndef __com_sun_star_script_InterruptReason_idl__ 
+#define __com_sun_star_script_InterruptReason_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
 /** values used to specify the response for a scripting engine
     interrupt.
     @deprecated
  */
 published enum InterruptReason
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** script execution was cancelled.
      */
-    Cancel,
-
-    //-------------------------------------------------------------------------
+    Cancel, 
+ 
+    //------------------------------------------------------------------------- 
     /** runtime error occurred during script execution.
      */
-    RuntimeError,
-
-    //-------------------------------------------------------------------------
+    RuntimeError, 
+ 
+    //------------------------------------------------------------------------- 
     /** script has invalid syntax.
      */
-    CompileError,
-
-    //-------------------------------------------------------------------------
+    CompileError, 
+ 
+    //------------------------------------------------------------------------- 
     /** script stopped at a breakpoint.
      */
-    BreakPoint,
-
-    //-------------------------------------------------------------------------
+    BreakPoint, 
+ 
+    //------------------------------------------------------------------------- 
     /** script stops because only one scripting engine command was executed.
      */
-    Step,
-
-    //-------------------------------------------------------------------------
+    Step, 
+ 
+    //------------------------------------------------------------------------- 
     /** script stops because one step was executed.
      */
-    StepOver,
-
-    //-------------------------------------------------------------------------
+    StepOver, 
+ 
+    //------------------------------------------------------------------------- 
     /** script stops because it leaves a function.
      */
-    StepOut,
-
-    //-------------------------------------------------------------------------
+    StepOut, 
+ 
+    //------------------------------------------------------------------------- 
     /** script stop because one step was executed.
      */
-    StepStatement
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    StepStatement 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/Invocation.idl b/udkapi/com/sun/star/script/Invocation.idl
index 83eb11a37078..69511c6d38aa 100644
--- a/udkapi/com/sun/star/script/Invocation.idl
+++ b/udkapi/com/sun/star/script/Invocation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,38 +24,38 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_Invocation_idl__
-#define __com_sun_star_script_Invocation_idl__
-
-#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__
-#include <com/sun/star/lang/XSingleServiceFactory.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
+#ifndef __com_sun_star_script_Invocation_idl__ 
+#define __com_sun_star_script_Invocation_idl__ 
+ 
+#ifndef __com_sun_star_lang_XSingleServiceFactory_idl__ 
+#include <com/sun/star/lang/XSingleServiceFactory.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
 /** factory service that allows construction of Invocation objects.
-
+    
     <p>Invoke createInstanceWithArguments() of XSingleServiceFactory
-    to create an Invocation adapter for the passed object (Invoking
+    to create an Invocation adapter for the passed object (Invoking 
     createInstance() will fail).</p>
-    <p>
+    <p>	
     The adapter has to support <type scope="com::sun::star::script">XInvocation</type>.
     The adapter may also support <type scope="com::sun::star::script">XInvocation2</type>.
     </p>
  */
 published service Invocation
-{
+{ 
     /// Interface to specify the object to be mapped by the invocation service.
-    interface com::sun::star::lang::XSingleServiceFactory;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::lang::XSingleServiceFactory; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/InvocationAdapterFactory.idl b/udkapi/com/sun/star/script/InvocationAdapterFactory.idl
index 9363de749d6a..baa526ace529 100644
--- a/udkapi/com/sun/star/script/InvocationAdapterFactory.idl
+++ b/udkapi/com/sun/star/script/InvocationAdapterFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,54 +24,54 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_InvocationAdapterFactory_idl__
-#define __com_sun_star_script_InvocationAdapterFactory_idl__
-
-#ifndef __com_sun_star_script_XInvocationAdapterFactory_idl__
-#include <com/sun/star/script/XInvocationAdapterFactory.idl>
-#endif
-#ifndef __com_sun_star_script_XInvocationAdapterFactory2_idl__
-#include <com/sun/star/script/XInvocationAdapterFactory2.idl>
+#ifndef __com_sun_star_script_InvocationAdapterFactory_idl__ 
+#define __com_sun_star_script_InvocationAdapterFactory_idl__ 
+ 
+#ifndef __com_sun_star_script_XInvocationAdapterFactory_idl__ 
+#include <com/sun/star/script/XInvocationAdapterFactory.idl> 
 #endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-/** Provides functionality to create an adapter that supports (a)
-    special interface type(s) and maps calls to the interface's
+#ifndef __com_sun_star_script_XInvocationAdapterFactory2_idl__ 
+#include <com/sun/star/script/XInvocationAdapterFactory2.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+/** Provides functionality to create an adapter that supports (a) 
+    special interface type(s) and maps calls to the	interface's
     methods to an invocation interface.
 
-    <p>
+    <p>	
     An adapter like this allows generic dispatch interfaces to
     meet interface requirements, e.g. if a specific listener
     interface has to be passed to an add...Listener method.
     </p>
-
-    <p>
-    The adapter has to support
+        
+    <p>	
+    The adapter has to support 
         <type scope="com::sun::star::script">XInvocationAdapterFactory</type>.
-    The adapter may also support
+    The adapter may also support 
         <type scope="com::sun::star::script">XInvocationAdapterFactory2</type>.
     </p>
  */
 published service InvocationAdapterFactory
-{
+{ 
     /** Interface for creating adapter objects.
         This interface is deprecated.  Use <type>XInvocationAdapterFactory2</type>.
         @deprecated
     */
-    interface com::sun::star::script::XInvocationAdapterFactory;
+    interface com::sun::star::script::XInvocationAdapterFactory; 
 
     /** Interface for creating adapter objects.
     */
-    interface com::sun::star::script::XInvocationAdapterFactory2;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    interface com::sun::star::script::XInvocationAdapterFactory2; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/InvocationInfo.idl b/udkapi/com/sun/star/script/InvocationInfo.idl
index ba619e00461b..2554182b4f3a 100644
--- a/udkapi/com/sun/star/script/InvocationInfo.idl
+++ b/udkapi/com/sun/star/script/InvocationInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_InvocationInfo_idl__
-#define __com_sun_star_script_InvocationInfo_idl__
-
+#ifndef __com_sun_star_script_InvocationInfo_idl__ 
+#define __com_sun_star_script_InvocationInfo_idl__ 
+ 
 #ifndef __com_sun_star_script_MemberType_idl__
-#include <com/sun/star/script/MemberType.idl>
-#endif
-
+#include <com/sun/star/script/MemberType.idl> 
+#endif 
+ 
 #ifndef __com_sun_star_reflection_ParamMode_idl__
-#include <com/sun/star/reflection/ParamMode.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
-/**
+#include <com/sun/star/reflection/ParamMode.idl> 
+#endif 
+
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
+/** 
     This struct is used to specify information about object members
-    (methods or properties) accessed via XInvocation, such as names,
+    (methods or properties) accessed via XInvocation, such as names, 
     types, or parameters.
     </p>
  */
 published struct InvocationInfo
-{
+{ 
 
     /** Name of the method or property.
      */
@@ -60,13 +60,13 @@ published struct InvocationInfo
 
     /** Only for property members:
         This field may contain zero or more constants of the
-        <type scope="com::sun::star::beans">PropertyAttribute</type>
-        constants group. It is not guaranteed that all necessary
+        <type scope="com::sun::star::beans">PropertyAttribute</type> 
+        constants group. It is not guaranteed that all necessary 
         constants are set to describe the property completely,
         but a flag will only be set, if the corresponding charac-
         teristic really exists. Example: If the READONLY flag
         is set, the property is readonly. If it isn't set, the
-        property nevertheless can be readonly.
+        property nevertheless can be readonly. 
 
         For methods this field is irrelevant and is set to 0.
      */
@@ -80,14 +80,14 @@ published struct InvocationInfo
      */
     sequence< type > aParamTypes;
 
-    /** Mode of method parameters (IN, OUT, INOUT),
+    /** Mode of method parameters (IN, OUT, INOUT), 
         for properties this sequence is empty.
      */
-    sequence< com::sun::star::reflection::ParamMode > aParamModes;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    sequence< com::sun::star::reflection::ParamMode > aParamModes; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/JavaScript.idl b/udkapi/com/sun/star/script/JavaScript.idl
index 1134ed10c2f4..b4c3ccee72d0 100644
--- a/udkapi/com/sun/star/script/JavaScript.idl
+++ b/udkapi/com/sun/star/script/JavaScript.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_JavaScript_idl__
-#define __com_sun_star_script_JavaScript_idl__
-
-#ifndef __com_sun_star_script_Engine_idl__
-#include <com/sun/star/script/Engine.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
+#ifndef __com_sun_star_script_JavaScript_idl__ 
+#define __com_sun_star_script_JavaScript_idl__ 
+ 
+#ifndef __com_sun_star_script_Engine_idl__ 
+#include <com/sun/star/script/Engine.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
 /** service is implementation of a JavaScript interpreter.
-
+    
     <p>The interpreter should be similar to JavaScript 1.1. The exact
     behavior will be specified in future.</p>
     @deprecated
  */
 published service JavaScript
-{
+{ 
     /// Parent service
-    service com::sun::star::script::Engine;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    service com::sun::star::script::Engine; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/MemberType.idl b/udkapi/com/sun/star/script/MemberType.idl
index fcb2eb43d76a..42d6f7219b6e 100644
--- a/udkapi/com/sun/star/script/MemberType.idl
+++ b/udkapi/com/sun/star/script/MemberType.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,23 +29,23 @@
 
 //=============================================================================
 
-module com { module sun { module star { module script {
+module com { module sun { module star { module script { 
 
 //=============================================================================
-/** These values are used to specify a member accessible by
+/** These values are used to specify a member accessible by 
     <type>XInvocation</type>.
 */
 published enum MemberType
 {
-    METHOD,
-    PROPERTY,
+    METHOD, 
+    PROPERTY, 
     UNKNOWN
 };
 
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
 
diff --git a/udkapi/com/sun/star/script/ScriptEvent.idl b/udkapi/com/sun/star/script/ScriptEvent.idl
index 040124dbafd0..471057732a4e 100644
--- a/udkapi/com/sun/star/script/ScriptEvent.idl
+++ b/udkapi/com/sun/star/script/ScriptEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_ScriptEvent_idl__
-#define __com_sun_star_script_ScriptEvent_idl__
-
-#ifndef __com_sun_star_script_AllEventObject_idl__
-#include <com/sun/star/script/AllEventObject.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-/** script event that gets delivered whenever a script event takes place.
-    <p>For that to happen, a "ScriptEventDescriptor" must be registered at
+#ifndef __com_sun_star_script_ScriptEvent_idl__ 
+#define __com_sun_star_script_ScriptEvent_idl__ 
+ 
+#ifndef __com_sun_star_script_AllEventObject_idl__ 
+#include <com/sun/star/script/AllEventObject.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+/** script event that gets delivered whenever a script event takes place. 
+    <p>For that to happen, a "ScriptEventDescriptor" must be registered at 
     and attached to an object by an <type>XEventAttacherManager</type>.</p>
  */
 published struct ScriptEvent: com::sun::star::script::AllEventObject
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** type of the script language as string; for example, "Basic" or "StarScript".
      */
-    string ScriptType;
-
-    //-------------------------------------------------------------------------
-    /** script code as string.
-
+    string ScriptType; 
+ 
+    //------------------------------------------------------------------------- 
+    /** script code as string. 
+        
         <p>The code has to correspond with the language
         defined by ScriptType.</p>
      */
-    string ScriptCode;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string ScriptCode; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/ScriptEventDescriptor.idl b/udkapi/com/sun/star/script/ScriptEventDescriptor.idl
index 4cc7f85bda8e..c19077b77bc4 100644
--- a/udkapi/com/sun/star/script/ScriptEventDescriptor.idl
+++ b/udkapi/com/sun/star/script/ScriptEventDescriptor.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_ScriptEventDescriptor_idl__
-#define __com_sun_star_script_ScriptEventDescriptor_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
+#ifndef __com_sun_star_script_ScriptEventDescriptor_idl__ 
+#define __com_sun_star_script_ScriptEventDescriptor_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
 /** describes an effect, especially a script to be executed,
-    for a certain event given by the listener type and the name of the
+    for a certain event given by the listener type and the name of the 
     event method.
  */
 published struct ScriptEventDescriptor
 {
     /** listener type as string, same as listener-XIdlClass.getName().
      */
-    string ListenerType;
-
-    //-------------------------------------------------------------------------
+    string ListenerType; 
+ 
+    //------------------------------------------------------------------------- 
     /** event method as string.
      */
-    string EventMethod;
-
-    //-------------------------------------------------------------------------
+    string EventMethod; 
+ 
+    //------------------------------------------------------------------------- 
     /** data to be used if the addListener method needs an additional
-        parameter.
+        parameter. 
         <p>If the type of this parameter is different from string,
         it will be converted, when added.</p>
      */
-    string AddListenerParam;
-
-    //-------------------------------------------------------------------------
+    string AddListenerParam; 
+ 
+    //------------------------------------------------------------------------- 
     /** type of the script language as string; for example, "Basic" or "StarScript".
      */
-    string ScriptType;
-
-    //-------------------------------------------------------------------------
+    string ScriptType; 
+ 
+    //------------------------------------------------------------------------- 
     /** script code as string (the code has to correspond with the language
         defined by ScriptType).
      */
-    string ScriptCode;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string ScriptCode; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/XAllListener.idl b/udkapi/com/sun/star/script/XAllListener.idl
index d234edd05262..6b0c2521d781 100644
--- a/udkapi/com/sun/star/script/XAllListener.idl
+++ b/udkapi/com/sun/star/script/XAllListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,52 +24,52 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XAllListener_idl__
-#define __com_sun_star_script_XAllListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_script_AllEventObject_idl__
-#include <com/sun/star/script/AllEventObject.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
-#include <com/sun/star/reflection/InvocationTargetException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-/** specifies a listener combining all methods
+#ifndef __com_sun_star_script_XAllListener_idl__ 
+#define __com_sun_star_script_XAllListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_AllEventObject_idl__ 
+#include <com/sun/star/script/AllEventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_InvocationTargetException_idl__ 
+#include <com/sun/star/reflection/InvocationTargetException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+/** specifies a listener combining all methods 
     of a listener interface in a single generic call.
-
+    
     <p>Without any output parameters, it is possible to adapt any interface
     if the <type>XAllListenerAdapterService</type> can generate an adapter.</p>
  */
 published interface XAllListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** gets called when an event occurs at the object.
      */
-    [oneway] void firing( [in] com::sun::star::script::AllEventObject iaEvent );
-
-    //-------------------------------------------------------------------------
+    [oneway] void firing( [in] com::sun::star::script::AllEventObject iaEvent ); 
+ 
+    //------------------------------------------------------------------------- 
     /** gets called when a "vetoable event" occurs at the object.
-
-        <p>That happens when the listener method raises an exception,
+        
+        <p>That happens when the listener method raises an exception, 
         has a return value declared, or is not "oneway".</p>
      */
-    any approveFiring( [in] com::sun::star::script::AllEventObject aEvent )
-            raises( com::sun::star::reflection::InvocationTargetException );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    any approveFiring( [in] com::sun::star::script::AllEventObject aEvent ) 
+            raises( com::sun::star::reflection::InvocationTargetException ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/XAllListenerAdapterService.idl b/udkapi/com/sun/star/script/XAllListenerAdapterService.idl
index d779be5a45b3..fc0b83f40cc2 100644
--- a/udkapi/com/sun/star/script/XAllListenerAdapterService.idl
+++ b/udkapi/com/sun/star/script/XAllListenerAdapterService.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XAllListenerAdapterService_idl__
-#define __com_sun_star_script_XAllListenerAdapterService_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
-#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-
-#ifndef __com_sun_star_script_XAllListener_idl__
-#include <com/sun/star/script/XAllListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
+#ifndef __com_sun_star_script_XAllListenerAdapterService_idl__ 
+#define __com_sun_star_script_XAllListenerAdapterService_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_XIdlClass_idl__ 
+#include <com/sun/star/reflection/XIdlClass.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_XAllListener_idl__ 
+#include <com/sun/star/script/XAllListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
 /** allows the generation of adapters from specific
     interfaces to the <type>XAllListener</type> interface.
  */
 published interface XAllListenerAdapterService: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** creates a wrapper from the listener of type
         <var>xListenerType</var> to the <type>XAllListener</type>
         listener.
-
+        
         To get the correct listener interface the returned
         <type scope="com::sun::star::uno">XInterface</type> has to
         be queried for it.
      */
-    com::sun::star::uno::XInterface createAllListerAdapter( [in] type xListenerType,
-             [in] com::sun::star::script::XAllListener xListener,
-             [in] any aHelper );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::uno::XInterface createAllListerAdapter( [in] type xListenerType, 
+             [in] com::sun::star::script::XAllListener xListener, 
+             [in] any aHelper ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/XAutomationInvocation.idl b/udkapi/com/sun/star/script/XAutomationInvocation.idl
index 9555b5a35a9a..9dcf61bab4ea 100644
--- a/udkapi/com/sun/star/script/XAutomationInvocation.idl
+++ b/udkapi/com/sun/star/script/XAutomationInvocation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,25 +27,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XAutomationInvocation_idl__
+#ifndef __com_sun_star_script_XAutomationInvocation_idl__ 
 #define __com_sun_star_script_XAutomationInvocation_idl__
-
-#ifndef __com_sun_star_script_XInvocation_idl__
-#include <com/sun/star/script/XInvocation.idl>
-#endif
-
-
- module com {  module sun {  module star {  module script {
-
+ 
+#ifndef __com_sun_star_script_XInvocation_idl__ 
+#include <com/sun/star/script/XInvocation.idl> 
+#endif 
+ 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
 interface XAutomationInvocation: com::sun::star::script::XInvocation
-{
+{ 
     any invokeGetProperty(  [in] string aFunctionName, [in] sequence<any> aParams, [out] sequence<short> aOutParamIndex, [out] sequence<any> aOutParam ) raises( com::sun::star::lang::IllegalArgumentException, com::sun::star::script::CannotConvertException, com::sun::star::reflection::InvocationTargetException );
     any invokePutProperty(  [in] string aFunctionName, [in] sequence<any> aParams, [out] sequence<short> aOutParamIndex, [out] sequence<any> aOutParam ) raises( com::sun::star::lang::IllegalArgumentException, com::sun::star::script::CannotConvertException, com::sun::star::reflection::InvocationTargetException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/XDebugging.idl b/udkapi/com/sun/star/script/XDebugging.idl
index 55335e5c07eb..67c09308d806 100644
--- a/udkapi/com/sun/star/script/XDebugging.idl
+++ b/udkapi/com/sun/star/script/XDebugging.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,130 +24,130 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XDebugging_idl__
-#define __com_sun_star_script_XDebugging_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_ContextInformation_idl__
-#include <com/sun/star/script/ContextInformation.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
+#ifndef __com_sun_star_script_XDebugging_idl__ 
+#define __com_sun_star_script_XDebugging_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_ContextInformation_idl__ 
+#include <com/sun/star/script/ContextInformation.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::script::XDebugging
 /** makes it possible to set breakpoints in an interpreter.
     @deprecated
  */
 published interface XDebugging: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-    /** returns the source code line where the breakpoint was set.
-
-                <p>The value can differ from the parameter
-                <var>nSourceCodeLine</var> when this is not a valid line to
-                place it.  -1 indicates that the breakpoint cannot be set at
+{ 
+    //------------------------------------------------------------------------- 
+    /** returns the source code line where the breakpoint was set.  
+                 
+                <p>The value can differ from the parameter 
+                <var>nSourceCodeLine</var> when this is not a valid line to 
+                place it.  -1 indicates that the breakpoint cannot be set at 
                 this position.
      */
-    long setBreakPoint( [in] string aModuleName,
-             [in] long nSourceCodeLine,
-             [in] boolean bOn );
-
-    //-------------------------------------------------------------------------
+    long setBreakPoint( [in] string aModuleName, 
+             [in] long nSourceCodeLine, 
+             [in] boolean bOn ); 
+ 
+    //------------------------------------------------------------------------- 
     /** clears all breakpoints in the module set by "setBreakPoint".
      */
-    void clearAllBreakPoints( [in] string aModuleName );
-
-    //-------------------------------------------------------------------------
+    void clearAllBreakPoints( [in] string aModuleName ); 
+ 
+    //------------------------------------------------------------------------- 
     /** Evaluates an expression.
 
         @returns the value of the expression as string.
 
-        @param CallStackPos Position in the call stack for which the expression
-                    should be evaluated. 0 is the top/actual position in the call
+        @param CallStackPos	Position in the call stack for which the expression 
+                    should be evaluated. 0 is the top/actual position in the call 
                     in the call stack, 1 the next and so on.
      */
-    string eval( [in] string aSourceCode,
-             [in] short nCallStackPos );
-
-    //-------------------------------------------------------------------------
+    string eval( [in] string aSourceCode, 
+             [in] short nCallStackPos ); 
+ 
+    //------------------------------------------------------------------------- 
     /** Returns the engine's stack trace of the current execute position. Line break is the delimiter.
      */
-    sequence<string> getStackTrace();
-
-    //-------------------------------------------------------------------------
-    /** returns more detailed information about a specified stack frame.
-
-         @param nCallStackPos
-                specifies the position in the call stack for the
+    sequence<string> getStackTrace(); 
+ 
+    //------------------------------------------------------------------------- 
+    /** returns more detailed information about a specified stack frame. 
+                 
+         @param nCallStackPos 
+                specifies the position in the call stack for the 
                 variables that should be delivered.
      */
-    com::sun::star::script::ContextInformation getContextInformation( [in] short nCallStackPos );
-
-    //-------------------------------------------------------------------------
+    com::sun::star::script::ContextInformation getContextInformation( [in] short nCallStackPos ); 
+ 
+    //------------------------------------------------------------------------- 
     /** returns the value of the variable at the given stack position.
      */
-    string dumpVariable( [in] string aVariableName,
-             [in] short nCallStackPos );
-
-    //-------------------------------------------------------------------------
+    string dumpVariable( [in] string aVariableName, 
+             [in] short nCallStackPos ); 
+ 
+    //------------------------------------------------------------------------- 
     /** sets the value of the specified variable within the specified
         stack frame.
      */
-    void setVariable( [in] string aVariableName,
-             [in] string aValue,
-             [in] short nCallStackPos );
-
-    //-------------------------------------------------------------------------
+    void setVariable( [in] string aVariableName, 
+             [in] string aValue, 
+             [in] short nCallStackPos ); 
+ 
+    //------------------------------------------------------------------------- 
     /** returns whether the given variable exists within the specified stack frame.
      */
-    boolean isVariable( [in] string aVariableName,
-             [in] short nCallStackPos );
-
-    //-------------------------------------------------------------------------
-    /** stops the execution of the interpreter.
-
+    boolean isVariable( [in] string aVariableName, 
+             [in] short nCallStackPos ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** stops the execution of the interpreter. 
+        
         <p>To continue with the execution, call <method>XDebugging::doContinue</method>.
      */
-    void stop();
-
-    //-------------------------------------------------------------------------
+    void stop(); 
+ 
+    //------------------------------------------------------------------------- 
     /** executes the next and only the next statement.
-
+        
         <p>If the next statement is a function call, the function is
         executed completely.</p>
      */
-    void stepOver();
-
-    //-------------------------------------------------------------------------
+    void stepOver(); 
+ 
+    //------------------------------------------------------------------------- 
     /** executes the next and only the next statement.
-
-        <p>If the next statement is a function call, only the function
+        
+        <p>If the next statement is a function call, only the function 
         entered.</p>
      */
-    void stepIn();
-
-    //-------------------------------------------------------------------------
+    void stepIn(); 
+ 
+    //------------------------------------------------------------------------- 
     /** executes the program until the next return from this stack frame.
      */
-    void stepOut();
-
-    //-------------------------------------------------------------------------
+    void stepOut(); 
+ 
+    //------------------------------------------------------------------------- 
     /** continues the program execution.
      */
-    void doContinue();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void doContinue(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/XDefaultMethod.idl b/udkapi/com/sun/star/script/XDefaultMethod.idl
index 5a2409145e28..f94c8ff824e2 100644
--- a/udkapi/com/sun/star/script/XDefaultMethod.idl
+++ b/udkapi/com/sun/star/script/XDefaultMethod.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,15 +34,15 @@
 
 module com { module sun { module star { module script {
 //==============================================================================
-/**
+/** 
     An object supporting this interface indicates to interested
     parties or clients the name of the default method for
-    this object.
-    <p>For example where ExampleObject is an instance of an Object that
-    supports this interface which returns the default method name
-    "defaultMethod".A scripting engine could use this information to support
-    syntax like <p>"ExampleObject( Param1 .... ParamN )"</p>
-    which would be equivalent to writing
+    this object. 
+    <p>For example where ExampleObject is an instance of an Object that 
+    supports this interface which returns the default method name 
+    "defaultMethod".A scripting engine could use this information to support 
+    syntax like <p>"ExampleObject( Param1 .... ParamN )"</p> 
+    which would be equivalent to writing 
     <p>"ExampleObject.defaultMethod( Param1 ... ParamN )"</p>
 */
 interface XDefaultMethod : ::com::sun::star::uno::XInterface
diff --git a/udkapi/com/sun/star/script/XDefaultProperty.idl b/udkapi/com/sun/star/script/XDefaultProperty.idl
index 61bee2515eb4..6e8a92a0cac4 100644
--- a/udkapi/com/sun/star/script/XDefaultProperty.idl
+++ b/udkapi/com/sun/star/script/XDefaultProperty.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,19 +34,19 @@
 
 module com { module sun { module star { module script {
 //==============================================================================
-/**
+/** 
     An object supporting this interface indicates to interested
     parties or clients the name of the default propery for
-    this object.
-    <p>For example where ExampleObject is an instance of an Object that
-    supports this interface which returns the default property name
-    "Value".A scripting engine could use this information to support
-    syntax like <p>ExampleObject = "foo"</p>
-    which would be equivalent to writing
+    this object. 
+    <p>For example where ExampleObject is an instance of an Object that 
+    supports this interface which returns the default property name 
+    "Value".A scripting engine could use this information to support 
+    syntax like <p>ExampleObject = "foo"</p> 
+    which would be equivalent to writing 
     <p>ExampleObject.Value = "foo"</p>
     or
     <p>bar = ExampleObject</p>
-    which would be equivalent to writing
+    which would be equivalent to writing 
     <p>bar = ExampleObject.Value</p>
 */
 interface XDefaultProperty : ::com::sun::star::uno::XInterface
diff --git a/udkapi/com/sun/star/script/XEngine.idl b/udkapi/com/sun/star/script/XEngine.idl
index 17cfbe4b7426..941ec8e81cee 100644
--- a/udkapi/com/sun/star/script/XEngine.idl
+++ b/udkapi/com/sun/star/script/XEngine.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,109 +24,109 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XEngine_idl__
-#define __com_sun_star_script_XEngine_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_XLibraryAccess_idl__
-#include <com/sun/star/script/XLibraryAccess.idl>
-#endif
-
-#ifndef __com_sun_star_script_XEngineListener_idl__
-#include <com/sun/star/script/XEngineListener.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module script {
-
-//=============================================================================
+#ifndef __com_sun_star_script_XEngine_idl__ 
+#define __com_sun_star_script_XEngine_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_XLibraryAccess_idl__ 
+#include <com/sun/star/script/XLibraryAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_XEngineListener_idl__ 
+#include <com/sun/star/script/XEngineListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
 /** makes it possible to control a scripting engine.
     @deprecated
  */
 published interface XEngine: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-    /** sets an interface to an object as a scripting root.
-
-        <p>If the root object implements the XInvocation interface,
+{ 
+    //------------------------------------------------------------------------- 
+    /** sets an interface to an object as a scripting root. 
+        
+        <p>If the root object implements the XInvocation interface, 
         then the engine uses this interface to set/get properties and
         call methods.
         </p>
      */
-    void setRoot( [in] com::sun::star::uno::XInterface xRoot );
-
-    //-------------------------------------------------------------------------
+    void setRoot( [in] com::sun::star::uno::XInterface xRoot ); 
+ 
+    //------------------------------------------------------------------------- 
     /** gets an interface to the object which is the scripting root.
      */
-    com::sun::star::uno::XInterface getRoot();
-
-    //-------------------------------------------------------------------------
+    com::sun::star::uno::XInterface getRoot(); 
+ 
+    //------------------------------------------------------------------------- 
     /** sets an access object to get external functions.
      */
-    void setLibraryAccess( [in] com::sun::star::script::XLibraryAccess Library );
-
-    //-------------------------------------------------------------------------
+    void setLibraryAccess( [in] com::sun::star::script::XLibraryAccess Library ); 
+ 
+    //------------------------------------------------------------------------- 
     /** compiles a script module in the scope of the root object.
      */
-    boolean compile( [in] string ModuleName,
-             [in] string Script,
-             [in] boolean CreateDebugInfo );
-
-    //-------------------------------------------------------------------------
+    boolean compile( [in] string ModuleName, 
+             [in] string Script, 
+             [in] boolean CreateDebugInfo ); 
+ 
+    //------------------------------------------------------------------------- 
     /** runs a script specified by a string.
-
+        
         <p>The arguments given in <var>aArgs</var> can be ignored by
         the engine.  The Script is executed synchronously.</p>
      */
-    any run( [in] string aScript,
-             [in] com::sun::star::uno::XInterface xThis,
-             [in] sequence<any> aArgs );
-
-    //-------------------------------------------------------------------------
-    /** runs the script specified by a string and makes callbacks.
-
+    any run( [in] string aScript, 
+             [in] com::sun::star::uno::XInterface xThis, 
+             [in] sequence<any> aArgs ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** runs the script specified by a string and makes callbacks. 
+        
         <p>The arguments given in <var>aArgs</var> can be ignored by
         the engine.  The script is executed asynchronously.
-
+        
         </p>
      */
-    void runAsync( [in] string acript,
-             [in] com::sun::star::uno::XInterface xThis,
-             [in] sequence<any> args,
-             [in] com::sun::star::script::XEngineListener xCallback );
-
-    //-------------------------------------------------------------------------
-    /** terminates the execution of the running script.
-
+    void runAsync( [in] string acript, 
+             [in] com::sun::star::uno::XInterface xThis, 
+             [in] sequence<any> args, 
+             [in] com::sun::star::script::XEngineListener xCallback ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** terminates the execution of the running script. 
+        
         <p>The waiting queue is cleared too.</p>
      */
-    void cancel();
-
-    //-------------------------------------------------------------------------
+    void cancel(); 
+ 
+    //------------------------------------------------------------------------- 
     /** adds an engine listener.
 
        <p>It is suggested to allow multiple registration of the same listener,
         thus for each time a listener is added, it has to be removed.
      */
-    void addEngineListener( [in] com::sun::star::script::XEngineListener Listener );
-
-    //-------------------------------------------------------------------------
+    void addEngineListener( [in] com::sun::star::script::XEngineListener Listener ); 
+ 
+    //------------------------------------------------------------------------- 
     /** removes an engine listener.
 
        <p>It is suggested to allow multiple registration of the same listener,
         thus for each time a listener is added, it has to be removed.
      */
-    void removeEngineListener( [in] com::sun::star::script::XEngineListener Listener );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void removeEngineListener( [in] com::sun::star::script::XEngineListener Listener ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+
+#endif 
diff --git a/udkapi/com/sun/star/script/XEngineListener.idl b/udkapi/com/sun/star/script/XEngineListener.idl
index 0ba2b2fe0d70..4ed0921c7156 100644
--- a/udkapi/com/sun/star/script/XEngineListener.idl
+++ b/udkapi/com/sun/star/script/XEngineListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,60 +24,60 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XEngineListener_idl__
-#define __com_sun_star_script_XEngineListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_script_InterruptEngineEvent_idl__
-#include <com/sun/star/script/InterruptEngineEvent.idl>
-#endif
-
-#ifndef __com_sun_star_lang_EventObject_idl__
-#include <com/sun/star/lang/EventObject.idl>
-#endif
-
-#ifndef __com_sun_star_script_FinishEngineEvent_idl__
-#include <com/sun/star/script/FinishEngineEvent.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
+#ifndef __com_sun_star_script_XEngineListener_idl__ 
+#define __com_sun_star_script_XEngineListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_InterruptEngineEvent_idl__ 
+#include <com/sun/star/script/InterruptEngineEvent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_EventObject_idl__ 
+#include <com/sun/star/lang/EventObject.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_FinishEngineEvent_idl__ 
+#include <com/sun/star/script/FinishEngineEvent.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
 /** makes it possible to receive events from a scripting engine.
     @deprecated
  */
 published interface XEngineListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** gets fired when an interrupt occurs during the script execution.
-
-        <p>If you call the method, the execution stops.  So in this situation,
-        the stack and variable values are still available by using the
-        appropriate <type>XDebugging</type> methods.
+        
+        <p>If you call the method, the execution stops.  So in this situation, 
+        the stack and variable values are still available by using the 
+        appropriate <type>XDebugging</type>	methods.
         </p>
      */
-    void interrupt( [in] com::sun::star::script::InterruptEngineEvent Evt );
-
-    //-------------------------------------------------------------------------
+    void interrupt( [in] com::sun::star::script::InterruptEngineEvent Evt ); 
+ 
+    //------------------------------------------------------------------------- 
     /** gets fired when the script gets into execution state.
      */
-    void running( [in] com::sun::star::lang::EventObject Evt );
-
-    //-------------------------------------------------------------------------
+    void running( [in] com::sun::star::lang::EventObject Evt ); 
+ 
+    //------------------------------------------------------------------------- 
     /** gets fired when the script execution has finished.
      */
-    void finished( [in] com::sun::star::script::FinishEngineEvent Evt );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void finished( [in] com::sun::star::script::FinishEngineEvent Evt ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/XEventAttacher.idl b/udkapi/com/sun/star/script/XEventAttacher.idl
index 7acc672af968..46c9cfdb5d56 100644
--- a/udkapi/com/sun/star/script/XEventAttacher.idl
+++ b/udkapi/com/sun/star/script/XEventAttacher.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,100 +24,100 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XEventAttacher_idl__
-#define __com_sun_star_script_XEventAttacher_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_script_XAllListener_idl__
-#include <com/sun/star/script/XAllListener.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_IntrospectionException_idl__
-#include <com/sun/star/beans/IntrospectionException.idl>
-#endif
-
-#ifndef __com_sun_star_script_CannotCreateAdapterException_idl__
-#include <com/sun/star/script/CannotCreateAdapterException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_ServiceNotRegisteredException_idl__
-#include <com/sun/star/lang/ServiceNotRegisteredException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
+#ifndef __com_sun_star_script_XEventAttacher_idl__ 
+#define __com_sun_star_script_XEventAttacher_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_XAllListener_idl__ 
+#include <com/sun/star/script/XAllListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_IntrospectionException_idl__ 
+#include <com/sun/star/beans/IntrospectionException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_CannotCreateAdapterException_idl__ 
+#include <com/sun/star/script/CannotCreateAdapterException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_ServiceNotRegisteredException_idl__ 
+#include <com/sun/star/lang/ServiceNotRegisteredException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
 /** makes it possible to attach script events given by a sequence of
     <type>ScriptEventDescriptor</type> structures to a given interface.
  */
 published interface XEventAttacher: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** registers the given "AllListener" object as a listener at the
         given interface by creating a suitable listener adapter and
         calling the "addListener" method corresponding to the
         "ListenerType".
      */
-    com::sun::star::lang::XEventListener attachListener( [in] com::sun::star::uno::XInterface xTarget,
-             [in] com::sun::star::script::XAllListener xAllListener,
-             [in] any aHelper,
-             [in] string aListenerType,
-             [in] string aAddListenerParam )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::beans::IntrospectionException,
-                    com::sun::star::script::CannotCreateAdapterException,
-                    com::sun::star::lang::ServiceNotRegisteredException );
-
-    //-------------------------------------------------------------------------
+    com::sun::star::lang::XEventListener attachListener( [in] com::sun::star::uno::XInterface xTarget, 
+             [in] com::sun::star::script::XAllListener xAllListener, 
+             [in] any aHelper, 
+             [in] string aListenerType, 
+             [in] string aAddListenerParam ) 
+            raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::beans::IntrospectionException, 
+                    com::sun::star::script::CannotCreateAdapterException, 
+                    com::sun::star::lang::ServiceNotRegisteredException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** registers an object as a listener at the given interface by
         creating a suitable listener adapter and calling the method
-        which corresponds to the listener type.
-
+        which corresponds to the listener type. 
+        
         <p>Only the event corresponding to the given event method
         will be delegated to <var>xAllListener</var>.</p>
      */
-    com::sun::star::lang::XEventListener attachSingleEventListener( [in] com::sun::star::uno::XInterface xTarget,
-             [in] com::sun::star::script::XAllListener xAllListener,
-             [in] any aHelper,
-             [in] string aListenerType,
-             [in] string aAddListenerParam,
-             [in] string aEventMethod )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::beans::IntrospectionException,
-                    com::sun::star::script::CannotCreateAdapterException,
-                    com::sun::star::lang::ServiceNotRegisteredException );
-
-    //-------------------------------------------------------------------------
+    com::sun::star::lang::XEventListener attachSingleEventListener( [in] com::sun::star::uno::XInterface xTarget, 
+             [in] com::sun::star::script::XAllListener xAllListener, 
+             [in] any aHelper, 
+             [in] string aListenerType, 
+             [in] string aAddListenerParam, 
+             [in] string aEventMethod ) 
+            raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::beans::IntrospectionException, 
+                    com::sun::star::script::CannotCreateAdapterException, 
+                    com::sun::star::lang::ServiceNotRegisteredException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** removes a listener object as a listener from the given interface.
-
+        
         <p> This method can and should be used as a contrary method
         to the two attach methods.</p>
      */
-    void removeListener( [in] com::sun::star::uno::XInterface xTarget,
-             [in] string aListenerType,
-             [in] string aRemoveListenerParam,
-             [in] com::sun::star::lang::XEventListener xToRemoveListener )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::beans::IntrospectionException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void removeListener( [in] com::sun::star::uno::XInterface xTarget, 
+             [in] string aListenerType, 
+             [in] string aRemoveListenerParam, 
+             [in] com::sun::star::lang::XEventListener xToRemoveListener ) 
+            raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::beans::IntrospectionException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/XEventAttacherManager.idl b/udkapi/com/sun/star/script/XEventAttacherManager.idl
index 16f209d876a5..5602377c8dbb 100644
--- a/udkapi/com/sun/star/script/XEventAttacherManager.idl
+++ b/udkapi/com/sun/star/script/XEventAttacherManager.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,57 +24,57 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XEventAttacherManager_idl__
-#define __com_sun_star_script_XEventAttacherManager_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_ScriptEventDescriptor_idl__
-#include <com/sun/star/script/ScriptEventDescriptor.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_ServiceNotRegisteredException_idl__
-#include <com/sun/star/lang/ServiceNotRegisteredException.idl>
-#endif
-
-#ifndef __com_sun_star_script_XScriptListener_idl__
-#include <com/sun/star/script/XScriptListener.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
+#ifndef __com_sun_star_script_XEventAttacherManager_idl__ 
+#define __com_sun_star_script_XEventAttacherManager_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_ScriptEventDescriptor_idl__ 
+#include <com/sun/star/script/ScriptEventDescriptor.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_ServiceNotRegisteredException_idl__ 
+#include <com/sun/star/lang/ServiceNotRegisteredException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_XScriptListener_idl__ 
+#include <com/sun/star/script/XScriptListener.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
 /** registers listeners for specified events.
  */
 published interface XEventAttacherManager: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** registers one event for an object identified by its index.
-
+        
         <p>If any object is attached under this index, then this
         event is attached automatically.</p>
         <p>Exceptions of type
         <type scope="com::sun::star::beans">IntrospectionException</type> and
         <type scope="com::sun::star::script">CannotCreateAdapterException</type>
-        that can be thrown by methods of <type>XEventAttacher</type> are caught
+        that can be thrown by methods of <type>XEventAttacher</type> are caught 
         and ignored.</p>
      */
-    void registerScriptEvent( [in] long nIndex,
-             [in] com::sun::star::script::ScriptEventDescriptor aScriptEvent )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-    /** registers several events for an object identified by its index.
-
+    void registerScriptEvent( [in] long nIndex, 
+             [in] com::sun::star::script::ScriptEventDescriptor aScriptEvent ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** registers several events for an object identified by its index. 
+        
         <p>The result is the same as if the method <member>registerScriptEvent
         </member> was called once for each <type>ScriptEventDescriptor</type>
         in the sequence.</p>
@@ -83,43 +83,43 @@ published interface XEventAttacherManager: com::sun::star::uno::XInterface
         event is attached automatically (see <member>attach</member>)</p>
 
         <p>Exceptions of type
-        <type scope="com::sun::star::beans">IntrospectionException</type> and
-        <type scope="com::sun::star::script">CannotCreateAdapterException</type>
-        that can be thrown by methods of <type>XEventAttacher</type> are caught
+        <type scope="com::sun::star::beans">IntrospectionException</type> and 
+        <type scope="com::sun::star::script">CannotCreateAdapterException</type> 
+        that can be thrown by methods of <type>XEventAttacher</type> are caught 
         and ignored.</p>
 
         @see registerScriptEvent
         @see attach
      */
-    void registerScriptEvents( [in] long nIndex,
-             [in] sequence<com::sun::star::script::ScriptEventDescriptor> aScriptEvents )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-    /** revokes the registration of an event.
-
+    void registerScriptEvents( [in] long nIndex, 
+             [in] sequence<com::sun::star::script::ScriptEventDescriptor> aScriptEvents ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** revokes the registration of an event. 
+        
         <p>The parameters <var>ListenerType</var> and
         <var>EventMethod</var> are equivalent to the first two
-        members of the <type>ScriptEventDescriptor</type>
+        members of the <type>ScriptEventDescriptor</type> 
         used to register events. If this event at this index has
-        been attached to any object, it is detached automatically
+        been attached to any object, it is detached automatically 
         (see <member>attach</member>).</p>
 
         <p>Exceptions of type
-        <type scope="com::sun::star::beans">IntrospectionException</type> and
-        <type scope="com::sun::star::script">CannotCreateAdapterException</type>
-        that can be thrown by methods of <type>XEventAttacher</type> are caught
+        <type scope="com::sun::star::beans">IntrospectionException</type> and 
+        <type scope="com::sun::star::script">CannotCreateAdapterException</type> 
+        that can be thrown by methods of <type>XEventAttacher</type> are caught 
         and ignored.</p>
 
         @see attach
      */
-    void revokeScriptEvent( [in] long nIndex,
-             [in] string aListenerType,
-             [in] string aEventMethod,
-             [in] string aRemoveListenerParam )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
+    void revokeScriptEvent( [in] long nIndex, 
+             [in] string aListenerType, 
+             [in] string aEventMethod, 
+             [in] string aRemoveListenerParam ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** revokes all events which are registered for the given index.
 
         <p>If the events at this index have been attached to any
@@ -128,75 +128,75 @@ published interface XEventAttacherManager: com::sun::star::uno::XInterface
 
         @see attach
      */
-    void revokeScriptEvents( [in] long nIndex )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-    /** creates an empty entry at the given position.
+    void revokeScriptEvents( [in] long nIndex ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** creates an empty entry at the given position. 
 
         <p>The index <var>n</var> of all entries with <code>n &amp;gt;=
         nIndex</code> will be increased by one.</p>
      */
-    void insertEntry( [in] long nIndex )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-    /** removes the entry at the given position.
-
+    void insertEntry( [in] long nIndex ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** removes the entry at the given position. 
+        
         <p>If any events are registered at this index, they will
         be revoked, too. So if the events at this index have been
         attached to any object they are detached automatically.
         (see <member>attach</member>).</p>
-
+        
         @see attach
      */
-    void removeEntry( [in] long nIndex )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-    /** @eturns
-            all events registered for the given object index.
-
-        @param Index
-            an index previously inserted with the method insertEntry.
-
-        @throws IllegalArgumentException
+    void removeEntry( [in] long nIndex ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** @eturns 
+            all events registered for the given object index. 
+              
+        @param Index	
+            an index previously inserted with the method insertEntry. 
+             
+        @throws IllegalArgumentException  
             if Index is not valid.
      */
-    sequence<com::sun::star::script::ScriptEventDescriptor> getScriptEvents( [in] long Index )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
-    /** attaches all the <type>ScriptEvent</type>s which are registered
+    sequence<com::sun::star::script::ScriptEventDescriptor> getScriptEvents( [in] long Index ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** attaches all the <type>ScriptEvent</type>s which are registered 
         for the given index to the given object.
-
+        
         <p>Exceptions of type
-        <type scope="com::sun::star::beans">IntrospectionException</type> and
-        <type scope="com::sun::star::script">CannotCreateAdapterException</type>
-        that can be thrown by methods of <type>XEventAttacher</type> are caught
+        <type scope="com::sun::star::beans">IntrospectionException</type> and 
+        <type scope="com::sun::star::script">CannotCreateAdapterException</type> 
+        that can be thrown by methods of <type>XEventAttacher</type> are caught 
         and ignored.</p>
      */
-    void attach( [in] long nIndex,
-             [in] com::sun::star::uno::XInterface xObject,
-             [in] any aHelper )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::lang::ServiceNotRegisteredException );
-
-    //-------------------------------------------------------------------------
-    /** detaches all the <type>ScriptEvent</type>s from the given object
+    void attach( [in] long nIndex, 
+             [in] com::sun::star::uno::XInterface xObject, 
+             [in] any aHelper ) 
+            raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::lang::ServiceNotRegisteredException ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** detaches all the <type>ScriptEvent</type>s from the given object 
         which are registered at this object for the given index.
 
         <p>Exceptions of type
-        <type scope="com::sun::star::beans">IntrospectionException</type> and
-        <type scope="com::sun::star::script">CannotCreateAdapterException</type>
-        that can be thrown by methods of <type>XEventAttacher</type> are caught
+        <type scope="com::sun::star::beans">IntrospectionException</type> and 
+        <type scope="com::sun::star::script">CannotCreateAdapterException</type> 
+        that can be thrown by methods of <type>XEventAttacher</type> are caught 
         and ignored.</p>
      */
-    void detach( [in] long nIndex,
-             [in] com::sun::star::uno::XInterface xObject )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
+    void detach( [in] long nIndex, 
+             [in] com::sun::star::uno::XInterface xObject ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** adds an <type>XScriptListener</type> that will be notified when an
         event takes place. For that a
         <type>ScriptEventDescriptor</type> is registered at and
@@ -207,26 +207,26 @@ published interface XEventAttacherManager: com::sun::star::uno::XInterface
 
         @see removeScriptListener
      */
-    void addScriptListener( [in] com::sun::star::script::XScriptListener xListener )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-    //-------------------------------------------------------------------------
+    void addScriptListener( [in] com::sun::star::script::XScriptListener xListener ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** removes a <type>XScriptListener</type> from the listener list.
-
+        
         <p>Nothing happens if the listener is not registered.
 
        <p>It is suggested to allow multiple registration of the same listener,
         thus for each time a listener is added, it has to be removed.
-
+        
         @see addScriptListener
      */
-    void removeScriptListener( [in] com::sun::star::script::XScriptListener Listener )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    void removeScriptListener( [in] com::sun::star::script::XScriptListener Listener ) 
+            raises( com::sun::star::lang::IllegalArgumentException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/XInvocation.idl b/udkapi/com/sun/star/script/XInvocation.idl
index 9299dc8f8802..27dda9e35d8a 100644
--- a/udkapi/com/sun/star/script/XInvocation.idl
+++ b/udkapi/com/sun/star/script/XInvocation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,134 +24,134 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XInvocation_idl__
-#define __com_sun_star_script_XInvocation_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XIntrospectionAccess_idl__
-#include <com/sun/star/beans/XIntrospectionAccess.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_script_CannotConvertException_idl__
-#include <com/sun/star/script/CannotConvertException.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
-#include <com/sun/star/reflection/InvocationTargetException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_UnknownPropertyException_idl__
-#include <com/sun/star/beans/UnknownPropertyException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
+#ifndef __com_sun_star_script_XInvocation_idl__ 
+#define __com_sun_star_script_XInvocation_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_XIntrospectionAccess_idl__ 
+#include <com/sun/star/beans/XIntrospectionAccess.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_CannotConvertException_idl__ 
+#include <com/sun/star/script/CannotConvertException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_InvocationTargetException_idl__ 
+#include <com/sun/star/reflection/InvocationTargetException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_UnknownPropertyException_idl__ 
+#include <com/sun/star/beans/UnknownPropertyException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
 /** gives access to an object's methods and properties.
-    Container access is available through
-    <type scope="com::sun::star::container">XIndexContainer</type>,
-    <type scope="com::sun::star::container">XNameContainer</type> and
+    Container access is available through 
+    <type scope="com::sun::star::container">XIndexContainer</type>, 
+    <type scope="com::sun::star::container">XNameContainer</type> and 
     <type scope="com::sun::star::container">XEnumerationAccess</type>.
     </p>
  */
 published interface XInvocation: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-    /** returns the introspection from this object or <NULL/>
+{ 
+    //------------------------------------------------------------------------- 
+    /** returns the introspection from this object or <NULL/> 
         if the object does not provide this information.
      */
-    com::sun::star::beans::XIntrospectionAccess getIntrospection();
-
-    //-------------------------------------------------------------------------
+    com::sun::star::beans::XIntrospectionAccess getIntrospection(); 
+ 
+    //------------------------------------------------------------------------- 
     /** provides access to methods exposed by an object.
-
+        
         @param aParams all parameters; pure out params are undefined in sequence,
                        the value has to be ignored by the callee
         @param aOutParamIndex This sequence contains the indices of all parameters
                         that are specified as out or inout.
-        @param aOutParam This sequence contains the values of all parameters that
-                        are specified as out or inout and corresponds with the
+        @param aOutParam This sequence contains the values of all parameters that 
+                        are specified as out or inout and corresponds with the 
                         indices provided by the aOutParamIndex sequence.
 
-                        Example: aOutParamIndex == { 1, 4 } means that
-                        aOutParam[0] contains the out value of the aParams[1]
-                        parameter and aOutParam[1] contains the out value of
+                        Example: aOutParamIndex == { 1, 4 } means that 
+                        aOutParam[0] contains the out value of the aParams[1] 
+                        parameter and aOutParam[1] contains the out value of 
                         the aParams[4] parameter.
      */
-    any invoke( [in] string aFunctionName,
-             [in] sequence<any> aParams,
-             [out] sequence<short> aOutParamIndex,
-             [out] sequence<any> aOutParam )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::script::CannotConvertException,
-                    com::sun::star::reflection::InvocationTargetException );
-
-    //-------------------------------------------------------------------------
+    any invoke( [in] string aFunctionName, 
+             [in] sequence<any> aParams, 
+             [out] sequence<short> aOutParamIndex, 
+             [out] sequence<any> aOutParam ) 
+            raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::script::CannotConvertException, 
+                    com::sun::star::reflection::InvocationTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** sets a value to the property with the specified name.
-
+        
         <p> If the underlying object implements an
-        <type scope="com::sun::star::container">XNameContainer</type>,
-        then this method will insert the value if there is no such
+        <type scope="com::sun::star::container">XNameContainer</type>, 
+        then this method will insert the value if there is no such 
         <var>aPropertyName</var>.
-
+        
         </p>
      */
-    void setValue( [in] string aPropertyName,
-             [in] any aValue )
-            raises( com::sun::star::beans::UnknownPropertyException,
-                    com::sun::star::script::CannotConvertException,
-                    com::sun::star::reflection::InvocationTargetException );
-
-    //-------------------------------------------------------------------------
-    /** returns the value of the property with the specified name.
-
-        @param aPropertyName
+    void setValue( [in] string aPropertyName, 
+             [in] any aValue ) 
+            raises( com::sun::star::beans::UnknownPropertyException, 
+                    com::sun::star::script::CannotConvertException, 
+                    com::sun::star::reflection::InvocationTargetException ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** returns the value of the property with the specified name. 
+                 
+        @param aPropertyName	 
             specifies the name of the property.
      */
-    any getValue( [in] string aPropertyName )
-            raises( com::sun::star::beans::UnknownPropertyException );
-
-    //-------------------------------------------------------------------------
+    any getValue( [in] string aPropertyName ) 
+            raises( com::sun::star::beans::UnknownPropertyException ); 
+ 
+    //------------------------------------------------------------------------- 
     /** returns <TRUE/> if the method with the specified name exists, else <FALSE/>.
-
-        <p>This optimizes the calling sequence
-        ( <member>XInvocation::hasMethod</member>,
+                 
+        <p>This optimizes the calling sequence 
+        ( <member>XInvocation::hasMethod</member>, 
         <member>XInvocation::invoke</member> )!</p>
-
-                @param aName
+                 
+                @param aName			 
                     specifies the name of the method.
      */
-    boolean hasMethod( [in] string aName );
-
-    //-------------------------------------------------------------------------
-    /** returns <TRUE/> if the property with the specified name exists, else <FALSE/>.
-
-                <p>This optimizes the calling sequence
-                ( <member>XInvocation::hasProperty</member>,
-                <member>XInvocation::getValue</member> ) or
-
-                ( <member>XInvocation::hasProperty</member>,
-                <member>XInvocation::setValue</member> )!
-
-                    @param aName
+    boolean hasMethod( [in] string aName ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** returns <TRUE/> if the property with the specified name exists, else <FALSE/>. 
+                 
+                <p>This optimizes the calling sequence 
+                ( <member>XInvocation::hasProperty</member>, 
+                <member>XInvocation::getValue</member> ) or 
+                 
+                ( <member>XInvocation::hasProperty</member>,  
+                <member>XInvocation::setValue</member> )! 
+                 
+                    @param aName	 
                 specifies the name of the property.
      */
-    boolean hasProperty( [in] string aName );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    boolean hasProperty( [in] string aName ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/XInvocation2.idl b/udkapi/com/sun/star/script/XInvocation2.idl
index 5cc24aa3bd38..83b579d490f2 100644
--- a/udkapi/com/sun/star/script/XInvocation2.idl
+++ b/udkapi/com/sun/star/script/XInvocation2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XInvocation2_idl__
-#define __com_sun_star_script_XInvocation2_idl__
-
-#ifndef __com_sun_star_script_XInvocation_idl__
-#include <com/sun/star/script/XInvocation.idl>
-#endif
-
-#ifndef __com_sun_star_script_InvocationInfo_idl__
-#include <com/sun/star/script/InvocationInfo.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
-/**
+#ifndef __com_sun_star_script_XInvocation2_idl__ 
+#define __com_sun_star_script_XInvocation2_idl__ 
+ 
+#ifndef __com_sun_star_script_XInvocation_idl__ 
+#include <com/sun/star/script/XInvocation.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_InvocationInfo_idl__ 
+#include <com/sun/star/script/InvocationInfo.idl> 
+#endif 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
+/** 
     Extension of XInvocation to provide additional information
-    about the methods and properties that are accessable via
+    about the methods and properties that are accessable via 
     XInvocation.
     </p>
  */
 published interface XInvocation2: com::sun::star::script::XInvocation
-{
+{ 
     /** returns the names of all methods and properties accessable via XInvocation.
      */
     sequence< string > getMemberNames();
@@ -61,24 +61,24 @@ published interface XInvocation2: com::sun::star::script::XInvocation
 
     /** returns information item for the method or property defined by aName
 
-        @param aName
+        @param aName	
             specifies the name of the method or property
 
-        @param bExact
+        @param bExact	
             specifies the name of the method or property
 
-        @throws IllegalArgumentException
+        @throws	IllegalArgumentException 
             if aName is not the name of a supported method or property
 
         @see com::sun::star::script::Invocation
      */
     InvocationInfo getInfoForName( [in] string aName, [in] boolean bExact )
         raises( com::sun::star::lang::IllegalArgumentException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/XInvocationAdapterFactory.idl b/udkapi/com/sun/star/script/XInvocationAdapterFactory.idl
index 6584bebbcb5f..89931350289d 100644
--- a/udkapi/com/sun/star/script/XInvocationAdapterFactory.idl
+++ b/udkapi/com/sun/star/script/XInvocationAdapterFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,49 +24,49 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XInvocationAdapterFactory_idl__
-#define __com_sun_star_script_XInvocationAdapterFactory_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_XInvocation_idl__
-#include <com/sun/star/script/XInvocation.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
+#ifndef __com_sun_star_script_XInvocationAdapterFactory_idl__ 
+#define __com_sun_star_script_XInvocationAdapterFactory_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_XInvocation_idl__ 
+#include <com/sun/star/script/XInvocation.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
 /** Interface to create adapter objects giving a type to be supported and a
     an invocation interface incoming calls are delegated to.
-
+    
     This interface is deprecated.  Use <type>XInvocationAdapterFactory2</type>.
     @deprecated
 */
 published interface XInvocationAdapterFactory: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** Creates an adapter interface of given type for calling the given
         <type>XInvocation</type> interface.
-
-        @param Invocation
+        
+        @param Invocation 
                invocation interface being called on incoming adapter calls
-        @param aType
+        @param aType		 	
                supported type of adapter
-
-        @returns
-                 adapter interface; this interface can be queried for
+               
+        @returns	
+                 adapter interface; this interface can be queried for 
                  XInterface and given type
     */
-    com::sun::star::uno::XInterface createAdapter( [in]XInvocation Invocation, [in]type aType );
-};
+    com::sun::star::uno::XInterface createAdapter( [in]XInvocation Invocation, [in]type aType ); 
+}; 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl b/udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl
index 90c2e57fc5a7..3651c1921cc3 100644
--- a/udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl
+++ b/udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,22 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XInvocationAdapterFactory2_idl__
-#define __com_sun_star_script_XInvocationAdapterFactory2_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_script_XInvocation_idl__
-#include <com/sun/star/script/XInvocation.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module script {
-
+#ifndef __com_sun_star_script_XInvocationAdapterFactory2_idl__ 
+#define __com_sun_star_script_XInvocationAdapterFactory2_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_XInvocation_idl__ 
+#include <com/sun/star/script/XInvocation.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module script {  
+ 
 /** Interface to create adapter objects giving types to be supported and a
     an invocation interface incoming calls are delegated to.
 */
@@ -47,14 +47,14 @@ published interface XInvocationAdapterFactory2 : com::sun::star::uno::XInterface
 {
     /** Creates an adapter interface of given types for calling the given
         <type>XInvocation</type> interface.
-
-        @param Invocation
+        
+        @param Invocation 
                invocation interface being called on incoming adapter calls
-        @param aType
+        @param aType		 	
                supported types of adapter
-
-        @returns
-                 adapter interface; this interface can be queried for
+               
+        @returns	
+                 adapter interface; this interface can be queried for 
                  XInterface and given types
     */
     com::sun::star::uno::XInterface createAdapter(
@@ -63,6 +63,6 @@ published interface XInvocationAdapterFactory2 : com::sun::star::uno::XInterface
 };
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/udkapi/com/sun/star/script/XLibraryAccess.idl b/udkapi/com/sun/star/script/XLibraryAccess.idl
index 8bb54f02a2dd..34a2535de605 100644
--- a/udkapi/com/sun/star/script/XLibraryAccess.idl
+++ b/udkapi/com/sun/star/script/XLibraryAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,85 +24,85 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XLibraryAccess_idl__
-#define __com_sun_star_script_XLibraryAccess_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
+#ifndef __com_sun_star_script_XLibraryAccess_idl__ 
+#define __com_sun_star_script_XLibraryAccess_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
 /** provides access to additional scripting code.
-
-    <p>This code is organized in modules and these modules contain
-    the functions. It is possible to get just the code from a function,
+    
+    <p>This code is organized in modules and these modules contain 
+    the functions. It is possible to get just the code from a function, 
     but you can also get the whole code of a module with all functions in it.</p>
     @deprecated
  */
 published interface XLibraryAccess: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-    /** returns <TRUE/>, if the function is accessible through this library;
-        otherwise it returns <FALSE/>.
-
-                @param aFunctionName
-                the fully qualified name of a funtion.
+{ 
+    //------------------------------------------------------------------------- 
+    /** returns <TRUE/>, if the function is accessible through this library; 
+        otherwise it returns <FALSE/>. 
+                 
+                @param aFunctionName  
+                the fully qualified name of a funtion. 
                 (e.g., "UtilLibrary.ModuleDate.FunctionCurrentDate")
      */
-    boolean isFunction( [in] string aFunctionName );
-
-    //-------------------------------------------------------------------------
-    /** returns <TRUE/> if a fully qualified function name begins with this name.
-
-                @param aPathName
+    boolean isFunction( [in] string aFunctionName ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** returns <TRUE/> if a fully qualified function name begins with this name. 
+                 
+                @param aPathName	 
                 a part of a function name (e.g., "UtilLibrary").
      */
-    boolean isValidPath( [in] string aPathName );
-
-    //-------------------------------------------------------------------------
-    /** Return all module names which contain code.
+    boolean isValidPath( [in] string aPathName ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** Return all module names which contain code. 
          e.g., { "UtilLibrary.ModuleDate", "UtilLibrary.Output", ... }
      */
-    sequence<string> getModuleNames();
-
-    //-------------------------------------------------------------------------
+    sequence<string> getModuleNames(); 
+ 
+    //------------------------------------------------------------------------- 
     /** get the source code of a module.
      */
-    string getModuleSource( [in] string aModulName );
-
-    //-------------------------------------------------------------------------
-    /** Get the hole compiled code of a module.
-
-        @param ModuleName the full qualified name of a module.
-                            (e.g., "UtilLibrary.ModuleDate")
-        @return         an empty sequence, if this module is not found or the
+    string getModuleSource( [in] string aModulName ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** Get the hole compiled code of a module. 
+        
+        @param ModuleName the full qualified name of a module. 
+                            (e.g., "UtilLibrary.ModuleDate") 
+        @return			an empty sequence, if this module is not found or the 
                             code is not compiled.
      */
-    sequence<byte> getModuleCode( [in] string aModuleName );
-
-    //-------------------------------------------------------------------------
+    sequence<byte> getModuleCode( [in] string aModuleName ); 
+ 
+    //------------------------------------------------------------------------- 
     /** get the source code of a function.
      */
-    string getFunctionSource( [in] string aFunctionName );
-
-    //-------------------------------------------------------------------------
-    /** Get the compiled code of a function.
-
-        @param FunctionName the full qualified name of a function.
-                            (e.g., "UtilLibrary.ModuleDate.Function.CurrentDate")
-        @return         an empty sequence, if this function is not found.
+    string getFunctionSource( [in] string aFunctionName ); 
+ 
+    //------------------------------------------------------------------------- 
+    /** Get the compiled code of a function. 
+        
+        @param FunctionName the full qualified name of a function. 
+                            (e.g., "UtilLibrary.ModuleDate.Function.CurrentDate") 
+        @return			an empty sequence, if this function is not found.
      */
-    sequence<byte> getFunctionCode( [in] string FunctionName );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    sequence<byte> getFunctionCode( [in] string FunctionName ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/XScriptEventsAttacher.idl b/udkapi/com/sun/star/script/XScriptEventsAttacher.idl
index d60a593fcf52..d9094f7d3c91 100644
--- a/udkapi/com/sun/star/script/XScriptEventsAttacher.idl
+++ b/udkapi/com/sun/star/script/XScriptEventsAttacher.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,78 +24,78 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XScriptEventsAttacher_idl__
-#define __com_sun_star_script_XScriptEventsAttacher_idl__
-
-#ifndef __com_sun_star_script_XScriptListener_idl__
-#include <com/sun/star/script/XScriptListener.idl>
-#endif
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_IntrospectionException_idl__
-#include <com/sun/star/beans/IntrospectionException.idl>
-#endif
-
-#ifndef __com_sun_star_script_CannotCreateAdapterException_idl__
-#include <com/sun/star/script/CannotCreateAdapterException.idl>
-#endif
-
-#ifndef __com_sun_star_lang_ServiceNotRegisteredException_idl__
-#include <com/sun/star/lang/ServiceNotRegisteredException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
-/**
-    This interface can be used to attach script events to a number of
+#ifndef __com_sun_star_script_XScriptEventsAttacher_idl__ 
+#define __com_sun_star_script_XScriptEventsAttacher_idl__ 
+ 
+#ifndef __com_sun_star_script_XScriptListener_idl__ 
+#include <com/sun/star/script/XScriptListener.idl> 
+#endif 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_beans_IntrospectionException_idl__ 
+#include <com/sun/star/beans/IntrospectionException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_CannotCreateAdapterException_idl__ 
+#include <com/sun/star/script/CannotCreateAdapterException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_ServiceNotRegisteredException_idl__ 
+#include <com/sun/star/lang/ServiceNotRegisteredException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
+/** 
+    This interface can be used to attach script events to a number of 
     objects that give access to the definition of events that should
     be attached to them, e.g., by supporting XEventsSupplier
 */
 published interface XScriptEventsAttacher: com::sun::star::uno::XInterface
-{
-    /**
+{ 
+    /** 
         Attaches the events defined by XScriptEventsSupplier to the
         corresponding object implementing XScriptEventsSupplier.
-
-        @param Objects
+        
+        @param Objects		
                             Sequence of all objects. Usually the objects should directly
                             support <type>XScriptEventsAttacher</type> to define the events
                             but this is not strictly required. It's also possible that
                             the object implementing <type>XScriptEventsAttacher</type>
                             knows how to get the necessary information for the objects.
-        @param xListener
-                            All events (if defined by XScriptEventsSupplier) that are fired
-                            by one of the objects are mapped into a <type>ScriptEvent</type>
+        @param xListener	
+                            All events (if defined by XScriptEventsSupplier) that are fired 
+                            by one of the objects are mapped into a <type>ScriptEvent</type> 
                             and passed to the methods of this XScriptListener.
-        @param Helper
+        @param Helper		
                             Helper object for the implementation. This value will be
                             passed to the XScriptListener as Helper property in the
                             <type>ScriptEvent</type>.
     */
-    void attachEvents(  [in] sequence< com::sun::star::uno::XInterface > Objects,
+    void attachEvents(	[in] sequence< com::sun::star::uno::XInterface > Objects, 
                         [in] com::sun::star::script::XScriptListener xListener,
                         [in] any Helper )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::beans::IntrospectionException,
-                    com::sun::star::script::CannotCreateAdapterException,
-                    com::sun::star::lang::ServiceNotRegisteredException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+            raises( com::sun::star::lang::IllegalArgumentException, 
+                    com::sun::star::beans::IntrospectionException, 
+                    com::sun::star::script::CannotCreateAdapterException, 
+                    com::sun::star::lang::ServiceNotRegisteredException ); 
+
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
 
diff --git a/udkapi/com/sun/star/script/XScriptEventsSupplier.idl b/udkapi/com/sun/star/script/XScriptEventsSupplier.idl
index 3355b7dd83ae..802bd1a3557a 100644
--- a/udkapi/com/sun/star/script/XScriptEventsSupplier.idl
+++ b/udkapi/com/sun/star/script/XScriptEventsSupplier.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,39 +24,39 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XScriptEventsSupplier_idl__
-#define __com_sun_star_script_XScriptEventsSupplier_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
-/**
-    Gives access to an event container represented by an
+#ifndef __com_sun_star_script_XScriptEventsSupplier_idl__ 
+#define __com_sun_star_script_XScriptEventsSupplier_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#include <com/sun/star/container/XNameContainer.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
+/** 
+    Gives access to an event container represented by an 
     XNameContainer containing ScriptEventDescriptor instances.
  */
 published interface XScriptEventsSupplier: com::sun::star::uno::XInterface
-{
-    /**
-        Returns an XNameContainer containing instances
-        of <type>ScriptEventDescriptor</type>
+{ 
+    /** 
+        Returns an XNameContainer containing instances 
+        of <type>ScriptEventDescriptor</type> 
     */
-    com::sun::star::container::XNameContainer getEvents();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    com::sun::star::container::XNameContainer getEvents(); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/XScriptListener.idl b/udkapi/com/sun/star/script/XScriptListener.idl
index f4404d39d645..2cc6c7c2808c 100644
--- a/udkapi/com/sun/star/script/XScriptListener.idl
+++ b/udkapi/com/sun/star/script/XScriptListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XScriptListener_idl__
-#define __com_sun_star_script_XScriptListener_idl__
-
-#ifndef __com_sun_star_lang_XEventListener_idl__
-#include <com/sun/star/lang/XEventListener.idl>
-#endif
-
-#ifndef __com_sun_star_script_ScriptEvent_idl__
-#include <com/sun/star/script/ScriptEvent.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_InvocationTargetException_idl__
-#include <com/sun/star/reflection/InvocationTargetException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
+#ifndef __com_sun_star_script_XScriptListener_idl__ 
+#define __com_sun_star_script_XScriptListener_idl__ 
+ 
+#ifndef __com_sun_star_lang_XEventListener_idl__ 
+#include <com/sun/star/lang/XEventListener.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_ScriptEvent_idl__ 
+#include <com/sun/star/script/ScriptEvent.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_InvocationTargetException_idl__ 
+#include <com/sun/star/reflection/InvocationTargetException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
 /** makes it possible to receive <type>ScriptEvent</type>s.
  */
 published interface XScriptListener: com::sun::star::lang::XEventListener
-{
-    //-------------------------------------------------------------------------
-    /** gets called when an event takes place.  For that a
+{ 
+    //------------------------------------------------------------------------- 
+    /** gets called when an event takes place.  For that a 
         <type>ScriptEventDescriptor</type> is registered at and
         attached to an object by an <type>XEventAttacherManager</type>.
      */
-    void firing( [in] com::sun::star::script::ScriptEvent aEvent );
-
-    //-------------------------------------------------------------------------
+    void firing( [in] com::sun::star::script::ScriptEvent aEvent ); 
+ 
+    //------------------------------------------------------------------------- 
     /** gets called when a "vetoable event" occurs at the object.
      */
-    any approveFiring( [in] com::sun::star::script::ScriptEvent aEvent )
-            raises( com::sun::star::reflection::InvocationTargetException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    any approveFiring( [in] com::sun::star::script::ScriptEvent aEvent ) 
+            raises( com::sun::star::reflection::InvocationTargetException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/XStarBasicAccess.idl b/udkapi/com/sun/star/script/XStarBasicAccess.idl
index 97a7bfd08da7..030d7fb2cdf6 100644
--- a/udkapi/com/sun/star/script/XStarBasicAccess.idl
+++ b/udkapi/com/sun/star/script/XStarBasicAccess.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,75 +24,75 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XStarBasicAccess_idl__
-#define __com_sun_star_script_XStarBasicAccess_idl__
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
+#ifndef __com_sun_star_script_XStarBasicAccess_idl__ 
+#define __com_sun_star_script_XStarBasicAccess_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#include <com/sun/star/container/XNameContainer.idl> 
+#endif 
+  
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
 /** Interface representing a library and provides access to its modules
 
     @deprecated
  */
 published interface XStarBasicAccess: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-    /** returns
+{ 
+    //------------------------------------------------------------------------- 
+    /** returns  
         the library container giving access to the libraries stored in a document
         or basic library file.
      */
-    com::sun::star::container::XNameContainer getLibraryContainer();
-
-    //-------------------------------------------------------------------------
+    com::sun::star::container::XNameContainer getLibraryContainer(); 
+ 
+    //------------------------------------------------------------------------- 
     /**
         Creates an empty library. This method can be called alternatively to
-        accessing directly the NameContainer returned by getLibraryContainer.
+        accessing directly the NameContainer returned by getLibraryContainer. 
         By using this method together with addModule and addStarBasicDialog
-        the caller does not have to implement XStarBasicLibraryInfo, XModuleInfo,
+        the caller does not have to implement XStarBasicLibraryInfo, XModuleInfo, 
         and XStarBasicDialogInfo
      */
-    void createLibrary( [in] string LibName, [in] string Password,
+    void createLibrary( [in] string LibName, [in] string Password, 
                         [in] string ExternalSourceURL, [in] string LinkTargetURL )
-        raises( com::sun::star::container::ElementExistException );
+        raises( com::sun::star::container::ElementExistException ); 
 
-    //-------------------------------------------------------------------------
+    //------------------------------------------------------------------------- 
     /**
         Adds a module to an existing (e.g., created by createLibrary) library.
-        By using this method together with createLibrary the caller does not have
-        to implement XStarBasicLibraryInfo and XModuleInfo.
+        By using this method together with createLibrary the caller does not have 
+        to implement XStarBasicLibraryInfo and XModuleInfo. 
 
         @throws  NoSuchElementException
-        if the library doesn't exist.
+        if the library doesn't exist. 
      */
-    void addModule( [in] string LibraryName, [in] string ModuleName,
+    void addModule( [in] string LibraryName, [in] string ModuleName, 
                     [in] string Language, [in] string Source )
-        raises( com::sun::star::container::NoSuchElementException );
-
-    //-------------------------------------------------------------------------
+        raises( com::sun::star::container::NoSuchElementException ); 
+ 
+    //------------------------------------------------------------------------- 
     /**
-        Adds an old style basic dialog (SI controls) to an existing (e.g., created
+        Adds an old style basic dialog (SI controls) to an existing (e.g., created 
         by createLibrary) library.
-        By using this method together with createLibrary the caller does not have
+        By using this method together with createLibrary the caller does not have 
         to implement XStarBasicLibraryInfo and XStarBasicDialogInfo
 
         @throws  NoSuchElementException
-        if the library doesn't exist.
+        if the library doesn't exist. 
      */
-    void addDialog( [in] string LibraryName, [in] string DialogName,
+    void addDialog( [in] string LibraryName, [in] string DialogName, 
                     [in] sequence< byte > Data )
-        raises( com::sun::star::container::NoSuchElementException );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+        raises( com::sun::star::container::NoSuchElementException ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/XStarBasicDialogInfo.idl b/udkapi/com/sun/star/script/XStarBasicDialogInfo.idl
index ddcf583f2777..b9a715ce5c85 100644
--- a/udkapi/com/sun/star/script/XStarBasicDialogInfo.idl
+++ b/udkapi/com/sun/star/script/XStarBasicDialogInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,40 +24,40 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XStarBasicDialogInfo_idl__
-#define __com_sun_star_script_XStarBasicDialogInfo_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
-/** Interface describing old style basic dialog (SI controls) in binary data
+#ifndef __com_sun_star_script_XStarBasicDialogInfo_idl__ 
+#define __com_sun_star_script_XStarBasicDialogInfo_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+  
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
+/** Interface describing old style basic dialog (SI controls) in binary data 
 
     @deprecated
  */
 published interface XStarBasicDialogInfo: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** returns the name of the dialog
      */
     string getName();
-
-    //-------------------------------------------------------------------------
-    /** returns binary data describing the SIDialog in SBX stream format
+ 
+    //------------------------------------------------------------------------- 
+    /** returns binary data describing the SIDialog in SBX stream format 
      */
     sequence< byte > getData();
 
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/XStarBasicLibraryInfo.idl b/udkapi/com/sun/star/script/XStarBasicLibraryInfo.idl
index 4b7337a0b33c..44477773a5f3 100644
--- a/udkapi/com/sun/star/script/XStarBasicLibraryInfo.idl
+++ b/udkapi/com/sun/star/script/XStarBasicLibraryInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,32 +24,32 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XStarBasicLibraryInfo_idl__
-#define __com_sun_star_script_XStarBasicLibraryInfo_idl__
-
-#ifndef __com_sun_star_container_XNameContainer_idl__
-#include <com/sun/star/container/XNameContainer.idl>
-#endif
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
+#ifndef __com_sun_star_script_XStarBasicLibraryInfo_idl__ 
+#define __com_sun_star_script_XStarBasicLibraryInfo_idl__ 
+ 
+#ifndef __com_sun_star_container_XNameContainer_idl__ 
+#include <com/sun/star/container/XNameContainer.idl> 
+#endif 
+  
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
 /** Interface representing a library and provides access to its modules
 
     @deprecated
  */
 published interface XStarBasicLibraryInfo: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** returns the library's name
      */
     string getName();
-
-    //-------------------------------------------------------------------------
-    /** returns
+ 
+    //------------------------------------------------------------------------- 
+    /** returns  
         the module container giving access to the modules stored in the library.
         The container has to be returned in any case, no matter if the library is
         stored embedded, external, or linked.
@@ -57,9 +57,9 @@ published interface XStarBasicLibraryInfo: com::sun::star::uno::XInterface
         @see getExternalSourceURL
         @see getLinkTargetURL
      */
-    com::sun::star::container::XNameContainer getModuleContainer();
-
-    //-------------------------------------------------------------------------
+    com::sun::star::container::XNameContainer getModuleContainer(); 
+ 
+    //------------------------------------------------------------------------- 
     /** returns
         the dialog container giving access to the dialogs stored in the library.
         The container has to be returned in any case, no matter if the library is
@@ -68,39 +68,39 @@ published interface XStarBasicLibraryInfo: com::sun::star::uno::XInterface
         @see getExternalSourceURL
         @see getLinkTargetURL
      */
-    com::sun::star::container::XNameContainer getDialogContainer();
-
-    //-------------------------------------------------------------------------
+    com::sun::star::container::XNameContainer getDialogContainer(); 
+ 
+    //------------------------------------------------------------------------- 
     /** returns
         the password, if the library is protected with one,
         an empty string otherwise.
      */
-    string getPassword();
-
-    //-------------------------------------------------------------------------
+    string getPassword(); 
+ 
+    //------------------------------------------------------------------------- 
     /** returns an
-        URL describing the location where the library is stored if the library
-        is stored seperately (for example not in the main XML file but in a
+        URL describing the location where the library is stored if the library 
+        is stored seperately (for example not in the main XML file but in a 
         special library format file), an empty string otherwise.
-        This information can be useful to optimize the access to the library,
+        This information can be useful to optimize the access to the library, 
         e.g., for loading on demand.
      */
-    string getExternalSourceURL();
-
-    //-------------------------------------------------------------------------
+    string getExternalSourceURL(); 
+ 
+    //------------------------------------------------------------------------- 
     /** returns an
         URL describing the location of the library linked to.
-
+        
         <p>HINT: This method can be removed when there is a generic interface
         for linking. Then the implementation will simply support this
         "XLinked" interface and it can be checked by queryInterface().</p>
      */
-    string getLinkTargetURL();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+    string getLinkTargetURL(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/XStarBasicModuleInfo.idl b/udkapi/com/sun/star/script/XStarBasicModuleInfo.idl
index 93421c3b9d6d..b2e70fcc32ec 100644
--- a/udkapi/com/sun/star/script/XStarBasicModuleInfo.idl
+++ b/udkapi/com/sun/star/script/XStarBasicModuleInfo.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,47 +24,47 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XStarBasicModuleInfo_idl__
-#define __com_sun_star_script_XStarBasicModuleInfo_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
+#ifndef __com_sun_star_script_XStarBasicModuleInfo_idl__ 
+#define __com_sun_star_script_XStarBasicModuleInfo_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+  
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
 /** Script Module containing some scripting code in a certain scripting language
     @deprecated
  */
 published interface XStarBasicModuleInfo: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
+{ 
+    //------------------------------------------------------------------------- 
     /** returns the name of the module
      */
     string getName();
-
-    //-------------------------------------------------------------------------
+ 
+    //------------------------------------------------------------------------- 
     /** returns the type of the script language as string, for example, "StarBasic" or "JavaScript".
      */
     string getLanguage();
-
-    //-------------------------------------------------------------------------
-    /** returns the script source code as string.
-
+ 
+    //------------------------------------------------------------------------- 
+    /** returns the script source code as string. 
+        
         <p>The code has to correspond with the language
         defined by Language.</p>
      */
     string getSource();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/script/XTypeConverter.idl b/udkapi/com/sun/star/script/XTypeConverter.idl
index df854bed1e9f..12b90f1032cb 100644
--- a/udkapi/com/sun/star/script/XTypeConverter.idl
+++ b/udkapi/com/sun/star/script/XTypeConverter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,42 +24,42 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_script_XTypeConverter_idl__
-#define __com_sun_star_script_XTypeConverter_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_reflection_XIdlClass_idl__
-#include <com/sun/star/reflection/XIdlClass.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-
-#ifndef __com_sun_star_script_CannotConvertException_idl__
-#include <com/sun/star/script/CannotConvertException.idl>
-#endif
-
-#ifndef __com_sun_star_uno_TypeClass_idl__
-#include <com/sun/star/uno/TypeClass.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module script {
-
-//=============================================================================
-
+#ifndef __com_sun_star_script_XTypeConverter_idl__ 
+#define __com_sun_star_script_XTypeConverter_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_reflection_XIdlClass_idl__ 
+#include <com/sun/star/reflection/XIdlClass.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_script_CannotConvertException_idl__ 
+#include <com/sun/star/script/CannotConvertException.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_TypeClass_idl__ 
+#include <com/sun/star/uno/TypeClass.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module script {  
+ 
+//============================================================================= 
+ 
 /** Interface to provide standard type conversions.
-
+    
     @see Converter
 */
 published interface XTypeConverter: com::sun::star::uno::XInterface
-{
+{ 
     /** Converts the value <code>aFrom</code> to the specified type
         <code>xDestinationType</code>.
         Throws an <type>CannotConvertException</type> if the conversion
@@ -72,11 +72,11 @@ published interface XTypeConverter: com::sun::star::uno::XInterface
                 converted value (any carrying value of type <code>xDestinationType</code>
     */
     any convertTo(
-        [in] any aFrom,
-        [in] type xDestinationType )
-        raises( com::sun::star::lang::IllegalArgumentException,
-                com::sun::star::script::CannotConvertException );
-
+        [in] any aFrom, 
+        [in] type xDestinationType ) 
+        raises( com::sun::star::lang::IllegalArgumentException, 
+                com::sun::star::script::CannotConvertException ); 
+    
     /** Converts the value <code>aFrom</code> to the specified simple type
         <code>aDestinationType</code>.
         Throws an <type>CannotConvertException</type> if the conversion
@@ -84,7 +84,7 @@ published interface XTypeConverter: com::sun::star::uno::XInterface
         if the destination
         <type scope="com::sun::star::uno">TypeClass</type> is not simple,
         e.g. not long or byte.
-
+        
         @param aFrom
                source value
         @param aDestinationType
@@ -93,17 +93,17 @@ published interface XTypeConverter: com::sun::star::uno::XInterface
                 converted value (any carrying value of type <code>aDestinationType</code>
     */
     any convertToSimpleType(
-        [in] any aFrom,
-        [in] com::sun::star::uno::TypeClass aDestinationType )
-        raises( com::sun::star::lang::IllegalArgumentException,
-                com::sun::star::script::CannotConvertException );
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+        [in] any aFrom, 
+        [in] com::sun::star::uno::TypeClass aDestinationType ) 
+        raises( com::sun::star::lang::IllegalArgumentException, 
+                com::sun::star::script::CannotConvertException ); 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/security/AccessControlException.idl b/udkapi/com/sun/star/security/AccessControlException.idl
index 289c312165f8..7dd036d4d4a4 100644
--- a/udkapi/com/sun/star/security/AccessControlException.idl
+++ b/udkapi/com/sun/star/security/AccessControlException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,18 +25,18 @@
  *
  ************************************************************************/
 #ifndef __com_sun_star_security_AccessControlException_idl__
-#define __com_sun_star_security_AccessControlException_idl__
-
+#define __com_sun_star_security_AccessControlException_idl__ 
+ 
 #ifndef __com_sun_star_uno_SecurityException_idl__
-#include <com/sun/star/uno/SecurityException.idl>
+#include <com/sun/star/uno/SecurityException.idl> 
 #endif
 
-//=============================================================================
-
-module com {  module sun {  module star {  module security {
+//============================================================================= 
 
-//=============================================================================
+module com {  module sun {  module star {  module security {  
 
+//============================================================================= 
+ 
 /** Exception notifying a lacking permission to access data or execute code
     thus it is thrown if permission ought to be denied.
 
@@ -45,7 +45,7 @@ module com {  module sun {  module star {  module security {
 published exception AccessControlException : com::sun::star::uno::SecurityException
 {
     /** lacking permission.
-
+        
         @attention
         If it is the case, that XAccessController::checkPermission() was called
         passing a sequence< any >, i.e. a sequence of paermissions are demanded,
@@ -55,8 +55,8 @@ published exception AccessControlException : com::sun::star::uno::SecurityExcept
     any LackingPermission;
 };
 
-//=============================================================================
-
+//============================================================================= 
+ 
 }; }; }; };
 
 #endif
diff --git a/udkapi/com/sun/star/security/AccessController.idl b/udkapi/com/sun/star/security/AccessController.idl
index 35d1c51a1a61..9b74305bf54a 100644
--- a/udkapi/com/sun/star/security/AccessController.idl
+++ b/udkapi/com/sun/star/security/AccessController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,19 +24,19 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_security_AccessController_idl__
-#define __com_sun_star_security_AccessController_idl__
-
+#ifndef __com_sun_star_security_AccessController_idl__ 
+#define __com_sun_star_security_AccessController_idl__ 
+ 
 #ifndef __com_sun_star_security_XAccessController_idl__
-#include <com/sun/star/security/XAccessController.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module security {
-
-//=============================================================================
+#include <com/sun/star/security/XAccessController.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module security {  
+ 
+//============================================================================= 
 /** This meta service supports the XAccessController interface for checking
     security permissions.
 
@@ -45,7 +45,7 @@ module com {  module sun {  module star {  module security {
     of bootstrapping problems, i.e. recurring calls during initialization
     have to be resolved.  This happens when the implementation calls other
     service implementations.
-
+    
     Also, it obviously has also to be ensured that the object is process-local
     to assure that permission checks are not corrupted via insecure inter-process
     communication.
diff --git a/udkapi/com/sun/star/security/AllPermission.idl b/udkapi/com/sun/star/security/AllPermission.idl
index 53af3b200770..b49e1baeffd9 100644
--- a/udkapi/com/sun/star/security/AllPermission.idl
+++ b/udkapi/com/sun/star/security/AllPermission.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/security/Policy.idl b/udkapi/com/sun/star/security/Policy.idl
index 027221fd2c6e..a5423a831c5d 100644
--- a/udkapi/com/sun/star/security/Policy.idl
+++ b/udkapi/com/sun/star/security/Policy.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/security/RuntimePermission.idl b/udkapi/com/sun/star/security/RuntimePermission.idl
index 6c4930b8986c..c6e2c109768b 100644
--- a/udkapi/com/sun/star/security/RuntimePermission.idl
+++ b/udkapi/com/sun/star/security/RuntimePermission.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,11 +27,11 @@
 #ifndef __com_sun_star_security_RuntimePermission_idl__
 #define __com_sun_star_security_RuntimePermission_idl__
 //=============================================================================
-
+ 
 module com {  module sun {  module star {  module security {
-
+ 
 //=============================================================================
-
+ 
 /** This permission grants runtime access to some named functionality.
     A RuntimePermission contains a name (also referred to as a "target name")
     but no actions list;  you either have the named permission or you don't.
diff --git a/udkapi/com/sun/star/security/XAccessControlContext.idl b/udkapi/com/sun/star/security/XAccessControlContext.idl
index 535e8753aa20..2a0a5429f9be 100644
--- a/udkapi/com/sun/star/security/XAccessControlContext.idl
+++ b/udkapi/com/sun/star/security/XAccessControlContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_security_XAccessControlContext_idl__
-#define __com_sun_star_security_XAccessControlContext_idl__
-
+#ifndef __com_sun_star_security_XAccessControlContext_idl__ 
+#define __com_sun_star_security_XAccessControlContext_idl__ 
+ 
 #ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/uno/XInterface.idl> 
 #endif
 #ifndef __com_sun_star_security_AccessControlException_idl__
-#include <com/sun/star/security/AccessControlException.idl>
+#include <com/sun/star/security/AccessControlException.idl> 
 #endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module security {
-
-//=============================================================================
-
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module security {  
+ 
+//============================================================================= 
+ 
 /** An XAccessControlContext is used to make system resource access decisions
     based on the context it encapsulates.
     <p>
@@ -66,10 +66,10 @@ published interface XAccessControlContext : com::sun::star::uno::XInterface
         This method quietly returns if the access request is permitted,
         or throws a suitable AccessControlException otherwise.
         </p>
-
+        
         @param perm
                permission to be checked
-
+               
         @throws AccessControlException
                 thrown if access is denied
 
@@ -84,7 +84,7 @@ published interface XAccessControlContext : com::sun::star::uno::XInterface
         raises (AccessControlException);
 };
 
-//=============================================================================
+//============================================================================= 
 
 }; }; }; };
 
diff --git a/udkapi/com/sun/star/security/XAccessController.idl b/udkapi/com/sun/star/security/XAccessController.idl
index 708a884bad68..246cf0997897 100644
--- a/udkapi/com/sun/star/security/XAccessController.idl
+++ b/udkapi/com/sun/star/security/XAccessController.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_security_XAccessController_idl__
-#define __com_sun_star_security_XAccessController_idl__
-
+#ifndef __com_sun_star_security_XAccessController_idl__ 
+#define __com_sun_star_security_XAccessController_idl__ 
+ 
 #ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/uno/XInterface.idl> 
 #endif
 #ifndef __com_sun_star_security_XAccessControlContext_idl__
-#include <com/sun/star/security/XAccessControlContext.idl>
+#include <com/sun/star/security/XAccessControlContext.idl> 
 #endif
 
 #ifndef __com_sun_star_security_XAction_idl__
-#include <com/sun/star/security/XAction.idl>
+#include <com/sun/star/security/XAction.idl> 
 #endif
 
 #ifndef __com_sun_star_security_AccessControlException_idl__
-#include <com/sun/star/security/AccessControlException.idl>
+#include <com/sun/star/security/AccessControlException.idl> 
 #endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module security {
-
-//=============================================================================
-
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module security {  
+ 
+//============================================================================= 
+ 
 /** Interface for checking permissions and invoking privileged or restricted
     actions.
 
@@ -67,10 +67,10 @@ published interface XAccessController : com::sun::star::uno::XInterface
         This method quietly returns if the access request is permitted,
         or throws a suitable AccessControlException otherwise.
         </p>
-
+        
         @param perm
                permission to be checked
-
+               
         @throws AccessControlException
                 thrown if access is denied
 
@@ -83,7 +83,7 @@ published interface XAccessController : com::sun::star::uno::XInterface
     void checkPermission(
         [in] any perm )
         raises (AccessControlException);
-
+    
     /** Perform the specified action restricting permissions to the given
         XAccessControlContext.
         The action is performed with the intersection of the permissions of the currently installed
@@ -93,7 +93,7 @@ published interface XAccessController : com::sun::star::uno::XInterface
         If the specified XAccessControlContext is null, then the action is performed
         with unmodified permissions, i.e. the call makes no sense.
         </p>
-
+        
         @param action
                action object to be executed
         @param restriction
@@ -107,7 +107,7 @@ published interface XAccessController : com::sun::star::uno::XInterface
         [in] XAction action,
         [in] XAccessControlContext restriction )
         raises (com::sun::star::uno::Exception);
-
+    
     /** Perform the specified action adding a set of permissions defined by the given
         XAccessControlContext.
         The action is performed with the union of the permissions of the currently installed
@@ -117,12 +117,12 @@ published interface XAccessController : com::sun::star::uno::XInterface
         If the given XAccessControlContext is null, then the action is performed
         <b>only</b> with the permissions of the security policy currently in effect.
         </p>
-
+        
         @attention
         Do carefully use this method only for well known use-cases to avoid exploits!
         Script engines executing sandboxed scripts should generally deny calling this
         method.
-
+        
         @param action
                action object to be executed
         @param restriction
@@ -136,7 +136,7 @@ published interface XAccessController : com::sun::star::uno::XInterface
         [in] XAction action,
         [in] XAccessControlContext restriction )
         raises (com::sun::star::uno::Exception);
-
+    
     /** This method takes a "snapshot" of the current calling context
         and returns it.
         <p>
@@ -148,7 +148,7 @@ published interface XAccessController : com::sun::star::uno::XInterface
     XAccessControlContext getContext();
 };
 
-//=============================================================================
+//============================================================================= 
 
 }; }; }; };
 
diff --git a/udkapi/com/sun/star/security/XAction.idl b/udkapi/com/sun/star/security/XAction.idl
index 7a61477ea628..4e961b99ed37 100644
--- a/udkapi/com/sun/star/security/XAction.idl
+++ b/udkapi/com/sun/star/security/XAction.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_security_XAction_idl__
-#define __com_sun_star_security_XAction_idl__
-
+#ifndef __com_sun_star_security_XAction_idl__ 
+#define __com_sun_star_security_XAction_idl__ 
+ 
 #ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/uno/XInterface.idl> 
 #endif
 #ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
-module com {  module sun {  module star {  module security {
-
-//=============================================================================
-
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module security {  
+ 
+//============================================================================= 
+ 
 /** Interface for running an action.
 
     @since OOo 1.1.2
@@ -48,7 +48,7 @@ module com {  module sun {  module star {  module security {
 published interface XAction : com::sun::star::uno::XInterface
 {
     /** Action to be done.
-
+        
         @return
                 result
         @throws com::sun::star::uno::Exception
@@ -58,7 +58,7 @@ published interface XAction : com::sun::star::uno::XInterface
         raises (com::sun::star::uno::Exception);
 };
 
-//=============================================================================
+//============================================================================= 
 
 }; }; }; };
 
diff --git a/udkapi/com/sun/star/security/XPolicy.idl b/udkapi/com/sun/star/security/XPolicy.idl
index b591eb32353f..57f9afe4db6c 100644
--- a/udkapi/com/sun/star/security/XPolicy.idl
+++ b/udkapi/com/sun/star/security/XPolicy.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@ module com {  module sun {  module star {  module security {
 
 /** Interface for getting sets of permissions of a specified user or
     the default permissions if no user is given.
-
+    
     @see com::sun::star::security::Policy
 
     @since OOo 1.1.2
@@ -44,7 +44,7 @@ published interface XPolicy : com::sun::star::uno::XInterface
 {
     /** Gets the permissions of the specified user excluding the default permissions
         granted to all users.
-
+        
         @param userId
                user id
         @return
@@ -52,14 +52,14 @@ published interface XPolicy : com::sun::star::uno::XInterface
     */
     sequence< any > getPermissions(
         [in] string userId );
-
+    
     /** Gets the default permissions granted to all users.
-
+        
         @return
                default permissions
     */
     sequence< any > getDefaultPermissions();
-
+    
     /** Refreshes the policy configuration.
     */
     void refresh();
diff --git a/udkapi/com/sun/star/task/XInteractionAbort.idl b/udkapi/com/sun/star/task/XInteractionAbort.idl
index cef59c8ea7b8..e3f67547278b 100644
--- a/udkapi/com/sun/star/task/XInteractionAbort.idl
+++ b/udkapi/com/sun/star/task/XInteractionAbort.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_task_XInteractionAbort_idl__
-#define __com_sun_star_task_XInteractionAbort_idl__
-
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
-#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module task {
-
-//=============================================================================
-
+#ifndef __com_sun_star_task_XInteractionAbort_idl__ 
+#define __com_sun_star_task_XInteractionAbort_idl__ 
+ 
+#ifndef __com_sun_star_task_XInteractionContinuation_idl__ 
+#include <com/sun/star/task/XInteractionContinuation.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module task {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::task::XInteractionAbort
 /** An interaction continuation specifing to abort executing the process that
     issued the request.
  */
 published interface XInteractionAbort: com::sun::star::task::XInteractionContinuation
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/task/XInteractionContinuation.idl b/udkapi/com/sun/star/task/XInteractionContinuation.idl
index c9b2ab5858cb..a56690090d0f 100644
--- a/udkapi/com/sun/star/task/XInteractionContinuation.idl
+++ b/udkapi/com/sun/star/task/XInteractionContinuation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
-#define __com_sun_star_task_XInteractionContinuation_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module task {
-
-//=============================================================================
+#ifndef __com_sun_star_task_XInteractionContinuation_idl__ 
+#define __com_sun_star_task_XInteractionContinuation_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module task {  
+ 
+//============================================================================= 
 /** Specifies a way of how to continue from an
     <type scope="com::sun::star::task">XInteractionRequest</type>.
     <P>Different sub-interfaces of this interface specify different ways of
     continuing.</P>
  */
 published interface XInteractionContinuation: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::task::XInteractionContinuation::select
     /** Select this way of continuing from an
         <type scope="com::sun::star::task">XInteractionRequest</type> (given a
         choice of various
         <type scope="com::sun::star::task">XInteractionContinuation</type>s).
      */
-    void select();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void select(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/task/XInteractionHandler.idl b/udkapi/com/sun/star/task/XInteractionHandler.idl
index 0bbd7fed3202..32c71a43a434 100644
--- a/udkapi/com/sun/star/task/XInteractionHandler.idl
+++ b/udkapi/com/sun/star/task/XInteractionHandler.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,43 +24,43 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
-#define __com_sun_star_task_XInteractionHandler_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionRequest_idl__
-#include <com/sun/star/task/XInteractionRequest.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module task {
-
-//=============================================================================
-
+#ifndef __com_sun_star_task_XInteractionHandler_idl__ 
+#define __com_sun_star_task_XInteractionHandler_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_task_XInteractionRequest_idl__ 
+#include <com/sun/star/task/XInteractionRequest.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module task {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::task::XInteractionHandler
 /** An interaction request handler.
  */
 published interface XInteractionHandler: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::task::XInteractionHandler::handle
     /** Handle an interaction request.
      */
-    void handle( [in] com::sun::star::task::XInteractionRequest Request );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void handle( [in] com::sun::star::task::XInteractionRequest Request ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/task/XInteractionHandler2.idl b/udkapi/com/sun/star/task/XInteractionHandler2.idl
index 8fff5823d669..fff12ae1f56b 100644
--- a/udkapi/com/sun/star/task/XInteractionHandler2.idl
+++ b/udkapi/com/sun/star/task/XInteractionHandler2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_task_XInteractionHandler2_idl__
-#define __com_sun_star_task_XInteractionHandler2_idl__
-
-#ifndef __com_sun_star_task_XInteractionHandler_idl__
-#include <com/sun/star/task/XInteractionHandler.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module task {
-
-//=============================================================================
-
+#ifndef __com_sun_star_task_XInteractionHandler2_idl__ 
+#define __com_sun_star_task_XInteractionHandler2_idl__ 
+ 
+#ifndef __com_sun_star_task_XInteractionHandler_idl__ 
+#include <com/sun/star/task/XInteractionHandler.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module task {  
+ 
+//============================================================================= 
+ 
 /** An interaction request handler.
 
    <p>This interface extends the interface <type>XInteractionHandler</type>
@@ -45,24 +45,24 @@
       actually handled by the interaction handler.</p>
  */
 /* published */ interface XInteractionHandler2 : com::sun::star::task::XInteractionHandler
-{
+{ 
     //-------------------------------------------------------------------------
     /** Handle an interaction request.
 
         @param Request the inteaction request to handle.
-
-        @return <true/>, if the handler handled the request, <false/> otherwise.
+       
+        @return <true/>, if the handler handled the request, <false/> otherwise. 
      */
-    boolean handleInteractionRequest(
-        [in] com::sun::star::task::XInteractionRequest Request );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    boolean handleInteractionRequest( 
+        [in] com::sun::star::task::XInteractionRequest Request ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/task/XInteractionRequest.idl b/udkapi/com/sun/star/task/XInteractionRequest.idl
index a0518fd7fd8a..4141c90d4c5b 100644
--- a/udkapi/com/sun/star/task/XInteractionRequest.idl
+++ b/udkapi/com/sun/star/task/XInteractionRequest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,31 +24,31 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_task_XInteractionRequest_idl__
-#define __com_sun_star_task_XInteractionRequest_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
-#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module task {
-
-//=============================================================================
-
+#ifndef __com_sun_star_task_XInteractionRequest_idl__ 
+#define __com_sun_star_task_XInteractionRequest_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_task_XInteractionContinuation_idl__ 
+#include <com/sun/star/task/XInteractionContinuation.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module task {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::task::XInteractionRequest
 /** The description of an interaction request.
  */
 published interface XInteractionRequest: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::task::XInteractionRequest::getRequest
     /** Get information about the request itself.
 
@@ -56,22 +56,22 @@ published interface XInteractionRequest: com::sun::star::uno::XInterface
         an <type scope="com::sun::star::uno">Exception</type>, wrapped as an
         <atom>any</atom>.
      */
-    any getRequest();
-
-    //-------------------------------------------------------------------------
+    any getRequest(); 
+ 
+    //------------------------------------------------------------------------- 
     /** Get the set of
         <type scope="com::sun::star::task">XInteractionContinuation</type>s
         the client supports for this request.
      */
-    sequence<com::sun::star::task::XInteractionContinuation> getContinuations();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    sequence<com::sun::star::task::XInteractionContinuation> getContinuations(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/task/XInteractionRetry.idl b/udkapi/com/sun/star/task/XInteractionRetry.idl
index eab9ec1ab3c3..dc0c4e7e2453 100644
--- a/udkapi/com/sun/star/task/XInteractionRetry.idl
+++ b/udkapi/com/sun/star/task/XInteractionRetry.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,33 +24,33 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_task_XInteractionRetry_idl__
-#define __com_sun_star_task_XInteractionRetry_idl__
-
-#ifndef __com_sun_star_task_XInteractionContinuation_idl__
-#include <com/sun/star/task/XInteractionContinuation.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module task {
-
-//=============================================================================
-
+#ifndef __com_sun_star_task_XInteractionRetry_idl__ 
+#define __com_sun_star_task_XInteractionRetry_idl__ 
+ 
+#ifndef __com_sun_star_task_XInteractionContinuation_idl__ 
+#include <com/sun/star/task/XInteractionContinuation.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module task {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::task::XInteractionRetry
 /** An interaction continuation specifing to try to re-execute the process
     that issued the request.
  */
 published interface XInteractionRetry: com::sun::star::task::XInteractionContinuation
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/test/TestEvent.idl b/udkapi/com/sun/star/test/TestEvent.idl
index f5717fd903d5..cc224499cc90 100644
--- a/udkapi/com/sun/star/test/TestEvent.idl
+++ b/udkapi/com/sun/star/test/TestEvent.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,10 +34,10 @@
 
 //=============================================================================
 
-module com { module sun { module star { module test {
+module com { module sun { module star { module test { 
 
 //=============================================================================
-/** This event gets delivered whenever a test event (an error, an exception,
+/** This event gets delivered whenever a test event (an error, an exception, 
     a warning) takes place.
     @deprecated
 */
@@ -49,7 +49,7 @@ published struct TestEvent: com::sun::star::lang::EventObject
     string Message;
 
     //-------------------------------------------------------------------------
-    /** contains the exception notified by the <type>XTestListener</type>
+    /** contains the exception notified by the <type>XTestListener</type> 
         method notifyException. This value is not valid for other events.
     */
     any Exception;
@@ -57,6 +57,6 @@ published struct TestEvent: com::sun::star::lang::EventObject
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/udkapi/com/sun/star/test/TestFactory.idl b/udkapi/com/sun/star/test/TestFactory.idl
index 100ac85d499f..076b4248b345 100644
--- a/udkapi/com/sun/star/test/TestFactory.idl
+++ b/udkapi/com/sun/star/test/TestFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,27 +34,27 @@
 
 //=============================================================================
 
-module com { module sun { module star { module test {
+module com { module sun { module star { module test { 
 
 //=============================================================================
 /** describes a factory of services with interfaces for testing purposes.
-
-    <p>It create instances that support the interface
+    
+    <p>It create instances that support the interface 
     <type scope="com::sun::star::test">XSimpleTest</type>.
-
+    
     <p>The services are accessed through interface, service or object
     names.  The name test service must begin with "test." followed by the
     interface, service or object name ("test.com.sun.star.beans.XPropertySet").
-
+    
     @example:Java
-
+    
     <listing>
     xTestService = TestFactory.createInstance( "com.sun.star.beans.XPropertySet" );
     xTestService.test( "com.sun.star.beans.XPropertySet", myTestObject );
     </listing>
-
-    @author Markus Meyer
-    @version    0.1
+    
+    @author	Markus Meyer
+    @version	0.1
     @deprecated
 */
 published service TestFactory
@@ -65,6 +65,6 @@ published service TestFactory
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/udkapi/com/sun/star/test/XSimpleTest.idl b/udkapi/com/sun/star/test/XSimpleTest.idl
index f2a310f9a44c..2097380ade05 100644
--- a/udkapi/com/sun/star/test/XSimpleTest.idl
+++ b/udkapi/com/sun/star/test/XSimpleTest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,27 +38,27 @@
 
 //=============================================================================
 
-module com { module sun { module star { module test {
+module com { module sun { module star { module test { 
 
 //=============================================================================
-/**
+/** 
     A simple interface to test a service or interface implementation.
 */
 published interface XSimpleTest: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /**
+    /** 
         Test the object TestObject against the test specified with TestName. This test
         does not change the semantic state of the object, so it can be called on a existing
         component that will used further on.
         Note : This can be a strong test limitation. There are some components, that cannot
-        perform their full test scenario.
-        @param TestName     the name of the test. Must be an interface, service or implementation name.
+        perform their full test scenario. 
+        @param TestName		the name of the test. Must be an interface, service or implementation name.
         Note : The name is only used by the test component to distinguish
         between test scenarios.
-        @param  TestObject  The instance to be tested.
-
-        @throws IllegalArgumentException
+        @param 	TestObject	The instance to be tested.
+        
+        @throws IllegalArgumentException  
             if the test does not support TestName or TestObject is null.
     */
     void testInvariant( [in] string TestName,
@@ -66,25 +66,25 @@ published interface XSimpleTest: com::sun::star::uno::XInterface
             raises( com::sun::star::lang::IllegalArgumentException );
 
     //-------------------------------------------------------------------------
-    /**
+    /** 
         Test the object TestObject against the test specified with TestName. This test
         changes the state of the object. The object may be useless afterwards.
         (e.g. a closed XOutputStream). The method in general may be called multipe times with a new
         test object instance.
         Note : These tests should include the testInvariant test.
-        Note : Each test scenario should be independent of each other, so even if a scenario
-        didn't pass the test, the other test can still be performed. The error messages
+        Note : Each test scenario should be independent of each other, so even if a scenario 
+        didn't pass the test, the other test can still be performed. The error messages 
         are cumulative.
-
-        @param TestName     The name of the test. Must be an interface, service or implementation name.
+        
+        @param TestName		The name of the test. Must be an interface, service or implementation name.
         Note : The name is only used by the test component to distinguish
         between test scenarios.
-        @param  TestObject  The instance to be tested.
-        @param   hTestHandle Internal test handle. Handle for first test is always 0.
+        @param 	TestObject	The instance to be tested.
+        @param   hTestHandle Internal test handle. Handle for first test is always 0. 
         Handle of next test is  returned by the method.
         @return  Handle of the next test. -1 if this was the last test.
-
-        @throws IllegalArgumentException
+        
+        @throws IllegalArgumentException  
             if the test does not support TestName or
         TestObject is null.
     */
@@ -96,7 +96,7 @@ published interface XSimpleTest: com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
     /**States if one of the last test has failed. This is cumulative.
         @return true if all test have been passed succesfully. false if an error has occured.
-
+        
     */
     boolean testPassed();
 
@@ -116,6 +116,6 @@ published interface XSimpleTest: com::sun::star::uno::XInterface
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/udkapi/com/sun/star/test/XTest.idl b/udkapi/com/sun/star/test/XTest.idl
index 12481184b15d..e80b6367f179 100644
--- a/udkapi/com/sun/star/test/XTest.idl
+++ b/udkapi/com/sun/star/test/XTest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,27 +42,27 @@
 
 //=============================================================================
 
-module com { module sun { module star { module test {
+module com { module sun { module star { module test { 
 
 //=============================================================================
-/**
+/** 
     A simple interface to test a service or interface implementation.
 */
 published interface XTest: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /**
+    /** 
         Test the object TestObject against the test specified with TestName. This test
         does not change the semantic state of the object, so it can be called on a existing
-        component that will used further on. Note: This can be a strong test limitation.
-        There are some components, that cannot perform their full test scenario.
-        @param TestName
+        component that will used further on. Note: This can be a strong test limitation. 
+        There are some components, that cannot perform their full test scenario. 
+        @param TestName		
             the name of the test. Must be an interface, service, or implementation name.
-            Note: The name is only used by the test component to distinguish between test
+            Note: The name is only used by the test component to distinguish between test 
             scenarios.
-        @param TestObject
+        @param TestObject	
                 The instance to be tested.
-        @throws IllegalArgumentException
+        @throws IllegalArgumentException  
             if the test does not support TestName or TestObject is null.
     */
     void testInvariant( [in] string TestName,
@@ -70,27 +70,27 @@ published interface XTest: com::sun::star::uno::XInterface
             raises( com::sun::star::lang::IllegalArgumentException );
 
     //-------------------------------------------------------------------------
-    /**
-        Test the object TestObject against the test specified with TestName.
-        This test changes the state of the object. The object may be useless
-        afterwards (e.g., a closed XOutputStream). The method in general may
-        be called multiple times with a new test object instance. Note: Each test
-        scenario should be independent of each other, so even if a scenario
-        didn't pass the test, the other test can still be performed.
+    /** 
+        Test the object TestObject against the test specified with TestName. 
+        This test changes the state of the object. The object may be useless 
+        afterwards (e.g., a closed XOutputStream). The method in general may 
+        be called multiple times with a new test object instance. Note: Each test 
+        scenario should be independent of each other, so even if a scenario 
+        didn't pass the test, the other test can still be performed. 
         The error messages are cumulative.
-
-        @param TestName
-            The name of the test. Must be an interface, service, or
-            implementation name. Note: The name is only used by the test component
+        
+        @param TestName 
+            The name of the test. Must be an interface, service, or 
+            implementation name. Note: The name is only used by the test component 
             to distinguish between test scenarios.
-        @param TestObject
+        @param TestObject 
                 The instance to be tested.
-        @param hTestHandle
+        @param hTestHandle 
                 Internal test handle. Handle for first test is always 0.
             Handle of next test is  returned by the method.
         @return Handle of the next test. -1 if this was the last test.
-
-        @throws IllegalArgumentException
+        
+        @throws IllegalArgumentException 
             if the test does not support TestName or TestObject is null.
     */
     long test( [in] string TestName,
@@ -99,33 +99,33 @@ published interface XTest: com::sun::star::uno::XInterface
             raises( com::sun::star::lang::IllegalArgumentException );
 
     //-------------------------------------------------------------------------
-    /**
-        Test the object TestObject against the test specified with TestName using
-        several threads. That does NOT mean that testMultiThread should implement
-        a test using several threads but that this test method should be designed
-        to be called by several threads. So for example, it has to take into consideration
-        that a test object state that is changed by the method  can be
+    /** 
+        Test the object TestObject against the test specified with TestName	using 
+        several threads. That does NOT mean that testMultiThread should	implement 
+        a test using several threads but that this test method should be designed 
+        to be called by several threads. So for example, it has to take into consideration 
+        that a test object state that is changed by the method	can be 
         changed again by another thread. So it's not necessarily a mistake if an
-        expected state can't be confirmed after setting it. Besides that, everything
+        expected state can't be confirmed after setting it. Besides that, everything 
         is the same as described for the test method.
 
         If this way of testing with multiple threads is not appropriate for the
-        component to be tested this method should not be implemented (it should
-        only return -1) and a special multithread test adapted to the special
+        component to be tested this method should not be implemented (it should 
+        only return -1) and a special multithread test adapted to the special 
         needs of testing this component should be integrated in the test method.
 
-        @param TestName
-            The name of the test. Must be an interface, service or
-            implementation name. Note: The name is only used by the test component
+        @param TestName 
+            The name of the test. Must be an interface, service or 
+            implementation name. Note: The name is only used by the test component 
             to distinguish between test scenarios.
-        @param TestObject
+        @param TestObject 
             The instance to be tested.
-        @param hTestHandle
+        @param hTestHandle 
             Internal test handle. Handle for first test is always 0.
             Handle of next test is  returned by the method.
         @return Handle of the next test. -1 if this was the last test.
-
-        @throws IllegalArgumentException
+        
+        @throws IllegalArgumentException 
             if the test does not support TestName or TestObject is null.
     */
     long testMultiThread( [in] string TestName,
@@ -134,13 +134,13 @@ published interface XTest: com::sun::star::uno::XInterface
             raises( com::sun::star::lang::IllegalArgumentException );
 
     //-------------------------------------------------------------------------
-    /** registers an event listener, which will be called for reporting
+    /**	registers an event listener, which will be called for reporting 
         errors/exceptions and warnings and for protocol purpuses.
     */
     void addTestListener( [in] XTestListener xListener );
 
     //-------------------------------------------------------------------------
-    /** unregisters an event listener which was registered with
+    /**	unregisters an event listener which was registered with
         <member>XTest::addTestListener()</member>.
 
     */
@@ -150,6 +150,6 @@ published interface XTest: com::sun::star::uno::XInterface
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/udkapi/com/sun/star/test/XTestListener.idl b/udkapi/com/sun/star/test/XTestListener.idl
index 3f385d96d8b9..c74321f52ef6 100644
--- a/udkapi/com/sun/star/test/XTestListener.idl
+++ b/udkapi/com/sun/star/test/XTestListener.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@
 
 //=============================================================================
 
-module com { module sun { module star { module test {
+module com { module sun { module star { module test { 
 
 //=============================================================================
 /** is used to handle errors/exceptions and warnings during tests.
@@ -49,18 +49,18 @@ published interface XTestListener: com::sun::star::lang::XEventListener
     /** gets called when an error occurs while performing an test.
         If the error results from an exception, the exception
         can be found in the Exception member of the TestEvent
-
+        
         @param evt
-        This property contains the <type>TestEvent</type> object that
+        This property contains the <type>TestEvent</type> object that 
         describes the event source and error description.
     */
     void notifyError( [in] com::sun::star::test::TestEvent evt );
 
     //-------------------------------------------------------------------------
     /** gets called when an warning occurs while performing an test.
-
+        
         @param evt
-        This property contains the <type>TestEvent</type> object that
+        This property contains the <type>TestEvent</type> object that 
         describes the event source and warning description.
     */
     void notifyWarning( [in] com::sun::star::test::TestEvent evt );
@@ -69,9 +69,9 @@ published interface XTestListener: com::sun::star::lang::XEventListener
     /** can be called by the broadcaster to inform the listener about
         the progress of the test. The listener can use this information
         for example to write it into a test protocol file.
-
+        
         @param evt
-        This property contains the <type>TestEvent</type> object that
+        This property contains the <type>TestEvent</type> object that 
         describes the protocol message.
     */
     void protocol( [in] com::sun::star::test::TestEvent evt );
@@ -80,6 +80,6 @@ published interface XTestListener: com::sun::star::lang::XEventListener
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/udkapi/com/sun/star/test/bridge/XBridgeTest.idl b/udkapi/com/sun/star/test/bridge/XBridgeTest.idl
index 05f444a43318..cebece6dec24 100644
--- a/udkapi/com/sun/star/test/bridge/XBridgeTest.idl
+++ b/udkapi/com/sun/star/test/bridge/XBridgeTest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,27 +62,27 @@ published enum TestEnum
  */
 published struct TestSimple
 {
-    boolean                    Bool;
-    char                       Char;
-    byte                       Byte;
-    short                      Short;
-    unsigned short             UShort;
-    long                       Long;
-    unsigned long              ULong;
-    hyper                      Hyper;
-    unsigned hyper             UHyper;
-    float                      Float;
-    double                     Double;
-    TestEnum                   Enum;
+    boolean					   Bool;
+    char					   Char;
+    byte					   Byte;
+    short					   Short;
+    unsigned short			   UShort;
+    long					   Long;
+    unsigned long			   ULong;
+    hyper					   Hyper;
+    unsigned hyper			   UHyper;
+    float					   Float;
+    double					   Double;
+    TestEnum				   Enum;
 };
 /**
  * complex types adding string, inteface, any
  */
 published struct TestElement : TestSimple
 {
-    string                     String;
+    string					   String;
     com::sun::star::uno::XInterface   Interface;
-    any                        Any;
+    any						   Any;
 };
 /**
  * adding even more complexity, sequence< TestElement >
@@ -102,18 +102,18 @@ published interface XRecursiveCall : com::sun::star::uno::XInterface
     /***
      * @param nToCall If nToCall is 0, the method returns immeadiatly.
      *                Otherwise, call the given interface with nToCall -1
-     *
+     * 
      ***/
     void callRecursivly( [in] XRecursiveCall xCall , [in] long nToCall );
 };
 
-/**
+/** 
  * Monster test interface to test bridge calls.
  * An implementation of this object has to store given values and return whenever there
  * is an out param or return value.
  */
 published interface XBridgeTestBase : com::sun::star::uno::XInterface
-{
+{	
     /**
      * in parameter test, tests by calls reference also (complex types)
      */
@@ -128,10 +128,10 @@ published interface XBridgeTestBase : com::sun::star::uno::XInterface
                              [in] TestData aStruct );
     /**
      * inout parameter test
-     *
+     * 
      * @return aStruct. The out parameter contain the values, that were previously set
      *         by setValues or (if not called before) default constructed values.
-     *
+     * 
      */
     TestData setValues2( [inout] boolean bBool, [inout] char cChar, [inout] byte nByte,
                          [inout] short nShort, [inout] unsigned short nUShort,
@@ -142,7 +142,7 @@ published interface XBridgeTestBase : com::sun::star::uno::XInterface
                          [inout] com::sun::star::uno::XInterface xInterface, [inout] any aAny,
                          [inout] sequence< TestElement > aSequence,
                          [inout] TestData aStruct );
-
+    
     /**
      * out parameter test
      */
@@ -155,28 +155,28 @@ published interface XBridgeTestBase : com::sun::star::uno::XInterface
                         [out] com::sun::star::uno::XInterface xInterface, [out] any aAny,
                         [out] sequence< TestElement > aSequence,
                         [out] TestData aStruct );
-
-    [attribute] boolean                  Bool;
-    [attribute] byte                     Byte;
-    [attribute] char                     Char;
-    [attribute] short                    Short;
-    [attribute] unsigned short           UShort;
-    [attribute] long                     Long;
-    [attribute] unsigned long            ULong;
-    [attribute] hyper                    Hyper;
-    [attribute] unsigned hyper           UHyper;
-    [attribute] float                    Float;
-    [attribute] double                   Double;
-    [attribute] TestEnum                 Enum;
-    [attribute] string                   String;
+    
+    [attribute] boolean					 Bool;
+    [attribute] byte					 Byte;
+    [attribute] char					 Char;
+    [attribute] short					 Short;
+    [attribute] unsigned short			 UShort;
+    [attribute] long					 Long;
+    [attribute] unsigned long			 ULong;
+    [attribute] hyper					 Hyper;
+    [attribute] unsigned hyper			 UHyper;
+    [attribute] float					 Float;
+    [attribute] double					 Double;
+    [attribute] TestEnum				 Enum;
+    [attribute] string					 String;
     [attribute] com::sun::star::uno::XInterface Interface;
-    [attribute] any                      Any;
-    [attribute] sequence< TestElement >  Sequence;
-    [attribute] TestData                 Struct;
+    [attribute] any						 Any;
+    [attribute] sequence< TestElement >	 Sequence;
+    [attribute] TestData				 Struct;
 
 
     /***
-     * This method returns the parameter value.
+     * This method returns the parameter value. 
      * Method to extensivly test anys.
      ****/
     any transportAny( [in] any value );
@@ -184,7 +184,7 @@ published interface XBridgeTestBase : com::sun::star::uno::XInterface
     /***
      * methods to check sequence of calls. Call call() and callOneway
      * in an arbitrary sequence. Increase the callId for every call.
-     * The testobject sets an error flag.
+     * The testobject sets an error flag. 
 
         @see testSequencePassed
      ***/
@@ -194,13 +194,13 @@ published interface XBridgeTestBase : com::sun::star::uno::XInterface
 
     /****
      * methods to check, if threads thread identity is holded.
-     *
+     *                  
      ***/
     void startRecursiveCall( [in] XRecursiveCall xCall , [in] long nToCall );
 };
 
 
-/**
+/** 
  * Inherting from monster; adds raiseException(), attribute raising RuntimeException.
  */
 published interface XBridgeTest : XBridgeTestBase
@@ -213,7 +213,7 @@ published interface XBridgeTest : XBridgeTestBase
                              [in] string Message,
                              [in] com::sun::star::uno::XInterface Context )
         raises( com::sun::star::lang::IllegalArgumentException );
-
+    
 
     /**
      * Throws runtime exception.
@@ -221,14 +221,14 @@ published interface XBridgeTest : XBridgeTestBase
      * Note that on client side the execption may fly or not. When it flies, it should
      * have the proper message and context.
      ***/
-    [oneway] void raiseRuntimeExceptionOneway(  [in] string Message,
+    [oneway] void raiseRuntimeExceptionOneway(	[in] string Message,
                                                 [in] com::sun::star::uno::XInterface Context );
-
+        
     /**
      * raises runtime exception;
      * the exception struct returned has to be filled with formerly set test data.
      */
-    [attribute] long                     RuntimeException;
+    [attribute] long					 RuntimeException;
 };
 
 /** Extended tests with sequences.
@@ -256,7 +256,7 @@ published interface XBridgeTest2 : XBridgeTest
     sequence< sequence< long > > setDim2( [in] sequence< sequence< long > > aSeq);
     sequence< sequence < sequence < long > > > setDim3(
         [in] sequence< sequence < sequence < long > > > aSeq);
-
+    
     void setSequencesInOut( [inout] sequence< boolean > aSeqBoolean,
                        [inout] sequence< char > aSeqChar,
                        [inout] sequence< byte > aSeqByte,
@@ -293,7 +293,7 @@ published interface XBridgeTest2 : XBridgeTest
                        [out] sequence< sequence< long > > aSeqDim2,
                        [out] sequence< sequence < sequence < long > > > aSeqDim3);
 
-
+    
 };
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/test/performance/XPerformanceTest.idl b/udkapi/com/sun/star/test/performance/XPerformanceTest.idl
index 9ef559c240d6..ace0f4d10e41 100644
--- a/udkapi/com/sun/star/test/performance/XPerformanceTest.idl
+++ b/udkapi/com/sun/star/test/performance/XPerformanceTest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,26 +46,26 @@ module performance
 */
 published struct SimpleTypes
 {
-    boolean                    Bool;
-    char                       Char;
-    byte                       Byte;
-    short                      Short;
-    unsigned short             UShort;
-    long                       Long;
-    unsigned long              ULong;
-    hyper                      Hyper;
-    unsigned hyper             UHyper;
-    float                      Float;
-    double                     Double;
+    boolean					   Bool;
+    char					   Char;
+    byte					   Byte;
+    short					   Short;
+    unsigned short			   UShort;
+    long					   Long;
+    unsigned long			   ULong;
+    hyper					   Hyper;
+    unsigned hyper			   UHyper;
+    float					   Float;
+    double					   Double;
 };
 /** struct ComplexTypes adding Sequence, String, Interface, Any to SimpleTypes
 */
 published struct ComplexTypes : SimpleTypes
 {
-    sequence< long >           Sequence;
-    string                     String;
+    sequence< long >		   Sequence;
+    string					   String;
     com::sun::star::uno::XInterface Interface;
-    any                        Any;
+    any						   Any;
 };
 
 /** A performance test object has to be implemented in a special way, that:
@@ -87,44 +87,44 @@ published interface XPerformanceTest : com::sun::star::uno::XInterface
 {
     [oneway] void async();
     void sync();
-
+    
     ComplexTypes complex_in( [in] ComplexTypes aVal );
     ComplexTypes complex_inout( [inout] ComplexTypes aVal );
-
+    
     [oneway] void complex_oneway( [in] ComplexTypes aVal );
     void complex_noreturn( [in] ComplexTypes aVal );
-
+    
     XPerformanceTest createObject();
-
-    [attribute] long                     Long_attr;
-    [attribute] hyper                    Hyper_attr;
-    [attribute] float                    Float_attr;
-    [attribute] double                   Double_attr;
-    [attribute] string                   String_attr;
+    
+    [attribute] long					 Long_attr;
+    [attribute] hyper					 Hyper_attr;
+    [attribute] float					 Float_attr;
+    [attribute] double					 Double_attr;
+    [attribute] string					 String_attr;
     [attribute] com::sun::star::uno::XInterface Interface_attr;
-    [attribute] any                      Any_attr;
+    [attribute] any						 Any_attr;
     [attribute] sequence< com::sun::star::uno::XInterface > Sequence_attr;
-    [attribute] ComplexTypes             Struct_attr;
-
-    long                getLong();
-    void                setLong( [in] long n );
-    hyper               getHyper();
-    void                setHyper( [in] hyper n );
-    float               getFloat();
-    void                setFloat( [in] float f );
-    double              getDouble();
-    void                setDouble( [in] double f );
-    string              getString();
-    void                setString( [in] string s );
+    [attribute] ComplexTypes			 Struct_attr;
+    
+    long				getLong();
+    void				setLong( [in] long n );
+    hyper				getHyper();
+    void				setHyper( [in] hyper n );
+    float				getFloat();
+    void				setFloat( [in] float f );
+    double				getDouble();
+    void				setDouble( [in] double f );
+    string				getString();
+    void				setString( [in] string s );
     com::sun::star::uno::XInterface getInterface();
-    void                setInterface( [in] com::sun::star::uno::XInterface x );
-    any                 getAny();
-    void                setAny( [in] any a );
+    void				setInterface( [in] com::sun::star::uno::XInterface x );
+    any					getAny();
+    void				setAny( [in] any a );
     sequence< com::sun::star::uno::XInterface > getSequence();
-    void                setSequence( [in] sequence< com::sun::star::uno::XInterface > seq );
-    ComplexTypes        getStruct();
-    void                setStruct( [in] ComplexTypes c );
-
+    void				setSequence( [in] sequence< com::sun::star::uno::XInterface > seq );
+    ComplexTypes		getStruct();
+    void				setStruct( [in] ComplexTypes c );
+    
     void raiseRuntimeException();
 };
 
diff --git a/udkapi/com/sun/star/udk-modules.idl b/udkapi/com/sun/star/udk-modules.idl
index cb879e5f803c..61a1cc46e84b 100644
--- a/udkapi/com/sun/star/udk-modules.idl
+++ b/udkapi/com/sun/star/udk-modules.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,10 +24,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_modules_idl__
-#define __com_sun_star_modules_idl__
+#ifndef __com_sun_star_modules_idl__ 
+#define __com_sun_star_modules_idl__ 
 
-module com { module sun { module star {
+module com { module sun { module star { 
 
 /// Java beans-like property access and introspection.
 module beans{};
diff --git a/udkapi/com/sun/star/uno/DeploymentException.idl b/udkapi/com/sun/star/uno/DeploymentException.idl
index 5cf8e4f48bd7..abdf9587506f 100644
--- a/udkapi/com/sun/star/uno/DeploymentException.idl
+++ b/udkapi/com/sun/star/uno/DeploymentException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_uno_DeploymentException_idl__
-#define __com_sun_star_uno_DeploymentException_idl__
-
-#ifndef __com_sun_star_uno_RuntimeException_idl__
-#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module uno {
-
-//=============================================================================
-
+#ifndef __com_sun_star_uno_DeploymentException_idl__ 
+#define __com_sun_star_uno_DeploymentException_idl__ 
+ 
+#ifndef __com_sun_star_uno_RuntimeException_idl__ 
+#include <com/sun/star/uno/RuntimeException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module uno {  
+ 
+//============================================================================= 
+ 
 /** Exception signalling a deployment error.
 
     @since OOo 1.1.2
@@ -45,9 +45,9 @@
 published exception DeploymentException : com::sun::star::uno::RuntimeException
 {
 };
-
+ 
 //=============================================================================
-
+ 
 }; }; }; };
 
-#endif
+#endif 
diff --git a/udkapi/com/sun/star/uno/Exception.idl b/udkapi/com/sun/star/uno/Exception.idl
index 1ddfcdd3d8ce..7308f489977a 100644
--- a/udkapi/com/sun/star/uno/Exception.idl
+++ b/udkapi/com/sun/star/uno/Exception.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_uno_Exception_idl__
-#define __com_sun_star_uno_Exception_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module uno {
-
-//=============================================================================
-
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#define __com_sun_star_uno_Exception_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module uno {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: exception com::sun::star::uno::Exception
 /** the base of all UNO exceptions
-
+    
     <p>All exceptions defined in UNO idl should derive from this exception.</p>
  */
 published exception Exception
 {
     /** gives a detailed description of the reason, why the exception was thrown.
         <p>
-        The description should be as detailed as possible.
-
+        The description should be as detailed as possible. 
+        
      */
-    string Message;
-
-    //-------------------------------------------------------------------------
-
+    string Message; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** should contain a reference to the original, which raised the exception.
         <p>May be NULL.</p>
      */
-    com::sun::star::uno::XInterface Context;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::uno::XInterface Context; 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/uno/NamingService.idl b/udkapi/com/sun/star/uno/NamingService.idl
index db77fb65cb4c..f4cdac498576 100644
--- a/udkapi/com/sun/star/uno/NamingService.idl
+++ b/udkapi/com/sun/star/uno/NamingService.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,34 +24,34 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_uno_NamingService_idl__
-#define __com_sun_star_uno_NamingService_idl__
-
-#ifndef __com_sun_star_uno_XNamingService_idl__
-#include <com/sun/star/uno/XNamingService.idl>
-#endif
-
- module com {  module sun {  module star {  module uno {
-
-//=============================================================================
+#ifndef __com_sun_star_uno_NamingService_idl__ 
+#define __com_sun_star_uno_NamingService_idl__ 
+ 
+#ifndef __com_sun_star_uno_XNamingService_idl__ 
+#include <com/sun/star/uno/XNamingService.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module uno {  
+ 
+//============================================================================= 
 /** a simple named object container.
-
+    
  */
 published service NamingService
-{
+{ 
     /** through this interface the objects are registered and accessed.
      */
-    interface com::sun::star::uno::XNamingService;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-      Source Code Control System - Update
-
-=============================================================================*/
-#endif
-
+    interface com::sun::star::uno::XNamingService; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+      Source Code Control System - Update 
+ 
+=============================================================================*/ 
+#endif 
+ 
diff --git a/udkapi/com/sun/star/uno/RuntimeException.idl b/udkapi/com/sun/star/uno/RuntimeException.idl
index c5660e0895fc..63e83386b9cf 100644
--- a/udkapi/com/sun/star/uno/RuntimeException.idl
+++ b/udkapi/com/sun/star/uno/RuntimeException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_uno_RuntimeException_idl__
-#define __com_sun_star_uno_RuntimeException_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module uno {
-
-//=============================================================================
-
+#ifndef __com_sun_star_uno_RuntimeException_idl__ 
+#define __com_sun_star_uno_RuntimeException_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module uno {  
+ 
+//============================================================================= 
+ 
 /** This exception or a subclass can occur at every interface method.
     <p>
     It shall signal an error, which was not covered by the interface
@@ -47,14 +47,14 @@
     references ) or the called object has been disposed before.
  */
 published exception RuntimeException: com::sun::star::uno::Exception
-{
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+{ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/uno/SecurityException.idl b/udkapi/com/sun/star/uno/SecurityException.idl
index 341c79827453..171388ab6c6d 100644
--- a/udkapi/com/sun/star/uno/SecurityException.idl
+++ b/udkapi/com/sun/star/uno/SecurityException.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,28 +24,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_uno_SecurityException_idl__
-#define __com_sun_star_uno_SecurityException_idl__
-
-#ifndef __com_sun_star_uno_RuntimeException_idl__
-#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module uno {
-
-//=============================================================================
-
+#ifndef __com_sun_star_uno_SecurityException_idl__ 
+#define __com_sun_star_uno_SecurityException_idl__ 
+ 
+#ifndef __com_sun_star_uno_RuntimeException_idl__ 
+#include <com/sun/star/uno/RuntimeException.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module uno {  
+ 
+//============================================================================= 
+ 
 /** Base exception for all security related exceptions.
 */
 published exception SecurityException : com::sun::star::uno::RuntimeException
 {
 };
-
+ 
 //=============================================================================
-
+ 
 }; }; }; };
 
-#endif
+#endif 
diff --git a/udkapi/com/sun/star/uno/TypeClass.idl b/udkapi/com/sun/star/uno/TypeClass.idl
index 7d5acb693b56..a1cbb797fec0 100644
--- a/udkapi/com/sun/star/uno/TypeClass.idl
+++ b/udkapi/com/sun/star/uno/TypeClass.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/uno/Uik.idl b/udkapi/com/sun/star/uno/Uik.idl
index 1ef1f776f3df..9659ca9c09fb 100644
--- a/udkapi/com/sun/star/uno/Uik.idl
+++ b/udkapi/com/sun/star/uno/Uik.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,16 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_uno_Uik_idl__
-#define __com_sun_star_uno_Uik_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module uno {
-
+#ifndef __com_sun_star_uno_Uik_idl__ 
+#define __com_sun_star_uno_Uik_idl__ 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module uno {  
+ 
 /** Specifies an universal interface key (globally unique).
-
+    
     This struct is deprecated.  Uiks are not used anymore.
     @deprecated
 */
@@ -41,30 +41,30 @@ published struct Uik
 {
     /** specifies a 4 byte data block.
      */
-    unsigned long m_Data1;
-
+    unsigned long m_Data1; 
+ 
     /** specifies a 2 byte data block.
      */
-    unsigned short m_Data2;
-
+    unsigned short m_Data2; 
+ 
     /** specifies a 2 byte data block.
      */
-    unsigned short m_Data3;
-
+    unsigned short m_Data3; 
+ 
     /** specifies a 4 byte data block.
      */
-    unsigned long m_Data4;
-
+    unsigned long m_Data4; 
+ 
     /** specifies a 4 byte data block.
      */
-    unsigned long m_Data5;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    unsigned long m_Data5; 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/uno/XAdapter.idl b/udkapi/com/sun/star/uno/XAdapter.idl
index 875fc71c8113..0368bfae2939 100644
--- a/udkapi/com/sun/star/uno/XAdapter.idl
+++ b/udkapi/com/sun/star/uno/XAdapter.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,69 +24,69 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_uno_XAdapter_idl__
-#define __com_sun_star_uno_XAdapter_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XReference_idl__
-#include <com/sun/star/uno/XReference.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module uno {
-
-//=============================================================================
-
+#ifndef __com_sun_star_uno_XAdapter_idl__ 
+#define __com_sun_star_uno_XAdapter_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_XReference_idl__ 
+#include <com/sun/star/uno/XReference.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module uno {  
+ 
+//============================================================================= 
+ 
 /** This is the server-side interface to a weak adapter.
-
-    <p>The implementation of <type>XAdapter</type> must know
-    but not hold the adapted object, because it must not
-    affect the lifetime of the adapted object.
-
-    </p>@see XWeak
+    
+    <p>The implementation of <type>XAdapter</type> must know 
+    but not hold the adapted object, because it must not 
+    affect the lifetime of the adapted object. 
+    
+    </p>@see XWeak  
         for description of concepts.
  */
 published interface XAdapter: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::uno::XAdapter::queryAdapted
     /** queries the adapted object if it is alive.
      */
-    com::sun::star::uno::XInterface queryAdapted();
-
-    //-------------------------------------------------------------------------
-
+    com::sun::star::uno::XInterface queryAdapted(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::uno::XAdapter::addReference
     /** adds a reference to the adapter.
-
-
-
+        
+        
+        
         <p>All added references are called when the adapted object dies.
-
+        
         </p>
      */
-    void addReference( [in] com::sun::star::uno::XReference xRef );
-
-    //-------------------------------------------------------------------------
-
+    void addReference( [in] com::sun::star::uno::XReference xRef ); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::uno::XAdapter::removeReference
     /** removes a reference from the adapter.
      */
-    void removeReference( [in] com::sun::star::uno::XReference xRef );
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    void removeReference( [in] com::sun::star::uno::XReference xRef ); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/uno/XAggregation.idl b/udkapi/com/sun/star/uno/XAggregation.idl
index 3fe757bba7b3..b2a66b2ab92b 100644
--- a/udkapi/com/sun/star/uno/XAggregation.idl
+++ b/udkapi/com/sun/star/uno/XAggregation.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,42 +33,42 @@
 
 //=============================================================================
 
-module com { module sun { module star { module uno {
+module com { module sun { module star { module uno { 
 
 //=============================================================================
 /** Objects which implement this interface can become aggregates of
     a delegator.
-
+    
     <p>That means if an object "A" aggregates "B", "A" can provide all
     or some of the interfaces of "B". Whenever the method
     <member>XInterface::queryInterface()</member>
     is called on either of the objects, the call will be forwarded
     to object "A". Object "A" now can determine whether to use the
-    interfaces of "A" or "B" or neither. Actually, any number of
+    interfaces of "A" or "B" or neither. Actually, any number of 
     aggregates can be used, even nested ones (aggregated objects which are
     delegators by themselves).
-
+    
     <p>The following rules are to be observed:
     <ol>
     <li>All calls to <member>XInterface::acquire()</member>
     which are made before the delegator was set (using the method
-    <member>XAggregation::setDelegator()</member>) must not be taken back
+    <member>XAggregation::setDelegator()</member>) must not be taken back 
     (using the method <member>XInterface::release()</member>)
     before the delegation is removed by calling
     <code>xAggregation-&gt;setDelegator(NULL)</code>.
-
-    <li>The constructor of a delegator has to increment its
-    own reference count by calling its method
+    
+    <li>The constructor of a delegator has to increment its 
+    own reference count by calling its method 
     <member>XInterface::acquire()</member>
     before it sets itself to any aggregate using the method
     <member>XAggregation::setDelegator()</member>. After that
-    call it has to reset its own reference count without the
+    call it has to reset its own reference count without the 
     destructor getting called.
-
+    
     <li>The destructor of a delegator has to reset the delegator in
     its aggregated objects by calling their method
-    <member>XAggregation::setDelegator()</member> with
-    <const>NULL</const> before it releases its reference to
+    <member>XAggregation::setDelegator()</member> with 
+    <const>NULL</const> before it releases its reference to 
     its aggregated objects.
     </ol>
 
@@ -84,33 +84,33 @@ published interface XAggregation: com::sun::star::uno::XInterface
     /** sets the object to which all calls to the method
         <member>XInterface::queryInterface()</member>
         have to be forwarded. @
-
+        
         @param xDelegator
-        specifies the object which handles the calls to
-        <member>XInterface::queryInterface()</member>.
-        If <var>xDelegator</var> is <const>NULL</const>, the delegator is
-        removed and thus the object becomes its own delegator and has
+        specifies the object which handles the calls to 
+        <member>XInterface::queryInterface()</member>. 
+        If <var>xDelegator</var> is <const>NULL</const>, the delegator is 
+        removed and thus the object becomes its own delegator and has 
         to handle calls to the method
         <member>XInterface::queryInterface()</member>
         itself.
-
+        
         @see XAggregation::queryAggregation
     */
     void setDelegator( [in] com::sun::star::uno::XInterface pDelegator );
 
     //-------------------------------------------------------------------------
     /** is similar to <member>XInterface::queryInterface()</member>,
-        but it is to be processed directly without being forwarded to the
+        but it is to be processed directly without being forwarded to the 
         delegator. @
-
-        <p>This method is only called from within an implementation of
-        <member>XInterface::queryInterface()</member>
+        
+        <p>This method is only called from within an implementation of         
+        <member>XInterface::queryInterface()</member> 
         or <member>XAggregation::queryAggregation()</member>. This method
         is to be called by the delegator if it does not implement the
         interface itself. An object which got aggregated cannot depend
         on getting its own interface when it calls the method
         <member>XInterface::queryInterface()</member>.
-
+            
         @see XAggregation::setDelegator
     */
     any queryAggregation( [in] type aType );
@@ -119,6 +119,6 @@ published interface XAggregation: com::sun::star::uno::XInterface
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/udkapi/com/sun/star/uno/XComponentContext.idl b/udkapi/com/sun/star/uno/XComponentContext.idl
index fe43ed62e092..6356b951d344 100644
--- a/udkapi/com/sun/star/uno/XComponentContext.idl
+++ b/udkapi/com/sun/star/uno/XComponentContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,12 +24,12 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_uno_XComponentContext_idl__
-#define __com_sun_star_uno_XComponentContext_idl__
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
+#ifndef __com_sun_star_uno_XComponentContext_idl__ 
+#define __com_sun_star_uno_XComponentContext_idl__ 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
 
 
 module com {  module sun {  module star {  module lang {
@@ -45,19 +45,19 @@ module com {  module sun {  module star {  module uno {
 published interface XComponentContext : XInterface
 {
     /** Gets a value from the context.
-
+        
         @param Name
                name of value
         @return
                 value
     */
     any getValueByName( [in] string Name );
-
+    
     /** Gets the service manager instance to be used from key
         <code>/singletons/com.sun.star.lang.theServiceManager</code> (maybe null ref).
         This method has been added for convenience, because the
         service manager is used very often.
-
+        
         @return
                 service manager, if any
     */
@@ -65,5 +65,5 @@ published interface XComponentContext : XInterface
 };
 
 }; }; }; };
-
+ 
 #endif
diff --git a/udkapi/com/sun/star/uno/XCurrentContext.idl b/udkapi/com/sun/star/uno/XCurrentContext.idl
index 4cd83482afe6..cbb7004d9951 100644
--- a/udkapi/com/sun/star/uno/XCurrentContext.idl
+++ b/udkapi/com/sun/star/uno/XCurrentContext.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,13 +24,13 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_uno_XCurrentContext_idl__
-#define __com_sun_star_uno_XCurrentContext_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
+#ifndef __com_sun_star_uno_XCurrentContext_idl__ 
+#define __com_sun_star_uno_XCurrentContext_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
 
 module com {  module sun {  module star {  module uno {
 
@@ -47,7 +47,7 @@ module com {  module sun {  module star {  module uno {
 published interface XCurrentContext : XInterface
 {
     /** Gets a value from the context.
-
+        
         @param Name
                name of value
         @return
@@ -57,5 +57,5 @@ published interface XCurrentContext : XInterface
 };
 
 }; }; }; };
-
+ 
 #endif
diff --git a/udkapi/com/sun/star/uno/XInterface.idl b/udkapi/com/sun/star/uno/XInterface.idl
index 440b3fe95db1..751cdbed7b50 100644
--- a/udkapi/com/sun/star/uno/XInterface.idl
+++ b/udkapi/com/sun/star/uno/XInterface.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,23 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_uno_XInterface_idl__
-#define __com_sun_star_uno_XInterface_idl__
-
-//=============================================================================
-
- module com {  module sun {  module star {  module uno {
-
-//=============================================================================
-
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#define __com_sun_star_uno_XInterface_idl__ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module uno {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::uno::XInterface
 /** base interface of all UNO interfaces
 
     <p> It provides lifetime control by reference counting and the
     possibility of querying for other
     interfaces of the same logical object.
-
-
+    
+    
     <p>
     "Logical Object" in this case means that the
     interfaces actually can be supported by internal (e.g. aggregated) physical objects.</p>
@@ -54,7 +54,7 @@
         release() do not have return values). In general, also the UNO object itself
         should not make any assumption on the concrete value of the reference count
         (except on the transition from one to zero ).
-
+    
  */
 published interface XInterface
 {
@@ -94,9 +94,9 @@ published interface XInterface
         @return an interface reference in case the requested interface is supported by the object,
                 a void any otherwise.
      */
-    any queryInterface( [in] type aType );
-
-    //-------------------------------------------------------------------------
+    any queryInterface( [in] type aType ); 
+ 
+    //------------------------------------------------------------------------- 
     /** increases the reference counter by one.
 
         <p>When you have called acquire() on the
@@ -110,25 +110,25 @@ published interface XInterface
         <p> Every call to acquire must be followed by a corresponding call to release
         some time later, which may eventually lead to the destruction of the object.
      */
-    [oneway] void acquire();
-
-    //-------------------------------------------------------------------------
-
+    [oneway] void acquire(); 
+ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::uno::XInterface::release
     /** decreases the reference counter by one.
         <p>When the reference counter reaches 0, the object gets deleted.</p>
         <p>Calling release() on the object is often called releasing
         or clearing the reference to an object.
      */
-    [oneway] void release();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void release(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/uno/XNamingService.idl b/udkapi/com/sun/star/uno/XNamingService.idl
index c88da8638696..b58872a6b460 100644
--- a/udkapi/com/sun/star/uno/XNamingService.idl
+++ b/udkapi/com/sun/star/uno/XNamingService.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,59 +24,59 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_uno_XNamingService_idl__
-#define __com_sun_star_uno_XNamingService_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_Exception_idl__
-#include <com/sun/star/uno/Exception.idl>
-#endif
-
- module com {  module sun {  module star {  module uno {
-
-//=============================================================================
-
+#ifndef __com_sun_star_uno_XNamingService_idl__ 
+#define __com_sun_star_uno_XNamingService_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_Exception_idl__ 
+#include <com/sun/star/uno/Exception.idl> 
+#endif 
+ 
+ module com {  module sun {  module star {  module uno { 
+ 
+//============================================================================= 
+ 
 /** allows to insert, remove and access named objects.
  */
 published interface XNamingService: com::sun::star::uno::XInterface
-{
-
+{ 
+     
     /** provides a previous registered object.
      */
-    com::sun::star::uno::XInterface getRegisteredObject( [in] string Name )
-            raises (Exception);
-
-
+    com::sun::star::uno::XInterface getRegisteredObject( [in] string Name ) 
+            raises (Exception); 
+ 
+     
     /** registers one object under the specified name.
 
     <p>If any object is registered before, then this
         object is revoked automatically.
-
+        
         </p>
      */
-    void registerObject( [in]string Name, [in]com::sun::star::uno::XInterface Object )
-        raises (Exception);
-
-
+    void registerObject( [in]string Name, [in]com::sun::star::uno::XInterface Object ) 
+        raises (Exception); 
+ 
+     
     /** revokes the registration of an object. <p>If the object was not
         previously registered, then this call does nothing.
      */
-    void revokeObject( [in]string Name )
-        raises (Exception);
-};
-
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-      Source Code Control System - Update
-
-=============================================================================*/
-#endif
-
+    void revokeObject( [in]string Name ) 
+        raises (Exception); 
+}; 
+ 
+ 
+//============================================================================= 
+ 
+}; }; }; }; 
+ 
+/*============================================================================= 
+ 
+      Source Code Control System - Update 
+ 
+=============================================================================*/ 
+#endif 
+ 
diff --git a/udkapi/com/sun/star/uno/XReference.idl b/udkapi/com/sun/star/uno/XReference.idl
index 540ba053abba..c3b7ad3ad491 100644
--- a/udkapi/com/sun/star/uno/XReference.idl
+++ b/udkapi/com/sun/star/uno/XReference.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,48 +24,48 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_uno_XReference_idl__
-#define __com_sun_star_uno_XReference_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module uno {
-
-//=============================================================================
-
+#ifndef __com_sun_star_uno_XReference_idl__ 
+#define __com_sun_star_uno_XReference_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module uno {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::uno::XReference
-/** must be implemented by anyone who holds the adapter on the client side.@see XWeak
+/** must be implemented by anyone who holds the adapter on the client side.@see XWeak  
         for decription af concepts.
  */
 published interface XReference: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::uno::XReference::dispose
     /** removes all references to the adapter.
-
-
-
-        <p> This method is called when the adapted object dies.
+        
+        
+        
+        <p> This method is called when the adapted object dies. 
         The implementation of the client-side's weak reference
         must include removal of all references to the adapter.
-        Otherwise, the adapted object will be destroyed, but the
+        Otherwise, the adapted object will be destroyed, but the 
         adapter will be alive.</p>
      */
-    [oneway] void dispose();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    [oneway] void dispose(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/uno/XUnloadingPreference.idl b/udkapi/com/sun/star/uno/XUnloadingPreference.idl
index e87efd20d253..c6e40ac34b43 100644
--- a/udkapi/com/sun/star/uno/XUnloadingPreference.idl
+++ b/udkapi/com/sun/star/uno/XUnloadingPreference.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,18 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_uno_XUnloadingPreference_idl__
-#define __com_sun_star_uno_XUnloadingPreference_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-//=============================================================================
-
-module com {  module sun {  module star {  module uno {
-
-//=============================================================================
+#ifndef __com_sun_star_uno_XUnloadingPreference_idl__ 
+#define __com_sun_star_uno_XUnloadingPreference_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+  
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module uno {  
+ 
+//============================================================================= 
 /** Components can implement <code>XUnloadingPreference</code> in order to indicate
     how they should be treated when their hosting library is to be unloaded.
 
@@ -43,29 +43,29 @@ module com {  module sun {  module star {  module uno {
     listeners are notified by calling previously registered callback
     functions. A listener is an entity that employs, registers, and
     unregisters the callback functions on its behalf. Upon notification
-    (the callback function is being called)
+    (the callback function is being called) 
     a listener may release references to UNO components. Thus, the
-    loaded libraries can be unloaded, if no one else keeps any
+    loaded libraries can be unloaded, if no one else keeps any 
     objects from the library alive. <br>
     Before a listener releases references, it should ask for this interface.
     If the interface is not implemented, then the listener may release the
     object; otherwise, it calls <code>releaseOnNotification</code>. If the function
-    returns false then the listener should keep the reference, otherwise
+    returns false then the listener should keep the reference, otherwise 
     it may release it.
 */
 published interface XUnloadingPreference: com::sun::star::uno::XInterface
-{
+{ 
     /**
         The return value determines if the object wants to stay
         alive in case of an unloading procedure.
-        @return
+        @return 
         <FALSE/>do not release references to this object,otherwise
         <TRUE/>
     */
     boolean releaseOnNotification();
-};
-//=============================================================================
-
-}; }; }; };
-
-#endif
+}; 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/udkapi/com/sun/star/uno/XWeak.idl b/udkapi/com/sun/star/uno/XWeak.idl
index 73b73090d286..b240eb038159 100644
--- a/udkapi/com/sun/star/uno/XWeak.idl
+++ b/udkapi/com/sun/star/uno/XWeak.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,100 +24,100 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __com_sun_star_uno_XWeak_idl__
-#define __com_sun_star_uno_XWeak_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_uno_XAdapter_idl__
-#include <com/sun/star/uno/XAdapter.idl>
-#endif
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module uno {
-
-//=============================================================================
-
+#ifndef __com_sun_star_uno_XWeak_idl__ 
+#define __com_sun_star_uno_XWeak_idl__ 
+ 
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl> 
+#endif 
+ 
+#ifndef __com_sun_star_uno_XAdapter_idl__ 
+#include <com/sun/star/uno/XAdapter.idl> 
+#endif 
+ 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module uno {  
+ 
+//============================================================================= 
+ 
 // DocMerge from xml: interface com::sun::star::uno::XWeak
 /** the server-side interface to a weak object.
-
-
-
-    <p>This interface is proxy to the adapted object.
-    In order to make it possible to have weak references to objects,
+    
+    
+    
+    <p>This interface is proxy to the adapted object. 
+    In order to make it possible to have weak references to objects, 
     the <type>XAdapter</type> interface must be implemented to provide
     a weak adapter for the clients.
-
+    
     <h4>Concept of weak referencing:</h4>
-
+    
     </p>
     <p>This module specifies the interfaces for implementing and using
     weak references.</p>
     <p>
-
+    
     </p>
-    <p>The sense of weak references is to hold a reference to an object
-    without affecting the lifetime of the object. That means that a weak
+    <p>The sense of weak references is to hold a reference to an object 
+    without affecting the lifetime of the object. That means that a weak 
     reference may become invalid, at any time, if the referenced object dies.
-
+    
     </p>
-    <p>The following interfaces describe one way to handle weak references
-    by providing a weak adapter. The weak object has to provide this
+    <p>The following interfaces describe one way to handle weak references 
+    by providing a weak adapter. The weak object has to provide this 
     adapter if anyone wants to hold a weak reference. To separate their
     lifetimes, the adapter and the original object must not share the same
     reference counter.  The weak reference is in fact only a hard reference
     to the adapter, which knows - but does not hold - the original object.
-    That means that the implementation and synchronization of weak
-    referencing is the responsibility of the object.  The following
+    That means that the implementation and synchronization of weak 
+    referencing is the responsibility of the object.  The following 
     interfaces are involved in the concept of weak referencing:
-
+    
     <dl>
     <dt>
-    <type>XWeak</type>
+    <type>XWeak</type> 
     </dt>
     <dd>is the server-side interface of the referred object. This
     referred object must support the <type>XAdapter</type> interface.
-
+    
     </dd>
     <dt>
-    <type>XReference</type>
+    <type>XReference</type> 
     </dt>
     <dd>is a client-side interface which must be implemented by
     the holder of any weak reference. It is used for notification
     when the adapted object dies.
-
+    
     </dd>
     </dl>
     </p>
  */
 published interface XWeak: com::sun::star::uno::XInterface
-{
-    //-------------------------------------------------------------------------
-
+{ 
+    //------------------------------------------------------------------------- 
+     
     // DocMerge from xml: method com::sun::star::uno::XWeak::queryAdapter
     /** queries the weak adapter.
-
-
-
-        <p>It is important that the adapter must know, but not hold
-        the adapted object. If the adapted object dies, all references
+        
+        
+        
+        <p>It is important that the adapter must know, but not hold 
+        the adapted object. If the adapted object dies, all references 
         to the adapter have to be notified to release the adapter.
-
+        
         </p>
      */
-    com::sun::star::uno::XAdapter queryAdapter();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
-#endif
+    com::sun::star::uno::XAdapter queryAdapter(); 
+ 
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+/*============================================================================= 
+ 
+=============================================================================*/ 
+#endif 
diff --git a/udkapi/com/sun/star/uri/ExternalUriReferenceTranslator.idl b/udkapi/com/sun/star/uri/ExternalUriReferenceTranslator.idl
index 3ed909101441..ce6e4790769f 100644
--- a/udkapi/com/sun/star/uri/ExternalUriReferenceTranslator.idl
+++ b/udkapi/com/sun/star/uri/ExternalUriReferenceTranslator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/uri/RelativeUriExcessParentSegments.idl b/udkapi/com/sun/star/uri/RelativeUriExcessParentSegments.idl
index 6d65648b7950..37a555fce679 100644
--- a/udkapi/com/sun/star/uri/RelativeUriExcessParentSegments.idl
+++ b/udkapi/com/sun/star/uri/RelativeUriExcessParentSegments.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/uri/UriReferenceFactory.idl b/udkapi/com/sun/star/uri/UriReferenceFactory.idl
index 678258d75ce0..ed8780ccc9bc 100644
--- a/udkapi/com/sun/star/uri/UriReferenceFactory.idl
+++ b/udkapi/com/sun/star/uri/UriReferenceFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTexpand.idl b/udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTexpand.idl
index b0115810fb8a..4a19eece6995 100644
--- a/udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTexpand.idl
+++ b/udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTexpand.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTscript.idl b/udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTscript.idl
index 50da8154e43a..bf0c95e535e3 100644
--- a/udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTscript.idl
+++ b/udkapi/com/sun/star/uri/UriSchemeParser_vndDOTsunDOTstarDOTscript.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.idl b/udkapi/com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.idl
index f652851cf280..944c6bde13f9 100644
--- a/udkapi/com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.idl
+++ b/udkapi/com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/uri/XExternalUriReferenceTranslator.idl b/udkapi/com/sun/star/uri/XExternalUriReferenceTranslator.idl
index 3dc6b8bfca77..ec5d5a0acf8c 100644
--- a/udkapi/com/sun/star/uri/XExternalUriReferenceTranslator.idl
+++ b/udkapi/com/sun/star/uri/XExternalUriReferenceTranslator.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/uri/XUriReference.idl b/udkapi/com/sun/star/uri/XUriReference.idl
index 79ad88f47a1c..75591f3fe8eb 100644
--- a/udkapi/com/sun/star/uri/XUriReference.idl
+++ b/udkapi/com/sun/star/uri/XUriReference.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/uri/XUriReferenceFactory.idl b/udkapi/com/sun/star/uri/XUriReferenceFactory.idl
index bd62235b985d..cf4c1cb56190 100644
--- a/udkapi/com/sun/star/uri/XUriReferenceFactory.idl
+++ b/udkapi/com/sun/star/uri/XUriReferenceFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/uri/XUriSchemeParser.idl b/udkapi/com/sun/star/uri/XUriSchemeParser.idl
index 61a8173d9ab4..7a86ba9fdfd3 100644
--- a/udkapi/com/sun/star/uri/XUriSchemeParser.idl
+++ b/udkapi/com/sun/star/uri/XUriSchemeParser.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl b/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl
index 8d3d339ce404..7ecb0e08d9ae 100644
--- a/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl
+++ b/udkapi/com/sun/star/uri/XVndSunStarExpandUrl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference.idl b/udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference.idl
index 57e9e28e28af..8d7b77888cf6 100644
--- a/udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference.idl
+++ b/udkapi/com/sun/star/uri/XVndSunStarExpandUrlReference.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/uri/XVndSunStarPkgUrlReferenceFactory.idl b/udkapi/com/sun/star/uri/XVndSunStarPkgUrlReferenceFactory.idl
index e6db55f9905b..cc777e6fa383 100644
--- a/udkapi/com/sun/star/uri/XVndSunStarPkgUrlReferenceFactory.idl
+++ b/udkapi/com/sun/star/uri/XVndSunStarPkgUrlReferenceFactory.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/uri/XVndSunStarScriptUrl.idl b/udkapi/com/sun/star/uri/XVndSunStarScriptUrl.idl
index 753ed90b1cef..ed9e0a23c3b2 100644
--- a/udkapi/com/sun/star/uri/XVndSunStarScriptUrl.idl
+++ b/udkapi/com/sun/star/uri/XVndSunStarScriptUrl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/uri/XVndSunStarScriptUrlReference.idl b/udkapi/com/sun/star/uri/XVndSunStarScriptUrlReference.idl
index 4b3ef2eae4b5..7cce9a5a3589 100644
--- a/udkapi/com/sun/star/uri/XVndSunStarScriptUrlReference.idl
+++ b/udkapi/com/sun/star/uri/XVndSunStarScriptUrlReference.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/util/BootstrapMacroExpander.idl b/udkapi/com/sun/star/util/BootstrapMacroExpander.idl
index 0d98381326fc..e57278d5a212 100644
--- a/udkapi/com/sun/star/util/BootstrapMacroExpander.idl
+++ b/udkapi/com/sun/star/util/BootstrapMacroExpander.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@ module com {  module sun {  module star {  module util {
     The service can be instantiated via arguments giving an ini/rc file url.
     Otherwise it will read from an uno.ini/unorc file next to the cppuhelper
     library.
-
+    
     @see theMacroExpander
 
     @since OOo 1.1.2
diff --git a/udkapi/com/sun/star/util/MacroExpander.idl b/udkapi/com/sun/star/util/MacroExpander.idl
index 6e8ed2e04325..511c96310a26 100644
--- a/udkapi/com/sun/star/util/MacroExpander.idl
+++ b/udkapi/com/sun/star/util/MacroExpander.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ module com {  module sun {  module star {  module util {
     arbitrary macro expressions, i.e. substitude macro names.
     The purpose of this service is to separate the use of macrofied strings,
     e.g. urls from the use of services.
-
+    
     @see BootstrapMacroExpander
     @see theMacroExpander
 
diff --git a/udkapi/com/sun/star/util/XMacroExpander.idl b/udkapi/com/sun/star/util/XMacroExpander.idl
index 86b14257c976..b24a7a6b5ae7 100644
--- a/udkapi/com/sun/star/util/XMacroExpander.idl
+++ b/udkapi/com/sun/star/util/XMacroExpander.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/util/XVeto.idl b/udkapi/com/sun/star/util/XVeto.idl
index 813d72c6d69b..66c7cd792b88 100644
--- a/udkapi/com/sun/star/util/XVeto.idl
+++ b/udkapi/com/sun/star/util/XVeto.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,13 @@
 #ifndef __com_sun_star_util_XVeto_idl__
 #define __com_sun_star_util_XVeto_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
+#ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
 //=============================================================================
 
-module com { module sun { module star { module util {
+module com { module sun { module star { module util { 
 
 //=============================================================================
 
@@ -56,7 +56,7 @@ interface XVeto
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/util/logging/LogLevel.idl b/udkapi/com/sun/star/util/logging/LogLevel.idl
index 78b201ccb332..73754c143f73 100644
--- a/udkapi/com/sun/star/util/logging/LogLevel.idl
+++ b/udkapi/com/sun/star/util/logging/LogLevel.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/util/logging/Logger.idl b/udkapi/com/sun/star/util/logging/Logger.idl
index 4eaa06676f95..dd98daa232bb 100644
--- a/udkapi/com/sun/star/util/logging/Logger.idl
+++ b/udkapi/com/sun/star/util/logging/Logger.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/util/logging/LoggerRemote.idl b/udkapi/com/sun/star/util/logging/LoggerRemote.idl
index 91c3c14eaba4..70966d0983b6 100644
--- a/udkapi/com/sun/star/util/logging/LoggerRemote.idl
+++ b/udkapi/com/sun/star/util/logging/LoggerRemote.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/util/logging/XLogger.idl b/udkapi/com/sun/star/util/logging/XLogger.idl
index ae3355914f25..06b8773a69be 100644
--- a/udkapi/com/sun/star/util/logging/XLogger.idl
+++ b/udkapi/com/sun/star/util/logging/XLogger.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/udkapi/com/sun/star/util/logging/XLoggerRemote.idl b/udkapi/com/sun/star/util/logging/XLoggerRemote.idl
index 81e3482d13e4..4b99302e7165 100644
--- a/udkapi/com/sun/star/util/logging/XLoggerRemote.idl
+++ b/udkapi/com/sun/star/util/logging/XLoggerRemote.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
-#ifndef __com_sun_star_beans_XPropertiesChangeListener_idl__
+#ifndef __com_sun_star_beans_XPropertiesChangeListener_idl__ 
 #include <com/sun/star/beans/XPropertiesChangeListener.idl>
 #endif
 
diff --git a/udkapi/com/sun/star/util/theMacroExpander.idl b/udkapi/com/sun/star/util/theMacroExpander.idl
index 11fa247f4495..0608bf7ae253 100644
--- a/udkapi/com/sun/star/util/theMacroExpander.idl
+++ b/udkapi/com/sun/star/util/theMacroExpander.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ure/source/startup.sh b/ure/source/startup.sh
index 1b80e16cf3d6..88301c2d2aa9 100644
--- a/ure/source/startup.sh
+++ b/ure/source/startup.sh
@@ -2,7 +2,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/ure/source/uretest/JavaClient.java b/ure/source/uretest/JavaClient.java
index 71b3113372ed..1734ca5ff11d 100644
--- a/ure/source/uretest/JavaClient.java
+++ b/ure/source/uretest/JavaClient.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ure/source/uretest/JavaMain.java b/ure/source/uretest/JavaMain.java
index a6054b26ea1c..8968ccb2ab09 100644
--- a/ure/source/uretest/JavaMain.java
+++ b/ure/source/uretest/JavaMain.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ure/source/uretest/JavaNative.java b/ure/source/uretest/JavaNative.java
index cbbb988f5e69..c8140b497e29 100644
--- a/ure/source/uretest/JavaNative.java
+++ b/ure/source/uretest/JavaNative.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ure/source/uretest/JavaTest.java b/ure/source/uretest/JavaTest.java
index 307ec3453096..5a08eb433a66 100644
--- a/ure/source/uretest/JavaTest.java
+++ b/ure/source/uretest/JavaTest.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ure/source/uretest/Runner.java b/ure/source/uretest/Runner.java
index dc6abcabd0ce..9c885e1e13bc 100644
--- a/ure/source/uretest/Runner.java
+++ b/ure/source/uretest/Runner.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ure/source/uretest/Tester.java b/ure/source/uretest/Tester.java
index 39fd9545987e..7bd7b9a36103 100644
--- a/ure/source/uretest/Tester.java
+++ b/ure/source/uretest/Tester.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ure/source/uretest/types.idl b/ure/source/uretest/types.idl
index 8d454801c38c..c7b823c98f86 100644
--- a/ure/source/uretest/types.idl
+++ b/ure/source/uretest/types.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/ure/source/uretest/version.map b/ure/source/uretest/version.map
index 82a89b6b28fc..7d305778d080 100644
--- a/ure/source/uretest/version.map
+++ b/ure/source/uretest/version.map
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
diff --git a/xml2cmp/source/finder/dep_main.cxx b/xml2cmp/source/finder/dep_main.cxx
index 6f6de46f0a18..1d9913c61fc7 100644
--- a/xml2cmp/source/finder/dep_main.cxx
+++ b/xml2cmp/source/finder/dep_main.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/xml2cmp/source/finder/dependy.cxx b/xml2cmp/source/finder/dependy.cxx
index 8a7ae0a8d94f..1b34b5655d26 100644
--- a/xml2cmp/source/finder/dependy.cxx
+++ b/xml2cmp/source/finder/dependy.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,12 +36,12 @@
 
 
 
-Simstr              ShortName(const Simstr & i_rService);
+Simstr 				ShortName(const Simstr & i_rService);
 
 
 
 Service::Service( const char * i_sName )
-    :   sName(i_sName)
+    :	sName(i_sName)
         // aImplementations
 {
 }
@@ -55,7 +55,7 @@ Service::AddImplementation( const char * i_sLibrary )
 }
 
 ServiceInfo::ServiceInfo( const char * i_sLibrary )
-    :   sImplementingLibrary(i_sLibrary)
+    :	sImplementingLibrary(i_sLibrary)
         // aNeededServices
 {
 }
@@ -87,9 +87,9 @@ DependencyFinder::GatherData( const char * i_sSearchDirectory )
 }
 
 void
-DependencyFinder::FindNeededServices( StringVector &        o_rLibraries,
-                                      StringVector &        o_rServices,
-                                      const Simstr &        i_rService )
+DependencyFinder::FindNeededServices( StringVector &		o_rLibraries,
+                                      StringVector &		o_rServices,
+                                      const Simstr &		i_rService )
 {
     Map_Services::const_iterator itService = aServices.find(i_rService);
     if ( itService == aServices.end() )
@@ -124,8 +124,8 @@ DependencyFinder::FindNeededServices( StringVector &        o_rLibraries,
 void
 DependencyFinder::ReadFile(  const char * i_sFilename )
 {
-    ModuleDescription   aModule;
-    X2CParser           aParser(aModule);
+    ModuleDescription	aModule;
+    X2CParser			aParser(aModule);
 
     if ( !aParser.Parse(i_sFilename) )
     {
@@ -171,10 +171,10 @@ DependencyFinder::ReadFile(  const char * i_sFilename )
                 {
                     if (! aNeededServices[n]->Data(dn).is_no_text())
                         rSInfo.AddDependency( ShortName(aNeededServices[n]->Data(dn)) );
-                }   // end for dn
-            }   // end for n
-        }   //  end for di
-    }   // end for i
+                }	// end for dn
+            }	// end for n
+        }	//	end for di
+    }	// end for i
 }
 
 void
@@ -192,7 +192,7 @@ DependencyFinder::Add2Result( const Service & i_rService )
         std::pair< std::set< Simstr >::iterator, bool > aInsertResult
                 = aResult_Services.insert(*it);
         if (aInsertResult.second)
-        {   // Needed service not yet known
+        {	// Needed service not yet known
             Map_Services::const_iterator itFound = aServices.find(*it);
             if ( itFound == aServices.end() )
             {
@@ -205,8 +205,8 @@ DependencyFinder::Add2Result( const Service & i_rService )
             {
                 Add2Result( *(*itFound).second );
             }
-        }   // endif (! aInsertResult.second)
-    }   // end for (it)
+        } 	// endif (! aInsertResult.second)
+    } 	// end for (it)
 }
 
 
diff --git a/xml2cmp/source/finder/dependy.hxx b/xml2cmp/source/finder/dependy.hxx
index c2c2d7d9233f..3db0a51c2efd 100644
--- a/xml2cmp/source/finder/dependy.hxx
+++ b/xml2cmp/source/finder/dependy.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,25 +38,25 @@
 class Service;
 class ServiceInfo;
 
-typedef std::vector< Simstr>            StringVector;
-typedef std::vector< ServiceInfo* >     List_Implementations;
-typedef std::map< Simstr, Service* >    Map_Services;
+typedef std::vector< Simstr> 			StringVector;
+typedef std::vector< ServiceInfo* > 	List_Implementations;
+typedef std::map< Simstr, Service* >	Map_Services;
 
 class Service
 {
   public:
                         Service(
-                            const char *        i_sName );
+                            const char *		i_sName );
 
-    ServiceInfo &       AddImplementation(
-                            const char *        i_sLibrary );   /// That is: module-name.
+    ServiceInfo &		AddImplementation(
+                            const char *		i_sLibrary );	/// That is: module-name.
 
-    const Simstr &      Name() const            { return sName; }
-    const ServiceInfo & FirstImplementation() const
+    const Simstr &		Name() const			{ return sName; }
+    const ServiceInfo &	FirstImplementation() const
                                                 { return *aImplementations[0]; }
 
   private:
-    Simstr              sName;
+    Simstr				sName;
     List_Implementations
                         aImplementations;
 };
@@ -67,19 +67,19 @@ class ServiceInfo
     typedef StringVector List_NeededServices;
 
                         ServiceInfo(
-                            const char *        i_sLibrary );
+                            const char *		i_sLibrary );
 
-    void                AddDependency(
-                            const char *        i_sNeededService );
+    void				AddDependency(
+                            const char *		i_sNeededService );
 
-    const Simstr &      Library() const         { return sImplementingLibrary; }
+    const Simstr &		Library() const			{ return sImplementingLibrary; }
     const List_NeededServices &
-                        NeededServices() const  { return aNeededServices; }
+                        NeededServices() const	{ return aNeededServices; }
 
 
   private:
-    Simstr              sImplementingLibrary;
-    List_NeededServices aNeededServices;
+    Simstr				sImplementingLibrary;
+    List_NeededServices	aNeededServices;
 };
 
 
@@ -89,25 +89,25 @@ class DependencyFinder
                         DependencyFinder();
                         ~DependencyFinder();
 
-    void                GatherData(
-                            const char *        i_sSearchDirectory );
+    void				GatherData(
+                            const char *		i_sSearchDirectory );
 
-    void                FindNeededServices(
-                            StringVector &      o_rLibraries,
-                            StringVector &      o_rServices,
-                            const Simstr &      i_rService );
+    void				FindNeededServices(
+                            StringVector &		o_rLibraries,
+                            StringVector &		o_rServices,
+                            const Simstr &		i_rService );
   private:
-    void                ReadFile(
-                            const char *        i_sFilename );
-    void                Add2Result(
-                            const Service &     i_rService );
+    void				ReadFile(
+                            const char * 		i_sFilename );
+    void               	Add2Result(
+                            const Service &		i_rService );
 
     // Data
-    Map_Services        aServices;
+    Map_Services		aServices;
 
     // Temporary data
-    std::set< Simstr >  aResult_Libraries;
-    std::set< Simstr >  aResult_Services;
+    std::set< Simstr >	aResult_Libraries;
+    std::set< Simstr >	aResult_Services;
 };
 
 
diff --git a/xml2cmp/source/inc/lst_str.h b/xml2cmp/source/inc/lst_str.h
index fdd162ad05b8..e450c1096362 100644
--- a/xml2cmp/source/inc/lst_str.h
+++ b/xml2cmp/source/inc/lst_str.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,65 +34,65 @@
 
 typedef struct LSElem
 {
-    Cstring *           pData;
-    struct LSElem * pNext;
+    Cstring *			pData;
+    struct LSElem *	pNext;
 } LSElem;
 
 
 typedef struct LSIterator
 {
-    LSElem *        pElement;
+    LSElem *       	pElement;
 } LSIterator;
 
 
 typedef struct ListCstring
 {
-    LSElem *            dpStart;
-    LSElem *            pEnd;
+    LSElem *			dpStart;
+    LSElem *			pEnd;
     Bool                bAutoDeleteData;
 } ListCstring;
 
 
-#define ListCstring_THIS    ListCstring * pThis
-#define LSIterator_THIS LSIterator * pThis
-#define LSElem_THIS     LSElem * pThis
+#define ListCstring_THIS  	ListCstring * pThis
+#define LSIterator_THIS	LSIterator * pThis
+#define LSElem_THIS	    LSElem * pThis
 
 
 
-void                ListCstring_CTOR( ListCstring_THIS,
+void				ListCstring_CTOR( ListCstring_THIS,
                         Bool                i_bAutoDeleteData );
-void                ListCstring_DTOR( ListCstring_THIS );
-
-void                LS_Add( ListCstring_THIS,
-                        Cstring *           i_pData );
-void                LS_Empty( ListCstring_THIS,
-                        Bool                i_bDeleteData );
-void                LS_Append( ListCstring_THIS,
-                        char *              i_sStrings[],
+void				ListCstring_DTOR( ListCstring_THIS );
+
+void				LS_Add( ListCstring_THIS,
+                        Cstring *			i_pData );
+void				LS_Empty( ListCstring_THIS,
+                        Bool				i_bDeleteData );
+void				LS_Append( ListCstring_THIS,
+                        char *				i_sStrings[],
                         intt                i_nNrOfStrings );
-Bool                LS_IsEmpty( ListCstring_THIS );
+Bool				LS_IsEmpty( ListCstring_THIS );
 
-LSIterator          LS_Begin( ListCstring_THIS );
+LSIterator			LS_Begin( ListCstring_THIS );
 
 
-void                LSIterator_CTOR( LSIterator_THIS,
-                        LSElem *            i_pElement );
-void                LSI_opp( LSIterator_THIS );     /** operator++() */
+void				LSIterator_CTOR( LSIterator_THIS,
+                        LSElem *     		i_pElement );
+void				LSI_opp( LSIterator_THIS );  	/** operator++() */
 
-Bool                LSI_obool( LSIterator_THIS );
-Cstring *           LSI_optr( LSIterator_THIS );    /** operator->() */
+Bool				LSI_obool( LSIterator_THIS );
+Cstring *			LSI_optr( LSIterator_THIS );  	/** operator->() */
 
 
-void                LSElem_CTOR( LSElem_THIS,
-                        Cstring *           i_pData );
-void                LSElem_DTOR( LSElem_THIS );
+void				LSElem_CTOR( LSElem_THIS,
+                        Cstring *			i_pData );
+void				LSElem_DTOR( LSElem_THIS );
 
-Cstring *           LSE_Data( LSElem_THIS );
-LSElem *            LSE_Next( LSElem_THIS );
+Cstring *			LSE_Data( LSElem_THIS );
+LSElem *			LSE_Next( LSElem_THIS );
 
-void                LSE_SetNext( LSElem_THIS,
-                        LSElem *            i_pNext );
-void                LSE_DeleteData( LSElem_THIS );
+void				LSE_SetNext( LSElem_THIS,
+                        LSElem *			i_pNext );
+void				LSE_DeleteData( LSElem_THIS );
 
 
 
diff --git a/xml2cmp/source/inc/new_del.h b/xml2cmp/source/inc/new_del.h
index c00c4bb26e27..aa22bc8547ed 100644
--- a/xml2cmp/source/inc/new_del.h
+++ b/xml2cmp/source/inc/new_del.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,10 +30,10 @@
 #define CPV_NEW_DEL_H
 
 
-void *              New(
-                        intt                i_nSize );
-void                Delete(
-                        void *              io_pMemory );
+void * 				New(
+                        intt				i_nSize );
+void  				Delete(
+                        void *				io_pMemory );
 
 /* at ASSIGN_NEW ptr must be an L-Value. */
 #define ASSIGN_NEW( ptr, type ) \
diff --git a/xml2cmp/source/inc/precomp.h b/xml2cmp/source/inc/precomp.h
index 72e1f368b2bf..64dfc6984fce 100644
--- a/xml2cmp/source/inc/precomp.h
+++ b/xml2cmp/source/inc/precomp.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,22 +31,22 @@
 
 #define _NO_BOOL_TYPE_
 
-typedef short       Bool;
-#define True        1
-#define False       0
+typedef	short    	Bool;
+#define True		1
+#define False		0
 
 
 
-typedef long        intt;
+typedef long	  	intt;
 
 #define AND &&
-#define OR  ||
+#define OR	||
 #define NOT !
 
 
 #define REF( x )  (&(x))
 #define MREF( x )  (&(pThis->x))
-#define THIS_       pThis
+#define THIS_ 		pThis
 
 
 
diff --git a/xml2cmp/source/inc/str.h b/xml2cmp/source/inc/str.h
index 62192aaa9a71..aad0eb60e05e 100644
--- a/xml2cmp/source/inc/str.h
+++ b/xml2cmp/source/inc/str.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,40 +31,40 @@
 
 
 #ifdef UNX
-#define stricmp(str1,str2)      strcasecmp(str1, str2)
-#define strnicmp(str1,str2,n)   strncasecmp(str1, str2, n)
+#define stricmp(str1,str2)   	strcasecmp(str1, str2)
+#define strnicmp(str1,str2,n)  	strncasecmp(str1, str2, n)
 #endif
 
 
 typedef struct Cstring
 {
-    char *              dpText;
-    intt                nLength;
+    char *				dpText;
+    intt				nLength;
 
 } Cstring;
 
-#define Cstring_THIS        Cstring * pThis
+#define Cstring_THIS		Cstring * pThis			
 
 
-void                Cstring_CTOR( Cstring_THIS,
-                        char *              pText );
-void                Cstring_DTOR( Cstring * pThis );
+void			   	Cstring_CTOR( Cstring_THIS,
+                        char *				pText );
+void				Cstring_DTOR( Cstring * pThis );
 
-void                Cs_Assign( Cstring_THIS,
-                        char *              i_pNewText );
-void                Cs_AssignPart( Cstring_THIS,
-                        char *              i_pNewText,
+void				Cs_Assign( Cstring_THIS,
+                        char * 				i_pNewText );
+void				Cs_AssignPart( Cstring_THIS,
+                        char * 				i_pNewText,
                         intt                i_nLength );
 
-void                Cs_AddCs( Cstring_THIS,
-                        Cstring *           i_pAddedText );
-void                Cs_Add( Cstring_THIS,
-                        char *              i_pAddedText );
+void				Cs_AddCs( Cstring_THIS,
+                        Cstring * 			i_pAddedText );
+void				Cs_Add( Cstring_THIS,
+                        char * 				i_pAddedText );
 
-char *              Cs_Str( Cstring_THIS );
-intt                Cs_Length( Cstring_THIS );
+char *				Cs_Str( Cstring_THIS );
+intt				Cs_Length( Cstring_THIS );
 
-void                Cs_ToUpper( Cstring_THIS );
+void				Cs_ToUpper( Cstring_THIS );
 
 
 
diff --git a/xml2cmp/source/inc/textbuff.h b/xml2cmp/source/inc/textbuff.h
index 94fc16247d46..357d79fcb989 100644
--- a/xml2cmp/source/inc/textbuff.h
+++ b/xml2cmp/source/inc/textbuff.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,18 +34,18 @@
 
 typedef struct TextBuffer
 {
-    char *              dpText;
-    intt                nSize;
+    char *				dpText;
+    intt				nSize;
 
-    intt                nPosition;
+    intt				nPosition;
 
 } TextBuffer;
 
-#define TextBuffer_THIS     TextBuffer * pThis
+#define TextBuffer_THIS		TextBuffer * pThis
 
 
-#define ENDS    '\0'
-#define ENDL    '\n'
+#define ENDS	'\0'
+#define ENDL	'\n'
 
 typedef enum E_TB_Relation
 {
@@ -55,31 +55,31 @@ typedef enum E_TB_Relation
 } E_TB_Relation;
 
 
-void                TextBuffer_CTOR( TextBuffer_THIS,
-                        intt                i_nSize );
-void                TextBuffer_DTOR( TextBuffer_THIS );
-void                TB_Resize( TextBuffer_THIS,
-                        intt                i_nNewSize );
+void			   	TextBuffer_CTOR( TextBuffer_THIS,
+                        intt				i_nSize );
+void				TextBuffer_DTOR( TextBuffer_THIS );
+void				TB_Resize( TextBuffer_THIS,
+                        intt				i_nNewSize );
 
-Bool                TB_oin( TextBuffer_THIS,                /** operator>>(char *) */
-                        char *              i_pText );
-Bool                TB_oinChar( TextBuffer_THIS,            /** operator>>(char) */
-                        char                i_cChar );
-Bool                TB_oinFile( TextBuffer_THIS,            /** operator>>(TextFile*)  */
-                        TextFile *          i_pFile );
-void                TB_opp( TextBuffer_THIS );              /** operator++ */
+Bool				TB_oin( TextBuffer_THIS,				/** operator>>(char *) */
+                        char * 				i_pText );
+Bool				TB_oinChar( TextBuffer_THIS,			/** operator>>(char) */
+                        char  				i_cChar );
+Bool				TB_oinFile( TextBuffer_THIS,			/** operator>>(TextFile*)  */
+                        TextFile *			i_pFile );
+void				TB_opp( TextBuffer_THIS );				/** operator++ */
 
-intt                TB_Goto( TextBuffer_THIS,
-                        intt                i_nPosition,
-                        E_TB_Relation       i_nRelation );      /** tb_begin, tb_cur, tb_end */
+intt				TB_Goto( TextBuffer_THIS,
+                        intt				i_nPosition,
+                        E_TB_Relation		i_nRelation );		/**	tb_begin, tb_cur, tb_end */
 
 
-char *              TB_Text( TextBuffer_THIS );
-char                TB_CurChar( TextBuffer_THIS );
-char *              TB_CurCharPtr( TextBuffer_THIS );
-intt                TB_Size( TextBuffer_THIS );
-intt                TB_Position( TextBuffer_THIS );
-Bool                TB_EndOfBuffer( TextBuffer_THIS );
+char *				TB_Text( TextBuffer_THIS );
+char				TB_CurChar( TextBuffer_THIS );
+char *				TB_CurCharPtr( TextBuffer_THIS );
+intt				TB_Size( TextBuffer_THIS );
+intt				TB_Position( TextBuffer_THIS );
+Bool				TB_EndOfBuffer( TextBuffer_THIS );
 
 
 #endif
diff --git a/xml2cmp/source/inc/textfile.h b/xml2cmp/source/inc/textfile.h
index a86d355a9cf4..1d6f6c509d46 100644
--- a/xml2cmp/source/inc/textfile.h
+++ b/xml2cmp/source/inc/textfile.h
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,37 +36,37 @@
 
 typedef struct TextFile
 {
-    Cstring             sName;
-    FILE *              hFile;
-    intt                nLastAction;
+    Cstring				sName;
+    FILE *				hFile;
+    intt				nLastAction;
 } TextFile;
 
-#define TextFile_THIS       TextFile * pThis
+#define TextFile_THIS		TextFile * pThis
 
 
 
-void                TextFile_CTOR( TextFile_THIS,
-                        char *              i_pName );
-void                TextFile_DTOR( TextFile_THIS );
+void           		TextFile_CTOR( TextFile_THIS,
+                        char *				i_pName );
+void           		TextFile_DTOR( TextFile_THIS );
 
-Bool                TF_Open( TextFile_THIS,
-                        char *              i_sOptions );    /* options for second parameter of fopen */
-Bool                TF_Create( TextFile_THIS );
-void                TF_Close( TextFile_THIS );
+Bool			   	TF_Open( TextFile_THIS,
+                        char * 				i_sOptions );    /* options for second parameter of fopen */
+Bool			   	TF_Create( TextFile_THIS );
+void			   	TF_Close( TextFile_THIS );
 
-void                TF_Goto( TextFile_THIS,
-                        intt                i_nPosition );
-intt                TF_Read( TextFile_THIS,
-                        char *              o_pBuffer,
-                        intt                i_nNrOfBytes );
-intt                TF_Write( TextFile_THIS,
-                        char *              i_pBuffer,
-                        intt                i_nNrOfBytes );
-intt                TF_WriteStr( TextFile_THIS,
-                        char *              i_pString );
+void			   	TF_Goto( TextFile_THIS,
+                        intt	 			i_nPosition );
+intt			   	TF_Read( TextFile_THIS,
+                        char *				o_pBuffer,
+                        intt				i_nNrOfBytes );
+intt			   	TF_Write( TextFile_THIS,
+                        char *				i_pBuffer,
+                        intt				i_nNrOfBytes );
+intt			   	TF_WriteStr( TextFile_THIS,
+                        char *				i_pString );
 
-intt                TF_Position( TextFile_THIS );
-intt                TF_Size( TextFile_THIS );
+intt			   	TF_Position( TextFile_THIS );
+intt			   	TF_Size( TextFile_THIS );
 
 
 
diff --git a/xml2cmp/source/support/badcast.cxx b/xml2cmp/source/support/badcast.cxx
index 37a763967dc1..429671e392d9 100644
--- a/xml2cmp/source/support/badcast.cxx
+++ b/xml2cmp/source/support/badcast.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/xml2cmp/source/support/cmdline.cxx b/xml2cmp/source/support/cmdline.cxx
index 7ca25d3562c4..c6a2cbb5dc52 100644
--- a/xml2cmp/source/support/cmdline.cxx
+++ b/xml2cmp/source/support/cmdline.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,7 +48,7 @@ char C_sUseText[] = "Use: xml2cmp.exe \n"
                     "        tagname [tagname ...]";
 
 
-char C_sCmdFunc[]       = "-func";
+char C_sCmdFunc[] 		= "-func";
 char C_sCmdHtml[]       = "-html";
 char C_sCmdType[]       = "-types";
 char C_sCmdIndex[]      = "-ix";
@@ -59,9 +59,9 @@ char C_sCmdIdlPath[]    = "-idlpath";
 bool GetParameter( Simstr & o_rMemory, int & io_nCountArg, int argc, char * argv[] );
 
 
-CommandLine::CommandLine( int           argc,
-                          char *        argv[] )
-    :   bIsOk(true)
+CommandLine::CommandLine( int			argc,
+                          char *		argv[] )
+    :	bIsOk(true)
 {
     bool bDisplayUse = false;
 
@@ -125,7 +125,7 @@ CommandLine::ErrorText() const
 
 bool
 GetParameter( Simstr &      o_pMemory,
-              int &         io_pCountArg,
+              int & 	    io_pCountArg,
               int           argc,
               char *        argv[] )
 {
@@ -140,8 +140,8 @@ GetParameter( Simstr &      o_pMemory,
 
 
 void
-CommandLine::ParseIndexCommand( int                 argc,
-                                char *              argv[] )
+CommandLine::ParseIndexCommand( int					argc,
+                                char *				argv[] )
 {
     int nCountArg = 1;
     bIsOk = GetParameter(
@@ -178,8 +178,8 @@ CommandLine::ParseIndexCommand( int                 argc,
 
 
 void
-CommandLine::ParseSingleFileCommand( int                argc,
-                                     char *             argv[] )
+CommandLine::ParseSingleFileCommand( int				argc,
+                                     char *				argv[] )
 {
     for ( int nCountArg = 1; nCountArg < argc && bIsOk; ++nCountArg )
     {
@@ -219,7 +219,7 @@ CommandLine::ParseSingleFileCommand( int                argc,
         {
             sXmlSourceFile = argv[nCountArg];
         }
-    }   /* end for */
+    }  	/* end for */
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/cmdline.hxx b/xml2cmp/source/support/cmdline.hxx
index 126cdeae138f..c4126d842c42 100644
--- a/xml2cmp/source/support/cmdline.hxx
+++ b/xml2cmp/source/support/cmdline.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,47 +37,47 @@ class CommandLine
 {
   public:
                         CommandLine(
-                            int                 i_argc,
-                            char *              i_argv[] );
+                            int				 	i_argc,
+                            char *				i_argv[] );
                         ~CommandLine();
 
-    bool                IsOk() const            { return bIsOk; }
-    const char *        ErrorText() const;
+    bool				IsOk() const			{ return bIsOk; }
+    const char *		ErrorText() const;
 
-    const char *        XmlSrcFile() const      { return sXmlSourceFile.str(); }
-    const char *        FuncFile() const        { return sFuncFile.str(); }
-    const char *        HtmlFile() const        { return sHtmlFile.str(); }
-    const char *        TypeInfoFile() const    { return sTypeInfoFile.str(); }
+    const char *		XmlSrcFile() const 		{ return sXmlSourceFile.str(); }
+    const char *		FuncFile() const        { return sFuncFile.str(); }
+    const char *		HtmlFile() const        { return sHtmlFile.str(); }
+    const char *		TypeInfoFile() const    { return sTypeInfoFile.str(); }
 
-    bool                IsIndexCommand() const  { return sIndexFile.l() > 0; }
-    const char *        XmlSrcDirectory() const { return sXmlSourceDirectory.str(); }
-    const char *        IndexOutputFile() const { return sIndexFile.str(); }
-    const char *        OutputDirectory() const { return sOutputDirectory.str(); }
+    bool				IsIndexCommand() const	{ return sIndexFile.l() > 0; }
+    const char *		XmlSrcDirectory() const { return sXmlSourceDirectory.str(); }
+    const char *		IndexOutputFile() const { return sIndexFile.str(); }
+    const char *		OutputDirectory() const { return sOutputDirectory.str(); }
     const List<Simstr> &
-                        IndexedTags() const     { return aTagsInIndex; }
+                        IndexedTags() const	 	{ return aTagsInIndex; }
 
-    const char *        IdlRootPath() const     { return sIdlRootPath.str(); }
+    const char *		IdlRootPath() const 	{ return sIdlRootPath.str(); }
 
   private:
-    void                ParseIndexCommand(
-                            int                 argc,
-                            char *              argv[] );
-    void                ParseSingleFileCommand(
-                            int                 argc,
-                            char *              argv[] );
-    Simstr              sXmlSourceFile;
-    Simstr              sFuncFile;
-    Simstr              sHtmlFile;
-    Simstr              sTypeInfoFile;
-
-    Simstr              sXmlSourceDirectory;
-    Simstr              sIndexFile;
-    Simstr              sOutputDirectory;
-    List<Simstr>        aTagsInIndex;
-
-    Simstr              sIdlRootPath;
-
-    bool                bIsOk;
+    void				ParseIndexCommand(
+                            int					argc,
+                            char *				argv[] );
+    void				ParseSingleFileCommand(
+                            int					argc,
+                            char *				argv[] );
+    Simstr 				sXmlSourceFile;
+    Simstr 				sFuncFile;
+    Simstr 				sHtmlFile;
+    Simstr 				sTypeInfoFile;
+
+    Simstr 				sXmlSourceDirectory;
+    Simstr 				sIndexFile;
+    Simstr 				sOutputDirectory;
+    List<Simstr>		aTagsInIndex;
+
+    Simstr 				sIdlRootPath;
+
+    bool				bIsOk;
 };
 
 
diff --git a/xml2cmp/source/support/heap.cxx b/xml2cmp/source/support/heap.cxx
index e814cbe66eef..db51e34847fa 100644
--- a/xml2cmp/source/support/heap.cxx
+++ b/xml2cmp/source/support/heap.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 
 #include <iostream>
 #include <stdlib.h>
-#define AssertionOf(x)  {if (!(x)) {std::cerr << "Assertion failed: " << #x << __FILE__ << __LINE__ << std::endl; exit(3); }}
+#define AssertionOf(x)	{if (!(x)) {std::cerr << "Assertion failed: " << #x << __FILE__ << __LINE__ << std::endl; exit(3); }}
 
 #ifdef UNX
 #define stricmp strcasecmp
@@ -40,8 +40,8 @@
 
 
 
-Heap::Heap(unsigned i_nWidth)
-    :   dpColumnsArray(new Column[i_nWidth]),
+Heap::Heap(unsigned	i_nWidth)
+    :	dpColumnsArray(new Column[i_nWidth]),
         nColumnsArraySize(i_nWidth),
         nActiveColumn(nColumnsArraySize-1)
 {
@@ -67,8 +67,8 @@ Heap::~Heap()
 }
 
 void
-Heap::InsertValue( const char *     i_sKey,
-                   const char *     i_sValue )
+Heap::InsertValue( const char *		i_sKey,
+                   const char *	   	i_sValue )
 {
     HeapItem * pSearch1 = 0;
     HeapItem * pSearch2 = 0;
@@ -138,7 +138,7 @@ Heap::ReleaseTop()
                 nRetColumn = i;
             }
         }
-    }   // for
+    }	// for
 
     if (ret != 0)
     {
@@ -156,9 +156,9 @@ Heap::IncColumn()
 
 
 
-HeapItem::HeapItem( const char *        i_sKey,
-                    const char *        i_sValue )
-    :   sValue(i_sValue),
+HeapItem::HeapItem( const char *		i_sKey,
+                    const char *	   	i_sValue )
+    :	sValue(i_sValue),
         sKey(i_sKey),
         pNext(0)
 {
diff --git a/xml2cmp/source/support/heap.hxx b/xml2cmp/source/support/heap.hxx
index 5d4a9bf0a610..ccd49788b005 100644
--- a/xml2cmp/source/support/heap.hxx
+++ b/xml2cmp/source/support/heap.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,23 +37,23 @@ class Heap
 {
   public:
                         Heap(
-                            unsigned            i_nWidth );
+                            unsigned			i_nWidth );
                         ~Heap();
 
-    void                InsertValue(
-                            const char *        i_sKey,
-                            const char *        i_sValue );
-    HeapItem *          ReleaseTop();           /// @return must be deleted by caller of method.
+    void				InsertValue(
+                            const char *		i_sKey,
+                            const char *	   	i_sValue );
+    HeapItem *		    ReleaseTop();   		/// @return must be deleted by caller of method.
 
   private:
     typedef HeapItem * Column;
 
-    void                IncColumn();
-    Column &            ActiveColumn()          { return dpColumnsArray[nActiveColumn]; }
+    void				IncColumn();
+    Column &			ActiveColumn()			{ return dpColumnsArray[nActiveColumn]; }
 
-    Column *            dpColumnsArray;
-    unsigned            nColumnsArraySize;
-    unsigned            nActiveColumn;
+    Column *			dpColumnsArray;
+    unsigned			nColumnsArraySize;
+    unsigned			nActiveColumn;
 };
 
 
@@ -61,25 +61,25 @@ class HeapItem
 {
   public:
                         HeapItem(
-                            const char *        i_sKey,
-                            const char *        i_sValue );
+                            const char *		i_sKey,
+                            const char *	   	i_sValue );
                         ~HeapItem(  );
 
-    bool                operator<(
-                            const HeapItem &    i_rOther ) const;
-    bool                operator<=(
-                            const HeapItem &    i_rOther ) const
+    bool				operator<(
+                            const HeapItem &  	i_rOther ) const;
+    bool				operator<=(
+                            const HeapItem &  	i_rOther ) const
                                                 { return ! (i_rOther < *this); }
-    const Simstr &      Value() const;
-    const Simstr &      Key() const;
-    HeapItem *          Next() const;
+    const Simstr &		Value() const;
+    const Simstr &		Key() const;
+    HeapItem * 		    Next() const;
 
-    void                SetNext(
-                            HeapItem *          i_pNext );
+    void        		SetNext(
+                            HeapItem *			i_pNext );
   private:
-    Simstr              sValue;
+    Simstr				sValue;
     Simstr              sKey;
-    HeapItem *          pNext;
+    HeapItem *			pNext;
 };
 
 
diff --git a/xml2cmp/source/support/list.hxx b/xml2cmp/source/support/list.hxx
index 66888ee6bfbc..6de123e297de 100644
--- a/xml2cmp/source/support/list.hxx
+++ b/xml2cmp/source/support/list.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,24 +46,24 @@ class List
 
     // OPERATORS
     const XX &          operator[](
-                            unsigned            n) const
+                            unsigned 			n) const
                                                 { return elem(n); }
     XX &                operator[](
-                            unsigned            n)
+                            unsigned 			n)
                                                 { return elem(n); }
     // OPERATIONS
     void                reserve(
-                            unsigned            i_nSize )
+                            unsigned			i_nSize )
                                                 { alloc(i_nSize,true); }
     virtual void        insert(
-                            unsigned            pos,
+                            unsigned 			pos,
                             const XX &          elem );
     void                push_back(
-                            const XX &          elem_)
+                            const XX & 			elem_)
                                                 { insert(size(),elem_); }
 
     virtual void        remove(
-                            unsigned            pos );
+                            unsigned 			pos );
     void                pop_back()              { remove(size()-1); }
     void                erase_all()             { while (size()) remove(size()-1); }
 
@@ -79,19 +79,19 @@ class List
 
   protected:
     void                checkSize(
-                            unsigned            newLength);
-    void                alloc(
-                            unsigned            newSpace,
+                            unsigned 			newLength);
+    void        		alloc(
+                            unsigned			newSpace,
                             bool                re = false );
 
-    const XX &          elem(
-                            unsigned            n ) const
+    const XX &         	elem(
+                            unsigned 			n ) const
                                                 { return inhalt[n]; }
-    XX &                elem(
-                            unsigned            n )
+    XX &        		elem(
+                            unsigned 			n )
                                                 { return inhalt[n]; }
   // DATA
-    XX *                inhalt;
+    XX *        		inhalt;
     unsigned            len;
     unsigned            allocated;
 
@@ -99,7 +99,7 @@ class List
     // forbidden functions
                         List(const List<XX> & L);
     List<XX> &          operator=(
-                            const List<XX> &    L);
+                            const List<XX> & 	L);
 
 };
 
@@ -110,10 +110,10 @@ class DynamicList : public List<XY*>
     virtual             ~DynamicList();
 
     virtual void        insert(
-                            unsigned            pos,
+                            unsigned 			pos,
                             XY * const &        elem );
     virtual void        remove(
-                            unsigned            pos );
+                            unsigned 			pos );
 };
 
 
diff --git a/xml2cmp/source/support/sistr.cxx b/xml2cmp/source/support/sistr.cxx
index 1a59ea78cc50..f7031c2138cd 100644
--- a/xml2cmp/source/support/sistr.cxx
+++ b/xml2cmp/source/support/sistr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -115,11 +115,11 @@ Simstr
 Simstr::operator+(const Simstr & S) const
 {
    Simstr ret = sz;
-   ret.push_back(S);
+   ret.push_back(S);                                         
    return ret;
 }
 
-Simstr &
+Simstr &     
 Simstr::operator+=(const Simstr & S)
 {
    push_back(S);
@@ -137,20 +137,20 @@ bool
 Simstr::operator!=(const Simstr & S) const
 { return strcmp(sz,S.sz) ? true : false; }
 
-bool
-Simstr::operator<(const Simstr & S) const
+bool  
+Simstr::operator<(const Simstr & S) const 
 { return (strcmp(sz,S.sz) < 0) ? true : false; }
 
-bool
-Simstr::operator>(const Simstr & S) const
+bool  
+Simstr::operator>(const Simstr & S) const 
 { return (strcmp(sz,S.sz) > 0) ? true : false; }
 
 bool
-Simstr::operator<=(const Simstr & S) const
+Simstr::operator<=(const Simstr & S) const 
 { return (strcmp(sz,S.sz) <= 0) ? true : false; }
 
-bool
-Simstr::operator>=(const Simstr & S) const
+bool  
+Simstr::operator>=(const Simstr & S) const 
 { return (strcmp(sz,S.sz) >= 0) ? true : false; }
 
 
@@ -173,7 +173,7 @@ Simstr::push_front(char c)
    len++;
 }
 
-void
+void 
 Simstr::push_back(char c)
 {
    char * result = new char[len+2];
@@ -216,7 +216,7 @@ Simstr::push_back(const Simstr & S)
 
 // Remove
 
-void
+void 
 Simstr::remove(int  pos, int  anzahl)
 {
    if (pos >= len || pos < 0 || anzahl < 1)
@@ -270,7 +270,7 @@ Simstr::pos_last(char c) const
 
 bool
 Simstr::is_no_text() const
-{
+{ 
    if (!len)
       return true;
 
diff --git a/xml2cmp/source/support/sistr.hxx b/xml2cmp/source/support/sistr.hxx
index a7f747ead017..deb7d6e81c95 100644
--- a/xml2cmp/source/support/sistr.hxx
+++ b/xml2cmp/source/support/sistr.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ class  Simstr
                      Simstr(                       // Creates Simstr out of a copy of the described bytes within 'anyBytes'.
                                                    // Adds a '\0' at the end.
                            const char *   anybytes,
-                           int            firstBytesPos,
+                           int			  firstBytesPos,
                            int            nrOfBytes);
       virtual        ~Simstr();
                      Simstr(
@@ -50,7 +50,7 @@ class  Simstr
                      operator const char*() const;
 
       // diverse utility functions
-      const char *   str() const                { return sz; }
+      const char *   str() const				{ return sz; }
       char *         s();   // CAUTION!!!          // Only use when a function needs a 'char*' but
                                                    //   still will NOT MODIFY THE STRING!
                                                    //   Typecasts to 'const char*' are performed automatically.
@@ -89,7 +89,7 @@ class  Simstr
       void           remove(
                              int            pos,
                            int            anzahl = 1);
-      void           remove_trailing_blanks();
+      void			 remove_trailing_blanks();
 
          // search functions
       int            pos_first(
@@ -137,7 +137,7 @@ bool  operator>=(const char * str, const Simstr & S);
 
 inline char *
 Simstr::s()                            { return sz; }
-inline int
+inline int 
 Simstr::l() const                      { return len; }
 inline
 Simstr::operator const char*() const   { return sz; }
@@ -145,6 +145,6 @@ inline bool
 Simstr::is_empty() const               { return len == 0; }
 
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/syshelp.cxx b/xml2cmp/source/support/syshelp.cxx
index fd26acc6bfd4..6838819f1077 100644
--- a/xml2cmp/source/support/syshelp.cxx
+++ b/xml2cmp/source/support/syshelp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,10 +50,10 @@
 char C_sSpaceInName[] = "&nbsp;&nbsp;&nbsp;";
 
 void
-WriteName( std::ostream &       o_rFile,
-           const Simstr &   i_rIdlDocuBaseDir,
+WriteName( std::ostream & 		o_rFile,
+           const Simstr &	i_rIdlDocuBaseDir,
            const Simstr &   i_rName,
-           E_LinkType       i_eLinkType )
+           E_LinkType		i_eLinkType )
 {
     if (i_rName.l() == 0)
         return;
@@ -97,7 +97,7 @@ WriteName( std::ostream &       o_rFile,
             WriteStr( o_rFile, ".html\">" );
         }
         else
-        {   // Should not be reached:
+        {  	// Should not be reached:
             WriteStr(o_rFile, i_rName);
             return;
         }
@@ -154,14 +154,14 @@ WriteName( std::ostream &       o_rFile,
 
 
 void
-WriteStr( std::ostream &    o_rFile,
-          const char *      i_sStr )
+WriteStr( std::ostream & 	o_rFile,
+          const char *		i_sStr )
 {
     o_rFile.write( i_sStr, (int) strlen(i_sStr) );
 }
 
 void
-WriteStr( std::ostream &      o_rFile,
+WriteStr( std::ostream & 	  o_rFile,
           const Simstr &      i_sStr )
 {
     o_rFile.write( i_sStr.str(), i_sStr.l() );
@@ -171,12 +171,12 @@ WriteStr( std::ostream &      o_rFile,
 const char C_sXML_END[] = "\\*.xml";
 
 void
-GatherFileNames( List<Simstr> &     o_sFiles,
-                 const char *       i_sSrcDirectory )
+GatherFileNames( List<Simstr> &   	o_sFiles,
+                 const char *		i_sSrcDirectory )
 {
-    static int   nAliveCounter = 0;
+    static int 	 nAliveCounter = 0;
 
-    char *       sNextDir = 0;
+    char * 		 sNextDir = 0;
     Simstr       sNew = 0;
 
 #ifdef WNT
@@ -201,7 +201,7 @@ GatherFileNames( List<Simstr> &     o_sFiles,
         sNew += "\\";
         sNew += aEntry.name;
         o_sFiles.push_back(sNew);
-    }   // end for
+    }	// end for
 
     _findclose(hFile);
     delete [] sFilter;
@@ -224,14 +224,14 @@ GatherFileNames( List<Simstr> &     o_sFiles,
             sNew += pEntry->d_name;
             o_sFiles.push_back(sNew);
         }
-    }   // end while
+    }	// end while
 
     closedir( pDir );
 #else
 #error Must run on unix or windows, please define UNX or WNT.
 #endif
 
-    //  gathering from subdirectories:
+    //  gathering from subdirectories: 
     List<Simstr> aSubDirectories;
     GatherSubDirectories( aSubDirectories, i_sSrcDirectory );
 
@@ -253,8 +253,8 @@ GatherFileNames( List<Simstr> &     o_sFiles,
 const char * C_sANYDIR = "\\*.*";
 
 void
-GatherSubDirectories( List<Simstr> &    o_sSubDirectories,
-                      const char *      i_sParentdDirectory )
+GatherSubDirectories( List<Simstr> &   	o_sSubDirectories,
+                      const char *	   	i_sParentdDirectory )
 {
     Simstr sNew;
 
@@ -274,7 +274,7 @@ GatherSubDirectories( List<Simstr> &    o_sSubDirectories,
     {
         if (aEntry.attrib == _A_SUBDIR)
         {
-            // Do not gather . .. and outputtree directories
+            // Do not gather . .. and outputtree directories 
             if ( strchr(aEntry.name,'.') == 0
                  && strncmp(aEntry.name, "wnt", 3) != 0
                  && strncmp(aEntry.name, "unx", 3) != 0 )
@@ -282,22 +282,22 @@ GatherSubDirectories( List<Simstr> &    o_sSubDirectories,
                 sNew = aEntry.name;
                 o_sSubDirectories.push_back(sNew);
             }
-        }   // endif (aEntry.attrib == _A_SUBDIR)
-    }   // end for
+        }   // endif (aEntry.attrib == _A_SUBDIR) 
+    }   // end for 
     _findclose(hFile);
     delete [] sFilter;
 
 #elif defined(UNX) || defined(OS2)
     DIR * pDir = opendir( i_sParentdDirectory );
     dirent * pEntry = 0;
-    struct stat     aEntryStatus;
+    struct stat 	aEntryStatus;
 
     while ( ( pEntry = readdir(pDir) ) != 0 )
     {
         stat(pEntry->d_name, &aEntryStatus);
         if ( ( aEntryStatus.st_mode & S_IFDIR ) == S_IFDIR )
         {
-            // Do not gather . .. and outputtree directories
+            // Do not gather . .. and outputtree directories 
             if ( strchr(pEntry->d_name,'.') == 0
                  && strncmp(pEntry->d_name, "wnt", 3) != 0
                  && strncmp(pEntry->d_name, "unx", 3) != 0 )
@@ -306,7 +306,7 @@ GatherSubDirectories( List<Simstr> &    o_sSubDirectories,
                 o_sSubDirectories.push_back(sNew);
             }
         }   // endif (aEntry.attrib == _A_SUBDIR)
-    }   // end while
+    }	// end while
     closedir( pDir );
 #else
 #error Must run on unix or windows, please define UNX or WNT.
diff --git a/xml2cmp/source/support/syshelp.hxx b/xml2cmp/source/support/syshelp.hxx
index d735ef4971d6..9d4c358a82d6 100644
--- a/xml2cmp/source/support/syshelp.hxx
+++ b/xml2cmp/source/support/syshelp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,26 +59,26 @@ enum E_LinkType
 };
 
 
-void                WriteName(
-                        std::ostream &      o_rFile,
-                        const Simstr &      i_rIdlDocuBaseDir,
+void 				WriteName(
+                        std::ostream & 	    o_rFile,
+                        const Simstr &	    i_rIdlDocuBaseDir,
                         const Simstr &      i_rName,
-                        E_LinkType          i_eLinkType );
+                        E_LinkType			i_eLinkType );
 
 
-void                WriteStr(
-                        std::ostream &      o_rFile,
-                        const char *        i_sStr );
-void                WriteStr(
-                        std::ostream &      o_rFile,
+void 				WriteStr(
+                        std::ostream & 	    o_rFile,
+                        const char *		i_sStr );
+void 				WriteStr(
+                        std::ostream & 	    o_rFile,
                         const Simstr &      i_sStr );
 
-void                GatherFileNames(
-                        List<Simstr> &      o_sFiles,
-                        const char *        i_sSrcDirectory );
-void                GatherSubDirectories(
-                        List<Simstr> &      o_sSubDirectories,
-                        const char *        i_sParentdDirectory );
+void				GatherFileNames(
+                        List<Simstr> &		o_sFiles,
+                        const char *		i_sSrcDirectory );
+void				GatherSubDirectories(
+                        List<Simstr> &		o_sSubDirectories,
+                        const char *		i_sParentdDirectory );
 
 
 
diff --git a/xml2cmp/source/x2cclass/xml_cd.hxx b/xml2cmp/source/x2cclass/xml_cd.hxx
index 9f59aa476fcb..8b71d22c08af 100644
--- a/xml2cmp/source/x2cclass/xml_cd.hxx
+++ b/xml2cmp/source/x2cclass/xml_cd.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 
-#ifndef UDKSERVICE_XML_CD_HXX
-#define UDKSERVICE_XML_CD_HXX
+#ifndef	UDKSERVICE_XML_CD_HXX
+#define	UDKSERVICE_XML_CD_HXX
 
 
 #include <tools/string.hxx>
@@ -35,15 +35,15 @@
 
 
 
-/** Represents one Component description from an XML file.
+/**	Represents one Component description from an XML file.
     DatumOf() is used for tags with only one value.
     DataOf() is used, if the tag has multiple values or if
-    you don't know.
+    you	don't know.
 **/
 class ComponentDescription
 {
   public:
-    /** @ATTENTION
+    /**	@ATTENTION
         Because the enum values are used as array indices:
             tag_None must be the first and have the value "0".
             tag_MAX must be the last.
@@ -66,7 +66,7 @@ class ComponentDescription
         tag_MAX
     };
 
-    virtual             ~ComponentDescription() {}
+    virtual				~ComponentDescription() {}
 
     /// @return All values of this tag. An empty vector for wrong indices.
     virtual const std::vector< ByteString > &
@@ -75,7 +75,7 @@ class ComponentDescription
                                                     i_eTag ) const = 0;
 
     /// @return The only or the first value of this tag. An empty string for wrong indices.
-    virtual ByteString  DatumOf(
+    virtual ByteString 	DatumOf(
                             ComponentDescription::E_Tag
                                                     i_eTag ) const = 0;
 };
diff --git a/xml2cmp/source/x2cclass/xml_cdff.cxx b/xml2cmp/source/x2cclass/xml_cdff.cxx
index 83827335dbe5..264a65364775 100644
--- a/xml2cmp/source/x2cclass/xml_cdff.cxx
+++ b/xml2cmp/source/x2cclass/xml_cdff.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,13 +39,13 @@ typedef ComponentDescriptionImpl::ValueList CdiValueList;
 class dyn_buffer
 {
   public:
-                        dyn_buffer()                    : s(0) {}
+                        dyn_buffer() 					: s(0) {}
                         ~dyn_buffer()                   { if (s) delete [] s; }
-                        operator const char *() const   { return s; }
+                        operator const char *() const 	{ return s; }
     char *              operator->()                    { return s; }
     char &              operator[](
                             INT32 ix )                  { return s[ix]; }
-    void                SetSize(
+    void               	SetSize(
                             INT32 i_size )              { if (s) delete [] s; s = new char [i_size]; }
   private:
     char * s;
@@ -53,8 +53,8 @@ class dyn_buffer
 
 
 inline BOOL
-LoadXmlFile( dyn_buffer &       o_rBuffer,
-             const UniString &  i_sXmlFilePath )
+LoadXmlFile( dyn_buffer & 		o_rBuffer,
+             const UniString &	i_sXmlFilePath )
 {
     BOOL ret = TRUE;
     SvFileStream aXmlFile;
@@ -80,7 +80,7 @@ LoadXmlFile( dyn_buffer &       o_rBuffer,
 
 
 CompDescrsFromAnXmlFile::CompDescrsFromAnXmlFile()
-    :   dpDescriptions(new std::vector< ComponentDescriptionImpl* >),
+    :	dpDescriptions(new std::vector< ComponentDescriptionImpl* >),
         eStatus(not_yet_parsed)
 {
     dpDescriptions->reserve(3);
@@ -96,7 +96,7 @@ CompDescrsFromAnXmlFile::~CompDescrsFromAnXmlFile()
 BOOL
 CompDescrsFromAnXmlFile::Parse( const UniString & i_sXmlFilePath )
 {
-    dyn_buffer      dpBuffer;
+    dyn_buffer  	dpBuffer;
 
     if (! LoadXmlFile(dpBuffer,i_sXmlFilePath) )
     {
@@ -104,13 +104,13 @@ CompDescrsFromAnXmlFile::Parse( const UniString & i_sXmlFilePath )
         return FALSE;
     }
 
-    const char *    pTokenStart = 0;
+    const char * 	pTokenStart = 0;
     const char *    pBufferPosition = dpBuffer;
     INT32           nTokenLength = 0;
-    BOOL            bWithinElement = FALSE;
+    BOOL			bWithinElement = FALSE;
 
-    CdiValueList *  pCurTagData = 0;
-    ByteString      sStatusValue;   // Used only if a <Status ...> tag is found.
+    CdiValueList *	pCurTagData = 0;
+    ByteString      sStatusValue;	// Used only if a <Status ...> tag is found.
 
 
     for ( ComponentDescriptionImpl::ParseUntilStartOfDescription(pBufferPosition);
@@ -142,7 +142,7 @@ CompDescrsFromAnXmlFile::Parse( const UniString & i_sXmlFilePath )
                                 {
                                     // Status tag is already parsed:
                                     pCurTagData->push_back(sStatusValue);
-                                }   // endif (sStatusValue.Length () == 0)
+                                }	// endif (sStatusValue.Length () == 0)
                             }
                             else if ( ComponentDescriptionImpl::CheckEndOfDescription(pBufferPosition) )
                             {
@@ -153,7 +153,7 @@ CompDescrsFromAnXmlFile::Parse( const UniString & i_sXmlFilePath )
                             {
                                 eStatus = inconsistent_file;
                                 return FALSE;
-                            }   // endif (pCurTagData != 0) elseif() else
+                            }	// endif (pCurTagData != 0) elseif() else
                         }
                         else if ( pCurTagData->MatchesEndTag(pBufferPosition) )
                         {
@@ -179,7 +179,7 @@ CompDescrsFromAnXmlFile::Parse( const UniString & i_sXmlFilePath )
                         {
                             nTokenLength++;
                             ++pBufferPosition;
-                        }   // endif (!bWithinElement) else if () else
+                        }	// endif (!bWithinElement) else if () else
                        break;
                 default:
                         if (bWithinElement)
@@ -187,8 +187,8 @@ CompDescrsFromAnXmlFile::Parse( const UniString & i_sXmlFilePath )
                             ++nTokenLength;
                         }
                         ++pBufferPosition;
-            }   // end switch
-        }   // end for
+            }	// end switch
+        } 	// end for 
 
         if (bWithinElement)
         {
@@ -211,7 +211,7 @@ CompDescrsFromAnXmlFile::operator[](INT32 i_nIndex) const
 {
     static const ComponentDescriptionImpl aNullDescr_;
     return 0 <= i_nIndex && i_nIndex < dpDescriptions->size()
-                ?   *(*dpDescriptions)[i_nIndex]
+                ?	*(*dpDescriptions)[i_nIndex]
                 :   aNullDescr_;
 }
 
diff --git a/xml2cmp/source/x2cclass/xml_cdff.hxx b/xml2cmp/source/x2cclass/xml_cdff.hxx
index 6616abbf0edb..28ded806ce97 100644
--- a/xml2cmp/source/x2cclass/xml_cdff.hxx
+++ b/xml2cmp/source/x2cclass/xml_cdff.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 
-#ifndef UDKSERVICE_XML_CDFF_HXX
-#define UDKSERVICE_XML_CDFF_HXX
+#ifndef	UDKSERVICE_XML_CDFF_HXX
+#define	UDKSERVICE_XML_CDFF_HXX
 
 
 #include <tools/string.hxx>
@@ -36,7 +36,7 @@
 class ComponentDescriptionImpl;
 
 
-/** @descr
+/**	@descr
     Is able to parse an XML file with Component descriptions. Gives access
     to the parsed data.
 
@@ -56,7 +56,7 @@ class ComponentDescriptionImpl;
         in xml_cd.hxx .
 
         It is possible to parse more than one time. Then the old data
-        are discarded.
+        are discarded. 
 **/
 class CompDescrsFromAnXmlFile
 {
@@ -70,30 +70,30 @@ class CompDescrsFromAnXmlFile
         no_tag_found_in_file
     };
 
-    //  LIFECYCLE
+    // 	LIFECYCLE
                         CompDescrsFromAnXmlFile();
                         ~CompDescrsFromAnXmlFile();
 
-    //  OPERATIONS
-    BOOL                Parse(
-                            const UniString &   i_sXmlFilePath );
+    //	OPERATIONS
+    BOOL				Parse(
+                            const UniString &	i_sXmlFilePath );
 
-    //  INQUIRY
-    INT32               NrOfDescriptions() const;
+    //	INQUIRY
+    INT32				NrOfDescriptions() const;
     const ComponentDescription &
-                        operator[](             /// @return an empty description, if index does not exist.
-                            INT32               i_nIndex ) const;
+                        operator[](				/// @return an empty description, if index does not exist.
+                            INT32				i_nIndex ) const;
     CompDescrsFromAnXmlFile::E_Status
                         Status() const;
 
   private:
     // PRIVATE SERVICES
-    void                Empty();
+    void				Empty();
 
     // DATA
-    std::vector< ComponentDescriptionImpl* >    *
+    std::vector< ComponentDescriptionImpl* >	*
                         dpDescriptions;
-    E_Status            eStatus;
+    E_Status			eStatus;
 };
 
 
diff --git a/xml2cmp/source/x2cclass/xml_cdim.cxx b/xml2cmp/source/x2cclass/xml_cdim.cxx
index ed9bc1b12c3e..24546691cefa 100644
--- a/xml2cmp/source/x2cclass/xml_cdim.cxx
+++ b/xml2cmp/source/x2cclass/xml_cdim.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@ const char ComponentDescriptionImpl::C_sTagDescription[]
 const char ComponentDescriptionImpl::C_sStatus[]
                                         =   "Status";
 const char * ComponentDescriptionImpl::C_sSubTags[ComponentDescription::tag_MAX]
-                                        = { "None",
+                                        = {	"None",
                                             "Name",
                                             "Description",
                                             "ModuleName",
@@ -48,7 +48,7 @@ const char * ComponentDescriptionImpl::C_sSubTags[ComponentDescription::tag_MAX]
                                           };
 
 ComponentDescriptionImpl::ComponentDescriptionImpl()
-//  :   aTags
+//	:	aTags
 {
     const int i_max = tag_MAX;
     aTags.reserve(i_max);
@@ -87,7 +87,7 @@ GetStatusValue( ByteString & o_sValue, const ByteString & i_sStatusTag )
 }
 
 ComponentDescriptionImpl::ValueList *
-ComponentDescriptionImpl::GetBeginTag( ByteString &  o_sValue,
+ComponentDescriptionImpl::GetBeginTag( ByteString &	 o_sValue,
                                        const char *& io_pStartOfTag ) const
 {
     o_sValue = "";
@@ -114,7 +114,7 @@ ComponentDescriptionImpl::GetBeginTag( ByteString &  o_sValue,
     {
         if ( 0 == stricmp(sTag.GetBuffer(), C_sSubTags[i]) )
             return aTags[i];
-    }   // end for
+    }	// end for
 
     return 0;
 }
@@ -154,7 +154,7 @@ ComponentDescriptionImpl::ParseUntilStartOfDescription( const char * & io_pBuffe
             io_pBufferPosition = pSearch + strlen(C_sTagDescription) + 2;
             return;
         }
-    }   // end for
+    }	// end for
 
     io_pBufferPosition = 0;
 }
diff --git a/xml2cmp/source/x2cclass/xml_cdim.hxx b/xml2cmp/source/x2cclass/xml_cdim.hxx
index c9a0d650fc6f..e7656b6c2cf7 100644
--- a/xml2cmp/source/x2cclass/xml_cdim.hxx
+++ b/xml2cmp/source/x2cclass/xml_cdim.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 
-#ifndef UDKSERVICE_XML_CDIM_HXX
-#define UDKSERVICE_XML_CDIM_HXX
+#ifndef	UDKSERVICE_XML_CDIM_HXX
+#define	UDKSERVICE_XML_CDIM_HXX
 
 
 #include "xml_cd.hxx"
@@ -37,7 +37,7 @@
 
 
 
-/** Represents one of the Component descriptions in an XML file.
+/**	Represents one of the Component descriptions in an XML file.
     Implements ComponentDescription and does part of the parsing for class CompDescrsFromAnXmlFile.
 **/
 class ComponentDescriptionImpl : public ComponentDescription
@@ -48,52 +48,52 @@ class ComponentDescriptionImpl : public ComponentDescription
       public:
         // LIFECYCLE
                             ValueList(
-                                E_Tag               i_eTag )
+                                E_Tag				i_eTag )
                                 : eTag(i_eTag) {}
         // INQUIRY
-        const char *        BeginTag() const;
-        BOOL                MatchesEndTag(
-                                const char *        i_pTextPosition ) const;
-        INT32               EndTagLength() const;
+        const char *		BeginTag() const;
+        BOOL				MatchesEndTag(
+                                const char *		i_pTextPosition ) const;
+        INT32				EndTagLength() const;
 
         static const ValueList &
                             Null_();
       private:
-        E_Tag               eTag;
+        E_Tag				eTag;
     };
 
     // LIFECYCLE
                         ComponentDescriptionImpl();
-    virtual             ~ComponentDescriptionImpl();
+    virtual				~ComponentDescriptionImpl();
 
     // OPERATIONS
-    ValueList *         GetBeginTag(
-                            ByteString &            o_sValue,
-                            const char * &          io_pStartOfTag ) const;
-    static void         ParseUntilStartOfDescription(
+    ValueList *			GetBeginTag(
+                            ByteString &		    o_sValue,
+                            const char * & 			io_pStartOfTag ) const;
+    static void 		ParseUntilStartOfDescription(
                             const char * & io_pBufferPosition );
     static BOOL         CheckEndOfDescription(
                             const char * & io_pBufferPosition );
     // INQUIRY
-    static INT32        DescriptionEndTagSize();
+    static INT32		DescriptionEndTagSize();
 
   // INTERFACE ComponentDescription
     // INQUIRY
     virtual const std::vector< ByteString > &
-                        DataOf(                     /// @return All values of this tag.
+                        DataOf(						/// @return All values of this tag.
                             ComponentDescription::E_Tag
                                                     i_eTag ) const;
-    virtual ByteString  DatumOf(                    /// @return The only or the first value of this tag.
+    virtual ByteString 	DatumOf(                    /// @return The only or the first value of this tag.
                             ComponentDescription::E_Tag
                                                     i_eTag ) const;
   private:
     // DATA
-    static const char   C_sTagDescription[];
-    static const char   C_sStatus[];
+    static const char 	C_sTagDescription[];
+    static const char 	C_sStatus[];
     static const char * C_sSubTags[ComponentDescription::tag_MAX];
     friend class ValueList;
 
-    std::vector< ValueList* >       // Dynamic allocated pointers.
+    std::vector< ValueList* >		// Dynamic allocated pointers.
                         aTags;
 };
 
diff --git a/xml2cmp/source/xcd/cr_html.cxx b/xml2cmp/source/xcd/cr_html.cxx
index e180f7933c77..24063f46fbf9 100644
--- a/xml2cmp/source/xcd/cr_html.cxx
+++ b/xml2cmp/source/xcd/cr_html.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,11 +38,11 @@ char C_sHtmlFileHeader1[] =
     "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n"
     "<HTML>\n"
     "<HEAD>\n"
-    "   <TITLE>";
+    "	<TITLE>";
 
 char C_sHtmlFileHeader2[] =
         "</TITLE>\n"
-    "       <META NAME=\"GENERATOR\" CONTENT=\"xml2cmp\">\n"
+    "		<META NAME=\"GENERATOR\" CONTENT=\"xml2cmp\">\n"
     "</HEAD>\n"
     "<BODY BGCOLOR=\"#ffffff\">\n<P><BR></P>";
 
@@ -50,10 +50,10 @@ char C_sHtmlFileHeader2[] =
 char C_sHtmlFileFoot[] = "</BODY>\n</HTML>\n";
 
 
-HtmlCreator::HtmlCreator( const char *              i_pOutputFileName,
-                          const XmlElement &        i_rDocument,
-                          const Simstr &            i_sIDL_BaseDirectory )
-    :   aFile(i_pOutputFileName, std::ios::out
+HtmlCreator::HtmlCreator( const char *		  		i_pOutputFileName,
+                          const XmlElement &	    i_rDocument,
+                          const Simstr &		    i_sIDL_BaseDirectory )
+    :	aFile(i_pOutputFileName, std::ios::out
 #if defined(WNT) || defined(OS2)
                                                | std::ios::binary
 #endif
@@ -92,18 +92,18 @@ HtmlCreator::StartTable()
     WriteStr( "<P><BR></P>\n" );
     WriteStr(
             "<TABLE WIDTH=95% BORDER=1 CELLSPACING=0 CELLPADDING=4>\n"
-            "   <TBODY>\n"  );
+            "	<TBODY>\n"	);
 }
 
 void
 HtmlCreator::FinishTable()
 {
-    WriteStr( " </TBODY>\n"
+    WriteStr( "	</TBODY>\n"
               "</TABLE>\n\n" );
 }
 
 void
-HtmlCreator::StartBigCell( const char * i_sTitle )
+HtmlCreator::StartBigCell( const char *	i_sTitle )
 {
     WriteStr( "<TR><TD COLSPAN=2>\n"
               "<H4><BR>" );
@@ -151,7 +151,7 @@ HtmlCreator::Write_SglTextElement( const SglTextElement &  i_rElement,
 }
 
 void
-HtmlCreator::Write_MultiTextElement( const MultipleTextElement &    i_rElement )
+HtmlCreator::Write_MultiTextElement( const MultipleTextElement & 	i_rElement )
 {
     StartRow();
 
@@ -164,15 +164,15 @@ HtmlCreator::Write_MultiTextElement( const MultipleTextElement &    i_rElement )
         if (i > 0)
             WriteStr( "<BR>\n" );
         WriteName( aFile, sIdl_BaseDirectory, i_rElement.Data(i), i_rElement.LinkType() );
-    }   // end for
+    }	// end for
     FinishCell();
 
     FinishRow();
 }
 
 void
-HtmlCreator::Write_SglText( const Simstr &      i_sName,
-                            const Simstr &      i_sValue )
+HtmlCreator::Write_SglText(	const Simstr &      i_sName,
+                            const Simstr &		i_sValue )
 {
     StartRow();
 
@@ -187,9 +187,9 @@ HtmlCreator::Write_SglText( const Simstr &      i_sName,
 
 void
 HtmlCreator::Write_ReferenceDocu( const Simstr &      i_sName,
-                                  const Simstr &      i_sRef,
-                                  const Simstr &      i_sRole,
-                                  const Simstr &      i_sTitle )
+                                  const Simstr &	  i_sRef,
+                                  const Simstr &	  i_sRole,
+                                  const Simstr &	  i_sTitle )
 {
     StartRow();
 
@@ -229,27 +229,27 @@ HtmlCreator::Write_ReferenceDocu( const Simstr &      i_sName,
 void
 HtmlCreator::StartRow()
 {
-    WriteStr( "     <TR VALIGN=TOP>\n" );
+    WriteStr( "		<TR VALIGN=TOP>\n" );
 }
 
 void
 HtmlCreator::FinishRow()
 {
-    WriteStr( "     </TR>\n" );
+    WriteStr( "		</TR>\n" );
 }
 
 void
 HtmlCreator::StartCell( const char * i_pWidth)
 {
-    WriteStr( "         <TD WIDTH=" );
+    WriteStr( "			<TD WIDTH="	);
     WriteStr( i_pWidth );
-    WriteStr( ">\n              <P>" );
+    WriteStr( ">\n				<P>" );
 }
 
 void
 HtmlCreator::FinishCell()
 {
-    WriteStr( "</P>\n           </TD>\n" );
+    WriteStr( "</P>\n			</TD>\n" );
 }
 
 void
diff --git a/xml2cmp/source/xcd/cr_html.hxx b/xml2cmp/source/xcd/cr_html.hxx
index b68e641d88f1..d7e662dfabdb 100644
--- a/xml2cmp/source/xcd/cr_html.hxx
+++ b/xml2cmp/source/xcd/cr_html.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,18 +45,18 @@ class HtmlCreator
 {
   public:
                         HtmlCreator(
-                            const char *        i_pOutputFileName,
-                            const XmlElement &  i_rDocument,
-                            const Simstr &      i_sIDL_BaseDirectory );
+                            const char *		i_pOutputFileName,
+                            const XmlElement &	i_rDocument,
+                            const Simstr &		i_sIDL_BaseDirectory );
                         ~HtmlCreator();
 
-    void                Run();
+    void				Run();
 
-    void                StartTable();
-    void                FinishTable();
-    void                StartBigCell(
-                            const char *        i_sTitle );
-    void                FinishBigCell();
+    void				StartTable();
+    void				FinishTable();
+    void				StartBigCell(
+                            const char *		i_sTitle );
+    void				FinishBigCell();
 
     void                Write_SglTextElement(
                             const SglTextElement &
@@ -67,12 +67,12 @@ class HtmlCreator
                                                 i_rElement );
     void                Write_SglText(
                             const Simstr &      i_sName,
-                            const Simstr &      i_sValue );
+                            const Simstr &		i_sValue );
     void                Write_ReferenceDocu(
                             const Simstr &      i_sName,
-                            const Simstr &      i_sRef,
-                            const Simstr &      i_sRole,
-                            const Simstr &      i_sTitle );
+                            const Simstr &		i_sRef,
+                            const Simstr &		i_sRole,
+                            const Simstr &		i_sTitle );
   private:
     void                StartRow();
     void                FinishRow();
@@ -81,15 +81,15 @@ class HtmlCreator
     void                FinishCell();
 
     void                WriteElementName(
-                            const Simstr &      i_sName,
+                            const Simstr & 		i_sName,
                             bool                i_bStrong );
-    void                WriteStr(
-                            const char *        i_sStr )
+    void				WriteStr(
+                            const char * 		i_sStr )
                                                 { aFile.write( i_sStr, (int) strlen(i_sStr) ); }
     // DATA
-    std::ofstream       aFile;
-    const XmlElement &  rDocument;
-    Simstr              sIdl_BaseDirectory;
+    std::ofstream		aFile;
+    const XmlElement &	rDocument;
+    Simstr				sIdl_BaseDirectory;
 };
 
 
diff --git a/xml2cmp/source/xcd/cr_index.cxx b/xml2cmp/source/xcd/cr_index.cxx
index 7ef7cf85a330..aef14324aa75 100644
--- a/xml2cmp/source/xcd/cr_index.cxx
+++ b/xml2cmp/source/xcd/cr_index.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,27 +37,27 @@
 #include "cr_html.hxx"
 
 
-extern unsigned C_nSupportedServicesIndex;
+extern unsigned	C_nSupportedServicesIndex;
 
 char C_sLineEnd[] = "\n";
 
-char C_sFileBegin[]     = "<HTML><HEAD></HEAD><BODY bgcolor=\"#ffffff\">\n";
-char C_sFileEnd[]       = "</BODY></HTML>\n";
-char C_sTableBegin[]    = "<TABLE WIDTH=100% BORDER=1 CELLPADDING=4 CELLSPACING=0><TBODY>\n";
-char C_sTableEnd[]      = "</TBODY></TABLE>\n";
-char C_sService[]       = "SupportedService";
-char C_sModule[]        = "ModuleName";
-char C_sComponentname[] = "ComponentName";
+char C_sFileBegin[] 	= "<HTML><HEAD></HEAD><BODY bgcolor=\"#ffffff\">\n";
+char C_sFileEnd[]   	= "</BODY></HTML>\n";
+char C_sTableBegin[] 	= "<TABLE WIDTH=100% BORDER=1 CELLPADDING=4 CELLSPACING=0><TBODY>\n";
+char C_sTableEnd[]  	= "</TBODY></TABLE>\n";
+char C_sService[]	    = "SupportedService";
+char C_sModule[]	    = "ModuleName";
+char C_sComponentname[]	= "ComponentName";
 
 
 
 Simstr sIdlRootPath;
 
 
-Index::Index( const char *          i_sOutputDirectory,
-              const char *          i_sIdlRootPath,
-              const List<Simstr> &   )
-    :   aService2Module(20),
+Index::Index( const char *			i_sOutputDirectory,
+              const char *			i_sIdlRootPath,
+              const List<Simstr> &	 )
+    :	aService2Module(20),
         aModule2Service(20),
         sOutputDirectory(i_sOutputDirectory),
         sIdlRootPath(i_sIdlRootPath)
@@ -106,7 +106,7 @@ Index::WriteOutput( const char * i_sOuputFile )
 }
 
 void
-Index::InsertSupportedService( const Simstr &       i_sService )
+Index::InsertSupportedService( const Simstr &		i_sService )
 {
     aService2Module.InsertValue( i_sService, sCurModule );
     aModule2Service.InsertValue( sCurModule, i_sService );
@@ -115,10 +115,10 @@ Index::InsertSupportedService( const Simstr &       i_sService )
 void
 Index::ReadFile(  const char * i_sFilename )
 {
-    static char             sOutputHtml[1020];
+    static char				sOutputHtml[1020];
 
-    ModuleDescription   aModule;
-    X2CParser           aParser(aModule);
+    ModuleDescription	aModule;
+    X2CParser			aParser(aModule);
 
     // Parse
     bool bResult = aParser.Parse(i_sFilename);
@@ -133,7 +133,7 @@ Index::ReadFile(  const char * i_sFilename )
 
     // Create Html:
     CreateHtmlFileName( sOutputHtml, aModule );
-    HtmlCreator     aHtmlCreator( sOutputHtml, aModule, sIdlRootPath );
+    HtmlCreator 	aHtmlCreator( sOutputHtml, aModule, sIdlRootPath );
     aHtmlCreator.Run();
 
     // GetResults:
@@ -149,8 +149,8 @@ Index::ReadFile(  const char * i_sFilename )
 }
 
 void
-Index::CreateHtmlFileName(  char *                      o_sOutputHtml,
-                            const ModuleDescription &   i_rModule )
+Index::CreateHtmlFileName(	char *						o_sOutputHtml,
+                            const ModuleDescription	&   i_rModule )
 {
     if ( strlen(sOutputDirectory.str()) + strlen(i_rModule.ModuleName()) > 1000 )
     {
@@ -164,7 +164,7 @@ Index::CreateHtmlFileName(  char *                      o_sOutputHtml,
 #elif defined(UNX)
     strcat(o_sOutputHtml, "/");                             // STRCAT SAFE HERE
 #else
-#error  WNT or UNX have to be defined.
+#error	WNT or UNX have to be defined.
 #endif
     strcat( o_sOutputHtml, i_rModule.ModuleName() );        // STRCAT SAFE HERE
     strcat( o_sOutputHtml, ".html" );                       // STRCAT SAFE HERE
@@ -172,11 +172,11 @@ Index::CreateHtmlFileName(  char *                      o_sOutputHtml,
 
 
 void
-Index::WriteTableFromHeap( std::ostream &   o_rOut,
-                           Heap &       i_rHeap,
-                           const char * i_sIndexValue,
-                           const char * i_sIndexReference,
-                           E_LinkType       i_eLinkType )
+Index::WriteTableFromHeap( std::ostream &  	o_rOut,
+                           Heap & 	    i_rHeap,
+                           const char *	i_sIndexValue,
+                           const char *	i_sIndexReference,
+                           E_LinkType		i_eLinkType )
 {
     WriteStr(o_rOut, "<H3><BR>");
     WriteStr(o_rOut, i_sIndexValue );
@@ -191,9 +191,9 @@ Index::WriteTableFromHeap( std::ostream &   o_rOut,
 
 
 void
-Index::WriteHeap( std::ostream &    o_rOut,
-                  Heap &        i_rHeap,
-                  E_LinkType    i_eLinkType )
+Index::WriteHeap( std::ostream &  	o_rOut,
+                  Heap &	    i_rHeap,
+                  E_LinkType 	i_eLinkType )
 {
     static Simstr S_sKey;
     static char C_sSpaceInName[] = "&nbsp;&nbsp;&nbsp;";
@@ -241,7 +241,7 @@ Index::WriteHeap( std::ostream &    o_rOut,
 
 
 
-/** Structure overview
+/**	Structure overview
 
 MODULEDESCRIPTION
 {
diff --git a/xml2cmp/source/xcd/cr_index.hxx b/xml2cmp/source/xcd/cr_index.hxx
index eeea87ed1e46..912ecf831e0b 100644
--- a/xml2cmp/source/xcd/cr_index.hxx
+++ b/xml2cmp/source/xcd/cr_index.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,47 +42,47 @@ class Index
 {
   public:
                         Index(
-                            const char  *       i_sOutputDirectory,
-                            const char *        i_sIdlRootPath,
+                            const char	*		i_sOutputDirectory,
+                            const char *		i_sIdlRootPath,
                             const List<Simstr> &
                                                 i_rTagList );
                         ~Index();
 
-    void                GatherData(
+    void				GatherData(
                             const List<Simstr> &
                                                 i_rInputFileList );
-    void                WriteOutput(
-                            const char *        i_sOuputFile );
+    void				WriteOutput(
+                            const char *      	i_sOuputFile );
 
-    void                InsertSupportedService(
-                            const Simstr &      i_sService );
+    void				InsertSupportedService(
+                            const Simstr &		i_sService );
   private:
-    void                ReadFile(
-                            const char *        i_sFilename );
+    void				ReadFile(
+                            const char *      	i_sFilename );
     void                CreateHtmlFileName(
-                            char *              o_sOutputHtml,
-                            const ModuleDescription &
+                            char *				o_sOutputHtml,
+                            const ModuleDescription	&
                                                 i_rModule );
-    void                WriteTableFromHeap(
-                            std::ostream &      o_rOut,
-                            Heap &              i_rHeap,
+    void				WriteTableFromHeap(
+                            std::ostream &		o_rOut,
+                            Heap &		        i_rHeap,
                             const char *        i_sIndexKey,
                             const char *        i_sIndexReference,
-                            E_LinkType          i_eLinkType );
-    void                WriteHeap(
-                            std::ostream &      o_rOut,
-                            Heap &              i_rHeap,
-                            E_LinkType          i_eLinkType );
+                            E_LinkType			i_eLinkType );
+    void				WriteHeap(
+                            std::ostream &  	o_rOut,
+                            Heap &		        i_rHeap,
+                            E_LinkType			i_eLinkType );
 
     // DATA
-    Heap                aService2Module;
-    Heap                aModule2Service;
+    Heap				aService2Module;
+    Heap				aModule2Service;
 
-    Simstr              sOutputDirectory;
-    Simstr              sIdlRootPath;
+    Simstr				sOutputDirectory;
+    Simstr			    sIdlRootPath;
 
     // Temporary Data
-    Simstr              sCurModule;
+    Simstr				sCurModule;
 };
 
 
diff --git a/xml2cmp/source/xcd/cr_metho.cxx b/xml2cmp/source/xcd/cr_metho.cxx
index 07abb0d9d589..85077224ff8d 100644
--- a/xml2cmp/source/xcd/cr_metho.cxx
+++ b/xml2cmp/source/xcd/cr_metho.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,8 +55,8 @@ const char C_sFuncEnd[]    =  "\";\r\n"
 
 
 void
-Create_AccessMethod( const char *           i_pOutputFileName,
-                     const char *           i_sText )
+Create_AccessMethod( const char *			i_pOutputFileName,
+                     const char *			i_sText )
 {
     const char * pText = i_sText;
     const char * pTrans = 0;
@@ -85,18 +85,18 @@ Create_AccessMethod( const char *           i_pOutputFileName,
     {
         switch (*pTrans)
         {
-            case '"':   aFile.write( "\\\"", 2);
+            case '"':	aFile.write( "\\\"", 2);
                         break;
             case '\n':  aFile.write( "\\n", 2);
                         aFile.write( sDescrLineChange, sDescrLen);
                         break;
             case '\r':  aFile.write( "\\r", 2);
                         break;
-//          case '\t':  aFile.write( "\\t", 2);
-//                      break;
+//			case '\t':  aFile.write( "\\t", 2);
+//						break;
             default:    aFile.write( pTrans, 1);
         }
-    }   /* end for */
+    }	/* end for */
 
     aFile.write( C_sFuncEnd, (int) strlen(C_sFuncEnd) );
 
diff --git a/xml2cmp/source/xcd/cr_metho.hxx b/xml2cmp/source/xcd/cr_metho.hxx
index 212d74045e20..d538da95f7fd 100644
--- a/xml2cmp/source/xcd/cr_metho.hxx
+++ b/xml2cmp/source/xcd/cr_metho.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,9 +31,9 @@
 
 
 
-void                Create_AccessMethod(
-                        const char *            i_pOutputFileName,
-                        const char *            i_sText );
+void				Create_AccessMethod(
+                        const char *			i_pOutputFileName,
+                        const char *			i_sText );
 
 #endif
 
diff --git a/xml2cmp/source/xcd/filebuff.cxx b/xml2cmp/source/xcd/filebuff.cxx
index e1e318953ca4..b2291491d344 100644
--- a/xml2cmp/source/xcd/filebuff.cxx
+++ b/xml2cmp/source/xcd/filebuff.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -38,8 +38,8 @@
 
 
 bool
-LoadXmlFile( Buffer &           o_rBuffer,
-             const char *       i_sXmlFilePath )
+LoadXmlFile( Buffer & 			o_rBuffer,
+             const char *		i_sXmlFilePath )
 {
     std::ifstream aXmlFile;
 
diff --git a/xml2cmp/source/xcd/filebuff.hxx b/xml2cmp/source/xcd/filebuff.hxx
index 053d5c9e9fa0..07de89f52cba 100644
--- a/xml2cmp/source/xcd/filebuff.hxx
+++ b/xml2cmp/source/xcd/filebuff.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,22 +33,22 @@
 class Buffer
 {
   public:
-                        Buffer()                : s(0) {}
+                        Buffer() 			   	: s(0) {}
                         ~Buffer()               { if (s) delete [] s; }
                         operator const char *() const
                                                 { return s; }
-    char *              Data()                  { return s; }
-    void                SetSize(
-                           unsigned long                i_size )
+    char *				Data() 					{ return s; }
+    void               	SetSize(
+                           unsigned	long 			    i_size )
                                                 { if (s) delete [] s; s = new char [i_size]; }
   private:
     char * s;
 };
 
 
-bool                LoadXmlFile(
-                        Buffer &            o_rBuffer,
-                        const char *        i_sXmlFilePath );
+bool				LoadXmlFile(
+                        Buffer & 			o_rBuffer,
+                        const char *		i_sXmlFilePath );
 
 
 
diff --git a/xml2cmp/source/xcd/main.cxx b/xml2cmp/source/xcd/main.cxx
index a09c0f78a842..f535f07031d1 100644
--- a/xml2cmp/source/xcd/main.cxx
+++ b/xml2cmp/source/xcd/main.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,24 +44,24 @@
 
 
 
-int                     Do_IndexCommandLine(
-                            const CommandLine &     i_rCommandLine );
-int                     Do_SingleFileCommandLine(
-                            const CommandLine &     i_rCommandLine );
-void                    Create_TypeInfo(
-                            const char *            o_sOutputFile,
-                            ModuleDescription &     i_rData );
+int      				Do_IndexCommandLine(
+                            const CommandLine &		i_rCommandLine );
+int      				Do_SingleFileCommandLine(
+                            const CommandLine &		i_rCommandLine );
+void					Create_TypeInfo(
+                            const char *		  	o_sOutputFile,
+                            ModuleDescription &	    i_rData );
 
 
 int
 #ifdef WNT
 _cdecl
 #endif
-main( int       argc,
+main( int 		argc,
       char *    argv[] )
 {
     // Variables
-    CommandLine             aCommandLine(argc, argv);
+    CommandLine				aCommandLine(argc, argv);
     int ret = 0;
 
     if (! aCommandLine.IsOk())
@@ -82,8 +82,8 @@ main( int       argc,
 int
 Do_SingleFileCommandLine(const CommandLine & i_rCommandLine)
 {
-    ModuleDescription   aDescr;
-    X2CParser           aParser(aDescr);
+    ModuleDescription	aDescr;
+    X2CParser			aParser(aDescr);
 
     // Load file and create Function-file
     bool bLoadResult = aParser.LoadFile(i_rCommandLine.XmlSrcFile());
@@ -129,8 +129,8 @@ int
 Do_IndexCommandLine(const CommandLine & i_rCommandLine)
 {
     // Parse files:
-    List<Simstr>    aFiles;
-    Index           aIndex( i_rCommandLine.OutputDirectory(),
+    List<Simstr>	aFiles;
+    Index	        aIndex( i_rCommandLine.OutputDirectory(),
                             i_rCommandLine.IdlRootPath(),
                             i_rCommandLine.IndexedTags() );
 
@@ -151,22 +151,22 @@ Do_IndexCommandLine(const CommandLine & i_rCommandLine)
 //********************      Creating of typeinfo       ********************//
 
 
-void                    Put2StdOut_TypeInfo(
-                            ModuleDescription &     i_rData );
-void                    Put2File_TypeInfo(
+void					Put2StdOut_TypeInfo(
+                            ModuleDescription &	    i_rData );
+void					Put2File_TypeInfo(
                             const char *            i_sOutputFile,
-                            ModuleDescription &     i_rData );
-void                    StreamOut_TypeInfo(
+                            ModuleDescription &	    i_rData );
+void					StreamOut_TypeInfo(
                             std::ostream &               o_rOut,
-                            ModuleDescription &     i_rData,
+                            ModuleDescription &	    i_rData,
                             const char *            i_sSeparator );
 
 
 
 
 void
-Create_TypeInfo( const char *           o_sOutputFile,
-                 ModuleDescription &    i_rData )
+Create_TypeInfo( const char *	   		o_sOutputFile,
+                 ModuleDescription &	i_rData )
 {
     if ( strcmp(o_sOutputFile, "stdout") == 0 )
         Put2StdOut_TypeInfo(i_rData);
@@ -175,14 +175,14 @@ Create_TypeInfo( const char *           o_sOutputFile,
 }
 
 void
-Put2StdOut_TypeInfo( ModuleDescription &    i_rData )
+Put2StdOut_TypeInfo( ModuleDescription &	i_rData )
 {
     StreamOut_TypeInfo(std::cout, i_rData, " ");
 }
 
 void
 Put2File_TypeInfo( const char *            i_sOutputFile,
-                   ModuleDescription &     i_rData )
+                   ModuleDescription &	   i_rData )
 {
     std::ofstream aOut(i_sOutputFile, std::ios::out
 #if defined(WNT) || defined(OS2)
@@ -195,7 +195,7 @@ Put2File_TypeInfo( const char *            i_sOutputFile,
         return;
     }
 
-    Simstr  sLibPrefix = i_rData.ModuleName();
+    Simstr	sLibPrefix = i_rData.ModuleName();
     WriteStr( aOut, sLibPrefix );
     WriteStr( aOut, "_XML2CMPTYPES= ");
 
@@ -206,10 +206,10 @@ Put2File_TypeInfo( const char *            i_sOutputFile,
 
 void
 StreamOut_TypeInfo( std::ostream &               o_rOut,
-                    ModuleDescription &     i_rData,
+                    ModuleDescription &	    i_rData,
                     const char *            i_sSeparator )
 {
-    Heap    aTypesHeap(12);
+    Heap 	aTypesHeap(12);
 
     // Gather types:
     List< const MultipleTextElement * > aTypes;
@@ -249,7 +249,7 @@ StreamOut_TypeInfo( std::ostream &               o_rOut,
         }
         else
             WriteStr( o_rOut, pHeapTop->Key() );
-    }   // end for
+    }	// end for
 
     if (pLastHeapTop != 0)
     {
diff --git a/xml2cmp/source/xcd/parse.cxx b/xml2cmp/source/xcd/parse.cxx
index 454abb46d1ce..9a7b4f625d4c 100644
--- a/xml2cmp/source/xcd/parse.cxx
+++ b/xml2cmp/source/xcd/parse.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,13 +47,13 @@
 
 
 
-#define AssertionOf(x)  \
+#define AssertionOf(x)	\
     {if (!(x)) {std::cerr << "Assertion failed: " << #x << __FILE__ << __LINE__ << std::endl; exit(3); }}
 
 
 
 X2CParser::X2CParser( XmlElement & o_rDocumentData )
-    :   // sFileName,
+    :	// sFileName,
         nFileLine(0),
         pDocumentData(&o_rDocumentData),
         // sWord,
@@ -129,7 +129,7 @@ X2CParser::Parse_Doctype()
 
 void
 X2CParser::Parse_Sequence( DynamicList<XmlElement> & o_rElements,
-                           const Simstr &            i_sElementName  )
+                           const Simstr &			 i_sElementName  )
 {
     CheckAndPassBeginTag(i_sElementName.str());
 
@@ -145,7 +145,7 @@ X2CParser::Parse_Sequence( DynamicList<XmlElement> & o_rElements,
 void
 X2CParser::Parse_FreeChoice( DynamicList<XmlElement> & o_rElements )
 {
-    unsigned        nSize = o_rElements.size();
+    unsigned     	nSize = o_rElements.size();
 
     for ( bool bBreak = false;  !bBreak; )
     {
@@ -159,8 +159,8 @@ X2CParser::Parse_FreeChoice( DynamicList<XmlElement> & o_rElements )
                 bBreak = false;
                 break;
             }
-        }   // end for i
-    }   // end for !bBreak
+        }  	// end for i
+    } 	// end for !bBreak
 }
 
 void
@@ -175,9 +175,9 @@ X2CParser::Parse_List( ListElement &  o_rListElem )
 }
 
 void
-X2CParser::Parse_Text( Simstr &         o_sText,
-                       const Simstr &   i_sElementName,
-                       bool             i_bReverseName )
+X2CParser::Parse_Text( Simstr &			o_sText,
+                       const Simstr &	i_sElementName,
+                       bool				i_bReverseName )
 {
 
     if ( ! CheckAndPassBeginTag(i_sElementName.str()) )
@@ -191,9 +191,9 @@ X2CParser::Parse_Text( Simstr &         o_sText,
 }
 
 void
-X2CParser::Parse_MultipleText( List<Simstr> &   o_rTexts,
-                               const Simstr &   i_sElementName,
-                               bool             i_bReverseName )
+X2CParser::Parse_MultipleText( List<Simstr> &	o_rTexts,
+                               const Simstr &	i_sElementName,
+                               bool				i_bReverseName )
 {
     for ( Goto('<'); IsBeginTag(i_sElementName.str()); Goto('<') )
     {
@@ -205,9 +205,9 @@ X2CParser::Parse_MultipleText( List<Simstr> &   o_rTexts,
 }
 
 void
-X2CParser::Parse_SglAttr( Simstr &          o_sAttrValue,
-                          const Simstr &    i_sElementName,
-                          const Simstr &    i_sAttrName )
+X2CParser::Parse_SglAttr( Simstr &			o_sAttrValue,
+                          const Simstr &	i_sElementName,
+                          const Simstr &	i_sAttrName )
 {
     Goto('<');
     if ( !IsBeginTag(i_sElementName.str()) )
@@ -228,9 +228,9 @@ X2CParser::Parse_SglAttr( Simstr &          o_sAttrValue,
 }
 
 void
-X2CParser::Parse_MultipleAttr( List<Simstr> &       o_rAttrValues,
-                               const Simstr &       i_sElementName,
-                               const List<Simstr> & i_rAttrNames )
+X2CParser::Parse_MultipleAttr( List<Simstr> &		o_rAttrValues,
+                               const Simstr &		i_sElementName,
+                               const List<Simstr> &	i_rAttrNames )
 {
     Goto('<');
     if ( !IsBeginTag(i_sElementName.str()) )
@@ -279,13 +279,13 @@ X2CParser::Get_Attribute( Simstr & o_rAttrValue,
 }
 
 bool
-X2CParser::IsText( const char * i_sComparedText )
+X2CParser::IsText( const char *	i_sComparedText )
 {
     return strnicmp( text, i_sComparedText, strlen(i_sComparedText) ) == 0;
 }
 
 bool
-X2CParser::IsBeginTag( const char * i_sTagName )
+X2CParser::IsBeginTag( const char *	i_sTagName )
 {
     return strnicmp( text+1, i_sTagName, strlen(i_sTagName) ) == 0
            && *text == '<';
@@ -397,7 +397,7 @@ X2CParser::CheckAndPassBeginTag( const char * i_sElementName )
 }
 
 void
-X2CParser::CheckAndPassEndTag( const char * i_sElementName )
+X2CParser::CheckAndPassEndTag( const char *	i_sElementName )
 {
     Pass_White();
     if ( !IsEndTag(i_sElementName) )
diff --git a/xml2cmp/source/xcd/parse.hxx b/xml2cmp/source/xcd/parse.hxx
index 7bd726b9930a..732fea698b89 100644
--- a/xml2cmp/source/xcd/parse.hxx
+++ b/xml2cmp/source/xcd/parse.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,88 +49,88 @@ class X2CParser
     typedef XmlElement * (*F_CREATE)(const Simstr &);
 
                         X2CParser(
-                            XmlElement &        o_rDocumentData );
+                            XmlElement &		o_rDocumentData );
                         ~X2CParser();
 
-    bool                LoadFile(
-                            const char *        i_sFilename );
+    bool			 	LoadFile(
+                            const char *		i_sFilename );
     void                Parse();
     bool                Parse(
-                            const char *        i_sFilename );
+                            const char *		i_sFilename );
 
 
-    const char *        PureText() const        { return aFile.operator const char*(); }
+    const char *		PureText() const		{ return aFile.operator const char*(); }
 
-    void                Parse_Sequence(
+    void				Parse_Sequence(
                            DynamicList<XmlElement> &
                                                 o_rElements,
-                           const Simstr &       i_sElementName );
-    void                Parse_FreeChoice(
+                           const Simstr &		i_sElementName );
+    void				Parse_FreeChoice(
                             DynamicList<XmlElement> &
                                                 o_rElements );
-    void                Parse_List(
-                            ListElement &       o_rListElem );
+    void				Parse_List(
+                            ListElement &		o_rListElem );
     void                Parse_Text(
-                            Simstr &            o_sText,
-                            const Simstr &      i_sElementName,
-                            bool                i_bReverseName );
+                            Simstr &			o_sText,
+                            const Simstr &		i_sElementName,
+                            bool				i_bReverseName );
     void                Parse_MultipleText(
-                            List<Simstr> &      o_rTexts,
-                            const Simstr &      i_sElementName,
-                            bool                i_bReverseName );
+                            List<Simstr> &	    o_rTexts,
+                            const Simstr &		i_sElementName,
+                            bool				i_bReverseName );
     void                Parse_SglAttr(
-                            Simstr &            o_sAttrValue,
-                            const Simstr &      i_sElementName,
-                            const Simstr &      i_sAttrName );
+                            Simstr &			o_sAttrValue,
+                            const Simstr &		i_sElementName,
+                            const Simstr &		i_sAttrName );
     void                Parse_MultipleAttr(
-                            List<Simstr> &      o_rAttrValues,
-                            const Simstr &      i_sElementName,
+                            List<Simstr> &		o_rAttrValues,
+                            const Simstr &		i_sElementName,
                             const List<Simstr> &
                                                 i_rAttrNames );
 
   private:
-    void                Parse_XmlDeclaration();
-    void                Parse_Doctype();
-
-    void                Get_Attribute(
-                            Simstr &            o_rAttrValue,
-                            Simstr &            o_rAttrName );
-    bool                IsText(
-                            const char *        i_sComparedText );
-    bool                IsBeginTag(
-                            const char *        i_sTagName );
-    bool                IsEndTag(
-                            const char *        i_sTagName );
-    void                Goto(
-                            char                i_cNext );
-    void                Goto_And_Pass(
-                            char                i_cNext );
-    void                Move(
-                            int                 i_nForward );
-    void                Pass_White();
-    void                GetTextTill(
-                            Simstr &            o_rText,
-                            char                i_cEnd,
+    void				Parse_XmlDeclaration();
+    void				Parse_Doctype();
+
+    void				Get_Attribute(
+                            Simstr &			o_rAttrValue,
+                            Simstr &			o_rAttrName );
+    bool				IsText(
+                            const char *		i_sComparedText );
+    bool				IsBeginTag(
+                            const char *		i_sTagName );
+    bool				IsEndTag(
+                            const char *		i_sTagName );
+    void				Goto(
+                            char				i_cNext );
+    void				Goto_And_Pass(
+                            char				i_cNext );
+    void				Move(
+                            int					i_nForward );
+    void				Pass_White();
+    void				GetTextTill(
+                            Simstr & 			o_rText,
+                            char				i_cEnd,
                             bool                i_bReverseName = false );
     /// @return false in case of empty tag with no attributes.
-    bool                CheckAndPassBeginTag(
-                            const char *        i_sElementName );
-    void                CheckAndPassEndTag(
-                            const char *        i_sElementName );
+    bool				CheckAndPassBeginTag(
+                            const char *		i_sElementName );
+    void				CheckAndPassEndTag(
+                            const char *		i_sElementName );
     /// @precond IsBeginTag() == true.
     bool                IsAbsoluteEmpty() const;
 
 
-    void                SyntaxError(
-                            const char *        i_sText );
-    void                TestCurChar();
+    void				SyntaxError(
+                            const char *		i_sText );
+    void				TestCurChar();
 
     // DATA
-    Simstr              sFileName;
-    unsigned            nFileLine;
+    Simstr				sFileName;
+    unsigned			nFileLine;
 
-    Buffer              aFile;
-    XmlElement *        pDocumentData;
+    Buffer 				aFile;
+    XmlElement *		pDocumentData;
 
     char                sWord[8192];
     const char *        text;
diff --git a/xml2cmp/source/xcd/xmlelem.cxx b/xml2cmp/source/xcd/xmlelem.cxx
index 3634d076c216..94405c302597 100644
--- a/xml2cmp/source/xcd/xmlelem.cxx
+++ b/xml2cmp/source/xcd/xmlelem.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -63,12 +63,12 @@ MultipleElement::~MultipleElement()
 }
 
 MultipleElement::MultipleElement( const char * i_sName )
-    :   XmlElement(i_sName)
+    :	XmlElement(i_sName)
 {
 }
 
 void
-MultipleElement::AddChild( XmlElement & let_drElement )
+MultipleElement::AddChild( XmlElement &	let_drElement )
 {
     aChildren.push_back(&let_drElement);
 }
@@ -99,13 +99,13 @@ SequenceElement::Write2Html( HtmlCreator & io_rHC ) const
 
 SequenceElement::SequenceElement( const char * i_sName,
                                   unsigned     i_nIndexNameElement )
-    :   MultipleElement(i_sName),
+    :	MultipleElement(i_sName),
         nIndexNameElement(i_nIndexNameElement)
 {
 }
 
 FreeChoiceElement::FreeChoiceElement()
-    :   MultipleElement("")
+    :	MultipleElement("")
 {
 }
 
@@ -126,15 +126,15 @@ FreeChoiceElement::Write2Html( HtmlCreator & io_rHC ) const
 
 ListElement::ListElement( const char * i_sElementsName,
                           F_CREATE     i_fCreateNewElement )
-    :   MultipleElement(i_sElementsName),
+    :	MultipleElement(i_sElementsName),
         fCreateNewElement(i_fCreateNewElement)
 {
 }
 
 void
-ListElement::Parse( X2CParser & io_rParser )
+ListElement::Parse( X2CParser &	io_rParser )
 {
-    io_rParser.Parse_List(  *this );
+    io_rParser.Parse_List(	*this );
 }
 
 void
@@ -154,19 +154,19 @@ ListElement::Create_and_Add_NewElement()
     return pNew;
 }
 
-TextElement::TextElement( const char *      i_sName,
-                          E_LinkType        i_eLinkType,
-                          bool              i_bReverseName )
-    :   XmlElement(i_sName),
+TextElement::TextElement( const char *		i_sName,
+                          E_LinkType		i_eLinkType,
+                          bool				i_bReverseName )
+    :	XmlElement(i_sName),
         eLinkType(i_eLinkType),
         bReverseName(i_bReverseName)
 {
 }
 
-SglTextElement::SglTextElement( const char *        i_sName,
-                                E_LinkType          i_eLinkType,
-                                bool                i_bReverseName )
-    :   TextElement(i_sName, i_eLinkType, i_bReverseName)
+SglTextElement::SglTextElement( const char *		i_sName,
+                                E_LinkType			i_eLinkType,
+                                bool				i_bReverseName )
+    :	TextElement(i_sName, i_eLinkType, i_bReverseName)
 {
 }
 
@@ -177,16 +177,16 @@ SglTextElement::Parse( X2CParser & io_rParser )
 }
 
 void
-SglTextElement::Write2Html( HtmlCreator & io_rHC ) const
+SglTextElement::Write2Html(	HtmlCreator & io_rHC ) const
 {
     if ( !sContent.is_no_text() )
         io_rHC.Write_SglTextElement( *this );
 }
 
-MultipleTextElement::MultipleTextElement( const char *      i_sName,
-                                          E_LinkType        i_eLinkType,
-                                          bool              i_bReverseName )
-    :   TextElement(i_sName, i_eLinkType, i_bReverseName)
+MultipleTextElement::MultipleTextElement( const char *		i_sName,
+                                          E_LinkType		i_eLinkType,
+                                          bool				i_bReverseName )
+    :	TextElement(i_sName, i_eLinkType, i_bReverseName)
 {
 }
 
@@ -197,7 +197,7 @@ MultipleTextElement::Parse( X2CParser & io_rParser )
 }
 
 void
-MultipleTextElement::Write2Html(    HtmlCreator & io_rHC ) const
+MultipleTextElement::Write2Html(	HtmlCreator & io_rHC ) const
 {
     if (Size() > 0)
         io_rHC.Write_MultiTextElement( *this );
@@ -214,13 +214,13 @@ MultipleTextElement::Data( unsigned i_nNr ) const
 }
 
 EmptyElement::EmptyElement( const char * i_sName )
-    :   XmlElement(i_sName)
+    :	XmlElement(i_sName)
 {
 }
 
-SglAttrElement::SglAttrElement( const char *        i_sName,
-                                const char *        i_sAttrName )
-    :   EmptyElement(i_sName),
+SglAttrElement::SglAttrElement( const char *		i_sName,
+                                const char *		i_sAttrName )
+    :	EmptyElement(i_sName),
         sAttrName(i_sAttrName)
 {
 }
@@ -232,15 +232,15 @@ SglAttrElement::Parse( X2CParser & io_rParser )
 }
 
 void
-SglAttrElement::Write2Html( HtmlCreator & io_rHC ) const
+SglAttrElement::Write2Html(	HtmlCreator & io_rHC ) const
 {
     io_rHC.Write_SglText( Name(), sAttrValue );
 }
 
-MultipleAttrElement::MultipleAttrElement( const char *      i_sName,
-                                          const char **     i_sAttrNames,
-                                          unsigned          i_nSize )
-    :   EmptyElement(i_sName)
+MultipleAttrElement::MultipleAttrElement( const char *		i_sName,
+                                          const char **		i_sAttrNames,
+                                          unsigned			i_nSize )
+    :	EmptyElement(i_sName)
 {
     for ( unsigned i = 0; i < i_nSize; ++i )
     {
@@ -250,13 +250,13 @@ MultipleAttrElement::MultipleAttrElement( const char *      i_sName,
 }
 
 void
-MultipleAttrElement::Parse( X2CParser & io_rParser )
+MultipleAttrElement::Parse(	X2CParser &	io_rParser )
 {
     io_rParser.Parse_MultipleAttr(aAttrValues, Name(), aAttrNames);
 }
 
 void
-MultipleAttrElement::Write2Html(    HtmlCreator & io_rHC ) const
+MultipleAttrElement::Write2Html(	HtmlCreator & io_rHC ) const
 {
     if ( ! aAttrValues[0].is_no_text() )
         io_rHC.Write_ReferenceDocu( Name(), aAttrValues[0], aAttrValues[1], aAttrValues[2] );
diff --git a/xml2cmp/source/xcd/xmlelem.hxx b/xml2cmp/source/xcd/xmlelem.hxx
index 6d797884362d..2d4b5ae052c1 100644
--- a/xml2cmp/source/xcd/xmlelem.hxx
+++ b/xml2cmp/source/xcd/xmlelem.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,23 +47,23 @@ class Index;
 class XmlElement
 {
   public:
-    virtual             ~XmlElement() {}
+    virtual				~XmlElement() {}
     virtual void        Parse(
-                            X2CParser &         io_rParser ) = 0;
+                            X2CParser &			io_rParser ) = 0;
     virtual void        Write2Html(
-                            HtmlCreator &       io_rHC ) const = 0;
+                            HtmlCreator &		io_rHC ) const = 0;
     virtual void        Insert2Index(
-                            Index &             o_rIndex ) const;           // Default: Does nothing, but can be overwritten.
+                            Index & 	        o_rIndex ) const;			// Default: Does nothing, but can be overwritten.
 
-//  virtual void        Put2Dependy() = 0;
+//	virtual void        Put2Dependy() = 0;
 
-    const Simstr &      Name() const            { return sName; }
+    const Simstr &		Name() const			{ return sName; }
 
   protected:
                         XmlElement(
-                            const char *        i_sName );
+                            const char *		i_sName );
   private:
-    Simstr              sName;
+    Simstr 				sName;
 };
 
 
@@ -74,51 +74,51 @@ class MultipleElement : public XmlElement
 
     virtual XmlElement *
                         FindChild(
-                            const Simstr &      i_sChildName );
+                            const Simstr &		i_sChildName );
 
 
   protected:
-    typedef DynamicList<XmlElement>         ChildList;
+    typedef DynamicList<XmlElement>			ChildList;
 
                         MultipleElement(
-                            const char *        i_sName );
+                            const char *		i_sName );
 
-    void                AddChild(
-                            XmlElement &        let_drElement );
+    void				AddChild(
+                            XmlElement &		let_drElement );
 
-    const ChildList &   Children() const        { return aChildren; }
-    ChildList &         Children()              { return aChildren; }
+    const ChildList &	Children() const		{ return aChildren; }
+    ChildList &			Children()				{ return aChildren; }
 
   private:
-    ChildList           aChildren;
+    ChildList			aChildren;
 };
 
 class SequenceElement : public MultipleElement
 {
   public:
     virtual void        Parse(
-                            X2CParser &         io_rParser );
+                            X2CParser &			io_rParser );
     virtual void        Write2Html(
-                            HtmlCreator &       io_rHC ) const;
+                            HtmlCreator &		io_rHC ) const;
 
   protected:
                         SequenceElement(
-                            const char *        i_sName,
+                            const char *		i_sName,
                             unsigned            i_nIndexNameElement = 0 );
   private:
-    unsigned            nIndexNameElement;
+    unsigned			nIndexNameElement;
 };
 
 class FreeChoiceElement : public MultipleElement
 {
   public:
                         FreeChoiceElement();
-    using               MultipleElement::AddChild;
+    using				MultipleElement::AddChild;
 
     virtual void        Parse(
-                            X2CParser &         io_rParser );
+                            X2CParser &			io_rParser );
     virtual void        Write2Html(
-                            HtmlCreator &       io_rHC ) const;
+                            HtmlCreator &		io_rHC ) const;
 };
 
 class ListElement : public MultipleElement
@@ -127,94 +127,94 @@ class ListElement : public MultipleElement
     typedef XmlElement * (*F_CREATE)(const Simstr &);
 
                         ListElement(
-                            const char *        i_sElementsName,
+                            const char *		i_sElementsName,
                             F_CREATE            i_fCreateNewElement );
 
     virtual void        Parse(
-                            X2CParser &         io_rParser );
+                            X2CParser &			io_rParser );
     virtual void        Write2Html(
-                            HtmlCreator &       io_rHC ) const;
+                            HtmlCreator &		io_rHC ) const;
     virtual XmlElement *
                         Create_and_Add_NewElement();
   private:
-    F_CREATE            fCreateNewElement;
+    F_CREATE			fCreateNewElement;
 };
 
 class TextElement : public XmlElement
 {
   public:
-    E_LinkType          LinkType() const        { return eLinkType; }
-    bool                IsReversedName() const  { return bReverseName; }
+    E_LinkType			LinkType() const		{ return eLinkType; }
+    bool			    IsReversedName() const	{ return bReverseName; }
   protected:
                         TextElement(
-                            const char *        i_sName,
-                            E_LinkType          i_eLinkType,
-                            bool                i_bReverseName );
+                            const char *		i_sName,
+                            E_LinkType			i_eLinkType,
+                            bool				i_bReverseName );
   private:
-    E_LinkType          eLinkType;
-    bool                bReverseName;
+    E_LinkType			eLinkType;
+    bool				bReverseName;
 };
 
 class SglTextElement : public TextElement
 {
   public:
                         SglTextElement(
-                            const char *        i_sName,
-                            E_LinkType          i_eLinkType,
-                            bool                i_bReverseName );
+                            const char *		i_sName,
+                            E_LinkType			i_eLinkType,
+                            bool				i_bReverseName );
 
     virtual void        Parse(
-                            X2CParser &         io_rParser );
+                            X2CParser &			io_rParser );
     virtual void        Write2Html(
-                            HtmlCreator &       io_rHC ) const;
+                            HtmlCreator &		io_rHC ) const;
     virtual const Simstr &
-                        Data() const            { return sContent; }
+                        Data() const			{ return sContent; }
   private:
-    Simstr              sContent;
+    Simstr				sContent;
 };
 
 class MultipleTextElement : public TextElement
 {
   public:
                         MultipleTextElement(
-                            const char *        i_sName,
-                            E_LinkType          i_eLinkType,
-                            bool                i_bReverseName );
+                            const char *		i_sName,
+                            E_LinkType			i_eLinkType,
+                            bool				i_bReverseName );
 
     virtual void        Parse(
-                            X2CParser &         io_rParser );
+                            X2CParser &			io_rParser );
     virtual void        Write2Html(
-                            HtmlCreator &       io_rHC ) const;
+                            HtmlCreator &		io_rHC ) const;
     virtual const Simstr &
                         Data(
-                            unsigned            i_nNr ) const;
-    virtual unsigned    Size() const            { return aContent.size(); }
+                            unsigned 			i_nNr ) const;
+    virtual unsigned	Size() const			{ return aContent.size(); }
 
   private:
-    List<Simstr>        aContent;
+    List<Simstr>		aContent;
 };
 
 class EmptyElement : public XmlElement
 {
   protected:
                         EmptyElement(
-                            const char *        i_sName );
+                            const char *		i_sName );
 };
 
 class SglAttrElement : public EmptyElement
 {
   public:
                         SglAttrElement(
-                            const char *        i_sName,
-                            const char *        i_sAttrName );
+                            const char *		i_sName,
+                            const char *		i_sAttrName );
 
     virtual void        Parse(
-                            X2CParser &         io_rParser );
+                            X2CParser &			io_rParser );
     virtual void        Write2Html(
-                            HtmlCreator &       io_rHC ) const;
+                            HtmlCreator &		io_rHC ) const;
   private:
-    Simstr              sAttrName;
-    Simstr              sAttrValue;
+    Simstr				sAttrName;
+    Simstr				sAttrValue;
 };
 
 
@@ -222,17 +222,17 @@ class MultipleAttrElement : public EmptyElement
 {
   public:
                         MultipleAttrElement(
-                            const char *        i_sName,
-                            const char **       i_sAttrNames,
-                            unsigned            i_nSize );
+                            const char *		i_sName,
+                            const char **		i_sAttrNames,
+                            unsigned			i_nSize );
 
     virtual void        Parse(
-                            X2CParser &         io_rParser );
+                            X2CParser &			io_rParser );
     virtual void        Write2Html(
-                            HtmlCreator &       io_rHC ) const;
+                            HtmlCreator &		io_rHC ) const;
   private:
-    List<Simstr>        aAttrNames;
-    List<Simstr>        aAttrValues;
+    List<Simstr>		aAttrNames;
+    List<Simstr>		aAttrValues;
 };
 
 // IMPLEMENTATION
diff --git a/xml2cmp/source/xcd/xmltree.cxx b/xml2cmp/source/xcd/xmltree.cxx
index 6c823a1d8054..240f41130d44 100644
--- a/xml2cmp/source/xcd/xmltree.cxx
+++ b/xml2cmp/source/xcd/xmltree.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,15 +56,15 @@ char  C_sAttr_xl_role[] = "xlink:role";
 char  C_sAttr_xl_title[] = "xlink:title";
 char  C_sAttr_xmlns[] = "xmlns:xlink";
 char  C_sAttr_xl_type[] = "xlink:type";
-char  C_sCompDescrListTitle[] = "Component Descriptions";
+char  C_sCompDescrListTitle[] = "Component Descriptions"; 
 
 
-FreeChoiceElement * Create_ModuleDescrOptional_Element(
+FreeChoiceElement *	Create_ModuleDescrOptional_Element(
                         MultipleTextElement * &
                                             o_rTypes,
                         MultipleTextElement * &
                                             o_rServiceDependencies );
-FreeChoiceElement * Create_CompDescrOptional_Element(
+FreeChoiceElement *	Create_CompDescrOptional_Element(
                         MultipleTextElement * &
                                             o_rTypes,
                         MultipleTextElement * &
@@ -73,7 +73,7 @@ FreeChoiceElement * Create_CompDescrOptional_Element(
 
 
 ModuleDescription::ModuleDescription()
-    :   SequenceElement(C_sMODULEDESCRIPTION),
+    :	SequenceElement(C_sMODULEDESCRIPTION),
         pModuleName(0),
         pCdList(0),
         pTypes(0),
@@ -113,7 +113,7 @@ ModuleDescription::Get_ServiceDependencies( List< const MultipleTextElement * >
 }
 
 ComponentDescription::ComponentDescription()
-    :   SequenceElement(C_sCOMPONENTDESCRIPTION,1),
+    :	SequenceElement(C_sCOMPONENTDESCRIPTION,1),
         pComponentName(0),
         pSupportedServices(0),
         pTypes(0),
@@ -132,7 +132,7 @@ ComponentDescription::ComponentDescription()
 }
 
 CompDescrList::CompDescrList()
-    :   ListElement(C_sCOMPONENTDESCRIPTION, 0)
+    :	ListElement(C_sCOMPONENTDESCRIPTION, 0)
 {
 }
 
@@ -184,7 +184,7 @@ CompDescrList::Get_ServiceDependencies( List< const MultipleTextElement * > & o_
 }
 
 MdName::MdName()
-    :   SglTextElement(C_sModuleName, lt_html, false)
+    :	SglTextElement(C_sModuleName, lt_html, false)
 {
 }
 
@@ -195,7 +195,7 @@ MdName::Write2Html( HtmlCreator & io_rHC ) const
 }
 
 CdName::CdName()
-    :   SglTextElement(C_sName, lt_html, true)
+    :	SglTextElement(C_sName, lt_html, true)
 {
 }
 
@@ -206,7 +206,7 @@ CdName::Write2Html( HtmlCreator & io_rHC ) const
 }
 
 SupportedService::SupportedService()
-    :   MultipleTextElement(C_sSupportedService, lt_idl, true)
+    :	MultipleTextElement(C_sSupportedService, lt_idl, true)
 {
 }
 
diff --git a/xml2cmp/source/xcd/xmltree.hxx b/xml2cmp/source/xcd/xmltree.hxx
index 9e0bdf05a8e9..7728f586d47a 100644
--- a/xml2cmp/source/xcd/xmltree.hxx
+++ b/xml2cmp/source/xcd/xmltree.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,19 +47,19 @@ class ModuleDescription : public SequenceElement
   public:
                         ModuleDescription();
 
-    const Simstr &      ModuleName() const;
-    void                Get_SupportedServices(    /// @return also the children of component-description.
+    const Simstr &		ModuleName() const;
+    void	            Get_SupportedServices(    /// @return also the children of component-description.
                             List< const MultipleTextElement * > &
                                                 o_rServices ) const;
-    void                Get_Types(
+    void				Get_Types(
                             List< const MultipleTextElement * > &
                                                 o_rTypes ) const;
-    void                Get_ServiceDependencies(
+    void				Get_ServiceDependencies(
                             List< const MultipleTextElement * > &
                                                 o_rServices ) const;
   private:
-    SglTextElement *    pModuleName;
-    CompDescrList *     pCdList;
+    SglTextElement *	pModuleName;
+    CompDescrList *		pCdList;
     MultipleTextElement *
                         pTypes;
     MultipleTextElement *
@@ -72,7 +72,7 @@ class ComponentDescription : public SequenceElement
   public:
                         ComponentDescription();
 
-    const Simstr &      ComponentName() const   { return pComponentName->Data(); }
+    const Simstr &		ComponentName() const	{ return pComponentName->Data(); }
     const MultipleTextElement &
                         SupportedServices() const
                                                 { return *pSupportedServices; }
@@ -82,7 +82,7 @@ class ComponentDescription : public SequenceElement
                         ServiceDependencies() const
                                                 { return *pServiceDependencies; }
   private:
-    SglTextElement *    pComponentName;
+    SglTextElement *	pComponentName;
     MultipleTextElement *
                         pSupportedServices;
     MultipleTextElement *
@@ -96,17 +96,17 @@ class CompDescrList : public ListElement
   public:
                         CompDescrList();
     virtual void        Write2Html(
-                            HtmlCreator &       io_rHC ) const;
+                            HtmlCreator &		io_rHC ) const;
     virtual XmlElement *
                         Create_and_Add_NewElement();
 
-    void                Get_SupportedServices(
+    void				Get_SupportedServices(
                             List< const MultipleTextElement * > &
                                                 o_rResult ) const;
-    void                Get_Types(
+    void				Get_Types(
                             List< const MultipleTextElement * > &
                                                 o_rResult ) const;
-    void                Get_ServiceDependencies(
+    void				Get_ServiceDependencies(
                             List< const MultipleTextElement * > &
                                                 o_rResult ) const;
   private:
@@ -119,7 +119,7 @@ class MdName : public SglTextElement
   public:
                         MdName();
     virtual void        Write2Html(
-                            HtmlCreator &       io_rHC ) const;
+                            HtmlCreator &		io_rHC ) const;
 };
 
 class CdName : public SglTextElement
@@ -127,7 +127,7 @@ class CdName : public SglTextElement
   public:
                         CdName();
     virtual void        Write2Html(
-                            HtmlCreator &       io_rHC ) const;
+                            HtmlCreator &		io_rHC ) const;
 };
 
 class SupportedService : public MultipleTextElement
@@ -136,7 +136,7 @@ class SupportedService : public MultipleTextElement
                         SupportedService();
 
     virtual void        Insert2Index(
-                            Index &             o_rIndex ) const;
+                            Index & 	        o_rIndex ) const;
 };